From 31f620cfd1ef287d996991c06aa0c1edf98f8b35 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 27 Mar 2024 13:55:04 +0000
Subject: =?UTF-8?q?Resolve=20"QR-Code=20f=C3=BCr=20=C3=B6ffentlichen=20Lin?=
 =?UTF-8?q?k=20zu=20Fragebogen=20anzeigen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #2971

Merge request studip/studip!1996
---
 app/views/questionnaire/context.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/questionnaire/context.php b/app/views/questionnaire/context.php
index 3b601c1..3237101 100644
--- a/app/views/questionnaire/context.php
+++ b/app/views/questionnaire/context.php
@@ -6,6 +6,10 @@
     <fieldset>
         <legend><?= _("URL zum Fragebogen") ?></legend>
         <input type="text" aria-label="<?= _("URL zum Fragebogen (nur lesbar)") ?>" readonly value="<?= htmlReady($GLOBALS['ABSOLUTE_URI_STUDIP']."dispatch.php/questionnaire/answer/".$questionnaire->getId()) ?>">
+        <a href="<?= htmlReady($GLOBALS['ABSOLUTE_URI_STUDIP'] . "dispatch.php/questionnaire/answer/" . $questionnaire->id) ?>"
+           data-qr-code title="<?= _('QR-Code zum Link anzeigen') ?>">
+            <?= Icon::create('code-qr')->asImg(['class' => 'text-bottom']) ?>
+        </a>
     </fieldset>
     <fieldset>
         <legend><?= _("Freigaben bearbeiten") ?></legend>
-- 
cgit v1.0


From 53e7b2b1f0d62801fe39209361de99706d682f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCttl=C3=B6ffel?=
 <schuettloeffel@zqs.uni-hannover.de>
Date: Thu, 28 Mar 2024 08:18:47 +0000
Subject: =?UTF-8?q?Resolve=20"Terminkalender/Stundenplan:=20nur=2015=20Far?=
 =?UTF-8?q?ben=20verf=C3=BCgbar"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3909

Merge request studip/studip!2765
---
 resources/assets/stylesheets/scss/schedule.scss | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/resources/assets/stylesheets/scss/schedule.scss b/resources/assets/stylesheets/scss/schedule.scss
index c8c8f5a..bc00b5b 100644
--- a/resources/assets/stylesheets/scss/schedule.scss
+++ b/resources/assets/stylesheets/scss/schedule.scss
@@ -266,6 +266,15 @@ td.schedule-adminbind {
         &.schedule-category15 {
             background-color: $calendar-category-15;
         }
+        &.schedule-category16 {
+            background-color: $calendar-category-16;
+        }
+        &.schedule-category17 {
+            background-color: $calendar-category-17;
+        }
+        &.schedule-category18 {
+            background-color: $calendar-category-18;
+        }
         &.schedule-category255 {
             background-color: $calendar-category-255;
         }
@@ -440,5 +449,38 @@ div.schedule_entry {
                 color: contrast($calendar-category-15-aux, $black, $white);
             }
         }
+        &.schedule-category16 {
+            background-color: $calendar-category-16-aux;
+            border: 1px solid $calendar-category-16;
+            dt {
+                background-color: $calendar-category-16;
+                color: contrast($calendar-category-16, $black, $white);
+            }
+            dd {
+                color: contrast($calendar-category-16-aux, $black, $white);
+            }
+        }
+        &.schedule-category17 {
+            background-color: $calendar-category-17-aux;
+            border: 1px solid $calendar-category-17;
+            dt {
+                background-color: $calendar-category-17;
+                color: contrast($calendar-category-17, $black, $white);
+            }
+            dd {
+                color: contrast($calendar-category-17-aux, $black, $white);
+            }
+        }
+        &.schedule-category18 {
+            background-color: $calendar-category-18-aux;
+            border: 1px solid $calendar-category-18;
+            dt {
+                background-color: $calendar-category-18;
+                color: contrast($calendar-category-18, $black, $white);
+            }
+            dd {
+                color: contrast($calendar-category-18-aux, $black, $white);
+            }
+        }
     }
 }
-- 
cgit v1.0


From 25f3127886f0a787970c08a2b3ff9eabfc23d3f3 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Thu, 28 Mar 2024 08:47:25 +0000
Subject: pass questions_data as JSON string and fix invalid values, fixes
 #3526, #3691, #3460

Closes #3526, #3691, and #3460

Merge request studip/studip!2771
---
 app/controllers/questionnaire.php                      |  2 +-
 .../5.3.23_fix_questionnaire_questiondata.php          | 18 ++++++++++++++++++
 resources/assets/javascripts/lib/questionnaire.js      |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 db/migrations/5.3.23_fix_questionnaire_questiondata.php

diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index 66a4e0b..d0766ed 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -148,7 +148,7 @@ class QuestionnaireController extends AuthenticatedController
             : null;
 
         $this->questionnaire['user_id'] = User::findCurrent()->id;
-        $questions_data = Request::getArray('questions_data');
+        $questions_data = json_decode(Request::get('questions_data'), true);
         $questions = [];
         foreach ($questions_data as $index => $question_data) {
             $class = $question_data['questiontype'];
diff --git a/db/migrations/5.3.23_fix_questionnaire_questiondata.php b/db/migrations/5.3.23_fix_questionnaire_questiondata.php
new file mode 100644
index 0000000..be115fc
--- /dev/null
+++ b/db/migrations/5.3.23_fix_questionnaire_questiondata.php
@@ -0,0 +1,18 @@
+<?php
+
+class FixQuestionnaireQuestiondata extends Migration
+{
+    public function description()
+    {
+        return 'fix invalid boolean values in questionnaire_questions';
+    }
+
+    public function up()
+    {
+        DBManager::get()->exec("
+            UPDATE questionnaire_questions
+            SET questiondata = REPLACE(questiondata, ':\"false\"', ':false')
+            WHERE questiondata LIKE '%:\"false\"%'
+        ");
+    }
+}
diff --git a/resources/assets/javascripts/lib/questionnaire.js b/resources/assets/javascripts/lib/questionnaire.js
index 2bca8c6..08d3a75 100644
--- a/resources/assets/javascripts/lib/questionnaire.js
+++ b/resources/assets/javascripts/lib/questionnaire.js
@@ -86,7 +86,7 @@ const Questionnaire = {
                             }
                             $.post(STUDIP.URLHelper.getURL('dispatch.php/questionnaire/store/' + (this.data.id || '')), {
                                 questionnaire: data,
-                                questions_data: questions,
+                                questions_data: JSON.stringify(questions),
                                 range_type: this.range_type,
                                 range_id: this.range_id
                             }).done(() => {
-- 
cgit v1.0


From f59e6bd9e965bf426f944d0f7484bab1ba2719f5 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 2 Apr 2024 08:23:11 +0000
Subject: fix #3829 for 5.5+

Closes #3829

Merge request studip/studip!2778
---
 resources/vue/components/StudipDialog.vue                      | 10 +++++++++-
 .../courseware/blocks/CoursewareBiographyCareerBlock.vue       |  4 ++--
 .../components/courseware/blocks/CoursewareImageMapBlock.vue   |  4 ++--
 .../components/courseware/blocks/CoursewareKeyPointBlock.vue   |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/resources/vue/components/StudipDialog.vue b/resources/vue/components/StudipDialog.vue
index f14dd37..0edd3c5 100644
--- a/resources/vue/components/StudipDialog.vue
+++ b/resources/vue/components/StudipDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <MountingPortal mountTo="body" append>
-        <focus-trap v-model="trap" :initial-focus="() => defaultFocus ? $refs.buttonB : null">
+        <focus-trap v-model="trap">
             <div class="studip-dialog" @keydown.esc="closeDialog">
                 <transition name="dialog-fade">
                     <div class="studip-dialog-backdrop">
@@ -262,5 +262,13 @@ export default {
             return typeof value !== "number" ? 0 : value;
         }
     },
+    mounted() {
+        if (this.defaultFocus) {
+            this.$nextTick()
+                .then(() => {
+                    this.$refs.buttonB.focus();
+                });
+        }
+    }
 };
 </script>
diff --git a/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue b/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue
index c366618..98fab71 100644
--- a/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue
@@ -17,8 +17,8 @@
                         class="cw-timeline-item"
                     >
                         <div class="cw-timeline-item-icon cw-timeline-item-icon-color-studip-blue">
-                            <studip-icon v-if="item.type === 'school'" shape="doctoral-cap" role="clickable" size="32"/>
-                            <studip-icon v-if="item.type === 'experience'" shape="tools" role="clickable" size="32"/>
+                            <studip-icon v-if="item.type === 'school'" shape="doctoral-cap" role="clickable" :size="32"/>
+                            <studip-icon v-if="item.type === 'experience'" shape="tools" role="clickable" :size="32"/>
                         </div>
                         <div
                             class="cw-timeline-item-content cw-timeline-item-content-color-studip-blue"
diff --git a/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue b/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue
index 6d12980..4f52d4b 100644
--- a/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue
@@ -113,7 +113,7 @@
                                 >
                                     <template #open-indicator="selectAttributes">
                                         <span v-bind="selectAttributes"
-                                            ><studip-icon shape="arr_1down" size="10"
+                                            ><studip-icon shape="arr_1down" :size="10"
                                         /></span>
                                     </template>
                                     <template #no-options>
@@ -141,7 +141,7 @@
                                 >
                                     <template #open-indicator="selectAttributes">
                                         <span v-bind="selectAttributes"
-                                            ><studip-icon shape="arr_1down" size="10"
+                                            ><studip-icon shape="arr_1down" :size="10"
                                         /></span>
                                     </template>
                                     <template #no-options>
diff --git a/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue b/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
index a410740..e52b608 100644
--- a/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareKeyPointBlock.vue
@@ -38,7 +38,7 @@
                             v-model="currentColor"
                         >
                             <template #open-indicator="selectAttributes">
-                                <span v-bind="selectAttributes"><studip-icon shape="arr_1down" size="10" /></span>
+                                <span v-bind="selectAttributes"><studip-icon shape="arr_1down" :size="10" /></span>
                             </template>
                             <template #no-options>
                                 {{ $gettext('Es steht keine Auswahl zur Verfügung.') }}
@@ -57,7 +57,7 @@
                         {{ $gettext('Icon') }}
                         <studip-select :options="icons" :clearable="false" v-model="currentIcon">
                             <template #open-indicator="selectAttributes">
-                                <span v-bind="selectAttributes"><studip-icon shape="arr_1down" size="10" /></span>
+                                <span v-bind="selectAttributes"><studip-icon shape="arr_1down" :size="10" /></span>
                             </template>
                             <template #no-options>
                                 {{ $gettext('Es steht keine Auswahl zur Verfügung.') }}
-- 
cgit v1.0


From 56018dcad34e9d464d387ce1ad4e70c934c87fba Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 2 Apr 2024 10:58:21 +0000
Subject: fixes #3925

Closes #3925

Merge request studip/studip!2780
---
 app/controllers/my_courses.php        | 22 ++++++----------------
 app/views/my_courses/courseexport.php |  6 ++++++
 lib/classes/MyRealmModel.php          |  4 +++-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index 410947b..cff0933 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -131,26 +131,16 @@ class MyCoursesController extends AuthenticatedController
             throw new AccessDeniedException();
         }
 
-        $this->with_modules = Request::bool('modules');
-
-        $this->sem_data = Semester::getAllAsArray();
-
-        $this->group_field = 'sem_number';
-
-        // Needed parameters for selecting courses
-        $params = [
-            'group_field'         => $this->group_field,
+        $template = $this->get_template_factory()->open('my_courses/courseexport');
+        $template->sem_courses = MyRealmModel::getPreparedCourses('', [
+            'group_field'         => 'sem_number',
             'order_by'            => null,
             'order'               => 'asc',
             'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS,
             'deputies_enabled'    => Config::get()->DEPUTIES_ENABLE,
-        ];
-
-        $this->sem_courses  = MyRealmModel::getPreparedCourses('all', $params);
-
-        $factory  = $this->get_template_factory();
-        $template = $factory->open('my_courses/courseexport');
-        $template->set_attributes($this->get_assigned_variables());
+        ]);
+        $template->sem_data = Semester::getAllAsArray();
+        $template->with_modules = Request::bool('modules');
         $template->image_style = 'height: 6px; width: 8px;';
 
         $doc = new ExportPDF();
diff --git a/app/views/my_courses/courseexport.php b/app/views/my_courses/courseexport.php
index d953187..b08c69d 100644
--- a/app/views/my_courses/courseexport.php
+++ b/app/views/my_courses/courseexport.php
@@ -1,3 +1,9 @@
+<?php
+/**
+ * @var array|null $sem_courses
+ * @var array $sem_data
+ */
+?>
 <html>
     <head>
        <meta charset="UTF-8">
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 8008580..5b7a29b 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -232,7 +232,9 @@ class MyRealmModel
         $current_sem = null;
         foreach ($sem_data as $sem_key => $one_sem) {
             $current_sem = $sem_key;
-            if (!$one_sem['past']) break;
+            if (!$one_sem['past']) {
+                break;
+            }
         }
 
         if (isset($sem_data[$current_sem + 1])) {
-- 
cgit v1.0


From f937f504d5ad86d2ff6040b89937b30c518e7052 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 2 Apr 2024 15:20:49 +0000
Subject: fix #3934

Closes #3934

Merge request studip/studip!2787
---
 lib/models/Courseware/BlockTypes/Folder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/Courseware/BlockTypes/Folder.php b/lib/models/Courseware/BlockTypes/Folder.php
index 2eed4b0..a3ea7d9 100644
--- a/lib/models/Courseware/BlockTypes/Folder.php
+++ b/lib/models/Courseware/BlockTypes/Folder.php
@@ -55,7 +55,7 @@ class Folder extends BlockType
         if ($folder) {
             $typedFolder = $folder->getTypedFolder();
             $payload['folder-type'] = $typedFolder->folder_type;
-            if ($typedFolder->isReadable($user->id)) {   
+            if ($typedFolder->isReadable($user->id) || $typedFolder->folder_type === 'HomeworkFolder') {   
                 foreach ($typedFolder->getFiles() as $folderFile) {
                     $file['id'] = $folderFile->id;
                     $file['attributes'] = [
-- 
cgit v1.0


From 1afde945e2ca96883442fe3f7fe0dd7cbc37c699 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 3 Apr 2024 07:12:42 +0000
Subject: fix #3933

Closes #3933

Merge request studip/studip!2788
---
 resources/vue/components/courseware/toolbar/CoursewareToolbar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
index d31e963..8f82eac 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
@@ -183,8 +183,8 @@ export default {
     },
 
     watch: {
-        containers(oldValue, newValue) {
-            if (oldValue && newValue && oldValue.length !== newValue.length) {
+        containers(newValue, oldValue) {
+            if (newValue) {
                 this.resetAdderStorage();
             }
         },
-- 
cgit v1.0


From 57b7e1aad83db265670c6dad355c37766d629f13 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 3 Apr 2024 07:19:41 +0000
Subject: prevent php-warnings, cleanup php-doc and remove unused variables,
 fixes #3928

Closes #3928

Merge request studip/studip!2783
---
 app/controllers/admin/plugin.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/controllers/admin/plugin.php b/app/controllers/admin/plugin.php
index 903c45e..8a6935b 100644
--- a/app/controllers/admin/plugin.php
+++ b/app/controllers/admin/plugin.php
@@ -86,7 +86,7 @@ class Admin_PluginController extends AuthenticatedController
      * update information is available, an error message is set in
      * this controller and an empty array is returned.
      *
-     * @param array     array of plugin meta data
+     * @param array $plugins array of plugin meta data
      */
     private function get_update_info($plugins)
     {
@@ -127,7 +127,6 @@ class Admin_PluginController extends AuthenticatedController
         }
 
         $plugin_manager = PluginManager::getInstance();
-        $plugin_filter = Request::option('plugin_filter', '');
 
         $plugins = $plugin_manager->getPluginInfos($this->plugin_filter);
 
@@ -200,7 +199,6 @@ class Admin_PluginController extends AuthenticatedController
                         _('Die Position von Plugin "%s" wurde verändert.'),
                         $plugin['name']
                     );
-                    $changed = true;
                 }
             }
         }
@@ -344,7 +342,7 @@ class Admin_PluginController extends AuthenticatedController
     /**
      * Ask for confirmation from the user before deleting a plugin.
      *
-     * @param integer   id of plugin to delete
+     * @param int $plugin_id id of plugin to delete
      */
     public function ask_delete_action($plugin_id)
     {
@@ -366,7 +364,7 @@ class Admin_PluginController extends AuthenticatedController
     /**
      * Completely delete a plugin from the system.
      *
-     * @param integer   id of plugin to delete
+     * @param int $plugin_id id of plugin to delete
      */
     public function delete_action($plugin_id)
     {
@@ -390,7 +388,7 @@ class Admin_PluginController extends AuthenticatedController
     /**
      * Download a ZIP file containing the given plugin.
      *
-     * @param integer   id of plugin to download
+     * @param int $plugin_id id of plugin to download
      */
     public function download_action($plugin_id)
     {
@@ -441,16 +439,16 @@ class Admin_PluginController extends AuthenticatedController
         $update_info = $this->plugin_admin->getUpdateInfo($plugins);
 
         $update = $this->flash['update'];
-        $update_status = [];
-
-        // update each plugin in turn
-        foreach ($update as $id) {
-            if (isset($update_info[$id]['update'])) {
-                try {
-                    $update_url = $update_info[$id]['update']['url'];
-                    $this->plugin_admin->installPluginFromURL($update_url);
-                } catch (PluginInstallationException $ex) {
-                    $update_errors[] = sprintf('%s: %s', $plugins[$id]['name'], $ex->getMessage());
+
+        if (!empty($update)) { // update each plugin in turn
+            foreach ($update as $id) {
+                if (isset($update_info[$id]['update'])) {
+                    try {
+                        $update_url = $update_info[$id]['update']['url'];
+                        $this->plugin_admin->installPluginFromURL($update_url);
+                    } catch (PluginInstallationException $ex) {
+                        $update_errors[] = sprintf('%s: %s', $plugins[$id]['name'], $ex->getMessage());
+                    }
                 }
             }
         }
@@ -473,6 +471,8 @@ class Admin_PluginController extends AuthenticatedController
     /**
      * Show a page describing this plugin's meta data and description,
      * if available.
+     *
+     * @param int $plugin_id if of plugin to show manifest
      */
     public function manifest_action($plugin_id)
     {
@@ -491,7 +491,7 @@ class Admin_PluginController extends AuthenticatedController
     /**
      * migrate a plugin to top version
      *
-     * @param integer   id of plugin to migrate
+     * @param int $plugin_id id of plugin to migrate
      */
     public function migrate_action($plugin_id)
     {
@@ -516,7 +516,7 @@ class Admin_PluginController extends AuthenticatedController
      * register a plugin in database when it
      * already exists in file system
      *
-     * @param integer   number of found plugin
+     * @param int $number number of found plugin
      */
     public function register_action($number)
     {
-- 
cgit v1.0


From b46cd35bca764a7630d684e9684b00c6943f45ce Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 3 Apr 2024 07:24:02 +0000
Subject: fix wrong member-counting, closes #3906

Closes #3906

Merge request studip/studip!2781
---
 app/controllers/admin/courses.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 6f9312d..b8cb83e 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -620,7 +620,7 @@ class Admin_CoursesController extends AuthenticatedController
         }
         if (in_array('members', $activated_fields)) {
             $d['members'] = '<a href="'.URLHelper::getLink('dispatch.php/course/members', ['cid' => $course->id]).'">'
-                .$course->getNumParticipants()
+                .$course->countMembersWithStatus('user autor')
                 .'</a>';
         }
         if (in_array('waiting', $activated_fields)) {
-- 
cgit v1.0


From 47e2f1b784be5eec72b80c29ccdf912cbb121b65 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 3 Apr 2024 07:25:54 +0000
Subject: remove obsolet view, closes #3930

Closes #3930

Merge request studip/studip!2784
---
 app/views/admin/courses/courses.php | 270 ------------------------------------
 1 file changed, 270 deletions(-)
 delete mode 100644 app/views/admin/courses/courses.php

diff --git a/app/views/admin/courses/courses.php b/app/views/admin/courses/courses.php
deleted file mode 100644
index d225270..0000000
--- a/app/views/admin/courses/courses.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/**
- * @var string $selected_action
- * @var array $view_filter
- * @var Semester $semester
- * @var int $count_courses
- * @var string $sortby
- * @var string $sortFlag
- * @var int $nav_elements
- * @var array $courses
- */
-
-$colspan = 2
-?>
-
-<? if (!empty($actions[$selected_action]['multimode'])) : ?>
-    <form action="<?= URLHelper::getLink($actions[$selected_action]['url']) ?>" method="post"
-          <?= !empty($actions[$selected_action]['dialogform']) ? ' data-dialog="auto"' : '' ?>>
-<? endif ?>
-<?= CSRFProtection::tokenTag() ?>
-<table class="default course-admin">
-    <colgroup>
-        <col style="width: 2%">
-    <? if (in_array('number', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 8%">
-    <? endif ?>
-    <? if (in_array('name', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col>
-    <? endif ?>
-    <? if (in_array('type', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 10%">
-    <? endif ?>
-    <? if (in_array('room_time', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 30%">
-    <? endif ?>
-        <? if (in_array('semester', $view_filter)) : ?>
-            <? $colspan++ ?>
-            <col style="width: 10%">
-        <? endif ?>
-        <? if (in_array('institute', $view_filter)) : ?>
-            <? $colspan++ ?>
-            <col style="width: 10%">
-        <? endif ?>
-        <? if (in_array('requests', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 5%">
-    <? endif ?>
-    <? if (in_array('teachers', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 10%">
-    <? endif ?>
-    <? if (in_array('members', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 3%">
-    <? endif ?>
-    <? if (in_array('waiting', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 5%">
-    <? endif ?>
-    <? if (in_array('preliminary', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 5%">
-    <? endif ?>
-    <? if (in_array('contents', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 8%">
-    <? endif ?>
-    <? if (in_array('last_activity', $view_filter)) : ?>
-        <? $colspan++ ?>
-        <col style="width: 8%">
-    <? endif ?>
-        <? foreach (PluginManager::getInstance()->getPlugins("AdminCourseContents") as $plugin) : ?>
-            <? foreach ($plugin->adminAvailableContents() as $index => $label) : ?>
-                <? if (in_array($plugin->getPluginId()."_".$index, $view_filter)) : ?>
-                    <? $colspan++ ?>
-                    <col style="width: 8%">
-                <? endif ?>
-            <? endforeach ?>
-        <? endforeach ?>
-        <col style="width: 15%">
-
-    </colgroup>
-    <caption>
-        <? if (!$GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) : ?>
-            <?= _('Veranstaltungen') ?>
-        <? else : ?>
-            <?= htmlReady(sprintf(_('Veranstaltungen im %s'), $semester->name)) ?>
-        <? endif ?>
-        <span class="actions">
-                <?= sprintf('%u %s', $count_courses, $count_courses > 1 ? _('Veranstaltungen') : _('Veranstaltung')) ?>
-            </span>
-    </caption>
-    <thead>
-    <tr class="sortable">
-    <? if (Config::get()->ADMIN_COURSES_SHOW_COMPLETE): ?>
-        <th <? if ($sortby === 'completion') printf('class="sort%s"', mb_strtolower($sortFlag)) ?>>
-            <a href="<?= URLHelper::getLink('', ['sortby' => 'completion', 'sortFlag' => mb_strtolower($sortFlag)]) ?>" class="course-completion" title="<?= _('Bearbeitungsstatus') ?>">
-                <?= _('Bearbeitungsstatus') ?>
-            </a>
-        </th>
-    <? else: ?>
-        <th>
-            &nbsp;
-        </th>
-    <? endif; ?>
-        <? if (in_array('number', $view_filter)) : ?>
-            <th <?= ($sortby == 'VeranstaltungsNummer') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?=
-                URLHelper::getLink('', ['sortby'   => 'VeranstaltungsNummer',
-                                             'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <?= _('Nr.') ?>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('name', $view_filter)) : ?>
-            <th <?= ($sortby == 'Name') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?=
-                URLHelper::getLink('', ['sortby'   => 'Name',
-                                             'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <?= _('Name') ?>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('type', $view_filter)) : ?>
-            <th <?= ($sortby == 'status') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?=
-                URLHelper::getLink('', ['sortby'   => 'status',
-                                             'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <?= _("VA-Typ") ?>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('room_time', $view_filter)) : ?>
-            <th><?= _('Raum/Zeit') ?></th>
-        <? endif ?>
-        <? if (in_array('semester', $view_filter)) : ?>
-            <th <?= ($sortby == 'start_time') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?= URLHelper::getLink('', ['sortby'   => 'start_time', 'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <?= _('Semester') ?>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('institute', $view_filter)) : ?>
-            <th <?= ($sortby == 'institute') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?= URLHelper::getLink('', ['sortby'   => 'institute', 'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <?= _('Einrichtung') ?>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('requests', $view_filter)) : ?>
-            <th <?= ($sortby == 'requests') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?=
-                URLHelper::getLink('', ['sortby'   => 'requests',
-                                             'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <abbr title="<?= _('Raumanfragen') ?>">
-                        <?= _('RA') ?>
-                    </abbr>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('teachers', $view_filter)) : ?>
-            <th><?= _('Lehrende') ?></th>
-        <? endif ?>
-        <? if (in_array('members', $view_filter)) : ?>
-            <th <?= ($sortby == 'teilnehmer') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?= URLHelper::getLink('', ['sortby'   => 'teilnehmer',
-                                             'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <abbr title="<?= _('Teilnehmende') ?>">
-                        <?= _('TN') ?>
-                    </abbr>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('waiting', $view_filter)) : ?>
-            <th <? if ($sortby == 'waiting') printf('class="sort%s"', mb_strtolower($sortFlag)); ?>>
-                <a href="<?= URLHelper::getLink('', ['sortby'   => 'waiting',
-                                                    'sortFlag' => mb_strtolower($sortFlag)]) ?>">
-                    <?= _('Warteliste') ?>
-                </a>
-            </th>
-        <? endif ?>
-        <? if (in_array('preliminary', $view_filter)) : ?>
-            <th <?= ($sortby == 'prelim') ? sprintf('class="sort%s"', mb_strtolower($sortFlag)) : '' ?>>
-                <a href="<?=
-                URLHelper::getLink('', ['sortby'   => 'prelim',
-                                             'sortFlag' => mb_strtolower($sortFlag)]) ?>"><?= _('Vorläufig') ?></a>
-            </th>
-        <? endif ?>
-        <? if (in_array('contents', $view_filter)) : ?>
-            <th style="width: <?= $nav_elements * 27 ?>px">
-                <?= _('Inhalt') ?>
-            </th>
-        <? endif ?>
-        <? if (in_array('last_activity', $view_filter)) : ?>
-            <th style="width: <?= $nav_elements * 27 ?>px">
-                <?= _('letzte Aktivität') ?>
-            </th>
-        <? endif ?>
-        <? foreach (PluginManager::getInstance()->getPlugins("AdminCourseContents") as $plugin) : ?>
-            <? foreach ($plugin->adminAvailableContents() as $index => $label) : ?>
-                <? if (in_array($plugin->getPluginId()."_".$index, $view_filter)) : ?>
-                    <th style="width: <?= $nav_elements * 27 ?>px"><?= htmlReady($label) ?></th>
-                <? endif ?>
-            <? endforeach ?>
-        <? endforeach ?>
-        <th style="text-align: center" class="actions">
-            <?= _('Aktion') ?>
-        </th>
-    </tr>
-    <? if (!empty($actions[$selected_action]['multimode'])) : ?>
-        <?= $this->render_partial('admin/courses/additional_inputs.php', compact('colspan')) ?>
-        <? if (count($courses) > 10): ?>
-            <tr>
-                <th colspan="<?= $colspan ?>" style="text-align: right">
-                    <? if (is_a($actions[$selected_action]['multimode'], "\\Studip\\Button")) : ?>
-                        <?= $actions[$selected_action]['multimode'] ?>
-                    <? else : ?>
-                        <?= Studip\Button::createAccept(
-                                is_string($actions[$selected_action]['multimode'])
-                                    ? $actions[$selected_action]['multimode']
-                                    : $actions[$selected_action]['title'],
-                                'save_action',
-                                $selected_action == 16 ? ['data-dialog' => 1] : null) ?>
-                    <? endif ?>
-                </th>
-            </tr>
-        <? endif; ?>
-    <? endif ?>
-    </thead>
-    <tbody>
-    <? foreach ($courses as $semid => $values) : ?>
-        <?= $this->render_partial('admin/courses/_course',
-            [
-                'semid' => $semid,
-                'values' => $values,
-                'view_filter' => $view_filter,
-                'actions' => $actions,
-                'selected_action' => $selected_action,
-                'courses' => $courses,
-                'parent' => $parent ?? null
-            ]
-        ) ?>
-    <? endforeach ?>
-    </tbody>
-<? if (!empty($actions[$selected_action]['multimode'])) : ?>
-    <tfoot>
-        <tr>
-            <td colspan="<?= $colspan ?>" style="text-align: right">
-                <? if (is_a($actions[$selected_action]['multimode'], "\\Studip\\Button")) : ?>
-                    <?= $actions[$selected_action]['multimode'] ?>
-                <? else : ?>
-                    <?= Studip\Button::createAccept(
-                        is_string($actions[$selected_action]['multimode'])
-                            ? $actions[$selected_action]['multimode']
-                            : $actions[$selected_action]['title'],
-                        $actions[$selected_action]['name'],
-                        $selected_action == 16 ? ['data-dialog' => 1] : null) ?>
-                <? endif ?>
-            </td>
-        </tr>
-    </tfoot>
-    <? endif ?>
-</table>
-<? if (!empty($actions[$selected_action]['multimode'])) : ?>
-</form>
-<? endif ?>
-- 
cgit v1.0


From 4aba8064ca402ae834bb244237579ec51f5ada51 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 3 Apr 2024 07:28:07 +0000
Subject: Resolve "Barrierefreiheit: Leeres alt-Attribut bei Verwendung von
 studip-icon"

Closes #3931

Merge request studip/studip!2785
---
 resources/vue/components/StudipIcon.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/vue/components/StudipIcon.vue b/resources/vue/components/StudipIcon.vue
index 9ca1c7b..5e27372 100644
--- a/resources/vue/components/StudipIcon.vue
+++ b/resources/vue/components/StudipIcon.vue
@@ -9,6 +9,7 @@
         :role="ariaRole"
         v-bind="$attrs"
         v-on="$listeners"
+        :alt="$attrs.alt ?? ''"
     />
     <img v-else
          :src="url"
@@ -17,6 +18,7 @@
          :role="ariaRole"
          v-bind="$attrs"
          v-on="$listeners"
+         :alt="$attrs.alt ?? ''"
     />
 </template>
 
-- 
cgit v1.0


From d9792e42ee0f4121de5dc2ba5fb7bd74bb5080ce Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 3 Apr 2024 07:38:13 +0000
Subject: fix #3908

Closes #3908

Merge request studip/studip!2775
---
 .../unit/CoursewareUnitItemDialogLayout.vue        | 119 +++++++++++++--------
 1 file changed, 77 insertions(+), 42 deletions(-)

diff --git a/resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue b/resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue
index f956e47..572e171 100644
--- a/resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue
+++ b/resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue
@@ -1,11 +1,11 @@
 <template>
-        <studip-dialog
+    <studip-dialog
         :title="$gettext('Darstellung')"
         :confirmText="$gettext('Speichern')"
         confirmClass="accept"
         :closeText="$gettext('Schließen')"
         closeClass="cancel"
-        height="470"
+        height="540"
         width="870"
         @close="$emit('close')"
         @confirm="storeLayout"
@@ -23,12 +23,8 @@
                     <label v-if="showPreviewImage">
                         <button class="button" @click="deleteImage">{{ $gettext('Bild löschen') }}</button>
                     </label>
-                    <courseware-companion-box
-                        v-if="uploadFileError"
-                        :msgCompanion="uploadFileError"
-                        mood="sad"
-                    />
-                    <label v-if="!showPreviewImage">
+                    <courseware-companion-box v-if="uploadFileError" :msgCompanion="uploadFileError" mood="sad" />
+                    <template v-if="!showPreviewImage">
                         <img
                             v-if="currentFile"
                             :src="uploadImageURL"
@@ -36,14 +32,32 @@
                             :alt="$gettext('Vorschaubild')"
                         />
                         <div v-else class="cw-structural-element-image-preview-placeholder"></div>
-                        {{ $gettext('Bild hochladen') }}
-                        <input class="cw-file-input" ref="upload_image" type="file" accept="image/*" @change="checkUploadFile" />
-                    </label>
+                        <label>
+                            {{ $gettext('Bild hochladen') }}
+                            <input
+                                class="cw-file-input"
+                                ref="upload_image"
+                                type="file"
+                                accept="image/*"
+                                @change="checkUploadFile"
+                            />
+                        </label>
+                        {{ $gettext('oder') }}
+                        <br />
+                        <button class="button" type="button" @click="showStockImageSelector = true">
+                            {{ $gettext('Aus dem Bilderpool auswählen') }}
+                        </button>
+                        <StockImageSelector
+                            v-if="showStockImageSelector"
+                            @close="showStockImageSelector = false"
+                            @select="onSelectStockImage"
+                        />
+                    </template>
                 </form>
                 <form class="default cw-unit-item-dialog-layout-content-settings" @submit.prevent="">
                     <label>
                         {{ $gettext('Titel') }}
-                        <input type="text" v-model="currentElement.attributes.title"/>
+                        <input type="text" v-model="currentElement.attributes.title" />
                     </label>
                     <label>
                         {{ $gettext('Beschreibung') }}
@@ -62,13 +76,9 @@
                             class="cw-vs-select"
                         >
                             <template #open-indicator="selectAttributes">
-                                <span v-bind="selectAttributes"
-                                    ><studip-icon shape="arr_1down" :size="10"
-                                /></span>
-                            </template>
-                            <template #no-options>
-                                {{ $gettext('Es steht keine Auswahl zur Verfügung') }}.
+                                <span v-bind="selectAttributes"><studip-icon shape="arr_1down" :size="10" /></span>
                             </template>
+                            <template #no-options> {{ $gettext('Es steht keine Auswahl zur Verfügung') }}. </template>
                             <template #selected-option="{ name, hex }">
                                 <span class="vs__option-color" :style="{ 'background-color': hex }"></span
                                 ><span>{{ name }}</span>
@@ -96,19 +106,19 @@
 
 <script>
 import CoursewareCompanionBox from '../layouts/CoursewareCompanionBox.vue';
-
+import StockImageSelector from '../../stock-images/SelectorDialog.vue';
 import colorMixin from '@/vue/mixins/courseware/colors.js';
 import { mapActions, mapGetters } from 'vuex';
 
-
 export default {
     name: 'courseware-unit-item-dialog-layout',
     components: {
-        CoursewareCompanionBox
+        CoursewareCompanionBox,
+        StockImageSelector,
     },
     props: {
         unit: Object,
-        unitElement: Object
+        unitElement: Object,
     },
     mixins: [colorMixin],
     data() {
@@ -120,18 +130,26 @@ export default {
             uploadImageURL: null,
             currentRootLayout: 'default',
             loadingInstance: false,
-        }
+            showStockImageSelector: false,
+            selectedStockImage: null,
+        };
     },
     computed: {
         ...mapGetters({
             context: 'context',
             instanceById: 'courseware-instances/byId',
-            userId: 'userId'
+            userId: 'userId',
         }),
         colors() {
-            return this.mixinColors.filter(color => color.darkmode);
+            return this.mixinColors.filter((color) => color.darkmode);
         },
         image() {
+            if (this.selectedStockImage) {
+                return this.selectedStockImage.attributes['download-urls'].small
+            }
+            if (this.uploadImageURL) {
+                return this.uploadImageURL;
+            }
             return this.currentElement.relationships?.image?.meta?.['download-url'] ?? null;
         },
 
@@ -140,15 +158,14 @@ export default {
         },
         instance() {
             if (this.inCourseContext) {
-                return this.instanceById({id: 'course_' + this.context.id + '_' + this.unit.id});
+                return this.instanceById({ id: 'course_' + this.context.id + '_' + this.unit.id });
             } else {
-                return this.instanceById({id: 'user_' + this.context.id + '_' + this.unit.id});
+                return this.instanceById({ id: 'user_' + this.context.id + '_' + this.unit.id });
             }
-            
         },
         inCourseContext() {
             return this.context.type === 'courses';
-        }
+        },
     },
     methods: {
         ...mapActions({
@@ -162,9 +179,10 @@ export default {
             uploadImageForStructuralElement: 'uploadImageForStructuralElement',
             deleteImageForStructuralElement: 'deleteImageForStructuralElement',
             storeCoursewareSettings: 'storeCoursewareSettings',
+            setStockImageForStructuralElement: 'setStockImageForStructuralElement',
         }),
         async loadUnitInstance() {
-            const context = {type: this.context.type, id: this.context.id, unit: this.unit.id};
+            const context = { type: this.context.type, id: this.context.id, unit: this.unit.id };
             await this.loadInstance(context);
         },
         initData() {
@@ -192,11 +210,13 @@ export default {
             this.$emit('close');
             await this.loadStructuralElement(this.currentElement.id);
             if (
-                this.unitElement.relationships['edit-blocker'].data !== null
-                && this.unitElement.relationships['edit-blocker'].data?.id !== this.userId
+                this.unitElement.relationships['edit-blocker'].data !== null &&
+                this.unitElement.relationships['edit-blocker'].data?.id !== this.userId
             ) {
                 this.companionWarning({
-                    info: this.$gettext('Ihre Änderungen konnten nicht gespeichert werden, die Daten werden bereits von einem anderen Nutzer bearbeitet.')
+                    info: this.$gettext(
+                        'Ihre Änderungen konnten nicht gespeichert werden, die Daten werden bereits von einem anderen Nutzer bearbeitet.'
+                    ),
                 });
                 return false;
             } else {
@@ -207,13 +227,20 @@ export default {
                 this.uploadImageForStructuralElement({
                     structuralElement: this.currentElement,
                     file: this.currentFile,
-                }).then(() => {
-                    this.loadStructuralElement(this.currentElement.id)
-                }).catch((error) => {
-                    console.error(error);
-                    this.companionWarning({
-                        info: this.$gettext('Beim Hochladen der Bilddatei ist ein Fehler aufgetretten.')
+                })
+                    .then(() => {
+                        this.loadStructuralElement(this.currentElement.id);
+                    })
+                    .catch((error) => {
+                        console.error(error);
+                        this.companionWarning({
+                            info: this.$gettext('Beim Hochladen der Bilddatei ist ein Fehler aufgetretten.'),
+                        });
                     });
+            } else if (this.selectedStockImage) {
+                await this.setStockImageForStructuralElement({
+                    structuralElement: this.currentElement,
+                    stockImage: this.selectedStockImage,
                 });
             } else if (this.deletingPreviewImage) {
                 await this.deleteImageForStructuralElement(this.currentElement);
@@ -233,13 +260,21 @@ export default {
                     instance: currentInstance,
                 });
             }
-        }
+        },
+        onSelectStockImage(stockImage) {
+            if (this.$refs?.upload_image) {
+                this.$refs.upload_image.value = null;
+            }
+            this.selectedStockImage = stockImage;
+            this.showStockImageSelector = false;
+            this.deletingPreviewImage = false;
+        },
     },
     async mounted() {
         this.loadingInstance = true;
         await this.loadUnitInstance();
         this.loadingInstance = false;
         this.initData();
-    }
-}
+    },
+};
 </script>
-- 
cgit v1.0


From fe1aecd55bdcdf1250804fcec5416c7e98ada79d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 3 Apr 2024 07:41:46 +0000
Subject: fixes #3926

Closes #3926

Merge request studip/studip!2782
---
 app/controllers/admin/courses.php         | 1 +
 resources/vue/components/AdminCourses.vue | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index b8cb83e..7130cd2 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -604,6 +604,7 @@ class Admin_CoursesController extends AuthenticatedController
         }
         if (in_array('semester', $activated_fields)) {
             $d['semester'] = $course->semester_text;
+            $d['semester_sort'] = $course->start_semester ? $course->start_semester->beginn : 0;
         }
         if (in_array('institute', $activated_fields)) {
             $d['institute'] = $course->home_institut ? $course->home_institut->name : $course->institute;
diff --git a/resources/vue/components/AdminCourses.vue b/resources/vue/components/AdminCourses.vue
index a2f61d7..4c5d79c 100644
--- a/resources/vue/components/AdminCourses.vue
+++ b/resources/vue/components/AdminCourses.vue
@@ -261,6 +261,8 @@ export default {
                     return collator.compare(striptags(a.number), striptags(b.number))
                         || collator.compare(striptags(a.name), striptags(b.name));
                 };
+            } else if (sortby === 'semester') {
+                sortFunction = (a, b) => a.semester_sort - b.semester_sort;
             } else {
                 let is_numeric = true;
                 for (let i in array) {
-- 
cgit v1.0


From 6428892fee35ecc4db24f4ac9102f0d9ea401665 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 3 Apr 2024 07:49:09 +0000
Subject: fix #3918

Closes #3918

Merge request studip/studip!2776
---
 .../structural-element/CoursewareRootContent.vue   | 106 +++++++++++----------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue b/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue
index 1a739a6..15056e4 100644
--- a/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue
+++ b/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue
@@ -16,21 +16,21 @@
     </div>
     <div v-else class="cw-root-content-wrapper">
         <div class="cw-root-content" :class="['cw-root-content-' + rootLayout]">
-            <div class="cw-root-content-img" :style="image">
+            <div class="cw-root-content-img" :style="bgImage">
                 <section class="cw-root-content-description" :style="bgColor">
-                    <img v-if="imageIsSet" class="cw-root-content-description-img" :src="imageURL" />
-                    <template v-else>
+                    <div class="cw-root-content-description-img" :src="imageURL" :style="image"></div>
+                    <template v-if="!imageIsSet">
                         <studip-ident-image
                             class="cw-root-content-description-img"
-                            v-model="identImageCanvas"
-                            :showCanvas="true"
+                            v-model="identImage"
                             :baseColor="bgColorHex"
                             :pattern="structuralElement.attributes.title"
                         />
                         <studip-ident-image
-                            v-model="identImage"
-                            :width="1095"
-                            :height="withTOC ? 300 : 480"
+                            v-model="identBgImage"
+                            class="cw-root-content-description-background-img"
+                            :width="4380"
+                            :height="withTOC ? 1200 : 1920"
                             :baseColor="bgColorHex"
                             :pattern="structuralElement.attributes.title"
                         />
@@ -46,44 +46,28 @@
         </div>
         <div v-if="withTOC" class="cw-root-content-toc">
             <ul class="cw-tiles">
-                <li
-                    v-for="child in childElements"
-                    :key="child.id"
-                    class="tile"
-                    :class="[child.attributes.payload.color]"
-                >
+                <li v-for="child in childElements" :key="child.id">
                     <router-link :to="'/structural_element/' + child.id" :title="child.attributes.title">
-                        <div
-                            v-if="hasImage(child)"
-                            class="preview-image"
-                            :style="getChildStyle(child)"
-                        ></div>
-                        <studip-ident-image
-                            v-else
-                            :baseColor="getColor(child).hex"
-                            :pattern="child.attributes.title"
-                            :showCanvas="true"
-                        />
-                        <div class="description">
-                            <header
-                                :class="[
-                                    child.attributes.purpose !== ''
-                                        ? 'description-icon-' + child.attributes.purpose
-                                        : '',
-                                ]"
-                            >
-                                {{ child.attributes.title || '–' }}
-                            </header>
-                            <div class="description-text-wrapper">
-                                <p>{{ child.attributes.payload.description }}</p>
-                            </div>
-                            <footer>
-                                {{ countChildChildren(child) }}
-                                <translate :translate-n="countChildChildren(child)" translate-plural="Seiten">
-                                    Seite
-                                </translate>
-                            </footer>
-                        </div>
+                        <courseware-tile
+                            tag="div"
+                            :color="child.attributes.payload.color"
+                            :title="child.attributes.title || '–'"
+                            :imageUrl="hasImage(child) ? child.relationships?.image?.meta?.['download-url'] : ''"
+                        >
+                            <template #description>
+                                {{ child.attributes.payload.description }}
+                            </template>
+                            <template #footer>
+                                <p class="cw-root-content-toc-tile-footer">
+                                {{
+                                    $gettextInterpolate(
+                                        $ngettext('%{pages} Seite', '%{pages} Seiten', countChildChildren(child)),
+                                        { pages: countChildChildren(child) }
+                                    )
+                                }}
+                                </p>
+                            </template>
+                        </courseware-tile>
                     </router-link>
                 </li>
             </ul>
@@ -93,6 +77,7 @@
 
 <script>
 import CoursewareCompanionBox from './../layouts/CoursewareCompanionBox.vue';
+import CoursewareTile from './../layouts/CoursewareTile.vue';
 import StudipIdentImage from './../../StudipIdentImage.vue';
 import colorMixin from '@/vue/mixins/courseware/colors.js';
 import { mapActions, mapGetters } from 'vuex';
@@ -100,18 +85,19 @@ import { mapActions, mapGetters } from 'vuex';
 export default {
     name: 'courseware-root-content',
     mixins: [colorMixin],
-    props: {
-        structuralElement: Object,
-        canEdit: Boolean,
-    },
     components: {
         CoursewareCompanionBox,
+        CoursewareTile,
         StudipIdentImage,
     },
+    props: {
+        structuralElement: Object,
+        canEdit: Boolean,
+    },
     data() {
         return {
             identImage: '',
-            identImageCanvas: '',
+            identBgImage: '',
         };
     },
     computed: {
@@ -132,6 +118,18 @@ export default {
             const backgroundURL = this.imageIsSet ? this.imageURL : this.identImage;
 
             style.backgroundImage = 'url(' + backgroundURL + ')';
+            if (!this.imageIsSet) {
+                style.backgroundSize = '100% auto';
+                style.height = '180px';
+            }
+
+            return style;
+        },
+        bgImage() {
+            let style = {};
+            const backgroundURL = this.imageIsSet ? this.imageURL : this.identBgImage;
+
+            style.backgroundImage = 'url(' + backgroundURL + ')';
             style.height = this.withTOC ? '300px' : '480px';
 
             return style;
@@ -180,7 +178,7 @@ export default {
         },
         addPage() {
             this.showElementAddDialog(true);
-        }
+        },
     },
 };
 </script>
@@ -203,9 +201,10 @@ export default {
         top: 8em;
 
         .cw-root-content-description-img {
-            width: 240px;
+            width: 270px;
             height: fit-content;
             margin-right: 2em;
+            background-color: #fff;
         }
         .cw-root-content-description-text {
             max-height: calc(480px - 18em);
@@ -239,6 +238,9 @@ export default {
             max-height: calc(300px - 6em);
         }
     }
+    .cw-root-content-toc-tile-footer {
+        line-height: 4em;
+    }
 }
 .cw-root-content-hint {
     max-width: 1095px;
-- 
cgit v1.0


From e60df65327fc34c641e48d8e6b863d7d3aefa3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCttl=C3=B6ffel?=
 <schuettloeffel@zqs.uni-hannover.de>
Date: Wed, 3 Apr 2024 07:53:41 +0000
Subject: Resolve "Nutzerverwaltung: "gesperrt von" zeigt eigenen Username"

Closes #3932

Merge request studip/studip!2786
---
 app/views/admin/user/edit.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/user/edit.php b/app/views/admin/user/edit.php
index 75ca932..c92efe6 100644
--- a/app/views/admin/user/edit.php
+++ b/app/views/admin/user/edit.php
@@ -29,7 +29,10 @@ use Studip\Button, Studip\LinkButton;
     <? if ($user->locked): ?>
         <br>
         <span style="color: red">
-            (<?= sprintf(_('gesperrt von %s'), htmlReady(get_fullname($user->locked_by))) ?>
+            (<?= htmlReady(sprintf(
+                _('gesperrt von %s'),
+                $user->locked_by ? get_fullname($user->locked_by) : _('unbekannt')
+             )) ?>
         <? if ($user->lock_comment): ?>
             , <?= _('Kommentar') ?>: <?= htmlReady($user->lock_comment) ?>
         <? endif; ?>
-- 
cgit v1.0


From cca50cff7bff7ecb6c7859d6faea2cb932e877e3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 3 Apr 2024 07:58:32 +0000
Subject: fixes #1421

Closes #1421

Merge request studip/studip!2753
---
 app/views/resources/_common/_room_tr.php     | 2 +-
 app/views/room_management/overview/rooms.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/resources/_common/_room_tr.php b/app/views/resources/_common/_room_tr.php
index 37f26d1..1b9f46a 100644
--- a/app/views/resources/_common/_room_tr.php
+++ b/app/views/resources/_common/_room_tr.php
@@ -19,7 +19,7 @@
  *     Defaults to false (do not show actions).
  * $user_has_booking_rights: Boolean: Whether the user for which this template
  *     is rendered has booking rights on the resource (true) or not (false).
- * $show_room_picture: Boolean: Whether to display the room picture or not.
+ * $show_picture: Boolean: Whether to display the room picture or not.
  *     Defaults to false (do not show picture).
  * $additional_properties: Array: Additional properties
  *     that shall be displayed in extra columns.
diff --git a/app/views/room_management/overview/rooms.php b/app/views/room_management/overview/rooms.php
index a6323dc..cdec83e 100644
--- a/app/views/room_management/overview/rooms.php
+++ b/app/views/room_management/overview/rooms.php
@@ -40,7 +40,7 @@
                         'user_has_booking_rights' => $room->userHasBookingRights(
                             $user
                         ),
-                        'show_room_picture' => true,
+                        'show_picture' => true,
                         'additional_columns' => [
                             $room->category->name,
                         ]
-- 
cgit v1.0


From cd51a9d0219e4232c2ac8a9c71f25623df51d2c6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 3 Apr 2024 08:12:24 +0000
Subject: fixes #3895

Closes #3895

Merge request studip/studip!2750
---
 lib/classes/Request.class.php                    | 15 +++-
 tests/unit/lib/classes/RequestParametersTest.php | 94 ++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/lib/classes/Request.class.php b/lib/classes/Request.class.php
index 50ab8c4..c977934 100644
--- a/lib/classes/Request.class.php
+++ b/lib/classes/Request.class.php
@@ -363,7 +363,7 @@ class Request implements ArrayAccess, IteratorAggregate
         //The second format and value is only added
         //when $second_param and $second_format are set
         //and a second value could be retrieved.
-        if ($second_param and $second_format) {
+        if ($second_param && $second_format) {
             $second_value = Request::get($second_param);
             if ($second_value) {
                 $combined_format .= ' ' . $second_format;
@@ -379,11 +379,22 @@ class Request implements ArrayAccess, IteratorAggregate
 
         //Now we return a DateTime object created from the
         //specified date value(s):
-        return DateTime::createFromFormat(
+        $result = DateTime::createFromFormat(
             $combined_format,
             $combined_value,
             $time_zone
         );
+
+        if (
+            $result
+            && !$second_param
+            && !$second_format
+            && !preg_match('/[aAghGHisvu]/', $format) // Ensure no time in format
+        ) {
+            $result->setTime(0, 0);
+        }
+
+        return $result;
     }
 
 
diff --git a/tests/unit/lib/classes/RequestParametersTest.php b/tests/unit/lib/classes/RequestParametersTest.php
index 85194c4..85ef33c 100644
--- a/tests/unit/lib/classes/RequestParametersTest.php
+++ b/tests/unit/lib/classes/RequestParametersTest.php
@@ -33,12 +33,20 @@ class RequestParametersTest extends Codeception\Test\Unit
         $_GET['v3']  = ['root@studip', 'hotte.testfreund', 42, '!"$%&/()'];
         $_POST['v4'] = ['0', '1', '', 'foo'];
 
+        $_GET['date'] = '2025-03-25';
+        $_GET['time'] = '17:39:04';
+        $_GET['datetime'] = '2025-03-25 17:39:04';
+        $_GET['invalid_date'] = 'foobar';
+
         $testconfig = new Config([
             'USERNAME_REGULAR_EXPRESSION' => '/^([a-zA-Z0-9_@.-]{4,})$/',
         ]);
         Config::set($testconfig);
     }
 
+    /**
+     * @covers Request::offsetGet
+     */
     public function testArrayAccess ()
     {
         $request = Request::getInstance();
@@ -49,6 +57,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame($request['c'], '-23');
     }
 
+    /**
+     * @covers Request::set
+     */
     public function testSetParam ()
     {
         Request::set('yyy', 'xyzzy');
@@ -58,6 +69,10 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::getArray('zzz'), [1, 2]);
     }
 
+    /**
+     * @covers Request::get
+     * @covers Request::quoted
+     */
     public function testStringParam ()
     {
         $this->assertNull(Request::get('null'));
@@ -74,6 +89,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertNull(Request::quoted('v2'));
     }
 
+    /**
+     * @covers Request::option
+     */
     public function testOptionParam ()
     {
         $this->assertNull(Request::option('null'));
@@ -82,6 +100,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertNull(Request::option('v1'));
     }
 
+    /**
+     * @covers Request::int
+     */
     public function testIntParam ()
     {
         $this->assertNull(Request::int('null'));
@@ -92,6 +113,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertNull(Request::int('v1'));
     }
 
+    /**
+     * @covers Request::float
+     */
     public function testFloatParam ()
     {
         $this->assertNull(Request::float('null'));
@@ -102,6 +126,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertNull(Request::float('v1'));
     }
 
+    /**
+     * @covers Request::bool
+     */
     public function testBoolParam ()
     {
         $this->assertNull(Request::bool('null'));
@@ -115,6 +142,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertNull(Request::bool('v1'));
     }
 
+    /**
+     * @covers Request::username
+     */
     public function testUsernameParam ()
     {
         $this->assertNull(Request::username('null'));
@@ -124,6 +154,10 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertNull(Request::username('v1'));
     }
 
+    /**
+     * @covers Request::getArray
+     * @covers Request::quotedArray
+     */
     public function testStringArrayParam ()
     {
         $this->assertSame(Request::getArray('null'), []);
@@ -137,6 +171,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::quotedArray('v2'), ['on\\\'e', 'two', 'thr33']);
     }
 
+    /**
+     * @covers Request::optionArray
+     */
     public function testOptionArrayParam ()
     {
         $this->assertSame(Request::optionArray('null'), []);
@@ -145,6 +182,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::optionArray('v2'), [1 => 'two', 2 => 'thr33']);
     }
 
+    /**
+     * @covers Request::intArray
+     */
     public function testIntArrayParam ()
     {
         $this->assertSame(Request::intArray('null'), []);
@@ -153,6 +193,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::intArray('v2'), [0, 0, 0]);
     }
 
+    /**
+     * @covers Request::floatArray
+     */
     public function testFloatArrayParam ()
     {
         $this->assertSame(Request::floatArray('null'), []);
@@ -161,6 +204,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::floatArray('v2'), [0.0, 0.0, 0.0]);
     }
 
+    /**
+     * @covers Request::boolArray
+     */
     public function testBoolArrayParam ()
     {
         $this->assertSame(Request::boolArray('null'), []);
@@ -168,6 +214,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::boolArray('v4'), [false, true, false, true]);
     }
 
+    /**
+     * @covers Request::usernameArray
+     */
     public function testUsernameArrayParam ()
     {
         $this->assertSame(Request::usernameArray('null'), []);
@@ -177,6 +226,9 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertSame(Request::usernameArray('v3'), ['root@studip', 'hotte.testfreund']);
     }
 
+    /**
+     * @covers Request::submitted
+     */
     public function testSubmitted ()
     {
         $this->assertFalse(Request::submitted('null'));
@@ -184,12 +236,54 @@ class RequestParametersTest extends Codeception\Test\Unit
         $this->assertTrue(Request::submitted('v1'));
     }
 
+    /**
+     * @covers Request::submittedSome
+     */
     public function testSubmittedSome ()
     {
         $this->assertFalse(Request::submittedSome('null', 'null'));
         $this->assertTrue(Request::submittedSome('null', 's', 'v'));
     }
 
+    /**
+     * @covers Request::getDateTime
+     */
+    public function testGetDatetimeWithDate()
+    {
+        $date = Request::getDateTime();
+        $this->assertNotFalse($date);
+        $this->assertEquals('2025-03-25 00:00:00', $date->format('Y-m-d H:i:s'));
+    }
+
+    /**
+     * @covers Request::getDateTime
+     */
+    public function testGetDatetimeWithDateAndTime()
+    {
+        $datetime = Request::getDateTime('datetime', 'Y-m-d H:i:s');
+        $this->assertNotFalse($datetime);
+        $this->assertEquals('2025-03-25 17:39:04', $datetime->format('Y-m-d H:i:s'));
+    }
+
+    /**
+     * @covers Request::getDateTime
+     */
+    public function testGetDatetimeWithDateAndTimeInTwoParameters()
+    {
+        $date = Request::getDateTime('date', 'Y-m-d', 'time', 'H:i:s');
+        $this->assertNotFalse($date);
+        $this->assertEquals('2025-03-25 17:39:04', $date->format('Y-m-d H:i:s'));
+    }
+
+    /**
+     * @covers Request::getDateTime
+     */
+    public function testGetDatetimeWithInvalidDate()
+    {
+        $invalid_date = Request::getDateTime('invalid_date');
+        $this->assertFalse($invalid_date);
+    }
+
     public function tearDown(): void
     {
         Config::set(null);
-- 
cgit v1.0


From 58b1b71c787909c981d58efd2362eb3e460bc379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Wed, 3 Apr 2024 08:15:15 +0000
Subject: =?UTF-8?q?Resolve=20#3907=20"Tempor=C3=A4re=20Buchungsrechte:=20R?=
 =?UTF-8?q?echte-=20und=20Buchungszeitraum=20identisch"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3907

Merge request studip/studip!2764
---
 lib/models/resources/Resource.class.php | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/lib/models/resources/Resource.class.php b/lib/models/resources/Resource.class.php
index 531bc4c..92d8107 100644
--- a/lib/models/resources/Resource.class.php
+++ b/lib/models/resources/Resource.class.php
@@ -2296,29 +2296,14 @@ class Resource extends SimpleORMap implements StudipItem
             return 'admin';
         }
 
-        //Check for a temporary permission first:
 
         $perm_string = '';
         $temp_perm   = null;
 
         $begin = time();
         $end   = $begin;
-
-        //If $time range is set and contains two DateTime objects
-        //we can include that in the search for temporary permissions.
-        if ($time_range) {
-            if ($time_range[0] instanceof DateTime) {
-                $begin = $time_range[0]->getTimestamp();
-            } else {
-                $begin = $time_range[0];
-            }
-            if ($time_range[1] instanceof DateTime) {
-                $end = $time_range[1]->getTimestamp();
-            } else {
-                $end = $time_range[1];
-            }
-        }
-
+        //Check for a temporary permission first:
+        //check only against current timestamp
         if (!$permanent_only) {
             $temp_perm = ResourceTemporaryPermission::findOneBySql(
                 '(resource_id = :resource_id) AND (user_id = :user_id)
@@ -2375,8 +2360,18 @@ class Resource extends SimpleORMap implements StudipItem
             $perm_string = $global_perm;
         }
         //Now we must check for global resource locks:
-
         if ($perm_string && $time_range && $this->lockable) {
+
+            if ($time_range[0] instanceof DateTime) {
+                $begin = $time_range[0]->getTimestamp();
+            } else {
+                $begin = $time_range[0];
+            }
+            if ($time_range[1] instanceof DateTime) {
+                $end = $time_range[1]->getTimestamp();
+            } else {
+                $end = $time_range[1];
+            }
             if (GlobalResourceLock::isLocked($begin, $end)) {
                 //A permission level exists for the user.
                 //The user gets "user" permissions in case
-- 
cgit v1.0


From ce63777244a4fa83fda033cd9c9733b1f17e53f7 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Wed, 3 Apr 2024 08:22:24 +0000
Subject: calendar/date/add: add the calendar owner instead of the current user
 as default participant, fixes #3923

Closes #3923

Merge request studip/studip!2777
---
 app/controllers/calendar/date.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/controllers/calendar/date.php b/app/controllers/calendar/date.php
index 72f3a40..eda171b 100644
--- a/app/controllers/calendar/date.php
+++ b/app/controllers/calendar/date.php
@@ -27,9 +27,8 @@ class Calendar_DateController extends AuthenticatedController
             $range_id = $range_and_id[1];
         }
         if (!$range) {
-            //Show the personal calendar of the current user:
+            $range_id = Request::option('user_id', $GLOBALS['user']->id);
             $range = 'user';
-            $range_id = $GLOBALS['user']->id;
         }
 
         $owner = null;
@@ -325,15 +324,12 @@ class Calendar_DateController extends AuthenticatedController
 
         if ($this->date->isNew()) {
             if (!($owner instanceof Course)) {
-                //Assign the date to the calendar of the current user by default:
-                $user = User::findCurrent();
-                if ($user) {
-                    $this->calendar_assignment_items[] = [
-                        'value'     => $user->id,
-                        'name'      => $user->getFullName(),
-                        'deletable' => true
-                    ];
-                }
+                //Assign the date to the calendar of the owner by default:
+                $this->calendar_assignment_items[] = [
+                    'value'     => $owner->id,
+                    'name'      => $owner->getFullName(),
+                    'deletable' => true
+                ];
             }
         } else {
             $exceptions = CalendarDateException::findBySql(
-- 
cgit v1.0


From a636dcb33e542e196ed07daf6b9e41beedab9910 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 3 Apr 2024 11:54:33 +0000
Subject: fixes #3922

Closes #3922

Merge request studip/studip!2792
---
 app/controllers/calendar/contentbox.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/controllers/calendar/contentbox.php b/app/controllers/calendar/contentbox.php
index 8ba5215..89b0ad3 100644
--- a/app/controllers/calendar/contentbox.php
+++ b/app/controllers/calendar/contentbox.php
@@ -78,6 +78,15 @@ class Calendar_ContentboxController extends StudipController
         if ($this->admin) {
             $this->isProfile = $this->single && $this->userRange;
         }
+
+        // Sort dates
+        usort($this->termine, function ($a, $b) {
+            [$a_begin, $a_end] = $this->parseBeginAndEndFromDate($a);
+            [$b_begin, $b_end] = $this->parseBeginAndEndFromDate($b);
+
+            return $a_begin - $b_begin
+                ?: $a_end - $b_end;
+        });
     }
 
     private function parseSeminar($id)
@@ -170,4 +179,23 @@ class Calendar_ContentboxController extends StudipController
             $this->termine[] = $assignment;
         }
     }
+
+    private function parseBeginAndEndFromDate($date): array
+    {
+        if ($date instanceof CalendarDateAssignment) {
+            return [
+                $date->calendar_date->begin,
+                $date->calendar_date->end,
+            ];
+        }
+
+        if ($date instanceof CourseDate || $date instanceof CourseExDate) {
+            return [
+                $date->date,
+                $date->end_time,
+            ];
+        }
+
+        throw new Exception('Invalid date type passed: ' . get_class($date));
+    }
 }
-- 
cgit v1.0


From f0405b97446b04101f2fcfc315bbdb368a6a4183 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 3 Apr 2024 13:17:59 +0000
Subject: fix #2565

Closes #2565

Merge request studip/studip!2463
---
 .../CoursewareStructuralElementDialogImport.vue    |  4 ++-
 resources/vue/mixins/courseware/import.js          | 32 +++++++++++++++-------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue b/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue
index 60b404e..019bbf2 100644
--- a/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue
+++ b/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue
@@ -130,7 +130,6 @@ export default {
             this.importZipFile = event.target.files[0];
             this.setImportFilesProgress(0);
             this.setImportStructuresProgress(0);
-            this.setImportErrors([]);
         },
         async importCoursewareArchiv() {
             this.importAborted = false;
@@ -199,6 +198,9 @@ export default {
 
             await this.importCourseware(courseware, this.currentElement, files, this.importBehavior, null);
         }
+    },
+    mounted() {
+        this.setImportErrors([]);
     }
 }
 </script>
diff --git a/resources/vue/mixins/courseware/import.js b/resources/vue/mixins/courseware/import.js
index a7c9420..547280f 100644
--- a/resources/vue/mixins/courseware/import.js
+++ b/resources/vue/mixins/courseware/import.js
@@ -53,7 +53,6 @@ export default {
             this.elementCounter = await this.countImportElements([element]);
             this.setImportStructuresState('');
             this.importElementCounter = 0;
-            this.setImportErrors([]);
 
             if (importBehavior === 'default') {
                 await this.importStructuralElement([element], rootId, files);
@@ -286,8 +285,14 @@ export default {
                     let new_file = this.file_mapping[files[i].id].new;
                     let payload = JSON.stringify(block.attributes.payload);
 
-                    payload = payload.replaceAll(old_file.id, new_file.id);
-                    payload = payload.replaceAll(old_file.folder.id, new_file.relationships.parent.data.id);
+                    if (new_file) {
+                        payload = payload.replaceAll(old_file.id, new_file.id);
+                        payload = payload.replaceAll(old_file.folder.id, new_file.relationships.parent.data.id);
+                    } else {
+                        payload = payload.replaceAll(old_file.id, '');
+                        payload = payload.replaceAll(old_file.folder.id, '');
+                    }
+                    
 
                     block.attributes.payload = JSON.parse(payload);
                 }
@@ -395,13 +400,20 @@ export default {
 
                         // create new blob with correct type
                         let filedata = zip_filedata.slice(0, zip_filedata.size, files[i].attributes['mime-type']);
-
-                        let file = await this.createFile({
-                            file: files[i],
-                            filedata: filedata,
-                            folder: folders[files[i].folder.id]
-                        });
-                        this.setImportFilesState(this.$gettext('Erzeuge Datei') + ': ' + files[i].attributes.name);
+                        let file = null;
+                        try {
+                            file = await this.createFile({
+                                file: files[i],
+                                filedata: filedata,
+                                folder: folders[files[i].folder.id]
+                            });
+                        } catch (error) {
+                            this.currentImportErrors.push(this.$gettext('Import einer Datei fehlgeschlagen.'));
+                            this.setImportFilesState(this.$gettext('Fehler beim Anlegen der Datei'));
+                        }
+                        if (file !== null) {
+                            this.setImportFilesState(this.$gettext('Erzeuge Datei') + ': ' + files[i].attributes.name);
+                        }
                         this.setImportFilesProgress(parseInt(i / files.length * 100));
 
                         //file mapping
-- 
cgit v1.0


From d425f02d9c336f66ee9744d2b74ffd4c40159a28 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 3 Apr 2024 15:17:20 +0000
Subject: prevent php-warnings, closes #3939

Closes #3939

Merge request studip/studip!2798
---
 app/controllers/course/messenger.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/course/messenger.php b/app/controllers/course/messenger.php
index 3e692aa..710ac87 100644
--- a/app/controllers/course/messenger.php
+++ b/app/controllers/course/messenger.php
@@ -12,16 +12,20 @@ class Course_MessengerController extends AuthenticatedController
 
     public function course_action($thread_id = null)
     {
-        if (Context::get()) {
-            PageLayout::setTitle(Context::get()->getFullName() . ' - ' . _('Blubber'));
+        $context = Context::get();
+
+        if (!$context) {
+            throw new CheckObjectException(_('Sie haben kein Objekt gewählt.'));
         }
 
         if (Navigation::hasItem('/course/blubber')) {
             Navigation::activateItem('/course/blubber');
         }
 
+        PageLayout::setTitle($context->getFullName() . ' - ' . _('Blubber'));
+
         $this->search = '';
-        $this->threads = BlubberThread::findByContext(Context::get()->id, true, Context::getType());
+        $this->threads = BlubberThread::findByContext($context->id, true, Context::getType());
         $this->thread = null;
         $this->threads_more_down = 0;
 
-- 
cgit v1.0


From 3dd0907ffd40825995d1076cacef4f09dcbe4cab Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 07:50:44 +0000
Subject: fixes #3913

Closes #3913

Merge request studip/studip!2794
---
 lib/classes/Siteinfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/Siteinfo.php b/lib/classes/Siteinfo.php
index 4722b93..ba7386b 100644
--- a/lib/classes/Siteinfo.php
+++ b/lib/classes/Siteinfo.php
@@ -580,7 +580,7 @@ class SiteinfoMarkupEngine {
                                          "title" => _("Evaluationen"),
                                          "detail" => "",
                                          "constraint" => Config::get()->VOTE_ENABLE];
-        $indicator['wiki_pages'] = ["query" => "SELECT COUNT(DISTINCT keyword) AS count FROM wiki",
+        $indicator['wiki_pages'] = ["query" => "SELECT COUNT(*) AS count FROM wiki_pages",
                                          "title" => _("Wiki-Seiten"),
                                          "detail" => "",
                                          "constraint" => Config::get()->WIKI_ENABLE];
-- 
cgit v1.0


From 1993c6d18bd593e9679952f00500afdaaa8cafae Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 07:54:27 +0000
Subject: fixes #3935

Closes #3935

Merge request studip/studip!2790
---
 .gitlab-ci.yml                |  2 +-
 docker/build_images.sh        |  1 +
 docker/tests/php74/Dockerfile |  3 ++-
 docker/tests/php82/Dockerfile |  3 ++-
 docker/tests/php83/Dockerfile | 24 ++++++++++++++++++++++++
 5 files changed, 30 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 docker/build_images.sh
 create mode 100644 docker/tests/php83/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d97565e..7172007 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: studip/studip:tests-php8.2
+image: studip/studip:tests-php8.3
 
 variables:
   FF_NETWORK_PER_BUILD: 1
diff --git a/docker/build_images.sh b/docker/build_images.sh
old mode 100644
new mode 100755
index f8feb9f..c5f32f4
--- a/docker/build_images.sh
+++ b/docker/build_images.sh
@@ -9,6 +9,7 @@ build_image () {
   fi
 }
 
+build_image tests/php83 studip:tests-php8.3 &
 build_image tests/php82 studip:tests-php8.2 &
 build_image tests/php74 studip:tests-php7.4 &
 build_image release-cli release-cli &
diff --git a/docker/tests/php74/Dockerfile b/docker/tests/php74/Dockerfile
index 49149a9..b982414 100644
--- a/docker/tests/php74/Dockerfile
+++ b/docker/tests/php74/Dockerfile
@@ -7,10 +7,11 @@ RUN apt update && apt install -y  --no-install-recommends \
     lsb-release \
     zip \
     tar \
+    libwebp-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install php extensions
-RUN docker-php-ext-configure gd --with-jpeg
+RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
 
 # Install npm using nvm
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index f1a5793..27ffb64 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -7,10 +7,11 @@ RUN apt update && apt install -y  --no-install-recommends \
     lsb-release \
     zip \
     tar \
+    libwebp-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install php extensions
-RUN docker-php-ext-configure gd --with-jpeg=/usr/include/
+RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
 
 # Install npm using nvm
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
new file mode 100644
index 0000000..a25e830
--- /dev/null
+++ b/docker/tests/php83/Dockerfile
@@ -0,0 +1,24 @@
+# Setup php, apache and stud.ip
+FROM php:8.3-cli
+
+# Install system requirements
+RUN apt update && apt install -y  --no-install-recommends \
+    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    lsb-release \
+    zip \
+    tar \
+    libwebp-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install php extensions
+RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
+RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+
+# Install npm using nvm
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
-- 
cgit v1.0


From 372c24be996033dc022ebc6851b83d861ccc5785 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 07:58:02 +0000
Subject: resurrect logout message, fixes #3937

Closes #3937

Merge request studip/studip!2791
---
 public/logout.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/logout.php b/public/logout.php
index e18a858..2f8fcd8 100644
--- a/public/logout.php
+++ b/public/logout.php
@@ -30,7 +30,7 @@ page_open(["sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm"
 require_once 'lib/messaging.inc.php';
 
 //nur wenn wir angemeldet sind sollten wir dies tun!
-if ($auth->auth["uid"]!="nobody") {
+if ($auth->auth['uid'] !== 'nobody') {
     $my_messaging_settings = $GLOBALS['user']->cfg->MESSAGING_SETTINGS;
 
     //Wenn Option dafuer gewaehlt, alle ungelsesenen Nachrichten als gelesen speichern
@@ -38,13 +38,13 @@ if ($auth->auth["uid"]!="nobody") {
         Message::markAllAs();
     }
 
-    $logout_user=$user->id;
+    $logout_user = $user->id;
     $_language = $_SESSION['_language'];
     $contrast = UserConfig::get($GLOBALS['user']->id)->USER_HIGH_CONTRAST;
 
     // TODO this needs to be generalized or removed
     //erweiterung cas
-    if ($auth->auth["auth_plugin"] == "cas"){
+    if ($auth->auth['auth_plugin'] === 'cas') {
         $casauth = StudipAuthAbstract::GetInstance('cas');
         $docaslogout = true;
     }
@@ -67,9 +67,14 @@ if ($auth->auth["uid"]!="nobody") {
     if ($contrast) {
         $_SESSION['contrast'] = $contrast;
     }
+
+    PageLayout::postSuccess(
+        _('Sie sind nun aus dem System abgemeldet.'),
+        array_filter([$GLOBALS['UNI_LOGOUT_ADD']])
+    );
 } else {
     $sess->delete();
     page_close();
 }
 
-header("Location:" . URLHelper::getURL("index.php?logout=true"));
+header('Location: ' . URLHelper::getURL('index.php'));
-- 
cgit v1.0


From cb738f5f297b420aa0a2c5370b75f94e7866b479 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 08:00:34 +0000
Subject: fixes #3917

Closes #3917

Merge request studip/studip!2793
---
 .../assets/stylesheets/scss/questionnaire.scss     | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/resources/assets/stylesheets/scss/questionnaire.scss b/resources/assets/stylesheets/scss/questionnaire.scss
index f5e726b..f55b50f 100644
--- a/resources/assets/stylesheets/scss/questionnaire.scss
+++ b/resources/assets/stylesheets/scss/questionnaire.scss
@@ -387,40 +387,6 @@ $width: 270px;
             }
         }
     }
-
-    .centerline {
-        border-top: 1px solid var(--base-color);
-        position: relative;
-        top: 35px;
-        margin-left: -5px;
-        margin-right: -5px;
-        z-index: 2;
-    }
-    .questionnaire-evaluation-circle-container {
-        text-align: center;
-        display: block;
-        .questionnaire-evaluation-circle {
-            width: 70px;
-            height: 70px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            margin-left: auto;
-            margin-right: auto;
-            z-index: 3;
-            position: relative;
-            > .value {
-                border-radius: 100px;
-                color: white;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                background-color: var(--base-color);
-                width: 100%;
-                height: 100%;
-            }
-        }
-    }
 }
 
 .courseselector,
-- 
cgit v1.0


From 6b12e2fbd987a4057c2b9b0c282be08a9fe0ef74 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 08:03:07 +0000
Subject: fixes #3898

Closes #3898

Merge request studip/studip!2795
---
 app/controllers/course/wiki.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 7a3a09e..06317b6 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -282,11 +282,18 @@ class Course_WikiController extends AuthenticatedController
 
     public function allpages_action()
     {
-        Navigation::activateItem('/course/wiki/allpages');
         $this->pages = WikiPage::findBySQL(
             "`range_id` = ? ORDER BY `name` ASC",
             [$this->range->id]
         );
+
+        if (count($this->pages) === 0) {
+            $this->redirect($this->pageURL());
+            return;
+        }
+
+        Navigation::activateItem('/course/wiki/allpages');
+
         if ($GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) {
             $actions = new ActionsWidget();
             $actions->addLink(
-- 
cgit v1.0


From 64b40494949a59e161b4aed4a242c423e56d271b Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 08:16:00 +0000
Subject: disallow turning a regular course into a study group, fixes #3921

Closes #3921

Merge request studip/studip!2797
---
 app/controllers/course/basicdata.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/controllers/course/basicdata.php b/app/controllers/course/basicdata.php
index 8cc7d94..f4f50fe 100644
--- a/app/controllers/course/basicdata.php
+++ b/app/controllers/course/basicdata.php
@@ -956,20 +956,30 @@ class Course_BasicdataController extends AuthenticatedController
     private function _getTypes($sem, $data, &$changable = true)
     {
         $sem_types = [];
+
+        $sem_classes = [];
         if ($GLOBALS['perm']->have_perm("admin")) {
             foreach (SemClass::getClasses() as $sc) {
                 if (!$sc['course_creation_forbidden']) {
-                    $sem_types[$sc['name']] = array_map(function ($st) {
-                        return $st['name'];
-                    }, $sc->getSemTypes());
+                    $sem_classes[] = $sc;
                 }
             }
         } else {
-            $sc = $sem->getSemClass();
+            $sem_classes[] = $sem->getSemClass();
+        }
+
+        if (!$sem->isStudyGroup()) {
+            $sem_classes = array_filter($sem_classes, function (SemClass $sc) {
+                return !$sc['studygroup_mode'];
+            });
+        }
+
+        foreach ($sem_classes as $sc) {
             $sem_types[$sc['name']] = array_map(function ($st) {
                 return $st['name'];
             }, $sc->getSemTypes());
         }
+
         if (!in_array($data['status'], array_flatten(array_values(array_map('array_keys', $sem_types))))) {
             $class_name = $sem->getSemClass()->offsetGet('name');
             if (!isset($sem_types[$class_name])) {
-- 
cgit v1.0


From 8fcf1bd190159b71d201cdb41685c6fb22832f2e Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Thu, 4 Apr 2024 09:55:35 +0000
Subject: =?UTF-8?q?Resolve=20"Umschalten=20der=20Ansicht=20im=20Veranstalt?=
 =?UTF-8?q?ungsverzeichnis=20springt=20wieder=20an=20den=20Anfang=20zur?=
 =?UTF-8?q?=C3=BCck"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3867

Merge request studip/studip!2720
---
 app/controllers/search/courses.php                 | 12 +----
 resources/vue/components/tree/StudipTree.vue       | 29 ++++++++++-
 .../vue/components/tree/StudipTreeViewWidget.vue   | 56 ++++++++++++++++++++++
 3 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 resources/vue/components/tree/StudipTreeViewWidget.vue

diff --git a/app/controllers/search/courses.php b/app/controllers/search/courses.php
index 6ae9d6a..eaf660b 100644
--- a/app/controllers/search/courses.php
+++ b/app/controllers/search/courses.php
@@ -110,17 +110,7 @@ class Search_CoursesController extends AuthenticatedController
         }
 
         $sidebar->addWidget(new VueWidget('search-widget'));
+        $sidebar->addWidget(new VueWidget('views-widget'));
         $sidebar->addWidget(new VueWidget('export-widget'));
-
-        $views = new ViewsWidget();
-        $views->addLink(
-            _('Als Liste'),
-            $this->url_for('search/courses', array_merge($params, ['show_as' => 'list']))
-        )->setActive($this->show_as === 'list');
-        $views->addLink(
-            _('Als Tabelle'),
-            $this->url_for('search/courses', array_merge($params, ['show_as' => 'table']))
-        )->setActive($this->show_as === 'table');
-        $sidebar->addWidget($views);
     }
 }
diff --git a/resources/vue/components/tree/StudipTree.vue b/resources/vue/components/tree/StudipTree.vue
index 136fc95..1678225 100644
--- a/resources/vue/components/tree/StudipTree.vue
+++ b/resources/vue/components/tree/StudipTree.vue
@@ -33,6 +33,11 @@
         <MountingPortal v-if="withSearch" mountTo="#search-widget" name="sidebar-search">
             <search-widget v-if="currentNode" :min-length="3" ref="searchWidget"></search-widget>
         </MountingPortal>
+        <MountingPortal v-if="!editable && !isSearching && !isLoading && currentNode"
+                        mountTo="#views-widget"
+                        name="sidebar-views">
+            <studip-tree-view-widget :config="viewConfig" />
+        </MountingPortal>
     </div>
 </template>
 
@@ -41,6 +46,7 @@ import axios from 'axios';
 import { TreeMixin } from '../../mixins/TreeMixin';
 import StudipProgressIndicator from '../StudipProgressIndicator.vue';
 import SearchWidget from '../SearchWidget.vue';
+import StudipTreeViewWidget from './StudipTreeViewWidget.vue';
 import StudipTreeList from './StudipTreeList.vue';
 import StudipTreeTable from './StudipTreeTable.vue';
 import StudipTreeNode from './StudipTreeNode.vue';
@@ -49,7 +55,13 @@ import TreeSearchResult from './TreeSearchResult.vue';
 export default {
     name: 'StudipTree',
     components: {
-        TreeSearchResult, SearchWidget, StudipProgressIndicator, StudipTreeList, StudipTreeTable, StudipTreeNode
+        TreeSearchResult,
+        SearchWidget,
+        StudipTreeViewWidget,
+        StudipProgressIndicator,
+        StudipTreeList,
+        StudipTreeTable,
+        StudipTreeNode
     },
     mixins: [ TreeMixin ],
     props: {
@@ -163,12 +175,19 @@ export default {
             isLoading: false,
             showStructuralNavigation: false,
             searchConfig: {},
-            isSearching: false
+            isSearching: false,
+            viewConfig: null
         }
     },
     methods: {
         changeCurrentNode(node) {
             this.currentNode = node;
+            this.viewConfig = {
+                view: this.viewType,
+                node: this.currentNode,
+                semester: this.semester,
+                semClass: this.semClass
+            };
             this.$nextTick(() => {
                 document.getElementById('tree-breadcrumb-' + node.attributes.id)?.focus();
             });
@@ -206,6 +225,12 @@ export default {
             this.currentNode = this.startNode;
             this.loaded = true;
             this.isLoading = false;
+            this.viewConfig = {
+                view: this.viewType,
+                node: this.currentNode,
+                semester: this.semester,
+                semClass: this.semClass
+            };
         });
 
         axios.interceptors.request.eject(loadingIndicator);
diff --git a/resources/vue/components/tree/StudipTreeViewWidget.vue b/resources/vue/components/tree/StudipTreeViewWidget.vue
new file mode 100644
index 0000000..30e2d5c
--- /dev/null
+++ b/resources/vue/components/tree/StudipTreeViewWidget.vue
@@ -0,0 +1,56 @@
+<template>
+    <sidebar-widget id="views-widget" class="sidebar-views" :title="$gettext('Ansicht')">
+        <template #content>
+            <ul class="widget-list widget-links sidebar-views">
+                <li :class="{ active: config.view === 'list' }">
+                    <a :href="getUrl('list')"
+                       :title="$gettext('Verzeichnis als Liste anzeigen')"
+                       tabindex="0">
+                        {{ $gettext('Als Liste anzeigen') }}
+                    </a>
+                </li>
+                <li :class="{ active: config.view === 'table' }">
+                    <a :href="getUrl('table')"
+                       :title="$gettext('Verzeichnis als Tabelle anzeigen')"
+                       tabindex="0">
+                        {{ $gettext('Als Tabelle anzeigen') }}
+                    </a>
+                </li>
+            </ul>
+        </template>
+    </sidebar-widget>
+</template>
+
+<script>
+import SidebarWidget from '../SidebarWidget.vue';
+
+export default {
+    name: 'StudipTreeViewWidget',
+    components: {
+        SidebarWidget
+    },
+    props: {
+        config: {
+            type: Object,
+            required: true
+        }
+    },
+    methods: {
+        getUrl(showAs) {
+            const url = new URL(window.location);
+            url.searchParams.set('show_as', showAs);
+            url.searchParams.set('node_id', this.config.node.id);
+
+            if (this.config.semester !== '') {
+                url.searchParams.set('semester', this.config.semester);
+            }
+
+            if (this.config.semClass !== 0) {
+                url.searchParams.set('semclass', this.config.semClass);
+            }
+
+            return url.toString();
+        }
+    }
+}
+</script>
-- 
cgit v1.0


From ea611ecd35d7adc989c622edba64ec51b32d63a5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 09:58:39 +0000
Subject: fixes #3940

Closes #3940

Merge request studip/studip!2799
---
 app/controllers/calendar/contentbox.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/controllers/calendar/contentbox.php b/app/controllers/calendar/contentbox.php
index 89b0ad3..b684905 100644
--- a/app/controllers/calendar/contentbox.php
+++ b/app/controllers/calendar/contentbox.php
@@ -91,17 +91,16 @@ class Calendar_ContentboxController extends StudipController
 
     private function parseSeminar($id)
     {
-        $course = Course::find($id);
-        $this->termine = $course->getDatesWithExdates()->findBy('end_time', [$this->start, $this->start + $this->timespan], '><');
-        foreach ($this->termine as $course_date) {
-            if ($this->course_range) {
-                //Display only date and time:
-                $this->titles[$course_date->id] = $course_date->getFullName('include-room');
-            } else {
-                //Include the course title:
-                $this->titles[$course_date->id] = $course_date->getFullName('verbose');
-            }
-        }
+        // Display only date and time if in course range, include course title
+        // otherwise
+        $date_format = $this->course_range ? 'include-room' : 'verbose';
+
+        $this->termine = Course::find($id)->getDatesWithExdates()
+            ->findBy('end_time', [$this->start, $this->start + $this->timespan], '><')
+            ->map(function ($course_date) use ($date_format) {
+                $this->titles[$course_date->id] = $course_date->getFullName($date_format);
+                return $course_date;
+            });
     }
 
     private function parseUser($id)
-- 
cgit v1.0


From cba3934cff0198686a3a6fe8d14f9878847a4e8c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 11:06:11 +0000
Subject: fixes #3890

Closes #3890

Merge request studip/studip!2741
---
 app/controllers/contact.php                        | 14 ++++++-
 app/views/calendar/calendar/export.php             |  2 +-
 app/views/course/wizard/steps/lvgroups/index.php   | 46 +++++++++++++---------
 lib/classes/MyRealmModel.php                       |  4 +-
 .../coursewizardsteps/BasicDataWizardStep.php      |  4 +-
 .../coursewizardsteps/LVGroupsWizardStep.php       | 25 ++++++------
 .../coursewizardsteps/StudyAreasWizardStep.php     |  2 +-
 lib/plugins/core/CorePlugin.php                    |  2 +-
 8 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/app/controllers/contact.php b/app/controllers/contact.php
index 7dd2b05..2148777 100644
--- a/app/controllers/contact.php
+++ b/app/controllers/contact.php
@@ -189,9 +189,21 @@ class ContactController extends AuthenticatedController
             $user = User::findManyByUsername(Request::getArray('user'));
         }
         if ($group) {
-            $user = User::findMany(Statusgruppen::find($group)->members->pluck('user_id'));
+            $group_object = Statusgruppen::find($group);
+            if (!$group_object) {
+                $this->set_status(404);
+                $this->render_nothing();
+                return;
+            }
+            $user = User::findMany($group_object->members->pluck('user_id'));
         }
         if (!$user) {
+            $user_object = User::findCurrent();
+            if (!$user_object) {
+                $this->set_status(404);
+                $this->render_nothing();
+                return;
+            }
             $user = User::findCurrent()->contacts;
         }
 
diff --git a/app/views/calendar/calendar/export.php b/app/views/calendar/calendar/export.php
index 3fa302e..0ff766d 100644
--- a/app/views/calendar/calendar/export.php
+++ b/app/views/calendar/calendar/export.php
@@ -8,7 +8,7 @@
  */
 ?>
 <form class="default" method="post"
-      action="<?= $controller->link_for('calendar/calendar/export/' . $user_id) ?>">
+      action="<?= $controller->link_for('calendar/calendar/export', $user_id ?? null) ?>">
     <?= CSRFProtection::tokenTag() ?>
     <fieldset>
         <legend><?= _('Termine exportieren') ?></legend>
diff --git a/app/views/course/wizard/steps/lvgroups/index.php b/app/views/course/wizard/steps/lvgroups/index.php
index 744cc94..0d8e196 100644
--- a/app/views/course/wizard/steps/lvgroups/index.php
+++ b/app/views/course/wizard/steps/lvgroups/index.php
@@ -17,25 +17,33 @@
         </li>
     </ul>
 </div>
-<? if (!$values['locked']) : ?>
+<? if (empty($values['locked'])) : ?>
 
-	<div id="lvgroup-tree-open-nodes">
-	<? foreach ($open_lvg_nodes as $opennode) : ?>
-		<input type="hidden" name="open_lvg_nodes[]" value="<?= $opennode; ?>">
-	<? endforeach; ?>
-	</div>
+    <div id="lvgroup-tree-open-nodes">
+    <? foreach ($open_lvg_nodes as $opennode) : ?>
+        <input type="hidden" name="open_lvg_nodes[]" value="<?= $opennode; ?>">
+    <? endforeach; ?>
+    </div>
 
     <div id="studyareas" data-ajax-url="<?= $ajax_url ?>"
         data-forward-url="<?= $no_js_url ?>" data-no-search-result="<?=_('Es wurde kein Suchergebnis gefunden.') ?>">
         <h2><?= _('Lehrveranstaltungsgruppen Suche') ?></h2>
         <div>
             <input type="text" size="40" style="width: auto;" name="search" id="lvgroup-tree-search"
-                   value="<?= $values['searchterm'] ?>">
+                   value="<?= htmlReady($values['searchterm'] ?? '') ?>">
             <span id="lvgroup-tree-search-start">
-                <?= Icon::create('search', 'clickable')->asInput(["name" => 'start_search', "onclick" => "return STUDIP.MVV.CourseWizard.searchTree()", "class" => $search_result?'hidden-no-js':'']) ?>
+                <?= Icon::create('search')->asInput([
+                    'name'    => 'start_search',
+                    'onclick' => 'return STUDIP.MVV.CourseWizard.searchTree()',
+                    'class'   => !empty($search_result) ? 'hidden-no-js' : '',
+                ]) ?>
             </span>
             <span id="lvgroup-tree-search-reset" class="hidden-js">
-                <?= Icon::create('refresh', 'clickable')->asInput(["name" => 'reset_search', "onclick" => "return STUDIP.MVV.CourseWizard.resetSearch()", "class" => $search_result?'':' hidden-no-js']) ?>
+                <?= Icon::create('refresh')->asInput([
+                    'name'    => 'reset_search',
+                    'onclick' => 'return STUDIP.MVV.CourseWizard.resetSearch()',
+                    'class'   => !empty($search_result) ? '' : ' hidden-no-js',
+                ]) ?>
             </span>
         </div>
 
@@ -56,23 +64,25 @@
                 <? $pos_id = 1; ?>
                 <? foreach ((array) $tree as $node) : ?>
                     <? $children = $node->getChildren() ?>
-                    <? if (count($children)) : ?>
-                    <?= $this->render_partial('lvgroups/_node',
-                        ['node' => $node, 'pos_id' => $pos_id++,
-                            'open_nodes' => $open_lvg_nodes ?: [],
-                            'search_result' => $search_result ?: [],
-                            'children' => $node->getChildren()]) ?>
+                    <? if (count($children) > 0) : ?>
+                    <?= $this->render_partial('lvgroups/_node', [
+                        'node'          => $node,
+                        'pos_id'        => $pos_id++,
+                        'open_nodes'    => $open_lvg_nodes ?: [],
+                        'search_result' => $search_result ?? [],
+                        'children'      => $node->getChildren(),
+                    ]) ?>
                     <? endif ?>
                 <? endforeach; ?>
                 </ul>
             </li>
         </ul>
     </div>
-    <? if ($values['open_lvg_nodes']) : ?>
+    <? if (!empty($values['open_lvg_nodes'])) : ?>
     <input type="hidden" name="open_nodes" value="<?= json_encode($values['open_lvg_nodes']) ?>"/>
     <? endif; ?>
-    <? if ($values['searchterm']) : ?>
-    <input type="hidden" name="searchterm" value="<?= $values['searchterm'] ?>"/>
+    <? if (!empty($values['searchterm'])) : ?>
+    <input type="hidden" name="searchterm" value="<?= htmlReady($values['searchterm']) ?>">
     <? endif; ?>
     <script>
     //<!--
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 5b7a29b..f968026 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -283,7 +283,7 @@ class MyRealmModel
     public static function getPreparedCourses($sem = '', $params = [])
     {
         $semesters   = self::getSelectedSemesters($sem);
-        $current_semester_nr = Semester::getIndexById(@Semester::findCurrent()->id);
+        $current_semester_nr = Semester::getIndexById(Semester::findCurrent()->id ?? null);
         $min_sem_key = min($semesters);
         $max_sem_key = max($semesters);
         $group_field = $params['group_field'];
@@ -334,7 +334,7 @@ class MyRealmModel
             $_course['visitdate']      = $visits[$course->id][0]['visitdate'];
             $_course['user_status']    = $user_status;
             $_course['gruppe']         = !$is_deputy ? $member_ships[$course->id]['gruppe'] ?? null : ($deputy ? $deputy->gruppe : null);
-            $_course['sem_number_end'] = $course->isOpenEnded() ? $max_sem_key : Semester::getIndexById($course->end_semester->id);
+            $_course['sem_number_end'] = $course->isOpenEnded() ? $max_sem_key : Semester::getIndexById($course->end_semester->id ?? null);
             $_course['sem_number']     = Semester::getIndexById($course->start_semester->id);
             $_course['tools']          = $course->tools;
             $_course['name']           = $course->name;
diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index 4f424e8..58fb09f 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -356,9 +356,9 @@ class BasicDataWizardStep implements CourseWizardStep
                 htmlReady(get_title_for_status('dozent', 1, $values['coursetype']))
             );
         }
-        if (!$values['lecturers'][$GLOBALS['user']->id] && !$GLOBALS['perm']->have_perm('admin')) {
+        if (empty($values['lecturers'][$GLOBALS['user']->id]) && !$GLOBALS['perm']->have_perm('admin')) {
             if (Config::get()->DEPUTIES_ENABLE) {
-                if (!$values['deputies'][$GLOBALS['user']->id]) {
+                if (empty($values['deputies'][$GLOBALS['user']->id])) {
                     $errors[] = sprintf(
                         _('Sie selbst müssen entweder als %s oder als Vertretung eingetragen sein.'),
                         htmlReady(get_title_for_status('dozent', 1, $values['coursetype']))
diff --git a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
index 22f11ea..f343730 100644
--- a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
+++ b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
@@ -36,7 +36,7 @@ class LVGroupsWizardStep implements CourseWizardStep
         $course_start_time = $values[$step_one_class]['start_time'];
 
         // We only need our own stored values here.
-        $values = $values[__CLASS__];
+        $values = $values[__CLASS__] ?? [];
 
         // Load template from step template directory.
         $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps');
@@ -53,9 +53,12 @@ class LVGroupsWizardStep implements CourseWizardStep
             }
         }
 
-        $selection_details = $values['lvgruppe_selection']['area_details'];
+        $selection_details = $values['lvgruppe_selection']['area_details'] ?? null;
 
-        if ($_SESSION[__CLASS__]['course_start_time'] != $course_start_time) {
+        if (
+            isset($_SESSION[__CLASS__]['course_start_time'])
+            && $_SESSION[__CLASS__]['course_start_time'] != $course_start_time
+        ) {
             // don't store previously opened nodes
             // because we get in trouble if the semester has changed
             $open_nodes = [];
@@ -65,15 +68,15 @@ class LVGroupsWizardStep implements CourseWizardStep
 
         $_SESSION[__CLASS__]['course_start_time'] = $course_start_time;
 
-        $tpl->set_attribute('open_lvg_nodes', $open_nodes);
-        $tpl->set_attribute('selection', $selection);
-        $tpl->set_attribute('selection_details', $selection_details);
-        $tpl->set_attribute('tree', $lvgtree->getRootItem()->getChildren());
+        $tpl->open_lvg_nodes = $open_nodes;
+        $tpl->selection = $selection;
+        $tpl->selection_details = $selection_details;
+        $tpl->tree = $lvgtree->getRootItem()->getChildren();
 
-        $tpl->set_attribute('ajax_url', $values['ajax_url'] ?: URLHelper::getLink('dispatch.php/course/wizard/ajax'));
-        $tpl->set_attribute('no_js_url', $values['no_js_url'] ?: 'dispatch.php/course/wizard/forward/'.$stepnumber.'/'.$temp_id);
-        $tpl->set_attribute('stepnumber', $stepnumber);
-        $tpl->set_attribute('temp_id', $temp_id);
+        $tpl->ajax_url = !empty($values['ajax_url']) ? $values['ajax_url'] : URLHelper::getLink('dispatch.php/course/wizard/ajax');
+        $tpl->no_js_url = !empty($values['no_js_url']) ? $values['no_js_url'] : URLHelper::getURL('dispatch.php/course/wizard/forward/'.$stepnumber.'/'.$temp_id);
+        $tpl->stepnumber = $stepnumber;
+        $tpl->temp_id = $temp_id;
         return $tpl->render();
     }
 
diff --git a/lib/classes/coursewizardsteps/StudyAreasWizardStep.php b/lib/classes/coursewizardsteps/StudyAreasWizardStep.php
index f81ce41..29de617 100644
--- a/lib/classes/coursewizardsteps/StudyAreasWizardStep.php
+++ b/lib/classes/coursewizardsteps/StudyAreasWizardStep.php
@@ -28,7 +28,7 @@ class StudyAreasWizardStep implements CourseWizardStep
     public function getStepTemplate($values, $stepnumber, $temp_id)
     {
         // We only need our own stored values here.
-        $values = $values[get_class($this)];
+        $values = $values[get_class($this)] ?? [];
         // Load template from step template directory.
         $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/course/wizard/steps');
         $tpl = $factory->open('studyareas/index');
diff --git a/lib/plugins/core/CorePlugin.php b/lib/plugins/core/CorePlugin.php
index 7f1aaed..d059f4c 100644
--- a/lib/plugins/core/CorePlugin.php
+++ b/lib/plugins/core/CorePlugin.php
@@ -70,7 +70,7 @@ abstract class CorePlugin
         if (!empty($metadata['description_' . $language])) {
             return $metadata['description_' . $language];
         }
-        $description = $metadata['descriptionlong'] ?? $metadata['description'];
+        $description = $metadata['descriptionlong'] ?? $metadata['description'] ?? '';
 
         if ($this->plugin_info['description_mode'] === 'override_description') {
             return $this->plugin_info['description'];
-- 
cgit v1.0


From 02c08f9df0d68e2dd00846805070cee47f45306a Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Thu, 4 Apr 2024 11:08:36 +0000
Subject: fix #3942

Closes #3942

Merge request studip/studip!2801
---
 lib/models/Courseware/BlockTypes/Text.php              | 2 +-
 lib/models/Courseware/ContainerTypes/ContainerType.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/models/Courseware/BlockTypes/Text.php b/lib/models/Courseware/BlockTypes/Text.php
index 441da89..b728019 100644
--- a/lib/models/Courseware/BlockTypes/Text.php
+++ b/lib/models/Courseware/BlockTypes/Text.php
@@ -192,7 +192,7 @@ class Text extends BlockType
 
             }
 
-            return array();
+            return null;
         });
     }
 }
diff --git a/lib/models/Courseware/ContainerTypes/ContainerType.php b/lib/models/Courseware/ContainerTypes/ContainerType.php
index e358c9c..a4eae29 100644
--- a/lib/models/Courseware/ContainerTypes/ContainerType.php
+++ b/lib/models/Courseware/ContainerTypes/ContainerType.php
@@ -199,7 +199,7 @@ abstract class ContainerType
             foreach ($section['blocks'] as &$block) {
                 $block = $block_map[$block] ?? null;
             }
-            $section['blocks'] = array_filter($section['blocks']);
+            $section['blocks'] = array_values(array_filter($section['blocks']));
         }
 
         return $payload;
-- 
cgit v1.0


From cc60c7073baaaaee9923532318aadfdd0808de4f Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 4 Apr 2024 13:24:27 +0000
Subject: dont store empty room-request-properties, closes #3947

Closes #3947

Merge request studip/studip!2804
---
 app/controllers/course/room_requests.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index ab802b7..14c0179 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -630,7 +630,9 @@ class Course_RoomRequestsController extends AuthenticatedController
 
             //Store the properties:
             foreach ($_SESSION[$request_id]['selected_properties'] as $name => $state) {
-                $this->request->setProperty($name, $state);
+                if (!empty($state)) {
+                    $this->request->setProperty($name, $state);
+                }
             }
 
             // once stored, we can delete the session data for this request
-- 
cgit v1.0


From 8d9e573bf7a66b7eb86e442dd97d802ed26b4e31 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 13:27:05 +0000
Subject: fixes #3944

Closes #3944

Merge request studip/studip!2803
---
 lib/models/OERMaterial.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php
index 94559ef..b0b29ec 100644
--- a/lib/models/OERMaterial.php
+++ b/lib/models/OERMaterial.php
@@ -172,7 +172,7 @@ class OERMaterial extends SimpleORMap
                     $host->fetchRemoteSearch($text, $tag);
                 }
             }
-            StudipCacheFactory::getCache()->read($cache_name, "1", 60);
+            StudipCacheFactory::getCache()->write($cache_name, "1", 60);
         }
     }
 
-- 
cgit v1.0


From cfd7d78c8120cc41fc4f44f25ff44094f2ee5418 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 4 Apr 2024 13:32:48 +0000
Subject: fixes #3943

Closes #3943

Merge request studip/studip!2802
---
 lib/classes/I18NString.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/I18NString.php b/lib/classes/I18NString.php
index 353062e..63e275e 100644
--- a/lib/classes/I18NString.php
+++ b/lib/classes/I18NString.php
@@ -184,7 +184,7 @@ class I18NString implements JsonSerializable
      */
     public function translation($lang)
     {
-        return $this->toArray()[$lang] ?? '';
+        return $this->toArray()[$lang] ?? null;
     }
 
     /**
-- 
cgit v1.0


From 14a70b4425a823fbcf0d04cb2470d38e9bc0e583 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 4 Apr 2024 13:50:37 +0000
Subject: fixes #3949

Closes #3949

Merge request studip/studip!2806
---
 app/controllers/course/courseware.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/course/courseware.php b/app/controllers/course/courseware.php
index 22b124b..f0b873a 100644
--- a/app/controllers/course/courseware.php
+++ b/app/controllers/course/courseware.php
@@ -52,22 +52,20 @@ class Course_CoursewareController extends CoursewareController
 
     public function courseware_action($unit_id = null):  void
     {
-        global $user;
-
         Navigation::activateItem('course/courseware/unit');
         if ($this->unitsNotFound) {
             PageLayout::postMessage(MessageBox::info(_('Es wurde kein Lernmaterial gefunden.')));
             return;
         }
+        $user = User::findCurrent();
         $this->setCoursewareSidebar();
 
-        $this->user_id = $user->id;
         /** @var array<mixed> $last */
-        $last = UserConfig::get($this->user_id)->getValue('COURSEWARE_LAST_ELEMENT');
+        $last = UserConfig::get($user->id)->getValue('COURSEWARE_LAST_ELEMENT');
         $lastStructuralElement = \Courseware\StructuralElement::findOneById($last);
 
         if ($unit_id === null) {
-            if (isset($lastStructuralElement) && $lastStructuralElement->canVisit(User::findCurrent())) {
+            if (isset($lastStructuralElement) && $lastStructuralElement->canVisit($user)) {
                 $this->redirectToFirstUnit('course', Context::getId(), $last);
             } else {
                 $this->redirectToFirstUnit('course', Context::getId(), []);
-- 
cgit v1.0


From 0ef2e3073ef9406b4963901ffe906c1389d3cd4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Thu, 4 Apr 2024 14:00:32 +0000
Subject: =?UTF-8?q?Resolve=20#2956=20"Verlinkung=20bei=20der=20Raumverwalt?=
 =?UTF-8?q?ung=20>=20Aufl=C3=B6sen=20von=20Raumanfragen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #2956

Merge request studip/studip!1990
---
 app/controllers/resources/room_request.php           |  4 ++--
 app/views/course/timesrooms/_roomRequest.php         |  3 +--
 resources/assets/javascripts/lib/extract_callback.js |  5 +++--
 tests/jest/extract_callback.test.js                  | 10 ----------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php
index 6421f23..4c51beb 100644
--- a/app/controllers/resources/room_request.php
+++ b/app/controllers/resources/room_request.php
@@ -1739,8 +1739,8 @@ class Resources_RoomRequestController extends AuthenticatedController
         if ($save_only) {
             // redirect to reload all infos and showing the most current ones
             $this->redirect('resources/room_request/resolve/' . $request_id);
-        } elseif (Request::isDialog() && Context::get()) {
-            $this->response->add_header('X-Dialog-Execute', '{"func": "STUDIP.AdminCourses.App.loadCourse", "payload": "'.Context::get()->id.'"}');
+        } elseif (Request::isDialog() && Context::get()->id) {
+            $this->response->add_header('X-Dialog-Execute', '{"func": "STUDIP.AdminCourses.App.loadCourse", "payload": "' . Context::get()->id . '"}');
         }
     }
 
diff --git a/app/views/course/timesrooms/_roomRequest.php b/app/views/course/timesrooms/_roomRequest.php
index 989fccb..ffa72b0 100644
--- a/app/views/course/timesrooms/_roomRequest.php
+++ b/app/views/course/timesrooms/_roomRequest.php
@@ -93,8 +93,7 @@
                                 ),
                                 _('Diese Anfrage selbst auflösen'),
                                 Icon::create('admin'),
-                                ['title' => _('Diese Anfrage selbst auflösen')],
-                                ['data-dialog' => '1']
+                                ['title' => _('Diese Anfrage selbst auflösen'), 'data-dialog' => '']
                             ) ?>
                         <? endif ?>
                         <? $actionMenu->addLink(
diff --git a/resources/assets/javascripts/lib/extract_callback.js b/resources/assets/javascripts/lib/extract_callback.js
index bf7ac79..a630275 100644
--- a/resources/assets/javascripts/lib/extract_callback.js
+++ b/resources/assets/javascripts/lib/extract_callback.js
@@ -56,8 +56,9 @@ export default function extractCallback(cmd, payload, root = window) {
             }
         }
 
-        if (callback[chunk] === undefined) {
-            throw 'Error: Undefined callback ' + cmd;
+        if (callback === null || callback[chunk] === undefined) {
+            console.log('Error: Undefined callback ' + cmd);
+            return;
         }
 
         if (typeof callback[chunk] === 'function' && parameters !== null) {
diff --git a/tests/jest/extract_callback.test.js b/tests/jest/extract_callback.test.js
index d67d7e6..895aa8d 100644
--- a/tests/jest/extract_callback.test.js
+++ b/tests/jest/extract_callback.test.js
@@ -108,14 +108,4 @@ describe('extract_callback()', () => {
         expect(callback).toHaveBeenCalledWith(['foo', 23]);
     })
 
-
-    test('invalid', () => {
-        expect(() => {
-            extractCallback('callback', {}, {});
-        }).toThrow();
-
-        expect(() => {
-            extractCallback('{}', {}, {});
-        }).toThrow();
-    })
 });
-- 
cgit v1.0


From 0858b8d8dc5be5976aa7e7a42015f11841835b6e Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 4 Apr 2024 14:02:30 +0000
Subject: fixes #3950

Closes #3950

Merge request studip/studip!2808
---
 app/controllers/jsupdater.php | 111 ++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index eb6032d..319edaa 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -290,71 +290,74 @@ class JsupdaterController extends AuthenticatedController
                     ]
                 );
                 $page = WikiPage::find($page_id);
-                if ($page && $page->isEditable()) {
-                    if (
-                        $pageInfo['wiki_editor_status']['focussed'] == $page_id
-                        && !empty($pageInfo['wiki_editor_status']['page_content'])
-                    ) {
-                        $page->content = \Studip\Markup::markAsHtml(
-                            $pageInfo['wiki_editor_status']['page_content']
+                if ($page) {
+                    if ($page->isEditable()) {
+                        if (
+                            $pageInfo['wiki_editor_status']['focussed'] == $page_id
+                            && !empty($pageInfo['wiki_editor_status']['page_content'])
+                        ) {
+                            $page->content = \Studip\Markup::markAsHtml(
+                                $pageInfo['wiki_editor_status']['page_content']
+                            );
+                            $page->store();
+                        }
+                        $onlineData = [
+                            'user_id' => $user->id,
+                            'page_id' => $page_id
+                        ];
+                        $online     = WikiOnlineEditingUser::findOneBySQL(
+                            "`user_id` = :user_id AND `page_id` = :page_id",
+                            $onlineData
                         );
-                        $page->store();
-                    }
-                    $onlineData = [
-                        'user_id' => $user->id,
-                        'page_id' => $page_id
-                    ];
-                    $online = WikiOnlineEditingUser::findOneBySQL(
-                        "`user_id` = :user_id AND `page_id` = :page_id",
-                        $onlineData
-                    );
-                    if (!$online) {
-                        $online = WikiOnlineEditingUser::build($onlineData);
-                    }
-                    $editingUsers = WikiOnlineEditingUser::countBySQL(
-                        "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
-                        [$page->id, $user->id]
-                    );
-                    if ($editingUsers > 0) {
-                        $online->editing = 0;
-                    } elseif ($online->editing && $online->editing_request) {
-                        // this is the mode that this user requested the editing mode and was granted to get it:
-                        $online->editing_request = 0;
-                    } elseif ($online->editing_request) {
-                        $other_requests = WikiOnlineEditingUser::countBySql("`page_id` = ? AND `editing_request` = 1 AND `user_id` != ?", [
-                            $page->id,
-                            $user->id,
-                        ]);
-                        if ($other_requests === 0) {
-                            $online->editing_request = 0;
-                            $online->editing = 1;
+                        if (!$online) {
+                            $online = WikiOnlineEditingUser::build($onlineData);
                         }
-                    } else {
-                        if ($pageInfo['wiki_editor_status']['focussed'] == $page_id) {
-                            $online->editing = 1;
-                        } else {
-                            $other_users = WikiOnlineEditingUser::countBySql("`page_id` = ? AND `user_id` != ?", [
+                        $editingUsers = WikiOnlineEditingUser::countBySQL(
+                            "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
+                            [$page->id, $user->id]
+                        );
+                        if ($editingUsers > 0) {
+                            $online->editing = 0;
+                        } else if ($online->editing && $online->editing_request) {
+                            // this is the mode that this user requested the editing mode and was granted to get it:
+                            $online->editing_request = 0;
+                        } else if ($online->editing_request) {
+                            $other_requests = WikiOnlineEditingUser::countBySql("`page_id` = ? AND `editing_request` = 1 AND `user_id` != ?", [
                                 $page->id,
                                 $user->id,
                             ]);
-                            if ($other_users === 0) {
-                                // if I'm the only user I don't need to lose the edit mode
+                            if ($other_requests === 0) {
+                                $online->editing_request = 0;
+                                $online->editing         = 1;
+                            }
+                        } else {
+                            if ($pageInfo['wiki_editor_status']['focussed'] == $page_id) {
                                 $online->editing = 1;
                             } else {
-                                $online->editing = 0;
+                                $other_users = WikiOnlineEditingUser::countBySql("`page_id` = ? AND `user_id` != ?", [
+                                    $page->id,
+                                    $user->id,
+                                ]);
+                                if ($other_users === 0) {
+                                    // if I'm the only user I don't need to lose the edit mode
+                                    $online->editing = 1;
+                                } else {
+                                    $online->editing = 0;
+                                }
                             }
                         }
+                        $online->chdate = time();
+                        $online->store();
+                        $data['contents'][$page_id]         = wikiReady($page->content, true, $page->range_id, $page_id);
+                        $data['wysiwyg_contents'][$page_id] = $page->content;
+                        $data['pages'][$page_id]['editing'] = $online->editing;
+                    }
+                    else {
+                        $data['pages'][$page_id]['editing'] = 0;
                     }
-                    $online->chdate = time();
-                    $online->store();
-                    $data['contents'][$page_id] = wikiReady($page->content, true, $page->range_id, $page_id);
-                    $data['wysiwyg_contents'][$page_id] = $page->content;
-                    $data['pages'][$page_id]['editing'] = $online->editing;
-                } else {
-                    $data['pages'][$page_id]['editing'] = 0;
+                    $data['pages'][$page_id]['chdate'] = $page->chdate;
+                    $data['users'][$page_id] = $page->getOnlineUsers();
                 }
-                $data['pages'][$page_id]['chdate'] = $page->chdate;
-                $data['users'][$page_id] = $page->getOnlineUsers();
             }
         }
         return $data;
-- 
cgit v1.0


From 16a6bbe0fd4c2199298d4713a605b0af9f5d1f14 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Thu, 4 Apr 2024 14:05:39 +0000
Subject: fix #3945

Closes #3945

Merge request studip/studip!2807
---
 lib/classes/JsonApi/Routes/Courseware/UnitsCreate.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/classes/JsonApi/Routes/Courseware/UnitsCreate.php b/lib/classes/JsonApi/Routes/Courseware/UnitsCreate.php
index e676507..d913966 100644
--- a/lib/classes/JsonApi/Routes/Courseware/UnitsCreate.php
+++ b/lib/classes/JsonApi/Routes/Courseware/UnitsCreate.php
@@ -100,6 +100,20 @@ class UnitsCreate extends JsonApiController
             'commentable' => 0
         ]);
 
+        \Courseware\Container::create([
+            'structural_element_id' => $struct->id,
+            'owner_id'              => $user->id,
+            'editor_id'             => $user->id,
+            'edit_blocker_id'       => '',
+            'position'              => 0,
+            'container_type'        => 'list',
+
+            'payload' => json_encode([
+                'colspan' => 'full',
+                'sections' => [['name' => _('erstes Element'), 'icon' => '','blocks' => []]]
+            ]),
+        ]);
+
         $unit = \Courseware\Unit::create([
             'range_id' => $range->getRangeId(),
             'range_type' => $range->getRangeType(),
-- 
cgit v1.0


From d3d645245099559f74d49bd8b7b286720869a704 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 5 Apr 2024 06:09:29 +0000
Subject: fix #3948

Closes #3948

Merge request studip/studip!2805
---
 .../scss/courseware/blocks/document.scss           |  1 +
 .../courseware/blocks/CoursewareDocumentBlock.vue  | 34 +++++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/resources/assets/stylesheets/scss/courseware/blocks/document.scss b/resources/assets/stylesheets/scss/courseware/blocks/document.scss
index fb230b2..0c69cda 100644
--- a/resources/assets/stylesheets/scss/courseware/blocks/document.scss
+++ b/resources/assets/stylesheets/scss/courseware/blocks/document.scss
@@ -109,6 +109,7 @@
     .cw-pdf-outer-container {
         position: relative;
         width: 100%;
+        overflow: hidden;
 
         .cw-pdf-content {
             display: flex;
diff --git a/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue b/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue
index 72cfeb3..73f0985 100644
--- a/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue
@@ -131,8 +131,8 @@
                                     </button>
                                     <select v-model="currentScale" :aria-label="$gettext('Zoom')" @change="updateZoom">
                                         <option v-show="false" :value="currentScale">{{ formattedZoom }}%</option>
-                                        <option v-for="(value, index) in scaleValues" :key="index" :value="value">
-                                            {{ value * 100 }}%
+                                        <option v-for="(value, index) in scaleValues" :key="index" :value="value.scale">
+                                            {{ value.name }}
                                         </option>
                                     </select>
                                 </div>
@@ -305,7 +305,7 @@ export default {
             pdfAnnotationLayer: null,
             pdfAnnotation: false,
             pdfRotate: 0,
-            PdfViewer: null,
+            pdfViewer: null,
             pdfEventBus: null,
             pdfLinkService: null,
             pdfFindController: null,
@@ -322,8 +322,8 @@ export default {
             pageNum: 1,
             pageCount: 0,
             scale: 1,
+            baseScale: 1,
             currentScale: 1,
-            scaleValues: [0.5, 1, 1.5, 2, 3, 4],
             file: null,
 
             srMessage: '',
@@ -361,10 +361,23 @@ export default {
         formattedZoom() {
             return Number.parseInt(this.scale * 100, 10);
         },
+        scaleValues() {
+            const defaultValues = [
+                { name: '25%', scale: 0.25 },
+                { name: '50%', scale: 0.5 },
+                { name: '75%', scale: 0.75 },
+                { name: '100%', scale: 1.0 },
+                { name: '150%', scale: 1.5 },
+                { name: '200%', scale: 2.0 },
+                { name: '300%', scale: 3.0 },
+            ];
+
+            return defaultValues.concat([{ name: this.$gettext('volle Breite'), scale: this.baseScale }]);
+        },
     },
     watch: {
         scale(newValue) {
-            let overflow = newValue > 1 ? 'auto' : 'hidden';
+            let overflow = newValue > this.baseScale ? 'auto' : 'hidden';
             let container = this.$refs.container;
             container.style.overflow = overflow;
             this.currentScale = newValue;
@@ -473,9 +486,12 @@ export default {
                     .getPage(parseInt(view.pageNum))
                     .then((pdfPage) => {
                         view.pdfPage = pdfPage;
+                        const width = outerContainer.offsetWidth;
+                        view.baseScale = (width / pdfPage.view[2] / 1.33).toFixed(2);
+                        view.scale = view.baseScale;
                         // Creating the page view with default parameters.
                         let defaultViewport = pdfPage.getViewport({
-                            scale: 1.35,
+                            scale: 1.0,
                         });
 
                         view.pdfBasePage = new PDFViewer({
@@ -512,8 +528,6 @@ export default {
                         view.pdfViewer.setPdfPage(view.pdfPage);
                         // Set LinkService viewer
                         view.pdfLinkService.setViewer(view.pdfViewer);
-                        // Set outer container height
-                        outerContainer.style.height = container.offsetHeight + 'px';
                         view.renderPage();
                     })
                     .catch((err) => {
@@ -610,12 +624,12 @@ export default {
             this.updateSrMessage(this.$gettext('gedreht'));
         },
         zoomIn() {
-            this.scale = this.scale < 4 ? (this.scale * 10 + 1) / 10 : this.scale;
+            this.scale = this.scale < 4 ? ((this.scale * 10 + 1) / 10).toFixed(1) : this.scale;
             this.renderPage();
             this.updateSrMessage(this.$gettext('vergrößert'));
         },
         zoomOut() {
-            this.scale = this.scale > 0.1 ? (this.scale * 10 - 1) / 10 : this.scale;
+            this.scale = this.scale > 0.1 ? ((this.scale * 10 - 1) / 10).toFixed(1) : this.scale;
             this.renderPage();
             this.updateSrMessage(this.$gettext('verkleinert'));
         },
-- 
cgit v1.0


From 6b7994e6e9157e0c47b84a4396287fa72c307d95 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 5 Apr 2024 06:17:11 +0000
Subject: refine blubber-compose-dialog, fixes #3952

Closes #3952

Merge request studip/studip!2810
---
 app/controllers/blubber.php                    | 51 +++++++-------
 app/views/blubber/compose.php                  | 92 +++++++++++++++-----------
 resources/assets/stylesheets/scss/blubber.scss | 11 ++-
 templates/blubber/private_context.php          | 12 ++--
 4 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/app/controllers/blubber.php b/app/controllers/blubber.php
index c0490f0..6588014 100644
--- a/app/controllers/blubber.php
+++ b/app/controllers/blubber.php
@@ -135,7 +135,7 @@ class BlubberController extends AuthenticatedController
                     'user_id' => $user_id,
                 ]);
             }
-            $this->redirect("blubber/index/{$blubber->getId()}");
+            $this->relocate("blubber/index/{$blubber->getId()}");
             return;
         }
 
@@ -271,13 +271,12 @@ class BlubberController extends AuthenticatedController
 
         $output = [];
         foreach ($_FILES as $file) {
-            $newfile = null; //is filled below
             $file_ref = null; //is also filled below
 
             if ($file['size']) {
                 $document['user_id'] = $GLOBALS['user']->id;
-                $document['filesize'] = $file['size'];
-
+                $success = false;
+                $url = '';
                 try {
                     $root_dir = Folder::findTopFolder($GLOBALS['user']->id);
                     $root_dir = $root_dir->getTypedFolder();
@@ -339,7 +338,6 @@ class BlubberController extends AuthenticatedController
                     }
                 } catch (Exception $e) {
                     $output['errors'][] = $e->getMessage();
-                    $success = false;
                 }
 
                 if ($success) {
@@ -373,21 +371,22 @@ class BlubberController extends AuthenticatedController
         }
         PageLayout::setTitle(_('Person hinzufügen'));
         if (Request::isPost() && Request::option('user_id')) {
-            $query = "INSERT IGNORE INTO blubber_mentions
-                      SET thread_id = :thread_id,
-                          user_id = :user_id,
-                          external_contact = 0,
-                          mkdate = UNIX_TIMESTAMP()";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                'thread_id' => $thread_id,
-                'user_id' => Request::option('user_id'),
-            ]);
-            $this->response->add_header('X-Dialog-Execute', 'STUDIP.Blubber.refreshThread');
-            $this->response->add_header('X-Dialog-Close', '1');
-            $this->render_json([
-                'thread_id' => $thread_id,
-            ]);
+            $data = [
+                'user_id'          => Request::option('user_id'),
+                'thread_id'        => $thread_id,
+                'external_contact' => 0,
+            ];
+
+            $blubber_mention = BlubberMention::findOneBySQL('user_id = ? AND thread_id = ?', [Request::option('user_id'), $thread_id]);
+
+            if ($blubber_mention) {
+                $blubber_mention->setData($data);
+            } else {
+                $blubber_mention = BlubberMention::create($data);
+            }
+            $blubber_mention->store();
+            $this->relocate('blubber/index/' . $thread_id);
+            return;
         }
     }
 
@@ -408,13 +407,9 @@ class BlubberController extends AuthenticatedController
                 CourseAvatar::getAvatar($course->getId())->createFromUpload('avatar');
             }
 
-            $query = "SELECT user_id
-                      FROM blubber_mentions
-                      WHERE thread_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->thread->id]);
-            foreach ($statement->fetchFirst() as $user_id) {
-                CourseMember::insertCourseMember($course->getId(), $user_id, $user_id === $this->thread['user_id'] ? 'dozent' : 'tutor');
+            $blubber_mentions = BlubberMention::findBySQL('thread_id = ?', [$this->thread->id]);
+            foreach ($blubber_mentions as $blubber_mention) {
+                CourseMember::insertCourseMember($course->getId(), $blubber_mention->user_id, $blubber_mention->user_id === $this->thread['user_id'] ? 'dozent' : 'tutor');
             }
 
             $this->thread['context_type'] = 'course';
@@ -430,7 +425,7 @@ class BlubberController extends AuthenticatedController
                 true
             );
 
-            PageLayout::postSuccess(sprintf(_("Studiengruppe '%s' wurde angelegt."), htmlReady($course['name'])));
+            PageLayout::postSuccess(sprintf(_('Studiengruppe "%s" wurde angelegt.'), htmlReady($course['name'])));
             $this->redirect(URLHelper::getURL('seminar_main.php', ['auswahl' => $course->getId()]));
         }
     }
diff --git a/app/views/blubber/compose.php b/app/views/blubber/compose.php
index 3b8b2a0..3ea46c4 100644
--- a/app/views/blubber/compose.php
+++ b/app/views/blubber/compose.php
@@ -1,68 +1,79 @@
-<form class="default" action="<?= $controller->compose($thread ? $thread->getId() : null) ?>" method="post">
+<?php
+/**
+ * @var BlubberController $controller
+ * @var BlubberThread $thread
+ * @var Contact[] $contacts
+ */
+?>
 
-    <?= CSRFProtection::tokenTag() ?>
+<form class="default" action="<?= $controller->compose($thread ? $thread->getId() : null) ?>" method="post" data-dialog>
 
-    <div <?= !$thread ? "" : 'style="display: none;"' ?>>
-        <div class="file_select_possibilities">
+    <?= CSRFProtection::tokenTag() ?>
 
-            <a href="#" onclick="jQuery('.file_select_possibilities').hide(); jQuery('.private_blubber_composer').show(); return false;">
+    <div class="file_select_possibilities" <?= !$thread ? "" : 'style="display: none;"' ?>>
+        <div>
+            <a href="#"
+               onclick="$('.file_select_possibilities').hide(); $('.private_blubber_composer').show(); return false;">
                 <?= Icon::create('group3')->asImg(50) ?>
                 <?= _('Kontakte') ?>
             </a>
 
-            <a href="<?= $controller->link_for("blubber/index/global") ?>">
+            <a href="<?= $controller->link_for('blubber/index/global') ?>">
                 <?= Icon::create('globe')->asImg(50) ?>
                 <?= _('Öffentlich') ?>
             </a>
 
             <? if (!$GLOBALS['perm']->have_perm('admin')) : ?>
-                <a href="#" onclick="jQuery('.file_select_possibilities').hide(); jQuery('.course_blubber_composer').show(); return false;">
+                <a href="#"
+                   onclick="$('.file_select_possibilities').hide(); $('.course_blubber_composer').show(); return false;">
                     <?= Icon::create('seminar')->asImg(50) ?>
                     <?= _('Veranstaltung') ?>
                 </a>
             <? endif ?>
-
         </div>
     </div>
 
     <div class="course_blubber_composer" style="display: none;">
-    <? if (!$GLOBALS['perm']->have_perm("admin")) : ?>
-        <ul class="clean">
-        <? foreach (CourseMember::findBySQL("INNER JOIN seminare USING (Seminar_id) WHERE user_id = ? ORDER BY seminare.name ASC", [$GLOBALS['user']->id]) as $member) : ?>
-            <li>
-                <a href="<?= $controller->to_course($member['seminar_id']) ?>">
-                    <?= CourseAvatar::getAvatar($member['seminar_id'])->getImageTag(Avatar::SMALL) ?>
-                    <?= htmlReady($member->course['name']) ?>
-                </a>
-            </li>
-        <? endforeach ?>
-        </ul>
-    <? endif ?>
+        <? if (!$GLOBALS['perm']->have_perm('admin')) : ?>
+            <ul class="clean">
+                <? foreach (CourseMember::findBySQL("INNER JOIN seminare USING (Seminar_id) WHERE user_id = ? ORDER BY seminare.name ASC", [$GLOBALS['user']->id]) as $member) : ?>
+                    <li>
+                        <a href="<?= $controller->to_course($member['seminar_id']) ?>">
+                            <?= CourseAvatar::getAvatar($member['seminar_id'])->getImageTag(Avatar::SMALL) ?>
+                            <?= htmlReady($member->course['name']) ?>
+                        </a>
+                    </li>
+                <? endforeach ?>
+            </ul>
+        <? endif ?>
     </div>
 
     <div class="private_blubber_composer" style="display: none;">
-        <label for="blubber_contacts">
-            <?= _('Kontakte') ?>
-        </label>
-        <div class="blubber_composer_select_container">
+
+        <? if (!empty($contacts)) : ?>
+            <div class="blubber_composer_select_container">
             <span class="container">
-                <select name="user_ids[]" class="select2" id="blubber_contacts" multiple>
+                <label>
+                    <?= _('Kontakte') ?>
+                    <select name="user_ids[]" class="select2" id="blubber_contacts" multiple>
                     <? foreach ($contacts as $contact) : ?>
-                        <option value="<?= htmlReady($contact['user_id']) ?>" data-avatar="<?= htmlReady(Avatar::getAvatar($contact['user_id'])->getImageTag(Avatar::SMALL)) ?>">
+                        <option value="<?= htmlReady($contact->user_id) ?>"
+                                data-avatar="<?= htmlReady(Avatar::getAvatar($contact['user_id'])->getImageTag(Avatar::SMALL)) ?>">
                             <?= htmlReady($contact->friend->getFullName()) ?>
                         </option>
                     <? endforeach ?>
                 </select>
+                </label>
             </span>
 
-            <a href="" onClick="$('#blubber_contacts').focus().select2('open'); return false;">
-                <?= Icon::create("search", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
-            </a>
-            <a href="" onClick="$('#blubber_contacts').val(null).trigger('change'); return false;">
-                <?= Icon::create("decline", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
-            </a>
-        </div>
-
+                <a href="" onClick="$('#blubber_contacts').trigger('focus').select2('open'); return false;">
+                    <?= Icon::create('search')->asImg(['class' => 'text-bottom']) ?>
+                </a>
+                <a href="" onClick="$('#blubber_contacts').val(null).trigger('change'); return false;">
+                    <?= Icon::create('decline',)->asImg(['class' => "text-bottom"]) ?>
+                </a>
+            </div>
+        <? endif ?>
         <script>
             jQuery(function ($) {
                 let format = function (state) {
@@ -83,7 +94,6 @@
                 STUDIP.Blubber.Composer.init();
             });
         </script>
-
         <div class=".more_persons">
             <?= _('Weitere Personen') ?>
 
@@ -92,19 +102,21 @@
                     <input type="hidden" name="user_ids[]" :value="user.user_id">
                     <span>{{ user.name }}</span>
                     <a href="#" @click.prevent="removeUser">
-                        <studip-icon shape="trash" :size="20" role="clickable"></studip-icon>
+                        <studip-icon shape="trash"></studip-icon>
                     </a>
                 </li>
             </ul>
+            <quicksearch :searchtype="quicksearch" name="qs" @input="addRange" :placeholder="$gettext('Suchen')"></quicksearch>
             <div class="blubber_composer_select_container">
                 <?= QuickSearch::get('search_user_id', new StandardSearch('user_id'))
-                        ->fireJSFunctionOnSelect('STUDIP.Blubber.Composer.vue.addUser')->render() ?>
+                    ->setInputStyle('width: 90%')
+                    ->fireJSFunctionOnSelect('STUDIP.Blubber.Composer.vue.addUser')->render() ?>
 
-                <a href="" onClick="$('input[name=search_user_id_parameter]').focus(); return false;">
-                    <?= Icon::create("search", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
+                <a href="" onClick="$('input[name=search_user_id_parameter]').trigger('focus'); return false;">
+                    <?= Icon::create('search')->asImg(['class' => "text-bottom"]) ?>
                 </a>
                 <a href="" onClick="STUDIP.Blubber.Composer.vue.clearUsers(); return false;">
-                    <?= Icon::create("decline", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
+                    <?= Icon::create('decline')->asImg(['class' => "text-bottom"]) ?>
                 </a>
             </div>
         </div>
diff --git a/resources/assets/stylesheets/scss/blubber.scss b/resources/assets/stylesheets/scss/blubber.scss
index 1893fd5..ccfec80 100644
--- a/resources/assets/stylesheets/scss/blubber.scss
+++ b/resources/assets/stylesheets/scss/blubber.scss
@@ -447,15 +447,12 @@
 }
 
 
-form.default {
-    .blubber_composer_select_container {
-        input, select, .container {
-            width: calc(100% - 50px);
-            display: inline-block;
-        }
+.blubber_composer_select_container {
+    input, select, .container {
+        width: 90%;
+        display: inline-block;
     }
 }
-
 .float_right {
     float: right;
 }
diff --git a/templates/blubber/private_context.php b/templates/blubber/private_context.php
index 5984f13..b9a5ba9 100644
--- a/templates/blubber/private_context.php
+++ b/templates/blubber/private_context.php
@@ -1,7 +1,7 @@
 <div class="blubber_private_info indented">
 
     <div class="icon">
-        <?= Icon::create("group3", "info")->asImg(50, ['title' => _("Dies ist ein privater Blubber.")]) ?>
+        <?= Icon::create('group3', Icon::ROLE_INFO)->asImg(50, ['title' => _('Dies ist ein privater Blubber.')]) ?>
     </div>
 
     <ul class="clean members">
@@ -13,7 +13,7 @@
                 <? $user = User::find($mention['user_id']) ?>
                 <? if ($user) : ?>
                     <? if ($user->getId() !== $GLOBALS['user']->id && count($mentions) > 2) : ?>
-                        <a class="float_right" href="<?= URLHelper::getLink("dispatch.php/blubber/write_to/".$user->getId()) ?>" data-dialog title="<?= _("Anblubbern") ?>">
+                        <a class="float_right" href="<?= URLHelper::getLink("dispatch.php/blubber/write_to/". $user->getId()) ?>" data-dialog title="<?= _("Anblubbern") ?>">
                             <?= Icon::create("blubber", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
                         </a>
                     <? endif ?>
@@ -23,7 +23,7 @@
                            data-dialog="size=auto"
                            title="<?= _("Gruppe verlassen") ?>"
                            data-confirm="<?= _("Private Konversation wirklich verlassen?") ?>">
-                            <?= Icon::create("door-leave", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
+                            <?= Icon::create('door-leave')->asImg(['class' => 'text-bottom']) ?>
                         </a>
                     <? endif ?>
                     <a href="<?= URLHelper::getLink("dispatch.php/profile", ['username' => $user['username']]) ?>">
@@ -38,8 +38,8 @@
         </li>
         <? endforeach ?>
         <li>
-            <a href="<?= URLHelper::getLink("dispatch.php/blubber/add_member_to_private/".$thread->getId()) ?>" data-dialog>
-                <?= Icon::create("add", "clickable")->asImg(25, ['class' => "text-bottom"]) ?>
+            <a href="<?= URLHelper::getLink("dispatch.php/blubber/add_member_to_private/".$thread->getId()) ?>" data-dialog="width=600;height=300">
+                <?= Icon::create('add')->asImg(25, ['class' => 'text-bottom']) ?>
             </a>
         </li>
     </ul>
@@ -53,4 +53,4 @@
             <?= _("Aus diesem Blubber eine Studiengruppe machen.") ?>
         </a>
     </div>
-<? endif ?>
\ No newline at end of file
+<? endif ?>
-- 
cgit v1.0


From 6e4031571ca4ce1ed59bc1d936fa4c473375b8d1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 07:30:46 +0000
Subject: fixes #3951

Closes #3951

Merge request studip/studip!2809
---
 resources/assets/stylesheets/scss/talk-bubble.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/assets/stylesheets/scss/talk-bubble.scss b/resources/assets/stylesheets/scss/talk-bubble.scss
index bc44600..380fb6d 100644
--- a/resources/assets/stylesheets/scss/talk-bubble.scss
+++ b/resources/assets/stylesheets/scss/talk-bubble.scss
@@ -8,6 +8,13 @@ $ownColor: var(--petrol-40);
 
     .talk-bubble-avatar {
         padding: 8px;
+        width: 40px;
+        height: 40px;
+
+        img {
+            width: 100%;
+            height: 100%;
+        }
     }
 
     .talk-bubble {
@@ -136,4 +143,4 @@ $ownColor: var(--petrol-40);
             flex-direction: row-reverse;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.0


From ce29a764567cfdd792e1fe7b5e0bfb06d2f278e3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 07:32:39 +0000
Subject: fixes #3946

Closes #3946

Merge request studip/studip!2811
---
 app/controllers/my_courses.php |  2 +-
 lib/classes/MyRealmModel.php   |  2 +-
 lib/models/Course.class.php    | 22 +++++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index cff0933..9e8e0b6 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -190,7 +190,7 @@ class MyCoursesController extends AuthenticatedController
                            LEFT JOIN `mvv_lvgruppe` AS ml ON (mls.`lvgruppe_id` = ml.`lvgruppe_id`)
                            LEFT JOIN `mvv_lvgruppe_modulteil` AS mlm on(mls.`lvgruppe_id` = mlm.`lvgruppe_id`)
                            LEFT JOIN `mvv_modulteil` AS mmt ON (mlm.`modulteil_id` = mmt.`modulteil_id`)
-                           LEFT JOIN `mvv_modul` AS mm ON (mmt.`modul_id` = mm.`modul_id`)";
+                           LEFT JOIN `mvv_modul` AS mm ON (mmt.`modul_id` = mm.`modul_id` AND mm.`stat` = 'genehmigt')";
 
         }
 
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index f968026..0279fe5 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -788,7 +788,7 @@ class MyRealmModel
         foreach ($sem_courses as $sem_key => $collection) {
             $_tmp_courses[$sem_key] = [];
             foreach ($collection as $course) {
-                $modules = Course::getMVVModulesForCourseId($course['seminar_id']);
+                $modules = Course::getMVVModulesForCourseId($course['seminar_id'], ['genehmigt']);
                 if ($modules) {
                     $modules = array_map(function (Modul $module) {
                         return $module->getDisplayName();
diff --git a/lib/models/Course.class.php b/lib/models/Course.class.php
index 59f9b82..bfea7a0 100644
--- a/lib/models/Course.class.php
+++ b/lib/models/Course.class.php
@@ -306,19 +306,27 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe
     /**
      * Returns the associated mvv modules for a given course id.
      *
-     * @param string $course_id
+     * @param string     $course_id
+     * @param array|null $statusses Limit the results by a given module status
      * @return Modul[]
      */
-    public static function getMVVModulesForCourseId(string $course_id): array
+    public static function getMVVModulesForCourseId(string $course_id, ?array $statusses = null): array
     {
         $query = "SELECT mvv_modul.*
                   FROM mvv_lvgruppe_seminar
-                  JOIN `mvv_lvgruppe` on(`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe`.`lvgruppe_id`)
-                  JOIN `mvv_lvgruppe_modulteil` on(`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe_modulteil`.`lvgruppe_id`)
-                  JOIN `mvv_modulteil` on(`mvv_lvgruppe_modulteil`.`modulteil_id` = `mvv_modulteil`.`modulteil_id`)
-                  JOIN `mvv_modul` on(`mvv_modulteil`.`modul_id` = `mvv_modul`.`modul_id`)
+                  JOIN `mvv_lvgruppe` ON (`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe`.`lvgruppe_id`)
+                  JOIN `mvv_lvgruppe_modulteil` ON (`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe_modulteil`.`lvgruppe_id`)
+                  JOIN `mvv_modulteil` ON (`mvv_lvgruppe_modulteil`.`modulteil_id` = `mvv_modulteil`.`modulteil_id`)
+                  JOIN `mvv_modul` ON (`mvv_modulteil`.`modul_id` = `mvv_modul`.`modul_id`)
                   WHERE seminar_id = ?";
-        return DBManager::get()->fetchAll($query, [$course_id], function ($row) {
+        $parameters = [$course_id];
+
+        if ($statusses !== null) {
+            $query .= ' AND `mvv_modul`.`stat` IN (?)';
+            $parameters[] = $statusses;
+        }
+
+        return DBManager::get()->fetchAll($query, $parameters, function ($row) {
             return Modul::buildExisting($row);
         });
     }
-- 
cgit v1.0


From 813b98c13dc5c44aff3132d7919c73b652b0a7da Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Fri, 5 Apr 2024 09:21:03 +0000
Subject: Resolve "Layout der HTML-Mails"

Closes #2350

Merge request studip/studip!2686
---
 lib/classes/ModulesNotification.class.php |   5 +-
 lib/messaging.inc.php                     |  19 ++--
 templates/mail/html.php                   | 149 ++++++++++++++++++++-------
 templates/mail/notification_html.php      | 162 +++++++++++++++++++++---------
 4 files changed, 249 insertions(+), 86 deletions(-)

diff --git a/lib/classes/ModulesNotification.class.php b/lib/classes/ModulesNotification.class.php
index 324b5c5..3ee6642 100644
--- a/lib/classes/ModulesNotification.class.php
+++ b/lib/classes/ModulesNotification.class.php
@@ -142,12 +142,15 @@ class ModulesNotification
             }
         }
         if (count($news)) {
-            $auth_plugin = User::find($user_id)->auth_plugin;
+            $user = User::find($user_id);
+            $auth_plugin = $user->auth_plugin;
             if (!is_a('StudipAuth' . ucfirst($auth_plugin), 'StudipAuthSSO', true)) {
                 $auth_plugin = null;
             }
             $template = $GLOBALS['template_factory']->open('mail/notification_html');
             $template->set_attribute('lang', getUserLanguagePath($user_id));
+            $template->set_attribute('rec_fullname', $user->getFullname('full'));
+            $template->set_attribute('rec_username', $user->username);
             $template->set_attribute('news', $news);
             $template->set_attribute('sso', $auth_plugin);
 
diff --git a/lib/messaging.inc.php b/lib/messaging.inc.php
index 8f2b6ce..0fb7c3f 100644
--- a/lib/messaging.inc.php
+++ b/lib/messaging.inc.php
@@ -183,7 +183,7 @@ class messaging
         if ($snd_user_id != "____%system%____") {
             $sender = User::find($snd_user_id);
 
-            $snd_fullname = $sender->getFullName();
+            $snd_fullname = $sender->getFullName() . ' (' . $sender->username . ')';
             $reply_to = $sender->Email;
         }
         $attachments = [];
@@ -198,8 +198,8 @@ class messaging
         $template->set_attribute('message', kill_format($message));
         $template->set_attribute('rec_fullname', $rec_fullname);
         $template->set_attribute('rec_email', $to);
+        $template->set_attribute('snd_email', $reply_to);
         if (isset($snd_fullname)) {
-            $template->set_attribute('snd_email', $reply_to);
             $template->set_attribute('snd_fullname', $snd_fullname);
         }
         if ($attachments_as_links) {
@@ -211,9 +211,10 @@ class messaging
         $template->set_attribute('lang', getUserLanguagePath($rec_user_id));
         $template->set_attribute('message', $message);
         $template->set_attribute('rec_fullname', $rec_fullname);
+        $template->set_attribute('rec_username', $receiver->username);
         $template->set_attribute('rec_email', $to);
+        $template->set_attribute('snd_email', $reply_to);
         if (isset($snd_fullname)) {
-            $template->set_attribute('snd_email', $reply_to);
             $template->set_attribute('snd_fullname', $snd_fullname);
         }
         if ($attachments_as_links) {
@@ -296,8 +297,6 @@ class messaging
             // system-signatur
             $snd_user_id = '____%system%____';
             setTempLanguage();
-            $message .= $this->sig_string;
-            $message .= _('Diese Nachricht wurde automatisch vom Stud.IP-System generiert. Sie können darauf nicht antworten.');
 
             restoreLanguage();
         }
@@ -306,11 +305,19 @@ class messaging
         $query = "INSERT INTO message (message_id, autor_id, subject, message, show_adressees, priority, mkdate)
                   VALUES (?, ?, ?, ?, ?, ?, UNIX_TIMESTAMP())";
         $statement = DBManager::get()->prepare($query);
+
+        $internal_message = $message;
+
+        if ($snd_user_id === '____%system%____') {
+            $internal_message .= $this->sig_string . ' ' .
+                _('Diese Nachricht wurde automatisch vom Stud.IP-System generiert. Sie können darauf nicht antworten.');
+        }
+
         $statement->execute([
             $tmp_message_id,
             $snd_user_id,
             $subject,
-            $message,
+            $internal_message,
             (int) $show_adressees,
             $priority,
         ]);
diff --git a/templates/mail/html.php b/templates/mail/html.php
index e737965..cfb4e95 100644
--- a/templates/mail/html.php
+++ b/templates/mail/html.php
@@ -1,38 +1,119 @@
-<?
+<?php
 # Lifter010: TODO
+/**
+ * @var string $snd_fullname
+ * @var string $rec_fullname
+ * @var string $rec_username
+ * @var string $message
+ * @var array $attachments
+ */
 ?>
 <html>
-<head>
-  <?= Assets::stylesheet('studip-base.css') ?>
-</head>
-<body>
-  <div style="background-color: white; margin: auto; width: 700px; padding: 4px;">
-    <?= Assets::img("locale/$lang/LC_PICTURES/mail_header.png") ?>
-    <p>
-      <?= formatReady($message, true, true) ?>
-    </p>
-    <? if (isset($attachments) && count($attachments)) : ?>
-    <hr>
-    <span class="minor">
-      <?=_("Dateianhänge:")?>
-        <ul>
-        <? foreach($attachments as $attachment) : ?>
-       	  <li>
-            <a href="<?= $attachment->getDownloadURL() ?>"><?= htmlReady($attachment->name . ' (' . relsize($attachment->file->size, false) . ')') ?></a>
-          </li>
-        <? endforeach;?>
-     	</ul>
-     </span>
-  	<? endif;?>
-    <hr>
-    <span class="minor">
-        <? if ($snd_fullname) : ?>
-            <?= sprintf(_('Diese E-Mail ist eine Kopie einer systeminternen Nachricht, die in Stud.IP von %s (<a href="%s">%s</a>) an %s (<a href="%s">%s</a>) versendet wurde.'), htmlReady($snd_fullname), htmlReady($snd_email),htmlReady($snd_email), htmlReady($rec_fullname), htmlReady($rec_email),htmlReady($rec_email)) ?>
-        <? else : ?>
-          <?= sprintf(_("Diese E-Mail ist eine Kopie einer systeminternen Nachricht, die in Stud.IP an %s versendet wurde."), htmlReady($rec_fullname)) ?>
-        <? endif ?>
-      <br><?= sprintf(_("Sie erreichen Stud.IP unter %s"), "<a href=\"" . $GLOBALS['ABSOLUTE_URI_STUDIP'] . "\">" . $GLOBALS['ABSOLUTE_URI_STUDIP'] . "</a>") ?>
-    </span>
-  </div>
-</body>
+    <head>
+        <style>
+            body {
+                background-color: #e7ebf1;
+                font-family: 'Lato', Helvetica, Arial, sans-serif;
+            }
+
+            a, a:link, a:visited {
+                color: #28497c;
+                text-decoration: none;
+            }
+            a[href] {
+                transition: color .3s;
+            }
+            a[disabled] {
+                pointer-events: none;
+            }
+
+            a:hover, a:active {
+                color: #d60000;
+                text-decoration: none;
+            }
+
+            .studip-mail {
+                background-color: #ffffff;
+                border: 1px solid #d0d7e3;
+                margin: 25px auto;
+                padding: 10px 25px 25px 25px;
+                width: 700px;
+            }
+
+            .studip-mail header {
+                border-bottom: 1px solid #d0d7e3;
+                text-align: center;
+                padding-bottom: 15px;
+            }
+
+            .studip-mail-header-logo {
+                margin-left: auto;
+                margin-right: auto;
+            }
+
+            .studip-mail-sndrec {
+                margin-top: 0;
+            }
+
+            .studip-mail-message {
+                line-height: 1.33;
+                padding: 15px 25px;
+            }
+
+            .studip-mail footer {
+                border-top: 1px solid #d0d7e3;
+                text-align: center;
+                padding-top: 15px;
+            }
+        </style>
+    </head>
+    <body>
+        <article class="studip-mail">
+            <header>
+                <div class="studip-mail-header-logo" >
+                    <img alt="" width="130" height="92" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkViZW5lXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgODQxLjg5IDU5NS4yOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgODQxLjg5IDU5NS4yOCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cGF0aCBmaWxsPSIjMTM0MDk0IiBkPSJNNzYzLjE3MiwyNDguMzU1YzAtMTcuNjM5LTE0LjMzMS0zMS45NTYtMzEuOTctMzEuOTU2Yy0xNy42NTIsMC0zMS45NDEsMTQuMzE2LTMxLjk0MSwzMS45NTYNCgkJczE0LjI4OSwzMS45NywzMS45NDEsMzEuOTdDNzQ4Ljg0MSwyODAuMzI1LDc2My4xNzIsMjY1Ljk5NCw3NjMuMTcyLDI0OC4zNTUgTTczMS4yMDIsMTYzLjI3Mg0KCQljLTQ2Ljk1OCwwLTg1LjA3NiwzOC4xMTItODUuMDksODUuMDYzaDI1LjM0YzAuMDA2LTMyLjk2NiwyNi43NjItNTkuNzQzLDU5Ljc1LTU5Ljc0M2MzMywwLDU5Ljc3NywyNi43ODMsNTkuNzc3LDU5Ljc2NA0KCQljMCwzMi45ODUtMjYuNzYyLDU5Ljc1Ni01OS43NSw1OS43NjJ2MjUuMzRjNDYuOTc4LTAuMDEzLDg1LjA2My0zOC4xMzksODUuMDYzLTg1LjEwM1M3NzguMTkzLDE2My4yNzIsNzMxLjIwMiwxNjMuMjcyIi8+DQoJPHJlY3QgeD0iNDg2LjkxNiIgeT0iMzk5LjMxOCIgZmlsbD0iI0FFMEEwRCIgd2lkdGg9IjMwLjY0MSIgaGVpZ2h0PSIzMC42NDEiLz4NCgk8Zz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTUxLjAwMiwzODUuNTY3YzEwLjk1MSw5LjUyNCwyNS4yMzYsMTYuMTksMzguMDkzLDE2LjE5YzE0LjUyMiwwLDIxLjY2NC01LjcxNCwyMS42NjQtMTQuOTk4DQoJCQljMC05Ljc2My04LjgwOC0xMi44NTgtMjIuMzgtMTguNTcxbC0xOS45OTgtOC41NzFjLTE2LjE5LTYuNDI5LTMxLjQyNy0xOS43NjEtMzEuNDI3LTQyLjM3OA0KCQkJYzAtMjUuNzEzLDIzLjA5NS00Ni4xODgsNTUuMjM1LTQ2LjE4OGMxNy44NTYsMCwzNi42NjQsNy4xNDIsNDkuOTk2LDIwLjQ3NWwtMTcuNjE3LDIyLjE0MmMtMTAuMjM5LTcuODU4LTIwLTEyLjM4MS0zMi4zOC0xMi4zODENCgkJCWMtMTEuOTA1LDAtMTkuNzYxLDUuMjM5LTE5Ljc2MSwxNC4wNDdjMCw5LjUyNCwxMC4yMzcsMTIuODU2LDIzLjgwOCwxOC4zMzJsMTkuNzYxLDguMDk1DQoJCQljMTguODA4LDcuNjE5LDMwLjcxMiwyMC4yMzcsMzAuNzEyLDQyLjE0MWMwLDI1LjcxMy0yMS40MjcsNDguMDkzLTU4LjMzLDQ4LjA5M2MtMjAuMjM2LDAtNDEuNjY0LTcuNjE5LTU3LjYxNS0yMi4zOA0KCQkJTDUxLjAwMiwzODUuNTY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMTgzLjM3OCwzMzIuMTAzaC0zMi45ODN2LTI3LjYxNWg5OC45NTJ2MjcuNjE1aC0zMi45ODV2OTcuMDM0aC0zMi45ODNWMzMyLjEwM3oiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTI2MS4xNTUsMzA0LjQ4N2gzMi45ODN2NjguMjY5YzAsMjIuMjQ2LDUuNzU0LDMwLjMsMTguNzk0LDMwLjNjMTMuMDQsMCwxOS4xNzctOC4wNTUsMTkuMTc3LTMwLjMNCgkJCXYtNjguMjY5aDMxLjgzNHY2NC40MzVjMCw0Mi41NzItMTYuMTA5LDYyLjUxNS01MS4wMSw2Mi41MTVzLTUxLjc3Ny0xOS45NDMtNTEuNzc3LTYyLjUxNVYzMDQuNDg3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMzc5LjEyMiwzMDQuNDg3aDM2LjgxOWMzNy45NywwLDY0LjA1LDE3LjY0Myw2NC4wNSw2MS43NWMwLDQ0LjEwNS0yNi4wOCw2Mi44OTktNjIuMTMyLDYyLjg5OWgtMzguNzM3DQoJCQlWMzA0LjQ4N3ogTTQxNC4wMjMsNDAyLjY3MmMxOC4wMjcsMCwzMi4yMTgtNy4yODYsMzIuMjE4LTM2LjQzNWMwLTI5LjE0OS0xNC4xOTEtMzUuMjg2LTMyLjIxOC0zNS4yODZoLTEuOTE2djcxLjcyMUg0MTQuMDIzeiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNNTMyLjU1LDI3My45MDZoMzUuMjM2djE1NS4yM0g1MzIuNTVWMjczLjkwNnoiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTU4NC40NDQsMjczLjkwNmg1Ni42NjNjMzMuODA4LDAsNjAuNzEyLDEyLjM4MSw2MC43MTIsNDkuOTk4YzAsMzYuNDI3LTI3Ljg1Niw1Mi42MTUtNjAuNzEyLDUyLjYxNQ0KCQkJaC0yMS40Mjd2NTIuNjE3aC0zNS4yMzVWMjczLjkwNnogTTYzOC45NjQsMzQ4LjY2NWMxOS4yODUsMCwyOC41NjktOC41NzEsMjguNTY5LTI0Ljc2MWMwLTE2LjE5LTkuOTk4LTIyLjE0Mi0yOC41NjktMjIuMTQyDQoJCQloLTE5LjI4NXY0Ni45MDNINjM4Ljk2NHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==">
+                </div>
+                <p class="studip-mail-sndrec">
+                    <?php if ($snd_fullname) : ?>
+                        <?= sprintf(_('%1$s hat Ihnen eine Nachricht in Stud.IP geschickt.'),
+                            htmlReady($snd_fullname), htmlReady($rec_fullname), htmlReady($rec_username)) ?>
+                    <?php else : ?>
+                        <?= sprintf(
+                                _('Stud.IP hat eine automatische Systemnachricht für Sie.'),
+                                htmlReady($rec_fullname),
+                                htmlReady($rec_username)
+                        ) ?>
+                    <?php endif ?>
+                </p>
+            </header>
+            <section class="studip-mail-message">
+                <p>
+                  <?= formatReady($message, true, true) ?>
+                </p>
+                <?php if (isset($attachments) && count($attachments)) : ?>
+                <div class="studip-mail-attachments">
+                  <?= _('Dateianhänge:') ?>
+                    <ul>
+                    <?php foreach($attachments as $attachment) : ?>
+                      <li>
+                        <a href="<?= $attachment->getDownloadURL() ?>"><?= htmlReady($attachment->name .
+                                ' (' . relsize($attachment->file->size, false) . ')') ?></a>
+                      </li>
+                    <?php endforeach ?>
+                    </ul>
+                 </div>
+                <?php endif ?>
+            </section>
+            <footer>
+                <?= sprintf(
+                        _('Diese E-Mail ist eine Kopie einer systeminternen Nachricht, die in Stud.IP an %1$s (%2$s) versendet wurde.'),
+                        htmlReady($rec_fullname),
+                        htmlReady($rec_username)
+                    )
+                ?>
+                <br><?= sprintf(_('Sie erreichen Stud.IP unter %s'),
+                    '<a href="' . $GLOBALS['ABSOLUTE_URI_STUDIP'] . '">' . $GLOBALS['ABSOLUTE_URI_STUDIP'] . '</a>') ?>
+            </footer>
+        </article>
+    </body>
 </html>
diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php
index 5060fb7..48f4cef 100644
--- a/templates/mail/notification_html.php
+++ b/templates/mail/notification_html.php
@@ -1,50 +1,122 @@
 <?
 # Lifter010: TODO
+/**
+ * @var string $rec_fullname
+ * @var string $rec_username
+ * @var array $news
+ * @var string $sso
+ */
 ?>
 <html>
-<head>
-  <?= Assets::stylesheet('studip-base.css') ?>
-</head>
-<body>
-  <div style="background-color: white; margin: auto; max-width: 700px; padding: 4px;">
-    <?= Assets::img("locale/$lang/LC_PICTURES/mail_header_notification.png") ?>
-    <p>
-      <?= _("Sie erhalten hiermit in regelmäßigen Abständen Informationen über Neuigkeiten und Änderungen in belegten Veranstaltungen.") ?>
-      <br><br>
-      <?= _("Über welche Inhalte und in welchem Format Sie informiert werden wollen, können Sie hier einstellen:") ?>
-      <br>
-      <a href="<?= URLHelper::getLink('dispatch.php/settings/notification', ['again' => 'yes', 'sso' => $sso]) ?>">
-        <?= URLHelper::getLink('dispatch.php/settings/notification', ['again' => 'yes', 'sso' => $sso]) ?>
-      </a>
-    </p>
-
-    <table class="default">
-      <? foreach ($news as $sem_titel => $data) : ?>
-        <tr class="table_header_bold">
-          <td colspan="2" style="font-weight: bold;">
-            <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?>">
-              <?= htmlReady($sem_titel) ?>
-              <?= (($semester = get_semester($data[0]['range_id'])) ? ' ('.$semester.')' : '') ?>
-            </a>
-          </td>
-        </tr>
-
-        <? foreach ($data as $module) : ?>
-        <tr class="<?= TextHelper::cycle('hover_odd', 'hover_even') ?>">
-          <td>
-            <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= htmlReady($module['text']) ?></a>
-          </td>
-          <td>
-            <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= $module['icon']->asImg(['title' => $module['text']]) ?></a>
-          </td>
-        </tr>
-        <? endforeach ?>
-      <? endforeach ?>
-    </table>
-    <hr>
-    <span class="minor">
-      <?= _("Diese Nachricht wurde automatisch vom Stud.IP-System generiert. Sie können darauf nicht antworten.") ?>
-    </span>
-  </div>
-</body>
+    <head>
+        <style>
+            body {
+                background-color: #e7ebf1;
+                font-family: 'Lato', Helvetica, Arial, sans-serif;
+            }
+
+            a, a:link, a:visited {
+                color: #28497c;
+                text-decoration: none;
+            }
+            a[href] {
+                transition: color .3s;
+            }
+            a[disabled] {
+                pointer-events: none;
+            }
+
+            a:hover, a:active {
+                color: #d60000;
+                text-decoration: none;
+            }
+
+            .studip-mail {
+                background-color: #ffffff;
+                border: 1px solid #d0d7e3;
+                margin: 25px auto;
+                padding: 10px 25px 25px 25px;
+                width: 700px;
+            }
+
+            .studip-mail header {
+                border-bottom: 1px solid #d0d7e3;
+                text-align: center;
+                padding-bottom: 15px;
+            }
+
+            .studip-mail-header-logo {
+                margin-left: auto;
+                margin-right: auto;
+            }
+
+            .studip-mail-sndrec {
+                margin-top: 0;
+            }
+
+            .studip-mail-message {
+                line-height: 1.33;
+                padding: 15px 25px;
+            }
+
+            .studip-mail footer {
+                border-top: 1px solid #d0d7e3;
+                text-align: center;
+                padding-top: 15px;
+            }
+        </style>
+    </head>
+    <body>
+    <article class="studip-mail">
+        <header>
+            <div class="studip-mail-header-logo" >
+                <img alt="" width="130" height="92" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkViZW5lXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgODQxLjg5IDU5NS4yOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgODQxLjg5IDU5NS4yOCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cGF0aCBmaWxsPSIjMTM0MDk0IiBkPSJNNzYzLjE3MiwyNDguMzU1YzAtMTcuNjM5LTE0LjMzMS0zMS45NTYtMzEuOTctMzEuOTU2Yy0xNy42NTIsMC0zMS45NDEsMTQuMzE2LTMxLjk0MSwzMS45NTYNCgkJczE0LjI4OSwzMS45NywzMS45NDEsMzEuOTdDNzQ4Ljg0MSwyODAuMzI1LDc2My4xNzIsMjY1Ljk5NCw3NjMuMTcyLDI0OC4zNTUgTTczMS4yMDIsMTYzLjI3Mg0KCQljLTQ2Ljk1OCwwLTg1LjA3NiwzOC4xMTItODUuMDksODUuMDYzaDI1LjM0YzAuMDA2LTMyLjk2NiwyNi43NjItNTkuNzQzLDU5Ljc1LTU5Ljc0M2MzMywwLDU5Ljc3NywyNi43ODMsNTkuNzc3LDU5Ljc2NA0KCQljMCwzMi45ODUtMjYuNzYyLDU5Ljc1Ni01OS43NSw1OS43NjJ2MjUuMzRjNDYuOTc4LTAuMDEzLDg1LjA2My0zOC4xMzksODUuMDYzLTg1LjEwM1M3NzguMTkzLDE2My4yNzIsNzMxLjIwMiwxNjMuMjcyIi8+DQoJPHJlY3QgeD0iNDg2LjkxNiIgeT0iMzk5LjMxOCIgZmlsbD0iI0FFMEEwRCIgd2lkdGg9IjMwLjY0MSIgaGVpZ2h0PSIzMC42NDEiLz4NCgk8Zz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTUxLjAwMiwzODUuNTY3YzEwLjk1MSw5LjUyNCwyNS4yMzYsMTYuMTksMzguMDkzLDE2LjE5YzE0LjUyMiwwLDIxLjY2NC01LjcxNCwyMS42NjQtMTQuOTk4DQoJCQljMC05Ljc2My04LjgwOC0xMi44NTgtMjIuMzgtMTguNTcxbC0xOS45OTgtOC41NzFjLTE2LjE5LTYuNDI5LTMxLjQyNy0xOS43NjEtMzEuNDI3LTQyLjM3OA0KCQkJYzAtMjUuNzEzLDIzLjA5NS00Ni4xODgsNTUuMjM1LTQ2LjE4OGMxNy44NTYsMCwzNi42NjQsNy4xNDIsNDkuOTk2LDIwLjQ3NWwtMTcuNjE3LDIyLjE0MmMtMTAuMjM5LTcuODU4LTIwLTEyLjM4MS0zMi4zOC0xMi4zODENCgkJCWMtMTEuOTA1LDAtMTkuNzYxLDUuMjM5LTE5Ljc2MSwxNC4wNDdjMCw5LjUyNCwxMC4yMzcsMTIuODU2LDIzLjgwOCwxOC4zMzJsMTkuNzYxLDguMDk1DQoJCQljMTguODA4LDcuNjE5LDMwLjcxMiwyMC4yMzcsMzAuNzEyLDQyLjE0MWMwLDI1LjcxMy0yMS40MjcsNDguMDkzLTU4LjMzLDQ4LjA5M2MtMjAuMjM2LDAtNDEuNjY0LTcuNjE5LTU3LjYxNS0yMi4zOA0KCQkJTDUxLjAwMiwzODUuNTY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMTgzLjM3OCwzMzIuMTAzaC0zMi45ODN2LTI3LjYxNWg5OC45NTJ2MjcuNjE1aC0zMi45ODV2OTcuMDM0aC0zMi45ODNWMzMyLjEwM3oiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTI2MS4xNTUsMzA0LjQ4N2gzMi45ODN2NjguMjY5YzAsMjIuMjQ2LDUuNzU0LDMwLjMsMTguNzk0LDMwLjNjMTMuMDQsMCwxOS4xNzctOC4wNTUsMTkuMTc3LTMwLjMNCgkJCXYtNjguMjY5aDMxLjgzNHY2NC40MzVjMCw0Mi41NzItMTYuMTA5LDYyLjUxNS01MS4wMSw2Mi41MTVzLTUxLjc3Ny0xOS45NDMtNTEuNzc3LTYyLjUxNVYzMDQuNDg3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMzc5LjEyMiwzMDQuNDg3aDM2LjgxOWMzNy45NywwLDY0LjA1LDE3LjY0Myw2NC4wNSw2MS43NWMwLDQ0LjEwNS0yNi4wOCw2Mi44OTktNjIuMTMyLDYyLjg5OWgtMzguNzM3DQoJCQlWMzA0LjQ4N3ogTTQxNC4wMjMsNDAyLjY3MmMxOC4wMjcsMCwzMi4yMTgtNy4yODYsMzIuMjE4LTM2LjQzNWMwLTI5LjE0OS0xNC4xOTEtMzUuMjg2LTMyLjIxOC0zNS4yODZoLTEuOTE2djcxLjcyMUg0MTQuMDIzeiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNNTMyLjU1LDI3My45MDZoMzUuMjM2djE1NS4yM0g1MzIuNTVWMjczLjkwNnoiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTU4NC40NDQsMjczLjkwNmg1Ni42NjNjMzMuODA4LDAsNjAuNzEyLDEyLjM4MSw2MC43MTIsNDkuOTk4YzAsMzYuNDI3LTI3Ljg1Niw1Mi42MTUtNjAuNzEyLDUyLjYxNQ0KCQkJaC0yMS40Mjd2NTIuNjE3aC0zNS4yMzVWMjczLjkwNnogTTYzOC45NjQsMzQ4LjY2NWMxOS4yODUsMCwyOC41NjktOC41NzEsMjguNTY5LTI0Ljc2MWMwLTE2LjE5LTkuOTk4LTIyLjE0Mi0yOC41NjktMjIuMTQyDQoJCQloLTE5LjI4NXY0Ni45MDNINjM4Ljk2NHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==">
+            </div>
+            <p class="studip-mail-sndrec">
+                <?= sprintf(
+                    _('Stud.IP hat eine automatische Systemnachricht für Sie.'),
+                    htmlReady($rec_fullname),
+                    htmlReady($rec_username)
+                ) ?>
+            </p>
+            <p>
+                <?= _("Sie erhalten hiermit in regelmäßigen Abständen Informationen über Neuigkeiten und Änderungen in belegten Veranstaltungen.") ?>
+                <br><br>
+                <?= _("Über welche Inhalte und in welchem Format Sie informiert werden wollen, können Sie hier einstellen:") ?>
+                <br>
+                <a href="<?= URLHelper::getLink('dispatch.php/settings/notification', ['again' => 'yes', 'sso' => $sso]) ?>">
+                    <?= URLHelper::getLink('dispatch.php/settings/notification', ['again' => 'yes', 'sso' => $sso]) ?>
+                </a>
+            </p>
+        </header>
+        <section class="studip-mail-message">
+            <table class="default">
+              <? foreach ($news as $sem_titel => $data) : ?>
+                <tr class="table_header_bold">
+                  <td style="font-weight: bold;">
+                    <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?>">
+                      <?= htmlReady($sem_titel) ?>
+                      <?= (($semester = Course::find($data[0]['range_id'])->semester_text) ? ' ('.$semester.')' : '') ?>
+                    </a>
+                  </td>
+                </tr>
+                <? foreach ($data as $module) : ?>
+                <tr class="<?= TextHelper::cycle('hover_odd', 'hover_even') ?>">
+                  <td>
+                    <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= htmlReady($module['text']) ?></a>
+                  </td>
+                </tr>
+                <? endforeach ?>
+              <? endforeach ?>
+            </table>
+        </section>
+        <footer>
+            <?= sprintf(
+                _('Diese E-Mail wurde von Stud.IP an %1$s (%2$s) versendet.'),
+                htmlReady($rec_fullname),
+                htmlReady($rec_username)
+            )
+            ?>
+        </footer>
+    </body>
 </html>
-- 
cgit v1.0


From 9956847f16054755078ad66c7e6db89940019359 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 09:26:15 +0000
Subject: fixes #3749

Closes #3749

Merge request studip/studip!2604
---
 resources/vue/components/responsive/ResponsiveContentBar.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/vue/components/responsive/ResponsiveContentBar.vue b/resources/vue/components/responsive/ResponsiveContentBar.vue
index d64ac52..eb6dd96 100644
--- a/resources/vue/components/responsive/ResponsiveContentBar.vue
+++ b/resources/vue/components/responsive/ResponsiveContentBar.vue
@@ -131,7 +131,11 @@ export default {
                             .classList.add('contentbar-wrapper-right');
                     }
 
-                    document.getElementById('responsive-contentbar-container').prepend(this.realContentbar);
+                    const contentbarContainer = document.getElementById('responsive-contentbar-container');
+
+                    contentbarContainer.prepend(this.realContentbar);
+
+                    document.getElementById('content-wrapper').style.marginTop = `${contentbarContainer.clientHeight}px`;
                 } else {
                     this.realContentbar.id = 'contentbar';
                     document.getElementById('toggle-sidebar').remove();
@@ -145,6 +149,8 @@ export default {
                     }
 
                     document.querySelector(this.realContentbarSource).prepend(this.realContentbar);
+
+                    document.getElementById('content-wrapper').style.marginTop = 'initial';
                 }
             }
         },
-- 
cgit v1.0


From 33b91e8d791b8f3530e4c0cb609fcfbfcf507d14 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 5 Apr 2024 09:30:28 +0000
Subject: fix typo and and always selects a semester, fixes #3954

Closes #3954

Merge request studip/studip!2812
---
 app/controllers/calendar/calendar.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index c605c01..85b5b43 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -660,7 +660,7 @@ class Calendar_CalendarController extends AuthenticatedController
     public function add_courses_action()
     {
         $selected_semester_pseudo_id = Request::option('semester_id');
-        $this->selected_semesters_id = '';
+        $this->selected_semester_id = '';
         $this->available_semester_data = [];
         $semesters = Semester::getAll();
         foreach ($semesters as $semester) {
@@ -691,8 +691,9 @@ class Calendar_CalendarController extends AuthenticatedController
             $this->selected_semester_id = $semester->id;
         } else {
             $this->selected_semester_id = $selected_semester_pseudo_id ?? '';
-            if (!Semester::exists($this->selected_semesters_id)) {
-                $this->selected_semester_id = '';
+            if (!Semester::exists($this->selected_semester_id)) {
+                $semester = Semester::findCurrent();
+                $this->selected_semester_id = $semester->id;
             }
         }
 
-- 
cgit v1.0


From c449ebf329f2a2b645a783965529739c61fe5152 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 11:45:13 +0000
Subject: fixes #3957

Closes #3957

Merge request studip/studip!2815
---
 docker/studip/docker-entrypoint.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh
index bafc2fe..e7bb00f 100644
--- a/docker/studip/docker-entrypoint.sh
+++ b/docker/studip/docker-entrypoint.sh
@@ -28,17 +28,14 @@ done
 
 sh $STUDIP/.gitlab/scripts/install_db.sh
 
-if [ ! -z $AUTO_MIGRATE ]; then
-    echo "Migrate Instance"
-    # If migrate fails start instance anyway
-    php "$STUDIP/cli/studip migrate" || true
-    echo "Migration finished"
-fi
+echo "Migrate Instance"
+# If migrate fails start instance anyway
+php "$STUDIP/cli/studip migrate" || true
+echo "Migration finished"
 
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
-	set -- apache2-foreground "$@"
+    set -- apache2-foreground "$@"
 fi
 
 exec "$@"
-
-- 
cgit v1.0


From 47f788af78eaf5bd6245341decfbbffe6c43f621 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 12:16:30 +0000
Subject: refine first solution, re #3957

Merge request studip/studip!2817
---
 docker/studip/Dockerfile           |  1 +
 docker/studip/Dockerfile-Dev       |  2 +-
 docker/studip/docker-entrypoint.sh | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index 8ee1d20..bc65e81 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -59,5 +59,6 @@ COPY ./docker/studip/docker-entrypoint.sh /usr/local/bin/
 RUN chmod u+x /usr/local/bin/docker-entrypoint.sh
 
 # Set start parameters
+ENV AUTO_MIGRATE 1
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev
index 960bd97..1549fdb 100644
--- a/docker/studip/Dockerfile-Dev
+++ b/docker/studip/Dockerfile-Dev
@@ -35,4 +35,4 @@ RUN chmod u+x /usr/local/bin/docker-entrypoint.sh
 
 # Set start parameters
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["apache2-foreground"]
\ No newline at end of file
+CMD ["apache2-foreground"]
diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh
index e7bb00f..ccd0ef3 100644
--- a/docker/studip/docker-entrypoint.sh
+++ b/docker/studip/docker-entrypoint.sh
@@ -28,10 +28,12 @@ done
 
 sh $STUDIP/.gitlab/scripts/install_db.sh
 
-echo "Migrate Instance"
-# If migrate fails start instance anyway
-php "$STUDIP/cli/studip migrate" || true
-echo "Migration finished"
+if [ ! -z $AUTO_MIGRATE ]; then
+    echo "Migrate Instance"
+    # If migrate fails start instance anyway
+    php "$STUDIP/cli/studip migrate" || true
+    echo "Migration finished"
+fi
 
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
-- 
cgit v1.0


From ab02d8db208174985a48529ef0f82fe9b626b19d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 12:20:18 +0000
Subject: fixes #3956

Closes #3956

Merge request studip/studip!2816
---
 app/views/my_studygroups/_course.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/my_studygroups/_course.php b/app/views/my_studygroups/_course.php
index 93161e2..972a577 100644
--- a/app/views/my_studygroups/_course.php
+++ b/app/views/my_studygroups/_course.php
@@ -6,7 +6,7 @@
         </td>
         <td style="text-align: left">
             <a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $group['seminar_id']]) ?>"
-                <?= $group['last_visitdate'] >= $group['chdate'] ? 'style="color: red;"' : '' ?>>
+                <?= $group['last_visitdate'] < $group['chdate'] ? 'style="color: red;"' : '' ?>>
                 <?= htmlReady($group['name']) ?>
             </a>
             <? if ($group['visible'] == 0) : ?>
-- 
cgit v1.0


From 864f80040952304c52b0af5a9ec75f849d9e8cc7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 5 Apr 2024 14:35:55 +0000
Subject: fixes #3965

Closes #3965

Merge request studip/studip!2818
---
 docker/studip/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh
index ccd0ef3..111d357 100644
--- a/docker/studip/docker-entrypoint.sh
+++ b/docker/studip/docker-entrypoint.sh
@@ -31,7 +31,7 @@ sh $STUDIP/.gitlab/scripts/install_db.sh
 if [ ! -z $AUTO_MIGRATE ]; then
     echo "Migrate Instance"
     # If migrate fails start instance anyway
-    php "$STUDIP/cli/studip migrate" || true
+    php "$STUDIP/cli/studip" migrate || true
     echo "Migration finished"
 fi
 
-- 
cgit v1.0


From eedd011c39d211a3928b5ca2bb7a901301a1c21a Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 5 Apr 2024 15:03:02 +0000
Subject: fixes #3914

Closes #3914

Merge request studip/studip!2813
---
 .../vue/components/questionnaires/InputArray.vue   | 43 ++++++++++++++++++----
 .../vue/components/questionnaires/VoteEdit.vue     |  2 +-
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/resources/vue/components/questionnaires/InputArray.vue b/resources/vue/components/questionnaires/InputArray.vue
index 37fa6fc..0fd67db 100644
--- a/resources/vue/components/questionnaires/InputArray.vue
+++ b/resources/vue/components/questionnaires/InputArray.vue
@@ -19,17 +19,17 @@
                 <button class="as-link"
                    :title="$gettext('Option löschen')"
                    @click.prevent="askForDeletingOption(index)">
-                    <studip-icon shape="trash" role="clickable" :size="20" alt=""></studip-icon>
-                </button>
-                <button v-if="index == options.length - 1"
-                   class="as-link"
-                   :title="$gettext('Option hinzufügen')"
-                   @click.prevent="addOption">
-                    <studip-icon shape="add" role="clickable" :size="20" alt=""></studip-icon>
+                    <studip-icon shape="trash" :role="options.length > 1 ? 'clickable' : 'inactive'" :size="20" alt=""></studip-icon>
                 </button>
             </li>
         </draggable>
 
+        <button class="as-link"
+                :title="$gettext('Option hinzufügen')"
+                @click.prevent="addOption">
+            <studip-icon shape="add" :size="20" alt=""></studip-icon>
+        </button>
+
         <studip-dialog
             v-if="askForDeleting"
             :title="$gettext('Bitte bestätigen Sie die Aktion.')"
@@ -90,6 +90,10 @@ export default {
             });
         },
         askForDeletingOption: function (index) {
+            if (this.options.length <= 1) {
+                return;
+            }
+
             this.indexOfDeletingOption = index;
             if (this.value[index]) {
                 this.askForDeleting = true;
@@ -175,3 +179,28 @@ export default {
     }
 }
 </script>
+<style lang="scss" scoped>
+.input-array {
+    display: grid;
+    grid-template-areas:
+        "sr sr"
+        "options button";
+    grid-template-columns: calc(100% - 24px) 24px;
+    grid-template-rows: auto;
+
+    > .sr-only {
+        grid-area: sr;
+    }
+
+    > .options {
+        grid-area: options;
+    }
+
+    > button.as-link {
+        align-self: end;
+        grid-area: button;
+        justify-self: left;
+        margin-bottom: 8px;
+    }
+}
+</style>
diff --git a/resources/vue/components/questionnaires/VoteEdit.vue b/resources/vue/components/questionnaires/VoteEdit.vue
index 9acb01f..62de963 100644
--- a/resources/vue/components/questionnaires/VoteEdit.vue
+++ b/resources/vue/components/questionnaires/VoteEdit.vue
@@ -56,7 +56,7 @@ export default {
         if (!this.value.description) {
             this.$emit('input', {
                 multiplechoice: 1,
-                options: ['', '', '', '']
+                options: ['', '', '', ''],
             });
         }
         this.$refs.autofocus.focus();
-- 
cgit v1.0


From 5ff357a4490a21c38a5eb39402d5c726a8d3f2ba Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 4 Apr 2024 15:03:42 +0000
Subject: Translated using Weblate (English)

Currently translated at 96.8% (9533 of 9845 strings)

Translation: Stud.IP/Stud.IP main
Translate-URL: https://weblate.uni-vechta.de/projects/stud-ip/stud-ip-main/en/
---
 locale/en/LC_MESSAGES/studip.po | 239 +++++++++++++++-------------------------
 1 file changed, 88 insertions(+), 151 deletions(-)

diff --git a/locale/en/LC_MESSAGES/studip.po b/locale/en/LC_MESSAGES/studip.po
index ed1e134..9f611d6 100644
--- a/locale/en/LC_MESSAGES/studip.po
+++ b/locale/en/LC_MESSAGES/studip.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-03-06 13:16+0100\n"
-"PO-Revision-Date: 2024-03-06 12:30+0000\n"
+"PO-Revision-Date: 2024-04-06 15:29+0000\n"
 "Last-Translator: Moritz Strohm <strohm@data-quest.de>\n"
 "Language-Team: English <https://weblate.uni-vechta.de/projects/stud-ip/"
 "stud-ip-main/en/>\n"
@@ -1017,9 +1017,8 @@ msgid "Alle Termine exportieren"
 msgstr "Export all dates"
 
 #: app/controllers/consultation/admin.php:860
-#, fuzzy
 msgid "Link zur Terminübersicht kopieren"
-msgstr "Copy link to this course"
+msgstr "Copy link to date overview"
 
 #: app/controllers/consultation/consultation_controller.php:96
 msgid "Dieser Terminblock ist ungültig."
@@ -1594,19 +1593,16 @@ msgid "Veranstaltungskategorie"
 msgstr "Course category"
 
 #: app/controllers/search/courses.php:117
-#, fuzzy
 msgid "Als Liste"
-msgstr "List"
+msgstr "As list"
 
 #: app/controllers/search/courses.php:121
-#, fuzzy
 msgid "Als Tabelle"
-msgstr "Table"
+msgstr "As table"
 
 #: app/controllers/oer/endpoints.php:328
-#, fuzzy
 msgid "Die gewünschte Datei konnte nicht gefunden werden."
-msgstr "The selected operation could not be executed."
+msgstr "The requested file could not be found."
 
 #: app/controllers/oer/admin.php:30
 msgid "Ihr PHP hat kein aktiviertes cURL-Modul."
@@ -2041,9 +2037,8 @@ msgstr ""
 "Do you want to delete all messages in the inbox? %u messages will be deleted."
 
 #: app/controllers/messages.php:981
-#, fuzzy
 msgid "Posteingang leeren"
-msgstr "Mail inbox"
+msgstr "Empty inbox"
 
 #: app/controllers/messages.php:990
 #, php-format
@@ -2055,7 +2050,7 @@ msgstr ""
 
 #: app/controllers/messages.php:994
 msgid "Postausgang leeren"
-msgstr ""
+msgstr "Empty outbox"
 
 #: app/controllers/messages.php:1006
 msgid "Nachrichten durchsuchen"
@@ -6793,7 +6788,6 @@ msgid "Der Fragebogen ist nicht kopierbar."
 msgstr "The questionnaire cannot be copied."
 
 #: app/controllers/questionnaire.php:207
-#, fuzzy
 msgid "Kopie"
 msgstr "Copy"
 
@@ -7279,14 +7273,12 @@ msgid "Neue Wiki-Seite anlegen"
 msgstr "Create new wiki page"
 
 #: app/controllers/course/wiki.php:79 app/controllers/course/wiki.php:299
-#, fuzzy
 msgid "Wiki verwalten"
-msgstr "Edit account"
+msgstr "Manage wiki"
 
 #: app/controllers/course/wiki.php:87
-#, fuzzy
 msgid "Seiten aus Veranstaltung importieren"
-msgstr "Copy topics from course"
+msgstr "Import pages from course"
 
 #: app/controllers/course/wiki.php:100 app/controllers/course/wiki.php:309
 #: app/controllers/course/wiki.php:890
@@ -7294,17 +7286,15 @@ msgid "Im Wiki suchen"
 msgstr "Search in the Wiki"
 
 #: app/controllers/course/wiki.php:110
-#, fuzzy
 msgid "Als PDF exportieren"
-msgstr "Export PDF"
+msgstr "Export as PDF"
 
 #: app/controllers/course/wiki.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Version %1$s, geändert von %2$s <br> am %3$s"
-msgstr ", last changes from %s at %s"
+msgstr "Version %1$s, modified by %2$s <br> on %3$s"
 
 #: app/controllers/course/wiki.php:140
-#, fuzzy
 msgid "Seiteneinstellungen"
 msgstr "Page settings"
 
@@ -7313,9 +7303,8 @@ msgid "Seite löschen"
 msgstr "Delete page"
 
 #: app/controllers/course/wiki.php:148
-#, fuzzy
 msgid "Wollen Sie wirklich die komplette Seite löschen?"
-msgstr "Are you sure to delete role \"%s\"?"
+msgstr "Do you really want to delete the whole page?"
 
 #: app/controllers/course/wiki.php:153
 msgid "Als Vollbild anzeigen"
@@ -7327,7 +7316,6 @@ msgid "Keine"
 msgstr "None"
 
 #: app/controllers/course/wiki.php:185
-#, fuzzy
 msgid "Lehrende und Tutoren/Tutorinnen"
 msgstr "Lecturers and tutors"
 
@@ -7338,19 +7326,16 @@ msgid "Nur Lehrende"
 msgstr "Only lecturers"
 
 #: app/controllers/course/wiki.php:199
-#, fuzzy
 msgid "Seiteneinstellung"
 msgstr "Page settings"
 
 #: app/controllers/course/wiki.php:202
-#, fuzzy
 msgid "Titel der Seite"
-msgstr "Tab title"
+msgstr "Page title"
 
 #: app/controllers/course/wiki.php:212
-#, fuzzy
 msgid "Dieser Name ist bereits vergeben."
-msgstr "This date is already occupied."
+msgstr "This name is already in use."
 
 #: app/controllers/course/wiki.php:219 app/controllers/course/wiki.php:773
 #, fuzzy
@@ -7358,39 +7343,34 @@ msgid "Übergeordnete Seite im Inhaltsverzeichnis"
 msgstr "Table of contents"
 
 #: app/controllers/course/wiki.php:224
-#, fuzzy
 msgid "Lesezugriff für"
-msgstr "Read access"
+msgstr "Read access for"
 
 #: app/controllers/course/wiki.php:229
-#, fuzzy
 msgid "Schreibzugriff für"
-msgstr "Write access"
+msgstr "Write access for"
 
 #: app/controllers/course/wiki.php:279
-#, fuzzy, php-format
+#, php-format
 msgid "Die Seite %s wurde gelöscht."
-msgstr "The column %s has been deleted."
+msgstr "The page %s has been deleted."
 
 #: app/controllers/course/wiki.php:317
-#, fuzzy
 msgid "Alle Wiki-Seiten als PDF exportieren"
-msgstr "Export postings as PDF"
+msgstr "Export all wiki pages as PDF"
 
 #: app/controllers/course/wiki.php:423
-#, fuzzy
 msgid "Zuletzt gespeichert"
-msgstr "saved"
+msgstr "Last saved"
 
 #: app/controllers/course/wiki.php:528
-#, fuzzy
 msgid "Die Seite wurde gespeichert."
-msgstr "The rule has been saved."
+msgstr "The page has been saved."
 
 #: app/controllers/course/wiki.php:615
-#, fuzzy, php-format
+#, php-format
 msgid "Version %1$s vom %2$s"
-msgstr "Postings from %1$s in %2$s"
+msgstr "Version %1$s from %2$s"
 
 #: app/controllers/course/wiki.php:713
 #, fuzzy
@@ -7398,9 +7378,8 @@ msgid "Änderungen dieser Version"
 msgstr "Save changes"
 
 #: app/controllers/course/wiki.php:737
-#, fuzzy
 msgid "Neue Wikiseite erstellen"
-msgstr "Create new rule"
+msgstr "Create new wiki page"
 
 #: app/controllers/course/wiki.php:751
 #: lib/models/Courseware/BlockTypes/BiographyPersonalInformation.php:70
@@ -7409,14 +7388,12 @@ msgid "Daten"
 msgstr "Data"
 
 #: app/controllers/course/wiki.php:759
-#, fuzzy
 msgid "Name der Seite"
-msgstr "Wiki page name"
+msgstr "Page name"
 
 #: app/controllers/course/wiki.php:768
-#, fuzzy
 msgid "Name existiert schon."
-msgstr "File does not exist."
+msgstr "The name already exists."
 
 #: app/controllers/course/wiki.php:778
 msgid ""
@@ -7442,9 +7419,8 @@ msgid "Lesen"
 msgstr "Read"
 
 #: app/controllers/course/wiki.php:962
-#, fuzzy
 msgid "Seiten-Historie"
-msgstr "Sidebar"
+msgstr "Page history"
 
 #: app/controllers/course/wiki.php:966 app/views/course/wiki/diff.php:7
 msgid "Änderungsliste"
@@ -7464,17 +7440,15 @@ msgid "Die ausgewählte Veranstaltung wurde nicht gefunden!"
 msgstr "The selected course could not be found!"
 
 #: app/controllers/course/wiki.php:1047
-#, fuzzy
 msgid "Es wurden keine Wiki-Seiten ausgewählt!"
 msgstr "No wiki pages have been selected!"
 
 #: app/controllers/course/wiki.php:1060
-#, fuzzy
 msgid "Es wurden keine Wiki-Seiten gefunden!"
 msgstr "No wiki pages have been found!"
 
 #: app/controllers/course/wiki.php:1084
-#, fuzzy, php-format
+#, php-format
 msgid "Fehler beim Import der Wiki-Seite %s!"
 msgstr "Error while importing the wiki page %s!"
 
@@ -7948,9 +7922,8 @@ msgstr "Import participant list"
 #: app/controllers/course/members.php:1660
 #: app/controllers/course/statusgroups.php:259
 #: app/controllers/institute/members.php:649
-#, fuzzy
 msgid "Als Excel-Datei exportieren"
-msgstr "Export to Excel"
+msgstr "Export as Excel file"
 
 #: app/controllers/course/members.php:1669 app/controllers/course/dates.php:97
 #: app/controllers/admin/courses.php:229
@@ -8026,9 +7999,8 @@ msgid "Titel nachgestellt"
 msgstr "Second title"
 
 #: app/controllers/course/members.php:1761
-#, fuzzy
 msgid "Telefonnr."
-msgstr "Telephone"
+msgstr "Phone"
 
 #: app/controllers/course/members.php:1762
 #: app/controllers/course/statusgroups.php:319
@@ -8049,9 +8021,8 @@ msgstr "Matriculation number"
 #: app/controllers/course/members.php:1770
 #: app/controllers/admin/courses.php:483 app/controllers/admin/courses.php:1383
 #: app/controllers/admin/courses.php:1384
-#, fuzzy
 msgid "Teilnehmendenexport"
-msgstr "Participant page"
+msgstr "Participant export"
 
 #: app/controllers/course/members.php:1891
 msgid "Es wurde keine Gruppe ausgewählt!"
@@ -8414,9 +8385,8 @@ msgid "Es wurde kein Lernmaterial gefunden."
 msgstr "No learning material has been found."
 
 #: app/controllers/course/courseware.php:100
-#, fuzzy
 msgid "Courseware: Aufgaben"
-msgstr "Courseware tasks"
+msgstr "Courseware: Tasks"
 
 #: app/controllers/course/forum/area.php:22
 #: app/controllers/course/forum/index.php:446
@@ -8764,9 +8734,8 @@ msgstr "Progress"
 #: app/controllers/course/gradebook/students.php:91
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:15
 #: app/views/course/gradebook/lecturers/custom_definitions.php:47
-#, fuzzy
 msgid "Bestanden"
-msgstr "I understand"
+msgstr "Passed"
 
 #: app/controllers/course/gradebook/students.php:92
 #: app/views/course/gradebook/students/index.php:45
@@ -8801,9 +8770,8 @@ msgid "Test als Leistung hinzufügen"
 msgstr "Add a course"
 
 #: app/controllers/course/gradebook/template_helpers.php:102
-#, fuzzy
 msgid "Ergebnisse aus ILIAS importieren"
-msgstr "Export results"
+msgstr "Import results from ILIAS"
 
 #: app/controllers/course/gradebook/lecturers.php:75
 #: app/views/course/gradebook/students/index.php:17
@@ -8811,9 +8779,8 @@ msgstr "Export results"
 #: app/views/course/gradebook/students/index.php:63
 #: app/views/course/gradebook/lecturers/index.php:52
 #: app/views/course/gradebook/lecturers/index.php:62
-#, fuzzy
 msgid "bestanden"
-msgstr "I understand"
+msgstr "passed"
 
 #: app/controllers/course/gradebook/lecturers.php:138
 msgid "Gewichtungen erfolgreich verändert."
@@ -8914,9 +8881,8 @@ msgstr "Create several groups"
 
 #: app/controllers/course/statusgroups.php:268
 #: app/controllers/institute/members.php:657
-#, fuzzy
 msgid "Als .csv exportieren"
-msgstr "Export to Excel"
+msgstr "Export as .csv"
 
 #: app/controllers/course/statusgroups.php:281
 msgid "In eine Gruppe eintragen"
@@ -13204,9 +13170,8 @@ msgstr[0] "%s could not be removed from %u course."
 msgstr[1] "%s could not be removed from %u courses."
 
 #: app/controllers/admin/user.php:1623
-#, fuzzy
 msgid "Teilnehmendendaten exportieren"
-msgstr "Import participant list"
+msgstr "Export participant data"
 
 #: app/controllers/admin/user.php:1705
 msgid "Neues Konto anlegen"
@@ -14827,14 +14792,12 @@ msgid "Konfiguration hochladen"
 msgstr "Upload configuration"
 
 #: app/controllers/admin/extern.php:102 app/controllers/admin/extern.php:422
-#, fuzzy
 msgid "Neue externe Seite anlegen"
-msgstr "Create new page"
+msgstr "Create new external page"
 
 #: app/controllers/admin/extern.php:120
-#, fuzzy
 msgid "Vorschau anzeigen"
-msgstr "Display log entries"
+msgstr "Display preview"
 
 #: app/controllers/admin/extern.php:126
 #: app/views/resources/_common/_resource_tree_item.php:17
@@ -14844,9 +14807,8 @@ msgstr "Display information"
 
 #: app/controllers/admin/extern.php:132
 #: app/views/institute/extern/_table-row.php:42
-#, fuzzy
 msgid "Konfiguration herunterladen"
-msgstr "Download configuration file"
+msgstr "Download configuration"
 
 #: app/controllers/admin/extern.php:167
 #, fuzzy
@@ -14904,7 +14866,6 @@ msgid "Liste der Veranstaltungen"
 msgstr "Type of course"
 
 #: app/controllers/admin/extern.php:477
-#, fuzzy
 msgid "Veranst.-Details"
 msgstr "Course details"
 
@@ -15224,9 +15185,8 @@ msgid "Diese Emailadresse ist bereits registriert."
 msgstr "The Plug-in is already registered."
 
 #: app/controllers/registration.php:120
-#, fuzzy
 msgid "Registrierung abschließen"
-msgstr "Cancel registration"
+msgstr "Finish registration"
 
 #: app/controllers/registration.php:121
 #: app/views/admission/rule/configure.php:24
@@ -15819,9 +15779,8 @@ msgid "Liste der Dateien zum Download"
 msgstr "Link to file download"
 
 #: app/controllers/institute/extern.php:67
-#, fuzzy
 msgid "Externe Seiten (Einrichtung)"
-msgstr "Name of an institute"
+msgstr "External pages (Institute)"
 
 #: app/controllers/institute/files.php:28
 msgid "Es wurde keine passende Einrichtung gefunden."
@@ -16416,9 +16375,8 @@ msgstr "None of the selected bookings could be copied!"
 #: app/controllers/room_management/planning.php:1142
 #: lib/navigation/ResourceNavigation.php:157
 #: lib/navigation/ResourceNavigation.php:197
-#, fuzzy
 msgid "Buchungsübersicht mit Kommentaren"
-msgstr "Bookings with comments"
+msgstr "Booking overview with comments"
 
 #: app/controllers/room_management/planning.php:1161
 msgid "Export für Word"
@@ -16541,39 +16499,33 @@ msgstr "Sunday"
 #: app/controllers/calendar/calendar.php:413
 #: app/controllers/calendar/calendar.php:525
 #: app/controllers/calendar/calendar.php:606
-#, fuzzy
 msgid "Sie dürfen diesen Kalender nicht sehen!"
-msgstr "You must not copy this course"
+msgstr "You are not allowed to view this calendar!"
 
 #: app/controllers/calendar/date.php:106 app/controllers/calendar/date.php:593
-#, fuzzy
 msgid "Der angegebene Termin wurde nicht gefunden."
-msgstr "The specified person could not be found!"
+msgstr "The specified date could not be found."
 
 #: app/controllers/calendar/date.php:114
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (am %2$s von %3$s bis %4$s Uhr)"
-msgstr "Date on %1$s, %2$s from %3$s until %4$s"
+msgstr "%1$s (on %2$s from %3$s until %4$s)"
 
 #: app/controllers/calendar/date.php:146
-#, fuzzy
 msgid "Sie nehmen am Termin teil."
-msgstr "You did not select any date."
+msgstr "You participate on this date."
 
 #: app/controllers/calendar/date.php:148
-#, fuzzy
 msgid "Sie nehmen nicht am Termin teil."
-msgstr "You did not select any date."
+msgstr "You do not participate on this date."
 
 #: app/controllers/calendar/date.php:150
-#, fuzzy
 msgid "Sie haben den Termin zur Kenntnis genommen."
-msgstr "I acknowledge the hint from above"
+msgstr "You acknowledge the date."
 
 #: app/controllers/calendar/date.php:152
-#, fuzzy
 msgid "Sie haben keine Angaben zur Teilnahme gemacht."
-msgstr "You did not select any date."
+msgstr "You did not specify whether you participate on the date."
 
 #: app/controllers/calendar/date.php:211
 #: app/controllers/calendar/calendar.php:29
@@ -16591,30 +16543,25 @@ msgid "Termin bearbeiten"
 msgstr "Edit date"
 
 #: app/controllers/calendar/date.php:244 app/controllers/calendar/date.php:741
-#, fuzzy
 msgid "Der Termin wurde nicht gefunden!"
-msgstr "The date has not been changed."
+msgstr "The date could not be found!"
 
 #: app/controllers/calendar/date.php:381
-#, fuzzy
 msgid "Bitte geben Sie einen Startzeitpunkt ein."
-msgstr "Please enter a name."
+msgstr "Please enter a start time."
 
 #: app/controllers/calendar/date.php:384
-#, fuzzy
 msgid "Bitte geben Sie einen Endzeitpunkt ein."
-msgstr "Please enter a name."
+msgstr "Please enter an end time."
 
 #: app/controllers/calendar/date.php:387
 #: app/controllers/calendar/calendar.php:717
-#, fuzzy
 msgid "Der Startzeitpunkt darf nicht nach dem Endzeitpunkt liegen!"
 msgstr "The start time must not lie after the end time!"
 
 #: app/controllers/calendar/date.php:392
-#, fuzzy
 msgid "Bitte geben Sie einen Titel ein."
-msgstr "Please enter a name."
+msgstr "Please enter a title."
 
 #: app/controllers/calendar/date.php:397 app/views/admin/api/permissions.php:14
 #: app/views/calendar/date/index.php:60 app/views/calendar/date/delete.php:40
@@ -16623,14 +16570,12 @@ msgid "Zugriff"
 msgstr "Access"
 
 #: app/controllers/calendar/date.php:397
-#, fuzzy
 msgid "Bitte wählen Sie einen Zugriffstyp aus."
-msgstr "Please choose a value"
+msgstr "Please select an access type."
 
 #: app/controllers/calendar/date.php:404
-#, fuzzy
 msgid "Bitte wählen Sie eine gültige Kategorie aus."
-msgstr "Select two valid accounts."
+msgstr "Please select a valid category."
 
 #: app/controllers/calendar/date.php:416 app/views/calendar/date/index.php:63
 #: app/views/calendar/date/delete.php:43
@@ -16642,19 +16587,16 @@ msgid "Wiederholung"
 msgstr "Repetition"
 
 #: app/controllers/calendar/date.php:416
-#, fuzzy
 msgid "Bitte wählen Sie ein gültiges Wiederholungsintervall aus."
-msgstr "Select two valid accounts."
+msgstr "Please select a valid repetition interval."
 
 #: app/controllers/calendar/date.php:428
-#, fuzzy
 msgid "Wiederholung an bestimmtem Wochentag"
-msgstr "Repetition date"
+msgstr "Repetition on a certain day of week"
 
 #: app/controllers/calendar/date.php:428
-#, fuzzy
 msgid "Bitte wählen Sie einen Wochentag zwischen Montag und Sonntag aus."
-msgstr "Please select a course."
+msgstr "Please select a day of week between Monday and Sunday."
 
 #: app/controllers/calendar/date.php:449
 #: app/views/admin/cronjobs/schedules/periodic-schedule.php:42
@@ -16664,25 +16606,21 @@ msgid "Monat"
 msgstr "Month"
 
 #: app/controllers/calendar/date.php:449
-#, fuzzy
 msgid "Bitte wählen Sie einen Monat zwischen Januar und Dezember aus."
-msgstr "Please select a course."
+msgstr "Please select a month between January and December."
 
 #: app/controllers/calendar/date.php:476
 #: app/views/calendar/date/_add_edit_form.php:124
-#, fuzzy
 msgid "Teilnehmende Personen"
-msgstr "Remove participant(s)"
+msgstr "Participants"
 
 #: app/controllers/calendar/date.php:476
-#, fuzzy
 msgid "Der Termin ist keinem Kalender zugewiesen!"
-msgstr "File reference is not assigned to a folder!"
+msgstr "The date is not assigned to a calendar!"
 
 #: app/controllers/calendar/date.php:491
-#, fuzzy
 msgid "Beim Speichern des Termins ist ein Fehler aufgetreten."
-msgstr "Error during upload"
+msgstr "An error occurred while saving the date."
 
 #: app/controllers/calendar/date.php:525
 #, fuzzy
@@ -17021,7 +16959,7 @@ msgstr "Telephone"
 #: app/controllers/accessibility/forms.php:103
 #: app/controllers/accessibility/forms.php:104
 msgid "Dieses Feld nicht ausfüllen"
-msgstr ""
+msgstr "Do not fill this field"
 
 #: app/controllers/accessibility/forms.php:113
 msgid ""
@@ -18960,7 +18898,7 @@ msgstr "Also mark the free dates in the calendar"
 #: app/views/consultation/admin/edit.php:64
 msgid ""
 "Tutor/innen beim Versand von Buchungsbenachrichtigungen berücksichtigen?"
-msgstr ""
+msgstr "Regard tutors when sending booking notifications?"
 
 #: app/views/consultation/admin/create.php:211
 #: app/views/consultation/admin/edit.php:71
@@ -24299,7 +24237,7 @@ msgstr "Page title"
 
 #: app/views/siteinfo/new.php:47 app/views/siteinfo/edit.php:46
 msgid "Entwurfsmodus (nur sichtbar für root)"
-msgstr ""
+msgstr "Draft mode (only visible for root)"
 
 #: app/views/siteinfo/new.php:52 app/views/siteinfo/edit.php:51
 #, fuzzy
@@ -26357,7 +26295,7 @@ msgstr "Transfer groups"
 #: app/views/course/gradebook/lecturers/edit_ilias_definition.php:17
 #: app/views/course/gradebook/lecturers/new_ilias_definition.php:23
 msgid "Bestanden/nicht bestanden übertragen"
-msgstr ""
+msgstr "Submit passed/not passed"
 
 #: app/views/course/gradebook/lecturers/weights.php:2
 #: app/views/course/gradebook/lecturers/index.php:73
@@ -27099,7 +27037,7 @@ msgstr "Search results for %s"
 #: app/views/course/wiki/search.php:85
 #, php-format
 msgid "Treffer in alten Namen: %s"
-msgstr ""
+msgstr "Match in old names: %s"
 
 #: app/views/course/wiki/search.php:92
 #, fuzzy
@@ -27192,7 +27130,7 @@ msgstr "Leave"
 
 #: app/views/course/wiki/edit.php:49
 msgid "Beantragen Sie, dass Sie den Text jetzt bearbeiten wollen."
-msgstr ""
+msgstr "Request that you want to edit the text now."
 
 #: app/views/course/wiki/edit.php:51
 #, fuzzy
@@ -27201,7 +27139,7 @@ msgstr "Abort modification"
 
 #: app/views/course/wiki/page.php:26
 msgid "Dieses Wiki ist noch leer. Erstellen Sie die erste Wiki-Seite."
-msgstr ""
+msgstr "This wiki is still empty. Create the first wiki page."
 
 #: app/views/course/wiki/page.php:36 templates/wiki/show.php:8
 msgid "Mach die Welt ein Stückchen schlauer."
@@ -28942,7 +28880,7 @@ msgstr "Display all study areas"
 
 #: app/views/settings/calendar.php:58
 msgid "Nur Montag bis Freitag in der Wochenansicht anzeigen."
-msgstr ""
+msgstr "Only show monday until friday in the week view."
 
 #: app/views/settings/calendar.php:64
 msgid "Einzelterminkalender"
@@ -28955,7 +28893,7 @@ msgstr "Starting time of day view and week view"
 #: app/views/settings/calendar.php:72 app/views/settings/calendar.php:83
 #, php-format
 msgid "%02u:00 Uhr"
-msgstr ""
+msgstr "%02u:00"
 
 #: app/views/settings/calendar.php:80
 msgid "Endzeit der Tages- und Wochenansicht"
@@ -32995,7 +32933,7 @@ msgstr "Can have sub-courses"
 
 #: app/views/admin/sem_classes/details.php:205
 msgid "Unbegrenzte Laufzeit verbieten"
-msgstr ""
+msgstr "Forbid unlimited duration"
 
 #: app/views/admin/sem_classes/details.php:209
 msgid "Kurzer Beschreibungstext zum Anlegen einer Veranstaltung"
@@ -33663,7 +33601,7 @@ msgstr "Name of configuration"
 #: app/views/institute/extern/info.php:23
 #, php-format
 msgid "durch %s"
-msgstr ""
+msgstr "by %s"
 
 #: app/views/institute/extern/info.php:22
 #, fuzzy
@@ -34234,7 +34172,7 @@ msgstr "Download booking list"
 #: app/views/calendar/date/move.php:1 app/views/calendar/date/delete.php:7
 msgid ""
 "Es handelt sich um einen Termin in einer Terminserie. Was möchten Sie tun?"
-msgstr ""
+msgstr "This is a date in a date series. What do you want to do?"
 
 #: app/views/calendar/date/move.php:9
 msgid "Der Termin soll aus der Terminserie herausgelöst werden."
@@ -40558,9 +40496,8 @@ msgid "Kalendereinträge"
 msgstr "Calendar entries"
 
 #: lib/models/calendar/CalendarDate.class.php:454
-#, fuzzy
 msgid "Keine Wiederholung"
-msgstr "Repetition"
+msgstr "No repetition"
 
 #: lib/models/calendar/CalendarDate.class.php:461
 #, fuzzy, php-format
@@ -40570,7 +40507,7 @@ msgstr "additional dates"
 #: lib/models/calendar/CalendarDate.class.php:466
 #, php-format
 msgid "Täglich bis zum %1$s"
-msgstr ""
+msgstr "Daily until %1$s"
 
 #: lib/models/calendar/CalendarDate.class.php:470
 #, fuzzy
@@ -40580,7 +40517,7 @@ msgstr "Daily repetition"
 #: lib/models/calendar/CalendarDate.class.php:476
 #, php-format
 msgid "Jeden %1$u. Tag (%2$u Termine)"
-msgstr ""
+msgstr "Every %1$u day (%2$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:482
 #, fuzzy, php-format
@@ -40590,7 +40527,7 @@ msgstr "Every %s in %s"
 #: lib/models/calendar/CalendarDate.class.php:488
 #, php-format
 msgid "Jeden %u. Tag ohne Begrenzung"
-msgstr ""
+msgstr "Every %u day never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:507
 #, fuzzy, php-format
@@ -40612,12 +40549,12 @@ msgstr "Every %s in %s"
 #: lib/models/calendar/CalendarDate.class.php:531
 #, php-format
 msgid "Jeden %s ohne Begrenzung"
-msgstr ""
+msgstr "Every %s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:539
 #, php-format
 msgid "Jeden %1$u. %2$s (%3$u Termine)"
-msgstr ""
+msgstr "Every %1$u %2$s (%3$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:546
 #, fuzzy, php-format
@@ -40627,17 +40564,17 @@ msgstr "%1$d. week, from %2$s to %3$s"
 #: lib/models/calendar/CalendarDate.class.php:553
 #, php-format
 msgid "Jeden %1$u. %2$s ohne Begrenzung"
-msgstr ""
+msgstr "Every %1$u. %2$s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:566
 #, php-format
 msgid "Jeden Monat am letzten %s"
-msgstr ""
+msgstr "Every month on the last %s"
 
 #: lib/models/calendar/CalendarDate.class.php:572
 #, php-format
 msgid "Jeden Monat am %1$u. %2$s"
-msgstr ""
+msgstr "Every month on the %1$u. %2$s"
 
 #: lib/models/calendar/CalendarDate.class.php:580
 #, fuzzy, php-format
@@ -40647,7 +40584,7 @@ msgstr "Every %s. day"
 #: lib/models/calendar/CalendarDate.class.php:590
 #, php-format
 msgid "Jeden %1$u. Monat am letzten %2$s"
-msgstr ""
+msgstr "Evety %1$u. month on the last %2$s"
 
 #: lib/models/calendar/CalendarDate.class.php:597
 #, php-format
@@ -41251,7 +41188,7 @@ msgstr "Tutors"
 
 #: lib/extern/ExternPagePersBrowse.php:89
 msgid "Dozenten/Dozentinnen"
-msgstr ""
+msgstr "Lecturers"
 
 #: lib/extern/ExternPagePersBrowse.php:90
 #, fuzzy
-- 
cgit v1.0


From 192fb58d1dace1d2e60e62f1e4e1fc6883ca0f72 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 4 Apr 2024 15:18:34 +0000
Subject: Translated using Weblate (English)

Currently translated at 90.3% (1346 of 1489 strings)

Translation: Stud.IP/Stud.IP main (JS)
Translate-URL: https://weblate.uni-vechta.de/projects/stud-ip/stud-ip-main-js/en/
---
 locale/en/LC_MESSAGES/js-resources.po | 176 +++++++++++++---------------------
 1 file changed, 65 insertions(+), 111 deletions(-)

diff --git a/locale/en/LC_MESSAGES/js-resources.po b/locale/en/LC_MESSAGES/js-resources.po
index c7f6833..864428e 100644
--- a/locale/en/LC_MESSAGES/js-resources.po
+++ b/locale/en/LC_MESSAGES/js-resources.po
@@ -2,15 +2,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2023-10-19 16:29+0000\n"
+"PO-Revision-Date: 2024-04-06 15:29+0000\n"
 "Last-Translator: Moritz Strohm <strohm@data-quest.de>\n"
-"Language-Team: English <https://weblate.uni-vechta.de/projects/stud-ip/stud-"
-"ip-main-js/en/>\n"
+"Language-Team: English <https://weblate.uni-vechta.de/projects/stud-ip/"
+"stud-ip-main-js/en/>\n"
 "Language: en\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.3.1\n"
 "Generated-By: easygettext\n"
 
 #: resources/assets/javascripts/lib/multi_person_search.js:71
@@ -59,9 +59,8 @@ msgstr[1] "%{ count } notifications"
 
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:30
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:58
-#, fuzzy
 msgid "%{ count } Tage"
-msgstr "%{count} object"
+msgstr "%{count} days"
 
 #: resources/vue/components/tree/StudipTreeTable.vue:134
 msgid "%{ count } Unterebenen"
@@ -175,9 +174,8 @@ msgstr[0] "%{count} object"
 msgstr[1] "%{count} objects"
 
 #: resources/vue/components/form_inputs/MyCoursesColouredTable.vue:87
-#, fuzzy
 msgid "%{course} auswählen"
-msgstr "Select %{context}"
+msgstr "Select %{course}"
 
 #: resources/vue/components/courseware/structural-element/CoursewareTreeItem.vue:247
 msgid ""
@@ -277,18 +275,16 @@ msgstr[0] "%{length} comment"
 msgstr[1] "%{length} comments"
 
 #: resources/vue/components/file-chooser/FileChooserFolderItem.vue:50
-#, fuzzy
 msgid "%{length} Objekt"
 msgid_plural "%{length} Objekte"
-msgstr[0] "%{count} object"
-msgstr[1] "%{count} objects"
+msgstr[0] "%{length} object"
+msgstr[1] "%{length} objects"
 
 #: resources/vue/components/courseware/blocks/CoursewareTableOfContentsBlock.vue:97
-#, fuzzy
 msgid "%{length} Seite"
 msgid_plural "%{length} Seiten"
-msgstr[0] "%{length} feedback"
-msgstr[1] "%{length} feedbacks"
+msgstr[0] "%{length} page"
+msgstr[1] "%{length} pages"
 
 #: resources/vue/components/RangeInput.vue:3
 msgid "%{myValue} von %{max}"
@@ -306,9 +302,8 @@ msgid "%{name} bearbeiten"
 msgstr "Edit %{name}"
 
 #: resources/vue/components/StudipActionMenu.vue:73
-#, fuzzy
 msgid "%{title} für %{context}"
-msgstr "Action menu for %{context}"
+msgstr "%{title} for %{context}"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogExport.vue:29
 msgid "%{title} wird exportiert, bitte haben sie einen Moment Geduld..."
@@ -477,9 +472,8 @@ msgid "Abschnitte"
 msgstr "Sections"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbar.vue:36
-#, fuzzy
 msgid "Abschnitte hinzufügen"
-msgstr "Add section"
+msgstr "Add sections"
 
 #: resources/vue/components/courseware/PublicApp.vue:14
 #: resources/vue/components/feedback/FeedbackElementUpdate.vue:32
@@ -492,23 +486,20 @@ msgid "Abspielen"
 msgstr "Play"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:204
-#, fuzzy
 msgid "Abstand in Jahren"
-msgstr "I understand"
+msgstr "Distance in years"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:309
 msgid "Abstand in Monaten"
-msgstr ""
+msgstr "Distance in months"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:110
-#, fuzzy
 msgid "Abstand in Tagen"
-msgstr "Expiration in days"
+msgstr "Distance in days"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:124
-#, fuzzy
 msgid "Abstand in Wochen"
-msgstr "I understand"
+msgstr "Distance in weeks"
 
 #: resources/vue/components/courseware/blocks/CoursewareBiographyCareerBlock.vue:113
 #: resources/vue/components/courseware/blocks/CoursewareTimelineBlock.vue:106
@@ -589,9 +580,8 @@ msgid "Aktuelle Position in der Liste: %{pos} von %{listLength}."
 msgstr "Current position in the list: %{pos} of %{listLength}."
 
 #: resources/vue/components/courseware/toolbar/CoursewareClipboardItem.vue:56
-#, fuzzy
 msgid "Aktuellen Stand einfügen"
-msgstr "Insert copy of the current state"
+msgstr "Insert current state"
 
 #: resources/vue/components/courseware/CoursewareContentBookmarkFilterWidget.vue:12
 msgid "alle"
@@ -646,9 +636,8 @@ msgid "Alle Kategorien"
 msgstr "All categories"
 
 #: resources/vue/components/FilesTable.vue:201
-#, fuzzy
 msgid "Alle Ordner und Dateien auswählen"
-msgstr "Select all students"
+msgstr "Select all folders and files"
 
 #: resources/assets/javascripts/bootstrap/raumzeit.js:114
 msgid "Alle Räume anzeigen"
@@ -688,9 +677,8 @@ msgid "Als Vollbild anzeigen"
 msgstr "Show as full screen"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:385
-#, fuzzy
 msgid "Am dritten gewählten Wochentag"
-msgstr "Displayed week-days"
+msgstr "On the third selected day of week"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:108
 #, fuzzy
@@ -698,28 +686,24 @@ msgid "Am Ende eines Kapitels einen Dialog für die Bewertung anzeigen"
 msgstr "No time ranges have been specified for the booking!"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:377
-#, fuzzy
 msgid "Am ersten gewählten Wochentag"
-msgstr "Displayed week-days"
+msgstr "On the first selected day of week"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:393
-#, fuzzy
 msgid "Am letzten gewählten Wochentag"
-msgstr "Displayed week-days"
+msgstr "On the last selected day of week"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:389
-#, fuzzy
 msgid "Am vierten gewählten Wochentag"
-msgstr "Displayed week-days"
+msgstr "On the fourth selected day of week"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:381
-#, fuzzy
 msgid "Am zweiten gewählten Wochentag"
-msgstr "Displayed week-days"
+msgstr "On the second selected day of week"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:413
 msgid "An einem bestimmten Datum"
-msgstr ""
+msgstr "On a specific date"
 
 #: resources/assets/javascripts/bootstrap/mvv_difflog.js:144
 msgid "Änderung durch %{user} am %{time}"
@@ -883,23 +867,20 @@ msgid "Art der Inhaltsabfolge"
 msgstr "Type of content order"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:215
-#, fuzzy
 msgid "Art der jährlichen Wiederholung"
-msgstr "Daily repetition"
+msgstr "Type of yearly repetition"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:320
-#, fuzzy
 msgid "Art der monatlichen Wiederholung"
-msgstr "Monthly repetition"
+msgstr "Type of monthly repetition"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAdd.vue:104
 msgid "Art der Vorlage"
 msgstr "Type of template"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:73
-#, fuzzy
 msgid "Art der Wiederholung"
-msgstr "Repetition end"
+msgstr "Type of repetition"
 
 #: resources/vue/components/courseware/CoursewareAdminTemplates.vue:8
 #: resources/vue/components/courseware/CoursewareAdminTemplates.vue:31
@@ -918,7 +899,6 @@ msgid "Art des Links"
 msgstr "Link type"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:537
-#, fuzzy
 msgid "Audio-Aufnahmen zulassen"
 msgstr "Allow audio recordings"
 
@@ -955,9 +935,8 @@ msgid "Aufgabe abgegeben"
 msgstr "Submit task"
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:78
-#, fuzzy
 msgid "Aufgabe bearbeiten"
-msgstr "Edit data"
+msgstr "Edit task"
 
 #: resources/vue/mixins/courseware/task-helper.js:14
 msgid "Aufgabe bereit"
@@ -966,9 +945,8 @@ msgstr "Task ready"
 #: resources/vue/components/courseware/tasks/CoursewareDashboardStudents.vue:92
 #: resources/vue/components/courseware/tasks/TaskGroupsDeleteDialog.vue:7
 #: resources/vue/components/courseware/widgets/CoursewareTasksActionWidget.vue:46
-#, fuzzy
 msgid "Aufgabe löschen"
-msgstr "Delete recording"
+msgstr "Delete task"
 
 #: resources/vue/mixins/courseware/task-helper.js:20
 #: resources/vue/mixins/courseware/task-helper.js:34
@@ -1032,9 +1010,8 @@ msgid "Aufnahme"
 msgstr "Recording"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:362
-#, fuzzy
 msgid "Aufnahme abbrechen"
-msgstr "Save recording"
+msgstr "Abort recording"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:352
 msgid "Aufnahme aktivieren"
@@ -1094,9 +1071,8 @@ msgstr "Link pages"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAddChooser.vue:39
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAddChooser.vue:39
-#, fuzzy
 msgid "Aus Datei importieren"
-msgstr "Export as CSV file"
+msgstr "Import from file"
 
 #: resources/vue/components/courseware/blocks/CoursewareHeadlineBlock.vue:480
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:765
@@ -1174,15 +1150,13 @@ msgstr "Author"
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue:176
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue:154
-#, fuzzy
 msgid "Automatisch"
-msgstr "Detect automatically"
+msgstr "Automatically"
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue:177
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue:155
-#, fuzzy
 msgid "Automatisch mit Inhaltsverzeichnis"
-msgstr "Table of contents"
+msgstr "Automatically with table of contents"
 
 #: resources/vue/components/courseware/blocks/CoursewareGalleryBlock.vue:286
 #: resources/vue/components/courseware/blocks/CoursewareGalleryBlock.vue:294
@@ -1374,9 +1348,8 @@ msgstr "Confirmation"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAddChooser.vue:26
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAddChooser.vue:34
-#, fuzzy
 msgid "Bestehendes kopieren"
-msgstr "Copy pages"
+msgstr "Copy existing"
 
 #: resources/vue/components/courseware/blocks/CoursewareBiographyAchievementsBlock.vue:50
 #: resources/vue/components/courseware/blocks/CoursewareBiographyAchievementsBlock.vue:127
@@ -1479,7 +1452,6 @@ msgid "Bild Vorderseite"
 msgstr "Image front"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:163
-#, fuzzy
 msgid "Bild wählen"
 msgstr "Select image"
 
@@ -1565,9 +1537,8 @@ msgid "Bitte geben Sie eine URL der Anwendung an."
 msgstr "Please specify an URL of the application."
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogTopics.vue:69
-#, fuzzy
 msgid "Bitte geben Sie einen Titel ein."
-msgstr "Please enter a name."
+msgstr "Please enter a title."
 
 #: resources/vue/components/courseware/structural-element/CoursewareTreeItemAdder.vue:38
 #, fuzzy
@@ -1704,9 +1675,8 @@ msgid "Block bearbeiten"
 msgstr "Edit block"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbar.vue:54
-#, fuzzy
 msgid "Block hinzufügen"
-msgstr "Add block date"
+msgstr "Add block"
 
 #: resources/vue/mixins/courseware/import.js:272
 msgid "Block konnte nicht erstellt werden"
@@ -1758,9 +1728,8 @@ msgid "Blöcke"
 msgstr "Blocks"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbar.vue:31
-#, fuzzy
 msgid "Blöcke hinzufügen"
-msgstr "Add block date"
+msgstr "Add blocks"
 
 #: resources/vue/components/courseware/widgets/CoursewareCommentsOverviewWidgetFilterType.vue:25
 msgid "Blöcke und Seiten"
@@ -1822,17 +1791,15 @@ msgstr "Courseware task feedback"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:422
 msgid "Cover"
-msgstr ""
+msgstr "Cover"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:398
-#, fuzzy
 msgid "Cover entfernen"
-msgstr "Remove form"
+msgstr "Remove cover"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:436
-#, fuzzy
 msgid "Cover wird entfernt"
-msgstr "%s has been removed."
+msgstr "Cover is being removed"
 
 #: resources/vue/components/courseware/blocks/CoursewareIframeBlock.vue:186
 msgid "Creative Commons"
@@ -1935,14 +1902,12 @@ msgid "Datei"
 msgstr "File"
 
 #: resources/vue/components/StudipFileChooser.vue:79
-#, fuzzy
 msgid "Datei \"%{fileName}\" ausgewählt"
-msgstr "Select %{userName}"
+msgstr "File \"%{fileName}\" selected"
 
 #: resources/vue/components/FilesTable.vue:154
-#, fuzzy
 msgid "Datei %{name} auswählen"
-msgstr "Select data field"
+msgstr "Select file %{name}"
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogImport.vue:69
 msgid "Datei ändern"
@@ -1951,9 +1916,8 @@ msgstr "Edit file"
 #: resources/vue/components/StudipFileChooser.vue:64
 #: resources/vue/components/file-chooser/FileChooserDialog.vue:71
 #: resources/vue/components/file-chooser/FileChooserToolbar.vue:84
-#, fuzzy
 msgid "Datei auswählen"
-msgstr "Select room"
+msgstr "Select file"
 
 #: resources/vue/components/courseware/blocks/CoursewareDownloadBlock.vue:64
 #: resources/vue/components/courseware/blocks/CoursewareFolderBlock.vue:86
@@ -2062,14 +2026,12 @@ msgid "Datum"
 msgstr "Date"
 
 #: resources/vue/components/form_inputs/DateListInput.vue:67
-#, fuzzy
 msgid "Datum %{date} entfernt"
-msgstr "Remove data record"
+msgstr "Removed date %{date}"
 
 #: resources/vue/components/form_inputs/DateListInput.vue:60
-#, fuzzy
 msgid "Datum %{date} hinzugefügt"
-msgstr "File has been added."
+msgstr "Added date %{date}"
 
 #: resources/vue/components/courseware/blocks/CoursewareTimelineBlock.vue:119
 msgid "Datum und Zeit"
@@ -2121,9 +2083,8 @@ msgid "Der eingegebene Link ist nicht korrekt und wird nicht angezeigt werden."
 msgstr "The entered link is not correct and will not be displayed."
 
 #: resources/vue/components/form_inputs/CalendarPermissionsTable.vue:42
-#, fuzzy
 msgid "Der Kalender wird mit keinem Kontakt geteilt."
-msgstr "The calendar has not been activated."
+msgstr "The calendar is not shared with any contact."
 
 #: resources/vue/components/file-chooser/FileChooserBox.vue:114
 msgid "Der Ordner wurde angelegt."
@@ -2134,6 +2095,8 @@ msgid ""
 "Der Ordnertyp wurde nach der Erstellung des Blocks geändert! Bitte "
 "überprüfen Sie die Einstellungen."
 msgstr ""
+"The folder type has been changed after the creation of the block! Please "
+"check the settings."
 
 #: resources/vue/mixins/courseware/oermessage.js:17
 msgid "Der Vorschlag wurde verschickt."
@@ -2386,20 +2349,19 @@ msgstr "This file is too large. Please choose a smaller file."
 
 #: resources/vue/components/WikiEditorOnlineUsers.vue:47
 msgid "Diese Person beantragt den Bearbeitungsmodus."
-msgstr ""
+msgstr "This person is requesting the edit mode."
 
 #: resources/vue/components/WikiEditorOnlineUsers.vue:36
 msgid "Diese Person hat den Bearbeitungsmodus."
-msgstr ""
+msgstr "This person has the edit mode."
 
 #: resources/vue/components/courseware/unit/CoursewareUnitProgress.vue:68
 msgid "diese Seite"
 msgstr "this page"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:1035
-#, fuzzy
 msgid "Diese Seite darf nicht gelöscht werden"
-msgstr "The page could not be deleted."
+msgstr "This page must not be deleted"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitProgress.vue:89
 msgid "Diese Seite enthält keine darunter liegenden Seiten."
@@ -2652,9 +2614,8 @@ msgid "Eine Seite"
 msgstr "One page"
 
 #: resources/vue/components/courseware/structural-element/CoursewareRootContent.vue:42
-#, fuzzy
 msgid "Eine Seite hinzufügen"
-msgstr "Add page"
+msgstr "Add a page"
 
 #: resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue:201
 msgid "Eine Seite vor"
@@ -2967,9 +2928,8 @@ msgid "Es werden auch alle Beiträge in diesem Bereich gelöscht!"
 msgstr "All postings in this area will be deleted as well!"
 
 #: resources/vue/components/file-chooser/FileChooserBox.vue:110
-#, fuzzy
 msgid "Es wurde eine Datei hochgeladen."
-msgstr "%s files have been uploaded"
+msgstr "A file has been uploaded."
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockFeedback.vue:43
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementFeedback.vue:41
@@ -4182,9 +4142,8 @@ msgid "jährlich"
 msgstr "yearly"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:101
-#, fuzzy
 msgid "Jährliche Wiederholung"
-msgstr "Daily repetition"
+msgstr "Yearly repetition"
 
 #: resources/assets/javascripts/studip-ui.js:644
 msgid "Jan"
@@ -4229,7 +4188,7 @@ msgstr "Tiles"
 
 #: resources/vue/components/form_inputs/CalendarPermissionsTable.vue:81
 msgid "Kalender nicht mehr mit %{name} teilen"
-msgstr ""
+msgstr "Do not share the calendar with %{name} anymore"
 
 #: resources/vue/components/courseware/blocks/CoursewareDialogCardsBlock.vue:111
 #: resources/vue/components/courseware/blocks/CoursewareDialogCardsBlock.vue:118
@@ -4253,9 +4212,8 @@ msgid "Karussell"
 msgstr "Carousel"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue:71
-#, fuzzy
 msgid "Kategorien-Filter"
-msgstr "Filter categories"
+msgstr "Category filter"
 
 #: resources/assets/javascripts/lib/quick_search.js:70
 msgid "Kein Ergebnis gefunden."
@@ -4270,9 +4228,8 @@ msgid "kein Ordner ausgewählt"
 msgstr "no folder selected"
 
 #: resources/vue/components/StudipFileChooser.vue:69
-#, fuzzy
 msgid "Kein Ordner ausgewählt"
-msgstr "no folder selected"
+msgstr "No folder selected"
 
 #: resources/assets/javascripts/lib/oer.js:23
 msgid "Kein passendes Element für Vollbildmodus."
@@ -4310,9 +4267,8 @@ msgid "Keine Auswahlmöglichkeiten"
 msgstr "No selection possibilities"
 
 #: resources/vue/components/StudipFileChooser.vue:77
-#, fuzzy
 msgid "Keine Datei ausgewählt"
-msgstr "no file selected"
+msgstr "No file selected"
 
 #: resources/vue/components/courseware/layouts/CoursewareFileChooser.vue:13
 msgid "Keine Dateien vorhanden"
@@ -4372,9 +4328,8 @@ msgid "Keine weitere Auswahl möglich"
 msgstr "No further selection possible"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:81
-#, fuzzy
 msgid "Keine Wiederholung"
-msgstr "Repetition"
+msgstr "No repetition"
 
 #: resources/vue/components/courseware/blocks/CoursewareCanvasBlock.vue:99
 msgid "klein"
@@ -4442,7 +4397,7 @@ msgstr "Royal purple"
 
 #: resources/vue/components/form_inputs/CalendarPermissionsTable.vue:28
 msgid "Kontakte, mit denen der Kalender geteilt wird"
-msgstr ""
+msgstr "Contacts the calendar is shared with"
 
 #: resources/vue/components/blubber/ThreadsWidget.vue:21
 msgid "Konversationen"
@@ -4463,7 +4418,7 @@ msgstr "Circle diagram"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:449
 msgid "Künstler"
-msgstr ""
+msgstr "Artist"
 
 #: resources/vue/mixins/courseware/colors.js:120
 msgid "Kürbis"
@@ -4483,9 +4438,8 @@ msgid "Lade Dateien"
 msgstr "Load files"
 
 #: resources/vue/components/file-chooser/FileChooserBox.vue:83
-#, fuzzy
 msgid "Lade Dateien…"
-msgstr "Load files"
+msgstr "Loading files…"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogExport.vue:64
 msgid "Lade Einstellungen"
@@ -5301,7 +5255,7 @@ msgstr "Reload"
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAddChooser.vue:28
 msgid "Neu, Struktur aus Ablaufplan"
-msgstr ""
+msgstr "New, structure from schedule"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:245
 #, fuzzy
@@ -6447,7 +6401,7 @@ msgstr "Search for …"
 
 #: resources/vue/components/tree/TreeSearchResult.vue:30
 msgid "Suche nach dem Begriff \"%{ term }\""
-msgstr ""
+msgstr "Search for the term \"%{ term }\""
 
 #: resources/vue/components/SearchWithFilter.vue:60
 #: resources/vue/components/StudipMultiPersonSearch.vue:33
@@ -6499,7 +6453,7 @@ msgstr "Reset search form"
 #: resources/vue/components/courseware/containers/CoursewareAccordionContainer.vue:175
 #: resources/vue/components/courseware/containers/CoursewareTabsContainer.vue:170
 msgid "Symbol"
-msgstr ""
+msgstr "Symbol"
 
 #: resources/vue/components/courseware/containers/CoursewareTabsContainer.vue:220
 msgid "Tab hinzufügen"
-- 
cgit v1.0


From 1a392c455a370f0629295bd82b9df6a83c26a8f6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Sun, 7 Apr 2024 07:26:42 +0000
Subject: fixes #3969

Closes #3969

Merge request studip/studip!2821
---
 resources/assets/stylesheets/scss/lists.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/assets/stylesheets/scss/lists.scss b/resources/assets/stylesheets/scss/lists.scss
index 8ef1eb7..a260958 100644
--- a/resources/assets/stylesheets/scss/lists.scss
+++ b/resources/assets/stylesheets/scss/lists.scss
@@ -22,8 +22,12 @@ ol {
             content: ",";
         }
 
-        &:last-child::after {
-            content: unset;
+        &:last-child {
+            padding-right: 0;
+
+            &::after {
+                content: unset;
+            }
         }
     }
 
-- 
cgit v1.0


From dd904f39409065663c88cb12b7a1c955fe7fb4e4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Sun, 7 Apr 2024 09:10:37 +0000
Subject: fixes #3968

Closes #3968

Merge request studip/studip!2820
---
 lib/classes/DIContainer.php | 2 +-
 lib/helpers.php             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/classes/DIContainer.php b/lib/classes/DIContainer.php
index 9f0721b..818d191 100644
--- a/lib/classes/DIContainer.php
+++ b/lib/classes/DIContainer.php
@@ -17,7 +17,7 @@ class DIContainer
     /**
      * Get the globally available instance of the container.
      *
-     * @return static
+     * @return ContainerInterface
      */
     public static function getInstance()
     {
diff --git a/lib/helpers.php b/lib/helpers.php
index 6c7accd..a44f10b 100644
--- a/lib/helpers.php
+++ b/lib/helpers.php
@@ -14,13 +14,13 @@ use Psr\Container\ContainerInterface;
  * ```
  * $logger = app(LoggerInterface::class);
  * ```
- *
- * @param string|null $entryId    entry name or a class name
+ * @template T
+ * @param class-string<T>|string|null $entryId    entry name or a class name
  * @param array       $parameters Optional parameters to use to build the entry.
  *                                Use this to force specific parameters to specific values.
  *                                Parameters not defined in this array will be resolved using the container.
  *
- * @return ContainerInterface|mixed either the DI container or the entry associated to the $entryId
+ * @return T|ContainerInterface|mixed either the DI container or the entry associated to the $entryId
  */
 function app($entryId = null, $parameters = [])
 {
-- 
cgit v1.0


From b8a4978ea88c5a5333cb9cf3a448417fdb4e64f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Sun, 7 Apr 2024 09:36:07 +0000
Subject: Resolve #3966 "ILIAS Schnittstelle: SOAP Methode getUser wird noch an
 einer Stelle verwendet"

Closes #3966

Merge request studip/studip!2819
---
 lib/ilias_interface/IliasSoap.class.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/ilias_interface/IliasSoap.class.php b/lib/ilias_interface/IliasSoap.class.php
index f9ffcca..7911e9e 100644
--- a/lib/ilias_interface/IliasSoap.class.php
+++ b/lib/ilias_interface/IliasSoap.class.php
@@ -952,13 +952,9 @@ class IliasSoap extends StudipSoapClient
      */
     function getUserFullname($user_id)
     {
-        $param = [
-                        'sid' => $this->getSID(),
-                        'user_id'         => $user_id,
-        ];
-        $result = $this->call('getUser', $param); // returns user data array
-        $objects = $result;
-        return trim(sprintf('%s %s %s', $result['title'], $result['firstname'], $result['lastname']));
+        $result = $this->getUser($user_id);
+
+        return !empty($result) ? trim(sprintf('%s %s %s', $result['title'], $result['firstname'], $result['lastname'])) : '';
     }
 
     /**
-- 
cgit v1.0


From 696da99526ea372b2334a9de31e5bc1fd228dd58 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 8 Apr 2024 06:59:31 +0000
Subject: fixes #1757

Closes #1757

Merge request studip/studip!2752
---
 app/views/admin/datafields/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/datafields/new.php b/app/views/admin/datafields/new.php
index 0c6f696..e64293f 100644
--- a/app/views/admin/datafields/new.php
+++ b/app/views/admin/datafields/new.php
@@ -45,7 +45,7 @@ use Studip\Button, Studip\LinkButton;
             <?= _('Veranstaltungskategorie') ?>
         <? elseif ($object_typ === 'inst'): ?>
             <?= _('Einrichtungstyp') ?>
-        <? elseif ($object_typ === 'moduldeskriptor' || $object_type === 'modulteildeskriptor') : ?>
+        <? elseif ($object_typ === 'moduldeskriptor' || $object_typ === 'modulteildeskriptor') : ?>
             <?= _('Sprache') ?>
         <? elseif ($object_typ === 'studycourse'): ?>
             <?= _('Typ/Abschnitt') ?>
-- 
cgit v1.0


From 9aef3af998d6e0cf3276db84201179c6cfe96528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCttl=C3=B6ffel?=
 <schuettloeffel@zqs.uni-hannover.de>
Date: Mon, 8 Apr 2024 07:25:51 +0000
Subject: =?UTF-8?q?Resolve=20"Sichtbarkeitseinstellung:=20irref=C3=BChrend?=
 =?UTF-8?q?er=20Hinweis"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3859

Merge request studip/studip!2770
---
 lib/seminar_open.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/seminar_open.php b/lib/seminar_open.php
index e5c4cf7..1c0056b 100644
--- a/lib/seminar_open.php
+++ b/lib/seminar_open.php
@@ -222,7 +222,15 @@ if (is_object($GLOBALS['user'])
     die;
 }
 
-if (Config::get()->USER_VISIBILITY_CHECK && is_object($GLOBALS['user']) && $GLOBALS['user']->id !== 'nobody') {
+if (
+    Config::get()->USER_VISIBILITY_CHECK
+    && is_object($GLOBALS['user'])
+    && $GLOBALS['user']->id !== 'nobody'
+    && !(
+        Config::get()->DOZENT_ALWAYS_VISIBLE
+        && $perm->get_perm() === 'dozent'
+    )
+) {
     require_once('lib/user_visible.inc.php');
     first_decision($GLOBALS['user']->id);
 }
-- 
cgit v1.0


From 1fe008a1aee1186e90642f5f82c2a83c3dc53952 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Mon, 8 Apr 2024 08:14:17 +0000
Subject: Resolve "Wiki-Bearbeiten wird nicht freigegeben, wenn gespeichert
 wird"

Closes #3970

Merge request studip/studip!2822
---
 app/controllers/course/wiki.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 06317b6..ac478c1 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -532,6 +532,15 @@ class Course_WikiController extends AuthenticatedController
 
         $page->content = \Studip\Markup::markAsHtml(trim(Request::get('content')));
         $page->store();
+        $user = User::findCurrent();
+        $pageData = [
+            'page_id' => $page->id,
+            'user_id' => $user->id
+        ];
+        WikiOnlineEditingUser::deleteBySQL(
+            '`page_id` = :page_id AND `user_id` = :user_id',
+            $pageData
+        );
         PageLayout::postSuccess(_('Die Seite wurde gespeichert.'));
         $this->redirect($this->pageURL($page));
     }
-- 
cgit v1.0


From f112b9ed5d1b5e81e0a88992b980fbe8849829bd Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Mon, 8 Apr 2024 09:45:37 +0000
Subject: =?UTF-8?q?Resolve=20"Wiki=20=C3=84nderungen=20seit=20letztem=20Be?=
 =?UTF-8?q?such=20zeigt=20zu=20viel=20Text=20an"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3972

Merge request studip/studip!2823
---
 app/views/course/wiki/newpages.php          | 20 ++++++++++++++++----
 resources/assets/stylesheets/scss/wiki.scss |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/views/course/wiki/newpages.php b/app/views/course/wiki/newpages.php
index d9e0dce..d165819 100644
--- a/app/views/course/wiki/newpages.php
+++ b/app/views/course/wiki/newpages.php
@@ -55,36 +55,39 @@
             <td>
             <?
                 $authors = [$page->user_id => $page->user];
+                $versions = [$page];
                 $oldcontent = "";
                 $oldversion = $page;
                 while ($oldversion = $oldversion->predecessor) {
                     if ($oldversion->mkdate >= $last_visit && $oldversion->user_id !== User::findCurrent()->id) {
                         $oldcontent = $oldversion->content;
                         if (!isset($authors[$oldversion->user_id])) {
+                            $versions[] = $oldversion;
                             $authors[$oldversion->user_id] = $oldversion->user;
                         }
                     } else {
                         break;
                     }
                 }
+                $oldcontent = $oldversion->content;
                 $oldcontent = strip_tags(wikiReady($oldcontent));
                 $content = strip_tags(wikiReady($page->content));
 
                 $commonFromStart = $controller->findLongestCommonSubstring($content, $oldcontent);
                 $commonFromEnd = $controller->findLongestCommonSubstring($content, $oldcontent, true);
 
-                $content = mb_substr($content, $commonFromStart, $commonFromEnd);
-                $oldcontent = mb_substr($oldcontent, $commonFromStart, $commonFromEnd);
+                $oldcontent = mb_substr($oldcontent, $commonFromStart, mb_strlen($oldcontent) - mb_strlen($content));
+                $content = mb_substr($content, $commonFromStart, $commonFromEnd - $commonFromStart);
                 if ($content) {
                     echo htmlReady(mila($content, 300), true, true);
                 } elseif ($oldcontent) {
-                    echo _('Gelöscht') . ': ' . htmlReady($oldcontent, true, true);
+                    echo _('Gelöscht') . ': ' . htmlReady(mila($oldcontent, 300), true, true);
                 }
             ?>
             </td>
             <td>
                 <ul class="wiki_authors">
-                <? foreach ($authors as $user) : ?>
+                <? foreach ($authors as $user_id => $user) : ?>
                     <li>
                     <? if ($user): ?>
                         <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $user->username]) ?>"
@@ -95,6 +98,15 @@
                     <? else: ?>
                         <?= _('unbekannt') ?>
                     <? endif; ?>
+                    <? foreach ($versions as $version) : ?>
+                        <? if ($version->user_id === $user_id) : ?>
+                            <a href="<?= $controller->versiondiff($page, is_a($version, 'WikiVersion') ? $version->id : null) ?>"
+                               title="<?= _('Einzelne Änderung anzeigen') ?>"
+                               data-dialog>
+                                <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?>
+                            </a>
+                        <? endif ?>
+                   <? endforeach ?>
                     </li>
                 <? endforeach ?>
                 </ul>
diff --git a/resources/assets/stylesheets/scss/wiki.scss b/resources/assets/stylesheets/scss/wiki.scss
index e19b9b1..323fbb5 100644
--- a/resources/assets/stylesheets/scss/wiki.scss
+++ b/resources/assets/stylesheets/scss/wiki.scss
@@ -190,12 +190,12 @@ article.studip.wiki {
      padding: 0;
      li {
          margin-bottom: 5px;
+         display: flex;
      }
      a {
          background-position: left top;
          background-repeat: no-repeat;
          background-size: var(--avatar-small);
-         display: block;
          min-height: var(--avatar-small);
          padding-left: calc(var(--avatar-small) + 1ex);
      }
-- 
cgit v1.0


From 903cbdcff34dd9138f82cee2887d7a69704c46da Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Mon, 8 Apr 2024 10:29:15 +0000
Subject: Resolve "Wikiseite angeblich vom 1.1.1970"

Closes #3973

Merge request studip/studip!2825
---
 app/controllers/course/wiki.php | 55 ++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index ac478c1..8c891ba 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -117,8 +117,9 @@ class Course_WikiController extends AuthenticatedController
         $startPage = WikiPage::find($this->range->getConfiguration()->WIKI_STARTPAGE_ID);
         $this->contentbar = ContentBar::get()
             ->setTOC(CoreWiki::getTOC($this->page))
-            ->setIcon(Icon::create('wiki'))
-            ->setInfo(sprintf(
+            ->setIcon(Icon::create('wiki'));
+        if (!$this->page->isNew()) {
+            $this->contentbar->setInfo(sprintf(
                 _('Version %1$s, geändert von %2$s <br> am %3$s'),
                 $this->page->versionnumber,
                 sprintf(
@@ -128,33 +129,35 @@ class Course_WikiController extends AuthenticatedController
                 ),
                 date('d.m.Y H:i:s', $this->page['chdate'])
             ));
-        $action_menu = ActionMenu::get();
-        if ($this->page->isEditable()) {
-            $action_menu->addLink(
-                $this->editURL($this->page),
-                _('Bearbeiten'),
-                Icon::create('edit')
-            );
+            $action_menu = ActionMenu::get();
+            if ($this->page->isEditable()) {
+                $action_menu->addLink(
+                    $this->editURL($this->page),
+                    _('Bearbeiten'),
+                    Icon::create('edit')
+                );
+                $action_menu->addLink(
+                    $this->pagesettingsURL($this->page->id),
+                    _('Seiteneinstellungen'),
+                    Icon::create('settings'),
+                    ['data-dialog' => 'width=700']
+                );
+                $action_menu->addButton(
+                    'delete',
+                    _('Seite löschen'),
+                    Icon::create('trash'),
+                    ['data-confirm' => _('Wollen Sie wirklich die komplette Seite löschen?'), 'form' => 'delete_page']
+                );
+            }
             $action_menu->addLink(
-                $this->pagesettingsURL($this->page->id),
-                _('Seiteneinstellungen'),
-                Icon::create('settings'),
-                ['data-dialog' => 'width=700']
-            );
-            $action_menu->addButton(
-                'delete',
-                _('Seite löschen'),
-                Icon::create('trash'),
-                ['data-confirm' => _('Wollen Sie wirklich die komplette Seite löschen?'), 'form' => 'delete_page']
+                '#',
+                _('Als Vollbild anzeigen'),
+                Icon::create('screen-full'),
+                ['class' => 'fullscreen-trigger hidden-medium-down']
             );
+            $this->contentbar->setActionMenu($action_menu);
         }
-        $action_menu->addLink(
-            '#',
-            _('Als Vollbild anzeigen'),
-            Icon::create('screen-full'),
-            ['class' => 'fullscreen-trigger hidden-medium-down']
-        );
-        $this->contentbar->setActionMenu($action_menu);
+
     }
 
     public function pagesettings_action(WikiPage $page)
-- 
cgit v1.0


From bcd76d3c5ac715a33668d4c6611b7be8f11e3404 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 8 Apr 2024 12:16:45 +0000
Subject: fixes #3964

Closes #3964

Merge request studip/studip!2824
---
 .../5.1.55_fix_collation_on_oer_campus_tables.php  | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 db/migrations/5.1.55_fix_collation_on_oer_campus_tables.php

diff --git a/db/migrations/5.1.55_fix_collation_on_oer_campus_tables.php b/db/migrations/5.1.55_fix_collation_on_oer_campus_tables.php
new file mode 100644
index 0000000..8c9a8b4
--- /dev/null
+++ b/db/migrations/5.1.55_fix_collation_on_oer_campus_tables.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This migration will set the columns of the oer campus to the correct state
+ * regarding the collations of some columns. This should only be necessary if
+ * the plugin "Lernmarktplatz" was installed before the migration of Stud.IP
+ * that introduced the oer campus. In any other case the tables should not be
+ * changed since they are already in the correct format.
+ *
+ * @see https://gitlab.studip.de/studip/studip/-/issues/3964
+ *
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ */
+final class FixCollationOnOerCampusTables extends Migration
+{
+    public function description()
+    {
+        return 'Correct collations for oer campus tables';
+    }
+
+    protected function up()
+    {
+        $query = "ALTER TABLE `oer_abo`
+                  MODIFY COLUMN `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL DEFAULT '',
+                  MODIFY COLUMN `material_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_comments`
+                  MODIFY COLUMN `comment_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `review_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `foreign_comment_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL,
+                  MODIFY COLUMN `host_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL,
+                  MODIFY COLUMN `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_downloadcounter`
+                  MODIFY COLUMN `counter_id` CHAR(32) COLLATE `latin1_bin` NOT NULL DEFAULT '',
+                  MODIFY COLUMN `material_id` CHAR(32) COLLATE `latin1_bin` NOT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_hosts`
+                  MODIFY COLUMN `host_id` CHAR(32) COLLATE `latin1_bin` NOT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_material`
+                  MODIFY COLUMN `material_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `foreign_material_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL,
+                  MODIFY COLUMN `host_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_material_users`
+                  MODIFY COLUMN `material_id` CHAR(32) COLLATE `latin1_bin` NOT NULL DEFAULT '',
+                  MODIFY COLUMN `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL DEFAULT ''";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_reviews`
+                  MODIFY COLUMN `review_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `material_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `foreign_review_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL,
+                  MODIFY COLUMN `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `host_id` CHAR(32) COLLATE `latin1_bin` DEFAULT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_tags`
+                  MODIFY COLUMN `tag_hash` CHAR(32) COLLATE `latin1_bin` NOT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_tags_material`
+                  MODIFY COLUMN `material_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `tag_hash` CHAR(32) COLLATE `latin1_bin` NOT NULL";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `oer_user`
+                  MODIFY COLUMN `user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `foreign_user_id` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                  MODIFY COLUMN `host_id` CHAR(32) COLLATE `latin1_bin` NOT NULL";
+        DBManager::get()->exec($query);
+    }
+}
-- 
cgit v1.0


From 922feaedbdae60833b6c696eb21ada653a7405a4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 9 Apr 2024 10:33:28 +0000
Subject: add command to reset compiled di container, fixes #3979

Closes #3979

Merge request studip/studip!2829
---
 cli/Commands/DI/Reset.php   | 30 ++++++++++++++++++++++++++++++
 cli/studip                  |  1 +
 lib/classes/DIContainer.php | 15 ++++++++++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 cli/Commands/DI/Reset.php

diff --git a/cli/Commands/DI/Reset.php b/cli/Commands/DI/Reset.php
new file mode 100644
index 0000000..646bfb6
--- /dev/null
+++ b/cli/Commands/DI/Reset.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Studip\Cli\Commands\DI;
+
+use Studip\DIContainer;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Reset extends Command
+{
+    protected static $defaultName = 'di:reset';
+
+    protected function configure(): void
+    {
+        $this->setDescription('Resets the compiled DI container');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $file = DIContainer::getCompilationPath() . '/' . DIContainer::getCompilationClass() . '.php';
+
+        if (file_exists($file) && !unlink($file)) {
+            $output->writeln('<error>Could not removed compiled file.</error>');
+            return Command::FAILURE;
+        }
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/cli/studip b/cli/studip
index a46a00d..971ad8e 100755
--- a/cli/studip
+++ b/cli/studip
@@ -33,6 +33,7 @@ $commands = [
     Commands\Cronjobs\CronjobWorker::class,
     Commands\DB\Dump::class,
     Commands\DB\MoveMatrikelnummer::class,
+    Commands\DI\Reset::class,
     Commands\Files\Dump::class,
     Commands\Fix\Biest7789::class,
     Commands\Fix\Biest7866::class,
diff --git a/lib/classes/DIContainer.php b/lib/classes/DIContainer.php
index 818d191..307ed4a 100644
--- a/lib/classes/DIContainer.php
+++ b/lib/classes/DIContainer.php
@@ -47,7 +47,10 @@ class DIContainer
     {
         $builder = new ContainerBuilder();
         if (\Studip\ENV == 'production') {
-            $builder->enableCompilation($GLOBALS['TMP_PATH']);
+            $builder->enableCompilation(
+                self::getCompilationPath(),
+                self::getCompilationClass()
+            );
         }
         $builder->ignorePhpDocErrors(true);
         $builder->addDefinitions('lib/bootstrap-definitions.php');
@@ -60,4 +63,14 @@ class DIContainer
 
         return $builder;
     }
+
+    public static function getCompilationPath(): string
+    {
+        return $GLOBALS['TMP_PATH'];
+    }
+
+    public static function getCompilationClass(): string
+    {
+        return 'CompiledContainer';
+    }
 }
-- 
cgit v1.0


From f81c53eec54e7f9a7fa7b16b3ee5ffdb4942558c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 9 Apr 2024 11:06:37 +0000
Subject: allow webp in main docker file as well, re #3935

Merge request studip/studip!2827
---
 docker/studip/Dockerfile     | 3 ++-
 docker/studip/Dockerfile-Dev | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index bc65e81..76fe2d9 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -11,11 +11,12 @@ RUN apt update && apt install -y --no-install-recommends \
         libonig-dev \
         libzip-dev \
         libicu-dev \
+        libwebp-dev \
         vim \
     && rm -rf /var/lib/apt/lists/*
 
 # Install php extensions
-RUN docker-php-ext-configure gd --with-jpeg
+RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
 
 FROM node:16 as nodejs
diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev
index 1549fdb..112825a 100644
--- a/docker/studip/Dockerfile-Dev
+++ b/docker/studip/Dockerfile-Dev
@@ -11,11 +11,12 @@ RUN apt update && apt install -y --no-install-recommends \
         libonig-dev \
         libzip-dev \
         libicu-dev \
+        libwebp-dev \
         vim \
     && rm -rf /var/lib/apt/lists/*
 
 # Install php extensions
-RUN docker-php-ext-configure gd --with-jpeg
+RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
 
 
-- 
cgit v1.0


From 4693ea0ffae7aabe02337e43b891a7df89cd03c7 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 9 Apr 2024 11:22:25 +0000
Subject: prevent sql-errors, closes #3981

Closes #3981

Merge request studip/studip!2831
---
 lib/classes/calendar/CalendarScheduleModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/calendar/CalendarScheduleModel.php b/lib/classes/calendar/CalendarScheduleModel.php
index 468b7e2..0aeadee 100644
--- a/lib/classes/calendar/CalendarScheduleModel.php
+++ b/lib/classes/calendar/CalendarScheduleModel.php
@@ -623,7 +623,7 @@ class CalendarScheduleModel
                     SET visible = 0
                     WHERE seminar_id = ? AND user_id = ? AND metadate_id = ?");
             } else {
-                $stmt = DBManager::get()->prepare("INSERT INTO schedule_seminare
+                $stmt = DBManager::get()->prepare("INSERT IGNORE INTO schedule_seminare
                     (seminar_id, user_id, metadate_id, visible)
                     VALUES(?, ?, ?, 0)");
             }
-- 
cgit v1.0


From 4682fb5d4273881465d60817a2731a32ba0ed054 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 9 Apr 2024 11:30:55 +0000
Subject: fixes  #3980

Closes #3980

Merge request studip/studip!2830
---
 app/controllers/course/room_requests.php           | 73 +++++++++++-----------
 .../room_requests/request_find_matching_rooms.php  |  2 +-
 app/views/course/timesrooms/editDate.php           | 28 +++++----
 3 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index 14c0179..b1db632 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -274,7 +274,6 @@ class Course_RoomRequestsController extends AuthenticatedController
             $this->selected_room_id = Request::get('selected_room_id');
             $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
             $_SESSION[$request_id]['select_room'] = true;
-
             $this->redirect(
                 'course/room_requests/request_check_properties/' . $this->request_id
             );
@@ -289,8 +288,6 @@ class Course_RoomRequestsController extends AuthenticatedController
             );
             return;
         }
-
-        // or we filter via category
         else if (Request::get('category_id') && Request::submitted('select_properties')) {
             $_SESSION[$request_id]['search_by'] = 'category';
             $_SESSION[$request_id]['room_category_id'] = Request::get('category_id');
@@ -310,39 +307,13 @@ class Course_RoomRequestsController extends AuthenticatedController
 
         // for step 2: after choosing a specific room OR searching via properties
         if ($this->step === 2) {
-            if ($_SESSION[$request_id]['search_by'] == 'roomname') {
-                // find category via room
-                $this->category = ResourceCategory::find($this->selected_room_category_id);
-                if ($this->category) {
-                    $this->available_properties = $this->category->getRequestableProperties();
-                }
-
-                $this->selected_properties = $_SESSION[$request_id]['selected_properties'];
-                $this->room = Room::find($_SESSION[$request_id]['room_id']);
-                $this->selected_properties['seats'] = $_SESSION[$request_id]['selected_properties']['seats']
-                    ?: $this->course->admission_turnout
-                    ?: Config::get()->RESOURCES_ROOM_REQUEST_DEFAULT_SEATS;
-                $_SESSION[$request_id]['selected_properties']['seats'] = $this->selected_properties['seats'];
-            } else if ($_SESSION[$request_id]['search_by'] === 'category') {
-                $this->room = Room::find($_SESSION[$request_id]['room_id']);
-                if ($this->room) {
-                    $this->grouped_properties = $this->room->getGroupedProperties();
-                    foreach ($this->grouped_properties as $properties) {
-                        foreach ($properties as $property) {
-                            $this->selected_properties[$property->name] = $property->state;
-                        }
-                    }
-                }
-
-            }
-
             // find rooms fitting to category and properties
             if (Request::submitted('search_rooms')) {
                 $this->selected_properties = Request::getArray('selected_properties');
                 $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
                 // no min number of seats
                 if (
-                    (!$_SESSION[$request_id]['selected_properties']['seats'] || $_SESSION[$request_id]['selected_properties']['seats'] < 1)
+                    (!isset($_SESSION[$request_id]['selected_properties']['seats']) || $_SESSION[$request_id]['selected_properties']['seats'] < 1)
                     && $_SESSION[$request_id]['search_by'] === 'category'
                 ) {
                     PageLayout::postError(
@@ -360,13 +331,42 @@ class Course_RoomRequestsController extends AuthenticatedController
                 }
             }
 
-            // let's find all the properties belonging to the selected category
-            $this->room_category_id = $_SESSION[$request_id]['room_category_id'];
-            $this->category = ResourceCategory::find($this->room_category_id);
-            $this->available_properties = $this->category->getRequestableProperties();
+            if ($_SESSION[$request_id]['search_by'] === 'roomname') {
+                // find category via room
+                $this->category = ResourceCategory::find($this->selected_room_category_id);
+                if ($this->category) {
+                    $this->available_properties = $this->category->getRequestableProperties();
+                }
+
+                $this->selected_properties = $_SESSION[$request_id]['selected_properties'] ?? null;
+                $this->room = Room::find($_SESSION[$request_id]['room_id']);
+                if (!isset($_SESSION[$request_id]['selected_properties']['seats'])) {
+                    $this->selected_properties['seats'] = $this->course->admission_turnout ?? Config::get()->RESOURCES_ROOM_REQUEST_DEFAULT_SEATS;
+                }
+                $_SESSION[$request_id]['selected_properties']['seats'] = $this->selected_properties['seats'];
+                $_SESSION[$request_id]['room_category_id'] = $this->selected_room_category_id;
+            } else if ($_SESSION[$request_id]['search_by'] === 'category') {
+                $this->room = Room::find($_SESSION[$request_id]['room_id']);
+                if ($this->room) {
+                    $this->grouped_properties = $this->room->getGroupedProperties();
+                    $this->selected_properties = [];
+                    foreach ($this->grouped_properties as $properties) {
+                        foreach ($properties as $property) {
+                            $this->selected_properties[$property->name] = $property->state;
+                        }
+                    }
+                }
+            } else {
+                // let's find all the properties belonging to the selected category
+                $this->room_category_id = $_SESSION[$request_id]['room_category_id'];
+                $this->category = ResourceCategory::find($this->room_category_id);
+                if ($this->category) {
+                    $this->available_properties = $this->category->getRequestableProperties();
+                }
+                // properties, like 'Sitzplätze', 'behindertengerecht' etc
+                $this->selected_properties = $_SESSION[$request_id]['selected_properties'] ?? null;
+            }
 
-            // properties, like 'Sitzplätze', 'behindertengerecht' etc
-            $this->selected_properties = $_SESSION[$request_id]['selected_properties'] ?? null;
             $this->preparation_time = $_SESSION[$request_id]['preparation_time'] ?? null;
             $this->comment = $_SESSION[$request_id]['comment'] ?? null;
             $this->request->category_id = $_SESSION[$request_id]['room_category_id'];
@@ -376,6 +376,7 @@ class Course_RoomRequestsController extends AuthenticatedController
                 $this->selected_room_id = Request::get('selected_room_id');
                 $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
                 $_SESSION[$request_id]['selected_properties'] = Request::getArray('selected_properties');
+                $_SESSION[$request_id]['room_category_id'] = $this->room_category_id;
                 $this->redirect('course/room_requests/request_show_summary/' . $this->request_id );
             }
         }
diff --git a/app/views/course/room_requests/request_find_matching_rooms.php b/app/views/course/room_requests/request_find_matching_rooms.php
index 01f42a4..0a11aeb 100644
--- a/app/views/course/room_requests/request_find_matching_rooms.php
+++ b/app/views/course/room_requests/request_find_matching_rooms.php
@@ -41,7 +41,7 @@
                             ]
                         ) ?>
 
-                            <? if ($category) : ?>
+                            <? if (!empty($category)) : ?>
                             <?= Icon::create('decline')->asInput(
                                 [
                                     'title' => _('alle Angaben zurücksetzen'),
diff --git a/app/views/course/timesrooms/editDate.php b/app/views/course/timesrooms/editDate.php
index c4bd405..e3bde2c 100644
--- a/app/views/course/timesrooms/editDate.php
+++ b/app/views/course/timesrooms/editDate.php
@@ -224,20 +224,24 @@
               ['data-dialog' => 'size=big']) ?>
         <? endif ?>
         <? if (Request::isXhr() && !$locked && Config::get()->RESOURCES_ENABLE && Config::get()->RESOURCES_ALLOW_ROOM_REQUESTS): ?>
-            <?  ?>
-            <?= Studip\LinkButton::create(
-                (isset($request_id) ? _('Zur Raumanfrage wechseln') : _('Raumanfrage erstellen')),
-                (
-                    isset($request_id)
-                    ? $controller->url_for(
+            <? if (isset($request_id)) : ?>
+                <?= Studip\LinkButton::create(
+                    _('Zur Raumanfrage wechseln'),
+                    $controller->url_for(
                         'course/room_requests/request_show_summary/' . $request_id
-                    )
-                    :  $controller->url_for(
-                        'course/room_requests/new_request/' . $request_id,
+                    ),
+                    ['data-dialog' => 'size=big']
+                ) ?>
+            <? else : ?>
+                <?= Studip\LinkButton::create(
+                    _('Raumanfrage erstellen'),
+                    $controller->url_for(
+                        'course/room_requests/new_request',
                         array_merge($params, ['range_str' => 'date', 'range_id' => $date->id])
-                    )
-                ),
-                ['data-dialog' => 'size=big']) ?>
+                    ),
+                    ['data-dialog' => 'size=big']
+                ) ?>
+            <? endif ?>
         <? endif ?>
     </footer>
 </form>
-- 
cgit v1.0


From 5a70856f301dcbe2e398ff735c1d9a2c706d7ac5 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Tue, 9 Apr 2024 12:04:31 +0000
Subject: Resolve "PHP Warnungen im WIKI"

Closes #3967

Merge request studip/studip!2832
---
 app/controllers/course/wiki.php    | 2 +-
 app/views/course/wiki/newpages.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 8c891ba..b8a50dc 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -389,7 +389,7 @@ class Course_WikiController extends AuthenticatedController
             $this->redirect($this->editURL($page));
             return;
         }
-        if (!$page->isEditable()) {
+        if ($page->isNew() || !$page->isEditable()) {
             throw new AccessDeniedException();
         }
         Navigation::activateItem('/course/wiki/start');
diff --git a/app/views/course/wiki/newpages.php b/app/views/course/wiki/newpages.php
index d165819..99e0f29 100644
--- a/app/views/course/wiki/newpages.php
+++ b/app/views/course/wiki/newpages.php
@@ -69,7 +69,9 @@
                         break;
                     }
                 }
-                $oldcontent = $oldversion->content;
+                if ($oldversion) {
+                    $oldcontent = $oldversion->content;
+                }
                 $oldcontent = strip_tags(wikiReady($oldcontent));
                 $content = strip_tags(wikiReady($page->content));
 
-- 
cgit v1.0


From 5d2d193451ebe0404f637edf0b23a9860bc07721 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 9 Apr 2024 13:44:02 +0000
Subject: use static instead of get_called_class(), fixes #3976

Closes #3976

Merge request studip/studip!2826
---
 lib/models/SimpleORMap.class.php | 45 +++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/lib/models/SimpleORMap.class.php b/lib/models/SimpleORMap.class.php
index 4a0caa3..89cdd09 100644
--- a/lib/models/SimpleORMap.class.php
+++ b/lib/models/SimpleORMap.class.php
@@ -246,7 +246,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     protected static function configure($config = [])
     {
-        $class = get_called_class();
+        $class = static::class;
 
         if (empty($config['db_table'])) {
             $config['db_table'] = strtolower($class);
@@ -459,8 +459,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     public static function find($id)
     {
-        $class = get_called_class();
-        $ref = new ReflectionClass($class);
+        $ref = new ReflectionClass(static::class);
         /** @var static $record */
         $record = $ref->newInstanceArgs(func_get_args());
         if (!$record->isNew()) {
@@ -480,9 +479,8 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
     {
         $ret = false;
         $db_table = static::db_table();
-        $class = get_called_class();
-        $record = new $class();
-        call_user_func_array([$record, 'setId'], func_get_args());
+        $record = new static();
+        $record->setId(...func_get_args());
         $where_query = $record->getWhereQuery();
         if ($where_query) {
             $query = "SELECT 1 FROM `$db_table` WHERE "
@@ -521,8 +519,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     public static function create($data)
     {
-        $class = get_called_class();
-        $record = new $class();
+        $record = new static();
         $record->setData($data, false);
         if ($record->store()) {
             return $record;
@@ -540,9 +537,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     public static function build($data, $is_new = true)
     {
-        $class = get_called_class();
-        /** @var static $record */
-        $record = new $class();
+        $record = new static();
         $record->setData($data, !$is_new);
         $record->setNew($is_new);
         return $record;
@@ -570,7 +565,6 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     public static function import($data)
     {
-        $class = get_called_class();
         $record_data = [];
         $relation_data = [];
         foreach ($data as $key => $value) {
@@ -581,8 +575,8 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
             }
         }
         $record = static::toObject($record_data);
-        if (!$record instanceof $class) {
-            $record = new $class();
+        if (!$record instanceof static) {
+            $record = new static();
             $record->setData($record_data, true);
         } else {
             $record->setData($record_data);
@@ -856,8 +850,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     public static function toObject($id_or_object)
     {
-        $class = get_called_class();
-        if ($id_or_object instanceof $class) {
+        if ($id_or_object instanceof static) {
             return $id_or_object;
         }
         if (is_array($id_or_object)) {
@@ -880,31 +873,31 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
         } else {
             $id = $id_or_object;
         }
-        return call_user_func([$class, 'find'], $id);
+        return static::find($id);
     }
 
     /**
      * interceptor for static findByColumn / findEachByColumn / countByColumn /
      * deleteByColumn magic
+     *
      * @param string $name
      * @param array $arguments
      * @throws BadMethodCallException
      * @return int|static|static[]
      */
-    public static function __callStatic($name, $arguments)
+    public static function __callStatic(string $name, array $arguments)
     {
         $db_table = static::db_table();
         $alias_fields = static::alias_fields();
         $db_fields = static::db_fields();
         $name = strtolower($name);
-        $class = get_called_class();
         $order = '';
         $param_arr = [];
         $where = '';
         $where_param = is_array($arguments[0]) ? $arguments[0] : [$arguments[0]];
-        $prefix = strstr($name, 'by', true);
-        $field = substr($name, strlen($prefix) + 2);
-        switch ($prefix) {
+        $action = strstr($name, 'by', true);
+        $field = substr($name, strlen($action) + 2);
+        switch ($action) {
             case 'findone':
                 $order = $arguments[1] ?? '';
                 $param_arr[0] =& $where;
@@ -930,19 +923,19 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
             case 'delete':
                 $param_arr[0] =& $where;
                 $param_arr[1] = [$where_param];
-                $method = "{$prefix}bysql";
+                $method = "{$action}bysql";
                 break;
             default:
-                throw new BadMethodCallException("Method $class::$name not found");
+                throw new BadMethodCallException("Method " . static::class . "::$name not found");
         }
         if (isset($alias_fields[$field])) {
             $field = $alias_fields[$field];
         }
         if (isset($db_fields[$field])) {
             $where = "`$db_table`.`$field` IN(?) " . $order;
-            return call_user_func_array([$class, $method], $param_arr);
+            return call_user_func_array([static::class, $method], $param_arr);
         }
-        throw new BadMethodCallException("Method $class::$name not found");
+        throw new BadMethodCallException("Method " . static::class . "::$name not found");
     }
 
     /**
-- 
cgit v1.0


From 086864d456cb0e1bab8d3394ca9aa3b8b9eddaed Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 9 Apr 2024 14:44:19 +0000
Subject: fixes #3978

Closes #3978

Merge request studip/studip!2828
---
 lib/classes/ModulesNotification.class.php | 19 ++++++++++---------
 templates/mail/notification_html.php      |  2 +-
 templates/mail/notification_text.php      |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/classes/ModulesNotification.class.php b/lib/classes/ModulesNotification.class.php
index 3ee6642..f414071 100644
--- a/lib/classes/ModulesNotification.class.php
+++ b/lib/classes/ModulesNotification.class.php
@@ -126,7 +126,8 @@ class ModulesNotification
             $navigation = MyRealmModel::getAdditionalNavigations($seminar_id, $s_data, null, $user_id, $visit_data[$seminar_id]);
             $n_data = [];
             foreach ($this->registered_notification_modules as $id => $m_data) {
-                if (in_array($id, $s_data['notification'])
+                if (
+                    in_array($id, $s_data['notification'])
                     && isset($navigation[$id])
                     && $navigation[$id]->getImage()
                     && $navigation[$id]->getImage()->getRole() === Icon::ROLE_ATTENTION
@@ -168,14 +169,14 @@ class ModulesNotification
         $base_url = URLHelper::setBaseURL('');
         URLHelper::setBaseURl($base_url);
         if ($nav instanceof Navigation && $nav->isVisible(true)) {
-                $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&');
-                $icon = $nav->getImage();
-                $text = $nav->getTitle();
-                if (!$text) {
-                    $text = $this->registered_notification_modules[$id]['name'];
-                }
-                $text .= ' - ' .  $nav->getLinkAttributes()['title'];
-                return compact('text', 'url', 'icon', 'seminar_id');
+            $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&');
+            $icon = $nav->getImage();
+            $text = $nav->getTitle();
+            if (!$text) {
+                $text = $this->registered_notification_modules[$id]['name'];
             }
+            $text .= ' - ' .  $nav->getLinkAttributes()['title'];
+            return compact('text', 'url', 'icon', 'seminar_id');
+        }
     }
 }
diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php
index 48f4cef..d046cb2 100644
--- a/templates/mail/notification_html.php
+++ b/templates/mail/notification_html.php
@@ -94,7 +94,7 @@
               <? foreach ($news as $sem_titel => $data) : ?>
                 <tr class="table_header_bold">
                   <td style="font-weight: bold;">
-                    <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?>">
+                    <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?>">
                       <?= htmlReady($sem_titel) ?>
                       <?= (($semester = Course::find($data[0]['range_id'])->semester_text) ? ' ('.$semester.')' : '') ?>
                     </a>
diff --git a/templates/mail/notification_text.php b/templates/mail/notification_text.php
index bac0d5e..47b8a4a 100644
--- a/templates/mail/notification_text.php
+++ b/templates/mail/notification_text.php
@@ -14,7 +14,7 @@
 <? foreach ($news as $sem_titel => $data) : ?>
 <?= sprintf(_("In der Veranstaltung \"%s\" gibt es folgende Neuigkeiten:"), $sem_titel) ?>
 
-<?= URLHelper::getURL('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?>
+<?= URLHelper::getURL('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?>
 
 
 <? foreach ($data as $module) : ?>
-- 
cgit v1.0


From c680176306b18a13b3a3acd69f6c5e84c9d4ea11 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 10 Apr 2024 09:03:47 +0000
Subject: fixes #3983

Closes #3983

Merge request studip/studip!2835
---
 lib/models/calendar/CalendarDate.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/models/calendar/CalendarDate.class.php b/lib/models/calendar/CalendarDate.class.php
index e9269c6..7026ece 100644
--- a/lib/models/calendar/CalendarDate.class.php
+++ b/lib/models/calendar/CalendarDate.class.php
@@ -402,8 +402,8 @@ class CalendarDate extends SimpleORMap implements PrivacyObject
         $sorm = self::findThru($storage->user_id, [
             'thru_table'        => 'calendar_date_assignments',
             'thru_key'          => 'range_id',
-            'thru_assoc_key'    => 'event_id',
-            'assoc_foreign_key' => 'event_id',
+            'thru_assoc_key'    => 'calendar_date_id',
+            'assoc_foreign_key' => 'id',
         ]);
         if ($sorm) {
             $field_data = [];
-- 
cgit v1.0


From cd724f840d929141a8c7c9396fc76c330df35d62 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 10 Apr 2024 09:28:26 +0000
Subject: make ci job build_image interruptible, fixes #3987

Closes #3987

Merge request studip/studip!2837
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7172007..54dda7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -419,6 +419,7 @@ build_image:
     entrypoint: [""]
   stage: build
   when: manual
+  interruptible: true
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
   script:
-- 
cgit v1.0


From 8d2c6f5ae8a99218d277ae2aa7ad1abaa72378d1 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 10 Apr 2024 10:52:48 +0000
Subject: Resolve "Barrierefreiheit: "Back to top" ist nicht per Tabulator
 erreichbar"

Closes #3941

Merge request studip/studip!2800
---
 resources/assets/javascripts/lib/scroll_to_top.js | 22 ++++++++++++++--------
 templates/layouts/base.php                        |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/assets/javascripts/lib/scroll_to_top.js b/resources/assets/javascripts/lib/scroll_to_top.js
index 2a75402..9b0d3ee 100644
--- a/resources/assets/javascripts/lib/scroll_to_top.js
+++ b/resources/assets/javascripts/lib/scroll_to_top.js
@@ -4,9 +4,9 @@ let fold;
 let was_below_the_fold = false;
 
 const back_to_top = function(scrolltop) {
-    var is_below_the_fold = scrolltop > fold;
+    let is_below_the_fold = scrolltop > fold;
     if (is_below_the_fold !== was_below_the_fold) {
-        $('#scroll-to-top').toggleClass('hide', !is_below_the_fold);
+        document.getElementById('scroll-to-top').classList.toggle('hide', !is_below_the_fold);
         was_below_the_fold = is_below_the_fold;
     }
 };
@@ -23,15 +23,21 @@ const ScrollToTop = {
     },
     disable() {
         Scroll.removeHandler('header');
-        $('#scroll-to-top').addClass('hide');
+        document.getElementById('scroll-to-top').classList.add('hide');
     },
     moveBack() {
-        $('#scroll-to-top').on('click', function(e) {
-            $('html, body').stop().animate({
-                scrollTop: (0)
-            }, 1000, 'easeInOutExpo');
-            e.preventDefault();
+        document.getElementById('scroll-to-top').addEventListener('click', (evt)  => {
+            evt.preventDefault();
+            this.toTop();
         });
+        document.getElementById('scroll-to-top').addEventListener('keypress', (evt) => {
+            if (evt.code === 'Space') {
+                this.toTop();
+            }
+        });
+    },
+    toTop() {
+        window.scroll({top: 0, left: 0, behavior: 'smooth'});
     }
 };
 
diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index 180e020..2db1f7e 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -96,7 +96,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
     </main>
     <!-- End main content -->
 
-    <a id="scroll-to-top" class="hide">
+    <a id="scroll-to-top" class="hide" tabindex="0" title="<?= _('Zurück zum Seitenanfang') ?>">
         <?= Icon::create('arr_1up', 'info_alt')->asImg(24, ['class' => '']) ?>
     </a>
 
-- 
cgit v1.0


From 6b4674ffd580d692dd0cb126112724b26fdeb529 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 10 Apr 2024 13:19:18 +0000
Subject: fixes #3991

Closes #3991

Merge request studip/studip!2840
---
 app/controllers/course/room_requests.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index b1db632..d782495 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -376,7 +376,7 @@ class Course_RoomRequestsController extends AuthenticatedController
                 $this->selected_room_id = Request::get('selected_room_id');
                 $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
                 $_SESSION[$request_id]['selected_properties'] = Request::getArray('selected_properties');
-                $_SESSION[$request_id]['room_category_id'] = $this->room_category_id;
+                $_SESSION[$request_id]['room_category_id'] = $this->category->id;
                 $this->redirect('course/room_requests/request_show_summary/' . $this->request_id );
             }
         }
@@ -523,11 +523,11 @@ class Course_RoomRequestsController extends AuthenticatedController
         } else if (Request::submitted('show_summary')) {
             $this->request = new RoomRequest($this->request_id);
             $this->selected_properties = Request::getArray('selected_properties');
-
-            $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
             $this->selected_room_id = Request::get('selected_room_id');
+            $room = Room::find($this->selected_room_id);
             $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
-
+            $_SESSION[$request_id]['room_category_id'] = $room->category_id;
+            $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
             $this->redirect('course/room_requests/request_show_summary/' . $this->request_id  );
         } else {
             $room = Room::find($_SESSION[$request_id]['room_id']);
-- 
cgit v1.0


From 714438f8fe377d9889e93814109e012bb0662421 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 10 Apr 2024 14:37:13 +0000
Subject: fixes #3992

Closes #3992

Merge request studip/studip!2842
---
 lib/classes/searchtypes/NewsRangesSearch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/searchtypes/NewsRangesSearch.php b/lib/classes/searchtypes/NewsRangesSearch.php
index 458d6f0..6cb7a2f 100644
--- a/lib/classes/searchtypes/NewsRangesSearch.php
+++ b/lib/classes/searchtypes/NewsRangesSearch.php
@@ -56,7 +56,7 @@ class NewsRangesSearch extends SearchType
                                    LEFT JOIN `semester_courses` AS sc ON s.`Seminar_id` = sc.`course_id`
                                    LEFT JOIN `semester_data` USING (`semester_id`)
                                    WHERE {$sem_inst}.`institut_id` IN (:institutes)
-                                     AND `name` LIKE :input
+                                     AND s.`name` LIKE :input
                                    GROUP BY s.`Seminar_id`
                                    ORDER BY s.`start_time` DESC
                                ) AS course_select";
-- 
cgit v1.0


From e3a70de2c4d1db02e4430f83ed2f301a109c8afb Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Thu, 11 Apr 2024 07:32:36 +0000
Subject: =?UTF-8?q?Resolve=20"Nachtr=C3=A4gliche=20Gruppenzuweisung=20zu?=
 =?UTF-8?q?=20einem=20Termin=20wird=20nicht=20=C3=BCbernommen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3995

Merge request studip/studip!2845
---
 app/controllers/course/timesrooms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index 2e3b3fe..c2b51cd 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -439,7 +439,7 @@ class Course_TimesroomsController extends AuthenticatedController
         }
 
         // Set assigned groups
-        $assigned_groups       = Request::optionArray('assigned_groups');
+        $assigned_groups       = Request::optionArray('assigned-groups');
         $termin->statusgruppen = Statusgruppen::findMany($assigned_groups);
 
         $termin->store();
-- 
cgit v1.0


From afb530bcb840ff6f06db0771a55a501ea7fb0e20 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 11 Apr 2024 08:11:42 +0000
Subject: fixes #3996

Closes #3996

Merge request studip/studip!2846
---
 app/controllers/admin/courses.php | 163 --------------------------------------
 1 file changed, 163 deletions(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 7130cd2..4882f8e 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -1447,169 +1447,6 @@ class Admin_CoursesController extends AuthenticatedController
         return $views;
     }
 
-    /**
-     * Returns all courses matching set criteria.
-     *
-     * @param array $params Additional parameters
-     * @param bool $display_all : boolean should we show all courses or check for a limit of 500 courses?
-     * @return array of courses
-     */
-    private function getCourses($params = [], $display_all = false)
-    {
-        // Init
-        if ($GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT === "all") {
-            $inst = new SimpleCollection($this->insts);
-            $inst->filter(function ($a) use (&$inst_ids) {
-                $inst_ids[] = $a->Institut_id;
-            });
-        } else {
-            //We must check, if the institute ID belongs to a faculty
-            //and has the string _i appended to it.
-            //In that case we must display the courses of the faculty
-            //and all its institutes.
-            //Otherwise we just display the courses of the faculty.
-
-            $inst_id = $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
-
-            $institut = new Institute($inst_id);
-
-            if (!$institut->isFaculty() || $GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN) {
-                // If the institute is not a faculty or the child insts are included,
-                // pick the institute IDs of the faculty/institute and of all sub-institutes.
-                $inst_ids[] = $inst_id;
-                if ($institut->isFaculty()) {
-                    foreach ($institut->sub_institutes->pluck('Institut_id') as $institut_id) {
-                        $inst_ids[] = $institut_id;
-                    }
-                }
-            } else {
-                // If the institute is a faculty and the child insts are not included,
-                // pick only the institute id of the faculty:
-                $inst_ids[] = $inst_id;
-            }
-        }
-
-        $active_elements = $this->getActiveElements();
-
-        $filter = AdminCourseFilter::get(true);
-
-        if ($params['datafields']) {
-            foreach ($params['datafields'] as $field_id => $value) {
-                $datafield = DataField::find($field_id);
-                if ($datafield) {
-                    //enable filtering by datafield values:
-                    //and use the where-clause for each datafield:
-                    $filter->settings['query']['joins']['de_'.$field_id] = [
-                        'table' => "datafields_entries",
-                        'join' => "LEFT JOIN",
-                        'on' => "seminare.seminar_id = de_".$field_id.".range_id"
-                    ];
-                    $filter->where("(de_".$field_id.".datafield_id = :fieldId_".$field_id." "
-                        . "AND de_".$field_id.".content = :fieldValue_".$field_id.") "
-                        . ($datafield['default_value'] == $value ? " OR (de_".$field_id.".content IS NULL)" : "")." ",
-                        [
-                            'fieldId_'.$field_id => $field_id,
-                            'fieldValue_'.$field_id => $value
-                        ]
-                    );
-                }
-            }
-        }
-
-        $filter->where("sem_classes.studygroup_mode = '0'");
-
-        // Get only children of given course
-        if (!empty($params['parent_course'])) {
-            $filter->where("parent_course = :parent",
-                [
-                    'parent' => $params['parent_course']
-                ]
-            );
-        }
-
-        if ($active_elements['semester'] && is_object($this->semester)) {
-            $filter->filterBySemester($this->semester->getId());
-        }
-        if ($active_elements['courseType'] && $params['typeFilter'] && $params['typeFilter'] !== "all") {
-            $parts = explode('_', $params['typeFilter']);
-            $class_filter = $parts[0];
-            $type_filter = $parts[1] ?? null;
-            if (!$type_filter && !empty($GLOBALS['SEM_CLASS'][$class_filter])) {
-                $type_filter = array_keys($GLOBALS['SEM_CLASS'][$class_filter]->getSemTypes());
-            }
-            $filter->filterByType($type_filter);
-        }
-        if ($active_elements['search'] && $GLOBALS['user']->cfg->ADMIN_COURSES_SEARCHTEXT) {
-            $filter->filterBySearchString($GLOBALS['user']->cfg->ADMIN_COURSES_SEARCHTEXT);
-        }
-        if ($active_elements['teacher'] && $GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER && ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER !== "all")) {
-            $filter->filterByDozent($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER);
-        }
-        if ($active_elements['institute']) {
-            $filter->filterByInstitute($inst_ids);
-        }
-        if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL && $GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL !== 'all') {
-            $filter->filterByStgTeil($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL);
-        }
-        if ($params['sortby'] === "status") {
-            $filter->orderBy(sprintf('sem_classes.name %s, sem_types.name %s, VeranstaltungsNummer %s', $params['sortFlag'], $params['sortFlag'], $params['sortFlag']), $params['sortFlag']);
-        } elseif ($params['sortby'] === 'institute') {
-            $filter->orderBy('Institute.Name', $params['sortFlag']);
-        } elseif ($params['sortby']) {
-            $filter->orderBy($params['sortby'], $params['sortFlag']);
-        }
-        $filter->storeSettings();
-        $this->count_courses = $filter->countCourses();
-        if ($this->count_courses && ($this->count_courses <= $filter->max_show_courses || $display_all)) {
-            $courses = $filter->getCourses();
-        } else {
-            return [];
-        }
-
-        $seminars = [];
-        if (!empty($courses)) {
-            foreach ($courses as $seminar_id => $seminar) {
-                $seminars[$seminar_id] = $seminar[0];
-                $seminars[$seminar_id]['seminar_id'] = $seminar_id;
-                $seminars[$seminar_id]['obj_type'] = 'sem';
-                $dozenten = $this->getTeacher($seminar_id);
-                $seminars[$seminar_id]['dozenten'] = $dozenten;
-
-                if (in_array('contents', $params['view_filter'])) {
-                    $tools = new SimpleCollection(ToolActivation::findbyRange_id($seminar_id, "ORDER BY position"));
-                    $visit_data = get_objects_visits([$seminar_id], 0, null, null, $tools->pluck('plugin_id'));
-                    $seminars[$seminar_id]['visitdate'] = $visit_data[$seminar_id][0]['visitdate'];
-                    $seminars[$seminar_id]['last_visitdate'] = $visit_data[$seminar_id][0]['last_visitdate'];
-                    $seminars[$seminar_id]['tools'] = $tools;
-                    $seminars[$seminar_id]['navigation'] = MyRealmModel::getAdditionalNavigations(
-                        $seminar_id,
-                        $seminars[$seminar_id],
-                        $seminars[$seminar_id]['sem_class'] ?? null,
-                        $GLOBALS['user']->id,
-                        $visit_data[$seminar_id]
-                    );
-                }
-                //add last activity column:
-                if (in_array('last_activity', $params['view_filter'])) {
-                    $seminars[$seminar_id]['last_activity'] = lastActivity($seminar_id);
-                }
-                if ((int)$this->selected_action === 17) {
-                    $seminars[$seminar_id]['admission_locked'] = false;
-                    if ($seminar[0]['course_set']) {
-                        $set = new CourseSet($seminar[0]['course_set']);
-                        if (!is_null($set) && $set->hasAdmissionRule('LockedAdmission')) {
-                            $seminars[$seminar_id]['admission_locked'] = 'locked';
-                        } else {
-                            $seminars[$seminar_id]['admission_locked'] = 'disable';
-                        }
-                        unset($set);
-                    }
-                }
-            }
-        }
-
-        return $seminars;
-    }
 
     /**
      * Returns the teacher for a given cours
-- 
cgit v1.0


From 5452656a09def98a20d264bf79a2cbf1298f1d22 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 11 Apr 2024 18:19:25 +0000
Subject: resurrect missing list classes, fixes #3997

Closes #3997

Merge request studip/studip!2848
---
 resources/assets/stylesheets/mixins/misc.scss    |  4 ----
 resources/assets/stylesheets/mixins/studip.scss  | 16 ----------------
 resources/assets/stylesheets/scss/dashboard.scss |  2 +-
 resources/assets/stylesheets/scss/lists.scss     | 21 ++++++++++++++++++---
 resources/assets/stylesheets/scss/profile.scss   |  2 +-
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/resources/assets/stylesheets/mixins/misc.scss b/resources/assets/stylesheets/mixins/misc.scss
index 90d61c5..1fe9d08 100644
--- a/resources/assets/stylesheets/mixins/misc.scss
+++ b/resources/assets/stylesheets/mixins/misc.scss
@@ -15,10 +15,6 @@
         clear: both;
     }
 }
-@mixin list-unstyled {
-    padding-left: 0;
-    list-style: none;
-}
 
 
 @mixin size($height, $width) {
diff --git a/resources/assets/stylesheets/mixins/studip.scss b/resources/assets/stylesheets/mixins/studip.scss
index 344f802..1bbd7d5 100644
--- a/resources/assets/stylesheets/mixins/studip.scss
+++ b/resources/assets/stylesheets/mixins/studip.scss
@@ -259,19 +259,3 @@
     /* Opera doesn't support this in the shorthand */
     background-attachment: local, local, scroll, scroll;
 }
-
-@mixin list-unstyled {
-    padding-left: 0;
-    list-style: none;
-}
-
-@mixin list-inline {
-    @include list-unstyled();
-    margin-left: -5px;
-
-    > li {
-        display: inline-block;
-        padding-left: 5px;
-        padding-right: 5px;
-    }
-}
diff --git a/resources/assets/stylesheets/scss/dashboard.scss b/resources/assets/stylesheets/scss/dashboard.scss
index 6020d6e..e353f72 100644
--- a/resources/assets/stylesheets/scss/dashboard.scss
+++ b/resources/assets/stylesheets/scss/dashboard.scss
@@ -77,7 +77,7 @@
     padding-bottom: 1em;
 
     ul {
-        @include list-inline();
+        @extend .list-inline;
 
         img {
             margin-left: 0.25em;
diff --git a/resources/assets/stylesheets/scss/lists.scss b/resources/assets/stylesheets/scss/lists.scss
index a260958..6de2004 100644
--- a/resources/assets/stylesheets/scss/lists.scss
+++ b/resources/assets/stylesheets/scss/lists.scss
@@ -10,9 +10,25 @@ ol {
     }
 }
 
+.list-unstyled {
+    padding-left: 0;
+    list-style: none;
+}
+
+.list-inline {
+    @extend .list-unstyled;
+    margin-left: -5px;
+
+    > li {
+        display: inline-block;
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+}
+
 //comma separated
 .list-csv {
-    @include list-inline();
+    @extend .list-inline;
     margin-left: 0;
 
     > li {
@@ -24,7 +40,6 @@ ol {
 
         &:last-child {
             padding-right: 0;
-
             &::after {
                 content: unset;
             }
@@ -39,7 +54,7 @@ ol {
 }
 
 .list-pipe-separated {
-    @include list-inline();
+    @extend .list-inline;
     display: flex; // Prevents the mystery gap between elements
 
     > li {
diff --git a/resources/assets/stylesheets/scss/profile.scss b/resources/assets/stylesheets/scss/profile.scss
index ef7e75a..c180e03 100644
--- a/resources/assets/stylesheets/scss/profile.scss
+++ b/resources/assets/stylesheets/scss/profile.scss
@@ -13,7 +13,7 @@
     padding: 0 1em;
 }
 .profile-view-actions {
-    @include list-unstyled();
+    @extend .list-unstyled;
     img {
         vertical-align: text-top;
     }
-- 
cgit v1.0


From 033892bb84bd4792b76ce2bd5f4c44d99148474d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 12 Apr 2024 08:37:46 +0000
Subject: fixes #3988

Closes #3988

Merge request studip/studip!2852
---
 docker-compose-dev.yml |  2 +-
 docker-compose.yml     |  2 +-
 docker/studip/my.cnf   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 docker/studip/my.cnf

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index f202a07..6e74c71 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -5,7 +5,7 @@ services:
     image: mariadb:10.4
     volumes:
       - db_data:/var/lib/mysql
-    command: mysqld --sql_mode=""
+      - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
     restart: always
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: 1
diff --git a/docker-compose.yml b/docker-compose.yml
index d96342f..492671d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: mariadb:10.4
     volumes:
       - db_data:/var/lib/mysql
-    command: mysqld --sql_mode=""
+      - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
     restart: always
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: 1
diff --git a/docker/studip/my.cnf b/docker/studip/my.cnf
new file mode 100644
index 0000000..5e34466
--- /dev/null
+++ b/docker/studip/my.cnf
@@ -0,0 +1,13 @@
+[client]
+default-character-set = utf8mb4
+
+[mysql]
+default-character-set = utf8mb4
+
+[mysqld]
+init_connect='SET NAMES UTF8MB4'
+character-set-server = utf8mb4
+collation-server = utf8mb4_unicode_ci
+
+innodb_file_per_table = On
+sql_mode = NO_ENGINE_SUBSTITUTION
-- 
cgit v1.0


From 187f03c42a2dca1b23dede9d1e0b107f5f9a001e Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 12 Apr 2024 11:53:59 +0000
Subject: fixes #4000

Closes #4000

Merge request studip/studip!2849
---
 app/controllers/course/room_requests.php | 101 +++++++++++--------------------
 1 file changed, 37 insertions(+), 64 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index d782495..b9658b8 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -143,25 +143,15 @@ class Course_RoomRequestsController extends AuthenticatedController
         // a single date or whole course
         $this->request_range_id = Request::get('range_id', Context::getId());
 
-        if (!isset($_SESSION[$this->request_id])) {
-            $_SESSION[$this->request_id] = [];
-        }
+        $this->init_session();
         $_SESSION[$this->request_id]['range'] = $this->request_range ?: $_SESSION[$this->request_id]['range'] ?? null;
         $_SESSION[$this->request_id]['range_ids'] = $this->request_range_ids ?: [$this->request_range_id];
-        $_SESSION[$this->request_id]['search_by'] = '';
-        $_SESSION[$this->request_id]['room_category_id'] = '';
-        $_SESSION[$this->request_id]['room_id'] = '';
-        $_SESSION[$this->request_id]['room_name'] = '';
-        $_SESSION[$this->request_id]['selected_properties'] = [];
-
-        $this->request = null;
 
         // look for existing request or create a new one
         $this->request = new RoomRequest($this->request_id);
         // time ranges (start date, end date)
         $this->request->setRangeFields($_SESSION[$this->request_id]['range'], $_SESSION[$this->request_id]['range_ids']);
         $this->request_time_intervals = $this->request->getTimeIntervals();
-
     }
 
     /**
@@ -211,7 +201,6 @@ class Course_RoomRequestsController extends AuthenticatedController
                 );
             }
         }
-
     }
 
     /**
@@ -227,7 +216,6 @@ class Course_RoomRequestsController extends AuthenticatedController
                 _('Das Erstellen von Raumanfragen ist nicht erlaubt!')
             );
         }
-
         $this->request_id = $request_id;
         $this->step = (int)$step;
         $this->room_name = $_SESSION[$request_id]['room_name'];
@@ -266,13 +254,16 @@ class Course_RoomRequestsController extends AuthenticatedController
         $this->selected_room = Resource::find($_SESSION[$request_id]['room_id'] ?: $this->request->resource_id);
 
         $this->selected_room_category_id = $this->selected_room->category_id ?? $_SESSION[$request_id]['room_category_id'] ?? null;
+        $this->category = ResourceCategory::find($this->selected_room_category_id);
 
         $_SESSION[$request_id]['room_category_id'] = $_SESSION[$request_id]['room_category_id'] ?? $this->selected_room->category_id ?? null;
 
         // after selecting a room, go to next step or stay here if no room was selected at all
         if (Request::submitted('select_room')) {
             $this->selected_room_id = Request::get('selected_room_id');
+            $room = Room::find($this->selected_room_id);
             $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
+            $_SESSION[$request_id]['room_category_id'] = $room->category_id;
             $_SESSION[$request_id]['select_room'] = true;
             $this->redirect(
                 'course/room_requests/request_check_properties/' . $this->request_id
@@ -296,48 +287,20 @@ class Course_RoomRequestsController extends AuthenticatedController
             );
             return;
         } else if (Request::submitted('reset_category')) {
-            //Delete all selected properties from the session since the category is reset
-            $_SESSION[$request_id]['selected_properties'] = [];
-            $_SESSION[$request_id]['room_category_id'] = '';
-            $_SESSION[$request_id]['room_name'] = '';
-            $_SESSION[$request_id]['room_id'] = '';
-            $this->redirect('course/room_requests/request_find_available_properties/' . $this->request_id . '/1');
+            $this->init_session();
+            $this->redirect('course/room_requests/new_request');
             return;
         }
 
         // for step 2: after choosing a specific room OR searching via properties
         if ($this->step === 2) {
-            // find rooms fitting to category and properties
-            if (Request::submitted('search_rooms')) {
+            if (!empty(Request::getArray('selected_properties'))) {
                 $this->selected_properties = Request::getArray('selected_properties');
-                $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
-                // no min number of seats
-                if (
-                    (!isset($_SESSION[$request_id]['selected_properties']['seats']) || $_SESSION[$request_id]['selected_properties']['seats'] < 1)
-                    && $_SESSION[$request_id]['search_by'] === 'category'
-                ) {
-                    PageLayout::postError(
-                        _('Die Mindestanzahl der Sitzplätze beträgt 1!')
-                    );
-                    $this->redirect(
-                        'course/room_requests/request_find_matching_rooms/' . $request_id . '/' . $this->step
-                    );
-                    return;
-                } else {
-                    $this->redirect(
-                        'course/room_requests/request_find_matching_rooms/' . $request_id . '/' . $this->step
-                    );
-                    return;
-                }
+            } else {
+                $this->selected_properties =  $_SESSION[$request_id]['selected_properties'];
             }
-
+            $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
             if ($_SESSION[$request_id]['search_by'] === 'roomname') {
-                // find category via room
-                $this->category = ResourceCategory::find($this->selected_room_category_id);
-                if ($this->category) {
-                    $this->available_properties = $this->category->getRequestableProperties();
-                }
-
                 $this->selected_properties = $_SESSION[$request_id]['selected_properties'] ?? null;
                 $this->room = Room::find($_SESSION[$request_id]['room_id']);
                 if (!isset($_SESSION[$request_id]['selected_properties']['seats'])) {
@@ -359,14 +322,11 @@ class Course_RoomRequestsController extends AuthenticatedController
             } else {
                 // let's find all the properties belonging to the selected category
                 $this->room_category_id = $_SESSION[$request_id]['room_category_id'];
-                $this->category = ResourceCategory::find($this->room_category_id);
-                if ($this->category) {
-                    $this->available_properties = $this->category->getRequestableProperties();
-                }
-                // properties, like 'Sitzplätze', 'behindertengerecht' etc
-                $this->selected_properties = $_SESSION[$request_id]['selected_properties'] ?? null;
             }
 
+            if ($this->category) {
+                $this->available_properties = $this->category->getRequestableProperties();
+            }
             $this->preparation_time = $_SESSION[$request_id]['preparation_time'] ?? null;
             $this->comment = $_SESSION[$request_id]['comment'] ?? null;
             $this->request->category_id = $_SESSION[$request_id]['room_category_id'];
@@ -375,8 +335,10 @@ class Course_RoomRequestsController extends AuthenticatedController
             if (Request::submitted('show_summary')) {
                 $this->selected_room_id = Request::get('selected_room_id');
                 $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
-                $_SESSION[$request_id]['selected_properties'] = Request::getArray('selected_properties');
-                $_SESSION[$request_id]['room_category_id'] = $this->category->id;
+                $room = Room::find($this->selected_room_id);
+                if ($room) {
+                    $_SESSION[$request_id]['room_category_id'] = $room->category_id;
+                }
                 $this->redirect('course/room_requests/request_show_summary/' . $this->request_id );
             }
         }
@@ -395,7 +357,6 @@ class Course_RoomRequestsController extends AuthenticatedController
                 _('Das Erstellen von Raumanfragen ist nicht erlaubt!')
             );
         }
-
         $this->request_id = $request_id;
         $this->step = (int)$step;
 
@@ -456,11 +417,13 @@ class Course_RoomRequestsController extends AuthenticatedController
         }
 
         $this->request_id = $request_id;
-
+        $this->selected_properties = Request::getArray('selected_properties');
         // select a room, search for a room name or search for rooms matching properties
         if (Request::submitted('select_room')) {
             $this->selected_room_id = Request::get('selected_room_id');
+            $room = Room::find($this->selected_room_id);
             $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
+            $_SESSION[$request_id]['room_category_id'] = $room->category_id;
             $_SESSION[$request_id]['select_room'] = true;
             $this->step = 2;
             $this->request = new RoomRequest($this->request_id);
@@ -468,7 +431,6 @@ class Course_RoomRequestsController extends AuthenticatedController
                 'course/room_requests/request_find_matching_rooms/' . $this->request_id . '/' . $this->step
             );
         } else if (Request::get('room_name') && Request::submitted('search_by_name')) {
-            $this->selected_properties = Request::getArray('selected_properties');
             $this->category_id = Request::get('category_id');
             $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
             $_SESSION[$request_id]['room_category_id'] = $this->category_id;
@@ -480,7 +442,6 @@ class Course_RoomRequestsController extends AuthenticatedController
             );
 
         } else if (Request::submitted('search_rooms')) {
-            $this->selected_properties = Request::getArray('selected_properties');
             $this->category_id = Request::get('category_id');
             $_SESSION[$request_id]['room_category_id'] = $this->category_id;
             $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
@@ -507,8 +468,7 @@ class Course_RoomRequestsController extends AuthenticatedController
             }
         } else if (Request::submitted('reset_category')) {
             //Delete all selected properties from the session since the category is reset
-            $_SESSION[$request_id]['selected_properties'] = [];
-            $_SESSION[$request_id]['room_category_id'] = '';
+            $this->init_session();
             $this->redirect('course/room_requests/request_find_available_properties/' . $this->request_id . '/1');
         } else if (Request::submitted('search_by_category')) {
             if (Request::get('category_id') === '0') {
@@ -522,11 +482,10 @@ class Course_RoomRequestsController extends AuthenticatedController
             );
         } else if (Request::submitted('show_summary')) {
             $this->request = new RoomRequest($this->request_id);
-            $this->selected_properties = Request::getArray('selected_properties');
             $this->selected_room_id = Request::get('selected_room_id');
             $room = Room::find($this->selected_room_id);
             $_SESSION[$request_id]['room_id'] = $this->selected_room_id;
-            $_SESSION[$request_id]['room_category_id'] = $room->category_id;
+            $_SESSION[$request_id]['room_category_id'] = $room->category_id ?? $_SESSION[$request_id]['room_category_id'];
             $_SESSION[$request_id]['selected_properties'] = $this->selected_properties;
             $this->redirect('course/room_requests/request_show_summary/' . $this->request_id  );
         } else {
@@ -570,7 +529,6 @@ class Course_RoomRequestsController extends AuthenticatedController
         );
 
         $this->selected_room_category = ResourceCategory::find($_SESSION[$request_id]['room_category_id'] ?? $this->request->category_id);
-
         $this->selected_room = Resource::find($_SESSION[$request_id]['room_id'] ?? $this->request->resource_id);
 
         $this->room_id = $_SESSION[$request_id]['room_id'] ?? $this->request->resource_id;
@@ -726,4 +684,19 @@ class Course_RoomRequestsController extends AuthenticatedController
         }
         $this->redirect('course/timesrooms/index');
     }
+
+    private function init_session()
+    {
+        $_SESSION[$this->request_id] = array_merge(
+            $_SESSION[$this->request_id] ?? [],
+            [
+                'search_by'           => '',
+                'room_category_id'    => '',
+                'room_id'             => '',
+                'room_name'           => '',
+                'select_room'         => false,
+                'selected_properties' => [],
+            ]
+        );
+    }
 }
-- 
cgit v1.0


From e7d5f02ac827280149e4fcc622de5205f91b9de4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 12 Apr 2024 12:22:43 +0000
Subject: fixes #3982

Closes #3982

Merge request studip/studip!2853
---
 cli/Commands/Cronjobs/CronjobExecute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/Commands/Cronjobs/CronjobExecute.php b/cli/Commands/Cronjobs/CronjobExecute.php
index d4789ea..93b5ddb 100644
--- a/cli/Commands/Cronjobs/CronjobExecute.php
+++ b/cli/Commands/Cronjobs/CronjobExecute.php
@@ -96,7 +96,7 @@ class CronjobExecute extends Command
                             if (strlen($value) && !ctype_digit($value)) {
                                 throw new \RuntimeException('Number is invalid.');
                             }
-                            return $value;
+                            return (int) $value;
                         });
                     }
                 }
-- 
cgit v1.0


From c64fdad3dabf40369393418d66207a09e4beb123 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 12 Apr 2024 12:34:45 +0000
Subject: fixes #4004

Closes #4004

Merge request studip/studip!2855
---
 app/controllers/course/room_requests.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index b9658b8..cdf8b1d 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -308,17 +308,6 @@ class Course_RoomRequestsController extends AuthenticatedController
                 }
                 $_SESSION[$request_id]['selected_properties']['seats'] = $this->selected_properties['seats'];
                 $_SESSION[$request_id]['room_category_id'] = $this->selected_room_category_id;
-            } else if ($_SESSION[$request_id]['search_by'] === 'category') {
-                $this->room = Room::find($_SESSION[$request_id]['room_id']);
-                if ($this->room) {
-                    $this->grouped_properties = $this->room->getGroupedProperties();
-                    $this->selected_properties = [];
-                    foreach ($this->grouped_properties as $properties) {
-                        foreach ($properties as $property) {
-                            $this->selected_properties[$property->name] = $property->state;
-                        }
-                    }
-                }
             } else {
                 // let's find all the properties belonging to the selected category
                 $this->room_category_id = $_SESSION[$request_id]['room_category_id'];
-- 
cgit v1.0


From 8237015debcd53cfecd6c38750f52c0de36d4acf Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 12 Apr 2024 13:53:19 +0000
Subject: fixes #4007

Closes #4007

Merge request studip/studip!2858
---
 docker-compose.yml                 | 3 +--
 docker/studip/docker-entrypoint.sh | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 492671d..8a2f010 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,6 @@ services:
       MYSQL_DATABASE: studip_db
       MYSQL_USER: studip_user
       MYSQL_PASSWORD: studip_password
-      DEMO_DATA: 1
-      MAIL_TRANSPORT: debug
   web:
     build:
       context: .
@@ -34,6 +32,7 @@ services:
       MYSQL_PASSWORD: studip_password
       MYSQL_HOST: db
       STUDIP_MAIL_TRANSPORT: debug
+      STUDIP_NAME: ${STUDIP_NAME}
 
       # Use automigrate to migrate your instance on startup
       AUTO_MIGRATE: 1
diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh
index 111d357..dde57c5 100644
--- a/docker/studip/docker-entrypoint.sh
+++ b/docker/studip/docker-entrypoint.sh
@@ -28,7 +28,7 @@ done
 
 sh $STUDIP/.gitlab/scripts/install_db.sh
 
-if [ ! -z $AUTO_MIGRATE ]; then
+if [[ -n $AUTO_MIGRATE ]]; then
     echo "Migrate Instance"
     # If migrate fails start instance anyway
     php "$STUDIP/cli/studip" migrate || true
@@ -40,4 +40,10 @@ if [ "${1#-}" != "$1" ]; then
     set -- apache2-foreground "$@"
 fi
 
+# Set name of installation if set
+if [[ -n "$STUDIP_NAME" ]]; then
+    echo "Setting installation name"
+    php "$STUDIP/cli/studip" config:set UNI_NAME_CLEAN "$STUDIP_NAME"
+fi
+
 exec "$@"
-- 
cgit v1.0


From ebcb5b20ef2d04136f7364414fd825e335888dad Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 11 Apr 2024 10:53:01 +0000
Subject: Translated using Weblate (English)

Currently translated at 100.0% (1489 of 1489 strings)

Translation: Stud.IP/Stud.IP main (JS)
Translate-URL: https://weblate.uni-vechta.de/projects/stud-ip/stud-ip-main-js/en/
---
 locale/en/LC_MESSAGES/js-resources.po | 446 ++++++++++++----------------------
 1 file changed, 161 insertions(+), 285 deletions(-)

diff --git a/locale/en/LC_MESSAGES/js-resources.po b/locale/en/LC_MESSAGES/js-resources.po
index 864428e..efa9bdd 100644
--- a/locale/en/LC_MESSAGES/js-resources.po
+++ b/locale/en/LC_MESSAGES/js-resources.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2024-04-06 15:29+0000\n"
+"PO-Revision-Date: 2024-04-12 14:29+0000\n"
 "Last-Translator: Moritz Strohm <strohm@data-quest.de>\n"
 "Language-Team: English <https://weblate.uni-vechta.de/projects/stud-ip/"
 "stud-ip-main-js/en/>\n"
@@ -237,18 +237,17 @@ msgstr "Select %{groupName}"
 
 #: resources/vue/components/courseware/CoursewareBlockCommentsOverview.vue:109
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:107
-#, fuzzy
 msgid "%{length} Anmerkung"
 msgid_plural "%{length} Anmerkungen"
-msgstr[0] "%{length} comment"
-msgstr[1] "%{length} comments"
+msgstr[0] "%{length} annotation"
+msgstr[1] "%{length} annotations"
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockDiscussion.vue:59
 msgid "%{length} Anmerkung (Nur für Nutzende mit Schreibrechten sichtbar)"
 msgid_plural ""
 "%{length} Anmerkungen (Nur für Nutzende mit Schreibrechten sichtbar)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%{length} annotation (only visible for users with write permissions)"
+msgstr[1] "%{length} annotations (only visible for users with write permissions)"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:733
 msgid ""
@@ -257,7 +256,11 @@ msgid_plural ""
 "%{length} Anmerkungen zur Seite (Nur für Nutzende mit Schreibrechten "
 "sichtbar)"
 msgstr[0] ""
+"%{length} annotation for the page (only visible for users with write "
+"permissions)"
 msgstr[1] ""
+"%{length} annotations for the page (only visible for users with write "
+"permissions)"
 
 #: resources/vue/components/courseware/CoursewareBlockCommentsOverview.vue:98
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:95
@@ -268,11 +271,10 @@ msgstr[0] "%{length} comment"
 msgstr[1] "%{length} comments"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:753
-#, fuzzy
 msgid "%{length} Kommentar zur Seite"
 msgid_plural "%{length} Kommentare zur Seite"
-msgstr[0] "%{length} comment"
-msgstr[1] "%{length} comments"
+msgstr[0] "%{length} comment for the page"
+msgstr[1] "%{length} comments for the page"
 
 #: resources/vue/components/file-chooser/FileChooserFolderItem.vue:50
 msgid "%{length} Objekt"
@@ -291,11 +293,10 @@ msgid "%{myValue} von %{max}"
 msgstr "%{myValue} of %{max}"
 
 #: resources/vue/components/feedback/FeedbackFiveStarsHistogram.vue:26
-#, fuzzy
 msgid "%{n} Bewertung"
 msgid_plural "%{n} Bewertungen"
-msgstr[0] "Rating"
-msgstr[1] "Rating"
+msgstr[0] "%{n} rating"
+msgstr[1] "%{n} ratings"
 
 #: resources/vue/components/tree/StudipTreeList.vue:87
 msgid "%{name} bearbeiten"
@@ -324,11 +325,10 @@ msgid "<%= count %> ausgewählt"
 msgstr "<%= count %> selected"
 
 #: resources/vue/components/tree/TreeNodeCourseInfo.vue:3
-#, fuzzy
 msgid "<strong>Eine</strong> Veranstaltung"
 msgid_plural "<strong>%{count}</strong> Veranstaltungen"
-msgstr[0] "<strong>One</strong> course on this layer."
-msgstr[1] "<strong>%{count}</strong> courses on this layer."
+msgstr[0] "<strong>One</strong> course"
+msgstr[1] "<strong>%{count}</strong> courses"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:236
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:307
@@ -564,9 +564,8 @@ msgid "Aktivitäten"
 msgstr "Activities"
 
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:26
-#, fuzzy
 msgid "Aktuelle Bearbeitungszeit:"
-msgstr "Processing time"
+msgstr "Current editing time:"
 
 #: resources/vue/components/questionnaires/LikertEdit.vue:76
 #: resources/vue/components/questionnaires/LikertEdit.vue:89
@@ -681,9 +680,8 @@ msgid "Am dritten gewählten Wochentag"
 msgstr "On the third selected day of week"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:108
-#, fuzzy
 msgid "Am Ende eines Kapitels einen Dialog für die Bewertung anzeigen"
-msgstr "No time ranges have been specified for the booking!"
+msgstr "Show a dialog at the end of a chapter for the rating"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:377
 msgid "Am ersten gewählten Wochentag"
@@ -736,9 +734,8 @@ msgid "Anfrage wird bearbeitet"
 msgstr "Request is being processed"
 
 #: resources/vue/components/courseware/widgets/CoursewareActivitiesWidgetFilterType.vue:29
-#, fuzzy
 msgid "Angemerkt"
-msgstr "Enroled"
+msgstr "Annotated"
 
 #: resources/vue/components/tree/AssignLinkWidget.vue:19
 #: resources/vue/components/tree/AssignLinkWidget.vue:23
@@ -756,56 +753,47 @@ msgstr "Configure admission setting"
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:25
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:38
-#, fuzzy
 msgid "Anmerkung"
-msgstr "Comment"
+msgstr "Annotation"
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:109
-#, fuzzy
 msgid "Anmerkung anzeigen"
-msgstr "Show comment"
+msgstr "Show annotations"
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockFeedback.vue:76
-#, fuzzy
 msgid "Anmerkung gesendet"
-msgstr "Admission locked"
+msgstr "Annotation sent"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementFeedback.vue:79
-#, fuzzy
 msgid "Anmerkung hinzugefügt"
-msgstr "Add comment"
+msgstr "Annotation added"
 
 #: resources/vue/components/courseware/CoursewareBlockCommentsOverview.vue:75
 #: resources/vue/components/courseware/CoursewareCommentsOverviewDialog.vue:45
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:71
-#, fuzzy
 msgid "Anmerkungen"
-msgstr "Comment"
+msgstr "Annotations"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:535
-#, fuzzy
 msgid "Anmerkungen aktivieren"
-msgstr "Activate task"
+msgstr "Activate annotations"
 
 #: resources/vue/components/courseware/CoursewareBlockCommentsOverview.vue:101
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:94
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:104
 #: resources/vue/components/courseware/blocks/CoursewareBlockDiscussion.vue:27
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:267
-#, fuzzy
 msgid "Anmerkungen anzeigen"
-msgstr "Show changes"
+msgstr "Show annotations"
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockDiscussion.vue:28
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:268
-#, fuzzy
 msgid "Anmerkungen ausblenden"
-msgstr "Hide names"
+msgstr "Hide annotations"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDiscussion.vue:23
-#, fuzzy
 msgid "Anmerkungen zur Seite"
-msgstr "Comments on the page"
+msgstr "Annotations for the page"
 
 #: resources/assets/javascripts/lib/forum.js:422
 msgid "Anonym"
@@ -828,9 +816,8 @@ msgid "Antwortmöglichkeiten konfigurieren"
 msgstr "Configure possible answers"
 
 #: resources/vue/components/WikiEditorOnlineUsers.vue:20
-#, fuzzy
 msgid "Anwesende Personen"
-msgstr "Remove participant(s)"
+msgstr "Present persons"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:441
 msgid "Anzahl der Termine"
@@ -970,9 +957,8 @@ msgid "Aufgaben"
 msgstr "Tasks"
 
 #: resources/vue/components/courseware/tasks/CoursewareTasksDialogDistribute.vue:287
-#, fuzzy
 msgid "Aufgaben werden bereits verteilt."
-msgstr "Tasks have been distributed."
+msgstr "Tasks are already being distributed."
 
 #: resources/vue/components/courseware/tasks/CoursewareTasksDialogDistribute.vue:336
 msgid "Aufgaben wurden verteilt."
@@ -1065,9 +1051,8 @@ msgid "August"
 msgstr "August"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAddChooser.vue:33
-#, fuzzy
 msgid "Aus Arbeitsplatz verknüpfen"
-msgstr "Link pages"
+msgstr "Link from work place"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAddChooser.vue:39
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAddChooser.vue:39
@@ -1132,8 +1117,8 @@ msgstr "Select"
 #: resources/vue/components/feedback/StudipFiveStarsInput.vue:22
 msgid "auswählen, um mit einem Stern zu bewerten."
 msgid_plural "auswählen, um mit %{i} Sternen zu bewerten."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "select to rate with one star"
+msgstr[1] "select to rate with %{i} stars"
 
 #: resources/vue/components/questionnaires/RangescaleEdit.vue:205
 msgid "Ausweichantwort (leer lassen für keine)"
@@ -1216,14 +1201,12 @@ msgstr "Processing time"
 #: resources/vue/components/courseware/tasks/CoursewareDashboardStudents.vue:84
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:15
 #: resources/vue/components/courseware/widgets/CoursewareTasksActionWidget.vue:33
-#, fuzzy
 msgid "Bearbeitungszeit verlängern"
-msgstr "Change status"
+msgstr "Prolong editing time"
 
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:34
-#, fuzzy
 msgid "Bearbeitungszeit verlängern bis zum"
-msgstr "Change status"
+msgstr "Editing time prolonged until"
 
 #: resources/assets/javascripts/lib/user_filter.js:12
 msgid "Bedingung konfigurieren"
@@ -1358,29 +1341,24 @@ msgstr "Participation"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:1235
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:153
-#, fuzzy
 msgid "Bewerten Sie das Lernmaterial"
-msgstr "Shared learning material"
+msgstr "Rate the learning material"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:1267
-#, fuzzy
 msgid "Bewerten Sie die Seite"
-msgstr "Do you want the page"
+msgstr "Rate this page"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:119
-#, fuzzy
 msgid "Bewertung auf der Seite anzeigen"
-msgstr "Display all courses on this level"
+msgstr "Show rating on the page"
 
 #: resources/vue/components/courseware/structural-element/CoursewareFeedbackPopup.vue:23
-#, fuzzy
 msgid "Bewertung für %{title}"
-msgstr "Comment for %s"
+msgstr "Rating for %{title}"
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:93
-#, fuzzy
 msgid "Bewertungen"
-msgstr "Rating"
+msgstr "Ratings"
 
 #: resources/vue/components/courseware/blocks/CoursewareChartBlock.vue:162
 #: resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue:414
@@ -1497,11 +1475,10 @@ msgstr "Please confirm the action."
 
 #: resources/vue/mixins/courseware/clipboard.js:10
 #: resources/vue/mixins/courseware/container.js:143
-#, fuzzy
 msgid ""
 "Bitte fügen Sie der Seite einen Abschnitt hinzu, damit der Block eingefügt "
 "werden kann."
-msgstr "Please select a place where the block should be inserted."
+msgstr "Please add a section to the page so that the block can be inserted."
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue:104
 msgid "Bitte füllen Sie alle notwendigen Angaben aus."
@@ -1524,9 +1501,8 @@ msgid "Bitte geben Sie ein Datum an."
 msgstr "Please specify a date."
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogTopics.vue:75
-#, fuzzy
 msgid "Bitte geben Sie eine Beschreibung ein."
-msgstr "Please enter the starting date of the vacation period."
+msgstr "Please enter a description."
 
 #: resources/vue/components/courseware/blocks/CoursewareDateBlock.vue:95
 msgid "Bitte geben Sie eine Uhrzeit an."
@@ -1541,14 +1517,12 @@ msgid "Bitte geben Sie einen Titel ein."
 msgstr "Please enter a title."
 
 #: resources/vue/components/courseware/structural-element/CoursewareTreeItemAdder.vue:38
-#, fuzzy
 msgid "Bitte geben Sie einen Titel für die neue Seite ein."
-msgstr "Please enter a title for this step"
+msgstr "Please enter a title for the new page."
 
 #: resources/vue/components/courseware/structural-element/CoursewareTreeItemUpdater.vue:40
-#, fuzzy
 msgid "Bitte geben Sie einen Titel für die Seite ein."
-msgstr "Please enter a title for this step"
+msgstr "Please enter a title for this page."
 
 #: resources/assets/javascripts/lib/register.js:92
 msgid "Bitte geben Sie Ihren tatsächlichen Nachnamen an."
@@ -1691,9 +1665,8 @@ msgid "Block merken"
 msgstr "Remember block"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbar.vue:41
-#, fuzzy
 msgid "Block Merkliste"
-msgstr "Watch list"
+msgstr "Block clipboard"
 
 #: resources/vue/components/courseware/blocks/CoursewareDefaultBlock.vue:50
 msgid "Block unwiderruflich löschen"
@@ -1785,9 +1758,8 @@ msgid "Countdown"
 msgstr "Countdown"
 
 #: resources/vue/components/courseware/tasks/TaskGroup.vue:15
-#, fuzzy
 msgid "Courseware-Aufgabe \"%{ taskGroup }\""
-msgstr "Courseware task feedback"
+msgstr "Courseware task \"%{ taskGroup }\""
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:422
 msgid "Cover"
@@ -2067,11 +2039,9 @@ msgstr ""
 "image."
 
 #: resources/vue/mixins/courseware/container.js:169
-#, fuzzy
 msgid ""
 "Der Block konnte nicht hinzugefügt werden, bitte versuchen Sie es erneut."
-msgstr ""
-"The periodic course date could not be added! Please check your entries."
+msgstr "The block could not be added, please try again later."
 
 #: resources/vue/mixins/courseware/clipboard.js:13
 #: resources/vue/mixins/courseware/container.js:138
@@ -2133,19 +2103,16 @@ msgid "Die Aufnahme wurde erfolgreich im Dateibereich abgelegt."
 msgstr "The recording has been successfully placed in the file area."
 
 #: resources/vue/components/courseware/tasks/task-groups-helper.js:12
-#, fuzzy
 msgid "Die Bearbeitungszeit hat begonnen."
-msgstr "Processing time"
+msgstr "The editing time has begun."
 
 #: resources/vue/components/courseware/tasks/task-groups-helper.js:20
-#, fuzzy
 msgid "Die Bearbeitungszeit hat noch nicht begonnen."
-msgstr "This date is not yet booked."
+msgstr "The editing time has not yet begun."
 
 #: resources/vue/components/courseware/tasks/task-groups-helper.js:28
-#, fuzzy
 msgid "Die Bearbeitungszeit ist beendet."
-msgstr "The evaluation has ended."
+msgstr "The editing time has ended."
 
 #: resources/assets/javascripts/bootstrap/studip_helper_attributes.js:242
 msgid "Die beiden Werte \"$1\" und \"$2\" stimmen nicht überein. "
@@ -2189,12 +2156,11 @@ msgid "Die E-Mail-Adresse ist nicht korrekt!"
 msgstr "Invalid e-mail address!"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:292
-#, fuzzy
 msgid ""
 "Die Einstellungen dieser Seite werden im Moment von %{blockingUserName} "
 "bearbeitet."
 msgstr ""
-"The settings on this page are currenty being edited by %{blockingUserName}"
+"The settings on this page are currenty being edited by %{blockingUserName}."
 
 #: resources/vue/components/courseware/CoursewareContentPermissions.vue:147
 msgid "Die folgenden ausgewählten Personen existierten bereits:"
@@ -2205,6 +2171,8 @@ msgid ""
 "Die Fortschrittsanzeige bezieht sich auf den Anteil der Teilnehmenden, die "
 "eine Seite aufgerufen haben."
 msgstr ""
+"The progress meter relates to the share of participants that have accessed a "
+"page."
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue:69
 msgid "Die gewählte Datei ist kein Archiv oder das Archiv ist beschädigt."
@@ -2315,14 +2283,12 @@ msgid "Dies ist ein Pflichtfeld"
 msgstr "This is a mandatory field"
 
 #: resources/vue/components/courseware/tasks/TaskGroup.vue:60
-#, fuzzy
 msgid "Diese Aufgabe wurde an niemanden verteilt."
-msgstr "Tasks have been distributed."
+msgstr "This tasks has not been distributed to anyone."
 
 #: resources/vue/components/courseware/tasks/PagesTaskGroupsShow.vue:79
-#, fuzzy
 msgid "Diese Courseware-Aufgabe konnte nicht gefunden werden."
-msgstr "The page could not be found."
+msgstr "This Courseware task could not be found."
 
 #: resources/vue/components/FilesTable.vue:468
 msgid "Diese Datei ist barrierefrei."
@@ -2372,7 +2338,6 @@ msgid "Diese Seite hat eine zeitlich beschränkte Sichtbarkeit"
 msgstr "This page has a time-restricted visibility"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitProgress.vue:64
-#, fuzzy
 msgid "diese Seite inkl. darunter liegender Seiten"
 msgstr "this page incl. underlying pages"
 
@@ -2474,9 +2439,8 @@ msgstr "Delete this element"
 
 #: resources/vue/components/courseware/containers/CoursewareAccordionContainer.vue:86
 #: resources/vue/components/courseware/containers/CoursewareTabsContainer.vue:95
-#, fuzzy
 msgid "Dieses Fach enthält keine Blöcke."
-msgstr "This section does not contain blocks."
+msgstr "This field of study does not contain blocks."
 
 #: resources/assets/javascripts/bootstrap/forms.js:349
 msgid "Dieses Feld muss ausgewählt sein."
@@ -2532,9 +2496,8 @@ msgid "Drucken"
 msgstr "Print"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:51
-#, fuzzy
 msgid "Drücken Sie die Leertaste oder Entertaste, um neu anzuordnen."
-msgstr "Press the space bar to reorder."
+msgstr "Press the space bar or the enter key to reorder."
 
 #: resources/vue/components/courseware/containers/CoursewareAccordionContainer.vue:53
 #: resources/vue/components/courseware/containers/CoursewareListContainer.vue:50
@@ -2733,9 +2696,8 @@ msgid "Ereignis hinzufügen"
 msgstr "Add event"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:150
-#, fuzzy
 msgid "Erforderlicher Fortschritt (in Prozent)"
-msgstr "Required progress (in percent) to get a certificate"
+msgstr "Required progress (in percent)"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogSettings.vue:214
 msgid "Erinnerungen"
@@ -2933,9 +2895,8 @@ msgstr "A file has been uploaded."
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockFeedback.vue:43
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementFeedback.vue:41
-#, fuzzy
 msgid "Es wurde noch keine Anmerkung hinzugefügt."
-msgstr "One person has been added."
+msgstr "No annotation has been added yet."
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:132
 msgid "Es wurden bisher keine Aufgaben gestellt."
@@ -2950,9 +2911,8 @@ msgid "Es wurden keine Aktivitäten gefunden."
 msgstr "No activities have been found."
 
 #: resources/vue/components/tree/TreeSearchResult.vue:104
-#, fuzzy
 msgid "Es wurden keine Ergebnisse zu Ihrem Suchbegriff \"%{term}\" gefunden."
-msgstr "No results for \"%s\"."
+msgstr "No results could be found for your search term \"%{term}\"."
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogCopy.vue:201
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogCopy.vue:208
@@ -2966,9 +2926,8 @@ msgstr "No groups in this course could be found."
 
 #: resources/vue/components/courseware/CoursewareBlockCommentsOverview.vue:129
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:127
-#, fuzzy
 msgid "Es wurden keine Kommentare oder Anmerkungen gefunden"
-msgstr "No comments or feedback has been found"
+msgstr "No comments or annotations have been found"
 
 #: resources/vue/components/StudipMultiPersonSearch.vue:94
 msgid "Es wurden keine neuen Ergebnisse für \"%{ needle }\" gefunden."
@@ -3004,23 +2963,20 @@ msgid "Es wurden leider noch keine Lernmaterialien angelegt."
 msgstr "Unfortunately, no learning materials have been created yet."
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardStudents.vue:108
-#, fuzzy
 msgid "Es wurden noch keine Aufgaben verteilt."
-msgstr "No shares have been created yet"
+msgstr "No tasks have been distributed yet."
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:108
-#, fuzzy
 msgid "Es wurden noch keine Bewertungen abgegeben."
-msgstr "No languages have been specified."
+msgstr "No ratings have been given yet."
 
 #: resources/vue/components/courseware/CoursewareContentPermissions.vue:28
 msgid "Es wurden noch keine Freigaben erteilt"
 msgstr "No shares have been created yet"
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:111
-#, fuzzy
 msgid "Es wurden noch keine weiteren Bewertungen abgegeben."
-msgstr "No further participating institutes were specified."
+msgstr "No further ratings have been given."
 
 #: resources/vue/components/courseware/widgets/CoursewareExportWidget.vue:27
 #: resources/vue/components/tree/TreeExportWidget.vue:15
@@ -3140,21 +3096,18 @@ msgid "Feedback"
 msgstr "Feedback"
 
 #: resources/vue/components/courseware/structural-element/CoursewareFeedbackPopup.vue:15
-#, fuzzy
 msgid "Feedback abgeben"
 msgstr "Give feedback"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:486
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:67
-#, fuzzy
 msgid "Feedback aktivieren"
-msgstr "Give feedback"
+msgstr "Activate feedback"
 
 #: resources/vue/components/courseware/structural-element/CoursewareFeedbackPopup.vue:47
 #: resources/vue/components/feedback/FeedbackEntryCreate.vue:38
-#, fuzzy
 msgid "Feedback anonym abgeben"
-msgstr "Feedback could not be saved"
+msgstr "Give feedback anonymously"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:494
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:75
@@ -3166,9 +3119,8 @@ msgid "Feedback bearbeiten"
 msgstr "Edit feedback"
 
 #: resources/vue/components/feedback/FeedbackCreateDialog.vue:8
-#, fuzzy
 msgid "Feedback erstellen"
-msgstr "Feedback given"
+msgstr "Create feedback"
 
 #: resources/vue/components/courseware/tasks/TaskGroupTaskItem.vue:131
 msgid "Feedback geben"
@@ -3179,19 +3131,16 @@ msgid "Feedback gegeben"
 msgstr "Feedback given"
 
 #: resources/vue/components/courseware/tasks/TaskGroupTaskItem.vue:110
-#, fuzzy
 msgid "Feedback geschrieben am: %{ date }"
-msgstr "Feedback written on:"
+msgstr "Feedback written on: %{ date }"
 
 #: resources/vue/components/feedback/FeedbackCreateDialog.vue:47
-#, fuzzy
 msgid "Feedback kann anonym abgegeben werden"
-msgstr "Feedback could not be saved"
+msgstr "Feedback can be given anonymously"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:1297
-#, fuzzy
 msgid "Feedback wurde abgegeben."
-msgstr "Give feedback for the task"
+msgstr "Feedback has been given."
 
 #: resources/vue/components/courseware/tasks/PagesTaskGroupsShow.vue:135
 msgid "Feedback wurde gelöscht."
@@ -3210,9 +3159,8 @@ msgid "Feedback zur Aufgabe geben"
 msgstr "Give feedback for the task"
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:117
-#, fuzzy
 msgid "Feedback-Eintrag löschen"
-msgstr "Delete feedback element"
+msgstr "Delete feedback entry"
 
 #: resources/vue/components/feedback/FeedbackElementUpdate.vue:10
 msgid "Feedback-Element bearbeiten"
@@ -3296,14 +3244,12 @@ msgid "Fortschritt"
 msgstr "Progress"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:102
-#, fuzzy
 msgid "Fortschritt aller Teilnehmenden"
-msgstr "Number of participants:"
+msgstr "Progress of all participants"
 
 #: resources/vue/components/courseware/layouts/CoursewareTile.vue:105
-#, fuzzy
 msgid "Fortschritt aller Teilnehmenden: %{progress}%"
-msgstr "Progress: %{progress}%"
+msgstr "Progress of all participants: %{progress}%"
 
 #: resources/vue/components/courseware/blocks/CoursewareDownloadBlock.vue:166
 msgid "Fortschritt erst beim Herunterladen"
@@ -3338,9 +3284,8 @@ msgstr "Free"
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue:178
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue:156
-#, fuzzy
 msgid "Frei bearbeitbar"
-msgstr "Edit share"
+msgstr "Freely editable"
 
 #: resources/vue/components/courseware/CoursewareContentShared.vue:18
 #: resources/vue/components/courseware/CoursewareContentShared.vue:81
@@ -3433,9 +3378,8 @@ msgid "Gelöscht"
 msgstr "Deleted"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitProgress.vue:64
-#, fuzzy
 msgid "Gesamtes Lernmaterial"
-msgstr "Shared learning material"
+msgstr "All learning material"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:166
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:54
@@ -3671,28 +3615,20 @@ msgid "Hier muss ein Wert eingetragen werden."
 msgstr "A value must be entered here."
 
 #: resources/assets/javascripts/bootstrap/forms.js:353
-#, fuzzy
 msgid "Hier muss ein Wert mit mindestens %{min} Zeichen eingetragen werden."
-msgstr "A value must be entered here."
+msgstr "A value with at least %{min} characters must be entered here."
 
 #: resources/vue/components/blubber/Comment.vue:87
-#, fuzzy
 msgid "Hierauf antworten"
-msgstr "Reply on this."
+msgstr "Reply on this"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExportPdf.vue:19
-#, fuzzy
 msgid "Hiermit exportieren Sie die Seite \"%{ pageTitle }\" als PDF-Datei."
-msgstr ""
-"Hereby you export the page \"%{ currentElement.attributes.title }\" as PDF "
-"file."
+msgstr "Hereby you export the page \"%{ pageTitle }\" as PDF file."
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExport.vue:24
-#, fuzzy
 msgid "Hiermit exportieren Sie die Seite \"%{ pageTitle }\" als ZIP-Datei."
-msgstr ""
-"Hereby you export the page \"%{ currentElement.attributes.title }\" as ZIP "
-"file."
+msgstr "Hereby you export the page \"%{ pageTitle }\" as ZIP file."
 
 #: resources/vue/components/courseware/blocks/CoursewareHeadlineBlock.vue:371
 msgid "Hintergrund"
@@ -3815,10 +3751,9 @@ msgid "Ihre persönlichen Lernmaterialien"
 msgstr "Your personal learning materials"
 
 #: resources/vue/components/form_inputs/MyCoursesColouredTable.vue:97
-#, fuzzy
 msgid ""
 "Im gewählten Semester stehen keine Veranstaltungen zur Auswahl zur Verfügung."
-msgstr "No learning material is available for the selected source."
+msgstr "No courses are available for selection in the selected semester."
 
 #: resources/vue/components/courseware/widgets/CoursewareImportWidget.vue:15
 #: resources/vue/components/courseware/widgets/CoursewareShelfImportWidget.vue:11
@@ -3899,6 +3834,9 @@ msgid ""
 "den Einstellungen des Lernmaterials ändern. Wenn Sie die Einstellung "
 "beibehalten wollen, legen Sie bitte eine Seite an."
 msgstr ""
+"In this learning material, the start page will be hidden. You can change "
+"this in the settings of the learning material. If you wan to keept this "
+"setting, please create a page."
 
 #: resources/vue/components/courseware/blocks/CoursewareDownloadBlock.vue:127
 msgid "Infobox"
@@ -4085,10 +4023,9 @@ msgstr "Merge contents"
 #: resources/vue/components/ContentModulesControl.vue:38
 #: resources/vue/components/ContentModulesEditTiles.vue:120
 #: resources/vue/components/ContentmodulesEditTable.vue:135
-#, fuzzy
 msgid ""
 "Inhaltsmodul %{ name } für Teilnehmende unsichtbar bzw. sichtbar schalten"
-msgstr "Make content module %{ name } invisible or visible for participants"
+msgstr "Make the content module %{ name } invisible or visible for participants"
 
 #: resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue:105
 #: resources/vue/components/courseware/structural-element/CoursewareRibbon.vue:30
@@ -4283,9 +4220,8 @@ msgid "Keine Exportoptionen verfügbar"
 msgstr "No export options available"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExportChooser.vue:49
-#, fuzzy
 msgid "Keine Exportoptionen verfügbar."
-msgstr "No export options available"
+msgstr "No export options available."
 
 #: resources/vue/components/courseware/blocks/CoursewareDialogCardsBlock.vue:90
 msgid "keine nächste Karte"
@@ -4357,15 +4293,13 @@ msgstr "Comments"
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockActions.vue:63
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:527
-#, fuzzy
 msgid "Kommentare abschalten"
-msgstr "Hide comments"
+msgstr "Disable comments"
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockActions.vue:64
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:528
-#, fuzzy
 msgid "Kommentare aktivieren"
-msgstr "Show comments"
+msgstr "Enable comments"
 
 #: resources/vue/components/courseware/CoursewareBlockCommentsOverview.vue:99
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:92
@@ -4429,9 +4363,8 @@ msgid "Lade Aktivitäten…"
 msgstr "Loading activities…"
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:127
-#, fuzzy
 msgid "Lade Bewertungen…"
-msgstr "Loading courses…"
+msgstr "Loading ratings…"
 
 #: resources/vue/mixins/courseware/export.js:77
 msgid "Lade Dateien"
@@ -4539,44 +4472,40 @@ msgid "Lernmaterial"
 msgstr "Learning material"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:84
-#, fuzzy
 msgid ""
 "Lernmaterial %{unitTitle} ausgewählt. Aktuelle Position in der Liste: %{pos} "
 "von %{listLength}. Drücken Sie die Aufwärts- und Abwärtspfeiltasten, um die "
 "Position zu ändern, die Leertaste oder Entertaste zum Ablegen, die Escape-"
 "Taste zum Abbrechen."
 msgstr ""
-"%{blockTitle} block selected. Current position in the list: %{pos} of "
-"%{listLength}. Press the up and down arrow keys to change the position. "
+"Learning material %{unitTitle} selected. Current position in the list: %{pos}"
+" of %{listLength}. Press the up and down arrow keys to change the position. "
 "Press the space bar to set the position, press escape to abort."
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:123
-#, fuzzy
 msgid ""
 "Lernmaterial %{unitTitle}, abgelegt. Endgültige Position in der Liste: "
 "%{pos} von %{listLength}."
 msgstr ""
-"%{elementTitle}, set. Final position in the list: %{pos} of %{listLength}."
+"Learning material %{unittTitle}, set. Final position in the list: %{pos} of "
+"%{listLength}."
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:114
-#, fuzzy
 msgid "Lernmaterial %{unitTitle}, Neuordnung abgebrochen."
-msgstr "%{elementTitle}. Reordering aborted."
+msgstr "Learning material %{unitTitle}. Reordering aborted."
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:138
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:152
-#, fuzzy
 msgid ""
 "Lernmaterial %{unitTitle}. Aktuelle Position in der Liste: %{pos} von "
 "%{listLength}."
 msgstr ""
-"%{elementTitle} has been moved. Current position in the list: %{pos} of "
-"%{listLength}"
+"Learning material %{unitTitle}. Current position in the list: %{pos} of "
+"%{listLength}."
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogTopics.vue:21
-#, fuzzy
 msgid "Lernmaterial aus Ablaufplan-Themen erstellen"
-msgstr "Add new learning material"
+msgstr "Create learning material from schedule topics"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogExport.vue:12
 msgid "Lernmaterial exportieren"
@@ -4622,12 +4551,11 @@ msgstr "Open learning material"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:60
 msgid "Lernmaterial wurde mit %{avg} Sternen bewertet"
-msgstr ""
+msgstr "The learning material has been rated with %{avg} stars"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:70
-#, fuzzy
 msgid "Lernmaterial wurde noch nicht bewertet"
-msgstr "This request has not been processed yet."
+msgstr "The learning material has not been rated"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItems.vue:84
 msgid "Lernmaterialien"
@@ -4857,19 +4785,16 @@ msgid "Mehrere Antworten sind erlaubt"
 msgstr "Multiple answers are allowed"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:102
-#, fuzzy
 msgid "Mein Fortschritt"
-msgstr "Progress"
+msgstr "My progress"
 
 #: resources/vue/components/courseware/layouts/CoursewareTile.vue:107
-#, fuzzy
 msgid "Mein Fortschritt: %{progress}%"
-msgstr "Progress: %{progress}%"
+msgstr "My progress: %{progress}%"
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:72
-#, fuzzy
 msgid "Meine Bewertung"
-msgstr "Rating"
+msgstr "My rating"
 
 #: resources/vue/components/MemcachedCacheConfig.vue:5
 msgid "Memcached-Server"
@@ -4972,20 +4897,20 @@ msgid ""
 "Möchten Sie das Feedback-Element wirklich unwiderruflich löschen? Alle "
 "Bewertungen werden ebenfalls gelöscht!"
 msgstr ""
+"Do you really want to delete the feedback element irrevocably? All ratings "
+"will be deleted, too!"
 
 #: resources/vue/components/courseware/unit/CoursewareUnitItem.vue:90
 msgid "Möchten Sie das Lernmaterial %{ unitTitle } wirklich löschen?"
 msgstr "Do you really want to delete the learning material %{ unitTitle }?"
 
 #: resources/vue/components/feedback/FeedbackDialog.vue:118
-#, fuzzy
 msgid "Möchten Sie den Eintrag wirklich unwiderruflich löschen?"
-msgstr "Are you sure to delete this posting?"
+msgstr "Are you sure to delete this entry irrevocably?"
 
 #: resources/vue/components/courseware/tasks/TaskGroupsDeleteDialog.vue:8
-#, fuzzy
 msgid "Möchten Sie die Aufgabe wirklich löschen?"
-msgstr "Do you really want to delete the page?"
+msgstr "Do you really want to delete the task?"
 
 #: resources/vue/components/courseware/CoursewareContentShared.vue:105
 msgid "Möchten Sie die Freigabe für %{ pageTitle} wirklich löschen?"
@@ -5039,23 +4964,20 @@ msgid "Möchten Sie diesen Block wirklich löschen?"
 msgstr "Do you really want to delete this block?"
 
 #: resources/vue/components/courseware/layouts/CoursewareTalkBubble.vue:67
-#, fuzzy
 msgid "Möchten Sie diesen Eintrag löschen?"
-msgstr "Do you really want to delete this link"
+msgstr "Do you really want to delete this entry?"
 
 #: resources/vue/components/courseware/CoursewareContentLinks.vue:109
 msgid "Möchten Sie diesen Link löschen"
 msgstr "Do you really want to delete this link"
 
 #: resources/vue/components/courseware/containers/CoursewareAccordionContainer.vue:148
-#, fuzzy
 msgid "Möchten Sie dieses Fach wirklich löschen?"
-msgstr "Do you really want to delete this block?"
+msgstr "Do you really want to delete this field of study?"
 
 #: resources/vue/components/courseware/containers/CoursewareTabsContainer.vue:50
-#, fuzzy
 msgid "Möchten Sie dieses Tab wirklich löschen?"
-msgstr "Do you really want to delete this template?"
+msgstr "Do you really want to delete this tab?"
 
 #: resources/assets/javascripts/mvv.js:117
 msgid "Modul suchen"
@@ -5086,18 +5008,16 @@ msgid "Montag"
 msgstr "Monday"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:369
-#, fuzzy
 msgid "MP3 Metadaten bearbeiten"
-msgstr "Edit study details"
+msgstr "Edit MP3 metadata"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue:42
 msgid "Multimedia"
 msgstr "Multimedia"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:417
-#, fuzzy
 msgid "Nach einer Anzahl von Terminen"
-msgstr "Number of appointments"
+msgstr "After an amount of dates"
 
 #: resources/vue/components/courseware/blocks/CoursewareBeforeAfterBlock.vue:110
 msgid "Nachher"
@@ -5122,9 +5042,8 @@ msgid "Nächste"
 msgstr "Next"
 
 #: resources/vue/components/courseware/blocks/CoursewareGalleryBlock.vue:120
-#, fuzzy
 msgid "Nächstes Bild"
-msgstr "next"
+msgstr "Next picture"
 
 #: resources/vue/components/ContentModules.vue:72
 msgid "Nächstes Inhaltselement"
@@ -5245,9 +5164,8 @@ msgstr "No"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogAddChooser.vue:21
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAddChooser.vue:21
-#, fuzzy
 msgid "Neu erstellen"
-msgstr "create"
+msgstr "Create new"
 
 #: resources/assets/javascripts/lib/jsupdater.js:171
 msgid "Neu laden"
@@ -5258,9 +5176,8 @@ msgid "Neu, Struktur aus Ablaufplan"
 msgstr "New, structure from schedule"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:245
-#, fuzzy
 msgid "Neue Aufnahme starten"
-msgstr "Start recording"
+msgstr "Start new recording"
 
 #: resources/vue/components/courseware/tasks/RenewalDialog.vue:39
 msgid "neue Frist"
@@ -5292,9 +5209,8 @@ msgid "Nicht buchbare Räume:"
 msgstr "Non-allocatable rooms:"
 
 #: resources/vue/components/form_inputs/CalendarPermissionsTable.vue:33
-#, fuzzy
 msgid "Nicht mehr teilen"
-msgstr "Unsubscribe"
+msgstr "Do not share anymore"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementSelectorItem.vue:73
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementSelectorItem.vue:108
@@ -5490,60 +5406,50 @@ msgid "Ordner"
 msgstr "Folder"
 
 #: resources/vue/components/StudipFileChooser.vue:71
-#, fuzzy
 msgid "Ordner \"%{folderName}\" ausgewählt"
-msgstr "Select %{userName}"
+msgstr "Folder \"%{folderName}\" selected"
 
 #: resources/vue/components/FilesTable.vue:148
-#, fuzzy
 msgid "Ordner %{name} auswählen"
-msgstr "Select folder type"
+msgstr "Select folder %{name}"
 
 #: resources/vue/components/file-chooser/FileChooserToolbar.vue:46
-#, fuzzy
 msgid "Ordner anlegen"
-msgstr "Create document folder"
+msgstr "Create folder"
 
 #: resources/vue/components/file-chooser/FileChooserTree.vue:22
-#, fuzzy
 msgid "Ordner aufklappen"
-msgstr "Open object"
+msgstr "Expand folder"
 
 #: resources/vue/components/StudipFileChooser.vue:61
 #: resources/vue/components/file-chooser/FileChooserDialog.vue:68
-#, fuzzy
 msgid "Ordner auswählen"
-msgstr "Select folder type"
+msgstr "Select folder"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:331
-#, fuzzy
 msgid "Ordner enthält keine Audio-Dateien"
-msgstr "The ZIP archive doesn't contain any file!"
+msgstr "Folder does not contain audio files"
 
 #: resources/vue/components/file-chooser/FileChooserToolbar.vue:27
 #: resources/vue/components/file-chooser/FileChooserToolbar.vue:35
-#, fuzzy
 msgid "Ordner hinzufügen"
-msgstr "Add server"
+msgstr "Add folder"
 
 #: resources/vue/components/FilesTable.vue:195
-#, fuzzy
 msgid "Ordner und Dateien auswählen"
-msgstr "Select folder type"
+msgstr "Select folder and files"
 
 #: resources/vue/components/file-chooser/FileChooserTree.vue:22
-#, fuzzy
 msgid "Ordner zuklappen"
-msgstr "Close object"
+msgstr "Fold folder"
 
 #: resources/vue/components/courseware/layouts/CoursewareFileChooser.vue:2
 msgid "Ordner-Filter"
 msgstr "Folder filter"
 
 #: resources/vue/components/file-chooser/FileChooserToolbar.vue:40
-#, fuzzy
 msgid "Ordnername"
-msgstr "Folder"
+msgstr "Folder name"
 
 #: resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue:194
 msgid "Oval hinzufügen"
@@ -5563,18 +5469,16 @@ msgid "Passwort"
 msgstr "Password"
 
 #: resources/vue/components/RedisCacheConfig.vue:35
-#, fuzzy
 msgid "Passwort/Token zur Authentifizierung"
-msgstr "External authentication"
+msgstr "Password/token for authentification"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:176
 msgid "Pause"
 msgstr "Break"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExportChooser.vue:32
-#, fuzzy
 msgid "PDF Datei herunterladen"
-msgstr "Download file"
+msgstr "Download PDF file"
 
 #: resources/vue/components/courseware/widgets/CoursewareExportWidget.vue:43
 msgid "PDF-Dokument erstellen"
@@ -5683,9 +5587,8 @@ msgid "Radius"
 msgstr "Radius"
 
 #: resources/vue/components/file-chooser/FileChooserBox.vue:39
-#, fuzzy
 msgid "Rasteransicht umschalten"
-msgstr "Make course visible"
+msgstr "Switch raster view"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:86
 msgid "Rechte"
@@ -5796,18 +5699,16 @@ msgstr "Write something, ask something. Press enter to send it."
 
 #: resources/vue/components/courseware/blocks/CoursewareBlockFeedback.vue:18
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementFeedback.vue:18
-#, fuzzy
 msgid "Schreiben Sie eine Anmerkung..."
-msgstr "Write a feedback..."
+msgstr "Write an annotation..."
 
 #: resources/vue/components/form_inputs/CalendarPermissionsTable.vue:32
 msgid "Schreibzugriff"
 msgstr "Write access"
 
 #: resources/vue/components/form_inputs/CalendarPermissionsTable.vue:68
-#, fuzzy
 msgid "Schreibzugriff für %{name}"
-msgstr "Write access"
+msgstr "Write access for %{name}"
 
 #: resources/vue/components/courseware/blocks/CoursewareTypewriterBlock.vue:94
 msgid "Schriftart"
@@ -5862,14 +5763,12 @@ msgstr[0] "Page"
 msgstr[1] "Pages"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:217
-#, fuzzy
 msgid "Seite auf dem OER Campus veröffentlichen"
-msgstr "Publish learning content on the OER Campus"
+msgstr "Publish page on the OER Campus"
 
 #: resources/vue/components/courseware/structural-element/CoursewareTreeItemAdder.vue:30
-#, fuzzy
 msgid "Seite erstellen"
-msgstr "Write posting"
+msgstr "Create page"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExport.vue:13
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExportChooser.vue:11
@@ -5879,7 +5778,6 @@ msgid "Seite exportieren"
 msgstr "Export page"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:225
-#, fuzzy
 msgid "Seite für den OER Campus vorschlagen"
 msgstr "Suggest page for the OER Campus"
 
@@ -5920,12 +5818,11 @@ msgstr "Page created by"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:216
 msgid "Seite wurde mit %{avg} Sternen bewertet"
-msgstr ""
+msgstr "Page has been rated with %{avg} stars"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:219
-#, fuzzy
 msgid "Seite wurde noch nicht bewertet"
-msgstr "This request has not been processed yet."
+msgstr "Page has not been rated yet"
 
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:44
 #: resources/vue/components/courseware/CoursewareStructuralElementCommentsOverview.vue:117
@@ -6142,9 +6039,8 @@ msgid "Sie selbst haben folgende Dateien in diesen Ordner eingestellt"
 msgstr "You have inserted the following files to this folder"
 
 #: resources/vue/components/file-chooser/FileChooserBox.vue:61
-#, fuzzy
 msgid "Sie sind nicht berechtigt, den Inhalt dieses Ordners anzuzeigen."
-msgstr "You are not allowed to see the content of this folder!"
+msgstr "You are not allowed to see the content of this folder."
 
 #: resources/assets/javascripts/lib/jsupdater.js:188
 msgid "Sie sind nicht mehr im System angemeldet."
@@ -6230,13 +6126,12 @@ msgstr "Miscellanea"
 
 #: resources/vue/components/questionnaires/LikertEdit.vue:67
 #: resources/vue/components/questionnaires/RangescaleEdit.vue:76
-#, fuzzy
 msgid ""
 "Sortierelement für Aussage %{statement}. Drücken Sie die Tasten Pfeil-nach-"
 "oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben."
 msgstr ""
-"Sorting element for the element %{node}. Press the up or down arrow key to "
-"move this element inside the list."
+"Sorting element for the statement %{statement}. Press the up or down arrow "
+"key to move this element inside the list."
 
 #: resources/vue/components/tree/StudipTreeList.vue:128
 #: resources/vue/components/tree/StudipTreeTable.vue:183
@@ -6248,21 +6143,19 @@ msgstr ""
 "move this element inside the list."
 
 #: resources/vue/components/ContentmodulesEditTable.vue:76
-#, fuzzy
 msgid ""
 "Sortierelement für Module %{module}. Drücken Sie die Tasten Pfeil-nach-oben "
 "oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben."
 msgstr ""
-"Sorting element for the element %{node}. Press the up or down arrow key to "
+"Sorting element for the module %{module}. Press the up or down arrow key to "
 "move this element inside the list."
 
 #: resources/vue/components/ContentModulesEditTiles.vue:77
-#, fuzzy
 msgid ""
 "Sortierelement für Werkzeug %{module}. Drücken Sie die Tasten Pfeil-nach-"
 "oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben."
 msgstr ""
-"Sorting element for the element %{node}. Press the up or down arrow key to "
+"Sorting element for the tool %{module}. Press the up or down arrow key to "
 "move this element inside the list."
 
 #: resources/assets/javascripts/chunks/tablesorter.js:26
@@ -6497,9 +6390,8 @@ msgstr "Tags"
 #: resources/vue/components/courseware/tasks/CoursewareDashboardStudents.vue:78
 #: resources/vue/components/courseware/tasks/TaskGroupsAddSolversDialog.vue:18
 #: resources/vue/components/courseware/widgets/CoursewareTasksActionWidget.vue:40
-#, fuzzy
 msgid "Teilnehmende hinzufügen"
-msgstr "Add participant(s)"
+msgstr "Add participants"
 
 #: resources/vue/components/courseware/tasks/TaskGroupTaskItem.vue:38
 #: resources/vue/components/courseware/tasks/TaskGroupTaskItem.vue:40
@@ -6613,9 +6505,8 @@ msgstr "Learning material title"
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogAdd.vue:171
 #: resources/vue/components/courseware/unit/CoursewareUnitItemDialogLayout.vue:150
-#, fuzzy
 msgid "Titelseite"
-msgstr "Target page"
+msgstr "Title page"
 
 #: resources/vue/components/courseware/blocks/CoursewareImageMapBlock.vue:26
 msgid "Transparent"
@@ -6829,9 +6720,8 @@ msgstr "Display all courses on this level"
 #: resources/vue/components/tree/StudipTreeList.vue:169
 #: resources/vue/components/tree/StudipTreeTable.vue:124
 #: resources/vue/components/tree/StudipTreeTable.vue:125
-#, fuzzy
 msgid "Veranstaltungen auf Unterebenen anzeigen"
-msgstr "Show courses on all sub-layers"
+msgstr "Show courses on sub-layers"
 
 #: resources/vue/components/tree/StudipTreeList.vue:258
 msgid "Veranstaltungen exportieren"
@@ -6876,9 +6766,8 @@ msgid "Verknüpfen"
 msgstr "Link"
 
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:16
-#, fuzzy
 msgid "Verlängern"
-msgstr "prolonged until"
+msgstr "Prolong"
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:101
 #: resources/vue/components/courseware/tasks/TaskGroupTaskItem.vue:92
@@ -6886,9 +6775,8 @@ msgid "verlängert bis"
 msgstr "prolonged until"
 
 #: resources/vue/components/courseware/tasks/TaskGroupsModifyDeadlineDialog.vue:54
-#, fuzzy
 msgid "Verlängerte Bearbeitungszeit:"
-msgstr "Processing time"
+msgstr "Prolonged editing time:"
 
 #: resources/vue/components/courseware/tasks/CoursewareDashboardTasks.vue:88
 msgid "Verlängerung beantragen"
@@ -6938,9 +6826,8 @@ msgid "Verteilen an"
 msgstr "Distribute to"
 
 #: resources/vue/components/courseware/tasks/TaskGroup.vue:30
-#, fuzzy
 msgid "Verteilte Aufgaben"
-msgstr "Distribute to"
+msgstr "Distributed tasks"
 
 #: resources/vue/components/courseware/blocks/CoursewareHeadlineBlock.vue:144
 msgid "Vertikal"
@@ -7006,9 +6893,8 @@ msgid "Vor"
 msgstr "Before"
 
 #: resources/assets/javascripts/lib/datetime.js:45
-#, fuzzy
 msgid "Vor %{ minutes } Minuten"
-msgstr "%s minutes ago"
+msgstr "%{ minutes } minutes ago"
 
 #: resources/vue/components/courseware/containers/CoursewareAccordionContainer.vue:136
 #: resources/vue/components/courseware/containers/CoursewareListContainer.vue:110
@@ -7022,9 +6908,8 @@ msgid "Vorher"
 msgstr "Before"
 
 #: resources/vue/components/courseware/blocks/CoursewareGalleryBlock.vue:115
-#, fuzzy
 msgid "Vorheriges Bild"
-msgstr "previous"
+msgstr "Previous image"
 
 #: resources/vue/components/courseware/CoursewareAdminTemplates.vue:42
 #: resources/vue/components/courseware/CoursewareAdminTemplates.vue:18
@@ -7085,9 +6970,8 @@ msgid "Vorschaubild"
 msgstr "Preview image"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:226
-#, fuzzy
 msgid "Vorschlagen"
-msgstr "Templates"
+msgstr "Suggest"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogCopy.vue:24
 msgid ""
@@ -7241,6 +7125,9 @@ msgid ""
 "Zertifikats verwenden möchten, muss es nur die passende Größe haben, um die "
 "ganze Seite auszufüllen."
 msgstr ""
+"Select an image here that is shown in the left top corner of the certificate "
+"in its original size. If you want to use the image as background for the "
+"certificate, it just has to have the matching size to fill the whole page."
 
 #: resources/vue/components/courseware/unit/CoursewareShelfDialogImport.vue:20
 msgid ""
@@ -7253,9 +7140,8 @@ msgstr ""
 "courseware.json."
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:366
-#, fuzzy
 msgid "Wann im Monat soll die Wiederholung stattfinden?"
-msgstr "In which calendar week shall the booking take place?"
+msgstr "When in the month shall the repetition take place?"
 
 #: resources/vue/components/courseware/blocks/CoursewareAudioBlock.vue:493
 #: resources/vue/components/courseware/blocks/CoursewareBeforeAfterBlock.vue:74
@@ -7320,14 +7206,12 @@ msgid "Werkzeug ist inaktiv"
 msgstr "Tool is inactive"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbar.vue:63
-#, fuzzy
 msgid "Werkzeugleiste ausklappen"
-msgstr "Tool is active"
+msgstr "Expand tool bar"
 
 #: resources/vue/components/courseware/toolbar/CoursewareToolbar.vue:46
-#, fuzzy
 msgid "Werkzeugleiste einklappen"
-msgstr "Tool is inactive"
+msgstr "Fold tool bar"
 
 #: resources/vue/components/courseware/blocks/CoursewareChartBlock.vue:113
 msgid "Wert"
@@ -7339,40 +7223,33 @@ msgid "Werte anderer Nutzer anzeigen"
 msgstr "Show values of other users"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:342
-#, fuzzy
 msgid "Wiederholung am einem bestimmten Tag des Monats:"
-msgstr "Repetition date"
+msgstr "Repetition on a certain day of month:"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:135
-#, fuzzy
 msgid "Wiederholung an bestimmten Wochentagen"
-msgstr "Repetition date"
+msgstr "Repetition on certain days of week"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:223
-#, fuzzy
 msgid "Wiederholung an einem bestimmten Datum"
-msgstr "Repetition date"
+msgstr "Repetition on a certain date"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:328
-#, fuzzy
 msgid "Wiederholung an einem bestimmten Tag des Monats"
-msgstr "Repetition date"
+msgstr "Repetition on a certain day of month"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:227
 #: resources/vue/components/form_inputs/RepetitionInput.vue:332
-#, fuzzy
 msgid "Wiederholung an einem bestimmten Wochentag"
-msgstr "Repetition date"
+msgstr "Repetition on a certain day of week"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:357
-#, fuzzy
 msgid "Wiederholung an einem bestimmten Wochentag:"
-msgstr "Repetition date"
+msgstr "Repetition on a certain day of week:"
 
 #: resources/vue/components/form_inputs/RepetitionInput.vue:89
-#, fuzzy
 msgid "Wiederholung an jedem Werktag"
-msgstr "Repetition date"
+msgstr "Repetition on every working day"
 
 #: resources/assets/javascripts/cke/wiki-link/formview.js:23
 msgid "Wikiseite"
@@ -7502,9 +7379,8 @@ msgid "Zielseite"
 msgstr "Target page"
 
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogExportChooser.vue:24
-#, fuzzy
 msgid "ZIP Datei herunterladen"
-msgstr "Download file"
+msgstr "Download ZIP file"
 
 #: resources/assets/javascripts/cke/studip-quote/StudipBlockQuote.js:24
 msgid "Zitat einfügen"
@@ -7548,7 +7424,7 @@ msgstr "Last changed on"
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:256
 #: resources/vue/components/courseware/structural-element/CoursewareStructuralElement.vue:19
 msgid "Zuletzt bearbeitet von"
-msgstr "Last changed by"
+msgstr "Last modified by"
 
 #: resources/assets/javascripts/cke/wiki-link/formview.js:23
 msgid "zum Beispiel \"Wiki-Startseite\""
-- 
cgit v1.0


From 39178af50c544f724face1e24ceb746921abe652 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Wed, 10 Apr 2024 15:21:22 +0000
Subject: Translated using Weblate (English)

Currently translated at 100.0% (9845 of 9845 strings)

Translation: Stud.IP/Stud.IP main
Translate-URL: https://weblate.uni-vechta.de/projects/stud-ip/stud-ip-main/en/
---
 locale/en/LC_MESSAGES/studip.po | 971 ++++++++++++++++------------------------
 1 file changed, 383 insertions(+), 588 deletions(-)

diff --git a/locale/en/LC_MESSAGES/studip.po b/locale/en/LC_MESSAGES/studip.po
index 9f611d6..3b63e49 100644
--- a/locale/en/LC_MESSAGES/studip.po
+++ b/locale/en/LC_MESSAGES/studip.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-03-06 13:16+0100\n"
-"PO-Revision-Date: 2024-04-06 15:29+0000\n"
+"PO-Revision-Date: 2024-04-12 15:29+0000\n"
 "Last-Translator: Moritz Strohm <strohm@data-quest.de>\n"
 "Language-Team: English <https://weblate.uni-vechta.de/projects/stud-ip/"
 "stud-ip-main/en/>\n"
@@ -7338,9 +7338,8 @@ msgid "Dieser Name ist bereits vergeben."
 msgstr "This name is already in use."
 
 #: app/controllers/course/wiki.php:219 app/controllers/course/wiki.php:773
-#, fuzzy
 msgid "Übergeordnete Seite im Inhaltsverzeichnis"
-msgstr "Table of contents"
+msgstr "Superordinated page in the table of contents"
 
 #: app/controllers/course/wiki.php:224
 msgid "Lesezugriff für"
@@ -7373,9 +7372,8 @@ msgid "Version %1$s vom %2$s"
 msgstr "Version %1$s from %2$s"
 
 #: app/controllers/course/wiki.php:713
-#, fuzzy
 msgid "Änderungen dieser Version"
-msgstr "Save changes"
+msgstr "Changes of this version"
 
 #: app/controllers/course/wiki.php:737
 msgid "Neue Wikiseite erstellen"
@@ -7398,7 +7396,7 @@ msgstr "The name already exists."
 #: app/controllers/course/wiki.php:778
 msgid ""
 "Den Seitennamen der neuen Seite automatisch in anderen Wikiseiten verlinken."
-msgstr ""
+msgstr "Automatically link the page name of the new page in other wiki pages."
 
 #: app/controllers/course/wiki.php:903 app/controllers/course/wiki.php:927
 msgid "Wiki: "
@@ -7431,7 +7429,6 @@ msgid "Text mit Autor/-innenzuordnung"
 msgstr "Text with author assignment"
 
 #: app/controllers/course/wiki.php:988
-#, fuzzy
 msgid "Sie haben keine Berechtigung, Änderungen an Wiki-Seiten vorzunehmen!"
 msgstr "You are not allowed to make changes to wiki pages!"
 
@@ -7457,7 +7454,6 @@ msgid "Die folgenden Fehler traten beim Import auf:"
 msgstr "The following errors occurred during import:"
 
 #: app/controllers/course/wiki.php:1101
-#, fuzzy
 msgid ""
 "Die Wiki-Seite wurde importiert! Sie ist unter der Ansicht \"Alle Seiten\" "
 "erreichbar."
@@ -7465,8 +7461,8 @@ msgid_plural ""
 "Die Wiki-Seiten wurden importiert! Sie sind unter der Ansicht \"Alle "
 "Seiten\" erreichbar."
 msgstr[0] ""
-"The wiki page has been imported! It is available at the navigation item "
-"\"All pages\"."
+"The wiki page has been imported! It is available at the navigation item \"All"
+" pages\"."
 msgstr[1] ""
 "The wiki pages have been imported! They are available at the navigation item "
 "\"All pages\"."
@@ -7717,11 +7713,10 @@ msgstr ""
 "An error occurred while changing the visibility. The setting was not altered."
 
 #: app/controllers/course/members.php:1005
-#, fuzzy
 msgid ""
 "Sie dürfen keine Lehrenden oder Tutor/-innen in diese Veranstaltung "
 "eintragen."
-msgstr "With write access for all lecturers/tutors of this course"
+msgstr "You are not allowed to add lecturers or tutors to this course."
 
 #: app/controllers/course/members.php:1029
 #, php-format
@@ -8086,11 +8081,10 @@ msgid "Anmeldung aufgehoben, auf Warteliste gesetzt"
 msgstr "Enrolment cancelled, added to wait list"
 
 #: app/controllers/course/members.php:2250
-#, fuzzy
 msgid ""
 "Sie dürfen keine Lehrenden oder Tutor/-innen aus dieser Veranstaltungen "
 "austragen."
-msgstr "You are not allowed to sign out of the course by yourself."
+msgstr "You are not allowed to remove lecturers or tutors from this course."
 
 #: app/controllers/course/management.php:37
 msgid "Dies ist eine Studiengruppe und kein Seminar!"
@@ -8765,9 +8759,8 @@ msgid "ILIAS"
 msgstr "ILIAS"
 
 #: app/controllers/course/gradebook/template_helpers.php:96
-#, fuzzy
 msgid "Test als Leistung hinzufügen"
-msgstr "Add a course"
+msgstr "Add test as achievement"
 
 #: app/controllers/course/gradebook/template_helpers.php:102
 msgid "Ergebnisse aus ILIAS importieren"
@@ -8791,9 +8784,8 @@ msgid "Die Noten wurden gespeichert."
 msgstr "The grades have been saved."
 
 #: app/controllers/course/gradebook/lecturers.php:196
-#, fuzzy
 msgid "Beim Übermitteln der Daten trat ein Fehler auf."
-msgstr "An error occurred while copying!"
+msgstr "An error occurred while transferring data."
 
 #: app/controllers/course/gradebook/lecturers.php:212
 #: app/views/course/gradebook/lecturers/custom_definitions.php:62
@@ -8832,21 +8824,19 @@ msgid "Die Leistung wurde gelöscht."
 msgstr "The achivement has been deleted."
 
 #: app/controllers/course/gradebook/lecturers.php:325
-#, fuzzy
 msgid "Es sind keine ILIAS-Tests als Leistungen definiert."
-msgstr "There are no manual achievements defined yet."
+msgstr "There are no ILIAS test defined as achievements."
 
 #: app/controllers/course/gradebook/lecturers.php:418
-#, fuzzy
 msgid "Die Leistung wurde erfolgreich aktualisiert."
-msgstr "The achievement has been defined successfully."
+msgstr "The achievement has been updated successfully."
 
 #: app/controllers/course/gradebook/lecturers.php:430
-#, fuzzy, php-format
+#, php-format
 msgid "%s Resultat wurde importiert."
 msgid_plural "%s Resultate wurden importiert."
-msgstr[0] "The tour has been imported."
-msgstr[1] "The tour has been imported."
+msgstr[0] "%s result has been imported."
+msgstr[1] "%s results have been imported."
 
 #: app/controllers/course/study_areas.php:130
 #: app/controllers/course/study_areas.php:172
@@ -8905,12 +8895,10 @@ msgid "Gruppe"
 msgstr "Group"
 
 #: app/controllers/course/statusgroups.php:319
-#, fuzzy
 msgid "Privatadresse"
-msgstr "Home address"
+msgstr "Private address"
 
 #: app/controllers/course/statusgroups.php:319
-#, fuzzy
 msgid "Privatnr."
 msgstr "Home number"
 
@@ -9993,9 +9981,8 @@ msgid "Thema gespeichert."
 msgstr "Topic saved."
 
 #: app/controllers/course/topics.php:121
-#, fuzzy
 msgid "Eines oder mehrere Themen gehören nicht zur ausgewählten Veranstaltung."
-msgstr "back to selected course"
+msgstr "One or more topics do not belong to the selected course."
 
 #: app/controllers/course/topics.php:158
 #, php-format
@@ -11013,11 +11000,11 @@ msgid "Diesen Nutzer gibt es nicht"
 msgstr "This user does not exist"
 
 #: app/controllers/tfa.php:42
-#, fuzzy
 msgid ""
 "Sie können die Zwei-Faktor-Authentifizierung nicht für andere Personen "
 "einrichten."
-msgstr "Two-factor authentication has been deactivated for this person."
+msgstr ""
+"You may not configure the two-factor authentification for other persons."
 
 #: app/controllers/tfa.php:66
 msgid "Die Zwei-Faktor-Authentifizierung wurde eingerichtet"
@@ -11331,7 +11318,6 @@ msgid "Der Kalender ist nicht aktiviert."
 msgstr "The calendar has not been activated."
 
 #: app/controllers/settings/calendar.php:37
-#, fuzzy
 msgid "Einstellungen des Kalenders anpassen"
 msgstr "Customise calender settings"
 
@@ -12052,10 +12038,9 @@ msgid "Rubrik löschen"
 msgstr "Delete category"
 
 #: app/controllers/siteinfo.php:149
-#, fuzzy
 msgid ""
 "Diese Seite befindet sich im Entwurfsmodus und ist daher noch unsichtbar."
-msgstr "The system is in maintenance mode. No access possible at the moment."
+msgstr "This page is in draft mode and therefore still invisible."
 
 #: app/controllers/siteinfo.php:159
 msgid "Neue Rubrik"
@@ -14073,9 +14058,8 @@ msgstr "Pictures"
 
 #: app/controllers/admin/login_style.php:38
 #: app/views/admin/login_style/login_faq.php:10
-#, fuzzy
 msgid "Hinweise zum Login"
-msgstr "Utilisation suggestions"
+msgstr "Login hints"
 
 #: app/controllers/admin/login_style.php:97
 #, php-format
@@ -14110,31 +14094,26 @@ msgid "Der Aktivierungsstatus konnte nicht gespeichert werden."
 msgstr "The activation state could not be saved."
 
 #: app/controllers/admin/login_style.php:162
-#, fuzzy
 msgid "Hinweise zum Login für den Startbildschirm"
-msgstr "Background images for the start screen"
+msgstr "Login hints for the start screen"
 
 #: app/controllers/admin/login_style.php:171
 #: app/controllers/admin/login_style.php:216
-#, fuzzy
 msgid "Hinweistext hinzufügen"
-msgstr "Add filter"
+msgstr "Add hint"
 
 #: app/controllers/admin/login_style.php:171
 #: app/views/admin/login_style/login_faq.php:27
-#, fuzzy
 msgid "Hinweistext bearbeiten"
-msgstr "Edit help text"
+msgstr "Edit hint"
 
 #: app/controllers/admin/login_style.php:185
-#, fuzzy
 msgid "Hinweistext wurde gespeichert."
-msgstr "List saved."
+msgstr "Hint has been saved."
 
 #: app/controllers/admin/login_style.php:196
-#, fuzzy
 msgid "Der Hinweistext wurde gelöscht."
-msgstr "The section has been deleted."
+msgstr "Hint has been deleted."
 
 #: app/controllers/admin/login_style.php:210
 msgid "Bild hinzufügen"
@@ -14756,36 +14735,35 @@ msgid "Freie Suche"
 msgstr "Free search"
 
 #: app/controllers/admin/extern.php:48
-#, fuzzy
 msgid "Personen-Browser"
-msgstr "Staff list"
+msgstr "Person browser"
 
 #: app/controllers/admin/extern.php:49
-#, fuzzy
 msgid "Personal der Einrichtungen"
-msgstr "%s of the institute"
+msgstr "Staff of the institutes"
 
 #: app/controllers/admin/extern.php:56
-#, fuzzy
 msgid "Externe Seiten (Systemweit)"
-msgstr "External pages"
+msgstr "External pages (system-wide)"
 
 #: app/controllers/admin/extern.php:79
 msgid ""
 "Die mit einem Ausrufezeichen versehenen Konfigurationen müssen eventuell "
 "überarbeitet werden."
 msgstr ""
+"The configurations marked with an exclaimation mark may need to be revised."
 
 #: app/controllers/admin/extern.php:81
 msgid ""
 "Der Aufbau der Templates hat sich in der aktuellen Stud.IP-Version geändert."
 msgstr ""
+"The structure of the templates has changed in the current Stud.IP version."
 
 #: app/controllers/admin/extern.php:82
 msgid ""
 "Nach dem Speichern der gekennzeichneten Templates wird die Markierung "
 "entfernt."
-msgstr ""
+msgstr "After saving the marked templates, the marking will be removed."
 
 #: app/controllers/admin/extern.php:88 app/controllers/admin/extern.php:137
 msgid "Konfiguration hochladen"
@@ -14811,73 +14789,63 @@ msgid "Konfiguration herunterladen"
 msgstr "Download configuration"
 
 #: app/controllers/admin/extern.php:167
-#, fuzzy
 msgid "Eine neue externe Seite \"%$1s\" vom Typ %$2s wurde angelegt."
-msgstr "The new property group with the name %s has been created."
+msgstr "A new external page \"%1$s\" of the type %2$s has been created."
 
 #: app/controllers/admin/extern.php:173
-#, fuzzy, php-format
+#, php-format
 msgid "Die Konfiguration der externen Seite \"%s\" wurde gespeichert."
-msgstr "The configuration options have been saved!"
+msgstr "The configuration of the external page \"%s\" has been saved."
 
 #: app/controllers/admin/extern.php:247
-#, fuzzy, php-format
+#, php-format
 msgid "Die Konfiguration \"%s\" wurde gelöscht."
-msgstr "Evaluation %s was deleted."
+msgstr "The configuration \"%s\" has been deleted."
 
 #: app/controllers/admin/extern.php:328
-#, fuzzy
 msgid "Es wurde keine Datei ausgewählt!"
-msgstr "No files have been selected!"
+msgstr "No file has been selected!"
 
 #: app/controllers/admin/extern.php:334
-#, fuzzy
 msgid "Die Datei hat ein ungültiges Format!"
-msgstr "The format of the course number is invalid."
+msgstr "The file format is invalid!"
 
 #: app/controllers/admin/extern.php:350
-#, fuzzy
 msgid "Die Datei kann nicht importiert werden!"
-msgstr "The data could not be exported."
+msgstr "The file cannot be imported!"
 
 #: app/controllers/admin/extern.php:356
-#, fuzzy
 msgid "Der Typ der Konfiguration ist ungültig!"
-msgstr "The username is invalid"
+msgstr "The configuration type is invalid!"
 
 #: app/controllers/admin/extern.php:367
-#, fuzzy, php-format
+#, php-format
 msgid "Die Konfiguration \"%s\" wurde erfolgreich importiert."
-msgstr "Data successfully exported."
+msgstr "The configuration \"%s\" has been imported successfully."
 
 #: app/controllers/admin/extern.php:465
-#, fuzzy
 msgid "Personen-Details"
-msgstr "Staff list"
+msgstr "Person details"
 
 #: app/controllers/admin/extern.php:466
-#, fuzzy
 msgid "Details zu einer Person"
-msgstr "Request details"
+msgstr "Details for a person"
 
 #: app/controllers/admin/extern.php:472
-#, fuzzy
 msgid "Liste der Veranstaltungen"
-msgstr "Type of course"
+msgstr "List of courses"
 
 #: app/controllers/admin/extern.php:477
 msgid "Veranst.-Details"
 msgstr "Course details"
 
 #: app/controllers/admin/extern.php:478
-#, fuzzy
 msgid "Details zu einer Veranstaltung"
-msgstr "directly to the course"
+msgstr "Details for a course"
 
 #: app/controllers/admin/extern.php:484
-#, fuzzy
 msgid "Zeiten/Termine/Themen der Veranstaltungen"
-msgstr "Course participants"
+msgstr "Times/Dates/Topics of the courses"
 
 #: app/controllers/admin/sem_classes.php:20
 #: app/views/institute/extern/extern_config/persondetails.php:83
@@ -15111,18 +15079,16 @@ msgid "Herzlich willkommen!"
 msgstr "Welcome!"
 
 #: app/controllers/registration.php:35
-#, fuzzy
 msgid ""
 "Benutzername muss mindestens 4 Zeichen lang sein und darf nur aus "
 "Buchstaben, Ziffern, Unterstrich, @, Punkt und Minus bestehen."
 msgstr ""
-"Your search item has to be 3 characters long and can only contain letters "
-"and numbers!"
+"The user name must be at least 4 characters long and must only consist of "
+"letters, numbers, dash, @, plus and minus."
 
 #: app/controllers/registration.php:41
-#, fuzzy
 msgid "Benutzername ist schon vergeben."
-msgstr "User <em>%s</em> already exists!"
+msgstr "The user name is already in use."
 
 #: app/controllers/registration.php:47 app/views/admin/install/root.php:15
 #: app/views/my_ilias_accounts/new_account.php:8
@@ -15136,9 +15102,8 @@ msgid "Passwortbestätigung"
 msgstr "Confirm password"
 
 #: app/controllers/registration.php:66
-#, fuzzy
 msgid "Passwörter stimmen nicht überein."
-msgstr "The passwords don't match."
+msgstr "The passwords do not match."
 
 #: app/controllers/registration.php:94 app/views/settings/account/index.php:143
 #: app/views/admin/user/new.php:81 app/views/admin/user/edit.php:171
@@ -15180,9 +15145,8 @@ msgid "divers"
 msgstr "diverse"
 
 #: app/controllers/registration.php:112
-#, fuzzy
 msgid "Diese Emailadresse ist bereits registriert."
-msgstr "The Plug-in is already registered."
+msgstr "This E-Mail address is already registered."
 
 #: app/controllers/registration.php:120
 msgid "Registrierung abschließen"
@@ -15565,9 +15529,8 @@ msgid "Funktion"
 msgstr "Function"
 
 #: app/controllers/institute/members.php:566
-#, fuzzy
 msgid "Mitarbeitendenexport"
-msgstr "Staff members"
+msgstr "Staff export"
 
 #: app/controllers/institute/members.php:581
 msgid "Erweitert"
@@ -15769,14 +15732,12 @@ msgid "Personen"
 msgstr "Persons"
 
 #: app/controllers/institute/extern.php:54
-#, fuzzy
 msgid "Liste der Personen an einer Einrichtung"
-msgstr "URL of the operating institution"
+msgstr "List of persons of an institute"
 
 #: app/controllers/institute/extern.php:60
-#, fuzzy
 msgid "Liste der Dateien zum Download"
-msgstr "Link to file download"
+msgstr "List of files for downloading"
 
 #: app/controllers/institute/extern.php:67
 msgid "Externe Seiten (Einrichtung)"
@@ -15951,9 +15912,8 @@ msgid "Datei konnte nicht gelöscht werden."
 msgstr "File could not be deleted."
 
 #: app/controllers/file.php:1454
-#, fuzzy
 msgid "Beim Kopieren ist ein Fehler aufgetreten"
-msgstr "An error occurred during copying."
+msgstr "An error occurred during copying"
 
 #: app/controllers/file.php:1496
 #, php-format
@@ -16623,38 +16583,32 @@ msgid "Beim Speichern des Termins ist ein Fehler aufgetreten."
 msgstr "An error occurred while saving the date."
 
 #: app/controllers/calendar/date.php:525
-#, fuzzy
 msgid "Die Zuweisungen des Termins zu Kalendern sind ungültig!"
-msgstr "The data you have entered are invalid."
+msgstr "The assignments of the date to calendars are invalid!"
 
 #: app/controllers/calendar/date.php:570
 msgid "Der Termin wurde gespeichert."
 msgstr "The date has been saved."
 
 #: app/controllers/calendar/date.php:572
-#, fuzzy
 msgid "Der Termin wurde gespeichert, aber nicht mit allen Terminausfällen!"
-msgstr "The date has been accepted, but %s will not be participating."
+msgstr "The date has been saved but not with all of its exceptions!"
 
 #: app/controllers/calendar/date.php:598
-#, fuzzy
 msgid "Sie sind nicht berechtigt, diesen Termin zu ändern."
-msgstr "You are not allowed to see the content of this folder!"
+msgstr "You are not allowed to modify this date."
 
 #: app/controllers/calendar/date.php:609
-#, fuzzy
 msgid "Verschieben eines Termins aus einer Terminserie"
-msgstr "Try again in %u minute(s)"
+msgstr "Moving a date from a date series"
 
 #: app/controllers/calendar/date.php:695
-#, fuzzy
 msgid "Ungültige Auswahl!"
-msgstr "Invalid module"
+msgstr "Invalid selection!"
 
 #: app/controllers/calendar/date.php:709 app/controllers/calendar/date.php:730
-#, fuzzy
 msgid "Der Termin konnte nicht gespeichert werden."
-msgstr "Vacation period could not be saved."
+msgstr "The date could not be saved."
 
 #: app/controllers/calendar/date.php:737
 #: app/views/course/timesrooms/_cycleRow.php:138
@@ -16662,39 +16616,34 @@ msgid "Termin löschen"
 msgstr "Delete date"
 
 #: app/controllers/calendar/date.php:766
-#, fuzzy, php-format
+#, php-format
 msgid "Die Ausnahme am %s wurde der Terminserie hinzugefügt."
-msgstr "One person has been added to the list."
+msgstr "The exception on %s has been added to the date series."
 
 #: app/controllers/calendar/date.php:775
-#, fuzzy, php-format
+#, php-format
 msgid "Die Ausnahme am %s konnte der Terminserie nicht hinzugefügt werden."
-msgstr "The sub-course could not be added."
+msgstr "The exception on %s could not be added to the date series."
 
 #: app/controllers/calendar/date.php:789
-#, fuzzy
 msgid "Die Terminserie wurde gelöscht!"
-msgstr "The dates have been deleted"
+msgstr "The date series has been deleted!"
 
 #: app/controllers/calendar/date.php:791
-#, fuzzy
 msgid "Der Termin wurde gelöscht!"
-msgstr "The date has been deleted"
+msgstr "The date has been deleted!"
 
 #: app/controllers/calendar/date.php:797
-#, fuzzy
 msgid "Die Terminserie konnte nicht gelöscht werden!"
-msgstr "File could not be deleted!"
+msgstr "The date series could not be deleted!"
 
 #: app/controllers/calendar/date.php:799
-#, fuzzy
 msgid "Der Termin konnte nicht gelöscht werden!"
-msgstr "File could not be deleted!"
+msgstr "The date could not be deleted!"
 
 #: app/controllers/calendar/date.php:825
-#, fuzzy
 msgid "Ihre Teilnahmestatus wurde geändert."
-msgstr "Status not changed."
+msgstr "Your participation status has been changed."
 
 #: app/controllers/calendar/contentbox.php:69
 #, php-format
@@ -16736,9 +16685,8 @@ msgid "Kalender teilen"
 msgstr "Share calendar"
 
 #: app/controllers/calendar/calendar.php:64
-#, fuzzy
 msgid "Gruppen verwalten"
-msgstr "Exit group"
+msgstr "Manage groups"
 
 #: app/controllers/calendar/calendar.php:102
 #: app/controllers/calendar/calendar.php:331
@@ -16764,56 +16712,48 @@ msgid "(bitte wählen)"
 msgstr "(please select)"
 
 #: app/controllers/calendar/calendar.php:244
-#, fuzzy
 msgid "Kalender auswählen"
-msgstr "Select members"
+msgstr "Select calendar"
 
 #: app/controllers/calendar/calendar.php:250
 msgid "Eigener Kalender"
 msgstr "Own calendar"
 
 #: app/controllers/calendar/calendar.php:262
-#, fuzzy
 msgid "Kalenderansicht"
-msgstr "Folder view"
+msgstr "Calendar view"
 
 #: app/controllers/calendar/calendar.php:264
-#, fuzzy
 msgid "Gruppenkalender"
-msgstr "Group calendar:"
+msgstr "Group calendar"
 
 #: app/controllers/calendar/calendar.php:268
-#, fuzzy
 msgid "Zeitleiste"
-msgstr "Sidebar"
+msgstr "Timeline"
 
 #: app/controllers/calendar/calendar.php:401
 #: app/controllers/calendar/calendar.php:458
-#, fuzzy
 msgid "Veranstaltungskalender"
-msgstr "Course calendar:"
+msgstr "Course calendar"
 
 #: app/controllers/calendar/calendar.php:701
-#, fuzzy
 msgid "Die Zuordnung von Veranstaltungen zum Kalender wurde aktualisiert."
-msgstr "The assigned courses have been configured."
+msgstr "The assignment of courses to the calendar has been updated."
 
 #: app/controllers/calendar/calendar.php:722
-#, fuzzy
 msgid "Bitte wählen Sie aus, welche Termine exportiert werden sollen!"
-msgstr "Select the date types to be displayed."
+msgstr "Please select which dates shall be exported!"
 
 #: app/controllers/calendar/calendar.php:761
-#, fuzzy, php-format
+#, php-format
 msgid "Ein Termin wurde importiert."
 msgid_plural "Es wurden %u Termine importiert."
-msgstr[0] "The tour has been imported."
-msgstr[1] "The tour has been imported."
+msgstr[0] "A date has been imported."
+msgstr[1] "%u dates have been imported."
 
 #: app/controllers/calendar/calendar.php:859
-#, fuzzy
 msgid "Die Kalenderfreigaben wurden geändert."
-msgstr "Locking level changed."
+msgstr "The calendar share has been modified."
 
 #: app/controllers/calendar/calendar.php:871
 msgid "Die Adresse, unter der Ihre Termine abrufbar sind, wurde gelöscht"
@@ -16847,9 +16787,8 @@ msgid "Bitte geben Sie eine gültige Email-Adresse an."
 msgstr "Please specify a valid e-mail address."
 
 #: app/controllers/calendar/calendar.php:898
-#, fuzzy
 msgid "Kalender veröffentlichen"
-msgstr "Publish your score"
+msgstr "Publish calendar"
 
 #: app/controllers/calendar/schedule.php:52 app/views/settings/general.php:5
 #: lib/modules/ScheduleWidget.php:25
@@ -17223,9 +17162,8 @@ msgid "Die Lehrveranstaltungsgruppe \"%s\" wurde gelöscht."
 msgstr "Course group \"%s\" deleted."
 
 #: app/controllers/lvgruppen/lvgruppen.php:364
-#, fuzzy
 msgid "Verwendet in Semester"
-msgstr "Use in semester:"
+msgstr "Used in semester"
 
 #: app/controllers/lvgruppen/lvgruppen.php:373
 #: app/controllers/lvgruppen/lvgruppen.php:400
@@ -17233,19 +17171,16 @@ msgid "Nicht verwendet"
 msgstr "Not in use"
 
 #: app/controllers/lvgruppen/lvgruppen.php:390
-#, fuzzy
 msgid "Verwendet von Fachbereich"
-msgstr "In use at faculty:"
+msgstr "Used by faculty"
 
 #: app/controllers/lvgruppen/lvgruppen.php:425
-#, fuzzy
 msgid "Verwendet von Fach"
-msgstr "In use at faculty:"
+msgstr "Used by field of study"
 
 #: app/controllers/lvgruppen/lvgruppen.php:448
-#, fuzzy
 msgid "Verwendet von Abschluss"
-msgstr "In use at faculty:"
+msgstr "Used by degree"
 
 #: app/controllers/userfilter/field.php:28
 msgid "Bedingung"
@@ -18721,12 +18656,16 @@ msgid ""
 "Die Person, für die die Sprechstunden angezeigt werden sollen, ist nicht "
 "mehr vorhanden"
 msgstr ""
+"The person for which the consultation hours shall be displayed is not "
+"available anymore"
 
 #: app/views/consultation/not_found.php:9
 msgid ""
 "Das Objekt, für das die Sprechstunden angezeigt werden sollen, ist nicht "
 "mehr vorhanden"
 msgstr ""
+"The object for which the consultation hours shall be displayed is not "
+"available anymore"
 
 #: app/views/consultation/slot-bookings.php:19
 #: app/views/consultation/admin/ungrouped.php:214
@@ -24222,9 +24161,8 @@ msgid "Titel der Rubrik"
 msgstr "Category title"
 
 #: app/views/siteinfo/new.php:27 app/views/siteinfo/edit.php:24
-#, fuzzy
 msgid "Position der Rubrik"
-msgstr "Category title"
+msgstr "Category position"
 
 #: app/views/siteinfo/new.php:32 app/views/siteinfo/edit.php:29
 msgid "Rubrik-Zuordnung"
@@ -24240,14 +24178,12 @@ msgid "Entwurfsmodus (nur sichtbar für root)"
 msgstr "Draft mode (only visible for root)"
 
 #: app/views/siteinfo/new.php:52 app/views/siteinfo/edit.php:51
-#, fuzzy
 msgid "Seite nicht anzeigen für nicht angemeldete Benutzer"
-msgstr "As public link for unregistered users"
+msgstr "Do not show the page for users that are not logged-in"
 
 #: app/views/siteinfo/new.php:56 app/views/siteinfo/edit.php:55
-#, fuzzy
 msgid "Position der Seite"
-msgstr "Versions of this page"
+msgstr "Page position"
 
 #: app/views/siteinfo/new.php:61 app/views/siteinfo/edit.php:60
 msgid "Seiteninhalt"
@@ -24592,7 +24528,6 @@ msgstr "Cancel the following course dates"
 
 #: app/views/course/cancel_dates/index.php:15
 #: app/views/course/timesrooms/_cancel_form.php:9
-#, fuzzy
 msgid ""
 "Wenn Sie die nicht stattfindenden Termine mit einem Kommentar versehen, "
 "werden die Ausfalltermine im Ablaufplan weiterhin dargestellt und auch im "
@@ -26248,9 +26183,8 @@ msgid "Gewichtung"
 msgstr "Weighting"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:7
-#, fuzzy
 msgid "ILIAS Leistungen definieren"
-msgstr "Define achievement"
+msgstr "Define ILIAS achievements"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:13
 #: app/views/admin/domain/index.php:26
@@ -26261,9 +26195,8 @@ msgid "ID"
 msgstr "ID"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:14
-#, fuzzy
 msgid "Prozentwert"
-msgstr "Percent"
+msgstr "Percentage"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:54
 #: app/views/course/gradebook/lecturers/edit_custom_definitions.php:39
@@ -26271,14 +26204,12 @@ msgid "Wollen Sie die Leistungsdefinition wirklich löschen?"
 msgstr "Do you really want to delete the achievement definition?"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:67
-#, fuzzy
 msgid "Weiteren Test als Leistung definieren"
-msgstr "Define more achievements"
+msgstr "Define another test as achievement"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definitions.php:67
-#, fuzzy
 msgid "Test als Leistung definieren"
-msgstr "Define achievement"
+msgstr "Define test as achievement"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definition.php:9
 #: app/views/course/gradebook/lecturers/edit_custom_definition.php:5
@@ -26288,9 +26219,8 @@ msgstr "Achievement name"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definition.php:13
 #: app/views/course/gradebook/lecturers/new_ilias_definition.php:19
-#, fuzzy
 msgid "Prozentwert übertragen"
-msgstr "Transfer groups"
+msgstr "Transfer percentage"
 
 #: app/views/course/gradebook/lecturers/edit_ilias_definition.php:17
 #: app/views/course/gradebook/lecturers/new_ilias_definition.php:23
@@ -26340,9 +26270,8 @@ msgid "Leistung definieren"
 msgstr "Define achievement"
 
 #: app/views/course/gradebook/lecturers/new_ilias_definition.php:9
-#, fuzzy
 msgid "Bitte wählen Sie einen Test aus"
-msgstr "Please choose a value"
+msgstr "Please select a test"
 
 #: app/views/course/archive/archive.php:4
 msgid "Veranstaltung erfolgreich archiviert!"
@@ -26965,30 +26894,25 @@ msgid "Zugelassenene Nutzerdomänen:"
 msgstr "Admissible user domains:"
 
 #: app/views/course/details/index.php:527
-#, fuzzy
 msgid "Direkt zur Veranstaltung"
-msgstr "directly to the course"
+msgstr "Directly to the course"
 
 #: app/views/course/wiki/admin.php:13
-#, fuzzy
 msgid "Startseite des Wikis"
-msgstr "Start page of tour"
+msgstr "Start page of the wiki"
 
 #: app/views/course/wiki/admin.php:26 app/views/course/wiki/admin.php:42
-#, fuzzy
 msgid "Wer darf neue Wiki-Seiten anlegen?"
-msgstr "Create new wiki page"
+msgstr "Who may create new wiki pages?"
 
 #: app/views/course/wiki/admin.php:33 app/views/course/wiki/admin.php:49
 #: app/views/course/wiki/admin.php:68 app/views/course/wiki/admin.php:84
-#, fuzzy
 msgid "Tutor/-innen und Lehrende"
-msgstr "Admins and lecturers"
+msgstr "Tutors and lecturers"
 
 #: app/views/course/wiki/admin.php:61 app/views/course/wiki/admin.php:77
-#, fuzzy
 msgid "Wer darf Wiki-Seiten umbenennen?"
-msgstr "Rename page"
+msgstr "Who may rename wiki pages?"
 
 #: app/views/course/wiki/newpages.php:28 app/views/course/wiki/import.php:83
 #: app/views/course/wiki/allpages.php:14
@@ -27006,33 +26930,30 @@ msgid "Text"
 msgstr "Text"
 
 #: app/views/course/wiki/newpages.php:44
-#, fuzzy
 msgid "Keine Seiten wurden seit Ihrem letzten Besuch verändert."
-msgstr "This posting has been created after your last visit."
+msgstr "No pages have been modified since your last visit."
 
 #: app/views/course/wiki/newpages.php:81
-#, fuzzy
 msgid "Gelöscht"
-msgstr "deleted"
+msgstr "Deleted"
 
 #: app/views/course/wiki/search.php:13
-#, fuzzy, php-format
+#, php-format
 msgid "Treffer für Suche nach <em>%s</em> in allen Versionen"
-msgstr "Search results for %s"
+msgstr "Search results for <em>%s</em> in all versions"
 
 #: app/views/course/wiki/search.php:18
 msgid "Treffer"
 msgstr "Research results"
 
 #: app/views/course/wiki/search.php:41
-#, fuzzy
 msgid "Nur in alter Version der Seite enthalten."
-msgstr "in all versions of page %s"
+msgstr "Only available in an old version of the page."
 
 #: app/views/course/wiki/search.php:82
-#, fuzzy, php-format
+#, php-format
 msgid "Treffer im Namen: %s"
-msgstr "Search results for %s"
+msgstr "Match in the name: %s"
 
 #: app/views/course/wiki/search.php:85
 #, php-format
@@ -27040,19 +26961,18 @@ msgid "Treffer in alten Namen: %s"
 msgstr "Match in old names: %s"
 
 #: app/views/course/wiki/search.php:92
-#, fuzzy
 msgid "Aktuelle Version"
 msgstr "Current version"
 
 #: app/views/course/wiki/search.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "Ihre Suche nach <em>%s</em> ergab keine Treffer."
-msgstr "No results found for your search"
+msgstr "Your search for <em>%s</em> yielded no results."
 
 #: app/views/course/wiki/history.php:10
-#, fuzzy, php-format
+#, php-format
 msgid "%s - Versionshistorie"
-msgstr "Version history"
+msgstr "%s - version history"
 
 #: app/views/course/wiki/history.php:21 templates/wiki/pageversions.php:21
 msgid "Autor/in"
@@ -27068,7 +26988,6 @@ msgid "Meinten Sie eine der folgenden Veranstaltungen?"
 msgstr "Did you mean one of the following courses?"
 
 #: app/views/course/wiki/import.php:26
-#, fuzzy
 msgid ""
 "Sie können hier eine Veranstaltung mit zu importierenden Wiki-Seiten suchen."
 msgstr "Here you can search for a course with wiki pages to import."
@@ -27080,7 +26999,7 @@ msgid "Neue Suche"
 msgstr "New search"
 
 #: app/views/course/wiki/import.php:73
-#, fuzzy, php-format
+#, php-format
 msgid "%s: Importierbare Wiki-Seiten"
 msgstr "%s: Wiki pages that can be imported"
 
@@ -27091,7 +27010,6 @@ msgid "Importieren"
 msgstr "Import"
 
 #: app/views/course/wiki/import.php:115
-#, fuzzy
 msgid "Die gewählte Veranstaltung besitzt keine Wiki-Seiten!"
 msgstr "The selected course does not have any wiki page!"
 
@@ -27104,24 +27022,21 @@ msgid "Zurück zum Wiki"
 msgstr "Back to the wiki"
 
 #: app/views/course/wiki/versiondiff.php:12
-#, fuzzy, php-format
+#, php-format
 msgid "Version %1$u, geändert von %2$s am %3$s."
-msgstr ", last changes from %s at %s"
+msgstr "Version %1$u, modified by %2$s on %3$s."
 
 #: app/views/course/wiki/edit.php:28
-#, fuzzy
 msgid "Autosave aktiv"
-msgstr "Activate task"
+msgstr "Autosave active"
 
 #: app/views/course/wiki/edit.php:32
-#, fuzzy
 msgid "Speichern Sie den aktuellen Stand."
-msgstr "Your system is up-to-date."
+msgstr "Save the current state."
 
 #: app/views/course/wiki/edit.php:32
-#, fuzzy
 msgid "Der aktuelle Stand ist schon gespeichert."
-msgstr "These entries have not been saved yet."
+msgstr "The current state has already been saved."
 
 #: app/views/course/wiki/edit.php:35 app/views/course/wiki/edit.php:53
 #: app/views/blubber/leave_private.php:12
@@ -27133,9 +27048,8 @@ msgid "Beantragen Sie, dass Sie den Text jetzt bearbeiten wollen."
 msgstr "Request that you want to edit the text now."
 
 #: app/views/course/wiki/edit.php:51
-#, fuzzy
 msgid "Bearbeiten beantragen"
-msgstr "Abort modification"
+msgstr "Request editing"
 
 #: app/views/course/wiki/page.php:26
 msgid "Dieses Wiki ist noch leer. Erstellen Sie die erste Wiki-Seite."
@@ -27146,9 +27060,8 @@ msgid "Mach die Welt ein Stückchen schlauer."
 msgstr "Make the world a bit smarter."
 
 #: app/views/course/wiki/allpages.php:10
-#, fuzzy
 msgid "Alle Seiten des Wikis"
-msgstr "All pages"
+msgstr "All pages of the wiki"
 
 #: app/views/course/wiki/allpages.php:15 templates/wiki/list.php:18
 #: templates/wiki/list.php:47
@@ -27156,9 +27069,8 @@ msgid "Änderungen"
 msgstr "Changes"
 
 #: app/views/course/wiki/allpages.php:17
-#, fuzzy
 msgid "Zuletzt bearbeitet von"
-msgstr "Last change on %s by %s"
+msgstr "Last modified by"
 
 #: app/views/course/wiki/blame.php:28
 msgid "Änderungen anzeigen"
@@ -27826,14 +27738,12 @@ msgid "Optionale Beschreibung"
 msgstr "Optional description"
 
 #: app/views/course/feedback/_new_edit_feedback_form.php:17
-#, fuzzy
 msgid "Feedback-Ergebnisse nach Antwort sichtbar"
-msgstr "Feedback results visible after answer"
+msgstr "Feedback results visible by answer"
 
 #: app/views/course/feedback/_new_edit_feedback_form.php:27
-#, fuzzy
 msgid "Feedback kann anonym abgegeben werden"
-msgstr "Feedback could not be saved"
+msgstr "Feedback can be given anonymously"
 
 #: app/views/course/feedback/_new_edit_feedback_form.php:33
 msgid "Abgegebenes Feedback kann einen Kommentar beinhalten"
@@ -27915,9 +27825,8 @@ msgid "Durchschnitt: "
 msgstr "Average:"
 
 #: app/views/course/feedback/_add_edit_entry_form.php:35
-#, fuzzy
 msgid "Kommentar anonym abgeben"
-msgstr "Show comments"
+msgstr "Submit comment anonymously"
 
 #: app/views/course/feedback/_entry.php:25
 msgid "Feedback löschen?"
@@ -28865,7 +28774,6 @@ msgid "2 Stunden"
 msgstr "2 hours"
 
 #: app/views/settings/calendar.php:36
-#, fuzzy
 msgid "Einstellungen des Kalenders"
 msgstr "Calendar settings"
 
@@ -28874,9 +28782,8 @@ msgid "Startansicht"
 msgstr "Default view"
 
 #: app/views/settings/calendar.php:53
-#, fuzzy
 msgid "Alle Wochentage in der Wochenansicht anzeigen."
-msgstr "Display all study areas"
+msgstr "Display all days of week in the week view."
 
 #: app/views/settings/calendar.php:58
 msgid "Nur Montag bis Freitag in der Wochenansicht anzeigen."
@@ -28966,9 +28873,8 @@ msgid ""
 msgstr "A colour scheme with high contrast is activated with this option."
 
 #: app/views/settings/general.php:6
-#, fuzzy
 msgid "Mein Kalender"
-msgstr "Core-Calendar"
+msgstr "My calendar"
 
 #: app/views/settings/general.php:7
 msgid "Mein Adressbuch"
@@ -29996,9 +29902,8 @@ msgid ""
 msgstr "Name of entry (will be overwritten when assigned to a Stud.IP unit)"
 
 #: app/views/admin/tree/create.php:6
-#, fuzzy
 msgid "Name des Eintrags"
-msgstr "Name of the other entry:"
+msgstr "Entry name"
 
 #: app/views/admin/tree/create.php:12 app/views/admin/tree/edit.php:15
 msgid "Infotext"
@@ -30360,9 +30265,8 @@ msgstr ""
 
 #: app/views/admin/extern/extern_config/persbrowse.php:10
 #: app/views/institute/extern/extern_config/courses.php:10
-#, fuzzy
 msgid "Konfiguration für die Ausgabe von Veranstaltungen"
-msgstr "Information about displaying courses."
+msgstr "Configuration for outputting courses"
 
 #: app/views/admin/extern/extern_config/persbrowse.php:19
 #: app/views/institute/extern/extern_config/coursedetails.php:17
@@ -30371,19 +30275,16 @@ msgstr "Information about displaying courses."
 #: app/views/institute/extern/extern_config/persondetails.php:18
 #: app/views/institute/extern/extern_config/timetable.php:17
 #: app/views/institute/extern/extern_config/courses.php:17
-#, fuzzy
 msgid "Angaben zum Inhalt"
-msgstr "Information about HTML tag &lt;tr&gt;"
+msgstr "Information about the content"
 
 #: app/views/admin/extern/extern_config/persbrowse.php:22
-#, fuzzy
 msgid "Rechtestufe in Einrichtungen"
-msgstr "Permission level in institute"
+msgstr "Permission level in institutes"
 
 #: app/views/admin/extern/extern_config/persbrowse.php:36
-#, fuzzy
 msgid "Nur Lehrende anzeigen."
-msgstr "Show lecturers"
+msgstr "Show lecturers only."
 
 #: app/views/admin/extern/extern_config/persbrowse.php:45
 #: app/views/institute/extern/extern_config/coursedetails.php:29
@@ -30392,9 +30293,8 @@ msgstr "Show lecturers"
 #: app/views/institute/extern/extern_config/persondetails.php:101
 #: app/views/institute/extern/extern_config/timetable.php:69
 #: app/views/institute/extern/extern_config/courses.php:80
-#, fuzzy
 msgid "Speichern und zurück"
-msgstr "Save and back to overview"
+msgstr "Save and go back"
 
 #: app/views/admin/install/session_error.php:2
 msgid ""
@@ -31694,9 +31594,8 @@ msgid "letzte Aktivität"
 msgstr "last activity"
 
 #: app/views/admin/courses/batch_export_members.php:8
-#, fuzzy
 msgid "Teilnehmende exportieren"
-msgstr "Import participant list"
+msgstr "Export participants"
 
 #: app/views/admin/user/_priority_list.php:10
 msgid ""
@@ -31936,9 +31835,8 @@ msgid "Diesen Studiengang löschen"
 msgstr "Delete this course of study"
 
 #: app/views/admin/user/edit.php:442
-#, fuzzy
 msgid "Sind Sie sicher, dass Sie diesen Studiengang löschen wollen?"
-msgstr "Are you sure to delete this institute?"
+msgstr "Are you sure you want to delete this course of study?"
 
 #: app/views/admin/user/edit.php:482 app/views/admin/user/edit.php:543
 msgid "Diese Einrichtung löschen"
@@ -31967,10 +31865,9 @@ msgid "Aus dieser Nutzerdomäne austragen"
 msgstr "Remove from this user domain"
 
 #: app/views/admin/user/edit.php:587
-#, fuzzy
 msgid ""
 "Sind Sie sicher, dass sie die Person aus der Nutzerdomäne austragen wollen?"
-msgstr "Do really want to discard your posting?"
+msgstr "Are you sure to remove the person from the user domain?"
 
 #: app/views/admin/user/edit.php:611
 msgid "-- Bitte Sperrebene auswählen --"
@@ -32034,36 +31931,28 @@ msgid ""
 msgstr "Downloading this file is restricted due to terms of use!"
 
 #: app/views/admin/user/batch_export_members.php:4
-#, fuzzy
 msgid "Die Daten der Teilnehmenden folgender Veranstaltungen werden exportiert"
-msgstr ""
-"The enrolment is not allowed for participants of one of the following "
-"courses:"
+msgstr "The participant data of the following courses will be exported"
 
 #: app/views/admin/user/batch_export_members.php:9
-#, fuzzy
 msgid "Anzahl Lehrende"
-msgstr "Amount of participants"
+msgstr "Amount of lecturers"
 
 #: app/views/admin/user/batch_export_members.php:10
-#, fuzzy
 msgid "Anzahl Tutor/-innen"
-msgstr "Tutors"
+msgstr "Amount of tutors"
 
 #: app/views/admin/user/batch_export_members.php:11
-#, fuzzy
 msgid "Anzahl Studierende"
-msgstr "Students"
+msgstr "Amount of students"
 
 #: app/views/admin/user/batch_export_members.php:37
-#, fuzzy
 msgid "Export als Excel-Datei"
-msgstr "Export as .csv"
+msgstr "Export as Excel file"
 
 #: app/views/admin/user/batch_export_members.php:38
-#, fuzzy
 msgid "Export als CSV-Datei"
-msgstr "Export as .csv"
+msgstr "Export as CSV file"
 
 #: app/views/admin/user/_delete.php:15
 msgid "Wollen Sie die folgenden Nutzer wirklich löschen?"
@@ -32106,14 +31995,12 @@ msgid "Dateien in Veranstaltungen und Einrichtungen"
 msgstr "Files in courses and institutes"
 
 #: app/views/admin/user/_delete.php:56
-#, fuzzy
 msgid "Lernmaterialien löschen?"
-msgstr "Learning materials"
+msgstr "Delete learning materials?"
 
 #: app/views/admin/user/_delete.php:57
-#, fuzzy
 msgid "Courseware Lernmaterialien, Seiten, Abschnitte und Blöcke"
-msgstr "Courseware learning materials"
+msgstr "Courseware learning materials, pages, sections and blocks"
 
 #: app/views/admin/user/_delete.php:63
 msgid "veranstaltungsbezogene Inhalte, bis auf Wiki und Forum Einträge"
@@ -32986,9 +32873,8 @@ msgid "Link zur Lizenz"
 msgstr "Link to the license"
 
 #: app/views/admin/licenses/edit.php:39
-#, fuzzy
 msgid "Bild hochladen (PNG, JPG, GIF, WebP)"
-msgstr "Upload image (PNG, JPG, GIF)"
+msgstr "Upload image (PNG, JPG, GIF, WebP)"
 
 #: app/views/admin/licenses/edit.php:45
 #: app/views/admin/login_style/index.php:67
@@ -33041,19 +32927,17 @@ msgid "Auswahl von Inhalten über LTI Deep Linking (Content Item)"
 msgstr "Content selection via LTI Deep Linking (Content Item)"
 
 #: app/views/admin/login_style/login_faq.php:32
-#, fuzzy
 msgid "Hinweistext löschen"
-msgstr "Delete help text"
+msgstr "Delete hint"
 
 #: app/views/admin/login_style/login_faq.php:37
-#, fuzzy, php-format
+#, php-format
 msgid "Wollen Sie den Hinweistext \"%s\" wirklich löschen?"
-msgstr "Are you sure to delete rule \"%s\"?"
+msgstr "Are you sure to delete the hint \"%s\"?"
 
 #: app/views/admin/login_style/login_faq.php:50
-#, fuzzy
 msgid "Keine Hinweistexte vorhanden"
-msgstr "No help text found."
+msgstr "No hint available"
 
 #: app/views/admin/login_style/index.php:25
 msgid "Aktiviert für"
@@ -33587,9 +33471,8 @@ msgid "Infobild löschen"
 msgstr "Delete avatar picture"
 
 #: app/views/institute/extern/info.php:16
-#, fuzzy
 msgid "Modultyp"
-msgstr "Module"
+msgstr "Module type"
 
 #: app/views/institute/extern/info.php:18
 #: app/views/institute/extern/upload.php:15
@@ -33604,24 +33487,21 @@ msgid "durch %s"
 msgstr "by %s"
 
 #: app/views/institute/extern/info.php:22
-#, fuzzy
 msgid "Bearbeitet am"
-msgstr "Edited:"
+msgstr "Modified on"
 
 #: app/views/institute/extern/info.php:26
-#, fuzzy
 msgid "Zur Hilfeseite"
-msgstr "New help text"
+msgstr "Go to help page"
 
 #: app/views/institute/extern/info.php:28
-#, fuzzy, php-format
+#, php-format
 msgid "Hilfe zur Konfiguration des Moduls \"%s\"."
-msgstr "Configuration of the module"
+msgstr "Help for the configuration of the module \"%s\"."
 
 #: app/views/institute/extern/info.php:36
-#, fuzzy
 msgid "Informationen zur Verlinkung"
-msgstr "Request information"
+msgstr "Information on the link"
 
 #: app/views/institute/extern/info.php:40
 msgid "Direkter Link"
@@ -33636,39 +33516,37 @@ msgstr ""
 "module's output."
 
 #: app/views/institute/extern/info.php:50
-#, fuzzy
 msgid "Mögliche URL-Parameter"
-msgstr "Additional LTI parameters"
+msgstr "Possible URL parameters"
 
 #: app/views/institute/extern/info.php:73
 msgid ""
 "Hinweis: Die gelisteten Datenfelder sind eventuell nicht für alle Objekte "
 "eines Typs verfügbar."
 msgstr ""
+"Note: The listed data fields are possibly not available for all objects of a "
+"type."
 
 #: app/views/institute/extern/upload.php:13
-#, fuzzy
 msgid "Konfigurationsdatei importieren"
-msgstr "Download configuration file"
+msgstr "Import configuration file"
 
 #: app/views/institute/extern/upload.php:17
 msgid "Ohne Angabe wird der Name aus den importierten Daten genommen."
-msgstr ""
+msgstr "Without information, the name of the imported file will be selected."
 
 #: app/views/institute/extern/upload.php:22
-#, fuzzy
 msgid "Konfigurationsdatei"
-msgstr "Configuration"
+msgstr "Configuration file"
 
 #: app/views/institute/extern/index.php:9
-#, fuzzy
 msgid "Es wurde noch keine externe Seite angelegt."
-msgstr "No vacation periods have been created yet."
+msgstr "No external page has been created yet."
 
 #: app/views/institute/extern/index.php:11
-#, fuzzy, php-format
+#, php-format
 msgid "Um eine neue externe Seite anzulegen, klicken sie %shier%s."
-msgstr "Click %shere%s to download the output file."
+msgstr "Click %shere%s to create a new external page."
 
 #: app/views/institute/extern/index.php:21
 #: lib/navigation/AdminNavigation.php:83 lib/navigation/AdminNavigation.php:109
@@ -33680,31 +33558,29 @@ msgid "Konfiguration bearbeiten"
 msgstr "Edit configuration"
 
 #: app/views/institute/extern/_table-row.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Soll die Konfiguration \"%s\" gelöscht werden?"
-msgstr "Do you really want to delete the file \"%s\"?"
+msgstr "Do you really want to delete the configuration \"%s\"?"
 
 #: app/views/institute/extern/extern_config/_basic_settings.php:40
-#, fuzzy
 msgid "Automatisches Umkodieren der Inhalte"
-msgstr "Manage automatic updates"
+msgstr "Automatic recoding of contents"
 
 #: app/views/institute/extern/extern_config/_basic_settings.php:43
-#, fuzzy
 msgid "Keine Umkodierung vornehmen"
-msgstr "No changes made."
+msgstr "Do not recode"
 
 #: app/views/institute/extern/extern_config/_basic_settings.php:44
 msgid "html-konform umkodieren"
-msgstr ""
+msgstr "recode html-compliant"
 
 #: app/views/institute/extern/extern_config/_basic_settings.php:45
 msgid "xml-konform umkodieren"
-msgstr ""
+msgstr "recode xml-compliant"
 
 #: app/views/institute/extern/extern_config/_basic_settings.php:46
 msgid "json-konform umkodieren"
-msgstr ""
+msgstr "recode json-compliant"
 
 #: app/views/institute/extern/extern_config/_template.php:9
 #: app/views/event_log/admin.php:8 app/views/event_log/edit.php:16
@@ -33716,9 +33592,8 @@ msgid "Geben Sie hier das Template ein."
 msgstr "Enter the template."
 
 #: app/views/institute/extern/extern_config/coursedetails.php:9
-#, fuzzy
 msgid "Konfiguration für die Detailansicht einer Veranstaltung"
-msgstr "Room requests for the entire course"
+msgstr "Configuration for the detail view of a course"
 
 #: app/views/institute/extern/extern_config/coursedetails.php:20
 msgid "Bereichspfad ab Ebene"
@@ -33730,45 +33605,41 @@ msgstr "Displaying the area path will start at the level to be selected here."
 
 #: app/views/institute/extern/extern_config/persons.php:10
 msgid "Konfiguration für eine Liste der Mitarbeitenden (Personal)"
-msgstr ""
+msgstr "Configuration for a list of staff members"
 
 #: app/views/institute/extern/extern_config/persons.php:34
-#, fuzzy
 msgid "Gruppierung nach Funktionen/Gruppen"
-msgstr "Manage functions and groups"
+msgstr "Group by functions/groups"
 
 #: app/views/institute/extern/extern_config/persons.php:39
 msgid ""
 "Ausgabe der Funktionen / Gruppen (Sichtbarkeit, alternative Gruppennamen)"
-msgstr ""
+msgstr "Output of the functions / groups (visibility, alternativ group names)"
 
 #: app/views/institute/extern/extern_config/persons.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "Alternativer Gruppenname (%s)"
-msgstr "alternative group name"
+msgstr "Alternative group name (%s)"
 
 #: app/views/institute/extern/extern_config/persons.php:56
-#, fuzzy
 msgid "Keine Funktionen / Gruppen an dieser Einrichtung vorhanden."
-msgstr "No courses in this subject area available."
+msgstr "No functions / groups available on this institute."
 
 #: app/views/institute/extern/extern_config/download.php:10
 msgid "Konfiguration für eine Liste von Dateien (Download)"
-msgstr ""
+msgstr "Configuration for a list of files (download)"
 
 #: app/views/institute/extern/extern_config/download.php:33
-#, fuzzy
 msgid "Ordnerauswahl"
-msgstr "Select folder type"
+msgstr "Folder selection"
 
 #: app/views/institute/extern/extern_config/download.php:46
-#, fuzzy
 msgid "Unterordner der ausgewählten Ordner anzeigen."
-msgstr "Display evaluations in the selected area"
+msgstr "Display sub-folders of the selected folder."
 
 #: app/views/institute/extern/extern_config/persondetails.php:10
 msgid "Konfiguration für die Detailansicht von Mitarbeitenden (Personal)"
-msgstr ""
+msgstr "Configuration for the detailed staff view"
 
 #: app/views/institute/extern/extern_config/persondetails.php:24
 msgid ""
@@ -33782,9 +33653,8 @@ msgstr ""
 "institute's address always is to be exported. "
 
 #: app/views/institute/extern/extern_config/persondetails.php:32
-#, fuzzy
 msgid "Persönliche Lehrveranstaltungen"
-msgstr "Assigned courses:"
+msgstr "Personal courses"
 
 #: app/views/institute/extern/extern_config/persondetails.php:36
 msgid ""
@@ -33805,7 +33675,6 @@ msgid "aktuelles"
 msgstr "current"
 
 #: app/views/institute/extern/extern_config/persondetails.php:47
-#, fuzzy
 msgid "letztes"
 msgstr "Last"
 
@@ -33839,83 +33708,69 @@ msgstr ""
 
 #: app/views/institute/extern/extern_config/persondetails.php:66
 #: app/views/institute/extern/extern_config/courses.php:52
-#, fuzzy
 msgid "Am Semesterende"
-msgstr "at the end of semester"
+msgstr "at the end of the semester"
 
 #: app/views/institute/extern/extern_config/persondetails.php:68
 #: app/views/institute/extern/extern_config/courses.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s Woche vor Semesterende (Systemkonfiguration)"
 msgid_plural "%s Wochen vor Semesterende (Systemkonfiguration)"
-msgstr[0] "%s weeks before the end of semester"
-msgstr[1] "%s weeks before the end of semester"
+msgstr[0] "%s week before the end of the semester (system configuration)"
+msgstr[1] "%s weeks before the end of the semester (system configuration)"
 
 #: app/views/institute/extern/extern_config/persondetails.php:75
 #: app/views/institute/extern/extern_config/courses.php:61
-#, fuzzy, php-format
+#, php-format
 msgid "%s Woche vor Semesterende"
 msgid_plural "%s Wochen vor Semesterende"
-msgstr[0] "%s weeks before the end of semester"
-msgstr[1] "%s weeks before the end of semester"
+msgstr[0] "%s week before the end of the semester"
+msgstr[1] "%s weeks before the end of the semester"
 
 #: app/views/institute/extern/extern_config/persondetails.php:84
-#, fuzzy
 msgid ""
 "Wählen Sie aus, welche Veranstaltungskategorien angezeigt werden sollen."
-msgstr "Choose the course classes to be displayed."
+msgstr "Select which course categories shall be displayed."
 
 #: app/views/institute/extern/extern_config/timetable.php:10
-#, fuzzy
 msgid "Konfiguration für die Ausgabe Veranstaltungsterminen"
-msgstr "Global configuration parameters for all courses"
+msgstr "Configuration for the output of course dates"
 
 #: app/views/institute/extern/extern_config/timetable.php:33
-#, fuzzy
 msgid "Anzahl der Zeitbereiche"
-msgstr "Amount of characters per line"
+msgstr "Amount of time ranges"
 
 #: app/views/institute/extern/extern_config/timetable.php:34
-#, fuzzy
 msgid ""
 "Geben Sie an, wie viele der folgenden Zeitbereiche angezeigt werden sollen."
-msgstr ""
-"Please specify how many semesters shall be displayed (starting with the "
-"start semester selected above)."
+msgstr "Select how many of the following time ranges shall be displayed."
 
 #: app/views/institute/extern/extern_config/timetable.php:38
-#, fuzzy
 msgid "Anzuzeigender Zeitbereich"
-msgstr "Areas to be displayed:"
+msgstr "Time range to be displayed"
 
 #: app/views/institute/extern/extern_config/timetable.php:48
-#, fuzzy
 msgid "Anzuzeigende Termintypen"
-msgstr "Areas to be displayed:"
+msgstr "Date types to be displayed"
 
 #: app/views/institute/extern/extern_config/timetable.php:60
 #: app/views/institute/extern/extern_config/courses.php:71
-#, fuzzy
 msgid "Veranstaltungen beteiligter Institute anzeigen."
-msgstr "Show courses of involved institutes"
+msgstr "Show courses of involved institutes."
 
 #: app/views/institute/extern/extern_config/_study_areas_selector.php:12
-#, fuzzy
 msgid "Anzuzeigende Studienbereiche"
-msgstr "Selection of fields of study to be displayed"
+msgstr "Fields of study to be displayed"
 
 #: app/views/institute/extern/extern_config/_study_areas_selector.php:13
-#, fuzzy
 msgid "Wenn keine Studienbereiche ausgewählt werden, werden alle angezeigt."
-msgstr "Select the fields of study whose courses are to be displayed."
+msgstr "If no fields of study are selected, all of them will be displayed."
 
 #: app/views/institute/extern/extern_config/_study_areas_selector.php:27
-#, fuzzy
 msgid "Unterebenen anzeigen."
-msgstr "Show level"
+msgstr "Show sub-layers."
 
 #: app/views/institute/extern/extern_config/courses.php:29
-#, fuzzy
 msgid ""
 "Geben Sie das erste anzuzeigende Semester an. Die Angaben \"Vorheriges\", "
 "\"Aktuelles\" und \"Nächstes\" beziehen sich immer auf das laufende Semester "
@@ -34063,9 +33918,8 @@ msgid "Webseite"
 msgstr "Website"
 
 #: app/views/room_management/overview/buildings.php:18
-#, fuzzy
 msgid "Alle Gebäude auswählen"
-msgstr "Select building"
+msgstr "Select all buildings"
 
 #: app/views/room_management/overview/buildings.php:86
 #: app/views/room_management/overview/buildings.php:88
@@ -34128,9 +33982,9 @@ msgstr "Calendar week: %d. week"
 
 #: app/views/room_management/planning/booking_comments.php:117
 #: app/views/room_management/planning/booking_comments.php:124
-#, fuzzy, php-format
+#, php-format
 msgid "In der %d. Kalenderwoche sind keine Buchungen vorhanden!"
-msgstr "There are no bookings with comments in the %d. calendar week!"
+msgstr "There are no bookings in the %d. calendar week!"
 
 #: app/views/room_management/planning/copy_bookings.php:7
 msgid "Verfügbare Räume"
@@ -34176,22 +34030,21 @@ msgstr "This is a date in a date series. What do you want to do?"
 
 #: app/views/calendar/date/move.php:9
 msgid "Der Termin soll aus der Terminserie herausgelöst werden."
-msgstr ""
+msgstr "The date shall be removed from the date series."
 
 #: app/views/calendar/date/move.php:13
 msgid "Start- und Enduhrzeit der gesamten Terminserie soll geändert werden."
-msgstr ""
+msgstr "Change the start and end time of the whole date series."
 
 #: app/views/calendar/date/move.php:17
 msgid ""
 "Die gesamte Terminserie soll verschoben werden und erst am gewählten Datum "
 "beginnen."
-msgstr ""
+msgstr "The whole date series shall be moved and begin at the selected date."
 
 #: app/views/calendar/date/index.php:4
-#, fuzzy
 msgid "Neuen Teilnahmestatus wählen"
-msgstr "Own participation status"
+msgstr "Select new participation status"
 
 #: app/views/calendar/date/index.php:14
 #: lib/models/calendar/CalendarDateAssignment.class.php:704
@@ -34214,49 +34067,44 @@ msgid "Angenommen (keine Teilnahme)"
 msgstr "Accepted (no participation)"
 
 #: app/views/calendar/date/index.php:40
-#, fuzzy
 msgid "Teilnahmestatus ändern"
-msgstr "Change status"
+msgstr "Change participation status"
 
 #: app/views/calendar/date/index.php:73
-#, fuzzy
 msgid "Bearbeitung"
-msgstr "in Editing"
+msgstr "Being edited"
 
 #: app/views/calendar/date/index.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "Erstellt von %s"
-msgstr "Created by"
+msgstr "Created by %s"
 
 #: app/views/calendar/date/index.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "Erstellt und zuletzt bearbeitet von %s"
-msgstr "Last change on %s by %s"
+msgstr "Created and last modified by %s"
 
 #: app/views/calendar/date/index.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "Erstellt von %1$s, zuletzt bearbeitet von %2$s"
-msgstr "Last change on %s by %s"
+msgstr "Created by %1$s, last modified by %2$s"
 
 #: app/views/calendar/date/index.php:101
-#, fuzzy
 msgid "Teilnahmen"
-msgstr "Participants "
+msgstr "Participations"
 
 #: app/views/calendar/date/delete.php:12
 #, php-format
 msgid "Am %s soll aus dem Einzeltermin eine Ausnahme der Terminserie werden."
-msgstr ""
+msgstr "The date shall become an exception on %s in the date series."
 
 #: app/views/calendar/date/delete.php:19
-#, fuzzy
 msgid "Die gesamte Terminserie soll gelöscht werden."
-msgstr "The achievement could not be deleted."
+msgstr "The whole date series shall be deleted."
 
 #: app/views/calendar/date/delete.php:23
-#, fuzzy
 msgid "Soll der folgende Termin wirklich gelöscht werden?"
-msgstr "Do you really want to delete the following room?"
+msgstr "Do you really want to delete the following date?"
 
 #: app/views/calendar/date/_add_edit_form.php:21
 #: app/views/questionnaire/edit.php:65 templates/forms/form.php:46
@@ -34281,14 +34129,12 @@ msgid ""
 msgstr "The following fields must be corrected to be able to submit the form:"
 
 #: app/views/calendar/date/_add_edit_form.php:69
-#, fuzzy
 msgid "Ganztägiger Termin"
-msgstr "All-day timeframe"
+msgstr "All-day date"
 
 #: app/views/calendar/date/_add_edit_form.php:76
-#, fuzzy
 msgid "Öffentlich zugänglich"
-msgstr "Room plans accessible to the public"
+msgstr "Publicly accessible"
 
 #: app/views/calendar/date/_add_edit_form.php:82
 #: lib/models/calendar/CalendarDate.class.php:441
@@ -34302,6 +34148,9 @@ msgid ""
 "Personen, denen der Kalender freigegeben wurde, sichtbar. Vertrauliche "
 "Termine sind hingegen nur für einen selbst sichtbar."
 msgstr ""
+"Public dates are visible system-wide. Private dates are visible for persons "
+"with which the calendar is shared. Confidential dates on the other hand are "
+"only visible for oneself."
 
 #: app/views/calendar/date/_add_edit_form.php:106
 msgid "Eigene Kategorie"
@@ -34317,23 +34166,20 @@ msgid "Neuen Termin anlegen"
 msgstr "Create new date"
 
 #: app/views/calendar/contentbox/display.php:31
-#, fuzzy
 msgid ""
 "Es sind keine aktuellen Termine vorhanden. Zum Anlegen neuer Termine können "
 "Sie die Aktion „Neuen Termin anlegen“ benutzen."
 msgstr ""
-"No current dates available. To create new dates click on the cogwheel icon "
-"on the right."
+"No current dates available. To create new dates you can use the action "
+"\"Create new date\"."
 
 #: app/views/calendar/contentbox/_termin.php:16
-#, fuzzy
 msgid "Zum Kalender"
-msgstr "Calendar"
+msgstr "To the calendar"
 
 #: app/views/calendar/calendar/add_courses.php:4
-#, fuzzy
 msgid "Veranstaltungen für den Kalender auswählen"
-msgstr "Choose course"
+msgstr "Select courses for the calendar"
 
 #: app/views/calendar/calendar/publish.php:8
 msgid "Kalender mit anderen Teilen und in andere Kalender einbetten"
@@ -34391,14 +34237,12 @@ msgid "Adresse löschen"
 msgstr "Delete address"
 
 #: app/views/calendar/calendar/share_select.php:11
-#, fuzzy
 msgid "Mit Nutzenden teilen"
-msgstr "Remove user"
+msgstr "Share with users"
 
 #: app/views/calendar/calendar/share_select.php:16
-#, fuzzy
 msgid "Link zu diesem Kalender"
-msgstr "Link to this posting"
+msgstr "Link to this calendar"
 
 #: app/views/calendar/calendar/share.php:11 app/views/file/update.php:31
 #: lib/evaluation/evaluation_show.lib.php:304
@@ -34414,14 +34258,12 @@ msgid "Datei zum Importieren wählen"
 msgstr "Select file for import"
 
 #: app/views/calendar/calendar/export.php:16
-#, fuzzy
 msgid "Zu exportierende Termine"
-msgstr "Booking types to be exported"
+msgstr "Dates to be exported"
 
 #: app/views/calendar/calendar/export.php:20
-#, fuzzy
 msgid "Persönliche Termine"
-msgstr "Personal files"
+msgstr "Personal dates"
 
 #: app/views/calendar/calendar/export.php:24
 msgid "Veranstaltungstermine"
@@ -35018,13 +34860,13 @@ msgid "Wählen Sie ein Bild von Ihrer Festplatte aus."
 msgstr "Select an image from your hard drive."
 
 #: app/views/avatar/update.php:34
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Die Bilddatei darf max. %s groß sein, es sind nur Dateien mit den Endungen ."
 "jpg, .png, .gif und .webp erlaubt!"
 msgstr ""
-"The image file's maximum allowed size is %s, only files with the extensions ."
-"jpg, .png or .gif are allowed!"
+"The maximum allowed image file size is %s, only files with the extensions ."
+"jpg, .png, .gif and .webp are allowed!"
 
 #: app/views/avatar/update.php:45 app/views/avatar/update.php:47
 msgid "Vergrößern"
@@ -35620,13 +35462,12 @@ msgid "Mail zum Zurücksetzen des Passworts anfordern"
 msgstr "Request mail to reset passwort"
 
 #: app/views/new_password/index.php:9
-#, fuzzy
 msgid ""
 "Geben Sie die Mail-Adresse des Zugangs an, für den Sie das Passwort "
 "zurücksetzen möchten"
 msgstr ""
-"Please specify the mail address for the account for which you want to reset "
-"the password"
+"Please specify the mail address for the account for which you would like to "
+"reset the password"
 
 #: app/views/new_password/index.php:10
 msgid "Ihre Mail-Adresse"
@@ -37653,7 +37494,6 @@ msgid "Nur %1$d von %2$d Räumen konnten dem teilbaren Raum zugeordnet werden!"
 msgstr "Only %1$d of %2$d rooms could be assigned to the separable room!"
 
 #: lib/models/resources/ResourcePropertyDefinition.class.php:259
-#, fuzzy
 msgid "Zuorndung entfernen"
 msgstr "Remove assignment"
 
@@ -37825,7 +37665,7 @@ msgstr ""
 #: lib/models/resources/ResourceBooking.class.php:469
 #: lib/models/resources/ResourceBooking.class.php:777
 msgid "Es wurde ein Wiederholungsintervall ohne Begrenzung angegeben!"
-msgstr "A repetition interval without limit has been specified!"
+msgstr "A never ending repetition interval has been specified!"
 
 #: lib/models/resources/ResourceBooking.class.php:474
 #: lib/models/resources/ResourceBooking.class.php:782
@@ -38871,9 +38711,9 @@ msgid "Zuordnung Lehrveranstaltungsgruppe zu Modulteil"
 msgstr "Assignment of course group to module component"
 
 #: lib/models/StgteilVersion.php:325
-#, fuzzy, php-format
+#, php-format
 msgid "%s - %s"
-msgstr "Orig.: %s - %s"
+msgstr "%s - %s"
 
 #: lib/models/StgteilVersion.php:328 lib/models/Modul.php:374
 #, php-format
@@ -40486,12 +40326,11 @@ msgid "Die Tour muss mindestens einen Schritt enthalten."
 msgstr "The tour must have at least one step."
 
 #: lib/models/calendar/CalendarDate.class.php:154
-#, fuzzy, php-format
+#, php-format
 msgid "Terminänderung durch %s"
-msgstr "Calendar of %s"
+msgstr "Date changed by %s"
 
 #: lib/models/calendar/CalendarDate.class.php:412
-#, fuzzy
 msgid "Kalendereinträge"
 msgstr "Calendar entries"
 
@@ -40500,9 +40339,9 @@ msgid "Keine Wiederholung"
 msgstr "No repetition"
 
 #: lib/models/calendar/CalendarDate.class.php:461
-#, fuzzy, php-format
+#, php-format
 msgid "Täglich (%u Termine)"
-msgstr "additional dates"
+msgstr "Daily (%u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:466
 #, php-format
@@ -40510,9 +40349,8 @@ msgid "Täglich bis zum %1$s"
 msgstr "Daily until %1$s"
 
 #: lib/models/calendar/CalendarDate.class.php:470
-#, fuzzy
 msgid "Täglich ohne Begrenzung"
-msgstr "Daily repetition"
+msgstr "Daily never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:476
 #, php-format
@@ -40520,9 +40358,9 @@ msgid "Jeden %1$u. Tag (%2$u Termine)"
 msgstr "Every %1$u day (%2$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:482
-#, fuzzy, php-format
+#, php-format
 msgid "Jeden %1$u. Tag bis zum %2$s"
-msgstr "Every %s in %s"
+msgstr "Every %1$u. day until %2$s"
 
 #: lib/models/calendar/CalendarDate.class.php:488
 #, php-format
@@ -40530,21 +40368,21 @@ msgid "Jeden %u. Tag ohne Begrenzung"
 msgstr "Every %u day never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:507
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s und %2$s"
-msgstr "%s %s and %s"
+msgstr "%1$s and %2$s"
 
 #: lib/models/calendar/CalendarDate.class.php:519
-#, fuzzy, php-format
+#, php-format
 msgid "Einmal am folgenden %s"
 msgid_plural "Jeden %1$s (%2$u Termine)"
-msgstr[0] "Once at %s %s"
-msgstr[1] "Once at %s %s"
+msgstr[0] "Once on the following %s"
+msgstr[1] "Every %1$s (%2$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:525
-#, fuzzy, php-format
+#, php-format
 msgid "Jeden %1$s bis zum %2$s"
-msgstr "Every %s in %s"
+msgstr "Every %1$s until %2$s"
 
 #: lib/models/calendar/CalendarDate.class.php:531
 #, php-format
@@ -40557,9 +40395,9 @@ msgid "Jeden %1$u. %2$s (%3$u Termine)"
 msgstr "Every %1$u %2$s (%3$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:546
-#, fuzzy, php-format
+#, php-format
 msgid "Jeden %1$u. %2$s bis zum %3$s"
-msgstr "%1$d. week, from %2$s to %3$s"
+msgstr "Every %1$u. %2$s until %3$s"
 
 #: lib/models/calendar/CalendarDate.class.php:553
 #, php-format
@@ -40577,9 +40415,9 @@ msgid "Jeden Monat am %1$u. %2$s"
 msgstr "Every month on the %1$u. %2$s"
 
 #: lib/models/calendar/CalendarDate.class.php:580
-#, fuzzy, php-format
+#, php-format
 msgid "Jeden Monat am %u. Tag"
-msgstr "Every %s. day"
+msgstr "Every Monday on the %u. day"
 
 #: lib/models/calendar/CalendarDate.class.php:590
 #, php-format
@@ -40589,122 +40427,122 @@ msgstr "Evety %1$u. month on the last %2$s"
 #: lib/models/calendar/CalendarDate.class.php:597
 #, php-format
 msgid "Jeden %1$u. Monat am %2$u. %3$s"
-msgstr ""
+msgstr "Every %1$u. month on the %2$u. %3$s"
 
 #: lib/models/calendar/CalendarDate.class.php:606
 #, php-format
 msgid "Jeden %1$u. Monat am %2$u."
-msgstr ""
+msgstr "Every %1$u month on the %2$u."
 
 #: lib/models/calendar/CalendarDate.class.php:621
 #, php-format
 msgid "Jedes Jahr im %1$s am letzten %2$s (%3$u Termine)"
-msgstr ""
+msgstr "Every year in %1$s on the last %2$s (%3$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:628
-#, fuzzy, php-format
+#, php-format
 msgid "Jedes Jahr im %1$s am letzten %2$s bis zum %3$s"
-msgstr "on %1$s from %2$s to %3$s"
+msgstr "Every year in %1$s on the last %2$s until %3$s"
 
 #: lib/models/calendar/CalendarDate.class.php:635
 #, php-format
 msgid "Jedes Jahr im %1$s am letzten %2$s ohne Begrenzung"
-msgstr ""
+msgstr "Every year in %1$s on the last %2$s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:643
 #, php-format
 msgid "Jedes Jahr im %1$s am %2$u. %3$s (%4$u Termine"
-msgstr ""
+msgstr "Every year in %1$s on the %2$u. %3$s (%4$u dates"
 
 #: lib/models/calendar/CalendarDate.class.php:651
-#, fuzzy, php-format
+#, php-format
 msgid "Jedes Jahr im %1$s am %2$u. %3$s bis zum %4$s"
-msgstr "Date on %1$s, %2$s from %3$s to %4$s"
+msgstr "Every year in %1$s on the %2$u. %3$s until %4$s"
 
 #: lib/models/calendar/CalendarDate.class.php:659
 #, php-format
 msgid "Jedes Jahr im %1$s am %2$u. %3$s ohne Begrenzung"
-msgstr ""
+msgstr "Every year in %1$s on the %2$u. %3$s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:670
 #, php-format
 msgid "Jedes Jahr am %1$u. %2$s (%3$u Termine)"
-msgstr ""
+msgstr "Every year on the %1$u. %2$s (%3$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:677
-#, fuzzy, php-format
+#, php-format
 msgid "Jedes Jahr am %1$u. %2$s bis zum %3$s"
-msgstr "%1$d. week, from %2$s to %3$s"
+msgstr "Every year on the %1$u. %2$s until %3$s"
 
 #: lib/models/calendar/CalendarDate.class.php:684
 #, php-format
 msgid "Jedes Jahr am %1$u. %2$s ohne Begrenzung"
-msgstr ""
+msgstr "Every year on %1$u. %2$s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:698
 #, php-format
 msgid "Jedes %1$u. Jahr im %2$s am letzten %3$s (%4$u Termine)"
-msgstr ""
+msgstr "Every %1$u. year in %2$s on the last %3$s (%4$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:706
 #, php-format
 msgid "Jedes %1$u. Jahr im %2$s am letzten %3$s bis zum %4$s"
-msgstr ""
+msgstr "Every %1$u. year in %2$s on the last %3$s until %4$s"
 
 #: lib/models/calendar/CalendarDate.class.php:714
 #, php-format
 msgid "Jedes %1$u. Jahr im %2$s am letzten %3$s ohne Begrenzung"
-msgstr ""
+msgstr "Every %1$u. year in %2$s on the last %3$s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:723
 #, php-format
 msgid "Jedes %1$u. Jahr im %2$s am %3$u. %4$s (%5$u Termine)"
-msgstr ""
+msgstr "Every %1$u. year in %2$s on the %3$u. %4$s (%5$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:732
 #, php-format
 msgid "Jedes %1$u. Jahr im %2$s am %3$u. %4$s bis zum %5$s"
-msgstr ""
+msgstr "Every %1$u. year in %2$s on the %3$u. %4$s until %5$s"
 
 #: lib/models/calendar/CalendarDate.class.php:741
 #, php-format
 msgid "Jedes %1$u. Jahr im %2$s am %3$u. %4$s ohne Begrenzung"
-msgstr ""
+msgstr "Every %1$u. year in %2$s on the %3$u. %4$s never ending"
 
 #: lib/models/calendar/CalendarDate.class.php:753
 #, php-format
 msgid "Jedes %1$u. Jahr am %2$u. %3$s (%4$u Termine)"
-msgstr ""
+msgstr "Every %1$u. year on %2$u. %3$s (%4$u dates)"
 
 #: lib/models/calendar/CalendarDate.class.php:761
-#, fuzzy, php-format
+#, php-format
 msgid "Jedes %1$u. Jahr am %2$u. %3$s bis zum %4$s"
-msgstr "%1$d. week, from %2$s to %3$s"
+msgstr "Every %1$u. year on %2$u. %3$s until %4$s"
 
 #: lib/models/calendar/CalendarDate.class.php:769
 #, php-format
 msgid "Jedes %1$u. Jahr am %2$u. %3$s ohne Begrenzung"
-msgstr ""
+msgstr "Every %1$u. year on %2$u. %3$s never ending"
 
 #: lib/models/calendar/CalendarDateAssignment.class.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "%s hat einen Termin im Kalender eingetragen"
-msgstr "%s has inserted a new date into your calendar."
+msgstr "%s has inserted a new date into the calendar"
 
 #: lib/models/calendar/CalendarDateAssignment.class.php:124
-#, fuzzy, php-format
+#, php-format
 msgid "%s hat einen Termin im Kalender gelöscht"
-msgstr "%s has deleted following date in your calendar:"
+msgstr "%s has deleted a date in the calendar"
 
 #: lib/models/calendar/CalendarDateAssignment.class.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s hat Ihren Termin am %2$s angenommen"
-msgstr "%s has participated in the survey '%s'."
+msgstr "%1$s has accepted your date on %2$s"
 
 #: lib/models/calendar/CalendarDateAssignment.class.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s hat Ihren Termin am %2$s abgelehnt"
-msgstr "%1$s: Edit reservation on %2$s"
+msgstr "%1$s has declined your date on %2$s"
 
 #: lib/models/ModulteilDeskriptor.php:83 lib/models/ModulteilDeskriptor.php:91
 msgid "Modulteil-Deskriptor"
@@ -41107,82 +40945,66 @@ msgid "Keinem Modul zugeordnet"
 msgstr "Not assigned to a module"
 
 #: lib/extern/ExternPageCourses.php:150
-#, fuzzy
 msgid "Vorheriges"
-msgstr "previous"
+msgstr "Previous"
 
 #: lib/extern/ExternPageCourses.php:151
-#, fuzzy
 msgid "Aktuelles"
-msgstr "current"
+msgstr "Current"
 
 #: lib/extern/ExternPageCourses.php:152
-#, fuzzy
 msgid "Nächstes"
-msgstr "next"
+msgstr "Next"
 
 #: lib/extern/ExternPageCourses.php:165
-#, fuzzy
 msgid "Keine Gruppierung"
-msgstr "no grouping"
+msgstr "No grouping"
 
 #: lib/extern/ExternPageTimetable.php:83
-#, fuzzy
 msgid "Wochen"
-msgstr "Week"
+msgstr "Weeks"
 
 #: lib/extern/ExternPageTimetable.php:84
-#, fuzzy
 msgid "Monate"
-msgstr "Month"
+msgstr "Months"
 
 #: lib/extern/ExternPageTimetable.php:85
-#, fuzzy
 msgid "Jahre"
-msgstr "Year"
+msgstr "Years"
 
 #: lib/extern/ExternPageTimetable.php:98
-#, fuzzy
 msgid "Angegebenes Startdatum"
-msgstr "Coupled system"
+msgstr "Specified start date"
 
 #: lib/extern/ExternPageTimetable.php:99
-#, fuzzy
 msgid "Aktuelles Datum"
-msgstr "Current name"
+msgstr "Current date"
 
 #: lib/extern/ExternPageTimetable.php:100
-#, fuzzy
 msgid "Nächstes Semester"
-msgstr "whole semester"
+msgstr "Next semester"
 
 #: lib/extern/ExternPageTimetable.php:101
-#, fuzzy
 msgid "Nächste Woche"
-msgstr "Next request"
+msgstr "Next week"
 
 #: lib/extern/ExternPageTimetable.php:102
-#, fuzzy
 msgid "Nächster Monat"
-msgstr "Next date"
+msgstr "Next month"
 
 #: lib/extern/ExternPageTimetable.php:103
-#, fuzzy
 msgid "Nächstes Jahr"
-msgstr "next"
+msgstr "Next year"
 
 #: lib/extern/ExternPagePersons.php:33
-#, fuzzy
 msgid "Titel vorangestellt"
-msgstr "Second title"
+msgstr "Prefixed title"
 
 #: lib/extern/ExternPageDownload.php:37
-#, fuzzy
 msgid "Autor:in"
 msgstr "Author"
 
 #: lib/extern/ExternPagePersBrowse.php:88
-#, fuzzy
 msgid "Tutoren/Tutorinnen"
 msgstr "Tutors"
 
@@ -41191,9 +41013,8 @@ msgid "Dozenten/Dozentinnen"
 msgstr "Lecturers"
 
 #: lib/extern/ExternPagePersBrowse.php:90
-#, fuzzy
 msgid "Administratoren/Administratorinnen"
-msgstr "Admins"
+msgstr "Administrators"
 
 #: lib/classes/SemBrowse.class.php:475
 msgid "Der Suchbegriff fehlt oder ist zu kurz"
@@ -42413,9 +42234,9 @@ msgid "Sie haben keine Berechtigung, die Seite %s zu lesen!"
 msgstr "You are not allowed to read the page %s!"
 
 #: lib/classes/ActionMenu.php:444
-#, fuzzy, php-format
+#, php-format
 msgid "%s für %s"
-msgstr "Roles for %s"
+msgstr "%s for %s"
 
 #: lib/classes/SemClass.class.php:74
 msgid "Generierte Standardinstitutsklasse"
@@ -42565,9 +42386,8 @@ msgid "Sie haben keine Datei zum Hochladen ausgewählt!"
 msgstr "You have not selected any file to be uploaded!"
 
 #: lib/classes/Avatar.class.php:352
-#, fuzzy
 msgid "Es gab einen Fehler beim Hochladen der Datei!"
-msgstr "Error while saving the file!"
+msgstr "An error occurred while uploading the file!"
 
 #: lib/classes/Avatar.class.php:359
 #, php-format
@@ -42579,13 +42399,13 @@ msgstr ""
 "%s KB!"
 
 #: lib/classes/Avatar.class.php:372
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Der Dateityp der Bilddatei ist falsch (%s). Es sind nur die Dateiendungen ."
 "gif, .png, .jpeg, .jpg oder .webp erlaubt!"
 msgstr ""
-"Invalid file format of the image file (%s). The file formats .gif, png, ."
-"jpeg and .jpg are permitted, only!"
+"The file format of the image file is wrong (%s). Only the file extensions ."
+"gif, png, .jpeg, .jpg or .webp are allowed!"
 
 #: lib/classes/Avatar.class.php:406
 msgid "Es ist ein Fehler beim Bearbeiten des Bildes aufgetreten."
@@ -42600,9 +42420,8 @@ msgid "Der Typ des Bilds wird nicht unterstützt."
 msgstr "The file format of the image file is not supported."
 
 #: lib/classes/Avatar.class.php:513
-#, fuzzy
 msgid "Das Verzeichnis zum Speichern der Datei konnte nicht angelegt werden."
-msgstr "Export folder cannot be generated!"
+msgstr "The directory for saving the file could not be created."
 
 #: lib/classes/StudipSemTreeView.class.php:127
 #: lib/classes/StudipSemTreeViewAdmin.class.php:487
@@ -43525,14 +43344,12 @@ msgid "Ungültige Sortierung."
 msgstr "Invalid ordering."
 
 #: lib/classes/wiki/WikiDiffer.php:35
-#, fuzzy
 msgid "Dieser Text wurde hinzugefügt"
-msgstr "The date %s has been added!"
+msgstr "This text has been added"
 
 #: lib/classes/wiki/WikiDiffer.php:36
-#, fuzzy
 msgid "Dieser Text wurde gelöscht bzw. ersetzt."
-msgstr "The date has been deleted."
+msgstr "This text has been deleted or replaced."
 
 #: lib/classes/StudipRedisCache.class.php:22
 msgid "Redis"
@@ -43788,7 +43605,7 @@ msgid "[Stud.IP - %s] Neues Passwort setzen"
 msgstr "[Stud.IP - %s] Set new password"
 
 #: lib/classes/UserManagement.class.php:748
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Dies ist eine Bestätigungsmail des Stud.IP-Systems\n"
 "(Studienbegleitender Internetsupport von Präsenzlehre)\n"
@@ -43824,9 +43641,9 @@ msgid ""
 msgstr ""
 "This is a confirmation mail from the Stud.IP system\n"
 "(Studienbegleitender Internetsupport von Präsenzlehre)\n"
-"- %s -\n"
+"- %1$s -\n"
 "\n"
-"You have requested the reset of your password.\n"
+"You have requested the reset of your password for your username %5$s.\n"
 "\n"
 "This e-mail has been sent to you to make sure\n"
 "that the specified e-mail address really belongs to you.\n"
@@ -43834,7 +43651,7 @@ msgstr ""
 "If you have requested the reset of your password,\n"
 "please open the following link\n"
 "\n"
-"%s\n"
+"%2$s\n"
 "\n"
 "in your browser. You can set another password on the page.\n"
 "\n"
@@ -43844,9 +43661,9 @@ msgstr ""
 "If not, you must open your browser and copy the link completely in\n"
 "the line named \"location\" or \"URL\".\n"
 "\n"
-"If you did not request this e-mail or if you don't know what\n"
+"If you did not request this e-mail or if you do not know what\n"
 "this is about, then someone maliciously used your e-mail address!\n"
-"In this case, ignore this e-mail. No changes will be made on your account.\n"
+"In this case, ignore this E-Mail. No changes will be made to your account.\n"
 "\n"
 
 #: lib/classes/UserManagement.class.php:806
@@ -44156,9 +43973,8 @@ msgid "Suchkriterien für Räume"
 msgstr "Search criteria for rooms"
 
 #: lib/classes/sidebar/DateSelectWidget.php:39
-#, fuzzy
 msgid "Datum auswählen"
-msgstr "Select room"
+msgstr "Select date"
 
 #: lib/classes/sidebar/RoomClipboardWidget.class.php:24
 msgid "Gruppenbelegungsplan anzeigen"
@@ -44567,12 +44383,14 @@ msgid ""
 "Sie haben einen Fortschritt von %1$u % % im Lernmaterial \"%2$s\" erreicht "
 "und können daher Ihr [Zertifikat herunterladen]%3$s ."
 msgstr ""
+"You have reached a progress of %1$u %% in the learning material \"%2$s\" and "
+"can therefore [download your certificate]%3$s ."
 
 #: lib/cronjobs/courseware.php:259 lib/cronjobs/courseware.php:293
 #: lib/cronjobs/courseware.php:332
-#, fuzzy, php-format
+#, php-format
 msgid "Sie können das Lernmaterial [direkt hier aufrufen]%s ."
-msgstr "Now, you may close this window."
+msgstr "You can access the learning material [directly here]%s ."
 
 #: lib/cronjobs/courseware.php:297
 msgid "Courseware: Erinnerung"
@@ -44583,29 +44401,28 @@ msgid "Courseware: Fortschritt zurückgesetzt"
 msgstr "Courseware: Progress reset"
 
 #: lib/cronjobs/courseware.php:371
-#, fuzzy
 msgid "Courseware-Zertifikate"
-msgstr "Courseware: Certificate"
+msgstr "Courseware certificates"
 
 #: lib/cronjobs/courseware.php:372
 msgid ""
 "Erteilte Zertifikate für den Fortschritt in Courseware-Inhalten dieser "
 "Veranstaltung "
 msgstr ""
+"Granted certificates for the progress in Courseware contents in this course "
 
 #: lib/cronjobs/courseware.php:384
-#, fuzzy, php-format
+#, php-format
 msgid "Zertifikate für Lernmaterial %u"
-msgstr "Shared learning material"
+msgstr "Certificates for learning material %u"
 
 #: lib/cronjobs/import_ilias_testresults.php:12
-#, fuzzy
 msgid "Testergebnisse aus ILIAS importieren"
-msgstr "Export results"
+msgstr "Import test results from ILIAS"
 
 #: lib/cronjobs/import_ilias_testresults.php:17
 msgid "Importiert Testergebnisse in das Gradebook"
-msgstr ""
+msgstr "Imports test results into the gradebook"
 
 #: lib/cronjobs/session_gc.class.php:15
 msgid "Sessions bereinigen"
@@ -46728,9 +46545,8 @@ msgid "Gradebook"
 msgstr "Gradebook"
 
 #: lib/modules/GradebookModule.class.php:118
-#, fuzzy
 msgid "ILIAS-Test als Leistung definieren"
-msgstr "Define more achievements"
+msgstr "Define ILIAS test as achievement"
 
 #: lib/modules/GradebookModule.class.php:140
 msgid "Leistungen"
@@ -46764,11 +46580,11 @@ msgstr[0] "%d wiki page"
 msgstr[1] "%d wiki pages"
 
 #: lib/modules/CoreWiki.class.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "%d Änderung"
 msgid_plural "%d Änderungen"
-msgstr[0] "Changes"
-msgstr[1] "Changes"
+msgstr[0] "%d change"
+msgstr[1] "%d changes"
 
 #: lib/modules/CoreWiki.class.php:118 lib/modules/CoreWiki.class.php:187
 #: templates/wiki/edit.php:5 templates/wiki/list.php:36
@@ -46788,7 +46604,6 @@ msgid "Gemeinsames Erstellen und Bearbeiten von Texten"
 msgstr "Collaborative creating and editing of text"
 
 #: lib/modules/CoreWiki.class.php:133
-#, fuzzy
 msgid ""
 "Im Wiki können verschiedene Autor/-innen gemeinsam Texte, Konzepte und "
 "andere schriftliche Arbeiten erstellen und gestalten, dies allerdings nicht "
@@ -46799,9 +46614,13 @@ msgid ""
 "mit der Änderungen nachvollziehbar werden. Einzelne Versionen können zudem "
 "auch gelöscht werden (nur Lehrende). Ein Export als pdf-Datei ist integriert."
 msgstr ""
-"Different authors can edit and create texts. A wiki consist of an unlimited "
-"number of pages everyone can create. The version history allows to toll back "
-"changes. Pages can be downloaded as PDF."
+"In the wiki, different authors can edit and create and design texts, "
+"concepts and other written works together, but not at the same time. Texts "
+"can be edited individually and the changes be saved. The special thing in "
+"the wiki is that students and lecturers almost have the same permissions ("
+"write, read, change, delete) which cannot be restricted. The system creates "
+"a version history that makes changes visible. Single versions can also be "
+"deleted (only for lecturers). An export as PDF file is integrated."
 
 #: lib/modules/CoreWiki.class.php:146
 msgid "Wiki-Web"
@@ -46828,7 +46647,6 @@ msgid "Gemeinsames asynchrones Erstellen und Bearbeiten von Texten"
 msgstr "Collaborative work on text"
 
 #: lib/modules/CoreWiki.class.php:153
-#, fuzzy
 msgid ""
 "Im Wiki können verschiedene Autor/-innen gemeinsam Texte, Konzepte und "
 "andere schriftliche Arbeiten erstellen und gestalten. Dies allerdings nicht "
@@ -46840,11 +46658,13 @@ msgid ""
 "gelöscht werden (nur Lehrende). Eine Druckansicht und eine Exportmöglichkeit "
 "als PDF-Datei ist integriert."
 msgstr ""
-"The wiki allows multiple authors to create and edit texts. Simultaneous "
-"editing is NOT possible. Both lecturers and students have permission to edit "
-"the wiki, which requires some trust in each other. The history lists all "
-"changes. Lecturers may delete current versions. Pages can be printed or "
-"exported as PDF. "
+"In the wiki, different authors can edit and create and design texts, "
+"concepts and other written works together, but not at the same time. Texts "
+"can be edited individually and the changes be saved. The special thing in "
+"the wiki is that students and lecturers almost have the same permissions ("
+"write, read, change, delete) which requires mutual trust. The system creates "
+"a version history that makes changes visible. Single versions can also be "
+"deleted (only for lecturers). An export as PDF file is integrated."
 
 #: lib/modules/CoreWiki.class.php:162 lib/modules/Blubber.class.php:124
 #: lib/modules/CoreForum.class.php:196 lib/modules/FeedbackModule.class.php:53
@@ -46923,9 +46743,8 @@ msgid "Aktivitäten"
 msgstr "Activities"
 
 #: lib/modules/CoursewareModule.class.php:76
-#, fuzzy
 msgid "Kommentare und Anmerkungen"
-msgstr "Show comments"
+msgstr "Comments and annotations"
 
 #: lib/modules/CoursewareModule.class.php:121
 msgid "neue Seiten"
@@ -47258,9 +47077,8 @@ msgid "Meine aktuellen Termine"
 msgstr "My current dates"
 
 #: lib/modules/TerminWidget.php:23
-#, fuzzy
 msgid "Dieses Widget zeigt die eigenen aktuellen Termine an."
-msgstr "This widget shows a list of your courses."
+msgstr "This widget shows the own current dates."
 
 #: lib/modules/FeedbackModule.class.php:51
 msgid "Einholen von Feedback zu Inhaltselementen"
@@ -47857,9 +47675,8 @@ msgid "Sie haben eine Nachricht von %s erhalten!"
 msgstr "You have received a message from %s!"
 
 #: lib/exceptions/FeatureDisabledException.php:7
-#, fuzzy
 msgid "Diese Funktion ist ausgeschaltet."
-msgstr "The reference management is disabled!"
+msgstr "This function is disabled."
 
 #: lib/exceptions/MethodNotAllowedException.php:21
 msgid "Unzulässige Request-Methode beim Aufruf."
@@ -48153,9 +47970,9 @@ msgstr "The folder is not writeable."
 #: lib/filesystem/FileArchiveManager.class.php:114
 #: lib/filesystem/FileArchiveManager.class.php:152
 #: lib/filesystem/FileArchiveManager.class.php:186
-#, fuzzy, php-format
+#, php-format
 msgid "Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!"
-msgstr "The ZIP archive is too big! Maximum allowed size is %d bytes!"
+msgstr "The ZIP archive is too big! The maximum allowed size is %s!"
 
 #: lib/filesystem/FileArchiveManager.class.php:176
 #, php-format
@@ -48723,9 +48540,8 @@ msgid "Barrierefreiheitserklärung"
 msgstr "Accessibility declaration"
 
 #: lib/navigation/FooterNavigation.php:89
-#, fuzzy
 msgid "Leichte Sprache"
-msgstr "Language of instruction"
+msgstr "Simple language"
 
 #: lib/navigation/MVVNavigation.php:54
 msgid "Studiengangsinformationen"
@@ -48926,7 +48742,7 @@ msgstr "for registered users"
 
 #: lib/navigation/LoginNavigation.php:47
 msgid "um das System erstmalig zu nutzen"
-msgstr ""
+msgstr "for using the system for the first time"
 
 #: lib/navigation/LoginNavigation.php:52
 msgid "Freier Zugang"
@@ -50527,28 +50343,24 @@ msgid "Kommentar entfernen"
 msgstr "Remove comment"
 
 #: templates/_standard_loginform.php:51
-#, fuzzy
 msgid "Passwort anzeigen"
-msgstr "Confirm password"
+msgstr "Show password"
 
 #: templates/_standard_loginform.php:56
-#, fuzzy
 msgid "Passwort verstecken"
-msgstr "Forgotten password"
+msgstr "Hide password"
 
 #: templates/_standard_loginform.php:61
-#, fuzzy
 msgid "Feststelltaste ist aktiviert!"
-msgstr "Wait list activated"
+msgstr "Caps lock is activated!"
 
 #: templates/_standard_loginform.php:69
 msgid "Anmelden"
 msgstr "Login"
 
 #: templates/_standard_loginform.php:76
-#, fuzzy
 msgid "Passwort vergessen?"
-msgstr "Forgotten password"
+msgstr "Forgot your password?"
 
 #: templates/header.php:147
 #, php-format
@@ -51104,9 +50916,9 @@ msgid "Speichern und weiter bearbeiten"
 msgstr "Save and continue "
 
 #: templates/courseware/mails/certificate.php:8
-#, fuzzy, php-format
+#, php-format
 msgid "für %s"
-msgstr "Roles for %s"
+msgstr "for %s"
 
 #: templates/courseware/block_types/iframe.php:2
 #: templates/courseware/block_types/embed.php:2
@@ -51193,7 +51005,6 @@ msgid "Hohen Kontrast aktivieren"
 msgstr "Activate high contrast"
 
 #: templates/loginform.php:115
-#, fuzzy
 msgid ""
 "Aktiviert einen hohen Kontrast gemäß WCAG 2.1. Diese Einstellung wird nach "
 "dem Login übernommen.\n"
@@ -51818,84 +51629,68 @@ msgid "Der Termin am %s findet nicht statt."
 msgstr "The date on %s has been cancelled."
 
 #: templates/library/library_document_info.php:42
-#, fuzzy
 msgid "Übersetzer*in"
-msgstr "translate"
+msgstr "Translator"
 
 #: templates/library/library_document_info.php:51
-#, fuzzy
 msgid "Kurztitel"
-msgstr "Course title"
+msgstr "Short title"
 
 #: templates/library/library_document_info.php:59
-#, fuzzy
 msgid "Verlagsort"
-msgstr "Course location"
+msgstr "Place of publication"
 
 #: templates/library/library_document_info.php:63
-#, fuzzy
 msgid "Bandanzahl"
-msgstr "Number"
+msgstr "Amount of volumes"
 
 #: templates/library/library_document_info.php:67
-#, fuzzy
 msgid "Seitenanzahl"
-msgstr "Page content"
+msgstr "Page number"
 
 #: templates/library/library_document_info.php:71
-#, fuzzy
 msgid "Zusätzliche Information"
-msgstr "Personal information"
+msgstr "Additional information"
 
 #: templates/library/library_document_info.php:79
-#, fuzzy
 msgid "Datum der Veröffentlichung der Ausgabe"
-msgstr "Release date"
+msgstr "Release date of the edition"
 
 #: templates/library/library_document_info.php:85
-#, fuzzy
 msgid "ISBN"
-msgstr "ISBN: %s"
+msgstr "ISBN"
 
 #: templates/library/library_document_info.php:93
-#, fuzzy
 msgid "Verfasser*in"
-msgstr "Leave"
+msgstr "Author"
 
 #: templates/library/library_document_info.php:102
-#, fuzzy
 msgid "Auflagen"
-msgstr "Requests"
+msgstr "Editions"
 
 #: templates/library/library_document_info.php:106
-#, fuzzy
 msgid "Sammlungstitel"
-msgstr "Collection"
+msgstr "Collection title"
 
 #: templates/library/library_document_info.php:110
-#, fuzzy
 msgid "Sammlungsnummer"
-msgstr "Collection"
+msgstr "Collection number"
 
 #: templates/library/library_document_info.php:114
-#, fuzzy
 msgid "Sammlungseditor"
-msgstr "Collection"
+msgstr "Collection editor"
 
 #: templates/library/library_document_info.php:127
-#, fuzzy
 msgid "Speicherort im Archiv"
-msgstr "Search in archive"
+msgstr "Save location in the archive"
 
 #: templates/library/library_document_info.php:135
-#, fuzzy
 msgid "Zugriffsdatum"
-msgstr "Access type"
+msgstr "Access date"
 
 #: templates/library/library_document_info.php:141
-#, fuzzy
 msgid "Inhaltsangabe"
-msgstr "Contents"
+msgstr "Summary"
 
 #~ msgid "Als CSV-Dokument exportieren"
 #~ msgstr "Export as CSV document"
-- 
cgit v1.0


From b4f508cfda9d8233912059a72a51217c438f8e0e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 15 Apr 2024 12:12:44 +0000
Subject: add room request actions to action menu on times rooms for irregular
 dates, fixes #4003

Closes #4003

Merge request studip/studip!2861
---
 app/controllers/course/timesrooms.php     |  5 -----
 app/views/course/timesrooms/_cycleRow.php | 30 +++++++++++++++++++++++++++---
 app/views/course/timesrooms/editDate.php  | 20 --------------------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index c2b51cd..41a78a8 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -331,11 +331,6 @@ class Course_TimesroomsController extends AuthenticatedController
         $this->date       = CourseDate::find($termin_id) ?: CourseExDate::find($termin_id);
         $this->attributes = [];
 
-        if ($request = RoomRequest::findByDate($this->date->id)) {
-            $this->params = ['request_id' => $request->getId()];
-        } else {
-            $this->params = ['new_room_request_type' => 'date_' . $this->date->id];
-        }
         $this->only_bookable_rooms = Request::submitted('only_bookable_rooms');
 
         if (Config::get()->RESOURCES_ENABLE) {
diff --git a/app/views/course/timesrooms/_cycleRow.php b/app/views/course/timesrooms/_cycleRow.php
index 71a5085..5a5f60b 100644
--- a/app/views/course/timesrooms/_cycleRow.php
+++ b/app/views/course/timesrooms/_cycleRow.php
@@ -82,8 +82,8 @@ $is_exTermin = $termin instanceof CourseExDate;
         <?= $room_holiday ?: '' ?>
     <? endif ?>
 
-    <? $room_request_exists = RoomRequest::existsByDate($termin->id, true) ?>
-    <? if ($room_request_exists): ?>
+    <? $room_request = RoomRequest::findByDate($termin->id) ?>
+    <? if ($room_request && $room_request->closed == ResourceRequest::STATE_OPEN): ?>
         <? $msg_info = _('Für diesen Termin existiert eine Raumanfrage.') ?>
         <?= tooltipIcon($msg_info) ?>
     <? endif ?>
@@ -123,9 +123,33 @@ $is_exTermin = $termin instanceof CourseExDate;
         <? $actionMenu->addLink(
             $controller->url_for('course/timesrooms/editDate/' . $termin->id, $linkAttributes),
             _('Termin bearbeiten'),
-            Icon::create('edit', Icon::ROLE_CLICKABLE, ['title' => _('Diesen Termin bearbeiten')]),
+            Icon::create('edit'),
             ['data-dialog' => '']
         ) ?>
+        <? $actionMenu
+                ->conditionAll(Config::get()->RESOURCES_ENABLE && Config::get()->RESOURCES_ALLOW_ROOM_REQUESTS)
+                ->condition((bool) $room_request)
+                ->addLink(
+                    $controller->url_for(
+                        'course/room_requests/request_show_summary',
+                        $room_request
+                    ),
+                    _('Raumanfrage bearbeiten'),
+                    Icon::create('room-occupied'),
+                    ['data-dialog' => 'size=big']
+                )
+                ->condition(!$room_request)
+                ->addLink(
+                    $controller->url_for(
+                        'course/room_requests/new_request',
+                        ['range_str' => 'date', 'range_id' => $termin->id]
+                    ),
+                    _('Neue Raumanfrage'),
+                    Icon::create('room-request'),
+                    ['data-dialog' => 'size=big']
+                )
+                ->conditionAll(true)
+        ?>
 
         <? $actionMenu->addLink(
             $controller->url_for(
diff --git a/app/views/course/timesrooms/editDate.php b/app/views/course/timesrooms/editDate.php
index e3bde2c..c4c1495 100644
--- a/app/views/course/timesrooms/editDate.php
+++ b/app/views/course/timesrooms/editDate.php
@@ -223,25 +223,5 @@
                 ),
               ['data-dialog' => 'size=big']) ?>
         <? endif ?>
-        <? if (Request::isXhr() && !$locked && Config::get()->RESOURCES_ENABLE && Config::get()->RESOURCES_ALLOW_ROOM_REQUESTS): ?>
-            <? if (isset($request_id)) : ?>
-                <?= Studip\LinkButton::create(
-                    _('Zur Raumanfrage wechseln'),
-                    $controller->url_for(
-                        'course/room_requests/request_show_summary/' . $request_id
-                    ),
-                    ['data-dialog' => 'size=big']
-                ) ?>
-            <? else : ?>
-                <?= Studip\LinkButton::create(
-                    _('Raumanfrage erstellen'),
-                    $controller->url_for(
-                        'course/room_requests/new_request',
-                        array_merge($params, ['range_str' => 'date', 'range_id' => $date->id])
-                    ),
-                    ['data-dialog' => 'size=big']
-                ) ?>
-            <? endif ?>
-        <? endif ?>
     </footer>
 </form>
-- 
cgit v1.0


From aef2b4af131f08cdabf78b447dceb7d74948809b Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 15 Apr 2024 12:17:14 +0000
Subject: cleanup showNews.inc.php, fixes #4001

Closes #4001

Merge request studip/studip!2850
---
 lib/showNews.inc.php | 90 ++++++++++++++--------------------------------------
 1 file changed, 24 insertions(+), 66 deletions(-)

diff --git a/lib/showNews.inc.php b/lib/showNews.inc.php
index c000713..882e9d4 100644
--- a/lib/showNews.inc.php
+++ b/lib/showNews.inc.php
@@ -25,51 +25,6 @@
 
 require_once 'lib/object.inc.php';
 
-/**
- * generates proper text for confirmation question and deletes comments
- *
- *
- * @param mixed $comment_id (single or array)
- * @return string text for confirmation question or empty string after deletion
- */
-function delete_comments($delete_comments_array = '')
-{
-    $text = '';
-    $confirmed = false;
-    if (! is_array($delete_comments_array))
-        $delete_comments_array = [$delete_comments_array];
-    if (Request::submitted('yes') AND Request::isPost()) {
-        CSRFProtection::verifySecurityToken();
-        $confirmed = true;
-    }
-    if ($confirmed) {
-        foreach ($delete_comments_array as $comment_id) {
-            $delete_comment = new StudipComment($comment_id);
-            if (!$delete_comment->isNew()) {
-                if (!is_object($news[$delete_comment->getValue("object_id")]))
-                    $news[$delete_comment->getValue("object_id")] = new StudipNews($delete_comment->getValue("object_id"));
-                // user has to have delete permission for news
-                if ($news[$delete_comment->getValue("object_id")]->havePermission('delete')) {
-                    $delete_comment->delete();
-                    $delete_counter++;
-                }
-                else
-                    PageLayout::postMessage(MessageBox::error(_('Keine Berechtigung zum Löschen des Kommentars.')));
-            }
-        }
-        if ($delete_counter > 1)
-            PageLayout::postMessage(MessageBox::success(sprintf(_('%s Kommentare wurden gelöscht.'), $delete_counter)));
-        elseif ($delete_counter == 1)
-            PageLayout::postMessage(MessageBox::success(_('Kommentar wurde gelöscht.')));
-    } else {
-        if (count($delete_comments_array) > 1) {
-            $text = sprintf(_('Wollen Sie die %s Komentare jetzt löschen?'), count($delete_comments_array));
-        } elseif (count($delete_comments_array) == 1) {
-            $text = _('Wollen Sie den Kommentar jetzt löschen?');
-        }
-    }
-    return $text;
-}
 
 /**
  * generates proper text for confirmation question and deletes news
@@ -89,6 +44,7 @@ function delete_news($delete_news_array)
         CSRFProtection::verifySecurityToken();
         $confirmed = true;
     }
+    $delete_news_titles = [];
     foreach ($delete_news_array as $news_id) {
         if ($news_id) {
             $delete_news = new StudipNews($news_id);
@@ -103,10 +59,10 @@ function delete_news($delete_news_array)
                     if ($delete_news->getValue('user_id') != $GLOBALS['auth']->auth['uid']) {
                         setTempLanguage($delete_news->getValue('user_id'));
                         $msg = sprintf(
-                            _('Ihre Ankündigung "%s" wurde von der Administration gelöscht!.'),
-                            (string) $delete_news->topic,
-                            get_fullname() . ' (' . get_username() . ')'
-                        ). "\n";
+                                _('Ihre Ankündigung "%s" wurde von der Administration gelöscht!.'),
+                                (string) $delete_news->topic,
+                                get_fullname() . ' (' . get_username() . ')'
+                            ). "\n";
                         $msg_object->insert_message(
                             $msg,
                             get_username($delete_news->user_id),
@@ -132,15 +88,15 @@ function delete_news($delete_news_array)
     if (! $confirmed) {
         if (count($delete_news_titles) === 1) {
             $text = sprintf(
-                _('- Die Ankündigung "%s" wird unwiderruflich gelöscht.'),
-                $delete_news_titles[0]
-            ) . "\n";
+                    _('- Die Ankündigung "%s" wird unwiderruflich gelöscht.'),
+                    $delete_news_titles[0]
+                ) . "\n";
         } elseif (count($delete_news_titles) > 1) {
             $text = sprintf(
-                _('- Die %s Ankündigungen "%s" werden unwiderruflich gelöscht.'),
-                count($delete_news_titles),
-                implode('", "', $delete_news_titles)
-            ) . "\n";
+                    _('- Die %s Ankündigungen "%s" werden unwiderruflich gelöscht.'),
+                    count($delete_news_titles),
+                    implode('", "', $delete_news_titles)
+                ) . "\n";
         }
     }
     return $text;
@@ -176,7 +132,7 @@ function remove_news($remove_array)
             if ($text) {
                 $question_text[] = $text;
             }
-        // or just remove range_id(s)?
+            // or just remove range_id(s)?
         } else {
             $text = '';
             if ($confirmed && ! $remove_news->isNew() && count($ranges)) {
@@ -209,10 +165,10 @@ function remove_news($remove_array)
             } elseif (!$confirmed) {
                 if (count($ranges) === 1) {
                     $text = sprintf(_('- Die Ankündigung "%s" wird aus dem aktiven Bereich entfernt. '
-                                      .'Sie wird dadurch nicht endgültig gelöscht. Es wird nur die Zuordnung entfernt.'), $remove_news_title)."\n";
+                            .'Sie wird dadurch nicht endgültig gelöscht. Es wird nur die Zuordnung entfernt.'), $remove_news_title)."\n";
                 } elseif (count($ranges) > 1) {
                     $text = sprintf(_('- Die Ankündigung "%s" wird aus den %s gewählten Bereichen entfernt. '
-                                      .'Sie wird dadurch nicht endgültig gelöscht. Es werden nur die Zuordnungen entfernt.'), $remove_news_title, count($ranges))."\n";
+                            .'Sie wird dadurch nicht endgültig gelöscht. Es werden nur die Zuordnungen entfernt.'), $remove_news_title, count($ranges))."\n";
                 }
             }
             if ($text) {
@@ -232,19 +188,21 @@ function remove_news($remove_array)
 
 /**
  *
- * @param unknown_type $range_id
- * @param unknown_type $type
+ * @param string $range_id
+ * @param string $type
  */
 function show_rss_news($range_id, $type)
 {
     $item_url_fmt = '%1$s&contentbox_open=%2$s#%2$s';
-
+    $title = '';
+    $studip_url = '';
+    $description = '';
     switch ($type){
         case 'user':
             $studip_url = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/profile?again=yes&username=' . get_username($range_id);
             $title = get_fullname($range_id) . ' (Stud.IP - ' . Config::get()->UNI_NAME_CLEAN . ')';
             $description = _('Persönliche Neuigkeiten') . ' ' . $title;
-        break;
+            break;
         case 'sem':
             $studip_url = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/course/overview?cid=' . $range_id;
             $sem_obj = Seminar::GetInstance($range_id);
@@ -254,7 +212,7 @@ function show_rss_news($range_id, $type)
             $title = $sem_obj->getName() . ' (Stud.IP - ' . Config::get()->UNI_NAME_CLEAN . ')';
             $description = _('Neuigkeiten der Veranstaltung') . ' ' . $title;
 
-        break;
+            break;
         case 'inst':
             $studip_url = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/institute/overview?auswahl=' . $range_id;
             $object_name = get_object_name($range_id, $type);
@@ -264,12 +222,12 @@ function show_rss_news($range_id, $type)
             }
             $title = $object_name['name'] . ' (Stud.IP - ' . Config::get()->UNI_NAME_CLEAN . ')';
             $description = _('Neuigkeiten der Einrichtung') . ' ' . $title;
-        break;
+            break;
         case 'global':
             $studip_url = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/start?again=yes';
             $title = 'Stud.IP - ' . Config::get()->UNI_NAME_CLEAN;
             $description = _('Allgemeine Neuigkeiten') . ' ' . $title;
-        break;
+            break;
     }
 
     $items = StudipNews::GetNewsByRange($range_id, true, true);
-- 
cgit v1.0


From cb7224d65a7b34ba555e4e94b4d2fea9e831848f Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Mon, 15 Apr 2024 14:47:10 +0000
Subject: =?UTF-8?q?Resolve=20"Admin-Filter=20nach=20Lehrenden=20und=20Stud?=
 =?UTF-8?q?iengangteilen=20werden=20nicht=20zur=C3=BCckgesetzt"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4018

Merge request studip/studip!2867
---
 app/controllers/admin/courses.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 4882f8e..0ad7c03 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -535,6 +535,10 @@ class Admin_CoursesController extends AuthenticatedController
             if (isset($filters[$key])) {
                 $config->store($field, $filters[$key]);
             }
+            if (!$config->MY_INSTITUTES_DEFAULT) {
+                $config->delete('ADMIN_COURSES_TEACHERFILTER');
+                $config->delete('MY_COURSES_SELECTED_STGTEIL');
+            }
 
             unset($filters[$key]);
         }
-- 
cgit v1.0


From 21ccc143a81efc2d265c5d051be49e5aa6ca0bf5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 15 Apr 2024 14:52:00 +0000
Subject: fixes #4012

Closes #4012

Merge request studip/studip!2864
---
 app/controllers/course/room_requests.php              | 12 +++++++++---
 .../course/room_requests/_new_request_form_footer.php | 19 +++++++++++++++----
 .../room_requests/request_find_matching_rooms.php     |  4 ++--
 app/views/course/wiki/search.php                      |  3 ++-
 app/views/resources/room_request/decline.php          |  6 +++---
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index cdf8b1d..a6c7a44 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -350,11 +350,14 @@ class Course_RoomRequestsController extends AuthenticatedController
         $this->step = (int)$step;
 
         $this->request = new RoomRequest($this->request_id);
-        $this->request->setRangeFields($_SESSION[$this->request_id]['range'], $_SESSION[$this->request_id]['range_ids']);
+        $this->request->setRangeFields(
+            $_SESSION[$this->request_id]['range'] ?? null,
+            $_SESSION[$this->request_id]['range_ids'] ?? null
+        );
 
         // let's find all the properties belonging to the selected category
         $this->room_category_id = $_SESSION[$request_id]['room_category_id'] ?: $this->request->category_id;
-        $this->room_name = $_SESSION[$request_id]['room_name'];
+        $this->room_name = $_SESSION[$request_id]['room_name'] ?? '';
         $this->selected_room = Resource::find($_SESSION[$request_id]['room_id'] ?: $this->request->resource_id);
         $this->category = $this->room_category_id ? ResourceCategory::find($this->room_category_id) : '';
         $this->available_properties = $this->room_category_id ? $this->category->getRequestableProperties() : '';
@@ -369,7 +372,10 @@ class Course_RoomRequestsController extends AuthenticatedController
         $this->comment = $_SESSION[$request_id]['comment'] ?? null;
 
         // when searching for a room name, list found room
-        if ($_SESSION[$request_id]['room_name'] !== '') {
+        if (
+            isset($_SESSION[$request_id]['room_name'])
+            && $_SESSION[$request_id]['room_name'] !== ''
+        ) {
             $search_properties['room_category_id'] = $this->room_category_id;
             $search_properties['seats'] = [
                 1,
diff --git a/app/views/course/room_requests/_new_request_form_footer.php b/app/views/course/room_requests/_new_request_form_footer.php
index 4b84790..0bad076 100644
--- a/app/views/course/room_requests/_new_request_form_footer.php
+++ b/app/views/course/room_requests/_new_request_form_footer.php
@@ -16,13 +16,24 @@
         <? endif ?>
 
         <? if ($step === 1 || $step === 2) : ?>
-                <? if ($_SESSION[$request_id]['search_by'] !== 'category') : ?>
-                    <? \Studip\Button::create(_('Raum auswählen'), 'select_room') ?>
+            <? if (
+                !isset($_SESSION[$request_id]['search_by'])
+                || $_SESSION[$request_id]['search_by'] !== 'category'
+            ) : ?>
+                <? \Studip\Button::create(_('Raum auswählen'), 'select_room') ?>
             <? endif ?>
         <? endif ?>
 
-        <? if (($step === 1 && $_SESSION[$request_id]['room_category_id'] !== '0')
-            || $step === 2) : ?>
+        <? if (
+            (
+                $step === 1
+                && (
+                    !isset($_SESSION[$request_id]['room_category_id'])
+                    || $_SESSION[$request_id]['room_category_id'] !== '0'
+                )
+            )
+            || $step === 2
+        ) : ?>
             <?= \Studip\Button::create(_('Weiter'), 'show_summary') ?>
         <? endif ?>
 
diff --git a/app/views/course/room_requests/request_find_matching_rooms.php b/app/views/course/room_requests/request_find_matching_rooms.php
index 0a11aeb..ce24e0f 100644
--- a/app/views/course/room_requests/request_find_matching_rooms.php
+++ b/app/views/course/room_requests/request_find_matching_rooms.php
@@ -85,7 +85,7 @@
                 <label>
                     <?= _('Raumname') ?>
                     <span class="flex-row">
-                    <input type="text" name="room_name" value="<?= htmlReady($_SESSION[$request_id]['room_name']) ?>">
+                    <input type="text" name="room_name" value="<?= htmlReady($_SESSION[$request_id]['room_name'] ?? '') ?>">
                     <?= Icon::create('search')->asInput(
                         [
                             'title' => _('Räume suchen'),
@@ -107,7 +107,7 @@
                                             <input type="radio" name="selected_room_id"
                                                    data-activates="button[type='submit'][name='select_room']"
                                                    value="<?= htmlReady($room->id) ?>"
-                                                <? if ($_SESSION[$request_id]['room_id'] === $room->id) echo 'checked' ?>>
+                                                <? if (isset($_SESSION[$request_id]['room_id']) && $_SESSION[$request_id]['room_id'] === $room->id) echo 'checked' ?>>
                                             <?= htmlReady(mila($room->name, 60)) . ' (' . $room['category']->name . ')'?>
                                             <? if ($room->properties): ?>
                                                 <? $property_names = $room->getInfolabelProperties()
diff --git a/app/views/course/wiki/search.php b/app/views/course/wiki/search.php
index 27811eb..daf88fe 100644
--- a/app/views/course/wiki/search.php
+++ b/app/views/course/wiki/search.php
@@ -45,6 +45,7 @@
                 <td>
                     <?
                     $content = Studip\Markup::removeHtml($content);
+                    $ignore_next_hits = 0;
                     $offset  = 0;
                     $output  = [];
 
@@ -55,7 +56,7 @@
                             break;
                         }
                         $offset = $pos + 1;
-                        if (($ignore_next_hits--) > 0) {
+                        if ($ignore_next_hits-- > 0) {
                             // if more than one occurence is found
                             // in a fragment to be displayed,
                             // the fragment is only shown once
diff --git a/app/views/resources/room_request/decline.php b/app/views/resources/room_request/decline.php
index 188c4bb..2c02126 100644
--- a/app/views/resources/room_request/decline.php
+++ b/app/views/resources/room_request/decline.php
@@ -30,7 +30,7 @@
         <? endif ?>
     <? endif ?>
     <footer data-dialog-button>
-        <? if ($prev_request) : ?>
+        <? if (!empty($prev_request)) : ?>
             <?= \Studip\LinkButton::create(
                 _('Vorherige Anfrage'),
                 $controller->declineURL($prev_request),
@@ -45,7 +45,7 @@
         <? if ($show_form) : ?>
             <?= \Studip\Button::createAccept($delete_mode ? _('Löschen') : _('Ablehnen'), 'confirm') ?>
         <? endif ?>
-        <? if ($next_request) : ?>
+        <? if (!empty($next_request)) : ?>
             <?= \Studip\LinkButton::create(
                 _('Nächste Anfrage'),
                 $controller->declineURL($next_request),
@@ -53,4 +53,4 @@
             ) ?>
         <? endif ?>
     </footer>
-</form>
\ No newline at end of file
+</form>
-- 
cgit v1.0


From ef6f0e8f193ebcfd78d0afb9e01e514ff660a217 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 16 Apr 2024 06:15:39 +0000
Subject: Resolve "Avatare haben kein alt-Attribut im Image-Tag"

Closes #4014

Merge request studip/studip!2862
---
 resources/assets/javascripts/lib/global_search.js | 2 +-
 resources/assets/javascripts/lib/search.js        | 2 +-
 resources/vue/components/StudipAssetImg.vue       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/javascripts/lib/global_search.js b/resources/assets/javascripts/lib/global_search.js
index dbd045b..05a53aa 100644
--- a/resources/assets/javascripts/lib/global_search.js
+++ b/resources/assets/javascripts/lib/global_search.js
@@ -111,7 +111,7 @@ const GlobalSearch = {
 
                     // Optional image...
                     if (result.img !== null) {
-                        $(`<img src="${result.img}">`)
+                        $(`<img src="${result.img}" alt="">`)
                             .wrap('<div class="globalsearch-result-img">')
                             .parent() // Element is now the wrapper
                             .appendTo(link);
diff --git a/resources/assets/javascripts/lib/search.js b/resources/assets/javascripts/lib/search.js
index 5d39f43..2f97f43 100644
--- a/resources/assets/javascripts/lib/search.js
+++ b/resources/assets/javascripts/lib/search.js
@@ -200,7 +200,7 @@ const Search = {
         // Optional image...
         if (result.img !== null) {
             $('<div class="search-result-img hidden-tiny-down">')
-                .append(`<img src="${result.img}">`)
+                .append(`<img src="${result.img}" alt="">`)
                 .appendTo(link);
         }
 
diff --git a/resources/vue/components/StudipAssetImg.vue b/resources/vue/components/StudipAssetImg.vue
index 6a250a9..b60915b 100644
--- a/resources/vue/components/StudipAssetImg.vue
+++ b/resources/vue/components/StudipAssetImg.vue
@@ -1,6 +1,6 @@
 <template>
     <img :src="url"
-         :width="width">
+         :width="width" alt="">
 </template>
 
 <script>
-- 
cgit v1.0


From a5210d73f5e03cfa3b6fc4a7e869400a41c74a45 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 16 Apr 2024 06:22:06 +0000
Subject: =?UTF-8?q?Resolve=20"Barrierefreiheit:=20Auf-=20und=20Zuklappverh?=
 =?UTF-8?q?alten=20f=C3=BCr=20Screenreader=20kennzeichnen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3960

Merge request studip/studip!2854
---
 app/views/messages/write.php                               | 14 +++++++++-----
 .../javascripts/bootstrap/studip_helper_attributes.js      |  9 +++++++++
 resources/assets/javascripts/lib/messages.js               |  2 ++
 templates/helpbar/helpbar.php                              | 10 +++++++---
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/views/messages/write.php b/app/views/messages/write.php
index 4117628..3ddc423 100644
--- a/app/views/messages/write.php
+++ b/app/views/messages/write.php
@@ -67,22 +67,26 @@
         <ul class="message-options">
         <? if ($GLOBALS['ENABLE_EMAIL_ATTACHMENTS']): ?>
             <li>
-                <a href="" onClick="STUDIP.Messages.toggleSetting('attachments'); return false;">
-                    <?= Icon::create('staple', 'clickable')->asImg(40) ?>
+                <a href="" onClick="STUDIP.Messages.toggleSetting('attachments'); return false;" aria-expanded="false"
+                   role="button" title="<?= _('Anhänge verwalten') ?>" aria-controls="attachments"
+                   id="toggle-attachments">
+                    <?= Icon::create('staple')->asImg(40) ?>
                     <br>
                     <strong><?= _("Anhänge") ?></strong>
                 </a>
             </li>
         <? endif; ?>
             <li>
-                <a href="" onClick="STUDIP.Messages.toggleSetting('tags'); return false;">
-                    <?= Icon::create('star', 'clickable')->asImg(40) ?>
+                <a href="" onClick="STUDIP.Messages.toggleSetting('tags'); return false;" aria-expanded="false"
+                   role="button" title="<?= _('Schlagworte verwalten') ?>" aria-controls="tags" id="toggle-tags">
+                    <?= Icon::create('star')->asImg(40) ?>
                     <br>
                     <strong><?= _("Schlagworte") ?></strong>
                 </a>
             </li>
             <li>
-                <a href="" onClick="STUDIP.Messages.toggleSetting('settings'); return false;">
+                <a href="" onClick="STUDIP.Messages.toggleSetting('settings'); return false;" aria-expanded="false"
+                   role="button" title="<?= _('Optionen') ?>" aria-controls="settings" id="toggle-settings">
                     <?= Icon::create('admin', 'clickable')->asImg(40) ?>
                     <br>
                     <strong><?= _("Optionen") ?></strong>
diff --git a/resources/assets/javascripts/bootstrap/studip_helper_attributes.js b/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
index c106de3..aea1823 100644
--- a/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
+++ b/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
@@ -276,6 +276,15 @@ $(document).on('click keydown', '[data-toggles]', function (event) {
             $(target).toggle();
         }
 
+        const controls = $(event.currentTarget).attr('aria-controls');
+        if (controls) {
+            // Find elements which control the expanded status of the same element.
+            const elements = $('[aria-controls="' + controls + '"]');
+            const expanded = $(event.currentTarget).attr('aria-expanded') === 'true';
+            // Set the aria-expanded status accordingly.
+            elements.attr('aria-expanded', !expanded);
+        }
+
         event.preventDefault();
     }
 });
diff --git a/resources/assets/javascripts/lib/messages.js b/resources/assets/javascripts/lib/messages.js
index 7ce5328..8e27f8f 100644
--- a/resources/assets/javascripts/lib/messages.js
+++ b/resources/assets/javascripts/lib/messages.js
@@ -252,6 +252,8 @@ const Messages = {
         if (jQuery('#' + name).is(':visible')) {
             jQuery('#' + name)[0].scrollIntoView(false);
         }
+        jQuery('#toggle-' + name)
+            .attr('aria-expanded', jQuery('#toggle-' + name).attr('aria-expanded') !== 'true');
     }
 };
 
diff --git a/templates/helpbar/helpbar.php b/templates/helpbar/helpbar.php
index 6f80c4d..cc77053 100644
--- a/templates/helpbar/helpbar.php
+++ b/templates/helpbar/helpbar.php
@@ -1,13 +1,17 @@
 <div class="helpbar-container">
     <?= SkipLinks::addIndex(_('Tipps & Hilfe'), 'helpbar_icon', 920) ?>
-    <a id="helpbar_icon" href="#" class="helpbar-toggler" data-toggles=".helpbar" title="<?= _('Hilfelasche anzeigen/verstecken') ?>">
+    <a id="helpbar_icon" href="#" class="helpbar-toggler" data-toggles=".helpbar" role="button"
+       title="<?= _('Hilfelasche anzeigen/verstecken') ?>" aria-controls="helpbar-content"
+       aria-expanded="<?= $open ? 'true' : 'false' ?>">
         <?= Icon::create('question-circle')->asImg(24, ['alt' => '']) ?>
     </a>
-    <div class="helpbar" <? if (!$open) echo 'style="display: none"'; ?>>
+    <div class="helpbar" id="helpbar-content" <? if (!$open) echo 'style="display: none"'; ?>>
 
         <h2 class="helpbar-title">
             <?= _('Tipps & Hilfe') ?>
-            <a href="#" class="helpbar-toggler" data-toggles=".helpbar" aria-hidden="true" title="<?= _('Hilfelasche verstecken') ?>">
+            <a href="#" class="helpbar-toggler" data-toggles=".helpbar" aria-hidden="true" role="button"
+               title="<?= _('Hilfelasche verstecken') ?>" aria-controls="helpbar-content"
+               aria-expanded="<?= $open ? 'true' : 'false' ?>">
                 <?= Icon::create('decline-circle', Icon::ROLE_INFO_ALT)->asImg(24, ['alt' => '']) ?>
             </a>
         </h2>
-- 
cgit v1.0


From f833ea1b3a142c38bee761240b324cd33b20b28b Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 16 Apr 2024 07:36:16 +0000
Subject: Biest 4019

Merge request studip/studip!2868
---
 app/controllers/course/studygroup.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php
index b75d91e..500a0b6 100644
--- a/app/controllers/course/studygroup.php
+++ b/app/controllers/course/studygroup.php
@@ -596,6 +596,11 @@ class Course_StudygroupController extends AuthenticatedController
         global $perm;
 
         $id = Context::getId();
+
+        if (!$id) {
+            throw new CheckObjectException(_('Sie haben kein Objekt gewählt.'));
+        }
+
         $user = Request::username('user');
 
         if ($from_status === 'moderator') {
-- 
cgit v1.0


From cc9daefea2db16fc07901129fd4106dda38bca5c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 16 Apr 2024 08:20:46 +0000
Subject: fixes #4005

Closes #4005

Merge request studip/studip!2860
---
 resources/assets/javascripts/lib/header_magic.js   |  2 +-
 resources/assets/javascripts/lib/scroll.js         | 59 ++++++++++++----------
 .../components/responsive/ResponsiveNavigation.vue |  3 ++
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/resources/assets/javascripts/lib/header_magic.js b/resources/assets/javascripts/lib/header_magic.js
index f465e7e..a581107 100644
--- a/resources/assets/javascripts/lib/header_magic.js
+++ b/resources/assets/javascripts/lib/header_magic.js
@@ -17,7 +17,7 @@ const scroll = function(scrolltop) {
 const HeaderMagic = {
     enable() {
         fold = $('#navigation-level-1').height();
-        Scroll.addHandler('header', scroll);
+        Scroll.addHandler('header', scroll, true);
     },
     disable() {
         Scroll.removeHandler('header');
diff --git a/resources/assets/javascripts/lib/scroll.js b/resources/assets/javascripts/lib/scroll.js
index a4d24d5..f4ffc66 100644
--- a/resources/assets/javascripts/lib/scroll.js
+++ b/resources/assets/javascripts/lib/scroll.js
@@ -6,49 +6,54 @@
  * Updates/calls to the callback are synchronized to screen refresh by using
  * the animation frame method (which will fallback to a timer based solution).
  */
-var handlers = {};
-var animId = false;
+const handlers = {};
+let animId = false;
 
-var lastTop  = null;
-var lastLeft = null;
-
-function scrollHandler() {
-    var scrollTop = $(document).scrollTop();
-    var scrollLeft = $(document).scrollLeft();
-
-    if (scrollTop !== lastTop || scrollLeft !== lastLeft) {
-        $.each(handlers, function(index, handler) {
-            handler(scrollTop, scrollLeft);
-        });
-
-        lastTop  = scrollTop;
-        lastLeft = scrollLeft;
-    }
-
-    animId = false;
-
-    engageScrollTrigger();
-}
+let lastTop = null;
+let lastLeft = null;
 
 function refresh() {
-    var hasHandlers = !$.isEmptyObject(handlers);
+    const hasHandlers = Object.keys(handlers).length > 0;
     if (!hasHandlers && animId !== false) {
         window.cancelAnimationFrame(animId);
         animId = false;
     } else if (hasHandlers && animId === false) {
-        animId = window.requestAnimationFrame(scrollHandler);
+        animId = window.requestAnimationFrame(() => Scroll.executeHandlers());
     }
 }
 
 function engageScrollTrigger() {
-    $(window).off('scroll.studip-handler');
-    $(window).one('scroll.studip-handler', refresh);
+    window.removeEventListener('scroll', refresh);
+    window.addEventListener('scroll', refresh, {once: true});
 }
 
 const Scroll = {
-    addHandler(index, handler) {
+    executeHandlers(only_these = []) {
+        const scrollTop = document.scrollingElement.scrollTop;
+        const scrollLeft = document.scrollingElement.scrollLeft;
+
+        if (scrollTop !== lastTop || scrollLeft !== lastLeft) {
+            for (const [index, handler] of Object.entries(handlers)) {
+                if (only_these.length === 0 || only_these.includes(index)) {
+                    handler(scrollTop, scrollLeft);
+                }
+            }
+
+            lastTop  = scrollTop;
+            lastLeft = scrollLeft;
+        }
+
+        animId = false;
+
+        engageScrollTrigger();
+    },
+    addHandler(index, handler, immediate = false) {
         handlers[index] = handler;
         engageScrollTrigger();
+
+        if (immediate) {
+            Scroll.executeHandlers([index]);
+        }
     },
     removeHandler(index) {
         delete handlers[index];
diff --git a/resources/vue/components/responsive/ResponsiveNavigation.vue b/resources/vue/components/responsive/ResponsiveNavigation.vue
index 1c07e73..fffce17 100644
--- a/resources/vue/components/responsive/ResponsiveNavigation.vue
+++ b/resources/vue/components/responsive/ResponsiveNavigation.vue
@@ -594,6 +594,9 @@ export default {
                 attributeFilter: ['class']
             })
         });
+
+        // Check initial state after load
+        this.headerMagic = document.querySelector('body').classList.contains('fixed');
     },
     beforeDestroy() {
         this.classObserver.disconnect();
-- 
cgit v1.0


From 37844a9bd94fc8769de9d0839ec11debdeff9323 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 16 Apr 2024 10:54:16 +0000
Subject: refine url validation, fixes #4021

Closes #4021

Merge request studip/studip!2870
---
 .../courseware/blocks/CoursewareIframeBlock.vue       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/resources/vue/components/courseware/blocks/CoursewareIframeBlock.vue b/resources/vue/components/courseware/blocks/CoursewareIframeBlock.vue
index be56ab4..4ff7e45 100644
--- a/resources/vue/components/courseware/blocks/CoursewareIframeBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareIframeBlock.vue
@@ -234,17 +234,16 @@ export default {
             this.currentUrlIsValid = this.isValidUrl(this.currentUrl);
         },
         isValidUrl(urlString) {
-            const urlPattern = new RegExp(
-                '^(https?:\\/\\/)?' + // validate protocol
-                    '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // validate domain name
-                    '((\\d{1,3}\\.){3}\\d{1,3}))' + // validate OR ip (v4) address
-                    '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // validate port and path
-                    '(\\?[;&a-z\\d%_.~+=-]*)?' + // validate query string
-                    '(\\#[-a-z\\d_]*)?$',
-                'i'
-            ); // validate fragment locator
+            if (!urlString.startsWith('http')) {
+                urlString = `${location.protocol}//${urlString}`;
+            }
 
-            return !!urlPattern.test(urlString);
+            try {
+                const url = new URL(urlString);
+                return ['http:', 'https:'].includes(url.protocol);
+            } catch (e) {
+                return false;
+            }
         },
 
         updateUrl() {
-- 
cgit v1.0


From 1c0302b5a90e6388f7e7122e71e18601111816b0 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 16 Apr 2024 12:18:57 +0000
Subject: messages/write: removed triple text for adding recipients link, fixes
 #3961

Closes #3961

Merge request studip/studip!2857
---
 app/views/messages/write.php            | 4 +---
 lib/classes/MultiPersonSearch.class.php | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/views/messages/write.php b/app/views/messages/write.php
index 3ddc423..1f818b4 100644
--- a/app/views/messages/write.php
+++ b/app/views/messages/write.php
@@ -32,9 +32,7 @@
             ->render();
 
         $mps = MultiPersonSearch::get('add_adressees')
-           ->setLinkText(_('Mehrere Adressaten hinzufügen'))
-            //->setDefaultSelectedUser($defaultSelectedUser)
-            ->setTitle(_('Mehrere Adressaten hinzufügen'))
+            ->setLinkText(_('Mehrere Adressaten hinzufügen'))
             ->setExecuteURL($controller->url_for('messages/write'))
             ->setJSFunctionOnSubmit('STUDIP.Messages.add_adressees')
             ->setSearchObject($this->mp_search_object);
diff --git a/lib/classes/MultiPersonSearch.class.php b/lib/classes/MultiPersonSearch.class.php
index 763ccd5..af10e6b 100644
--- a/lib/classes/MultiPersonSearch.class.php
+++ b/lib/classes/MultiPersonSearch.class.php
@@ -528,9 +528,9 @@ class MultiPersonSearch {
      * sets default values of the internal variables.
      */
     private function setDefaultValues() {
-        $this->title = _('Personen hinzufügen');
+        $this->title = '';
         $this->description = _('Bitte wählen Sie aus, wen Sie hinzufügen möchten.');
-        $this->linkIconPath = Icon::create("add", "clickable", ['title' => _('Personen hinzufügen')]);
+        $this->linkIconPath = Icon::create('add');
     }
 
     /**
-- 
cgit v1.0


From 95b8d817b5337c234a50a3d4dfb202f5a40ef8af Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 17 Apr 2024 07:45:49 +0000
Subject: remove cli command 'check:globalized-config', fixes #4024

Closes #4024

Merge request studip/studip!2878
---
 cli/Commands/Checks/GlobalizedConfig.php | 148 -------------------------------
 cli/studip                               |   1 -
 2 files changed, 149 deletions(-)
 delete mode 100644 cli/Commands/Checks/GlobalizedConfig.php

diff --git a/cli/Commands/Checks/GlobalizedConfig.php b/cli/Commands/Checks/GlobalizedConfig.php
deleted file mode 100644
index 373534a..0000000
--- a/cli/Commands/Checks/GlobalizedConfig.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-namespace Studip\Cli\Commands\Checks;
-
-use Config;
-use DirectoryIterator;
-use FilesystemIterator;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use RecursiveRegexIterator;
-use RegexIterator;
-use Studip\Cli\Commands\AbstractCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-final class GlobalizedConfig extends AbstractCommand
-{
-    protected static $defaultName = 'check:globalized-config';
-
-    protected function configure(): void
-    {
-        $this->setDescription(
-            '<href=https://develop.studip.de/trac/ticket/5671>TIC 5671</> scanner - Globalized config'
-        );
-        $this->setHelp(
-            'Scans files for occurences of globalized config items (see <href=https://develop.studip.de/trac/ticket/5671>ticket 5671</> for more info)'
-        );
-
-        $this->addOption('filenames', 'f', InputOption::VALUE_NONE, 'Display filenames only (excludes -m and -o)');
-        $this->addOption('matches', 'm', InputOption::VALUE_NONE, 'Show matched config variables');
-        $this->addOption(
-            'recursive',
-            'r',
-            InputOption::VALUE_NONE | InputOption::VALUE_NEGATABLE,
-            'Do not scan recursively into subfolders'
-        );
-        $this->addOption('occurences', 'o', InputOption::VALUE_NONE, 'Show occurences in files');
-
-        $this->addArgument(
-            'folder',
-            InputArgument::IS_ARRAY | InputArgument::OPTIONAL,
-            'Folder(s) to scan (pass the special value of "plugins" to scan the plugin folder)',
-            [$GLOBALS['STUDIP_BASE_PATH']]
-        );
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $only_filenames = (bool) $input->getOption('filenames');
-        $show_occurences = !$only_filenames && ($output->isVerbose() || $input->getOption('occurences'));
-        $show_matches = !$only_filenames && ($show_occurences || $input->getOption('matches'));
-        $recursive = $input->getOption('recursive') ?? true;
-
-        $folders = $input->getArgument('folder');
-        foreach ($folders as $index => $folder) {
-            if ($folder === 'plugins') {
-                $folders[$index] = $GLOBALS['STUDIP_BASE_PATH'] . '/public/plugins_packages/';
-            }
-        }
-        $folders = array_unique($folders);
-
-        $config = Config::get()->getFields('global');
-        $quoted = array_map(function ($item) {
-            return preg_quote($item, '/');
-        }, $config);
-        $regexp = '/\$(?:GLOBALS\[["\']?)?(' . implode('|', $quoted) . ')\b/S';
-
-        foreach ($folders as $folder) {
-            if (!file_exists($folder) || !is_dir($folder)) {
-                $output->writeln(
-                    "Skipping non-folder argument <fg=red>{$folder}</>",
-                    OutputInterface::VERBOSITY_VERBOSE
-                );
-                continue;
-            }
-            $output->writeln("Scanning {$folder}", OutputInterface::VERBOSITY_VERBOSE);
-
-            foreach ($this->getFolderIterator($folder, $recursive, ['php', 'tpl', 'inc']) as $file) {
-                $filename = $file->getPathName();
-                $contents = file_get_contents($filename);
-
-                $output->writeln(
-                    sprintf(
-                        'Check <fg=magenta>%s</>',
-                        $this->relativeFilePath($filename)
-                    ),
-                    OutputInterface::VERBOSITY_VERBOSE
-                );
-
-                if ($matched = preg_match_all($regexp, $contents, $matches)) {
-                    if ($only_filenames) {
-                        $output->writeln($filename);
-                    } else {
-                        $output->writeln(
-                            sprintf(
-                                '%u matched variable(s) in <fg=green;options=bold>%s</>',
-                                $matched,
-                                $this->shorten($filename)
-                            )
-                        );
-                        if ($show_matches) {
-                            $variables = array_unique($matches[1]);
-                            foreach ($variables as $variable) {
-                                $output->writeln("> <fg=cyan>{$variable}</>");
-                                if ($show_occurences) {
-                                    $output->writeln($this->highlight($contents, $variable));
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return Command::SUCCESS;
-    }
-
-    private function highlight(string $content, string $variable): string
-    {
-        $lines = explode("\n", $content);
-
-        $result = [];
-        foreach ($lines as $index => $line) {
-            if (mb_strpos($line, $variable) === false) {
-                continue;
-            }
-            $result[$index + 1] = $line;
-        }
-
-        if (!$result) {
-            return '';
-        }
-
-        $max = max(array_map('mb_strlen', array_keys($result)));
-
-        foreach ($result as $index => $line) {
-            $result[$index] = sprintf(
-                "<fg=yellow>:%0{$max}u:</> %s",
-                $index,
-                str_replace($variable, "<fg=black;bg=yellow>{$variable}</>", $line)
-            );
-        }
-
-        return implode("\n", $result);
-    }
-}
diff --git a/cli/studip b/cli/studip
index 971ad8e..858dc3d 100755
--- a/cli/studip
+++ b/cli/studip
@@ -15,7 +15,6 @@ $commands = [
     Commands\Base\Dump::class,
     Commands\Base\Tinker::class,
     Commands\Checks\Compatibility::class,
-    Commands\Checks\GlobalizedConfig::class,
     Commands\Checks\HelpTours::class,
     Commands\Checks\HelpTours::class,
     Commands\CleanupAdmissionRules::class,
-- 
cgit v1.0


From e0d83e5e63f1ce728923b77409e68635fdeb6cf8 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 17 Apr 2024 14:21:55 +0000
Subject: =?UTF-8?q?Resolve=20"Darstellung=20der=20neuen=20HTML-Mails=20f?=
 =?UTF-8?q?=C3=BCr=20m=C3=B6glichst=20viele=20Clients"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4027

Merge request studip/studip!2879
---
 lib/classes/StudipMail.class.php       | 33 +++++++++++++++++++++++++++++++--
 lib/messaging.inc.php                  |  9 +++++++++
 templates/mail/html.php                | 20 +++++++++++++++-----
 templates/mail/notification_html.php   | 20 +++++++++++++++-----
 vendor/email_message/email_message.php |  3 +++
 5 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/lib/classes/StudipMail.class.php b/lib/classes/StudipMail.class.php
index db68a11..4974f66 100644
--- a/lib/classes/StudipMail.class.php
+++ b/lib/classes/StudipMail.class.php
@@ -36,6 +36,11 @@ class StudipMail
      */
     private $attachments = [];
     /**
+     * Array of attachments that are related to the content
+     * @var array
+     */
+    private $related_attachments = [];
+    /**
      * @var array
      */
     private $sender;
@@ -307,6 +312,17 @@ class StudipMail
         return $this;
     }
 
+    public function addRelatedAttachment(string $file_name, string $name, string $type, string $content_id): void
+    {
+        $this->related_attachments[$name] = [
+            'FileName' => $file_name,
+            'Name' => $name,
+            'Content-Type' => $type,
+            'Disposition' => 'inline',
+            'Content-ID' => $content_id
+        ];
+    }
+
     /**
      * @param $name
      * @return StudipMail provides fluent interface
@@ -411,16 +427,29 @@ class StudipMail
             $transporter->SetMultipleEncodedEmailHeader($type, $recipients);
         }
         $transporter->SetEncodedHeader('Subject', $this->getSubject());
-        if($this->getBodyHtml()){
-            $html_part = '';
+        if($this->getBodyHtml()) {
+            $html_part = 0;
             $transporter->CreateQuotedPrintableHTMLPart($this->getBodyHtml(), "", $html_part);
             $text_part = '';
             $text_message = $this->getBodyText();
+
             if(!$text_message){
                 $text_message = _('Diese Nachricht ist im HTML-Format verfasst. Sie benötigen eine E-Mail-Anwendung, die das HTML-Format anzeigen kann.');
             }
             $transporter->CreateQuotedPrintableTextPart($transporter->WrapText($text_message), "", $text_part);
+
             $part = [$text_part, $html_part];
+            if (count($this->related_attachments) > 0) {
+                $relparts = [$html_part];
+                $i = 99;
+                $multipart = 0;
+                foreach ($this->related_attachments as $one) {
+                    $transporter->CreateFilePart($one, $i);
+                    $relparts[] = $i;
+                }
+                $transporter->CreateRelatedMultipart($relparts, $multipart);
+                $part = [$text_part, $multipart];
+            }
             $transporter->AddAlternativeMultipart($part);
         } else {
             $transporter->AddQuotedPrintableTextPart($this->getBodyText());
diff --git a/lib/messaging.inc.php b/lib/messaging.inc.php
index 0fb7c3f..8df15ba 100644
--- a/lib/messaging.inc.php
+++ b/lib/messaging.inc.php
@@ -229,6 +229,15 @@ class messaging
         $mail->setSubject($title)
             ->addRecipient($to, $rec_fullname)
             ->setBodyText($mailmessage);
+
+        // Add Stud.IP logo as "pseudo" attachment - this will be embedded in the mail via Content-ID.
+        $mail->addRelatedAttachment(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/public/assets/images/logos/studip4-logo@2x.png',
+            'studip-logo.png',
+            'image/png',
+            'studiplogo'
+        );
+
         if (mb_strlen($reply_to)) {
             if ($GLOBALS['MESSAGING_FORWARD_USE_REPLYTO']) {
                 $mail->setReplyToEmail($reply_to)
diff --git a/templates/mail/html.php b/templates/mail/html.php
index cfb4e95..1987333 100644
--- a/templates/mail/html.php
+++ b/templates/mail/html.php
@@ -11,9 +11,11 @@
 <html>
     <head>
         <style>
-            body {
+            html {
                 background-color: #e7ebf1;
                 font-family: 'Lato', Helvetica, Arial, sans-serif;
+                height: 100%;
+                width: 100%;
             }
 
             a, a:link, a:visited {
@@ -42,20 +44,25 @@
 
             .studip-mail header {
                 border-bottom: 1px solid #d0d7e3;
+                display: block;
                 text-align: center;
                 padding-bottom: 15px;
             }
 
-            .studip-mail-header-logo {
+            .studip-mail header .studip-mail-header-logo {
                 margin-left: auto;
                 margin-right: auto;
+                width: 100%;
             }
 
-            .studip-mail-sndrec {
+            .studip-mail header .studip-mail-sndrec {
+                margin-left: auto;
+                margin-right: auto;
                 margin-top: 0;
+                width: 100%;
             }
 
-            .studip-mail-message {
+            .studip-mail .studip-mail-message {
                 line-height: 1.33;
                 padding: 15px 25px;
             }
@@ -63,7 +70,10 @@
             .studip-mail footer {
                 border-top: 1px solid #d0d7e3;
                 text-align: center;
+                margin-left: auto;
+                margin-right: auto;
                 padding-top: 15px;
+                width: 100%;
             }
         </style>
     </head>
@@ -71,7 +81,7 @@
         <article class="studip-mail">
             <header>
                 <div class="studip-mail-header-logo" >
-                    <img alt="" width="130" height="92" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkViZW5lXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgODQxLjg5IDU5NS4yOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgODQxLjg5IDU5NS4yOCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cGF0aCBmaWxsPSIjMTM0MDk0IiBkPSJNNzYzLjE3MiwyNDguMzU1YzAtMTcuNjM5LTE0LjMzMS0zMS45NTYtMzEuOTctMzEuOTU2Yy0xNy42NTIsMC0zMS45NDEsMTQuMzE2LTMxLjk0MSwzMS45NTYNCgkJczE0LjI4OSwzMS45NywzMS45NDEsMzEuOTdDNzQ4Ljg0MSwyODAuMzI1LDc2My4xNzIsMjY1Ljk5NCw3NjMuMTcyLDI0OC4zNTUgTTczMS4yMDIsMTYzLjI3Mg0KCQljLTQ2Ljk1OCwwLTg1LjA3NiwzOC4xMTItODUuMDksODUuMDYzaDI1LjM0YzAuMDA2LTMyLjk2NiwyNi43NjItNTkuNzQzLDU5Ljc1LTU5Ljc0M2MzMywwLDU5Ljc3NywyNi43ODMsNTkuNzc3LDU5Ljc2NA0KCQljMCwzMi45ODUtMjYuNzYyLDU5Ljc1Ni01OS43NSw1OS43NjJ2MjUuMzRjNDYuOTc4LTAuMDEzLDg1LjA2My0zOC4xMzksODUuMDYzLTg1LjEwM1M3NzguMTkzLDE2My4yNzIsNzMxLjIwMiwxNjMuMjcyIi8+DQoJPHJlY3QgeD0iNDg2LjkxNiIgeT0iMzk5LjMxOCIgZmlsbD0iI0FFMEEwRCIgd2lkdGg9IjMwLjY0MSIgaGVpZ2h0PSIzMC42NDEiLz4NCgk8Zz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTUxLjAwMiwzODUuNTY3YzEwLjk1MSw5LjUyNCwyNS4yMzYsMTYuMTksMzguMDkzLDE2LjE5YzE0LjUyMiwwLDIxLjY2NC01LjcxNCwyMS42NjQtMTQuOTk4DQoJCQljMC05Ljc2My04LjgwOC0xMi44NTgtMjIuMzgtMTguNTcxbC0xOS45OTgtOC41NzFjLTE2LjE5LTYuNDI5LTMxLjQyNy0xOS43NjEtMzEuNDI3LTQyLjM3OA0KCQkJYzAtMjUuNzEzLDIzLjA5NS00Ni4xODgsNTUuMjM1LTQ2LjE4OGMxNy44NTYsMCwzNi42NjQsNy4xNDIsNDkuOTk2LDIwLjQ3NWwtMTcuNjE3LDIyLjE0MmMtMTAuMjM5LTcuODU4LTIwLTEyLjM4MS0zMi4zOC0xMi4zODENCgkJCWMtMTEuOTA1LDAtMTkuNzYxLDUuMjM5LTE5Ljc2MSwxNC4wNDdjMCw5LjUyNCwxMC4yMzcsMTIuODU2LDIzLjgwOCwxOC4zMzJsMTkuNzYxLDguMDk1DQoJCQljMTguODA4LDcuNjE5LDMwLjcxMiwyMC4yMzcsMzAuNzEyLDQyLjE0MWMwLDI1LjcxMy0yMS40MjcsNDguMDkzLTU4LjMzLDQ4LjA5M2MtMjAuMjM2LDAtNDEuNjY0LTcuNjE5LTU3LjYxNS0yMi4zOA0KCQkJTDUxLjAwMiwzODUuNTY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMTgzLjM3OCwzMzIuMTAzaC0zMi45ODN2LTI3LjYxNWg5OC45NTJ2MjcuNjE1aC0zMi45ODV2OTcuMDM0aC0zMi45ODNWMzMyLjEwM3oiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTI2MS4xNTUsMzA0LjQ4N2gzMi45ODN2NjguMjY5YzAsMjIuMjQ2LDUuNzU0LDMwLjMsMTguNzk0LDMwLjNjMTMuMDQsMCwxOS4xNzctOC4wNTUsMTkuMTc3LTMwLjMNCgkJCXYtNjguMjY5aDMxLjgzNHY2NC40MzVjMCw0Mi41NzItMTYuMTA5LDYyLjUxNS01MS4wMSw2Mi41MTVzLTUxLjc3Ny0xOS45NDMtNTEuNzc3LTYyLjUxNVYzMDQuNDg3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMzc5LjEyMiwzMDQuNDg3aDM2LjgxOWMzNy45NywwLDY0LjA1LDE3LjY0Myw2NC4wNSw2MS43NWMwLDQ0LjEwNS0yNi4wOCw2Mi44OTktNjIuMTMyLDYyLjg5OWgtMzguNzM3DQoJCQlWMzA0LjQ4N3ogTTQxNC4wMjMsNDAyLjY3MmMxOC4wMjcsMCwzMi4yMTgtNy4yODYsMzIuMjE4LTM2LjQzNWMwLTI5LjE0OS0xNC4xOTEtMzUuMjg2LTMyLjIxOC0zNS4yODZoLTEuOTE2djcxLjcyMUg0MTQuMDIzeiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNNTMyLjU1LDI3My45MDZoMzUuMjM2djE1NS4yM0g1MzIuNTVWMjczLjkwNnoiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTU4NC40NDQsMjczLjkwNmg1Ni42NjNjMzMuODA4LDAsNjAuNzEyLDEyLjM4MSw2MC43MTIsNDkuOTk4YzAsMzYuNDI3LTI3Ljg1Niw1Mi42MTUtNjAuNzEyLDUyLjYxNQ0KCQkJaC0yMS40Mjd2NTIuNjE3aC0zNS4yMzVWMjczLjkwNnogTTYzOC45NjQsMzQ4LjY2NWMxOS4yODUsMCwyOC41NjktOC41NzEsMjguNTY5LTI0Ljc2MWMwLTE2LjE5LTkuOTk4LTIyLjE0Mi0yOC41NjktMjIuMTQyDQoJCQloLTE5LjI4NXY0Ni45MDNINjM4Ljk2NHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==">
+                    <img alt="" width="130" height="92" src="cid:studiplogo">
                 </div>
                 <p class="studip-mail-sndrec">
                     <?php if ($snd_fullname) : ?>
diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php
index d046cb2..4502ae5 100644
--- a/templates/mail/notification_html.php
+++ b/templates/mail/notification_html.php
@@ -10,9 +10,11 @@
 <html>
     <head>
         <style>
-            body {
+            html {
                 background-color: #e7ebf1;
                 font-family: 'Lato', Helvetica, Arial, sans-serif;
+                height: 100%;
+                width: 100%;
             }
 
             a, a:link, a:visited {
@@ -41,20 +43,25 @@
 
             .studip-mail header {
                 border-bottom: 1px solid #d0d7e3;
+                display: block;
                 text-align: center;
                 padding-bottom: 15px;
             }
 
-            .studip-mail-header-logo {
+            .studip-mail header .studip-mail-header-logo {
                 margin-left: auto;
                 margin-right: auto;
+                width: 100%;
             }
 
-            .studip-mail-sndrec {
+            .studip-mail header .studip-mail-sndrec {
+                margin-left: auto;
+                margin-right: auto;
                 margin-top: 0;
+                width: 100%;
             }
 
-            .studip-mail-message {
+            .studip-mail .studip-mail-message {
                 line-height: 1.33;
                 padding: 15px 25px;
             }
@@ -62,7 +69,10 @@
             .studip-mail footer {
                 border-top: 1px solid #d0d7e3;
                 text-align: center;
+                margin-left: auto;
+                margin-right: auto;
                 padding-top: 15px;
+                width: 100%;
             }
         </style>
     </head>
@@ -70,7 +80,7 @@
     <article class="studip-mail">
         <header>
             <div class="studip-mail-header-logo" >
-                <img alt="" width="130" height="92" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkViZW5lXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgODQxLjg5IDU5NS4yOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgODQxLjg5IDU5NS4yOCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8Zz4NCgk8cGF0aCBmaWxsPSIjMTM0MDk0IiBkPSJNNzYzLjE3MiwyNDguMzU1YzAtMTcuNjM5LTE0LjMzMS0zMS45NTYtMzEuOTctMzEuOTU2Yy0xNy42NTIsMC0zMS45NDEsMTQuMzE2LTMxLjk0MSwzMS45NTYNCgkJczE0LjI4OSwzMS45NywzMS45NDEsMzEuOTdDNzQ4Ljg0MSwyODAuMzI1LDc2My4xNzIsMjY1Ljk5NCw3NjMuMTcyLDI0OC4zNTUgTTczMS4yMDIsMTYzLjI3Mg0KCQljLTQ2Ljk1OCwwLTg1LjA3NiwzOC4xMTItODUuMDksODUuMDYzaDI1LjM0YzAuMDA2LTMyLjk2NiwyNi43NjItNTkuNzQzLDU5Ljc1LTU5Ljc0M2MzMywwLDU5Ljc3NywyNi43ODMsNTkuNzc3LDU5Ljc2NA0KCQljMCwzMi45ODUtMjYuNzYyLDU5Ljc1Ni01OS43NSw1OS43NjJ2MjUuMzRjNDYuOTc4LTAuMDEzLDg1LjA2My0zOC4xMzksODUuMDYzLTg1LjEwM1M3NzguMTkzLDE2My4yNzIsNzMxLjIwMiwxNjMuMjcyIi8+DQoJPHJlY3QgeD0iNDg2LjkxNiIgeT0iMzk5LjMxOCIgZmlsbD0iI0FFMEEwRCIgd2lkdGg9IjMwLjY0MSIgaGVpZ2h0PSIzMC42NDEiLz4NCgk8Zz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTUxLjAwMiwzODUuNTY3YzEwLjk1MSw5LjUyNCwyNS4yMzYsMTYuMTksMzguMDkzLDE2LjE5YzE0LjUyMiwwLDIxLjY2NC01LjcxNCwyMS42NjQtMTQuOTk4DQoJCQljMC05Ljc2My04LjgwOC0xMi44NTgtMjIuMzgtMTguNTcxbC0xOS45OTgtOC41NzFjLTE2LjE5LTYuNDI5LTMxLjQyNy0xOS43NjEtMzEuNDI3LTQyLjM3OA0KCQkJYzAtMjUuNzEzLDIzLjA5NS00Ni4xODgsNTUuMjM1LTQ2LjE4OGMxNy44NTYsMCwzNi42NjQsNy4xNDIsNDkuOTk2LDIwLjQ3NWwtMTcuNjE3LDIyLjE0MmMtMTAuMjM5LTcuODU4LTIwLTEyLjM4MS0zMi4zOC0xMi4zODENCgkJCWMtMTEuOTA1LDAtMTkuNzYxLDUuMjM5LTE5Ljc2MSwxNC4wNDdjMCw5LjUyNCwxMC4yMzcsMTIuODU2LDIzLjgwOCwxOC4zMzJsMTkuNzYxLDguMDk1DQoJCQljMTguODA4LDcuNjE5LDMwLjcxMiwyMC4yMzcsMzAuNzEyLDQyLjE0MWMwLDI1LjcxMy0yMS40MjcsNDguMDkzLTU4LjMzLDQ4LjA5M2MtMjAuMjM2LDAtNDEuNjY0LTcuNjE5LTU3LjYxNS0yMi4zOA0KCQkJTDUxLjAwMiwzODUuNTY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMTgzLjM3OCwzMzIuMTAzaC0zMi45ODN2LTI3LjYxNWg5OC45NTJ2MjcuNjE1aC0zMi45ODV2OTcuMDM0aC0zMi45ODNWMzMyLjEwM3oiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTI2MS4xNTUsMzA0LjQ4N2gzMi45ODN2NjguMjY5YzAsMjIuMjQ2LDUuNzU0LDMwLjMsMTguNzk0LDMwLjNjMTMuMDQsMCwxOS4xNzctOC4wNTUsMTkuMTc3LTMwLjMNCgkJCXYtNjguMjY5aDMxLjgzNHY2NC40MzVjMCw0Mi41NzItMTYuMTA5LDYyLjUxNS01MS4wMSw2Mi41MTVzLTUxLjc3Ny0xOS45NDMtNTEuNzc3LTYyLjUxNVYzMDQuNDg3eiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNMzc5LjEyMiwzMDQuNDg3aDM2LjgxOWMzNy45NywwLDY0LjA1LDE3LjY0Myw2NC4wNSw2MS43NWMwLDQ0LjEwNS0yNi4wOCw2Mi44OTktNjIuMTMyLDYyLjg5OWgtMzguNzM3DQoJCQlWMzA0LjQ4N3ogTTQxNC4wMjMsNDAyLjY3MmMxOC4wMjcsMCwzMi4yMTgtNy4yODYsMzIuMjE4LTM2LjQzNWMwLTI5LjE0OS0xNC4xOTEtMzUuMjg2LTMyLjIxOC0zNS4yODZoLTEuOTE2djcxLjcyMUg0MTQuMDIzeiIvPg0KCQk8cGF0aCBmaWxsPSIjM0M0NDQ4IiBkPSJNNTMyLjU1LDI3My45MDZoMzUuMjM2djE1NS4yM0g1MzIuNTVWMjczLjkwNnoiLz4NCgkJPHBhdGggZmlsbD0iIzNDNDQ0OCIgZD0iTTU4NC40NDQsMjczLjkwNmg1Ni42NjNjMzMuODA4LDAsNjAuNzEyLDEyLjM4MSw2MC43MTIsNDkuOTk4YzAsMzYuNDI3LTI3Ljg1Niw1Mi42MTUtNjAuNzEyLDUyLjYxNQ0KCQkJaC0yMS40Mjd2NTIuNjE3aC0zNS4yMzVWMjczLjkwNnogTTYzOC45NjQsMzQ4LjY2NWMxOS4yODUsMCwyOC41NjktOC41NzEsMjguNTY5LTI0Ljc2MWMwLTE2LjE5LTkuOTk4LTIyLjE0Mi0yOC41NjktMjIuMTQyDQoJCQloLTE5LjI4NXY0Ni45MDNINjM4Ljk2NHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==">
+                <img alt="" width="130" height="92" src="cid:studiplogo">
             </div>
             <p class="studip-mail-sndrec">
                 <?= sprintf(
diff --git a/vendor/email_message/email_message.php b/vendor/email_message/email_message.php
index dcef90c..a94e996 100644
--- a/vendor/email_message/email_message.php
+++ b/vendor/email_message/email_message.php
@@ -2608,6 +2608,9 @@ class email_message_class
 		if(IsSet($file['Cache'])
 		&& $file['Cache'])
 			$definition['Cache'] = 1;
+		if(IsSet($file['Content-ID'])
+		&& $file['Content-ID'])
+			$definition['Content-ID'] = $file['Content-ID'];
 		return("");
 	}
 
-- 
cgit v1.0


From e3241f20722fe19ef7f0c88c7c2036b2419b8346 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 18 Apr 2024 09:06:42 +0000
Subject: fixes #4028

Closes #4028

Merge request studip/studip!2880
---
 app/controllers/admin/courses.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 0ad7c03..b28a0fe 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -580,19 +580,19 @@ class Admin_CoursesController extends AuthenticatedController
         if (in_array('name', $activated_fields)) {
             $params = tooltip2(_('Veranstaltungsdetails anzeigen'));
             $params['style'] = 'cursor: pointer';
-            $d['name'] = '<a href="'.URLHelper::getLink('seminar_main.php', ['auswahl' => $course->id]).'">'
+            $d['name'] = '<a href="'.URLHelper::getLink('dispatch.php/course/basicdata/view', ['cid' => $course->id]).'">'
                 . htmlReady($course->name)
                 .'</a> '
                 .'<a href="'.URLHelper::getLink('dispatch.php/course/details/index/'. $course->id).'" data-dialog><button class="undecorated">'.Icon::create('info-circle', Icon::ROLE_INACTIVE)->asImg($params).'</button></a> '
                 .(!$course->visible ? _('(versteckt)') : '');
         }
         if (in_array('number', $activated_fields)) {
-            $d['number'] = '<a href="'.URLHelper::getLink('seminar_main.php', ['auswahl' => $course->id]).'">'
+            $d['number'] = '<a href="'.URLHelper::getLink('dispatch.php/course/basicdata/view', ['cid' => $course->id]).'">'
                 .$course->veranstaltungsnummer
                 .'</a>';
         }
         if (in_array('avatar', $activated_fields)) {
-            $d['avatar'] = '<a href="'.URLHelper::getLink('seminar_main.php', ['auswahl' => $course->id]).'">'
+            $d['avatar'] = '<a href="'.URLHelper::getLink('dispatch.php/course/basicdata/view', ['cid' => $course->id]).'">'
                 .CourseAvatar::getAvatar($course->getId())->getImageTag(Avatar::SMALL, ['title' => $course->name])
                 ."</a>";
         }
-- 
cgit v1.0


From 61beee8b7fa4560df9046e6fdea54a8d89f99382 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Thu, 18 Apr 2024 10:16:05 +0000
Subject: =?UTF-8?q?Resolve=20"Barrierefreiheit:=20Blubber=20f=C3=BCr=20200?=
 =?UTF-8?q?%"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4023

Merge request studip/studip!2872
---
 resources/assets/stylesheets/scss/blubber.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/assets/stylesheets/scss/blubber.scss b/resources/assets/stylesheets/scss/blubber.scss
index ccfec80..76bafe4 100644
--- a/resources/assets/stylesheets/scss/blubber.scss
+++ b/resources/assets/stylesheets/scss/blubber.scss
@@ -1,7 +1,7 @@
 .blubber_panel {
     display: flex;
     align-items: stretch;
-    height: calc(100vh - 174px);
+    height: calc(100vh - 130px);
     transition: opacity 100ms, filter 100ms;
     &.waiting {
         filter: blur(1px);
@@ -520,4 +520,7 @@ ol.tagcloud {
     .blubber_thread {
         margin-right: 0;
     }
+    .blubber_threads_widget .sidebar-widget-content {
+        max-height: calc(100vh - 230px);
+    }
 }
-- 
cgit v1.0


From ed901fa0c3cc3bd4d2b2b02c79a7f1a26bdfb908 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 18 Apr 2024 10:21:51 +0000
Subject: don't rely on set data for determining whether a sidebar is present,
 check the...

Closes #3927

Merge request studip/studip!2883
---
 resources/vue/components/responsive/ResponsiveNavigation.vue | 7 +++----
 templates/header.php                                         | 6 ------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/resources/vue/components/responsive/ResponsiveNavigation.vue b/resources/vue/components/responsive/ResponsiveNavigation.vue
index fffce17..87084a5 100644
--- a/resources/vue/components/responsive/ResponsiveNavigation.vue
+++ b/resources/vue/components/responsive/ResponsiveNavigation.vue
@@ -130,10 +130,6 @@ export default {
             type: String,
             default: ''
         },
-        hasSidebar: {
-            type: Boolean,
-            default: true
-        },
         navigation: {
             type: Object,
             required: true,
@@ -162,6 +158,7 @@ export default {
             classObserver: null,
             dialogObserver: null,
             hasSkiplinks: document.querySelector('#skiplink_list') !== null,
+            hasSidebar: false,
             hasContentbar: false,
             contentbarTitle: ''
         }
@@ -494,6 +491,8 @@ export default {
         }
     },
     mounted() {
+        this.hasSidebar = document.querySelectorAll('#sidebar .sidebar-widget:not(#sidebar-navigation)').length > 0;
+
         const cache = STUDIP.Cache.getInstance('responsive.');
         const fullscreen = cache.get('fullscreen-mode') ?? false;
         const fullscreenDocument = document.documentElement.classList.contains('fullscreen-mode');
diff --git a/templates/header.php b/templates/header.php
index 5ff5a1f..f11b23c 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -66,18 +66,12 @@ if ($navigation) {
                     'username' => $user->username,
                     'perm' => $GLOBALS['perm']->get_perm()
                 ];
-
-                $navWidget = Sidebar::get()->countWidgets(NavigationWidget::class);
-                $allWidgets = Sidebar::get()->countWidgets();
-                $hasSidebar = $allWidgets - $navWidget > 0;
                 ?>
             <? } else {
                 $me = ['username' => 'nobody'];
-                $hasSidebar = false;
             } ?>
             <responsive-navigation :me="<?= htmlReady(json_encode($me)) ?>"
                                    context="<?= htmlReady(Context::get() ? Context::get()->getFullName() : '') ?>"
-                                   :has-sidebar="<?= $hasSidebar ? 'true' : 'false' ?>"
                                    :navigation="<?= htmlReady(json_encode(ResponsiveHelper::getNavigationObject($_COOKIE['responsive-navigation-hash'] ?? null))) ?>"
             ></responsive-navigation>
         </div>
-- 
cgit v1.0


From 3057a3cb7774089c3b604f7b1a34927e217840d2 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Fri, 19 Apr 2024 07:42:14 +0000
Subject: Resolve "Mangelnde Tastatur-Bedienbarkeit im
 Veranstaltungsverzeichnis"

Closes #4031

Merge request studip/studip!2886
---
 resources/vue/components/tree/StudipTreeList.vue     | 6 +++---
 resources/vue/components/tree/StudipTreeTable.vue    | 4 ++--
 resources/vue/components/tree/TreeCourseDetails.vue  | 8 +++++---
 resources/vue/components/tree/TreeNodeCoursePath.vue | 8 +++++++-
 resources/vue/components/tree/TreeSearchResult.vue   | 5 +++--
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/resources/vue/components/tree/StudipTreeList.vue b/resources/vue/components/tree/StudipTreeList.vue
index 4ba08bc..2ab489c 100644
--- a/resources/vue/components/tree/StudipTreeList.vue
+++ b/resources/vue/components/tree/StudipTreeList.vue
@@ -91,9 +91,9 @@
             <tbody>
                 <tr v-for="(course) in courses" :key="course.id" class="studip-tree-child studip-tree-course">
                     <td>
-                        <a :href="courseUrl(course.id)"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ course }'),
-                                { course: course.attributes.title })">
+                        <a :href="courseUrl(course.id)" tabindex="0"
+                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ title }'),
+                                { title: course.attributes.title })">
                             <studip-icon shape="seminar" :size="26"></studip-icon>
                             <template v-if="course.attributes['course-number']">
                                 {{ course.attributes['course-number'] }}
diff --git a/resources/vue/components/tree/StudipTreeTable.vue b/resources/vue/components/tree/StudipTreeTable.vue
index 03a9d7b..4cfa7d5 100644
--- a/resources/vue/components/tree/StudipTreeTable.vue
+++ b/resources/vue/components/tree/StudipTreeTable.vue
@@ -112,8 +112,8 @@
                     </td>
                     <td>
                         <a :href="courseUrl(course.id)" tabindex="0"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ course }'),
-                                { course: course.attributes.title })">
+                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ title }'),
+                                { title: course.attributes.title })">
                             <template v-if="course.attributes['course-number']">
                                 {{ course.attributes['course-number'] }}
                             </template>
diff --git a/resources/vue/components/tree/TreeCourseDetails.vue b/resources/vue/components/tree/TreeCourseDetails.vue
index 609349d..6f3e056 100644
--- a/resources/vue/components/tree/TreeCourseDetails.vue
+++ b/resources/vue/components/tree/TreeCourseDetails.vue
@@ -4,14 +4,16 @@
             ({{ details.semester }})
         </div>
         <div class="admission-state" v-if="details.admissionstate">
-            <studip-icon :shape="details.admissionstate.icon" :role="details.admissionstate.role"
-                         :title="details.admissionstate.info"></studip-icon>
+            <studip-icon :shape="details.admissionstate.icon"
+                         :role="details.admissionstate.role"
+                         :alt="details.admissionstate.info"></studip-icon>
         </div>
         <div class="course-lecturers">
             <span v-for="(lecturer, index) in details.lecturers" :key="index">
                 <a :href="profileUrl(lecturer.username)"
                    :title="$gettextInterpolate($gettext('Zum Profil von %{ user }'),
-                        { user: lecturer.name })">
+                        { user: lecturer.name })"
+                   tabindex="0">
                     {{ lecturer.name }}
                 </a><template v-if="details.lecturers.length > 1 && index < details.lecturers.length - 1">, </template>
             </span>
diff --git a/resources/vue/components/tree/TreeNodeCoursePath.vue b/resources/vue/components/tree/TreeNodeCoursePath.vue
index 26ab88e..71f69ea 100644
--- a/resources/vue/components/tree/TreeNodeCoursePath.vue
+++ b/resources/vue/components/tree/TreeNodeCoursePath.vue
@@ -1,6 +1,12 @@
 <template>
     <div>
-        <studip-icon shape="info-circle" @click="togglePathInfo"></studip-icon>
+        <button type="button"
+                @click.prevent="togglePathInfo"
+                :title="showPaths
+                    ? $gettext('Pfad im Verzeichnis ausblenden')
+                    : $gettext('Pfad im Verzeichnis anzeigen')">
+            <studip-icon shape="info-circle"></studip-icon>
+        </button>
         <ul v-if="showPaths" class="studip-tree-course-path">
             <li v-for="(path, pindex) in paths" :key="pindex">
                 <button @click.prevent="openNode(path[path.length - 1].id)">
diff --git a/resources/vue/components/tree/TreeSearchResult.vue b/resources/vue/components/tree/TreeSearchResult.vue
index e5093eb..1943dd3 100644
--- a/resources/vue/components/tree/TreeSearchResult.vue
+++ b/resources/vue/components/tree/TreeSearchResult.vue
@@ -31,13 +31,14 @@
                     </td>
                     <td>
                         <a :href="courseUrl(course.id)"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{name}'), {name:  + course.attributes.title})">
+                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{title}'), {title: course.attributes.title})"
+                           tabindex="0">
                             <template v-if="course.attributes['course-number']">
                                 {{ course.attributes['course-number'] }}
                             </template>
                             {{ course.attributes.title }}
-                            <div :id="'course-dates-' + course.id" class="course-dates"></div>
                         </a>
+                        <div :id="'course-dates-' + course.id" class="course-dates"></div>
                         <tree-node-course-path :node-class="searchConfig.classname"
                                                :course-id="course.id"></tree-node-course-path>
                     </td>
-- 
cgit v1.0


From ceeff330f46e8a969a6843b980b1a957e98e30bb Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 19 Apr 2024 09:14:13 +0000
Subject: fixes #4032

Closes #4032

Merge request studip/studip!2888
---
 resources/vue/base-components.js | 87 +++++++++++++---------------------------
 1 file changed, 28 insertions(+), 59 deletions(-)

diff --git a/resources/vue/base-components.js b/resources/vue/base-components.js
index 2390bb9..65b467b 100644
--- a/resources/vue/base-components.js
+++ b/resources/vue/base-components.js
@@ -1,63 +1,32 @@
-import CalendarPermissionsTable from "./components/form_inputs/CalendarPermissionsTable.vue";
-import DayOfWeekSelect from './components/form_inputs/DayOfWeekSelect.vue';
-import DateListInput from './components/form_inputs/DateListInput.vue';
-import Multiselect from './components/Multiselect.vue';
-import MyCoursesColouredTable from './components/form_inputs/MyCoursesColouredTable.vue';
-import EditableList from "./components/EditableList.vue";
-import Quicksearch from './components/Quicksearch.vue';
-import RepetitionInput from "./components/form_inputs/RepetitionInput.vue";
-import SidebarWidget from './components/SidebarWidget.vue';
-import StudipActionMenu from './components/StudipActionMenu.vue';
-import StudipAssetImg from './components/StudipAssetImg.vue';
-import StudipDateTime from './components/StudipDateTime.vue';
-import StudipDialog from './components/StudipDialog.vue';
-import StudipFileSize from './components/StudipFileSize.vue';
-import StudipFolderSize from './components/StudipFolderSize.vue';
-import StudipIcon from './components/StudipIcon.vue';
-import RangeInput from './components/RangeInput.vue';
-import Datepicker from './components/Datepicker.vue';
-import Datetimepicker from './components/Datetimepicker.vue';
-import TextareaWithToolbar from './components/TextareaWithToolbar.vue';
-import I18nTextarea from "./components/I18nTextarea.vue";
-import StudipWysiwyg from "./components/StudipWysiwyg.vue";
-// import StudipLoadingIndicator from './StudipLoadingIndicator.vue';
-import StudipMessageBox from './components/StudipMessageBox.vue';
-import StudipProxyCheckbox from './components/StudipProxyCheckbox.vue';
-import StudipProxiedCheckbox from './components/StudipProxiedCheckbox.vue';
-import StudipTooltipIcon from './components/StudipTooltipIcon.vue';
-import StudipSelect from './components/StudipSelect.vue';
-import StudipMultiPersonSearch from './components/StudipMultiPersonSearch.vue';
-
 const BaseComponents = {
-    CalendarPermissionsTable,
-    DayOfWeekSelect,
-    DateListInput,
-    Multiselect,
-    MyCoursesColouredTable,
-    EditableList,
-    Quicksearch,
-    RangeInput,
-    RepetitionInput,
-    SidebarWidget,
-    StudipActionMenu,
-    StudipAssetImg,
-    StudipDateTime,
-    Datepicker,
-    Datetimepicker,
-    StudipDialog,
-    StudipFileSize,
-    StudipFolderSize,
-    StudipIcon,
-    I18nTextarea,
-    StudipWysiwyg,
-//    StudipLoadingIndicator,
-    StudipMessageBox,
-    StudipProxyCheckbox,
-    StudipProxiedCheckbox,
-    StudipTooltipIcon,
-    StudipSelect,
-    TextareaWithToolbar,
-    StudipMultiPersonSearch
+    CalendarPermissionsTable: () => import("./components/form_inputs/CalendarPermissionsTable.vue"),
+    DateListInput: () => import('./components/form_inputs/DateListInput.vue'),
+    Datepicker: () => import('./components/Datepicker.vue'),
+    Datetimepicker: () => import('./components/Datetimepicker.vue'),
+    DayOfWeekSelect: () => import('./components/form_inputs/DayOfWeekSelect.vue'),
+    EditableList: () => import("./components/EditableList.vue"),
+    I18nTextarea: () => import("./components/I18nTextarea.vue"),
+    Multiselect: () => import('./components/Multiselect.vue'),
+    MyCoursesColouredTable: () => import('./components/form_inputs/MyCoursesColouredTable.vue'),
+    Quicksearch: () => import('./components/Quicksearch.vue'),
+    RangeInput: () => import('./components/RangeInput.vue'),
+    RepetitionInput: () => import("./components/form_inputs/RepetitionInput.vue"),
+    SidebarWidget: () => import('./components/SidebarWidget.vue'),
+    StudipActionMenu: () => import('./components/StudipActionMenu.vue'),
+    StudipAssetImg: () => import('./components/StudipAssetImg.vue'),
+    StudipDateTime: () => import('./components/StudipDateTime.vue'),
+    StudipDialog: () => import('./components/StudipDialog.vue'),
+    StudipFileSize: () => import('./components/StudipFileSize.vue'),
+    StudipFolderSize: () => import('./components/StudipFolderSize.vue'),
+    StudipIcon: () => import('./components/StudipIcon.vue'),
+    StudipMessageBox: () => import('./components/StudipMessageBox.vue'),
+    StudipMultiPersonSearch: () => import('./components/StudipMultiPersonSearch.vue'),
+    StudipProxiedCheckbox: () => import('./components/StudipProxiedCheckbox.vue'),
+    StudipProxyCheckbox: () => import('./components/StudipProxyCheckbox.vue'),
+    StudipSelect: () => import('./components/StudipSelect.vue'),
+    StudipTooltipIcon: () => import('./components/StudipTooltipIcon.vue'),
+    StudipWysiwyg: () => import("./components/StudipWysiwyg.vue"),
+    TextareaWithToolbar: () => import('./components/TextareaWithToolbar.vue'),
 };
 
 export default BaseComponents;
-- 
cgit v1.0


From b3399e96283c7a86a3be6e5a9a8dbbb4afbce060 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 19 Apr 2024 13:13:27 +0000
Subject: fixes #4041

Closes #4041

Merge request studip/studip!2895
---
 lib/models/BlubberThread.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/BlubberThread.php b/lib/models/BlubberThread.php
index 2bc78a9..aa6016f 100644
--- a/lib/models/BlubberThread.php
+++ b/lib/models/BlubberThread.php
@@ -470,7 +470,7 @@ class BlubberThread extends SimpleORMap implements PrivacyObject
                     if (
                         isset($nav)
                         && $nav->isVisible(true)
-                        && count($module->getTabNavigation($this['context_id'])) > 0
+                        && $module->getTabNavigation($this['context_id'])
                         && $GLOBALS['perm']->have_studip_perm($tool->getVisibilityPermission(), $this['context_id'])
                     ) {
                         $icons[] = $nav;
-- 
cgit v1.0


From eb289a859cda292ef660b64c59b1975e6bbf52c8 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 19 Apr 2024 13:15:41 +0000
Subject: fixes #4034

Closes #4034

Merge request studip/studip!2889
---
 lib/bootstrap.php                | 18 ++++++++++--------
 lib/classes/StudipFileloader.php |  6 ++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index c9f5103..06ddca5 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -65,6 +65,16 @@ if (isset($_SERVER['SERVER_NAME'])) {
 $GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/';
 $GLOBALS['ASSETS_PATH'] = $ABSOLUTE_PATH_STUDIP . 'assets/';
 
+// Check if instance is configured; redirect to install script if not
+if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') {
+    require_once __DIR__ . '/classes/URLHelper.php';
+
+    URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
+    header('Location: ' . URLHelper::getURL('install.php'));
+    die;
+}
+
+// Load configuration
 require __DIR__ . '/classes/StudipFileloader.php';
 
 $added_configs = [];
@@ -80,14 +90,6 @@ if (!defined('Studip\ENV')) {
     define('Studip\ENV', DEFAULT_ENV);
 }
 
-if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') {
-    require_once __DIR__ . '/classes/URLHelper.php';
-
-    URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
-    header('Location: ' . URLHelper::getURL('install.php'));
-    die;
-}
-
 require __DIR__ . '/bootstrap-autoload.php';
 
 // construct absolute URL for ASSETS_URL
diff --git a/lib/classes/StudipFileloader.php b/lib/classes/StudipFileloader.php
index f499b68..661c062 100644
--- a/lib/classes/StudipFileloader.php
+++ b/lib/classes/StudipFileloader.php
@@ -27,6 +27,12 @@ class StudipFileloader
         $_oldVariableNames = array_keys(get_defined_vars());
 
         foreach (preg_split('/ /', $_filename, -1, PREG_SPLIT_NO_EMPTY) as $file) {
+            if (
+                !file_exists($file)
+                && !stream_resolve_include_path($file)
+            ) {
+                continue;
+            }
             include $file;
         }
         unset($file);
-- 
cgit v1.0


From 83773002244ced4b3082570175a68349baa7e28a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 19 Apr 2024 13:17:59 +0000
Subject: consistently uses CourseManagementSelectWidget on all sites of the
 course management, fixes #4030

Closes #4030

Merge request studip/studip!2887
---
 app/controllers/admin/additional.php   |  2 ++
 app/controllers/avatar.php             |  6 ++++++
 app/controllers/course/grouping.php    |  5 +++++
 app/controllers/course/lvgselector.php |  5 +++++
 app/controllers/course/timesrooms.php  | 19 +++----------------
 app/controllers/questionnaire.php      |  9 +++++++++
 public/admin_evaluation.php            |  7 +++++++
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/additional.php b/app/controllers/admin/additional.php
index a98da20..6f8f08c 100644
--- a/app/controllers/admin/additional.php
+++ b/app/controllers/admin/additional.php
@@ -30,6 +30,8 @@ class Admin_AdditionalController extends AuthenticatedController
             throw new AccessDeniedException(_("Sie haben keine Berechtigung diese " .
                     "Veranstaltung zu verändern."));
         }
+
+        Sidebar::get()->addWidget(new CourseManagementSelectWidget());
     }
 
     /**
diff --git a/app/controllers/avatar.php b/app/controllers/avatar.php
index c549cf0..aafbb98 100644
--- a/app/controllers/avatar.php
+++ b/app/controllers/avatar.php
@@ -62,8 +62,14 @@ class AvatarController extends AuthenticatedController
             Navigation::activateItem('/admin/institute/details');
         } else {
             Navigation::activateItem('/course/admin/avatar');
+
+            if ($GLOBALS['perm']->have_studip_perm('admin', $id)) {
+                $widget = new CourseManagementSelectWidget();
+                Sidebar::get()->addWidget($widget);
+            }
         }
 
+
         $avatar = $class::getAvatar($id);
         $this->avatar = $avatar->getURL($class::NORMAL);
         $this->customized = $avatar->is_customized();
diff --git a/app/controllers/course/grouping.php b/app/controllers/course/grouping.php
index 4f35b53..1729d99 100644
--- a/app/controllers/course/grouping.php
+++ b/app/controllers/course/grouping.php
@@ -36,6 +36,11 @@ class Course_GroupingController extends AuthenticatedController
         if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->course->id)) {
             throw new AccessDeniedException(_('Sie haben leider nicht die notwendige Berechtigung für diese Aktion.'));
         }
+
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+            $widget = new CourseManagementSelectWidget();
+            Sidebar::get()->addWidget($widget);
+        }
     }
 
     /**
diff --git a/app/controllers/course/lvgselector.php b/app/controllers/course/lvgselector.php
index 3542a11..171f3d5 100644
--- a/app/controllers/course/lvgselector.php
+++ b/app/controllers/course/lvgselector.php
@@ -37,6 +37,11 @@ class Course_LvgselectorController extends AuthenticatedController
         $widget = new HelpbarWidget();
         $widget->addElement(new WidgetElement(_('Auf dieser Seite kann die Veranstaltung ausgewählten Lehrveranstaltungsgruppen zugeordnet werden.')));
         Helpbar::get()->addWidget($widget);
+
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+            $widget = new CourseManagementSelectWidget();
+            Sidebar::get()->addWidget($widget);
+        }
     }
 
     /**
diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index 41a78a8..1f0ab17 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -1485,23 +1485,10 @@ class Course_TimesroomsController extends AuthenticatedController
         }
         Sidebar::Get()->addWidget($widget);
 
-        if ($GLOBALS['perm']->have_perm('admin')) {
-            $list = new SelectWidget(
-                _('Veranstaltungen'),
-                $this->indexURL(),
-                'cid'
-            );
 
-            foreach (AdminCourseFilter::get()->getCoursesForAdminWidget() as $seminar) {
-                $list->addElement(new SelectElement(
-                    $seminar['Seminar_id'],
-                    $seminar['Name'],
-                    $seminar['Seminar_id'] === Context::getId(),
-                    $seminar['VeranstaltungsNummer'] . ' ' . $seminar['Name']
-                ));
-            }
-            $list->size = 8;
-            Sidebar::Get()->addWidget($list);
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+            $widget = new CourseManagementSelectWidget();
+            Sidebar::get()->addWidget($widget);
         }
     }
 
diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index d0766ed..2da457c 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -52,7 +52,16 @@ class QuestionnaireController extends AuthenticatedController
         if (!$GLOBALS['perm']->have_studip_perm("tutor", $this->range_id)) {
             throw new AccessDeniedException("Only for logged in users.");
         }
+
         Navigation::activateItem("/course/admin/questionnaires");
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+            // Ensure the select widget is added last
+            NotificationCenter::on('SidebarWillRender', function () {
+                $widget = new CourseManagementSelectWidget();
+                Sidebar::get()->addWidget($widget);
+            });
+        }
+
         $this->statusgruppen = Statusgruppen::findByRange_id($this->range_id);
         $this->questionnaires = Questionnaire::findBySQL(
             "INNER JOIN questionnaire_assignments USING (questionnaire_id) WHERE (questionnaire_assignments.range_id = ? AND questionnaire_assignments.range_type = ?) OR (questionnaire_assignments.range_id IN (?) AND questionnaire_assignments.range_type = 'statusgruppe') ORDER BY questionnaires.chdate DESC",
diff --git a/public/admin_evaluation.php b/public/admin_evaluation.php
index f702173..bee8cce 100644
--- a/public/admin_evaluation.php
+++ b/public/admin_evaluation.php
@@ -66,6 +66,13 @@ if ($view === 'eval_inst') {
     require_once 'lib/admin_search.inc.php';
 } else if (Context::getId() && $view == "eval_sem") {
     Navigation::activateItem('/course/admin/evaluation');
+    if ($GLOBALS['perm']->have_studip_perm('admin', Context::getId())) {
+        // Ensure the select widget is added last
+        NotificationCenter::on('SidebarWillRender', function () {
+            $widget = new CourseManagementSelectWidget();
+            Sidebar::get()->addWidget($widget);
+        });
+    }
 } else {
     Navigation::activateItem('/contents/evaluation');
 }
-- 
cgit v1.0


From 81f239042f2537f01072d11253af114192a0c05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Fri, 19 Apr 2024 13:26:25 +0000
Subject: Resolve "Doppeltes Id Attribut auf der Nachrichtenseite"

Closes #4039

Merge request studip/studip!2894
---
 lib/classes/sidebar/LinksWidget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/sidebar/LinksWidget.php b/lib/classes/sidebar/LinksWidget.php
index bc8256d..72a2fca 100644
--- a/lib/classes/sidebar/LinksWidget.php
+++ b/lib/classes/sidebar/LinksWidget.php
@@ -30,7 +30,7 @@ class LinksWidget extends ListWidget
     public function &addLink($label, $url, $icon = null, $attributes = [], $index = null)
     {
         if ($index === null) {
-            $index = 'link-' . md5($url);
+            $index = 'link-' . md5($url . $label);
         }
         $element = new LinkElement($label, $url, $icon, $attributes);
         $this->addElement($element, $index);
-- 
cgit v1.0


From 5dd5dbd5a112affa1bbcc81947ba9a249c86a957 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 19 Apr 2024 14:04:27 +0000
Subject: fixes #4044

Closes #4044

Merge request studip/studip!2898
---
 app/controllers/course/wiki.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index b8a50dc..738d0e7 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -511,6 +511,7 @@ class Course_WikiController extends AuthenticatedController
             $this->render_json([
                 'error' => 'user_not_requested_edit_mode'
             ]);
+            return;
         }
 
         $online_user_me->editing = 0;
-- 
cgit v1.0


From 40d435ffc10aaaf9a9a471598d149f9ae7dfdc7e Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Sun, 21 Apr 2024 08:28:15 +0000
Subject: drop removed parameter from error handler, fixes #4045

Closes #4045

Merge request studip/studip!2899
---
 vendor/trails/src/dispatcher.php | 4 +---
 vendor/trails/trails.php         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/vendor/trails/src/dispatcher.php b/vendor/trails/src/dispatcher.php
index 59bf8d9..58f55b1 100644
--- a/vendor/trails/src/dispatcher.php
+++ b/vendor/trails/src/dispatcher.php
@@ -255,14 +255,12 @@ class Trails_Dispatcher {
    * @param  string     the error message
    * @param  string     the filename that the error was raised in
    * @param  integer    the line number the error was raised at
-   * @param  array      an array of every variable that existed in the scope the
-   *                    error was triggered in
    *
    * @throws Trails_Exception
    *
    * @return void
    */
-  function error_handler($errno, $string, $file, $line, $context) {
+  function error_handler($errno, $string, $file, $line) {
     if (!(5888 & $errno)) {
       return false;
     }
diff --git a/vendor/trails/trails.php b/vendor/trails/trails.php
index b88a4a9..96b9562 100644
--- a/vendor/trails/trails.php
+++ b/vendor/trails/trails.php
@@ -283,14 +283,12 @@ class Trails_Dispatcher {
    * @param  string     the error message
    * @param  string     the filename that the error was raised in
    * @param  integer    the line number the error was raised at
-   * @param  array      an array of every variable that existed in the scope the
-   *                    error was triggered in
    *
    * @throws Trails_Exception
    *
    * @return void
    */
-  function error_handler($errno, $string, $file, $line, $context) {
+  function error_handler($errno, $string, $file, $line) {
     if (!(5888 & $errno)) {
       return false;
     }
-- 
cgit v1.0


From 51f44ced12b4b81520eb5c390c9c8d060deaca5f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 22 Apr 2024 07:08:07 +0000
Subject: fixes #4026

Closes #4026

Merge request studip/studip!2881
---
 app/views/course/wizard/steps/studyareas/_assigned_node.php |  8 ++++----
 lib/models/Lvgruppe.php                                     | 12 ++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/course/wizard/steps/studyareas/_assigned_node.php b/app/views/course/wizard/steps/studyareas/_assigned_node.php
index 459cddd..9525fc8 100644
--- a/app/views/course/wizard/steps/studyareas/_assigned_node.php
+++ b/app/views/course/wizard/steps/studyareas/_assigned_node.php
@@ -1,12 +1,12 @@
 <li class="sem-tree-assigned-<?= $element['id'] ?>">
     <?= htmlReady($element['name']) ?>
-    <?php if (!$values['locked'] && $element['assignable'] && in_array($element['id'], $studyareas ?: [])) : ?>
-        <?= Icon::create('trash', 'clickable')->asInput(["name" => 'unassign['.$element['id'].']', "onclick" => "return STUDIP.CourseWizard.unassignNode('".$element['id']."')"]) ?>
-    <input type="hidden" name="studyareas[]" value="<?= $element['id'] ?>"/>
+    <?php if (empty($values['locked']) && $element['assignable'] && in_array($element['id'], $studyareas ?: [])) : ?>
+        <?= Icon::create('trash')->asInput(["name" => 'unassign['.$element['id'].']', "onclick" => "return STUDIP.CourseWizard.unassignNode('".$element['id']."')"]) ?>
+    <input type="hidden" name="studyareas[]" value="<?= htmlReady($element['id']) ?>"/>
     <?php endif ?>
     <ul>
         <?php foreach ($element['children'] as $c) : ?>
         <?= $this->render_partial('studyareas/_assigned_node', ['element' => $c]) ?>
         <?php endforeach ?>
     </ul>
-</li>
\ No newline at end of file
+</li>
diff --git a/lib/models/Lvgruppe.php b/lib/models/Lvgruppe.php
index 138d28e..05f3b59 100644
--- a/lib/models/Lvgruppe.php
+++ b/lib/models/Lvgruppe.php
@@ -232,7 +232,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem
      *
      * @param string $term The search term.
      * @param array|string $filter An array with filter options or a where part.
-     * @return object A SimpleORMapCollection of LV-Gruppen.
+     * @return SimpleORMapCollection A SimpleORMapCollection of LV-Gruppen.
      */
     public static function findBySearchTerm($term, $filter = null)
     {
@@ -271,7 +271,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem
      * Retrieves all LV-Gruppen related to the Modulteil with given id.
      *
      * @param string $modulteil_id The id of a Modulteil.
-     * @return object A SimpleORMapCollection of LV-Gruppen.
+     * @return SimpleORMapCollection A SimpleORMapCollection of LV-Gruppen.
      */
     public static function findByModulteil($modulteil_id)
     {
@@ -286,7 +286,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem
      * Retrieves all LV-Gruppen related to the course with given id.
      *
      * @param string $seminar_id The id of a course.
-     * @return object A SimpleORMapCollection of LV-Gruppen.
+     * @return SimpleORMapCollection A SimpleORMapCollection of LV-Gruppen.
      */
     public static function findBySeminar($seminar_id)
     {
@@ -339,7 +339,7 @@ class Lvgruppe extends ModuleManagementModelTreeItem
     /**
      * Assigns the given course to the given LvGruppen.
      *
-     * @param array Array of ids
+     * @param string $seminar_id Array of ids
      * @return int The number of assigned LvGruppen.
      */
     public static function setLvgruppen($seminar_id, $lvgruppen_ids)
@@ -347,9 +347,13 @@ class Lvgruppe extends ModuleManagementModelTreeItem
         $old = Lvgruppe::findBySeminar($seminar_id);
         $removed = array_diff($old->pluck('id'), $lvgruppen_ids);
         $added = array_diff($lvgruppen_ids, $old->pluck('id'));
+
+        $count_removed = 0;
         foreach ($removed as $one) {
             $count_removed += $old->findOneBy('id', $one)->removeSeminar($seminar_id);
         }
+
+        $count_added = 0;
         foreach ($added as $one) {
             $count_added += Lvgruppe::get($one)->addSeminar($seminar_id);
         }
-- 
cgit v1.0


From 8dae601aa9ab032b9e5aed1cb3e7e0394de12583 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 22 Apr 2024 12:06:38 +0200
Subject: fix #4033

---
 .../stylesheets/scss/courseware/blockadder.scss    |   2 +-
 .../stylesheets/scss/courseware/toolbar.scss       |  17 ++-
 .../courseware/toolbar/CoursewareToolbar.vue       |  44 ++++--
 .../courseware/toolbar/CoursewareToolbarBlocks.vue | 170 +++++++++++----------
 .../toolbar/CoursewareToolbarClipboard.vue         |  14 +-
 5 files changed, 150 insertions(+), 97 deletions(-)

diff --git a/resources/assets/stylesheets/scss/courseware/blockadder.scss b/resources/assets/stylesheets/scss/courseware/blockadder.scss
index 93325dd..b3f4834 100644
--- a/resources/assets/stylesheets/scss/courseware/blockadder.scss
+++ b/resources/assets/stylesheets/scss/courseware/blockadder.scss
@@ -136,7 +136,7 @@
 }
 .cw-element-inserter-wrapper {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(225px, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
     grid-auto-rows: auto;
     grid-gap: 4px;
     margin-bottom: 8px;
diff --git a/resources/assets/stylesheets/scss/courseware/toolbar.scss b/resources/assets/stylesheets/scss/courseware/toolbar.scss
index fdabbf2..0670486 100644
--- a/resources/assets/stylesheets/scss/courseware/toolbar.scss
+++ b/resources/assets/stylesheets/scss/courseware/toolbar.scss
@@ -14,8 +14,7 @@
         min-height: 100%;
         border: solid thin var(--content-color-40);
         background-color: var(--white);
-        overflow-y: auto;
-        overflow-x: hidden;
+        overflow: hidden;
         position: relative;
         padding: 0 4px;
         top: 0;
@@ -33,6 +32,11 @@
             right: 0;
         }
 
+        .cw-toolbar-tool-content {
+            overflow-y: auto;
+            padding-right: 8px;
+        }
+
         .cw-toolbar-blocks {
             .input-group.files-search {
                 &.search {
@@ -96,6 +100,12 @@
             }
 
         }
+
+        .cw-toolbar-clipboard {
+            .cw-collapsible {
+                margin-bottom: 4px;
+            }
+        }
     }
     .cw-toolbar-folded-wrapper {
         display: flex;
@@ -124,6 +134,7 @@
 
         &.cw-toolbar-button-toggle {
             text-align: end;
+            flex-grow: 1;
         }
 
         &.active {
@@ -142,7 +153,7 @@
     .cw-toolbar-tools.hd {
         .cw-toolbar-button-wrapper {
             .cw-toolbar-button {
-                width: 128px;
+                min-width: 110px;
                 padding: 2px 16px 0 16px;
                 &.cw-toolbar-button-toggle {
                     text-align: end;
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
index 8f82eac..dc70348 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
@@ -2,7 +2,7 @@
     <div class="cw-toolbar-wrapper">
         <div id="cw-toolbar" class="cw-toolbar" :style="toolbarStyle">
             <div v-if="showTools" class="cw-toolbar-tools" :class="{ unfold: unfold, hd: isHd, wqhd: isWqhd }">
-                <div class="cw-toolbar-button-wrapper">
+                <div id="cw-toolbar-nav" class="cw-toolbar-button-wrapper">
                     <button
                         class="cw-toolbar-button"
                         :class="{ active: activeTool === 'blockAdder' }"
@@ -35,9 +35,19 @@
                         <studip-icon shape="arr_2right" :size="24" />
                     </button>
                 </div>
-                <courseware-toolbar-blocks v-if="activeTool === 'blockAdder'" />
-                <courseware-toolbar-containers v-if="activeTool === 'containerAdder'" />
-                <courseware-toolbar-clipboard v-if="activeTool === 'clipboard'" />
+                <div class="cw-toolbar-tool-wrapper">
+                    <CoursewareToolbarBlocks
+                        v-if="activeTool === 'blockAdder'"
+                        :toolbarContentHeight="toolbarContentHeight"
+                    />
+                    <CoursewareToolbarContainers
+                        v-if="activeTool === 'containerAdder'"
+                    />
+                    <CoursewareToolbarClipboard
+                        v-if="activeTool === 'clipboard'"
+                        :toolbarContentHeight="toolbarContentHeight"
+                    />
+                </div>
             </div>
             <div v-else class="cw-toolbar-folded-wrapper">
                 <button
@@ -97,20 +107,26 @@ export default {
             toolbarActive: 'toolbarActive',
             hideEditLayout: 'hideEditLayout',
         }),
-        toolbarStyle() {
-            const scrollTopStyles = window.getComputedStyle(document.getElementById('scroll-to-top'));
+        scrollTopStyles() {
+            return window.getComputedStyle(document.getElementById('scroll-to-top'));
+        },
+        toolbarHeight() {
             const scrollTopHeight =
-                parseInt(scrollTopStyles['height'], 10) +
-                parseInt(scrollTopStyles['padding-top'], 10) +
-                parseInt(scrollTopStyles['padding-bottom'], 10) +
-                parseInt(scrollTopStyles['margin-bottom'], 10);
-            let height = parseInt(
+                parseInt(this.scrollTopStyles['height'], 10) +
+                parseInt(this.scrollTopStyles['padding-top'], 10) +
+                parseInt(this.scrollTopStyles['padding-bottom'], 10) +
+                parseInt(this.scrollTopStyles['margin-bottom'], 10);
+            return parseInt(
                 Math.min(this.windowInnerHeight * 0.9, this.windowInnerHeight - this.toolbarTop - scrollTopHeight)
             );
-
+        },
+        toolbarContentHeight() {
+            return this.toolbarHeight - 55;
+        },
+        toolbarStyle() {
             return {
-                height: height + 'px',
-                minHeight: height + 'px',
+                height: this.toolbarHeight + 'px',
+                minHeight: this.toolbarHeight + 'px',
                 top: this.toolbarTop + 'px',
             };
         },
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
index 2795e62..ceda0f0 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
@@ -1,85 +1,88 @@
 <template>
     <div class="cw-toolbar-blocks">
-        <form @submit.prevent="loadSearch">
-            <div class="input-group files-search search cw-block-search">
-                <input
-                    ref="searchBox"
-                    type="text"
-                    v-model="searchInput"
-                    @click.stop
-                    :label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
-                />
-                <span class="input-group-append" @click.stop>
-                    <button
-                        v-if="searchInput"
-                        type="button"
-                        class="button reset-search"
-                        id="reset-search"
-                        :title="$gettext('Suche zurücksetzen')"
-                        @click="resetSearch"
-                    >
-                        <studip-icon shape="decline" :size="20"></studip-icon>
-                    </button>
-                    <button
-                        type="submit"
-                        class="button"
-                        id="search-btn"
-                        :title="$gettext('Suche starten')"
-                        @click="loadSearch"
-                    >
-                        <studip-icon shape="search" :size="20"></studip-icon>
-                    </button>
-                </span>
-            </div>
-        </form>
+        <div id="cw-toolbar-blocks-header" class="cw-toolbar-tool-header">
+            <form @submit.prevent="loadSearch">
+                <div class="input-group files-search search cw-block-search">
+                    <input
+                        ref="searchBox"
+                        type="text"
+                        v-model="searchInput"
+                        @click.stop
+                        :label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
+                    />
+                    <span class="input-group-append" @click.stop>
+                        <button
+                            v-if="searchInput"
+                            type="button"
+                            class="button reset-search"
+                            id="reset-search"
+                            :title="$gettext('Suche zurücksetzen')"
+                            @click="resetSearch"
+                        >
+                            <studip-icon shape="decline" :size="20"></studip-icon>
+                        </button>
+                        <button
+                            type="submit"
+                            class="button"
+                            id="search-btn"
+                            :title="$gettext('Suche starten')"
+                            @click="loadSearch"
+                        >
+                            <studip-icon shape="search" :size="20"></studip-icon>
+                        </button>
+                    </span>
+                </div>
+            </form>
 
-        <div class="filterpanel">
-            <span class="sr-only">{{ $gettext('Kategorien-Filter') }}</span>
-            <button
-                v-for="category in blockCategories"
-                :key="category.type"
-                class="button"
-                :class="{ 'button-active': category.type === currentFilterCategory }"
-                :aria-pressed="category.type === currentFilterCategory ? 'true' : 'false'"
-                @click="selectCategory(category.type)"
-            >
-                {{ category.title }}
-            </button>
+            <div class="filterpanel">
+                <span class="sr-only">{{ $gettext('Kategorien-Filter') }}</span>
+                <button
+                    v-for="category in blockCategories"
+                    :key="category.type"
+                    class="button"
+                    :class="{ 'button-active': category.type === currentFilterCategory }"
+                    :aria-pressed="category.type === currentFilterCategory ? 'true' : 'false'"
+                    @click="selectCategory(category.type)"
+                >
+                    {{ category.title }}
+                </button>
+            </div>
         </div>
-
-        <div v-if="filteredBlockTypes.length > 0" class="cw-blockadder-item-list">
-            <draggable
-                v-if="filteredBlockTypes.length > 0"
-                class="cw-blockadder-item-list"
-                tag="div"
-                role="listbox"
-                v-model="filteredBlockTypes"
-                handle=".cw-sortable-handle-blockadder"
-                :group="{ name: 'blocks', pull: 'clone', put: 'false' }"
-                :clone="cloneBlock"
-                :sort="false"
-                :emptyInsertThreshold="20"
-                @start="dragBlockStart($event)"
-                @end="dropNewBlock($event)"
-                ref="sortables"
-                sectionId="0"
-            >
-                <courseware-blockadder-item
-                    v-for="(block, index) in filteredBlockTypes"
-                    :key="index"
-                    :title="block.title"
-                    :type="block.type"
-                    :data-blocktype="block.type"
-                    :description="block.description"
-                    @blockAdded="$emit('blockAdded')"
-                />
-            </draggable>
+        <div class="cw-toolbar-tool-content" :style="toolContentStyle">
+            <div v-if="filteredBlockTypes.length > 0" class="cw-blockadder-item-list">
+                <draggable
+                    v-if="filteredBlockTypes.length > 0"
+                    class="cw-blockadder-item-list"
+                    tag="div"
+                    role="listbox"
+                    v-model="filteredBlockTypes"
+                    handle=".cw-sortable-handle-blockadder"
+                    :group="{ name: 'blocks', pull: 'clone', put: 'false' }"
+                    :clone="cloneBlock"
+                    :sort="false"
+                    :emptyInsertThreshold="20"
+                    @start="dragBlockStart($event)"
+                    @end="dropNewBlock($event)"
+                    ref="sortables"
+                    sectionId="0"
+                >
+                    <courseware-blockadder-item
+                        v-for="(block, index) in filteredBlockTypes"
+                        :key="index"
+                        :title="block.title"
+                        :type="block.type"
+                        :data-blocktype="block.type"
+                        :description="block.description"
+                        @blockAdded="$emit('blockAdded')"
+                    />
+                </draggable>
+            </div>
+            <courseware-companion-box
+                v-else
+                :msgCompanion="$gettext('Es wurden keine passenden Blöcke gefunden.')"
+                mood="pointing"
+            />
         </div>
-        <courseware-companion-box
-            v-else
-            :msgCompanion="$gettext('Es wurden keine passenden Blöcke gefunden.')"
-            mood="pointing"
-        />
     </div>
 </template>
 
@@ -99,6 +102,12 @@ export default {
         CoursewareCompanionBox,
         draggable,
     },
+    props: {
+        toolbarContentHeight: {
+            type: Number,
+            required: true,
+        },
+    },
     data() {
         return {
             searchInput: '',
@@ -132,6 +141,13 @@ export default {
                 { title: this.$gettext('Biografie'), type: 'biography' },
             ];
         },
+        toolContentStyle() {
+            const height = this.toolbarContentHeight - 115;
+
+            return {
+                height: height + 'px',
+            };
+        },
     },
     methods: {
         ...mapActions({
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
index 98cd573..c6f1e92 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="cw-toolbar-clipboard">
+    <div class="cw-toolbar-clipboard cw-toolbar-tool-content" :style="toolContentStyle">
         <courseware-collapsible-box :title="$gettext('Blöcke')" :open="clipboardBlocks.length > 0">
             <template v-if="clipboardBlocks.length > 0">
                 <div class="cw-element-inserter-wrapper">
@@ -101,7 +101,12 @@ export default {
         StudipDialog,
         draggable,
     },
-
+    props: {
+        toolbarContentHeight: {
+            type: Number,
+            required: true,
+        },
+    },
     data() {
         return {
             showDeleteClipboardDialog: false,
@@ -143,6 +148,11 @@ export default {
             }
             return '';
         },
+        toolContentStyle() {
+            return {
+                height: this.toolbarContentHeight + 'px',
+            };
+        },
     },
     methods: {
         ...mapActions({
-- 
cgit v1.0


From 71681338cf8c24fbfb62ef79d5655025b24ca5c8 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 22 Apr 2024 12:15:53 +0200
Subject: Revert "fix #4033"

This reverts commit 8dae601aa9ab032b9e5aed1cb3e7e0394de12583.
---
 .../stylesheets/scss/courseware/blockadder.scss    |   2 +-
 .../stylesheets/scss/courseware/toolbar.scss       |  17 +--
 .../courseware/toolbar/CoursewareToolbar.vue       |  44 ++----
 .../courseware/toolbar/CoursewareToolbarBlocks.vue | 170 ++++++++++-----------
 .../toolbar/CoursewareToolbarClipboard.vue         |  14 +-
 5 files changed, 97 insertions(+), 150 deletions(-)

diff --git a/resources/assets/stylesheets/scss/courseware/blockadder.scss b/resources/assets/stylesheets/scss/courseware/blockadder.scss
index b3f4834..93325dd 100644
--- a/resources/assets/stylesheets/scss/courseware/blockadder.scss
+++ b/resources/assets/stylesheets/scss/courseware/blockadder.scss
@@ -136,7 +136,7 @@
 }
 .cw-element-inserter-wrapper {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(225px, 1fr));
     grid-auto-rows: auto;
     grid-gap: 4px;
     margin-bottom: 8px;
diff --git a/resources/assets/stylesheets/scss/courseware/toolbar.scss b/resources/assets/stylesheets/scss/courseware/toolbar.scss
index 0670486..fdabbf2 100644
--- a/resources/assets/stylesheets/scss/courseware/toolbar.scss
+++ b/resources/assets/stylesheets/scss/courseware/toolbar.scss
@@ -14,7 +14,8 @@
         min-height: 100%;
         border: solid thin var(--content-color-40);
         background-color: var(--white);
-        overflow: hidden;
+        overflow-y: auto;
+        overflow-x: hidden;
         position: relative;
         padding: 0 4px;
         top: 0;
@@ -32,11 +33,6 @@
             right: 0;
         }
 
-        .cw-toolbar-tool-content {
-            overflow-y: auto;
-            padding-right: 8px;
-        }
-
         .cw-toolbar-blocks {
             .input-group.files-search {
                 &.search {
@@ -100,12 +96,6 @@
             }
 
         }
-
-        .cw-toolbar-clipboard {
-            .cw-collapsible {
-                margin-bottom: 4px;
-            }
-        }
     }
     .cw-toolbar-folded-wrapper {
         display: flex;
@@ -134,7 +124,6 @@
 
         &.cw-toolbar-button-toggle {
             text-align: end;
-            flex-grow: 1;
         }
 
         &.active {
@@ -153,7 +142,7 @@
     .cw-toolbar-tools.hd {
         .cw-toolbar-button-wrapper {
             .cw-toolbar-button {
-                min-width: 110px;
+                width: 128px;
                 padding: 2px 16px 0 16px;
                 &.cw-toolbar-button-toggle {
                     text-align: end;
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
index dc70348..8f82eac 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
@@ -2,7 +2,7 @@
     <div class="cw-toolbar-wrapper">
         <div id="cw-toolbar" class="cw-toolbar" :style="toolbarStyle">
             <div v-if="showTools" class="cw-toolbar-tools" :class="{ unfold: unfold, hd: isHd, wqhd: isWqhd }">
-                <div id="cw-toolbar-nav" class="cw-toolbar-button-wrapper">
+                <div class="cw-toolbar-button-wrapper">
                     <button
                         class="cw-toolbar-button"
                         :class="{ active: activeTool === 'blockAdder' }"
@@ -35,19 +35,9 @@
                         <studip-icon shape="arr_2right" :size="24" />
                     </button>
                 </div>
-                <div class="cw-toolbar-tool-wrapper">
-                    <CoursewareToolbarBlocks
-                        v-if="activeTool === 'blockAdder'"
-                        :toolbarContentHeight="toolbarContentHeight"
-                    />
-                    <CoursewareToolbarContainers
-                        v-if="activeTool === 'containerAdder'"
-                    />
-                    <CoursewareToolbarClipboard
-                        v-if="activeTool === 'clipboard'"
-                        :toolbarContentHeight="toolbarContentHeight"
-                    />
-                </div>
+                <courseware-toolbar-blocks v-if="activeTool === 'blockAdder'" />
+                <courseware-toolbar-containers v-if="activeTool === 'containerAdder'" />
+                <courseware-toolbar-clipboard v-if="activeTool === 'clipboard'" />
             </div>
             <div v-else class="cw-toolbar-folded-wrapper">
                 <button
@@ -107,26 +97,20 @@ export default {
             toolbarActive: 'toolbarActive',
             hideEditLayout: 'hideEditLayout',
         }),
-        scrollTopStyles() {
-            return window.getComputedStyle(document.getElementById('scroll-to-top'));
-        },
-        toolbarHeight() {
+        toolbarStyle() {
+            const scrollTopStyles = window.getComputedStyle(document.getElementById('scroll-to-top'));
             const scrollTopHeight =
-                parseInt(this.scrollTopStyles['height'], 10) +
-                parseInt(this.scrollTopStyles['padding-top'], 10) +
-                parseInt(this.scrollTopStyles['padding-bottom'], 10) +
-                parseInt(this.scrollTopStyles['margin-bottom'], 10);
-            return parseInt(
+                parseInt(scrollTopStyles['height'], 10) +
+                parseInt(scrollTopStyles['padding-top'], 10) +
+                parseInt(scrollTopStyles['padding-bottom'], 10) +
+                parseInt(scrollTopStyles['margin-bottom'], 10);
+            let height = parseInt(
                 Math.min(this.windowInnerHeight * 0.9, this.windowInnerHeight - this.toolbarTop - scrollTopHeight)
             );
-        },
-        toolbarContentHeight() {
-            return this.toolbarHeight - 55;
-        },
-        toolbarStyle() {
+
             return {
-                height: this.toolbarHeight + 'px',
-                minHeight: this.toolbarHeight + 'px',
+                height: height + 'px',
+                minHeight: height + 'px',
                 top: this.toolbarTop + 'px',
             };
         },
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
index ceda0f0..2795e62 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
@@ -1,88 +1,85 @@
 <template>
     <div class="cw-toolbar-blocks">
-        <div id="cw-toolbar-blocks-header" class="cw-toolbar-tool-header">
-            <form @submit.prevent="loadSearch">
-                <div class="input-group files-search search cw-block-search">
-                    <input
-                        ref="searchBox"
-                        type="text"
-                        v-model="searchInput"
-                        @click.stop
-                        :label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
-                    />
-                    <span class="input-group-append" @click.stop>
-                        <button
-                            v-if="searchInput"
-                            type="button"
-                            class="button reset-search"
-                            id="reset-search"
-                            :title="$gettext('Suche zurücksetzen')"
-                            @click="resetSearch"
-                        >
-                            <studip-icon shape="decline" :size="20"></studip-icon>
-                        </button>
-                        <button
-                            type="submit"
-                            class="button"
-                            id="search-btn"
-                            :title="$gettext('Suche starten')"
-                            @click="loadSearch"
-                        >
-                            <studip-icon shape="search" :size="20"></studip-icon>
-                        </button>
-                    </span>
-                </div>
-            </form>
-
-            <div class="filterpanel">
-                <span class="sr-only">{{ $gettext('Kategorien-Filter') }}</span>
-                <button
-                    v-for="category in blockCategories"
-                    :key="category.type"
-                    class="button"
-                    :class="{ 'button-active': category.type === currentFilterCategory }"
-                    :aria-pressed="category.type === currentFilterCategory ? 'true' : 'false'"
-                    @click="selectCategory(category.type)"
-                >
-                    {{ category.title }}
-                </button>
+        <form @submit.prevent="loadSearch">
+            <div class="input-group files-search search cw-block-search">
+                <input
+                    ref="searchBox"
+                    type="text"
+                    v-model="searchInput"
+                    @click.stop
+                    :label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
+                />
+                <span class="input-group-append" @click.stop>
+                    <button
+                        v-if="searchInput"
+                        type="button"
+                        class="button reset-search"
+                        id="reset-search"
+                        :title="$gettext('Suche zurücksetzen')"
+                        @click="resetSearch"
+                    >
+                        <studip-icon shape="decline" :size="20"></studip-icon>
+                    </button>
+                    <button
+                        type="submit"
+                        class="button"
+                        id="search-btn"
+                        :title="$gettext('Suche starten')"
+                        @click="loadSearch"
+                    >
+                        <studip-icon shape="search" :size="20"></studip-icon>
+                    </button>
+                </span>
             </div>
+        </form>
+
+        <div class="filterpanel">
+            <span class="sr-only">{{ $gettext('Kategorien-Filter') }}</span>
+            <button
+                v-for="category in blockCategories"
+                :key="category.type"
+                class="button"
+                :class="{ 'button-active': category.type === currentFilterCategory }"
+                :aria-pressed="category.type === currentFilterCategory ? 'true' : 'false'"
+                @click="selectCategory(category.type)"
+            >
+                {{ category.title }}
+            </button>
         </div>
-        <div class="cw-toolbar-tool-content" :style="toolContentStyle">
-            <div v-if="filteredBlockTypes.length > 0" class="cw-blockadder-item-list">
-                <draggable
-                    v-if="filteredBlockTypes.length > 0"
-                    class="cw-blockadder-item-list"
-                    tag="div"
-                    role="listbox"
-                    v-model="filteredBlockTypes"
-                    handle=".cw-sortable-handle-blockadder"
-                    :group="{ name: 'blocks', pull: 'clone', put: 'false' }"
-                    :clone="cloneBlock"
-                    :sort="false"
-                    :emptyInsertThreshold="20"
-                    @start="dragBlockStart($event)"
-                    @end="dropNewBlock($event)"
-                    ref="sortables"
-                    sectionId="0"
-                >
-                    <courseware-blockadder-item
-                        v-for="(block, index) in filteredBlockTypes"
-                        :key="index"
-                        :title="block.title"
-                        :type="block.type"
-                        :data-blocktype="block.type"
-                        :description="block.description"
-                        @blockAdded="$emit('blockAdded')"
-                    />
-                </draggable>
-            </div>
-            <courseware-companion-box
-                v-else
-                :msgCompanion="$gettext('Es wurden keine passenden Blöcke gefunden.')"
-                mood="pointing"
-            />
+
+        <div v-if="filteredBlockTypes.length > 0" class="cw-blockadder-item-list">
+            <draggable
+                v-if="filteredBlockTypes.length > 0"
+                class="cw-blockadder-item-list"
+                tag="div"
+                role="listbox"
+                v-model="filteredBlockTypes"
+                handle=".cw-sortable-handle-blockadder"
+                :group="{ name: 'blocks', pull: 'clone', put: 'false' }"
+                :clone="cloneBlock"
+                :sort="false"
+                :emptyInsertThreshold="20"
+                @start="dragBlockStart($event)"
+                @end="dropNewBlock($event)"
+                ref="sortables"
+                sectionId="0"
+            >
+                <courseware-blockadder-item
+                    v-for="(block, index) in filteredBlockTypes"
+                    :key="index"
+                    :title="block.title"
+                    :type="block.type"
+                    :data-blocktype="block.type"
+                    :description="block.description"
+                    @blockAdded="$emit('blockAdded')"
+                />
+            </draggable>
         </div>
+        <courseware-companion-box
+            v-else
+            :msgCompanion="$gettext('Es wurden keine passenden Blöcke gefunden.')"
+            mood="pointing"
+        />
     </div>
 </template>
 
@@ -102,12 +99,6 @@ export default {
         CoursewareCompanionBox,
         draggable,
     },
-    props: {
-        toolbarContentHeight: {
-            type: Number,
-            required: true,
-        },
-    },
     data() {
         return {
             searchInput: '',
@@ -141,13 +132,6 @@ export default {
                 { title: this.$gettext('Biografie'), type: 'biography' },
             ];
         },
-        toolContentStyle() {
-            const height = this.toolbarContentHeight - 115;
-
-            return {
-                height: height + 'px',
-            };
-        },
     },
     methods: {
         ...mapActions({
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
index c6f1e92..98cd573 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="cw-toolbar-clipboard cw-toolbar-tool-content" :style="toolContentStyle">
+    <div class="cw-toolbar-clipboard">
         <courseware-collapsible-box :title="$gettext('Blöcke')" :open="clipboardBlocks.length > 0">
             <template v-if="clipboardBlocks.length > 0">
                 <div class="cw-element-inserter-wrapper">
@@ -101,12 +101,7 @@ export default {
         StudipDialog,
         draggable,
     },
-    props: {
-        toolbarContentHeight: {
-            type: Number,
-            required: true,
-        },
-    },
+
     data() {
         return {
             showDeleteClipboardDialog: false,
@@ -148,11 +143,6 @@ export default {
             }
             return '';
         },
-        toolContentStyle() {
-            return {
-                height: this.toolbarContentHeight + 'px',
-            };
-        },
     },
     methods: {
         ...mapActions({
-- 
cgit v1.0


From 4fe996bbc7d97633c65ca9e9aaf1f79a866d30eb Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Mon, 22 Apr 2024 13:01:57 +0000
Subject: Resolve "Falscher Link zu OER-Material in Abo-Nachricht"

Closes #4052

Merge request studip/studip!2903
---
 lib/models/OERMaterial.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php
index b0b29ec..6ec7de8 100644
--- a/lib/models/OERMaterial.php
+++ b/lib/models/OERMaterial.php
@@ -703,7 +703,7 @@ class OERMaterial extends SimpleORMap
         $message = sprintf(
             _('%1$s hat soeben neues Material auf dem OER Campus zur verfügung gestellt. Viel Spaß! <br> %2$s'),
             $user_name,
-            URLHelper::getURL("dispatch.php/oer/market/details/".$this->getId())
+            URLHelper::getURL("dispatch.php/oer/market/details/".$this->getId(), [], true)
         );
         URLHelper::setBaseURL($oldbase);
         $messsaging->insert_message(
-- 
cgit v1.0


From 348bd1303bc31d0f1be6a8990e0647d7233b388f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Mon, 22 Apr 2024 16:02:08 +0000
Subject: Resolve "MessageBox sollte als Statusmeldung ausgezeichnet werden"

Closes #4042

Merge request studip/studip!2896
---
 lib/classes/MessageBox.class.php  | 10 ++++++++++
 templates/_standard_loginform.php |  6 ++++--
 templates/shared/message_box.php  | 22 ++++++++++++----------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/lib/classes/MessageBox.class.php b/lib/classes/MessageBox.class.php
index 450851f..c0d94b2 100644
--- a/lib/classes/MessageBox.class.php
+++ b/lib/classes/MessageBox.class.php
@@ -41,6 +41,7 @@ class MessageBox implements LayoutMessage
     public $details;
     public $close_details;
     protected $hide_close = false;
+    public static $counter = 0;
 
     /**
      * This function returns an exception message box. Use it only for system errors
@@ -147,12 +148,21 @@ class MessageBox implements LayoutMessage
      */
     public function __toString()
     {
+        $label = [
+            'exception' => _('Systemfehler'),
+            'error'     => _('Fehler'),
+            'warning'   => _('Warnung'),
+            'info'      => _('Hinweis'),
+            'success'   => _('Erfolg'),
+        ];
         return $GLOBALS['template_factory']->render('shared/message_box', [
             'class'         => $this->class,
             'message'       => $this->message,
             'details'       => is_array($this->details) ? $this->details : [],
             'close_details' => $this->close_details,
             'hide_close'    => $this->hide_close,
+            'label'         => $label[$this->class],
+            'counter'       => self::$counter++,
         ]);
     }
 }
diff --git a/templates/_standard_loginform.php b/templates/_standard_loginform.php
index 51fc53b..57c9cec 100644
--- a/templates/_standard_loginform.php
+++ b/templates/_standard_loginform.php
@@ -43,9 +43,11 @@ $password_tooltip_text = (string)Config::get()->PASSWORD_TOOLTIP_TEXT;
                    name="password"
                    autocomplete="current-password"
                    size="20"
-                   required>
+                   required
+                   <?= $loginerror ? 'aria-describedby="messagebox-0"' : ''?>
+            >
 
-            <i id="password-toggle" tabindex="0" aria-role="button" class="enter-accessible">
+            <i id="password-toggle" tabindex="0" role="button" class="enter-accessible">
                 <?= Icon::create('visibility-checked')->asImg(20, [
                     'id   ' => 'visible-password',
                     'title' => _('Passwort anzeigen'),
diff --git a/templates/shared/message_box.php b/templates/shared/message_box.php
index 657563b..447763d 100644
--- a/templates/shared/message_box.php
+++ b/templates/shared/message_box.php
@@ -1,4 +1,4 @@
-<div class="messagebox messagebox_<?= $class ?> <? if (count($details) > 0 && $close_details): ?>details_hidden<? endif; ?>">
+<div role="region" aria-label="<?= $label ?>" aria-describedby="messagebox-<?= $counter ?>" class="messagebox messagebox_<?= $class ?> <? if (count($details) > 0 && $close_details): ?>details_hidden<? endif; ?>">
     <div class="messagebox_buttons">
     <? if (count($details) > 0 && $close_details) : ?>
         <a class="details" href="#" title="<?=_('Detailanzeige umschalten')?>">
@@ -6,19 +6,21 @@
         </a>
     <? endif ?>
     <? if (!$hide_close): ?>
-        <a class="close" href="#" title="<?= _('Nachrichtenbox schließen') ?>">
+        <a class="close" role="button" href="#" title="<?= _('Nachrichtenbox schließen') ?>">
             <span><?= _('Nachrichtenbox schließen') ?></span>
         </a>
     <? endif; ?>
     </div>
+    <div role="status" id="messagebox-<?= $counter ?>">
     <?= $message ?>
-<? if (count($details) > 0) : ?>
-    <div class="messagebox_details">
-        <ul>
-        <? foreach ($details as $li) : ?>
-            <li><?= $li ?></li>
-        <? endforeach ?>
-        </ul>
+    <? if (count($details) > 0) : ?>
+        <div class="messagebox_details">
+            <ul>
+            <? foreach ($details as $li) : ?>
+                <li><?= $li ?></li>
+            <? endforeach ?>
+            </ul>
+        </div>
+    <? endif ?>
     </div>
-<? endif ?>
 </div>
-- 
cgit v1.0


From 8b07f02f53421911a25066d1c4d78b97c9f3fcd9 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Tue, 23 Apr 2024 08:46:46 +0000
Subject: =?UTF-8?q?Resolve=20"Barrierefreiheit:=20Blubber=20Benachrichtigu?=
 =?UTF-8?q?ngsstatus=20ist=20nicht=20f=C3=BCr=20Screenreader=20erkennbar"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4061

Merge request studip/studip!2907
---
 resources/assets/javascripts/lib/blubber.js | 1 +
 templates/blubber/global_context.php        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/resources/assets/javascripts/lib/blubber.js b/resources/assets/javascripts/lib/blubber.js
index 3e93985..4e724b4 100644
--- a/resources/assets/javascripts/lib/blubber.js
+++ b/resources/assets/javascripts/lib/blubber.js
@@ -47,6 +47,7 @@ const Blubber = {
                 subscribe: follow,
             });
         }).then(() => {
+            elements.attr('aria-pressed', follow ? 'true' : 'false');
             elements.toggleClass('unfollowed', !follow);
         }).finally(() => {
             elements.removeClass('loading');
diff --git a/templates/blubber/global_context.php b/templates/blubber/global_context.php
index 77c4a29..4a52407 100644
--- a/templates/blubber/global_context.php
+++ b/templates/blubber/global_context.php
@@ -7,6 +7,8 @@
        onClick="STUDIP.Blubber.followunfollow('global'); return false;"
        class="followunfollow<?= $unfollowed ? " unfollowed" : "" ?>"
        title="<?= _("Benachrichtigungen für diese Konversation abstellen.") ?>"
+       aria-pressed="<?= $unfollowed ? 'false' : 'true' ?>"
+       role="button"
        data-thread_id="global">
         <?= Icon::create("decline")->asImg(20, ['class' => "follow text-bottom"]) ?>
         <?= Icon::create("notification2")->asImg(20, ['class' => "unfollow text-bottom"]) ?>
-- 
cgit v1.0


From 38451e87d752c465d86585920f48aa94667cfb19 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 23 Apr 2024 09:12:09 +0000
Subject: optimize query that loads the courses by using a subselect and EXISTS
 and avoid duplication of costly query, fixes #3999

Closes #3999

Merge request studip/studip!2905
---
 app/controllers/admin/courses.php       | 12 ++++-----
 lib/classes/AdminCourseFilter.class.php | 35 +++++++++++++++++----------
 lib/classes/SQLQuery.php                | 43 +++++++++++++++++++++++++--------
 3 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index b28a0fe..d0e2d53 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -375,14 +375,14 @@ class Admin_CoursesController extends AuthenticatedController
         }
         PluginEngine::sendMessage(AdminCourseWidgetPlugin::class, 'applyFilters', $filter);
 
-        $count = $filter->countCourses();
-        if ($count > $this->max_show_courses && !Request::submitted('without_limit')) {
-            $this->render_json([
-                'count' => $count
-            ]);
+        try {
+            $courses = $filter->fetchCourses(
+                Request::bool('without_limit') ? null: $this->max_show_courses
+            );
+        } catch (OverflowException $e) {
+            $this->render_json(['count' => (int) $e->getMessage()]);
             return;
         }
-        $courses = AdminCourseFilter::get()->getCourses();
 
         $data = [
             'data' => []
diff --git a/lib/classes/AdminCourseFilter.class.php b/lib/classes/AdminCourseFilter.class.php
index da8ce54..3b9cb4b 100644
--- a/lib/classes/AdminCourseFilter.class.php
+++ b/lib/classes/AdminCourseFilter.class.php
@@ -28,6 +28,8 @@
 class AdminCourseFilter
 {
     static protected $instance = null;
+
+    /** @var SQLQuery|null  */
     public $query = null;
     public $max_show_courses = 500;
     public $settings = [];
@@ -109,13 +111,10 @@ class AdminCourseFilter
         }
 
         if (Config::get()->ALLOW_ADMIN_RELATED_INST) {
-            $sem_inst = 'seminar_inst';
-            $this->query->join('seminar_inst', 'seminar_inst', 'seminar_inst.seminar_id = seminare.Seminar_id');
+            $this->query->where('seminar_inst', 'EXISTS (SELECT 1 FROM seminar_inst WHERE seminar_id = seminare.Seminar_id AND institut_id IN (:institut_ids))');
         } else {
-            $sem_inst = 'seminare';
+            $this->query->where("seminar_inst", "seminare.institut_id IN (:institut_ids)");
         }
-
-        $this->query->where('seminar_inst', "$sem_inst.institut_id IN (:institut_ids)");
         $this->query->parameter('institut_ids', $inst_ids);
 
         if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) {
@@ -196,6 +195,16 @@ class AdminCourseFilter
     }
 
     /**
+     * @param int|null $limit
+     * @return Course[]
+     */
+    public function fetchCourses(?int $limit = null): array
+    {
+        NotificationCenter::postNotification('AdminCourseFilterWillQuery', $this);
+        return $this->query->fetchAll(Course::class, $limit);
+    }
+
+    /**
      * Returns the data of the resultset of the AdminCourseFilter.
      *
      * @param string $order_by possible values name or number
@@ -206,16 +215,16 @@ class AdminCourseFilter
      */
     public function getCoursesForAdminWidget(string $order_by = 'name')
     {
-        $count_courses = $this->countCourses();
-        $order = 'seminare.name';
-        if ($order_by === 'number') {
-            $order = 'seminare.veranstaltungsnummer, seminare.name';
-        }
-        if ($count_courses && $count_courses <= $this->max_show_courses) {
+        try {
+            $order = 'seminare.name';
+            if ($order_by === 'number') {
+                $order = 'seminare.veranstaltungsnummer, seminare.name';
+            }
             $this->query->orderBy($order);
-            return $this->getCourses();
+            return $this->fetchCourses($this->max_show_courses);
+        } catch (OverflowException $e) {
+            return [];
         }
-        return [];
     }
 
 }
diff --git a/lib/classes/SQLQuery.php b/lib/classes/SQLQuery.php
index 0442604..6c8f49e 100644
--- a/lib/classes/SQLQuery.php
+++ b/lib/classes/SQLQuery.php
@@ -215,14 +215,22 @@ class SQLQuery
     /**
      * Fetches the whole resultset as an array of associative arrays. If you define
      * a sorm_class the result will be an array of the sorm-objects.
-     * @param $sorm_class_or_column : column name, a class of SimpleORMap or null for associative array.
-     * @return array of arrays or array of objects or array of values.
+     *
+     * @template T of SimpleORMap
+     * @param class-string<T>|string|null $sorm_class_or_column : column name, a class of SimpleORMap or null for associative array.
+     * @param int|null $max_results Maximum number of results to return
+     * @return array[]|T[]|mixed[] arrays or array of objects or array of values.
+     *
+     * @throws OverflowException if number of found rows is greater than $max_results
      */
-    public function fetchAll($sorm_class_or_column = null)
+    public function fetchAll($sorm_class_or_column = null, ?int $max_results = null)
     {
         NotificationCenter::postNotification('SQLQueryWillExecute', $this);
 
-        if (is_string($sorm_class_or_column) && !is_subclass_of($sorm_class_or_column, "SimpleORMap")) {
+        if (
+            is_string($sorm_class_or_column)
+            && !is_subclass_of($sorm_class_or_column, SimpleORMap::class)
+        ) {
             $sql = "SELECT `{$this->settings['table']}`.`{$sorm_class_or_column}` ";
         } else {
             $sql = "SELECT `{$this->settings['table']}`.* ";
@@ -239,16 +247,31 @@ class SQLQuery
 
         NotificationCenter::postNotification('SQLQueryDidExecute', $this);
 
-        if (is_string($sorm_class_or_column) && !is_subclass_of($sorm_class_or_column, "SimpleORMap")) {
-            return $statement->fetchAll(PDO::FETCH_COLUMN, 0);
+        if (
+            is_string($sorm_class_or_column)
+            && !is_subclass_of($sorm_class_or_column, SimpleORMap::class)
+        ) {
+            return $statement->fetchAll(PDO::FETCH_COLUMN);
         }
 
-        $alldata = $statement->fetchAll(PDO::FETCH_ASSOC);
-        if (!$sorm_class_or_column) {
-            return $alldata;
+        $statement->setFetchMode(PDO::FETCH_ASSOC);
+
+        $result = [];
+        $count = 0;
+        foreach ($statement as $row) {
+            $result[$count++] = $sorm_class_or_column ? $sorm_class_or_column::buildExisting($row) : $row;
+
+            if ($max_results && $count > $max_results) {
+                // Count remaining rows
+                $statement->setFetchMode(PDO::FETCH_COLUMN, 0);
+                while ($statement->fetch()) {
+                    $count += 1;
+                }
+                throw new OverflowException($count);
+            }
         }
 
-        return array_map("{$sorm_class_or_column}::buildExisting", $alldata);
+        return $result;
     }
 
     /**
-- 
cgit v1.0


From c1de8c5ac6c4c1653612edb92eed23d174b0a5f9 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 23 Apr 2024 09:38:44 +0000
Subject: Resolve "Beim Navigieren durch das Vorlesungsverzeichnis aktualisiert
 sich der Seitentitel nicht"

Closes #4035

Merge request studip/studip!2890
---
 app/controllers/search/courses.php           |  3 +++
 resources/vue/components/tree/StudipTree.vue | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/search/courses.php b/app/controllers/search/courses.php
index eaf660b..e068cf7 100644
--- a/app/controllers/search/courses.php
+++ b/app/controllers/search/courses.php
@@ -40,6 +40,7 @@ class Search_CoursesController extends AuthenticatedController
     public function index_action()
     {
         $nodeClass = '';
+        $title = _('Vorlesungsverzeichnis');
         if (Request::option('type', 'semtree') === 'semtree') {
             Navigation::activateItem('/search/courses/semtree');
             $nodeClass = StudipStudyArea::class;
@@ -52,10 +53,12 @@ class Search_CoursesController extends AuthenticatedController
             $this->treeTitle = _('Einrichtungen');
             $this->breadcrumbIcon = 'institute';
             $this->editUrl = $this->url_for('rangetree/edit');
+            $title = _('Einrichtungsverzeichnis');
         }
         $this->startId = Request::option('node_id', $nodeClass . '_root');
 
         $this->setupSidebar();
+        PageLayout::setTitle($title);
     }
 
     public function export_results_action()
diff --git a/resources/vue/components/tree/StudipTree.vue b/resources/vue/components/tree/StudipTree.vue
index 1678225..fc6dc41 100644
--- a/resources/vue/components/tree/StudipTree.vue
+++ b/resources/vue/components/tree/StudipTree.vue
@@ -44,6 +44,7 @@
 <script>
 import axios from 'axios';
 import { TreeMixin } from '../../mixins/TreeMixin';
+import PageLayout from '../../../assets/javascripts/lib/page_layout';
 import StudipProgressIndicator from '../StudipProgressIndicator.vue';
 import SearchWidget from '../SearchWidget.vue';
 import StudipTreeViewWidget from './StudipTreeViewWidget.vue';
@@ -176,7 +177,8 @@ export default {
             showStructuralNavigation: false,
             searchConfig: {},
             isSearching: false,
-            viewConfig: null
+            viewConfig: null,
+            pageTitle: document.title
         }
     },
     methods: {
@@ -188,6 +190,7 @@ export default {
                 semester: this.semester,
                 semClass: this.semClass
             };
+            this.setPageTitle(this.currentNode.attributes.name);
             this.$nextTick(() => {
                 document.getElementById('tree-breadcrumb-' + node.attributes.id)?.focus();
             });
@@ -206,6 +209,10 @@ export default {
                 form.appendChild(input);
             }
             input.setAttribute('value', searchterm);
+        },
+        setPageTitle(nodeTitle) {
+            const title = this.pageTitle.split('-');
+            PageLayout.title = title.slice(0, -1).join('-') + '/ ' + nodeTitle + ' -' + title[title.length - 1];
         }
     },
     mounted() {
@@ -231,6 +238,7 @@ export default {
                 semester: this.semester,
                 semClass: this.semClass
             };
+            this.setPageTitle(this.currentNode.attributes.name);
         });
 
         axios.interceptors.request.eject(loadingIndicator);
-- 
cgit v1.0


From e0b123ac6abb86ed90426638e3f617a02925c156 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 23 Apr 2024 09:44:40 +0000
Subject: =?UTF-8?q?Resolve=20"Fehlende=20textuelle=20Beschreibungen=20f?=
 =?UTF-8?q?=C3=BCr=20Icons=20im=20Dateibereich"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4037

Merge request studip/studip!2893
---
 resources/assets/stylesheets/scss/tables.scss |   8 +-
 resources/vue/components/FilesTable.vue       | 132 ++++++++++++++++++++++----
 2 files changed, 117 insertions(+), 23 deletions(-)

diff --git a/resources/assets/stylesheets/scss/tables.scss b/resources/assets/stylesheets/scss/tables.scss
index 9e05f01..058569f 100644
--- a/resources/assets/stylesheets/scss/tables.scss
+++ b/resources/assets/stylesheets/scss/tables.scss
@@ -271,11 +271,15 @@ tr.sortable {
     }
 
     th.sortasc {
-        @include icon('after', 'arr_1up', 'clickable');
+        span[role=img] {
+            @include icon('after', 'arr_1up', 'clickable');
+        }
     }
 
     th.sortdesc {
-        @include icon('after', 'arr_1down', 'clickable');
+        span[role=img] {
+            @include icon('after', 'arr_1down', 'clickable');
+        }
     }
 }
 
diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index 646e914..389e5d1 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -42,52 +42,127 @@
             </colgroup>
             <thead>
                 <tr class="sortable">
-                    <th v-if="show_bulk_actions" data-sort="false" :aria-label="$gettext('Ordner und Dateien auswählen')">
+                    <th v-if="show_bulk_actions"
+                        data-sort="false"
+                        :aria-label="$gettext('Ordner und Dateien auswählen')">
                         <studip-proxy-checkbox
                             v-model="selectedIds"
                             :total="allIds"
                             :title="$gettext('Alle Ordner und Dateien auswählen')"
                         ></studip-proxy-checkbox>
                     </th>
-                    <th @click="sort('mime_type')" :class="sortClasses('mime_type')">
-                        <a href="#" @click.prevent>
+                    <th @click="sort('mime_type')"
+                        :class="sortClasses('mime_type')">
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettext('Nach Typ sortieren')">
                             {{ $gettext('Typ') }}
                         </a>
+                        <span v-if="sortedBy === 'mime_type'"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird abfsteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
-                    <th @click="sort('name')" :class="sortClasses('name')">
-                        <a href="#" @click.prevent>
+                    <th @click="sort('name')"
+                        :class="sortClasses('name')">
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettext('Nach Name sortieren')">
                             {{ $gettext('Name') }}
                         </a>
+                        <span v-if="sortedBy === 'name'"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
-                    <th @click="sort('size')" class="responsive-hidden" :class="sortClasses('size')">
-                        <a href="#" @click.prevent>
+                    <th @click="sort('size')"
+                        class="responsive-hidden"
+                        :class="sortClasses('size')">
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettext('Nach Größe sortieren')">
                             {{ $gettext('Größe') }}
                         </a>
+                        <span v-if="sortedBy === 'size'"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
-                    <th v-if="showdownloads" @click="sort('downloads')" class="responsive-hidden" :class="sortClasses('downloads')">
-                        <a href="#" @click.prevent>
+                    <th v-if="showdownloads"
+                        @click="sort('downloads')"
+                        class="responsive-hidden"
+                        :class="sortClasses('downloads')">
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettext('Nach Downloads sortieren')">
                             {{ $gettext('Downloads') }}
                         </a>
+                        <span v-if="sortedBy === 'downloads'"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
-                    <th class="responsive-hidden" @click="sort('author_name')" :class="sortClasses('author_name')">
-                        <a href="#" @click.prevent>
+                    <th class="responsive-hidden"
+                        @click="sort('author_name')"
+                        :class="sortClasses('author_name')">
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettext('Nach Autor/-in sortieren')">
                             {{ $gettext('Autor/-in') }}
                         </a>
+                        <span v-if="sortedBy === 'author_name'"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
-                    <th class="responsive-hidden" @click="sort('chdate')" :class="sortClasses('chdate')">
-                        <a href="#" @click.prevent>
+                    <th class="responsive-hidden"
+                        @click="sort('chdate')"
+                        :class="sortClasses('chdate')">
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettext('Nach Datum sortieren')">
                             {{ $gettext('Datum') }}
                         </a>
+                        <span v-if="sortedBy === 'chdate'"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
                     <th v-for="(name, index) in additionalColumns"
                         :key="index"
                         @click="sort(index)"
                         class="responsive-hidden"
                         :class="sortClasses(index)">
-                        <a href="#" @click.prevent>
+                        <a href="#"
+                           @click.prevent
+                           :title="$gettextInterpolate($gettext('Nach %{ colName } sortieren'), {colName: name})">
                             {{name}}
                         </a>
-
+                        <span v-if="sortedBy === name"
+                              role="img"
+                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :aria-label="sortDirection === 'asc'
+                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
+                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                        </span>
                     </th>
                     <th class="actions" data-sort="false">{{ $gettext('Aktionen') }}</th>
                 </tr>
@@ -120,12 +195,17 @@
                         ></studip-proxied-checkbox>
                     </td>
                     <td class="document-icon">
-                        <a :href="folder.url" :id="`folder-${folder.id}`">
-                            <studip-icon :shape="folder.icon" :size="26" class="text-bottom"></studip-icon>
+                        <a :href="folder.url"
+                           :id="`folder-${folder.id}`"
+                           :title="$gettextInterpolate($gettext('Ordner %{foldername} öffnen'),
+                           { foldername: folder.name})">
+                            <studip-icon :shape="folder.icon" :size="26" class="text-bottom" alt=""></studip-icon>
                         </a>
                     </td>
                     <td :class="{'filter-match': valueMatchesFilter(folder.name)}">
-                        <a :href="folder.url">
+                        <a :href="folder.url"
+                           :title="$gettextInterpolate($gettext('Ordner %{foldername} öffnen'),
+                           { foldername: folder.name})">
                             <span v-html="highlightString(folder.name)"></span>
                         </a>
                     </td>
@@ -172,7 +252,11 @@
                         ></studip-proxied-checkbox>
                     </td>
                     <td class="document-icon">
-                        <a v-if="file.download_url" :href="file.download_url" target="_blank" rel="noopener noreferrer">
+                        <a v-if="file.download_url"
+                           :href="file.download_url"
+                           target="_blank" rel="noopener noreferrer"
+                           :title="$gettextInterpolate($gettext('Datei %{filename} herunterladen'),
+                            { filename: file.name })">
                             <studip-icon :shape="file.icon" :size="24" class="text-bottom"></studip-icon>
                         </a>
                         <studip-icon v-else :shape="file.icon" :size="24"></studip-icon>
@@ -180,10 +264,16 @@
                         <a :href="file.download_url"
                            v-if="file.download_url && file.mime_type.indexOf('image/') === 0"
                            class="lightbox-image"
-                           data-lightbox="gallery"></a>
+                           data-lightbox="gallery"
+                           :title="$gettextInterpolate($gettext('Datei %{filename} anzeigen'),
+                            { filename: file.name })"></a>
                     </td>
                     <td :class="{'filter-match': valueMatchesFilter(file.name)}">
-                        <a :href="file.details_url" data-dialog :id="`file-${file.id}`">
+                        <a :href="file.details_url"
+                           data-dialog
+                           :id="`file-${file.id}`"
+                           :title="$gettextInterpolate($gettext('Details zur Datei %{filename} anzeigen'),
+                            { filename: file.name })">
                             <span v-html="highlightString(file.name)"></span>
                             <studip-icon v-if="file.isAccessible"
                                          shape="accessibility"
-- 
cgit v1.0


From ec645615ce5e29469fda57d689bb6b5c3f7c0b65 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 23 Apr 2024 09:47:35 +0000
Subject: fixes #4062

Closes #4062

Merge request studip/studip!2908
---
 app/controllers/shared/log_event.php | 4 ++--
 lib/classes/EventLog.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/shared/log_event.php b/app/controllers/shared/log_event.php
index 0355e45..3d8af7e 100644
--- a/app/controllers/shared/log_event.php
+++ b/app/controllers/shared/log_event.php
@@ -122,12 +122,12 @@ class Shared_LogEventController extends MVVController
                     $search_action .= " AND `log_actions`.`name` LIKE CONCAT('%_'," . DBManager::get()->quote($log_action) . ")";
                 }
 
-                $statement = DBManager::get()->prepare("SELECT *, `log_actions`.`name`
+                $statement = DBManager::get()->prepare("SELECT *
                         FROM `log_events`
                         LEFT JOIN `log_actions` ON `log_events`.`action_id` =  `log_actions`.`action_id`
                         WHERE `info` = ?
                         " . $search_action . "
-                        ORDER BY `log_events`.`mkdate` DESC");
+                        ORDER BY `log_events`.`event_id` DESC");
                 $statement->execute([$mvv_field]);
                 $res = $statement->fetchOne();
                 if ($res) {
diff --git a/lib/classes/EventLog.php b/lib/classes/EventLog.php
index 7336415..b20b997 100644
--- a/lib/classes/EventLog.php
+++ b/lib/classes/EventLog.php
@@ -87,7 +87,7 @@ class EventLog
         $offset = (int) $offset;
 
         $filter  = $this->sql_event_filter($action_id, $object_id, $parameters) ?: '1';
-        $filter .= " ORDER BY mkdate DESC, event_id DESC LIMIT {$offset}, 50";
+        $filter .= " ORDER BY event_id DESC LIMIT {$offset}, 50";
         $log_events = LogEvent::findBySQL($filter, $parameters);
         $events = [];
 
-- 
cgit v1.0


From 014efac042a9baaa92021656e759fd6e990cd0f0 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 23 Apr 2024 10:12:08 +0000
Subject: =?UTF-8?q?Resolve=20"Dialogtitel=20sind=20nicht=20als=20=C3=9Cber?=
 =?UTF-8?q?schrift=20gekennzeichnet=20und=20nicht=20modal"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4038

Merge request studip/studip!2891
---
 resources/assets/javascripts/lib/dialog.js | 7 ++++++-
 resources/vue/components/StudipDialog.vue  | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/assets/javascripts/lib/dialog.js b/resources/assets/javascripts/lib/dialog.js
index b5cab54..8f6e50a 100644
--- a/resources/assets/javascripts/lib/dialog.js
+++ b/resources/assets/javascripts/lib/dialog.js
@@ -386,7 +386,12 @@ Dialog.show = function(content, options = {}) {
                     .before(element);
             }
 
-            $(this).parent().find('.ui-dialog-title').attr('title', options.title);
+            $(this).parent().find('.ui-dialog-title').attr({
+                title: options.title,
+                role: 'heading',
+                'aria-level': 2
+            });
+            $(this).parents('.studip-dialog').attr('aria-modal', 'true');
 
             instance.open = true;
             // Execute scripts
diff --git a/resources/vue/components/StudipDialog.vue b/resources/vue/components/StudipDialog.vue
index 0edd3c5..79337f8 100644
--- a/resources/vue/components/StudipDialog.vue
+++ b/resources/vue/components/StudipDialog.vue
@@ -38,7 +38,11 @@
                                 <header
                                     class="studip-dialog-header"
                                 >
-                                    <span :id="dialogTitleId" class="studip-dialog-title" :title="dialogTitle">
+                                    <span :id="dialogTitleId"
+                                          class="studip-dialog-title"
+                                          :title="dialogTitle"
+                                          role="heading"
+                                          aria-level="2">
                                         {{ dialogTitle }}
                                     </span>
                                     <slot name="dialogHeader"></slot>
-- 
cgit v1.0


From aa0ae8cd0421b1666af84148064b97cab0d2c5a9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 23 Apr 2024 11:15:14 +0000
Subject: fix regression from 83773002, fixes #4030

Closes #4030

Merge request studip/studip!2911
---
 app/controllers/course/timesrooms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index 1f0ab17..ddd6883 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -1486,7 +1486,7 @@ class Course_TimesroomsController extends AuthenticatedController
         Sidebar::Get()->addWidget($widget);
 
 
-        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course->id)) {
             $widget = new CourseManagementSelectWidget();
             Sidebar::get()->addWidget($widget);
         }
-- 
cgit v1.0


From 3d4b1124bbbb07ffb9e656432f7a6a971d207897 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 23 Apr 2024 11:49:14 +0000
Subject: set user_id or group_id when calling calendar/date/add from sidebar, 
 fixes #4058

Closes #4058

Merge request studip/studip!2910
---
 app/controllers/calendar/calendar.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index 85b5b43..0c24a80 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -12,8 +12,12 @@ class Calendar_CalendarController extends AuthenticatedController
     }
 
 
-    protected function buildSidebar($schedule = false)
-    {
+    protected function buildSidebar(
+        bool $schedule = false,
+        string $user_id = '',
+        string $group_id = ''
+    ) {
+
         $sidebar = Sidebar::get();
 
         $actions = new ActionsWidget();
@@ -25,9 +29,15 @@ class Calendar_CalendarController extends AuthenticatedController
                 ['data-dialog' => 'size=default']
             );
         } else {
+            $params = [];
+            if ($user_id) {
+                $params['user_id'] = $user_id;
+            } elseif ($group_id) {
+                $params['group_id'] = $group_id;
+            }
             $actions->addLink(
                 _('Termin anlegen'),
-                $this->url_for('calendar/date/add'),
+                $this->url_for('calendar/date/add', $params),
                 Icon::create('add'),
                 ['data-dialog' => 'size=auto']
             );
@@ -181,7 +191,11 @@ class Calendar_CalendarController extends AuthenticatedController
             throw new AccessDeniedException(_('Sie dürfen diesen Kalender nicht sehen!'));
         }
 
-        $this->buildSidebar(false);
+        $this->buildSidebar(
+            false,
+            $calendar_owner ? $calendar_owner->id : '',
+            $selected_group ? $selected_group->id : ''
+        );
 
         $sidebar = Sidebar::get();
 
-- 
cgit v1.0


From 73482db31db6f82a66b210ce6dc346742720eecf Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 23 Apr 2024 14:45:07 +0000
Subject: fix for BIESt 4009, fixes #4009

Closes #4009

Merge request studip/studip!2865
---
 app/views/file/_terms_of_use_select.php      | 22 +++++++++++-----------
 app/views/file/new_edit_folder_form.php      | 17 ++++++++---------
 resources/assets/stylesheets/scss/files.scss |  9 +++++----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/views/file/_terms_of_use_select.php b/app/views/file/_terms_of_use_select.php
index 59cb507..c1aae00 100644
--- a/app/views/file/_terms_of_use_select.php
+++ b/app/views/file/_terms_of_use_select.php
@@ -24,20 +24,20 @@ if (!$selected_terms_of_use_id) {
                aria-description="<?= htmlReady(kill_format($content_terms_of_use_entry->description)) ?>">
 
         <label for="content_terms_of_use-<?= htmlReady($content_terms_of_use_entry->id) ?>">
-            <div class="icon">
-            <? if ($content_terms_of_use_entry['icon']) : ?>
-                <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?>
-                    <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32">
-                <? else : ?>
-                    <?= Icon::create($content_terms_of_use_entry['icon'], Icon::ROLE_CLICKABLE)->asImg(32) ?>
-                <? endif ?>
-            <? endif ?>
-            </div>
+            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($content_terms_of_use_entry->name) ?>
             </div>
-            <?= Icon::create('arr_1down', Icon::ROLE_CLICKABLE)->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('check-circle', Icon::ROLE_CLICKABLE)->asImg(32, ['class' => 'check']) ?>
+            <div class="icon">
+                <? if ($content_terms_of_use_entry['icon']) : ?>
+                    <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?>
+                        <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32">
+                    <? else : ?>
+                        <?= Icon::create($content_terms_of_use_entry['icon'], Icon::ROLE_CLICKABLE)->asImg(32) ?>
+                    <? endif ?>
+                <? endif ?>
+            </div>
         </label>
 
         <? if (trim($content_terms_of_use_entry->description)): ?>
diff --git a/app/views/file/new_edit_folder_form.php b/app/views/file/new_edit_folder_form.php
index c1301d4..d2dd931 100644
--- a/app/views/file/new_edit_folder_form.php
+++ b/app/views/file/new_edit_folder_form.php
@@ -27,20 +27,19 @@
                id="folder-type-<?= htmlReady($folder_type['class']) ?>"
                <? if ($folder_type['class'] === get_class($folder)) echo 'checked'; ?>>
         <label for="folder-type-<?= htmlReady($folder_type['class']) ?>">
-            <div class="icon">
-                <? if ($folder_type['icon']) : ?>
-                    <?= $folder_type['icon']->asImg(32) ?>
-                <? endif ?>
-            </div>
+            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($folder_type['name']) ?>
             <? if ($template = $folder_type['instance']->getDescriptionTemplate()): ?>
                 <?= tooltipIcon($template instanceof Flexi_Template ? $template->render() : $template, false, true) ?>
-            <? endif; ?>
-
+            <? endif ?>
+            </div>
+            <div class="icon">
+                <? if ($folder_type['icon']) : ?>
+                    <?= $folder_type['icon']->asImg(32) ?>
+                <? endif ?>
             </div>
-            <?= Icon::create('arr_1down')->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('check-circle')->asImg(32, ['class' => 'check']) ?>
         </label>
         <? if ($folder_type['class'] === get_class($folder)) : ?>
             <? $folder_template = $folder->getEditTemplate() ?>
diff --git a/resources/assets/stylesheets/scss/files.scss b/resources/assets/stylesheets/scss/files.scss
index 7808f15..a75f8f3 100644
--- a/resources/assets/stylesheets/scss/files.scss
+++ b/resources/assets/stylesheets/scss/files.scss
@@ -406,19 +406,20 @@ form.default {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            padding: 6px 6px 2px;
+            padding: 0 10px 0;
             margin-bottom: 0;
             border-top: none;
             > .text {
                 width: 100%;
                 margin-left: 10px;
             }
-            > .arrow {
-                margin-right: 5px;
-            }
             > .check {
                 display: none;
             }
+
+            > .icon {
+                margin-top: 6px;
+            }
         }
         > label:first-of-type {
             border-top: 1px solid var(--content-color-40);
-- 
cgit v1.0


From a63417001fc9ca48709deff439d7f974fd2a0570 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 23 Apr 2024 15:14:59 +0000
Subject: prevent php-warnings, fixes #4063

Closes #4063

Merge request studip/studip!2909
---
 lib/classes/InstituteCalendarHelper.class.php | 40 ++++++++++++---------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/lib/classes/InstituteCalendarHelper.class.php b/lib/classes/InstituteCalendarHelper.class.php
index 9412a34..4302cf1 100644
--- a/lib/classes/InstituteCalendarHelper.class.php
+++ b/lib/classes/InstituteCalendarHelper.class.php
@@ -43,14 +43,6 @@ class InstituteCalendarHelper
      */
     public static function getResourceColumns($institut_id, $only_visible = false)
     {
-        /*
-        returns the columns in following format:
-            $columns = [
-                ['id' => '0', 'title' => 'Sammelspalte'],
-                ['id' => '1', 'title' => 'Spalte 1']
-            ];
-        */
-
         $columns = [];
         $inst_columns = [
             0 => ['Sammelspalte', 1]
@@ -206,13 +198,13 @@ class InstituteCalendarHelper
     /**
      * Looks up default color value for institute course events
      *
-     * @param Course $course
+     * @param SimpleORMap $context
      *
      * @return array course events with color value
      */
-    public static function getInstituteDefaultEventcolors($institut)
+    public static function getInstituteDefaultEventcolors($context)
     {
-        $df = DatafieldEntryModel::findByModel($institut, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
+        $df = DatafieldEntryModel::findByModel($context, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
         if ($df && $df[0]->content) {
             $event_colors = unserialize($df[0]->content);
         } else {
@@ -224,17 +216,17 @@ class InstituteCalendarHelper
     /**
      * Sets default institute course events color value for semtypes
      *
-     * @param Institut $institut
+     * @param SimpleORMap $context
      * @param string $semtype
      * @param string $color colorcode
      *
      * @return bool stored
      */
-    public static function setInstituteDefaultEventcolor($institut, $semtype, $color)
+    public static function setInstituteDefaultEventcolor($context, $semtype, $color)
     {
-        $df = DatafieldEntryModel::findByModel($institut, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
+        $df = DatafieldEntryModel::findByModel($context, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
         if ($df[0]) {
-            $event_colors = self::getInstituteDefaultEventcolors($institut);
+            $event_colors = self::getInstituteDefaultEventcolors($context);
             $event_colors[$semtype['name']] = $color;
             $df[0]->content = serialize($event_colors);
             return $df[0]->store();
@@ -317,7 +309,6 @@ class InstituteCalendarHelper
      */
     public static function getEvents($courses, $institut_id, $semester = null, $specific_weekday = null)
     {
-        $events = [];
         $today = date('w');
 
         $user_insts = array_map(function ($arr) {
@@ -330,9 +321,15 @@ class InstituteCalendarHelper
         $maxbigtime = (int) $max_time[0];
 
         $institut = Institute::find($institut_id);
+
+        if (!$institut) {
+            return [];
+        }
+
         $inst_default_colors = self::getInstituteDefaultEventcolors($institut);
 
-        Course::findAndMapMany(function ($course) use (
+        $events = [];
+        Course::findEachMany(function ($course) use (
             $courses,
             &$events,
             $today,
@@ -418,8 +415,8 @@ class InstituteCalendarHelper
                     }
                     if (!$backgroundcolor) {
                         $backgroundcolor = array_key_exists($semtype['name'], $inst_default_colors)
-                                         ? $inst_default_colors[$semtype['name']]
-                                         : self::DEFAULT_EVENT_COLOR;
+                            ? $inst_default_colors[$semtype['name']]
+                            : self::DEFAULT_EVENT_COLOR;
                     }
 
                     $textcolor = '#ffffff';
@@ -472,7 +469,7 @@ class InstituteCalendarHelper
      * @param SeminarCycleDate $cycle_date
      * @param string $institut_id
      *
-     * @return string enriched course info string for tooltip
+     * @return array enriched course info string for tooltip
      */
     public static function getCycleEvent($cycle_date, $institut_id)
     {
@@ -594,9 +591,8 @@ class InstituteCalendarHelper
      */
     private static function getCycleInfos($course, $cycle_date)
     {
-        $info_string = '';
 
-        $info_string .= $course->getFullName('number-name') . "\n";
+        $info_string = $course->getFullName('number-name') . "\n";
 
         $dozenten = [];
         foreach (CourseMember::findByCourseAndStatus($course->id, 'dozent') as $cmember) {
-- 
cgit v1.0


From d7d545c1089cbe0d676a3e1af1ef64f891d271b1 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 24 Apr 2024 09:59:16 +0000
Subject: =?UTF-8?q?Resolve=20"Meine=20Veranstaltungen:=20Fehlende=20Textal?=
 =?UTF-8?q?ternativen=20f=C3=BCr=20die=20angezeigte=20Farbgruppierung"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4036

Merge request studip/studip!2892
---
 resources/vue/components/MyCoursesTables.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/resources/vue/components/MyCoursesTables.vue b/resources/vue/components/MyCoursesTables.vue
index 80d04dd..1c39d95 100644
--- a/resources/vue/components/MyCoursesTables.vue
+++ b/resources/vue/components/MyCoursesTables.vue
@@ -12,7 +12,11 @@
             </colgroup>
             <thead>
                 <tr class="sortable">
-                    <th></th>
+                    <th>
+                        <span class="sr-only">
+                            {{ $gettext('Zugeordnete Farbgruppe') }}
+                        </span>
+                    </th>
                     <th></th>
                     <th v-if="getConfig('sem_number') && !responsiveDisplay" :class="getOrderClasses('number')">
                         <a href="#" @click.prevent="changeOrder('number')">
@@ -37,7 +41,14 @@
                     <th v-if="!responsiveDisplay" class="dont-hide" colspan="2"></th>
                 </tr>
                 <tr v-for="course in getOrderedCourses(subgroup.ids)" :data-course-id="course.id" :class="getCourseClasses(course)" :key="course.id">
-                    <td :class="`gruppe${course.group}`"></td>
+                    <td :class="`gruppe${course.group}`">
+                        <span class="sr-only">
+                            {{ $gettextInterpolate(
+                                $gettext('Diese Veranstaltung gehört zur Farbgruppe %{group}'),
+                                course
+                            ) }}
+                        </span>
+                    </td>
                     <td :class="{'subcourse-indented': isChild(course)}">
                         <span :style="{backgroundImage: `url(${course.avatar}`}" class="my-courses-avatar course-avatar-small" :title="course.name" alt=""></span>
                     </td>
-- 
cgit v1.0


From b3b65cfb5a56137156556f26e67cd5c6c6206bae Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 24 Apr 2024 10:01:25 +0000
Subject: =?UTF-8?q?Resolve=20"Fehlende=20aria-Informationen=20f=C3=BCr=20W?=
 =?UTF-8?q?arndialoge=20und=20fehlerhafte=20Aria-Sortierinformation=20f?=
 =?UTF-8?q?=C3=BCr=20Tabellen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4064

Merge request studip/studip!2912
---
 resources/vue/components/FilesTable.vue | 75 +++++++++++++++++++++------------
 templates/shared/question-box.php       | 11 +++--
 2 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index 389e5d1..2a0a15a 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -52,7 +52,9 @@
                         ></studip-proxy-checkbox>
                     </th>
                     <th @click="sort('mime_type')"
-                        :class="sortClasses('mime_type')">
+                        :class="sortClasses('mime_type')"
+                        :aria-sort="getAriaSortString('mime_type')"
+                        :aria-labelledby="sortedBy === 'mime_type' ? 'sort-indicator-mime_type' : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Typ sortieren')">
@@ -60,14 +62,16 @@
                         </a>
                         <span v-if="sortedBy === 'mime_type'"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              id="sort-indicator-mime_type"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird abfsteigend nach dieser Spalte sortiert.')">
+                                ? $gettext('Es wird aufsteigend nach der Spalte Typ sortiert.')
+                                : $gettext('Es wird absteigend nach der Spalte Typ sortiert.')">
                         </span>
                     </th>
                     <th @click="sort('name')"
-                        :class="sortClasses('name')">
+                        :class="sortClasses('name')"
+                        :aria-sort="getAriaSortString('name')"
+                        :aria-labelledby="sortedBy === 'name' ? 'sort-indicator-name' : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Name sortieren')">
@@ -75,15 +79,17 @@
                         </a>
                         <span v-if="sortedBy === 'name'"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              id="sort-indicator-name"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                                ? $gettext('Es wird aufsteigend nach der Spalte Name sortiert.')
+                                : $gettext('Es wird absteigend nach der Spalte Name sortiert.')">
                         </span>
                     </th>
                     <th @click="sort('size')"
                         class="responsive-hidden"
-                        :class="sortClasses('size')">
+                        :class="sortClasses('size')"
+                        :aria-sort="getAriaSortString('size')"
+                        :aria-labelledby="sortedBy === 'size' ? 'sort-indicator-size' : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Größe sortieren')">
@@ -91,16 +97,18 @@
                         </a>
                         <span v-if="sortedBy === 'size'"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              id="sort-indicator-size"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                                ? $gettext('Es wird aufsteigend nach der Spalte Größe sortiert.')
+                                : $gettext('Es wird absteigend nach der Spalte Größe sortiert.')">
                         </span>
                     </th>
                     <th v-if="showdownloads"
                         @click="sort('downloads')"
                         class="responsive-hidden"
-                        :class="sortClasses('downloads')">
+                        :class="sortClasses('downloads')"
+                        :aria-sort="getAriaSortString('downloads')"
+                        :aria-labelledby="sortedBy === 'downloads' ? 'sort-indicator-downloads' : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Downloads sortieren')">
@@ -108,15 +116,17 @@
                         </a>
                         <span v-if="sortedBy === 'downloads'"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              id="sort-indicator-downloads"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                                ? $gettext('Es wird aufsteigend nach der Spalte Downloads sortiert.')
+                                : $gettext('Es wird absteigend nach der Spalte Downloads sortiert.')">
                         </span>
                     </th>
                     <th class="responsive-hidden"
                         @click="sort('author_name')"
-                        :class="sortClasses('author_name')">
+                        :class="sortClasses('author_name')"
+                        :aria-sort="getAriaSortString('author_name')"
+                        :aria-labelledby="sortedBy === 'author_name' ? 'sort-indicator-author_name' : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Autor/-in sortieren')">
@@ -124,15 +134,17 @@
                         </a>
                         <span v-if="sortedBy === 'author_name'"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              id="sort-indicator-author_name"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                                ? $gettext('Es wird aufsteigend nach der Spalte Autor-/in sortiert.')
+                                : $gettext('Es wird absteigend nach der Spalte Autor-/in sortiert.')">
                         </span>
                     </th>
                     <th class="responsive-hidden"
                         @click="sort('chdate')"
-                        :class="sortClasses('chdate')">
+                        :class="sortClasses('chdate')"
+                        :aria-sort="getAriaSortString('chdate')"
+                        :aria-labelledby="sortedBy === 'chdate' ? 'sort-indicator-chdate' : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Datum sortieren')">
@@ -140,17 +152,19 @@
                         </a>
                         <span v-if="sortedBy === 'chdate'"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              id="sort-indicator-chdate"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                                ? $gettext('Es wird aufsteigend nach der Spalte Datum sortiert.')
+                                : $gettext('Es wird absteigend nach der Spalte Datum sortiert.')">
                         </span>
                     </th>
                     <th v-for="(name, index) in additionalColumns"
                         :key="index"
                         @click="sort(index)"
                         class="responsive-hidden"
-                        :class="sortClasses(index)">
+                        :class="sortClasses(index)"
+                        :aria-sort="getAriaSortString(name)"
+                        :aria-labelledby="sortedBy === name ? 'sort-indicator-' + name : null">
                         <a href="#"
                            @click.prevent
                            :title="$gettextInterpolate($gettext('Nach %{ colName } sortieren'), {colName: name})">
@@ -158,10 +172,10 @@
                         </a>
                         <span v-if="sortedBy === name"
                               role="img"
-                              :aria-sort="sortDirection === 'asc' ? 'ascending' : 'descending'"
+                              :id="'sort-indicator-' + name"
                               :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach dieser Spalte sortiert.')
-                                : $gettext('Es wird absteigend nach dieser Spalte sortiert.')">
+                                ? $gettextInterpolate($gettext('Es wird aufsteigend nach der Spalte %{colName} sortiert.'), {colName: name})
+                                : $gettextInterpolate($gettext('Es wird absteigend nach der Spalte %{colName} sortiert.'), {colName: name})">
                         </span>
                     </th>
                     <th class="actions" data-sort="false">{{ $gettext('Aktionen') }}</th>
@@ -495,6 +509,11 @@ export default {
                 this.$gettext('Datei %{name} auswählen'),
                 {name: file.name}
             );
+        },
+        getAriaSortString(column) {
+            return column === this.sortedBy
+                ? (this.sortDirection === 'asc' ? 'ascending' : 'descending')
+                : null;
         }
     },
     computed: {
diff --git a/templates/shared/question-box.php b/templates/shared/question-box.php
index 40535c5..5bf1dcd 100644
--- a/templates/shared/question-box.php
+++ b/templates/shared/question-box.php
@@ -1,5 +1,7 @@
 <div class="modaloverlay">
-    <div class="ui-dialog ui-corner-all ui-widget ui-widget-content ui-front ui-dialog-buttons studip-confirmation">
+    <div class="ui-dialog ui-corner-all ui-widget ui-widget-content ui-front ui-dialog-buttons studip-confirmation"
+         role="alertdialog" aria-labelledBy="studip-confirmation-title-1" aria-describedby="studip-confirmation-desc-1"
+         modal="true">
         <form action="<?= URLHelper::getLink($accept_url) ?>" method="post">
             <?= CSRFProtection::tokenTag() ?>
         <? foreach ($accept_parameters as $key => $value): ?>
@@ -7,13 +9,16 @@
         <? endforeach; ?>
 
             <div class="ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix">
-                <span class="ui-dialog-title"><?= _('Bitte bestätigen Sie die Aktion') ?></span>
+                <span class="ui-dialog-title" id="studip-confirmation-title-1">
+                    <?= _('Bitte bestätigen Sie die Aktion') ?>
+                </span>
                 <a href="<?= URLHelper::getLink($decline_url, $decline_parameters) ?>" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-icon-only ui-dialog-titlebar-close">
                     <span class="ui-button-icon-primary ui-icon ui-icon-closethick"></span>
                     <span class="ui-button-text"><?= _('Schliessen') ?></span>
                 </a>
             </div>
-            <div class="content ui-widget-content ui-dialog-content studip-confirmation">
+            <div class="content ui-widget-content ui-dialog-content studip-confirmation"
+                 id="studip-confirmation-desc-1" role="heading" aria-level="2">
                 <?= $question ?>
             </div>
             <div class="buttons ui-widget-content ui-dialog-buttonpane">
-- 
cgit v1.0


From c38b0da4de0ba9d347db82b9f18381815f84e912 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 24 Apr 2024 10:13:20 +0000
Subject: fixes #4065

Closes #4065

Merge request studip/studip!2915
---
 lib/navigation/ResourceNavigation.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/navigation/ResourceNavigation.php b/lib/navigation/ResourceNavigation.php
index 17ca4be..02c2b40 100644
--- a/lib/navigation/ResourceNavigation.php
+++ b/lib/navigation/ResourceNavigation.php
@@ -30,14 +30,16 @@ class ResourceNavigation extends Navigation
 
     public function initItem()
     {
+        parent::initItem();;
+
         $user = User::findCurrent();
-        if (ResourceManager::userHasGlobalPermission($user, 'user')) {
+        if (ResourceManager::userHasGlobalPermission($user)) {
             $this->setURL('dispatch.php/room_management/overview/index');
         } else {
             $this->setURL('dispatch.php/room_management/overview/rooms');
         }
         $this->setImage(
-            Icon::create('resources', 'navigation', ['title' => _('Raumverwaltung')])
+            Icon::create('resources', Icon::ROLE_NAVIGATION, ['title' => _('Raumverwaltung')])
         );
     }
 
-- 
cgit v1.0


From 401a3ed23c8c9582079bee51e0c699d7b1664244 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 24 Apr 2024 10:34:08 +0000
Subject: fix other regressions from  83773002, re #4030

Merge request studip/studip!2916
---
 app/controllers/course/grouping.php | 2 +-
 app/controllers/questionnaire.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/course/grouping.php b/app/controllers/course/grouping.php
index 1729d99..3cef673 100644
--- a/app/controllers/course/grouping.php
+++ b/app/controllers/course/grouping.php
@@ -37,7 +37,7 @@ class Course_GroupingController extends AuthenticatedController
             throw new AccessDeniedException(_('Sie haben leider nicht die notwendige Berechtigung für diese Aktion.'));
         }
 
-        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course->id)) {
             $widget = new CourseManagementSelectWidget();
             Sidebar::get()->addWidget($widget);
         }
diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index 2da457c..fe2ed3a 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -54,7 +54,7 @@ class QuestionnaireController extends AuthenticatedController
         }
 
         Navigation::activateItem("/course/admin/questionnaires");
-        if ($GLOBALS['perm']->have_studip_perm('admin', $this->course_id)) {
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->range_id)) {
             // Ensure the select widget is added last
             NotificationCenter::on('SidebarWillRender', function () {
                 $widget = new CourseManagementSelectWidget();
-- 
cgit v1.0


From 3cee335ad57aa8cd39f55a6fcdb750d801d06530 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 24 Apr 2024 12:46:18 +0000
Subject: =?UTF-8?q?Resolve=20"article.studip=20und=20fieldsets=20kennzeich?=
 =?UTF-8?q?nen=20nicht=20ihren=20auf-/zugeklappten=20Zustand=20f=C3=BCr=20?=
 =?UTF-8?q?Screenreader=20mit=20aria-expanded"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4040

Merge request studip/studip!2914
---
 app/views/course/basicdata/view.php                        | 12 ++++++++----
 resources/assets/javascripts/bootstrap/application.js      |  1 +
 resources/assets/javascripts/bootstrap/article.js          |  1 +
 resources/assets/javascripts/bootstrap/contentbox.js       |  1 +
 resources/assets/javascripts/lib/personal_notifications.js |  5 +++++
 templates/header.php                                       |  3 ++-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/views/course/basicdata/view.php b/app/views/course/basicdata/view.php
index 9f7b5b3..380fdb4 100644
--- a/app/views/course/basicdata/view.php
+++ b/app/views/course/basicdata/view.php
@@ -24,7 +24,8 @@ $message_types = ['msg' => "success", 'error' => "error", 'info' => "info"];
     <?= CSRFProtection::tokenTag() ?>
     <input id="open_variable" type="hidden" name="open" value="<?= $flash['open'] ?>">
     <?= Studip\Button::createAccept(_('Speichern'), 'store', ['style' => 'display: none;']) ?>
-    <fieldset <?= isset($flash['open']) && $flash['open'] != 'bd_basicsettings' ? 'class="collapsed"' : ''?> data-open="bd_basicsettings">
+    <fieldset <?= isset($flash['open']) && $flash['open'] != 'bd_basicsettings' ? 'class="collapsed"' : ''?> data-open="bd_basicsettings"
+            aria-expanded="<?= isset($flash['open']) && $flash['open'] === 'bd_basicsettings' ? 'true' : 'false' ?>">
         <legend><?= _('Grundeinstellungen') ?></legend>
 
 <? if (!$attributes): ?>
@@ -55,7 +56,8 @@ $message_types = ['msg' => "success", 'error' => "error", 'info' => "info"];
         </label>
     </fieldset>
 
-    <fieldset <?= !isset($flash['open']) || $flash['open'] != 'inset' ? 'class="collapsed"' : ''?> data-open="bd_inst">
+    <fieldset <?= !isset($flash['open']) || $flash['open'] != 'inset' ? 'class="collapsed"' : ''?> data-open="bd_inst"
+            aria-expanded="<?= isset($flash['open']) && $flash['open'] === 'inset' ? 'true' : 'false' ?>">
         <legend><?= _('Einrichtungen') ?></legend>
 
 <? if (!$institutional): ?>
@@ -78,7 +80,8 @@ $message_types = ['msg' => "success", 'error' => "error", 'info' => "info"];
 <? endif; ?>
     </fieldset>
 
-    <fieldset <?= !isset($flash['open']) || $flash['open'] != 'bd_personal' ? 'class="collapsed"' : ''?>>
+    <fieldset <?= !isset($flash['open']) || $flash['open'] != 'bd_personal' ? 'class="collapsed"' : ''?>
+        aria-expanded="<?= isset($flash['open']) && $flash['open'] === 'bd_personal' ? 'true' : 'false' ?>">
         <legend><?= _('Personal') ?></legend>
 
         <table class="default">
@@ -293,7 +296,8 @@ $message_types = ['msg' => "success", 'error' => "error", 'info' => "info"];
             </tbody>
         </table>
     </fieldset>
-    <fieldset <?= !isset($flash['open']) || $flash['open'] != 'bd_description' ? 'class="collapsed"' : ''?> data-open="bd_description">
+    <fieldset <?= !isset($flash['open']) || $flash['open'] != 'bd_description' ? 'class="collapsed"' : ''?> data-open="bd_description"
+            aria-expanded="<?= isset($flash['open']) && $flash['open'] === 'bd_description' ? 'true' : 'false' ?>">
         <legend><?= _('Weitere Angaben') ?></legend>
 
 <? if (!$descriptions): ?>
diff --git a/resources/assets/javascripts/bootstrap/application.js b/resources/assets/javascripts/bootstrap/application.js
index a9f53df..4ad248f 100644
--- a/resources/assets/javascripts/bootstrap/application.js
+++ b/resources/assets/javascripts/bootstrap/application.js
@@ -353,6 +353,7 @@ jQuery(document).on('click', 'a[data-behaviour~="ajax-toggle"]', function (event
 (function ($) {
     $(document).on('click', 'form[name=course-details] fieldset legend', function () {
         $('#open_variable').attr('value', $(this).parent('fieldset').data('open'));
+        $(this).parent('fieldset').attr('aria-expanded',  $(this).parent('fieldset').attr('aria-expanded') == 'true' ? 'false' : 'true');
     });
 }(jQuery));
 
diff --git a/resources/assets/javascripts/bootstrap/article.js b/resources/assets/javascripts/bootstrap/article.js
index fbfc131..04316f5 100644
--- a/resources/assets/javascripts/bootstrap/article.js
+++ b/resources/assets/javascripts/bootstrap/article.js
@@ -13,6 +13,7 @@
 
         // Open the contentbox
         article.toggleClass('open').removeClass('new');
+        article.attr('aria-expanded', article.attr('aria-expanded') === 'true' ? 'false' : 'true');
     });
 
     // Open closed article contents when location hash matches
diff --git a/resources/assets/javascripts/bootstrap/contentbox.js b/resources/assets/javascripts/bootstrap/contentbox.js
index 42c5df1..3f05331 100644
--- a/resources/assets/javascripts/bootstrap/contentbox.js
+++ b/resources/assets/javascripts/bootstrap/contentbox.js
@@ -13,5 +13,6 @@ $(document).on('click', 'section.contentbox article header h1 a', function(e) {
 
         // Open the contentbox
         article.toggleClass('open').removeClass('new');
+        article.attr('aria-expanded', article.attr('aria-expanded') === 'true' ? 'false' : 'true');
     }
 });
diff --git a/resources/assets/javascripts/lib/personal_notifications.js b/resources/assets/javascripts/lib/personal_notifications.js
index 90f1053..392e8b0 100644
--- a/resources/assets/javascripts/lib/personal_notifications.js
+++ b/resources/assets/javascripts/lib/personal_notifications.js
@@ -116,6 +116,11 @@ const PersonalNotifications = {
                     .click(STUDIP.PersonalNotifications.activate);
             }
         }
+
+        // Special handling for personal notifications:
+        $('#notification-container').on('mouseover mouseout', function (event) {
+            $(this).attr('aria-expanded', $(this).attr('aria-expanded') === 'true' ? 'false' : 'true');
+        });
     },
     activate () {
         Promise.resolve(Notification.requestPermission()).then(permission => {
diff --git a/templates/header.php b/templates/header.php
index f11b23c..5a935b3 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -141,7 +141,8 @@ if ($navigation) {
                                     ngettext('%u Benachrichtigung', '%u Benachrichtigungen', count($notifications)),
                                     count($notifications)
                                 ) ?>" data-lastvisit="<?= $lastvisit ?>"
-                                <?= count($notifications) == 0 ? 'disabled' : '' ?>>
+                                <?= count($notifications) == 0 ? 'disabled' : '' ?> aria-controls="notification-list"
+                                aria-expanded="false">
                             <span class="count" aria-hidden="true"><?= count($notifications) ?></span>
                         </button>
                         <input type="checkbox" id="notification_checkbox">
-- 
cgit v1.0


From 8d696407e1b3fed3b4bf54951c889ea75290897e Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 24 Apr 2024 13:59:32 +0000
Subject: =?UTF-8?q?Resolve=20"Vertikale=20Ausrichtung=20von=20Text=20wird?=
 =?UTF-8?q?=20nicht=20=C3=BCbernommen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4067

Merge request studip/studip!2917
---
 lib/classes/Markup.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/classes/Markup.class.php b/lib/classes/Markup.class.php
index da040fa..fbde67b 100644
--- a/lib/classes/Markup.class.php
+++ b/lib/classes/Markup.class.php
@@ -363,7 +363,8 @@ class Markup
             'border-color',
             'border-style',
             'float',
-            'border'
+            'border',
+            'vertical-align'
         ]);
         $config->set('CSS.MaxImgLength', null);
 
-- 
cgit v1.0


From 0b282700b7c76784658cb94845361ae72f6a4f26 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 25 Apr 2024 13:39:35 +0000
Subject: fixes #4077

Closes #4077

Merge request studip/studip!2920
---
 app/controllers/course/contentmodules.php | 14 ++++++++++----
 app/views/course/contentmodules/info.php  | 20 +++++---------------
 lib/classes/PluginAdministration.php      | 12 +++++++-----
 lib/models/OERHostOERSI.php               | 21 +++++++++++++--------
 lib/plugins/core/StudIPPlugin.class.php   |  2 +-
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/app/controllers/course/contentmodules.php b/app/controllers/course/contentmodules.php
index 923c61b..df397cd 100644
--- a/app/controllers/course/contentmodules.php
+++ b/app/controllers/course/contentmodules.php
@@ -261,7 +261,12 @@ class Course_ContentmodulesController extends AuthenticatedController
             }
         }
 
-        PageLayout::setTitle(sprintf(_('Informationen über %s'), $this->metadata['displayname']));
+        $this->metadata['icon'] = $this->getIconFromMetadata($this->metadata, $this->plugin);
+
+        PageLayout::setTitle(sprintf(
+            _('Informationen über %s'),
+            $this->metadata['displayname'] ?? $this->plugin->getPluginName()
+        ));
     }
 
     private function getModules(Range $context)
@@ -291,6 +296,7 @@ class Course_ContentmodulesController extends AuthenticatedController
             $visibility = $tool ? $tool->getVisibilityPermission() : 'nobody';
 
             $metadata = $plugin->getMetadata();
+            $icon = $this->getIconFromMetadata($metadata, $plugin);
             $list[$plugin_id] = [
                 'id'             => $plugin_id,
                 'moduleclass'    => get_class($plugin),
@@ -299,7 +305,7 @@ class Course_ContentmodulesController extends AuthenticatedController
                 'displayname'    => $displayname,
                 'visibility'     => $visibility,
                 'active'         => (bool) $tool,
-                'icon'           => $this->getIconFromMetadata($metadata, $plugin),
+                'icon'           => $icon ? $icon->asImagePath() : null,
                 'summary'        => $metadata['summary'] ?? null,
                 'mandatory'      => $this->sem_class->isModuleMandatory(get_class($plugin)),
                 'highlighted'    => (bool) $plugin->isHighlighted(),
@@ -315,7 +321,7 @@ class Course_ContentmodulesController extends AuthenticatedController
      * @param array $metadata
      * @param CorePlugin|StudIPPlugin $plugin
      */
-    private function getIconFromMetadata(array $metadata, $plugin): ?string
+    private function getIconFromMetadata(array $metadata, $plugin): ?Icon
     {
         $icon = $metadata['icon_clickable'] ?? $metadata['icon'] ?? null;
 
@@ -332,7 +338,7 @@ class Course_ContentmodulesController extends AuthenticatedController
             $icon = Icon::create($plugin->getPluginURL() . '/' . $icon);
         }
 
-        return $icon->copyWithRole(Icon::ROLE_CLICKABLE)->asImagePath();
+        return $icon->copyWithRole(Icon::ROLE_CLICKABLE);
     }
 
     private function getCoreIcon(string $path): ?Icon
diff --git a/app/views/course/contentmodules/info.php b/app/views/course/contentmodules/info.php
index 11bf9dc..93d3ad9 100644
--- a/app/views/course/contentmodules/info.php
+++ b/app/views/course/contentmodules/info.php
@@ -5,27 +5,17 @@
         <div class="main_part">
             <div class="header">
                 <div class="image">
-                    <?
-                    if ($metadata['icon']) {
-                        $icon = $metadata['icon'] instanceof Icon
-                            ? $metadata['icon']->asImagePath()
-                            : Icon::create($plugin->getPluginURL().'/'.$metadata['icon'])->asImagePath();
-                    } else {
-                        $icon = null;
-                    }
-                    if ($icon && !is_a($icon, 'Icon')) {
-                        $icon = Icon::create($icon);
-                    }
-                    ?>
-                    <? if ($icon) : ?>
-                        <?= $icon->asImg(100) ?>
-                    <? endif ?>
+                <? if ($metadata['icon']): ?>
+                    <?= $metadata['icon']->copyWithRole(Icon::ROLE_INFO)->asImg(100) ?>
+                <? endif; ?>
                 </div>
                 <div class="text">
                     <h1><?= htmlReady($metadata['displayname'] ?? $plugin->getPluginName()) ?></h1>
+                <? if (!empty($metadata['summary'])): ?>
                     <strong>
                         <?= htmlReady($metadata['summary']) ?>
                     </strong>
+                <? endif; ?>
                 </div>
             </div>
             <div class="content-modules-controls-vue-app" is="ContentModulesControl" module_id="<?= htmlReady($plugin->getPluginId()) ?>"></div>
diff --git a/lib/classes/PluginAdministration.php b/lib/classes/PluginAdministration.php
index 2732f58..8ac5fa8 100644
--- a/lib/classes/PluginAdministration.php
+++ b/lib/classes/PluginAdministration.php
@@ -440,12 +440,14 @@ class PluginAdministration
         // get plugin meta data
         $pluginclass = $manifest['pluginclassname'];
         $origin      = $manifest['origin'];
-        $min_version = $manifest['studipMinVersion'];
-        $max_version = $manifest['studipMaxVersion'];
+        $min_version = $manifest['studipMinVersion'] ?? null;
+        $max_version = $manifest['studipMaxVersion'] ?? null;
 
         // check for compatible version
-        if ((isset($min_version) && StudipVersion::olderThan($min_version)) ||
-            (isset($max_version) && StudipVersion::newerThan($max_version))) {
+        if (
+            (isset($min_version) && StudipVersion::olderThan($min_version))
+            || (isset($max_version) && StudipVersion::newerThan($max_version))
+        ) {
             throw new PluginInstallationException(_('Das Plugin ist mit dieser Stud.IP-Version nicht kompatibel.'));
         }
 
@@ -456,7 +458,7 @@ class PluginAdministration
         $pluginregistered = $plugin_manager->getPluginInfo($pluginclass);
 
         if ($pluginregistered) {
-            new PluginInstallationException(_('Das Plugin ist bereits registriert.'));
+            throw new PluginInstallationException(_('Das Plugin ist bereits registriert.'));
         }
 
         // create database schema if needed
diff --git a/lib/models/OERHostOERSI.php b/lib/models/OERHostOERSI.php
index 52e50d3..5e539bf 100644
--- a/lib/models/OERHostOERSI.php
+++ b/lib/models/OERHostOERSI.php
@@ -76,7 +76,7 @@ class OERHostOERSI extends OERHost
                     $material['difficulty_end'] = 12;
                     $material['uri'] = $material_data['_source']['id'];
                     $material['source_url'] = $material_data['_source']['id'];
-                    $material['content_type'] = $material_data['_source']['encoding'][0]['encodingFormat'] ?: '';
+                    $material['content_type'] = $material_data['_source']['encoding'][0]['encodingFormat'] ?? '';
                     $material['license_identifier'] = $this->getLicenseID($material_data['_source']['license']['id']) ?: '';
                     if (!$material['category']) {
                         $material['category'] = $material->autoDetectCategory();
@@ -86,18 +86,23 @@ class OERHostOERSI extends OERHost
                         'front_image_url' => $material_data['_source']['image'] ?? null,
                         'download' => $material_data['_source']['encoding'][0]['contentUrl'] ?: '',
                         'id' => $material_data['_id'],
-                        'organization' => $material_data['_source']['sourceOrganization'][0]['name'] ?: $material_data['_source']['publisher'][0]['name']
+                        'organization' => $material_data['_source']['sourceOrganization'][0]['name'] ?? $material_data['_source']['publisher'][0]['name'] ?? '',
                     ];
                     $material->store();
 
                     //set users:
                     $userdata = [];
-                    foreach ((array) $material_data['_source']['creator'] as $creator) {
-                        $userdata[] = [
-                            'user_id' => md5($creator['name']),
-                            'name' => $creator['name'],
-                            'host_url' => $this['url']
-                        ];
+                    if (
+                        isset($material_data['_source']['creator'])
+                        && is_array($material_data['_source']['creator'])
+                    ) {
+                        foreach ($material_data['_source']['creator'] as $creator) {
+                            $userdata[] = [
+                                'user_id' => md5($creator['name']),
+                                'name' => $creator['name'],
+                                'host_url' => $this['url']
+                            ];
+                        }
                     }
                     $material->setUsers($userdata);
 
diff --git a/lib/plugins/core/StudIPPlugin.class.php b/lib/plugins/core/StudIPPlugin.class.php
index be2c776..ea5c8ff 100644
--- a/lib/plugins/core/StudIPPlugin.class.php
+++ b/lib/plugins/core/StudIPPlugin.class.php
@@ -95,7 +95,7 @@ abstract class StudIPPlugin
         if (!empty($metadata['description_' . $language])) {
             return $metadata['description_' . $language];
         }
-        $description = $metadata['descriptionlong'] ?? $metadata['description'];
+        $description = $metadata['descriptionlong'] ?? $metadata['description'] ?? '';
 
         if ($this->plugin_info['description_mode'] === 'override_description') {
             return $this->plugin_info['description'];
-- 
cgit v1.0


From 80ede55a25e60f366aa0ff05dc9ae1043c56f271 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 25 Apr 2024 19:32:01 +0000
Subject: set default character set on command line not on server, re #3988

Merge request studip/studip!2923
---
 .gitlab/scripts/install_db.sh | 24 +++++++++++++++++-------
 docker/studip/my.cnf          |  1 -
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitlab/scripts/install_db.sh b/.gitlab/scripts/install_db.sh
index f095f1e..4befdcc 100644
--- a/.gitlab/scripts/install_db.sh
+++ b/.gitlab/scripts/install_db.sh
@@ -1,26 +1,36 @@
 #!/bin/bash
 set -e
 
+importSQLFile() {
+    mysql --default-character-set=utf8mb4\
+        -u $MYSQL_USER\
+        -h $MYSQL_HOST\
+        -p$MYSQL_PASSWORD\
+        $MYSQL_DATABASE\
+        < $1
+
+}
+
 if [ $(mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "show tables;" --batch | wc -l) -eq 0 ]; then
 
     # Setup mysql database
     echo "INSTALL DB"
-    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip.sql
+    importSQLFile ./db/studip.sql
     echo "INSTALL DEFAULT DATA"
-    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_default_data.sql
-    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_default_data.sql
+    importSQLFile ./db/studip_default_data.sql
+    importSQLFile ./db/studip_resources_default_data.sql
 
     echo "INSTALL ROOTUSER"
-    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_root_user.sql
+    importSQLFile ./db/studip_root_user.sql
 
     # Check if demodata is required
     if [ ! -z $DEMO_DATA ]; then
         echo "INSTALL DEMODATA"
-        mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_demo_data.sql
+        importSQLFile ./db/studip_demo_data.sql
         echo "INSTALL MVV_DEMODATA"
-        mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_mvv_demo_data.sql
+        importSQLFile ./db/studip_mvv_demo_data.sql
         echo "INSTALL RESOURCES-DEMODATA"
-        mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_demo_data.sql
+        importSQLFile ./db/studip_resources_demo_data.sql
     fi
 
     echo "INSTALLATION FINISHED"
diff --git a/docker/studip/my.cnf b/docker/studip/my.cnf
index 5e34466..c5607a4 100644
--- a/docker/studip/my.cnf
+++ b/docker/studip/my.cnf
@@ -5,7 +5,6 @@ default-character-set = utf8mb4
 default-character-set = utf8mb4
 
 [mysqld]
-init_connect='SET NAMES UTF8MB4'
 character-set-server = utf8mb4
 collation-server = utf8mb4_unicode_ci
 
-- 
cgit v1.0


From 572b9b5116f83670fd2d482930588144bec03ef0 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 25 Apr 2024 22:08:04 +0200
Subject: add init command, re #3988

---
 .gitlab/scripts/install_db.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab/scripts/install_db.sh b/.gitlab/scripts/install_db.sh
index 4befdcc..b3d7111 100644
--- a/.gitlab/scripts/install_db.sh
+++ b/.gitlab/scripts/install_db.sh
@@ -3,6 +3,7 @@ set -e
 
 importSQLFile() {
     mysql --default-character-set=utf8mb4\
+        --init-command="SET NAMES UTF8;"\
         -u $MYSQL_USER\
         -h $MYSQL_HOST\
         -p$MYSQL_PASSWORD\
-- 
cgit v1.0


From c140af0d6c46ca96ddffd8ea49e1190d05dd9c8f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 26 Apr 2024 07:17:44 +0000
Subject: unify questionnaire editing vue components, re #3914, fixes #3915

Closes #3915 and #3914

Merge request studip/studip!2833
---
 .../question_types/likert/likert_answer.php        |   4 +-
 .../question_types/likert/likert_evaluation.php    |   2 +-
 .../rangescale/rangescale_answer.php               |   4 +-
 .../rangescale/rangescale_evaluation.php           |   2 +-
 .../assets/stylesheets/scss/questionnaire.scss     | 170 ++----------
 .../vue/components/questionnaires/FreetextEdit.vue |  39 +--
 .../vue/components/questionnaires/InputArray.vue   | 304 +++++++++------------
 .../vue/components/questionnaires/LikertEdit.vue   | 189 ++-----------
 .../questionnaires/QuestionnaireInfoEdit.vue       |  44 +--
 .../components/questionnaires/RangescaleEdit.vue   | 216 +++------------
 .../vue/components/questionnaires/VoteEdit.vue     |  51 +---
 resources/vue/mixins/QuestionnaireComponent.js     |  24 ++
 12 files changed, 295 insertions(+), 754 deletions(-)
 create mode 100644 resources/vue/mixins/QuestionnaireComponent.js

diff --git a/app/views/questionnaire/question_types/likert/likert_answer.php b/app/views/questionnaire/question_types/likert/likert_answer.php
index 1847587..86ccc3e 100644
--- a/app/views/questionnaire/question_types/likert/likert_answer.php
+++ b/app/views/questionnaire/question_types/likert/likert_answer.php
@@ -25,7 +25,7 @@ $responseData = isset($response->answerdata['answers']) ? $response->answerdata[
             <tr>
                 <th><?= _('Aussage') ?></th>
                 <? foreach ($answers as $answer) : ?>
-                <th><?= htmlReady($answer) ?></th>
+                <th class="option-cell"><?= htmlReady($answer) ?></th>
                 <? endforeach ?>
             </tr>
         </thead>
@@ -35,7 +35,7 @@ $responseData = isset($response->answerdata['answers']) ? $response->answerdata[
                 <? $html_id = md5(uniqid($index)) ?>
                 <td id="<?= $html_id ?>"><?= htmlReady($statements[$index]) ?></td>
                 <? foreach ($answers as $answer_index => $answer) : ?>
-                    <td>
+                    <td class="option-cell">
                         <input type="radio"
                                title="<?= htmlReady($answer) ?>"
                                aria-labelledby="<?= $html_id ?>"
diff --git a/app/views/questionnaire/question_types/likert/likert_evaluation.php b/app/views/questionnaire/question_types/likert/likert_evaluation.php
index fd4eb01..11ef4b4 100644
--- a/app/views/questionnaire/question_types/likert/likert_evaluation.php
+++ b/app/views/questionnaire/question_types/likert/likert_evaluation.php
@@ -27,7 +27,7 @@ $options = $vote->questiondata['options'];
         <tr>
             <th><?= _('Aussage') ?></th>
             <? foreach ($options as $option) : ?>
-                <th><?= htmlReady($option) ?></th>
+                <th class="option-cell"><?= htmlReady($option) ?></th>
             <? endforeach ?>
         </tr>
     </thead>
diff --git a/app/views/questionnaire/question_types/rangescale/rangescale_answer.php b/app/views/questionnaire/question_types/rangescale/rangescale_answer.php
index 3525b4c..4333689 100644
--- a/app/views/questionnaire/question_types/rangescale/rangescale_answer.php
+++ b/app/views/questionnaire/question_types/rangescale/rangescale_answer.php
@@ -25,7 +25,7 @@ $responseData = $response['answerdata'] && $response['answerdata']['answers'] ?
             <tr>
                 <th><?= _('Aussage') ?></th>
                 <? for ($i = $vote->questiondata['minimum'] ?? 1; $i <= $vote->questiondata['maximum']; $i++) : ?>
-                <th><?= htmlReady($i) ?></th>
+                <th class="option-cell"><?= htmlReady($i) ?></th>
                 <? endfor ?>
             </tr>
         </thead>
@@ -35,7 +35,7 @@ $responseData = $response['answerdata'] && $response['answerdata']['answers'] ?
                 <? $html_id = md5(uniqid($index)) ?>
                 <td id="<?= $html_id ?>"><?= htmlReady($statements[$index]) ?></td>
                 <? for ($i = $vote->questiondata['minimum'] ?? 1; $i <= $vote->questiondata['maximum']; $i++) : ?>
-                    <td>
+                    <td class="option-cell">
                         <input type="radio"
                                title="<?= htmlReady($i) ?>"
                                aria-labelledby="<?= $html_id ?>"
diff --git a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
index 2715934..6b75ea1 100644
--- a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
+++ b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
@@ -27,7 +27,7 @@ $options = range($vote->questiondata['minimum'], $vote->questiondata['maximum'])
         <tr>
             <th><?= _('Aussage') ?></th>
             <? for ($i = $vote->questiondata['minimum'] ?? 1; $i <= $vote->questiondata['maximum']; $i++) : ?>
-                <th class="rangescale_center"><?= htmlReady($i) ?></th>
+                <th class="option-cell"><?= htmlReady($i) ?></th>
             <? endfor ?>
         </tr>
     </thead>
diff --git a/resources/assets/stylesheets/scss/questionnaire.scss b/resources/assets/stylesheets/scss/questionnaire.scss
index f55b50f..fde7d32 100644
--- a/resources/assets/stylesheets/scss/questionnaire.scss
+++ b/resources/assets/stylesheets/scss/questionnaire.scss
@@ -1,8 +1,6 @@
 $width: 270px;
 
 .questionnaire_edit {
-
-
     .editor {
         display: flex;
         flex-direction: row-reverse;
@@ -14,14 +12,16 @@ $width: 270px;
             min-width: $width;
             width: $width;
             .questions_container {
-                padding: 0px;
+                padding: 0;
                 .questions {
                     display: flex;
                     flex-direction: column;
                 }
             }
 
-            > .admin, > .add_question, .questions > * {
+            > .admin,
+            > .add_question,
+            .questions > * {
                 width: calc(100% - 8px);
                 padding: 4px;
                 border-bottom: 1px solid var(--content-color-40);
@@ -42,8 +42,8 @@ $width: 270px;
                     &::before {
                         content: '';
                         position: absolute;
-                        height: 0px;
-                        width: 0px;
+                        height: 0;
+                        width: 0;
                         border-top: 25px transparent solid;
                         border-bottom: 25px transparent solid;
                         border-left: 7px var(--content-color-40) solid;
@@ -52,8 +52,8 @@ $width: 270px;
                     &::after {
                         content: '';
                         position: absolute;
-                        height: 0px;
-                        width: 0px;
+                        height: 0;
+                        width: 0;
                         border-top: 25px transparent solid;
                         border-bottom: 25px transparent solid;
                         border-left: 7px var(--yellow-40) solid;
@@ -93,42 +93,11 @@ $width: 270px;
             border: 1px solid var(--content-color-40);
             border-left: none;
             flex-grow: 1;
-            padding: 10px;
-            padding-left: 15px;
+            padding: 10px 10px 10px 15px;
             min-height: 150px;
             min-width: 0;
         }
-        .vote_edit {
-            .options {
-                > li {
-                    display: flex;
-                    align-items: center;
-                    > * {
-                        margin-right: 10px;
-                    }
-                }
-            }
-        }
-        .rangescale_edit table.default > thead > tr > th.number {
-            padding-left: 12px;
-        }
-
-        .dragcolumn {
-            max-width: 1px;
-            padding-bottom: 0px;
-            > .dragarea {
-                display: inline-block;
-                height: 27px;
-            }
-        }
-
-        .input-array {
-            margin-left: 4px;
-        }
 
-        .likert_edit .input-array {
-            margin-left: 7px;
-        }
         .inline_editing {
             width: 100%;
             display: flex;
@@ -150,114 +119,25 @@ $width: 270px;
                 justify-items: center;
             }
         }
-        .drag-handle {
-            display: inline-block;
-            height: 24px;
-        }
-    }
-
-    /* ab hier der alte kram */
-
-    section {
-        border: thin solid var(--black);
-        margin: 3px;
-    }
-
-    .options {
-        padding: 0;
-        list-style-type: none;
-
-        > li {
-            margin-top: 5px;
-            margin-bottom: 5px;
-
-            > .move {
-                cursor: move;
-                display: inline-block;
-                vertical-align: middle;
-            }
-
-            > input {
-                display: inline-block;
-                vertical-align: middle;
-            }
-
-            > input[type=text] {
-                width: calc(100% - 70px);
-            }
 
-            .delete {
+        .dragcolumn {
+            max-width: 1px;
+            padding-bottom: 0;
+            > .dragarea {
                 display: inline-block;
-                vertical-align: middle;
-                cursor: pointer;
-            }
-
-            .add {
-                display: none;
-                vertical-align: middle;
-                cursor: pointer;
+                height: 27px;
             }
         }
 
-        > li:last-child .delete {
-            display: none;
-        }
-
-        > li:last-child .add {
+        .drag-handle {
             display: inline-block;
+            height: 24px;
         }
 
-        > li:only-child .move {
-            display: none;
-        }
-
-    }
-
-    .all_questions {
-        .question:first-child .move_up {
-            display: none;
-        }
-
-        .question:last-child .move_down {
-            display: none;
-        }
-    }
-
-    .add_questions {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: center;
-        align-items: stretch;
-        border: thin dashed var(--content-color-40);
-
-        > a {
-            background-color: transparent;
-            margin: 10px;
-            border: thin solid var(--content-color-20);
-            padding: 5px;
-            width: 100px;
-            min-width: 100px;
-            max-width: 100px;
-            height: 100px;
-            min-height: 100px;
-            max-height: 100px;
-            overflow: hidden;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-around;
-            align-items: center;
+        .option-cell {
             text-align: center;
-
-            > img {
-                margin-left: auto;
-                margin-right: auto;
-            }
         }
     }
-
-    .questionnaire_metadata {
-        margin-top: 10px;
-    }
 }
 
 .questionnaire_results {
@@ -308,7 +188,8 @@ $width: 270px;
 }
 
 
-.questionnaire_answer, .questionnaire_results {
+.questionnaire_answer,
+.questionnaire_results {
     .description_container {
         display: flex;
         > .icon_container {
@@ -335,7 +216,7 @@ $width: 270px;
         border: none;
 
         > :first-child {
-            margin-top: 0px;
+            margin-top: 0;
         }
 
         .invalidation_notice {
@@ -351,9 +232,6 @@ $width: 270px;
         font-size: 0.7em;
         padding-left: 5px;
     }
-    .rangescale_center {
-        text-align: center;
-    }
     .centerline {
         border-top: 1px solid var(--base-color);
         position: relative;
@@ -389,6 +267,14 @@ $width: 270px;
     }
 }
 
+.questionnaire_edit,
+.questionnaire_answer,
+.questionnaire_results {
+    .option-cell {
+        text-align: center;
+    }
+}
+
 .courseselector,
 .instituteselector,
 .statusgroupselector {
diff --git a/resources/vue/components/questionnaires/FreetextEdit.vue b/resources/vue/components/questionnaires/FreetextEdit.vue
index 29c6f34..58848ed 100644
--- a/resources/vue/components/questionnaires/FreetextEdit.vue
+++ b/resources/vue/components/questionnaires/FreetextEdit.vue
@@ -2,7 +2,7 @@
     <div>
         <div class="formpart" tabindex="0" ref="autofocus">
             {{ $gettext('Frage') }}
-            <studip-wysiwyg v-model="val_clone.description" :key="question_id"></studip-wysiwyg>
+            <StudipWysiwyg v-model="val_clone.description" />
         </div>
 
         <label>
@@ -13,40 +13,19 @@
 </template>
 
 <script>
-import StudipWysiwyg from "../StudipWysiwyg.vue";
+import { QuestionnaireComponent } from '../../mixins/QuestionnaireComponent';
 
 export default {
     name: 'freetext-edit',
-    components: {
-        StudipWysiwyg
+    mixins: [ QuestionnaireComponent ],
+    created() {
+        this.setDefaultValues({
+            description: '',
+            mandatory: '0',
+        });
     },
-    props: {
-        value: {
-            type: Object,
-            required: false,
-            default: function () {
-                return {};
-            }
-        },
-        question_id: {
-            type: String,
-            required: false
-        }
-    },
-    data: function () {
-        return {
-            val_clone: ''
-        };
-    },
-    mounted: function () {
-        this.val_clone = this.value;
+    mounted() {
         this.$refs.autofocus.focus();
-    },
-    watch: {
-        value (new_val) {
-            this.val_clone = new_val;
-        }
     }
-
 }
 </script>
diff --git a/resources/vue/components/questionnaires/InputArray.vue b/resources/vue/components/questionnaires/InputArray.vue
index 0fd67db..f57ca58 100644
--- a/resources/vue/components/questionnaires/InputArray.vue
+++ b/resources/vue/components/questionnaires/InputArray.vue
@@ -1,206 +1,170 @@
 <template>
     <div class="input-array">
         <span aria-live="assertive" class="sr-only">{{ assistiveLive }}</span>
-        <draggable v-model="options" handle=".dragarea" tag="ol" class="clean options">
-            <li v-for="(option, index) in options" :key="index">
-                <a class="dragarea"
-                   v-if="options.length > 1"
-                   tabindex="0"
-                   :ref="'draghandle_' + index"
-                   :title="$gettextInterpolate('Sortierelement für Option %{option}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.', {option: option})"
-                   @keydown="keyHandler($event, index)">
-                    <span class="drag-handle"></span>
-                </a>
-                <input type="text"
-                       :placeholder="$gettext('Option')"
-                       :ref="'option_' + index"
-                       @paste="(ev) => onPaste(ev, index)"
-                       v-model="options[index]">
-                <button class="as-link"
-                   :title="$gettext('Option löschen')"
-                   @click.prevent="askForDeletingOption(index)">
-                    <studip-icon shape="trash" :role="options.length > 1 ? 'clickable' : 'inactive'" :size="20" alt=""></studip-icon>
-                </button>
-            </li>
-        </draggable>
 
-        <button class="as-link"
-                :title="$gettext('Option hinzufügen')"
-                @click.prevent="addOption">
-            <studip-icon shape="add" :size="20" alt=""></studip-icon>
-        </button>
-
-        <studip-dialog
-            v-if="askForDeleting"
-            :title="$gettext('Bitte bestätigen Sie die Aktion.')"
-            :question="$gettext('Wirklich löschen?')"
-            :confirmText="$gettext('Ja')"
-            :closeText="$gettext('Nein')"
-            closeClass="cancel"
-            height="180"
-            @confirm="deleteOption"
-            @close="askForDeleting = false"
-        >
-        </studip-dialog>
+        <table class="default nohover">
+            <colgroup>
+                <col style="width: 16px">
+                <col>
+                <col v-for="i in additionalColspan" :key="`colspan-${i}`">
+                <col style="width: 24px">
+            </colgroup>
+            <thead>
+                <tr>
+                    <th class="dragcolumn"></th>
+                    <th>{{ labelPlural }}</th>
+                    <slot name="header-cells" />
+                    <th class="actions"></th>
+                </tr>
+            </thead>
+            <Draggable v-model="options" handle=".dragarea" tag="tbody" class="statements">
+                <tr v-for="(option, index) in options" :key="index">
+                    <td class="dragcolumn">
+                        <a class="dragarea"
+                           tabindex="0"
+                           :title="$gettextInterpolate($gettext(`Sortierelement für %{label} %{option}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.`), {option, label})"
+                           @keydown="keyHandler($event, index)"
+                           ref="draghandle">
+                            <span class="drag-handle"></span>
+                        </a>
+                    </td>
+                    <td>
+                        <input type="text"
+                               ref="inputs"
+                               :placeholder="label"
+                               @paste="(ev) => onPaste(ev, index)"
+                               v-model="options[index]">
+                    </td>
+                    <slot name="body-cells" />
+                    <td class="actions">
+                        <StudipIcon name="delete"
+                                     shape="trash"
+                                     :size="20"
+                                     @click.prevent="deleteOption(index)"
+                                     :title="$gettextInterpolate($gettext('%{label} löschen'), {label})"
+                        />
+                    </td>
+                </tr>
+            </Draggable>
+            <tfoot>
+                <tr>
+                    <td :colspan="3 + additionalColspan">
+                        <button class="as-link"
+                                :title="$gettextInterpolate($gettext('%{label} hinzufügen'),  {label})"
+                                @click.prevent="addOption()">
+                            <StudipIcon shape="add" :size="20" alt="" />
+                        </button>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
     </div>
 </template>
 
 <script>
-import StudipIcon from "../StudipIcon.vue";
-import StudipDialog from "../StudipDialog.vue";
-import draggable from 'vuedraggable';
+import Draggable from 'vuedraggable';
+import { $gettext } from '../../../assets/javascripts/lib/gettext';
+
 export default {
     name: 'input-array',
-    components: {
-        StudipIcon,
-        StudipDialog,
-        draggable
-    },
+    components: { Draggable },
     props: {
-        value: {
-            type: Array,
-            required: false
-        }
+        additionalColspan: {
+            type: Number,
+            default: 0,
+        },
+        label: {
+            type: String,
+            default: $gettext('Option'),
+        },
+        labelPlural: {
+            type: String,
+            default: $gettext('Optionen'),
+        },
+        value: Array,
     },
-    data: function () {
+    data() {
         return {
             options: [],
-            askForDeleting: false,
-            indexOfDeletingOption: 0,
-            unique_id: null,
-            assistiveLive: ''
+            assistiveLive: '',
         };
     },
     methods: {
-        addOption: function (val, position) {
-            let data = this.value;
-            if (val.target) {
-                val = '';
-            }
-            if (typeof position === "undefined") {
-                data.push(val || '');
-                position = this.value.length - 1
-            } else {
-                data.splice(position, 0, val || '');
-            }
-            this.$emit('input', data);
-            let v = this;
-            this.$nextTick(function () {
-                v.$refs['option_' + position][0].focus();
-            });
-        },
-        askForDeletingOption: function (index) {
-            if (this.options.length <= 1) {
-                return;
-            }
+        addOption(val = '', position = this.options.length) {
+            this.$set(this.options, position, val.trim());
 
-            this.indexOfDeletingOption = index;
-            if (this.value[index]) {
-                this.askForDeleting = true;
-            } else {
-                this.deleteOption();
-            }
+            this.$nextTick(() => {
+                this.$refs.inputs[position].focus();
+            });
         },
-        deleteOption: function () {
-            this.$delete(this.value, this.indexOfDeletingOption);
-            this.askForDeleting = false;
+        deleteOption(index) {
+            const question = this.options[index] ? this.$gettext('Wirklich löschen?') : true;
+            STUDIP.Dialog.confirm(question).done(() => {
+                this.$delete(this.options, index);
+            });
         },
-        onPaste: function (ev, position) {
-            let data = ev.clipboardData.getData("text").split("\n");
-            for (let i = 0; i < data.length; i++) {
-                if (data[i].trim()) {
-                    this.addOption(data[i], position + i);
-                }
-            }
+        onPaste(ev, position) {
+            ev.clipboardData
+                .getData('text')
+                .split("\n")
+                .filter(str => str.trim().length > 0)
+                .forEach((value, index) => this.addOption(value, position + index));
+            ev.preventDefault();
         },
         keyHandler(e, index) {
-            switch (e.keyCode) {
-                case 38: // up
-                    e.preventDefault();
-                    if (index > 0) {
-                        this.moveUp(index);
-                        this.$nextTick(function () {
-                            this.$refs['draghandle_' + (index - 1)][0].focus();
-                            this.assistiveLive = this.$gettextInterpolate(
-                                'Aktuelle Position in der Liste: %{pos} von %{listLength}.'
-                                , {pos: index, listLength: this.options.length}
-                            );
-                        });
-                    }
-                    break;
-                case 40: // down
-                    e.preventDefault();
-                    if (index < this.options.length - 1) {
-                        this.moveDown(index);
-                        this.$nextTick(function () {
-                            this.$refs['draghandle_' + (index + 1)][0].focus();
-                            this.assistiveLive = this.$gettextInterpolate(
-                                'Aktuelle Position in der Liste: %{pos} von %{listLength}.'
-                                , {pos: index + 2, listLength: this.options.length}
-                            );
-                        });
-                    }
-                    break;
-            }
-        },
-        moveDown: function (index) {
-            if (index == this.options.length - 1) {
+            if (e.keyCode !== 38 && e.keyCode !== 40) {
                 return;
             }
-            let option = this.options[index];
-            this.options[index] = this.options[index + 1];
-            this.options[index + 1] = option;
-            this.$forceUpdate();
+
+            e.preventDefault();
+
+            const moveUp = e.keyCode === 38;
+
+            this.moveElement(index, moveUp ? -1 : 1).then((newIndex) => {
+                this.assistiveLive = this.$gettextInterpolate(
+                    this.$gettext('Aktuelle Position in der Liste: %{pos} von %{listLength}.'),
+                    {pos: newIndex + 1, listLength: this.options.length}
+                );
+
+                this.$nextTick(() => {
+                    this.$refs['draghandle'][newIndex].focus();
+                });
+            })
         },
-        moveUp: function (index) {
-            if (index === 0) {
-                return;
+        moveElement(index, direction) {
+            if (this.options[index + direction] === undefined) {
+                return Promise.resolve(index);
             }
-            let option = this.options[index];
-            this.options[index] = this.options[index - 1];
-            this.options[index - 1] = option;
-            this.$forceUpdate();
+
+            const indices = [index, index + direction].sort();
+
+            this.options.splice(
+                Math.min(...indices),
+                2,
+                ...indices.reverse().map(idx => this.options[idx])
+            );
+
+            return Promise.resolve(index + direction);
         }
     },
-    mounted: function () {
-        this.options = this.value;
-        this.unique_id = 'array_input_' + Math.floor(Math.random() * 100000000);
-    },
     watch: {
-        options (new_data, old_data) {
-            if (typeof old_data === 'undefined' || typeof new_data === 'undefined') {
-                return;
-            }
-            this.$emit('input', new_data);
+        options: {
+            handler(current) {
+                this.$emit('input', current);
+            },
+            deep: true
         },
-        value (new_val) {
-            this.options = new_val;
+        value: {
+            handler(current) {
+                this.options = current;
+            },
+            immediate: true
         }
     }
 }
 </script>
-<style lang="scss" scoped>
-.input-array {
-    display: grid;
-    grid-template-areas:
-        "sr sr"
-        "options button";
-    grid-template-columns: calc(100% - 24px) 24px;
-    grid-template-rows: auto;
-
-    > .sr-only {
-        grid-area: sr;
-    }
-
-    > .options {
-        grid-area: options;
-    }
-
-    > button.as-link {
-        align-self: end;
-        grid-area: button;
-        justify-self: left;
-        margin-bottom: 8px;
-    }
+<style scoped>
+.input-array input[type="text"] {
+    max-width: unset;
 }
 </style>
diff --git a/resources/vue/components/questionnaires/LikertEdit.vue b/resources/vue/components/questionnaires/LikertEdit.vue
index c87f9fe..736be6b 100644
--- a/resources/vue/components/questionnaires/LikertEdit.vue
+++ b/resources/vue/components/questionnaires/LikertEdit.vue
@@ -1,66 +1,27 @@
 <template>
     <div class="likert_edit">
-
         <div class="formpart" tabindex="0" ref="autofocus">
             {{ $gettext('Einleitungstext' )}}
-            <studip-wysiwyg v-model="val_clone.description"></studip-wysiwyg>
+            <StudipWysiwyg v-model="val_clone.description" />
         </div>
 
-        <span aria-live="assertive" class="sr-only">{{ assistiveLive }}</span>
+        <InputArray v-model="val_clone.statements"
+                     :label="$gettext('Aussage')"
+                     :label-plural="$gettext('Aussagen')"
+                     :additional-colspan="val_clone.options.length"
+        >
+            <template #header-cells>
+                <th v-for="(option, index) in val_clone.options" class="option-cell" :key="index">
+                    {{ option }}
+                </th>
+            </template>
 
-        <table class="default nohover">
-            <thead>
-                <tr>
-                    <th class="dragcolumn"></th>
-                    <th>{{ $gettext('Aussagen') }}</th>
-                    <th v-for="(option, index) in val_clone.options" :key="index">{{ option }}</th>
-                    <th class="actions"></th>
-                </tr>
-            </thead>
-            <draggable v-model="val_clone.statements" handle=".dragarea" tag="tbody" class="statements">
-                <tr v-for="(statement, index) in val_clone.statements" :key="index">
-                    <td class="dragcolumn">
-                        <a class="dragarea"
-                           tabindex="0"
-                           :title="$gettextInterpolate($gettext('Sortierelement für Aussage %{statement}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'), {statement: statement})"
-                           @keydown="keyHandler($event, index)"
-                           :ref="'draghandle_' + index">
-                            <span class="drag-handle"></span>
-                        </a>
-                    </td>
-                    <td>
-                        <input type="text"
-                               :ref="'statement_' + index"
-                               :placeholder="$gettext('Aussage')"
-                               @paste="(ev) => onPaste(ev, index)"
-                               v-model="val_clone.statements[index]">
-                    </td>
-                    <td v-for="(option, index2) in val_clone.options" :key="index2">
-                        <input type="radio" disabled :title="option">
-                    </td>
-                    <td class="actions">
-                        <studip-icon name="delete"
-                                     shape="trash"
-                                     :size="20"
-                                     @click.prevent="deleteStatement(index)"
-                                     :title="$gettext('Aussage löschen')"
-                        ></studip-icon>
-                    </td>
-                </tr>
-            </draggable>
-            <tfoot>
-                <tr>
-                    <td :colspan="val_clone.options.length + 3">
-                        <studip-icon name="add"
-                                     shape="add"
-                                     :size="20"
-                                     @click.prevent="addStatement()"
-                                     :title="$gettext('Aussage hinzufügen')"
-                        ></studip-icon>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
+            <template #body-cells>
+                <td v-for="(option, index) in val_clone.options" class="option-cell" :key="index">
+                    <input type="radio" disabled :title="option">
+                </td>
+            </template>
+        </InputArray>
 
         <label>
             <input type="checkbox" v-model.number="val_clone.mandatory" true-value="1" false-value="0">
@@ -73,17 +34,18 @@
 
         <div>
             <div>{{ $gettext('Antwortmöglichkeiten konfigurieren') }}</div>
-            <input-array v-model="val_clone.options"></input-array>
+            <InputArray v-model="val_clone.options" />
         </div>
     </div>
 </template>
 
 <script>
-import draggable from 'vuedraggable';
-import InputArray from "./InputArray.vue";
 import { $gettext } from '../../../assets/javascripts/lib/gettext';
+import InputArray from "./InputArray.vue";
+import { QuestionnaireComponent } from '../../mixins/QuestionnaireComponent';
 
-const default_value = () => ({
+// This is necesssar since $gettext does not seem to work in data() or created()
+const default_values = () => ({
     description: '',
     statements: ['', '', '', ''],
     mandatory: 0,
@@ -96,115 +58,16 @@ const default_value = () => ({
         $gettext('trifft nicht zu'),
     ],
 });
+
 export default {
     name: 'likert-edit',
-    components: {
-        draggable,
-        InputArray
-    },
-    props: {
-        value: {
-            type: Object,
-            required: false,
-            default() {
-                return {...default_value()};
-            }
-        },
-        question_id: {
-            type: String,
-            required: false
-        }
-    },
-    data() {
-        return {
-            val_clone: null,
-            assistiveLive: ''
-        };
-    },
-    methods: {
-        addStatement(val = '', position = null) {
-            if (position === null) {
-                this.val_clone.statements.push(val || '');
-            } else {
-                this.val_clone.statements.splice(position, 0, val || '');
-            }
-            this.$nextTick(() => {
-                this.$refs['statement_' + (this.val_clone.statements.length - 1)][0].focus();
-            });
-        },
-        deleteStatement(index) {
-            STUDIP.Dialog.confirm(this.$gettext('Wirklich löschen?')).done(() => {
-                this.$delete(this.val_clone.statements, index);
-            });
-        },
-        onPaste(ev, position) {
-            let data = ev.clipboardData.getData("text").split("\n");
-            for (let i = 0; i < data.length; i++) {
-                if (data[i].trim()) {
-                    this.addStatement(data[i], position + i);
-                }
-            }
-        },
-        keyHandler(e, index) {
-            switch (e.keyCode) {
-                case 38: // up
-                    e.preventDefault();
-                    if (index > 0) {
-                        this.moveUp(index);
-                        this.$nextTick(() => {
-                            this.$refs['draghandle_' + (index - 1)][0].focus();
-                            this.assistiveLive = this.$gettextInterpolate(
-                                this.$gettext('Aktuelle Position in der Liste: %{pos} von %{listLength}.'),
-                                {pos: index, listLength: this.val_clone.statements.length}
-                            );
-                        });
-                    }
-                    break;
-                case 40: // down
-                    e.preventDefault();
-                    if (index < this.val_clone.statements.length - 1) {
-                        this.moveDown(index);
-                        this.$nextTick(() => {
-                            this.$refs['draghandle_' + (index + 1)][0].focus();
-                            this.assistiveLive = this.$gettextInterpolate(
-                                this.$gettext('Aktuelle Position in der Liste: %{pos} von %{listLength}.'),
-                                {pos: index + 2, listLength: this.val_clone.statements.length}
-                            );
-                        });
-                    }
-                    break;
-            }
-        },
-        moveDown(index) {
-            this.val_clone.statements.splice(
-                index,
-                2,
-                this.val_clone.statements[index + 1],
-                this.val_clone.statements[index]
-            )
-        },
-        moveUp(index) {
-            this.val_clone.statements.splice(
-                index - 1,
-                2,
-                this.val_clone.statements[index],
-                this.val_clone.statements[index - 1]
-            )
-        }
-    },
+    components: { InputArray },
+    mixins: [ QuestionnaireComponent ],
     created() {
-        this.val_clone = Object.assign({}, default_value(), this.value ?? {});
+        this.setDefaultValues(default_values());
     },
     mounted() {
         this.$refs.autofocus.focus();
-    },
-    watch: {
-        val_clone: {
-            handler(current) {
-                this.$emit('input', current);
-            },
-            deep: true
-        }
     }
 }
 </script>
diff --git a/resources/vue/components/questionnaires/QuestionnaireInfoEdit.vue b/resources/vue/components/questionnaires/QuestionnaireInfoEdit.vue
index bc5e829..83d5fa2 100644
--- a/resources/vue/components/questionnaires/QuestionnaireInfoEdit.vue
+++ b/resources/vue/components/questionnaires/QuestionnaireInfoEdit.vue
@@ -8,39 +8,26 @@
 
         <div class="formpart">
             {{ $gettext('Hinweistext (optional)') }}
-            <studip-wysiwyg v-model="val_clone.description" :key="question_id"></studip-wysiwyg>
+            <StudipWysiwyg v-model="val_clone.description" />
         </div>
     </div>
 </template>
 
 <script>
-import StudipWysiwyg from "../StudipWysiwyg.vue";
+import { QuestionnaireComponent } from '../../mixins/QuestionnaireComponent';
 
 export default {
     name: 'questionnaire-info-edit',
-    components: {
-        StudipWysiwyg
+    mixins: [ QuestionnaireComponent ],
+    created() {
+        this.setDefaultValues({
+            url: '',
+            description: ''
+        });
     },
-    props: {
-        value: {
-            type: Object,
-            required: false,
-            default() {
-                return {
-                    url: '',
-                    description: ''
-                };
-            }
-        },
-        question_id: {
-            type: String,
-            required: false
-        }
-    },
-    data () {
-        return {
-            val_clone: this.value,
-        };
+    mounted() {
+        this.$refs.infoUrl.focus();
+        this.checkValidity();
     },
     methods: {
         checkValidity() {
@@ -53,15 +40,6 @@ export default {
                 this.$refs.infoUrl.reportValidity();
             }
         }
-    },
-    mounted() {
-        this.$refs.infoUrl.focus();
-        this.checkValidity();
-    },
-    watch: {
-        value (new_val) {
-            this.val_clone = new_val;
-        }
     }
 }
 </script>
diff --git a/resources/vue/components/questionnaires/RangescaleEdit.vue b/resources/vue/components/questionnaires/RangescaleEdit.vue
index 91aec1c..cd7ce3b 100644
--- a/resources/vue/components/questionnaires/RangescaleEdit.vue
+++ b/resources/vue/components/questionnaires/RangescaleEdit.vue
@@ -3,68 +3,25 @@
 
         <div class="formpart" tabindex="0" ref="autofocus">
             {{ $gettext('Einleitungstext') }}
-            <studip-wysiwyg v-model="val_clone.description"></studip-wysiwyg>
+            <StudipWysiwyg v-model="val_clone.description" />
         </div>
 
-        <span aria-live="assertive" class="sr-only">{{ assistiveLive }}</span>
-
-        <table class="default nohover">
-            <thead>
-                <tr>
-                    <th class="dragcolumn"></th>
-                    <th>{{ $gettext('Aussagen') }}</th>
-                    <th v-for="i in (val_clone.maximum - val_clone.minimum + 1)" :key="i" class="number">{{ (val_clone.minimum - 1 + i) }}</th>
-                    <th v-if="val_clone.alternative_answer.trim().length > 0">{{ val_clone.alternative_answer }}</th>
-                    <th class="actions"></th>
-                </tr>
-            </thead>
-            <draggable v-model="val_clone.statements" handle=".dragarea" tag="tbody" class="statements">
-                <tr v-for="(statement, index) in val_clone.statements" :key="index">
-                    <td class="dragcolumn">
-                        <a class="dragarea"
-                           tabindex="0"
-                           :title="$gettextInterpolate($gettext('Sortierelement für Aussage %{statement}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'), {statement: statement})"
-                           @keydown="keyHandler($event, index)"
-                           :ref="'draghandle_' + index">
-                            <span class="drag-handle"></span>
-                        </a>
-                    </td>
-                    <td>
-                        <input type="text"
-                               :ref="'statement_' + index"
-                               :placeholder="$gettext('Aussage')"
-                               @paste="(ev) => onPaste(ev, index)"
-                               v-model="val_clone.statements[index]">
-                    </td>
-                    <td v-for="i in (val_clone.maximum - val_clone.minimum + 1)" :key="i">
-                        <input type="radio" disabled :title="i + val_clone.minimum - 1">
-                    </td>
-                    <td v-if="val_clone.alternative_answer.trim().length > 0">
-                        <input type="radio" disabled :title="val_clone.alternative_answer">
-                    </td>
-                    <td class="actions">
-                        <studip-icon name="delete"
-                                     shape="trash"
-                                     :size="20"
-                                     @click.prevent="deleteStatement(index)"
-                                     :title="$gettext('Aussage löschen')"
-                        ></studip-icon>
-                    </td>
-                </tr>
-            </draggable>
-            <tfoot>
-                <tr>
-                    <td :colspan="val_clone.maximum - val_clone.minimum + 4 + (val_clone.alternative_answer.trim().length > 0 ? 1 : 0)">
-                        <studip-icon name="add"
-                                     shape="add"
-                                     :size="20"
-                                     @click.prevent="addStatement()"
-                                     :title="$gettext('Aussage hinzufügen')"
-                        ></studip-icon>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
+        <InputArray v-model="val_clone.statements"
+                     :label="$gettext('Aussage')"
+                     :label-plural="$gettext('Aussagen')"
+                     :additional-colspan="options.length"
+        >
+             <template #header-cells>
+                 <th v-for="(option, index) in options" class="option-cell" :key="index">
+                     {{ option }}
+                 </th>
+             </template>
+            <template #body-cells>
+                <td v-for="(option, index) in options" class="option-cell" :key="index">
+                    <input type="radio" disabled :title="option">
+                </td>
+            </template>
+        </InputArray>
 
         <label>
             <input type="checkbox" v-model.number="val_clone.mandatory" true-value="1" false-value="0">
@@ -82,135 +39,48 @@
 
         <label>
             {{ $gettext('Minimum') }}
-            <input type="number" v-model.number="val_clone.minimum" min="1">
+            <input type="number" v-model.number="val_clone.minimum" min="1" :max="val_clone.maximum">
         </label>
 
         <label>
             {{ $gettext('Ausweichantwort (leer lassen für keine)') }}
-            <input type="text" v-model="val_clone.alternative_answer">
+            <input type="text" v-model.trim="val_clone.alternative_answer">
         </label>
     </div>
 </template>
 
 <script>
-import draggable from 'vuedraggable';
+import InputArray from './InputArray.vue';
+import { QuestionnaireComponent } from '../../mixins/QuestionnaireComponent';
 
-const default_value = () => ({
-    description: '',
-    statements: ['', '', '', ''],
-    mandatory: 0,
-    randomize: 0,
-    minimum: 1,
-    maximum: 5,
-    alternative_answer: ''
-});
 export default {
-    name: 'likert-edit',
-    components: {
-        draggable,
-    },
-    props: {
-        value: {
-            type: Object,
-            required: false,
-            default() {
-                return default_value();
-            }
-        },
-        question_id: {
-            type: String,
-            required: false
-        }
-    },
-    data() {
-        return {
-            val_clone: null,
-            assistiveLive: ''
-        };
-    },
-    methods: {
-        addStatement(val = '', position = null) {
-            if (position === null) {
-                this.val_clone.statements.push(val || '');
-            } else {
-                this.val_clone.statements.splice(position, 0, val || '');
-            }
-            this.$nextTick(() => {
-                this.$refs['statement_' + (this.value.statements.length - 1)][0].focus();
-            });
-        },
-        deleteStatement(index) {
-            STUDIP.Dialog.confirm(this.$gettext('Wirklich löschen?')).done(() => {
-                this.$delete(this.value.statements, index);
-            });
-        },
-        onPaste(ev, position) {
-            let data = ev.clipboardData.getData('text').split("\n");
-            for (let i = 0; i < data.length; i++) {
-                if (data[i].trim()) {
-                    this.addStatement(data[i], position + i);
-                }
-            }
-        },
-        keyHandler(e, index) {
-            switch (e.keyCode) {
-                case 38: // up
-                    e.preventDefault();
-                    if (index > 0) {
-                        this.moveUp(index);
-                        this.$nextTick(() => {
-                            this.$refs['draghandle_' + (index - 1)][0].focus();
-                            this.assistiveLive = this.$gettextInterpolate(
-                                this.$gettext('Aktuelle Position in der Liste: %{pos} von %{listLength}.'),
-                                {pos: index, listLength: this.val_clone.statements.length}
-                            );
-                        });
-                    }
-                    break;
-                case 40: // down
-                    e.preventDefault();
-                    if (index < this.val_clone.statements.length - 1) {
-                        this.moveDown(index);
-                        this.$nextTick(() => {
-                            this.$refs['draghandle_' + (index + 1)][0].focus();
-                            this.assistiveLive = this.$gettextInterpolate(
-                                this.$gettext('Aktuelle Position in der Liste: %{pos} von %{listLength}.'),
-                                {pos: index + 2, listLength: this.val_clone.statements.length}
-                            );
-                        });
-                    }
-                    break;
-            }
-        },
-        moveDown(index) {
-            this.val_clone.statements.splice(
-                index,
-                2,
-                this.val_clone.statements[index + 1],
-                this.val_clone.statements[index]
-            );
-        },
-        moveUp(index) {
-            this.val_clone.statements.splice(
-                index - 1,
-                2,
-                this.val_clone.statements[index],
-                this.val_clone.statements[index - 1]
-            );
-        },
-    },
+    name: 'rangescale-edit',
+    components: { InputArray },
+    mixins: [ QuestionnaireComponent ],
     created() {
-        this.val_clone = Object.assign({}, default_value(), this.value ?? {});
+        this.setDefaultValues({
+            alternative_answer: '',
+            description: '',
+            mandatory: 0,
+            maximum: 5,
+            minimum: 1,
+            randomize: 0,
+            statements: ['', '', '', '']
+        });
     },
     mounted() {
         this.$refs.autofocus.focus();
     },
-    watch: {
-        val_clone: {
-            handler(current) {
-                this.$emit('input', current);
-            },
-            deep: true
+    computed: {
+        options() {
+            let result = [];
+            for (let i = this.val_clone.minimum; i <= this.val_clone.maximum; i += 1) {
+                result.push(i);
+            }
+            if (this.val_clone.alternative_answer.length > 0) {
+                result.push(this.val_clone.alternative_answer);
+            }
+            return result;
         }
     }
 }
diff --git a/resources/vue/components/questionnaires/VoteEdit.vue b/resources/vue/components/questionnaires/VoteEdit.vue
index 62de963..1d6d9cf 100644
--- a/resources/vue/components/questionnaires/VoteEdit.vue
+++ b/resources/vue/components/questionnaires/VoteEdit.vue
@@ -2,10 +2,10 @@
     <div class="vote_edit">
         <div class="formpart" tabindex="0" ref="autofocus">
             {{ $gettext('Frage') }}
-            <studip-wysiwyg v-model="val_clone.description" :key="question_id"></studip-wysiwyg>
+            <StudipWysiwyg v-model="val_clone.description" />
         </div>
 
-        <input-array v-model="val_clone.options"></input-array>
+        <InputArray v-model="val_clone.options" />
 
         <label>
             <input type="checkbox" v-model.number="val_clone.multiplechoice" true-value="1" false-value="0">
@@ -24,47 +24,24 @@
 </template>
 
 <script>
-import StudipWysiwyg from "../StudipWysiwyg.vue";
 import InputArray from "./InputArray.vue";
+import { QuestionnaireComponent } from '../../mixins/QuestionnaireComponent';
 
 export default {
     name: 'vote-edit',
-    components: {
-        StudipWysiwyg,
-        InputArray
+    components: { InputArray },
+    mixins: [QuestionnaireComponent],
+    created() {
+        this.setDefaultValues({
+            description: '',
+            mandatory: '0',
+            multiplechoice: '1',
+            options: ['', '', '', ''],
+            randomize: '0',
+        });
     },
-    props: {
-        value: {
-            type: Object,
-            required: false,
-            default: function () {
-                return {};
-            }
-        },
-        question_id: {
-            type: String,
-            required: false
-        }
-    },
-    data: function () {
-        return {
-            val_clone: {}
-        };
-    },
-    mounted: function () {
-        this.val_clone = this.value;
-        if (!this.value.description) {
-            this.$emit('input', {
-                multiplechoice: 1,
-                options: ['', '', '', ''],
-            });
-        }
+    mounted() {
         this.$refs.autofocus.focus();
-    },
-    watch: {
-        value (new_val) {
-            this.val_clone = new_val;
-        }
     }
 }
 </script>
diff --git a/resources/vue/mixins/QuestionnaireComponent.js b/resources/vue/mixins/QuestionnaireComponent.js
new file mode 100644
index 0000000..277f21c
--- /dev/null
+++ b/resources/vue/mixins/QuestionnaireComponent.js
@@ -0,0 +1,24 @@
+export const QuestionnaireComponent = {
+    props: {
+        value: Object
+    },
+    data () {
+        return {val_clone: this.value};
+    },
+    methods: {
+        setDefaultValues(value) {
+            this.val_clone = Object.assign(value, this.value);
+        }
+    },
+    watch: {
+        val_clone: {
+            handler(current) {
+                this.$emit('input', current);
+            },
+            deep: true
+        },
+        value (new_val) {
+            this.val_clone = new_val;
+        }
+    }
+};
-- 
cgit v1.0


From 19d54aa9cdc21524ea018727463bef44bbba9fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Fri, 26 Apr 2024 11:35:15 +0000
Subject: =?UTF-8?q?Resolve=20"Ilias=20Schnittstelle:=20Automatisch=20angel?=
 =?UTF-8?q?egte=20Benutzer=20k=C3=B6nnen=20sich=20in=20Ilias=20nicht=20anm?=
 =?UTF-8?q?elden=20(Ilias=208)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4081

Merge request studip/studip!2927
---
 lib/ilias_interface/IliasUser.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ilias_interface/IliasUser.class.php b/lib/ilias_interface/IliasUser.class.php
index 5737e65..426de80 100644
--- a/lib/ilias_interface/IliasUser.class.php
+++ b/lib/ilias_interface/IliasUser.class.php
@@ -171,7 +171,7 @@ class IliasUser
         // data for user-account in ILIAS
         $user_data['id'] = $this->id;
         $user_data['login'] = $this->studip_login;
-        $user_data['passwd'] = $this->external_password;
+        $user_data['passwd'] = md5(uniqid()); //never gets used, only to ensure correct entry in ilias db
         $user_data['firstname'] = $this->firstname;
         $user_data['lastname'] = $this->lastname;
         $user_data['title'] = $this->title;
-- 
cgit v1.0


From ced3440d88912bdba743a2b74263a1442f116cac Mon Sep 17 00:00:00 2001
From: Peter Thienel <thienel@data-quest.de>
Date: Mon, 29 Apr 2024 08:35:47 +0000
Subject: =?UTF-8?q?Resolve=20"Terminkalender:=20T=C3=A4glich=20wiederholte?=
 =?UTF-8?q?=20Termine=20werden=20nicht=20angezeigt"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4080

Merge request studip/studip!2926
---
 lib/models/calendar/CalendarDateAssignment.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/calendar/CalendarDateAssignment.class.php b/lib/models/calendar/CalendarDateAssignment.class.php
index fbd21a7..bd99dd3 100644
--- a/lib/models/calendar/CalendarDateAssignment.class.php
+++ b/lib/models/calendar/CalendarDateAssignment.class.php
@@ -250,7 +250,7 @@ class CalendarDateAssignment extends SimpleORMap implements Event
         ]);
 
 
-        $sql_repetition = $sql . " AND `calendar_dates`.`begin` < :end AND `calendar_dates`.`repetition_type` IN ('DAYLY', 'WEEKLY', 'MONTHLY', 'YEARLY')
+        $sql_repetition = $sql . " AND `calendar_dates`.`begin` < :end AND `calendar_dates`.`repetition_type` IN ('DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY')
                     AND `calendar_dates`.`repetition_end` > :begin
             ";
 
-- 
cgit v1.0


From 2a7f4401cb87e479765df527a887fdbeb905c572 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Mon, 29 Apr 2024 11:23:44 +0000
Subject: =?UTF-8?q?Resolve=20"Veranstaltungshierarchie:=20Aktionen=20in=20?=
 =?UTF-8?q?der=20Contentbar=20funktionieren=20nach=20Schlie=C3=9Fen=20des?=
 =?UTF-8?q?=20Dialogs=20nicht=20mehr"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3490

Merge request studip/studip!2928
---
 .../assets/javascripts/bootstrap/responsive-navigation.js    |  2 +-
 resources/assets/javascripts/bootstrap/treeview.js           |  3 ++-
 resources/vue/components/responsive/ResponsiveNavigation.vue | 12 ------------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/resources/assets/javascripts/bootstrap/responsive-navigation.js b/resources/assets/javascripts/bootstrap/responsive-navigation.js
index aa81107..ad39d2b 100644
--- a/resources/assets/javascripts/bootstrap/responsive-navigation.js
+++ b/resources/assets/javascripts/bootstrap/responsive-navigation.js
@@ -1,6 +1,6 @@
 import ResponsiveNavigation from '../../../vue/components/responsive/ResponsiveNavigation.vue';
 
-STUDIP.ready(() => {
+STUDIP.domReady(() => {
     STUDIP.Vue.load().then(({ createApp }) => {
         createApp({
             el: '#responsive-menu',
diff --git a/resources/assets/javascripts/bootstrap/treeview.js b/resources/assets/javascripts/bootstrap/treeview.js
index 998a70e..d132775 100644
--- a/resources/assets/javascripts/bootstrap/treeview.js
+++ b/resources/assets/javascripts/bootstrap/treeview.js
@@ -1,7 +1,8 @@
 import StudipTree from '../../../vue/components/tree/StudipTree.vue'
 
 STUDIP.ready(() => {
-    document.querySelectorAll('[data-studip-tree]').forEach(element => {
+    document.querySelectorAll('[data-studip-tree]:not(.vueified)').forEach(element => {
+        element.classList.add('vueified');
         STUDIP.Vue.load().then(({ createApp }) => {
             createApp({
                 el: element,
diff --git a/resources/vue/components/responsive/ResponsiveNavigation.vue b/resources/vue/components/responsive/ResponsiveNavigation.vue
index 87084a5..d9c391d 100644
--- a/resources/vue/components/responsive/ResponsiveNavigation.vue
+++ b/resources/vue/components/responsive/ResponsiveNavigation.vue
@@ -563,18 +563,6 @@ export default {
             attributeFilter: ['class']
         });
 
-        // Check for closed dialog, re-mounting the Vue component.
-        this.dialogObserver = new MutationObserver(mutations => {
-            if (mutations[0].removedNodes.length > 0 &&
-                    mutations[0].removedNodes[0].classList.contains('ui-widget-overlay')) {
-                document.getElementById('responsive-menu').replaceChildren(this.$el);
-            }
-        });
-
-        this.dialogObserver.observe(document.body, {
-            childList: true
-        });
-
         this.globalOn('has-contentbar', value => {
             this.hasContentbar = value;
             if (value && this.isFullscreen) {
-- 
cgit v1.0


From 6dee621eda725dd9e640a2eb34b4684ea0638af6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 29 Apr 2024 11:53:06 +0000
Subject: fixes #4086

Closes #4086

Merge request studip/studip!2930
---
 app/views/admin/tree/create.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/tree/create.php b/app/views/admin/tree/create.php
index 027507a..55d26a5 100644
--- a/app/views/admin/tree/create.php
+++ b/app/views/admin/tree/create.php
@@ -20,8 +20,8 @@
                     <? foreach ($GLOBALS['SEM_TREE_TYPES'] as $index => $type) : ?>
                         <option value="<?= htmlReady($index) ?>">
                             <?= $type['name'] ?: _('Standard') ?>
-                            <?= !$type['editable'] ? _('(nicht mehr nachträglich änderbar)') : '' ?>
-                            <?= $type['hidden'] ? _('(dieser Knoten ist versteckt)') : '' ?>
+                            <?= empty($type['editable']) ? _('(nicht mehr nachträglich änderbar)') : '' ?>
+                            <?= !empty($type['hidden']) ? _('(dieser Knoten ist versteckt)') : '' ?>
                         </option>
                     <? endforeach ?>
                 </select>
-- 
cgit v1.0


From 260b6ac6ea08dc3bf973580ab41ecea61635890f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 29 Apr 2024 12:01:39 +0000
Subject: fixes #4090

Closes #4090

Merge request studip/studip!2934
---
 lib/classes/PageLayout.php      | 24 +++++++++++++++++++++++-
 lib/classes/helpbar/Helpbar.php |  3 ++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/classes/PageLayout.php b/lib/classes/PageLayout.php
index fca69b5..4eb422c 100644
--- a/lib/classes/PageLayout.php
+++ b/lib/classes/PageLayout.php
@@ -36,6 +36,11 @@ class PageLayout
     private static $help_keyword;
 
     /**
+     * current help URL (or null if unset)
+     */
+    private static ?string $help_url = null;
+
+    /**
      * base item path for tab view (defaults to active item in top nav)
      */
     private static $tab_navigation_path = false;
@@ -179,7 +184,24 @@ class PageLayout
      */
     public static function getHelpKeyword()
     {
-        return isset(self::$help_keyword) ? self::$help_keyword : 'Basis.Allgemeines';
+        return self::$help_keyword ?? 'Basis.Allgemeines';
+    }
+
+    /**
+     * Set the help URL in the help bar. Pass null to fall back to the help keyword.
+     */
+    public static function setHelpUrl(?string $url): void
+    {
+        self::$help_url = $url;
+    }
+
+    /**
+     * Get the current help URL. If no URL is set explicitely, the URL for
+     * the help keyword is used.
+     */
+    public static function getHelpUrl(): ?string
+    {
+        return self::$help_url ?? format_help_url(self::getHelpKeyword());
     }
 
     /**
diff --git a/lib/classes/helpbar/Helpbar.php b/lib/classes/helpbar/Helpbar.php
index cfa98a3..cc2c619 100644
--- a/lib/classes/helpbar/Helpbar.php
+++ b/lib/classes/helpbar/Helpbar.php
@@ -253,7 +253,8 @@ class Helpbar extends WidgetContainer
         // add wiki link and remove it from navigation
         $this->addLink(
             _('Weiterführende Hilfe'),
-            format_help_url(PageLayout::getHelpKeyword()), Icon::create('link-extern', 'info_alt'),
+            PageLayout::getHelpUrl(),
+            Icon::create('link-extern', Icon::ROLE_INFO_ALT),
             '_blank',
             ['rel' => 'noopener noreferrer']
         );
-- 
cgit v1.0


From d0b3cea122cc90faec0b7b4b4c24267a06d022b6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 29 Apr 2024 12:08:40 +0000
Subject: cronjobs: remove scheduling once and priority, fixes #4078

Closes #4078

Merge request studip/studip!2922
---
 RELEASE-NOTES.md                                   |  1 +
 app/controllers/admin/cronjobs/schedules.php       | 39 +++++-------
 app/views/admin/cronjobs/schedules/display.php     | 22 +------
 app/views/admin/cronjobs/schedules/edit.php        | 39 ------------
 app/views/admin/cronjobs/schedules/index.php       | 29 ++-------
 db/migrations/1.231_add_files_search_index.php     |  7 +--
 ...emove_cronjobs_scheduling_once_and_priority.php | 19 ++++++
 lib/classes/CronjobScheduler.class.php             | 67 +++++++++-----------
 lib/models/CronjobSchedule.class.php               | 72 +++-------------------
 lib/models/CronjobTask.class.php                   | 68 ++++++++++----------
 tests/unit/lib/classes/CronjobScheduleTest.php     | 54 ----------------
 11 files changed, 111 insertions(+), 306 deletions(-)
 create mode 100644 db/migrations/6.0.1_remove_cronjobs_scheduling_once_and_priority.php

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index a10e714..d28b92b 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -18,6 +18,7 @@
 - Die Funktionen `studip_json_encode()` und `studip_json_decode()` wurden entfernt. Stattdessen müssen die Methode `json_encode()` und `json_decode()` verwendet werden. ([Issue #3814](https://gitlab.studip.de/studip/studip/-/issues/3814))
 - Die `MembersModel.php` wurde entfernt ([Issue #3811](https://gitlab.studip.de/studip/studip/-/issues/3811))
 - Die `admission.inc.php` wurde entfernt. ([Issue #3812](https://gitlab.studip.de/studip/studip/-/issues/3812))
+- Die Methoden `CronjobScheduler::scheduleOnce()` sowie `CronjobTask::scheduleOnce()` wurden ersatzlos entfernt. ([Issue #4078](https://gitlab.studip.de/studip/studip/-/issues/4078))
 
 ## Security related issues
 
diff --git a/app/controllers/admin/cronjobs/schedules.php b/app/controllers/admin/cronjobs/schedules.php
index 294d78d..929ae29 100644
--- a/app/controllers/admin/cronjobs/schedules.php
+++ b/app/controllers/admin/cronjobs/schedules.php
@@ -29,7 +29,7 @@ class Admin_Cronjobs_SchedulesController extends AuthenticatedController
         if (empty($_SESSION['cronjob-filter'])) {
             $_SESSION['cronjob-filter'] = [
                 'where'  => '1',
-                'values' => array_fill_keys(['type', 'status', 'task_id'], null),
+                'values' => array_fill_keys(['status', 'task_id'], null),
             ];
         }
 
@@ -102,9 +102,6 @@ class Admin_Cronjobs_SchedulesController extends AuthenticatedController
         $filter     = array_filter(Request::optionArray('filter'));
         $conditions = [];
 
-        if (!empty($filter['type'])) {
-            $conditions[] = "type = " . DBManager::get()->quote($filter['type']);
-        }
         if (!empty($filter['status'])) {
             $active = (int)($filter['status'] === 'active');
             $conditions[] = "active = " . DBManager::get()->quote($active);
@@ -130,7 +127,6 @@ class Admin_Cronjobs_SchedulesController extends AuthenticatedController
         if (Request::submitted('store')) {
             $parameters = Request::getArray('parameters');
 
-            $schedule->priority    = Request::option('priority', 'normal');
             $schedule->title       = Request::get('title');
             $schedule->description = Request::get('description');
             $schedule->active      = Request::int('active', 0);
@@ -138,27 +134,20 @@ class Admin_Cronjobs_SchedulesController extends AuthenticatedController
                 $schedule->task_id = Request::option('task_id');
             }
             $schedule->parameters  = $parameters[$schedule->task_id];
-            $schedule->type        = Request::option('type') === 'once'
-                                   ? 'once'
-                                   : 'periodic';
-
-            if ($schedule->type === 'once') {
-                $temp = Request::getArray('once');
-                $schedule->next_execution = strtotime($temp['date'] . ' ' . $temp['time']);
-            } else {
-                $temp = Request::getArray('periodic');
-                $schedule->minute      = $this->extractCronItem($temp['minute']);
-                $schedule->hour        = $this->extractCronItem($temp['hour']);
-                $schedule->day         = $this->extractCronItem($temp['day']);
-                $schedule->month       = $this->extractCronItem($temp['month']);
-                $schedule->day_of_week = mb_strlen($temp['day_of_week']['value'])
-                                       ? (int) $temp['day_of_week']['value']
-                                       : null;
-
-                if ($schedule->active) {
-                    $schedule->next_execution = $schedule->calculateNextExecution();
-                }
+
+            $temp = Request::getArray('periodic');
+            $schedule->minute      = $this->extractCronItem($temp['minute']);
+            $schedule->hour        = $this->extractCronItem($temp['hour']);
+            $schedule->day         = $this->extractCronItem($temp['day']);
+            $schedule->month       = $this->extractCronItem($temp['month']);
+            $schedule->day_of_week = mb_strlen($temp['day_of_week']['value'])
+                                   ? (int) $temp['day_of_week']['value']
+                                   : null;
+
+            if ($schedule->active) {
+                $schedule->next_execution = $schedule->calculateNextExecution();
             }
+
             $schedule->store();
 
             PageLayout::postSuccess(_('Die Änderungen wurden gespeichert.'));
diff --git a/app/views/admin/cronjobs/schedules/display.php b/app/views/admin/cronjobs/schedules/display.php
index 8eb9075..ddf1d21 100644
--- a/app/views/admin/cronjobs/schedules/display.php
+++ b/app/views/admin/cronjobs/schedules/display.php
@@ -16,9 +16,6 @@
     <dt><?= _('Aktiv') ?></dt>
     <dd><?= $schedule->active ? _('Ja') : _('Nein') ?></dd>
 
-    <dt><?= _('Priorität') ?></dt>
-    <dd><?= CronjobSchedule::describePriority($schedule->priority) ?></dd>
-
 <? if (count($schedule->parameters) > 0): ?>
     <dt><?= _('Parameter') ?></dt>
     <dd>
@@ -33,23 +30,8 @@
     <dt><?= _('Aufgabe') ?></dt>
     <dd><?= htmlReady($schedule->task->name) ?></dd>
 
-    <dt><?= _('Typ') ?></dt>
-<? if ($schedule->type === 'once'): ?>
-    <dd>
-        <?= sprintf(_('Einmalig am %s um %s'), date('d.m.Y', $schedule->next_execution), date('H:i', $schedule->next_execution)) ?>
-    </dd>
-
-    <dt><?= _('Ausgeführt') ?>?</dt>
-    <dd>
-    <? if ($schedule->execution_count > 0): ?>
-        <?= _('Ja') ?>, <?= sprintf(_('am %s um %s'), date('d.m.Y', $schedule->last_execution), date('H:i:s', $schedule->last_execution)) ?>
-    <? else: ?>
-        <?= _('Nein') ?>
-    <? endif; ?>
-    </dd>
-<? else: ?>
+    <dt><?= _('Ausführungsrhytmus') ?></dt>
     <dd>
-        <?= _('Regelmässig') ?>
         <?= $this->render_partial('admin/cronjobs/schedules/periodic-schedule', $schedule->toArray()) ?>
     </dd>
 
@@ -68,8 +50,6 @@
         <dt><?= _('Letztes Ergebnis') ?></dt>
         <dd><code><?= htmlReady($schedule->last_result) ?></code></dd>
     <? endif; ?>
-
-<? endif; ?>
 </dl>
 
 <div data-dialog-button>
diff --git a/app/views/admin/cronjobs/schedules/edit.php b/app/views/admin/cronjobs/schedules/edit.php
index 96be249..8754510 100644
--- a/app/views/admin/cronjobs/schedules/edit.php
+++ b/app/views/admin/cronjobs/schedules/edit.php
@@ -42,17 +42,6 @@ $days_of_week = [
         </label>
 
         <label>
-            <?= _('Priorität') ?>
-            <select name="priority" id="priority">
-            <? foreach (CronjobSchedule::getPriorities() as $priority => $label): ?>
-                <option value="<?= $priority ?>" <? if ((!$schedule->priority && $priority === CronjobSchedule::PRIORITY_NORMAL) || $schedule->priority === $priority) echo 'selected'; ?>>
-                    <?= htmlReady($label) ?>
-                </option>
-            <? endforeach; ?>
-            </select>
-        </label>
-
-        <label>
             <?= _('Titel') ?>
             <input type="text" name="title" id="title" value="<?= htmlReady($schedule->title ?: '') ?>">
         </label>
@@ -118,14 +107,6 @@ $days_of_week = [
     <fieldset>
         <legend><?= _('Zeitplan') ?></legend>
 
-        <label>
-            <input type="radio" name="type" value="periodic"
-                   data-activates="[name^='periodic']"
-                   data-deactivates="[name^='once']"
-                   <? if ($schedule->type === 'periodic') echo 'checked'; ?>>
-            <?= _('Wiederholt') ?>
-        </label>
-
         <section>
             <table class="default">
                 <colgroup>
@@ -218,26 +199,6 @@ $days_of_week = [
                 </tbody>
             </table>
         </section>
-
-        <label>
-            <input type="radio" name="type" value="once"
-                   data-activates="input[name^='once']"
-                   data-deactivates="[name^='periodic']"
-                   <? if ($schedule->type === 'once') echo 'checked'; ?>>
-            <?= _('Einmalig') ?>
-        </label>
-
-        <label class="col-1">
-            <?= _('Datum') ?>
-            <input type="text" name="once[date]" data-date-picker class="size-s"
-                   value="<? if ($schedule->type === 'once' && $schedule->next_execution) echo date('d.m.Y', $schedule->next_execution); ?>">
-        </label>
-
-        <label class="col-1">
-            <?= _('Uhrzeit') ?>
-            <input type="text" name="once[time]" data-time-picker class="size-s"
-                   value="<? if ($schedule->type === 'once' && $schedule->next_execution) echo date('H:i', $schedule->next_execution) ?>">
-        </label>
     </fieldset>
 
     <footer class="buttons">
diff --git a/app/views/admin/cronjobs/schedules/index.php b/app/views/admin/cronjobs/schedules/index.php
index 6160875..f4b0b13 100644
--- a/app/views/admin/cronjobs/schedules/index.php
+++ b/app/views/admin/cronjobs/schedules/index.php
@@ -18,19 +18,7 @@ use Studip\Button, Studip\LinkButton;
                 <?= sprintf(_('Passend: %u von %u Cronjobs'), count($schedules), $total) ?>
             <? endif; ?>
         </legend>
-        <label class="col-2">
-            <?= _('Typ') ?>
-            <select name="filter[type]" id="type" class="submit-upon-select">
-                <option value=""><?= _('Alle Cronjobs anzeigen') ?></option>
-                <option value="once" <? if ($filter['type'] === 'once') echo 'selected'; ?>>
-                    <?= _('Nur einmalige Cronjobs anzeigen') ?>
-                </option>
-                <option value="periodic" <? if ($filter['type'] === 'periodic') echo 'selected'; ?>>
-                    <?= _('Nur regelmässige Cronjobs anzeigen') ?>
-                </option>
-            </select>
-        </label>
-        <label class="col-2">
+        <label class="col-3">
             <?= _('Aufgabe') ?>
             <select name="filter[task_id]" id="task_id" class="submit-upon-select">
                 <option value=""><?= _('Alle Cronjobs anzeigen') ?></option>
@@ -41,7 +29,7 @@ use Studip\Button, Studip\LinkButton;
                 <? endforeach; ?>
             </select>
         </label>
-        <label class="col-2">
+        <label class="col-3">
             <?= _('Status') ?>
             <select name="filter[status]" id="status" class="submit-upon-select">
                 <option value=""><?= _('Alle Cronjobs anzeigen') ?></option>
@@ -74,7 +62,6 @@ use Studip\Button, Studip\LinkButton;
             <col style="width: 20px">
             <col>
             <col style="width: 40px">
-            <col style="width: 100px">
             <col style="width: 30px">
             <col style="width: 30px">
             <col style="width: 30px">
@@ -91,7 +78,6 @@ use Studip\Button, Studip\LinkButton;
             </th>
             <th data-sort="text"><?= _('Cronjob') ?></th>
             <th data-sort="htmldata"><?= _('Aktiv') ?></th>
-            <th data-sort="text"><?= _('Typ') ?></th>
             <th colspan="5" data-sort="false"><?= _('Ausführung') ?></th>
             <th data-sort="false"><?= _('Optionen') ?></th>
         </tr>
@@ -124,14 +110,7 @@ use Studip\Button, Studip\LinkButton;
                         </a>
                     <? endif; ?>
                 </td>
-                <td><?= $schedule->type === 'once' ? _('Einmalig') : _('Regelmässig') ?></td>
-                <? if ($schedule->type === 'once'): ?>
-                    <td colspan="5">
-                        <?= strftime('%x %R', $schedule->next_execution) ?>
-                    </td>
-                <? else: ?>
-                    <?= $this->render_partial('admin/cronjobs/schedules/periodic-schedule', $schedule->toArray() + ['display' => 'table-cells']) ?>
-                <? endif; ?>
+                <?= $this->render_partial('admin/cronjobs/schedules/periodic-schedule', $schedule->toArray() + ['display' => 'table-cells']) ?>
                 <td style="text-align: right">
                     <a data-dialog href="<?= $controller->display($schedule) ?>">
                         <?= Icon::create('admin')->asImg(['title' => _('Cronjob anzeigen')]) ?>
@@ -152,7 +131,7 @@ use Studip\Button, Studip\LinkButton;
         </tbody>
         <tfoot>
         <tr>
-            <td colspan="10">
+            <td colspan="9">
                 <select name="action" data-activates=".cronjobs button[name=bulk]" aria-label="<?= _('Aktion auswählen')?>">
                     <option value="">- <?= _('Aktion auswählen') ?> -</option>
                     <option value="activate"><?= _('Aktivieren') ?></option>
diff --git a/db/migrations/1.231_add_files_search_index.php b/db/migrations/1.231_add_files_search_index.php
index 18a22ae..5ac455a 100644
--- a/db/migrations/1.231_add_files_search_index.php
+++ b/db/migrations/1.231_add_files_search_index.php
@@ -181,12 +181,7 @@ class AddFilesSearchIndex extends Migration
 
     private function installCronjob()
     {
-        $scheduler = CronjobScheduler::getInstance();
-
         require_once 'lib/classes/FilesSearch/Cronjob.php';
-        $task = new  \FilesSearch\Cronjob();
-        $taskId = $scheduler->registerTask($task);
-        $scheduler->scheduleOnce($taskId, strtotime('+1 minute'))->activate();
-        $scheduler->schedulePeriodic($taskId, 55, 0)->activate();
+        \FilesSearch\Cronjob::register()->schedule(55, 0)->activate(true);
     }
 }
diff --git a/db/migrations/6.0.1_remove_cronjobs_scheduling_once_and_priority.php b/db/migrations/6.0.1_remove_cronjobs_scheduling_once_and_priority.php
new file mode 100644
index 0000000..d3d95b0
--- /dev/null
+++ b/db/migrations/6.0.1_remove_cronjobs_scheduling_once_and_priority.php
@@ -0,0 +1,19 @@
+<?php
+ return new class extends Migration
+ {
+     protected function up()
+     {
+         $query = "ALTER TABLE `cronjobs_schedules`
+                   DROP COLUMN `priority`,
+                   DROP COLUMN `type`";
+         DBManager::get()->exec($query);
+     }
+
+     protected function down()
+     {
+         $query = "ALTER TABLE `cronjobs_schedules`
+                   ADD COLUMN `priority` ENUM('low', 'normal', 'high') COLLATE `latin1_bin` DEFAULT NULL AFTER `parameters`,
+                   ADD COLUMN `type` ENUM('periodic', 'once') COLLATE `latin1_bin` DEFAULT NULL AFTER `priority`";
+         DBManager::get()->exec($query);
+     }
+ };
diff --git a/lib/classes/CronjobScheduler.class.php b/lib/classes/CronjobScheduler.class.php
index 67db94c..69b1fb3 100644
--- a/lib/classes/CronjobScheduler.class.php
+++ b/lib/classes/CronjobScheduler.class.php
@@ -132,35 +132,6 @@ class CronjobScheduler
     }
 
     /**
-     * Schedules a task for a single execution at the provided time.
-     *
-     * @param String $task_id    The id of the task to be executed
-     * @param int    $timestamp  When the task should be executed
-     * @param String $priority   Priority of the execution (low, normal, high),
-     *                           defaults to normal
-     * @param Array  $parameters Optional parameters passed to the task
-     * @return CronjobSchedule The generated schedule object.
-     */
-    public function scheduleOnce($task_id, $timestamp, $priority = CronjobSchedule::PRIORITY_NORMAL,
-                                 $parameters = [])
-    {
-        $schedule = new CronjobSchedule();
-        $schedule->type           = 'once';
-        $schedule->task_id        = $task_id;
-        $schedule->parameters     = $parameters;
-        $schedule->priority       = $priority;
-        $schedule->next_execution = $timestamp;
-
-        $schedule->store();
-
-        $task = $schedule->task;
-        $task->assigned_count += 1;
-        $task->store();
-
-        return $schedule;
-    }
-
-    /**
      * Schedules a task for periodic execution with the provided schedule.
      *
      * @param String $task_id     The id of the task to be executed
@@ -185,21 +156,21 @@ class CronjobScheduler
      *                            - 1 >= x >= 7 for "exactly at day of week x"
      *                              (x starts with monday at 1 and ends with
      *                               sunday at 7)
-     * @param String $priority   Priority of the execution (low, normal, high),
-     *                           defaults to normal
      * @param Array  $parameters Optional parameters passed to the task
      * @return CronjobSchedule The generated schedule object.
      */
-    public function schedulePeriodic($task_id, $minute = null, $hour = null,
-                                     $day = null, $month = null, $day_of_week = null,
-                                     $priority = CronjobSchedule::PRIORITY_NORMAL,
-                                     $parameters = [])
-    {
+    public function schedule(
+        string $task_id,
+        ?int $minute = null,
+        ?int $hour = null,
+        ?int $day = null,
+        ?int $month = null,
+        ?int $day_of_week = null,
+        array $parameters = []
+    ): CronjobSchedule {
         $schedule = new CronjobSchedule();
-        $schedule->type       = 'periodic';
         $schedule->task_id    = $task_id;
         $schedule->parameters = $parameters;
-        $schedule->priority   = $priority;
 
         $schedule->minute = $minute;
         $schedule->hour = $hour;
@@ -217,6 +188,24 @@ class CronjobScheduler
     }
 
     /**
+     * An alias for schedule for backwards compatibility.
+     *
+     * @see CronjobScheduler::schedule()
+     */
+    public function schedulePeriodic(
+        $task_id,
+        $minute = null,
+        $hour = null,
+        $day = null,
+        $month = null,
+        $day_of_week = null,
+        $priority = null,
+        $parameters = []
+    ) {
+        return $this->schedule($task_id, $minute, $hour, $day, $month, $day_of_week, $parameters);
+    }
+
+    /**
      * Cancels the provided schedule.
      *
      * @param String $schedule_id Id of the schedule to be canceled
@@ -259,7 +248,7 @@ class CronjobScheduler
 
         // Find all schedules that are due to execute and which task is active
         $temp = CronjobSchedule::findBySQL('active = 1 AND next_execution <= UNIX_TIMESTAMP() '
-                                          .'ORDER BY priority DESC, next_execution ASC');
+                                          .'ORDER next_execution');
         $schedules = array_filter($temp, function ($schedule) { return $schedule->task->active; });
 
         if (count($schedules) === 0) {
diff --git a/lib/models/CronjobSchedule.class.php b/lib/models/CronjobSchedule.class.php
index 4304be1..0eb19ba 100644
--- a/lib/models/CronjobSchedule.class.php
+++ b/lib/models/CronjobSchedule.class.php
@@ -34,8 +34,6 @@
  * @property string|null $title database column
  * @property string|null $description database column
  * @property string|null $parameters database column
- * @property string $priority database column
- * @property string $type database column
  * @property int|null $minute database column
  * @property int|null $hour database column
  * @property int|null $day database column
@@ -53,10 +51,6 @@
 
 class CronjobSchedule extends SimpleORMap
 {
-    const PRIORITY_LOW    = 'low';
-    const PRIORITY_NORMAL = 'normal';
-    const PRIORITY_HIGH   = 'high';
-
     protected static function configure($config = [])
     {
         $config['db_table'] = 'cronjobs_schedules';
@@ -79,41 +73,6 @@ class CronjobSchedule extends SimpleORMap
     }
 
     /**
-     * Returns a mapped version of the priorities (key = priority value,
-     * value = localized priority label).
-     *
-     * @return Array The mapped priorities
-     */
-    public static function getPriorities()
-    {
-        $mapping = [];
-        $mapping[self::PRIORITY_LOW]    = _('niedrig');
-        $mapping[self::PRIORITY_NORMAL] = _('normal');
-        $mapping[self::PRIORITY_HIGH]   = _('hoch');
-
-        return $mapping;
-    }
-
-    /**
-     * Maps a priority value to it's localized label.
-     *
-     * @param  String $priority Priority value
-     * @return String The localized label
-     * @throws RuntimeException when an unknown priority value is passed
-     */
-    public static function describePriority($priority)
-    {
-        $priority = $priority ?? 'normal';
-
-        $mapping = self::getPriorities();
-        if (!isset($mapping[$priority])) {
-            throw new RuntimeException('Access to unknown priority "' . $priority . '"');
-        }
-
-        return $mapping[$priority];
-    }
-
-    /**
      * replaces title with task name if title is empty.
      *
      * @return string the title or the task name
@@ -171,10 +130,12 @@ class CronjobSchedule extends SimpleORMap
      *
      * @return CronjobSchedule Returns itself to allow chaining
      */
-    public function activate()
+    public function activate(bool $run_immediately = false)
     {
-        $this->active         = 1;
-        $this->next_execution = $this->calculateNextExecution();
+        $next_execution = $run_immediately ? strtotime('-1 minute') : $this->calculateNextExecution();
+
+        $this->active = true;
+        $this->next_execution = $next_execution;
         $this->store();
 
         return $this;
@@ -187,7 +148,7 @@ class CronjobSchedule extends SimpleORMap
      */
     public function deactivate()
     {
-        $this->active = 0;
+        $this->active = false;
         $this->store();
 
         return $this;
@@ -221,9 +182,6 @@ class CronjobSchedule extends SimpleORMap
 
         $result = $this->task->engage($this->last_result, $this->parameters);
 
-        if ($this->type === 'once') {
-            $this->active = 0;
-        }
         $this->last_result = $result;
         $this->store();
 
@@ -245,16 +203,12 @@ class CronjobSchedule extends SimpleORMap
     /**
      * Calculates the next execution for this schedule.
      *
-     * For schedules of type 'once' the check solely tests whether the
-     * timestamp has already passed and will return false in that case.
-     * Otherwise the defined timestamp will be returned.
-     *
-     * For schedules of type 'periodic' the next execution
-     * is calculated by increasing the current timestamp and testing
-     * whether all conditions match. This is not the best method to test
-     * and should be optimized sooner or later.
+     * The next execution is calculated by increasing the current timestamp
+     * and testing whether all conditions match. This is not the best method
+     * to test and should be optimized sooner or later.
      *
      * @param mixed $now Defines the temporal fix point
+     *
      * @return int Timestamp of calculated next execution
      * @throws RuntimeException When calculation takes too long (you should
      *                          check the conditions for validity in that case)
@@ -263,12 +217,6 @@ class CronjobSchedule extends SimpleORMap
     {
         $now = $now ?: time();
 
-        if ($this->type === 'once') {
-            return $now <= $this->next_execution
-                ? $this->next_execution
-                : false;
-        }
-
         $result  = $now;
         $result -= $result % 60;
 
diff --git a/lib/models/CronjobTask.class.php b/lib/models/CronjobTask.class.php
index f235951..8a56ca0 100644
--- a/lib/models/CronjobTask.class.php
+++ b/lib/models/CronjobTask.class.php
@@ -160,72 +160,70 @@ class CronjobTask extends SimpleORMap
 // Convenience methods to ease the usage
 
     /**
-     * Schedules this task for a single execution at the provided time.
-     *
-     * @param int    $timestamp  When the task should be executed
-     * @param String $priority   Priority of the execution (low, normal, high),
-     *                           defaults to normal
-     * @param Array  $parameters Optional parameters passed to the task
-     * @return CronjobSchedule The generated schedule object.
-     */
-    public function scheduleOnce($timestamp, $priority = CronjobSchedule::PRIORITY_NORMAL,
-                                 $parameters = [])
-    {
-        return CronjobScheduler::getInstance()->scheduleOnce(
-            $this->id,
-            $timestamp,
-            $priority,
-            $parameters
-        );
-    }
-
-    /**
      * Schedules this task for periodic execution with the provided schedule.
      *
-     * @param mixed  $minute      Minute part of the schedule:
+     * @param int|null  $minute      Minute part of the schedule:
      *                            - null for "every minute" a.k.a. "don't care"
      *                            - x < 0 for "every x minutes"
      *                            - x >= 0 for "only at minute x"
-     * @param mixed  $hour        Hour part of the schedule:
+     * @param int|null  $hour        Hour part of the schedule:
      *                            - null for "every hour" a.k.a. "don't care"
      *                            - x < 0 for "every x hours"
      *                            - x >= 0 for "only at hour x"
-     * @param mixed  $day         Day part of the schedule:
+     * @param int|null  $day         Day part of the schedule:
      *                            - null for "every day" a.k.a. "don't care"
      *                            - x < 0 for "every x days"
      *                            - x > 0 for "only at day x"
-     * @param mixed  $month       Month part of the schedule:
+     * @param int|null  $month       Month part of the schedule:
      *                            - null for "every month" a.k.a. "don't care"
      *                            - x < 0 for "every x months"
      *                            - x > 0 for "only at month x"
-     * @param mixed  $day_of_week Day of week part of the schedule:
+     * @param int|null  $day_of_week Day of week part of the schedule:
      *                            - null for "every day" a.k.a. "don't care"
      *                            - 1 >= x >= 7 for "exactly at day of week x"
      *                              (x starts with monday at 1 and ends with
      *                               sunday at 7)
-     * @param String $priority   Priority of the execution (low, normal, high),
-     *                           defaults to normal
-     * @param Array  $parameters Optional parameters passed to the task
+     * @param array  $parameters Optional parameters passed to the task
      * @return CronjobSchedule The generated schedule object.
      */
-    public function schedulePeriodic($minute = null, $hour = null,
-                                     $day = null, $month = null, $day_of_week = null,
-                                     $priority = CronjobSchedule::PRIORITY_NORMAL,
-                                     $parameters = [])
-    {
-        return CronjobScheduler::getInstance()->schedulePeriodic(
+    public function schedule(
+        ?int $minute = null,
+        ?int $hour = null,
+        ?int $day = null,
+        ?int $month = null,
+        ?int $day_of_week = null,
+        array $parameters = []
+    ): CronjobSchedule {
+        return CronjobScheduler::getInstance()->schedule(
             $this->id,
             $minute,
             $hour,
             $day,
             $month,
             $day_of_week,
-            $priority,
             $parameters
         );
     }
 
     /**
+     * An alias for schedule for backwards compatibility.
+     *
+     * @see CronjobTask::schedule()
+     * @return CronjobSchedule
+     */
+    public function schedulePeriodic(
+        $minute = null,
+        $hour = null,
+        $day = null,
+        $month = null,
+        $day_of_week = null,
+        $priority = '',
+        $parameters = []
+    ) {
+        return $this->schedule($minute, $hour, $day, $month, $day_of_week, $parameters);
+    }
+
+    /**
      * Extracts the default parameter values from the associated task.
      *
      * @return array
diff --git a/tests/unit/lib/classes/CronjobScheduleTest.php b/tests/unit/lib/classes/CronjobScheduleTest.php
index a97872e..b6fd573 100644
--- a/tests/unit/lib/classes/CronjobScheduleTest.php
+++ b/tests/unit/lib/classes/CronjobScheduleTest.php
@@ -26,69 +26,15 @@ class CronjobScheduleTest extends \Codeception\Test\Unit
         StudipTestHelper::tear_down_tables();
     }
 
-    function testOnceSchedule()
-    {
-        $schedule = new CronjobSchedule();
-        $schedule->type = 'once';
-
-        $this->assertEquals('once', $schedule->type);
-
-        return $schedule;
-    }
-
-    /**
-     * @depends testOnceSchedule
-     */
-    function testNextExecutionOncePast($schedule)
-    {
-        $now  = strtotime('10.11.2013 01:02:00');
-        $then = strtotime('-2 weeks', $now);
-
-        $schedule->next_execution = $then;
-        $schedule->calculateNextExecution();
-
-        $this->assertEquals($then, $schedule->next_execution);
-    }
-
-    /**
-     * @depends testOnceSchedule
-     */
-    function testNextExecutionOncePresent($schedule)
-    {
-        $now = strtotime('10.11.2013 01:02:00');
-
-        $schedule->next_execution = $now;
-        $schedule->calculateNextExecution();
-
-        $this->assertEquals($now, $schedule->next_execution);
-    }
-
-    /**
-     * @depends testOnceSchedule
-     */
-    function testNextExecutionOnceFuture(CronjobSchedule $schedule)
-    {
-        $now  = strtotime('10.11.2013 01:02:00');
-        $then = strtotime('+2 weeks', $now);
-
-        $schedule->next_execution = $then;
-        $schedule->calculateNextExecution($now);
-
-        $this->assertEquals($then, $schedule->next_execution);
-    }
-
     function testPeriodicSchedule()
     {
         $schedule = new CronjobSchedule();
-        $schedule->type        = 'periodic';
         $schedule->minute      = null;
         $schedule->hour        = null;
         $schedule->day         = null;
         $schedule->month       = null;
         $schedule->day_of_week = null;
 
-        $this->assertEquals('periodic', $schedule->type);
-
         return $schedule;
     }
 
-- 
cgit v1.0


From a0b463f9ec72f045ba2ce79510224e0d20884404 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Mon, 29 Apr 2024 14:13:10 +0200
Subject: fix typo, re #4090

---
 lib/classes/PageLayout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/PageLayout.php b/lib/classes/PageLayout.php
index 4eb422c..d3f3028 100644
--- a/lib/classes/PageLayout.php
+++ b/lib/classes/PageLayout.php
@@ -196,7 +196,7 @@ class PageLayout
     }
 
     /**
-     * Get the current help URL. If no URL is set explicitely, the URL for
+     * Get the current help URL. If no URL is set explicitly, the URL for
      * the help keyword is used.
      */
     public static function getHelpUrl(): ?string
-- 
cgit v1.0


From 3ffd2f46af742ee26ecf0884ea4729e37b873e93 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Mon, 29 Apr 2024 14:35:09 +0000
Subject: don't format freetext room twice, partial "dates/_seminar_rooms" will
 handle it, fixes #4092

Closes #4092

Merge request studip/studip!2935
---
 templates/dates/seminar_html.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/dates/seminar_html.php b/templates/dates/seminar_html.php
index 47aa0aa..f227a57 100644
--- a/templates/dates/seminar_html.php
+++ b/templates/dates/seminar_html.php
@@ -55,11 +55,10 @@ if (!$dates['regular']['turnus_data'] && empty($dates['irregular'])) {
                 }
                 $irregular_rooms[$date['resource_id']]++;
             } elseif ($date['raum']) {
-                $temp = '(' . htmlReady($date['raum']) . ')';
-                if (!isset($freetext_rooms[$temp])) {
-                    $freetext_rooms[$temp] = 0;
+                if (!isset($freetext_rooms[$date['raum']])) {
+                    $freetext_rooms[$date['raum']] = 0;
                 }
-                $freetext_rooms[$temp]++;
+                $freetext_rooms[$date['raum']]++;
             }
         }
         // Remove invalid entry if present
-- 
cgit v1.0


From 3abeb6de6112bd177a5f6b96dc944b5637c55b96 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Mon, 29 Apr 2024 14:47:17 +0000
Subject: =?UTF-8?q?Resolve=20"Wiki:=20Einzelne=20Wikiversionen=20k=C3=B6nn?=
 =?UTF-8?q?en=20nicht=20mehr=20gel=C3=B6scht=20werden"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4079

Merge request studip/studip!2925
---
 app/controllers/course/wiki.php                    |  82 +++++-
 app/controllers/jsupdater.php                      |   5 +-
 app/views/course/wiki/ask_deleting.php             |  31 +++
 app/views/course/wiki/history.php                  |  20 ++
 lib/classes/JsonApi/Schemas/WikiPage.php           |   2 +-
 lib/models/WikiPage.class.php                      |   3 +-
 tests/_support/_generated/JsonapiTesterActions.php | 294 ++++++++++-----------
 7 files changed, 277 insertions(+), 160 deletions(-)
 create mode 100644 app/views/course/wiki/ask_deleting.php

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 738d0e7..567e285 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -142,12 +142,21 @@ class Course_WikiController extends AuthenticatedController
                     Icon::create('settings'),
                     ['data-dialog' => 'width=700']
                 );
-                $action_menu->addButton(
-                    'delete',
-                    _('Seite löschen'),
-                    Icon::create('trash'),
-                    ['data-confirm' => _('Wollen Sie wirklich die komplette Seite löschen?'), 'form' => 'delete_page']
-                );
+                if (count($this->page->versions) > 0) {
+                    $action_menu->addLink(
+                        $this->ask_deletingURL($this->page),
+                        _('Seite / Version löschen'),
+                        Icon::create('trash'),
+                        ['data-dialog' => 'size=auto']
+                    );
+                } else {
+                    $action_menu->addButton(
+                        'delete',
+                        _('Seite löschen'),
+                        Icon::create('trash'),
+                        ['data-confirm' => _('Wollen Sie wirklich die komplette Seite löschen?'), 'form' => 'delete_page']
+                    );
+                }
             }
             $action_menu->addLink(
                 '#',
@@ -256,7 +265,10 @@ class Course_WikiController extends AuthenticatedController
                     "[[ " . $values['name'],
                     $p2['content']
                 );
-                $p2->store();
+                if ($p2->isDirty()) {
+                    $p2['user_id'] = User::findCurrent()->id;
+                    $p2->store();
+                }
             }
         })->validate();
         if (Request::isPost()) {
@@ -272,9 +284,17 @@ class Course_WikiController extends AuthenticatedController
         $this->render_form($this->form);
     }
 
+    public function ask_deleting_action(WikiPage $page)
+    {
+        if (!$page->isEditable()) {
+            throw new AccessDeniedException();
+        }
+        PageLayout::setTitle(_('Was genau soll gelöscht werden?'));
+    }
+
     public function delete_action(WikiPage $page)
     {
-        if (!Request::isPost() || !CSRFProtection::verifyRequest()) {
+        if (!Request::isPost() || !$page->isEditable() || !CSRFProtection::verifyRequest()) {
             throw new AccessDeniedException();
         }
         $name = $page->name;
@@ -283,6 +303,38 @@ class Course_WikiController extends AuthenticatedController
         $this->redirect($this->allpagesURL());
     }
 
+    public function deleteversion_action(WikiPage $page, $version_id = null)
+    {
+        if (!Request::isPost() || !$page->isEditable() || !CSRFProtection::verifyRequest()) {
+            throw new AccessDeniedException();
+        }
+        if ($version_id === null) {
+            $version = $page->versions[0];
+            if ($version) {
+                $page['name'] = $version['name'];
+                $page['content'] = $version['content'];
+                $page['user_id'] = $version['user_id'];
+                $page['chdate'] = $version['mkdate'];
+                $page->store();
+                $version->delete();
+            } else {
+                $page->delete();
+            }
+        } else {
+            $version = WikiVersion::find($version_id);
+            if ($version['page_id'] === $page->id) {
+                $version->delete();
+            }
+        }
+        PageLayout::postSuccess(_('Version wurde gelöscht.'));
+        if (Request::get('redirect_to') === 'page') {
+            $this->redirect($this->page($page));
+        } else {
+            $this->redirect($this->history($page));
+        }
+
+    }
+
     public function allpages_action()
     {
         $this->pages = WikiPage::findBySQL(
@@ -535,8 +587,11 @@ class Course_WikiController extends AuthenticatedController
         }
 
         $page->content = \Studip\Markup::markAsHtml(trim(Request::get('content')));
-        $page->store();
         $user = User::findCurrent();
+        if ($page->isDirty()) {
+            $page['user_id'] = $user->id;
+            $page->store();
+        }
         $pageData = [
             'page_id' => $page->id,
             'user_id' => $user->id
@@ -774,6 +829,10 @@ class Course_WikiController extends AuthenticatedController
                         'type' => 'no',
                         'mapper' => function () { return $this->range->id; }
                     ],
+                    'user_id' => [
+                        'type' => 'no',
+                        'mapper' => function () { return User::findCurrent()->id; }
+                    ],
                     'name' => [
                         'required' => true,
                         'label' => _('Name der Seite'),
@@ -828,7 +887,10 @@ class Course_WikiController extends AuthenticatedController
                             '[[ ' . $values['name'] . ' ]]',
                             $page->content
                         );
-                        $page->store();
+                        if ($page->isDirty()) {
+                            $page['user_id'] = User::findCurrent()->id;
+                            $page->store();
+                        }
                     }
                 }
             }
diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index 319edaa..a5425f9 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -299,7 +299,10 @@ class JsupdaterController extends AuthenticatedController
                             $page->content = \Studip\Markup::markAsHtml(
                                 $pageInfo['wiki_editor_status']['page_content']
                             );
-                            $page->store();
+                            if ($page->isDirty()) {
+                                $page['user_id'] = User::findCurrent()->id;
+                                $page->store();
+                            }
                         }
                         $onlineData = [
                             'user_id' => $user->id,
diff --git a/app/views/course/wiki/ask_deleting.php b/app/views/course/wiki/ask_deleting.php
new file mode 100644
index 0000000..5afd19f
--- /dev/null
+++ b/app/views/course/wiki/ask_deleting.php
@@ -0,0 +1,31 @@
+<form action="" method="post">
+    <?= CSRFProtection::tokenTag() ?>
+    <div class="file_select_possibilities">
+        <div>
+            <div class="clickable">
+                <?= Icon::create('archive2')->asInput(50, [
+                    'formaction' => $controller->deleteversionURL($page, ['redirect_to' => 'page']),
+                    'data-confirm' => _('Wirklich die letzte Änderung löschen?')
+                ]) ?>
+                <button
+                    class="undecorated"
+                    data-confirm="<?= _('Wirklich die letzte Änderung löschen?') ?>"
+                    formaction="<?= $controller->deleteversionURL($page, ['redirect_to' => 'page']) ?>">
+                    <?= _('Nur die letzte Änderung löschen') ?>
+                </button>
+            </div>
+            <div class="clickable">
+                <?= Icon::create('wiki')->asInput(50, [
+                    'formaction' => $controller->deleteURL($page),
+                    'data-confirm' => _('Wollen Sie wirklich die komplette Seite löschen?')
+                ]) ?>
+                <button
+                    class="undecorated"
+                    data-confirm="<?= _('Wollen Sie wirklich die komplette Seite löschen?') ?>"
+                    formaction="<?= $controller->deleteURL($page) ?>">
+                    <?= _('Ganze Wikiseite löschen') ?>
+                </button>
+            </div>
+        </div>
+    </div>
+</form>
diff --git a/app/views/course/wiki/history.php b/app/views/course/wiki/history.php
index 81fde59..cbd324d 100644
--- a/app/views/course/wiki/history.php
+++ b/app/views/course/wiki/history.php
@@ -45,6 +45,16 @@
                 <a href="<?= $controller->versiondiff($page) ?>" data-dialog>
                     <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?>
                 </a>
+                <? if ($page->isEditable()) : ?>
+                    <form action="<?= $controller->deleteversion($page) ?>"
+                          method="post"
+                          class="inline"
+                          title="<?= _('Version löschen') ?>"
+                          data-confirm="<?= _('Wirklich diese Version löschen?') ?>">
+                        <?= CSRFProtection::tokenTag() ?>
+                        <?= Icon::create('trash')->asInput() ?>
+                    </form>
+                <? endif ?>
             </td>
         </tr>
         <? foreach ($page->versions as $i => $version) : ?>
@@ -69,6 +79,16 @@
                 <a href="<?= $controller->versiondiff($page, $version->id) ?>" data-dialog>
                     <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?>
                 </a>
+                <? if ($page->isEditable()) : ?>
+                    <form action="<?= $controller->deleteversion($page, $version->id) ?>"
+                          method="post"
+                          class="inline"
+                          title="<?= _('Version löschen') ?>"
+                          data-confirm="<?= _('Wirklich diese Version löschen?') ?>">
+                        <?= CSRFProtection::tokenTag() ?>
+                        <?= Icon::create('trash')->asInput() ?>
+                    </form>
+                <? endif ?>
             </td>
         </tr>
         <? endforeach ?>
diff --git a/lib/classes/JsonApi/Schemas/WikiPage.php b/lib/classes/JsonApi/Schemas/WikiPage.php
index 857666e..f061ecc 100644
--- a/lib/classes/JsonApi/Schemas/WikiPage.php
+++ b/lib/classes/JsonApi/Schemas/WikiPage.php
@@ -152,7 +152,7 @@ class WikiPage extends SchemaProvider
      */
     private function addAuthorRelationship($relationships, $wiki, $includeList)
     {
-        if ($wiki->user_id) {
+        if ($wiki->user_id && $wiki->user_id !== 'nobody') {
             $relationships[self::REL_AUTHOR] = [
                 self::RELATIONSHIP_LINKS => [
                     Link::RELATED => $this->createLinkToResource($wiki->user),
diff --git a/lib/models/WikiPage.class.php b/lib/models/WikiPage.class.php
index d349aa1..67ddd7e 100644
--- a/lib/models/WikiPage.class.php
+++ b/lib/models/WikiPage.class.php
@@ -92,7 +92,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
 
     protected function createVersion()
     {
-        $this->user_id = User::findCurrent()->id;
+        $last_version = $this->versions[0];
         if (
             !$this->isNew()
             && $this->content['content'] !== $this->content_db['content']
@@ -100,6 +100,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
                 $this->content_db['user_id'] !== $this->content['user_id']
                 || $this->content_db['chdate'] < time() - 60 * 30
             )
+            && (!$last_version || $last_version['content'] !== $this['content'])
         ) {
             //Neue Version anlegen:
             WikiVersion::create([
diff --git a/tests/_support/_generated/JsonapiTesterActions.php b/tests/_support/_generated/JsonapiTesterActions.php
index 5f9e833..c191a3e 100644
--- a/tests/_support/_generated/JsonapiTesterActions.php
+++ b/tests/_support/_generated/JsonapiTesterActions.php
@@ -12,7 +12,7 @@ trait JsonapiTesterActions
      */
     abstract protected function getScenario();
 
-
+    
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -47,7 +47,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -81,7 +81,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('expectThrowable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -95,7 +95,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -110,7 +110,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -124,7 +124,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -139,7 +139,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -154,7 +154,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -169,7 +169,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -184,7 +184,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertThatItsNot', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -199,7 +199,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -214,7 +214,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -229,7 +229,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassHasAttribute', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -244,7 +244,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassHasStaticAttribute', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -259,7 +259,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassNotHasAttribute', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -274,7 +274,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassNotHasStaticAttribute', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -289,7 +289,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -302,7 +302,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContainsEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -318,7 +318,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContainsOnly', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -333,7 +333,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContainsOnlyInstancesOf', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -348,7 +348,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCount', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -362,7 +362,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryDoesNotExist', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -376,7 +376,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryExists', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -390,7 +390,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsNotReadable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -404,7 +404,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsNotWritable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -418,7 +418,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsReadable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -432,7 +432,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsWritable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -447,7 +447,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDoesNotMatchRegularExpression', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -461,7 +461,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -476,7 +476,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -491,7 +491,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEqualsCanonicalizing', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -506,7 +506,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEqualsIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -522,7 +522,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEqualsWithDelta', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -536,7 +536,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -550,7 +550,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileDoesNotExist', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -565,7 +565,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -580,7 +580,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileEqualsCanonicalizing', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -595,7 +595,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileEqualsIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -609,7 +609,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -623,7 +623,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsNotReadable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -637,7 +637,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsNotWritable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -651,7 +651,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsReadable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -665,7 +665,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsWritable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -680,7 +680,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -695,7 +695,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotEqualsCanonicalizing', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -710,7 +710,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotEqualsIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -724,7 +724,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFinite', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -739,7 +739,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -754,7 +754,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -768,7 +768,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInfinite', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -783,7 +783,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -797,7 +797,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsArray', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -811,7 +811,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsBool', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -825,7 +825,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsCallable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -839,7 +839,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsClosedResource', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -853,7 +853,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsFloat', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -867,7 +867,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsInt', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -881,7 +881,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsIterable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -895,7 +895,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotArray', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -909,7 +909,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotBool', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -923,7 +923,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotCallable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -937,7 +937,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotClosedResource', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -951,7 +951,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotFloat', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -965,7 +965,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotInt', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -979,7 +979,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotIterable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -993,7 +993,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotNumeric', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1007,7 +1007,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotObject', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1021,7 +1021,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotReadable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1035,7 +1035,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotResource', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1049,7 +1049,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotScalar', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1063,7 +1063,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1077,7 +1077,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotWritable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1091,7 +1091,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNumeric', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1105,7 +1105,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsObject', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1119,7 +1119,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsReadable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1133,7 +1133,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsResource', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1147,7 +1147,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsScalar', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1161,7 +1161,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1175,7 +1175,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsWritable', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1189,7 +1189,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJson', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1204,7 +1204,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonFileEqualsJsonFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1219,7 +1219,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonFileNotEqualsJsonFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1234,7 +1234,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringEqualsJsonFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1249,7 +1249,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringEqualsJsonString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1264,7 +1264,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringNotEqualsJsonFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1279,7 +1279,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringNotEqualsJsonString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1294,7 +1294,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1309,7 +1309,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1324,7 +1324,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertMatchesRegularExpression', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1338,7 +1338,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNan', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1353,7 +1353,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1364,7 +1364,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContainsEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1380,7 +1380,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContainsOnly', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1395,7 +1395,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotCount', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1409,7 +1409,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1424,7 +1424,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1439,7 +1439,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEqualsCanonicalizing', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1454,7 +1454,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEqualsIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1470,7 +1470,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEqualsWithDelta', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1484,7 +1484,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotFalse', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1499,7 +1499,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1513,7 +1513,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1528,7 +1528,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1543,7 +1543,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSameSize', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1557,7 +1557,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotTrue', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1571,7 +1571,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1586,7 +1586,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertObjectHasAttribute', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1601,7 +1601,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertObjectNotHasAttribute', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1616,7 +1616,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1631,7 +1631,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSameSize', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1644,7 +1644,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringContainsString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1655,7 +1655,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringContainsStringIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1670,7 +1670,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEndsNotWith', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1685,7 +1685,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEndsWith', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1700,7 +1700,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEqualsFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1715,7 +1715,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEqualsFileCanonicalizing', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1730,7 +1730,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEqualsFileIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1745,7 +1745,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringMatchesFormat', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1760,7 +1760,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringMatchesFormatFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1773,7 +1773,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotContainsString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1786,7 +1786,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotContainsStringIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1801,7 +1801,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotEqualsFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1815,7 +1815,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotEqualsFileCanonicalizing', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1830,7 +1830,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotEqualsFileIgnoringCase', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1845,7 +1845,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotMatchesFormat', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1860,7 +1860,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotMatchesFormatFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1875,7 +1875,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsNotWith', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1890,7 +1890,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsWith', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1905,7 +1905,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertThat', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1919,7 +1919,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1934,7 +1934,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlFileEqualsXmlFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1949,7 +1949,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlFileNotEqualsXmlFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1964,7 +1964,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringEqualsXmlFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1979,7 +1979,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringEqualsXmlString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1994,7 +1994,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringNotEqualsXmlFile', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2009,7 +2009,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringNotEqualsXmlString', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2022,7 +2022,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2035,7 +2035,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('markTestIncomplete', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2048,7 +2048,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('markTestSkipped', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2059,7 +2059,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForTestAutor', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2070,7 +2070,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForTestDozent', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2081,7 +2081,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForTestAdmin', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2092,7 +2092,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForRoot', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2108,7 +2108,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('withPHPLib', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2125,7 +2125,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('createApp', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2138,7 +2138,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('createRequestBuilder', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2151,7 +2151,7 @@ trait JsonapiTesterActions
         return $this->getScenario()->runStep(new \Codeception\Step\Action('sendMockRequest', func_get_args()));
     }
 
-
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-- 
cgit v1.0


From 6d93659a93446ed620d5c620a6e0dee2c51781b3 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Mon, 29 Apr 2024 16:25:46 +0000
Subject: Resolve "PERSONALDOCUMENT_ENABLE wird noch verwendet?"

Closes #4093

Merge request studip/studip!2937
---
 lib/navigation/AdminNavigation.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/navigation/AdminNavigation.php b/lib/navigation/AdminNavigation.php
index 7d9cd2d..8e86e04 100644
--- a/lib/navigation/AdminNavigation.php
+++ b/lib/navigation/AdminNavigation.php
@@ -207,11 +207,6 @@ class AdminNavigation extends Navigation
                 $navigation->addSubNavigation('cronjobs', new Navigation(_('Cronjobs'), 'dispatch.php/admin/cronjobs/schedules'));
             }
 
-            if (Config::get()->PERSONALDOCUMENT_ENABLE) {
-                $navigation->addSubNavigation('document_area', new Navigation(_('Pers. Dateibereich'), 'dispatch.php/document/administration'));
-            }
-
-
             $navigation->addSubNavigation('admissionrules', new Navigation(_('Anmelderegeln'), 'dispatch.php/admission/ruleadministration'));
 
             if (Config::get()->API_ENABLED) {
-- 
cgit v1.0


From 01bf94bcc6369b7e7812f6727a52b189728dbe77 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 29 Apr 2024 18:04:09 +0000
Subject: fixes #4076

Closes #4076

Merge request studip/studip!2919
---
 lib/classes/ResponsiveHelper.php    | 117 ++++++++++++++++++------------------
 lib/navigation/CourseNavigation.php |  68 +++++++++++++--------
 lib/navigation/StudipNavigation.php |   2 +-
 3 files changed, 101 insertions(+), 86 deletions(-)

diff --git a/lib/classes/ResponsiveHelper.php b/lib/classes/ResponsiveHelper.php
index 3e29db3..f02ee80 100644
--- a/lib/classes/ResponsiveHelper.php
+++ b/lib/classes/ResponsiveHelper.php
@@ -210,30 +210,29 @@ class ResponsiveHelper
             $courses = [];
         }
 
-        $items = [];
-
-        $standardIcon = Icon::create('seminar', Icon::ROLE_INFO_ALT)->asImagePath();
-
         // Add current course to list.
         if (Context::get()) {
             $courses[] = Context::get();
         }
 
-        foreach ($courses as $course) {
 
+        if (Context::isInstitute()) {
+            $avatarClass = InstituteAvatar::class;
+            $url = 'dispatch.php/institute/overview';
+            $standardIcon = Icon::create('institute', Icon::ROLE_INFO_ALT)->asImagePath();
+        } else {
             $avatarClass = CourseAvatar::class;
             $url = 'dispatch.php/course/details';
-            if (Context::isInstitute()) {
-                $avatarClass = InstituteAvatar::class;
-                $url = 'dispatch.php/institute/overview';
-                $standardIcon = Icon::create('institute', Icon::ROLE_INFO_ALT)->asImagePath();
-            }
+            $standardIcon = Icon::create('seminar', Icon::ROLE_INFO_ALT)->asImagePath();
+        }
 
+        $items = [];
+        foreach ($courses as $course) {
             $avatar = $avatarClass::getAvatar($course->id);
             $hasAvatar = $avatar->is_customized();
             $icon = $hasAvatar ? $avatar->getURL(Avatar::SMALL) : $standardIcon;
 
-            $cnav = [
+            $items['browse/my_courses/' . $course->id] = [
                 'icon'     => $icon,
                 'avatar'   => $hasAvatar,
                 'title'    => $course->getFullName(),
@@ -242,60 +241,60 @@ class ResponsiveHelper
                 'path'     => 'browse/my_courses/' . $course->id,
                 'visible'  => true,
                 'active'   => Context::getId() === $course->id,
-                'children' => []
+                'children' => self::getRangeNavigation(
+                    $course,
+                    'browse/my_courses/' . $course->id,
+                    $activated
+                ),
             ];
 
-            $path = 'browse/my_courses/' . $course->id;
-
-            foreach ($course->tools as $tool) {
-                if (Seminar_Perm::get()->have_studip_perm($tool->getVisibilityPermission(), $course->id)) {
-
-                    $studip_module = $tool->getStudipModule();
-                    if ($studip_module instanceof StudipModule) {
-                        $tool_nav = $studip_module->getTabNavigation($course->id) ?: [];
-                        foreach ($tool_nav as $nav_name => $navigation) {
-                            if ($nav_name && is_a($navigation, 'Navigation')) {
-                                if (!empty($tool->metadata['displayname'])) {
-                                    $navigation->setTitle($tool->getDisplayname());
-                                }
-                                $cnav['children'][$path . '/' . $nav_name] = [
-                                    'icon'     => $navigation->getImage() ? $navigation->getImage()->asImagePath() : '',
-                                    'title'    => $navigation->getTitle(),
-                                    'url'      => URLHelper::getURL($navigation->getURL(), ['cid' => $course->id]),
-                                    'parent'   => 'browse/my_courses/' . $course->id,
-                                    'path'     => 'browse/my_courses/' . $course->id . '/' . $nav_name,
-                                    'visible'  => true,
-                                    'active'   => $navigation->isActive(),
-                                    'children' => static::getChildren(
-                                        $navigation,
-                                        'browse/my_courses/' . $course->id . '/' . $nav_name,
-                                        $activated,
-                                        $course->id
-                                    ),
-                                ];
-                            }
-                        }
-                    }
-                }
-            }
+        }
 
-            if ($GLOBALS['perm']->have_studip_perm('tutor', $course->id)) {
-                $cnav['children'][$path . '/plus'] = [
-                    'icon' => Icon::create('add', Icon::ROLE_INFO_ALT)->asImagePath(),
-                    'title' => _('Mehr...'),
-                    'url' => URLHelper::getURL('dispatch.php/course/plus/index', ['cid' => $course->id]),
-                    'parent' => 'browse/my_courses/' . $course->id,
-                    'path' => 'browse/my_courses/' . $course->id . '/plus/index',
-                    'visible' => true,
-                    'active' => false,
-                    'children' => [],
-                ];
-            }
+        return $items;
+    }
+
+    private static function getRangeNavigation(Range $range, string $path_prefix, array &$activated): array
+    {
+        if ($range->id === Context::getId()) {
+            $navigation = Navigation::getItem('/course');
+        } else {
+            $navigation = new CourseNavigation($range);
+        }
 
-            $items['browse/my_courses/' . $course->id] = $cnav;
+        $result = [];
 
+        foreach ($navigation as $nav_name => $nav) {
+            $result[$path_prefix . '/' . $nav_name] = [
+                'icon'     => $nav->getImage() ? $nav->getImage()->asImagePath() : '',
+                'title'    => $nav->getTitle(),
+                'url'      => URLHelper::getURL($nav->getURL(), ['cid' => $range->id]),
+                'parent'   => 'browse/my_courses/' . $range->id,
+                'path'     => 'browse/my_courses/' . $range->id . '/' . $nav_name,
+                'visible'  => true,
+                'active'   => $nav->isActive(),
+                'children' => static::getChildren(
+                    $nav,
+                    'browse/my_courses/' . $range->id . '/' . $nav_name,
+                    $activated,
+                    $range->id
+                ),
+            ];
         }
 
-        return $items;
+        // Move admin page to the end
+        if (count($result) > 0) {
+            $first_path = array_keys($result)[0];
+            if (str_ends_with($first_path, '/admin')) {
+                $admin_navigation = array_slice(array_values($result), 0, 1)[0];
+                $admin_navigation['title'] = _('Verwaltung');
+                $admin_navigation['icon'] = Icon::create('add', Icon::ROLE_INFO_ALT)->asImagePath();
+                $result = array_merge(
+                    array_slice($result, 1),
+                    [$path_prefix . '/admin' => $admin_navigation]
+                );
+            }
+        }
+
+        return $result;
     }
 }
diff --git a/lib/navigation/CourseNavigation.php b/lib/navigation/CourseNavigation.php
index 6e37cf5..a22b89e 100644
--- a/lib/navigation/CourseNavigation.php
+++ b/lib/navigation/CourseNavigation.php
@@ -15,15 +15,23 @@
 
 class CourseNavigation extends Navigation
 {
+    private $range;
+
     /**
      * Initialize a new Navigation instance.
      */
-    public function __construct()
+    public function __construct(Range $range)
     {
-        global $user, $perm;
+        if (!($range instanceof Course) && !($range instanceof Institute)) {
+            throw new InvalidArgumentException('Invalid range type "' . get_class($range) . '" for course navigation');
+        }
+
+        $this->range = $range;
+
+        global $user;
 
         // check if logged in
-        if (is_object($user) && $user->id != 'nobody') {
+        if (User::findCurrent()) {
             $coursetext = _('Veranstaltungen');
             $courseinfo = _('Meine Veranstaltungen & Einrichtungen');
             $courselink = 'dispatch.php/my_courses';
@@ -35,8 +43,8 @@ class CourseNavigation extends Navigation
 
         parent::__construct($coursetext, $courselink);
 
-        if (is_object($user)) {
-            $this->setImage(Icon::create('seminar', 'navigation', ["title" => $courseinfo]));
+        if (User::findCurrent()) {
+            $this->setImage(Icon::create('seminar', Icon::ROLE_NAVIGATION, ['title' => $courseinfo]));
         }
     }
 
@@ -48,21 +56,19 @@ class CourseNavigation extends Navigation
     {
         parent::initSubNavigation();
 
-        $context = Context::get();
-        if (!$context) {
-            return;
-        }
-
         $admin_plugin_ids = [];
-        $core_admin = PluginManager::getInstance()->getPlugin('CoreAdmin');
+
+        $core_admin = PluginManager::getInstance()->getPlugin(CoreAdmin::class);
         if ($core_admin) {
             $admin_plugin_ids[] = $core_admin->getPluginId();
         }
-        $core_studygroup_admin = PluginManager::getInstance()->getPlugin('CoreStudygroupAdmin');
+
+        $core_studygroup_admin = PluginManager::getInstance()->getPlugin(CoreStudygroupAdmin::class);
         if ($core_studygroup_admin) {
             $admin_plugin_ids[] = $core_studygroup_admin->getPluginId();
         }
-        $tools = $context->tools->getArrayCopy();
+
+        $tools = $this->range->tools->getArrayCopy();
         usort($tools, function ($a, $b) use ($admin_plugin_ids) {
             if (in_array($a['plugin_id'], $admin_plugin_ids)) {
                 return -1;
@@ -72,22 +78,32 @@ class CourseNavigation extends Navigation
             }
             return $a['position'] - $b['position'];
         });
+
         foreach ($tools as $tool) {
-            if (Context::isInstitute() || Seminar_Perm::get()->have_studip_perm($tool->getVisibilityPermission(), $context->id)) {
-                $studip_module = $tool->getStudipModule();
-                if ($studip_module instanceof StudipModule) {
-                    $tool_nav = $studip_module->getTabNavigation($context->id) ?: [];
-                    foreach ($tool_nav as $nav_name => $navigation) {
-                        if ($nav_name && is_a($navigation, "Navigation")) {
-                            if ($tool->metadata['displayname']) {
-                                $navigation->setTitle($tool->getDisplayname());
-                            }
-                            $this->addSubNavigation($nav_name, $navigation);
-                        }
-                    }
+            if (
+                !($this->range instanceof Institute)
+                && !Seminar_Perm::get()->have_studip_perm($tool->getVisibilityPermission(), $this->range->id)
+            ) {
+                continue;
+            }
+
+            $studip_module = $tool->getStudipModule();
+            if (!($studip_module instanceof StudipModule)) {
+                continue;
+            }
+
+            $tool_nav = $studip_module->getTabNavigation($this->range->id) ?: [];
+
+            foreach ($tool_nav as $nav_name => $navigation) {
+                if (!$nav_name || !$navigation instanceof Navigation) {
+                    continue;
+                }
+
+                if ($tool->metadata['displayname']) {
+                    $navigation->setTitle($tool->getDisplayname());
                 }
+                $this->addSubNavigation($nav_name, $navigation);
             }
         }
     }
-
 }
diff --git a/lib/navigation/StudipNavigation.php b/lib/navigation/StudipNavigation.php
index 4a61153..bc3fae9 100644
--- a/lib/navigation/StudipNavigation.php
+++ b/lib/navigation/StudipNavigation.php
@@ -40,7 +40,7 @@ class StudipNavigation extends Navigation
 
         // if a course is selected, the navigation for it will be loaded
         if (Context::getId()) {
-            $this->addSubNavigation('course', new CourseNavigation());
+            $this->addSubNavigation('course', new CourseNavigation(Context::get()));
         }
 
         try {
-- 
cgit v1.0


From c90f47677d86a57c1184096c5f02ab9c55ca498a Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Tue, 30 Apr 2024 09:18:09 +0000
Subject: delay style update until next event cycle, re #3510

Merge request studip/studip!2939
---
 resources/assets/javascripts/bootstrap/wysiwyg.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/assets/javascripts/bootstrap/wysiwyg.js b/resources/assets/javascripts/bootstrap/wysiwyg.js
index fb158bb..9e18cf8 100644
--- a/resources/assets/javascripts/bootstrap/wysiwyg.js
+++ b/resources/assets/javascripts/bootstrap/wysiwyg.js
@@ -6,8 +6,11 @@ STUDIP.domReady(() => {
     $(document).on('focus blur', '.studip-dialog .ck-editor__editable_inline', function(event) {
         let height = this.clientHeight;
         let editor = this.ckeditorInstance;
-        editor.editing.view.change(writer => {
-            writer.setStyle('height', height + 'px', editor.editing.view.document.getRoot());
+        // this is needed on Chrome, see https://gitlab.studip.de/studip/studip/-/issues/3510
+        setTimeout(() => {
+            editor.editing.view.change(writer => {
+                writer.setStyle('height', height + 'px', editor.editing.view.document.getRoot());
+            });
         });
     });
 
-- 
cgit v1.0


From 0d766d2f811526fb7071130fdba895000528f5ed Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Tue, 30 Apr 2024 09:32:28 +0000
Subject: Resolve "Cronjobs laufen nicht"

Closes #4095

Merge request studip/studip!2941
---
 lib/classes/CronjobScheduler.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/classes/CronjobScheduler.class.php b/lib/classes/CronjobScheduler.class.php
index 69b1fb3..afc89f6 100644
--- a/lib/classes/CronjobScheduler.class.php
+++ b/lib/classes/CronjobScheduler.class.php
@@ -247,8 +247,8 @@ class CronjobScheduler
         }
 
         // Find all schedules that are due to execute and which task is active
-        $temp = CronjobSchedule::findBySQL('active = 1 AND next_execution <= UNIX_TIMESTAMP() '
-                                          .'ORDER next_execution');
+        $temp = CronjobSchedule::findBySQL('`active` = 1 AND `next_execution` <= UNIX_TIMESTAMP() '
+                                          .'ORDER BY `next_execution`');
         $schedules = array_filter($temp, function ($schedule) { return $schedule->task->active; });
 
         if (count($schedules) === 0) {
-- 
cgit v1.0


From 4711c82b887a0629acf53352981f3badbbce8ba7 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 30 Apr 2024 11:25:35 +0000
Subject: prevent php-warnings, fixes #4098

Closes #4098

Merge request studip/studip!2944
---
 app/controllers/questionnaire.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index fe2ed3a..6f80526 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -48,6 +48,10 @@ class QuestionnaireController extends AuthenticatedController
     public function courseoverview_action()
     {
         $this->range_id = Context::getId();
+
+        if (!$this->range_id) {
+            throw new CheckObjectException(_('Sie haben kein Objekt gewählt.'));
+        }
         $this->range_type = Context::getType();
         if (!$GLOBALS['perm']->have_studip_perm("tutor", $this->range_id)) {
             throw new AccessDeniedException("Only for logged in users.");
@@ -593,8 +597,8 @@ class QuestionnaireController extends AuthenticatedController
         }
         $this->statusgruppen_ids = [];
         if (in_array($this->range_type, ["course", "institute"])) {
-            if ($GLOBALS['perm']->have_studip_perm("tutor", $this->range_id)) {
-                $statusgruppen = Statusgruppen::findByRange_id(Context::get()->id);
+            if ($this->range_id && $GLOBALS['perm']->have_studip_perm("tutor", $this->range_id)) {
+                $statusgruppen = Statusgruppen::findByRange_id($this->range_id);
             } else {
                 $statusgruppen = Statusgruppen::findBySQL("INNER JOIN statusgruppe_user USING (statusgruppe_id) WHERE statusgruppen.range_id = ? AND statusgruppe_user.user_id = ? ", [
                     Context::get()->id,
@@ -643,6 +647,7 @@ class QuestionnaireController extends AuthenticatedController
             object_set_visit($questionnaire['questionnaire_id'], 'vote');
         }
         if (in_array($this->range_type, ["course", "institute"])
+                && $this->range_id
                 && !$GLOBALS['perm']->have_studip_perm("tutor", $this->range_id)
                 && !($stopped_visible || count($this->questionnaire_data))) {
             $this->render_nothing();
-- 
cgit v1.0


From 118d31c8878b5918fddd913069e57077c4aa46f2 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 30 Apr 2024 12:09:43 +0000
Subject: cleanup blubber and delete correctly, fixes #4097

Closes #4097

Merge request studip/studip!2943
---
 db/migrations/5.1.56_cleanup_blubber.php | 46 ++++++++++++++++++++++++++++++++
 lib/classes/UserManagement.class.php     | 12 ---------
 lib/models/User.class.php                | 17 ++++++++++++
 3 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 db/migrations/5.1.56_cleanup_blubber.php

diff --git a/db/migrations/5.1.56_cleanup_blubber.php b/db/migrations/5.1.56_cleanup_blubber.php
new file mode 100644
index 0000000..86348bc
--- /dev/null
+++ b/db/migrations/5.1.56_cleanup_blubber.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @see https://gitlab.studip.de/studip/studip/-/issues/4097
+ */
+return new class extends Migration
+{
+    public function description()
+    {
+        return 'Removes orhpaned blubber entries';
+    }
+
+    protected function up()
+    {
+        $query = "DELETE bt, ouv
+                  FROM `blubber_threads` AS bt
+                  LEFT JOIN `object_user_visits` AS ouv
+                    ON (bt.`thread_id` = ouv.`object_id`)
+                  WHERE bt.`external_contact` = 0
+                    AND bt.`user_id` NOT IN (
+                        SELECT `user_id` FROM `auth_user_md5`
+                    )";
+        DBManager::get()->exec($query);
+
+        $query = "DELETE FROM `blubber_comments`
+                  WHERE (
+                      `external_contact` = 0
+                      AND `user_id` NOT IN (
+                          SELECT `user_id` FROM `auth_user_md5`
+                      )
+                    ) OR `thread_id` NOT IN (
+                      SELECT `thread_id` FROM `blubber_threads`
+                    )";
+        DBManager::get()->exec($query);
+
+        $query = "DELETE FROM `blubber_mentions`
+                  WHERE (
+                      `external_contact` = 0
+                      AND `user_id` NOT IN (
+                          SELECT `user_id` FROM `auth_user_md5`
+                      )
+                    ) OR `thread_id` NOT IN (
+                    SELECT `thread_id` FROM `blubber_threads`
+                  )";
+        DBManager::get()->exec($query);
+    }
+};
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php
index c831b85..e3d9aa3 100644
--- a/lib/classes/UserManagement.class.php
+++ b/lib/classes/UserManagement.class.php
@@ -1122,18 +1122,6 @@ class UserManagement
         // delete the datafields
         $localEntries = DataFieldEntry::removeAll($user_id);
 
-        // delete all blubber entrys
-        $query = "DELETE blubber_threads, blubber_mentions, blubber_comments
-                  FROM blubber_threads
-                  LEFT JOIN blubber_mentions USING (user_id)
-                  LEFT JOIN blubber_comments USING (user_id)
-                  WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_id]);
-        if ($count = $statement->rowCount()) {
-            $msg .= 'info§' . sprintf(_('%s Blubber gelöscht.'), $count) . '§';
-        }
-
         // delete user from waiting lists
         $query = "SELECT seminar_id FROM admission_seminar_user WHERE user_id = ?";
         $statement = DBManager::get()->prepare($query);
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
index 056b48a..ab92bad 100644
--- a/lib/models/User.class.php
+++ b/lib/models/User.class.php
@@ -52,6 +52,9 @@
  * @property SimpleORMapCollection|Kategorie[] $profile_categories has_many Kategorie
  * @property SimpleORMapCollection|MvvContact[] $mvv_assignments has_many MvvContact
  * @property SimpleORMapCollection|CourseMemberNotification[] $course_notifications has_many CourseMemberNotification
+ * @property SimpleORMapCollection|BlubberThread[] $blubber_threads has_many BlubberThread
+ * @property SimpleORMapCollection|BlubberComment[] $blubber_comments has_many BlubberComment
+ * @property SimpleORMapCollection|BlubberMention[] $blubber_mentions has_many BlubberMention
  * @property UserInfo $info has_one UserInfo
  * @property UserOnline $online has_one UserOnline
  * @property Courseware\Unit $courseware_units has_one Courseware\Unit
@@ -206,6 +209,20 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
             'assoc_foreign_key' => 'author_id'
         ];
 
+        // Blubber relations
+        $config['has_many']['blubber_threads'] = [
+            'class_name' => BlubberThread::class,
+            'on_delete'  => 'delete',
+        ];
+        $config['has_many']['blubber_comments'] = [
+            'class_name' => BlubberComment::class,
+            'on_delete'  => 'delete',
+        ];
+        $config['has_many']['blubber_mentions'] = [
+            'class_name' => BlubberMention::class,
+            'on_delete'  => 'delete',
+        ];
+
         $config['additional_fields']['config']['get'] = function ($user) {
             return UserConfig::get($user->id);
         };
-- 
cgit v1.0


From 27b722116b6e60d16a0fa4a9bd47ff2ac8487f08 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 30 Apr 2024 14:48:50 +0200
Subject: don't delete global thread or automatically generated threads, re
 #4097

---
 db/migrations/5.1.56_cleanup_blubber.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/migrations/5.1.56_cleanup_blubber.php b/db/migrations/5.1.56_cleanup_blubber.php
index 86348bc..b870d78 100644
--- a/db/migrations/5.1.56_cleanup_blubber.php
+++ b/db/migrations/5.1.56_cleanup_blubber.php
@@ -16,6 +16,8 @@ return new class extends Migration
                   LEFT JOIN `object_user_visits` AS ouv
                     ON (bt.`thread_id` = ouv.`object_id`)
                   WHERE bt.`external_contact` = 0
+                    AND bt.`thread_id` != 'global'
+                    AND bt.`user_id` != ''
                     AND bt.`user_id` NOT IN (
                         SELECT `user_id` FROM `auth_user_md5`
                     )";
-- 
cgit v1.0


From a756b09921d5f21ed4e8d90ecd0f7eb879d591bd Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Thu, 2 May 2024 09:49:31 +0000
Subject: Resolve "Verwaltung von Veranstaltungen: Lehrendenfilter wird
 angewendet, obwohl das nicht angezeigt wird"

Closes #4053

Merge request studip/studip!2946
---
 app/controllers/admin/courses.php | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index d0e2d53..5ae810d 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -535,12 +535,42 @@ class Admin_CoursesController extends AuthenticatedController
             if (isset($filters[$key])) {
                 $config->store($field, $filters[$key]);
             }
+            unset($filters[$key]);
+        }
+
+        if ($config->ADMIN_COURSES_TEACHERFILTER) {
             if (!$config->MY_INSTITUTES_DEFAULT) {
                 $config->delete('ADMIN_COURSES_TEACHERFILTER');
+            } else {
+                $exists = InstituteMember::countBySQL("INNER JOIN `auth_user_md5` USING (`user_id`) WHERE `user_inst`.`user_id` = :user_id AND `user_inst`.`Institut_id` = :institut_id AND `auth_user_md5`.`perms` = 'dozent' ", [
+                    'user_id' => $config->ADMIN_COURSES_TEACHERFILTER,
+                    'institut_id' => $config->MY_INSTITUTES_DEFAULT
+                ]) > 0;
+                if (!$exists) {
+                    $config->delete('ADMIN_COURSES_TEACHERFILTER');
+                }
+            }
+        }
+        if ($config->MY_COURSES_SELECTED_STGTEIL) {
+            if (!$config->MY_INSTITUTES_DEFAULT) {
                 $config->delete('MY_COURSES_SELECTED_STGTEIL');
+            } else {
+                $statement = DBManager::get()->prepare("
+                    SELECT 1
+                    FROM `mvv_stg_stgteil`
+                        INNER JOIN `mvv_studiengang` ON (`mvv_stg_stgteil`.`studiengang_id` = `mvv_studiengang`.`studiengang_id`)
+                    WHERE `mvv_studiengang`.`institut_id` = :institut_id
+                        AND `mvv_stg_stgteil`.`stgteil_id` = :stgteil_id
+                ");
+                $statement->execute([
+                    'institut_id' => $config->MY_INSTITUTES_DEFAULT,
+                    'stgteil_id' => $config->MY_COURSES_SELECTED_STGTEIL
+                ]);
+                $exists = (bool) $statement->fetch(PDO::FETCH_COLUMN);
+                if (!$exists) {
+                    $config->delete('MY_COURSES_SELECTED_STGTEIL');
+                }
             }
-
-            unset($filters[$key]);
         }
 
         // Datafield filters
-- 
cgit v1.0


From c46251795ae2f724d4939f03eddd2c7aa2ea2964 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 2 May 2024 11:59:05 +0000
Subject: fixes #4099

Closes #4099

Merge request studip/studip!2948
---
 lib/classes/PluginAdministration.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/classes/PluginAdministration.php b/lib/classes/PluginAdministration.php
index 8ac5fa8..faba3ec 100644
--- a/lib/classes/PluginAdministration.php
+++ b/lib/classes/PluginAdministration.php
@@ -452,17 +452,14 @@ class PluginAdministration
         }
 
         // determine the plugin path
-        $basepath = Config::get()->PLUGINS_PATH;
         $pluginpath = $origin . '/' . $pluginclass;
 
-        $pluginregistered = $plugin_manager->getPluginInfo($pluginclass);
-
-        if ($pluginregistered) {
-            throw new PluginInstallationException(_('Das Plugin ist bereits registriert.'));
-        }
-
         // create database schema if needed
-        $this->createDBSchema($plugindir, $manifest, $pluginregistered);
+        $this->createDBSchema(
+            $plugindir,
+            $manifest,
+            (bool) $plugin_manager->getPluginInfo($pluginclass)
+        );
 
         // now register the plugin in the database
         $pluginid = $plugin_manager->registerPlugin($manifest['pluginname'], $pluginclass, $pluginpath);
-- 
cgit v1.0


From 42d1af6c5e3dfcead050cf42aa5bea81f72ea701 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Thu, 2 May 2024 12:43:59 +0000
Subject: Resolve "Einrichtungsfilter zeigt falschen Wert bei "Einrichtung +
 Institute""

Closes #4051

Merge request studip/studip!2947
---
 app/controllers/admin/courses.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 5ae810d..17a07c7 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -322,6 +322,9 @@ class Admin_CoursesController extends AuthenticatedController
         $institut_id = $configuration->MY_INSTITUTES_DEFAULT && $configuration->MY_INSTITUTES_DEFAULT !== 'all'
                      ? $configuration->MY_INSTITUTES_DEFAULT
                      : null;
+        if ($configuration->MY_INSTITUTES_INCLUDE_CHILDREN) {
+            $institut_id .= '_withinst';
+        }
 
         $filters = array_merge(
             array_merge(...PluginEngine::sendMessage(AdminCourseWidgetPlugin::class, 'getFilters')),
@@ -531,6 +534,14 @@ class Admin_CoursesController extends AuthenticatedController
             'institut_id'    => 'MY_INSTITUTES_DEFAULT',
         ];
 
+        $config->store(
+            'MY_INSTITUTES_INCLUDE_CHILDREN',
+            str_contains($filters['institut_id'], '_') ? 1 : 0
+        );
+        if ($config->MY_INSTITUTES_INCLUDE_CHILDREN) {
+            $filters['institut_id'] = substr($filters['institut_id'], 0, strpos($filters['institut_id'], '_'));
+        }
+
         foreach ($mapping as $key => $field) {
             if (isset($filters[$key])) {
                 $config->store($field, $filters[$key]);
@@ -1522,6 +1533,7 @@ class Admin_CoursesController extends AuthenticatedController
                     $institut['Institut_id'],
                     (!$institut['is_fak'] ? ' ' : '') . $institut['Name'],
                     $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT === $institut['Institut_id']
+                        && !$GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN
                 );
 
             //check if the institute is a faculty.
@@ -1534,7 +1546,8 @@ class Admin_CoursesController extends AuthenticatedController
                     new SelectElement(
                         $institut['Institut_id'] . '_withinst', //_withinst = with institutes
                         ' ' . $institut['Name'] . ' +' . _('Institute'),
-                        ($GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT === $institut['Institut_id'] && $GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN)
+                        $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT === $institut['Institut_id']
+                            && $GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN
                     );
             }
         }
@@ -1567,6 +1580,9 @@ class Admin_CoursesController extends AuthenticatedController
     private function getStgteilSelector($institut_id = null)
     {
         $institut_id = $institut_id ?: $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
+        if (str_contains($institut_id, '_')) {
+            $institut_id = substr($institut_id, 0, strpos($institut_id, '_'));
+        }
         $stgteile = StudiengangTeil::getAllEnriched('fach_name', 'ASC', ['mvv_fach_inst.institut_id' => $institut_id]);
         $list = [];
         if (!$institut_id || $institut_id === 'all') {
@@ -1655,6 +1671,9 @@ class Admin_CoursesController extends AuthenticatedController
     private function getTeacherWidget($institut_id = null)
     {
         $institut_id = $institut_id ?: $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
+        if (str_contains($institut_id, '_')) {
+            $institut_id = substr($institut_id, 0, strpos($institut_id, '_'));
+        }
         $teachers = DBManager::get()->fetchAll("
                 SELECT auth_user_md5.*, user_info.*
                 FROM auth_user_md5
-- 
cgit v1.0


From 2b25082b266b650d9a0496a2a25468484b40efce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Thu, 2 May 2024 16:29:07 +0000
Subject: Resolve "Datentabellen im Bereich "Forum" sind nicht korrekt
 aufgebaut/beschriftet"

Closes #4089

Merge request studip/studip!2933
---
 app/views/course/forum/index/_areas.php    | 7 ++++---
 app/views/course/members/accepted_list.php | 2 +-
 app/views/course/members/autor_list.php    | 2 +-
 app/views/course/members/awaiting_list.php | 2 +-
 app/views/course/members/dozent_list.php   | 2 +-
 app/views/course/members/tutor_list.php    | 2 +-
 app/views/course/members/user_list.php     | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/course/forum/index/_areas.php b/app/views/course/forum/index/_areas.php
index 11f32be..4f4fa0f 100644
--- a/app/views/course/forum/index/_areas.php
+++ b/app/views/course/forum/index/_areas.php
@@ -46,17 +46,18 @@
         <col>
         <col>
         <col class="hidden-tiny-down">
-        <col>
+        <col style="width: 20px">
     </colgroup>
 
     <thead>
         <tr>
-            <th colspan="2"> <?= _('Name des Bereichs') ?></th>
+            <th></th>
+            <th> <?= _('Name des Bereichs') ?></th>
             <th data-type="answers"><?= _("Beiträge") ?></th>
             <th data-type="last_posting" class="hidden-tiny-down">
                 <?= _("letzte Antwort") ?>
             </th>
-            <th></th>
+            <th> <?= _('Aktionen') ?> </th>
         </tr>
     </thead>
 
diff --git a/app/views/course/members/accepted_list.php b/app/views/course/members/accepted_list.php
index 7b34ef3..8bcd5f8 100644
--- a/app/views/course/members/accepted_list.php
+++ b/app/views/course/members/accepted_list.php
@@ -39,7 +39,7 @@
                            type="checkbox" name="all" value="1" data-proxyfor=":checkbox[name^=accepted]">
                 </th>
             <? endif ?>
-                <th></th>
+                <th><p class="sr-only"><?= _('Nummer') ?></p></th>
                 <th <?if ($sort_by === 'nachname' && $sort_status === 'accepted') printf('class="sort%s"', $order); ?>>
                     <? $order = $sort_status !== 'accepted' ? 'desc' : $order; ?>
                     <a href="<?= URLHelper::getLink(sprintf(
diff --git a/app/views/course/members/autor_list.php b/app/views/course/members/autor_list.php
index 0464d47..e19868f 100644
--- a/app/views/course/members/autor_list.php
+++ b/app/views/course/members/autor_list.php
@@ -48,7 +48,7 @@
                            type="checkbox" name="all" value="1" data-proxyfor=":checkbox[name^=autor]">
                 </th>
             <? endif ?>
-                <th></th>
+                <th><p class="sr-only"><?= _('Nummer') ?></p></th>
                 <th <? if ($sort_by === 'nachname' && $sort_status === 'autor') printf('class="sort%s"', $order); ?>>
                     <? $order = $sort_status !== 'autor' ? 'desc' : $order; ?>
                     <a href="<?= URLHelper::getLink(sprintf(
diff --git a/app/views/course/members/awaiting_list.php b/app/views/course/members/awaiting_list.php
index b8c1e08..86e76b7 100644
--- a/app/views/course/members/awaiting_list.php
+++ b/app/views/course/members/awaiting_list.php
@@ -36,7 +36,7 @@
                            data-activates="#action_awaiting,button[name='submit_awaiting']">
                 </th>
             <? endif ?>
-                <th></th>
+                <th><p class="sr-only"><?= _('Nummer') ?></p></th>
                 <th <? if ($sort_by === 'nachname' && $sort_status === $waiting_type) printf('class="sort%s"', $order); ?>>
                     <a href="<?= URLHelper::getLink(sprintf(
                         "?sortby=nachname&sort_status={$waiting_type}&order=%s&toggle=%s#awaiting",
diff --git a/app/views/course/members/dozent_list.php b/app/views/course/members/dozent_list.php
index 9b11d07..a2bae4e 100644
--- a/app/views/course/members/dozent_list.php
+++ b/app/views/course/members/dozent_list.php
@@ -25,7 +25,7 @@
     </colgroup>
     <thead>
         <tr class="sortable">
-            <th></th>
+            <th><p class="sr-only"><?= _('Nummer') ?></p></th>
             <th <? if ($sort_by === 'nachname' && $sort_status === 'dozent') printf('class="sort%s"', $order); ?>>
                 <? $order = $sort_status !== 'dozent' ? 'desc' : $order; ?>
                 <a href="<?= URLHelper::getLink(sprintf(
diff --git a/app/views/course/members/tutor_list.php b/app/views/course/members/tutor_list.php
index 6af208c..a8d46c6 100644
--- a/app/views/course/members/tutor_list.php
+++ b/app/views/course/members/tutor_list.php
@@ -43,7 +43,7 @@
                            type="checkbox" name="all" value="1" data-proxyfor=":checkbox[name^=tutor]">
                 </th>
             <? endif ?>
-                <th></th>
+                <th><p class="sr-only"><?= _('Nummer') ?></p></th>
                 <th <? if ($sort_by === 'nachname' && $sort_status === 'tutor') printf('class="sort%s"', $order); ?>>
                     <? $order = $sort_status !== 'tutor' ? 'desc' : $order; ?>
                     <a href="<?= URLHelper::getLink(sprintf(
diff --git a/app/views/course/members/user_list.php b/app/views/course/members/user_list.php
index 9b2acea..04da780 100644
--- a/app/views/course/members/user_list.php
+++ b/app/views/course/members/user_list.php
@@ -43,7 +43,7 @@
                            type="checkbox" name="all" value="1" data-proxyfor=":checkbox[name^=user]">
                 </th>
             <? endif ?>
-                <th></th>
+                <th><p class="sr-only"><?= _('Nummer') ?></p></th>
                 <th <? if ($sort_by === 'nachname' && $sort_status === 'user') printf('class="sort%s"', $order); ?>>
                     <? $order = $sort_status !== 'user' ? 'desc' : $order; ?>
                     <a href="<?= URLHelper::getLink(sprintf(
-- 
cgit v1.0


From d066e3494ba0b661d149dcd7bb267aed8f4e65ea Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 3 May 2024 11:41:22 +0000
Subject: increase php minimal version to 8.1, fixes #3805

Closes #3805

Merge request studip/studip!2814
---
 .gitlab-ci.yml                |  10 +-
 composer.json                 |  21 +-
 composer.lock                 | 720 +++++++++++++++++++-----------------------
 docker/build_images.sh        |   2 +-
 docker/studip/Dockerfile      |   4 +-
 docker/tests/php81/Dockerfile |  22 ++
 docker/tests/php82/Dockerfile |  12 +-
 docker/tests/php83/Dockerfile |  12 +-
 8 files changed, 378 insertions(+), 425 deletions(-)
 create mode 100644 docker/tests/php81/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54dda7e..9d0e3ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: studip/studip:tests-php8.3
+image: studip/studip:tests-php8.1
 
 variables:
   FF_NETWORK_PER_BUILD: 1
@@ -115,14 +115,14 @@ lint-php:
     reports:
       codequality: $PHPLINT_CODE_QUALITY_REPORT
 
-lint-php-7.4:
-  image: studip/studip:tests-php8.2
+lint-php-8.3:
+  image: studip/studip:tests-php8.3
   stage: checks
   needs: [build-composer]
   variables:
     CACHE_LOCATION: $CACHE_DIR/phplint-cache
-    PHPLINT_JSON_REPORT: $REPORT_DIR/phplint-report-7.4.json
-    PHPLINT_CODE_QUALITY_REPORT: $REPORT_DIR/phplint-codequality-7.4.json
+    PHPLINT_JSON_REPORT: $REPORT_DIR/phplint-report-8.3.json
+    PHPLINT_CODE_QUALITY_REPORT: $REPORT_DIR/phplint-codequality-8.3.json
   interruptible: true
   cache:
     - *composer-cache
diff --git a/composer.json b/composer.json
index dd95f12..92003f8 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "config": {
         "vendor-dir": "composer",
         "platform": {
-            "php": "7.4"
+            "php": "8.1"
         }
     },
     "require-dev": {
@@ -12,12 +12,12 @@
         "woohoolabs/yang": "2.3.2",
         "codeception/codeception": "^4.2",
         "codeception/module-asserts": "^1.3",
-        "overtrue/phplint": "^3.0",
+        "overtrue/phplint": "3.1.1",
         "phpstan/phpstan": "^1.8",
         "symfony/var-dumper": "^5.4"
     },
     "require": {
-        "php": "^7.2",
+        "php": "^8.1",
         "guzzlehttp/psr7": "^2.3",
         "neomerx/json-api": "4.0.1",
         "spomky-labs/otphp": "^10",
@@ -51,27 +51,22 @@
         "symfony/console": "^5.3.16",
         "symfony/process": "^5.4",
         "jumbojett/openid-connect-php": "^0.9.2",
-        "league/oauth2-server": "^8.3",
+        "league/oauth2-server": "8.5.4",
         "willdurand/negotiation": "^3.1",
         "monolog/monolog": "^2.8",
-        "symfony/polyfill-php80": "^1.27",
-        "symfony/polyfill-php81": "^1.27",
         "phpowermove/docblock": "^2.0",
         "ksubileau/color-thief-php": "^2.0",
         "symfony/polyfill-php82": "^1.28",
         "symfony/polyfill-php83": "^1.28",
         "phpoffice/phpspreadsheet": "^1.19",
-        "psy/psysh": "^0.12.2"
+        "psy/psysh": "^0.12.2",
+        "okvpn/clock-lts": "^1.0"
     },
     "replace": {
-        "symfony/polyfill-php54": "*",
-        "symfony/polyfill-php55": "*",
-        "symfony/polyfill-php56": "*",
-        "symfony/polyfill-php70": "*",
-        "symfony/polyfill-php71": "*",
-        "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*",
         "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*",
+        "symfony/polyfill-php81": "*",
         "symfony/polyfill-mbstring": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
index dd52082..0c2e769 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "57c5409fb404051d418751e660f3210f",
+    "content-hash": "2300fa9bd6d32d616b562b0790585cbe",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -230,16 +230,16 @@
         },
         {
             "name": "defuse/php-encryption",
-            "version": "v2.3.1",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/defuse/php-encryption.git",
-                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2"
+                "reference": "f53396c2d34225064647a05ca76c1da9d99e5828"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2",
-                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2",
+                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828",
+                "reference": "f53396c2d34225064647a05ca76c1da9d99e5828",
                 "shasum": ""
             },
             "require": {
@@ -248,7 +248,8 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
+                "phpunit/phpunit": "^5|^6|^7|^8|^9|^10",
+                "yoast/phpunit-polyfills": "^2.0.0"
             },
             "bin": [
                 "bin/generate-defuse-key"
@@ -290,26 +291,26 @@
             ],
             "support": {
                 "issues": "https://github.com/defuse/php-encryption/issues",
-                "source": "https://github.com/defuse/php-encryption/tree/v2.3.1"
+                "source": "https://github.com/defuse/php-encryption/tree/v2.4.0"
             },
-            "time": "2021-04-09T23:57:26+00:00"
+            "time": "2023-06-19T06:10:36+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.16.0",
+            "version": "v4.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
                 "shasum": ""
             },
             "require": {
-                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "require-dev": {
                 "cerdic/css-tidy": "^1.7 || ^2.0",
@@ -351,9 +352,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
             },
-            "time": "2022-09-18T07:06:19+00:00"
+            "time": "2023-11-17T15:01:25+00:00"
         },
         {
             "name": "fig/http-message-util",
@@ -790,45 +791,41 @@
         },
         {
             "name": "lcobucci/jwt",
-            "version": "3.4.6",
+            "version": "5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "3ef8657a78278dfeae7707d51747251db4176240"
+                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/3ef8657a78278dfeae7707d51747251db4176240",
-                "reference": "3ef8657a78278dfeae7707d51747251db4176240",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0ba88aed12c04bd2ed9924f500673f32b67a6211",
+                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
                 "ext-openssl": "*",
-                "php": "^5.6 || ^7.0"
+                "ext-sodium": "*",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+                "psr/clock": "^1.0"
             },
             "require-dev": {
-                "mikey179/vfsstream": "~1.5",
-                "phpmd/phpmd": "~2.2",
-                "phpunit/php-invoker": "~1.1",
-                "phpunit/phpunit": "^5.7 || ^7.3",
-                "squizlabs/php_codesniffer": "~2.3"
+                "infection/infection": "^0.27.0",
+                "lcobucci/clock": "^3.0",
+                "lcobucci/coding-standard": "^11.0",
+                "phpbench/phpbench": "^1.2.9",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "^1.10.7",
+                "phpstan/phpstan-deprecation-rules": "^1.1.3",
+                "phpstan/phpstan-phpunit": "^1.3.10",
+                "phpstan/phpstan-strict-rules": "^1.5.0",
+                "phpunit/phpunit": "^10.2.6"
             },
             "suggest": {
-                "lcobucci/clock": "*"
+                "lcobucci/clock": ">= 3.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
             "autoload": {
-                "files": [
-                    "compat/class-aliases.php",
-                    "compat/json-exception-polyfill.php",
-                    "compat/lcobucci-clock-polyfill.php"
-                ],
                 "psr-4": {
                     "Lcobucci\\JWT\\": "src"
                 }
@@ -839,7 +836,7 @@
             ],
             "authors": [
                 {
-                    "name": "Luís Otávio Cobucci Oblonczyk",
+                    "name": "Luís Cobucci",
                     "email": "lcobucci@gmail.com",
                     "role": "Developer"
                 }
@@ -851,7 +848,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/3.4.6"
+                "source": "https://github.com/lcobucci/jwt/tree/5.2.0"
             },
             "funding": [
                 {
@@ -863,7 +860,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2021-09-28T19:18:28+00:00"
+            "time": "2023-11-20T21:17:42+00:00"
         },
         {
             "name": "league/event",
@@ -921,37 +918,37 @@
         },
         {
             "name": "league/oauth2-server",
-            "version": "8.4.1",
+            "version": "8.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24"
+                "reference": "ab7714d073844497fd222d5d0a217629089936bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24",
-                "reference": "eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/ab7714d073844497fd222d5d0a217629089936bc",
+                "reference": "ab7714d073844497fd222d5d0a217629089936bc",
                 "shasum": ""
             },
             "require": {
-                "defuse/php-encryption": "^2.2.1",
-                "ext-json": "*",
+                "defuse/php-encryption": "^2.3",
                 "ext-openssl": "*",
-                "lcobucci/jwt": "^3.4.6 || ^4.0.4",
+                "lcobucci/clock": "^2.2 || ^3.0",
+                "lcobucci/jwt": "^4.3 || ^5.0",
                 "league/event": "^2.2",
-                "league/uri": "^6.4",
-                "php": "^7.2 || ^8.0",
-                "psr/http-message": "^1.0.1"
+                "league/uri": "^6.7 || ^7.0",
+                "php": "^8.0",
+                "psr/http-message": "^1.0.1 || ^2.0"
             },
             "replace": {
                 "league/oauth2server": "*",
                 "lncd/oauth2": "*"
             },
             "require-dev": {
-                "laminas/laminas-diactoros": "^2.4.1",
+                "laminas/laminas-diactoros": "^3.0.0",
                 "phpstan/phpstan": "^0.12.57",
                 "phpstan/phpstan-phpunit": "^0.12.16",
-                "phpunit/phpunit": "^8.5.13",
+                "phpunit/phpunit": "^9.6.6",
                 "roave/security-advisories": "dev-master"
             },
             "type": "library",
@@ -997,7 +994,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-server/issues",
-                "source": "https://github.com/thephpleague/oauth2-server/tree/8.4.1"
+                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.4"
             },
             "funding": [
                 {
@@ -1005,54 +1002,48 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T11:47:53+00:00"
+            "time": "2023-08-25T22:35:12+00:00"
         },
         {
             "name": "league/uri",
-            "version": "6.4.0",
+            "version": "7.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "09da64118eaf4c5d52f9923a1e6a5be1da52fd9a"
+                "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/09da64118eaf4c5d52f9923a1e6a5be1da52fd9a",
-                "reference": "09da64118eaf4c5d52f9923a1e6a5be1da52fd9a",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
+                "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "league/uri-interfaces": "^2.1",
-                "php": ">=7.2",
-                "psr/http-message": "^1.0"
+                "league/uri-interfaces": "^7.3",
+                "php": "^8.1"
             },
             "conflict": {
                 "league/uri-schemes": "^1.0"
             },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.16",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^8.0 || ^9.0",
-                "psr/http-factory": "^1.0"
-            },
             "suggest": {
-                "ext-fileinfo": "Needed to create Data URI from a filepath",
-                "ext-intl": "Needed to improve host validation",
-                "league/uri-components": "Needed to easily manipulate URI objects",
-                "psr/http-factory": "Needed to use the URI factory"
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-fileinfo": "to create Data URI from file contennts",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
+                "league/uri-components": "Needed to easily manipulate URI objects components",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.x-dev"
+                    "dev-master": "7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "League\\Uri\\": "src"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1067,7 +1058,7 @@
                 }
             ],
             "description": "URI manipulation library",
-            "homepage": "http://uri.thephpleague.com",
+            "homepage": "https://uri.thephpleague.com",
             "keywords": [
                 "data-uri",
                 "file-uri",
@@ -1092,8 +1083,8 @@
             "support": {
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
-                "issues": "https://github.com/thephpleague/uri/issues",
-                "source": "https://github.com/thephpleague/uri/tree/6.4.0"
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri/tree/7.4.1"
             },
             "funding": [
                 {
@@ -1101,46 +1092,44 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-22T14:29:11+00:00"
+            "time": "2024-03-23T07:42:40+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "2.3.0",
+            "version": "7.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"
+                "reference": "8d43ef5c841032c87e2de015972c06f3865ef718"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/00e7e2943f76d8cb50c7dfdc2f6dee356e15e383",
-                "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/8d43ef5c841032c87e2de015972c06f3865ef718",
+                "reference": "8d43ef5c841032c87e2de015972c06f3865ef718",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.19",
-                "phpstan/phpstan": "^0.12.90",
-                "phpstan/phpstan-phpunit": "^0.12.19",
-                "phpstan/phpstan-strict-rules": "^0.12.9",
-                "phpunit/phpunit": "^8.5.15 || ^9.5"
+                "ext-filter": "*",
+                "php": "^8.1",
+                "psr/http-factory": "^1",
+                "psr/http-message": "^1.1 || ^2.0"
             },
             "suggest": {
-                "ext-intl": "to use the IDNA feature",
-                "symfony/intl": "to use the IDNA feature via Symfony Polyfill"
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-master": "7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "League\\Uri\\": "src/"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1154,17 +1143,32 @@
                     "homepage": "https://nyamsprod.com"
                 }
             ],
-            "description": "Common interface for URI representation",
-            "homepage": "http://github.com/thephpleague/uri-interfaces",
+            "description": "Common interfaces and classes for URI representation and interaction",
+            "homepage": "https://uri.thephpleague.com",
             "keywords": [
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
                 "rfc3986",
                 "rfc3987",
+                "rfc6570",
                 "uri",
-                "url"
+                "url",
+                "ws"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/uri-interfaces/issues",
-                "source": "https://github.com/thephpleague/uri-interfaces/tree/2.3.0"
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.1"
             },
             "funding": [
                 {
@@ -1172,7 +1176,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-28T04:27:21+00:00"
+            "time": "2024-03-23T07:42:40+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
@@ -1748,6 +1752,66 @@
             "time": "2024-03-05T20:51:40+00:00"
         },
         {
+            "name": "okvpn/clock-lts",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/okvpn/clock-lts.git",
+                "reference": "5e7dc00d23a7d65e8ed2b0ff7a4dcf7860c05a14"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/okvpn/clock-lts/zipball/5e7dc00d23a7d65e8ed2b0ff7a4dcf7860c05a14",
+                "reference": "5e7dc00d23a7d65e8ed2b0ff7a4dcf7860c05a14",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2",
+                "psr/clock": "^1.0"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "replace": {
+                "lcobucci/clock": "*"
+            },
+            "require-dev": {
+                "infection/infection": "^0.27",
+                "lcobucci/coding-standard": "^11.0.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.10.25",
+                "phpstan/phpstan-deprecation-rules": "^1.1.3",
+                "phpstan/phpstan-phpunit": "^1.3.13",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^10.2.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Lcobucci\\Clock\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Luís Cobucci",
+                    "email": "lcobucci@gmail.com"
+                },
+                {
+                    "name": "Uładzimir Tsykun",
+                    "email": "vtsykun@okvpn.org"
+                }
+            ],
+            "description": "Adding support for a wider range of PHP versions to lcobucci/clock",
+            "support": {
+                "source": "https://github.com/okvpn/clock-lts/tree/1.0.0"
+            },
+            "time": "2023-09-26T11:13:49+00:00"
+        },
+        {
             "name": "opis/closure",
             "version": "3.6.3",
             "source": {
@@ -2642,21 +2706,69 @@
             "time": "2023-02-11T17:10:30+00:00"
         },
         {
+            "name": "psr/clock",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/clock.git",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Clock\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for reading the clock.",
+            "homepage": "https://github.com/php-fig/clock",
+            "keywords": [
+                "clock",
+                "now",
+                "psr",
+                "psr-20",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/clock/issues",
+                "source": "https://github.com/php-fig/clock/tree/1.0.0"
+            },
+            "time": "2022-11-25T14:36:26+00:00"
+        },
+        {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
@@ -2685,9 +2797,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2021-03-05T17:36:06+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/http-client",
@@ -2743,21 +2855,21 @@
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -2777,7 +2889,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for PSR-7 HTTP message factories",
@@ -2792,31 +2904,31 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2023-04-10T20:10:41+00:00"
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -2845,9 +2957,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
         },
         {
             "name": "psr/http-server-handler",
@@ -3539,16 +3651,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.21",
+            "version": "v5.4.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9"
+                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c77433ddc6cdc689caf48065d9ea22ca0853fbd9",
-                "reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9",
+                "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
+                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
                 "shasum": ""
             },
             "require": {
@@ -3613,12 +3725,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.21"
+                "source": "https://github.com/symfony/console/tree/v5.4.36"
             },
             "funding": [
                 {
@@ -3634,29 +3746,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-25T16:59:41+00:00"
+            "time": "2024-02-20T16:33:57+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.2",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3685,7 +3797,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -3701,20 +3813,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                 "shasum": ""
             },
             "require": {
@@ -3728,9 +3840,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3767,7 +3876,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -3783,20 +3892,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                 "shasum": ""
             },
             "require": {
@@ -3807,9 +3916,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3848,7 +3954,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -3864,20 +3970,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -3888,9 +3994,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3932,7 +4035,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -3948,169 +4051,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php81",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
-                "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php82",
@@ -4273,16 +4214,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.21",
+            "version": "v5.4.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd"
+                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd",
-                "reference": "d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4fdf34004f149cc20b2f51d7d119aa500caad975",
+                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975",
                 "shasum": ""
             },
             "require": {
@@ -4315,7 +4256,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.21"
+                "source": "https://github.com/symfony/process/tree/v5.4.36"
             },
             "funding": [
                 {
@@ -4331,37 +4272,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-21T19:46:44+00:00"
+            "time": "2024-02-12T15:49:53+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.2",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
             },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4371,7 +4308,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\Service\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -4398,7 +4338,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -4414,38 +4354,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:29+00:00"
+            "time": "2023-12-19T21:51:00+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.21",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "edac10d167b78b1d90f46a80320d632de0bd9f2f"
+                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/edac10d167b78b1d90f46a80320d632de0bd9f2f",
-                "reference": "edac10d167b78b1d90f46a80320d632de0bd9f2f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": ">=3.0"
+                "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^6.2|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4484,7 +4424,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.21"
+                "source": "https://github.com/symfony/string/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -4500,7 +4440,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-22T08:00:55+00:00"
+            "time": "2024-02-01T13:16:41+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -4593,16 +4533,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.21",
+            "version": "v5.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "3713e20d93e46e681e51605d213027e48dab3469"
+                "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/3713e20d93e46e681e51605d213027e48dab3469",
-                "reference": "3713e20d93e46e681e51605d213027e48dab3469",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
+                "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
                 "shasum": ""
             },
             "require": {
@@ -4648,7 +4588,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.21"
+                "source": "https://github.com/symfony/yaml/tree/v5.4.35"
             },
             "funding": [
                 {
@@ -4664,7 +4604,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-21T19:46:44+00:00"
+            "time": "2024-01-23T13:51:25+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -5719,26 +5659,26 @@
         },
         {
             "name": "overtrue/phplint",
-            "version": "3.2.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/phplint.git",
-                "reference": "c3021ad8cebd802ad3f4924c45f508803e0b80e5"
+                "reference": "66be32d54b763a4b0ba1a820d3c867cd2e252ea5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/phplint/zipball/c3021ad8cebd802ad3f4924c45f508803e0b80e5",
-                "reference": "c3021ad8cebd802ad3f4924c45f508803e0b80e5",
+                "url": "https://api.github.com/repos/overtrue/phplint/zipball/66be32d54b763a4b0ba1a820d3c867cd2e252ea5",
+                "reference": "66be32d54b763a4b0ba1a820d3c867cd2e252ea5",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "n98/junit-xml": "1.1.0",
-                "php": "^5.5.9 || ^7.0",
-                "symfony/console": "^3.2 || ^4.0 || ^5.0",
-                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
-                "symfony/process": "^3.3 || ^4.0 || ^5.0",
-                "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
+                "php": ">=5.5.9",
+                "symfony/console": "^3.2|^4.0|^5.0",
+                "symfony/finder": "^3.0|^4.0|^5.0",
+                "symfony/process": "^3.3|^4.0|^5.0",
+                "symfony/yaml": "^3.0|^4.0|^5.0"
             },
             "require-dev": {
                 "brainmaestro/composer-git-hooks": "^2.7",
@@ -5783,7 +5723,7 @@
             ],
             "support": {
                 "issues": "https://github.com/overtrue/phplint/issues",
-                "source": "https://github.com/overtrue/phplint/tree/3.2.0"
+                "source": "https://github.com/overtrue/phplint/tree/3.1.1"
             },
             "funding": [
                 {
@@ -5791,7 +5731,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-07-12T07:37:04+00:00"
+            "time": "2022-06-21T05:52:47+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7490,16 +7430,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.21",
+            "version": "v5.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19"
+                "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/078e9a5e1871fcfe6a5ce421b539344c21afef19",
-                "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435",
+                "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435",
                 "shasum": ""
             },
             "require": {
@@ -7533,7 +7473,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.21"
+                "source": "https://github.com/symfony/finder/tree/v5.4.35"
             },
             "funding": [
                 {
@@ -7549,7 +7489,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-16T09:33:00+00:00"
+            "time": "2024-01-23T13:51:25+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -7673,7 +7613,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2",
+        "php": "^8.1",
         "ext-gd": "*",
         "ext-gettext": "*",
         "ext-pdo_mysql": "*",
@@ -7688,7 +7628,7 @@
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.4"
+        "php": "8.1"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/docker/build_images.sh b/docker/build_images.sh
index c5f32f4..cc03883 100755
--- a/docker/build_images.sh
+++ b/docker/build_images.sh
@@ -11,7 +11,7 @@ build_image () {
 
 build_image tests/php83 studip:tests-php8.3 &
 build_image tests/php82 studip:tests-php8.2 &
-build_image tests/php74 studip:tests-php7.4 &
+build_image tests/php81 studip:tests-php8.1 &
 build_image release-cli release-cli &
 wait
 
diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index 76fe2d9..0689c3a 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -1,5 +1,5 @@
 # Setup php, apache and stud.ip
-FROM php:7.4-apache as base
+FROM php:8.1-apache as base
 
 # Install system requirements
 RUN apt update && apt install -y --no-install-recommends \
@@ -17,7 +17,7 @@ RUN apt update && apt install -y --no-install-recommends \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
-RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
+RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl
 
 FROM node:16 as nodejs
 
diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile
new file mode 100644
index 0000000..7d0478e
--- /dev/null
+++ b/docker/tests/php81/Dockerfile
@@ -0,0 +1,22 @@
+# Setup php, apache and stud.ip
+FROM php:8.1-cli
+
+# Install system requirements
+RUN apt update && apt install -y  --no-install-recommends \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    lsb-release \
+    zip \
+    tar \
+    libwebp-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install php extensions
+RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
+
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+
+# Install composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index 27ffb64..c8abd9d 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -3,7 +3,8 @@ FROM php:8.2-cli
 
 # Install system requirements
 RUN apt update && apt install -y  --no-install-recommends \
-    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
     lsb-release \
     zip \
     tar \
@@ -12,13 +13,10 @@ RUN apt update && apt install -y  --no-install-recommends \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt update && apt install -y --no-install-recommends nodejs \
-        curl apt-transport-https ca-certificates gnupg unzip git \
-    && rm -rf /var/lib/apt/lists/*
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
index a25e830..68d1764 100644
--- a/docker/tests/php83/Dockerfile
+++ b/docker/tests/php83/Dockerfile
@@ -3,7 +3,8 @@ FROM php:8.3-cli
 
 # Install system requirements
 RUN apt update && apt install -y  --no-install-recommends \
-    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
     lsb-release \
     zip \
     tar \
@@ -12,13 +13,10 @@ RUN apt update && apt install -y  --no-install-recommends \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip
 
-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt update && apt install -y --no-install-recommends nodejs \
-        curl apt-transport-https ca-certificates gnupg unzip git \
-    && rm -rf /var/lib/apt/lists/*
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
-- 
cgit v1.0


From a54b6f395dbef03e679357e9e93891d4b4749ba1 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 3 May 2024 14:06:50 +0000
Subject: functions.php: added studip_interpolate, closes #3555

Closes #3555

Merge request studip/studip!2442
---
 lib/functions.php                | 31 +++++++++++++++++++++++++++++++
 tests/unit/lib/FunctionsTest.php | 20 +++++++++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/lib/functions.php b/lib/functions.php
index 90d4499..b68658a 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1859,3 +1859,34 @@ function xml_escape($string)
     $string = preg_replace('/[\x00-\x08\x0b\x0c\x0e-\x1f]/', '', $string);
     return htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
 }
+
+/**
+ * This function mimics the functionality of the $gettextInterpolate function in JavaScript.
+ * This makes it easier to format text in translatable strings.
+ *
+ * Note that the behavior of this function is simplified in comparison with $gettextInterpolate:
+ * - All placeholders that have a value are replaced with the string value of that value.
+ *   Numbers must be pre-formatted before added to the parameters.
+ * - All placeholders that have no replacements in the parameters array are output.
+ *
+ * @param string $gettext_string The translation string to be interpolated.
+ *
+ * @param array $parameters The parameters that replace the placeholders in the translation string.
+ *     Array keys are the names of the placeholders while array values are the values that are
+ *     placed inside the string.
+ *
+ * @return string The interpolated translation string.
+ */
+function studip_interpolate(string $gettext_string, array $parameters) : string
+{
+    return preg_replace_callback(
+        '/%\{\s*(\w+)\s*\}/',
+        function ($match) use ($parameters): string {
+            if (!isset($parameters[$match[1]])) {
+                throw new Exception('The parameter for the placeholder ' . $match[1] . ' is missing.');
+            }
+            return $parameters[$match[1]];
+        },
+        $gettext_string
+    );
+}
diff --git a/tests/unit/lib/FunctionsTest.php b/tests/unit/lib/FunctionsTest.php
index 9a92f1a..670d00c 100644
--- a/tests/unit/lib/FunctionsTest.php
+++ b/tests/unit/lib/FunctionsTest.php
@@ -80,11 +80,29 @@ class FunctionsTest extends \Codeception\Test\Unit
     public function testTrailsControllerExtractActionAndArgs()
     {
         $controller = new Trails_Controller(null);
-        list($action, $args, $format) = $controller->extract_action_and_args('foo/bar//42.html');
+        [$action, $args, $format] = $controller->extract_action_and_args('foo/bar//42.html');
 
         $this->assertEquals('foo', $action);
         $this->assertEquals(['bar', '', '42'], $args);
         $this->assertEquals('html', $format);
 
     }
+
+    /**
+     * @covers ::studip_interpolate
+     */
+    public function testStudipInterpolate()
+    {
+        $this->assertEquals(
+            '12bar34',
+            studip_interpolate('12%{foo}34', ['foo' => 'bar'])
+        );
+        $this->assertEquals(
+            'foo',
+            studip_interpolate('%{ bar }', ['bar' => 'foo'])
+        );
+
+        $this->expectException(Exception::class);
+        studip_interpolate('%{foo}', []);
+    }
 }
-- 
cgit v1.0


From 9c060cedfa6017a38b79d3bc6771fea2084bf823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Fri, 3 May 2024 15:49:37 +0000
Subject: Resolve "Verwaltung von Veranstaltungen: Duplikate im
 Lehrendenfilter"

Closes #4054 and #4107

Merge request studip/studip!2955
---
 app/controllers/admin/courses.php | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 17a07c7..8de1b79 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -534,12 +534,14 @@ class Admin_CoursesController extends AuthenticatedController
             'institut_id'    => 'MY_INSTITUTES_DEFAULT',
         ];
 
-        $config->store(
-            'MY_INSTITUTES_INCLUDE_CHILDREN',
-            str_contains($filters['institut_id'], '_') ? 1 : 0
-        );
-        if ($config->MY_INSTITUTES_INCLUDE_CHILDREN) {
-            $filters['institut_id'] = substr($filters['institut_id'], 0, strpos($filters['institut_id'], '_'));
+        if (!empty($filters['institut_id'])) {
+            $config->store(
+                'MY_INSTITUTES_INCLUDE_CHILDREN',
+                str_contains($filters['institut_id'], '_') ? 1 : 0
+            );
+            if ($config->MY_INSTITUTES_INCLUDE_CHILDREN) {
+                $filters['institut_id'] = substr($filters['institut_id'], 0, strpos($filters['institut_id'], '_'));
+            }
         }
 
         foreach ($mapping as $key => $field) {
@@ -1674,7 +1676,9 @@ class Admin_CoursesController extends AuthenticatedController
         if (str_contains($institut_id, '_')) {
             $institut_id = substr($institut_id, 0, strpos($institut_id, '_'));
         }
-        $teachers = DBManager::get()->fetchAll("
+        $teachers = [];
+        if ($institut_id) {
+            $teachers = DBManager::get()->fetchAll("
                 SELECT auth_user_md5.*, user_info.*
                 FROM auth_user_md5
                     LEFT JOIN user_info ON (auth_user_md5.user_id = user_info.user_id)
@@ -1682,18 +1686,19 @@ class Admin_CoursesController extends AuthenticatedController
                     INNER JOIN Institute ON (Institute.Institut_id = user_inst.Institut_id)
                 WHERE (Institute.Institut_id = :institut_id OR Institute.fakultaets_id = :institut_id)
                     AND auth_user_md5.perms = 'dozent'
+                GROUP BY auth_user_md5.user_id
                 ORDER BY auth_user_md5.Nachname ASC, auth_user_md5.Vorname ASC
             ", [
                 'institut_id' => $institut_id
             ],
-            function ($data) {
-                $ret['user_id'] = $data['user_id'];
-                unset($data['user_id']);
-                $ret['fullname'] = User::build($data)->getFullName("full_rev");
-                return $ret;
-            }
-        );
-
+                function ($data) {
+                    $ret['user_id'] = $data['user_id'];
+                    unset($data['user_id']);
+                    $ret['fullname'] = User::build($data)->getFullName("full_rev");
+                    return $ret;
+                }
+            );
+        }
 
         $list = [];
         if (!$institut_id || $institut_id === 'all') {
-- 
cgit v1.0


From 21f741c44215044c162fc1f0044bcbc052004d2e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 06:49:27 +0000
Subject: fixes #4112

Closes #4112

Merge request studip/studip!2957
---
 app/controllers/accessibility/forms.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/controllers/accessibility/forms.php b/app/controllers/accessibility/forms.php
index f4f9adf..476f2fe 100644
--- a/app/controllers/accessibility/forms.php
+++ b/app/controllers/accessibility/forms.php
@@ -3,6 +3,21 @@ class Accessibility_FormsController extends StudipController
 {
     protected $with_session = true;
 
+    public function before_filter(&$action, &$args)
+    {
+        parent::before_filter($action, $args);
+
+        if (
+            Config::get()->REPORT_BARRIER_MODE === 'off'
+            || (
+                Config::get()->REPORT_BARRIER_MODE === 'logged-in'
+                && !User::findCurrent()
+            )
+        ) {
+            throw new AccessDeniedException();
+        }
+    }
+
     public function report_barrier_action()
     {
         PageLayout::setTitle(_('Barriere melden'));
-- 
cgit v1.0


From 463161ebfd669120ccd747db0c7df405ae2ace2c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 07:14:06 +0000
Subject: fixes #4104

Closes #4104

Merge request studip/studip!2952
---
 app/controllers/admin/courseplanning.php      | 2 +-
 app/views/admin/courseplanning/pick_color.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/courseplanning.php b/app/controllers/admin/courseplanning.php
index b8971e2..44b372d 100644
--- a/app/controllers/admin/courseplanning.php
+++ b/app/controllers/admin/courseplanning.php
@@ -82,7 +82,7 @@ class Admin_CourseplanningController extends AuthenticatedController
         foreach ($this->events as $event) {
             $start_date_time = explode('T', $event['start']);
             $time_elements = explode(':', $start_date_time[1]);
-            if (!$event['comform'] || $time_elements[0] % 2) {
+            if (!$event['conform'] || $time_elements[0] % 2) {
                 Sidebar::get()->getWidget('actions')->addLink(
                     _('Veranstaltungen außerhalb des Rasters'),
                     $this->nonconformURL(),
diff --git a/app/views/admin/courseplanning/pick_color.php b/app/views/admin/courseplanning/pick_color.php
index dbd93a8..61cc7fc 100644
--- a/app/views/admin/courseplanning/pick_color.php
+++ b/app/views/admin/courseplanning/pick_color.php
@@ -13,10 +13,12 @@
 
     <div id="event-color-picker"></div>
 
+<? if (!empty($semtype)): ?>
     <label>
         <input name="event_color_semtype" type="checkbox" value="1">
         <?= sprintf(_('Farbtyp für alle VA dieses Typs (%s) übernehmen'), htmlReady($semtype)) ?>
     </label>
+<? endif; ?>
 
     <div data-dialog-button>
         <?= Studip\Button::createAccept(_('Speichern'), 'save') ?>
-- 
cgit v1.0


From 329ab7b0e2fb946bb4773612b42ec47370cc5d43 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 07:28:15 +0000
Subject: fixes #4103

Closes #4103

Merge request studip/studip!2951
---
 app/views/consultation/admin/ungrouped.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/consultation/admin/ungrouped.php b/app/views/consultation/admin/ungrouped.php
index d41d43d..f21dc6a 100644
--- a/app/views/consultation/admin/ungrouped.php
+++ b/app/views/consultation/admin/ungrouped.php
@@ -183,9 +183,7 @@
                 </div>
             <? endif; ?>
             </td>
-            <td>
-                <?= htmlReady($block->room) ?>
-            </td>
+            <td><?= htmlReady($slot->block->room) ?></td>
             <td>
                 <?= $this->render_partial('consultation/slot-occupation.php', compact('slot')) ?>
             </td>
-- 
cgit v1.0


From b9ac604f3b4f03acc8ce4a88c78fbb399be3a373 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 07:37:00 +0000
Subject: fixes #4100

Closes #4100

Merge request studip/studip!2950
---
 lib/models/SimpleORMap.class.php | 49 +++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/lib/models/SimpleORMap.class.php b/lib/models/SimpleORMap.class.php
index 89cdd09..2013db4 100644
--- a/lib/models/SimpleORMap.class.php
+++ b/lib/models/SimpleORMap.class.php
@@ -568,10 +568,11 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
         $record_data = [];
         $relation_data = [];
         foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                $relation_data[$key] = $value;
-            } else {
+            $temp = static::alias_fields()[$key] ?? $key;
+            if (isset(static::db_fields()[$temp])) {
                 $record_data[$key] = $value;
+            } else {
+                $relation_data[$key] = $value;
             }
         }
         $record = static::toObject($record_data);
@@ -581,29 +582,31 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
         } else {
             $record->setData($record_data);
         }
-        if (is_array($relation_data)) {
-            foreach ($relation_data as $relation => $data) {
-                $options = $record->getRelationOptions($relation);
-                if ($options['type'] == 'has_one') {
-                    $record->{$relation} = call_user_func([$options['class_name'], 'import'], $data);
-                }
-                if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
-                    foreach ($data as $one) {
-                        $current = call_user_func([$options['class_name'], 'import'], $one);
-                        if ($options['type'] == 'has_many') {
-                            $foreign_key_value = call_user_func($options['assoc_func_params_func'], $record);
-                            call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
-                        }
-                        if ($current->id !== null) {
-                            $existing = $record->{$relation}->find($current->id);
-                            if ($existing) {
-                                $existing->setData($current);
-                            } else {
-                                $record->{$relation}->append($current);
-                            }
+        foreach ($relation_data as $relation => $data) {
+            if (!$record->isRelation($relation)) {
+                continue;
+            }
+
+            $options = $record->getRelationOptions($relation);
+            if ($options['type'] == 'has_one') {
+                $record->{$relation} = call_user_func([$options['class_name'], 'import'], $data);
+            }
+            if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
+                foreach ($data as $one) {
+                    $current = call_user_func([$options['class_name'], 'import'], $one);
+                    if ($options['type'] == 'has_many') {
+                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $record);
+                        call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
+                    }
+                    if ($current->id !== null) {
+                        $existing = $record->{$relation}->find($current->id);
+                        if ($existing) {
+                            $existing->setData($current);
                         } else {
                             $record->{$relation}->append($current);
                         }
+                    } else {
+                        $record->{$relation}->append($current);
                     }
                 }
             }
-- 
cgit v1.0


From ef54bef72559aa7c2e74c390248a2f33dcd69bce Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 08:35:27 +0000
Subject: fixes #4096

Closes #4096

Merge request studip/studip!2942
---
 lib/classes/CronjobScheduler.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/classes/CronjobScheduler.class.php b/lib/classes/CronjobScheduler.class.php
index afc89f6..cc4cf8b 100644
--- a/lib/classes/CronjobScheduler.class.php
+++ b/lib/classes/CronjobScheduler.class.php
@@ -256,20 +256,19 @@ class CronjobScheduler
         }
 
         foreach ($schedules as $schedule) {
+            $log = new CronjobLog();
+            $log->schedule_id = $schedule->schedule_id;
+            $log->scheduled   = $schedule->next_execution;
+            $log->executed    = time();
+            $log->exception   = null;
+            $log->duration    = -1;
+
             try {
                 // Skip schedules with missing task classes
                 if (!$schedule->task->valid) {
                     throw new Exception(_('Die Klasse für den Cronjob-Task konnte nicht gefunden werden'));
                 }
 
-                $log = new CronjobLog();
-                $log->schedule_id = $schedule->schedule_id;
-                $log->scheduled   = $schedule->next_execution;
-                $log->executed    = time();
-                $log->exception   = null;
-                $log->duration    = -1;
-                $log->store();
-
                 // Start capturing output and measuring duration
                 ob_start();
                 $start_time = microtime(true);
@@ -286,6 +285,7 @@ class CronjobScheduler
                 $log->store();
             } catch (Exception $e) {
                 $log->exception = $e;
+                $log->store();
 
                 // Deactivate schedule
                 $schedule->deactivate();
-- 
cgit v1.0


From b54b49704eb31bbe0fe4ffe05466538a4174d4dc Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 6 May 2024 08:38:40 +0000
Subject: fix #4033

Closes #4033

Merge request studip/studip!2900
---
 .../stylesheets/scss/courseware/blockadder.scss    |   2 +-
 .../stylesheets/scss/courseware/toolbar.scss       |  17 ++-
 .../courseware/toolbar/CoursewareToolbar.vue       |  44 ++++--
 .../courseware/toolbar/CoursewareToolbarBlocks.vue | 170 +++++++++++----------
 .../toolbar/CoursewareToolbarClipboard.vue         |  14 +-
 5 files changed, 150 insertions(+), 97 deletions(-)

diff --git a/resources/assets/stylesheets/scss/courseware/blockadder.scss b/resources/assets/stylesheets/scss/courseware/blockadder.scss
index 93325dd..b3f4834 100644
--- a/resources/assets/stylesheets/scss/courseware/blockadder.scss
+++ b/resources/assets/stylesheets/scss/courseware/blockadder.scss
@@ -136,7 +136,7 @@
 }
 .cw-element-inserter-wrapper {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(225px, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
     grid-auto-rows: auto;
     grid-gap: 4px;
     margin-bottom: 8px;
diff --git a/resources/assets/stylesheets/scss/courseware/toolbar.scss b/resources/assets/stylesheets/scss/courseware/toolbar.scss
index fdabbf2..0670486 100644
--- a/resources/assets/stylesheets/scss/courseware/toolbar.scss
+++ b/resources/assets/stylesheets/scss/courseware/toolbar.scss
@@ -14,8 +14,7 @@
         min-height: 100%;
         border: solid thin var(--content-color-40);
         background-color: var(--white);
-        overflow-y: auto;
-        overflow-x: hidden;
+        overflow: hidden;
         position: relative;
         padding: 0 4px;
         top: 0;
@@ -33,6 +32,11 @@
             right: 0;
         }
 
+        .cw-toolbar-tool-content {
+            overflow-y: auto;
+            padding-right: 8px;
+        }
+
         .cw-toolbar-blocks {
             .input-group.files-search {
                 &.search {
@@ -96,6 +100,12 @@
             }
 
         }
+
+        .cw-toolbar-clipboard {
+            .cw-collapsible {
+                margin-bottom: 4px;
+            }
+        }
     }
     .cw-toolbar-folded-wrapper {
         display: flex;
@@ -124,6 +134,7 @@
 
         &.cw-toolbar-button-toggle {
             text-align: end;
+            flex-grow: 1;
         }
 
         &.active {
@@ -142,7 +153,7 @@
     .cw-toolbar-tools.hd {
         .cw-toolbar-button-wrapper {
             .cw-toolbar-button {
-                width: 128px;
+                min-width: 110px;
                 padding: 2px 16px 0 16px;
                 &.cw-toolbar-button-toggle {
                     text-align: end;
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
index 8f82eac..dc70348 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbar.vue
@@ -2,7 +2,7 @@
     <div class="cw-toolbar-wrapper">
         <div id="cw-toolbar" class="cw-toolbar" :style="toolbarStyle">
             <div v-if="showTools" class="cw-toolbar-tools" :class="{ unfold: unfold, hd: isHd, wqhd: isWqhd }">
-                <div class="cw-toolbar-button-wrapper">
+                <div id="cw-toolbar-nav" class="cw-toolbar-button-wrapper">
                     <button
                         class="cw-toolbar-button"
                         :class="{ active: activeTool === 'blockAdder' }"
@@ -35,9 +35,19 @@
                         <studip-icon shape="arr_2right" :size="24" />
                     </button>
                 </div>
-                <courseware-toolbar-blocks v-if="activeTool === 'blockAdder'" />
-                <courseware-toolbar-containers v-if="activeTool === 'containerAdder'" />
-                <courseware-toolbar-clipboard v-if="activeTool === 'clipboard'" />
+                <div class="cw-toolbar-tool-wrapper">
+                    <CoursewareToolbarBlocks
+                        v-if="activeTool === 'blockAdder'"
+                        :toolbarContentHeight="toolbarContentHeight"
+                    />
+                    <CoursewareToolbarContainers
+                        v-if="activeTool === 'containerAdder'"
+                    />
+                    <CoursewareToolbarClipboard
+                        v-if="activeTool === 'clipboard'"
+                        :toolbarContentHeight="toolbarContentHeight"
+                    />
+                </div>
             </div>
             <div v-else class="cw-toolbar-folded-wrapper">
                 <button
@@ -97,20 +107,26 @@ export default {
             toolbarActive: 'toolbarActive',
             hideEditLayout: 'hideEditLayout',
         }),
-        toolbarStyle() {
-            const scrollTopStyles = window.getComputedStyle(document.getElementById('scroll-to-top'));
+        scrollTopStyles() {
+            return window.getComputedStyle(document.getElementById('scroll-to-top'));
+        },
+        toolbarHeight() {
             const scrollTopHeight =
-                parseInt(scrollTopStyles['height'], 10) +
-                parseInt(scrollTopStyles['padding-top'], 10) +
-                parseInt(scrollTopStyles['padding-bottom'], 10) +
-                parseInt(scrollTopStyles['margin-bottom'], 10);
-            let height = parseInt(
+                parseInt(this.scrollTopStyles['height'], 10) +
+                parseInt(this.scrollTopStyles['padding-top'], 10) +
+                parseInt(this.scrollTopStyles['padding-bottom'], 10) +
+                parseInt(this.scrollTopStyles['margin-bottom'], 10);
+            return parseInt(
                 Math.min(this.windowInnerHeight * 0.9, this.windowInnerHeight - this.toolbarTop - scrollTopHeight)
             );
-
+        },
+        toolbarContentHeight() {
+            return this.toolbarHeight - 55;
+        },
+        toolbarStyle() {
             return {
-                height: height + 'px',
-                minHeight: height + 'px',
+                height: this.toolbarHeight + 'px',
+                minHeight: this.toolbarHeight + 'px',
                 top: this.toolbarTop + 'px',
             };
         },
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
index 2795e62..ceda0f0 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbarBlocks.vue
@@ -1,85 +1,88 @@
 <template>
     <div class="cw-toolbar-blocks">
-        <form @submit.prevent="loadSearch">
-            <div class="input-group files-search search cw-block-search">
-                <input
-                    ref="searchBox"
-                    type="text"
-                    v-model="searchInput"
-                    @click.stop
-                    :label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
-                />
-                <span class="input-group-append" @click.stop>
-                    <button
-                        v-if="searchInput"
-                        type="button"
-                        class="button reset-search"
-                        id="reset-search"
-                        :title="$gettext('Suche zurücksetzen')"
-                        @click="resetSearch"
-                    >
-                        <studip-icon shape="decline" :size="20"></studip-icon>
-                    </button>
-                    <button
-                        type="submit"
-                        class="button"
-                        id="search-btn"
-                        :title="$gettext('Suche starten')"
-                        @click="loadSearch"
-                    >
-                        <studip-icon shape="search" :size="20"></studip-icon>
-                    </button>
-                </span>
-            </div>
-        </form>
+        <div id="cw-toolbar-blocks-header" class="cw-toolbar-tool-header">
+            <form @submit.prevent="loadSearch">
+                <div class="input-group files-search search cw-block-search">
+                    <input
+                        ref="searchBox"
+                        type="text"
+                        v-model="searchInput"
+                        @click.stop
+                        :label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
+                    />
+                    <span class="input-group-append" @click.stop>
+                        <button
+                            v-if="searchInput"
+                            type="button"
+                            class="button reset-search"
+                            id="reset-search"
+                            :title="$gettext('Suche zurücksetzen')"
+                            @click="resetSearch"
+                        >
+                            <studip-icon shape="decline" :size="20"></studip-icon>
+                        </button>
+                        <button
+                            type="submit"
+                            class="button"
+                            id="search-btn"
+                            :title="$gettext('Suche starten')"
+                            @click="loadSearch"
+                        >
+                            <studip-icon shape="search" :size="20"></studip-icon>
+                        </button>
+                    </span>
+                </div>
+            </form>
 
-        <div class="filterpanel">
-            <span class="sr-only">{{ $gettext('Kategorien-Filter') }}</span>
-            <button
-                v-for="category in blockCategories"
-                :key="category.type"
-                class="button"
-                :class="{ 'button-active': category.type === currentFilterCategory }"
-                :aria-pressed="category.type === currentFilterCategory ? 'true' : 'false'"
-                @click="selectCategory(category.type)"
-            >
-                {{ category.title }}
-            </button>
+            <div class="filterpanel">
+                <span class="sr-only">{{ $gettext('Kategorien-Filter') }}</span>
+                <button
+                    v-for="category in blockCategories"
+                    :key="category.type"
+                    class="button"
+                    :class="{ 'button-active': category.type === currentFilterCategory }"
+                    :aria-pressed="category.type === currentFilterCategory ? 'true' : 'false'"
+                    @click="selectCategory(category.type)"
+                >
+                    {{ category.title }}
+                </button>
+            </div>
         </div>
-
-        <div v-if="filteredBlockTypes.length > 0" class="cw-blockadder-item-list">
-            <draggable
-                v-if="filteredBlockTypes.length > 0"
-                class="cw-blockadder-item-list"
-                tag="div"
-                role="listbox"
-                v-model="filteredBlockTypes"
-                handle=".cw-sortable-handle-blockadder"
-                :group="{ name: 'blocks', pull: 'clone', put: 'false' }"
-                :clone="cloneBlock"
-                :sort="false"
-                :emptyInsertThreshold="20"
-                @start="dragBlockStart($event)"
-                @end="dropNewBlock($event)"
-                ref="sortables"
-                sectionId="0"
-            >
-                <courseware-blockadder-item
-                    v-for="(block, index) in filteredBlockTypes"
-                    :key="index"
-                    :title="block.title"
-                    :type="block.type"
-                    :data-blocktype="block.type"
-                    :description="block.description"
-                    @blockAdded="$emit('blockAdded')"
-                />
-            </draggable>
+        <div class="cw-toolbar-tool-content" :style="toolContentStyle">
+            <div v-if="filteredBlockTypes.length > 0" class="cw-blockadder-item-list">
+                <draggable
+                    v-if="filteredBlockTypes.length > 0"
+                    class="cw-blockadder-item-list"
+                    tag="div"
+                    role="listbox"
+                    v-model="filteredBlockTypes"
+                    handle=".cw-sortable-handle-blockadder"
+                    :group="{ name: 'blocks', pull: 'clone', put: 'false' }"
+                    :clone="cloneBlock"
+                    :sort="false"
+                    :emptyInsertThreshold="20"
+                    @start="dragBlockStart($event)"
+                    @end="dropNewBlock($event)"
+                    ref="sortables"
+                    sectionId="0"
+                >
+                    <courseware-blockadder-item
+                        v-for="(block, index) in filteredBlockTypes"
+                        :key="index"
+                        :title="block.title"
+                        :type="block.type"
+                        :data-blocktype="block.type"
+                        :description="block.description"
+                        @blockAdded="$emit('blockAdded')"
+                    />
+                </draggable>
+            </div>
+            <courseware-companion-box
+                v-else
+                :msgCompanion="$gettext('Es wurden keine passenden Blöcke gefunden.')"
+                mood="pointing"
+            />
         </div>
-        <courseware-companion-box
-            v-else
-            :msgCompanion="$gettext('Es wurden keine passenden Blöcke gefunden.')"
-            mood="pointing"
-        />
     </div>
 </template>
 
@@ -99,6 +102,12 @@ export default {
         CoursewareCompanionBox,
         draggable,
     },
+    props: {
+        toolbarContentHeight: {
+            type: Number,
+            required: true,
+        },
+    },
     data() {
         return {
             searchInput: '',
@@ -132,6 +141,13 @@ export default {
                 { title: this.$gettext('Biografie'), type: 'biography' },
             ];
         },
+        toolContentStyle() {
+            const height = this.toolbarContentHeight - 115;
+
+            return {
+                height: height + 'px',
+            };
+        },
     },
     methods: {
         ...mapActions({
diff --git a/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue b/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
index 98cd573..c6f1e92 100644
--- a/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
+++ b/resources/vue/components/courseware/toolbar/CoursewareToolbarClipboard.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="cw-toolbar-clipboard">
+    <div class="cw-toolbar-clipboard cw-toolbar-tool-content" :style="toolContentStyle">
         <courseware-collapsible-box :title="$gettext('Blöcke')" :open="clipboardBlocks.length > 0">
             <template v-if="clipboardBlocks.length > 0">
                 <div class="cw-element-inserter-wrapper">
@@ -101,7 +101,12 @@ export default {
         StudipDialog,
         draggable,
     },
-
+    props: {
+        toolbarContentHeight: {
+            type: Number,
+            required: true,
+        },
+    },
     data() {
         return {
             showDeleteClipboardDialog: false,
@@ -143,6 +148,11 @@ export default {
             }
             return '';
         },
+        toolContentStyle() {
+            return {
+                height: this.toolbarContentHeight + 'px',
+            };
+        },
     },
     methods: {
         ...mapActions({
-- 
cgit v1.0


From ed31fb683f3c8e61d42f2379b98f23aa4ebdd063 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 08:41:32 +0000
Subject: fixes #4115

Closes #4115

Merge request studip/studip!2959
---
 lib/navigation/FooterNavigation.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/navigation/FooterNavigation.php b/lib/navigation/FooterNavigation.php
index 32a4182..4319c97 100644
--- a/lib/navigation/FooterNavigation.php
+++ b/lib/navigation/FooterNavigation.php
@@ -69,13 +69,20 @@ class FooterNavigation extends Navigation
                 && User::findCurrent()
             )
         ) {
+            $url = Request::url();
+
+            // Remove 'page' parameter if the page links to itself
+            if (str_contains($url, 'dispatch.php/accessibility/forms/report_barrier')) {
+                $url = URLHelper::getURL($url, ['page' => null], true);
+            }
+
             $this->addSubNavigation(
                 'report_barrier',
                 new Navigation(
                     _('Barriere melden'),
                     URLHelper::getURL(
                         'dispatch.php/accessibility/forms/report_barrier',
-                        ['page' => Request::url(), 'cancel_login' => '1']
+                        ['page' => $url, 'cancel_login' => '1']
                     )
                 )
             );
-- 
cgit v1.0


From f8d42374860009922ee68bd9aba63e50f66e77df Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 6 May 2024 08:48:05 +0000
Subject: prevent php-warnings, re #4114

Merge request studip/studip!2958
---
 app/controllers/oer/endpoints.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/oer/endpoints.php b/app/controllers/oer/endpoints.php
index 417f1e8..31563f5 100644
--- a/app/controllers/oer/endpoints.php
+++ b/app/controllers/oer/endpoints.php
@@ -45,7 +45,7 @@ class Oer_EndpointsController extends StudipController
         $this->render_json([
             'name' => Config::get()->UNI_NAME_CLEAN,
             'public_key' => $host['public_key'],
-            'url' => $GLOBALS['OER_PREFERRED_URI'] ?: $GLOBALS['ABSOLUTE_URI_STUDIP']."dispatch.php/oer/endpoints/",
+            'url' => ($GLOBALS['OER_PREFERRED_URI'] ?? $GLOBALS['ABSOLUTE_URI_STUDIP']) . 'dispatch.php/oer/endpoints/',
             'index_server' => $host['index_server']
         ]);
     }
@@ -254,7 +254,7 @@ class Oer_EndpointsController extends StudipController
                     'description' => $material['description'],
                     'content_type' => $material['content_type'],
                     'front_image_content_type' => $material['front_image_content_type'],
-                    'url' => ($GLOBALS['OER_PREFERRED_URI'] ?: $GLOBALS['ABSOLUTE_URI_STUDIP'])."dispatch.php/oer/market/download/".$item_id,
+                    'url' => ($GLOBALS['OER_PREFERRED_URI'] ?? $GLOBALS['ABSOLUTE_URI_STUDIP']) . 'dispatch.php/oer/market/download/' . $item_id,
                     'player_url' => $material['player_url'],
                     'tool' => $material['tool'],
                     'structure' => ($material['structure'] ? $material['structure']->getArrayCopy() : null),
-- 
cgit v1.0


From c659d71e33cecbe42a7038c281c082f4b5c98414 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 08:50:32 +0000
Subject: adjustments for php8, fixes #4111

Closes #4111

Merge request studip/studip!2956
---
 lib/activities/Stream.php                          | 30 +++--------
 lib/classes/Config.class.php                       | 30 +++--------
 lib/classes/ForumHelpers.php                       | 10 ++--
 lib/classes/I18NString.php                         |  7 +--
 .../JsonApi/Middlewares/StudipMockNavigation.php   | 27 +++-------
 lib/classes/MultiDimArrayObject.class.php          | 13 +----
 lib/classes/Request.class.php                      | 27 +++-------
 lib/classes/SemClass.class.php                     | 22 ++------
 lib/classes/SemType.class.php                      | 27 +++-------
 lib/classes/SessionDecoder.class.php               | 61 ++++------------------
 lib/classes/StudipArrayObject.class.php            | 38 +++-----------
 lib/classes/StudipCachedArray.php                  |  7 +--
 lib/classes/StudipPDO.class.php                    | 33 +++++-------
 lib/classes/StudipPDOStatement.php                 |  5 +-
 lib/classes/UserDataAdapter.php                    | 30 +++--------
 lib/classes/restapi/Response.php                   | 24 ++-------
 lib/classes/sidebar/AttributesArrayAccessTrait.php | 26 ++-------
 lib/filesystem/StandardFile.php                    | 21 ++------
 lib/filesystem/UnknownFileType.php                 | 21 ++------
 lib/models/DataField.class.php                     |  5 +-
 lib/models/SimpleCollection.class.php              | 12 ++---
 lib/models/SimpleORMap.class.php                   | 41 ++++-----------
 lib/models/SimpleORMapCollection.class.php         |  5 +-
 lib/navigation/Navigation.php                      |  7 +--
 phpstan-php8.neon.dist                             | 26 ---------
 phpstan.neon.dist                                  |  2 +-
 26 files changed, 114 insertions(+), 443 deletions(-)
 delete mode 100644 phpstan-php8.neon.dist

diff --git a/lib/activities/Stream.php b/lib/activities/Stream.php
index 6b64eff..b1472ef 100644
--- a/lib/activities/Stream.php
+++ b/lib/activities/Stream.php
@@ -79,66 +79,48 @@ class Stream implements \ArrayAccess, \Countable, \IteratorAggregate
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->activities[$offset]);
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->activities[$offset];
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->activities[$offset] = $value;
     }
 
     /**
      * ArrayAccess: unset the value at the given offset (not applicable)
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->activities[$offset]);
     }
 
     /**
      * IteratorAggregate
-     *
-     * @todo Add \Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new \ArrayIterator($this->activities);
     }
 
     /**
      * Countable
-     *
-     * @todo Add int return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return count($this->activities);
     }
diff --git a/lib/classes/Config.class.php b/lib/classes/Config.class.php
index 4d57f0f..2f6b728 100644
--- a/lib/classes/Config.class.php
+++ b/lib/classes/Config.class.php
@@ -153,11 +153,8 @@ class Config implements ArrayAccess, Countable, IteratorAggregate
 
     /**
      * IteratorAggregate
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new ArrayIterator($this->data);
     }
@@ -188,55 +185,40 @@ class Config implements ArrayAccess, Countable, IteratorAggregate
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->$offset);
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->$offset;
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->$offset = $value;
     }
 
     /**
      * ArrayAccess: unset the value at the given offset (not applicable)
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
 
     }
 
     /**
      * Countable
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return count($this->data);
     }
diff --git a/lib/classes/ForumHelpers.php b/lib/classes/ForumHelpers.php
index 3054dbc..0c036cf 100644
--- a/lib/classes/ForumHelpers.php
+++ b/lib/classes/ForumHelpers.php
@@ -92,19 +92,15 @@ class ForumHelpers {
      */
     public static function translate_perm($perm)
     {
-        $mapping = [
+        return match ($perm) {
             'root'   => _('Root'),
             'admin'  => _('Administrator/-in'),
             'dozent' => _('Lehrende/-r'),
             'tutor'  => _('Tutor/-in'),
             'autor'  => _('Autor/-in'),
             'user'   => _('Leser/-in'),
-        ];
-
-        // TODO: Activate next when devboard reliably runs on PHP7
-        // return $mapping[$perm] ?? '';
-
-        return isset($mapping[$perm]) ? $mapping[$perm] : '';
+            default  => '',
+        };
     }
 
     /**
diff --git a/lib/classes/I18NString.php b/lib/classes/I18NString.php
index 63e275e..eab42ff 100644
--- a/lib/classes/I18NString.php
+++ b/lib/classes/I18NString.php
@@ -78,13 +78,8 @@ class I18NString implements JsonSerializable
 
     /**
      * Return the JSON representation of this i18n field in selected language.
-     *
-     * @return string
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): string
     {
         return (string) $this;
     }
diff --git a/lib/classes/JsonApi/Middlewares/StudipMockNavigation.php b/lib/classes/JsonApi/Middlewares/StudipMockNavigation.php
index 34225d4..0883809 100644
--- a/lib/classes/JsonApi/Middlewares/StudipMockNavigation.php
+++ b/lib/classes/JsonApi/Middlewares/StudipMockNavigation.php
@@ -18,53 +18,38 @@ class DummyNavigation extends \Navigation implements \ArrayAccess
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return true;
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this;
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
     }
 
     /**
      * ArrayAccess: Delete the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
     }
 
     /**
-     * IteratorAggregate: Create interator for request parameters.
-     *
-     * @todo Add \Traversable return type when Stud.IP requires PHP8 minimal
+     * IteratorAggregate: Create iterator for request parameters.
      */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new \ArrayIterator();
     }
diff --git a/lib/classes/MultiDimArrayObject.class.php b/lib/classes/MultiDimArrayObject.class.php
index 459578f..b578018 100644
--- a/lib/classes/MultiDimArrayObject.class.php
+++ b/lib/classes/MultiDimArrayObject.class.php
@@ -78,13 +78,8 @@ class MultiDimArrayObject extends StudipArrayObject
 
     /**
      * Create a new iterator from an ArrayObject instance
-     *
-     * @return \Iterator
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         $class = $this->iteratorClass;
 
@@ -96,12 +91,8 @@ class MultiDimArrayObject extends StudipArrayObject
      *
      * @param  mixed $key
      * @param  mixed $value
-     * @return void
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($key, $value)
+    public function offsetSet($key, $value): void
     {
         $new_value = $this->recursiveArrayToArrayObjects($value);
         if (is_array($new_value)) {
diff --git a/lib/classes/Request.class.php b/lib/classes/Request.class.php
index c977934..d72a6a9 100644
--- a/lib/classes/Request.class.php
+++ b/lib/classes/Request.class.php
@@ -45,55 +45,40 @@ class Request implements ArrayAccess, IteratorAggregate
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->params[$offset]);
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->params[$offset] ?? null;
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->params[$offset] = $value;
     }
 
     /**
      * ArrayAccess: Delete the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->params[$offset]);
     }
 
     /**
-     * IteratorAggregate: Create interator for request parameters.
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
+     * IteratorAggregate: Create iterator for request parameters.
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new ArrayIterator((array)$this->params);
     }
diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php
index 09580e2..c4a2c26 100644
--- a/lib/classes/SemClass.class.php
+++ b/lib/classes/SemClass.class.php
@@ -478,11 +478,8 @@ class SemClass implements ArrayAccess
      * deprecated, does nothing, should not be used
      * @param string $offset
      * @param mixed $value
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
     }
 
@@ -490,12 +487,8 @@ class SemClass implements ArrayAccess
      * Compatibility function with old $SEM_CLASS variable for plugins. Maps the
      * new array-structure to the old boolean values.
      * @param integer $offset: name of attribute
-     * @return boolean|(localized)string
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         switch ($offset) {
             case "name":
@@ -528,12 +521,8 @@ class SemClass implements ArrayAccess
     /**
      * ArrayAccess method to check if an attribute exists.
      * @param int $offset
-     * @return bool
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->data[$offset]);
     }
@@ -541,11 +530,8 @@ class SemClass implements ArrayAccess
     /**
      * deprecated, does nothing, should not be used
      * @param string $offset
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
     }
 
diff --git a/lib/classes/SemType.class.php b/lib/classes/SemType.class.php
index 3d5de5d..2365c4e 100644
--- a/lib/classes/SemType.class.php
+++ b/lib/classes/SemType.class.php
@@ -86,8 +86,8 @@ class SemType implements ArrayAccess
         if ($this->countSeminars() === 0) {
             $db = DBManager::get();
             $statement = $db->prepare("
-                DELETE FROM sem_types 
-                WHERE id = :id 
+                DELETE FROM sem_types
+                WHERE id = :id
             ");
             StudipCacheFactory::getCache()->expire('DB_SEM_TYPES_ARRAY');
             return $statement->execute([
@@ -119,11 +119,9 @@ class SemType implements ArrayAccess
      * deprecated, does nothing, should not be used
      * @param string $offset
      * @param mixed $value
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+
+    public function offsetSet($offset, $value): void
     {
     }
 
@@ -131,12 +129,8 @@ class SemType implements ArrayAccess
      * Compatibility function with old $SEM_TYPE variable for plugins. Maps the
      * new array-structure to the old boolean values.
      * @param integer $offset: name of attribute
-     * @return boolean|(localized)string
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         switch ($offset) {
             case "name":
@@ -153,12 +147,8 @@ class SemType implements ArrayAccess
     /**
      * ArrayAccess method to check if an attribute exists.
      * @param mixed $offset
-     * @return bool
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->data[$offset]);
     }
@@ -166,11 +156,8 @@ class SemType implements ArrayAccess
     /**
      * deprecated, does nothing, should not be used
      * @param string $offset
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
     }
 
diff --git a/lib/classes/SessionDecoder.class.php b/lib/classes/SessionDecoder.class.php
index 8c0bc6b..d437494 100644
--- a/lib/classes/SessionDecoder.class.php
+++ b/lib/classes/SessionDecoder.class.php
@@ -83,69 +83,42 @@ class SessionDecoder implements ArrayAccess, Countable, Iterator {
         return $this->var_names;
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         reset($this->var_names);
     }
 
-    /**
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         $current = current($this->var_names);
         return $current !== false ? $this->offsetGet($current) : false;
     }
 
-    /**
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return current($this->var_names);
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         next($this->var_names);
     }
 
-    /**
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         $current = current($this->var_names);
         return $current !== false;
     }
 
-    /**
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->encoded_session[$offset]);
     }
 
     /**
-     * @param $offset
-     * @return mixed|null
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
+     * @param string $offset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         if($this->offsetExists($offset) && !isset($this->decoded_session[$offset])) {
             $this->decoded_session[$offset] = unserialize($this->encoded_session[$offset]);
@@ -153,27 +126,15 @@ class SessionDecoder implements ArrayAccess, Countable, Iterator {
         return $this->decoded_session[$offset] ?? null;
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
     }
 
-    /**
-     * @todo Add int return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return count($this->var_names);
     }
diff --git a/lib/classes/StudipArrayObject.class.php b/lib/classes/StudipArrayObject.class.php
index fe9aad1..531da67 100644
--- a/lib/classes/StudipArrayObject.class.php
+++ b/lib/classes/StudipArrayObject.class.php
@@ -157,13 +157,8 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
 
     /**
      * Get the number of public properties in the ArrayObject
-     *
-     * @return int
-     *
-     * @todo Add int return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return count($this->storage);
     }
@@ -216,13 +211,8 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
 
     /**
      * Create a new iterator from an ArrayObject instance
-     *
-     * @return \Iterator
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         $class = $this->iteratorClass;
 
@@ -273,12 +263,8 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
      * Returns whether the requested key exists
      *
      * @param  mixed $key
-     * @return bool
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($key)
+    public function offsetExists($key): bool
     {
         return isset($this->storage[$key]);
     }
@@ -287,12 +273,8 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
      * Returns the value at the specified key
      *
      * @param  mixed $key
-     * @return mixed
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($key)
+    public function offsetGet($key): mixed
     {
         $ret = null;
         if (!$this->offsetExists($key)) {
@@ -308,12 +290,8 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
      *
      * @param  mixed $key
      * @param  mixed $value
-     * @return void
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($key, $value)
+    public function offsetSet($key, $value): void
     {
         if (is_null($key)) {
             $this->append($value);
@@ -326,12 +304,8 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
      * Unsets the value at the specified key
      *
      * @param  mixed $key
-     * @return void
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($key)
+    public function offsetUnset($key): void
     {
         if ($this->offsetExists($key)) {
             unset($this->storage[$key]);
diff --git a/lib/classes/StudipCachedArray.php b/lib/classes/StudipCachedArray.php
index 18bb55b..1232d00 100644
--- a/lib/classes/StudipCachedArray.php
+++ b/lib/classes/StudipCachedArray.php
@@ -71,13 +71,8 @@ class StudipCachedArray implements ArrayAccess
      * Returns the value at given offset or null if it doesn't exist.
      *
      * @param string $offset Offset
-     *
-     * @return mixed
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         $this->loadData($offset);
         return $this->data[$offset];
diff --git a/lib/classes/StudipPDO.class.php b/lib/classes/StudipPDO.class.php
index e77a37f..8fa3418 100644
--- a/lib/classes/StudipPDO.class.php
+++ b/lib/classes/StudipPDO.class.php
@@ -122,23 +122,20 @@ class StudipPDO extends PDO
      * Quotes the given value in a form appropriate for the type.
      * If no explicit type is given, the value's PHP type is used.
      *
-     * @param mixed $value PHP value to quote
+     * @param mixed $string PHP value to quote
      * @param ?int $type parameter type (e.g. PDO::PARAM_STR)
      * @return string|false quoted SQL string
-     *
-     * @todo Add string|false return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function quote($value, $type = null)
+    public function quote($string, $type = null): false|string
     {
         if (!isset($type)) {
-            if (is_null($value)) {
+            if (is_null($string)) {
                 $type = PDO::PARAM_NULL;
-            } else if (is_bool($value)) {
+            } else if (is_bool($string)) {
                 $type = PDO::PARAM_BOOL;
-            } else if (is_int($value)) {
+            } else if (is_int($string)) {
                 $type = PDO::PARAM_INT;
-            } else if (is_array($value)) {
+            } else if (is_array($string)) {
                 $type = StudipPDO::PARAM_ARRAY;
             } else {
                 $type = PDO::PARAM_STR;
@@ -149,28 +146,24 @@ class StudipPDO extends PDO
             case PDO::PARAM_NULL:
                 return 'NULL';
             case PDO::PARAM_BOOL:
-                return $value ? '1' : '0';
+                return $string ? '1' : '0';
             case PDO::PARAM_INT:
-                return (int) $value;
+                return (int) $string;
             case StudipPDO::PARAM_ARRAY:
-                return is_array($value) && count($value) ? join(',', array_map([$this, 'quote'], $value)) : 'NULL';
+                return is_array($string) && count($string) ? join(',', array_map([$this, 'quote'], $string)) : 'NULL';
             case StudipPDO::PARAM_COLUMN:
-                return preg_replace('/\\W/', '', $value);
+                return preg_replace('/\\W/', '', $string);
             default:
-                return parent::quote($value);
+                return parent::quote($string);
         }
     }
 
     /**
      * Executes an SQL statement and returns the number of affected rows.
      *
-     * @param string    SQL statement
-     * @return int|false      number of affected rows
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
+     * @param string $statement SQL statement
      */
-    #[ReturnTypeWillChange]
-    public function exec($statement)
+    public function exec(string $statement): false|int
     {
         $this->verify($statement);
         return parent::exec($statement);
diff --git a/lib/classes/StudipPDOStatement.php b/lib/classes/StudipPDOStatement.php
index 4a3d069..80a8dc8 100644
--- a/lib/classes/StudipPDOStatement.php
+++ b/lib/classes/StudipPDOStatement.php
@@ -99,11 +99,8 @@ class StudipPDOStatement implements IteratorAggregate
 
     /**
      * Forwards all Iterator methods to the actual statement object.
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return $this->stmt;
     }
diff --git a/lib/classes/UserDataAdapter.php b/lib/classes/UserDataAdapter.php
index 0a0c3be..5277145 100644
--- a/lib/classes/UserDataAdapter.php
+++ b/lib/classes/UserDataAdapter.php
@@ -26,66 +26,48 @@ class UserDataAdapter implements ArrayAccess, Countable, IteratorAggregate
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return $this->user->offsetExists($this->adaptOffset($offset));
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->user->offsetGet($this->adaptOffset($offset));
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->user->offsetSet($this->adaptOffset($offset), $value);
     }
 
     /**
      * ArrayAccess: unset the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         $this->user->offsetUnset($this->adaptOffset($offset));
     }
 
     /**
      * @see Countable::count()
-     *
-     * @todo Add int return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return $this->user->count();
     }
 
     /**
      * @see IteratorAggregate::getIterator()
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return $this->user->getIterator();
     }
diff --git a/lib/classes/restapi/Response.php b/lib/classes/restapi/Response.php
index 4417979..56d9b65 100644
--- a/lib/classes/restapi/Response.php
+++ b/lib/classes/restapi/Response.php
@@ -123,41 +123,25 @@ class Response implements \ArrayAccess
 
     // array access methods for headers
 
-    /**
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->headers[$offset]);
     }
 
     /**
      * @param $offset
-     * @return mixed
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return @$this->headers[$offset];
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->headers[$offset] = $value;
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->headers[$offset]);
     }
diff --git a/lib/classes/sidebar/AttributesArrayAccessTrait.php b/lib/classes/sidebar/AttributesArrayAccessTrait.php
index 7bea834..09fc030 100644
--- a/lib/classes/sidebar/AttributesArrayAccessTrait.php
+++ b/lib/classes/sidebar/AttributesArrayAccessTrait.php
@@ -3,41 +3,25 @@ trait AttributesArrayAccessTrait
 {
     public $attributes = [];
 
-    /**
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->attributes[$offset]);
     }
 
     /**
-     * @param $offset
-     * @return mixed
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
+     * @param string $offset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->attributes[$offset];
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->attributes[$offset] = $value;
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->attributes[$offset]);
     }
diff --git a/lib/filesystem/StandardFile.php b/lib/filesystem/StandardFile.php
index e051871..9d2d35c 100644
--- a/lib/filesystem/StandardFile.php
+++ b/lib/filesystem/StandardFile.php
@@ -112,46 +112,33 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return $this->__isset($offset);
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->__get($offset);
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->__set($offset, $value);
     }
 
     /**
      * ArrayAccess: unset the value at the given offset (not applicable)
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
-
     }
 
     /**
diff --git a/lib/filesystem/UnknownFileType.php b/lib/filesystem/UnknownFileType.php
index bfd00ba..33d6c53 100644
--- a/lib/filesystem/UnknownFileType.php
+++ b/lib/filesystem/UnknownFileType.php
@@ -51,46 +51,33 @@ class UnknownFileType implements FileType, ArrayAccess
 
     /**
      * ArrayAccess: Check whether the given offset exists.
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return $this->__isset($offset);
     }
 
     /**
      * ArrayAccess: Get the value at the given offset.
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->__get($offset);
     }
 
     /**
      * ArrayAccess: Set the value at the given offset.
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->__set($offset, $value);
     }
 
     /**
      * ArrayAccess: unset the value at the given offset (not applicable)
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
-
     }
     /**
      * @inheritDoc
diff --git a/lib/models/DataField.class.php b/lib/models/DataField.class.php
index 2d745a9..8a0bdb6 100644
--- a/lib/models/DataField.class.php
+++ b/lib/models/DataField.class.php
@@ -256,11 +256,8 @@ class DataField extends SimpleORMap implements PrivacyObject
      * Specialized count method that returns the number of concrete entries.
      *
      * @return int number of entries
-     *
-     * @todo Add int return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return DatafieldEntryModel::countBySQL('datafield_id = ?', [$this->id]);
     }
diff --git a/lib/models/SimpleCollection.class.php b/lib/models/SimpleCollection.class.php
index 4d77682..6acc10d 100644
--- a/lib/models/SimpleCollection.class.php
+++ b/lib/models/SimpleCollection.class.php
@@ -299,12 +299,9 @@ class SimpleCollection extends StudipArrayObject
      * @param mixed $newval
      *
      * @see ArrayObject::offsetSet()
-     * @return void
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($index, $newval)
+
+    public function offsetSet($index, $newval): void
     {
         if (is_numeric($index)) {
             $index = (int) $index;
@@ -318,11 +315,8 @@ class SimpleCollection extends StudipArrayObject
      *
      * @see ArrayObject::offsetUnset()
      * @throws InvalidArgumentException
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($index)
+    public function offsetUnset($index): void
     {
         if ($this->offsetExists($index)) {
             $this->deleted[] = $this->offsetGet($index);
diff --git a/lib/models/SimpleORMap.class.php b/lib/models/SimpleORMap.class.php
index 2013db4..f86ec6f 100644
--- a/lib/models/SimpleORMap.class.php
+++ b/lib/models/SimpleORMap.class.php
@@ -1638,16 +1638,13 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
             return false;
         }
     }
+
     /**
      * ArrayAccess: Check whether the given offset exists.
      *
      * @param string $offset
-     * @return bool
-     *
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return $this->__isset($offset);
     }
@@ -1659,11 +1656,8 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      * @throws BadMethodCallException if getter for additional field could not be found
      * @param string $offset the column or additional field
      * @return null|string|SimpleORMapCollection
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->getValue($offset);
     }
@@ -1675,49 +1669,34 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      * @throws BadMethodCallException if setter for additional field could not be found
      * @param string $offset
      * @param mixed $value
-     * @return void
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->setValue($offset, $value);
     }
+
     /**
      * ArrayAccess: unset the value at the given offset (not applicable)
      *
      * @param string $offset
-     * @return void
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
 
     }
+
     /**
      * IteratorAggregate
-     *
-     * @return ArrayIterator
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): ArrayIterator
     {
         return new ArrayIterator($this->toArray());
     }
+
     /**
      * Countable
-     *
-     * @return int
-     *
-     * @todo Add int return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         return count($this->known_slots()) - count($this->relations);
     }
diff --git a/lib/models/SimpleORMapCollection.class.php b/lib/models/SimpleORMapCollection.class.php
index f06ee17..7debb80 100644
--- a/lib/models/SimpleORMapCollection.class.php
+++ b/lib/models/SimpleORMapCollection.class.php
@@ -92,11 +92,8 @@ class SimpleORMapCollection extends SimpleCollection
      *
      * @see ArrayObject::offsetSet()
      * @throws InvalidArgumentException if the given model does not fit (wrong type or id)
-     *
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($index, $newval)
+    public function offsetSet($index, $newval): void
     {
         if (!is_null($index)) {
             $index = (int)$index;
diff --git a/lib/navigation/Navigation.php b/lib/navigation/Navigation.php
index 3c02e86..af4355b 100644
--- a/lib/navigation/Navigation.php
+++ b/lib/navigation/Navigation.php
@@ -562,12 +562,9 @@ class Navigation implements IteratorAggregate
     }
 
     /**
-     * IteratorAggregate: Create interator for request parameters.
-     *
-     * @todo Add Traversable return type when Stud.IP requires PHP8 minimal
+     * IteratorAggregate: Create iterator for request parameters.
      */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new ArrayIterator($this->getSubNavigation());
     }
diff --git a/phpstan-php8.neon.dist b/phpstan-php8.neon.dist
deleted file mode 100644
index ed3baef..0000000
--- a/phpstan-php8.neon.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
-    level: 0
-    phpVersion: 80000 # PHP 8.0
-    paths:
-        - app/controllers
-        - app/routes
-        - lib
-        - tests/functional
-        - tests/jsonapi
-        - tests/unit
-    scanFiles:
-        - composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc
-    scanDirectories:
-        - app/controllers
-        - lib
-        - vendor
-    excludePaths:
-        - lib/classes/ZipArchiveLegacyTrait.php
-        - lib/elearning/studip_referrer.php
-        - lib/soap/StudipSoapClient_PHP5.class.php
-    tmpDir: .caches
-    earlyTerminatingMethodCalls:
-        RESTAPI\RouteMap:
-            - error
-            - halt
-            - notFound
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 17ff7c6..531053a 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,6 +1,6 @@
 parameters:
     level: 0
-    phpVersion: 70400 # PHP 7.4
+    phpVersion: 80100 # PHP 8.1
     paths:
         - app/controllers
         - app/routes
-- 
cgit v1.0


From a944dacedff6511310d1c73b9854b450ed8996b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Mon, 6 May 2024 08:54:08 +0000
Subject: =?UTF-8?q?Resolve=20"Verwaltung=20von=20Veranstaltungen:=20Einric?=
 =?UTF-8?q?htungsfilter=20filtert=20bei=20"Fakult=C3=A4t=20+=20Institute"?=
 =?UTF-8?q?=20nur=20auf=20die=20Fakult=C3=A4t"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4108

Merge request studip/studip!2954
---
 lib/classes/AdminCourseFilter.class.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/classes/AdminCourseFilter.class.php b/lib/classes/AdminCourseFilter.class.php
index 3b9cb4b..f643e09 100644
--- a/lib/classes/AdminCourseFilter.class.php
+++ b/lib/classes/AdminCourseFilter.class.php
@@ -86,21 +86,11 @@ class AdminCourseFilter
                 return $a['Institut_id'];
             });
         } else {
-            //We must check, if the institute ID belongs to a faculty
-            //and has the string _i appended to it.
-            //In that case we must display the courses of the faculty
-            //and all its institutes.
-            //Otherwise we just display the courses of the faculty.
 
-            $include_children = false;
             $inst_id = $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
-            if (str_contains($inst_id, '_')) {
-                $inst_id = substr($inst_id, 0, strpos($inst_id, '_'));
-                $include_children = true;
-            }
             $inst_ids[] = $inst_id;
 
-            if ($include_children) {
+            if ($GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN) {
                 $inst = Institute::find($inst_id);
                 if ($inst && $inst->isFaculty()) {
                     foreach ($inst->sub_institutes->pluck('Institut_id') as $institut_id) {
-- 
cgit v1.0


From 8474ee1063d11f1d5fd4b79674d2d734b82e18b0 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 08:59:03 +0000
Subject: relocate sorm classes, fixes #4106

Closes #4106

Merge request studip/studip!2953
---
 lib/classes/SimpleCollection.class.php      |  782 +++++++++
 lib/classes/SimpleORMap.class.php           | 2476 +++++++++++++++++++++++++++
 lib/classes/SimpleORMapCollection.class.php |  258 +++
 lib/models/SimpleCollection.class.php       |  782 ---------
 lib/models/SimpleORMap.class.php            | 2476 ---------------------------
 lib/models/SimpleORMapCollection.class.php  |  258 ---
 tests/unit/lib/VisualTest.php               |    2 +-
 tests/unit/lib/classes/MigrationTest.php    |    2 +-
 8 files changed, 3518 insertions(+), 3518 deletions(-)
 create mode 100644 lib/classes/SimpleCollection.class.php
 create mode 100644 lib/classes/SimpleORMap.class.php
 create mode 100644 lib/classes/SimpleORMapCollection.class.php
 delete mode 100644 lib/models/SimpleCollection.class.php
 delete mode 100644 lib/models/SimpleORMap.class.php
 delete mode 100644 lib/models/SimpleORMapCollection.class.php

diff --git a/lib/classes/SimpleCollection.class.php b/lib/classes/SimpleCollection.class.php
new file mode 100644
index 0000000..6acc10d
--- /dev/null
+++ b/lib/classes/SimpleCollection.class.php
@@ -0,0 +1,782 @@
+<?php
+if (!defined('SORT_NATURAL')) {
+    define('SORT_NATURAL', 6);
+}
+if (!defined('SORT_FLAG_CASE')) {
+    define('SORT_FLAG_CASE', 8);
+}
+
+/**
+ * SimpleCollection.class.php
+ * collection of assoc arrays with convenience
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @template T
+ */
+class SimpleCollection extends StudipArrayObject
+{
+    /**
+     * callable to initialize collection
+     *
+     * @var ?callable(): array<T>
+     */
+    protected $finder;
+
+    /**
+     * number of records after last init
+     *
+     * @var int
+     */
+    protected $last_count;
+
+    /**
+     * collection with deleted records
+     * @var static
+     */
+    protected $deleted;
+
+    /**
+     * creates a collection from an array of arrays
+     * all arrays should contain same keys, but is not enforced
+     *
+     * @param array<T> $data array containing assoc arrays
+     * @return SimpleCollection<T>
+     */
+    public static function createFromArray(array $data)
+    {
+        return new self($data);
+    }
+
+    /**
+     * converts arrays or objects to ArrayObject objects
+     * if ArrayAccess interface is not available
+     *
+     * @param mixed $a
+     * @return StudipArrayObject|ArrayAccess
+     */
+    public static function arrayToArrayObject($a)
+    {
+        if ($a instanceof StudipArrayObject) {
+            $a->setFlags(StudipArrayObject::ARRAY_AS_PROPS);
+            return $a;
+        }
+
+        if ($a instanceof ArrayObject) {
+            return new StudipArrayObject($a->getArrayCopy(), StudipArrayObject::ARRAY_AS_PROPS);
+        }
+
+        if ($a instanceof ArrayAccess) {
+            return $a;
+        }
+
+        return new StudipArrayObject((array) $a, StudipArrayObject::ARRAY_AS_PROPS);
+    }
+
+    /**
+     * returns closure to compare a value against given arguments
+     * using given operator
+     *
+     * @param string|callable(mixed, mixed|array): bool  $operator
+     * @param mixed|array $args
+     * @throws InvalidArgumentException
+     * @return callable(mixed): bool comparison function
+     */
+    public static function getCompFunc($operator, $args)
+    {
+        if (is_callable($operator)) {
+            $comp_func = function ($a) use ($args, $operator) {
+                return $operator($a, $args);
+            };
+        } else {
+            if (!is_array($args)) {
+                $args = [$args];
+            }
+            switch ($operator) {
+                case '==':
+                    $comp_func = function ($a) use ($args) {
+                        return in_array($a, $args);
+                    };
+                break;
+                case '===':
+                    $comp_func = function ($a) use ($args) {
+                        return in_array($a, $args, true);
+                    };
+                break;
+                case '!=':
+                case '<>':
+                    $comp_func = function ($a) use ($args) {
+                        return !in_array($a, $args);
+                    };
+                break;
+                case '!==':
+                    $comp_func = function ($a) use ($args) {
+                        return !in_array($a, $args, true);
+                    };
+                break;
+                case '<':
+                case '>':
+                case '<=':
+                case '>=':
+                    $op_func = function ($a, $b) use ($operator) {
+                        if ($operator === '<') {
+                            return $a < $b;
+                        } elseif ($operator === '<=') {
+                            return $a <= $b;
+                        } elseif ($operator === '>=') {
+                            return $a >= $b;
+                        } elseif ($operator === '>') {
+                            return $a > $b;
+                        }
+                    };
+                    $comp_func = function ($a) use ($op_func, $args) {
+                        return $op_func($a, $args[0]);
+                    };
+                break;
+                case '><':
+                    $comp_func = function ($a) use ($args) {
+                        return $a > $args[0] && $a < $args[1];
+                    };
+                break;
+                case '>=<=':
+                    $comp_func = function ($a) use ($args) {
+                        return $a >= $args[0] && $a <= $args[1];
+                    };
+                    break;
+                case '%=':
+                    $comp_func = function ($a) use ($args) {
+                        $a = mb_strtolower(static::translitLatin1($a));
+                        $args = array_map([static::class, 'translitLatin1'], $args);
+                        $args = array_map('mb_strtolower', $args);
+                        return in_array($a, $args);
+                    };
+                break;
+                case '*=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            if (mb_strpos($a, $arg) !== false) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                break;
+                case '^=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            if (mb_strpos($a, $arg) === 0) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                break;
+                case '$=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            $found = mb_strrpos($a, $arg);
+                            if ($found !== false && ($found + mb_strlen($arg)) === mb_strlen($a)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                break;
+                case '~=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            if (preg_match($arg, $a) === 1) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                    break;
+                default:
+                    throw new InvalidArgumentException('unknown operator: ' . $operator);
+             }
+         }
+         return $comp_func;
+    }
+
+    /**
+     * transliterates latin1 string to ascii
+     *
+     * @param string $text
+     * @return string
+     */
+    public static function translitLatin1($text)
+    {
+        if (!preg_match('/[\200-\377]/', $text)) {
+            return $text;
+        }
+        $text = str_replace(['ä','Ä','ö','Ö','ü','Ü','ß'], ['a','A','o','O','u','U','s'], $text);
+        $text = str_replace(['À','Á','Â','Ã','Å','Æ'], 'A' , $text);
+        $text = str_replace(['à','á','â','ã','å','æ'], 'a' , $text);
+        $text = str_replace(['È','É','Ê','Ë'], 'E' , $text);
+        $text = str_replace(['è','é','ê','ë'], 'e' , $text);
+        $text = str_replace(['Ì','Í','Î','Ï'], 'I' , $text);
+        $text = str_replace(['ì','í','î','ï'], 'i' , $text);
+        $text = str_replace(['Ò','Ó','Õ','Ô','Ø'], 'O' , $text);
+        $text = str_replace(['ò','ó','ô','õ','ø'], 'o' , $text);
+        $text = str_replace(['Ù','Ú','Û'], 'U' , $text);
+        $text = str_replace(['ù','ú','û'], 'u' , $text);
+        $text = str_replace(['Ç','ç','Ð','Ñ','Ý','ñ','ý','ÿ'], ['C','c','D','N','Y','n','y','y'] , $text);
+        return $text;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param array<T>|callable(): array<T> $data array or closure to fill collection
+     */
+    public function __construct($data = [])
+    {
+        parent::__construct();
+        $this->finder = is_callable($data) ? $data : null;
+        $this->deleted = clone $this;
+        if (is_callable($data)) {
+            $this->refresh();
+        } else {
+            $this->exchangeArray($data);
+        }
+    }
+
+    /**
+     * @param array $input
+     * @return array
+     */
+    public function exchangeArray($input)
+    {
+        return parent::exchangeArray(array_map(
+            [static::class, 'arrayToArrayObject'],
+            $input
+        ));
+    }
+
+    /**
+     * converts the object and all elements to plain arrays
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $args = func_get_args();
+        return $this->map(function ($a) use ($args) {
+            if (method_exists($a, 'toArray')) {
+                return call_user_func_array([$a, 'toArray'], $args);
+            }
+            if (method_exists($a, 'getArrayCopy')) {
+                return $a->getArrayCopy();
+            }
+            return (array) $a;
+        }
+        );
+    }
+
+    /**
+     *
+     * @see ArrayObject::append()
+     */
+    public function append($newval)
+    {
+        parent::append(static::arrayToArrayObject($newval));
+    }
+
+    /**
+     * Sets the value at the specified index
+     * ensures the value has ArrayAccess
+     *
+     * @param mixed $index
+     * @param mixed $newval
+     *
+     * @see ArrayObject::offsetSet()
+     */
+
+    public function offsetSet($index, $newval): void
+    {
+        if (is_numeric($index)) {
+            $index = (int) $index;
+        }
+        parent::offsetSet($index, static::arrayToArrayObject($newval));
+    }
+
+    /**
+     * Unsets the value at the specified index
+     * value is moved to internal deleted collection
+     *
+     * @see ArrayObject::offsetUnset()
+     * @throws InvalidArgumentException
+     */
+    public function offsetUnset($index): void
+    {
+        if ($this->offsetExists($index)) {
+            $this->deleted[] = $this->offsetGet($index);
+        }
+        parent::offsetUnset($index);
+    }
+
+    /**
+     * sets the finder function
+     *
+     * @param callable(): array<T> $finder
+     * @return void
+     */
+    public function setFinder(callable $finder)
+    {
+        $this->finder = $finder;
+    }
+
+    /**
+     * get deleted records collection
+     * @return SimpleCollection<T>
+     */
+    public function getDeleted()
+    {
+        return $this->deleted;
+    }
+
+    /**
+     * reloads the elements of the collection
+     * by calling the finder function
+     *
+     * @return ?int of records after refresh
+     */
+    public function refresh()
+    {
+        if (is_callable($this->finder)) {
+            $data = call_user_func($this->finder);
+            $this->exchangeArray($data);
+            $this->deleted->exchangeArray([]);
+            return $this->last_count = $this->count();
+        }
+    }
+
+    /**
+     * returns a new collection containing all elements
+     * where given columns value matches given value(s) using passed operator
+     * pass array for multiple values
+     *
+     * operators:
+     * == equal, like php
+     * === identical, like php
+     * !=,<> not equal, like php
+     * !== not identical, like php
+     * <,>,<=,>= less,greater,less or equal,greater or equal
+     * >< between without borders, needs two arguments
+     * >=<= between including borders, needs two arguments
+     * %= like string, transliterate to ascii,case insensitive
+     * *= contains string
+     * ^= begins with string
+     * $= ends with string
+     * ~= regex
+     *
+     * @param string $key the column name
+     * @param mixed $values value to search for
+     * @param string|callable $op operator to find
+     * @return SimpleCollection<T> with found records
+     */
+    public function findBy($key, $values, $op = '==')
+    {
+        $comp_func = self::getCompFunc($op, $values);
+        return $this->filter(function ($record) use ($comp_func, $key) {
+            return $comp_func($record[$key]);
+        });
+    }
+
+    /**
+     * returns the first element
+     * where given column has given value(s)
+     * pass array for multiple values
+     *
+     * @param string $key the column name
+     * @param mixed $values value to search for,
+     * @param string|callable $op operator to find
+     * @return ?T found record
+     */
+    public function findOneBy($key, $values, $op = '==')
+    {
+        $comp_func = self::getCompFunc($op, $values);
+        return $this->filter(function ($record) use ($comp_func, $key) {
+            return $comp_func($record[$key]);
+        }, 1)->first();
+    }
+
+    /**
+     * apply given callback to all elements of
+     * collection
+     *
+     * @param callable(T): int $func the function to call
+     * @return int|false addition of return values
+     */
+    public function each(callable $func)
+    {
+        $result = false;
+        foreach ($this->storage as $record) {
+            $result += call_user_func($func, $record);
+        }
+        return $result;
+    }
+
+    /**
+     * apply given callback to all elements of
+     * collection and give back array of return values
+     *
+     * @param callable(T, mixed): mixed $func the function to call
+     * @return array<mixed>
+     */
+    public function map(callable $func)
+    {
+        $results = [];
+        foreach ($this->storage as $key => $value) {
+            $results[$key] = call_user_func($func, $value, $key);
+        }
+        return $results;
+    }
+
+    /**
+     * filter elements
+     * if given callback returns true
+     *
+     * @param ?callable(T, mixed): bool $func the function to call
+     * @param ?integer $limit limit number of found records
+     * @return SimpleCollection<T> containing filtered elements
+     */
+    public function filter(callable $func = null, $limit = null)
+    {
+        $results = [];
+        $found = 0;
+        foreach ($this->storage as $key => $value) {
+            if (call_user_func($func, $value, $key)) {
+                $results[$key] = $value;
+                if ($limit && (++$found == $limit)) {
+                    break;
+                }
+            }
+        }
+        return self::createFromArray($results);
+    }
+
+    /**
+     * Returns whether any element of the collection returns true for the
+     * given callback.
+     *
+     * @param  callable(T, mixed): bool $func the function to call
+     * @return bool
+     */
+    public function any(callable $func)
+    {
+        foreach ($this->storage as $key => $value) {
+            if (call_user_func($func, $value, $key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns whether every element of the collection returns true for the
+     * given callback.
+     *
+     * @param  callable(T, mixed): bool $func the function to call
+     * @return bool
+     */
+    public function every(callable $func)
+    {
+        foreach ($this->storage as $key => $value) {
+            if (!call_user_func($func, $value, $key)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * extract array of columns values
+     * pass array or space-delimited string for multiple columns
+     *
+     * @param string|array $columns the column(s) to extract
+     * @return array of extracted values
+     */
+    public function pluck($columns)
+    {
+        if (!is_array($columns)) {
+            $columns = words($columns);
+        }
+        $func = function ($r) use ($columns) {
+            $result = [];
+            foreach ($columns as $c) {
+                $result[] = $r[$c];
+            }
+            return $result;
+        };
+        $result = $this->map($func);
+        return count($columns) === 1 ? array_map('current', $result) : $result;
+    }
+
+    /**
+     * returns the collection as grouped array
+     * first param is the column to group by, it becomes the key in
+     * the resulting array, default is pk. Limit returned fields with second param
+     * The grouped entries can optoionally go through the given
+     * callback. If no callback is provided, only the first grouped
+     * entry is returned, suitable for grouping by unique column
+     *
+     * @param string $group_by the column to group by, pk if ommitted
+     * @param string|array|null $only_these_fields limit returned fields
+     * @param ?callable $group_func closure to aggregate grouped entries
+     * @return array assoc array
+     */
+    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
+    {
+        $result = [];
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        foreach ($this->toArray() as $record) {
+            $key = $record[$group_by];
+            $ret = [];
+            if (is_array($only_these_fields)) {
+                $result[$key][] = array_intersect_key($record, array_flip($only_these_fields));
+            } else {
+                $result[$key][] = $record;
+            }
+        }
+        if ($group_func === null) {
+            $group_func = 'current';
+        }
+        return array_map($group_func, $result);
+    }
+
+    /**
+     * get the first element
+     *
+     * @return ?T first element or null
+     */
+    public function first()
+    {
+        $keys = array_keys($this->storage);
+        $first_offset = reset($keys);
+        return $this->offsetGet($first_offset ?: 0);
+    }
+
+    /**
+     * get the last element
+     *
+     * @return ?T last element or null
+     */
+    public function last()
+    {
+        $keys = array_keys($this->storage);
+        $last_offset = end($keys);
+        return $this->offsetGet($last_offset ?: 0);
+    }
+
+     /**
+     * get the the value from given key from first element
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function val($key)
+    {
+        $first = $this->first();
+        return $first[$key] ?? null;
+    }
+
+    /**
+     * mark element(s) for deletion
+     * where given column has given value(s)
+     * element(s) are moved to
+     * internal deleted collection
+     * pass array for multiple values
+     *
+     * operators:
+     * == equal, like php
+     * === identical, like php
+     * !=,<> not equal, like php
+     * !== not identical, like php
+     * <,>,<=,>= less,greater,less or equal,greater or equal
+     * >< between without borders, needs two arguments
+     * >=<= between including borders, needs two arguments
+     * %= like string, transliterate to ascii,case insensitive
+     * *= contains string
+     * ^= begins with string
+     * $= ends with string
+     * ~= regex
+     *
+     * @param string $key
+     * @param mixed $values
+     * @param string|callable(mixed, mixed|array): bool $op operator to find elements
+     * @return int|false number of unsetted elements
+     */
+    public function unsetBy($key, $values, $op = '==')
+    {
+        $ret = false;
+        $comp_func = self::getCompFunc($op, $values);
+        foreach ($this->storage as $k => $record) {
+            if ($comp_func($record[$key])) {
+                $this->offsetunset($k);
+                $ret += 1;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * sorts the collection by columns of contained elements and returns it
+     *
+     * works like sql order by:
+     * first param is a string containing combinations of column names
+     * and sort direction, separated by comma e.g.
+     *  'name asc, nummer desc '
+     *  sorts first by name ascending and then by nummer descending
+     *  second param denotes the sort type (using PHP sort constants):
+     *  SORT_LOCALE_STRING:
+     *  compare items as strings, transliterate latin1 to ascii, case insensitiv, natural order for numbers
+     *  SORT_NUMERIC:
+     *  compare items as integers
+     *  SORT_STRING:
+     *  compare items as strings
+     *  SORT_NATURAL:
+     *  compare items as strings using "natural ordering"
+     *  SORT_FLAG_CASE:
+     *  can be combined (bitwise OR) with SORT_STRING or SORT_NATURAL to sort strings case-insensitively
+     *
+     * @param string $order columns to order by
+     * @param integer $sort_flags
+     * @return $this the sorted collection
+     */
+    public function orderBy($order, $sort_flags = SORT_LOCALE_STRING)
+    {
+        //('name asc, nummer desc ')
+        $sort_locale = false;
+        switch ($sort_flags) {
+        case SORT_NATURAL:
+            $sort_func = 'strnatcmp';
+            break;
+        case SORT_NATURAL | SORT_FLAG_CASE:
+            $sort_func = 'strnatcasecmp';
+            break;
+        case SORT_STRING | SORT_FLAG_CASE:
+            $sort_func = 'strcasecmp';
+            break;
+        case SORT_STRING:
+            $sort_func = 'strcmp';
+            break;
+        case SORT_NUMERIC:
+            $sort_func = function ($a, $b) {
+                return (int) $a - (int) $b;
+            };
+            break;
+        case SORT_LOCALE_STRING:
+        default:
+            $sort_func = 'strnatcasecmp';
+            $sort_locale = true;
+        }
+
+        $sorter = [];
+        foreach (explode(',', $order) as $one) {
+            $sorter[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
+        }
+
+        $func = function ($d1, $d2) use ($sorter, $sort_func, $sort_locale) {
+            do {
+                $current_sorter = current($sorter);
+                $field = $current_sorter[0];
+                $dir = $current_sorter[1] ?? '';
+                if (!$sort_locale) {
+                    $value1 = $d1[$field];
+                    $value2 = $d2[$field];
+                } else {
+                    $value1 = static::translitLatin1(mb_substr($d1[$field], 0, 100));
+                    $value2 = static::translitLatin1(mb_substr($d2[$field], 0, 100));
+                }
+                $ret = $sort_func($value1, $value2);
+                if (strtolower($dir) == 'desc') $ret = $ret * -1;
+            } while ($ret === 0 && next($sorter));
+
+            return $ret;
+        };
+        if (count($sorter)) {
+            $this->uasort($func);
+        }
+        return $this;
+    }
+
+    /**
+     * returns a new collection contaning a sequence of original collection
+     * mimics the sql limit constrain:
+     * used with one parameter, the first x elements are extracted
+     * used with two parameters, the first parameter denotes the offset, the second the
+     * number of elements
+     *
+     * @param integer $arg1
+     * @param ?integer $arg2
+     * @return SimpleCollection<T>
+     */
+    public function limit($arg1, $arg2 = null)
+    {
+        if (is_null($arg2)) {
+            if ($arg1 > 0) {
+                $row_count = $arg1;
+                $offset = 0;
+            } else {
+                $row_count = abs($arg1);
+                $offset = $arg1;
+            }
+        } else {
+            $offset = $arg1;
+            $row_count = $arg2;
+        }
+        return self::createFromArray(array_slice($this->storage, $offset, $row_count, true));
+    }
+
+     /**
+     * calls the given method on all elements
+     * of the collection
+     * @param literal-string $method methodname to call
+     * @param array $params parameters for methodcall
+     * @return array of all return values
+     */
+    public function sendMessage($method, $params = []) {
+        $results = [];
+        foreach ($this->storage as $record) {
+            $results[] = call_user_func_array([$record, $method], $params);
+        }
+        return $results;
+    }
+
+    /**
+     * magic version of sendMessage
+     * calls undefineds methods on all elements of the collection
+     * But beware of the dark side...
+     *
+     * @param literal-string $method methodname to call
+     * @param array $params parameters for methodcall
+     * @return array of all return values
+     */
+    public function __call($method, $params)
+    {
+        return $this->sendMessage($method, $params);
+    }
+
+    /**
+     * merge in another collection, elements are appended
+     *
+     * @param SimpleCollection<T> $a_collection
+     * @return void
+     */
+    public function merge(SimpleCollection $a_collection)
+    {
+        $this->storage = array_merge($this->storage, $a_collection->getArrayCopy());
+    }
+}
diff --git a/lib/classes/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
new file mode 100644
index 0000000..f86ec6f
--- /dev/null
+++ b/lib/classes/SimpleORMap.class.php
@@ -0,0 +1,2476 @@
+<?php
+/**
+ * SimpleORMap.class.php
+ * simple object-relational mapping
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
+{
+    /**
+     * Defines `_` as character used when joining composite primary keys.
+     */
+    const ID_SEPARATOR = '_';
+
+    /**
+     * table row data
+     * @var array $content
+     */
+    protected $content = [];
+
+    /**
+     * table row data
+     * @var array $content_db
+     */
+    protected $content_db = [];
+
+    /**
+     * new state of entry
+     * @var boolean $is_new
+     */
+    protected $is_new = true;
+
+    /**
+     * deleted state of entry
+     * @var boolean $is_deleted
+     */
+    protected $is_deleted = false;
+
+     /**
+     * db table metadata
+     * @var ?array $schemes;
+     */
+    public static $schemes = null;
+
+    /**
+     * configuration data for subclasses
+     * @see self::configure()
+     * @var array $config;
+     */
+    protected static $config = [];
+
+    /**
+     * stores instantiated related objects
+     * @var array $relations
+     */
+    protected $relations = [];
+
+    /**
+     * assoc array for storing values for additional fields
+     *
+     * @var array $additional_data
+     */
+    protected $additional_data = [];
+
+    /**
+     * reserved indentifiers, fields with those names must not have an explicit getXXX() method
+     * @var array $reserved_slots
+     */
+    protected static $reserved_slots = ['value','newid','iterator','tablemetadata', 'relationvalue','wherequery','relationoptions','data','new','id'];
+
+    /**
+     * indicator for batch operations in findEachBySQL
+     *
+     * @var bool $performs_batch_operation
+     */
+    protected static $performs_batch_operation = false;
+
+    /**
+     * name of db table
+     * @return string
+     */
+    protected static function db_table()
+    {
+        return static::config('db_table');
+    }
+
+    /**
+     * table columns
+     * @return array
+     */
+    protected static function db_fields()
+    {
+        return static::config('db_fields');
+    }
+
+    /**
+     * primary key columns
+     * @return array
+     */
+    protected static function pk()
+    {
+        return static::config('pk');
+    }
+
+    /**
+     * default values for columns
+     * @return array
+     */
+    protected static function default_values()
+    {
+        return static::config('default_values');
+    }
+
+    /**
+     * list of columns to deserialize
+     * @return array key is name of column, value is name of ArrayObject class
+     */
+    protected static function serialized_fields()
+    {
+        return static::config('serialized_fields');
+    }
+
+    /**
+     * aliases for columns
+     * alias => column
+     * @return array
+     */
+    protected static function alias_fields()
+    {
+        return static::config('alias_fields');
+    }
+
+    /**
+     * multi-language fields
+     * name => boolean
+     * @return array
+     */
+    protected static function i18n_fields()
+    {
+        return static::config('i18n_fields');
+    }
+
+    /**
+     * additional computed fields
+     * name => callable
+     * @return array
+     */
+    protected static function additional_fields()
+    {
+        return static::config('additional_fields');
+    }
+
+    /**
+     * 1:n relation
+     * @return array
+     */
+    protected static function has_many()
+    {
+        return static::config('has_many');
+    }
+
+    /**
+     * 1:1 relation
+     * @return array
+     */
+    protected static function has_one()
+    {
+        return static::config('has_one');
+    }
+
+    /**
+     * n:1 relations
+     * @return array
+     */
+    protected static function belongs_to()
+    {
+        return static::config('belongs_to');
+    }
+
+    /**
+     * n:m relations
+     * @return array
+     */
+    protected static function has_and_belongs_to_many()
+    {
+        return static::config('has_and_belongs_to_many');
+    }
+
+    /**
+     * callbacks
+     * @return array<string, array<string|Closure>>
+     */
+    protected static function registered_callbacks()
+    {
+        return static::config('registered_callbacks');
+    }
+
+    /**
+     * contains an array of all used identifiers for fields
+     * (db columns + aliased columns + additional columns + relations)
+     * @return array
+     */
+    protected static function known_slots()
+    {
+        return static::config('known_slots');
+    }
+
+    /**
+     * assoc array used to map SORM callback to NotificationCenter
+     * keys are SORM callbacks, values notifications
+     * eg. 'after_create' => 'FooDidCreate'
+     *
+     * @return array
+     */
+    protected static function notification_map()
+    {
+        return static::config('notification_map');
+    }
+
+    /**
+     * assoc array for mapping get/set Methods
+     *
+     * @return array
+     */
+    protected static function getter_setter_map()
+    {
+        return static::config('getter_setter_map');
+    }
+
+    //////////////////////////////////////////////////
+
+    /**
+     * set configuration data from subclass
+     *
+     * @param ?array $config configuration data
+     * @return void
+     */
+    protected static function configure($config = [])
+    {
+        $class = static::class;
+
+        if (empty($config['db_table'])) {
+            $config['db_table'] = strtolower($class);
+        }
+
+        if (!isset($config['db_fields'])) {
+            if (static::tableScheme($config['db_table'])) {
+                $config['db_fields'] = self::$schemes[$config['db_table']]['db_fields'];
+                $config['pk'] = self::$schemes[$config['db_table']]['pk'];
+            }
+        }
+
+        if (isset($config['pk'])
+            && !isset($config['db_fields']['id'])
+            && !isset($config['alias_fields']['id'])
+            && !isset($config['additional_fields']['id'])
+        ) {
+            if (count($config['pk']) === 1) {
+                $config['alias_fields']['id'] = $config['pk'][0];
+            } else {
+                $config['additional_fields']['id'] = ['get' => '_getId',
+                                                           'set' => '_setId'];
+            }
+        }
+        if (isset($config['additional_fields'])) {
+            foreach ($config['additional_fields'] as $a_field => $a_config) {
+                if (is_array($a_config) && !(isset($a_config['get']) || isset($a_config['set']))) {
+                    $relation = $a_config[0] ?? '';
+                    $relation_field = $a_config[1] ?? '';
+                    if (!$relation) {
+                        list($relation, $relation_field) = explode('_', $a_field);
+                    }
+                    if (!$relation_field || !$relation) {
+                        throw new UnexpectedValueException('no relation found for autoget/set additional field: ' . $a_field);
+                    }
+                    $config['additional_fields'][$a_field] = ['get'            => '_getAdditionalValueFromRelation',
+                                                                   'set'            => '_setAdditionalValue',
+                                                                   'relation'       => $relation,
+                                                                   'relation_field' => $relation_field];
+                }
+            }
+        }
+        if (isset($config['serialized_fields'])) {
+            foreach ($config['serialized_fields'] as $a_field => $object_type) {
+                if (!(is_subclass_of($object_type, 'StudipArrayObject'))) {
+                    throw new UnexpectedValueException(sprintf('serialized field %s must use subclass of StudipArrayObject', $a_field));
+                }
+            }
+        }
+
+        foreach (['default_values', 'serialized_fields', 'alias_fields', 'i18n_fields', 'additional_fields'] as $fields) {
+            if (!isset($config[$fields])) {
+                $config[$fields] = [];
+            }
+        }
+
+        foreach (['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            if (isset($config[$type]) && is_array($config[$type])) {
+                foreach (array_keys($config[$type]) as $one) {
+                    $config['relations'][$one] = null;
+                }
+            } else {
+                $config[$type] = [];
+            }
+        }
+
+        $callbacks = ['before_create',
+                      'before_update',
+                      'before_store',
+                      'before_delete',
+                      'before_initialize',
+                      'after_create',
+                      'after_update',
+                      'after_store',
+                      'after_delete',
+                      'after_initialize'];
+
+        foreach ($callbacks as $callback) {
+            if (!isset($config['registered_callbacks'][$callback])) {
+                $config['registered_callbacks'][$callback] = [];
+            }
+        }
+
+        $auto_notification_map['after_create'] = $class . 'DidCreate';
+        $auto_notification_map['after_store'] = $class . 'DidStore';
+        $auto_notification_map['after_delete'] = $class . 'DidDelete';
+        $auto_notification_map['after_update'] = $class . 'DidUpdate';
+        $auto_notification_map['before_create'] = $class . 'WillCreate';
+        $auto_notification_map['before_store'] = $class . 'WillStore';
+        $auto_notification_map['before_delete'] = $class . 'WillDelete';
+        $auto_notification_map['before_update'] = $class . 'WillUpdate';
+
+        foreach ($auto_notification_map as $cb => $notification) {
+            if (isset($config['notification_map'][$cb])) {
+                if (strpos($config['notification_map'][$cb], $notification) !== false) {
+                    $config['notification_map'][$cb] .= ' ' . $notification;
+                }
+            } else {
+                $config['notification_map'][$cb] = $notification;
+            }
+        }
+
+        if (is_array($config['notification_map'])) {
+            foreach (array_keys($config['notification_map']) as $cb) {
+                $config['registered_callbacks'][$cb][] = 'cbNotificationMapper';
+            }
+        }
+
+        if (!I18N::isEnabled() || empty($config['i18n_fields'])) {
+            $config['i18n_fields'] = [];
+        } elseif (is_string($config['i18n_fields'])) {
+            $i18n_fields = words($config['i18n_fields']);
+            $config['i18n_fields'] = array_combine(
+                $i18n_fields,
+                array_fill(0, count($i18n_fields), true)
+            );
+        } elseif (array_is_list($config['i18n_fields'])) {
+            $config['i18n_fields'] = array_combine(
+                $config['i18n_fields'],
+                array_fill(0, count($config['i18n_fields']), true)
+            );
+        }
+
+        array_unshift($config['registered_callbacks']['after_initialize'], 'cbAfterInitialize');
+
+        $config['known_slots'] = array_merge(
+            array_keys($config['db_fields']),
+            array_keys($config['alias_fields'] ?? []),
+            array_keys($config['additional_fields'] ?? []),
+            array_keys($config['relations'] ?? [])
+        );
+
+        foreach (array_map('strtolower', get_class_methods($class)) as $method) {
+            if (in_array(substr($method, 0, 3), ['get', 'set'])) {
+                $verb = substr($method, 0, 3);
+                $name = substr($method, 3);
+                if (in_array($name, $config['known_slots']) && !in_array($name, static::$reserved_slots) && !isset($config['additional_fields'][$name][$verb])) {
+                    $config['getter_setter_map'][$name][$verb] = $method;
+                }
+            }
+        }
+        self::$config[$class] = $config;
+    }
+
+    /**
+     * fetch config data for the called class
+     *
+     * @param string $key config key
+     * @return mixed value of config key (null if not set)
+     */
+    protected static function config($key)
+    {
+        if (!array_key_exists(static::class, self::$config)) {
+            static::configure();
+        }
+
+        return self::$config[static::class][$key] ?? null;
+    }
+
+    /**
+     * fetch table metadata from db or from local cache
+     *
+     * @param string $db_table
+     * @return bool true if metadata could be fetched
+     */
+    public static function tableScheme($db_table)
+    {
+        if (self::$schemes === null) {
+            $cache = StudipCacheFactory::getCache();
+            self::$schemes = unserialize($cache->read('DB_TABLE_SCHEMES'));
+        }
+        if (!isset(self::$schemes[$db_table])) {
+            $db = DBManager::get()->query("SHOW COLUMNS FROM $db_table");
+            while($rs = $db->fetch(PDO::FETCH_ASSOC)){
+                $db_fields[strtolower($rs['Field'])] = [
+                    'name' => $rs['Field'],
+                    'null' => $rs['Null'],
+                    'default' => $rs['Default'],
+                    'type' => $rs['Type'],
+                    'extra' => $rs['Extra']
+                ];
+                if ($rs['Key'] == 'PRI'){
+                    $pk[] = strtolower($rs['Field']);
+                }
+            }
+            self::$schemes[$db_table]['db_fields'] = $db_fields;
+            self::$schemes[$db_table]['pk'] = $pk;
+            $cache = StudipCacheFactory::getCache();
+            $cache->write('DB_TABLE_SCHEMES', serialize(self::$schemes));
+        }
+        return isset(self::$schemes[$db_table]);
+    }
+
+    /**
+     * force reload of cached table metadata
+     * @return void
+     */
+    public static function expireTableScheme()
+    {
+        StudipCacheFactory::getCache()->expire('DB_TABLE_SCHEMES');
+        self::$schemes = null;
+        self::$config = [];
+    }
+
+    /**
+     * Returns new instance for given key when found in the database, else null.
+     *
+     * @param string $id primary key
+     * @return static|null
+     */
+    public static function find($id)
+    {
+        $ref = new ReflectionClass(static::class);
+        /** @var static $record */
+        $record = $ref->newInstanceArgs(func_get_args());
+        if (!$record->isNew()) {
+            return $record;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns true if given key exists in the database.
+     *
+     * @param string|array $id primary key
+     * @return boolean
+     */
+    public static function exists($id)
+    {
+        $ret = false;
+        $db_table = static::db_table();
+        $record = new static();
+        $record->setId(...func_get_args());
+        $where_query = $record->getWhereQuery();
+        if ($where_query) {
+            $query = "SELECT 1 FROM `$db_table` WHERE "
+                    . join(" AND ", $where_query);
+            $ret = (bool)DBManager::get()->query($query)->fetchColumn();
+        }
+        return $ret;
+    }
+
+    /**
+     * returns number of records
+     *
+     * @param ?string $sql sql clause to use on the right side of WHERE
+     * @param ?array $params params for query
+     * @return int
+     */
+    public static function countBySql($sql = '1', $params = [])
+    {
+        $db_table = static::db_table();
+        $db = DBManager::get();
+        $has_join = stripos($sql, 'JOIN ');
+        if ($has_join === false || $has_join > 10) {
+            $sql = 'WHERE ' . $sql;
+        }
+        $sql = "SELECT count(*) FROM `" .  $db_table . "` " . $sql;
+        $st = $db->prepare($sql);
+        $st->execute($params);
+        return (int)$st->fetchColumn();
+    }
+
+    /**
+     * creates new record with given data in db
+     * returns the new object or null
+     * @param array $data assoc array of record
+     * @return ?static
+     */
+    public static function create($data)
+    {
+        $record = new static();
+        $record->setData($data, false);
+        if ($record->store()) {
+            return $record;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * build object with given data
+     *
+     * @param array $data assoc array of record
+     * @param ?bool $is_new set object to new state
+     * @return static
+     */
+    public static function build($data, $is_new = true)
+    {
+        $record = new static();
+        $record->setData($data, !$is_new);
+        $record->setNew($is_new);
+        return $record;
+    }
+
+    /**
+     * build object with given data and mark it as existing
+     *
+     * @param array $data assoc array of record
+     * @return static
+     */
+    public static function buildExisting($data)
+    {
+        return static::build($data, false);
+    }
+
+    /**
+     * generate SimpleORMap object structure from assoc array
+     * if given array contains data of related objects in sub-arrays
+     * they are also generated. Existing records are updated, new records are created
+     * (but changes are not yet stored)
+     *
+     * @param array $data
+     * @return static
+     */
+    public static function import($data)
+    {
+        $record_data = [];
+        $relation_data = [];
+        foreach ($data as $key => $value) {
+            $temp = static::alias_fields()[$key] ?? $key;
+            if (isset(static::db_fields()[$temp])) {
+                $record_data[$key] = $value;
+            } else {
+                $relation_data[$key] = $value;
+            }
+        }
+        $record = static::toObject($record_data);
+        if (!$record instanceof static) {
+            $record = new static();
+            $record->setData($record_data, true);
+        } else {
+            $record->setData($record_data);
+        }
+        foreach ($relation_data as $relation => $data) {
+            if (!$record->isRelation($relation)) {
+                continue;
+            }
+
+            $options = $record->getRelationOptions($relation);
+            if ($options['type'] == 'has_one') {
+                $record->{$relation} = call_user_func([$options['class_name'], 'import'], $data);
+            }
+            if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
+                foreach ($data as $one) {
+                    $current = call_user_func([$options['class_name'], 'import'], $one);
+                    if ($options['type'] == 'has_many') {
+                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $record);
+                        call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
+                    }
+                    if ($current->id !== null) {
+                        $existing = $record->{$relation}->find($current->id);
+                        if ($existing) {
+                            $existing->setData($current);
+                        } else {
+                            $record->{$relation}->append($current);
+                        }
+                    } else {
+                        $record->{$relation}->append($current);
+                    }
+                }
+            }
+        }
+        return $record;
+    }
+
+    /**
+     * returns array of instances of given class filtered by given sql
+     * @param string $sql sql clause to use on the right side of WHERE
+     * @param ?array $params parameters for query
+     * @return static[] array of "self" objects
+     */
+    public static function findBySQL($sql, $params = [])
+    {
+        $db_table = static::db_table();
+
+        $has_join = stripos($sql, 'JOIN ');
+        if ($has_join === false || $has_join > 10) {
+            $sql = 'WHERE ' . $sql;
+        }
+        $sql = "SELECT `" . $db_table . "`.* FROM `" . $db_table . "` " . $sql;
+        $stmt = DBManager::get()->prepare($sql);
+        $stmt->execute($params);
+
+        $record = static::build([], false);
+
+        $ret = [];
+        do  {
+            $clone = clone $record;
+            $clone->setNew(false);
+            $stmt->setFetchMode(PDO::FETCH_INTO, $clone);
+
+            if ($clone = $stmt->fetch()) {
+                $clone->applyCallbacks('after_initialize');
+                $ret[] = $clone;
+            }
+        } while ($clone);
+        return $ret;
+    }
+
+    /**
+     * returns one instance of given class filtered by given sql
+     * only first row of query is used
+     * @param string $where sql clause to use on the right side of WHERE
+     * @param ?array $params parameters for query
+     * @return ?static
+     */
+    public static function findOneBySQL($where, $params = [])
+    {
+        if (stripos($where, 'LIMIT') === false) {
+            $where .= " LIMIT 1";
+        }
+        $found = static::findBySQL($where, $params);
+        return isset($found[0]) ? $found[0] : null;
+    }
+
+    /**
+     * find related records for a n:m relation (has_many_and_belongs_to_many)
+     * using a combination table holding the keys
+     *
+     * @param string $foreign_key_value value of foreign key to find related records
+     * @param array $options relation options from other side of relation
+     * @return static[] array of "self" objects
+     */
+    public static function findThru($foreign_key_value, $options)
+    {
+        $thru_table = $options['thru_table'];
+        $thru_key = $options['thru_key'];
+        $thru_assoc_key = $options['thru_assoc_key'];
+        $assoc_foreign_key = $options['assoc_foreign_key'];
+
+        $db_table = static::db_table();
+
+        $sql = "SELECT `$db_table`.* FROM `$thru_table`
+        INNER JOIN `$db_table` ON `$thru_table`.`$thru_assoc_key` = `$db_table`.`$assoc_foreign_key`
+        WHERE `$thru_table`.`$thru_key` = ? " . ($options['order_by'] ?? '');
+        $st = DBManager::get()->prepare($sql);
+        $st->execute([$foreign_key_value]);
+
+        $record = static::build([], false);
+
+        $ret = [];
+        do {
+            $clone = clone $record;
+            $clone->setNew(false);
+            $st->setFetchMode(PDO::FETCH_INTO, $clone);
+
+            if ($clone = $st->fetch()) {
+                $clone->applyCallbacks('after_initialize');
+                $ret[] = $clone;
+            }
+        } while ($clone);
+        return $ret;
+    }
+
+    /**
+     * passes objects for given sql through given callback
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param string $sql where clause of sql
+     * @param ?array $params sql statement parameters
+     * @return integer number of found records
+     */
+    public static function findEachBySQL($callable, $sql, $params = [])
+    {
+        $has_join = stripos($sql, 'JOIN ');
+        if ($has_join === false || $has_join > 10) {
+            $sql = "WHERE {$sql}";
+        }
+
+        $db_table = static::db_table();
+        $st = DBManager::get()->prepare("SELECT `{$db_table}`.* FROM `{$db_table}` {$sql}");
+        $st->execute($params);
+
+        // Indicate that we are performing a batch operation
+        static::$performs_batch_operation = true;
+
+        $record = static::build([], false);
+
+        $ret = 0;
+        do {
+            $clone = clone $record;
+            $clone->setNew(false);
+            $st->setFetchMode(PDO::FETCH_INTO, $clone);
+
+            if ($clone = $st->fetch()) {
+                $clone->applyCallbacks('after_initialize');
+                $callable($clone, $ret++);
+            }
+        } while ($clone);
+
+        // Reset batch operation indicator
+        static::$performs_batch_operation = false;
+
+        return $ret;
+    }
+
+    /**
+     * returns array of instances of given class for by given pks
+     * @param ?array $pks array of primary keys
+     * @param ?string $order order by clause
+     * @param ?array $order_params
+     * @return static[]
+     */
+    public static function findMany($pks = [], $order = '', $order_params = [])
+    {
+        $db_table = static::db_table();
+        $pk = static::pk();
+        $db = DBManager::get();
+        if (count($pk) > 1) {
+            throw new Exception('not implemented yet');
+        }
+        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
+        return static::findBySQL($where . $order, $order_params);
+    }
+
+    /**
+     * passes objects for by given pks through given callback
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param ?array $pks array of primary keys of called class
+     * @param ?string $order order by sql
+     * @param ?array $order_params
+     * @return integer number of found records
+     */
+    public static function findEachMany($callable, $pks = [], $order = '', $order_params = [])
+    {
+        $db_table = static::db_table();
+        $pk = static::pk();
+        $db = DBManager::get();
+        if (count($pk) > 1) {
+            throw new Exception('not implemented yet');
+        }
+        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
+        return static::findEachBySQL($callable, $where . $order, $order_params);
+    }
+
+    /**
+     * passes objects for given sql through given callback
+     * and returns an array of callback return values
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param string $where where clause of sql
+     * @param array $params sql statement parameters
+     * @return array return values of callback
+     */
+    public static function findAndMapBySQL($callable, $where, $params = [])
+    {
+        $ret = [];
+        $calleach = function($m) use (&$ret, $callable) {
+            $ret[] = $callable($m);
+        };
+        static::findEachBySQL($calleach, $where, $params);
+        return $ret;
+    }
+
+    /**
+     * passes objects for by given pks through given callback
+     * and returns an array of callback return values
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param ?array $pks array of primary keys of called class
+     * @param ?string $order order by sql
+     * @param ?array $order_params
+     * @return array return values of callback
+     */
+    public static function findAndMapMany($callable, $pks = [], $order = '', $order_params = [])
+    {
+        $ret = [];
+        $calleach = function($m) use (&$ret, $callable) {
+            $ret[] = $callable($m);
+        };
+        $db_table = static::db_table();
+        $pk = static::pk();
+        $db = DBManager::get();
+        if (count($pk) > 1) {
+            throw new Exception('not implemented yet');
+        }
+        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
+        static::findEachBySQL($calleach, $where . $order, $order_params);
+        return $ret;
+    }
+
+    /**
+     * deletes objects specified by sql clause
+     * @param string $where sql clause to use on the right side of WHERE
+     * @param ?array $params parameters for query
+     * @return integer number of deleted records
+     */
+    public static function deleteBySQL($where, $params = [])
+    {
+        $killeach = function($record) {$record->delete();};
+        return static::findEachBySQL($killeach, $where, $params);
+    }
+
+    /**
+     * returns object of given class for given id or null
+     * the param could be a string, an assoc array containing primary key field
+     * or an already matching object. In all these cases an object is returned
+     *
+     * @param string|static|array $id_or_object id as string, object or assoc array
+     * @return static
+     */
+    public static function toObject($id_or_object)
+    {
+        if ($id_or_object instanceof static) {
+            return $id_or_object;
+        }
+        if (is_array($id_or_object)) {
+            $pk = static::pk();
+            $key_values = [];
+            foreach ($pk as $key) {
+                if (array_key_exists($key, $id_or_object)) {
+                    $key_values[] = $id_or_object[$key];
+                }
+            }
+            if (count($pk) === count($key_values)) {
+                if (count($pk) === 1) {
+                    $id = $key_values[0];
+                } else {
+                    $id = $key_values;
+                }
+            } else {
+                $id = null;
+            }
+        } else {
+            $id = $id_or_object;
+        }
+        return static::find($id);
+    }
+
+    /**
+     * interceptor for static findByColumn / findEachByColumn / countByColumn /
+     * deleteByColumn magic
+     *
+     * @param string $name
+     * @param array $arguments
+     * @throws BadMethodCallException
+     * @return int|static|static[]
+     */
+    public static function __callStatic(string $name, array $arguments)
+    {
+        $db_table = static::db_table();
+        $alias_fields = static::alias_fields();
+        $db_fields = static::db_fields();
+        $name = strtolower($name);
+        $order = '';
+        $param_arr = [];
+        $where = '';
+        $where_param = is_array($arguments[0]) ? $arguments[0] : [$arguments[0]];
+        $action = strstr($name, 'by', true);
+        $field = substr($name, strlen($action) + 2);
+        switch ($action) {
+            case 'findone':
+                $order = $arguments[1] ?? '';
+                $param_arr[0] =& $where;
+                $param_arr[1] = [$where_param];
+                $method = 'findonebysql';
+                break;
+            case 'find':
+            case 'findmany':
+                $order = $arguments[1] ?? '';
+                $param_arr[0] =& $where;
+                $param_arr[1] = [$where_param];
+                $method = 'findbysql';
+                break;
+            case 'findeach':
+            case 'findeachmany':
+                $order = $arguments[2] ?? '';
+                $param_arr[0] = $arguments[0];
+                $param_arr[1] =& $where;
+                $param_arr[2] = [$arguments[1]];
+                $method = 'findeachbysql';
+                break;
+            case 'count':
+            case 'delete':
+                $param_arr[0] =& $where;
+                $param_arr[1] = [$where_param];
+                $method = "{$action}bysql";
+                break;
+            default:
+                throw new BadMethodCallException("Method " . static::class . "::$name not found");
+        }
+        if (isset($alias_fields[$field])) {
+            $field = $alias_fields[$field];
+        }
+        if (isset($db_fields[$field])) {
+            $where = "`$db_table`.`$field` IN(?) " . $order;
+            return call_user_func_array([static::class, $method], $param_arr);
+        }
+        throw new BadMethodCallException("Method " . static::class . "::$name not found");
+    }
+
+    /**
+     * constructor, give primary key of record as param to fetch
+     * corresponding record from db if available, if not preset primary key
+     * with given value. Give null to create new record
+     *
+     * @param null|int|string|array $id primary key of table
+     */
+    function __construct($id = null)
+    {
+        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            foreach (array_keys($this->$type()) as $one) {
+                $this->relations[$one] = null;
+            }
+        }
+
+        if ($id) {
+            $this->setId($id);
+        }
+        $this->restore();
+    }
+
+    /**
+     * returns internal used id value (multiple keys concatenated with _)
+     * @param mixed $field unused parameter
+     * @return ?string
+     */
+    protected function _getId($field)
+    {
+        return is_null($this->getId())
+             ? null
+             : implode(self::ID_SEPARATOR, $this->getId());
+    }
+
+    /**
+     * sets internal used id value (multiple keys concatenated with _)
+     * @param string $field Field to set (unused since it's always the id)
+     * @param string $value Value for id field
+     * @return bool
+     */
+    protected function _setId($field, $value)
+    {
+        return $this->setId(explode(self::ID_SEPARATOR, $value));
+    }
+
+    /**
+     * retrieves an additional field value from relation
+     *
+     * @param string $field
+     * @return mixed
+     */
+    protected function _getAdditionalValueFromRelation($field)
+    {
+        list($relation, $relation_field) = [$this->additional_fields()[$field]['relation'],
+                                                $this->additional_fields()[$field]['relation_field']];
+        if (!array_key_exists($field, $this->additional_data)) {
+            $this->_setAdditionalValue($field, $this->getRelationValue($relation, $relation_field));
+        }
+        return $this->additional_data[$field];
+    }
+
+    /**
+     * sets additional value in field imported from relation
+     *
+     * @param string $field
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function _setAdditionalValueFromRelation($field, $value)
+    {
+        list($relation, $relation_field) = [$this->additional_fields()[$field]['relation'],
+                $this->additional_fields()[$field]['relation_field']];
+        $this->$relation->$field = $value;
+        unset($this->additional_data[$field]);
+        return $this->_getAdditionalValueFromRelation($field);
+    }
+
+    /**
+     * @param string $field
+     * @return mixed
+     */
+    protected function _getAdditionalValue($field)
+    {
+        return $this->additional_data[$field];
+    }
+
+    /**
+     * @param string $field
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function _setAdditionalValue($field, $value)
+    {
+        return $this->additional_data[$field] = $value;
+    }
+
+    /**
+     * clean up references after cloning
+     * @return void
+     */
+    function __clone()
+    {
+        $this->setNew(true);
+        //all references link still to old object => reset all aliases
+        foreach ($this->alias_fields() as $alias => $field) {
+            if (isset($this->db_fields()[$field])) {
+                $content_value = $this->content[$field];
+                $content_db_value = $this->content_db[$field];
+                unset($this->content[$alias]);
+                unset($this->content_db[$alias]);
+                unset($this->content[$field]);
+                unset($this->content_db[$field]);
+                if (is_object($content_value)) {
+                    $this->content[$field] = clone $content_value;
+                } else {
+                    $this->content[$field] = $content_value;
+                }
+                if (is_object($content_db_value)) {
+                    $this->content_db[$field] = clone $content_db_value;
+                } else {
+                    $this->content_db[$field] = $content_db_value;
+                }
+            }
+        }
+        foreach ($this->alias_fields() as $alias => $field) {
+            if (isset($this->db_fields()[$field])) {
+                $this->content[$alias] =& $this->content[$field];
+                $this->content_db[$alias] =& $this->content_db[$field];
+            }
+        }
+        //unset all relations for now
+        //TODO: maybe a deep copy of all belonging objects is more appropriate
+        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            foreach (array_keys($this->$type()) as $one) {
+                $this->relations[$one] = null;
+            }
+        }
+        //begun the clone war has... hmpf
+    }
+
+    /**
+     * try to determine all needed options for a relationship from
+     * configured options
+     *
+     * @param string $type
+     * @param string $name
+     * @param array $options
+     * @throws Exception if options for thru_table could not be determined
+     * @return array
+     */
+    protected function parseRelationOptions($type, $name, $options)
+    {
+        if (empty($options['class_name'])) {
+            throw new Exception('Option class_name not set for relation ' . $name);
+        }
+        if (empty($options['assoc_foreign_key'])) {
+            if ($type === 'has_many' || $type === 'has_one') {
+                $options['assoc_foreign_key'] = $this->pk()[0];
+            } else if ($type === 'belongs_to') {
+                $options['assoc_foreign_key'] = 'id';
+            }
+        }
+        if ($type === 'has_and_belongs_to_many') {
+            $thru_table = $options['thru_table'];
+            if (empty($options['thru_key'])) {
+                $options['thru_key'] = $this->pk()[0];
+            }
+            if (empty($options['thru_assoc_key']) || empty($options['assoc_foreign_key'])) {
+                $class = $options['class_name'];
+                $record = new $class();
+                $meta = $record->getTableMetadata();
+                if (empty($options['thru_assoc_key'])) {
+                    $options['thru_assoc_key'] = $meta['pk'][0];
+                }
+                if (empty($options['assoc_foreign_key'])) {
+                    $options['assoc_foreign_key']= $meta['pk'][0];
+                }
+            }
+            static::tableScheme($thru_table);
+            if (is_array(self::$schemes[$thru_table])) {
+                $thru_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_key']]);
+                $thru_assoc_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_assoc_key']]);
+            }
+            if (!$thru_assoc_key_ok || !$thru_key_ok) {
+                throw new Exception("Could not determine keys for relation " . $name . " through table " . $thru_table);
+            }
+            if ($options['assoc_foreign_key'] instanceof Closure) {
+                throw new Exception("For relation " . $name . " assoc_foreign_key must be a name of a column");
+            }
+        }
+        if (empty($options['assoc_func'])) {
+            if ($type !== 'has_and_belongs_to_many') {
+                $options['assoc_func'] = $options['assoc_foreign_key'] === 'id' ? 'find' : 'findBy' . $options['assoc_foreign_key'];
+            } else {
+                $options['assoc_func'] = 'findThru';
+            }
+        }
+        if (empty($options['foreign_key'])) {
+            $options['foreign_key'] = 'id';
+        }
+        if (isset($options['foreign_key']) && $options['foreign_key'] instanceof Closure) {
+            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return call_user_func($options['foreign_key'], $record, $name, $options);};
+        } else {
+            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return $options['foreign_key'] === 'id' ? $record->getId() : $record->getValue($options['foreign_key']);};
+        }
+        if (isset($options['assoc_foreign_key']) && $options['assoc_foreign_key'] instanceof Closure) {
+            if ($type === 'belongs_to') {
+                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $name, $options, $that);};
+            } else {
+                $options['assoc_foreign_key_setter'] = function($record, $params) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $params, $name, $options);};
+            }
+        } elseif (!empty($options['assoc_foreign_key'])) {
+            if ($type === 'belongs_to') {
+                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return $record->getValue($options['assoc_foreign_key']);};
+            } else {
+                $options['assoc_foreign_key_setter'] = function($record, $value) use ($name, $options) { return $record->setValue($options['assoc_foreign_key'], $value);};
+            }
+        } else {
+            throw new Exception("Could not determine assoc_foreign_key for relation " . $name);
+        }
+        return $options;
+    }
+
+    /**
+     * returns array with option for given relation
+     * available options:
+     * 'type':                   relation type, on of 'has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'
+     * 'class_name':             name of class for related records
+     * 'foreign_key':            name of column with foreign key
+     *                           or callback to retrieve foreign key value
+     * 'assoc_foreign_key':      name of foreign key column in related class
+     * 'assoc_func':             name of static method to call on related class to find related records
+     * 'assoc_func_params_func': callback to retrieve params for assoc_func
+     * 'thru_table':             name of relation table for n:m relation
+     * 'thru_key':               name of column holding foreign key in relation table
+     * 'thru_assoc_key':         name of column holding foreign key from related class in relation table
+     * 'on_delete':              contains simply 'delete' to indicate that related records should be deleted
+     *                           or callback to invoke before record gets deleted
+     * 'on_store':               contains simply 'store' to indicate that related records should be stored
+     *                           or callback to invoke after record gets stored
+     *
+     * @param string $relation name of relation
+     * @return array assoc array containing options
+     */
+    function getRelationOptions($relation)
+    {
+        $options = [];
+        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            if (isset($this->$type()[$relation])) {
+                $options = self::$config[get_class($this)][$type][$relation];
+                if (!isset($options['type'])) {
+                    $options = $this->parseRelationOptions($type, $relation, $options, $this->db_table());
+                    $options['type'] = $type;
+                    self::$config[get_class($this)][$type][$relation] = $options;
+                }
+                break;
+            }
+        }
+        return $options;
+    }
+
+    /**
+     * returns table and columns metadata
+     *
+     * @return array assoc array with columns, primary keys and name of table
+     */
+    function getTableMetadata()
+    {
+        return ['fields' => $this->db_fields(),
+                     'pk' => $this->pk(),
+                     'table' => $this->db_table(),
+                     'additional_fields' => $this->additional_fields(),
+                     'alias_fields' => $this->alias_fields(),
+                     'relations' => array_keys($this->relations)];
+    }
+
+    /**
+     * returns true, if table has an auto_increment column
+     *
+     * @return boolean
+     */
+    function hasAutoIncrementColumn()
+    {
+        return $this->db_fields()[$this->pk()[0]]['extra'] == 'auto_increment';
+    }
+
+    /**
+     * set primary key for entry, combined keys must be passed as array
+     * @param int|string|array $id primary key
+     * @throws InvalidArgumentException if given key is not complete
+     * @return boolean
+     */
+    public function setId($id)
+    {
+        if (!is_array($id)){
+            $id = [$id];
+        }
+        if (count($this->pk()) != count($id)){
+            throw new InvalidArgumentException("Invalid ID, Primary Key {$this->db_table()} is " .join(",",$this->pk()));
+        } else {
+            foreach ($this->pk() as $count => $key){
+                $this->content[$key] = $id[$count];
+            }
+            return true;
+        }
+    }
+
+    /**
+     * returns primary key, multiple keys as array
+     * @return null|string|array current primary key, null if not set
+     */
+    function getId()
+    {
+        if (count($this->pk()) == 1) {
+            return $this->content[$this->pk()[0]] ?? null;
+        } else {
+            $id = [];
+            foreach ($this->pk() as $key) {
+                if (array_key_exists($key, $this->content)) {
+                    $id[] = $this->content[$key];
+                }
+            }
+            return (count($this->pk()) == count($id) ? $id : null);
+        }
+    }
+
+    /**
+     * create new unique pk as md5 hash
+     * if pk consists of multiple columns, false is returned
+     * @return boolean|string
+     */
+    function getNewId()
+    {
+        $id = false;
+        if (count($this->pk()) == 1) {
+            do {
+                $id = md5(uniqid($this->db_table(), 1));
+                $db = DBManager::get()->query("SELECT `{$this->pk()[0]}` FROM `{$this->db_table()}` "
+                . "WHERE `{$this->pk()[0]}` = '$id'");
+            } while($db->fetch());
+        }
+        return $id;
+    }
+
+    /**
+     * returns data of table row as assoc array
+     * pass array of fieldnames or ws separated string to limit
+     * fields
+     *
+     * @param null|array|string $only_these_fields limit returned fields
+     * @return array
+     */
+    function toArray($only_these_fields = null)
+    {
+        $ret = [];
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        $fields = array_diff($this->known_slots(), array_keys($this->relations));
+        if (is_array($only_these_fields)) {
+            $only_these_fields = array_filter(array_map(function($s) {
+                return is_string($s) ? strtolower($s) : null;
+            }, $only_these_fields));
+            $fields = array_intersect($only_these_fields, $fields);
+        }
+        foreach ($fields as $field) {
+            $ret[$field] = $this->getValue($field);
+            if ($ret[$field] instanceof StudipArrayObject) {
+                $ret[$field] = $ret[$field]->getArrayCopy();
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Returns data of table row as assoc array with raw contents like
+     * they are in the database.
+     * Pass array of fieldnames or ws separated string to limit
+     * fields.
+     *
+     * @param null|array|string $only_these_fields
+     * @return array
+     */
+    function toRawArray($only_these_fields = null)
+    {
+        $ret = [];
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        $fields = array_keys($this->db_fields());
+        if (is_array($only_these_fields)) {
+            $only_these_fields = array_filter(array_map(function ($s) {
+                return is_string($s) ? strtolower($s) : null;
+            }, $only_these_fields));
+            $fields = array_intersect($only_these_fields, $fields);
+        }
+        foreach ($fields as $field) {
+            if ($this->content[$field] instanceof I18NString) {
+                $ret[$field] = $this->content[$field]->original();
+            } elseif ($this->content[$field] === null) {
+                $ret[$field] = null;
+            } else {
+                $ret[$field] = (string)$this->content[$field];
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * returns data of table row as assoc array
+     * including related records with a 'has*' relationship
+     * recurses one level without param
+     *
+     * $only_these_fields limits output for relationships in this way:
+     * $only_these_fields = array('field_1',
+     *                            'field_2',
+     *                            'relation1',
+     *                            'relation2' => array('rel2_f1',
+     *                                                 'rel2_f2',
+     *                                                 'rel2_rel11' => array(
+     *                                                           rel2_rel1_f1)
+     *                                                )
+     *                           )
+     * Here all fields of relation1 will be returned.
+     *
+     * @param null|array|string $only_these_fields limit returned fields
+     * @return array
+     */
+    function toArrayRecursive($only_these_fields = null)
+    {
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        if (is_null($only_these_fields)) {
+            $only_these_fields = $this->known_slots();
+        }
+        $ret = $this->toArray($only_these_fields);
+        $relations = [];
+        if (is_array($only_these_fields)) {
+            foreach ($only_these_fields as $key => $value) {
+                if (!is_array($value) &&
+                    array_key_exists(strtolower($value), $this->relations)
+                ) {
+                    $relations[strtolower($value)] = 0; //not null|array|string to stop recursion
+                }
+                if (array_key_exists(strtolower($key), $this->relations)) {
+                    $relations[strtolower($key)] = $value;
+                }
+            }
+        }
+        if (count($relations)) {
+            foreach ($relations as $relation_name => $relation_only_these_fields) {
+                $options = $this->getRelationOptions($relation_name);
+                if ($options['type'] === 'has_one' ||
+                        $options['type'] === 'belongs_to') {
+                    $ret[$relation_name] =
+                            $this->{$relation_name}->
+                                            toArrayRecursive($relation_only_these_fields);
+                }
+                if ($options['type'] === 'has_many' ||
+                    $options['type'] === 'has_and_belongs_to_many') {
+                    $ret[$relation_name] =
+                            $this->{$relation_name}->
+                                            sendMessage('toArrayRecursive',
+                                            [$relation_only_these_fields]);
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * returns value of a column
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if getter for additional field could not be found
+     * @param string $field
+     * @return null|string|SimpleORMapCollection
+     */
+    public function getValue($field)
+    {
+        $field = strtolower($field);
+
+        // No value defined, throw exception
+        if (!in_array($field, $this->known_slots())) {
+            throw new InvalidArgumentException(static::class . '::'.$field . ' not found.');
+        }
+
+        // Get value by getter
+        if (isset($this->getter_setter_map()[$field]['get'])) {
+            return call_user_func([$this, $this->getter_setter_map()[$field]['get']]);
+        }
+
+        // Get value from content
+        if (array_key_exists($field, $this->content)) {
+            return $this->content[$field];
+        }
+
+        // Get value from relation
+        if (array_key_exists($field, $this->relations)) {
+            $this->initRelation($field);
+            return $this->relations[$field];
+        }
+
+        // Get value from additional_field
+        if (isset($this->additional_fields()[$field]['get'])) {
+            // Getter is defined as a closure
+            if ($this->additional_fields()[$field]['get'] instanceof Closure) {
+                return call_user_func_array($this->additional_fields()[$field]['get'], [$this, $field]);
+            }
+
+            // Getter is defined as a method of this object
+            return call_user_func([$this, $this->additional_fields()[$field]['get']], $field);
+        }
+
+        // No value found, throw exception
+        throw new RuntimeException('No value could be found for ' . static::class . '::' . $field);
+    }
+
+    /**
+     * gets a value from a related object
+     * only possible, if the relation has cardinality 1
+     * e.g. 'has_one' or 'belongs_to'
+     *
+     * @param string $relation name of relation
+     * @param string $field name of column
+     * @throws InvalidArgumentException if no relation with given name is found
+     * @return mixed the value from the related object
+     */
+    function getRelationValue($relation, $field)
+    {
+        $field = strtolower($field);
+        $options = $this->getRelationOptions($relation);
+        if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
+            return $this->{$relation}->{$field} ?? null;
+        } else {
+            throw new InvalidArgumentException('Relation ' . $relation . ' not found or not applicable.');
+        }
+    }
+
+    /**
+     * returns default value for column
+     *
+     * @param string $field name of column
+     * @return mixed the default value
+     */
+     function getDefaultValue($field)
+     {
+         $default_value = null;
+         if (!isset($this->default_values()[$field])) {
+             if (!in_array($field, $this->pk())) {
+                 $meta = $this->db_fields()[$field];
+                 if (isset($meta['default'])) {
+                     $default_value = $meta['default'];
+                 } elseif ($meta['null'] == 'NO') {
+                     if (strpos($meta['type'], 'text') !== false || strpos($meta['type'], 'char') !== false) {
+                         $default_value = '';
+                     }
+                     if (strpos($meta['type'], 'int') !== false) {
+                         $default_value = '0';
+                     }
+                 }
+             }
+         } else {
+             $default_value = $this->default_values()[$field];
+         }
+         return $default_value;
+     }
+
+    /**
+     * sets value of a column
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if setter for additional field could not be found
+     * @param string $field
+     * @param mixed $value
+     * @return string
+     */
+     function setValue($field, $value)
+     {
+         $field = strtolower($field);
+         $ret = false;
+         if (in_array($field, $this->known_slots())) {
+             if (isset($this->getter_setter_map()[$field]['set'])) {
+                 return call_user_func([$this, $this->getter_setter_map()[$field]['set']], $value);
+             }
+             if (array_key_exists($field, $this->content)) {
+                 if (array_key_exists($field, $this->serialized_fields())) {
+                     $ret = $this->setSerializedValue($field, $value);
+                 } elseif ($this->isI18nField($field)) {
+                         $ret = $this->setI18nValue($field, $value);
+                 } else {
+                     $ret = ($this->content[$field] = $value);
+                 }
+             } elseif (isset($this->additional_fields()[$field]['set'])) {
+                 if ($this->additional_fields()[$field]['set'] instanceof Closure) {
+                     return call_user_func_array($this->additional_fields()[$field]['set'], [$this, $field, $value]);
+                 } else {
+                     return call_user_func([$this, $this->additional_fields()[$field]['set']], $field, $value);
+                 }
+             } elseif (array_key_exists($field, $this->relations)) {
+                 $options = $this->getRelationOptions($field);
+                 if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
+                     if (is_a($value, $options['class_name'])) {
+                         $this->relations[$field] = $value;
+                         if ($options['type'] == 'has_one') {
+                             $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                             call_user_func($options['assoc_foreign_key_setter'], $value, $foreign_key_value);
+                         } else {
+                             $assoc_foreign_key_value = call_user_func($options['assoc_foreign_key_getter'], $value, $this);
+                             if ($assoc_foreign_key_value === null) {
+                                 throw new InvalidArgumentException(sprintf('trying to set belongs_to object of type: %s, but assoc_foreign_key: %s is null', get_class($value), $options['assoc_foreign_key']));
+                             }
+                             $this->setValue($options['foreign_key'], $assoc_foreign_key_value);
+                         }
+                     } else {
+                         throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
+                     }
+                 }
+                 if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
+                     if (is_array($value) || $value instanceof Traversable) {
+                         $new_ids = [];
+                         $old_ids = $this->{$field}->pluck('id');
+                         foreach ($value as $current) {
+                             if (!is_a($current, $options['class_name'])) {
+                                 throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
+                             }
+                             if ($options['type'] == 'has_many') {
+                                 $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                                 call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
+                             }
+                             if ($current->id !== null) {
+                                 $new_ids[] = $current->id;
+                                 $existing = $this->{$field}->find($current->id);
+                                 if ($existing) {
+                                     $existing->setData($current);
+                                 } else {
+                                     $this->{$field}->append($current);
+                                 }
+                             } else {
+                                 $this->{$field}->append($current);
+                             }
+                         }
+                         foreach (array_diff($old_ids, $new_ids) as $to_delete) {
+                             $this->{$field}->unsetByPK($to_delete);
+                         }
+                     } else {
+                         throw new InvalidArgumentException(sprintf('relation %s expects collection or array of objects of type: %s', $field, $options['class_name']));
+                     }
+                 }
+             }
+         } else {
+             throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
+         }
+         return $ret;
+     }
+
+    /**
+     * magic method for dynamic properties
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if getter for additional field could not be found
+     * @param string $field the column or additional field
+     * @return null|string|SimpleORMapCollection
+     */
+    function __get($field)
+    {
+        return $this->getValue($field);
+    }
+    /**
+     * magic method for dynamic properties
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if setter for additional field could not be found
+     * @param string $field
+     * @param string $value
+     * @return string
+     */
+    function __set($field, $value)
+    {
+        return $this->setValue($field, $value);
+    }
+    /**
+     * magic method for dynamic properties
+     *
+     * @param string $field
+     * @return bool
+     */
+    function __isset($field)
+    {
+        $field = strtolower($field);
+        if (in_array($field, $this->known_slots())) {
+            $value = $this->getValue($field);
+            return $value instanceOf SimpleORMapCollection ? (bool)count($value) : !is_null($value);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * ArrayAccess: Check whether the given offset exists.
+     *
+     * @param string $offset
+     */
+    public function offsetExists($offset): bool
+    {
+        return $this->__isset($offset);
+    }
+
+    /**
+     * ArrayAccess: Get the value at the given offset.
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if getter for additional field could not be found
+     * @param string $offset the column or additional field
+     * @return null|string|SimpleORMapCollection
+     */
+    public function offsetGet($offset): mixed
+    {
+        return $this->getValue($offset);
+    }
+
+    /**
+     * ArrayAccess: Set the value at the given offset.
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if setter for additional field could not be found
+     * @param string $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value): void
+    {
+        $this->setValue($offset, $value);
+    }
+
+    /**
+     * ArrayAccess: unset the value at the given offset (not applicable)
+     *
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
+    {
+
+    }
+
+    /**
+     * IteratorAggregate
+     */
+    public function getIterator(): ArrayIterator
+    {
+        return new ArrayIterator($this->toArray());
+    }
+
+    /**
+     * Countable
+     */
+    public function count(): int
+    {
+        return count($this->known_slots()) - count($this->relations);
+    }
+
+    /**
+     * check if given column exists in table
+     * @param string $field
+     * @return boolean
+     */
+    function isField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->db_fields()[$field]);
+    }
+
+    /**
+     * check if given relation exists in this class
+     * @param string $field
+     * @return boolean
+     */
+    function isRelation($field)
+    {
+        $field = strtolower($field);
+        return array_key_exists($field, $this->relations);
+    }
+
+    /**
+     * check if given column is additional
+     * @param string $field
+     * @return boolean
+     */
+    function isAdditionalField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->additional_fields()[$field]);
+    }
+
+    /**
+     * check if given column is an alias
+     * @param string $field
+     * @return boolean
+     */
+    function isAliasField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->alias_fields()[$field]);
+    }
+
+    /**
+     * check if given column is a multi-language field
+     * @param string $field
+     * @return boolean
+     */
+    function isI18nField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->i18n_fields()[$field]);
+    }
+
+    /**
+     * set multiple column values
+     * if second param is set, existing data in object will be
+     * discarded and dirty state is cleared,
+     * else new data overrides old data
+     *
+     * @param ?iterable $data assoc array
+     * @param ?boolean $reset existing data in object will be discarded
+     * @return int|bool number of columns changed
+     */
+    function setData($data, $reset = false)
+    {
+        $count = 0;
+        if ($reset) {
+            if ($this->applyCallbacks('before_initialize') === false) {
+                return false;
+            }
+            $this->initializeContent();
+        }
+        if (is_iterable($data)) {
+            foreach($data as $key => $value) {
+                $key = strtolower($key);
+                if (isset($this->db_fields()[$key])
+                    || isset($this->alias_fields()[$key])
+                    || isset($this->additional_fields()[$key]['set'])
+                ) {
+                    $this->setValue($key, $value);
+                    ++$count;
+                }
+            }
+        }
+        if ($reset) {
+            $this->applyCallbacks('after_initialize');
+        }
+        return $count;
+    }
+
+    /**
+     * check if object exists in database
+     * @return boolean
+     */
+    function isNew()
+    {
+        return $this->is_new;
+    }
+
+    /**
+     * check if object was deleted
+     *
+     * @return boolean
+     */
+    function isDeleted()
+    {
+        return $this->is_deleted;
+    }
+
+    /**
+     * set object to new state
+     * @param boolean $is_new
+     * @return boolean
+     */
+    function setNew($is_new)
+    {
+        return $this->is_new = $is_new;
+    }
+
+    /**
+     * returns sql clause with current table and pk
+     * @throws UnexpectedValueException if the primary key is incomplete
+     * @return boolean|array<string>
+     */
+    function getWhereQuery()
+    {
+        $where_query = null;
+        $pk_not_set = [];
+        foreach ($this->pk() as $key) {
+            $pk = $this->content_db[$key] ?? $this->content[$key] ?? null;
+            if (isset($pk)) {
+                $where_query[] = "`{$this->db_table()}`.`{$key}` = "  . DBManager::get()->quote($pk);
+            } else {
+                $pk_not_set[] = $key;
+            }
+        }
+        if (!$where_query || count($pk_not_set)){
+            if ($this->isNew()) {
+                return false;
+            } else {
+                throw new UnexpectedValueException(sprintf("primary key incomplete: %s must not be null", join(',',$pk_not_set)));
+            }
+        }
+        return $where_query;
+    }
+
+    /**
+     * restore entry from database
+     * @return boolean
+     */
+    function restore()
+    {
+        $where_query = $this->getWhereQuery();
+        $id = $this->getId();
+        if ($where_query) {
+            if ($this->applyCallbacks('before_initialize') === false) {
+                return false;
+            }
+            $this->initializeContent();
+            $query = "SELECT * FROM `{$this->db_table()}` WHERE "
+                    . join(" AND ", $where_query);
+            $st = DBManager::get()->prepare($query);
+            $st->execute();
+            $st->setFetchMode(PDO::FETCH_INTO , $this);
+            if ($st->fetch()) {
+                $this->setNew(false);
+                $this->applyCallbacks('after_initialize');
+                return true;
+            }
+        }
+        $this->setData([], true);
+        $this->setNew(true);
+        if (isset($id)) {
+            $this->setId($id);
+        }
+        return false;
+    }
+
+    /**
+     * store entry in database
+     *
+     * @throws UnexpectedValueException if there are forbidden NULL values
+     * @return number|boolean
+     */
+    function store()
+    {
+        // Set id or prepare setting of id
+        if ($this->isNew() && $this->getId() === null) {
+            // Explicitly set id to 0 if auto increment pk is null
+            if ($this->hasAutoIncrementColumn()) {
+                $this->setId(0);
+            } else {
+                $this->setId($this->getNewId());
+            }
+        }
+
+        if ($this->applyCallbacks('before_store') === false) {
+            return false;
+        }
+
+        $ret = 0;
+
+        if (!$this->isDeleted() && ($this->isDirty() || $this->isNew())) {
+            $callback = $this->isNew() ? 'before_create' : 'before_update';
+            if ($this->applyCallbacks($callback) === false) {
+                return false;
+            }
+
+            // Collect i18n contents
+            $i18ncontent = [];
+            foreach (array_keys($this->i18n_fields()) as $field) {
+                if ($this->content[$field] instanceof I18NString) {
+                    $i18ncontent[$field] = $this->content[$field];
+                    $this->content[$field] = $this->content[$field]->original();
+                    $this->content_db[$field] = $this->content_db[$field]->original();
+                }
+            }
+
+            // Create sql data assignment chunks
+            foreach ($this->db_fields() as $field => $meta) {
+                $value = $this->content[$field];
+                if ($field == 'chdate' && !$this->isFieldDirty($field) && $this->isDirty()) {
+                    $value = time();
+                }
+                if ($field == 'mkdate') {
+                    if ($this->isNew()) {
+                        if (!$this->isFieldDirty($field)) {
+                            $value = time();
+                        }
+                    } else {
+                        continue;
+                    }
+                }
+                if ($value === null && $meta['null'] == 'NO') {
+                    throw new UnexpectedValueException($this->db_table() . '.' . $field . ' must not be null.');
+                }
+                if (is_float($value)) {
+                    $value = str_replace(',', '.', $value);
+                }
+                $this->content[$field] = $value;
+                $query_part[] = "`$field` = " . DBManager::get()->quote($value) . " ";
+            }
+
+            // Create store query
+            if (!$this->isNew()) {
+                $where_query = $this->getWhereQuery();
+                $query = "UPDATE `{$this->db_table()}` SET "
+                    . implode(',', $query_part);
+                $query .= " WHERE " . join(" AND ", $where_query);
+            } else {
+                $query = "INSERT INTO `{$this->db_table()}` SET "
+                    . implode(',', $query_part);
+            }
+            $ret = DBManager::get()->exec($query);
+
+            // Retrieve generated id from database if pk is an auto increment
+            // column
+            if ($this->isNew()) {
+                if ($this->hasAutoIncrementColumn() && !$this->getId()) {
+                    $this->setId(DBManager::get()->lastInsertId());
+                }
+            }
+
+            // Store i18n contents
+            foreach ($i18ncontent as $field => $one) {
+                $meta = [
+                    'object_id' => $this->getId(),
+                    'table'     => $this->db_table(),
+                    'field'     => $field
+                ];
+                $one->setMetadata($meta);
+                $one->storeTranslations();
+                if (!$this->content[$field] instanceof I18NString) {
+                    $this->content[$field] = $one;
+                    $this->content_db[$field] = clone $one;
+                }
+            }
+
+            // Apply callbacks
+            $this->applyCallbacks($this->isNew() ? 'after_create' : 'after_update');
+        }
+        $rel_ret = $this->storeRelations();
+
+        $this->applyCallbacks('after_store');
+
+        if ($ret || $rel_ret) {
+            $this->restore();
+        }
+        return $ret + $rel_ret;
+    }
+
+    /**
+     * sends a store message to all initialized related objects
+     * if a relation has a callback for 'on_store' configured, the callback
+     * is instead invoked
+     *
+     * @param null|array|string $only_these
+     * @return int|false number addition of all return values, false if none was called
+     */
+    protected function storeRelations($only_these = null)
+    {
+        $ret = false;
+        if (is_string($only_these)) {
+            $only_these = words($only_these);
+        }
+        $relations = array_keys($this->relations);
+        if (is_array($only_these)) {
+            $only_these = array_filter(array_map(function ($s) {
+                return is_string($s) ? strtolower($s) : null;
+            }, $only_these));
+            $relations = array_intersect($only_these, $relations);
+        }
+        foreach ($relations as $relation) {
+            $options = $this->getRelationOptions($relation);
+            if (isset($options['on_store']) &&
+            ($options['type'] === 'has_one' ||
+            $options['type'] === 'has_many' ||
+            $options['type'] === 'has_and_belongs_to_many')) {
+                if ($options['on_store'] instanceof Closure) {
+                    $ret += call_user_func($options['on_store'], $this, $relation);
+                } elseif (isset($this->relations[$relation])) {
+                    $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                    if ($options['type'] === 'has_one') {
+                        call_user_func($options['assoc_foreign_key_setter'], $this->{$relation}, $foreign_key_value);
+                        $ret = call_user_func([$this->{$relation}, 'store']);
+                    } elseif ($options['type'] === 'has_many') {
+                        foreach ($this->{$relation} as $r) {
+                            call_user_func($options['assoc_foreign_key_setter'], $r, $foreign_key_value);
+                        }
+                        $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'store'));
+                        $ret += array_sum(call_user_func([$this->{$relation}->getDeleted(), 'sendMessage'], 'delete'));
+                    } else {
+                        call_user_func([$this->{$relation}, 'sendMessage'], 'store');
+                        $to_delete = array_filter($this->{$relation}->getDeleted()->pluck($options['assoc_foreign_key']));
+                        $to_insert = array_filter($this->{$relation}->pluck($options['assoc_foreign_key']));
+                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ? AND `" . $options['thru_assoc_key'] . "` = ?";
+                        $st = DBManager::get()->prepare($sql);
+                        foreach ($to_delete as $one_value) {
+                            $st->execute([$foreign_key_value, $one_value]);
+                            $ret += $st->rowCount();
+                        }
+                        $sql = "INSERT IGNORE INTO `" . $options['thru_table'] ."` SET `" . $options['thru_key'] ."` = ?, `" . $options['thru_assoc_key'] . "` = ?";
+                        $st = DBManager::get()->prepare($sql);
+                        foreach ($to_insert as $one_value) {
+                            $st->execute([$foreign_key_value, $one_value]);
+                            $ret += $st->rowCount();
+                        }
+                    }
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * set chdate column to current timestamp
+     * @return boolean
+     */
+    function triggerChdate()
+    {
+        if ($this->db_fields()['chdate']) {
+            $this->content['chdate'] = time();
+            if ($where_query = $this->getWhereQuery()) {
+                DBManager::get()->exec("UPDATE `{$this->db_table()}` SET chdate={$this->content['chdate']}
+                            WHERE ". join(" AND ", $where_query));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * delete entry from database
+     * the object is cleared, but is not(!) turned to new state
+     * @return bool|int number of deleted rows
+     */
+    function delete()
+    {
+        $ret = false;
+        if (!$this->isDeleted() && !$this->isNew()) {
+            if ($this->applyCallbacks('before_delete') === false) {
+                return false;
+            }
+            $ret = $this->deleteRelations();
+            $where_query = $this->getWhereQuery();
+            if ($where_query) {
+                $query = "DELETE FROM `{$this->db_table()}` WHERE "
+                        . join(" AND ", $where_query);
+                $ret += DBManager::get()->exec($query);
+            }
+            $this->is_deleted = true;
+            $this->applyCallbacks('after_delete');
+
+            // Remove i18n translations
+            if (I18N::isEnabled()) {
+                foreach (array_keys($this->i18n_fields()) as $field) {
+                    if ($this->content[$field] instanceof I18NString) {
+                        $this->content[$field]->removeTranslations();
+                    }
+                }
+            }
+        }
+        $this->setData([], true);
+        return $ret;
+    }
+
+    /**
+     * sends a delete message to all related objects
+     * if a relation has a callback for 'on_delete' configured, the callback
+     * is invoked instead
+     *
+     * @return bool|int addition of all return values, false if none was called
+     */
+    protected function deleteRelations()
+    {
+        $ret = false;
+        foreach (array_keys($this->relations) as $relation) {
+            $options = $this->getRelationOptions($relation);
+            if (isset($options['on_delete']) &&
+                ($options['type'] === 'has_one' ||
+                $options['type'] === 'has_many' ||
+                $options['type'] === 'has_and_belongs_to_many')) {
+                if ($options['on_delete'] instanceof Closure) {
+                    $ret += call_user_func($options['on_delete'], $this, $relation);
+                } else {
+                    if ($options['type'] === 'has_one' || $options['type'] === 'has_many') {
+                        $this->initRelation($relation);
+                        if (isset($this->relations[$relation])) {
+                            if ($options['type'] === 'has_one') {
+                                $ret += call_user_func([$this->{$relation}, 'delete']);
+                            } elseif ($options['type'] === 'has_many') {
+                                $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'delete'));
+                            }
+                        }
+                    } else {
+                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ?";
+                        $st = DBManager::get()->prepare($sql);
+                        $st->execute([$foreign_key_value]);
+                        $ret += $st->rowCount();
+                    }
+                }
+                $this->relations[$relation] = null;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * init internal content arrays with nulls or defaults
+     *
+     * @throws UnexpectedValueException if there is an unmatched alias
+     * @return void
+     */
+    protected function initializeContent()
+    {
+        $this->content = [];
+        foreach (array_keys($this->db_fields()) as $field) {
+            $this->content[$field] = null;
+            $this->content_db[$field] = null;
+            $this->setValue($field, $this->getDefaultValue($field));
+        }
+        foreach ($this->alias_fields() as $alias => $field) {
+            if (isset($this->db_fields()[$field])) {
+                $this->content[$alias] =& $this->content[$field];
+                $this->content_db[$alias] =& $this->content_db[$field];
+            } else {
+                throw new UnexpectedValueException(sprintf('Column %s not found for alias %s', $field, $alias));
+            }
+        }
+        foreach (array_keys($this->relations) as $one) {
+            $this->relations[$one] = null;
+        }
+        $this->additional_data = [];
+    }
+
+    /**
+     * checks if at least one field was modified since last restore
+     *
+     * @return boolean
+     */
+    public function isDirty()
+    {
+        foreach (array_keys($this->db_fields()) as $field) {
+            if ($this->isFieldDirty($field)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * checks if given field was modified since last restore
+     *
+     * @param string $field
+     * @return boolean
+     */
+    public function isFieldDirty($field)
+    {
+        $field = strtolower($field);
+        if ($this->content[$field] === null || $this->content_db[$field] === null) {
+            return $this->content[$field] !== $this->content_db[$field];
+        } else if ($this->content[$field] instanceof I18NString || $this->content_db[$field] instanceof I18NString) {
+            return $this->content[$field] != $this->content_db[$field];
+        } else {
+            return (string)$this->content[$field] !== (string)$this->content_db[$field];
+        }
+    }
+
+    /**
+     * reverts value of given field to last restored value
+     *
+     * @param string $field
+     * @return mixed the restored value
+     */
+    public function revertValue($field)
+    {
+        $field = strtolower($field);
+        return ($this->content[$field] = $this->content_db[$field]);
+    }
+
+    /**
+     * returns unmodified value of given field
+     *
+     * @param string $field
+     * @throws InvalidArgumentException
+     * @return mixed
+     */
+    public function getPristineValue($field)
+    {
+        $field = strtolower($field);
+        if (array_key_exists($field, $this->content_db)) {
+            return $this->content_db[$field];
+        } else {
+            throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
+        }
+    }
+
+    /**
+     * intitalize a relationship and get related record(s)
+     *
+     * @param string $relation name of relation
+     * @throws InvalidArgumentException if the relation does not exists
+     * @return void
+     */
+    public function initRelation($relation)
+    {
+        if (!array_key_exists($relation, $this->relations)) {
+            throw new InvalidArgumentException('Unknown relation: ' . $relation);
+        }
+        if ($this->relations[$relation] === null) {
+            $options = $this->getRelationOptions($relation);
+            $to_call = [$options['class_name'], $options['assoc_func']];
+            if (!is_callable($to_call)) {
+                throw new RuntimeException('assoc_func: ' . join('::', $to_call) . ' is not callable.' );
+            }
+            $params = $options['assoc_func_params_func'];
+            if ($options['type'] === 'has_many') {
+                $records = function($record) use ($to_call, $params, $options) {
+                    $p = (array)$params($record);
+                    return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options['order_by'] ?? null]));
+                };
+                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
+            } elseif ($options['type'] === 'has_and_belongs_to_many') {
+                $records = function($record) use ($to_call, $params, $options) {$p = (array)$params($record); return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options]));};
+                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
+            } else {
+                $p = (array)$params($this);
+                $records = call_user_func_array($to_call, count($p) ? $p : [null]);
+                $result = is_array($records) ? ($records[0] ?? null) : $records;
+                $this->relations[$relation] = $result;
+            }
+        }
+    }
+
+    /**
+     * clear data for a relationship
+     *
+     * @param string $relation name of relation
+     * @throws InvalidArgumentException if teh relation does not exists
+     * @return void
+     */
+    public function resetRelation($relation)
+    {
+        if (!array_key_exists($relation, $this->relations)) {
+            throw new InvalidArgumentException('Unknown relation: ' . $relation);
+        }
+        $this->relations[$relation] = null;
+    }
+
+    /**
+     * invoke registered callbacks for given type
+     * if one callback returns false the following will not
+     * be invoked
+     *
+     * @param string $type type of callback
+     * @return bool return value from last callback
+     */
+    protected function applyCallbacks($type)
+    {
+        $ok = true;
+        foreach ($this->registered_callbacks()[$type] as $cb) {
+            if ($cb instanceof Closure) {
+                $function =  $cb;
+                $params = [$this, $type, $cb];
+            } else {
+                $function = [$this, $cb];
+                $params = [$type];
+            };
+            $ok = call_user_func_array($function, $params);
+            if ($ok === false) {
+                break;
+            }
+        }
+        return $ok;
+    }
+
+    /**
+     * register given callback for one or many possible callback types
+     * callback param could be a closure or method name of current class
+     *
+     * @param string|array $types types to register callback for
+     * @param callable $cb callback
+     * @throws InvalidArgumentException if the callback type is not known
+     * @return number of registered callbacks
+     */
+    protected static function registerCallback($types, $cb)
+    {
+        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
+
+        $types = is_array($types) ? $types : words($types);
+        $reg = 0;
+        foreach ($types as $type) {
+            if (isset(static::registered_callbacks()[$type])) {
+                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
+                if ($found === false) {
+                    self::$config[static::class]['registered_callbacks'][$type][] = $cb;
+                    $reg++;
+                }
+            } else {
+                throw new InvalidArgumentException('Unknown callback type: ' . $type);
+            }
+        }
+        return $reg;
+    }
+
+    /**
+     * unregister given callback for one or many possible callback types
+     *
+     * @param string|array $types types to unregister callback for
+     * @param mixed $cb
+     * @throws InvalidArgumentException if the callback type is not known
+     * @return number of unregistered callbacks
+     */
+    protected static function unregisterCallback($types, $cb)
+    {
+        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
+
+        $types = is_array($types) ? $types : words($types);
+        foreach ($types as $type) {
+            if (isset(static::registered_callbacks()[$type])) {
+                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
+                if ($found !== false) {
+                    $unreg++;
+                    unset(self::$config[static::class]['registered_callbacks'][$type][$found]);
+                }
+            } else {
+                throw new InvalidArgumentException('Unknown callback type: ' . $type);
+            }
+        }
+        return $unreg;
+    }
+
+    /**
+     * default callback used to map specific callbacks to NotificationCenter
+     *
+     * @param string $cb_type callback type
+     * @return void|boolean
+     */
+    protected function cbNotificationMapper($cb_type)
+    {
+        if (isset($this->notification_map()[$cb_type])) {
+            try {
+                foreach(words($this->notification_map()[$cb_type]) as $notification) {
+                    NotificationCenter::postNotification($notification, $this);
+                }
+            } catch (NotificationVetoException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * default callback used to map specific callbacks to NotificationCenter
+     *
+     * @param string $cb_type callback type
+     * @return void|boolean
+     */
+    protected function cbAfterInitialize($cb_type)
+    {
+        foreach (array_keys($this->db_fields()) as $field) {
+            if (is_object($this->content[$field])) {
+                $this->content_db[$field] = clone $this->content[$field];
+            } else {
+                $this->content_db[$field] = $this->content[$field];
+            }
+        }
+    }
+
+    /**
+     * default setter used to proxy serialized fields with
+     * ArrayObjects
+     *
+     * @param string $field column name
+     * @param mixed $value value
+     * @return mixed
+     */
+     protected function setSerializedValue($field, $value)
+     {
+         $object_type = $this->serialized_fields()[$field];
+         if (is_null($value) || $value instanceof $object_type) {
+             $this->content[$field] = $value;
+         } else {
+             $this->content[$field] = new $object_type($value);
+         }
+         return $this->content[$field];
+     }
+
+    /**
+     * default setter used to proxy I18N fields with
+     * I18NString
+     *
+     * @param string $field column name
+     * @param mixed $value value
+     * @return mixed
+     */
+    protected function setI18nValue($field, $value)
+    {
+        $meta = ['object_id' => $this->getId(),
+                 'table'     => $this->db_table(),
+                 'field'     => $field];
+        if ($value instanceof I18NString) {
+            $value->setMetadata($meta);
+            $this->content[$field] = $value;
+        } else {
+            $this->content[$field] = new I18NString($value, null, $meta);
+        }
+        return $this->content[$field];
+    }
+
+     /**
+      * Cleans up this object. This essentially reset all relations of
+      * this object and marks them as unused so that the garbage collector may
+      * remove the objects.
+      *
+      * Use this function when you ran into memory problems and need to free
+      * some memory;
+      *
+      * @return void
+      */
+     public function cleanup()
+     {
+         foreach ($this->relations as $relation => $object) {
+             if ($object instanceof SimpleORMap || $object instanceof SimpleORMapCollection) {
+                 $this->relations[$relation]->cleanup();
+             }
+             $this->resetRelation($relation);
+         }
+     }
+}
diff --git a/lib/classes/SimpleORMapCollection.class.php b/lib/classes/SimpleORMapCollection.class.php
new file mode 100644
index 0000000..7debb80
--- /dev/null
+++ b/lib/classes/SimpleORMapCollection.class.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * SimpleORMapCollection.class.php
+ * simple object-relational mapping
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @extends SimpleCollection<SimpleORMap>
+ *
+ * @template T of SimpleORMap
+ */
+class SimpleORMapCollection extends SimpleCollection
+{
+    /**
+     * @var int Exception error code denoting a wrong type of objects.
+     */
+    const WRONG_OBJECT_TYPE = 1;
+
+    /**
+     * @var int Exception error code denoting that an object of this `id` already exists.
+     */
+    const OBJECT_EXISTS = 2;
+
+    /**
+     * the record object this collection belongs to
+     *
+     * @var ?SimpleORMap
+     */
+    protected $related_record;
+
+    /**
+     * relation options
+     * @var array
+     */
+    protected $relation_options = [];
+
+    /**
+     * creates a collection from an array of objects
+     * all objects should be of the same type
+     *
+     * @throws InvalidArgumentException if first entry is not SimpleOrMap
+     * @param T[] $data array with SimpleORMap objects
+     * @param bool $strict check every element for correct type and unique pk
+     * @return SimpleORMapCollection<T>
+     */
+    public static function createFromArray(array $data, $strict = true)
+    {
+        $ret = new SimpleORMapCollection();
+        if (count($data)) {
+            $first = current($data);
+            if ($first instanceof SimpleORMap) {
+                $ret->setClassName(get_class($first));
+                if ($strict) {
+                    foreach ($data as $one) {
+                        $ret[] = $one;
+                    }
+                } else {
+                    $ret->exchangeArray($data);
+                }
+            } else {
+                throw new InvalidArgumentException('This collection only accepts objects derived from SimpleORMap', self::WRONG_OBJECT_TYPE);
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param ?Closure         $finder  callable to fill collection
+     * @param ?array           $options relationship options
+     * @param SimpleORMap|null $record  related record
+     */
+    public function __construct(Closure $finder = null, array $options = null, SimpleORMap $record = null)
+    {
+        $this->relation_options = $options;
+        $this->related_record = $record;
+        parent::__construct($finder === null ? [] : $finder);
+    }
+
+    /**
+     * Sets the value at the specified index
+     * checks if the value is an object of specified class
+     *
+     * @see ArrayObject::offsetSet()
+     * @throws InvalidArgumentException if the given model does not fit (wrong type or id)
+     */
+    public function offsetSet($index, $newval): void
+    {
+        if (!is_null($index)) {
+            $index = (int)$index;
+        }
+        if (!is_a($newval, $this->getClassName())) {
+            throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
+        }
+        if ($this->related_record && $this->relation_options['type'] === 'has_many') {
+            $foreign_key_value = call_user_func($this->relation_options['assoc_func_params_func'], $this->related_record);
+            call_user_func($this->relation_options['assoc_foreign_key_setter'], $newval, $foreign_key_value);
+        }
+        if ($newval->id !== null) {
+            $exists = $this->find($newval->id);
+            if ($exists) {
+                throw new InvalidArgumentException('Element could not be appended, element with id: ' . $exists->id . ' is in the way', self::OBJECT_EXISTS);
+            }
+        }
+        parent::offsetSet($index, $newval);
+    }
+
+    /**
+     * sets the allowed class name
+     * @param class-string $class_name
+     * @return void
+     */
+    public function setClassName($class_name)
+    {
+        $this->relation_options['class_name'] = strtolower($class_name);
+        $this->deleted->relation_options['class_name'] = strtolower($class_name);
+    }
+
+    /**
+     * sets the related record
+     *
+     * @param SimpleORMap $record
+     * @return void
+     */
+    public function setRelatedRecord(SimpleORMap $record)
+    {
+        $this->related_record = $record;
+    }
+
+    /**
+     * gets the allowed classname
+     *
+     * @return string
+     */
+    public function getClassName()
+    {
+        return strtolower($this->relation_options['class_name']);
+    }
+
+    /**
+     * reloads the elements of the collection
+     * by calling the finder function
+     *
+     * @throws InvalidArgumentException
+     * @return ?int number of records after refresh
+     */
+    public function refresh()
+    {
+        if (is_callable($this->finder)) {
+            $data = call_user_func($this->finder, $this->related_record);
+            foreach ($data as $one) {
+                if (!is_a($one, $this->getClassName())) {
+                    throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
+                }
+            }
+            $this->exchangeArray($data);
+            $this->deleted->exchangeArray([]);
+            return $this->last_count = $this->count();
+        }
+
+        return null;
+    }
+
+    /**
+     * returns element with given primary key value
+     *
+     * @param string $value primary key value to search for
+     * @return ?T
+     */
+    public function find($value)
+    {
+        return $this->findOneBy('id', $value);
+    }
+
+    /**
+     * returns the collection as grouped array
+     * first param is the column to group by, it becomes the key in
+     * the resulting array, default is pk. Limit returned fields with second param
+     * The grouped entries can optoionally go through the given
+     * callback. If no callback is provided, only the first grouped
+     * entry is returned, suitable for grouping by unique column
+     *
+     * @param string $group_by the column to group by, pk if ommitted
+     * @param mixed $only_these_fields limit returned fields
+     * @param ?callable $group_func closure to aggregate grouped entries
+     * @return array assoc array
+     */
+    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
+    {
+        $result = [];
+        foreach ($this as $record) {
+            $key = $record->getValue($group_by);
+            if (is_array($key)) {
+                $key = join('_', $key);
+            }
+            $result[$key][] = $record->toArray($only_these_fields);
+        }
+        if ($group_func === null) {
+            $group_func = 'current';
+        }
+        return array_map($group_func, $result);
+    }
+
+    /**
+     * mark element(s) for deletion
+     * element(s) with given primary key are moved to
+     * internal deleted collection
+     *
+     * @param string $id primary key of element
+     * @return int number of unsetted elements
+     */
+    public function unsetByPk($id)
+    {
+        return $this->unsetBy('id', $id);
+    }
+
+    /**
+     * merge in another collection, elements must be of
+     * the same type, if an element already exists it is
+     * replaced or ignored depending on second param
+     *
+     * @param SimpleORMapCollection $a_collection
+     * @param string $mode 'replace' or 'ignore'
+     * @return void
+     */
+    public function merge(SimpleCollection $a_collection, string $mode = 'ignore')
+    {
+        $mode = func_get_arg(1);
+        foreach ($a_collection as $element) {
+            try {
+                /**
+                 * @throws InvalidArgumentException
+                 * @see SimpleORMapCollection::offsetSet()
+                 */
+                $this[] = $element;
+            } catch (InvalidArgumentException $e) {
+                if ($e->getCode() === self::OBJECT_EXISTS) {
+                    if ($mode === 'replace') {
+                        $this->unsetByPk($element->id);
+                        $this[] = $element;
+                    } // else $mode means 'ignore'
+                } else {
+                    throw $e;
+                }
+            }
+        }
+        $this->storage = array_values($this->storage);
+    }
+}
diff --git a/lib/models/SimpleCollection.class.php b/lib/models/SimpleCollection.class.php
deleted file mode 100644
index 6acc10d..0000000
--- a/lib/models/SimpleCollection.class.php
+++ /dev/null
@@ -1,782 +0,0 @@
-<?php
-if (!defined('SORT_NATURAL')) {
-    define('SORT_NATURAL', 6);
-}
-if (!defined('SORT_FLAG_CASE')) {
-    define('SORT_FLAG_CASE', 8);
-}
-
-/**
- * SimpleCollection.class.php
- * collection of assoc arrays with convenience
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @template T
- */
-class SimpleCollection extends StudipArrayObject
-{
-    /**
-     * callable to initialize collection
-     *
-     * @var ?callable(): array<T>
-     */
-    protected $finder;
-
-    /**
-     * number of records after last init
-     *
-     * @var int
-     */
-    protected $last_count;
-
-    /**
-     * collection with deleted records
-     * @var static
-     */
-    protected $deleted;
-
-    /**
-     * creates a collection from an array of arrays
-     * all arrays should contain same keys, but is not enforced
-     *
-     * @param array<T> $data array containing assoc arrays
-     * @return SimpleCollection<T>
-     */
-    public static function createFromArray(array $data)
-    {
-        return new self($data);
-    }
-
-    /**
-     * converts arrays or objects to ArrayObject objects
-     * if ArrayAccess interface is not available
-     *
-     * @param mixed $a
-     * @return StudipArrayObject|ArrayAccess
-     */
-    public static function arrayToArrayObject($a)
-    {
-        if ($a instanceof StudipArrayObject) {
-            $a->setFlags(StudipArrayObject::ARRAY_AS_PROPS);
-            return $a;
-        }
-
-        if ($a instanceof ArrayObject) {
-            return new StudipArrayObject($a->getArrayCopy(), StudipArrayObject::ARRAY_AS_PROPS);
-        }
-
-        if ($a instanceof ArrayAccess) {
-            return $a;
-        }
-
-        return new StudipArrayObject((array) $a, StudipArrayObject::ARRAY_AS_PROPS);
-    }
-
-    /**
-     * returns closure to compare a value against given arguments
-     * using given operator
-     *
-     * @param string|callable(mixed, mixed|array): bool  $operator
-     * @param mixed|array $args
-     * @throws InvalidArgumentException
-     * @return callable(mixed): bool comparison function
-     */
-    public static function getCompFunc($operator, $args)
-    {
-        if (is_callable($operator)) {
-            $comp_func = function ($a) use ($args, $operator) {
-                return $operator($a, $args);
-            };
-        } else {
-            if (!is_array($args)) {
-                $args = [$args];
-            }
-            switch ($operator) {
-                case '==':
-                    $comp_func = function ($a) use ($args) {
-                        return in_array($a, $args);
-                    };
-                break;
-                case '===':
-                    $comp_func = function ($a) use ($args) {
-                        return in_array($a, $args, true);
-                    };
-                break;
-                case '!=':
-                case '<>':
-                    $comp_func = function ($a) use ($args) {
-                        return !in_array($a, $args);
-                    };
-                break;
-                case '!==':
-                    $comp_func = function ($a) use ($args) {
-                        return !in_array($a, $args, true);
-                    };
-                break;
-                case '<':
-                case '>':
-                case '<=':
-                case '>=':
-                    $op_func = function ($a, $b) use ($operator) {
-                        if ($operator === '<') {
-                            return $a < $b;
-                        } elseif ($operator === '<=') {
-                            return $a <= $b;
-                        } elseif ($operator === '>=') {
-                            return $a >= $b;
-                        } elseif ($operator === '>') {
-                            return $a > $b;
-                        }
-                    };
-                    $comp_func = function ($a) use ($op_func, $args) {
-                        return $op_func($a, $args[0]);
-                    };
-                break;
-                case '><':
-                    $comp_func = function ($a) use ($args) {
-                        return $a > $args[0] && $a < $args[1];
-                    };
-                break;
-                case '>=<=':
-                    $comp_func = function ($a) use ($args) {
-                        return $a >= $args[0] && $a <= $args[1];
-                    };
-                    break;
-                case '%=':
-                    $comp_func = function ($a) use ($args) {
-                        $a = mb_strtolower(static::translitLatin1($a));
-                        $args = array_map([static::class, 'translitLatin1'], $args);
-                        $args = array_map('mb_strtolower', $args);
-                        return in_array($a, $args);
-                    };
-                break;
-                case '*=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            if (mb_strpos($a, $arg) !== false) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                break;
-                case '^=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            if (mb_strpos($a, $arg) === 0) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                break;
-                case '$=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            $found = mb_strrpos($a, $arg);
-                            if ($found !== false && ($found + mb_strlen($arg)) === mb_strlen($a)) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                break;
-                case '~=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            if (preg_match($arg, $a) === 1) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                    break;
-                default:
-                    throw new InvalidArgumentException('unknown operator: ' . $operator);
-             }
-         }
-         return $comp_func;
-    }
-
-    /**
-     * transliterates latin1 string to ascii
-     *
-     * @param string $text
-     * @return string
-     */
-    public static function translitLatin1($text)
-    {
-        if (!preg_match('/[\200-\377]/', $text)) {
-            return $text;
-        }
-        $text = str_replace(['ä','Ä','ö','Ö','ü','Ü','ß'], ['a','A','o','O','u','U','s'], $text);
-        $text = str_replace(['À','Á','Â','Ã','Å','Æ'], 'A' , $text);
-        $text = str_replace(['à','á','â','ã','å','æ'], 'a' , $text);
-        $text = str_replace(['È','É','Ê','Ë'], 'E' , $text);
-        $text = str_replace(['è','é','ê','ë'], 'e' , $text);
-        $text = str_replace(['Ì','Í','Î','Ï'], 'I' , $text);
-        $text = str_replace(['ì','í','î','ï'], 'i' , $text);
-        $text = str_replace(['Ò','Ó','Õ','Ô','Ø'], 'O' , $text);
-        $text = str_replace(['ò','ó','ô','õ','ø'], 'o' , $text);
-        $text = str_replace(['Ù','Ú','Û'], 'U' , $text);
-        $text = str_replace(['ù','ú','û'], 'u' , $text);
-        $text = str_replace(['Ç','ç','Ð','Ñ','Ý','ñ','ý','ÿ'], ['C','c','D','N','Y','n','y','y'] , $text);
-        return $text;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param array<T>|callable(): array<T> $data array or closure to fill collection
-     */
-    public function __construct($data = [])
-    {
-        parent::__construct();
-        $this->finder = is_callable($data) ? $data : null;
-        $this->deleted = clone $this;
-        if (is_callable($data)) {
-            $this->refresh();
-        } else {
-            $this->exchangeArray($data);
-        }
-    }
-
-    /**
-     * @param array $input
-     * @return array
-     */
-    public function exchangeArray($input)
-    {
-        return parent::exchangeArray(array_map(
-            [static::class, 'arrayToArrayObject'],
-            $input
-        ));
-    }
-
-    /**
-     * converts the object and all elements to plain arrays
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $args = func_get_args();
-        return $this->map(function ($a) use ($args) {
-            if (method_exists($a, 'toArray')) {
-                return call_user_func_array([$a, 'toArray'], $args);
-            }
-            if (method_exists($a, 'getArrayCopy')) {
-                return $a->getArrayCopy();
-            }
-            return (array) $a;
-        }
-        );
-    }
-
-    /**
-     *
-     * @see ArrayObject::append()
-     */
-    public function append($newval)
-    {
-        parent::append(static::arrayToArrayObject($newval));
-    }
-
-    /**
-     * Sets the value at the specified index
-     * ensures the value has ArrayAccess
-     *
-     * @param mixed $index
-     * @param mixed $newval
-     *
-     * @see ArrayObject::offsetSet()
-     */
-
-    public function offsetSet($index, $newval): void
-    {
-        if (is_numeric($index)) {
-            $index = (int) $index;
-        }
-        parent::offsetSet($index, static::arrayToArrayObject($newval));
-    }
-
-    /**
-     * Unsets the value at the specified index
-     * value is moved to internal deleted collection
-     *
-     * @see ArrayObject::offsetUnset()
-     * @throws InvalidArgumentException
-     */
-    public function offsetUnset($index): void
-    {
-        if ($this->offsetExists($index)) {
-            $this->deleted[] = $this->offsetGet($index);
-        }
-        parent::offsetUnset($index);
-    }
-
-    /**
-     * sets the finder function
-     *
-     * @param callable(): array<T> $finder
-     * @return void
-     */
-    public function setFinder(callable $finder)
-    {
-        $this->finder = $finder;
-    }
-
-    /**
-     * get deleted records collection
-     * @return SimpleCollection<T>
-     */
-    public function getDeleted()
-    {
-        return $this->deleted;
-    }
-
-    /**
-     * reloads the elements of the collection
-     * by calling the finder function
-     *
-     * @return ?int of records after refresh
-     */
-    public function refresh()
-    {
-        if (is_callable($this->finder)) {
-            $data = call_user_func($this->finder);
-            $this->exchangeArray($data);
-            $this->deleted->exchangeArray([]);
-            return $this->last_count = $this->count();
-        }
-    }
-
-    /**
-     * returns a new collection containing all elements
-     * where given columns value matches given value(s) using passed operator
-     * pass array for multiple values
-     *
-     * operators:
-     * == equal, like php
-     * === identical, like php
-     * !=,<> not equal, like php
-     * !== not identical, like php
-     * <,>,<=,>= less,greater,less or equal,greater or equal
-     * >< between without borders, needs two arguments
-     * >=<= between including borders, needs two arguments
-     * %= like string, transliterate to ascii,case insensitive
-     * *= contains string
-     * ^= begins with string
-     * $= ends with string
-     * ~= regex
-     *
-     * @param string $key the column name
-     * @param mixed $values value to search for
-     * @param string|callable $op operator to find
-     * @return SimpleCollection<T> with found records
-     */
-    public function findBy($key, $values, $op = '==')
-    {
-        $comp_func = self::getCompFunc($op, $values);
-        return $this->filter(function ($record) use ($comp_func, $key) {
-            return $comp_func($record[$key]);
-        });
-    }
-
-    /**
-     * returns the first element
-     * where given column has given value(s)
-     * pass array for multiple values
-     *
-     * @param string $key the column name
-     * @param mixed $values value to search for,
-     * @param string|callable $op operator to find
-     * @return ?T found record
-     */
-    public function findOneBy($key, $values, $op = '==')
-    {
-        $comp_func = self::getCompFunc($op, $values);
-        return $this->filter(function ($record) use ($comp_func, $key) {
-            return $comp_func($record[$key]);
-        }, 1)->first();
-    }
-
-    /**
-     * apply given callback to all elements of
-     * collection
-     *
-     * @param callable(T): int $func the function to call
-     * @return int|false addition of return values
-     */
-    public function each(callable $func)
-    {
-        $result = false;
-        foreach ($this->storage as $record) {
-            $result += call_user_func($func, $record);
-        }
-        return $result;
-    }
-
-    /**
-     * apply given callback to all elements of
-     * collection and give back array of return values
-     *
-     * @param callable(T, mixed): mixed $func the function to call
-     * @return array<mixed>
-     */
-    public function map(callable $func)
-    {
-        $results = [];
-        foreach ($this->storage as $key => $value) {
-            $results[$key] = call_user_func($func, $value, $key);
-        }
-        return $results;
-    }
-
-    /**
-     * filter elements
-     * if given callback returns true
-     *
-     * @param ?callable(T, mixed): bool $func the function to call
-     * @param ?integer $limit limit number of found records
-     * @return SimpleCollection<T> containing filtered elements
-     */
-    public function filter(callable $func = null, $limit = null)
-    {
-        $results = [];
-        $found = 0;
-        foreach ($this->storage as $key => $value) {
-            if (call_user_func($func, $value, $key)) {
-                $results[$key] = $value;
-                if ($limit && (++$found == $limit)) {
-                    break;
-                }
-            }
-        }
-        return self::createFromArray($results);
-    }
-
-    /**
-     * Returns whether any element of the collection returns true for the
-     * given callback.
-     *
-     * @param  callable(T, mixed): bool $func the function to call
-     * @return bool
-     */
-    public function any(callable $func)
-    {
-        foreach ($this->storage as $key => $value) {
-            if (call_user_func($func, $value, $key)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns whether every element of the collection returns true for the
-     * given callback.
-     *
-     * @param  callable(T, mixed): bool $func the function to call
-     * @return bool
-     */
-    public function every(callable $func)
-    {
-        foreach ($this->storage as $key => $value) {
-            if (!call_user_func($func, $value, $key)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * extract array of columns values
-     * pass array or space-delimited string for multiple columns
-     *
-     * @param string|array $columns the column(s) to extract
-     * @return array of extracted values
-     */
-    public function pluck($columns)
-    {
-        if (!is_array($columns)) {
-            $columns = words($columns);
-        }
-        $func = function ($r) use ($columns) {
-            $result = [];
-            foreach ($columns as $c) {
-                $result[] = $r[$c];
-            }
-            return $result;
-        };
-        $result = $this->map($func);
-        return count($columns) === 1 ? array_map('current', $result) : $result;
-    }
-
-    /**
-     * returns the collection as grouped array
-     * first param is the column to group by, it becomes the key in
-     * the resulting array, default is pk. Limit returned fields with second param
-     * The grouped entries can optoionally go through the given
-     * callback. If no callback is provided, only the first grouped
-     * entry is returned, suitable for grouping by unique column
-     *
-     * @param string $group_by the column to group by, pk if ommitted
-     * @param string|array|null $only_these_fields limit returned fields
-     * @param ?callable $group_func closure to aggregate grouped entries
-     * @return array assoc array
-     */
-    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
-    {
-        $result = [];
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        foreach ($this->toArray() as $record) {
-            $key = $record[$group_by];
-            $ret = [];
-            if (is_array($only_these_fields)) {
-                $result[$key][] = array_intersect_key($record, array_flip($only_these_fields));
-            } else {
-                $result[$key][] = $record;
-            }
-        }
-        if ($group_func === null) {
-            $group_func = 'current';
-        }
-        return array_map($group_func, $result);
-    }
-
-    /**
-     * get the first element
-     *
-     * @return ?T first element or null
-     */
-    public function first()
-    {
-        $keys = array_keys($this->storage);
-        $first_offset = reset($keys);
-        return $this->offsetGet($first_offset ?: 0);
-    }
-
-    /**
-     * get the last element
-     *
-     * @return ?T last element or null
-     */
-    public function last()
-    {
-        $keys = array_keys($this->storage);
-        $last_offset = end($keys);
-        return $this->offsetGet($last_offset ?: 0);
-    }
-
-     /**
-     * get the the value from given key from first element
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function val($key)
-    {
-        $first = $this->first();
-        return $first[$key] ?? null;
-    }
-
-    /**
-     * mark element(s) for deletion
-     * where given column has given value(s)
-     * element(s) are moved to
-     * internal deleted collection
-     * pass array for multiple values
-     *
-     * operators:
-     * == equal, like php
-     * === identical, like php
-     * !=,<> not equal, like php
-     * !== not identical, like php
-     * <,>,<=,>= less,greater,less or equal,greater or equal
-     * >< between without borders, needs two arguments
-     * >=<= between including borders, needs two arguments
-     * %= like string, transliterate to ascii,case insensitive
-     * *= contains string
-     * ^= begins with string
-     * $= ends with string
-     * ~= regex
-     *
-     * @param string $key
-     * @param mixed $values
-     * @param string|callable(mixed, mixed|array): bool $op operator to find elements
-     * @return int|false number of unsetted elements
-     */
-    public function unsetBy($key, $values, $op = '==')
-    {
-        $ret = false;
-        $comp_func = self::getCompFunc($op, $values);
-        foreach ($this->storage as $k => $record) {
-            if ($comp_func($record[$key])) {
-                $this->offsetunset($k);
-                $ret += 1;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * sorts the collection by columns of contained elements and returns it
-     *
-     * works like sql order by:
-     * first param is a string containing combinations of column names
-     * and sort direction, separated by comma e.g.
-     *  'name asc, nummer desc '
-     *  sorts first by name ascending and then by nummer descending
-     *  second param denotes the sort type (using PHP sort constants):
-     *  SORT_LOCALE_STRING:
-     *  compare items as strings, transliterate latin1 to ascii, case insensitiv, natural order for numbers
-     *  SORT_NUMERIC:
-     *  compare items as integers
-     *  SORT_STRING:
-     *  compare items as strings
-     *  SORT_NATURAL:
-     *  compare items as strings using "natural ordering"
-     *  SORT_FLAG_CASE:
-     *  can be combined (bitwise OR) with SORT_STRING or SORT_NATURAL to sort strings case-insensitively
-     *
-     * @param string $order columns to order by
-     * @param integer $sort_flags
-     * @return $this the sorted collection
-     */
-    public function orderBy($order, $sort_flags = SORT_LOCALE_STRING)
-    {
-        //('name asc, nummer desc ')
-        $sort_locale = false;
-        switch ($sort_flags) {
-        case SORT_NATURAL:
-            $sort_func = 'strnatcmp';
-            break;
-        case SORT_NATURAL | SORT_FLAG_CASE:
-            $sort_func = 'strnatcasecmp';
-            break;
-        case SORT_STRING | SORT_FLAG_CASE:
-            $sort_func = 'strcasecmp';
-            break;
-        case SORT_STRING:
-            $sort_func = 'strcmp';
-            break;
-        case SORT_NUMERIC:
-            $sort_func = function ($a, $b) {
-                return (int) $a - (int) $b;
-            };
-            break;
-        case SORT_LOCALE_STRING:
-        default:
-            $sort_func = 'strnatcasecmp';
-            $sort_locale = true;
-        }
-
-        $sorter = [];
-        foreach (explode(',', $order) as $one) {
-            $sorter[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
-        }
-
-        $func = function ($d1, $d2) use ($sorter, $sort_func, $sort_locale) {
-            do {
-                $current_sorter = current($sorter);
-                $field = $current_sorter[0];
-                $dir = $current_sorter[1] ?? '';
-                if (!$sort_locale) {
-                    $value1 = $d1[$field];
-                    $value2 = $d2[$field];
-                } else {
-                    $value1 = static::translitLatin1(mb_substr($d1[$field], 0, 100));
-                    $value2 = static::translitLatin1(mb_substr($d2[$field], 0, 100));
-                }
-                $ret = $sort_func($value1, $value2);
-                if (strtolower($dir) == 'desc') $ret = $ret * -1;
-            } while ($ret === 0 && next($sorter));
-
-            return $ret;
-        };
-        if (count($sorter)) {
-            $this->uasort($func);
-        }
-        return $this;
-    }
-
-    /**
-     * returns a new collection contaning a sequence of original collection
-     * mimics the sql limit constrain:
-     * used with one parameter, the first x elements are extracted
-     * used with two parameters, the first parameter denotes the offset, the second the
-     * number of elements
-     *
-     * @param integer $arg1
-     * @param ?integer $arg2
-     * @return SimpleCollection<T>
-     */
-    public function limit($arg1, $arg2 = null)
-    {
-        if (is_null($arg2)) {
-            if ($arg1 > 0) {
-                $row_count = $arg1;
-                $offset = 0;
-            } else {
-                $row_count = abs($arg1);
-                $offset = $arg1;
-            }
-        } else {
-            $offset = $arg1;
-            $row_count = $arg2;
-        }
-        return self::createFromArray(array_slice($this->storage, $offset, $row_count, true));
-    }
-
-     /**
-     * calls the given method on all elements
-     * of the collection
-     * @param literal-string $method methodname to call
-     * @param array $params parameters for methodcall
-     * @return array of all return values
-     */
-    public function sendMessage($method, $params = []) {
-        $results = [];
-        foreach ($this->storage as $record) {
-            $results[] = call_user_func_array([$record, $method], $params);
-        }
-        return $results;
-    }
-
-    /**
-     * magic version of sendMessage
-     * calls undefineds methods on all elements of the collection
-     * But beware of the dark side...
-     *
-     * @param literal-string $method methodname to call
-     * @param array $params parameters for methodcall
-     * @return array of all return values
-     */
-    public function __call($method, $params)
-    {
-        return $this->sendMessage($method, $params);
-    }
-
-    /**
-     * merge in another collection, elements are appended
-     *
-     * @param SimpleCollection<T> $a_collection
-     * @return void
-     */
-    public function merge(SimpleCollection $a_collection)
-    {
-        $this->storage = array_merge($this->storage, $a_collection->getArrayCopy());
-    }
-}
diff --git a/lib/models/SimpleORMap.class.php b/lib/models/SimpleORMap.class.php
deleted file mode 100644
index f86ec6f..0000000
--- a/lib/models/SimpleORMap.class.php
+++ /dev/null
@@ -1,2476 +0,0 @@
-<?php
-/**
- * SimpleORMap.class.php
- * simple object-relational mapping
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
-{
-    /**
-     * Defines `_` as character used when joining composite primary keys.
-     */
-    const ID_SEPARATOR = '_';
-
-    /**
-     * table row data
-     * @var array $content
-     */
-    protected $content = [];
-
-    /**
-     * table row data
-     * @var array $content_db
-     */
-    protected $content_db = [];
-
-    /**
-     * new state of entry
-     * @var boolean $is_new
-     */
-    protected $is_new = true;
-
-    /**
-     * deleted state of entry
-     * @var boolean $is_deleted
-     */
-    protected $is_deleted = false;
-
-     /**
-     * db table metadata
-     * @var ?array $schemes;
-     */
-    public static $schemes = null;
-
-    /**
-     * configuration data for subclasses
-     * @see self::configure()
-     * @var array $config;
-     */
-    protected static $config = [];
-
-    /**
-     * stores instantiated related objects
-     * @var array $relations
-     */
-    protected $relations = [];
-
-    /**
-     * assoc array for storing values for additional fields
-     *
-     * @var array $additional_data
-     */
-    protected $additional_data = [];
-
-    /**
-     * reserved indentifiers, fields with those names must not have an explicit getXXX() method
-     * @var array $reserved_slots
-     */
-    protected static $reserved_slots = ['value','newid','iterator','tablemetadata', 'relationvalue','wherequery','relationoptions','data','new','id'];
-
-    /**
-     * indicator for batch operations in findEachBySQL
-     *
-     * @var bool $performs_batch_operation
-     */
-    protected static $performs_batch_operation = false;
-
-    /**
-     * name of db table
-     * @return string
-     */
-    protected static function db_table()
-    {
-        return static::config('db_table');
-    }
-
-    /**
-     * table columns
-     * @return array
-     */
-    protected static function db_fields()
-    {
-        return static::config('db_fields');
-    }
-
-    /**
-     * primary key columns
-     * @return array
-     */
-    protected static function pk()
-    {
-        return static::config('pk');
-    }
-
-    /**
-     * default values for columns
-     * @return array
-     */
-    protected static function default_values()
-    {
-        return static::config('default_values');
-    }
-
-    /**
-     * list of columns to deserialize
-     * @return array key is name of column, value is name of ArrayObject class
-     */
-    protected static function serialized_fields()
-    {
-        return static::config('serialized_fields');
-    }
-
-    /**
-     * aliases for columns
-     * alias => column
-     * @return array
-     */
-    protected static function alias_fields()
-    {
-        return static::config('alias_fields');
-    }
-
-    /**
-     * multi-language fields
-     * name => boolean
-     * @return array
-     */
-    protected static function i18n_fields()
-    {
-        return static::config('i18n_fields');
-    }
-
-    /**
-     * additional computed fields
-     * name => callable
-     * @return array
-     */
-    protected static function additional_fields()
-    {
-        return static::config('additional_fields');
-    }
-
-    /**
-     * 1:n relation
-     * @return array
-     */
-    protected static function has_many()
-    {
-        return static::config('has_many');
-    }
-
-    /**
-     * 1:1 relation
-     * @return array
-     */
-    protected static function has_one()
-    {
-        return static::config('has_one');
-    }
-
-    /**
-     * n:1 relations
-     * @return array
-     */
-    protected static function belongs_to()
-    {
-        return static::config('belongs_to');
-    }
-
-    /**
-     * n:m relations
-     * @return array
-     */
-    protected static function has_and_belongs_to_many()
-    {
-        return static::config('has_and_belongs_to_many');
-    }
-
-    /**
-     * callbacks
-     * @return array<string, array<string|Closure>>
-     */
-    protected static function registered_callbacks()
-    {
-        return static::config('registered_callbacks');
-    }
-
-    /**
-     * contains an array of all used identifiers for fields
-     * (db columns + aliased columns + additional columns + relations)
-     * @return array
-     */
-    protected static function known_slots()
-    {
-        return static::config('known_slots');
-    }
-
-    /**
-     * assoc array used to map SORM callback to NotificationCenter
-     * keys are SORM callbacks, values notifications
-     * eg. 'after_create' => 'FooDidCreate'
-     *
-     * @return array
-     */
-    protected static function notification_map()
-    {
-        return static::config('notification_map');
-    }
-
-    /**
-     * assoc array for mapping get/set Methods
-     *
-     * @return array
-     */
-    protected static function getter_setter_map()
-    {
-        return static::config('getter_setter_map');
-    }
-
-    //////////////////////////////////////////////////
-
-    /**
-     * set configuration data from subclass
-     *
-     * @param ?array $config configuration data
-     * @return void
-     */
-    protected static function configure($config = [])
-    {
-        $class = static::class;
-
-        if (empty($config['db_table'])) {
-            $config['db_table'] = strtolower($class);
-        }
-
-        if (!isset($config['db_fields'])) {
-            if (static::tableScheme($config['db_table'])) {
-                $config['db_fields'] = self::$schemes[$config['db_table']]['db_fields'];
-                $config['pk'] = self::$schemes[$config['db_table']]['pk'];
-            }
-        }
-
-        if (isset($config['pk'])
-            && !isset($config['db_fields']['id'])
-            && !isset($config['alias_fields']['id'])
-            && !isset($config['additional_fields']['id'])
-        ) {
-            if (count($config['pk']) === 1) {
-                $config['alias_fields']['id'] = $config['pk'][0];
-            } else {
-                $config['additional_fields']['id'] = ['get' => '_getId',
-                                                           'set' => '_setId'];
-            }
-        }
-        if (isset($config['additional_fields'])) {
-            foreach ($config['additional_fields'] as $a_field => $a_config) {
-                if (is_array($a_config) && !(isset($a_config['get']) || isset($a_config['set']))) {
-                    $relation = $a_config[0] ?? '';
-                    $relation_field = $a_config[1] ?? '';
-                    if (!$relation) {
-                        list($relation, $relation_field) = explode('_', $a_field);
-                    }
-                    if (!$relation_field || !$relation) {
-                        throw new UnexpectedValueException('no relation found for autoget/set additional field: ' . $a_field);
-                    }
-                    $config['additional_fields'][$a_field] = ['get'            => '_getAdditionalValueFromRelation',
-                                                                   'set'            => '_setAdditionalValue',
-                                                                   'relation'       => $relation,
-                                                                   'relation_field' => $relation_field];
-                }
-            }
-        }
-        if (isset($config['serialized_fields'])) {
-            foreach ($config['serialized_fields'] as $a_field => $object_type) {
-                if (!(is_subclass_of($object_type, 'StudipArrayObject'))) {
-                    throw new UnexpectedValueException(sprintf('serialized field %s must use subclass of StudipArrayObject', $a_field));
-                }
-            }
-        }
-
-        foreach (['default_values', 'serialized_fields', 'alias_fields', 'i18n_fields', 'additional_fields'] as $fields) {
-            if (!isset($config[$fields])) {
-                $config[$fields] = [];
-            }
-        }
-
-        foreach (['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            if (isset($config[$type]) && is_array($config[$type])) {
-                foreach (array_keys($config[$type]) as $one) {
-                    $config['relations'][$one] = null;
-                }
-            } else {
-                $config[$type] = [];
-            }
-        }
-
-        $callbacks = ['before_create',
-                      'before_update',
-                      'before_store',
-                      'before_delete',
-                      'before_initialize',
-                      'after_create',
-                      'after_update',
-                      'after_store',
-                      'after_delete',
-                      'after_initialize'];
-
-        foreach ($callbacks as $callback) {
-            if (!isset($config['registered_callbacks'][$callback])) {
-                $config['registered_callbacks'][$callback] = [];
-            }
-        }
-
-        $auto_notification_map['after_create'] = $class . 'DidCreate';
-        $auto_notification_map['after_store'] = $class . 'DidStore';
-        $auto_notification_map['after_delete'] = $class . 'DidDelete';
-        $auto_notification_map['after_update'] = $class . 'DidUpdate';
-        $auto_notification_map['before_create'] = $class . 'WillCreate';
-        $auto_notification_map['before_store'] = $class . 'WillStore';
-        $auto_notification_map['before_delete'] = $class . 'WillDelete';
-        $auto_notification_map['before_update'] = $class . 'WillUpdate';
-
-        foreach ($auto_notification_map as $cb => $notification) {
-            if (isset($config['notification_map'][$cb])) {
-                if (strpos($config['notification_map'][$cb], $notification) !== false) {
-                    $config['notification_map'][$cb] .= ' ' . $notification;
-                }
-            } else {
-                $config['notification_map'][$cb] = $notification;
-            }
-        }
-
-        if (is_array($config['notification_map'])) {
-            foreach (array_keys($config['notification_map']) as $cb) {
-                $config['registered_callbacks'][$cb][] = 'cbNotificationMapper';
-            }
-        }
-
-        if (!I18N::isEnabled() || empty($config['i18n_fields'])) {
-            $config['i18n_fields'] = [];
-        } elseif (is_string($config['i18n_fields'])) {
-            $i18n_fields = words($config['i18n_fields']);
-            $config['i18n_fields'] = array_combine(
-                $i18n_fields,
-                array_fill(0, count($i18n_fields), true)
-            );
-        } elseif (array_is_list($config['i18n_fields'])) {
-            $config['i18n_fields'] = array_combine(
-                $config['i18n_fields'],
-                array_fill(0, count($config['i18n_fields']), true)
-            );
-        }
-
-        array_unshift($config['registered_callbacks']['after_initialize'], 'cbAfterInitialize');
-
-        $config['known_slots'] = array_merge(
-            array_keys($config['db_fields']),
-            array_keys($config['alias_fields'] ?? []),
-            array_keys($config['additional_fields'] ?? []),
-            array_keys($config['relations'] ?? [])
-        );
-
-        foreach (array_map('strtolower', get_class_methods($class)) as $method) {
-            if (in_array(substr($method, 0, 3), ['get', 'set'])) {
-                $verb = substr($method, 0, 3);
-                $name = substr($method, 3);
-                if (in_array($name, $config['known_slots']) && !in_array($name, static::$reserved_slots) && !isset($config['additional_fields'][$name][$verb])) {
-                    $config['getter_setter_map'][$name][$verb] = $method;
-                }
-            }
-        }
-        self::$config[$class] = $config;
-    }
-
-    /**
-     * fetch config data for the called class
-     *
-     * @param string $key config key
-     * @return mixed value of config key (null if not set)
-     */
-    protected static function config($key)
-    {
-        if (!array_key_exists(static::class, self::$config)) {
-            static::configure();
-        }
-
-        return self::$config[static::class][$key] ?? null;
-    }
-
-    /**
-     * fetch table metadata from db or from local cache
-     *
-     * @param string $db_table
-     * @return bool true if metadata could be fetched
-     */
-    public static function tableScheme($db_table)
-    {
-        if (self::$schemes === null) {
-            $cache = StudipCacheFactory::getCache();
-            self::$schemes = unserialize($cache->read('DB_TABLE_SCHEMES'));
-        }
-        if (!isset(self::$schemes[$db_table])) {
-            $db = DBManager::get()->query("SHOW COLUMNS FROM $db_table");
-            while($rs = $db->fetch(PDO::FETCH_ASSOC)){
-                $db_fields[strtolower($rs['Field'])] = [
-                    'name' => $rs['Field'],
-                    'null' => $rs['Null'],
-                    'default' => $rs['Default'],
-                    'type' => $rs['Type'],
-                    'extra' => $rs['Extra']
-                ];
-                if ($rs['Key'] == 'PRI'){
-                    $pk[] = strtolower($rs['Field']);
-                }
-            }
-            self::$schemes[$db_table]['db_fields'] = $db_fields;
-            self::$schemes[$db_table]['pk'] = $pk;
-            $cache = StudipCacheFactory::getCache();
-            $cache->write('DB_TABLE_SCHEMES', serialize(self::$schemes));
-        }
-        return isset(self::$schemes[$db_table]);
-    }
-
-    /**
-     * force reload of cached table metadata
-     * @return void
-     */
-    public static function expireTableScheme()
-    {
-        StudipCacheFactory::getCache()->expire('DB_TABLE_SCHEMES');
-        self::$schemes = null;
-        self::$config = [];
-    }
-
-    /**
-     * Returns new instance for given key when found in the database, else null.
-     *
-     * @param string $id primary key
-     * @return static|null
-     */
-    public static function find($id)
-    {
-        $ref = new ReflectionClass(static::class);
-        /** @var static $record */
-        $record = $ref->newInstanceArgs(func_get_args());
-        if (!$record->isNew()) {
-            return $record;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns true if given key exists in the database.
-     *
-     * @param string|array $id primary key
-     * @return boolean
-     */
-    public static function exists($id)
-    {
-        $ret = false;
-        $db_table = static::db_table();
-        $record = new static();
-        $record->setId(...func_get_args());
-        $where_query = $record->getWhereQuery();
-        if ($where_query) {
-            $query = "SELECT 1 FROM `$db_table` WHERE "
-                    . join(" AND ", $where_query);
-            $ret = (bool)DBManager::get()->query($query)->fetchColumn();
-        }
-        return $ret;
-    }
-
-    /**
-     * returns number of records
-     *
-     * @param ?string $sql sql clause to use on the right side of WHERE
-     * @param ?array $params params for query
-     * @return int
-     */
-    public static function countBySql($sql = '1', $params = [])
-    {
-        $db_table = static::db_table();
-        $db = DBManager::get();
-        $has_join = stripos($sql, 'JOIN ');
-        if ($has_join === false || $has_join > 10) {
-            $sql = 'WHERE ' . $sql;
-        }
-        $sql = "SELECT count(*) FROM `" .  $db_table . "` " . $sql;
-        $st = $db->prepare($sql);
-        $st->execute($params);
-        return (int)$st->fetchColumn();
-    }
-
-    /**
-     * creates new record with given data in db
-     * returns the new object or null
-     * @param array $data assoc array of record
-     * @return ?static
-     */
-    public static function create($data)
-    {
-        $record = new static();
-        $record->setData($data, false);
-        if ($record->store()) {
-            return $record;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * build object with given data
-     *
-     * @param array $data assoc array of record
-     * @param ?bool $is_new set object to new state
-     * @return static
-     */
-    public static function build($data, $is_new = true)
-    {
-        $record = new static();
-        $record->setData($data, !$is_new);
-        $record->setNew($is_new);
-        return $record;
-    }
-
-    /**
-     * build object with given data and mark it as existing
-     *
-     * @param array $data assoc array of record
-     * @return static
-     */
-    public static function buildExisting($data)
-    {
-        return static::build($data, false);
-    }
-
-    /**
-     * generate SimpleORMap object structure from assoc array
-     * if given array contains data of related objects in sub-arrays
-     * they are also generated. Existing records are updated, new records are created
-     * (but changes are not yet stored)
-     *
-     * @param array $data
-     * @return static
-     */
-    public static function import($data)
-    {
-        $record_data = [];
-        $relation_data = [];
-        foreach ($data as $key => $value) {
-            $temp = static::alias_fields()[$key] ?? $key;
-            if (isset(static::db_fields()[$temp])) {
-                $record_data[$key] = $value;
-            } else {
-                $relation_data[$key] = $value;
-            }
-        }
-        $record = static::toObject($record_data);
-        if (!$record instanceof static) {
-            $record = new static();
-            $record->setData($record_data, true);
-        } else {
-            $record->setData($record_data);
-        }
-        foreach ($relation_data as $relation => $data) {
-            if (!$record->isRelation($relation)) {
-                continue;
-            }
-
-            $options = $record->getRelationOptions($relation);
-            if ($options['type'] == 'has_one') {
-                $record->{$relation} = call_user_func([$options['class_name'], 'import'], $data);
-            }
-            if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
-                foreach ($data as $one) {
-                    $current = call_user_func([$options['class_name'], 'import'], $one);
-                    if ($options['type'] == 'has_many') {
-                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $record);
-                        call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
-                    }
-                    if ($current->id !== null) {
-                        $existing = $record->{$relation}->find($current->id);
-                        if ($existing) {
-                            $existing->setData($current);
-                        } else {
-                            $record->{$relation}->append($current);
-                        }
-                    } else {
-                        $record->{$relation}->append($current);
-                    }
-                }
-            }
-        }
-        return $record;
-    }
-
-    /**
-     * returns array of instances of given class filtered by given sql
-     * @param string $sql sql clause to use on the right side of WHERE
-     * @param ?array $params parameters for query
-     * @return static[] array of "self" objects
-     */
-    public static function findBySQL($sql, $params = [])
-    {
-        $db_table = static::db_table();
-
-        $has_join = stripos($sql, 'JOIN ');
-        if ($has_join === false || $has_join > 10) {
-            $sql = 'WHERE ' . $sql;
-        }
-        $sql = "SELECT `" . $db_table . "`.* FROM `" . $db_table . "` " . $sql;
-        $stmt = DBManager::get()->prepare($sql);
-        $stmt->execute($params);
-
-        $record = static::build([], false);
-
-        $ret = [];
-        do  {
-            $clone = clone $record;
-            $clone->setNew(false);
-            $stmt->setFetchMode(PDO::FETCH_INTO, $clone);
-
-            if ($clone = $stmt->fetch()) {
-                $clone->applyCallbacks('after_initialize');
-                $ret[] = $clone;
-            }
-        } while ($clone);
-        return $ret;
-    }
-
-    /**
-     * returns one instance of given class filtered by given sql
-     * only first row of query is used
-     * @param string $where sql clause to use on the right side of WHERE
-     * @param ?array $params parameters for query
-     * @return ?static
-     */
-    public static function findOneBySQL($where, $params = [])
-    {
-        if (stripos($where, 'LIMIT') === false) {
-            $where .= " LIMIT 1";
-        }
-        $found = static::findBySQL($where, $params);
-        return isset($found[0]) ? $found[0] : null;
-    }
-
-    /**
-     * find related records for a n:m relation (has_many_and_belongs_to_many)
-     * using a combination table holding the keys
-     *
-     * @param string $foreign_key_value value of foreign key to find related records
-     * @param array $options relation options from other side of relation
-     * @return static[] array of "self" objects
-     */
-    public static function findThru($foreign_key_value, $options)
-    {
-        $thru_table = $options['thru_table'];
-        $thru_key = $options['thru_key'];
-        $thru_assoc_key = $options['thru_assoc_key'];
-        $assoc_foreign_key = $options['assoc_foreign_key'];
-
-        $db_table = static::db_table();
-
-        $sql = "SELECT `$db_table`.* FROM `$thru_table`
-        INNER JOIN `$db_table` ON `$thru_table`.`$thru_assoc_key` = `$db_table`.`$assoc_foreign_key`
-        WHERE `$thru_table`.`$thru_key` = ? " . ($options['order_by'] ?? '');
-        $st = DBManager::get()->prepare($sql);
-        $st->execute([$foreign_key_value]);
-
-        $record = static::build([], false);
-
-        $ret = [];
-        do {
-            $clone = clone $record;
-            $clone->setNew(false);
-            $st->setFetchMode(PDO::FETCH_INTO, $clone);
-
-            if ($clone = $st->fetch()) {
-                $clone->applyCallbacks('after_initialize');
-                $ret[] = $clone;
-            }
-        } while ($clone);
-        return $ret;
-    }
-
-    /**
-     * passes objects for given sql through given callback
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param string $sql where clause of sql
-     * @param ?array $params sql statement parameters
-     * @return integer number of found records
-     */
-    public static function findEachBySQL($callable, $sql, $params = [])
-    {
-        $has_join = stripos($sql, 'JOIN ');
-        if ($has_join === false || $has_join > 10) {
-            $sql = "WHERE {$sql}";
-        }
-
-        $db_table = static::db_table();
-        $st = DBManager::get()->prepare("SELECT `{$db_table}`.* FROM `{$db_table}` {$sql}");
-        $st->execute($params);
-
-        // Indicate that we are performing a batch operation
-        static::$performs_batch_operation = true;
-
-        $record = static::build([], false);
-
-        $ret = 0;
-        do {
-            $clone = clone $record;
-            $clone->setNew(false);
-            $st->setFetchMode(PDO::FETCH_INTO, $clone);
-
-            if ($clone = $st->fetch()) {
-                $clone->applyCallbacks('after_initialize');
-                $callable($clone, $ret++);
-            }
-        } while ($clone);
-
-        // Reset batch operation indicator
-        static::$performs_batch_operation = false;
-
-        return $ret;
-    }
-
-    /**
-     * returns array of instances of given class for by given pks
-     * @param ?array $pks array of primary keys
-     * @param ?string $order order by clause
-     * @param ?array $order_params
-     * @return static[]
-     */
-    public static function findMany($pks = [], $order = '', $order_params = [])
-    {
-        $db_table = static::db_table();
-        $pk = static::pk();
-        $db = DBManager::get();
-        if (count($pk) > 1) {
-            throw new Exception('not implemented yet');
-        }
-        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
-        return static::findBySQL($where . $order, $order_params);
-    }
-
-    /**
-     * passes objects for by given pks through given callback
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param ?array $pks array of primary keys of called class
-     * @param ?string $order order by sql
-     * @param ?array $order_params
-     * @return integer number of found records
-     */
-    public static function findEachMany($callable, $pks = [], $order = '', $order_params = [])
-    {
-        $db_table = static::db_table();
-        $pk = static::pk();
-        $db = DBManager::get();
-        if (count($pk) > 1) {
-            throw new Exception('not implemented yet');
-        }
-        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
-        return static::findEachBySQL($callable, $where . $order, $order_params);
-    }
-
-    /**
-     * passes objects for given sql through given callback
-     * and returns an array of callback return values
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param string $where where clause of sql
-     * @param array $params sql statement parameters
-     * @return array return values of callback
-     */
-    public static function findAndMapBySQL($callable, $where, $params = [])
-    {
-        $ret = [];
-        $calleach = function($m) use (&$ret, $callable) {
-            $ret[] = $callable($m);
-        };
-        static::findEachBySQL($calleach, $where, $params);
-        return $ret;
-    }
-
-    /**
-     * passes objects for by given pks through given callback
-     * and returns an array of callback return values
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param ?array $pks array of primary keys of called class
-     * @param ?string $order order by sql
-     * @param ?array $order_params
-     * @return array return values of callback
-     */
-    public static function findAndMapMany($callable, $pks = [], $order = '', $order_params = [])
-    {
-        $ret = [];
-        $calleach = function($m) use (&$ret, $callable) {
-            $ret[] = $callable($m);
-        };
-        $db_table = static::db_table();
-        $pk = static::pk();
-        $db = DBManager::get();
-        if (count($pk) > 1) {
-            throw new Exception('not implemented yet');
-        }
-        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
-        static::findEachBySQL($calleach, $where . $order, $order_params);
-        return $ret;
-    }
-
-    /**
-     * deletes objects specified by sql clause
-     * @param string $where sql clause to use on the right side of WHERE
-     * @param ?array $params parameters for query
-     * @return integer number of deleted records
-     */
-    public static function deleteBySQL($where, $params = [])
-    {
-        $killeach = function($record) {$record->delete();};
-        return static::findEachBySQL($killeach, $where, $params);
-    }
-
-    /**
-     * returns object of given class for given id or null
-     * the param could be a string, an assoc array containing primary key field
-     * or an already matching object. In all these cases an object is returned
-     *
-     * @param string|static|array $id_or_object id as string, object or assoc array
-     * @return static
-     */
-    public static function toObject($id_or_object)
-    {
-        if ($id_or_object instanceof static) {
-            return $id_or_object;
-        }
-        if (is_array($id_or_object)) {
-            $pk = static::pk();
-            $key_values = [];
-            foreach ($pk as $key) {
-                if (array_key_exists($key, $id_or_object)) {
-                    $key_values[] = $id_or_object[$key];
-                }
-            }
-            if (count($pk) === count($key_values)) {
-                if (count($pk) === 1) {
-                    $id = $key_values[0];
-                } else {
-                    $id = $key_values;
-                }
-            } else {
-                $id = null;
-            }
-        } else {
-            $id = $id_or_object;
-        }
-        return static::find($id);
-    }
-
-    /**
-     * interceptor for static findByColumn / findEachByColumn / countByColumn /
-     * deleteByColumn magic
-     *
-     * @param string $name
-     * @param array $arguments
-     * @throws BadMethodCallException
-     * @return int|static|static[]
-     */
-    public static function __callStatic(string $name, array $arguments)
-    {
-        $db_table = static::db_table();
-        $alias_fields = static::alias_fields();
-        $db_fields = static::db_fields();
-        $name = strtolower($name);
-        $order = '';
-        $param_arr = [];
-        $where = '';
-        $where_param = is_array($arguments[0]) ? $arguments[0] : [$arguments[0]];
-        $action = strstr($name, 'by', true);
-        $field = substr($name, strlen($action) + 2);
-        switch ($action) {
-            case 'findone':
-                $order = $arguments[1] ?? '';
-                $param_arr[0] =& $where;
-                $param_arr[1] = [$where_param];
-                $method = 'findonebysql';
-                break;
-            case 'find':
-            case 'findmany':
-                $order = $arguments[1] ?? '';
-                $param_arr[0] =& $where;
-                $param_arr[1] = [$where_param];
-                $method = 'findbysql';
-                break;
-            case 'findeach':
-            case 'findeachmany':
-                $order = $arguments[2] ?? '';
-                $param_arr[0] = $arguments[0];
-                $param_arr[1] =& $where;
-                $param_arr[2] = [$arguments[1]];
-                $method = 'findeachbysql';
-                break;
-            case 'count':
-            case 'delete':
-                $param_arr[0] =& $where;
-                $param_arr[1] = [$where_param];
-                $method = "{$action}bysql";
-                break;
-            default:
-                throw new BadMethodCallException("Method " . static::class . "::$name not found");
-        }
-        if (isset($alias_fields[$field])) {
-            $field = $alias_fields[$field];
-        }
-        if (isset($db_fields[$field])) {
-            $where = "`$db_table`.`$field` IN(?) " . $order;
-            return call_user_func_array([static::class, $method], $param_arr);
-        }
-        throw new BadMethodCallException("Method " . static::class . "::$name not found");
-    }
-
-    /**
-     * constructor, give primary key of record as param to fetch
-     * corresponding record from db if available, if not preset primary key
-     * with given value. Give null to create new record
-     *
-     * @param null|int|string|array $id primary key of table
-     */
-    function __construct($id = null)
-    {
-        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            foreach (array_keys($this->$type()) as $one) {
-                $this->relations[$one] = null;
-            }
-        }
-
-        if ($id) {
-            $this->setId($id);
-        }
-        $this->restore();
-    }
-
-    /**
-     * returns internal used id value (multiple keys concatenated with _)
-     * @param mixed $field unused parameter
-     * @return ?string
-     */
-    protected function _getId($field)
-    {
-        return is_null($this->getId())
-             ? null
-             : implode(self::ID_SEPARATOR, $this->getId());
-    }
-
-    /**
-     * sets internal used id value (multiple keys concatenated with _)
-     * @param string $field Field to set (unused since it's always the id)
-     * @param string $value Value for id field
-     * @return bool
-     */
-    protected function _setId($field, $value)
-    {
-        return $this->setId(explode(self::ID_SEPARATOR, $value));
-    }
-
-    /**
-     * retrieves an additional field value from relation
-     *
-     * @param string $field
-     * @return mixed
-     */
-    protected function _getAdditionalValueFromRelation($field)
-    {
-        list($relation, $relation_field) = [$this->additional_fields()[$field]['relation'],
-                                                $this->additional_fields()[$field]['relation_field']];
-        if (!array_key_exists($field, $this->additional_data)) {
-            $this->_setAdditionalValue($field, $this->getRelationValue($relation, $relation_field));
-        }
-        return $this->additional_data[$field];
-    }
-
-    /**
-     * sets additional value in field imported from relation
-     *
-     * @param string $field
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function _setAdditionalValueFromRelation($field, $value)
-    {
-        list($relation, $relation_field) = [$this->additional_fields()[$field]['relation'],
-                $this->additional_fields()[$field]['relation_field']];
-        $this->$relation->$field = $value;
-        unset($this->additional_data[$field]);
-        return $this->_getAdditionalValueFromRelation($field);
-    }
-
-    /**
-     * @param string $field
-     * @return mixed
-     */
-    protected function _getAdditionalValue($field)
-    {
-        return $this->additional_data[$field];
-    }
-
-    /**
-     * @param string $field
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function _setAdditionalValue($field, $value)
-    {
-        return $this->additional_data[$field] = $value;
-    }
-
-    /**
-     * clean up references after cloning
-     * @return void
-     */
-    function __clone()
-    {
-        $this->setNew(true);
-        //all references link still to old object => reset all aliases
-        foreach ($this->alias_fields() as $alias => $field) {
-            if (isset($this->db_fields()[$field])) {
-                $content_value = $this->content[$field];
-                $content_db_value = $this->content_db[$field];
-                unset($this->content[$alias]);
-                unset($this->content_db[$alias]);
-                unset($this->content[$field]);
-                unset($this->content_db[$field]);
-                if (is_object($content_value)) {
-                    $this->content[$field] = clone $content_value;
-                } else {
-                    $this->content[$field] = $content_value;
-                }
-                if (is_object($content_db_value)) {
-                    $this->content_db[$field] = clone $content_db_value;
-                } else {
-                    $this->content_db[$field] = $content_db_value;
-                }
-            }
-        }
-        foreach ($this->alias_fields() as $alias => $field) {
-            if (isset($this->db_fields()[$field])) {
-                $this->content[$alias] =& $this->content[$field];
-                $this->content_db[$alias] =& $this->content_db[$field];
-            }
-        }
-        //unset all relations for now
-        //TODO: maybe a deep copy of all belonging objects is more appropriate
-        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            foreach (array_keys($this->$type()) as $one) {
-                $this->relations[$one] = null;
-            }
-        }
-        //begun the clone war has... hmpf
-    }
-
-    /**
-     * try to determine all needed options for a relationship from
-     * configured options
-     *
-     * @param string $type
-     * @param string $name
-     * @param array $options
-     * @throws Exception if options for thru_table could not be determined
-     * @return array
-     */
-    protected function parseRelationOptions($type, $name, $options)
-    {
-        if (empty($options['class_name'])) {
-            throw new Exception('Option class_name not set for relation ' . $name);
-        }
-        if (empty($options['assoc_foreign_key'])) {
-            if ($type === 'has_many' || $type === 'has_one') {
-                $options['assoc_foreign_key'] = $this->pk()[0];
-            } else if ($type === 'belongs_to') {
-                $options['assoc_foreign_key'] = 'id';
-            }
-        }
-        if ($type === 'has_and_belongs_to_many') {
-            $thru_table = $options['thru_table'];
-            if (empty($options['thru_key'])) {
-                $options['thru_key'] = $this->pk()[0];
-            }
-            if (empty($options['thru_assoc_key']) || empty($options['assoc_foreign_key'])) {
-                $class = $options['class_name'];
-                $record = new $class();
-                $meta = $record->getTableMetadata();
-                if (empty($options['thru_assoc_key'])) {
-                    $options['thru_assoc_key'] = $meta['pk'][0];
-                }
-                if (empty($options['assoc_foreign_key'])) {
-                    $options['assoc_foreign_key']= $meta['pk'][0];
-                }
-            }
-            static::tableScheme($thru_table);
-            if (is_array(self::$schemes[$thru_table])) {
-                $thru_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_key']]);
-                $thru_assoc_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_assoc_key']]);
-            }
-            if (!$thru_assoc_key_ok || !$thru_key_ok) {
-                throw new Exception("Could not determine keys for relation " . $name . " through table " . $thru_table);
-            }
-            if ($options['assoc_foreign_key'] instanceof Closure) {
-                throw new Exception("For relation " . $name . " assoc_foreign_key must be a name of a column");
-            }
-        }
-        if (empty($options['assoc_func'])) {
-            if ($type !== 'has_and_belongs_to_many') {
-                $options['assoc_func'] = $options['assoc_foreign_key'] === 'id' ? 'find' : 'findBy' . $options['assoc_foreign_key'];
-            } else {
-                $options['assoc_func'] = 'findThru';
-            }
-        }
-        if (empty($options['foreign_key'])) {
-            $options['foreign_key'] = 'id';
-        }
-        if (isset($options['foreign_key']) && $options['foreign_key'] instanceof Closure) {
-            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return call_user_func($options['foreign_key'], $record, $name, $options);};
-        } else {
-            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return $options['foreign_key'] === 'id' ? $record->getId() : $record->getValue($options['foreign_key']);};
-        }
-        if (isset($options['assoc_foreign_key']) && $options['assoc_foreign_key'] instanceof Closure) {
-            if ($type === 'belongs_to') {
-                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $name, $options, $that);};
-            } else {
-                $options['assoc_foreign_key_setter'] = function($record, $params) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $params, $name, $options);};
-            }
-        } elseif (!empty($options['assoc_foreign_key'])) {
-            if ($type === 'belongs_to') {
-                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return $record->getValue($options['assoc_foreign_key']);};
-            } else {
-                $options['assoc_foreign_key_setter'] = function($record, $value) use ($name, $options) { return $record->setValue($options['assoc_foreign_key'], $value);};
-            }
-        } else {
-            throw new Exception("Could not determine assoc_foreign_key for relation " . $name);
-        }
-        return $options;
-    }
-
-    /**
-     * returns array with option for given relation
-     * available options:
-     * 'type':                   relation type, on of 'has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'
-     * 'class_name':             name of class for related records
-     * 'foreign_key':            name of column with foreign key
-     *                           or callback to retrieve foreign key value
-     * 'assoc_foreign_key':      name of foreign key column in related class
-     * 'assoc_func':             name of static method to call on related class to find related records
-     * 'assoc_func_params_func': callback to retrieve params for assoc_func
-     * 'thru_table':             name of relation table for n:m relation
-     * 'thru_key':               name of column holding foreign key in relation table
-     * 'thru_assoc_key':         name of column holding foreign key from related class in relation table
-     * 'on_delete':              contains simply 'delete' to indicate that related records should be deleted
-     *                           or callback to invoke before record gets deleted
-     * 'on_store':               contains simply 'store' to indicate that related records should be stored
-     *                           or callback to invoke after record gets stored
-     *
-     * @param string $relation name of relation
-     * @return array assoc array containing options
-     */
-    function getRelationOptions($relation)
-    {
-        $options = [];
-        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            if (isset($this->$type()[$relation])) {
-                $options = self::$config[get_class($this)][$type][$relation];
-                if (!isset($options['type'])) {
-                    $options = $this->parseRelationOptions($type, $relation, $options, $this->db_table());
-                    $options['type'] = $type;
-                    self::$config[get_class($this)][$type][$relation] = $options;
-                }
-                break;
-            }
-        }
-        return $options;
-    }
-
-    /**
-     * returns table and columns metadata
-     *
-     * @return array assoc array with columns, primary keys and name of table
-     */
-    function getTableMetadata()
-    {
-        return ['fields' => $this->db_fields(),
-                     'pk' => $this->pk(),
-                     'table' => $this->db_table(),
-                     'additional_fields' => $this->additional_fields(),
-                     'alias_fields' => $this->alias_fields(),
-                     'relations' => array_keys($this->relations)];
-    }
-
-    /**
-     * returns true, if table has an auto_increment column
-     *
-     * @return boolean
-     */
-    function hasAutoIncrementColumn()
-    {
-        return $this->db_fields()[$this->pk()[0]]['extra'] == 'auto_increment';
-    }
-
-    /**
-     * set primary key for entry, combined keys must be passed as array
-     * @param int|string|array $id primary key
-     * @throws InvalidArgumentException if given key is not complete
-     * @return boolean
-     */
-    public function setId($id)
-    {
-        if (!is_array($id)){
-            $id = [$id];
-        }
-        if (count($this->pk()) != count($id)){
-            throw new InvalidArgumentException("Invalid ID, Primary Key {$this->db_table()} is " .join(",",$this->pk()));
-        } else {
-            foreach ($this->pk() as $count => $key){
-                $this->content[$key] = $id[$count];
-            }
-            return true;
-        }
-    }
-
-    /**
-     * returns primary key, multiple keys as array
-     * @return null|string|array current primary key, null if not set
-     */
-    function getId()
-    {
-        if (count($this->pk()) == 1) {
-            return $this->content[$this->pk()[0]] ?? null;
-        } else {
-            $id = [];
-            foreach ($this->pk() as $key) {
-                if (array_key_exists($key, $this->content)) {
-                    $id[] = $this->content[$key];
-                }
-            }
-            return (count($this->pk()) == count($id) ? $id : null);
-        }
-    }
-
-    /**
-     * create new unique pk as md5 hash
-     * if pk consists of multiple columns, false is returned
-     * @return boolean|string
-     */
-    function getNewId()
-    {
-        $id = false;
-        if (count($this->pk()) == 1) {
-            do {
-                $id = md5(uniqid($this->db_table(), 1));
-                $db = DBManager::get()->query("SELECT `{$this->pk()[0]}` FROM `{$this->db_table()}` "
-                . "WHERE `{$this->pk()[0]}` = '$id'");
-            } while($db->fetch());
-        }
-        return $id;
-    }
-
-    /**
-     * returns data of table row as assoc array
-     * pass array of fieldnames or ws separated string to limit
-     * fields
-     *
-     * @param null|array|string $only_these_fields limit returned fields
-     * @return array
-     */
-    function toArray($only_these_fields = null)
-    {
-        $ret = [];
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        $fields = array_diff($this->known_slots(), array_keys($this->relations));
-        if (is_array($only_these_fields)) {
-            $only_these_fields = array_filter(array_map(function($s) {
-                return is_string($s) ? strtolower($s) : null;
-            }, $only_these_fields));
-            $fields = array_intersect($only_these_fields, $fields);
-        }
-        foreach ($fields as $field) {
-            $ret[$field] = $this->getValue($field);
-            if ($ret[$field] instanceof StudipArrayObject) {
-                $ret[$field] = $ret[$field]->getArrayCopy();
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns data of table row as assoc array with raw contents like
-     * they are in the database.
-     * Pass array of fieldnames or ws separated string to limit
-     * fields.
-     *
-     * @param null|array|string $only_these_fields
-     * @return array
-     */
-    function toRawArray($only_these_fields = null)
-    {
-        $ret = [];
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        $fields = array_keys($this->db_fields());
-        if (is_array($only_these_fields)) {
-            $only_these_fields = array_filter(array_map(function ($s) {
-                return is_string($s) ? strtolower($s) : null;
-            }, $only_these_fields));
-            $fields = array_intersect($only_these_fields, $fields);
-        }
-        foreach ($fields as $field) {
-            if ($this->content[$field] instanceof I18NString) {
-                $ret[$field] = $this->content[$field]->original();
-            } elseif ($this->content[$field] === null) {
-                $ret[$field] = null;
-            } else {
-                $ret[$field] = (string)$this->content[$field];
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * returns data of table row as assoc array
-     * including related records with a 'has*' relationship
-     * recurses one level without param
-     *
-     * $only_these_fields limits output for relationships in this way:
-     * $only_these_fields = array('field_1',
-     *                            'field_2',
-     *                            'relation1',
-     *                            'relation2' => array('rel2_f1',
-     *                                                 'rel2_f2',
-     *                                                 'rel2_rel11' => array(
-     *                                                           rel2_rel1_f1)
-     *                                                )
-     *                           )
-     * Here all fields of relation1 will be returned.
-     *
-     * @param null|array|string $only_these_fields limit returned fields
-     * @return array
-     */
-    function toArrayRecursive($only_these_fields = null)
-    {
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        if (is_null($only_these_fields)) {
-            $only_these_fields = $this->known_slots();
-        }
-        $ret = $this->toArray($only_these_fields);
-        $relations = [];
-        if (is_array($only_these_fields)) {
-            foreach ($only_these_fields as $key => $value) {
-                if (!is_array($value) &&
-                    array_key_exists(strtolower($value), $this->relations)
-                ) {
-                    $relations[strtolower($value)] = 0; //not null|array|string to stop recursion
-                }
-                if (array_key_exists(strtolower($key), $this->relations)) {
-                    $relations[strtolower($key)] = $value;
-                }
-            }
-        }
-        if (count($relations)) {
-            foreach ($relations as $relation_name => $relation_only_these_fields) {
-                $options = $this->getRelationOptions($relation_name);
-                if ($options['type'] === 'has_one' ||
-                        $options['type'] === 'belongs_to') {
-                    $ret[$relation_name] =
-                            $this->{$relation_name}->
-                                            toArrayRecursive($relation_only_these_fields);
-                }
-                if ($options['type'] === 'has_many' ||
-                    $options['type'] === 'has_and_belongs_to_many') {
-                    $ret[$relation_name] =
-                            $this->{$relation_name}->
-                                            sendMessage('toArrayRecursive',
-                                            [$relation_only_these_fields]);
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * returns value of a column
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if getter for additional field could not be found
-     * @param string $field
-     * @return null|string|SimpleORMapCollection
-     */
-    public function getValue($field)
-    {
-        $field = strtolower($field);
-
-        // No value defined, throw exception
-        if (!in_array($field, $this->known_slots())) {
-            throw new InvalidArgumentException(static::class . '::'.$field . ' not found.');
-        }
-
-        // Get value by getter
-        if (isset($this->getter_setter_map()[$field]['get'])) {
-            return call_user_func([$this, $this->getter_setter_map()[$field]['get']]);
-        }
-
-        // Get value from content
-        if (array_key_exists($field, $this->content)) {
-            return $this->content[$field];
-        }
-
-        // Get value from relation
-        if (array_key_exists($field, $this->relations)) {
-            $this->initRelation($field);
-            return $this->relations[$field];
-        }
-
-        // Get value from additional_field
-        if (isset($this->additional_fields()[$field]['get'])) {
-            // Getter is defined as a closure
-            if ($this->additional_fields()[$field]['get'] instanceof Closure) {
-                return call_user_func_array($this->additional_fields()[$field]['get'], [$this, $field]);
-            }
-
-            // Getter is defined as a method of this object
-            return call_user_func([$this, $this->additional_fields()[$field]['get']], $field);
-        }
-
-        // No value found, throw exception
-        throw new RuntimeException('No value could be found for ' . static::class . '::' . $field);
-    }
-
-    /**
-     * gets a value from a related object
-     * only possible, if the relation has cardinality 1
-     * e.g. 'has_one' or 'belongs_to'
-     *
-     * @param string $relation name of relation
-     * @param string $field name of column
-     * @throws InvalidArgumentException if no relation with given name is found
-     * @return mixed the value from the related object
-     */
-    function getRelationValue($relation, $field)
-    {
-        $field = strtolower($field);
-        $options = $this->getRelationOptions($relation);
-        if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
-            return $this->{$relation}->{$field} ?? null;
-        } else {
-            throw new InvalidArgumentException('Relation ' . $relation . ' not found or not applicable.');
-        }
-    }
-
-    /**
-     * returns default value for column
-     *
-     * @param string $field name of column
-     * @return mixed the default value
-     */
-     function getDefaultValue($field)
-     {
-         $default_value = null;
-         if (!isset($this->default_values()[$field])) {
-             if (!in_array($field, $this->pk())) {
-                 $meta = $this->db_fields()[$field];
-                 if (isset($meta['default'])) {
-                     $default_value = $meta['default'];
-                 } elseif ($meta['null'] == 'NO') {
-                     if (strpos($meta['type'], 'text') !== false || strpos($meta['type'], 'char') !== false) {
-                         $default_value = '';
-                     }
-                     if (strpos($meta['type'], 'int') !== false) {
-                         $default_value = '0';
-                     }
-                 }
-             }
-         } else {
-             $default_value = $this->default_values()[$field];
-         }
-         return $default_value;
-     }
-
-    /**
-     * sets value of a column
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if setter for additional field could not be found
-     * @param string $field
-     * @param mixed $value
-     * @return string
-     */
-     function setValue($field, $value)
-     {
-         $field = strtolower($field);
-         $ret = false;
-         if (in_array($field, $this->known_slots())) {
-             if (isset($this->getter_setter_map()[$field]['set'])) {
-                 return call_user_func([$this, $this->getter_setter_map()[$field]['set']], $value);
-             }
-             if (array_key_exists($field, $this->content)) {
-                 if (array_key_exists($field, $this->serialized_fields())) {
-                     $ret = $this->setSerializedValue($field, $value);
-                 } elseif ($this->isI18nField($field)) {
-                         $ret = $this->setI18nValue($field, $value);
-                 } else {
-                     $ret = ($this->content[$field] = $value);
-                 }
-             } elseif (isset($this->additional_fields()[$field]['set'])) {
-                 if ($this->additional_fields()[$field]['set'] instanceof Closure) {
-                     return call_user_func_array($this->additional_fields()[$field]['set'], [$this, $field, $value]);
-                 } else {
-                     return call_user_func([$this, $this->additional_fields()[$field]['set']], $field, $value);
-                 }
-             } elseif (array_key_exists($field, $this->relations)) {
-                 $options = $this->getRelationOptions($field);
-                 if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
-                     if (is_a($value, $options['class_name'])) {
-                         $this->relations[$field] = $value;
-                         if ($options['type'] == 'has_one') {
-                             $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                             call_user_func($options['assoc_foreign_key_setter'], $value, $foreign_key_value);
-                         } else {
-                             $assoc_foreign_key_value = call_user_func($options['assoc_foreign_key_getter'], $value, $this);
-                             if ($assoc_foreign_key_value === null) {
-                                 throw new InvalidArgumentException(sprintf('trying to set belongs_to object of type: %s, but assoc_foreign_key: %s is null', get_class($value), $options['assoc_foreign_key']));
-                             }
-                             $this->setValue($options['foreign_key'], $assoc_foreign_key_value);
-                         }
-                     } else {
-                         throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
-                     }
-                 }
-                 if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
-                     if (is_array($value) || $value instanceof Traversable) {
-                         $new_ids = [];
-                         $old_ids = $this->{$field}->pluck('id');
-                         foreach ($value as $current) {
-                             if (!is_a($current, $options['class_name'])) {
-                                 throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
-                             }
-                             if ($options['type'] == 'has_many') {
-                                 $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                                 call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
-                             }
-                             if ($current->id !== null) {
-                                 $new_ids[] = $current->id;
-                                 $existing = $this->{$field}->find($current->id);
-                                 if ($existing) {
-                                     $existing->setData($current);
-                                 } else {
-                                     $this->{$field}->append($current);
-                                 }
-                             } else {
-                                 $this->{$field}->append($current);
-                             }
-                         }
-                         foreach (array_diff($old_ids, $new_ids) as $to_delete) {
-                             $this->{$field}->unsetByPK($to_delete);
-                         }
-                     } else {
-                         throw new InvalidArgumentException(sprintf('relation %s expects collection or array of objects of type: %s', $field, $options['class_name']));
-                     }
-                 }
-             }
-         } else {
-             throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
-         }
-         return $ret;
-     }
-
-    /**
-     * magic method for dynamic properties
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if getter for additional field could not be found
-     * @param string $field the column or additional field
-     * @return null|string|SimpleORMapCollection
-     */
-    function __get($field)
-    {
-        return $this->getValue($field);
-    }
-    /**
-     * magic method for dynamic properties
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if setter for additional field could not be found
-     * @param string $field
-     * @param string $value
-     * @return string
-     */
-    function __set($field, $value)
-    {
-        return $this->setValue($field, $value);
-    }
-    /**
-     * magic method for dynamic properties
-     *
-     * @param string $field
-     * @return bool
-     */
-    function __isset($field)
-    {
-        $field = strtolower($field);
-        if (in_array($field, $this->known_slots())) {
-            $value = $this->getValue($field);
-            return $value instanceOf SimpleORMapCollection ? (bool)count($value) : !is_null($value);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * ArrayAccess: Check whether the given offset exists.
-     *
-     * @param string $offset
-     */
-    public function offsetExists($offset): bool
-    {
-        return $this->__isset($offset);
-    }
-
-    /**
-     * ArrayAccess: Get the value at the given offset.
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if getter for additional field could not be found
-     * @param string $offset the column or additional field
-     * @return null|string|SimpleORMapCollection
-     */
-    public function offsetGet($offset): mixed
-    {
-        return $this->getValue($offset);
-    }
-
-    /**
-     * ArrayAccess: Set the value at the given offset.
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if setter for additional field could not be found
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value): void
-    {
-        $this->setValue($offset, $value);
-    }
-
-    /**
-     * ArrayAccess: unset the value at the given offset (not applicable)
-     *
-     * @param string $offset
-     */
-    public function offsetUnset($offset): void
-    {
-
-    }
-
-    /**
-     * IteratorAggregate
-     */
-    public function getIterator(): ArrayIterator
-    {
-        return new ArrayIterator($this->toArray());
-    }
-
-    /**
-     * Countable
-     */
-    public function count(): int
-    {
-        return count($this->known_slots()) - count($this->relations);
-    }
-
-    /**
-     * check if given column exists in table
-     * @param string $field
-     * @return boolean
-     */
-    function isField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->db_fields()[$field]);
-    }
-
-    /**
-     * check if given relation exists in this class
-     * @param string $field
-     * @return boolean
-     */
-    function isRelation($field)
-    {
-        $field = strtolower($field);
-        return array_key_exists($field, $this->relations);
-    }
-
-    /**
-     * check if given column is additional
-     * @param string $field
-     * @return boolean
-     */
-    function isAdditionalField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->additional_fields()[$field]);
-    }
-
-    /**
-     * check if given column is an alias
-     * @param string $field
-     * @return boolean
-     */
-    function isAliasField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->alias_fields()[$field]);
-    }
-
-    /**
-     * check if given column is a multi-language field
-     * @param string $field
-     * @return boolean
-     */
-    function isI18nField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->i18n_fields()[$field]);
-    }
-
-    /**
-     * set multiple column values
-     * if second param is set, existing data in object will be
-     * discarded and dirty state is cleared,
-     * else new data overrides old data
-     *
-     * @param ?iterable $data assoc array
-     * @param ?boolean $reset existing data in object will be discarded
-     * @return int|bool number of columns changed
-     */
-    function setData($data, $reset = false)
-    {
-        $count = 0;
-        if ($reset) {
-            if ($this->applyCallbacks('before_initialize') === false) {
-                return false;
-            }
-            $this->initializeContent();
-        }
-        if (is_iterable($data)) {
-            foreach($data as $key => $value) {
-                $key = strtolower($key);
-                if (isset($this->db_fields()[$key])
-                    || isset($this->alias_fields()[$key])
-                    || isset($this->additional_fields()[$key]['set'])
-                ) {
-                    $this->setValue($key, $value);
-                    ++$count;
-                }
-            }
-        }
-        if ($reset) {
-            $this->applyCallbacks('after_initialize');
-        }
-        return $count;
-    }
-
-    /**
-     * check if object exists in database
-     * @return boolean
-     */
-    function isNew()
-    {
-        return $this->is_new;
-    }
-
-    /**
-     * check if object was deleted
-     *
-     * @return boolean
-     */
-    function isDeleted()
-    {
-        return $this->is_deleted;
-    }
-
-    /**
-     * set object to new state
-     * @param boolean $is_new
-     * @return boolean
-     */
-    function setNew($is_new)
-    {
-        return $this->is_new = $is_new;
-    }
-
-    /**
-     * returns sql clause with current table and pk
-     * @throws UnexpectedValueException if the primary key is incomplete
-     * @return boolean|array<string>
-     */
-    function getWhereQuery()
-    {
-        $where_query = null;
-        $pk_not_set = [];
-        foreach ($this->pk() as $key) {
-            $pk = $this->content_db[$key] ?? $this->content[$key] ?? null;
-            if (isset($pk)) {
-                $where_query[] = "`{$this->db_table()}`.`{$key}` = "  . DBManager::get()->quote($pk);
-            } else {
-                $pk_not_set[] = $key;
-            }
-        }
-        if (!$where_query || count($pk_not_set)){
-            if ($this->isNew()) {
-                return false;
-            } else {
-                throw new UnexpectedValueException(sprintf("primary key incomplete: %s must not be null", join(',',$pk_not_set)));
-            }
-        }
-        return $where_query;
-    }
-
-    /**
-     * restore entry from database
-     * @return boolean
-     */
-    function restore()
-    {
-        $where_query = $this->getWhereQuery();
-        $id = $this->getId();
-        if ($where_query) {
-            if ($this->applyCallbacks('before_initialize') === false) {
-                return false;
-            }
-            $this->initializeContent();
-            $query = "SELECT * FROM `{$this->db_table()}` WHERE "
-                    . join(" AND ", $where_query);
-            $st = DBManager::get()->prepare($query);
-            $st->execute();
-            $st->setFetchMode(PDO::FETCH_INTO , $this);
-            if ($st->fetch()) {
-                $this->setNew(false);
-                $this->applyCallbacks('after_initialize');
-                return true;
-            }
-        }
-        $this->setData([], true);
-        $this->setNew(true);
-        if (isset($id)) {
-            $this->setId($id);
-        }
-        return false;
-    }
-
-    /**
-     * store entry in database
-     *
-     * @throws UnexpectedValueException if there are forbidden NULL values
-     * @return number|boolean
-     */
-    function store()
-    {
-        // Set id or prepare setting of id
-        if ($this->isNew() && $this->getId() === null) {
-            // Explicitly set id to 0 if auto increment pk is null
-            if ($this->hasAutoIncrementColumn()) {
-                $this->setId(0);
-            } else {
-                $this->setId($this->getNewId());
-            }
-        }
-
-        if ($this->applyCallbacks('before_store') === false) {
-            return false;
-        }
-
-        $ret = 0;
-
-        if (!$this->isDeleted() && ($this->isDirty() || $this->isNew())) {
-            $callback = $this->isNew() ? 'before_create' : 'before_update';
-            if ($this->applyCallbacks($callback) === false) {
-                return false;
-            }
-
-            // Collect i18n contents
-            $i18ncontent = [];
-            foreach (array_keys($this->i18n_fields()) as $field) {
-                if ($this->content[$field] instanceof I18NString) {
-                    $i18ncontent[$field] = $this->content[$field];
-                    $this->content[$field] = $this->content[$field]->original();
-                    $this->content_db[$field] = $this->content_db[$field]->original();
-                }
-            }
-
-            // Create sql data assignment chunks
-            foreach ($this->db_fields() as $field => $meta) {
-                $value = $this->content[$field];
-                if ($field == 'chdate' && !$this->isFieldDirty($field) && $this->isDirty()) {
-                    $value = time();
-                }
-                if ($field == 'mkdate') {
-                    if ($this->isNew()) {
-                        if (!$this->isFieldDirty($field)) {
-                            $value = time();
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-                if ($value === null && $meta['null'] == 'NO') {
-                    throw new UnexpectedValueException($this->db_table() . '.' . $field . ' must not be null.');
-                }
-                if (is_float($value)) {
-                    $value = str_replace(',', '.', $value);
-                }
-                $this->content[$field] = $value;
-                $query_part[] = "`$field` = " . DBManager::get()->quote($value) . " ";
-            }
-
-            // Create store query
-            if (!$this->isNew()) {
-                $where_query = $this->getWhereQuery();
-                $query = "UPDATE `{$this->db_table()}` SET "
-                    . implode(',', $query_part);
-                $query .= " WHERE " . join(" AND ", $where_query);
-            } else {
-                $query = "INSERT INTO `{$this->db_table()}` SET "
-                    . implode(',', $query_part);
-            }
-            $ret = DBManager::get()->exec($query);
-
-            // Retrieve generated id from database if pk is an auto increment
-            // column
-            if ($this->isNew()) {
-                if ($this->hasAutoIncrementColumn() && !$this->getId()) {
-                    $this->setId(DBManager::get()->lastInsertId());
-                }
-            }
-
-            // Store i18n contents
-            foreach ($i18ncontent as $field => $one) {
-                $meta = [
-                    'object_id' => $this->getId(),
-                    'table'     => $this->db_table(),
-                    'field'     => $field
-                ];
-                $one->setMetadata($meta);
-                $one->storeTranslations();
-                if (!$this->content[$field] instanceof I18NString) {
-                    $this->content[$field] = $one;
-                    $this->content_db[$field] = clone $one;
-                }
-            }
-
-            // Apply callbacks
-            $this->applyCallbacks($this->isNew() ? 'after_create' : 'after_update');
-        }
-        $rel_ret = $this->storeRelations();
-
-        $this->applyCallbacks('after_store');
-
-        if ($ret || $rel_ret) {
-            $this->restore();
-        }
-        return $ret + $rel_ret;
-    }
-
-    /**
-     * sends a store message to all initialized related objects
-     * if a relation has a callback for 'on_store' configured, the callback
-     * is instead invoked
-     *
-     * @param null|array|string $only_these
-     * @return int|false number addition of all return values, false if none was called
-     */
-    protected function storeRelations($only_these = null)
-    {
-        $ret = false;
-        if (is_string($only_these)) {
-            $only_these = words($only_these);
-        }
-        $relations = array_keys($this->relations);
-        if (is_array($only_these)) {
-            $only_these = array_filter(array_map(function ($s) {
-                return is_string($s) ? strtolower($s) : null;
-            }, $only_these));
-            $relations = array_intersect($only_these, $relations);
-        }
-        foreach ($relations as $relation) {
-            $options = $this->getRelationOptions($relation);
-            if (isset($options['on_store']) &&
-            ($options['type'] === 'has_one' ||
-            $options['type'] === 'has_many' ||
-            $options['type'] === 'has_and_belongs_to_many')) {
-                if ($options['on_store'] instanceof Closure) {
-                    $ret += call_user_func($options['on_store'], $this, $relation);
-                } elseif (isset($this->relations[$relation])) {
-                    $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                    if ($options['type'] === 'has_one') {
-                        call_user_func($options['assoc_foreign_key_setter'], $this->{$relation}, $foreign_key_value);
-                        $ret = call_user_func([$this->{$relation}, 'store']);
-                    } elseif ($options['type'] === 'has_many') {
-                        foreach ($this->{$relation} as $r) {
-                            call_user_func($options['assoc_foreign_key_setter'], $r, $foreign_key_value);
-                        }
-                        $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'store'));
-                        $ret += array_sum(call_user_func([$this->{$relation}->getDeleted(), 'sendMessage'], 'delete'));
-                    } else {
-                        call_user_func([$this->{$relation}, 'sendMessage'], 'store');
-                        $to_delete = array_filter($this->{$relation}->getDeleted()->pluck($options['assoc_foreign_key']));
-                        $to_insert = array_filter($this->{$relation}->pluck($options['assoc_foreign_key']));
-                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ? AND `" . $options['thru_assoc_key'] . "` = ?";
-                        $st = DBManager::get()->prepare($sql);
-                        foreach ($to_delete as $one_value) {
-                            $st->execute([$foreign_key_value, $one_value]);
-                            $ret += $st->rowCount();
-                        }
-                        $sql = "INSERT IGNORE INTO `" . $options['thru_table'] ."` SET `" . $options['thru_key'] ."` = ?, `" . $options['thru_assoc_key'] . "` = ?";
-                        $st = DBManager::get()->prepare($sql);
-                        foreach ($to_insert as $one_value) {
-                            $st->execute([$foreign_key_value, $one_value]);
-                            $ret += $st->rowCount();
-                        }
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * set chdate column to current timestamp
-     * @return boolean
-     */
-    function triggerChdate()
-    {
-        if ($this->db_fields()['chdate']) {
-            $this->content['chdate'] = time();
-            if ($where_query = $this->getWhereQuery()) {
-                DBManager::get()->exec("UPDATE `{$this->db_table()}` SET chdate={$this->content['chdate']}
-                            WHERE ". join(" AND ", $where_query));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * delete entry from database
-     * the object is cleared, but is not(!) turned to new state
-     * @return bool|int number of deleted rows
-     */
-    function delete()
-    {
-        $ret = false;
-        if (!$this->isDeleted() && !$this->isNew()) {
-            if ($this->applyCallbacks('before_delete') === false) {
-                return false;
-            }
-            $ret = $this->deleteRelations();
-            $where_query = $this->getWhereQuery();
-            if ($where_query) {
-                $query = "DELETE FROM `{$this->db_table()}` WHERE "
-                        . join(" AND ", $where_query);
-                $ret += DBManager::get()->exec($query);
-            }
-            $this->is_deleted = true;
-            $this->applyCallbacks('after_delete');
-
-            // Remove i18n translations
-            if (I18N::isEnabled()) {
-                foreach (array_keys($this->i18n_fields()) as $field) {
-                    if ($this->content[$field] instanceof I18NString) {
-                        $this->content[$field]->removeTranslations();
-                    }
-                }
-            }
-        }
-        $this->setData([], true);
-        return $ret;
-    }
-
-    /**
-     * sends a delete message to all related objects
-     * if a relation has a callback for 'on_delete' configured, the callback
-     * is invoked instead
-     *
-     * @return bool|int addition of all return values, false if none was called
-     */
-    protected function deleteRelations()
-    {
-        $ret = false;
-        foreach (array_keys($this->relations) as $relation) {
-            $options = $this->getRelationOptions($relation);
-            if (isset($options['on_delete']) &&
-                ($options['type'] === 'has_one' ||
-                $options['type'] === 'has_many' ||
-                $options['type'] === 'has_and_belongs_to_many')) {
-                if ($options['on_delete'] instanceof Closure) {
-                    $ret += call_user_func($options['on_delete'], $this, $relation);
-                } else {
-                    if ($options['type'] === 'has_one' || $options['type'] === 'has_many') {
-                        $this->initRelation($relation);
-                        if (isset($this->relations[$relation])) {
-                            if ($options['type'] === 'has_one') {
-                                $ret += call_user_func([$this->{$relation}, 'delete']);
-                            } elseif ($options['type'] === 'has_many') {
-                                $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'delete'));
-                            }
-                        }
-                    } else {
-                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ?";
-                        $st = DBManager::get()->prepare($sql);
-                        $st->execute([$foreign_key_value]);
-                        $ret += $st->rowCount();
-                    }
-                }
-                $this->relations[$relation] = null;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * init internal content arrays with nulls or defaults
-     *
-     * @throws UnexpectedValueException if there is an unmatched alias
-     * @return void
-     */
-    protected function initializeContent()
-    {
-        $this->content = [];
-        foreach (array_keys($this->db_fields()) as $field) {
-            $this->content[$field] = null;
-            $this->content_db[$field] = null;
-            $this->setValue($field, $this->getDefaultValue($field));
-        }
-        foreach ($this->alias_fields() as $alias => $field) {
-            if (isset($this->db_fields()[$field])) {
-                $this->content[$alias] =& $this->content[$field];
-                $this->content_db[$alias] =& $this->content_db[$field];
-            } else {
-                throw new UnexpectedValueException(sprintf('Column %s not found for alias %s', $field, $alias));
-            }
-        }
-        foreach (array_keys($this->relations) as $one) {
-            $this->relations[$one] = null;
-        }
-        $this->additional_data = [];
-    }
-
-    /**
-     * checks if at least one field was modified since last restore
-     *
-     * @return boolean
-     */
-    public function isDirty()
-    {
-        foreach (array_keys($this->db_fields()) as $field) {
-            if ($this->isFieldDirty($field)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * checks if given field was modified since last restore
-     *
-     * @param string $field
-     * @return boolean
-     */
-    public function isFieldDirty($field)
-    {
-        $field = strtolower($field);
-        if ($this->content[$field] === null || $this->content_db[$field] === null) {
-            return $this->content[$field] !== $this->content_db[$field];
-        } else if ($this->content[$field] instanceof I18NString || $this->content_db[$field] instanceof I18NString) {
-            return $this->content[$field] != $this->content_db[$field];
-        } else {
-            return (string)$this->content[$field] !== (string)$this->content_db[$field];
-        }
-    }
-
-    /**
-     * reverts value of given field to last restored value
-     *
-     * @param string $field
-     * @return mixed the restored value
-     */
-    public function revertValue($field)
-    {
-        $field = strtolower($field);
-        return ($this->content[$field] = $this->content_db[$field]);
-    }
-
-    /**
-     * returns unmodified value of given field
-     *
-     * @param string $field
-     * @throws InvalidArgumentException
-     * @return mixed
-     */
-    public function getPristineValue($field)
-    {
-        $field = strtolower($field);
-        if (array_key_exists($field, $this->content_db)) {
-            return $this->content_db[$field];
-        } else {
-            throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
-        }
-    }
-
-    /**
-     * intitalize a relationship and get related record(s)
-     *
-     * @param string $relation name of relation
-     * @throws InvalidArgumentException if the relation does not exists
-     * @return void
-     */
-    public function initRelation($relation)
-    {
-        if (!array_key_exists($relation, $this->relations)) {
-            throw new InvalidArgumentException('Unknown relation: ' . $relation);
-        }
-        if ($this->relations[$relation] === null) {
-            $options = $this->getRelationOptions($relation);
-            $to_call = [$options['class_name'], $options['assoc_func']];
-            if (!is_callable($to_call)) {
-                throw new RuntimeException('assoc_func: ' . join('::', $to_call) . ' is not callable.' );
-            }
-            $params = $options['assoc_func_params_func'];
-            if ($options['type'] === 'has_many') {
-                $records = function($record) use ($to_call, $params, $options) {
-                    $p = (array)$params($record);
-                    return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options['order_by'] ?? null]));
-                };
-                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
-            } elseif ($options['type'] === 'has_and_belongs_to_many') {
-                $records = function($record) use ($to_call, $params, $options) {$p = (array)$params($record); return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options]));};
-                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
-            } else {
-                $p = (array)$params($this);
-                $records = call_user_func_array($to_call, count($p) ? $p : [null]);
-                $result = is_array($records) ? ($records[0] ?? null) : $records;
-                $this->relations[$relation] = $result;
-            }
-        }
-    }
-
-    /**
-     * clear data for a relationship
-     *
-     * @param string $relation name of relation
-     * @throws InvalidArgumentException if teh relation does not exists
-     * @return void
-     */
-    public function resetRelation($relation)
-    {
-        if (!array_key_exists($relation, $this->relations)) {
-            throw new InvalidArgumentException('Unknown relation: ' . $relation);
-        }
-        $this->relations[$relation] = null;
-    }
-
-    /**
-     * invoke registered callbacks for given type
-     * if one callback returns false the following will not
-     * be invoked
-     *
-     * @param string $type type of callback
-     * @return bool return value from last callback
-     */
-    protected function applyCallbacks($type)
-    {
-        $ok = true;
-        foreach ($this->registered_callbacks()[$type] as $cb) {
-            if ($cb instanceof Closure) {
-                $function =  $cb;
-                $params = [$this, $type, $cb];
-            } else {
-                $function = [$this, $cb];
-                $params = [$type];
-            };
-            $ok = call_user_func_array($function, $params);
-            if ($ok === false) {
-                break;
-            }
-        }
-        return $ok;
-    }
-
-    /**
-     * register given callback for one or many possible callback types
-     * callback param could be a closure or method name of current class
-     *
-     * @param string|array $types types to register callback for
-     * @param callable $cb callback
-     * @throws InvalidArgumentException if the callback type is not known
-     * @return number of registered callbacks
-     */
-    protected static function registerCallback($types, $cb)
-    {
-        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
-
-        $types = is_array($types) ? $types : words($types);
-        $reg = 0;
-        foreach ($types as $type) {
-            if (isset(static::registered_callbacks()[$type])) {
-                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
-                if ($found === false) {
-                    self::$config[static::class]['registered_callbacks'][$type][] = $cb;
-                    $reg++;
-                }
-            } else {
-                throw new InvalidArgumentException('Unknown callback type: ' . $type);
-            }
-        }
-        return $reg;
-    }
-
-    /**
-     * unregister given callback for one or many possible callback types
-     *
-     * @param string|array $types types to unregister callback for
-     * @param mixed $cb
-     * @throws InvalidArgumentException if the callback type is not known
-     * @return number of unregistered callbacks
-     */
-    protected static function unregisterCallback($types, $cb)
-    {
-        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
-
-        $types = is_array($types) ? $types : words($types);
-        foreach ($types as $type) {
-            if (isset(static::registered_callbacks()[$type])) {
-                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
-                if ($found !== false) {
-                    $unreg++;
-                    unset(self::$config[static::class]['registered_callbacks'][$type][$found]);
-                }
-            } else {
-                throw new InvalidArgumentException('Unknown callback type: ' . $type);
-            }
-        }
-        return $unreg;
-    }
-
-    /**
-     * default callback used to map specific callbacks to NotificationCenter
-     *
-     * @param string $cb_type callback type
-     * @return void|boolean
-     */
-    protected function cbNotificationMapper($cb_type)
-    {
-        if (isset($this->notification_map()[$cb_type])) {
-            try {
-                foreach(words($this->notification_map()[$cb_type]) as $notification) {
-                    NotificationCenter::postNotification($notification, $this);
-                }
-            } catch (NotificationVetoException $e) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * default callback used to map specific callbacks to NotificationCenter
-     *
-     * @param string $cb_type callback type
-     * @return void|boolean
-     */
-    protected function cbAfterInitialize($cb_type)
-    {
-        foreach (array_keys($this->db_fields()) as $field) {
-            if (is_object($this->content[$field])) {
-                $this->content_db[$field] = clone $this->content[$field];
-            } else {
-                $this->content_db[$field] = $this->content[$field];
-            }
-        }
-    }
-
-    /**
-     * default setter used to proxy serialized fields with
-     * ArrayObjects
-     *
-     * @param string $field column name
-     * @param mixed $value value
-     * @return mixed
-     */
-     protected function setSerializedValue($field, $value)
-     {
-         $object_type = $this->serialized_fields()[$field];
-         if (is_null($value) || $value instanceof $object_type) {
-             $this->content[$field] = $value;
-         } else {
-             $this->content[$field] = new $object_type($value);
-         }
-         return $this->content[$field];
-     }
-
-    /**
-     * default setter used to proxy I18N fields with
-     * I18NString
-     *
-     * @param string $field column name
-     * @param mixed $value value
-     * @return mixed
-     */
-    protected function setI18nValue($field, $value)
-    {
-        $meta = ['object_id' => $this->getId(),
-                 'table'     => $this->db_table(),
-                 'field'     => $field];
-        if ($value instanceof I18NString) {
-            $value->setMetadata($meta);
-            $this->content[$field] = $value;
-        } else {
-            $this->content[$field] = new I18NString($value, null, $meta);
-        }
-        return $this->content[$field];
-    }
-
-     /**
-      * Cleans up this object. This essentially reset all relations of
-      * this object and marks them as unused so that the garbage collector may
-      * remove the objects.
-      *
-      * Use this function when you ran into memory problems and need to free
-      * some memory;
-      *
-      * @return void
-      */
-     public function cleanup()
-     {
-         foreach ($this->relations as $relation => $object) {
-             if ($object instanceof SimpleORMap || $object instanceof SimpleORMapCollection) {
-                 $this->relations[$relation]->cleanup();
-             }
-             $this->resetRelation($relation);
-         }
-     }
-}
diff --git a/lib/models/SimpleORMapCollection.class.php b/lib/models/SimpleORMapCollection.class.php
deleted file mode 100644
index 7debb80..0000000
--- a/lib/models/SimpleORMapCollection.class.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- * SimpleORMapCollection.class.php
- * simple object-relational mapping
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @extends SimpleCollection<SimpleORMap>
- *
- * @template T of SimpleORMap
- */
-class SimpleORMapCollection extends SimpleCollection
-{
-    /**
-     * @var int Exception error code denoting a wrong type of objects.
-     */
-    const WRONG_OBJECT_TYPE = 1;
-
-    /**
-     * @var int Exception error code denoting that an object of this `id` already exists.
-     */
-    const OBJECT_EXISTS = 2;
-
-    /**
-     * the record object this collection belongs to
-     *
-     * @var ?SimpleORMap
-     */
-    protected $related_record;
-
-    /**
-     * relation options
-     * @var array
-     */
-    protected $relation_options = [];
-
-    /**
-     * creates a collection from an array of objects
-     * all objects should be of the same type
-     *
-     * @throws InvalidArgumentException if first entry is not SimpleOrMap
-     * @param T[] $data array with SimpleORMap objects
-     * @param bool $strict check every element for correct type and unique pk
-     * @return SimpleORMapCollection<T>
-     */
-    public static function createFromArray(array $data, $strict = true)
-    {
-        $ret = new SimpleORMapCollection();
-        if (count($data)) {
-            $first = current($data);
-            if ($first instanceof SimpleORMap) {
-                $ret->setClassName(get_class($first));
-                if ($strict) {
-                    foreach ($data as $one) {
-                        $ret[] = $one;
-                    }
-                } else {
-                    $ret->exchangeArray($data);
-                }
-            } else {
-                throw new InvalidArgumentException('This collection only accepts objects derived from SimpleORMap', self::WRONG_OBJECT_TYPE);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param ?Closure         $finder  callable to fill collection
-     * @param ?array           $options relationship options
-     * @param SimpleORMap|null $record  related record
-     */
-    public function __construct(Closure $finder = null, array $options = null, SimpleORMap $record = null)
-    {
-        $this->relation_options = $options;
-        $this->related_record = $record;
-        parent::__construct($finder === null ? [] : $finder);
-    }
-
-    /**
-     * Sets the value at the specified index
-     * checks if the value is an object of specified class
-     *
-     * @see ArrayObject::offsetSet()
-     * @throws InvalidArgumentException if the given model does not fit (wrong type or id)
-     */
-    public function offsetSet($index, $newval): void
-    {
-        if (!is_null($index)) {
-            $index = (int)$index;
-        }
-        if (!is_a($newval, $this->getClassName())) {
-            throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
-        }
-        if ($this->related_record && $this->relation_options['type'] === 'has_many') {
-            $foreign_key_value = call_user_func($this->relation_options['assoc_func_params_func'], $this->related_record);
-            call_user_func($this->relation_options['assoc_foreign_key_setter'], $newval, $foreign_key_value);
-        }
-        if ($newval->id !== null) {
-            $exists = $this->find($newval->id);
-            if ($exists) {
-                throw new InvalidArgumentException('Element could not be appended, element with id: ' . $exists->id . ' is in the way', self::OBJECT_EXISTS);
-            }
-        }
-        parent::offsetSet($index, $newval);
-    }
-
-    /**
-     * sets the allowed class name
-     * @param class-string $class_name
-     * @return void
-     */
-    public function setClassName($class_name)
-    {
-        $this->relation_options['class_name'] = strtolower($class_name);
-        $this->deleted->relation_options['class_name'] = strtolower($class_name);
-    }
-
-    /**
-     * sets the related record
-     *
-     * @param SimpleORMap $record
-     * @return void
-     */
-    public function setRelatedRecord(SimpleORMap $record)
-    {
-        $this->related_record = $record;
-    }
-
-    /**
-     * gets the allowed classname
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        return strtolower($this->relation_options['class_name']);
-    }
-
-    /**
-     * reloads the elements of the collection
-     * by calling the finder function
-     *
-     * @throws InvalidArgumentException
-     * @return ?int number of records after refresh
-     */
-    public function refresh()
-    {
-        if (is_callable($this->finder)) {
-            $data = call_user_func($this->finder, $this->related_record);
-            foreach ($data as $one) {
-                if (!is_a($one, $this->getClassName())) {
-                    throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
-                }
-            }
-            $this->exchangeArray($data);
-            $this->deleted->exchangeArray([]);
-            return $this->last_count = $this->count();
-        }
-
-        return null;
-    }
-
-    /**
-     * returns element with given primary key value
-     *
-     * @param string $value primary key value to search for
-     * @return ?T
-     */
-    public function find($value)
-    {
-        return $this->findOneBy('id', $value);
-    }
-
-    /**
-     * returns the collection as grouped array
-     * first param is the column to group by, it becomes the key in
-     * the resulting array, default is pk. Limit returned fields with second param
-     * The grouped entries can optoionally go through the given
-     * callback. If no callback is provided, only the first grouped
-     * entry is returned, suitable for grouping by unique column
-     *
-     * @param string $group_by the column to group by, pk if ommitted
-     * @param mixed $only_these_fields limit returned fields
-     * @param ?callable $group_func closure to aggregate grouped entries
-     * @return array assoc array
-     */
-    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
-    {
-        $result = [];
-        foreach ($this as $record) {
-            $key = $record->getValue($group_by);
-            if (is_array($key)) {
-                $key = join('_', $key);
-            }
-            $result[$key][] = $record->toArray($only_these_fields);
-        }
-        if ($group_func === null) {
-            $group_func = 'current';
-        }
-        return array_map($group_func, $result);
-    }
-
-    /**
-     * mark element(s) for deletion
-     * element(s) with given primary key are moved to
-     * internal deleted collection
-     *
-     * @param string $id primary key of element
-     * @return int number of unsetted elements
-     */
-    public function unsetByPk($id)
-    {
-        return $this->unsetBy('id', $id);
-    }
-
-    /**
-     * merge in another collection, elements must be of
-     * the same type, if an element already exists it is
-     * replaced or ignored depending on second param
-     *
-     * @param SimpleORMapCollection $a_collection
-     * @param string $mode 'replace' or 'ignore'
-     * @return void
-     */
-    public function merge(SimpleCollection $a_collection, string $mode = 'ignore')
-    {
-        $mode = func_get_arg(1);
-        foreach ($a_collection as $element) {
-            try {
-                /**
-                 * @throws InvalidArgumentException
-                 * @see SimpleORMapCollection::offsetSet()
-                 */
-                $this[] = $element;
-            } catch (InvalidArgumentException $e) {
-                if ($e->getCode() === self::OBJECT_EXISTS) {
-                    if ($mode === 'replace') {
-                        $this->unsetByPk($element->id);
-                        $this[] = $element;
-                    } // else $mode means 'ignore'
-                } else {
-                    throw $e;
-                }
-            }
-        }
-        $this->storage = array_values($this->storage);
-    }
-}
diff --git a/tests/unit/lib/VisualTest.php b/tests/unit/lib/VisualTest.php
index dfa2945..c62cd05 100644
--- a/tests/unit/lib/VisualTest.php
+++ b/tests/unit/lib/VisualTest.php
@@ -9,7 +9,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/models/SimpleORMap.class.php';
+require_once 'lib/classes/SimpleORMap.class.php';
 require_once 'lib/models/OpenGraphURL.class.php';
 require_once 'lib/visual.inc.php';
 require_once 'lib/classes/Config.class.php';
diff --git a/tests/unit/lib/classes/MigrationTest.php b/tests/unit/lib/classes/MigrationTest.php
index 444ebf2..4a45e71 100644
--- a/tests/unit/lib/classes/MigrationTest.php
+++ b/tests/unit/lib/classes/MigrationTest.php
@@ -16,10 +16,10 @@ class MigrationTest extends \Codeception\Test\Unit
         $this->before = $GLOBALS['CACHING_ENABLE'] ?? null;
         $GLOBALS['CACHING_ENABLE'] = false;
 
+        require_once 'lib/classes/SimpleORMap.class.php';
         require_once 'lib/classes/StudipCache.class.php';
         require_once 'lib/classes/StudipMemoryCache.class.php';
         require_once 'lib/classes/StudipCacheFactory.class.php';
-        require_once 'lib/models/SimpleORMap.class.php';
 
         require_once 'lib/migrations/Migration.php';
         require_once 'lib/migrations/Migrator.php';
-- 
cgit v1.0


From e7bfc2e80046cdbe28122c8430d9ce9dfdafb5a1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 09:03:33 +0000
Subject: fixes #3977

Closes #3977

Merge request studip/studip!2945
---
 db/migrations/5.1.57_cleanup_tool_activations.php | 23 +++++++++
 lib/plugins/engine/PluginManager.class.php        | 60 +++++++++++++----------
 2 files changed, 57 insertions(+), 26 deletions(-)
 create mode 100644 db/migrations/5.1.57_cleanup_tool_activations.php

diff --git a/db/migrations/5.1.57_cleanup_tool_activations.php b/db/migrations/5.1.57_cleanup_tool_activations.php
new file mode 100644
index 0000000..6700816
--- /dev/null
+++ b/db/migrations/5.1.57_cleanup_tool_activations.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @see https://gitlab.studip.de/studip/studip/-/issues/3977
+ */
+return new class extends Migration
+{
+    public function description()
+    {
+        return 'Removes invalid tool activations (that are no longer connected '
+            . 'to a StandardPlugin';
+    }
+
+    protected function up()
+    {
+        $query = "DELETE FROM `tools_activated`
+                  WHERE `plugin_id` NOT IN (
+                      SELECT `pluginid`
+                      FROM `plugins`
+                      WHERE FIND_IN_SET(?, `plugintype`)
+                  )";
+        DBManager::get()->execute($query, [StandardPlugin::class]);
+    }
+};
diff --git a/lib/plugins/engine/PluginManager.class.php b/lib/plugins/engine/PluginManager.class.php
index be4f766..f08b5fa 100644
--- a/lib/plugins/engine/PluginManager.class.php
+++ b/lib/plugins/engine/PluginManager.class.php
@@ -427,41 +427,49 @@ class PluginManager
             $this->plugins[$id]['name'] = $name;
             $this->plugins[$id]['path'] = $path;
             $this->plugins[$id]['type'] = $type;
+        } else {
+            foreach ($this->plugins as $plugin) {
+                $common_types = array_intersect($type, $plugin['type']);
 
-            return $id;
-        }
-
-        foreach ($this->plugins as $plugin) {
-            $common_types = array_intersect($type, $plugin['type']);
-
-            if (count($common_types) > 0 && $plugin['position'] >= $position) {
-                $position = $plugin['position'] + 1;
+                if (count($common_types) > 0 && $plugin['position'] >= $position) {
+                    $position = $plugin['position'] + 1;
+                }
             }
-        }
 
-        $sql = 'INSERT INTO plugins (
+            $sql = 'INSERT INTO plugins (
                     pluginname, pluginclassname, pluginpath,
                     plugintype, navigationpos, dependentonid
                 ) VALUES (?,?,?,?,?,?)';
-        $stmt = $db->prepare($sql);
-        $stmt->execute([$name, $class, $path, join(',', $type), $position, $depends]);
-        $id = $db->lastInsertId();
-
-        $this->plugins[$id] = [
-            'id'          => $id,
-            'name'        => $name,
-            'class'       => $class,
-            'path'        => $path,
-            'type'        => $type,
-            'enabled'     => false,
-            'position'    => $position,
-            'depends'     => $depends
-        ];
+            $stmt = $db->prepare($sql);
+            $stmt->execute([$name, $class, $path, join(',', $type), $position, $depends]);
+            $id = $db->lastInsertId();
 
-        $this->readPluginInfos();
+            $this->plugins[$id] = [
+                'id'          => $id,
+                'name'        => $name,
+                'class'       => $class,
+                'path'        => $path,
+                'type'        => $type,
+                'enabled'     => false,
+                'position'    => $position,
+                'depends'     => $depends
+            ];
+
+            $this->readPluginInfos();
 
-        $db->exec("INSERT INTO roles_plugins (roleid, pluginid)
+            $db->exec("INSERT INTO roles_plugins (roleid, pluginid)
                    SELECT roleid, $id FROM roles WHERE `system` = 'y' AND rolename != 'Nobody'");
+        }
+
+        if (!in_array(StandardPlugin::class, $type)) {
+            ToolActivation::findEachBySQL(
+                function (ToolActivation $activation) use ($id) {
+                    $this->setPluginActivated($id, $activation->range_id, false);
+                },
+                'plugin_id = ?',
+                [$id]
+            );
+        }
 
         return $id;
     }
-- 
cgit v1.0


From e398eec260ff49cfd347246f143e629905de6f5e Mon Sep 17 00:00:00 2001
From: Peter Thienel <thienel@data-quest.de>
Date: Mon, 6 May 2024 09:14:14 +0000
Subject: =?UTF-8?q?Resolve=20"Terminkalender:=20Dialog=20des=20Termin-Expo?=
 =?UTF-8?q?rts=20schlie=C3=9Ft=20sich=20nicht=20nach=20Download"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4094

Merge request studip/studip!2938
---
 app/controllers/calendar/calendar.php  | 52 +++++++++++++++++++++-------------
 app/views/calendar/calendar/export.php |  2 +-
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index 0c24a80..d0d5743 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -770,29 +770,41 @@ class Calendar_CalendarController extends AuthenticatedController
                 PageLayout::postError(_('Bitte wählen Sie aus, welche Termine exportiert werden sollen!'));
                 return;
             }
-            $ical = '';
-            $calendar_export = new ICalendarExport();
-            if ($this->dates_to_export === 'user') {
-                $ical = $calendar_export->exportCalendarDates(User::findCurrent()->id, $this->begin, $this->end);
-            } elseif ($this->dates_to_export === 'course') {
-                $ical = $calendar_export->exportCourseDates(User::findCurrent()->id, $this->begin, $this->end);
-                $ical .= $calendar_export->exportCourseExDates(User::findCurrent()->id, $this->begin, $this->end);
-            } elseif ($this->dates_to_export === 'all') {
-                $ical = $calendar_export->exportCalendarDates(User::findCurrent()->id, $this->begin, $this->end);
-                $ical .= $calendar_export->exportCourseDates(User::findCurrent()->id, $this->begin, $this->end);
-                $ical .= $calendar_export->exportCourseExDates(User::findCurrent()->id, $this->begin, $this->end);
-            }
-            $ical = $calendar_export->writeHeader() . $ical . $calendar_export->writeFooter();
-            $this->response->add_header('Content-Type', 'text/calendar;charset=utf-8');
-            $this->response->add_header('Content-Disposition', 'attachment; filename="studip.ics"');
-            $this->response->add_header('Content-Transfer-Encoding', 'binary');
-            $this->response->add_header('Pragma', 'public');
-            $this->response->add_header('Cache-Control', 'private');
-            $this->response->add_header('Content-Length', strlen($ical));
-            $this->render_text($ical);
+            $this->relocate($this->url_for('calendar/calendar/export_file', [
+                'begin' => $this->begin->format('d.m.Y'),
+                'end' => $this->end->format('d.m.Y'),
+                'dates_to_export' => $this->dates_to_export
+            ]));
         }
     }
 
+    public function export_file_action()
+    {
+        $begin = Request::getDateTime('begin', 'd.m.Y');
+        $end = Request::getDateTime('end', 'd.m.Y');
+        $dates_to_export = Request::option('dates_to_export', 'user');
+        $ical = '';
+        $calendar_export = new ICalendarExport();
+        if ($dates_to_export === 'user') {
+            $ical = $calendar_export->exportCalendarDates(User::findCurrent()->id, $begin, $end);
+        } elseif ($dates_to_export === 'course') {
+            $ical = $calendar_export->exportCourseDates(User::findCurrent()->id, $begin, $end);
+            $ical .= $calendar_export->exportCourseExDates(User::findCurrent()->id, $begin, $end);
+        } elseif ($dates_to_export === 'all') {
+            $ical = $calendar_export->exportCalendarDates(User::findCurrent()->id, $begin, $end);
+            $ical .= $calendar_export->exportCourseDates(User::findCurrent()->id, $begin, $end);
+            $ical .= $calendar_export->exportCourseExDates(User::findCurrent()->id, $begin, $end);
+        }
+        $ical = $calendar_export->writeHeader() . $ical . $calendar_export->writeFooter();
+        $this->response->add_header('Content-Type', 'text/calendar;charset=utf-8');
+        $this->response->add_header('Content-Disposition', 'attachment; filename="studip.ics"');
+        $this->response->add_header('Content-Transfer-Encoding', 'binary');
+        $this->response->add_header('Pragma', 'public');
+        $this->response->add_header('Cache-Control', 'private');
+        $this->response->add_header('Content-Length', strlen($ical));
+        $this->render_text($ical);
+    }
+
     public function import_action() {}
 
     public function import_file_action()
diff --git a/app/views/calendar/calendar/export.php b/app/views/calendar/calendar/export.php
index 0ff766d..b4171fe 100644
--- a/app/views/calendar/calendar/export.php
+++ b/app/views/calendar/calendar/export.php
@@ -7,7 +7,7 @@
  * @var DateTimeImmutable $end
  */
 ?>
-<form class="default" method="post"
+<form class="default" method="post" data-dialog="size=auto"
       action="<?= $controller->link_for('calendar/calendar/export', $user_id ?? null) ?>">
     <?= CSRFProtection::tokenTag() ?>
     <fieldset>
-- 
cgit v1.0


From 06629e19ca03c3431a64302a18a1ff2a2f011be1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 09:17:44 +0000
Subject: relocate stud.ip trails files, fixes #4105

Closes #4105

Merge request studip/studip!2936
---
 RELEASE-NOTES.md                                   |   6 +
 app/controllers/admin/install.php                  |   2 +-
 app/controllers/authenticated_controller.php       |  32 -
 app/controllers/loncapa.php                        |   2 -
 app/controllers/notifications.php                  |   3 -
 app/controllers/plugin_controller.php              |  72 --
 app/controllers/studip_controller.php              | 875 ---------------------
 .../studip_controller_properties_trait.php         |  69 --
 app/controllers/studip_response.php                |  55 --
 lib/bootstrap-autoload.php                         |  12 -
 lib/classes/AuthenticatedController.php            |  32 +
 lib/classes/PluginController.php                   |  72 ++
 lib/classes/StudipController.php                   | 872 ++++++++++++++++++++
 lib/classes/StudipControllerPropertiesTrait.php    |  69 ++
 lib/classes/StudipResponse.php                     |  55 ++
 tests/unit/_bootstrap.php                          |   1 -
 16 files changed, 1107 insertions(+), 1122 deletions(-)
 delete mode 100644 app/controllers/authenticated_controller.php
 delete mode 100644 app/controllers/plugin_controller.php
 delete mode 100644 app/controllers/studip_controller.php
 delete mode 100644 app/controllers/studip_controller_properties_trait.php
 delete mode 100644 app/controllers/studip_response.php
 create mode 100644 lib/classes/AuthenticatedController.php
 create mode 100644 lib/classes/PluginController.php
 create mode 100644 lib/classes/StudipController.php
 create mode 100644 lib/classes/StudipControllerPropertiesTrait.php
 create mode 100644 lib/classes/StudipResponse.php

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d28b92b..9f3f8c6 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -19,6 +19,12 @@
 - Die `MembersModel.php` wurde entfernt ([Issue #3811](https://gitlab.studip.de/studip/studip/-/issues/3811))
 - Die `admission.inc.php` wurde entfernt. ([Issue #3812](https://gitlab.studip.de/studip/studip/-/issues/3812))
 - Die Methoden `CronjobScheduler::scheduleOnce()` sowie `CronjobTask::scheduleOnce()` wurden ersatzlos entfernt. ([Issue #4078](https://gitlab.studip.de/studip/studip/-/issues/4078))
+- Die folgenden Klassen wurden innerhalb von Stud.IP verschoben. Da sie über den Autoloader geladen werden, kann jedes manuelle Einbinden ersatzlos entfernt werden. ([Issue #4105](https://gitlab.studip.de/studip/studip/-/issues/4105))
+  - `AuthenticatedController`
+  - `PluginController`
+  - `StudipController`
+  - `StudipControllerPropertiesTrait`
+  - `StudipResponse`
 
 ## Security related issues
 
diff --git a/app/controllers/admin/install.php b/app/controllers/admin/install.php
index 0054445..9ede078 100644
--- a/app/controllers/admin/install.php
+++ b/app/controllers/admin/install.php
@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../studip_controller_properties_trait.php';
+require_once __DIR__ . '/../../../lib/classes/StudipControllerPropertiesTrait.php';
 
 class Admin_InstallController extends Trails_Controller
 {
diff --git a/app/controllers/authenticated_controller.php b/app/controllers/authenticated_controller.php
deleted file mode 100644
index e051ffa..0000000
--- a/app/controllers/authenticated_controller.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
- * Copyright (C) 2009 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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.
- */
-
-class AuthenticatedController extends StudipController
-{
-    protected $with_session = true;  //we do need to have a session for this controller
-    protected $allow_nobody = false; //nobody is not allowed and always gets a login-screen
-
-    public function before_filter(&$action, &$args)
-    {
-        parent::before_filter($action, $args);
-
-        // Restore request if present
-        if (isset($this->flash['request'])) {
-            foreach ($this->flash['request'] as $key => $value) {
-                Request::set($key, $value);
-            }
-        }
-    }
-
-    protected function keepRequest()
-    {
-        $this->flash['request'] = Request::getInstance()->getIterator()->getArrayCopy();
-    }
-}
diff --git a/app/controllers/loncapa.php b/app/controllers/loncapa.php
index 3119178..41331b6 100644
--- a/app/controllers/loncapa.php
+++ b/app/controllers/loncapa.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'app/controllers/authenticated_controller.php';
-
 class LoncapaController extends AuthenticatedController
 {
     public function enter_action()
diff --git a/app/controllers/notifications.php b/app/controllers/notifications.php
index b206df1..dc31aab 100644
--- a/app/controllers/notifications.php
+++ b/app/controllers/notifications.php
@@ -13,9 +13,6 @@
  * @since       3.0
  */
 
-require_once 'app/controllers/authenticated_controller.php';
-
-
 class NotificationsController extends AuthenticatedController
 {
     /**
diff --git a/app/controllers/plugin_controller.php b/app/controllers/plugin_controller.php
deleted file mode 100644
index d57a90d..0000000
--- a/app/controllers/plugin_controller.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014  Rasmus Fuhse <fuhse@data-quest.de>
- *
- * 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.
- */
-
-class PluginController extends StudipController
-{
-    public function __construct($dispatcher)
-    {
-        parent::__construct($dispatcher);
-
-        if (!isset($dispatcher->current_plugin)) {
-            throw new Exception('Plugin missing for plugin controller!');
-        }
-        $this->plugin = $dispatcher->current_plugin;
-
-        if ($this->plugin && $this->plugin->hasTranslation()) {
-            // Localization
-            $this->_ = function ($string) {
-                return call_user_func_array(
-                    [$this->plugin, '_'],
-                    func_get_args()
-                );
-            };
-
-            $this->_n = function ($string0, $tring1, $n) {
-                return call_user_func_array(
-                    [$this->plugin, '_n'],
-                    func_get_args()
-                );
-            };
-        }
-    }
-
-    /**
-     * Creates the body element id for this controller a given action.
-     *
-     * @param string $unconsumed_path Unconsumed path to extract action from
-     * @return string
-     */
-    protected function getBodyElementIdForControllerAndAction($unconsumed_path)
-    {
-        $body_id = implode('-', [
-            'plugin',
-            strtosnakecase(get_class($this->plugin)),
-            parent::getBodyElementIdForControllerAndAction($unconsumed_path),
-        ]);
-
-        return $body_id;
-    }
-
-    /**
-     * Intercepts all non-resolvable method calls in order to correctly handle
-     * calls to _ and _n.
-     *
-     * @param string $method
-     * @param array  $arguments
-     * @return mixed
-     */
-    public function __call($method, $arguments)
-    {
-        if (isset($this->_template_variables[$method]) && is_callable($this->_template_variables[$method])) {
-            return call_user_func_array($this->_template_variables[$method], $arguments);
-        }
-        return parent::__call($method, $arguments);
-    }
-}
diff --git a/app/controllers/studip_controller.php b/app/controllers/studip_controller.php
deleted file mode 100644
index 9e238a1..0000000
--- a/app/controllers/studip_controller.php
+++ /dev/null
@@ -1,875 +0,0 @@
-<?php
-/*
- * studip_controller.php - studip controller base class
- * Copyright (c) 2009  Elmar Ludwig
- *
- * 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.
- */
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Csv;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-
-require_once 'studip_controller_properties_trait.php';
-require_once 'studip_response.php';
-
-/**
- * @property StudipResponse $response
- */
-abstract class StudipController extends Trails_Controller
-{
-    use StudipControllerPropertiesTrait;
-
-    protected $with_session = false; //do we need to have a session for this controller
-    protected $allow_nobody = true; //should 'nobody' allowed for this controller or redirected to login?
-    protected $_autobind = false;
-
-    /**
-     * @return false|void
-     */
-    public function before_filter(&$action, &$args)
-    {
-        $this->current_action = $action;
-        // allow only "word" characters in arguments
-        $this->validate_args($args);
-
-        parent::before_filter($action, $args);
-
-        if ($this->with_session) {
-            # open session
-            page_open([
-                'sess' => 'Seminar_Session',
-                'auth' => $this->allow_nobody ? 'Seminar_Default_Auth' : 'Seminar_Auth',
-                'perm' => 'Seminar_Perm',
-                'user' => 'Seminar_User'
-            ]);
-
-            // show login-screen, if authentication is "nobody"
-            $GLOBALS['auth']->login_if((Request::get('again') || !$this->allow_nobody) && $GLOBALS['user']->id == 'nobody');
-
-            // Setup flash instance
-            $this->flash = Trails_Flash::instance();
-
-            // set up user session
-            include 'lib/seminar_open.php';
-        }
-
-        // Set generic attribute that indicates whether the request was sent
-        // via ajax or not
-        $this->via_ajax = Request::isXhr();
-
-        # Set base layout
-        #
-        # If your controller needs another layout, overwrite your controller's
-        # before filter:
-        #
-        #   class YourController extends AuthenticatedController {
-        #     function before_filter(&$action, &$args) {
-        #       parent::before_filter($action, $args);
-        #       $this->set_layout("your_layout");
-        #     }
-        #   }
-        #
-        # or unset layout by sending:
-        #
-        #   $this->set_layout(NULL)
-        #
-        $layout_file = Request::isXhr()
-                     ? 'layouts/dialog.php'
-                     : 'layouts/base.php';
-        $layout = $GLOBALS['template_factory']->open($layout_file);
-        $this->set_layout($layout);
-
-        $this->set_content_type('text/html;charset=utf-8');
-    }
-
-    /**
-     * Extended method to inject extended response object.
-     */
-    public function erase_response()
-    {
-        parent::erase_response();
-
-        $this->response = new StudipResponse();
-    }
-
-    /**
-     * Hooked perform method in order to inject body element id creation.
-     *
-     * In order to avoid clashes, these body element id will be joined
-     * with a minus sign. Otherwise the controller "x" with action
-     * "y_z" would be given the same id as the controller "x/y" with
-     * the action "z", namely "x_y_z". With the minus sign this will
-     * result in the ids "x-y_z" and "x_y-z".
-     *
-     * Plugins will always have a leading 'plugin-' and the decamelized
-     * plugin name in front of the id.
-     *
-     * @param String $unconsumed_path Path segment containing action and
-     *                                optionally arguments or format
-     * @return Trails_Response from parent controller
-     */
-    public function perform($unconsumed_path)
-    {
-        // Set body element id if it has not already been set
-        if (!PageLayout::hasBodyElementId()) {
-            $body_id = $this->getBodyElementIdForControllerAndAction($unconsumed_path);
-            PageLayout::setBodyElementId($body_id);
-        }
-
-        return parent::perform($unconsumed_path);
-    }
-
-    /**
-     * Callback function being called after an action is executed.
-     *
-     * @param string Name of the action to perform.
-     * @param array  An array of arguments to the action.
-     *
-     * @return void
-     */
-    public function after_filter($action, $args)
-    {
-        parent::after_filter($action, $args);
-
-        if (Request::isXhr() && !isset($this->response->headers['X-Title']) && PageLayout::hasTitle()) {
-            $this->response->add_header('X-Title', rawurlencode(PageLayout::getTitle()));
-        }
-        if (Request::isXhr() && !isset($this->response->headers['X-WikiLink']) && PageLayout::getHelpKeyword()) {
-            $this->response->add_header('X-WikiLink', format_help_url(PageLayout::getHelpKeyword()));
-        }
-
-        if ($this->with_session) {
-            page_close();
-        }
-    }
-
-    /**
-     * Validate arguments based on a list of given types. The types are:
-     * 'int', 'float', 'option' and 'string'. If the list of types is NULL
-     * or shorter than the argument list, 'option' is assumed for all
-     * remaining arguments. 'option' differs from Request::option() in
-     * that it also accepts the charaters '-' and ',' in addition to all
-     * word characters.
-     *
-     * Since Stud.IP 4.0 it is also possible to directly inject
-     * SimpleORMap objects. If types is NULL, the signature of the called
-     * action is analyzed and any type hint that matches a sorm class
-     * will be used to create an object using the argument as the id
-     * that is passed to the object's constructor.
-     *
-     * If $_autobind is set to true, the created object is also assigned
-     * to the controller so that it is available in a view.
-     *
-     * @param array $args  an array of arguments to the action
-     * @param array $types list of argument types (optional)
-     */
-    public function validate_args(&$args, $types = null)
-    {
-        $class_infos = [];
-
-        if ($types === null) {
-            $types = [];
-        }
-
-        if ($this->has_action($this->current_action)) {
-            $reflection = new ReflectionMethod($this, $this->current_action . '_action');
-            $parameters = $reflection->getParameters();
-            foreach ($parameters as $i => $parameter) {
-                $class_type = $parameter->getType();
-
-                if (
-                    !$class_type
-                    || !class_exists($class_type->getName())
-                    || !is_a($class_type->getName(), SimpleORMap::class, true)
-                ) {
-                    continue;
-                }
-
-                $types[$i] = 'sorm';
-                $class_infos[$i] = [
-                    'model'    => $class_type->getName(),
-                    'var'      => $parameter->getName(),
-                    'optional' => $parameter->isOptional(),
-                ];
-
-                if ($parameter->isOptional() && !isset($args[$i])) {
-                    $args[$i] = $parameter->getDefaultValue();
-                }
-            }
-        }
-
-        foreach ($args as $i => &$arg) {
-            $type = $types[$i] ?? 'option';
-            switch ($type) {
-                case 'int':
-                    $arg = (int) $arg;
-                    break;
-
-                case 'float':
-                    $arg = (float) strtr($arg, ',', '.');
-                    break;
-
-                case 'option':
-                    if (preg_match('/[^\\w,-]/', $arg)) {
-                        throw new Trails_Exception(400);
-                    }
-                    break;
-
-                case 'sorm':
-                    $info = $class_infos[$i];
-
-                    $id = null;
-                    if ($arg != -1) {
-                        $id = $arg;
-                    }
-                    if (mb_strpos($id, SimpleORMap::ID_SEPARATOR) !== false) {
-                        $id = explode(SimpleORMap::ID_SEPARATOR, $id);
-                    }
-
-                    $reflection = new ReflectionClass($info['model']);
-
-                    $sorm = $reflection->newInstance($id);
-                    if (!$info['optional'] && $sorm->isNew()) {
-                        throw new Trails_Exception(
-                            404,
-                            "Parameter {$info['var']} could not be resolved with value {$arg}"
-                        );
-                    }
-
-                    $arg = $sorm;
-                    if ($this->_autobind) {
-                        $this->{$info['var']} = $arg;
-                    }
-                    break;
-
-                case 'string':
-                    break;
-
-                default:
-                    throw new Trails_Exception(500, 'Unknown type "' . $type . '"');
-            }
-        }
-
-        reset($args);
-    }
-
-    /**
-     * Returns a URL to a specified route to your Trails application.
-     * without first parameter the current action is used
-     * if route begins with a / then the current controller ist prepended
-     * if second parameter is an array it is passed to URLHeper
-     *
-     * @param  string   a string containing a controller and optionally an action
-     * @param  string[] optional arguments
-     *
-     * @return string  a URL to this route
-     */
-    public function url_for($to = ''/* , ... */)
-    {
-        $args = func_get_args();
-
-        // Try to create route if none given
-        if ($to === '') {
-            $args[0] = isset($this->parent_controller)
-                     ? $this->parent_controller->current_action
-                     : $this->current_action;
-            return $this->action_url(...$args);
-        }
-
-        // Create url for a specific action
-        // TODO: This seems odd. You kinda specify an absolute path
-        //       to receive a relative url. Meh...
-        //
-        // @deprecated Do not use this, please!
-        if ($to[0] === '/') {
-            $args[0] = substr($to, 1);
-            return $this->action_url(...$args);
-        }
-
-        // Check for absolute URL
-        if ($this->isURL($to)) {
-            throw new InvalidArgumentException(__METHOD__ . ' cannot be used with absolute URLs');
-        }
-
-        // Extract fragment (if any)
-        if (strpos($to, '#') !== false) {
-            list($args[0], $fragment) = explode('#', $to);
-        }
-
-        // Extract parameters (if any)
-        $params = [];
-        if (is_array(end($args))) {
-            $params = array_pop($args);
-        }
-
-        // Map any sorm objects to their ids
-        $args = array_map(function ($arg) {
-            if (is_object($arg) && $arg instanceof SimpleORMap) {
-                return $arg->isNew() ? -1 : $arg->id;
-            }
-            return $arg;
-        }, $args);
-
-        $url = parent::url_for(...$args);
-
-        if (isset($fragment)) {
-            $url .= '#' . $fragment;
-        }
-        return URLHelper::getURL($url, $params);
-    }
-
-    /**
-     * Returns an escaped URL to a specified route to your Trails application.
-     * without first parameter the current action is used
-     * if route begins with a / then the current controller ist prepended
-     * if second parameter is an array it is passed to URLHeper
-     *
-     * @param  string   a string containing a controller and optionally an action
-     * @param  strings  optional arguments
-     *
-     * @return string  a URL to this route
-     */
-    public function link_for($to = ''/* , ... */)
-    {
-        return htmlReady($this->url_for(...func_get_args()));
-    }
-
-    /**
-     * Redirects the user another page. Accepts multiple parameters just like
-     * url_for().
-     *
-     * @param string $to
-     * @see StudipController::url_for()
-     */
-    public function redirect($to)
-    {
-        $to = $this->adjustToArguments(...func_get_args());
-
-        parent::redirect($to);
-    }
-
-    /**
-     * Relocate the user to another location. This is a specialized version
-     * of redirect that differs in two points:
-     *
-     * - relocate() will force the browser to leave the current dialog while
-     *   redirect would refresh the dialog's contents
-     * - relocate() accepts all the parameters that url_for() accepts so it's
-     *   no longer neccessary to chain url_for() and redirect()
-     *
-     * @param String $to Location to redirect to
-     */
-    public function relocate($to)
-    {
-        $to = $this->adjustToArguments(...func_get_args());
-
-        if (Request::isDialog()) {
-            $this->response->add_header('X-Location', encodeURI($to));
-            $this->render_nothing();
-        } else {
-            parent::redirect($to);
-        }
-    }
-
-    /**
-     * Returns a URL to a specified route to your Trails application, unless
-     * the parameter is already a valid URL (which is returned unchanged).
-     *
-     * If no absolute url or more than one argument is given, url_for() is
-     * used.
-     */
-    private function adjustToArguments(...$args): string
-    {
-        if (count($args) > 1 && $this->isURL($args[0])) {
-            throw new InvalidArgumentException('Method may not be used with a URL and multiple parameters');
-        }
-
-        if (count($args) === 1 && $this->isURL($args[0])) {
-            return $args[0];
-        }
-
-        return $this->url_for(...$args);
-    }
-
-    /**
-     * Returns whether the given parameter is a valid url.
-     *
-     * @param string $to
-     * @return bool
-     */
-    private function isURL(string $to): bool
-    {
-        return preg_match('#^(/|\w+://)#', $to);
-    }
-
-    /**
-     * Exception handler called when the performance of an action raises an
-     * exception.
-     *
-     * @param  object     the thrown exception
-     */
-    public function rescue($exception)
-    {
-        throw $exception;
-    }
-
-    /**
-     * render given data as json, data is converted to utf-8
-     *
-     * @param mixed $data
-     */
-    public function render_json($data)
-    {
-        $json = json_encode($data);
-
-        $this->set_content_type('application/json;charset=utf-8');
-        $this->response->add_header('Content-Length', strlen($json));
-        $this->render_text($json);
-    }
-
-    /**
-     * Render given data as csv, data is assumed to be utf-8.
-     * The first row of data may contain column titles.
-     *
-     * @param array $data       data as two dimensional array
-     * @param string $filename  download file name (optional)
-     * @param string $delimiter field delimiter char (optional)
-     * @param string $enclosure field enclosure char (optional)
-     */
-    public function render_csv($data, $filename = null, $delimiter = ';', $enclosure = '"')
-    {
-        $this->set_content_type('text/csv; charset=UTF-8');
-
-        $output = fopen('php://temp', 'rw');
-        fputs($output, "\xEF\xBB\xBF");
-
-        foreach ($data as $row) {
-            fputcsv($output, $row, $delimiter, $enclosure);
-        }
-
-        rewind($output);
-        $csv_data = stream_get_contents($output);
-        fclose($output);
-
-        if (isset($filename)) {
-            $this->response->add_header('Content-Disposition', 'attachment; ' . encode_header_parameter('filename', $filename));
-        }
-
-        $this->response->add_header('Content-Length', strlen($csv_data));
-
-        $this->render_text($csv_data);
-    }
-
-    /**
-     * Renders a pdf file given by a TCPDF/ExportPDF object.
-     *
-     * @param TCPDF   $pdf      TCPDF object to render
-     * @param string  $filename Filename
-     * @param bool    $inline   Should the pdf be displayed inline (default: no)
-     */
-    protected function render_pdf(TCPDF $pdf, $filename, $inline = false)
-    {
-        $temp_file = $GLOBALS['TMP_PATH'] . '/' . md5(uniqid('pdf-file', true));
-        $pdf->Output($temp_file, 'F');
-
-        $disposition = $inline ? 'inline' : 'attachment';
-
-        $this->render_temporary_file($temp_file, $filename, 'application/pdf', $disposition);
-    }
-
-    /**
-     * Renders a file
-     * @param string  $file                Path of the file to render
-     * @param string  $filename            Name of the file displayed to user
-     *                                     (will equal $file when missing)
-     * @param string  $content_type        Optional content type (will be determined if missing)
-     * @param string  $content_disposition Either attachment (default) or inline
-     * @param Closure $callback            Optional callback when download has finished
-     * @param int     $chunk_size          Optional size of chunks to send (default: 256k)
-     */
-    public function render_file(
-        $file,
-        $filename = null,
-        $content_type = null,
-        $content_disposition = 'attachment',
-        Closure $callback = null,
-        $chunk_size = 262144
-    ) {
-        if (!file_exists($file)) {
-            throw new Trails_Exception(404);
-        }
-
-        if (!is_readable($file)) {
-            throw new Trails_Exception(500);
-        }
-
-        if ($content_type === null) {
-            $content_type = get_mime_type($filename ?: $file);
-        }
-
-        if (!in_array($content_type, get_mime_types())) {
-            $content_type = 'application/octet-stream';
-        }
-
-        if ($content_type === 'application/octet-stream') {
-            $content_disposition = 'attachment';
-        }
-
-        $this->set_content_type($content_type);
-        $this->response->add_header(
-            'Content-Disposition',
-            "{$content_disposition}; " . encode_header_parameter(
-                'filename',
-                FileManager::cleanFileName($filename ?: basename($file))
-            )
-        );
-        $this->response->add_header('Content-Length', filesize($file));
-        $this->response->add_header('Content-Transfer-Encoding',  'binary');
-        $this->response->add_header('Pragma', 'public');
-        $this->render_text(function () use ($file, $chunk_size, $callback) {
-            $fp = fopen($file, 'rb');
-
-            while (!feof($fp)) {
-                yield fgets($fp, $chunk_size);
-            }
-
-            fclose($fp);
-
-            if ($callback) {
-                $callback($file);
-            }
-        });
-    }
-
-    /**
-     * Renders a temporary file which will be deleted after transmission.
-     * This is just a convenience method so you don't have to write the delete
-     * callback.
-     *
-     * @param string  $file                Path of the file to render
-     * @param string  $filename            Name of the file displayed to user
-     *                                     (will equal $file when missing)
-     * @param string  $content_type        Optional content type (will be determined if missing)
-     * @param string  $content_disposition Either attachment (default) or inline
-     * @param Closure $callback            Optional callback when download has finished
-     * @param int     $chunk_size          Optional size of chunks to send (default: 256k)
-     */
-    public function render_temporary_file(
-        $file,
-        $filename = null,
-        $content_type = null,
-        $content_disposition = 'attachment',
-        Closure $callback = null,
-        $chunk_size = 262144
-
-    ) {
-        $delete_callback = function ($file) use ($callback) {
-            unlink($file);
-
-            if ($callback) {
-                $callback($file);
-            }
-        };
-
-        $this->render_file(
-            $file,
-            $filename,
-            $content_type,
-            $content_disposition,
-            $delete_callback,
-            $chunk_size
-        );
-    }
-
-    public function render_form(\Studip\Forms\Form $form)
-    {
-        $this->render_text($form->render());
-    }
-
-    /**
-     * relays current request to another controller and returns the response
-     * the other controller is given all assigned properties, additional parameters are passed
-     * through
-     *
-     * @param string $to_uri a trails route
-     * @return Trails_Response
-     */
-    public function relay($to_uri/* , ... */)
-    {
-        $args = func_get_args();
-        $uri = array_shift($args);
-        [$controller_path, $unconsumed] = '' === $uri ? $this->dispatcher->default_route() : $this->dispatcher->parse($uri);
-
-        $controller = $this->dispatcher->load_controller($controller_path);
-        $assigns = $this->get_assigned_variables();
-        unset($assigns['controller']);
-        foreach ($assigns as $k => $v) {
-            $controller->$k = $v;
-        }
-        $controller->layout = null;
-        $controller->parent_controller = $this;
-        array_unshift($args, $unconsumed);
-        return $controller->perform_relayed(...$args);
-    }
-
-    /**
-     * Relays current request and performs redirect if neccessary.
-     *
-     * @param string $to_uri a trails route
-     * @return Trails_Response
-     *
-     * @see StudipController::relay()
-     */
-    public function relayWithRedirect(...$args): Trails_Response
-    {
-        $response = $this->relay(...$args);
-
-        // If the relayed action should perform a redirect, do so
-        if (isset($response->headers['Location'])) {
-            header("Location: {$response->headers['Location']}");
-            page_close();
-            die;
-        }
-
-        return $response;
-    }
-
-    /**
-     * perform a given action/parameter string from an relayed request
-     * before_filter and after_filter methods are not called
-     *
-     * @see perform
-     * @param string $unconsumed
-     * @return Trails_Response
-     */
-    public function perform_relayed($unconsumed/* , ... */)
-    {
-        $args = func_get_args();
-        $unconsumed = array_shift($args);
-
-        [$action, $extracted_args, $format] = $this->extract_action_and_args($unconsumed);
-        $this->format = isset($format) ? $format : 'html';
-        $this->current_action = $action;
-        $args = array_merge($extracted_args, $args);
-        $callable = $this->map_action($action);
-
-        if (is_callable($callable)) {
-            $callable(...$args);
-        } else {
-            $this->does_not_understand($action, $args);
-        }
-
-        if (!$this->performed) {
-            $this->render_action($action);
-        }
-        return $this->response;
-    }
-
-    /**
-     * Renders a given template and returns the resulting string.
-     *
-     * @param string $template Name of the template file
-     * @param mixed  $layout   Optional layout
-     * @return string
-     */
-    public function render_template_as_string($template, $layout = null)
-    {
-        $template = $this->get_template_factory()->open($template);
-        $template->set_layout($layout);
-        $template->set_attributes($this->get_assigned_variables());
-        return $template->render();
-    }
-
-    /**
-     * Magic methods that intercepts all unknown method calls.
-     * If a method is called that matches an action on this controller,
-     * an url to that action is generated.
-     *
-     * Basically, this:
-     *
-     *    <code>$controller->url_for('foo/bar/baz/' . $param)</code>
-     *
-     * is equal to calling this on the Foo_BarController:
-     *
-     *    <code>$controller->baz($param)</code>
-     *
-     * @param String $method    Called method name
-     * @param array  $argumetns Provided arguments
-     * @return url to the requested action
-     * @throws Trails_UnknownAction if no action matches the method
-     */
-    public function __call($method, $arguments)
-    {
-        $function = 'action_link';
-        if (mb_strpos($method, 'Link') === mb_strlen($method) - 4) {
-            $method = mb_substr($method, 0, -4);
-        } elseif (mb_strpos($method, 'URL') === mb_strlen($method) - 3) {
-            $function = 'action_url';
-            $method = mb_substr($method, 0, -3);
-        }
-
-        if (!$this->has_action($method)) {
-            throw new Trails_UnknownAction("Unknown action '{$method}'");
-        }
-
-        array_unshift($arguments, $method);
-        return call_user_func_array([$this, $function], $arguments);
-    }
-
-    /**
-     * Returns whether this controller has the specificed action.
-     *
-     * @param string $action Name of the action
-     * @return true if action is defined, false otherwise
-     */
-    public function has_action($action)
-    {
-        return method_exists($this, $action . '_action')
-            || ($this->parent_controller
-                && $this->parent_controller->has_action($action));
-    }
-
-    /**
-     * Generates the url for an action on this controller without the
-     * neccessity to provide the full "path" to the action (since it
-     * is implicitely known).
-     *
-     * Basically, this:
-     *
-     *    <code>$controller->url_for('foo/bar/baz/' . $param)</code>
-     *
-     * is equal to calling this on the Foo_BarController:
-     *
-     *    <code>$controller->action_url('baz/' . $param)</code>
-     *
-     * @param string $action Name of the action
-     * @return string url to the requested action
-     */
-    public function action_url($action)
-    {
-        $arguments = func_get_args();
-        $arguments[0] = $this->controller_path() . '/' . $arguments[0];
-
-        return $this->url_for(...$arguments);
-    }
-
-    /**
-     * Generates the link for an action on this controller without the
-     * neccessity to provide the full "path" to the action (since it
-     * is implicitely known).
-     *
-     * Basically, this:
-     *
-     *    <code>$controller->link_for('foo/bar/baz/' . $param)</code>
-     *
-     * is equal to calling this on the Foo_BarController:
-     *
-     *    <code>$controller->action_link('baz/' . $param)</code>
-     *
-     * @param string $action Name of the action
-     * @return string to the requested action
-     */
-    public function action_link($action)
-    {
-        return htmlReady($this->action_url(...func_get_args()));
-    }
-
-    /**
-     * Returns the url path to this controller.
-     *
-     * @return string url path to this controller
-     */
-    protected function controller_path()
-    {
-        $class = get_class($this->parent_controller ?? $this);
-        $controller = mb_substr($class, 0, -mb_strlen('Controller'));
-        $controller = strtosnakecase($controller);
-        return preg_replace('/_{2,}/', '/', $controller);
-    }
-
-
-    /**
-     * Validate the datetime according to specific format.
-     *
-     * @param string $datetime the datetime which should be validate
-     * @param string $format the format that the datetime should have by default H:i for time
-     *
-     * @return bool result of validation
-     */
-    public function validate_datetime($datetime, $format = 'H:i')
-    {
-        $dt = DateTime::createFromFormat($format, $datetime);
-        return $dt && $dt->format($format) == date('H:i',strtotime($datetime));
-    }
-
-    /**
-     * Export xlsx and csv files via PhpSpreadsheet
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     */
-    public function render_spreadsheet(
-        array $header,
-        array $data,
-        string $format,
-        string $filename,
-        ?string $filepath = null
-    ): void  {
-        $render_to_browser = false;
-        if ($filepath == null) {
-            $render_to_browser = true;
-            $filepath = tempnam($GLOBALS['TMP_PATH'], 'spreadsheet');
-        }
-        $spreadsheet = new Spreadsheet();
-        $activeWorksheet = $spreadsheet->getActiveSheet();
-        $activeWorksheet->fromArray($header);
-        $activeWorksheet->fromArray($data, null, 'A2');
-
-        if ($format === 'xlsx') {
-            $writer = new Xlsx($spreadsheet);
-        } elseif ($format === 'csv') {
-            $writer = new Csv($spreadsheet);
-        } else {
-            throw new Exception("Format {$format} is not supported");
-        }
-
-        $writer->save($filepath);
-
-        if ($render_to_browser) {
-            $this->response->add_header('Cache-Control', 'cache, must-revalidate');
-            $this->render_temporary_file(
-                $filepath,
-                $filename,
-                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-            );
-        }
-    }
-
-    /**
-     * Creates the body element id for this controller a given action.
-     *
-     * @param string $unconsumed_path Unconsumed path to extract action from
-     * @return string
-     */
-    protected function getBodyElementIdForControllerAndAction($unconsumed_path)
-    {
-        // Extract action from unconsumed path segment
-        [$action] = $this->extract_action_and_args($unconsumed_path);
-
-        // Extract controller name from class name
-        $controller = preg_replace('/Controller$/', '', get_class($this));
-        $controller = Trails_Inflector::underscore($controller);
-
-        // Build main parts of the body element id
-        $body_id_parts = explode('/', $controller);
-        $body_id_parts[] = $action;
-
-        // Create and set body element id
-        $body_id = implode('-', $body_id_parts);
-
-        return $body_id;
-    }
-}
diff --git a/app/controllers/studip_controller_properties_trait.php b/app/controllers/studip_controller_properties_trait.php
deleted file mode 100644
index 4e906fa..0000000
--- a/app/controllers/studip_controller_properties_trait.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * This trait manages all variable assignments to the controller and templates.
- *
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since Stud.IP 5.2
- */
-trait StudipControllerPropertiesTrait
-{
-    /**
-     * Stores the assigned variables.
-     * @var array
-     */
-    protected $_template_variables = [];
-
-    /**
-     * Returns whether a variable is set.
-     *
-     * @param string $offset
-     * @return bool
-     */
-    public function __isset(string $offset): bool
-    {
-        return isset($this->_template_variables[$offset]);
-    }
-
-    /**
-     * Stores a variable.
-     *
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function __set(string $offset, $value): void
-    {
-        $this->_template_variables[$offset] = $value;
-    }
-
-    /**
-     * Returns a previously set variable.
-     *
-     * @param string $offset
-     * @return mixed
-     */
-    public function &__get(string $offset)
-    {
-        if (!isset($this->_template_variables[$offset])) {
-            $this->_template_variables[$offset] = null;
-        }
-        return $this->_template_variables[$offset];
-    }
-
-    /**
-     * Unsets a previously set variable
-     *
-     * @param string $offset
-     */
-    public function __unset(string $offset): void
-    {
-        unset($this->_template_variables[$offset]);
-    }
-
-    public function get_assigned_variables(): array
-    {
-        $variables = $this->_template_variables;
-        $variables['controller'] = $this;
-        return $variables;
-    }
-}
diff --git a/app/controllers/studip_response.php b/app/controllers/studip_response.php
deleted file mode 100644
index 1c15326..0000000
--- a/app/controllers/studip_response.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-class StudipResponse extends Trails_Response
-{
-    /**
-     * Outputs this response to the client using "echo" and "header".
-     *
-     * This extension allows the body to be a callable and handles generators
-     * by outputting the chunks yielded by the generator.
-     */
-    public function output()
-    {
-        if (isset($this->status)) {
-            $this->send_header(
-                "{$_SERVER['SERVER_PROTOCOL']} {$this->status} {$this->reason}",
-                true,
-                $this->status
-            );
-        }
-
-        // Send headers
-        foreach ($this->headers as $k => $v) {
-            $this->send_header("{$k}: {$v}");
-        }
-
-        // Determine output
-        if (is_callable($this->body)) {
-            $output = call_user_func($this->body);
-        } else {
-            $output = $this->body;
-        }
-
-        if ($output instanceof Generator) {
-            // Clear output buffer
-            while (ob_get_level()) {
-                ob_end_clean();
-            }
-
-            // Ensure generator will run to the end
-            $abort = ignore_user_abort(true);
-
-            // Output chunks yielded by generator
-            foreach ($output as $chunk) {
-                if (!connection_aborted()) {
-                    echo $chunk;
-                    flush();
-                }
-            }
-
-            // Reset user abort to previous state
-            ignore_user_abort($abort);
-        } else {
-            echo $output;
-        }
-    }
-}
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index 6f3f4a7..3a767c1 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -76,18 +76,6 @@ StudipAutoloader::addClassLookup(
     $trails_classes,
     'vendor/trails/trails.php'
 );
-StudipAutoloader::addClassLookup(
-    'StudipController',
-    'app/controllers/studip_controller.php'
-);
-StudipAutoloader::addClassLookup(
-    'AuthenticatedController',
-    'app/controllers/authenticated_controller.php'
-);
-StudipAutoloader::addClassLookup(
-    'PluginController',
-    'app/controllers/plugin_controller.php'
-);
 
 // Vendor
 StudipAutoloader::addClassLookups([
diff --git a/lib/classes/AuthenticatedController.php b/lib/classes/AuthenticatedController.php
new file mode 100644
index 0000000..e051ffa
--- /dev/null
+++ b/lib/classes/AuthenticatedController.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ * Copyright (C) 2009 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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.
+ */
+
+class AuthenticatedController extends StudipController
+{
+    protected $with_session = true;  //we do need to have a session for this controller
+    protected $allow_nobody = false; //nobody is not allowed and always gets a login-screen
+
+    public function before_filter(&$action, &$args)
+    {
+        parent::before_filter($action, $args);
+
+        // Restore request if present
+        if (isset($this->flash['request'])) {
+            foreach ($this->flash['request'] as $key => $value) {
+                Request::set($key, $value);
+            }
+        }
+    }
+
+    protected function keepRequest()
+    {
+        $this->flash['request'] = Request::getInstance()->getIterator()->getArrayCopy();
+    }
+}
diff --git a/lib/classes/PluginController.php b/lib/classes/PluginController.php
new file mode 100644
index 0000000..d57a90d
--- /dev/null
+++ b/lib/classes/PluginController.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright (c) 2014  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ * 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.
+ */
+
+class PluginController extends StudipController
+{
+    public function __construct($dispatcher)
+    {
+        parent::__construct($dispatcher);
+
+        if (!isset($dispatcher->current_plugin)) {
+            throw new Exception('Plugin missing for plugin controller!');
+        }
+        $this->plugin = $dispatcher->current_plugin;
+
+        if ($this->plugin && $this->plugin->hasTranslation()) {
+            // Localization
+            $this->_ = function ($string) {
+                return call_user_func_array(
+                    [$this->plugin, '_'],
+                    func_get_args()
+                );
+            };
+
+            $this->_n = function ($string0, $tring1, $n) {
+                return call_user_func_array(
+                    [$this->plugin, '_n'],
+                    func_get_args()
+                );
+            };
+        }
+    }
+
+    /**
+     * Creates the body element id for this controller a given action.
+     *
+     * @param string $unconsumed_path Unconsumed path to extract action from
+     * @return string
+     */
+    protected function getBodyElementIdForControllerAndAction($unconsumed_path)
+    {
+        $body_id = implode('-', [
+            'plugin',
+            strtosnakecase(get_class($this->plugin)),
+            parent::getBodyElementIdForControllerAndAction($unconsumed_path),
+        ]);
+
+        return $body_id;
+    }
+
+    /**
+     * Intercepts all non-resolvable method calls in order to correctly handle
+     * calls to _ and _n.
+     *
+     * @param string $method
+     * @param array  $arguments
+     * @return mixed
+     */
+    public function __call($method, $arguments)
+    {
+        if (isset($this->_template_variables[$method]) && is_callable($this->_template_variables[$method])) {
+            return call_user_func_array($this->_template_variables[$method], $arguments);
+        }
+        return parent::__call($method, $arguments);
+    }
+}
diff --git a/lib/classes/StudipController.php b/lib/classes/StudipController.php
new file mode 100644
index 0000000..ae316c1
--- /dev/null
+++ b/lib/classes/StudipController.php
@@ -0,0 +1,872 @@
+<?php
+/*
+ * StudipController.php - studip controller base class
+ * Copyright (c) 2009  Elmar Ludwig
+ *
+ * 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.
+ */
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Csv;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+/**
+ * @property StudipResponse $response
+ */
+abstract class StudipController extends Trails_Controller
+{
+    use StudipControllerPropertiesTrait;
+
+    protected $with_session = false; //do we need to have a session for this controller
+    protected $allow_nobody = true; //should 'nobody' allowed for this controller or redirected to login?
+    protected $_autobind = false;
+
+    /**
+     * @return false|void
+     */
+    public function before_filter(&$action, &$args)
+    {
+        $this->current_action = $action;
+        // allow only "word" characters in arguments
+        $this->validate_args($args);
+
+        parent::before_filter($action, $args);
+
+        if ($this->with_session) {
+            # open session
+            page_open([
+                'sess' => 'Seminar_Session',
+                'auth' => $this->allow_nobody ? 'Seminar_Default_Auth' : 'Seminar_Auth',
+                'perm' => 'Seminar_Perm',
+                'user' => 'Seminar_User'
+            ]);
+
+            // show login-screen, if authentication is "nobody"
+            $GLOBALS['auth']->login_if((Request::get('again') || !$this->allow_nobody) && $GLOBALS['user']->id == 'nobody');
+
+            // Setup flash instance
+            $this->flash = Trails_Flash::instance();
+
+            // set up user session
+            include 'lib/seminar_open.php';
+        }
+
+        // Set generic attribute that indicates whether the request was sent
+        // via ajax or not
+        $this->via_ajax = Request::isXhr();
+
+        # Set base layout
+        #
+        # If your controller needs another layout, overwrite your controller's
+        # before filter:
+        #
+        #   class YourController extends AuthenticatedController {
+        #     function before_filter(&$action, &$args) {
+        #       parent::before_filter($action, $args);
+        #       $this->set_layout("your_layout");
+        #     }
+        #   }
+        #
+        # or unset layout by sending:
+        #
+        #   $this->set_layout(NULL)
+        #
+        $layout_file = Request::isXhr()
+                     ? 'layouts/dialog.php'
+                     : 'layouts/base.php';
+        $layout = $GLOBALS['template_factory']->open($layout_file);
+        $this->set_layout($layout);
+
+        $this->set_content_type('text/html;charset=utf-8');
+    }
+
+    /**
+     * Extended method to inject extended response object.
+     */
+    public function erase_response()
+    {
+        parent::erase_response();
+
+        $this->response = new StudipResponse();
+    }
+
+    /**
+     * Hooked perform method in order to inject body element id creation.
+     *
+     * In order to avoid clashes, these body element id will be joined
+     * with a minus sign. Otherwise the controller "x" with action
+     * "y_z" would be given the same id as the controller "x/y" with
+     * the action "z", namely "x_y_z". With the minus sign this will
+     * result in the ids "x-y_z" and "x_y-z".
+     *
+     * Plugins will always have a leading 'plugin-' and the decamelized
+     * plugin name in front of the id.
+     *
+     * @param String $unconsumed_path Path segment containing action and
+     *                                optionally arguments or format
+     * @return Trails_Response from parent controller
+     */
+    public function perform($unconsumed_path)
+    {
+        // Set body element id if it has not already been set
+        if (!PageLayout::hasBodyElementId()) {
+            $body_id = $this->getBodyElementIdForControllerAndAction($unconsumed_path);
+            PageLayout::setBodyElementId($body_id);
+        }
+
+        return parent::perform($unconsumed_path);
+    }
+
+    /**
+     * Callback function being called after an action is executed.
+     *
+     * @param string Name of the action to perform.
+     * @param array  An array of arguments to the action.
+     *
+     * @return void
+     */
+    public function after_filter($action, $args)
+    {
+        parent::after_filter($action, $args);
+
+        if (Request::isXhr() && !isset($this->response->headers['X-Title']) && PageLayout::hasTitle()) {
+            $this->response->add_header('X-Title', rawurlencode(PageLayout::getTitle()));
+        }
+        if (Request::isXhr() && !isset($this->response->headers['X-WikiLink']) && PageLayout::getHelpKeyword()) {
+            $this->response->add_header('X-WikiLink', format_help_url(PageLayout::getHelpKeyword()));
+        }
+
+        if ($this->with_session) {
+            page_close();
+        }
+    }
+
+    /**
+     * Validate arguments based on a list of given types. The types are:
+     * 'int', 'float', 'option' and 'string'. If the list of types is NULL
+     * or shorter than the argument list, 'option' is assumed for all
+     * remaining arguments. 'option' differs from Request::option() in
+     * that it also accepts the charaters '-' and ',' in addition to all
+     * word characters.
+     *
+     * Since Stud.IP 4.0 it is also possible to directly inject
+     * SimpleORMap objects. If types is NULL, the signature of the called
+     * action is analyzed and any type hint that matches a sorm class
+     * will be used to create an object using the argument as the id
+     * that is passed to the object's constructor.
+     *
+     * If $_autobind is set to true, the created object is also assigned
+     * to the controller so that it is available in a view.
+     *
+     * @param array $args  an array of arguments to the action
+     * @param array $types list of argument types (optional)
+     */
+    public function validate_args(&$args, $types = null)
+    {
+        $class_infos = [];
+
+        if ($types === null) {
+            $types = [];
+        }
+
+        if ($this->has_action($this->current_action)) {
+            $reflection = new ReflectionMethod($this, $this->current_action . '_action');
+            $parameters = $reflection->getParameters();
+            foreach ($parameters as $i => $parameter) {
+                $class_type = $parameter->getType();
+
+                if (
+                    !$class_type
+                    || !class_exists($class_type->getName())
+                    || !is_a($class_type->getName(), SimpleORMap::class, true)
+                ) {
+                    continue;
+                }
+
+                $types[$i] = 'sorm';
+                $class_infos[$i] = [
+                    'model'    => $class_type->getName(),
+                    'var'      => $parameter->getName(),
+                    'optional' => $parameter->isOptional(),
+                ];
+
+                if ($parameter->isOptional() && !isset($args[$i])) {
+                    $args[$i] = $parameter->getDefaultValue();
+                }
+            }
+        }
+
+        foreach ($args as $i => &$arg) {
+            $type = $types[$i] ?? 'option';
+            switch ($type) {
+                case 'int':
+                    $arg = (int) $arg;
+                    break;
+
+                case 'float':
+                    $arg = (float) strtr($arg, ',', '.');
+                    break;
+
+                case 'option':
+                    if (preg_match('/[^\\w,-]/', $arg)) {
+                        throw new Trails_Exception(400);
+                    }
+                    break;
+
+                case 'sorm':
+                    $info = $class_infos[$i];
+
+                    $id = null;
+                    if ($arg != -1) {
+                        $id = $arg;
+                    }
+                    if (mb_strpos($id, SimpleORMap::ID_SEPARATOR) !== false) {
+                        $id = explode(SimpleORMap::ID_SEPARATOR, $id);
+                    }
+
+                    $reflection = new ReflectionClass($info['model']);
+
+                    $sorm = $reflection->newInstance($id);
+                    if (!$info['optional'] && $sorm->isNew()) {
+                        throw new Trails_Exception(
+                            404,
+                            "Parameter {$info['var']} could not be resolved with value {$arg}"
+                        );
+                    }
+
+                    $arg = $sorm;
+                    if ($this->_autobind) {
+                        $this->{$info['var']} = $arg;
+                    }
+                    break;
+
+                case 'string':
+                    break;
+
+                default:
+                    throw new Trails_Exception(500, 'Unknown type "' . $type . '"');
+            }
+        }
+
+        reset($args);
+    }
+
+    /**
+     * Returns a URL to a specified route to your Trails application.
+     * without first parameter the current action is used
+     * if route begins with a / then the current controller ist prepended
+     * if second parameter is an array it is passed to URLHeper
+     *
+     * @param  string   a string containing a controller and optionally an action
+     * @param  string[] optional arguments
+     *
+     * @return string  a URL to this route
+     */
+    public function url_for($to = ''/* , ... */)
+    {
+        $args = func_get_args();
+
+        // Try to create route if none given
+        if ($to === '') {
+            $args[0] = isset($this->parent_controller)
+                     ? $this->parent_controller->current_action
+                     : $this->current_action;
+            return $this->action_url(...$args);
+        }
+
+        // Create url for a specific action
+        // TODO: This seems odd. You kinda specify an absolute path
+        //       to receive a relative url. Meh...
+        //
+        // @deprecated Do not use this, please!
+        if ($to[0] === '/') {
+            $args[0] = substr($to, 1);
+            return $this->action_url(...$args);
+        }
+
+        // Check for absolute URL
+        if ($this->isURL($to)) {
+            throw new InvalidArgumentException(__METHOD__ . ' cannot be used with absolute URLs');
+        }
+
+        // Extract fragment (if any)
+        if (strpos($to, '#') !== false) {
+            list($args[0], $fragment) = explode('#', $to);
+        }
+
+        // Extract parameters (if any)
+        $params = [];
+        if (is_array(end($args))) {
+            $params = array_pop($args);
+        }
+
+        // Map any sorm objects to their ids
+        $args = array_map(function ($arg) {
+            if (is_object($arg) && $arg instanceof SimpleORMap) {
+                return $arg->isNew() ? -1 : $arg->id;
+            }
+            return $arg;
+        }, $args);
+
+        $url = parent::url_for(...$args);
+
+        if (isset($fragment)) {
+            $url .= '#' . $fragment;
+        }
+        return URLHelper::getURL($url, $params);
+    }
+
+    /**
+     * Returns an escaped URL to a specified route to your Trails application.
+     * without first parameter the current action is used
+     * if route begins with a / then the current controller ist prepended
+     * if second parameter is an array it is passed to URLHeper
+     *
+     * @param  string   a string containing a controller and optionally an action
+     * @param  strings  optional arguments
+     *
+     * @return string  a URL to this route
+     */
+    public function link_for($to = ''/* , ... */)
+    {
+        return htmlReady($this->url_for(...func_get_args()));
+    }
+
+    /**
+     * Redirects the user another page. Accepts multiple parameters just like
+     * url_for().
+     *
+     * @param string $to
+     * @see StudipController::url_for()
+     */
+    public function redirect($to)
+    {
+        $to = $this->adjustToArguments(...func_get_args());
+
+        parent::redirect($to);
+    }
+
+    /**
+     * Relocate the user to another location. This is a specialized version
+     * of redirect that differs in two points:
+     *
+     * - relocate() will force the browser to leave the current dialog while
+     *   redirect would refresh the dialog's contents
+     * - relocate() accepts all the parameters that url_for() accepts so it's
+     *   no longer neccessary to chain url_for() and redirect()
+     *
+     * @param String $to Location to redirect to
+     */
+    public function relocate($to)
+    {
+        $to = $this->adjustToArguments(...func_get_args());
+
+        if (Request::isDialog()) {
+            $this->response->add_header('X-Location', encodeURI($to));
+            $this->render_nothing();
+        } else {
+            parent::redirect($to);
+        }
+    }
+
+    /**
+     * Returns a URL to a specified route to your Trails application, unless
+     * the parameter is already a valid URL (which is returned unchanged).
+     *
+     * If no absolute url or more than one argument is given, url_for() is
+     * used.
+     */
+    private function adjustToArguments(...$args): string
+    {
+        if (count($args) > 1 && $this->isURL($args[0])) {
+            throw new InvalidArgumentException('Method may not be used with a URL and multiple parameters');
+        }
+
+        if (count($args) === 1 && $this->isURL($args[0])) {
+            return $args[0];
+        }
+
+        return $this->url_for(...$args);
+    }
+
+    /**
+     * Returns whether the given parameter is a valid url.
+     *
+     * @param string $to
+     * @return bool
+     */
+    private function isURL(string $to): bool
+    {
+        return preg_match('#^(/|\w+://)#', $to);
+    }
+
+    /**
+     * Exception handler called when the performance of an action raises an
+     * exception.
+     *
+     * @param  object     the thrown exception
+     */
+    public function rescue($exception)
+    {
+        throw $exception;
+    }
+
+    /**
+     * render given data as json, data is converted to utf-8
+     *
+     * @param mixed $data
+     */
+    public function render_json($data)
+    {
+        $json = json_encode($data);
+
+        $this->set_content_type('application/json;charset=utf-8');
+        $this->response->add_header('Content-Length', strlen($json));
+        $this->render_text($json);
+    }
+
+    /**
+     * Render given data as csv, data is assumed to be utf-8.
+     * The first row of data may contain column titles.
+     *
+     * @param array $data       data as two dimensional array
+     * @param string $filename  download file name (optional)
+     * @param string $delimiter field delimiter char (optional)
+     * @param string $enclosure field enclosure char (optional)
+     */
+    public function render_csv($data, $filename = null, $delimiter = ';', $enclosure = '"')
+    {
+        $this->set_content_type('text/csv; charset=UTF-8');
+
+        $output = fopen('php://temp', 'rw');
+        fputs($output, "\xEF\xBB\xBF");
+
+        foreach ($data as $row) {
+            fputcsv($output, $row, $delimiter, $enclosure);
+        }
+
+        rewind($output);
+        $csv_data = stream_get_contents($output);
+        fclose($output);
+
+        if (isset($filename)) {
+            $this->response->add_header('Content-Disposition', 'attachment; ' . encode_header_parameter('filename', $filename));
+        }
+
+        $this->response->add_header('Content-Length', strlen($csv_data));
+
+        $this->render_text($csv_data);
+    }
+
+    /**
+     * Renders a pdf file given by a TCPDF/ExportPDF object.
+     *
+     * @param TCPDF   $pdf      TCPDF object to render
+     * @param string  $filename Filename
+     * @param bool    $inline   Should the pdf be displayed inline (default: no)
+     */
+    protected function render_pdf(TCPDF $pdf, $filename, $inline = false)
+    {
+        $temp_file = $GLOBALS['TMP_PATH'] . '/' . md5(uniqid('pdf-file', true));
+        $pdf->Output($temp_file, 'F');
+
+        $disposition = $inline ? 'inline' : 'attachment';
+
+        $this->render_temporary_file($temp_file, $filename, 'application/pdf', $disposition);
+    }
+
+    /**
+     * Renders a file
+     * @param string  $file                Path of the file to render
+     * @param string  $filename            Name of the file displayed to user
+     *                                     (will equal $file when missing)
+     * @param string  $content_type        Optional content type (will be determined if missing)
+     * @param string  $content_disposition Either attachment (default) or inline
+     * @param Closure $callback            Optional callback when download has finished
+     * @param int     $chunk_size          Optional size of chunks to send (default: 256k)
+     */
+    public function render_file(
+        $file,
+        $filename = null,
+        $content_type = null,
+        $content_disposition = 'attachment',
+        Closure $callback = null,
+        $chunk_size = 262144
+    ) {
+        if (!file_exists($file)) {
+            throw new Trails_Exception(404);
+        }
+
+        if (!is_readable($file)) {
+            throw new Trails_Exception(500);
+        }
+
+        if ($content_type === null) {
+            $content_type = get_mime_type($filename ?: $file);
+        }
+
+        if (!in_array($content_type, get_mime_types())) {
+            $content_type = 'application/octet-stream';
+        }
+
+        if ($content_type === 'application/octet-stream') {
+            $content_disposition = 'attachment';
+        }
+
+        $this->set_content_type($content_type);
+        $this->response->add_header(
+            'Content-Disposition',
+            "{$content_disposition}; " . encode_header_parameter(
+                'filename',
+                FileManager::cleanFileName($filename ?: basename($file))
+            )
+        );
+        $this->response->add_header('Content-Length', filesize($file));
+        $this->response->add_header('Content-Transfer-Encoding',  'binary');
+        $this->response->add_header('Pragma', 'public');
+        $this->render_text(function () use ($file, $chunk_size, $callback) {
+            $fp = fopen($file, 'rb');
+
+            while (!feof($fp)) {
+                yield fgets($fp, $chunk_size);
+            }
+
+            fclose($fp);
+
+            if ($callback) {
+                $callback($file);
+            }
+        });
+    }
+
+    /**
+     * Renders a temporary file which will be deleted after transmission.
+     * This is just a convenience method so you don't have to write the delete
+     * callback.
+     *
+     * @param string  $file                Path of the file to render
+     * @param string  $filename            Name of the file displayed to user
+     *                                     (will equal $file when missing)
+     * @param string  $content_type        Optional content type (will be determined if missing)
+     * @param string  $content_disposition Either attachment (default) or inline
+     * @param Closure $callback            Optional callback when download has finished
+     * @param int     $chunk_size          Optional size of chunks to send (default: 256k)
+     */
+    public function render_temporary_file(
+        $file,
+        $filename = null,
+        $content_type = null,
+        $content_disposition = 'attachment',
+        Closure $callback = null,
+        $chunk_size = 262144
+
+    ) {
+        $delete_callback = function ($file) use ($callback) {
+            unlink($file);
+
+            if ($callback) {
+                $callback($file);
+            }
+        };
+
+        $this->render_file(
+            $file,
+            $filename,
+            $content_type,
+            $content_disposition,
+            $delete_callback,
+            $chunk_size
+        );
+    }
+
+    public function render_form(\Studip\Forms\Form $form)
+    {
+        $this->render_text($form->render());
+    }
+
+    /**
+     * relays current request to another controller and returns the response
+     * the other controller is given all assigned properties, additional parameters are passed
+     * through
+     *
+     * @param string $to_uri a trails route
+     * @return Trails_Response
+     */
+    public function relay($to_uri/* , ... */)
+    {
+        $args = func_get_args();
+        $uri = array_shift($args);
+        [$controller_path, $unconsumed] = '' === $uri ? $this->dispatcher->default_route() : $this->dispatcher->parse($uri);
+
+        $controller = $this->dispatcher->load_controller($controller_path);
+        $assigns = $this->get_assigned_variables();
+        unset($assigns['controller']);
+        foreach ($assigns as $k => $v) {
+            $controller->$k = $v;
+        }
+        $controller->layout = null;
+        $controller->parent_controller = $this;
+        array_unshift($args, $unconsumed);
+        return $controller->perform_relayed(...$args);
+    }
+
+    /**
+     * Relays current request and performs redirect if neccessary.
+     *
+     * @param string $to_uri a trails route
+     * @return Trails_Response
+     *
+     * @see StudipController::relay()
+     */
+    public function relayWithRedirect(...$args): Trails_Response
+    {
+        $response = $this->relay(...$args);
+
+        // If the relayed action should perform a redirect, do so
+        if (isset($response->headers['Location'])) {
+            header("Location: {$response->headers['Location']}");
+            page_close();
+            die;
+        }
+
+        return $response;
+    }
+
+    /**
+     * perform a given action/parameter string from an relayed request
+     * before_filter and after_filter methods are not called
+     *
+     * @see perform
+     * @param string $unconsumed
+     * @return Trails_Response
+     */
+    public function perform_relayed($unconsumed/* , ... */)
+    {
+        $args = func_get_args();
+        $unconsumed = array_shift($args);
+
+        [$action, $extracted_args, $format] = $this->extract_action_and_args($unconsumed);
+        $this->format = isset($format) ? $format : 'html';
+        $this->current_action = $action;
+        $args = array_merge($extracted_args, $args);
+        $callable = $this->map_action($action);
+
+        if (is_callable($callable)) {
+            $callable(...$args);
+        } else {
+            $this->does_not_understand($action, $args);
+        }
+
+        if (!$this->performed) {
+            $this->render_action($action);
+        }
+        return $this->response;
+    }
+
+    /**
+     * Renders a given template and returns the resulting string.
+     *
+     * @param string $template Name of the template file
+     * @param mixed  $layout   Optional layout
+     * @return string
+     */
+    public function render_template_as_string($template, $layout = null)
+    {
+        $template = $this->get_template_factory()->open($template);
+        $template->set_layout($layout);
+        $template->set_attributes($this->get_assigned_variables());
+        return $template->render();
+    }
+
+    /**
+     * Magic methods that intercepts all unknown method calls.
+     * If a method is called that matches an action on this controller,
+     * an url to that action is generated.
+     *
+     * Basically, this:
+     *
+     *    <code>$controller->url_for('foo/bar/baz/' . $param)</code>
+     *
+     * is equal to calling this on the Foo_BarController:
+     *
+     *    <code>$controller->baz($param)</code>
+     *
+     * @param String $method    Called method name
+     * @param array  $argumetns Provided arguments
+     * @return url to the requested action
+     * @throws Trails_UnknownAction if no action matches the method
+     */
+    public function __call($method, $arguments)
+    {
+        $function = 'action_link';
+        if (mb_strpos($method, 'Link') === mb_strlen($method) - 4) {
+            $method = mb_substr($method, 0, -4);
+        } elseif (mb_strpos($method, 'URL') === mb_strlen($method) - 3) {
+            $function = 'action_url';
+            $method = mb_substr($method, 0, -3);
+        }
+
+        if (!$this->has_action($method)) {
+            throw new Trails_UnknownAction("Unknown action '{$method}'");
+        }
+
+        array_unshift($arguments, $method);
+        return call_user_func_array([$this, $function], $arguments);
+    }
+
+    /**
+     * Returns whether this controller has the specificed action.
+     *
+     * @param string $action Name of the action
+     * @return true if action is defined, false otherwise
+     */
+    public function has_action($action)
+    {
+        return method_exists($this, $action . '_action')
+            || ($this->parent_controller
+                && $this->parent_controller->has_action($action));
+    }
+
+    /**
+     * Generates the url for an action on this controller without the
+     * neccessity to provide the full "path" to the action (since it
+     * is implicitely known).
+     *
+     * Basically, this:
+     *
+     *    <code>$controller->url_for('foo/bar/baz/' . $param)</code>
+     *
+     * is equal to calling this on the Foo_BarController:
+     *
+     *    <code>$controller->action_url('baz/' . $param)</code>
+     *
+     * @param string $action Name of the action
+     * @return string url to the requested action
+     */
+    public function action_url($action)
+    {
+        $arguments = func_get_args();
+        $arguments[0] = $this->controller_path() . '/' . $arguments[0];
+
+        return $this->url_for(...$arguments);
+    }
+
+    /**
+     * Generates the link for an action on this controller without the
+     * neccessity to provide the full "path" to the action (since it
+     * is implicitely known).
+     *
+     * Basically, this:
+     *
+     *    <code>$controller->link_for('foo/bar/baz/' . $param)</code>
+     *
+     * is equal to calling this on the Foo_BarController:
+     *
+     *    <code>$controller->action_link('baz/' . $param)</code>
+     *
+     * @param string $action Name of the action
+     * @return string to the requested action
+     */
+    public function action_link($action)
+    {
+        return htmlReady($this->action_url(...func_get_args()));
+    }
+
+    /**
+     * Returns the url path to this controller.
+     *
+     * @return string url path to this controller
+     */
+    protected function controller_path()
+    {
+        $class = get_class($this->parent_controller ?? $this);
+        $controller = mb_substr($class, 0, -mb_strlen('Controller'));
+        $controller = strtosnakecase($controller);
+        return preg_replace('/_{2,}/', '/', $controller);
+    }
+
+
+    /**
+     * Validate the datetime according to specific format.
+     *
+     * @param string $datetime the datetime which should be validate
+     * @param string $format the format that the datetime should have by default H:i for time
+     *
+     * @return bool result of validation
+     */
+    public function validate_datetime($datetime, $format = 'H:i')
+    {
+        $dt = DateTime::createFromFormat($format, $datetime);
+        return $dt && $dt->format($format) == date('H:i',strtotime($datetime));
+    }
+
+    /**
+     * Export xlsx and csv files via PhpSpreadsheet
+     *
+     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+     */
+    public function render_spreadsheet(
+        array $header,
+        array $data,
+        string $format,
+        string $filename,
+        ?string $filepath = null
+    ): void  {
+        $render_to_browser = false;
+        if ($filepath == null) {
+            $render_to_browser = true;
+            $filepath = tempnam($GLOBALS['TMP_PATH'], 'spreadsheet');
+        }
+        $spreadsheet = new Spreadsheet();
+        $activeWorksheet = $spreadsheet->getActiveSheet();
+        $activeWorksheet->fromArray($header);
+        $activeWorksheet->fromArray($data, null, 'A2');
+
+        if ($format === 'xlsx') {
+            $writer = new Xlsx($spreadsheet);
+        } elseif ($format === 'csv') {
+            $writer = new Csv($spreadsheet);
+        } else {
+            throw new Exception("Format {$format} is not supported");
+        }
+
+        $writer->save($filepath);
+
+        if ($render_to_browser) {
+            $this->response->add_header('Cache-Control', 'cache, must-revalidate');
+            $this->render_temporary_file(
+                $filepath,
+                $filename,
+                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            );
+        }
+    }
+
+    /**
+     * Creates the body element id for this controller a given action.
+     *
+     * @param string $unconsumed_path Unconsumed path to extract action from
+     * @return string
+     */
+    protected function getBodyElementIdForControllerAndAction($unconsumed_path)
+    {
+        // Extract action from unconsumed path segment
+        [$action] = $this->extract_action_and_args($unconsumed_path);
+
+        // Extract controller name from class name
+        $controller = preg_replace('/Controller$/', '', get_class($this));
+        $controller = Trails_Inflector::underscore($controller);
+
+        // Build main parts of the body element id
+        $body_id_parts = explode('/', $controller);
+        $body_id_parts[] = $action;
+
+        // Create and set body element id
+        $body_id = implode('-', $body_id_parts);
+
+        return $body_id;
+    }
+}
diff --git a/lib/classes/StudipControllerPropertiesTrait.php b/lib/classes/StudipControllerPropertiesTrait.php
new file mode 100644
index 0000000..4e906fa
--- /dev/null
+++ b/lib/classes/StudipControllerPropertiesTrait.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * This trait manages all variable assignments to the controller and templates.
+ *
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since Stud.IP 5.2
+ */
+trait StudipControllerPropertiesTrait
+{
+    /**
+     * Stores the assigned variables.
+     * @var array
+     */
+    protected $_template_variables = [];
+
+    /**
+     * Returns whether a variable is set.
+     *
+     * @param string $offset
+     * @return bool
+     */
+    public function __isset(string $offset): bool
+    {
+        return isset($this->_template_variables[$offset]);
+    }
+
+    /**
+     * Stores a variable.
+     *
+     * @param string $offset
+     * @param mixed $value
+     */
+    public function __set(string $offset, $value): void
+    {
+        $this->_template_variables[$offset] = $value;
+    }
+
+    /**
+     * Returns a previously set variable.
+     *
+     * @param string $offset
+     * @return mixed
+     */
+    public function &__get(string $offset)
+    {
+        if (!isset($this->_template_variables[$offset])) {
+            $this->_template_variables[$offset] = null;
+        }
+        return $this->_template_variables[$offset];
+    }
+
+    /**
+     * Unsets a previously set variable
+     *
+     * @param string $offset
+     */
+    public function __unset(string $offset): void
+    {
+        unset($this->_template_variables[$offset]);
+    }
+
+    public function get_assigned_variables(): array
+    {
+        $variables = $this->_template_variables;
+        $variables['controller'] = $this;
+        return $variables;
+    }
+}
diff --git a/lib/classes/StudipResponse.php b/lib/classes/StudipResponse.php
new file mode 100644
index 0000000..1c15326
--- /dev/null
+++ b/lib/classes/StudipResponse.php
@@ -0,0 +1,55 @@
+<?php
+class StudipResponse extends Trails_Response
+{
+    /**
+     * Outputs this response to the client using "echo" and "header".
+     *
+     * This extension allows the body to be a callable and handles generators
+     * by outputting the chunks yielded by the generator.
+     */
+    public function output()
+    {
+        if (isset($this->status)) {
+            $this->send_header(
+                "{$_SERVER['SERVER_PROTOCOL']} {$this->status} {$this->reason}",
+                true,
+                $this->status
+            );
+        }
+
+        // Send headers
+        foreach ($this->headers as $k => $v) {
+            $this->send_header("{$k}: {$v}");
+        }
+
+        // Determine output
+        if (is_callable($this->body)) {
+            $output = call_user_func($this->body);
+        } else {
+            $output = $this->body;
+        }
+
+        if ($output instanceof Generator) {
+            // Clear output buffer
+            while (ob_get_level()) {
+                ob_end_clean();
+            }
+
+            // Ensure generator will run to the end
+            $abort = ignore_user_abort(true);
+
+            // Output chunks yielded by generator
+            foreach ($output as $chunk) {
+                if (!connection_aborted()) {
+                    echo $chunk;
+                    flush();
+                }
+            }
+
+            // Reset user abort to previous state
+            ignore_user_abort($abort);
+        } else {
+            echo $output;
+        }
+    }
+}
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index 2216111..e5299a6 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -60,7 +60,6 @@ StudipAutoloader::addAutoloadPath('lib/plugins/engine');
 StudipAutoloader::addAutoloadPath('lib/plugins/core');
 StudipAutoloader::addAutoloadPath('lib/plugins/db');
 
-StudipAutoloader::addClassLookup('StudipController', 'app/controllers/studip_controller.php');
 $trails_classes = [
     'Trails_Dispatcher', 'Trails_Response', 'Trails_Controller',
     'Trails_Inflector', 'Trails_Flash',
-- 
cgit v1.0


From e2df6525b5b19f2ead4967630c437b89558afcf3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 09:21:07 +0000
Subject: allow setting configuration by environment variables, fixes #3560

Closes #3560

Merge request studip/studip!2875
---
 .env.dist                                   |  15 ++
 app/views/admin/configuration/table-row.php |  16 +-
 composer.json                               |   3 +-
 composer.lock                               | 223 +++++++++++++++++++++++++++-
 config/config_defaults.inc.php              |  16 +-
 lib/bootstrap-autoload.php                  |   3 -
 lib/bootstrap.php                           |  10 +-
 lib/classes/Config.class.php                |  16 ++
 8 files changed, 285 insertions(+), 17 deletions(-)
 create mode 100644 .env.dist

diff --git a/.env.dist b/.env.dist
new file mode 100644
index 0000000..3d1b90b
--- /dev/null
+++ b/.env.dist
@@ -0,0 +1,15 @@
+# MYSQL_HOST=""
+# MYSQL_USER=""
+# MYSQL_PASSWORD=""
+# MYSQL_DATABASE=""
+
+# STUDIP_CACHING_ENABLE=""
+# STUDIP_CACHE_IS_SESSION_STORAGE=""
+# STUDIP_ENV=""
+# STUDIP_MAIL_TRANSPORT=""
+# STUDIP_PLUGINS_UPLOAD_ENABLE=""
+
+## You may also change configuration settings from the environment. To do so, prefix the configuration name with
+## "STUDIP_CONFIG_". Example for changing the site name:
+#
+# STUDIP_CONFIG_UNI_NAME_CLEAN="new uni name"
diff --git a/app/views/admin/configuration/table-row.php b/app/views/admin/configuration/table-row.php
index 12769ed..a0725a5 100644
--- a/app/views/admin/configuration/table-row.php
+++ b/app/views/admin/configuration/table-row.php
@@ -9,12 +9,16 @@
 ?>
 <tr id="field-<?= htmlReady($field) ?>">
     <td>
+    <? if (!Config::get()->fromEnv($field)): ?>
         <a data-dialog href="<?= $controller->link_for($linkchunk, compact('field')) ?>">
             <?= htmlReady($field) ?>
         </a>
-        <? if (!empty($description)): ?>
-            <br><small><?= htmlReady($description) ?></small>
-        <? endif; ?>
+    <? else: ?>
+        <?= htmlReady($field) ?>
+    <? endif; ?>
+    <? if (!empty($description)): ?>
+        <br><small><?= htmlReady($description) ?></small>
+    <? endif; ?>
     </td>
     <td class="wrap-content">
         <? if ($type === 'string' || $type === 'i18n'): ?>
@@ -31,8 +35,14 @@
     </td>
     <td><?= htmlReady($type) ?></td>
     <td class="actions">
+    <? if (!Config::get()->fromEnv($field)): ?>
         <a data-dialog="size=auto" href="<?= $controller->link_for($linkchunk, compact('field')) ?>">
             <?= Icon::create('edit')->asImg(['title' => _('Konfigurationsparameter bearbeiten')]) ?>
         </a>
+    <? else: ?>
+        <?= Icon::create('ufo', Icon::ROLE_INFO)->asImg([
+            'title' => _('Wert wurde über eine Umgebungsvariable gesetzt und kann an dieser Stelle nicht verändert werden.'),
+        ]) ?>
+    <? endif; ?>
     </td>
 </tr>
diff --git a/composer.json b/composer.json
index 92003f8..64ed048 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,8 @@
         "symfony/polyfill-php83": "^1.28",
         "phpoffice/phpspreadsheet": "^1.19",
         "psy/psysh": "^0.12.2",
-        "okvpn/clock-lts": "^1.0"
+        "okvpn/clock-lts": "^1.0",
+        "vlucas/phpdotenv": "^5.6"
     },
     "replace": {
         "symfony/polyfill-php73": "*",
diff --git a/composer.lock b/composer.lock
index 0c2e769..c469e1e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2300fa9bd6d32d616b562b0790585cbe",
+    "content-hash": "69b82b7aa6db216cb8afdb9da520b4e7",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -413,6 +413,68 @@
             "time": "2020-11-24T22:02:12+00:00"
         },
         {
+            "name": "graham-campbell/result-type",
+            "version": "v1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/GrahamCampbell/Result-Type.git",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "GrahamCampbell\\ResultType\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                }
+            ],
+            "description": "An Implementation Of The Result Type",
+            "keywords": [
+                "Graham Campbell",
+                "GrahamCampbell",
+                "Result Type",
+                "Result-Type",
+                "result"
+            ],
+            "support": {
+                "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T22:16:48+00:00"
+        },
+        {
             "name": "guzzlehttp/psr7",
             "version": "2.4.4",
             "source": {
@@ -2433,6 +2495,81 @@
             "time": "2021-10-31T15:09:20+00:00"
         },
         {
+            "name": "phpoption/phpoption",
+            "version": "1.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-option.git",
+                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                },
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpOption\\": "src/PhpOption/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "https://github.com/schmittjoh"
+                },
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                }
+            ],
+            "description": "Option Type for PHP",
+            "keywords": [
+                "language",
+                "option",
+                "php",
+                "type"
+            ],
+            "support": {
+                "issues": "https://github.com/schmittjoh/php-option/issues",
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T21:59:55+00:00"
+        },
+        {
             "name": "phpowermove/docblock",
             "version": "v2.0.1",
             "source": {
@@ -5017,6 +5154,90 @@
             "time": "2021-09-14T12:46:25+00:00"
         },
         {
+            "name": "vlucas/phpdotenv",
+            "version": "v5.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/phpdotenv.git",
+                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "graham-campbell/result-type": "^1.1.2",
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.2",
+                "symfony/polyfill-ctype": "^1.24",
+                "symfony/polyfill-mbstring": "^1.24",
+                "symfony/polyfill-php80": "^1.24"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "ext-filter": "*",
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+            },
+            "suggest": {
+                "ext-filter": "Required to use the boolean validator."
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                },
+                "branch-alias": {
+                    "dev-master": "5.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "https://github.com/vlucas"
+                }
+            ],
+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "keywords": [
+                "dotenv",
+                "env",
+                "environment"
+            ],
+            "support": {
+                "issues": "https://github.com/vlucas/phpdotenv/issues",
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T22:43:29+00:00"
+        },
+        {
             "name": "willdurand/negotiation",
             "version": "3.1.0",
             "source": {
diff --git a/config/config_defaults.inc.php b/config/config_defaults.inc.php
index 4a362ad..5901c24 100644
--- a/config/config_defaults.inc.php
+++ b/config/config_defaults.inc.php
@@ -10,10 +10,10 @@ please fill in your database connection settings.
 */
 
 // default Stud.IP database (DB_Seminar)
-$DB_STUDIP_HOST = "localhost";
-$DB_STUDIP_USER = "";
-$DB_STUDIP_PASSWORD = "";
-$DB_STUDIP_DATABASE = "studip";
+$DB_STUDIP_HOST = $_ENV['MYSQL_HOST'] ?? 'localhost';
+$DB_STUDIP_USER = $_ENV['MYSQL_USER'] ?? '';
+$DB_STUDIP_PASSWORD = $_ENV['MYSQL_PASSWORD'] ?? '';
+$DB_STUDIP_DATABASE = $_ENV['MYSQL_DATABASE'] ?? 'studip';
 $DEBUG_ALL_DB_QUERIES_WITH_TRACE = false;
 /*
 // optional Stud.IP slave database
@@ -66,9 +66,9 @@ $TMP_PATH ="/tmp";                                  //the system temp path
 $MEDIA_CACHE_PATH = $STUDIP_BASE_PATH . '/data/media_cache';
 
 //caching
-$CACHING_ENABLE = true;
+$CACHING_ENABLE = $_ENV['STUDIP_CACHING_ENABLE'] ?? true;
 $CACHING_FILECACHE_PATH = $TMP_PATH . '/studip_cache';
-$CACHE_IS_SESSION_STORAGE = false;                 //store session data in cache
+$CACHE_IS_SESSION_STORAGE = $_ENV['STUDIP_CACHE_IS_SESSION_STORAGE'] ?? false; //store session data in cache
 
 /*Stud.IP modules
 ----------------------------------------------------------------
@@ -159,7 +159,7 @@ $ELEARNING_INTERFACE_MODULES["loncapa"] =
         ]
 ];
 
-$PLUGINS_UPLOAD_ENABLE = TRUE;      //Upload of Plugins is enabled
+$PLUGINS_UPLOAD_ENABLE = $_ENV['STUDIP_PLUGIN_UPLOAD_ENABLE'] ?? true;      //Upload of Plugins is enabled
 
 $PLUGIN_REPOSITORIES = [
     'https://develop.studip.de/studip/plugins.php/pluginmarket/extern/xml',
@@ -193,7 +193,7 @@ sendmail  use local sendmail script
 qmail     use local Qmail MTA
 debug     mails are only written to a file in $TMP_PATH
 */
-$MAIL_TRANSPORT = "smtp";
+$MAIL_TRANSPORT = $_ENV['STUDIP_MAIL_TRANSPORT'] ?? 'smtp';
 
 /*smtp settings
 ----------------------------------------------------------------
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index 3a767c1..eb9ac12 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -1,7 +1,4 @@
 <?php
-// Include composer's autoload
-require __DIR__ . '/../composer/autoload.php';
-
 // Setup autoloading
 require 'lib/classes/StudipAutoloader.php';
 StudipAutoloader::register();
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 06ddca5..364f9d9 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -9,8 +9,16 @@
  * the License, or (at your option) any later version.
  */
 
+// Include composer's autoload
+require __DIR__ . '/../composer/autoload.php';
+
+// Load enviroment
+$dot_env_path = __DIR__ . '/..';
+$dotenv = \Dotenv\Dotenv::createImmutable($dot_env_path);
+$dotenv->safeLoad();
+
 // Default environment, do not change. Change in config/config_local.inc.php.
-const DEFAULT_ENV = 'production';
+define('DEFAULT_ENV',  $_ENV['STUDIP_ENV'] ?? 'production');
 
 //software version - please leave it as it is!
 $SOFTWARE_VERSION = '6.0.alpha';
diff --git a/lib/classes/Config.class.php b/lib/classes/Config.class.php
index 2f6b728..642665d 100644
--- a/lib/classes/Config.class.php
+++ b/lib/classes/Config.class.php
@@ -127,9 +127,14 @@ class Config implements ArrayAccess, Countable, IteratorAggregate
      */
     public function getValue($field)
     {
+        if ($this->fromEnv($field)) {
+            return $_ENV["STUDIP_CONFIG_{$field}"];
+        }
+
         if (array_key_exists($field, $this->data)) {
             return $this->data[$field];
         }
+
         if (isset($GLOBALS[$field]) && !isset($_REQUEST[$field])) {
             return $GLOBALS[$field];
         }
@@ -450,4 +455,15 @@ class Config implements ArrayAccess, Countable, IteratorAggregate
 
         return (string) $value;
     }
+
+    /**
+     * Returns whether the value was set from the environment.
+     *
+     * @param string $field
+     * @return bool
+     */
+    public function fromEnv(string $field): bool
+    {
+        return isset($_ENV["STUDIP_CONFIG_{$field}"]);
+    }
 }
-- 
cgit v1.0


From 6a69943b16197ce98474953e6d425b520a834865 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Mon, 6 May 2024 11:53:47 +0200
Subject: select plugins correctly, re #3977

---
 db/migrations/5.1.57_cleanup_tool_activations.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/migrations/5.1.57_cleanup_tool_activations.php b/db/migrations/5.1.57_cleanup_tool_activations.php
index 6700816..2f4bda2 100644
--- a/db/migrations/5.1.57_cleanup_tool_activations.php
+++ b/db/migrations/5.1.57_cleanup_tool_activations.php
@@ -17,7 +17,8 @@ return new class extends Migration
                       SELECT `pluginid`
                       FROM `plugins`
                       WHERE FIND_IN_SET(?, `plugintype`)
+                         OR FIND_IN_SET(?, `plugintype`)
                   )";
-        DBManager::get()->execute($query, [StandardPlugin::class]);
+        DBManager::get()->execute($query, [StudipModule::class, StandardPlugin::class]);
     }
 };
-- 
cgit v1.0


From 57bd2457f68b705c706900394a88891fc2b3ad8d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 11:29:42 +0000
Subject: remove extra from icons and adjust tests, re #3788

Merge request studip/studip!2871
---
 lib/classes/Icon.class.php               | 11 +++++---
 tests/unit/lib/classes/IconClassTest.php | 48 ++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/lib/classes/Icon.class.php b/lib/classes/Icon.class.php
index ca0b9e0..6c586a0 100644
--- a/lib/classes/Icon.class.php
+++ b/lib/classes/Icon.class.php
@@ -338,7 +338,7 @@ class Icon
         $classNames = 'icon-role-' . $this->role;
 
         if (!self::isStatic($this->shape)) {
-            $classNames .= ' icon-shape-' . $this->shape;
+            $classNames .= ' icon-shape-' . $this->shapeToPath($this->shape);
         }
 
         $result['class'] = isset($result['class']) ? $result['class'] . ' ' . $classNames : $classNames;
@@ -385,8 +385,11 @@ class Icon
     // transforms a shape w/ possible additions (`shape`) to a path `(addition/)?shape`
     private function shapeToPath()
     {
-        return self::isStatic($this->shape)
-            ? $this->shape :
-            join('/', array_reverse(explode('+', preg_replace('/\.svg$/', '', $this->shape))));
+        if (self::isStatic($this->shape)) {
+            return $this->shape;
+        }
+        $shape = array_reverse(explode('/', $this->shape))[0];
+        $shape = explode('+', $shape)[0];
+        return $shape;
     }
 }
diff --git a/tests/unit/lib/classes/IconClassTest.php b/tests/unit/lib/classes/IconClassTest.php
index eb743b9..0e79df9 100644
--- a/tests/unit/lib/classes/IconClassTest.php
+++ b/tests/unit/lib/classes/IconClassTest.php
@@ -27,7 +27,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img width="16" height="16" src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
-            Icon::create('vote', 'clickable')->asImg()
+            Icon::create('vote')->asImg()
         );
     }
 
@@ -35,7 +35,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img width="16" height="16" src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
-            Icon::create('vote', 'clickable')->asImg()
+            Icon::create('vote')->asImg()
         );
     }
 
@@ -43,7 +43,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img width="20" height="20" src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
-            Icon::create('vote', 'clickable')->asImg(20)
+            Icon::create('vote')->asImg(20)
         );
     }
 
@@ -51,7 +51,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img title="Mit Anhang" width="20" height="20" src="images/icons/blue/vote.svg" class="icon-role-clickable icon-shape-vote">',
-            Icon::create('vote', 'clickable', ['title' => _("Mit Anhang")])->asImg(20)
+            Icon::create('vote')->asImg(20, ['title' => _('Mit Anhang')])
         );
     }
 
@@ -59,7 +59,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img hspace="3" width="16" height="16" src="images/icons/blue/arr_2left.svg" alt="" class="icon-role-clickable icon-shape-arr_2left">',
-            Icon::create('arr_2left', 'clickable')->asImg(['hspace' => 3])
+            Icon::create('arr_2left')->asImg(['hspace' => 3])
         );
     }
 
@@ -67,7 +67,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img class="text-bottom icon-role-info icon-shape-staple" width="20" height="20" src="images/icons/black/staple.svg" alt="">',
-            Icon::create('staple', 'info')->asImg(20, ['class' => 'text-bottom'])
+            Icon::create('staple', Icon::ROLE_INFO)->asImg(20, ['class' => 'text-bottom'])
         );
     }
 
@@ -75,7 +75,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img title="Datei hochladen" class="text-bottom icon-role-new icon-shape-upload" width="20" height="20" src="images/icons/red/upload.svg">',
-            Icon::create('upload', 'new', ['title' => _("Datei hochladen")])
+            Icon::create('upload', Icon::ROLE_NEW, ['title' => _("Datei hochladen")])
                 ->asImg(20, ['class' => 'text-bottom'])
         );
     }
@@ -84,22 +84,22 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<input type="image" class="text-bottom icon-role-clickable icon-shape-upload" width="20" height="20" src="images/icons/blue/upload.svg" alt="">',
-            Icon::create('upload', 'clickable')->asInput(20, ['class' => 'text-bottom'])
+            Icon::create('upload')->asInput(20, ['class' => 'text-bottom'])
         );
     }
 
     function testIconIsImmutable()
     {
-        $icon = Icon::create('upload', 'clickable', ['title' => _('a title')]);
-        $copy = $icon->copyWithRole('clickable');
+        $icon = Icon::create('upload', Icon::ROLE_CLICKABLE, ['title' => _('a title')]);
+        $copy = $icon->copyWithRole(Icon::ROLE_CLICKABLE);
 
         $this->assertNotSame($icon, $copy);
     }
 
     function testIconCopyWithRole()
     {
-        $icon = Icon::create('upload', 'clickable', ['title' => _('a title')]);
-        $copy = $icon->copyWithRole('info');
+        $icon = Icon::create('upload', Icon::ROLE_CLICKABLE, ['title' => _('a title')]);
+        $copy = $icon->copyWithRole(Icon::ROLE_INFO);
 
         $this->assertEquals($icon->getShape(),      $copy->getShape());
         $this->assertNotEquals($icon->getRole(),    $copy->getRole());
@@ -108,7 +108,7 @@ class IconClassTest extends \Codeception\Test\Unit
 
     function testIconCopyWithShape()
     {
-        $icon = Icon::create('upload', 'clickable', ['title' => _('a title')]);
+        $icon = Icon::create('upload', Icon::ROLE_CLICKABLE, ['title' => _('a title')]);
         $copy = $icon->copyWithShape('staple');
 
         $this->assertNotEquals($icon->getShape(),   $copy->getShape());
@@ -118,7 +118,7 @@ class IconClassTest extends \Codeception\Test\Unit
 
     function testIconCopyWithAttributes()
     {
-        $icon = Icon::create('upload', 'clickable', ['title' => _('a title')]);
+        $icon = Icon::create('upload', Icon::ROLE_CLICKABLE, ['title' => _('a title')]);
         $copy = $icon->copyWithAttributes(['title' => _('another title')]);
 
         $this->assertEquals($icon->getShape(),         $copy->getShape());
@@ -136,7 +136,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             'background-image:url(images/icons/blue/vote.svg);background-size:17px 17px;',
-            Icon::create('vote', 'clickable')->asCSS(17)
+            Icon::create('vote')->asCSS(17)
         );
     }
 
@@ -144,7 +144,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             'images/icons/blue/vote.svg',
-            Icon::create('vote', 'clickable')->asImagePath()
+            Icon::create('vote')->asImagePath()
         );
     }
 
@@ -152,7 +152,7 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<img src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
-            Icon::create('vote', 'clickable')->asImg(false)
+            Icon::create('vote')->asImg(false)
         );
     }
 
@@ -160,7 +160,19 @@ class IconClassTest extends \Codeception\Test\Unit
     {
         $this->assertEquals(
             '<input type="image" src="images/icons/blue/upload.svg" alt="" class="icon-role-clickable icon-shape-upload">',
-            Icon::create('upload', 'clickable')->asInput(false)
+            Icon::create('upload')->asInput(false)
+        );
+    }
+
+    function testIconCreateRemovedExtras()
+    {
+        $this->assertEquals(
+            '<img src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
+            Icon::create('add/vote')->asImg(false)
+        );
+        $this->assertEquals(
+            '<img src="images/icons/blue/vote.svg" alt="" class="icon-role-clickable icon-shape-vote">',
+            Icon::create('vote+add')->asImg(false)
         );
     }
 }
-- 
cgit v1.0


From 81d4d624bdf79caff709fe9f23bf4d9fd6b90598 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 6 May 2024 11:36:19 +0000
Subject: remove obsolet functions, fixes #4002

Closes #4002

Merge request studip/studip!2851
---
 RELEASE-NOTES.md  |  1 +
 lib/functions.php | 58 -------------------------------------------------------
 2 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9f3f8c6..18c0ae6 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -18,6 +18,7 @@
 - Die Funktionen `studip_json_encode()` und `studip_json_decode()` wurden entfernt. Stattdessen müssen die Methode `json_encode()` und `json_decode()` verwendet werden. ([Issue #3814](https://gitlab.studip.de/studip/studip/-/issues/3814))
 - Die `MembersModel.php` wurde entfernt ([Issue #3811](https://gitlab.studip.de/studip/studip/-/issues/3811))
 - Die `admission.inc.php` wurde entfernt. ([Issue #3812](https://gitlab.studip.de/studip/studip/-/issues/3812))
+- Die folgenden Funktionen wurden aus der Datei `lib/functions.php` entfernt: `re_sort_dozenten()`, `re_sort_tutoren()` und `get_next_position()` ([Issue #4002](https://gitlab.studip.de/studip/studip/-/issues/4002))
 - Die Methoden `CronjobScheduler::scheduleOnce()` sowie `CronjobTask::scheduleOnce()` wurden ersatzlos entfernt. ([Issue #4078](https://gitlab.studip.de/studip/studip/-/issues/4078))
 - Die folgenden Klassen wurden innerhalb von Stud.IP verschoben. Da sie über den Autoloader geladen werden, kann jedes manuelle Einbinden ersatzlos entfernt werden. ([Issue #4105](https://gitlab.studip.de/studip/studip/-/issues/4105))
   - `AuthenticatedController`
diff --git a/lib/functions.php b/lib/functions.php
index b68658a..0e806aa 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -504,64 +504,6 @@ function check_and_set_date($tag, $monat, $jahr, $stunde, $minute, &$arr, $field
     return $check;
 }
 
-/**
- * reset the order-positions for the lecturers in the passed seminar,
- * starting at the passed position
- *
- * @param string $s_id     the seminar to work on
- * @param int    $position the position to start with
- * @deprecated since Stud.IP 5.3
- *
- * @return void
- */
-function re_sort_dozenten($s_id, $position)
-{
-    $query = "UPDATE seminar_user
-              SET position = position - 1
-              WHERE Seminar_id = ? AND status = 'dozent' AND position > ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$s_id, $position]);
-}
-
-/**
- * reset the order-positions for the tutors in the passed seminar,
- * starting at the passed position
- *
- * @param string $s_id     the seminar to work on
- * @param int    $position the position to start with
- * @deprecated since Stud.IP 5.3
- *
- * @return void
- */
-function re_sort_tutoren($s_id, $position)
-{
-    $query = "UPDATE seminar_user
-              SET position = position - 1
-              WHERE Seminar_id = ? AND status = 'tutor' AND position > ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$s_id, $position]);
-}
-
-/**
- * return the highest position-number increased by one for the
- * passed user-group in the passed seminar
- *
- * @param string $status     can be on of 'tutor', 'dozent', ...
- * @param string $seminar_id the seminar to work on
- * @deprecated since Stud.IP 5.3
- *
- * @return int  the next available position
- */
-function get_next_position($status, $seminar_id)
-{
-    $query = "SELECT MAX(position) + 1
-              FROM seminar_user
-              WHERE Seminar_id = ? AND status = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$seminar_id, $status]);
-
-    return $statement->fetchColumn() ?: 0;
-}
 
 /**
  * converts a string to a float, depending on the locale
-- 
cgit v1.0


From 4d98ebd6c7f57d8cc10599c74f2c8c061e907d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Mon, 6 May 2024 11:40:39 +0000
Subject: =?UTF-8?q?Resolve=20#3989=20"Filter=20"Vorletztes=20und=20aktuell?=
 =?UTF-8?q?es=20Semester"=20f=C3=BCr=20meine=20Veranstaltungen"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3989

Merge request studip/studip!2838
---
 app/controllers/my_courses.php |  6 +++++-
 lib/classes/MyRealmModel.php   | 22 ++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index 9e8e0b6..8205c12 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -344,7 +344,10 @@ class MyCoursesController extends AuthenticatedController
         $semesters   = MyRealmModel::getSelectedSemesters($sem);
         $min_sem_key = min($semesters);
         $max_sem_key = max($semesters);
-        $courses     = MyRealmModel::getCourses($min_sem_key, $max_sem_key, compact('deputies_enabled'));
+        $courses     = MyRealmModel::getCourses($min_sem_key, $max_sem_key, [
+            'deputies_enabled' => $deputies_enabled,
+            'exactly'          => $semesters,
+        ]);
         foreach ($courses as $index => $course) {
             MyRealmModel::setObjectVisits($course, $GLOBALS['user']->id, $timestamp);
         }
@@ -1168,6 +1171,7 @@ class MyCoursesController extends AuthenticatedController
             'future'      => _('Aktuelles und nächstes Semester'),
             'last'        => _('Aktuelles und letztes Semester'),
             'lastandnext' => _('Letztes, aktuelles, nächstes Semester'),
+            'lastbutone'  => _('Aktuelles und vorletztes Semester'),
         ];
 
         if (Config::get()->MY_COURSES_ENABLE_ALL_SEMESTERS) {
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 0279fe5..94bb30d 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -163,16 +163,22 @@ class MyRealmModel
     public static function getCourses($min_sem_key, $max_sem_key, $params = [])
     {
         // init
-        $order_by          = $params['order_by'] ?? null;
-        $order             = $params['order'] ?? null;
-        $deputies_enabled  = $params['deputies_enabled'];
+        $order_by         = $params['order_by'] ?? null;
+        $order            = $params['order'] ?? null;
+        $deputies_enabled = $params['deputies_enabled'];
 
         $sem_data = Semester::getAllAsArray();
 
         $semester_ids = [];
         if (is_numeric($min_sem_key) && is_numeric($max_sem_key)) {
             foreach ($sem_data as $index => $data) {
-                if ($index >= $min_sem_key && $index <= $max_sem_key) {
+                if (
+                    $index >= $min_sem_key && $index <= $max_sem_key
+                    && (
+                        !isset($params['exactly'])
+                        || in_array($index, $params['exactly'])
+                    )
+                ) {
                     $semester_ids[] = $data['semester_id'] ?? '';
                 }
             }
@@ -244,7 +250,7 @@ class MyRealmModel
         }
 
         // Get the needed semester
-        if (!in_array($sem, ['', 'current', 'future', 'last', 'lastandnext'])) {
+        if (!in_array($sem, ['', 'current', 'future', 'last', 'lastandnext','lastbutone'])) {
             $semesters[] = Semester::getIndexById($sem);
         } else {
             switch ($sem) {
@@ -264,6 +270,10 @@ class MyRealmModel
                     $semesters[] = $current_sem;
                     $semesters[] = $max_sem;
                     break;
+                case 'lastbutone':
+                    $semesters[] = $current_sem - 2;
+                    $semesters[] = $current_sem;
+                    break;
                 default:
                     $semesters = array_keys($sem_data);
                     break;
@@ -287,7 +297,7 @@ class MyRealmModel
         $min_sem_key = min($semesters);
         $max_sem_key = max($semesters);
         $group_field = $params['group_field'];
-        $courses     = self::getCourses($min_sem_key, $max_sem_key, $params);
+        $courses     = self::getCourses($min_sem_key, $max_sem_key, $params + ['exactly' => $semesters]);
         $show_semester_name = UserConfig::get($GLOBALS['user']->id)->SHOWSEM_ENABLE;
         $sem_courses = [];
 
-- 
cgit v1.0


From e278ef0a79fbd9ef33b9fa5af1ac7e3e6145c8eb Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 11:44:58 +0000
Subject: fixes #3672

Closes #3672

Merge request studip/studip!2649
---
 app/controllers/course/statusgroups.php   | 16 ++++++++++++++++
 app/views/course/dates/_date_row.php      | 17 ++++++++++++++++-
 app/views/course/statusgroups/details.php | 30 ++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 app/views/course/statusgroups/details.php

diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php
index c15733d..48939bd 100644
--- a/app/controllers/course/statusgroups.php
+++ b/app/controllers/course/statusgroups.php
@@ -1487,4 +1487,20 @@ class Course_StatusgroupsController extends AuthenticatedController
         return $members->orderBy($order);
 
     }
+
+    public function details_action(Statusgruppen $group): void
+    {
+        $course = Course::findCurrent();
+
+        if ($course->id !== $group->range_id) {
+            throw new AccessDeniedException();
+        }
+
+        PageLayout::setTitle(sprintf(
+            _('Personen der Gruppe %s'),
+            $group->name
+        ));
+
+        $this->group = $group;
+    }
 }
diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php
index 0246455..8aea8b3 100644
--- a/app/views/course/dates/_date_row.php
+++ b/app/views/course/dates/_date_row.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * @var bool $show_raumzeit
+ * @var bool $has_access
+ * @var bool $is_next_date
+ * @var bool $cancelled_dates_locked
+ * @var Course_DatesController $controller
+ * @var CourseDate $date
+ * @var Course $course
+ */
+?>
+<?php
 $icon = 'date';
 $dialog_url = $show_raumzeit
             ? $controller->url_for('course/dates/details/' . $date->id)
@@ -30,7 +41,11 @@ $dialog_url = $show_raumzeit
     <? if (count($date->statusgruppen) > 0) : ?>
         <ul class="clean">
         <? foreach ($date->statusgruppen as $statusgruppe) : ?>
-            <li><?= htmlReady($statusgruppe->name) ?></li>
+            <li>
+                <a href="<?= $controller->link_for('course/statusgroups/details', $statusgruppe) ?>" data-dialog="size=default">
+                    <?= htmlReady($statusgruppe->name) ?>
+                </a>
+            </li>
         <? endforeach ?>
         </ul>
     <? else : ?>
diff --git a/app/views/course/statusgroups/details.php b/app/views/course/statusgroups/details.php
new file mode 100644
index 0000000..db80777
--- /dev/null
+++ b/app/views/course/statusgroups/details.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @var Statusgruppen $group
+ */
+?>
+<table class="default">
+    <caption class="hide-in-dialog">
+        <?= sprintf(_('Gruppe %s'), htmlReady($group->name)) ?>
+    </caption>
+    <colgroup>
+        <col style="width: 32px">
+        <col>
+    </colgroup>
+    <tbody>
+    <? foreach ($group->members as $member): ?>
+        <tr>
+            <td>
+                <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $member->user->username], true) ?>">
+                    <?= $member->avatar() ?>
+                </a>
+            </td>
+            <td>
+                <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $member->user->username], true) ?>">
+                    <?= htmlReady($member->user->getFullname()) ?>
+                </a>
+            </td>
+        </tr>
+    <? endforeach; ?>
+    </tbody>
+</table>
-- 
cgit v1.0


From cab295240e7e5895e80eeaae198e0ab814166a7a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 11:53:02 +0000
Subject: fixes #3644

Closes #3644

Merge request studip/studip!2522
---
 app/views/news/admin_news.php   | 84 ++++++++++++++++++++++++++---------------
 lib/models/StudipNews.class.php | 17 ++++++---
 2 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/app/views/news/admin_news.php b/app/views/news/admin_news.php
index 0376083..db07d03 100644
--- a/app/views/news/admin_news.php
+++ b/app/views/news/admin_news.php
@@ -1,24 +1,36 @@
-<? use Studip\Button, Studip\LinkButton; ?>
+<?php
+/**
+ * @var NewsController $controller
+ * @var string $area_type
+ * @var Trails_Flash $flash
+ * @var string $news_searchterm
+ * @var string $news_startdate
+ * @var string $news_enddate
+ * @var string|null $filter_text
+ * @var array<string, array<string, array{title: string, object: StudipNews}>> $news_items
+ * @var array $area_structure
+ */
+?>
 <? if (!empty($flash['question_text'])) : ?>
-<?= QuestionBox::create(
-        htmlReady($flash['question_text']),
-        $controller->url_for('news/admin_news/' . $area_type, array_merge(
-            $flash['question_param'],
-            [
+    <?= QuestionBox::create(
+            htmlReady($flash['question_text']),
+            $controller->url_for('news/admin_news/' . $area_type, array_merge(
+                $flash['question_param'],
+                [
+                    'news_filter_term'  => htmlReady($news_searchterm),
+                    'news_filter_start' => $news_startdate,
+                    'news_filter_end'   => $news_enddate,
+                    'news_filter'       => 'set'
+                ]
+            )),
+            $controller->url_for('news/admin_news/' . $area_type, [
                 'news_filter_term'  => htmlReady($news_searchterm),
                 'news_filter_start' => $news_startdate,
                 'news_filter_end'   => $news_enddate,
                 'news_filter'       => 'set'
-            ]
-        )),
-        $controller->url_for('news/admin_news/' . $area_type, [
-            'news_filter_term'  => htmlReady($news_searchterm),
-            'news_filter_start' => $news_startdate,
-            'news_filter_end'   => $news_enddate,
-            'news_filter'       => 'set'
-        ])
-    );
-?>
+            ])
+        );
+    ?>
 <? endif ?>
 
 <form action="<?= $controller->link_for('news/admin_news/' . $area_type) ?>" id="admin_news_form" class="default" method="post">
@@ -52,9 +64,9 @@
         </label>
     </fieldset>
     <footer>
-        <?= Button::create(_('Filter anwenden'), 'apply_news_filter', ['aria-label' => _('Liste mit Suchbegriff und/oder Zeitraum filtern')]) ?>
+        <?= Studip\Button::create(_('Filter anwenden'), 'apply_news_filter', ['aria-label' => _('Liste mit Suchbegriff und/oder Zeitraum filtern')]) ?>
     <? if ($filter_text) : ?>
-        <?= Button::create(_('Filter zurücksetzen'), 'reset_filter') ?>
+        <?= Studip\Button::create(_('Filter zurücksetzen'), 'reset_filter') ?>
     <? endif ?>
     </footer>
     <br>
@@ -74,12 +86,13 @@
                 </caption>
             <? endif ?>
                 <colgroup>
-                    <col width="20">
+                    <col style="width: 20px">
                     <col>
-                    <col width="25%">
-                    <col width="10%">
-                    <col width="10%">
-                    <col width="80">
+                    <col style="width: 25%">
+                    <col style="width: 10%">
+                    <col style="width: 10%">
+                    <col style="width: 5%">
+                    <col style="width: 80px">
                 </colgroup>
                 <thead>
                     <tr>
@@ -88,6 +101,7 @@
                         <th><?= _('Autor') ?></th>
                         <th><?= _('Einstelldatum') ?></th>
                         <th><?= _('Ablaufdatum') ?></th>
+                        <th><?= _('Aufrufe') ?></th>
                         <th class="actions"><?= _('Aktion') ?></th>
                     </tr>
                 </thead>
@@ -99,18 +113,18 @@
                             <tr>
                                 <th>
                                     <input type="checkbox"
-                                           data-proxyfor=".news_<?= $news['range_id'] ?>"
+                                           data-proxyfor=".news_<?= htmlReady($news['range_id']) ?>"
                                            aria-labelledby="<?= _('Alle auswählen') ?>">
                                 </th>
-                                <th colspan="5"><?= mila(htmlReady($news['title'] ?? '')) . ' ' . htmlReady($news['semester'] ?? '') ?></th>
+                                <th colspan="6"><?= mila(htmlReady($news['title'] ?? '')) . ' ' . htmlReady($news['semester'] ?? '') ?></th>
                             </tr>
                         <? endif ?>
                         <? $last_title = $title ?>
                     <? endif ?>
                     <tr>
                         <td>
-                            <input type="checkbox" class="news_<?= $news['range_id'] ?>" name="mark_news[]"
-                                   value="<?= $news['object']->news_id . '_' . $news['range_id'] ?>"
+                            <input type="checkbox" class="news_<?= htmlReady($news['range_id']) ?>" name="mark_news[]"
+                                   value="<?= htmlReady($news['object']->news_id . '_' . $news['range_id']) ?>"
                                    aria-label="<?= _('Diese Ankündigung zum Entfernen vormerken') ?>" <?= tooltip(_("Diese Ankündigung zum Entfernen vormerken"), false) ?>>
                         </td>
                         <td><?= htmlReady($news['object']->topic) ?></td>
@@ -119,9 +133,19 @@
                             $body = $parts[0];
                             $admin_msg = $parts[1] ?? ';'
                         ?>
-                        <td><?= htmlReady($news['object']->author) ?></td>
+                        <td>
+                        <? if ($news['object']->owner): ?>
+                            <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $news['object']->owner->username]) ?>">
+                                <?= Avatar::getAvatar($news['object']->user_id)->getImageTag(Avatar::SMALL) ?>
+                                <?= htmlReady($news['object']->owner->getFullName()) ?>
+                            </a>
+                        <? else: ?>
+                            <?= htmlReady($news['object']->author) ?>
+                        <? endif; ?>
+                        </td>
                         <td><?= strftime("%d.%m.%y", $news['object']->date) ?></td>
                         <td><?= strftime("%d.%m.%y", $news['object']->date + $news['object']->expire) ?></td>
+                        <td><?= $news['object']->views ?></td>
                         <td class="actions">
                             <?
                             $menu = ActionMenu::get()->setContext($news['object']->topic);
@@ -158,8 +182,8 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="6">
-                            <?= Button::create(_('Alle markierten Ankündigungen entfernen'), 'remove_marked_news') ?>
+                        <td colspan="7">
+                            <?= Studip\Button::create(_('Alle markierten Ankündigungen entfernen'), 'remove_marked_news') ?>
                         </td>
                     </tr>
                 </tfoot>
diff --git a/lib/models/StudipNews.class.php b/lib/models/StudipNews.class.php
index 607f9d3..12eb3e1 100644
--- a/lib/models/StudipNews.class.php
+++ b/lib/models/StudipNews.class.php
@@ -44,6 +44,7 @@ require_once 'lib/object.inc.php';
  * @property SimpleORMapCollection|StudipComment[] $comments has_many StudipComment
  * @property SimpleORMapCollection|NewsRoles[] $news_roles has_many NewsRoles
  * @property User $owner belongs_to User
+ * @property int $views additional field
  */
 class StudipNews extends SimpleORMap implements PrivacyObject
 {
@@ -72,8 +73,15 @@ class StudipNews extends SimpleORMap implements PrivacyObject
             'on_delete'         => 'delete'
         ];
 
-        $config['i18n_fields']['topic'] = true;
-        $config['i18n_fields']['body'] = true;
+        $config['additional_fields'] = [
+            'views' => [
+                'get' => function (StudipNews $news): int {
+                    return object_return_views($news->id);
+                },
+            ],
+        ];
+
+        $config['i18n_fields'] = ['topic', 'body'];
 
         // Strip <admin_msg> from news body
         $config['registered_callbacks']['after_initialize'][] = function ($news) {
@@ -292,7 +300,7 @@ class StudipNews extends SimpleORMap implements PrivacyObject
         $news_result    = $statement->fetchGrouped();
 
         $objects = [$area => []];
-        foreach($news_result as $id => $result) {
+        foreach ($news_result as $id => $result) {
             $objects[$area][$id] = [
                 'range_id' => $result['range_id'],
                 'title'    => $result['title'] ?? '',
@@ -307,8 +315,7 @@ class StudipNews extends SimpleORMap implements PrivacyObject
             } elseif ($area === 'user') {
                 if ($GLOBALS['user']->id === $result['userid']) {
                     $objects[$area][$id]['title'] = _('Ankündigungen auf Ihrer Profilseite');
-                }
-                else {
+                } else {
                     $objects[$area][$id]['title'] = sprintf(_('Ankündigungen auf der Profilseite von %s'), get_fullname($result['userid']));
                 }
             } elseif ($area === 'global') {
-- 
cgit v1.0


From 8cf4703abcbe46d1e96966359920cd1ab9d9927f Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 6 May 2024 13:53:58 +0000
Subject: remove write_excel, fixes #4118

Closes #4118

Merge request studip/studip!2961
---
 RELEASE-NOTES.md                   |    1 +
 app/controllers/search/courses.php |   12 -
 lib/classes/SemBrowse.class.php    |  182 ---
 vendor/write_excel/BIFFwriter.php  |  209 ---
 vendor/write_excel/Format.php      |  637 --------
 vendor/write_excel/OLEwriter.php   |  414 ------
 vendor/write_excel/Parser.php      |  996 -------------
 vendor/write_excel/Workbook.php    |  953 ------------
 vendor/write_excel/Worksheet.php   | 2835 ------------------------------------
 vendor/write_excel/thanks          |    7 -
 10 files changed, 1 insertion(+), 6245 deletions(-)
 delete mode 100644 vendor/write_excel/BIFFwriter.php
 delete mode 100644 vendor/write_excel/Format.php
 delete mode 100644 vendor/write_excel/OLEwriter.php
 delete mode 100644 vendor/write_excel/Parser.php
 delete mode 100644 vendor/write_excel/Workbook.php
 delete mode 100644 vendor/write_excel/Worksheet.php
 delete mode 100644 vendor/write_excel/thanks

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 18c0ae6..d447701 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -26,6 +26,7 @@
   - `StudipController`
   - `StudipControllerPropertiesTrait`
   - `StudipResponse`
+- Im Rahmen von [Issue #4118](https://gitlab.studip.de/studip/studip/-/issues/4118) wurde `write_excel` ausgebaut. Als Alternative kann `phpoffice/phpspreadsheet` verwendet werden.
 
 ## Security related issues
 
diff --git a/app/controllers/search/courses.php b/app/controllers/search/courses.php
index e068cf7..a6a4d27 100644
--- a/app/controllers/search/courses.php
+++ b/app/controllers/search/courses.php
@@ -61,18 +61,6 @@ class Search_CoursesController extends AuthenticatedController
         PageLayout::setTitle($title);
     }
 
-    public function export_results_action()
-    {
-        $sem_browse_obj = new SemBrowse();
-        $tmpfile = basename($sem_browse_obj->create_result_xls());
-        if ($tmpfile) {
-            $this->redirect(FileManager::getDownloadURLForTemporaryFile(
-                    $tmpfile, _('ErgebnisVeranstaltungssuche.xls'), 4));
-        } else {
-            $this->render_nothing();
-        }
-    }
-
     private function setupSidebar()
     {
         $sidebar = Sidebar::Get();
diff --git a/lib/classes/SemBrowse.class.php b/lib/classes/SemBrowse.class.php
index 7969a17..536b7e3 100644
--- a/lib/classes/SemBrowse.class.php
+++ b/lib/classes/SemBrowse.class.php
@@ -484,188 +484,6 @@ class SemBrowse {
         ob_end_flush();
     }
 
-    public function create_result_xls($headline = '')
-    {
-        require_once "vendor/write_excel/OLEwriter.php";
-        require_once "vendor/write_excel/BIFFwriter.php";
-        require_once "vendor/write_excel/Worksheet.php";
-        require_once "vendor/write_excel/Workbook.php";
-
-        global $SEM_TYPE, $SEM_CLASS, $TMP_PATH;
-
-        if (!$headline) {
-            $headline = _('Stud.IP Veranstaltungen') . ' - ' . Config::get()->UNI_NAME_CLEAN;
-        }
-        $tmpfile = null;
-        if (is_array($this->sem_browse_data['search_result'])
-                && count($this->sem_browse_data['search_result'])) {
-            if (!is_object($this->sem_tree)) {
-                $the_tree = TreeAbstract::GetInstance('StudipSemTree', false);
-            } else {
-                $the_tree = $this->sem_tree->tree;
-            }
-            list($group_by_data, $sem_data) = $this->get_result();
-            $tmpfile = $TMP_PATH . '/' . md5(uniqid('write_excel', 1));
-            // Creating a workbook
-            $workbook = new Workbook($tmpfile);
-            $head_format = $workbook->addformat();
-            $head_format->set_size(12);
-            $head_format->set_bold();
-            $head_format->set_align('left');
-            $head_format->set_align('vcenter');
-
-            $head_format_merged = $workbook->addformat();
-            $head_format_merged->set_size(12);
-            $head_format_merged->set_bold();
-            $head_format_merged->set_align('left');
-            $head_format_merged->set_align('vcenter');
-            $head_format_merged->set_merge();
-            $head_format_merged->set_text_wrap();
-
-            $caption_format = $workbook->addformat();
-            $caption_format->set_size(10);
-            $caption_format->set_align('left');
-            $caption_format->set_align('vcenter');
-            $caption_format->set_bold();
-
-            $data_format = $workbook->addformat();
-            $data_format->set_size(10);
-            $data_format->set_align('left');
-            $data_format->set_align('vcenter');
-
-            $caption_format_merged = $workbook->addformat();
-            $caption_format_merged->set_size(10);
-            $caption_format_merged->set_merge();
-            $caption_format_merged->set_align('left');
-            $caption_format_merged->set_align('vcenter');
-            $caption_format_merged->set_bold();
-
-
-            // Creating the first worksheet
-            $worksheet1 = $workbook->addworksheet(_('Veranstaltungen'));
-            $worksheet1->set_row(0, 20);
-            $worksheet1->write_string(0, 0, mb_convert_encoding($headline, 'WINDOWS-1252') ,$head_format);
-            $worksheet1->set_row(1, 20);
-            $worksheet1->write_string(
-                1,
-                0,
-                mb_convert_encoding(sprintf(
-                    _('%s Veranstaltungen gefunden %s, Gruppierung: %s'),
-                    count($sem_data),
-                    $this->sem_browse_data['sset'] ? '(' . _('Suchergebnis') . ')' : '',
-                    $this->group_by_fields[$this->sem_browse_data['group_by']]['name']
-                ), 'WINDOWS-1252'),
-                $caption_format
-            );
-
-            $worksheet1->write_blank(0, 1, $head_format);
-            $worksheet1->write_blank(0, 2, $head_format);
-            $worksheet1->write_blank(0, 3, $head_format);
-
-            $worksheet1->write_blank(1, 1, $head_format);
-            $worksheet1->write_blank(1, 2, $head_format);
-            $worksheet1->write_blank(1, 3, $head_format);
-
-            $worksheet1->set_column(0, 0, 70);
-            $worksheet1->set_column(0, 1, 25);
-            $worksheet1->set_column(0, 2, 25);
-            $worksheet1->set_column(0, 3, 50);
-
-            $row = 2;
-
-            foreach ($group_by_data as $group_field => $sem_ids) {
-                switch ($this->sem_browse_data['group_by']) {
-                    case 0:
-                        $headline = $this->search_obj->sem_dates[$group_field]['name'];
-                        break;
-                    case 1:
-                        if ($the_tree->tree_data[$group_field]) {
-                            $headline = $the_tree->getShortPath($group_field);
-                        } else {
-                            $headline =  _('keine Studienbereiche eingetragen');
-                        }
-                        break;
-                    case 3:
-                        $headline = $SEM_TYPE[$group_field]['name']
-                            ." ("
-                            . $SEM_CLASS[$SEM_TYPE[$group_field]['class']]['name'] . ')';
-                        break;
-                    default:
-                    $headline = $group_field;
-                }
-                ++$row;
-                $worksheet1->write_string($row, 0 , mb_convert_encoding($headline, 'WINDOWS-1252'), $caption_format);
-                $worksheet1->write_blank($row, 1, $caption_format);
-                $worksheet1->write_blank($row, 2, $caption_format);
-                $worksheet1->write_blank($row, 3, $caption_format);
-                ++$row;
-                if (is_array($sem_ids['Seminar_id'])) {
-                     foreach(array_keys($sem_ids['Seminar_id']) as $seminar_id){
-                        $seminar_obj = new Seminar($seminar_id);
-
-                        $sem_name = $seminar_obj->getName();
-                        $seminar_number = key($sem_data[$seminar_id]['VeranstaltungsNummer']);
-                        $sem_number_start = key($sem_data[$seminar_id]['sem_number']);
-                        $sem_number_end = key($sem_data[$seminar_id]['sem_number_end']);
-                        if ($sem_number_start != $sem_number_end) {
-                            $sem_name .= ' (' . $this->search_obj->sem_dates[$sem_number_start]['name'] . ' - ';
-                            $sem_name .= ($sem_number_end == -1 ? _('unbegrenzt') : $this->search_obj->sem_dates[$sem_number_end]['name']) . ')';
-                        } elseif ($this->sem_browse_data['group_by']) {
-                            $sem_name .= ' (' . $this->search_obj->sem_dates[$sem_number_start]['name'] . ')';
-                        }
-                        // is this sem a studygroup?
-                        $studygroup_mode = SeminarCategories::GetByTypeId($seminar_obj->getStatus())->studygroup_mode;
-                        if ($studygroup_mode) {
-                            $sem_name = $seminar_obj->getName() . ' (' . _('Studiengruppe');
-                            if ($seminar_obj->admission_prelim) $sem_name .= ', '. _('Zutritt auf Anfrage');
-                            $sem_name .= ')';
-                        }
-                        $worksheet1->write_string($row, 0, mb_convert_encoding($sem_name, 'WINDOWS-1252'), $data_format);
-                        //create Turnus field
-                        $temp_turnus_string = $seminar_obj->getFormattedTurnus(true);
-                        //Shorten, if string too long (add link for details.php)
-                        if (mb_strlen($temp_turnus_string) > 245) {
-                            $temp_turnus_string = mb_substr($temp_turnus_string,
-                                    0, mb_strpos(
-                                            mb_substr($temp_turnus_string, 245,
-                                                mb_strlen($temp_turnus_string)
-                                            ), ','
-                                        ) + 246);
-                            $temp_turnus_string .= ' ... (' . _('mehr') . ')';
-                        }
-                        $worksheet1->write_string($row, 1, mb_convert_encoding($seminar_number, 'WINDOWS-1252'), $data_format);
-                        $worksheet1->write_string($row, 2, mb_convert_encoding($temp_turnus_string, 'WINDOWS-1252'), $data_format);
-
-                        $doz_name = [];
-                        $c = 0;
-                        reset($sem_data[$seminar_id]['fullname']);
-                        foreach ($sem_data[$seminar_id]['username'] as $anzahl1) {
-                            if ($c == 0) {
-                                $d_name = key($sem_data[$seminar_id]['fullname']);
-                                $anzahl2 = current($sem_data[$seminar_id]['fullname']);
-                                next($sem_data[$seminar_id]['fullname']);
-                                $c = $anzahl2 / $anzahl1;
-                                $doz_name = array_merge($doz_name, array_fill(0, $c, $d_name));
-                            }
-                            --$c;
-                        }
-                        $doz_position = array_keys($sem_data[$seminar_id]['position']);
-                        if (is_array($doz_name)){
-                            if (count($doz_position) != count($doz_name)) {
-                                $doz_position = range(1, count($doz_name));
-                            }
-                            array_multisort($doz_position, $doz_name);
-                            $worksheet1->write_string($row, 3, mb_convert_encoding(join(', ', $doz_name), 'WINDOWS-1252'), $data_format);
-                        }
-                        ++$row;
-                    }
-                }
-            }
-            $workbook->close();
-        }
-        return $tmpfile;
-    }
-
     public function get_result()
     {
         global $_fullname_sql, $user;
diff --git a/vendor/write_excel/BIFFwriter.php b/vendor/write_excel/BIFFwriter.php
deleted file mode 100644
index 75d7be3..0000000
--- a/vendor/write_excel/BIFFwriter.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/*
-*  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-*
-*  The majority of this is _NOT_ my code.  I simply ported it from the
-*  PERL Spreadsheet::WriteExcel module.
-*
-*  The author of the Spreadsheet::WriteExcel module is John McNamara 
-*  <jmcnamara@cpan.org>
-*
-*  I _DO_ maintain this code, and John McNamara has nothing to do with the
-*  porting of this code to PHP.  Any questions directly related to this
-*  class library should be directed to me.
-*
-*  License Information:
-*
-*    Spreadsheet::WriteExcel:  A library for generating Excel Spreadsheets
-*    Copyright (C) 2002 Xavier Noguer xnoguer@rezebra.com
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License as published by the Free Software Foundation; either
-*    version 2.1 of the License, or (at your option) any later version.
-*
-*    This library 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
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-* Class for writing Excel BIFF records.
-* 
-* From "MICROSOFT EXCEL BINARY FILE FORMAT" by Mark O'Brien (Microsoft Corporation):
-*
-* BIFF (BInary File Format) is the file format in which Excel documents are 
-* saved on disk.  A BIFF file is a complete description of an Excel document.
-* BIFF files consist of sequences of variable-length records. There are many 
-* different types of BIFF records.  For example, one record type describes a 
-* formula entered into a cell; one describes the size and location of a 
-* window into a document; another describes a picture format.
-*
-* @author Xavier Noguer <xnoguer@rezebra.com>
-* @package Spreadsheet_WriteExcel
-*/
-
-class BIFFWriter
-{
-    var $_BIFF_version = 0x0500;
-
-/**
-* Constructor
-*
-* @access public
-*/
-    function __construct()
-    {
-        // The byte order of this architecture. 0 => little endian, 1 => big endian
-        $this->_byte_order = '';
-        // The string containing the data of the BIFF stream
-        $this->_data       = '';
-        // Should be the same as strlen($this->_data)
-        $this->_datasize   = 0;
-        // The maximun length for a BIFF record. See _add_continue()
-        $this->_limit      = 2080;   
-        // Set the byte order
-        $this->_set_byte_order();
-    }
-
-/**
-* Determine the byte order and store it as class data to avoid
-* recalculating it for each call to new().
-*
-* @access private
-*/
-    function _set_byte_order()
-    {
-        if ($this->_byte_order == '')
-        {
-            // Check if "pack" gives the required IEEE 64bit float
-            $teststr = pack("d", 1.2345);
-            $number  = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
-            if ($number == $teststr) {
-                $byte_order = 0;    // Little Endian
-            }
-            elseif ($number == strrev($teststr)){
-                $byte_order = 1;    // Big Endian
-            }
-            else {
-                // Give up. I'll fix this in a later version.
-                die("Required floating point format not supported ".
-                    "on this platform. See the portability section ".
-                    "of the documentation."
-                   );
-            }
-        }
-        $this->_byte_order = $byte_order;
-    }
-
-/**
-* General storage function
-*
-* @param string $data binary data to prepend
-* @access private
-*/
-    function _prepend($data)
-    {
-        if (strlen($data) > $this->_limit) {
-            $data = $this->_add_continue($data);
-        }
-        $this->_data      = $data.$this->_data;
-        $this->_datasize += strlen($data);
-    }
-
-/**
-* General storage function
-*
-* @param string $data binary data to append
-* @access private
-*/
-    function _append($data)
-    {
-        if (strlen($data) > $this->_limit) {
-            $data = $this->_add_continue($data);
-        }
-        $this->_data      = $this->_data.$data;
-        $this->_datasize += strlen($data);
-    }
-
-/**
-* Writes Excel BOF record to indicate the beginning of a stream or
-* sub-stream in the BIFF file.
-*
-* @param  integer $type type of BIFF file to write: 0x0005 Workbook, 0x0010 Worksheet.
-* @access private
-*/
-    function _store_bof($type)
-    {
-        $record  = 0x0809;        // Record identifier
-        $length  = 0x0008;        // Number of bytes to follow
-        $version = $this->_BIFF_version;
-   
-        // According to the SDK $build and $year should be set to zero.
-        // However, this throws a warning in Excel 5. So, use these
-        // magic numbers.
-        $build   = 0x096C;
-        $year    = 0x07C9;
-   
-        $header  = pack("vv",   $record, $length);
-        $data    = pack("vvvv", $version, $type, $build, $year);
-        $this->_prepend($header.$data);
-    }
-
-/**
-* Writes Excel EOF record to indicate the end of a BIFF stream.
-*
-* @access private
-*/
-    function _store_eof() 
-    {
-        $record    = 0x000A;   // Record identifier
-        $length    = 0x0000;   // Number of bytes to follow
-        $header    = pack("vv", $record, $length);
-        $this->_append($header);
-    }
-
-/**
-* Excel limits the size of BIFF records. In Excel 5 the limit is 2084 bytes. In
-* Excel 97 the limit is 8228 bytes. Records that are longer than these limits
-* must be split up into CONTINUE blocks.
-*
-* This function takes a long BIFF record and inserts CONTINUE records as
-* necessary.
-*
-* @param  string  $data The original binary data to be written
-* @return string        A very convenient string of continue blocks
-* @access private
-*/
-    function _add_continue($data)
-    {
-        $limit      = $this->_limit;
-        $record     = 0x003C;         // Record identifier
- 
-        // The first 2080/8224 bytes remain intact. However, we have to change
-        // the length field of the record.
-        $tmp = substr($data, 0, 2).pack("v", $limit-4).substr($data, 4, $limit - 4);
-        
-        $header = pack("vv", $record, $limit);  // Headers for continue records
- 
-        // Retrieve chunks of 2080/8224 bytes +4 for the header.
-        for($i = $limit; $i < strlen($data) - $limit; $i += $limit)
-        {
-            $tmp .= $header;
-            $tmp .= substr($data, $i, $limit);
-        }
-
-        // Retrieve the last chunk of data
-        $header  = pack("vv", $record, strlen($data) - $i);
-        $tmp    .= $header;
-        $tmp    .= substr($data,$i,strlen($data) - $i);
- 
-        return($tmp);
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/write_excel/Format.php b/vendor/write_excel/Format.php
deleted file mode 100644
index 9af415e..0000000
--- a/vendor/write_excel/Format.php
+++ /dev/null
@@ -1,637 +0,0 @@
-<?php
-/*
-*  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-*
-*  The majority of this is _NOT_ my code.  I simply ported it from the
-*  PERL Spreadsheet::WriteExcel module.
-*
-*  The author of the Spreadsheet::WriteExcel module is John McNamara
-*  <jmcnamara@cpan.org>
-*
-*  I _DO_ maintain this code, and John McNamara has nothing to do with the
-*  porting of this code to PHP.  Any questions directly related to this
-*  class library should be directed to me.
-*
-*  License Information:
-*
-*    Spreadsheet::WriteExcel:  A library for generating Excel Spreadsheets
-*    Copyright (C) 2002 Xavier Noguer xnoguer@rezebra.com
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License as published by the Free Software Foundation; either
-*    version 2.1 of the License, or (at your option) any later version.
-*
-*    This library 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
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-* Class for generating Excel XF records (formats)
-*
-* @author Xavier Noguer <xnoguer@rezebra.com>
-* @package Spreadsheet_WriteExcel
-*/
-
-class Format
-{
-  /**
-  * Constructor
-  *
-  * @access public
-  * @param integer $index the XF index for the format.
-  * @param array   $properties array with properties to be set on initialization.
-  */
-    function __construct($index = 0,$properties =  array())
-    {
-        $this->xf_index       = $index;
-    
-        $this->font_index     = 0;
-        $this->font           = 'Arial';
-        $this->size           = 10;
-        $this->bold           = 0x0190;
-        $this->_italic        = 0;
-        $this->color          = 0x7FFF;
-        $this->_underline     = 0;
-        $this->font_strikeout = 0;
-        $this->font_outline   = 0;
-        $this->font_shadow    = 0;
-        $this->font_script    = 0;
-        $this->font_family    = 0;
-        $this->font_charset   = 0;
-    
-        $this->_num_format    = 0;
-    
-        $this->hidden         = 0;
-        $this->locked         = 1;
-    
-        $this->_text_h_align  = 0;
-        $this->_text_wrap     = 0;
-        $this->text_v_align   = 2;
-        $this->text_justlast  = 0;
-        $this->rotation       = 0;
-    
-        $this->fg_color       = 0x40;
-        $this->bg_color       = 0x41;
-    
-        $this->pattern        = 0;
-    
-        $this->bottom         = 0;
-        $this->top            = 0;
-        $this->left           = 0;
-        $this->right          = 0;
-    
-        $this->bottom_color   = 0x40;
-        $this->top_color      = 0x40;
-        $this->left_color     = 0x40;
-        $this->right_color    = 0x40;
-    
-        // Set properties passed to Workbook::add_format()
-        foreach($properties as $property => $value)
-        {
-            if(method_exists($this,"set_$property"))
-            {
-                $aux = 'set_'.$property;
-                $this->$aux($value);
-            }
-        }
-    }
-    
-    /**
-    * Generate an Excel BIFF XF record (style or cell).
-    *
-    * @param string $style The type of the XF record ('style' or 'cell').
-    * @return string The XF record
-    */
-    function get_xf($style)
-    {
-        // Set the type of the XF record and some of the attributes.
-        if ($style == "style") {
-            $style = 0xFFF5;
-        }
-        else {
-            $style   = $this->locked;
-            $style  |= $this->hidden << 1;
-        }
-    
-        // Flags to indicate if attributes have been set.
-        $atr_num     = ($this->_num_format != 0)?1:0;
-        $atr_fnt     = ($this->font_index != 0)?1:0;
-        $atr_alc     = ($this->_text_wrap)?1:0;
-        $atr_bdr     = ($this->bottom   ||
-                        $this->top      ||
-                        $this->left     ||
-                        $this->right)?1:0;
-        $atr_pat     = (($this->fg_color != 0x40) ||
-                        ($this->bg_color != 0x41) ||
-                        $this->pattern)?1:0;
-        $atr_prot    = 0;
-    
-        // Zero the default border colour if the border has not been set.
-        if ($this->bottom == 0) {
-            $this->bottom_color = 0;
-            }
-        if ($this->top  == 0) {
-            $this->top_color = 0;
-            }
-        if ($this->right == 0) {
-            $this->right_color = 0;
-            }
-        if ($this->left == 0) {
-            $this->left_color = 0;
-            }
-    
-        $record         = 0x00E0;              // Record identifier
-        $length         = 0x0010;              // Number of bytes to follow
-                                               
-        $ifnt           = $this->font_index;   // Index to FONT record
-        $ifmt           = $this->_num_format;  // Index to FORMAT record
-    
-        $align          = $this->_text_h_align;       // Alignment
-        $align         |= $this->_text_wrap    << 3;
-        $align         |= $this->text_v_align  << 4;
-        $align         |= $this->text_justlast << 7;
-        $align         |= $this->rotation      << 8;
-        $align         |= $atr_num                << 10;
-        $align         |= $atr_fnt                << 11;
-        $align         |= $atr_alc                << 12;
-        $align         |= $atr_bdr                << 13;
-        $align         |= $atr_pat                << 14;
-        $align         |= $atr_prot               << 15;
-    
-        $icv            = $this->fg_color;           // fg and bg pattern colors
-        $icv           |= $this->bg_color      << 7;
-    
-        $fill           = $this->pattern;            // Fill and border line style
-        $fill          |= $this->bottom        << 6;
-        $fill          |= $this->bottom_color  << 9;
-    
-        $border1        = $this->top;                // Border line style and color
-        $border1       |= $this->left          << 3;
-        $border1       |= $this->right         << 6;
-        $border1       |= $this->top_color     << 9;
-
-        $border2        = $this->left_color;         // Border color
-        $border2       |= $this->right_color   << 7;
-    
-        $header      = pack("vv",       $record, $length);
-        $data        = pack("vvvvvvvv", $ifnt, $ifmt, $style, $align,
-                                        $icv, $fill,
-                                        $border1, $border2);
-        return($header.$data);
-    }
-    
-    /**
-    * Generate an Excel BIFF FONT record.
-    *
-    * @see Workbook::_store_all_fonts()
-    * @return string The FONT record
-    */
-    function get_font()
-    {
-        $dyHeight   = $this->size * 20;    // Height of font (1/20 of a point)
-        $icv        = $this->color;        // Index to color palette
-        $bls        = $this->bold;         // Bold style
-        $sss        = $this->font_script;  // Superscript/subscript
-        $uls        = $this->_underline;   // Underline
-        $bFamily    = $this->font_family;  // Font family
-        $bCharSet   = $this->font_charset; // Character set
-        $rgch       = $this->font;         // Font name
-    
-        $cch        = strlen($rgch);       // Length of font name
-        $record     = 0x31;                // Record identifier
-        $length     = 0x0F + $cch;         // Record length
-        $reserved   = 0x00;                // Reserved
-        $grbit      = 0x00;                // Font attributes
-        if ($this->_italic) {
-            $grbit     |= 0x02;
-        }
-        if ($this->font_strikeout) {
-            $grbit     |= 0x08;
-        }
-        if ($this->font_outline) {
-            $grbit     |= 0x10;
-        }
-        if ($this->font_shadow) {
-            $grbit     |= 0x20;
-        }
-    
-        $header  = pack("vv",         $record, $length);
-        $data    = pack("vvvvvCCCCC", $dyHeight, $grbit, $icv, $bls,
-                                      $sss, $uls, $bFamily,
-                                      $bCharSet, $reserved, $cch);
-        return($header . $data. $this->font);
-    }
-    
-    /**
-    * Returns a unique hash key for a font. Used by Workbook->_store_all_fonts()
-    *
-    * The elements that form the key are arranged to increase the probability of
-    * generating a unique key. Elements that hold a large range of numbers
-    * (eg. _color) are placed between two binary elements such as _italic
-    *
-    * @return string A key for this font
-    */
-    function get_font_key()
-    {
-        $key  = "$this->font$this->size";
-        $key .= "$this->font_script$this->_underline";
-        $key .= "$this->font_strikeout$this->bold$this->font_outline";
-        $key .= "$this->font_family$this->font_charset";
-        $key .= "$this->font_shadow$this->color$this->_italic";
-        $key  = str_replace(" ","_",$key);
-        return ($key);
-    }
-    
-    /**
-    * Returns the index used by Worksheet->_XF()
-    *
-    * @return integer The index for the XF record
-    */
-    function get_xf_index()
-    {
-        return($this->xf_index);
-    }
-    
-    /**
-    * Used in conjunction with the set_xxx_color methods to convert a color
-    * string into a number. Color range is 0..63 but we will restrict it
-    * to 8..63 to comply with Gnumeric. Colors 0..7 are repeated in 8..15.
-    *
-    * @param string $name_color name of the color (i.e.: 'blue', 'red', etc..). Optional.
-    * @return integer The color index
-    */
-    function _get_color($name_color = '')
-    {
-        $colors = array(
-                        'aqua'    => 0x0F,
-                        'cyan'    => 0x0F,
-                        'black'   => 0x08,
-                        'blue'    => 0x0C,
-                        'brown'   => 0x10,
-                        'magenta' => 0x0E,
-                        'fuchsia' => 0x0E,
-                        'gray'    => 0x17,
-                        'grey'    => 0x17,
-                        'green'   => 0x11,
-                        'lime'    => 0x0B,
-                        'navy'    => 0x12,
-                        'orange'  => 0x35,
-                        'purple'  => 0x14,
-                        'red'     => 0x0A,
-                        'silver'  => 0x16,
-                        'white'   => 0x09,
-                        'yellow'  => 0x0D
-                       );
-    
-        // Return the default color, 0x7FFF, if undef,
-        if($name_color == '') {
-            return(0x7FFF);
-        }
-    
-        // or the color string converted to an integer,
-        if(isset($colors[$name_color])) {
-            return($colors[$name_color]);
-        }
-    
-        // or the default color if string is unrecognised,
-        if(preg_match("/\D/",$name_color)) {
-            return(0x7FFF);
-        }
-    
-        // or an index < 8 mapped into the correct range,
-        if($name_color < 8) {
-            return($name_color + 8);
-        }
-    
-        // or the default color if arg is outside range,
-        if($name_color > 63) {
-            return(0x7FFF);
-        }
-    
-        // or an integer in the valid range
-        return($name_color);
-    }
-    
-    /**
-    * Set cell alignment.
-    *
-    * @access public
-    * @param string $location alignment for the cell ('left', 'right', etc...).
-    */
-    function set_align($location)
-    {
-        if (preg_match("/\d/",$location)) {
-            return;                      // Ignore numbers
-        }
-    
-        $location = strtolower($location);
-    
-        if ($location == 'left')
-            $this->_text_h_align = 1; 
-        if ($location == 'centre')
-            $this->_text_h_align = 2; 
-        if ($location == 'center')
-            $this->_text_h_align = 2; 
-        if ($location == 'right')
-            $this->_text_h_align = 3; 
-        if ($location == 'fill')
-            $this->_text_h_align = 4; 
-        if ($location == 'justify')
-            $this->_text_h_align = 5;
-        if ($location == 'merge')
-            $this->_text_h_align = 6;
-        if ($location == 'equal_space') // For T.K.
-            $this->_text_h_align = 7; 
-        if ($location == 'top')
-            $this->text_v_align = 0; 
-        if ($location == 'vcentre')
-            $this->text_v_align = 1; 
-        if ($location == 'vcenter')
-            $this->text_v_align = 1; 
-        if ($location == 'bottom')
-            $this->text_v_align = 2; 
-        if ($location == 'vjustify')
-            $this->text_v_align = 3; 
-        if ($location == 'vequal_space') // For T.K.
-            $this->text_v_align = 4; 
-    }
-    
-    /**
-    * This is an alias for the unintuitive set_align('merge')
-    *
-    * @access public
-    */
-    function set_merge()
-    {
-        $this->set_align('merge');
-    }
-    
-    /**
-    * Bold has a range 0x64..0x3E8.
-    * 0x190 is normal. 0x2BC is bold.
-    *
-    * @access public
-    * @param integer $weight Weight for the text, 0 maps to 0x190, 1 maps to 0x2BC. 
-                             It's Optional, default is 1 (bold).
-    */
-    function set_bold($weight = 1)
-    {
-        if($weight == 1) {
-            $weight = 0x2BC;  // Bold text
-        }
-        if($weight == 0) {
-            $weight = 0x190;  // Normal text
-        }
-        if($weight <  0x064) {
-            $weight = 0x190;  // Lower bound
-        }
-        if($weight >  0x3E8) {
-            $weight = 0x190;  // Upper bound
-        }
-        $this->bold = $weight;
-    }
-    
-    
-    /************************************
-    * FUNCTIONS FOR SETTING CELLS BORDERS
-    */
-    
-    /**
-    * Sets the bottom border of the cell
-    *
-    * @access public
-    * @param integer $style style of the cell border. 1 => thin, 2 => thick.
-    */
-    function set_bottom($style)
-    {
-        $this->bottom = $style;
-    }
-    
-    /**
-    * Sets the top border of the cell
-    *
-    * @access public
-    * @param integer $style style of the cell top border. 1 => thin, 2 => thick.
-    */
-    function set_top($style)
-    {
-        $this->top = $style;
-    }
-    
-    /**
-    * Sets the left border of the cell
-    *
-    * @access public
-    * @param integer $style style of the cell left border. 1 => thin, 2 => thick.
-    */
-    function set_left($style)
-    {
-        $this->left = $style;
-    }
-    
-    /**
-    * Sets the right border of the cell
-    *
-    * @access public
-    * @param integer $style style of the cell right border. 1 => thin, 2 => thick.
-    */
-    function set_right($style)
-    {
-        $this->right = $style;
-    }
-    
-    
-    /**
-    * Set cells borders to the same style
-    *
-    * @access public
-    * @param integer $style style to apply for all cell borders. 1 => thin, 2 => thick.
-    */
-    function set_border($style)
-    {
-        $this->set_bottom($style);
-        $this->set_top($style);
-        $this->set_left($style);
-        $this->set_right($style);
-    }
-    
-    
-    /*******************************************
-    * FUNCTIONS FOR SETTING CELLS BORDERS COLORS
-    */
-    
-    /**
-    * Sets all the cell's borders to the same color
-    *
-    * @access public
-    * @param mixed $color The color we are setting. Either a string (like 'blue'), 
-    *                     or an integer (like 0x41).
-    */
-    function set_border_color($color)
-    {
-        $this->set_bottom_color($color);
-        $this->set_top_color($color);
-        $this->set_left_color($color);
-        $this->set_right_color($color);
-    }
-    
-    /**
-    * Sets the cell's bottom border color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (range is [8...63]).
-    */
-    function set_bottom_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->bottom_color = $value;
-    }
-    
-    /**
-    * Sets the cell's top border color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (range is [8...63]).
-    */
-    function set_top_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->top_color = $value;
-    }
-    
-    /**
-    * Sets the cell's left border color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (like 0x41).
-    */
-    function set_left_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->left_color = $value;
-    }
-    
-    /**
-    * Sets the cell's right border color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (like 0x41).
-    */
-    function set_right_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->right_color = $value;
-    }
-    
-    
-    /**
-    * Sets the cell's foreground color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (like 0x41).
-    */
-    function set_fg_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->fg_color = $value;
-    }
-      
-    /**
-    * Sets the cell's background color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (like 0x41).
-    */
-    function set_bg_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->bg_color = $value;
-    }
-    
-    /**
-    * Sets the cell's color
-    *
-    * @access public
-    * @param mixed $color either a string (like 'blue'), or an integer (like 0x41).
-    */
-    function set_color($color)
-    {
-        $value = $this->_get_color($color);
-        $this->color = $value;
-    }
-    
-    /**
-    * Sets the pattern attribute of a cell
-    *
-    * @access public
-    * @param integer $arg Optional. Defaults to 1.
-    */
-    function set_pattern($arg = 1)
-    {
-        $this->pattern = $arg;
-    }
-    
-    /**
-    * Sets the underline of the text
-    *
-    * @access public
-    * @param integer $underline The value for underline. Possible values are:
-    *                          1 => underline, 2 => double underline.
-    */
-    function set_underline($underline)
-    {
-        $this->_underline = $underline;
-    }
- 
-    /**
-    * Sets the font style as italic
-    *
-    * @access public
-    */
-    function set_italic()
-    {
-        $this->_italic = 1;
-    }
-
-    /**
-    * Sets the font size 
-    *
-    * @access public
-    * @param integer $size The font size (in pixels I think).
-    */
-    function set_size($size)
-    {
-        $this->size = $size;
-    }
-    
-    /**
-    * Sets the num format
-    *
-    * @access public
-    * @param integer $num_format The num format.
-    */
-    function set_num_format($num_format)
-    {
-        $this->_num_format = $num_format;
-    }
-    
-    /**
-    * Sets text wrapping
-    *
-    * @access public
-    * @param integer $text_wrap Optional. 0 => no text wrapping, 1 => text wrapping. 
-    *                           Defaults to 1.
-    */
-    function set_text_wrap($text_wrap = 1)
-    {
-        $this->_text_wrap = $text_wrap;
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/write_excel/OLEwriter.php b/vendor/write_excel/OLEwriter.php
deleted file mode 100644
index b82f3aa..0000000
--- a/vendor/write_excel/OLEwriter.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-/*
-*  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-*
-*  The majority of this is _NOT_ my code.  I simply ported it from the
-*  PERL Spreadsheet::WriteExcel module.
-*
-*  The author of the Spreadsheet::WriteExcel module is John McNamara
-*  <jmcnamara@cpan.org>
-*
-*  I _DO_ maintain this code, and John McNamara has nothing to do with the
-*  porting of this code to PHP.  Any questions directly related to this
-*  class library should be directed to me.
-*
-*  License Information:
-*
-*    Spreadsheet::WriteExcel:  A library for generating Excel Spreadsheets
-*    Copyright (C) 2002 Xavier Noguer xnoguer@rezebra.com
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License as published by the Free Software Foundation; either
-*    version 2.1 of the License, or (at your option) any later version.
-*
-*    This library 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
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-* Class for creating OLE streams for Excel Spreadsheets
-*
-* @author Xavier Noguer <xnoguer@rezebra.com>
-* @package Spreadsheet_WriteExcel
-*/
-class OLEwriter
-{
-    /**
-    * Filename for the OLE stream
-    * @var string
-    * @see _initialize()
-    */
-    var $_OLEfilename;
-
-    /**
-    * Filehandle for the OLE stream
-    * @var resource
-    */
-    var $_filehandle;
-
-    /**
-    * Name of the temporal file in case OLE stream goes to stdout
-    * @var string
-    */
-    var $_tmp_filename;
-
-    /**
-    * Variable for preventing closing two times
-    * @var integer
-    */
-    var $_fileclosed;
-
-    /**
-    * Size of the data to be written to the OLE stream
-    * @var integer
-    */
-    var $_biffsize;
-
-    /**
-    * Real data size to be written to the OLE stream
-    * @var integer
-    */
-    var $_booksize;
-
-    /**
-    * Number of big blocks in the OLE stream
-    * @var integer
-    */
-    var $_big_blocks;
-
-    /**
-    * Number of list blocks in the OLE stream
-    * @var integer
-    */
-    var $_list_blocks;
-
-    /**
-    * Number of big blocks in the OLE stream
-    * @var integer
-    */
-    var $_root_start;
-
-    /**
-    * Class for creating an OLEwriter
-    *
-    * @param string $OLEfilename the name of the file for the OLE stream
-    */
-    function __construct($OLEfilename)
-    {
-        $this->_OLEfilename  = $OLEfilename;
-        $this->_filehandle   = "";
-        $this->_tmp_filename = "";
-        $this->_fileclosed   = 0;
-        //$this->_size_allowed = 0;
-        $this->_biffsize     = 0;
-        $this->_booksize     = 0;
-        $this->_big_blocks   = 0;
-        $this->_list_blocks  = 0;
-        $this->_root_start   = 0;
-        //$this->_block_count  = 4;
-        $this->_initialize();
-    }
-
-/**
-* Check for a valid filename and store the filehandle.
-* Filehandle "-" writes to STDOUT
-*/
-    function _initialize()
-    {
-        $OLEfile = $this->_OLEfilename;
- 
-        if(($OLEfile == '-') or ($OLEfile == ''))
-        {
-            $this->_tmp_filename = tempnam("/tmp", "OLEwriter");
-            $fh = fopen($this->_tmp_filename,"wb");
-            if ($fh == false) {
-                die("Can't create temporary file.");
-            }
-        }
-        else
-        {
-            // Create a new file, open for writing (in binmode)
-            $fh = fopen($OLEfile,"wb");
-            if ($fh == false) {
-                die("Can't open $OLEfile. It may be in use or protected.");
-            }
-        }
-
-        // Store filehandle
-        $this->_filehandle = $fh;
-    }
-
-
-    /**
-    * Set the size of the data to be written to the OLE stream.
-    * The maximun size comes from this:
-    *   $big_blocks = (109 depot block x (128 -1 marker word)
-    *                 - (1 x end words)) = 13842
-    *   $maxsize    = $big_blocks * 512 bytes = 7087104
-    *
-    * @access public
-    * @see Workbook::store_OLE_file()
-    * @param integer $biffsize The size of the data to be written to the OLE stream
-    * @return integer 1 for success
-    */
-    function set_size($biffsize)
-    {
-        $maxsize = 7087104; // TODO: extend max size
- 
-        if ($biffsize > $maxsize) {
-            die("Maximum file size, $maxsize, exceeded.");
-        }
- 
-        $this->_biffsize = $biffsize;
-        // Set the min file size to 4k to avoid having to use small blocks
-        if ($biffsize > 4096) {
-            $this->_booksize = $biffsize;
-        }
-        else {
-            $this->_booksize = 4096;
-        }
-        //$this->_size_allowed = 1;
-        return(1);
-    }
-
-
-    /**
-    * Calculate various sizes needed for the OLE stream
-    */
-    function _calculate_sizes()
-    {
-        $datasize = $this->_booksize;
-        if ($datasize % 512 == 0) {
-            $this->_big_blocks = $datasize/512;
-        }
-        else {
-            $this->_big_blocks = floor($datasize/512) + 1;
-        }
-        // There are 127 list blocks and 1 marker blocks for each big block
-        // depot + 1 end of chain block
-        $this->_list_blocks = floor(($this->_big_blocks)/127) + 1;
-        $this->_root_start  = $this->_big_blocks;
-    }
-
-    /**
-    * Write root entry, big block list and close the filehandle.
-    * This routine is used to explicitly close the open filehandle without
-    * having to wait for DESTROY.
-    *
-    * @access public
-    * @see Workbook::store_OLE_file()
-    */
-    function close() 
-    {
-        //return if not $this->{_size_allowed};
-        $this->_write_padding();
-        $this->_write_property_storage();
-        $this->_write_big_block_depot();
-        // Close the filehandle 
-        fclose($this->_filehandle);
-        if(($this->_OLEfilename == '-') or ($this->_OLEfilename == ''))
-        {
-            $fh = fopen($this->_tmp_filename, "rb");
-            if ($fh == false) {
-                die("Can't read temporary file.");
-            }
-            fpassthru($fh);
-            // Delete the temporary file.
-            @unlink($this->_tmp_filename);
-        }
-        $this->_fileclosed = 1;
-    }
-
-
-    /**
-    * Write BIFF data to OLE file.
-    *
-    * @param string $data string of bytes to be written
-    */
-    function write($data) //por ahora s�lo a STDOUT
-    {
-        fwrite($this->_filehandle,$data,strlen($data));
-    }
-
-
-    /**
-    * Write OLE header block.
-    */
-    function write_header()
-    {
-        $this->_calculate_sizes();
-        $root_start      = $this->_root_start;
-        $num_lists       = $this->_list_blocks;
-        $id              = pack("nnnn", 0xD0CF, 0x11E0, 0xA1B1, 0x1AE1);
-        $unknown1        = pack("VVVV", 0x00, 0x00, 0x00, 0x00);
-        $unknown2        = pack("vv",   0x3E, 0x03);
-        $unknown3        = pack("v",    -2);
-        $unknown4        = pack("v",    0x09);
-        $unknown5        = pack("VVV",  0x06, 0x00, 0x00);
-        $num_bbd_blocks  = pack("V",    $num_lists);
-        $root_startblock = pack("V",    $root_start);
-        $unknown6        = pack("VV",   0x00, 0x1000);
-        $sbd_startblock  = pack("V",    -2);
-        $unknown7        = pack("VVV",  0x00, -2 ,0x00);
-        $unused          = pack("V",    -1);
- 
-        fwrite($this->_filehandle,$id);
-        fwrite($this->_filehandle,$unknown1);
-        fwrite($this->_filehandle,$unknown2);
-        fwrite($this->_filehandle,$unknown3);
-        fwrite($this->_filehandle,$unknown4);
-        fwrite($this->_filehandle,$unknown5);
-        fwrite($this->_filehandle,$num_bbd_blocks);
-        fwrite($this->_filehandle,$root_startblock);
-        fwrite($this->_filehandle,$unknown6);
-        fwrite($this->_filehandle,$sbd_startblock);
-        fwrite($this->_filehandle,$unknown7);
- 
-        for($i=1; $i <= $num_lists; $i++)
-        {
-            $root_start++;
-            fwrite($this->_filehandle,pack("V",$root_start));
-        }
-        for($i = $num_lists; $i <=108; $i++)
-        {
-            fwrite($this->_filehandle,$unused);
-        }
-    }
-
-
-    /**
-    * Write big block depot.
-    */
-    function _write_big_block_depot()
-    {
-        $num_blocks   = $this->_big_blocks;
-        $num_lists    = $this->_list_blocks;
-        $total_blocks = $num_lists *128;
-        $used_blocks  = $num_blocks + $num_lists +2;
- 
-        $marker       = pack("V", -3);
-        $end_of_chain = pack("V", -2);
-        $unused       = pack("V", -1);
- 
-        for($i=1; $i < $num_blocks; $i++)
-        {
-            fwrite($this->_filehandle,pack("V",$i));
-        }
-        fwrite($this->_filehandle,$end_of_chain);
-        fwrite($this->_filehandle,$end_of_chain);
-        for($i=0; $i < $num_lists; $i++)
-        {
-            fwrite($this->_filehandle,$marker);
-        }
-        for($i=$used_blocks; $i <= $total_blocks; $i++)
-        {
-            fwrite($this->_filehandle,$unused);
-        }
-    }
-
-/**
-* Write property storage. TODO: add summary sheets
-*/
-    function _write_property_storage()
-    {
-        //$rootsize = -2;
-        /***************  name         type   dir start size */
-        $this->_write_pps("Root Entry", 0x05,   1,   -2, 0x00);
-        $this->_write_pps("Book",       0x02,  -1, 0x00, $this->_booksize);
-        $this->_write_pps('',           0x00,  -1, 0x00, 0x0000);
-        $this->_write_pps('',           0x00,  -1, 0x00, 0x0000);
-    }
-
-/**
-* Write property sheet in property storage
-*
-* @param string  $name  name of the property storage.
-* @param integer $type  type of the property storage.
-* @param integer $dir   dir of the property storage.
-* @param integer $start start of the property storage.
-* @param integer $size  size of the property storage.
-* @access private
-*/
-    function _write_pps($name,$type,$dir,$start,$size)
-    {
-        $length  = 0;
-        $rawname = '';
- 
-        if ($name != '')
-        {
-            $name = $name . "\0";
-            for($i=0;$i<strlen($name);$i++)
-            {
-                // Simulate a Unicode string
-                $rawname .= pack("H*",dechex(ord($name[$i]))).pack("C",0);
-            }
-            $length = strlen($name) * 2;
-        }
-       
-        $zero            = pack("C",  0);
-        $pps_sizeofname  = pack("v",  $length);    // 0x40
-        $pps_type        = pack("v",  $type);      // 0x42
-        $pps_prev        = pack("V",  -1);         // 0x44
-        $pps_next        = pack("V",  -1);         // 0x48
-        $pps_dir         = pack("V",  $dir);       // 0x4c
-       
-        $unknown1        = pack("V",  0);
-       
-        $pps_ts1s        = pack("V",  0);          // 0x64
-        $pps_ts1d        = pack("V",  0);          // 0x68
-        $pps_ts2s        = pack("V",  0);          // 0x6c
-        $pps_ts2d        = pack("V",  0);          // 0x70
-        $pps_sb          = pack("V",  $start);     // 0x74
-        $pps_size        = pack("V",  $size);      // 0x78
-       
-       
-        fwrite($this->_filehandle,$rawname);
-        for($i=0; $i < (64 -$length); $i++) {
-            fwrite($this->_filehandle,$zero);
-        }
-        fwrite($this->_filehandle,$pps_sizeofname);
-        fwrite($this->_filehandle,$pps_type);
-        fwrite($this->_filehandle,$pps_prev);
-        fwrite($this->_filehandle,$pps_next);
-        fwrite($this->_filehandle,$pps_dir);
-        for($i=0; $i < 5; $i++) {
-            fwrite($this->_filehandle,$unknown1);
-        }
-        fwrite($this->_filehandle,$pps_ts1s);
-        fwrite($this->_filehandle,$pps_ts1d);
-        fwrite($this->_filehandle,$pps_ts2d);
-        fwrite($this->_filehandle,$pps_ts2d);
-        fwrite($this->_filehandle,$pps_sb);
-        fwrite($this->_filehandle,$pps_size);
-        fwrite($this->_filehandle,$unknown1);
-    }
-
-    /**
-    * Pad the end of the file
-    */
-    function _write_padding()
-    {
-        $biffsize = $this->_biffsize;
-        if ($biffsize < 4096) {
-	    $min_size = 4096;
-        }
-	else {    
-            $min_size = 512;
-        }
-	if ($biffsize % $min_size != 0)
-        {
-            $padding  = $min_size - ($biffsize % $min_size);
-            for($i=0; $i < $padding; $i++) {
-                fwrite($this->_filehandle,"\0");
-            }
-        }
-    }
-}
-?>
diff --git a/vendor/write_excel/Parser.php b/vendor/write_excel/Parser.php
deleted file mode 100644
index 1646f74..0000000
--- a/vendor/write_excel/Parser.php
+++ /dev/null
@@ -1,996 +0,0 @@
-<?php
-/**
-*  Class for parsing Excel formulas
-*
-*  License Information:
-*
-*    Spreadsheet::WriteExcel:  A library for generating Excel Spreadsheets
-*    Copyright (C) 2002 Xavier Noguer xnoguer@rezebra.com
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License as published by the Free Software Foundation; either
-*    version 2.1 of the License, or (at your option) any later version.
-*
-*    This library 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
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/**
-* @const ADD token identifier for character "+"
-*/
-define('ADD',"+");
-
-/**
-* @const SUB token identifier for character "-"
-*/
-define('SUB',"-");
-
-/**
-* @const EQUAL token identifier for character "="
-*/
-define('EQUAL',"=");
-
-/**
-* @const MUL token identifier for character "*"
-*/
-define('MUL',"*");
-
-/**
-* @const DIV token identifier for character "/"
-*/
-define('DIV',"/");
-
-/**
-* @const OPEN token identifier for character "("
-*/
-define('OPEN',"(");
-
-/**
-* @const CLOSE token identifier for character ")"
-*/
-define('CLOSE',")");
-
-/**
-* @const COMA token identifier for character ","
-*/
-define('COMA',",");
-
-/**
-* Class for parsing Excel formulas
-*
-* @author Xavier Noguer <xnoguer@rezebra.com>
-* @package Spreadsheet_WriteExcel
-*/
-class Parser
-  {
-/**
-* The class constructor
-*
-* @param integer $byte_order The byte order (Little endian or Big endian) of the architecture
-                             (optional). 1 => big endian, 0 (default) => little endian.
-*/
-  function __construct($byte_order = 0)
-    {
-    $this->_current_char  = 0;        // The index of the character we are currently looking at.
-    $this->_current_token = '';       // The token we are working on.
-    $this->_formula       = "";       // The formula to parse.
-    $this->_lookahead     = '';       // The character ahead of the current char.
-    $this->_parse_tree    = '';       // The parse tree to be generated.
-    $this->_initialize_hashes();      // Initialize the hashes: ptg's and function's ptg's
-    $this->_byte_order = $byte_order; // Little Endian or Big Endian
-    $this->_func_args  = 0;           // Number of arguments for the current function
-    $this->_volatile   = 0;
-    }
-
-/**
-* Initialize the ptg and function hashes.
-*/
-  function _initialize_hashes()
-    {
-    // The Excel ptg indices
-    $this->ptg = array(
-        'ptgExp'       => 0x01,
-        'ptgTbl'       => 0x02,
-        'ptgAdd'       => 0x03,
-        'ptgSub'       => 0x04,
-        'ptgMul'       => 0x05,
-        'ptgDiv'       => 0x06,
-        'ptgPower'     => 0x07,
-        'ptgConcat'    => 0x08,
-        'ptgLT'        => 0x09,
-        'ptgLE'        => 0x0A,
-        'ptgEQ'        => 0x0B,
-        'ptgGE'        => 0x0C,
-        'ptgGT'        => 0x0D,
-        'ptgNE'        => 0x0E,
-        'ptgIsect'     => 0x0F,
-        'ptgUnion'     => 0x10,
-        'ptgRange'     => 0x11,
-        'ptgUplus'     => 0x12,
-        'ptgUminus'    => 0x13,
-        'ptgPercent'   => 0x14,
-        'ptgParen'     => 0x15,
-        'ptgMissArg'   => 0x16,
-        'ptgStr'       => 0x17,
-        'ptgAttr'      => 0x19,
-        'ptgSheet'     => 0x1A,
-        'ptgEndSheet'  => 0x1B,
-        'ptgErr'       => 0x1C,
-        'ptgBool'      => 0x1D,
-        'ptgInt'       => 0x1E,
-        'ptgNum'       => 0x1F,
-        'ptgArray'     => 0x20,
-        'ptgFunc'      => 0x21,
-        'ptgFuncVar'   => 0x22,
-        'ptgName'      => 0x23,
-        'ptgRef'       => 0x24,
-        'ptgArea'      => 0x25,
-        'ptgMemArea'   => 0x26,
-        'ptgMemErr'    => 0x27,
-        'ptgMemNoMem'  => 0x28,
-        'ptgMemFunc'   => 0x29,
-        'ptgRefErr'    => 0x2A,
-        'ptgAreaErr'   => 0x2B,
-        'ptgRefN'      => 0x2C,
-        'ptgAreaN'     => 0x2D,
-        'ptgMemAreaN'  => 0x2E,
-        'ptgMemNoMemN' => 0x2F,
-        'ptgNameX'     => 0x39,
-        'ptgRef3d'     => 0x3A,
-        'ptgArea3d'    => 0x3B,
-        'ptgRefErr3d'  => 0x3C,
-        'ptgAreaErr3d' => 0x3D,
-        'ptgArrayV'    => 0x40,
-        'ptgFuncV'     => 0x41,
-        'ptgFuncVarV'  => 0x42,
-        'ptgNameV'     => 0x43,
-        'ptgRefV'      => 0x44,
-        'ptgAreaV'     => 0x45,
-        'ptgMemAreaV'  => 0x46,
-        'ptgMemErrV'   => 0x47,
-        'ptgMemNoMemV' => 0x48,
-        'ptgMemFuncV'  => 0x49,
-        'ptgRefErrV'   => 0x4A,
-        'ptgAreaErrV'  => 0x4B,
-        'ptgRefNV'     => 0x4C,
-        'ptgAreaNV'    => 0x4D,
-        'ptgMemAreaNV' => 0x4E,
-        'ptgMemNoMemN' => 0x4F,
-        'ptgFuncCEV'   => 0x58,
-        'ptgNameXV'    => 0x59,
-        'ptgRef3dV'    => 0x5A,
-        'ptgArea3dV'   => 0x5B,
-        'ptgRefErr3dV' => 0x5C,
-        'ptgAreaErr3d' => 0x5D,
-        'ptgArrayA'    => 0x60,
-        'ptgFuncA'     => 0x61,
-        'ptgFuncVarA'  => 0x62,
-        'ptgNameA'     => 0x63,
-        'ptgRefA'      => 0x64,
-        'ptgAreaA'     => 0x65,
-        'ptgMemAreaA'  => 0x66,
-        'ptgMemErrA'   => 0x67,
-        'ptgMemNoMemA' => 0x68,
-        'ptgMemFuncA'  => 0x69,
-        'ptgRefErrA'   => 0x6A,
-        'ptgAreaErrA'  => 0x6B,
-        'ptgRefNA'     => 0x6C,
-        'ptgAreaNA'    => 0x6D,
-        'ptgMemAreaNA' => 0x6E,
-        'ptgMemNoMemN' => 0x6F,
-        'ptgFuncCEA'   => 0x78,
-        'ptgNameXA'    => 0x79,
-        'ptgRef3dA'    => 0x7A,
-        'ptgArea3dA'   => 0x7B,
-        'ptgRefErr3dA' => 0x7C,
-        'ptgAreaErr3d' => 0x7D
-        );
-
-    // Thanks to Michael Meeks and Gnumeric for the initial arg values.
-    //
-    // The following hash was generated by "function_locale.pl" in the distro.
-    // Refer to function_locale.pl for non-English function names.
-    //
-    // The array elements are as follow:
-    // ptg:   The Excel function ptg code.
-    // args:  The number of arguments that the function takes:
-    //           >=0 is a fixed number of arguments.
-    //           -1  is a variable  number of arguments.
-    // class: The reference, value or array class of the function args.
-    // vol:   The function is volatile.
-    //
-    $this->_functions = array(
-          // function                  ptg  args  class  vol
-          'COUNT'           => array(   0,   -1,    0,    0 ),
-          'IF'              => array(   1,   -1,    1,    0 ),
-          'ISNA'            => array(   2,    1,    1,    0 ),
-          'ISERROR'         => array(   3,    1,    1,    0 ),
-          'SUM'             => array(   4,   -1,    0,    0 ),
-          'AVERAGE'         => array(   5,   -1,    0,    0 ),
-          'MIN'             => array(   6,   -1,    0,    0 ),
-          'MAX'             => array(   7,   -1,    0,    0 ),
-          'ROW'             => array(   8,   -1,    0,    0 ),
-          'COLUMN'          => array(   9,   -1,    0,    0 ),
-          'NA'              => array(  10,    0,    0,    0 ),
-          'NPV'             => array(  11,   -1,    1,    0 ),
-          'STDEV'           => array(  12,   -1,    0,    0 ),
-          'DOLLAR'          => array(  13,   -1,    1,    0 ),
-          'FIXED'           => array(  14,   -1,    1,    0 ),
-          'SIN'             => array(  15,    1,    1,    0 ),
-          'COS'             => array(  16,    1,    1,    0 ),
-          'TAN'             => array(  17,    1,    1,    0 ),
-          'ATAN'            => array(  18,    1,    1,    0 ),
-          'PI'              => array(  19,    0,    1,    0 ),
-          'SQRT'            => array(  20,    1,    1,    0 ),
-          'EXP'             => array(  21,    1,    1,    0 ),
-          'LN'              => array(  22,    1,    1,    0 ),
-          'LOG10'           => array(  23,    1,    1,    0 ),
-          'ABS'             => array(  24,    1,    1,    0 ),
-          'INT'             => array(  25,    1,    1,    0 ),
-          'SIGN'            => array(  26,    1,    1,    0 ),
-          'ROUND'           => array(  27,    2,    1,    0 ),
-          'LOOKUP'          => array(  28,   -1,    0,    0 ),
-          'INDEX'           => array(  29,   -1,    0,    1 ),
-          'REPT'            => array(  30,    2,    1,    0 ),
-          'MID'             => array(  31,    3,    1,    0 ),
-          'LEN'             => array(  32,    1,    1,    0 ),
-          'VALUE'           => array(  33,    1,    1,    0 ),
-          'TRUE'            => array(  34,    0,    1,    0 ),
-          'FALSE'           => array(  35,    0,    1,    0 ),
-          'AND'             => array(  36,   -1,    0,    0 ),
-          'OR'              => array(  37,   -1,    0,    0 ),
-          'NOT'             => array(  38,    1,    1,    0 ),
-          'MOD'             => array(  39,    2,    1,    0 ),
-          'DCOUNT'          => array(  40,    3,    0,    0 ),
-          'DSUM'            => array(  41,    3,    0,    0 ),
-          'DAVERAGE'        => array(  42,    3,    0,    0 ),
-          'DMIN'            => array(  43,    3,    0,    0 ),
-          'DMAX'            => array(  44,    3,    0,    0 ),
-          'DSTDEV'          => array(  45,    3,    0,    0 ),
-          'VAR'             => array(  46,   -1,    0,    0 ),
-          'DVAR'            => array(  47,    3,    0,    0 ),
-          'TEXT'            => array(  48,    2,    1,    0 ),
-          'LINEST'          => array(  49,   -1,    0,    0 ),
-          'TREND'           => array(  50,   -1,    0,    0 ),
-          'LOGEST'          => array(  51,   -1,    0,    0 ),
-          'GROWTH'          => array(  52,   -1,    0,    0 ),
-          'PV'              => array(  56,   -1,    1,    0 ),
-          'FV'              => array(  57,   -1,    1,    0 ),
-          'NPER'            => array(  58,   -1,    1,    0 ),
-          'PMT'             => array(  59,   -1,    1,    0 ),
-          'RATE'            => array(  60,   -1,    1,    0 ),
-          'MIRR'            => array(  61,    3,    0,    0 ),
-          'IRR'             => array(  62,   -1,    0,    0 ),
-          'RAND'            => array(  63,    0,    1,    1 ),
-          'MATCH'           => array(  64,   -1,    0,    0 ),
-          'DATE'            => array(  65,    3,    1,    0 ),
-          'TIME'            => array(  66,    3,    1,    0 ),
-          'DAY'             => array(  67,    1,    1,    0 ),
-          'MONTH'           => array(  68,    1,    1,    0 ),
-          'YEAR'            => array(  69,    1,    1,    0 ),
-          'WEEKDAY'         => array(  70,   -1,    1,    0 ),
-          'HOUR'            => array(  71,    1,    1,    0 ),
-          'MINUTE'          => array(  72,    1,    1,    0 ),
-          'SECOND'          => array(  73,    1,    1,    0 ),
-          'NOW'             => array(  74,    0,    1,    1 ),
-          'AREAS'           => array(  75,    1,    0,    1 ),
-          'ROWS'            => array(  76,    1,    0,    1 ),
-          'COLUMNS'         => array(  77,    1,    0,    1 ),
-          'OFFSET'          => array(  78,   -1,    0,    1 ),
-          'SEARCH'          => array(  82,   -1,    1,    0 ),
-          'TRANSPOSE'       => array(  83,    1,    1,    0 ),
-          'TYPE'            => array(  86,    1,    1,    0 ),
-          'ATAN2'           => array(  97,    2,    1,    0 ),
-          'ASIN'            => array(  98,    1,    1,    0 ),
-          'ACOS'            => array(  99,    1,    1,    0 ),
-          'CHOOSE'          => array( 100,   -1,    1,    0 ),
-          'HLOOKUP'         => array( 101,   -1,    0,    0 ),
-          'VLOOKUP'         => array( 102,   -1,    0,    0 ),
-          'ISREF'           => array( 105,    1,    0,    0 ),
-          'LOG'             => array( 109,   -1,    1,    0 ),
-          'CHAR'            => array( 111,    1,    1,    0 ),
-          'LOWER'           => array( 112,    1,    1,    0 ),
-          'UPPER'           => array( 113,    1,    1,    0 ),
-          'PROPER'          => array( 114,    1,    1,    0 ),
-          'LEFT'            => array( 115,   -1,    1,    0 ),
-          'RIGHT'           => array( 116,   -1,    1,    0 ),
-          'EXACT'           => array( 117,    2,    1,    0 ),
-          'TRIM'            => array( 118,    1,    1,    0 ),
-          'REPLACE'         => array( 119,    4,    1,    0 ),
-          'SUBSTITUTE'      => array( 120,   -1,    1,    0 ),
-          'CODE'            => array( 121,    1,    1,    0 ),
-          'FIND'            => array( 124,   -1,    1,    0 ),
-          'CELL'            => array( 125,   -1,    0,    1 ),
-          'ISERR'           => array( 126,    1,    1,    0 ),
-          'ISTEXT'          => array( 127,    1,    1,    0 ),
-          'ISNUMBER'        => array( 128,    1,    1,    0 ),
-          'ISBLANK'         => array( 129,    1,    1,    0 ),
-          'T'               => array( 130,    1,    0,    0 ),
-          'N'               => array( 131,    1,    0,    0 ),
-          'DATEVALUE'       => array( 140,    1,    1,    0 ),
-          'TIMEVALUE'       => array( 141,    1,    1,    0 ),
-          'SLN'             => array( 142,    3,    1,    0 ),
-          'SYD'             => array( 143,    4,    1,    0 ),
-          'DDB'             => array( 144,   -1,    1,    0 ),
-          'INDIRECT'        => array( 148,   -1,    1,    1 ),
-          'CALL'            => array( 150,   -1,    1,    0 ),
-          'CLEAN'           => array( 162,    1,    1,    0 ),
-          'MDETERM'         => array( 163,    1,    2,    0 ),
-          'MINVERSE'        => array( 164,    1,    2,    0 ),
-          'MMULT'           => array( 165,    2,    2,    0 ),
-          'IPMT'            => array( 167,   -1,    1,    0 ),
-          'PPMT'            => array( 168,   -1,    1,    0 ),
-          'COUNTA'          => array( 169,   -1,    0,    0 ),
-          'PRODUCT'         => array( 183,   -1,    0,    0 ),
-          'FACT'            => array( 184,    1,    1,    0 ),
-          'DPRODUCT'        => array( 189,    3,    0,    0 ),
-          'ISNONTEXT'       => array( 190,    1,    1,    0 ),
-          'STDEVP'          => array( 193,   -1,    0,    0 ),
-          'VARP'            => array( 194,   -1,    0,    0 ),
-          'DSTDEVP'         => array( 195,    3,    0,    0 ),
-          'DVARP'           => array( 196,    3,    0,    0 ),
-          'TRUNC'           => array( 197,   -1,    1,    0 ),
-          'ISLOGICAL'       => array( 198,    1,    1,    0 ),
-          'DCOUNTA'         => array( 199,    3,    0,    0 ),
-          'ROUNDUP'         => array( 212,    2,    1,    0 ),
-          'ROUNDDOWN'       => array( 213,    2,    1,    0 ),
-          'RANK'            => array( 216,   -1,    0,    0 ),
-          'ADDRESS'         => array( 219,   -1,    1,    0 ),
-          'DAYS360'         => array( 220,   -1,    1,    0 ),
-          'TODAY'           => array( 221,    0,    1,    1 ),
-          'VDB'             => array( 222,   -1,    1,    0 ),
-          'MEDIAN'          => array( 227,   -1,    0,    0 ),
-          'SUMPRODUCT'      => array( 228,   -1,    2,    0 ),
-          'SINH'            => array( 229,    1,    1,    0 ),
-          'COSH'            => array( 230,    1,    1,    0 ),
-          'TANH'            => array( 231,    1,    1,    0 ),
-          'ASINH'           => array( 232,    1,    1,    0 ),
-          'ACOSH'           => array( 233,    1,    1,    0 ),
-          'ATANH'           => array( 234,    1,    1,    0 ),
-          'DGET'            => array( 235,    3,    0,    0 ),
-          'INFO'            => array( 244,    1,    1,    1 ),
-          'DB'              => array( 247,   -1,    1,    0 ),
-          'FREQUENCY'       => array( 252,    2,    0,    0 ),
-          'ERROR.TYPE'      => array( 261,    1,    1,    0 ),
-          'REGISTER.ID'     => array( 267,   -1,    1,    0 ),
-          'AVEDEV'          => array( 269,   -1,    0,    0 ),
-          'BETADIST'        => array( 270,   -1,    1,    0 ),
-          'GAMMALN'         => array( 271,    1,    1,    0 ),
-          'BETAINV'         => array( 272,   -1,    1,    0 ),
-          'BINOMDIST'       => array( 273,    4,    1,    0 ),
-          'CHIDIST'         => array( 274,    2,    1,    0 ),
-          'CHIINV'          => array( 275,    2,    1,    0 ),
-          'COMBIN'          => array( 276,    2,    1,    0 ),
-          'CONFIDENCE'      => array( 277,    3,    1,    0 ),
-          'CRITBINOM'       => array( 278,    3,    1,    0 ),
-          'EVEN'            => array( 279,    1,    1,    0 ),
-          'EXPONDIST'       => array( 280,    3,    1,    0 ),
-          'FDIST'           => array( 281,    3,    1,    0 ),
-          'FINV'            => array( 282,    3,    1,    0 ),
-          'FISHER'          => array( 283,    1,    1,    0 ),
-          'FISHERINV'       => array( 284,    1,    1,    0 ),
-          'FLOOR'           => array( 285,    2,    1,    0 ),
-          'GAMMADIST'       => array( 286,    4,    1,    0 ),
-          'GAMMAINV'        => array( 287,    3,    1,    0 ),
-          'CEILING'         => array( 288,    2,    1,    0 ),
-          'HYPGEOMDIST'     => array( 289,    4,    1,    0 ),
-          'LOGNORMDIST'     => array( 290,    3,    1,    0 ),
-          'LOGINV'          => array( 291,    3,    1,    0 ),
-          'NEGBINOMDIST'    => array( 292,    3,    1,    0 ),
-          'NORMDIST'        => array( 293,    4,    1,    0 ),
-          'NORMSDIST'       => array( 294,    1,    1,    0 ),
-          'NORMINV'         => array( 295,    3,    1,    0 ),
-          'NORMSINV'        => array( 296,    1,    1,    0 ),
-          'STANDARDIZE'     => array( 297,    3,    1,    0 ),
-          'ODD'             => array( 298,    1,    1,    0 ),
-          'PERMUT'          => array( 299,    2,    1,    0 ),
-          'POISSON'         => array( 300,    3,    1,    0 ),
-          'TDIST'           => array( 301,    3,    1,    0 ),
-          'WEIBULL'         => array( 302,    4,    1,    0 ),
-          'SUMXMY2'         => array( 303,    2,    2,    0 ),
-          'SUMX2MY2'        => array( 304,    2,    2,    0 ),
-          'SUMX2PY2'        => array( 305,    2,    2,    0 ),
-          'CHITEST'         => array( 306,    2,    2,    0 ),
-          'CORREL'          => array( 307,    2,    2,    0 ),
-          'COVAR'           => array( 308,    2,    2,    0 ),
-          'FORECAST'        => array( 309,    3,    2,    0 ),
-          'FTEST'           => array( 310,    2,    2,    0 ),
-          'INTERCEPT'       => array( 311,    2,    2,    0 ),
-          'PEARSON'         => array( 312,    2,    2,    0 ),
-          'RSQ'             => array( 313,    2,    2,    0 ),
-          'STEYX'           => array( 314,    2,    2,    0 ),
-          'SLOPE'           => array( 315,    2,    2,    0 ),
-          'TTEST'           => array( 316,    4,    2,    0 ),
-          'PROB'            => array( 317,   -1,    2,    0 ),
-          'DEVSQ'           => array( 318,   -1,    0,    0 ),
-          'GEOMEAN'         => array( 319,   -1,    0,    0 ),
-          'HARMEAN'         => array( 320,   -1,    0,    0 ),
-          'SUMSQ'           => array( 321,   -1,    0,    0 ),
-          'KURT'            => array( 322,   -1,    0,    0 ),
-          'SKEW'            => array( 323,   -1,    0,    0 ),
-          'ZTEST'           => array( 324,   -1,    0,    0 ),
-          'LARGE'           => array( 325,    2,    0,    0 ),
-          'SMALL'           => array( 326,    2,    0,    0 ),
-          'QUARTILE'        => array( 327,    2,    0,    0 ),
-          'PERCENTILE'      => array( 328,    2,    0,    0 ),
-          'PERCENTRANK'     => array( 329,   -1,    0,    0 ),
-          'MODE'            => array( 330,   -1,    2,    0 ),
-          'TRIMMEAN'        => array( 331,    2,    0,    0 ),
-          'TINV'            => array( 332,    2,    1,    0 ),
-          'CONCATENATE'     => array( 336,   -1,    1,    0 ),
-          'POWER'           => array( 337,    2,    1,    0 ),
-          'RADIANS'         => array( 342,    1,    1,    0 ),
-          'DEGREES'         => array( 343,    1,    1,    0 ),
-          'SUBTOTAL'        => array( 344,   -1,    0,    0 ),
-          'SUMIF'           => array( 345,   -1,    0,    0 ),
-          'COUNTIF'         => array( 346,    2,    0,    0 ),
-          'COUNTBLANK'      => array( 347,    1,    0,    0 ),
-          'ROMAN'           => array( 354,   -1,    1,    0 )
-          );
-    }
-
-/**
-* Convert a token to the proper ptg value.
-*
-* @param mixed $token The token to convert.
-*/
-  function _convert($token)
-    {
-    if(is_numeric($token))
-        {
-        return($this->_convert_number($token));
-        }
-    // match references like A1
-    elseif(preg_match("/^([A-I]?[A-Z])(\d+)$/",$token))
-        {
-        return($this->_convert_ref2d($token));
-        }
-    // match ranges like A1:B2
-    elseif(preg_match("/^([A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$token))
-        {
-        return($this->_convert_range2d($token));
-        }
-    // match ranges like A1..B2
-    elseif(preg_match("/^([A-I]?[A-Z])(\d+)\.\.([A-I]?[A-Z])(\d+)$/",$token))
-        {
-        return($this->_convert_range2d($token));
-        }
-    elseif(isset($this->ptg[$token])) // operators (including parentheses)
-        {
-        return(pack("C", $this->ptg[$token]));
-        }
-    elseif(preg_match("/[A-Z0-9�-�\.]+/",$token))
-        {
-        return($this->_convert_function($token,$this->_func_args));
-        }
-    // if it's an argument, ignore the token (the argument remains)
-    elseif($token == 'arg')
-        {
-        $this->_func_args++;
-        return('');
-        }
-    die("Unknown token $token");
-    }
-
-/**
-* Convert a number token to ptgInt or ptgNum
-*
-* @param mixed $num an integer or double for conersion to its ptg value
-*/
-  function _convert_number($num)
-    {
-    // Integer in the range 0..2**16-1
-    if ((preg_match("/^\d+$/",$num)) and ($num <= 65535)) {
-        return pack("Cv", $this->ptg['ptgInt'], $num);
-        }
-    else // A float
-        {
-        if($this->_byte_order) // if it's Big Endian
-            {
-            $num = strrev($num);
-            }
-        return pack("Cd", $this->ptg['ptgNum'], $num);
-        }
-    }
-
-/**
-* Convert a function to a ptgFunc or ptgFuncVarV depending on the number of
-* args that it takes.
-*
-* @param string  $token    The name of the function for convertion to ptg value.
-* @param integer $num_args The number of arguments the function recieves.
-*/
-  function _convert_function($token, $num_args)
-    {
-    $this->_func_args = 0; // re initialize the number of arguments
-    $args     = $this->_functions[$token][1];
-    $volatile = $this->_functions[$token][3];
-
-    if($volatile) {
-        $this->_volatile = 1;
-        }
-    // Fixed number of args eg. TIME($i,$j,$k).
-    if ($args >= 0)
-        {
-        return(pack("Cv", $this->ptg['ptgFuncV'], $this->_functions[$token][0]));
-        }
-    // Variable number of args eg. SUM($i,$j,$k, ..).
-    if ($args == -1) {
-        return(pack("CCv", $this->ptg['ptgFuncVarV'], $num_args, $this->_functions[$token][0]));
-        }
-    }
-
-/**
-* Convert an Excel range such as A1:D4 to a ptgRefV.
-*
-* @param string $range An Excel range in the A1:A2 or A1..A2 format.
-*/
-  function _convert_range2d($range)
-    {
-    $class = 2; // as far as I know, this is magick.
-
-    // Split the range into 2 cell refs
-    if(preg_match("/^([A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$range)) {
-        list($cell1, $cell2) = explode(':', $range);
-        }
-    elseif(preg_match("/^([A-I]?[A-Z])(\d+)\.\.([A-I]?[A-Z])(\d+)$/",$range)) {
-        list($cell1, $cell2) = explode('\.\.', $range);
-        }
-    else {
-        die("Unknown range separator");
-        }
-
-    // Convert the cell references
-    list($row1, $col1) = $this->_cell_to_packed_rowcol($cell1);
-    list($row2, $col2) = $this->_cell_to_packed_rowcol($cell2);
-
-    // The ptg value depends on the class of the ptg.
-    if ($class == 0) {
-        $ptgArea = pack("C", $this->ptg['ptgArea']);
-        }
-    elseif ($class == 1) {
-        $ptgArea = pack("C", $this->ptg['ptgAreaV']);
-        }
-    elseif ($class == 2) {
-        $ptgArea = pack("C", $this->ptg['ptgAreaA']);
-        }
-    else{
-        die("Unknown class ");
-        }
-
-    return($ptgArea . $row1 . $row2 . $col1. $col2);
-    }
-
-/**
-* Convert an Excel reference such as A1, $B2, C$3 or $D$4 to a ptgRefV.
-*
-* @param string $cell An Excel cell reference
-*/
-  function _convert_ref2d($cell)
-    {
-    $class = 2; // as far as I know, this is magick.
-
-    // Convert the cell reference
-    list($row, $col) = $this->_cell_to_packed_rowcol($cell);
-
-    // The ptg value depends on the class of the ptg.
-    if ($class == 0) {
-        $ptgRef = pack("C", $this->ptg['ptgRef']);
-        }
-    elseif ($class == 1) {
-        $ptgRef = pack("C", $this->ptg['ptgRefV']);
-        }
-    elseif ($class == 2) {
-        $ptgRef = pack("C", $this->ptg['ptgRefA']);
-        }
-    else{
-        die("Unknown class ");
-        }
-    return $ptgRef.$row.$col;
-    }
-
-/**
-* pack() row and column into the required 3 byte format.
-*
-* @param string $cell The Excel cell reference to be packed
-*/
-  function _cell_to_packed_rowcol($cell)
-    {
-    list($row, $col, $row_rel, $col_rel) = $this->_cell_to_rowcol($cell);
-    if ($col >= 256) {
-        die("Column in: $cell greater than 255 ");
-        }
-    if ($row >= 16384) {
-        die("Row in: $cell greater than 16384 ");
-        }
-
-    // Set the high bits to indicate if row or col are relative.
-    $row    |= $col_rel << 14;
-    $row    |= $row_rel << 15;
-
-    $row     = pack('v', $row);
-    $col     = pack('C', $col);
-
-    return (array($row, $col));
-    }
-
-/**
-* Convert an Excel cell reference such as A1 or $B2 or C$3 or $D$4 to a zero
-* indexed row and column number. Also returns two boolean values to indicate
-* whether the row or column are relative references.
-*
-* @param string $cell The Excel cell reference in A1 format.
-*/
-  function _cell_to_rowcol($cell)
-    {
-    preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/',$cell,$match);
-    // return absolute column if there is a $ in the ref
-    $col_rel = empty($match[1]) ? 1 : 0;
-    $col_ref = $match[2];
-    $row_rel = empty($match[3]) ? 1 : 0;
-    $row     = $match[4];
-
-    // Convert base26 column string to a number.
-    $expn   = strlen($col_ref) - 1;
-    $col    = 0;
-    for($i=0; $i < strlen($col_ref); $i++)
-    {
-        $col += (ord($col_ref[$i]) - ord('A') + 1) * pow(26, $expn);
-        $expn--;
-    }
-
-    // Convert 1-index to zero-index
-    $row--;
-    $col--;
-
-    return(array($row, $col, $row_rel, $col_rel));
-    }
-
-/**
-* Advance to the next valid token.
-*/
-  function _advance()
-    {
-    $i = $this->_current_char;
-    // eat up white spaces
-    if($i < strlen($this->_formula))
-        {
-        while($this->_formula[$i] == " ")
-            {
-            $i++;
-            }
-        if($i < strlen($this->_formula) - 1)
-            {
-            $this->_lookahead = $this->_formula[$i+1];
-            }
-        $token = "";
-        }
-    while($i < strlen($this->_formula))
-        {
-        $token .= $this->_formula[$i];
-        if($this->_match($token) != '')
-            {
-            if($i < strlen($this->_formula) - 1)
-                {
-                $this->_lookahead = $this->_formula[$i+1];
-                }
-            $this->_current_char = $i + 1;
-            $this->_current_token = $token;
-            return(1);
-            }
-        $this->_lookahead = $this->_formula[$i+2];
-        $i++;
-        }
-    //die("Lexical error ".$this->_current_char);
-    }
-
-/**
-* Checks if it's a valid token.
-*
-* @param mixed $token The token to check.
-*/
-  function _match($token)
-    {
-    switch($token)
-        {
-        case ADD:
-            return($token);
-            break;
-        case SUB:
-            return($token);
-            break;
-        case MUL:
-            return($token);
-            break;
-        case DIV:
-            return($token);
-            break;
-        case OPEN:
-            return($token);
-            break;
-        case CLOSE:
-            return($token);
-            break;
-        case COMA:
-            return($token);
-            break;
-        default:
-	    // if it's a reference
-            if(preg_match("/^[A-I]?[A-Z][0-9]+$/i", $token) and
-	        !preg_match("/[0-9]/",$this->_lookahead) and
-               ($this->_lookahead != ':') and ($this->_lookahead != '.'))
-                {
-                return($token);
-                }
-            // if it's a range (A1:A2)
-            elseif(preg_match("/^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$/i", $token) and
-	         !preg_match("/[0-9]/",$this->_lookahead))
-	        {
-		return($token);
-		}
-            // if it's a range (A1..A2)
-            elseif(preg_match("/^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$/i", $token) and
-	           !preg_match("/[0-9]/",$this->_lookahead))
-	        {
-		return($token);
-		}
-            elseif(is_numeric($token) and !is_numeric($token.$this->_lookahead))
-                {
-                return($token);
-                }
-            // if it's a function call
-            elseif(preg_match("/^[A-Z0-9�-�\.]+$/i", $token) and ($this->_lookahead == "("))
-
-	        {
-		return($token);
-		}
-            return '';
-        }
-    }
-
-/**
-* The parsing method. It parses a formula.
-*
-* @access public
-* @param string $formula The formula to parse, without the initial equal sign (=).
-*/
-  function parse($formula)
-    {
-    $this->_current_char = 0;
-    $this->_formula      = $formula;
-    $this->_lookahead    = $formula[1];
-    $this->_advance();
-    $this->_parse_tree   = $this->_expression();
-    }
-
-/**
-* It parses a expression. It assumes the following rule:
-* Expr -> Term [("+" | "-") Term]
-*
-* @return mixed The parsed ptg'd tree
-*/
-  function _expression()
-    {
-    $result = $this->_term();
-    while ($this->_current_token == ADD or $this->_current_token == SUB)
-        {
-        if ($this->_current_token == ADD)
-            {
-            $this->_advance();
-            $result = $this->_create_tree('ptgAdd', $result, $this->_term());
-            }
-        else
-            {
-            $this->_advance();
-            $result = $this->_create_tree('ptgSub', $result, $this->_term());
-            }
-        }
-    return $result;
-    }
-
-/**
-* This function just introduces a ptgParen element in the tree, so that Excel
-* doesn't get confused when working with a parenthesized formula afterwards.
-*
-* @see _fact
-* @return mixed The parsed ptg'd tree
-*/
-  function _parenthesized_expression()
-    {
-    $result = $this->_create_tree('ptgParen', $this->_expression(), '');
-    return($result);
-    }
-
-/**
-* It parses a term. It assumes the following rule:
-* Term -> Fact [("*" | "/") Fact]
-*
-* @return mixed The parsed ptg'd tree
-*/
-  function _term()
-    {
-    $result = $this->_fact();
-    while ($this->_current_token == MUL || $this->_current_token == DIV)
-        {
-        if ($this->_current_token == MUL)
-            {
-            $this->_advance();
-            $result = $this->_create_tree('ptgMul', $result, $this->_fact());
-            }
-        else
-            {
-            $this->_advance();
-            $result = $this->_create_tree('ptgDiv', $result, $this->_fact());
-            }
-        }
-    return($result);
-    }
-
-/**
-* It parses a factor. It assumes the following rule:
-* Fact -> ( Expr )
-*       | CellRef
-*       | CellRange
-*       | Number
-*       | Function
-*
-* @return mixed The parsed ptg'd tree
-*/
-  function _fact()
-    {
-    if ($this->_current_token == OPEN)
-        {
-        $this->_advance();         // eat the "("
-        $result = $this->_parenthesized_expression();//$this->_expression();
-
-        if ($this->_current_token != CLOSE) {
-            die("')' token expected.");
-            }
-        $this->_advance();         // eat the ")"
-        return($result);
-        }
-    // if it's a reference
-    if (preg_match("/^[A-I]?[A-Z][0-9]+$/i", $this->_current_token))
-        {
-        $result = $this->_create_tree($this->_current_token, '', '');
-        $this->_advance();
-        return($result);
-        }
-    // if it's a range
-    elseif (preg_match("/^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$/i", $this->_current_token) or
-            preg_match("/^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$/i", $this->_current_token))
-        {
-        $result = $this->_current_token;
-        $this->_advance();
-        return($result);
-        }
-    elseif (is_numeric($this->_current_token))
-        {
-        $result = $this->_create_tree($this->_current_token, '', '');
-        $this->_advance();
-        return($result);
-        }
-    // if it's a function call
-    elseif (preg_match("/^[A-Z0-9�-�\.]+$/i", $this->_current_token))
-        {
-        $result = $this->_func();
-        return($result);
-        }
-    die("Sintactic error: ".$this->_current_token.", lookahead: ".
-        $this->_lookahead.", current char: ".$this->_current_char);
-    }
-
-/**
-* It parses a function call. It assumes the following rule:
-* Func -> ( Expr [,Expr]* )
-*
-*/
-  function _func()
-    {
-    $num_args = 0; // number of arguments received
-    $function = $this->_current_token;
-    $this->_advance();
-    $this->_advance();         // eat the "("
-    while($this->_current_token != ')')
-        {
-        if($num_args > 0)
-            {
-            if($this->_current_token == COMA) {
-                $this->_advance();  // eat the ","
-                }
-            else {
-                die("Sintactic error: coma expected $num_args");
-                }
-            $result = $this->_create_tree('arg', $result, $this->_expression());
-            }
-        else {
-            $result = $this->_create_tree('arg', '', $this->_expression());
-            }
-        $num_args++;
-        }
-    $args = $this->_functions[$function][1];
-    // If fixed number of args eg. TIME($i,$j,$k). Check that the number of args is valid.
-    if (($args >= 0) and ($args != $num_args))
-        {
-        die("Incorrect number of arguments in function $function() ");
-        }
-
-    $result = $this->_create_tree($function, $result, '');
-    $this->_advance();         // eat the ")"
-    return($result);
-    }
-
-/**
-* Creates a tree. In fact an array which may have one or two arrays (sub-trees)
-* as elements.
-*
-* @param mixed $value The value of this node.
-* @param mixed $left  The left array (sub-tree) or a final node.
-* @param mixed $right The right array (sub-tree) or a final node.
-*/
-  function _create_tree($value, $left, $right)
-    {
-    return array('value' => $value, 'left' => $left, 'right' => $right);
-    }
-
-/**
-* Builds a string containing the tree in reverse polish notation (What you
-* would use in a HP calculator stack).
-* The following tree:
-*
-*    +
-*   / \
-*  2   3
-*
-* produces: "23+"
-*
-* The following tree:
-*
-*    +
-*   / \
-*  3   *
-*     / \
-*    6   A1
-*
-* produces: "36A1*+"
-*
-* In fact all operands, functions, references, etc... are written as ptg's
-*
-* @access public
-* @param array $tree The optional tree to convert.
-*/
-  function to_reverse_polish($tree = array())
-    {
-    $polish = ""; // the string we are going to return
-    if (empty($tree)) // If it's the first call use _parse_tree
-        {
-        $tree = $this->_parse_tree;
-        }
-    if (is_array($tree['left']))
-        {
-        $polish .= $this->to_reverse_polish($tree['left']);
-        }
-    elseif($tree['left'] != '') // It's a final node
-        {
-        $polish .= $this->_convert($tree['left']); //$tree['left'];
-        }
-    if (is_array($tree['right']))
-        {
-        $polish .= $this->to_reverse_polish($tree['right']);
-        }
-    elseif($tree['right'] != '') // It's a final node
-        {
-        $polish .= $this->_convert($tree['right']);
-        }
-    $polish .= $this->_convert($tree['value']);
-    return $polish;
-    }
-  }
-?>
diff --git a/vendor/write_excel/Workbook.php b/vendor/write_excel/Workbook.php
deleted file mode 100644
index eff68c0..0000000
--- a/vendor/write_excel/Workbook.php
+++ /dev/null
@@ -1,953 +0,0 @@
-<?php
-/*
-*  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-*
-*  The majority of this is _NOT_ my code.  I simply ported it from the
-*  PERL Spreadsheet::WriteExcel module.
-*
-*  The author of the Spreadsheet::WriteExcel module is John McNamara 
-*  <jmcnamara@cpan.org>
-*
-*  I _DO_ maintain this code, and John McNamara has nothing to do with the
-*  porting of this code to PHP.  Any questions directly related to this
-*  class library should be directed to me.
-*
-*  License Information:
-*
-*    Spreadsheet::WriteExcel:  A library for generating Excel Spreadsheets
-*    Copyright (C) 2002 Xavier Noguer xnoguer@rezebra.com
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License as published by the Free Software Foundation; either
-*    version 2.1 of the License, or (at your option) any later version.
-*
-*    This library 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
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-require_once('Format.php');
-require_once('OLEwriter.php');
-require_once('BIFFwriter.php');
-
-/**
-* Class for generating Excel Spreadsheets
-*
-* @author Xavier Noguer <xnoguer@rezebra.com>
-* @package Spreadsheet_WriteExcel
-*/
-
-class Workbook extends BIFFwriter
-{
-    /**
-    * Class constructor
-    *
-    * @param string filename for storing the workbook. "-" for writing to stdout.
-    */
-    function __construct($filename)
-    {
-        parent::__construct();
-    
-        $this->_filename         = $filename;
-        $this->parser            = new Parser($this->_byte_order);
-        $this->_1904             = 0;
-        $this->activesheet       = 0;
-        $this->firstsheet        = 0;
-        $this->selected          = 0;
-        $this->xf_index          = 16; // 15 style XF's and 1 cell XF.
-        $this->_fileclosed       = 0;
-        $this->_biffsize         = 0;
-        $this->sheetname         = "Sheet";
-        $this->tmp_format        = new Format();
-        $this->worksheets        = array();
-        $this->sheetnames        = array();
-        $this->formats           = array();
-        $this->palette           = array();
-    
-        // Add the default format for hyperlinks
-        $this->url_format =& $this->add_format(array('color' => 'blue', 'underline' => 1));
-    
-        // Check for a filename
-        //if ($this->_filename == '') {
-        //    die('Filename required by Spreadsheet::WriteExcel->new()');
-        //}
-    
-        # Warn if tmpfiles can't be used.
-        //$this->tmpfile_warning();
-        $this->_set_palette_xl97();
-    }
-    
-    /**
-    * Calls finalization methods and explicitly close the OLEwriter file
-    * handle.
-    */
-    function close()
-    {
-        if ($this->_fileclosed) { // Prevent close() from being called twice.
-            return;
-        }
-        $this->store_workbook();
-        $this->_fileclosed = 1;
-    }
-    
-    
-    /**
-    * An accessor for the _worksheets[] array
-    * Returns an array of the worksheet objects in a workbook
-    *
-    * @return array
-    */
-    function sheets()
-    {
-        return($this->worksheets());
-    }
-    
-    /**
-    * An accessor for the _worksheets[] array.
-    *
-    * @return array
-    */
-    function worksheets()
-    {
-        return($this->worksheets);
-    }
-    
-    /**
-    * Add a new worksheet to the Excel workbook.
-    * TODO: Add accessor for $this->{_sheetname} for international Excel versions.
-    *
-    * @access public
-    * @param string $name the optional name of the worksheet
-    * @return &object reference to a worksheet object
-    */
-    function &add_worksheet($name = '')
-    {
-        $index     = count($this->worksheets);
-        $sheetname = $this->sheetname;
-
-        if($name == '') {
-            $name = $sheetname.($index+1); 
-        }
-    
-        // Check that sheetname is <= 31 chars (Excel limit).
-        if(strlen($name) > 31) {
-            die("Sheetname $name must be <= 31 chars");
-        }
-    
-        // Check that the worksheet name doesn't already exist: a fatal Excel error.
-        for($i=0; $i < count($this->worksheets); $i++)
-        {
-            if($name == $this->worksheets[$i]->get_name()) {
-                die("Worksheet '$name' already exists");
-            }
-        }
-    
-        $worksheet = new Worksheet($name,$index,$this->activesheet,
-                                   $this->firstsheet,$this->url_format,
-                                   $this->parser);
-        $this->worksheets[$index] = &$worksheet;      // Store ref for iterator
-        $this->sheetnames[$index] = $name;            // Store EXTERNSHEET names
-        //$this->parser->set_ext_sheet($name,$index); // Store names in Formula.php
-        return($worksheet);
-    }
-    
-    /**
-    * DEPRECATED!! Use add_worksheet instead
-    *
-    * @access public
-    * @deprecated Use add_worksheet instead
-    * @param string $name the optional name of the worksheet
-    * @return &object reference to a worksheet object
-    */
-    function &addworksheet($name = '')
-    {
-        return($this->add_worksheet($name));
-    }
-    
-    /**
-    * Add a new format to the Excel workbook. This adds an XF record and
-    * a FONT record. Also, pass any properties to the Format constructor.
-    *
-    * @access public
-    * @param array $properties array with properties for initializing the format (see Format.php)
-    * @return &object reference to an XF format
-    */
-    function &add_format($properties = array())
-    {
-        $format = new Format($this->xf_index,$properties);
-        $this->xf_index += 1;
-        $this->formats[] = &$format;
-        return($format);
-    }
-    
-    /**
-    * DEPRECATED!! Use add_format instead
-    *
-    * @access public
-    * @deprecated Use add_format instead
-    * @param array $properties array with properties for initializing the format (see Format.php)
-    * @return &object reference to an XF format
-    */
-    function &addformat($properties = array())
-    {
-         return($this->add_format($properties));
-    }
-    
-    
-    /**
-    * Change the RGB components of the elements in the colour palette.
-    *
-    * @access public
-    * @param integer $index colour index
-    * @param integer $red   red RGB value [0-255]
-    * @param integer $green green RGB value [0-255]
-    * @param integer $blue  blue RGB value [0-255]
-    * @return integer The palette index for the custom color
-    */
-    function set_custom_color($index,$red,$green,$blue)
-    {
-        // Match a HTML #xxyyzz style parameter
-        /*if (defined $_[1] and $_[1] =~ /^#(\w\w)(\w\w)(\w\w)/ ) {
-            @_ = ($_[0], hex $1, hex $2, hex $3);
-        }*/
-    
-        // Check that the colour index is the right range
-        if ($index < 8 or $index > 64) {
-            die("Color index $index outside range: 8 <= index <= 64");
-        }
-    
-        // Check that the colour components are in the right range
-        if ( ($red   < 0 or $red   > 255) ||
-             ($green < 0 or $green > 255) ||
-             ($blue  < 0 or $blue  > 255) )  
-        {
-            die("Color component outside range: 0 <= color <= 255");
-        }
-
-        $index -= 8; // Adjust colour index (wingless dragonfly)
-        
-        // Set the RGB value
-        $this->palette[$index] = array($red, $green, $blue, 0);
-        return($index + 8);
-    }
-    
-    /**
-    * Sets the colour palette to the Excel 97+ default.
-    */
-    function _set_palette_xl97()
-    {
-        $this->palette = array(
-                           array(0x00, 0x00, 0x00, 0x00),   // 8
-                           array(0xff, 0xff, 0xff, 0x00),   // 9
-                           array(0xff, 0x00, 0x00, 0x00),   // 10
-                           array(0x00, 0xff, 0x00, 0x00),   // 11
-                           array(0x00, 0x00, 0xff, 0x00),   // 12
-                           array(0xff, 0xff, 0x00, 0x00),   // 13
-                           array(0xff, 0x00, 0xff, 0x00),   // 14
-                           array(0x00, 0xff, 0xff, 0x00),   // 15
-                           array(0x80, 0x00, 0x00, 0x00),   // 16
-                           array(0x00, 0x80, 0x00, 0x00),   // 17
-                           array(0x00, 0x00, 0x80, 0x00),   // 18
-                           array(0x80, 0x80, 0x00, 0x00),   // 19
-                           array(0x80, 0x00, 0x80, 0x00),   // 20
-                           array(0x00, 0x80, 0x80, 0x00),   // 21
-                           array(0xc0, 0xc0, 0xc0, 0x00),   // 22
-                           array(0x80, 0x80, 0x80, 0x00),   // 23
-                           array(0x99, 0x99, 0xff, 0x00),   // 24
-                           array(0x99, 0x33, 0x66, 0x00),   // 25
-                           array(0xff, 0xff, 0xcc, 0x00),   // 26
-                           array(0xcc, 0xff, 0xff, 0x00),   // 27
-                           array(0x66, 0x00, 0x66, 0x00),   // 28
-                           array(0xff, 0x80, 0x80, 0x00),   // 29
-                           array(0x00, 0x66, 0xcc, 0x00),   // 30
-                           array(0xcc, 0xcc, 0xff, 0x00),   // 31
-                           array(0x00, 0x00, 0x80, 0x00),   // 32
-                           array(0xff, 0x00, 0xff, 0x00),   // 33
-                           array(0xff, 0xff, 0x00, 0x00),   // 34
-                           array(0x00, 0xff, 0xff, 0x00),   // 35
-                           array(0x80, 0x00, 0x80, 0x00),   // 36
-                           array(0x80, 0x00, 0x00, 0x00),   // 37
-                           array(0x00, 0x80, 0x80, 0x00),   // 38
-                           array(0x00, 0x00, 0xff, 0x00),   // 39
-                           array(0x00, 0xcc, 0xff, 0x00),   // 40
-                           array(0xcc, 0xff, 0xff, 0x00),   // 41
-                           array(0xcc, 0xff, 0xcc, 0x00),   // 42
-                           array(0xff, 0xff, 0x99, 0x00),   // 43
-                           array(0x99, 0xcc, 0xff, 0x00),   // 44
-                           array(0xff, 0x99, 0xcc, 0x00),   // 45
-                           array(0xcc, 0x99, 0xff, 0x00),   // 46
-                           array(0xff, 0xcc, 0x99, 0x00),   // 47
-                           array(0x33, 0x66, 0xff, 0x00),   // 48
-                           array(0x33, 0xcc, 0xcc, 0x00),   // 49
-                           array(0x99, 0xcc, 0x00, 0x00),   // 50
-                           array(0xff, 0xcc, 0x00, 0x00),   // 51
-                           array(0xff, 0x99, 0x00, 0x00),   // 52
-                           array(0xff, 0x66, 0x00, 0x00),   // 53
-                           array(0x66, 0x66, 0x99, 0x00),   // 54
-                           array(0x96, 0x96, 0x96, 0x00),   // 55
-                           array(0x00, 0x33, 0x66, 0x00),   // 56
-                           array(0x33, 0x99, 0x66, 0x00),   // 57
-                           array(0x00, 0x33, 0x00, 0x00),   // 58
-                           array(0x33, 0x33, 0x00, 0x00),   // 59
-                           array(0x99, 0x33, 0x00, 0x00),   // 60
-                           array(0x99, 0x33, 0x66, 0x00),   // 61
-                           array(0x33, 0x33, 0x99, 0x00),   // 62
-                           array(0x33, 0x33, 0x33, 0x00),   // 63
-                         );
-    }
-    
-    
-    ###############################################################################
-    #
-    # _tmpfile_warning()
-    #
-    # Check that tmp files can be created for use in Worksheet.pm. A CGI, mod_perl
-    # or IIS might not have permission to create tmp files. The test is here rather
-    # than in Worksheet.pm so that only one warning is given.
-    #
-    /*sub _tmpfile_warning {
-    
-        my $fh = IO::File->new_tmpfile();
-    
-        if ((not defined $fh) && ($^W)) {
-            carp("Unable to create tmp files via IO::File->new_tmpfile(). " .
-                 "Storing data in memory")
-    }
-    }*/
-    
-    /**
-    * Assemble worksheets into a workbook and send the BIFF data to an OLE
-    * storage.
-    */
-    function store_workbook()
-    {
-        // Ensure that at least one worksheet has been selected.
-        if ($this->activesheet == 0) {
-            $this->worksheets[0]->selected = 1;
-        }
-    
-        // Calculate the number of selected worksheet tabs and call the finalization
-        // methods for each worksheet
-        for($i=0; $i < count($this->worksheets); $i++)
-        {
-            if($this->worksheets[$i]->selected)
-              $this->selected++;
-            $this->worksheets[$i]->close($this->sheetnames);
-        }
-    
-        // Add Workbook globals
-        $this->_store_bof(0x0005);
-        $this->_store_externs();    // For print area and repeat rows
-        $this->_store_names();      // For print area and repeat rows
-        $this->_store_window1();
-        $this->_store_1904();
-        $this->_store_all_fonts();
-        $this->_store_all_num_formats();
-        $this->_store_all_xfs();
-        $this->_store_all_styles();
-        $this->_store_palette();
-        $this->_calc_sheet_offsets();
-    
-        // Add BOUNDSHEET records
-        for($i=0; $i < count($this->worksheets); $i++) {
-            $this->_store_boundsheet($this->worksheets[$i]->name,$this->worksheets[$i]->offset);
-        }
-    
-        // End Workbook globals
-        $this->_store_eof();
-
-        // Store the workbook in an OLE container
-        $this->_store_OLE_file();
-    }
-    
-    /**
-    * Store the workbook in an OLE container if the total size of the workbook data
-    * is less than ~ 7MB.
-    */
-    function _store_OLE_file()
-    {
-        $OLE  = new OLEwriter($this->_filename);
-        // Write Worksheet data if data <~ 7MB
-        if ($OLE->set_size($this->_biffsize))
-        {
-            $OLE->write_header();
-            $OLE->write($this->_data);
-            foreach($this->worksheets as $sheet) 
-            {
-                while ($tmp = $sheet->get_data()) {
-                    $OLE->write($tmp);
-                }
-            }
-        }
-        $OLE->close();
-    }
-    
-    /**
-    * Calculate offsets for Worksheet BOF records.
-    */
-    function _calc_sheet_offsets()
-    {
-        $BOF     = 11;
-        $EOF     = 4;
-        $offset  = $this->_datasize;
-        for($i=0; $i < count($this->worksheets); $i++) {
-            $offset += $BOF + strlen($this->worksheets[$i]->name);
-        }
-        $offset += $EOF;
-        for($i=0; $i < count($this->worksheets); $i++) {
-            $this->worksheets[$i]->offset = $offset;
-            $offset += $this->worksheets[$i]->_datasize;
-        }
-        $this->_biffsize = $offset;
-    }
-    
-    /**
-    * Store the Excel FONT records.
-    */
-    function _store_all_fonts()
-    {
-        // tmp_format is added by new(). We use this to write the default XF's
-        $format = $this->tmp_format;
-        $font   = $format->get_font();
-    
-        // Note: Fonts are 0-indexed. According to the SDK there is no index 4,
-        // so the following fonts are 0, 1, 2, 3, 5
-        //
-        for($i=1; $i <= 5; $i++){
-            $this->_append($font);
-        }
-    
-        // Iterate through the XF objects and write a FONT record if it isn't the
-        // same as the default FONT and if it hasn't already been used.
-        //
-        $fonts = array();
-        $index = 6;                  // The first user defined FONT
-    
-        $key = $format->get_font_key(); // The default font from _tmp_format
-        $fonts[$key] = 0;               // Index of the default font
-    
-        for($i=0; $i < count($this->formats); $i++) {
-            $key = $this->formats[$i]->get_font_key();
-            if (isset($fonts[$key])) {
-                // FONT has already been used
-                $this->formats[$i]->font_index = $fonts[$key];
-            }
-            else {
-                // Add a new FONT record
-                $fonts[$key]        = $index;
-                $this->formats[$i]->font_index = $index;
-                $index++;
-                $font = $this->formats[$i]->get_font();
-                $this->_append($font);
-            }
-        }
-    }
-    
-    /**
-    * Store user defined numerical formats i.e. FORMAT records
-    */
-    function _store_all_num_formats()
-    {
-        // Leaning num_format syndrome
-        $hash_num_formats = array();
-        $num_formats      = array();
-        $index = 164;
-    
-        // Iterate through the XF objects and write a FORMAT record if it isn't a
-        // built-in format type and if the FORMAT string hasn't already been used.
-        //
-        for($i=0; $i < count($this->formats); $i++)
-        {
-            $num_format = $this->formats[$i]->_num_format;
-    
-            // Check if $num_format is an index to a built-in format.
-            // Also check for a string of zeros, which is a valid format string
-            // but would evaluate to zero.
-            //
-            if (!preg_match("/^0+\d/",$num_format))
-            {
-                if (preg_match("/^\d+$/",$num_format)) { // built-in format
-                    continue;
-                }
-            }
-    
-            if (isset($hash_num_formats[$num_format])) {
-                // FORMAT has already been used
-                $this->formats[$i]->_num_format = $hash_num_formats[$num_format];
-            }
-            else
-            {
-                // Add a new FORMAT
-                $hash_num_formats[$num_format]  = $index;
-                $this->formats[$i]->_num_format = $index;
-                array_push($num_formats,$num_format);
-                $index++;
-            }
-        }
-    
-        // Write the new FORMAT records starting from 0xA4
-        $index = 164;
-        foreach ($num_formats as $num_format)
-        {
-            $this->_store_num_format($num_format,$index);
-            $index++;
-        }
-    }
-    
-    /**
-    * Write all XF records.
-    */
-    function _store_all_xfs()
-    {
-        // tmp_format is added by the constructor. We use this to write the default XF's
-        // The default font index is 0
-        //
-        $format = $this->tmp_format;
-        for ($i=0; $i <= 14; $i++)
-        {
-            $xf = $format->get_xf('style'); // Style XF
-            $this->_append($xf);
-        }
-    
-        $xf = $format->get_xf('cell');      // Cell XF
-        $this->_append($xf);
-    
-        // User defined XFs
-        for($i=0; $i < count($this->formats); $i++)
-        {
-            $xf = $this->formats[$i]->get_xf('cell');
-            $this->_append($xf);
-        }
-    }
-    
-    /**
-    * Write all STYLE records.
-    */
-    function _store_all_styles()
-    {
-        $this->_store_style();
-    }
-    
-    /**
-    * Write the EXTERNCOUNT and EXTERNSHEET records. These are used as indexes for
-    * the NAME records.
-    */
-    function _store_externs()
-    {
-        // Create EXTERNCOUNT with number of worksheets
-        $this->_store_externcount(count($this->worksheets));
-    
-        // Create EXTERNSHEET for each worksheet
-        foreach ($this->sheetnames as $sheetname) {
-            $this->_store_externsheet($sheetname);
-        }
-    }
-    
-    /**
-    * Write the NAME record to define the print area and the repeat rows and cols.
-    */
-    function _store_names()
-    {
-        // Create the print area NAME records
-        foreach ($this->worksheets as $worksheet)
-        {
-            // Write a Name record if the print area has been defined
-            if (isset($worksheet->_print_rowmin))
-            {
-                $this->store_name_short(
-                    $worksheet->index,
-                    0x06, // NAME type
-                    $worksheet->_print_rowmin,
-                    $worksheet->_print_rowmax,
-                    $worksheet->_print_colmin,
-                    $worksheet->_print_colmax
-                    );
-            }
-        }
-    
-        // Create the print title NAME records
-        foreach ($this->worksheets as $worksheet)
-        {
-            $rowmin = $worksheet->_title_rowmin;
-            $rowmax = $worksheet->_title_rowmax;
-            $colmin = $worksheet->_title_colmin;
-            $colmax = $worksheet->_title_colmax;
-    
-            // Determine if row + col, row, col or nothing has been defined
-            // and write the appropriate record
-            //
-            if (isset($rowmin) && isset($colmin))
-            {
-                // Row and column titles have been defined.
-                // Row title has been defined.
-                $this->store_name_long(
-                    $worksheet->index,
-                    0x07, // NAME type
-                    $rowmin,
-                    $rowmax,
-                    $colmin,
-                    $colmax
-                    );
-            }
-            elseif (isset($rowmin))
-            {
-                // Row title has been defined.
-                $this->store_name_short(
-                    $worksheet->index,
-                    0x07, // NAME type
-                    $rowmin,
-                    $rowmax,
-                    0x00,
-                    0xff
-                    );
-            }
-            elseif (isset($colmin))
-            {
-                // Column title has been defined.
-                $this->store_name_short(
-                    $worksheet->index,
-                    0x07, // NAME type
-                    0x0000,
-                    0x3fff,
-                    $colmin,
-                    $colmax
-                    );
-            }
-            else {
-                // Print title hasn't been defined.
-            }
-        }
-    }
-    
-
-    
-    
-    /******************************************************************************
-    *
-    * BIFF RECORDS
-    *
-    */
-    
-    /**
-    * Write Excel BIFF WINDOW1 record.
-    */
-    function _store_window1()
-    {
-        $record    = 0x003D;                 // Record identifier
-        $length    = 0x0012;                 // Number of bytes to follow
-    
-        $xWn       = 0x0000;                 // Horizontal position of window
-        $yWn       = 0x0000;                 // Vertical position of window
-        $dxWn      = 0x25BC;                 // Width of window
-        $dyWn      = 0x1572;                 // Height of window
-    
-        $grbit     = 0x0038;                 // Option flags
-        $ctabsel   = $this->selected;        // Number of workbook tabs selected
-        $wTabRatio = 0x0258;                 // Tab to scrollbar ratio
-    
-        $itabFirst = $this->firstsheet;   // 1st displayed worksheet
-        $itabCur   = $this->activesheet;  // Active worksheet
-    
-        $header    = pack("vv",        $record, $length);
-        $data      = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn,
-                                       $grbit,
-                                       $itabCur, $itabFirst,
-                                       $ctabsel, $wTabRatio);
-        $this->_append($header.$data);
-    }
-    
-    /**
-    * Writes Excel BIFF BOUNDSHEET record.
-    *
-    * @param string  $sheetname Worksheet name
-    * @param integer $offset    Location of worksheet BOF
-    */
-    function _store_boundsheet($sheetname,$offset)
-    {
-        $record    = 0x0085;                    // Record identifier
-        $length    = 0x07 + strlen($sheetname); // Number of bytes to follow
-    
-        $grbit     = 0x0000;                    // Sheet identifier
-        $cch       = strlen($sheetname);        // Length of sheet name
-    
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("VvC", $offset, $grbit, $cch);
-        $this->_append($header.$data.$sheetname);
-    }
-    
-    /**
-    * Write Excel BIFF STYLE records.
-    */
-    function _store_style()
-    {
-        $record    = 0x0293;   // Record identifier
-        $length    = 0x0004;   // Bytes to follow
-                               
-        $ixfe      = 0x8000;   // Index to style XF
-        $BuiltIn   = 0x00;     // Built-in style
-        $iLevel    = 0xff;     // Outline style level
-    
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("vCC", $ixfe, $BuiltIn, $iLevel);
-        $this->_append($header.$data);
-    }
-    
-    
-    /**
-    * Writes Excel FORMAT record for non "built-in" numerical formats.
-    *
-    * @param string  $format Custom format string
-    * @param integer $ifmt   Format index code
-    */
-    function _store_num_format($format,$ifmt)
-    {
-        $record    = 0x041E;                      // Record identifier
-        $length    = 0x03 + strlen($format);      // Number of bytes to follow
-    
-        $cch       = strlen($format);             // Length of format string
-    
-        $header    = pack("vv", $record, $length);
-        $data      = pack("vC", $ifmt, $cch);
-        $this->_append($header.$data.$format);
-    }
-    
-    /**
-    * Write Excel 1904 record to indicate the date system in use.
-    */
-    function _store_1904()
-    {
-        $record    = 0x0022;         // Record identifier
-        $length    = 0x0002;         // Bytes to follow
-
-        $f1904     = $this->_1904;   // Flag for 1904 date system
-    
-        $header    = pack("vv", $record, $length);
-        $data      = pack("v", $f1904);
-        $this->_append($header.$data);
-    }
-    
-    
-    /**
-    * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
-    * references in the workbook.
-    *
-    * Excel only stores references to external sheets that are used in NAME.
-    * The workbook NAME record is required to define the print area and the repeat
-    * rows and columns.
-    *
-    * A similar method is used in Worksheet.php for a slightly different purpose.
-    *
-    * @param integer $cxals Number of external references
-    */
-    function _store_externcount($cxals)
-    {
-        $record   = 0x0016;          // Record identifier
-        $length   = 0x0002;          // Number of bytes to follow
-    
-        $header   = pack("vv", $record, $length);
-        $data     = pack("v",  $cxals);
-        $this->_append($header.$data);
-    }
-    
-    
-    /**
-    * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-    * formulas. NAME record is required to define the print area and the repeat
-    * rows and columns.
-    *
-    * A similar method is used in Worksheet.php for a slightly different purpose.
-    *
-    * @param string $sheetname Worksheet name
-    */
-    function _store_externsheet($sheetname)
-    {
-        $record      = 0x0017;                     // Record identifier
-        $length      = 0x02 + strlen($sheetname);  // Number of bytes to follow
-                                                   
-        $cch         = strlen($sheetname);         // Length of sheet name
-        $rgch        = 0x03;                       // Filename encoding
-    
-        $header      = pack("vv",  $record, $length);
-        $data        = pack("CC", $cch, $rgch);
-        $this->_append($header.$data.$sheetname);
-    }
-    
-    
-    /**
-    * Store the NAME record in the short format that is used for storing the print
-    * area, repeat rows only and repeat columns only.
-    *
-    * @param integer $index  Sheet index
-    * @param integer $type   Built-in name type
-    * @param integer $rowmin Start row
-    * @param integer $rowmax End row
-    * @param integer $colmin Start colum
-    * @param integer $colmax End column
-    */
-    function store_name_short($index,$type,$rowmin,$rowmax,$colmin,$colmax)
-    {
-        $record          = 0x0018;       // Record identifier
-        $length          = 0x0024;       // Number of bytes to follow
-    
-        $grbit           = 0x0020;       // Option flags
-        $chKey           = 0x00;         // Keyboard shortcut
-        $cch             = 0x01;         // Length of text name
-        $cce             = 0x0015;       // Length of text definition
-        $ixals           = $index + 1;   // Sheet index
-        $itab            = $ixals;       // Equal to ixals
-        $cchCustMenu     = 0x00;         // Length of cust menu text
-        $cchDescription  = 0x00;         // Length of description text
-        $cchHelptopic    = 0x00;         // Length of help topic text
-        $cchStatustext   = 0x00;         // Length of status bar text
-        $rgch            = $type;        // Built-in name type
-    
-        $unknown03       = 0x3b;
-        $unknown04       = 0xffff-$index;
-        $unknown05       = 0x0000;
-        $unknown06       = 0x0000;
-        $unknown07       = 0x1087;
-        $unknown08       = 0x8005;
-    
-        $header             = pack("vv", $record, $length);
-        $data               = pack("v", $grbit);
-        $data              .= pack("C", $chKey);
-        $data              .= pack("C", $cch);
-        $data              .= pack("v", $cce);
-        $data              .= pack("v", $ixals);
-        $data              .= pack("v", $itab);
-        $data              .= pack("C", $cchCustMenu);
-        $data              .= pack("C", $cchDescription);
-        $data              .= pack("C", $cchHelptopic);
-        $data              .= pack("C", $cchStatustext);
-        $data              .= pack("C", $rgch);
-        $data              .= pack("C", $unknown03);
-        $data              .= pack("v", $unknown04);
-        $data              .= pack("v", $unknown05);
-        $data              .= pack("v", $unknown06);
-        $data              .= pack("v", $unknown07);
-        $data              .= pack("v", $unknown08);
-        $data              .= pack("v", $index);
-        $data              .= pack("v", $index);
-        $data              .= pack("v", $rowmin);
-        $data              .= pack("v", $rowmax);
-        $data              .= pack("C", $colmin);
-        $data              .= pack("C", $colmax);
-        $this->_append($header.$data);
-    }
-    
-    
-    /**
-    * Store the NAME record in the long format that is used for storing the repeat
-    * rows and columns when both are specified. This share a lot of code with
-    * _store_name_short() but we use a separate method to keep the code clean.
-    * Code abstraction for reuse can be carried too far, and I should know. ;-)
-    *
-    * @param integer $index Sheet index
-    * @param integer $type  Built-in name type
-    * @param integer $rowmin Start row
-    * @param integer $rowmax End row
-    * @param integer $colmin Start colum
-    * @param integer $colmax End column
-    */
-    function store_name_long($index,$type,$rowmin,$rowmax,$colmin,$colmax)
-    {
-        $record          = 0x0018;       // Record identifier
-        $length          = 0x003d;       // Number of bytes to follow
-        $grbit           = 0x0020;       // Option flags
-        $chKey           = 0x00;         // Keyboard shortcut
-        $cch             = 0x01;         // Length of text name
-        $cce             = 0x002e;       // Length of text definition
-        $ixals           = $index + 1;   // Sheet index
-        $itab            = $ixals;       // Equal to ixals
-        $cchCustMenu     = 0x00;         // Length of cust menu text
-        $cchDescription  = 0x00;         // Length of description text
-        $cchHelptopic    = 0x00;         // Length of help topic text
-        $cchStatustext   = 0x00;         // Length of status bar text
-        $rgch            = $type;        // Built-in name type
-    
-        $unknown01       = 0x29;
-        $unknown02       = 0x002b;
-        $unknown03       = 0x3b;
-        $unknown04       = 0xffff-$index;
-        $unknown05       = 0x0000;
-        $unknown06       = 0x0000;
-        $unknown07       = 0x1087;
-        $unknown08       = 0x8008;
-    
-        $header             = pack("vv",  $record, $length);
-        $data               = pack("v", $grbit);
-        $data              .= pack("C", $chKey);
-        $data              .= pack("C", $cch);
-        $data              .= pack("v", $cce);
-        $data              .= pack("v", $ixals);
-        $data              .= pack("v", $itab);
-        $data              .= pack("C", $cchCustMenu);
-        $data              .= pack("C", $cchDescription);
-        $data              .= pack("C", $cchHelptopic);
-        $data              .= pack("C", $cchStatustext);
-        $data              .= pack("C", $rgch);
-        $data              .= pack("C", $unknown01);
-        $data              .= pack("v", $unknown02);
-        // Column definition
-        $data              .= pack("C", $unknown03);
-        $data              .= pack("v", $unknown04);
-        $data              .= pack("v", $unknown05);
-        $data              .= pack("v", $unknown06);
-        $data              .= pack("v", $unknown07);
-        $data              .= pack("v", $unknown08);
-        $data              .= pack("v", $index);
-        $data              .= pack("v", $index);
-        $data              .= pack("v", 0x0000);
-        $data              .= pack("v", 0x3fff);
-        $data              .= pack("C", $colmin);
-        $data              .= pack("C", $colmax);
-        // Row definition
-        $data              .= pack("C", $unknown03);
-        $data              .= pack("v", $unknown04);
-        $data              .= pack("v", $unknown05);
-        $data              .= pack("v", $unknown06);
-        $data              .= pack("v", $unknown07);
-        $data              .= pack("v", $unknown08);
-        $data              .= pack("v", $index);
-        $data              .= pack("v", $index);
-        $data              .= pack("v", $rowmin);
-        $data              .= pack("v", $rowmax);
-        $data              .= pack("C", 0x00);
-        $data              .= pack("C", 0xff);
-        // End of data
-        $data              .= pack("C", 0x10);
-        $this->_append($header.$data);
-    }
-    
-    
-    /**
-    * Stores the PALETTE biff record.
-    */
-    function _store_palette()
-    {
-        $aref            = $this->palette;
-    
-        $record          = 0x0092;                 // Record identifier
-        $length          = 2 + 4 * count($aref);   // Number of bytes to follow
-        $ccv             =         count($aref);   // Number of RGB values to follow
-        $data = '';                                // The RGB data
-    
-        // Pack the RGB data
-        foreach($aref as $color)
-        {
-            foreach($color as $byte) {
-                $data .= pack("C",$byte);
-            }
-        }
-    
-        $header = pack("vvv",  $record, $length, $ccv);
-        $this->_append($header.$data);
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/write_excel/Worksheet.php b/vendor/write_excel/Worksheet.php
deleted file mode 100644
index ecb3d8c..0000000
--- a/vendor/write_excel/Worksheet.php
+++ /dev/null
@@ -1,2835 +0,0 @@
-<?php
-/*
-*  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-*
-*  The majority of this is _NOT_ my code.  I simply ported it from the
-*  PERL Spreadsheet::WriteExcel module.
-*
-*  The author of the Spreadsheet::WriteExcel module is John McNamara
-*  <jmcnamara@cpan.org>
-*
-*  I _DO_ maintain this code, and John McNamara has nothing to do with the
-*  porting of this code to PHP.  Any questions directly related to this
-*  class library should be directed to me.
-*
-*  License Information:
-*
-*    Spreadsheet::WriteExcel:  A library for generating Excel Spreadsheets
-*    Copyright (C) 2002 Xavier Noguer xnoguer@rezebra.com
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License as published by the Free Software Foundation; either
-*    version 2.1 of the License, or (at your option) any later version.
-*
-*    This library 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
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-require_once('Parser.php');
-require_once('BIFFwriter.php');
-
-/**
-* Class for generating Excel Spreadsheets
-*
-* @author Xavier Noguer <xnoguer@rezebra.com>
-* @package Spreadsheet_WriteExcel
-*/
-
-class Worksheet extends BIFFwriter
-{
-
-    /**
-    * Constructor
-    *
-    * @param string  $name         The name of the new worksheet
-    * @param integer $index        The index of the new worksheet
-    * @param mixed   &$activesheet The current activesheet of the workbook we belong to
-    * @param mixed   &$firstsheet  The first worksheet in the workbook we belong to
-    * @param mixed   &$url_format  The default format for hyperlinks
-    * @param mixed   &$parser      The formula parser created for the Workbook
-    */
-    function __construct($name,$index,&$activesheet,&$firstsheet,&$url_format,&$parser)
-    {
-        parent::__construct();
-        $rowmax                = 65536; // 16384 in Excel 5
-        $colmax                = 256;
-        $strmax                = 255;
-
-        $this->name            = $name;
-        $this->index           = $index;
-        $this->activesheet     = &$activesheet;
-        $this->firstsheet      = &$firstsheet;
-        $this->_url_format     = $url_format;
-        $this->_parser         = &$parser;
-
-        $this->ext_sheets      = array();
-        $this->_using_tmpfile  = 1;
-        $this->_filehandle     = "";
-        $this->fileclosed      = 0;
-        $this->offset          = 0;
-        $this->xls_rowmax      = $rowmax;
-        $this->xls_colmax      = $colmax;
-        $this->xls_strmax      = $strmax;
-        $this->dim_rowmin      = $rowmax +1;
-        $this->dim_rowmax      = 0;
-        $this->dim_colmin      = $colmax +1;
-        $this->dim_colmax      = 0;
-        $this->colinfo         = array();
-        $this->_selection      = array(0,0,0,0);
-        $this->_panes          = array();
-        $this->_active_pane    = 3;
-        $this->_frozen         = 0;
-        $this->selected        = 0;
-
-        $this->_paper_size      = 0x0;
-        $this->_orientation     = 0x1;
-        $this->_header          = '';
-        $this->_footer          = '';
-        $this->_hcenter         = 0;
-        $this->_vcenter         = 0;
-        $this->_margin_head     = 0.50;
-        $this->_margin_foot     = 0.50;
-        $this->_margin_left     = 0.75;
-        $this->_margin_right    = 0.75;
-        $this->_margin_top      = 1.00;
-        $this->_margin_bottom   = 1.00;
-
-        $this->_title_rowmin    = NULL;
-        $this->_title_rowmax    = NULL;
-        $this->_title_colmin    = NULL;
-        $this->_title_colmax    = NULL;
-        $this->_print_rowmin    = NULL;
-        $this->_print_rowmax    = NULL;
-        $this->_print_colmin    = NULL;
-        $this->_print_colmax    = NULL;
-
-        $this->_print_gridlines = 1;
-        $this->_print_headers   = 0;
-
-        $this->_fit_page        = 0;
-        $this->_fit_width       = 0;
-        $this->_fit_height      = 0;
-
-        $this->_hbreaks         = array();
-        $this->_vbreaks         = array();
-
-        $this->_protect         = 0;
-        $this->_password        = NULL;
-
-        $this->col_sizes        = array();
-        $this->row_sizes        = array();
-
-        $this->_zoom            = 100;
-        $this->_print_scale     = 100;
-
-        $this->_initialize();
-    }
-
-    /**
-    * Open a tmp file to store the majority of the Worksheet data. If this fails,
-    * for example due to write permissions, store the data in memory. This can be
-    * slow for large files.
-    */
-    function _initialize()
-    {
-        // Open tmp file for storing Worksheet data
-        $fh = tmpfile();
-        if ( $fh) {
-            // Store filehandle
-            $this->_filehandle = $fh;
-        }
-        else {
-            // If tmpfile() fails store data in memory
-            $this->_using_tmpfile = 0;
-        }
-    }
-
-    /**
-    * Add data to the beginning of the workbook (note the reverse order)
-    * and to the end of the workbook.
-    *
-    * @access public
-    * @see Workbook::store_workbook()
-    * @param array $sheetnames The array of sheetnames from the Workbook this
-    *                          worksheet belongs to
-    */
-    function close($sheetnames)
-    {
-        $num_sheets = count($sheetnames);
-
-        /***********************************************
-        * Prepend in reverse order!!
-        */
-
-        // Prepend the sheet dimensions
-        $this->_store_dimensions();
-
-        // Prepend the sheet password
-        $this->_store_password();
-
-        // Prepend the sheet protection
-        $this->_store_protect();
-
-        // Prepend the page setup
-        $this->_store_setup();
-
-        // Prepend the bottom margin
-        $this->_store_margin_bottom();
-
-        // Prepend the top margin
-        $this->_store_margin_top();
-
-        // Prepend the right margin
-        $this->_store_margin_right();
-
-        // Prepend the left margin
-        $this->_store_margin_left();
-
-        // Prepend the page vertical centering
-        $this->store_vcenter();
-
-        // Prepend the page horizontal centering
-        $this->store_hcenter();
-
-        // Prepend the page footer
-        $this->store_footer();
-
-        // Prepend the page header
-        $this->store_header();
-
-        // Prepend the vertical page breaks
-        $this->_store_vbreak();
-
-        // Prepend the horizontal page breaks
-        $this->_store_hbreak();
-
-        // Prepend WSBOOL
-        $this->_store_wsbool();
-
-        // Prepend GRIDSET
-        $this->_store_gridset();
-
-        // Prepend PRINTGRIDLINES
-        $this->_store_print_gridlines();
-
-        // Prepend PRINTHEADERS
-        $this->_store_print_headers();
-
-        // Prepend EXTERNSHEET references
-        for ($i = $num_sheets; $i > 0; $i--) {
-            $sheetname = $sheetnames[$i-1];
-            $this->_store_externsheet($sheetname);
-        }
-
-        // Prepend the EXTERNCOUNT of external references.
-        $this->_store_externcount($num_sheets);
-
-        // Prepend the COLINFO records if they exist
-        if (!empty($this->colinfo)){
-            for($i=0; $i < count($this->colinfo); $i++)
-            {
-                $this->_store_colinfo($this->colinfo[$i]);
-            }
-            $this->_store_defcol();
-        }
-
-        // Prepend the BOF record
-        $this->_store_bof(0x0010);
-
-        /*
-        * End of prepend. Read upwards from here.
-        ***********************************************/
-
-        // Append
-        $this->_store_window2();
-        $this->_store_zoom();
-        if(!empty($this->_panes))
-          $this->_store_panes($this->_panes);
-        $this->_store_selection($this->_selection);
-        $this->_store_eof();
-    }
-
-    /**
-    * Retrieve the worksheet name. This is usefull when creating worksheets
-    * without a name.
-    *
-    * @access public
-    * @return string The worksheet's name
-    */
-    function get_name()
-    {
-        return($this->name);
-    }
-
-    /**
-    * Retrieves data from memory in one chunk, or from disk in $buffer
-    * sized chunks.
-    *
-    * @return string The data
-    */
-    function get_data()
-    {
-        $buffer = 4096;
-
-        // Return data stored in memory
-        if (isset($this->_data)) {
-            $tmp   = $this->_data;
-            unset($this->_data);
-            $fh    = $this->_filehandle;
-            if ($this->_using_tmpfile) {
-                fseek($fh, 0);
-            }
-            return($tmp);
-        }
-        // Return data stored on disk
-        if ($this->_using_tmpfile) {
-            if ($tmp = fread($this->_filehandle, $buffer)) {
-                return($tmp);
-            }
-        }
-
-        // No data to return
-        return('');
-    }
-
-    /**
-    * Set this worksheet as a selected worksheet, i.e. the worksheet has its tab
-    * highlighted.
-    *
-    * @access public
-    */
-    function select()
-    {
-        $this->selected = 1;
-    }
-
-    /**
-    * Set this worksheet as the active worksheet, i.e. the worksheet that is
-    * displayed when the workbook is opened. Also set it as selected.
-    *
-    * @access public
-    */
-    function activate()
-    {
-        $this->selected = 1;
-        $this->activesheet =& $this->index;
-    }
-
-    /**
-    * Set this worksheet as the first visible sheet. This is necessary
-    * when there are a large number of worksheets and the activated
-    * worksheet is not visible on the screen.
-    *
-    * @access public
-    */
-    function set_first_sheet()
-    {
-        $this->firstsheet = $this->index;
-    }
-
-    /**
-    * Set the worksheet protection flag to prevent accidental modification and to
-    * hide formulas if the locked and hidden format properties have been set.
-    *
-    * @access public
-    * @param string $password The password to use for protecting the sheet.
-    */
-    function protect($password)
-    {
-        $this->_protect   = 1;
-        $this->_password  = $this->_encode_password($password);
-    }
-
-    /**
-    * Set the width of a single column or a range of columns.
-    *
-    * @access public
-    * @see _store_colinfo()
-    * @param integer $firstcol first column on the range
-    * @param integer $lastcol  last column on the range
-    * @param integer $width    width to set
-    * @param mixed   $format   The optional XF format to apply to the columns
-    * @param integer $hidden   The optional hidden atribute
-    */
-    function set_column($firstcol, $lastcol, $width, $format = 0, $hidden = 0)
-    {
-        $this->colinfo[] = array($firstcol, $lastcol, $width, $format, $hidden);
-
-        // Set width to zero if column is hidden
-        $width = ($hidden) ? 0 : $width;
-
-        for($col = $firstcol; $col <= $lastcol; $col++) {
-            $this->col_sizes[$col] = $width;
-        }
-    }
-
-    /**
-    * Set which cell or cells are selected in a worksheet
-    *
-    * @access public
-    * @param integer $first_row    first row in the selected quadrant
-    * @param integer $first_column first column in the selected quadrant
-    * @param integer $last_row     last row in the selected quadrant
-    * @param integer $last_column  last column in the selected quadrant
-    * @see _store_selection()
-    */
-    function set_selection($first_row,$first_column,$last_row,$last_column)
-    {
-        $this->_selection = array($first_row,$first_column,$last_row,$last_column);
-    }
-
-    /**
-    * Set panes and mark them as frozen.
-    *
-    * @access public
-    * @param array $panes This is the only parameter received and is composed of the following:
-    *                     0 => Vertical split position,
-    *                     1 => Horizontal split position
-    *                     2 => Top row visible
-    *                     3 => Leftmost column visible
-    *                     4 => Active pane
-    */
-    function freeze_panes($panes)
-    {
-        $this->_frozen = 1;
-        $this->_panes  = $panes;
-    }
-
-    /**
-    * Set panes and mark them as unfrozen.
-    *
-    * @access public
-    * @param array $panes This is the only parameter received and is composed of the following:
-    *                     0 => Vertical split position,
-    *                     1 => Horizontal split position
-    *                     2 => Top row visible
-    *                     3 => Leftmost column visible
-    *                     4 => Active pane
-    */
-    function thaw_panes($panes)
-    {
-        $this->_frozen = 0;
-        $this->_panes  = $panes;
-    }
-
-    /**
-    * Set the page orientation as portrait.
-    *
-    * @access public
-    */
-    function set_portrait()
-    {
-        $this->_orientation = 1;
-    }
-
-    /**
-    * Set the page orientation as landscape.
-    *
-    * @access public
-    */
-    function set_landscape()
-    {
-        $this->_orientation = 0;
-    }
-
-    /**
-    * Set the paper type. Ex. 1 = US Letter, 9 = A4
-    *
-    * @access public
-    * @param integer $size The type of paper size to use
-    */
-    function set_paper($size = 0)
-    {
-        $this->_paper_size = $size;
-    }
-
-
-    /**
-    * Set the page header caption and optional margin.
-    *
-    * @access public
-    * @param string $string The header text
-    * @param float  $margin optional head margin in inches.
-    */
-    function set_header($string,$margin = 0.50)
-    {
-        if (strlen($string) >= 255) {
-            //carp 'Header string must be less than 255 characters';
-            return;
-        }
-        $this->_header      = $string;
-        $this->_margin_head = $margin;
-    }
-
-    /**
-    * Set the page footer caption and optional margin.
-    *
-    * @access public
-    * @param string $string The footer text
-    * @param float  $margin optional foot margin in inches.
-    */
-    function set_footer($string,$margin = 0.50)
-    {
-        if (strlen($string) >= 255) {
-            //carp 'Footer string must be less than 255 characters';
-            return;
-        }
-        $this->_footer      = $string;
-        $this->_margin_foot = $margin;
-    }
-
-    /**
-    * Center the page horinzontally.
-    *
-    * @access public
-    * @param integer $center the optional value for centering. Defaults to 1 (center).
-    */
-    function center_horizontally($center = 1)
-    {
-        $this->_hcenter = $center;
-    }
-
-    /**
-    * Center the page horinzontally.
-    *
-    * @access public
-    * @param integer $center the optional value for centering. Defaults to 1 (center).
-    */
-    function center_vertically($center = 1)
-    {
-        $this->_vcenter = $center;
-    }
-
-    /**
-    * Set all the page margins to the same value in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margins($margin)
-    {
-        $this->set_margin_left($margin);
-        $this->set_margin_right($margin);
-        $this->set_margin_top($margin);
-        $this->set_margin_bottom($margin);
-    }
-
-    /**
-    * Set the left and right margins to the same value in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margins_LR($margin)
-    {
-        $this->set_margin_left($margin);
-        $this->set_margin_right($margin);
-    }
-
-    /**
-    * Set the top and bottom margins to the same value in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margins_TB($margin)
-    {
-        $this->set_margin_top($margin);
-        $this->set_margin_bottom($margin);
-    }
-
-    /**
-    * Set the left margin in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margin_left($margin = 0.75)
-    {
-        $this->_margin_left = $margin;
-    }
-
-    /**
-    * Set the right margin in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margin_right($margin = 0.75)
-    {
-        $this->_margin_right = $margin;
-    }
-
-    /**
-    * Set the top margin in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margin_top($margin = 1.00)
-    {
-        $this->_margin_top = $margin;
-    }
-
-    /**
-    * Set the bottom margin in inches.
-    *
-    * @access public
-    * @param float $margin The margin to set in inches
-    */
-    function set_margin_bottom($margin = 1.00)
-    {
-        $this->_margin_bottom = $margin;
-    }
-
-    /**
-    * Set the rows to repeat at the top of each printed page. See also the
-    * _store_name_xxxx() methods in Workbook.php
-    *
-    * @access public
-    * @param integer $first_row First row to repeat
-    * @param integer $last_row  Last row to repeat. Optional.
-    */
-    function repeat_rows($first_row, $last_row = NULL)
-    {
-        $this->_title_rowmin  = $first_row;
-        if(isset($last_row)) { //Second row is optional
-            $this->_title_rowmax  = $last_row;
-        }
-        else {
-            $this->_title_rowmax  = $first_row;
-        }
-    }
-
-    /**
-    * Set the columns to repeat at the left hand side of each printed page.
-    * See also the _store_names() methods in Workbook.php
-    *
-    * @access public
-    * @param integer $first_col First column to repeat
-    * @param integer $last_col  Last column to repeat. Optional.
-    */
-    function repeat_columns($first_col, $last_col = NULL)
-    {
-        $this->_title_colmin  = $first_col;
-        if(isset($last_col)) { // Second col is optional
-            $this->_title_colmax  = $last_col;
-        }
-        else {
-            $this->_title_colmax  = $first_col;
-        }
-    }
-
-    /**
-    * Set the area of each worksheet that will be printed.
-    *
-    * @access public
-    * @see Workbook::_store_names()
-    * @param integer $first_row First row of the area to print
-    * @param integer $first_col First column of the area to print
-    * @param integer $last_row  Last row of the area to print
-    * @param integer $last_col  Last column of the area to print
-    */
-    function print_area($first_row, $first_col, $last_row, $last_col)
-    {
-        $this->_print_rowmin  = $first_row;
-        $this->_print_colmin  = $first_col;
-        $this->_print_rowmax  = $last_row;
-        $this->_print_colmax  = $last_col;
-    }
-
-
-    /**
-    * Set the option to hide gridlines on the printed page.
-    *
-    * @access public
-    * @see _store_print_gridlines(), _store_gridset()
-    */
-    function hide_gridlines()
-    {
-        $this->_print_gridlines = 0;
-    }
-
-    /**
-    * Set the option to print the row and column headers on the printed page.
-    * See also the _store_print_headers() method below.
-    *
-    * @access public
-    * @see _store_print_headers()
-    * @param integer $print Whether to print the headers or not. Defaults to 1 (print).
-    */
-    function print_row_col_headers($print = 1)
-    {
-        $this->_print_headers = $print;
-    }
-
-    /**
-    * Store the vertical and horizontal number of pages that will define the
-    * maximum area printed. It doesn't seem to work with OpenOffice.
-    *
-    * @access public
-    * @param  integer $width  Maximun width of printed area in pages
-    * @param  integer $heigth Maximun heigth of printed area in pages
-    * @see set_print_scale()
-    */
-    function fit_to_pages($width, $height)
-    {
-        $this->_fit_page      = 1;
-        $this->_fit_width     = $width;
-        $this->_fit_height    = $height;
-    }
-
-    /**
-    * Store the horizontal page breaks on a worksheet (for printing).
-    * The breaks represent the row after which the break is inserted.
-    *
-    * @access public
-    * @param array $breaks Array containing the horizontal page breaks
-    */
-    function set_h_pagebreaks($breaks)
-    {
-        foreach($breaks as $break) {
-            array_push($this->_hbreaks,$break);
-        }
-    }
-
-    /**
-    * Store the vertical page breaks on a worksheet (for printing).
-    * The breaks represent the column after which the break is inserted.
-    *
-    * @access public
-    * @param array $breaks Array containing the vertical page breaks
-    */
-    function set_v_pagebreaks($breaks)
-    {
-        foreach($breaks as $break) {
-            array_push($this->_vbreaks,$break);
-        }
-    }
-
-
-    /**
-    * Set the worksheet zoom factor.
-    *
-    * @access public
-    * @param integer $scale The zoom factor
-    */
-    function set_zoom($scale = 100)
-    {
-        // Confine the scale to Excel's range
-        if ($scale < 10 or $scale > 400) {
-            //carp "Zoom factor $scale outside range: 10 <= zoom <= 400";
-            $scale = 100;
-        }
-
-        $this->_zoom = floor($scale);
-    }
-
-    /**
-    * Set the scale factor for the printed page.
-    * It turns off the "fit to page" option
-    *
-    * @access public
-    * @param integer $scale The optional scale factor. Defaults to 100
-    */
-    function set_print_scale($scale = 100)
-    {
-        // Confine the scale to Excel's range
-        if ($scale < 10 or $scale > 400)
-        {
-            // REPLACE THIS FOR A WARNING
-            die("Print scale $scale outside range: 10 <= zoom <= 400");
-            $scale = 100;
-        }
-
-        // Turn off "fit to page" option
-        $this->_fit_page    = 0;
-
-        $this->_print_scale = floor($scale);
-    }
-
-    /**
-    * Map to the appropriate write method acording to the token recieved.
-    *
-    * @access public
-    * @param integer $row    The row of the cell we are writing to
-    * @param integer $col    The column of the cell we are writing to
-    * @param mixed   $token  What we are writing
-    * @param mixed   $format The optional format to apply to the cell
-    */
-    function write($row, $col, $token, $format = 0)
-    {
-        // Check for a cell reference in A1 notation and substitute row and column
-        /*if ($_[0] =~ /^\D/) {
-            @_ = $this->_substitute_cellref(@_);
-    }*/
-
-        /*
-        # Match an array ref.
-        if (ref $token eq "ARRAY") {
-            return $this->write_row(@_);
-    }*/
-
-        // Match number
-        if (preg_match("/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/",$token)) {
-            return $this->write_number($row,$col,$token,$format);
-        }
-        // Match http or ftp URL
-        elseif (preg_match("/^[fh]tt?p:\/\//",$token)) {
-            return $this->write_url($row, $col, $token, $format);
-        }
-        // Match mailto:
-        elseif (preg_match("/^mailto:/",$token)) {
-            return $this->write_url($row, $col, $token, $format);
-        }
-        // Match internal or external sheet link
-        elseif (preg_match("/^(?:in|ex)ternal:/",$token)) {
-            return $this->write_url($row, $col, $token, $format);
-        }
-        // Match formula
-        elseif (preg_match("/^=/",$token)) {
-            return $this->write_formula($row, $col, $token, $format);
-        }
-        // Match formula
-        elseif (preg_match("/^@/",$token)) {
-            return $this->write_formula($row, $col, $token, $format);
-        }
-        // Match blank
-        elseif ($token == '') {
-            return $this->write_blank($row,$col,$format);
-        }
-        // Default: match string
-        else {
-            return $this->write_string($row,$col,$token,$format);
-        }
-    }
-
-    /**
-    * Returns an index to the XF record in the workbook
-    *
-    * @param mixed $format The optional XF format
-    * @return integer The XF record index
-    */
-    function _XF(&$format)
-    {
-        if($format != 0)
-        {
-            return($format->get_xf_index());
-        }
-        else
-        {
-            return(0x0F);
-        }
-    }
-
-
-    /******************************************************************************
-    *******************************************************************************
-    *
-    * Internal methods
-    */
-
-
-    /**
-    * Store Worksheet data in memory using the parent's class append() or to a
-    * temporary file, the default.
-    *
-    * @param string $data The binary data to append
-    */
-    function _append($data)
-    {
-        if ($this->_using_tmpfile)
-        {
-            // Add CONTINUE records if necessary
-            if (strlen($data) > $this->_limit) {
-                $data = $this->_add_continue($data);
-            }
-            fwrite($this->_filehandle,$data);
-            $this->_datasize += strlen($data);
-        }
-        else {
-            parent::_append($data);
-        }
-    }
-
-    /**
-    * Substitute an Excel cell reference in A1 notation for  zero based row and
-    * column values in an argument list.
-    *
-    * Ex: ("A4", "Hello") is converted to (3, 0, "Hello").
-    *
-    * @param string $cell The cell reference. Or range of cells.
-    * @return array
-    */
-    function _substitute_cellref($cell)
-    {
-        $cell = strtoupper($cell);
-
-        // Convert a column range: 'A:A' or 'B:G'
-        if (preg_match("/([A-I]?[A-Z]):([A-I]?[A-Z])/",$cell,$match)) {
-            list($no_use, $col1) =  $this->_cell_to_rowcol($match[1] .'1'); // Add a dummy row
-            list($no_use, $col2) =  $this->_cell_to_rowcol($match[2] .'1'); // Add a dummy row
-            return(array($col1, $col2));
-        }
-
-        // Convert a cell range: 'A1:B7'
-        if (preg_match("/\$?([A-I]?[A-Z]\$?\d+):\$?([A-I]?[A-Z]\$?\d+)/",$cell,$match)) {
-            list($row1, $col1) =  $this->_cell_to_rowcol($match[1]);
-            list($row2, $col2) =  $this->_cell_to_rowcol($match[2]);
-            return(array($row1, $col1, $row2, $col2));
-        }
-
-        // Convert a cell reference: 'A1' or 'AD2000'
-        if (preg_match("/\$?([A-I]?[A-Z]\$?\d+)/",$cell)) {
-            list($row1, $col1) =  $this->_cell_to_rowcol($match[1]);
-            return(array($row1, $col1));
-        }
-
-        die("Unknown cell reference $cell ");
-    }
-
-    /**
-    * Convert an Excel cell reference in A1 notation to a zero based row and column
-    * reference; converts C1 to (0, 2).
-    *
-    * @param string $cell The cell reference.
-    * @return array containing (row, column)
-    */
-    function _cell_to_rowcol($cell)
-    {
-        preg_match("/\$?([A-I]?[A-Z])\$?(\d+)/",$cell,$match);
-        $col     = $match[1];
-        $row     = $match[2];
-
-        // Convert base26 column string to number
-        $chars = explode('', $col);
-        $expn  = 0;
-        $col   = 0;
-
-        while ($chars) {
-            $char = array_pop($chars);        // LS char first
-            $col += (ord($char) -ord('A') +1) * pow(26,$expn);
-            $expn++;
-        }
-
-        // Convert 1-index to zero-index
-        $row--;
-        $col--;
-
-        return(array($row, $col));
-    }
-
-    /**
-    * Based on the algorithm provided by Daniel Rentz of OpenOffice.
-    *
-    * @param string $plaintext The password to be encoded in plaintext.
-    * @return string The encoded password
-    */
-    function _encode_password($plaintext)
-    {
-        $password = 0x0000;
-        $i        = 1;       // char position
-
-        // split the plain text password in its component characters
-        $chars = preg_split('//', $plaintext, -1, PREG_SPLIT_NO_EMPTY);
-        foreach($chars as $char)
-        {
-            $value     = ord($char) << $i;   // shifted ASCII value
-            $bit_16    = $value & 0x8000;    // the bit 16
-            $bit_16  >>= 15;                 // 0x0000 or 0x0001
-            //$bit_17    = $value & 0x00010000;
-            //$bit_17  >>= 15;
-            $value    &= 0x7fff;             // first 15 bits
-            $password ^= ($value | $bit_16);
-            //$password ^= ($value | $bit_16 | $bit_17);
-            $i++;
-        }
-
-        $password ^= strlen($plaintext);
-        $password ^= 0xCE4B;
-
-        return($password);
-    }
-
-    /******************************************************************************
-    *******************************************************************************
-    *
-    * BIFF RECORDS
-    */
-
-
-    /**
-    * Write a double to the specified row and column (zero indexed).
-    * An integer can be written as a double. Excel will display an
-    * integer. $format is optional.
-    *
-    * Returns  0 : normal termination
-    *         -2 : row or column out of range
-    *
-    * @access public
-    * @param integer $row    Zero indexed row
-    * @param integer $col    Zero indexed column
-    * @param float   $num    The number to write
-    * @param mixed   $format The optional XF format
-    */
-    function write_number($row, $col, $num, $format = 0)
-    {
-        $record    = 0x0203;                 // Record identifier
-        $length    = 0x000E;                 // Number of bytes to follow
-        $xf        = $this->_XF($format);    // The cell format
-
-        // Check that row and col are valid and store max and min values
-        if ($row >= $this->xls_rowmax)
-        {
-            return(-2);
-        }
-        if ($col >= $this->xls_colmax)
-        {
-            return(-2);
-        }
-        if ($row <  $this->dim_rowmin)
-        {
-            $this->dim_rowmin = $row;
-        }
-        if ($row >  $this->dim_rowmax)
-        {
-            $this->dim_rowmax = $row;
-        }
-        if ($col <  $this->dim_colmin)
-        {
-            $this->dim_colmin = $col;
-        }
-        if ($col >  $this->dim_colmax)
-        {
-            $this->dim_colmax = $col;
-        }
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("vvv", $row, $col, $xf);
-        $xl_double = pack("d",   $num);
-        if ($this->_byte_order) // if it's Big Endian
-        {
-            $xl_double = strrev($xl_double);
-        }
-
-        $this->_append($header.$data.$xl_double);
-        return(0);
-    }
-
-    /**
-    * Write a string to the specified row and column (zero indexed).
-    * NOTE: there is an Excel 5 defined limit of 255 characters.
-    * $format is optional.
-    * Returns  0 : normal termination
-    *         -1 : insufficient number of arguments
-    *         -2 : row or column out of range
-    *         -3 : long string truncated to 255 chars
-    *
-    * @access public
-    * @param integer $row    Zero indexed row
-    * @param integer $col    Zero indexed column
-    * @param string  $str    The string to write
-    * @param mixed   $format The XF format for the cell
-    */
-    function write_string($row, $col, $str, $format = 0)
-    {
-        $strlen    = strlen($str);
-        $record    = 0x0204;                   // Record identifier
-        $length    = 0x0008 + $strlen;         // Bytes to follow
-        $xf        = $this->_XF($format);      // The cell format
-
-        $str_error = 0;
-
-        // Check that row and col are valid and store max and min values
-        if ($row >= $this->xls_rowmax)
-        {
-            return(-2);
-        }
-        if ($col >= $this->xls_colmax)
-        {
-            return(-2);
-        }
-        if ($row <  $this->dim_rowmin)
-        {
-            $this->dim_rowmin = $row;
-        }
-        if ($row >  $this->dim_rowmax)
-        {
-            $this->dim_rowmax = $row;
-        }
-        if ($col <  $this->dim_colmin)
-        {
-            $this->dim_colmin = $col;
-        }
-        if ($col >  $this->dim_colmax)
-        {
-            $this->dim_colmax = $col;
-        }
-
-        if ($strlen > $this->xls_strmax)  // LABEL must be < 255 chars
-        {
-            $str       = substr($str, 0, $this->xls_strmax);
-            $length    = 0x0008 + $this->xls_strmax;
-            $strlen    = $this->xls_strmax;
-            $str_error = -3;
-        }
-
-        $header    = pack("vv",   $record, $length);
-        $data      = pack("vvvv", $row, $col, $xf, $strlen);
-        $this->_append($header.$data.$str);
-        return($str_error);
-    }
-
-    /**
-    * Writes a note associated with the cell given by the row and column.
-    * NOTE records don't have a length limit.
-    *
-    * @access public
-    * @param integer $row    Zero indexed row
-    * @param integer $col    Zero indexed column
-    * @param string  $note   The note to write
-    */
-    function write_note($row, $col, $note)
-    {
-        $note_length    = strlen($note);
-        $record         = 0x001C;                // Record identifier
-        $max_length     = 2048;                  // Maximun length for a NOTE record
-        //$length      = 0x0006 + $note_length;    // Bytes to follow
-
-        // Check that row and col are valid and store max and min values
-        if ($row >= $this->xls_rowmax)
-        {
-            return(-2);
-        }
-        if ($col >= $this->xls_colmax)
-        {
-            return(-2);
-        }
-        if ($row <  $this->dim_rowmin)
-        {
-            $this->dim_rowmin = $row;
-        }
-        if ($row >  $this->dim_rowmax)
-        {
-            $this->dim_rowmax = $row;
-        }
-        if ($col <  $this->dim_colmin)
-        {
-            $this->dim_colmin = $col;
-        }
-        if ($col >  $this->dim_colmax)
-        {
-            $this->dim_colmax = $col;
-        }
-
-        // Length for this record is no more than 2048 + 6
-        $length    = 0x0006 + min($note_length, 2048);
-        $header    = pack("vv",   $record, $length);
-        $data      = pack("vvv", $row, $col, $note_length);
-        $this->_append($header.$data.substr($note, 0, 2048));
-
-        for($i = $max_length; $i < $note_length; $i += $max_length)
-        {
-            $chunk  = substr($note, $i, $max_length);
-            $length = 0x0006 + strlen($chunk);
-            $header = pack("vv",   $record, $length);
-            $data   = pack("vvv", -1, 0, strlen($chunk));
-            $this->_append($header.$data.$chunk);
-        }
-        return(0);
-    }
-
-    /**
-    * Write a blank cell to the specified row and column (zero indexed).
-    * A blank cell is used to specify formatting without adding a string
-    * or a number.
-    *
-    * A blank cell without a format serves no purpose. Therefore, we don't write
-    * a BLANK record unless a format is specified. This is mainly an optimisation
-    * for the write_row() and write_col() methods.
-    *
-    * Returns  0 : normal termination (including no format)
-    *         -1 : insufficient number of arguments
-    *         -2 : row or column out of range
-    *
-    * @access public
-    * @param integer $row    Zero indexed row
-    * @param integer $col    Zero indexed column
-    * @param mixed   $format The XF format
-    */
-    function write_blank($row, $col, $format = 0)
-    {
-        // Don't write a blank cell unless it has a format
-        if ($format == 0)
-        {
-            return(0);
-        }
-
-        $record    = 0x0201;                 // Record identifier
-        $length    = 0x0006;                 // Number of bytes to follow
-        $xf        = $this->_XF($format);    // The cell format
-
-        // Check that row and col are valid and store max and min values
-        if ($row >= $this->xls_rowmax)
-        {
-            return(-2);
-        }
-        if ($col >= $this->xls_colmax)
-        {
-            return(-2);
-        }
-        if ($row <  $this->dim_rowmin)
-        {
-            $this->dim_rowmin = $row;
-        }
-        if ($row >  $this->dim_rowmax)
-        {
-            $this->dim_rowmax = $row;
-        }
-        if ($col <  $this->dim_colmin)
-        {
-            $this->dim_colmin = $col;
-        }
-        if ($col >  $this->dim_colmax)
-        {
-            $this->dim_colmax = $col;
-        }
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("vvv", $row, $col, $xf);
-        $this->_append($header.$data);
-        return 0;
-    }
-
-    /**
-    * Write a formula to the specified row and column (zero indexed).
-    * The textual representation of the formula is passed to the parser in
-    * Parser.php which returns a packed binary string.
-    *
-    * Returns  0 : normal termination
-    *         -2 : row or column out of range
-    *
-    * @access public
-    * @param integer $row     Zero indexed row
-    * @param integer $col     Zero indexed column
-    * @param string  $formula The formula text string
-    * @param mixed   $format  The optional XF format
-    */
-    function write_formula($row, $col, $formula, $format = 0)
-    {
-        $record    = 0x0006;     // Record identifier
-
-        // Excel normally stores the last calculated value of the formula in $num.
-        // Clearly we are not in a position to calculate this a priori. Instead
-        // we set $num to zero and set the option flags in $grbit to ensure
-        // automatic calculation of the formula when the file is opened.
-        //
-        $xf        = $this->_XF($format); // The cell format
-        $num       = 0x00;                // Current value of formula
-        $grbit     = 0x03;                // Option flags
-        $chn       = 0x0000;              // Must be zero
-
-
-        // Check that row and col are valid and store max and min values
-        if ($row >= $this->xls_rowmax)
-        {
-            return(-2);
-        }
-        if ($col >= $this->xls_colmax)
-        {
-            return(-2);
-        }
-        if ($row <  $this->dim_rowmin)
-        {
-            $this->dim_rowmin = $row;
-        }
-        if ($row >  $this->dim_rowmax)
-        {
-            $this->dim_rowmax = $row;
-        }
-        if ($col <  $this->dim_colmin)
-        {
-            $this->dim_colmin = $col;
-        }
-        if ($col >  $this->dim_colmax)
-        {
-            $this->dim_colmax = $col;
-        }
-
-        // Strip the '=' or '@' sign at the beginning of the formula string
-        if (preg_match("/^=/", $formula)) {
-            $formula = preg_replace("/(^=)/","",$formula);
-        }
-        elseif(preg_match("/^@/", $formula)) {
-            $formula = preg_replace("/(^@)/","",$formula);
-        }
-        else {
-            die("Unrecognised character for formula");
-        }
-
-        // Parse the formula using the parser in Parser.php
-        //$tree      = new Parser($this->_byte_order);
-        $this->_parser->parse($formula);
-        //$tree->parse($formula);
-        $formula = $this->_parser->to_reverse_polish();
-
-        $formlen    = strlen($formula);    // Length of the binary string
-        $length     = 0x16 + $formlen;     // Length of the record data
-
-        $header    = pack("vv",      $record, $length);
-        $data      = pack("vvvdvVv", $row, $col, $xf, $num,
-                                     $grbit, $chn, $formlen);
-
-        $this->_append($header.$data.$formula);
-        return 0;
-    }
-
-    /**
-    * Write a hyperlink. This is comprised of two elements: the visible label and
-    * the invisible link. The visible label is the same as the link unless an
-    * alternative string is specified. The label is written using the
-    * write_string() method. Therefore the 255 characters string limit applies.
-    * $string and $format are optional and their order is interchangeable.
-    *
-    * The hyperlink can be to a http, ftp, mail, internal sheet, or external
-    * directory url.
-    *
-    * Returns  0 : normal termination
-    *         -1 : insufficient number of arguments
-    *         -2 : row or column out of range
-    *         -3 : long string truncated to 255 chars
-    *
-    * @access public
-    * @param integer $row    Row
-    * @param integer $col    Column
-    * @param string  $url    URL string
-    * @param string  $string Alternative label
-    * @param mixed   $format The cell format
-    */
-    function write_url($row, $col, $url, $string = '', $format = 0)
-    {
-        // Add start row and col to arg list
-        return($this->_write_url_range($row, $col, $row, $col, $url, $string, $format));
-    }
-
-    /**
-    * This is the more general form of write_url(). It allows a hyperlink to be
-    * written to a range of cells. This function also decides the type of hyperlink
-    * to be written. These are either, Web (http, ftp, mailto), Internal
-    * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
-    *
-    * See also write_url() above for a general description and return values.
-    *
-    * @param integer $row1   Start row
-    * @param integer $col1   Start column
-    * @param integer $row2   End row
-    * @param integer $col2   End column
-    * @param string  $url    URL string
-    * @param string  $string Alternative label
-    * @param mixed   $format The cell format
-    */
-
-    function _write_url_range($row1, $col1, $row2, $col2, $url, $string = '', $format = 0)
-    {
-        // Check for internal/external sheet links or default to web link
-        if (preg_match('[^internal:]', $url)) {
-            return($this->_write_url_internal($row1, $col1, $row2, $col2, $url, $string, $format));
-        }
-        if (preg_match('[^external:]', $url)) {
-            return($this->_write_url_external($row1, $col1, $row2, $col2, $url, $string, $format));
-        }
-        return($this->_write_url_web($row1, $col1, $row2, $col2, $url, $string, $format));
-    }
-
-
-    /**
-    * Used to write http, ftp and mailto hyperlinks.
-    * The link type ($options) is 0x03 is the same as absolute dir ref without
-    * sheet. However it is differentiated by the $unknown2 data stream.
-    *
-    * @see write_url()
-    * @param integer $row1   Start row
-    * @param integer $col1   Start column
-    * @param integer $row2   End row
-    * @param integer $col2   End column
-    * @param string  $url    URL string
-    * @param string  $str    Alternative label
-    * @param mixed   $format The cell format
-    */
-    function _write_url_web($row1, $col1, $row2, $col2, $url, $str, $format = 0)
-    {
-        $record      = 0x01B8;                       // Record identifier
-        $length      = 0x00000;                      // Bytes to follow
-
-        if($format == 0) {
-            $format = $this->_url_format;
-        }
-
-        // Write the visible label using the write_string() method.
-        if($str == '') {
-            $str = $url;
-        }
-        $str_error = $this->write_string($row1, $col1, $str, $format);
-        if ($str_error == -2) {
-            return($str_error);
-        }
-
-        // Pack the undocumented parts of the hyperlink stream
-        $unknown1    = pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
-        $unknown2    = pack("H*", "E0C9EA79F9BACE118C8200AA004BA90B");
-
-        // Pack the option flags
-        $options     = pack("V", 0x03);
-
-        // Convert URL to a null terminated wchar string
-        $url         = join("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-        $url         = $url . "\0\0\0";
-
-        // Pack the length of the URL
-        $url_len     = pack("V", strlen($url));
-
-        // Calculate the data length
-        $length      = 0x34 + strlen($url);
-
-        // Pack the header data
-        $header      = pack("vv",   $record, $length);
-        $data        = pack("vvvv", $row1, $row2, $col1, $col2);
-
-        // Write the packed data
-        $this->_append( $header. $data.
-                        $unknown1. $options.
-                        $unknown2. $url_len. $url);
-        return($str_error);
-    }
-
-    /**
-    * Used to write internal reference hyperlinks such as "Sheet1!A1".
-    *
-    * @see write_url()
-    * @param integer $row1   Start row
-    * @param integer $col1   Start column
-    * @param integer $row2   End row
-    * @param integer $col2   End column
-    * @param string  $url    URL string
-    * @param string  $str    Alternative label
-    * @param mixed   $format The cell format
-    */
-    function _write_url_internal($row1, $col1, $row2, $col2, $url, $str, $format = 0)
-    {
-        $record      = 0x01B8;                       // Record identifier
-        $length      = 0x00000;                      // Bytes to follow
-
-        if ($format == 0) {
-            $format = $this->_url_format;
-        }
-
-        // Strip URL type
-        $url = preg_replace('s[^internal:]', '', $url);
-
-        // Write the visible label
-        if($str == '') {
-            $str = $url;
-        }
-        $str_error = $this->write_string($row1, $col1, $str, $format);
-        if ($str_error == -2) {
-            return($str_error);
-        }
-
-        // Pack the undocumented parts of the hyperlink stream
-        $unknown1    = pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
-
-        // Pack the option flags
-        $options     = pack("V", 0x08);
-
-        // Convert the URL type and to a null terminated wchar string
-        $url         = join("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-        $url         = $url . "\0\0\0";
-
-        // Pack the length of the URL as chars (not wchars)
-        $url_len     = pack("V", floor(strlen($url)/2));
-
-        // Calculate the data length
-        $length      = 0x24 + strlen($url);
-
-        // Pack the header data
-        $header      = pack("vv",   $record, $length);
-        $data        = pack("vvvv", $row1, $row2, $col1, $col2);
-
-        // Write the packed data
-        $this->_append($header. $data.
-                       $unknown1. $options.
-                       $url_len. $url);
-        return($str_error);
-    }
-
-    /**
-    * Write links to external directory names such as 'c:\foo.xls',
-    * c:\foo.xls#Sheet1!A1', '../../foo.xls'. and '../../foo.xls#Sheet1!A1'.
-    *
-    * Note: Excel writes some relative links with the $dir_long string. We ignore
-    * these cases for the sake of simpler code.
-    *
-    * @see write_url()
-    * @param integer $row1   Start row
-    * @param integer $col1   Start column
-    * @param integer $row2   End row
-    * @param integer $col2   End column
-    * @param string  $url    URL string
-    * @param string  $str    Alternative label
-    * @param mixed   $format The cell format
-    */
-    function _write_url_external($row1, $col1, $row2, $col2, $url, $str, $format = 0)
-    {
-        // Network drives are different. We will handle them separately
-        // MS/Novell network drives and shares start with \\
-        if (preg_match('[^external:\\\\]', $url)) {
-            return($this->_write_url_external_net($row1, $col1, $row2, $col2, $url, $str, $format));
-        }
-
-        $record      = 0x01B8;                       // Record identifier
-        $length      = 0x00000;                      // Bytes to follow
-
-        if ($format == 0) {
-            $format = $this->_url_format;
-        }
-
-        // Strip URL type and change Unix dir separator to Dos style (if needed)
-        //
-        $url = preg_replace('[^external:]', '', $url);
-        $url = preg_replace('[/]', "\\", $url);
-
-        // Write the visible label
-        if ($str == '') {
-            $str = preg_replace('[\#]', ' - ', $url);
-        }
-        $str_error = $this->write_string($row1, $col1, $str, $format);
-        if ($str_error == -2) {
-            return($str_error);
-        }
-
-        // Determine if the link is relative or absolute:
-        //   relative if link contains no dir separator, "somefile.xls"
-        //   relative if link starts with up-dir, "..\..\somefile.xls"
-        //   otherwise, absolute
-
-        $absolute    = 0x02; // Bit mask
-        if (!preg_match('[\\]', $url)) {
-            $absolute    = 0x00;
-        }
-        if (preg_match('[^\.\.\\]', $url)) {
-            $absolute    = 0x00;
-        }
-
-        // Determine if the link contains a sheet reference and change some of the
-        // parameters accordingly.
-        // Split the dir name and sheet name (if it exists)
-        list($dir_long , $sheet) = explode('/\#/', $url);
-        $link_type               = 0x01 | $absolute;
-
-        if (isset($sheet)) {
-            $link_type |= 0x08;
-            $sheet_len  = pack("V", strlen($sheet) + 0x01);
-            $sheet      = join("\0", explode('', $sheet));
-            $sheet     .= "\0\0\0";
-        }
-        else {
-            $sheet_len   = '';
-            $sheet       = '';
-        }
-
-        // Pack the link type
-        $link_type   = pack("V", $link_type);
-
-        // Calculate the up-level dir count e.g.. (..\..\..\ == 3)
-        $up_count    = preg_match_all("/\.\.\\/", $dir_long, $useless);
-        $up_count    = pack("v", $up_count);
-
-        // Store the short dos dir name (null terminated)
-        $dir_short   = preg_replace('/\.\.\\/', '', $dir_long) . "\0";
-
-        // Store the long dir name as a wchar string (non-null terminated)
-        $dir_long       = join("\0", explode('', $dir_long));
-        $dir_long       = $dir_long . "\0";
-
-        // Pack the lengths of the dir strings
-        $dir_short_len = pack("V", strlen($dir_short)      );
-        $dir_long_len  = pack("V", strlen($dir_long)       );
-        $stream_len    = pack("V", strlen($dir_long) + 0x06);
-
-        // Pack the undocumented parts of the hyperlink stream
-        $unknown1 = pack("H*",'D0C9EA79F9BACE118C8200AA004BA90B02000000'       );
-        $unknown2 = pack("H*",'0303000000000000C000000000000046'               );
-        $unknown3 = pack("H*",'FFFFADDE000000000000000000000000000000000000000');
-        $unknown4 = pack("v",  0x03                                            );
-
-        // Pack the main data stream
-        $data        = pack("vvvv", $row1, $row2, $col1, $col2) .
-                          $unknown1     .
-                          $link_type    .
-                          $unknown2     .
-                          $up_count     .
-                          $dir_short_len.
-                          $dir_short    .
-                          $unknown3     .
-                          $stream_len   .
-                          $dir_long_len .
-                          $unknown4     .
-                          $dir_long     .
-                          $sheet_len    .
-                          $sheet        ;
-
-        // Pack the header data
-        $length   = strlen($data);
-        $header   = pack("vv", $record, $length);
-
-        // Write the packed data
-        $this->_append($header. $data);
-        return($str_error);
-    }
-
-
-    /*
-    ###############################################################################
-    #
-    # write_url_xxx($row1, $col1, $row2, $col2, $url, $string, $format)
-    #
-    # Write links to external MS/Novell network drives and shares such as
-    # '//NETWORK/share/foo.xls' and '//NETWORK/share/foo.xls#Sheet1!A1'.
-    #
-    # See also write_url() above for a general description and return values.
-    #
-    sub _write_url_external_net {
-
-        my $this    = shift;
-
-        my $record      = 0x01B8;                       # Record identifier
-        my $length      = 0x00000;                      # Bytes to follow
-
-        my $row1        = $_[0];                        # Start row
-        my $col1        = $_[1];                        # Start column
-        my $row2        = $_[2];                        # End row
-        my $col2        = $_[3];                        # End column
-        my $url         = $_[4];                        # URL string
-        my $str         = $_[5];                        # Alternative label
-        my $xf          = $_[6] || $this->{_url_format};# The cell format
-
-
-        # Strip URL type and change Unix dir separator to Dos style (if needed)
-        #
-        $url            =~ s[^external:][];
-        $url            =~ s[/][\\]g;
-
-
-        # Write the visible label
-        ($str = $url)   =~ s[\#][ - ] unless defined $str;
-        my $str_error   = $this->write_string($row1, $col1, $str, $xf);
-        return $str_error if $str_error == -2;
-
-
-        # Determine if the link contains a sheet reference and change some of the
-        # parameters accordingly.
-        # Split the dir name and sheet name (if it exists)
-        #
-        my ($dir_long , $sheet) = split /\#/, $url;
-        my $link_type           = 0x0103; # Always absolute
-        my $sheet_len;
-
-        if (defined $sheet) {
-            $link_type |= 0x08;
-            $sheet_len  = pack("V", length($sheet) + 0x01);
-            $sheet      = join("\0", split('', $sheet));
-            $sheet     .= "\0\0\0";
-    }
-        else {
-            $sheet_len   = '';
-            $sheet       = '';
-    }
-
-        # Pack the link type
-        $link_type      = pack("V", $link_type);
-
-
-        # Make the string null terminated
-        $dir_long       = $dir_long . "\0";
-
-
-        # Pack the lengths of the dir string
-        my $dir_long_len  = pack("V", length $dir_long);
-
-
-        # Store the long dir name as a wchar string (non-null terminated)
-        $dir_long       = join("\0", split('', $dir_long));
-        $dir_long       = $dir_long . "\0";
-
-
-        # Pack the undocumented part of the hyperlink stream
-        my $unknown1    = pack("H*",'D0C9EA79F9BACE118C8200AA004BA90B02000000');
-
-
-        # Pack the main data stream
-        my $data        = pack("vvvv", $row1, $row2, $col1, $col2) .
-                          $unknown1     .
-                          $link_type    .
-                          $dir_long_len .
-                          $dir_long     .
-                          $sheet_len    .
-                          $sheet        ;
-
-
-        # Pack the header data
-        $length         = length $data;
-        my $header      = pack("vv",   $record, $length);
-
-
-        # Write the packed data
-        $this->_append( $header, $data);
-
-        return $str_error;
-}*/
-
-    /**
-    * This method is used to set the height and XF format for a row.
-    * Writes the  BIFF record ROW.
-    *
-    * @access public
-    * @param integer $row    The row to set
-    * @param integer $height Height we are giving to the row.
-    *                        Use NULL to set XF without setting height
-    * @param mixed   $format XF format we are giving to the row
-    */
-    function set_row($row, $height, $format = 0)
-    {
-        $record      = 0x0208;               // Record identifier
-        $length      = 0x0010;               // Number of bytes to follow
-
-        $colMic      = 0x0000;               // First defined column
-        $colMac      = 0x0000;               // Last defined column
-        $irwMac      = 0x0000;               // Used by Excel to optimise loading
-        $reserved    = 0x0000;               // Reserved
-        $grbit       = 0x01C0;               // Option flags. (monkey) see $1 do
-        $ixfe        = $this->_XF($format); // XF index
-
-        // Use set_row($row, NULL, $XF) to set XF without setting height
-        if ($height != NULL) {
-            $miyRw = $height * 20;  // row height
-        }
-        else {
-            $miyRw = 0xff;          // default row height is 256
-        }
-
-        $header   = pack("vv",       $record, $length);
-        $data     = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw,
-                                     $irwMac,$reserved, $grbit, $ixfe);
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Writes Excel DIMENSIONS to define the area in which there is data.
-    */
-    function _store_dimensions()
-    {
-        $record    = 0x0000;               // Record identifier
-        $length    = 0x000A;               // Number of bytes to follow
-        $row_min   = $this->dim_rowmin;    // First row
-        $row_max   = $this->dim_rowmax;    // Last row plus 1
-        $col_min   = $this->dim_colmin;    // First column
-        $col_max   = $this->dim_colmax;    // Last column plus 1
-        $reserved  = 0x0000;               // Reserved by Excel
-
-        $header    = pack("vv",    $record, $length);
-        $data      = pack("vvvvv", $row_min, $row_max,
-                                   $col_min, $col_max, $reserved);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write BIFF record Window2.
-    */
-    function _store_window2()
-    {
-        $record         = 0x023E;     // Record identifier
-        $length         = 0x000A;     // Number of bytes to follow
-
-        $grbit          = 0x00B6;     // Option flags
-        $rwTop          = 0x0000;     // Top row visible in window
-        $colLeft        = 0x0000;     // Leftmost column visible in window
-        $rgbHdr         = 0x00000000; // Row/column heading and gridline color
-
-        // The options flags that comprise $grbit
-        $fDspFmla       = 0;                     // 0 - bit
-        $fDspGrid       = 1;                     // 1
-        $fDspRwCol      = 1;                     // 2
-        $fFrozen        = $this->_frozen;        // 3
-        $fDspZeros      = 1;                     // 4
-        $fDefaultHdr    = 1;                     // 5
-        $fArabic        = 0;                     // 6
-        $fDspGuts       = 1;                     // 7
-        $fFrozenNoSplit = 0;                     // 0 - bit
-        $fSelected      = $this->selected;       // 1
-        $fPaged         = 1;                     // 2
-
-        $grbit             = $fDspFmla;
-        $grbit            |= $fDspGrid       << 1;
-        $grbit            |= $fDspRwCol      << 2;
-        $grbit            |= $fFrozen        << 3;
-        $grbit            |= $fDspZeros      << 4;
-        $grbit            |= $fDefaultHdr    << 5;
-        $grbit            |= $fArabic        << 6;
-        $grbit            |= $fDspGuts       << 7;
-        $grbit            |= $fFrozenNoSplit << 8;
-        $grbit            |= $fSelected      << 9;
-        $grbit            |= $fPaged         << 10;
-
-        $header  = pack("vv",   $record, $length);
-        $data    = pack("vvvV", $grbit, $rwTop, $colLeft, $rgbHdr);
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Write BIFF record DEFCOLWIDTH if COLINFO records are in use.
-    */
-    function _store_defcol()
-    {
-        $record   = 0x0055;      // Record identifier
-        $length   = 0x0002;      // Number of bytes to follow
-        $colwidth = 0x0008;      // Default column width
-
-        $header   = pack("vv", $record, $length);
-        $data     = pack("v",  $colwidth);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write BIFF record COLINFO to define column widths
-    *
-    * Note: The SDK says the record length is 0x0B but Excel writes a 0x0C
-    * length record.
-    *
-    * @param array $col_array This is the only parameter received and is composed of the following:
-    *                0 => First formatted column,
-    *                1 => Last formatted column,
-    *                2 => Col width (8.43 is Excel default),
-    *                3 => The optional XF format of the column,
-    *                4 => Option flags.
-    */
-    function _store_colinfo($col_array)
-    {
-        if(isset($col_array[0])) {
-            $colFirst = $col_array[0];
-        }
-        if(isset($col_array[1])) {
-            $colLast = $col_array[1];
-        }
-        if(isset($col_array[2])) {
-            $coldx = $col_array[2];
-        }
-        else {
-            $coldx = 8.43;
-        }
-        if(isset($col_array[3])) {
-            $format = $col_array[3];
-        }
-        else {
-            $format = 0;
-        }
-        if(isset($col_array[4])) {
-            $grbit = $col_array[4];
-        }
-        else {
-            $grbit = 0;
-        }
-        $record   = 0x007D;          // Record identifier
-        $length   = 0x000B;          // Number of bytes to follow
-
-        $coldx   += 0.72;            // Fudge. Excel subtracts 0.72 !?
-        $coldx   *= 256;             // Convert to units of 1/256 of a char
-
-        $ixfe     = $this->_XF($format);
-        $reserved = 0x00;            // Reserved
-
-        $header   = pack("vv",     $record, $length);
-        $data     = pack("vvvvvC", $colFirst, $colLast, $coldx,
-                                   $ixfe, $grbit, $reserved);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write BIFF record SELECTION.
-    *
-    * @param array $array array containing ($rwFirst,$colFirst,$rwLast,$colLast)
-    * @see set_selection()
-    */
-    function _store_selection($array)
-    {
-        list($rwFirst,$colFirst,$rwLast,$colLast) = $array;
-        $record   = 0x001D;                  // Record identifier
-        $length   = 0x000F;                  // Number of bytes to follow
-
-        $pnn      = $this->_active_pane;     // Pane position
-        $rwAct    = $rwFirst;                // Active row
-        $colAct   = $colFirst;               // Active column
-        $irefAct  = 0;                       // Active cell ref
-        $cref     = 1;                       // Number of refs
-
-        if (!isset($rwLast)) {
-            $rwLast   = $rwFirst;       // Last  row in reference
-        }
-        if (!isset($colLast)) {
-            $colLast  = $colFirst;      // Last  col in reference
-        }
-
-        // Swap last row/col for first row/col as necessary
-        if ($rwFirst > $rwLast)
-        {
-            list($rwFirst, $rwLast) = array($rwLast, $rwFirst);
-        }
-
-        if ($colFirst > $colLast)
-        {
-            list($colFirst, $colLast) = array($colLast, $colFirst);
-        }
-
-        $header   = pack("vv",         $record, $length);
-        $data     = pack("CvvvvvvCC",  $pnn, $rwAct, $colAct,
-                                       $irefAct, $cref,
-                                       $rwFirst, $rwLast,
-                                       $colFirst, $colLast);
-        $this->_append($header.$data);
-    }
-
-
-    /**
-    * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
-    * references in a worksheet.
-    *
-    * Excel only stores references to external sheets that are used in formulas.
-    * For simplicity we store references to all the sheets in the workbook
-    * regardless of whether they are used or not. This reduces the overall
-    * complexity and eliminates the need for a two way dialogue between the formula
-    * parser the worksheet objects.
-    *
-    * @param integer $count The number of external sheet references in this worksheet
-    */
-    function _store_externcount($count)
-    {
-        $record   = 0x0016;          // Record identifier
-        $length   = 0x0002;          // Number of bytes to follow
-
-        $header   = pack("vv", $record, $length);
-        $data     = pack("v",  $count);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-    * formulas. A formula references a sheet name via an index. Since we store a
-    * reference to all of the external worksheets the EXTERNSHEET index is the same
-    * as the worksheet index.
-    *
-    * @param string $sheetname The name of a external worksheet
-    */
-    function _store_externsheet($sheetname)
-    {
-        $record    = 0x0017;         // Record identifier
-
-        // References to the current sheet are encoded differently to references to
-        // external sheets.
-        //
-        if ($this->name == $sheetname) {
-            $sheetname = '';
-            $length    = 0x02;  // The following 2 bytes
-            $cch       = 1;     // The following byte
-            $rgch      = 0x02;  // Self reference
-        }
-        else {
-            $length    = 0x02 + strlen($sheetname);
-            $cch       = strlen($sheetname);
-            $rgch      = 0x03;  // Reference to a sheet in the current workbook
-        }
-
-        $header     = pack("vv",  $record, $length);
-        $data       = pack("CC", $cch, $rgch);
-        $this->_prepend($header.$data.$sheetname);
-    }
-
-    /**
-    * Writes the Excel BIFF PANE record.
-    * The panes can either be frozen or thawed (unfrozen).
-    * Frozen panes are specified in terms of an integer number of rows and columns.
-    * Thawed panes are specified in terms of Excel's units for rows and columns.
-    *
-    * @param array $panes This is the only parameter received and is composed of the following:
-    *                     0 => Vertical split position,
-    *                     1 => Horizontal split position
-    *                     2 => Top row visible
-    *                     3 => Leftmost column visible
-    *                     4 => Active pane
-    */
-    function _store_panes($panes)
-    {
-        $y       = $panes[0];
-        $x       = $panes[1];
-        $rwTop   = $panes[2];
-        $colLeft = $panes[3];
-        if(count($panes) > 4) { // if Active pane was received
-            $pnnAct = $panes[4];
-        }
-        else {
-            $pnnAct = NULL;
-        }
-        $record  = 0x0041;       // Record identifier
-        $length  = 0x000A;       // Number of bytes to follow
-
-        // Code specific to frozen or thawed panes.
-        if ($this->_frozen) {
-            // Set default values for $rwTop and $colLeft
-            if(!isset($rwTop)) {
-                $rwTop   = $y;
-            }
-            if(!isset($colLeft)) {
-                $colLeft = $x;
-            }
-        }
-        else {
-            // Set default values for $rwTop and $colLeft
-            if(!isset($rwTop)) {
-                $rwTop   = 0;
-            }
-            if(!isset($colLeft)) {
-                $colLeft = 0;
-            }
-
-            // Convert Excel's row and column units to the internal units.
-            // The default row height is 12.75
-            // The default column width is 8.43
-            // The following slope and intersection values were interpolated.
-            //
-            $y = 20*$y      + 255;
-            $x = 113.879*$x + 390;
-        }
-
-
-        // Determine which pane should be active. There is also the undocumented
-        // option to override this should it be necessary: may be removed later.
-        //
-        if (!isset($pnnAct))
-        {
-            if ($x != 0 and $y != 0)
-                $pnnAct = 0; // Bottom right
-            if ($x != 0 and $y == 0)
-                $pnnAct = 1; // Top right
-            if ($x == 0 and $y != 0)
-                $pnnAct = 2; // Bottom left
-            if ($x == 0 and $y == 0)
-                $pnnAct = 3; // Top left
-        }
-
-        $this->_active_pane = $pnnAct; // Used in _store_selection
-
-        $header     = pack("vv",    $record, $length);
-        $data       = pack("vvvvv", $x, $y, $rwTop, $colLeft, $pnnAct);
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Store the page setup SETUP BIFF record.
-    */
-    function _store_setup()
-    {
-        $record       = 0x00A1;                  // Record identifier
-        $length       = 0x0022;                  // Number of bytes to follow
-
-        $iPaperSize   = $this->_paper_size;    // Paper size
-        $iScale       = $this->_print_scale;   // Print scaling factor
-        $iPageStart   = 0x01;                 // Starting page number
-        $iFitWidth    = $this->_fit_width;    // Fit to number of pages wide
-        $iFitHeight   = $this->_fit_height;   // Fit to number of pages high
-        $grbit        = 0x00;                 // Option flags
-        $iRes         = 0x0258;               // Print resolution
-        $iVRes        = 0x0258;               // Vertical print resolution
-        $numHdr       = $this->_margin_head;  // Header Margin
-        $numFtr       = $this->_margin_foot;   // Footer Margin
-        $iCopies      = 0x01;                 // Number of copies
-
-        $fLeftToRight = 0x0;                     // Print over then down
-        $fLandscape   = $this->_orientation;     // Page orientation
-        $fNoPls       = 0x0;                     // Setup not read from printer
-        $fNoColor     = 0x0;                     // Print black and white
-        $fDraft       = 0x0;                     // Print draft quality
-        $fNotes       = 0x0;                     // Print notes
-        $fNoOrient    = 0x0;                     // Orientation not set
-        $fUsePage     = 0x0;                     // Use custom starting page
-
-        $grbit           = $fLeftToRight;
-        $grbit          |= $fLandscape    << 1;
-        $grbit          |= $fNoPls        << 2;
-        $grbit          |= $fNoColor      << 3;
-        $grbit          |= $fDraft        << 4;
-        $grbit          |= $fNotes        << 5;
-        $grbit          |= $fNoOrient     << 6;
-        $grbit          |= $fUsePage      << 7;
-
-        $numHdr = pack("d", $numHdr);
-        $numFtr = pack("d", $numFtr);
-        if ($this->_byte_order) // if it's Big Endian
-        {
-            $numHdr = strrev($numHdr);
-            $numFtr = strrev($numFtr);
-        }
-
-        $header = pack("vv", $record, $length);
-        $data1  = pack("vvvvvvvv", $iPaperSize,
-                                   $iScale,
-                                   $iPageStart,
-                                   $iFitWidth,
-                                   $iFitHeight,
-                                   $grbit,
-                                   $iRes,
-                                   $iVRes);
-        $data2  = $numHdr .$numFtr;
-        $data3  = pack("v", $iCopies);
-        $this->_prepend($header.$data1.$data2.$data3);
-    }
-
-    /**
-    * Store the header caption BIFF record.
-    */
-    function store_header()
-    {
-        $record  = 0x0014;               // Record identifier
-
-        $str     = $this->_header;        // header string
-        $cch     = strlen($str);         // Length of header string
-        $length  = 1 + $cch;             // Bytes to follow
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("C",   $cch);
-
-        $this->_append($header.$data.$str);
-    }
-
-    /**
-    * Store the footer caption BIFF record.
-    */
-    function store_footer()
-    {
-        $record  = 0x0015;               // Record identifier
-
-        $str     = $this->_footer;       // Footer string
-        $cch     = strlen($str);         // Length of footer string
-        $length  = 1 + $cch;             // Bytes to follow
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("C",   $cch);
-
-        $this->_append($header.$data.$str);
-    }
-
-    /**
-    * Store the horizontal centering HCENTER BIFF record.
-    */
-    function store_hcenter()
-    {
-        $record   = 0x0083;              // Record identifier
-        $length   = 0x0002;              // Bytes to follow
-
-        $fHCenter = $this->_hcenter;      // Horizontal centering
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("v",   $fHCenter);
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Store the vertical centering VCENTER BIFF record.
-    */
-    function store_vcenter()
-    {
-        $record   = 0x0084;              // Record identifier
-        $length   = 0x0002;              // Bytes to follow
-
-        $fVCenter = $this->_vcenter;      // Horizontal centering
-
-        $header    = pack("vv", $record, $length);
-        $data      = pack("v", $fVCenter);
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Store the LEFTMARGIN BIFF record.
-    */
-    function _store_margin_left()
-    {
-        $record  = 0x0026;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
-
-        $margin  = $this->_margin_left;       // Margin in inches
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("d",   $margin);
-        if ($this->_byte_order) // if it's Big Endian
-        {
-            $data = strrev($data);
-        }
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Store the RIGHTMARGIN BIFF record.
-    */
-    function _store_margin_right()
-    {
-        $record  = 0x0027;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
-
-        $margin  = $this->_margin_right;      // Margin in inches
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("d",   $margin);
-        if ($this->_byte_order) // if it's Big Endian
-        {
-            $data = strrev($data);
-        }
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Store the TOPMARGIN BIFF record.
-    */
-    function _store_margin_top()
-    {
-        $record  = 0x0028;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
-
-        $margin  = $this->_margin_top;        // Margin in inches
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("d",   $margin);
-        if ($this->_byte_order) // if it's Big Endian
-        {
-            $data = strrev($data);
-        }
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Store the BOTTOMMARGIN BIFF record.
-    */
-    function _store_margin_bottom()
-    {
-        $record  = 0x0029;                   // Record identifier
-        $length  = 0x0008;                   // Bytes to follow
-
-        $margin  = $this->_margin_bottom;     // Margin in inches
-
-        $header    = pack("vv",  $record, $length);
-        $data      = pack("d",   $margin);
-        if ($this->_byte_order) // if it's Big Endian
-        {
-            $data = strrev($data);
-        }
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * This is an Excel97/2000 method. It is required to perform more complicated
-    * merging than the normal set_align('merge'). It merges the area given by
-    * its arguments.
-    *
-    * @access public
-    * @param integer $first_row First row of the area to merge
-    * @param integer $first_col First column of the area to merge
-    * @param integer $last_row  Last row of the area to merge
-    * @param integer $last_col  Last column of the area to merge
-    */
-    function merge_cells($first_row, $first_col, $last_row, $last_col)
-    {
-        $record  = 0x00E5;                   // Record identifier
-        $length  = 0x000A;                   // Bytes to follow
-        $cref     = 1;                       // Number of refs
-
-        // Swap last row/col for first row/col as necessary
-        if ($first_row > $last_row) {
-            list($first_row, $last_row) = array($last_row, $first_row);
-        }
-
-        if ($first_col > $last_col) {
-            list($first_col, $last_col) = array($last_col, $first_col);
-        }
-
-        $header   = pack("vv",    $record, $length);
-        $data     = pack("vvvvv", $cref, $first_row, $last_row,
-                                  $first_col, $last_col);
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Write the PRINTHEADERS BIFF record.
-    */
-    function _store_print_headers()
-    {
-        $record      = 0x002a;                   // Record identifier
-        $length      = 0x0002;                   // Bytes to follow
-
-        $fPrintRwCol = $this->_print_headers;     // Boolean flag
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("v", $fPrintRwCol);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write the PRINTGRIDLINES BIFF record. Must be used in conjunction with the
-    * GRIDSET record.
-    */
-    function _store_print_gridlines()
-    {
-        $record      = 0x002b;                    // Record identifier
-        $length      = 0x0002;                    // Bytes to follow
-
-        $fPrintGrid  = $this->_print_gridlines;    // Boolean flag
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("v", $fPrintGrid);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write the GRIDSET BIFF record. Must be used in conjunction with the
-    * PRINTGRIDLINES record.
-    */
-    function _store_gridset()
-    {
-        $record      = 0x0082;                        // Record identifier
-        $length      = 0x0002;                        // Bytes to follow
-
-        $fGridSet    = !($this->_print_gridlines);     // Boolean flag
-
-        $header      = pack("vv",  $record, $length);
-        $data        = pack("v",   $fGridSet);
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
-    * with the SETUP record.
-    */
-    function _store_wsbool()
-    {
-        $record      = 0x0081;   // Record identifier
-        $length      = 0x0002;   // Bytes to follow
-
-        // The only option that is of interest is the flag for fit to page. So we
-        // set all the options in one go.
-        //
-        if ($this->_fit_page) {
-            $grbit = 0x05c1;
-        }
-        else {
-            $grbit = 0x04c1;
-        }
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("v",  $grbit);
-        $this->_prepend($header.$data);
-    }
-
-
-    /**
-    * Write the HORIZONTALPAGEBREAKS BIFF record.
-    */
-    function _store_hbreak()
-    {
-        // Return if the user hasn't specified pagebreaks
-        if(empty($this->_hbreaks)) {
-            return;
-        }
-
-        // Sort and filter array of page breaks
-        $breaks = $this->_hbreaks;
-        sort($breaks,SORT_NUMERIC);
-        if($breaks[0] == 0) { // don't use first break if it's 0
-            array_shift($breaks);
-        }
-
-        $record  = 0x001b;               // Record identifier
-        $cbrk    = count($breaks);       // Number of page breaks
-        $length  = ($cbrk + 1) * 2;      // Bytes to follow
-
-        $header  = pack("vv", $record, $length);
-        $data    = pack("v",  $cbrk);
-
-        // Append each page break
-        foreach($breaks as $break) {
-            $data .= pack("v", $break);
-        }
-
-        $this->_prepend($header.$data);
-    }
-
-
-    /**
-    * Write the VERTICALPAGEBREAKS BIFF record.
-    */
-    function _store_vbreak()
-    {
-        // Return if the user hasn't specified pagebreaks
-        if(empty($this->_vbreaks)) {
-            return;
-        }
-
-        // 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
-        // It is slightly higher in Excel 97/200, approx. 1026
-        $breaks = array_slice($this->_vbreaks,0,1000);
-
-        // Sort and filter array of page breaks
-        sort($breaks,SORT_NUMERIC);
-        if($breaks[0] == 0) { // don't use first break if it's 0
-            array_shift($breaks);
-        }
-
-        $record  = 0x001a;               // Record identifier
-        $cbrk    = count($breaks);       // Number of page breaks
-        $length  = ($cbrk + 1) * 2;      // Bytes to follow
-
-        $header  = pack("vv",  $record, $length);
-        $data    = pack("v",   $cbrk);
-
-        // Append each page break
-        foreach ($breaks as $break) {
-            $data .= pack("v", $break);
-        }
-
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Set the Biff PROTECT record to indicate that the worksheet is protected.
-    */
-    function _store_protect()
-    {
-        // Exit unless sheet protection has been specified
-        if($this->_protect == 0) {
-            return;
-        }
-
-        $record      = 0x0012;             // Record identifier
-        $length      = 0x0002;             // Bytes to follow
-
-        $fLock       = $this->_protect;    // Worksheet is protected
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("v",  $fLock);
-
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Write the worksheet PASSWORD record.
-    */
-    function _store_password()
-    {
-        // Exit unless sheet protection and password have been specified
-        if(($this->_protect == 0) or (!isset($this->_password))) {
-            return;
-        }
-
-        $record      = 0x0013;               // Record identifier
-        $length      = 0x0002;               // Bytes to follow
-
-        $wPassword   = $this->_password;     // Encoded password
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("v",  $wPassword);
-
-        $this->_prepend($header.$data);
-    }
-
-    /**
-    * Insert a 24bit bitmap image in a worksheet. The main record required is
-    * IMDATA but it must be proceeded by a OBJ record to define its position.
-    *
-    * @access public
-    * @param integer $row     The row we are going to insert the bitmap into
-    * @param integer $col     The column we are going to insert the bitmap into
-    * @param string  $bitmap  The bitmap filename
-    * @param integer $x       The horizontal position (offset) of the image inside the cell.
-    * @param integer $y       The vertical position (offset) of the image inside the cell.
-    * @param integer $scale_x The horizontal scale
-    * @param integer $scale_y The vertical scale
-    */
-    function insert_bitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
-    {
-        list($width, $height, $size, $data) = $this->_process_bitmap($bitmap);
-
-        // Scale the frame of the image.
-        $width  *= $scale_x;
-        $height *= $scale_y;
-
-        // Calculate the vertices of the image and write the OBJ record
-        $this->_position_image($col, $row, $x, $y, $width, $height);
-
-        // Write the IMDATA record to store the bitmap data
-        $record      = 0x007f;
-        $length      = 8 + $size;
-        $cf          = 0x09;
-        $env         = 0x01;
-        $lcb         = $size;
-
-        $header      = pack("vvvvV", $record, $length, $cf, $env, $lcb);
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Calculate the vertices that define the position of the image as required by
-    * the OBJ record.
-    *
-    *         +------------+------------+
-    *         |     A      |      B     |
-    *   +-----+------------+------------+
-    *   |     |(x1,y1)     |            |
-    *   |  1  |(A1)._______|______      |
-    *   |     |    |              |     |
-    *   |     |    |              |     |
-    *   +-----+----|    BITMAP    |-----+
-    *   |     |    |              |     |
-    *   |  2  |    |______________.     |
-    *   |     |            |        (B2)|
-    *   |     |            |     (x2,y2)|
-    *   +---- +------------+------------+
-    *
-    * Example of a bitmap that covers some of the area from cell A1 to cell B2.
-    *
-    * Based on the width and height of the bitmap we need to calculate 8 vars:
-    *     $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
-    * The width and height of the cells are also variable and have to be taken into
-    * account.
-    * The values of $col_start and $row_start are passed in from the calling
-    * function. The values of $col_end and $row_end are calculated by subtracting
-    * the width and height of the bitmap from the width and height of the
-    * underlying cells.
-    * The vertices are expressed as a percentage of the underlying cell width as
-    * follows (rhs values are in pixels):
-    *
-    *       x1 = X / W *1024
-    *       y1 = Y / H *256
-    *       x2 = (X-1) / W *1024
-    *       y2 = (Y-1) / H *256
-    *
-    *       Where:  X is distance from the left side of the underlying cell
-    *               Y is distance from the top of the underlying cell
-    *               W is the width of the cell
-    *               H is the height of the cell
-    *
-    * @note  the SDK incorrectly states that the height should be expressed as a
-    *        percentage of 1024.
-    * @param integer $col_start Col containing upper left corner of object
-    * @param integer $row_start Row containing top left corner of object
-    * @param integer $x1        Distance to left side of object
-    * @param integer $y1        Distance to top of object
-    * @param integer $width     Width of image frame
-    * @param integer $height    Height of image frame
-    */
-    function _position_image($col_start, $row_start, $x1, $y1, $width, $height)
-    {
-        // Initialise end cell to the same as the start cell
-        $col_end    = $col_start;  // Col containing lower right corner of object
-        $row_end    = $row_start;  // Row containing bottom right corner of object
-
-        // Zero the specified offset if greater than the cell dimensions
-        if ($x1 >= $this->size_col($col_start))
-        {
-            $x1 = 0;
-        }
-        if ($y1 >= $this->size_row($row_start))
-        {
-            $y1 = 0;
-        }
-
-        $width      = $width  + $x1 -1;
-        $height     = $height + $y1 -1;
-
-        // Subtract the underlying cell widths to find the end cell of the image
-        while ($width >= $this->size_col($col_end)) {
-            $width -= $this->size_col($col_end);
-            $col_end++;
-        }
-
-        // Subtract the underlying cell heights to find the end cell of the image
-        while ($height >= $this->size_row($row_end)) {
-            $height -= $this->size_row($row_end);
-            $row_end++;
-        }
-
-        // Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
-        // with zero eight or width.
-        //
-        if ($this->size_col($col_start) == 0)
-            return;
-        if ($this->size_col($col_end)   == 0)
-            return;
-        if ($this->size_row($row_start) == 0)
-            return;
-        if ($this->size_row($row_end)   == 0)
-            return;
-
-        // Convert the pixel values to the percentage value expected by Excel
-        $x1 = $x1     / $this->size_col($col_start)   * 1024;
-        $y1 = $y1     / $this->size_row($row_start)   *  256;
-        $x2 = $width  / $this->size_col($col_end)     * 1024; // Distance to right side of object
-        $y2 = $height / $this->size_row($row_end)     *  256; // Distance to bottom of object
-
-        $this->_store_obj_picture( $col_start, $x1,
-                                  $row_start, $y1,
-                                  $col_end, $x2,
-                                  $row_end, $y2
-                                );
-    }
-
-    /**
-    * Convert the width of a cell from user's units to pixels. By interpolation
-    * the relationship is: y = 7x +5. If the width hasn't been set by the user we
-    * use the default value. If the col is hidden we use a value of zero.
-    *
-    * @param integer  $col The column
-    * @return integer The width in pixels
-    */
-    function size_col($col)
-    {
-        // Look up the cell value to see if it has been changed
-        if (isset($this->col_sizes[$col])) {
-            if ($this->col_sizes[$col] == 0) {
-                return(0);
-            }
-            else {
-                return(floor(7 * $this->col_sizes[$col] + 5));
-            }
-        }
-        else {
-            return(64);
-        }
-    }
-
-    /**
-    * Convert the height of a cell from user's units to pixels. By interpolation
-    * the relationship is: y = 4/3x. If the height hasn't been set by the user we
-    * use the default value. If the row is hidden we use a value of zero. (Not
-    * possible to hide row yet).
-    *
-    * @param integer $row The row
-    * @return integer The width in pixels
-    */
-    function size_row($row)
-    {
-        // Look up the cell value to see if it has been changed
-        if (isset($this->row_sizes[$row])) {
-            if ($this->row_sizes[$row] == 0) {
-                return(0);
-            }
-            else {
-                return(floor(4/3 * $this->row_sizes[$row]));
-            }
-        }
-        else {
-            return(17);
-        }
-    }
-
-    /**
-    * Store the OBJ record that precedes an IMDATA record. This could be generalise
-    * to support other Excel objects.
-    *
-    * @param integer $colL Column containing upper left corner of object
-    * @param integer $dxL  Distance from left side of cell
-    * @param integer $rwT  Row containing top left corner of object
-    * @param integer $dyT  Distance from top of cell
-    * @param integer $colR Column containing lower right corner of object
-    * @param integer $dxR  Distance from right of cell
-    * @param integer $rwB  Row containing bottom right corner of object
-    * @param integer $dyB  Distance from bottom of cell
-    */
-    function _store_obj_picture($colL,$dxL,$rwT,$dyT,$colR,$dxR,$rwB,$dyB)
-    {
-        $record      = 0x005d;   // Record identifier
-        $length      = 0x003c;   // Bytes to follow
-
-        $cObj        = 0x0001;   // Count of objects in file (set to 1)
-        $OT          = 0x0008;   // Object type. 8 = Picture
-        $id          = 0x0001;   // Object ID
-        $grbit       = 0x0614;   // Option flags
-
-        $cbMacro     = 0x0000;   // Length of FMLA structure
-        $Reserved1   = 0x0000;   // Reserved
-        $Reserved2   = 0x0000;   // Reserved
-
-        $icvBack     = 0x09;     // Background colour
-        $icvFore     = 0x09;     // Foreground colour
-        $fls         = 0x00;     // Fill pattern
-        $fAuto       = 0x00;     // Automatic fill
-        $icv         = 0x08;     // Line colour
-        $lns         = 0xff;     // Line style
-        $lnw         = 0x01;     // Line weight
-        $fAutoB      = 0x00;     // Automatic border
-        $frs         = 0x0000;   // Frame style
-        $cf          = 0x0009;   // Image format, 9 = bitmap
-        $Reserved3   = 0x0000;   // Reserved
-        $cbPictFmla  = 0x0000;   // Length of FMLA structure
-        $Reserved4   = 0x0000;   // Reserved
-        $grbit2      = 0x0001;   // Option flags
-        $Reserved5   = 0x0000;   // Reserved
-
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("V", $cObj);
-        $data       .= pack("v", $OT);
-        $data       .= pack("v", $id);
-        $data       .= pack("v", $grbit);
-        $data       .= pack("v", $colL);
-        $data       .= pack("v", $dxL);
-        $data       .= pack("v", $rwT);
-        $data       .= pack("v", $dyT);
-        $data       .= pack("v", $colR);
-        $data       .= pack("v", $dxR);
-        $data       .= pack("v", $rwB);
-        $data       .= pack("v", $dyB);
-        $data       .= pack("v", $cbMacro);
-        $data       .= pack("V", $Reserved1);
-        $data       .= pack("v", $Reserved2);
-        $data       .= pack("C", $icvBack);
-        $data       .= pack("C", $icvFore);
-        $data       .= pack("C", $fls);
-        $data       .= pack("C", $fAuto);
-        $data       .= pack("C", $icv);
-        $data       .= pack("C", $lns);
-        $data       .= pack("C", $lnw);
-        $data       .= pack("C", $fAutoB);
-        $data       .= pack("v", $frs);
-        $data       .= pack("V", $cf);
-        $data       .= pack("v", $Reserved3);
-        $data       .= pack("v", $cbPictFmla);
-        $data       .= pack("v", $Reserved4);
-        $data       .= pack("v", $grbit2);
-        $data       .= pack("V", $Reserved5);
-
-        $this->_append($header.$data);
-    }
-
-    /**
-    * Convert a 24 bit bitmap into the modified internal format used by Windows.
-    * This is described in BITMAPCOREHEADER and BITMAPCOREINFO structures in the
-    * MSDN library.
-    *
-    * @param string $bitmap The bitmap to process
-    * @return array Array with data and properties of the bitmap
-    */
-    function _process_bitmap($bitmap)
-    {
-        // Open file.
-        $bmp_fd = fopen($bitmap,"rb");
-        if (!$bmp_fd) {
-            die("Couldn't import $bitmap");
-        }
-
-        // Slurp the file into a string.
-        $data = fread($bmp_fd, filesize($bitmap));
-
-        // Check that the file is big enough to be a bitmap.
-        if (strlen($data) <= 0x36) {
-            die("$bitmap doesn't contain enough data.\n");
-        }
-
-        // The first 2 bytes are used to identify the bitmap.
-        $identity = unpack("A2", $data);
-        if ($identity[''] != "BM") {
-            die("$bitmap doesn't appear to be a valid bitmap image.\n");
-        }
-
-        // Remove bitmap data: ID.
-        $data = substr($data, 2);
-
-        // Read and remove the bitmap size. This is more reliable than reading
-        // the data size at offset 0x22.
-        //
-        $size_array   = unpack("V", substr($data, 0, 4));
-        $size   = $size_array[''];
-        $data   = substr($data, 4);
-        $size  -= 0x36; // Subtract size of bitmap header.
-        $size  += 0x0C; // Add size of BIFF header.
-
-        // Remove bitmap data: reserved, offset, header length.
-        $data = substr($data, 12);
-
-        // Read and remove the bitmap width and height. Verify the sizes.
-        $width_and_height = unpack("V2", substr($data, 0, 8));
-        $width  = $width_and_height[1];
-        $height = $width_and_height[2];
-        $data   = substr($data, 8);
-        if ($width > 0xFFFF) {
-            die("$bitmap: largest image width supported is 65k.\n");
-        }
-        if ($height > 0xFFFF) {
-            die("$bitmap: largest image height supported is 65k.\n");
-        }
-
-        // Read and remove the bitmap planes and bpp data. Verify them.
-        $planes_and_bitcount = unpack("v2", substr($data, 0, 4));
-        $data = substr($data, 4);
-        if ($planes_and_bitcount[2] != 24) { // Bitcount
-            die("$bitmap isn't a 24bit true color bitmap.\n");
-        }
-        if ($planes_and_bitcount[1] != 1) {
-            die("$bitmap: only 1 plane supported in bitmap image.\n");
-        }
-
-        // Read and remove the bitmap compression. Verify compression.
-        $compression = unpack("V", substr($data, 0, 4));
-        $data = substr($data, 4);
-
-        //$compression = 0;
-        if ($compression[""] != 0) {
-            die("$bitmap: compression not supported in bitmap image.\n");
-        }
-
-        // Remove bitmap data: data size, hres, vres, colours, imp. colours.
-        $data = substr($data, 20);
-
-        // Add the BITMAPCOREHEADER data
-        $header  = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-        $data    = $header . $data;
-
-        return (array($width, $height, $size, $data));
-    }
-
-    /**
-    * Store the window zoom factor. This should be a reduced fraction but for
-    * simplicity we will store all fractions with a numerator of 100.
-    */
-    function _store_zoom()
-    {
-        // If scale is 100 we don't need to write a record
-        if ($this->_zoom == 100) {
-            return;
-        }
-
-        $record      = 0x00A0;               // Record identifier
-        $length      = 0x0004;               // Bytes to follow
-
-        $header      = pack("vv", $record, $length);
-        $data        = pack("vv", $this->_zoom, 100);
-        $this->_append($header.$data);
-    }
-}
-?>
diff --git a/vendor/write_excel/thanks b/vendor/write_excel/thanks
deleted file mode 100644
index b128adf..0000000
--- a/vendor/write_excel/thanks
+++ /dev/null
@@ -1,7 +0,0 @@
-Inmortalizing those who have contributed(*) to Spreadsheet_WriteExcel:
- Quentin Bennett
- Kenneth G. Chin
- Tomislav Goles
-
-
-(*) According to my own personal definition of contribution.
\ No newline at end of file
-- 
cgit v1.0


From 6603fd37c5fc788bed5c43f46b30fb711a5699c9 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 7 May 2024 07:53:22 +0000
Subject: fix #4121

Closes #4121

Merge request studip/studip!2966
---
 resources/vue/components/StudipFileChooser.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/vue/components/StudipFileChooser.vue b/resources/vue/components/StudipFileChooser.vue
index e021aec..798d646 100644
--- a/resources/vue/components/StudipFileChooser.vue
+++ b/resources/vue/components/StudipFileChooser.vue
@@ -128,7 +128,7 @@ export default {
     max-width: 48em;
     button {
         margin: 0.5ex 0 0.5ex 0;
-        min-width: 140px;
+        width: 150px;
     }
     span {
         box-sizing: border-box;
@@ -138,7 +138,7 @@ export default {
         font-size: 14px;
         line-height: 130%;
         min-width: 100px;
-        width: calc(100% - 140px);
+        width: calc(100% - 150px);
         overflow: hidden;
         text-overflow: ellipsis;
         padding: 5px 15px;
-- 
cgit v1.0


From 51876b9c1878a2a5bd4c49241507f1ed47472d46 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 7 May 2024 08:07:00 +0000
Subject: fix #4083

Closes #4083

Merge request studip/studip!2967
---
 .../vue/components/courseware/blocks/CoursewareBlockEdit.vue | 12 +-----------
 resources/vue/components/file-chooser/FileChooserDialog.vue  |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/resources/vue/components/courseware/blocks/CoursewareBlockEdit.vue b/resources/vue/components/courseware/blocks/CoursewareBlockEdit.vue
index d1ed09f..82d1abc 100644
--- a/resources/vue/components/courseware/blocks/CoursewareBlockEdit.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareBlockEdit.vue
@@ -2,7 +2,7 @@
     <section class="cw-block-edit">
         <header v-if="preview">{{ $gettext('Bearbeiten') }}</header>
         <div class="cw-block-features-content">
-            <div @click="deactivateToolbar(); exitHandler = true;">
+            <div @click="exitHandler = true;">
                 <slot name="edit" />
             </div>
             <div class="cw-button-box">
@@ -31,16 +31,6 @@ export default {
     beforeMount() {
         this.originalBlock = this.block;
     },
-    methods: {
-        ...mapActions({
-            coursewareBlockAdder: 'coursewareBlockAdder',
-            coursewareShowToolbar: 'coursewareShowToolbar'
-        }),
-        deactivateToolbar() {
-            this.coursewareBlockAdder({});
-            this.coursewareShowToolbar(false);
-        },
-    },
     beforeDestroy() {
         if (this.exitHandler) {
             this.$emit('store');
diff --git a/resources/vue/components/file-chooser/FileChooserDialog.vue b/resources/vue/components/file-chooser/FileChooserDialog.vue
index 2102d1e..2b21f51 100644
--- a/resources/vue/components/file-chooser/FileChooserDialog.vue
+++ b/resources/vue/components/file-chooser/FileChooserDialog.vue
@@ -93,8 +93,8 @@ export default {
     },
     data() {
         return {
-            height: 600,
-            width: 1000,
+            height: '600',
+            width: '1000',
             scope: 'courses',
             coursesTree: [],
             usersTree: [],
-- 
cgit v1.0


From 49451b26817ba0d50121dc84a1bd0df5902906f9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 7 May 2024 09:48:35 +0000
Subject: fixes #4123

Closes #4123

Merge request studip/studip!2968
---
 docker/studip/config_local.php | 64 ++++++++++++++----------------------------
 tests/configuration.php        | 22 ++++++++++-----
 2 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/docker/studip/config_local.php b/docker/studip/config_local.php
index 010ff66..63029e7 100644
--- a/docker/studip/config_local.php
+++ b/docker/studip/config_local.php
@@ -1,49 +1,27 @@
 <?php
-/*basic settings for Stud.IP
-----------------------------------------------------------------
-you find here the basic system settings. You shouldn't have to touch much of them...
-please note the CONFIG.INC.PHP for the indivual settings of your installation!*/
-
-namespace Studip {
-    //const ENV = 'development';
-    define ('ENV', getenv('ENV') ?? 'development');
-}
-
-namespace {
-    /*settings for database access
-    ----------------------------------------------------------------
-    please fill in your database connection settings.
-    */
+define ('Studip\\ENV', $_ENV['ENV'] ?? 'development');
 
-    // default Stud.IP database (DB_Seminar)
-    $DB_STUDIP_HOST = getenv('MYSQL_HOST');
-    $DB_STUDIP_USER = getenv('MYSQL_USER');
-    $DB_STUDIP_PASSWORD = getenv('MYSQL_PASSWORD');
-    $DB_STUDIP_DATABASE = getenv('MYSQL_DATABASE');
-    $MAIL_TRANSPORT = getenv('MAIL_TRANSPORT');
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
-    /*URL
-    ----------------------------------------------------------------
-    customize if automatic detection fails, e.g. when installation is hidden
-    behind a proxy
-    */
-    //$CANONICAL_RELATIVE_PATH_STUDIP = '/';
-    //$ABSOLUTE_URI_STUDIP = 'https://www.studip.de/';
-    //$ASSETS_URL = 'https://www.studip.de/assets/';
-
-    // Set proxy url
-    if ($PROXY_URL = getenv('PROXY_URL')) {
-        $ABSOLUTE_URI_STUDIP = $PROXY_URL;
-        $ASSETS_URL = $PROXY_URL.'/assets/';
-        unset($PROXY_URL);
-    }
+/*URL
+----------------------------------------------------------------
+customize if automatic detection fails, e.g. when installation is hidden
+behind a proxy
+*/
+//$CANONICAL_RELATIVE_PATH_STUDIP = '/';
+//$ABSOLUTE_URI_STUDIP = 'https://www.studip.de/';
+//$ASSETS_URL = 'https://www.studip.de/assets/';
 
-    // Use autoproxy
-    if (getenv('AUTO_PROXY')) {
-        $ABSOLUTE_URI_STUDIP = $_SERVER['HTTP_X_FORWARDED_PROTO'].'://'.$_SERVER['HTTP_X_FORWARDED_HOST'].'/';
-        $ASSETS_URL = $ABSOLUTE_URI_STUDIP.'/assets/';
-    }
-    $MAIL_TRANSPORT = getenv('STUDIP_MAIL_TRANSPORT');
+// Set proxy url
+if (isset($_ENV['PROXY_URL'])) {
+    $ABSOLUTE_URI_STUDIP = $_ENV['PROXY_URL'];
+    $ASSETS_URL = $_ENV['PROXY_URL'].'/assets/';
+}
 
-    $CONTENT_LANGUAGES['en_GB'] = ['picture' => 'lang_en.gif', 'name' => 'English'];
+// Use autoproxy
+if (isset($_ENV['AUTO_PROXY'])) {
+    $ABSOLUTE_URI_STUDIP = $_SERVER['HTTP_X_FORWARDED_PROTO'].'://'.$_SERVER['HTTP_X_FORWARDED_HOST'].'/';
+    $ASSETS_URL = $ABSOLUTE_URI_STUDIP.'/assets/';
 }
+
+$CONTENT_LANGUAGES['en_GB'] = ['picture' => 'lang_en.gif', 'name' => 'English'];
diff --git a/tests/configuration.php b/tests/configuration.php
index f2ea461..523229f 100644
--- a/tests/configuration.php
+++ b/tests/configuration.php
@@ -1,11 +1,19 @@
 <?php
 
-return (function ($filename) {
-    if (file_exists($filename)) {
-        require_once $filename;
-
-        return compact('DB_STUDIP_HOST', 'DB_STUDIP_USER', 'DB_STUDIP_PASSWORD', 'DB_STUDIP_DATABASE');
+return (function (string ...$filenames) {
+    foreach ($filenames as $filename) {
+        if (file_exists($filename)) {
+            require_once $filename;
+        }
     }
 
-    return [];
-})(dirname(__DIR__).'/config/config_local.inc.php');
+    return array_filter([
+        'DB_STUDIP_HOST'     => $DB_STUDIP_HOST ?? null,
+        'DB_STUDIP_USER'     => $DB_STUDIP_USER ?? null,
+        'DB_STUDIP_PASSWORD' => $DB_STUDIP_PASSWORD ?? null,
+        'DB_STUDIP_DATABASE' => $DB_STUDIP_DATABASE ?? null,
+    ]);
+})(
+    dirname(__DIR__).'/config/config_defaults.inc.php',
+    dirname(__DIR__).'/config/config_local.inc.php'
+);
-- 
cgit v1.0


From 4e9e416671846d119fe9a0f9189d8e989076910e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 7 May 2024 12:09:51 +0000
Subject: fixes #4127

Closes #4127

Merge request studip/studip!2970
---
 app/views/course/forum/area/add.php         | 4 ++--
 app/views/course/forum/index/_last_post.php | 2 +-
 lib/classes/ForumActivity.php               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/course/forum/area/add.php b/app/views/course/forum/area/add.php
index 881c122..1449a5d 100644
--- a/app/views/course/forum/area/add.php
+++ b/app/views/course/forum/area/add.php
@@ -7,7 +7,7 @@
         <? else : ?>
             <? $num_postings = ForumVisit::getCount($entry['topic_id'], $visitdate) ?>
             <?= Icon::create('forum', $num_postings > 0 ? Icon::ROLE_ATTENTION : Icon::ROLE_INFO)->asImg([
-                'title' => ForumHelpers::getVisitText($num_postings, $entry['topic_id'], $constraint['depth']),
+                'title' => ForumHelpers::getVisitText($num_postings, $entry['topic_id']),
             ]) ?>
         <? endif ?>
     </td>
@@ -36,7 +36,7 @@
     </td>
 
     <td class="postings">
-        <?= number_format(max($entry['num_postings'] - 1, 0), 0, ',', '.') ?>
+        <?= number_format(max(($entry['num_postings'] ?? 0) - 1, 0), 0, ',', '.') ?>
     </td>
 
     <td class="answer hidden-tiny-down">
diff --git a/app/views/course/forum/index/_last_post.php b/app/views/course/forum/index/_last_post.php
index 3532d40..b5d854a 100644
--- a/app/views/course/forum/index/_last_post.php
+++ b/app/views/course/forum/index/_last_post.php
@@ -1,4 +1,4 @@
-<? if (is_array($entry['last_posting']) && count($entry['last_posting'])) : ?>
+<? if (!empty($entry['last_posting']) && is_array($entry['last_posting'])) : ?>
     <?= _('von') ?>
     <? if (!empty($entry['last_posting']['anonymous'])): ?>
         <?= _('Anonym') ?>
diff --git a/lib/classes/ForumActivity.php b/lib/classes/ForumActivity.php
index bc00cf1..a6a685d 100644
--- a/lib/classes/ForumActivity.php
+++ b/lib/classes/ForumActivity.php
@@ -124,7 +124,7 @@ class ForumActivity
             'mkdate'       => $post['mkdate'] ?? time()
         ];
 
-        if ($post['anonymous']) {
+        if (!empty($post['anonymous'])) {
             $data['actor_type'] = 'anonymous';
             $data['actor_id']   = '';
         }
-- 
cgit v1.0


From 95d79f130e55a68649f603df38a2b895c59d23ab Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 7 May 2024 13:47:43 +0000
Subject: prevent php-warnings, closes #4124

Closes #4124

Merge request studip/studip!2969
---
 app/controllers/admin/extern.php                           | 14 +++++++++-----
 app/views/institute/extern/extern_config/persondetails.php |  2 +-
 app/views/institute/extern/index.php                       |  2 +-
 app/views/institute/extern/upload.php                      |  2 +-
 lib/classes/StudipTreeNodeCachableTrait.php                |  2 +-
 lib/extern/ExternPage.php                                  |  5 +++--
 lib/extern/ExternPageTimetable.php                         |  3 ++-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/extern.php b/app/controllers/admin/extern.php
index 41833b1..559868e 100644
--- a/app/controllers/admin/extern.php
+++ b/app/controllers/admin/extern.php
@@ -66,8 +66,8 @@ class Admin_ExternController extends AuthenticatedController
         ExternPageConfig::findEachBySQL(
             function ($c) use (&$configs, &$count_not_migrated) {
                 $configs[$c->type][] = $c;
-                if (isset($c->conf['not_fixed_after_migration'])) { 
-                    $count_not_migrated++; 
+                if (isset($c->conf['not_fixed_after_migration'])) {
+                    $count_not_migrated++;
                 }
             },
             "range_id = ?", [$this->range]
@@ -165,7 +165,7 @@ class Admin_ExternController extends AuthenticatedController
                 if ($this->page->page_config->isNew()) {
                     PageLayout::postSuccess(sprintf(
                         _('Eine neue externe Seite "%$1s" vom Typ %$2s wurde angelegt.'),
-                        htmlReady($this->page->name), 
+                        htmlReady($this->page->name),
                         htmlReady($this->page->type)
                     ));
                 } else {
@@ -259,7 +259,11 @@ class Admin_ExternController extends AuthenticatedController
      */
     public function info_action(string $config_id)
     {
-        $this->page = ExternPage::get(ExternPageConfig::find($config_id));
+        $config = ExternPageConfig::find($config_id);
+        if (!$config) {
+            throw new Exception('ExternPageConfig object not found!');
+        }
+        $this->page = ExternPage::get($config);
         if ($this->page->author) {
             $this->author = '<a href="'
                 . URLHelper::getLink('dispatch.php/profile', ['username' => $this->page->author->username])
@@ -364,7 +368,7 @@ class Admin_ExternController extends AuthenticatedController
             $config->author_id = $config->editor_id = $GLOBALS['user']->id;
             $config->store();
             PageLayout::postSuccess(
-                sprintf(_('Die Konfiguration "%s" wurde erfolgreich importiert.'), 
+                sprintf(_('Die Konfiguration "%s" wurde erfolgreich importiert.'),
                 htmlReady($config->name)
             ));
         }
diff --git a/app/views/institute/extern/extern_config/persondetails.php b/app/views/institute/extern/extern_config/persondetails.php
index 311551d..897703d 100644
--- a/app/views/institute/extern/extern_config/persondetails.php
+++ b/app/views/institute/extern/extern_config/persondetails.php
@@ -85,7 +85,7 @@
             <select class="nested-select" name="semclass[]" multiple>
                 <? foreach ($GLOBALS['SEM_CLASS'] as $key => $sem_class) : ?>
                     <? if ($sem_class['show_browse']) : ?>
-                        <option value="<?= $key ?>"<?= in_array($key, $page->semclass) ? ' selected' : '' ?>>
+                        <option value="<?= $key ?>"<?= in_array($key, $page->semclass ?? []) ? ' selected' : '' ?>>
                             <?= htmlReady($sem_class['name']) ?>
                         </option>
                     <? endif ?>
diff --git a/app/views/institute/extern/index.php b/app/views/institute/extern/index.php
index 2fdf31e..a93d969 100644
--- a/app/views/institute/extern/index.php
+++ b/app/views/institute/extern/index.php
@@ -22,7 +22,7 @@ else : ?>
             </h1>
         </header>
         <? foreach ($config_types as $type_id => $config_type): ?>
-            <? if ($configs[$type_id]) : ?>
+            <? if (!empty($configs[$type_id])) : ?>
                 <article id="<?= $type_id ?>" <? if (Request::option('open_type') === $type_id) echo 'class="open"'; ?>>
                     <header>
                         <h1>
diff --git a/app/views/institute/extern/upload.php b/app/views/institute/extern/upload.php
index 92b2894..675f31a 100644
--- a/app/views/institute/extern/upload.php
+++ b/app/views/institute/extern/upload.php
@@ -16,7 +16,7 @@
             <div style="font-size: smaller;">
                 (<?= _('Ohne Angabe wird der Name aus den importierten Daten genommen.') ?>)
             </div>
-            <input type="text" name="config_name" value="<?= htmlReady($config_name) ?>">
+            <input type="text" name="config_name" value="<?= htmlReady($config_name ?? '') ?>">
         </label>
         <label>
             <?= _('Konfigurationsdatei') ?>
diff --git a/lib/classes/StudipTreeNodeCachableTrait.php b/lib/classes/StudipTreeNodeCachableTrait.php
index 31823ac..d40cf70 100644
--- a/lib/classes/StudipTreeNodeCachableTrait.php
+++ b/lib/classes/StudipTreeNodeCachableTrait.php
@@ -37,7 +37,7 @@ trait StudipTreeNodeCachableTrait
         return $config;
     }
 
-    protected function getDescendantIds(): array
+    public function getDescendantIds(): array
     {
         $cache = self::getDescendantsCacheArray();
 
diff --git a/lib/extern/ExternPage.php b/lib/extern/ExternPage.php
index 8ed0e96..d775bc4 100644
--- a/lib/extern/ExternPage.php
+++ b/lib/extern/ExternPage.php
@@ -138,7 +138,7 @@ abstract class ExternPage
             $extract[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
         }
         foreach ($extract as $one) {
-            $return[$one[0]] = $one[1];
+            $return[$one[0]] = $one[1] ?? null;
         }
         return $return;
     }
@@ -236,7 +236,7 @@ abstract class ExternPage
         $allowed_params = $this->getAllowedRequestParams(true);
         $config_fields = $this->getConfigFields(true);
         foreach ($allowed_params as $param_name) {
-            $method = $config_fields[$param_name] ?: 'get';
+            $method = $config_fields[$param_name] ?? 'get';
             $param_value = Request::$method($param_name);
             if ($param_value) {
                 $this->setValue($param_name, $param_value);
@@ -342,6 +342,7 @@ abstract class ExternPage
     ): string {
         if (count($scopes) > 0) {
             $study_areas = StudipStudyArea::findMany($scopes);
+
             $scopes = [];
             if ($with_kids) {
                 foreach ($study_areas as $study_area) {
diff --git a/lib/extern/ExternPageTimetable.php b/lib/extern/ExternPageTimetable.php
index d427600..5d8dfd9 100644
--- a/lib/extern/ExternPageTimetable.php
+++ b/lib/extern/ExternPageTimetable.php
@@ -162,7 +162,7 @@ class ExternPageTimetable extends ExternPage
         $time = new DateTime();
         switch ($this->date_offset) {
             case 'start_date':
-                $time = DateTime::createFromFormat('d.m.Y', $this->date);
+                $time = $this->date ? DateTime::createFromFormat('d.m.Y', $this->date) : $time;
                 break;
             case 'current_semester':
                 $semester = Semester::findCurrent();
@@ -228,6 +228,7 @@ class ExternPageTimetable extends ExternPage
     protected function getContent()
     {
         $count = 0;
+        $date_content = [];
         foreach ($this->getDates() as $date) {
             $day = new DateTime();
             $day->setTimestamp($date->date)->setTime(0, 0);
-- 
cgit v1.0


From 08d02aa1fe9bd0d1e7862137b7f1ff98dcbf66d2 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 7 May 2024 13:51:48 +0000
Subject: fixes #4128

Closes #4128

Merge request studip/studip!2971
---
 app/controllers/lvgruppen/lvgruppen.php             | 21 ++++++++++++---------
 app/controllers/module/module.php                   |  2 +-
 app/controllers/resources/ajax.php                  |  2 +-
 app/controllers/room_management/planning.php        |  8 ++++----
 app/controllers/search/studiengaenge.php            |  2 +-
 app/controllers/shared/contacts.php                 |  4 ++--
 app/views/course/wizard/steps/lvgroups/_node.php    |  2 +-
 app/views/fachabschluss/abschluesse/index.php       |  2 +-
 app/views/fachabschluss/faecher/fachbereiche.php    |  4 ++--
 app/views/lvgruppen/lvgruppen/details.php           |  2 +-
 app/views/materialien/files/add_dokument.php        |  6 +++---
 app/views/questionnaire/assign.php                  | 16 ++++++++--------
 app/views/resources/_common/_grouped_room_list.php  |  2 +-
 app/views/shared/contacts/add_ranges_to_contact.php |  4 ++--
 app/views/shared/contacts/details.php               |  2 +-
 app/views/shared/contacts/range.php                 |  2 +-
 lib/classes/MVV.class.php                           |  2 +-
 .../coursewizardsteps/BasicDataWizardStep.php       |  5 ++++-
 18 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/app/controllers/lvgruppen/lvgruppen.php b/app/controllers/lvgruppen/lvgruppen.php
index 5bac0fd..8562836 100644
--- a/app/controllers/lvgruppen/lvgruppen.php
+++ b/app/controllers/lvgruppen/lvgruppen.php
@@ -149,10 +149,12 @@ class Lvgruppen_LvgruppenController extends MVVController
             $semester = Semester::find($this->semester_filter);
             if ($semester && $semester->isCurrent()) {
                 $this->next_sem = Semester::findNext();
-                $this->display_semesters[] = $this->next_sem;
-                $this->courses = array_merge($this->courses,
-                    $this->lvgruppe->getAllAssignedCourses(false, $this->next_sem->id)
-                );
+                if ($this->next_sem) {
+                    $this->display_semesters[] = $this->next_sem;
+                    $this->courses = array_merge($this->courses,
+                        $this->lvgruppe->getAllAssignedCourses(false, $this->next_sem->id)
+                    );
+                }
             }
             $this->current_sem = $semester;
             $this->display_semesters[] = $semester;
@@ -451,7 +453,7 @@ class Lvgruppen_LvgruppenController extends MVVController
         );
         $widget->class = 'nested-select';
         $widget->addElement(
-            new SelectElement('select-none', _('Alle'), $selected_abschlussh === '')
+            new SelectElement('select-none', _('Alle'), $selected_abschluss === '')
         );
         $abschluesse = Abschluss::findBySQL(' 1 ORDER BY `name`');
         foreach ($abschluesse as $abschluss) {
@@ -533,11 +535,12 @@ class Lvgruppen_LvgruppenController extends MVVController
     private function set_trails_filter($start, $end)
     {
         // show only pathes with modules valid in the selected semester
-        ModuleManagementModelTreeItem::setObjectFilter('Modulteil',
+        ModuleManagementModelTreeItem::setObjectFilter(
+            Modulteil::class,
             function ($mt) use ($start, $end) {
-                $modul_start = Semester::find($mt->modul->start)->beginn ?: 0;
-                $modul_end = Semester::find($mt->modul->end)->ende ?: PHP_INT_MAX;
-                return ($modul_start <= $end && $modul_end >= $start);
+                $modul_start = Semester::find($mt->modul->start)->beginn ?? 0;
+                $modul_end = Semester::find($mt->modul->end)->ende ?? PHP_INT_MAX;
+                return $modul_start <= $end && $modul_end >= $start;
             }
         );
     }
diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php
index 2f6ba4c..e57156f 100644
--- a/app/controllers/module/module.php
+++ b/app/controllers/module/module.php
@@ -53,7 +53,7 @@ class Module_ModuleController extends MVVController
         if (count($search_result) > 0) {
             $module_ids = $search_result;
         } else {
-            if ($_SESSION['mvv_filter_module_fach_id']) {
+            if (!empty($_SESSION['mvv_filter_module_fach_id'])) {
                 $module_ids = $this->findModuleIdsByFach($_SESSION['mvv_filter_module_fach_id']);
             }
             if (!empty($_SESSION['mvv_filter_module_abschluss_id'])) {
diff --git a/app/controllers/resources/ajax.php b/app/controllers/resources/ajax.php
index 6ff3942..998acaf 100644
--- a/app/controllers/resources/ajax.php
+++ b/app/controllers/resources/ajax.php
@@ -190,7 +190,7 @@ class Resources_AjaxController extends AuthenticatedController
                 'resource_id' => $resource->id
             ];
             if (!$display_all_requests) {
-                $requests_sql .= "AND user_id = :user_id ";
+                $requests_sql .= " AND user_id = :user_id ";
                 $requests_sql_params['user_id'] = $current_user->id;
             }
 
diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php
index c450c64..1484bbb 100644
--- a/app/controllers/room_management/planning.php
+++ b/app/controllers/room_management/planning.php
@@ -38,7 +38,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         if ($selected_clipboard_id) {
             $_SESSION['selected_clipboard_id'] = $selected_clipboard_id;
         } else {
-            $selected_clipboard_id = $_SESSION['selected_clipboard_id'];
+            $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null;
         }
 
         $this->display_all_requests = Request::get('display_all_requests');
@@ -282,7 +282,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         if ($selected_clipboard_id) {
             $_SESSION['selected_clipboard_id'] = $selected_clipboard_id;
         } else {
-            $selected_clipboard_id = $_SESSION['selected_clipboard_id'];
+            $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null;
         }
 
         $this->display_all_requests = Request::get('display_all_requests');
@@ -411,7 +411,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         }
 
         //Check if a clipboard is selected:
-        $selected_clipboard_id = $_SESSION['selected_clipboard_id'];
+        $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null;
         $rooms = [];
         if ($selected_clipboard_id) {
             $clipboard = Clipboard::find($selected_clipboard_id);
@@ -1075,7 +1075,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         if ($selected_clipboard_id) {
             $_SESSION['selected_clipboard_id'] = $selected_clipboard_id;
         } else {
-            $selected_clipboard_id = $_SESSION['selected_clipboard_id'];
+            $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null;
         }
 
         //Get the selected date or use the current date, if none specified:
diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php
index a075ce9..ae27106 100644
--- a/app/controllers/search/studiengaenge.php
+++ b/app/controllers/search/studiengaenge.php
@@ -228,7 +228,7 @@ class Search_StudiengaengeController extends MVVController
             } else {
                 $this->active_sem = Semester::find($this->sessGet('selected_semester', Semester::findCurrent()->id));
             }
-            $this->active_sem = $this->semesters[$this->active_sem->id] ? $this->active_sem : null;
+            $this->active_sem = !empty($this->semesters[$this->active_sem->id]) ? $this->active_sem : null;
             if (!$this->active_sem && count($this->semesters)) {
                 $active_sem = reset($this->semesters);
                 $this->active_sem = Semester::find($active_sem['semester_id']);
diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php
index 98670f4..62dd7a8 100644
--- a/app/controllers/shared/contacts.php
+++ b/app/controllers/shared/contacts.php
@@ -725,7 +725,7 @@ class Shared_ContactsController extends MVVController
         $this->mvvcontact_id = $user_id;
 
         $this->selected_sem_end = $this->filter['end_sem.ende'];
-        $this->selected_inst = $this->filter['mvv_studiengang.institut_id'];
+        $this->selected_inst = $this->filter['mvv_studiengang.institut_id'] ?? null;
 
         if (Request::submitted('store')) {
             $selected = Request::getArray('ranges');
@@ -871,7 +871,7 @@ class Shared_ContactsController extends MVVController
         ));
         $filter = [
             'mvv_modul.stat'             => $stat,
-            'mvv_modul_inst.institut_id' => $this->filter['mvv_modul_inst.institut_id'],
+            'mvv_modul_inst.institut_id' => $this->filter['mvv_modul_inst.institut_id'] ?? '',
             'start_sem.beginn'           => $this->filter['start_sem.beginn'],
             'end_sem.ende'               => $this->filter['end_sem.ende']
         ];
diff --git a/app/views/course/wizard/steps/lvgroups/_node.php b/app/views/course/wizard/steps/lvgroups/_node.php
index 8b159bd..78db2f1 100644
--- a/app/views/course/wizard/steps/lvgroups/_node.php
+++ b/app/views/course/wizard/steps/lvgroups/_node.php
@@ -1,4 +1,4 @@
-<? if (!$search_result || in_array($node->id, $search_result)) : ?>
+<? if (empty($search_result) || in_array($node->id, $search_result)) : ?>
 <? $id = $node->id . '-' . $pos_id; ?>
     <? if (!count($children)) : ?>
         <li><?= _('Keine Module verfügbar') ?></li>
diff --git a/app/views/fachabschluss/abschluesse/index.php b/app/views/fachabschluss/abschluesse/index.php
index 6750a76..2b39000 100644
--- a/app/views/fachabschluss/abschluesse/index.php
+++ b/app/views/fachabschluss/abschluesse/index.php
@@ -14,7 +14,7 @@
             </tr>
         </thead>
         <? foreach ($abschluesse as $abschluss) : ?>
-        <tbody class="<?= $abschluss->count_faecher ? '' : 'empty' ?> <?= ($abschluss_id ? 'not-collapsed' : 'collapsed') ?>">
+        <tbody class="<?= $abschluss->count_faecher ? '' : 'empty' ?> <?= !empty($abschluss_id) ? 'not-collapsed' : 'collapsed' ?>">
         <tr class="header-row">
             <td class="toggle-indicator">
                 <? if ($abschluss->count_faecher) : ?>
diff --git a/app/views/fachabschluss/faecher/fachbereiche.php b/app/views/fachabschluss/faecher/fachbereiche.php
index 5a4f6f1..844440c 100644
--- a/app/views/fachabschluss/faecher/fachbereiche.php
+++ b/app/views/fachabschluss/faecher/fachbereiche.php
@@ -10,7 +10,7 @@
     </thead>
     <? foreach ($fachbereiche as $fachbereich): ?>
         <? if ($fachbereich['faecher']) : ?>
-            <tbody class="<?= ($fachbereich_id === $fachbereich['institut_id'] ? 'not-collapsed' : 'collapsed') ?>">
+            <tbody class="<?= isset($fachbereich_id) && $fachbereich_id === $fachbereich['institut_id'] ? 'not-collapsed' : 'collapsed' ?>">
                 <tr class="header-row">
                     <td class="toggle-indicator">
                         <a class="mvv-load-in-new-row"
@@ -18,7 +18,7 @@
                     </td>
                     <td style="text-align: center;" class="dont-hide"><?= htmlReady($fachbereich['faecher']) ?> </td>
                 </tr>
-                <? if ($fachbereich_id === $fachbereich['institut_id']) : ?>
+                <? if (isset($fachbereich_id) && $fachbereich_id === $fachbereich['institut_id']): ?>
                     <tr class="loaded-details nohover">
                         <?= $this->render_partial('fachabschluss/faecher/details_fachbereich', compact('fach')) ?>
                     </tr>
diff --git a/app/views/lvgruppen/lvgruppen/details.php b/app/views/lvgruppen/lvgruppen/details.php
index 073d552..6a9c3af 100644
--- a/app/views/lvgruppen/lvgruppen/details.php
+++ b/app/views/lvgruppen/lvgruppen/details.php
@@ -92,7 +92,7 @@
                 <? else : ?>
                     <ul style="list-style-type:none;" id="mvv-lvgruppen-semester">
                         <? foreach ($display_semesters as $semester) : ?>
-                            <? if ($courses[$semester->id]) : ?>
+                            <? if (!empty($courses[$semester->id])) : ?>
                                 <li>
                                     <strong><?= htmlReady($semester->name) ?></strong>
                                     <ul style="list-style-type:none;">
diff --git a/app/views/materialien/files/add_dokument.php b/app/views/materialien/files/add_dokument.php
index e53d917..3b706e9 100644
--- a/app/views/materialien/files/add_dokument.php
+++ b/app/views/materialien/files/add_dokument.php
@@ -35,7 +35,7 @@
         </tr>
         <tr>
             <td>
-                <div class="attachments" style="<?= (!$documents || !key_exists($key, $documents))  ? '' : 'display: none;'?>">
+                <div class="attachments" style="<?= (empty($documents) || !array_key_exists($key, $documents))  ? '' : 'display: none;'?>">
                     <span style="cursor:pointer;" onClick="$('#fileselector_<?= $key; ?>').toggle();$(this).toggle();">
                         <?= Icon::create('add', Icon::ROLE_CLICKABLE, ['title' => _("Datei hinzufügen"), 'class' => 'text-bottom']); ?>
                         <?= _("Datei hinzufügen") ?>
@@ -43,11 +43,11 @@
                     <div id="fileselector_<?= $key; ?>" style="display:none;">
                         <ul class="stgfiles list-unstyled">
                             <li style="display: none;" class="stgfile">
-                                <input type="hidden" name="document_id" id="document_id" value="<?= htmlReady($document_id) ?>">
+                                <input type="hidden" name="document_id" id="document_id" value="<?= htmlReady($document_id ?? '') ?>">
                                 <span class="icon"></span>
                                 <span class="name"></span>
                                 <span class="size"></span>
-                                <a class="remove_attachment"><?= Icon::create('trash', 'clickable')->asImg(['class' => "text-bottom"]) ?></a>
+                                <a class="remove_attachment"><?= Icon::create('trash')->asImg(['class' => 'text-bottom']) ?></a>
                             </li>
                         </ul>
                         <div id="statusbar_container">
diff --git a/app/views/questionnaire/assign.php b/app/views/questionnaire/assign.php
index 4bf7fc5..5299a83 100644
--- a/app/views/questionnaire/assign.php
+++ b/app/views/questionnaire/assign.php
@@ -10,8 +10,8 @@
                     <select name="semester_id">
                         <? foreach ($available_semesters as $available_semester): ?>
                             <option value="<?= htmlReady($available_semester->id) ?>"
-                                    <?= ($available_semester->id == $semester_id)
-                                      ? 'selected="selected"'
+                                    <?= isset($semester_id) && $available_semester->id == $semester_id
+                                      ? 'selected'
                                       : ''
                                     ?>>
                                 <?= htmlReady($available_semester->name) ?>
@@ -24,13 +24,13 @@
                     (<?= _('optional') ?>)
                     <select name="institute_id">
                         <option value=""
-                                <?= ($institute_id == '' ? 'selected="selected"' : '') ?>>
+                                <?= empty($institute_id) ? 'selected' : '' ?>>
                                 <?= _('(bitte wählen)') ?>
                         </option>
                         <? foreach ($available_institutes as $available_institute): ?>
                             <option value="<?= htmlReady($available_institute['Institut_id']) ?>"
-                                    <?= ($available_institute['Institut_id'] == $institute_id)
-                                      ? 'selected="selected"'
+                                    <?= isset($institute_id) && $available_institute['Institut_id'] == $institute_id
+                                      ? 'selected'
                                       : ''
                                     ?>>
                                 <?= htmlReady($available_institute['Name']) ?>
@@ -43,13 +43,13 @@
                     (<?= _('optional') ?>)
                     <select name="course_type_id">
                         <option value=""
-                                <?= ($course_type_id == '' ? 'selected="selected"' : '') ?>>
+                                <?= empty($course_type_id) ? 'selected' : '' ?>>
                             <?= dgettext('AskALotPlugin', '(bitte wählen)') ?>
                         </option>
                         <? foreach ($available_course_types as $available_course_type): ?>
                             <option value="<?= htmlReady($available_course_type['id']) ?>"
-                                    <?= ($available_course_type['id'] == $course_type_id)
-                                      ? 'selected="selected"'
+                                    <?= isset($course_type_id) && $available_course_type['id'] == $course_type_id
+                                      ? 'selected'
                                       : ''
                                     ?>>
                                 <?= htmlReady($available_course_type['name']) ?>
diff --git a/app/views/resources/_common/_grouped_room_list.php b/app/views/resources/_common/_grouped_room_list.php
index f3d6b62..a27af17 100644
--- a/app/views/resources/_common/_grouped_room_list.php
+++ b/app/views/resources/_common/_grouped_room_list.php
@@ -64,7 +64,7 @@
                                                 <? if ($user) :?>
                                                     <?
                                                     $perms = [
-                                                        'show_global_admin_actions' => $show_global_admin_actions,
+                                                        'show_global_admin_actions' => $show_global_admin_actions ?? false,
                                                         'show_admin_actions'        => $resource->userHasPermission($user, 'admin'),
                                                         'show_tutor_actions'        => $resource->userHasPermission($user, 'tutor'),
                                                         'show_autor_actions'        => $resource->userHasPermission($user, 'autor'),
diff --git a/app/views/shared/contacts/add_ranges_to_contact.php b/app/views/shared/contacts/add_ranges_to_contact.php
index 389e72c..0f4ae3f 100644
--- a/app/views/shared/contacts/add_ranges_to_contact.php
+++ b/app/views/shared/contacts/add_ranges_to_contact.php
@@ -16,7 +16,7 @@
         <select style="display: inline-block;" name="ansp_typ">
             <option value=""<?= empty($ansp_typ) ? ' selected' : '' ?>></option>
         <? foreach ($GLOBALS['MVV_CONTACTS']['TYPE']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == $ansp_typ ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= $key ?>"<?= isset($ansp_typ) && $key == $ansp_typ ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
         <? endforeach; ?>
         </select>
     </label>
@@ -26,7 +26,7 @@
         <?= _('Kategorie') ?>
         <select style="display: inline-block;" name="ansp_kat">
         <? foreach (MvvContactRange::getCategoriesByRangetype($range_type) as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == $ansp_kat ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= $key ?>"<?= isset($ansp_kat) && $key == $ansp_kat ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
         <? endforeach; ?>
         </select>
     </label>
diff --git a/app/views/shared/contacts/details.php b/app/views/shared/contacts/details.php
index f39d200..a4605ce 100644
--- a/app/views/shared/contacts/details.php
+++ b/app/views/shared/contacts/details.php
@@ -45,7 +45,7 @@
                                     </td>
                                     <? if ($object_type === 'Studiengang') : ?>
                                     <td>
-                                        <?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$rel['type']]['name']); ?>
+                                        <?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$rel['type']]['name'] ?? ''); ?>
                                     </td>
                                     <? endif; ?>
                                     <td>
diff --git a/app/views/shared/contacts/range.php b/app/views/shared/contacts/range.php
index d66c494..f58b286 100644
--- a/app/views/shared/contacts/range.php
+++ b/app/views/shared/contacts/range.php
@@ -40,7 +40,7 @@
             <td><?= htmlReady($mvv_contact->position); ?></td>
             <td><?= htmlReady($mvv_contact->name) ?></td>
         <? if($range_type !== 'Modul'): ?>
-            <td><?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$mvv_contact->type]['name']) ?></td>
+            <td><?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$mvv_contact->type]['name'] ?? '') ?></td>
         <? endif; ?>
             <td><?= htmlReady($mvv_contact->getCategoryDisplayname()); ?></td>
             <td ><?= htmlReady($mvv_contact->count_relations); ?></td>
diff --git a/lib/classes/MVV.class.php b/lib/classes/MVV.class.php
index 67bbbeb..517514c 100644
--- a/lib/classes/MVV.class.php
+++ b/lib/classes/MVV.class.php
@@ -843,7 +843,7 @@ class MVV implements Loggable {
     public static function getContentLanguageImagePath($language): string
     {
         $content_language = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]['content_language'];
-        return 'languages/' . ($GLOBALS['CONTENT_LANGUAGES'][$content_language]?$GLOBALS['CONTENT_LANGUAGES'][$content_language]['picture']:'lang_' . mb_strtolower($language) . '.gif');
+        return 'languages/' . ($GLOBALS['CONTENT_LANGUAGES'][$content_language]['picture'] ?? 'lang_' . mb_strtolower($language) . '.gif');
     }
 
 }
diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index 58fb09f..6a1438f 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -620,7 +620,10 @@ class BasicDataWizardStep implements CourseWizardStep
 
                 }
             }
-
+        } else {
+            foreach ($indices as $index) {
+                $values[$index] = $values[$index] ?? '';
+            }
         }
 
         return $values;
-- 
cgit v1.0


From 59c6b7f62e2d3d27cd1a4027cd18be5b9a21f64e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 7 May 2024 16:04:05 +0200
Subject: re #4128

---
 app/views/course/wizard/steps/basicdata/index.php |  2 +-
 lib/classes/SemClass.class.php                    | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/course/wizard/steps/basicdata/index.php b/app/views/course/wizard/steps/basicdata/index.php
index e1f10a4..f19643a 100644
--- a/app/views/course/wizard/steps/basicdata/index.php
+++ b/app/views/course/wizard/steps/basicdata/index.php
@@ -123,7 +123,7 @@
     </div>
 </section>
 
-<?php if ($dsearch) : ?>
+<?php if (isset($dsearch)) : ?>
 <section>
     <label for="deputy_id_3">
         <?= _('Vertretungen') ?>
diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php
index c4a2c26..63be920 100644
--- a/lib/classes/SemClass.class.php
+++ b/lib/classes/SemClass.class.php
@@ -304,9 +304,11 @@ class SemClass implements ArrayAccess
     public function isModuleAllowed($modulename)
     {
         return !$this->isModuleForbidden($modulename)
-            && (empty($this->data['modules'][$modulename])
-            || !$this->data['modules'][$modulename]['sticky']
-            || $this->data['modules'][$modulename]['activated']);
+            && (
+                empty($this->data['modules'][$modulename])
+                || empty($this->data['modules'][$modulename]['sticky'])
+                || !empty($this->data['modules'][$modulename]['activated'])
+            );
     }
 
     /**
@@ -317,8 +319,8 @@ class SemClass implements ArrayAccess
     public function isModuleMandatory($module)
     {
         return isset($this->data['modules'][$module])
-            && $this->data['modules'][$module]['sticky']
-            && $this->data['modules'][$module]['activated'];
+            && !empty($this->data['modules'][$module]['sticky'])
+            && !empty($this->data['modules'][$module]['activated']);
     }
 
     public function getSemTypes()
-- 
cgit v1.0


From 2c4c41a7733923cbd0f9f93eb7c90ad412efda1f Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Tue, 7 May 2024 18:31:11 +0000
Subject: Resolve "edu-sharing/auth-plugin umstellen auf composer"

Closes #4120

Merge request studip/studip!2964
---
 cli/Commands/Twillo/PrivateKeys.php                |   6 +-
 composer.json                                      |   3 +-
 composer.lock                                      |  52 +++++-
 lib/bootstrap-autoload.php                         |  18 --
 lib/classes/TwilloConnector.php                    |   8 +-
 .../edu-sharing-plugin/edu-sharing-auth-helper.php | 107 ------------
 .../edu-sharing-helper-abstract.php                |  43 -----
 .../edu-sharing-plugin/edu-sharing-helper-base.php |  45 -----
 vendor/edu-sharing-plugin/edu-sharing-helper.php   |  47 ------
 .../edu-sharing-plugin/edu-sharing-node-helper.php | 184 ---------------------
 vendor/edu-sharing-plugin/example/example-api.php  |  59 -------
 vendor/edu-sharing-plugin/example/example.php      |  49 ------
 vendor/edu-sharing-plugin/example/index.html       | 120 --------------
 vendor/edu-sharing-plugin/readme.md                |   1 -
 14 files changed, 59 insertions(+), 683 deletions(-)
 delete mode 100644 vendor/edu-sharing-plugin/edu-sharing-auth-helper.php
 delete mode 100644 vendor/edu-sharing-plugin/edu-sharing-helper-abstract.php
 delete mode 100644 vendor/edu-sharing-plugin/edu-sharing-helper-base.php
 delete mode 100644 vendor/edu-sharing-plugin/edu-sharing-helper.php
 delete mode 100644 vendor/edu-sharing-plugin/edu-sharing-node-helper.php
 delete mode 100644 vendor/edu-sharing-plugin/example/example-api.php
 delete mode 100644 vendor/edu-sharing-plugin/example/example.php
 delete mode 100644 vendor/edu-sharing-plugin/example/index.html
 delete mode 100644 vendor/edu-sharing-plugin/readme.md

diff --git a/cli/Commands/Twillo/PrivateKeys.php b/cli/Commands/Twillo/PrivateKeys.php
index 06dd121..c517e5b 100644
--- a/cli/Commands/Twillo/PrivateKeys.php
+++ b/cli/Commands/Twillo/PrivateKeys.php
@@ -2,7 +2,7 @@
 namespace Studip\Cli\Commands\Twillo;
 
 use Config;
-use EduSharingHelper;
+use \EduSharingApiClient\EduSharingHelper;
 use Studip\Cli\Commands\AbstractCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -32,13 +32,13 @@ final class PrivateKeys extends AbstractCommand
             $key = EduSharingHelper::generateKeyPair();
             $success = file_put_contents(
                 $properties,
-                EduSharingHelper::generateEduAppXMLData($appId, $key['publickey'])
+                EduSharingHelper::generateEduAppXMLData($appId, $key['publicKey'])
             );
 
             if ($success !== false) {
                 file_put_contents(
                     $privateKey,
-                    $key['privatekey']
+                    $key['privateKey']
                 );
                 Config::get()->store('OERCAMPUS_TWILLO_APPID', $appId);
 
diff --git a/composer.json b/composer.json
index 64ed048..e4d1902 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,8 @@
         "phpoffice/phpspreadsheet": "^1.19",
         "psy/psysh": "^0.12.2",
         "okvpn/clock-lts": "^1.0",
-        "vlucas/phpdotenv": "^5.6"
+        "vlucas/phpdotenv": "^5.6",
+        "edu-sharing/auth-plugin": "8.0.x-dev"
     },
     "replace": {
         "symfony/polyfill-php73": "*",
diff --git a/composer.lock b/composer.lock
index c469e1e..ffde9ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "69b82b7aa6db216cb8afdb9da520b4e7",
+    "content-hash": "535218b1c9cca9acd1f2c554c59e5113",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -296,6 +296,53 @@
             "time": "2023-06-19T06:10:36+00:00"
         },
         {
+            "name": "edu-sharing/auth-plugin",
+            "version": "8.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/edu-sharing/php-auth-plugin.git",
+                "reference": "4dc40c400afea63bd75ddd5ad4cea8033e477e72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/edu-sharing/php-auth-plugin/zipball/4dc40c400afea63bd75ddd5ad4cea8033e477e72",
+                "reference": "4dc40c400afea63bd75ddd5ad4cea8033e477e72",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-openssl": "*",
+                "php": ">= 8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "EduSharingApiClient\\": "src/EduSharing"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "Torsten Simon",
+                    "email": "simon@edu-sharing.net"
+                }
+            ],
+            "description": "Plugin to provide authentification via Auth By App with a edu-sharing repository",
+            "support": {
+                "issues": "https://github.com/edu-sharing/php-auth-plugin/issues",
+                "source": "https://github.com/edu-sharing/php-auth-plugin/tree/8.0"
+            },
+            "time": "2024-04-02T10:02:58+00:00"
+        },
+        {
             "name": "ezyang/htmlpurifier",
             "version": "v4.17.0",
             "source": {
@@ -7829,7 +7876,8 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "phpxmlrpc/extras": 10
+        "phpxmlrpc/extras": 10,
+        "edu-sharing/auth-plugin": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index eb9ac12..4e63115 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -88,21 +88,3 @@ StudipAutoloader::addClassLookup(
     ['xmlrpc_server'],
     'composer/phpxmlrpc/phpxmlrpc/lib/xmlrpcs.inc'
 );
-
-//Edu-Sharing helper classes for twillo connector
-StudipAutoloader::addClassLookup(
-    'EduSharingHelper',
-    'vendor/edu-sharing-plugin/edu-sharing-helper.php'
-);
-StudipAutoloader::addClassLookup(
-    'EduSharingHelperBase',
-    'vendor/edu-sharing-plugin/edu-sharing-helper-base.php'
-);
-StudipAutoloader::addClassLookup(
-    'EduSharingAuthHelper',
-    'vendor/edu-sharing-plugin/edu-sharing-auth-helper.php'
-);
-StudipAutoloader::addClassLookup(
-    'EduSharingNodeHelper',
-    'vendor/edu-sharing-plugin/edu-sharing-node-helper.php'
-);
diff --git a/lib/classes/TwilloConnector.php b/lib/classes/TwilloConnector.php
index 7a57583..40ceff8 100644
--- a/lib/classes/TwilloConnector.php
+++ b/lib/classes/TwilloConnector.php
@@ -50,14 +50,14 @@ class TwilloConnector
     public static function uploadMaterial(OERMaterial $material, $user_id = null)
     {
         $user_id || $user_id = User::findCurrent()->id;
-        $base = new EduSharingHelperBase(
+        $base = new \EduSharingApiClient\EduSharingHelperBase(
             self::$twillo_base_url,
             file_get_contents($GLOBALS['STUDIP_BASE_PATH']."/config/twillo-private.key"),
             Config::get()->OERCAMPUS_TWILLO_APPID,
             self::getHttpProxy()
         // 'data-quest-Test'
         );
-        $authHelper = new EduSharingAuthHelper($base);
+        $authHelper = new \EduSharingApiClient\EduSharingAuthHelper($base);
         if (!static::$ticket) {
             static::$ticket = $authHelper->getTicketForUser(TwilloConnector::getTwilloUserID($user_id));
         }
@@ -261,13 +261,13 @@ class TwilloConnector
     {
         $user_id || $user_id = User::findCurrent()->id;
 
-        $base = new EduSharingHelperBase(
+        $base = new \EduSharingApiClient\EduSharingHelperBase(
             self::$twillo_base_url,
             file_get_contents($GLOBALS['STUDIP_BASE_PATH']."/config/twillo-private.key"),
             Config::get()->OERCAMPUS_TWILLO_APPID,
             self::getHttpProxy()// 'data-quest-Test'
         );
-        $authHelper = new EduSharingAuthHelper($base);
+        $authHelper = new \EduSharingApiClient\EduSharingAuthHelper($base);
         if (!static::$ticket) {
             static::$ticket = $authHelper->getTicketForUser(TwilloConnector::getTwilloUserID($user_id));
         }
diff --git a/vendor/edu-sharing-plugin/edu-sharing-auth-helper.php b/vendor/edu-sharing-plugin/edu-sharing-auth-helper.php
deleted file mode 100644
index ef9dec1..0000000
--- a/vendor/edu-sharing-plugin/edu-sharing-auth-helper.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-require_once "edu-sharing-helper-abstract.php";
-
-class EduSharingAuthHelper extends EduSharingHelperAbstract  {
-
-    /**
-     * Gets detailed information about a ticket
-     * Will throw an exception if the given ticket is not valid anymore
-     * @param string $ticket
-     * The ticket, obtained by @getTicketForUser
-     * @return array
-     * Detailed information about the current session
-     * @throws Exception
-     * Thrown if the ticket is not valid anymore
-     */
-    public function getTicketAuthenticationInfo(string $ticket) {
-        $curl = curl_init($this->base->baseUrl . '/rest/authentication/v1/validateSession');
-        curl_setopt_array($curl, [
-            CURLOPT_HTTPHEADER => [
-                $this->getRESTAuthenticationHeader($ticket),
-                'Accept: application/json',
-                'Content-Type: application/json',
-            ],
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_CONNECTTIMEOUT => 5,
-            CURLOPT_TIMEOUT => 5
-        ]);
-        if ($this->base->http_proxy) {
-            curl_setopt($curl, CURLOPT_PROXY, $this->base->http_proxy);
-        }
-        $data = json_decode(curl_exec($curl), true);
-        curl_close($curl);
-        if ( is_null( $data ) ) {
-            throw new Exception( 'No answer from repository. Possibly a timeout while trying to connect' );
-        }
-        if($data['statusCode'] !== 'OK') {
-            throw new Exception('The given ticket is not valid anymore');
-        }
-        return $data;
-    }
-
-    /**
-     * Fetches the edu-sharing ticket for a given username
-     * @param string $username
-     * The username you want to generate a ticket for
-     * @return string
-     * The ticket, which you can use as an authentication header, see @getRESTAuthenticationHeader
-     * @throws Exception
-     */
-    public function getTicketForUser(string $username, $bodyparams = null) {
-        if ($bodyparams === null) {
-            $bodyparams = [
-                "primaryAffiliation" => "employee",
-                "skills" => [
-                    "string"
-                ],
-                "types" => [
-                    "string"
-                ],
-                "extendedAttributes" => [
-                    'affiliation' => ["employee"]
-                ],
-                "vcard" => "string",
-                "firstName" => User::findCurrent()->vorname,
-                "lastName" => User::findCurrent()->nachname,
-                "email" => User::findCurrent()->email,
-                "avatar" => "string",
-                "about" => "string"
-            ];
-        }
-        $curl = curl_init($this->base->baseUrl . '/rest/authentication/v1/appauth/' . rawurlencode($username));
-        curl_setopt_array($curl, [
-            CURLOPT_POST => 1,
-            CURLOPT_FAILONERROR => false,
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_HTTPHEADER => $this->getSignatureHeaders($username),
-            CURLOPT_CONNECTTIMEOUT => 5,
-            CURLOPT_TIMEOUT => 5
-        ]);
-        curl_setopt(
-            $curl,
-            CURLOPT_POSTFIELDS,
-            is_array($bodyparams) ? json_encode($bodyparams) : (string) $bodyparams
-        );
-        if ($this->base->http_proxy) {
-            curl_setopt($curl, CURLOPT_PROXY, $this->base->http_proxy);
-        }
-
-        $output = curl_exec($curl);
-        $data = json_decode($output, true);
-
-        $err     = curl_errno( $curl );
-        $info = curl_getinfo($curl);
-        curl_close($curl);
-        if ($err === 0 && $info["http_code"] === 200 && $data['userId'] === $username) {
-            return $data['ticket'];
-        } else {
-            if ( is_null( $data ) ) {
-                $data = ['error' => $output];
-            }
-            throw new Exception(
-                'edu-sharing ticket could not be retrieved: HTTP-Code ' .
-                $info["http_code"] . ': ' . $data['error']
-            );
-        }
-    }
-}
diff --git a/vendor/edu-sharing-plugin/edu-sharing-helper-abstract.php b/vendor/edu-sharing-plugin/edu-sharing-helper-abstract.php
deleted file mode 100644
index d531eec..0000000
--- a/vendor/edu-sharing-plugin/edu-sharing-helper-abstract.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-abstract class EduSharingHelperAbstract {
-    protected $base;
-    public function __construct(
-        EduSharingHelperBase $base
-    ) {
-        $this->base = $base;
-    }
-
-    /**
-     * Generates the header to use for a given ticket to authenticate with any edu-sharing api endpoint
-     * @param string $ticket
-     * The ticket, obtained by @getTicketForUser
-     * @return string
-     */
-    public function getRESTAuthenticationHeader(string $ticket) {
-        return 'Authorization: EDU-TICKET ' . $ticket;
-    }
-
-
-    protected function getSignatureHeaders(
-        string $signString,
-        $accept = 'application/json',
-        $contentType = 'application/json'
-    ) {
-        $ts = time() * 1000;
-        $toSign = $this->base->appId . $signString . $ts;
-        $signature = $this->sign($toSign);
-        return [
-            'Accept: ' . $accept,
-            'Content-Type: ' . $contentType,
-            'X-Edu-App-Id: ' . $this->base->appId,
-            'X-Edu-App-Signed: ' . $toSign,
-            'X-Edu-App-Sig: ' . $signature,
-            'X-Edu-App-Ts: ' . $ts,
-        ];
-    }
-
-    protected function sign(string $toSign) {
-        return $this->base->sign($toSign);
-    }
-}
\ No newline at end of file
diff --git a/vendor/edu-sharing-plugin/edu-sharing-helper-base.php b/vendor/edu-sharing-plugin/edu-sharing-helper-base.php
deleted file mode 100644
index 4c6f6da..0000000
--- a/vendor/edu-sharing-plugin/edu-sharing-helper-base.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-class EduSharingHelperBase {
-    public $baseUrl;
-    public $privateKey;
-    public $appId;
-    public $language = 'de';
-    public $http_proxy = '';
-
-    /**
-     * @param string $baseUrl
-     * The base url to your repository in the format "http://<host>/edu-sharing"
-     * @param string $privateKey
-     * Your app's private key. This must match the public key registered in the repo
-     * @param string $appId
-     * Your app id name (as registered in the edu-sharing repository)
-     */
-    public function __construct(
-        string $baseUrl,
-        string $privateKey,
-        string $appId,
-        string $http_proxy = ''
-    ) {
-        if(!preg_match('/^([a-z]|[A-Z]|[0-9]|[-_])+$/', $appId)) {
-            throw new Exception('The given app id contains invalid characters or symbols');
-        }
-        $this->baseUrl=$baseUrl;
-        $this->privateKey=$privateKey;
-        $this->appId=$appId;
-        $this->http_proxy = $http_proxy;
-    }
-
-    public function setLanguage(string $language) {
-        $this->language = $language;
-    }
-
-    function sign(string $toSign) {
-        $pkeyid = openssl_get_privatekey($this->privateKey);
-        openssl_sign($toSign, $signature, $pkeyid);
-        $signature = base64_encode($signature);
-        openssl_free_key($pkeyid);
-        return $signature;
-    }
-
-}
diff --git a/vendor/edu-sharing-plugin/edu-sharing-helper.php b/vendor/edu-sharing-plugin/edu-sharing-helper.php
deleted file mode 100644
index 3c9d884..0000000
--- a/vendor/edu-sharing-plugin/edu-sharing-helper.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class EduSharingHelper {
-    /**
-     * generate a new key pair (private + public) to be registered in the edu-sharing repository
-     * Store the data somewhere in your application, e.g. database
-     * use the public key returned to register the application in edu-sharing
-     * NOTE: This function will fail on windows-based systems!
-     * @throws Exception
-     */
-    public static function generateKeyPair(
-    )
-    {
-        $res = openssl_pkey_new();
-        if(!$res) {
-            throw new Exception("No result from openssl_pkey_new. Please check your php installation");
-        }
-        openssl_pkey_export($res, $privatekey);
-        $publickey = openssl_pkey_get_details($res);
-        $publickey = $publickey["key"];
-        return [
-            "privatekey" => $privatekey,
-            "publickey" => $publickey
-        ];
-    }
-
-    /**
-     * Generates an edu-sharing compatible xml file for registering the application
-     * This is a very basic function and is only intended for demonstration or manual use. Data is not escaped!
-     */
-    public static function generateEduAppXMLData(string $appId, string $publickey, string $type = 'LMS', string $publicIP = '*') {
-        return '<?xml version="1.0" encoding="UTF-8"?>
-                <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-                <properties>
-                    <entry key="appid">' . $appId . '</entry>
-                    <entry key="public_key">' . $publickey . '</entry>
-                    <entry key="type">' . $type . '</entry>
-                    <entry key="domain"></entry>
-                    <!-- in case of wildcard host: Replace this, if possible, with the public ip from your service --> 
-                    <entry key ="host">' . $publicIP . '</entry>
-                    <!-- must be true -->
-                    <entry key="trustedclient">true</entry> 
-                </properties>
-                ';
-    }
-
-}
\ No newline at end of file
diff --git a/vendor/edu-sharing-plugin/edu-sharing-node-helper.php b/vendor/edu-sharing-plugin/edu-sharing-node-helper.php
deleted file mode 100644
index 6c7a18e..0000000
--- a/vendor/edu-sharing-plugin/edu-sharing-node-helper.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-require_once "edu-sharing-helper-abstract.php";
-
-class DisplayMode {
-    const Inline = 'inline';
-    const Embed = 'embed';
-    const Dynamic = 'dynamic';
-}
-class Usage {
-    public $nodeId;
-    public $nodeVersion;
-    public $containerId;
-    public $resourceId;
-    public $usageId;
-
-    public function __construct($nodeId, $nodeVersion, $containerId, $resourceId, $usageId)
-    {
-        $this->nodeId = $nodeId;
-        $this->nodeVersion = $nodeVersion;
-        $this->containerId = $containerId;
-        $this->resourceId = $resourceId;
-        $this->usageId = $usageId;
-    }
-
-}
-class EduSharingNodeHelper extends EduSharingHelperAbstract  {
-    /**
-     * creates a usage for a given node
-     * The given usage can later be used to fetch this node REGARDLESS of the actual user
-     * The usage gives permanent access to this node and acts similar to a license
-     * In order to be able to create an usage for a node, the current user (provided via the ticket)
-     * MUST have CC_PUBLISH permissions on the given node id
-     * @param string $ticket
-     * A ticket with the user session who is creating this usage
-     * @param string $containerId
-     * A unique page / course id this usage refers to inside your system (e.g. a database id of the page you include the usage)
-     * @param string $resourceId
-     * The individual resource id on the current page or course this object refers to
-     * (you may enumerate or use unique UUID's)
-     * @param string $nodeId
-     * The edu-sharing node id the usage shall be created for
-     * @param string|null $nodeVersion
-     * Optional: The fixed version this usage should refer to
-     * If you leave it empty, the usage will always refer to the latest version of the node
-     * @return Usage
-     * An usage element you can use with @getNodeByUsage
-     * Keep all data of this object stored inside your system!
-     */
-    public function createUsage(
-        string $ticket,
-        string $containerId,
-        string $resourceId,
-        string $nodeId,
-        string $nodeVersion = null
-    ) {
-        $curl = curl_init($this->base->baseUrl . '/rest/usage/v1/usages/repository/-home-');
-        $headers = $this->getSignatureHeaders($ticket);
-        $headers[] = $this->getRESTAuthenticationHeader($ticket);
-        curl_setopt_array($curl, [
-            CURLOPT_FAILONERROR => false,
-            CURLOPT_POST => 1,
-            CURLOPT_POSTFIELDS => json_encode([
-                'appId' => $this->base->appId,
-                'courseId' => $containerId,
-                'resourceId' => $resourceId,
-                'nodeId' => $nodeId,
-                'nodeVersion' => $nodeVersion,
-            ]),
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_HTTPHEADER => $headers
-        ]);
-        if ($this->base->http_proxy) {
-            curl_setopt($curl, CURLOPT_PROXY, $this->base->http_proxy);
-        }
-        $data = json_decode(curl_exec($curl), true);
-        $err     = curl_errno( $curl );
-        $info = curl_getinfo($curl);
-        curl_close($curl);
-        if ($err === 0 && $info["http_code"] === 200) {
-            return new Usage(
-                $data['parentNodeId'],
-                $nodeVersion,
-                $containerId,
-                $resourceId,
-                $data['nodeId']
-            );
-        } else {
-            throw new Exception('creating usage failed ' .
-                $info["http_code"] . ': ' . $data['error'] . ' ' . $data['message']);
-        }
-
-    }
-
-    /**
-     * Loads the edu-sharing node refered by a given usage
-     * @param Usage $usage
-     * The usage, as previously returned by @createUsage
-     * @param string $displayMode
-     * The displayMode
-     * This will ONLY change the content representation inside the "detailsSnippet" return value
-     * @param array $renderingParams
-     * @return mixed
-     * Returns an object containing a "detailsSnippet" repesentation
-     * as well as the full node as provided by the REST API
-     * Please refer to the edu-sharing REST documentation for more details
-     * @throws Exception
-     */
-    public function getNodeByUsage(
-        Usage $usage,
-        $displayMode = DisplayMode::Inline,
-        array $renderingParams = null
-    )
-    {
-        $url = $this->base->baseUrl . '/rest/rendering/v1/details/-home-/' . rawurlencode($usage->nodeId);
-        $url .= '?displayMode=' . rawurlencode($displayMode);
-        if($usage->nodeVersion) {
-            $url .= '&version=' . rawurlencode($usage->nodeVersion);
-        }
-        $curl = curl_init($url);
-
-        $headers = $this->getSignatureHeaders($usage->usageId);
-        $headers[] = 'X-Edu-Usage-Node-Id: ' . $usage->nodeId;
-        $headers[] = 'X-Edu-Usage-Course-Id: ' . $usage->containerId;
-        $headers[] = 'X-Edu-Usage-Resource-Id: ' . $usage->resourceId;
-
-        curl_setopt_array($curl, [
-            CURLOPT_FAILONERROR => false,
-            CURLOPT_POST => 1,
-            CURLOPT_POSTFIELDS => json_encode($renderingParams),
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_HTTPHEADER => $headers
-        ]);
-        if ($this->base->http_proxy) {
-            curl_setopt($curl, CURLOPT_PROXY, $this->base->http_proxy);
-        }
-        $data = json_decode(curl_exec($curl), true);
-        $err     = curl_errno( $curl );
-        $info = curl_getinfo($curl);
-        if ($err === 0 && $info["http_code"] === 200) {
-            return $data;
-        } else {
-            throw new Exception('fetching node by usage failed ' .
-                $info["http_code"] . ': ' . $data['error'] . ' ' . $data['message']);
-        }
-    }
-
-    /**
-     * Deletes the given usage
-     * We trust that you've validated if the current user in your context is allowed to do so
-     * There is no restriction in deleting usages even from foreign users, as long as they were generated by your app
-     * Thus, this endpoint does not require any user ticket
-     * @param string $nodeId
-     * The edu-sharing node id this usage belongs to
-     * @param string $usageId
-     * The usage id
-     */
-    public function deleteUsage(
-        string $nodeId,
-        string $usageId
-    ) {
-        $curl = curl_init($this->base->baseUrl . '/rest/usage/v1/usages/node/' . rawurlencode($nodeId) . '/' . rawurlencode($usageId));
-        $headers = $this->getSignatureHeaders($nodeId.$usageId);
-        curl_setopt_array($curl, [
-            CURLOPT_FAILONERROR => false,
-            CURLOPT_CUSTOMREQUEST => 'DELETE',
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_HTTPHEADER => $headers
-        ]);
-        if ($this->base->http_proxy) {
-            curl_setopt($curl, CURLOPT_PROXY, $this->base->http_proxy);
-        }
-        $data = json_decode(curl_exec($curl), true);
-        $err     = curl_errno( $curl );
-        $info = curl_getinfo($curl);
-        curl_close($curl);
-        if ($err === 0 && $info["http_code"] === 200) {
-
-        } else {
-            throw new Exception('deleting usage failed ' .
-                $info["http_code"] . ': ' . $data['error'] . ' ' . $data['message']);
-        }
-
-    }
-}
diff --git a/vendor/edu-sharing-plugin/example/example-api.php b/vendor/edu-sharing-plugin/example/example-api.php
deleted file mode 100644
index a961a7d..0000000
--- a/vendor/edu-sharing-plugin/example/example-api.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-define('APP_ID', 'data-quest Test');
-define('BASE_URL', 'http://localhost:8080/edu-sharing');
-define('USERNAME', 'root@studip');
-
-
-header('Accept: application/json');
-header('Content-Type: application/json');
-
-require_once "../edu-sharing-helper.php";
-require_once "../edu-sharing-helper-base.php";
-require_once "../edu-sharing-auth-helper.php";
-require_once "../edu-sharing-node-helper.php";
-
-$privatekey = @file_get_contents('private.key');
-if(!$privatekey) {
-    die('no private key');
-} else {
-    $key["privatekey"] = $privatekey;
-}
-// init the base class instance we use for all helpers
-$base = new EduSharingHelperBase(BASE_URL, $key["privatekey"], APP_ID);
-$postData = json_decode(file_get_contents('php://input'));
-$action = $postData->action;
-$result = null;
-if ($action === 'BASE_URL') {
-    $result = BASE_URL;
-} else if ($action === 'GET_NODE') {
-    $nodeHelper = new EduSharingNodeHelper($base);
-    $result = $nodeHelper->getNodeByUsage(
-        new Usage(
-            $postData->nodeId,
-            $postData->nodeVersion,
-            $postData->containerId,
-            $postData->resourceId,
-            $postData->usageId
-        )
-    );
-} else if ($action === 'CREATE_USAGE') {
-    $nodeHelper = new EduSharingNodeHelper($base);
-    $result = $nodeHelper->createUsage(
-        $postData->ticket,
-        $postData->containerId,
-        $postData->resourceId,
-        $postData->nodeId
-    );
-} else if ($action === 'DELETE_USAGE') {
-    $nodeHelper = new EduSharingNodeHelper($base);
-    $nodeHelper->deleteUsage(
-        $postData->nodeId,
-        $postData->usageId
-    );
-} else if ($action === 'TICKET') {
-    $authHelper = new EduSharingAuthHelper($base);
-    $ticket = $authHelper->getTicketForUser(USERNAME);
-    $result = $ticket;
-}
-
-echo json_encode($result);
diff --git a/vendor/edu-sharing-plugin/example/example.php b/vendor/edu-sharing-plugin/example/example.php
deleted file mode 100644
index e959d59..0000000
--- a/vendor/edu-sharing-plugin/example/example.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * This is a sample file on how to use the edu-sharing remote library
- * Run this script for the first time to create a private/public keypair
- * On first run, a properties.xml file will be created
- * Upload this file to your target edu-sharing (Admin-Tools -> Remote Systems -> Choose XML-File)
- */
-
-define('APP_ID', 'sample-app');
-define('USERNAME', 'tester');
-require_once "../edu-sharing-helper.php";
-require_once "../edu-sharing-helper-base.php";
-require_once "../edu-sharing-auth-helper.php";
-require_once "../edu-sharing-node-helper.php";
-
-$privatekey = @file_get_contents('private.key');
-if(!$privatekey) {
-    $key = EduSharingHelper::generateKeyPair();
-    // store the $key data inside your application, e.g. your database or plugin config
-    file_put_contents(APP_ID . '.properties.xml', EduSharingHelper::generateEduAppXMLData(APP_ID, $key['publickey']));
-    file_put_contents('private.key', $key['privatekey']);
-    die('Wrote ' . APP_ID . '.properties.xml file. Upload it to edu-sharing, then run this script again');
-} else {
-    $key["privatekey"] = $privatekey;
-}
-if(count($argv) < 2) {
-    die('This script should be called as follow: "example.php http://localhost:8080/edu-sharing [<node-id>]"');
-}
-// init the base class instance we use for all helpers
-$base = new EduSharingHelperBase($argv[1], $key["privatekey"], APP_ID);
-$base->setLanguage('de');
-
-// authenticating (getting a ticket) and validating the given ticket
-$authHelper = new EduSharingAuthHelper($base);
-$ticket = $authHelper->getTicketForUser(USERNAME);
-echo "Ticket validation result:\n";
-print_r($authHelper->getTicketAuthenticationInfo($ticket));
-
-if(count($argv) !== 3) {
-    die("No node id given. Add a 3rd parameter to test create + fetching of nodes by usage");
-}
-$nodeHelper = new EduSharingNodeHelper($base);
-$usage = $nodeHelper->createUsage($ticket, '1', '1', $argv[2]);
-echo "Usage create result:\n";
-print_r($usage);
-
-$node = $nodeHelper->getNodeByUsage($usage);
-echo "Get node by usage:\n";
-print_r($node["node"]["name"]);
\ No newline at end of file
diff --git a/vendor/edu-sharing-plugin/example/index.html b/vendor/edu-sharing-plugin/example/index.html
deleted file mode 100644
index 9be18ce..0000000
--- a/vendor/edu-sharing-plugin/example/index.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Edu Sharing Usage Example</title>
-    <style>
-        body > div {
-            padding: 20px 10px;
-        }
-        pre {
-            border: 1px solid #eee;
-            padding: 10px;
-            margin: 10px;
-        }
-    </style>
-    <script>
-        let ticket;
-        let baseUrl = null;
-        let esWindow = null;
-        function openEduSharing() {
-            esWindow = window.open(
-                baseUrl + '/components/search?ticket=' + encodeURIComponent(ticket) +
-                '&reurl=IFRAME'
-            );
-        }
-        window.addEventListener('message', receiveMessage, false);
-        async function receiveMessage(event){
-            if(event.data.event === 'APPLY_NODE'){ // Event Name hier festlegen
-                esWindow.close();
-                console.log(event.data.data);
-                usage = await createUsage(event.data.data.nodeId);
-                // in a real application, the usage is stored in your backend system
-                localStorage.setItem('usage', JSON.stringify(usage));
-                await renderUsage();
-
-            }
-        }
-        async function renderUsage() {
-            if(localStorage.getItem('usage')) {
-                const usage = JSON.parse(localStorage.getItem('usage'));
-                document.querySelector('#usage').style.display = null;
-                document.querySelector('#delete-usage').style.display = null;
-                document.querySelector('#usage').innerHTML = JSON.stringify(usage, null, 4);
-                usage.action = 'GET_NODE';
-                const render = await fetchAPI(usage)
-                document.querySelector('#render').innerHTML = render.detailsSnippet;
-            }
-
-        }
-        async function createUsage(nodeId) {
-            return await fetchAPI({
-                action: 'CREATE_USAGE',
-                ticket,
-                nodeId,
-                containerId: 'my_sample_page_1',
-                resourceId: Math.random()
-            });
-        }
-        async function deleteUsage(nodeId) {
-            const usage = JSON.parse(localStorage.getItem('usage'));
-            await fetchAPI({
-                action: 'DELETE_USAGE',
-                nodeId: usage.nodeId,
-                usageId: usage.usageId
-            });
-            localStorage.removeItem('usage');
-            document.querySelector('#render').style.display = 'none';
-            document.querySelector('#usage').style.display = 'none';
-            document.querySelector('#delete-usage').style.display = 'none';
-        }
-        async function fetchAPI(data) {
-            return new Promise((resolve, reject) => {
-                var xhr = new XMLHttpRequest();
-                xhr.open("POST", "example-api.php", true);
-                xhr.onload = () => {
-                    if (xhr.readyState === 4) {
-                        if (xhr.status === 200) {
-                            resolve(JSON.parse(xhr.response));
-                        } else {
-                            alert(xhr.statusText);
-                            reject(xhr.statusText);
-                        }
-                    }
-                };
-                xhr.onerror = function (e) {
-                    alert(xhr.statusText);
-                };
-                xhr.send(JSON.stringify(data));
-            });
-        }
-        async function getTicket() {
-            ticket = await fetchAPI({action: 'TICKET'});
-            document.querySelector('#ticket').innerText = ticket;
-            document.querySelector('#edu-select').style.display = null;
-
-        }
-        window.addEventListener('load', async () => {
-            baseUrl = await fetchAPI({action: 'BASE_URL'});
-            await renderUsage();
-
-            await getTicket();
-        });
-    </script>
-</head>
-<body>
-<div>
-    <button onclick="getTicket()">Re-Fetch ticket</button>
-    <span id="ticket">No ticket</span>
-</div>
-<div id="edu-select" style="display:none;">
-    <button onclick="openEduSharing()">Open edu-sharing & select node</button>
-</div>
-<pre id="usage" style="display: none"></pre>
-<div id="delete-usage" style="display: none">
-    <button onclick="deleteUsage()">Delete current Usage</button>
-</div>
-<div id="render"></div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/vendor/edu-sharing-plugin/readme.md b/vendor/edu-sharing-plugin/readme.md
deleted file mode 100644
index ab1f332..0000000
--- a/vendor/edu-sharing-plugin/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-This library is a changed version of https://github.com/edu-sharing/php-auth-plugin
-- 
cgit v1.0


From 15c29abc3dc12e40c40a9331f6b9478386d2bf7d Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 8 May 2024 07:38:22 +0000
Subject: move exTpl to lib, re #4119

Merge request studip/studip!2963
---
 lib/exTpl/ArithExpression.php                 |  29 ++
 lib/exTpl/ArrayNode.php                       |  37 ++
 lib/exTpl/BinaryExpression.php                |  27 ++
 lib/exTpl/BooleanExpression.php               |  31 ++
 lib/exTpl/ConditionExpression.php             |  38 ++
 lib/exTpl/ConditionNode.php                   |  59 +++
 lib/exTpl/ConstantExpression.php              |  31 ++
 lib/exTpl/Context.php                         |  77 ++++
 lib/exTpl/Expression.php                      |  27 ++
 lib/exTpl/ExpressionNode.php                  |  37 ++
 lib/exTpl/FunctionExpression.php              |  45 +++
 lib/exTpl/IndexExpression.php                 |  22 ++
 lib/exTpl/IteratorNode.php                    |  55 +++
 lib/exTpl/MinusExpression.php                 |  19 +
 lib/exTpl/Node.php                            |  28 ++
 lib/exTpl/NotExpression.php                   |  19 +
 lib/exTpl/RawExpression.php                   |  19 +
 lib/exTpl/Scanner.php                         |  87 ++++
 lib/exTpl/SymbolExpression.php                |  39 ++
 lib/exTpl/Template.php                        | 547 ++++++++++++++++++++++++++
 lib/exTpl/TemplateParserException.php         |  19 +
 lib/exTpl/TextNode.php                        |  31 ++
 lib/exTpl/UnaryExpression.php                 |  21 +
 lib/extern/ExternPage.php                     |   2 -
 tests/unit/_bootstrap.php                     |   1 +
 tests/unit/lib/classes/extTPLTemplateTest.php | 213 ++++++++++
 vendor/exTpl/Context.php                      |  80 ----
 vendor/exTpl/Expression.php                   | 329 ----------------
 vendor/exTpl/Node.php                         | 234 -----------
 vendor/exTpl/Scanner.php                      |  98 -----
 vendor/exTpl/Template.php                     | 535 -------------------------
 vendor/exTpl/template_test.php                | 215 ----------
 32 files changed, 1558 insertions(+), 1493 deletions(-)
 create mode 100644 lib/exTpl/ArithExpression.php
 create mode 100644 lib/exTpl/ArrayNode.php
 create mode 100644 lib/exTpl/BinaryExpression.php
 create mode 100644 lib/exTpl/BooleanExpression.php
 create mode 100644 lib/exTpl/ConditionExpression.php
 create mode 100644 lib/exTpl/ConditionNode.php
 create mode 100644 lib/exTpl/ConstantExpression.php
 create mode 100644 lib/exTpl/Context.php
 create mode 100644 lib/exTpl/Expression.php
 create mode 100644 lib/exTpl/ExpressionNode.php
 create mode 100644 lib/exTpl/FunctionExpression.php
 create mode 100644 lib/exTpl/IndexExpression.php
 create mode 100644 lib/exTpl/IteratorNode.php
 create mode 100644 lib/exTpl/MinusExpression.php
 create mode 100644 lib/exTpl/Node.php
 create mode 100644 lib/exTpl/NotExpression.php
 create mode 100644 lib/exTpl/RawExpression.php
 create mode 100644 lib/exTpl/Scanner.php
 create mode 100644 lib/exTpl/SymbolExpression.php
 create mode 100644 lib/exTpl/Template.php
 create mode 100644 lib/exTpl/TemplateParserException.php
 create mode 100644 lib/exTpl/TextNode.php
 create mode 100644 lib/exTpl/UnaryExpression.php
 create mode 100644 tests/unit/lib/classes/extTPLTemplateTest.php
 delete mode 100644 vendor/exTpl/Context.php
 delete mode 100644 vendor/exTpl/Expression.php
 delete mode 100644 vendor/exTpl/Node.php
 delete mode 100644 vendor/exTpl/Scanner.php
 delete mode 100644 vendor/exTpl/Template.php
 delete mode 100644 vendor/exTpl/template_test.php

diff --git a/lib/exTpl/ArithExpression.php b/lib/exTpl/ArithExpression.php
new file mode 100644
index 0000000..4888b73
--- /dev/null
+++ b/lib/exTpl/ArithExpression.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * ArithExpression represents an arithmetic operator.
+ */
+class ArithExpression extends BinaryExpression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        $left  = $this->left->value($context);
+        $right = $this->right->value($context);
+
+        return match ($this->operator) {
+            '+' => $left + $right,
+            '-' => $left - $right,
+            '*' => $left * $right,
+            '/' => $left / $right,
+            '%' => $left % $right,
+            '~' => $left . $right,
+        };
+    }
+}
diff --git a/lib/exTpl/ArrayNode.php b/lib/exTpl/ArrayNode.php
new file mode 100644
index 0000000..3981598
--- /dev/null
+++ b/lib/exTpl/ArrayNode.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * ArrayNode represents a sequence of arbitrary nodes.
+ */
+class ArrayNode implements Node
+{
+    protected array $nodes = [];
+
+    /**
+     * Adds a child node to this sequence node.
+     *
+     * @param Node $node child node to add
+     */
+    public function addChild(Node $node): void
+    {
+        $this->nodes[] = $node;
+    }
+
+    /**
+     * Returns a string representation of this node.
+     *
+     * @param Context $context symbol table
+     */
+    public function render(Context $context): string
+    {
+        $result = '';
+
+        foreach ($this->nodes as $node) {
+            $result .= $node->render($context);
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/exTpl/BinaryExpression.php b/lib/exTpl/BinaryExpression.php
new file mode 100644
index 0000000..1c82730
--- /dev/null
+++ b/lib/exTpl/BinaryExpression.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * BinaryExpression represents a binary operator.
+ */
+abstract class BinaryExpression implements Expression
+{
+    protected Expression $left;
+    protected Expression $right;
+    protected mixed $operator;
+
+    /**
+     * Initializes a new Expression instance.
+     *
+     * @param Expression $left left operand
+     * @param Expression $right right operand
+     * @param mixed $operator operator token
+     */
+    public function __construct(Expression $left, Expression $right, mixed $operator)
+    {
+        $this->left     = $left;
+        $this->right    = $right;
+        $this->operator = $operator;
+    }
+}
diff --git a/lib/exTpl/BooleanExpression.php b/lib/exTpl/BooleanExpression.php
new file mode 100644
index 0000000..0e18df0
--- /dev/null
+++ b/lib/exTpl/BooleanExpression.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * BooleanExpression represents a boolean operator.
+ */
+class BooleanExpression extends BinaryExpression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): bool
+    {
+        $left  = $this->left->value($context);
+        $right = $this->right->value($context);
+
+        return match ($this->operator) {
+            T_IS_EQUAL            => $left == $right,
+            T_IS_NOT_EQUAL        => $left != $right,
+            '<'                   => $left < $right,
+            T_IS_SMALLER_OR_EQUAL => $left <= $right,
+            '>'                   => $left > $right,
+            T_IS_GREATER_OR_EQUAL => $left >= $right,
+            T_BOOLEAN_AND         => $left && $right,
+            T_BOOLEAN_OR          => $left || $right,
+        };
+    }
+}
diff --git a/lib/exTpl/ConditionExpression.php b/lib/exTpl/ConditionExpression.php
new file mode 100644
index 0000000..657ee31
--- /dev/null
+++ b/lib/exTpl/ConditionExpression.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * ConditionExpression represents the conditional operator ('?:').
+ */
+class ConditionExpression implements Expression
+{
+    protected Expression $condition;
+    protected Expression $left;
+    protected Expression $right;
+
+    /**
+     * Initializes a new Expression instance.
+     *
+     * @param Expression $condition expression
+     * @param Expression $left left alternative
+     * @param Expression $right right alternative
+     */
+    public function __construct(Expression $condition, Expression $left, Expression $right)
+    {
+        $this->condition = $condition;
+        $this->left      = $left;
+        $this->right     = $right;
+    }
+
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        return $this->condition->value($context) ?
+            $this->left->value($context) : $this->right->value($context);
+    }
+}
diff --git a/lib/exTpl/ConditionNode.php b/lib/exTpl/ConditionNode.php
new file mode 100644
index 0000000..bab2121
--- /dev/null
+++ b/lib/exTpl/ConditionNode.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * ConditionNode represents a single condition tag:
+ * "{if CONDITION}...{else}...{endif}".
+ */
+class ConditionNode extends ArrayNode
+{
+    protected Expression $condition;
+    protected ArrayNode|null $else_node = null;
+
+    /**
+     * Initializes a new Node instance with the given expression.
+     *
+     * @param Expression $condition expression object
+     */
+    public function __construct(Expression $condition)
+    {
+        $this->condition = $condition;
+    }
+
+    /**
+     * Adds an else block to this condition node.
+     */
+    public function addElse(): void
+    {
+        $this->else_node = new ArrayNode();
+    }
+
+    /**
+     * Adds a child node to this condition node.
+     *
+     * @param Node $node child node to add
+     */
+    public function addChild(Node $node): void
+    {
+        if ($this->else_node) {
+            $this->else_node->addChild($node);
+        } else {
+            parent::addChild($node);
+        }
+    }
+
+    /**
+     * Returns a string representation of this node.
+     *
+     * @param Context $context symbol table
+     */
+    public function render(Context $context): string
+    {
+        if ($this->condition->value($context)) {
+            return parent::render($context);
+        }
+
+        return $this->else_node ? $this->else_node->render($context) : '';
+    }
+}
diff --git a/lib/exTpl/ConstantExpression.php b/lib/exTpl/ConstantExpression.php
new file mode 100644
index 0000000..7235647
--- /dev/null
+++ b/lib/exTpl/ConstantExpression.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * ConstantExpression represents a literal value.
+ */
+class ConstantExpression implements Expression
+{
+    protected mixed $value;
+
+    /**
+     * Initializes a new Expression instance.
+     *
+     * @param mixed $value expression value
+     */
+    public function __construct(mixed $value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        return $this->value;
+    }
+}
diff --git a/lib/exTpl/Context.php b/lib/exTpl/Context.php
new file mode 100644
index 0000000..309174f
--- /dev/null
+++ b/lib/exTpl/Context.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Context.php - template parser symbol table
+ *
+ * A Context object represents the symbol table used to resolve
+ *  symbol names to their values in the local scope. Each context
+ *  may inherit symbol definitions from its parent context.
+ *
+ * @copyright 2013  Elmar Ludwig
+ * @license GPL2 or any later version
+ */
+
+namespace exTpl;
+
+use Closure;
+
+class Context
+{
+    private array $bindings;
+    private Closure|null $escape;
+    private Context|null $parent;
+
+    /**
+     * Initializes a new Context instance with the given bindings.
+     *
+     * @param array $bindings symbol table
+     * @param Context|null $parent parent context (or NULL)
+     */
+    public function __construct(array $bindings, Context $parent = null)
+    {
+        $this->bindings = $bindings;
+        $this->parent   = $parent;
+    }
+
+    /**
+     * Looks up the value of a symbol in this context and returns it.
+     * The reserved symbol "this" is an alias for the current context.
+     *
+     * @param string $key symbol name
+     */
+    public function lookup(string $key): mixed
+    {
+        if (isset($this->bindings[$key])) {
+            return $this->bindings[$key];
+        } else if ($this->parent) {
+            return $this->parent->lookup($key);
+        }
+
+        return null;
+    }
+
+    /**
+     * Enables or disables automatic escaping for template values.
+     *
+     * @param callable|null $escape escape callback or null
+     */
+    public function autoescape(?callable $escape): void
+    {
+        $this->escape = $escape ? $escape(...) : null;
+    }
+
+    /**
+     * Escapes the given value using the configured strategy.
+     *
+     * @param mixed $value expression value
+     */
+    public function escape(mixed $value): mixed
+    {
+        if (isset($this->escape)) {
+            $value = call_user_func($this->escape, $value);
+        } else if ($this->parent) {
+            $value = $this->parent->escape($value);
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/exTpl/Expression.php b/lib/exTpl/Expression.php
new file mode 100644
index 0000000..15a485d
--- /dev/null
+++ b/lib/exTpl/Expression.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * Expression.php - template parser expression interface and classes
+ *
+ * Copyright (c) 2013  Elmar Ludwig
+ *
+ * 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.
+ */
+
+namespace exTpl;
+
+/**
+ * Basic interface for expressions in the template parse tree. The
+ * only required method is "value" to get the expression's value.
+ */
+interface Expression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context  symbol table
+     */
+    public function value(Context $context): mixed;
+}
diff --git a/lib/exTpl/ExpressionNode.php b/lib/exTpl/ExpressionNode.php
new file mode 100644
index 0000000..061edce
--- /dev/null
+++ b/lib/exTpl/ExpressionNode.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * ExpressionNode represents an expression tag: "{...}".
+ */
+class ExpressionNode implements Node
+{
+    protected Expression $expr;
+
+    /**
+     * Initializes a new Node instance with the given expression.
+     *
+     * @param Expression $expr expression object
+     */
+    public function __construct(Expression $expr)
+    {
+        $this->expr = $expr;
+    }
+
+    /**
+     * Returns a string representation of this node.
+     *
+     * @param Context $context symbol table
+     */
+    public function render(Context $context): ?string
+    {
+        $value = $this->expr->value($context);
+
+        if (!($this->expr instanceof RawExpression)) {
+            $value = $context->escape($value);
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/exTpl/FunctionExpression.php b/lib/exTpl/FunctionExpression.php
new file mode 100644
index 0000000..48d4413
--- /dev/null
+++ b/lib/exTpl/FunctionExpression.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * FunctionExpression represents a function call.
+ */
+class FunctionExpression implements Expression
+{
+    protected Expression $name;
+    protected array $arguments;
+
+    /**
+     * Initializes a new Expression instance.
+     *
+     * @param Expression $name function name
+     * @param array $arguments function arguments
+     */
+    public function __construct(Expression $name, array $arguments)
+    {
+        $this->name      = $name;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        $callable  = $this->name->value($context);
+        $arguments = [];
+
+        foreach ($this->arguments as $expr) {
+            $arguments[] = $expr->value($context);
+        }
+
+        if (is_callable($callable)) {
+            return $callable(...$arguments);
+        }
+
+        return null;
+    }
+}
diff --git a/lib/exTpl/IndexExpression.php b/lib/exTpl/IndexExpression.php
new file mode 100644
index 0000000..ecb3241
--- /dev/null
+++ b/lib/exTpl/IndexExpression.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * IndexExpression represents the array index operator.
+ */
+class IndexExpression extends BinaryExpression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        $left  = $this->left->value($context);
+        $right = $this->right->value($context);
+
+        return $left[$right];
+    }
+}
diff --git a/lib/exTpl/IteratorNode.php b/lib/exTpl/IteratorNode.php
new file mode 100644
index 0000000..58dd593
--- /dev/null
+++ b/lib/exTpl/IteratorNode.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * IteratorNode represents a single iterator tag:
+ * "{foreach ARRAY [as [KEY =>] VALUE]}...{endforeach}".
+ */
+class IteratorNode extends ArrayNode
+{
+    protected Expression $expr;
+    protected string $key_name;
+    protected string $val_name;
+
+    /**
+     * Initializes a new Node instance with the given expression.
+     *
+     * @param Expression $expr expression object
+     * @param string $key_name name of variable on each iteration
+     * @param string $val_name name of variable on each iteration
+     */
+    public function __construct(Expression $expr, string $key_name, string $val_name)
+    {
+        $this->expr     = $expr;
+        $this->key_name = $key_name;
+        $this->val_name = $val_name;
+    }
+
+    /**
+     * Returns a string representation of this node. The IteratorNode
+     * renders the node sequence for each value in the expression list.
+     *
+     * @param Context $context symbol table
+     */
+    public function render(Context $context): string
+    {
+        $values = $this->expr->value($context);
+        $result = '';
+
+        if (is_array($values) && is_int(key($values))) {
+            $bindings = [$this->key_name => &$key, $this->val_name => &$value];
+            $context  = new Context($bindings, $context);
+
+            foreach ($values as $key => $value) {
+                $result .= parent::render(new Context($value, $context));
+            }
+        } else if (is_array($values) && count($values)) {
+            return parent::render(new Context($values, $context));
+        } else if ($values) {
+            return parent::render($context);
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/exTpl/MinusExpression.php b/lib/exTpl/MinusExpression.php
new file mode 100644
index 0000000..6b81e91
--- /dev/null
+++ b/lib/exTpl/MinusExpression.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * MinusExpression represents the unary minus operator ('-').
+ */
+class MinusExpression extends UnaryExpression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context  symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        return -$this->expr->value($context);
+    }
+}
diff --git a/lib/exTpl/Node.php b/lib/exTpl/Node.php
new file mode 100644
index 0000000..5c24cab
--- /dev/null
+++ b/lib/exTpl/Node.php
@@ -0,0 +1,28 @@
+<?php
+/*
+ * Node.php - template parser node interface and classes
+ *
+ * Copyright (c) 2013  Elmar Ludwig
+ *
+ * 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.
+ */
+
+namespace exTpl;
+
+
+/**
+ * Basic interface for nodes in the template parse tree. The only
+ * required method is "render" to render a node and its children.
+ */
+interface Node
+{
+    /**
+     * Returns a string representation of this node.
+     *
+     * @param Context $context symbol table
+     */
+    public function render(Context $context): ?string;
+}
diff --git a/lib/exTpl/NotExpression.php b/lib/exTpl/NotExpression.php
new file mode 100644
index 0000000..cf7472d
--- /dev/null
+++ b/lib/exTpl/NotExpression.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * NotExpression represents the logical negation operator ('!').
+ */
+class NotExpression extends UnaryExpression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): bool
+    {
+        return !$this->expr->value($context);
+    }
+}
diff --git a/lib/exTpl/RawExpression.php b/lib/exTpl/RawExpression.php
new file mode 100644
index 0000000..275f239
--- /dev/null
+++ b/lib/exTpl/RawExpression.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * RawExpression represents the "raw" filter function.
+ */
+class RawExpression extends UnaryExpression
+{
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        return $this->expr->value($context);
+    }
+}
diff --git a/lib/exTpl/Scanner.php b/lib/exTpl/Scanner.php
new file mode 100644
index 0000000..76cbc01
--- /dev/null
+++ b/lib/exTpl/Scanner.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Scanner.php - template parser lexical scanner
+ *
+ * Simple wrapper class around the Zend engine's lexical scanner. It
+ *  automatically skips whitespace.
+ *
+ * @copyright 2013  Elmar Ludwig
+ * @license GPL2 or any later version
+ */
+namespace exTpl;
+
+class Scanner
+{
+    private array $tokens;
+    private mixed $token_type;
+    private mixed $token_value;
+
+    /**
+     * Initializes a new Scanner instance for the given text.
+     *
+     * @param string $text string to parse
+     */
+    public function __construct(string $text)
+    {
+        $this->tokens = token_get_all('<?php ' . $text);
+    }
+
+    /**
+     * Advances the scanner to the next token and returns its token type.
+     * The valid token types are those defined for token_get_all() in the
+     * PHP documentation. Returns false when the end of input is reached.
+     */
+    public function nextToken(): mixed
+    {
+        do {
+            $token = next($this->tokens);
+            $key   = key($this->tokens);
+
+            // FIXME this workaround should be dropped
+            while (
+                $token && $token[0] === T_STRING
+                && isset($this->tokens[$key + 2])
+                && $this->tokens[++$key] === '-'
+                && $this->tokens[++$key][0] === T_STRING
+            ) {
+                $token[1] .= '-' . $this->tokens[$key][1];
+                next($this->tokens);
+                next($this->tokens);
+            }
+        } while (is_array($token) && $token[0] === T_WHITESPACE);
+
+        if (is_string($token) || $token === false) {
+            $this->token_type  = $token;
+            $this->token_value = null;
+        } else {
+            $this->token_type = $token[0];
+
+            $this->token_value = match ($token[0]) {
+                T_CONSTANT_ENCAPSED_STRING => stripcslashes(substr($token[1], 1, -1)),
+                T_DNUMBER => (double) $token[1],
+                T_LNUMBER => (int) $token[1],
+                default => $token[1],
+            };
+        }
+
+        return $this->token_type;
+    }
+
+    /**
+     * Returns the current token type. The valid token types are
+     * those defined for token_get_all() in the PHP documentation.
+     */
+    public function tokenType(): mixed
+    {
+        return $this->token_type;
+    }
+
+    /**
+     * Returns the current token value if the token type supports
+     * a value (T_STRING, T_LNUMBER etc.). Returns null otherwise.
+     */
+    public function tokenValue(): mixed
+    {
+        return $this->token_value;
+    }
+}
diff --git a/lib/exTpl/SymbolExpression.php b/lib/exTpl/SymbolExpression.php
new file mode 100644
index 0000000..178a51f
--- /dev/null
+++ b/lib/exTpl/SymbolExpression.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * SymbolExpression represents a symbol (template variable).
+ */
+class SymbolExpression implements Expression
+{
+    protected string $name;
+
+    /**
+     * Initializes a new Expression instance.
+     *
+     * @param string $name      symbol name
+     */
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Returns the name of this symbol.
+     */
+    public function name(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns the value of this expression.
+     *
+     * @param Context $context  symbol table
+     */
+    public function value(Context $context): mixed
+    {
+        return $context->lookup($this->name);
+    }
+}
diff --git a/lib/exTpl/Template.php b/lib/exTpl/Template.php
new file mode 100644
index 0000000..274e115
--- /dev/null
+++ b/lib/exTpl/Template.php
@@ -0,0 +1,547 @@
+<?php
+/*
+ * Template.php - expression template parser
+ *
+ * Copyright (c) 2013  Elmar Ludwig
+ *
+ * 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.
+ */
+
+namespace exTpl;
+
+use Closure;
+use InvalidArgumentException;
+
+
+/**
+ * The Template class is the only externally visible API of this
+ * template implementation. It can be used to create and render
+ * template objects.
+ */
+class Template
+{
+    private static string $tag_start = '{';
+    private static string $tag_end   = '}';
+    private Closure|string|null $escape = null;
+    private array $functions;
+    private ArrayNode $template;
+
+    /**
+     * Sets the delimiter strings used for the template tags, the
+     * default delimiters are: $tag_start = '{', $tag_end = '}'.
+     *
+     * @param string $tag_start tag start marker
+     * @param string $tag_end tag end marker
+     */
+    public static function setTagMarkers(string $tag_start, string $tag_end): void
+    {
+        self::$tag_start = $tag_start;
+        self::$tag_end   = $tag_end;
+    }
+
+    /**
+     * Initializes a new Template instance from the given string.
+     *
+     * @param string $string template text
+     *
+     * @throws TemplateParserException
+     */
+    public function __construct(string $string)
+    {
+        $this->template  = new ArrayNode();
+        $this->functions = [
+            'count'  => fn($a) => count($a),
+            'strlen' => fn($a) => mb_strlen($a),
+        ];
+        self::parseTemplate($this->template, $string, 0);
+    }
+
+    /**
+     * Enables or disables automatic escaping for template values.
+     * Currently supported strategies: NULL, 'html', 'json', 'xml'
+     *
+     * @param callable|string|null $escape escape strategy or callback
+     */
+    public function autoescape(callable|string|null $escape): void
+    {
+        if ($escape === 'html' || $escape === 'xml') {
+            $this->escape = 'htmlspecialchars';
+        } else if ($escape === 'json') {
+            $this->escape = 'json_encode';
+        } else if (is_callable($escape)) {
+            $this->escape = $escape;
+        } else if ($escape === null) {
+            $this->escape = null;
+        } else {
+            throw new InvalidArgumentException("invalid escape strategy: $escape");
+        }
+    }
+
+    /**
+     * Renders the template to a string using the given array of
+     * bindings to resolve symbol references inside the template.
+     *
+     * @param array $bindings symbol table
+     *
+     * @return string   string representation of the template
+     */
+    public function render(array $bindings): string
+    {
+        $context = new Context($bindings + $this->functions);
+        $context->autoescape($this->escape);
+
+        return $this->template->render($context);
+    }
+
+    /**
+     * Skips tokens until the end of the current tag is reached.
+     *
+     * @param string $string template text
+     * @param int $pos offset in string
+     *
+     * @return int new offset in the string
+     */
+    private static function skipTokens(string $string, int $pos): int
+    {
+        for ($len = strlen($string); $pos < $len && substr_compare($string, self::$tag_end, $pos, strlen(self::$tag_end)); ++$pos) {
+            $chr = $string[$pos];
+            if ($chr === '"' || $chr === "'") {
+                while (++$pos < $len && $string[$pos] !== $chr) {
+                    if ($string[$pos] === '\\') {
+                        ++$pos;
+                    }
+                }
+            }
+        }
+
+        return $pos;
+    }
+
+    /**
+     * Parses a template string into a template node tree, starting
+     * at the specified offset. All created nodes are added to the
+     * given sequence node.
+     *
+     * @param ArrayNode $node   template node to build
+     * @param string    $string string to parse
+     * @param int       $pos    offset in string
+     *
+     * @return int      new offset in the string
+     * @throws TemplateParserException
+     */
+    private static function parseTemplate(ArrayNode $node, string $string, int $pos): int
+    {
+        $len = strlen($string);
+
+        while ($pos < $len) {
+            $next_pos = strpos($string, self::$tag_start, $pos);
+
+            if ($next_pos === false) {
+                $child = new TextNode(substr($string, $pos));
+                $node->addChild($child);
+                break;
+            }
+
+            if ($next_pos > $pos) {
+                $child = new TextNode(substr($string, $pos, $next_pos - $pos));
+                $node->addChild($child);
+            }
+
+            $pos      = $next_pos + strlen(self::$tag_start);
+            $next_pos = self::skipTokens($string, $pos);
+            $scanner  = new Scanner(substr($string, $pos, $next_pos - $pos));
+            $pos      = $next_pos + strlen(self::$tag_end);
+
+            switch ($scanner->nextToken()) {
+                case T_FOREACH:
+                    $scanner->nextToken();
+                    $expr     = self::parseExpr($scanner);
+                    $key_name = 'index';
+                    $val_name = 'this';
+
+                    if ($scanner->tokenType() === T_AS) {
+                        $scanner->nextToken();
+
+                        if ($scanner->tokenType() !== T_STRING) {
+                            throw new TemplateParserException('symbol expected', $scanner);
+                        }
+
+                        $val_name = $scanner->tokenValue();
+                        $scanner->nextToken();
+
+                        if ($scanner->tokenType() === T_DOUBLE_ARROW) {
+                            $scanner->nextToken();
+
+                            if ($scanner->tokenType() !== T_STRING) {
+                                throw new TemplateParserException('symbol expected', $scanner);
+                            }
+
+                            $key_name = $val_name;
+                            $val_name = $scanner->tokenValue();
+                            $scanner->nextToken();
+                        }
+                    }
+
+                    $child = new IteratorNode($expr, $key_name, $val_name);
+                    $pos   = self::parseTemplate($child, $string, $pos);
+                    $node->addChild($child);
+                    break;
+                case T_ENDIF:
+                case T_ENDFOREACH:
+                    return $pos;
+                case T_IF:
+                    $scanner->nextToken();
+                    $child = new ConditionNode(self::parseExpr($scanner));
+                    $pos   = self::parseTemplate($child, $string, $pos);
+                    $node->addChild($child);
+                    break;
+                case T_ELSEIF:
+                    $scanner->nextToken();
+                    $child = new ConditionNode(self::parseExpr($scanner));
+                    $node->addElse();
+                    $node->addChild($child);
+                    return self::parseTemplate($child, $string, $pos);
+                case T_ELSE:
+                    $scanner->nextToken();
+                    $node->addElse();
+                    break;
+                default:
+                    $child = new ExpressionNode(self::parseExpr($scanner));
+                    $node->addChild($child);
+            }
+
+            if ($scanner->tokenType() !== false) {
+                throw new TemplateParserException('syntax error', $scanner);
+            }
+        }
+
+        return $pos;
+    }
+
+    /**
+     * value: NUMBER | STRING | SYMBOL | '(' expr ')'
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseValue(Scanner $scanner): mixed
+    {
+        switch ($scanner->tokenType()) {
+            case T_CONSTANT_ENCAPSED_STRING:
+            case T_DNUMBER:
+            case T_LNUMBER:
+                $result = new ConstantExpression($scanner->tokenValue());
+                break;
+            case T_STRING:
+                $result = new SymbolExpression($scanner->tokenValue());
+                break;
+            case '(':
+                $scanner->nextToken();
+                $result = self::parseExpr($scanner);
+
+                if ($scanner->tokenType() !== ')') {
+                    throw new TemplateParserException('missing ")"', $scanner);
+                }
+                break;
+            default:
+                throw new TemplateParserException('syntax error', $scanner);
+        }
+
+        $scanner->nextToken();
+        return $result;
+    }
+
+    /**
+     * function: value | function '(' ')' | function '(' expr { ',' expr } ')'
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseFunction(Scanner $scanner): mixed
+    {
+        $result = self::parseValue($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === '(') {
+            $scanner->nextToken();
+            $arguments = [];
+
+            if ($scanner->tokenType() !== ')') {
+                $arguments[] = self::parseExpr($scanner);
+
+                while ($scanner->tokenType() === ',') {
+                    $scanner->nextToken();
+                    $arguments[] = self::parseExpr($scanner);
+                }
+
+                if ($scanner->tokenType() !== ')') {
+                    throw new TemplateParserException('missing ")"', $scanner);
+                }
+            }
+
+            $scanner->nextToken();
+            $result = new FunctionExpression($result, $arguments);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * index: function | index '[' expr ']' | index '.' SYMBOL
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseIndex(Scanner $scanner): mixed
+    {
+        $result = self::parseFunction($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === '[' || $type === '.') {
+            $scanner->nextToken();
+
+            if ($type === '[') {
+                $expr = self::parseExpr($scanner);
+
+                if ($scanner->tokenType() !== ']') {
+                    throw new TemplateParserException('missing "]"', $scanner);
+                }
+            } else if ($scanner->tokenType() === T_STRING) {
+                $expr = new ConstantExpression($scanner->tokenValue());
+            } else {
+                throw new TemplateParserException('symbol expected', $scanner);
+            }
+
+            $scanner->nextToken();
+            $result = new IndexExpression($result, $expr, $type);
+            $type = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * filter: index | filter '|' SYMBOL | filter '|' SYMBOL '(' expr { ',' expr } ')'
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseFilter(Scanner $scanner): mixed
+    {
+        $result = self::parseIndex($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === '|') {
+            $scanner->nextToken();
+
+            if ($scanner->tokenType() !== T_STRING) {
+                throw new TemplateParserException('symbol expected', $scanner);
+            }
+
+            $arguments = [$result];
+            $symbol    = new SymbolExpression($scanner->tokenValue());
+            $scanner->nextToken();
+
+            if ($scanner->tokenType() === '(') {
+                $scanner->nextToken();
+
+                if ($scanner->tokenType() !== ')') {
+                    $arguments[] = self::parseExpr($scanner);
+
+                    while ($scanner->tokenType() === ',') {
+                        $scanner->nextToken();
+                        $arguments[] = self::parseExpr($scanner);
+                    }
+
+                    if ($scanner->tokenType() !== ')') {
+                        throw new TemplateParserException('missing ")"', $scanner);
+                    }
+                }
+
+                $scanner->nextToken();
+            }
+
+            if ($symbol->name() === 'raw') {
+                $result = new RawExpression($result);
+            } else {
+                $result = new FunctionExpression($symbol, $arguments);
+            }
+
+            $type = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * sign: '!' sign | '+' sign | '-' sign | filter
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseSign(Scanner $scanner): mixed
+    {
+        switch ($scanner->tokenType()) {
+            case '!':
+                $scanner->nextToken();
+                $result = new NotExpression(self::parseSign($scanner));
+                break;
+            case '+':
+                $scanner->nextToken();
+                $result = self::parseSign($scanner);
+                break;
+            case '-':
+                $scanner->nextToken();
+                $result = new MinusExpression(self::parseSign($scanner));
+                break;
+            default:
+                $result = self::parseFilter($scanner);
+        }
+
+        return $result;
+    }
+
+    /**
+     * product: sign | product '*' sign | product '/' sign | product '%' sign
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseProduct(Scanner $scanner): mixed
+    {
+        $result = self::parseSign($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === '*' || $type === '/' || $type === '%') {
+            $scanner->nextToken();
+            $result = new ArithExpression($result, self::parseSign($scanner), $type);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * sum: product | sum '+' product | sum '-' product | sum '~' product
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseSum(Scanner $scanner): mixed
+    {
+        $result = self::parseProduct($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === '+' || $type === '-' || $type === '~') {
+            $scanner->nextToken();
+            $result = new ArithExpression($result, self::parseProduct($scanner), $type);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * lt_gt: sum | lt_gt '<' concat | lt_gt IS_SMALLER_OR_EQUAL concat
+     *            | lt_gt '>' concat | lt_gt IS_GREATER_OR_EQUAL concat
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseLtGt(Scanner $scanner): mixed
+    {
+        $result = self::parseSum($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === '<' || $type === T_IS_SMALLER_OR_EQUAL ||
+            $type === '>' || $type === T_IS_GREATER_OR_EQUAL) {
+            $scanner->nextToken();
+            $result = new BooleanExpression($result, self::parseSum($scanner), $type);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * cmp: lt_gt | cmp IS_EQUAL lt_gt | cmp IS_NOT_EQUAL lt_gt
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseCmp(Scanner $scanner): mixed
+    {
+        $result = self::parseLtGt($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === T_IS_EQUAL || $type === T_IS_NOT_EQUAL) {
+            $scanner->nextToken();
+            $result = new BooleanExpression($result, self::parseLtGt($scanner), $type);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * and: cmp | and BOOLEAN_AND cmp
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseAnd(Scanner $scanner): mixed
+    {
+        $result = self::parseCmp($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === T_BOOLEAN_AND) {
+            $scanner->nextToken();
+            $result = new BooleanExpression($result, self::parseCmp($scanner), $type);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * or: and | or BOOLEAN_OR and
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseOr(Scanner $scanner): mixed
+    {
+        $result = self::parseAnd($scanner);
+        $type   = $scanner->tokenType();
+
+        while ($type === T_BOOLEAN_OR) {
+            $scanner->nextToken();
+            $result = new BooleanExpression($result, self::parseAnd($scanner), $type);
+            $type   = $scanner->tokenType();
+        }
+
+        return $result;
+    }
+
+    /**
+     * expr: or | or '?' expr ':' expr | or '?' ':' expr
+     *
+     * @throws TemplateParserException
+     */
+    private static function parseExpr(Scanner $scanner): mixed
+    {
+        $result = self::parseOr($scanner);
+
+        if ($scanner->tokenType() === '?') {
+            $scanner->nextToken();
+
+            if ($scanner->tokenType() !== ':') {
+                $expr = self::parseExpr($scanner);
+            } else {
+                $expr = $result;
+            }
+
+            if ($scanner->tokenType() !== ':') {
+                throw new TemplateParserException('missing ":"', $scanner);
+            }
+
+            $scanner->nextToken();
+            $result = new ConditionExpression($result, $expr, self::parseExpr($scanner));
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/exTpl/TemplateParserException.php b/lib/exTpl/TemplateParserException.php
new file mode 100644
index 0000000..2c7abf8
--- /dev/null
+++ b/lib/exTpl/TemplateParserException.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace exTpl;
+
+use Exception;
+
+/**
+ * Exception class used to report template parse errors.
+ */
+class TemplateParserException extends Exception
+{
+    public function __construct(string $message, Scanner $scanner)
+    {
+        $type  = $scanner->tokenType();
+        $value = is_int($type) ? $scanner->tokenValue() : $type;
+
+        return parent::__construct("$message at \"$value\"");
+    }
+}
diff --git a/lib/exTpl/TextNode.php b/lib/exTpl/TextNode.php
new file mode 100644
index 0000000..053cafc
--- /dev/null
+++ b/lib/exTpl/TextNode.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * TextNode represents a verbatim text segment.
+ */
+class TextNode implements Node
+{
+    protected string $text;
+
+    /**
+     * Initializes a new Node instance with the given text.
+     *
+     * @param string $text verbatim text
+     */
+    public function __construct(string $text)
+    {
+        $this->text = $text;
+    }
+
+    /**
+     * Returns a string representation of this node.
+     *
+     * @param Context $context symbol table
+     */
+    public function render(Context $context): string
+    {
+        return $this->text;
+    }
+}
diff --git a/lib/exTpl/UnaryExpression.php b/lib/exTpl/UnaryExpression.php
new file mode 100644
index 0000000..9979311
--- /dev/null
+++ b/lib/exTpl/UnaryExpression.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace exTpl;
+
+/**
+ * UnaryExpression represents a unary operator.
+ */
+abstract class UnaryExpression implements Expression
+{
+    protected Expression $expr;
+
+    /**
+     * Initializes a new Expression instance.
+     *
+     * @param Expression $expr  expression object
+     */
+    public function __construct(Expression $expr)
+    {
+        $this->expr = $expr;
+    }
+}
diff --git a/lib/extern/ExternPage.php b/lib/extern/ExternPage.php
index d775bc4..308caeb 100644
--- a/lib/extern/ExternPage.php
+++ b/lib/extern/ExternPage.php
@@ -13,8 +13,6 @@
  * @since       5.4
  */
 
-require_once 'vendor/exTpl/Template.php';
-
 abstract class ExternPage
 {
     /**
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index e5299a6..3aa1144 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -53,6 +53,7 @@ StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
 StudipAutoloader::addAutoloadPath('lib/models');
 StudipAutoloader::addAutoloadPath('lib/classes');
 StudipAutoloader::addAutoloadPath('lib/classes', 'Studip');
+StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
 StudipAutoloader::addAutoloadPath('lib/exceptions');
 StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
 StudipAutoloader::addAutoloadPath('lib/classes/helpbar');
diff --git a/tests/unit/lib/classes/extTPLTemplateTest.php b/tests/unit/lib/classes/extTPLTemplateTest.php
new file mode 100644
index 0000000..43a9629
--- /dev/null
+++ b/tests/unit/lib/classes/extTPLTemplateTest.php
@@ -0,0 +1,213 @@
+<?php
+/*
+ * template_test.php - expression template unit tests
+ *
+ * Copyright (c) 2013  Elmar Ludwig
+ *
+ * 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.
+ */
+
+use exTpl\Template;
+
+class extTplTemplateTest extends \Codeception\Test\Unit
+{
+    public function testSimpleString()
+    {
+        $bindings = [];
+        $template = 'The quick brown fox jumps over the layz dog.';
+        $expected = $template;
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testConstantExpression()
+    {
+        $bindings = array();
+        $template = '17 + 4 = {"foo" != "bar" ? 17 + 4 : 42.0}';
+        $expected = '17 + 4 = 21';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testConditionExpression()
+    {
+        $bindings = array('a' => 0, 'b' => 42);
+        $template = 'answer is {"" ?: a ?: b}';
+        $expected = 'answer is 42';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testStringEscapes()
+    {
+        $bindings = array();
+        $template = '"{"\\tfoo\'\\"\\n"}{\'{"bar"}\'}"';
+        $expected = "\"\tfoo'\"\n{\"bar\"}\"";
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testOperatorPrecedence()
+    {
+        $bindings = array('val' => array(array(42)));
+        $template = '{-val[0][0] / (17+4) + 8 > 6 && "foo" == "f"~"o"~"o" ? 1 : 2}';
+        $expected = '2';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testSimpleBindings()
+    {
+        $bindings = array('foo' => 'bar', 'val' => array(17, 4), 'pi' => 3.14159);
+        $template = 'foo = "{foo}", sum = {val[0] + val[1]}, pi^2 = {pi * pi}, x = {x}';
+        $expected = 'foo = "bar", sum = 21, pi^2 = 9.8695877281, x = ';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testConditional()
+    {
+        $bindings = array('foo' => 'bar', 'pi' => 3.14159);
+        $template = '{if foo == "foo"}NO{elseif foo == "bar"}pi = {pi}{else}NO{endif}';
+        $expected = 'pi = 3.14159';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testConditionalIteration()
+    {
+        $bindings = array('foo' => 'bar', 'pi' => 3.14159);
+        $template = '{foreach foo}{if foo}{foo}{endif}{endforeach}';
+        $expected = 'bar';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testIteration()
+    {
+        $bindings = array('persons' => array(
+                        1 => array('user' => 'jane', 'phone' => '555-81281'),
+                        2 => array('user' => 'mike', 'phone' => '230-28382'),
+                        3 => array('user' => 'john', 'phone' => '911-19212')
+                    ));
+        $template = '<ul>{foreach persons as person}<li>{index~":"~person.user~":"~phone}</li>{endforeach}</ul>';
+        $expected = '<ul>' .
+                    '<li>1:jane:555-81281</li>' .
+                    '<li>2:mike:230-28382</li>' .
+                    '<li>3:john:911-19212</li>' .
+                    '</ul>';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testEmptyIteration()
+    {
+        $bindings = array('foo' => array(), 'bar' => false);
+        $template = '{foreach foo}foo{endforeach}:{foreach bar}bar{endforeach}';
+        $expected = ':';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testVariableScope()
+    {
+        $bindings = array('value' => 42, 'test' => array(
+                        array(),
+                        array('value' => 17),
+                        array('test' => array(
+                            array(),
+                            array('value' => 4)
+                        ))
+                    ));
+        $template = '{foreach test}{value}:{foreach test}{value}~{endforeach}{endforeach}';
+        $expected = '42:42~17~42~17:17~17~17~42:42~4~';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testNestedStatements()
+    {
+        foreach (range(0, 9) as $i) {
+            $bindings['loop'][$i]['i'] = "$i";
+        }
+        $template = '{foreach loop}' .
+                    '{if i+1>4 && i<(1+10/2)}{i==4*1 ? \'foo\'~i : "bar"}' .
+                    '{elseif !(i<=+4)}+{elseif i==""}..{else}{"-"}{endif}' .
+                    '{endforeach}';
+        $expected = '----foo4bar++++';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testFunctionCall()
+    {
+        $bindings = array('val' => array(0, 1, 2, 3));
+        $template = '{strlen("foobar") + count(val)}';
+        $expected = '10';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testFilters()
+    {
+        $bindings = array(
+            'pi' => 3.14159,
+            'format' => function($a, $b) { return number_format($a, $b); },
+            'upper' => function($a) { return strtoupper($a); }
+        );
+        $template = '{pi|format(3) ~ ":" ~ "foobar"|upper}';
+        $expected = '3.142:FOOBAR';
+        $tmpl_obj = new Template($template);
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testRawFilter()
+    {
+        $bindings = array('foo' => '<img>', 'upper' => function($a) { return strtoupper($a); });
+        $template = '{foo}:{foo|upper|raw}';
+        $expected = '&lt;img&gt;:<IMG>';
+        $tmpl_obj = new Template($template);
+        $tmpl_obj->autoescape('html');
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testHtmlAutoEscape()
+    {
+        $bindings = array('foo' => '<img>', 'pi' => 3.14159);
+        $template = '{foo}:{pi}';
+        $expected = '&lt;img&gt;:3.14159';
+        $tmpl_obj = new Template($template);
+        $tmpl_obj->autoescape('html');
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+
+    public function testJsonAutoEscape()
+    {
+        $bindings = array('foo' => '<img>', 'pi' => 3.14159);
+        $template = '{foo}:{pi}';
+        $expected = '"<img>":3.14159';
+        $tmpl_obj = new Template($template);
+        $tmpl_obj->autoescape('json');
+
+        $this->assertEquals($expected, $tmpl_obj->render($bindings));
+    }
+}
diff --git a/vendor/exTpl/Context.php b/vendor/exTpl/Context.php
deleted file mode 100644
index ea94b2f..0000000
--- a/vendor/exTpl/Context.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * Context.php - template parser symbol table
- *
- * Copyright (c) 2013  Elmar Ludwig
- *
- * 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.
- */
-
-namespace exTpl;
-
-/**
- * A Context object represents the symbol table used to resolve
- * symbol names to their values in the local scope. Each context
- * may inherit symbol definitions from its parent context.
- */
-class Context
-{
-    private $bindings;
-    private $escape;
-    private $parent;
-
-    /**
-     * Initializes a new Context instance with the given bindings.
-     *
-     * @param array $bindings   symbol table
-     * @param Context $parent   parent context (or NULL)
-     */
-    public function __construct($bindings, Context $parent = NULL)
-    {
-        $this->bindings = $bindings;
-        $this->parent = $parent;
-    }
-
-    /**
-     * Looks up the value of a symbol in this context and returns it.
-     * The reserved symbol "this" is an alias for the current context.
-     *
-     * @param string $key       symbol name
-     */
-    public function lookup($key)
-    {
-        if (isset($this->bindings[$key])) {
-            return $this->bindings[$key];
-        } else if ($this->parent) {
-            return $this->parent->lookup($key);
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Enables or disables automatic escaping for template values.
-     *
-     * @param callable $escape   escape callback or NULL
-     */
-    public function autoescape($escape)
-    {
-        $this->escape = $escape;
-    }
-
-    /**
-     * Escapes the given value using the configured strategy.
-     *
-     * @param mixed $value      expression value
-     */
-    public function escape($value)
-    {
-        if (isset($this->escape)) {
-            $value = call_user_func($this->escape, $value);
-        } else if ($this->parent) {
-            $value = $this->parent->escape($value);
-        }
-
-        return $value;
-    }
-}
diff --git a/vendor/exTpl/Expression.php b/vendor/exTpl/Expression.php
deleted file mode 100644
index 35ea458..0000000
--- a/vendor/exTpl/Expression.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/*
- * Expression.php - template parser expression interface and classes
- *
- * Copyright (c) 2013  Elmar Ludwig
- *
- * 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.
- */
-
-namespace exTpl;
-
-/**
- * Basic interface for expressions in the template parse tree. The
- * only required method is "value" to get the expression's value.
- */
-interface Expression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context);
-}
-
-/**
- * ConstantExpression represents a literal value.
- */
-class ConstantExpression implements Expression
-{
-    protected $value;
-
-    /**
-     * Initializes a new Expression instance.
-     *
-     * @param mixed $value      expression value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        return $this->value;
-    }
-}
-
-/**
- * SymbolExpression represents a symbol (template variable).
- */
-class SymbolExpression implements Expression
-{
-    protected $name;
-
-    /**
-     * Initializes a new Expression instance.
-     *
-     * @param string $name      symbol name
-     */
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Returns the name of this symbol.
-     */
-    public function name()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        return $context->lookup($this->name);
-    }
-}
-
-/**
- * UnaryExpression represents a unary operator.
- */
-abstract class UnaryExpression implements Expression
-{
-    protected $expr;
-
-    /**
-     * Initializes a new Expression instance.
-     *
-     * @param Expression $expr  expression object
-     */
-    public function __construct(Expression $expr)
-    {
-        $this->expr = $expr;
-    }
-}
-
-/**
- * MinusExpression represents the unary minus operator ('-').
- */
-class MinusExpression extends UnaryExpression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        return -$this->expr->value($context);
-    }
-}
-
-/**
- * NotExpression represents the logical negation operator ('!').
- */
-class NotExpression extends UnaryExpression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        return !$this->expr->value($context);
-    }
-}
-
-/**
- * RawExpression represents the "raw" filter function.
- */
-class RawExpression extends UnaryExpression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        return $this->expr->value($context);
-    }
-}
-
-/**
- * BinaryExpression represents a binary operator.
- */
-abstract class BinaryExpression implements Expression
-{
-    protected $left, $right;
-    protected $operator;
-
-    /**
-     * Initializes a new Expression instance.
-     *
-     * @param Expression $left  left operand
-     * @param Expression $right right operand
-     * @param mixed $operator   operator token
-     */
-    public function __construct(Expression $left, Expression $right, $operator)
-    {
-        $this->left = $left;
-        $this->right = $right;
-        $this->operator = $operator;
-    }
-}
-
-/**
- * ArithExpression represents an arithmetic operator.
- */
-class ArithExpression extends BinaryExpression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        $left = $this->left->value($context);
-        $right = $this->right->value($context);
-
-        switch ($this->operator) {
-            case '+': return $left + $right;
-            case '-': return $left - $right;
-            case '*': return $left * $right;
-            case '/': return $left / $right;
-            case '%': return $left % $right;
-            case '~': return $left . $right;
-        }
-    }
-}
-
-/**
- * IndexExpression represents the array index operator.
- */
-class IndexExpression extends BinaryExpression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        $left = $this->left->value($context);
-        $right = $this->right->value($context);
-
-        return $left[$right];
-    }
-}
-
-/**
- * BooleanExpression represents a boolean operator.
- */
-class BooleanExpression extends BinaryExpression
-{
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        $left = $this->left->value($context);
-        $right = $this->right->value($context);
-
-        switch ($this->operator) {
-            case T_IS_EQUAL           : return $left == $right;
-            case T_IS_NOT_EQUAL       : return $left != $right;
-            case '<'                  : return $left <  $right;
-            case T_IS_SMALLER_OR_EQUAL: return $left <= $right;
-            case '>'                  : return $left >  $right;
-            case T_IS_GREATER_OR_EQUAL: return $left >= $right;
-            case T_BOOLEAN_AND        : return $left && $right;
-            case T_BOOLEAN_OR         : return $left || $right;
-        }
-    }
-}
-
-/**
- * ConditionExpression represents the conditional operator ('?:').
- */
-class ConditionExpression implements Expression
-{
-    protected $condition;
-    protected $left, $right;
-
-    /**
-     * Initializes a new Expression instance.
-     *
-     * @param Expression $condition expression
-     * @param Expression $left      left alternative
-     * @param Expression $right     right alternative
-     */
-    public function __construct($condition, $left, $right)
-    {
-        $this->condition = $condition;
-        $this->left = $left;
-        $this->right = $right;
-    }
-
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        return $this->condition->value($context) ?
-                    $this->left->value($context) : $this->right->value($context);
-    }
-}
-
-/**
- * FunctionExpression represents a function call.
- */
-class FunctionExpression implements Expression
-{
-    protected $name;
-    protected $arguments;
-
-    /**
-     * Initializes a new Expression instance.
-     *
-     * @param Expression $name  function name
-     * @param array  $arguments function arguments
-     */
-    public function __construct(Expression $name, $arguments)
-    {
-        $this->name = $name;
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * Returns the value of this expression.
-     *
-     * @param Context $context  symbol table
-     */
-    public function value($context)
-    {
-        $callable = $this->name->value($context);
-        $arguments = array();
-
-        foreach ($this->arguments as $expr) {
-            $arguments[] = $expr->value($context);
-        }
-
-        if ($callable instanceof \Closure) {
-            return call_user_func_array($callable, $arguments);
-        }
-
-        return NULL;
-    }
-}
diff --git a/vendor/exTpl/Node.php b/vendor/exTpl/Node.php
deleted file mode 100644
index 0dbd946..0000000
--- a/vendor/exTpl/Node.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/*
- * Node.php - template parser node interface and classes
- *
- * Copyright (c) 2013  Elmar Ludwig
- *
- * 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.
- */
-
-namespace exTpl;
-
-require_once 'Context.php';
-require_once 'Expression.php';
-
-/**
- * Basic interface for nodes in the template parse tree. The only
- * required method is "render" to render a node and its children.
- */
-interface Node
-{
-    /**
-     * Returns a string representation of this node.
-     *
-     * @param Context $context  symbol table
-     */
-    public function render($context);
-}
-
-/**
- * TextNode represents a verbatim text segment.
- */
-class TextNode implements Node
-{
-    protected $text;
-
-    /**
-     * Initializes a new Node instance with the given text.
-     *
-     * @param string $text      verbatim text
-     */
-    public function __construct($text)
-    {
-        $this->text = $text;
-    }
-
-    /**
-     * Returns a string representation of this node.
-     *
-     * @param Context $context  symbol table
-     */
-    public function render($context)
-    {
-        return $this->text;
-    }
-}
-
-/**
- * ExpressionNode represents an expression tag: "{...}".
- */
-class ExpressionNode implements Node
-{
-    protected $expr;
-
-    /**
-     * Initializes a new Node instance with the given expression.
-     *
-     * @param Expression $expr  expression object
-     */
-    public function __construct(Expression $expr)
-    {
-        $this->expr = $expr;
-    }
-
-    /**
-     * Returns a string representation of this node.
-     *
-     * @param Context $context  symbol table
-     */
-    public function render($context)
-    {
-        $value = $this->expr->value($context);
-
-        if (!($this->expr instanceof RawExpression)) {
-            $value = $context->escape($value);
-        }
-
-        return $value;
-    }
-}
-
-/**
- * ArrayNode represents a sequence of arbitrary nodes.
- */
-class ArrayNode implements Node
-{
-    protected $nodes = array();
-
-    /**
-     * Adds a child node to this sequence node.
-     *
-     * @param Node $node        child node to add
-     */
-    public function addChild(Node $node)
-    {
-        $this->nodes[] = $node;
-    }
-
-    /**
-     * Returns a string representation of this node.
-     *
-     * @param Context $context  symbol table
-     */
-    public function render($context)
-    {
-        $result = '';
-
-        foreach ($this->nodes as $node) {
-            $result .= $node->render($context);
-        }
-
-        return $result;
-    }
-}
-
-/**
- * IteratorNode represents a single iterator tag:
- * "{foreach ARRAY [as [KEY =>] VALUE]}...{endforeach}".
- */
-class IteratorNode extends ArrayNode
-{
-    protected $expr;
-    protected $key_name;
-    protected $val_name;
-
-    /**
-     * Initializes a new Node instance with the given expression.
-     *
-     * @param Expression $expr  expression object
-     * @param string $key_name  name of variable on each iteration
-     * @param string $val_name  name of variable on each iteration
-     */
-    public function __construct(Expression $expr, $key_name, $val_name)
-    {
-        $this->expr = $expr;
-        $this->key_name = $key_name;
-        $this->val_name = $val_name;
-    }
-
-    /**
-     * Returns a string representation of this node. The IteratorNode
-     * renders the node sequence for each value in the expression list.
-     *
-     * @param Context $context  symbol table
-     */
-    public function render($context)
-    {
-        $values = $this->expr->value($context);
-        $result = '';
-
-        if (is_array($values) && is_int(key($values))) {
-            $bindings = array($this->key_name => &$key, $this->val_name => &$value);
-            $context = new Context($bindings, $context);
-
-            foreach ($values as $key => $value) {
-                $result .= parent::render(new Context($value, $context));
-            }
-        } else if (is_array($values) && count($values)) {
-            return parent::render(new Context($values, $context));
-        } else if ($values) {
-            return parent::render($context);
-        }
-
-        return $result;
-    }
-}
-
-/**
- * ConditionNode represents a single condition tag:
- * "{if CONDITION}...{else}...{endif}".
- */
-class ConditionNode extends ArrayNode
-{
-    protected $condition;
-    protected $else_node;
-
-    /**
-     * Initializes a new Node instance with the given expression.
-     *
-     * @param Expression $condition     expression object
-     */
-    public function __construct(Expression $condition)
-    {
-        $this->condition = $condition;
-    }
-
-    /**
-     * Adds an else block to this condition node.
-     */
-    public function addElse()
-    {
-        $this->else_node = new ArrayNode();
-    }
-
-    /**
-     * Adds a child node to this condition node.
-     *
-     * @param Node $node        child node to add
-     */
-    public function addChild(Node $node)
-    {
-        if ($this->else_node) {
-            $this->else_node->addChild($node);
-        } else {
-            parent::addChild($node);
-        }
-    }
-
-    /**
-     * Returns a string representation of this node.
-     *
-     * @param Context $context  symbol table
-     */
-    public function render($context)
-    {
-        if ($this->condition->value($context)) {
-            return parent::render($context);
-        }
-
-        return $this->else_node ? $this->else_node->render($context) : '';
-    }
-}
diff --git a/vendor/exTpl/Scanner.php b/vendor/exTpl/Scanner.php
deleted file mode 100644
index b2464fb..0000000
--- a/vendor/exTpl/Scanner.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/*
- * Scanner.php - template parser lexical scanner
- *
- * Copyright (c) 2013  Elmar Ludwig
- *
- * 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.
- */
-
-namespace exTpl;
-
-/**
- * Simple wrapper class around the Zend engine's lexical scanner. It
- * automatically skips whitespace and offers an interator interface.
- */
-class Scanner
-{
-    private $tokens;
-    private $token_type;
-    private $token_value;
-
-    /**
-     * Initializes a new Scanner instance for the given text.
-     *
-     * @param string $text      string to parse
-     */
-    public function __construct($text)
-    {
-        $this->tokens = token_get_all('<?php ' . $text);
-    }
-
-    /**
-     * Advances the scanner to the next token and returns its token type.
-     * The valid token types are those defined for token_get_all() in the
-     * PHP documentation. Returns false when the end of input is reached.
-     */
-    public function nextToken()
-    {
-        do {
-            $token = next($this->tokens);
-            $key = key($this->tokens);
-
-            // FIXME this workaround should be dropped
-            while ($token && $token[0] === T_STRING &&
-                   isset($this->tokens[$key + 2]) &&
-                   $this->tokens[++$key] === '-' &&
-                   $this->tokens[++$key][0] === T_STRING) {
-                $token[1] .= '-' . $this->tokens[$key][1];
-                next($this->tokens);
-                next($this->tokens);
-            }
-        } while (is_array($token) && $token[0] === T_WHITESPACE);
-
-        if (is_string($token) || $token === false) {
-            $this->token_type = $token;
-            $this->token_value = NULL;
-        } else {
-            $this->token_type = $token[0];
-
-            switch ($token[0]) {
-                case T_CONSTANT_ENCAPSED_STRING:
-                    $this->token_value = stripcslashes(substr($token[1], 1, -1));
-                    break;
-                case T_DNUMBER:
-                    $this->token_value = (double) $token[1];
-                    break;
-                case T_LNUMBER:
-                    $this->token_value = (int) $token[1];
-                    break;
-                default:
-                    $this->token_value = $token[1];
-            }
-        }
-
-        return $this->token_type;
-    }
-
-    /**
-     * Returns the current token type. The valid token types are
-     * those defined for token_get_all() in the PHP documentation.
-     */
-    public function tokenType()
-    {
-        return $this->token_type;
-    }
-
-    /**
-     * Returns the current token value if the token type supports
-     * a value (T_STRING, T_LNUMBER etc.). Returns NULL otherwise.
-     */
-    public function tokenValue()
-    {
-        return $this->token_value;
-    }
-}
diff --git a/vendor/exTpl/Template.php b/vendor/exTpl/Template.php
deleted file mode 100644
index 9d5be04..0000000
--- a/vendor/exTpl/Template.php
+++ /dev/null
@@ -1,535 +0,0 @@
-<?php
-/*
- * Template.php - expression template parser
- *
- * Copyright (c) 2013  Elmar Ludwig
- *
- * 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.
- */
-
-namespace exTpl;
-
-require_once 'Scanner.php';
-require_once 'Node.php';
-
-/**
- * The Template class is the only externally visible API of this
- * template implementation. It can be used to create and render
- * template objects.
- */
-class Template
-{
-    private static $tag_start = '{';
-    private static $tag_end = '}';
-    private $escape;
-    private $functions;
-    private $template;
-
-    /**
-     * Sets the delimiter strings used for the template tags, the
-     * default delimiters are: $tag_start = '{', $tag_end = '}'.
-     *
-     * @param string $tag_start tag start marker
-     * @param string $tag_end   tag end marker
-     */
-    public static function setTagMarkers($tag_start, $tag_end)
-    {
-        self::$tag_start = $tag_start;
-        self::$tag_end = $tag_end;
-    }
-
-    /**
-     * Initializes a new Template instance from the given string.
-     *
-     * @param string $string    template text
-     */
-    public function __construct($string)
-    {
-        $this->template = new ArrayNode();
-        $this->functions = array(
-            'count' => function($a) { return count($a); },
-            'strlen' => function($a) { return mb_strlen($a); }
-        );
-        self::parseTemplate($this->template, $string, 0);
-    }
-
-    /**
-     * Enables or disables automatic escaping for template values.
-     * Currently supported strategies: NULL, 'html', 'json', 'xml'
-     *
-     * @param string|callable $escape   escape strategy or callback
-     */
-    public function autoescape($escape)
-    {
-        if ($escape === 'html' || $escape === 'xml') {
-            $this->escape = 'htmlspecialchars';
-        } else if ($escape === 'json') {
-            $this->escape = 'json_encode';
-        } else if (is_callable($escape)) {
-            $this->escape = $escape;
-        } else if ($escape === NULL) {
-            $this->escape = NULL;
-        } else {
-            throw new InvalidArgumentException("invalid escape strategy: $escape");
-        }
-    }
-
-    /**
-     * Renders the template to a string using the given array of
-     * bindings to resolve symbol references inside the template.
-     *
-     * @param array $bindings   symbol table
-     *
-     * @return string   string representation of the template
-     */
-    public function render(array $bindings)
-    {
-        $context = new Context($bindings + $this->functions);
-        $context->autoescape($this->escape);
-
-        return $this->template->render($context);
-    }
-
-    /**
-     * Skips tokens until the end of the current tag is reached.
-     *
-     * @param string $string    template text
-     * @param int    $pos       offset in string
-     *
-     * @return int      new offset in the string
-     */
-    private static function skipTokens($string, $pos)
-    {
-        for ($len = strlen($string); $pos < $len &&
-                substr_compare($string, self::$tag_end, $pos, strlen(self::$tag_end)); ++$pos) {
-            $chr = $string[$pos];
-            if ($chr === '"' || $chr === "'") {
-                while (++$pos < $len && $string[$pos] !== $chr) {
-                    if ($string[$pos] === '\\') {
-                        ++$pos;
-                    }
-                }
-            }
-        }
-
-        return $pos;
-    }
-
-    /**
-     * Parses a template string into a template node tree, starting
-     * at the specified offset. All created nodes are added to the
-     * given sequence node.
-     *
-     * @param ArrayNode $node   template node to build
-     * @param string    $string string to parse
-     * @param int       $pos    offset in string
-     *
-     * @return int      new offset in the string
-     */
-    private static function parseTemplate(ArrayNode $node, $string, $pos)
-    {
-        $len = strlen($string);
-
-        while ($pos < $len) {
-            $next_pos = strpos($string, self::$tag_start, $pos);
-
-            if ($next_pos === false) {
-                $child = new TextNode(substr($string, $pos));
-                $node->addChild($child);
-                break;
-            }
-
-            if ($next_pos > $pos) {
-                $child = new TextNode(substr($string, $pos, $next_pos - $pos));
-                $node->addChild($child);
-            }
-
-            $pos = $next_pos + strlen(self::$tag_start);
-            $next_pos = self::skipTokens($string, $pos);
-            $scanner = new Scanner(substr($string, $pos, $next_pos - $pos));
-            $pos = $next_pos + strlen(self::$tag_end);
-
-            switch ($scanner->nextToken()) {
-                case T_FOREACH:
-                    $scanner->nextToken();
-                    $expr = self::parseExpr($scanner);
-                    $key_name = 'index';
-                    $val_name = 'this';
-
-                    if ($scanner->tokenType() === T_AS) {
-                        $scanner->nextToken();
-
-                        if ($scanner->tokenType() !== T_STRING) {
-                            throw new TemplateParserException('symbol expected', $scanner);
-                        }
-
-                        $val_name = $scanner->tokenValue();
-                        $scanner->nextToken();
-
-                        if ($scanner->tokenType() === T_DOUBLE_ARROW) {
-                            $scanner->nextToken();
-
-                            if ($scanner->tokenType() !== T_STRING) {
-                                throw new TemplateParserException('symbol expected', $scanner);
-                            }
-
-                            $key_name = $val_name;
-                            $val_name = $scanner->tokenValue();
-                            $scanner->nextToken();
-                        }
-                    }
-
-                    $child = new IteratorNode($expr, $key_name, $val_name);
-                    $pos = self::parseTemplate($child, $string, $pos);
-                    $node->addChild($child);
-                    break;
-                case T_ENDFOREACH:
-                    return $pos;
-                case T_IF:
-                    $scanner->nextToken();
-                    $child = new ConditionNode(self::parseExpr($scanner));
-                    $pos = self::parseTemplate($child, $string, $pos);
-                    $node->addChild($child);
-                    break;
-                case T_ELSEIF:
-                    $scanner->nextToken();
-                    $child = new ConditionNode(self::parseExpr($scanner));
-                    $node->addElse();
-                    $node->addChild($child);
-                    return self::parseTemplate($child, $string, $pos);
-                case T_ELSE:
-                    $scanner->nextToken();
-                    $node->addElse();
-                    break;
-                case T_ENDIF:
-                    return $pos;
-                default:
-                    $child = new ExpressionNode(self::parseExpr($scanner));
-                    $node->addChild($child);
-            }
-
-            if ($scanner->tokenType() !== false) {
-                throw new TemplateParserException('syntax error', $scanner);
-            }
-        }
-
-        return $pos;
-    }
-
-    /**
-     * value: NUMBER | STRING | SYMBOL | '(' expr ')'
-     */
-    private static function parseValue(Scanner $scanner)
-    {
-        switch ($scanner->tokenType()) {
-            case T_CONSTANT_ENCAPSED_STRING:
-            case T_DNUMBER:
-            case T_LNUMBER:
-                $result = new ConstantExpression($scanner->tokenValue());
-                break;
-            case T_STRING:
-                $result = new SymbolExpression($scanner->tokenValue());
-                break;
-            case '(':
-                $scanner->nextToken();
-                $result = self::parseExpr($scanner);
-
-                if ($scanner->tokenType() !== ')') {
-                    throw new TemplateParserException('missing ")"', $scanner);
-                }
-                break;
-            default:
-                throw new TemplateParserException('syntax error', $scanner);
-        }
-
-        $scanner->nextToken();
-        return $result;
-    }
-
-    /**
-     * function: value | function '(' ')' | function '(' expr { ',' expr } ')'
-     */
-    private static function parseFunction(Scanner $scanner)
-    {
-        $result = self::parseValue($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === '(') {
-            $scanner->nextToken();
-            $arguments = array();
-
-            if ($scanner->tokenType() !== ')') {
-                $arguments[] = self::parseExpr($scanner);
-
-                while ($scanner->tokenType() === ',') {
-                    $scanner->nextToken();
-                    $arguments[] = self::parseExpr($scanner);
-                }
-
-                if ($scanner->tokenType() !== ')') {
-                    throw new TemplateParserException('missing ")"', $scanner);
-                }
-            }
-
-            $scanner->nextToken();
-            $result = new FunctionExpression($result, $arguments);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * index: function | index '[' expr ']' | index '.' SYMBOL
-     */
-    private static function parseIndex(Scanner $scanner)
-    {
-        $result = self::parseFunction($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === '[' || $type === '.') {
-            $scanner->nextToken();
-
-            if ($type === '[') {
-                $expr = self::parseExpr($scanner);
-
-                if ($scanner->tokenType() !== ']') {
-                    throw new TemplateParserException('missing "]"', $scanner);
-                }
-            } else if ($scanner->tokenType() === T_STRING) {
-                $expr = new ConstantExpression($scanner->tokenValue());
-            } else {
-                throw new TemplateParserException('symbol expected', $scanner);
-            }
-
-            $scanner->nextToken();
-            $result = new IndexExpression($result, $expr, $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * filter: index | filter '|' SYMBOL | filter '|' SYMBOL '(' expr { ',' expr } ')'
-     */
-    private static function parseFilter(Scanner $scanner)
-    {
-        $result = self::parseIndex($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === '|') {
-            $scanner->nextToken();
-
-            if ($scanner->tokenType() !== T_STRING) {
-                throw new TemplateParserException('symbol expected', $scanner);
-            }
-
-            $arguments = array($result);
-            $symbol = new SymbolExpression($scanner->tokenValue());
-            $scanner->nextToken();
-
-            if ($scanner->tokenType() === '(') {
-                $scanner->nextToken();
-
-                if ($scanner->tokenType() !== ')') {
-                    $arguments[] = self::parseExpr($scanner);
-
-                    while ($scanner->tokenType() === ',') {
-                        $scanner->nextToken();
-                        $arguments[] = self::parseExpr($scanner);
-                    }
-
-                    if ($scanner->tokenType() !== ')') {
-                        throw new TemplateParserException('missing ")"', $scanner);
-                    }
-                }
-
-                $scanner->nextToken();
-            }
-
-            if ($symbol->name() === 'raw') {
-                $result = new RawExpression($result);
-            } else {
-                $result = new FunctionExpression($symbol, $arguments);
-            }
-
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * sign: '!' sign | '+' sign | '-' sign | filter
-     */
-    private static function parseSign(Scanner $scanner)
-    {
-        switch ($scanner->tokenType()) {
-            case '!':
-                $scanner->nextToken();
-                $result = new NotExpression(self::parseSign($scanner));
-                break;
-            case '+':
-                $scanner->nextToken();
-                $result = self::parseSign($scanner);
-                break;
-            case '-':
-                $scanner->nextToken();
-                $result = new MinusExpression(self::parseSign($scanner));
-                break;
-            default:
-                $result = self::parseFilter($scanner);
-        }
-
-        return $result;
-    }
-
-    /**
-     * product: sign | product '*' sign | product '/' sign | product '%' sign
-     */
-    private static function parseProduct(Scanner $scanner)
-    {
-        $result = self::parseSign($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === '*' || $type === '/' || $type === '%') {
-            $scanner->nextToken();
-            $result = new ArithExpression($result, self::parseSign($scanner), $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * sum: product | sum '+' product | sum '-' product | sum '~' product
-     */
-    private static function parseSum(Scanner $scanner)
-    {
-        $result = self::parseProduct($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === '+' || $type === '-' || $type === '~') {
-            $scanner->nextToken();
-            $result = new ArithExpression($result, self::parseProduct($scanner), $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * lt_gt: sum | lt_gt '<' concat | lt_gt IS_SMALLER_OR_EQUAL concat
-     *            | lt_gt '>' concat | lt_gt IS_GREATER_OR_EQUAL concat
-     */
-    private static function parseLtGt(Scanner $scanner)
-    {
-        $result = self::parseSum($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === '<' || $type === T_IS_SMALLER_OR_EQUAL ||
-               $type === '>' || $type === T_IS_GREATER_OR_EQUAL) {
-            $scanner->nextToken();
-            $result = new BooleanExpression($result, self::parseSum($scanner), $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * cmp: lt_gt | cmp IS_EQUAL lt_gt | cmp IS_NOT_EQUAL lt_gt
-     */
-    private static function parseCmp(Scanner $scanner)
-    {
-        $result = self::parseLtGt($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === T_IS_EQUAL || $type === T_IS_NOT_EQUAL) {
-            $scanner->nextToken();
-            $result = new BooleanExpression($result, self::parseLtGt($scanner), $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * and: cmp | and BOOLEAN_AND cmp
-     */
-    private static function parseAnd(Scanner $scanner)
-    {
-        $result = self::parseCmp($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === T_BOOLEAN_AND) {
-            $scanner->nextToken();
-            $result = new BooleanExpression($result, self::parseCmp($scanner), $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * or: and | or BOOLEAN_OR and
-     */
-    private static function parseOr(Scanner $scanner)
-    {
-        $result = self::parseAnd($scanner);
-        $type = $scanner->tokenType();
-
-        while ($type === T_BOOLEAN_OR) {
-            $scanner->nextToken();
-            $result = new BooleanExpression($result, self::parseAnd($scanner), $type);
-            $type = $scanner->tokenType();
-        }
-
-        return $result;
-    }
-
-    /**
-     * expr: or | or '?' expr ':' expr | or '?' ':' expr
-     */
-    private static function parseExpr(Scanner $scanner)
-    {
-        $result = self::parseOr($scanner);
-
-        if ($scanner->tokenType() === '?') {
-            $scanner->nextToken();
-
-            if ($scanner->tokenType() !== ':') {
-                $expr = self::parseExpr($scanner);
-            } else {
-                $expr = $result;
-            }
-
-            if ($scanner->tokenType() !== ':') {
-                throw new TemplateParserException('missing ":"', $scanner);
-            }
-
-            $scanner->nextToken();
-            $result = new ConditionExpression($result, $expr, self::parseExpr($scanner));
-        }
-
-        return $result;
-    }
-}
-
-/**
- * Exception class used to report template parse errors.
- */
-class TemplateParserException extends \Exception
-{
-    public function __construct($message, $scanner)
-    {
-        $type = $scanner->tokenType();
-        $value = is_int($type) ? $scanner->tokenValue() : $type;
-
-        return parent::__construct("$message at \"$value\"");
-    }
-}
diff --git a/vendor/exTpl/template_test.php b/vendor/exTpl/template_test.php
deleted file mode 100644
index 62aee1c..0000000
--- a/vendor/exTpl/template_test.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/*
- * template_test.php - expression template unit tests
- *
- * Copyright (c) 2013  Elmar Ludwig
- *
- * 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.
- */
-
-require 'Template.php';
-
-use exTpl\Template;
-
-class template_test extends PHPUnit\Framework\TestCase
-{
-    public function testSimpleString()
-    {
-        $bindings = array();
-        $template = 'The quick brown fox jumps over the layz dog.';
-        $expected = $template;
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testConstantExpression()
-    {
-        $bindings = array();
-        $template = '17 + 4 = {"foo" != "bar" ? 17 + 4 : 42.0}';
-        $expected = '17 + 4 = 21';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testConditionExpression()
-    {
-        $bindings = array('a' => 0, 'b' => 42);
-        $template = 'answer is {"" ?: a ?: b}';
-        $expected = 'answer is 42';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testStringEscapes()
-    {
-        $bindings = array();
-        $template = '"{"\\tfoo\'\\"\\n"}{\'{"bar"}\'}"';
-        $expected = "\"\tfoo'\"\n{\"bar\"}\"";
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testOperatorPrecedence()
-    {
-        $bindings = array('val' => array(array(42)));
-        $template = '{-val[0][0] / (17+4) + 8 > 6 && "foo" == "f"~"o"~"o" ? 1 : 2}';
-        $expected = '2';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testSimpleBindings()
-    {
-        $bindings = array('foo' => 'bar', 'val' => array(17, 4), 'pi' => 3.14159);
-        $template = 'foo = "{foo}", sum = {val[0] + val[1]}, pi^2 = {pi * pi}, x = {x}';
-        $expected = 'foo = "bar", sum = 21, pi^2 = 9.8695877281, x = ';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testConditional()
-    {
-        $bindings = array('foo' => 'bar', 'pi' => 3.14159);
-        $template = '{if foo == "foo"}NO{elseif foo == "bar"}pi = {pi}{else}NO{endif}';
-        $expected = 'pi = 3.14159';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testConditionalIteration()
-    {
-        $bindings = array('foo' => 'bar', 'pi' => 3.14159);
-        $template = '{foreach foo}{if foo}{foo}{endif}{endforeach}';
-        $expected = 'bar';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testIteration()
-    {
-        $bindings = array('persons' => array(
-                        1 => array('user' => 'jane', 'phone' => '555-81281'),
-                        2 => array('user' => 'mike', 'phone' => '230-28382'),
-                        3 => array('user' => 'john', 'phone' => '911-19212')
-                    ));
-        $template = '<ul>{foreach persons as person}<li>{index~":"~person.user~":"~phone}</li>{endforeach}</ul>';
-        $expected = '<ul>' .
-                    '<li>1:jane:555-81281</li>' .
-                    '<li>2:mike:230-28382</li>' .
-                    '<li>3:john:911-19212</li>' .
-                    '</ul>';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testEmptyIteration()
-    {
-        $bindings = array('foo' => array(), 'bar' => false);
-        $template = '{foreach foo}foo{endforeach}:{foreach bar}bar{endforeach}';
-        $expected = ':';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testVariableScope()
-    {
-        $bindings = array('value' => 42, 'test' => array(
-                        array(),
-                        array('value' => 17),
-                        array('test' => array(
-                            array(),
-                            array('value' => 4)
-                        ))
-                    ));
-        $template = '{foreach test}{value}:{foreach test}{value}~{endforeach}{endforeach}';
-        $expected = '42:42~17~42~17:17~17~17~42:42~4~';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testNestedStatements()
-    {
-        foreach (range(0, 9) as $i) {
-            $bindings['loop'][$i]['i'] = "$i";
-        }
-        $template = '{foreach loop}' .
-                    '{if i+1>4 && i<(1+10/2)}{i==4*1 ? \'foo\'~i : "bar"}' .
-                    '{elseif !(i<=+4)}+{elseif i==""}..{else}{"-"}{endif}' .
-                    '{endforeach}';
-        $expected = '----foo4bar++++';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testFunctionCall()
-    {
-        $bindings = array('val' => array(0, 1, 2, 3));
-        $template = '{strlen("foobar") + count(val)}';
-        $expected = '10';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testFilters()
-    {
-        $bindings = array(
-            'pi' => 3.14159,
-            'format' => function($a, $b) { return number_format($a, $b); },
-            'upper' => function($a) { return strtoupper($a); }
-        );
-        $template = '{pi|format(3) ~ ":" ~ "foobar"|upper}';
-        $expected = '3.142:FOOBAR';
-        $tmpl_obj = new Template($template);
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testRawFilter()
-    {
-        $bindings = array('foo' => '<img>', 'upper' => function($a) { return strtoupper($a); });
-        $template = '{foo}:{foo|upper|raw}';
-        $expected = '&lt;img&gt;:<IMG>';
-        $tmpl_obj = new Template($template);
-        $tmpl_obj->autoescape('html');
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testHtmlAutoEscape()
-    {
-        $bindings = array('foo' => '<img>', 'pi' => 3.14159);
-        $template = '{foo}:{pi}';
-        $expected = '&lt;img&gt;:3.14159';
-        $tmpl_obj = new Template($template);
-        $tmpl_obj->autoescape('html');
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-
-    public function testJsonAutoEscape()
-    {
-        $bindings = array('foo' => '<img>', 'pi' => 3.14159);
-        $template = '{foo}:{pi}';
-        $expected = '"<img>":3.14159';
-        $tmpl_obj = new Template($template);
-        $tmpl_obj->autoescape('json');
-
-        $this->assertEquals($expected, $tmpl_obj->render($bindings));
-    }
-}
-- 
cgit v1.0


From 6860e928e832ca5c879426c809822b340c7b971b Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 8 May 2024 07:52:35 +0000
Subject: =?UTF-8?q?Resolve=20"Barrierefreiheit:=20Gr=C3=B6=C3=9Fer=20geste?=
 =?UTF-8?q?llter=20Text=20w=C3=A4chst=20aus=20Box"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4006

Merge request studip/studip!2856
---
 resources/assets/stylesheets/scss/contents.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/stylesheets/scss/contents.scss b/resources/assets/stylesheets/scss/contents.scss
index fc8a6c9..8e02284 100644
--- a/resources/assets/stylesheets/scss/contents.scss
+++ b/resources/assets/stylesheets/scss/contents.scss
@@ -8,7 +8,7 @@
         width: 100%;
 
         .content-item {
-            height: 100px;
+            min-height: 100px;
 
             .content-item-link {
                 padding: 5px;
@@ -46,7 +46,7 @@
         background-color: var(--dark-gray-color-5);
         border: solid thin var(--light-gray-color-40);
         display: flex;
-        height: 150px;
+        min-height: 150px;
         justify-content: stretch;
 
         .content-item-link {
-- 
cgit v1.0


From c226b6bb23eec2f3cb1d61374ef11a61e3e99c04 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 8 May 2024 07:56:54 +0000
Subject: fixes #4129

Closes #4129

Merge request studip/studip!2973
---
 tests/unit/lib/classes/SimpleOrMapNodbTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/unit/lib/classes/SimpleOrMapNodbTest.php b/tests/unit/lib/classes/SimpleOrMapNodbTest.php
index 4c35d27..3ede1aa 100644
--- a/tests/unit/lib/classes/SimpleOrMapNodbTest.php
+++ b/tests/unit/lib/classes/SimpleOrMapNodbTest.php
@@ -46,10 +46,17 @@ class auth_user_md5 extends SimpleORMap
     }
 }
 
+/**
+ * @backupGlobals enabled
+ */
 class SimpleOrMapNodbTest extends \Codeception\Test\Unit
 {
     protected static function setupFixture(): void
     {
+        if (count($GLOBALS['CONTENT_LANGUAGES']) < 2) {
+            $GLOBALS['CONTENT_LANGUAGES']['en_GB'] = ['picture' => 'lang_en.gif', 'name' => 'English'];
+        }
+
         StudipTestHelper::set_up_tables(['auth_user_md5']);
     }
 
-- 
cgit v1.0


From eb6fcd5c560f3938ea4f60fbe70ad09261c300cc Mon Sep 17 00:00:00 2001
From: Peter Thienel <thienel@data-quest.de>
Date: Wed, 8 May 2024 08:16:05 +0000
Subject: =?UTF-8?q?Resolve=20"iCal=20Export=20liefert=20abgew=C3=A4hlte=20?=
 =?UTF-8?q?Veranstaltungstermine=20mit=20aus"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3938

Merge request studip/studip!2940
---
 lib/classes/calendar/ICalendarExport.class.php   | 49 +++++++-----------------
 lib/models/calendar/CalendarCourseDate.class.php | 48 ++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/lib/classes/calendar/ICalendarExport.class.php b/lib/classes/calendar/ICalendarExport.class.php
index ce50f87..1454179 100644
--- a/lib/classes/calendar/ICalendarExport.class.php
+++ b/lib/classes/calendar/ICalendarExport.class.php
@@ -76,20 +76,7 @@ class ICalendarExport
         if ($this->time === 0) {
             $this->time = time();
         }
-        $dates = CourseDate::findBySql(
-            "LEFT JOIN `seminar_user`
-                ON `termine`.`range_id` = `seminar_user`.`Seminar_id`
-            WHERE
-                `seminar_user`.`user_id` = :user_id
-                AND `seminar_user`.`bind_calendar` = 1
-                AND (`termine`.`date` <= :end
-                    AND `termine`.`end_time` >= :begin)",
-            [
-                ':user_id'  => $user_id,
-                ':begin'    => $start->getTimestamp(),
-                ':end'      => $end->getTimestamp(),
-            ]
-        );
+        $dates = CalendarCourseDate::getEvents($start, $end, $user_id);
         $ical = '';
         foreach ($dates as $date) {
             $ical .= $this->writeICalEvent($this->prepareCourseDate($date));
@@ -102,20 +89,7 @@ class ICalendarExport
         if ($this->time === 0) {
             $this->time = time();
         }
-        $dates = CourseExDate::findBySql(
-            "LEFT JOIN `seminar_user`
-                ON `ex_termine`.`range_id` = `seminar_user`.`Seminar_id`
-            WHERE
-                `seminar_user`.`user_id` = :user_id
-                AND `seminar_user`.`bind_calendar` = 1
-                AND (`ex_termine`.`date` <= :end
-                    AND `ex_termine`.`end_time` >= :begin)",
-            [
-                ':user_id'  => $user_id,
-                ':begin'    => $start->getTimestamp(),
-                ':end'      => $end->getTimestamp(),
-            ]
-        );
+        $dates = CalendarCourseExDate::getEvents($start, $end, $user_id);
         $ical = '';
         foreach ($dates as $date) {
             $ical .= $this->writeICalEvent($this->prepareCourseDate($date));
@@ -124,10 +98,10 @@ class ICalendarExport
     }
 
     /**
-     * @param CalendarDate | CourseExDate $date
-     * @return array
+     * @param CalendarDate $date The calendar date to export.
+     * @return array Calendar date data prepared for export.
      */
-    public function prepareCalendarDate($date): array
+    public function prepareCalendarDate(CalendarDate $date): array
     {
         return [
             'SUMMARY'       => $date->title,
@@ -155,8 +129,8 @@ class ICalendarExport
     }
 
     /**
-     * @param CalendarDate | CourseExDate $date
-     * @return array
+     * @param CourseDate | CourseExDate $date The course date to export.
+     * @return array Course date data prepared for export.
      */
     public function prepareCourseDate($date): array
     {
@@ -165,10 +139,13 @@ class ICalendarExport
         if ($date instanceof CourseExDate) {
             $summary .= ' ' . _('(fällt aus)');
             $categories = '';
+            $description = $date->content;
+        } else {
+            $description = implode("\n", $date->topics->pluck('title'));
         }
         return [
             'SUMMARY'       => $summary,
-            'DESCRIPTION'   => '',
+            'DESCRIPTION'   => $description,
             'LOCATION'      => $date->getRoomName(),
             'CATEGORIES'    => $categories,
             'LAST-MODIFIED' => $date->chdate,
@@ -381,8 +358,8 @@ class ICalendarExport
     public function _exportDateTime($value, $utc = false)
     {
         $date_time = new DateTime();
-        $date_time->setTimestamp($value);
-        //transform local time in UTC
+        $date_time->setTimestamp(intval($value));
+        //transform local time to UTC
         if ($utc) {
             $tz_utc = new DateTimeZone('UTC');
             $date_time->setTimezone($tz_utc);
diff --git a/lib/models/calendar/CalendarCourseDate.class.php b/lib/models/calendar/CalendarCourseDate.class.php
index 49179bd..370dcd1 100644
--- a/lib/models/calendar/CalendarCourseDate.class.php
+++ b/lib/models/calendar/CalendarCourseDate.class.php
@@ -8,7 +8,13 @@ class CalendarCourseDate extends CourseDate
 {
     public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
     {
-        return parent::findBySQL(
+        $events = [];
+        parent::findEachBySQL(
+            function ($e) use (&$events, $range_id) {
+                if (self::checkRelated($e, $range_id)) {
+                    $events[] = $e;
+                }
+            },
             "JOIN `seminar_user`
                ON `seminar_user`.`seminar_id` = `termine`.`range_id`
              WHERE `seminar_user`.`user_id` = :user_id
@@ -30,5 +36,45 @@ class CalendarCourseDate extends CourseDate
                 'user_id' => $range_id
             ]
         );
+        return $events;
+    }
+
+    /**
+     * Checks if given user is the responsible lecturer or is member of a
+     * related group.
+     *
+     * @global object $perm The global perm object.
+     * @param CalendarCourseDate $event The course event to check against.
+     * @param string $user_id The id of the user.
+     * @return boolean
+     */
+    protected static function checkRelated(CalendarCourseDate $event, string $user_id): bool
+    {
+        $check_related = false;
+        $permission = $GLOBALS['perm']->get_studip_perm($event->range_id, $user_id);
+        switch ($permission) {
+            case 'dozent' :
+                $related_persons = $event->dozenten->pluck('user_id');
+                if (count($related_persons) > 0) {
+                    $check_related = in_array($user_id, $related_persons);
+                } else {
+                    $check_related = true;
+                }
+                break;
+            case 'tutor' :
+                $check_related = true;
+                break;
+            default :
+                $group_ids = $event->statusgruppen->pluck('statusgruppe_id');
+                if (count($group_ids) > 0) {
+                    $member = StatusgruppeUser::findBySQL(
+                        'statusgruppe_id IN(?) AND user_id = ?',
+                        [$group_ids, $user_id]);
+                    $check_related = count($member) > 0;
+                } else {
+                    $check_related = true;
+                }
+        }
+        return $check_related;
     }
 }
-- 
cgit v1.0


From b56bb5506f46ae8f6ed249902cfcad2524c1f2af Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 8 May 2024 11:40:11 +0000
Subject: update doc-block, fixes #4130

Closes #4130

Merge request studip/studip!2974
---
 lib/classes/SimpleORMap.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
index f86ec6f..2606086 100644
--- a/lib/classes/SimpleORMap.class.php
+++ b/lib/classes/SimpleORMap.class.php
@@ -454,7 +454,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
     /**
      * Returns new instance for given key when found in the database, else null.
      *
-     * @param string $id primary key
+     * @param string|array $id primary key
      * @return static|null
      */
     public static function find($id)
-- 
cgit v1.0


From 79a1564005f300ea9ee23a2769756e2e12001f96 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 8 May 2024 12:56:34 +0000
Subject: introduce altcha/captcha, fixes #4113

Closes #4113

Merge request studip/studip!2965
---
 app/controllers/accessibility/forms.php            |  3 +
 app/controllers/captcha.php                        | 12 +++
 db/migrations/6.0.2_captcha_by_altcha.php          | 39 ++++++++++
 lib/classes/forms/Captcha.php                      | 29 +++++++
 lib/classes/forms/CaptchaInput.php                 | 38 ++++++++++
 lib/classes/forms/Form.php                         |  8 +-
 lib/classes/forms/Part.php                         |  2 +-
 lib/cronjobs/garbage_collector.class.php           |  3 +
 lib/models/CaptchaChallenge.php                    | 88 ++++++++++++++++++++++
 package-lock.json                                  |  7 ++
 package.json                                       |  1 +
 resources/vue/base-components.js                   |  1 +
 .../vue/components/form_inputs/CaptchaInput.vue    | 70 +++++++++++++++++
 templates/forms/form.php                           |  6 +-
 14 files changed, 301 insertions(+), 6 deletions(-)
 create mode 100644 app/controllers/captcha.php
 create mode 100644 db/migrations/6.0.2_captcha_by_altcha.php
 create mode 100644 lib/classes/forms/Captcha.php
 create mode 100644 lib/classes/forms/CaptchaInput.php
 create mode 100644 lib/models/CaptchaChallenge.php
 create mode 100644 resources/vue/components/form_inputs/CaptchaInput.vue

diff --git a/app/controllers/accessibility/forms.php b/app/controllers/accessibility/forms.php
index 476f2fe..e240a6c 100644
--- a/app/controllers/accessibility/forms.php
+++ b/app/controllers/accessibility/forms.php
@@ -146,6 +146,9 @@ class Accessibility_FormsController extends StudipController
         }
 
         $this->form->addPart($personal_data_part);
+
+        $this->form->addPart(new \Studip\Forms\Captcha());
+
         $this->form->setSaveButtonText(_('Barriere melden'));
         $this->form->setSaveButtonName('report');
         $this->form->setURL($this->report_barrierURL());
diff --git a/app/controllers/captcha.php b/app/controllers/captcha.php
new file mode 100644
index 0000000..37bac47
--- /dev/null
+++ b/app/controllers/captcha.php
@@ -0,0 +1,12 @@
+<?php
+final class CaptchaController extends StudipController
+{
+    public function challenge_action(): void
+    {
+        $this->response->add_header(
+            'Expires',
+            gmdate('D, d M Y H:i:s', time() + CaptchaChallenge::CHALLENGE_EXPIRATION) . ' GMT'
+        );
+        $this->render_json(CaptchaChallenge::createNewChallenge());
+    }
+}
diff --git a/db/migrations/6.0.2_captcha_by_altcha.php b/db/migrations/6.0.2_captcha_by_altcha.php
new file mode 100644
index 0000000..3749c71
--- /dev/null
+++ b/db/migrations/6.0.2_captcha_by_altcha.php
@@ -0,0 +1,39 @@
+<?php
+return new class extends Migration
+{
+    public function description(): string
+    {
+        return 'Creates a config entry for the key used for captchas and '
+             . 'db storage for solved challenges.';
+    }
+
+    protected function up(): void
+    {
+        $query = "INSERT INTO `config` (`field`, `value`, `type`, `range`, `mkdate`, `chdate`, `description`)
+                  VALUES ('CAPTCHA_KEY', '', 'string', 'global', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), ?)";
+        DBManager::get()->execute($query, [
+            'Speichert den für Captchas verwendeten Schlüssel (Wert leeren, um einen neuen zu generieren)',
+        ]);
+
+        $query = "CREATE TABLE `captcha_challenges` (
+                      `challenge_id` int(11) NOT NULL AUTO_INCREMENT,
+                      `salt` CHAR(32) COLLATE `latin1_bin` NOT NULL,
+                      `number` INT(11) UNSIGNED NOT NULL,
+                      `mkdate` INT(11) UNSIGNED NOT NULL,
+                      PRIMARY KEY (`challenge_id`)                        
+                  )";
+        DBManager::get()->exec($query);
+    }
+
+    protected function down(): void
+    {
+        $query = "DROP TABLE `captcha_challenges`";
+        DBManager::get()->exec($query);
+
+        $query = "DELETE `config`, `config_values`
+                  FROM `config`
+                  LEFT JOIN `config_values` USING (`field`)
+                  WHERE `field` = 'CAPTCHA_KEY'";
+        DBManager::get()->exec($query);
+    }
+};
diff --git a/lib/classes/forms/Captcha.php b/lib/classes/forms/Captcha.php
new file mode 100644
index 0000000..c01b702
--- /dev/null
+++ b/lib/classes/forms/Captcha.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Studip\Forms;
+
+use CaptchaChallenge;
+
+/**
+ * The Text class represents a part of a form that displays a captcha.
+ */
+class Captcha extends Fieldset
+{
+    private CaptchaInput $captcha_input;
+
+    public function __construct()
+    {
+        parent::__construct(_('Bitte bestätigen Sie, dass Sie kein Roboter sind'));
+
+        $captchaInput = new CaptchaInput('altcha', $this->legend, null);
+        $captchaInput->setStoringFunction(function (string $payload) {
+            $json = CaptchaChallenge::decodePayload($payload);
+
+            CaptchaChallenge::create([
+                'salt'   => $json['salt'],
+                'number' => $json['number'],
+            ]);
+        });
+        $this->addInput($captchaInput);
+    }
+}
diff --git a/lib/classes/forms/CaptchaInput.php b/lib/classes/forms/CaptchaInput.php
new file mode 100644
index 0000000..6476f87
--- /dev/null
+++ b/lib/classes/forms/CaptchaInput.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Studip\Forms;
+
+use CaptchaChallenge;
+use URLHelper;
+
+/**
+ * The Text class represents a part of a form that displays a captcha.
+ */
+final class CaptchaInput extends Input
+{
+    public function hasValidation(): bool
+    {
+        return true;
+    }
+
+    public function getValidationCallback(): callable
+    {
+        return fn($value) => \CaptchaChallenge::validatePayload($value);
+    }
+
+    public function render(): string
+    {
+        return sprintf(
+            '<captcha-input challenge-url="%s" v-model="%s" auto="onload"></captcha-input>',
+            URLHelper::getLink('dispatch.php/captcha/challenge', [], true),
+            htmlReady($this->name)
+        );
+    }
+
+    public function renderWithCondition(): string
+    {
+        return $this->render();
+    }
+
+
+}
diff --git a/lib/classes/forms/Form.php b/lib/classes/forms/Form.php
index fa0422e..8977a37 100644
--- a/lib/classes/forms/Form.php
+++ b/lib/classes/forms/Form.php
@@ -309,7 +309,7 @@ class Form extends Part
             //verify the user input:
             $output = [];
             foreach ($this->getAllInputs() as $input) {
-                if ($input->validate) {
+                if ($input->hasValidation()) {
                     $callback = $input->getValidationCallback();
                     $value = $this->getStorableValueFromRequest($input);
                     $valid = $callback($value, $input);
@@ -317,7 +317,7 @@ class Form extends Part
                         $output[$input->getName()] = [
                             'name' => $input->getName(),
                             'label' => $input->getTitle(),
-                            'error' => $callback($value, $input)
+                            'error' => $valid,
                         ];
                     }
                 }
@@ -396,7 +396,7 @@ class Form extends Part
         $stored = 0;
 
         foreach ($this->getAllInputs() as $input) {
-            if ($input->validate) {
+            if ($input->hasValidation()) {
                 $callback = $input->getValidationCallback();
                 $value = $this->getStorableValueFromRequest($input);
                 $valid = $callback($value, $input);
@@ -450,7 +450,7 @@ class Form extends Part
 
     /**
      * Returns all the Part objects like Fieldsets as an array.
-     * @return array
+     * @return Part[]
      */
     public function getParts() : array
     {
diff --git a/lib/classes/forms/Part.php b/lib/classes/forms/Part.php
index fdca8f5..779cab7 100644
--- a/lib/classes/forms/Part.php
+++ b/lib/classes/forms/Part.php
@@ -139,7 +139,7 @@ abstract class Part
 
     /**
      * Recursively returns all Input elements attached to this Part object or any child Parts.
-     * @return array
+     * @return Input[]
      */
     public function getAllInputs()
     {
diff --git a/lib/cronjobs/garbage_collector.class.php b/lib/cronjobs/garbage_collector.class.php
index 13d3029..e426cf3 100644
--- a/lib/cronjobs/garbage_collector.class.php
+++ b/lib/cronjobs/garbage_collector.class.php
@@ -195,5 +195,8 @@ class GarbageCollectorJob extends CronJob
             'mkdate < UNIX_TIMESTAMP() - ?',
             [TFASecret::getGreatestValidityDuration()]
         );
+
+        // Remove expired solved captcha challenges
+        CaptchaChallenge::gc();
     }
 }
diff --git a/lib/models/CaptchaChallenge.php b/lib/models/CaptchaChallenge.php
new file mode 100644
index 0000000..446985d
--- /dev/null
+++ b/lib/models/CaptchaChallenge.php
@@ -0,0 +1,88 @@
+<?php
+final class CaptchaChallenge extends SimpleORMap
+{
+    public const ALGORITHM = 'SHA-256';
+    public const CHALLENGE_EXPIRATION = 5 * 60;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'captcha_challenges';
+
+        parent::configure($config);
+    }
+
+    protected static function getKey(): string
+    {
+        $key = Config::get()->CAPTCHA_KEY;
+        if ($key === '') {
+            $key = bin2hex(random_bytes(32));
+            Config::get()->store('CAPTCHA_KEY', $key);
+        }
+        return $key;
+    }
+
+    public static function createChallenge(string $salt, int $number): array
+    {
+        $algorithm = 'sha256';
+        $challenge = hash($algorithm, $salt . $number);
+        $signature = hash_hmac($algorithm, $challenge, self::getKey());
+
+        return [
+            'algorithm' => self::ALGORITHM,
+            'challenge' => $challenge,
+            'salt'      => $salt,
+            'signature' => $signature,
+        ];
+    }
+
+    public static function createNewChallenge(): array
+    {
+        do {
+            $salt = time() . '-' . bin2hex(random_bytes(12));
+            $number = random_int(1e3, 1e5);
+        } while (self::countBySql('salt = ? AND number = ?', [$salt, $number]) > 0);
+
+        return self::createChallenge($salt, $number);
+    }
+
+    public static function decodePayload(string $payload): array|null
+    {
+        return json_decode(base64_decode($payload), true);
+    }
+
+    public static function validatePayload(string $payload): string|bool
+    {
+        $json = self::decodePayload($payload);
+
+        if ($json === null) {
+            return _('Sie haben nicht bestätigt, dass Sie kein Roboter sind');
+        }
+
+        $time = explode('-', $json['salt'])[0];
+        if ($time < time() - self::CHALLENGE_EXPIRATION) {
+            return _('Die Challenge ist abgelaufen');
+        }
+
+        // Replay?
+        if (\CaptchaChallenge::countBySql('salt = ? AND number = ?', [$json['salt'], $json['number']]) > 0) {
+            return _('Nicht schummeln!');
+        }
+
+        $check = self::createChallenge($json['salt'], $json['number']);
+
+        if (
+            $json['algorithm'] !== $check['algorithm']
+            || $json['challenge'] !== $check['challenge']
+            || $json['signature'] !== $check['signature']
+        ) {
+            return _('Sie sind scheinbar ein Roboter...');
+        }
+
+        return true;
+    }
+
+    public static function gc(): void
+    {
+        self::deleteBySQL("mkdate < UNIX_TIMESTAMP() - ?", [self::CHALLENGE_EXPIRATION]);
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index f808530..cef443d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,6 +61,7 @@
                 "@types/jqueryui": "^1.12.16",
                 "@types/lodash": "^4.14.191",
                 "@vue/eslint-config-typescript": "^12.0.0",
+                "altcha": "^0.3.2",
                 "autoprefixer": "^10.2.5",
                 "axios": "^0.21.0",
                 "babel-loader": "^8.2.1",
@@ -4902,6 +4903,12 @@
             "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
             "dev": true
         },
+        "node_modules/altcha": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/altcha/-/altcha-0.3.2.tgz",
+            "integrity": "sha512-5UQP/fwgdlxfhgr4GADoPyMzHWTmDuWq3OloQlZsmUl3C/8+0huWdXW5S8FraA6GWK8iEwbG/2IR4TehLTY9cQ==",
+            "dev": true
+        },
         "node_modules/ansi-colors": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
diff --git a/package.json b/package.json
index fef26f2..3d382e5 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
         "@types/jqueryui": "^1.12.16",
         "@types/lodash": "^4.14.191",
         "@vue/eslint-config-typescript": "^12.0.0",
+        "altcha": "^0.3.2",
         "autoprefixer": "^10.2.5",
         "axios": "^0.21.0",
         "babel-loader": "^8.2.1",
diff --git a/resources/vue/base-components.js b/resources/vue/base-components.js
index 65b467b..5d11daa 100644
--- a/resources/vue/base-components.js
+++ b/resources/vue/base-components.js
@@ -1,4 +1,5 @@
 const BaseComponents = {
+    CaptchaInput: () => import('./components/form_inputs/CaptchaInput.vue'),
     CalendarPermissionsTable: () => import("./components/form_inputs/CalendarPermissionsTable.vue"),
     DateListInput: () => import('./components/form_inputs/DateListInput.vue'),
     Datepicker: () => import('./components/Datepicker.vue'),
diff --git a/resources/vue/components/form_inputs/CaptchaInput.vue b/resources/vue/components/form_inputs/CaptchaInput.vue
new file mode 100644
index 0000000..1409aa8
--- /dev/null
+++ b/resources/vue/components/form_inputs/CaptchaInput.vue
@@ -0,0 +1,70 @@
+<template>
+    <div class="formpart">
+        <altcha-widget :challengeurl="challengeUrl" ref="widget"></altcha-widget>
+    </div>
+</template>
+<script>
+import 'altcha';
+import { $gettext } from '../../../assets/javascripts/lib/gettext';
+
+export default {
+    name: 'CaptchaInput',
+    props: {
+        name: {
+            type: String,
+            default: 'altcha'
+        },
+        challengeUrl: {
+            type: String,
+            requird: true,
+        },
+        auto: {
+            type: String,
+            default: null,
+            validator: (value) => ['onfocus', 'onload', 'onsubmit'].includes(value),
+        }
+    },
+    data() {
+        return {};
+    },
+    methods: {
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$refs.widget.configure({
+                auto: this.auto,
+                name: this.name,
+                hidefooter: false,
+                hidelogo: false,
+                strings: {
+                    error: $gettext('Überprüfung fehlgeschlagen. Versuchen Sie es später erneut.'),
+                    footer: $gettext('Geschützt von <a href="https://altcha.org/" target="_blank">ALTCHA</a>'),
+                    label: $gettext('Ich bin kein Bot'),
+                    verified: $gettext('Überprüft'),
+                    verifying: $gettext('Überprüfung...'),
+                    waitAlert: $gettext('Überprüfung... Bitte warten.'),
+                },
+            });
+
+            this.$refs.widget.addEventListener('statechange', (ev) => {
+                if (ev.detail.state === 'verified') {
+                    this.$emit('input', ev.detail.payload);
+                }
+            })
+        });
+    }
+}
+</script>
+<style>
+:root {
+    --altcha-border-width: 0;
+    --altcha-border-radius: 0;
+    --altcha-color-base: transparent;
+    --altcha-color-border: #a0a0a0;
+    --altcha-color-text: currentColor;
+    --altcha-color-border-focus: currentColor;
+    --altcha-color-error-text: var(--red);
+    --altcha-color-footer-bg: none;
+    --altcha-max-width: auto;
+}
+</style>
diff --git a/templates/forms/form.php b/templates/forms/form.php
index 4745225..fe19404 100644
--- a/templates/forms/form.php
+++ b/templates/forms/form.php
@@ -1,4 +1,8 @@
-<?
+<?php
+/**
+ * @var \Studip\Forms\Form $form
+ */
+
 $inputs = [];
 $allinputs = $form->getAllInputs();
 $required_inputs = [];
-- 
cgit v1.0


From 3474ea5022e9bb4d7fc861472d35be3bcb7ca735 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 8 May 2024 14:38:45 +0000
Subject: fix #4122

Closes #4122

Merge request studip/studip!2976
---
 .../structural-element/CoursewareRootContent.vue   | 77 ++++++++++++++++++----
 1 file changed, 63 insertions(+), 14 deletions(-)

diff --git a/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue b/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue
index 15056e4..1aa8802 100644
--- a/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue
+++ b/resources/vue/components/courseware/structural-element/CoursewareRootContent.vue
@@ -116,12 +116,7 @@ export default {
         image() {
             let style = {};
             const backgroundURL = this.imageIsSet ? this.imageURL : this.identImage;
-
             style.backgroundImage = 'url(' + backgroundURL + ')';
-            if (!this.imageIsSet) {
-                style.backgroundSize = '100% auto';
-                style.height = '180px';
-            }
 
             return style;
         },
@@ -194,17 +189,20 @@ export default {
     }
     .cw-root-content-description {
         display: flex;
-        flex-direction: row;
-        margin: 0 8em;
-        padding: 2em 4px 2em 2em;
         position: relative;
-        top: 8em;
+        flex-direction: column;
+        margin: 0 1em;
+        padding: 1em 4px 1em 1em;
+        top: 1em;
+        gap: 10px;
 
         .cw-root-content-description-img {
-            width: 270px;
-            height: fit-content;
-            margin-right: 2em;
+            min-width: 135px;
+            height: 90px;
             background-color: #fff;
+            background-size: cover;
+            background-position: center;
+            margin-right: 1em;
         }
         .cw-root-content-description-text {
             max-height: calc(480px - 18em);
@@ -232,8 +230,7 @@ export default {
     max-width: 1095px;
     margin-bottom: 1em;
     .cw-root-content-description {
-        margin: 0 8em;
-        top: 1.5em;
+        height: calc(100% - 4em);
         .cw-root-content-description-text {
             max-height: calc(300px - 6em);
         }
@@ -245,4 +242,56 @@ export default {
 .cw-root-content-hint {
     max-width: 1095px;
 }
+
+.size-small {
+    .cw-root-content-description {
+        flex-direction: row;
+        padding: 1em 4px 1em 1em;
+
+        .cw-root-content-description-img {
+            min-width: 135px;
+            height: 90px;
+        }
+    }
+
+    .cw-root-content-default {
+        .cw-root-content-description {
+            margin: 0 4em;
+            top: 8em;
+        }
+    }
+    .cw-root-content-toc {
+        .cw-root-content-description {
+            height: calc(100% - 6em);
+            margin: 0 4em;
+            top: 1.5em;
+        }
+    }
+}
+
+.size-large {
+    .cw-root-content-description {
+        flex-direction: row;
+        padding: 2em 4px 2em 2em;
+
+        .cw-root-content-description-img {
+            min-width: 270px;
+            height: 180px;
+        }
+    }
+
+    .cw-root-content-default {
+        .cw-root-content-description {
+            margin: 0 8em;
+            top: 8em;
+        }
+    }
+    .cw-root-content-toc {
+        .cw-root-content-description {
+            height: calc(100% - 7em);
+            margin: 0 8em;
+            top: 1.5em;
+        }
+    }
+}
 </style>
-- 
cgit v1.0


From 1ed2587c0b55d7587477c7269fe5e30b098ad592 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 8 May 2024 23:48:43 +0000
Subject: Resolve "Suchfunktion Wiki"

Closes #4126

Merge request studip/studip!2972
---
 app/controllers/course/wiki.php      | 61 ++++++++++++++++++++++++++++++++++++
 app/views/course/wiki/search.php     | 16 +++++++++-
 app/views/course/wiki/searchpage.php | 48 ++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 app/views/course/wiki/searchpage.php

diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 567e285..cbd63cf 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -976,6 +976,30 @@ class Course_WikiController extends AuthenticatedController
         Sidebar::Get()->addWidget($search);
     }
 
+    public function searchpage_action(WikiPage $page)
+    {
+        if (!$page->isReadable()) {
+            throw new AccessDeniedException();
+        }
+        Navigation::activateItem('/course/wiki/allpages');
+        if (!Request::get('search')) {
+            throw new Exception('No search text.');
+        }
+        $search = str_replace(['\\', '_', '%'], ['\\\\', '\\_', '\\%'], Request::get('search'));
+        $this->versions = WikiVersion::findBySQL("`page_id` = :page_id AND (`wiki_versions`.`content` LIKE :searchterm OR `wiki_versions`.`name` LIKE :searchterm) ORDER BY `mkdate` DESC ", [
+            'page_id' => $page->id,
+            'searchterm' => '%' . $search . '%'
+        ]);
+
+        $search = new SearchWidget($this->searchURL());
+        $search->addNeedle(
+            _('Im Wiki suchen'),
+            'search',
+            true
+        );
+        Sidebar::Get()->addWidget($search);
+    }
+
     public function pdf_action(WikiPage $page)
     {
         if (!$page->isReadable()) {
@@ -1217,4 +1241,41 @@ class Course_WikiController extends AuthenticatedController
 
         return $from_end ? mb_strlen($str0) - $length : $length;
     }
+
+    public function findTextualHits($text, $search, $length = 80)
+    {
+        $content = Studip\Markup::removeHtml($text);
+        $offset  = 0;
+        $output  = [];
+
+        // find all occurences
+        while ($offset < mb_strlen($content)) {
+            $pos = mb_stripos($content, Request::get('search'), $offset);
+            if ($pos === false) {
+                break;
+            }
+            $offset = $pos + 1;
+
+            // show max 200 chars
+            $fragment       = '';
+            $split_fragment = preg_split(
+                '/(' . preg_quote(Request::get('search'), '/') . ')/i',
+                mb_substr($content, max(0, $pos - floor($length / 2)), $length),
+                -1,
+                PREG_SPLIT_DELIM_CAPTURE
+            );
+            for ($i = 0; $i < count($split_fragment); ++$i) {
+                if ($i % 2) {
+                    $fragment .= '<span class="wiki_highlight">';
+                    $fragment .= htmlready($split_fragment[$i], false);
+                    $fragment .= '</span>';
+                } else {
+                    $fragment .= htmlready($split_fragment[$i], false);
+                }
+            }
+            $found_in_fragment = (count($split_fragment) - 1) / 2; // number of hits in fragment
+            $output[]          = '...' . $fragment . '...';
+        }
+        return implode('<br>', $output);
+    }
 }
diff --git a/app/views/course/wiki/search.php b/app/views/course/wiki/search.php
index daf88fe..8ef886a 100644
--- a/app/views/course/wiki/search.php
+++ b/app/views/course/wiki/search.php
@@ -10,7 +10,7 @@
 
     <table class="default">
         <caption>
-            <?= sprintf(_('Treffer für Suche nach <em>%s</em> in allen Versionen'), htmlReady(Request::get('search'))) ?>
+            <?= sprintf(_('Treffer für Suche nach <em>%s</em>'), htmlReady(Request::get('search'))) ?>
         </caption>
         <thead>
         <tr>
@@ -96,6 +96,20 @@
                     <? endif ?>
                 </td>
             </tr>
+            <? if ($pagedata['is_in_history'] && count($pagedata['versions']) > 1 || ($pagedata['is_in_content'] && count($pagedata['versions']) > 0)) : ?>
+            <tr>
+                <td colspan="3">
+                    <a href="<?= $controller->searchpage($page_id, ['search' => Request::get('search')]) ?>">
+                        <?= Icon::create('add')->asImg(['class' => 'text-bottom']) ?>
+                        <? if (count($pagedata['versions']) === 1) : ?>
+                            <?= _('Weiterer Treffer in einer älteren Version.') ?>
+                        <? else : ?>
+                            <?= sprintf(_('Weitere Treffer in %d älteren Versionen.'), count($pagedata['versions'])) ?>
+                        <? endif ?>
+                    </a>
+                </td>
+            </tr>
+            <? endif ?>
         <? endforeach ?>
         </tbody>
     </table>
diff --git a/app/views/course/wiki/searchpage.php b/app/views/course/wiki/searchpage.php
new file mode 100644
index 0000000..95b6ff4
--- /dev/null
+++ b/app/views/course/wiki/searchpage.php
@@ -0,0 +1,48 @@
+<table class="default">
+    <caption>
+        <?= sprintf(_('Treffer für Suche nach <em>%s</em> auf Seite %s'), htmlReady(Request::get('search')), htmlReady($page->name)) ?>
+    </caption>
+    <thead>
+    <tr>
+        <th><?= _('Seite') ?></th>
+        <th><?= _('Treffer') ?></th>
+        <th><?= _('Datum') ?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <? $pos_name = mb_stripos($page->name, Request::get('search')) ?>
+    <? $pos_content = mb_stripos($page->content, Request::get('search')) ?>
+    <? if ($pos_name !== false || $pos_content !== false) : ?>
+        <tr>
+            <td>
+                <a href="<?= $controller->page($page) ?>">
+                    <?= htmlReady($page->name) ?>
+                </a>
+            </td>
+            <td>
+                <?= $controller->findTextualHits($page->content, Request::get('search'), 200) ?>
+            </td>
+            <td>
+                <?= $page->chdate > 0 ? date('d.m.Y H:i:s', $page->chdate) : _('unbekannt') ?>
+                (<?= _('Version').' '.htmlReady($page->versionnumber) ?>)
+            </td>
+        </tr>
+    <? endif ?>
+    <? foreach ($versions as $version) : ?>
+        <tr>
+            <td>
+                <a href="<?= $controller->version($version) ?>">
+                    <?= htmlReady($version->name) ?>
+                </a>
+            </td>
+            <td>
+                <?= $controller->findTextualHits($version->content, Request::get('search'), 200) ?>
+            </td>
+            <td>
+                <?= $version->mkdate > 0 ? date('d.m.Y H:i:s', $version->mkdate) : _('unbekannt') ?>
+                (<?= _('Version').' '.htmlReady($version->versionnumber) ?>)
+            </td>
+        </tr>
+    <? endforeach ?>
+    </tbody>
+</table>
-- 
cgit v1.0


From c0c705fa365e0bc971f8923cf050dee17c62a8b8 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 13 May 2024 09:45:09 +0000
Subject: Fix for BIESt 3818, fixes #3818

Closes #3818

Merge request studip/studip!2979
---
 app/controllers/calendar/calendar.php | 10 ++++------
 lib/models/CourseDate.class.php       |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index d0d5743..89421cb 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -578,20 +578,18 @@ class Calendar_CalendarController extends AuthenticatedController
             $course_dates = CalendarCourseDate::getEvents($begin, $end, $owner->id);
             foreach ($course_dates as $course_date) {
                 $event = $course_date->toEventData(User::findCurrent()->id);
-                $event->background_colour = '#ffffff';
+                $event->background_colour = '';
                 $event->text_colour = '#000000';
-                $event->border_colour = '#000000';
-                $event->event_classes = [];
+                $event->border_colour = '';
                 $result[] = $event->toFullcalendarEvent();
             }
             //Include relevant cancelled course dates:
             $cancelled_course_dates = CalendarCourseExDate::getEvents($begin, $end, $owner->id);
             foreach ($cancelled_course_dates as $cancelled_course_date) {
                 $event = $cancelled_course_date->toEventData(User::findCurrent()->id);
-                $event->background_colour = '#ffffff';
+                $event->background_colour = '';
                 $event->text_colour = '#000000';
-                $event->border_colour = '#000000';
-                $event->event_classes = [];
+                $event->border_colour = '';
                 $result[] = $event->toFullcalendarEvent();
             }
         }
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php
index ac0c8c3..59fbb9c 100644
--- a/lib/models/CourseDate.class.php
+++ b/lib/models/CourseDate.class.php
@@ -633,7 +633,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
         );
         $class_names = [];
         if ($membership) {
-            $class_names[] = sprintf('gruppe%u', $membership->status);
+            $class_names[] = 'course-color-' . $membership->gruppe;
         }
         $studip_view_urls = [];
         if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
-- 
cgit v1.0


From 636039e25ccc6c33ae758bdb3ddfca4f68327948 Mon Sep 17 00:00:00 2001
From: Peter Thienel <thienel@data-quest.de>
Date: Mon, 13 May 2024 09:47:54 +0000
Subject: Resolve "iCal Export zeigt Terminserie an, die schon abgelaufen ist"

Closes #3953

Merge request studip/studip!2843
---
 lib/classes/calendar/ICalendarExport.class.php | 49 +++++++++++++++-----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/lib/classes/calendar/ICalendarExport.class.php b/lib/classes/calendar/ICalendarExport.class.php
index 1454179..00147ef 100644
--- a/lib/classes/calendar/ICalendarExport.class.php
+++ b/lib/classes/calendar/ICalendarExport.class.php
@@ -55,7 +55,7 @@ class ICalendarExport
                     (`calendar_dates`.`begin` <= :end
                         AND `calendar_dates`.`end` >= :begin)
                     OR (`calendar_dates`.`repetition_type` != 'SINGLE'
-                        AND (`calendar_dates`.`repetition_end` >= :end
+                        AND (`calendar_dates`.`repetition_end` >= :begin
                             OR `calendar_dates`.`repetition_end` = 0)
                     AND `calendar_dates`.`begin` < :end))",
             [
@@ -263,7 +263,7 @@ class ICalendarExport
                 case 'DUE':
                 case 'RECURRENCE-ID':
                     if (array_key_exists('VALUE', $params)) {
-                        if ($params['VALUE'] == 'DATE') {
+                        if ($params['VALUE'] === 'DATE') {
                             $value = $this->_exportDate($value);
                         } else {
                             $value = $this->_exportDateTime($value);
@@ -276,12 +276,12 @@ class ICalendarExport
                     break;
 
                 case 'EXDATE':
-                    if (array_key_exists('VALUE', $params)) {
+                    if (array_key_exists('VALUE', $params) && $params['VALUE'] === 'DATE') {
                         $value = $this->exportExDate($value);
                     } else {
-                        $value = $this->exportExDateTime($value);
+                        $value = $this->exportExDateTime($value, $exdate_time);
+                        $params_str = ';TZID=Europe/Berlin';
                     }
-                    $params_str = ';TZID=Europe/Berlin';
                     break;
 
                 // Integer fields
@@ -315,7 +315,7 @@ class ICalendarExport
                 // Recursion fields
                 case 'EXRULE':
                 case 'RRULE':
-                    if ($value['type'] !== 'SINGLE') {
+                    if ($value['type'] !== 'SINGLE' && $value['type'] !== '') {
                         $value = $this->_exportRecurrence($value);
                     }
                     break;
@@ -404,7 +404,7 @@ class ICalendarExport
             $value['offset'] = '-1';
         }
 
-        if ($value['count']) {
+        if ($value['count'] > 1) {
             unset($value['expire']);
         }
 
@@ -415,7 +415,7 @@ class ICalendarExport
                         $rrule[] = 'FREQ=' . $r_value;
                         break;
                     case 'expire':
-                        if ($r_value < CalendarDate::NEVER_ENDING)
+                        if ($r_value)
                             $rrule[] = 'UNTIL=' . $this->_exportDateTime($r_value, true);
                         break;
                     case 'interval':
@@ -447,7 +447,9 @@ class ICalendarExport
                         $rrule[] = 'BYMONTH=' . $r_value;
                         break;
                     case 'count':
-                        $rrule[] = 'COUNT=' . $r_value;
+                        if ($r_value > 1) {
+                            $rrule[] = 'COUNT=' . $r_value;
+                        }
                         break;
                 }
             }
@@ -478,35 +480,40 @@ class ICalendarExport
         return implode(',', $wdays);
     }
 
+
     /**
      * Formats dates of exception.
      *
-     * @param string $value Unix timestamps as csv list.
+     * @param string $value Date values (Y-m-d) as csv list.
      * @return string The formatted Exceptions.
      */
     public function exportExDate(string $value): string
     {
-        $exdates = [];
-        $date_times = explode(',', $value);
-        foreach ($date_times as $date_time) {
-            $exdates[] = $this->_exportDate($date_time);
+        $ex_dates = [];
+        $dates = explode(',', $value);
+        foreach ($dates as $date) {
+            $ex_datetime = $date . ' 12:00:00';
+            $ex_date = DateTime::createFromFormat('Y-m-d H:i:s', $ex_datetime);
+            $ex_dates[] = $this->_exportDate($ex_date->getTimestamp());
         }
-        return implode(',', $exdates);
+
+        return implode(',', $ex_dates);
     }
 
     /**
      * Formats date times of exception.
      *
-     * @param string $value Unix timestamps as csv list.
+     * @param string $value Date values (Y-m-d) as csv list.
+     * @param int $begin Start date of event as unix timestamp.
      * @return string The formatted Exceptions.
      */
-    public function exportExDateTime(string $value): string
+    public function exportExDateTime(string $value, int $begin): string
     {
         $ex_dates = [];
-        $ex_date_times = explode(',', $value);
-        foreach ($ex_date_times as $ex_date_time) {
-            $date_time = new DateTime();
-            $date_time->setTimestamp($ex_date_time);
+        $dates = explode(',', $value);
+        foreach ($dates as $date) {
+            $ex_datetime = $date . date(' H:i:s', $begin);
+            $date_time = DateTime::createFromFormat('Y-m-d H:i:s', $ex_datetime);
             $ex_dates[] = $date_time->format('Ymd\THis');
         }
         return implode(',', $ex_dates);
-- 
cgit v1.0


From 40bdfaf4415ff9f46e63435fc5e61049649802f2 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 14 May 2024 07:22:47 +0000
Subject: made Stud.IP cache compatible with PSR-6, re #3701

Merge request studip/studip!2570
---
 app/controllers/admin/cache.php                    |   6 +-
 app/controllers/file.php                           |  12 +-
 composer.json                                      |   3 +-
 composer.lock                                      |  51 +++-
 db/migrations/1.154_recalculate_score.php          |   3 +-
 db/migrations/1.224_db_cache_table.php             |   2 +-
 db/migrations/1.318_step_00353_cache.php           |  13 +-
 .../5.5.26_tic3193_no_unlimited_courses.php        |   5 +-
 db/migrations/6.0.3_adjust_cache_configuration.php |  38 +++
 lib/activities/Activity.php                        |   4 +-
 lib/bootstrap-autoload.php                         |   5 +
 lib/bootstrap-definitions.php                      |   4 +-
 lib/bootstrap.php                                  |   4 +-
 lib/classes/MvvPerm.php                            |   4 +-
 lib/classes/Score.class.php                        |   2 +-
 lib/classes/SemClass.class.php                     |  10 +-
 lib/classes/SemType.class.php                      |  10 +-
 lib/classes/Seminar.class.php                      |   4 +-
 lib/classes/SimpleORMap.class.php                  |  12 +-
 lib/classes/Siteinfo.php                           |   6 +-
 lib/classes/StudipCache.class.php                  |  94 -------
 lib/classes/StudipCacheFactory.class.php           | 195 ---------------
 lib/classes/StudipCacheKeyTrait.php                |  29 ---
 lib/classes/StudipCacheProxy.php                   | 117 ---------
 lib/classes/StudipCacheWrapper.php                 |  85 -------
 lib/classes/StudipCachedArray.php                  |  20 +-
 lib/classes/StudipDbCache.class.php                | 123 ---------
 lib/classes/StudipFileCache.class.php              | 276 --------------------
 lib/classes/StudipKing.class.php                   |   2 +-
 lib/classes/StudipMemcachedCache.php               | 157 ------------
 lib/classes/StudipMemoryCache.class.php            |  84 -------
 lib/classes/StudipRedisCache.class.php             | 177 -------------
 lib/classes/UserLookup.class.php                   |   2 +-
 lib/classes/assets/SASSCompiler.php                |   4 +-
 lib/classes/cache/Cache.class.php                  | 208 ++++++++++++++++
 lib/classes/cache/DbCache.class.php                | 142 +++++++++++
 lib/classes/cache/Exception.php                    |  27 ++
 lib/classes/cache/Factory.class.php                | 206 +++++++++++++++
 lib/classes/cache/FileCache.class.php              | 277 +++++++++++++++++++++
 .../cache/InvalidCacheArgumentException.php        |  28 +++
 lib/classes/cache/Item.class.php                   | 163 ++++++++++++
 lib/classes/cache/KeyTrait.php                     |  31 +++
 lib/classes/cache/MemcachedCache.class.php         | 151 +++++++++++
 lib/classes/cache/MemoryCache.class.php            |  98 ++++++++
 lib/classes/cache/Proxy.class.php                  | 122 +++++++++
 lib/classes/cache/RedisCache.class.php             | 198 +++++++++++++++
 lib/classes/cache/Wrapper.class.php                |  95 +++++++
 lib/classes/cas/CAS_PGTStorage_Cache.php           |   4 +-
 lib/cronjobs/purge_cache.class.php                 |   4 +-
 lib/functions.php                                  |   2 +-
 lib/models/CourseDate.class.php                    |   6 +-
 lib/models/OERMaterial.php                         |   4 +-
 lib/models/PersonalNotifications.class.php         |   6 +-
 lib/models/Semester.class.php                      |   6 +-
 lib/models/StudipCacheOperation.php                |   2 +-
 lib/phplib/CT_Cache.class.php                      |   2 +-
 lib/plugins/db/RolePersistence.class.php           |   4 +-
 lib/plugins/engine/PluginRepository.class.php      |   2 +-
 lib/raumzeit/SingleDate.class.php                  |   4 +-
 tests/functional/_bootstrap.php                    |   4 +-
 tests/jsonapi/_bootstrap.php                       |   2 +
 tests/unit/_bootstrap.php                          |   4 +-
 tests/unit/lib/classes/MigrationTest.php           |   5 -
 tests/unit/lib/classes/StudipCachedArrayTest.php   |   5 +-
 64 files changed, 1943 insertions(+), 1432 deletions(-)
 create mode 100644 db/migrations/6.0.3_adjust_cache_configuration.php
 delete mode 100644 lib/classes/StudipCache.class.php
 delete mode 100644 lib/classes/StudipCacheFactory.class.php
 delete mode 100644 lib/classes/StudipCacheKeyTrait.php
 delete mode 100644 lib/classes/StudipCacheProxy.php
 delete mode 100644 lib/classes/StudipCacheWrapper.php
 delete mode 100644 lib/classes/StudipDbCache.class.php
 delete mode 100644 lib/classes/StudipFileCache.class.php
 delete mode 100644 lib/classes/StudipMemcachedCache.php
 delete mode 100644 lib/classes/StudipMemoryCache.class.php
 delete mode 100644 lib/classes/StudipRedisCache.class.php
 create mode 100644 lib/classes/cache/Cache.class.php
 create mode 100644 lib/classes/cache/DbCache.class.php
 create mode 100644 lib/classes/cache/Exception.php
 create mode 100644 lib/classes/cache/Factory.class.php
 create mode 100644 lib/classes/cache/FileCache.class.php
 create mode 100644 lib/classes/cache/InvalidCacheArgumentException.php
 create mode 100644 lib/classes/cache/Item.class.php
 create mode 100644 lib/classes/cache/KeyTrait.php
 create mode 100644 lib/classes/cache/MemcachedCache.class.php
 create mode 100644 lib/classes/cache/MemoryCache.class.php
 create mode 100644 lib/classes/cache/Proxy.class.php
 create mode 100644 lib/classes/cache/RedisCache.class.php
 create mode 100644 lib/classes/cache/Wrapper.class.php

diff --git a/app/controllers/admin/cache.php b/app/controllers/admin/cache.php
index 329aab7..3e9d970 100644
--- a/app/controllers/admin/cache.php
+++ b/app/controllers/admin/cache.php
@@ -111,7 +111,7 @@ class Admin_CacheController extends AuthenticatedController
         // Store settings to global config.
         if (Config::get()->store('SYSTEMCACHE', $settings)) {
             PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.'));
-            StudipCacheFactory::unconfigure();
+            \Studip\Cache\Factory::unconfigure();
         }
 
         $this->relocate('admin/cache/settings');
@@ -122,7 +122,7 @@ class Admin_CacheController extends AuthenticatedController
      */
     public function flush_action()
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->flush();
 
         PageLayout::postSuccess(_('Die Inhalte des Caches wurden gelöscht.'));
@@ -135,7 +135,7 @@ class Admin_CacheController extends AuthenticatedController
      */
     public function stats_action()
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
 
         $this->stats = $cache->getStats();
     }
diff --git a/app/controllers/file.php b/app/controllers/file.php
index 65344ef..bebfe70 100644
--- a/app/controllers/file.php
+++ b/app/controllers/file.php
@@ -364,7 +364,7 @@ class FileController extends AuthenticatedController
 
             //The file system object is a folder.
             //Calculate the files and the folder size:
-            list($this->folder_size, $this->folder_file_amount) = $this->getFolderSize($this->folder);
+            [$this->folder_size, $this->folder_file_amount] = $this->getFolderSize($this->folder);
             PageLayout::setTitle($this->folder->name);
             $this->render_action('folder_details');
         }
@@ -1128,7 +1128,7 @@ class FileController extends AuthenticatedController
 
                 $this->search_id = md5(json_encode($search_parameters));
 
-                $cache = StudipCacheFactory::getCache();
+                $cache = \Studip\Cache\Factory::getCache();
 
                 $merged_results = LibrarySearchManager::search(
                     $search_parameters,
@@ -1187,7 +1187,7 @@ class FileController extends AuthenticatedController
             $this->search_id = Request::get('search_id');
             $this->page = Request::get('page');
 
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             $cache_data = $cache->read($this->search_id);
             $results = $cache_data['results'];
             $this->total_results = count($results);
@@ -1247,7 +1247,7 @@ class FileController extends AuthenticatedController
         }
 
         if ($item_id) {
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             $documents = $cache->read($search_id);
             $document = $documents['results'][$item_id];
             if (!($document instanceof LibraryDocument)) {
@@ -1255,7 +1255,7 @@ class FileController extends AuthenticatedController
             }
             $file = LibraryFile::createFromLibraryDocument($document, $folder_id);
         } else {
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             $search = $cache->read($search_id);
             if (!$search) {
                 throw new Exception('Search not found in cache!');
@@ -2036,7 +2036,7 @@ class FileController extends AuthenticatedController
                 PageLayout::postMessage($result);
             }
         }
-        list($this->folder_size, $this->folder_file_amount) = $this->getFolderSize($folder);
+        [$this->folder_size, $this->folder_file_amount] = $this->getFolderSize($folder);
     }
 
     public function delete_folder_action($folder_id)
diff --git a/composer.json b/composer.json
index e4d1902..009a7a0 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,8 @@
         "psy/psysh": "^0.12.2",
         "okvpn/clock-lts": "^1.0",
         "vlucas/phpdotenv": "^5.6",
-        "edu-sharing/auth-plugin": "8.0.x-dev"
+        "edu-sharing/auth-plugin": "8.0.x-dev",
+        "psr/cache": "^1.0"
     },
     "replace": {
         "symfony/polyfill-php73": "*",
diff --git a/composer.lock b/composer.lock
index ffde9ba..b93431a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "535218b1c9cca9acd1f2c554c59e5113",
+    "content-hash": "30db4609d0f74dac659c0fcd53db3d0a",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -2890,6 +2890,55 @@
             "time": "2023-02-11T17:10:30+00:00"
         },
         {
+            "name": "psr/cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
+            "time": "2016-08-06T20:24:11+00:00"
+        },
+        {
             "name": "psr/clock",
             "version": "1.0.0",
             "source": {
diff --git a/db/migrations/1.154_recalculate_score.php b/db/migrations/1.154_recalculate_score.php
index 158582e..5568363 100644
--- a/db/migrations/1.154_recalculate_score.php
+++ b/db/migrations/1.154_recalculate_score.php
@@ -38,7 +38,7 @@ class RecalculateScore extends Migration {
     private static function getScore($user_id)
     {
         $user_id || $user_id = $GLOBALS['user']->id;
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         if ($cache->read("user_score_of_".$user_id)) {
             return $cache->read("user_score_of_".$user_id);
         }
@@ -142,4 +142,3 @@ class RecalculateScore extends Migration {
     }
 
 }
-
diff --git a/db/migrations/1.224_db_cache_table.php b/db/migrations/1.224_db_cache_table.php
index 66227d0..9abe7e3 100644
--- a/db/migrations/1.224_db_cache_table.php
+++ b/db/migrations/1.224_db_cache_table.php
@@ -17,7 +17,7 @@ class DbCacheTable extends Migration
                    PRIMARY KEY (cache_key)
                    ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC');
 
-        StudipCacheFactory::getCache()->flush();
+        \Studip\Cache\Factory::getCache()->flush();
     }
 
     public function down()
diff --git a/db/migrations/1.318_step_00353_cache.php b/db/migrations/1.318_step_00353_cache.php
index 901db60..5959945 100644
--- a/db/migrations/1.318_step_00353_cache.php
+++ b/db/migrations/1.318_step_00353_cache.php
@@ -1,5 +1,10 @@
 <?php
 
+use Studip\Cache\DbCache;
+use Studip\Cache\FileCache;
+use Studip\Cache\MemcachedCache;
+use Studip\Cache\RedisCache;
+
 class Step00353Cache extends Migration
 {
     public function description()
@@ -20,10 +25,10 @@ class Step00353Cache extends Migration
             ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC");
 
         $types = [
-            'StudipDbCache',
-            'StudipFileCache',
-            'StudipMemcachedCache',
-            'StudipRedisCache'
+            DbCache::class,
+            FileCache::class,
+            MemcachedCache::class,
+            RedisCache::class,
         ];
 
         // Insert pre-defined cache types in to database
diff --git a/db/migrations/5.5.26_tic3193_no_unlimited_courses.php b/db/migrations/5.5.26_tic3193_no_unlimited_courses.php
index ef45bce..21a80ca 100644
--- a/db/migrations/5.5.26_tic3193_no_unlimited_courses.php
+++ b/db/migrations/5.5.26_tic3193_no_unlimited_courses.php
@@ -12,15 +12,14 @@ final class Tic3193NoUnlimitedCourses extends Migration
         DBManager::get()->exec("
             ALTER TABLE `sem_classes` ADD `unlimited_forbidden` TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER `is_group`
         ");
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('DB_SEM_CLASSES_ARRAY');
     }
 
     public function down()
     {
         DBManager::get()->exec("ALTER TABLE `sem_classes` DROP `unlimited_forbidden`");
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('DB_SEM_CLASSES_ARRAY');
     }
 }
-
diff --git a/db/migrations/6.0.3_adjust_cache_configuration.php b/db/migrations/6.0.3_adjust_cache_configuration.php
new file mode 100644
index 0000000..2432e84
--- /dev/null
+++ b/db/migrations/6.0.3_adjust_cache_configuration.php
@@ -0,0 +1,38 @@
+<?php
+return new class extends Migration
+{
+    private const MAPPING = [
+        StudipDbCache::class        => Studip\Cache\DbCache::class,
+        StudipFileCache::class      => Studip\Cache\FileCache::class,
+        StudipMemcachedCache::class => Studip\Cache\MemcachedCache::class,
+        StudipRedisCache::class     => Studip\Cache\RedisCache::class,
+    ];
+
+    public function description()
+    {
+        return 'Replaces the renamed cache classes in system configuration';
+    }
+
+    protected function up()
+    {
+        foreach (self::MAPPING as $old => $new) {
+            self::replaceCache($old, $new);
+        }
+    }
+
+    protected function down()
+    {
+        foreach (self::MAPPING as $old => $new) {
+            self::replaceCache($new, $old);
+        }
+    }
+
+    private function replaceCache(string $old, string $new): void
+    {
+        $query = "UPDATE `config_values`
+                  SET `value` = JSON_REPLACE(`value`, '$.type', ?)
+                  WHERE `field` = 'SYSTEMCACHE'
+                    AND JSON_CONTAINS(`value`, JSON_QUOTE(?), '$.type')";
+        DBManager::get()->execute($query, [$new, $old]);
+    }
+};
diff --git a/lib/activities/Activity.php b/lib/activities/Activity.php
index 3508e5a..e1c918d 100644
--- a/lib/activities/Activity.php
+++ b/lib/activities/Activity.php
@@ -163,7 +163,7 @@ class Activity extends \SimpleORMap
         );
 
         //Expire Cache
-        \StudipCacheFactory::getCache()->expire('activity/oldest_activity');
+        \Studip\Cache\Factory::getCache()->expire('activity/oldest_activity');
     }
 
     /**
@@ -173,7 +173,7 @@ class Activity extends \SimpleORMap
      */
     public static function getOldestActivity()
     {
-        $cache = \StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache_key = 'activity/oldest-activity';
 
         if (!$activity = unserialize($cache->read($cache_key))) {
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index 4e63115..21219fd 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -20,6 +20,11 @@ StudipAutoloader::addAutoloadPath('lib/classes/admission');
 StudipAutoloader::addAutoloadPath('lib/classes/admission/userfilter');
 StudipAutoloader::addAutoloadPath('lib/classes/auth_plugins');
 StudipAutoloader::addAutoloadPath('lib/classes/calendar');
+
+StudipAutoloader::addAutoloadPath('lib/classes/cache', 'Studip\\Cache');
+class_alias(\Studip\Cache\Factory::class, 'StudipCacheFactory');
+class_alias(\Studip\Cache\Cache::class, 'StudipCache');
+
 StudipAutoloader::addAutoloadPath('lib/classes/exportdocument');
 StudipAutoloader::addAutoloadPath('lib/classes/forms');
 StudipAutoloader::addAutoloadPath('lib/classes/globalsearch');
diff --git a/lib/bootstrap-definitions.php b/lib/bootstrap-definitions.php
index 17f35d1..ee80135 100644
--- a/lib/bootstrap-definitions.php
+++ b/lib/bootstrap-definitions.php
@@ -14,8 +14,8 @@ return [
             ),
         ]);
     }),
-    StudipCache::class => DI\factory(function () {
-        return StudipCacheFactory::getCache();
+    \Studip\Cache\Cache::class => DI\factory(function () {
+        return \Studip\Cache\Factory::getCache();
     }),
     StudipPDO::class => DI\factory(function () {
         return DBManager::get();
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 364f9d9..9afc16a 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -170,7 +170,7 @@ if (isset($_SERVER['REQUEST_METHOD'])) {
 // bootstrap because the stud.ip cache needs to have a db conenction)
 if ($GLOBALS['CACHING_ENABLE']) {
     $lookup_hash = null;
-    $cached = StudipCacheFactory::getCache()->read('STUDIP#autoloader-classes');
+    $cached = \Studip\Cache\Factory::getCache()->read('STUDIP#autoloader-classes');
     if ($cached) {
         $class_lookup = json_decode($cached, true);
         if (is_array($class_lookup)) {
@@ -182,7 +182,7 @@ if ($GLOBALS['CACHING_ENABLE']) {
     register_shutdown_function(function () use ($lookup_hash) {
         $cached = json_encode(StudipAutoloader::$class_lookup, JSON_UNESCAPED_UNICODE);
         if (md5($cached) !== $lookup_hash) {
-            StudipCacheFactory::getCache()->write(
+            \Studip\Cache\Factory::getCache()->write(
                 'STUDIP#autoloader-classes',
                 $cached,
                 7 * 24 * 60 * 60
diff --git a/lib/classes/MvvPerm.php b/lib/classes/MvvPerm.php
index 93f9f44..91e1e35 100644
--- a/lib/classes/MvvPerm.php
+++ b/lib/classes/MvvPerm.php
@@ -563,7 +563,7 @@ class MvvPerm {
     private static function getPrivileges($mvv_table)
     {
         if (self::$privileges === null) {
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             self::$privileges = unserialize($cache->read(MVV::CACHE_KEY . '/privileges'));
         }
 
@@ -576,7 +576,7 @@ class MvvPerm {
                     include $config_file; // Defines $privileges
                     self::$privileges[$mvv_table] = $privileges ?? [];
                 }
-                $cache = StudipCacheFactory::getCache();
+                $cache = \Studip\Cache\Factory::getCache();
                 $cache->write(MVV::CACHE_KEY . '/privileges', serialize(self::$privileges));
             }
         }
diff --git a/lib/classes/Score.class.php b/lib/classes/Score.class.php
index 8f038f9..f7d8ea3 100644
--- a/lib/classes/Score.class.php
+++ b/lib/classes/Score.class.php
@@ -121,7 +121,7 @@ class Score
     public static function GetMyScore($user_or_id = null)
     {
         $user = $user_or_id ? User::toObject($user_or_id) : User::findCurrent();
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         if ($cache->read("user_score_of_".$user->id)) {
             return $cache->read("user_score_of_".$user->id);
         }
diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php
index 63be920..2a038e2 100644
--- a/lib/classes/SemClass.class.php
+++ b/lib/classes/SemClass.class.php
@@ -389,7 +389,7 @@ class SemClass implements ArrayAccess
                 "chdate = UNIX_TIMESTAMP() " .
             "WHERE id = :id ".
         "");
-        StudipCacheFactory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
         return $statement->execute([
             'id' => $this->data['id'],
             'name' => $this->data['name'],
@@ -453,7 +453,7 @@ class SemClass implements ArrayAccess
                 DELETE FROM sem_classes
                 WHERE id = :id
             ");
-            StudipCacheFactory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
+            \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
             return $statement->execute([
                 'id' => $this->data['id']
             ]);
@@ -552,7 +552,7 @@ class SemClass implements ArrayAccess
             $db = DBManager::get();
             self::$sem_classes = [];
 
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             $class_array = unserialize($cache->read('DB_SEM_CLASSES_ARRAY'));
             if (!$class_array) {
 
@@ -564,7 +564,7 @@ class SemClass implements ArrayAccess
                     $class_array = $statement->fetchAll(PDO::FETCH_ASSOC);
 
                     if ($class_array) {
-                        $cache = StudipCacheFactory::getCache();
+                        $cache = \Studip\Cache\Factory::getCache();
                         $cache->write('DB_SEM_CLASSES_ARRAY', serialize($class_array));
                     }
                 } catch (PDOException $e) {
@@ -593,7 +593,7 @@ class SemClass implements ArrayAccess
      */
     static public function refreshClasses()
     {
-        StudipCacheFactory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
         self::$sem_classes = null;
         return self::getClasses();
     }
diff --git a/lib/classes/SemType.class.php b/lib/classes/SemType.class.php
index 2365c4e..5be1f19 100644
--- a/lib/classes/SemType.class.php
+++ b/lib/classes/SemType.class.php
@@ -68,7 +68,7 @@ class SemType implements ArrayAccess
                 "chdate = UNIX_TIMESTAMP() " .
             "WHERE id = :id ".
         "");
-        StudipCacheFactory::getCache()->expire('DB_SEM_TYPES_ARRAY');
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
         return $statement->execute([
             'id' => $this->data['id'],
             'name' => $this->data['name'],
@@ -89,7 +89,7 @@ class SemType implements ArrayAccess
                 DELETE FROM sem_types
                 WHERE id = :id
             ");
-            StudipCacheFactory::getCache()->expire('DB_SEM_TYPES_ARRAY');
+            \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
             return $statement->execute([
                 'id' => $this->data['id']
             ]);
@@ -175,7 +175,7 @@ class SemType implements ArrayAccess
             $db = DBManager::get();
             self::$sem_types = [];
 
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             $types_array = unserialize($cache->read('DB_SEM_TYPES_ARRAY'));
             if (!$types_array) {
                 try {
@@ -185,7 +185,7 @@ class SemType implements ArrayAccess
                     $statement->execute();
                     $types_array = $statement->fetchAll(PDO::FETCH_ASSOC);
                     if ($types_array) {
-                        $cache = StudipCacheFactory::getCache();
+                        $cache = \Studip\Cache\Factory::getCache();
                         $cache->write('DB_SEM_TYPES_ARRAY', serialize($types_array));
                     }
                 } catch (PDOException $e) {
@@ -210,7 +210,7 @@ class SemType implements ArrayAccess
 
     static public function refreshTypes() {
         self::$sem_types = null;
-        StudipCacheFactory::getCache()->expire('DB_SEM_TYPES_ARRAY');
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
         return self::getTypes();
     }
 
diff --git a/lib/classes/Seminar.class.php b/lib/classes/Seminar.class.php
index 054c337..dda25ee 100644
--- a/lib/classes/Seminar.class.php
+++ b/lib/classes/Seminar.class.php
@@ -303,7 +303,7 @@ class Seminar
     {
 
         // Caching
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache_key = 'course/undecorated_data/'. $this->id;
 
         if ($filter) {
@@ -745,7 +745,7 @@ class Seminar
         StudipLog::log("SEM_ADD_SINGLEDATE", $this->getId(), $singledate->toString(), 'SingleDateID: '.$singledate->getTerminID());
         // logging <<<<<<
 
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('course/undecorated_data/'. $this->getId());
 
         $this->readSingleDates();
diff --git a/lib/classes/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
index 2606086..499149c 100644
--- a/lib/classes/SimpleORMap.class.php
+++ b/lib/classes/SimpleORMap.class.php
@@ -277,7 +277,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
                     $relation = $a_config[0] ?? '';
                     $relation_field = $a_config[1] ?? '';
                     if (!$relation) {
-                        list($relation, $relation_field) = explode('_', $a_field);
+                        [$relation, $relation_field] = explode('_', $a_field);
                     }
                     if (!$relation_field || !$relation) {
                         throw new UnexpectedValueException('no relation found for autoget/set additional field: ' . $a_field);
@@ -415,7 +415,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
     public static function tableScheme($db_table)
     {
         if (self::$schemes === null) {
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             self::$schemes = unserialize($cache->read('DB_TABLE_SCHEMES'));
         }
         if (!isset(self::$schemes[$db_table])) {
@@ -434,7 +434,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
             }
             self::$schemes[$db_table]['db_fields'] = $db_fields;
             self::$schemes[$db_table]['pk'] = $pk;
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
             $cache->write('DB_TABLE_SCHEMES', serialize(self::$schemes));
         }
         return isset(self::$schemes[$db_table]);
@@ -446,7 +446,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     public static function expireTableScheme()
     {
-        StudipCacheFactory::getCache()->expire('DB_TABLE_SCHEMES');
+        \Studip\Cache\Factory::getCache()->expire('DB_TABLE_SCHEMES');
         self::$schemes = null;
         self::$config = [];
     }
@@ -993,7 +993,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     protected function _getAdditionalValueFromRelation($field)
     {
-        list($relation, $relation_field) = [$this->additional_fields()[$field]['relation'],
+        [$relation, $relation_field] = [$this->additional_fields()[$field]['relation'],
                                                 $this->additional_fields()[$field]['relation_field']];
         if (!array_key_exists($field, $this->additional_data)) {
             $this->_setAdditionalValue($field, $this->getRelationValue($relation, $relation_field));
@@ -1010,7 +1010,7 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
      */
     protected function _setAdditionalValueFromRelation($field, $value)
     {
-        list($relation, $relation_field) = [$this->additional_fields()[$field]['relation'],
+        [$relation, $relation_field] = [$this->additional_fields()[$field]['relation'],
                 $this->additional_fields()[$field]['relation_field']];
         $this->$relation->$field = $value;
         unset($this->additional_data[$field]);
diff --git a/lib/classes/Siteinfo.php b/lib/classes/Siteinfo.php
index ba7386b..247b836 100644
--- a/lib/classes/Siteinfo.php
+++ b/lib/classes/Siteinfo.php
@@ -419,7 +419,7 @@ class SiteinfoMarkupEngine {
     }
 
     function coregroup() {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         if (!($remotefile = $cache->read('coregroup'))) {
             $remotefile = file_get_contents('https://develop.studip.de/studip/extern.php?module=Persons&config_id=8d1dafc3afca2bce6125d57d4119b631&range_id=4498a5bc62d7974d0a0ac3e97aca5296', false, get_default_http_stream_context('https://develop.studip.de'));
             $cache->write('coregroup', $remotefile);
@@ -428,7 +428,7 @@ class SiteinfoMarkupEngine {
     }
 
     function toplist($item) {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         if ($found_in_cache = $cache->read(__METHOD__ . $item)) {
             return $found_in_cache;
         }
@@ -531,7 +531,7 @@ class SiteinfoMarkupEngine {
     }
 
     function indicator($key) {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         if ($found_in_cache = $cache->read(__METHOD__ . $key)) {
             return $found_in_cache;
         }
diff --git a/lib/classes/StudipCache.class.php b/lib/classes/StudipCache.class.php
deleted file mode 100644
index ba929f9..0000000
--- a/lib/classes/StudipCache.class.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * An interface which has to be implemented by instances returned from
- * StudipCacheFactory#getCache
- *
- * @package    studip
- * @subpackage lib
- *
- * @author     Marco Diedrich (mdiedric@uos)
- * @author     Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright  (c) Authors
- * @since      1.6
- * @license    GPL2 or any later version
- */
-
-interface StudipCache
-{
-    const DEFAULT_EXPIRATION = 12 * 60 * 60; // 12 hours
-
-    /**
-     * Expire item from the cache.
-     *
-     * Example:
-     *
-     *   # expires foo
-     *   $cache->expire('foo');
-     *
-     * @param string $arg a single key
-     */
-    public function expire($arg);
-
-    /**1
-     * Expire all items from the cache.
-     */
-    public function flush();
-
-    /**
-     * Retrieve item from the server.
-     *
-     * Example:
-     *
-     *   # reads foo
-     *   $foo = $cache->reads('foo');
-     *
-     * @param string $arg a single key
-     *
-     * @return mixed    the previously stored data if an item with such a key
-     *                  exists on the server or FALSE on failure.
-     */
-    public function read($arg);
-
-    /**
-     * Store data at the server.
-     *
-     * @param string $name     the item's key.
-     * @param mixed  $content  the item's content (will be serialized if necessary).
-     * @param int    $expires  the item's expiry time in seconds. Optional, defaults to 12h.
-     *
-     * @return bool     returns TRUE on success or FALSE on failure.
-     */
-    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION);
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string;
-
-    /**
-     * Get some statistics from cache, like number of entries, hit rate or
-     * whatever the underlying cache provides.
-     * Results are returned in form of an array like
-     *      "[
-     *          [
-     *              'name' => <displayable name>
-     *              'value' => <value of the current stat>
-     *          ]
-     *      ]"
-     *
-     * @return array
-     */
-    public function getStats(): array;
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     * The associative array is of the form
-     *  [
-     *      'component' => <Vue component name>,
-     *      'props' => <Properties for component>
-     *  ]
-     *
-     * @return array
-     */
-    public static function getConfig(): array;
-}
diff --git a/lib/classes/StudipCacheFactory.class.php b/lib/classes/StudipCacheFactory.class.php
deleted file mode 100644
index 77c5973..0000000
--- a/lib/classes/StudipCacheFactory.class.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * This factory retrieves the instance of StudipCache configured for use in
- * this Stud.IP installation.
- *
- * @package    studip
- * @subpackage lib
- *
- * @author    Marco Diedrich (mdiedric@uos)
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright 2007 (c) Authors
- * @since     1.6
- * @license   GPL2 or any later version
- */
-
-class StudipCacheFactory
-{
-    /**
-     * the default cache class
-     *
-     * @var string
-     */
-    const DEFAULT_CACHE_CLASS = StudipDbCache::class;
-
-    /**
-     * singleton instance
-     *
-     * @var StudipCache
-     */
-    private static $cache;
-
-
-    /**
-     * config instance
-     *
-     * @var Config
-     */
-    private static $config = null;
-
-
-    /**
-     * Returns the currently used config instance
-     *
-     * @return Config        an instance of class Config used by this factory to
-     *                       determine the class of the actual implementation of
-     *                       the StudipCache interface; if no config was set, it
-     *                       returns the instance returned by Config#getInstance
-     * @see Config
-     */
-    public static function getConfig()
-    {
-        return is_null(self::$config) ? Config::getInstance() : self::$config;
-    }
-
-
-    /**
-     * @param Config $config an instance of class Config which will be used to
-     *                       determine the class of the implementation of interface
-     *                       StudipCache
-     */
-    public static function setConfig($config)
-    {
-        self::$config = $config;
-        self::$cache = NULL;
-    }
-
-    /**
-     * Resets the configuration and voids the cache instance.
-     */
-    public static function unconfigure()
-    {
-        self::$cache = NULL;
-    }
-
-    /**
-     * Returns a cache instance.
-     *
-     * @param bool $apply_proxied_operations Whether or not to apply any
-     *                                       proxied (disable this in tests!)
-     * @return StudipCache the cache instance
-     */
-    public static function getCache($apply_proxied_operations = true)
-    {
-        if (is_null(self::$cache)) {
-            $proxied = false;
-
-            if (!$GLOBALS['CACHING_ENABLE']) {
-                self::$cache = new StudipMemoryCache();
-
-                // Proxy cache operations if CACHING_ENABLE is different from the globally set
-                // caching value. This should only be the case in cli mode.
-                if (isset($GLOBALS['GLOBAL_CACHING_ENABLE']) && $GLOBALS['GLOBAL_CACHING_ENABLE']) {
-                    $proxied = true;
-                }
-            } else {
-                try {
-                    $class = self::loadCacheClass();
-                    $args = self::retrieveConstructorArguments();
-
-                    self::$cache = self::instantiateCache($class, $args);
-                } catch (Exception $e) {
-                    error_log(__METHOD__ . ': ' . $e->getMessage());
-                    PageLayout::addBodyElements(MessageBox::error(__METHOD__ . ': ' . $e->getMessage()));
-                    $class = self::DEFAULT_CACHE_CLASS;
-                    self::$cache = new $class();
-                }
-            }
-
-            // If proxy should be used, inject it. Otherwise apply pending
-            // operations, if any.
-            if ($proxied) {
-                self::$cache = new StudipCacheProxy(self::$cache);
-            } elseif ($GLOBALS['CACHING_ENABLE'] && $apply_proxied_operations) {
-                // Even if the above condition will try to eliminate most
-                // failures, the following operation still needs to be wrapped
-                // in a try/catch block. Otherwise there are no means to
-                // execute migration 166 which creates the neccessary tables
-                // for said operation.
-                try {
-                    StudipCacheOperation::apply(self::$cache);
-                } catch (Exception $e) {
-                }
-            }
-        }
-
-        return self::$cache;
-    }
-
-
-    /**
-     * Load configured cache class and return its name.
-     *
-     * @return string  the name of the configured cache class
-     */
-    public static function loadCacheClass()
-    {
-        $cacheConfig = self::getConfig()->SYSTEMCACHE;
-
-        $cache_class = $cacheConfig['type'] ?: null;
-
-        # default class
-        if ($cache_class === null) {
-            $version = new DBSchemaVersion();
-            if ($version->get(1) < 224) {
-                // db cache is not yet available, use StudipMemoryCache
-                return 'StudipMemoryCache';
-            }
-
-            return self::DEFAULT_CACHE_CLASS;
-        }
-
-        if (!class_exists($cache_class)) {
-            throw new UnexpectedValueException("Could not find class: '$cache_class'");
-        }
-
-        return $cache_class;
-    }
-
-    /**
-     * Return an array of arguments required for instantiation of the cache
-     * class.
-     *
-     * @return array  the array of arguments
-     */
-    public static function retrieveConstructorArguments()
-    {
-        $cacheConfig = self::getConfig()->SYSTEMCACHE;
-
-        return $cacheConfig ?: [];
-    }
-
-    /**
-     * Return an instance of a given class using some arguments. Unless the
-     * memory cache is instantiated, the cache will be wrapped in a wrapper
-     * class that uses a memory cache to reduce accesses to the cache.
-     *
-     * @param  string $class     the name of the class
-     * @param  array  $arguments an array of arguments to be used by the constructor
-     *
-     * @return StudipCache  an instance of the specified class
-     */
-    public static function instantiateCache($class, $arguments)
-    {
-        $reflection_class = new ReflectionClass($class);
-        $cache = (is_array($arguments['config']) && count($arguments['config']) > 0)
-               ? $reflection_class->newInstanceArgs($arguments['config'])
-               : $reflection_class->newInstance();
-
-        if ($class !== StudipMemoryCache::class) {
-            return new StudipCacheWrapper($cache);
-        }
-
-        return $cache;
-    }
-}
diff --git a/lib/classes/StudipCacheKeyTrait.php b/lib/classes/StudipCacheKeyTrait.php
deleted file mode 100644
index 62eb142..0000000
--- a/lib/classes/StudipCacheKeyTrait.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Trait for unique cache hashes per key for each system based on db configuration which should
- * be sufficient to eliminate cache mishaps.
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     GPL2 or any later version
- * @package     studip
- * @subpackage  cache
- * @since       Stud.IP 5.0
- */
-trait StudipCacheKeyTrait
-{
-    protected $cache_prefix = null;
-
-    /**
-     * Returns a prefix cache key based on db configuration.
-     *
-     * @param  string $offset
-     * @return string
-     */
-    protected function getCacheKey($offset)
-    {
-        if ($this->cache_prefix === null) {
-            $this->cache_prefix = md5("{$GLOBALS['DB_STUDIP_HOST']}|{$GLOBALS['DB_STUDIP_DATABASE']}");
-        }
-        return "{$this->cache_prefix}/{$offset}";
-    }
-}
diff --git a/lib/classes/StudipCacheProxy.php b/lib/classes/StudipCacheProxy.php
deleted file mode 100644
index 686f812..0000000
--- a/lib/classes/StudipCacheProxy.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Proxies a StudipCache and stores the expire operation in the database.
- * These operations are lateron applied to the cache they should have
- * been applied to in the beginning.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since   Stud.IP 3.3
- */
-class StudipCacheProxy implements StudipCache
-{
-    protected $actual_cache;
-    protected $proxy_these;
-
-    /**
-     * @param StudipCache $cache       The actual cache object
-     * @param mixed       $proxy_these List of operations to proxy (should be
-     *                                 an array but a space seperated string
-     *                                 is also valid)
-     */
-    public function __construct(StudipCache $cache, $proxy_these = ['expire'])
-    {
-        if (!is_array($proxy_these)) {
-            $proxy_these = words($proxy_these);
-        }
-
-        $this->actual_cache = $cache;
-        $this->proxy_these  = is_array($proxy_these)
-                            ? $proxy_these
-                            : words($proxy_these);
-    }
-
-    /**
-     * Expires just a single key.
-     *
-     * @param string $key The item's key
-     */
-    public function expire($key)
-    {
-        if (in_array('expire', $this->proxy_these)) {
-            try {
-                $operation = new StudipCacheOperation([$key, 'expire']);
-                $operation->parameters = serialize([]);
-                $operation->store();
-            } catch (Exception $e) {
-            }
-        }
-
-        return $this->actual_cache->expire($key);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        if (in_array('flush', $this->proxy_these)) {
-            try {
-                $operation = new StudipCacheOperation(['', 'flush']);
-                $operation->parameters = serialize([]);
-                $operation->store();
-            } catch (Exception $e) {
-            }
-        }
-
-        return $this->actual_cache->flush();
-    }
-
-    /**
-     * Reads just a single key from the cache.
-     *
-     * @param  string $key The item's key
-     * @return mixed The corresponding value
-     */
-    public function read($key)
-    {
-        return $this->actual_cache->read($key);
-    }
-
-    /**
-     * Store data at the server.
-     *
-     * @param string $key     The item's key
-     * @param string $content The item's conten
-     * @param int    $expires The item's expiry time in seconds, defaults to 12h
-     * @return bool  Returns TRUE on success or FALSE on failure
-     */
-    public function write($key, $content, $expires = self::DEFAULT_EXPIRATION)
-    {
-        if (in_array('write', $this->proxy_these)) {
-            try {
-                $operation = new StudipCacheOperation([$key, 'write']);
-                $operation->parameters = serialize([$content, $expires]);
-                $operation->store();
-            } catch (Exception $e) {
-            }
-        }
-
-        return $this->actual_cache->write($key, $content, $expires);
-    }
-
-    public static function getDisplayName(): string
-    {
-        return static::class;
-    }
-
-    public function getStats(): array
-    {
-        return $this->actual_cache->getStats();
-    }
-
-    public static function getConfig(): array
-    {
-        return [];
-    }
-}
diff --git a/lib/classes/StudipCacheWrapper.php b/lib/classes/StudipCacheWrapper.php
deleted file mode 100644
index 6c75c01..0000000
--- a/lib/classes/StudipCacheWrapper.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * The cache wrapper wraps a memory cache around another cache. This should
- * reduce the accesses to the actual cache.
- *
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since Stud.IP 5.4
- */
-class StudipCacheWrapper implements StudipCache
-{
-    const DEFAULT_MEMORY_EXPIRATION = 60;
-
-    protected $actual_cache;
-    protected $memory_cache;
-
-    public function __construct(StudipCache $actual_cache)
-    {
-        $this->actual_cache = $actual_cache;
-        $this->memory_cache = new StudipMemoryCache();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function expire($arg)
-    {
-        $this->memory_cache->expire($arg);
-        $this->actual_cache->expire($arg);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function flush()
-    {
-        $this->memory_cache->flush();
-        $this->actual_cache->flush();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function read($arg)
-    {
-        $cached = $this->memory_cache->read($arg);
-        if ($cached !== false) {
-            return $cached;
-        }
-
-        $cached = $this->actual_cache->read($arg);
-        if ($cached !== false) {
-            $this->memory_cache->write($arg, $cached, self::DEFAULT_MEMORY_EXPIRATION);
-        }
-        return $cached;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION)
-    {
-        if ($this->actual_cache->write($name, $content, $expires)) {
-            return $this->memory_cache->write($name, $content, $expires);
-        } else {
-            return false;
-        }
-    }
-
-    public static function getDisplayName(): string
-    {
-        return static::class;
-    }
-
-    public function getStats(): array
-    {
-        return $this->actual_cache->getStats();
-    }
-
-    public static function getConfig(): array
-    {
-        return [];
-    }
-}
diff --git a/lib/classes/StudipCachedArray.php b/lib/classes/StudipCachedArray.php
index 1232d00..46723f4 100644
--- a/lib/classes/StudipCachedArray.php
+++ b/lib/classes/StudipCachedArray.php
@@ -27,10 +27,10 @@ class StudipCachedArray implements ArrayAccess
      * @param int    $duration Duration in seconds for which the item shall be
      *                         stored
      */
-    public function __construct(string $key, int $duration = StudipCache::DEFAULT_EXPIRATION)
+    public function __construct(string $key, int $duration = \Studip\Cache\Cache::DEFAULT_EXPIRATION)
     {
         $this->key = self::class . "/{$key}";
-        $this->cache = StudipCacheFactory::getCache();
+        $this->cache = \Studip\Cache\Factory::getCache();
         $this->duration = $duration;
         $this->hash = $this->getHash();
 
@@ -116,11 +116,14 @@ class StudipCachedArray implements ArrayAccess
     protected function loadData(string $offset)
     {
         if (!array_key_exists($offset, $this->data)) {
-            $cached = $this->cache->read($this->getCacheKey($offset));
-            $this->data[$offset] = $this->swapNullAndFalse($cached);
+            // Get the cache item from the cache:
+            $item = $this->cache->getItem($this->getCacheKey($offset));
+            if ($item->isHit()) {
+                $this->data[$offset] = $this->swapNullAndFalse($item->get());
+            }
         }
 
-        return $this->data[$offset];
+        return $this->data[$offset] ?? null;
     }
 
     /**
@@ -132,13 +135,12 @@ class StudipCachedArray implements ArrayAccess
      */
     protected function storeData(string $offset): void
     {
-        $data = $this->swapNullAndFalse($this->data[$offset]);
-
-        $this->cache->write(
+        $item = new \Studip\Cache\Item(
             $this->getCacheKey($offset),
-            $data,
+            $this->swapNullAndFalse($this->data[$offset]),
             $this->duration
         );
+        $this->cache->save($item);
     }
 
     /**
diff --git a/lib/classes/StudipDbCache.class.php b/lib/classes/StudipDbCache.class.php
deleted file mode 100644
index 865825e..0000000
--- a/lib/classes/StudipDbCache.class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * StudipCache implementation using database table
- *
- * @package     studip
- * @subpackage  cache
- *
- * @author    Elmar Ludwig <elmar.ludwig@uos.de>
- */
-class StudipDbCache implements StudipCache
-{
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Datenbank');
-    }
-
-    /**
-     * Expire item from the cache.
-     *
-     * @param string $arg a single key
-     */
-    public function expire($arg)
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare('DELETE FROM cache WHERE cache_key = ?');
-        $stmt->execute([$arg]);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $db = DBManager::get();
-
-        $db->exec('TRUNCATE TABLE cache');
-    }
-
-    /**
-     * Delete all expired items from the cache.
-     */
-    public function purge()
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare('DELETE FROM cache WHERE expires < ?');
-        $stmt->execute([time()]);
-    }
-
-    /**
-     * Retrieve item from the server.
-     *
-     * @param string $arg a single key
-     *
-     * @return mixed    the previously stored data if an item with such a key
-     *                  exists on the server or FALSE on failure.
-     */
-    public function read($arg)
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare('SELECT content FROM cache WHERE cache_key = ? AND expires > ?');
-        $stmt->execute([$arg, time()]);
-        $result = $stmt->fetchColumn();
-
-        return $result !== false ? unserialize($result) : false;
-    }
-
-    /**
-     * Store data at the server.
-     *
-     * @param string $name     the item's key.
-     * @param mixed  $content  the item's content (will be serialized if necessary).
-     * @param int    $expired  the item's expiry time in seconds. Optional, defaults to 12h.
-     *
-     * @return bool     returns TRUE on success or FALSE on failure.
-     */
-    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION)
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare('REPLACE INTO cache VALUES(?, ?, ?)');
-        return $stmt->execute([$name, serialize($content), time() + $expires]);
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @see StudipCache::getStats()
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        return [
-            __CLASS__ => [
-                'name' => _('Anzahl Einträge'),
-                'value' => DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
-            ]
-        ];
-    }
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @see StudipCache::getConfig()
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        return [
-            'component' => null,
-            'props' => []
-        ];
-    }
-
-}
diff --git a/lib/classes/StudipFileCache.class.php b/lib/classes/StudipFileCache.class.php
deleted file mode 100644
index 9eae66c..0000000
--- a/lib/classes/StudipFileCache.class.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipFileCache.class.php
-//
-//
-//
-// Copyright (c) 2007 André Noack <noack@data-quest.de>
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-/**
- * StudipCache implementation using files
- *
- * @package     studip
- * @subpackage  cache
- *
- * @author    André Noack <noack@data-quest.de>
- * @version   2
- */
-class StudipFileCache implements StudipCache
-{
-    use StudipCacheKeyTrait;
-
-    /**
-     * full path to cache directory
-     *
-     * @var string
-     */
-    private $dir;
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Dateisystem');
-    }
-
-    /**
-     * without the 'dir' argument the cache path is taken from
-     * $CACHING_FILECACHE_PATH or is set to
-     * $TMP_PATH/studip_cache
-     *
-     * @param string the path to use
-     * @return void
-     * @throws exception if the directory does not exist or could not be
-     *         created
-     */
-    public function __construct($path = '')
-    {
-        $this->dir = $path
-                  ?: (Config::get()->SYSTEMCACHE['type'] == 'StudipFileCache' ?
-                        Config::get()->SYSTEMCACHE['config']['path'] : '')
-                  ?: $GLOBALS['CACHING_FILECACHE_PATH']
-                  ?: ($GLOBALS['TMP_PATH'] . '/' . 'studip_cache');
-        $this->dir = rtrim($this->dir, '\\/') . '/';
-
-        if (!is_dir($this->dir) && !@mkdir($this->dir, 0700)) {
-            throw new Exception('Could not create directory: ' . $this->dir);
-        }
-
-        if (!is_writable($this->dir)) {
-            throw new Exception('Can not write to directory: ' . $this->dir);
-        }
-    }
-
-    /**
-     * get path to cache directory
-     *
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return $this->dir;
-    }
-
-    /**
-     * expire cache item
-     *
-     * @see StudipCache::expire()
-     * @param string $arg
-     * @return void
-     */
-    public function expire($arg)
-    {
-        $key = $this->getCacheKey($arg);
-
-        if ($file = $this->getPathAndFile($key)){
-            @unlink($file);
-        }
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        rmdirr($this->dir);
-    }
-
-    /**
-     * retrieve cache item from filesystem
-     * tests first if item is expired
-     *
-     * @see StudipCache::read()
-     * @param string $arg a cache key
-     * @return string|bool
-     */
-    public function read($arg)
-    {
-        $key = $this->getCacheKey($arg);
-
-        if ($file = $this->check($key)){
-            $f = @fopen($file, 'rb');
-            if ($f) {
-                @flock($f, LOCK_SH);
-                $result = stream_get_contents($f);
-                @fclose($f);
-            }
-            return unserialize($result);
-        }
-        return false;
-    }
-
-    /**
-     * store data as cache item in filesystem
-     *
-     * @see StudipCache::write()
-     * @param string $arg a cache key
-     * @param mixed $content data to store
-     * @param int $expire expiry time in seconds, default 12h
-     * @return int|bool the number of bytes that were written to the file,
-     *         or false on failure
-     */
-    public function write($arg, $content, $expire = self::DEFAULT_EXPIRATION)
-    {
-        $key = $this->getCacheKey($arg);
-
-        $this->expire($key);
-        $file = $this->getPathAndFile($key, $expire);
-        return @file_put_contents($file, serialize($content), LOCK_EX);
-    }
-
-    /**
-     * checks if specified cache item is expired
-     * if expired the cache file is deleted
-     *
-     * @param string $key a cache key to check
-     * @return string|bool the path to the cache file or false if expired
-     */
-    private function check($key)
-    {
-        if ($file = $this->getPathAndFile($key)){
-            list($id, $expire) = explode('-', basename($file));
-            if (time() < $expire) {
-                return $file;
-            } else {
-                @unlink($file);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * get the full path to a cache file
-     *
-     * the cache files are organized in sub-folders named by
-     * the first two characters of the hashed cache key.
-     * the filename is constructed from the hashed cache key
-     * and the timestamp of expiration
-     *
-     * @param string $key a cache key
-     * @param int $expire expiry time in seconds
-     * @return string|bool full path to cache item or false on failure
-     */
-    private function getPathAndFile($key, $expire = null)
-    {
-        $id = hash('md5', $key);
-        $path = $this->dir . mb_substr($id, 0, 2);
-        if (!is_dir($path) && !@mkdir($path, 0700)) {
-            throw new Exception('Could not create directory: ' . $path);
-        }
-        if (!is_null($expire)){
-            return $path . '/' . $id . '-' . (time() + $expire);
-        } else {
-            $files = @glob("{$path}/{$id}*");
-            if (count($files) > 0) {
-                return $files[0];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * purges expired entries from the cache directory
-     *
-     * @param bool echo messages if set to false
-     * @return int the number of deleted files
-     */
-    public function purge($be_quiet = true)
-    {
-        $now = time();
-        $deleted = 0;
-        foreach (@glob($this->dir . '*', GLOB_ONLYDIR) as $current_dir){
-            foreach (@glob("{$current_dir}/*") as $file){
-                list($id, $expire) = explode('-', basename($file));
-                if ($expire < $now) {
-                    if (@unlink($file)) {
-                        ++$deleted;
-                        if (!$be_quiet) {
-                            echo "File: {$file} deleted.\n";
-                        }
-                    }
-                } else if (!$be_quiet){
-                    echo "File: {$file} expires on " . strftime('%x %X', $expire) . "\n";
-                }
-            }
-        }
-        return $deleted;
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        return [
-            __CLASS__ => [
-                'name' => _('Anzahl Einträge'),
-                'value' => DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
-            ]
-        ];
-    }
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        $currentCache = Config::get()->SYSTEMCACHE;
-
-        // Set default config for this cache
-        $currentConfig = [
-            'path' => $GLOBALS['TMP_PATH'] . '/studip_cache'
-        ];
-
-        // If this cache is set as system cache, use config from global settings.
-        if ($currentCache['type'] == __CLASS__) {
-            $currentConfig = $currentCache['config'];
-        }
-
-        return [
-            'component' => 'FileCacheConfig',
-            'props' => $currentConfig
-        ];
-    }
-
-}
diff --git a/lib/classes/StudipKing.class.php b/lib/classes/StudipKing.class.php
index 2d1f15c..3a61c57 100644
--- a/lib/classes/StudipKing.class.php
+++ b/lib/classes/StudipKing.class.php
@@ -63,7 +63,7 @@ class StudipKing {
     private static function get_kings()
     {
         if (self::$kings === null) {
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
 
             # read cache (unserializing a cache miss - FALSE - does not matter)
             $kings = unserialize($cache->read(self::CACHE_KEY));
diff --git a/lib/classes/StudipMemcachedCache.php b/lib/classes/StudipMemcachedCache.php
deleted file mode 100644
index 0e44dd5..0000000
--- a/lib/classes/StudipMemcachedCache.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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.
- */
-
-
-/**
- * Cache implementation using memcached.
- *
- * @package     studip
- * @subpackage  cache
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @since   5.0
- */
-
-class StudipMemcachedCache implements StudipCache
-{
-    use StudipCacheKeyTrait;
-
-    private $memcache;
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Memcached');
-    }
-
-    public function __construct($servers)
-    {
-        if (!extension_loaded('memcached')) {
-            throw new Exception('Memcache extension missing.');
-        }
-
-        $prefix = Config::get()->STUDIP_INSTALLATION_ID;
-        $this->memcache = new Memcached('studip' . $prefix ? '-' . $prefix : '');
-
-        if (count($this->memcache->getServerList()) === 0) {
-            foreach ($servers as $server) {
-                $status = $this->memcache->addServer($server['hostname'], (int) $server['port']);
-
-                if (!$status) {
-                    throw new Exception("Could not add server: {$server['hostname']} @ port {$server['port']}");
-                }
-            }
-        }
-    }
-
-    /**
-     * Expire item from the cache.
-     *
-     * Example:
-     *
-     *   # expires foo
-     *   $cache->expire('foo');
-     *
-     * @param   string $arg a single key.
-     * @returns void
-     */
-    public function expire($arg)
-    {
-        $key = $this->getCacheKey($arg);
-        $this->memcache->delete($key);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $this->memcache->flush();
-    }
-
-    /**
-     * Retrieve item from the server.
-     *
-     * Example:
-     *
-     *   # reads foo
-     *   $foo = $cache->reads('foo');
-     *
-     * @param   string $arg a single key
-     * @returns mixed  the previously stored data if an item with such a key
-     *                 exists on the server or FALSE on failure.
-     */
-    public function read($arg)
-    {
-        $key = $this->getCacheKey($arg);
-        return $this->memcache->get($key);
-    }
-
-    /**
-     * Store data at the server.
-     *
-     * @param string $arg the item's key.
-     * @param string $content the item's content.
-     * @param int $expire the item's expiry time in seconds. Defaults to 12h.
-     *
-     * @returns mixed  returns TRUE on success or FALSE on failure.
-     *
-     */
-    public function write($arg, $content, $expire = self::DEFAULT_EXPIRATION)
-    {
-        $key = $this->getCacheKey($arg);
-        return $this->memcache->set($key, $content, $expire);
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @StudipCache::getStats()
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        $stats = $this->memcache->getStats();
-        return $stats;
-    }
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @see StudipCache::getConfig()
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        $currentCache = Config::get()->SYSTEMCACHE;
-
-        // Set default config for this cache
-        $currentConfig = [
-            'servers' => []
-        ];
-
-        // If this cache is set as system cache, use config from global settings.
-        if ($currentCache['type'] == __CLASS__) {
-            $currentConfig = $currentCache['config'];
-        }
-
-        return [
-            'component' => 'MemcachedCacheConfig',
-            'props' => $currentConfig
-        ];
-    }
-
-}
diff --git a/lib/classes/StudipMemoryCache.class.php b/lib/classes/StudipMemoryCache.class.php
deleted file mode 100644
index d38385a..0000000
--- a/lib/classes/StudipMemoryCache.class.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * The php memory implementation of the StudipCache interface.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since   Stud.IP 5.0
- */
-class StudipMemoryCache implements StudipCache
-{
-    protected $memory_cache = [];
-
-    /**
-     * Expires just a single key.
-     *
-     * @param  string  the key
-     */
-    public function expire($key)
-    {
-        unset($this->memory_cache[$key]);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $this->memory_cache = [];
-    }
-
-    /**
-     * Reads just a single key from the cache.
-     *
-     * @param  string  the key
-     *
-     * @return mixed   the corresponding value
-     */
-    public function read($key)
-    {
-        if (!isset($this->memory_cache[$key])) {
-            return false;
-        }
-        if ($this->memory_cache[$key]['expires'] < time()) {
-            $this->expire($key);
-            return false;
-        }
-        return $this->memory_cache[$key]['data'];
-    }
-
-    /**
-     * Store data at the server.
-     *
-     * @param string   the item's key.
-     * @param mixed    the item's content (will be serialized if necessary).
-     * @param int      the item's expiry time in seconds. Defaults to 12h.
-     *
-     * @returns mixed  returns TRUE on success or FALSE on failure.
-     *
-     */
-    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION)
-    {
-        $this->memory_cache[$name] = [
-            'expires' => time() + $expires,
-            'data'    => $content,
-        ];
-
-        return true;
-    }
-
-    public static function getDisplayName(): string
-    {
-        return 'Memory cache';
-    }
-
-    public function getStats(): array
-    {
-        return [];
-    }
-
-    public static function getConfig(): array
-    {
-        return [];
-    }
-}
diff --git a/lib/classes/StudipRedisCache.class.php b/lib/classes/StudipRedisCache.class.php
deleted file mode 100644
index 7b9570b..0000000
--- a/lib/classes/StudipRedisCache.class.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Cache implementation using redis.
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     GPL2 or any later version
- * @package     studip
- * @subpackage  cache
- * @since       Stud.IP 5.0
- */
-class StudipRedisCache implements StudipCache
-{
-    use StudipCacheKeyTrait;
-
-    private $redis;
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Redis');
-    }
-
-    /**
-     * Construct a cache instance.
-     *
-     * @param string $hostname Hostname of redis server
-     * @param int    $port     Port of redis server
-     * @param string $auth     Optional auth token/password
-     */
-    public function __construct($hostname, $port, string $auth = '')
-    {
-        if (!extension_loaded('redis')) {
-            throw new Exception('Redis extension missing.');
-        }
-
-        $this->redis = new Redis();
-        $status = $this->redis->connect($hostname, $port, 1);
-
-        if (!$status) {
-            throw new Exception('Could not add cache.');
-        }
-
-        if ($auth !== '') {
-            $this->redis->auth($auth);
-        }
-    }
-
-    /**
-     * Returns the instance of the redis server connection.
-     *
-     * @return Redis instance
-     */
-    public function getRedis()
-    {
-        return $this->redis;
-    }
-
-    /**
-     * Expire item from the cache.
-     *
-     * Example:
-     *
-     *   # expires foo
-     *   $cache->expire('foo');
-     *
-     * @param   string $arg a single key.
-     */
-    public function expire($arg)
-    {
-        $key = $this->getCacheKey($arg);
-        $this->redis->unlink($key);
-    }
-
-    /**
-     * Retrieve item from the server.
-     *
-     * Example:
-     *
-     *   # reads foo
-     *   $foo = $cache->reads('foo');
-     *
-     * @param  string $arg a single key
-     * @return mixed  the previously stored data if an item with such a key
-     *                exists on the server or FALSE on failure.
-     */
-    public function read($arg)
-    {
-        $key = $this->getCacheKey($arg);
-
-        $result = $this->redis->get($key);
-
-        return ($result === null) ? null : unserialize($result);
-    }
-
-    /**
-     * Store data at the server.
-     *
-     * @param string   the item's key.
-     * @param string   the item's content.
-     * @param int      the item's expiry time in seconds. Defaults to 12h.
-     * @return mixed  returns TRUE on success or FALSE on failure.
-     */
-    public function write($name, $content, $expire = self::DEFAULT_EXPIRATION)
-    {
-        $key = $this->getCacheKey($name);
-        return $this->redis->setEx($key, $expire, serialize($content));
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $pattern = $this->getCacheKey('*');
-        foreach ($this->redis->keys($pattern) as $key) {
-            $this->redis->unlink($key);
-        }
-    }
-
-    /**
-     * @param string $method Method to call
-     * @param array $args Arguments to pass
-     * @return false|mixed
-     */
-    public function __call($method, $args)
-    {
-        if (is_callable([$this->redis, $method])) {
-            return call_user_func_array([$this->redis, $method], $args);
-        }
-        throw new BadMethodCallException("Method {$method} does not exist");
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @StudipCache::getStats()
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        $stats = $this->redis->info();
-        $stats['size'] = count($this->redis->keys($this->getCacheKey('*')));
-        return ["{$this->redis->getHost()}:{$this->redis->getPort()}" => $stats];
-    }
-
-    /*
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @see StudipCache::getConfig()
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        $currentCache = Config::get()->SYSTEMCACHE;
-
-        // Set default config for this cache
-        $currentConfig = [
-            'hostname' => '',
-            'port' => null
-        ];
-
-        // If this cache is set as system cache, use config from global settings.
-        if ($currentCache['type'] == __CLASS__) {
-            $currentConfig = $currentCache['config'];
-            $currentConfig['port'] = $currentConfig['port'] ? (int) $currentConfig['port'] : null;
-        }
-
-        return [
-            'component' => 'RedisCacheConfig',
-            'props' => $currentConfig
-        ];
-    }
-}
diff --git a/lib/classes/UserLookup.class.php b/lib/classes/UserLookup.class.php
index ddf9276..bdd9fc3 100644
--- a/lib/classes/UserLookup.class.php
+++ b/lib/classes/UserLookup.class.php
@@ -239,7 +239,7 @@ class UserLookup
             return call_user_func(self::$types[$type]['values']);
         }
 
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache_key = "UserLookup/{$type}/values";
         $cached_values = $cache->read($cache_key);
         if ($cached_values) {
diff --git a/lib/classes/assets/SASSCompiler.php b/lib/classes/assets/SASSCompiler.php
index 2dcda2d..0b03a8c 100644
--- a/lib/classes/assets/SASSCompiler.php
+++ b/lib/classes/assets/SASSCompiler.php
@@ -2,7 +2,7 @@
 namespace Assets;
 
 use Assets;
-use StudipCacheFactory;
+use Studip\Cache\Factory;
 use Studip;
 
 use ScssPhp\ScssPhp\Compiler as ScssCompiler;
@@ -82,7 +82,7 @@ class SASSCompiler implements Compiler
      */
     private function getPrefix()
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = Studip\Cache\Factory::getCache();
 
         $prefix = $cache->read(self::CACHE_KEY);
 
diff --git a/lib/classes/cache/Cache.class.php b/lib/classes/cache/Cache.class.php
new file mode 100644
index 0000000..366945d
--- /dev/null
+++ b/lib/classes/cache/Cache.class.php
@@ -0,0 +1,208 @@
+<?php
+
+namespace Studip\Cache;
+
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+
+/**
+ * An abstract class which has to be extended by instances returned from
+ * \Studip\Cache\Factory#getCache
+ *
+ * @author     Marco Diedrich (mdiedric@uos)
+ * @author     Marcus Lunzenauer (mlunzena@uos.de)
+ * @author     Moritz Strohm <strohm@data-quest.de>
+ * @copyright  (c) Authors
+ * @since      1.6
+ * @license    GPL2 or any later version
+ */
+abstract class Cache implements CacheItemPoolInterface
+{
+    const DEFAULT_EXPIRATION = 12 * 60 * 60; // 12 hours
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    abstract public static function getDisplayName(): string;
+
+    /**
+     * Get some statistics from cache, like number of entries, hit rate or
+     * whatever the underlying cache provides.
+     * Results are returned in form of an array like
+     *      "[
+     *          [
+     *              'name' => <displayable name>
+     *              'value' => <value of the current stat>
+     *          ]
+     *      ]"
+     *
+     * @return array
+     */
+    abstract public function getStats(): array;
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     * The associative array is of the form
+     *  [
+     *      'component' => <Vue component name>,
+     *      'props' => <Properties for component>
+     *  ]
+     *
+     * @return array
+     */
+    abstract public static function getConfig(): array;
+
+    /**
+     * Expire item from the cache.
+     *
+     * Example:
+     *
+     *   # expires foo
+     *   $cache->expire('foo');
+     *
+     * @param string $arg a single key
+     */
+    abstract public function expire($arg);
+
+    /**
+     * Expire all items from the cache.
+     */
+    abstract public function flush();
+
+    /**
+     * @see CacheItemPoolInterface::getItem
+     */
+    abstract public function getItem($key);
+
+    /**
+     * @see CacheItemPoolInterface::hasItem
+     */
+    abstract public function hasItem($key);
+
+    /**
+     * @var array An array of deferred items that shall be saved only
+     * when commit() is called. This is only used in PSR-6 cache methods.
+     */
+    protected array $deferred_items = [];
+
+    /**
+     * Retrieve item from the server.
+     *
+     * Example:
+     *
+     *   # reads foo
+     *   $foo = $cache->reads('foo');
+     *
+     * @param string $arg a single key
+     *
+     * @return mixed    the previously stored data if an item with such a key
+     *                  exists on the server or FALSE on failure.
+     *
+     * @deprecated To be removed with Stud.IP 7.0.
+     */
+    public function read($arg)
+    {
+        $item = $this->getItem($arg);
+        if ($item->isHit()) {
+            return $item->get();
+        }
+        return false;
+    }
+
+    /**
+     * Store data at the server.
+     *
+     * @param string $name     the item's key.
+     * @param mixed  $content  the item's content (will be serialized if necessary).
+     * @param int    $expires  the item's expiry time in seconds. Optional, defaults to 12h.
+     *
+     * @return bool     returns TRUE on success or FALSE on failure.
+
+     * @deprecated To be removed with Stud.IP 7.0.
+     */
+    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION)
+    {
+        $item = new Item($name, $content, $expires);
+
+        return $this->save($item);
+    }
+
+    /**
+     * Calculates the expiration by a cache item. If that cannot be determined,
+     * the default expiration period is returned.
+     *
+     * @param Item $item The item from which to get the expiration time.
+     *
+     * @return int The time from now until the expiration in seconds.
+     */
+    public function getExpiration(CacheItemInterface $item) : int
+    {
+        $expiration = self::DEFAULT_EXPIRATION;
+        if ($item instanceof Item) {
+            $expiration = $item->getExpirationInSeconds();
+        }
+        return $expiration;
+    }
+
+    // PSR-6 CacheItemPoolInterface:
+
+    /**
+     * @see CacheItemPoolInterface::getItems
+     */
+    public function getItems(array $keys = [])
+    {
+        $items = [];
+        foreach ($keys as $key) {
+            $item = $this->getItem($key);
+            if ($item instanceof Item) {
+                $items[] = $item;
+            }
+        }
+        return $items;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::clear
+     */
+    public function clear()
+    {
+        $this->deferred_items = [];
+        $this->flush();
+    }
+
+    /**
+     * @see CacheItemPoolInterface::deleteItem
+     */
+    public function deleteItem($key)
+    {
+        $this->expire($key);
+    }
+
+    /**
+     * @see CacheItemPoolInterface::deleteItems
+     */
+    public function deleteItems(array $keys)
+    {
+        foreach ($keys as $key) {
+            $this->expire($key);
+        }
+    }
+
+    /**
+     * @see CacheItemPoolInterface::saveDeferred
+     */
+    public function saveDeferred(CacheItemInterface $item)
+    {
+        $this->deferred_items[] = $item;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::commit
+     */
+    public function commit()
+    {
+        foreach ($this->deferred_items as $item) {
+            $this->save($item);
+        }
+    }
+}
diff --git a/lib/classes/cache/DbCache.class.php b/lib/classes/cache/DbCache.class.php
new file mode 100644
index 0000000..3361af0
--- /dev/null
+++ b/lib/classes/cache/DbCache.class.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Studip\Cache;
+
+use DBManager;
+
+/**
+ * StudipCache implementation using database table
+ *
+ * @author    Elmar Ludwig <elmar.ludwig@uos.de>
+ */
+class DbCache extends Cache
+{
+    /**
+     * @return string A display name (that can be translated) for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Datenbank');
+    }
+
+    /**
+     * Expire item from the cache.
+     *
+     * @param string $arg a single key
+     */
+    public function expire($arg)
+    {
+        $db = DBManager::get();
+
+        $stmt = $db->prepare('DELETE FROM cache WHERE cache_key = ?');
+        $stmt->execute([$arg]);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $db = DBManager::get();
+
+        $db->exec('TRUNCATE TABLE cache');
+    }
+
+    /**
+     * Delete all expired items from the cache.
+     */
+    public function purge()
+    {
+        $db = DBManager::get();
+
+        $stmt = $db->prepare('DELETE FROM cache WHERE expires < ?');
+        $stmt->execute([time()]);
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @return array|array[]
+     *@see Cache::getStats()
+     *
+     */
+    public function getStats(): array
+    {
+        return [
+            __CLASS__ => [
+                'name' => _('Anzahl Einträge'),
+                'value' => DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
+            ]
+        ];
+    }
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @return array
+     *@see Cache::getConfig()
+     *
+     */
+    public static function getConfig(): array
+    {
+        return [
+            'component' => null,
+            'props' => []
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        $query = "SELECT `content`, `expires`
+                  FROM `cache`
+                  WHERE `cache_key` = :key
+                    AND `expires` > UNIX_TIMESTAMP()";
+        $result = DBManager::get()->fetchOne($query, [':key' => $key]);
+
+        $item = new Item($key);
+        if (!empty($result)) {
+            $item->setHit();
+            if ($result['content']) {
+                $item->set(unserialize($result['content']));
+            }
+            if ($result['expires']) {
+                $expiration = new \DateTime();
+                $expiration->setTimestamp($result['expires']);
+                $item->expiresAt($expiration);
+            }
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        $query = "SELECT 1
+                  FROM `cache`
+                  WHERE `cache_key` = :key
+                    AND `expires` > UNIX_TIMESTAMP()";
+        return (bool) DBManager::get()->fetchColumn($query, [':key' => $key]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(\Psr\Cache\CacheItemInterface $item)
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            // The item would expire immediately.
+            return false;
+        }
+
+        return DBManager::get()->execute(
+            'REPLACE INTO `cache` VALUES (?, ?, ?)',
+            [$item->getKey(), serialize($item->get()), $expiration]
+        );
+    }
+}
diff --git a/lib/classes/cache/Exception.php b/lib/classes/cache/Exception.php
new file mode 100644
index 0000000..64ee364
--- /dev/null
+++ b/lib/classes/cache/Exception.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * CacheException.class.php
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2024
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       6.0
+ */
+
+namespace Studip\Cache;
+
+/**
+ * The CacheException class is an implementation of the CacheException interface
+ * of PSR-6 that behaves like a StudipException.
+ */
+class Exception extends \StudipException implements \Psr\Cache\CacheException
+{
+    //Nothing here, since there is nothing to implement.
+}
diff --git a/lib/classes/cache/Factory.class.php b/lib/classes/cache/Factory.class.php
new file mode 100644
index 0000000..b5c8359
--- /dev/null
+++ b/lib/classes/cache/Factory.class.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace Studip\Cache;
+
+use Config;
+use DBSchemaVersion;
+use MessageBox;
+use PageLayout;
+use ReflectionClass;
+use StudipCacheOperation;
+use UnexpectedValueException;
+
+/**
+ * This factory retrieves the instance of StudipCache configured for use in
+ * this Stud.IP installation.
+ *
+ * @package    studip
+ * @subpackage lib
+ *
+ * @author    Marco Diedrich (mdiedric@uos)
+ * @author    Marcus Lunzenauer (mlunzena@uos.de)
+ * @copyright 2007 (c) Authors
+ * @since     1.6
+ * @license   GPL2 or any later version
+ */
+class Factory
+{
+    /**
+     * the default cache class
+     *
+     * @var string
+     */
+    const DEFAULT_CACHE_CLASS = DbCache::class;
+
+    /**
+     * singleton instance
+     *
+     * @var Cache|null
+     */
+    private static ?Cache $cache = null;
+
+
+    /**
+     * config instance
+     *
+     * @var Config|null
+     */
+    private static ?Config $config = null;
+
+
+    /**
+     * Returns the currently used config instance
+     *
+     * @return Config        an instance of class Config used by this factory to
+     *                       determine the class of the actual implementation of
+     *                       the StudipCache interface; if no config was set, it
+     *                       returns the instance returned by Config#getInstance
+     * @see Config
+     */
+    public static function getConfig()
+    {
+        return self::$config ?? Config::getInstance();
+    }
+
+
+    /**
+     * @param Config $config an instance of class Config which will be used to
+     *                       determine the class of the implementation of interface
+     *                       StudipCache
+     */
+    public static function setConfig(Config $config)
+    {
+        self::$config = $config;
+        self::$cache = NULL;
+    }
+
+    /**
+     * Resets the configuration and voids the cache instance.
+     */
+    public static function unconfigure()
+    {
+        self::$cache = NULL;
+    }
+
+    /**
+     * Returns a cache instance.
+     *
+     * @param bool $apply_proxied_operations Whether or not to apply any
+     *                                       proxied (disable this in tests!)
+     * @return Cache the cache instance
+     */
+    public static function getCache(bool $apply_proxied_operations = true): Cache
+    {
+        if (self::$cache === null) {
+            $proxied = false;
+
+            if (!$GLOBALS['CACHING_ENABLE']) {
+                self::$cache = new MemoryCache();
+
+                // Proxy cache operations if CACHING_ENABLE is different from the globally set
+                // caching value. This should only be the case in cli mode.
+                if (isset($GLOBALS['GLOBAL_CACHING_ENABLE']) && $GLOBALS['GLOBAL_CACHING_ENABLE']) {
+                    $proxied = true;
+                }
+            } else {
+                try {
+                    $class = self::loadCacheClass();
+                    $args = self::retrieveConstructorArguments();
+
+                    self::$cache = self::instantiateCache($class, $args);
+                } catch (\Exception $e) {
+                    error_log(__METHOD__ . ': ' . $e->getMessage());
+                    PageLayout::addBodyElements(MessageBox::error(__METHOD__ . ': ' . $e->getMessage()));
+                    $class = self::DEFAULT_CACHE_CLASS;
+                    self::$cache = new $class();
+                }
+            }
+
+            // If proxy should be used, inject it. Otherwise apply pending
+            // operations, if any.
+            if ($proxied) {
+                self::$cache = new Proxy(self::$cache);
+            } elseif ($GLOBALS['CACHING_ENABLE'] && $apply_proxied_operations) {
+                // Even if the above condition will try to eliminate most
+                // failures, the following operation still needs to be wrapped
+                // in a try/catch block. Otherwise there are no means to
+                // execute migration 166 which creates the neccessary tables
+                // for said operation.
+                try {
+                    StudipCacheOperation::apply(self::$cache);
+                } catch (\Exception $e) {
+                }
+            }
+        }
+
+        return self::$cache;
+    }
+
+
+    /**
+     * Load configured cache class and return its name.
+     *
+     * @return string  the name of the configured cache class
+     */
+    public static function loadCacheClass()
+    {
+        $cacheConfig = self::getConfig()->SYSTEMCACHE;
+
+        $cache_class = $cacheConfig['type'] ?: null;
+
+        # default class
+        if ($cache_class === null) {
+            $version = new DBSchemaVersion();
+            if ($version->get(1) < 224) {
+                // db cache is not yet available, use StudipMemoryCache
+                return 'StudipMemoryCache';
+            }
+
+            return self::DEFAULT_CACHE_CLASS;
+        }
+
+        if (!class_exists($cache_class)) {
+            throw new UnexpectedValueException("Could not find class: '$cache_class'");
+        }
+
+        return $cache_class;
+    }
+
+    /**
+     * Return an array of arguments required for instantiation of the cache
+     * class.
+     *
+     * @return array  the array of arguments
+     */
+    public static function retrieveConstructorArguments()
+    {
+        $cacheConfig = self::getConfig()->SYSTEMCACHE;
+
+        return $cacheConfig ?: [];
+    }
+
+    /**
+     * Return an instance of a given class using some arguments. Unless the
+     * memory cache is instantiated, the cache will be wrapped in a wrapper
+     * class that uses a memory cache to reduce accesses to the cache.
+     *
+     * @param string $class     the name of the class
+     * @param array  $arguments an array of arguments to be used by the constructor
+     *
+     * @return Cache  an instance of the specified class
+     * @throws \ReflectionException
+     */
+    public static function instantiateCache($class, $arguments)
+    {
+        $reflection_class = new ReflectionClass($class);
+        $cache = (is_array($arguments['config']) && count($arguments['config']) > 0)
+               ? $reflection_class->newInstanceArgs($arguments['config'])
+               : $reflection_class->newInstance();
+
+        if ($class !== MemoryCache::class) {
+            return new Wrapper($cache);
+        }
+
+        return $cache;
+    }
+}
diff --git a/lib/classes/cache/FileCache.class.php b/lib/classes/cache/FileCache.class.php
new file mode 100644
index 0000000..e94395a
--- /dev/null
+++ b/lib/classes/cache/FileCache.class.php
@@ -0,0 +1,277 @@
+<?php
+
+namespace Studip\Cache;
+
+use Config;
+use Exception;
+
+/**
+ * Cache implementation using files
+ *
+ * @author    André Noack <noack@data-quest.de>
+ * @copyright 2007 André Noack <noack@data-quest.de>
+ * @license GPL2 or any later version
+ */
+class FileCache extends Cache
+{
+    use KeyTrait;
+
+    /**
+     * full path to cache directory
+     *
+     * @var string
+     */
+    private string $dir;
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Dateisystem');
+    }
+
+    /**
+     * without the 'dir' argument the cache path is taken from
+     * $CACHING_FILECACHE_PATH or is set to
+     * $TMP_PATH/studip_cache
+     *
+     * @param string $path the path to use
+     * @throws Exception if the directory does not exist or could not be
+     *         created
+     */
+    public function __construct(string $path = '')
+    {
+        $this->dir = $path
+                  ?: (
+                      Config::get()->SYSTEMCACHE['type'] === self::class
+                          ? Config::get()->SYSTEMCACHE['config']['path']
+                          : ''
+                  )
+                  ?: $GLOBALS['CACHING_FILECACHE_PATH']
+                  ?: ($GLOBALS['TMP_PATH'] . '/' . 'studip_cache');
+        $this->dir = rtrim($this->dir, '\\/') . '/';
+
+        if (!is_dir($this->dir) && !@mkdir($this->dir, 0700)) {
+            throw new \Exception('Could not create directory: ' . $this->dir);
+        }
+
+        if (!is_writable($this->dir)) {
+            throw new \Exception('Can not write to directory: ' . $this->dir);
+        }
+    }
+
+    /**
+     * get path to cache directory
+     *
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return $this->dir;
+    }
+
+    /**
+     * expire cache item
+     *
+     * @param string $arg
+     *
+     * @return void
+     * @throws Exception
+     * @see Cache::expire()
+     */
+    public function expire($arg)
+    {
+        $key = $this->getCacheKey($arg);
+
+        if ($file = $this->getPathAndFile($key)){
+            @unlink($file);
+        }
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        rmdirr($this->dir);
+    }
+
+    /**
+     * checks if specified cache item is expired
+     * if expired the cache file is deleted
+     *
+     * @param string $key a cache key to check
+     *
+     * @return array|bool the path to the cache file or false if expired
+     * @throws Exception
+     */
+    private function check($key)
+    {
+        if ($file = $this->getPathAndFile($key)){
+            [$id, $expire] = explode('-', basename($file));
+            if (time() < $expire) {
+                return [$file, $expire];
+            } else {
+                @unlink($file);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * get the full path to a cache file
+     *
+     * the cache files are organized in sub-folders named by
+     * the first two characters of the hashed cache key.
+     * the filename is constructed from the hashed cache key
+     * and the timestamp of expiration
+     *
+     * @param string   $key    a cache key
+     * @param int|null $expire expiry time in seconds
+     *
+     * @return string|bool full path to cache item or false on failure
+     * @throws Exception
+     */
+    private function getPathAndFile(string $key, ?int $expire = null): bool|string
+    {
+        $id = hash('md5', $key);
+        $path = $this->dir . mb_substr($id, 0, 2);
+        if (!is_dir($path) && !@mkdir($path, 0700)) {
+            throw new \Exception('Could not create directory: ' . $path);
+        }
+        if (!is_null($expire)){
+            return $path . '/' . $id . '-' . (time() + $expire);
+        } else {
+            $files = @glob("{$path}/{$id}*");
+            if (count($files) > 0) {
+                return $files[0];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * purges expired entries from the cache directory
+     *
+     * @param bool $be_quiet echo messages if set to false
+     *
+     * @return int the number of deleted files
+     */
+    public function purge(bool $be_quiet = true): int
+    {
+        $now = time();
+        $deleted = 0;
+        foreach (@glob($this->dir . '*', GLOB_ONLYDIR) as $current_dir){
+            foreach (@glob("{$current_dir}/*") as $file){
+                [$id, $expire] = explode('-', basename($file));
+                if ($expire < $now) {
+                    if (@unlink($file)) {
+                        ++$deleted;
+                        if (!$be_quiet) {
+                            echo "File: {$file} deleted.\n";
+                        }
+                    }
+                } else if (!$be_quiet) {
+                    echo "File: {$file} expires on " . date('Y-m-d H:i:s', $expire) . "\n";
+                }
+            }
+        }
+        return $deleted;
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @return array|array[]
+     */
+    public function getStats(): array
+    {
+        return [
+            __CLASS__ => [
+                'name' => _('Anzahl Einträge'),
+                'value' => \DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
+            ]
+        ];
+    }
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @return array
+     */
+    public static function getConfig(): array
+    {
+        $currentCache = Config::get()->SYSTEMCACHE;
+
+        // Set default config for this cache
+        $currentConfig = [
+            'path' => $GLOBALS['TMP_PATH'] . '/studip_cache'
+        ];
+
+        // If this cache is set as system cache, use config from global settings.
+        if ($currentCache['type'] == __CLASS__) {
+            $currentConfig = $currentCache['config'];
+        }
+
+        return [
+            'component' => 'FileCacheConfig',
+            'props' => $currentConfig
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        $real_key = $this->getCacheKey($key);
+
+        $item = new \Studip\Cache\Item($key);
+
+        $file_data = $this->check($real_key);
+        if ($file_data) {
+            $file = $file_data[0];
+            $expire = $file_data[1];
+            $f = @fopen($file, 'rb');
+            if ($f) {
+                @flock($f, LOCK_SH);
+                $result = stream_get_contents($f);
+                @fclose($f);
+            }
+            $item->setHit();
+            $item->set(unserialize($result));
+            $expiration = new \DateTime();
+            $expiration->setTimestamp($expire);
+            $item->expiresAt($expiration);
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        $real_key = $this->getCacheKey($key);
+        $file_data = $this->check($real_key);
+        return $file_data !== false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(\Psr\Cache\CacheItemInterface $item)
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            //The item would expire immediately.
+            return false;
+        }
+
+        $real_key = $this->getCacheKey($item->getKey());
+        $this->expire($real_key);
+        $file = $this->getPathAndFile($real_key, $expiration);
+        return @file_put_contents($file, serialize($item->get()), LOCK_EX);
+    }
+}
diff --git a/lib/classes/cache/InvalidCacheArgumentException.php b/lib/classes/cache/InvalidCacheArgumentException.php
new file mode 100644
index 0000000..e85c6b2
--- /dev/null
+++ b/lib/classes/cache/InvalidCacheArgumentException.php
@@ -0,0 +1,28 @@
+<?php
+/*
+ * CacheException.class.php
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2024
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       6.0
+ */
+
+namespace Studip\Cache;
+
+
+/**
+ * The InvalidCacheArgumentException is an implementation of the InvalidArgumentException interface
+ *  of PSR-6 that behaves like a StudipException.
+ */
+class InvalidCacheArgumentException extends \StudipException implements \Psr\Cache\InvalidArgumentException
+{
+    //Nothing here, since there is nothing to implement.
+}
diff --git a/lib/classes/cache/Item.class.php b/lib/classes/cache/Item.class.php
new file mode 100644
index 0000000..1a09f1d
--- /dev/null
+++ b/lib/classes/cache/Item.class.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Item.class.php
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2024
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       6.0
+ */
+
+namespace Studip\Cache;
+
+use DateInterval;
+use DateTime;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * \Studip\Cache\CacheItem implements the CacheItemInterface of PSR-6. It holds the value and the
+ * key of a cache item and also provides additional methods to get the expiration of the item.
+ */
+class Item implements CacheItemInterface
+{
+    /**
+     * @var string The key of the item in the cache.
+     */
+    protected string $key;
+
+    /**
+     * @var mixed The value of the item.
+     */
+    protected mixed $value;
+
+    /**
+     * @var DateTime|null The expiration as DateTime object or null if the expiration is not defined.
+     */
+    protected ?DateTime $expiration = null;
+
+    /**
+     * @var bool An indicator whether the item has been found in the cache (true) or not (false).
+     */
+    protected bool $cache_hit = false;
+
+    /**
+     * The constructor of \Studip\Cache\CacheItem.
+     *
+     * @param string $key The key of the item in the cache.
+     * @param mixed $value The value of the item.
+     * @param int|null $expiration The expiration of the item in seconds, if applicable.
+     * @param bool $cache_hit Whether the item shall be constructed as cache hit (true) or not (false).
+     *
+     */
+    public function __construct(
+        string $key,
+        mixed $value = null,
+        ?int $expiration = null,
+        bool $cache_hit = false
+    ) {
+        $this->key         = $key;
+        $this->value       = $value;
+        $this->cache_hit   = $cache_hit;
+        $this->expiresAfter($expiration);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isHit()
+    {
+        return $this->cache_hit;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function set($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function expiresAt($expiration)
+    {
+        $this->expiration = $expiration;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function expiresAfter($time)
+    {
+        $this->expiration = new DateTime();
+        if ($time instanceof DateInterval) {
+            $this->expiration = $this->expiration->add($time);
+        } elseif (is_integer($time)) {
+            $this->expiration->setTimestamp(time() + $time);
+        } else {
+            $this->expiration->setTimestamp(time() + Cache::DEFAULT_EXPIRATION);
+        }
+        return $this;
+    }
+
+    // \Studip\Cache\CacheItem specific methods:
+
+    /**
+     * Sets the item to be a cache hit.
+     *
+     * @return void
+     */
+    public function setHit() : void
+    {
+        $this->cache_hit = true;
+    }
+
+    /**
+     * Returns the expiration, if set.
+     *
+     * @return DateTime|null A DateTime object with the expiration date and time
+     *     or null if the expiration is not defined.
+     */
+    public function getExpiration() : ?DateTime
+    {
+        return $this->expiration;
+    }
+
+    /**
+     * Returns the seconds from the current timestamp until the expiration of the item.
+     *
+     * @return int The seconds until the item expires
+     */
+    public function getExpirationInSeconds() : int
+    {
+        if ($this->expiration) {
+            return $this->expiration->getTimestamp() - time();
+        }
+        return 0;
+    }
+}
diff --git a/lib/classes/cache/KeyTrait.php b/lib/classes/cache/KeyTrait.php
new file mode 100644
index 0000000..021aaba
--- /dev/null
+++ b/lib/classes/cache/KeyTrait.php
@@ -0,0 +1,31 @@
+<?php
+namespace Studip\Cache;
+
+/**
+ * Trait for unique cache hashes per key for each system based on db configuration which should
+ * be sufficient to eliminate cache mishaps.
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     GPL2 or any later version
+ * @package     studip
+ * @subpackage  cache
+ * @since       Stud.IP 5.0
+ */
+trait KeyTrait
+{
+    protected ?string $cache_prefix = null;
+
+    /**
+     * Returns a prefix cache key based on db configuration.
+     *
+     * @param  string $offset
+     * @return string
+     */
+    protected function getCacheKey(string $offset): string
+    {
+        if ($this->cache_prefix === null) {
+            $this->cache_prefix = md5("{$GLOBALS['DB_STUDIP_HOST']}|{$GLOBALS['DB_STUDIP_DATABASE']}");
+        }
+        return "$this->cache_prefix/$offset";
+    }
+}
diff --git a/lib/classes/cache/MemcachedCache.class.php b/lib/classes/cache/MemcachedCache.class.php
new file mode 100644
index 0000000..5d9033b
--- /dev/null
+++ b/lib/classes/cache/MemcachedCache.class.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Studip\Cache;
+
+use Memcached;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * Cache implementation using memcached.
+ *
+ * @author    Marcus Lunzenauer <mlunzena@uos.de>
+ * @copyright (c) Authors
+ * @license GPL2 or any later version
+ * @since   5.0
+ */
+class MemcachedCache extends Cache
+{
+    use KeyTrait;
+
+    private Memcached $memcache;
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Memcached');
+    }
+
+    public function __construct($servers)
+    {
+        if (!extension_loaded('memcached')) {
+            throw new \Exception('Memcache extension missing.');
+        }
+
+        $prefix = \Config::get()->STUDIP_INSTALLATION_ID;
+        $this->memcache = new Memcached('studip' . ($prefix ? '-' . $prefix : ''));
+
+        if (count($this->memcache->getServerList()) === 0) {
+            foreach ($servers as $server) {
+                $status = $this->memcache->addServer($server['hostname'], (int) $server['port']);
+
+                if (!$status) {
+                    throw new \Exception("Could not add server: {$server['hostname']} @ port {$server['port']}");
+                }
+            }
+        }
+    }
+
+    /**
+     * Expire item from the cache.
+     *
+     * Example:
+     *
+     *   # expires foo
+     *   $cache->expire('foo');
+     *
+     * @param   string $arg a single key.
+     * @returns void
+     */
+    public function expire($arg)
+    {
+        $key = $this->getCacheKey($arg);
+        $this->memcache->delete($key);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $this->memcache->flush();
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @StudipCache::getStats()
+     *
+     * @return array|array[]
+     */
+    public function getStats(): array
+    {
+        return $this->memcache->getStats();
+    }
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @see Cache::getConfig()
+     *
+     * @return array
+     */
+    public static function getConfig(): array
+    {
+        $currentCache = \Config::get()->SYSTEMCACHE;
+
+        // Set default config for this cache
+        $currentConfig = [
+            'servers' => []
+        ];
+
+        // If this cache is set as system cache, use config from global settings.
+        if ($currentCache['type'] == __CLASS__) {
+            $currentConfig = $currentCache['config'];
+        }
+
+        return [
+            'component' => 'MemcachedCacheConfig',
+            'props' => $currentConfig
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        $item = new Item($key);
+        $value = $this->memcache->get($this->getCacheKey($key));
+        if ($this->memcache->getResultCode() !== Memcached::RES_NOTFOUND) {
+            // Set the value, even if it is the boolean value false:
+            $item->setHit();
+            $item->set($value);
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        return $this->memcache->checkKey($this->getCacheKey($key));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item)
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            // The item would expire immediately.
+            return false;
+        }
+
+        $real_key = $this->getCacheKey($item->getKey());
+        return $this->memcache->set($real_key, $item->get(), $expiration);
+    }
+}
diff --git a/lib/classes/cache/MemoryCache.class.php b/lib/classes/cache/MemoryCache.class.php
new file mode 100644
index 0000000..93f6bbd
--- /dev/null
+++ b/lib/classes/cache/MemoryCache.class.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Studip\Cache;
+
+use DateTime;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * The php memory implementation of the StudipCache interface.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since   Stud.IP 5.0
+ */
+class MemoryCache extends Cache
+{
+    protected array $memory_cache = [];
+
+    /**
+     * Expires just a single key.
+     *
+     * @param  string  the key
+     */
+    public function expire($key)
+    {
+        unset($this->memory_cache[$key]);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $this->memory_cache = [];
+    }
+
+    public static function getDisplayName(): string
+    {
+        return 'Memory cache';
+    }
+
+    public function getStats(): array
+    {
+        return [];
+    }
+
+    public static function getConfig(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        $item = new Item($key);
+        if (!isset($this->memory_cache[$key])) {
+            return $item;
+        }
+        if ($this->memory_cache[$key]['expires'] < time()) {
+            $this->expire($key);
+            return $item;
+        }
+        $item->setHit();
+        $item->set($this->memory_cache[$key]['data']);
+        if (!empty($this->memory_cache[$key]['expires'])) {
+            $expiration = new DateTime();
+            $expiration->setTimestamp($this->memory_cache[$key]['expires']);
+            $item->expiresAt($expiration);
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        return isset($this->memory_cache[$key])
+            && $this->memory_cache[$key]['expires'] < time();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item)
+    {
+        $expiration = $this->getExpiration($item);
+
+        $this->memory_cache[$item->getKey()] = [
+            'expires' => $expiration + time(),
+            'data'    => $item->get(),
+        ];
+
+        return true;
+    }
+}
diff --git a/lib/classes/cache/Proxy.class.php b/lib/classes/cache/Proxy.class.php
new file mode 100644
index 0000000..6791fb7
--- /dev/null
+++ b/lib/classes/cache/Proxy.class.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Studip\Cache;
+
+use StudipCacheOperation;
+
+/**
+ * Proxies a StudipCache and stores the expire operation in the database.
+ * These operations are lateron applied to the cache they should have
+ * been applied to in the beginning.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since   Stud.IP 3.3
+ */
+class Proxy extends Cache
+{
+    protected Cache $actual_cache;
+    protected array $proxy_these;
+
+    /**
+     * @param Cache $cache       The actual cache object
+     * @param mixed $proxy_these List of operations to proxy (should be an
+     *                           array but a space seperated string is also
+     *                           valid)
+     */
+    public function __construct(Cache $cache, $proxy_these = ['expire'])
+    {
+        if (!is_array($proxy_these)) {
+            $proxy_these = words($proxy_these);
+        }
+
+        $this->actual_cache = $cache;
+        $this->proxy_these  = is_array($proxy_these)
+                            ? $proxy_these
+                            : words($proxy_these);
+    }
+
+    /**
+     * Expires just a single key.
+     *
+     * @param string $key The item's key
+     */
+    public function expire($key)
+    {
+        if (in_array('expire', $this->proxy_these)) {
+            try {
+                $operation = new StudipCacheOperation([$key, 'expire']);
+                $operation->parameters = serialize([]);
+                $operation->store();
+            } catch (\Exception $e) {
+            }
+        }
+
+        return $this->actual_cache->expire($key);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        if (in_array('flush', $this->proxy_these)) {
+            try {
+                $operation = new StudipCacheOperation(['', 'flush']);
+                $operation->parameters = serialize([]);
+                $operation->store();
+            } catch (\Exception $e) {
+            }
+        }
+
+        return $this->actual_cache->flush();
+    }
+
+    public static function getDisplayName(): string
+    {
+        return static::class;
+    }
+
+    public function getStats(): array
+    {
+        return $this->actual_cache->getStats();
+    }
+
+    public static function getConfig(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        return $this->actual_cache->getItem($key);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        return $this->actual_cache->hasItem($key);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(\Psr\Cache\CacheItemInterface $item)
+    {
+        if (in_array('save', $this->proxy_these)) {
+            try {
+                $operation = new StudipCacheOperation([$item->getKey(), 'save']);
+                $operation->parameters = serialize([$item]);
+                $operation->store();
+            } catch (\Exception $e) {
+            }
+        }
+
+        return $this->actual_cache->save($item);
+    }
+}
diff --git a/lib/classes/cache/RedisCache.class.php b/lib/classes/cache/RedisCache.class.php
new file mode 100644
index 0000000..9ea8711
--- /dev/null
+++ b/lib/classes/cache/RedisCache.class.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace Studip\Cache;
+
+use BadMethodCallException;
+use Config;
+use DateTime;
+use Exception;
+use Psr\Cache\CacheItemInterface;
+use Redis;
+use RedisException;
+
+/**
+ * Cache implementation using redis.
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     GPL2 or any later version
+ * @package     studip
+ * @subpackage  cache
+ * @since       Stud.IP 5.0
+ */
+class RedisCache extends Cache
+{
+    use KeyTrait;
+
+    private $redis;
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Redis');
+    }
+
+    /**
+     * Construct a cache instance.
+     *
+     * @param string $hostname Hostname of redis server
+     * @param int    $port     Port of redis server
+     * @param string $auth     Optional auth token/password
+     *
+     * @throws RedisException
+     */
+    public function __construct($hostname, $port, string $auth = '')
+    {
+        if (!extension_loaded('redis')) {
+            throw new Exception('Redis extension missing.');
+        }
+
+        $this->redis = new Redis();
+        $status = $this->redis->connect($hostname, $port, 1);
+
+        if (!$status) {
+            throw new Exception('Could not add cache.');
+        }
+
+        if ($auth !== '') {
+            $this->redis->auth($auth);
+        }
+    }
+
+    /**
+     * Returns the instance of the redis server connection.
+     *
+     * @return Redis instance
+     */
+    public function getRedis()
+    {
+        return $this->redis;
+    }
+
+    /**
+     * Expire item from the cache.
+     *
+     * Example:
+     *
+     *   # expires foo
+     *   $cache->expire('foo');
+     *
+     * @param   string $arg a single key.
+     */
+    public function expire($arg)
+    {
+        $key = $this->getCacheKey($arg);
+        $this->redis->unlink($key);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $pattern = $this->getCacheKey('*');
+        foreach ($this->redis->keys($pattern) as $key) {
+            $this->redis->unlink($key);
+        }
+    }
+
+    /**
+     * @param string $method Method to call
+     * @param array $args Arguments to pass
+     * @return false|mixed
+     */
+    public function __call($method, $args)
+    {
+        if (is_callable([$this->redis, $method])) {
+            return call_user_func_array([$this->redis, $method], $args);
+        }
+        throw new BadMethodCallException("Method {$method} does not exist");
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @StudipCache::getStats()
+     *
+     * @return array|array[]
+     */
+    public function getStats(): array
+    {
+        $stats = $this->redis->info();
+        $stats['size'] = count($this->redis->keys($this->getCacheKey('*')));
+        return ["{$this->redis->getHost()}:{$this->redis->getPort()}" => $stats];
+    }
+
+    /*
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @see StudipCache::getConfig()
+     *
+     * @return array
+     */
+    public static function getConfig(): array
+    {
+        $currentCache = Config::get()->SYSTEMCACHE;
+
+        // Set default config for this cache
+        $currentConfig = [
+            'hostname' => '',
+            'port' => null
+        ];
+
+        // If this cache is set as system cache, use config from global settings.
+        if ($currentCache['type'] == __CLASS__) {
+            $currentConfig = $currentCache['config'];
+            $currentConfig['port'] = $currentConfig['port'] ? (int) $currentConfig['port'] : null;
+        }
+
+        return [
+            'component' => 'RedisCacheConfig',
+            'props' => $currentConfig
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        $item = new Item($key);
+        $real_key = $this->getCacheKey($key);
+        $result = $this->redis->get($real_key);
+        if ($result === null) {
+            return $item;
+        }
+        $item->setHit();
+        $item->set(unserialize($result));
+        $expiration = new DateTime();
+        $expiration->setTimestamp($this->redis->expiretime($real_key));
+        $item->expiresAt($expiration);
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        $real_key = $this->getCacheKey($key);
+        return $this->redis->get($real_key) !== null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item)
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            // The item would expire immediately.
+            return false;
+        }
+
+        $real_key = $this->getCacheKey($item->getKey());
+        return $this->redis->setEx($real_key, $expiration, serialize($item->get()));
+    }
+}
diff --git a/lib/classes/cache/Wrapper.class.php b/lib/classes/cache/Wrapper.class.php
new file mode 100644
index 0000000..7448932
--- /dev/null
+++ b/lib/classes/cache/Wrapper.class.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Studip\Cache;
+
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * The cache wrapper wraps a memory cache around another cache. This should
+ * reduce the accesses to the actual cache.
+ *
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since Stud.IP 5.4
+ */
+class Wrapper extends Cache
+{
+    protected Cache $actual_cache;
+    protected MemoryCache $memory_cache;
+
+    public function __construct(Cache $actual_cache)
+    {
+        $this->actual_cache = $actual_cache;
+        $this->memory_cache = new MemoryCache();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function expire($arg)
+    {
+        $this->memory_cache->expire($arg);
+        $this->actual_cache->expire($arg);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function flush()
+    {
+        $this->memory_cache->flush();
+        $this->actual_cache->flush();
+    }
+
+    public static function getDisplayName(): string
+    {
+        return static::class;
+    }
+
+    public function getStats(): array
+    {
+        return $this->actual_cache->getStats();
+    }
+
+    public static function getConfig(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem($key)
+    {
+        $cached = $this->memory_cache->getItem($key);
+        if ($cached->isHit()) {
+            return $cached;
+        }
+
+        $cached = $this->actual_cache->getItem($key);
+        if ($cached->isHit()) {
+            $this->memory_cache->save($cached);
+        }
+        return $cached;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem($key)
+    {
+        return $this->actual_cache->hasItem($key);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item)
+    {
+        if ($this->actual_cache->save($item)) {
+            return $this->memory_cache->save($item);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/lib/classes/cas/CAS_PGTStorage_Cache.php b/lib/classes/cas/CAS_PGTStorage_Cache.php
index 284b591..61ce9fa 100644
--- a/lib/classes/cas/CAS_PGTStorage_Cache.php
+++ b/lib/classes/cas/CAS_PGTStorage_Cache.php
@@ -43,7 +43,7 @@ class CAS_PGTStorage_Cache extends CAS_PGTStorage_AbstractStorage
      */
     public function write($pgt, $pgt_iou)
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache_key = 'pgtiou/' . $pgt_iou;
         return $cache->write($cache_key, $pgt);
     }
@@ -58,7 +58,7 @@ class CAS_PGTStorage_Cache extends CAS_PGTStorage_AbstractStorage
      */
     public function read($pgt_iou)
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache_key = 'pgtiou/' . $pgt_iou;
         $pgt = $cache->read($cache_key);
         $cache->expire($cache_key);
diff --git a/lib/cronjobs/purge_cache.class.php b/lib/cronjobs/purge_cache.class.php
index 4e5682f..d2e3697 100644
--- a/lib/cronjobs/purge_cache.class.php
+++ b/lib/cronjobs/purge_cache.class.php
@@ -70,7 +70,7 @@ class PurgeCacheJob extends CronJob
      */
     public function setUp()
     {
-        require_once 'lib/classes/StudipFileCache.class.php';
+        require_once 'lib/classes/cache/FileCache.class.php';
     }
 
     /**
@@ -86,7 +86,7 @@ class PurgeCacheJob extends CronJob
      */
     public function execute($last_result, $parameters = [])
     {
-        $cache = new StudipFileCache();
+        $cache = new \Studip\Cache\FileCache();
         $cache->purge(empty($parameters['verbose']));
     }
 }
diff --git a/lib/functions.php b/lib/functions.php
index 0e806aa..7d9f4f2 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -636,7 +636,7 @@ function get_users_online($active_time = 5, $name_format = 'full_rev')
  */
 function get_users_online_count($active_time = 10)
 {
-    $cache = StudipCacheFactory::getCache();
+    $cache = \Studip\Cache\Factory::getCache();
     $online_count = $cache->read("online_count/{$active_time}");
     if ($online_count === false) {
         $query = "SELECT COUNT(*) FROM user_online
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php
index 59fbb9c..eadeb0a 100644
--- a/lib/models/CourseDate.class.php
+++ b/lib/models/CourseDate.class.php
@@ -364,7 +364,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
         // load room-booking, if any
         $this->room_booking;
 
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('course/undecorated_data/'. $this->range_id);
         return parent::store();
     }
@@ -376,7 +376,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
      */
     public function delete()
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('course/undecorated_data/'. $this->range_id);
         return parent::delete();
     }
@@ -433,7 +433,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
             $folders = array_merge($folders, $topic->folders->getArrayCopy());
         }
         foreach ($folders as $folder) {
-            list($files, $typed_folders) = array_values(FileManager::getFolderFilesRecursive($folder->getTypedFolder(), $user_id));
+            [$files, $typed_folders] = array_values(FileManager::getFolderFilesRecursive($folder->getTypedFolder(), $user_id));
             foreach ($files as $file) {
                 $all_files[$file->id] = $file;
             }
diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php
index 6ec7de8..8411d14 100644
--- a/lib/models/OERMaterial.php
+++ b/lib/models/OERMaterial.php
@@ -164,7 +164,7 @@ class OERMaterial extends SimpleORMap
     public static function fetchRemoteSearch($text, $tag = false)
     {
         $cache_name = "oer_remote_searched_for_".md5($text)."_".($tag ? 1 : 0);
-        $already_searched = (bool) StudipCacheFactory::getCache()->read($cache_name);
+        $already_searched = (bool) \Studip\Cache\Factory::getCache()->read($cache_name);
         if (!$already_searched) {
             $hosts = OERHost::findBySQL("index_server = '1' AND allowed_as_index_server = '1' ORDER BY RAND()");
             foreach ($hosts as $host) {
@@ -172,7 +172,7 @@ class OERMaterial extends SimpleORMap
                     $host->fetchRemoteSearch($text, $tag);
                 }
             }
-            StudipCacheFactory::getCache()->write($cache_name, "1", 60);
+            \Studip\Cache\Factory::getCache()->write($cache_name, "1", 60);
         }
     }
 
diff --git a/lib/models/PersonalNotifications.class.php b/lib/models/PersonalNotifications.class.php
index 721038c..12d9c1b 100644
--- a/lib/models/PersonalNotifications.class.php
+++ b/lib/models/PersonalNotifications.class.php
@@ -262,7 +262,7 @@ class PersonalNotifications extends SimpleORMap
      */
     protected static function getCache($user_id)
     {
-        $cache  = StudipCacheFactory::getCache();
+        $cache  = \Studip\Cache\Factory::getCache();
         $hash   = self::getCacheHash($user_id);
         $cached = $cache->read($hash);
 
@@ -281,7 +281,7 @@ class PersonalNotifications extends SimpleORMap
      */
     protected static function setCache($user_id, $items)
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $hash  = self::getCacheHash($user_id);
         $cache->write($hash, serialize($items), self::CACHE_DURATION);
     }
@@ -293,7 +293,7 @@ class PersonalNotifications extends SimpleORMap
      */
     protected static function expireCache($user_id)
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $hash  = self::getCacheHash($user_id);
         $cache->expire($hash);
     }
diff --git a/lib/models/Semester.class.php b/lib/models/Semester.class.php
index 4eefa3b..03243a5 100644
--- a/lib/models/Semester.class.php
+++ b/lib/models/Semester.class.php
@@ -181,7 +181,7 @@ class Semester extends SimpleORMap
         if (!is_array(self::$semester_cache) || $force_reload) {
             self::$semester_cache = [];
             if (!$force_reload) {
-                $cache = StudipCacheFactory::getCache();
+                $cache = \Studip\Cache\Factory::getCache();
                 $semester_data_array = unserialize($cache->read('DB_SEMESTER_DATA'));
                 if ($semester_data_array) {
                     foreach ($semester_data_array as $semester_data) {
@@ -202,7 +202,7 @@ class Semester extends SimpleORMap
                     }
                     $semester_data[] = $semester->toRawArray();
                 }
-                $cache = StudipCacheFactory::getCache();
+                $cache = \Studip\Cache\Factory::getCache();
                 $cache->write('DB_SEMESTER_DATA', serialize($semester_data));
             }
         }
@@ -471,7 +471,7 @@ class Semester extends SimpleORMap
      */
     public function refreshCache()
     {
-        StudipCacheFactory::getCache()->expire('DB_SEMESTER_DATA');
+        \Studip\Cache\Factory::getCache()->expire('DB_SEMESTER_DATA');
     }
 
     /*
diff --git a/lib/models/StudipCacheOperation.php b/lib/models/StudipCacheOperation.php
index e9c8738..d2287c3 100644
--- a/lib/models/StudipCacheOperation.php
+++ b/lib/models/StudipCacheOperation.php
@@ -42,7 +42,7 @@ class StudipCacheOperation extends SimpleORMap
      */
     public static function apply(StudipCache $cache)
     {
-        self::findEachBySQL(function ($item) use ($cache) {
+        self::findEachBySQL(function (StudipCacheOperation $item) use ($cache): void {
             $parameters = unserialize($item->parameters);
             array_unshift($parameters, $item->cache_key);
             call_user_func_array([$cache, $item->operation], $parameters);
diff --git a/lib/phplib/CT_Cache.class.php b/lib/phplib/CT_Cache.class.php
index 311b27c..d4eccfa 100644
--- a/lib/phplib/CT_Cache.class.php
+++ b/lib/phplib/CT_Cache.class.php
@@ -14,7 +14,7 @@ class CT_Cache
 
     public function ac_start()
     {
-        $this->cache = StudipCacheFactory::getCache();
+        $this->cache = \Studip\Cache\Factory::getCache();
     }
 
     public function ac_get_lock()
diff --git a/lib/plugins/db/RolePersistence.class.php b/lib/plugins/db/RolePersistence.class.php
index b11fa4a..df63a77 100644
--- a/lib/plugins/db/RolePersistence.class.php
+++ b/lib/plugins/db/RolePersistence.class.php
@@ -29,7 +29,7 @@ class RolePersistence
     {
         if (self::$all_roles === null) {
             // read cache
-            $cache = StudipCacheFactory::getCache();
+            $cache = \Studip\Cache\Factory::getCache();
 
             // cache miss, retrieve from database
             self::$all_roles = $cache->read(self::ROLES_CACHE_KEY);
@@ -675,7 +675,7 @@ class RolePersistence
     public static function expireRolesCache()
     {
         self::$all_roles = null;
-        StudipCacheFactory::getCache()->expire(self::ROLES_CACHE_KEY);
+        \Studip\Cache\Factory::getCache()->expire(self::ROLES_CACHE_KEY);
     }
 
     /**
diff --git a/lib/plugins/engine/PluginRepository.class.php b/lib/plugins/engine/PluginRepository.class.php
index 14415f4..235e9bd 100644
--- a/lib/plugins/engine/PluginRepository.class.php
+++ b/lib/plugins/engine/PluginRepository.class.php
@@ -55,7 +55,7 @@ class PluginRepository
      */
     public function readMetadata($url)
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache_key = 'plugin_metadata/'.$url;
         $metadata = $cache->read($cache_key);
 
diff --git a/lib/raumzeit/SingleDate.class.php b/lib/raumzeit/SingleDate.class.php
index 82a89db..1a58695 100644
--- a/lib/raumzeit/SingleDate.class.php
+++ b/lib/raumzeit/SingleDate.class.php
@@ -292,7 +292,7 @@ class SingleDate
 
     function delete()
     {
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('course/undecorated_data/' . $this->range_id);
 
         $this->chdate = time();
@@ -304,7 +304,7 @@ class SingleDate
     function store()
     {
 
-        $cache = StudipCacheFactory::getCache();
+        $cache = \Studip\Cache\Factory::getCache();
         $cache->expire('course/undecorated_data/' . $this->range_id);
 
         $this->chdate = time();
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
index 49f3324..8a9125b 100644
--- a/tests/functional/_bootstrap.php
+++ b/tests/functional/_bootstrap.php
@@ -30,6 +30,8 @@ StudipAutoloader::register();
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/calendar', 'Studip\\Calendar');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes', 'Studip');
+StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes/cache');
+StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes/cache', 'Studip');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions/resources');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/filesystem');
@@ -74,7 +76,7 @@ if (!class_exists('StudipTestHelper')) {
     {
         static function set_up_tables($tables)
         {
-            $cache = StudipCacheFactory::getCache(false);
+            $cache = \Studip\Cache\Factory::getCache(false);
 
             // second step, expire table scheme
             SimpleORMap::expireTableScheme();
diff --git a/tests/jsonapi/_bootstrap.php b/tests/jsonapi/_bootstrap.php
index 82ae54e..baf3740 100644
--- a/tests/jsonapi/_bootstrap.php
+++ b/tests/jsonapi/_bootstrap.php
@@ -53,6 +53,8 @@ StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/eng
 
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/calendar');
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/calendar', 'Studip\\Calendar');
+StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'lib/classes/cache');
+StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'lib/classes/cache', 'Studip');
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/calendar/lib');
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/exceptions');
 
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index 3aa1144..af95607 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -54,6 +54,8 @@ StudipAutoloader::addAutoloadPath('lib/models');
 StudipAutoloader::addAutoloadPath('lib/classes');
 StudipAutoloader::addAutoloadPath('lib/classes', 'Studip');
 StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
+StudipAutoloader::addAutoloadPath('lib/classes/cache');
+StudipAutoloader::addAutoloadPath('lib/classes/cache', 'Studip');
 StudipAutoloader::addAutoloadPath('lib/exceptions');
 StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
 StudipAutoloader::addAutoloadPath('lib/classes/helpbar');
@@ -108,7 +110,7 @@ if (!class_exists('StudipTestHelper')) {
         static function set_up_tables($tables)
         {
             // first step, set fake cache
-            $cache = StudipCacheFactory::getCache(false);
+            $cache = \Studip\Cache\Factory::getCache(false);
 
             // second step, expire table scheme
             SimpleORMap::expireTableScheme();
diff --git a/tests/unit/lib/classes/MigrationTest.php b/tests/unit/lib/classes/MigrationTest.php
index 4a45e71..12df120 100644
--- a/tests/unit/lib/classes/MigrationTest.php
+++ b/tests/unit/lib/classes/MigrationTest.php
@@ -16,11 +16,6 @@ class MigrationTest extends \Codeception\Test\Unit
         $this->before = $GLOBALS['CACHING_ENABLE'] ?? null;
         $GLOBALS['CACHING_ENABLE'] = false;
 
-        require_once 'lib/classes/SimpleORMap.class.php';
-        require_once 'lib/classes/StudipCache.class.php';
-        require_once 'lib/classes/StudipMemoryCache.class.php';
-        require_once 'lib/classes/StudipCacheFactory.class.php';
-
         require_once 'lib/migrations/Migration.php';
         require_once 'lib/migrations/Migrator.php';
         require_once 'lib/migrations/SchemaVersion.php';
diff --git a/tests/unit/lib/classes/StudipCachedArrayTest.php b/tests/unit/lib/classes/StudipCachedArrayTest.php
index c98c1bd..5fd39f2 100644
--- a/tests/unit/lib/classes/StudipCachedArrayTest.php
+++ b/tests/unit/lib/classes/StudipCachedArrayTest.php
@@ -1,4 +1,7 @@
 <?php
+
+use Studip\Cache\MemoryCache;
+
 /**
  * StudipCachedArrayTest.php - unit tests for the StudipCachedArray class
  *
@@ -6,7 +9,7 @@
  * @license  GPL2 or any later version
  *
  * @covers StudipCachedArray
- * @uses StudipMemoryCache
+ * @uses   MemoryCache
  */
 
 class StudipCachedArrayTest extends \Codeception\Test\Unit
-- 
cgit v1.0


From 5e8078fb03c442b9069613e6df3b75d265993bc3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 14 May 2024 07:42:16 +0000
Subject: fixes #4141

Closes #4141

Merge request studip/studip!2983
---
 db/migrations/6.0.4_adjust_cache_types_table.php | 37 ++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 db/migrations/6.0.4_adjust_cache_types_table.php

diff --git a/db/migrations/6.0.4_adjust_cache_types_table.php b/db/migrations/6.0.4_adjust_cache_types_table.php
new file mode 100644
index 0000000..dfe0b27
--- /dev/null
+++ b/db/migrations/6.0.4_adjust_cache_types_table.php
@@ -0,0 +1,37 @@
+<?php
+return new class extends Migration
+{
+    private const MAPPING = [
+        StudipDbCache::class        => Studip\Cache\DbCache::class,
+        StudipFileCache::class      => Studip\Cache\FileCache::class,
+        StudipMemcachedCache::class => Studip\Cache\MemcachedCache::class,
+        StudipRedisCache::class     => Studip\Cache\RedisCache::class,
+    ];
+
+    public function description()
+    {
+        return 'Replaces the renamed cache classes in table "cache_types"';
+    }
+
+    protected function up()
+    {
+        foreach (self::MAPPING as $old => $new) {
+            self::updateCacheTypesTable($old, $new);
+        }
+    }
+
+    protected function down()
+    {
+        foreach (self::MAPPING as $old => $new) {
+            self::updateCacheTypesTable($new, $old);
+        }
+    }
+
+    private function updateCacheTypesTable(string $old, string $new): void
+    {
+        $query = "UPDATE `cache_types`
+                  SET `class_name` = ?
+                  WHERE `class_name` = ?";
+        DBManager::get()->execute($query, [$new, $old]);
+    }
+};
-- 
cgit v1.0


From 19ab03fc80bdf257e74fdfe8b191227d178731e8 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 14 May 2024 09:43:08 +0200
Subject: adjust remaining incorrect class name, re #3701

---
 lib/cronjobs/garbage_collector.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cronjobs/garbage_collector.class.php b/lib/cronjobs/garbage_collector.class.php
index e426cf3..bab44b2 100644
--- a/lib/cronjobs/garbage_collector.class.php
+++ b/lib/cronjobs/garbage_collector.class.php
@@ -162,7 +162,7 @@ class GarbageCollectorJob extends CronJob
         ]);
 
         // clean db cache
-        $cache = new StudipDbCache();
+        $cache = new Studip\Cache\DbCache();
         $cache->purge();
 
         // Remove old plugin assets
-- 
cgit v1.0


From 9d2a9e75b92e75ccb1a901670423fba7d8b3c33c Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 14 May 2024 08:05:15 +0000
Subject: added TIC 3701 to release notes, re #3701

Merge request studip/studip!2984
---
 RELEASE-NOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d447701..e4b3b5b 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -4,7 +4,7 @@
 
 ## Neue Features
 
--
+- Der Stud.IP-Cache ist nun kompatibel zu PSR-6. ([TIC #3701](https://gitlab.studip.de/studip/studip/-/issues/3701))
 
 ## Breaking changes
 
@@ -27,6 +27,8 @@
   - `StudipControllerPropertiesTrait`
   - `StudipResponse`
 - Im Rahmen von [Issue #4118](https://gitlab.studip.de/studip/studip/-/issues/4118) wurde `write_excel` ausgebaut. Als Alternative kann `phpoffice/phpspreadsheet` verwendet werden.
+- Im Rahmen von [TIC #3701](https://gitlab.studip.de/studip/studip/-/issues/3701) wurden die Klassen für den Cache umbenannt. Alle Vorkommnisse sollten ersetzt werden:
+  - `StudipCacheFactory` -> `Studip\Cache\Factory`
 
 ## Security related issues
 
-- 
cgit v1.0


From ba187680db11fc21bd8ed095492c94d06e17ef9b Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 14 May 2024 14:36:51 +0000
Subject: fixes #4144

Closes #4144

Merge request studip/studip!2985
---
 app/controllers/admission/courseset.php | 48 ++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/app/controllers/admission/courseset.php b/app/controllers/admission/courseset.php
index b39cdfb..65d4247 100644
--- a/app/controllers/admission/courseset.php
+++ b/app/controllers/admission/courseset.php
@@ -23,18 +23,17 @@ class Admission_CoursesetController extends AuthenticatedController
     {
         parent::before_filter($action, $args);
 
-        if (!Request::isXhr()) {
-            PageLayout::setTitle(_('Anmeldesets'));
-            // Get only own courses if user doesn't have permission to edit institute-wide coursesets.
-            $this->onlyOwnCourses = true;
-            if ($GLOBALS['perm']->have_perm('admin') || ($GLOBALS['perm']->have_perm('dozent') && Config::get()->ALLOW_DOZENT_COURSESET_ADMIN)) {
-                // We have access to institute-wide course sets, so all courses may be assigned.
-                $this->onlyOwnCourses = false;
-                Navigation::activateItem('/browse/coursesets/sets');
-            } else {
-                throw new AccessDeniedException();
-            }
+        PageLayout::setTitle(_('Anmeldesets'));
+        // Get only own courses if user doesn't have permission to edit institute-wide coursesets.
+        $this->onlyOwnCourses = true;
+        if ($GLOBALS['perm']->have_perm('admin') || ($GLOBALS['perm']->have_perm('dozent') && Config::get()->ALLOW_DOZENT_COURSESET_ADMIN)) {
+            // We have access to institute-wide course sets, so all courses may be assigned.
+            $this->onlyOwnCourses = false;
+            Navigation::activateItem('/browse/coursesets/sets');
+        } else {
+            throw new AccessDeniedException();
         }
+
         PageLayout::addScript('studip-admission.js');
 
         $views = new ActionsWidget();
@@ -44,6 +43,7 @@ class Admission_CoursesetController extends AuthenticatedController
             Icon::create('add')
         )->setActive($action === 'configure');
         Sidebar::Get()->addWidget($views);
+
         if (!isset($this->instant_course_set_view)) {
             $this->instant_course_set_view = false;
         }
@@ -327,15 +327,19 @@ class Admission_CoursesetController extends AuthenticatedController
      *
      * @param String $coursesetId the course set to delete
      */
-    public function delete_action($coursesetId) {
+    public function delete_action($coursesetId)
+    {
         $this->courseset = new CourseSet($coursesetId);
-        if (Request::int('really')) {
-            $this->courseset->delete();
-            $this->redirect($this->url_for('admission/courseset'));
+
+        if (!$this->courseset->isUserAllowedToEdit(User::findCurrent()->id)) {
+            throw new AccessDeniedException(_('Sie dürfen diese Anmelderegel nicht löschen.'));
         }
-        if (Request::int('cancel')) {
-            $this->redirect($this->url_for('admission/courseset'));
+
+        if (Request::bool('really')) {
+            $this->courseset->delete();
         }
+
+        $this->redirect($this->url_for('admission/courseset'));
     }
 
     /**
@@ -757,11 +761,17 @@ class Admission_CoursesetController extends AuthenticatedController
 
         $ids = Request::optionArray('ids');
         if (Request::submitted('delete')) {
+            $deleted = 0;
             foreach ($ids as $id) {
                 $courseset = new CourseSet($id);
-                $courseset->delete();
+                if ($courseset->isUserAllowedToEdit(User::findCurrent()->id)) {
+                    $courseset->delete();
+                    $deleted += 1;
+                }
+            }
+            if ($deleted > 0) {
+                PageLayout::postSuccess(_('Die Anmeldesets wurden gelöscht.'));
             }
-            PageLayout::postSuccess(_('Die Anmeldesets wurden gelöscht.'));
         }
 
         $this->redirect('admission/courseset');
-- 
cgit v1.0


From 4c0242f044a53979a08e7bec5913dc6a48b976f9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 14 May 2024 15:44:50 +0000
Subject: fixes #4145

Closes #4145

Merge request studip/studip!2987
---
 cli/Commands/SORM/DescribeModels.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cli/Commands/SORM/DescribeModels.php b/cli/Commands/SORM/DescribeModels.php
index 46dd8ff..b1084d6 100644
--- a/cli/Commands/SORM/DescribeModels.php
+++ b/cli/Commands/SORM/DescribeModels.php
@@ -156,6 +156,7 @@ final class DescribeModels extends AbstractCommand
 
                     if (
                         $options['foreign_key'] !== 'id'
+                        && !is_callable($options['foreign_key'])
                         && isset($meta['fields'][$options['foreign_key']])
                         && $meta['fields'][$options['foreign_key']]['null'] === 'YES'
                     ) {
-- 
cgit v1.0


From 24778635d3cea1bf2a1e59fccb4cccbdcf0af890 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 06:56:03 +0000
Subject: update codeception/codeception to 5.1.2 and
 codeception/module-asserts to 3.0.0, fix test, fixes #4150

Closes #4150

Merge request studip/studip!2990
---
 composer.json                                      |    4 +-
 composer.lock                                      | 1185 +++++++++++---------
 lib/classes/JsonApi/Middlewares/Authentication.php |   45 +-
 tests/_support/Helper/Jsonapi.php                  |    2 +-
 tests/_support/Helper/StudipDb.php                 |   11 +-
 tests/configuration.php                            |    4 +
 tests/jsonapi/StructuralElementsShowTest.php       |    2 +-
 tests/jsonapi/_bootstrap.php                       |   14 +-
 tests/unit/lib/classes/StudipFileloaderTest.php    |    2 +-
 9 files changed, 703 insertions(+), 566 deletions(-)

diff --git a/composer.json b/composer.json
index 009a7a0..0110f30 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
     "require-dev": {
         "adlawson/vfs": "~0.12.1",
         "woohoolabs/yang": "2.3.2",
-        "codeception/codeception": "^4.2",
-        "codeception/module-asserts": "^1.3",
+        "codeception/codeception": "5.1.2",
+        "codeception/module-asserts": "3.0.0",
         "overtrue/phplint": "3.1.1",
         "phpstan/phpstan": "^1.8",
         "symfony/var-dumper": "^5.4"
diff --git a/composer.lock b/composer.lock
index b93431a..6cd4a26 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "30db4609d0f74dac659c0fcd53db3d0a",
+    "content-hash": "3d6e5f66a5b2a4c48d22fc9311177914",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -3411,16 +3411,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.2",
+            "version": "v0.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d"
+                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d",
-                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
+                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
                 "shasum": ""
             },
             "require": {
@@ -3484,9 +3484,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.2"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.3"
             },
-            "time": "2024-03-17T01:53:00+00:00"
+            "time": "2024-04-02T15:57:53+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -3884,16 +3884,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.36",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e"
+                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
-                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f3e591c48688a0cfa1a3296205926c05e84b22b1",
+                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1",
                 "shasum": ""
             },
             "require": {
@@ -3963,7 +3963,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.36"
+                "source": "https://github.com/symfony/console/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -3979,20 +3979,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T16:33:57+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                 "shasum": ""
             },
             "require": {
@@ -4001,7 +4001,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4030,7 +4030,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -4046,7 +4046,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4509,21 +4509,22 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
-                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^1.1|^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -4531,7 +4532,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4571,7 +4572,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -4587,20 +4588,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-19T21:51:00+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
+                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69",
+                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69",
                 "shasum": ""
             },
             "require": {
@@ -4657,7 +4658,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.4"
+                "source": "https://github.com/symfony/string/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -4673,20 +4674,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-01T13:16:41+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.4.21",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74"
+                "reference": "1987f86ad7f339fe3d3e8e6cf3b7ce4d4b8e547e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6c5ac3a1be8b849d59a1a77877ee110e1b55eb74",
-                "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1987f86ad7f339fe3d3e8e6cf3b7ce4d4b8e547e",
+                "reference": "1987f86ad7f339fe3d3e8e6cf3b7ce4d4b8e547e",
                 "shasum": ""
             },
             "require": {
@@ -4695,12 +4696,12 @@
                 "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
-                "phpunit/phpunit": "<5.4.3",
                 "symfony/console": "<4.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
                 "symfony/console": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0",
                 "symfony/process": "^4.4|^5.0|^6.0",
                 "symfony/uid": "^5.1|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
@@ -4746,7 +4747,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.21"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -4762,20 +4763,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-23T10:00:28+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.35",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4"
+                "reference": "bc780e16879000f77a1022163c052f5323b5e640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
-                "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/bc780e16879000f77a1022163c052f5323b5e640",
+                "reference": "bc780e16879000f77a1022163c052f5323b5e640",
                 "shasum": ""
             },
             "require": {
@@ -4821,7 +4822,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.35"
+                "source": "https://github.com/symfony/yaml/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -4837,7 +4838,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-04-23T11:57:27+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -5516,61 +5517,76 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.2.2",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474"
+                "reference": "3b2d7d1a88e7e1d9dc0acb6d3c8f0acda0a37374"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b88014f3348c93f3df99dc6d0967b0dbfa804474",
-                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/3b2d7d1a88e7e1d9dc0acb6d3c8f0acda0a37374",
+                "reference": "3b2d7d1a88e7e1d9dc0acb6d3c8f0acda0a37374",
                 "shasum": ""
             },
             "require": {
-                "behat/gherkin": "^4.4.0",
-                "codeception/lib-asserts": "^1.0 | 2.0.*@dev",
-                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0",
-                "codeception/stub": "^2.0 | ^3.0 | ^4.0",
+                "behat/gherkin": "^4.6.2",
+                "codeception/lib-asserts": "^2.0",
+                "codeception/stub": "^4.1",
                 "ext-curl": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "guzzlehttp/psr7": "^1.4 | ^2.0",
-                "php": ">=5.6.0 <9.0",
-                "symfony/console": ">=2.7 <6.0",
-                "symfony/css-selector": ">=2.7 <6.0",
-                "symfony/event-dispatcher": ">=2.7 <6.0",
-                "symfony/finder": ">=2.7 <6.0",
-                "symfony/yaml": ">=2.7 <6.0"
+                "php": "^8.0",
+                "phpunit/php-code-coverage": "^9.2 || ^10.0 || ^11.0",
+                "phpunit/php-text-template": "^2.0 || ^3.0 || ^4.0",
+                "phpunit/php-timer": "^5.0.3 || ^6.0 || ^7.0",
+                "phpunit/phpunit": "^9.5.20 || ^10.0 || ^11.0",
+                "psy/psysh": "^0.11.2 || ^0.12",
+                "sebastian/comparator": "^4.0.5 || ^5.0 || ^6.0",
+                "sebastian/diff": "^4.0.3 || ^5.0 || ^6.0",
+                "symfony/console": ">=4.4.24 <8.0",
+                "symfony/css-selector": ">=4.4.24 <8.0",
+                "symfony/event-dispatcher": ">=4.4.24 <8.0",
+                "symfony/finder": ">=4.4.24 <8.0",
+                "symfony/var-dumper": ">=4.4.24 <8.0",
+                "symfony/yaml": ">=4.4.24 <8.0"
+            },
+            "conflict": {
+                "codeception/lib-innerbrowser": "<3.1.3",
+                "codeception/module-filesystem": "<3.0",
+                "codeception/module-phpbrowser": "<2.5"
+            },
+            "replace": {
+                "codeception/phpunit-wrapper": "*"
             },
             "require-dev": {
-                "codeception/module-asserts": "^1.0 | 2.0.*@dev",
-                "codeception/module-cli": "^1.0 | 2.0.*@dev",
-                "codeception/module-db": "^1.0 | 2.0.*@dev",
-                "codeception/module-filesystem": "^1.0 | 2.0.*@dev",
-                "codeception/module-phpbrowser": "^1.0 | 2.0.*@dev",
-                "codeception/specify": "~0.3",
+                "codeception/lib-innerbrowser": "*@dev",
+                "codeception/lib-web": "^1.0",
+                "codeception/module-asserts": "*@dev",
+                "codeception/module-cli": "*@dev",
+                "codeception/module-db": "*@dev",
+                "codeception/module-filesystem": "*@dev",
+                "codeception/module-phpbrowser": "*@dev",
                 "codeception/util-universalframework": "*@dev",
-                "monolog/monolog": "~1.8",
-                "squizlabs/php_codesniffer": "~2.0",
-                "symfony/process": ">=2.7 <6.0",
-                "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0 | ^5.0"
+                "ext-simplexml": "*",
+                "jetbrains/phpstorm-attributes": "^1.0",
+                "symfony/dotenv": ">=4.4.24 <8.0",
+                "symfony/process": ">=4.4.24 <8.0",
+                "vlucas/phpdotenv": "^5.1"
             },
             "suggest": {
                 "codeception/specify": "BDD-style code blocks",
                 "codeception/verify": "BDD-style assertions",
-                "hoa/console": "For interactive console functionality",
+                "ext-simplexml": "For loading params from XML files",
                 "stecman/symfony-console-completion": "For BASH autocompletion",
-                "symfony/phpunit-bridge": "For phpunit-bridge support"
+                "symfony/dotenv": "For loading params from .env files",
+                "symfony/phpunit-bridge": "For phpunit-bridge support",
+                "vlucas/phpdotenv": "For loading params from .env files"
             },
             "bin": [
                 "codecept"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": []
-            },
             "autoload": {
                 "files": [
                     "functions.php"
@@ -5578,7 +5594,10 @@
                 "psr-4": {
                     "Codeception\\": "src/Codeception",
                     "Codeception\\Extension\\": "ext"
-                }
+                },
+                "classmap": [
+                    "src/PHPUnit/TestCase.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5587,8 +5606,8 @@
             "authors": [
                 {
                     "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "https://codegyre.com"
+                    "email": "davert.ua@gmail.com",
+                    "homepage": "https://codeception.com"
                 }
             ],
             "description": "BDD-style testing framework",
@@ -5602,7 +5621,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/4.2.2"
+                "source": "https://github.com/Codeception/Codeception/tree/5.1.2"
             },
             "funding": [
                 {
@@ -5610,26 +5629,26 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-08-13T13:28:25+00:00"
+            "time": "2024-03-07T07:19:42+00:00"
         },
         {
             "name": "codeception/lib-asserts",
-            "version": "1.13.2",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/lib-asserts.git",
-                "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6"
+                "reference": "b8c7dff552249e560879c682ba44a4b963af91bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6",
-                "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6",
+                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/b8c7dff552249e560879c682ba44a4b963af91bc",
+                "reference": "b8c7dff552249e560879c682ba44a4b963af91bc",
                 "shasum": ""
             },
             "require": {
-                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0",
+                "codeception/phpunit-wrapper": "^7.7.1 | ^8.0.3 | ^9.0",
                 "ext-dom": "*",
-                "php": ">=5.6.0 <9.0"
+                "php": "^7.4 | ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5662,31 +5681,31 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/lib-asserts/issues",
-                "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2"
+                "source": "https://github.com/Codeception/lib-asserts/tree/2.1.0"
             },
-            "time": "2020-10-21T16:26:20+00:00"
+            "time": "2023-02-10T18:36:23+00:00"
         },
         {
             "name": "codeception/module-asserts",
-            "version": "1.3.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-asserts.git",
-                "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de"
+                "reference": "1b6b150b30586c3614e7e5761b31834ed7968603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de",
-                "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de",
+                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/1b6b150b30586c3614e7e5761b31834ed7968603",
+                "reference": "1b6b150b30586c3614e7e5761b31834ed7968603",
                 "shasum": ""
             },
             "require": {
                 "codeception/codeception": "*@dev",
-                "codeception/lib-asserts": "^1.13.1",
-                "php": ">=5.6.0 <9.0"
+                "codeception/lib-asserts": "^2.0",
+                "php": "^8.0"
             },
             "conflict": {
-                "codeception/codeception": "<4.0"
+                "codeception/codeception": "<5.0"
             },
             "type": "library",
             "autoload": {
@@ -5719,161 +5738,50 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/module-asserts/issues",
-                "source": "https://github.com/Codeception/module-asserts/tree/1.3.1"
-            },
-            "time": "2020-10-21T16:48:15+00:00"
-        },
-        {
-            "name": "codeception/phpunit-wrapper",
-            "version": "8.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "7d3479bab7e2b6349044db8af11cd05d57809f9c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7d3479bab7e2b6349044db8af11cd05d57809f9c",
-                "reference": "7d3479bab7e2b6349044db8af11cd05d57809f9c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2",
-                "phpunit/php-code-coverage": "^7.0",
-                "phpunit/phpunit": "^8.0",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0"
-            },
-            "require-dev": {
-                "codeception/specify": "*",
-                "vlucas/phpdotenv": "^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\PHPUnit\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Davert",
-                    "email": "davert.php@resend.cc"
-                }
-            ],
-            "description": "PHPUnit classes used by Codeception",
-            "support": {
-                "issues": "https://github.com/Codeception/phpunit-wrapper/issues",
-                "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.6"
+                "source": "https://github.com/Codeception/module-asserts/tree/3.0.0"
             },
-            "time": "2022-05-23T06:22:33+00:00"
+            "time": "2022-02-16T19:48:08+00:00"
         },
         {
             "name": "codeception/stub",
-            "version": "3.7.0",
+            "version": "4.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304"
+                "reference": "4fcad2c165f365377486dc3fd8703b07f1f2fcae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304",
-                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/4fcad2c165f365377486dc3fd8703b07f1f2fcae",
+                "reference": "4fcad2c165f365377486dc3fd8703b07f1f2fcae",
                 "shasum": ""
             },
             "require": {
-                "phpunit/phpunit": "^8.4 | ^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "support": {
-                "issues": "https://github.com/Codeception/Stub/issues",
-                "source": "https://github.com/Codeception/Stub/tree/3.7.0"
-            },
-            "time": "2020-07-03T15:54:43+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+                "php": "^7.4 | ^8.0",
+                "phpunit/phpunit": "^8.4 | ^9.0 | ^10.0 | ^11"
             },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
+            "conflict": {
+                "codeception/codeception": "<5.0.6"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
+                "consolidation/robo": "^3.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                    "Codeception\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
             "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+                "issues": "https://github.com/Codeception/Stub/issues",
+                "source": "https://github.com/Codeception/Stub/tree/4.1.3"
             },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-30T00:15:36+00:00"
+            "time": "2024-02-02T19:21:00+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -6052,20 +5960,21 @@
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -6106,9 +6015,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -6344,40 +6259,44 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.15",
+            "version": "10.1.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48"
+                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": ">=7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.3 || ^4.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1.3"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.0",
+                "phpunit/php-text-template": "^3.0",
+                "sebastian/code-unit-reverse-lookup": "^3.0",
+                "sebastian/complexity": "^3.0",
+                "sebastian/environment": "^6.0",
+                "sebastian/lines-of-code": "^2.0",
+                "sebastian/version": "^4.0",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2.2"
+                "phpunit/phpunit": "^10.1"
             },
             "suggest": {
-                "ext-xdebug": "^2.7.2"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.0-dev"
+                    "dev-main": "10.1-dev"
                 }
             },
             "autoload": {
@@ -6405,7 +6324,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
             },
             "funding": [
                 {
@@ -6413,32 +6333,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-26T12:20:09+00:00"
+            "time": "2024-03-12T15:33:41+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.5",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5"
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -6465,7 +6385,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
             "funding": [
                 {
@@ -6473,26 +6394,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:42:26+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^10.0"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -6509,41 +6442,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
             "keywords": [
-                "template"
+                "process"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:56:09+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.3",
+            "name": "phpunit/php-text-template",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -6562,14 +6501,15 @@
                     "role": "lead"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "timer"
+                "template"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
             "funding": [
                 {
@@ -6577,33 +6517,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:20:02+00:00"
+            "time": "2023-08-31T14:07:24+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "3.1.3",
+            "name": "phpunit/php-timer",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768",
-                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -6618,17 +6557,18 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "tokenizer"
+                "timer"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
             },
             "funding": [
                 {
@@ -6636,53 +6576,52 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2021-07-26T12:15:06+00:00"
+            "time": "2023-02-03T06:57:52+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.33",
+            "version": "10.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e"
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e",
-                "reference": "7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.0",
+                "myclabs/deep-copy": "^1.10.1",
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
-                "php": ">=7.2",
-                "phpunit/php-code-coverage": "^7.0.12",
-                "phpunit/php-file-iterator": "^2.0.4",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1.2",
-                "sebastian/comparator": "^3.0.5",
-                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.3",
-                "sebastian/exporter": "^3.1.5",
-                "sebastian/global-state": "^3.0.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.3",
-                "sebastian/version": "^2.0.1"
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.5",
+                "phpunit/php-file-iterator": "^4.0",
+                "phpunit/php-invoker": "^4.0",
+                "phpunit/php-text-template": "^3.0",
+                "phpunit/php-timer": "^6.0",
+                "sebastian/cli-parser": "^2.0",
+                "sebastian/code-unit": "^2.0",
+                "sebastian/comparator": "^5.0",
+                "sebastian/diff": "^5.0",
+                "sebastian/environment": "^6.0",
+                "sebastian/exporter": "^5.1",
+                "sebastian/global-state": "^6.0.1",
+                "sebastian/object-enumerator": "^5.0",
+                "sebastian/recursion-context": "^5.0",
+                "sebastian/type": "^4.0",
+                "sebastian/version": "^4.0"
             },
             "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0.0"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
             "bin": [
                 "phpunit"
@@ -6690,10 +6629,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.5-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -6718,7 +6660,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.33"
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
             },
             "funding": [
                 {
@@ -6734,7 +6677,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-27T13:04:50+00:00"
+            "time": "2024-04-24T06:32:35+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -6787,29 +6730,142 @@
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
+            "name": "sebastian/cli-parser",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T07:12:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:58:43+00:00"
+        },
+        {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -6831,7 +6887,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
             },
             "funding": [
                 {
@@ -6839,34 +6895,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2023-02-03T06:59:15+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.5",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770"
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
-                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^10.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -6905,7 +6963,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
             },
             "funding": [
                 {
@@ -6913,33 +6972,91 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:31:48+00:00"
+            "time": "2023-08-14T13:18:12+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-21T08:37:17+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.3",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -6971,7 +7088,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -6979,27 +7097,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.4",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -7007,7 +7125,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -7026,7 +7144,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -7034,7 +7152,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -7042,34 +7161,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:53:42+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.5",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
-                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -7104,14 +7223,15 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
             },
             "funding": [
                 {
@@ -7119,38 +7239,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:00:17+00:00"
+            "time": "2024-03-02T07:17:12+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.2",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921"
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/de036ec91d55d2a9e0db2ba975b512cdb1c23921",
-                "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^8.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -7169,13 +7286,14 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.2"
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
             },
             "funding": [
                 {
@@ -7183,34 +7301,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-10T06:55:38+00:00"
+            "time": "2024-03-02T07:19:19+00:00"
         },
         {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "name": "sebastian/lines-of-code",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -7225,14 +7342,16 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -7240,32 +7359,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
         },
         {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "name": "sebastian/object-enumerator",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7283,11 +7404,11 @@
                     "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
             },
             "funding": [
                 {
@@ -7295,32 +7416,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2023-02-03T07:08:32+00:00"
         },
         {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "name": "sebastian/object-reflector",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -7336,21 +7457,13 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
                 }
             ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
             },
             "funding": [
                 {
@@ -7358,29 +7471,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2023-02-03T07:06:18+00:00"
         },
         {
-            "name": "sebastian/resource-operations",
-            "version": "2.0.2",
+            "name": "sebastian/recursion-context",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7396,13 +7512,21 @@
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
                 }
             ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
             },
             "funding": [
                 {
@@ -7410,32 +7534,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:30:19+00:00"
+            "time": "2023-02-03T07:05:40+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "1.1.4",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4"
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7458,7 +7582,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
             },
             "funding": [
                 {
@@ -7466,29 +7590,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:25:11+00:00"
+            "time": "2023-02-03T07:10:45+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7511,27 +7635,32 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-07T11:34:05+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.4.21",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d"
+                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d",
-                "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c5d5c2103c3762aff27a27e1e2409e30a79083b",
+                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -7563,7 +7692,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.4.21"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7579,48 +7708,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:03:56+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.21",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "f0ae1383a8285dfc6752b8d8602790953118ff5a"
+                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f0ae1383a8285dfc6752b8d8602790953118ff5a",
-                "reference": "f0ae1383a8285dfc6752b8d8602790953118ff5a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f",
+                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/event-dispatcher-contracts": "^2|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "2.0"
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/http-foundation": "^4.4|^5.0|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/stopwatch": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7648,7 +7772,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.21"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7664,33 +7788,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:03:56+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7727,7 +7848,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -7743,20 +7864,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.35",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435"
+                "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435",
-                "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/f6a96e4fcd468a25fede16ee665f50ced856bd0a",
+                "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a",
                 "shasum": ""
             },
             "require": {
@@ -7790,7 +7911,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.35"
+                "source": "https://github.com/symfony/finder/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -7806,20 +7927,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -7848,7 +7969,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -7856,7 +7977,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         },
         {
             "name": "woohoolabs/yang",
diff --git a/lib/classes/JsonApi/Middlewares/Authentication.php b/lib/classes/JsonApi/Middlewares/Authentication.php
index de92e15..b84f6f9 100644
--- a/lib/classes/JsonApi/Middlewares/Authentication.php
+++ b/lib/classes/JsonApi/Middlewares/Authentication.php
@@ -15,22 +15,21 @@ class Authentication
     // $user = $request->getAttribute(Authentication::USER_KEY);
     const USER_KEY = 'studip-user';
 
-    // a callable accepting two arguments username and password and
-    // returning either null or a Stud.IP user object
-    /** @var callable */
-    private $authenticator;
-
     /**
      * Der Konstruktor.
      *
-     * @param callable $authenticator ein Callable, das den Nutzernamen und
+     * @param \Closure $authenticator eine Closure, die den Nutzernamen und
      *                                das Passwort als Argumente erhält und
      *                                damit entweder einen Stud.IP-User-Objekt
      *                                oder null zurückgibt
+     * @param array    $excluded_strategies
      */
-    public function __construct($authenticator)
-    {
-        $this->authenticator = $authenticator;
+    public function __construct(
+        // a callable accepting two arguments username and password and
+        // returning either null or a Stud.IP user object
+        private readonly \Closure $authenticator,
+        private readonly array $excluded_strategies = []
+    ) {
     }
 
     /**
@@ -45,12 +44,7 @@ class Authentication
      */
     public function __invoke(Request $request, RequestHandler $handler)
     {
-        $guards = [
-            new Auth\SessionStrategy(),
-            new Auth\HttpBasicAuthStrategy($request, $this->authenticator),
-            new Auth\OAuth2Strategy($request, $this->authenticator),
-            new Auth\OAuth1Strategy($request, $this->authenticator),
-        ];
+        $guards = $this->getGuards($request);
 
         foreach ($guards as $guard) {
             if ($guard->check()) {
@@ -101,4 +95,25 @@ class Authentication
 
         return $request->withAttribute(self::USER_KEY, $user);
     }
+
+    /**
+     * @param Request $request
+     *
+     * @return array
+     */
+    protected function getGuards(Request $request): array
+    {
+        $guards = [
+            'session' => new Auth\SessionStrategy(),
+            'basic'   => new Auth\HttpBasicAuthStrategy($request, $this->authenticator),
+            'oauth2'  => new Auth\OAuth2Strategy($request, $this->authenticator),
+            'oauth1'  => new Auth\OAuth1Strategy($request, $this->authenticator),
+        ];
+
+        foreach ($this->excluded_strategies as $strategy) {
+            unset($guards[$strategy]);
+        }
+
+        return $guards;
+    }
 }
diff --git a/tests/_support/Helper/Jsonapi.php b/tests/_support/Helper/Jsonapi.php
index 8d98e6a..2dec2d1 100644
--- a/tests/_support/Helper/Jsonapi.php
+++ b/tests/_support/Helper/Jsonapi.php
@@ -148,7 +148,7 @@ class Jsonapi extends \Codeception\Module
 
                     return $handler->handle($request);
                 })
-                ->add(new Authentication($authenticator));
+                ->add(new Authentication($authenticator, ['session']));
         }
 
         return $app;
diff --git a/tests/_support/Helper/StudipDb.php b/tests/_support/Helper/StudipDb.php
index 90ad24c..c80338c 100644
--- a/tests/_support/Helper/StudipDb.php
+++ b/tests/_support/Helper/StudipDb.php
@@ -5,7 +5,7 @@ namespace Helper;
 use Codeception\Exception\ModuleConfigException;
 use Codeception\Exception\ModuleException;
 
-require_once('lib/classes/StudipPDO.class.php');
+require_once 'lib/classes/StudipPDO.class.php';
 
 class StudipDb extends \Codeception\Module
 {
@@ -14,18 +14,17 @@ class StudipDb extends \Codeception\Module
      *
      * @var
      */
-    public $dbh;
+    public ?\StudipPdo $dbh;
 
     /**
      * @var array
      */
-    protected $config = [
-    ];
+    protected array $config = [];
 
     /**
      * @var array
      */
-    protected $requiredFields = ['dsn', 'user', 'password'];
+    protected array $requiredFields = ['dsn', 'user', 'password'];
 
     /**
      * @SuppressWarnings(PHPMD.CamelCaseMethodName)
@@ -42,7 +41,7 @@ class StudipDb extends \Codeception\Module
 
     private function checkConfig($configKey, $name)
     {
-        if (strstr($this->config[$configKey], '%'.$name.'%')) {
+        if (str_contains($this->config[$configKey], '%' . $name . '%')) {
             throw new ModuleConfigException(__CLASS__, 'You have to provide a '.$name.' either as ENV variable or in config_local.inc.php!');
         }
     }
diff --git a/tests/configuration.php b/tests/configuration.php
index 523229f..c68a445 100644
--- a/tests/configuration.php
+++ b/tests/configuration.php
@@ -1,6 +1,10 @@
 <?php
 
 return (function (string ...$filenames) {
+    $ABSOLUTE_URI_STUDIP = '';
+    $ASSETS_URL = '';
+    $STUDIP_BASE_PATH = '';
+
     foreach ($filenames as $filename) {
         if (file_exists($filename)) {
             require_once $filename;
diff --git a/tests/jsonapi/StructuralElementsShowTest.php b/tests/jsonapi/StructuralElementsShowTest.php
index 8cc168a..4873aae 100644
--- a/tests/jsonapi/StructuralElementsShowTest.php
+++ b/tests/jsonapi/StructuralElementsShowTest.php
@@ -52,7 +52,7 @@ class StructuralElementsShowTest extends \Codeception\Test\Unit
         $childIDs = $structuralElement->children->pluck('id');
         $this->assertCount(count($childIDs), $includedResources);
         foreach ($includedResources as $included) {
-            $this->assertContains($included->id(), $childIDs);
+            $this->assertContainsEquals($included->id(), $childIDs);
         }
     }
 
diff --git a/tests/jsonapi/_bootstrap.php b/tests/jsonapi/_bootstrap.php
index baf3740..cb6df04 100644
--- a/tests/jsonapi/_bootstrap.php
+++ b/tests/jsonapi/_bootstrap.php
@@ -74,14 +74,12 @@ StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes/vis
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/vendor/oauth-php/library');
 
 // Messy file names
-StudipAutoloader::addClassLookups(
-    array(
-        'StudipPlugin' => $GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/core/StudIPPlugin.class.php',
-        'messaging' => $GLOBALS['STUDIP_BASE_PATH'].'/lib/messaging.inc.php',
-    )
-);
-
-$GLOBALS['_fullname_sql'] = array();
+StudipAutoloader::addClassLookups([
+    'StudipPlugin' => $GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/core/StudIPPlugin.class.php',
+    'messaging' => $GLOBALS['STUDIP_BASE_PATH'].'/lib/messaging.inc.php',
+]);
+
+$GLOBALS['_fullname_sql'] = [];
 $GLOBALS['_fullname_sql']['full'] = "TRIM(CONCAT(title_front,' ',Vorname,' ',Nachname,IF(title_rear!='',CONCAT(', ',title_rear),'')))";
 $GLOBALS['_fullname_sql']['full_rev'] = "TRIM(CONCAT(Nachname,', ',Vorname,IF(title_front!='',CONCAT(', ',title_front),''),IF(title_rear!='',CONCAT(', ',title_rear),'')))";
 $GLOBALS['_fullname_sql']['no_title'] = "CONCAT(Vorname ,' ', Nachname)";
diff --git a/tests/unit/lib/classes/StudipFileloaderTest.php b/tests/unit/lib/classes/StudipFileloaderTest.php
index 1ffe6b5..62c5e04 100644
--- a/tests/unit/lib/classes/StudipFileloaderTest.php
+++ b/tests/unit/lib/classes/StudipFileloaderTest.php
@@ -56,7 +56,7 @@ class StudipFileloaderTestCase extends \Codeception\Test\Unit
 
     public function test_should_balk_upon_file_not_found()
     {
-        $this->expectException(\PHPUnit\Framework\Exception::class);
+        $this->expectException(Exception::class);
         StudipFileloader::load('var://pathto/not-there.php', $container);
     }
 }
-- 
cgit v1.0


From a4ec66e13cac07bd59d5bdbb1d0f437a4d638bc2 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 15 May 2024 07:10:17 +0000
Subject: fix #4142

Closes #4142

Merge request studip/studip!2995
---
 resources/vue/components/courseware/blocks/CoursewareBlockActions.vue    | 1 +
 .../vue/components/courseware/containers/CoursewareContainerActions.vue  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/resources/vue/components/courseware/blocks/CoursewareBlockActions.vue b/resources/vue/components/courseware/blocks/CoursewareBlockActions.vue
index 89beb0a..eea76fe 100644
--- a/resources/vue/components/courseware/blocks/CoursewareBlockActions.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareBlockActions.vue
@@ -3,6 +3,7 @@
         <studip-action-menu
             :items="menuItems"
             :context="block.attributes.title"
+            :collapseAt="1"
             @editBlock="editBlock"
             @setVisibility="setVisibility"
             @showInfo="showInfo"
diff --git a/resources/vue/components/courseware/containers/CoursewareContainerActions.vue b/resources/vue/components/courseware/containers/CoursewareContainerActions.vue
index 79379bf..875ab1f 100644
--- a/resources/vue/components/courseware/containers/CoursewareContainerActions.vue
+++ b/resources/vue/components/courseware/containers/CoursewareContainerActions.vue
@@ -3,6 +3,7 @@
         <studip-action-menu
             :items="menuItems"
             :context="container.attributes.title"
+            :collapseAt="1"
             @editContainer="editContainer"
             @changeContainer="changeContainer"
             @deleteContainer="deleteContainer"
-- 
cgit v1.0


From 2a24eef079c6e419412b70ab1f62d5064f5bafc4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 09:06:39 +0000
Subject: add missing indices, fixes #4157

Closes #4157

Merge request studip/studip!2997
---
 ...missing_indices_for_table_schedule_seminare.php | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 db/migrations/5.1.58_add_missing_indices_for_table_schedule_seminare.php

diff --git a/db/migrations/5.1.58_add_missing_indices_for_table_schedule_seminare.php b/db/migrations/5.1.58_add_missing_indices_for_table_schedule_seminare.php
new file mode 100644
index 0000000..f051f6d
--- /dev/null
+++ b/db/migrations/5.1.58_add_missing_indices_for_table_schedule_seminare.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @see https://gitlab.studip.de/studip/studip/-/issues/4157
+ */
+return new class extends Migration
+{
+    public function description()
+    {
+        return 'Adds missing indices for columns "seminar_id" and "metadate_id" for table "schedule_seminare"';
+    }
+
+    protected function up()
+    {
+        $query = "ALTER TABLE `schedule_seminare`
+                  ADD INDEX `seminar_id` (`seminar_id`),
+                  ADD INDEX `metadate_id` (`metadate_id`)";
+        DBManager::get()->exec($query);
+    }
+
+    protected function down()
+    {
+        $query = "ALTER TABLE `schedule_seminare`
+                  DROP INDEX `seminar_id`,
+                  DROP INDEX `metadate_id`";
+        DBManager::get()->exec($query);
+    }
+};
-- 
cgit v1.0


From a02de27e595e88652cf371e43154f3a9b50d813d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 10:36:11 +0000
Subject: update symfony/polyfill-php82 and symfony/polyfill-php83 to 1.29.0,
 fixes #4159

Closes #4159

Merge request studip/studip!2999
---
 composer.json |  4 ++--
 composer.lock | 32 +++++++++++++-------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 0110f30..390f959 100644
--- a/composer.json
+++ b/composer.json
@@ -56,8 +56,8 @@
         "monolog/monolog": "^2.8",
         "phpowermove/docblock": "^2.0",
         "ksubileau/color-thief-php": "^2.0",
-        "symfony/polyfill-php82": "^1.28",
-        "symfony/polyfill-php83": "^1.28",
+        "symfony/polyfill-php82": "1.29.0",
+        "symfony/polyfill-php83": "1.29.0",
         "phpoffice/phpspreadsheet": "^1.19",
         "psy/psysh": "^0.12.2",
         "okvpn/clock-lts": "^1.0",
diff --git a/composer.lock b/composer.lock
index 6cd4a26..a02e74f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3d6e5f66a5b2a4c48d22fc9311177914",
+    "content-hash": "9de36f10fc3876b0b408ea52624e3e38",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -4288,16 +4288,16 @@
         },
         {
             "name": "symfony/polyfill-php82",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php82.git",
-                "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49"
+                "reference": "559d488c38784112c78b9bf17c5ce8366a265643"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/7716bea9c86776fb3362d6b52fe1fc9471056a49",
-                "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49",
+                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/559d488c38784112c78b9bf17c5ce8366a265643",
+                "reference": "559d488c38784112c78b9bf17c5ce8366a265643",
                 "shasum": ""
             },
             "require": {
@@ -4305,9 +4305,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4347,7 +4344,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php82/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php82/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -4363,20 +4360,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-25T17:27:25+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11"
+                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
-                "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
+                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
                 "shasum": ""
             },
             "require": {
@@ -4385,9 +4382,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4427,7 +4421,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -4443,7 +4437,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-16T06:22:46+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/process",
-- 
cgit v1.0


From a750752430955a2fe020bf9fd1714da4ad1ccfa3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 10:54:04 +0000
Subject: update symfony/var-dump to 6.4.7, fixes #4160

Closes #4160

Merge request studip/studip!3000
---
 composer.json |  2 +-
 composer.lock | 36 ++++++++++++++++--------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 390f959..0d803c2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "codeception/module-asserts": "3.0.0",
         "overtrue/phplint": "3.1.1",
         "phpstan/phpstan": "^1.8",
-        "symfony/var-dumper": "^5.4"
+        "symfony/var-dumper": "6.4.7"
     },
     "require": {
         "php": "^8.1",
diff --git a/composer.lock b/composer.lock
index a02e74f..b552d52 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9de36f10fc3876b0b408ea52624e3e38",
+    "content-hash": "d1e8c9d9fa6756344b84b026805f9d05",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -4672,39 +4672,35 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.4.39",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "1987f86ad7f339fe3d3e8e6cf3b7ce4d4b8e547e"
+                "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1987f86ad7f339fe3d3e8e6cf3b7ce4d4b8e547e",
-                "reference": "1987f86ad7f339fe3d3e8e6cf3b7ce4d4b8e547e",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7",
+                "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<4.4"
+                "symfony/console": "<5.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/uid": "^5.1|^6.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^6.3|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/uid": "^5.4|^6.0|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
-            "suggest": {
-                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-                "ext-intl": "To show region name in time zone dump",
-                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
-            },
             "bin": [
                 "Resources/bin/var-dump-server"
             ],
@@ -4741,7 +4737,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.39"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -4757,7 +4753,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T08:26:06+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/yaml",
-- 
cgit v1.0


From 3639735d50ffe73ae6508cb9b33a394668cb1875 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 10:58:32 +0000
Subject: update caxy/php-htmldiff to 0.1.15, fixes #4167

Closes #4167

Merge request studip/studip!3005
---
 composer.json |  2 +-
 composer.lock | 71 +++++++++--------------------------------------------------
 2 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/composer.json b/composer.json
index 0d803c2..70b30d8 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "phpxmlrpc/phpxmlrpc": "^4.9.0",
         "phpxmlrpc/extras": "^1.0.0-beta2",
         "algo26-matthias/idna-convert": "^3.0",
-        "caxy/php-htmldiff": "^0.1.9",
+        "caxy/php-htmldiff": "0.1.15",
         "phpseclib/phpseclib": "^3",
         "ext-gd": "*",
         "ext-gettext": "*",
diff --git a/composer.lock b/composer.lock
index b552d52..02eed92 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d1e8c9d9fa6756344b84b026805f9d05",
+    "content-hash": "a63ea48b02fb5f560eaa7f4544fc340c",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -131,26 +131,27 @@
         },
         {
             "name": "caxy/php-htmldiff",
-            "version": "v0.1.9",
+            "version": "v0.1.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/caxy/php-htmldiff.git",
-                "reference": "4bad5c6a4ecc76954d37764e6a29273b6b7bf1f8"
+                "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/4bad5c6a4ecc76954d37764e6a29273b6b7bf1f8",
-                "reference": "4bad5c6a4ecc76954d37764e6a29273b6b7bf1f8",
+                "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd",
+                "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
+                "ext-mbstring": "*",
                 "ezyang/htmlpurifier": "^4.7",
-                "kub-at/php-simple-html-dom-parser": "^1.7",
-                "php": ">=5.3.3"
+                "php": ">=7.3"
             },
             "require-dev": {
                 "doctrine/cache": "~1.0",
-                "phpunit/phpunit": "~5.0"
+                "phpunit/phpunit": "~9.0"
             },
             "suggest": {
                 "doctrine/cache": "Used for caching the calculated diffs using a Doctrine Cache Provider"
@@ -185,9 +186,9 @@
             ],
             "support": {
                 "issues": "https://github.com/caxy/php-htmldiff/issues",
-                "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.9"
+                "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15"
             },
-            "time": "2019-02-20T18:52:14+00:00"
+            "time": "2023-11-05T23:49:04+00:00"
         },
         {
             "name": "davefx/phplot",
@@ -849,56 +850,6 @@
             "time": "2022-11-12T10:09:40+00:00"
         },
         {
-            "name": "kub-at/php-simple-html-dom-parser",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Kub-AT/php-simple-html-dom-parser.git",
-                "reference": "ff22f98bfd9235115c128059076f3eb740d66913"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Kub-AT/php-simple-html-dom-parser/zipball/ff22f98bfd9235115c128059076f3eb740d66913",
-                "reference": "ff22f98bfd9235115c128059076f3eb740d66913",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "KubAT\\PhpSimple\\HtmlDomParser": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "S.C. Chen",
-                    "email": "me578022@gmail.com"
-                },
-                {
-                    "name": "Jakub Stawowy",
-                    "email": "Kub-AT@users.noreply.github.com"
-                }
-            ],
-            "description": "PHP Simple HTML DOM Parser with namespace and PHP 7.3 compatible",
-            "homepage": "http://simplehtmldom.sourceforge.net/",
-            "keywords": [
-                "Simple",
-                "dom",
-                "html"
-            ],
-            "support": {
-                "issues": "https://github.com/Kub-AT/php-simple-html-dom-parser/issues",
-                "source": "https://github.com/Kub-AT/php-simple-html-dom-parser/tree/master"
-            },
-            "time": "2019-10-25T12:34:43+00:00"
-        },
-        {
             "name": "lcobucci/jwt",
             "version": "5.2.0",
             "source": {
-- 
cgit v1.0


From 152ef0e0f92afde613b65842aaffbd0da95d5bbd Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 11:02:34 +0000
Subject: update scssphp/scssphp to 1.12.1, fixes #4163

Closes #4163

Merge request studip/studip!3003
---
 composer.json |  2 +-
 composer.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 70b30d8..18ffadb 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "spomky-labs/otphp": "^10",
         "tuupola/cors-middleware": "^1.2.1",
         "tecnickcom/tcpdf": "^6.3",
-        "scssphp/scssphp": "^1.4",
+        "scssphp/scssphp": "1.12.1",
         "symfony/yaml": "^5.0",
         "ezyang/htmlpurifier": "^4.13",
         "davefx/phplot": "^6.2",
diff --git a/composer.lock b/composer.lock
index 02eed92..d47ed8c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a63ea48b02fb5f560eaa7f4544fc340c",
+    "content-hash": "fcafb6aa7ae481f3523dda004973c010",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -3485,16 +3485,16 @@
         },
         {
             "name": "scssphp/scssphp",
-            "version": "v1.11.0",
+            "version": "v1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "33749d12c2569bb24071f94e9af828662dabb068"
+                "reference": "394ed1e960138710a60d035c1a85d43d0bf0faeb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068",
-                "reference": "33749d12c2569bb24071f94e9af828662dabb068",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/394ed1e960138710a60d035c1a85d43d0bf0faeb",
+                "reference": "394ed1e960138710a60d035c1a85d43d0bf0faeb",
                 "shasum": ""
             },
             "require": {
@@ -3511,7 +3511,7 @@
                 "thoughtbot/bourbon": "^7.0",
                 "twbs/bootstrap": "~5.0",
                 "twbs/bootstrap4": "4.6.1",
-                "zurb/foundation": "~6.5"
+                "zurb/foundation": "~6.7.0"
             },
             "suggest": {
                 "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
@@ -3559,9 +3559,9 @@
             ],
             "support": {
                 "issues": "https://github.com/scssphp/scssphp/issues",
-                "source": "https://github.com/scssphp/scssphp/tree/v1.11.0"
+                "source": "https://github.com/scssphp/scssphp/tree/v1.12.1"
             },
-            "time": "2022-09-02T21:24:55+00:00"
+            "time": "2024-01-13T12:36:40+00:00"
         },
         {
             "name": "slim/psr7",
-- 
cgit v1.0


From 0f1d1b14280562f5ff6a64d103979204d8d2a22d Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 15 May 2024 13:57:30 +0000
Subject: remove old evaluation, fixes #3787

Closes #3787

Merge request studip/studip!2661
---
 app/controllers/admin/user.php                     |    4 -
 app/controllers/course/overview.php                |    2 -
 app/controllers/evaluation.php                     |   61 -
 app/controllers/institute/overview.php             |    3 -
 app/controllers/profile.php                        |    3 -
 app/controllers/vote.php                           |   94 -
 app/views/course/overview/index.php                |    5 -
 app/views/evaluation/_actions.php                  |    4 -
 app/views/evaluation/_admin_list_vote.php          |   27 -
 app/views/evaluation/_buttons.php                  |   22 -
 app/views/evaluation/_evaluation.php               |   57 -
 app/views/evaluation/display.php                   |   27 -
 app/views/institute/overview/index.php             |    1 -
 app/views/profile/index.php                        |    2 -
 app/views/siteinfo/help.php                        |    1 -
 composer.json                                      |    1 -
 composer.lock                                      |   41 +-
 db/migrations/6.0.5_remove_old_evaluation.php      |   33 +
 lib/bootstrap-autoload.php                         |    2 -
 lib/classes/MyRealmModel.php                       |   35 +-
 lib/classes/Privacy.php                            |    1 -
 lib/classes/Siteinfo.php                           |    4 -
 lib/classes/UserManagement.class.php               |    2 -
 lib/evaluation/classes/Evaluation.class.php        |  539 ----
 lib/evaluation/classes/EvaluationAnswer.class.php  |  277 --
 .../classes/EvaluationExportManager.class.php      |  267 --
 .../classes/EvaluationExportManagerCSV.class.php   |  341 --
 lib/evaluation/classes/EvaluationGroup.class.php   |  193 --
 lib/evaluation/classes/EvaluationObject.class.php  |  530 ----
 .../classes/EvaluationQuestion.class.php           |  179 --
 lib/evaluation/classes/EvaluationTree.class.php    |  166 -
 .../classes/EvaluationTreeEditView.class.php       | 3245 --------------------
 .../classes/EvaluationTreeShowUser.class.php       |  539 ----
 lib/evaluation/classes/HTML.class.php              |  185 --
 lib/evaluation/classes/HTMLempty.class.php         |  184 --
 lib/evaluation/classes/LazyHTML.class.php          |   71 -
 .../classes/db/EvaluationAnswerDB.class.php        |  284 --
 lib/evaluation/classes/db/EvaluationDB.class.php   |  291 --
 .../classes/db/EvaluationGroupDB.class.php         |  225 --
 .../classes/db/EvaluationObjectDB.class.php        |  365 ---
 .../classes/db/EvaluationQuestionDB.class.php      |  298 --
 lib/evaluation/evaluation.config.php               |  157 -
 lib/evaluation/evaluation.lib.php                  |  246 --
 lib/evaluation/evaluation_admin_edit.inc.php       |  210 --
 lib/evaluation/evaluation_admin_edit.lib.php       |   97 -
 lib/evaluation/evaluation_admin_overview.inc.php   |  391 ---
 lib/evaluation/evaluation_admin_overview.lib.php   | 2215 -------------
 lib/evaluation/evaluation_admin_template.inc.php   |  655 ----
 lib/evaluation/evaluation_admin_template.lib.php   | 1102 -------
 lib/evaluation/evaluation_show.lib.php             |  417 ---
 lib/functions.php                                  |    2 +-
 lib/include/header.php                             |    2 +-
 lib/models/StudipEvaluation.php                    |   90 -
 lib/models/User.class.php                          |   20 +-
 lib/modules/CoreAdmin.class.php                    |    6 -
 lib/modules/CoreStudygroupAdmin.class.php          |    4 -
 lib/modules/EvaluationsWidget.php                  |    8 +-
 lib/navigation/AdminNavigation.php                 |    3 -
 lib/navigation/ContentsNavigation.php              |    7 -
 lib/navigation/StartNavigation.php                 |    3 -
 lib/object.inc.php                                 |    2 -
 public/admin_evaluation.php                        |  120 -
 public/eval_config.php                             |  140 -
 public/eval_summary.php                            |  610 ----
 public/eval_summary_export.php                     |  699 -----
 public/show_evaluation.php                         |  272 --
 resources/assets/stylesheets/scss/evaluation.scss  |   40 -
 resources/assets/stylesheets/studip.scss           |    1 -
 templates/evaluation/config.php                    |  125 -
 69 files changed, 40 insertions(+), 16215 deletions(-)
 delete mode 100644 app/controllers/evaluation.php
 delete mode 100644 app/controllers/vote.php
 delete mode 100644 app/views/evaluation/_actions.php
 delete mode 100644 app/views/evaluation/_admin_list_vote.php
 delete mode 100644 app/views/evaluation/_buttons.php
 delete mode 100644 app/views/evaluation/_evaluation.php
 delete mode 100644 app/views/evaluation/display.php
 create mode 100644 db/migrations/6.0.5_remove_old_evaluation.php
 delete mode 100644 lib/evaluation/classes/Evaluation.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationAnswer.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationExportManager.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationExportManagerCSV.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationGroup.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationObject.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationQuestion.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationTree.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationTreeEditView.class.php
 delete mode 100644 lib/evaluation/classes/EvaluationTreeShowUser.class.php
 delete mode 100644 lib/evaluation/classes/HTML.class.php
 delete mode 100644 lib/evaluation/classes/HTMLempty.class.php
 delete mode 100644 lib/evaluation/classes/LazyHTML.class.php
 delete mode 100644 lib/evaluation/classes/db/EvaluationAnswerDB.class.php
 delete mode 100644 lib/evaluation/classes/db/EvaluationDB.class.php
 delete mode 100644 lib/evaluation/classes/db/EvaluationGroupDB.class.php
 delete mode 100644 lib/evaluation/classes/db/EvaluationObjectDB.class.php
 delete mode 100644 lib/evaluation/classes/db/EvaluationQuestionDB.class.php
 delete mode 100644 lib/evaluation/evaluation.config.php
 delete mode 100644 lib/evaluation/evaluation.lib.php
 delete mode 100644 lib/evaluation/evaluation_admin_edit.inc.php
 delete mode 100644 lib/evaluation/evaluation_admin_edit.lib.php
 delete mode 100644 lib/evaluation/evaluation_admin_overview.inc.php
 delete mode 100644 lib/evaluation/evaluation_admin_overview.lib.php
 delete mode 100644 lib/evaluation/evaluation_admin_template.inc.php
 delete mode 100644 lib/evaluation/evaluation_admin_template.lib.php
 delete mode 100644 lib/evaluation/evaluation_show.lib.php
 delete mode 100644 lib/models/StudipEvaluation.php
 delete mode 100644 public/admin_evaluation.php
 delete mode 100644 public/eval_config.php
 delete mode 100644 public/eval_summary.php
 delete mode 100644 public/eval_summary_export.php
 delete mode 100644 public/show_evaluation.php
 delete mode 100644 resources/assets/stylesheets/scss/evaluation.scss
 delete mode 100644 templates/evaluation/config.php

diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index 70dfdf1..214c290 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1447,10 +1447,6 @@ class Admin_UserController extends AuthenticatedController
             'query' => "SELECT COUNT(*) FROM questionnaires WHERE user_id = ? GROUP BY user_id",
         ];
         $queries[] = [
-            'desc'  => _("Anzahl der Evaluationen"),
-            'query' => "SELECT COUNT(*) FROM eval WHERE author_id = ? GROUP BY author_id",
-        ];
-        $queries[] = [
             'desc'    => _("Anzahl der Dateien in Veranstaltungen und Einrichtungen"),
             'query'   => "SELECT COUNT(file_refs.id)
                   FROM (file_refs INNER JOIN files ON file_refs.file_id = files.id)
diff --git a/app/controllers/course/overview.php b/app/controllers/course/overview.php
index 96e7f5a..402137e 100644
--- a/app/controllers/course/overview.php
+++ b/app/controllers/course/overview.php
@@ -58,8 +58,6 @@ class Course_OverviewController extends AuthenticatedController
 
         // Fetch  votes
         if (Config::get()->VOTE_ENABLE) {
-            $response             = $this->relay('evaluation/display/' . $this->course_id);
-            $this->evaluations    = $response->body;
             $response             = $this->relay('questionnaire/widget/' . $this->course_id);
             $this->questionnaires = $response->body;
         }
diff --git a/app/controllers/evaluation.php b/app/controllers/evaluation.php
deleted file mode 100644
index 4a157a9..0000000
--- a/app/controllers/evaluation.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-# Lifter010: TODO
-/**
- * vote.php - Votecontroller controller
- *
- * 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.
- */
-
-class EvaluationController extends AuthenticatedController
-{
-    public function display_action($range_id)
-    {
-        // Bind some params
-        URLHelper::bindLinkParam('show_expired', $null1);
-
-        // Bind range_id
-        $this->range_id = $range_id;
-
-        $this->nobody = !$GLOBALS['user']->id || $GLOBALS['user']->id == 'nobody';
-
-        // Check if we ned administration icons
-        $this->admin = $range_id == $GLOBALS['user']->id || $GLOBALS['perm']->have_studip_perm('tutor', $range_id);
-
-        // Load evaluations
-        if (!$this->nobody) {
-            $eval_db = new EvaluationDB();
-            $this->evaluations = StudipEvaluation::findMany($eval_db->getEvaluationIDs($range_id, EVAL_STATE_ACTIVE));
-        } else {
-            $this->evaluations = [];
-        }
-        // Check if we got expired
-        if (Request::get('show_expired')) {
-            if ($this->admin) {
-                $this->evaluations = array_merge($this->evaluations, StudipEvaluation::findMany($eval_db->getEvaluationIDs($range_id, EVAL_STATE_STOPPED)));
-            }
-        }
-        if (!empty($this->suppress_empty_output) && count($this->evaluations) === 0) {
-            $this->render_nothing();
-        } else {
-            $this->visit();
-        }
-    }
-
-    public function visit()
-    {
-        if ($GLOBALS['user']->id && $GLOBALS['user']->id != 'nobody' && Request::option('contentbox_open') && in_array(Request::option('contentbox_type'), words('vote eval'))) {
-            object_set_visit(Request::option('contentbox_open'), Request::option('contentbox_type'));
-        }
-    }
-
-    public function visit_action()
-    {
-        $this->visit();
-        $this->render_nothing();
-    }
-
-}
diff --git a/app/controllers/institute/overview.php b/app/controllers/institute/overview.php
index 66d55e1..3713dcc 100644
--- a/app/controllers/institute/overview.php
+++ b/app/controllers/institute/overview.php
@@ -138,9 +138,6 @@ class Institute_OverviewController extends AuthenticatedController
 
         // Fetch  votes
         if (Config::get()->VOTE_ENABLE) {
-            $response = $this->relay('evaluation/display/' . $this->institute_id . '/institute');
-            $this->evaluations = $response->body;
-
             $response = $this->relay('questionnaire/widget/' . $this->institute_id . '/institute');
             $this->questionnaires = $response->body;
         }
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index a4e7c56a..3fa3777 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -159,9 +159,6 @@ class ProfileController extends AuthenticatedController
 
         // include and show votes and tests
         if (Config::get()->VOTE_ENABLE && Visibility::verify('votes', $this->current_user->user_id)) {
-            $response          = $this->relay('evaluation/display/' . $this->current_user->user_id);
-            $this->evaluations = $response->body;
-
             $response             = $this->relay('questionnaire/widget/' . $this->current_user->user_id . "/user");
             $this->questionnaires = $response->body;
         }
diff --git a/app/controllers/vote.php b/app/controllers/vote.php
deleted file mode 100644
index 19f92a2..0000000
--- a/app/controllers/vote.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-# Lifter010: TODO
-/**
- * vote.php - Votecontroller controller
- *
- * 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.
- */
-
-class VoteController extends AuthenticatedController {
-
-    public function display_action($range_id) {
-
-        // Bind some params
-        URLHelper::bindLinkParam('show_expired', $null1);
-        URLHelper::bindLinkParam('preview', $null2);
-        URLHelper::bindLinkParam('revealNames', $null3);
-        URLHelper::bindLinkParam('sort', $null4);
-
-        // Bind range_id
-        $this->range_id = $range_id;
-
-        $this->nobody = !$GLOBALS['user']->id || $GLOBALS['user']->id == 'nobody';
-
-        /*
-         * Insert vote
-         */
-        if ($vote = Request::get('vote')) {
-            $vote = new Vote($vote);
-            if (!$this->nobody && $vote && $vote->isRunning() && (!$vote->userVoted() || $vote->changeable)) {
-                try {
-                    $vote->insertVote(Request::getArray('vote_answers'), $GLOBALS['user']->id);
-                } catch (Exception $exc) {
-                    $GLOBALS['vote_message'][$vote->id] = MessageBox::error($exc->getMessage());
-                }
-            }
-        }
-
-        // Check if we need administration icons
-        $this->admin = $range_id == $GLOBALS['user']->id || $GLOBALS['perm']->have_studip_perm('tutor', $range_id);
-
-
-        // Load evaluations
-        if (!$this->nobody) {
-            $eval_db = new EvaluationDB();
-            $this->evaluations = StudipEvaluation::findMany($eval_db->getEvaluationIDs($range_id, EVAL_STATE_ACTIVE));
-        } else {
-            $this->evaluations = [];
-        }
-        $show_votes[] = 'active';
-        // Check if we got expired
-        if (Request::get('show_expired')) {
-            $show_votes[] = 'stopvis';
-            if ($this->admin) {
-                $this->evaluations = array_merge($this->evaluations, StudipEvaluation::findMany($eval_db->getEvaluationIDs($range_id, EVAL_STATE_STOPPED)));
-                $show_votes[] = 'stopinvis';
-            }
-        }
-
-        $this->votes = Vote::findBySQL('range_id = ? AND state IN (?) ORDER BY mkdate desc', [$range_id,$show_votes]);
-        $this->visit();
-
-        }
-
-    function visit()
-    {
-        if ($GLOBALS['user']->id && $GLOBALS['user']->id != 'nobody' && Request::option('contentbox_open') && in_array(Request::option('contentbox_type'), words('vote eval'))) {
-            object_set_visit(Request::option('contentbox_open'), Request::option('contentbox_type'));
-        }
-    }
-
-    function visit_action()
-    {
-        $this->visit();
-        $this->render_nothing();
-    }
-
-    /**
-     * Determines if a vote should show its result
-     *
-     * @param Vote $vote the vote to check
-     * @return boolean true if result should be shown
-     */
-    public function showResult($vote) {
-        if (Request::submitted('change') && $vote->changeable) {
-            return false;
-        }
-        return $vote->userVoted() || in_array($vote->id, Request::getArray('preview'));
-    }
-
-}
diff --git a/app/views/course/overview/index.php b/app/views/course/overview/index.php
index 39d801d..4e69b4a 100644
--- a/app/views/course/overview/index.php
+++ b/app/views/course/overview/index.php
@@ -64,11 +64,6 @@ if (!empty($dates)) {
     echo $dates;
 }
 
-// Anzeige von Umfragen
-if (!empty($evaluations)) {
-    echo $evaluations;
-}
-
 if (!empty($questionnaires)) {
     echo $questionnaires;
 }
diff --git a/app/views/evaluation/_actions.php b/app/views/evaluation/_actions.php
deleted file mode 100644
index e702ff2..0000000
--- a/app/views/evaluation/_actions.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?= Icon::create('pause', 'clickable')->asImg() ?>
-<?= Icon::create('decline', 'clickable')->asImg() ?>
-<?= Icon::create('admin', 'clickable')->asImg() ?>
-<?= Icon::create('trash', 'clickable')->asImg() ?>
diff --git a/app/views/evaluation/_admin_list_vote.php b/app/views/evaluation/_admin_list_vote.php
deleted file mode 100644
index a98335b..0000000
--- a/app/views/evaluation/_admin_list_vote.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<? foreach ($votes as $vote): ?>
-    <tr>
-        <td>
-            <?= htmlReady($vote->title) ?>
-        </td>
-        <td>
-            <?= ObjectdisplayHelper::link($vote->author) ?>
-        </td>
-        <td>
-            <?= strftime("%d.%m.%Y %T", $vote->startdate) ?>
-        </td>
-        <td>
-            <? if ($vote->stopdate): ?>
-                <?= strftime("%d.%m.%Y %T", $vote->stopdate) ?>
-            <? else: ?>
-                <? if ($vote->timespan): ?>
-                    <?= strftime("%d.%m.%Y %T", $vote->startdate + $vote->timespan) ?>
-                <? else: ?>
-                    <?= _('Unbegrenzt') ?>
-                <? endif; ?>
-            <? endif; ?>
-        </td>
-        <td class="actions">
-            <?= $this->render_partial("vote/_actions.php", ['vote' => $vote]) ?>
-        </td>
-    </tr>
-<? endforeach; ?>
\ No newline at end of file
diff --git a/app/views/evaluation/_buttons.php b/app/views/evaluation/_buttons.php
deleted file mode 100644
index b5a3b33..0000000
--- a/app/views/evaluation/_buttons.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<? if (!$controller->showResult($vote)): ?>
-    <? if ($vote->isRunning() && !$nobody) : ?>
-        <?= Studip\Button::create(_('Abstimmen'), 'vote', ['value' => $vote->id]) ?>
-    <? endif ?>
-    <?= Studip\LinkButton::create(_('Ergebnisse'), ContentBoxHelper::href($vote->id, ['preview[]' => $vote->id])) ?>
-<? else: ?>
-    <?= Studip\LinkButton::create(_('Ergebnisse ausblenden'), ContentBoxHelper::href($vote->id, ['preview' => 0])) ?>
-    <?= Request::get('sort')
-        ? Studip\LinkButton::create(_('Nicht sortieren'), ContentBoxHelper::href($vote->id, ['preview[]' => $vote->id, 'sort' => 0]))
-        : Studip\LinkButton::create(_('Sortieren'), ContentBoxHelper::href($vote->id, ['preview[]' => $vote->id, 'sort' => 1]))
-    ?>
-    <? if ($vote->changeable && $vote->state == 'active' && !$nobody): ?>
-        <?= Studip\LinkButton::create(_('Antwort ändern'), ContentBoxHelper::href($vote->id, ['change' => 1])) ?>
-    <? endif; ?>
-    <? if (!$vote->anonymous && ($admin || $vote->namesvisibility)): ?>
-        <? if (Request::get('revealNames') === $vote->id) : ?>
-            <?= Studip\LinkButton::create(_('Namen ausblenden'), ContentBoxHelper::href($vote->id, ['revealNames' => null])) ?>
-        <? else : ?>
-            <?= Studip\LinkButton::create(_('Namen zeigen'), ContentBoxHelper::href($vote->id, ['revealNames' => $vote->id])); ?>
-        <? endif; ?>
-    <? endif; ?>
-<? endif; ?>
\ No newline at end of file
diff --git a/app/views/evaluation/_evaluation.php b/app/views/evaluation/_evaluation.php
deleted file mode 100644
index 82c6fd1..0000000
--- a/app/views/evaluation/_evaluation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<? $is_new = ($evaluation->chdate >= object_get_visit($evaluation->id, 'eval', false, false)) && ($evaluation->author_id != $GLOBALS['user']->id);
-?>
-<article class="studip toggle <?=($is_new ? 'new' : '')?>" id="<?= $evaluation->id ?>" data-visiturl="<?=URLHelper::getScriptLink('dispatch.php/vote/visit')?>">
-    <header>
-        <h1>
-            <a href="<?= ContentBoxHelper::switchhref($evaluation->id, ['contentbox_type' => 'eval']) ?>">
-                <?= htmlReady($evaluation->title) ?>
-            </a>
-        </h1>
-        <nav>
-            <a href="<?= $evaluation->author ? URLHelper::getLink('dispatch.php/profile', ['username' => $evaluation->author->username]) : '' ?>">
-                <?= $evaluation->author ? htmlReady($evaluation->author->getFullName()) : '' ?>
-            </a> |
-            <?= strftime("%d.%m.%Y", $evaluation->mkdate) ?>
-            <? if ($admin): ?>
-                <a title="<?= _("Evaluation bearbeiten") ?>" href="<?= URLHelper::getLink('admin_evaluation.php', ['openID' => $evaluation->id, 'rangeID' => $range_id]) ?>">
-                    <?= Icon::create('admin', 'clickable')->asImg() ?>
-                </a>
-                <? if (!$evaluation->enddate || $evaluation->enddate > time()): ?>
-                    <a title="<?= _("Evaluation stoppen") ?>" href="<?= URLHelper::getLink('admin_evaluation.php', ['evalID' => $evaluation->id, 'evalAction' => 'stop']) ?>">
-                        <?= Icon::create('pause', 'clickable')->asImg() ?>
-                    </a>
-                <? else: ?>
-                    <a title="<?= _("Evaluation fortsetzen") ?>" href="<?= URLHelper::getLink('admin_evaluation.php', ['evalID' => $evaluation->id, 'evalAction' => 'continue']) ?>">
-                        <?= Icon::create('play', 'clickable')->asImg() ?>
-                    </a>
-                <? endif; ?>
-                <a title="<?= _("Evaluation löschen") ?>" href="<?= URLHelper::getLink('admin_evaluation.php', ['evalID' => $evaluation->id, 'evalAction' => 'delete_request']) ?>">
-                    <?= Icon::create('trash', 'clickable')->asImg() ?>
-                </a>
-                <a title="<?= _("Evaluation exportieren") ?>" href="<?= URLHelper::getLink('admin_evaluation.php', ['evalID' => $evaluation->id, 'evalAction' => 'export_request']) ?>">
-                    <?= Icon::create('export', 'clickable')->asImg() ?>
-                </a>
-                <a title="<?= _("Evaluation auswerten") ?>" href="<?= URLHelper::getLink('eval_summary.php', ['eval_id' => $evaluation->id]) ?>">
-                    <?= Icon::create('vote', 'clickable')->asImg() ?>
-                </a>
-            <? endif; ?>
-        </nav>
-    </header>
-    <section>
-        <?= formatReady($evaluation->text); ?>
-    </section>
-    <section>
-        <?= \Studip\LinkButton::create(_('Anzeigen'), URLHelper::getURL('show_evaluation.php', ['evalID' => $evaluation->id]), ['data-dialog' => '', 'target' => '_blank']) ?>
-    </section>
-    <footer>
-        <p>
-            <?= _('Teilnehmende') ?>: <?= $evaluation->getNumberOfVotes() ?>
-        </p>
-        <p>
-            <?= _('Anonym') ?>: <?= $evaluation->anonymous ? _('Ja') : _('Nein') ?>
-        </p>
-        <p>
-            <?= _('Endzeitpunkt') ?>: <?= $evaluation->enddate ? strftime('%d.%m.%y, %H:%M', $evaluation->enddate) : _('Unbekannt') ?>
-        </p>
-    </footer>
-</article>
diff --git a/app/views/evaluation/display.php b/app/views/evaluation/display.php
deleted file mode 100644
index 35d3178..0000000
--- a/app/views/evaluation/display.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<? if ($admin || $evaluations): ?>
-<article class="studip">
-    <header>
-        <h1>
-            <?= Icon::create('vote', 'info')->asImg(); ?>
-            <?= _('Evaluationen') ?>
-        </h1>
-        <nav>
-        <? if ($admin): ?>
-            <a href="<?= URLHelper::getLink('admin_evaluation.php', ['rangeID' => $range_id]) ?>">
-                <?= Icon::create('edit', 'clickable')->asImg(); ?>
-            </a>
-        <? endif; ?>
-        </nav>
-    </header>
-
-    <? if (!$evaluations): ?>
-        <section>
-            <?= _('Keine Evaluationen vorhanden. Um neue Umfragen zu erstellen, klicken Sie rechts auf das Bearbeiten-Zeichen.') ?>
-        </section>
-    <? else: ?>
-        <? foreach ($evaluations as $evaluation): ?>
-            <?= $this->render_partial('evaluation/_evaluation.php', ['evaluation' => $evaluation]); ?>
-        <? endforeach; ?>
-    <? endif; ?>
-</article>
-<? endif; ?>
diff --git a/app/views/institute/overview/index.php b/app/views/institute/overview/index.php
index cb347b0..3e80f98 100644
--- a/app/views/institute/overview/index.php
+++ b/app/views/institute/overview/index.php
@@ -50,7 +50,6 @@
 </article>
 
 <?= $news ?>
-<?= $evaluations ?>
 <?= $questionnaires ?>
 
 <?
diff --git a/app/views/profile/index.php b/app/views/profile/index.php
index 82a001a..b191151 100644
--- a/app/views/profile/index.php
+++ b/app/views/profile/index.php
@@ -87,8 +87,6 @@
 
 <?= $dates ?>
 
-<?= $evaluations ?? '' ?>
-
 <?= $questionnaires ?? '' ?>
 
 <? if (!empty($ausgabe_inhalt)) : ?>
diff --git a/app/views/siteinfo/help.php b/app/views/siteinfo/help.php
index 54d0d09..e2a6762 100644
--- a/app/views/siteinfo/help.php
+++ b/app/views/siteinfo/help.php
@@ -59,7 +59,6 @@
                 <li>news</li>
                 <li>vote</li>
                 <li>test</li>
-                <li>evaluation</li>
                 <li>wiki_pages</li>
                 <li>lernmodul</li>
                 <li>resource</li>
diff --git a/composer.json b/composer.json
index 18ffadb..6a1190c 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,6 @@
         "scssphp/scssphp": "1.12.1",
         "symfony/yaml": "^5.0",
         "ezyang/htmlpurifier": "^4.13",
-        "davefx/phplot": "^6.2",
         "jasig/phpcas": "1.5",
         "phpxmlrpc/phpxmlrpc": "^4.9.0",
         "phpxmlrpc/extras": "^1.0.0-beta2",
diff --git a/composer.lock b/composer.lock
index d47ed8c..95d389a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fcafb6aa7ae481f3523dda004973c010",
+    "content-hash": "73b508e157437e29fceffadbfa22aa2e",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -191,45 +191,6 @@
             "time": "2023-11-05T23:49:04+00:00"
         },
         {
-            "name": "davefx/phplot",
-            "version": "6.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/davefx/PHPlot.git",
-                "reference": "d2e201ecaabb0428116c89cebe281a8f54096450"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/davefx/PHPlot/zipball/d2e201ecaabb0428116c89cebe281a8f54096450",
-                "reference": "d2e201ecaabb0428116c89cebe281a8f54096450",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "phplot/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL"
-            ],
-            "description": "PHPlot - Create charts in PHP",
-            "homepage": "http://phplot.sourceforge.net",
-            "keywords": [
-                "chart",
-                "phplot"
-            ],
-            "support": {
-                "issues": "https://github.com/davefx/PHPlot/issues",
-                "source": "https://github.com/davefx/PHPlot/tree/master"
-            },
-            "time": "2016-10-19T07:14:15+00:00"
-        },
-        {
             "name": "defuse/php-encryption",
             "version": "v2.4.0",
             "source": {
diff --git a/db/migrations/6.0.5_remove_old_evaluation.php b/db/migrations/6.0.5_remove_old_evaluation.php
new file mode 100644
index 0000000..ff1a26e
--- /dev/null
+++ b/db/migrations/6.0.5_remove_old_evaluation.php
@@ -0,0 +1,33 @@
+<?php
+
+final class RemoveOldEvaluation extends Migration
+{
+    public function description()
+    {
+        return 'removes old evaluation tables';
+    }
+
+    public function up()
+    {
+        DBManager::get()->exec('DROP TABLE `eval`');
+        DBManager::get()->exec('DROP TABLE `eval_group_template`');
+        DBManager::get()->exec('DROP TABLE `eval_range`');
+        DBManager::get()->exec('DROP TABLE `eval_templates`');
+        DBManager::get()->exec('DROP TABLE `eval_templates_eval`');
+        DBManager::get()->exec('DROP TABLE `eval_templates_user`');
+        DBManager::get()->exec('DROP TABLE `eval_user`');
+        DBManager::get()->exec('DROP TABLE `evalanswer`');
+        DBManager::get()->exec('DROP TABLE `evalanswer_user`');
+        DBManager::get()->exec('DROP TABLE `evalgroup`');
+        DBManager::get()->exec('DROP TABLE `evalquestion`');
+
+        $query = "DELETE `config`, `config_values`
+                  FROM `config`
+                  LEFT JOIN `config_values` USING (`field`)
+                  WHERE field IN (
+                    'EVAL_AUSWERTUNG_GRAPH_FORMAT',
+                    'EVAL_ENABLE', 'EVAL_AUSWERTUNG_CONFIG_ENABLE'
+                  )";
+        DBManager::get()->exec($query);
+    }
+}
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index 21219fd..1f3f6d4 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -50,8 +50,6 @@ StudipAutoloader::addAutoloadPath('lib/phplib');
 StudipAutoloader::addAutoloadPath('lib/raumzeit');
 StudipAutoloader::addAutoloadPath('lib/resources');
 StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
-StudipAutoloader::addAutoloadPath('lib/evaluation/classes');
-StudipAutoloader::addAutoloadPath('lib/evaluation/classes/db');
 
 StudipAutoloader::addAutoloadPath('lib/extern');
 StudipAutoloader::addAutoloadPath('lib/calendar/lib');
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 94bb30d..ab9aa20 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -93,35 +93,6 @@ class MyRealmModel
             }
         }
 
-        $sql = "SELECT COUNT(a.eval_id) as count,
-                       COUNT(IF((chdate > IFNULL(b.visitdate, :threshold) AND d.author_id !=:user_id ), a.eval_id, NULL)) AS neue,
-                       MAX(IF ((chdate > IFNULL(b.visitdate, :threshold) AND d.author_id != :user_id), chdate, 0)) AS last_modified
-                FROM eval_range a
-                INNER JOIN eval d
-                  ON (a.eval_id = d.eval_id AND d.startdate < UNIX_TIMESTAMP() AND (d.stopdate > UNIX_TIMESTAMP() OR d.startdate + d.timespan > UNIX_TIMESTAMP() OR (d.stopdate IS NULL AND d.timespan IS NULL)))
-                LEFT JOIN object_user_visits b
-                  ON (b.object_id = a.eval_id AND b.user_id = :user_id AND b.plugin_id = :plugin_id)
-                WHERE a.range_id = :course_id
-                GROUP BY a.range_id";
-
-        $statement = DBManager::get()->prepare($sql);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $object_id);
-        $statement->bindValue(':threshold', object_get_visit_threshold());
-        $statement->bindValue(':plugin_id', -2);
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-        if (!empty($result)) {
-            $count += $result['count'];
-            $neue += $result['neue'];
-            if (isset($my_obj['last_modified'], $result['last_modified']) && $result['last_modified']) {
-                if ($my_obj['last_modified'] < $result['last_modified']) {
-                    $my_obj['last_modified'] = $result['last_modified'];
-                }
-            }
-        }
-
-
         if ($neue || $count > 0) {
             $nav = new Navigation('vote', '#vote');
             if ($neue) {
@@ -506,7 +477,7 @@ class MyRealmModel
         // load plugins, so they have a chance to register themselves as observers
         PluginEngine::getPlugins('StandardPlugin');
 
-        // Update news, votes and evaluations
+        // Update news and votes
         $query = "INSERT INTO object_user_visits
                     (object_id, user_id, plugin_id, visitdate, last_visitdate)
                   (
@@ -514,10 +485,6 @@ class MyRealmModel
                     FROM questionnaire_assignments
                     WHERE range_id = :id
                   ) UNION (
-                    SELECT eval_id, :user_id, '-2', :timestamp, 0
-                    FROM eval_range
-                    WHERE range_id = :id
-                  ) UNION (
                     SELECT `news_id`, :user_id, `pluginid`, :timestamp, 0
                     FROM `news_range`
                     JOIN `plugins` ON (`pluginclassname` = 'CoreOverview')
diff --git a/lib/classes/Privacy.php b/lib/classes/Privacy.php
index 38e6e80..0ba296a 100644
--- a/lib/classes/Privacy.php
+++ b/lib/classes/Privacy.php
@@ -59,7 +59,6 @@ class Privacy
             Courseware\UserProgress::class,
         ],
         'quest' => [
-            Evaluation::class,
             Questionnaire::class,
             QuestionnaireAnswer::class,
             QuestionnaireAnonymousAnswer::class,
diff --git a/lib/classes/Siteinfo.php b/lib/classes/Siteinfo.php
index 247b836..9043ce3 100644
--- a/lib/classes/Siteinfo.php
+++ b/lib/classes/Siteinfo.php
@@ -576,10 +576,6 @@ class SiteinfoMarkupEngine {
                                    "title" => _("Fragebögen"),
                                    "detail" => "",
                                    "constraint" => Config::get()->VOTE_ENABLE];
-        $indicator['evaluation'] = ["count" => ['count_table_rows','eval'],
-                                         "title" => _("Evaluationen"),
-                                         "detail" => "",
-                                         "constraint" => Config::get()->VOTE_ENABLE];
         $indicator['wiki_pages'] = ["query" => "SELECT COUNT(*) AS count FROM wiki_pages",
                                          "title" => _("Wiki-Seiten"),
                                          "detail" => "",
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php
index e3d9aa3..7805594 100644
--- a/lib/classes/UserManagement.class.php
+++ b/lib/classes/UserManagement.class.php
@@ -1209,8 +1209,6 @@ class UserManagement
             "DELETE FROM priorities WHERE user_id = ?",
             "DELETE FROM api_oauth_user_mapping WHERE user_id = ?",
             "DELETE FROM api_user_permissions WHERE user_id = ?",
-            "DELETE FROM eval_user WHERE user_id = ?",
-            "DELETE FROM evalanswer_user WHERE user_id = ?",
             "DELETE FROM help_tour_user WHERE user_id = ?",
             "DELETE FROM personal_notifications_user WHERE user_id = ?",
             "DELETE FROM forum_abo_users WHERE user_id = ?",
diff --git a/lib/evaluation/classes/Evaluation.class.php b/lib/evaluation/classes/Evaluation.class.php
deleted file mode 100644
index 5f269a7..0000000
--- a/lib/evaluation/classes/Evaluation.class.php
+++ /dev/null
@@ -1,539 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_EVALDB;
-require_once EVAL_FILE_OBJECT;
-require_once EVAL_FILE_GROUP;
-# ====================================================== end: including files #
-
-
-# Define all required constants ============================================= #
-/**
- * @const INSTANCEOF_EVAL Is instance of an evaluation object
- * @access public
- */
-define("INSTANCEOF_EVAL", "Evaluation");
-# ===================================================== end: define constants #
-
-
-/**
- * The mainclass for an evaluation for the Stud.IP-project.
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class Evaluation extends EvaluationObject implements PrivacyObject
-{
-# Define all required variables ============================================= #
-    /**
-     * Startdate
-     * @access   private
-     * @var      integer $startdate
-     */
-    var $startdate;
-
-    /**
-     * Stopdate
-     * @access   private
-     * @var      integer $stopdate
-     */
-    var $stopdate;
-
-    /**
-     * Timespan
-     * @access   private
-     * @var      integer $timespan
-     */
-    var $timespan;
-
-    /**
-     * Time of creation. Is set automatically.
-     * @access   private
-     * @var      integer $mkdate
-     */
-    var $mkdate;
-
-    /**
-     * Time of last change. Is set automatically.
-     * @access   private
-     * @var      integer $chdate
-     */
-    var $chdate;
-
-    /**
-     * Defines wheter the evaluation is anonymous
-     * @access   private
-     * @var      boolean $anonymous
-     */
-    var $anonymous;
-
-    /**
-     * Defines whether the evaluation is visible
-     * @access   private
-     * @var      boolean $visible
-     */
-    var $visible;
-
-    /**
-     * Defines whether the evaluation template is shared
-     * @access   private
-     * @var      boolean $shared
-     */
-    var $shared;
-
-    /**
-     * Counts the number of connected ranges
-     * @access   private
-     * @var      integer $numberRanges
-     */
-    var $numberRanges;
-
-    /**
-     * Counts the number of connected ranges
-     * @access   private
-     * @var      integer $rangeNum
-     */
-    var $rangeNum;
-
-    /**
-     * Constructor
-     * @access   public
-     * @param string $objectID The ID of an existing evaluation
-     * @param object $parentObject The parent object if exists
-     * @param integer $loadChildren See const EVAL_LOAD_*_CHILDREN
-     */
-    public function __construct($objectID = "", $parentObject = null, $loadChildren = EVAL_LOAD_NO_CHILDREN)
-    {
-        parent::__construct($objectID, $parentObject, $loadChildren);
-        $this->instanceof = INSTANCEOF_EVAL;
-
-        $this->rangeID = [];
-        $this->startdate = NULL;
-        $this->stopdate = NULL;
-        $this->timespan = NULL;
-        $this->mkdate = time();
-        $this->chdate = time();
-        $this->anonymous = NO;
-        $this->visible = NO;
-        $this->shared = NO;
-        $this->rangeNum = 0;
-        $this->db = new EvaluationDB ();
-        if ($this->db->isError()) {
-            return $this->throwErrorFromClass($this->db);
-        }
-        $this->init($objectID);
-    }
-
-    /**
-     * Sets the startdate
-     * @access  public
-     * @param integer $startdate The startdate.
-     * @throws  error
-     */
-    public function setStartdate($startdate)
-    {
-        if (!empty ($startdate)) {
-            if (!empty ($this->stopdate) && $startdate > $this->stopdate) {
-                return $this->throwError(1, _("Das Startdatum ist nach dem Stoppdatum."));
-            }
-            if ($startdate <= 0) {
-                return $this->throwError(1, _("Das Startdatum ist leider ungültig."));
-            }
-        }
-        $this->startdate = $startdate;
-    }
-
-    /**
-     * Gets the startdate
-     * @access  public
-     * @return  integer  The startdate
-     */
-    public function getStartdate()
-    {
-        return $this->startdate;
-    }
-
-    /**
-     * Sets the stopdate
-     * @access  public
-     * @param integer $stopdate The stopdate.
-     * @throws  error
-     */
-    public function setStopdate($stopdate)
-    {
-        if (!empty ($stopdate)) {
-            if ($stopdate <= 0)
-                return $this->throwError(1, _("Das Stoppdatum ist leider ungültig."));
-            if ($stopdate < $this->startdate)
-                return $this->throwError(1, _("Das Stoppdatum ist vor dem Startdatum."));
-            if (!empty ($this->timespan))
-                $this->timespan = NULL;
-        }
-        $this->stopdate = $stopdate;
-    }
-
-    /**
-     * Gets the stopdate
-     * @access  public
-     * @return  string  The stopdate
-     */
-    public function getStopdate()
-    {
-        return $this->stopdate;
-    }
-
-    /**
-     * Gets the real stop date as a UNIX-timestamp (e.g. startdate + timespan)
-     * @access  public
-     * @return  integer The UNIX-timestamp with the real stopdate
-     */
-    public function getRealStopdate()
-    {
-        $stopdate = $this->getStopdate();
-
-        if ($this->getTimespan() != NULL)
-            $stopdate = $this->getStartdate() + $this->getTimespan();
-
-        return $stopdate;
-    }
-
-    /**
-     * Sets the timespan
-     * @access  public
-     * @param string $timespan The timespan.
-     * @throws  error
-     */
-    public function setTimespan($timespan)
-    {
-        if (!empty ($timespan) && !empty ($this->stopdate))
-            $this->stopdate = NULL;
-        $this->timespan = $timespan;
-    }
-
-    /**
-     * Gets the timespan
-     * @access  public
-     * @return  string  The timespan
-     */
-    public function getTimespan()
-    {
-        return $this->timespan;
-    }
-
-    /**
-     * Gets the creationdate
-     * @access  public
-     * @return  integer  The creationdate
-     */
-    public function getCreationdate()
-    {
-        return $this->mkdate;
-    }
-
-    /**
-     * Gets the changedate
-     * @access  public
-     * @return  integer  The changedate
-     */
-    public function getChangedate()
-    {
-        return $this->chdate;
-    }
-
-    /**
-     * Sets anonymous
-     * @access  public
-     * @param string $anonymous The anonymous.
-     * @throws  error
-     */
-    public function setAnonymous($anonymous)
-    {
-        $this->anonymous = $anonymous == YES ? YES : NO;
-    }
-
-    /**
-     * Gets anonymous
-     * @access  public
-     * @return  string  The anonymous
-     */
-    public function isAnonymous()
-    {
-        return $this->anonymous == YES ? YES : NO;
-    }
-
-    /**
-     * Sets visible
-     * @access  public
-     * @param string $visible The visible.
-     * @throws  error
-     */
-    public function setVisible($visible)
-    {
-        $this->visible = $visible == YES ? YES : NO;
-    }
-
-    /**
-     * Gets visible
-     * @access  public
-     * @return  string  The visible
-     */
-    public function isVisible()
-    {
-        return $this->visible == YES ? YES : NO;
-    }
-
-    /**
-     * Set shared for a public search
-     * @access  public
-     * @param boolean $shared if true it is shared
-     */
-    public function setShared($shared)
-    {
-        if ($shared == YES && $this->isTemplate() == NO)
-            return $this->throwError(1, _("Nur ein Template kann freigegeben werden"));
-        $this->shared = $shared == YES ? YES : NO;
-    }
-
-    /**
-     * Is shared for a public search?
-     * @access  public
-     * @return  boolen  true if it is shared template
-     */
-    public function isShared()
-    {
-        return $this->shared == YES ? YES : NO;
-    }
-
-    /**
-     * Is this evaluation a template?
-     * @access  public
-     * @return  boolen  true if it is a template
-     */
-    public function isTemplate()
-    {
-        return empty ($this->rangeID) ? YES : NO;
-    }
-
-    /**
-     * Has a user used this evaluation?
-     * @access  public
-     * @param string $userID Optional an user id
-     * @return  string  YES if a user used this evaluation
-     */
-    public function hasVoted($userID = "")
-    {
-        return $this->db->hasVoted($this->getObjectID(), $userID);
-    }
-
-    /**
-     * Removes a range from the object (not from the DB!)
-     * @access  public
-     * @param string $rangeID The range id
-     */
-    public function removeRangeID($rangeID)
-    {
-        $temp = [];
-        while ($oldRangeID = $this->getNextRangeID()) {
-            if ($oldRangeID != $rangeID) {
-                $temp[] = $oldRangeID;
-            }
-        }
-        $this->rangeID = $temp;
-        $this->numberRanges = count($temp);
-    }
-
-    /**
-     * Removes all rangeIDs
-     * @access   public
-     */
-    public function removeRangeIDs()
-    {
-        while ($this->getRangeID()) ;
-    }
-
-    /**
-     * Adds a rangeID
-     * @access  public
-     * @param string $rangeID The rangeID
-     * @throws  error
-     */
-    public function addRangeID($rangeID)
-    {
-        $this->rangeID[] = $rangeID;
-        $this->numberRanges++;
-    }
-
-    /**
-     * Gets the first rangeID and removes it
-     * @access  public
-     * @return  string  The first object
-     */
-    public function getRangeID()
-    {
-        if ($this->numberRanges)
-            $this->numberRanges--;
-        return array_pop($this->rangeID);
-    }
-
-    /**
-     * Gets the next rangeID
-     * @access  public
-     * @return  string   The rangeID
-     */
-    public function getNextRangeID()
-    {
-        if ($this->rangeNum >= $this->numberRanges) {
-            $this->rangeNum = 0;
-            return NULL;
-        }
-        return $this->rangeID[$this->rangeNum++];
-    }
-
-    /**
-     * Gets all the rangeIDs from the evaluation
-     * @access  public
-     * @return  array  An array full of rangeIDs
-     */
-    public function getRangeIDs()
-    {
-        return $this->rangeID;
-    }
-
-    /**
-     * Gets the number of ranges
-     * @access  public
-     * @return  integer  Number of ranges
-     */
-    public function getNumberRanges()
-    {
-        return $this->numberRanges;
-    }
-
-    /**
-     * Resets all answers for this evaluation
-     * @access public
-     */
-    public function resetAnswers()
-    {
-        // Für diesen Mist habe ich jetzt ca. 3 Stunden gebraucht :(
-        $answers = $this->getSpecialChildobjects($this, INSTANCEOF_EVALANSWER);
-
-        $number = count($answers);
-        for ($i = 0; $i < $number; $i++) {
-            $answer = &$answers[$i];
-#while ($answer->getUserID ()); // delete users...
-            $answer->db->resetVotes($answer);
-        }
-
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $field_data = DBManager::get()->fetchAll("SELECT * FROM eval WHERE author_id = ?", [$storage->user_id]);
-        if ($field_data) {
-            $storage->addTabularData(_('Evaluation'), 'eval', $field_data);
-        }
-
-        $field_data = DBManager::get()->fetchAll("SELECT * FROM evalanswer_user WHERE user_id = ?", [$storage->user_id]);
-        if ($field_data) {
-            $storage->addTabularData(_('EvaluationAnswerUser'), 'evalanswer_user', $field_data);
-        }
-
-        $field_data = DBManager::get()->fetchAll("SELECT * FROM eval_group_template WHERE user_id = ?", [$storage->user_id]);
-        if ($field_data) {
-            $storage->addTabularData(_('EvaluationGroupTemplate'), 'eval_group_template', $field_data);
-        }
-
-        $field_data = DBManager::get()->fetchAll("SELECT * FROM eval_templates WHERE user_id = ?", [$storage->user_id]);
-        if ($field_data) {
-            $storage->addTabularData(_('EvaluationTemplates'), 'eval_templates', $field_data);
-        }
-
-        $field_data = DBManager::get()->fetchAll("SELECT * FROM eval_templates_user WHERE user_id = ?", [$storage->user_id]);
-        if ($field_data) {
-            $storage->addTabularData(_('EvaluationTemplatesUser'), 'eval_templates_user', $field_data);
-        }
-
-        $field_data = DBManager::get()->fetchAll("SELECT * FROM eval_user WHERE user_id = ?", [$storage->user_id]);
-        if ($field_data) {
-            $storage->addTabularData(_('EvaluationUser'), 'eval_user', $field_data);
-        }
-
-    }
-
-    /**
-     * Sets the creationdate
-     * @access  private
-     * @param integer $creationdate The creationdate.
-     * @throws  error
-     */
-    public function setCreationdate($creationdate)
-    {
-        $this->mkdate = $creationdate;
-    }
-
-    /**
-     * Sets the changedate
-     * @access  private
-     * @param integer $changedate The changedate.
-     * @throws  error
-     */
-    public function setChangedate($changedate)
-    {
-        $this->chdate = $changedate;
-    }
-
-    /**
-     * Checks if object is in a valid state
-     * @access private
-     */
-    public function check()
-    {
-        parent::check();
-        if (empty ($this->title)) {
-            $this->throwError(1, _("Der Titel darf nicht leer sein."));
-        }
-
-        if ($this->isTemplate() && $this->hasVoted()) {
-            $this->throwError(2, _("Ungültiges Objekt: Bei einer Vorlage wurde abgestimmt."));
-        }
-
-        if (!$this->isTemplate() && $this->isShared()) {
-            $this->throwError(3, _("Ungültiges Objekt: Eine aktive Evaluation wurde freigegeben."));
-        }
-
-    }
-}
diff --git a/lib/evaluation/classes/EvaluationAnswer.class.php b/lib/evaluation/classes/EvaluationAnswer.class.php
deleted file mode 100644
index 0116e3b..0000000
--- a/lib/evaluation/classes/EvaluationAnswer.class.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Beschreibung
- *
- * @author      Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_ANSWERDB;
-require_once EVAL_FILE_OBJECT;
-
-/**
- * @const INSTANCEOF_EVALANSWER Is instance of an evaluationanswer object
- * @access public
- */
-define("INSTANCEOF_EVALANSWER", "EvaluationAnswer");
-
-class EvaluationAnswer extends EvaluationObject
-{
-
-    /**
-     * The value for an answer
-     * @access   private
-     * @var      integer $value ;
-     */
-    var $value;
-
-    /**
-     * If >0 the answer is a freetext with $rows rows
-     * @access   private
-     * @var      integer $rows
-     */
-    var $rows;
-
-    /**
-     * The userIDs of users who voted for this answer
-     * @access   private
-     * @var      array $users
-     */
-    var $users;
-
-    /**
-     * The number of users voted for this answer
-     * @access   private
-     * @var      integer $userNum
-     */
-    var $userNum;
-
-    /**
-     * For internal use (getNextUserID)
-     * @access   private
-     * @var      integer $userNumIterator
-     */
-    var $userNumIterator;
-
-    /**
-     * If true this is the residual answer for a question
-     * @access   private
-     * @var      boolean $residual
-     */
-    var $residual;
-
-    /**
-     * Constructor
-     * @access   public
-     * @param string $objectID The ID of an existing answer
-     * @param object $parentObject The parent object if exists
-     * @param integer $loadChildren See const EVAL_LOAD_*_CHILDREN
-     */
-    public function __construct($objectID = "", $parentObject = null, $loadChildren = EVAL_LOAD_NO_CHILDREN)
-    {
-        /* Set default values ------------------------------------------------- */
-        parent::__construct($objectID, $parentObject, $loadChildren);
-        $this->instanceof = INSTANCEOF_EVALANSWER;
-
-        $this->value = 0;
-        $this->rows = 0;
-        $this->users = [];
-        $this->userNum = 0;
-        $this->userNumIterator = 0;
-        $this->residual = NO;
-
-        $this->db = new EvaluationAnswerDB ();
-        if ($this->db->isError()) {
-            return $this->throwErrorFromClass($this->db);
-        }
-        $this->init($objectID);
-
-    }
-
-    /**
-     * Gets the number of votes for this answer
-     * @access  public
-     * @return  string  The counter of the answer
-     */
-    public function getNumberOfVotes()
-    {
-        return $this->userNum;
-    }
-
-    /**
-     * Gets the number of rows from freetext answers
-     * @access   public
-     * @return   integer   The number of rows
-     */
-    public function getRows()
-    {
-        return $this->rows;
-    }
-
-    /**
-     * Gets the number of rows for freetext answers
-     * @access   public
-     * @param integer $rows The number of rows
-     */
-    public function setRows($rows)
-    {
-        $this->rows = $rows;
-    }
-
-    /**
-     * Gets the value of an answer
-     * @access   public
-     * @return   integer   The value
-     */
-    public function getValue()
-    {
-        return $this->value;;
-    }
-
-    /**
-     * Sets the value of an answer
-     * @access   public
-     * @param integer $value The value
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Checks whether the answer is a residual answer
-     * @access   public
-     * @return   boolean   YES if it is a residual answer
-     */
-    public function isResidual()
-    {
-        return $this->residual == YES ? YES : NO;
-    }
-
-    /**
-     * Sets the answers as an residual answer
-     * @access   public
-     * @param boolean $boolean YES to set it as a residual answer
-     */
-    public function setResidual($boolean)
-    {
-        $this->residual = $boolean == YES ? YES : NO;
-    }
-
-    /**
-     * Vote for this answer
-     * @access  public
-     * @param string $userID The user id
-     */
-    public function vote($userID)
-    {
-        $this->addUserID($userID);
-    }
-
-    /**
-     * Non-Anonymous vote for this answer
-     * @access  public
-     * @param string $userID The user id
-     */
-    public function addUserID($userID)
-    {
-        if (empty ($userID)) {
-            return $this->throwError(1, _("Nur pseudonyme Abstimmung erlaubt! Neue ID mit StudipObject::createNewID () erzeugen"));
-        }
-
-        $this->userNum++;
-        array_push($this->users, $userID);
-    }
-
-    /**
-     * Gets the first user and removes it
-     * @access  public
-     * @return  string  The first user id
-     */
-    public function getUserID()
-    {
-        if ($this->userNum > 0)
-            $this->userNum--;
-        return array_pop($this->users);
-    }
-
-    /**
-     * Gets the next user
-     * @access  public
-     * @return  string  The next user id, otherwise NULL
-     */
-    public function getNextUserID()
-    {
-        if ($this->userNumIterator >= $this->userNum) {
-            $this->userNumIterator = 0;
-            return NULL;
-        }
-        return $this->users[$this->userNumIterator++];
-    }
-
-    /**
-     * Gets all the user ids
-     * @access  public
-     * @return  array  An array full of user ids
-     */
-    public function getUserIDs()
-    {
-        return $this->users;
-    }
-
-    /**
-     * @access public
-     * @return integer  YES, if the Answer is a textfield
-     */
-    public function isFreetext()
-    {
-        return ($this->rows == 0) ? NO : YES;
-    }
-
-    /**
-     * Checks if object is in a valid state
-     * @access private
-     */
-    public function check()
-    {
-        parent::check();
-    }
-
-    /**
-     * Debugfunction
-     * @access   private
-     */
-    public function toString()
-    {
-        parent::toString();
-        echo "Anzahl der Stimmen: " . $this->getNumberOfVotes() . "<br>\n";
-    }
-}
diff --git a/lib/evaluation/classes/EvaluationExportManager.class.php b/lib/evaluation/classes/EvaluationExportManager.class.php
deleted file mode 100644
index 0c88e7f..0000000
--- a/lib/evaluation/classes/EvaluationExportManager.class.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-# Lifter002: TEST
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_EVALDB;
-require_once EVAL_FILE_ANSWERDB;
-require_once EVAL_FILE_OBJECT;
-require_once EVAL_FILE_GROUP;
-
-/**
- * @const INSTANCEOF_EVALEXPORTMANAGER Is instance of an export manager
- * @access public
- */
-define("INSTANCEOF_EVALEXPORTMANAGER", "EvaluationExportManager");
-
-/**
- * @const EVALEXPORT_PREFIX The prefix for temporary filenames
- * @access public
- */
-define("EVALEXPORT_PREFIX", "evaluation");
-
-/**
- * @const EVALEXPORT_LIFETIME The lifetime in seconds for temporary files
- * @access public
- */
-define("EVALEXPORT_LIFETIME", 1800);
-
-
-/**
- * The mainclass for the evaluation export manager
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvaluationExportManager extends AuthorObject
-{
-
-    /**
-     * The temporary filename
-     * @access   private
-     * @var      string $filename
-     */
-    public $filename;
-
-    /**
-     * The filehandle for the temporary filename
-     * @access   private
-     * @public      integer $filehandle
-     */
-    public $filehandle;
-
-    /**
-     * The ID for the evaluation to export
-     * @access   private
-     * @var      string $evalID
-     */
-    public $evalID;
-
-    /**
-     * The evaluation to export
-     * @access   private
-     * @var      object   Evaluation   $eval
-     */
-    public $eval;
-
-    /**
-     * Array full of questionobjects
-     * @access   private
-     * @var      array $evalquestions
-     */
-    public $evalquestions;
-
-    /**
-     * The extension for the FILENAME
-     * @access   private
-     * @var      string $extension
-     */
-    public $extension;
-
-    /**
-     * UserIDs of all persons which used the evaluation
-     * @access   private
-     * @var      array $users
-     */
-    public $users;
-
-    /**
-     * Constructor
-     * @access   public
-     * @param string $evalID The ID of the evaluation for export
-     */
-    public function __construct($evalID)
-    {
-        register_shutdown_function([&$this, "_EvaluationExportManager"]);
-
-        parent::__construct();
-        $this->instanceof = INSTANCEOF_EVALEXPORTMANAGER;
-
-        $this->filename = "";
-        $this->filehandle = "";
-        $this->evalID = $evalID;
-        $this->eval = new Evaluation ($evalID, NULL, EVAL_LOAD_FIRST_CHILDREN);
-        $this->evalquestions = [];
-        $this->extension = EVALEXPORT_EXTENSION;
-
-        $this->createNewFile();
-        $this->getQuestionobjects($this->eval);
-        /* -------------------------------------------------------------------- */
-    }
-
-    /**
-     * Destructor. Closes all files and removes old temp files
-     * @access   public
-     */
-    public function _EvaluationExportManager()
-    {
-        $this->closeFile();
-        $this->cleanUp();
-    }
-
-    /**
-     * Returns the temnporary filename
-     * @access   public
-     * @returns  string   The temporary filename
-     */
-    public function getTempFilename()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Exports the evaluation
-     * @access   public
-     */
-    public function export()
-    {
-        if (empty ($this->filehandle)) {
-            return $this->throwError(1, _("ExportManager::Konnte temporäre Datei nicht öffnen."));
-        }
-
-        if (!$this->eval->isAnonymous()) {
-            $this->users = EvaluationDB::getUserVoted($this->eval->getObjectID());
-        } else {
-            $questions = $this->eval->getSpecialChildobjects($this->eval, INSTANCEOF_EVALQUESTION);
-            $questionIDs = [];
-            foreach ($questions as $question) {
-                array_push($questionIDs, $question->getObjectID());
-            }
-            $this->users = EvaluationDB::getUserVoted($this->eval->getObjectID(), null, $questionIDs);
-        }
-
-        if (empty ($this->users)) {
-            return $this->throwError(1, _("ExportManager::Es haben noch keine Benutzer abgestimmt oder angegebene Evaluation existiert nicht."));
-        }
-    }
-
-    /**
-     * Gets the filname for the user
-     * @access   public
-     */
-    public function getFilename()
-    {
-        return (rawurlencode($this->eval->getTitle()) . "." . $this->extension);
-    }
-
-    /**
-     * Gets all questionobjects of the evaluation
-     * @access   private
-     * @param EvaluationObject   &$object An evaluationobject object
-     */
-    public function getQuestionobjects(&$object)
-    {
-        if ($object->x_instanceof() == INSTANCEOF_EVALQUESTION) {
-            array_push($this->evalquestions, $object);
-        } else {
-            while ($child = $object->getNextChild()) {
-                $this->getQuestionobjects($child);
-            }
-        }
-    }
-
-    /**
-     * Closes all opened files
-     * @access   public
-     */
-    public function closeFile()
-    {
-        if (empty($this->filehandle)) {
-            return $this->throwError(1, _("ExportManager::Konnte temporäre Datei nicht schließen."));
-        }
-
-        fclose($this->filehandle);
-    }
-
-    /**
-     * Removes old temporary files
-     * @access   private
-     */
-    public function cleanUp()
-    {
-        if (empty ($this->filehandle)) {
-            return $this->throwError(1, _("ExportManager::Konnte temporäre Datei nicht öffnen."));
-        }
-
-        $dirhandle = dir($GLOBALS['TMP_PATH']);
-        while (($file = $dirhandle->read()) != false) {
-            $file = $GLOBALS['TMP_PATH'] . "/" . $file;
-            $part = pathinfo($file);
-
-            if (filemtime($file) < (time() - EVALEXPORT_LIFETIME) &&
-                $part["extension"] == $this->extension &&
-                mb_substr($part["basename"], 0, mb_strlen(EVALEXPORT_PREFIX)) == EVALEXPORT_PREFIX)
-                unlink($file);
-        }
-        $dirhandle->close();
-    }
-
-    /**
-     * Creates a new temporary file
-     * @access   public
-     */
-    public function createNewFile()
-    {
-        $randomID = StudipObject::createNewID();
-        $this->filename = $randomID . "." . $this->extension;
-        if (!is_dir($GLOBALS['TMP_PATH'])) {
-            return $this->throwError(1, sprintf(_("ExportManager::Das Verzeichnis %s existiert nicht."), $GLOBALS['TMP_PATH']));
-        }
-        if (!is_writable($GLOBALS['TMP_PATH'])) {
-            return $this->throwError(2, sprintf(_("ExportManager::Das Verzeichnis %s ist nicht schreibbar nicht."), $GLOBALS['TMP_PATH']));
-        }
-
-        $this->filehandle = @fopen($GLOBALS['TMP_PATH'] . "/" . $this->filename, "w");
-
-        if (empty ($this->filehandle)) {
-            return $this->throwError(3, _("ExportManager::Konnte temporäre Datei nicht erstellen."));
-        }
-    }
-
-}
-
diff --git a/lib/evaluation/classes/EvaluationExportManagerCSV.class.php b/lib/evaluation/classes/EvaluationExportManagerCSV.class.php
deleted file mode 100644
index 4baa3f8..0000000
--- a/lib/evaluation/classes/EvaluationExportManagerCSV.class.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_EXPORTMANAGER;
-# ====================================================== end: including files #
-
-
-# Define all required constants ============================================= #
-/**
- * @const INSTANCEOF_EVALEXPORTMANAGER Is instance of an export manager
- * @access public
- */
-define ("INSTANCEOF_EVALEXPORTMANAGERCSV", "EvaluationExportManagerCSV");
-
-/**
- * @const EVALEXPORT_SEPERATOR The seperator for values
- * @access public
- */
-define ("EVALEXPORT_SEPERATOR", ";");
-
-/**
- * @const EVALEXPORT_DELIMITER The delimiter for values
- * @access public
- */
-define ("EVALEXPORT_DELIMITER", "\"");
-
-/**
- * @const EVALEXPORT_NODELIMITER Character to substitute the delimiter in a text
- * @access public
- */
-define ("EVALEXPORT_NODELIMITER", "'");
-
-/**
- * @const EVALEXPORT_ENDROW The characters to end a row
- * @access public
- */
-define ("EVALEXPORT_ENDROW", EVALEXPORT_DELIMITER.EVALEXPORT_DELIMITER."\n");
-
-/**
- * @const EVALEXPORT_EXTENSION The extension for the filenames
- * @access public
- */
-define ("EVALEXPORT_EXTENSION", "csv");
-# ===================================================== end: define constants #
-
-
-/**
- * The mainclass for the evaluation export manager
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvaluationExportManagerCSV extends EvaluationExportManager {
-# Define all required variables ============================================= #
-    var $evalquestions_residual = [];
-# ============================================================ end: variables #
-
-
-# Define constructor and destructor ========================================= #
-  /**
-    * Constructor
-    * @access   public
-    * @param    string   $evalID   The ID of the evaluation for export
-    */
-   function __construct($evalID) {
-    /* Set default values ------------------------------------------------- */
-    register_shutdown_function([&$this, "_EvaluationExportManagerCSV"]);
-    ini_set('memory_limit', '256M');
-    parent::__construct($evalID);
-    $this->instanceof = INSTANCEOF_EVALEXPORTMANAGERCSV;
-
-    $this->extension     = EVALEXPORT_EXTENSION;
-    /* -------------------------------------------------------------------- */
-  }
-
-  /**
-    * Destructor. Closes all files and removes old temp files
-    * @access   public
-    */
-  function _EvaluationExportManagerCSV () {
-
-  }
-# =========================================== end: constructor and destructor #
-
-
-# Define public functions =================================================== #
-   /**
-    * Exports the evaluation
-    * @access   public
-    */
-   function export () {
-      parent::export ();
-      if ($this->isError ())
-         return;
-      $this->exportHeader ();
-      $this->exportContent();
-   }
-
-   /**
-    * Exports the headline
-    * @access   public
-    */
-   function exportHeader () {
-      if (empty ($this->filehandle))
-         return $this->throwError (1, _("ExportManager::Konnte temporäre Datei nicht öffnen."));
-      fputs ($this->filehandle, "\xEF\xBB\xBF");
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER . _("Nummer") . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER . _("Datum") . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER . _("Benutzername") . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER . _("Nachname") . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER . _("Vorname") . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER . _("E-Mail") . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-
-      /* for each question -------------------------------------------------- */
-      foreach ($this->evalquestions as $evalquestion) {
-         $type     = $evalquestion->getType ();
-         $residual = "";
-
-         /* Questiontype: likert scale -------------------------------------- */
-         if ($type == EVALQUESTION_TYPE_LIKERT) {
-            EvaluationAnswerDB::addChildren($evalquestion);
-            $header = $evalquestion->getText ().":";
-            while ($answer = &$evalquestion->getNextChild ()) {
-               if ($answer->isResidual ()) {
-                  $residual = $evalquestion->getText ().":".$answer->getText ();
-               } else {
-                  $header .= $answer->getText ();
-                  $header .= "(".$answer->getPosition ().")";
-                  $header .= ",";
-               }
-            }
-            $header = mb_substr ($header, 0, mb_strlen ($header) - 1);
-
-            $this->addCol ($header);
-
-            if (!empty ($residual)) {
-               $this->addCol ($residual);
-               $this->evalquestions_residual[$evalquestion->getObjectID()] = true;
-            }
-         /* ----------------------------------------------------- end: likert */
-
-
-         /* Questiontype: pol scale ----------------------------------------- */
-         } elseif ($type == EVALQUESTION_TYPE_POL) {
-            EvaluationAnswerDB::addChildren($evalquestion);
-            $header = $evalquestion->getText ().":";
-            $answer = $evalquestion->getNextChild ();
-            $header .= $answer->getText ();
-            $header .= "(".$answer->getPosition ().")";
-            $header .= "-";
-            while ($answer = &$evalquestion->getNextChild ()) {
-               if ($answer->isResidual ())
-                  $residual = $evalquestion->getText ().":".$answer->getText ();
-               else
-                  $last = $answer->getText ()."(".$answer->getPosition ().")";
-            }
-            $header .= $last;
-            $this->addCol ($header);
-            if (!empty ($residual)) {
-               $this->addCol ($residual);
-               $this->evalquestions_residual[$evalquestion->getObjectID()] = true;
-            }
-         /* -------------------------------------------------------- end: pol */
-
-
-         /* Questiontype: multiple chioice ---------------------------------- */
-         } elseif ($type == EVALQUESTION_TYPE_MC) {
-            if ($evalquestion->isMultiplechoice ()) {
-               EvaluationAnswerDB::addChildren($evalquestion);
-               while ($answer = &$evalquestion->getNextChild ()) {
-                  $header = $evalquestion->getText ();
-                  $header .= ":".$answer->getText ();
-                  $this->addCol ($header);
-               }
-            } else {
-               $header = $evalquestion->getText ();
-               $this->addCol ($header);
-            }
-         /* --------------------------------------------------------- end: mc */
-
-
-         /* Questiontype: undefined ----------------------------------------- */
-         } else {
-            return $this->throwError (2, _("ExportManager::Ungültiger Typ."));
-         }
-         /* -------------------------------------------------- end: undefined */
-      }
-      /* ---------------------------------------------- end: foreach question */
-
-      fputs ($this->filehandle, EVALEXPORT_ENDROW);
-   }
-
-   /**
-    * Exports the content
-    * @access   public
-    */
-   function exportContent () {
-      $counter = 0;
-      $answers = [];
-      $db = DBManager::get();
-      $stmt = $db->prepare("SELECT user_id,text,value,position,residual,
-                    MAX(evaldate) as evaldate,
-                    GROUP_CONCAT(evalanswer_id) as evalanswer_id
-                    FROM evalanswer
-                    INNER JOIN evalanswer_user
-                    USING ( evalanswer_id )
-                    WHERE parent_id = ? GROUP BY user_id");
-      foreach ($this->evalquestions as $evalquestion) {
-          $stmt->execute([$evalquestion->getObjectID()]);
-          $answers[$evalquestion->getObjectID()] = $stmt->fetchGrouped();
-      }
-
-      /* One row for each user --------------------------------------------- */
-      foreach ($this->users as $userID) {
-
-         /* Userinformation if available ----------------------------------- */
-         $username = "";
-         $name     = "";
-         $surname  = "";
-         $email    = "";
-         $evaldate = "";
-         if (!$this->eval->isAnonymous ()) {
-             $data = DBManager::get()->query("SELECT username, Vorname, Nachname, Email "
-                   . "FROM auth_user_md5 WHERE user_id = "
-                   . DBManager::get()->quote($userID))->fetchAll(PDO::FETCH_NUM);
-             if (is_array($data[0])) {
-                 list($username, $name, $surname, $email) = $data[0];
-             }
-         }
-         if ($timestamp = $answers[$this->evalquestions[0]->getObjectID()][$userID]['evaldate']) {
-             $evaldate = date('Y-m-d H:i:s', $timestamp);
-         }
-         fputs ($this->filehandle, EVALEXPORT_DELIMITER . ++$counter . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-         fputs ($this->filehandle, EVALEXPORT_DELIMITER . $evaldate . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-         fputs ($this->filehandle, EVALEXPORT_DELIMITER . $username . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-         fputs ($this->filehandle, EVALEXPORT_DELIMITER . $surname . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-         fputs ($this->filehandle, EVALEXPORT_DELIMITER . $name . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-         fputs ($this->filehandle, EVALEXPORT_DELIMITER . $email . EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-
-         /* ------------------------------------------------- end: user info */
-
-         /* One colum for each question ------------------------------------ */
-         foreach ($this->evalquestions as $evalquestion) {
-            $type = $evalquestion->getType ();
-
-            /* Questiontype: pol or likert scale --------------------------- */
-            if ($type == EVALQUESTION_TYPE_LIKERT ||
-                $type == EVALQUESTION_TYPE_POL) {
-               $hasResidual = $this->evalquestions_residual[$evalquestion->getObjectID()];
-               $entry       = "";
-               $residual    = 0;
-               if ($answer = $answers[$evalquestion->getObjectID()][$userID]) {
-                   if ($answer['residual']) {
-                       $residual = 1;
-                   } else {
-                       $entry = $answer['position'];
-                   }
-               }
-               $this->addCol ($entry);
-
-               if ($hasResidual) {
-                  $this->addCol ($residual);
-               }
-            }
-            /* ------------------------------------------------- end: likert */
-
-
-            /* Questiontype: multiple chioice ------------------------------ */
-            elseif ($type == EVALQUESTION_TYPE_MC) {
-                if ($evalquestion->isMultiplechoice ()) {
-                    $mc_answers = explode(',', $answers[$evalquestion->getObjectID()][$userID]['evalanswer_id']);
-                    while ($answer = &$evalquestion->getNextChild ()) {
-                        $this->addCol ((int)in_array($answer->getObjectID(), $mc_answers));
-                    }
-                } else {
-                    $entry = "";
-                    if ($answer = $answers[$evalquestion->getObjectID()][$userID]) {
-                        $entry = preg_replace ("(\r\n|\n|\r)", " ", $answer['text']);
-                    }
-                    $this->addCol ($entry);
-                }
-            }
-            /* ------------------------------------------------------ end: mc */
-
-
-            /* Questiontype: undefined -------------------------------------- */
-            else {
-               return $this->throwError (1, _("ExportManager::Ungültiger Fragetyp."));
-            }
-            /* ----------------------------------------------- end: undefined */
-         }
-         /* ------------------------------------------ end: col for question */
-
-         fputs ($this->filehandle, EVALEXPORT_ENDROW);
-      }
-      /* -------------------------------------------- end: row for each user */
-   }
-# ===================================================== end: public functions #
-
-# Define private functions ================================================== #
-   /**
-    * Adds a row for the text
-    * @param    string   $text   The text for the row
-    * @access   private
-    */
-   function addCol ($text) {
-      $col = str_replace (EVALEXPORT_DELIMITER, EVALEXPORT_NODELIMITER, $text);
-      fputs ($this->filehandle, EVALEXPORT_DELIMITER.$col.EVALEXPORT_DELIMITER.EVALEXPORT_SEPERATOR);
-   }
-# ==================================================== end: private functions #
-
-}
-
-?>
diff --git a/lib/evaluation/classes/EvaluationGroup.class.php b/lib/evaluation/classes/EvaluationGroup.class.php
deleted file mode 100644
index fbe84af..0000000
--- a/lib/evaluation/classes/EvaluationGroup.class.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_GROUPDB;
-require_once EVAL_FILE_OBJECT;
-require_once EVAL_FILE_QUESTION;
-# ====================================================== end: including files #
-
-
-# Define constants ========================================================== #
-/**
- * @const INSTANCEOF_EVALGROUP Is instance of an evaluationgroup object
- * @access public
- */
-define ("INSTANCEOF_EVALGROUP", "EvaluationGroup");
-# ===================================================== end: define constants #
-
-
-/**
- * This class provides a group for an evaluation for the Stud.IP-project.
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-
-class EvaluationGroup extends EvaluationObject {
-
-#Define all required variables ============================================= #
-  /**
-   * Possible Type of thechildren
-   * @access   private
-   * @var      string   $childType
-   */
-   var $childType;
-
-  /**
-   *  Is it mandatory to answer sub questions
-   *  @access  private
-   *  @var     boolean  $mandatory
-   */
-   var $mandatory;
-
-  /**
-   * ID of the templateID for the childs
-   * @access private
-   * @var    string   $templateID
-   */
-  var $templateID;
-# ============================================================ end: variables #
-
-
-# Define constructor and destructor ========================================= #
-   /**
-    * Constructor
-    * @access   public
-    * @param    string            $objectID       The ID of an existing group
-    * @param    EvaluationObject  $parentObject   The parent object if exists
-    * @param    string            $loadChildren   See const EVAL_LOAD_*_CHILDREN
-    */
-   function __construct($objectID = "", $parentObject = null,
-                              $loadChildren = EVAL_LOAD_NO_CHILDREN) {
-    /* Set default values ------------------------------------------------- */
-    parent::__construct($objectID, $parentObject, $loadChildren);
-    $this->instanceof = INSTANCEOF_EVALGROUP;
-
-    $this->childType = NULL;
-    $this->mandatory = NO;
-    /* --------------------------------------------------------------------- */
-
-    /* Connect to database ------------------------------------------------- */
-    $this->db = new EvaluationGroupDB ();
-     if ($this->db->isError ())
-       return $this->throwErrorFromClass ($this->db);
-     $this->init ($objectID);
-    /* --------------------------------------------------------------------- */
-  }
-# =========================================== end: constructor and destructor #
-
-# Define public functions =================================================== #
-   /**
-    * Returns wheter the childs are groups or questions
-    * @access public
-    */
-    function getChildType () {
-        return $this->childType;
-    }
-
-   /**
-    * Adds a child
-    * @access  public
-    * @param   object  EvaluationObject &$child  The child object
-    */
-   function addChild (&$child) {
-        parent::addChild ($child);
-        $this->childType = $child->x_instanceof ();
-   }
-
-   /**
-    * Defines which type of childs the group have
-    * @access public
-    * @param   string   $childType   The child type
-    */
-  function setChildType ($childType) {
-    $this->childType = $childType;
-  }
-
-  /**
-   * Is it mandatory to answer sub questions
-   * @access public
-   * @param  boolean  $boolean  true if it is mandatory
-   */
-  function setMandatory ($boolean) {
-     $this->mandatory = $boolean == YES ? YES : NO;
-  }
-
-  /**
-   * Is it mandatory to answer sub questions?
-   * @access  public
-   * @return  boolean  YES if it is true, else NO
-   */
-  function isMandatory () {
-     return $this->mandatory == YES ? YES : NO;
-  }
-
-  /**
-   * Gets the template id
-   * @access   public
-   * @return   string   The template id
-   */
-   function getTemplateID () {
-      return $this->templateID;
-   }
-
-  /**
-   * Sets the template id
-   * @access   public
-   * @param    string   $templateID   The template id
-   */
-   function setTemplateID ($templateID) {
-      $newQuestionTexts =  [];
-
-#      if ($templateID == $this->templateID)
-#         return; // for performance reasons
-
-      $this->templateID = $templateID;
-
-      while ($child = &$this->getChild ()) {
-         array_push ($newQuestionTexts, $child->getText ());
-         $child->delete ();
-      }
-
-      while ($text = array_pop ($newQuestionTexts)) {
-         $template = new EvaluationQuestion ($templateID, NULL,
-          EVAL_LOAD_ALL_CHILDREN);
-         $child = &$template->duplicate ();
-         $child->setText ($text);
-         $this->addChild ($child);
-      }
-   }
-# ======================================================= end: public nctions #
-
-
-# Define private functions ================================================== #
-# ==================================================== end: private functions #
-}
-
-?>
diff --git a/lib/evaluation/classes/EvaluationObject.class.php b/lib/evaluation/classes/EvaluationObject.class.php
deleted file mode 100644
index e42dfb0..0000000
--- a/lib/evaluation/classes/EvaluationObject.class.php
+++ /dev/null
@@ -1,530 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-# ====================================================== end: including files #
-
-
-# Define constants ========================================================== #
-/**
- * @const INSTANCEOF_EVALOBJECT Is instance of an abstrakt evaluation object
- * @access public
- */
-define ("INSTANCEOF_EVALOBJECT", "EvaluationObject");
-
-/**
- * @const EVAL_LOAD_NO_CHILDREN Load no children from DB
- * @access public
- */
-define ("EVAL_LOAD_NO_CHILDREN", 0);
-
-/**
- * @const EVAL_LOAD_FIRST_CHILDREN Load just the direct children from DB
- * @access public
- */
-define ("EVAL_LOAD_FIRST_CHILDREN", 1);
-
-/**
- * @const EVAL_LOAD_ALL_CHILDREN Load all children from DB
- * @access public
- */
-define ("EVAL_LOAD_ALL_CHILDREN", 2);
-
-/**
- * @const EVAL_LOAD_ONLY_EVALGROUP Load just the groups for performance reasons
- * @access public
- */
-define ("EVAL_LOAD_ONLY_EVALGROUP", 3);
-# ===================================================== end: define constants #
-
-
-/**
- * This abstract class provides functions for evaluation objects
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvaluationObject extends StudipObject {
-# Define all required variables ============================================= #
-  /**
-   * The parent object
-   * @access   private
-   * @var      string $parentObject
-   */
-  var $parentObject;
-
-  /**
-   * The parent object id
-   * @access   private
-   * @var      string $parentObjectCD
-   */
-  var $parentObjectID;
-
-  /**
-   * Array with all linked childobjects
-   * @access   private
-   * @var      array $childObjects
-   */
-  var $childObjects;
-
-  /**
-   * Counts the number of childs
-   * @access   private
-   * @var      integer  $numberChildren
-   */
-  var $numberChildren;
-
-  /**
-   * Title of the group
-   * @access   private
-   * @var      integer $title
-   */
-  var $title;
-
-  /**
-   * Text of the group
-   * @access   private
-   * @var      integer $text
-   */
-  var $text;
-
-  /**
-   * Position of this group in parent object
-   * @access   private
-   * @var      integer $position
-   */
-  var $position;
-
-  /**
-   * Holds the DB object
-   * @access   private
-   * @var      object DatabaseObject $db
-   */
-  var $db;
-
-  /**
-   * Is used as a counter for getNextChild )
-   * @access   private
-   * @var      integer $childNum
-   */
-  var $childNum;
-
-  /**
-   * Defines how many children to load. See EVAL_LOAD_*_CHILDREN
-   * @access   private
-   * @var      integer  $loadChildren
-   */
-  var $loadChildren;
-# ============================================================ end: variables #
-
-
-# Define constructor and destructor ========================================= #
-  /**
-   * Constructor
-   * @param    string            $objectID       The ID of an existing object
-   * @param    EvaluationObject  $parentObject   The parent object
-   * @param    integer           $loadChildren   See const EVAL_LOAD_*_CHILDREN
-   * @access   public
-   */
-  function __construct($objectID = "", $parentObject = NULL,
-                              $loadChildren = EVAL_LOAD_NO_CHILDREN) {
-
-    /* Set default values -------------------------------------------------- */
-    parent::__construct($objectID);
-    $this->instanceof = INSTANCEOF_EVALOBJECT;
-
-    $this->parentObject   = $parentObject;
-    $this->loadChildren   = $loadChildren;
-    $this->db             = NULL;
-    $this->childObjects   =  [];
-    $this->numberChildren = 0;
-    $this->title          = "";
-    $this->text           = "";
-    $this->position       = 0;
-    $this->childNum       = 0;
-    /* --------------------------------------------------------------------- */
-  }
-# =========================================== end: constructor and destructor #
-
-
-# Define public functions =================================================== #
-   /**
-    * Sets the title
-    * @access  public
-    * @param   string  $title  The title.
-    * @throws  error
-    */
-   function setTitle ($title) {
-         $this->title = $title;
-   }
-
-   /**
-    * Gets the title
-    * @access  public
-    * @return  string  The title
-    */
-   function getTitle () {
-         return $this->title;
-   }
-
-   /**
-    * Sets the text
-    * @access  public
-    * @param   string  $text        The text.
-    * @throws  error
-    */
-   function setText ($text) {
-         $this->text = $text;
-   }
-
-   /**
-    * Gets the text
-    * @access  public
-    * @return  string  The text
-    */
-   function getText () {
-         return $this->text;
-   }
-
-
-   /**
-    * Sets the position
-    * @access  public
-    * @param   string  $position  The position.
-    */
-   function setPosition ($position) {
-     $this->position = $position;
-   }
-
-   /**
-    * Gets the position
-    * @access  public
-    * @return  string  The position
-    */
-   function getPosition () {
-      return $this->position;
-   }
-
-   /**
-    * Sets the parentObject
-    * @access  public
-    * @param   string  &$parentObject  The parentObject.
-    */
-   function setParentObject (&$parentObject) {
-     $this->parentObject = &$parentObject;
-     $this->parentObjectID = $this->parentObject->getObjectID ();
-   }
-
-   /**
-    * Gets the parentObject
-    * @access  public
-    * @returns object  The parentObject.
-    */
-   function getParentObject () {
-     return $this->parentObject;
-   }
-
-   /**
-    * Gets the parentObjectID
-    * @access  public
-    * @returns string  The parentObjectID
-    */
-   function getParentID () {
-     return $this->parentObjectID;
-   }
-
-
-   /**
-    * Sets the parentObjectID
-    * @access  public
-    * @param   string  $parentID  The parent id
-    */
-   function setParentID ($parentID) {
-     $this->parentObjectID = $parentID;
-   }
-
-   /**
-    * Removes a child from the object (not from the DB!)
-    * @access  public
-    * @param   string   $childID   The child id
-    */
-   function removeChildID ($childID) {
-      $temp         =  [];
-      $childRemoved = NO;
-
-      while ($child = &$this->getNextChild ()) {
-         if ($childRemoved)
-            $child->setPosition ($child->getPosition () - 1);
-
-         if ($child->getObjectID () != $childID) {
-            array_push ($temp, $child);
-         } else {
-            $childRemoved = YES;
-         }
-      }
-
-      $this->childObjects = $temp;
-
-      if ($childRemoved)
-         $this->numberChildren--;
-   }
-
-   /**
-    * Adds a child
-    * @access  public
-    * @param   object  EvaluationObject &$child  The child object
-    */
-   function addChild (&$child) {
-     $child->setPosition ($this->numberChildren++);
-     $child->setParentObject ($this);
-     array_push ($this->childObjects, $child);
-   }
-
-   /**
-    * Gets the first child and removes it (if no id is given)
-    * @access  public
-    * @param   string   $childID   The child id
-    * @return  object   The first object
-    */
-   function &getChild ($childID = "") {
-      if (!empty ($childID)) {
-         while ($child = $this->getNextChild ())
-         if ($child->getObjectID () == $childID) {
-            $this->childNum = 0;
-            return $child;
-         }
-         $ret = null;
-         return $ret;
-      } else {
-         if ($this->numberChildren > 0)
-            $this->numberChildren--;
-         $ret = array_pop ($this->childObjects);
-         return $ret;
-      }
-   }
-
-   /**
-    * Gets the next child
-    * @access  public
-    * @return  object   The next object, otherwise NULL
-    */
-   function &getNextChild () {
-      if ($this->childNum >= $this->numberChildren) {
-         $this->childNum = 0;
-         $ret = null;
-         return $ret;
-      }
-      return $this->childObjects[$this->childNum++];
-   }
-
-   /**
-    * Gets all the childs in the object
-    * @access  public
-    * @return  array  An array full of childObjects
-    */
-   function getChildren () {
-     return $this->childObjects;
-   }
-
-   /**
-    * Gets the number of children
-    * @access  public
-    * @return  integer  Number of children
-    */
-   function getNumberChildren () {
-     return $this->numberChildren;
-   }
-
-   /**
-    * Saves the object into the database
-    * @access public
-    */
-   function save () {
-     /* Check own object --------------------------------------------------- */
-     $this->check ();
-     if ($this->isError ())
-       return;
-     /* --------------------------------------------------------- end: check */
-
-     /* save own object ---------------------------------------------------- */
-     $this->db->save ($this);
-     if ($this->db->isError ())
-       return $this->throwErrorFromClass ($this->db);
-     /* ----------------------------------------------- end: save own object */
-
-     /* save children ------------------------------------------------------ */
-     while ($childObject = $this->getNextChild ()) {
-       $childObject->save ();
-       if ($childObject->isError ())
-     return $this->throwErrorFromClass ($childObject);
-     }
-     /* ------------------------------------------------- end: save children */
-   }
-
-   /**
-    * Deletes the object from the database
-    * @access public
-    */
-   function delete () {
-     /* remove id from parentobject if exists ------------------------------ */
-      if (!empty ($this->parentObject)) {
-         $this->parentObject->removeChildID ($this->getObjectID ());
-      }
-     /* ----------------------------------------- end: remove id from parent */
-
-     /* delete own object -------------------------------------------------- */
-     $this->db->delete ($this);
-     /* --------------------------------------------- end: delete own object */
-
-     /* delete children ---------------------------------------------------- */
-     while ($childObject = $this->getChild ()) {
-       $childObject->delete ();
-       if ($childObject->isError ())
-         $this->throwErrorFromClass ($childObject);
-     }
-     /* ----------------------------------------------- end: delete children */
-   }
-
-   /**
-    * Duplicates the evaluation object. WARNING: Stored childs will be
-    * modified :(
-    * @access public
-    */
-   function &duplicate () {
-     $newObject = $this;
-     $newObject->duplicate_init ();
-     return $newObject;
-   }
-# ===================================================== end: public functions #
-
-
-# Define private functions ================================================== #
-   /**
-    * Initialisation for duplicated objects
-    * @access   private
-    */
-   function duplicate_init () {
-     $this->init ();
-     while ($childObject =& $this->getNextChild ()) {
-       $childObject->setParentID ($this->getObjectID ());
-       $childObject->duplicate_init ();
-     }
-   }
-
-   /**
-    * Initialisation for objects
-    * @access   private
-    * @param    string   $objectID   The object id
-    */
-   function init ($objectID = "") {
-     /* Load an evaluationobject or create a new one ----------------------- */
-     if (empty ($objectID)) {
-       $this->setObjectID(self::createNewID());
-     } else {
-       $this->setObjectID ($objectID);
-       $this->load ();
-       if ($this->db->isError ())
-     return $this->throwErrorFromClass ($this->db);
-     }
-    /* -------------------------------------------------------------------- */
-
-   }
-
-   /**
-    * Loads the Object from the database
-    * @access private
-    */
-   function load () {
-     $this->db->load ($this);
-     if ($this->db->isError ())
-       return $this->throwErrorFromClass ($this->db);
-   }
-
-   /**
-    * Checks if object is in a valid state
-    * @access private
-    */
-   function check () {
-     if (empty ($this->db))
-       $this->throwError (1, _("Es existiert kein DB-Objekt"));
-   }
-
-    /**
-     * Gets all children of a special kind
-     * @param   EvaluationObject  &$object      the parent object
-     * @param   string            $instanceof  instance of the searched child
-     * @param   boolean           $reset       for internal use
-     * @access  public
-     */
-   function getSpecialChildobjects (&$object, $instanceof, $reset = false) {
-      static $specialchildobjects =  [];
-      if ($reset == YES) {
-         $specialchildobjects =  [];
-      }
-
-      if ($object->x_instanceof () == $instanceof) {
-         array_push ($specialchildobjects, $object);
-      } else {
-         while ($child = &$object->getNextChild ()) {
-            $this->getSpecialChildobjects ($child, $instanceof, NO);
-         }
-      }
-      return $specialchildobjects;
-   }
-
-   /**
-    * Debugfunction
-    * @access public
-    */
-   function toString () {
-     echo "<table border=1 cellpadding=5><tr><td>";
-     echo "Typ: ".$this->x_instanceof ()."<br>";
-     echo "ObjectID: ".$this->getObjectID ()."<br>";
-     echo "ParentID: ".$this->getParentID ()."<br>";
-     echo "ParentObject: ".$this->getParentObject ()."<br>";
-     echo "Author: ".$this->getAuthorID ()."<br>";
-     echo "Titel: ".$this->getTitle ()."<br>";
-     echo "Text: ".$this->getText ()."<br>";
-     echo "Position: ".$this->getPosition ()."<br>";
-     echo "Untergruppen: ".$this->getNumberChildren ()."<br>";
-     echo "</td></tr>";
-     $i = 0;
-     while ($child = $this->getNextChild ()) {
-       echo "<tr><td>";
-       $i++;
-       echo "<b>Kind $i</b>"."<br>";
-       $child->toString ();
-       echo "</td></tr>";
-     }
-     echo "</table>";
-   }
-# ==================================================== end: private functions #
-
-}
-
-?>
diff --git a/lib/evaluation/classes/EvaluationQuestion.class.php b/lib/evaluation/classes/EvaluationQuestion.class.php
deleted file mode 100644
index c3c1da3..0000000
--- a/lib/evaluation/classes/EvaluationQuestion.class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Beschreibung
- *
- * @author      Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
-*/
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_QUESTIONDB;
-require_once EVAL_FILE_OBJECT;
-require_once EVAL_FILE_ANSWER;
-# ====================================================== end: including files #
-
-
-# Define constants ========================================================== #
-/**
- * @const INSTANCEOF_EVALGROUP Is instance of an evaluationquestion object
- * @access public
- */
-define ("INSTANCEOF_EVALQUESTION", "EvaluationQuestion");
-
-/**
- * @const EVALQUESTION_TYPE_LIKERT Type of question is skala
- * @access public
- */
-define ("EVALQUESTION_TYPE_LIKERT", "likertskala");
-
-/**
- * @const EVALQUESTION_TYPE_MC Type of question is normal
- * @access public
- */
-define ("EVALQUESTION_TYPE_MC", "multiplechoice");
-
-/**
- * @const EVALQUESTION_TYPE_POL Type of question is pol
- * @access public
- */
-define ("EVALQUESTION_TYPE_POL", "polskala");
-# ===================================================== end: define constants #
-
-
-class EvaluationQuestion extends EvaluationObject {
-
-# Define all required variables ============================================= #
-  /**
-   * Type of question (skala/normal) => see EVALQUESTION_TYPE_*
-   * @access private
-   * @var    string   $type
-   */
-  var $type;
-
-  /**
-   * If set YES it is allowed to choose more than one answer
-   * @access private
-   * @var    string   $isMultiplechoice
-   */
-  var $isMultiplechoice;
-
-  var $templateID;
-
-# ============================================================ end: variables #
-
-# Define constructor and destructor ========================================= #
-   /**
-    * Constructor
-    * @access   public
-    * @param    string   $objectID       The ID of an existing question
-    * @param    object   $parentObject   The parent object if exists
-    * @param    integer  $loadChildren   See const EVAL_LOAD_*_CHILDREN
-    */
-   function __construct($objectID = "", $parentObject = NULL,
-                                $loadChildren = EVAL_LOAD_NO_CHILDREN) {
-    /* Set default values ------------------------------------------------- */
-    parent::__construct($objectID, $parentObject, $loadChildren);
-    $this->instanceof       = INSTANCEOF_EVALQUESTION;
-
-    $this->type             = EVALQUESTION_TYPE_MC;
-    $this->isMultiplechoice = NO;
-    $this->templateID       = YES;
-    /* ------------------------------------------------------------------- */
-
-    /* Connect to database ------------------------------------------------- */
-    $this->db = new EvaluationQuestionDB ();
-    if ($this->db->isError ())
-      return $this->throwErrorFromClass ($this->db);
-    $this->init ($objectID);
-    /* --------------------------------------------------------------------- */
-  }
-# =========================================== end: constructor and destructor #
-
-
-# Define public functions =================================================== #
-  /**
-   * Sets the type of a question
-   * @access  public
-   * @param   string  $type  The type of the question. ('skala','normal','pol')
-   */
-  function setType ($type) {
-    $this->type = $type;
-  }
-
-  /**
-   * Sets the type of a question
-   * @access  public
-   * @return  string  The type of the question.('likert','multiplechoice','pol')
-   */
-  function getType () {
-    return  $this->type;
-  }
-
-
-  /**
-   * Sets multiplechoice value of a question
-   * @access  public
-   * @param   $tinyint  The multiplechoice Value.
-   */
-  function setMultiplechoice ($multiplechoice) {
-    $this->isMultiplechoice = $multiplechoice == YES ? YES : NO;
-  }
-
-  /**
-   * Checks for multiplechoice
-   * @access   public
-   * @return   boolean   YES if it is an multiplechoice question
-   */
-  function isMultiplechoice () {
-    return $this->isMultiplechoice == YES ? YES : NO;
-  }
-
-
-  /**
-   * Adds a child and sets the value to pos+1
-   * @access  public
-   * @param   object  EvaluationObject &$child  The child object
-   * @throws  error
-   */
-  function addChild (&$child) {
-    parent::addChild ($child);
-    if ($child->getValue () == 0)
-        $child->setValue ($child->getPosition () + 1);
-  }
-# ===================================================== end: public functions #
-
-
-# Define private functions ================================================== #
-# ==================================================== end: private functions #
-
-}
-
-?>
diff --git a/lib/evaluation/classes/EvaluationTree.class.php b/lib/evaluation/classes/EvaluationTree.class.php
deleted file mode 100644
index a369d69..0000000
--- a/lib/evaluation/classes/EvaluationTree.class.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * The treeclass for an evaluation.
- *
- * @author  mcohrs
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_EVAL;
-require_once EVAL_FILE_GROUP;
-# ====================================================== end: including files #
-
-
-class EvaluationTree extends TreeAbstract {
-# Define all required variables ============================================= #
-
- /**
-  * Holds the Evaluation object
-  * @access   public
-  * @var      object Evaluation $eval
-  */
-  var $eval;
-
- /**
-  * Holds the Evaluation ID
-  * @access   public
-  * @var      string $evalID
-  */
-  var $evalID;
-
- /**
-  * Holds the eval constructor load mode
-  * @access   public
-  * @var      integer $load_mode
-  */
-  var $load_mode;
-
-  var $root_content;
-
-# ============================================================ end: variables #
-
-
-# Define constructor and destructor ========================================= #
-  /**
-    * Constructor
-    * @access   public
-    * @param    array  the eval's ID (optional - if not given, it must be in $_REQUEST).
-    */
-  function __construct( $args ) {
-
-
-      if (isset($args['evalID']))
-        $this->evalID = $args['evalID'];
-      else
-        $this->evalID = Request::option("evalID");
-
-      $this->load_mode = ($args['load_mode'] ? $args['load_mode'] : EVAL_LOAD_NO_CHILDREN);
-      if (empty($this->evalID)){
-      print _("Fehler in EvaluationTree: Es wurde keine evalID übergeben");
-      exit ();
-      }
-
-      /* ------------------------------------------------------------------- */
-      parent::__construct();
-  }
-# =========================================== end: constructor and destructor #
-
-
-# Define public functions =================================================== #
-
-  /**
-   * initializes the tree
-   * store rows from evaluation tables in array $tree_data
-   * @access public
-   */
-  function init() {
-      /* create the evaluation -------------------> */
-      $this->eval = new Evaluation( $this->evalID, NULL, $this->load_mode );
-      $this->root_name = $this->eval->getTitle();
-      $this->root_content = $this->eval->getText();
-
-      /* create the tree structure ---------------> */
-      parent::init();
-
-      foreach( $this->eval->getChildren() as $group ) {
-      $this->recursiveInit( $group );
-
-      $this->tree_data[$group->getObjectID()]["text"] = $group->getText();
-      $this->tree_data[$group->getObjectID()]["object"] = $group;
-      $this->storeItem( $group->getObjectID(), "root",
-                $group->getTitle(), $group->getPosition() );
-      }
-      /* <---------------------------------------- */
-  }
-
-
-  /**
-   * initialize the sub-groups.
-   *
-   * @access  private
-   * @param   object EvaluationGroup  the current group to be initialized.
-   */
-  function recursiveInit( $group ) {
-      // only groups are interesting here.
-      if( $group->x_instanceof() != INSTANCEOF_EVALGROUP )
-      return;
-
-      if( $children = $group->getChildren() ) {
-      foreach( $children as $child ) {
-          $this->recursiveInit( $child );
-      }
-      }
-
-      // store current object itself
-      $this->tree_data[$group->getObjectID()]["object"] = $group;
-
-      $this->storeItem( $group->getObjectID(), $group->getParentID(),
-            $group->getTitle(), $group->getPosition() );
-
-  }
-
-  function &getGroupObject($item_id, $renew = false){
-      if (isset($this->tree_data[$item_id]['object']) && is_object($this->tree_data[$item_id]['object'])) {
-          if ($renew) $this->recursiveInit(new EvaluationGroup($item_id,null,$this->load_mode));
-          return $this->tree_data[$item_id]['object'];
-      } else {
-          $evalGroup = new EvaluationGroup($item_id, null, $this->load_mode);
-          return $evalGroup;
-      }
-  }
-
-# ===================================================== end: public functions #
-
-
-}
-
-?>
diff --git a/lib/evaluation/classes/EvaluationTreeEditView.class.php b/lib/evaluation/classes/EvaluationTreeEditView.class.php
deleted file mode 100644
index 3bfe92a..0000000
--- a/lib/evaluation/classes/EvaluationTreeEditView.class.php
+++ /dev/null
@@ -1,3245 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter005: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-use Studip\Button, Studip\LinkButton;
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_LIB_COMMON;
-require_once EVAL_FILE_EVALTREE;
-require_once EVAL_FILE_EVAL;
-# ====================================================== end: including files #
-
-/**
- * Class to print out the an evaluation's admin-tree
- *
- * @author  Christian Bauer <alfredhitchcock@gmx.net>
- * @copyright   2004 Stud.IP-Project
- * @access  public
- * @package     evaluation
- * @modulegroup evaluation_modules
- */
-
-
-# defines ==================================================================== #
-
-/**
- * @const NO_TEMPLATE_GROUP  title of the template without temtplateID
- * @access private
- */
-define('NO_TEMPLATE_GROUP', _('keine Vorlage'));
-
-/**
- * @const NO_TEMPLATE_GROUP_TITLE  title of questiongroup without title
- * @access private
- */
-define('NO_QUESTION_GROUP_TITLE', _('*Fragenblock*'));
-
-/**
- * @const NO_TEMPLATE  title of a template without title
- * @access private
- */
-define('NO_TEMPLATE', _('*unbekannt*'));
-/**
- * @const NEW_ARRANGMENT_BLOCK_TITLE  title of a new arrangment block
- * @access private
- */
-define('NEW_ARRANGMENT_BLOCK_TITLE', _('Neuer Gruppierungsblock'));
-
-/**
- * @const NEW_QUESTION_BLOCK_BLOCK_TITLE  title of a new question block
- * @access private
- */
-define('NEW_QUESTION_BLOCK_BLOCK_TITLE', _('Neuer Fragenblock'));
-
-/**
- * @const ROOT_BLOCK  the root item
- * @access private
- */
-define('ROOT_BLOCK', 'root');
-
-/**
- * @const ARRANGMENT_BLOCK  the arrangment block item
- * @access private
- */
-define('ARRANGMENT_BLOCK', 'ARRANGMENT_BLOCK');
-
-/**
- * @const QUESTION_BLOCK  the question block item
- * @access private
- */
-define('QUESTION_BLOCK', 'QUESTION_BLOCK');
-
-# =============================================================== end: defines #
-
-
-# classes ==================================================================== #
-
-class EvaluationTreeEditView
-{
-
-    /**
-     * Reference to the tree structure
-     *
-     * @access   public
-     * @var      object EvaluationTree  $tree
-     */
-    var $tree;
-
-    /**
-     * contains the item with the current html anchor
-     *
-     * @access   public
-     * @var      string $anchor
-     */
-    var $anchor;
-
-    /**
-     * the item to start with
-     *
-     * @access   public
-     * @var      string $startItemID
-     */
-    var $startItemID;
-
-    /**
-     * true if changedate should be set
-     *
-     * @access   private
-     * @var      boolean $changed
-     */
-    var $changed;
-
-    /**
-     * Holds the Evaluation object
-     * @access   private
-     * @var      object Evaluation  $eval
-     */
-    var $eval;
-
-    /**
-     * Holds the current Item-ID
-     * @access   private
-     * @var      string $itemID
-     */
-    var $itemID;
-
-    /**
-     * Holds the currently moved Item-ID
-     * @var string $moveItemID
-     */
-    var $moveItemID;
-
-    /**
-     * Holds the current evalID
-     * @access   private
-     * @var      integer $evalID
-     */
-    var $evalID;
-
-    /**
-     * The itemID instance
-     * @access   private
-     * @var      string $itemInstance
-     */
-    var $itemInstance;
-
-    /**
-     * Possible messages
-     *
-     * @var array $msg
-     */
-    var $msg = [];
-
-    /**
-     * constructor
-     *
-     * @access public
-     * @param string $itemID the item to display
-     * @param string $evalID the evaluation of the item
-     */
-    function __construct($itemID = ROOT_BLOCK, $evalID = NULL)
-    {
-        global $sess;
-
-        $this->itemID = ($itemID) ? $itemID : ROOT_BLOCK;
-        $this->startItemID = ($itemID) ? $itemID : ROOT_BLOCK;
-        $this->evalID = $evalID;
-        $this->itemInstance = $this->getInstance($this->itemID);
-        $this->changed = false;
-
-        $this->tree = TreeAbstract::GetInstance("EvaluationTree", ['evalID' => $this->evalID,
-            'load_mode' => EVAL_LOAD_ALL_CHILDREN]);
-
-        # filter out an old session itemID ======================================= #
-        if (is_array($this->tree->tree_data) && !is_null($itemID)) {
-            if (!array_key_exists($itemID, $this->tree->tree_data)) {
-                $this->itemID = ROOT_BLOCK;
-                $this->startItemID = ROOT_BLOCK;
-                $this->tree->init();
-            }
-        } else {
-            $this->itemID = ROOT_BLOCK;
-            $this->startItemID = ROOT_BLOCK;
-            $this->tree->init();
-        }
-
-        # handling the moveItemID =============================================== #
-        if (Request::submitted('create_moveItemID'))
-            $this->moveItemID = Request::option("itemID");
-        elseif (Request::option("moveItemID"))
-            $this->moveItemID = Request::get("moveItemID");
-
-        if (Request::submitted("abbort_move"))
-            $this->moveItemID = NULL;
-
-        if ($this->moveItemID != NULL) {
-            if (is_array($this->tree->tree_data)) {
-                if (!array_key_exists($this->moveItemID, $this->tree->tree_data)) {
-                    $this->moveItemID = NULL;
-                }
-            } else {
-                $this->moveItemID = NULL;
-            }
-        }
-
-
-        # execute the comand ==================================================== #
-        $this->parseCommand();
-
-        # set the new changedate ================================================ #
-        if ($this->changed) {
-            $this->tree->eval->setChangedate(time());
-            $this->tree->eval->save();
-        }
-
-    }
-
-
-################################################################################
-#                                                                              #
-# public functions                                                             #
-#                                                                              #
-################################################################################
-
-    /**
-     * displays the EvaluationTree
-     *
-     * @access  public
-     * @return  string the eval-tree (html)
-     */
-    function showEvalTree()
-    {
-
-        $html = "<table width=\"99%\" border=\"0\" cellpadding=\"0\" "
-            . "cellspacing=\"0\">\n";
-
-        if ($this->startItemID != ROOT_BLOCK) {
-
-            $html .= " <tr>\n"
-                . "  <td class=\"table_row_odd\" align=\"left\" valign=\"top\" "
-                . "colspan=\"";
-            $html .= ($this->moveItemID) ? "1" : "1";
-            $html .= "\""
-                . ">\n"
-                . $this->getEvalPath()
-#       . "<img src=\"".
-#       . "/forumleer.gif\"  border=\"0\" height=\"20\" width=\"1\">\n"
-                . "   </td>\n"
-                . " </tr>\n";
-        }
-        # display the infos when moving a block =================================== #
-
-        if ($this->moveItemID) {
-
-            $html .= " <tr>\n";
-#       . "   <td width=\"10\"class=\"blank tree-indent\" "
-#       . "background=\"".."forumstrich.gif\">"
-#       . "<img src=\""
-#       . ."forumstrich.gif\" width=\"10\" border=\"0\" >"
-#       . "</td>\n"
-            $html .= "  <td class=\"graulight\" align=\"left\" valign=\"top\" width=\"100%\">\n";
-
-
-            $mode = $this->getInstance($this->moveItemID);
-
-            switch ($mode) {
-
-                case ARRANGMENT_BLOCK:
-                    $group =& $this->tree->getGroupObject($this->moveItemID);
-                    $title = htmlready($group->getTitle());
-                    $msg = sprintf(_("Sie haben den Gruppierungsblock <b>%s</b> zum Verschieben ausgewählt. Sie können ihn nun in einen leeren Gruppierungsblock, einen Gruppierungsblock ohne Frageblöcke oder in die oberste Ebene verschieben."), $title);
-
-                    break;
-
-                case QUESTION_BLOCK:
-                    $group = &$this->tree->getGroupObject($this->moveItemID);
-                    $title = htmlready($group->getTitle());
-                    if (!$title)
-                        $title = NO_QUESTION_GROUP_TITLE;
-                    $msg = sprintf(_("Sie haben den Fragenblock <b>%s</b> zum Verschieben ausgewählt. Sie können ihn nun in einen leeren Gruppierungsblock oder einen Gruppierungsblock mit Frageblöcke verschieben."), $title);
-                    break;
-
-                default:
-
-                    $msg = _("Es wurde ein ungültiger Block zum verschieben ausgewählt.");
-                    break;
-            }
-
-
-            $table = new HTML ("table");
-            $table->addAttr("border", "0");
-            $table->addAttr("cellspacing", "0");
-            $table->addAttr("cellpadding", "2");
-            $table->addAttr("width", "100%");
-
-            $tr = new HTML ("tr");
-
-            $td = new HTML ("td");
-            $td->addAttr("align", "center");
-            $td->addAttr("class", "graulight");
-            $td->addAttr("width", "25");
-
-            $img = new HTMLempty ("img");
-            $img->addAttr("width", "32");
-            $img->addAttr("height", "32");
-            $img->addAttr("src", EVAL_PIC_INFO);
-
-            $td->addContent($img);
-            $tr->addContent($td);
-
-            $td = new HTML ("td");
-            $td->addAttr("align", "left");
-
-            $font = new HTML ("font");
-            $font->addAttr("color", "black");
-            $font->addHTMLContent($msg);
-            $font->addHTMLContent(" " . sprintf(
-                    _("Benutzen Sie dieses %s Symbol, um den Block zu verschieben."),
-                    $this->createImage(EVAL_PIC_MOVE_GROUP, _("Block verschieben Symbol"))));
-            $font->addHTMLContent("<br><br>"
-                . _("Oder wollen Sie die Aktion abbrechen?")
-                . " "
-                . LinkButton::createCancel(_('Abbrechen'),
-                    $this->getSelf('abbort_move=1')));
-
-            $td->addContent($font);
-            $tr->addContent($td);
-            $table->addContent($tr);
-
-            $html .= "<br>" . $table->createContent() . "<br>";
-
-            $html .= "</td></tr>\n";
-        }
-        # ============================= END: display the infos when moving a block #
-
-        $html .= " <tr>\n"
-            . "  <td class=\"blank\"  align=\"left\" valign=\"top\" "
-            . "colspan=\"";
-        $html .= ($this->moveItemID) ? "1" : "1";
-        $html .= "\""
-            . ">\n";
-
-        if (!$this->startItemID != ROOT_BLOCK) {
-            $html .= "<a name=\"anchor\"></a>\n";
-        }
-
-        $html .= $this->showTree($this->startItemID, 1)
-            . "  </td>\n"
-            . " </tr>\n"
-            . "</table>\n";
-
-        return $html;
-    }
-
-# ###################################################### end: public functions #
-
-
-################################################################################
-#                                                                              #
-# show tree functions                                                          #
-#                                                                              #
-################################################################################
-
-    /**
-     * prints out the tree beginning at the parent-item
-     *
-     * @access  public
-     * @param string $itemID the item to display
-     * @param string $start YES if its the basecall
-     * @return  string   the tree (html)
-     */
-    function showTree($itemID = ROOT_BLOCK, $start = NULL)
-    {
-
-        $items = [];
-        if (!is_array($itemID)) {
-            $items[0] = $itemID;
-
-            $mode = $this->getInstance($itemID);
-
-            switch ($mode) {
-
-                case ROOT_BLOCK:
-                    $this->startItemID = $itemID;
-                    break;
-
-                case ARRANGMENT_BLOCK:
-
-                case QUESTION_BLOCK:
-                    $parentgroup = &$this->tree->getGroupObject($itemID);
-                    $this->startItemID = $parentgroup->getObjectID();
-                    break;
-            }
-
-            $this->startItemID = $itemID;
-        } else {
-            $items = $itemID;
-        }
-        $num_items = count($items);
-
-        $html = "";
-
-        // this is the first / the opened item
-        if ($start) {
-
-            $mode = $this->getInstance($itemID);
-
-            switch ($mode) {
-
-                case ROOT_BLOCK:
-
-                    break;
-
-                case ARRANGMENT_BLOCK:
-
-                case QUESTION_BLOCK:
-
-                    $group = &$this->tree->getGroupObject($itemID);
-                    $parentID = $group->getParentID();
-
-                    $mode = $this->getInstance($parentID);
-                    $items2 = [];
-                    if ($mode == ROOT_BLOCK) {
-
-                        $eval = new Evaluation ($this->evalID, NULL, EVAL_LOAD_FIRST_CHILDREN);
-                        while ($child = $eval->getNextChild())
-                            $items2[] = $child->getObjectID();
-                    } else {
-
-                        $parentgroup = &$this->tree->getGroupObject($parentID, NULL, EVAL_LOAD_FIRST_CHILDREN);
-                        while ($child = $parentgroup->getNextChild())
-                            $items2[] = $child->getObjectID();
-                    }
-
-                    $num_items2 = count($items2);
-
-                    $num_items = $num_items2;
-                    $items = $items2;
-                    break;
-
-            }
-
-        }
-
-        for ($j = 0; $j < $num_items; ++$j) {
-
-            $html .= $this->createTreeLevelOutput($items[$j]);
-            $html .= $this->createTreeItemOutput($items[$j]);
-
-            if ($this->tree->hasKids($items[$j]) &&
-                $this->itemID == $items[$j])
-                $html .= $this->showTree($this->tree->tree_childs[$items[$j]]);
-        }
-
-        return $html;
-    }
-
-
-    /**
-     * creates the parentslinks
-     *
-     * @access  private
-     * @return  string  the eval path as html-links
-     */
-    function getEvalPath()
-    {
-
-        $path = "<a name=\"anchor\">&nbsp;</a>\n"
-            . _("Sie sind hier:")
-            . "&nbsp;";
-        $path .= "<a class=\"tree\" href=\""
-            . URLHelper::getLink($this->getSelf("itemID=" . ROOT_BLOCK, false))
-            . "\">"
-            . htmlready(my_substr(
-                $this->tree->tree_data[ROOT_BLOCK]["name"], 0, 60))
-            . "</a>";
-
-        # collecting the parent blocks =========================================== #
-
-        if ($parents = $this->tree->getParents($this->startItemID)) {
-            for ($i = count($parents) - 1; $i >= 0; --$i) {
-                if ($parents[$i] != ROOT_BLOCK)
-                    $path .= "&nbsp;&gt;&nbsp;"
-                        . "<a class=\"tree\" href=\""
-                        . URLHelper::getLink($this->getSelf("itemID={$parents[$i]}", false))
-                        . "\">"
-                        . htmlready(my_substr(
-                            $this->tree->tree_data[$parents[$i]]["name"], 0, 60))
-                        . "</a>";
-            }
-        }
-        # ====================================== END: collecting the parent blocks #
-        return $path;
-    }
-
-
-    /**
-     * returns html for the icons in front of the name of the item
-     *
-     * @access  private
-     * @param string $itemID the item-heas id
-     * @return  string   the item head (html)
-     */
-    function getItemHeadPics($itemID)
-    {
-
-        $mode = $this->getInstance($itemID);
-
-        if ($this->itemID == $itemID) {
-
-            $img = new HTMLempty ("img");
-            $img->addAttr("src", EVAL_PIC_TREE_ARROW_ACTIVE);
-            $img->addAttr("border", "0");
-            $img->addAttr("align", "baseline");
-            $img->addAttr("hspace", "2");
-            $img->addString(tooltip(_("Dieser Block ist geöffnet."), true));
-            $head = $img->createContent();
-
-        } else {
-
-            $a = new HTML ("a");
-            $a->addAttr("href", URLHelper::getLink($this->getSelf("itemID={$itemID}")));
-
-            $img = new HTMLempty ("img");
-            $img->addAttr("src", EVAL_PIC_TREE_ARROW);
-            $img->addAttr("border", "0");
-            $img->addAttr("align", "baseline");
-            $img->addAttr("hspace", "2");
-            $img->addString(tooltip(_("Diesen Block öffnen."), true));
-
-            $a->addContent($img);
-
-            $head = $a->createContent();
-
-        }
-
-        # collecting the image and tooltip for this item ========================== #
-
-        switch ($mode) {
-
-            case ROOT_BLOCK:
-
-                $tooltip = _("Dies ist Ihre Evaluation.");
-                $image = EVAL_PIC_ICON;
-                break;
-
-            case ARRANGMENT_BLOCK:
-
-                $group = &$this->tree->getGroupObject($itemID);
-
-                $tooltip = ($group->getNumberChildren() == 0)
-                    ? _("Dieser Gruppierungsblock enthält keine Blöcke.")
-                    : sprintf(_("Dieser Grupppierungsblock enthält %s Blöcke."),
-                        $group->getNumberChildren());
-
-                $image = ($group->getNumberChildren() == 0)
-                    ? EVAL_PIC_TREE_GROUP
-                    : EVAL_PIC_TREE_GROUP_FILLED;
-
-                break;
-
-            case QUESTION_BLOCK:
-
-                $group = &$this->tree->getGroupObject($itemID);
-
-                $tooltip = ($group->getNumberChildren() == 0)
-                    ? _("Dieser Fragenblock enthält keine Fragen.")
-                    : sprintf(_("Dieser Fragenblock enthält %s Fragen."),
-                        $group->getNumberChildren());
-
-                $image = ($group->getNumberChildren() == 0)
-                    ? EVAL_PIC_TREE_QUESTIONGROUP
-                    : EVAL_PIC_TREE_QUESTIONGROUP_FILLED;
-
-                break;
-
-            default:
-
-                $tooltip = _("Kein Blocktyp.");
-                $image = EVAL_PIC_TREE_GROUP;
-
-                break;
-        }
-
-        # ===================== END: collecting the image and toolpi for this item #
-
-        $img = new HTMLempty ("img");
-        $img->addAttr("border", "0");
-        $img->addAttr("align", "baseline");
-        $img->addAttr("src", $image);
-        $img->addString(tooltip($tooltip, true));
-
-        $head .= $img->createContent();
-
-        return $head;
-    }
-
-
-    /**
-     * creates the content for all item-types
-     *
-     * @access  private
-     * @param string $itemID the item-heas id
-     * @return  string   the item content (html)
-     */
-    function getItemContent($itemID)
-    {
-
-        $content = "";
-
-        if ($this->getItemMessage($itemID)) {
-
-            $table = new HTML ("table");
-            $table->addAttr("width", "99%");
-            $table->addAttr("cellpadding", "2");
-            $table->addAttr("cellspacing", "2");
-            $table->addAttr("style", "font-size:10pt;");
-
-            $tr = new HTML ("tr");
-
-            $td = new HTML ("td");
-            $td->addHTMLContent($this->getItemMessage($itemID));
-
-            $tr->addContent($td);
-            $table->addContent($tr);
-
-            $content .= "<br>" . $table->createContent();
-        }
-
-
-        $content .= "<form class=\"default\" action=\"" . URLHelper::getLink($this->getSelf("item_id={$itemID}", 1))
-            . "\" method=\"POST\" style=\"display:inline;\">\n";
-        $content .= CSRFProtection::tokenTag();
-
-        $content .= "<br>";
-
-        $mode = $this->getInstance($itemID);
-
-        switch ($mode) {
-            case ROOT_BLOCK:
-
-                $content .= $this->createTitleInput(ROOT_BLOCK)
-                    . $this->createGlobalFeatures()
-
-                    . $this->createButtonbar(ROOT_BLOCK);
-                break;
-
-            case ARRANGMENT_BLOCK:
-
-                $content .= $this->createTitleInput(ARRANGMENT_BLOCK);
-
-                $group = &$this->tree->getGroupObject($itemID);
-                if ($children = $group->getChildren()) {
-                    if ($this->getInstance($children[0]->getObjectID()) == ARRANGMENT_BLOCK)
-                        $show = ARRANGMENT_BLOCK;
-                    else
-                        $show = QUESTION_BLOCK;
-                } else
-                    $show = "both";
-                $content .= $this->createButtonbar($show);
-                break;
-
-            case QUESTION_BLOCK:
-
-                $content .= $this->createTitleInput(QUESTION_BLOCK)
-                    . $this->createQuestionFeatures()
-                    . $this->createQuestionForm()
-                    . $this->createButtonbar(NULL);
-                break;
-        }
-
-        $content .= "</form>\n";
-
-        return $content;
-    }
-
-
-    /**
-     * prints out the lines before an item ("Strichlogik" (c) rstockm)
-     *
-     * @access  private
-     * @param string $item_id the current item
-     * @param string $start_itemID the start item
-     * @return  string   the level output (html)
-     */
-    function createTreeLevelOutput($item_id, $start_itemID = NULL)
-    {
-
-        $level_output = "";
-
-        // without the first strichcode
-        $item_parent = $this->tree->tree_data[$item_id]['parent_id'];
-        $startitem_parent = $this->tree->tree_data[$this->startItemID]['parent_id'];
-
-        if (($item_parent != $startitem_parent) && ($item_parent != NULL)
-            && (
-                ($item_id != ROOT_BLOCK) ||
-                ($item_id != $this->tree->tree_data[$this->startItemID]['parent_id']))) {
-            if ($this->tree->isLastKid($item_id) || $item_id == ROOT_BLOCK)
-                $level_output = "<td class=\"blank tree-indent\" valign=\"top\"  "
-                    . "nowrap>"
-                    . Assets::img('forumstrich2.gif')
-                    . "</td>"; //last
-            else
-                $level_output = "   <td class=\"blank tree-indent\" valign=\"top\" "
-                    . "nowrap>"
-                    . Assets::img('forumstrich3.gif')
-                    . "</td>"; //crossing
-
-            $parent_id = $item_id;
-            $counter = 0;
-            while (
-                (0) &&
-                ($this->tree->tree_data[$parent_id]['parent_id'] != $this->tree->tree_data[$this->startItemID]['parent_id']) &&
-                ($this->tree->tree_data[$parent_id]['parent_id'] != $start_itemID) &&
-                ($this->tree->tree_data[$parent_id]['parent_id'] != ROOT_BLOCK)) {
-                $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
-                $counter++;
-
-                if ($this->tree->isLastKid($parent_id)) {
-                    $level_output = "<td class=\"blank\" valign=\"top\" "
-                        . "width=\"10\" nowrap>"
-                        . Assets::img('forumleer.gif')
-                        . "</td>"
-                        . $level_output; //nothing
-                } else {
-                    $level_output = "   <td class=\"blank tree-indent\" valign=\"top\"  "
-                        . "nowrap>"
-                        . Assets::img('forumstrich.gif')
-                        . "</td>"
-                        . $level_output; //vertical line
-                }
-
-            }
-
-            // the root-item
-            if ((0) &&
-                ($this->startItemID == ROOT_BLOCK) &&
-                ($this->tree->tree_data[$item_id]['parent_id'] == ROOT_BLOCK)) {
-                $level_output = "<td class=\"blank\" valign=\"top\" "
-                    . "width=\"10\" nowrap>"
-                    . Assets::img('forumleer.gif')
-                    . "</td>"
-                    . $level_output; //nothing
-            }
-
-        }
-
-        $html = "<table border=\"0\" width=\"100%\" cellspacing=\"0\" "
-            . "cellpadding=\"0\">"
-            . " <tr>$level_output";
-        return $html;
-    }
-
-
-    /**
-     * prints out one item
-     *
-     * @access  private
-     * @param string $item_id the items id
-     * @return  string             one item (html)
-     */
-    function createTreeItemOutput($item_id)
-    {
-
-        $html = "  <td  class=\"printhead\" nowrap  align=\"left\" "
-            . "valign=\"bottom\">\n"
-            . $this->getItemHeadPics($item_id) . "\n"
-            . "  </td>\n"
-            . "  <td class=\"printhead\" nowrap width=\"1\" valign=\"middle\">\n";
-        if ($this->anchor == $item_id)
-            $html .= "<a name=\"anchor\">";
-        $html .= Assets::img('forumleer.gif');
-        if ($this->anchor == $item_id)
-            $html .= "</a>";
-        $html .= "\n"
-            . "  </td>\n"
-            . "  <td class=\"printhead\" align=\"left\" width=\"99%\" "
-            . "nowrap valign=\"bottom\">"
-            . $this->getItemHead($item_id)
-            . "  </td>\n"
-            . " </tr>\n"
-            . "</table>\n";
-        if ($this->itemID == $item_id)
-            $html .= $this->createTreeItemDetails($item_id);
-        return $html;
-    }
-
-
-    /**
-     * prints out the item details
-     *
-     * @access  private
-     * @param string $item_id the current item
-     * @return  string   the item details (html)
-     */
-    private function createTreeItemDetails($item_id)
-    {
-        $mode = $this->getInstance($item_id);
-
-        switch ($mode) {
-            case ROOT_BLOCK:
-                $eval = new Evaluation($this->evalID, NULL, EVAL_LOAD_FIRST_CHILDREN);
-                $hasKids = $eval->getNumberChildren() == 0 ? NO : YES;
-                break;
-            case ARRANGMENT_BLOCK:
-                $group = $this->tree->getGroupObject($item_id);
-                $hasKids = $group->getNumberChildren() == 0 ? NO : YES;
-                break;
-            default:
-                $hasKids = NO;
-                break;
-        }
-
-        if (!$hasKids || $this->itemID != $item_id) {
-            $level_output = $this->createLevelOutputTD();
-        } else {
-            $level_output = $this->createLevelOutputTD("forumstrich.gif");
-        }
-
-        $table = new HTML ("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "0");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML ("tr");
-        $tr->addHTMLContent($level_output);
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "printcontent");
-        $td->addAttr("width", "100%");
-
-        $div = new HTML ("div");
-        $div->addAttr("align", "center");
-        $div->setTextareaCheck();
-        $div->addHTMLContent($this->getItemContent($item_id));
-
-        $td->addContent($div);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        return $table->createContent();
-    }
-
-
-    /**
-     * creates the items head
-     *
-     * @access  private
-     * @param string $itemID the current item
-     * @return  string   the item head (html)
-     */
-    function getItemHead($itemID)
-    {
-
-        $mode = $this->getInstance($itemID);
-
-        if ($this->itemID == $itemID) {
-
-#       $group = new EvaluationGroup($itemID);
-            $head = "&nbsp;";
-            if ($this->tree->tree_data[$itemID]['name'] == "" && $mode == QUESTION_BLOCK)
-                $head .= NO_QUESTION_GROUP_TITLE;
-            else
-                $head .= htmlready(my_substr(
-                    $this->tree->tree_data[$itemID]['name'], 0, 60));
-
-        } else {
-
-            if ($mode == QUESTION_BLOCK) {
-
-                $group = &$this->tree->getGroupObject($itemID);
-                $templateID = $group->getTemplateID();
-                if ($templateID) {
-                    $template = new EvaluationQuestion($templateID);
-                    $templateTitle = htmlReady($template->getText());
-                } else
-                    $templateTitle = NO_TEMPLATE_GROUP;
-
-                if ($templateTitle == "")
-                    $templateTitle = NO_TEMPLATE;
-
-                $template = "   </td>\n"
-                    . "   <td align=\"right\" valign=\"bottom\" "
-                    . "class=\"printhead\" nowrap=\"nowrap\">\n"
-                    . "<b>"
-                    . _("Vorlage") . ": "
-                    . $templateTitle
-                    . "</b>&nbsp;";
-
-            }
-
-            $head = "&nbsp;<a class=\"tree\" href=\""
-                . URLHelper::getLink($this->getSelf("itemID={$itemID}", false)) . "\"" . tooltip(_("Diesen Block öffnen"), true) . ">";
-
-            if ($this->tree->tree_data[$itemID]['name'] == "" && $mode == QUESTION_BLOCK)
-                $head .= NO_QUESTION_GROUP_TITLE;
-            else
-                $head .= htmlready(my_substr(
-                    $this->tree->tree_data[$itemID]['name'], 0, 60));
-            $head .= "</a>";
-
-            if (!empty($template))
-                $head .= $template;
-        }
-        $moveItem = [];
-        $moveItemIsParent = 0;
-        if ($itemID == ROOT_BLOCK)
-            $itemID2 = $this->evalID;
-        else
-            $itemID2 = $itemID;
-
-        // the "verschiebäfinger"
-        if ($this->moveItemID &&
-            ($this->tree->tree_data[$itemID]['parent_id'] != $this->moveItemID) &&
-            ($mode == ARRANGMENT_BLOCK || $itemID == ROOT_BLOCK) &&
-            $this->moveItemID != $itemID2) {
-
-            $parentID = $this->tree->tree_data[$itemID]['parent_id'];
-            if (!$parentID) $parentID = ROOT_BLOCK;
-            while ($parentID != ROOT_BLOCK && $parentID != $this->moveItemID) {
-                $parentID = $this->tree->tree_data[$parentID]['parent_id'];
-                if ($parentID == $this->moveItemID)
-                    $moveItemIsParent = 1;
-            }
-
-            $moveItem = "   </td>\n"
-                . "   <td align=\"right\" valign=\"middle\" class=\"printhead\" nowrap=\"nowrap\">\n"
-                . $this->createLinkImage(EVAL_PIC_MOVE_GROUP,
-                    _("Den ausgwählten Block in diesen Block verschieben"),
-                    "&itemID=$itemID&cmd=MoveGroup",
-                    NO, NULL, NO)
-                . "&nbsp;";
-        }
-
-        if ($moveItem && !$moveItemIsParent) {
-            $move_mode = $this->getInstance($this->moveItemID);
-
-            if ($mode == ARRANGMENT_BLOCK) {
-                $group = &$this->tree->getGroupObject($itemID);
-                if ($children = $group->getChildren()) {
-                    if ($this->getInstance($children[0]->getObjectID()) == ARRANGMENT_BLOCK)
-                        $move_type = ARRANGMENT_BLOCK;
-                    else
-                        $move_type = QUESTION_BLOCK;
-                } else
-                    $move_type = "both";
-            } elseif ($mode == ROOT_BLOCK)
-                $move_type = ARRANGMENT_BLOCK;
-            else
-                $move_type = "no";
-
-
-            if (($move_type == "both") ||
-                ($move_mode == $move_type)) {
-                $head .= $moveItem;
-            }
-        }
-
-        if (!($this->tree->isFirstKid($itemID) && $this->tree->isLastKid($itemID)) &&
-            ($itemID != $this->startItemID) &&
-            ($this->tree->tree_data[$itemID]['parent_id'] == $this->startItemID)) {
-            $head .= "   </td>\n"
-                . "   <td align=\"right\" valign=\"bottom\" class=\"printhead\" nowrap=\"nowrap\">\n"
-                . $this->createLinkImage(EVAL_PIC_MOVE_UP,
-                    _("Block nach oben verschieben"),
-                    "cmd=Move&direction=up&groupID=$itemID",
-                    NO)
-                . $this->createLinkImage(EVAL_PIC_MOVE_DOWN,
-                    _("Block nach unten verschieben"),
-                    "cmd=Move&direction=down&groupID=$itemID",
-                    NO)
-                . "&nbsp;";
-        }
-        return $head;
-    }
-
-
-    /**
-     * creates a table and calls the ItemMessages
-     *
-     * @access  private
-     * @param string $itemID the current item
-     * @param integer $colspan the needed colspan (optional)
-     * @return  string             the item message (html)
-     */
-    function getItemMessage($itemID, $colspan = 1)
-    {
-        if (!empty($this->msg[$itemID])) {
-            $msg = explode("§", $this->msg[$itemID]);
-            $details = [];
-            if ($msg[0] == 'msg') {
-                $msg[0] = 'success';
-            }
-            if (mb_strpos($msg[1], '<br>')) {
-                $details = explode("<br>", $msg[1]);
-                $msg[1] = array_shift($details);
-            }
-
-            return (string)MessageBox::{$msg[0]}($msg[1], $details);
-        } else {
-            return NULL;
-        }
-    }
-
-
-    /**
-     * creates a self-url with add. items
-     *
-     * @access  private
-     * @param string $param params (optional)
-     * @param boolean $with_start_item startItem needed? (optional)
-     * @return  string                    the self url
-     */
-    function getSelf($param = "", $with_start_item = true)
-    {
-
-        $url = "?page=edit";
-
-        if ($this->evalID)
-            $url .= "&evalID=" . $this->evalID;
-        else
-            $url .= "&evalID=" . Request::option("evalID");
-
-        if ($param) {
-            $url .= (($with_start_item)
-                    ? "&itemID=" . $this->startItemID . "&"
-                    : "&") . $param;
-        } else {
-            $url .= (($with_start_item)
-                ? "&itemID=" . $this->startItemID
-                : "");
-        }
-
-        if ($this->moveItemID)
-            $url .= "&moveItemID=" . $this->moveItemID;
-
-        $url .= "#anchor";
-
-        return $url;
-    }
-
-# ################################################### end: show tree functions #
-
-
-################################################################################
-#                                                                              #
-# command functions                                                            #
-#                                                                              #
-################################################################################
-
-    /**
-     * parses the _Request-commands and calls the avaible functions
-     *
-     * @access  private
-     */
-    function parseCommand()
-    {
-        $exec_func = '';
-        if (Request::option('cmd') || Request::optionArray('cmd')) {
-            # extract the command from Request (array) =========================== #
-
-            if (Request::optionArray('cmd'))
-                $exec_func = "execCommand" . key(Request::optionArray('cmd'));
-            else
-                $exec_func = "execCommand" . Request::option('cmd');
-
-        } else {
-            $found = 0;
-            # extract the command from the template-site ========================= #
-            foreach ($_REQUEST as $key => $value) {
-                if (preg_match("/template_(.*)_#(.*)_button?/", $key, $command)) {
-                    $found = 1;
-                    break;
-                }
-            }
-
-            if (!$found) {
-                foreach ($_REQUEST as $key => $value) {
-                    if (preg_match("/cmd_(.*)_#(.*)_§(.*)_button?/", $key, $command))
-                        break;
-                }
-            }
-
-
-            if (isset($command[1])) {
-                if ($command[1] == "create_question_answers")
-                    $exec_func = "execCommandQuestionAnswersCreate";
-                else
-                    $exec_func = "execCommand" . $command[1];
-            }
-            # ==================== END: extract the command from the template-site #
-        }
-
-        if (method_exists($this, $exec_func)) {
-            if ($this->$exec_func()) {
-                $this->tree->init();
-                $this->tree->eval->save();
-            }
-        }
-    }
-
-
-    /**
-     * Creates cancel-message
-     * @access   public
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandCancel()
-    {
-
-
-        $itemID = Request::option('startItemID');
-
-        $this->anchor = $itemID;
-        $this->msg[$this->startItemID] .= "info§"
-            . sprintf(_("Die Aktion wurde abgebrochen."));
-        return false;
-    }
-
-    /**
-     * Updates the item content of any kind
-     *
-     * @access  private
-     * @param boolean $no_delete YES/NO (optional)
-     * @return  boolean  true (reinits the tree)
-     */
-    function execCommandUpdateItem($no_delete = false)
-    {
-
-
-        $mode = $this->getInstance($this->itemID);
-
-        $title = Request::get('title');
-        if ($title == "" && $mode != QUESTION_BLOCK)
-            $title = _("Kein Titel angegeben.");
-        $text = Studip\Markup::purifyHtml(trim(Request::get('text')));
-
-        switch ($mode) {
-            case ROOT_BLOCK:
-
-                $this->tree->eval->setTitle($title);
-                $this->tree->eval->setText($text);
-
-                //global features
-                $this->tree->eval->setAnonymous(Request::get('anonymous'));
-
-                $this->tree->eval->save();
-
-                if (!empty($this->tree->eval->isError)) {
-                    return MessageBox::error(_("Fehler beim Einlesen (root-item)"));
-                }
-                $this->msg[$this->itemID] = "msg§"
-                    . _("Veränderungen wurden gespeichert.");
-
-                break;
-            case ARRANGMENT_BLOCK:
-
-                $group = &$this->tree->getGroupObject($this->itemID, true);
-
-                $group->setTitle($title);
-                $group->setText($text);
-                $group->save();
-                if (!empty($group->isError)) {
-                    return MessageBox::error(_("Fehler beim Einlesen (Block)"));
-                }
-                $this->msg[$this->itemID] = "msg§"
-                    . _("Veränderungen wurden gespeichert.");
-                $group = null;
-                break;
-            case QUESTION_BLOCK:
-
-                $group = &$this->tree->getGroupObject($this->itemID, true);
-                $group->setTitle($title);
-                $group->setText($text);
-                $group->setMandatory(Request::get('mandatory'));
-                $group->save();
-
-                // update the questions
-                $msg = $this->execCommandUpdateQuestions();
-
-                $no_answers = 0;
-                $group = &$this->tree->getGroupObject($this->itemID, true);
-                // info about missing answers
-                if ($group->getChildren() && $group->getTemplateID() == NULL) {
-                    foreach ($group->getChildren() as $question) {
-                        if ($question->getChildren() == NULL)
-                            $no_answers++;
-                    }
-                    if ($no_answers == 1) {
-                        if ($this->msg[$this->itemID])
-                            $this->msg[$this->itemID] .= "<br>" . _("Einer Frage wurden noch keine Antwortenmöglichkeiten zugewiesen.");
-                        else
-                            $this->msg[$this->itemID] .= "info§" . _("Einer Frage  wurden noch keine Antwortenmöglichkeiten zugewiesen.");
-                    } elseif ($no_answers > 1) {
-                        if ($this->msg[$this->itemID])
-                            $this->msg[$this->itemID] .= "<br>" . sprintf(_("%s Fragen wurden noch keine Antwortenmöglichkeiten zugewiesen."), $no_answers);
-                        else
-                            $this->msg[$this->itemID] .= "info§" . sprintf(_("%s Fragen wurden noch keine Antwortenmöglichkeiten zugewiesen."), $no_answers);
-                    }
-
-                }
-
-                if (!empty($group->isError)) {
-                    return MessageBox::error("Fehler beim Einlesen (Fragenblock)");
-                }
-                if (!isset($this->msg[$this->itemID])) {
-                    $this->msg[$this->itemID] = '';
-                }
-                if (!empty($this->msg[$this->itemID]))
-                    $this->msg[$this->itemID] .= "<br>" . _("Veränderungen wurden gespeichert.");
-                else
-                    $this->msg[$this->itemID] .= "msg§"
-                        . _("Veränderungen wurden gespeichert.");
-
-                if (!empty($msg)) {
-                    if (!isset($this->msg[$this->itemID])) {
-                        $this->msg[$this->itemID] = '';
-                    }
-                    $this->msg[$this->itemID] = $this->msg[$this->itemID] . "<br>" . $msg;
-                }
-                break;
-            default:
-                $this->msg[$this->itemID] .= "info§"
-                    . _("Falscher Blocktyp. Es wurden keine Veränderungen vorgenommen.");
-                break;
-        }
-
-        $this->changed = true;
-
-        return true;
-    }
-
-
-    /**
-     * Creates a delete-request
-     *
-     * @access   public
-     * @return    boolean  false
-     */
-    function execCommandAssertDeleteItem()
-    {
-        $group = &$this->tree->getGroupObject($this->itemID);
-        if ($group->getChildType() == "EvaluationQuestion")
-            $numberofchildren = $group->getNumberChildren();
-        else
-            $numberofchildren = $this->tree->getNumKidsKids($this->itemID);
-
-        $title = htmlready($group->getTitle());
-
-        // constructing the message
-        $this->msg[$this->itemID] = "info§";
-
-        if ($group->getChildType() == "EvaluationQuestion") {
-            if ($numberofchildren) {
-                $this->msg[$this->itemID] .= ""
-                    . sprintf(
-                        _("Sie beabsichtigen den Fragenblock <b>%s</b> inklusive aller Fragen zu löschen. "),
-                        $title)
-                    . sprintf(_("Es werden insgesamt %s Fragen gelöscht!"), $numberofchildren);
-            } else {
-                $this->msg[$this->itemID] .= ""
-                    . sprintf(
-                        _("Sie beabsichtigen den Fragenblock <b>%s</b> inklusive aller Fragen zu löschen. "),
-                        $title);
-            }
-            $this->msg[$this->itemID] .= "<br>"
-                . _("Wollen Sie diesen Fragenblock wirklich löschen?");
-        } else {
-            if ($numberofchildren) {
-                $this->msg[$this->itemID] .= ""
-                    . sprintf(
-                        _("Sie beabsichtigen den Gruppierungsblock <b>%s</b> inklusive aller Unterblöcke zu löschen. "),
-                        $title)
-                    . sprintf(_("Es werden insgesamt %s Unterblöcke gelöscht!"), $numberofchildren);
-            } else {
-                $this->msg[$this->itemID] .= ""
-                    . sprintf(
-                        _("Sie beabsichtigen den Gruppierungsblock <b>%s</b> inklusive aller Unterblöcke zu löschen. "),
-                        $title);
-            }
-            $this->msg[$this->itemID] .= "<br>"
-                . _("Wollen Sie diesen Gruppierungsblock wirklich löschen?");
-        }
-
-        $this->msg[$this->itemID] .= "<br><br>"
-            . LinkButton::createAccept(_('JA!'),
-                $this->getSelf('cmd[DeleteItem]=1'),
-                ['title' => _('Löschen')])
-            . "&nbsp;"
-            . LinkButton::createCancel(_('NEIN!'),
-                $this->getSelf('cmd[Cancel]=1'))
-            . "\n";
-
-        return false;
-    }
-
-    /**
-     * Deletes an Item and its kids
-     * @access   public
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandDeleteItem()
-    {
-
-        $title = $this->tree->tree_data[$this->itemID]['name'];
-        $parentID = $this->tree->tree_data[$this->itemID]['parent_id'];
-
-        $group = &$this->tree->getGroupObject($this->startItemID);
-        if ($group->getChildType() == "EvaluationQuestion")
-            $numberofchildren = $group->getNumberChildren();
-        else
-            $numberofchildren = $this->tree->getNumKidsKids($this->itemID);
-
-        $group->delete();
-
-        if (!empty($group->isError)) {
-            return MessageBox::error(_("Fehler beim Löschen eines Block."));
-        }
-
-        if ($group->getChildType() == "EvaluationQuestion") {
-            if ($numberofchildren) {
-                $this->msg[$parentID] = "msg§" . sprintf(_("Der Fragenblock <b>%s</b> und alle darin enthaltenen Fragen (insgesamt %s) wurden gelöscht. "), $title, $numberofchildren);
-            } else {
-                $this->msg[$parentID] = "msg§" . sprintf(_("Der Fragenblock <b>%s</b> wurde gelöscht. "), $title);
-            }
-        } else {
-            if ($numberofchildren) {
-                $this->msg[$parentID] = "msg§" . sprintf(_("Der Gruppierungsblock <b>%s</b> und alle Unterblöcke (insgesamt %s) wurden gelöscht. "), $title, $numberofchildren);
-            } else {
-                $this->msg[$parentID] = "msg§" . sprintf(_("Der Gruppierungsblock <b>%s</b> wurde gelöscht. "), $title);
-            }
-        }
-
-        $this->changed = true;
-
-        $this->startItemID = $parentID;
-        $this->itemID = $parentID;
-
-        return true;
-    }
-
-    /**
-     * Creates a new Group and adds it to the tree
-     *
-     * @access   public
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandAddGroup()
-    {
-
-
-        $group = new EvaluationGroup();
-        $group->setTitle(NEW_ARRANGMENT_BLOCK_TITLE);
-        $group->setText("");
-
-        $mode = $this->getInstance($this->itemID);
-
-        if ($mode == ROOT_BLOCK) {
-            $this->tree->eval->addChild($group);
-            $this->tree->eval->save();
-            if (!empty($this->tree->eval->isError)) {
-                return MessageBox::error(_("Fehler beim Anlegen eines neuen Blocks."));
-            }
-            $this->msg[$this->itemID] = "msg§"
-                . _("Ein neuer Gruppierungsblock wurde angelegt.");
-        } elseif ($mode == ARRANGMENT_BLOCK) {
-            $parentgroup = &$this->tree->getGroupObject($this->itemID);
-            $parentgroup->addChild($group);
-            $parentgroup->save();
-            if (!empty($parentgroup->isError)) {
-                return MessageBox::error(_("Fehler beim Anlegen eines neuen Blocks."));
-            }
-            $this->msg[$this->itemID] = "msg§"
-                . _("Ein neuer Gruppierungsblock wurde angelegt.");
-        }
-
-        $this->execCommandUpdateItem();
-
-        return true;
-    }
-
-    /**
-     * adds a questions-group
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandAddQGroup()
-    {
-
-
-        $group = new EvaluationGroup();
-        $group->setTitle(NEW_QUESTION_BLOCK_BLOCK_TITLE);
-        $group->setText("");
-        $group->setChildType("EvaluationQuestion");
-        $group->setTemplateID(Request::option("templateID"));
-        $template = new EvaluationQuestion (Request::option("templateID"),
-            NULL, EVAL_LOAD_FIRST_CHILDREN);
-
-        $mode = $this->getInstance($this->itemID);
-
-        if ($mode == ROOT_BLOCK) {
-            $this->tree->eval->addChild($group);
-            $this->tree->eval->save();
-            if (!empty($this->tree->eval->isError)) {
-                return MessageBox::error(_("Fehler beim Anlegen eines neuen Blocks."));
-            }
-            $this->msg[$this->itemID] = "msg§"
-                . _("Ein neuer Fragenblock wurde angelegt.");
-        }// group
-        elseif ($mode == ARRANGMENT_BLOCK) {
-            $parentgroup =& $this->tree->getGroupObject($this->itemID);
-            $parentgroup->addChild($group);
-            $parentgroup->save();
-            if (!empty($parentgroup->isError)) {
-                return MessageBox::error(_("Fehler beim Anlegen eines neuen Blocks."));
-            }
-            if (Request::option("templateID") != "")
-                $this->msg[$this->itemID] = "msg§"
-                    . sprintf(_("Ein neuer Fragenblock mit der Antwortenvorlage <b>%s</b> wurde angelegt."),
-                        htmlReady($template->getText()));
-            else
-                $this->msg[$this->itemID] = "msg§"
-                    . sprintf(_("Ein neuer Fragenblock mit keiner Antwortenvorlage wurde angelegt."),
-                        1);
-        }
-        $this->execCommandUpdateItem();
-
-        return true;
-    }
-
-    /**
-     * Updates the templateID of a group
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandChangeTemplate()
-    {
-
-
-        $this->execCommandUpdateItem();
-
-        $group = &$this->tree->getGroupObject($this->itemID);
-        $group->setTemplateID(Request::option("templateID"));
-        $group->save();
-
-        if (!empty($group->isError)) {
-            return MessageBox::error(_("Fehler beim Zuordnen eines Templates."));
-        }
-
-        $templateID = $group->getTemplateID();
-        if ($templateID) {
-
-            $template = new EvaluationQuestion($templateID);
-            $templateTitle = htmlReady($template->getText());
-
-        } else
-            $templateTitle = NO_TEMPLATE_GROUP;
-
-        $this->msg[$this->itemID] = "msg§"
-            . sprintf(_("Die Vorlage <b>%s</b> wurde dem Fragenblock zugeordnet."),
-                $templateTitle);
-
-        return true;
-    }
-
-    /**
-     * Update the Question content
-     *
-     * @access  private
-     * @param boolean $no_delete YES/NO (optional)
-     * @return  string   the udpatemessage
-     */
-    function execCommandUpdateQuestions($no_delete = false)
-    {
-
-        $questions = Request::getArray('questions');
-        $deleteQuestions = Request::getArray('DeleteQuestions');
-
-        // remove any empty questions
-        $deletecount = 0;
-
-        $qgroup = &$this->tree->getGroupObject($this->itemID);
-        $questionsDB = $qgroup->getChildren();
-        $cmd = Request::optionArray('cmd');
-        if (!empty($cmd))
-            if (key($cmd) == "UpdateItem")
-                $delete_empty_questions = 1;
-
-        for ($i = 0; $i < count($questions); $i++) {
-
-            if (!isset($deleteQuestions[$i])) {
-                $question = new EvaluationQuestion($questions[$i]['questionID'], NULL,
-                    EVAL_LOAD_FIRST_CHILDREN);
-
-                // remove any empty questions
-                if ((empty($questions[$i]['text'])) && $delete_empty_questions) {
-
-                    $question->delete();
-                    $deletecount++;
-
-                    // upadate the questiontext to the db
-                } else {
-
-                    $question->setText($questions[$i]['text']);
-                    $question->save();
-                }
-            }
-        }
-        $msg = NULL;
-        if ($deletecount == 1)
-            $msg = _("Es wurde eine leere Frage entfernt.");
-        elseif ($deletecount > 1)
-            $msg = sprintf(_("Es wurden %s leere Fragen entfernt."), $deletecount);
-
-        return $msg;
-    }
-
-    /**
-     * Adds Questions
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandAddQuestions()
-    {
-
-        $addquestions = Request::get('newQuestionFields');
-
-        $qgroup = &$this->tree->getGroupObject($this->itemID);
-        $templateID = $qgroup->getTemplateID();
-
-        for ($i = 1; $i <= $addquestions; $i++) {
-            $template = new EvaluationQuestion ($templateID, NULL, EVAL_LOAD_FIRST_CHILDREN);
-            $newquestion = $template->duplicate();
-            $newquestion->setText("");
-            $qgroup->addChild($newquestion);
-            $qgroup->save();
-            if (!empty($qgroup->isError)) {
-                return MessageBox::error(_("Fehler beim Anlegen neuer Fragen."));
-            }
-        }
-
-        if ($addquestions == "1")
-            $this->msg[$this->itemID] = "msg§"
-                . _("Es wurde eine neue Frage hinzugefügt.");
-        else
-            $this->msg[$this->itemID] = "msg§"
-                . sprintf(_("Es wurden %s neue Fragen hinzugefügt."), $addquestions);
-
-        $this->execCommandUpdateItem(NO);
-
-        return true;
-    }
-
-    /**
-     * deletes questions
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandDeleteQuestions()
-    {
-
-        $questions = Request::getArray('questions');
-        $deleteQuestions = Request::getArray('DeleteQuestions');
-
-        $deletecount = 0;
-        for ($i = 0; $i < count($questions); $i++) {
-
-            $question = new EvaluationQuestion($questions[$i]['questionID'], NULL,
-                EVAL_LOAD_ALL_CHILDREN);
-
-            // remove any empty questions
-            if ($deleteQuestions[$i]) {
-                $question->delete();
-                $deletecount++;
-            }
-        }
-
-        if ($deletecount == "1")
-            $this->msg[$this->itemID] = "msg§"
-                . _("Es wurde eine Frage gelöscht.");
-        elseif ($deletecount > 1)
-            $this->msg[$this->itemID] = "msg§"
-                . sprintf(_("Es wurden %s Fragen gelöscht."), $deletecount);
-        else
-            $this->msg[$this->itemID] = "msg§"
-                . _("Es wurde keine Frage gelöscht.");
-
-        $this->execCommandUpdateItem();
-
-        return true;
-    }
-
-    /**
-     * creates an info-message and updates the item
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandQuestionAnswersCreate()
-    {
-
-        $this->execCommandUpdateItem();
-
-        // extract the questionID from the command
-        foreach ($_REQUEST as $key => $value) {
-            if (preg_match("/template_(.*)_button?/", $key, $command))
-                break;
-        }
-        if (preg_match("/(.*)_#(.*)/", $command[1], $command_parts))
-            $questionID = $command_parts[2];
-
-        $question = new EvaluationQuestion($questionID);
-        $questiontitle = htmlReady($question->getText());
-
-        $this->msg[$this->itemID] = "msg§"
-#           . sprintf(_("Sie können nun der Frage <b>%s</b> im rechten Bereich Antworten zuweisen.")
-#               , $questiontitle)
-#           . "<br>"
-            . _("Veränderungen wurden gespeichert.");
-
-        return true;
-    }
-
-    /**
-     * creates an confirm-message if answers were created
-     *
-     * @access   private
-     * @return   boolean  false
-     */
-    function execCommandQuestionAnswersCreated()
-    {
-
-        $id = $this->itemID;
-
-        $question = new EvaluationQuestion(Request::get("questionID"));
-        $title = htmlready($question->getTitle());
-
-        $this->msg[$this->itemID] = "msg§"
-            . sprintf(_("Der Frage <b>%s</b> wurden Antwortenmöglichkeiten zugewiesen."), $title);
-
-        $this->changed = true;
-
-        return false;
-    }
-
-    /**
-     * Moves a Questions
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandMoveQuestionUp()
-    {
-
-        $this->execCommandUpdateItem();
-
-        foreach ($_REQUEST as $key => $value) {
-            if (preg_match("/cmd_(.*)_#(.*)_§(.*)_button(_x)?/", $key, $command))
-                break;
-        }
-
-        $questionID = $command[2];
-        $oldposition = $command[3];
-
-        $this->swapPosition($this->itemID, $questionID, $oldposition,
-            "up");
-
-        if ($oldposition == 0)
-            $this->msg[$this->itemID] = "msg§"
-                . _("Die Frage wurde von Position 1 an die letzte Stelle verschoben.");
-        else
-            $this->msg[$this->itemID] = "msg§"
-                . sprintf(_("Die Frage wurde von Position %s nach oben verschoben."), $oldposition + 1);
-
-        $this->msg[$this->itemID] .= "<br>" . _("Veränderungen wurden gespeichert.");
-        return true;
-    }
-
-    /**
-     * Moves a Questions
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandMoveQuestionDown()
-    {
-
-        $this->execCommandUpdateItem();
-
-        foreach ($_REQUEST as $key => $value) {
-            if (preg_match("/cmd_(.*)_#(.*)_§(.*)_button(_x)?/", $key, $command))
-                break;
-        }
-
-        $questionID = $command[2];
-        $oldposition = $command[3];
-
-        $this->swapPosition($this->itemID, $questionID, $oldposition,
-            "down");
-
-        $this->msg[$this->itemID] = "msg§" . sprintf(
-            _("Die Frage wurde von Position %s nach unten verschoben."),
-            $oldposition + 1
-        );
-
-        $this->msg[$this->itemID] .= "<br>" . _("Veränderungen wurden gespeichert.");
-        return true;
-    }
-
-
-    public function execCommandMove()
-    {
-        $direction = Request::option('direction');
-
-        $group = &$this->tree->getGroupObject(Request::option('groupID'));
-        $oldposition = $group->getPosition();
-
-        $this->swapPosition($this->itemID, $group->objectID, $oldposition, $direction);
-
-        $this->msg[$this->itemID] = "msg§ ";
-        if (($this->itemID != ROOT_BLOCK)
-            && ($group->getChildType() == "EvaluationQuestion"))
-            $this->msg[$this->itemID] .= _("Fragenblock");
-        else
-            $this->msg[$this->itemID] .= _("Gruppierungsblock");
-
-        if (($oldposition == 0) && ($direction == "up"))
-            $this->msg[$this->itemID] .=
-                _(" wurde von Position 1 an die letzte Stelle verschoben.");
-        elseif (($oldposition == $group->getNumberChildren() - 1)
-            && ($direction == "down"))
-            $this->msg[$this->itemID] .=
-                sprintf(_(" wurde von Position %s an die erste Stelle verschoben.")
-                    , $oldposition + 1);
-        else
-            $this->msg[$this->itemID] .= (($direction == "up")
-                ? sprintf(_(" wurde von Position %s nach oben verschoben."), $oldposition + 1)
-                : sprintf(_(" wurde von Position %s nach unten verschoben."), $oldposition + 1));
-
-        $this->changed = true;
-
-        return true;
-    }
-
-    /**
-     * Moves a Group from one parent to another
-     *
-     * @access   private
-     * @return   boolean  true (reinits the tree)
-     */
-    function execCommandMoveGroup()
-    {
-
-
-        $moveGroupeID = Request::option('moveGroupeID');
-
-        if (!$this->moveItemID) {
-            $this->msg[$this->itemID] = "msg§"
-                . _("Fehler beim Verschieben eines Blocks. Es wurde kein Block zum verschieben ausgewählt.");
-            return false;
-        }
-
-        $mode = $this->getInstance($this->itemID);
-
-        if (!$mode) {
-            $this->msg[$this->itemID] = "msg§"
-                . _("Fehler beim Verschieben eines Blocks. Der Zielblock besitzt keinen Typ.");
-            return false;
-        }
-
-        $move_mode = $this->getInstance($this->moveItemID);
-
-        if (!$move_mode) {
-            $this->msg[$this->itemID] = "msg§"
-                . _("Fehler beim Verschieben eines Blocks. Der Zielblock besitzt keinen Typ.");
-            return false;
-        }
-
-        $move_group =& $this->tree->getGroupObject($this->moveItemID);
-        $move_group_title = htmlready($move_group->getTitle());
-        $oldparentID = $move_group->getParentID();
-
-        switch ($mode) {
-
-            case ROOT_BLOCK:
-
-                if ($children = $this->tree->eval->getChildren()) {
-                    if ($this->getInstance($children[0]->getObjectID()) != $move_mode) {
-                        $this->msg[$this->itemID] = "msg§"
-                            . _("Fehler beim Verschieben eines Blocks. Der ausgewählte Block und der Zielblock besitzen verschiedene Typen.");
-                        return false;
-                    }
-                }
-
-                $newgroup = $move_group->duplicate();
-
-                $this->tree->eval->addChild($newgroup);
-                $this->tree->eval->save();
-
-                if (($oldparentID == $this->evalID) || $oldparentID == "root") {
-
-                    $grouptodelete = $this->tree->eval->getChild($move_group->getObjectID());
-                    $grouptodelete->delete();
-                    $this->tree->eval->save();
-                    if (!empty($this->tree->eval->isError))
-                        return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                } else {
-
-                    $oldparentgroup = &$this->tree->getGroupObject($oldparentID);
-                    $grouptodelete = $oldparentgroup->getChild($move_group->getObjectID());
-                    $grouptodelete->delete();
-                    $oldparentgroup->save();
-                }
-
-                if (!empty($this->tree->eval->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($move_group->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($newgroup->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($grouptodelete->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-
-                $this->msg[$this->itemID] = "msg§"
-                    . sprintf(_("Der Block <b>%s</b> wurde in die Hauptebene verschoben."),
-                        $move_group_title);
-                break;
-
-            case ARRANGMENT_BLOCK:
-
-                $group = &$this->tree->getGroupObject($this->itemID);
-                if ($children = $group->getChildren()) {
-                    if ($this->getInstance($children[0]->getObjectID()) != $move_mode) {
-                        $this->msg[$this->itemID] = "msg§"
-                            . _("Fehler beim Verschieben eines Blocks. Der ausgewählte Block und der Zielblock besitzen verschiedene Typen.");
-                        return false;
-                    }
-                }
-                if ($oldparentID == $this->evalID) {
-                    $grouptodelete = $this->tree->eval->getChild($move_group->getObjectID());
-                    $grouptodelete->delete();
-                    $this->tree->eval->save();
-                    if (!empty($this->tree->eval->isError))
-                        return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                } else {
-
-                    $oldparentgroup = &$this->tree->getGroupObject($oldparentID);
-                    $grouptodelete = $oldparentgroup->getChild($move_group->getObjectID());
-                    $grouptodelete->delete();
-                    $oldparentgroup->save();
-                    if (!empty($oldparentgroup->isError))
-                        return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                }
-                $newgroup = $move_group->duplicate();
-
-                $group->addChild($newgroup);
-                $group->save();
-
-
-                if (!empty($group->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($move_group->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($newgroup->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($grouptodelete->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-
-
-                $this->msg[$this->itemID] = "msg§"
-                    . sprintf(_("Der Block <b>%s</b> wurde in diesen Gruppierungsblock verschoben."),
-                        $move_group_title);
-                break;
-
-            case QUESTION_BLOCK:
-
-                $group = &$this->tree->getGroupObject($this->itemID);
-
-                if ($children = $group->getChildren()) {
-                    if ($this->getInstance($children[0]->getObjectID()) != $move_mode) {
-                        $this->msg[$this->itemID] = "msg§"
-                            . _("Fehler beim Verschieben eines Blocks. Der ausgewählte Block und der Zielblock besitzen verschiedene Typen.");
-                        return false;
-                    }
-                }
-
-                $oldparentID = $move_group->getParentID();
-                if ($oldparentID == ROOT_BLOCK) {
-
-                    $this->msg[$this->itemID] = "msg§"
-                        . _("Fehler beim Verschieben eines Blocks. Ein Fragenblock kann nicht auf die oberste Ebene verschoben werden.");
-                    return false;
-                } elseif ($oldparentID == $this->evalID) {
-
-                    $this->msg[$this->itemID] = "msg§"
-                        . _("Fehler beim Verschieben eines Blocks. Ein Fragenblock kann nicht auf die oberste Ebene verschoben werden.");
-                    return false;
-                } else {
-
-                    $oldparent = &$this->tree->getGroupObject($oldparentID);
-                }
-
-                $newgroup = $move_group->duplicate();
-
-                $group->addChild($newgroup);
-                $group->save();
-
-                $grouptodelete = $oldparent->getChild($move_group->getObjectID());
-                $grouptodelete->delete();
-                $oldparent->save();
-
-
-                if (!empty($group->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($move_group->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($newgroup->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($grouptodelete->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-                if (!empty($oldparent->isError))
-                    return MessageBox::error(_("Fehler beim Verschieben eines Blocks."));
-
-                $this->msg[$this->itemID] = "msg§"
-                    . sprintf(_("Der Block <b>%s</b> wurde in diesen Fragenblock verschoben."),
-                        $move_group_title);
-
-                break;
-        }
-
-        $this->moveItemID = NULL;
-
-        $this->changed = true;
-
-        return true;
-    }
-
-# ##################################################### end: command functions #
-
-
-################################################################################
-#                                                                              #
-# HTML functions                                                               #
-#                                                                              #
-################################################################################
-
-    /**
-     * creates the html for the create new group options
-     *
-     * @access  private
-     *
-     * @param string $show the blocktyp to display
-     * @return  string         the buttons (html)
-     */
-    function createButtonbar($show = ARRANGMENT_BLOCK)
-    {
-
-        $infotext = _("Sie können ...") . "\n";
-
-        $table = new HTML ("table");
-        $table->addAttr("width", "100%");
-        $table->addAttr("class", "blank");
-        $table->addAttr("border", "0");
-        $table->addAttr("cellpadding", "6");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("div", "left");
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "steelgrau");
-        $td->addAttr("align", "center");
-
-        $seperator = "&nbsp;|&nbsp;&nbsp;";
-
-        // the update-button
-        $buttons = "&nbsp;"
-            . Button::create(_('Übernehmen'),
-                'cmd[UpdateItem]',
-                ['title' => _('Die Veränderungen innerhalb des Blockes speichern.')]);
-
-        $infotext .= "\n"
-            . _("- die Veränderungen dieses Blocks speichern.");
-
-        // the new group-button
-        if ($show == "both" || $show == ARRANGMENT_BLOCK || $show == ROOT_BLOCK) {
-            $buttons .= $seperator
-                . Button::create(_('Erstellen'),
-                    'cmd[AddGroup]',
-                    ['title' => _('Einen neuen Gruppierungsblock erstellen.')]);
-            $infotext .= "\n"
-                . _("- einen neuen Gruppierungsblock innerhalb dieses Blockes erstellen, in welchem Sie weitere Gruppierungs- oder Fragenblöcke anlegen können.");
-        }
-
-        // the new question-group-button
-        if ($show == "both" || $show == QUESTION_BLOCK) {
-
-            $buttons .= $seperator
-                . $this->createTemplateSelection()
-                . Button::create(_('Erstellen'),
-                    'cmd[AddQGroup]',
-                    ['title' => _('Einen neuen Fragenblock mit der ausgewählten Antwortenvorlage erstellen.')]);
-            $infotext .= "\n"
-                . _("- einen neuen Fragenblock innherhalb dieses Blockes erstellen. Geben Sie dazu bitte eine Antwortenvorlage an, welche für alle Fragen des neuen Fragenblockes verwendet wird.");
-        }
-
-        // the move-button
-        if ($this->itemID != ROOT_BLOCK && !$this->moveItemID) {
-
-            $a = new HTML ("a");
-            $a->addAttr("href",
-                URLHelper::getLink($this->getSelf("&moveItemID=" . $this->itemID)));
-
-            $img = new HTMLempty ("img");
-            $img->addAttr("border", "0");
-            $img->addAttr("style", "vertical-align:middle;");
-            $img->addAttr("src", EVAL_PIC_MOVE_BUTTON);
-            $img->addAttr("style", "vertical-align:middle;");
-            $img->addString(tooltip(_("Diesen Block verschieben.")));
-
-            $a->addContent($img);
-
-            $button = new HTMLempty ("input");
-            $button->addAttr("type", "image");
-            $button->addAttr("name", "&moveItemID=" . $this->itemID);
-            $button->addAttr("style", "vertical-align:middle;");
-            $button->addAttr("border", "0");
-            $button->addAttr("src", EVAL_PIC_MOVE_BUTTON);
-            $button->addString(Tooltip(_("Diesen Block verschieben.")));
-
-            $buttons .= $seperator
-                . Button::create(_('verschieben'),
-                    'create_moveItemID',
-                    ['title' => _('Diesen Block verschieben.')]);
-#       . $a->createContent ();
-            $infotext .= "\n"
-                . _("- diesen Block zum Verschieben markieren.");
-
-            $movebutton = 1;
-        }
-
-
-        // the delete-button
-        if ($this->itemID != ROOT_BLOCK) {
-            $button = new HTMLempty ("input");
-            $button->addAttr("type", "image");
-            $button->addAttr("name", "cmd[AssertDeleteItem]");
-            $button->addAttr("style", "vertical-align:middle;");
-            $button->addAttr("border", "0");
-            $button->addAttr("src", EVAL_PIC_DELETE_GROUP);
-            $button->addString(Tooltip(_("Diesen Block und alle seine Unterblöcke löschen.")));
-
-            $buttons .= ($movebutton)
-                ? "&nbsp;"
-                : $seperator;
-            $buttons .= Button::create(_('Löschen'),
-                'cmd[AssertDeleteItem]',
-                ['title' => _('Diesen Block (und alle seine Unterblöcke) löschen..')]);
-#   $buttons .= $button->createContent ();
-
-            $infotext .= "\n"
-                . _("- diesen Block und seine Unterblöcke löschen.");
-        }
-
-        // the abort-button
-        $child = $this->tree->eval->getNextChild();
-        $number_of_childs = $this->tree->eval->getNumberChildren();
-        if ($number_of_childs == 1 &&
-            $this->itemID == ROOT_BLOCK &&
-            $this->tree->eval->getTitle() == NEW_EVALUATION_TITLE &&
-            $this->tree->eval->getText() == "" &&
-            $child &&
-            $child->getTitle() == FIRST_ARRANGMENT_BLOCK_TITLE &&
-            $child->getChildren() == NULL &&
-            isset($child->getText) && $child->getText == "") {
-
-            $a_content = LinkButton::createCancel(_('Abbrechen'),
-                URLHelper::getURL(EVAL_FILE_ADMIN . "?evalID=") . $this->tree->eval->getObjectID() . "&abort_creation_button=1",
-                ['title' => _("Erstellung einer Evaluation abbrechen")]);
-
-            $buttons .= $seperator
-                . $a_content;
-            $infotext .= "\n"
-                . _("Die Erstellung dieser Evaluation abbrechen.");
-        }
-
-        $td->addHTMLContent(
-            $this->createImage(EVAL_PIC_HELP, $infotext));
-        $td->addHTMLContent($buttons);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-
-        return $table->createContent();
-    }
-
-    /**
-     * creates the html for the create new group options
-     *
-     * @access   private
-     * @param string $show
-     * @return   string the html
-     */
-    function createFormNew($show = ARRANGMENT_BLOCK)
-    {
-
-        $table = new HTML ("table");
-        $table->addAttr("width", "100%");
-        $table->addAttr("class", "blank");
-        $table->addAttr("border", "0");
-        $table->addAttr("cellpadding", "6");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("div", "left");
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "blank");
-        $td->addAttr("align", "center");
-        $td->addContent(new HTMLempty ("br"));
-
-#   $tr->addContent ($td);
-#   $table->addContent ($tr);
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "content_body");
-#   $td->addAttr ("class","steelgrau");
-        $td->addAttr("align", "center");
-
-        $img = new HTMLempty ("img");
-        $img->addAttr("src", Assets::image_path("blank.gif"));
-        $img->addAttr("width", "30");
-        $img->addAttr("height", "1");
-        $img->addAttr("alt", "");
-
-#   $td->addContent ($img);
-#   $td->addContent (new HTMLempty ("br"));
-
-
-        $group_selection = _("Gruppierungsblock")
-            . "&nbsp;"
-            . Button::create(_('Erstellen'),
-                'cmd[AddGroup]',
-                ['title' => _('Einen neuen Gruppierungsblock erstellen')]);
-
-        $qgroup_selection = _("Fragenblock mit")
-            . "&nbsp;"
-            . $this->createTemplateSelection()
-            . Button::create(_('Erstellen'),
-                'cmd[AddQGroup]',
-                ['title' => _('Einen neuen Fragenblock erstellen')]);
-
-        $seperator = "&nbsp;|&nbsp;";
-
-        switch ($show) {
-            case ARRANGMENT_BLOCK:
-                $td->addHTMLContent($group_selection);
-                break;
-            case QUESTION_BLOCK:
-                $td->addHTMLContent($qgroup_selection);
-                break;
-            case "both":
-                $td->addHTMLContent(
-                    $group_selection
-                    . $seperator
-                    . $qgroup_selection);
-                break;
-        }
-
-        // abort-button
-        $child = $this->tree->eval->getNextChild();
-        $number_of_childs = $this->tree->eval->getNumberChildren();
-        if ($number_of_childs == 1 &&
-            $this->itemID == ROOT_BLOCK &&
-            $this->tree->eval->getTitle() == _("Neue Evaluation") &&
-            $this->tree->eval->getText() == "" &&
-            $child &&
-            $child->getTitle() == _("Erster Gruppierungsblock") &&
-            $child->getChildren() == NULL &&
-            $child->getText == "") {
-
-
-            $cancel = $seperator . "&nbsp;";
-
-            $a_content = LinkButton::createCancel(_('Abbrechen'),
-                URLHelper::getURL(EVAL_FILE_ADMIN . "?evalID=" . $this->tree->eval->getObjectID() . "&abort_creation_button=1"),
-                ['title' => _("Erstellung einer Evaluation abbrechen")]);
-
-            $cancel .= $a_content;
-
-            $td->addHTMLContent($cancel);
-
-        }
-
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-
-        return $table->createContent();
-    }
-
-    /**
-     * creates the html for the title and text input
-     *
-     * @access   private
-     * @param string $mode
-     * @return   string the html
-     */
-    function createTitleInput($mode = ROOT_BLOCK)
-    {
-
-        switch ($mode) {
-
-            case ROOT_BLOCK:
-                $title_label = _("Titel der Evaluation");
-                $title = htmlReady($this->tree->eval->getTitle());
-                $text_label = _("Zusätzlicher Text");
-                $text = wysiwygReady($this->tree->eval->getText());
-                break;
-
-            case ARRANGMENT_BLOCK:
-                $title_label = _("Titel des Gruppierungsblocks");
-                $group =  &$this->tree->getGroupObject($this->itemID);
-                $title = htmlReady($group->getTitle());
-                $text_label = _("Zusätzlicher Text");
-                $text = wysiwygReady($group->getText());
-                break;
-
-            case QUESTION_BLOCK:
-                $title_label = _("Titel des Fragenblocks");
-                $title_info = _("Die Angabe des Titels ist bei einem Fragenblock optional.");
-                $group =  &$this->tree->getGroupObject($this->itemID);
-                $title = htmlReady($group->getTitle());
-                $text_label = _("Zusätzlicher Text");
-                $text = wysiwygReady($group->getText());
-                break;
-        }
-        $text_info = _("Die Angabe des zusätzlichen Textes ist optional.");
-
-        $table = new HTML ("table");
-        $table->addAttr("width", "98%");
-        $table->addAttr("border", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("cellpadding", "0");
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr('colspan', '2');
-        $label = new HTML('label');
-        $label->addContent($title_label);
-        if ($mode == QUESTION_BLOCK)
-            $label->addHTMLContent($this->createImage(EVAL_PIC_HELP, $title_info));
-
-
-        $input = new HTMLempty ("input");
-        $input->addAttr("type", "text");
-        $input->addAttr("name", "title");
-        $input->addString("value=\"" . $title . "\"");
-        $input->addAttr("size", "60");
-        $input->addAttr("style", "vertical-align:middle; width: 100%;");
-
-        $label->addContent($input);
-
-        $td->addContent($label);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr('colspan', '2');
-
-        $label = new HTML('label');
-        $label->addContent($text_label);
-        $label->addHTMLContent($this->createImage(EVAL_PIC_HELP, $text_info));
-
-        $textarea = "<br><textarea class=\"wysiwyg\" name=\"text\" rows=\"4\" "
-            . "style=\"vertical-align:top; width: 100%;\">";
-        $textarea .= ($text)
-            ? $text
-            : "";
-        $textarea .= "</textarea>";
-
-        $label->addHTMLContent($textarea);
-        $label->setTextareaCheck();
-
-        $td->addContent($label);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        return $table->createContent();
-    }
-
-    /**
-     * creates the html for the update button
-     *
-     * @access  private
-     * @param string $mode
-     * @return  string  the html
-     */
-    function createUpdateButton($mode = NULL)
-    {
-
-        $button = "<table width=\"100%\" border=\"0\" cellpadding=\"2\" "
-            . "cellspacing=\"2\">\n"
-            . " <tr>\n"
-            . "  <td align=center>\n"
-//      . "   <input type=hidden name=\"cmd\" value=\"UpdateItem\">\n"
-            . Button::create(_('Übernehmen'),
-                'cmd[UpdateItem]',
-                ['title' => _('Änderungen übernehmen.')]);
-
-        if ($mode == NULL) {
-            $button .= "&nbsp;&nbsp;|&nbsp;&nbsp;" . _("Diesen Block") . "&nbsp;"
-                . Button::create(_('Löschen'),
-                    'cmd[AssertDeleteItem]',
-                    ['title', _('Diesen Block und alle seine Unterblöcke löschen.')]);
-        }
-
-        $button .= "  </td>\n"
-            . " </tr>\n"
-//      . " </form></tr>\n"
-            . "</table>\n";
-        return $button;
-    }
-
-    /**
-     * creates the html for the global features-input
-     *
-     * @access   private
-     * @return   string the html
-     */
-    function createGlobalFeatures()
-    {
-
-        $table = new HTML ("table");
-        $table->addAttr("width", "99%");
-        $table->addAttr("border", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("cellspacing", "2");
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "table_row_odd");
-        $td->addAttr("colspan", "2");
-
-        $b = new HTML ("b");
-        $b->addContent(_("Globale Eigenschaften"));
-
-        $td->addContent($b);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr('colspan', '2');
-
-        $div = new HTML('div');
-        $div->addContent(_("Die Auswertung der Evaluation läuft"));
-
-        $td->addContent($div);
-
-        $section = new HTML('section');
-        $section->addAttr('class', 'hgroup');
-
-        $l1 = new HTML('label');
-        $input = new HTMLempty ("input");
-        $input->addAttr("type", "radio");
-        $input->addAttr("value", "1");
-        $input->addAttr("name", "anonymous");
-        if ($this->tree->eval->isAnonymous())
-            $input->addAttr("checked", "checked");
-        $l1->addContent($input);
-        $l1->addContent(_("anonym"));
-
-        $l2 = new HTML('label');
-        $input2 = new HTMLempty ("input");
-        $input2->addAttr("type", "radio");
-        $input2->addAttr("value", "0");
-        $input2->addAttr("name", "anonymous");
-        if (!$this->tree->eval->isAnonymous())
-            $input2->addAttr("checked", "checked");
-        $l2->addContent($input2);
-        $l2->addContent(_("personalisiert"));
-
-        $section->addContent($l1);
-        $section->addContent($l2);
-
-        $td->addContent($section);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        return $table->createContent();
-    }
-
-    /**
-     * creates the html for the global features-input
-     *
-     * @access   private
-     * @return   string the html
-     */
-    function createQuestionFeatures()
-    {
-
-        $group = &$this->tree->getGroupObject($this->itemID);
-        $templateID = $group->getTemplateID();
-
-        if ($templateID) {
-            $template = new EvaluationQuestion($templateID);
-            $templateTitle = htmlReady($template->getText());
-        } else
-            $templateTitle = NO_TEMPLATE_GROUP;//_("keine Vorlage");
-
-        if ($templateTitle == "")
-            $templateTitle = NO_TEMPLATE;
-
-        $table = new HTML ("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "0");
-        $table->addAttr("width", "98%");
-//    $table->addAttr ("style", "border:5px solid white;");
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "table_row_odd");
-        $td->addAttr("colspan", "2");
-
-        $b = new HTML ("b");
-        $b->addContent(_("Eigenschaften"));
-        $b->addContent(":");
-
-        $td->addContent($b);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("style", "border-bottom:0px dotted black;");
-        $td->addContent(_("Die Fragen dieses Blocks müssen beantwortet werden (Pflichtfelder):"));
-
-        $tr->addContent($td);
-
-        $td = new HTML ("td");
-        $td->addAttr("style", "border-bottom:0px dotted black;");
-
-        $input = new HTMLempty ("input");
-        $input->addAttr("type", "radio");
-        $input->addAttr("value", "0");
-        $input->addAttr("name", "mandatory");
-        if (!$group->isMandatory()) $input->addAttr("checked", "checked");
-
-        $td->addContent($input);
-        $td->addContent(_("nein"));
-        $td->addContent(new HTMLempty ("br"));
-
-        $input = new HTMLempty ("input");
-        $input->addAttr("type", "radio");
-        $input->addAttr("value", "1");
-        $input->addAttr("name", "mandatory");
-        if ($group->isMandatory()) $input->addAttr("checked", "checked");
-
-        $td->addContent($input);
-        $td->addContent(_("ja"));
-
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("style", "border-bottom:0px dotted black;");
-        $td->addHTMLContent(sprintf(_("Diesem Fragenblock ist die Antwortenvorlage <b>%s</b> zugewiesen."),
-            $templateTitle));
-        $text = _("Das Zuweisen einer Antwortenvorlage ändert alle Antwortenmöglichkeiten der Fragen dieses Fragenblocks.");
-        if ($templateTitle == NO_TEMPLATE_GROUP)
-            $text .= " " . _("Da dieser Fragenblock keine Antwortenvorlage benutzt, würde ein Zuweisen einer Antwortenvorlage zum Verlust aller eingegebenen Antworten führen.");
-
-        $td->addHTMLContent($this->createImage(EVAL_PIC_HELP,
-            $text));
-
-        $tr->addContent($td);
-
-        $td = new HTML ("td");
-        $td->addAttr("style", "border-bottom:0px dotted black;");
-        $td->addAttr("nowrap", "nowrap");
-        $td->addHTMLContent($this->createTemplateSelection($templateID));
-        $td->addContent(" ");
-        $td->addHTMLContent(Button::create(_('Zuweisen'),
-            'cmd[ChangeTemplate]',
-            ['title' => _('Eine andere Antwortenvorlage für diesen Fragenblock auswählen')]));
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        return $table->createContent();
-    }
-
-    /**
-     * creates the html for the question-input
-     *
-     * @access   private
-     * @return   string the html
-     */
-    function createQuestionForm()
-    {
-
-        $qgroup = &$this->tree->getGroupObject($this->itemID);
-        $questions = $qgroup->getChildren();
-        $templateID = $qgroup->getTemplateID();
-
-        $table = new HTML ("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("width", "98%");
-
-        $tr = new HTML ("tr");
-
-        $td = new HTML ("td");
-        $td->addAttr("align", "center");
-
-        $table2 = new HTML ("table");
-        $table2->addAttr("border", "0");
-        $table2->addAttr("class", "blank");
-        $table2->addAttr("cellspacing", "0");
-        $table2->addAttr("cellpadding", "0");
-        $table2->addAttr("width", "100%");
-
-        // captions
-        $tr2 = new HTML ("tr");
-
-        $showclass = "table_row_odd";
-
-        $td2 = new HTML ("td");
-        $td2->addAttr("class", $showclass);
-        $td2->addAttr("align", "center");
-        $td2->addAttr("width", "15");
-
-        $b = new HTML ("b");
-        $b->addContent("#");
-
-        $td2->addContent($b);
-        $tr2->addContent($td2);
-
-        $td2 = new HTML ("td");
-        $td2->addAttr("class", $showclass);
-
-        $b = new HTML ("b");
-        $b->addContent(_("Frage"));
-
-        $td2->addContent($b);
-        $tr2->addContent($td2);
-
-        $td2 = new HTML ("td");
-        $td2->addAttr("class", $showclass);
-
-        if (count($questions) > 1) {
-            $b = new HTML ("b");
-            $b->addContent(_("Position"));
-
-            $td2->addContent($b);
-
-        } else {
-
-            $td2->addContent("");
-
-        }
-
-        $tr2->addContent($td2);
-
-        $td2 = new HTML ("td");
-        $td2->addAttr("class", $showclass);
-
-        $b = new HTML ("b");
-        $b->addContent(_("Löschen"));
-
-        $td2->addContent($b);
-        $tr2->addContent($td2);
-
-        // only if template is NO_TEMPLATE_GROUP
-        if ($templateID == NULL) {
-            $td2 = new HTML ("td");
-            $td2->addAttr("class", $showclass);
-
-            $b = new HTML ("b");
-            $b->addContent(_("Antworten"));
-
-            $td2->addContent($b);
-            $tr2->addContent($td2);
-        }
-
-        $table2->addContent($tr2);
-
-        $i = 0;
-        foreach ($questions as $question) {
-            $tr2 = new HTML ("tr");
-
-            // brrr :)
-            // extract the questionID from the command
-            foreach ($_REQUEST as $key => $value) {
-                if (preg_match("/template_(.*)_button?/", $key, $command))
-                    break;
-            }
-            if (isset($command[1]) && preg_match("/(.*)_#(.*)/", $command[1], $command_parts))
-                $questionID = $command_parts[2];
-            else
-                $questionID = Request::submitted('template_save2_button') ? "" : Request::get("template_id");
-
-            if ($question->getObjectID() == $questionID)
-                $tr2->addAttr("class", "eval_highlight");
-            else
-                $tr2->addAttr("class", ($i % 2 == 1 ? "table_row_odd" : "table_row_even"));
-
-            $td2 = new HTML ("td");
-            $td2->addAttr("align", "center");
-
-            $font = new HTML ("font");
-            $font->addAttr("size", "-1");
-            $font->addContent(($i + 1) . ".");
-
-            $td2->addContent($font);
-            $tr2->addContent($td2);
-
-            $td2 = new HTML ("td");
-            $td2->addAttr("align", "left");
-
-            $input = new HTMLempty ("input");
-            $input->addAttr("type", "tex");
-            $input->addAttr("size", "70");
-            $input->addAttr("name", "questions[$i][text]");
-            $input->addAttr("value", $question->getText());
-            $input->addAttr("tabindex", 3 + $i);
-
-            $td2->addContent($input);
-#   $td2->addHTMLContent ("POST: -".$question->getPosition()."-!");
-
-            $input = new HTMLempty ("input");
-            $input->addAttr("type", "hidden");
-            $input->addAttr("name", "questions[$i][questionID]");
-            $input->addAttr("value", $question->getObjectID());
-
-            $td2->addContent($input);
-
-            $input = new HTMLempty ("input");
-            $input->addAttr("type", "hidden");
-            $input->addAttr("name", "questions[$i][position]");
-            $input->addAttr("value", $question->getPosition());
-
-            $td2->addContent($input);
-
-            $input = new HTMLempty ("input");
-            $input->addAttr("type", "hidden");
-            $input->addAttr("name", "questions[$i][counter]");
-            $input->addAttr("value", $question->getPosition());
-
-            $td2->addContent($input);
-
-            $tr2->addContent($td2);
-
-            // move-up/down arrows and counter
-            if (count($questions) > 1) {
-
-                $numberchildren = $qgroup->getNumberChildren();
-
-                if ($question->getPosition() == 0)
-                    $tooltipup = _("Diese Frage mit der letzten Frage vertauschen.");
-                else
-                    $tooltipup = _("Diese Frage eine Position nach oben verschieben.");
-
-                if ($question->getPosition() == $numberchildren - 1)
-                    $tooltipdown = _("Diese Frage mit der ersten Frage vertauschen.");
-                else
-                    $tooltipdown = _("Diese Frage eine Position nach unten verschieben.");
-
-                $td2 = new HTML ("td");
-                $td2->addAttr("align", "center");
-
-                $button = new HTMLempty ("input");
-                $button->addAttr("type", "image");
-                $button->addAttr("name", "cmd_MoveQuestionUp_#" . $question->getObjectID() . "_§" . $question->getPosition() . "_button");
-                $button->addAttr("style", "vertical-align:middle;");
-                $button->addAttr("border", "0");
-                $button->addAttr("src", EVAL_PIC_MOVE_UP);
-                $button->addString(Tooltip($tooltipup));
-
-                $td2->addContent($button);
-
-                $button = new HTMLempty ("input");
-                $button->addAttr("type", "image");
-                $button->addAttr("name", "cmd_MoveQuestionDown_#" . $question->getObjectID() . "_§" . $question->getPosition() . "_button");
-                $button->addAttr("style", "vertical-align:middle;");
-                $button->addAttr("border", "0");
-                $button->addAttr("src", EVAL_PIC_MOVE_DOWN);
-                $button->addString(Tooltip($tooltipdown));
-
-                $td2->addContent($button);
-
-            } else {
-
-                $td2 = new HTML ("td");
-                $td2->addAttr("align", "center");
-                $td2->addContent(" ");
-            }
-
-            $tr2->addContent($td2);
-
-            $td2 = new HTML ("td");
-            $td2->addAttr("align", "center");
-
-            $input = new HTMLempty ("input");
-            $input->addAttr("type", "checkbox");
-            $input->addAttr("id", "deleteCheckboxes");
-            $input->addAttr("name", "DeleteQuestions[" . $question->getPosition() . "]");
-
-            $td2->addContent($input);
-            $tr2->addContent($td2);
-
-            // if template is NO_TEMPLATE_GROUP
-            if ($templateID == NULL) {
-
-                // hat noch keine antworten
-                if ($question->getChildren() == NULL) {
-                    $image = EVAL_PIC_CREATE_ANSWERS;
-                    $text = _("Dieser Frage wurden noch keine Antwortenmöglichkeiten zugewiesen. Drücken Sie auf den Doppelfpeil, um dies jetzt zu tun.");
-                    $tooltip = tooltip(_("Dieser Frage Antwortenmöglichkeiten zuweisen."));
-                } else {
-                    $image = EVAL_PIC_EDIT_ANSWERS;
-                    $text = _("Dieser Frage wurden bereits folgende Antwortenmöglichkeiten zugewiesen:")
-                        . " ";
-                    $tooltip = tooltip(_("Die zugewiesenen Antwortenmöglichkeiten bearbeiten."));
-                    $text .= "\n";
-                    while ($answer = $question->getNextChild()) {
-                        $text .= "\"" . $answer->getText() . "\"\n ";
-                    }
-                    $text .= "";
-                }
-
-                $td2 = new HTML ("td");
-                $td2->addAttr("align", "center");
-                $td2->addAttr("valign", "middle");
-                $td2->addHTMLContent(
-                    $this->createImage(EVAL_PIC_HELP, $text));
-
-                $questionID = $question->getObjectID();
-
-                $button = new HTMLempty ("input");
-                $button->addAttr("type", "image");
-                $button->addAttr("name", "template_create_question_answers_#" . $questionID . "_button");
-                $button->addAttr("style", "vertical-align:middle;");
-                $button->addAttr("border", "0");
-                $button->addAttr("src", $image);
-                $button->addString($tooltip);
-
-                $td2->addContent($button);
-
-
-                $tr2->addContent($td2);
-            }
-
-            $table2->addContent($tr2);
-            $i++;
-        }
-
-        if (sizeof($questions) == 0) {
-
-            $tr2 = new HTML ("tr");
-            $td2->addAttr("class", "table_row_even");
-
-            $td2 = new HTML ("td");
-            $td2->addAttr("align", "center");
-            $td2->addContent(" ");
-
-            $tr2->addContent($td2);
-
-            $td2 = new HTML ("td");
-            $td2->addContent(_("Dieser Block besitzt keine Fragen."));
-
-            $tr2->addContent($td2);
-
-            $td2 = new HTML ("td");
-            $td2->addContent(" ");
-
-            $tr2->addContent($td2);
-
-            $td2 = new HTML ("td");
-            $td2->addContent(" ");
-
-            $tr2->addContent($td2);
-            $table2->addContent($tr2);
-        }
-
-        $td->addContent($table2);
-
-        // the new questions und delete questions buttons
-        $table2 = new HTML ("table");
-        $table2->addAttr("width", "100%");
-        $table2->addAttr("border", "0");
-        $table2->addAttr("class",
-            ($i % 2 == 6)
-                ? "content_body"
-                : "content_body");
-        $table2->addAttr("cellspacing", "0");
-        $table2->addAttr("cellpadding", "2");
-
-        // buttons
-        $tr2 = new HTML ("tr");
-
-        $td2 = new HTML ("td");
-        $td2->addAttr("align", "left");
-
-        $select = new HTML ("select");
-        $select->addAttr("style", "vertical-align:middle;");
-        $select->addAttr("name", "newQuestionFields");
-        $select->addAttr("size", "1");
-
-        for ($i = 1; $i <= 10; $i++) {
-
-            $option = new HTML ("option");
-            $option->addAttr("value", $i);
-            $option->addContent($i);
-
-            $select->addContent($option);
-        }
-
-        $td2->addContent($select);
-        $td2->addContent(_("Frage/en"));
-        $td2->addContent(" ");
-        $td2->addHTMLContent(
-            Button::create(_('Hinzufügen'),
-                'cmd[AddQuestions]',
-                ['title' => _('Fragen hinzufügen')])
-        );
-
-        $tr2->addContent($td2);
-
-        $td2 = new HTML ("td");
-        $td2->addAttr("align", "right");
-
-        $font = new HTML ("font");
-        $font->addAttr("size", "-1");
-        $font->addContent(_("markierte Fragen "));
-
-        $td2->addContent($font);
-        $td2->addHTMLContent(
-            Button::create(_('Löschen'),
-                'cmd[DeleteQuestions]',
-                ['title' => _('Markierte Fragen löschen')])
-        );
-
-        $tr2->addContent($td2);
-        $table2->addContent($tr2);
-
-        $td->addContent($table2);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        return $table->createContent();
-    }
-# ######################################################## end: HTML functions #
-
-
-################################################################################
-#                                                                              #
-# additional HTML functions                                                    #
-#                                                                              #
-################################################################################
-
-    /**
-     * creates a link-image
-     *
-     * @access  private
-     * @param string $pic the image
-     * @param string $alt the alt-text (optional)
-     * @param string $value the value (optional)
-     * @param boolean $tooltip display as tooltip? (optional)
-     * @param string $args additional options (optional)
-     * @param boolean $self get self? (optional)
-     * @return  string             the image with a link (html)
-     */
-    function createLinkImage($pic,
-                             $alt = "",
-                             $value = "",
-                             $tooltip = true,
-                             $args = NULL,
-                             $self = true)
-    {
-
-        $a = new HTML ("a");
-        $a->addAttr("href", URLHelper::getLink($this->getSelf($value)));
-
-        $img = new HTMLempty ("img");
-        $img->addAttr("src", $pic);
-        $img->addAttr("border", "0");
-        $img->addAttr("style", "vertical-align:middle;");
-        if ($tooltip)
-            $img->addString(tooltip($alt, TRUE, TRUE));
-        else
-            $img->addAttr("alt", $alt);
-        if ($args)
-            $img->addString($args);
-
-        $a->addContent($img);
-
-        return $a->createContent();
-    }
-
-
-    /**
-     * creates an image
-     *
-     * @access  private
-     * @param string $pic the image
-     * @param string $alt the alt-text (optional)
-     * @param string $args additional options (optional)
-     * @return  string          the image (html)
-     */
-    function createImage($pic,
-                         $alt = "",
-                         $args = NULL)
-    {
-
-        if (!isset($args['alt'])) {
-            $args['alt'] = $alt;
-            $args['title'] = $alt;
-        }
-
-        $args['border'] = 0;
-        $args['style'] = "vertical-align:middle;";
-
-        $img = new HTMLempty ("img");
-        $img->addString(tooltip($alt, TRUE, TRUE));
-        $img->addAttr("src", $pic);
-        $img->addAttr("border", "0");
-        $img->addAttr("style", "vertical-align:middle;");
-        if (empty($args)) {
-            $img->addAttr("alt", $alt);
-            $img->addAttr("title", $alt);
-        } else
-            $img->addString($alt);
-        if ($args) ;
-        $img->addString($args);
-
-        return $img->createContent();
-    }
-
-
-    /**
-     * creates an td with an image
-     *
-     * @access  private
-     * @param string $pic the image
-     * @return  string        the image
-     */
-    function createLevelOutputTD($pic = "forumleer.gif")
-    {
-        $td = new HTML ("td");
-        $td->addAttr("class", "blank");
-        $td->addAttr("background", Assets::image_path($pic));
-
-        $img = new HTMLempty ("img");
-        $img->addAttr("width", "10");
-        $img->addAttr("height", "20");
-        $img->addAttr("src", Assets::image_path($pic));
-
-        $td->addContent($img);
-
-        return $td->createContent();
-    }
-
-
-    /**
-     * creates the template selection
-     *
-     * @access  private
-     * @param string $selected the entry to be preselected (optional)
-     * @return  string             the html
-     */
-    function createTemplateSelection($selected = NULL)
-    {
-        global $user;
-
-        $question_show = new EvaluationQuestionDB();
-        $arrayOfTemplateIDs = $question_show->getTemplateID($user->id);
-        $arrayOfPolTemplates = [];
-        $arrayOfSkalaTemplates = [];
-        $arrayOfNormalTemplates = [];
-        $arrayOfFreetextTemplates = [];
-
-        if (is_array($arrayOfTemplateIDs)) {
-            foreach ($arrayOfTemplateIDs as $templateID) {
-                $question = new EvaluationQuestion ($templateID, NULL,
-                    EVAL_LOAD_FIRST_CHILDREN);
-                $question->load();
-                $questiontyp = $question->getType();
-
-                $questiontext = $question->getText();
-
-                if ($question->getParentID() == '0')
-                    $questiontext .= " " . EVAL_ROOT_TAG;
-
-
-                switch ($questiontyp) {
-
-                    case EVALQUESTION_TYPE_POL:
-                        array_push($arrayOfPolTemplates, [$question->getObjectID(),
-                            ($questiontext)]);
-                        break;
-
-                    case EVALQUESTION_TYPE_LIKERT:
-                        array_push($arrayOfSkalaTemplates, [$question->getObjectID(),
-                            ($questiontext)]);
-                        break;
-
-                    case EVALQUESTION_TYPE_MC:
-                        $answer = $question->getNextChild();
-                        if ($answer && $answer->isFreetext())
-                            array_push($arrayOfFreetextTemplates, [
-                                $question->getObjectID(),
-                                ($questiontext)]);
-                        else
-                            array_push($arrayOfNormalTemplates, [
-                                $question->getObjectID(),
-                                ($questiontext)]);
-                        break;
-                }
-            }
-
-        } // End:  if (is_array ($arrayOfTemplateIDs))
-
-
-        $select = new HTML ("select");
-        $select->addAttr("name", "templateID");
-        $select->addAttr("style", "vertical-align:middle; max-width: 250px;");
-
-        $option = new HTML ("option");
-        $option->addAttr("value", "");
-        $option->addContent(NO_TEMPLATE_GROUP);
-
-        $select->addContent($option);
-
-
-        if (!empty($arrayOfPolTemplates) && is_array($arrayOfPolTemplates)) {
-
-            $optgroup = new HTML ("optgroup");
-            $optgroup->addAttr("label", _("Polskalen:"));
-
-            foreach ($arrayOfPolTemplates as $template) {
-                $option = new HTML ("option");
-                $option->addAttr("value", $template[0]);
-                if ($template[0] == $selected)
-                    $option->addAttr("selected", "selected");
-                $option->addHTMLContent($template[1]);
-                $optgroup->addContent($option);
-            }
-
-            $select->addContent($optgroup);
-
-        }
-
-
-        if (!empty($arrayOfSkalaTemplates) && is_array($arrayOfSkalaTemplates)) {
-
-            $optgroup = new HTML ("optgroup");
-            $optgroup->addAttr("label", _("Likertskalen:"));
-
-            foreach ($arrayOfSkalaTemplates as $template) {
-                $option = new HTML ("option");
-                $option->addAttr("value", $template[0]);
-                if ($template[0] == $selected)
-                    $option->addAttr("selected", "selected");
-                $option->addContent($template[1]);
-                $optgroup->addContent($option);
-            }
-
-            $select->addContent($optgroup);
-
-        }
-
-
-        if (!empty($arrayOfNormalTemplates) && is_array($arrayOfNormalTemplates)) {
-
-            $optgroup = new HTML ("optgroup");
-            $optgroup->addAttr("label", _("Multiple Choice:"));
-
-            foreach ($arrayOfNormalTemplates as $template) {
-                $option = new HTML ("option");
-                $option->addAttr("value", $template[0]);
-                if ($template[0] == $selected)
-                    $option->addAttr("selected", "selected");
-                $option->addContent($template[1]);
-                $optgroup->addContent($option);
-            }
-
-            $select->addContent($optgroup);
-
-        }
-
-
-        if (!empty($arrayOfFreetextTemplates) && is_array($arrayOfFreetextTemplates)) {
-
-            $optgroup = new HTML ("optgroup");
-            $optgroup->addAttr("label", _("Freitextantworten:"));
-
-            foreach ($arrayOfFreetextTemplates as $template) {
-                $option = new HTML ("option");
-                $option->addAttr("value", $template[0]);
-                if ($template[0] == $selected)
-                    $option->addAttr("selected", "selected");
-                $option->addContent($template[1]);
-                $optgroup->addContent($option);
-            }
-
-            $select->addContent($optgroup);
-
-        }
-
-        return $select->createContent();
-
-    }
-
-# ############################################# end: additional HTML functions #
-
-
-################################################################################
-#                                                                              #
-# additional functions                                                         #
-#                                                                              #
-################################################################################
-
-    /**
-     * detects the type of an object by its itemID
-     *
-     * @access  private
-     * @param string $itemID
-     * @return  string  the insctance of an object
-     */
-    function getInstance($itemID)
-    {
-
-        if ($itemID == ROOT_BLOCK || $itemID == $this->evalID)
-            return ROOT_BLOCK;
-        else {
-            $tree = TreeAbstract::GetInstance("EvaluationTree", ['evalID' => $this->evalID,
-                'load_mode' => EVAL_LOAD_FIRST_CHILDREN]);
-            $group = &$tree->getGroupObject($itemID);
-            $childtype = $group->getChildType();
-
-            if ($childtype == "EvaluationQuestion")
-                return QUESTION_BLOCK;
-            else
-                return ARRANGMENT_BLOCK;
-        }
-    }
-
-
-    /**
-     * swaps positions of two objects
-     *
-     * @access  private
-     * @param string $parentID the parentID
-     * @param string $objectID the object to swap
-     * @param string $oldposition the old position
-     * @param string $direction the direction to swap
-     */
-    function swapPosition($parentID,
-                          $objectID,
-                          $oldposition,
-                          $direction)
-    {
-
-        if ($parentID == ROOT_BLOCK) $group = $this->tree->eval;
-        else $group =  &$this->tree->getGroupObject($parentID);
-
-        $numberchildren = $group->getNumberChildren();
-
-        if ($direction == "up") {
-            if ($oldposition == 0)
-                $newposition = $numberchildren - 1;
-            else
-                $newposition = $oldposition - 1;
-        } else {
-            if ($oldposition == $numberchildren - 1)
-                $newposition = 0;
-            else
-                $newposition = $oldposition + 1;
-        }
-
-        while ($swapitem = $group->getNextChild()) {
-            if ($swapitem->getPosition() == $newposition) {
-                $swapitem->setPosition($oldposition);
-                $swapitem->save();
-            }
-        }
-        if (($parentID != ROOT_BLOCK) &&
-            $group->getChildType() == "EvaluationQuestion")
-            $object = new EvaluationQuestion ($objectID);
-        else
-            $object = &$this->tree->getGroupObject($objectID);
-        $object->setPosition($newposition);
-        $object->save();
-
-        if (!empty($swapitem->isError)) {
-            return MessageBox::error(_("Fehler beim verschieben."));
-        }
-        if (!empty($object->isError)) {
-            return MessageBox::error(_("Fehler beim verschieben."));
-        }
-    }
-}
diff --git a/lib/evaluation/classes/EvaluationTreeShowUser.class.php b/lib/evaluation/classes/EvaluationTreeShowUser.class.php
deleted file mode 100644
index e999cb5..0000000
--- a/lib/evaluation/classes/EvaluationTreeShowUser.class.php
+++ /dev/null
@@ -1,539 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once HTML;
-# ====================================================== end: including files #
-
-# Define constants ========================================================== #
-
-/**
- * The number of pixels by which each sub-group is indented.
- * @const INDENT_PIXELS
- * @access private
- */
-define("INDENT_PIXELS", 5);
-
-# ===================================================== end: define constants #
-
-
-/**
- * Class to print out html representation of an evaluation's tree
- * for the participation page
- * (based on /lib/classes/TreeView.class)
- *
- * @author  mcohrs <michael A7 cohrs D07 de>
- * @copyright   2004 Stud.IP-Project
- * @access  public
- * @package     evaluation
- * @modulegroup evaluation_modules
- */
-class EvaluationTreeShowUser
-{
-
-    /**
-     * Reference to the tree structure
-     *
-     * @access  private
-     * @var object EvaluationTree $tree
-     */
-    var $tree;
-
-    /**
-     * contains the item with the current html anchor (currently unused)
-     *
-     * @access  public
-     * @var string $anchor
-     */
-    var $anchor;
-
-    /**
-     * the item to start with
-     *
-     * @access  private
-     * @var string $start_item_id
-     */
-    var $start_item_id;
-
-
-    /**
-     * constructor
-     * @access public
-     * @param string  the eval's ID
-     */
-    public function __construct($evalID)
-    {
-
-        $this->tree = TreeAbstract::GetInstance("EvaluationTree", ['evalID' => $evalID,
-            'load_mode' => EVAL_LOAD_ALL_CHILDREN]);
-
-    }
-
-
-    /**
-     * prints out the tree beginning with a given item
-     *
-     * @access  public
-     * @param string  ID of the start item, shouldnt be needed.
-     */
-    public function showTree($item_id = "root")
-    {
-        $items = [];
-
-        if (!is_array($item_id)) {
-            $items[0] = $item_id;
-            $this->start_item_id = $item_id;
-        } else {
-            $items = $item_id;
-        }
-
-        $num_items = count($items);
-        for ($j = 0; $j < $num_items; ++$j) {
-
-            $this->printLevelOutput($items[$j]);
-            $this->printItemOutput($items[$j]);
-
-            if ($this->tree->hasKids($items[$j])) {
-                $this->showTree($this->tree->tree_childs[$items[$j]]);
-            }
-        }
-        return;
-    }
-
-
-    /**
-     * prints out ... hmm ... the group's level indentation space, and a table start
-     *
-     * @access  private
-     * @param string  ID of the item (which is an EvaluationGroup) to print the space for.
-     */
-    public function printLevelOutput($group_id)
-    {
-        if ($group_id == "root")
-            return;
-
-        $level_output = "";
-
-        $parent_id = $group_id;
-        while ($this->tree->tree_data[$parent_id]['parent_id'] != $this->start_item_id) {
-            $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
-
-            /* a little space to indent subgroups */
-            $level_output .=
-                "<td valign=\"top\" width=\"" . INDENT_PIXELS . "\" height=\"1\" nowrap>" .
-                Assets::img('forumleer.gif', ['size' => INDENT_PIXELS . '@1']) .
-                "</td>";
-        }
-
-        echo "<!-- printLevelOutput ----------------- -->\n";
-        echo "<table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\">\n";
-        echo "<tr>\n";
-        echo $level_output;
-        return;
-    }
-
-
-    /**
-     * prints out one group
-     *
-     * @access  private
-     * @param string  ID of the item to print (which is an EvaluationGroup).
-     */
-    public function printItemOutput($group_id)
-    {
-        if ($group_id == "root")
-            return;
-        $group = &$this->tree->getGroupObject($group_id);
-
-        echo "<td width=\"1\">\n";
-        echo "</td>\n";
-
-        /* show group headline, if it's not a question group */
-        if ($group->getChildType() != "EvaluationQuestion") {
-
-            /* add space after a top-level group */
-            $parent = $group->getParentObject();
-            if ($parent->x_instanceof() == "Evaluation" && $group->getPosition() != 0)
-                echo "<td colspan=\"2\" width=\"100%\"><br></td><tr>";
-
-            echo "<td align=\"left\" width=\"100%\" valign=\"bottom\" class=\"content_body\" style=\"padding:1px;\">\n";
-            $parent_id = $group_id;
-            $chapter_num = '';
-            while ($parent_id != "root") {
-                $chapter_num = ($this->tree->tree_data[$parent_id]['priority'] + 1) . "." . $chapter_num;
-                $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
-            }
-            echo "&nbsp;" . $chapter_num . " ";
-            echo "<b>";
-            echo htmlReady($this->tree->tree_data[$group_id]['name']);
-            echo "</b>";
-            echo "</td>";
-
-            echo "<td width=\"1\">\n";
-            echo Assets::img('forumleer.gif', ['size' => '2@1']);
-            echo "</td>\n";
-
-        } else {
-            echo "<td width=\"100%\"></td>";
-        }
-
-        echo "</tr>\n";
-        echo "</table>\n";
-
-        $this->printItemDetails($group);
-
-        return;
-    }
-
-
-    /**
-     * prints out the details for a group
-     *
-     * @access  private
-     * @param object EvaluationGroup  the group object.
-     */
-    public function printItemDetails($group)
-    {
-        $group_id = $group->getObjectID();
-
-        $parent_id = $group_id;
-        $level_output = '';
-        while ($this->tree->tree_data[$parent_id]['parent_id'] != $this->start_item_id) {
-            $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
-
-            /* a little space to indent subgroups */
-            $level_output = "<td width=\"" . INDENT_PIXELS . "\">" .
-                Assets::img('forumleer.gif', ['size' => INDENT_PIXELS . '@1']) .
-                "</td>" .
-                $level_output;
-        }
-
-        /* print table */
-        echo "<!-- printItemDetails ----------------- -->\n";
-        echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
-        echo "<tr>\n" . $level_output;
-        echo "<td class=\"printcontent\" width=\"100%\" " .
-            ($group->getChildType() == "EvaluationQuestion"
-                ? ">"
-                : ">");
-        echo $this->getGroupContent($group);
-        echo "</td></tr>\n";
-        echo "</table>\n";
-        return;
-    }
-
-
-    /**
-     * returns html for the content of a group
-     *
-     * @access  private
-     * @param object EvaluationGroup  the group object.
-     * @return  string
-     */
-    public function getGroupContent($group)
-    {
-        $closeTable = NO;
-        $html = "";
-        $content = "";
-
-        /* get title */
-        $content .= $group->getChildType() == "EvaluationQuestion" && $group->getTitle()
-            ? "<b>" . formatReady($group->getTitle()) . "</b><br>\n"
-            : "";
-
-        /* get text */
-        $content .= $group->getText()
-            ? formatReady($group->getText()) . "<br>\n"
-            : "";
-
-        /* get the content of questions under this group, if any */
-        foreach ($group->getChildren() as $question) {
-            if ($question->x_instanceof() == INSTANCEOF_EVALQUESTION) {
-
-                if ($question->getPosition() == 0) {
-                    $content .= "\n<table width=\"100%\" cellpadding=\"3\" cellspacing=\"0\" " .
-                        "align=\"center\" style=\"margin-top:3px;\">\n";
-                }
-
-                $content .= $this->getQuestionContent($question, $group);
-                $closeTable = YES;
-            }
-        }
-        if ($closeTable)
-            $content .= "</table>\n";
-
-        /* return if there is nothing to show */
-        if (empty($content))
-            return "";
-
-        /* build table of content */
-        $style = $group->getChildType() != "EvaluationQuestion"
-            ? ""
-            : "";
-
-        $class = $group->getChildType() != "EvaluationQuestion"
-            ? "eval_gray"
-            : "steelgroup7";
-        $html .= "\n<!-- getGroupContent ----------------- -->\n";
-        $html .= "<table width=\"100%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" " . $style . ">\n";
-        $html .= "<tr>\n";
-        $html .= "<td align=\"left\" class=\"" . $class . "\">\n";
-        $html .= $content;
-        $html .= "</td></tr>\n";
-        $html .= "</table>\n";
-
-        return $html;
-    }
-
-
-    /**
-     * returns html for a question and its answers
-     *
-     * @access  private
-     * @param object EvaluationQuestion  the question object.
-     * @param object EvaluationGroup     the question's parent-group object.
-     * @return  string
-     */
-    public function getQuestionContent($question, $group)
-    {
-        $type = $question->isMultipleChoice() ? "checkbox" : "radio";
-        $answerBorder = "1px dotted #909090";
-        $residualBorder = "1px dotted #909090";
-        $answerArray = $question->getChildren();
-        $hasResidual = NO;
-        $leftOutStyle = ($group->isMandatory() &&
-            Request::submitted('voteButton') &&
-            is_array($GLOBALS["mandatories"]) &&
-            in_array($question->getObjectID(), $GLOBALS["mandatories"]))
-            ? "background-image:url(" . Assets::image_path("steelgroup1.gif") . "); border-left:3px solid red; border-right:3px solid red;"
-            : "";
-
-        $html = '';
-        $cellWidth = null;
-        /* Skala (one row question) ---------------------------------------- */
-        if ($question->getType() == EVALQUESTION_TYPE_LIKERT || $question->getType() == EVALQUESTION_TYPE_POL) {
-
-            if (($numAnswers = $question->getNumberChildren()) > 0)
-                $cellWidth = (int)(40 / $numAnswers);
-
-            if ($numAnswers > 0 && $answerArray[$numAnswers - 1]->isResidual())
-                $hasResidual = YES;
-
-            $lastTextAnswer = $hasResidual ? ($numAnswers - 3) : ($numAnswers - 2);
-
-            /* Headline, only shown for first question */
-            if ($question->getPosition() == 0) {
-                $html .= " <tr>\n";
-                $html .= "  <td width=\"60%\" style=\"border-bottom: $answerBorder; border-top: $answerBorder;\">";
-#       $html .= mb_strlen( $group->getText() ) < 100 ? formatReady( $group->getText() ) : "&nbsp;";
-                $html .= "&nbsp;";
-                $html .= "</td>\n";
-                foreach ($answerArray as $answer) {
-                    $noWrap = NO;
-
-                    if ($answer->x_instanceof() == INSTANCEOF_EVALANSWER) {
-                        if (!$answer->getText()) {
-                            /* answer has NO text ------------ */
-                            if ($answer->getPosition() <= $lastTextAnswer / 2) //&& $numAnswers > 4 )
-                                $headCell = "&lt;--";
-                            elseif ($answer->getPosition() >= round($lastTextAnswer / 2) + $lastTextAnswer % 2) //&& $numAnswers > 4 )
-                                $headCell = "--&gt;";
-                            else
-                                $headCell = "&lt;- -&gt;";
-
-                            $noWrap = YES;
-                        } else {
-                            /* answer has its own text ------ */
-                            $headCell = formatReady($answer->getText());
-                        }
-
-                        $extraStyle = "";
-                        if ($answer->isResidual()) {
-                            $extraStyle = "border-left: $residualBorder;";
-                            $html .=
-                                "<td align=\"center\" style=\"$extraStyle\" " .
-                                "width=\"1\">&nbsp;</td>";
-                        }
-
-                        $html .=
-                            "  <td align=\"center\" class=\"steelgroup6\" " .
-                            "style=\"border-bottom: $answerBorder; " .
-                            "border-left: $answerBorder; border-top: $answerBorder; $extraStyle;\" " .
-                            "width=\"" . $cellWidth . "%\" " . ($noWrap ? "nowrap" : "") . ">";
-                        $html .= $headCell;
-                        $html .= "</td>\n";
-                    }
-                }
-                $html .= " </tr>\n";
-            }
-            $class = $question->getPosition() % 2 ? "table_row_even" : "table_row_odd";
-            $extraStyle = ($question->getPosition() == $group->getNumberChildren() - 1
-                ? "border-bottom: $answerBorder"
-                : "");
-            $html .= " <tr class=\"" . $class . "\">\n";
-            $html .= "  <td align=\"left\" width=\"60%\" style=\"$extraStyle; $leftOutStyle;\">";
-            $html .= formatReady($question->getText());
-            $html .= ($group->isMandatory() ? "<span class=\"eval_error\"><b>**</b></span>" : "");
-            $html .= "</td>\n";
-
-            foreach ($answerArray as $answer) {
-                $number = $question->isMultipleChoice() ? "[" . $answer->getPosition() . "]" : "";
-
-                if ($answer->x_instanceof() == INSTANCEOF_EVALANSWER) {
-                    $extraStyle = "";
-                    if ($answer->isResidual()) {
-                        $extraStyle = "border-left: $residualBorder;";
-                        $html .=
-                            "<td align=\"center\" class=\"steelgroup7\" style=\"$extraStyle\" " .
-                            "width=\"1%\">&nbsp;</td>";
-                    }
-
-                    $extraStyle .= ($question->getPosition() == $group->getNumberChildren() - 1
-                        ? " border-bottom: $answerBorder;"
-                        : "");
-                    $answers = Request::getArray('answers');
-                    $checked = isset($answers[$question->getObjectID()]) && $answers[$question->getObjectID()] == $answer->getObjectID() ? "checked" : "";
-
-                    $html .= "  <td align=\"center\" style=\"border-left: $answerBorder; $extraStyle;\" " .
-                        "width=\"" . $cellWidth . "%\">";
-                    $html .= "<input type=\"" . $type . "\" name=\"answers[" . $question->getObjectID() . "]" . $number . "\" " .
-                        "value=\"" . $answer->getObjectID() . "\" " . $checked . ">";
-                    $html .= "</td>\n";
-                }
-            }
-            $html .= " </tr>\n";
-            /* -------------------------------------------- */
-        } /* Normal (question with long answers) ----------------------------- */
-        else {
-            $class = $question->getPosition() % 2 ? "table_row_even" : "table_row_odd";
-
-            /* Question ----------------------------------- */
-            $html .=
-                "<tr class=\"" . $class . "\">" .
-                "<td align=\"left\" style=\"$leftOutStyle;\">" .
-                formatReady($question->getText()) .
-                ($group->isMandatory() ? "<span class=\"eval_error\"><b>**</b></span>" : "") .
-                "</td>" .
-                "</tr>\n";
-
-            $html .= "<tr class=\"" . $class . "\">";
-            $html .= "<td>";
-            $html .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\">\n";
-            /* -------------------------------------------- */
-
-            $numberOfVisibleAnswers = 0;
-            foreach ($answerArray as $answer)
-                if (!($answer->isFreetext() && $answer->getText() != ''))
-                    $numberOfVisibleAnswers++;
-
-            if ($numberOfVisibleAnswers == 0) {
-                $html .= "<tr valign=\"middle\">\n";
-                $html .=
-                    "<td class=\"eval_error\">" .
-                    _("Dieser Frage wurden keine Antworten zugeordnet!") .
-                    "</td>\n";
-                $html .= "</tr>\n";
-            }
-
-            /* Answers ------------------------------------ */
-            foreach ($answerArray as $answer) {
-                if ($answer->x_instanceof() == INSTANCEOF_EVALANSWER) {
-                    $number = $question->isMultipleChoice() ? "[" . $answer->getPosition() . "]" : "";
-
-                    /* if not a user's answer */
-                    if (!($answer->isFreetext() && $answer->getText() != '')) {
-                        $html .= "<tr valign=\"middle\">\n";
-
-                        /* show text input field ---------- */
-                        if ($answer->isFreetext()) {
-
-                            // not really needed anymore
-                            if ($numberOfVisibleAnswers > 1)
-                                /* show a check/radio-box */
-                                $html .=
-                                    "<td width=\"2%\">" .
-                                    "<input type=\"" . $type . "\"" .
-                                    " name=\"answers[" . $question->getObjectID() . "]" . $number . "\"" .
-                                    " value=\"" . $answer->getObjectID() . "\">" .
-                                    "</td>\n";
-
-                            /* one row input field */
-                            $freetexts = Request::getArray('freetexts');
-                            if ($answer->getRows() == 1)
-                                $html .=
-                                    "<td colspan=\"2\">" .
-                                    "<input type=\"text\"" .
-                                    " name=\"freetexts[" . $question->getObjectID() . "]\"" .
-                                    " value=\"" . htmlReady(isset($freetexts[$question->getObjectID()]) ? $freetexts[$question->getObjectID()] : '') . "\" size=\"60\">" .
-                                    "</td>\n";
-
-                            /* multiple row input field (textarea) */
-                            else
-                                $html .=
-                                    "<td colspan=\"2\">" .
-                                    "<textarea" .
-                                    " name=\"freetexts[" . $question->getObjectID() . "]\"" .
-                                    " cols=\"60\" rows=\"" . $answer->getRows() . "\">" .
-                                    htmlReady(isset($freetexts[$question->getObjectID()]) ? $freetexts[$question->getObjectID()] : '') .
-                                    "</textarea>" .
-                                    "</td>\n";
-                        } /* show normal answer ------------- */
-                        else {
-                            $answers = Request::getArray('answers');
-                            /* see if it must be checked  */
-                            if ($type == "radio")
-                                $checked = isset($answers[$question->getObjectID()]) && $answers[$question->getObjectID()] == $answer->getObjectID()
-                                    ? "checked"
-                                    : "";
-                            else
-                                $checked = (is_array($answers[$question->getObjectID()]) &&
-                                    in_array($answer->getObjectID(), $answers[$question->getObjectID()]))
-                                    ? "checked"
-                                    : "";
-
-                            /* show a check/radio-box */
-                            $html .=
-                                "<td width=\"2%\">" .
-                                "<input type=\"" . $type . "\"" .
-                                " name=\"answers[" . $question->getObjectID() . "]" . $number . "\"" .
-                                " value=\"" . $answer->getObjectID() . "\" " . $checked . ">" .
-                                "</td>\n";
-                            $html .=
-                                "<td align=\"left\" width=\"98%\">" .
-                                formatReady($answer->getText()) .
-                                "</td>\n";
-                        }
-                        $html .= "</tr>\n";
-                    }
-                }
-                /* ------------------------------- End: Answers */
-            }
-
-            $html .= "</table>\n";
-            $html .= "</td></tr>";
-        }
-
-        return $html;
-    }
-}
diff --git a/lib/evaluation/classes/HTML.class.php b/lib/evaluation/classes/HTML.class.php
deleted file mode 100644
index 50b01eb..0000000
--- a/lib/evaluation/classes/HTML.class.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * HTML-class for the Stud.IP-project.
- * Based on scripts from "http://tut.php-q.net/".
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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 'HTMLempty.class.php';
-
-class HTML extends HTMLempty
-{
-    /**
-     * Holds the content.
-     *
-     * @access   private
-     * @var      object $_content
-     */
-    var $_content;
-
-    /**
-     */
-    var $has_textarea = false;
-
-    public function addHTMLContent($_content)
-    {
-        if (is_object($_content)) {
-            $classname = mb_strtolower(get_class($_content));
-            $valid_classes = ['htmlempty', 'html', 'htm', 'htmpty', 'studip\button', 'studip\linkbutton', 'messagebox'];
-            if (in_array($classname, $valid_classes)) {
-                $this->_content[] = $_content;
-            } else {
-                trigger_error('Ungültiges Objekt: "' . $classname . '"', E_USER_ERROR);
-            }
-        } elseif (is_scalar($_content)) {
-            $this->_content[] = (string)$_content;
-        } else {
-            echo "Fehler in HTML.class.php: Es fehlt ein addHTMLContent-Element für ein Element des Typs \"&lt;" . $this->getName() . "&gt;\"<br>";
-        }
-    }
-
-    public function addContent($_content)
-    {
-        if (is_object($_content)) {
-            $this->addHTMLContent($_content);
-        } elseif (is_scalar($_content)) {
-            $this->addHTMLContent(htmlReady(((string)$_content)));
-        } else {
-            $this->addHTMLContent("");
-        }
-    }
-
-    /**
-     *
-     */
-    public function getContent()
-    {
-        return $this->_content;
-    }
-
-    /**
-     * avoid indentation of <textarea>...
-     */
-    public function setTextareaCheck()
-    {
-        $this->has_textarea = true;
-    }
-
-    /**
-     *
-     */
-    public function printContent($indent = 0)
-    {
-        echo $this->createContent($indent);
-    }
-
-    /**
-     *
-     */
-    public function createContent($indent = 0)
-    {
-        $output = "";
-
-        $str_indent = str_repeat(' ', $indent);
-
-        $_content = $this->getContent();
-        $output .= ($str_indent . "<" . $this->getName());
-
-        $attribute = $this->getAttr();
-        foreach ($attribute as $name => $value) {
-            $output .= (' ' . $name . '="' . $value . '"');
-        }
-
-        $output .= $this->_string;
-        $output .= (">\n");
-        if (!is_array($_content)) {
-            $attributes = "";
-            foreach ($attribute as $name => $value) {
-                $attributes .= ($name . '=&gt;"' . $value . '"; ');
-            }
-            print "Fehler in HTML.class.php: Es fehlt ein Content-Element für ein Element des Typs \"&lt;" . $this->getName() . "&gt;\" (Attribute: $attributes).";
-
-            return;
-        }
-
-        foreach ($_content as $content) {
-            if (is_object($content)) {
-                // der aktuelle Content ist ein Object
-                // also ein HTML-Element. Also geben
-                // wir es aus
-                $classname = mb_strtolower(get_class($content));
-                $valid_classes = ['studip\button', 'studip\linkbutton', 'messagebox'];
-                if (in_array($classname, $valid_classes)) {
-                    $output .= $content;
-                } else {
-                    $output .= $content->createContent($indent + 4);
-                }
-                // Rekursion lässt grüßen ...
-            } else {
-                // Content ist ein String. Jeden Zeile
-                // geben wir getrennt aus
-                $zeilen = explode("\n", $content);
-                $echo = "";
-
-                if ($this->has_textarea) {
-
-                    // look for textarea in content
-                    $text_area = false;
-                    foreach ($zeilen as $zeile) {
-
-                        if (mb_strstr($zeile, "<textarea"))
-                            $text_area = true;
-
-                        if ($text_area)
-                            $echo .= $zeile . "\n";
-                        else
-                            $echo .= $str_indent . "    " . $zeile . "\n";
-
-                        if (mb_strstr($zeile, "</textarea"))
-                            $text_area = false;
-                    }
-                } else {
-                    // standard
-                    foreach ($zeilen as $zeile) {
-                        $echo .= $str_indent . "    " . $zeile . "\n";
-                    }
-                }
-                $output .= $echo;
-            }
-        }
-        $output .= ($str_indent . "</" . $this->getName() . ">\n");
-
-        return $output;
-    }
-}
-
-include_once("LazyHTML.class.php");
-
diff --git a/lib/evaluation/classes/HTMLempty.class.php b/lib/evaluation/classes/HTMLempty.class.php
deleted file mode 100644
index 574816f..0000000
--- a/lib/evaluation/classes/HTMLempty.class.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * HTML-class for the Stud.IP-project.
- * Based on scripts from "http://tut.php-q.net/".
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-class HTMLempty
-{
-
-# Define all required variables ============================================= #
-    /**
-     * Holds the name of the element.
-     *
-     * @access   private
-     * @var      string $_name
-     */
-    var $_name = "";
-
-    /**
-     * Holds the attributes of the element.
-     *
-     * @access   private
-     * @var      array $_attribute
-     */
-    var $_attribute = [];
-
-    /**
-     * Holds additional attributes (strings generated from studip functions)
-     *
-     * @access   private
-     * @var      array $_string
-     */
-    var $_string = "";
-# ============================================================ end: variables #
-
-
-# Define constructor and destructor ========================================= #
-    public function __construct($name)
-    {
-        if (preg_match('/^[a-zA-Z.:][\w\-_\.:]*$/i', $name)) {
-            $this->_name = $name;
-        } else {
-            trigger_error("Unerlaubter Name für ein HTML-Element : '" . $name . "'", E_USER_ERROR);
-        }
-    }
-
-    /**
-     *
-     */
-    public function addAttr($name, $wert = null)
-    {
-        if (isset ($wert)) {
-            $name = (string)$name;
-            if (preg_match('/^[a-zA-Z.:][\w\-_\.:]*$/i', $name)) {
-                $this->_attribute[$name] = $wert;
-            } else {
-                trigger_error("Unerlaubter Name für ein HTML-Attribut : '" . $name . "'", E_USER_ERROR);
-            }
-        } else {
-            if (is_scalar($name)) {
-                // Dies braucht man, falls man Attribute hinzufügen
-                // will, die keinen Wert haben, wie man es bei
-                // <option selected> kennt
-                if (preg_match('/^[a-zA-Z\.:][\w\-_\.:]*$/i', $name)) {
-                    $this->_attribute[$name] = $name;
-                    // Da wir gültiges HTML bzw XML schreiben
-                    // muss jedes Attribut auch einen Wert haben
-                    // selected wird dann zu selected="selected"
-                } else {
-                    trigger_error("Unerlaubter Name für ein HTML-Attribut : '" . $name . "'", E_USER_ERROR);
-                }
-            } elseif (is_array($name)) {
-                // Jedes Arrayelement durchgehen
-                foreach ($name as $key => $wert) {
-                    if (is_int($key)) {
-                        // Arrayelement wurde mit $foo[] hinzugefügt
-                        // also ohne Schlüssel. Ich nehme dann an
-                        // das es sich um ein Attribut wie
-                        // 'selected' oder 'readonly' handelt
-                        if (preg_match('/^[a-zA-Z\.:][\w\-_\.:]*$/i', $wert)) {
-                            $this->_attribute[$wert] = $wert;
-                        } else {
-                            trigger_error("Unerlaubter Name für ein HTML-Attribut : '" .
-                                $wert . "'", E_USER_ERROR);
-                        }
-                    } else {
-                        $key = (string)$key;
-                        if (preg_match('/^[a-zA-Z\.:][\w\-_\.:]*$/i', $key)) {
-                            $this->_attribute[$key] = $wert;
-                        } else {
-                            trigger_error("Unerlaubter Name für ein HTML-Attribut : '" .
-                                $key . "'", E_USER_ERROR);
-                        }
-                    }
-                }
-            } else {
-                trigger_error("Erster Parameter muss ein Scalar oder ein Array sein",
-                    E_USER_ERROR);
-            }
-        }
-    }
-
-    /**
-     * to support Stud.IP legacy functions like makeButton...
-     */
-    public function addString($string)
-    {
-        if (is_array($string)) {
-            $string = implode(' ', $string);
-        }
-        $this->_string .= " " . $string;
-    }
-
-    /**
-     *
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     *
-     */
-    public function getAttr()
-    {
-        return $this->_attribute;
-    }
-
-    /**
-     *
-     */
-    public function printContent($indent = 0)
-    {
-        echo $this->createContent($indent);
-    }
-
-    /**
-     *
-     */
-    public function createContent($indent = 0)
-    {
-        $str = str_repeat(' ', $indent);
-        $str .= "<" . $this->getName();
-        $attrib = $this->getAttr();
-        foreach ($attrib as $name => $value) {
-            $str .= ' ' . $name . '="' . htmlReady($value) . '"';
-        }
-        $str .= $this->_string;
-        $str .= ">\n";
-
-        return ($str);
-    }
-}
diff --git a/lib/evaluation/classes/LazyHTML.class.php b/lib/evaluation/classes/LazyHTML.class.php
deleted file mode 100644
index 98f2f5e..0000000
--- a/lib/evaluation/classes/LazyHTML.class.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * HTML-class for the Stud.IP-project.
- * Based on scripts from "http://tut.php-q.net/".
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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 'HTML.class.php';
-
-class HTMpty extends HTMLempty
-{
-
-    public function attr($name, $wert = null)
-    {
-        parent::addAttr($name, $wert);
-    }
-
-    public function stri($string)
-    {
-        parent::addString($string);
-    }
-
-}
-
-class HTM extends HTML
-{
-
-    public function stri($string)
-    {
-        parent::addString($string);
-    }
-
-    public function attr($name, $wert = null)
-    {
-        parent::addAttr($name, $wert);
-    }
-
-    public function html($_content)
-    {
-        parent::addHTMLContent($_content);
-    }
-
-    public function cont($_content)
-    {
-        parent::addContent($_content);
-    }
-}
diff --git a/lib/evaluation/classes/db/EvaluationAnswerDB.class.php b/lib/evaluation/classes/db/EvaluationAnswerDB.class.php
deleted file mode 100644
index 54bdb7d..0000000
--- a/lib/evaluation/classes/db/EvaluationAnswerDB.class.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Beschreibung
- *
- * @author      Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_OBJECTDB;
-
-
-class EvaluationAnswerDB extends EvaluationObjectDB
-{
-    /**
-     * Constructor
-     * @access   public
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->instanceof = 'EvalANSWERDB';
-    }
-
-    /**
-     * Loads answers of a group from the DB
-     * @access  public
-     * @param EvaluationAnswer   &&$answerObject The answer object
-     */
-    public function load(&$answerObject)
-    {
-        /* load answer --------------------------------------------------------- */
-        $row = DBManager::get()->fetchOne(
-            "SELECT * FROM evalanswer WHERE evalanswer_id= ?", [$answerObject->getObjectID()]
-        );
-        if (!count($row)) {
-            return $this->throwError(2, _("Keine Antwort mit dieser ID gefunden."));
-        }
-
-        $answerObject->setObjectID($row['evalanswer_id']);
-        $answerObject->setParentID($row['parent_id']);
-        $answerObject->setPosition($row['position']);
-        $answerObject->setText($row['text']);
-        $answerObject->setValue($row['value']);
-        $answerObject->setRows($row['rows']);
-        $answerObject->setResidual($row['residual']);
-    }
-
-
-    /**
-     * Loads the votes from the users for this answer
-     * @access   public
-     * @param EvaluationAnswer   &$answerObject The answer object
-     */
-    function loadVotes(&$answerObject)
-    {
-        /* load users -------------------------------------------------------- */
-        $result = DBManager::get()->fetchFirst("SELECT user_id FROM evalanswer_user
-                                            WHERE evalanswer_id= ?", [$answerObject->getObjectID()]);
-        foreach ($result as $row) {
-            $answerObject->addUserID($row, NO);
-        }
-    }
-    /* ----------------------------------------------------------- end: users */
-
-    /**
-     * Writes answers into the DB
-     * @access    public
-     * @param EvaluationAnswer   &$answerObject The answerobject
-     * @throws    error
-     */
-    function save(&$answerObject)
-    {
-        /* save answers -------------------------------------------------------- */
-        DBManager::get()->execute(
-            "REPLACE INTO evalanswer SET
-                `evalanswer_id`   = ?,
-                `parent_id`       = ?,
-                `position`        = ?,
-                `text`            = ?,
-                `value`           = ?,
-                `rows`            = ?,
-                `residual`        = ?
-                ",
-            [$answerObject->getObjectID(),
-                $answerObject->getParentID(),
-                $answerObject->getPosition(),
-                $answerObject->getText(),
-                $answerObject->getValue(),
-                $answerObject->getRows(),
-                $answerObject->isResidual()]);
-        /* ----------------------------------------------------- end: answersave */
-
-        /* connect answer to users --------------------------------------------- */
-        while ($userID = $answerObject->getNextUserID()) {
-            DBManager::get()->execute(
-                "INSERT INTO evalanswer_user SET
-                    evalanswer_id   = ?,
-                    user_id         = ?,
-                    evaldate        = UNIX_TIMESTAMP()",
-                [$answerObject->getObjectID(), $userID]);
-        }
-        /* ----------------------------------------------------- end: connecting */
-
-    } // saved
-
-    /**
-     * Deletes all votes from the users for this answers
-     * @access   public
-     * @param EvaluationAnswer   &$answerObject The answer object
-     */
-    function resetVotes(&$answerObject)
-    {
-        /* delete userconnects ------------------------------------------------- */
-        DBManager::get()->execute("
-        DELETE FROM evalanswer_user
-            WHERE evalanswer_id   = ?",
-            [$answerObject->getObjectID()]);
-        /* ------------------------------------------------------- end: deleting */
-    }
-
-    /**
-     * Deletes a answer
-     * @access public
-     * @param EvaluationAnswer   &$answerObject The answer to delete
-     * @throws  error
-     */
-    function delete(&$answerObject)
-    {
-        /* delete answer ----------------------------------------------------- */
-        DBManager::get()->execute("
-        DELETE FROM evalanswer
-            WHERE evalanswer_id   = ?",
-            [$answerObject->getObjectID()]);
-        /* ------------------------------------------------------- end: deleting */
-        $this->resetVotes($answerObject);
-    } // deleted
-
-
-    /**
-     * Checks if answer with this ID exists
-     * @access  public
-     * @param string $answerID The answerID
-     * @return  bool     YES if exists
-     */
-    function exists($answerID)
-    {
-        $result = DBManager::get()->fetchOne("SELECT 1 FROM evalanswer
-                                            WHERE evalanswer_id= ?", [$answerID]);
-        if (count($result) > 0)
-            return true;
-        return false;
-    }
-
-
-    /**
-     * Adds the children to a parent object
-     * @access  public
-     * @param EvaluationObject  &$parentObject The parent object
-     */
-    public static function addChildren(&$parentObject)
-    {
-        $result = DBManager::get()->fetchFirst("SELECT evalanswer_id FROM evalanswer
-                                            WHERE parent_id= ? ORDER by position",
-            [$parentObject->getObjectID()]);
-
-        $loadChildren =
-            $parentObject->loadChildren == EVAL_LOAD_ALL_CHILDREN ? EVAL_LOAD_ALL_CHILDREN : EVAL_LOAD_NO_CHILDREN;
-
-        foreach ($result as $row) {
-            $child = new EvaluationAnswer($row, $parentObject, $loadChildren);
-            $parentObject->addChild($child);
-        }
-    }
-
-    /**
-     * Returns the type of an objectID
-     * @access public
-     * @param string $objectID The objectID
-     * @return string  INSTANCEOF_x, else NO
-     */
-    function getType($objectID)
-    {
-        if ($this->exists($objectID)) {
-            return INSTANCEOF_EVALANSWER;
-        } else {
-            return NO;
-        }
-    }
-
-    /**
-     * Returns the id from the parent object
-     * @access public
-     * @param string $objectID The object id
-     * @return string  The id from the parent object
-     */
-    public static function getParentID($objectID)
-    {
-        return DBManager::get()->fetchColumn("SELECT parent_id FROM evalanswer
-                                            WHERE evalanswer_id = ?",
-            [$objectID]);
-    }
-
-    /**
-     * Give all textanswers for a user and question for the export
-     * @access  public
-     * @param string $questionID The question id
-     * @param string $userID The user id
-     */
-    function getUserAnwerIDs($questionID, $userID)
-    {
-        /* ask database ------------------------------------------------------- */
-        $sql = "SELECT a.evalanswer_id as ttt FROM evalanswer a, evalanswer_user b
-                    WHERE a.parent_id = ? AND a.evalanswer_id = b.evalanswer_id";
-        if (empty ($userID))
-            $answer_ids = DBManager::get()->fetchFirst($sql, [$questionID]);
-        else
-            $answer_ids = DBManager::get()->fetchFirst($sql . " AND b.user_id = ?", [$questionID, $userID]);
-        /* -------------------------------------------------------- end: asking */
-        return $answer_ids;
-    }
-
-    /**
-     * Checks whether a user has voted for an answer
-     * @access   public
-     * @param string $answerID The answer id
-     * @param string $userID The user id
-     * @return   boolean  YES if user has voted for the answer
-     */
-    function hasVoted($answerID, $userID)
-    {
-        $result = DBManager::get()->fetchOne("SELECT 1 FROM evalanswer_user
-                                            WHERE evalanswer_id= ? AND user_id", [$answerID, $userID]);
-        if (count($result) > 0)
-            return true;
-        return false;
-    }
-
-    function getAllAnswers($question_id, $userID, $only_user_answered = false)
-    {
-        if ($only_user_answered)
-            return DBManager::get()->fetchAll("
-                SELECT evalanswer.*, COUNT(IF(user_id=?,1,NULL)) AS has_voted
-                FROM evalanswer LEFT JOIN evalanswer_user USING(evalanswer_id)
-                WHERE parent_id = ? AND user_id = ?
-                GROUP BY evalanswer.evalanswer_id ORDER BY position",
-                [$userID, $question_id, $userID]);
-        else
-            return DBManager::get()->fetchAll("
-                SELECT evalanswer.*, COUNT(IF(user_id=?,1,NULL)) AS has_voted
-                FROM evalanswer LEFT JOIN evalanswer_user USING(evalanswer_id)
-                WHERE parent_id = ?
-                GROUP BY evalanswer.evalanswer_id ORDER BY position",
-                [$userID, $question_id]);
-    }
-}
-
-?>
diff --git a/lib/evaluation/classes/db/EvaluationDB.class.php b/lib/evaluation/classes/db/EvaluationDB.class.php
deleted file mode 100644
index fd1c2b6..0000000
--- a/lib/evaluation/classes/db/EvaluationDB.class.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_OBJECTDB;
-require_once EVAL_FILE_GROUPDB;
-
-
-/**
- * @const EVAL_STATE_NEW Beschreibung
- * @access public
- */
-define("EVAL_STATE_NEW", "new");
-
-/**
- * @const EVAL_STATE_ACTIVE Beschreibung
- * @access public
- */
-define("EVAL_STATE_ACTIVE", "active");
-
-/**
- * @const EVAL_STATE_STOPPED Beschreibung
- * @access public
- */
-define("EVAL_STATE_STOPPED", "stopped");
-# =========================================================================== #
-
-
-/**
- * Databaseclass for all evaluations
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvaluationDB extends EvaluationObjectDB
-{
-
-    public function __construct()
-    {
-        parent::__construct();
-        $this->instanceof = 'EvalDB';
-    }
-
-    /**
-     * Loads an evaluation from DB into an object
-     *
-     * @access public
-     * @param object EvaluationObject &$evalObject  The evaluation to load
-     * @throws error
-     */
-    public function load(&$evalObject)
-    {
-        $row = DBManager::get()->fetchOne("SELECT * FROM eval WHERE eval_id = ?", [$evalObject->getObjectID()]);
-
-        if (!count($row)) {
-            return $this->throwError(1, _("Keine Evaluation mit dieser ID gefunden."));
-        }
-
-        $evalObject->setAuthorID($row['author_id']);
-        $evalObject->setTitle($row['title']);
-        $evalObject->setText($row['text']);
-        $evalObject->setStartdate($row['startdate']);
-        $evalObject->setStopdate($row['stopdate']);
-        $evalObject->setTimespan($row['timespan']);
-        $evalObject->setCreationdate($row['mkdate']);
-        $evalObject->setChangedate($row['chdate']);
-        $evalObject->setAnonymous($row['anonymous']);
-        $evalObject->setVisible($row['visible']);
-        $evalObject->setShared($row['shared']);
-
-        $range_ids = DBManager::get()->fetchFirst("SELECT range_id FROM eval_range WHERE eval_id = ?",
-            [$evalObject->getObjectID()]);
-
-        foreach ($range_ids as $range_id) {
-            $evalObject->addRangeID($range_id);
-        }
-        if ($evalObject->loadChildren != EVAL_LOAD_NO_CHILDREN) {
-            EvaluationGroupDB::addChildren($evalObject);
-        }
-    }
-
-    /**
-     * Saves an evaluation
-     * @access public
-     * @param object   Evaluation  &$evalObject  The evaluation to save
-     * @throws  error
-     */
-    public function save(&$evalObject)
-    {
-        $startdate = $evalObject->getStartdate();
-        $stopdate = $evalObject->getStopdate();
-        $timespan = $evalObject->getTimespan();
-
-        $evalObject->setChangedate(time());
-        if ($this->exists($evalObject->getObjectID())) {
-            DBManager::get()->execute(
-                "UPDATE eval SET title = ?, text = ?, startdate = ?,
-                stopdate = ?, timespan = ?, mkdate = ?,
-                chdate = ?, anonymous = ?, visible = ?, shared = ?
-             WHERE eval_id = ?",
-                [$evalObject->getTitle(), $evalObject->getText(),
-                    $startdate, $stopdate, $timespan, $evalObject->getCreationdate(),
-                    $evalObject->getChangedate(), $evalObject->isAnonymous(),
-                    $evalObject->isVisible(), $evalObject->isShared(), $evalObject->getObjectID()]);
-        } else {
-            DBManager::get()->execute(
-                "INSERT INTO eval SET eval_id = ?,
-                author_id = ?, title = ?, text = ?, startdate = ?,
-                stopdate = ?, timespan = ?, mkdate = ?, chdate = ?,
-                anonymous = ?, visible = ?, shared = ?",
-                [$evalObject->getObjectID(), $evalObject->getAuthorID(),
-                    $evalObject->getTitle(), $evalObject->getText(),
-                    $startdate, $stopdate, $timespan, $evalObject->getCreationdate(),
-                    $evalObject->getChangedate(), $evalObject->isAnonymous(),
-                    $evalObject->isVisible(), $evalObject->isShared()]);
-        }
-        DBManager::get()->execute("DELETE FROM eval_range WHERE eval_id  = ?", [$evalObject->getObjectID()]);
-
-        while ($rangeID = $evalObject->getNextRangeID()) {
-            DBManager::get()->execute("INSERT INTO eval_range SET eval_id  = ?, range_id = ?",
-                [$evalObject->getObjectID(), $rangeID]);
-        }
-    }
-
-    /**
-     * Deletes an evaluation
-     * @access public
-     * @param object   Evaluation  &$evalObject  The evaluation to delete
-     * @throws  error
-     */
-    public function delete(&$evalObject)
-    {
-        DBManager::get()->execute("DELETE FROM eval WHERE eval_id  = ?", [$evalObject->getObjectID()]);
-
-        DBManager::get()->execute("DELETE FROM eval_range WHERE eval_id  = ?", [$evalObject->getObjectID()]);
-        DBManager::get()->execute("DELETE FROM eval_user WHERE eval_id  = ?", [$evalObject->getObjectID()]);
-
-    }
-
-    /**
-     * Checks if evaluation with this ID exists
-     * @access  public
-     * @param string $evalID The evalID
-     * @return  bool     YES if exists
-     */
-    public function exists($evalID)
-    {
-        $entry = DBManager::get()->fetchOne("SELECT 1 FROM eval WHERE eval_id = ?", [$evalID]);
-        if (count($entry) > 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Checks if someone used the evaluation
-     * @access  public
-     * @param string $evalID The eval id
-     * @param string $userID The user id
-     * @return  bool     YES if evaluation was used
-     */
-    public function hasVoted($evalID, $userID = "")
-    {
-        /* ask database ------------------------------------------------------- */
-        $sql = "SELECT 1 FROM eval_user WHERE eval_id = ?";
-        if (empty($userID))
-            $entry = DBManager::get()->fetchOne($sql, [$evalID]);
-        else
-            $entry = DBManager::get()->fetchOne($sql . " AND user_id = ?", [$evalID, $userID]);
-        /* --------------------------------------------------------- end: asking */
-        if (count($entry) > 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Returns the type of an objectID
-     * @access public
-     * @param string $objectID The objectID
-     * @return string  INSTANCEOF_x, else NO
-     */
-    public function getType($objectID)
-    {
-        if ($this->exists($objectID)) {
-            return INSTANCEOF_EVAL;
-        } else {
-            $dbObject = new EvaluationGroupDB();
-            return $dbObject->getType($objectID);
-        }
-    }
-
-    /**
-     * Connect a user with an evaluation
-     * @access   public
-     * @param string $evalID The evaluation id
-     * @param string $userID The user id
-     */
-    public function connectWithUser($evalID, $userID)
-    {
-        if (empty($userID))
-            die ("EvaluationDB::connectWithUser: UserID leer!!");
-        DBManager::get()->execute("INSERT IGNORE INTO eval_user SET eval_id = ?, user_id = ?", [$evalID, $userID]);
-    }
-
-    /**
-     * Removes the connection of an evaluation with a user or all users
-     * @access   public
-     * @param string $evalID The evaluation id
-     * @param string $userID The user id
-     */
-    public function removeUser($evalID, $userID = "")
-    {
-        $sql = "DELETE FROM eval_user WHERE eval_id  = ?";
-
-        if (empty($userID))
-            DBManager::get()->execute($sql, [$evalID]);
-        else
-            DBManager::get()->execute($sql . " AND user_id = ?", [$evalID, $userID]);
-    }
-
-    /**
-     * Get number of users who participated in the eval
-     * @access public
-     * @param string $evalID The eval id
-     * @return integer  The number of users
-     */
-    public static function getNumberOfVotes($evalID)
-    {
-        return DBManager::get()->fetchColumn("SELECT count(DISTINCT user_id) AS number FROM eval_user WHERE eval_id = ?", [$evalID]);
-    }
-
-    /**
-     * Get users who participated in the eval
-     * @access public
-     * @param string $evalID The eval id
-     * @param array $answerIDs The answerIDs to get the pseudonym users
-     * @return string[] Ids of the users who voted
-     */
-    public static function getUserVoted($evalID, $answerIDs = [], $questionIDs = [])
-    {
-        $sql = "SELECT DISTINCT user_id FROM ";
-
-        if (empty($answerIDs) && empty($questionIDs)) {
-            $sql .= "eval_user WHERE eval_id = ?";
-            $search_criteria = $evalID;
-        } elseif (empty ($questionIDs)) {
-            $sql .= "evalanswer_user WHERE evalanswer_id IN (?)";
-            $search_criteria = $answerIDs;
-        } else {
-            $sql .= "evalanswer INNER JOIN evalanswer_user USING(evalanswer_id) WHERE parent_id IN (?)";
-            $search_criteria = $questionIDs;
-        }
-
-        return DBManager::get()->fetchFirst($sql, [$search_criteria]);
-    }
-
-    /**
-     *
-     * @access public
-     * @param string $search_str
-     * @return array
-     */
-    public function search_range($search_str)
-    {
-        return search_range($search_str, true);
-    }
-}
diff --git a/lib/evaluation/classes/db/EvaluationGroupDB.class.php b/lib/evaluation/classes/db/EvaluationGroupDB.class.php
deleted file mode 100644
index 60842ad..0000000
--- a/lib/evaluation/classes/db/EvaluationGroupDB.class.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_OBJECTDB;
-require_once EVAL_FILE_ANSWERDB;
-
-/**
- * Databaseclass for all evaluationgroups
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvaluationGroupDB extends EvaluationObjectDB
-{
-
-    /**
-     * Constructor
-     * @access   public
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->instanceof = 'EvalGroupDB';
-    }
-
-    /**
-     * Loads an evaluationgroup from DB into an object
-     *
-     * @access private
-     * @param object  EvaluationGroup &$groupObject  The group to load
-     * @throws error
-     */
-    public function load(&$groupObject)
-    {
-        /* load group ---------------------------------------------------------- */
-        $row = DBManager::get()->fetchOne("
-        SELECT * FROM evalgroup
-        WHERE evalgroup_id = ?
-        ORDER BY position ", [$groupObject->getObjectID()]);
-
-        if (count($row) === 0) {
-            return $this->throwError(1, _("Keine Gruppe mit dieser ID gefunden."));
-        }
-
-        $groupObject->setParentID($row['parent_id']);
-        $groupObject->setTitle($row['title']);
-        $groupObject->setText($row['text']);
-        $groupObject->setPosition($row['position']);
-        $groupObject->setChildType($row['child_type']);
-        $groupObject->setMandatory($row['mandatory']);
-        $groupObject->setTemplateID($row['template_id']);
-        if ($groupObject->loadChildren != EVAL_LOAD_NO_CHILDREN) {
-            if ($groupObject->loadChildren == EVAL_LOAD_ONLY_EVALGROUP) {
-                EvaluationGroupDB::addChildren($groupObject);
-            } else {
-                EvaluationGroupDB::addChildren($groupObject);
-                EvaluationQuestionDB::addChildren($groupObject);
-            }
-        }
-    }
-
-
-    /**
-     * Saves a group
-     * @access public
-     * @param object   EvaluationGroup  &$groupObject  The group to save
-     * @throws  error
-     */
-    public function save(&$groupObject)
-    {
-        if ($this->exists($groupObject->getObjectID())) {
-            DBManager::get()->execute("
-            UPDATE evalgroup SET
-                title           = ?,
-                text            = ?,
-                child_type      = ?,
-                position        = ?,
-                template_id     = ?,
-                mandatory       = ?
-            WHERE
-                evalgroup_id    = ?
-            ", [(string)$groupObject->getTitle(),
-                (string)$groupObject->getText(),
-                (string)$groupObject->getChildType(),
-                (int)$groupObject->getPosition(),
-                (string)$groupObject->getTemplateID(),
-                (int)$groupObject->isMandatory(),
-                (string)$groupObject->getObjectID()
-            ]);
-        } else {
-            DBManager::get()->execute("
-            INSERT INTO evalgroup SET
-                evalgroup_id    = ?,
-                parent_id       = ?,
-                title           = ?,
-                text            = ?,
-                child_type      = ?,
-                mandatory       = ?,
-                template_id     = ?,
-                position        = ?
-            ", [
-                (string)$groupObject->getObjectID(),
-                (string)$groupObject->getParentID(),
-                (string)$groupObject->getTitle(),
-                (string)$groupObject->getText(),
-                (string)$groupObject->getChildType(),
-                (int)$groupObject->isMandatory(),
-                (string)$groupObject->getTemplateID(),
-                (int)$groupObject->getPosition()
-            ]);
-        }
-    }
-
-    /**
-     * Deletes a group
-     * @access public
-     * @param object   EvaluationGroup  &$groupObject  The group to delete
-     * @throws  error
-     */
-    public function delete(&$groupObject)
-    {
-        DBManager::get()->execute("DELETE FROM evalgroup WHERE evalgroup_id = ?", [$groupObject->getObjectID()]);
-    }
-
-    /**
-     * Checks if group with this ID exists
-     * @access  public
-     * @param string $groupID The groupID
-     * @return  bool     YES if exists
-     */
-    public function exists($groupID)
-    {
-        $result = DBManager::get()->fetchColumn("SELECT 1 FROM evalgroup WHERE evalgroup_id = ?", [$groupID]);
-        return (bool)$result;
-    }
-
-    /**
-     * Adds the children to a parent object
-     * @access  public
-     * @param EvaluationObject  &$parentObject The parent object
-     */
-    public static function addChildren(&$parentObject)
-    {
-        $result = DBManager::get()->fetchFirst("
-        SELECT evalgroup_id FROM evalgroup
-        WHERE parent_id = ?
-        ORDER BY position", [$parentObject->getObjectID()]);
-
-        if (($loadChildren = $parentObject->loadChildren) == EVAL_LOAD_NO_CHILDREN)
-            $loadChildren = EVAL_LOAD_NO_CHILDREN;
-
-        foreach ($result as $groupID) {
-            $child = new EvaluationGroup ($groupID, $parentObject, $loadChildren);
-            $parentObject->addChild($child);
-        }
-    }
-
-    /**
-     * Returns the type of an objectID
-     * @access public
-     * @param string $objectID The objectID
-     * @return string  INSTANCEOF_x, else NO
-     */
-    public function getType($objectID)
-    {
-        if ($this->exists($objectID)) {
-            return INSTANCEOF_EVALGROUP;
-        } else {
-            $dbObject = new EvaluationQuestionDB ();
-            return $dbObject->getType($objectID);
-        }
-    }
-
-
-    /**
-     * Returns whether the childs are groups or questions
-     * @access   public
-     * @param string $objectID The object id
-     */
-    public function getChildType($objectID)
-    {
-        $result = DBManager::get()->fetchColumn("
-            SELECT child_type FROM evalgroup WHERE evalgroup_id = ?", [$objectID]);
-        if ($result) return $result;
-        return NULL;
-    }
-
-    /**
-     * Returns the id from the parent object
-     * @access public
-     * @param string $objectID The object id
-     * @return string  The id from the parent object
-     */
-    public static function getParentID($objectID)
-    {
-        return DBManager::get()->fetchColumn("
-            SELECT parent_id FROM evalgroup WHERE evalgroup_id = ?", [$objectID]);
-    }
-}
diff --git a/lib/evaluation/classes/db/EvaluationObjectDB.class.php b/lib/evaluation/classes/db/EvaluationObjectDB.class.php
deleted file mode 100644
index fd5728d..0000000
--- a/lib/evaluation/classes/db/EvaluationObjectDB.class.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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 'lib/evaluation/evaluation.config.php';
-
-/**
- * Databaseclass for all evaluationobjects
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvaluationObjectDB extends DatabaseObject
-{
-    /**
-     * Constructor
-     * @access   public
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->instanceof = 'EvalDBObject';
-    }
-
-    /**
-     * Gets the name of the range. Copied somewhere from Stud.IP...
-     * @access  public
-     * @param string $rangeID the rangeID
-     * @param boolean $html_decode (optional)
-     * @return  string                    The name of the range
-     */
-    public function getRangename($rangeID, $html_decode = true)
-    {
-        if ($rangeID == "studip") {
-            return _('Systemweite Evaluationen');
-        }
-        $o_type = get_object_type($rangeID, ['sem', 'user', 'inst']);
-        if (in_array($o_type, ['sem','inst','fak'])) {
-            $range = get_object_by_range_id($rangeID);
-            if ($range) {
-                $rangename = $range->getFullName('number-name-semester');
-            } else {
-                $rangename = _('Kein Titel gefunden.');
-            }
-            return $rangename;
-        }
-        if ($o_type != 'user') {
-            $user_id = get_userid($rangeID);
-        } else {
-            $user_id = $rangeID;
-        }
-
-        if ($user_id != $GLOBALS['user']->id) {
-            $rangename = _('Profil') . ': '
-                . get_fullname($user_id, 'full', true)
-                . ' (' . get_username($user_id) . ')';
-        } else {
-            $rangename = _('Profil');
-        }
-        return $rangename;
-    }
-
-    /**
-     * Gets the global Studi.IP perm
-     * @access  public
-     * @param boolean $as_value If YES return as value
-     * @return  string   the perm or NULL
-     */
-    public static function getGlobalPerm($as_value = false)
-    {
-        if ($GLOBALS['perm']->have_perm("root")) {
-            return $as_value ? 63 : "root";
-        } elseif ($GLOBALS['perm']->have_perm("admin")) {
-            return $as_value ? 31 : "admin";
-        } elseif ($GLOBALS['perm']->have_perm("dozent")) {
-            return $as_value ? 15 : "dozent";
-        } elseif ($GLOBALS['perm']->have_perm("tutor")) {
-            return $as_value ? 7 : "dozent";
-        } elseif ($GLOBALS['perm']->have_perm("autor")) {
-            return $as_value ? 3 : "autor";
-        } elseif ($GLOBALS['perm']->have_perm("user")) {
-            return $as_value ? 1 : "user";
-        } else {
-            return $as_value ? 0 : NULL;
-        }
-    }
-
-    /**
-     * Get the Stud.IP-Perm for a range
-     * @param string $rangeID The range id
-     * @param string $userID The user id
-     * @param boolean $as_value If YES return as value
-     * @access   public
-     * @return   string
-     */
-    public static function getRangePerm($rangeID, $userID = NULL, $as_value = false)
-    {
-        if (!$rangeID) {
-            print "no rangeID!<br>";
-            return NULL;
-        }
-        $userID = ($userID) ? $userID : $GLOBALS['user']->id;
-        $range_perm = $GLOBALS['perm']->get_studip_perm($rangeID, $userID);
-
-        if ($rangeID == $userID) {
-            return ($as_value) ? 63 : "root";
-        }
-
-        if (($rangeID == "studip") && ($GLOBALS['perm']->have_perm("root"))) {
-            return ($as_value) ? 63 : "root";
-        }
-
-        switch ($range_perm) {
-            case "root":
-                return ($as_value) ? 63 : "root";
-            case "admin":
-                return ($as_value) ? 31 : "admin";
-            case "dozent":
-                return ($as_value) ? 15 : "dozent";
-            case "tutor":
-                return ($as_value) ? 7 : "dozent";
-            case "autor":
-                return ($as_value) ? 3 : "autor";
-            case "user":
-                return ($as_value) ? 1 : "user";
-            default:
-                return 0;
-        }
-
-    }
-
-    /**
-     * Look for all rangeIDs for my permissions
-     * @param object  Perm &$permObj  PHP-LIB-Perm-Object
-     * @param object  User &$userObj  PHP-LIB-User-Object
-     * @param string $rangeID RangeID of actual page
-     */
-    public function getValidRangeIDs(&$permObj, &$userObj, $rangeID)
-    {
-        $range_ids = [];
-        $username = $userObj->username;
-
-        $range_ids += [
-            $username => ["name" => _("Profil")]
-        ];
-
-        if ($permObj->have_perm("root")) {
-            $range_ids += ["studip" => ["name" => _("Stud.IP-System")]];
-            if (($adminRange = $this->getRangename($rangeID)) &&
-                $rangeID != $userObj->id)
-                $range_ids += [$rangeID => ["name" =>
-                    $adminRange]];
-        } else if ($permObj->have_perm("admin")) {
-            if (($adminRange = $this->getRangename($rangeID)) &&
-                $rangeID != $userObj->id) {
-                $range_ids += [$rangeID => ["name" =>
-                    $adminRange]];
-            }
-        } else if ($permObj->have_perm("dozent") || $permObj->have_perm("tutor")) {
-            if ($ranges = search_range("")) {
-                $range_ids += $ranges;
-            }
-        }
-        return $range_ids;
-    }
-
-    /**
-     * Returns the number of ranges with no permission
-     * @access   public
-     * @param EvaluationObject   &$eval The evaluation
-     * @param boolean $return_ids If YES return the ids
-     * @return array|integer Number of ranges with no permission or array of ids
-     */
-    public static function getEvalUserRangesWithNoPermission(&$eval, $return_ids = false)
-    {
-        $no_permisson = 0;
-        $rangeIDs = $eval->getRangeIDs();
-        $no_permisson_ranges = [];
-        if (!is_array($rangeIDs)) {
-            $rangeIDs = [$rangeIDs];
-        }
-
-        foreach ($eval->getRangeIDs() as $rangeID) {
-            $user_perm = EvaluationObjectDB::getRangePerm($rangeID, $GLOBALS['user']->id, YES);
-            // every range with a lower perm than Tutor
-            if ($user_perm < 7) {
-                $no_permisson++;
-                $no_permisson_ranges[] = $rangeID;
-            }
-        }
-        if ($return_ids == YES) {
-            return $no_permisson_ranges;
-        }
-        return ($no_permisson > 0) ? $no_permisson : NO;
-    }
-
-    /**
-     * Gets the public template ids
-     * @access   public
-     * @param string $searchString The name of the template
-     * @return   array    The public template ids
-     */
-    public function getPublicTemplateIDs($searchString)
-    {
-        $sql = "
-            SELECT eval_id FROM eval
-            LEFT JOIN auth_user_md5 ON user_id = author_id
-            WHERE shared = 1
-              AND author_id <> :current_user
-              AND (title LIKE :search_string
-                   OR text LIKE :search_string
-                   OR Vorname LIKE :search_string
-                   OR Nachname LIKE :search_string
-                   OR username LIKE :search_string
-                  )
-            ORDER BY title";
-
-        return DBManager::get()->fetchFirst(
-            $sql, [':current_user' => $GLOBALS['user']->id, ':search_string' => '%' . $searchString . '%']
-        );
-    }
-
-    /**
-     * Return all evaluationIDs in a specific range
-     *
-     * @access  public
-     * @param string $rangeID Specific rangeID or it is a template
-     * @param string $state Specific state
-     * @return  array   All evaluations in this range and this state
-     */
-    public function getEvaluationIDs($rangeID = "", $state = "")
-    {
-        if (!empty ($rangeID) && !is_scalar($rangeID)) {
-            return $this->throwError(1, _("Übergebene RangeID ist ungültig."));
-        }
-        if ($state != "" &&
-            $state != EVAL_STATE_NEW &&
-            $state != EVAL_STATE_ACTIVE &&
-            $state != EVAL_STATE_STOPPED) {
-            return $this->throwError(2, _("Übergebener Status ist ungültig."));
-        }
-
-        if (get_userid($rangeID) != NULL && $rangeID != NULL) {
-            $rangeID = get_userid($rangeID);
-        }
-
-        if (!empty ($rangeID)) {
-            $sql =
-                "SELECT" .
-                " a.eval_id " .
-                "FROM" .
-                " eval_range a, eval b " .
-                "WHERE" .
-                " a.eval_id = b.eval_id" .
-                " AND " .
-                " a.range_id = ?";
-            $param = $rangeID;
-        } else {
-            $sql =
-                "SELECT" .
-                " b.eval_id " .
-                "FROM" .
-                " eval b " .
-                "LEFT JOIN" .
-                " eval_range " .
-                "ON" .
-                " b.eval_id = eval_range.eval_id " .
-                "WHERE" .
-                " eval_range.eval_id IS NULL" .
-                " AND" .
-                " b.author_id = ?";
-            $param = $GLOBALS['user']->id;
-        }
-
-        if ($state == EVAL_STATE_NEW)
-            $sql .= " AND (b.startdate IS NULL OR b.startdate > " . time() . ")";
-
-        elseif ($state == EVAL_STATE_ACTIVE)
-            $sql .=
-                " AND b.startdate < " . time() . "" .
-                " AND (" .
-                "      (b.timespan IS NULL AND b.stopdate > " . time() . ")" .
-                "       OR" .
-                "      (b.stopdate IS NULL AND (b.startdate+b.timespan) > " . time() . ")" .
-                "       OR" .
-                "      (b.timespan IS NULL AND b.stopdate IS NULL)" .
-                "     )";
-
-        elseif ($state == EVAL_STATE_STOPPED)
-            $sql .=
-                " AND b.startdate < " . time() . "" .
-                " AND (" .
-                "      (b.timespan IS NULL AND b.stopdate <= " . time() . ")" .
-                "       OR" .
-                "      (b.stopdate IS NULL AND (b.startdate+b.timespan) <= " . time() . ")" .
-                "     )";
-
-        $sql .= " ORDER BY chdate DESC";
-
-        return DBManager::get()->fetchFirst($sql, [$param]);
-    }
-
-    /**
-     * Gets the evaluation id for a object id
-     * @access  public
-     * @param string $objectID The object id
-     * @return  string   The evaluation id or nothing
-     */
-    public function getEvalID($objectID)
-    {
-        if (empty ($objectID)) {
-            throw new Exception("FATAL ERROR in getEvalID ;)");
-        }
-
-        $type = EvaluationObjectDB::getType($objectID);
-
-        switch ($type) {
-            case INSTANCEOF_EVALANSWER:
-                $parentID = EvaluationAnswerDB::getParentID($objectID);
-                break;
-            case INSTANCEOF_EVALQUESTION:
-                $parentID = EvaluationQuestionDB::getParentID($objectID);
-                break;
-            case INSTANCEOF_EVALGROUP:
-                $parentID = EvaluationGroupDB::getParentID($objectID);
-                break;
-            default:
-                return $objectID;
-        }
-        return EvaluationObjectDB::getEvalID($parentID);
-    }
-
-    /**
-     * Returns the type of an objectID
-     * @access public
-     * @param string $objectID The objectID
-     * @return string  INSTANCEOF_x, else NO
-     */
-    public function getType($objectID)
-    {
-        return (new EvaluationDB ())->getType($objectID);
-    }
-}
diff --git a/lib/evaluation/classes/db/EvaluationQuestionDB.class.php b/lib/evaluation/classes/db/EvaluationQuestionDB.class.php
deleted file mode 100644
index b6cea24..0000000
--- a/lib/evaluation/classes/db/EvaluationQuestionDB.class.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Beschreibung
- *
- * @author      Alexander Willner <mail@AlexanderWillner.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_OBJECTDB;
-require_once EVAL_FILE_ANSWERDB;
-# ====================================================== end: including files #
-
-# Define all required constants ============================================= #
-/**
- * @const INSTANCEOF_EVALQUESTIONDB Instance of an evaluationQuestionDB object
- * @access public
- */
-define("INSTANCEOF_EVALQUESTIONDB", "EvalQuestionDB");
-
-# =========================================================================== #
-
-
-class EvaluationQuestionDB extends EvaluationObjectDB
-{
-
-    /**
-     * Constructor
-     * @access   public
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->instanceof = 'EvalQuestionDB';
-    }
-
-    /**
-     * Loads a question from the DB
-     * @access  public
-     * @param EvaluationQuestion   &$questionObject The question object
-     */
-    public function load(&$questionObject)
-    {
-        $db = DBManager::get();
-        $query =
-            "SELECT" .
-            " * " .
-            "FROM" .
-            " evalquestion " .
-            "WHERE" .
-            " evalquestion_id = ? " .
-            "ORDER BY" .
-            " position ";
-        $row = $db->fetchOne($query, [$questionObject->getObjectID()]);
-
-        if (!count($row)) {
-            return $this->throwError(1, _("Keine Frage mit dieser ID gefunden."));
-        }
-
-        $questionObject->setParentID($row['parent_id']);
-        $questionObject->setType($row['type']);
-        $questionObject->setPosition($row['position']);
-        $questionObject->setText($row['text']);
-        $questionObject->setMultiplechoice($row['multiplechoice']);
-
-        if ($questionObject->loadChildren != EVAL_LOAD_NO_CHILDREN) {
-            EvaluationAnswerDB::addChildren($questionObject);
-        }
-    }
-
-
-    /**
-     * Writes or updates a question into the DB
-     * @access  public
-     * @param EvaluationQuestion   &$questionObject The question object
-     */
-    public function save(&$questionObject)
-    {
-        $db = DBManager::get();
-
-        if ($this->exists($questionObject->getObjectID())) {
-            $sql =
-                "UPDATE" .
-                " evalquestion " .
-                "SET" .
-                " parent_id       = ?," .
-                " type            = ?," .
-                " position        = ?," .
-                " text            = ?," .
-                " multiplechoice  = ? " .
-                "WHERE" .
-                " evalquestion_id = ?";
-        } else {
-            $sql =
-                "INSERT INTO" .
-                " evalquestion " .
-                "SET" .
-                " parent_id       = ?," .
-                " type            = ?," .
-                " position        = ?," .
-                " text            = ?," .
-                " multiplechoice  = ?," .
-                " evalquestion_id = ?";;
-        }
-        $db->execute($sql, [
-            (string)$questionObject->getParentID(),
-            (string)$questionObject->getType(),
-            (int)$questionObject->getPosition(),
-            (string)$questionObject->getText(),
-            (int)$questionObject->isMultiplechoice(),
-            $questionObject->getObjectID()
-        ]);
-    }
-
-    /**
-     * Deletes a question
-     * @access public
-     * @param object EvaluationQuestion &$questionObject The question to delete
-     * @throws  error
-     */
-    public function delete(&$questionObject)
-    {
-        $db = DBManager::get();
-
-        $sql = "DELETE FROM evalquestion WHERE evalquestion_id = ?";
-        $db->execute($sql, [$questionObject->getObjectID()]);
-    }
-
-    /**
-     * Checks if question with this ID exists
-     * @access  public
-     * @param string $questionID The questionID
-     * @return  bool     YES if exists
-     */
-    public function exists($questionID)
-    {
-        $db = DBManager::get();
-
-        $sql =
-            "SELECT" .
-            " 1 " .
-            "FROM" .
-            " evalquestion " .
-            "WHERE" .
-            " evalquestion_id = ?";
-        $result = $db->fetchColumn($sql, [$questionID]);
-
-        return (bool)$result;
-    }
-
-    /**
-     * Checks if a template exists with this title
-     * @access  public
-     * @param string $questionTitle The title of the question
-     * @param string $userID The user id
-     * @return  bool     YES if exists
-     */
-    public function titleExists($questionTitle, $userID)
-    {
-        $db = DBManager::get();
-
-        $sql =
-            "SELECT" .
-            " 1 " .
-            "FROM" .
-            " evalquestion " .
-            "WHERE" .
-            " text = ? " .
-            " AND " .
-            " parent_id = ?";
-
-        $result = $db->fetchColumn($sql, [$questionTitle, $userID]);
-
-        return (bool)$result;
-    }
-
-
-    /**
-     * Adds the children to a parent object
-     * @access  public
-     * @param EvaluationObject  &$parentObject The parent object
-     */
-    public static function addChildren(&$parentObject)
-    {
-        $db = DBManager::get();
-
-        $sql =
-            "SELECT" .
-            " evalquestion_id " .
-            "FROM" .
-            " evalquestion " .
-            "WHERE" .
-            " parent_id = ? " .
-            "ORDER BY" .
-            " position";
-        $result = $db->fetchFirst($sql, [$parentObject->getObjectID()]);
-
-        $loadChildren = $parentObject->loadChildren == EVAL_LOAD_ALL_CHILDREN
-            ? EVAL_LOAD_ALL_CHILDREN
-            : EVAL_LOAD_NO_CHILDREN;
-
-        foreach ($result as $evalquestion_id) {
-            $child = new EvaluationQuestion($evalquestion_id, $parentObject, $loadChildren);
-            $parentObject->addChild($child);
-        }
-    }
-
-    /**
-     * Returns the type of an objectID
-     * @access public
-     * @param string $objectID The objectID
-     * @return string  INSTANCEOF_x, else NO
-     */
-    public function getType($objectID)
-    {
-        if ($this->exists($objectID)) {
-            return INSTANCEOF_EVALQUESTION;
-        } else {
-            $dbObject = new EvaluationAnswerDB ();
-            return $dbObject->getType($objectID);
-        }
-    }
-
-    /**
-     * Returns the id from the parent object
-     * @access public
-     * @param string $objectID The object id
-     * @return string  The id from the parent object
-     */
-    public static function getParentID($objectID)
-    {
-        $db = DBManager::get();
-
-        $sql =
-            "SELECT" .
-            " parent_id " .
-            "FROM" .
-            " evalquestion " .
-            "WHERE" .
-            " evalquestion_id = ?";
-        $result = $db->fetchColumn($sql, [$objectID]);
-        return $result;
-    }
-
-    /**
-     * Returns the ids of the Answertemplates of a user
-     * @access public
-     * @param string $userID The user id
-     * @return array  The ids of the answertemplates
-     */
-    public function getTemplateID($userID)
-    {
-        $db = DBManager::get();
-
-        if (EvaluationObjectDB::getGlobalPerm() === 'root') {
-            $sql = "SELECT evalquestion_id
-                    FROM evalquestion
-                    WHERE parent_id = '0'
-                    ORDER BY text";
-            return $db->fetchFirst($sql);
-        } else {
-            $sql = "SELECT evalquestion_id
-                    FROM evalquestion
-                    WHERE parent_id = ?
-                       OR parent_id = '0'
-                    ORDER BY text";
-            return $db->fetchFirst($sql, [$userID]);
-        }
-    }
-}
diff --git a/lib/evaluation/evaluation.config.php b/lib/evaluation/evaluation.config.php
deleted file mode 100644
index e9d46db..0000000
--- a/lib/evaluation/evaluation.config.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Configurationfile for the evaluation module
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Include all required files ================================================ #
-
-# ====================================================== end: including files #
-
-
-# Define public constants =================================================== #
-
-/* General constants ------------------------------------------------------- */
-define ("YES", 1);
-define ("NO", 0);
-define ("DEBUG", 1);
-define ("QUOTED", 1);
-define ("UNQUOTED", 0);
-define ("EVAL_MIN_SEARCHLEN", 3);
-define ("EVAL_MAX_TEMPLATENAMELEN", 22);
-define("NEW_EVALUATION_TITLE", _("Neue Evaluation"));
-define('FIRST_ARRANGMENT_BLOCK_TITLE', _('Erster Gruppierungsblock'));
-define('EVAL_ROOT_TAG', "[R]");
-/* -------------------------------------------------- end: general constants */
-
-/* Path constants ---------------------------------------------------------- */
-define ("EVAL_PATH_RELATIV", "lib/evaluation/");
-define ("EVAL_PATH", EVAL_PATH_RELATIV);
-define ("EVAL_PATH_CLASSES", EVAL_PATH."classes/");
-define ("EVAL_PATH_DBCLASSES", EVAL_PATH_CLASSES."db/");
-/* ----------------------------------------------------- end: path constatns */
-
-/* Class constants --------------------------------------------------------- */
-define ("EVAL_FILE_EDIT", "evaluation_admin_edit.inc.php");
-define ("EVAL_FILE_TEMPLATE", "evaluation_admin_template.inc.php");
-define ("EVAL_FILE_OVERVIEW", "evaluation_admin_overview.inc.php");
-define ("EVAL_FILE_SHOW", "show_evaluation.php");
-define ("EVAL_FILE_ADMIN", "admin_evaluation.php");
-
-define ("EVAL_FILE_OBJECT", EVAL_PATH_CLASSES."EvaluationObject.class.php");
-define ("EVAL_FILE_OBJECTDB", EVAL_PATH_DBCLASSES."EvaluationObjectDB.class.php");
-define ("EVAL_FILE_EVAL", EVAL_PATH_CLASSES."Evaluation.class.php");
-define ("EVAL_FILE_EVALDB", EVAL_PATH_DBCLASSES."EvaluationDB.class.php");
-define ("EVAL_FILE_GROUP", EVAL_PATH_CLASSES."EvaluationGroup.class.php");
-define ("EVAL_FILE_GROUPDB", EVAL_PATH_DBCLASSES."EvaluationGroupDB.class.php");
-define ("EVAL_FILE_QUESTION", EVAL_PATH_CLASSES."EvaluationQuestion.class.php");
-define ("EVAL_FILE_QUESTIONDB", EVAL_PATH_DBCLASSES."EvaluationQuestionDB.class.php");
-define ("EVAL_FILE_ANSWER", EVAL_PATH_CLASSES."EvaluationAnswer.class.php");
-define ("EVAL_FILE_ANSWERDB", EVAL_PATH_DBCLASSES."EvaluationAnswerDB.class.php");
-define ("EVAL_FILE_EXPORTMANAGER", EVAL_PATH_CLASSES."EvaluationExportManager.class.php");
-define ("EVAL_FILE_EXPORTMANAGERCSV", EVAL_PATH_CLASSES."EvaluationExportManagerCSV.class.php");
-define ("EVAL_FILE_EVALTREE", EVAL_PATH_CLASSES."EvaluationTree.class.php");
-define ("EVAL_FILE_EDIT_TREEVIEW", EVAL_PATH_CLASSES."EvaluationTreeEditView.class.php");
-define ("EVAL_FILE_SHOW_TREEVIEW", EVAL_PATH_CLASSES."EvaluationTreeShowUser.class.php");
-
-define ("HTML", EVAL_PATH_CLASSES."HTML.class.php");
-define ("HTMLempty", EVAL_PATH_CLASSES."HTMLempty.class.php");
-/* --------------------------------------------------- end:  class constants */
-
-/* Library constants ------------------------------------------------------- */
-define ("EVAL_LIB_COMMON", EVAL_PATH."evaluation.lib.php");
-define ("EVAL_LIB_OVERVIEW", EVAL_PATH."evaluation_admin_overview.lib.php");
-define ("EVAL_LIB_EDIT", EVAL_PATH."evaluation_admin_edit.lib.php");
-define ("EVAL_LIB_TEMPLATE", EVAL_PATH."evaluation_admin_template.lib.php");
-define ("EVAL_LIB_SHOW", EVAL_PATH."evaluation_show.lib.php");
-/* -------------------------------------------------- end: library constants */
-
-/* Picture constants ------------------------------------------------------- */
-define ("EVAL_PIC_ICON",                Icon::create('test', 'inactive')->asImagePath());
-define ("EVAL_PIC_PREVIEW",             Icon::create('question-circle', 'clickable')->asImagePath());
-define ("EVAL_PIC_ADMIN",               Icon::create('admin', 'clickable')->asImagePath());
-define ("EVAL_PIC_LOGO",                Assets::image_path('sidebar/evaluation-sidebar.png'));
-define ("EVAL_PIC_ARROW",               Icon::create('arr_1right', 'accept')->asImagePath());
-define ("EVAL_PIC_ARROW_ACTIVE",        Icon::create('arr_1down', 'accept')->asImagePath());
-define ("EVAL_PIC_SUCCESS",             Icon::create('accept', 'accept')->asImagePath());
-define ("EVAL_PIC_ERROR",               Icon::create('decline', 'attention')->asImagePath());
-define ("EVAL_PIC_INFO",                Icon::create('exclaim', 'inactive')->asImagePath());
-define ("EVAL_PIC_INFO_SMALL",          Icon::create('info', 'info')->asImagePath());
-define ("EVAL_PIC_HELP",                Icon::create('info-circle', 'inactive')->asImagePath());
-define ("EVAL_PIC_MOVE_GROUP",          Icon::create('arr_2left', 'sort')->asImagePath());
-define ("EVAL_PIC_MOVE_UP",             Icon::create('arr_2up', 'sort')->asImagePath());
-define ("EVAL_PIC_MOVE_DOWN",           Icon::create('arr_2down', 'sort')->asImagePath());
-define ("EVAL_PIC_MOVE_RIGHT",          Icon::create('arr_2right', 'sort')->asImagePath());
-define ("EVAL_PIC_MOVE_LEFT",           Icon::create('arr_2left', 'sort')->asImagePath());
-define ("EVAL_PIC_CREATE_ANSWERS",      Assets::image_path('eval_create_answers.gif'));
-define ("EVAL_PIC_EDIT_ANSWERS",        Assets::image_path('eval_edit_answers.gif'));
-define ("EVAL_PIC_TIME",                Icon::create('date', 'info')->asImagePath());
-define ("EVAL_PIC_EXCLAIM",             Icon::create('info', 'info')->asImagePath());
-define ("EVAL_PIC_DELETE_GROUP",        Icon::create('trash', 'clickable')->asImagePath());
-define ("EVAL_PIC_MOVE_BUTTON",         Icon::create('arr_2right', 'sort')->asImagePath());
-define ("EVAL_PIC_ADD",                 Icon::create('add', 'clickable')->asImagePath());
-define ("EVAL_PIC_ADD_TEMPLATE",        Icon::create('add', 'clickable')->asImagePath());
-define ("EVAL_PIC_REMOVE",              Icon::create('trash', 'clickable')->asImagePath());
-define ("EVAL_PIC_EDIT",                Icon::create('edit', 'clickable')->asImagePath());
-define ("EVAL_PIC_BACK",                Icon::create('link-intern', 'clickable')->asImagePath());
-define ("EVAL_PIC_ARROW_TEMPLATE",      Icon::create('arr_1right', 'clickable')->asImagePath());
-define ("EVAL_PIC_ARROW_TEMPLATE_OPEN", Icon::create('arr_1down', 'clickable')->asImagePath());
-define ("EVAL_PIC_ARROW_NEW",           Icon::create('arr_1right', 'sort')->asImagePath());
-define ("EVAL_PIC_ARROW_NEW_OPEN",      Icon::create('arr_1down', 'sort')->asImagePath());
-define ("EVAL_PIC_ARROW_RUNNING",       Icon::create('arr_1right', 'accept')->asImagePath());
-define ("EVAL_PIC_ARROW_RUNNING_OPEN",  Icon::create('arr_1down', 'accept')->asImagePath());
-define ("EVAL_PIC_ARROW_STOPPED",       Icon::create('arr_1right', 'attention')->asImagePath());
-define ("EVAL_PIC_ARROW_STOPPED_OPEN",  Icon::create('arr_1down', 'attention')->asImagePath());
-define ("EVAL_PIC_TREE_ARROW",          Icon::create('arr_1right', 'clickable')->asImagePath());
-define ("EVAL_PIC_TREE_ARROW_ACTIVE",   Icon::create('arr_1down', 'clickable')->asImagePath());
-define ("EVAL_PIC_TREE_BLANC",          Assets::image_path('forumleer.gif'));
-define ("EVAL_PIC_TREE_ROOT",           Icon::create('vote', 'inactive')->asImagePath());
-define ("EVAL_PIC_TREE_GROUP",          Icon::create('test', 'info')->asImagePath());
-define ("EVAL_PIC_TREE_GROUP_FILLED",   Assets::image_path('eval_group_filled.gif'));
-define ("EVAL_PIC_TREE_QUESTIONGROUP",  Icon::create('test', 'info')->asImagePath());
-define ("EVAL_PIC_TREE_QUESTIONGROUP_FILLED", Assets::image_path('eval_qgroup_filled.gif'));
-define ("EVAL_PIC_EXPORT_FILE",         Icon::create('file-xls', 'clickable')->asImagePath());
-define ("EVAL_PIC_YES",                 Icon::create('accept', 'accept')->asImagePath());
-define ("EVAL_PIC_NO",                  Icon::create('decline', 'attention')->asImagePath());
-define ("EVAL_PIC_SHARED",              Icon::create('checkbox-checked', 'clickable')->asImagePath());
-define ("EVAL_PIC_NOTSHARED",           Icon::create('checkbox-unchecked', 'clickable')->asImagePath());
-/* -------------------------------------------------- end: picture constants */
-
-/* CSS constants ----------------------------------------------------------- */
-define ("EVAL_CSS_SUCCESS", "eval_success");
-define ("EVAL_CSS_ERROR",   "eval_error");
-define ("EVAL_CSS_INFO",    "eval_info");
-/* ------------------------------------------------------ end: css constants */
-
-# ===================================================== end: define constants #
-?>
diff --git a/lib/evaluation/evaluation.lib.php b/lib/evaluation/evaluation.lib.php
deleted file mode 100644
index 811e27d..0000000
--- a/lib/evaluation/evaluation.lib.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter005: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Define constants ========================================================== #
-# ===================================================== end: define constants #
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once HTML;
-# ====================================================== end: including files #
-
-
-/**
- * Library with common static functions for the evaluation module
- *
- * @author      Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvalCommon
-{
-    /**
-     * Creates this funny blue title bar
-     * @param string $title The title
-     * @param string $iconURL The URL for the icon
-     */
-    public static function createTitle($title, $iconURL = "", $padding = 0)
-    {
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("class", "blank");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", $padding);
-        $table->addAttr("width", "100%");
-
-        $trTitle = new HTML("tr");
-        $trTitle->AddAttr("valign", "top");
-        $trTitle->AddAttr("align", "center");
-
-        $tdTitle = new HTML("td");
-        if ($iconURL) {
-            $tdTitle->addAttr("class", "table_header_bold");
-        } else {
-            $tdTitle->addAttr("class", "content_body");
-        }
-        $tdTitle->addAttr("colspan", "2");
-        $tdTitle->addAttr("align", "left");
-        $tdTitle->addAttr("valign", "middle");
-
-        if ($iconURL) {
-            $imgTitle = new HTMLempty ("img");
-            $imgTitle->addAttr("src", $iconURL);
-            $imgTitle->addAttr("alt", $title);
-            $imgTitle->addAttr("align", "bottom");
-            $tdTitle->addContent($imgTitle);
-        }
-
-        $bTitle = new HTML ("b");
-        $bTitle->addContent($title);
-        $tdTitle->addContent($bTitle);
-
-        $trTitle->addContent($tdTitle);
-        $table->addContent($trTitle);
-
-        return $table;
-    }
-
-    /**
-     * Creates a simple image for the normal top of an modulepage
-     * @param string $imgURL The URL for the icon
-     * @param string $imgALT The description for the icon
-     */
-    public static function createImage($imgURL, $imgALT, $extra = "")
-    {
-        $img = new HTMLempty ("img");
-        $img->addAttr("border", "0");
-        $img->addAttr("valign", "middle");
-        $img->addAttr("src", $imgURL);
-        if (empty($extra)) {
-            $img->addAttr("alt", $imgALT);
-            $img->addAttr("title", $imgALT);
-        } else {
-            $img->addString($extra);
-        }
-
-        return $img;
-    }
-
-    /**
-     * Creates the Javascript static function, which will open an evaluation popup
-     */
-    static function createEvalShowJS($isPreview = NO, $as_object = YES)
-    {
-        $html = "";
-        $html .=
-            "<script type=\"text/javascript\" language=\"JavaScript\">" .
-            "  function openEval( evalID ) {" .
-            "    evalwin = window.open(STUDIP.URLHelper.getURL('show_evaluation.php?evalID=' + evalID + '&isPreview=" . $isPreview . "'), " .
-            "                          evalID, 'width=790,height=500,scrollbars=yes,resizable=yes');" .
-            "    evalwin.focus();" .
-            "  }\n" .
-            "</script>\n";
-
-        $div = new HTML ("div");
-        $div->addHTMLContent($html);
-
-        if ($as_object) {
-            return $div;
-        }
-        return $html;
-    }
-
-    /**
-     * Creates a link, which will open an evaluation popup
-     */
-    static function createEvalShowLink($evalID, $content, $isPreview = NO, $as_object = YES)
-    {
-        $html = "";
-
-        $html .=
-            "<a " .
-            "href=\"" . URLHelper::getLink('show_evaluation.php?evalID=' . $evalID . '&isPreview=' . $isPreview) . "\" " .
-            "target=\"" . $evalID . "\" " .
-            "onClick=\"openEval('" . $evalID . "'); return false;\">" .
-            (is_object($content) ? str_replace("\n", "", $content->createContent()) : $content) .
-            "</a>";
-
-        $div = new HTML ("div");
-        $div->addHTMLContent($html);
-
-        if ($as_object) {
-            return $div;
-        }
-        return $html;
-    }
-
-
-    /**
-     * @param $object
-     * @param string $errortitle
-     * @return MessageBox
-     * @deprecated
-     */
-    public static function createErrorReport(AuthorObject $object, string $errortitle = ''): MessageBox
-    {
-        $errors = $object->getErrors();
-
-        if (!$errortitle) {
-            if (count($errors) > 1) {
-                $errortitle = _('Es sind Fehler aufgetreten.');
-            } else {
-                $errortitle = _('Es ist ein Fehler aufgetreten.');
-            }
-        }
-
-        $details = array_map(
-            function ($error) {
-                return "#{$error['code']}: {$error['string']}";
-            },
-            $errors
-        );
-
-        return MessageBox::error($errortitle, $details);
-    }
-
-    /**
-     * Returns the rangeID
-     */
-    public static function getRangeID()
-    {
-        $rangeID = Request::option('range_id') ?: Context::getId();
-
-        if (empty ($rangeID) || ($rangeID == get_username($GLOBALS['user']->id)))
-            $rangeID = $GLOBALS['user']->id;
-
-        return $rangeID;
-    }
-
-
-    /**
-     * Checks and transforms a date into a UNIX (r)(tm) timestamp
-     * @access public
-     * @static
-     * @param integer $day The day
-     * @param integer $month The month
-     * @param integer $year The year
-     * @param integer $hour The hour (optional)
-     * @param integer $minute The minute (optional)
-     * @param integer $second The second (optional)
-     * @return  integer If an error occurs -> -1. Otherwise the UNIX-timestamp
-     */
-    public static function date2timestamp(
-        $day,
-        $month,
-        $year,
-        $hour = 0,
-        $minute = 0,
-        $second = 0
-    )
-    {
-        if (!checkdate((int)$month, (int)$day, (int)$year) ||
-            $hour < 0 || $hour > 24 ||
-            $minute < 0 || $minute > 59 ||
-            $second < 0 || $second > 59) {
-            return -1;
-        }
-
-        // windows cant count that mutch
-        if ($year < 1971) {
-            $year = 1971;
-        } elseif ($year > 2037) {
-            $year = 2037;
-        }
-
-        return mktime($hour, $minute, $second, $month, $day, $year);
-    }
-}
-
-?>
diff --git a/lib/evaluation/evaluation_admin_edit.inc.php b/lib/evaluation/evaluation_admin_edit.inc.php
deleted file mode 100644
index 39def65..0000000
--- a/lib/evaluation/evaluation_admin_edit.inc.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Beschreibung
- *
- * @author      Christian Bauer <alfredhitchcock@gmx.net>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-# PHP-LIB: open session ===================================================== #
-/*page_open (array ("sess" => "Seminar_Session",
-          "auth" => "Seminar_Auth",
-          "perm" => "Seminar_Perm",
-          "user" => "Seminar_User"));
-$auth->login_if ($auth->auth["uid"] == "nobody");
-$perm->check ("autor");*/
-# ============================================================== end: PHP-LIB #
-
-# Include all required files ================================================ #
-
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_LIB_EDIT;
-require_once EVAL_FILE_EDIT_TREEVIEW;
-
-# ====================================================== end: define constancs #
-
-$debug = "<pre class=\"steelgroup6\" style=\"font-size:10pt\">"
-    . "<pre class=\"steelgroup3\" style=\"font-size:10pt\">"
-    . "Welcome to BugReport 1.02 "
-    . "[Sharewareversion]"
-    . "</pre>";
-
-# check the evalID ========================================================= #
-
-global $user;
-
-if (Request::submitted('newButton')) {
-    $debug .= "neue Eval!<br>";
-    // create the first group
-    $group = new EvaluationGroup();
-    $group->setTitle(FIRST_ARRANGMENT_BLOCK_TITLE, QUOTED);
-    $group->setText("");
-    if ($group->isError()) {
-        return MessageBox::error(_("Fehler beim Anlegen einer Gruppe"));
-    }
-    // create a new eval
-    $eval = new Evaluation ();
-    $rangeID = Request::option("rangeID");
-    if ($rangeID == $user->username) {
-        $rangeID = $user->id;
-    }
-
-    $eval->setAuthorID($user->id);
-    $eval->setTitle(NEW_EVALUATION_TITLE);
-    $eval->setAnonymous(YES);
-    $evalID = $eval->getObjectID();
-    $eval->addChild($group);
-    $eval->save();
-
-    if ($eval->isError()) {
-        return MessageBox::error(_("Fehler beim Anlegen einer Evaluation"));
-    }
-
-    $groupID = $group->getObjectID();
-    $evalID = $eval->getObjectID();
-
-} elseif (Request::option("evalID") && (Request::option("evalID") != NULL)) {
-    $debug .= "isset _REQUTEST[evalID]!<br>";
-    $evalID = Request::option("evalID");
-    $eval = new Evaluation ($evalID, NULL, EVAL_LOAD_NO_CHILDREN);
-    if ($eval->isError()) {
-        PageLayout::postError(_("Es wurde eine ungültige Evaluations-ID übergeben."));
-    } elseif ($evalID == NULL) {
-        PageLayout::postError(_("Es wurde keine Evaluations-ID übergeben"));
-    }
-
-} else {
-    PageLayout::postError(_("Es wurde keine Evaluations-ID übergeben"));
-}
-
-# ===================================================== END: check the evalID #
-
-# check the itemID =========================================================  #
-$itemID = Request::option('itemID');
-if ($itemID) {
-    $_SESSION['itemID'] = $itemID;
-} elseif (Request::submitted('newButton')) {
-    $_SESSION['itemID'] = "root";
-}
-# ===================================================== END: check the itemID #
-
-# check the rangeID ========================================================  #
-
-if (Request::option("rangeID")) {
-    $_SESSION['rangeID'] = Request::option("rangeID");
-
-}
-
-# ==================================================== END: check the rangeID #
-
-# EVTAU: employees of the vote-team against urlhacking ====================== #
-
-$eval = new Evaluation($evalID ?? '', NULL, EVAL_LOAD_NO_CHILDREN);
-
-// someone has voted
-if ($eval->hasVoted()) {
-    $error = MessageBox::error(
-        _("An dieser Evaluation hat bereits jemand teilgenommen. Sie darf nicht mehr verändert werden.")
-    );
-}
-
-
-// only the author or user with tutor perm in all evalRangeIDs should edit an eval
-$authorID = $eval->getAuthorID();
-
-if ($authorID != $user->id) {
-
-    $no_permisson = 0;
-
-    if (is_array($eval->getRangeIDs())) {
-
-        foreach ($eval->getRangeIDs() as $rangeID) {
-
-            $user_perm = EvaluationObjectDB::getRangePerm($rangeID, $user->id, YES);
-
-            // every range with a lower perm than Tutor
-            if ($user_perm < 7)
-                $no_permisson++;
-        }
-
-        if ($no_permisson > 0) {
-            if ($no_permisson == 1) {
-                $no_permisson_msg = _("Sie haben in einem Bereich, in welchem diese Evaluation hängt, nicht aussreichene Rechte, um diese Eval zu bearbeiten.");
-            } else {
-                $no_permisson_msg = sprintf(_("Sie haben in %s Bereichen, in denen diese Evaluation hängt, nicht aussreichene Rechte, um diese Eval zu bearbeiten."), $no_permisson);
-            }
-            $error_msgs[] = MessageBox::error($no_permisson_msg);
-        }
-    }
-}
-
-
-# ============================================ end: Collection post/get-vars #
-
-# Print Error MSG and end Site ============================================= #
-
-if (!empty($error_msgs)) {
-
-    $back_button = ("&nbsp;&nbsp;&nbsp;")
-        . "<a href=\"" . URLHelper::getLink('admin_evaluation.php?page=overview&rangeID=' . Request::option('rangeID')) . "\">"
-        . _("Zur Evaluations-Verwaltung")
-        . "</a>";
-    $errors = '';
-    if (is_array($error_msgs)) {
-        foreach ($error_msgs as $error_msg) {
-            $errors .= $error_msg . "<br>";
-        }
-
-    }
-    echo EvalEdit::createSite($errors . $back_button, " ");
-    include_once('lib/include/html_end.inc.php');
-    page_close();
-    exit ();
-
-}
-
-
-# ======================================== end: Print Error MSG and end Site #
-
-/* Do first all actions for templates -------------------------------------- */
-$templateSite = include(EVAL_FILE_TEMPLATE);
-/* --------------------------------- end: do first all actions for templates */
-
-
-# Creating the Tree ======================================================== #
-$EditTree = new EvaluationTreeEditView($itemID, $evalID ?? null);
-
-# Send messages to the tree ================================================ #
-
-if (Request::submitted('newButton')) {
-    $EditTree->msg["root"] = "msg§"
-        . _("Erstellen Sie nun eine Evaluation.<br> Der erste Gruppierungsblock ist bereits angelegt worden. Wenn Sie ihn öffnen, können Sie dort weitere Gruppierungsblöcke oder Fragenblöcke anlegen.");
-}
-$editSite = $EditTree->showEvalTree($itemID, 1);
-echo EvalEdit::createSite($editSite, $templateSite);
diff --git a/lib/evaluation/evaluation_admin_edit.lib.php b/lib/evaluation/evaluation_admin_edit.lib.php
deleted file mode 100644
index 45ce428..0000000
--- a/lib/evaluation/evaluation_admin_edit.lib.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Beschreibung
- *
- * @author      Christian Bauer <alfredhitchcock@gmx.net>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once HTML;
-//require_once (HTMLempty);
-# ====================================================== end: including files #
-class EvalEdit
-{
-
-    /**
-     * creates the main-table
-     * @access  public
-     * @param string $title the title
-     * @param string $left the left site of the table
-     * @param string $rigt the right site of the table
-     * @return  string  the html-table
-     */
-    public static function createSite($left = "", $right = "")
-    {
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("class", "blank");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML("tr");
-
-        $td = new HTML("td");
-        $td->addAttr("class", "blank");
-        $td->addAttr("width", "100%");
-        $td->addAttr("align", "left");
-        $td->addAttr("valign", "top");
-        $td->setTextareaCheck(YES);
-        $td->addHTMLContent($left);
-
-        $tr->addContent($td);
-
-        $td = new HTML("td");
-        $td->addAttr("class", "blank");
-        $td->addAttr("align", "right");
-        $td->addAttr("valign", "top");
-        $td->addHTMLContent($right);
-
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        return $table->createContent();
-    }
-
-    public static function createHiddenIDs()
-    {
-        $input = new HTML ("input");
-        $input->addAttr("type", "hidden");
-        $input->addAttr("evalID", Request::option('evalID'));
-
-        $input = new HTML ("input");
-        $input->addAttr("type", "hidden");
-        $input->addAttr("itemID", Request::option('itemID'));
-
-        $input = new HTML ("input");
-        $input->addAttr("type", "hidden");
-        $input->addAttr("rangeID", Request::option("rangeID"));
-
-        return;
-    }
-}
diff --git a/lib/evaluation/evaluation_admin_overview.inc.php b/lib/evaluation/evaluation_admin_overview.inc.php
deleted file mode 100644
index d8ba9a3..0000000
--- a/lib/evaluation/evaluation_admin_overview.inc.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * Overview of all existing evaluations
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-# PHP-LIB: open session ===================================================== #
-// page_open (array ("sess" => "Seminar_Session",
-//         "auth" => "Seminar_Auth",
-//         "perm" => "Seminar_Perm",
-//         "user" => "Seminar_User"));
-// $auth->login_if ($auth->auth["uid"] == "nobody");
-// $GLOBALS['perm']->check ("autor");
-# ============================================================== end: PHP-LIB #
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_LIB_COMMON;
-require_once EVAL_LIB_OVERVIEW;
-require_once EVAL_FILE_EVAL;
-require_once EVAL_FILE_EVALDB;
-# ====================================================== end: including files #
-
-define("DISCARD_OPENID", "discard_openid");
-
-/* Create objects ---------------------------------------------------------- */
-$db = new EvaluationObjectDB ();
-if ($db->getErrors()) {
-    return MessageBox::error(_("Datenbankfehler"));
-}
-$lib = new EvalOverview ($db, $GLOBALS['perm'], $GLOBALS['user']);
-/* ------------------------------------------------------------ end: objects */
-
-
-/* Set variables ----------------------------------------------------------- */
-if (isset($_SESSION['evalID']))  {
-    unset($_SESSION['evalID']);
-}
-if (isset($_SESSION['rangeID'])) {
-    unset($_SESSION['rangeID']);
-}
-
-if (!empty($the_range)) {
-    $rangeID = $the_range;
-}
-
-$rangeID = $rangeID ?? Context::getId();
-
-if (empty ($rangeID) || ($rangeID == $GLOBALS['user']->username)) {
-    $rangeID = $GLOBALS['user']->id;
-}
-$_SESSION['rangeID'] = $rangeID;
-$debug = 0;
-
-$evalAction = $lib->getPageCommand();
-
-$openID = Request::option("openID");
-$evalID = Request::option("evalID");
-$search = Request::get("search"); // range
-$templates_search = Request::get("templates_search");
-$search = $templates_search;
-/* ---------------------------------------------------------- end: variables */
-
-/* Javascript function ----------------------------------------------------- */
-$js = EvalCommon::createEvalShowJS(YES);
-echo $js->createContent();
-
-/* Maintable with white border --------------------------------------------- */
-$table = $lib->createMainTable();
-/* -----------------------------------------------------------end: maintable */
-
-/* Check permissions and call safeguard ------------------------------------ */
-if (!$GLOBALS['perm']->have_studip_perm("tutor", $rangeID) && $GLOBALS['user']->id != $rangeID) {
-    echo MessageBox::error(_("Sie haben keinen Zugriff auf diesen Bereich."));
-    return;
-}
-
-$safeguard = $lib->callSafeguard($evalAction, $evalID, $rangeID, $search, null);
-/* ---------------------------------------------------------- end: safeguard */
-
-$foundTable = '';
-/* found public templates -------------------------------------------------- */
-if ($templates_search) {
-    $search = trim($search);
-    $evalIDArray = $db->getPublicTemplateIDs($search);
-    if (mb_strlen($search) >= EVAL_MIN_SEARCHLEN && !empty ($evalIDArray)) {
-        $foundTable = new HTML ("table");
-        $foundTable->addAttr("border", "0");
-        $foundTable->addAttr("align", "center");
-        $foundTable->addAttr("cellspacing", "0");
-        $foundTable->addAttr("cellpadding", "0");
-        $foundTable->addAttr("width", "100%");
-        $foundTr = new HTML ("tr");
-        $foundTd = new HTML ("td");
-        $foundTd->addAttr("align", "left");
-        $foundTd->addAttr("colspan", "10");
-        $foundTd->addContent(new HTMLempty ("br"));
-
-        $b = new HTML ("b");
-        $b->addContent(_("Gefundene öffentliche Evaluationsvorlagen:"));
-        $foundTd->addContent($b);
-        $foundTr->addContent($foundTd);
-        $foundTable->addContent($foundTr);
-
-        $foundTable->addContent($lib->createGroupTitle([
-            " ",
-            _("Titel"),
-#                        " ",
-            _("Autor"),
-            _("Letzte Änderung"),
-            _("Anonym"),
-            "",
-            _("Ansehen"),
-            _("Kopieren"),
-            " "
-        ], YES, "public_template"));
-        foreach ($evalIDArray as $number => $evalID) {
-            $eval = new Evaluation ($evalID);
-            $foundTable->addContent($lib->createEvalRow($eval, $number, "public_template", NO, YES));
-        }
-    }
-}
-/* --------------------------------------------- end: found public templates */
-
-/* Own templates ----------------------------------------------------------- */
-$evalIDArray = $db->getEvaluationIDs();
-$templateTable = new HTML ("table");
-$templateTable->addAttr("border", "0");
-#$templateTable->addAttr ("style","border:1px solid black");
-$templateTable->addAttr("align", "center");
-$templateTable->addAttr("cellspacing", "0");
-$templateTable->addAttr("cellpadding", "2");
-$templateTable->addAttr("width", "100%");
-$templateTr = new HTML ("tr");
-$templateTd = new HTML ("td");
-$templateTd->addAttr("colspan", "7");
-
-$b = new HTML ("h2");
-$b->addContent(_("Eigene Evaluationsvorlagen:"));
-$templateTd->addContent($b);
-$templateTr->addContent($templateTd);
-$templateTable->addContent($templateTr);
-
-if (!empty ($evalIDArray)) {
-    $templateTable->addContent($lib->createGroupTitle([
-        " ",
-        _("Titel"),
-        _("Freigeben"),
-        " ",
-        " ",
-        " ",
-        _("Bearbeiten"),
-        _("Löschen")], YES, "user_template"));
-    foreach ($evalIDArray as $number => $evalID) {
-        $eval = new Evaluation ($evalID);
-        $open = ($openID == $evalID);
-        $templateTable->addContent($lib->createEvalRow($eval, $number, "user_template", $open, YES));
-        if ($open) {
-            $tr = new HTML ("tr");
-            $td = new HTML ("td");
-            $td->addAttr("colspan", "10");
-            $td->addContent($lib->createEvalContent($eval, $number, "user_template", $safeguard));
-            $tr->addContent($td);
-            $templateTable->addContent($tr);
-        }
-    }
-} else {
-    $tr = new HTML ("tr");
-    $td = new HTML ("td");
-    $td->addAttr("colspan", "10");
-    $td->addContent($lib->createInfoCol(_("Keine eigenen Evaluationsvorlagen vorhanden.")));
-    $tr->addContent($td);
-    $templateTable->addContent($tr);
-}
-
-/* ------------------------------------------------------ end: own templates */
-
-
-/* Create header with logo and safeguard messages -------------------------- */
-if (is_array($safeguard)) {
-    if ($safeguard["option"] == DISCARD_OPENID)
-        $openID = NULL;
-    $safeguard = $safeguard["msg"];
-}
-
-if (empty($openID)) {
-    $table->addContent($lib->createHeader($safeguard, $templateTable, $foundTable));
-} else {
-    $table->addContent($lib->createHeader(" ", $templateTable, $foundTable));
-}
-/* ------------------------------------------------------------- end: header */
-
-$table->addContent($lib->createClosingRow());
-/* ---------------------------------------------------------- end: templates */
-
-
-/* Create line with informations ------------------------------------------- */
-$tr = new HTML ("tr");
-$td = new HTML ("td");
-$td->addAttr("class", "blank");
-
-
-if (EvaluationObjectDB::getGlobalPerm() !== 'autor') {
-    $td->addContent($lib->createShowRangeForm());
-} else {
-    $td->addHTMLContent("Evaluationen aus dem Bereich \"" .
-        htmlReady($db->getRangename($rangeID)) . "\":");
-    $td->addContent(new HTMLempty ("br"));
-}
-$td->addContent(new HTMLempty ("br"));
-
-
-$tr->addContent($td);
-$table->addContent($tr);
-/* ----------------------------------------------------------- end: infoline */
-
-/* Show showrange search results ------------------------------------------- */
-if ($evalAction == "search_showrange" && Request::get("search")) {
-    $tr = new HTML ("tr");
-    $td = new HTML ("td");
-    $td->addAttr("class", "blank");
-    $td->addAttr("align", "left");
-    $td->addContent(new HTMLempty ("br"));
-    $b = new HTML ("b");
-    $line = new HTMLempty ("hr");
-    $line->addAttr("size", "1");
-    $line->addAttr("noshade", "noshade");
-#$td->addContent ($line);
-    $b->addContent(_('Suchergebnisse') . ':');
-    $td->addContent($b);
-
-    $td->addHTMLContent($lib->createDomainLinks(Request::get("search")));
-    $tr->addContent($td);
-    $table->addContent($tr);
-    $table->addContent($lib->createClosingRow());
-    echo $table->createContent();
-    return;
-}
-/* -------------------------------------- end: Show showrange search results */
-
-/* Show not started evaluations -------------------------------------------- */
-$evalIDArray = $db->getEvaluationIDs($rangeID, EVAL_STATE_NEW);
-
-$tr = new HTML ("tr");
-$td = new HTML ("td");
-$td->addAttr("class", "blank");
-$b = new HTML ("b");
-$b->addContent(_("Noch nicht gestartete Evaluationen: "));
-$td->addContent($b);
-
-if (!empty ($evalIDArray)) {
-    $td->addContent($lib->createGroupTitle([_("Titel"),
-        _("Autor"),
-        _("Startdatum"),
-        _("Status"),
-        "",
-        _("Bearbeiten"),
-        _("Löschen"),
-        ""]));
-    foreach ($evalIDArray as $number => $evalID) {
-        $eval = new Evaluation ($evalID);
-        $open = ($openID == $evalID);
-        $td->addContent($lib->createEvalRow($eval, $number, EVAL_STATE_NEW, $open));
-        if ($open)
-            $td->addContent($lib->createEvalContent($eval, $number, EVAL_STATE_NEW, $safeguard));
-    }
-
-} else {
-    $td->addContent($lib->createInfoCol(_("Keine neuen Evaluationen vorhanden.")));
-}
-$tr->addContent($td);
-$table->addContent($tr);
-$table->addContent($lib->createClosingRow());
-/* -------------------------------------------------------- end: not started */
-
-
-/* Show running evaluations ------------------------------------------------ */
-$evalIDArray = $db->getEvaluationIDs($rangeID, EVAL_STATE_ACTIVE);
-
-$tr = new HTML ("tr");
-$td = new HTML ("td");
-$td->addAttr("class", "blank");
-$td->addContent(new HTMLempty("br"));
-$b = new HTML ("b");
-$b->addContent(_("Laufende Evaluationen:"));
-$td->addContent($b);
-if (!empty ($evalIDArray)) {
-    $td->addContent($lib->createGroupTitle([_("Titel"),
-        _("Autor"),
-        _("Ablaufdatum"),
-        _("Status"),
-        "",
-        _("Exportieren"),
-        _("Löschen"),
-        _("Auswertung")]));
-    foreach ($evalIDArray as $number => $evalID) {
-        $eval = new Evaluation ($evalID);
-        $open = ($openID == $evalID);
-        $td->addContent($lib->createEvalRow($eval, $number, EVAL_STATE_ACTIVE, $open));
-        if ($open)
-            $td->addContent($lib->createEvalContent($eval, $number, EVAL_STATE_ACTIVE, $safeguard));
-    }
-} else {
-    $td->addContent($lib->createInfoCol(_("Keine laufenden Evaluationen vorhanden.")));
-}
-$tr->addContent($td);
-$table->addContent($tr);
-$table->addContent($lib->createClosingRow());
-/* ------------------------------------------------------------ end: running */
-
-
-/* Show stopped evaluations ------------------------------------------------ */
-$evalIDArray = $db->getEvaluationIDs($rangeID, EVAL_STATE_STOPPED);
-$tr = new HTML ("tr");
-$td = new HTML ("td");
-$td->addAttr("class", "blank");
-$td->addContent(new HTMLempty("br"));
-$b = new HTML ("b");
-$b->addContent(_("Beendete Evaluationen:"));
-$td->addContent($b);
-
-if (!empty ($evalIDArray)) {
-    $td->addContent($lib->createGroupTitle([_("Titel"),
-        _("Autor"),
-        "",
-        _("Status"),
-        "",
-        _("Exportieren"),
-        _("Löschen"),
-        _("Auswertung")]));
-    foreach ($evalIDArray as $number => $evalID) {
-        $eval = new Evaluation ($evalID);
-        $open = ($openID == $evalID);
-        $td->addContent($lib->createEvalRow($eval, $number, EVAL_STATE_STOPPED, $open));
-        if ($open)
-            $td->addContent($lib->createEvalContent($eval, $number, EVAL_STATE_STOPPED, $safeguard));
-    }
-} else {
-    $td->addContent($lib->createInfoCol(_("Keine gestoppten Evaluationen vorhanden.")));
-}
-$tr->addContent($td);
-$table->addContent($tr);
-$table->addContent($lib->createClosingRow());
-/* ------------------------------------------------------------ end: stopped */
-
-echo $table->createContent();
-
-
-if ($debug) {
-    echo "<pre>";
-    echo "rangeid = $rangeID\n";
-    echo "<font color=red>Nach Evaluationen suchen...</font><br>";
-    $evalArray = $db->getEvaluationIDs($rangeID);
-    echo "ed(n) " . count($evalArray) . " Evaluation(en) gefunden...</font><br>";
-    $evalArray = $db->getEvaluationIDs($rangeID, EVAL_STATE_NEW);
-    echo "Es wurde(n) " . count($evalArray) . " neue Evaluation(en) gefunden...</font><br>";
-    $evalArray = $db->getEvaluationIDs($rangeID, EVAL_STATE_ACTIVE);
-    echo "Es wurde(n) " . count($evalArray) . " laufende Evaluation(en) gefunden...</font><br>";
-    $evalArray = $db->getEvaluationIDs($rangeID, EVAL_STATE_STOPPED);
-    echo "Es wurde(n) " . count($evalArray) . " gestoppte Evaluation(en) gefunden...</font><br>";
-
-    echo EvalCommon::createErrorReport($db);
-
-    print_r($_POST);
-}
diff --git a/lib/evaluation/evaluation_admin_overview.lib.php b/lib/evaluation/evaluation_admin_overview.lib.php
deleted file mode 100644
index 40174ec..0000000
--- a/lib/evaluation/evaluation_admin_overview.lib.php
+++ /dev/null
@@ -1,2215 +0,0 @@
-<?php
-
-# Lifter002: TODO
-# Lifter005: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-use Studip\Button,
-    Studip\LinkButton;
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once HTML;
-require_once EVAL_LIB_COMMON;
-require_once EVAL_LIB_SHOW;
-require_once EVAL_FILE_EXPORTMANAGERCSV;
-# ====================================================== end: including files #
-# Define constants ========================================================== #
-/**
- * @const EVAL_TITLE Blah...
- */
-define("EVAL_TITLE", _("Evaluations-Verwaltung"));
-# ===================================================== end: define constants #
-
-/**
- * Library for the overview of all existing evaluations
- *
- * @author  Alexander Willner <mail@AlexanderWillner.de>
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- *
- */
-class EvalOverview
-{
-# Define all required variables ============================================= #
-    /**
-     * Databaseobject
-     * @access   private
-     * @var      object DatabaseObject $db
-     */
-
-    var $db;
-
-    /**
-     * Permobject
-     * @access   private
-     * @var      object Perm $perm
-     */
-    var $perm;
-
-    /**
-     * Userobject
-     * @access   private
-     * @var      object User $user
-     */
-    var $user;
-# ============================================================ end: variables #
-# Define constructor and destructor ========================================= #
-    /**
-     * Constructor
-     * @access   public
-     * @param object  DatabaseObject $db    The database object
-     * @param object  Perm $perm  The permission object
-     * @param object  User $user  The user object
-     */
-
-    function __construct($db, $perm, $user)
-    {
-        /* Set default values ------------------------------------------------- */
-        $this->db = $db;
-        $this->perm = $perm;
-        $this->user = $user;
-        /* -------------------------------------------------------------------- */
-    }
-
-# =========================================== end: constructor and destructor #
-# Define public functions =================================================== #
-    /**
-     *
-     */
-
-    function createMainTable()
-    {
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "0");
-        $table->addAttr("width", "100%");
-        $table->addAttr("style", "border:5px solid white;");
-        return $table;
-    }
-
-    /**
-     * Creates the funny blue small titlerows
-     * @access public
-     * @param array $rowTitles An array with all col-titles
-     * @param boolean $returnRow If YES it returns the row not the table
-     * @param string $state
-     */
-    function createGroupTitle($rowTitles, $returnRow = false, $state = false)
-    {
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML("tr");
-
-        if ($state == "user_template")
-            $style = "steel_with_table_row_even_bg";
-        elseif ($state == "public_template")
-            $style = "eval_grey_border";
-        else
-            $style = "table_header";
-
-        for ($i = 0; $rowTitles != NULL; $i++) {
-
-            $td = new HTML("td");
-            $td->addAttr("style", "vertical-align:bottom; font-weight:bold; white-space:nowrap");
-            $td->addAttr("nowrap", "nowrap");
-            $td->addAttr("height", "22");
-            $td->addAttr("class", $style);
-
-            if ($i == 0) {
-                $td->addAttr("width", $state == "public_template" ? "1" : "10");
-                $td->addHTMLContent("&nbsp;");
-            } else {
-                if ($i == 2 && $state == "user_template") {
-                    // the title
-                    $td->addAttr("width", "100%");
-                    $td->addAttr("align", "left");
-                } elseif ($i == 2 && $state == "public_template") {
-                    // the title
-                    $td->addAttr("width", "100%");
-                    $td->addAttr("align", "left");
-                } elseif ($i > 1) {
-                    $td->addAttr("width", "96");
-                    $td->addAttr("align", "center");
-                } elseif ($i == 1 && $state == "public_template") {
-                    // the preview
-                    $td->addAttr("width", "20");
-                    $td->addAttr("align", "left");
-                    $td->addHTMLContent("&nbsp;");
-                } else {
-                    $td->addAttr("align", "left");
-                }
-                $title = array_shift($rowTitles);
-                $title = empty($title) ? "&nbsp;" : $title;
-                $td->addHTMLContent($title);
-            }
-
-            # filter out not needed headlines
-            if ($state == "user_template" &&
-                (($i == 4) || ($i == 5))) {
-                //nothing
-            } elseif ($state == "public_template" &&
-                (($i == 6) || ($i == 7) || ($i == 9))) {
-                //nothing
-            } else
-                $tr->addContent($td);
-        } // for
-
-        $table->addContent($tr);
-
-        return $returnRow ? $tr : $table;
-    }
-
-    /**
-     * Test...
-     * @access public
-     * @param object  Evaluation  $eval  The evaluation
-     * @param string $number
-     * @param string $state
-     * @param string $open
-     * @param boolean $returnRow
-     */
-    function createEvalRow($eval, $number, $state, $open, $returnRow = false)
-    {
-
-        /* initialize variables -------- */
-        $evalID = $eval->getObjectID();
-        $numberOfVotes = EvaluationDB::getNumberOfVotes($evalID);
-
-        $no_permissons = EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval);
-        $no_buttons = 0;
-        if ($eval->getAuthor() != $GLOBALS['user']->id && $no_permissons)
-            $no_buttons = 1;
-
-        $style = ($number % 2) ? "table_row_odd" : ($number == 0 ? "content_body" : "table_row_even");
-
-        $startDate = $eval->getStartdate() == NULL ? " " : date("d.m.Y", $eval->getStartdate());
-
-        $stopDate = $eval->getRealStopdate() == NULL ? " " : date("d.m.Y", $eval->getRealStopdate());
-
-        $link = "?rangeID=" . $_SESSION["rangeID"];
-        if ($open == NO)
-            $link .= '&openID=' . $evalID . '#open';
-
-        $titleLink = new HTML('a');
-        $titleLink->addAttr('href', URLHelper::getLink($link));
-        $arrowLink = new HTML('a');
-        $arrowLink->addAttr('href', URLHelper::getLink($link));
-
-        $titleLink->addContent(($eval->getTitle()) ? $eval->getTitle() : ' ');
-
-        switch ($state) {
-
-            case "public_template":
-                $arrowLink = "&nbsp;";
-                $titleLink = $eval->getTitle() ? $eval->getTitle() : " ";
-                $content[0] = $eval->getFullName() ? $eval->getFullName() : " ";
-                $content[1] = $eval->getChangedate() == NULL ? " " : date("d.m.Y", $eval->getChangedate());
-
-                $button = LinkButton::create(_('Vorschau'), URLHelper::getURL('show_evaluation.php?evalID=' . $evalID . '&isPreview=' . YES), ['title' => _('Vorschau dieser öffentlichen Evaluationsvorlage.'),
-                    'onClick' => 'openEval(\'' . $evalID . '\'); return false;']);
-                $div = new HTML("div");
-                $div->addHTMLContent($button);
-                $content[4] = $div;
-
-                $content[2] = $eval->isAnonymous() ? EvalCommon::createImage(EVAL_PIC_YES, _("ja")) : EvalCommon::createImage(EVAL_PIC_NO, _("nein"));
-
-                $copyButton = new HTMLempty("input");
-                $copyButton->addAttr("style", "vertical-align:middle;");
-                $copyButton->addAttr("type", "image");
-                $copyButton->addAttr("name", "copy_public_template_button");
-                $copyButton->addAttr("src", Icon::create('arr_2down', 'sort')->asImagePath());
-                $copyButton->addAttr("border", "0");
-                $copyButton->addAttr("alt", _("Kopieren"));
-                $copyButton->addAttr("title", _("Diese öffentliche Evaluationsvorlagen zu den eigenen Evaluationsvorlagen kopieren"));
-                $content[5] = $copyButton;
-
-                break;
-
-            case "user_template":
-                $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_TEMPLATE_OPEN : EVAL_PIC_ARROW_TEMPLATE), _("Aufklappen")));
-                $isShared = $eval->isShared() ? YES : NO;
-                $shareButton = new HTMLempty("input");
-                $shareButton->addAttr("style", "vertical-align:middle;");
-                $shareButton->addAttr("type", "image");
-                $shareButton->addAttr("name", "share_template_button");
-                $shareButton->addAttr("src", $isShared ? EVAL_PIC_SHARED : EVAL_PIC_NOTSHARED);
-                $shareButton->addAttr("border", "0");
-                $shareButton->addAttr("alt", $isShared ? _("als öffentliche Evaluationsvorlage Freigeben") : _("Freigabe entziehen"));
-                $shareButton->addAttr("title", $isShared ? _("Die Freigabe für diese Evaluationsvorlage entziehen") : _("Diese Evaluationsvorlage öffentlich freigeben"));
-
-                $content[0] = $shareButton;
-                $content[3] = Button::create(_('Kopie erstellen'), 'copy_own_template_button', ['title' => _('Evaluationsvorlage kopieren')]);
-
-                $content[4] = LinkButton::create(_('Bearbeiten'), URLHelper::getURL("admin_evaluation.php?page=edit&evalID=" . $evalID), ['title' => _('Evaluation bearbeiten')]);
-
-                $content[5] = Button::create(_('Löschen'), 'delete_request_button', ['title' => _('Evaluation löschen')]);
-                break;
-
-            case EVAL_STATE_NEW:
-                $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_NEW_OPEN : EVAL_PIC_ARROW_NEW), _("Aufklappen")));
-                $content[0] = $eval->getFullName() ? $eval->getFullName() : " ";
-                $content[1] = $startDate;
-                if (!$no_buttons) {
-                    $content[2] = Button::create(_('Start'), 'start_button', ['title' => _('Evaluation starten')]);
-
-                    $content[4] = LinkButton::create(_('Bearbeiten'), URLHelper::getURL("admin_evaluation.php?page=edit&evalID=" . $evalID), ['title' => _('Evaluation bearbeiten')]);
-
-                    $content[5] = Button::create(_('Löschen'), 'delete_request_button', ['title' => _('Evaluation löschen')]);
-                }
-                break;
-
-            case EVAL_STATE_ACTIVE:
-                $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_RUNNING_OPEN : EVAL_PIC_ARROW_RUNNING), _("Aufklappen")));
-                $content[0] = $eval->getFullName() ? $eval->getFullName() : " ";
-                $content[1] = $stopDate;
-                if (!$no_buttons) {
-                    $content[2] = Button::createCancel(_('Stop'), 'stop_button', ['title' => _('Evaluation stoppen')]);;
-                    // Kann hier noch optimiert werden, da hasVoted () immer einen DB-Aufruf startet
-                    $content[3] = ($eval->hasVoted()) ? Button::create(_('Zurücksetzen'), 'restart_request_button', ['title' => _('Evaluation zurücksetzen')]) : Button::create(_('Zurücksetzen'), 'restart_confirmed_button', ['title' => _('Evaluation zurücksetzen')]);
-                    $content[4] = Button::create(_('Export'), 'export_request_button', ['title' => _('Evaluation exportieren')]);
-                    $content[5] = Button::create(_('Löschen'), 'delete_request_button', ['title' => _('Evaluation löschen')]);
-                    //$content[6] = EvalCommon::createSubmitButton ("auswertung", _("Auswertung"), "export_gfx_request_button");
-                    $content[6] = LinkButton::create(_('Auswertung'), URLHelper::getURL("eval_summary.php?eval_id=" . $evalID), ['title' => _('Auswertung')]);
-                }
-                break;
-
-            case EVAL_STATE_STOPPED:
-                $arrowLink->addContent(EvalCommon::createImage(($open ? EVAL_PIC_ARROW_STOPPED_OPEN : EVAL_PIC_ARROW_STOPPED), _("Aufklappen")));
-                $content[0] = $eval->getFullName() ? $eval->getFullName() : " ";
-                //$content[1] = $eval->isVisible() ? "yes" : "no";
-                if (!$no_buttons) {
-                    $content[2] = Button::create(_('Fortsetzen'), 'continue_button', ['title' => _('Evaluation fortsetzen')]);
-                    $content[3] = ($eval->hasVoted()) ? Button::create(_('Zurücksetzen'), 'restart_request_button', ['title' => _('Evaluation zurücksetzen')]) : Button::create(_('Zurücksetzen'), 'restart_confirmed_button', ['title' => _('Evaluation zurücksetzen')]);
-                    $content[4] = Button::create(_('Export'), 'export_request_button', ['title' => _('Evaluation exportieren')]);
-                    $content[5] = Button::create(_('Löschen'), 'delete_request_button', ['title' => _('Evaluation löschen')]);
-                    //$content[6] = EvalCommon::createSubmitButton ("auswertung", _("Auswertung"), "export_gfx_request_button");
-                    $content[6] = LinkButton::create(_('Auswertung'), URLHelper::getURL("eval_summary.php?eval_id=" . $evalID), ['title' => _('Auswertung')]);
-                }
-                break;
-        }
-
-        $form = new HTML("form");
-        $form->addAttr("action", URLHelper::getLink("?rangeID=" . $_SESSION["rangeID"]));
-        $form->addAttr("method", "post");
-        $form->addAttr("style", "display:inline;");
-        $form->addHTMLContent(CSRFProtection::tokenTag());
-
-        $input = new HTMLempty("input");
-        $input->addAttr("type", "hidden");
-        $input->addAttr("name", "evalID");
-        $input->addAttr("value", $evalID);
-
-        $form->addContent($input);
-
-
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML("tr");
-        $tr->addAttr("align", "center");
-
-        /* opening arrow */
-        $td = new HTML("td");
-        $td->addAttr("class", $style);
-        $td->addAttr("width", "10");
-        if ($open) {
-            $anchor = new HTML("a");
-            $anchor->addAttr("name", "open");
-            $anchor->addContent($arrowLink);
-            $td->addContent($anchor);
-        } else {
-            $td->addHTMLContent($arrowLink);
-        }
-
-        if ($state != "public_template")
-            $tr->addContent($td);
-        else {
-            $td = new HTML("td");
-            $td->addAttr("class", $style);
-            $td->addAttr("width", "1");
-
-            // create a blindgif
-            $blingif = new HTMLempty("img");
-            $blingif->addAttr("border", "0");
-            $blingif->addAttr("valign", "middle");
-            $blingif->addAttr("width", "1");
-            $blingif->addAttr("height", "24");
-            $blingif->addAttr("alt", " ");
-            $blingif->addAttr("src", Assets::image_path('forumleer.gif'));
-            $td->addContent($blingif);
-            $tr->addContent($td);
-        }
-
-        /* preview icon */
-        $td = new HTML("td");
-        $td->addAttr("width", $state == "public_template" ? "20" : "1%");
-        $td->addAttr("class", $style);
-        $td->addAttr("align", "left");
-        $icon = EvalCommon::createImage(EVAL_PIC_PREVIEW, _("Vorschau"));
-        $td->addContent(EvalCommon::createEvalShowLink($evalID, $icon, YES));
-        $tr->addContent($td);
-
-        /* title */
-        $td = new HTML("td");
-        $td->addAttr("class", $style);
-        $td->addAttr("align", "left");
-        if ($returnRow)
-            $td->addAttr("width", "100%");
-
-        $td->addContent($titleLink);
-
-        if ($state == EVAL_STATE_ACTIVE || $state == EVAL_STATE_STOPPED) {
-            $td->addContent("|");
-            $font = new HTML("font");
-            $font->addAttr("color", "#005500");
-            $font->addContent($numberOfVotes);
-            $td->addContent($font);
-            $td->addContent("|");
-        }
-        $tr->addContent($td);
-        /* the content fields */
-        //for( $i = 0; $i < 6; $i++ ) {
-        for ($i = 0; $i < 7; $i++) {
-            $td = new HTML("td");
-            $td->addAttr("width", "96");
-            $td->addAttr("class", $style);
-            $td->addAttr("nowrap", "nowrap");
-            $td->addAttr("style", "white-space:nowrap");
-            #if (is_object($content[$i]))
-            $td->addContent(($content[$i] ?? " "));
-            #$td->addHTMLContent ( ($content[$i] ? $content[$i] : "-") );
-            # filter out not needed datacells
-            if ($state == "user_template" &&
-                (($i == 1) || ($i == 2))) {
-                //nothing
-            } elseif ($state == "public_template" &&
-                (($i == 3) || ($i == 4))) {
-                //nothing
-            } else {
-                $tr->addContent($td);
-            }
-        } // end: for
-
-        $table->addContent($tr);
-        if ($returnRow)
-            $form->addContent($tr);
-        else
-            $form->addContent($table);
-
-        return $form;
-    }
-
-    /**
-     * Test...
-     * @access public
-     * @param object  Evaluation  $eval  The evaluation
-     */
-    function createEvalContent($eval, $number, $state, $safeguard)
-    {
-
-        /* initialize variables -------- */
-        $evalID = $eval->getObjectID();
-
-        $style = ($number % 2) ? "table_row_odd" : "table_row_even";
-
-        $form = new HTML("form");
-        $form->addAttr("name", "settingsForm");
-        $form->addAttr("action", URLHelper::getLink("?rangeID=" .
-            $_SESSION["rangeID"] . "&openID=" . $evalID . "#open"));
-        $form->addAttr("method", "post");
-        $form->addAttr("style", "display:inline;");
-        $form->addHTMLContent(CSRFProtection::tokenTag());
-
-        $input = new HTMLempty("input");
-        $input->addAttr("type", "hidden");
-        $input->addAttr("name", "evalID");
-        $input->addAttr("value", $evalID);
-
-        $form->addContent($input);
-
-        $a = new HTMLempty("a");
-        $a->addAttr("name", "open");
-
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML("tr");
-        $tr->addAttr("align", "center");
-
-        $td = new HTML("td");
-        $td->addAttr("class", $style);
-
-
-        $table2 = new HTML("table");
-        $table2->addAttr("align", "center");
-        $table2->addAttr("cellspacing", "0");
-        $table2->addAttr("cellpadding", "3");
-        $table2->addAttr("width", "90%");
-
-        $tr2 = new HTML("tr");
-        $td2 = new HTML("td");
-        $td2->addAttr("colspan", "2");
-#$td2->addAttr ("style", "padding-bottom:0; border-top:1px solid black;");
-        $td2->addAttr("align", "center");
-        $td2->addAttr("class", ($number % 2 ? "table_row_odd" : "table_row_even"));
-
-        $td2->addHTMLContent($safeguard);
-
-        $globalperm = EvaluationObjectDB::getGlobalPerm();
-
-        $no_permission = EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval);
-
-        if (($globalperm == "root" || $globalperm == "admin") &&
-            !Request::get("search") && $eval->isTemplate()) {
-            // no RuntimeSettings and Save-Button for Template if there are no ranges
-            $td2->addHTMLContent($this->createDomainSettings($eval, $state, $number % 2 ? "eval_grey_border" : "eval_light_border"));
-        } elseif ($no_permission) {
-            // no RuntimeSettings if there are ranges with no permission
-            $td2->addHTMLContent($this->createDomainSettings($eval, $state, $number % 2 ? "eval_grey_border" : "eval_light_border"));
-
-            $td2->addContent(new HTMLempty("br"));
-
-            $saveButton = Button::create(_('Übernehmen'), 'save_button', ['title' => _('Einstellungen speichern')]);
-            $td2->addContent($saveButton);
-        } else {
-            $td2->addHTMLContent($this->createRuntimeSettings($eval, $state, $number % 2 ? "eval_grey_border" : "eval_light_border"));
-
-            $td2->addHTMLContent($this->createDomainSettings($eval, $state, $number % 2 ? "eval_grey_border" : "eval_light_border"));
-            $td2->addContent(new HTMLempty("br"));
-
-            $saveButton = Button::create(_('Übernehmen'), 'save_button', ['title' => _('Einstellungen speichern')]);
-
-            $td2->addContent($saveButton);
-        }
-
-        if (!$eval->isTemplate()) {
-            /* No Infotext for templates, it makes no sense */
-            $show = new EvalShow ();
-            $td2->addContent($show->createEvalMetaInfo($eval, NO, NO));
-        }
-
-        $tr2->addContent($td2);
-        $table2->addContent($tr2);
-
-        $td->addContent($table2);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-#      $form->addContent ($a);
-        $form->addContent($table);
-
-        return $form;
-    }
-
-
-    /**
-     *
-     */
-    function createHeader($safeguard, $templates = NULL, $foundTable = "")
-    {
-        Helpbar::Get()->addPlainText(_('Übersicht'), _('Auf dieser Seite haben Sie eine Übersicht aller in dem ausgewählten Bereich existierenden Evaluationen sowie Ihrer eigenen Evaluationsvorlagen.'));
-        Helpbar::Get()->addPlainText(_('Ansicht'), _("Sie können eine Evaluation aufklappen und dann Bereichen zuordnen und ihre Laufzeit bestimmen."));
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "5");
-        $table->addAttr("width", "100%");
-
-        /* create new ---------------------------------------------------------- */
-        $actions = new ActionsWidget();
-        $actions->addLink(_('Neue Evaluationsvorlage'),
-            URLHelper::getURL('?rangeID=' . $_SESSION['rangeID'] . '&page=edit&newButton=1'),
-            Icon::create('add', 'clickable'));
-        Sidebar::get()->addWidget($actions);
-        /* ----------------------------------------------------- end: create new */
-
-        /* search template ----------------------------------------------------- */
-        $tr = new HTML("tr");
-        $td = new HTML("td");
-        $td->addAttr("class", "table_row_odd");
-        $td->addAttr("valign", "top");
-        $td->addContent(EvalOverview::createSearchTemplateForm());
-        $tr->addContent($td);
-        $table->addContent($tr);
-        /* --------------------------------------------------------- end: search */
-
-        /* Show found templates ------------------------------------------------ */
-        if ($foundTable) {
-            $tr = new HTML("tr");
-            $td = new HTML("td");
-            $td->addAttr("class", "table_row_odd");
-            $td->addContent($foundTable);
-            $tr->addContent($td);
-            $table->addContent($tr);
-        }
-        /* ------------------------------------------------- end: show templates */
-
-        /* Show templates ------------------------------------------------------ */
-        $tr = new HTML("tr");
-        $td = new HTML("td");
-        $td->addAttr("class", "content_body");
-        $td->addContent(" ");
-        $tr->addContent($td);
-        $table->addContent($tr);
-        $tr = new HTML("tr");
-        $td = new HTML("td");
-        $td->addAttr("valign", "top");
-        $td->addAttr("class", "table_row_even");
-        $td->addContent($templates ? $templates : " ");
-        $tr->addContent($td);
-        $table->addContent($tr);
-        /* -------------------------------------------------- end: show templates */
-
-        /* Create result ------------------------------------------------------- */
-        $tr = new HTML("tr");
-        $td = new HTML("td");
-        $td->addAttr("class", "blank");
-
-        $tr->addHTMLContent($safeguard);
-
-        $td->addContent($table);
-        $tr->addContent($td);
-        /* --------------------------------------------------------- end: result */
-
-        return $tr;
-    }
-
-    /**
-     *
-     */
-    function createShowRangeForm()
-    {
-
-        $currentRangeID = $_SESSION['rangeID'];
-
-        $form = new HTML("form");
-        $form->addAttr('class', 'default');
-        $form->addAttr("method", "post");
-        $form->addAttr("action", URLHelper::getLink());
-        $form->addHTMLContent(CSRFProtection::tokenTag());
-
-        $form->addHTMLContent('<fieldset>');
-
-        $headline = new HTML ("legend");
-        $headline->addAttr("class", "eval");
-        $headline->addContent(_("Evaluationen"));
-        $form->addContent($headline);
-
-        $select = new HTML("select");
-        $select->addAttr("name", "rangeID");
-        $select->addAttr("style", "vertical-align:middle;");
-
-        /* get allowed range id's for user */
-        $rangeIDs = $this->db->getValidRangeIDs($this->perm, $this->user, $currentRangeID);
-        /* add the currently shown range if neccessary */
-        if (is_array($rangeIDs) && !in_array($currentRangeID, array_keys($rangeIDs))) {
-            $rangeIDs[$currentRangeID] = ["name" => $this->db->getRangename($currentRangeID)];
-        }
-
-        foreach ($rangeIDs as $rangeID => $object) {
-            $option = new HTML("option");
-            if ($currentRangeID == $rangeID)
-                $option->addAttr("selected", "selected");
-
-            $option->addAttr("value", $rangeID);
-            if (empty($object["name"]))
-                $object["name"] = " ";
-            $option->addHTMLContent(htmlReady($object["name"]));
-            $select->addContent($option);
-        }
-        /* --------------------------------------------------------------------- */
-
-        $form->addHTMLContent('<label>');
-        $form->addContent(_("Evaluationen aus folgendem Bereich anzeigen"));
-        $form->addContent($select);
-        $form->addHTMLContent('</label>');
-        $form->addContent(" ");
-        $form->addContent(Button::create(_('Anzeigen'), ['title' => _('Evaluationen aus gewähltem Bereich anzeigen')]));
-        $form->addContent(new HTMLempty("br"));
-
-        /* search field for showing ranges (admin/root) */
-        if ($GLOBALS["perm"]->have_perm("admin")) {
-            $form->addHTMLContent('<label>');
-            $form->addContent(_("Nach weiteren Bereichen suchen"));
-            $input = new HTMLempty("input");
-            $input->addAttr("type", "text");
-            $input->addAttr("name", "search");
-            $input->addAttr("size", "30");
-            $form->addContent($input);
-            $form->addHTMLContent('</label>');
-            $form->addContent(Button::create(_('Suchen'), 'search_showrange_button', ['title' => _('Weitere Bereiche suchen')]));
-        }
-
-        $form->addHTMLContent('</fieldset>');
-
-        return $form;
-    }
-
-    /**
-     *
-     */
-    function createSearchTemplateForm()
-    {
-        $form = new HTML("form");
-        $form->addAttr('class', 'default');
-        $form->addAttr("method", "post");
-        $form->addAttr("action", URLHelper::getLink("?rangeID=" . $_SESSION["rangeID"]));
-        $form->addHTMLContent(CSRFProtection::tokenTag());
-
-        $form->addHTMLContent('<fieldset><legend>');
-        $form->addContent(_("Öffentliche Evaluationsvorlage suchen"));
-        $form->addHTMLContent('</legend>');
-
-        $form->addHTMLContent('<label>');
-        $form->addContent(_("Name der Vorlage"));
-
-        $input = new HTMLempty("input");
-        $input->addAttr("type", "text");
-        $input->addAttr("name", "templates_search");
-        $input->addAttr("value", stripslashes($GLOBALS['templates_search']));
-        $input->addAttr("style", "vertical-align:middle;");
-
-        $form->addContent($input);
-        $form->addHTMLContent('</label>');
-
-        $form->addHTMLContent('</fieldset><footer>');
-        $form->addContent(Button::create(_('Suchen'), 'search_template_button', ['title' => _('Öffentliche Vorlage suchen')]));
-        $form->addHTMLContent('</footer>');
-
-        return $form;
-    }
-
-    /**
-     * Creates a gray col with text
-     * @access public
-     * @param string $text The information
-     */
-    function createInfoCol($text)
-    {
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML("tr");
-
-        $td = new HTML("td");
-        $td->addAttr("class", "content_body");
-        $td->addContent($text);
-
-        $tr->addContent($td);
-
-        $table->addContent($tr);
-        return $table;
-    }
-
-    /**
-     * Creates a row with black line above (and "open all evals" link...?)
-     * @access public
-     */
-    function createClosingRow()
-    {
-        $tr = new HTML("tr");
-        $tr->addAttr("height", "2");
-        $td = new HTML("td");
-        $td->addAttr("class", "content_body");
-        $td->addContent("");
-        $tr->addContent($td);
-
-        return $tr;
-    }
-
-    /*
-     * modifies the eval and calls createSafeguard
-     *
-     * @access private
-     * @param evalAction   string comprised the action
-     */
-
-    public function callSafeguard($evalAction, $evalID = "", $showrangeID = NULL, $search = NULL, $referer = NULL)
-    {
-        if (!($evalAction || $evalAction == "search")) {
-            return " ";
-        }
-
-        if (!($GLOBALS['perm']->have_studip_perm("tutor", $showrangeID)) && $GLOBALS['user']->id != $showrangeID &&
-            !(Deputy::isEditActivated() && Deputy::isDeputy($GLOBALS['user']->id, $showrangeID, true))) {
-            return $this->createSafeguard("ausruf", _("Sie haben keinen Zugriff auf diesen Bereich."));
-        }
-
-        $evalDB = new EvaluationDB;
-        $evalChanged = NULL;
-        $safeguard = " ";
-        $startDate = NULL;
-        $stopDate  = NULL;
-        $timeSpan  = NULL;
-        /* Actions without any permissions ---------------------------------- */
-        switch ($evalAction) {
-            case "search_template":
-                $search = trim($search);
-                $templates = $evalDB->getPublicTemplateIDs($search);
-                if (mb_strlen($search) < EVAL_MIN_SEARCHLEN) {
-                    return MessageBox::error(sprintf(_("Bitte einen Suchbegriff mit mindestens %d Buchstaben eingeben."), EVAL_MIN_SEARCHLEN));
-                } elseif (count($templates) == 0) {
-                    return MessageBox::error(_("Es wurden keine passenden öffentlichen Evaluationsvorlagen gefunden."));
-                } else {
-                    return MessageBox::error(sprintf(_("Es wurde(n) %d passende öffentliche Evaluationsvorlagen gefunden."), count($templates)));
-                }
-            case "export_request":
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_NO_CHILDREN);
-                $haveNoPerm = EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval);
-                if ($haveNoPerm == YES) {
-                    return MessageBox::error(_("Sie haben nicht die Berechtigung diese Evaluation zu exportieren."));
-                }
-                /* -------------------------------------- end: check permissions */
-
-
-                /* Export evaluation ------------------------------------------- */
-                $exportManager = new EvaluationExportManagerCSV($evalID);
-                $exportManager->export();
-                /* -------------------------------------- end: export evaluation */
-
-
-                /* Create report ----------------------------------------------- */
-                if ($exportManager->isError()) {
-                    return MessageBox::error(_("Fehler beim Exportieren"));
-                } else {
-                    return MessageBox::success(
-                        _("Die Daten wurden erfolgreich exportiert. Sie können die Ausgabedatei jetzt herunterladen."),
-                        [
-                            sprintf(_("Bitte klicken Sie %s um die Datei herunter zu laden.") . "<br><br>", '<a href="' . FileManager::getDownloadLinkForTemporaryFile($exportManager->getTempFilename(), $exportManager->getFilename()) . '">' . _("auf diese Verknüpfung") . '</a>')
-                        ]
-                    );
-                }
-        }
-        /* ----------------------------------- end: actions without permissions */
-
-        $eval = new Evaluation($evalID, NULL, EVAL_LOAD_NO_CHILDREN);
-        $evalName = htmlready($eval->getTitle());
-
-        /* Check for errors while loading ------------------------------------- */
-        if ($eval->isError()) {
-            EvalCommon::createErrorReport($eval);
-            return $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-        }
-        /* -------------------------------------- end: errorcheck while loading */
-
-        /* Check for permissions in all ranges of the evaluation -------------- */
-        $no_permission_msg = '';
-        if (!$eval->isTemplate() && ($GLOBALS['user']->id != $eval->getAuthorID())) {
-
-            $no_permisson = (int)EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval);
-            if ($no_permisson > 0) {
-                if ($no_permisson === 1) {
-                    $no_permission_msg .= sprintf(_("Die Evaluation %s ist einem Bereich zugeordnet, für den Sie keine Veränderungsrechte besitzen."), $evalName);
-                } else {
-                    $no_permission_msg .= sprintf(_("Die Evaluation %s ist %s Bereichen zugeordnet, für die Sie keine Veränderungsrechte besitzen."), $evalName, $no_permisson);
-                }
-
-                if ($evalAction != "save") {
-                    $no_permission_msg .= " " . _("Der Besitzer wurde durch eine systeminterne Nachricht informiert.");
-                    $author = User::find($eval->getAuthorID());
-                    $sms = new messaging();
-                    $sms->insert_message(
-                        sprintf(_("Benutzer **%s** hat versucht eine unzulässige Änderung an Ihrer Evaluation **%s** vorzunehmen."),
-                            $GLOBALS['user']->username,
-                            $eval->getTitle()
-                        ),
-                        $author->username,
-                        "____%system%____",
-                        false,
-                        false,
-                        "1",
-                        false,
-                        _("Versuchte Änderung an Ihrer Evaluation")
-                    );
-                }
-            }
-        } else if ($eval->isTemplate() &&
-            $GLOBALS['user']->id != $eval->getAuthorID() &&
-            $evalAction != "copy_public_template" &&
-            $evalAction != "search_showrange") {
-            $author = User::find($eval->getAuthorID());
-            $sms = new messaging();
-            $sms->insert_message(
-                sprintf(
-                    _("Benutzer **%s** hat versucht eine unzulässige Änderung an Ihrem Template **%s** vorzunehmen."),
-                    $GLOBALS['user']->username,
-                    $eval->getTitle()
-                ), $author->username,
-                "____%system%____",
-                false,
-                false,
-                "1",
-                false,
-                _("Versuchte Änderung an Ihrem Template")
-            );
-            return MessageBox::error(sprintf(_("Sie besitzen keine Rechte für das Tempate <b>%s</b>. Der Besitzer wurde durch eine systeminterne Nachricht informiert."), $evalName));
-        }
-        /* ----------------------------------------- end: check for permissions */
-        switch ($evalAction) {
-            case "share_template":
-                if ($eval->isShared()) {
-                    $eval->setShared(NO);
-                    $eval->save();
-                    if ($eval->isError()) {
-                        $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                        return $safeguard;
-                    }
-                    $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluationsvorlage %s kann jetzt nicht mehr von anderen Benutzern gefunden werden."), $evalName));
-                } else {
-                    $eval->setShared(YES);
-                    $eval->save();
-                    if ($eval->isError()) {
-                        $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                        return $safeguard;
-                    }
-                    $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluationsvorlage %s kann jetzt von anderen Benutzern gefunden werden."), $evalName));
-                }
-                break;
-
-            case "copy_public_template":
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $newEval = $eval->duplicate();
-                $newEval->setAuthorID($GLOBALS['user']->id);
-                $newEval->setShared(NO);
-                $newEval->setStartdate(NULL);
-                $newEval->setStopdate(NULL);
-                $newEval->setTimespan(NULL);
-                $newEval->removeRangeIDs();
-                $newEval->save();
-                if ($newEval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($newEval));
-                    return $safeguard;
-                }
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die öffentliche Evaluationsvorlage <b>%s</b> wurde zu den eigenen Evaluationsvorlagen kopiert."), $evalName));
-                break;
-
-            case "start":
-
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht gestartet."));
-
-                $eval->setStartdate(time() - 500);
-                $eval->save();
-                if ($eval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluation %s wurde gestartet."), $evalName));
-                $evalChanged = YES;
-                break;
-
-            case "stop":
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht beendet."));
-
-                $eval->setStopdate(time());
-                $eval->save();
-                if ($eval->isError()) {
-                    EvalCommon::createErrorReport($eval);
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluation %s wurde beendet."), $evalName));
-                $evalChanged = YES;
-                break;
-
-            case "continue":
-
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht fortgesetzt."));
-
-                $eval->setStopdate(NULL);
-                $eval->setStartdate(time() - 500);
-                $eval->save();
-                if ($eval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluation %s wurde fortgesetzt."), $evalName));
-                $evalChanged = YES;
-                break;
-
-            case "restart_request":
-
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht zurücksetzen."));
-
-                $safeguard .= $this->createSafeguard("ausruf", sprintf(_("Die Evaluation %s wirklich zurücksetzen? Dabei werden alle bisher abgegebenen Antworten gelöscht!"), $evalName), "restart_request", $evalID, $showrangeID, $referer);
-                break;
-
-            case "restart_confirmed":
-
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht zurücksetzen."));
-
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $eval->resetAnswers();
-
-                $evalDB->removeUser($eval->getObjectID());
-                $eval->setStartdate(NULL);
-                $eval->setStopdate(NULL);
-                $eval->save();
-                if ($eval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluation %s wurde zurückgesetzt."), $evalName));
-                $evalChanged = YES;
-                break;
-
-            case "restart_aborted":
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluation %s wurde nicht zurückgesetzt."), $evalName), "", "", "", $referer);
-                break;
-
-            case "copy_own_template":
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $newEval = $eval->duplicate();
-                $newEval->setShared(NO);
-                $newEval->save();
-                if ($newEval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($newEval));
-                    return $safeguard;
-                }
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluationsvorlage %s wurde kopiert."), $evalName));
-                break;
-
-            case "delete_request":
-
-                if ($no_permission_msg) {
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht gelöscht."));
-                }
-
-                $text = $eval->isTemplate() ? sprintf(_("Die Evaluationsvorlage %s wirklich löschen?"), $evalName) : sprintf(_("Die Evaluation %s wirklich löschen?"), $evalName);
-                $safeguard .= $this->createSafeguard("ausruf", $text, "delete_request", $evalID, $showrangeID, $referer);
-                break;
-
-            case "delete_confirmed":
-
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht gelöscht."));
-
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $eval->delete();
-                if ($eval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-
-                $text = $eval->isTemplate() ? _("Die Evaluationsvorlage %s wurde gelöscht.") : _("Die Evaluation %s wurde gelöscht.");
-                $safeguard .= $this->createSafeguard("ok", sprintf($text, $evalName), "", "", "", $referer);
-                $evalChanged = YES;
-                break;
-
-            case "delete_aborted":
-                $text = $eval->isTemplate() ? _("Die Evaluationsvorlage %s wurde nicht gelöscht.") : _("Die Evaluation %s wurde nicht gelöscht.");
-                $safeguard .= $this->createSafeguard("ok", sprintf($text, $evalName), "", "", "", $referer);
-                break;
-
-            case "unlink_delete_aborted":
-                $text = _("Die Evaluation %s wurde nicht verändert.");
-                $safeguard .= $this->createSafeguard("ok", sprintf($text, $evalName), "", "", "", $referer);
-                break;
-
-            case "unlink_and_move":
-
-                if ($no_permission_msg)
-                    return $this->createSafeguard("ausruf", $no_permission_msg . "<br>" . _("Die Evaluation wurde nicht ausgehängt und zu den eigenen Evaluationsvorlagen verschoben."));
-
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $eval->removeRangeIDs();
-                $eval->setAuthorID($GLOBALS['user']->id);
-                $eval->resetAnswers();
-                $evalDB->removeUser($eval->getObjectID());
-                $eval->setStartdate(NULL);
-                $eval->setStopdate(NULL);
-                $eval->save();
-                if ($eval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-                $text = _("Die Evaluation %s wurde aus allen Bereichen ausgehängt und zu den eigenen Evaluationsvorlagen verschoben.");
-                $safeguard .= $this->createSafeguard("ok", sprintf($text, $evalName), "", "", "", $referer);
-                break;
-
-            case "created":
-                $safeguard .= $this->createSafeguard("ok", sprintf(_("Die Evaluation %s wurde angelegt."), $evalName));
-                break;
-
-
-            case "save2":
-            case "save":
-
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $update_message = sprintf(_("Die Evaluation %s wurde mit den Veränderungen gespeichert."), $evalName);
-                $time_msg = '';
-                /* Timesettings ---------------------------------------------------- */
-                if (Request::option("startMode")) {
-                    switch (Request::option("startMode")) {
-                        case "manual":
-                            $startDate = NULL;
-                            break;
-                        case "timeBased":
-                            $startDate = EvalCommon::date2timestamp(Request::int("startDay"), Request::int("startMonth"), Request::int("startYear"), Request::int("startHour"), Request::int("startMinute"));
-                            break;
-                        case "immediate":
-                            $startDate = time() - 1;
-                            break;
-                    }
-                    if ($no_permission_msg && ($eval->getStartdate != $startDate)) {
-                        $time_msg = $no_permission_msg . "<br>" . _("Die Einstellungen zur Startzeit wurden nicht verändert.");
-                    }
-                }
-
-                if (Request::option("stopMode")) {
-                    switch (Request::option("stopMode")) {
-                        case "manual":
-                            $stopDate = NULL;
-                            $timeSpan = NULL;
-                            break;
-                        case "timeBased":
-                            $stopDate = EvalCommon::date2timestamp(Request::int("stopDay"), Request::int("stopMonth"), Request::int("stopYear"), Request::int("stopHour"), Request::int("stopMinute"));
-                            $timeSpan = NULL;
-                            break;
-                        case "timeSpanBased":
-                            $stopDate = NULL;
-                            $timeSpan = Request::get("timeSpan");
-                            break;
-                    }
-
-                    if ($no_permission_msg &&
-                        ($eval->getStopdate() != $stopDate &&
-                            $eval->getTimespan() != $timeSpan)) {
-                        $time_msg = $time_msg ? $time_msg . "<br>" : $no_permission_msg;
-                        $time_msg .= _("Die Einstellungen zur Endzeit wurden nicht verändert.");
-                    }
-                }
-                /* ----------------------------------------------- end: timesettings */
-
-                $message = '';
-
-                /* link eval to ranges --------------------------------------------- */
-                $link_range_Array = Request::optionArray("link_range");
-                if ($link_range_Array) {
-                    $isTemplate = $eval->isTemplate();
-                    if ($isTemplate) {
-                        $newEval = $eval->duplicate();
-                        if ($newEval->isError()) {
-                            $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($newEval));
-                            return $safeguard;
-                        }
-                        $update_message = sprintf(_("Die Evaluationsvorlage %s wurde als Evaluation angelegt."), $evalName);
-                        $newEval->setStartdate($startDate);
-                        $newEval->setStopdate($stopDate);
-                        $newEval->setTimespan($timeSpan);
-                        $newEval->setShared(NO);
-                    } else {
-                        $newEval = &$eval;
-                    }
-
-                    $counter_linked = 0;
-                    foreach ($link_range_Array as $link_rangeID => $v) {
-                        if ($userid = get_userid($link_rangeID))
-                            $link_rangeID = $userid;
-                        $newEval->addRangeID($link_rangeID);
-                        $counter_linked++;
-                    }
-
-                    if ($isTemplate)
-                        $newEval->save();
-
-                    if ($newEval->isError()) {
-                        $safeguard .= $this->createSafeguard("ausruf", _("Fehler beim Einhängen von Bereichen.") . EvalCommon::createErrorReport($newEval));
-                        return $safeguard;
-                    }
-
-                    $message .= $message ? "<br>" : " ";
-                    $message .= ($counter_linked > 1) ? sprintf(_("Die Evaluation wurde in %s Bereiche eingehängt."), $counter_linked) : sprintf(_("Die Evaluation wurde in einen Bereich eingehängt."), $counter_linked);
-                }
-                /* ---------------------------------------- end: link eval to ranges */
-
-
-                /* copy eval to ranges --------------------------------------------- */
-                $copy_range_Array = Request::optionArray("copy_range");
-                if (!empty($copy_range_Array)) {
-                    $counter_copy = 0;
-                    foreach ($copy_range_Array as $copy_rangeID => $v) {
-                        if ($userid = get_userid($copy_rangeID))
-                            $copy_rangeID = $userid;
-                        $newEval = $eval->duplicate();
-                        if (Request::option("startMode"))
-                            $newEval->setStartdate($startDate);
-                        if (Request::get("stopMode")) {
-                            $newEval->setStopdate($stopDate);
-                            $newEval->setTimespan($timeSpan);
-                        }
-                        $newEval->setShared(NO);
-                        $newEval->removeRangeIDs();
-                        $evalDB->removeUser($newEval->getObjectID());
-                        $newEval->addRangeID($copy_rangeID);
-                        $newEval->save();
-                        $counter_copy++;
-
-                        if ($newEval->isError()) {
-                            $safeguard .= $this->createSafeguard("ausruf", _("Fehler beim Kopieren von Evaluationen in Bereiche.") . EvalCommon::createErrorReport($newEval));
-                            return $safeguard;
-                        }
-                    }
-
-                    $message .= $message ? "<br>" : " ";
-                    $message .= ($counter_copy > 1) ? sprintf(_("Die Evaluation wurde in %s Bereiche kopiert."), $counter_copy) : sprintf(_("Die Evaluation wurde in einen Bereich kopiert."), $counter_copy);
-                }
-                /* ------------------------------------------- end: copy eval to ranges */
-
-                /* unlink ranges ------------------------------------------------------- */
-                $remove_range_Array = Request::optionArray("remove_range");
-                if (!empty($remove_range_Array)) {
-
-                    /* if all rangeIDs will be removed, so ask if it should be deleted -- */
-                    if (is_array($remove_range_Array) && count($remove_range_Array) == $eval->getNumberRanges()) {
-                        $text = _("Sie wollen die Evaluation <b>%s</b> aus allen ihr zugeordneten Bereichen aushängen.<br>Soll die Evaluation gelöscht oder zu Ihren eigenen Evaluationsvorlagen verschoben werden?");
-                        $safeguard .= $this->createSafeguard("ausruf", sprintf($text, $evalName), "unlink_delete_request", $evalID, $showrangeID, $referer);
-                        $update_message = NULL;
-                        return $safeguard;
-                    }
-                    /* -------------------------------- end: ask if it should be deleted */
-                    $no_permission_ranges = EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval, YES);
-                    $counter_no_permisson = 0;
-                    if (is_array($no_permission_ranges)) {
-                        foreach ($remove_range_Array as $remove_rangeID => $v) {
-
-                            if ($userid = get_userid($remove_rangeID))
-                                $remove_rangeID = $userid;
-
-                            // no permisson to unlink this range
-                            if (in_array($remove_rangeID, $no_permission_ranges))
-                                $counter_no_permisson++;
-                        }
-                    }
-
-                    // if there are no_permisson_ranges to unlink, return
-                    if ($counter_no_permisson > 0) {
-
-                        if ($counter_no_permisson == 1)
-                            $safeguard .= $this->createSafeguard("ausruf", _("Sie wollen die Evaluation aus einem Bereich aushängen, für den Sie keine Berechtigung besitzten.<br> Die Aktion wurde nicht ausgeführt."));
-                        else
-                            $safeguard .= $this->createSafeguard("ausruf", sprintf(_("Sie wollen die Evaluation aus %d Bereichen aushängen, für die Sie keine Berechtigung besitzten.<br> Die Aktion wurde nicht ausgeführt."), $counter_no_permisson));
-                        return $safeguard;
-                    }
-
-                    reset($remove_range_Array);
-                    $counter_copy = 0;
-                    foreach ($remove_range_Array as $remove_rangeID => $v) {
-
-                        if ($userid = get_userid($remove_rangeID))
-                            $remove_rangeID = $userid;
-
-                        // the current range will be removed
-                        if ($showrangeID == $remove_rangeID)
-                            $current_range_removed = 1;
-
-                        $eval->removeRangeID($remove_rangeID);
-                        $counter_copy++;
-                    }
-
-
-                    if ($eval->isError()) {
-                        $safeguard .= $this->createSafeguard("ausruf", _("Fehler beim Aushängen von Bereichen.") . EvalCommon::createErrorReport($eval));
-                        return $safeguard;
-                    }
-
-                    $message .= $message ? "<br>" : " ";
-                    $message .= ($counter_copy > 1) ? sprintf(_("Die Evaluation wurde aus %s Bereichen ausgehängt."), $counter_copy) : sprintf(_("Die Evaluation wurde aus einem Bereich ausgehängt."), $counter_copy);
-
-                    if ($eval->getNumberRanges() == 0) {
-                        $message .= $message ? "<br>" : "";
-                        $message .= _("Sie ist nun keinem Bereich mehr zugeordnet und wurde zu den eigenen Evaluationsvorlagen verschoben.");
-                        $eval->setStartdate(NULL);
-                        $eval->setStopdate(NULL);
-                        $evalDB->removeUser($eval->getObjectID());
-
-                        if ($eval->isError()) {
-                            $safeguard .= $this->createSafeguard("ausruf", _("Fehler beim Kopieren von Evaluationen in Bereiche.") . EvalCommon::createErrorReport($newEval));
-                            return $safeguard;
-                        }
-                    } else {
-
-                        $no_permission_ranges = EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval);
-                        $number_of_ranges = $eval->getNumberRanges();
-
-                        if ($number_of_ranges == $no_permission_ranges) {
-                            $return["msg"] = $this->createSafeguard("ausruf", $message . "<br>" . sprintf(_("Sie haben die Evaluation <b>%s</b> aus allen ihren Bereichen ausgehängt."), $evalName));
-                            $return["option"] = DISCARD_OPENID;
-                            $eval->save();
-                            if ($eval->isError()) {
-                                return $this->createSafeguard("ausruf", _("Fehler beim Aushängen einer Evaluationen aus allen Bereichen auf die Sie Zugriff haben.") . EvalCommon::createErrorReport($newEval));
-                            }
-                            return $return;
-                        }
-                    }
-                }
-
-                if ($eval->isTemplate()) {
-                    if (empty($link_range) && empty($copy_range) && empty($remove_range)) {
-                        $update_message = sprintf(_("Es wurden keine Veränderungen an der Evaluationsvorlage <b>%s</b> gespeichert."), $evalName);
-                    }
-                } else {
-                    // nothing changed
-                    if (!Request::option('startMode') && !Request::option('stopMode') &&
-                        empty($link_range) && empty($copy_range) && empty($remove_range))
-                        $update_message = _("Es wurden keine Veränderungen gespeichert.");
-
-                    // set new start date
-                    if (Request::option("startMode") && !$time_msg) {
-                        $eval->setStartDate($startDate);
-
-                        if ($startDate != NULL && $startDate <= time() - 1) {
-                            $message .= $message ? "<br>" : " ";
-                            $message .= _("Die Evaluation wurde gestartet.");
-                        }
-                    }
-
-                    // set new stop date
-                    if (Request::get("stopMode") && !$time_msg) {
-                        $eval->setStopDate($stopDate);
-                        $eval->setTimeSpan($timeSpan);
-
-                        if (($stopDate != NULL && $stopDate <= time() - 1) ||
-                            ($timeSpan != NULL && $eval->getStartdate() != NULL && ((int)$eval->getStartdate() + (int)$timeSpan) <= time() - 1)) {
-                            $message .= $message ? "<br>" : " ";
-                            $message .= _("Die Evaluation wurde beendet.");
-                        }
-                    }
-
-                    if ($eval->isError()) {
-                        $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                        return $safeguard;
-                    }
-
-                    $eval->save();
-                }
-
-                $evalChanged = YES;
-
-                // start/endtime aren't saved, because of ranges with no permisson
-                if ($time_msg)
-                    $safeguard .= $this->createSafeguard(
-                        "ausruf", $time_msg);
-
-                // everything is just fine so print the all messages
-                if ($update_message && !$time_msg)
-                    $safeguard .= $this->createSafeguard(
-                        "ok", $update_message . "<br>" . $message);
-                // messages from un/linking an making copys
-                elseif ($time_msg && $message)
-                    $safeguard .= $this->createSafeguard(
-                        "ok", $message);
-
-                break;
-
-            case "search_showrange":
-            case "search_range":
-                $search = Request::get("search");
-
-                if (EvaluationObjectDB::getGlobalPerm(YES) < 31) {
-                    return $this->createSafeguard("ausruf", _("Sie besitzen keine Berechtigung eine Suche durchzuführen."));
-                }
-
-                $results = $evalDB->search_range($search);
-                if (empty($search))
-                    $safeguard .= $this->createSafeguard("ausruf", _("Bitte einen Suchbegriff eingeben."), $search);
-                elseif (empty($results))
-                    $safeguard .= $this->createSafeguard("ausruf", sprintf(_("Es wurde kein Bereich gefunden, der den Suchbegriff <b>%s</b> enthält."), htmlReady($search)), $search);
-                else
-                    $safeguard .= $this->createSafeguard("ok", sprintf(_("Es wurden %s Bereiche gefunden, die den Suchbegriff <b>%s</b> enthalten."), count($results), htmlReady($search)), $search);
-                break;
-
-            case "check_abort_creation":
-
-                # check if the evaluation is new and not yet edited
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_NO_CHILDREN);
-                $abort_creation = false;
-                if ($eval->getTitle() == _("Neue Evaluation") &&
-                    $eval->getText() == "") {
-                    # the evaluationen may be not edited yet ... so continue checking
-                    $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                    $number_of_childs = $eval->getNumberChildren();
-                    $child = $eval->getNextChild();
-                    if ($number_of_childs == 1 &&
-                        $child &&
-                        $child->getTitle() == _("Erster Gruppierungsblock") &&
-                        $child->getChildren() == NULL &&
-                        $child->getText() == "") {
-                        $abort_creation = true;
-                    }
-                }
-
-                if (!$abort_creation)
-                    break;
-            # continue abort_creation
-
-            case "abort_creation":
-                $eval = new Evaluation($evalID, NULL, EVAL_LOAD_ALL_CHILDREN);
-                $eval->delete();
-                // error_ausgabe
-                if ($eval->isError()) {
-                    $safeguard .= $this->createSafeguard("", EvalCommon::createErrorReport($eval));
-                    return $safeguard;
-                }
-
-                $safeguard .= $this->createSafeguard("ok", _("Die Erstellung einer Evaluation wurde abgebrochen."), "", "", "", $referer);
-                break;
-
-            case "nothing":
-                break;
-
-            default:
-                $safeguard .= $this->createSafeguard("ausruf", _("Fehler! Es wurde versucht, eine nicht vorhandene Aktion auszuführen."));
-                break;
-        }
-
-        /* Send SMS when eval has been modified by admin/root ----------------- */
-        if (($evalChanged) && ($eval->getAuthorID() != $GLOBALS['user']->id)) {
-            $sms = new messaging();
-            $sms->insert_message(sprintf(_("An Ihrer Evaluation \"%s\" wurden von %s Änderungen vorgenommen."), $eval->getTitle(), $GLOBALS['user']->username), get_username($eval->getAuthorID()), "____%system%____", FALSE, FALSE, "1");
-        }
-        /* ------------------------------------------------------ end: send SMS */
-
-        // the current range has been removed from the eval
-        if (!empty($current_range_removed)) {
-            $return["msg"] = $safeguard;
-            $return["option"] = DISCARD_OPENID;
-            return $return;
-        } else {
-            return $safeguard;
-        }
-    }
-
-// callSafeguard
-
-    /**
-     * creates the 'Safeguard'
-     *
-     * @access  private
-     * @param sign   string Sign to draw (must be "ok" or "ausruf")
-     * @param text   string        The Text to draw
-     * @param evalID string needed if you want to delete an evaluation (not needed)
-     */
-    public function createSafeguard($sign, $text, $mode = NULL, $evalID = NULL, $showrangeID = NULL, $referer = NULL)
-    {
-        //TODO: auf messagebox bzw. createQuestion umstellen!!!
-
-        if (mb_stripos($mode, 'request') === false && $sign != '') {
-            if($sign === 'ok') {
-                return MessageBox::success($text);
-            } else {
-                return MessageBox::error($text);
-            }
-        }
-        $label = [
-            "referer" => _("Zum vorherigen Bereich zurückkehren."),
-            "yes" => _("Ja!"),
-            "no" => _("Nein!"),
-            "delete" => _("Löschen."),
-            "template" => _("Zu den eigenen Evaluationsvorlagen verschieben."),
-            "cancel" => _("Abbrechen")
-        ];
-
-        if ($referer) {
-            $linkreferer = "&referer=" . $referer;
-        }
-        $request = NO;
-        $value1 = '';
-        $value2 = '';
-        if ($mode == "delete_request") {
-            $value1 = "delete_confirmed";
-            $value2 = "delete_aborted";
-            $request = YES;
-        }
-        if ($mode == "restart_request") {
-            $value1 = "restart_confirmed";
-            $value2 = "restart_aborted";
-            $request = YES;
-        }
-
-        if ($referer) {
-            URLHelper::bindLinkParam('referer', $referer);
-        }
-
-        if ($request) {
-            return QuestionBox::create(
-                $text,
-                URLHelper::getURL('admin_evaluation.php?evalAction=' . $value1 . '&evalID=' . $evalID . '&rangeID=' . $showrangeID),
-                URLHelper::getURL('admin_evaluation.php?evalAction=' . $value2 . '&evalID=' . $evalID . '&rangeID=' . $showrangeID)
-            );
-        }
-
-        if ($mode == "unlink_delete_request") {
-            $add_cancel = !$referer ?: "&referer=" . $referer;
-            $links = [
-                URLHelper::getURL('admin_evaluation.php?evalAction=delete_confirmed&evalID=' . $evalID . '&rangeID=' . $showrangeID),
-                URLHelper::getURL('admin_evaluation.php?evalAction=unlink_delete_aborted&evalID=' . $evalID . '&rangeID=' . $showrangeID),
-                URLHelper::getURL('admin_evaluation.php?evalAction=unlink_and_move&evalID=' . $evalID . '&rangeID=' . $showrangeID . $add_cancel)
-            ];
-            $details[] = LinkButton::create(_('Löschen'), $links[0], ['title' => $label["delete"]]);
-            $details[] = LinkButton::create(_('Verschieben'), $links[1], ['title' => $label["template"]]);
-            $details[] = LinkButton::createCancel(_('Abbrechen'), $links[2], ['title' => $label["cancel"]]);
-
-            return MessageBox::info($text, $details);
-        }
-
-        if ($referer) {
-            return LinkButton::create($label["referer"], URLHelper::getLink($referer));
-        }
-    }
-
-    /**
-     * prints the tables for the runtime settings (start date, stop date...)
-     *
-     * @access  private
-     * @param   $eval    the eval object
-     * @param   $state   the eval's state (EVAL_STATE_NEW, EVAL_STATE_ACTIVE, ...)
-     * @param   $style   the background style
-     * @return  string   the runtime settings (html)
-     */
-    function createRuntimeSettings($eval, $state, $style)
-    {
-        $html = "";
-        $startDate = $eval->getStartdate();
-        $stopDate = $eval->getStopdate();
-        $timeSpan = $eval->getTimespan();
-
-        if ($startDate == NULL)
-            $startMode = "manual";
-        else
-            $startMode = "timeBased";
-
-        if ($stopDate == NULL)
-            $stopMode = "manual";
-        else
-            $stopMode = "timeBased";
-
-        if ($timeSpan != NULL)
-            $stopMode = "timeSpanBased";
-
-        if (!$startDate || $startDate == -1)
-            $startDate = time();
-
-        $startDay = date("d", $startDate);
-        $startMonth = date("m", $startDate);
-        $startYear = date("Y", $startDate);
-        $startHour = date("H", $startDate);
-        $startMinute = date("i", $startDate);
-
-        if (!$stopDate || $stopDate == -1)
-            $stopDate = mktime(0, 0, 0, date("m") + 1, date("d"), date("Y"));
-
-        $stopDay = date("d", $stopDate);
-        $stopMonth = date("m", $stopDate);
-        $stopYear = date("Y", $stopDate);
-        $stopHour = date("H", $stopDate);
-        $stopMinute = date("i", $stopDate);
-
-        if (!$timeSpan)
-            $timeSpan = 1209600; // default: 2 weeks
-
-        $html .= "<table border=0 align=center cellspacing=0 cellpadding=4 width=\"100%\">\n";
-        $html .= "<tr><td colspan=\"2\">\n";
-        $html .= "<b>" . _("Einstellungen zur Start- und Endzeit:") . "</b>";
-        $tooltip = $eval->isTemplate()
-            ? _('Legen Sie fest, von wann bis wann alle eingehängten und kopierten Instanzen dieser Evaluationsvorlage in Stud.IP öffentlich sichtbar sein sollen.')
-            : _('Legen Sie fest, von wann bis wann die Evaluation in Stud.IP öffentlich sichtbar sein soll.');
-        $html .= " ";
-        $html .= Icon::create('info-circle', 'inactive', ['title' => $tooltip])->asImg(['class' => 'middle']);
-        $html .= "</td></tr>";
-        $html .= "<tr>";
-
-        /* START TIME settings ------------------------------------------------- */
-        $html .= "<td width=\"50%\" valign=\"top\">"
-            . "<table width=\"100%\" cellpadding=0 cellspacing=0 border=0>\n"
-            . "<tr>"
-            . "<td class=\"$style\" height=\"22\" align=\"left\" "
-            . "style=\"vertical-align:bottom;\">"
-            . "<b>"
-            . "&nbsp;"
-            . _("Anfang")
-            . "</b>"
-            . "</td>"
-            . "</tr>\n";
-
-        /* Eval has NOT started yet --- */
-        if ($state == EVAL_STATE_NEW || $eval->isTemplate()) {
-            $html .= "<tr><td class=\"table_row_even\">";
-            $html .= "<input type=radio name=\"startMode\" value=\"manual\" " . ($startMode == "manual" ? "checked" : "") . ">&nbsp;";
-            $html .= _("später manuell starten");
-            $html .= "</td></tr>";
-
-            $html .= "<tr><td class=table_row_odd>";
-            $html .= "<input type=radio name=\"startMode\" value=\"timeBased\" " . ($startMode == "timeBased" ? "checked" : "") . ">&nbsp;";
-            $html .= _("Startzeitpunkt:");
-            $html .= "&nbsp;&nbsp;<input type=text name=\"startDay\" size=3 maxlength=2 value=\"" . $startDay . "\">&nbsp;.&nbsp;"
-                . "<input type=text name=\"startMonth\" size=3 maxlength=2 value=\"" . $startMonth . "\">&nbsp;.&nbsp;"
-                . "<input type=text name=\"startYear\" size=5 maxlength=4 value=\"" . $startYear . "\">&nbsp;"
-                . sprintf(_("um %s Uhr"), "&nbsp;<input type=text name=\"startHour\" size=3 maxlength=2 value=\"" . $startHour . "\">&nbsp;:" .
-                    "&nbsp;<input type=text name=\"startMinute\" size=3 maxlength=2 value=\"" . $startMinute . "\">&nbsp;");
-            $html .= "</td></tr>";
-
-            $html .= "<tr><td class=table_row_even valign=middle>";
-            $html .= "<input type=radio name=\"startMode\" value=\"immediate\">&nbsp;";
-            $html .= _("sofort");
-            $html .= "</td></tr>";
-        } /* Eval is already running or finished --- */ else {
-            $html .= "<tr><td><font size=\"+2\">&nbsp;</font></td></tr>";
-            $html .= "<tr><td valign=\"middle\" align=\"center\">";
-            $html .= sprintf(_("Startzeitpunkt war der <b>%s</b> um <b>%s</b> Uhr."), date("d.m.Y", $startDate), date("H:i", $startDate));
-            $html .= "</td></tr>";
-            $html .= "<tr><td><font size=\"+2\">&nbsp;</font></td></tr>";
-        }
-        $html .= "</table></td>";
-
-
-        /* END TIME settings --------------------------------------------------- */
-        $html .= "<td width=\"50%\" valign=\"top\">"
-            . "<table width=\"100%\" cellpadding=0 cellspacing=0 border=0>\n"
-            . "<tr>"
-            . "<td class=\"$style\" height=\"22\" align=\"left\" "
-            . "style=\"vertical-align:bottom;\">"
-            . "<b>"
-            . "&nbsp;"
-            . _("Ende")
-            . "</b>"
-            . "</td>"
-            . "</tr>\n";
-
-        /* Eval has NOT finished yet --- */
-        if ($state != EVAL_STATE_STOPPED) {
-            $html .= "<tr><td class=table_row_even>\n"
-                . "<input type=radio name=\"stopMode\" value=\"manual\" " . ($stopMode == "manual" ? "checked" : "") . ">&nbsp;"
-                . _("manuell beenden")
-                . "</td></tr>"
-                . "<tr><td class=table_row_odd>\n"
-                . "<input type=radio name=\"stopMode\" value=\"timeBased\" " . ($stopMode == "timeBased" ? "checked" : "") . ">&nbsp;"
-                . _("Endzeitpunkt:");
-
-            $html .= "&nbsp;&nbsp;"
-                . "<input type=text name=\"stopDay\" size=3 maxlength=2 value=\"" . $stopDay . "\">&nbsp;.&nbsp;"
-                . "<input type=text name=\"stopMonth\" size=3 maxlength=2 value=\"" . $stopMonth . "\">&nbsp;.&nbsp;"
-                . "<input type=text name=\"stopYear\" size=5 maxlength=4 value=\"" . $stopYear . "\">&nbsp;"
-                . sprintf(_("um %s Uhr"), "&nbsp;<input type=text name=\"stopHour\" size=3 maxlength=2 value=\"" . $stopHour . "\">&nbsp;:" .
-                    "&nbsp;<input type=text name=\"stopMinute\" size=3 maxlength=2 value=\"" . $stopMinute . "\">&nbsp;");
-            $html .= "&nbsp;"
-                . "</td></tr>"
-                . "<tr><td class=table_row_even valign=middle>"
-                . "<input type=radio name=\"stopMode\" value=\"timeSpanBased\" " . ($stopMode == "timeSpanBased" ? "checked" : "")
-                . ">&nbsp;"
-                . _("Zeitspanne")
-                . "&nbsp;&nbsp;"
-                . "<select name=\"timeSpan\" style=\"vertical-align:middle\" size=1 "
-                . ">";
-
-            for ($i = 1; $i <= 12; $i++) {
-                $secs = $i * 604800;  // == weeks * seconds per week
-
-                $html .= "\n<option value=\"" . $secs . "\" ";
-                if ($timeSpan == $secs)
-                    $html .= "selected";
-                $html .= ">";
-                $html .= sprintf(
-                    ngettext(
-                        '%d Woche',
-                        '%d Wochen',
-                        $i
-                    ),
-                    $i
-                );
-                $html .= "</option>";
-            }
-            $html .= "</select>";
-
-            if ($stopMode == "timeSpanBased" && $startMode != "manual") {
-
-                $startDate = ($startMode == "immediate") ? time() : $startDate;
-
-                $html .= "&nbsp;";
-                $html .= Icon::create('refresh', 'clickable', ['title' => _('Endzeitpunkt neu berechnen')])->asInput(['name' => 'save2_button', 'align' => 'middle',]);
-                $html .= sprintf(_(" (<b>%s</b> um <b>%s</b> Uhr)"), strftime("%d.%m.%Y", $startDate + $timeSpan), strftime("%H:%M", $startDate + $timeSpan));
-            }
-            $html .= "</td></tr>";
-        } else {
-            $html .= "<tr><td><font size=\"+2\">&nbsp;</font></td></tr>";
-            $html .= "<tr><td valign=\"middle\" align=\"center\">";
-            $html .= sprintf(_("Endzeitpunkt war der <b>%s</b> um <b>%s</b> Uhr."), date("d.m.Y", $stopDate), date("H:i", $stopDate));
-            $html .= "</td></tr>";
-            $html .= "<tr><td><font size=\"+2\">&nbsp;</font></td></tr>";
-        }
-        $html .= "</table>";
-
-        $html .= "</td></tr>";
-        $html .= "</table>";
-
-        return $html;
-    }
-
-    /**
-     *  the current eval-ranges and the options to copy and link ranges
-     *
-     * @access  private
-     * @param   $eval    the eval object
-     * @param   $state   the eval's state (EVAL_STATE_NEW, EVAL_STATE_ACTIVE, ...)
-     * @param   $style   the background style
-     * @return  string   the domain settings (html)
-     */
-    public function createDomainSettings($eval, $state, $style)
-    {
-        $db = new EvaluationObjectDB ();
-        $evalDB = new EvaluationDB ();
-        $evalID = $eval->getObjectID();
-        $globalperm = EvaluationObjectDB::getGlobalPerm();
-
-        // linked ranges
-        $rangeIDs = $eval->getRangeIDs();
-
-        // search results
-        if (Request::get("search"))
-            $results = $evalDB->search_range(Request::get("search"));
-        else
-            $results = $evalDB->search_range("");
-
-        if ($globalperm == "root") {
-            $results["studip"] = ["type" => "system", "name" => _("Systemweite Evaluationen")];
-        } elseif ($globalperm == "dozent" || $globalperm == "autor" || $globalperm == "admin") {
-            $results[$GLOBALS['user']->id] = ["type" => "user", "name" => _("Profil")];
-        }
-
-        if ($globalperm == "dozent" || $globalperm == "autor" || Request::get("search"))
-            $showsearchresults = 1;
-
-
-        if ($globalperm == "autor")
-            $range_types = [
-                "user" => _("Benutzer"),
-                "sem" => _("Veranstaltung")];
-        elseif ($globalperm == "dozent")
-            $range_types = [
-                "user" => _("Benutzer"),
-                "sem" => _("Veranstaltung"),
-                "inst" => _("Einrichtung")];
-        elseif ($globalperm == "admin")
-            $range_types = [
-                "user" => _("Benutzer"),
-                "sem" => _("Veranstaltung"),
-                "inst" => _("Einrichtung"),
-                "fak" => _("Fakultät")];
-        elseif ($globalperm == "root")
-            $range_types = [
-                "user" => _("Benutzer"),
-                "sem" => _("Veranstaltung"),
-                "inst" => _("Einrichtung"),
-                "fak" => _("Fakultät"),
-                "system" => _("System")];
-
-
-        // zugewiesene Bereiche
-        $table_r = new HTML("table");
-#   $table_r->addAttr ("class","white");
-        $table_r->addAttr("border", "0");
-        $table_r->addAttr("align", "center");
-        $table_r->addAttr("cellspacing", "0");
-        $table_r->addAttr("cellpadding", "0");
-        $table_r->addAttr("width", "100%");
-        $table_r->addAttr('class', 'default');
-
-        // Überschriften
-        $tr_r = new HTML("tr");
-
-        $td_r = new HTML("td");
-        $td_r->addAttr("class", "$style");
-        $td_r->addAttr("style", "vertical-align:bottom;");
-        $td_r->addAttr("height", "22");
-        $b_r = new HTML("b");
-        $b_r->addHTMLContent("&nbsp;");
-        $b_r->addContent(_("Bereich"));
-        $td_r->addContent($b_r);
-        $tr_r->addContent($td_r);
-
-        $td_r = new HTML("td");
-        $td_r->addAttr("class", "$style");
-        $td_r->addAttr("height", "22");
-        $td_r->addAttr("align", "center");
-        $td_r->addAttr("style", "vertical-align:bottom;");
-        $b_r = new HTML("b");
-        $b_r->addContent(_("aushängen"));
-        $td_r->addContent($b_r);
-        $tr_r->addContent($td_r);
-
-        $table_r->addContent($tr_r);
-
-        if ($rangeIDs) {
-
-            // die verknüpften bereiche
-            foreach ($rangeIDs as $k => $assigned_rangeID) {
-                $tr_r = new HTML("tr");
-
-                // title
-                $td_r = new HTML("td");
-                $td_r->addHTMLContent("&nbsp;");
-                $td_r->addContent($db->getRangename($assigned_rangeID, NO));
-#         $td_r->addContent ($db->getRangename($assigned_rangeID));
-                $tr_r->addContent($td_r);
-
-                if (($this->perm->have_studip_perm("tutor", $assigned_rangeID)) ||
-                    $assigned_rangeID == $GLOBALS['user']->id) {
-                    // link
-                    $td_r = new HTML("td");
-                    $td_r->addAttr("align", "center");
-                    $input = new HTMLempty("input");
-                    $input->addAttr("type", "checkbox");
-                    $input->addAttr("name", "remove_range[$assigned_rangeID]");
-                    $input->addAttr("value", "1");
-                    $td_r->addContent($input);
-                } else {
-                    // no permission
-                    $td_r = new HTML("td");
-                    $td_r->addAttr("align", "center");
-                    $td_r->addContent(_("Sie haben keine Berechtigung die Evaluation aus diesem Bereich auszuhängen."));
-                }
-                $tr_r->addContent($td_r);
-                $table_r->addContent($tr_r);
-            }
-        } else {
-            $td_r = new HTML("td");
-            $td_r->addAttr("class", "content_body");
-            $td_r->addAttr("width", "40");
-            $td_r->addAttr("align", "center");
-            $td_r->addAttr("style", "vertical-align:bottom;");
-            $td_r->addAttr("colspan", "2");
-            $b_r = new HTML("b");
-            $b_r->addHTMLContent("&nbsp;");
-            $b_r->addContent(_("Diese Evaluation wurde keinem Bereich zugeordnet."));
-            $td_r->addContent($b_r);
-            $tr_r->addContent($td_r);
-
-            $table_r->addContent($tr_r);
-        }
-
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("align", "center");
-        $table->addAttr("cellspacing", "0");
-        $table->addAttr("cellpadding", "4");
-        $table->addAttr("width", "100%");
-
-        $tr = new HTML("tr");
-
-        $td = new HTML("td");
-        $td->addAttr("colspan", "2");
-        $td->addAttr("style", "padding-bottom:0; border-top:1px solid black;");
-        $b = new HTML("b");
-        $b->addContent(_("Diese Evaluation ist folgenden Bereichen zugeordnet:"));
-        $td->addContent($b);
-        $td->addContent(EvalCommon::createImage(EVAL_PIC_HELP, "", tooltip(_(" können Sie Ihre Evaluation aus den verknüpften Bereichen entfernen."), TRUE, TRUE)));
-        $tr->addContent($td);
-        if (!$eval->isTemplate())
-            $table->addContent($tr);
-
-        $tr = new HTML("tr");
-
-        $td = new HTML("td");
-        $td->addAttr("colspan", "2");
-        $td->addContent($table_r);
-        $tr->addContent($td);
-        if (!$eval->isTemplate())
-            $table->addContent($tr);
-
-        // display search_results
-        if ($results) {
-            foreach ($results as $k => $v) {
-                if (!empty($range_types)) {
-                    foreach ($range_types as $type_key => $type_value) {
-                        if ($v["type"] == $type_key) {
-                            $ranges["$type_key"][] = ["id" => $k, "name" => $v["name"]];
-                        }
-                    }
-                    reset($range_types);
-                }
-            }
-
-            $table_s = new HTML("table");
-            $table_s->addAttr("border", "0");
-            $table_s->addAttr("align", "center");
-            $table_s->addAttr("cellspacing", "0");
-            $table_s->addAttr("cellpadding", "0");
-            $table_s->addAttr("width", "100%");
-
-            if (!empty($range_types)) {
-                foreach ($range_types as $type_key => $type_value) {
-
-                    // Überschriften
-                    $tr_s = new HTML("tr");
-
-                    // Typ
-                    $td_s = new HTML("td");
-                    $td_s->addAttr("colspan", "1");
-                    $td_s->addAttr("class", "$style");
-                    $td_s->addAttr("height", "22");
-                    $td_s->addAttr("style", "vertical-align:bottom;");
-                    $b_s = new HTML("b");
-                    $b_s->addHTMLContent("&nbsp;");
-                    $b_s->addContent($type_value . ":");
-                    $td_s->addContent($b_s);
-                    $tr_s->addContent($td_s);
-
-                    // link
-                    $td_s = new HTML("td");
-                    $td_s->addAttr("class", "$style");
-                    $td_s->addAttr("height", "22");
-                    $td_s->addAttr("align", "center");
-                    $td_s->addAttr("style", "vertical-align:bottom;");
-                    $b_s = new HTML("b");
-                    $b_s->addContent(_("einhängen"));
-                    $td_s->addContent($b_s);
-                    $tr_s->addContent($td_s);
-
-                    // kopie
-                    $td_s = new HTML("td");
-                    $td_s->addAttr("class", "$style");
-                    $td_s->addAttr("height", "22");
-                    $td_s->addAttr("align", "center");
-                    $td_s->addAttr("style", "vertical-align:bottom;");
-                    $b_s = new HTML("b");
-                    $b_s->addContent(_("kopieren"));
-                    $td_s->addContent($b_s);
-                    $tr_s->addContent($td_s);
-
-                    $table_s->addContent($tr_s);
-
-                    $counter = 0;
-
-                    if (!empty($ranges[$type_key])) {
-                        foreach ($ranges["$type_key"] as $range) {
-
-                            if ($counter == 0)
-                                $displayclass = "content_body";
-                            elseif (($counter % 2) == 0)
-                                $displayclass = "table_row_even";
-                            else
-                                $displayclass = "table_row_odd";
-
-                            $tr_s = new HTML("tr");
-
-                            // name
-                            $td_s = new HTML("td");
-                            $td_s->addHTMLContent("&nbsp;");
-                            $td_s->addHTMLContent(htmlready($range["name"]));
-                            $tr_s->addContent($td_s);
-
-                            // if the rangeID is a username, convert it to the userID
-                            $new_rangeID = (get_userid($range['id'])) ? get_userid($range['id']) : $range['id'];
-
-                            if (!in_array($new_rangeID, $rangeIDs)) {
-
-                                // link
-                                $td_s = new HTML("td");
-                                $td_s->addAttr("align", "center");
-                                $input = new HTMLempty("input");
-                                $input->addAttr("type", "checkbox");
-                                $input->addAttr("name", "link_range[{$range['id']}]");
-                                $input->addAttr("value", "1");
-                                $td_s->addContent($input);
-                                $tr_s->addContent($td_s);
-                            } else {
-
-                                // no link
-                                $td_s = new HTML("td");
-                                $td_s->addAttr("align", "center");
-                                $td_s->addAttr("colspan", "1");
-                                $input = new HTMLempty("input");
-                                $td_s->addContent(_("Die Evaluation ist bereits diesem Bereich zugeordnet."));
-                                $tr_s->addContent($td_s);
-                            }
-
-                            // copy
-                            $td_s = new HTML("td");
-                            $td_s->addAttr("align", "center");
-                            $input = new HTMLempty("input");
-                            $input->addAttr("type", "checkbox");
-                            $input->addAttr("name", "copy_range[{$range['id']}]");
-                            $input->addAttr("value", "1");
-                            $td_s->addContent($input);
-                            $tr_s->addContent($td_s);
-
-                            $table_s->addContent($tr_s);
-                            $counter++;
-                        }
-                    } elseif ($globalperm == "root" || $globalperm == "admin") {
-                        $tr_s = new HTML("tr");
-                        $td_s = new HTML("td");
-                        $td_s->addAttr("class", "content_body");
-                        $td_s->addAttr("colspan", "4");
-                        $td_s->addHTMLContent("&nbsp;");
-                        $td_s->addContent(_("Es wurden keine Ergebnisse aus diesem Bereich gefunden."));
-                        $tr_s->addContent($td_s);
-                        $table_s->addContent($tr_s);
-                    }
-                    reset($ranges);
-                }
-            }
-        }
-        if (!empty($showsearchresults)) {
-            $tr = new HTML("tr");
-            $td = new HTML("td");
-            $td->addAttr("colspan", "2");
-//       $td->addContent(new HTMLempty("hr"));
-            $b = new HTML("b");
-#       $b->addContent (_('Suchergebnisse') . ':');
-            if (Request::get("search"))
-                $b->addContent(_("Sie können die Evaluation folgenden Bereichen zuordnen (Suchergebnisse):"));
-            else
-                $b->addContent(_("Sie können die Evaluation folgenden Bereichen zuordnen:"));
-            $td->addContent($b);
-            $td->addContent(EvalCommon::createImage(EVAL_PIC_HELP, "", tooltip(_("Hängen Sie die Evaluation in die gewünschten Bereiche ein (abhängige Kopie mit gemeinsamer Auswertung) oder kopieren Sie sie in Bereiche (unabhängige Kopie mit getrennter Auswertung)."), TRUE, TRUE)));
-            $td->addContent(($results) ? $table_s : _("Die Suche ergab keine Treffer."));
-            $tr->addContent($td);
-            $table->addContent($tr);
-        }
-
-        // the seach-button
-        if ($globalperm == "root" || $globalperm == "admin") {
-            $tr = new HTML("tr");
-
-            $td = new HTML("td");
-            $td->addAttr("colspan", "2");
-            $td->addAttr("style", "padding-bottom:0; border-top:1px solid black;");
-            $td->addContent(_("Nach Bereichen suchen:"));
-            $td->addContent(" ");
-
-            $input = new HTMLempty("input");
-            $input->addAttr("type", "text");
-            $input->addAttr("name", "search");
-            $input->addAttr("style", "vertical-align:middle;");
-            $input->addAttr("value", "" . Request::get("search") . "");
-            $td->addContent($input);
-
-            $td->addContent(Button::create(_('Suchen'), 'search_range_button', ['title' => _('Bereiche suchen')]));
-            $tr->addContent($td);
-
-            $table->addContent($tr);
-        }
-
-        return $table->createContent();
-    }
-
-    function createDomainLinks($search)
-    {
-        $evalDB = new EvaluationDB ();
-        $globalperm = EvaluationObjectDB::getGlobalPerm();
-
-        // search results
-        $results = $evalDB->search_range($search);
-
-        if ($globalperm == "root") {
-            $results["studip"] = ["type" => "system", "name" => _("Systemweite Evaluationen")];
-        } else {
-            $results[$GLOBALS['user']->id] = ["type" => "user", "name" => _("Profil")];
-        }
-
-        if ($globalperm == "dozent" || $globalperm == "autor" || $search)
-            $showsearchresults = 1;
-        $range_types = [];
-        if ($globalperm == "admin")
-            $range_types = [
-                "user" => _("Benutzer"),
-                "sem" => _("Veranstaltung"),
-                "inst" => _("Einrichtung"),
-                "fak" => _("Fakultät")];
-
-        elseif ($globalperm == "root")
-            $range_types = [
-                "user" => _("Benutzer"),
-                "sem" => _("Veranstaltung"),
-                "inst" => _("Einrichtung"),
-                "fak" => _("Fakultät"),
-                "system" => _("System")];
-
-        // display search_results
-        if ($results) {
-            foreach ($results as $k => $v) {
-                foreach ($range_types as $type_key => $type_value) {
-                    if ($v["type"] == $type_key) {
-                        $ranges["$type_key"][] = ["id" => $k, "name" => $v["name"]];
-                    }
-                }
-                reset($range_types);
-            }
-
-            $table = new HTML("table");
-            $table->addAttr("class", "default");
-            $table->addAttr("border", "0");
-            $table->addAttr("align", "center");
-            $table->addAttr("cellspacing", "0");
-            $table->addAttr("cellpadding", "0");
-            $table->addAttr("width", "100%");
-
-            foreach ($range_types as $type_key => $type_value) {
-                // Überschriften
-                $tr = new HTML("tr");
-
-                // Typ
-                $td = new HTML("td");
-                $td->addAttr("colspan", "1");
-                $td->addAttr("class", "table_header");
-                $td->addAttr("height", "22");
-                $td->addAttr("width", "50%");
-                $td->addAttr("style", "vertical-align:bottom;");
-                $b = new HTML("b");
-                $b->addHTMLContent("&nbsp;");
-                $b->addContent($type_value . ":");
-                $td->addContent($b);
-                $tr->addContent($td);
-
-                // Typ
-                $td = new HTML("td");
-                $td->addAttr("class", "table_header");
-                $td->addAttr("height", "22");
-                $td->addAttr("align", "center");
-                $td->addAttr("style", "vertical-align:bottom;");
-                $b = new HTML("b");
-                $b->addContent(" ");
-                $td->addContent($b);
-                $tr->addContent($td);
-
-                // Typ
-                $td = new HTML("td");
-                $td->addAttr("class", "table_header");
-                $td->addAttr("height", "22");
-                $td->addAttr("align", "center");
-                $td->addAttr("style", "vertical-align:bottom;");
-                $b = new HTML("b");
-                $b->addContent(" ");
-                $td->addContent($b);
-                $tr->addContent($td);
-
-                $table->addContent($tr);
-
-                $counter = 0;
-
-                if (!empty($ranges[$type_key])) {
-                    foreach ($ranges["$type_key"] as $range) {
-
-                        if ($counter == 0)
-                            $displayclass = "content_body";
-                        elseif (($counter % 2) == 0)
-                            $displayclass = "table_row_even";
-                        else
-                            $displayclass = "table_row_odd";
-
-                        $tr = new HTML("tr");
-
-                        // name
-                        $td = new HTML("td");
-                        $td->addHTMLContent("&nbsp;");
-                        $td->addContent($range["name"]);
-                        $tr->addContent($td);
-
-                        // if the rangeID is a username, convert it to the userID
-                        $new_rangeID = (get_userid($range['id'])) ? get_userid($range['id']) : $range['id'];
-
-
-                        // link
-                        $td = new HTML("td");
-                        $td->addAttr("align", "center");
-                        $link = new HTML("a");
-                        $link->addAttr("href", URLHelper::getLink(EVAL_FILE_ADMIN . "?rangeID=" . $range['id']));
-                        $link->addContent(_("Diesen Bereich anzeigen."));
-                        $td->addContent($link);
-                        $tr->addContent($td);
-
-                        // copy
-                        $td = new HTML("td");
-                        $td->addAttr("align", "center");
-                        $td->addContent(" ");
-                        $tr->addContent($td);
-
-                        $table->addContent($tr);
-                        $counter++;
-                    }
-                } elseif ($globalperm == "root" || $globalperm == "admin") {
-                    $tr = new HTML("tr");
-                    $td = new HTML("td");
-                    $td->addAttr("class", "content_body");
-                    $td->addAttr("colspan", "4");
-                    $td->addHTMLContent("&nbsp;");
-                    $td->addContent(_("Es wurden keine Ergebnisse aus diesem Bereich gefunden."));
-                    $tr->addContent($td);
-                    $table->addContent($tr);
-                }
-                reset($ranges);
-            }
-        }
-
-        return !empty($table) ? $table->createContent() : '';
-    }
-
-    /**
-     * checks which button was pressed
-     *
-     * @access  public
-     * @returns string   the command
-     *
-     */
-    function getPageCommand()
-    {
-        if (Request::option('evalAction')) {
-            return Request::option('evalAction');
-        }
-        $command = [];
-        foreach ($_REQUEST as $key => $value) {
-            if (preg_match("/(.*)_button(_x)?/", $key, $command))
-                break;
-        }
-        return $command[1] ?? '';
-    }
-
-# ===================================================== end: public functions #
-}
diff --git a/lib/evaluation/evaluation_admin_template.inc.php b/lib/evaluation/evaluation_admin_template.inc.php
deleted file mode 100644
index 7996947..0000000
--- a/lib/evaluation/evaluation_admin_template.inc.php
+++ /dev/null
@@ -1,655 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * the form to create/edit templates for answers
- *
- * @author  JPWowra
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-use Studip\Button, Studip\LinkButton;
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once 'lib/evaluation/classes/db/EvaluationQuestionDB.class.php';
-require_once 'lib/evaluation/classes/EvaluationQuestion.class.php';
-require_once EVAL_LIB_COMMON;
-require_once EVAL_LIB_OVERVIEW;
-require_once EVAL_LIB_TEMPLATE;
-require_once EVAL_FILE_EVAL;
-require_once EVAL_FILE_EVALDB;
-require_once EVAL_FILE_QUESTION;
-require_once EVAL_FILE_QUESTIONDB;
-require_once EVAL_FILE_OBJECTDB;
-# ====================================================== end: including files #
-
-
-/* Create objects ---------------------------------------------------------- */
-$db = new EvaluationQuestionDB();
-$lib = new EvalTemplateGUI();
-/* ------------------------------------------------------------ end: objects */
-
-#error_reporting( E_ALL );
-
-/* Set variables ----------------------------------------------------------- */
-$rangeID = $rangeID ?? Context::getId();
-
-if (empty ($rangeID)) {
-    $rangeID = $user->id;
-}
-
-$command = $lib->getPageCommand();
-if (EvaluationObjectDB::getGlobalPerm() === 'root') {
-    $myuserid = 0;
-} else {
-    $myuserid = $user->id;
-
-}
-if (empty($parentID)) {
-    $parentID = Request::option('parentID');
-}
-$template_name = Request::get('template_name', $template_name ?? null);
-$template_type = Request::get('template_type', $template_type ?? null);
-$template_multiple = Request::get('template_multiple', $template_multiple ?? null);
-$template_answers = Request::getArray('template_answers');
-$template_add_num_answers = Request::int('template_add_num_answers', $template_add_num_answers ?? 0);
-if (empty($template_answers)) {
-    if (mb_strstr($command, "edit"))
-        for ($i = 0; $i < 5; $i++)
-            $template_answers[$i] = $lib->makeNewAnswer();
-    else
-        $template_answers = [];
-}
-if (empty($template_id)) {
-    $template_id = Request::option('template_id');
-}
-
-/* ---------------------------------------------------------- end: variables */
-
-if (Request::option('onthefly') && ($command == "delete" || $command == "add_answers"
-        || $command == "delete_answers" || $command == "save2")) {
-    $question = new EvaluationQuestion ($template_id,
-        NULL, EVAL_LOAD_ALL_CHILDREN);
-    $question->setMultiplechoice($template_multiple);
-    $question->setText(trim($template_name), YES);
-    $question->setType($template_type);
-    $question->setParentID($parentID);
-    $question->setPosition($template_position ?? '');
-    while ($answerrem = $question->getChild()) {
-        $id = $answerrem->getObjectID();
-        $answerrem->delete();
-        $question->removeChildID($id);
-    }
-    $controlnumber = count($template_answers);
-    for ($i = 0; $i < $controlnumber; $i++) {
-        $text = $template_answers[$i]['text'];
-        $answerID = $template_answers[$i]['answer_id'];
-        $answer = new EvaluationAnswer();
-        $answer->setObjectID($answerID);
-        $answer->setText(trim($text), YES);
-        $answer->setParentID($template_id);
-        $question->addChild($answer);
-    }
-
-}
-
-switch ($command) {
-    /* -------------------------------------------------------------------- */
-    case "savefree":
-        $qdb = new EvaluationQuestionDB();
-        if ($qdb->exists($template_id)) {
-            $question = new EvaluationQuestion ($template_id, NULL,
-                EVAL_LOAD_ALL_CHILDREN);
-            if ($question->getParentID() != $myuserid) {
-                $question = new EvaluationQuestion();
-                $question->setParentID($myuserid);
-            } else {
-                $question->delete();
-                $question = new EvaluationQuestion();
-            }
-        } else {
-            $question = new EvaluationQuestion();
-        }
-        /*wenn root, dann id = 0 setzen ---und Text Brandmarken!!--------------*/
-        $question->setParentID($myuserid);
-        $question->setText(trim($template_name), YES);
-        while ($answerrem = $question->getChild()) {
-            $id = $answerrem->getObjectID();
-            $answerrem->delete();
-            $question->removeChildID($id);
-        }
-        $answer = new EvaluationAnswer();
-        $answer->setRows(Request::option('template_add_num_answers'));
-        $question->addChild($answer);
-        $lib->setUniqueName($question, $db, $myuserid);
-        $question->save();
-        $command = "";
-
-        break;
-    /* -------------------------------------------------------------------- */
-    case "delete":
-        $question = new EvaluationQuestion ($template_id, null, EVAL_LOAD_ALL_CHILDREN);
-        if ($question->getParentID() == $myuserid) {
-            $question->delete();
-        } elseif (get_username($question->getParentID()) == "") {
-            while ($answer = $question->getChild()) {
-                $answer->delete();
-            }
-        } else {
-            $report = MessageBox::error(_("Keine Berechtigung zum Löschen."));
-        }
-        $command = "";
-        break;
-
-    /* -------------------------------------------------------------------- */
-    case "add_answers":
-        // Bevor etwas hinzugefügt wird nochmal die Speicherungsroutine laufen lassen
-        if (!Request::option('onthefly')) {
-            $question = save1($myuserid);
-        } else {
-            $question->save();
-        }
-        //$question->setMultiplechoice($template_multiple);
-        //$question->setText(trim($template_name), YES);
-        //$question->setType($template_type);
-        $command = "continue_edit";
-        if ($question->getType() == EVALQUESTION_TYPE_MC ||
-            $question->getType() == EVALQUESTION_TYPE_LIKERT) {
-            while ($template_add_num_answers--) {
-                $answer = new EvaluationAnswer();
-                $answer->setText("");
-                $question->addChild($answer);
-            }
-            #echo "Nummer: ".$question->getNumberChildren()."<br>";
-            break;
-
-        } elseif ($question->getType() == EVALQUESTION_TYPE_POL) {
-            echo(_("Diese Option gibt es nicht"));
-        } else {
-            echo(_("Unbekanntes Objekt"));
-        }
-        $command = "continue_edit";
-
-        break;
-
-
-    /* delete answers ----------------------------------------------------- */
-    case "delete_answers":
-        if (!Request::option('onthefly')) {
-            $question = save1($myuserid);
-            $question->setParentID($myuserid);
-        } else
-            $question->save();
-        $template_delete_answers = Request::getArray("template_delete_answers");
-        if (!empty($template_delete_answers))
-            foreach ($template_delete_answers as $answerID) {
-                $question->removeChildID($answerID);
-                $answer = new EvaluationAnswer ($answerID);
-                $answer->delete();
-            }
-        $command = "continue_edit";
-
-        break;
-    /* ------------------------------------------------ end: delete answers */
-
-
-    /* -------------------------------------------------------------------- */
-    case "save":
-        $question = save1($myuserid);
-        /* Check userinput ----------------------------------------------------- */
-        if ($question->getType() == EVALQUESTION_TYPE_MC ||
-            $question->getType() == EVALQUESTION_TYPE_LIKERT) {
-            $nummer = $question->getNumberChildren();
-            for ($i = 0; $i < count($template_answers); $i++) {
-                $text = $template_answers[$i]['text'];
-                if ($text == "") {
-                    $question->removeChildID($template_answers[$i]['answer_id']);
-                    $nummer--;
-                }
-            }
-
-            if ($nummer == 0) {
-                $report = MessageBox::error(_("Dem Template wurden keine Antworten zugewiesen oder keine der Antworten  enthielt einen Text. Fügen Sie Antworten an, oder löschen Sie das Template."));
-                $command = "continue_edit";
-                break;
-            }
-        }
-
-        if ($question->getType() == EVALQUESTION_TYPE_POL) {
-            for ($i = 0; $i < count($template_answers); $i++) {
-                $text = $template_answers[$i]['text'];
-                if ($text == "") {
-                    $report = MessageBox::error(_("Leere Antworten sind nicht zulässig, löschen Sie betreffende Felder oder geben Sie einen Text ein."));
-                    $command = "continue_edit";
-                    break;
-                }
-            }
-            if ($command == "continue_edit") {
-                break;
-            }
-        }
-        if (!empty($template_residual) && empty($template_residual_text)) {
-            $report = MessageBox::error(_("Geben Sie eine Ausweichantwort ein oder deaktivieren Sie diese."));
-            $command = "continue_edit";
-            break;
-        }
-        if (!Request::option('onthefly') && !$question->getText()) {
-            $report = MessageBox::error(_("Geben Sie einen Namen für die Vorlage ein."));
-            $command = "continue_edit";
-            break;
-        }
-        $question->save();
-        if ($question->isError()) {
-            $report = MessageBox::error(_("Fehler beim Speichern."));
-        }
-        $command = "";
-        $template_answers = "";
-        break;
-    case "save2":
-        if ($question) {
-            $question->save();
-            if ($question->isError()) {
-                $report = MessageBox::error(_("Fehler beim Speichern."));
-            }
-        }
-        $command = "";
-        $template_answers = "";
-        break;
-}
-
-/* Surrounding Table ------------------------------------------------------- */
-$br = new HTMpty("br");
-
-$tableA = new HTM ("table");
-$tableA->attr("border", "0");
-$tableA->attr("align", "center");
-$tableA->attr("cellspacing", "0");
-$tableA->attr("cellpadding", "2");
-$tableA->attr("width", "250");
-
-$lib->createInfoBox();
-
-$trA = new HTM("tr");
-$tdA = new HTM("td");
-$tdA->cont(EvalCommon::createTitle(_("Antwortenvorlagen"), NULL, 2));
-$trA->cont($tdA);
-$tableA->cont($trA);
-
-$trA = new HTM("tr");
-$tdA = new HTM("td");
-
-$table = new HTM ("table");
-$table->attr("border", "0");
-$table->attr("align", "center");
-$table->attr("cellspacing", "0");
-$table->attr("cellpadding", "3");
-$table->attr("width", "100%");
-
-$tr = new HTM("tr");
-$td = new HTM("td");
-$td->attr("class", "table_row_even");
-
-if (!$command || $command == "back") {
-    /* the template selection lists --------------------------------------- */
-
-    $question_show = new EvaluationQuestionDB();
-    $arrayOfTemplateIDs = $question_show->getTemplateID($myuserid);
-    $arrayOfPolTemplates = [];
-    $arrayOfSkalaTemplates = [];
-    $arrayOfNormalTemplates = [];
-    $arrayOfFreeTemplates = [];
-
-    foreach ($arrayOfTemplateIDs as $templateID) {
-        $questionload = new EvaluationQuestion ($templateID,
-            NULL, EVAL_LOAD_FIRST_CHILDREN);
-        $typ = $questionload->getType();
-        $text = my_substr($questionload->getText(), 0, EVAL_MAX_TEMPLATENAMELEN);
-        /*Root kennzeichnung hier entfernen!!*/
-        //if($questionload->getParentID()==0)
-        //  $text="<b>".$text."</b>";
-        if ($questionload->getParentID() == '0') {
-            $text = $questionload->getText() . " " . EVAL_ROOT_TAG;
-        }
-        if (($answer = $questionload->getChild()) == NULL)
-            $answer = new EvaluationAnswer ();
-        /* --------------------------------------------------------------- */
-        switch ($typ) {
-
-            case EVALQUESTION_TYPE_POL:
-                $arrayOfPolTemplates[] = [$questionload->getObjectID(), $text];
-                break;
-            case EVALQUESTION_TYPE_LIKERT:
-                $arrayOfSkalaTemplates[] = [$questionload->getObjectID(), $text];
-                break;
-            case EVALQUESTION_TYPE_MC:
-                if ($answer->isFreetext()) {
-                    $arrayOfFreeTemplates[] = [$questionload->getObjectID(), $text];
-                } else {
-                    $arrayOfNormalTemplates[] = [$questionload->getObjectID(), $text];
-                }
-                break;
-        }
-        /* -------------------------------------------------------- */
-    }
-
-    /* report messages ---------------------------------------------------- */
-    $td->cont($report ?? '');
-
-    $td->cont($lib->createSelections($arrayOfPolTemplates,
-        $arrayOfSkalaTemplates,
-        $arrayOfNormalTemplates,
-        $arrayOfFreeTemplates,
-        $myuserid));
-
-} else {
-    $form = new HTM("form");
-    $form->attr("action", URLHelper::getLink("?page=edit&evalID=" . $evalID ?? ''));
-    $form->attr("method", "post");
-    $form->html(CSRFProtection::tokenTag());
-    $form->cont(Button::create(_('zurück'), 'template_back_button', ['title' => _('Zurück zur Auswahl')]));
-    $td->cont($form);
-    $report = '';
-    /* on the fly info message -------------------------------------------- */
-    if ($command == "create_question_answers" || Request::option('onthefly')) {
-        $report = MessageBox::info(sprintf(_("Weisen Sie der links %sausgewählten%s Frage hier Antworten zu:"),
-            "<span class=\"eval_highlight\">", "</span>"));
-    }
-    /* report messages ---------------------------------------------------- */
-    $td->cont($report);
-}
-
-
-$tr->cont($td);
-$table->cont($tr);
-$tdA->cont($table);
-$trA->cont($tdA);
-$tableA->cont($trA);
-
-
-if ($command) {
-    /* the template editing fields */
-    $trA = new HTM("tr");
-    $tdA = new HTM("td");
-
-    $table = new HTM ("table");
-    $table->attr("border", "0");
-    $table->attr("align", "center");
-    $table->attr("cellspacing", "0");
-    $table->attr("cellpadding", "0");
-    $table->attr("width", "100%");
-
-    $tr = new HTM("tr");
-    $td = new HTM("td");
-    $td->attr("class", "table_row_odd");
-
-    /*übergebe an create Form das template, dass verändert werden soll*/
-
-    switch ($command) {
-        case "editpol_scale":
-            $question = new EvaluationQuestion (Request::option('template_editpol_scale'), NULL, EVAL_LOAD_ALL_CHILDREN);
-            $td->cont($lib->createTemplateForm($question));
-            break;
-        case "createpol_scale":
-            $question = new EvaluationQuestion();
-            $question->setObjectID(md5(uniqid(rand())));
-            $question->setType(EVALQUESTION_TYPE_POL);
-            $question->setText("");
-            for ($i = 0; $i < 2; $i++) {
-                $answer = new EvaluationAnswer();
-                $answer->setParentID($question->getObjectID());
-                if ($i == 0)
-                    $answer->setText(_("Anfang"));
-                else
-                    $answer->setText(_("Ende"));
-                $question->addChild($answer);
-            }
-            //  $td->cont( $lib->createTemplateFormPol( $question ) );
-            $td->cont($lib->createTemplateForm($question));
-            break;
-        case "editlikert_scale":
-            $question = new EvaluationQuestion (Request::option('template_editlikert_scale'),
-                NULL, EVAL_LOAD_ALL_CHILDREN);
-            $question->setType(EVALQUESTION_TYPE_LIKERT);
-            //$td->cont( $lib->createTemplateFormLikert( $question ) );
-            $td->cont($lib->createTemplateForm($question));
-            break;
-        case "createlikert_scale":
-            $question = new EvaluationQuestion();
-            $question->setObjectID(md5(uniqid(rand())));
-            $question->setType(EVALQUESTION_TYPE_LIKERT);
-            $question->setText("");
-            for ($i = 0; $i < 4; $i++) {
-                $answer = new EvaluationAnswer();
-                $answer->setParentID($question->getObjectID());
-                $answer->setText("");
-                $answer->setPosition(1);
-                $question->addChild($answer);
-            }
-            $td->cont($lib->createTemplateForm($question));
-            break;
-        case "editnormal_scale":
-            $question = new EvaluationQuestion (Request::option('template_editnormal_scale'),
-                NULL, EVAL_LOAD_ALL_CHILDREN);
-            $question->setType(EVALQUESTION_TYPE_MC);
-            $td->cont($lib->createTemplateForm($question));
-            break;
-        case "createnormal_scale":
-            $question = new EvaluationQuestion();
-            $question->setObjectID(md5(uniqid(rand())));
-            $question->setType(EVALQUESTION_TYPE_MC);
-            $question->setText("");
-            for ($i = 0; $i < 4; $i++) {
-                $answer = new EvaluationAnswer();
-                $answer->setParentID($question->getObjectID());
-                $answer->setText("");
-                $answer->setPosition(1);
-                $question->addChild($answer);
-            }
-            $td->cont($lib->createTemplateForm($question));
-            //$td->cont( $lib->createTemplateFormMul( $question ) );
-            break;
-        case "continue_edit":
-            /*Im Fall direkt question->answers flag mitübergeben*/
-            /*$template_type überprüfen------------------------------------------*/
-            switch (Request::option('template_type')) {
-                /* --------------------------------------------------------------- */
-                case EVALQUESTION_TYPE_LIKERT:
-                case EVALQUESTION_TYPE_POL:
-                    $td->cont($lib->createTemplateForm($question));
-                    break;
-                case EVALQUESTION_TYPE_MC:
-                    $td->cont($lib->createTemplateForm($question, Request::int('onthefly')));
-                    break;
-            }
-            break;
-
-        case "create_question_answers":
-            $onthefly = 1;
-            // extract the questionID from the command
-            foreach ($_REQUEST as $key => $value) {
-                if (preg_match("/template_(.*)_button?/", $key, $command))
-                    break;
-            }
-            if (preg_match("/(.*)_#(.*)/", $command[1], $command_parts))
-                $questionID = $command_parts[2];
-            $question = new EvaluationQuestion ($questionID ?? '', NULL, EVAL_LOAD_ALL_CHILDREN);
-
-            if ($question->getNumberChildren() == 0) {
-                $question->setType(EVALQUESTION_TYPE_MC);
-                for ($i = 0; $i < 4; $i++) {
-                    $answer = new EvaluationAnswer();
-                    $answer->setParentID($question->getObjectID());
-                    $answer->setText((""));
-                    $answer->setPosition(1);
-                    $question->addChild($answer);
-                }
-            }
-            $td->cont($lib->createTemplateForm($question, $onthefly));
-            break;
-        case "createfree_scale":
-            $question = new EvaluationQuestion();
-            $question->setObjectID(md5(uniqid(rand())));
-            $question->setType(EVALQUESTION_TYPE_MC);
-            $question->setText(_("Freitext"));
-            $answer = new EvaluationAnswer();
-            $answer->setParentID($question->getObjectID());
-            $answer->setText("");
-            $answer->setRows(1);
-            $question->addChild($answer);
-            $td->cont($lib->createTemplateFormFree($question));
-            break;
-        case "editfree_scale":
-            $question = new EvaluationQuestion (Request::option('template_editfree_scale'),
-                NULL, EVAL_LOAD_ALL_CHILDREN);
-            $td->cont($lib->createTemplateFormFree($question));
-            break;
-
-        case "back":
-            $td->cont(" ");
-            break;
-
-    }
-
-    $tr->cont($td);
-    $table->cont($tr);
-    $tdA->cont($table);
-    $trA->cont($tdA);
-    $tableA->cont($trA);
-
-}
-
-/* Javascript function for preview-link */
-$js = EvalCommon::createEvalShowJS(YES);
-
-/* --------------------------------------------------------------------- */
-return $js->createContent() . $tableA->createContent();
-/* --------------------------------------------------------------------- */
-
-
-/* --------------------------------------------------------------------- */
-function save1($myuserid)
-{
-    $mineexists = 0;
-    /*Existiert Question/Template schon?*/
-    $qdb = new EvaluationQuestionDB();
-    if (empty($template_id)) {
-        $template_id = Request::option("template_id");
-    }
-    if ($qdb->exists($template_id)) {
-        $question = new EvaluationQuestion ($template_id,
-            NULL, EVAL_LOAD_ALL_CHILDREN);
-        if ($question->getParentID() != $myuserid) {
-            $foreign = TRUE;
-            $question = new EvaluationQuestion();
-            $question->setParentID($myuserid);
-        } else {
-            $overwrite = 1;
-            //$question->delete();
-            //$question = new EvaluationQuestion();
-            //$template_id=$question->getObjectID();
-        }
-    } else {
-        $question = new EvaluationQuestion();
-    }
-
-    /*Get Vars ----------------------------------------------------*/
-    $template_name = Request::get("template_name");
-    $template_type = Request::get("template_type");
-    $template_multiple = Request::get("template_multiple");
-    $template_add_num_answers = Request::option("template_add_num_answers");
-    $template_residual = Request::get("template_residual");
-    $template_residual_text = Request::get("template_residual_text");
-    $template_answers = Request::getArray("template_answers");
-    /*end: Get Vars -----------------------------------------------*/
-
-    $question->setParentID($myuserid);
-    $question->setMultiplechoice($template_multiple);
-    $question->setText(trim($template_name), YES);
-    $question->setType($template_type);
-
-    while ($answerrem = $question->getChild()) {
-        $id = $answerrem->getObjectID();
-        $answerrem->delete();
-        $question->removeChildID($id);
-    }
-
-    $controlnumber = count($template_answers);
-    $ausgleich = 0;
-
-    for ($i = 0; $i < $controlnumber; $i++) {
-        $text = $template_answers[$i]['text'];
-        $answerID = $template_answers[$i]['answer_id'];
-        $answer = new EvaluationAnswer();
-        if (empty($foreign))
-            $answer->setObjectID($answerID);
-        $answer->setText(trim($text), YES);
-        $question->addChild($answer);
-
-        if ($template_type == EVALQUESTION_TYPE_POL && $i == 0) {
-            $answerdiff = $controlnumber - $template_add_num_answers;
-
-            if ($answerdiff > 0) {
-                $i = $i + $answerdiff;
-                $ausgleich = $ausgleich - $answerdiff;
-            }
-            while ($answerdiff < 0) {
-                $ausgleich = $ausgleich + 1;
-                $answer = new EvaluationAnswer();
-                $answer->setText("");
-                $answer->setParentID($question->getObjectID());
-                $answer->setPosition($i + $ausgleich);
-                $answer->setValue($i + 1 + $ausgleich);
-                $question->addChild($answer);
-                $answerdiff++;
-            }
-        }
-    }
-
-    if ($template_residual) {
-        $answer = new EvaluationAnswer();
-        $answer->setResidual($template_residual);
-        $answer->setText(trim($template_residual_text), QUOTED);
-        $answer->setParentID($question->getObjectID());
-        $answer->setPosition($i + $ausgleich + 1);
-        $answer->setValue(-1);
-        $question->addChild($answer);
-    }
-
-    if (empty($overwrite)) {
-        $db = new EvaluationQuestionDB();
-        $lib = new EvalTemplateGUI();
-        $lib->setUniqueName($question, $db, $myuserid, YES);
-    }
-
-    if ($question->isError()) {
-        return MessageBox::error(_("Fehler beim Speichern."));
-    }
-    return $question;
-
-}
diff --git a/lib/evaluation/evaluation_admin_template.lib.php b/lib/evaluation/evaluation_admin_template.lib.php
deleted file mode 100644
index 4cbf727..0000000
--- a/lib/evaluation/evaluation_admin_template.lib.php
+++ /dev/null
@@ -1,1102 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Library for template gui
- *
- * @author      JPWowra
- *
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-use Studip\Button;
-
-class EvalTemplateGUI
-{
-    public $BR;
-    public $command;
-
-    public function __construct()
-    {
-        $this->BR = new HTMpty("br");
-        $this->command = $this->getPageCommand();
-    }
-
-    /**
-     * Creates the two (?) template selection lists
-     * @param
-     */
-    public function createSelections(
-        $polTemplates,
-        $skalaTemplates,
-        $normalTemplates,
-        $freeTemplates,
-        $myuserid
-    )
-    {
-
-        global $evalID;
-
-        $form = new HTM("form");
-
-        $form->attr("action", URLHelper::getLink("?page=edit&evalID=" . $evalID));
-        $form->attr("method", "post");
-        $form->html(CSRFProtection::tokenTag());
-
-        $table = new HTML("table");
-        $table->addAttr("border", "0");
-        $table->addAttr("cellpadding", "2");
-        $table->addAttr("cellspacing", "0");
-
-        $table->addAttr("width", "100%");
-        $tr = new HTML ("tr");
-        $td = new HTML ("td");
-        $td->addAttr("align", "right");
-
-        /* Polskalen ------------------------------------------------ */
-        $b = new HTM("b");
-        $b->cont(_("Polskala"));
-        $td->addContent($b);
-        $tr->addContent($td);
-
-        $td = new HTML ("td");
-
-        /* create button ------------------------------------ */
-        $input = new HTMpty("input");
-        $input->attr("type", "image");
-        $input->attr("name", "template_createpol_scale_button");
-        $input->attr("border", "0");
-        $input->attr("style", "vertical-align:middle;");
-        $input->stri(tooltip(_("Neue Vorlage erstellen."), TRUE));
-        $input->attr("src", EVAL_PIC_ADD_TEMPLATE);
-
-        $td->addContent($input);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        if (!empty($polTemplates)) {
-            $tr = new HTML ("tr");
-            $td = new HTML ("td");
-            $td->addAttr("align", "right");
-
-            $select = new HTM("select");
-            $select->attr("name", "template");
-            $select->attr("size", "1");
-            foreach ($polTemplates as $templatearray) {
-                $option = new HTM("option");
-                $select->attr("name", "template_editpol_scale");
-                $option->attr("value", $templatearray[0]);
-                $option->cont("$templatearray[1]");
-                $select->cont($option);
-            }
-            $td->addContent($select);
-            $tr->addContent($td);
-            $td = new HTML ("td");
-
-            /* edit button ----------------------------------- */
-            $input = new HTMpty("input");
-            $input->attr("type", "image");
-            $input->attr("name", "template_editpol_scale_button");
-            $input->attr("border", "0");
-            $input->attr("style", "vertical-align:middle;");
-            $input->stri(tooltip(_("Ausgewählte Vorlage bearbeiten."), TRUE));
-            $input->attr("src", EVAL_PIC_EDIT);
-
-            $td->addContent($input);
-            $tr->addContent($td);
-            $table->addContent($tr);
-        }
-        /* end: Polskalen ----------------------------------------------- */
-
-
-        /* Likertskalen ------------------------------------------------- */
-        $td = new HTML ("td");
-        $td->addAttr("align", "right");
-        $td->addAttr("class", "content_body");
-        $tr = new HTML ("tr");
-
-        $b = new HTM("b");
-        $b->cont(_("Likertskala"));
-        $td->addContent($b);
-        $tr->addContent($td);
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "content_body");
-
-        /* create button ------------------------------------ */
-        $input = new HTMpty("input");
-        $input->attr("type", "image");
-        $input->attr("name", "template_createlikert_scale_button");
-        $input->attr("border", "0");
-        $input->attr("style", "vertical-align:middle;");
-        $input->stri(tooltip(_("Neue Vorlage erstellen."), TRUE));
-        $input->attr("src", EVAL_PIC_ADD_TEMPLATE);
-
-        $td->addContent($input);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        if (!empty($skalaTemplates)) {
-            $td = new HTML ("td");
-            $tr = new HTML ("tr");
-            $td->addAttr("align", "right");
-            $select = new HTM("select");
-            $select->attr("name", "template");
-            $select->attr("size", "1");
-
-            foreach ($skalaTemplates as $templatearray) {
-                $option = new HTM("option");
-                $select->attr("name", "template_editlikert_scale");
-                $option->attr("value", $templatearray[0]);
-                $option->cont("$templatearray[1]");
-                $select->cont($option);
-            }
-            $td->addContent($select);
-            $tr->addContent($td);
-
-            $td = new HTML ("td");
-            $input = new HTMpty("input");
-            $input->attr("type", "image");
-            $input->attr("name", "template_editlikert_scale_button");
-            $input->attr("border", "0");
-            $input->attr("style", "vertical-align:middle;");
-            $input->stri(tooltip(_("Ausgewählte Vorlage bearbeiten."), TRUE));
-            $input->attr("src", EVAL_PIC_EDIT);
-
-            $td->addContent($input);
-            $tr->addContent($td);
-            $table->addContent($tr);
-        }
-        /* end: Likertskalen ----------------------------------------------- */
-
-
-        /* Normale / Multiplechoice ---------------------------------------- */
-        $td = new HTML ("td");
-        $td->addAttr("class", "content_body");
-        $tr = new HTML ("tr");
-        $td->addAttr("align", "right");
-
-        $b = new HTM("b");
-        $b->cont(_("Multiple Choice"));
-        $td->addContent($b);
-        $tr->addContent($td);
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "content_body");
-
-        /* create button ------------------------------------ */
-        $input = new HTMpty("input");
-        $input->attr("type", "image");
-        $input->attr("name", "template_createnormal_scale_button");
-        $input->attr("border", "0");
-        $input->attr("style", "vertical-align:middle;");
-        $input->stri(tooltip(_("Neue Vorlage erstellen."), TRUE));
-        $input->attr("src", EVAL_PIC_ADD_TEMPLATE);
-
-        $td->addContent($input);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        if (!empty($normalTemplates)) {
-            $td = new HTML ("td");
-            $tr = new HTML ("tr");
-            $td->addAttr("align", "right");
-            $select = new HTM("select");
-            $select->attr("name", "template");
-            $select->attr("size", "1");
-
-            foreach ($normalTemplates as $templatearray) {
-                $option = new HTM("option");
-                $select->attr("name", "template_editnormal_scale");
-                $option->attr("value", $templatearray[0]);
-                $option->cont("$templatearray[1]");
-                $select->cont($option);
-            }
-            $td->addContent($select);
-            $tr->addContent($td);
-            $td = new HTML ("td");
-
-            /* edit button */
-            $input = new HTMpty("input");
-            $input->attr("type", "image");
-            $input->attr("name", "template_editnormal_scale_button");
-            $input->attr("border", "0");
-            $input->attr("style", "vertical-align:middle;");
-            $input->stri(tooltip(_("Ausgewählte Vorlage bearbeiten."), TRUE));
-            $input->attr("src", EVAL_PIC_EDIT);
-
-            $td->addContent($input);
-            $tr->addContent($td);
-            $table->addContent($tr);
-        }
-        /* end: Normale / Multiplechoice-------------------------------------- */
-
-
-        /* Freitext ----------------------------------------------------- */
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "content_body");
-        $tr = new HTML ("tr");
-        $td->addAttr("align", "right");
-
-        $b = new HTM("b");
-        $b->cont(_("Freitext-Antwort"));
-        $td->addContent($b);
-        $tr->addContent($td);
-
-        $td = new HTML ("td");
-        $td->addAttr("class", "content_body");
-        $input = new HTMpty("input");
-        $input->attr("type", "image");
-        $input->attr("name", "template_createfree_scale_button");
-        $input->attr("border", "0");
-        $input->attr("style", "vertical-align:middle;");
-        $input->stri(tooltip(_("Neue Vorlage erstellen."), TRUE));
-        $input->attr("src", EVAL_PIC_ADD_TEMPLATE);
-        $td->addContent($input);
-        $tr->addContent($td);
-        $table->addContent($tr);
-
-        if (!empty($freeTemplates)) {
-            $td = new HTML ("td");
-            $tr = new HTML ("tr");
-            $td->addAttr("align", "right");
-
-            $select = new HTM("select");
-            $select->attr("name", "template");
-            $select->attr("size", "1");
-
-            foreach ($freeTemplates as $templatearray) {
-                $option = new HTM("option");
-                $select->attr("name", "template_editfree_scale");
-                $option->attr("value", $templatearray[0]);
-                $option->cont("$templatearray[1]");
-                $select->cont($option);
-            }
-            $td->addContent($select);
-            $tr->addContent($td);
-            $td = new HTML ("td");
-
-            $input = new HTMpty("input");
-            $input->attr("type", "image");
-            $input->attr("name", "template_editfree_scale_button");
-            $input->attr("border", "0");
-            $input->attr("style", "vertical-align:middle;");
-            $input->stri(tooltip(_("Ausgewählte Vorlage bearbeiten."), TRUE));
-            $input->attr("src", EVAL_PIC_EDIT);
-            $td->addContent($input);
-            $tr->addContent($td);
-            $table->addContent($tr);
-        }
-        /* end: Freitext -------------------------------------- */
-
-        $form->cont($table);
-
-        return $form;
-    }
-
-    /**
-     * Creates the form for the template
-     * @param
-     */
-    public function createTemplateForm(&$question, $onthefly = "")
-    {
-        global $evalID, $itemID;
-
-        $type = $question->getType();
-        $tableA = new HTM("table");
-        $tableA->attr("border", "0");
-        $tableA->attr("cellpadding", "2");
-        $tableA->attr("cellspacing", "0");
-        $tableA->attr("width", "100%");
-
-        $trA = new HTM("tr");
-        $tdA = new HTM("td");
-        $tdA->attr("class", "table_header_bold");
-        $tdA->attr("align", "left");
-        if ($onthefly) {
-            $tdA->html(_("<b>Freie Antworten definieren</b>"));
-        } else {
-            $isCreate = mb_strstr($this->getPageCommand(), "create");
-            $tdA->html("<b>");
-            switch ($type) {
-                case EVALQUESTION_TYPE_MC:
-                    //$answer = $question->getChild();
-                    //if ($answer->isFreetext ()) {}
-                    //else
-                    $tdA->html($isCreate
-                        ? _("Multiple Choice erstellen")
-                        : _("Multiple Choice bearbeiten"));
-                    break;
-                case EVALQUESTION_TYPE_LIKERT:
-                    $tdA->html($isCreate
-                        ? _("Likertskala erstellen")
-                        : _("Likertskala bearbeiten"));
-                    break;
-                case EVALQUESTION_TYPE_POL:
-                    $tdA->html($isCreate
-                        ? _("Polskala erstellen")
-                        : _("Polskala bearbeiten"));
-                    break;
-            }
-            $tdA->html("</b>");
-        }
-        $trA->cont($tdA);
-        $tableA->cont($trA);
-
-        $trA = new HTM("tr");
-        $tdA = new HTM("td");
-
-        $form = new HTM("form");
-        $form->attr("action", URLHelper::getLink('', ['page' => 'edit', 'evalID' => $evalID, 'itemID' => $itemID]));
-
-        $form->attr("method", "post");
-        $form->html(CSRFProtection::tokenTag());
-        /* template name --------------------------------- */
-        if ($onthefly != 1) {
-            $b = new HTM("b");
-            $b->cont(_("Name") . ": ");
-            $form->cont($b);
-            $input = new HTMpty("input");
-            $input->attr("type", "text");
-            $input->attr("name", "template_name");
-            $input->attr("value", $question->getText());
-            $input->attr("style", "vertical-align:middle;");
-            $input->attr("size", 22);
-            $input->attr("maxlength", 22);
-            $input->attr("tabindex", 1);
-            $form->cont($input);
-        } else {
-            $input = new HTMpty("input");
-            $input->attr("type", "hidden");
-            $input->attr("name", "template_name");
-            $input->attr("value", $question->getText());
-            $form->cont($input);
-
-            $input = new HTMpty("input");
-            $input->attr("type", "hidden");
-            $input->attr("name", "onthefly");
-            $input->attr("value", $onthefly);
-            $form->cont($input);
-        }
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_id");
-        $input->attr("value", $question->getObjectID());
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_type");
-        $input->attr("value", $question->getType());
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_residual");
-        $input->attr("value", NO);
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_position");
-        $input->attr("value", $question->getPosition());
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "parentID");
-        $input->attr("value", $question->getParentID());
-        $form->cont($input);
-
-        if ($onthefly != 1) {
-            $img = new HTMpty("img");
-            $img->attr("src", Icon::create('info-circle', 'inactive')->asImagePath(16));
-            $img->attr("class", "middle");
-            $img->stri(tooltip(_("Geben Sie hier einen Namen für Ihre Vorlage ein. Wenn Sie eine systemweite Vorlage bearbeiten, und speichern, wird eine neue Vorlage für Sie persönlich angelegt."),
-                FALSE, TRUE));
-            $form->cont($img);
-            $form->cont($this->BR);
-        }
-        if ($type == EVALQUESTION_TYPE_MC) {
-            /* multiple - radiobuttons ----------------------- */
-            $form->cont($this->createSubHeadline
-            (_("Mehrfachantwort erlaubt") . ": "));
-            $radio = new HTMpty("input");
-            $radio->attr("type", "radio");
-            $radio->attr("name", "template_multiple");
-            $radio->attr("value", YES);
-            $question->isMultiplechoice()
-                ? $radio->attr("checked") : 0;
-            $form->cont($radio);
-            $form->cont(_("ja"));
-
-            $radio = new HTMpty("input");
-            $radio->attr("type", "radio");
-            $radio->attr("name", "template_multiple");
-            $radio->attr("value", NO);
-            $question->isMultiplechoice()
-                ? 0 : $radio->attr("checked");
-            $form->cont($radio);
-            $form->cont(_("nein"));
-            $form->cont($this->BR);
-            /*end:  multiple - radiobuttons -------------------- */
-
-            /* show multiple choice checkboxes & answers------------------------- */
-            $form->cont($this->createSubHeadline(_("Antworten") . ": "));
-            for ($i = 0; $answer = $question->getNextChild(); $i++) {
-                $form->cont(($i < 9 ? "0" : "") . ($i + 1) . ". ");
-                $input = new HTMpty("input");
-                $input->attr("type", "text");
-                $input->attr("name", "template_answers[" . $i . "][text]");
-                $input->attr("value", $answer->getText());
-                $input->attr("size", 23);
-                $input->attr("tabindex", $i + 2);
-                $form->cont($input);
-                $input = new HTMpty("input");
-                $input->attr("type", "checkbox");
-                $input->attr("name", "template_delete_answers[" . $i . "]");
-                $input->attr("value", $answer->getObjectID());
-                $form->cont($input);
-
-                $input = new HTMpty("input");
-                $input->attr("type", "hidden");
-                $input->attr("name", "template_answers[" . $i . "][answer_id]");
-                $input->attr("value", $answer->getObjectID());
-                $form->cont($input);
-                $form->cont($this->BR);
-            }
-            /* ------------------------- end: multiple choice checkboxes &answers */
-
-            /* add button ------------------------------------ */
-            $input = new HTMpty("input");
-            $input->attr("type", "image");
-            $input->attr("name", "template_add_answers_button");
-            $input->addAttr("src", EVAL_PIC_ADD);
-            $input->attr("border", "0");
-            $input->attr("style", "vertical-align:middle;");
-            $form->html("&nbsp;");
-            $form->cont($input);
-
-            /* add number of answers - list ------------------ */
-            $select = new HTM("select");
-            $select->attr("name", "template_add_num_answers");
-            $select->attr("size", "1");
-            $select->attr("style", "vertical-align:middle;");
-            for ($i = 1; $i <= 10; $i++) {
-                $option = new HTM("option");
-                $option->attr("value", $i);
-                $option->cont($i);
-                $select->cont($option);
-            }
-            $form->cont($select);
-
-            /* delete button --------------------------------- */
-            $input = new HTMpty("input");
-            $input->attr("type", "image");
-            $input->attr("name", "template_delete_answers_button");
-            $input->addAttr("src", EVAL_PIC_REMOVE);
-            $input->attr("border", "0");
-            $input->attr("style", "vertical-align:middle;");
-            $form->html("&nbsp;");
-            $form->cont($input);
-            $form->cont($this->BR);
-        } else {
-            if ($type == EVALQUESTION_TYPE_POL) {
-                $form->cont($this->createSubHeadline(_("Antworten") . ": "));
-                /* answers --------------------------------------- */
-                $isResidual = NO;
-                for ($i = 0; $answer = $question->getNextChild(); $i++) {
-                    /*Einbau der Residualkategorie hier komplizierter*/
-                    $residualAnswer = $answer;
-                    if (!$answer->isResidual()) {
-                        if ($i == 0 || $i >= ($question->getNumberChildren() - 2)) {
-                            if ($i == 0) {
-                                $form->cont(_("Beschriftung erste Antwort"));
-                                $input = new HTMpty("input");
-                                $input->attr("type", "text");
-                                $input->attr("name", "template_answers[0][text]");
-                                $input->attr("value", $answer->getText());
-                                $input->attr("size", 29);
-                                $form->cont($input);
-                                $input = new HTMpty("input");
-                                $input->attr("type", "hidden");
-                                $input->attr("name", "template_answers[0][answer_id]");
-                                $input->attr("value", $answer->getObjectID());
-                                $form->cont($input);
-                                $form->cont($this->BR);
-                            } else {
-
-                                if ($answer->getText() == "") {
-                                    $oldid = $answer->getObjectID();
-                                    //continue;
-                                } else {
-                                    $form->cont(_("Beschriftung letzte Antwort"));
-                                    $lastone = -1;
-                                    $input = new HTMpty("input");
-                                    $input->attr("type", "text");
-                                    $input->attr("name", "template_answers[1][text]");
-                                    $input->attr("value", $answer->getText());
-                                    $input->attr("size", 29);
-                                    $form->cont($input);
-                                    $input = new HTMpty("input");
-                                    $input->attr("type", "hidden");
-                                    $input->attr("name", "template_answers[1][answer_id]");
-                                    $input->attr("value", $answer->getObjectID());
-                                    $form->cont($input);
-                                }
-
-                            }
-
-                        }
-
-                    } else {
-                        $isResidual = YES;
-
-                    }
-                    if (isset($lastone) && $lastone != -1 && $i == ($question->getNumberChildren() - 1)) {
-                        $form->cont(_("Beschriftung letzte Antwort"));
-                        $lastone = YES;
-                        $input = new HTMpty("input");
-                        $input->attr("type", "text");
-                        $input->attr("name", "template_answers[1][text]");
-                        $input->attr("value", "");
-                        $input->attr("size", 29);
-                        $form->cont($input);
-                        $input = new HTMpty("input");
-                        $input->attr("type", "hidden");
-                        $input->attr("name", "template_answers[1][answer_id]");
-                        $input->attr("value", $oldid ?? '');
-                        $form->cont($input);
-                    }
-                }
-                $form->cont($this->BR);
-                $form->cont($this->
-                createSubHeadline(_("Anzahl Abstufungen") . ": "));
-                /* NUMBER OF ANSWERS------------------------------------------ */
-                $select = new HTM("select");
-                $select->attr("name", "template_add_num_answers");
-                $select->attr("size", "1");
-                $select->attr("style", "vertical-align:middle;");
-                $res = 0;
-                if ($isResidual == YES) {
-                    $res = 1;
-                }
-                for ($i = 4; $i <= 20; $i++) {
-                    $option = new HTM("option");
-                    $option->attr("value", $i);
-                    $option->cont($i);
-                    if ($i == $question->getNumberChildren() - $res)
-                        $option->addAttr("selected", "selected");
-                    $select->cont($option);
-                }
-                $form->cont($select);
-                $form->cont($this->BR);
-
-
-            }
-            if ($type == EVALQUESTION_TYPE_LIKERT) {
-                $form->cont($this->createSubHeadline(_("Antworten") . ": "));
-                $residualAnswer = NULL;
-                $isResidual = NO;
-                for ($i = 0; $answer = $question->getNextChild(); $i++) {
-                    if (!$answer->isResidual()) {
-                        $form->cont(($i < 9 ? "0" : "") . ($i + 1) . ". ");
-                        $input = new HTMpty("input");
-                        $input->attr("type", "text");
-                        $input->attr("name", "template_answers[" . $i . "][text]");
-                        $input->attr("value", $answer->getText());
-                        $input->attr("size", 23);
-                        $input->attr("tabindex", $i + 2);
-                        $form->cont($input);
-                        $input = new HTMpty("input");
-                        $input->attr("type", "checkbox");
-                        $input->attr("name", "template_delete_answers[" . $i . "]");
-                        $input->attr("value", $answer->getObjectID());
-                        $form->cont($input);
-                        $input = new HTMpty("input");
-                        $input->attr("type", "hidden");
-                        $input->attr("name", "template_answers[" . $i . "][answer_id]");
-                        $input->attr("value", $answer->getObjectID());
-                        $form->cont($input);
-                        $form->cont($this->BR);
-                        if (!$residualAnswer)
-                            $residualAnswer = $answer;
-                    } else {
-                        $i--;
-                        $isResidual = YES;
-                        $residualAnswer = $answer;
-                    }
-                }
-
-                /* add button ------------------------------------ */
-                $input = new HTMpty("input");
-                $input->attr("type", "image");
-                $input->attr("name", "template_add_answers_button");
-                $input->addAttr("src", EVAL_PIC_ADD);
-
-                $input->attr("border", "0");
-                $input->attr("style", "vertical-align:middle;");
-                $form->html("&nbsp;");
-                $form->cont($input);
-
-                /* add number of answers - list ------------------ */
-                $select = new HTM("select");
-                $select->attr("name", "template_add_num_answers");
-                $select->attr("size", "1");
-                $select->attr("style", "vertical-align:middle;");
-                for ($i = 1; $i <= 10; $i++) {
-                    $option = new HTM("option");
-                    $option->attr("value", $i);
-                    $option->cont($i);
-                    $select->cont($option);
-                }
-                $form->cont($select);
-
-                /* delete answers button --------------------------------- */
-                $input = new HTMpty("input");
-                $input->attr("type", "image");
-                $input->attr("name", "template_delete_answers_button");
-                $input->addAttr("src", EVAL_PIC_REMOVE);
-                $input->attr("border", "0");
-                $input->attr("style", "vertical-align:middle;");
-                $form->html("&nbsp;");
-                $form->cont($input);
-                $form->cont($this->BR);
-
-
-            }
-
-        }
-        if ($type == EVALQUESTION_TYPE_LIKERT || $type == EVALQUESTION_TYPE_POL) {
-            /* residual category ------------------------------------ */
-            $form->cont($this->createSubHeadline(_("Ausweichantwort") . ": "));
-
-            /* residual - radiobuttons ------------------------------ */
-            $radio = new HTMpty("input");
-            $radio->attr("type", "radio");
-            $radio->attr("name", "template_residual");
-            $radio->attr("value", YES);
-
-            $value = !empty($isResidual) ? "checked" : "unchecked";
-            $radio->attr($value);
-
-            $form->cont($radio);
-            $form->cont(_("ja") . ":");
-
-            /* residual text field -------------> */
-            $input = new HTMpty("input");
-            $input->attr("type", "text");
-            $input->attr("name", "template_residual_text");
-            if (!empty($isResidual))
-                $input->attr("value", !empty($residualAnswer) ? $residualAnswer->getText() : '');
-            else
-                $input->attr("value", "");
-            $input->attr("size", 22);
-            $form->cont($input);
-            /* <------------- residual text field */
-            $form->cont($this->BR);
-            $radio = new HTMpty("input");
-            $radio->attr("type", "radio");
-            $radio->attr("name", "template_residual");
-            $radio->attr("value", NO);
-
-            $value = $value == "unchecked" ? "checked" : "unchecked";
-            $radio->attr($value);
-
-            $form->cont($radio);
-            $form->cont(_("nein"));
-            /*end:  residual - radiobuttons -------------------- */
-
-            $input = new HTMpty("input");
-            $input->attr("type", "hidden");
-            $input->attr("name", "template_residual_id");
-            $input->attr("value", !empty($residualAnswer) ? $residualAnswer->getObjectID() : '');
-            $form->cont($input);
-            /*end:  residual - kategorie -------------------- */
-        }
-        /* uebernehmen button ---------------------------- */
-        if ($onthefly == 1) {
-            $input = new HTMpty("input");
-            $input->attr("type", "hidden");
-            $input->attr("name", "cmd");
-            $input->attr("value", "QuestionAnswersCreated");
-            $form->cont($input);
-
-            $input = Button::create(_('Übernehmen'),
-                'template_save2_button');
-        } else {
-            $input = Button::create(_('Übernehmen'),
-                'template_save_button');
-        }
-
-        if (!mb_strstr($this->command, "create")) {
-            $showDelete = YES;
-            $input2 = Button::createAccept(_('Löschen'),
-                'template_delete_button');
-        }
-
-        $table = new HTM("table");
-        $table->attr("border", "0");
-        $table->attr("align", "center");
-        $table->attr("cellspacing", "0");
-        $table->attr("cellpadding", "3");
-        $table->attr("width", "100%");
-        $tr = new HTM("tr");
-        $td = new HTM("td");
-        $td->attr("class", "content_body");
-        $td->attr("align", "center");
-        $td->cont($input);
-        $tr->cont($td);
-
-        if (!empty($showDelete)) {
-            $td = new HTM("td");
-            $td->attr("class", "content_body");
-            $td->attr("align", "center");
-            $td->cont($input2 ?? '');
-            $tr->cont($td);
-        }
-
-        $table->cont($tr);
-        $form->cont($table);
-
-        /* ----------------------------------------------- */
-        $tdA->cont($form);
-        $trA->cont($tdA);
-        $tableA->cont($trA);
-        return $tableA;
-
-    }
-
-
-    /**
-     * Creates the form for the Polskala templates
-     * @param
-     */
-    public function createTemplateFormFree(&$question)
-    {
-        global $evalID;
-        $answer = $question->getNextChild();
-
-        $tableA = new HTM("table");
-        $tableA->attr("border", "0");
-        $tableA->attr("cellpadding", "2");
-        $tableA->attr("cellspacing", "0");
-        $tableA->attr("width", "100%");
-
-        $trA = new HTM("tr");
-        $tdA = new HTM("td");
-        $tdA->attr("class", "table_header_bold");
-        $tdA->attr("align", "left");
-        $tdA->html("<b>" . (mb_strstr($this->getPageCommand(), "create")
-                ? _("Freitextvorlage erstellen")
-                : _("Freitextvorlage bearbeiten")) . "</b>");
-        $trA->cont($tdA);
-        $tableA->cont($trA);
-
-        $trA = new HTM("tr");
-        $tdA = new HTM("td");
-        $form = new HTM("form");
-        $form->attr("action", URLHelper::getLink("?page=edit&evalID=" . $evalID));
-        $form->attr("method", "post");
-        $form->html(CSRFProtection::tokenTag());
-
-        $b = new HTM("b");
-        $b->cont(_("Name") . ": ");
-        $form->cont($b);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "text");
-        $input->attr("name", "template_name");
-        $name = $question->getText();
-        $input->attr("value", $question->getText());
-        //    $input->attr( "value", $name );
-        $input->attr("style", "vertical-align:middle;");
-        $input->attr("size", 22);
-        $input->attr("maxlength", 22);
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_id");
-        $input->attr("value", $question->getObjectID());
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_type");
-        $input->attr("value", $question->getType());
-        $form->cont($input);
-
-        $input = new HTMpty("input");
-        $input->attr("type", "hidden");
-        $input->attr("name", "template_multiple");
-        $input->attr("value", NO);
-        $form->cont($input);
-
-        $img = new HTMpty("img");
-        $img->attr("src", Icon::create('info-circle', 'inactive')->asImagePath(16));
-        $img->attr("class", "middle");
-        $img->stri(tooltip(_("Geben Sie hier einen Namen für Ihre Vorlage ein. Ändern Sie den Namen, um eine neue Vorlage anzulegen."),
-            FALSE, TRUE));
-        $form->cont($img);
-        $form->cont($this->BR);
-
-        //$answer = $question->getNextChild();
-        //$answer->toString();
-        /* Anzahl Zeilen------------------------------------------------------ */
-        $form->cont($this->createSubHeadline(_("Anzahl Zeilen") . ": "));
-
-        $select = new HTM("select");
-        $select->attr("name", "template_add_num_answers");
-        $select->attr("size", "1");
-        $select->attr("style", "vertical-align:middle;");
-        for ($i = 1; $i <= 25; $i++) {
-            $option = new HTM("option");
-            $option->attr("value", $i);
-            $option->cont($i);
-            if ($i == $answer->getRows())
-                $option->addAttr("selected", "selected");
-            $select->cont($option);
-        }
-        $form->cont($select);
-        $form->cont($this->BR);
-
-        /* uebernehmen / loeschen Button ---------------------------- */
-        $input = Button::create(_('Übernehmen'),
-            'template_savefree_button');
-        if (!mb_strstr($this->command, "create")) {
-            $showDelete = YES;
-            $input2 = Button::createAccept(_('Löschen'),
-                'template_delete_button');
-        }
-
-        $table = new HTM("table");
-        $table->attr("border", "0");
-        $table->attr("align", "center");
-        $table->attr("cellspacing", "0");
-        $table->attr("cellpadding", "3");
-        $table->attr("width", "100%");
-        $tr = new HTM("tr");
-        $td = new HTM("td");
-        $td->attr("class", "content_body");
-        $td->attr("align", "center");
-        $td->cont($input);
-        $tr->cont($td);
-
-        if (!empty($showDelete)) {
-            $td = new HTM("td");
-            $td->attr("class", "content_body");
-            $td->attr("align", "center");
-            $td->cont($input2 ?? '');
-            $tr->cont($td);
-        }
-        $table->cont($tr);
-        $form->cont($table);
-
-        $tdA->cont($form);
-        $trA->cont($tdA);
-        $tableA->cont($trA);
-        return $tableA;
-    }
-
-
-    /**
-     * create a blue headline
-     */
-    public function createHeadline($text)
-    {
-        $div = new HTM("div");
-        $div->attr("class", "eval_title");
-        $div->attr("style", "margin-bottom:4px; margin-top:4px;");
-        $div->cont($text);
-        return $div;
-    }
-
-    /**
-     * create a fat-printed sub headline with some space
-     */
-    public function createSubHeadline($text)
-    {
-        $div = new HTM("div");
-        $div->attr("style", "margin-bottom:4px; margin-top:4px;");
-        $b = new HTM("b");
-        $b->cont($text);
-        $div->cont($b);
-        return $div;
-    }
-
-
-    /**
-     * creates the infobox
-     *
-     */
-    public function createInfoBox()
-    {
-        global $evalID, $rangeID;
-
-        if (get_Username($rangeID)) {
-            $rangeID = get_Username($rangeID);
-        }
-
-        if (empty($rangeID)) {
-            $rangeID = get_Username($GLOBALS['user']->id);
-        }
-
-        $actions = new ActionsWidget();
-        $actions->addLink(_('Vorschau der Evaluation'),
-            URLHelper::getURL('show_evaluation.php',
-                ['evalID' => $evalID,
-                    'isPreview' => YES]), Icon::create('question-circle', 'clickable'),
-            ['target' => $evalID,
-                'onClick' => "openEval('" . $evalID . "'); return false;"]);
-        $actions->addLink(_('Zurück zur Evaluations-Verwaltung'), URLHelper::getURL('admin_evaluation.php',
-            ['page' => 'overview',
-                'check_abort_creation_button' => '1',
-                'evalID' => $evalID,
-                'rangeID' => $rangeID]),
-            Icon::create('link-intern', 'clickable'));
-        Sidebar::Get()->addWidget($actions);
-    }
-
-
-# Define private functions ================================================== #
-
-    /**
-     * creates a new answer
-     *
-     * @access  private
-     * @return  array    the created answer as an array with keys 'answer_id' => new md5 id,
-     *                                                            'text' => "",
-     *                                                            'counter' => 0,
-     *                                                            'correct' => NO
-     */
-    public function makeNewAnswer()
-    {
-        return ['answer_id' => md5(uniqid(rand())),
-            'text' => rand()
-        ];
-    }
-
-
-    /**
-     * deletes the answer at position 'pos' from the array 'answers'
-     * and modifies the array 'deleteAnswers' respectively
-     *
-     * @access  public
-     * @param array  &$answers the answerarray
-     * @param array  &$deleteAnswers the array containing the deleteCheckbox-bool-value for each answer
-     * @param int $pos the position of the answer to be deleted
-     *
-     */
-    public function deleteAnswer($pos, &$answers, &$deleteAnswers)
-    {
-
-        unset($answers[$pos]);
-        if (is_array($deleteAnswers))
-            unset($deleteAnswers[$pos]);
-
-        for ($i = $pos; $i < count($answers); $i++) {
-
-            if (!isset($answers[$i])) {
-                $answers[$i] = $answers[$i + 1];
-                unset($answers[$i + 1]);
-                if (is_array($deleteAnswers)) {
-                    $deleteAnswers[$i] = $deleteAnswers[$i + 1];
-                    unset($deleteAnswers[$i + 1]);
-                }
-            }
-        }
-        return;
-    }
-
-    /**
-     * checks which button was pressed
-     *
-     * @access  public
-     * @returns string   the command "add_answers", "delete_answers", etc.
-     *
-     */
-    public function getPageCommand()
-    {
-        foreach ($_REQUEST as $key => $value) {
-            if (preg_match("/template_(.*)_button?/", $key, $command))
-                break;
-        }
-
-        $return_command = $command[1] ?? '';
-
-        // extract the command if theres a questionID in the commandname
-        if (preg_match("/(.*)_#(.*)/", $return_command, $new_command))
-            $return_command = $new_command[1];
-
-
-        return $return_command;
-    }
-
-
-    /**
-     * Checks if a template with the same name already exists and modifies the
-     * text of the template if necessary.
-     * @param object $template The template
-     * @param object $db The EvaluationQuestionDB
-     * @param string $myuserid My userid
-     * @param boolean $rootTag If yes, add the root tag if necessary
-     * @access   private
-     */
-    public function setUniqueName(&$question, $db, $myuserid, $rootTag = NO)
-    {
-        $text = $question->getText();
-
-        /* Add root tag if necessary ----------------------------------------- */
-        //if ($rootTag && $myuserid == "0" && !mb_strstr ($text, EVAL_ROOT_TAG))
-        //   $question->setText ($text." ".EVAL_ROOT_TAG);
-        /* ------------------------------------------------- end: add root tag */
-
-        /* Remove root tag if necessary -------------------------------------- */
-        if ($myuserid != "0" && mb_strstr($text, EVAL_ROOT_TAG)) {
-            $question->setText(trim(implode("", explode(EVAL_ROOT_TAG, $text))));
-        }
-        /* ---------------------------------------------- end: remove root tag */
-
-        /* Change text if necessary with increasing number ------------------- */
-        $originalName = $question->getText();
-        for ($i = 1; $db->titleExists($question->getText(), $myuserid); $i++) {
-            $question->setText($originalName . " (" . $i . ")");
-        }
-        /* -------------------------------------------------- end: change text */
-    }
-
-# ==================================================== end: private functions #
-
-}
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once HTML;
-# ====================================================== end: including files #
diff --git a/lib/evaluation/evaluation_show.lib.php b/lib/evaluation/evaluation_show.lib.php
deleted file mode 100644
index 40701fb..0000000
--- a/lib/evaluation/evaluation_show.lib.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * Library for evaluation participation page
- *
- * @author      mcohrs <michael A7 cohrs D07 de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-use Studip\Button, Studip\LinkButton;
-
-class EvalShow
-{
-
-  /**
-   * createEvaluationHeader: generate the head of an evaluation (title and base text)
-   * @param   the evaluation
-   * @returns a table row
-   */
-  function createEvaluationHeader( $eval, $votedNow, $votedEarlier )
-  {
-      $br = new HTMpty( "br" );
-
-      $tr = new HTM( "tr" );
-      $td = new HTM( "td" );
-      $td->attr( "class", "table_row_even" );
-
-      $table2 = new HTM( "table" );
-      $table2->attr( "width", "100%" );
-      $tr2 = new HTM( "tr" );
-      $td2 = new HTM( "td" );
-      $td2->attr( "width", "90%" );
-      $td2->attr( "valign", "top" );
-
-      if( $eval->isError() ) {
-      $td2->html( EvalCommon::createErrorReport ($eval, _("Fehler")) );
-      $td2->html( $br );
-      }
-
-      $span = new HTM( "span" );
-      $span->attr( "class", "eval_title" );
-      $span->html( htmlReady($eval->getTitle()) );
-      $td2->cont( $span );
-      $td2->cont( $br );
-
-      $td2->cont( $br );
-      if( $votedNow ) {
-          $message = new HTML('div');
-          $message->_content = [(string) MessageBox::success(_("Vielen Dank für Ihre Teilnahme."))];
-          $td2->cont($message);
-      } elseif( $votedEarlier ) {
-          $message = new HTML('div');
-          $message->_content = [(string) MessageBox::info(_("Sie haben an dieser Evaluation bereits teilgenommen."))];
-          $td2->cont($message);
-      } else {
-          $td2->html( formatReady($eval->getText()) );
-          $td2->cont( $br );
-      }
-      $tr2->cont( $td2 );
-      $voted = $votedNow || $votedEarlier;
-      $message = new HTML('div');
-      $message->_content = [(string)MessageBox::info(EvalShow::getAnonymousText($eval, $voted))];
-      $table2->cont($message);
-      $message = new HTML('div');
-      $message->_content = [(string)EvalShow::getStopdateText( $eval, $voted)];
-      $table2->cont($message);
-
-      if(!$voted && $GLOBALS["mandatories"] != 0) {
-          $message = new HTML('div');
-          $message->_content = [(string)sprintf(_("Mit %s gekennzeichnete Fragen müssen beantwortet werden."),
-              "<b><span class=\"eval_error\">**</span></b>")];
-          $table2->cont($message);
-      }
-
-
-
-      $td->cont( $table2 );
-      $tr->cont( $td );
-
-      return $tr;
-  }
-
-
-  /**
-   * createEvaluation: generate the evaluation itself (questions and answers)
-   * @param   the evaluation
-   * @returns a table row
-   */
-  function createEvaluation( $tree ) {
-      $tr = new HTM( "tr" );
-      $td = new HTM( "td" );
-      $td->attr( "class", "table_row_even" );
-      $td->html( "<hr noshade=\"noshade\" size=\"1\">\n" );
-
-      ob_start();
-        $tree->showTree();
-        $html = ob_get_contents();
-      ob_end_clean();
-
-      $td->html( $html );
-      $td->setTextareaCheck();
-      $tr->cont( $td );
-
-      return $tr;
-  }
-
-
-
-  /**
-   * create html for the meta-information about an evaluation.
-   * @param    Object $eval          The evaluation
-   * @param    bool   $isAssociated  whether the current user has used the eval
-   * @returns  String                a table row
-   */
-  function createEvalMetaInfo( $eval, $votedNow = NO, $votedEarlier = NO ) {
-      $html     = "";
-      $stopdate = $eval->getRealStopdate();
-      $number   = EvaluationDB::getNumberOfVotes( $eval->getObjectID() );
-      $voted    = $votedNow || $votedEarlier;
-
-      $html .= "<div align=\"left\" style=\"margin-left:3px; margin-right:3px;\">\n";
-      $html .= "<hr noshade=\"noshade\" size=\"1\">\n";
-
-#      $html .= $votedEarlier ? _("Sie haben an dieser Evaluation bereits teilgenommen.") : "";
-#      $html .= $votedNow ? _("Vielen Dank für Ihre Teilnahme.") : "";
-#      $html .= $voted ? "<hr noshade=\"noshade\" size=\"1\">\n" : "";
-
-      /* multiple choice? ----------------------------------------------------- */
-#      if ($eval->isMultipleChoice()) {
-#     $html .= ($voted || $eval->isStopped())
-#         ? _("Sie konnten mehrere Antworten auswählen.")
-#         : _("Sie können mehrere Antworten auswählen.");
-#     $html .= " \n";
-#      }
-      /* ---------------------------------------------------------------------- */
-
-      $html .= EvalShow::getNumberOfVotesText( $eval, $voted );
-      $html .= "<br>";
-      $html .= EvalShow::getAnonymousText( $eval, $voted );
-      $html .= "<br>";
-      $html .= EvalShow::getStopdateText( $eval, $voted );
-
-      $html .= "<br>\n";
-      $html .= "</div>\n";
-      /* ---------------------------------------------------------------------- */
-
-      /* create html tr object ------------------------------------------------ */
-      $tr = new HTM( "tr" );
-      $td = new HTM( "td" );
-      $td->attr( "align", "left" );
-      $td->attr( "style", "font-size:0.8em;" );
-      $td->html( $html );
-      $tr->cont( $td );
-      return $tr;
-  }
-
-
-  function getNumberOfVotesText( $eval, $voted ) {
-      $stopdate = $eval->getRealStopdate();
-      $number   = EvaluationDB::getNumberOfVotes( $eval->getObjectID() );
-      $html = "";
-
-      /* Get number of participants ------------------------------------------- */
-      if( $stopdate < time() && $stopdate > 0 ) {
-      if ($number != 1)
-          $html .= sprintf (_("Es haben insgesamt <b>%s</b> Personen teilgenommen"), $number);
-      else
-          $html .= $voted
-          ? _("Sie waren die einzige Person die teilgenommen hat")
-          : _("Es hat insgesamt <b>eine</b> Person teilgenommen");
-      }
-      else {
-      if ($number != 1)
-          $html .= sprintf (_("Es haben bisher <b>%s</b> Personen teilgenommen"), $number);
-      else
-          $html .= $voted
-          ? _("Sie waren bisher der/die einzige Person die teilgenommen hat")
-          : _("Es hat bisher <b>eine</b> Person teilgenommen");
-      }
-      /* ---------------------------------------------------------------------- */
-
-      if ($voted && $number > 1)
-      $html .= _(", Sie ebenfalls");
-
-      $html .= ".\n";
-      return $html;
-  }
-
-  function getStopdateText( $eval, $voted ) {
-      $stopdate = $eval->getRealStopdate();
-      $html = "";
-
-      /* stopdate ------------------------------------------------------------- */
-      if (!empty ($stopdate)) {
-      if( $stopdate < time() ) {
-          $html .=  sprintf (_("Die Evaluation wurde beendet am <b>%s</b> um <b>%s</b> Uhr."),
-                 date ("d.m.Y", $stopdate),
-                 date ("H:i", $stopdate));
-      }
-      else {
-          if( $voted ) {
-          $html .= sprintf (_("Die Evaluation wird voraussichtlich beendet am <b>%s</b> um <b>%s</b> Uhr."),
-                    date ("d.m.Y", $stopdate),
-                    date ("H:i", $stopdate));
-          }
-          else {
-          $html .= sprintf (_("Sie können teilnehmen bis zum <b>%s</b> um <b>%s</b> Uhr."),
-                    date ("d.m.Y", $stopdate),
-                    date ("H:i", $stopdate));
-          }
-      }
-      }
-      else {
-      $html .= _("Der Endzeitpunkt dieser Evaluation steht noch nicht fest.");
-      }
-      $html .= " \n";
-
-      return $html;
-  }
-
-  function getAnonymousText( $eval, $voted ) {
-      $stopdate = $eval->getRealStopdate();
-      $html = "";
-
-      /* Is anonymous --------------------------------------------------------- */
-      if( ($stopdate < time() && $stopdate > 0) ||
-      $voted )
-      $html .= ($eval->isAnonymous())
-          ? _("Die Teilnahme war anonym.")
-          : _("Die Teilnahme war <b>nicht</b> anonym.");
-      else
-      $html .= ($eval->isAnonymous())
-          ? _("Die Teilnahme ist anonym.")
-#         : _("Die Teilnahme ist <b>nicht</b> anonym.");
-          : ("<span style=\"color:red;\">" .
-         _("Dies ist eine personalisierte Evaluation. Ihre Angaben werden verknüpft mit Ihrem Namen gespeichert.") .
-         "</span>");
-
-      return $html;
-  }
-
-
-  /**
-   * createEvaluationFooter: generate the foot of an evaluation (buttons etc.)
-   * @param   the evaluation
-   * @returns a table row
-   */
-  function createEvaluationFooter( $eval, $voted, $isPreview ) {
-      if( $isPreview )
-      $voted = YES;
-
-      $br = new HTMpty( "br" );
-
-      $tr = new HTM( "tr" );
-      $td = new HTM( "td" );
-      $td->attr( "class", "content_body" );
-      $td->attr( "align", "center" );
-      $td->attr( "data-dialog-button","");
-      $td->cont( $br );
-
-      /* vote button */
-      if( ! $voted ) {
-          $button = Button::createAccept(_('Abschicken'),
-                'voteButton',
-                ['title' => _('Senden Sie Ihre Antworten hiermit ab.'), 'data-dialog' => '']);
-         $td->cont( $button );
-      }
-
-      /* close button */
-      if (!Request::isXHR()) {
-         $button = new HTM( "p" );
-         $button->cont( _("Sie können dieses Fenster jetzt schließen.") );
-         $td->cont( $button );
-      }
-
-
-      /* reload button */
-      if( $isPreview ) {
-         $button = LinkButton::create(_('Aktualisieren'),
-                URLHelper::getURL('show_evaluation.php?evalID='.$eval->getObjectID().'&isPreview=1'),
-                ['title' => _('Vorschau aktualisieren.')]);
-         $td->cont( $button );
-      }
-
-      $td->cont( $br );
-      $td->cont( $br );
-
-      $tr->cont( $td );
-
-      return $tr;
-  }
-
-   function createVoteButton ($eval) {
-      $button = LinkButton::create(_('Anzeigen'),
-              URLHelper::getURL('show_evaluation.php?evalID=' .$eval->getObjectID().'&isPreview=' . NO),
-              ['title' => _('Evaluation anzeigen.'),
-                  'onClick' => 'openEval(\''.$eval->getObjectID().'\'); return false;']);
-      $div = new HTML ("div");
-      $div->addHTMLContent( $button );
-      return $div;
-
-      // keine Ahnung warum das hier nicht funktioniert, bekomme eine JS-Fehlermeldung :(
-
-      // <grusel> das da oben reicht ja auch :)
-
-      /*
-      $script = new HTML ("script");
-      $script->addAttr ("type", "text/javascript");
-      $script->addAttr ("language", "JavaScript");
-
-      $aScript = new HTML ("a");
-      $aScript->addAttr ("href", "javascript:void();");
-      $aScript->addAttr ("onClick",
-        "window.open(\'show_evaluation.php?evalID=".$eval->getObjectID ()."\', ".
-        "\'_blank\', ".
-        "\'width=790,height=500,scrollbars=yes,resizable=yes\');");
-      $aScript->addContent ("Teilnehmen"); // Eigentlich kommt hier ein button hin
-      $script->addContent ("document.write ('");
-      $script->addContent ($aScript);
-      $script->addContent ("');");
-
-      $noscript = new HTML ("noscript");
-      $aNoScript = new HTML ("a");
-      $aNoScript->addAttr ("href", "show_evaluation.php?evalID=".$eval->getObjectID ());
-      $aNoScript->addAttr ("target", "_blank");
-      $aNoScript->addContent ("Teilnehmen"); // Eigentlich kommt hier ein button hin
-      $noscript->addContent ($aNoScript);
-
-      $div = new HTML ("div");
-      $div->addContent ($script);
-      $div->addContent ($noscript);
-      $tr = new HTML ("tr");
-      $td = new HTML ("td");
-      $td->addContent($script);
-      $td->addContent($noscript);
-      $tr->addContent($td);
-      return $tr;
-      */
-   }
-
-   function createEditButton ($eval) {
-       return LinkButton::create(_('Bearbeiten'),
-               URLHelper::getURL(EVAL_FILE_ADMIN."?page=edit&evalID=".$eval->getObjectID()),
-               ['title' => _('Evaluation bearbeiten.')]);
-   }
-
-   function createOverviewButton ($rangeID, $evalID) {
-       return LinkButton::create(_('Bearbeiten'),
-               URLHelper::getURL(EVAL_FILE_ADMIN."?rangeID=".$rangeID."&openID=".$evalID."#open"),
-               ['title' => _('Evaluationsverwaltung.')]);
-   }
-
-   function createDeleteButton ($eval) {
-       return LinkButton::create(_('Löschen'),
-               URLHelper::getURL(EVAL_FILE_ADMIN."?evalAction=delete_request&evalID=".$eval->getObjectID ()),
-               ['title' => _('Evaluation löschen.')]);
-   }
-
-   function createStopButton ($eval) {
-       return LinkButton::createCancel(_('Stop'),
-               URLHelper::getURL(EVAL_FILE_ADMIN."?evalAction=stop&evalID=".$eval->getObjectID ()),
-               ['title' => _('Evaluation stoppen.')]);
-   }
-
-   function createContinueButton ($eval) {
-       return LinkButton::create(_('Fortsetzen'),
-               URLHelper::getURL(EVAL_FILE_ADMIN."?evalAction=continue&evalID=".$eval->getObjectID ()),
-               ['title' => _('Evaluation fortsetzen')]);
-   }
-
-   function createExportButton ($eval) {
-       return LinkButton::create(_('Export'),
-               URLHelper::getURL(EVAL_FILE_ADMIN."?evalAction=export_request&evalID=".$eval->getObjectID ()),
-               ['title' => _('Evaluation exportieren.')]);
-   }
-
-   function createReportButton($eval) {
-       return LinkButton::create(_('Auswertung'), URLHelper::getURL("eval_summary.php?eval_id=" . $eval->getObjectID()), ['title' => _('Auswertung')]);
-   }
-
-  /* ----------------------------------------------------------------------- */
-}
-
-# Define constants ========================================================== #
-# ===================================================== end: define constants #
-
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once HTML;
-require_once EVAL_LIB_COMMON;
-# ====================================================== end: including files #
diff --git a/lib/functions.php b/lib/functions.php
index 7d9f4f2..6b00608 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -849,7 +849,7 @@ function search_range($search_str = false, $search_user = false, $show_sem = tru
             }
         }
     } elseif ($GLOBALS['perm']->have_perm('tutor') || $GLOBALS['perm']->have_perm('autor')) {
-        // autors my also have evaluations and news in studygroups with proper rights
+        // autors my also have news in studygroups with proper rights
         $_hidden = _('(versteckt)');
         $query = "SELECT s.Seminar_id, IF(s.visible = 0, CONCAT(s.Name, ' {$_hidden}'), s.Name) AS Name %s
                   FROM seminar_user AS a
diff --git a/lib/include/header.php b/lib/include/header.php
index e7a4ea8..81281ac 100644
--- a/lib/include/header.php
+++ b/lib/include/header.php
@@ -24,7 +24,7 @@
  * Bei Nutzung dieser Funktion unbedingt die Texte unter locale/de/LC_HELP/visibility_decision.php bzw.
  * locale/en/LC_HELP/visibility_decision.php an die lokalen Verhältnisse anpassen!
  */
-if (PageLayout::isHeaderEnabled()) //Einige Seiten benötigen keinen Header, sprich Navigation (Evaluation usw.)
+if (PageLayout::isHeaderEnabled()) //Einige Seiten benötigen keinen Header, sprich Navigation
 {
     $header_template = $GLOBALS['template_factory']->open('header');
     $header_template->current_page = PageLayout::getTitle();
diff --git a/lib/models/StudipEvaluation.php b/lib/models/StudipEvaluation.php
deleted file mode 100644
index 5441db8..0000000
--- a/lib/models/StudipEvaluation.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Evaluation.php
- * model class for table Evaluation
- *
- * 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.
- *
- * @author      Florian Bieringer <florian.bieringer@uni-passau.de>
- * @copyright   2014 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       3.0
- *
- * @property string $id alias column for eval_id
- * @property string $eval_id database column
- * @property string $author_id database column
- * @property string $title database column
- * @property string $text database column
- * @property int|null $startdate database column
- * @property int|null $stopdate database column
- * @property int|null $timespan database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $anonymous database column
- * @property int $visible database column
- * @property int $shared database column
- * @property User $author belongs_to User
- * @property SimpleORMapCollection|User[] $participants has_and_belongs_to_many User
- * @property mixed $enddate additional field
- */
-class StudipEvaluation extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'eval';
-
-        $config['belongs_to']['author'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'author_id'
-        ];
-        $config['has_and_belongs_to_many']['participants'] = [
-            'class_name' => User::class,
-            'thru_table' => 'eval_user'
-        ];
-
-        $config['additional_fields']['enddate'] = true;
-
-        parent::configure($config);
-    }
-
-    /**
-     * Fetches all evaluations for a specific range_id
-     *
-     * @param String $range_id the range id
-     * @return Array All evaluations for that range
-     */
-    public static function findByRange_id($range_id)
-    {
-        return self::findThru($range_id, [
-            'thru_table'        => 'eval_range',
-            'thru_key'          => 'range_id',
-            'thru_assoc_key'    => 'eval_id',
-            'assoc_foreign_key' => 'eval_id'
-        ]);
-    }
-
-    /**
-     * Returns the enddate of a evaluation. Returns null if stop is manual
-     *
-     * @return stopdate or null
-     */
-    public function getEnddate()
-    {
-        if ($this->stopdate) {
-            return $this->stopdate;
-        }
-        if ($this->timespan) {
-            return $this->startdate + $this->timespan;
-        }
-        return null;
-    }
-
-    function getNumberOfVotes ()
-    {
-        return DBManager::get()->fetchColumn("SELECT count(DISTINCT user_id) FROM eval_user WHERE eval_id = ?", [$this->id]);
-    }
-}
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
index ab92bad..b71464c 100644
--- a/lib/models/User.class.php
+++ b/lib/models/User.class.php
@@ -812,9 +812,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
             $activeVotes = [];
             $stoppedVotes = [];
         }
-        // Evaluations
-        $evalDB = new EvaluationDB();
-        $activeEvals = $evalDB->getEvaluationIDs($this->id, EVAL_STATE_ACTIVE);
+
         // Free datafields
         $data_fields = DataFieldEntry::getDataFieldEntries($this->id, 'user');
 
@@ -891,7 +889,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
                 'identifier' => 'commondata'
             ];
         }
-        if (Config::get()->VOTE_ENABLE && ($activeVotes || $stoppedVotes || $activeEvals) && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['votes'])) {
+        if (Config::get()->VOTE_ENABLE && ($activeVotes || $stoppedVotes) && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['votes'])) {
             $homepage_elements['votes'] = [
                 'name'       => _('Fragebögen'),
                 'visibility' => $homepage_visibility['votes'] ?? get_default_homepage_visibility($this->id),
@@ -1228,20 +1226,6 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
         $statement = DBManager::get()->prepare($query);
         $statement->execute([$new_id, $old_id]);
 
-        // Evaluationen
-        $query = "UPDATE IGNORE eval SET author_id = ? WHERE author_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        self::removeDoubles('eval_user', 'eval_id', $new_id, $old_id);
-        $query = "UPDATE IGNORE eval_user SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE evalanswer_user SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
         // Kategorien
         $query = "UPDATE IGNORE kategorien SET range_id = ? WHERE range_id = ?";
         $statement = DBManager::get()->prepare($query);
diff --git a/lib/modules/CoreAdmin.class.php b/lib/modules/CoreAdmin.class.php
index 948809c..4bf1880 100644
--- a/lib/modules/CoreAdmin.class.php
+++ b/lib/modules/CoreAdmin.class.php
@@ -80,12 +80,6 @@ class CoreAdmin extends CorePlugin implements StudipModule
                     $item->setDescription(_('Erstellen und bearbeiten von Fragebögen.'));
                     $navigation->addSubNavigation('questionnaires', $item);
                 }
-                if (Config::get()->EVAL_ENABLE) {
-                    $item = new Navigation(_('Evaluationen'), 'admin_evaluation.php?view=eval_sem');
-                    $item->setImage(Icon::create('evaluation'));
-                    $item->setDescription(_('Richten Sie fragebogenbasierte Umfragen und Lehrevaluationen ein.'));
-                    $navigation->addSubNavigation('evaluation', $item);
-                }
             }
 
             /*
diff --git a/lib/modules/CoreStudygroupAdmin.class.php b/lib/modules/CoreStudygroupAdmin.class.php
index d311390..d299adf 100644
--- a/lib/modules/CoreStudygroupAdmin.class.php
+++ b/lib/modules/CoreStudygroupAdmin.class.php
@@ -43,10 +43,6 @@ class CoreStudygroupAdmin extends CorePlugin implements StudipModule
             $item = new Navigation(_('Fragebögen'), 'dispatch.php/questionnaire/courseoverview');
             $item->setDescription(_('Erstellen und bearbeiten von Fragebögen.'));
             $navigation->addSubNavigation('questionnaires', $item);
-
-            $item = new Navigation(_('Evaluationen'), 'admin_evaluation.php?view=eval_sem');
-            $item->setDescription(_('Richten Sie fragebogenbasierte Umfragen und Lehrevaluationen ein.'));
-            $navigation->addSubNavigation('evaluation', $item);
         }
         return ['admin' => $navigation];
     }
diff --git a/lib/modules/EvaluationsWidget.php b/lib/modules/EvaluationsWidget.php
index 64458d9..dab271f 100644
--- a/lib/modules/EvaluationsWidget.php
+++ b/lib/modules/EvaluationsWidget.php
@@ -45,13 +45,7 @@ class EvaluationsWidget extends CorePlugin implements PortalPlugin
         // include and show votes and tests
         $controller = app(AuthenticatedController::class, ['dispatcher' => app(\Trails_Dispatcher::class)]);
         $controller->suppress_empty_output = true;
-
-        if (Config::get()->EVAL_ENABLE) {
-            $response = $controller->relay('evaluation/display/studip')->body;
-        }
-
-        $controller->suppress_empty_output = (bool)$response;
-        $response .= $controller->relay('questionnaire/widget/start')->body;
+        $response = $controller->relay('questionnaire/widget/start')->body;
 
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response;
diff --git a/lib/navigation/AdminNavigation.php b/lib/navigation/AdminNavigation.php
index 8e86e04..a1762c6 100644
--- a/lib/navigation/AdminNavigation.php
+++ b/lib/navigation/AdminNavigation.php
@@ -75,9 +75,6 @@ class AdminNavigation extends Navigation
         $navigation->addSubNavigation('faculty', new Navigation(_('Mitarbeiter'), 'dispatch.php/institute/members?admin_view=1'));
         $navigation->addSubNavigation('groups', new Navigation(_('Funktionen / Gruppen'), 'dispatch.php/admin/statusgroups?type=inst'));
 
-        if (Config::get()->EVAL_ENABLE) {
-            $navigation->addSubNavigation('evaluation', new Navigation(_('Evaluationen'), 'admin_evaluation.php?view=eval_inst'));
-        }
 
         if (Config::get()->EXTERN_ENABLE) {
             $navigation->addSubNavigation('external', new Navigation(_('Externe Seiten'), 'dispatch.php/institute/extern'));
diff --git a/lib/navigation/ContentsNavigation.php b/lib/navigation/ContentsNavigation.php
index 821d3ad..f6190e2 100644
--- a/lib/navigation/ContentsNavigation.php
+++ b/lib/navigation/ContentsNavigation.php
@@ -124,13 +124,6 @@ class ContentsNavigation extends Navigation
             }
         }
 
-        if (Config::get()->EVAL_ENABLE) {
-            $eval = new Navigation(_('Evaluationen'), 'admin_evaluation.php', ['rangeID' => $GLOBALS['user']->username]);
-            $eval->setImage(Icon::create('test'));
-            $eval->setDescription(_('Erstellen Sie komplexe Befragungen'));
-            $this->addSubNavigation('evaluation', $eval);
-        }
-
         // elearning
         if (Config::get()->ELEARNING_INTERFACE_ENABLE) {
             $elearning = new Navigation(_('Lernmodule'), 'dispatch.php/elearning/my_accounts');
diff --git a/lib/navigation/StartNavigation.php b/lib/navigation/StartNavigation.php
index 913f3fa..acd5ee3 100644
--- a/lib/navigation/StartNavigation.php
+++ b/lib/navigation/StartNavigation.php
@@ -231,9 +231,6 @@ class StartNavigation extends Navigation
         if (Config::get()->VOTE_ENABLE) {
             $navigation->addSubNavigation('questionnaire', new Navigation(_('Ankündigungen'), 'dispatch.php/news/admin_news'));
         }
-        if (Config::get()->EVAL_ENABLE) {
-            $navigation->addSubNavigation('evaluation', new Navigation(_('Evaluationen'), 'admin_evaluation.php', ['rangeID' => $auth->auth['uname']]));
-        }
 
         // elearning
         if (Config::get()->ELEARNING_INTERFACE_ENABLE) {
diff --git a/lib/object.inc.php b/lib/object.inc.php
index 5f231da..c23efa4 100644
--- a/lib/object.inc.php
+++ b/lib/object.inc.php
@@ -354,7 +354,6 @@ function object_type_to_id($type)
         'inst'=> 0,
         'basicdata' => 0,
         'vote' => -1,
-        'eval' => -2,
         'news' => 'CoreOverview',
         'documents' => 'CoreDocuments',
         'schedule' => 'CoreSchedule',
@@ -393,7 +392,6 @@ function object_id_to_type($id)
         'inst'=> 0,
         'basicdata' => 0,
         'vote' => -1,
-        'eval' => -2,
         'news' => 'CoreOverview',
         'documents' => 'CoreDocuments',
         'schedule' => 'CoreSchedule',
diff --git a/public/admin_evaluation.php b/public/admin_evaluation.php
deleted file mode 100644
index bee8cce..0000000
--- a/public/admin_evaluation.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// admin_evaluation.php
-//
-// Show the admin pages
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * admin_evaluation.php
- *
- *
- * @author  cb
- * @version 10. Juni 2003
- * @access  public
- * @package evaluation
- */
-
-require '../lib/bootstrap.php';
-
-ob_start(); // start output buffering
-
-page_open ( ["sess" => "Seminar_Session",
-                  "auth" => "Seminar_Auth",
-                  "perm" => "Seminar_Perm",
-                  "user" => "Seminar_User"]);
-$perm->check ("autor");
-
-$list = Request::option('list');
-$view = Request::option('view');
-
-
-include_once 'lib/seminar_open.php';
-
-PageLayout::setHelpKeyword("Basis.Evaluationen");
-$title = _('Verwaltung von Evaluationen');
-if (Context::get()) {
-    $title = Context::getHeaderLine() . ' - ' . $title;
-}
-PageLayout::setTitle($title);
-
-require_once 'lib/evaluation/evaluation.config.php';
-
-if ($view === 'eval_inst') {
-    Navigation::activateItem('/admin/institute/evaluation');
-    require_once 'lib/admin_search.inc.php';
-} else if (Context::getId() && $view == "eval_sem") {
-    Navigation::activateItem('/course/admin/evaluation');
-    if ($GLOBALS['perm']->have_studip_perm('admin', Context::getId())) {
-        // Ensure the select widget is added last
-        NotificationCenter::on('SidebarWillRender', function () {
-            $widget = new CourseManagementSelectWidget();
-            Sidebar::get()->addWidget($widget);
-        });
-    }
-} else {
-    Navigation::activateItem('/contents/evaluation');
-}
-
-if ((Context::getId()) && ($view == "eval_sem") || ($view == "eval_inst")) {
-    $the_range = Context::getId();
-} else {
-    $the_range = Request::option('rangeID');
-}
-
-$isUserrange = null;
-if ($the_range) {
-    if (get_Username($the_range)) {
-        $the_range = get_Username($the_range);
-    }
-    if (get_Userid($the_range)) {
-        $isUserrange = 1;
-    }
-} elseif ($view) {
-    $the_range = Context::getId();
-}
-
-if (empty($the_range)) {
-    $the_range = $user->id;
-    $isUserrange = 1;
-}
-
-if ($the_range != $auth->auth['uname'] && $the_range != 'studip' && !$isUserrange){
-    $view_mode = get_object_type($the_range);
-    if ($view_mode == "fak"){
-        $view_mode = "inst";
-    }
-}
-
-
-ob_start();
-if (Request::option('page') == "edit"){
-    include (EVAL_PATH.EVAL_FILE_EDIT);
-}else{
-    include (EVAL_PATH.EVAL_FILE_OVERVIEW);
-}
-$template = $GLOBALS['template_factory']->open('layouts/base.php');
-$template->content_for_layout = ob_get_clean();
-echo $template->render();
-page_close();
diff --git a/public/eval_config.php b/public/eval_config.php
deleted file mode 100644
index d064688..0000000
--- a/public/eval_config.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-# Lifert001: TODO
-# Lifter002: TEST
-# Lifter003: TEST
-# Lifter005: DONE - not applicable
-# Lifter007: TEST
-# Lifter010: DONE - not applicable
-
-/**
- * eval_config.php
- *
- * Konfiurationsseite fuer Eval-Auswertungen
- *
- *
- * @author Jan Kulmann <jankul@tzi.de>
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// eval_config.php
-// Copyright (C) 2005 Jan Kulmann <jankul@tzi.de>
-// +---------------------------------------------------------------------------+
-// 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 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 '../lib/bootstrap.php';
-
-    page_open([
-        'sess' => 'Seminar_Session',
-        'auth' => 'Seminar_Auth',
-        'perm' => 'Seminar_Perm',
-        'user' => 'Seminar_User'
-    ]);
-
-    $perm->check('user');
-
-    include 'lib/seminar_open.php';             // initialise Stud.IP-Session
-
-    // -- here you have to put initialisations for the current page
-    require_once 'lib/evaluation/evaluation.config.php';
-    require_once EVAL_FILE_EVAL;
-    require_once EVAL_FILE_OBJECTDB;
-
-    // Start of Output
-    PageLayout::setTitle(_('Evaluations-Auswertung'));
-    PageLayout::setHelpKeyword('Basis.Evaluationen');
-    Navigation::activateItem('/contents/evaluation');
-
-    // Extract variables from request
-    $eval_id     = Request::option('eval_id');
-    $template_id = Request::option('template_id');
-
-    // Überprüfen, ob die Evaluation existiert oder der Benutzer genügend Rechte hat
-    $eval = new Evaluation($eval_id);
-    $eval->check();
-    if (EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval) == YES || count($eval->errorArray) > 0) {
-        throw new Exception(_("Diese Evaluation ist nicht vorhanden oder Sie haben nicht ausreichend Rechte!"));
-    }
-
-    // Store settings
-    if (Request::submitted('store')) {
-        if (!$template_id) {
-            $template_id = DbView::get_uniqid();
-
-            $query = "INSERT INTO eval_templates_eval (eval_id, template_id)
-                      VALUES (?, ?)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$eval_id, $template_id]);
-        }
-
-        $show_questions              = Request::int('show_questions');
-        $show_total_stats            = Request::int('show_total_stats');
-        $show_graphics               = Request::int('show_graphics');
-        $show_questionblock_headline = Request::int('show_questionblock_headline');
-        $show_group_headline         = Request::int('show_group_headline');
-
-        $polscale_gfx_type           = Request::option('polscale_gfx_type');
-        $likertscale_gfx_type        = Request::option('likertscale_gfx_type');
-        $mchoice_scale_gfx_type      = Request::option('mchoice_scale_gfx_type');
-
-        $query = "INSERT INTO eval_templates
-                      (template_id, user_id, name,
-                       show_questions, show_total_stats, show_graphics,
-                       show_questionblock_headline, show_group_headline,
-                       polscale_gfx_type, likertscale_gfx_type, mchoice_scale_gfx_type)
-                  VALUES (?, ?, 'nix', ?, ?, ?, ?, ?, ?, ?, ?)
-                  ON DUPLICATE KEY UPDATE show_questions = VALUES(show_questions),
-                                          show_total_stats = VALUES(show_total_stats),
-                                          show_graphics = VALUES(show_graphics),
-                                          show_questionblock_headline = VALUES(show_questionblock_headline),
-                                          show_group_headline = VALUES(show_group_headline),
-                                          polscale_gfx_type = VALUES(polscale_gfx_type),
-                                          likertscale_gfx_type = VALUES(likertscale_gfx_type),
-                                          mchoice_scale_gfx_type = VALUES(mchoice_scale_gfx_type)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $template_id, $GLOBALS['user']->id,
-            $show_questions, $show_total_stats, $show_graphics,
-            $show_questionblock_headline, $show_group_headline,
-            $polscale_gfx_type, $likertscale_gfx_type, $mchoice_scale_gfx_type
-        ]);
-
-        PageLayout::postMessage(MessageBox::success(_('Die Auswertungskonfiguration wurde gespeichert.')));
-    }
-
-    // Read template setting from db
-    $query = "SELECT template_id,
-                     show_total_stats, show_graphics, show_questions, show_group_headline, show_questionblock_headline,
-                     polscale_gfx_type, likertscale_gfx_type, mchoice_scale_gfx_type
-              FROM eval_templates AS t
-              JOIN eval_templates_eval AS te USING (template_id)
-              WHERE te.eval_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$eval_id]);
-    $templates = $statement->fetch(PDO::FETCH_ASSOC);
-
-    // Open, populate and render template
-    $template = $GLOBALS['template_factory']->open('evaluation/config');
-    $template->set_layout($GLOBALS['template_factory']->open('layouts/base'));
-
-    $template->eval_id      = $eval_id;
-    $template->templates    = $templates;
-    $template->has_template = !empty($templates);
-
-    echo $template->render();
-
-  // Save data back to database.
-  page_close();
diff --git a/public/eval_summary.php b/public/eval_summary.php
deleted file mode 100644
index cbd6036..0000000
--- a/public/eval_summary.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TEST
-# Lifter003: TEST
-# Lifter010: TODO
-/**
- * eval_summary.php - Hauptseite fuer Eval-Auswertungen
- *
- * 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.
- *
- * @author      Jan Kulmann <jankul@zmml.uni-bremen.de>
- * @copyright   2007-2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-
-require '../lib/bootstrap.php';
-
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_EVAL;
-require_once EVAL_FILE_OBJECTDB;
-
-ob_start();
-page_open(["sess" => "Seminar_Session", "auth" => "Seminar_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"]);
-
-include ('lib/seminar_open.php'); // initialise Stud.IP-Session
-
-$eval_id = Request::option('eval_id');
-/*
-    1 = normale HTML-Ansicht in Stud.IP
-    2 = Druckansicht, ohne HTML-Elemente
-*/
-$ausgabeformat = Request::int('ausgabeformat', 1);
-$cmd = Request::option('cmd');
-$evalgroup_id = Request::option('evalgroup_id');
-$group_type = Request::option('group_type');
-
-// Überprüfen, ob die Evaluation existiert oder der Benutzer genügend Rechte hat
-$eval = new Evaluation($eval_id);
-$eval->check();
-if (EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval) == YES || count($eval->errorArray) > 0) {
-    throw new Exception(_("Diese Evaluation ist nicht vorhanden oder Sie haben nicht ausreichend Rechte!"));
-}
-
-// Template vorhanden?
-$has_template   = 0;
-$eval_templates = [];
-$question_type  = "";
-
-$tmp_path_export = $GLOBALS['TMP_PATH'];
-
-if (isset($cmd)) {
-    if ($cmd=="change_group_type" && isset($evalgroup_id) && isset($group_type)) {
-        $query = "SELECT 1 FROM eval_group_template WHERE evalgroup_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$evalgroup_id]);
-        $present = $statement->fetchColumn();
-
-        if ($present) { // Datensatz schon vorhanden --> UPDATE
-            if ($group_type == "normal") {
-                $query = "DELETE FROM eval_group_template WHERE group_type = 'table' AND evalgroup_id = ?";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([$evalgroup_id]);
-            } else {
-                $query = "UPDATE eval_group_template SET group_type = ? WHERE evalgroup_id = ? AND user_id = ?";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([$group_type, $evalgroup_id, $GLOBALS['user']->id]);
-            }
-        } else { // Datensatz nicht vorhanden --> INSERT
-            $query = "INSERT INTO eval_group_template (evalgroup_id, user_id, group_type)
-            VALUES (?, ?, ?)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$evalgroup_id, $GLOBALS['user']->id, $group_type]);
-        }
-    }
-}
-
-
-function do_template($column)
-{
-    global $has_template, $eval_templates;
-
-    return ($has_template==0 || ($has_template==1 && $eval_templates[$column]));
-}
-
-
-/**
- * returning the type of the graph
- *
- * @return string
- */
-function do_graph_template()
-{
-    global $eval_templates, $has_template, $question_type;
-
-    if ($has_template == 1) {
-        if ($question_type == 'likertskala') {
-            return $eval_templates['likertscale_gfx_type'];
-        }
-        if ($question_type == 'multiplechoice') {
-            return $eval_templates['mchoice_scale_gfx_type'];
-        }
-        if ($question_type == 'polskala') {
-            return $eval_templates['polscale_gfx_type'];
-        }
-    }
-    return 'bars';
-}
-
-/**
- * drawing the graph for a evaluation question
- *
- * @param array() $data
- * @param string $evalquestion_id
- */
-function do_graph($data, $evalquestion_id)
-{
-    global $tmp_path_export, $auth;
-
-    $type = do_graph_template();
-
-    //Define the object
-    if ($type == "pie") {
-        // Beim pie muss die Zeichenflaeche etwas groesser gewaehlt werden...
-        $graph = new PHPlot(500,300);
-    } else {
-        $graph = new PHPlot(300,250);
-    }
-
-    if ($type == "pie") {
-        // Beim pie muss das Array umgeformt werden. Bug in PHPlot?
-        $tmp = [];
-        $tmp2 = [];
-        $legend = [];
-        array_push($tmp,"Test");
-        foreach($data as $k=>$d) {
-            array_push($tmp, $d[1]);
-            array_push($legend, $d[0]);
-        }
-        array_push($tmp2, $tmp);
-        $data = $tmp2;
-        $graph->SetLegend($legend);
-    }
-
-    //Data Colors
-    $graph->SetDataColors(
-        ["blue", "green", "yellow", "red", "PeachPuff", "orange", "pink", "lavender",
-            "navy", "peru", "salmon", "maroon", "magenta", "orchid", "ivory"],
-        ["black"] //Border Colors
-    );
-
-    if(!empty($data)) {
-        $_data = [];
-        array_walk($data, function($d) use (&$_data) {
-            $_data[] = next($d);
-        });
-        $max_x = max($_data);
-        $graph->SetPlotAreaWorld(NULL, 0); // y-achse bei 0 starten
-        $graph->SetPrecisionY(0); //anzahl kommastellen y-achse
-        $graph->SetYTickIncrement($max_x < 10 ? 1 : round($max_x/10));
-        $graph->SetPlotBgColor([222,222,222]);
-        $graph->SetDataType("text-data");
-        $graph->SetFileFormat(Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT);
-        $graph->SetOutputFile($tmp_path_export."/evalsum".$evalquestion_id.$auth->auth["uid"].".".Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT);
-        $graph->SetIsInline(true);
-        $graph->SetDataValues($data);
-        $graph->SetPlotType($type);
-        $graph->SetXLabelAngle(count($data) < 10 ? 0 : 90);
-        //$graph->SetShading(0); // kein 3D
-
-        $graph->SetLineWidth(1);
-        $graph->SetDrawXDataLabels(true);
-        //Draw it
-        $graph->DrawGraph();
-    }
-}
-
-function freetype_answers($parent_id, $anz_nutzer)
-{
-    $query = "SELECT `text`
-              FROM evalanswer
-              INNER JOIN evalanswer_user USING(evalanswer_id)
-              WHERE parent_id = ? AND `text` != ''
-              ORDER BY position";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-
-    echo "  <tr>\n";
-    echo "    <td colspan=\"2\">\n";
-    echo "      <table border=\"0\" width=\"100%\">\n";
-    echo "        <tr><td colspan=\"2\" class=\"blank\"><font size=\"-1\"><b>"._("Antworten")."</b></font></td></tr>\n";
-
-    $counter = 1;
-    while (false !== ($answer = $statement->fetchColumn())) {
-        echo "      <tr>\n";
-        echo "        <td width=\"1%\" valign=\"TOP\"><font size=\"-1\"><b>".$counter.".</b></font></td><td><font size=\"-1\">".formatReady($answer)."</font></td>\n";
-        echo "      </tr>\n";
-        $counter++;
-    }
-
-    echo "      </table>\n";
-    echo "    </td>\n";
-    echo "  </tr>\n";
-    echo "  <tr><td colspan=\"2\"><font size=\"-1\">"._("Anzahl der Teilnehmenden").": ".$anz_nutzer."</font></td></tr>\n";
-}
-
-function user_answers_residual($parent_id)
-{
-    $query = "SELECT COUNT(*)
-              FROM evalanswer
-              JOIN evalanswer_user USING (evalanswer_id)
-              WHERE parent_id = ? AND residual = 1";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-    return $statement->fetchColumn();
-}
-
-function user_answers($evalanswer_id)
-{
-    $query = "SELECT COUNT(*) FROM evalanswer_user WHERE evalanswer_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$evalanswer_id]);
-    return $statement->fetchColumn();
-}
-
-function answers($parent_id, $anz_nutzer, $question_type)
-{
-    global $graph_switch, $auth, $ausgabeformat, $has_template;
-
-    // Rueckgabearray, damit die Daten noch aufzutrennen sind...
-    $ret_array = ["id"=>$parent_id,                         // Question-ID
-               "txt"=>"",                                // HTML-Ausgabe
-               "antwort_texte"=>[],                 // Antwort-Texte
-               "frage"=>"",                              // Frage-Text
-               "has_residual"=>0,                // Enthaltungen?
-               "antwort_durchschnitt"=>"",               // Antwort-Durchschnitt
-               "summe_antworten"=>"",                    // Summe der Antworten
-               "anzahl_teilnehmer"=>$anz_nutzer,         // Anzahl der Teilnehmer dieser Frage
-               "auswertung"=>[]                     // 1. Anzahl der Antworten zu einer Antwort
-                                                 // 2. Prozente einer Antwort
-                                                 // 3. Prozente einer Antwort ohne Enthaltungen
-              ];
-
-    $summary =  [];
-
-    $query = "SELECT COUNT(*)
-              FROM evalanswer
-              JOIN evalanswer_user USING (evalanswer_id)
-              WHERE parent_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-    $answers_sum = $statement->fetchColumn();
-
-    $antwort_nummer = 0;
-    $edit = "";
-    $txt = "";
-    $gesamte_antworten = 0;
-    $antwort_durchschnitt = 0;
-    $has_residual = user_answers_residual($parent_id);
-    $i = 1;
-    $edit .= "<tr class=\"table_row_even\"><td width=\"1%\">&nbsp;</td><td width=\"70%\"><font size=\"-1\"><b>"._("Antworten")."</b></font></td><td width=\"29%\"><font size=\"-1\"><b>"._("Auswertung")."</b></font></td></tr>\n";
-
-    $query = "SELECT evalanswer_id, `text`, value, residual FROM evalanswer WHERE parent_id = ? ORDER BY position";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-    while ($answer = $statement->fetch(PDO::FETCH_ASSOC)) {
-        $antwort_nummer++;
-        $answer_counter = user_answers($answer['evalanswer_id']);
-        if ($answer['residual'] == 0) {
-            $gesamte_antworten += $answer_counter;
-            $antwort_durchschnitt += $answer_counter * $antwort_nummer;
-        }
-        $prozente_wo_residual = 0;
-        if ($has_residual && ($answers_sum - $has_residual)>0) $prozente_wo_residual = ROUND($answer_counter*100/($anz_nutzer-$has_residual));
-        $prozente = 0;
-        if ($answers_sum > 0) $prozente = ROUND($answer_counter*100/$anz_nutzer);
-        $edit .= "<tr ".($i==1?'class="content_body"':'')."><td width=\"1%\"><font size=\"-1\"><b>".$antwort_nummer.".&nbsp;</b></font></td><td width=\"70%\"><font size=\"-1\">".($answer['text'] != '' ? formatReady($answer['text']) : $answer['value'])."</font></td>";
-        if ($has_residual) $edit .= "<td width=\"29%\"><font size=\"-1\">".$answer_counter." (".$prozente."%) ".($answer['residual'] == 0 ? "(".$prozente_wo_residual."%)<b>*</b>" : "" )."</font></td></tr>\n";
-        else $edit .= "<td width=\"29%\"><font size=\"-1\">".$answer_counter." (".$prozente."%)</font></td></tr>\n";
-        array_push($summary, [$antwort_nummer."(".$prozente."%)",$answer_counter]);
-
-        array_push($ret_array["antwort_texte"], ($answer['text'] != '' ? formatReady($answer['text']) : $answer['value']));
-        array_push($ret_array["auswertung"], [$answer_counter, $prozente, ($answer['residual'] == 0 ? $prozente_wo_residual : null)]);
-        if ($has_residual) $ret_array["has_residual"] = 1;
-
-        $i = 0;
-    }
-    do_graph($summary, $parent_id);
-
-    if ($gesamte_antworten > 0 && $antwort_durchschnitt > 0) $antwort_durchschnitt = ROUND($antwort_durchschnitt / $gesamte_antworten, 3);
-
-    $ret_array["antwort_durchschnitt"] = $antwort_durchschnitt;
-    $ret_array["summe_antworten"] = $gesamte_antworten;
-
-    $txt .= "  <tr>\n";
-    $txt .= "    <td width=\"70%\" valign=\"TOP\">\n";
-    $txt .= "      <table width=\"98%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
-    $txt .= $edit."\n";
-    $txt .= "        <tr class=\"blank\"><td colspan=\"3\"><font size=\"-1\">&nbsp;</font></td></tr>";
-    $txt .= "        <tr class=\"blank\"><td colspan=\"3\"><font size=\"-1\"><b>&#x2211;</b>=".$gesamte_antworten." "._("Antworten")."</font></td></tr>";
-
-    $txt .= "        <tr class=\"blank\">";
-    if ($question_type=="multiplechoice") {
-        $txt .= "        <td colspan=\"3\">";
-    } else {
-        $txt .= "<td colspan=\"2\"><font size=\"-1\"><b>&#x2205;</b>-"._("Antwort").": ".$antwort_durchschnitt.($has_residual==0 ? "" : "<b>*</b>")."</font></td><td>";
-    }
-    $txt .= "          <font size=\"-1\">"._("Anzahl der Teilnehmenden").": ".$anz_nutzer."</font></td></tr>";
-
-    if ($has_residual) $txt .= "        <tr class=\"blank\"><td colspan=\"3\"><font size=\"-1\"><b>*</b>"._("Werte ohne Enthaltungen").".</font></td></tr>";
-    $txt .= "      </table>";
-    $txt .= "    </td>\n";
-    $txt .= "    <td width=\"30%\" valign=\"TOP\" align=\"RIGHT\">\n";
-    if (do_template("show_graphics")) {
-        $txt .= '<IMG SRC="' . FileManager::getDownloadLinkForTemporaryFile(
-            'evalsum'.$parent_id.$auth->auth['uid'].'.'.Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT,
-            'evalsum'.$parent_id.$auth->auth['uid'].'.'.Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT) .'">'."\n";
-    } else $txt .= "&nbsp;\n";
-    $txt .= "    </td>\n";
-    $txt .= "  </tr>\n";
-
-    $ret_array['txt'] = $txt;
-
-    return $ret_array;
-
-}
-
-function groups($parent_id)
-{
-    global $ausgabeformat, $global_counter, $local_counter, $question_type, $eval_id, $evalgroup_id;
-
-    $query = "SELECT group_type FROM eval_group_template WHERE evalgroup_id = ?";
-    $type_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT LOCATE('Freitext', `text`) > 0 FROM evalquestion WHERE evalquestion_id = ?";
-    $freetext_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT evalquestion_id, `text`, type FROM evalquestion WHERE parent_id = ? ORDER BY position";
-    $questions_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT COUNT(DISTINCT user_id)
-              FROM evalanswer
-              JOIN evalanswer_user USING(evalanswer_id)
-              WHERE parent_id = ?";
-    $question_users_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT evalgroup_id, child_type, title, template_id FROM evalgroup WHERE parent_id = ? ORDER BY position";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-
-    while ($group = $statement->fetch(PDO::FETCH_ASSOC)) {
-        // Heraussuchen, ob es sich um ein Freitext-Template handelt...
-        $freetext_statement->execute([$group['template_id']]);
-        $freetype = $freetext_statement->fetchColumn();
-        $freetext_statement->closeCursor();
-
-        if ($group['child_type'] == 'EvaluationGroup') {
-            $global_counter += 1;
-            $local_counter   = 0;
-
-            echo "  <tr><td class=\"".($ausgabeformat==1 ? "table_header_bold" : "blank")."\" align=\"LEFT\" colspan=\"2\">\n";
-            if (do_template("show_group_headline"))
-                echo "    <b>".$global_counter.". ".formatReady($group['title'])."</b>&nbsp;\n";
-            else echo "&nbsp;";
-        } else {
-            $local_counter += 1;
-
-            $type_statement->execute([$group['evalgroup_id']]);
-            $group_type = $type_statement->fetchColumn() ?: 'normal';
-            $type_statement->closeCursor();
-
-            echo "  <tr><td class=\"".($ausgabeformat==1 ? "table_row_odd" : "blank")."\" colspan=\"2\">\n";
-            if (do_template("show_questionblock_headline")) {
-                echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td align=\"left\"><b>".$global_counter.".".$local_counter.". ".formatReady($group['title'])."</b></td>";
-                echo "<td align=\"RIGHT\">";
-                if ($ausgabeformat==1 && !$freetype) {
-                    if ($group_type === 'normal') {
-                        echo '<a href="' . URLHelper::getLink('?eval_id=' . $eval_id . '&evalgroup_id=' . $group['evalgroup_id'] . '&group_type=table&cmd=change_group_type#anker') . '">';
-                        echo Icon::create('vote-stopped', 'clickable', ['title' => _('Zum Darstellungstyp Tabelle wechseln')])->asImg();
-                        echo '</a>';
-                    } else {
-                        echo '<a href="' . URLHelper::getLink('?eval_id=' . $eval_id . '&evalgroup_id=' . $group['evalgroup_id'] . '&group_type=normal&cmd=change_group_type#anker') . '">';
-                        echo Icon::create('vote', 'clickable', ['title' => _('Zum Darstellungstyp Normal wechseln')])->asImg();
-                    }
-                } else {
-                    echo '&nbsp;';
-                }
-                echo "</td>";
-                echo "</tr></table>\n";
-            }
-            if ($evalgroup_id == $group['evalgroup_id']) {
-                echo "  <a name=\"anker\"></a>\n";
-            }
-        }
-
-        echo "  </td></tr>";
-
-        if ($group['child_type'] == 'EvaluationQuestion') {
-            echo "  <tr><td class=\"blank\" colspan=\"2\">\n";
-
-            echo "<table border=\"". (!empty($group_type) && $group_type=="normal" || $ausgabeformat==1 ? "0" : "1") ."\" width=\"100%\" cellspacing=\"0\">\n";
-
-            $local_question_counter = 0;
-            $answer_arr = [];
-
-            $questions_statement->execute([$group['evalgroup_id']]);
-            while ($question = $questions_statement->fetch(PDO::FETCH_ASSOC)) {
-                $question_type = $question['type'];
-
-                $question_users_statement->execute([$question['evalquestion_id']]);
-                $question_users = $question_users_statement->fetchColumn();
-                $question_users_statement->closeCursor();
-
-                $local_question_counter += 1;
-
-                if (do_template('show_questions') && !empty($group_type) && $group_type === 'normal') {
-                    echo "    <tr><td class=\"blank\" colspan=\"2\">\n";
-                    echo "      <b>".$global_counter.".".$local_counter.".".$local_question_counter.". ".formatReady($question['text'])."</b></font>\n";
-                    echo "    </td></tr>\n";
-                }
-
-                if (!($freetype)) {
-                    // Keine Freitext-Eingabe
-                    $ret = answers($question['evalquestion_id'], $question_users, $question['type']);
-                    $ret["frage"] = $question['text'];
-                    array_push($answer_arr, $ret);
-                    if ($group_type=="normal") echo $ret["txt"];
-                } else {
-                    // Freitext
-                    freetype_answers($question['evalquestion_id'], $question_users);
-                }
-            }
-            $questions_statement->closeCursor();
-
-            if (!$freetype && !empty($group_type) && $group_type === 'table') {
-                $antworten_angezeigt = FALSE;
-                $i = 0;
-                $has_residual = 0;
-                foreach ($answer_arr as $k1=>$questions) { // Oberste Ebene, hier sind die Questions abgelegt
-
-                    if (!($antworten_angezeigt)) {
-                        $i = 1;
-                                            echo "  <tr class=\"table_row_even\"><td><font size=\"-1\">&nbsp;</font></td>";
-                                            foreach ($questions["antwort_texte"] as $k2=>$v2) { // 1. Unterebene, hier sind die Antworttexte abgelegt
-                                                echo "<td><font size=\"-1\">".$v2."</font></td>";
-                                            }
-                        echo "<td align=\"center\"><font size=\"-1\"><b>&#x2211;</b></font></td><td align=\"center\"><font size=\"-1\"><b>&#x2205;</b></font></td><td align=\"center\"><font size=\"-1\">"._("Teilnehmende")."</font></td>";
-                                            echo "</tr>";
-                                            $antworten_angezeigt = TRUE;
-                                        }
-
-                    echo "<tr ". ($i==1?'class="content_body"':'').">";
-                    echo "  <td><font size=\"-1\">".$questions["frage"]."</font></td>";
-                    foreach ($questions["auswertung"] as $k3=>$v3) {
-                        echo "<td width=\"10%\" valign=\"TOP\"><font size=\"-1\">";
-                        echo $v3[0]." (".$v3[1]."%)"; // 2. Unterebene, hier sind die Zahlen abgelegt
-                        if ($v3[2]) echo " (".$v3[2]."%)<b>*</b>";
-                        echo "</font></td>";
-                    }
-
-                    $i=0;
-                    if ($questions["has_residual"]) $has_residual = 1;
-
-                    echo "<td align=\"center\" width=\"3%\" valign=\"TOP\"><font size=\"-1\">".$questions["summe_antworten"]."</font></td><td align=\"center\" width=\"3%\" valign=\"TOP\"><font size=\"-1\">".$questions["antwort_durchschnitt"].($questions["has_residual"]?"<b>*</b>":"")."</font></td><td align=\"center\" width=\"6%\" valign=\"TOP\"><font size=\"-1\">".$questions["anzahl_teilnehmer"]."</font></td>";
-
-                    echo "</tr>";
-                }
-                if ($has_residual) echo "<tr><td><font size=\"-1\"><b>*</b>"._("Werte ohne Enthaltungen").".</font></td></tr>";
-            }
-
-            echo "</table>\n";
-            echo "</td></tr>\n";
-        }
-        groups($group['evalgroup_id']);
-    }
-}
-
-$query = "SELECT eval_id, title, author_id, anonymous
-          FROM eval
-          WHERE eval_id = ?";
-$statement = DBManager::get()->prepare($query);
-$statement->execute([
-    $eval_id
-]);
-
-if ($evaluation = $statement->fetch(PDO::FETCH_ASSOC)) {
-  $query = "SELECT t.*
-            FROM eval_templates AS t
-            JOIN eval_templates_eval AS te USING (template_id)
-            WHERE te.eval_id = ?";
-  $statement = DBManager::get()->prepare($query);
-  $statement->execute([$eval_id]);
-  $eval_templates = $statement->fetch(PDO::FETCH_ASSOC);
-
-  $has_template = !empty($eval_templates);
-
-  $db_owner = User::find($evaluation['author_id']);
-
-  $global_counter = 0;
-  $local_counter  = 0;
-
-  $query = "SELECT COUNT(DISTINCT user_id) FROM eval_user WHERE eval_id = ?";
-  $statement = DBManager::get()->prepare($query);
-  $statement->execute([$eval_id]);
-  $number_of_votes = $statement->fetchColumn();
-
-  $eval_ranges_names = [];
-
-  $query = "SELECT range_id FROM eval_range WHERE eval_id = ?";
-  $statement = DBManager::get()->prepare($query);
-  $statement->execute([$eval_id]);
-  $eval_ranges = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-  foreach ($eval_ranges as $eval_range) {
-      $o_type = get_object_type($eval_range, ['studip','user','sem','inst']);
-      switch($o_type) {
-      case 'global':
-          $name = _('Systemweite Evaluationen');
-          break;
-      case 'sem':
-          $name = _('Veranstaltung') . ':';
-          $seminar = Seminar::getInstance($eval_range);
-          $name .= ' ' . $seminar->getName();
-          $name .= ' (' . Semester::findByTimestamp($seminar->semester_start_time)->name;
-          if ($seminar->semester_duration_time == -1) {
-              $name .= ' - ' . _('unbegrenzt');
-          }
-          if ($seminar->semester_duration_time > 0) {
-              $name .= ' - ' . Semester::findByTimestamp($seminar->semester_start_time + $seminar->semester_duration_time)->name;
-          }
-          $name .= ')';
-          $dozenten = array_map(function($v){return $v['Nachname'];}, $seminar->getMembers('dozent'));
-          $name .= ' (' . join(', ' , $dozenten) . ')';
-          break;
-      case 'user':
-          $name = _('Profil') . ':';
-          $name .= ' ' . get_fullname($eval_range);
-          break;
-      case 'inst':
-      case 'fak':
-          $name = _('Einrichtung') . ':';
-          $name .= ' ' . Institute::find($eval_range)->name;
-          break;
-      default:
-          $name = _('unbekannt');
-      }
-      $eval_ranges_names[] = $name;
-  }
-  sort($eval_ranges_names);
-
-  // Evaluation existiert auch...
-  echo "<table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\">\n";
-  echo "<tr><td class=\"table_header_bold\" align=\"left\"><font color=\"".($ausgabeformat==1 ? "white" : "black")."\">";
-  echo ($ausgabeformat==1 ? Icon::create('test', 'info_alt')->asImg() : "" );
-  echo "<b>"._("Evaluations-Auswertung")."</b></font></td>\n";
-  echo "<td class=\"".($ausgabeformat==1 ? "table_header_bold" : "blank" )."\" align=\"RIGHT\">".($ausgabeformat==1 ? "<a href=\"eval_summary_export.php?eval_id=".$eval_id."\" TARGET=\"_blank\"><font color=\"WHITE\">"._("PDF-Export")."</font></a><b>&nbsp;|&nbsp;</b><a href=\"".URLHelper::getLink('?eval_id='.$eval_id.'&ausgabeformat=2')."\" TARGET=\"_blank\"><font color=\"WHITE\">"._("Druckansicht")."</font></a>&nbsp;&nbsp;<a href=\"eval_config.php?eval_id=".$eval_id."\">" . Icon::create('arr_2right', 'info_alt', ['title' => _('Auswertung konfigurieren')])->asImg() . "</a>" : "" ) ."&nbsp;</td>\n";
-  echo "</tr>\n";
-  echo "<tr><td class=\"blank\" colspan=\"2\" align=\"left\">&nbsp;</td></tr>\n";
-  echo "<tr><td class=\"blank\" colspan=\"2\" align=\"left\"><font size=\"+1\"><b>&nbsp;&nbsp;".formatReady($evaluation['title'] ?? '')."</b></font></td>\n";
-  echo "<tr><td class=\"blank\" colspan=\"2\" align=\"left\">&nbsp;&nbsp;";
-  echo _("Diese Evaluation ist folgenden Bereichen zugeordnet:");
-  echo '<ul>';
-  echo '<li>' . join('</li><li>', array_map('htmlready', $eval_ranges_names)) . '</li>';
-  echo '</ul>';
-  echo "</td></tr>\n";
-
-  echo "</tr>\n";
-
-  echo "<tr><td class=\"blank\" colspan=\"2\" align=\"left\">&nbsp;</font></td></tr>\n";
-
-  // Gesamtstatistik
-  if (do_template("show_total_stats")) {
-    echo "  <tr>\n";
-    echo "    <td colspan=\"2\" class=\"blank\"><font size=\"-1\">\n";
-    echo "      &nbsp;&nbsp;".$number_of_votes." "._("Teilnehmende insgesamt").".&nbsp;";
-    echo "      ". ($evaluation['anonymous'] == 0 ? _('Die Teilnahme war nicht anonym.') : _('Die Teilnahme war anonym.')) . ' ';
-    echo "      "._("Eigentümer").": ".($db_owner ? htmlReady($db_owner->getFullName('no_title')) : _('Unbekannter Nutzer')).". ".("Erzeugt am").": ".date('d.m.Y H:i:s');
-    echo "    </font></td>\n";
-    echo "  </tr>\n";
-  }
-
-  echo "  <tr><td colspan=\"2\">\n";
-  echo "    <table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"8\">\n";
-
-  groups($evaluation['eval_id']);
-
-  echo "    </table>\n";
-  echo "  </td></tr>\n";
-  echo "</table>\n";
-}
-
-
-PageLayout::setHelpKeyword("Basis.Evaluationen");
-Navigation::activateItem('/contents/evaluation');
-PageLayout::setTitle(_("Evaluations-Auswertung"));
-
-if ($ausgabeformat == 2) {
-    PageLayout::removeStylesheet('studip-base.css');
-    PageLayout::addStylesheet('print.css');
-}
-$layout = $GLOBALS['template_factory']->open('layouts/base.php');
-
-$layout->content_for_layout = ob_get_clean();
-
-echo $layout->render();
-page_close();
diff --git a/public/eval_summary_export.php b/public/eval_summary_export.php
deleted file mode 100644
index 77b349a..0000000
--- a/public/eval_summary_export.php
+++ /dev/null
@@ -1,699 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TEST
-# Lifter010: DONE - not applicable
-/**
-* eval_summary_export.php
-*
-* PDF-Export fuer Eval-Auswertungen
-*
-*
-* @author               Jan Kulmann <jankul@zmml.uni-bremen.de>
-*/
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// eval_summary_export.php
-// Copyright (C) 2007 Jan Kulmann <jankul@zmml.uni-bremen.de>
-// +---------------------------------------------------------------------------+
-// 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 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 '../lib/bootstrap.php';
-
-page_open(["sess" => "Seminar_Session", "auth" => "Seminar_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"]);
-
-$perm->check('user');
-
-include 'lib/seminar_open.php'; // initialise Stud.IP-Session
-
-// -- here you have to put initialisations for the current page
-require_once 'lib/evaluation/evaluation.config.php';
-require_once EVAL_FILE_EVAL;
-require_once EVAL_FILE_OBJECTDB;
-
-// Start of Output
-$eval_id = Request::option('eval_id');
-
-// Überprüfen, ob die Evaluation existiert oder der Benutzer genügend Rechte hat
-$eval = new Evaluation($eval_id);
-$eval->check();
-if (EvaluationObjectDB::getEvalUserRangesWithNoPermission($eval) == YES || count($eval->errorArray) > 0) {
-    throw new Exception(_("Diese Evaluation ist nicht vorhanden oder Sie haben nicht ausreichend Rechte!"));
-}
-
-$tmp_path_export = $GLOBALS['TMP_PATH'];
-
-// Template vorhanden?
-$eval_templates = [];
-$has_template   = 0;
-
-$pattern = ["'<img[\s]+[^>]*?src[\s]?=[\s\"\']+(.*?)[\"\']+.*?>'si"];
-$replace = ["<fo:external-graphic src=\"url(\\1)\"/>"];
-
-
-function do_template($column)
-{
-    global $has_template, $eval_templates;
-
-    return ($has_template==0 || ($has_template==1 && $eval_templates[$column]));
-}
-
-/**
- * returning the type of the graph
- *
- * @return string
- */
-function do_graph_template()
-{
-    global $eval_templates, $has_template, $question_type;
-
-    if ($has_template == 1) {
-        if ($question_type == 'likertskala') {
-            return $eval_templates['likertscale_gfx_type'];
-        }
-        if ($question_type == 'multiplechoice') {
-            return $eval_templates['mchoice_scale_gfx_type'];
-        }
-        if ($question_type == 'polskala') {
-            return $eval_templates['polscale_gfx_type'];
-        }
-    }
-    return 'bars';
-}
-
-/**
- * drawing the graph for a evaluation question
- *
- * @param array() $data
- * @param string $evalquestion_id
- */
-function do_graph($data, $evalquestion_id)
-{
-    global $tmp_path_export, $auth;
-
-    $type = do_graph_template();
-
-    //Define the object
-    if ($type == "pie") {
-        // Beim pie muss die Zeichenflaeche etwas groesser gewaehlt werden...
-        $graph = new PHPlot(500,300);
-    } else {
-        $graph = new PHPlot(300,250);
-    }
-
-    if ($type == "pie") {
-        // Beim pie muss das Array umgeformt werden. Bug in PHPlot?
-        $tmp = [];
-        $tmp2 = [];
-        $legend = [];
-        array_push($tmp,"Test");
-        foreach($data as $k=>$d) {
-            array_push($tmp, $d[1]);
-            array_push($legend, $d[0]);
-        }
-        array_push($tmp2, $tmp);
-        $data = $tmp2;
-        $graph->SetLegend($legend);
-    }
-
-    //Data Colors
-    $graph->SetDataColors(
-        ["blue", "green", "yellow", "red", "PeachPuff", "orange", "pink", "lavender",
-            "navy", "peru", "salmon", "maroon", "magenta", "orchid", "ivory"],
-        ["black"] //Border Colors
-    );
-
-    if(!empty($data)) {
-        $max_x = max(array_map('next',$data));
-        $graph->SetPlotAreaWorld(NULL, 0); // y-achse bei 0 starten
-        $graph->SetPrecisionY(0); //anzahl kommastellen y-achse
-        $graph->SetYTickIncrement($max_x < 10 ? 1 : round($max_x/10));
-        $graph->SetPlotBgColor([222,222,222]);
-        $graph->SetDataType("text-data");
-        $graph->SetFileFormat(Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT);
-        $graph->SetOutputFile($tmp_path_export."/evalsum".$evalquestion_id.$auth->auth["uid"].".".Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT);
-        $graph->SetIsInline(true);
-        $graph->SetDataValues($data);
-        $graph->SetPlotType($type);
-        $graph->SetXLabelAngle(count($data) < 10 ? 0 : 90);
-        //$graph->SetShading(0); // kein 3D
-
-        $graph->SetLineWidth(1);
-        $graph->SetDrawXDataLabels(true);
-        //Draw it
-        $graph->DrawGraph();
-    }
-}
-
-function freetype_answers ($parent_id, $anz_nutzer) {
-    global $fo_file, $pattern, $replace;
-
-    $query = "SELECT `text`
-              FROM evalanswer
-              INNER JOIN evalanswer_user USING(evalanswer_id)
-              WHERE parent_id = ? AND `text` != ''
-              ORDER BY position";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-
-    while ($answer = $statement->fetchColumn()) {
-        $counter++;
-        fputs($fo_file,"                <fo:table-row>\n");
-        fputs($fo_file,"                  <fo:table-cell ><fo:block linefeed-treatment=\"preserve\" font-size=\"8pt\">".$counter.". ".preg_replace($pattern,$replace,xml_escape($answer))."</fo:block></fo:table-cell>\n");
-        fputs($fo_file,"                </fo:table-row>\n");
-    }
-    fputs($fo_file,"                <fo:table-row>\n");
-    fputs($fo_file,"                  <fo:table-cell ><fo:block font-size=\"8pt\">"._("Anzahl der Teilnehmenden").": ".$anz_nutzer."</fo:block></fo:table-cell>\n");
-    fputs($fo_file,"                </fo:table-row>\n");
-}
-
-function user_answers_residual($parent_id)
-{
-    $query = "SELECT COUNT(*)
-              FROM evalanswer
-              JOIN evalanswer_user USING (evalanswer_id)
-              WHERE parent_id = ? AND residual = 1";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-    return $statement->fetchColumn();
-}
-
-function user_answers($evalanswer_id)
-{
-    $query = "SELECT COUNT(*) FROM evalanswer_user WHERE evalanswer_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$evalanswer_id]);
-    return $statement->fetchColumn();
-}
-
-function answers ($parent_id, $anz_nutzer, $question_type) {
-    global $graph_switch, $auth, $ausgabeformat, $fo_file, $has_template, $pattern, $replace;
-
-     // Rueckgabearray, damit die Daten noch aufzutrennen sind...
-        $ret_array = ["id"=>$parent_id,                         // Question-ID
-                           "txt"=>"",                                // HTML-Ausgabe
-                           "antwort_texte"=>[],                 // Antwort-Texte
-                           "frage"=>"",                              // Frage-Text
-                           "has_residual"=>0,                        // Enthaltungen?
-                           "antwort_durchschnitt"=>"",               // Antwort-Durchschnitt
-                           "summe_antworten"=>"",                    // Summe der Antworten
-                           "anzahl_teilnehmer"=>$anz_nutzer,         // Anzahl der Teilnehmer dieser Frage
-                           "auswertung"=>[]                     // 1. Anzahl der Antworten zu einer Antwort
-                                                                     // 2. Prozente einer Antwort
-                                                                     // 3. Prozente einer Antwort ohne Enthaltungen
-                          ];
-
-    $summary =  [];
-
-    $query = "SELECT COUNT(*)
-              FROM evalanswer
-              JOIN evalanswer_user USING (evalanswer_id)
-              WHERE parent_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-    $answers_sum = $statement->fetchColumn();
-
-    $antwort_nummer = 0;
-    $gesamte_antworten = 0;
-    $edit = "";
-    $txt = "";
-    $antwort_durchschnitt = 0;
-    $has_residual = user_answers_residual($parent_id);
-
-    $query = "SELECT evalanswer_id, `text`, value, residual FROM evalanswer WHERE parent_id = ? ORDER BY position";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-    while ($answer = $statement->fetch(PDO::FETCH_ASSOC)) {
-        $antwort_nummer++;
-        $answer_counter = user_answers($answer['evalanswer_id']);
-        if ($answer['residual'] == 0) {
-            $gesamte_antworten += $answer_counter;
-            $antwort_durchschnitt += $answer_counter * $antwort_nummer;
-        }
-        $prozente = 0;
-        if ($answers_sum>0) $prozente = ROUND($answer_counter*100/$anz_nutzer);
-        $prozente_wo_residual = 0;
-        if ($has_residual && ($answers_sum-$has_residual)>0) $prozente_wo_residual = ROUND($answer_counter*100/($anz_nutzer-$has_residual));
-        $edit .= "                <fo:table-row>\n";
-        $edit .= "                  <fo:table-cell ><fo:block font-size=\"8pt\">".$antwort_nummer.". ". xml_escape(($answer['text']!="" ? $answer['text'] : $answer['value']))."</fo:block></fo:table-cell>\n";
-
-        if ($has_residual) $edit .= "                  <fo:table-cell ><fo:block font-size=\"8pt\">".$answer_counter." (".$prozente."%) ".($answer['residual'] == 0 ? "(".$prozente_wo_residual."%)*" : "" )."</fo:block></fo:table-cell>\n";
-        else $edit .= "                  <fo:table-cell ><fo:block font-size=\"8pt\">".$answer_counter." (".$prozente."%)</fo:block></fo:table-cell>\n";
-        $edit .= "                </fo:table-row>\n";
-
-        array_push($summary, [$antwort_nummer."(".$prozente."%)",$answer_counter]);
-
-        array_push($ret_array["antwort_texte"], ($answer['text'] != "" ? $answer['text'] : $answer['value']));
-                array_push($ret_array["auswertung"], [$answer_counter, $prozente, ($answer['residual']==0 ? $prozente_wo_residual : null)]);
-                if ($has_residual) $ret_array["has_residual"] = 1;
-
-    }
-    do_graph($summary, $parent_id);
-
-    if ($gesamte_antworten > 0 && $antwort_durchschnitt > 0) $antwort_durchschnitt = ROUND($antwort_durchschnitt / $gesamte_antworten, 3);
-
-    $ret_array["antwort_durchschnitt"] = $antwort_durchschnitt;
-        $ret_array["summe_antworten"] = $gesamte_antworten;
-
-    $txt .= $edit;
-
-    if ($question_type=="multiplechoice") {
-        $txt .= "                <fo:table-row>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\">"._("Anzahl der Teilnehmenden").": ".$anz_nutzer."</fo:block></fo:table-cell>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"></fo:block></fo:table-cell>\n";
-        $txt .= "                </fo:table-row>\n";
-
-        $txt .= "                <fo:table-row>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"><fo:inline font-family=\"Symbol\">&#x2211;</fo:inline> ".$gesamte_antworten." "._("Antworten").".</fo:block></fo:table-cell>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"></fo:block></fo:table-cell>\n";
-        $txt .= "                </fo:table-row>\n";
-    } else {
-        $txt .= "                <fo:table-row>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\">"._("Anzahl der Teilnehmenden").": ".$anz_nutzer."</fo:block></fo:table-cell>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"></fo:block></fo:table-cell>\n";
-        $txt .= "                </fo:table-row>\n";
-
-        $txt .= "                <fo:table-row>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"><fo:inline font-family=\"Symbol\">&#x2205;</fo:inline>-"._("Antwort").": ".$antwort_durchschnitt.($has_residual==0 ? "" : "*")."</fo:block></fo:table-cell>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"><fo:inline font-family=\"Symbol\">&#x2211;</fo:inline> ".$gesamte_antworten." "._("Antworten").".</fo:block></fo:table-cell>\n";
-        $txt .= "                </fo:table-row>\n";
-
-    }
-
-    if ($has_residual) {
-        $txt .= "                <fo:table-row>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\">*"._("Werte ohne Enthaltungen").".</fo:block></fo:table-cell>\n";
-        $txt .= "                  <fo:table-cell ><fo:block space-before.optimum=\"5pt\" font-size=\"8pt\"></fo:block></fo:table-cell>\n";
-        $txt .= "                </fo:table-row>\n";
-    }
-
-    $ret_array["txt"] = $txt;
-
-        return $ret_array;
-
-}
-
-function groups ($parent_id) {
-    global $ausgabeformat, $fo_file, $auth, $global_counter, $local_counter, $tmp_path_export, $pattern, $replace;
-
-    $query = "SELECT group_type FROM eval_group_template WHERE evalgroup_id = ?";
-    $type_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT LOCATE('Freitext', `text`) > 0 FROM evalquestion WHERE evalquestion_id = ?";
-    $freetext_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT evalquestion_id, `text`, type FROM evalquestion WHERE parent_id = ? ORDER BY position";
-    $questions_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT COUNT(DISTINCT user_id)
-              FROM evalanswer
-              JOIN evalanswer_user USING(evalanswer_id)
-              WHERE parent_id = ?";
-    $question_users_statement = DBManager::get()->prepare($query);
-
-    $query = "SELECT evalgroup_id, child_type, title, template_id FROM evalgroup WHERE parent_id = ? ORDER BY position";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$parent_id]);
-
-    while ($group = $statement->fetch(PDO::FETCH_ASSOC)) {
-        // Heraussuchen, ob es sich um ein Freitext-Template handelt...
-        $freetext_statement->execute([$group['template_id']]);
-        $freetype = $freetext_statement->fetchColumn();
-        $freetext_statement->closeCursor();
-
-        if ($group['child_type'] == 'EvaluationGroup') {
-            $global_counter += 1;
-            $local_counter   = 0;
-            fputs($fo_file,"    <!-- Groupblock -->\n");
-            fputs($fo_file,"    <fo:block font-variant=\"small-caps\" font-weight=\"bold\" text-align=\"start\" space-after.optimum=\"2pt\" background-color=\"lightblue\" space-before.optimum=\"10pt\">\n");
-            if (do_template("show_group_headline"))
-                fputs($fo_file,"      ".$global_counter.". ". xml_escape($group['title']) ."\n");
-            fputs($fo_file,"    </fo:block>\n");
-        } else {
-            $local_counter += 1;
-
-            $type_statement->execute([$group['evalgroup_id']]);
-            $group_type = $type_statement->fetchColumn() ?: 'normal';
-            $type_statement->closeCursor();
-
-            fputs($fo_file,"    <!-- Questionblock -->\n");
-            fputs($fo_file,"    <fo:block font-variant=\"small-caps\" font-weight=\"bold\" text-align=\"start\" background-color=\"grey\" color=\"white\" space-after.optimum=\"10pt\">\n");
-            if (do_template("show_questionblock_headline"))
-                fputs($fo_file,"      ".$global_counter.".".$local_counter.". ". xml_escape($group['title']) ."\n");
-            fputs($fo_file,"    </fo:block>\n");
-        }
-
-        if ($group['child_type'] == 'EvaluationQuestion') {
-
-            $local_question_counter = 0;
-            $answer_arr = [];
-
-            $questions_statement->execute([$group['evalgroup_id']]);
-            while ($question = $questions_statement->fetch(PDO::FETCH_ASSOC)) {
-                $question_users_statement->execute([$question['evalquestion_id']]);
-                $question_users = $question_users_statement->fetchColumn();
-                $question_users_statement->closeCursor();
-
-                if ($group_type=="normal") {
-
-                $local_question_counter += 1;
-                fputs($fo_file,"    <!-- Question -->\n");
-                fputs($fo_file,"    <fo:block text-align=\"start\" font-weight=\"bold\" space-before.optimum=\"10pt\" space-after.optimum=\"10pt\">\n");
-                if (do_template("show_questions")) {
-                    fputs($fo_file,"      ".$global_counter.".".$local_counter.".".$local_question_counter.". ". xml_escape($question['text']) ."\n");
-                }
-                fputs($fo_file,"    </fo:block>\n");
-                fputs($fo_file,"    <!-- table start -->\n");
-                fputs($fo_file,"    <fo:table table-layout=\"fixed\" border-width=\".1mm\" space-after.optimum=\"10pt\">\n");
-                if (!($freetype)) {
-                    fputs($fo_file,"      <fo:table-column column-width=\"100mm\"/>\n");
-                    fputs($fo_file,"      <fo:table-column column-width=\"60mm\"/>\n");
-                } else {
-                    fputs($fo_file,"      <fo:table-column column-width=\"160mm\"/>\n");
-                }
-                fputs($fo_file,"      <fo:table-body>\n");
-                fputs($fo_file,"        <fo:table-row >\n");
-                fputs($fo_file,"          <fo:table-cell ><fo:block start-indent=\"3mm\" end-indent=\"3mm\" padding-left=\"3mm\" padding-right=\"3mm\" padding-top=\"4mm\" padding-bottom=\"4mm\">\n");
-                fputs($fo_file,"            <!-- table start -->\n");
-                fputs($fo_file,"            <fo:table table-layout=\"fixed\">\n");
-                if (!($freetype)) {
-                    fputs($fo_file,"              <fo:table-column column-width=\"60mm\"/>\n");
-                    fputs($fo_file,"              <fo:table-column column-width=\"40mm\"/>\n");
-                } else {
-                    fputs($fo_file,"              <fo:table-column column-width=\"160mm\"/>\n");
-                }
-                fputs($fo_file,"              <fo:table-body>\n");
-
-
-                } // ($group_type=="normal")
-
-                if (!($freetype)) {
-                    // Keine Freitext-Eingabe
-                    $ret = answers($question['evalquestion_id'], $question_users, $question['type']);
-                    $ret["frage"] = $question['text'];
-                    array_push($answer_arr, $ret);
-                    if ($group_type=="normal") fputs($fo_file, $ret["txt"]);
-                } else {
-                    // Freitext
-                    freetype_answers($question['evalquestion_id'], $question_users);
-                }
-
-
-                if ($group_type=="normal") {
-
-                    fputs($fo_file,"              </fo:table-body>\n");
-                    fputs($fo_file,"            </fo:table>\n");
-                    fputs($fo_file,"            <!-- table end -->\n");
-                    fputs($fo_file,"          </fo:block></fo:table-cell>\n");
-                    if (!($freetype)) {
-                        fputs($fo_file,"          <fo:table-cell ><fo:block start-indent=\"3mm\" end-indent=\"3mm\" padding-left=\"3mm\" padding-right=\"3mm\" padding-top=\"4mm\" padding-bottom=\"4mm\">\n");
-                        if (do_template("show_graphics")) {
-                            fputs($fo_file,"            <fo:external-graphic content-width=\"70mm\" content-height=\"60mm\" src=\"url('file:///".$tmp_path_export."/evalsum".$question['evalquestion_id'].$auth->auth["uid"].".".Config::get()->EVAL_AUSWERTUNG_GRAPH_FORMAT."')\"/>\n");
-                        }
-                        fputs($fo_file,"          </fo:block></fo:table-cell>\n");
-                    }
-                    fputs($fo_file,"        </fo:table-row>\n");
-                    fputs($fo_file,"      </fo:table-body>\n");
-                    fputs($fo_file,"    </fo:table>\n");
-                    fputs($fo_file,"  <!-- table end -->\n");
-
-                } // ($group_type=="normal")
-
-
-
-            }
-
-            if (!($freetype) && $group_type=="table") {
-
-                $antworten_angezeigt = FALSE;
-                                $i = 0;
-                                $has_residual = 0;
-                $col_count = count($answer_arr[0]["antwort_texte"]);
-
-                fputs($fo_file,"    <!-- table start -->\n");
-                                fputs($fo_file,"    <fo:table table-layout=\"fixed\" border-width=\".1mm\" border-style=\"solid\" space-after.optimum=\"10pt\">\n");
-                fputs($fo_file,"              <fo:table-column/>\n");
-                for ($a=1; $a<=$col_count; $a++)
-                    fputs($fo_file,"              <fo:table-column  column-width=\"15mm\"/>\n");
-                fputs($fo_file,"              <fo:table-column  column-width=\"8mm\"/>\n");
-                fputs($fo_file,"              <fo:table-column  column-width=\"8mm\"/>\n");
-                fputs($fo_file,"              <fo:table-column  column-width=\"15mm\"/>\n");
-
-
-                fputs($fo_file,"      <fo:table-body>\n");
-
-                                foreach ($answer_arr as $k1=>$questions) { // Oberste Ebene, hier sind die Questions abgelegt
-                    if (!($antworten_angezeigt)) {
-                                            $i = 1;
-                        fputs($fo_file,"        <fo:table-row >\n");
-                        fputs($fo_file,"          <fo:table-cell ><fo:block space-before.optimum=\"10pt\">\n");
-                        fputs($fo_file,"          </fo:block></fo:table-cell >");
-                        foreach ($questions["antwort_texte"] as $k2=>$v2) { // 1. Unterebene, hier sind die Antworttexte abgelegt
-                            fputs($fo_file,"          <fo:table-cell ><fo:block space-before.optimum=\"10pt\" font-size=\"7pt\">\n");
-                            fputs($fo_file, xml_escape($v2));
-                            fputs($fo_file,"          </fo:block></fo:table-cell >");
-                        }
-
-                        fputs($fo_file,"          <fo:table-cell ><fo:block text-align=\"center\" space-before.optimum=\"10pt\" font-size=\"7pt\" font-family=\"Symbol\">\n");
-                        fputs($fo_file, "&#x2211;");
-                        fputs($fo_file,"          </fo:block></fo:table-cell >");
-                        fputs($fo_file,"          <fo:table-cell ><fo:block text-align=\"center\" space-before.optimum=\"10pt\" font-size=\"7pt\" font-family=\"Symbol\">\n");
-                        fputs($fo_file, "&#x2205;");
-                        fputs($fo_file,"          </fo:block></fo:table-cell >");
-                        fputs($fo_file,"          <fo:table-cell ><fo:block text-align=\"center\" space-before.optimum=\"10pt\" font-size=\"7pt\">\n");
-                        fputs($fo_file, _("Teilnehmende"));
-                        fputs($fo_file,"          </fo:block></fo:table-cell >");
-
-                        fputs($fo_file,"        </fo:table-row>\n");
-                        $antworten_angezeigt = TRUE;
-                    }
-
-                    fputs($fo_file,"        <fo:table-row >\n");
-
-                    fputs($fo_file,"          <fo:table-cell ><fo:block font-size=\"6pt\" start-indent=\"3mm\">\n");
-                    fputs($fo_file, $questions["frage"]);
-                    fputs($fo_file,"          </fo:block></fo:table-cell >");
-
-                    foreach ($questions["auswertung"] as $k3=>$v3) {
-                        fputs($fo_file,"          <fo:table-cell ><fo:block font-size=\"7pt\">\n");
-                        fputs($fo_file, $v3[0]." (".$v3[1]."%)"); // 2. Unterebene, hier sind die Zahlen abgelegt
-                        if ($v3[2]) fputs($fo_file, " (".$v3[2]."%)*");
-                        fputs($fo_file,"          </fo:block></fo:table-cell >");
-                    }
-
-                    $i=0;
-                    if ($questions["has_residual"]) $has_residual = 1;
-
-                    fputs($fo_file,"          <fo:table-cell ><fo:block text-align=\"center\" font-size=\"7pt\">\n");
-                    fputs($fo_file, $questions["summe_antworten"]);
-                    fputs($fo_file,"          </fo:block></fo:table-cell >");
-
-                    fputs($fo_file,"          <fo:table-cell ><fo:block text-align=\"center\" font-size=\"7pt\">\n");
-                    fputs($fo_file, $questions["antwort_durchschnitt"].($questions["has_residual"]?"*":""));
-                    fputs($fo_file,"          </fo:block></fo:table-cell >");
-
-                    fputs($fo_file,"          <fo:table-cell ><fo:block text-align=\"center\" font-size=\"7pt\">\n");
-                    fputs($fo_file, $questions["anzahl_teilnehmer"]);
-                    fputs($fo_file,"          </fo:block></fo:table-cell >");
-
-                    fputs($fo_file,"        </fo:table-row>\n");
-
-                }
-
-                fputs($fo_file,"        <fo:table-row >\n");
-                fputs($fo_file,"          <fo:table-cell ><fo:block start-indent=\"3mm\" space-after.optimum=\"10pt\" font-size=\"7pt\">\n");
-                if ($has_residual) fputs($fo_file, "* "._("Werte ohne Enthaltungen").".");
-                fputs($fo_file,"          </fo:block></fo:table-cell >");
-                fputs($fo_file,"        </fo:table-row >\n");
-
-                fputs($fo_file,"      </fo:table-body>\n");
-                fputs($fo_file,"    </fo:table>\n");
-                                fputs($fo_file,"  <!-- table end -->\n");
-
-            }
-        }
-
-        groups($group['evalgroup_id']);
-
-    }
-
-}
-
-
-$query = "SELECT eval_id, title, author_id, anonymous
-          FROM eval
-          WHERE eval_id = ?";
-$statement = DBManager::get()->prepare($query);
-$statement->execute([
-    $eval_id
-]);
-
-if ($evaluation = $statement->fetch(PDO::FETCH_ASSOC)) {
-    // Evaluation existiert auch...
-
-    $query = "SELECT t.*
-              FROM eval_templates AS t
-              JOIN eval_templates_eval AS te USING (template_id)
-              WHERE te.eval_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$eval_id]);
-    $eval_templates = $statement->fetch(PDO::FETCH_ASSOC);
-
-    $has_template = !empty($eval_templates);
-
-    $db_owner = User::find($evaluation['author_id']);
-
-    $global_counter = 0;
-    $local_counter  = 0;
-
-    $query = "SELECT COUNT(DISTINCT user_id) FROM eval_user WHERE eval_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$eval_id]);
-    $number_of_votes = $statement->fetchColumn();
-
-    $query = "SELECT range_id FROM eval_range WHERE eval_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$eval_id]);
-    $eval_ranges = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-    $eval_ranges_names = [];
-    foreach ($eval_ranges as $eval_range) {
-      $o_type = get_object_type($eval_range, ['studip','user','sem','inst']);
-      switch($o_type) {
-      case 'global':
-          $name = _("Systemweite Evaluationen");
-          break;
-      case 'sem':
-          $name = _('Veranstaltung') . ':';
-          $seminar = Seminar::getInstance($eval_range);
-          $name .= ' ' . $seminar->getName();
-          $name .= ' (' . Semester::findByTimestamp($seminar->semester_start_time)->name;
-          if ($seminar->semester_duration_time == -1) {
-              $name .= ' - ' . _('unbegrenzt');
-          }
-          if ($seminar->semester_duration_time > 0) {
-              $name .= ' - ' . Semester::findByTimestamp($seminar->semester_start_time + $seminar->semester_duration_time)->name;
-          }
-          $name .= ')';
-          $dozenten = array_map(function($v){return $v['Nachname'];}, $seminar->getMembers('dozent'));
-          $name .= ' (' . join(', ' , $dozenten) . ')';
-          break;
-      case 'user':
-          $name = _('Profil') . ':';
-          $name .= ' ' . get_fullname($eval_range);
-          break;
-      case 'inst':
-      case 'fak':
-          $name = _('Einrichtung') . ':';
-          $name .= ' ' . Institute::find($eval_range)->name;
-          break;
-      default:
-          $name = _('unbekannt');
-      }
-      $eval_ranges_names[] = $name;
-    }
-    sort($eval_ranges_names);
-    if (file_exists($tmp_path_export."/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".fo")) unlink($tmp_path_export."/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".fo");
-    if (file_exists($tmp_path_export."/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".pdf")) unlink($tmp_path_export."/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".pdf");
-
-    $fo_file = fopen($tmp_path_export."/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".fo","w");
-
-    // ----- START HEADER -----
-
-    fputs($fo_file,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    fputs($fo_file,"<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n");
-    fputs($fo_file,"  <!-- defines the layout master -->\n");
-    fputs($fo_file,"  <fo:layout-master-set>\n");
-    fputs($fo_file,"    <fo:simple-page-master master-name=\"first\" page-height=\"29.7cm\" page-width=\"21cm\" margin-top=\"1cm\" margin-bottom=\"2cm\" margin-left=\"2.5cm\" margin-right=\"2.5cm\">\n");
-    fputs($fo_file,"      <fo:region-body margin-top=\"1cm\" margin-bottom=\"1.5cm\"/>\n");
-    fputs($fo_file,"      <fo:region-before extent=\"1cm\"/>\n");
-    fputs($fo_file,"      <fo:region-after extent=\"1.5cm\"/>\n");
-    fputs($fo_file,"      </fo:simple-page-master>\n");
-    fputs($fo_file,"    </fo:layout-master-set>\n");
-    fputs($fo_file,"  <!-- starts actual layout -->\n");
-    fputs($fo_file,"  <fo:page-sequence master-reference=\"first\">\n");
-    fputs($fo_file,"  <fo:static-content flow-name=\"xsl-region-after\">\n");
-    fputs($fo_file,"    <fo:block text-align=\"center\" font-size=\"8pt\" font-family=\"serif\" line-height=\"14pt\" >\n");
-    fputs($fo_file,"    "._("Erstellt mit Stud.IP")." " . xml_escape($SOFTWARE_VERSION) . " - ". _("Seite")." <fo:page-number/>\n");
-    fputs($fo_file,"    </fo:block>\n");
-    fputs($fo_file,"    <fo:block text-align=\"center\" font-size=\"8pt\" font-family=\"serif\" line-height=\"14pt\" >\n");
-    fputs($fo_file,"      <fo:basic-link color=\"blue\" external-destination=\"$ABSOLUTE_URI_STUDIP\">". xml_escape(Config::get()->UNI_NAME_CLEAN) . "</fo:basic-link>\n");
-    fputs($fo_file,"    </fo:block>\n");
-    fputs($fo_file,"  </fo:static-content>\n");
-    fputs($fo_file,"  <fo:flow flow-name=\"xsl-region-body\">\n");
-    fputs($fo_file,"    <!-- this defines a title level 1-->\n");
-    fputs($fo_file,"    <fo:block font-size=\"18pt\" font-variant=\"small-caps\" font-family=\"sans-serif\" line-height=\"24pt\" space-after.optimum=\"15pt\" background-color=\"blue\" color=\"white\" text-align=\"center\" padding-top=\"3pt\">\n");
-    fputs($fo_file,"      "._("Stud.IP Evaluationsauswertung")."\n");
-    fputs($fo_file,"    </fo:block>\n");
-    fputs($fo_file,"    <!-- this defines a title level 2-->\n");
-
-    fputs($fo_file,"    <fo:block font-size=\"16pt\" font-weight=\"bold\" font-family=\"sans-serif\" space-before.optimum=\"10pt\" space-after.optimum=\"15pt\" text-align=\"center\">\n");
-    fputs($fo_file,"      ". xml_escape($evaluation['title'])."\n");
-    fputs($fo_file,"    </fo:block>\n");
-    fputs($fo_file,"    <fo:block text-align=\"start\" line-height=\"10pt\" font-size=\"8pt\">\n");
-    fputs($fo_file,    _("Diese Evaluation ist folgenden Bereichen zugeordnet:"));
-    fputs($fo_file,"    </fo:block>\n");
-    foreach($eval_ranges_names as $n) {
-        fputs($fo_file,"    <fo:block text-align=\"start\" margin-left=\"0.5cm\" line-height=\"10pt\" font-size=\"8pt\">\n");
-        fputs($fo_file, xml_escape($n));
-        fputs($fo_file,"    </fo:block>\n");
-    }
-
-
-
-    if (do_template("show_total_stats")) {
-        fputs($fo_file,"    <fo:block text-align=\"start\" space-before.optimum=\"10pt\" line-height=\"10pt\" font-size=\"8pt\">\n");
-        fputs($fo_file,"      ". xml_escape($number_of_votes." "._("Teilnehmende insgesamt")).".\n");
-        fputs($fo_file,"      ". xml_escape(($evaluation['anonymous']==0  ? _('Die Teilnahme war nicht anonym.') : _('Die Teilnahme war anonym.'))."\n"));
-        fputs($fo_file,"      " . xml_escape(_("Eigentümer").": ". ($db_owner ? $db_owner->getFullName('no_title') :  _('Unbekannter Nutzer')) .". "._("Erzeugt am").": ".date("d.m.Y H:i:s"))."\n");
-        fputs($fo_file,"    </fo:block>\n");
-    }
-
-    // ----- ENDE HEADER -----
-
-    groups($evaluation['eval_id']);
-
-    // ----- START FOOTER -----
-
-    fputs($fo_file,"    </fo:flow>\n");
-    fputs($fo_file,"  </fo:page-sequence>\n");
-    fputs($fo_file,"</fo:root>\n");
-
-    // ----- ENDE FOOTER -----
-
-    fclose($fo_file);
-
-    $pdffile = "$tmp_path_export/" . md5($evaluation['eval_id'].$auth->auth["uid"]);
-
-    $str = $FOP_SH_CALL." $tmp_path_export/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".fo $pdffile";
-
-    $err = exec($str);
-
-    if (file_exists($pdffile) && filesize($pdffile)) {
-        header('Location: ' . FileManager::getDownloadURLForTemporaryFile( basename($pdffile), "evaluation.pdf", 2, 'force'));
-        unlink($tmp_path_export."/evalsum".$evaluation['eval_id'].$auth->auth["uid"].".fo");
-    } else {
-        echo "Fehler beim PDF-Export!<BR>".$err;
-        echo "<BR>\n".$str;
-    }
-} else {
-    // Evaluation existiert nicht...
-    echo _("Evaluation NICHT vorhanden oder keine Rechte!");
-}
-// Save data back to database.
-page_close();
-?>
diff --git a/public/show_evaluation.php b/public/show_evaluation.php
deleted file mode 100644
index e81510a..0000000
--- a/public/show_evaluation.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * the evaluation participation page :)
- *
- * @author      mcohrs <michael A7 cohrs D07 de>
- * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
- * @copyright   2004 Stud.IP-Project
- * @access      public
- * @package     evaluation
- * @modulegroup evaluation_modules
- *
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Copyright (C) 2001-2004 Stud.IP
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-
-//TODO: auf TemplateFactory umstellen
-
-# PHP-LIB: open session ===================================================== #
-
-require '../lib/bootstrap.php';
-
-page_open ( ["sess" => "Seminar_Session",
-          "auth" => "Seminar_Auth",
-          "perm" => "Seminar_Perm",
-          "user" => "Seminar_User"]);
-$auth->login_if ($auth->auth["uid"] == "nobody");
-$perm->check ("autor");
-# ============================================================== end: PHP-LIB #
-
-# Include all required files ================================================ #
-require_once 'lib/evaluation/evaluation.config.php';
-require_once 'lib/seminar_open.php';
-
-require_once EVAL_FILE_EVAL;
-require_once EVAL_FILE_EVALDB;
-require_once EVAL_FILE_SHOW_TREEVIEW;
-require_once EVAL_FILE_EVALTREE;
-
-require_once EVAL_LIB_COMMON;
-require_once EVAL_LIB_SHOW;
-# ====================================================== end: including files #
-
-/* Create objects ---------------------------------------------------------- */
-$db  = new EvaluationDB();
-$lib = new EvalShow();
-/* ------------------------------------------------------------ end: objects */
-
-#error_reporting( E_ALL & ~E_NOTICE );
-
-/* Set variables ----------------------------------------------------------- */
-$rangeID = Request::option('rangeID',Context::getId());
-if (empty ($rangeID)) {
-    $rangeID = $user->id; }
-
-$evalID = Request::option('evalID');
-$tree = new EvaluationTreeShowUser( $evalID );
-
-$eval = $tree->tree->eval;
-$evalDB = new EvaluationDB();
-
-$isPreview = Request::option('isPreview') ? YES : NO;
-
-$votedEarlier = $eval->hasVoted( $auth->auth["uid"] ) && $isPreview == NO;
-$votedNow = Request::submitted('voteButton') && $votedEarlier == NO;
-
-if ( $eval->isAnonymous() )
-   $userID = StudipObject::createNewID ();
-else
-   $userID = $auth->auth["uid"];
-/* ---------------------------------------------------------- end: variables */
-
-$br = new HTMpty( "br" );
-
-/* Surrounding Form -------------------------------------------------------- */
-$form = new HTM( "form" );
-$form->attr( "action", URLHelper::getLink(Request::url()) );
-$form->attr( "method", "post" );
-$form->html(CSRFProtection::tokenTag());
-
-if (Request::isXHR()) {
-    PageLayout::setTitle(_("Stud.IP Online-Evaluation"));
-} else {
-    // TODO: This should use Assets::img() but on the other hand it should also use templates
-    $titlebar = EvalCommon::createTitle( _("Stud.IP Online-Evaluation"), Icon::create('test', 'info_alt')->asImagePath() );
-    $form->cont( $titlebar );
-}
-/* Surrounding Table ------------------------------------------------------- */
-$table = new HTM( "table" );
-$table->attr( "border","0" );
-$table->attr( "align", "center" );
-$table->attr( "cellspacing", "0" );
-$table->attr( "cellpadding", "3" );
-$table->attr( "width", "100%" );
-$table->attr( "class", "table_row_even" );
-
-/* count mandatory items */
-$mandatories = checkMandatoryItems( $eval );
-$answers = Request::quotedArray('answers');
-/* ------------------------------------------------------------------------- */
-if( $votedNow ) {
-    $answers = Request::quotedArray('answers');
-    $freetexts = Request::quotedArray('freetexts');
-    if( ! ( is_array($answers) ||
-        /* clicked no answer */
-        (is_array($freetexts) && implode("", $freetexts) != "")
-        /* typed no freetext */
-        )
-    ) {
-
-    $eval->throwError( 1, _("Sie haben keine Antworten gewählt.") );
-    $votedNow = NO;
-
-    }
-
-    /* check if mandatory answers are missing */
-    if( count($mandatories) > 0 ) {
-    $eval->throwError( 1, sprintf(_("Sie haben %s erforderliche Fragen nicht beantwortet. Diese wurden gesondert markiert."),
-                      count($mandatories)) );
-    $votedNow = NO;
-    }
-}
-
-if( $votedNow ) {
-    /* the vote was OK */
-
-    /* process the user's selected answers --------------------------------- */
-    if( is_array($answers) ) {
-    foreach( $answers as $question_id => $answer ) {
-        if( is_array($answer) )
-        /* multiple choice question */
-        foreach( $answer as $nr => $answer_id )
-            voteFor( $answer_id );
-        else
-        /* answer = answer_id */
-        voteFor( $answer );
-    }
-    }
-
-    /* process the user's typed-in answers --------------------------------- */
-    $freetexts = Request::quotedArray('freetexts');
-    if( is_array($freetexts) ) {
-    foreach( $freetexts as $question_id => $text ) {
-        if( trim($text) != '' ) {
-        $question = new EvaluationQuestion( $question_id );
-        $answer = new EvaluationAnswer();
-        $answer->setText( $text );
-        $answer->setRows( 1 );
-        $answer->vote( $GLOBALS["userID"] );
-        $question->addChild( $answer );
-        $question->save();
-        $debug .= "added answer text <b>".$answer->getText().
-            "</b> for question <b>".$question->getText()."</b>\n";
-        }
-    }
-    }
-
-    /* connect user with eval */
-    $evalDB->connectWithUser( $evalID, $auth->auth["uid"] );
-
-    /* header ------ */
-    $table->cont( $lib->createEvaluationHeader( $eval, $votedNow, $votedEarlier ) );
-
-} elseif( $votedEarlier ) {
-    /* header ------ */
-    $table->cont( $lib->createEvaluationHeader( $eval, $votedNow, $votedEarlier ) );
-
-} else {
-    /* header ------ */
-    $table->cont( $lib->createEvaluationHeader( $eval, $votedNow, $votedEarlier ) );
-
-    /* the whole evaluation ------ */
-    $table->cont( $lib->createEvaluation( $tree ) );
-}
-
-/* footer ------ */
-$table->cont( $lib->createEvaluationFooter( $eval, $votedNow || $votedEarlier, $isPreview ) );
-
-$form->cont( $table );
-
-/* Ausgabe erzeugen---------------------------------------------------------- */
-//Content (TODO: besser mit TemplateFactory)
-if (Request::isXHR()) {
-    echo $form->createContent();
-} else {
-    $layout = $GLOBALS['template_factory']->open('layouts/base.php');
-    $layout->content_for_layout = $form->createContent();
-    echo $layout->render();
-}
-
-page_close();
-
-
- /**
-  * checkMandatoryItems:
-  * put IDs of mandatory questions into global array $mandatories
-  *  (or, if the user has voted, the IDs of the mandatory questions, which he did not answer to)
-  *
-  * @param object  the Evaluation object (when called externally).
-  */
- function checkMandatoryItems( $item )
- {
-     global $mandatories;
-
-     if( $children = $item->getChildren() )
-     {
-        foreach( $children as $child )
-        {
-         checkMandatoryItems( $child );
-        }
-     }
-
-     if( $item->x_instanceof() == INSTANCEOF_EVALQUESTION )
-     {
-        $group = $item->getParentObject();
-        $answers = Request::quotedArray('answers');
-        $freetexts = Request::quotedArray('freetexts');
-        if( $group->isMandatory() &&
-         ( ! is_array($answers) ||
-           ( is_array($answers) &&
-         ! in_array($item->getObjectID(), array_keys($answers)) )
-           ) &&
-         trim($freetexts[$item->getObjectID()]) == ''
-         )
-         {
-             $mandatories[] = $item->getObjectID();
-         }
-     }
-     return $mandatories ?: [];
-
- }
-
-
- /**
-  * vote for an answer of given ID
-  * @param string  the ID.
-  */
- function voteFor( $answer_id )
- {
-    global $debug;
-    global $userID;
-
-    $answer = new EvaluationAnswer( $answer_id );
-    $answer->vote($userID);
-
-    $answer->save();
-
-    $debug .= "voted for answer <b>".$answer->getText()."</b> (".
-    $answer->getObjectID().")\n";
-}
-
-?>
diff --git a/resources/assets/stylesheets/scss/evaluation.scss b/resources/assets/stylesheets/scss/evaluation.scss
deleted file mode 100644
index 63fcef6..0000000
--- a/resources/assets/stylesheets/scss/evaluation.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-/* classes for the evaluation modules in Stud.IP ---------------------------- */
-.eval_title {
-    font-size: 1.2em;
-    font-weight: bold;
-    color: var(--base-color);
-}
-
-.eval_error {
-    color: var(--red);
-}
-
-.eval_success {
-    color: var(--green);
-}
-
-.eval_info {
-    color: var(--base-gray);
-}
-
-.eval_metainfo {
-    font-size: 0.8em;
-}
-
-.eval_highlight {
-    background-color: var(--content-color-60);
-}
-
-.eval_gray {
-    background: var(--dark-gray-color-20) none;
-}
-.evaluation_item {
-    box-sizing: border-box;
-    margin: 3px;
-}
-
-h3.eval {
-    font-size: 1.3em;
-    color: var(--black);
-    font-weight: bold;
-}
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index d19621a..037aad4 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -42,7 +42,6 @@
 @import "scss/documents";
 @import "scss/drag-handle";
 @import "scss/enrolment";
-@import "scss/evaluation";
 @import "scss/files";
 @import "scss/feedback";
 @import "scss/forms";
diff --git a/templates/evaluation/config.php b/templates/evaluation/config.php
deleted file mode 100644
index e328cf6..0000000
--- a/templates/evaluation/config.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?
-# Lifter010: TODO
-
-use Studip\Button, Studip\LinkButton, Studip\ResetButton;
-
-$options = [
-     'show_total_stats'            => _('Zeige Gesamtstatistik an'),
-     'show_graphics'               => _('Zeige Grafiken an'),
-     'show_questions'              => _('Zeige Fragen an'),
-     'show_group_headline'         => _('Zeige Gruppenüberschriften an'),
-     'show_questionblock_headline' => _('Zeige Fragenblocküberschriften an'),
-];
-
-$graphtypes = [
-    'polscale_gfx_type' => [
-        'title'   => _('Grafiktyp für Polskalen'),
-        'options' => [
-            'bars'        => _('Balken'),
-            'pie'         => _('Tortenstücke'),
-            'lines'       => _('Linien'),
-            'linepoints'  => _('Linienpunkte'),
-            'area'        => _('Bereich'),
-            'points'      => _('Punkte'),
-            'thinbarline' => _('Linienbalken'),
-        ],
-    ],
-    'likertscale_gfx_type' => [
-        'title'   => _('Grafiktyp für Likertskalen'),
-        'options' => [
-            'bars'        => _('Balken'),
-            'pie'         => _('Tortenstücke'),
-            'lines'       => _('Linien'),
-            'linepoints'  => _('Linienpunkte'),
-            'area'        => _('Bereich'),
-            'points'      => _('Punkte'),
-            'thinbarline' => _('Linienbalken'),
-        ],
-    ],
-    'mchoice_scale_gfx_type' => [
-        'title'   => _('Grafiktyp für Multiplechoice'),
-        'options' => [
-            'bars'        => _('Balken'),
-            'points'      => _('Punkte'),
-            'thinbarline' => _('Linienbalken'),
-        ],
-    ],
-];
-?>
-
-<form class="default" action="<?= URLHelper::getLink() ?>" method="post">
-    <?= CSRFProtection::tokenTag() ?>
-
-    <input type="hidden" name="template_id" value="<?= $templates['template_id'] ?>">
-    <input type="hidden" name="eval_id" value="<?= $eval_id ?>">
-
-    <table class="default">
-        <caption>
-            <?= _('Auswertungskonfiguration') ?>
-        </caption>
-        <colgroup>
-            <col width="50%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <thead>
-            <tr>
-                <th><?= _('Optionen') ?></th>
-                <th style="text-align: center;"><?= _('Ja') ?></th>
-                <th style="text-align: center;"><?= _('Nein') ?></th>
-            </tr>
-        </thead>
-        <tbody>
-        <? foreach ($options as $option => $title): ?>
-            <tr>
-                <td><?= htmlReady($title) ?>:</td>
-                <td style="text-align: center;">
-                    <input type="radio" name="<?= $option ?>" value="1"
-                           <? if ($templates[$option] || !$has_template) echo 'checked'; ?>>
-                </td>
-                <td style="text-align: center;">
-                    <input type="radio" name="<?= $option ?>" value="0"
-                           <? if ($has_template && !$templates[$option]) echo 'checked'; ?>>
-                </td>
-            </tr>
-        <? endforeach; ?>
-
-        <? foreach ($graphtypes as $type => $data): ?>
-            <tr>
-                <td>
-                    <label for="<?= $type ?>"><?= htmlReady($data['title']) ?>:</label>
-                </td>
-                <td style="text-align: center;" colspan="2">
-                    <select class="size-s" id="<?= $type ?>" name="<?= $type ?>" style="120px">
-                    <? foreach ($data['options'] as $k => $v): ?>
-                        <option value="<?= htmlReady($k) ?>"
-                                <? if ($templates[$type] == $k) echo "selected"; ?>>
-                            <?= htmlReady($v) ?>
-                        </option>
-                    <? endforeach; ?>
-                    </select>
-                </td>
-            </tr>
-        <? endforeach; ?>
-        </tbody>
-
-        <tfoot>
-            <tr>
-                <td>
-                    <?= LinkButton::create('<< ' . _('Zurück'),
-                                           URLHelper::getURL('eval_summary.php', compact('eval_id'))) ?>
-                </td>
-                <td colspan="2" style="text-align: right;">
-                    <?= Button::createAccept(_('Speichern'), 'store') ?>
-                    <?= ResetButton::createCancel(_('Zurücksetzen')) ?>
-                </td>
-            </tr>
-        </tfoot>
-    </table>
-</form>
-
-<?
-Helpbar::Get()->addPlainText(_('Information'), _('Auf dieser Seite können Sie die Auswertung Ihrer Evaluation konfigurieren.'));
-Helpbar::Get()->addPlainText(_('Information'), ('Wählen Sie Ihre Einstellungen und drücken Sie auf "Template speichern". '
-                                                .'Anschließend kommen Sie mit dem Button unten links zurück zu Ihrer Evaluation.'));
-?>
-- 
cgit v1.0


From 5bbe95fe73af8257a5054615db5c32aac1e42ba7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 14:01:51 +0000
Subject: remove adlawson/vfs, fixes #4174

Closes #4174

Merge request studip/studip!3012
---
 composer.json |  1 -
 composer.lock | 62 +----------------------------------------------------------
 2 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/composer.json b/composer.json
index 6a1190c..33dacc5 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,6 @@
         }
     },
     "require-dev": {
-        "adlawson/vfs": "~0.12.1",
         "woohoolabs/yang": "2.3.2",
         "codeception/codeception": "5.1.2",
         "codeception/module-asserts": "3.0.0",
diff --git a/composer.lock b/composer.lock
index 95d389a..5d88b0b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "73b508e157437e29fceffadbfa22aa2e",
+    "content-hash": "7dcab37d45eb1a3751325c91f0e782b1",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -5295,66 +5295,6 @@
     ],
     "packages-dev": [
         {
-            "name": "adlawson/vfs",
-            "version": "0.12.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/adlawson/php-vfs.git",
-                "reference": "e955034419d6a8f92c9a8ea2e626eeed96b41095"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/adlawson/php-vfs/zipball/e955034419d6a8f92c9a8ea2e626eeed96b41095",
-                "reference": "e955034419d6a8f92c9a8ea2e626eeed96b41095",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "psr/log": "^1.0"
-            },
-            "require-dev": {
-                "adlawson/timezone": "^1.0",
-                "fabpot/php-cs-fixer": "^1.9",
-                "mockery/mockery": "^0.9",
-                "phpunit/phpunit": "^4.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Vfs\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Andrew Lawson",
-                    "homepage": "http://adlawson.com"
-                }
-            ],
-            "description": "Virtual file system",
-            "homepage": "https://github.com/adlawson/php-vfs",
-            "keywords": [
-                "dir",
-                "directory",
-                "file",
-                "fs",
-                "read",
-                "stream",
-                "system",
-                "virtual",
-                "wrapper",
-                "write"
-            ],
-            "support": {
-                "issues": "https://github.com/adlawson/php-vfs/issues",
-                "source": "https://github.com/adlawson/php-vfs/tree/develop"
-            },
-            "time": "2016-02-20T12:46:01+00:00"
-        },
-        {
             "name": "behat/gherkin",
             "version": "v4.9.0",
             "source": {
-- 
cgit v1.0


From 2e27d1836985d92d59d358352351dac56e895eb9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:15:37 +0000
Subject: update tecnickcom/tcpdf to 6.7.5, fixes #4172

Closes #4172

Merge request studip/studip!3010
---
 composer.json |  2 +-
 composer.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 33dacc5..0ac48de 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "neomerx/json-api": "4.0.1",
         "spomky-labs/otphp": "^10",
         "tuupola/cors-middleware": "^1.2.1",
-        "tecnickcom/tcpdf": "^6.3",
+        "tecnickcom/tcpdf": "6.7.5",
         "scssphp/scssphp": "1.12.1",
         "symfony/yaml": "^5.0",
         "ezyang/htmlpurifier": "^4.13",
diff --git a/composer.lock b/composer.lock
index 5d88b0b..4ca9e96 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7dcab37d45eb1a3751325c91f0e782b1",
+    "content-hash": "37344117fe2a7e12104caa87e77be265",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -4744,20 +4744,20 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.6.2",
+            "version": "6.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"
+                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459",
-                "reference": "e3cffc9bcbc76e89e167e9eb0bbda0cab7518459",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
+                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.5.0"
             },
             "type": "library",
             "autoload": {
@@ -4782,7 +4782,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-3.0-only"
+                "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
@@ -4804,7 +4804,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.2"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.7.5"
             },
             "funding": [
                 {
@@ -4812,7 +4812,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2022-12-17T10:28:59+00:00"
+            "time": "2024-04-20T17:25:10+00:00"
         },
         {
             "name": "thecodingmachine/safe",
-- 
cgit v1.0


From 3f6581892f34c0327f73977536d5e8d6fa2a9199 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:19:52 +0000
Subject: update phpstan/phpstan to 1.11.0, fixes #4169

Closes #4169

Merge request studip/studip!3007
---
 composer.json |  2 +-
 composer.lock | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 0ac48de..f9f1108 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "codeception/codeception": "5.1.2",
         "codeception/module-asserts": "3.0.0",
         "overtrue/phplint": "3.1.1",
-        "phpstan/phpstan": "^1.8",
+        "phpstan/phpstan": "1.11.0",
         "symfony/var-dumper": "6.4.7"
     },
     "require": {
diff --git a/composer.lock b/composer.lock
index 4ca9e96..043fdac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "37344117fe2a7e12104caa87e77be265",
+    "content-hash": "49f5ef7c1527f76326978188aad5f943",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -6039,16 +6039,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.8",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0166aef76e066f0dd2adc2799bdadfa1635711e9"
+                "reference": "666cb1703742cea9cc80fee631f0940e1592fa6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0166aef76e066f0dd2adc2799bdadfa1635711e9",
-                "reference": "0166aef76e066f0dd2adc2799bdadfa1635711e9",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/666cb1703742cea9cc80fee631f0940e1592fa6e",
+                "reference": "666cb1703742cea9cc80fee631f0940e1592fa6e",
                 "shasum": ""
             },
             "require": {
@@ -6091,13 +6091,9 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2023-03-24T10:28:16+00:00"
+            "time": "2024-05-13T06:02:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-- 
cgit v1.0


From 3cd387467680585a0e3706459df0a80e0c9b3c79 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:23:29 +0000
Subject: update huzzlehttp/psr7 to 2.6.2, fixes #4171

Closes #4171

Merge request studip/studip!3009
---
 composer.json |  2 +-
 composer.lock | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index f9f1108..cc02a48 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": "^8.1",
-        "guzzlehttp/psr7": "^2.3",
+        "guzzlehttp/psr7": "2.6.2",
         "neomerx/json-api": "4.0.1",
         "spomky-labs/otphp": "^10",
         "tuupola/cors-middleware": "^1.2.1",
diff --git a/composer.lock b/composer.lock
index 043fdac..0cc6ad5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "49f5ef7c1527f76326978188aad5f943",
+    "content-hash": "4000fb6bfaa1e707c977504a197cc8dd",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -485,22 +485,22 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.4",
+            "version": "2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"
+                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
-                "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
                 "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
@@ -508,9 +508,9 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -520,9 +520,6 @@
                 "bamarni-bin": {
                     "bin-links": true,
                     "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
                 }
             },
             "autoload": {
@@ -584,7 +581,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.4"
+                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
             },
             "funding": [
                 {
@@ -600,7 +597,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-09T13:19:02+00:00"
+            "time": "2023-12-03T20:05:35+00:00"
         },
         {
             "name": "jakeasmith/http_build_url",
-- 
cgit v1.0


From 01eda888e61ee44f11f1053a5294006ec8c9a36d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:26:35 +0000
Subject: update phpseclib/phpseclib to 3.0.37, fixes #4170

Closes #4170

Merge request studip/studip!3008
---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index cc02a48..2b6a076 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
         "phpxmlrpc/extras": "^1.0.0-beta2",
         "algo26-matthias/idna-convert": "^3.0",
         "caxy/php-htmldiff": "0.1.15",
-        "phpseclib/phpseclib": "^3",
+        "phpseclib/phpseclib": "3.0.37",
         "ext-gd": "*",
         "ext-gettext": "*",
         "ext-pdo_mysql": "*",
diff --git a/composer.lock b/composer.lock
index 0cc6ad5..91982be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4000fb6bfaa1e707c977504a197cc8dd",
+    "content-hash": "6dd38e8a7fdaba26efc3a97346e78c0c",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -2579,16 +2579,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.19",
+            "version": "3.0.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
+                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
-                "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
                 "shasum": ""
             },
             "require": {
@@ -2669,7 +2669,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37"
             },
             "funding": [
                 {
@@ -2685,7 +2685,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-05T17:13:09+00:00"
+            "time": "2024-03-03T02:14:58+00:00"
         },
         {
             "name": "phpxmlrpc/extras",
-- 
cgit v1.0


From c114586c105b59bb4b3ed5c0fce176860e2aed41 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:33:39 +0000
Subject: update psy/psysh to 0.12.3, fixes #4165

Closes #4165

Merge request studip/studip!3004
---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 2b6a076..e26f5d0 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
         "symfony/polyfill-php82": "1.29.0",
         "symfony/polyfill-php83": "1.29.0",
         "phpoffice/phpspreadsheet": "^1.19",
-        "psy/psysh": "^0.12.2",
+        "psy/psysh": "0.12.3",
         "okvpn/clock-lts": "^1.0",
         "vlucas/phpdotenv": "^5.6",
         "edu-sharing/auth-plugin": "8.0.x-dev",
diff --git a/composer.lock b/composer.lock
index 91982be..747ee48 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6dd38e8a7fdaba26efc3a97346e78c0c",
+    "content-hash": "7a93548fcbb49075da2a6c6662c9f5d0",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
-- 
cgit v1.0


From 9199e077786c55909966d62f88444e8cc0ac688c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:37:21 +0000
Subject: update phpoffice/phpspreadsheet to 2.1.0, fixes #4162

Closes #4162

Merge request studip/studip!3002
---
 composer.json |  1 +
 composer.lock | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index e26f5d0..1190358 100644
--- a/composer.json
+++ b/composer.json
@@ -57,6 +57,7 @@
         "symfony/polyfill-php82": "1.29.0",
         "symfony/polyfill-php83": "1.29.0",
         "phpoffice/phpspreadsheet": "^1.19",
+        "phpoffice/phpspreadsheet": "2.1.0",
         "psy/psysh": "0.12.3",
         "okvpn/clock-lts": "^1.0",
         "vlucas/phpdotenv": "^5.6",
diff --git a/composer.lock b/composer.lock
index 747ee48..8bcf26b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7a93548fcbb49075da2a6c6662c9f5d0",
+    "content-hash": "7f25cddb2ee62fd59b0df2e23f6d513a",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -2348,16 +2348,16 @@
         },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.19.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf"
+                "reference": "dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
-                "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e",
+                "reference": "dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e",
                 "shasum": ""
             },
             "require": {
@@ -2374,33 +2374,33 @@
                 "ext-xmlwriter": "*",
                 "ext-zip": "*",
                 "ext-zlib": "*",
-                "ezyang/htmlpurifier": "^4.13",
-                "maennchen/zipstream-php": "^2.1",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
                 "markbaker/complex": "^3.0",
                 "markbaker/matrix": "^3.0",
-                "php": "^7.2 || ^8.0",
+                "php": "^8.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "psr/simple-cache": "^1.0"
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "dompdf/dompdf": "^1.0",
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "jpgraph/jpgraph": "^4.0",
-                "mpdf/mpdf": "^8.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                "dompdf/dompdf": "^2.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "^10.3",
+                "mpdf/mpdf": "^8.1.1",
                 "phpcompatibility/php-compatibility": "^9.3",
-                "phpstan/phpstan": "^0.12.82",
-                "phpstan/phpstan-phpunit": "^0.12.18",
-                "phpunit/phpunit": "^8.5",
-                "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "^6.3"
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.6",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "^6.5"
             },
             "suggest": {
-                "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-                "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
                 "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
             },
             "type": "library",
             "autoload": {
@@ -2446,9 +2446,9 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.1.0"
             },
-            "time": "2021-10-31T15:09:20+00:00"
+            "time": "2024-05-11T04:17:56+00:00"
         },
         {
             "name": "phpoption/phpoption",
-- 
cgit v1.0


From 475fb44a66953251327ef08f2ea600b4cccfd3b6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:45:23 +0000
Subject: update woohoolabs/yang to 3.0.0, fixes #4161

Closes #4161

Merge request studip/studip!3001
---
 composer.json |  2 +-
 composer.lock | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 1190358..0e60b30 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     },
     "require-dev": {
-        "woohoolabs/yang": "2.3.2",
+        "woohoolabs/yang": "3.0.0",
         "codeception/codeception": "5.1.2",
         "codeception/module-asserts": "3.0.0",
         "overtrue/phplint": "3.1.1",
diff --git a/composer.lock b/composer.lock
index 8bcf26b..46a3778 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7f25cddb2ee62fd59b0df2e23f6d513a",
+    "content-hash": "1cfd4a01ac233ef7d43be6fb00f23501",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -7816,36 +7816,37 @@
         },
         {
             "name": "woohoolabs/yang",
-            "version": "2.3.2",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woohoolabs/yang.git",
-                "reference": "da65122971fa6add83751497ec76af1fb6cccf77"
+                "reference": "5cbd05d5e6f94d40c4bef4a7b9a0fdb42503d8dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woohoolabs/yang/zipball/da65122971fa6add83751497ec76af1fb6cccf77",
-                "reference": "da65122971fa6add83751497ec76af1fb6cccf77",
+                "url": "https://api.github.com/repos/woohoolabs/yang/zipball/5cbd05d5e6f94d40c4bef4a7b9a0fdb42503d8dc",
+                "reference": "5cbd05d5e6f94d40c4bef4a7b9a0fdb42503d8dc",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.0||^8.0.0",
-                "php-http/httplug": "^1.0.0|^2.0.0",
+                "php": "^7.4.0||^8.0.0",
+                "php-http/httplug": "^2.0.0",
+                "psr/http-client": "^1.0.0",
                 "psr/http-message-implementation": "^1.0.0"
             },
             "require-dev": {
-                "guzzlehttp/psr7": "^1.4.0",
-                "php-http/guzzle6-adapter": "^2.0.0",
-                "phpstan/phpstan": "^0.12.0",
-                "phpstan/phpstan-phpunit": "^0.12.0",
-                "phpstan/phpstan-strict-rules": "^0.12.0",
-                "phpunit/phpunit": "^7.0.0||^8.2.0||^9.0.0",
-                "squizlabs/php_codesniffer": "^3.5.1",
-                "woohoolabs/coding-standard": "^1.0.0",
+                "guzzlehttp/psr7": "^2.6.0",
+                "php-http/guzzle7-adapter": "^1.0.0",
+                "phpstan/phpstan": "^1.10.12",
+                "phpstan/phpstan-phpunit": "^1.3.0",
+                "phpstan/phpstan-strict-rules": "^1.5.0",
+                "phpunit/phpunit": "^9.6.0",
+                "squizlabs/php_codesniffer": "^3.7.0",
+                "woohoolabs/coding-standard": "^2.4.0",
                 "woohoolabs/releaser": "^1.1.0"
             },
             "suggest": {
-                "php-http/guzzle6-adapter": "Allows to use Guzzle 6 as the HTTP client implementation"
+                "php-http/guzzle7-adapter": "Allows to use Guzzle 7 as the HTTP client implementation"
             },
             "type": "library",
             "autoload": {
@@ -7875,7 +7876,7 @@
                 "issues": "https://github.com/woohoolabs/yang/issues",
                 "source": "https://github.com/woohoolabs/yang"
             },
-            "time": "2020-11-15T08:55:55+00:00"
+            "time": "2023-09-06T09:39:12+00:00"
         }
     ],
     "aliases": [],
-- 
cgit v1.0


From b58642bffc75edc6393775ed5d75b39fe2563010 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:55:08 +0000
Subject: update overtrue/phplint to 9.0.8, re #4158

Merge request studip/studip!2998
---
 .gitlab-ci.yml |   4 +-
 composer.json  |   2 +-
 composer.lock  | 407 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 351 insertions(+), 62 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d0e3ea..1a5b71e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,7 @@ lint-php:
     - COMPOSER_MEMORY_LIMIT=-1
       composer exec phplint
       --
-      --json $PHPLINT_JSON_REPORT
+      --log-json=$PHPLINT_JSON_REPORT
       --cache=$CACHE_LOCATION
   after_script:
     - ./.gitlab/scripts/convert-phplint-report $PHPLINT_JSON_REPORT > $PHPLINT_CODE_QUALITY_REPORT
@@ -137,7 +137,7 @@ lint-php-8.3:
     - COMPOSER_MEMORY_LIMIT=-1
       composer exec phplint
       --
-      --json $PHPLINT_JSON_REPORT
+      --log-json=$PHPLINT_JSON_REPORT
       --cache=$CACHE_LOCATION
   after_script:
     - ./.gitlab/scripts/convert-phplint-report $PHPLINT_JSON_REPORT > $PHPLINT_CODE_QUALITY_REPORT
diff --git a/composer.json b/composer.json
index 0e60b30..46cd649 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "woohoolabs/yang": "3.0.0",
         "codeception/codeception": "5.1.2",
         "codeception/module-asserts": "3.0.0",
-        "overtrue/phplint": "3.1.1",
+        "overtrue/phplint": "9.0.8",
         "phpstan/phpstan": "1.11.0",
         "symfony/var-dumper": "6.4.7"
     },
diff --git a/composer.lock b/composer.lock
index 46a3778..0f5572c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1cfd4a01ac233ef7d43be6fb00f23501",
+    "content-hash": "4212f765bea5d1be5fa2d84d32040779",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -5682,72 +5682,36 @@
             "time": "2023-03-08T13:26:56+00:00"
         },
         {
-            "name": "n98/junit-xml",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cmuench/junit-xml.git",
-                "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cmuench/junit-xml/zipball/0017dd92ac8cb619f02e32f4cffd768cfe327c73",
-                "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "N98\\JUnitXml\\": "src/N98/JUnitXml"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Münch",
-                    "email": "c.muench@netz98.de"
-                }
-            ],
-            "description": "JUnit XML Document generation library",
-            "support": {
-                "issues": "https://github.com/cmuench/junit-xml/issues",
-                "source": "https://github.com/cmuench/junit-xml/tree/1.1.0"
-            },
-            "time": "2020-12-25T09:08:58+00:00"
-        },
-        {
             "name": "overtrue/phplint",
-            "version": "3.1.1",
+            "version": "9.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/phplint.git",
-                "reference": "66be32d54b763a4b0ba1a820d3c867cd2e252ea5"
+                "reference": "9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/phplint/zipball/66be32d54b763a4b0ba1a820d3c867cd2e252ea5",
-                "reference": "66be32d54b763a4b0ba1a820d3c867cd2e252ea5",
+                "url": "https://api.github.com/repos/overtrue/phplint/zipball/9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a",
+                "reference": "9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "n98/junit-xml": "1.1.0",
-                "php": ">=5.5.9",
-                "symfony/console": "^3.2|^4.0|^5.0",
-                "symfony/finder": "^3.0|^4.0|^5.0",
-                "symfony/process": "^3.3|^4.0|^5.0",
-                "symfony/yaml": "^3.0|^4.0|^5.0"
+                "ext-mbstring": "*",
+                "php": "^8.0",
+                "symfony/cache": "^5.4 || ^6.0 || ^7.0",
+                "symfony/console": "^5.4 || ^6.0 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+                "symfony/process": "^5.4 || ^6.0 || ^7.0",
+                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
             },
             "require-dev": {
-                "brainmaestro/composer-git-hooks": "^2.7",
-                "friendsofphp/php-cs-fixer": "^2.16",
-                "jakub-onderka/php-console-highlighter": "^0.3.2 || ^0.4"
+                "bamarni/composer-bin-plugin": "^1.4",
+                "brainmaestro/composer-git-hooks": "^2.8.5 || 3.0.0-alpha.1",
+                "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3 || ^2023.0",
+                "php-parallel-lint/php-console-highlighter": "^1.0"
             },
             "bin": [
                 "bin/phplint"
@@ -5757,10 +5721,10 @@
                 "hooks": {
                     "pre-commit": [
                         "composer fix-style"
-                    ],
-                    "pre-push": [
-                        "composer check-style"
                     ]
+                },
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
                 }
             },
             "autoload": {
@@ -5776,6 +5740,10 @@
                 {
                     "name": "overtrue",
                     "email": "anzhengchao@gmail.com"
+                },
+                {
+                    "name": "Laurent Laville",
+                    "homepage": "https://github.com/llaville"
                 }
             ],
             "description": "`phplint` is a tool that can speed up linting of php files by running several lint processes at once.",
@@ -5783,11 +5751,12 @@
                 "check",
                 "lint",
                 "phplint",
+                "static analysis",
                 "syntax"
             ],
             "support": {
                 "issues": "https://github.com/overtrue/phplint/issues",
-                "source": "https://github.com/overtrue/phplint/tree/3.1.1"
+                "source": "https://github.com/overtrue/phplint/tree/9.0.8"
             },
             "funding": [
                 {
@@ -5795,7 +5764,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-21T05:52:47+00:00"
+            "time": "2024-02-05T09:37:32+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7481,6 +7450,182 @@
             "time": "2023-02-07T11:34:05+00:00"
         },
         {
+            "name": "symfony/cache",
+            "version": "v5.4.39",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache.git",
+                "reference": "982237e35079fdcc31ab724f06b6131992c4fd24"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/982237e35079fdcc31ab724f06b6131992c4fd24",
+                "reference": "982237e35079fdcc31ab724f06b6131992c4fd24",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0",
+                "psr/log": "^1.1|^2|^3",
+                "symfony/cache-contracts": "^1.1.7|^2",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<2.13.1",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/http-kernel": "<4.4",
+                "symfony/var-dumper": "<4.4"
+            },
+            "provide": {
+                "psr/cache-implementation": "1.0|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0",
+                "symfony/cache-implementation": "1.0|2.0"
+            },
+            "require-dev": {
+                "cache/integration-tests": "dev-master",
+                "doctrine/cache": "^1.6|^2.0",
+                "doctrine/dbal": "^2.13.1|^3|^4",
+                "predis/predis": "^1.1",
+                "psr/simple-cache": "^1.0|^2.0",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/filesystem": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0",
+                "symfony/messenger": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Cache\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "caching",
+                "psr6"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/cache/tree/v5.4.39"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T08:26:06+00:00"
+        },
+        {
+            "name": "symfony/cache-contracts",
+            "version": "v2.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache-contracts.git",
+                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/fee6db04d913094e2fb55ff8e7db5685a8134463",
+                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0|^3.0"
+            },
+            "suggest": {
+                "symfony/cache-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Cache\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to caching",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-23T13:51:25+00:00"
+        },
+        {
             "name": "symfony/css-selector",
             "version": "v6.4.7",
             "source": {
@@ -7765,6 +7910,150 @@
             "time": "2024-04-18T08:26:06+00:00"
         },
         {
+            "name": "symfony/options-resolver",
+            "version": "v6.4.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a3c92b490716ba6771f5beced13c6eda7183eed",
+                "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an improved replacement for the array_replace PHP function",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v6.4.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:22:46+00:00"
+        },
+        {
+            "name": "symfony/var-exporter",
+            "version": "v6.4.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-exporter.git",
+                "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/825f9b00c37bbe1c1691cc1aff9b5451fc9b4405",
+                "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "require-dev": {
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\VarExporter\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clone",
+                "construct",
+                "export",
+                "hydrate",
+                "instantiate",
+                "lazy-loading",
+                "proxy",
+                "serialize"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-exporter/tree/v6.4.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:22:46+00:00"
+        },
+        {
             "name": "theseer/tokenizer",
             "version": "1.2.3",
             "source": {
-- 
cgit v1.0


From e8b666b380849ad14d1505046b09206317a6419e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:58:00 +0000
Subject: update slim/slim to 4.13.0 and slim/psr7 to 1.6.1, fixes #4156

Closes #4156

Merge request studip/studip!2996
---
 composer.json |  4 ++--
 composer.lock | 76 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/composer.json b/composer.json
index 46cd649..41904ab 100644
--- a/composer.json
+++ b/composer.json
@@ -43,8 +43,8 @@
         "ext-mbstring": "*",
         "ext-dom": "*",
         "opis/json-schema": "^1.0",
-        "slim/psr7": "^1.4",
-        "slim/slim": "^4.7.1",
+        "slim/psr7": "1.6.1",
+        "slim/slim": "4.13.0",
         "php-di/php-di": "^6.3.4",
         "symfony/console": "^5.3.16",
         "symfony/process": "^5.4",
diff --git a/composer.lock b/composer.lock
index 0f5572c..7f78a11 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4212f765bea5d1be5fa2d84d32040779",
+    "content-hash": "c12530d4c0a9fa774b713876e67f6876",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -3523,39 +3523,40 @@
         },
         {
             "name": "slim/psr7",
-            "version": "1.4",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim-Psr7.git",
-                "reference": "0dca983ca32a26f4a91fb11173b7b9eaee29e9d6"
+                "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/0dca983ca32a26f4a91fb11173b7b9eaee29e9d6",
-                "reference": "0dca983ca32a26f4a91fb11173b7b9eaee29e9d6",
+                "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/72d2b2bac94ab4575d369f605dbfafbe168d3163",
+                "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163",
                 "shasum": ""
             },
             "require": {
                 "fig/http-message-util": "^1.1.5",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "psr/http-factory": "^1.0",
                 "psr/http-message": "^1.0",
-                "ralouphie/getallheaders": "^3",
-                "symfony/polyfill-php80": "^1.22"
+                "ralouphie/getallheaders": "^3.0",
+                "symfony/polyfill-php80": "^1.26"
             },
             "provide": {
                 "psr/http-factory-implementation": "1.0",
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "adriansuter/php-autoload-override": "^1.2",
+                "adriansuter/php-autoload-override": "^1.3",
                 "ext-json": "*",
                 "http-interop/http-factory-tests": "^0.9.0",
-                "php-http/psr7-integration-tests": "dev-master",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^8.5 || ^9.5",
-                "squizlabs/php_codesniffer": "^3.6",
-                "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
+                "php-http/psr7-integration-tests": "1.1",
+                "phpspec/prophecy": "^1.15",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpstan/phpstan": "^1.8",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "^3.7"
             },
             "type": "library",
             "autoload": {
@@ -3598,50 +3599,51 @@
             ],
             "support": {
                 "issues": "https://github.com/slimphp/Slim-Psr7/issues",
-                "source": "https://github.com/slimphp/Slim-Psr7/tree/1.4"
+                "source": "https://github.com/slimphp/Slim-Psr7/tree/1.6.1"
             },
-            "time": "2021-05-08T18:22:56+00:00"
+            "time": "2023-04-17T16:02:20+00:00"
         },
         {
             "name": "slim/slim",
-            "version": "4.8.1",
+            "version": "4.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "c8934c35d9d98b1a1df9f99ee69b77a59e0aa820"
+                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/c8934c35d9d98b1a1df9f99ee69b77a59e0aa820",
-                "reference": "c8934c35d9d98b1a1df9f99ee69b77a59e0aa820",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "nikic/fast-route": "^1.3",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "psr/container": "^1.0 || ^2.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
                 "psr/http-server-handler": "^1.0",
                 "psr/http-server-middleware": "^1.0",
-                "psr/log": "^1.1"
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "adriansuter/php-autoload-override": "^1.2",
+                "adriansuter/php-autoload-override": "^1.4",
                 "ext-simplexml": "*",
-                "guzzlehttp/psr7": "^1.8",
-                "http-interop/http-factory-guzzle": "^1.0",
-                "laminas/laminas-diactoros": "^2.4",
-                "nyholm/psr7": "^1.4",
-                "nyholm/psr7-server": "^1.0.1",
-                "phpspec/prophecy": "^1.13",
-                "phpstan/phpstan": "^0.12.85",
-                "phpunit/phpunit": "^8.5.13 || ^9.3.8",
-                "slim/http": "^1.2",
-                "slim/psr7": "^1.3",
-                "squizlabs/php_codesniffer": "^3.6",
-                "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
+                "guzzlehttp/psr7": "^2.6",
+                "httpsoft/http-message": "^1.1",
+                "httpsoft/http-server-request": "^1.1",
+                "laminas/laminas-diactoros": "^2.17 || ^3",
+                "nyholm/psr7": "^1.8",
+                "nyholm/psr7-server": "^1.1",
+                "phpspec/prophecy": "^1.19",
+                "phpspec/prophecy-phpunit": "^2.1",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.6",
+                "slim/http": "^1.3",
+                "slim/psr7": "^1.6",
+                "squizlabs/php_codesniffer": "^3.9"
             },
             "suggest": {
                 "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@@ -3714,7 +3716,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-29T19:41:06+00:00"
+            "time": "2024-03-03T21:25:30+00:00"
         },
         {
             "name": "spomky-labs/otphp",
-- 
cgit v1.0


From c1d113ce8d0b091bae552ee068e42b85569fc995 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 19:01:57 +0000
Subject: update spomky-labs/otphp to 11.2.2, fixes #4155

Closes #4155

Merge request studip/studip!2994
---
 composer.json |   2 +-
 composer.lock | 261 +++++++---------------------------------------------------
 2 files changed, 31 insertions(+), 232 deletions(-)

diff --git a/composer.json b/composer.json
index 41904ab..7e37ca3 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "php": "^8.1",
         "guzzlehttp/psr7": "2.6.2",
         "neomerx/json-api": "4.0.1",
-        "spomky-labs/otphp": "^10",
+        "spomky-labs/otphp": "11.2.2",
         "tuupola/cors-middleware": "^1.2.1",
         "tecnickcom/tcpdf": "6.7.5",
         "scssphp/scssphp": "1.12.1",
diff --git a/composer.lock b/composer.lock
index 7f78a11..932b852 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c12530d4c0a9fa774b713876e67f6876",
+    "content-hash": "f4d658d79c623c432e65c2f2d1adac5b",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -63,73 +63,6 @@
             "time": "2023-02-17T10:08:02+00:00"
         },
         {
-            "name": "beberlei/assert",
-            "version": "v3.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/beberlei/assert.git",
-                "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655",
-                "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "php": "^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "*",
-                "phpstan/phpstan": "*",
-                "phpunit/phpunit": ">=6.0.0",
-                "yoast/phpunit-polyfills": "^0.1.0"
-            },
-            "suggest": {
-                "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/Assert/functions.php"
-                ],
-                "psr-4": {
-                    "Assert\\": "lib/Assert"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Richard Quadling",
-                    "email": "rquadling@gmail.com",
-                    "role": "Collaborator"
-                }
-            ],
-            "description": "Thin assertion library for input validation in business models.",
-            "keywords": [
-                "assert",
-                "assertion",
-                "validation"
-            ],
-            "support": {
-                "issues": "https://github.com/beberlei/assert/issues",
-                "source": "https://github.com/beberlei/assert/tree/v3.3.2"
-            },
-            "time": "2021-12-16T21:41:27+00:00"
-        },
-        {
             "name": "caxy/php-htmldiff",
             "version": "v0.1.15",
             "source": {
@@ -3720,43 +3653,38 @@
         },
         {
             "name": "spomky-labs/otphp",
-            "version": "v10.0.3",
+            "version": "11.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/otphp.git",
-                "reference": "9784d9f7c790eed26e102d6c78f12c754036c366"
+                "reference": "b737d1c6330beae7c0bc225d3e848805b352fe42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/9784d9f7c790eed26e102d6c78f12c754036c366",
-                "reference": "9784d9f7c790eed26e102d6c78f12c754036c366",
+                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/b737d1c6330beae7c0bc225d3e848805b352fe42",
+                "reference": "b737d1c6330beae7c0bc225d3e848805b352fe42",
                 "shasum": ""
             },
             "require": {
-                "beberlei/assert": "^3.0",
                 "ext-mbstring": "*",
                 "paragonie/constant_time_encoding": "^2.0",
-                "php": "^7.2|^8.0",
-                "thecodingmachine/safe": "^0.1.14|^1.0|^2.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "php-coveralls/php-coveralls": "^2.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-beberlei-assert": "^0.12",
-                "phpstan/phpstan-deprecation-rules": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^8.0",
-                "thecodingmachine/phpstan-safe-rule": "^1.0 || ^2.0"
+                "ekino/phpstan-banned-code": "^1.0",
+                "infection/infection": "^0.26|^0.27|^0.28",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5.26|^10.0|^11.0",
+                "qossmic/deptrac-shim": "^1.0",
+                "rector/rector": "1.0",
+                "symfony/phpunit-bridge": "^6.1|^7.0",
+                "symplify/easy-coding-standard": "^12.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "v10.0": "10.0.x-dev",
-                    "v9.0": "9.0.x-dev",
-                    "v8.3": "8.3.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "OTPHP\\": "src/"
@@ -3789,9 +3717,19 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/otphp/issues",
-                "source": "https://github.com/Spomky-Labs/otphp/tree/v10.0.3"
+                "source": "https://github.com/Spomky-Labs/otphp/tree/11.2.2"
             },
-            "time": "2022-03-17T08:00:35+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/Spomky",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2024-04-15T07:35:15+00:00"
         },
         {
             "name": "symfony/console",
@@ -4814,145 +4752,6 @@
             "time": "2024-04-20T17:25:10+00:00"
         },
         {
-            "name": "thecodingmachine/safe",
-            "version": "v1.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "a8ab0876305a4cdaef31b2350fcb9811b5608dbc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/a8ab0876305a4cdaef31b2350fcb9811b5608dbc",
-                "reference": "a8ab0876305a4cdaef31b2350fcb9811b5608dbc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^0.12",
-                "squizlabs/php_codesniffer": "^3.2",
-                "thecodingmachine/phpstan-strict-rules": "^0.12"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.1-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "deprecated/apc.php",
-                    "deprecated/libevent.php",
-                    "deprecated/mssql.php",
-                    "deprecated/stats.php",
-                    "lib/special_cases.php",
-                    "generated/apache.php",
-                    "generated/apcu.php",
-                    "generated/array.php",
-                    "generated/bzip2.php",
-                    "generated/calendar.php",
-                    "generated/classobj.php",
-                    "generated/com.php",
-                    "generated/cubrid.php",
-                    "generated/curl.php",
-                    "generated/datetime.php",
-                    "generated/dir.php",
-                    "generated/eio.php",
-                    "generated/errorfunc.php",
-                    "generated/exec.php",
-                    "generated/fileinfo.php",
-                    "generated/filesystem.php",
-                    "generated/filter.php",
-                    "generated/fpm.php",
-                    "generated/ftp.php",
-                    "generated/funchand.php",
-                    "generated/gmp.php",
-                    "generated/gnupg.php",
-                    "generated/hash.php",
-                    "generated/ibase.php",
-                    "generated/ibmDb2.php",
-                    "generated/iconv.php",
-                    "generated/image.php",
-                    "generated/imap.php",
-                    "generated/info.php",
-                    "generated/ingres-ii.php",
-                    "generated/inotify.php",
-                    "generated/json.php",
-                    "generated/ldap.php",
-                    "generated/libxml.php",
-                    "generated/lzf.php",
-                    "generated/mailparse.php",
-                    "generated/mbstring.php",
-                    "generated/misc.php",
-                    "generated/msql.php",
-                    "generated/mysql.php",
-                    "generated/mysqli.php",
-                    "generated/mysqlndMs.php",
-                    "generated/mysqlndQc.php",
-                    "generated/network.php",
-                    "generated/oci8.php",
-                    "generated/opcache.php",
-                    "generated/openssl.php",
-                    "generated/outcontrol.php",
-                    "generated/password.php",
-                    "generated/pcntl.php",
-                    "generated/pcre.php",
-                    "generated/pdf.php",
-                    "generated/pgsql.php",
-                    "generated/posix.php",
-                    "generated/ps.php",
-                    "generated/pspell.php",
-                    "generated/readline.php",
-                    "generated/rpminfo.php",
-                    "generated/rrd.php",
-                    "generated/sem.php",
-                    "generated/session.php",
-                    "generated/shmop.php",
-                    "generated/simplexml.php",
-                    "generated/sockets.php",
-                    "generated/sodium.php",
-                    "generated/solr.php",
-                    "generated/spl.php",
-                    "generated/sqlsrv.php",
-                    "generated/ssdeep.php",
-                    "generated/ssh2.php",
-                    "generated/stream.php",
-                    "generated/strings.php",
-                    "generated/swoole.php",
-                    "generated/uodbc.php",
-                    "generated/uopz.php",
-                    "generated/url.php",
-                    "generated/var.php",
-                    "generated/xdiff.php",
-                    "generated/xml.php",
-                    "generated/xmlrpc.php",
-                    "generated/yaml.php",
-                    "generated/yaz.php",
-                    "generated/zip.php",
-                    "generated/zlib.php"
-                ],
-                "psr-4": {
-                    "Safe\\": [
-                        "lib/",
-                        "deprecated/",
-                        "generated/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
-            "support": {
-                "issues": "https://github.com/thecodingmachine/safe/issues",
-                "source": "https://github.com/thecodingmachine/safe/tree/v1.3.3"
-            },
-            "time": "2020-10-28T17:51:34+00:00"
-        },
-        {
             "name": "tuupola/callable-handler",
             "version": "1.1.0",
             "source": {
-- 
cgit v1.0


From eb4f3bba75580ee1bd04e2b6677028ff28e6a1af Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 19:05:34 +0000
Subject: update php-di/php-di to 7.0.6, fixes #4153

Closes #4153

Merge request studip/studip!2993
---
 composer.json               |   2 +-
 composer.lock               | 252 ++++++++++++++++++++++----------------------
 lib/classes/DIContainer.php |   1 -
 3 files changed, 127 insertions(+), 128 deletions(-)

diff --git a/composer.json b/composer.json
index 7e37ca3..361149d 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
         "opis/json-schema": "^1.0",
         "slim/psr7": "1.6.1",
         "slim/slim": "4.13.0",
-        "php-di/php-di": "^6.3.4",
+        "php-di/php-di": "7.0.0",
         "symfony/console": "^5.3.16",
         "symfony/process": "^5.4",
         "jumbojett/openid-connect-php": "^0.9.2",
diff --git a/composer.lock b/composer.lock
index 932b852..bc0d599 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f4d658d79c623c432e65c2f2d1adac5b",
+    "content-hash": "f50f62060597f2d86eb61fc8af9cf333",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -741,6 +741,116 @@
             "time": "2022-11-12T10:09:40+00:00"
         },
         {
+            "name": "kub-at/php-simple-html-dom-parser",
+            "version": "1.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Kub-AT/php-simple-html-dom-parser.git",
+                "reference": "ff22f98bfd9235115c128059076f3eb740d66913"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Kub-AT/php-simple-html-dom-parser/zipball/ff22f98bfd9235115c128059076f3eb740d66913",
+                "reference": "ff22f98bfd9235115c128059076f3eb740d66913",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "KubAT\\PhpSimple\\HtmlDomParser": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "S.C. Chen",
+                    "email": "me578022@gmail.com"
+                },
+                {
+                    "name": "Jakub Stawowy",
+                    "email": "Kub-AT@users.noreply.github.com"
+                }
+            ],
+            "description": "PHP Simple HTML DOM Parser with namespace and PHP 7.3 compatible",
+            "homepage": "http://simplehtmldom.sourceforge.net/",
+            "keywords": [
+                "Simple",
+                "dom",
+                "html"
+            ],
+            "support": {
+                "issues": "https://github.com/Kub-AT/php-simple-html-dom-parser/issues",
+                "source": "https://github.com/Kub-AT/php-simple-html-dom-parser/tree/master"
+            },
+            "time": "2019-10-25T12:34:43+00:00"
+        },
+        {
+            "name": "laravel/serializable-closure",
+            "version": "v1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/serializable-closure.git",
+                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
+                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "nesbot/carbon": "^2.61",
+                "pestphp/pest": "^1.21.3",
+                "phpstan/phpstan": "^1.8.2",
+                "symfony/var-dumper": "^5.4.11"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\SerializableClosure\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                },
+                {
+                    "name": "Nuno Maduro",
+                    "email": "nuno@laravel.com"
+                }
+            ],
+            "description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.",
+            "keywords": [
+                "closure",
+                "laravel",
+                "serializable"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/serializable-closure/issues",
+                "source": "https://github.com/laravel/serializable-closure"
+            },
+            "time": "2023-11-08T14:08:06+00:00"
+        },
+        {
             "name": "lcobucci/jwt",
             "version": "5.2.0",
             "source": {
@@ -1763,71 +1873,6 @@
             "time": "2023-09-26T11:13:49+00:00"
         },
         {
-            "name": "opis/closure",
-            "version": "3.6.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opis/closure.git",
-                "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad",
-                "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.4 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "jeremeamia/superclosure": "^2.0",
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.6.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "functions.php"
-                ],
-                "psr-4": {
-                    "Opis\\Closure\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marius Sarca",
-                    "email": "marius.sarca@gmail.com"
-                },
-                {
-                    "name": "Sorin Sarca",
-                    "email": "sarca_sorin@hotmail.com"
-                }
-            ],
-            "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
-            "homepage": "https://opis.io/closure",
-            "keywords": [
-                "anonymous functions",
-                "closure",
-                "function",
-                "serializable",
-                "serialization",
-                "serialize"
-            ],
-            "support": {
-                "issues": "https://github.com/opis/closure/issues",
-                "source": "https://github.com/opis/closure/tree/3.6.3"
-            },
-            "time": "2022-01-27T09:35:39+00:00"
-        },
-        {
             "name": "opis/json-schema",
             "version": "1.1.0",
             "source": {
@@ -2163,39 +2208,36 @@
         },
         {
             "name": "php-di/php-di",
-            "version": "6.3.5",
+            "version": "7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-DI/PHP-DI.git",
-                "reference": "b8126d066ce144765300ee0ab040c1ed6c9ef588"
+                "reference": "f0ca9a0e0fb800974fcaf7b2f896ca1e840fd15b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/b8126d066ce144765300ee0ab040c1ed6c9ef588",
-                "reference": "b8126d066ce144765300ee0ab040c1ed6c9ef588",
+                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/f0ca9a0e0fb800974fcaf7b2f896ca1e840fd15b",
+                "reference": "f0ca9a0e0fb800974fcaf7b2f896ca1e840fd15b",
                 "shasum": ""
             },
             "require": {
-                "opis/closure": "^3.5.5",
-                "php": ">=7.2.0",
+                "laravel/serializable-closure": "^1.0",
+                "php": ">=8.0",
                 "php-di/invoker": "^2.0",
-                "php-di/phpdoc-reader": "^2.0.1",
-                "psr/container": "^1.0"
+                "psr/container": "^1.1 || ^2.0"
             },
             "provide": {
                 "psr/container-implementation": "^1.0"
             },
             "require-dev": {
-                "doctrine/annotations": "~1.2",
-                "friendsofphp/php-cs-fixer": "^2.4",
-                "mnapoli/phpunit-easymock": "^1.2",
-                "ocramius/proxy-manager": "^2.0.2",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^8.5|^9.0"
+                "friendsofphp/php-cs-fixer": "^3",
+                "mnapoli/phpunit-easymock": "^1.3",
+                "ocramius/proxy-manager": "^2.11.2",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^4.6"
             },
             "suggest": {
-                "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)",
-                "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)"
+                "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ^2.3)"
             },
             "type": "library",
             "autoload": {
@@ -2223,7 +2265,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-DI/PHP-DI/issues",
-                "source": "https://github.com/PHP-DI/PHP-DI/tree/6.3.5"
+                "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.0"
             },
             "funding": [
                 {
@@ -2235,49 +2277,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-02T09:49:58+00:00"
-        },
-        {
-            "name": "php-di/phpdoc-reader",
-            "version": "2.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-DI/PhpDocReader.git",
-                "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c",
-                "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "require-dev": {
-                "mnapoli/hard-mode": "~0.3.0",
-                "phpunit/phpunit": "^8.5|^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PhpDocReader\\": "src/PhpDocReader"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
-            "keywords": [
-                "phpdoc",
-                "reflection"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-DI/PhpDocReader/issues",
-                "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1"
-            },
-            "time": "2020-10-12T12:39:22+00:00"
+            "time": "2023-01-12T14:08:11+00:00"
         },
         {
             "name": "phpoffice/phpspreadsheet",
diff --git a/lib/classes/DIContainer.php b/lib/classes/DIContainer.php
index 307ed4a..c3d9b82 100644
--- a/lib/classes/DIContainer.php
+++ b/lib/classes/DIContainer.php
@@ -52,7 +52,6 @@ class DIContainer
                 self::getCompilationClass()
             );
         }
-        $builder->ignorePhpDocErrors(true);
         $builder->addDefinitions('lib/bootstrap-definitions.php');
 
         $jsonapiSettings = require 'lib/classes/JsonApi/settings.php';
-- 
cgit v1.0


From 7fbf01fafcbc022831e9717a892a084b3c6e6e59 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 19:10:49 +0000
Subject: update psr/cache to 3.0.0 and adjust everything necessary, fixes
 #4152

Closes #4152

Merge request studip/studip!2992
---
 composer.json                              |   2 +-
 composer.lock                              | 125 +++++++++--------------------
 lib/classes/cache/Cache.class.php          |  21 +++--
 lib/classes/cache/DbCache.class.php        |   7 +-
 lib/classes/cache/FileCache.class.php      |   7 +-
 lib/classes/cache/Item.class.php           |  13 +--
 lib/classes/cache/MemcachedCache.class.php |   6 +-
 lib/classes/cache/MemoryCache.class.php    |  12 +--
 lib/classes/cache/Proxy.class.php          |  21 ++---
 lib/classes/cache/RedisCache.class.php     |   6 +-
 lib/classes/cache/Wrapper.class.php        |   6 +-
 11 files changed, 92 insertions(+), 134 deletions(-)

diff --git a/composer.json b/composer.json
index 361149d..2d9519d 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,7 @@
         "okvpn/clock-lts": "^1.0",
         "vlucas/phpdotenv": "^5.6",
         "edu-sharing/auth-plugin": "8.0.x-dev",
-        "psr/cache": "^1.0"
+        "psr/cache": "3.0.0"
     },
     "replace": {
         "symfony/polyfill-php73": "*",
diff --git a/composer.lock b/composer.lock
index bc0d599..50868a9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f50f62060597f2d86eb61fc8af9cf333",
+    "content-hash": "4f5e2e10224f8606704af0c8e80acc02",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -741,56 +741,6 @@
             "time": "2022-11-12T10:09:40+00:00"
         },
         {
-            "name": "kub-at/php-simple-html-dom-parser",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Kub-AT/php-simple-html-dom-parser.git",
-                "reference": "ff22f98bfd9235115c128059076f3eb740d66913"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Kub-AT/php-simple-html-dom-parser/zipball/ff22f98bfd9235115c128059076f3eb740d66913",
-                "reference": "ff22f98bfd9235115c128059076f3eb740d66913",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "KubAT\\PhpSimple\\HtmlDomParser": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "S.C. Chen",
-                    "email": "me578022@gmail.com"
-                },
-                {
-                    "name": "Jakub Stawowy",
-                    "email": "Kub-AT@users.noreply.github.com"
-                }
-            ],
-            "description": "PHP Simple HTML DOM Parser with namespace and PHP 7.3 compatible",
-            "homepage": "http://simplehtmldom.sourceforge.net/",
-            "keywords": [
-                "Simple",
-                "dom",
-                "html"
-            ],
-            "support": {
-                "issues": "https://github.com/Kub-AT/php-simple-html-dom-parser/issues",
-                "source": "https://github.com/Kub-AT/php-simple-html-dom-parser/tree/master"
-            },
-            "time": "2019-10-25T12:34:43+00:00"
-        },
-        {
             "name": "laravel/serializable-closure",
             "version": "v1.3.3",
             "source": {
@@ -2733,20 +2683,20 @@
         },
         {
             "name": "psr/cache",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
@@ -2766,7 +2716,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for caching libraries",
@@ -2776,9 +2726,9 @@
                 "psr-6"
             ],
             "support": {
-                "source": "https://github.com/php-fig/cache/tree/master"
+                "source": "https://github.com/php-fig/cache/tree/3.0.0"
             },
-            "time": "2016-08-06T20:24:11+00:00"
+            "time": "2021-02-03T23:26:27+00:00"
         },
         {
             "name": "psr/clock",
@@ -7252,58 +7202,57 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v5.4.39",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "982237e35079fdcc31ab724f06b6131992c4fd24"
+                "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/982237e35079fdcc31ab724f06b6131992c4fd24",
-                "reference": "982237e35079fdcc31ab724f06b6131992c4fd24",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/b9e9b93c9817ec6c789c7943f5e54b57a041c16a",
+                "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/cache": "^1.0|^2.0",
+                "php": ">=8.1",
+                "psr/cache": "^2.0|^3.0",
                 "psr/log": "^1.1|^2|^3",
-                "symfony/cache-contracts": "^1.1.7|^2",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/cache-contracts": "^2.5|^3",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/var-exporter": "^6.3.6|^7.0"
             },
             "conflict": {
                 "doctrine/dbal": "<2.13.1",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/http-kernel": "<4.4",
-                "symfony/var-dumper": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/http-kernel": "<5.4",
+                "symfony/var-dumper": "<5.4"
             },
             "provide": {
-                "psr/cache-implementation": "1.0|2.0",
-                "psr/simple-cache-implementation": "1.0|2.0",
-                "symfony/cache-implementation": "1.0|2.0"
+                "psr/cache-implementation": "2.0|3.0",
+                "psr/simple-cache-implementation": "1.0|2.0|3.0",
+                "symfony/cache-implementation": "1.1|2.0|3.0"
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/cache": "^1.6|^2.0",
                 "doctrine/dbal": "^2.13.1|^3|^4",
-                "predis/predis": "^1.1",
-                "psr/simple-cache": "^1.0|^2.0",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/filesystem": "^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^4.4|^5.0|^6.0",
-                "symfony/messenger": "^4.4|^5.0|^6.0",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+                "predis/predis": "^1.1|^2.0",
+                "psr/simple-cache": "^1.0|^2.0|^3.0",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/filesystem": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Cache\\": ""
                 },
+                "classmap": [
+                    "Traits/ValueWrapper.php"
+                ],
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -7329,7 +7278,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.39"
+                "source": "https://github.com/symfony/cache/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7345,7 +7294,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T08:26:06+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/cache-contracts",
diff --git a/lib/classes/cache/Cache.class.php b/lib/classes/cache/Cache.class.php
index 366945d..be703cf 100644
--- a/lib/classes/cache/Cache.class.php
+++ b/lib/classes/cache/Cache.class.php
@@ -72,12 +72,12 @@ abstract class Cache implements CacheItemPoolInterface
     /**
      * @see CacheItemPoolInterface::getItem
      */
-    abstract public function getItem($key);
+    abstract public function getItem(string $key): CacheItemInterface;
 
     /**
      * @see CacheItemPoolInterface::hasItem
      */
-    abstract public function hasItem($key);
+    abstract public function hasItem(string $key): bool;
 
     /**
      * @var array An array of deferred items that shall be saved only
@@ -149,7 +149,7 @@ abstract class Cache implements CacheItemPoolInterface
     /**
      * @see CacheItemPoolInterface::getItems
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = []): iterable
     {
         $items = [];
         foreach ($keys as $key) {
@@ -164,45 +164,50 @@ abstract class Cache implements CacheItemPoolInterface
     /**
      * @see CacheItemPoolInterface::clear
      */
-    public function clear()
+    public function clear(): bool
     {
         $this->deferred_items = [];
         $this->flush();
+        return true;
     }
 
     /**
      * @see CacheItemPoolInterface::deleteItem
      */
-    public function deleteItem($key)
+    public function deleteItem($key): bool
     {
         $this->expire($key);
+        return true;
     }
 
     /**
      * @see CacheItemPoolInterface::deleteItems
      */
-    public function deleteItems(array $keys)
+    public function deleteItems(array $keys): bool
     {
         foreach ($keys as $key) {
             $this->expire($key);
         }
+        return true;
     }
 
     /**
      * @see CacheItemPoolInterface::saveDeferred
      */
-    public function saveDeferred(CacheItemInterface $item)
+    public function saveDeferred(CacheItemInterface $item): bool
     {
         $this->deferred_items[] = $item;
+        return true;
     }
 
     /**
      * @see CacheItemPoolInterface::commit
      */
-    public function commit()
+    public function commit(): bool
     {
         foreach ($this->deferred_items as $item) {
             $this->save($item);
         }
+        return true;
     }
 }
diff --git a/lib/classes/cache/DbCache.class.php b/lib/classes/cache/DbCache.class.php
index 3361af0..c7abef2 100644
--- a/lib/classes/cache/DbCache.class.php
+++ b/lib/classes/cache/DbCache.class.php
@@ -3,6 +3,7 @@
 namespace Studip\Cache;
 
 use DBManager;
+use Psr\Cache\CacheItemInterface;
 
 /**
  * StudipCache implementation using database table
@@ -88,7 +89,7 @@ class DbCache extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         $query = "SELECT `content`, `expires`
                   FROM `cache`
@@ -114,7 +115,7 @@ class DbCache extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         $query = "SELECT 1
                   FROM `cache`
@@ -126,7 +127,7 @@ class DbCache extends Cache
     /**
      * @inheritDoc
      */
-    public function save(\Psr\Cache\CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         $expiration = $this->getExpiration($item);
         if ($expiration < 1) {
diff --git a/lib/classes/cache/FileCache.class.php b/lib/classes/cache/FileCache.class.php
index e94395a..d760f08 100644
--- a/lib/classes/cache/FileCache.class.php
+++ b/lib/classes/cache/FileCache.class.php
@@ -4,6 +4,7 @@ namespace Studip\Cache;
 
 use Config;
 use Exception;
+use Psr\Cache\CacheItemInterface;
 
 /**
  * Cache implementation using files
@@ -223,7 +224,7 @@ class FileCache extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         $real_key = $this->getCacheKey($key);
 
@@ -251,7 +252,7 @@ class FileCache extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         $real_key = $this->getCacheKey($key);
         $file_data = $this->check($real_key);
@@ -261,7 +262,7 @@ class FileCache extends Cache
     /**
      * @inheritDoc
      */
-    public function save(\Psr\Cache\CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         $expiration = $this->getExpiration($item);
         if ($expiration < 1) {
diff --git a/lib/classes/cache/Item.class.php b/lib/classes/cache/Item.class.php
index 1a09f1d..4e83d4d 100644
--- a/lib/classes/cache/Item.class.php
+++ b/lib/classes/cache/Item.class.php
@@ -71,7 +71,7 @@ class Item implements CacheItemInterface
     /**
      * @inheritDoc
      */
-    public function getKey()
+    public function getKey(): string
     {
         return $this->key;
     }
@@ -79,7 +79,7 @@ class Item implements CacheItemInterface
     /**
      * @inheritDoc
      */
-    public function get()
+    public function get(): mixed
     {
         return $this->value;
     }
@@ -87,7 +87,7 @@ class Item implements CacheItemInterface
     /**
      * @inheritDoc
      */
-    public function isHit()
+    public function isHit(): bool
     {
         return $this->cache_hit;
     }
@@ -95,15 +95,16 @@ class Item implements CacheItemInterface
     /**
      * @inheritDoc
      */
-    public function set($value)
+    public function set($value): static
     {
         $this->value = $value;
+        return $this;
     }
 
     /**
      * @inheritDoc
      */
-    public function expiresAt($expiration)
+    public function expiresAt($expiration): static
     {
         $this->expiration = $expiration;
         return $this;
@@ -112,7 +113,7 @@ class Item implements CacheItemInterface
     /**
      * @inheritDoc
      */
-    public function expiresAfter($time)
+    public function expiresAfter($time): static
     {
         $this->expiration = new DateTime();
         if ($time instanceof DateInterval) {
diff --git a/lib/classes/cache/MemcachedCache.class.php b/lib/classes/cache/MemcachedCache.class.php
index 5d9033b..1c4b685 100644
--- a/lib/classes/cache/MemcachedCache.class.php
+++ b/lib/classes/cache/MemcachedCache.class.php
@@ -114,7 +114,7 @@ class MemcachedCache extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         $item = new Item($key);
         $value = $this->memcache->get($this->getCacheKey($key));
@@ -129,7 +129,7 @@ class MemcachedCache extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         return $this->memcache->checkKey($this->getCacheKey($key));
     }
@@ -137,7 +137,7 @@ class MemcachedCache extends Cache
     /**
      * @inheritDoc
      */
-    public function save(CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         $expiration = $this->getExpiration($item);
         if ($expiration < 1) {
diff --git a/lib/classes/cache/MemoryCache.class.php b/lib/classes/cache/MemoryCache.class.php
index 93f6bbd..7c00753 100644
--- a/lib/classes/cache/MemoryCache.class.php
+++ b/lib/classes/cache/MemoryCache.class.php
@@ -19,11 +19,11 @@ class MemoryCache extends Cache
     /**
      * Expires just a single key.
      *
-     * @param  string  the key
+     * @param  string $arg the key
      */
-    public function expire($key)
+    public function expire($arg)
     {
-        unset($this->memory_cache[$key]);
+        unset($this->memory_cache[$arg]);
     }
 
     /**
@@ -52,7 +52,7 @@ class MemoryCache extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         $item = new Item($key);
         if (!isset($this->memory_cache[$key])) {
@@ -75,7 +75,7 @@ class MemoryCache extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         return isset($this->memory_cache[$key])
             && $this->memory_cache[$key]['expires'] < time();
@@ -84,7 +84,7 @@ class MemoryCache extends Cache
     /**
      * @inheritDoc
      */
-    public function save(CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         $expiration = $this->getExpiration($item);
 
diff --git a/lib/classes/cache/Proxy.class.php b/lib/classes/cache/Proxy.class.php
index 6791fb7..fef034d 100644
--- a/lib/classes/cache/Proxy.class.php
+++ b/lib/classes/cache/Proxy.class.php
@@ -2,6 +2,7 @@
 
 namespace Studip\Cache;
 
+use Psr\Cache\CacheItemInterface;
 use StudipCacheOperation;
 
 /**
@@ -39,20 +40,20 @@ class Proxy extends Cache
     /**
      * Expires just a single key.
      *
-     * @param string $key The item's key
+     * @param string $arg The item's key
      */
-    public function expire($key)
+    public function expire($arg)
     {
         if (in_array('expire', $this->proxy_these)) {
             try {
-                $operation = new StudipCacheOperation([$key, 'expire']);
+                $operation = new StudipCacheOperation([$arg, 'expire']);
                 $operation->parameters = serialize([]);
                 $operation->store();
-            } catch (\Exception $e) {
+            } catch (\Exception) {
             }
         }
 
-        return $this->actual_cache->expire($key);
+        return $this->actual_cache->expire($arg);
     }
 
     /**
@@ -65,7 +66,7 @@ class Proxy extends Cache
                 $operation = new StudipCacheOperation(['', 'flush']);
                 $operation->parameters = serialize([]);
                 $operation->store();
-            } catch (\Exception $e) {
+            } catch (\Exception) {
             }
         }
 
@@ -90,7 +91,7 @@ class Proxy extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         return $this->actual_cache->getItem($key);
     }
@@ -98,7 +99,7 @@ class Proxy extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         return $this->actual_cache->hasItem($key);
     }
@@ -106,14 +107,14 @@ class Proxy extends Cache
     /**
      * @inheritDoc
      */
-    public function save(\Psr\Cache\CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         if (in_array('save', $this->proxy_these)) {
             try {
                 $operation = new StudipCacheOperation([$item->getKey(), 'save']);
                 $operation->parameters = serialize([$item]);
                 $operation->store();
-            } catch (\Exception $e) {
+            } catch (\Exception) {
             }
         }
 
diff --git a/lib/classes/cache/RedisCache.class.php b/lib/classes/cache/RedisCache.class.php
index 9ea8711..a78f751 100644
--- a/lib/classes/cache/RedisCache.class.php
+++ b/lib/classes/cache/RedisCache.class.php
@@ -156,7 +156,7 @@ class RedisCache extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         $item = new Item($key);
         $real_key = $this->getCacheKey($key);
@@ -175,7 +175,7 @@ class RedisCache extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         $real_key = $this->getCacheKey($key);
         return $this->redis->get($real_key) !== null;
@@ -184,7 +184,7 @@ class RedisCache extends Cache
     /**
      * @inheritDoc
      */
-    public function save(CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         $expiration = $this->getExpiration($item);
         if ($expiration < 1) {
diff --git a/lib/classes/cache/Wrapper.class.php b/lib/classes/cache/Wrapper.class.php
index 7448932..4e6342c 100644
--- a/lib/classes/cache/Wrapper.class.php
+++ b/lib/classes/cache/Wrapper.class.php
@@ -59,7 +59,7 @@ class Wrapper extends Cache
     /**
      * @inheritDoc
      */
-    public function getItem($key)
+    public function getItem(string $key): CacheItemInterface
     {
         $cached = $this->memory_cache->getItem($key);
         if ($cached->isHit()) {
@@ -76,7 +76,7 @@ class Wrapper extends Cache
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
+    public function hasItem(string $key): bool
     {
         return $this->actual_cache->hasItem($key);
     }
@@ -84,7 +84,7 @@ class Wrapper extends Cache
     /**
      * @inheritDoc
      */
-    public function save(CacheItemInterface $item)
+    public function save(CacheItemInterface $item): bool
     {
         if ($this->actual_cache->save($item)) {
             return $this->memory_cache->save($item);
-- 
cgit v1.0


From 9cdccef4cfc8cc02af4897c17b7a9572f96529fa Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 19:13:27 +0000
Subject: update jumbojett/openid-connect-php to 1.0.0, fixes #4151

Closes #4151

Merge request studip/studip!2991
---
 composer.json |  2 +-
 composer.lock | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 2d9519d..873ec70 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,7 @@
         "php-di/php-di": "7.0.0",
         "symfony/console": "^5.3.16",
         "symfony/process": "^5.4",
-        "jumbojett/openid-connect-php": "^0.9.2",
+        "jumbojett/openid-connect-php": "1.0.0",
         "league/oauth2-server": "8.5.4",
         "willdurand/negotiation": "^3.1",
         "monolog/monolog": "^2.8",
diff --git a/composer.lock b/composer.lock
index 50868a9..30a54d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4f5e2e10224f8606704af0c8e80acc02",
+    "content-hash": "0eef2a184f508c6e49337786eb186fca",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -640,27 +640,26 @@
         },
         {
             "name": "jumbojett/openid-connect-php",
-            "version": "v0.9.10",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jumbojett/OpenID-Connect-PHP.git",
-                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061"
+                "reference": "4af1d11497ec765dccddf928c14c04535ca96017"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/45aac47b525f0483dd4db3324bb1f1cab4666061",
-                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061",
+                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/4af1d11497ec765dccddf928c14c04535ca96017",
+                "reference": "4af1d11497ec765dccddf928c14c04535ca96017",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
-                "paragonie/random_compat": ">=2",
-                "php": ">=5.4",
-                "phpseclib/phpseclib": "~2.0 || ^3.0"
+                "php": ">=7.0",
+                "phpseclib/phpseclib": "~3.0"
             },
             "require-dev": {
-                "roave/security-advisories": "dev-master",
+                "roave/security-advisories": "dev-latest",
                 "yoast/phpunit-polyfills": "^1.0"
             },
             "type": "library",
@@ -676,9 +675,9 @@
             "description": "Bare-bones OpenID Connect client",
             "support": {
                 "issues": "https://github.com/jumbojett/OpenID-Connect-PHP/issues",
-                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v0.9.10"
+                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v1.0.0"
             },
-            "time": "2022-09-30T12:34:46+00:00"
+            "time": "2023-12-13T09:52:12+00:00"
         },
         {
             "name": "ksubileau/color-thief-php",
-- 
cgit v1.0


From 6899773092a6b73ab053be884a94033894aeb5e4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 19:20:45 +0000
Subject: update algo26-matthias/idna-convert v4.0.2, remove bogus code and add
 test, fixes #4149

Closes #4149

Merge request studip/studip!2989
---
 composer.json                 |  2 +-
 composer.lock                 | 18 +++++++++---------
 lib/visual.inc.php            | 39 +++++++++++++++++++--------------------
 tests/unit/lib/VisualTest.php | 11 +++++++++++
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/composer.json b/composer.json
index 873ec70..0d346cf 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "jasig/phpcas": "1.5",
         "phpxmlrpc/phpxmlrpc": "^4.9.0",
         "phpxmlrpc/extras": "^1.0.0-beta2",
-        "algo26-matthias/idna-convert": "^3.0",
+        "algo26-matthias/idna-convert": "4.0.2",
         "caxy/php-htmldiff": "0.1.15",
         "phpseclib/phpseclib": "3.0.37",
         "ext-gd": "*",
diff --git a/composer.lock b/composer.lock
index 30a54d9..a181ed1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,29 +4,29 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0eef2a184f508c6e49337786eb186fca",
+    "content-hash": "7f21be4fc85b3802bbef600b7cc4c538",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
-            "version": "v3.1.0",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/algo26-matthias/idna-convert.git",
-                "reference": "340a4dc65f6b0d9884853a3d32895d82f0c1502a"
+                "reference": "254938fb52b8bd34053401695d749f0e73fbb503"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/340a4dc65f6b0d9884853a3d32895d82f0c1502a",
-                "reference": "340a4dc65f6b0d9884853a3d32895d82f0c1502a",
+                "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/254938fb52b8bd34053401695d749f0e73fbb503",
+                "reference": "254938fb52b8bd34053401695d749f0e73fbb503",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
                 "jakeasmith/http_build_url": "^1",
-                "php": ">=7.2.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "8.0"
+                "phpunit/phpunit": "^9 || ^10"
             },
             "suggest": {
                 "ext-iconv": "Install ext/iconv for using input / output other than UTF-8 or ISO-8859-1",
@@ -58,9 +58,9 @@
             ],
             "support": {
                 "issues": "https://github.com/algo26-matthias/idna-convert/issues",
-                "source": "https://github.com/algo26-matthias/idna-convert/tree/v3.1.0"
+                "source": "https://github.com/algo26-matthias/idna-convert/tree/v4.0.2"
             },
-            "time": "2023-02-17T10:08:02+00:00"
+            "time": "2024-02-14T13:30:05+00:00"
         },
         {
             "name": "caxy/php-htmldiff",
diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 2ddcd46..86efbfb 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -290,31 +290,30 @@ function isLinkIntern($url) {
 }
 
 /**
-* convert links with 'umlauten' to punycode
-*
-* @access   public
-* @param    string  link to convert
-* @param    boolean  for mailadr = true and for other link = false
-* @return   string  link in punycode
-*/
-function idna_link($link, $mail = false) {
+ * convert links with 'umlauten' to punycode
+ *
+ * @param string $link link to convert
+ * @return string  link in punycode
+ *
+ * @throws \Algo26\IdnaConvert\Exception\AlreadyPunycodeException
+ * @throws \Algo26\IdnaConvert\Exception\InvalidCharacterException
+ */
+function idna_link(string $link) {
     if (!Config::get()->CONVERT_IDNA_URL) {
         return $link;
     }
-    $pu = @parse_url($link);
-    if (isset($pu['host']) && preg_match('/&\w+;/i', $pu['host'])) { //umlaute?  (html-coded)
+
+    $pu = parse_url($link);
+    if (
+        isset($pu['host'])
+        && preg_match('/&\w+;/i', $pu['host']) //umlaute?  (html-coded)
+        && preg_match('#^([^/]*)//([^/?]*)([/?].*)?$#i',$link, $matches)
+    ) {
         $IDN = new Algo26\IdnaConvert\ToIdn();
-        $out = false;
-        if ($mail){
-            if (preg_match('#^([^@]*)@(.*)$#i',$link, $matches)) {
-                $out = $IDN->convert(decodeHTML($matches[2], ENT_NOQUOTES)); // false by error
-                $out = $out ? $matches[1] . '@' . htmlReady($out) : $link;
-            }
-        } elseif (preg_match('#^([^/]*)//([^/?]*)(((/|\?).*$)|$)#i',$link, $matches)) {
-            $out = $IDN->convert(decodeHTML($matches[2], ENT_NOQUOTES)); // false by error
-            $out = $out ? $matches[1].'//'.htmlReady($out).$matches[3] : $link;
+        $out = $IDN->convert(decodeHTML($matches[2])); // false by error
+        if ($out) {
+            return $matches[1] . '//' . htmlReady($out) . ($matches[3] ?? '');
         }
-        return $out ?: $link;
     }
     return $link;
 }
diff --git a/tests/unit/lib/VisualTest.php b/tests/unit/lib/VisualTest.php
index c62cd05..ae9263f 100644
--- a/tests/unit/lib/VisualTest.php
+++ b/tests/unit/lib/VisualTest.php
@@ -21,6 +21,7 @@ class VisualFunctionsTest extends \Codeception\Test\Unit
         static $config = [
             'LOAD_EXTERNAL_MEDIA' => 'allow',
             'OPENGRAPH_ENABLE'    => false,
+            'CONVERT_IDNA_URL'    => true,
         ];
 
         Config::set(new Config($config));
@@ -224,6 +225,16 @@ class VisualFunctionsTest extends \Codeception\Test\Unit
         $this->assertEquals($expected, formatReady($input));
     }
 
+    public function testIdnaLink()
+    {
+        $input = htmlentities('https://www.täst-dömäne-mit-ümläuten.de');
+
+        $this->assertEquals(
+            'https://www.xn--tst-dmne-mit-mluten-gwbfj61b7e.de',
+            idna_link($input)
+        );
+    }
+
     private function wrap($string)
     {
         return sprintf(FORMATTED_CONTENT_WRAPPER, $string);
-- 
cgit v1.0


From 1379f7216578c25e0990f799aa48e141bbb522d5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 20:09:50 +0000
Subject: fixes #4168

Closes #4168

Merge request studip/studip!3006
---
 app/controllers/admin/datafields.php           | 10 ++++++----
 app/controllers/course/wizard.php              |  9 ++-------
 app/views/course/statusgroups/batch_action.php | 14 +++++++-------
 app/views/course/wizard/summary.php            | 11 ++++++++++-
 app/views/shared/modul/_modul.php              |  8 ++++----
 app/views/shared/modul/_modul_ohne_lv.php      | 14 +++++++-------
 6 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/app/controllers/admin/datafields.php b/app/controllers/admin/datafields.php
index bf390c9..6019a13 100644
--- a/app/controllers/admin/datafields.php
+++ b/app/controllers/admin/datafields.php
@@ -94,15 +94,17 @@ class Admin_DatafieldsController extends AuthenticatedController
 
         if (Request::submitted('uebernehmen')) {
             if (Request::get('datafield_name')) {
-                $datafield->name          = Request::i18n('datafield_name');
-                if ($datafield->object_type === 'moduldeskriptor'
-                        || $datafield->object_type === 'modulteildeskriptor') {
+                $datafield->name = Request::i18n('datafield_name');
+                if (
+                    $datafield->object_type === 'moduldeskriptor'
+                    || $datafield->object_type === 'modulteildeskriptor'
+                ) {
                     $object_class = implode(',', Request::getArray('object_class'));
                     $datafield->object_class  = (trim($object_class) && $object_class != 'NULL') ? $object_class : null;
                 } elseif ($datafield->object_type === 'studycourse') {
                     $datafield->object_class  = trim(Request::option('object_class', 'all_settings'));
                 } else {
-                    $datafield->object_class  = array_sum(Request::getArray('object_class')) ?: null;
+                    $datafield->object_class  = array_sum(Request::intArray('object_class')) ?: null;
                 }
                 $datafield->edit_perms     = Request::get('edit_perms');
                 $datafield->view_perms     = Request::get('visibility_perms');
diff --git a/app/controllers/course/wizard.php b/app/controllers/course/wizard.php
index b45f9e5..c1571ad 100644
--- a/app/controllers/course/wizard.php
+++ b/app/controllers/course/wizard.php
@@ -25,14 +25,9 @@ class Course_WizardController extends AuthenticatedController
     public function before_filter (&$action, &$args)
     {
         parent::before_filter($action, $args);
-        global $perm;
-        if (Request::isXhr()) {
-            $this->dialog = true;
-        }
-
-        $sidebar = Sidebar::get();
 
-        $this->studygroup = Request::int('studygroup') ?: $this->flash['studygroup'];
+        $this->dialog = Request::isXhr();
+        $this->studygroup = Request::bool('studygroup', $this->flash['studygroup'] ?? false);
 
         if (!$this->studygroup) {
             PageLayout::setTitle(_('Neue Veranstaltung anlegen'));
diff --git a/app/views/course/statusgroups/batch_action.php b/app/views/course/statusgroups/batch_action.php
index 10bec38..5600d3a 100644
--- a/app/views/course/statusgroups/batch_action.php
+++ b/app/views/course/statusgroups/batch_action.php
@@ -1,26 +1,26 @@
 <?php
-    if ($edit_size) {
+    if (!empty($edit_size)) {
         echo $this->render_partial('course/statusgroups/_edit_groups_size', compact('groups'));
-    } elseif ($edit_selfassign) {
+    } elseif (!empty($edit_selfassign)) {
         echo $this->render_partial('course/statusgroups/_edit_groups_selfassign', compact('groups'));
-    } elseif ($askdelete) {
+    } elseif (!empty($askdelete)) {
         echo $this->render_partial('course/statusgroups/_askdelete_groups', compact('groups'));
-    } elseif ($movemembers) {
+    } elseif (!empty($movemembers)) {
         echo $this->render_partial(
             'course/statusgroups/_move_members',
             compact('target_groups', 'members', 'source_group')
         );
-    } elseif ($copymembers) {
+    } elseif (!empty($copymembers)) {
         echo $this->render_partial(
             'course/statusgroups/_copy_members',
             compact('target_groups', 'members', 'source_group')
         );
-    } elseif ($deletemembers) {
+    } elseif (!empty($deletemembers)) {
         echo $this->render_partial(
             'course/statusgroups/_askdelete_members',
             compact('members', 'source_group')
         );
-    } elseif ($cancelmembers) {
+    } elseif (!empty($cancelmembers)) {
         echo $this->render_partial(
             'course/statusgroups/_askcancel_members',
             compact('members')
diff --git a/app/views/course/wizard/summary.php b/app/views/course/wizard/summary.php
index 5217bac..ec5a646 100644
--- a/app/views/course/wizard/summary.php
+++ b/app/views/course/wizard/summary.php
@@ -1,4 +1,13 @@
-<form class="default" action="<?= $controller->url_for('course/wizard/process', $stepnumber, $temp_id) ?>" method="post">
+<?php
+/**
+ * @var Course_WikiController $controller
+ * @var int $stepnumber
+ * @var string $temp_id
+ * @var bool $dialog
+ * @var Course|null $source_course
+ */
+?>
+<form class="default" action="<?= $controller->link_for('course/wizard/process', $stepnumber, $temp_id) ?>" method="post">
 <fieldset>
     <legend><?= _('Anlegen der Veranstaltung') ?></legend>
 
diff --git a/app/views/shared/modul/_modul.php b/app/views/shared/modul/_modul.php
index c813c44..461e486 100644
--- a/app/views/shared/modul/_modul.php
+++ b/app/views/shared/modul/_modul.php
@@ -46,7 +46,7 @@
             <td><strong><?= _('Semester der erstmaligen Durchführung') ?></strong></td>
             <td data-mvv-field="mvv_modul.start"><?= htmlReady($startSemester['name'] ?? '') ?></td>
         </tr>
-        <? if ($instituteName) : ?>
+        <? if (!empty($instituteName)) : ?>
         <tr>
             <td><strong><?= _('Fachbereich/Institut') ?></strong></td>
             <td data-mvv-field="mvv_modul_inst"><?= htmlReady($instituteName) ?></td>
@@ -135,7 +135,7 @@
             <td><strong><?= _('Modulinhalte') ?></strong></td>
             <td data-mvv-field="mvv_modul_deskriptor.inhalte"><?= formatReady($modulDeskriptor->inhalte) ?></td>
         </tr>
-        <? if ($type !== 3) : ?>
+        <? if (!isset($type) || $type !== 3) : ?>
         <tr>
             <td><strong><?= ngettext('Lehrveranstaltungsform', 'Lehrveranstaltungsformen', count($modul->modulteile)) ?></strong></td>
             <td data-mvv-field="mvv_modulteil_deskriptor.lernlehrform">
@@ -171,7 +171,7 @@
         </tr>
         <tr>
             <td><strong><?= _('Prüfungsebene') ?></strong></td>
-            <td data-mvv-field="mvv_modul.pruef_ebene"><?= htmlReady($pruefungsEbene) ?></td>
+            <td data-mvv-field="mvv_modul.pruef_ebene"><?= htmlReady($pruefungsEbene ?? '') ?></td>
         </tr>
         <tr>
             <td><strong><?= _('Credit-Points') ?></strong></td>
@@ -180,7 +180,7 @@
         <tr>
             <td><strong><?= _('Modulabschlussnote') ?></strong></td>
             <td>
-                <? if ($type !== 3) : ?>
+                <? if (!isset($type) || $type !== 3) : ?>
                     <? $nummer_modulteil = 1; ?>
                     <? $note = []; ?>
                     <? foreach ($modul->modulteile as $modulteil): ?>
diff --git a/app/views/shared/modul/_modul_ohne_lv.php b/app/views/shared/modul/_modul_ohne_lv.php
index 07e5310..f3c74ec 100644
--- a/app/views/shared/modul/_modul_ohne_lv.php
+++ b/app/views/shared/modul/_modul_ohne_lv.php
@@ -3,12 +3,12 @@
         <? $modulSumme =  $modul->wl_selbst + $modul->wl_pruef ?>
         <tr>
             <td style="width: 30%;"><strong><?= _('Workload selbstgestaltete Arbeit') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_selbst mvv_modul_deskriptor.kommentar_wl_selbst"><?= htmlReady($modul->wl_selbst) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_selbst) ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_selbst)) : '' ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_selbst mvv_modul_deskriptor.kommentar_wl_selbst"><?= htmlReady($modul->wl_selbst) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_selbst ?? '') ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_selbst)) : '' ?></td>
 
         </tr>
         <tr>
             <td style="width: 30%;"><strong><?= _('Workload Prüfung incl. Vorbereitung') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_pruef mvv_modul_deskriptor.kommentar_wl_pruef"><?= htmlReady($modul->wl_pruef) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_pruef) ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_pruef)) : '' ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_pruef mvv_modul_deskriptor.kommentar_wl_pruef"><?= htmlReady($modul->wl_pruef) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_pruef ?? '') ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_pruef)) : '' ?></td>
 
         </tr>
         <tr>
@@ -17,21 +17,21 @@
         </tr>
     </tbody>
 </table>
-<table class="mvv-modul-details" data-mvv-id="<?= $modulDeskriptor?$modulDeskriptor->getId():''; ?>" data-mvv-type="moduldeskriptor">
+<table class="mvv-modul-details" data-mvv-id="<?= isset($modulDeskriptor) ? $modulDeskriptor->getId() : ''; ?>" data-mvv-type="moduldeskriptor">
     <tbody>
-        <? if (trim($modulDeskriptor->pruef_vorleistung)) : ?>
+        <? if (trim($modulDeskriptor->pruef_vorleistung ?? '')) : ?>
         <tr>
             <td style="width: 30%;"><strong><?= _('Prüfungsvorleistung') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_vorleistung" ><?= formatReady($modulDeskriptor->pruef_vorleistung) ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_vorleistung" ><?= formatReady($modulDeskriptor->pruef_vorleistung ?? '') ?></td>
         </tr>
         <? endif; ?>
         <tr>
             <td style="width: 30%;"><strong><?= _('Prüfungsform') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_leistung"><?= formatReady($modulDeskriptor->pruef_leistung) ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_leistung"><?= formatReady($modulDeskriptor->pruef_leistung ?? '') ?></td>
         </tr>
         <tr>
             <td style="width: 30%;"><strong><?= _('Wiederholungsprüfung') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_wiederholung"><?= formatReady($modulDeskriptor->pruef_wiederholung) ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_wiederholung"><?= formatReady($modulDeskriptor->pruef_wiederholung ?? '') ?></td>
         </tr>
     </tbody>
 </table>
-- 
cgit v1.0


From 7934661383f805b658beb25c1cc9006fb25be4bd Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 20:13:22 +0000
Subject: update symfony/console to 6.4.7, fixes #4175

Closes #4175

Merge request studip/studip!3013
---
 composer.json |  2 +-
 composer.lock | 61 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/composer.json b/composer.json
index 0d346cf..35d1135 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
         "slim/psr7": "1.6.1",
         "slim/slim": "4.13.0",
         "php-di/php-di": "7.0.0",
-        "symfony/console": "^5.3.16",
+        "symfony/console": "6.4.7",
         "symfony/process": "^5.4",
         "jumbojett/openid-connect-php": "1.0.0",
         "league/oauth2-server": "8.5.4",
diff --git a/composer.lock b/composer.lock
index a181ed1..eab25e7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7f21be4fc85b3802bbef600b7cc4c538",
+    "content-hash": "a283983fa61709d51f067555c0f8aea8",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -3682,52 +3682,47 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.39",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1"
+                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f3e591c48688a0cfa1a3296205926c05e84b22b1",
-                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
+                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.1|^6.0"
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
             },
             "conflict": {
-                "psr/log": ">=3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0"
+                "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
-                "psr/log": "^1|^2",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
-                "symfony/lock": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -3761,7 +3756,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.39"
+                "source": "https://github.com/symfony/console/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -3777,7 +3772,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T08:26:06+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-- 
cgit v1.0


From a6f5d03ee02468013a5873011c8765bfbb40fe2f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 20:16:25 +0000
Subject: update symfony/process to 6.4.7, fixes #4176

Closes #4176

Merge request studip/studip!3014
---
 composer.json |  2 +-
 composer.lock | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 35d1135..f48cd95 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
         "slim/slim": "4.13.0",
         "php-di/php-di": "7.0.0",
         "symfony/console": "6.4.7",
-        "symfony/process": "^5.4",
+        "symfony/process": "6.4.7",
         "jumbojett/openid-connect-php": "1.0.0",
         "league/oauth2-server": "8.5.4",
         "willdurand/negotiation": "^3.1",
diff --git a/composer.lock b/composer.lock
index eab25e7..aa7c3f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a283983fa61709d51f067555c0f8aea8",
+    "content-hash": "0ad301d5d24df185fd5982cd805d4a98",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -4234,21 +4234,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.36",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975"
+                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4fdf34004f149cc20b2f51d7d119aa500caad975",
-                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975",
+                "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381",
+                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -4276,7 +4275,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.36"
+                "source": "https://github.com/symfony/process/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -4292,7 +4291,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-12T15:49:53+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/service-contracts",
-- 
cgit v1.0


From 556c02ba1b7f4918eb8b494f39dc96b926ba8442 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 20:19:29 +0000
Subject: update symfony/yaml to 6.4.7, fixes #4177

Closes #4177

Merge request studip/studip!3015
---
 composer.json |  2 +-
 composer.lock | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index f48cd95..b56c364 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "tuupola/cors-middleware": "^1.2.1",
         "tecnickcom/tcpdf": "6.7.5",
         "scssphp/scssphp": "1.12.1",
-        "symfony/yaml": "^5.0",
+        "symfony/yaml": "6.4.7",
         "ezyang/htmlpurifier": "^4.13",
         "jasig/phpcas": "1.5",
         "phpxmlrpc/phpxmlrpc": "^4.9.0",
diff --git a/composer.lock b/composer.lock
index aa7c3f8..fb3b192 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0ad301d5d24df185fd5982cd805d4a98",
+    "content-hash": "fca457dd82eba76b259880bcfbac376d",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -4549,31 +4549,28 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.39",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "bc780e16879000f77a1022163c052f5323b5e640"
+                "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/bc780e16879000f77a1022163c052f5323b5e640",
-                "reference": "bc780e16879000f77a1022163c052f5323b5e640",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0",
+                "reference": "53e8b1ef30a65f78eac60fddc5ee7ebbbdb1dee0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/console": "<5.3"
+                "symfony/console": "<5.4"
             },
             "require-dev": {
-                "symfony/console": "^5.3|^6.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
+                "symfony/console": "^5.4|^6.0|^7.0"
             },
             "bin": [
                 "Resources/bin/yaml-lint"
@@ -4604,7 +4601,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.39"
+                "source": "https://github.com/symfony/yaml/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -4620,7 +4617,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-23T11:57:27+00:00"
+            "time": "2024-04-28T10:28:08+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
-- 
cgit v1.0


From f9c634a9fe0fb5ac4c5a391fea813603631afc0f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 20:22:22 +0000
Subject: fixes #4139

Closes #4139

Merge request studip/studip!2981
---
 resources/assets/stylesheets/scss/tabs.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/assets/stylesheets/scss/tabs.scss b/resources/assets/stylesheets/scss/tabs.scss
index b37005e..63bf1a0 100644
--- a/resources/assets/stylesheets/scss/tabs.scss
+++ b/resources/assets/stylesheets/scss/tabs.scss
@@ -31,8 +31,6 @@ div.clear
     .quiet img { opacity: 0.25; }
 
     li {
-        background-color: var(--dark-gray-color-10);
-
         &:last-child {
             border-right: none;
         }
-- 
cgit v1.0


From 5b4b7f540bdaaba71557ffd528319025ebf028d2 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 20:50:29 +0000
Subject: fixes #4133

Closes #4133

Merge request studip/studip!2978
---
 app/controllers/activityfeed.php                   |  4 ++--
 app/controllers/admin/courses.php                  | 14 +++++++-------
 app/controllers/admin/extern.php                   |  2 +-
 app/controllers/admin/sem_classes.php              |  2 +-
 app/controllers/admin/user.php                     |  2 +-
 app/controllers/blubber.php                        |  2 +-
 app/controllers/contents/courseware.php            |  2 +-
 app/controllers/course/contentmodules.php          |  2 +-
 app/controllers/course/overview.php                |  2 +-
 app/controllers/course/wiki.php                    |  2 +-
 app/controllers/file.php                           | 10 +++++-----
 app/controllers/files.php                          |  6 +++---
 app/controllers/institute/basicdata.php            |  2 +-
 app/controllers/privacy.php                        |  2 +-
 app/controllers/profile.php                        |  2 +-
 app/controllers/profilemodules.php                 |  2 +-
 app/controllers/questionnaire.php                  |  2 +-
 app/controllers/quickselection.php                 |  2 +-
 app/controllers/start.php                          |  4 ++--
 app/views/course/details/index.php                 |  2 +-
 app/views/file/add_files_window.php                |  2 +-
 app/views/file/choose_destination.php              |  2 +-
 app/views/institute/overview/index.php             |  2 +-
 .../questionnaire/_overview_questionnaire.php      |  2 +-
 app/views/questionnaire/context.php                |  2 +-
 db/migrations/1.154_recalculate_score.php          |  2 +-
 db/migrations/1.314_step_00349.php                 |  4 ++--
 lib/archiv.inc.php                                 |  2 +-
 lib/classes/JsonApi/RouteMap.php                   |  4 ++--
 lib/classes/Metrics.php                            |  2 +-
 lib/classes/MyRealmModel.php                       |  2 +-
 lib/classes/Privacy.php                            |  2 +-
 lib/classes/Score.class.php                        |  2 +-
 lib/classes/Seminar.class.php                      |  2 +-
 lib/classes/Siteinfo.php                           |  4 ++--
 lib/classes/StudipKing.class.php                   |  2 +-
 lib/classes/UserManagement.class.php               |  2 +-
 lib/classes/Visibility.php                         |  2 +-
 lib/classes/WidgetHelper.php                       |  2 +-
 lib/extern/ExternPage.php                          |  2 +-
 lib/extern/ExternPagePersonDetails.php             |  2 +-
 lib/filesystem/LibraryFile.class.php               |  2 +-
 lib/models/BlubberThread.php                       |  2 +-
 lib/models/Questionnaire.php                       |  4 ++--
 lib/models/User.class.php                          |  2 +-
 lib/navigation/AdminNavigation.php                 |  2 +-
 lib/navigation/ContentsNavigation.php              |  2 +-
 lib/navigation/ProfileNavigation.php               |  2 +-
 lib/navigation/StartNavigation.php                 |  2 +-
 lib/plugins/engine/PluginEngine.class.php          | 21 ++++++++++-----------
 lib/plugins/engine/PluginManager.class.php         | 22 ++++++++++------------
 public/api.php                                     |  2 +-
 52 files changed, 88 insertions(+), 91 deletions(-)

diff --git a/app/controllers/activityfeed.php b/app/controllers/activityfeed.php
index 2f93aa1..8e81912 100644
--- a/app/controllers/activityfeed.php
+++ b/app/controllers/activityfeed.php
@@ -53,7 +53,7 @@ class ActivityfeedController extends AuthenticatedController
         unset($modules[Context::INSTITUTE]['participants']);
         unset($modules[Context::INSTITUTE]['schedule']);
 
-        $standard_plugins = PluginManager::getInstance()->getPlugins("StandardPlugin");
+        $standard_plugins = PluginManager::getInstance()->getPlugins(StandardPlugin::class);
         foreach ($standard_plugins as $plugin) {
             if ($plugin instanceof ActivityProvider) {
                 $modules[Context::COURSE][$plugin->getPluginName()] = $plugin->getPluginName();
@@ -67,7 +67,7 @@ class ActivityfeedController extends AuthenticatedController
             'blubber'      => _('Blubber'),
         ];
 
-        $homepage_plugins = PluginEngine::getPlugins('HomepagePlugin');
+        $homepage_plugins = PluginEngine::getPlugins(HomepagePlugin::class);
         foreach ($homepage_plugins as $plugin) {
             if ($plugin->isActivated($GLOBALS['user']->id, 'user')) {
                 if ($plugin instanceof ActivityProvider) {
diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 8de1b79..82c389b 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -490,7 +490,7 @@ class Admin_CoursesController extends AuthenticatedController
                     ]);
                 break;
             default:
-                foreach (PluginManager::getInstance()->getPlugins('AdminCourseAction') as $plugin) {
+                foreach (PluginManager::getInstance()->getPlugins(AdminCourseAction::class) as $plugin) {
                     if ($GLOBALS['user']->cfg->MY_COURSES_ACTION_AREA === get_class($plugin)) {
                         $multimode = $plugin->useMultimode();
                         if ($multimode) {
@@ -711,7 +711,7 @@ class Admin_CoursesController extends AuthenticatedController
             $d['last_activity_raw'] = $last_activity;
         }
 
-        foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(AdminCourseContents::class) as $plugin) {
             foreach ($plugin->adminAvailableContents() as $index => $label) {
                 if (in_array($plugin->getPluginId() . '_' . $index, $activated_fields)) {
                     $content = $plugin->adminAreaGetCourseContent($course, $index);
@@ -837,7 +837,7 @@ class Admin_CoursesController extends AuthenticatedController
                 $d['action'] = $template->render();
                 break;
             default:
-                foreach (PluginManager::getInstance()->getPlugins('AdminCourseAction') as $plugin) {
+                foreach (PluginManager::getInstance()->getPlugins(AdminCourseAction::class) as $plugin) {
                     if ($GLOBALS['user']->cfg->MY_COURSES_ACTION_AREA === get_class($plugin)) {
                         $output = $plugin->getAdminCourseActionTemplate($course->getId());
                         $d['action'] = $output instanceof Flexi_Template ? $output->render() : (string) $output;
@@ -1029,7 +1029,7 @@ class Admin_CoursesController extends AuthenticatedController
                     $row['institute'] = $course->home_institut ? (string) $course->home_institut['name'] : $course['institut_id'];
                 }
 
-                foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
+                foreach (PluginManager::getInstance()->getPlugins(AdminCourseContents::class) as $plugin) {
                     foreach ($plugin->adminAvailableContents() as $index => $label) {
                         if (in_array($plugin->getPluginId() . "_" . $index, $filter_config)) {
                             $content = $plugin->adminAreaGetCourseContent($course, $index);
@@ -1048,7 +1048,7 @@ class Admin_CoursesController extends AuthenticatedController
             foreach ($filter_config as $index) {
                 $captions[$index] = $view_filters[$index];
             }
-            foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
+            foreach (PluginManager::getInstance()->getPlugins(AdminCourseContents::class) as $plugin) {
                 foreach ($plugin->adminAvailableContents() as $index => $label) {
                     if (in_array($plugin->getPluginId() . "_" . $index, $filter_config)) {
                         $captions[$plugin->getPluginId() . "_" . $index] = $label;
@@ -1446,7 +1446,7 @@ class Admin_CoursesController extends AuthenticatedController
 
         ksort($actions);
 
-        foreach (PluginManager::getInstance()->getPlugins('AdminCourseAction') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(AdminCourseAction::class) as $plugin) {
             $actions[get_class($plugin)] = [
                 'name'      => $plugin->getPluginName(),
                 'title'     => $plugin->getPluginName(),
@@ -1486,7 +1486,7 @@ class Admin_CoursesController extends AuthenticatedController
             'contents'      => _('Inhalt'),
             'last_activity' => _('Letzte Aktivität'),
         ];
-        foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(AdminCourseContents::class) as $plugin) {
             foreach ($plugin->adminAvailableContents() as $index => $label) {
                 $views[$plugin->getPluginId() . "_" . $index] = $label;
             }
diff --git a/app/controllers/admin/extern.php b/app/controllers/admin/extern.php
index 559868e..732b586 100644
--- a/app/controllers/admin/extern.php
+++ b/app/controllers/admin/extern.php
@@ -440,7 +440,7 @@ class Admin_ExternController extends AuthenticatedController
      */
     protected function fetchPlugins(bool $is_system): void
     {
-        $plugins = PluginEngine::getPlugins('ExternPagePlugin');
+        $plugins = PluginEngine::getPlugins(ExternPagePlugin::class);
         foreach ($plugins as $plugin) {
             if (
                 $is_system === $plugin->isSystemPage()
diff --git a/app/controllers/admin/sem_classes.php b/app/controllers/admin/sem_classes.php
index c0b098f..7993c4b 100644
--- a/app/controllers/admin/sem_classes.php
+++ b/app/controllers/admin/sem_classes.php
@@ -65,7 +65,7 @@ class Admin_SemClassesController extends AuthenticatedController
     {
         Navigation::activateItem("/admin/locations/sem_classes");
 
-        $plugins = PluginManager::getInstance()->getPlugins("StudipModule");
+        $plugins = PluginManager::getInstance()->getPlugins(StudipModule::class);
         $this->sem_class = SemClass::getClasses()[Request::get("id")];
         $modules = [];
         foreach ($this->sem_class->getModuleObjects() as $plugin) {
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index 214c290..54aa0c4 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1474,7 +1474,7 @@ class Admin_UserController extends AuthenticatedController
             'details' => "files",
         ];
 
-        foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
             $table     = $plugin->getEntryTableInfo();
             $queries[] = [
                 'desc'  => $plugin->getPluginName() . ' - ' . _("Anzahl der Postings"),
diff --git a/app/controllers/blubber.php b/app/controllers/blubber.php
index 6588014..aedf9b6 100644
--- a/app/controllers/blubber.php
+++ b/app/controllers/blubber.php
@@ -419,7 +419,7 @@ class BlubberController extends AuthenticatedController
 
             PluginManager::getInstance()->setPluginActivated(
                 PluginManager::getInstance()
-                    ->getPlugin('Blubber')
+                    ->getPlugin(Blubber::class)
                     ->getPluginId(),
                 $course->getId(),
                 true
diff --git a/app/controllers/contents/courseware.php b/app/controllers/contents/courseware.php
index f0d5023..c1d807f 100644
--- a/app/controllers/contents/courseware.php
+++ b/app/controllers/contents/courseware.php
@@ -262,7 +262,7 @@ class Contents_CoursewareController extends CoursewareController
      */
     private function isCoursewareEnabled($course_id): bool
     {
-        $studip_module = PluginManager::getInstance()->getPlugin('CoursewareModule');
+        $studip_module = PluginManager::getInstance()->getPlugin(CoursewareModule::class);
 
         if (!$studip_module || !$studip_module->isActivated($course_id)) {
             return false;
diff --git a/app/controllers/course/contentmodules.php b/app/controllers/course/contentmodules.php
index df397cd..d37d1bb 100644
--- a/app/controllers/course/contentmodules.php
+++ b/app/controllers/course/contentmodules.php
@@ -273,7 +273,7 @@ class Course_ContentmodulesController extends AuthenticatedController
     {
         $list = [];
 
-        foreach (PluginEngine::getPlugins('StudipModule') as $plugin) {
+        foreach (PluginEngine::getPlugins(StudipModule::class) as $plugin) {
             if (!$plugin->isActivatableForContext($context)) {
                 continue;
             }
diff --git a/app/controllers/course/overview.php b/app/controllers/course/overview.php
index 402137e..876de5a 100644
--- a/app/controllers/course/overview.php
+++ b/app/controllers/course/overview.php
@@ -111,7 +111,7 @@ class Course_OverviewController extends AuthenticatedController
             $this->avatar   = StudygroupAvatar::getAvatar($this->course_id);
         }
 
-        $this->plugins = PluginEngine::getPlugins('StandardPlugin', $this->course_id);
+        $this->plugins = PluginEngine::getPlugins(StandardPlugin::class, $this->course_id);
 
         $sidebar = Sidebar::get();
 
diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index cbd63cf..0bb6c71 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -18,7 +18,7 @@ class Course_WikiController extends AuthenticatedController
         parent::before_filter($action, $args);
         object_set_visit_module('wiki');
         $this->range = Context::get();
-        $this->plugin = PluginManager::getInstance()->getPlugin('CoreWiki');
+        $this->plugin = PluginManager::getInstance()->getPlugin(CoreWiki::class);
 
         PageLayout::setTitle(Navigation::getItem('/course/wiki')->getTitle());
     }
diff --git a/app/controllers/file.php b/app/controllers/file.php
index bebfe70..11b1949 100644
--- a/app/controllers/file.php
+++ b/app/controllers/file.php
@@ -1103,7 +1103,7 @@ class FileController extends AuthenticatedController
                     return;
                 }
 
-                $this->library_plugins = $plugin_manager->getPlugins('LibraryPlugin');
+                $this->library_plugins = $plugin_manager->getPlugins(LibraryPlugin::class);
 
                 //Build the query parameter array:
                 $search_parameters = [];
@@ -1182,7 +1182,7 @@ class FileController extends AuthenticatedController
                 );
             }
         } elseif (Request::get('search_id')) {
-            $this->library_plugins = $plugin_manager->getPlugins('LibraryPlugin');
+            $this->library_plugins = $plugin_manager->getPlugins(LibraryPlugin::class);
 
             $this->search_id = Request::get('search_id');
             $this->page = Request::get('page');
@@ -1462,7 +1462,7 @@ class FileController extends AuthenticatedController
                 $this->current_folder = $this->to_folder_type;
                 $this->marked_element_ids = [];
 
-                $plugins = PluginManager::getInstance()->getPlugins('FileUploadHook');
+                $plugins = PluginManager::getInstance()->getPlugins(FileUploadHook::class);
 
                 $redirects = [];
                 foreach ($plugins as $plugin) {
@@ -1685,7 +1685,7 @@ class FileController extends AuthenticatedController
                         );
                     }
 
-                    $plugins = PluginManager::getInstance()->getPlugins('FileUploadHook');
+                    $plugins = PluginManager::getInstance()->getPlugins(FileUploadHook::class);
                     $redirect = null;
                     foreach ($plugins as $upload_hook_plugin) {
                         $url = $upload_hook_plugin->getAdditionalUploadWizardPage($file_ref);
@@ -1820,7 +1820,7 @@ class FileController extends AuthenticatedController
 
                     $payload['html'][] = FilesystemVueDataManager::getFileVueData($this->file, $this->top_folder);
 
-                    $plugins = PluginManager::getInstance()->getPlugins('FileUploadHook');
+                    $plugins = PluginManager::getInstance()->getPlugins(FileUploadHook::class);
 
                     $redirects = [];
                     foreach ($plugins as $plugin) {
diff --git a/app/controllers/files.php b/app/controllers/files.php
index 3c77f4e..2d4de4e 100644
--- a/app/controllers/files.php
+++ b/app/controllers/files.php
@@ -68,7 +68,7 @@ class FilesController extends AuthenticatedController
             $this->url_for("files/index"),
             Icon::create("files", "clickable")
         );
-        foreach (PluginManager::getInstance()->getPlugins('FilesystemPlugin') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(FilesystemPlugin::class) as $plugin) {
             if ($plugin->isPersonalFileArea()) {
                 $subnav = $plugin->getFileSelectNavigation();
                 $sources->addLink(
@@ -110,7 +110,7 @@ class FilesController extends AuthenticatedController
         }
 
         $config_urls = [];
-        foreach (PluginManager::getInstance()->getPlugins('FilesystemPlugin') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(FilesystemPlugin::class) as $plugin) {
             $url = $plugin->filesystemConfigurationURL();
             if ($url) {
                 $navigation = $plugin->getFileSelectNavigation();
@@ -647,7 +647,7 @@ class FilesController extends AuthenticatedController
         PageLayout::setTitle(_('Dateibereich zur Konfiguration auswählen'));
 
         $this->configure_urls = [];
-        foreach (PluginManager::getInstance()->getPlugins('FilesystemPlugin') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(FilesystemPlugin::class) as $plugin) {
             $url = $plugin->filesystemConfigurationURL();
             if ($url) {
                 $navigation = $plugin->getFileSelectNavigation();
diff --git a/app/controllers/institute/basicdata.php b/app/controllers/institute/basicdata.php
index fb1ce96..9c800fd 100644
--- a/app/controllers/institute/basicdata.php
+++ b/app/controllers/institute/basicdata.php
@@ -435,7 +435,7 @@ class Institute_BasicdataController extends AuthenticatedController
             }
 
             // delete all contents in forum-modules
-            foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+            foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
                 $plugin->deleteContents($i_id);  // delete content irrespective of plugin-activation in the seminar
                 if ($plugin->isActivated($i_id)) {   // only show a message, if the plugin is activated, to not confuse the user
                     $details[] = sprintf(_('Einträge in %s gelöscht.'), $plugin->getPluginName());
diff --git a/app/controllers/privacy.php b/app/controllers/privacy.php
index ba8e6f1..d50b1f1 100644
--- a/app/controllers/privacy.php
+++ b/app/controllers/privacy.php
@@ -305,7 +305,7 @@ class PrivacyController extends AuthenticatedController
             $storage->addFileRef($fileref);
         }
 
-        foreach (PluginEngine::getPlugins('PrivacyPlugin') as $plugin) {
+        foreach (PluginEngine::getPlugins(PrivacyPlugin::class) as $plugin) {
             $plugin->exportUserData($storage);
         }
 
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 3fa3777..b9a7cf7 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -210,7 +210,7 @@ class ProfileController extends AuthenticatedController
         }
 
         // Hompageplugins
-        $homepageplugins = PluginEngine::getPlugins('HomepagePlugin');
+        $homepageplugins = PluginEngine::getPlugins(HomepagePlugin::class);
 
         $render = '';
         $layout = $GLOBALS['template_factory']->open('shared/content_box');
diff --git a/app/controllers/profilemodules.php b/app/controllers/profilemodules.php
index 201c4ff..c24d4f4 100644
--- a/app/controllers/profilemodules.php
+++ b/app/controllers/profilemodules.php
@@ -106,7 +106,7 @@ class ProfileModulesController extends AuthenticatedController
         $plugins = [];
 
         // Get homepage plugins from database.
-        foreach (PluginEngine::getPlugins('HomepagePlugin') as $plugin) {
+        foreach (PluginEngine::getPlugins(HomepagePlugin::class) as $plugin) {
             if ($plugin->isActivatableForContext($this->user)) {
                 $plugins[$plugin->getPluginId()] = $plugin;
             }
diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index 6f80526..4016b9d 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -493,7 +493,7 @@ class QuestionnaireController extends AuthenticatedController
                 $course_assignment['user_id'] = $GLOBALS['user']->id;
                 $course_assignment->store();
             }
-            foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+            foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
                 $plugin->storeQuestionnaireAssignments($this->questionnaire);
             }
 
diff --git a/app/controllers/quickselection.php b/app/controllers/quickselection.php
index 1899e53..a53eb08 100644
--- a/app/controllers/quickselection.php
+++ b/app/controllers/quickselection.php
@@ -27,7 +27,7 @@ class QuickselectionController extends AuthenticatedController
 
         UserConfig::get($GLOBALS['user']->id)->store('QUICK_SELECTION', $names);
 
-        $template = PluginEngine::getPlugin('QuickSelection')->getPortalTemplate();
+        $template = PluginEngine::getPlugin(QuickSelection::class)->getPortalTemplate();
 
         $this->response->add_header('X-Dialog-Close', 1);
         $this->response->add_header('X-Dialog-Execute', 'STUDIP.QuickSelection.update');
diff --git a/app/controllers/start.php b/app/controllers/start.php
index 53a87dc..87c493e 100644
--- a/app/controllers/start.php
+++ b/app/controllers/start.php
@@ -132,7 +132,7 @@ class StartController extends AuthenticatedController
      */
     private function getAvailableWidgets($user_id)
     {
-        $all_widgets = PluginEngine::getPlugins('PortalPlugin');
+        $all_widgets = PluginEngine::getPlugins(PortalPlugin::class);
         $user_widgets = WidgetUser::getWidgets($user_id);
         $used_widgets = array_merge(...$user_widgets);
         $available = [];
@@ -190,7 +190,7 @@ class StartController extends AuthenticatedController
 
         PageLayout::setTitle(sprintf(_('Standard-Startseite für "%s" bearbeiten'), ucfirst($permission)));
 
-        $this->widgets = PluginEngine::getPlugins('PortalPlugin');
+        $this->widgets = PluginEngine::getPlugins(PortalPlugin::class);
         $this->initial_widgets = WidgetDefault::getWidgets($permission);
         $this->permission = $permission;
     }
diff --git a/app/views/course/details/index.php b/app/views/course/details/index.php
index eb7da10..545454a 100644
--- a/app/views/course/details/index.php
+++ b/app/views/course/details/index.php
@@ -496,7 +496,7 @@ if (!empty($mvv_tree)) : ?>
     </article>
 <? endif ?>
 
-<? foreach (PluginManager::getInstance()->getPlugins('DetailspagePlugin') as $plugin) : ?>
+<? foreach (PluginManager::getInstance()->getPlugins(DetailspagePlugin::class) as $plugin) : ?>
     <? $template = $plugin->getDetailspageTemplate($course) ?>
     <? if ($template) : ?>
         <article class="studip">
diff --git a/app/views/file/add_files_window.php b/app/views/file/add_files_window.php
index 53a7b73..c7630c5 100644
--- a/app/views/file/add_files_window.php
+++ b/app/views/file/add_files_window.php
@@ -69,7 +69,7 @@ if ($folder_id) {
                     <?= _('OER Campus') ?>
                 </a>
             <? endif ?>
-            <? foreach (PluginManager::getInstance()->getPlugins('FilesystemPlugin') as $plugin) : ?>
+            <? foreach (PluginManager::getInstance()->getPlugins(FilesystemPlugin::class) as $plugin) : ?>
                 <? if ($plugin->isSource()) : ?>
                     <? $nav = $plugin->getFileSelectNavigation() ?>
                     <? if ($nav): ?>
diff --git a/app/views/file/choose_destination.php b/app/views/file/choose_destination.php
index 49afe87..9a39883 100644
--- a/app/views/file/choose_destination.php
+++ b/app/views/file/choose_destination.php
@@ -64,7 +64,7 @@ $options = array_filter([
                 </button>
             </div>
 
-        <? foreach (PluginManager::getInstance()->getPlugins('FilesystemPlugin') as $plugin) : ?>
+        <? foreach (PluginManager::getInstance()->getPlugins(FilesystemPlugin::class) as $plugin) : ?>
             <? if ($plugin->isPersonalFileArea()) : ?>
                 <? $nav = $plugin->getFileSelectNavigation() ?>
                 <? if ($nav) : ?>
diff --git a/app/views/institute/overview/index.php b/app/views/institute/overview/index.php
index 3e80f98..7ed8546 100644
--- a/app/views/institute/overview/index.php
+++ b/app/views/institute/overview/index.php
@@ -54,7 +54,7 @@
 
 <?
 // display plugins
-$plugins = PluginEngine::getPlugins('StandardPlugin', $institute_id);
+$plugins = PluginEngine::getPlugins(StandardPlugin::class, $institute_id);
 $layout = $GLOBALS['template_factory']->open('shared/index_box');
 
 foreach ($plugins as $plugin) {
diff --git a/app/views/questionnaire/_overview_questionnaire.php b/app/views/questionnaire/_overview_questionnaire.php
index bb7586e..8b45d42 100644
--- a/app/views/questionnaire/_overview_questionnaire.php
+++ b/app/views/questionnaire/_overview_questionnaire.php
@@ -51,7 +51,7 @@
                 <?= htmlReady(Institute::find($assignment['range_id'])->name) ?>
             <? else : ?>
                 <?
-                foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+                foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
                     $name = $plugin->getQuestionnaireAssignmentName($assignment);
                     if ($name) {
                         echo htmlReady($name);
diff --git a/app/views/questionnaire/context.php b/app/views/questionnaire/context.php
index 3237101..98e08c0 100644
--- a/app/views/questionnaire/context.php
+++ b/app/views/questionnaire/context.php
@@ -93,7 +93,7 @@
         <? endif ?>
 
         <?
-        foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
             $template = $plugin->getQuestionnaireAssignmentEditTemplate($this->questionnaire);
             if ($template) {
                 echo $template->render();
diff --git a/db/migrations/1.154_recalculate_score.php b/db/migrations/1.154_recalculate_score.php
index 5568363..9391e7d 100644
--- a/db/migrations/1.154_recalculate_score.php
+++ b/db/migrations/1.154_recalculate_score.php
@@ -130,7 +130,7 @@ class RecalculateScore extends Migration {
             'date_column' => "chdate"
         ];
 
-        foreach (PluginManager::getInstance()->getPlugins("ScorePlugin") as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(ScorePlugin::class) as $plugin) {
             foreach ((array) $plugin->getPluginActivityTables() as $table) {
                 if ($table['table']) {
                     $tables[] = $table;
diff --git a/db/migrations/1.314_step_00349.php b/db/migrations/1.314_step_00349.php
index a777cc2..a1094d8 100644
--- a/db/migrations/1.314_step_00349.php
+++ b/db/migrations/1.314_step_00349.php
@@ -98,8 +98,8 @@ class Step00349 extends Migration
             'participants' => 'CoreParticipants',
             'courseware' => 'CoursewareModule'
         ];
-        PluginManager::getInstance()->getPlugin('CoreForum');
-        PluginManager::getInstance()->getPlugin('Blubber');
+        PluginManager::getInstance()->getPlugin(CoreForum::class);
+        PluginManager::getInstance()->getPlugin(Blubber::class);
 
         foreach ($core_plugins as $plugin) {
             try {
diff --git a/lib/archiv.inc.php b/lib/archiv.inc.php
index 8fe4bc9..e40685f 100644
--- a/lib/archiv.inc.php
+++ b/lib/archiv.inc.php
@@ -64,7 +64,7 @@ function lastActivity ($sem_id)
                           WHERE `range_id` = :id";
         }
 
-        foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
             $table = $plugin->getEntryTableInfo();
             $queries[] = 'SELECT MAX(`'. $table['chdate'] .'`) AS chdate FROM `'. $table['table'] .'` WHERE `'. $table['seminar_id'] .'` = :id';
         }
diff --git a/lib/classes/JsonApi/RouteMap.php b/lib/classes/JsonApi/RouteMap.php
index 4f44165..d81bbbf 100644
--- a/lib/classes/JsonApi/RouteMap.php
+++ b/lib/classes/JsonApi/RouteMap.php
@@ -122,7 +122,7 @@ class RouteMap
         $this->addAuthenticatedContactsRoutes($group);
         $this->addAuthenticatedCoursesRoutes($group);
 
-        if (\PluginManager::getInstance()->getPlugin('CoursewareModule')) {
+        if (\PluginManager::getInstance()->getPlugin(\CoursewareModule::class)) {
             $this->addAuthenticatedCoursewareRoutes($group);
         }
 
@@ -155,7 +155,7 @@ class RouteMap
 
         $group->get('/studip/properties', Routes\Studip\PropertiesIndex::class);
 
-        if (\PluginManager::getInstance()->getPlugin('CoursewareModule')) {
+        if (\PluginManager::getInstance()->getPlugin(\CoursewareModule::class)) {
             $group->get('/public/courseware/{link_id}/courseware-structural-elements/{id}', Routes\Courseware\PublicStructuralElementsShow::class);
             $group->get('/public/courseware/{link_id}/courseware-structural-elements', Routes\Courseware\PublicStructuralElementsIndex::class);
         }
diff --git a/lib/classes/Metrics.php b/lib/classes/Metrics.php
index c3874d5..e6a2925 100644
--- a/lib/classes/Metrics.php
+++ b/lib/classes/Metrics.php
@@ -191,7 +191,7 @@ class Metrics {
 
         // cache the activated MetricsPlugins
         if (!self::$metricPlugins) {
-            self::$metricPlugins = \PluginEngine::getPlugins('MetricsPlugin');
+            self::$metricPlugins = \PluginEngine::getPlugins(MetricsPlugin::class);
         }
 
         // call every MetricPlugin
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index ab9aa20..8997e78 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -475,7 +475,7 @@ class MyRealmModel
     public static function setObjectVisits($object, $user_id, $timestamp = null)
     {
         // load plugins, so they have a chance to register themselves as observers
-        PluginEngine::getPlugins('StandardPlugin');
+        PluginEngine::getPlugins(StandardPlugin::class);
 
         // Update news and votes
         $query = "INSERT INTO object_user_visits
diff --git a/lib/classes/Privacy.php b/lib/classes/Privacy.php
index 0ba296a..b38838c 100644
--- a/lib/classes/Privacy.php
+++ b/lib/classes/Privacy.php
@@ -114,7 +114,7 @@ class Privacy
         }
 
         if (!$section || $section === 'plugins') {
-            foreach (PluginEngine::getPlugins('PrivacyPlugin') as $plugin) {
+            foreach (PluginEngine::getPlugins(PrivacyPlugin::class) as $plugin) {
                 $plugin->exportUserData($storage);
             }
         }
diff --git a/lib/classes/Score.class.php b/lib/classes/Score.class.php
index f7d8ea3..4d114d5 100644
--- a/lib/classes/Score.class.php
+++ b/lib/classes/Score.class.php
@@ -212,7 +212,7 @@ class Score
             'date_column' => 'chdate'
         ];
 
-        foreach (PluginManager::getInstance()->getPlugins('ScorePlugin') as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(ScorePlugin::class) as $plugin) {
             foreach ((array) $plugin->getPluginActivityTables() as $table) {
                 if ($table['table']) {
                     $tables[] = $table;
diff --git a/lib/classes/Seminar.class.php b/lib/classes/Seminar.class.php
index dda25ee..8aa3d41 100644
--- a/lib/classes/Seminar.class.php
+++ b/lib/classes/Seminar.class.php
@@ -1565,7 +1565,7 @@ class Seminar
         SeminarCycleDate::deleteBySQL('seminar_id = ' . DBManager::get()->quote($s_id));
 
         // Alle weiteren Postings zu diesem Seminar in den Forums-Modulen löschen
-        foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
             $plugin->deleteContents($s_id);  // delete content irrespective of plugin-activation in the seminar
 
             if ($plugin->isActivated($s_id)) {   // only show a message, if the plugin is activated, to not confuse the user
diff --git a/lib/classes/Siteinfo.php b/lib/classes/Siteinfo.php
index 9043ce3..0d849ca 100644
--- a/lib/classes/Siteinfo.php
+++ b/lib/classes/Siteinfo.php
@@ -480,7 +480,7 @@ class SiteinfoMarkupEngine {
                 // get TopTen of seminars from all ForumModules and add up the
                 // count for seminars with more than one active ForumModule
                 // to get a combined toplist
-                foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+                foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
                     $new_seminars = $plugin->getTopTenSeminars();
                     foreach ($new_seminars as $sem) {
                         if (!isset($seminars[$sem['seminar_id']])) {
@@ -589,7 +589,7 @@ class SiteinfoMarkupEngine {
             $count = 0;
 
             // sum up number of postings for all availabe ForumModules
-            foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+            foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
                 $count += $plugin->getNumberOfPostings();
             }
 
diff --git a/lib/classes/StudipKing.class.php b/lib/classes/StudipKing.class.php
index 3a61c57..ae5a14e 100644
--- a/lib/classes/StudipKing.class.php
+++ b/lib/classes/StudipKing.class.php
@@ -118,7 +118,7 @@ class StudipKing {
         $kings = [];
 
         // sum up postings for all users from all ForumModules available
-        foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
             $table = $plugin->getEntryTableInfo();
             $query = "SELECT user_id AS id, COUNT(*) AS num FROM ". $table['table'] ." GROUP BY user_id";
             $new_kings = self::select_kings($query);
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php
index 7805594..015e6cd 100644
--- a/lib/classes/UserManagement.class.php
+++ b/lib/classes/UserManagement.class.php
@@ -898,7 +898,7 @@ class UserManagement
 
         // Load privacy plugins to ensure all event handlers can react to the
         // UserDataDidRemove event
-        PluginEngine::getPlugins('PrivacyPlugin');
+        PluginEngine::getPlugins(PrivacyPlugin::class);
 
         // delete user from instituts
         $this->logInstUserDel($this->user_data['auth_user_md5.user_id']);
diff --git a/lib/classes/Visibility.php b/lib/classes/Visibility.php
index 1b87230..99b3907 100644
--- a/lib/classes/Visibility.php
+++ b/lib/classes/Visibility.php
@@ -614,7 +614,7 @@ class Visibility
     private function createHomepagePluginEntries($user)
     {
         self::getUser($user);
-        $homepageplugins = PluginEngine::getPlugins('HomepagePlugin');
+        $homepageplugins = PluginEngine::getPlugins(HomepagePlugin::class);
         foreach ($homepageplugins as $plugin) {
             self::addPrivacySetting($plugin->getPluginName(), ("plugin".$plugin->getPluginId()), 'plugins', 1, $user, null, $plugin->getPluginId());
         }
diff --git a/lib/classes/WidgetHelper.php b/lib/classes/WidgetHelper.php
index ba82ee9..ff4d7a6 100644
--- a/lib/classes/WidgetHelper.php
+++ b/lib/classes/WidgetHelper.php
@@ -348,7 +348,7 @@ class WidgetHelper
      */
     public static function getAvailableWidgets($user_id = null)
     {
-        $all_widgets = PluginEngine::getPlugins('PortalPlugin');
+        $all_widgets = PluginEngine::getPlugins(PortalPlugin::class);
 
         $used_widgets = is_null($user_id)
                 ? []
diff --git a/lib/extern/ExternPage.php b/lib/extern/ExternPage.php
index 308caeb..d3c5ec2 100644
--- a/lib/extern/ExternPage.php
+++ b/lib/extern/ExternPage.php
@@ -110,7 +110,7 @@ abstract class ExternPage
         $page_name = 'ExternPage' . $config->type;
         if (!class_exists($page_name)) {
             // lookup plugins
-            $plugins = PluginEngine::getPlugins('ExternPagePlugin');
+            $plugins = PluginEngine::getPlugins(ExternPagePlugin::class);
             foreach ($plugins as $plugin) {
                 if ($config->type === $plugin->getExternPageName()) {
                     return $plugin->getExternPage($config);
diff --git a/lib/extern/ExternPagePersonDetails.php b/lib/extern/ExternPagePersonDetails.php
index 49c754c..8fb6540 100644
--- a/lib/extern/ExternPagePersonDetails.php
+++ b/lib/extern/ExternPagePersonDetails.php
@@ -439,7 +439,7 @@ class ExternPagePersonDetails extends ExternPage
     private function getContentHomepagePlugins(User $user)
     {
         $content = [];
-        $plugins = PluginEngine::getPlugins('HomepagePlugin');
+        $plugins = PluginEngine::getPlugins(HomepagePlugin::class);
         foreach ($plugins as $plugin) {
             $template = $plugin->getHomepageTemplate($user->id);
             if ($template) {
diff --git a/lib/filesystem/LibraryFile.class.php b/lib/filesystem/LibraryFile.class.php
index 0c2bcb6..c9524e3 100644
--- a/lib/filesystem/LibraryFile.class.php
+++ b/lib/filesystem/LibraryFile.class.php
@@ -212,7 +212,7 @@ class LibraryFile extends StandardFile
         );
         if (Config::get()->LITERATURE_ENABLE && Context::get() && $GLOBALS['perm']->have_studip_perm('tutor', Context::getId())) {
             $plugin_manager = PluginManager::getInstance();
-            $library_plugins = $plugin_manager->getPlugins('LibraryPlugin');
+            $library_plugins = $plugin_manager->getPlugins(LibraryPlugin::class);
             if (count($library_plugins)) {
                 $plugin = $library_plugins[0];
                 $action_menu->addLink(
diff --git a/lib/models/BlubberThread.php b/lib/models/BlubberThread.php
index aa6016f..590a600 100644
--- a/lib/models/BlubberThread.php
+++ b/lib/models/BlubberThread.php
@@ -1081,7 +1081,7 @@ class BlubberThread extends SimpleORMap implements PrivacyObject
                   FROM user_inst
                   WHERE user_id = ?";
         $institut_ids = DBManager::get()->fetchFirst($query, [$user_id]);
-        $blubberplugin = PluginManager::getInstance()->getPlugin("Blubber");
+        $blubberplugin = PluginManager::getInstance()->getPlugin(Blubber::class);
         if (!$blubberplugin) {
             return [];
         }
diff --git a/lib/models/Questionnaire.php b/lib/models/Questionnaire.php
index f29a2de..777182d 100644
--- a/lib/models/Questionnaire.php
+++ b/lib/models/Questionnaire.php
@@ -129,7 +129,7 @@ class Questionnaire extends SimpleORMap implements PrivacyObject
                 return true;
             } else {
                 //now look through all plugin if this assignment is related to plugin contents:
-                foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+                foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
                     if ($plugin->isQuestionnaireViewable($assignment)) {
                         return true;
                     }
@@ -172,7 +172,7 @@ class Questionnaire extends SimpleORMap implements PrivacyObject
                     return true;
                 } else {
                     //now look through all plugin if this assignment is related to plugin contents:
-                    foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+                    foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
                         if ($plugin->isQuestionnaireEditable($assignment)) {
                             return true;
                         }
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
index b71464c..a9dbc14 100644
--- a/lib/models/User.class.php
+++ b/lib/models/User.class.php
@@ -1189,7 +1189,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
         // Restliche Daten übertragen
 
         // ForumsModule migrieren
-        foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
             $plugin->migrateUser($old_id, $new_id);
         }
 
diff --git a/lib/navigation/AdminNavigation.php b/lib/navigation/AdminNavigation.php
index a1762c6..a725082 100644
--- a/lib/navigation/AdminNavigation.php
+++ b/lib/navigation/AdminNavigation.php
@@ -126,7 +126,7 @@ class AdminNavigation extends Navigation
                 $navigation->addSubNavigation('banner', new Navigation(_('Werbebanner'), 'dispatch.php/admin/banner'));
             }
 
-            if (PluginManager::getInstance()->getPlugin('CoursewareModule')) {
+            if (PluginManager::getInstance()->getPlugin(CoursewareModule::class)) {
                 $navigation->addSubNavigation(
                     'courseware',
                     new Navigation(
diff --git a/lib/navigation/ContentsNavigation.php b/lib/navigation/ContentsNavigation.php
index f6190e2..a00adb6 100644
--- a/lib/navigation/ContentsNavigation.php
+++ b/lib/navigation/ContentsNavigation.php
@@ -42,7 +42,7 @@ class ContentsNavigation extends Navigation
 
         $this->addSubNavigation('overview', $overview);
 
-        if (PluginManager::getInstance()->getPlugin('CoursewareModule')) {
+        if (PluginManager::getInstance()->getPlugin(CoursewareModule::class)) {
             $courseware = new Navigation(_('Courseware'));
             $courseware->setDescription(_('Erstellen und Sammeln von Lernmaterialien'));
             $courseware->setImage(Icon::create('courseware'));
diff --git a/lib/navigation/ProfileNavigation.php b/lib/navigation/ProfileNavigation.php
index 50dcfec..4827fe4 100644
--- a/lib/navigation/ProfileNavigation.php
+++ b/lib/navigation/ProfileNavigation.php
@@ -139,7 +139,7 @@ class ProfileNavigation extends Navigation
 
         // Add consultations if appropriate
         if (Config::get()->CONSULTATION_ENABLED) {
-            $plugin = PluginEngine::getPlugin('ConsultationModule');
+            $plugin = PluginEngine::getPlugin(ConsultationModule::class);
             if ($current_user && $plugin && PluginManager::getInstance()->isPluginActivatedForUser($plugin->getPluginId(), $current_user->id)) {
                 $this->addSubNavigation('consultation', new ConsultationNavigation($current_user));
             }
diff --git a/lib/navigation/StartNavigation.php b/lib/navigation/StartNavigation.php
index acd5ee3..0a6d52a 100644
--- a/lib/navigation/StartNavigation.php
+++ b/lib/navigation/StartNavigation.php
@@ -222,7 +222,7 @@ class StartNavigation extends Navigation
         // contents
         $navigation = new Navigation(_('Mein Arbeitsplatz'), 'dispatch.php/contents/overview');
 
-        if (PluginManager::getInstance()->getPlugin('CoursewareModule')) {
+        if (PluginManager::getInstance()->getPlugin(CoursewareModule::class)) {
             $navigation->addSubNavigation('courseware',
                 new Navigation(_('Courseware'), 'dispatch.php/contents/courseware'));
         }
diff --git a/lib/plugins/engine/PluginEngine.class.php b/lib/plugins/engine/PluginEngine.class.php
index ecf00cf..25974c5 100644
--- a/lib/plugins/engine/PluginEngine.class.php
+++ b/lib/plugins/engine/PluginEngine.class.php
@@ -3,8 +3,7 @@
 /**
  * Factory Class for the plugin engine
  * @author Dennis Reil, <dennis.reil@offis.de>
- * @package pluginengine
- * @subpackage engine
+ * @template P of StudIPPlugin
  */
 
 class PluginEngine
@@ -38,27 +37,28 @@ class PluginEngine
         global $user, $perm;
 
         // load system plugins
-        self::getPlugins('SystemPlugin');
+        self::getPlugins(SystemPlugin::class);
 
         // load homepage plugins
-        self::getPlugins('HomepagePlugin');
+        self::getPlugins(HomepagePlugin::class);
 
         // load course plugins
         if (Context::getId()) {
-            self::getPlugins('StudipModule');
-            self::getPlugins('StandardPlugin');
+            self::getPlugins(StudipModule::class);
+            self::getPlugins(StandardPlugin::class);
         }
 
         // load admin plugins
         if (is_object($user) && $perm->have_perm('admin')) {
-            self::getPlugins('AdministrationPlugin');
+            self::getPlugins(AdministrationPlugin::class);
         }
     }
 
     /**
      * Get instance of the plugin specified by plugin class name.
      *
-     * @param string $class class name of plugin
+     * @param class-string<P> $class class name of plugin
+     * @return P
      */
     public static function getPlugin ($class)
     {
@@ -70,10 +70,9 @@ class PluginEngine
      * returns all enabled plugins. The optional context parameter can be
      * used to get only plugins that are activated in the given context.
      *
-     * @template T
-     * @param T $type plugin type or null (all types)
+     * @param class-string<P>|null $type plugin type or null (all types)
      * @param string $context context range id (optional)
-     * @return T[] all plugins of the specified type
+     * @return P[]|StudIPPlugin[] all plugins of the specified type
      */
     public static function getPlugins ($type, $context = null)
     {
diff --git a/lib/plugins/engine/PluginManager.class.php b/lib/plugins/engine/PluginManager.class.php
index f08b5fa..fc81d7f 100644
--- a/lib/plugins/engine/PluginManager.class.php
+++ b/lib/plugins/engine/PluginManager.class.php
@@ -1,14 +1,11 @@
 <?php
-# Lifter010: TODO
-/*
+/**
  * PluginManager.class.php - plugin manager for Stud.IP
  *
- * Copyright (c) 2009  Elmar Ludwig
+ * @copyright  2009  Elmar Ludwig
+ * @license GPL2 or any later version
  *
- * 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.
+ * @template P of StudIPPlugin
  */
 
 class PluginManager
@@ -576,7 +573,7 @@ class PluginManager
      * Get instance of the plugin specified by plugin meta data.
      *
      * @param array $plugin_info plugin meta data
-     * @return object
+     * @return P
      */
     protected function getCachedPlugin ($plugin_info)
     {
@@ -603,8 +600,8 @@ class PluginManager
     /**
      * Get instance of the plugin specified by plugin class name.
      *
-     * @param string $class class name of plugin
-     * @return object
+     * @param class-string<P> $class class name of plugin
+     * @return P|null
      */
     public function getPlugin ($class)
     {
@@ -623,7 +620,7 @@ class PluginManager
      * Get instance of the plugin specified by plugin id.
      *
      * @param int $id id of the plugin
-     * @return object $plugin
+     * @return P|null $plugin
      */
     public function getPluginById ($id)
     {
@@ -643,8 +640,9 @@ class PluginManager
      * returns all enabled plugins. The optional context parameter can be
      * used to get only plugins that are activated in the given context.
      *
-     * @param string $type plugin type or null (all types)
+     * @param class-string<P>|null $type plugin type or null (all types)
      * @param string $context context range id (optional)
+     * @return P[]|StudIPPlugin[]
      */
     public function getPlugins ($type, $context = null)
     {
diff --git a/public/api.php b/public/api.php
index b2d30fa..9f7863c 100644
--- a/public/api.php
+++ b/public/api.php
@@ -43,7 +43,7 @@ namespace RESTAPI {
         require 'lib/bootstrap-api.php';
 
         // Initialize RESTAPI plugins
-        \PluginEngine::getPlugins('RESTAPIPlugin');
+        \PluginEngine::getPlugins(RESTAPIPlugin::class);
 
         $uri = \Request::pathInfo();
 
-- 
cgit v1.0


From f9cb99a85a578af3b168aad9be7792de5c8813ed Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 May 2024 06:56:09 +0000
Subject: update overtrue/phplint to 9.3.0, fixes #4158

Closes #4158

Merge request studip/studip!3016
---
 composer.json |  2 +-
 composer.lock | 87 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/composer.json b/composer.json
index b56c364..abfff34 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "woohoolabs/yang": "3.0.0",
         "codeception/codeception": "5.1.2",
         "codeception/module-asserts": "3.0.0",
-        "overtrue/phplint": "9.0.8",
+        "overtrue/phplint": "9.3.0",
         "phpstan/phpstan": "1.11.0",
         "symfony/var-dumper": "6.4.7"
     },
diff --git a/composer.lock b/composer.lock
index fb3b192..f82debe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fca457dd82eba76b259880bcfbac376d",
+    "content-hash": "e56f52fb79feb267575817504f36ad7c",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -5424,34 +5424,36 @@
         },
         {
             "name": "overtrue/phplint",
-            "version": "9.0.8",
+            "version": "9.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/phplint.git",
-                "reference": "9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a"
+                "reference": "9cba6a16eb2cee04af67f852b80e914c549d1e73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/phplint/zipball/9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a",
-                "reference": "9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a",
+                "url": "https://api.github.com/repos/overtrue/phplint/zipball/9cba6a16eb2cee04af67f852b80e914c549d1e73",
+                "reference": "9cba6a16eb2cee04af67f852b80e914c549d1e73",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/cache": "^5.4 || ^6.0 || ^7.0",
-                "symfony/console": "^5.4 || ^6.0 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
-                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
-                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
-                "symfony/process": "^5.4 || ^6.0 || ^7.0",
-                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+                "php": "^8.1",
+                "symfony/cache": "^6.4 || ^7.0",
+                "symfony/console": "^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^6.4 || ^7.0",
+                "symfony/finder": "^6.4 || ^7.0",
+                "symfony/options-resolver": "^6.4 || ^7.0",
+                "symfony/process": "^6.4 || ^7.0",
+                "symfony/yaml": "^6.4 || ^7.0"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.4",
+                "bartlett/sarif-php-sdk": "^1.2",
                 "brainmaestro/composer-git-hooks": "^2.8.5 || 3.0.0-alpha.1",
-                "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3 || ^2023.0",
+                "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3 || ^2023.3 || ^2024.1",
                 "php-parallel-lint/php-console-highlighter": "^1.0"
             },
             "bin": [
@@ -5459,13 +5461,22 @@
             ],
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "target-directory": "vendor-bin",
+                    "forward-command": true
+                },
                 "hooks": {
                     "pre-commit": [
-                        "composer fix-style"
+                        "composer style:fix",
+                        "composer code:check"
+                    ],
+                    "pre-push": [
+                        "composer qa:check"
                     ]
                 },
                 "branch-alias": {
-                    "dev-main": "9.0.x-dev"
+                    "dev-main": "9.3.x-dev"
                 }
             },
             "autoload": {
@@ -5497,7 +5508,7 @@
             ],
             "support": {
                 "issues": "https://github.com/overtrue/phplint/issues",
-                "source": "https://github.com/overtrue/phplint/tree/9.0.8"
+                "source": "https://github.com/overtrue/phplint/tree/9.3.0"
             },
             "funding": [
                 {
@@ -5505,7 +5516,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-05T09:37:32+00:00"
+            "time": "2024-05-16T06:42:55+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7288,29 +7299,26 @@
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v2.5.3",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463"
+                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/fee6db04d913094e2fb55ff8e7db5685a8134463",
-                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
+                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/cache": "^1.0|^2.0|^3.0"
-            },
-            "suggest": {
-                "symfony/cache-implementation": ""
+                "php": ">=8.1",
+                "psr/cache": "^3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7347,7 +7355,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.3"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -7363,7 +7371,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -7588,22 +7596,23 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.39",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a"
+                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/f6a96e4fcd468a25fede16ee665f50ced856bd0a",
-                "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764",
+                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7631,7 +7640,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.39"
+                "source": "https://github.com/symfony/finder/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7647,7 +7656,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T08:26:06+00:00"
+            "time": "2024-04-23T10:36:43+00:00"
         },
         {
             "name": "symfony/options-resolver",
-- 
cgit v1.0


From 6bc8e7bb6ff1b98f90ea605fde228c5e9d69d75d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 May 2024 07:28:41 +0000
Subject: fixes #4138

Closes #4138

Merge request studip/studip!2980
---
 app/views/web_migrate/index.php |  2 +-
 lib/migrations/Migration.php    | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/views/web_migrate/index.php b/app/views/web_migrate/index.php
index b26b90c..589d50a 100644
--- a/app/views/web_migrate/index.php
+++ b/app/views/web_migrate/index.php
@@ -51,7 +51,7 @@
                     <?= htmlReady($number) ?>
                 </td>
                 <td>
-                    <?= htmlReady(get_class($migration)) ?>
+                    <?= htmlReady($migration->getName()) ?>
                 </td>
                 <td>
                 <? if ($migration->description()): ?>
diff --git a/lib/migrations/Migration.php b/lib/migrations/Migration.php
index abaf747..92f73c7 100644
--- a/lib/migrations/Migration.php
+++ b/lib/migrations/Migration.php
@@ -49,6 +49,24 @@ abstract class Migration
     }
 
     /**
+     * Returns the name of the migration. If the migration is an anonymous
+     * class, the the name is created from the filename. Otherwise, it's the
+     * class name of the migration.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        $reflection = new ReflectionClass($this);
+        if ($reflection->isAnonymous()) {
+            $filename = basename($reflection->getFileName(), '.php');
+            $name = implode(' ', array_slice(explode('_', $filename), 1));
+            return ucfirst($name);
+        }
+        return static::class;
+    }
+
+    /**
      * Abstract method performing this migration step.
      * This method should be implemented in a migration subclass.
      */
@@ -67,12 +85,12 @@ abstract class Migration
     /**
      * Perform or revert this migration, depending on the indicated direction.
      *
-     * @param string $direction migration direction (either 'up' or 'down')
+     * @param ?string $direction migration direction (either 'up' or 'down')
      */
     public function migrate($direction)
     {
         if (!in_array($direction, ['up', 'down'])) {
-            return;
+            return null;
         }
 
         $result = $this->$direction();
@@ -107,7 +125,7 @@ abstract class Migration
         $args = func_get_args();
         $message = vsprintf(array_shift($args), $args);
 
-        return $this->write($this->mark($message));
+        $this->write($this->mark($message));
     }
 
     /**
-- 
cgit v1.0


From a8a031843d34937264f7b631e88d21401041abe8 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 May 2024 08:22:10 +0000
Subject: update opis/json-schema to 2.3.0, fixes #4173

Closes #4173

Merge request studip/studip!3011
---
 RELEASE-NOTES.md                                   |   3 +
 composer.json                                      |   2 +-
 composer.lock                                      | 159 ++++++++++++++++++---
 lib/models/Courseware/BlockTypes/Audio.php         |   7 +-
 lib/models/Courseware/BlockTypes/BeforeAfter.php   |   7 +-
 .../BlockTypes/BiographyAchievements.php           |   7 +-
 .../Courseware/BlockTypes/BiographyCareer.php      |   6 +-
 .../Courseware/BlockTypes/BiographyGoals.php       |   6 +-
 .../BlockTypes/BiographyPersonalInformation.php    |   6 +-
 lib/models/Courseware/BlockTypes/BlockType.php     |   9 +-
 lib/models/Courseware/BlockTypes/Canvas.php        |   6 +-
 lib/models/Courseware/BlockTypes/Chart.php         |   6 +-
 lib/models/Courseware/BlockTypes/Code.php          |   6 +-
 lib/models/Courseware/BlockTypes/Confirm.php       |   6 +-
 lib/models/Courseware/BlockTypes/Date.php          |   6 +-
 lib/models/Courseware/BlockTypes/DialogCards.php   |   6 +-
 lib/models/Courseware/BlockTypes/Document.php      |   7 +-
 lib/models/Courseware/BlockTypes/Download.php      |   6 +-
 lib/models/Courseware/BlockTypes/Embed.php         |   7 +-
 lib/models/Courseware/BlockTypes/Error.php         |   6 +-
 lib/models/Courseware/BlockTypes/Folder.php        |   7 +-
 lib/models/Courseware/BlockTypes/Gallery.php       |   6 +-
 lib/models/Courseware/BlockTypes/Headline.php      |  11 +-
 lib/models/Courseware/BlockTypes/IFrame.php        |   7 +-
 lib/models/Courseware/BlockTypes/ImageMap.php      |   6 +-
 lib/models/Courseware/BlockTypes/KeyPoint.php      |   6 +-
 lib/models/Courseware/BlockTypes/Link.php          |   7 +-
 lib/models/Courseware/BlockTypes/Lti.php           |   7 +-
 .../Courseware/BlockTypes/TableOfContents.php      |   6 +-
 lib/models/Courseware/BlockTypes/Text.php          |   6 +-
 lib/models/Courseware/BlockTypes/Timeline.php      |   7 +-
 lib/models/Courseware/BlockTypes/Typewriter.php    |   6 +-
 lib/models/Courseware/BlockTypes/Video.php         |   7 +-
 .../ContainerTypes/AccordionContainer.php          |   6 +-
 .../Courseware/ContainerTypes/ContainerType.php    |   9 +-
 .../Courseware/ContainerTypes/ListContainer.php    |   7 +-
 .../Courseware/ContainerTypes/TabsContainer.php    |   7 +-
 37 files changed, 216 insertions(+), 176 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index e4b3b5b..d262513 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -29,6 +29,9 @@
 - Im Rahmen von [Issue #4118](https://gitlab.studip.de/studip/studip/-/issues/4118) wurde `write_excel` ausgebaut. Als Alternative kann `phpoffice/phpspreadsheet` verwendet werden.
 - Im Rahmen von [TIC #3701](https://gitlab.studip.de/studip/studip/-/issues/3701) wurden die Klassen für den Cache umbenannt. Alle Vorkommnisse sollten ersetzt werden:
   - `StudipCacheFactory` -> `Studip\Cache\Factory`
+- Die Bibliothek `opis/json-schema` wurde auf Version 2.3.0 aktualisiert ([Issue #4173](https://gitlab.studip.de/studip/studip/-/issues/4173)). Dadurch ergeben sich die folgenden Änderungen für Komponenten aus Courseware (siehe auch [Migration Guide](https://opis.io/json-schema/2.x/php-migration.html#validator)):
+  - Instanzen von `Courseware\ContainerTypes\BlockType` müssen die Methode `getJsonSchema` anpassen. Der Return Type ist nun `string` und es muss der Inhalt der Schema-Datei zurückgegeben werden ohne Aufruf von `Schema::fromJsonString()`.
+  - Instanzen von `Courseware\ContainerTypes\ContainerType` müssen die Methode `getJsonSchema` anpassen. Der Return Type ist nun `string` und es muss der Inhalt der Schema-Datei zurückgegeben werden ohne Aufruf von `Schema::fromJsonString()`.
 
 ## Security related issues
 
diff --git a/composer.json b/composer.json
index abfff34..ac010e5 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "ext-pdo": "*",
         "ext-mbstring": "*",
         "ext-dom": "*",
-        "opis/json-schema": "^1.0",
+        "opis/json-schema": "2.3.0",
         "slim/psr7": "1.6.1",
         "slim/slim": "4.13.0",
         "php-di/php-di": "7.0.0",
diff --git a/composer.lock b/composer.lock
index f82debe..c2d073c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e56f52fb79feb267575817504f36ad7c",
+    "content-hash": "ce45f97b00f8fa90b09d0b907b3a4f53",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -1823,36 +1823,33 @@
         },
         {
             "name": "opis/json-schema",
-            "version": "1.1.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/json-schema.git",
-                "reference": "39d8072be8657a329a284339994401066406c43b"
+                "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/json-schema/zipball/39d8072be8657a329a284339994401066406c43b",
-                "reference": "39d8072be8657a329a284339994401066406c43b",
+                "url": "https://api.github.com/repos/opis/json-schema/zipball/c48df6d7089a45f01e1c82432348f2d5976f9bfb",
+                "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "ext-json": "*",
+                "opis/string": "^2.0",
+                "opis/uri": "^1.0",
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "ext-bcmath": "*",
                 "ext-intl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "opis/string": "^1.4",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^9.4"
-            },
-            "suggest": {
-                "opis/string": "A standalone library for manipulating multibyte strings"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -1874,19 +1871,145 @@
                     "email": "marius.sarca@gmail.com"
                 }
             ],
-            "description": "Json Schema Validator",
-            "homepage": "http://www.opis.io/json-schema",
+            "description": "Json Schema Validator for PHP",
+            "homepage": "https://opis.io/json-schema",
             "keywords": [
                 "json",
+                "json-schema",
                 "schema",
                 "validation",
                 "validator"
             ],
             "support": {
                 "issues": "https://github.com/opis/json-schema/issues",
-                "source": "https://github.com/opis/json-schema/tree/1.1.0"
+                "source": "https://github.com/opis/json-schema/tree/2.3.0"
+            },
+            "time": "2022-01-08T20:38:03+00:00"
+        },
+        {
+            "name": "opis/string",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/string.git",
+                "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/string/zipball/9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
+                "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "ext-json": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\String\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                },
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                }
+            ],
+            "description": "Multibyte strings as objects",
+            "homepage": "https://opis.io/string",
+            "keywords": [
+                "multi-byte",
+                "opis",
+                "string",
+                "string manipulation",
+                "utf-8"
+            ],
+            "support": {
+                "issues": "https://github.com/opis/string/issues",
+                "source": "https://github.com/opis/string/tree/2.0.1"
+            },
+            "time": "2022-01-14T15:42:23+00:00"
+        },
+        {
+            "name": "opis/uri",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/uri.git",
+                "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/uri/zipball/0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
+                "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
+                "shasum": ""
+            },
+            "require": {
+                "opis/string": "^2.0",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\Uri\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                },
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                }
+            ],
+            "description": "Build, parse and validate URIs and URI-templates",
+            "homepage": "https://opis.io",
+            "keywords": [
+                "URI Template",
+                "parse url",
+                "punycode",
+                "uri",
+                "uri components",
+                "url",
+                "validate uri"
+            ],
+            "support": {
+                "issues": "https://github.com/opis/uri/issues",
+                "source": "https://github.com/opis/uri/tree/1.1.0"
             },
-            "time": "2021-04-14T20:02:50+00:00"
+            "time": "2021-05-22T15:57:08+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
diff --git a/lib/models/Courseware/BlockTypes/Audio.php b/lib/models/Courseware/BlockTypes/Audio.php
index dd2588a..22dc167 100644
--- a/lib/models/Courseware/BlockTypes/Audio.php
+++ b/lib/models/Courseware/BlockTypes/Audio.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware audio block.
  *
@@ -42,11 +40,10 @@ class Audio extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Audio.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
diff --git a/lib/models/Courseware/BlockTypes/BeforeAfter.php b/lib/models/Courseware/BlockTypes/BeforeAfter.php
index b4f33ca..e174bff 100644
--- a/lib/models/Courseware/BlockTypes/BeforeAfter.php
+++ b/lib/models/Courseware/BlockTypes/BeforeAfter.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware before after block.
  *
@@ -41,11 +39,10 @@ class BeforeAfter extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/BeforeAfter.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
diff --git a/lib/models/Courseware/BlockTypes/BiographyAchievements.php b/lib/models/Courseware/BlockTypes/BiographyAchievements.php
index 3af5d64..2f8aeb7 100644
--- a/lib/models/Courseware/BlockTypes/BiographyAchievements.php
+++ b/lib/models/Courseware/BlockTypes/BiographyAchievements.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware biography achievements block.
  *
@@ -57,11 +55,10 @@ class BiographyAchievements extends BlockType
         parent::setPayload($payload);
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/BiographyAchievements.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/BiographyCareer.php b/lib/models/Courseware/BlockTypes/BiographyCareer.php
index ebd1a85..9425cfe 100644
--- a/lib/models/Courseware/BlockTypes/BiographyCareer.php
+++ b/lib/models/Courseware/BlockTypes/BiographyCareer.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware biography career block.
  *
@@ -48,11 +46,11 @@ class BiographyCareer extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/BiographyCareer.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/BiographyGoals.php b/lib/models/Courseware/BlockTypes/BiographyGoals.php
index dcfb76c..b4f1b64 100644
--- a/lib/models/Courseware/BlockTypes/BiographyGoals.php
+++ b/lib/models/Courseware/BlockTypes/BiographyGoals.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware biography personal goals block.
  *
@@ -53,11 +51,11 @@ class BiographyGoals extends BlockType
         parent::setPayload($payload);
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/BiographyGoals.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/BiographyPersonalInformation.php b/lib/models/Courseware/BlockTypes/BiographyPersonalInformation.php
index 8f3c0c1..bb11f53 100644
--- a/lib/models/Courseware/BlockTypes/BiographyPersonalInformation.php
+++ b/lib/models/Courseware/BlockTypes/BiographyPersonalInformation.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware biography personal information block.
  *
@@ -41,11 +39,11 @@ class BiographyPersonalInformation extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/BiographyPersonalInformation.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/BlockType.php b/lib/models/Courseware/BlockTypes/BlockType.php
index b3d5abf..b87a219 100644
--- a/lib/models/Courseware/BlockTypes/BlockType.php
+++ b/lib/models/Courseware/BlockTypes/BlockType.php
@@ -3,7 +3,6 @@
 namespace Courseware\BlockTypes;
 
 use Courseware\CoursewarePlugin;
-use Opis\JsonSchema\Schema;
 use Opis\JsonSchema\Validator;
 
 /**
@@ -52,9 +51,9 @@ abstract class BlockType
      * Returns the JSON schema which is used to validate the payload of
      * instances of this type of block.
      *
-     * @return Schema the JSON schema to be used
+     * @return string the JSON schema to be used
      */
-    abstract public static function getJsonSchema(): Schema;
+    abstract public static function getJsonSchema(): string;
 
     /**
      * Returns a list of categories to which this type of block is associated.
@@ -192,10 +191,8 @@ abstract class BlockType
      */
     public function validatePayload($payload): bool
     {
-        $schema = static::getJsonSchema();
         $validator = new Validator();
-        $result = $validator->schemaValidation($payload, $schema);
-
+        $result = $validator->validate($payload, static::getJsonSchema());
         return $result->isValid();
     }
 
diff --git a/lib/models/Courseware/BlockTypes/Canvas.php b/lib/models/Courseware/BlockTypes/Canvas.php
index e7b14e9..cc2196a 100644
--- a/lib/models/Courseware/BlockTypes/Canvas.php
+++ b/lib/models/Courseware/BlockTypes/Canvas.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware canvas block.
  *
@@ -40,11 +38,11 @@ class Canvas extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Canvas.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
diff --git a/lib/models/Courseware/BlockTypes/Chart.php b/lib/models/Courseware/BlockTypes/Chart.php
index 196e90f..147c3c5 100644
--- a/lib/models/Courseware/BlockTypes/Chart.php
+++ b/lib/models/Courseware/BlockTypes/Chart.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware chart block.
  *
@@ -38,11 +36,11 @@ class Chart extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Chart.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Code.php b/lib/models/Courseware/BlockTypes/Code.php
index 5b1454c..d5bd1c5 100644
--- a/lib/models/Courseware/BlockTypes/Code.php
+++ b/lib/models/Courseware/BlockTypes/Code.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware code block.
  *
@@ -37,11 +35,11 @@ class Code extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Code.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Confirm.php b/lib/models/Courseware/BlockTypes/Confirm.php
index bb6738d..2c25316 100644
--- a/lib/models/Courseware/BlockTypes/Confirm.php
+++ b/lib/models/Courseware/BlockTypes/Confirm.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware confirm block.
  *
@@ -36,11 +34,11 @@ class Confirm extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Confirm.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Date.php b/lib/models/Courseware/BlockTypes/Date.php
index 46e77d8..548e648 100644
--- a/lib/models/Courseware/BlockTypes/Date.php
+++ b/lib/models/Courseware/BlockTypes/Date.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware date block.
  *
@@ -37,11 +35,11 @@ class Date extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Date.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/DialogCards.php b/lib/models/Courseware/BlockTypes/DialogCards.php
index 74b843c..875a0b3 100644
--- a/lib/models/Courseware/BlockTypes/DialogCards.php
+++ b/lib/models/Courseware/BlockTypes/DialogCards.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware dialog cards block.
  *
@@ -96,11 +94,11 @@ class DialogCards extends BlockType
         return $payload;
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/DialogCards.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Document.php b/lib/models/Courseware/BlockTypes/Document.php
index db1ba6e..562ec08 100644
--- a/lib/models/Courseware/BlockTypes/Document.php
+++ b/lib/models/Courseware/BlockTypes/Document.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware document block.
  *
@@ -39,11 +37,10 @@ class Document extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Document.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
diff --git a/lib/models/Courseware/BlockTypes/Download.php b/lib/models/Courseware/BlockTypes/Download.php
index d736009..e7bb65c 100644
--- a/lib/models/Courseware/BlockTypes/Download.php
+++ b/lib/models/Courseware/BlockTypes/Download.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware download block.
  *
@@ -72,11 +70,11 @@ class Download extends BlockType
         return $payload;
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Download.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Embed.php b/lib/models/Courseware/BlockTypes/Embed.php
index cb997ee..1b36624 100644
--- a/lib/models/Courseware/BlockTypes/Embed.php
+++ b/lib/models/Courseware/BlockTypes/Embed.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware embed block.
  *
@@ -40,11 +38,10 @@ class Embed extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Embed.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public function getPayload()
diff --git a/lib/models/Courseware/BlockTypes/Error.php b/lib/models/Courseware/BlockTypes/Error.php
index 2e15456..3f290b1 100644
--- a/lib/models/Courseware/BlockTypes/Error.php
+++ b/lib/models/Courseware/BlockTypes/Error.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware error block.
  *
@@ -34,11 +32,11 @@ class Error extends BlockType
         return [];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Error.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Folder.php b/lib/models/Courseware/BlockTypes/Folder.php
index a3ea7d9..9f186df 100644
--- a/lib/models/Courseware/BlockTypes/Folder.php
+++ b/lib/models/Courseware/BlockTypes/Folder.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware folder block.
  *
@@ -116,11 +114,10 @@ class Folder extends BlockType
         return $payload;
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Folder.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Gallery.php b/lib/models/Courseware/BlockTypes/Gallery.php
index 5f9bb0b..5041573 100644
--- a/lib/models/Courseware/BlockTypes/Gallery.php
+++ b/lib/models/Courseware/BlockTypes/Gallery.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware gallery block.
  *
@@ -133,11 +131,11 @@ class Gallery extends BlockType
         return $payload;
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Gallery.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Headline.php b/lib/models/Courseware/BlockTypes/Headline.php
index 0c82138..616af88 100644
--- a/lib/models/Courseware/BlockTypes/Headline.php
+++ b/lib/models/Courseware/BlockTypes/Headline.php
@@ -2,7 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
 use Opis\JsonSchema\Validator;
 
 /**
@@ -49,11 +48,10 @@ class Headline extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Headline.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
@@ -88,11 +86,8 @@ class Headline extends BlockType
     public function validatePayload($payload): bool
     {
         unset($payload->background_image);
-        $schema = static::getJsonSchema();
-        $validator = new Validator();
-        $result = $validator->schemaValidation($payload, $schema);
 
-        return $result->isValid();
+        return parent::validatePayload($payload);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/IFrame.php b/lib/models/Courseware/BlockTypes/IFrame.php
index 5c914f9..f697e74 100644
--- a/lib/models/Courseware/BlockTypes/IFrame.php
+++ b/lib/models/Courseware/BlockTypes/IFrame.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware iFrame block.
  *
@@ -45,11 +43,10 @@ class IFrame extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/IFrame.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/ImageMap.php b/lib/models/Courseware/BlockTypes/ImageMap.php
index e275c46..d9ad845 100644
--- a/lib/models/Courseware/BlockTypes/ImageMap.php
+++ b/lib/models/Courseware/BlockTypes/ImageMap.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware image map block.
  *
@@ -66,11 +64,11 @@ class ImageMap extends BlockType
         return $payload;
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/ImageMap.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/KeyPoint.php b/lib/models/Courseware/BlockTypes/KeyPoint.php
index 8599704..d1e6c34 100644
--- a/lib/models/Courseware/BlockTypes/KeyPoint.php
+++ b/lib/models/Courseware/BlockTypes/KeyPoint.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware key point block.
  *
@@ -38,11 +36,11 @@ class KeyPoint extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/KeyPoint.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Link.php b/lib/models/Courseware/BlockTypes/Link.php
index ccf9f66..3282e2c 100644
--- a/lib/models/Courseware/BlockTypes/Link.php
+++ b/lib/models/Courseware/BlockTypes/Link.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware link block.
  *
@@ -39,11 +37,10 @@ class Link extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Link.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Lti.php b/lib/models/Courseware/BlockTypes/Lti.php
index 8b527c1..193bfb5 100644
--- a/lib/models/Courseware/BlockTypes/Lti.php
+++ b/lib/models/Courseware/BlockTypes/Lti.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware LTI block.
  *
@@ -44,11 +42,10 @@ class Lti extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Lti.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public function getPayload()
diff --git a/lib/models/Courseware/BlockTypes/TableOfContents.php b/lib/models/Courseware/BlockTypes/TableOfContents.php
index c48b683..f0485b9 100644
--- a/lib/models/Courseware/BlockTypes/TableOfContents.php
+++ b/lib/models/Courseware/BlockTypes/TableOfContents.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware table of contents block.
  *
@@ -37,11 +35,11 @@ class TableOfContents extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/TableOfContents.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Text.php b/lib/models/Courseware/BlockTypes/Text.php
index b728019..917efb3 100644
--- a/lib/models/Courseware/BlockTypes/Text.php
+++ b/lib/models/Courseware/BlockTypes/Text.php
@@ -2,7 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
 require_once 'lib/classes/Markup.class.php';
 
 /**
@@ -66,11 +65,10 @@ class Text extends BlockType
         parent::setPayload($payload);
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Text.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
diff --git a/lib/models/Courseware/BlockTypes/Timeline.php b/lib/models/Courseware/BlockTypes/Timeline.php
index 81802ce..5647e92 100644
--- a/lib/models/Courseware/BlockTypes/Timeline.php
+++ b/lib/models/Courseware/BlockTypes/Timeline.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware timeline block.
  *
@@ -45,11 +43,10 @@ class Timeline extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Timeline.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Typewriter.php b/lib/models/Courseware/BlockTypes/Typewriter.php
index 2544dde..b303fb3 100644
--- a/lib/models/Courseware/BlockTypes/Typewriter.php
+++ b/lib/models/Courseware/BlockTypes/Typewriter.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware typewriter block.
  *
@@ -39,11 +37,11 @@ class Typewriter extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Typewriter.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     public static function getCategories(): array
diff --git a/lib/models/Courseware/BlockTypes/Video.php b/lib/models/Courseware/BlockTypes/Video.php
index 431f69b..1ad7064 100644
--- a/lib/models/Courseware/BlockTypes/Video.php
+++ b/lib/models/Courseware/BlockTypes/Video.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware video block.
  *
@@ -42,11 +40,10 @@ class Video extends BlockType
         ];
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/Video.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 
     /**
diff --git a/lib/models/Courseware/ContainerTypes/AccordionContainer.php b/lib/models/Courseware/ContainerTypes/AccordionContainer.php
index 185b6d1..cd00a06 100644
--- a/lib/models/Courseware/ContainerTypes/AccordionContainer.php
+++ b/lib/models/Courseware/ContainerTypes/AccordionContainer.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\ContainerTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware accordion container stored in payload.
  *
@@ -54,10 +52,10 @@ class AccordionContainer extends ContainerType
         $this->setPayload($payload);
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/AccordionContainer.json';
 
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 }
diff --git a/lib/models/Courseware/ContainerTypes/ContainerType.php b/lib/models/Courseware/ContainerTypes/ContainerType.php
index a4eae29..baddaab 100644
--- a/lib/models/Courseware/ContainerTypes/ContainerType.php
+++ b/lib/models/Courseware/ContainerTypes/ContainerType.php
@@ -3,7 +3,6 @@
 namespace Courseware\ContainerTypes;
 
 use Courseware\CoursewarePlugin;
-use Opis\JsonSchema\Schema;
 use Opis\JsonSchema\Validator;
 
 /**
@@ -28,9 +27,9 @@ abstract class ContainerType
      * Returns the JSON schema which is used to validate the payload of
      * instances of this type of container.
      *
-     * @return Schema the JSON schema to be used
+     * @return string the JSON schema to be used
      */
-    abstract public static function getJsonSchema(): Schema;
+    abstract public static function getJsonSchema(): string;
 
     /**
      * Returns a short string describing this type of container.
@@ -150,10 +149,8 @@ abstract class ContainerType
      */
     public function validatePayload($payload): bool
     {
-        $schema = static::getJsonSchema();
         $validator = new Validator();
-        $result = $validator->schemaValidation($payload, $schema);
-
+        $result = $validator->validate($payload, static::getJsonSchema());
         return $result->isValid();
     }
 
diff --git a/lib/models/Courseware/ContainerTypes/ListContainer.php b/lib/models/Courseware/ContainerTypes/ListContainer.php
index b98d8a1..adbf7c3 100644
--- a/lib/models/Courseware/ContainerTypes/ListContainer.php
+++ b/lib/models/Courseware/ContainerTypes/ListContainer.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\ContainerTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware list container stored in payload.
  *
@@ -50,10 +48,9 @@ class ListContainer extends ContainerType
         $this->setPayload($payload);
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/ListContainer.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 }
diff --git a/lib/models/Courseware/ContainerTypes/TabsContainer.php b/lib/models/Courseware/ContainerTypes/TabsContainer.php
index 01f3d45..66a56b8 100644
--- a/lib/models/Courseware/ContainerTypes/TabsContainer.php
+++ b/lib/models/Courseware/ContainerTypes/TabsContainer.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\ContainerTypes;
 
-use Opis\JsonSchema\Schema;
-
 /**
  * This class represents the content of a Courseware tabs container stored in payload.
  *
@@ -54,10 +52,9 @@ class TabsContainer extends ContainerType
         $this->setPayload($payload);
     }
 
-    public static function getJsonSchema(): Schema
+    public static function getJsonSchema(): string
     {
         $schemaFile = __DIR__.'/TabsContainer.json';
-
-        return Schema::fromJsonString(file_get_contents($schemaFile));
+        return file_get_contents($schemaFile);
     }
 }
-- 
cgit v1.0


From 388af120fe46c842d32c07c0d9073c7be0f3ebd2 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 May 2024 09:08:22 +0000
Subject: fixes #4143

Closes #4143

Merge request studip/studip!2986
---
 lib/bootstrap.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 9afc16a..177fc08 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -69,10 +69,6 @@ if (isset($_SERVER['SERVER_NAME'])) {
     $ABSOLUTE_URI_STUDIP .= $CANONICAL_RELATIVE_PATH_STUDIP;
 }
 
-// default ASSETS_URL and ASSETS_PATH, customize if required
-$GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/';
-$GLOBALS['ASSETS_PATH'] = $ABSOLUTE_PATH_STUDIP . 'assets/';
-
 // Check if instance is configured; redirect to install script if not
 if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') {
     require_once __DIR__ . '/classes/URLHelper.php';
@@ -93,6 +89,14 @@ foreach($added_configs as $key => $value) {
     $GLOBALS[$key] = $value;
 }
 
+// create ASSETS_URL and ASSETS_PATH if not customized in config_local.inc.php
+if (!isset($GLOBALS['ASSETS_URL'])) {
+    $GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/';
+}
+if (!isset($GLOBALS['ASSETS_PATH'])) {
+    $GLOBALS['ASSETS_PATH'] = $ABSOLUTE_PATH_STUDIP . 'assets/';
+}
+
 // If no ENV setting was found in the config files, assume ENV=production
 if (!defined('Studip\ENV')) {
     define('Studip\ENV', DEFAULT_ENV);
-- 
cgit v1.0


From 7a6909c32bc4357dfa0a624d79ad255e9bdd2d11 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 16 May 2024 10:02:28 +0000
Subject: prevent php-warnings, closes #4178

Closes #4178

Merge request studip/studip!3017
---
 lib/dates.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/dates.inc.php b/lib/dates.inc.php
index 8538d24..851ee92 100644
--- a/lib/dates.inc.php
+++ b/lib/dates.inc.php
@@ -32,7 +32,11 @@ require_once 'lib/raumzeit/raumzeit_functions.inc.php'; // Helper-Funktionen
  * day_num  integer PHP-konformer Tag (0-6)
  * short    boolean Wenn gesetzt wird der Tag verkürzt zurückgegeben.
  */
-function getWeekday($day_num, $short = TRUE) {
+function getWeekday($day_num, $short = true): string
+{
+    if ($day_num < 0 || $day_num > 6) {
+        throw new Exception('Invalid day number');
+    }
     switch ($day_num) {
         case 0:
             $day = $short ? _("So") : _("Sonntag");
@@ -56,8 +60,6 @@ function getWeekday($day_num, $short = TRUE) {
             $day = $short ? _("Sa") : _("Samstag");
             break;
     }
-
-    // return i18n of day
     return $day;
 }
 
-- 
cgit v1.0


From bc30b99d18abf79208d3c2c509c7767593179f7a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 May 2024 10:12:57 +0000
Subject: remove ASSETS_URL from compact() and deactivate example
 configurations, re #4143

Merge request studip/studip!3018
---
 config/config_defaults.inc.php | 157 +++++++++++++++++++++--------------------
 lib/bootstrap.php              |   2 +-
 2 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/config/config_defaults.inc.php b/config/config_defaults.inc.php
index 5901c24..de63800 100644
--- a/config/config_defaults.inc.php
+++ b/config/config_defaults.inc.php
@@ -78,86 +78,87 @@ $FOP_SH_CALL = "/usr/bin/fop";                        //path to fop
 
 $EXTERN_SERVER_NAME = "";                               //define name, if you use special setup
 
-$ELEARNING_INTERFACE_MODULES = [
-    "ilias5" => [
-        "name" => "ILIAS 5",
-        "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your Ilias installation>/",
-        "ABSOLUTE_PATH_SOAP" => "http://<your Ilias installation>/webservice/soap/server.php?wsdl",
-        "CLASS_PREFIX" => "Ilias5",
-        "auth_necessary" => true,
-        "USER_AUTO_CREATE" => true,
-        "USER_PREFIX" => "",
-        "target_file" => "studip_referrer.php",
-        "logo_file" => "assets/images/logos/ilias_logo.png",
-        "soap_data" => [
-                        "username" => "<username>",     //this credentials are used to communicate with your Ilias 3 installation over SOAP
-                        "password" => "<password>",
-                        "client" => "<ilias client id>"],
-        "types" => [
-                   "webr" => ["name" => "ILIAS-Link", "icon" => "learnmodule"],
-                   "htlm" => ["name" => "HTML-Lerneinheit", "icon" => "learnmodule"],
-                   "sahs" => ["name" => "SCORM/AICC-Lerneinheit", "icon" => "learnmodule"],
-                   "lm" => ["name" => "ILIAS-Lerneinheit", "icon" => "learnmodule"],
-                   "glo" => ["name" => "ILIAS-Glossar", "icon" => "learnmodule"],
-                   "tst" => ["name" => "ILIAS-Test", "icon" => "learnmodule"],
-                   "svy" => ["name" => "ILIAS-Umfrage", "icon" => "learnmodule"],
-                   "exc" => ["name" => "ILIAS-Übung", "icon" => "learnmodule"]
-                   ],
-        "global_roles" => [4,5,14], // put here the ilias role-ids for User, Guest and Anonymous
-        "roles" =>  [
-                        "autor" => "4",
-                        "tutor" => "4",
-                        "dozent" => "4",
-                        "admin" => "4",
-                        "root" => "2"
-                        ],
-        "crs_roles" =>  [
-                        "autor" => "member",
-                        "tutor" => "tutor",
-                        "dozent" => "admin",
-                        "admin" => "admin",
-                        "root" => "admin"
-                        ]
-        ]
-    ];
+$ELEARNING_INTERFACE_MODULES = [];
 
 // example entry for wikifarm as server for elearning modules
+// Copy them into your customized config_local.inc.php and adjust them.
 // remember to activate studip-webservices with WEBSERVICES_ENABLE and to set STUDIP_INSTALLATION_ID
 
-$ELEARNING_INTERFACE_MODULES["pmwiki-farm"] =   [
-                        "name" => "Wikifarm",
-                        "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your PmWiki farm server>/<path to wiki fields>/",
-
-                        "WEBSERVICE_CLASS" => "xml_rpc_webserviceclient",
-                        "ABSOLUTE_PATH_SOAP" => "http://<your PmWiki farm server>/<path to PmWiki farm>/pmwiki.php",  // url to farm webservices
-                        "URL_PARAMS" => "action=xmlrpc",
-
-                        "CLASS_PREFIX" => "PmWiki",
-                        "auth_necessary" => false,
-
-                        "field_script" => "field.php",
-                        "logo_file" => $ASSETS_URL."/images/logos/pmwiki-32.gif",
-
-                        "soap_data" => [
-              "api-key" => "<api-key for wiki webservices>",
-            ],
-                        "types" =>  [
-              "wiki" => ["name" => "PmWiki-Lernmodul", "icon" => "learnmodule"],
-            ]
-];
-
-$ELEARNING_INTERFACE_MODULES["loncapa"] =
-[
-    "name" => "LonCapa",
-    "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://127.0.0.1/loncapa",
-    "CLASS_PREFIX" => "LonCapa",
-    "auth_necessary" => false,
-    "logo_file" => "assets/images/logos/lon-capa.gif",
-    "types" =>  [
-        "loncapa" => ["name" => "LonCapa-Lernmodul",
-                           "icon" => "learnmodule"],
-        ]
-];
+// $ELEARNING_INTERFACE_MODULES["ilias5"] = [
+//     "name" => "ILIAS 5",
+//     "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your Ilias installation>/",
+//     "ABSOLUTE_PATH_SOAP" => "http://<your Ilias installation>/webservice/soap/server.php?wsdl",
+//     "CLASS_PREFIX" => "Ilias5",
+//     "auth_necessary" => true,
+//     "USER_AUTO_CREATE" => true,
+//     "USER_PREFIX" => "",
+//     "target_file" => "studip_referrer.php",
+//     "logo_file" => "assets/images/logos/ilias_logo.png",
+//     "soap_data" => [
+//         "username" => "<username>",     //this credentials are used to communicate with your Ilias 3 installation over SOAP
+//         "password" => "<password>",
+//         "client" => "<ilias client id>"],
+//     "types" => [
+//         "webr" => ["name" => "ILIAS-Link", "icon" => "learnmodule"],
+//         "htlm" => ["name" => "HTML-Lerneinheit", "icon" => "learnmodule"],
+//         "sahs" => ["name" => "SCORM/AICC-Lerneinheit", "icon" => "learnmodule"],
+//         "lm" => ["name" => "ILIAS-Lerneinheit", "icon" => "learnmodule"],
+//         "glo" => ["name" => "ILIAS-Glossar", "icon" => "learnmodule"],
+//         "tst" => ["name" => "ILIAS-Test", "icon" => "learnmodule"],
+//         "svy" => ["name" => "ILIAS-Umfrage", "icon" => "learnmodule"],
+//         "exc" => ["name" => "ILIAS-Übung", "icon" => "learnmodule"]
+//     ],
+//     "global_roles" => [4,5,14], // put here the ilias role-ids for User, Guest and Anonymous
+//     "roles" =>  [
+//         "autor" => "4",
+//         "tutor" => "4",
+//         "dozent" => "4",
+//         "admin" => "4",
+//         "root" => "2"
+//     ],
+//     "crs_roles" =>  [
+//         "autor" => "member",
+//         "tutor" => "tutor",
+//         "dozent" => "admin",
+//         "admin" => "admin",
+//         "root" => "admin"
+//     ]
+// ];
+//
+// $ELEARNING_INTERFACE_MODULES["pmwiki-farm"] =   [
+//                         "name" => "Wikifarm",
+//                         "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your PmWiki farm server>/<path to wiki fields>/",
+//
+//                         "WEBSERVICE_CLASS" => "xml_rpc_webserviceclient",
+//                         "ABSOLUTE_PATH_SOAP" => "http://<your PmWiki farm server>/<path to PmWiki farm>/pmwiki.php",  // url to farm webservices
+//                         "URL_PARAMS" => "action=xmlrpc",
+//
+//                         "CLASS_PREFIX" => "PmWiki",
+//                         "auth_necessary" => false,
+//
+//                         "field_script" => "field.php",
+//                         "logo_file" => $ASSETS_URL."/images/logos/pmwiki-32.gif",
+//
+//                         "soap_data" => [
+//               "api-key" => "<api-key for wiki webservices>",
+//             ],
+//                         "types" =>  [
+//               "wiki" => ["name" => "PmWiki-Lernmodul", "icon" => "learnmodule"],
+//             ]
+// ];
+//
+// $ELEARNING_INTERFACE_MODULES["loncapa"] =
+// [
+//     "name" => "LonCapa",
+//     "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://127.0.0.1/loncapa",
+//     "CLASS_PREFIX" => "LonCapa",
+//     "auth_necessary" => false,
+//     "logo_file" => "assets/images/logos/lon-capa.gif",
+//     "types" =>  [
+//         "loncapa" => ["name" => "LonCapa-Lernmodul",
+//                            "icon" => "learnmodule"],
+//         ]
+// ];
 
 $PLUGINS_UPLOAD_ENABLE = $_ENV['STUDIP_PLUGIN_UPLOAD_ENABLE'] ?? true;      //Upload of Plugins is enabled
 
@@ -268,6 +269,10 @@ $STUDIP_AUTH_PLUGIN[] = "Standard";
 // $STUDIP_AUTH_PLUGIN[] = "IP";
 
 $STUDIP_AUTH_CONFIG_STANDARD = ["error_head" => "intern"];
+
+// Example configurations
+// Copy them into your customized config_local.inc.php and adjust them.
+
 /*
 $STUDIP_AUTH_CONFIG_LDAPREADANDBIND = array("host" => "localhost",
                                         "base_dn" => "dc=studip,dc=de",
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 177fc08..0c66a97 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -83,7 +83,7 @@ require __DIR__ . '/classes/StudipFileloader.php';
 
 $added_configs = [];
 
-StudipFileloader::load('config_defaults.inc.php config_local.inc.php', $added_configs, compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'ASSETS_URL', 'CANONICAL_RELATIVE_PATH_STUDIP'), true);
+StudipFileloader::load('config_defaults.inc.php config_local.inc.php', $added_configs, compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'CANONICAL_RELATIVE_PATH_STUDIP'), true);
 
 foreach($added_configs as $key => $value) {
     $GLOBALS[$key] = $value;
-- 
cgit v1.0


From bb2278c43c4992c2cc0fc2d468ad98a395e13962 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Thu, 16 May 2024 10:55:44 +0000
Subject: remote obsolete class, fixes #3283

Closes #3283

Merge request studip/studip!2215
---
 lib/classes/WidgetHelper.php | 402 -------------------------------------------
 1 file changed, 402 deletions(-)
 delete mode 100644 lib/classes/WidgetHelper.php

diff --git a/lib/classes/WidgetHelper.php b/lib/classes/WidgetHelper.php
deleted file mode 100644
index ff4d7a6..0000000
--- a/lib/classes/WidgetHelper.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-/**
- * WidgetHelper.php - utility functions for Widget-Parameter Handling
- * @deprecated since Stud.IP 5.5
- *
- * 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.
- *
- * @author   Nadine Werner <nadine.werner@uni-osnabrueck.de>
- * @author   André Klaßen <klassen@elan-ev.de>
- * @license  http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category Stud.IP
- * @package  index
- * @since    3.1
- */
-
-class WidgetHelper
-{
-    /**
-     * array of submitted widget parameter values
-     */
-    private static $params = [];
-
-    /**
-     * array of submitted widget parameter values
-     */
-    private static $activeWidget;
-
-    /**
-     * Saves the widget data of a user
-     */
-    private static $userWidgets = [];
-
-    /**
-     * Set the last active Widget
-     * @param string $activeWidget
-     */
-    public static function setActiveWidget($activeWidget)
-    {
-        self::$activeWidget = $activeWidget;
-    }
-
-    /**
-     * Returns the position in the two column layout on the Startpage
-     * If no position is stored in UserConfig, the widget will be displayed on the right side.
-     *
-     * @param string $pluginid
-     *
-     * @return the position as array matrix
-     */
-    public static function getWidgetPosition($pluginid)
-    {
-        $query = "SELECT position FROM widget_user where id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$pluginid]);
-        $pos = $statement->fetchColumn();
-
-        return $pos;
-    }
-
-    /**
-     * storeNewPositions - stores new Widget positions for a given user
-     *
-     * @param array $lanes array with column as index and ids array as value
-     *
-     * @return void
-     */
-    public static function storeNewPositions(array $lanes): void
-    {
-        // Query not displayed widgets to sort them to the bottom of a lane
-        $query = "SELECT `col`, `id`
-                  FROM `widget_user`
-                  WHERE `range_id` = ?
-                    AND `id` NOT IN (?)
-                  ORDER BY `col`, `position`";
-        $undisplayed = DBManager::get()->fetchGrouped($query, [
-            User::findCurrent()->id,
-            array_merge(...$lanes)
-        ], function ($row) {
-            return array_column($row, 'id');
-        });
-
-        // Set new positions
-        $query = "UPDATE `widget_user`
-                  SET `col` = :column,
-                      `position` = :position
-                  WHERE `id` = :id
-                    AND `range_id` = :user_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', User::findCurrent()->id);
-
-        foreach ([0, 1] as $column) {
-            $statement->bindValue(':column', $column);
-
-            $ids = array_merge(
-                $lanes[$column] ?? [],
-                $undisplayed[$column] ?? []
-            );
-
-            $position = 0;
-            foreach ($ids as $id) {
-                $statement->bindValue(':position', $position++);
-                $statement->bindValue(':id', $id);
-                $statement->execute();
-            }
-        }
-    }
-
-    /**
-     * addInitialPositons - adds the global widget default settings to an user setting
-     *
-     * @param string $col
-     * @param array $ids of widgets
-     * @param string $range_id
-     *
-     * @return void
-     */
-    public static function addInitialPositions($col, $ids, $range_id)
-    {
-        if(is_array($ids)) {
-             foreach ($ids as $pos => $id) {
-                  $pos = intVal($pos);
-                  $query = "REPLACE INTO widget_user (`pluginid`, `position`, `range_id`) VALUES (?,?,?);";
-                  $statement = DBManager::get()->prepare($query);
-                  $statement->execute([$id, $pos, $range_id]);
-             }
-        }
-    }
-
-    /**
-     * storeInitialPositions - stores the global widget default for a given perm
-     *
-     * @param string $col
-     * @param array $ids of widgets
-     * @param string $perm
-     *
-     * @return boolean success
-     */
-    public static function storeInitialPositions($col, $ids, $perm)
-    {
-        $stmt = DBManager::get()->prepare('DELETE FROM widget_default WHERE `perm` = ? AND `col` = ?;');
-        $stmt->execute([$perm, $col]);
-
-        if (is_array($ids)) {
-            foreach ($ids as $id => $pos) {
-                if ($id) {
-                    $pos = intVal($pos);
-                    $stmt = DBManager::get()->prepare("REPLACE INTO widget_default (`pluginid`,`col`, `position`, `perm`) VALUES (?,?,?,?);");
-                    $stmt->execute([$id, $col, $pos, $perm]);
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public static function getInitialPositions($perm)
-    {
-        return DBManager::get()->fetchGroupedPairs("SELECT col, pluginid, position FROM widget_default "
-                . "WHERE perm = ? "
-                . "ORDER BY col ASC, position ASC", [$perm]);
-    }
-
-    /**
-     * Sets the current setting of a user as the default for a usergroup
-     *
-     * @param string $range_id The range id of the user that defines the setting
-     * @param string $group The usergroup
-     */
-    public static function setAsInitialPositions($range_id, $group)
-    {
-        DBManager::get()->execute("DELETE FROM widget_default WHERE `perm` = ?", [$group]);
-        DBManager::get()->execute('INSERT INTO widget_default (SELECT pluginid, col, position, ? as perm  FROM widget_user WHERE range_id = ?)', [$group, $range_id]);
-    }
-
-    /**
-     * setInitialPositions - copies the default to the logged on user
-     */
-    public static function setInitialPositions()
-    {
-        $query = "INSERT INTO widget_user (pluginid, position, range_id, col)
-                  SELECT pluginid, position, :user_id, col
-                  AS perm
-                  FROM widget_default
-                  WHERE perm = :perm
-
-                  UNION
-
-                  -- Dummy entry to allow no widgets
-                  SELECT -1, 0, :user_id, 2";
-        DBManager::get()->execute($query, [
-            ':user_id' => $GLOBALS['user']->id,
-            ':perm'    => $GLOBALS['perm']->get_perm(),
-        ]);
-    }
-
-    /**
-     * getUserWidgets - retrieves the widget settings for a given user
-     *
-     * @param string $id
-     *
-     * @return array $widgets
-     */
-    public static function getUserWidgets($id, $col = 0)
-    {
-        $plugin_manager = PluginManager::getInstance();
-        $query = "SELECT * FROM widget_user WHERE range_id=? AND col = ? ORDER BY position";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$id, $col]);
-        $widgets = [];
-        while ($db_widget = $statement->fetch(PDO::FETCH_ASSOC)) {
-            if(!is_null($plugin_manager->getPluginById($db_widget['pluginid']))){
-                $widget = clone $plugin_manager->getPluginById($db_widget['pluginid']);
-                $widget->widget_id = $db_widget['id'];
-                $widgets[$db_widget['position']] = $widget;
-            }
-        }
-        return $widgets;
-    }
-
-    /**
-     * Returns whether a user has any defined widgets.
-     * @param  string  $user_id User id
-     * @return boolean
-     */
-    public static function hasUserWidgets($user_id)
-    {
-        $query = "SELECT 1 FROM `widget_user` WHERE `range_id` = ?";
-        return (bool) DBManager::get()->fetchColumn($query, [$user_id]);
-    }
-
-    /**
-     * addWidgetUserConfig - creates user_config entry for widget newly added by a user
-     *
-     * @param string $id - user_id
-     * @param string $pluginName
-     * @param array $confArray
-     *
-     * @return void
-     */
-    public static function addWidgetUserConfig($id, $pluginName, $confArray )
-    {
-        UserConfig::get($id)->store($pluginName, $confArray );
-    }
-
-
-    /**
-     * getWidgetUserConfig - retrieves user_config entry for widget newly added by a user
-     *
-     * @param string $id user_id
-     * @param string $pluginName
-     *
-     * @return object UserConfig
-     */
-    public static function getWidgetUserConfig($id, $pluginName)
-    {
-        return UserConfig::get($id)->getValue($pluginName);
-
-    }
-
-    /**
-     * removeWidget - removes a widget for a user
-     *
-     * @param string $id - widget_id
-     * @param string $pluginName
-     * @param string $range_id e.g. user_id
-     *
-     * @return bool success
-     */
-    public static function removeWidget($id, $pluginName, $range_id)
-    {
-        UserConfig::get($range_id)->delete($pluginName);
-
-        $query = "DELETE FROM widget_user WHERE id = ? AND range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-
-        return $statement->execute([$id, $range_id]);
-    }
-
-    /**
-     * addWidget - adds a widget for a given user
-     *
-     * @param string $id - widget_id
-     * @param string $range_id e.g. user_id
-     *
-     * @return bool|int false on error, id of inserted widget otherwise
-     */
-    public static function addWidget($id, $range_id)
-    {
-        $db = DBManager::get();
-        $statement = $db->prepare('SELECT MAX(position) + 1 FROM widget_user WHERE range_id = :range_id');
-        $statement->bindValue(':range_id', $range_id);
-        $statement->execute();
-        $position = $statement->fetchColumn() ?: 0;
-
-        $statement = $db->prepare('INSERT INTO widget_user (pluginid, position, range_id) VALUES (:id, :position, :range_id)');
-        $statement->bindValue(':id', $id);
-        $statement->bindValue(':position', $position);
-        $statement->bindValue(':range_id', $range_id);
-        $result = $statement->execute();
-
-        return $result ? $db->lastInsertId() : false;
-    }
-
-    /**
-     * getWidgetName - retrieves the name of a given widget
-     *
-     * @param string $id - widget_id
-     *
-     * @return string widget_name
-     */
-    public static function getWidgetName($id)
-    {
-        $query = "SELECT `pluginid` FROM `widget_user` WHERE `id`=?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$id]);
-        $pid = $statement->fetch(PDO::FETCH_ASSOC);
-
-        $plugin_manager = PluginManager::getInstance();
-        $plugin_info = $plugin_manager->getPluginById($pid['pluginid']);
-        return $plugin_info ? $plugin_info->getPluginName() : false;
-
-    }
-
-
-    /**
-     * getWidget - retrieves an instance of a given widget / portal plugin
-     *
-     * @param string $pluginid
-     *
-     * @return object widget
-     */
-    public static function getWidget($pluginid)
-    {
-        return PluginManager::getInstance()->getPluginById($pluginid);
-    }
-
-    /**
-     * getAvailableWidgets - fetches all widgets that are not already in use.
-     *
-     * @param string $user_id the user to check
-     *
-     * @return array All available widgets.
-     */
-    public static function getAvailableWidgets($user_id = null)
-    {
-        $all_widgets = PluginEngine::getPlugins(PortalPlugin::class);
-
-        $used_widgets = is_null($user_id)
-                ? []
-                : DBManager::get()->fetchFirst("SELECT `pluginid` FROM `widget_user` WHERE `range_id`=? ORDER BY `pluginid`", [$user_id]);
-
-        $available = [];
-        foreach ($all_widgets as $widget) {
-            if (!in_array($widget->getPluginId(), $used_widgets)) {
-                $available[$widget->getPluginId()] = $widget;
-            }
-        }
-        return $available;
-    }
-
-    /**
-     * hasWidget - returns whether has a certain widget activated
-     *
-     * @param string $user_id Id of the user
-     * @param mixed  $widget  Id or name of the widget (you may omit the
-     *                        'Widget' in the name)
-     * @return bool indicating whether the widget is activated
-     */
-    public static function hasWidget($user_id, $widget)
-    {
-        if (!isset(self::$userWidgets[$user_id])) {
-            $statement = DBManager::get()->prepare("
-                SELECT *
-                FROM widget_user
-                WHERE range_id = :user_id
-            ");
-            $statement->execute(['user_id' => $user_id]);
-            self::$userWidgets[$user_id] = $statement->fetchAll(PDO::FETCH_ASSOC);
-        }
-
-        if (!ctype_digit($widget)) {
-            $plugin = PluginManager::getInstance()->getPlugin($widget) ?: PluginManager::getInstance()->getPlugin($widget . "Widget");
-            if ($plugin) {
-                $widget = $plugin->getPluginId();
-            } else {
-                return false;
-            }
-        }
-
-        foreach (self::$userWidgets[$user_id] as $widget_user) {
-            if ($widget_user['pluginid'] == $widget) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-- 
cgit v1.0


From efaeea07319c63be2f2c6a8bd076e4de8ac8f11d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 May 2024 11:05:47 +0000
Subject: relocate flexi, fixes #4101

Closes #4101

Merge request studip/studip!2977
---
 RELEASE-NOTES.md                                   |   9 +
 app/controllers/admin/courses.php                  |  25 +-
 app/controllers/calendar/schedule.php              |   2 +-
 app/controllers/file.php                           |   4 +-
 app/controllers/resources/booking.php              |   4 +-
 app/controllers/room_management/planning.php       |   2 +-
 app/controllers/shared/download.php                |   4 +-
 app/controllers/start.php                          |   2 +
 app/views/file/file_details.php                    |  20 +-
 app/views/file/folder_details.php                  |   2 +-
 app/views/file/new_edit_folder_form.php            |   2 +-
 app/views/files/_fileref_tr.php                    |   2 +-
 app/views/files/_folder_tr.php                     |   2 +-
 app/views/files/flat.php                           |   2 +-
 app/views/files/index.php                          |   2 +-
 app/views/start/index.php                          |   3 +-
 .../ConditionalAdmission.class.php                 |   4 +-
 .../CourseMemberAdmission.class.php                |   4 +-
 .../limitedadmission/LimitedAdmission.class.php    |   4 +-
 .../lockedadmission/LockedAdmission.class.php      |   6 +-
 .../ParticipantRestrictedAdmission.class.php       |   4 +-
 .../passwordadmission/PasswordAdmission.class.php  |   6 +-
 .../PreferentialAdmission.class.php                |   4 +-
 .../termsadmission/TermsAdmission.class.php        |  16 +-
 .../timedadmission/TimedAdmission.class.php        |   4 +-
 lib/bootstrap-autoload.php                         |   9 +-
 lib/bootstrap.php                                  |   5 +-
 lib/calendar/CalendarView.class.php                |   2 +-
 lib/classes/Fullcalendar.class.php                 |   2 +-
 lib/classes/I18N.php                               |   4 +-
 lib/classes/QuestionType.interface.php             |   7 +-
 lib/classes/Seminar.class.php                      |   2 +-
 lib/classes/Siteinfo.php                           |   4 +-
 lib/classes/StudipFileloader.php                   |   2 +-
 .../AdvancedBasicDataWizardStep.php                |   2 +-
 .../coursewizardsteps/BasicDataWizardStep.php      |   2 +-
 .../coursewizardsteps/LVGroupsWizardStep.php       |   8 +-
 .../coursewizardsteps/StudyAreasWizardStep.php     |   2 +-
 lib/classes/forms/Form.php                         |   2 +-
 .../librarysearch/LibraryDocument.class.php        |   5 +-
 lib/classes/sidebar/TemplateWidget.php             |   4 +-
 lib/filesystem/CourseDateFolder.php                |   4 +-
 lib/filesystem/CoursePublicFolder.php              |   2 +-
 lib/filesystem/FileType.php                        |  12 +-
 lib/filesystem/FolderType.php                      |  12 +-
 lib/filesystem/HiddenFolder.php                    |   2 +-
 lib/filesystem/InboxOutboxFolder.php               |   8 +-
 lib/filesystem/PublicFolder.php                    |   2 +-
 lib/filesystem/RootFolder.php                      |   2 +-
 lib/filesystem/StandardFile.php                    |   8 +-
 lib/filesystem/StandardFolder.php                  |  10 +-
 lib/filesystem/TimedFolder.php                     |   4 +-
 lib/flexi/Factory.php                              | 243 ++++++
 lib/flexi/PhpTemplate.php                          | 111 +++
 lib/flexi/Template.php                             | 208 +++++
 lib/flexi/TemplateNotFoundException.php            |  12 +
 lib/models/Courseware/BlockTypes/BlockType.php     |   4 +-
 .../Courseware/ContainerTypes/ContainerType.php    |   4 +-
 lib/models/Freetext.php                            |  15 +-
 lib/models/LikertScale.php                         |   6 +-
 lib/models/OERMaterial.php                         |   2 +-
 lib/models/QuestionnaireInfo.php                   |   4 +-
 lib/models/RangeScale.php                          |   6 +-
 lib/models/Vote.php                                |   4 +-
 lib/models/calendar/CalendarDate.class.php         |   2 +-
 .../calendar/CalendarDateAssignment.class.php      |   6 +-
 lib/models/resources/ResourceBooking.class.php     |   4 +-
 .../resources/ResourcePropertyDefinition.class.php |   2 +-
 lib/models/resources/ResourceRequest.class.php     |   8 +-
 lib/modules/ScheduleWidget.php                     |   2 +-
 lib/modules/StudipModule.class.php                 |   4 +-
 lib/plugins/core/AdminCourseContents.class.php     |   4 +-
 lib/plugins/core/DetailspagePlugin.class.php       |   4 +-
 lib/plugins/core/ExternPagePlugin.php              |   4 +-
 lib/plugins/core/FilesystemPlugin.class.php        |   5 +-
 lib/plugins/core/HomepagePlugin.class.php          |   4 +-
 lib/plugins/core/PortalPlugin.class.php            |   4 +-
 .../core/QuestionnaireAssignmentPlugin.class.php   |   4 +-
 lib/raumzeit/SingleDate.class.php                  |   2 +-
 public/install.php                                 |   4 +-
 public/web_migrate.php                             |   2 +-
 templates/contentbar/contentbar.php                |  12 +-
 tests/functional/_bootstrap.php                    |   4 +-
 tests/jsonapi/BlubberThreadsCreateTest.php         |   2 +-
 tests/jsonapi/BlubberThreadsIndexTest.php          |   3 +-
 tests/jsonapi/BlubberThreadsShowTest.php           |   2 +-
 tests/jsonapi/ConsultationHelper.php               |   5 +-
 tests/jsonapi/_bootstrap.php                       |   1 +
 tests/unit/_bootstrap.php                          |   6 +-
 tests/unit/lib/classes/StudipFileloaderTest.php    |   2 +-
 tests/unit/lib/flexi/FactoryTest.php               | 119 +++
 tests/unit/lib/flexi/PHPTemplatePartialBugTest.php |  45 +
 tests/unit/lib/flexi/PHPTemplateTest.php           | 136 +++
 tests/unit/lib/flexi/TemplateEmptyTest.php         |  44 +
 tests/unit/lib/flexi/TemplateMagicMethodsTest.php  |  78 ++
 tests/unit/lib/flexi/TemplateTest.php              |  68 ++
 tests/unit/varstream.php                           | 106 ++-
 vendor/flexi/LICENSE                               |  22 -
 vendor/flexi/README                                |   0
 vendor/flexi/Rakefile                              |  22 -
 vendor/flexi/examples/01_hello_world/index.php     |  39 -
 .../01_hello_world/templates/hello_world.php       |   1 -
 vendor/flexi/examples/02_quotes/index.php          |  63 --
 .../flexi/examples/02_quotes/templates/quotes.php  |  23 -
 vendor/flexi/examples/03_layout/bgbody.gif         | Bin 1109 -> 0 bytes
 vendor/flexi/examples/03_layout/index.php          |  66 --
 vendor/flexi/examples/03_layout/style.css          |  18 -
 .../flexi/examples/03_layout/templates/layout.php  |  10 -
 .../flexi/examples/03_layout/templates/quotes.php  |  20 -
 .../flexi/examples/04_handler_plugin/mustache.php  |  32 -
 .../04_handler_plugin/templates/layout.php         |   3 -
 .../04_handler_plugin/templates/mustache.mustache  |   5 -
 vendor/flexi/examples/xx_js_templates/index.php    |  39 -
 .../xx_js_templates/templates/js_template.pjs      |   3 -
 vendor/flexi/flexi.php                             |  24 -
 vendor/flexi/lib/exceptions.php                    |  23 -
 vendor/flexi/lib/flexi.php                         |  41 -
 vendor/flexi/lib/helper/js_helper.php              | 135 ---
 vendor/flexi/lib/helper/prototype_helper.php       | 764 -----------------
 vendor/flexi/lib/helper/scriptaculous_helper.php   | 142 ----
 vendor/flexi/lib/helper/tag_helper.php             | 122 ---
 vendor/flexi/lib/helper/text_helper.php            | 183 ----
 vendor/flexi/lib/js_template.php                   |  55 --
 vendor/flexi/lib/mustache_template.php             |  85 --
 vendor/flexi/lib/php_template.php                  | 119 ---
 vendor/flexi/lib/template.php                      | 251 ------
 vendor/flexi/lib/template_factory.php              | 281 -------
 vendor/flexi/test/all_tests.php                    |  41 -
 vendor/flexi/test/coverage.php                     |  43 -
 vendor/flexi/test/flexi_tests.php                  |  61 --
 vendor/flexi/test/lib/helper/js_helper_test.php    |  93 --
 .../test/lib/helper/prototype_helper_test.php      | 180 ----
 .../test/lib/helper/scriptaculous_helper_test.php  |  67 --
 vendor/flexi/test/lib/helper/tag_helper_test.php   |  65 --
 vendor/flexi/test/lib/helper/text_helper_test.php  |  80 --
 vendor/flexi/test/lib/js_template_test.php         |  56 --
 vendor/flexi/test/lib/php_template_test.php        | 182 ----
 vendor/flexi/test/lib/template_factory_test.php    | 117 ---
 vendor/flexi/test/lib/template_test.php            | 215 -----
 .../templates/factory_tests/baz.unknown_extension  |   0
 vendor/flexi/test/templates/factory_tests/foo.php  |   1 -
 .../test/templates/layout_with_partials/layout.php |   3 -
 .../templates/layout_with_partials/partial.php     |   1 -
 .../templates/layout_with_partials/template.php    |   1 -
 .../test/templates/template_tests/attributes.php   |   3 -
 vendor/flexi/test/templates/template_tests/foo.php |   1 -
 .../templates/template_tests/foo_using_partial.php |   1 -
 .../template_tests/foo_with_partial_collection.php |   1 -
 .../test/templates/template_tests/foos_partial.php |   1 -
 .../flexi/test/templates/template_tests/item.php   |   1 -
 .../templates/template_tests/layouts/layout.php    |   1 -
 .../flexi/test/templates/template_tests/spacer.php |   1 -
 vendor/flexi/test/varstream.php                    | 244 ------
 vendor/flexi/vendor/mustache.php/LICENSE           |  22 -
 vendor/flexi/vendor/mustache.php/Mustache.php      | 931 ---------------------
 .../flexi/vendor/mustache.php/MustacheLoader.php   |  85 --
 vendor/flexi/vendor/mustache.php/README.markdown   |  98 ---
 .../vendor/mustache.php/bin/create_example.php     | 172 ----
 .../examples/child_context/ChildContext.php        |  13 -
 .../examples/child_context/child_context.mustache  |   2 -
 .../examples/child_context/child_context.txt       |   2 -
 .../mustache.php/examples/comments/Comments.php    |   7 -
 .../examples/comments/comments.mustache            |   1 -
 .../mustache.php/examples/comments/comments.txt    |   1 -
 .../mustache.php/examples/complex/complex.mustache |  16 -
 .../mustache.php/examples/complex/complex.php      |  19 -
 .../mustache.php/examples/complex/complex.txt      |   6 -
 .../examples/delimiters/Delimiters.php             |  14 -
 .../examples/delimiters/delimiters.mustache        |   8 -
 .../examples/delimiters/delimiters.txt             |   4 -
 .../examples/dot_notation/DotNotation.php          |  20 -
 .../examples/dot_notation/dot_notation.mustache    |   5 -
 .../examples/dot_notation/dot_notation.txt         |   5 -
 .../examples/double_section/DoubleSection.php      |   9 -
 .../double_section/double_section.mustache         |   7 -
 .../examples/double_section/double_section.txt     |   3 -
 .../mustache.php/examples/escaped/Escaped.php      |   5 -
 .../mustache.php/examples/escaped/escaped.mustache |   1 -
 .../mustache.php/examples/escaped/escaped.txt      |   1 -
 .../grand_parent_context/GrandParentContext.php    |  24 -
 .../grand_parent_context.mustache                  |   7 -
 .../grand_parent_context/grand_parent_context.txt  |   7 -
 .../vendor/mustache.php/examples/i18n/I18n.php     |  20 -
 .../mustache.php/examples/i18n/i18n.mustache       |   1 -
 .../vendor/mustache.php/examples/i18n/i18n.txt     |   1 -
 .../implicit_iterator/ImplicitIterator.php         |   5 -
 .../implicit_iterator/implicit_iterator.mustache   |   3 -
 .../implicit_iterator/implicit_iterator.txt        |   5 -
 .../InvertedDoubleSection.php                      |   6 -
 .../inverted_double_section.mustache               |   7 -
 .../inverted_double_section.txt                    |   3 -
 .../examples/inverted_section/InvertedSection.php  |   5 -
 .../inverted_section/inverted_section.mustache     |   2 -
 .../examples/inverted_section/inverted_section.txt |   1 -
 .../mustache.php/examples/partials/Partials.php    |  13 -
 .../examples/partials/partials.mustache            |   2 -
 .../mustache.php/examples/partials/partials.txt    |   3 -
 .../PartialsWithViewClass.php                      |  19 -
 .../partials_with_view_class.mustache              |   2 -
 .../partials_with_view_class.txt                   |   3 -
 .../examples/pragma_unescaped/PragmaUnescaped.php  |   5 -
 .../pragma_unescaped/pragma_unescaped.mustache     |   3 -
 .../examples/pragma_unescaped/pragma_unescaped.txt |   2 -
 .../pragmas_in_partials/PragmasInPartials.php      |   8 -
 .../pragmas_in_partials.mustache                   |   3 -
 .../pragmas_in_partials/pragmas_in_partials.txt    |   2 -
 .../recursive_partials/RecursivePartials.php       |  16 -
 .../recursive_partials/recursive_partials.mustache |   1 -
 .../recursive_partials/recursive_partials.txt      |   1 -
 .../SectionIteratorObjects.php                     |  16 -
 .../section_iterator_objects.mustache              |   5 -
 .../section_iterator_objects.txt                   |   4 -
 .../section_magic_objects/SectionMagicObjects.php  |  26 -
 .../section_magic_objects.mustache                 |   6 -
 .../section_magic_objects.txt                      |   4 -
 .../examples/section_objects/SectionObjects.php    |  16 -
 .../section_objects/section_objects.mustache       |   6 -
 .../examples/section_objects/section_objects.txt   |   4 -
 .../mustache.php/examples/sections/Sections.php    |  14 -
 .../examples/sections/sections.mustache            |   5 -
 .../mustache.php/examples/sections/sections.txt    |   4 -
 .../examples/sections_nested/SectionsNested.php    |  33 -
 .../sections_nested/sections_nested.mustache       |   7 -
 .../examples/sections_nested/sections_nested.txt   |  12 -
 .../vendor/mustache.php/examples/simple/Simple.php |  12 -
 .../mustache.php/examples/simple/simple.mustache   |   5 -
 .../vendor/mustache.php/examples/simple/simple.txt |   3 -
 .../mustache.php/examples/unescaped/Unescaped.php  |   5 -
 .../examples/unescaped/unescaped.mustache          |   1 -
 .../mustache.php/examples/unescaped/unescaped.txt  |   1 -
 .../vendor/mustache.php/examples/utf8/UTF8.php     |   5 -
 .../mustache.php/examples/utf8/utf8.mustache       |   1 -
 .../vendor/mustache.php/examples/utf8/utf8.txt     |   1 -
 .../examples/utf8_unescaped/UTF8Unescaped.php      |   5 -
 .../utf8_unescaped/utf8_unescaped.mustache         |   1 -
 .../examples/utf8_unescaped/utf8_unescaped.txt     |   1 -
 .../examples/whitespace/Whitespace.php             |  37 -
 .../examples/whitespace/whitespace.mustache        |  10 -
 .../examples/whitespace/whitespace.txt             |  12 -
 .../vendor/mustache.php/test/MustacheCallTest.php  |  24 -
 .../mustache.php/test/MustacheExceptionTest.php    | 152 ----
 .../test/MustacheHigherOrderSectionsTest.php       | 114 ---
 .../mustache.php/test/MustacheInjectionTest.php    | 127 ---
 .../mustache.php/test/MustacheLoaderTest.php       |  60 --
 .../test/MustacheObjectSectionTest.php             |  73 --
 .../mustache.php/test/MustachePragmaTest.php       |  74 --
 .../test/MustachePragmaUnescapedTest.php           |  19 -
 .../vendor/mustache.php/test/MustacheSpecTest.php  | 174 ----
 .../vendor/mustache.php/test/MustacheTest.php      | 464 ----------
 .../vendor/mustache.php/test/fixtures/bar.mustache |   1 -
 .../vendor/mustache.php/test/fixtures/foo.mustache |   1 -
 .../vendor/mustache.php/test/lib/yaml/LICENSE      |  19 -
 .../mustache.php/test/lib/yaml/README.markdown     |  15 -
 .../test/lib/yaml/doc/00-Introduction.markdown     | 143 ----
 .../test/lib/yaml/doc/01-Usage.markdown            | 110 ---
 .../test/lib/yaml/doc/02-YAML.markdown             | 312 -------
 .../test/lib/yaml/doc/A-License.markdown           | 108 ---
 .../mustache.php/test/lib/yaml/lib/sfYaml.php      | 135 ---
 .../test/lib/yaml/lib/sfYamlDumper.php             |  60 --
 .../test/lib/yaml/lib/sfYamlInline.php             | 442 ----------
 .../test/lib/yaml/lib/sfYamlParser.php             | 622 --------------
 .../vendor/mustache.php/test/lib/yaml/package.xml  | 102 ---
 vendor/flexi/vendor/mustache.php/test/phpunit.xml  |  10 -
 vendor/trails/src/controller.php                   |  12 +-
 vendor/trails/trails-abridged.php                  |   3 +-
 vendor/trails/trails.php                           |  12 +-
 266 files changed, 1365 insertions(+), 9557 deletions(-)
 create mode 100644 lib/flexi/Factory.php
 create mode 100644 lib/flexi/PhpTemplate.php
 create mode 100644 lib/flexi/Template.php
 create mode 100644 lib/flexi/TemplateNotFoundException.php
 create mode 100644 tests/unit/lib/flexi/FactoryTest.php
 create mode 100644 tests/unit/lib/flexi/PHPTemplatePartialBugTest.php
 create mode 100644 tests/unit/lib/flexi/PHPTemplateTest.php
 create mode 100644 tests/unit/lib/flexi/TemplateEmptyTest.php
 create mode 100644 tests/unit/lib/flexi/TemplateMagicMethodsTest.php
 create mode 100644 tests/unit/lib/flexi/TemplateTest.php
 delete mode 100644 vendor/flexi/LICENSE
 delete mode 100644 vendor/flexi/README
 delete mode 100644 vendor/flexi/Rakefile
 delete mode 100644 vendor/flexi/examples/01_hello_world/index.php
 delete mode 100644 vendor/flexi/examples/01_hello_world/templates/hello_world.php
 delete mode 100644 vendor/flexi/examples/02_quotes/index.php
 delete mode 100644 vendor/flexi/examples/02_quotes/templates/quotes.php
 delete mode 100644 vendor/flexi/examples/03_layout/bgbody.gif
 delete mode 100644 vendor/flexi/examples/03_layout/index.php
 delete mode 100644 vendor/flexi/examples/03_layout/style.css
 delete mode 100644 vendor/flexi/examples/03_layout/templates/layout.php
 delete mode 100644 vendor/flexi/examples/03_layout/templates/quotes.php
 delete mode 100644 vendor/flexi/examples/04_handler_plugin/mustache.php
 delete mode 100644 vendor/flexi/examples/04_handler_plugin/templates/layout.php
 delete mode 100644 vendor/flexi/examples/04_handler_plugin/templates/mustache.mustache
 delete mode 100644 vendor/flexi/examples/xx_js_templates/index.php
 delete mode 100644 vendor/flexi/examples/xx_js_templates/templates/js_template.pjs
 delete mode 100644 vendor/flexi/flexi.php
 delete mode 100644 vendor/flexi/lib/exceptions.php
 delete mode 100644 vendor/flexi/lib/flexi.php
 delete mode 100644 vendor/flexi/lib/helper/js_helper.php
 delete mode 100644 vendor/flexi/lib/helper/prototype_helper.php
 delete mode 100644 vendor/flexi/lib/helper/scriptaculous_helper.php
 delete mode 100644 vendor/flexi/lib/helper/tag_helper.php
 delete mode 100644 vendor/flexi/lib/helper/text_helper.php
 delete mode 100644 vendor/flexi/lib/js_template.php
 delete mode 100644 vendor/flexi/lib/mustache_template.php
 delete mode 100644 vendor/flexi/lib/php_template.php
 delete mode 100644 vendor/flexi/lib/template.php
 delete mode 100644 vendor/flexi/lib/template_factory.php
 delete mode 100644 vendor/flexi/test/all_tests.php
 delete mode 100644 vendor/flexi/test/coverage.php
 delete mode 100644 vendor/flexi/test/flexi_tests.php
 delete mode 100644 vendor/flexi/test/lib/helper/js_helper_test.php
 delete mode 100644 vendor/flexi/test/lib/helper/prototype_helper_test.php
 delete mode 100644 vendor/flexi/test/lib/helper/scriptaculous_helper_test.php
 delete mode 100644 vendor/flexi/test/lib/helper/tag_helper_test.php
 delete mode 100644 vendor/flexi/test/lib/helper/text_helper_test.php
 delete mode 100644 vendor/flexi/test/lib/js_template_test.php
 delete mode 100644 vendor/flexi/test/lib/php_template_test.php
 delete mode 100644 vendor/flexi/test/lib/template_factory_test.php
 delete mode 100644 vendor/flexi/test/lib/template_test.php
 delete mode 100644 vendor/flexi/test/templates/factory_tests/baz.unknown_extension
 delete mode 100644 vendor/flexi/test/templates/factory_tests/foo.php
 delete mode 100644 vendor/flexi/test/templates/layout_with_partials/layout.php
 delete mode 100644 vendor/flexi/test/templates/layout_with_partials/partial.php
 delete mode 100644 vendor/flexi/test/templates/layout_with_partials/template.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/attributes.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/foo.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/foo_using_partial.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/foo_with_partial_collection.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/foos_partial.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/item.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/layouts/layout.php
 delete mode 100644 vendor/flexi/test/templates/template_tests/spacer.php
 delete mode 100644 vendor/flexi/test/varstream.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/LICENSE
 delete mode 100644 vendor/flexi/vendor/mustache.php/Mustache.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/MustacheLoader.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/README.markdown
 delete mode 100644 vendor/flexi/vendor/mustache.php/bin/create_example.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/child_context/ChildContext.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/child_context/child_context.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/child_context/child_context.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/comments/Comments.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/comments/comments.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/comments/comments.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/complex/complex.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/complex/complex.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/complex/complex.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/delimiters/Delimiters.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/dot_notation/DotNotation.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/double_section/DoubleSection.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/double_section/double_section.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/double_section/double_section.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/escaped/Escaped.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/escaped/escaped.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/escaped/escaped.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/grand_parent_context/GrandParentContext.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/i18n/I18n.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/i18n/i18n.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/i18n/i18n.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/implicit_iterator/ImplicitIterator.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/inverted_double_section/InvertedDoubleSection.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/inverted_section/InvertedSection.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/partials/Partials.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/partials/partials.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/partials/partials.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/PartialsWithViewClass.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/PragmaUnescaped.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/PragmasInPartials.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/recursive_partials/RecursivePartials.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/SectionIteratorObjects.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_magic_objects/SectionMagicObjects.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_objects/SectionObjects.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/sections/Sections.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/sections/sections.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/sections/sections.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/sections_nested/SectionsNested.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/simple/Simple.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/simple/simple.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/simple/simple.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/unescaped/Unescaped.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/utf8/UTF8.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/utf8/utf8.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/utf8/utf8.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/UTF8Unescaped.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/whitespace/Whitespace.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.txt
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheCallTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheExceptionTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheHigherOrderSectionsTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheInjectionTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheLoaderTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheObjectSectionTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustachePragmaTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustachePragmaUnescapedTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheSpecTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/MustacheTest.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/fixtures/bar.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/fixtures/foo.mustache
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/LICENSE
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/README.markdown
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/00-Introduction.markdown
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/01-Usage.markdown
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/02-YAML.markdown
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/A-License.markdown
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYaml.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlDumper.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlInline.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlParser.php
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/lib/yaml/package.xml
 delete mode 100644 vendor/flexi/vendor/mustache.php/test/phpunit.xml

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d262513..9ac30a3 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -32,6 +32,15 @@
 - Die Bibliothek `opis/json-schema` wurde auf Version 2.3.0 aktualisiert ([Issue #4173](https://gitlab.studip.de/studip/studip/-/issues/4173)). Dadurch ergeben sich die folgenden Änderungen für Komponenten aus Courseware (siehe auch [Migration Guide](https://opis.io/json-schema/2.x/php-migration.html#validator)):
   - Instanzen von `Courseware\ContainerTypes\BlockType` müssen die Methode `getJsonSchema` anpassen. Der Return Type ist nun `string` und es muss der Inhalt der Schema-Datei zurückgegeben werden ohne Aufruf von `Schema::fromJsonString()`.
   - Instanzen von `Courseware\ContainerTypes\ContainerType` müssen die Methode `getJsonSchema` anpassen. Der Return Type ist nun `string` und es muss der Inhalt der Schema-Datei zurückgegeben werden ohne Aufruf von `Schema::fromJsonString()`.
+- Die von Stud.IP verwendete Template-Bibliothek "Flexi Templates" wurde vollständig in den Kern integriert.
+  Obwohl die Umstellung abwärtskompatibel sein sollte, sollten die Klassen folgendermassen ersetzt werden:
+  - `Flexi_TemplateFactory` > `Flexi\Factory`
+  - `Flexi_Template` > `Flexi\Template`
+  - `Flexi_PhpTemplate` > `Flexi\PhpTemplate`
+  - `Flexi_TemplateNotFoundException` > `Flexi\TemplateNotFoundException`
+
+  Sollte ein Plugin manuell Flexi einbinden, so wird dies zu einem Fehler führen. Jegliches Einbinden von Dateien
+  unterhalb von `vendor/flexi` muss ersatzlos entfernt werden.
 
 ## Security related issues
 
diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 82c389b..27b6ca6 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -22,6 +22,7 @@
  * @category    Stud.IP
  * @since       3.1
  */
+
 require_once 'lib/meine_seminare_func.inc.php';
 require_once 'lib/object.inc.php';
 require_once 'lib/archiv.inc.php'; //for lastActivity in getCourses() method
@@ -420,7 +421,7 @@ class Admin_CoursesController extends AuthenticatedController
                 }
             }
         }
-        $tf = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
+        $tf = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
         switch ($GLOBALS['user']->cfg->MY_COURSES_ACTION_AREA) {
             case 1:
             case 2:
@@ -495,7 +496,7 @@ class Admin_CoursesController extends AuthenticatedController
                         $multimode = $plugin->useMultimode();
                         if ($multimode) {
                             $data['buttons_top'] = '<label>'._('Alle auswählen').'<input type="checkbox" data-proxyfor=".course-admin td:last-child :checkbox"></label>';
-                            if ($multimode instanceof Flexi_Template) {
+                            if ($multimode instanceof Flex\Template) {
                                 $data['buttons_bottom'] = $multimode->render();
                             } elseif ($multimode instanceof \Studip\Button) {
                                 $data['buttons_bottom'] = (string) $multimode;
@@ -715,11 +716,14 @@ class Admin_CoursesController extends AuthenticatedController
             foreach ($plugin->adminAvailableContents() as $index => $label) {
                 if (in_array($plugin->getPluginId() . '_' . $index, $activated_fields)) {
                     $content = $plugin->adminAreaGetCourseContent($course, $index);
-                    $d[$plugin->getPluginId()."_".$index] = $content instanceof Flexi_Template ? $content->render() : $content;
+                    if ($content instanceof Flexi\Template) {
+                        $content = $content->render();
+                    }
+                    $d[$plugin->getPluginId()."_".$index] = $content;
                 }
             }
         }
-        $tf = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'].'/app/views');
+        $tf = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'].'/app/views');
 
         switch ($GLOBALS['user']->cfg->MY_COURSES_ACTION_AREA) {
             case 1:
@@ -840,7 +844,10 @@ class Admin_CoursesController extends AuthenticatedController
                 foreach (PluginManager::getInstance()->getPlugins(AdminCourseAction::class) as $plugin) {
                     if ($GLOBALS['user']->cfg->MY_COURSES_ACTION_AREA === get_class($plugin)) {
                         $output = $plugin->getAdminCourseActionTemplate($course->getId());
-                        $d['action'] = $output instanceof Flexi_Template ? $output->render() : (string) $output;
+                        if ($output instanceof Flexi\Template) {
+                            $output = $output->render();
+                        }
+                        $d['action'] = (string) $output;
                         break;
                     }
                 }
@@ -1033,10 +1040,10 @@ class Admin_CoursesController extends AuthenticatedController
                     foreach ($plugin->adminAvailableContents() as $index => $label) {
                         if (in_array($plugin->getPluginId() . "_" . $index, $filter_config)) {
                             $content = $plugin->adminAreaGetCourseContent($course, $index);
-                            $row[$plugin->getPluginId() . "_" . $index] = strip_tags(is_a($content, 'Flexi_Template')
-                                ? $content->render()
-                                : $content
-                            );
+                            if ($content instanceof Flexi\Template) {
+                                $content = $content->render();
+                            }
+                            $row[$plugin->getPluginId() . "_" . $index] = strip_tags($content);
                         }
                     }
                 }
diff --git a/app/controllers/calendar/schedule.php b/app/controllers/calendar/schedule.php
index 88c4304..5d9a26e 100644
--- a/app/controllers/calendar/schedule.php
+++ b/app/controllers/calendar/schedule.php
@@ -143,7 +143,7 @@ class Calendar_ScheduleController extends AuthenticatedController
             'entry_height' => $this->calendar_view->getHeight()
         ];
 
-        $factory = new Flexi_TemplateFactory($this->dispatcher->trails_root . '/views');
+        $factory = new Flexi\Factory($this->dispatcher->trails_root . '/views');
         PageLayout::addStyle($factory->render('calendar/schedule/stylesheet', $style_parameters), 'screen, print');
 
         if (Request::option('printview')) {
diff --git a/app/controllers/file.php b/app/controllers/file.php
index 11b1949..095e295 100644
--- a/app/controllers/file.php
+++ b/app/controllers/file.php
@@ -980,7 +980,7 @@ class FileController extends AuthenticatedController
                 );
             } else {
                 $this->top_folder = $this->filesystemplugin->getFolder($folder_id, true);
-                if (is_a($this->top_folder, 'Flexi_Template')) {
+                if ($this->top_folder instanceof Flexi\Template) {
                     $this->top_folder->select    = true;
                     $this->top_folder->to_folder = $this->to_folder;
                     $this->render_text($this->top_folder);
@@ -1505,7 +1505,7 @@ class FileController extends AuthenticatedController
                     $folder_id = substr($folder_id, 0, strpos($folder_id, "?"));
                 }
                 $this->top_folder = $this->filesystemplugin->getFolder($folder_id, true);
-                if (is_a($this->top_folder, 'Flexi_Template')) {
+                if ($this->top_folder instanceof Flexi\Template) {
                     $this->top_folder->select    = true;
                     $this->top_folder->to_folder = $this->to_folder;
                     $this->render_text($this->top_folder->render());
diff --git a/app/controllers/resources/booking.php b/app/controllers/resources/booking.php
index 294aeaa..45ccb16 100644
--- a/app/controllers/resources/booking.php
+++ b/app/controllers/resources/booking.php
@@ -242,9 +242,7 @@ class Resources_BookingController extends AuthenticatedController
             return true;
         }
 
-        $template_factory = new Flexi_TemplateFactory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-        );
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
 
         $derived_resource = $booking->resource->getDerivedClassInstance();
         $system_lang = $_SESSION['_language'];
diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php
index 1484bbb..3da7904 100644
--- a/app/controllers/room_management/planning.php
+++ b/app/controllers/room_management/planning.php
@@ -1371,7 +1371,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         $export = Request::get('export');
         if ($export == 'html') {
             //Load the export template:
-            $factory = new Flexi_TemplateFactory(
+            $factory = new Flexi\Factory(
                 $GLOBALS['STUDIP_BASE_PATH'] . '/app/views/room_management/planning/'
             );
 
diff --git a/app/controllers/shared/download.php b/app/controllers/shared/download.php
index 92d15d9..f94bc86 100644
--- a/app/controllers/shared/download.php
+++ b/app/controllers/shared/download.php
@@ -158,7 +158,7 @@ class Shared_DownloadController extends AuthenticatedController
         }
 
         $path = $GLOBALS['STUDIP_BASE_PATH'] . '/app/views/shared/modul/';
-        $factory = new Flexi_TemplateFactory($path);
+        $factory = new Flexi\Factory($path);
 
         $template = $factory->open('_modul');
         $template->_ = function ($string) { return $this->_($string); };
@@ -166,7 +166,7 @@ class Shared_DownloadController extends AuthenticatedController
         $template->display_language = $display_language;
         $content = $template->render();
 
-        $factory = new \Flexi_TemplateFactory($path);
+        $factory = new Flexi\Factory($path);
         $type = 1;
         if (count($modul->modulteile) == 1) {
             $modulteil = $modul->modulteile->first();
diff --git a/app/controllers/start.php b/app/controllers/start.php
index 87c493e..3040d58 100644
--- a/app/controllers/start.php
+++ b/app/controllers/start.php
@@ -53,6 +53,8 @@ class StartController extends AuthenticatedController
             }
         }
 
+        $this->widget_layout = $this->get_template_factory()->open('start/_widget.php');
+
         $sidebar = Sidebar::get();
 
         $nav = $sidebar->addWidget(new NavigationWidget());
diff --git a/app/views/file/file_details.php b/app/views/file/file_details.php
index 76f996a..ddbd7e4 100644
--- a/app/views/file/file_details.php
+++ b/app/views/file/file_details.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @var Flexi_Template $this
- * @var FileController $controller
- * @var Flexi_Template|null $file_info_template
- * @var array $fullpath
- * @var FileType $file
- * @var string|null $previous_file_ref_id
- * @var string|null $next_file_ref_id
- * @var string|null $from_plugin
- * @var bool $include_navigation
+ * @var Flexi\Template      $this
+ * @var FileController      $controller
+ * @var Flexi\Template|null $file_info_template
+ * @var array               $fullpath
+ * @var FileType            $file
+ * @var string|null         $previous_file_ref_id
+ * @var string|null         $next_file_ref_id
+ * @var string|null         $from_plugin
+ * @var bool                $include_navigation
  */
 ?>
 <div id="file_details_window">
     <?= $this->render_partial('file/_file_aside.php') ?>
 
     <div id="preview_container">
-        <? if ($file_info_template instanceof Flexi_Template) : ?>
+        <? if ($file_info_template instanceof Flexi\Template) : ?>
             <?= $file_info_template->render() ?>
         <? endif ?>
         <h3><?=_('Pfad')?></h3>
diff --git a/app/views/file/folder_details.php b/app/views/file/folder_details.php
index 5bd6574..7d1fe04 100644
--- a/app/views/file/folder_details.php
+++ b/app/views/file/folder_details.php
@@ -10,7 +10,7 @@ $folder_template = $folder->getDescriptionTemplate();
         <? if (!empty($folder_template)) : ?>
             <h3><?= _('Beschreibung') ?></h3>
             <article>
-            <? if ($folder_template instanceof Flexi_Template): ?>
+            <? if ($folder_template instanceof Flexi\Template): ?>
                 <?= $folder_template->render() ?>
             <? else: ?>
                 <?= $folder_template ?>
diff --git a/app/views/file/new_edit_folder_form.php b/app/views/file/new_edit_folder_form.php
index d2dd931..32b9800 100644
--- a/app/views/file/new_edit_folder_form.php
+++ b/app/views/file/new_edit_folder_form.php
@@ -32,7 +32,7 @@
             <div class="text">
                 <?= htmlReady($folder_type['name']) ?>
             <? if ($template = $folder_type['instance']->getDescriptionTemplate()): ?>
-                <?= tooltipIcon($template instanceof Flexi_Template ? $template->render() : $template, false, true) ?>
+                <?= tooltipIcon($template instanceof Flexi\Template ? $template->render() : $template, false, true) ?>
             <? endif ?>
             </div>
             <div class="icon">
diff --git a/app/views/files/_fileref_tr.php b/app/views/files/_fileref_tr.php
index f282f79..fc486ae 100644
--- a/app/views/files/_fileref_tr.php
+++ b/app/views/files/_fileref_tr.php
@@ -75,7 +75,7 @@ if ($file->isDownloadable($GLOBALS['user']->id)) {
             data-sort-value="<?= htmlReady($file->getAdditionalColumnOrderWeigh($index)) ?>">
         <? $content = $file->getContentForAdditionalColumn($index) ?>
         <? if ($content) : ?>
-            <?= is_a($content, "Flexi_Template") ? $content->render() : $content ?>
+            <?= $content instanceof Flexi\Template ? $content->render() : $content ?>
         <? endif ?>
         </td>
     <? endforeach ?>
diff --git a/app/views/files/_folder_tr.php b/app/views/files/_folder_tr.php
index 09cd295..c3f77f6 100644
--- a/app/views/files/_folder_tr.php
+++ b/app/views/files/_folder_tr.php
@@ -61,7 +61,7 @@ if ($folder->isReadable($GLOBALS['user']->id)) {
             data-sort-value="<?= htmlReady($folder->getAdditionalColumnOrderWeigh($index)) ?>">
             <? $content = $folder->getContentForAdditionalColumn($index) ?>
             <? if ($content) : ?>
-                <?= is_a($content, "Flexi_Template") ? $content->render() : $content ?>
+                <?= $content instanceof Flexi\Template ? $content->render() : $content ?>
             <? endif ?>
         </td>
     <? endforeach ?>
diff --git a/app/views/files/flat.php b/app/views/files/flat.php
index a7d0c93..1440117 100644
--- a/app/views/files/flat.php
+++ b/app/views/files/flat.php
@@ -13,7 +13,7 @@ $vue_topFolder = [
     'description' => $topFolder->getDescriptionTemplate(),
     'additionalColumns' => $topFolder->getAdditionalColumns(),
 ];
-if (is_a($vue_topFolder['description'], "Flexi_Template")) {
+if ($vue_topFolder['description'] instanceof Flexi\Template) {
     $vue_topFolder['description'] = $vue_topFolder['description']->render();
 }
 $vue_topFolder['buttons'] = '<span class="multibuttons">';
diff --git a/app/views/files/index.php b/app/views/files/index.php
index 94ae3f4..6bf28f7 100644
--- a/app/views/files/index.php
+++ b/app/views/files/index.php
@@ -23,7 +23,7 @@
         'additionalColumns' => $topFolder->getAdditionalColumns(),
         'buttons' => null
     ];
-    if (is_a($vue_topFolder['description'], "Flexi_Template")) {
+    if ($vue_topFolder['description'] instanceof Flexi\Template) {
         $vue_topFolder['description'] = $vue_topFolder['description']->render();
     }
     $vue_files = [];
diff --git a/app/views/start/index.php b/app/views/start/index.php
index f4e7fcc..1fa65ca 100644
--- a/app/views/start/index.php
+++ b/app/views/start/index.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @var array $columns
+ * @var Flexi\Template $widget_layout
  */
 ?>
 <h1 class="sr-only">
@@ -29,7 +30,7 @@ if (Config::get()->BANNER_ADS_ENABLE) {
                 <li class="studip-widget-wrapper" id="<?= $widget->getPluginId() ?>">
                     <div class="ui-widget-content studip-widget">
                         <? if ($template = $widget->getPortalTemplate()): ?>
-                            <? $template->set_layout($this->_factory->open('start/_widget')) ?>
+                            <? $template->set_layout($widget_layout) ?>
                             <?= $this->render_partial($template, compact('widget')) ?>
                         <? else: ?>
                             <?= $this->render_partial('start/_widget', compact('widget')) ?>
diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
index 63275f0..7fdbc00 100644
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
+++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
@@ -207,7 +207,7 @@ class ConditionalAdmission extends AdmissionRule
         // Open generic admission rule template.
         $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
         $tpl->set_attribute('rule', $this);
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
         // Now open specific template for this rule and insert base template.
         $tpl2 = $factory->open('configure');
         $tpl2->set_attribute('rule', $this);
@@ -471,7 +471,7 @@ class ConditionalAdmission extends AdmissionRule
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php
index a502971..a3309e8 100644
--- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php
+++ b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php
@@ -253,8 +253,8 @@ class CourseMemberAdmission extends AdmissionRule
         return '';
     }
 
-    private function getTemplateFactory(): Flexi_TemplateFactory
+    private function getTemplateFactory(): Flexi\Factory
     {
-        return new Flexi_TemplateFactory(__DIR__ . '/templates/');
+        return new Flexi\Factory(__DIR__ . '/templates/');
     }
 }
diff --git a/lib/admissionrules/limitedadmission/LimitedAdmission.class.php b/lib/admissionrules/limitedadmission/LimitedAdmission.class.php
index b0cb1ca..a193bda 100644
--- a/lib/admissionrules/limitedadmission/LimitedAdmission.class.php
+++ b/lib/admissionrules/limitedadmission/LimitedAdmission.class.php
@@ -126,7 +126,7 @@ class LimitedAdmission extends AdmissionRule
         // Open generic admission rule template.
         $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
         $tpl->set_attribute('rule', $this);
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         // Now open specific template for this rule and insert base template.
         $tpl2 = $factory->open('configure');
         $tpl2->set_attribute('rule', $this);
@@ -248,7 +248,7 @@ class LimitedAdmission extends AdmissionRule
      * @return String
      */
     public function toString() {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
diff --git a/lib/admissionrules/lockedadmission/LockedAdmission.class.php b/lib/admissionrules/lockedadmission/LockedAdmission.class.php
index c313d55..0ca324b 100644
--- a/lib/admissionrules/lockedadmission/LockedAdmission.class.php
+++ b/lib/admissionrules/lockedadmission/LockedAdmission.class.php
@@ -72,7 +72,7 @@ class LockedAdmission extends AdmissionRule
      * @return String
      */
     public function getTemplate() {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         // Now open specific template for this rule and insert base template. 
         $tpl = $factory->open('configure');
         $tpl->set_attribute('rule', $this);
@@ -125,7 +125,7 @@ class LockedAdmission extends AdmissionRule
      * @return String
      */
     public function toString() {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
@@ -133,4 +133,4 @@ class LockedAdmission extends AdmissionRule
 
 } /* end of class LockedAdmission */
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php
index a64b88a..28a910d 100644
--- a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php
+++ b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php
@@ -107,7 +107,7 @@ class ParticipantRestrictedAdmission extends AdmissionRule
      */
     public function getTemplate()
     {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         // Open specific template for this rule and insert base template.
         $tpl = $factory->open('configure');
         $tpl->set_attribute('rule', $this);
@@ -199,7 +199,7 @@ class ParticipantRestrictedAdmission extends AdmissionRule
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
diff --git a/lib/admissionrules/passwordadmission/PasswordAdmission.class.php b/lib/admissionrules/passwordadmission/PasswordAdmission.class.php
index 6a99066..0650630 100644
--- a/lib/admissionrules/passwordadmission/PasswordAdmission.class.php
+++ b/lib/admissionrules/passwordadmission/PasswordAdmission.class.php
@@ -80,7 +80,7 @@ class PasswordAdmission extends AdmissionRule
      * @return String A template-based input form.
      */
     public function getInput() {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         $tpl = $factory->open('input');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
@@ -111,7 +111,7 @@ class PasswordAdmission extends AdmissionRule
         // Open generic admission rule template.
         $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
         $tpl->set_attribute('rule', $this);
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         // Now open specific template for this rule and insert base template.
         $tpl2 = $factory->open('configure');
         $tpl2->set_attribute('rule', $this);
@@ -214,7 +214,7 @@ class PasswordAdmission extends AdmissionRule
      * @return String
      */
     public function toString() {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
index 6bb6ceb..bee3e19 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
@@ -338,7 +338,7 @@ class PreferentialAdmission extends AdmissionRule
      */
     public function getTemplate()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__.'/templates/');
+        $factory = new Flexi\Factory(__DIR__.'/templates/');
         // Now open specific template for this rule and insert base template.
         $tpl = $factory->open('configure');
         $tpl->set_attribute('rule', $this);
@@ -503,7 +503,7 @@ class PreferentialAdmission extends AdmissionRule
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__.'/templates/');
+        $factory = new Flexi\Factory(__DIR__.'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.class.php b/lib/admissionrules/termsadmission/TermsAdmission.class.php
index 112a12e..50c8712 100644
--- a/lib/admissionrules/termsadmission/TermsAdmission.class.php
+++ b/lib/admissionrules/termsadmission/TermsAdmission.class.php
@@ -61,16 +61,16 @@ class TermsAdmission extends AdmissionRule
     /**
      * Shows an input form
      *
-     * @return String A template-based input form.
-     * @throws Flexi_TemplateNotFoundException
+     * @return string A template-based input form.
+     * @throws Flexi\TemplateNotFoundException
      */
     public function getInput()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__ . '/templates');
+        $factory = new Flexi\Factory(__DIR__ . '/templates');
         $template = $factory->open('input');
         $template->rule = $this;
 
-        return MessageBox::info($template->render())->hideClose(true);
+        return (string) MessageBox::info($template->render())->hideClose();
     }
 
     /**
@@ -84,11 +84,11 @@ class TermsAdmission extends AdmissionRule
      * Gets the template that provides a configuration GUI for this rule.
      *
      * @return String
-     * @throws Flexi_TemplateNotFoundException
+     * @throws Flexi\TemplateNotFoundException
      */
     public function getTemplate()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__ . '/templates');
+        $factory = new Flexi\Factory(__DIR__ . '/templates');
         $template = $factory->open('configure');
         $template->rule = $this;
 
@@ -158,11 +158,11 @@ class TermsAdmission extends AdmissionRule
      * A textual description of the current rule.
      *
      * @return String
-     * @throws Flexi_TemplateNotFoundException
+     * @throws Flexi\TemplateNotFoundException
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(__DIR__ . '/templates/');
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
         $template = $factory->open('info');
         $template->rule = $this;
 
diff --git a/lib/admissionrules/timedadmission/TimedAdmission.class.php b/lib/admissionrules/timedadmission/TimedAdmission.class.php
index 735fdee..e167bd8 100644
--- a/lib/admissionrules/timedadmission/TimedAdmission.class.php
+++ b/lib/admissionrules/timedadmission/TimedAdmission.class.php
@@ -101,7 +101,7 @@ class TimedAdmission extends AdmissionRule
      * @return String
      */
     public function getTemplate() {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         // Open specific template for this rule and insert base template.
         $tpl = $factory->open('configure');
         $tpl->set_attribute('rule', $this);
@@ -213,7 +213,7 @@ class TimedAdmission extends AdmissionRule
      */
     public function toString()
     {
-        $factory = new Flexi_TemplateFactory(dirname(__FILE__).'/templates/');
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
         $tpl = $factory->open('info');
         $tpl->set_attribute('rule', $this);
         return $tpl->render();
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index 1f3f6d4..0bbad81 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -51,11 +51,18 @@ StudipAutoloader::addAutoloadPath('lib/raumzeit');
 StudipAutoloader::addAutoloadPath('lib/resources');
 StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
 
-StudipAutoloader::addAutoloadPath('lib/extern');
 StudipAutoloader::addAutoloadPath('lib/calendar/lib');
 StudipAutoloader::addAutoloadPath('lib/elearning');
+StudipAutoloader::addAutoloadPath('lib/extern');
 StudipAutoloader::addAutoloadPath('lib/ilias_interface');
 
+// Flexi
+StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
+class_alias(Flexi\PhpTemplate::class, 'Flexi_PhpTemplate');
+class_alias(Flexi\Template::class, 'Flexi_Template');
+class_alias(Flexi\Factory::class, 'Flexi_TemplateFactory');
+class_alias(Flexi\TemplateNotFoundException::class, 'Flexi_TemplateNotFoundException');
+
 // Messy file names
 StudipAutoloader::addClassLookups([
     'email_validation_class' => 'lib/phplib/email_validation.class.php',
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 0c66a97..e9c9bb5 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -54,7 +54,7 @@ $ABSOLUTE_URI_STUDIP = "";
 if (isset($_SERVER['SERVER_NAME'])) {
     // work around possible bug in lighttpd
     if (mb_strpos($_SERVER['SERVER_NAME'], ':') !== false) {
-        list($_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT']) =
+        [$_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT']] =
             explode(':', $_SERVER['SERVER_NAME']);
     }
 
@@ -125,8 +125,7 @@ Assets::set_assets_url($GLOBALS['ASSETS_URL']);
 Assets::set_assets_path($GLOBALS['ASSETS_PATH']);
 
 // globale template factory anlegen
-require_once 'vendor/flexi/lib/flexi.php';
-$GLOBALS['template_factory'] = new Flexi_TemplateFactory("{$STUDIP_BASE_PATH}/templates");
+$GLOBALS['template_factory'] = new Flexi\Factory("{$STUDIP_BASE_PATH}/templates");
 
 // set default pdo connection
 try {
diff --git a/lib/calendar/CalendarView.class.php b/lib/calendar/CalendarView.class.php
index fc69127..3d89ef1 100644
--- a/lib/calendar/CalendarView.class.php
+++ b/lib/calendar/CalendarView.class.php
@@ -214,7 +214,7 @@ class CalendarView
             'whole_height' => $this->getOverallHeight(),
             'entry_height' => $this->getHeight()
         ];
-        $factory = new Flexi_TemplateFactory(dirname(__file__).'/../../app/views');
+        $factory = new Flexi\Factory(dirname(__file__).'/../../app/views');
         PageLayout::addStyle($factory->render('calendar/schedule/stylesheet', $style_parameters));
 
         $template = $GLOBALS['template_factory']->open("calendar/calendar_view.php");
diff --git a/lib/classes/Fullcalendar.class.php b/lib/classes/Fullcalendar.class.php
index 467b583..db8364a 100644
--- a/lib/classes/Fullcalendar.class.php
+++ b/lib/classes/Fullcalendar.class.php
@@ -64,7 +64,7 @@ class Fullcalendar
 
     public function render()
     {
-        $factory = new \Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+        $factory = new \Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
         $template = $factory->open('studip-fullcalendar.php');
         $real_data_name = sprintf('data-%s', $this->data_name);
         return $template->render(
diff --git a/lib/classes/I18N.php b/lib/classes/I18N.php
index d34ed0b..44252f3 100644
--- a/lib/classes/I18N.php
+++ b/lib/classes/I18N.php
@@ -61,10 +61,10 @@ class I18N
     /**
      * Protected constructor in order to always force a specific input type.
      *
-     * @param string|Flexi_Template $template   Template to use
+     * @param string|Flexi\Template $template   Template to use
      * @param string                $name       Name of the element
      * @param string|I18NString     $value      Value of the element
-     * @param array           $attributes Additional variables for the
+     * @param array                 $attributes Additional variables for the
      *                                          element
      */
     final protected function __construct($template, $name, $value, array $attributes)
diff --git a/lib/classes/QuestionType.interface.php b/lib/classes/QuestionType.interface.php
index ada6005..03019fe 100644
--- a/lib/classes/QuestionType.interface.php
+++ b/lib/classes/QuestionType.interface.php
@@ -60,7 +60,8 @@ interface QuestionType {
      *
      * Try to prefix all your input variables at least with the id of the question,
      * so that they will never conflict with other variables.
-     * @return Flexi_Template
+     *
+     * @return Flexi\Template
      */
     public function getDisplayTemplate();
 
@@ -82,11 +83,13 @@ interface QuestionType {
 
     /**
      * Returns a template with the results of this question.
+     *
      * @param $only_user_ids : array\null array of user_ids that the results should be restricted to.
      *                         this is used to show only a subset of results to the user for
      *                         visible evaluation of the results. If the questionnaire is anonymous
      *                         just do nothing.
-     * @return Flexi_Template
+     *
+     * @return Flexi\Template
      */
     public function getResultTemplate($only_user_ids = null);
 
diff --git a/lib/classes/Seminar.class.php b/lib/classes/Seminar.class.php
index 8aa3d41..a2d69ea 100644
--- a/lib/classes/Seminar.class.php
+++ b/lib/classes/Seminar.class.php
@@ -1735,7 +1735,7 @@ class Seminar
      */
     public function getDatesTemplate($template, $params = [])
     {
-        if (!$template instanceof Flexi_Template && is_string($template)) {
+        if (!$template instanceof Flexi\Template && is_string($template)) {
             $template = $GLOBALS['template_factory']->open($template);
         }
 
diff --git a/lib/classes/Siteinfo.php b/lib/classes/Siteinfo.php
index 0d849ca..4a969ee 100644
--- a/lib/classes/Siteinfo.php
+++ b/lib/classes/Siteinfo.php
@@ -281,7 +281,7 @@ class SiteinfoMarkupEngine {
 
     function __construct() {
         $this->db = DBManager::get();
-        $this->template_factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/siteinfo/markup/');
+        $this->template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/siteinfo/markup/');
         $this->siteinfoMarkup("/\(:version:\)/", [$this, 'version']);
         $this->siteinfoMarkup("/\(:uniname:\)/", [$this, 'uniName']);
         $this->siteinfoMarkup("/\(:unicontact:\)/", [$this, 'uniContact']);
@@ -659,7 +659,7 @@ function language_filter($input) {
 }
 
 function stripforeignlanguage($language, $text) {
-    list($primary, $sub) = explode('_',$_SESSION['_language']);
+    [$primary, $sub] = explode('_',$_SESSION['_language']);
     if ($language === $primary || $language === $_SESSION['_language']) {
         return str_replace('\"', '"', $text);
     } else {
diff --git a/lib/classes/StudipFileloader.php b/lib/classes/StudipFileloader.php
index 661c062..aab0b31 100644
--- a/lib/classes/StudipFileloader.php
+++ b/lib/classes/StudipFileloader.php
@@ -31,7 +31,7 @@ class StudipFileloader
                 !file_exists($file)
                 && !stream_resolve_include_path($file)
             ) {
-                continue;
+                throw new Exception('Missing file '. $file);
             }
             include $file;
         }
diff --git a/lib/classes/coursewizardsteps/AdvancedBasicDataWizardStep.php b/lib/classes/coursewizardsteps/AdvancedBasicDataWizardStep.php
index 780f837..cd33fd3 100644
--- a/lib/classes/coursewizardsteps/AdvancedBasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/AdvancedBasicDataWizardStep.php
@@ -36,7 +36,7 @@ class AdvancedBasicDataWizardStep extends BasicDataWizardStep
         }
 
         // Load template from step template directory.
-        $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/course/wizard/steps');
+        $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/course/wizard/steps');
         $template = $factory->open('advancedbasicdata/index');
 
         $template = $this->setupTemplateAttributes($template, $values, $stepnumber, $temp_id);
diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index 6a1438f..d47c4f3 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -28,7 +28,7 @@ class BasicDataWizardStep implements CourseWizardStep
     public function getStepTemplate($values, $stepnumber, $temp_id)
     {
         // Load template from step template directory.
-        $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps');
+        $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps');
         if (!empty($values[__CLASS__]['studygroup'])) {
             $tpl = $factory->open('basicdata/index_studygroup');
             $values[__CLASS__]['lecturers'][$GLOBALS['user']->id] = 1;
diff --git a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
index f343730..e79e1bd 100644
--- a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
+++ b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
@@ -39,7 +39,7 @@ class LVGroupsWizardStep implements CourseWizardStep
         $values = $values[__CLASS__] ?? [];
 
         // Load template from step template directory.
-        $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps');
+        $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps');
         $tpl = $factory->open('lvgroups/index');
         $tpl->set_attribute('values', $values);
 
@@ -226,7 +226,7 @@ class LVGroupsWizardStep implements CourseWizardStep
                 continue;
             }
 
-            $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
+            $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
             $html = $factory->render('course/wizard/steps/lvgroups/lvgroup_searchentry', compact('area'));
             $data = [
                 'id' => $area->id,
@@ -288,7 +288,7 @@ class LVGroupsWizardStep implements CourseWizardStep
             'Studiengang']);
         $pathes = ModuleManagementModelTreeItem::getPathes($trails);
 
-        $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
+        $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
         $html = $factory->render('course/lvgselector/entry_trails',
                 compact('area', 'pathes'));
 
@@ -308,7 +308,7 @@ class LVGroupsWizardStep implements CourseWizardStep
         $mvvid = explode('-', $id);
         $area = Lvgruppe::find($mvvid[0]);
 
-        $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
+        $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views');
         $html = $factory->render('course/wizard/steps/lvgroups/lvgroup_entry', ['area' => $area, 'locked' => false, 'course_id' => '']);
 
         $data = [
diff --git a/lib/classes/coursewizardsteps/StudyAreasWizardStep.php b/lib/classes/coursewizardsteps/StudyAreasWizardStep.php
index 29de617..eac7e37 100644
--- a/lib/classes/coursewizardsteps/StudyAreasWizardStep.php
+++ b/lib/classes/coursewizardsteps/StudyAreasWizardStep.php
@@ -30,7 +30,7 @@ class StudyAreasWizardStep implements CourseWizardStep
         // We only need our own stored values here.
         $values = $values[get_class($this)] ?? [];
         // Load template from step template directory.
-        $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/course/wizard/steps');
+        $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'].'/app/views/course/wizard/steps');
         $tpl = $factory->open('studyareas/index');
         if (!empty($values['studyareas'])) {
             $tree = $this->buildPartialSemTree(StudipStudyArea::backwards(StudipStudyArea::findMany($values['studyareas'])));
diff --git a/lib/classes/forms/Form.php b/lib/classes/forms/Form.php
index 8977a37..36a2e7d 100644
--- a/lib/classes/forms/Form.php
+++ b/lib/classes/forms/Form.php
@@ -492,7 +492,7 @@ class Form extends Part
     /**
      * Renders the whole form as a string.
      * @return string
-     * @throws \Flexi_TemplateNotFoundException
+     * @throws \Flexi\TemplateNotFoundException
      */
     public function render()
     {
diff --git a/lib/classes/librarysearch/LibraryDocument.class.php b/lib/classes/librarysearch/LibraryDocument.class.php
index 4c90e0b4..46e11b2 100644
--- a/lib/classes/librarysearch/LibraryDocument.class.php
+++ b/lib/classes/librarysearch/LibraryDocument.class.php
@@ -14,7 +14,6 @@
  * @since       4.6
  */
 
-
 /**
  * This class represents a document from a library.
  */
@@ -386,12 +385,12 @@ class LibraryDocument
 
 
     /**
-     * @returns Flexi_Template A template containing information about the
+     * @returns Flexi\Template A template containing information about the
      *     the document.
      */
     public function getInfoTemplate($format = 'short')
     {
-        $factory = new Flexi_TemplateFactory(
+        $factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/templates/library/'
         );
         $template = $factory->open('library_document_info');
diff --git a/lib/classes/sidebar/TemplateWidget.php b/lib/classes/sidebar/TemplateWidget.php
index c937c3b..2ca2d70 100644
--- a/lib/classes/sidebar/TemplateWidget.php
+++ b/lib/classes/sidebar/TemplateWidget.php
@@ -15,10 +15,10 @@ class TemplateWidget extends SidebarWidget
      * Constructor of the widget.
      *
      * @param String         $title     Title of the widget
-     * @param Flexi_Template $template  Template for the widget
+     * @param Flexi\Template $template  Template for the widget
      * @param array          $variables Associated variables for the template
      */
-    public function __construct($title, Flexi_Template $template, array $variables = [])
+    public function __construct($title, Flexi\Template $template, array $variables = [])
     {
         parent::__construct();
 
diff --git a/lib/filesystem/CourseDateFolder.php b/lib/filesystem/CourseDateFolder.php
index 2ab0435..7c91c87 100644
--- a/lib/filesystem/CourseDateFolder.php
+++ b/lib/filesystem/CourseDateFolder.php
@@ -92,7 +92,7 @@ class CourseDateFolder extends PermissionEnabledFolder implements FolderType
     /**
      * This method returns the special part for the edit template
      *
-     * @return Flexi_Template  edit template
+     * @return Flexi\Template  edit template
      */
     public function getEditTemplate()
     {
@@ -126,7 +126,7 @@ class CourseDateFolder extends PermissionEnabledFolder implements FolderType
     /**
      * Returns the description template
      *
-     * @return Flexi_Template description template
+     * @return Flexi\Template description template
      */
     public function getDescriptionTemplate()
     {
diff --git a/lib/filesystem/CoursePublicFolder.php b/lib/filesystem/CoursePublicFolder.php
index 463fe19..6fa722d 100644
--- a/lib/filesystem/CoursePublicFolder.php
+++ b/lib/filesystem/CoursePublicFolder.php
@@ -112,7 +112,7 @@ class CoursePublicFolder extends StandardFolder
     /**
      * Returns the edit template for this folder type.
      *
-     * @return Flexi_Template
+     * @return Flexi\Template
      */
     public function getEditTemplate()
     {
diff --git a/lib/filesystem/FileType.php b/lib/filesystem/FileType.php
index 5a53896..3dcd32f 100644
--- a/lib/filesystem/FileType.php
+++ b/lib/filesystem/FileType.php
@@ -177,10 +177,12 @@ interface FileType
     public function convertToStandardFile();
 
     /**
-     * Returns the content for that additional column, if it exists. You can return null a string
-     * or a Flexi_Template as the content.
+     * Returns the content for that additional column, if it exists. You can
+     * return null, a string or a Flexi\Template as the content.
+     *
      * @param string $column_index
-     * @return null|string|Flexi_Template
+     *
+     * @return null|string|Flexi\Template
      */
     public function getContentForAdditionalColumn($column_index);
 
@@ -194,14 +196,14 @@ interface FileType
 
 
     /**
-     * Generates a Flexi_Template containing additional information that are
+     * Generates a Flexi\Template containing additional information that are
      * displayes in the information dialog of a file.
      *
      * @param bool $include_downloadable_infos Whether to include information
      *     like file previews that can be downloaded (true) or to not
      *     include them (false). Defaults to false.
      *
-     * @returns Flexi_Template|null Either a Flexi_Template containing
+     * @returns Flexi\Template|null Either a Flexi\Template containing
      *     additional information or null if no such information shall be
      *     displayed in the information dialog.
      */
diff --git a/lib/filesystem/FolderType.php b/lib/filesystem/FolderType.php
index 94d8667..69dae30 100644
--- a/lib/filesystem/FolderType.php
+++ b/lib/filesystem/FolderType.php
@@ -119,7 +119,7 @@ interface FolderType
     /**
      * returns description of the folder
      *
-     * @return Flexi_Template | string
+     * @return Flexi\Template | string
      */
     public function getDescriptionTemplate();
 
@@ -144,7 +144,7 @@ interface FolderType
     /**
      * returns template form, must not contain opening and closing <form> tags
      *
-     * @return Flexi_Template | string
+     * @return Flexi\Template | string
      */
     public function getEditTemplate();
 
@@ -243,10 +243,12 @@ interface FolderType
     public function getAdditionalColumns();
 
     /**
-     * Returns the content for that additional column, if it exists. You can return null a string
-     * or a Flexi_Template as the content.
+     * Returns the content for that additional column, if it exists. You can
+     * return null, a string or a Flexi\Template as the content.
+     *
      * @param string $column_index
-     * @return null|string|Flexi_Template
+     *
+     * @return null|string|Flexi\Template
      */
     public function getContentForAdditionalColumn($column_index);
 
diff --git a/lib/filesystem/HiddenFolder.php b/lib/filesystem/HiddenFolder.php
index b29f5fb..4daee0b 100644
--- a/lib/filesystem/HiddenFolder.php
+++ b/lib/filesystem/HiddenFolder.php
@@ -78,7 +78,7 @@ class HiddenFolder extends PermissionEnabledFolder
     /**
      * Returns the edit template for this folder type.
      *
-     * @return Flexi_Template
+     * @return Flexi\Template
      */
     public function getEditTemplate()
     {
diff --git a/lib/filesystem/InboxOutboxFolder.php b/lib/filesystem/InboxOutboxFolder.php
index 9386be4..6a8f2fd 100644
--- a/lib/filesystem/InboxOutboxFolder.php
+++ b/lib/filesystem/InboxOutboxFolder.php
@@ -269,10 +269,12 @@ class InboxOutboxFolder implements FolderType
     }
 
     /**
-     * Returns the content for that additional column, if it exists. You can return null a string
-     * or a Flexi_Template as the content.
+     * Returns the content for that additional column, if it exists. You can
+     * return null, a string or a Flexi\Template as the content.
+     *
      * @param string $column_index
-     * @return null|string|Flexi_Template
+     *
+     * @return null|string|Flexi\Template
      */
     public function getContentForAdditionalColumn($column_index)
     {
diff --git a/lib/filesystem/PublicFolder.php b/lib/filesystem/PublicFolder.php
index 6b06ac9..2dc4847 100644
--- a/lib/filesystem/PublicFolder.php
+++ b/lib/filesystem/PublicFolder.php
@@ -160,7 +160,7 @@ class PublicFolder extends StandardFolder
     /**
      * Returns the edit template for this folder type.
      *
-     * @return Flexi_Template
+     * @return Flexi\Template
      */
     public function getEditTemplate()
     {
diff --git a/lib/filesystem/RootFolder.php b/lib/filesystem/RootFolder.php
index 0727770..9771c32 100644
--- a/lib/filesystem/RootFolder.php
+++ b/lib/filesystem/RootFolder.php
@@ -86,7 +86,7 @@ class RootFolder extends StandardFolder
     }
 
     /**
-     * @return Flexi_Template
+     * @return Flexi\Template
      */
     public function getEditTemplate()
     {
diff --git a/lib/filesystem/StandardFile.php b/lib/filesystem/StandardFile.php
index 9d2d35c..4eb3140 100644
--- a/lib/filesystem/StandardFile.php
+++ b/lib/filesystem/StandardFile.php
@@ -460,9 +460,11 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
 
     /**
      * Returns the content for that additional column, if it exists. You can return null a string
-     * or a Flexi_Template as the content.
+     * or a Flexi\Template as the content.
+     *
      * @param string $column_index
-     * @return null|string|Flexi_Template
+     *
+     * @return null|string|Flexi\Template
      */
     public function getContentForAdditionalColumn($column_index)
     {
@@ -497,7 +499,7 @@ class StandardFile implements FileType, ArrayAccess, StandardFileInterface
             return null;
         }
 
-        $factory = new Flexi_TemplateFactory(
+        $factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/templates/filesystem/file_types/'
         );
         $template = $factory->open('standard_file_info');
diff --git a/lib/filesystem/StandardFolder.php b/lib/filesystem/StandardFolder.php
index a34ca4a..bbbb1fc 100644
--- a/lib/filesystem/StandardFolder.php
+++ b/lib/filesystem/StandardFolder.php
@@ -186,7 +186,7 @@ class StandardFolder implements FolderType
     }
 
     /**
-     * @return string|Flexi_Template
+     * @return string|Flexi\Template
      */
     public function getDescriptionTemplate()
     {
@@ -194,7 +194,7 @@ class StandardFolder implements FolderType
     }
 
     /**
-     * @return string|Flexi_Template
+     * @return string|Flexi\Template
      */
     public function getEditTemplate()
     {
@@ -509,9 +509,11 @@ class StandardFolder implements FolderType
 
     /**
      * Returns the content for that additional column, if it exists. You can return null a string
-     * or a Flexi_Template as the content.
+     * or a Flexi\Template as the content.
+     *
      * @param string $column_index
-     * @return null|string|Flexi_Template
+     *
+     * @return null|string|Flexi\Template
      */
     public function getContentForAdditionalColumn($column_index)
     {
diff --git a/lib/filesystem/TimedFolder.php b/lib/filesystem/TimedFolder.php
index 442c084..d5f933b 100644
--- a/lib/filesystem/TimedFolder.php
+++ b/lib/filesystem/TimedFolder.php
@@ -132,7 +132,7 @@ class TimedFolder extends PermissionEnabledFolder
     /**
      * Returns the description template for a instance of a TimedFolder type.
      *
-     * @return Flexi_Template A description template for a instance of the type TimedFolder
+     * @return Flexi\Template A description template for a instance of the type TimedFolder
      */
     public function getDescriptionTemplate()
     {
@@ -155,7 +155,7 @@ class TimedFolder extends PermissionEnabledFolder
     /**
      * Returns the edit template for this folder type.
      *
-     * @return Flexi_Template
+     * @return Flexi\Template
      */
     public function getEditTemplate()
     {
diff --git a/lib/flexi/Factory.php b/lib/flexi/Factory.php
new file mode 100644
index 0000000..b6c30fd
--- /dev/null
+++ b/lib/flexi/Factory.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Using this factory you can create new Template objects.
+ *
+ * @copyright 2008 Marcus Lunzenauer <mlunzena@uos.de>
+ * @author Marcus Lunzenauer <mlunzena@uos.de>
+ * @license MIT
+ */
+
+namespace Flexi;
+
+class Factory
+{
+    /**
+     * mapping of file extensions to supported template classes
+     */
+    protected array $handlers = [
+        'php' => [PhpTemplate::class, []],
+    ];
+
+    /**
+     * Constructor of TemplateFactory.
+     *
+     * @param string $path the template include path
+     */
+    public function __construct(protected string $path)
+    {
+        $this->set_path($path);
+    }
+
+    /**
+     * Sets a new include path for the factory and returns the old one.
+     *
+     * @param string $path the new path
+     *
+     * @return string the old path
+     */
+    public function set_path(string $path): string
+    {
+        $old_path = $this->get_path();
+
+        if (!str_ends_with($path, '/')) {
+            $path .= '/';
+        }
+
+        $this->path = $path;
+
+        return $old_path;
+    }
+
+    /**
+     * Returns the include path of the factory
+     *
+     * @return string the current include path
+     */
+    public function get_path(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * Open a template of the given name using the factory method pattern.
+     * If a string was given, the path of the factory is searched for a matching
+     * template.
+     * If this string starts with a slash or with /\w+:\/\//, the string is
+     * interpreted as an absolute path. Otherwise the path of the factory will be
+     * prepended.
+     * After that the factory searches for a file extension in this string. If
+     * there is none, the directory where the template is supposed to live is
+     * searched for a file starting with the template string and a supported
+     * file extension.
+     * At last the factory instantiates a template object of the matching template
+     * class.
+     *
+     * Examples:
+     *
+     *   $factory->open('/path/to/template')
+     *     does not prepend the factory's path but searches for "template.*" in
+     *     "/path/to"
+     *
+     *   $factory->open('template')
+     *     prepends the factory's path and searches there for "template.*"
+     *
+     *  $factory->open('template.php')
+     *     prepends the factory's path but does not search and instantiates a
+     *     PHPTemplate instead
+     *
+     * This method returns it's parameter, if it is not a string. This
+     * functionality is useful for helper methods like #render_partial
+     *
+     * @param Template|string $template A name of a template.
+     * @return Template the factored object
+     * @throws TemplateNotFoundException if the template could not be found
+     */
+    public function open(Template|string $template): Template
+    {
+        # if it is not a string, this method behaves like identity
+        if ($template instanceof Template) {
+            return $template;
+        }
+
+        # get file
+        $file = $this->get_template_file($template);
+
+        # retrieve handler
+        [$class, $options] = $this->get_template_handler($file);
+
+        return new $class($file, $this, $options);
+    }
+
+    /**
+     * This method returns the absolute filename of the template
+     *
+     * @param string $template0 a template string
+     *
+     * @return string     an absolute filename
+     *
+     * @throws TemplateNotFoundException  if the template could not be found
+     */
+    public function get_template_file(string $template0): string
+    {
+        $template = $this->get_absolute_path($template0);
+        $extension = $this->get_extension($template);
+
+        # extension defined, is there a matching template class?
+        if ($extension !== null) {
+            if (file_exists($template)) {
+                return $template;
+            }
+        } # no extension defined, find it
+        else {
+            $file = $this->find_template($template);
+            if ($file !== null) {
+                return $file;
+            }
+        }
+
+        # falling through to throw exception
+        throw new TemplateNotFoundException(sprintf(
+            'Missing template "%s" in "%s".',
+            $template0,
+            $this->path
+        ));
+    }
+
+    /**
+     * Matches an extension to a template handler.
+     *
+     * @param string $template the template
+     *
+     * @return array|null an array containing the class name and an array of
+     *                    options of the matched extension;
+     *                    or NULL if the extension did not match
+     */
+    public function get_template_handler(string $template): ?array
+    {
+        $extension = $this->get_extension($template);
+        return $this->handlers[$extension] ?? null;
+    }
+
+    /**
+     * Registers a handler for templates with a matching extension.
+     *
+     * @param string $extension the extension of the templates to handle
+     * @param class-string<Template> $class the name of the already loaded class
+     * @param array $options optional; an array of options which is used
+     *                       when constructing a new instance
+     */
+    public function add_handler(
+        string $extension,
+        string $class,
+        array $options = []
+    ): void {
+        $this->handlers[$extension] = [$class, $options];
+    }
+
+    /**
+     * Returns the absolute path to the template. If the given argument starts
+     * with a slash or with a protocoll, this method just returns its arguments.
+     *
+     * @param string $template an incomplete template name
+     *
+     * @return string an absolute path to the incomplete template name
+     */
+    public function get_absolute_path(string $template): string
+    {
+        return preg_match('#^(/|\w+://)#', $template)
+            ? $template
+            : $this->get_path() . $template;
+    }
+
+
+    /**
+     * Find template given w/o extension.
+     *
+     * @param string $template the template's filename w/o extension
+     * @return string|null null if there no such file could be found, a string
+     *                     containing the complete file name otherwise
+     */
+    public function find_template(string $template): ?string
+    {
+        foreach ($this->handlers as $ext => $handler) {
+            $file = "$template.$ext";
+            if (file_exists($file)) {
+                return $file;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the file extension if there is one.
+     *
+     * @param string $file an possibly incomplete template file name
+     * @return string|null a string containing the file extension if there is one,
+     *                     NULL otherwise
+     */
+    public function get_extension(string $file): ?string
+    {
+        return pathinfo($file, PATHINFO_EXTENSION) ?: null;
+    }
+
+    /**
+     * Class method to parse, render and return the presentation of a
+     * template.
+     *
+     * @param Template|string $template   A name of a template or a template
+     * @param array           $attributes An associative array of attributes and their
+     *                                    associated values.
+     * @param string|null     $layout     A name of a layout template.
+     *
+     * @return string A string representing the rendered presentation.
+     *
+     * @throws TemplateNotFoundException
+     */
+    public function render(
+        Template|string $template,
+        array $attributes = [],
+        ?string $layout = null
+    ): string {
+        return $this->open($template)->render($attributes, $layout);
+    }
+}
diff --git a/lib/flexi/PhpTemplate.php b/lib/flexi/PhpTemplate.php
new file mode 100644
index 0000000..8110b50
--- /dev/null
+++ b/lib/flexi/PhpTemplate.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * A template engine that uses PHP to render templates.
+ *
+ * @copyright 2008 Marcus Lunzenauer <mlunzena@uos.de>
+ * @author Marcus Lunzenauer <mlunzena@uos.de>
+ * @license MIT
+ */
+
+namespace Flexi;
+
+class PhpTemplate extends Template
+{
+    /**
+     * Parse, render and return the presentation.
+     *
+     * @return string A string representing the rendered presentation.
+     * @throws TemplateNotFoundException
+     */
+    public function _render(): string
+    {
+        extract($this->get_attributes());
+
+        # include template, parse it and get output
+        try {
+            ob_start();
+            require $this->template;
+            $content_for_layout = ob_get_contents();
+        } catch (\Error $e) {
+            throw new TemplateNotFoundException(previous: $e);
+        } finally {
+            ob_end_clean();
+        }
+
+        # include layout, parse it and get output
+        if (isset($this->layout)) {
+            $defined = get_defined_vars();
+            unset($defined['this']);
+            $content_for_layout = $this->layout->render($defined);
+        }
+
+        return $content_for_layout;
+    }
+
+    /**
+     * Parse, render and return the presentation of a partial template.
+     *
+     * @param Template|string $partial A partial name or template
+     * @param array $attributes An optional associative array of attributes
+     *                          and their associated values.
+     * @return string A string representing the rendered presentation.
+     * @throws TemplateNotFoundException
+     */
+    public function render_partial(Template|string $partial, array $attributes = []): string
+    {
+        return $this->factory->render($partial, $attributes + $this->attributes);
+    }
+
+    /**
+     * Renders a partial template with every member of a collection. This member
+     * can be accessed by a template variable with the same name as the name of
+     * the partial template.
+     *
+     * Example:
+     *
+     *   # template entry.php contains:
+     *   <li><?= $entry ?></li>
+     *
+     *
+     *   $entries = ['lorem', 'ipsum'];
+     *   $template->render_partial_collection('entry', $entries);
+     *
+     *   # results in:
+     *   <li>lorem</li>
+     *   <li>ipsum</li>
+     *
+     * If you want to use specific content between the rendered partials, you
+     * may define a spacer partial that will be used for that. The spacer will
+     * be rendered with the given attributes.
+     *
+     * @param string $partial A name of a partial template.
+     * @param array $collection The collection to be rendered.
+     * @param Template|string|null $spacer Optional a name of a partial template
+     *                                     used as spacer.
+     * @param array $attributes An optional associative array of attributes
+     *                          and their associated values.
+     *
+     * @return string A string representing the rendered presentation.
+     * @throws TemplateNotFoundException
+     */
+    public function render_partial_collection(
+        string $partial,
+        array $collection,
+        Template|string|null $spacer = null,
+        array $attributes = []
+    ): string {
+        $template = $this->factory->open($partial);
+        $template->set_attributes($this->attributes);
+        $template->set_attributes($attributes);
+
+        $collected = [];
+        $iterator_name = pathinfo($partial, PATHINFO_FILENAME);
+        foreach ($collection as $element) {
+            $collected[] = $template->render([$iterator_name => $element]);
+        }
+
+        $spacer = isset($spacer) ? $this->render_partial($spacer, $attributes) : '';
+
+        return implode($spacer, $collected);
+    }
+}
diff --git a/lib/flexi/Template.php b/lib/flexi/Template.php
new file mode 100644
index 0000000..de2547e
--- /dev/null
+++ b/lib/flexi/Template.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Abstract template class representing the presentation layer of an action.
+ *  Output can be customized by supplying attributes, which a template can
+ *  manipulate and display.
+ *
+ * @copyright 2008 Marcus Lunzenauer <mlunzena@uos.de>
+ * @author Marcus Lunzenauer <mlunzena@uos.de>
+ * @license MIT
+ */
+
+namespace Flexi;
+
+abstract class Template
+{
+    /**
+     * Parse, render and return the presentation.
+     *
+     * @return string A string representing the rendered presentation.
+     */
+    abstract public function _render(): string;
+
+    protected array $attributes = [];
+    protected Template|null $layout = null;
+
+    /**
+     * Constructor
+     *
+     * @param string  $template the path of the template.
+     * @param Factory $factory  the factory creating this template
+     * @param array   $options  optional array of options
+     */
+    public function __construct(
+        protected string $template,
+        protected Factory $factory,
+        protected array $options = []
+    ) {
+    }
+
+    /**
+     * __set() is a magic method run when writing data to inaccessible members.
+     * In this class it is used to set attributes for the template in a
+     * comfortable way.
+     *
+     * @param string $name  the name of the member field
+     * @param mixed  $value the value for the member field
+     *
+     * @see http://php.net/__set
+     */
+    public function __set(string $name, mixed $value): void
+    {
+        $this->set_attribute($name, $value);
+    }
+
+    /**
+     * __get() is a magic method utilized for reading data from inaccessible
+     * members.
+     * In this class it is used to get attributes for the template in a
+     * comfortable way.
+     *
+     * @param string $name the name of the member field
+     *
+     * @return mixed the value for the member field
+     * @see http://php.net/__get
+     */
+    public function __get(string $name): mixed
+    {
+        return $this->get_attribute($name);
+    }
+
+    /**
+     * __isset() is a magic method triggered by calling isset() or empty() on
+     * inaccessible members.
+     * In this class it is used to check for attributes for the template in a
+     * comfortable way.
+     *
+     * @param string $name the name of the member field
+     *
+     * @return bool TRUE if that attribute exists, FALSE otherwise
+     * @see http://php.net/__isset
+     */
+    public function __isset(string $name): bool
+    {
+        return isset($this->attributes[$name]);
+    }
+
+    /**
+     * __unset() is a magic method invoked when unset() is used on inaccessible
+     * members.
+     * In this class it is used to check for attributes for the template in a
+     * comfortable way.
+     *
+     * @param string $name the name of the member field
+     *
+     * @see http://php.net/__set
+     */
+    public function __unset(string $name): void
+    {
+        $this->clear_attribute($name);
+    }
+
+    /**
+     * Parse, render and return the presentation.
+     *
+     * @param array $attributes An optional associative array of attributes and
+     *                          their associated values.
+     * @param string|Template|null $layout A name of a layout template.
+     *
+     * @return string A string representing the rendered presentation.
+     * @throws TemplateNotFoundException
+     */
+    public function render(array $attributes = [], string|Template $layout = null): string
+    {
+        if (isset($layout)) {
+            $this->set_layout($layout);
+        }
+
+        # merge attributes
+        $this->set_attributes($attributes);
+
+        return $this->_render();
+    }
+
+    /**
+     * Returns the value of an attribute.
+     *
+     * @param string $name An attribute name.
+     * @return mixed  An attribute value.
+     */
+    public function get_attribute(string $name)
+    {
+        return $this->attributes[$name] ?? null;
+    }
+
+    /**
+     * Set an array of attributes.
+     *
+     * @return array An associative array of attributes and their associated
+     *               values.
+     */
+    public function get_attributes(): array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Set an attribute.
+     *
+     * @param string $name  An attribute name.
+     * @param mixed  $value An attribute value.
+     */
+    public function set_attribute(string $name, mixed $value): void
+    {
+        $this->attributes[$name] = $value;
+    }
+
+    /**
+     * Set an array of attributes.
+     *
+     * @param array $attributes An associative array of attributes and their
+     *                          associated values.
+     */
+    public function set_attributes(array $attributes): void
+    {
+        $this->attributes = $attributes + $this->attributes;
+    }
+
+
+    /**
+     * Clear all attributes associated with this template.
+     */
+    public function clear_attributes(): void
+    {
+        $this->attributes = [];
+    }
+
+    /**
+     * Clear an attribute associated with this template.
+     *
+     * @param string $name The name of the attribute to be cleared.
+     */
+    public function clear_attribute(string $name): void
+    {
+        unset($this->attributes[$name]);
+    }
+
+    /**
+     * Set the template's layout.
+     *
+     * @param Template|string|null $layout A name of a layout template or a
+     *                                     layout template.
+     * @throws TemplateNotFoundException
+     */
+    public function set_layout(Template|string|null $layout): void
+    {
+        $this->layout = $this->factory->open($layout);
+    }
+
+    /**
+     * Returns the template's layout.
+     *
+     * @return Template|null
+     */
+    public function get_layout(): ?Template
+    {
+        return $this->layout;
+    }
+}
diff --git a/lib/flexi/TemplateNotFoundException.php b/lib/flexi/TemplateNotFoundException.php
new file mode 100644
index 0000000..dbef2c6
--- /dev/null
+++ b/lib/flexi/TemplateNotFoundException.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @copyright 2009 Marcus Lunzenauer <mlunzena@uos.de>
+ * @author Marcus Lunzenauer <mlunzena@uos.de>
+ * @license MIT
+ */
+
+namespace Flexi;
+
+class TemplateNotFoundException extends \Exception
+{
+}
diff --git a/lib/models/Courseware/BlockTypes/BlockType.php b/lib/models/Courseware/BlockTypes/BlockType.php
index b87a219..37e617b 100644
--- a/lib/models/Courseware/BlockTypes/BlockType.php
+++ b/lib/models/Courseware/BlockTypes/BlockType.php
@@ -438,9 +438,9 @@ abstract class BlockType
      * It turns the classname into snakecase in order to find the
      * template file in templates/courseware/block_types.
      *
-     * @return mixed the \Flexi_Template instance if exists, otherwise null.
+     * @return \Flexi\Template|null the \Flexi\Template instance if exists, otherwise null.
      */
-    public function getPdfHtmlTemplate(): ?\Flexi_Template
+    public function getPdfHtmlTemplate(): ?\Flexi\Template
     {
         $template = null;
         try {
diff --git a/lib/models/Courseware/ContainerTypes/ContainerType.php b/lib/models/Courseware/ContainerTypes/ContainerType.php
index baddaab..4e816be 100644
--- a/lib/models/Courseware/ContainerTypes/ContainerType.php
+++ b/lib/models/Courseware/ContainerTypes/ContainerType.php
@@ -249,9 +249,9 @@ abstract class ContainerType
      * It turns the classname into snakecase in order to find the
      * template file in templates/courseware/container_types.
      *
-     * @return mixed the \Flexi_Template instance if exists, otherwise null.
+     * @return \Flexi\Template|null the \Flexi\Template instance if exists, otherwise null.
      */
-    public function getPdfHtmlTemplate(): ?\Flexi_Template
+    public function getPdfHtmlTemplate(): ?\Flexi\Template
     {
         $template = null;
         try {
diff --git a/lib/models/Freetext.php b/lib/models/Freetext.php
index 52182de..66b93c5 100644
--- a/lib/models/Freetext.php
+++ b/lib/models/Freetext.php
@@ -65,12 +65,13 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
 
     /**
      * Returns the template of this question to answer the question.
-     * @return Flexi_Template
-     * @throws Flexi_TemplateNotFoundException if there is no template.
+     *
+     * @return Flexi\Template
+     * @throws Flexi\TemplateNotFoundException if there is no template.
      */
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__ . '/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__ . '/../../app/views'));
         $template = $factory->open('questionnaire/question_types/freetext/freetext_answer.php');
         $template->vote = $this;
         return $template;
@@ -97,9 +98,11 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
 
     /**
      * Returns the template with the answers of the question so far.
+     *
      * @param null $only_user_ids : array of user_ids
-     * @return Flexi_Template
-     * @throws Flexi_TemplateNotFoundException if there is no template.
+     *
+     * @return Flexi\Template
+     * @throws Flexi\TemplateNotFoundException if there is no template.
      */
     public function getResultTemplate($only_user_ids = null)
     {
@@ -111,7 +114,7 @@ class Freetext extends QuestionnaireQuestion implements QuestionType
                 }
             }
         }
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__ . '/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__ . '/../../app/views'));
         $template = $factory->open('questionnaire/question_types/freetext/freetext_evaluation.php');
         $template->vote = $this;
         $template->set_attribute('answers', $answers);
diff --git a/lib/models/LikertScale.php b/lib/models/LikertScale.php
index 8ac7823..833d794 100644
--- a/lib/models/LikertScale.php
+++ b/lib/models/LikertScale.php
@@ -53,7 +53,7 @@ class LikertScale extends QuestionnaireQuestion implements QuestionType
 
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/likert/likert_answer');
         $template->set_attribute('vote', $this);
         return $template;
@@ -73,7 +73,7 @@ class LikertScale extends QuestionnaireQuestion implements QuestionType
     public function getUserIdsOfFilteredAnswer($answer_option)
     {
         $user_ids = [];
-        list($statement_key, $options_key) = explode('_', $answer_option);
+        [$statement_key, $options_key] = explode('_', $answer_option);
         foreach ($this->answers as $answer) {
             $answerData = $answer['answerdata']->getArrayCopy();
             if ($answerData['answers'][$statement_key] == $options_key) {
@@ -93,7 +93,7 @@ class LikertScale extends QuestionnaireQuestion implements QuestionType
                 }
             }
         }
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/likert/likert_evaluation');
         $template->set_attribute('vote', $this);
         $template->set_attribute('answers', $answers);
diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php
index 8411d14..604f845 100644
--- a/lib/models/OERMaterial.php
+++ b/lib/models/OERMaterial.php
@@ -198,7 +198,7 @@ class OERMaterial extends SimpleORMap
             return $output;
         }
 
-        $tf = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH']."/app/views");
+        $tf = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH']."/app/views");
         if ($material->hasValidPreviewUrl() || $material->isPDF()) {
             $template = $tf->open("oer/embed/url");
         } elseif ($material->isVideo()) {
diff --git a/lib/models/QuestionnaireInfo.php b/lib/models/QuestionnaireInfo.php
index fc6efc7..2bcf25d 100644
--- a/lib/models/QuestionnaireInfo.php
+++ b/lib/models/QuestionnaireInfo.php
@@ -50,7 +50,7 @@ class QuestionnaireInfo extends QuestionnaireQuestion implements QuestionType
 
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/info/info');
         $template->set_attribute('vote', $this);
         return $template;
@@ -68,7 +68,7 @@ class QuestionnaireInfo extends QuestionnaireQuestion implements QuestionType
 
     public function getResultTemplate($only_user_ids = null)
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/info/info');
         $template->set_attribute('vote', $this);
         return $template;
diff --git a/lib/models/RangeScale.php b/lib/models/RangeScale.php
index 78bc65b..44b946b 100644
--- a/lib/models/RangeScale.php
+++ b/lib/models/RangeScale.php
@@ -53,7 +53,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
 
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/rangescale/rangescale_answer');
         $template->set_attribute('vote', $this);
         return $template;
@@ -72,7 +72,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
     public function getUserIdsOfFilteredAnswer($answer_option)
     {
         $user_ids = [];
-        list($statement_key, $options_key) = explode('_', $answer_option);
+        [$statement_key, $options_key] = explode('_', $answer_option);
         foreach ($this->answers as $answer) {
             $answerData = $answer['answerdata']->getArrayCopy();
             if ($answerData['answers'][$statement_key] == $options_key) {
@@ -92,7 +92,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
                 }
             }
         }
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/rangescale/rangescale_evaluation');
         $template->set_attribute('vote', $this);
         $template->set_attribute('answers', $answers);
diff --git a/lib/models/Vote.php b/lib/models/Vote.php
index 0520401..ede0cea 100644
--- a/lib/models/Vote.php
+++ b/lib/models/Vote.php
@@ -53,7 +53,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType
 
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/vote/vote_answer');
         $template->set_attribute('vote', $this);
         return $template;
@@ -100,7 +100,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType
                 }
             }
         }
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/vote/vote_evaluation');
         $template->set_attribute('vote', $this);
         $template->set_attribute('answers', $answers);
diff --git a/lib/models/calendar/CalendarDate.class.php b/lib/models/calendar/CalendarDate.class.php
index 7026ece..d901cf1 100644
--- a/lib/models/calendar/CalendarDate.class.php
+++ b/lib/models/calendar/CalendarDate.class.php
@@ -114,7 +114,7 @@ class CalendarDate extends SimpleORMap implements PrivacyObject
 
     public function cbSendDateModificationMail()
     {
-        $template_factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
 
         foreach ($this->calendars as $calendar) {
             if ($calendar->range_id === $this->editor_id) {
diff --git a/lib/models/calendar/CalendarDateAssignment.class.php b/lib/models/calendar/CalendarDateAssignment.class.php
index bd99dd3..e0bf467 100644
--- a/lib/models/calendar/CalendarDateAssignment.class.php
+++ b/lib/models/calendar/CalendarDateAssignment.class.php
@@ -79,7 +79,7 @@ class CalendarDateAssignment extends SimpleORMap implements Event
             return;
         }
 
-        $template_factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
 
         setTempLanguage($this->range_id);
         $lang_path = getUserLanguagePath($this->range_id);
@@ -112,7 +112,7 @@ class CalendarDateAssignment extends SimpleORMap implements Event
             return;
         }
 
-        $template_factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
 
         setTempLanguage($this->range_id);
         $lang_path = getUserLanguagePath($this->range_id);
@@ -160,7 +160,7 @@ class CalendarDateAssignment extends SimpleORMap implements Event
             return;
         }
 
-        $template_factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
 
         setTempLanguage($this->range_id);
         $lang_path = getUserLanguagePath($this->range_id);
diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
index f55b3b3..fadf92f 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.class.php
@@ -876,7 +876,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
 
         $deleted_c = 0;
 
-        $template_factory = new Flexi_TemplateFactory(
+        $template_factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
         );
 
@@ -1917,7 +1917,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
             return;
         }
 
-        $template_factory = new Flexi_TemplateFactory(
+        $template_factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
         );
         setTempLanguage($booking_user->id);
diff --git a/lib/models/resources/ResourcePropertyDefinition.class.php b/lib/models/resources/ResourcePropertyDefinition.class.php
index 82d29c9..450ec00 100644
--- a/lib/models/resources/ResourcePropertyDefinition.class.php
+++ b/lib/models/resources/ResourcePropertyDefinition.class.php
@@ -221,7 +221,7 @@ class ResourcePropertyDefinition extends SimpleORMap
                 );
             }
         } elseif ($type === 'position') {
-            $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH']);
+            $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH']);
             $template = $factory->open('templates/resources/position_attribute_form_part.php');
             $template->set_attribute(
                 'input_name',
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index 6b22b44..9cad900 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -1963,7 +1963,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
             return;
         }
 
-        $factory = new Flexi_TemplateFactory(
+        $factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
         );
 
@@ -2020,7 +2020,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
      */
     public function sendCloseRequestMailToRequester($bookings = [])
     {
-        $factory = new Flexi_TemplateFactory(
+        $factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
         );
 
@@ -2110,7 +2110,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
             );
 
             if ($lecturers) {
-                $factory = new Flexi_TemplateFactory(
+                $factory = new Flexi\Factory(
                     $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
                 );
 
@@ -2199,7 +2199,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
         }
 
         //Load the mail template:
-        $factory        = new Flexi_TemplateFactory(
+        $factory = new Flexi\Factory(
             $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
         );
         $user_lang_path = getUserLanguagePath($user->id);
diff --git a/lib/modules/ScheduleWidget.php b/lib/modules/ScheduleWidget.php
index 5adc801..c4ab769 100644
--- a/lib/modules/ScheduleWidget.php
+++ b/lib/modules/ScheduleWidget.php
@@ -35,7 +35,7 @@ class ScheduleWidget extends CorePlugin implements PortalPlugin
     /**
      * Return the template for the widget.
      *
-     * @return Flexi_PhpTemplate The template containing the widget contents
+     * @return Flexi\PhpTemplate The template containing the widget contents
      */
     public function getPortalTemplate()
     {
diff --git a/lib/modules/StudipModule.class.php b/lib/modules/StudipModule.class.php
index 6cbcaf9..c281d29 100644
--- a/lib/modules/StudipModule.class.php
+++ b/lib/modules/StudipModule.class.php
@@ -54,7 +54,7 @@ interface StudipModule
     public function getMetadata();
 
     /**
-     * Return a template (an instance of the Flexi_Template class)
+     * Return a template (an instance of the Flexi\Template class)
      * to be rendered on the course summary page. Return NULL to
      * render nothing for this plugin.
      *
@@ -66,7 +66,7 @@ interface StudipModule
      *  admin_url    admin link for this plugin (if any)
      *  admin_title  title for admin link (default: Administration)
      *
-     * @return object   template object to render or NULL
+     * @return Flexi\Template|null template object to render or NULL
      */
     public function getInfoTemplate($course_id);
 }
diff --git a/lib/plugins/core/AdminCourseContents.class.php b/lib/plugins/core/AdminCourseContents.class.php
index 065cc9e..0e07b58 100644
--- a/lib/plugins/core/AdminCourseContents.class.php
+++ b/lib/plugins/core/AdminCourseContents.class.php
@@ -15,9 +15,11 @@ interface AdminCourseContents
 
     /**
      * Returns the value of the additional column for the course-overview table in the admin-area.
+     *
      * @param Course $course : A Course-object of the given ... course
      * @param string $index : the index that comes from adminAvailableContents to identify the column.
-     * @return Flexi_Template | String : Either one will do, but string is preferred, because it can exported as CSV-file more easily.
+     *
+     * @return Flexi\Template | String : Either one will do, but string is preferred, because it can exported as CSV-file more easily.
      */
     public function adminAreaGetCourseContent($course, $index);
 }
diff --git a/lib/plugins/core/DetailspagePlugin.class.php b/lib/plugins/core/DetailspagePlugin.class.php
index 15eda09..36e6efa 100644
--- a/lib/plugins/core/DetailspagePlugin.class.php
+++ b/lib/plugins/core/DetailspagePlugin.class.php
@@ -12,7 +12,7 @@
 interface DetailspagePlugin
 {
     /**
-     * Return a template (an instance of the Flexi_Template class)
+     * Return a template (an instance of the Flexi\Template class)
      * to be rendered on the details page. Return NULL to
      * render nothing for this plugin or this course.
      *
@@ -21,7 +21,7 @@ interface DetailspagePlugin
      *
      *  title        title to display, defaults to plugin name
      *
-     * @return object   template object to render or NULL
+     * @return Flexi\Template|null template object to render or NULL
      */
     public function getDetailspageTemplate($course);
 }
diff --git a/lib/plugins/core/ExternPagePlugin.php b/lib/plugins/core/ExternPagePlugin.php
index 5b40775..d12efc5 100644
--- a/lib/plugins/core/ExternPagePlugin.php
+++ b/lib/plugins/core/ExternPagePlugin.php
@@ -42,10 +42,10 @@ interface ExternPagePlugin
     public function getExternPage(ExternPageConfig $config): ExternPage;
 
     /**
-     * Returns a Flexi_Template or a path to the template file. This template contains the form
+     * Returns a Flexi\Template or a path to the template file. This template contains the form
      * to configure the external page.
      *
-     * @return string|Flexi_Template
+     * @return string|Flexi\Template
      */
     public function getConfigurationFormTemplate();
 
diff --git a/lib/plugins/core/FilesystemPlugin.class.php b/lib/plugins/core/FilesystemPlugin.class.php
index 6d4c46c..31b4b5b 100644
--- a/lib/plugins/core/FilesystemPlugin.class.php
+++ b/lib/plugins/core/FilesystemPlugin.class.php
@@ -34,11 +34,12 @@ interface FilesystemPlugin
 
     /**
      * This method is used to get a folder-object for this plugin.
-     * Not recommended but still possible is to return a Flexi_Template for the folder, if you want to
+     * Not recommended but still possible is to return a Flexi\Template for the folder, if you want to
      * take care of the frontend of displaying the folder as well.
      *
      * @param null $folder_id : folder_id of folder to get or null if you want the top-folder
-     * @return FolderType|Flexi_Template
+     *
+     * @return FolderType|Flexi\Template
      */
     public function getFolder($folder_id = null);
 
diff --git a/lib/plugins/core/HomepagePlugin.class.php b/lib/plugins/core/HomepagePlugin.class.php
index 74d0204..37efb54 100644
--- a/lib/plugins/core/HomepagePlugin.class.php
+++ b/lib/plugins/core/HomepagePlugin.class.php
@@ -15,7 +15,7 @@
 interface HomepagePlugin
 {
     /**
-     * Return a template (an instance of the Flexi_Template class)
+     * Return a template (an instance of the Flexi\Template class)
      * to be rendered on the given user's home page. Return NULL to
      * render nothing for this plugin.
      *
@@ -27,7 +27,7 @@ interface HomepagePlugin
      *  admin_url    admin link for this plugin (if any)
      *  admin_title  title for admin link (default: Administration)
      *
-     * @return object   template object to render or NULL
+     * @return Flexi\Template|null template object to render or NULL
      */
     function getHomepageTemplate($user_id);
 }
diff --git a/lib/plugins/core/PortalPlugin.class.php b/lib/plugins/core/PortalPlugin.class.php
index dce5774..cb5aca4 100644
--- a/lib/plugins/core/PortalPlugin.class.php
+++ b/lib/plugins/core/PortalPlugin.class.php
@@ -15,7 +15,7 @@
 interface PortalPlugin
 {
     /**
-     * Return a template (an instance of the Flexi_Template class)
+     * Return a template (an instance of the Flexi\Template class)
      * to be rendered on the start or portal page. Return NULL to
      * render nothing for this plugin.
      *
@@ -27,7 +27,7 @@ interface PortalPlugin
      *  admin_url    admin link for this plugin (if any)
      *  admin_title  title for admin link (default: Administration)
      *
-     * @return ?Flexi_Template template object to render or NULL
+     * @return ?Flexi\Template template object to render or NULL
      */
     function getPortalTemplate();
 }
diff --git a/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php b/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
index 6892f8a..cadaf52 100644
--- a/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
+++ b/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
@@ -39,8 +39,10 @@ interface QuestionnaireAssignmentPlugin
      * This template will get displayed when someone at tools -> questionnaires
      * wants to edit the contexts of the questionnaire. Maybe you don't want to provide a
      * template here, so return null or just a readonly html-snippet.
+     *
      * @param Questionnaire $questionnaire
-     * @return null|Flexi_Template
+     *
+     * @return null|Flexi\Template
      */
     public function getQuestionnaireAssignmentEditTemplate(Questionnaire $questionnaire);
 
diff --git a/lib/raumzeit/SingleDate.class.php b/lib/raumzeit/SingleDate.class.php
index 1a58695..3268935 100644
--- a/lib/raumzeit/SingleDate.class.php
+++ b/lib/raumzeit/SingleDate.class.php
@@ -861,7 +861,7 @@ class SingleDate
      */
     function getDatesTemplate($template)
     {
-        if (!$template instanceof Flexi_Template && is_string($template)) {
+        if (!$template instanceof Flexi\Template && is_string($template)) {
             $template = $GLOBALS['template_factory']->open($template);
         }
 
diff --git a/public/install.php b/public/install.php
index 6d71969..24725c3 100644
--- a/public/install.php
+++ b/public/install.php
@@ -41,7 +41,7 @@ if (!function_exists('_')) {
     require_once 'lib/language.inc.php';
 
     foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang) {
-        list($lang, ) = explode(';', $lang);
+        [$lang, ] = explode(';', $lang);
         $lang = substr($lang, 0, 2);
 
         if (!in_array($lang, ['de', 'en'])) {
@@ -53,7 +53,7 @@ if (!function_exists('_')) {
     }
 }
 
-$GLOBALS['template_factory'] = new Flexi_TemplateFactory('../templates/');
+$GLOBALS['template_factory'] = new Flexi\Factory('../templates/');
 
 # get plugin class from request
 $dispatch_to = ltrim(Request::pathInfo(), '/');
diff --git a/public/web_migrate.php b/public/web_migrate.php
index 79fba05..c01c600 100644
--- a/public/web_migrate.php
+++ b/public/web_migrate.php
@@ -31,7 +31,7 @@ if (empty($_SESSION['_language'])) {
 
 $_language_path = init_i18n($_SESSION['_language']);
 
-$GLOBALS['template_factory'] = new Flexi_TemplateFactory('../templates/');
+$GLOBALS['template_factory'] = new Flexi\Factory('../templates/');
 
 # get plugin class from request
 $dispatch_to = Request::pathInfo() ?: '';
diff --git a/templates/contentbar/contentbar.php b/templates/contentbar/contentbar.php
index fef7fd8..f9b42ed 100644
--- a/templates/contentbar/contentbar.php
+++ b/templates/contentbar/contentbar.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @var TOCItem $toc
- * @var Icon $icon
- * @var Flexi_Template $breadcrumbs
- * @var string $info
- * @var ActionMenu $actionMenu
- * @var Flexi_Template $ttpl
+ * @var TOCItem        $toc
+ * @var Icon           $icon
+ * @var Flexi\Template $breadcrumbs
+ * @var string         $info
+ * @var ActionMenu     $actionMenu
+ * @var Flexi\Template $ttpl
  */
 ?>
 <section>
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
index 8a9125b..1745a1a 100644
--- a/tests/functional/_bootstrap.php
+++ b/tests/functional/_bootstrap.php
@@ -34,6 +34,7 @@ StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes/cache');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes/cache', 'Studip');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions/resources');
+StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/flexi', 'Flexi');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/filesystem');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/migrations');
 StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/models');
@@ -64,8 +65,7 @@ require 'vendor/email_message/email_message.php';
 require 'vendor/email_message/debug_message.php';
 StudipMail::setDefaultTransporter(new debug_message_class());
 
-require_once 'vendor/flexi/lib/flexi.php';
-$GLOBALS['template_factory'] = new Flexi_TemplateFactory(dirname(dirname(__DIR__)) . '/templates');
+$GLOBALS['template_factory'] = new Flexi\Factory(dirname(dirname(__DIR__)) . '/templates');
 
 // Disable caching to fallback to memory cache
 $GLOBALS['CACHING_ENABLE'] = false;
diff --git a/tests/jsonapi/BlubberThreadsCreateTest.php b/tests/jsonapi/BlubberThreadsCreateTest.php
index 17846f8..d2bdaea 100644
--- a/tests/jsonapi/BlubberThreadsCreateTest.php
+++ b/tests/jsonapi/BlubberThreadsCreateTest.php
@@ -22,7 +22,7 @@ class BlubberThreadsCreateTest extends \Codeception\Test\Unit
         // Create global template factory if neccessary
         $has_template_factory = isset($GLOBALS['template_factory']);
         if (!$has_template_factory) {
-            $GLOBALS['template_factory'] = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+            $GLOBALS['template_factory'] = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
         }
     }
 
diff --git a/tests/jsonapi/BlubberThreadsIndexTest.php b/tests/jsonapi/BlubberThreadsIndexTest.php
index ab6d200..14173d3 100644
--- a/tests/jsonapi/BlubberThreadsIndexTest.php
+++ b/tests/jsonapi/BlubberThreadsIndexTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use JsonApi\Errors\RecordNotFoundException;
 use JsonApi\Routes\Blubber\ThreadsIndex;
 
 require_once 'BlubberTestHelper.php';
@@ -21,7 +20,7 @@ class BlubberThreadsIndexTest extends \Codeception\Test\Unit
         // Create global template factory if neccessary
         $has_template_factory = isset($GLOBALS['template_factory']);
         if (!$has_template_factory) {
-            $GLOBALS['template_factory'] = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+            $GLOBALS['template_factory'] = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
         }
     }
 
diff --git a/tests/jsonapi/BlubberThreadsShowTest.php b/tests/jsonapi/BlubberThreadsShowTest.php
index 932b768..875fc8c 100644
--- a/tests/jsonapi/BlubberThreadsShowTest.php
+++ b/tests/jsonapi/BlubberThreadsShowTest.php
@@ -23,7 +23,7 @@ class BlubberThreadsShowTest extends \Codeception\Test\Unit
         // Create global template factory if neccessary
         $has_template_factory = isset($GLOBALS['template_factory']);
         if (!$has_template_factory) {
-            $GLOBALS['template_factory'] = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+            $GLOBALS['template_factory'] = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
         }
     }
 
diff --git a/tests/jsonapi/ConsultationHelper.php b/tests/jsonapi/ConsultationHelper.php
index a46cb47..673174e 100644
--- a/tests/jsonapi/ConsultationHelper.php
+++ b/tests/jsonapi/ConsultationHelper.php
@@ -3,9 +3,6 @@ use WoohooLabs\Yang\JsonApi\Response\JsonApiResponse;
 use WoohooLabs\Yang\JsonApi\Schema\Document;
 use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObject;
 
-// Required for consultation mailer
-require_once 'vendor/flexi/flexi.php';
-
 trait ConsultationHelper
 {
     /**
@@ -96,7 +93,7 @@ trait ConsultationHelper
         // Create global template factory if neccessary
         $has_template_factory = isset($GLOBALS['template_factory']);
         if (!$has_template_factory) {
-            $GLOBALS['template_factory'] = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+            $GLOBALS['template_factory'] = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
         }
 
         $result = $this->tester->withPHPLib($credentials, $fn);
diff --git a/tests/jsonapi/_bootstrap.php b/tests/jsonapi/_bootstrap.php
index cb6df04..dea1c81 100644
--- a/tests/jsonapi/_bootstrap.php
+++ b/tests/jsonapi/_bootstrap.php
@@ -45,6 +45,7 @@ StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/models/cale
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/models/resources');
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes');
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes', 'Studip');
+StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/flexi', 'Flexi');
 
 // Plugins
 StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/core');
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index af95607..a1dbdd1 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -53,12 +53,12 @@ StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
 StudipAutoloader::addAutoloadPath('lib/models');
 StudipAutoloader::addAutoloadPath('lib/classes');
 StudipAutoloader::addAutoloadPath('lib/classes', 'Studip');
-StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
-StudipAutoloader::addAutoloadPath('lib/classes/cache');
 StudipAutoloader::addAutoloadPath('lib/classes/cache', 'Studip');
-StudipAutoloader::addAutoloadPath('lib/exceptions');
 StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
 StudipAutoloader::addAutoloadPath('lib/classes/helpbar');
+StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
+StudipAutoloader::addAutoloadPath('lib/exceptions');
+StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
 StudipAutoloader::addAutoloadPath('lib/plugins/engine');
 StudipAutoloader::addAutoloadPath('lib/plugins/core');
 StudipAutoloader::addAutoloadPath('lib/plugins/db');
diff --git a/tests/unit/lib/classes/StudipFileloaderTest.php b/tests/unit/lib/classes/StudipFileloaderTest.php
index 62c5e04..102aaac 100644
--- a/tests/unit/lib/classes/StudipFileloaderTest.php
+++ b/tests/unit/lib/classes/StudipFileloaderTest.php
@@ -20,7 +20,7 @@ class StudipFileloaderTestCase extends \Codeception\Test\Unit
         ]);
 
         if (!stream_wrapper_register('var', 'ArrayFileStream')) {
-            new Exception('Failed to register protocol');
+            throw new Exception('Failed to register protocol');
         }
     }
 
diff --git a/tests/unit/lib/flexi/FactoryTest.php b/tests/unit/lib/flexi/FactoryTest.php
new file mode 100644
index 0000000..2df9f6a
--- /dev/null
+++ b/tests/unit/lib/flexi/FactoryTest.php
@@ -0,0 +1,119 @@
+<?php
+
+use Flexi\Factory;
+use Flexi\TemplateNotFoundException;
+use Flexi\PhpTemplate;
+
+final class FactoryTestCase extends \Codeception\Test\Unit
+{
+    private Factory $factory;
+
+    public function setUp(): void
+    {
+        $this->setUpFS();
+
+        $this->factory = new Factory('var://templates');
+    }
+
+    public function tearDown(): void
+    {
+        unset($this->factory);
+        stream_wrapper_unregister('var');
+    }
+
+    public function setUpFS(): void
+    {
+        ArrayFileStream::set_filesystem([
+            'templates' => [
+                'foo.php'           => 'some content',
+                'baz.unknown'       => 'some content',
+                'multiplebasenames' => [
+                    'foo.txt' => 'there is no matching template class',
+                    'foo.php' => 'some content',
+                    'bar.txt' => 'there is no matching template class',
+                ],
+                'baz.known-ext' => 'some content',
+            ],
+        ]);
+        if (!stream_wrapper_register('var', ArrayFileStream::class)) {
+            die('Failed to register protocol');
+        }
+    }
+
+    public function testShouldCreateFactory()
+    {
+        $factory = new Factory('.');
+        $this->assertNotNull($factory);
+    }
+
+    public function testShouldCreateFactoryUsingPath()
+    {
+        $path = 'var://';
+        $factory = new Factory($path);
+        $this->assertNotNull($factory);
+    }
+
+    public function testShouldOpenTemplateUsingRelativePath()
+    {
+        $foo = $this->factory->open('foo');
+        $this->assertNotNull($foo);
+    }
+
+    public function testShouldOpenTemplateUsingAbsolutePath()
+    {
+        $foo = $this->factory->open('var://templates/foo');
+        $this->assertNotNull($foo);
+    }
+
+    public function testShouldThrowAnExceptionOpeningAMissingTemplateWithoutFileExtension()
+    {
+        $this->expectException(TemplateNotFoundException::class);
+        $this->factory->open('bar');
+    }
+
+    public function testShouldThrowAnExceptionOpeningAMissingTemplateWithFileExtension()
+    {
+        $this->expectException(TemplateNotFoundException::class);
+        $this->factory->open('bar.php');
+    }
+
+    public function testShouldOpenTemplateUsingExtension()
+    {
+        $this->assertInstanceOf(
+            PhpTemplate::class,
+            $this->factory->open('foo.php')
+        );
+    }
+
+    public function testShouldThrowAnExceptionWhenOpeningATemplateWithUnknownExtension()
+    {
+        $this->expectException(TemplateNotFoundException::class);
+        $this->factory->open('baz');
+    }
+
+    public function testShouldThrowAnExceptionOpeningATemplateInANonExistingDirectory()
+    {
+        $this->expectException(TemplateNotFoundException::class);
+        $this->factory->open('doesnotexist/foo');
+    }
+
+    public function testShouldSearchForASupportedTemplate()
+    {
+        $this->assertInstanceOf(
+            PhpTemplate::class,
+            $this->factory->open('multiplebasenames/foo')
+        );
+    }
+
+    public function testShouldRespondToAddedHandlers()
+    {
+        $handler = new class('', $this->factory) extends Flexi\Template {
+            public function _render(): string
+            {
+                return '';
+            }
+        };
+        $this->factory->add_handler('known-ext', $handler::class);
+        $this->factory->open('baz.known-ext');
+    }
+}
diff --git a/tests/unit/lib/flexi/PHPTemplatePartialBugTest.php b/tests/unit/lib/flexi/PHPTemplatePartialBugTest.php
new file mode 100644
index 0000000..ef265cf
--- /dev/null
+++ b/tests/unit/lib/flexi/PHPTemplatePartialBugTest.php
@@ -0,0 +1,45 @@
+<?php
+
+use Flexi\Factory;
+
+final class PhpTemplatePartialBugTestCase extends Codeception\Test\Unit
+{
+    public function setUp(): void
+    {
+        $this->setUpFS();
+        $this->factory = new Factory('var://templates/');
+    }
+
+    public function tearDown(): void
+    {
+        unset($this->factory);
+
+        stream_wrapper_unregister("var");
+    }
+
+    public function setUpFS(): void
+    {
+        ArrayFileStream::set_filesystem([
+            'templates' => [
+                'layout.php'   =>
+                    '<? $do_not_echo_this = $this->render_partial_collection("partial", range(1, 5));' .
+                    'echo $content_for_layout;',
+                'partial.php'  =>
+                    'partial',
+                'template.php' =>
+                    'template',
+            ]
+        ]);
+        if (!stream_wrapper_register('var', ArrayFileStream::class)) {
+            die('Failed to register protocol');
+        }
+    }
+
+    public function testPartialBug()
+    {
+        $template = $this->factory->open('template');
+        $template->set_layout('layout');
+        $result = $template->render();
+        $this->assertEquals($result, "template");
+    }
+}
diff --git a/tests/unit/lib/flexi/PHPTemplateTest.php b/tests/unit/lib/flexi/PHPTemplateTest.php
new file mode 100644
index 0000000..5dfd247
--- /dev/null
+++ b/tests/unit/lib/flexi/PHPTemplateTest.php
@@ -0,0 +1,136 @@
+<?php
+
+use Flexi\Factory;
+use Flexi\TemplateNotFoundException;
+
+final class PhpTemplateTestCase extends Codeception\Test\Unit
+{
+    private Factory $factory;
+
+    public function setUp(): void
+    {
+        $this->setUpFS();
+        $this->factory = new Factory('var://templates/');
+    }
+
+
+    public function tearDown(): void
+    {
+        unset($this->factory);
+
+        stream_wrapper_unregister('var');
+    }
+
+    public function setUpFS()
+    {
+        ArrayFileStream::set_filesystem([
+            'templates' => [
+                'foo_using_partial.php' =>
+                    'Hello, <?= $this->render_partial("foos_partial") ?>!',
+
+                'foos_partial.php' =>
+                    '<h1><?= $whom ?> at <?= $when ?></h1>',
+
+                'foo_with_partial_collection.php' =>
+                    '[<?= $this->render_partial_collection("item", $items, "spacer") ?>]',
+
+                'item.php' =>
+                    '"<?= $item ?>"',
+
+                'spacer.php' =>
+                    ', ',
+
+                'attributes.php' =>
+                    '<? foreach (get_defined_vars() as $name => $value) : ?>' .
+                    '<?= $name ?><?= $value ?>' .
+                    '<? endforeach ?>',
+
+                'foo.php' =>
+                    'Hello, <?= $whom ?>!',
+
+                'layout.php' =>
+                    '[<?= $content_for_layout ?>]',
+            ]
+        ]);
+        if (!stream_wrapper_register('var', ArrayFileStream::class)) {
+            die('Failed to register protocol');
+        }
+    }
+
+    public function testRenderPartial()
+    {
+        $template = $this->factory->open('foo_using_partial');
+        $template->set_attribute('whom', 'bar');
+        $this->assertEquals(
+            'Hello, <h1>bar at now</h1>!',
+            $template->render(['when' => 'now'])
+        );
+    }
+
+    public function testRenderPartialCollection()
+    {
+        $template = $this->factory->open('foo_with_partial_collection');
+        $result = $template->render_partial_collection(
+            'item',
+            range(1, 3),
+            'spacer'
+        );
+        $this->assertEquals('"1", "2", "3"', $result);
+    }
+
+    public function testShouldOverrideAttributesWithThosePassedToRender()
+    {
+        $template = $this->factory->open('attributes');
+        $template->set_attribute('foo', 'baz');
+
+        $template->render(['foo' => 'bar']);
+        $this->assertEquals('bar', $template->get_attribute('foo'));
+
+        $template->render();
+        $this->assertEquals('bar', $template->get_attribute('foo'));
+    }
+
+    public function testRenderWithoutLayout()
+    {
+        $foo = $this->factory->open('foo');
+        $foo->set_attribute('whom', 'bar');
+        $this->assertEquals('Hello, bar!', $foo->render());
+    }
+
+    public function testRenderWithLayout()
+    {
+        $foo = $this->factory->open('foo');
+        $foo->set_attribute('whom', 'bar');
+        $foo->set_layout('layout');
+        $out = $foo->render();
+        $this->assertEquals('[Hello, bar!]', $out);
+    }
+
+    public function testRenderWithLayoutInline()
+    {
+        $this->assertEquals(
+            '[Hello, bar!]',
+            $this->factory->render('foo', ['whom' => 'bar'], 'layout')
+        );
+    }
+
+    public function testRenderWithMissingLayout()
+    {
+        $foo = $this->factory->open('foo');
+        $this->expectException(TemplateNotFoundException::class);
+        $foo->set_layout('nosuchlayout');
+    }
+
+    public function testRenderWithAttributes()
+    {
+        $foo = $this->factory->open('foo');
+        $foo->set_attribute('whom', 'bar');
+        $foo->set_layout('layout');
+        $foo_out = $foo->render();
+
+        $bar = $this->factory->open('foo');
+        $bar_out = $bar->render(['whom' => 'bar'], 'layout');
+
+        $this->assertEquals($foo_out, $bar_out);
+    }
+}
diff --git a/tests/unit/lib/flexi/TemplateEmptyTest.php b/tests/unit/lib/flexi/TemplateEmptyTest.php
new file mode 100644
index 0000000..c5ebd79
--- /dev/null
+++ b/tests/unit/lib/flexi/TemplateEmptyTest.php
@@ -0,0 +1,44 @@
+<?php
+
+use Flexi\Factory;
+use Flexi\Template;
+
+final class TemplateEmptyTestCase extends \Codeception\Test\Unit
+{
+    private Factory $factory;
+
+    public function setUp(): void
+    {
+        $this->factory = $this->make(Factory::class, [
+            'open' => $this->make(Template::class),
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        unset($this->factory);
+    }
+
+    public function testShouldHaveNoAttributes()
+    {
+        $template = $this->factory->open('');
+        $this->assertCount(0, $template->get_attributes());
+    }
+
+    public function testShouldNotBeEmptyAfterSettingAnAttribute()
+    {
+        $template = $this->factory->open('');
+        $template->set_attribute('foo', 'bar');
+        $this->assertNotEmpty($template->get_attributes());
+    }
+
+    public function testShouldBeEmptyAfterClear()
+    {
+        $template = $this->factory->open('foo');
+
+        $this->assertEmpty($template->get_attributes());
+
+        $template->clear_attributes();
+        $this->assertEmpty($template->get_attributes());
+    }
+}
diff --git a/tests/unit/lib/flexi/TemplateMagicMethodsTest.php b/tests/unit/lib/flexi/TemplateMagicMethodsTest.php
new file mode 100644
index 0000000..ad2690a
--- /dev/null
+++ b/tests/unit/lib/flexi/TemplateMagicMethodsTest.php
@@ -0,0 +1,78 @@
+<?php
+
+use Flexi\Factory;
+use Flexi\Template;
+
+final class TemplateMagicMethodsTestCase extends \Codeception\Test\Unit
+{
+    private Factory $factory;
+
+    public function setUp(): void
+    {
+        $this->factory = $this->make(Factory::class, [
+            'open' => $this->make(Template::class),
+        ]);
+        $this->template = $this->factory->open('');
+    }
+
+    public function tearDown(): void
+    {
+        unset($this->factory);
+        unset($this->template);
+    }
+
+    public function testShouldSetAnAttributeUsingTheMagicMethods()
+    {
+        $this->template->foo = 'bar';
+        $this->assertEquals('bar', $this->template->get_attribute('foo'));
+    }
+
+    public function testShouldNotSetAProtectedMemberFieldAsAnAttribute()
+    {
+        $this->template->layout = 'bar';
+        $this->assertEquals('bar', $this->template->layout);
+        $this->assertNotEquals('bar', $this->template->get_layout());
+    }
+
+    public function testShouldOverwriteAnAttribute()
+    {
+        $this->template->set_attribute('foo', 'bar');
+        $this->template->foo = 'baz';
+        $this->assertEquals('baz', $this->template->get_attribute('foo'));
+    }
+
+    public function testShouldReturnAnExistingAttributeUsingTheMagicMethods()
+    {
+        $this->template->set_attribute('foo', 'bar');
+        $this->assertEquals('bar', $this->template->foo);
+    }
+
+    public function testShouldReturnNullForANonExistingAttributeUsingTheMagicMethods()
+    {
+        $this->assertNull($this->template->foo);
+    }
+
+    public function testShouldUnsetAnAttributeUsingTheMagicMethods()
+    {
+        $this->template->foo = 'bar';
+        unset($this->template->foo);
+        $this->assertNull($this->template->foo);
+    }
+
+    public function testShouldReturnNullOnUnsettingANonAttribute()
+    {
+        unset($this->template->foo);
+        $this->assertNull($this->template->foo);
+    }
+
+    public function testShouldReturnTrueOnIssetForAnAttribute()
+    {
+        $this->template->foo = 'bar';
+        $this->assertTrue(isset($this->template->foo));
+    }
+
+    public function testShouldReturnFalseOnIssetForANonExistingAttribute()
+    {
+        $this->assertFalse(isset($this->template->foo));
+    }
+}
diff --git a/tests/unit/lib/flexi/TemplateTest.php b/tests/unit/lib/flexi/TemplateTest.php
new file mode 100644
index 0000000..95e9145
--- /dev/null
+++ b/tests/unit/lib/flexi/TemplateTest.php
@@ -0,0 +1,68 @@
+<?php
+
+use Flexi\Factory;
+use Flexi\Template;
+
+final class TemplateTestCase extends \Codeception\Test\Unit
+{
+    private Factory $factory;
+
+    public function setUp(): void
+    {
+        $this->factory = $this->make(Factory::class, [
+            'open' => $this->make(Template::class),
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        unset($this->factory);
+    }
+
+    public function testShouldReturnAPreviouslySetAttribute()
+    {
+        $template = $this->factory->open('foo');
+        $template->set_attribute('whom', 'bar');
+        $this->assertEquals('bar', $template->get_attribute('whom'));
+    }
+
+    public function testShouldReturnPreviouslySetAttributes()
+    {
+        $template = $this->factory->open('foo');
+        $template->set_attributes(['whom' => 'bar', 'foo' => 'baz']);
+
+        $attributes = $template->get_attributes();
+        $this->assertIsArray($attributes);
+        $this->assertCount(2, $attributes);
+        $this->assertEquals('bar', $attributes['whom']);
+        $this->assertEquals('baz', $attributes['foo']);
+    }
+
+    public function testShouldMergeAttributesWithSetAttributes()
+    {
+        $template = $this->factory->open('foo');
+        $template->set_attributes(['a' => 1, 'b' => 2]);
+
+        $this->assertCount(2, $template->get_attributes());
+        $this->assertEquals(1, $template->get_attribute('a'));
+        $this->assertEquals(2, $template->get_attribute('b'));
+
+        $template->set_attributes(['b' => 8, 'c' => 9]);
+
+        $this->assertCount(3, $template->get_attributes());
+        $this->assertEquals(1, $template->get_attribute('a'));
+        $this->assertEquals(8, $template->get_attribute('b'));
+        $this->assertEquals(9, $template->get_attribute('c'));
+    }
+
+    public function testShouldBeEmptyAfterClear()
+    {
+        $template = $this->factory->open('foo');
+
+        $template->set_attributes(['a' => 1, 'b' => 2]);
+        $this->assertNotEmpty($template->get_attributes());
+
+        $template->clear_attributes();
+        $this->assertCount(0, $template->get_attributes());
+    }
+}
diff --git a/tests/unit/varstream.php b/tests/unit/varstream.php
index 9a3acb5..d2047c0 100644
--- a/tests/unit/varstream.php
+++ b/tests/unit/varstream.php
@@ -7,15 +7,17 @@ class ArrayFileStream
 
     private static $fs;
 
-    static function set_filesystem(array $fs) {
+    static function set_filesystem(array $fs)
+    {
         ArrayFileStream::$fs = $fs;
     }
 
-    private static function &get_element($path) {
+    private static function &get_element($path)
+    {
         $result =& ArrayFileStream::$fs;
         foreach (preg_split('/\//', $path, -1, PREG_SPLIT_NO_EMPTY) as $element) {
             if (!isset($result[$element])) {
-                $null = NULL;
+                $null = null;
                 return $null;
             }
             $result =& $result[$element];
@@ -23,9 +25,10 @@ class ArrayFileStream
         return $result;
     }
 
-    private static function &get_file($path) {
+    private static function &get_file($path)
+    {
         $url = parse_url($path);
-        $file =& self::get_element($url['host'] . $url['path']);
+        $file =& self::get_element($url['host'] . ($url['path'] ?? ''));
 
         if (is_null($file)) {
             throw new Exception("file not found.");
@@ -33,15 +36,18 @@ class ArrayFileStream
         return $file;
     }
 
-    public function stream_close() {
+    public function stream_close()
+    {
         # nothing to do
     }
 
-    public function stream_flush() {
+    public function stream_flush()
+    {
         # nothing to do
     }
 
-    public function stream_open($path, $mode, $options, $opened_path) {
+    public function stream_open($path, $mode, $options, $opened_path)
+    {
         try {
             $this->open_file =& self::get_file($path);
             $this->position = 0;
@@ -51,37 +57,41 @@ class ArrayFileStream
         }
     }
 
-    public function stream_read($count) {
+    public function stream_read($count)
+    {
         $ret = mb_substr($this->open_file, $this->position, $count);
         $this->position += mb_strlen($ret);
         return $ret;
     }
 
-    public function stream_write($data) {
-        $left  = mb_substr($this->open_file, 0, $this->position);
+    public function stream_write($data)
+    {
+        $left = mb_substr($this->open_file, 0, $this->position);
         $right = mb_substr($this->open_file, $this->position + mb_strlen($data));
         $this->open_file = $left . $data . $right;
         $this->position += mb_strlen($data);
         return mb_strlen($data);
     }
 
-    public function stream_tell() {
+    public function stream_tell()
+    {
         return $this->position;
     }
 
-    public function stream_eof() {
+    public function stream_eof()
+    {
         return $this->position >= mb_strlen($this->open_file);
     }
 
-    public function stream_seek($offset, $whence) {
+    public function stream_seek($offset, $whence)
+    {
 
         switch ($whence) {
             case SEEK_SET:
                 if ($offset < mb_strlen($this->open_file) && $offset >= 0) {
                     $this->position = $offset;
                     return true;
-                }
-                else {
+                } else {
                     return false;
                 }
                 break;
@@ -90,8 +100,7 @@ class ArrayFileStream
                 if ($offset >= 0) {
                     $this->position += $offset;
                     return true;
-                }
-                else {
+                } else {
                     return false;
                 }
                 break;
@@ -100,8 +109,7 @@ class ArrayFileStream
                 if (mb_strlen($this->open_file) + $offset >= 0) {
                     $this->position = mb_strlen($this->open_file) + $offset;
                     return true;
-                }
-                else {
+                } else {
                     return false;
                 }
                 break;
@@ -115,44 +123,61 @@ class ArrayFileStream
     {
     }
 
-    public function stream_stat() {
-        return array('size' => is_array($this->open_file)
-                     ? sizeof($this->open_file)
-                     : mb_strlen($this->open_file));
+    public function stream_stat()
+    {
+        return [
+            'size' => is_array($this->open_file)
+                ? sizeof($this->open_file)
+                : mb_strlen($this->open_file),
+        ];
     }
 
-    public function unlink($path) {
+    public function unlink($path)
+    {
 
         $parent =& self::get_file(dirname($path));
 
         if (is_array($parent) && isset($parent[basename($path)])) {
             unset($parent[basename($path)]);
-            return TRUE;
+            return true;
         }
 
-        return FALSE;
+        return false;
     }
 
-    public function rename($path_from, $path_to) {
+    public function rename($path_from, $path_to)
+    {
         throw new Exception('not implemented yet');
     }
 
-    public function mkdir($path, $mode, $options) {
+    public function mkdir($path, $mode, $options)
+    {
         throw new Exception('not implemented yet');
     }
 
-    public function rmdir($path, $options) {
+    public function rmdir($path, $options)
+    {
         throw new Exception('not implemented yet');
     }
 
-    public function dir_opendir($path, $options) {
+    public function dir_opendir($path, $options)
+    {
         throw new Exception('not implemented yet');
     }
 
-    public function url_stat($path, $flags) {
+    public function url_stat($path, $flags)
+    {
+        try {
+            if (!self::get_file($path)) {
+                return false;
+            }
+        } catch (Exception $e) {
+            return false;
+        }
+
         $time = time();
 
-        $keys = array(
+        $keys = [
             'dev'     => 0,
             'ino'     => 0,
             'mode'    => 33216, // chmod 700
@@ -161,25 +186,28 @@ class ArrayFileStream
             'gid'     => function_exists('posix_getgid') ? posix_getgid() : 0,
             'rdev'    => 0,
             'size'    => $flags & STREAM_URL_STAT_QUIET
-            ? @mb_strlen($this->open_file) : mb_strlen($this->open_file),
+                ? @mb_strlen($this->open_file) : mb_strlen($this->open_file),
             'atime'   => $time,
             'mtime'   => $time,
             'ctime'   => $time,
             'blksize' => 0,
-            'blocks'  => 0
-        );
+            'blocks'  => 0,
+        ];
         return array_merge(array_values($keys), $keys);
     }
 
-    public function dir_readdir() {
+    public function dir_readdir()
+    {
         throw new Exception('not implemented yet');
     }
 
-    public function dir_rewinddir() {
+    public function dir_rewinddir()
+    {
         throw new Exception('not implemented yet');
     }
 
-    public function dir_closedir() {
+    public function dir_closedir()
+    {
         throw new Exception('not implemented yet');
     }
 }
diff --git a/vendor/flexi/LICENSE b/vendor/flexi/LICENSE
deleted file mode 100644
index e845366..0000000
--- a/vendor/flexi/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2007 Marcus Lunzenauer <mlunzena@uos.de>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/flexi/README b/vendor/flexi/README
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/flexi/Rakefile b/vendor/flexi/Rakefile
deleted file mode 100644
index 5c951fc..0000000
--- a/vendor/flexi/Rakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'rake/clean'
-require 'rake/contrib/sys'
-
-SRC = FileList['lib/**/*']
-CLEAN.include('doc')
-
-desc 'Create documentation'
-file 'doc' => SRC do
-  sh "phpdoc --sourcecode on -t `pwd`/doc -d `pwd`/lib -ti 'trails documentation' -o 'HTML:frames:earthli'"
-end
-
-desc 'Run all unit tests'
-task 'test' do
-  sh "php test/all_tests.php"
-end
-
-desc 'Run coverage'
-task 'coverage' do
-  Sys.indir "test" do
-    sh "php coverage.php"
-  end
-end
diff --git a/vendor/flexi/examples/01_hello_world/index.php b/vendor/flexi/examples/01_hello_world/index.php
deleted file mode 100644
index 1d04136..0000000
--- a/vendor/flexi/examples/01_hello_world/index.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# load flexi lib
-require_once dirname(__FILE__) . '/../../lib/flexi.php';
-
-# where are the templates
-$path_to_the_templates = dirname(__FILE__) . '/templates';
-
-# we need a template factory
-$factory = new Flexi_TemplateFactory($path_to_the_templates);
-
-# open template
-$template = $factory->open('hello_world');
-
-# set name of the greetee
-$template->set_attribute('name', 'Axel');
-
-# render template
-echo $template->render();
diff --git a/vendor/flexi/examples/01_hello_world/templates/hello_world.php b/vendor/flexi/examples/01_hello_world/templates/hello_world.php
deleted file mode 100644
index 9560915..0000000
--- a/vendor/flexi/examples/01_hello_world/templates/hello_world.php
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Hello, <?= $name ?>!</h1>
diff --git a/vendor/flexi/examples/02_quotes/index.php b/vendor/flexi/examples/02_quotes/index.php
deleted file mode 100644
index 8b6e134..0000000
--- a/vendor/flexi/examples/02_quotes/index.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# load flexi lib
-require_once dirname(__FILE__) . '/../../lib/flexi.php';
-
-# where are the templates
-$path_to_the_templates = dirname(__FILE__) . '/templates';
-
-# we need a template factory
-$factory = new Flexi_TemplateFactory($path_to_the_templates);
-
-# open template
-$template = $factory->open('quotes');
-
-
-# set quotes
-$quotes = array(
-  array('author' => 'August Strindberg',
-        'quote'  => 'Der Mensch ist ein wunderliches Tier.'),
-  array('author' => 'Pierre Reverdy',
-        'quote'  => 'Der Mensch ist ein Tier, das sich selbst gezähmt hat.'),
-  array('author' => 'Thomas Niederreuther',
-        'quote'  => 'Der Mensch ist das einzige Tier, das sich für einen Menschen hält.'),
-  array('author' => 'Durs Grünbein',
-        'quote'  => 'Der Mensch ist das Tier, das Kaugummi kaut.'),
-  array('author' => 'Mark Twain',
-        'quote'  => 'Der Mensch ist das einzige Tier, das erröten kann - oder sollte.'));
-
-# select one randomly
-shuffle($quotes);
-$quote_of_the_day = array_shift($quotes);
-
-$template->set_attributes(array('quotes'           => $quotes,
-                                'quote_of_the_day' => $quote_of_the_day));
-
-
-# set current time
-$time = time();
-$template->set_attribute('time', $time);
-
-
-# render template
-echo $template->render();
diff --git a/vendor/flexi/examples/02_quotes/templates/quotes.php b/vendor/flexi/examples/02_quotes/templates/quotes.php
deleted file mode 100644
index b494cca..0000000
--- a/vendor/flexi/examples/02_quotes/templates/quotes.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<? $title = 'Zitate'; ?>
-<div id="header">Zitate <span class="amp">&amp;</span> mehr</div>
-
-<h2>Zitat des Tages (<?= date('d.m.Y', $time) ?>)</h2>
-<p>
-  <em>
-    „<?= $quote_of_the_day['quote'] ?>“
-  </em>
-  (<?= $quote_of_the_day['author'] ?>)
-</p>
-
-
-<? if (sizeof($quotes)) : ?>
-  <h2>Mehr Zitate</h2>
-  <? foreach ($quotes as $quote) : ?>
-    <p>
-      <em>
-        „<?= $quote['quote'] ?>“
-      </em>
-      (<?= $quote['author'] ?>)
-    </p>
-  <? endforeach ?>
-<? endif ?>
diff --git a/vendor/flexi/examples/03_layout/bgbody.gif b/vendor/flexi/examples/03_layout/bgbody.gif
deleted file mode 100644
index d868c71..0000000
Binary files a/vendor/flexi/examples/03_layout/bgbody.gif and /dev/null differ
diff --git a/vendor/flexi/examples/03_layout/index.php b/vendor/flexi/examples/03_layout/index.php
deleted file mode 100644
index 34f9449..0000000
--- a/vendor/flexi/examples/03_layout/index.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# load flexi lib
-require_once dirname(__FILE__) . '/../../lib/flexi.php';
-
-# where are the templates
-$path_to_the_templates = dirname(__FILE__) . '/templates';
-
-# we need a template factory
-$factory = new Flexi_TemplateFactory($path_to_the_templates);
-
-# open template
-$template = $factory->open('quotes');
-
-
-# set layout
-$template->set_layout('layout');
-
-# set quotes
-$quotes = array(
-  array('author' => 'August Strindberg',
-        'quote'  => 'Der Mensch ist ein wunderliches Tier.'),
-  array('author' => 'Pierre Reverdy',
-        'quote'  => 'Der Mensch ist ein Tier, das sich selbst gezähmt hat.'),
-  array('author' => 'Thomas Niederreuther',
-        'quote'  => 'Der Mensch ist das einzige Tier, das sich für einen Menschen hält.'),
-  array('author' => 'Durs Grünbein',
-        'quote'  => 'Der Mensch ist das Tier, das Kaugummi kaut.'),
-  array('author' => 'Mark Twain',
-        'quote'  => 'Der Mensch ist das einzige Tier, das erröten kann - oder sollte.'));
-
-# select one randomly
-shuffle($quotes);
-$quote_of_the_day = array_shift($quotes);
-
-$template->set_attributes(array('quotes'           => $quotes,
-                                'quote_of_the_day' => $quote_of_the_day));
-
-
-# set current time
-$time = time();
-$template->set_attribute('time', $time);
-
-
-# render template
-echo $template->render();
diff --git a/vendor/flexi/examples/03_layout/style.css b/vendor/flexi/examples/03_layout/style.css
deleted file mode 100644
index e8f2bfb..0000000
--- a/vendor/flexi/examples/03_layout/style.css
+++ /dev/null
@@ -1,18 +0,0 @@
-body {
-  background: white url("bgbody.gif") repeat-x;
-  color: #555;
-  font: 1.5em Verdana, Arial, 'Bitstream Vera Sans', sans-serif;
-}
-
-#header {
-  font: 1.8em Verdana, Arial, 'Bitstream Vera Sans', sans-serif;
-  color: white;
-  height: 101px;
-  width: 100%;
-  margin-bottom: 1em;
-}
-
-.amp {
-  font-style: italic;
-  font-family: 'Goudy Old Style', 'Palatino', 'Book Antiqua', serif;
-}
diff --git a/vendor/flexi/examples/03_layout/templates/layout.php b/vendor/flexi/examples/03_layout/templates/layout.php
deleted file mode 100644
index 3d025aa..0000000
--- a/vendor/flexi/examples/03_layout/templates/layout.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-  <title><?= $title ?></title>
-  <link rel="stylesheet" type="text/css" href="style.css" media="screen"/>
-</head>
-<body>
-  <?= $content_for_layout ?>
-</body>
-</html>
diff --git a/vendor/flexi/examples/03_layout/templates/quotes.php b/vendor/flexi/examples/03_layout/templates/quotes.php
deleted file mode 100644
index 9d9b96d..0000000
--- a/vendor/flexi/examples/03_layout/templates/quotes.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<h2>Zitat des Tages (<?= date('d.m.Y', $time) ?>)</h2>
-<p>
-  <em>
-    „<?= $quote_of_the_day['quote'] ?>“
-  </em>
-  (<?= $quote_of_the_day['author'] ?>)
-</p>
-
-
-<? if (sizeof($quotes)) : ?>
-  <h2>Mehr Zitate</h2>
-  <? foreach ($quotes as $quote) : ?>
-    <p>
-      <em>
-        „<?= $quote['quote'] ?>“
-      </em>
-      (<?= $quote['author'] ?>)
-    </p>
-  <? endforeach ?>
-<? endif ?>
diff --git a/vendor/flexi/examples/04_handler_plugin/mustache.php b/vendor/flexi/examples/04_handler_plugin/mustache.php
deleted file mode 100644
index 604c994..0000000
--- a/vendor/flexi/examples/04_handler_plugin/mustache.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-error_reporting(E_ALL ^ E_NOTICE);
-
-// load flexi lib
-require_once dirname(__FILE__) . '/../../lib/flexi.php';
-
-// where are the templates
-$path_to_the_templates = dirname(__FILE__) . '/templates';
-
-// we need a template factory
-$factory = new Flexi_TemplateFactory($path_to_the_templates);
-
-// load haml plugin
-
-require_once dirname(__FILE__) . '/../../lib/mustache_template.php';
-$factory->add_handler('mustache', 'Flexi_MustacheTemplate');
-
-// open template
-$template = $factory->open('mustache');
-
-$template->set_attributes(array(
-  "name" => "Chris",
-  "value" => 10000,
-  "taxed_value" => 10000 - (10000 * 0.4),
-  "in_ca" => true
-));
-
-// test mix of different template engines
-$template->set_layout("layout");
-
-// render template
-echo $template->render();
diff --git a/vendor/flexi/examples/04_handler_plugin/templates/layout.php b/vendor/flexi/examples/04_handler_plugin/templates/layout.php
deleted file mode 100644
index 60d102c..0000000
--- a/vendor/flexi/examples/04_handler_plugin/templates/layout.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<layout>
-<?= $content_for_layout ?>
-</layout>
diff --git a/vendor/flexi/examples/04_handler_plugin/templates/mustache.mustache b/vendor/flexi/examples/04_handler_plugin/templates/mustache.mustache
deleted file mode 100644
index de4a2be..0000000
--- a/vendor/flexi/examples/04_handler_plugin/templates/mustache.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-Hello {{name}}
-You have just won ${{value}}!
-{{#in_ca}}
-Well, ${{taxed_value}}, after taxes.
-{{/in_ca}}
diff --git a/vendor/flexi/examples/xx_js_templates/index.php b/vendor/flexi/examples/xx_js_templates/index.php
deleted file mode 100644
index b158f82..0000000
--- a/vendor/flexi/examples/xx_js_templates/index.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# load flexi lib
-require_once dirname(__FILE__) . '/../../lib/flexi.php';
-
-# where are the templates
-$path_to_the_templates = dirname(__FILE__) . '/templates';
-
-# we need a template factory
-$factory = new Flexi_TemplateFactory($path_to_the_templates);
-
-# open template
-$template = $factory->open('js_template');
-
-# set name of the greetee
-$template->set_attribute('name', 'Axel');
-
-# render template
-echo $template->render();
diff --git a/vendor/flexi/examples/xx_js_templates/templates/js_template.pjs b/vendor/flexi/examples/xx_js_templates/templates/js_template.pjs
deleted file mode 100644
index 56ab8a3..0000000
--- a/vendor/flexi/examples/xx_js_templates/templates/js_template.pjs
+++ /dev/null
@@ -1,3 +0,0 @@
-<?
-$update_page->append(var_export(get_defined_vars(), 1));
-
diff --git a/vendor/flexi/flexi.php b/vendor/flexi/flexi.php
deleted file mode 100644
index 22c21d8..0000000
--- a/vendor/flexi/flexi.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-# Copyright (c)  2012 - <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Stud.IP workaround for legacy plugins
-require_once 'lib/flexi.php';
diff --git a/vendor/flexi/lib/exceptions.php b/vendor/flexi/lib/exceptions.php
deleted file mode 100644
index befb789..0000000
--- a/vendor/flexi/lib/exceptions.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-# Copyright (c)  2009 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-class Flexi_TemplateNotFoundException extends Exception {}
diff --git a/vendor/flexi/lib/flexi.php b/vendor/flexi/lib/flexi.php
deleted file mode 100644
index ab94661..0000000
--- a/vendor/flexi/lib/flexi.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-define('FLEXI_VERSION', '0.5.0');
-
-/**
- * Bootstrapping file for flexi. Just include this to get going.
- *
- * @package   flexi
- */
-
-require_once 'exceptions.php';
-require_once 'template.php';
-require_once 'template_factory.php';
-require_once 'php_template.php';
-require_once 'js_template.php';
-
-require_once 'helper/js_helper.php';
-require_once 'helper/prototype_helper.php';
-require_once 'helper/scriptaculous_helper.php';
-require_once 'helper/tag_helper.php';
-require_once 'helper/text_helper.php';
diff --git a/vendor/flexi/lib/helper/js_helper.php b/vendor/flexi/lib/helper/js_helper.php
deleted file mode 100644
index b641f4e..0000000
--- a/vendor/flexi/lib/helper/js_helper.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * Provides functionality for working with JavaScript in your views.
- *
- * @package    flexi
- * @subpackage helper
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @author    David Heinemeier Hansson
- * @copyright (c) Authors
- * @version   $Id: js_helper.php 3437 2006-05-27 11:38:58Z mlunzena $
- */
-
-class JsHelper {
-
-  /**
-   * Returns a link that'll trigger a javascript function using the
-   * onclick handler and return false after the fact.
-   *
-   * Example:
-   *   JsHelper::link_to_function('Greeting', "alert('Hello world!')");
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function link_to_function($name, $function, $html = array()) {
-    $html['href'] = isset($html['href']) ? $html['href'] : '#';
-    $html['onclick'] = $function.'; return false;';
-    return TagHelper::content_tag('a', $name, $html);
-  }
-
-  /**
-   * Returns a link that'll trigger a JavaScript function using the onclick
-   * handler.
-   *
-   * Examples:
-   *   JsHelper::button_to_function("Greeting", "alert('Hello world!')");
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function button_to_function($name, $function, $html_options = array()) {
-
-    $html_options['type'] = 'button';
-    $html_options['value'] = $name;
-    $html_options['onclick'] = sprintf('%s%s;',
-      isset($html_options['onclick']) ? $html_options['onclick'] . '; ' : '',
-      $function);
-    return TagHelper::tag('input', $html_options);
-  }
-
-  /**
-   * Escape carrier returns and single and double quotes for Javascript
-   * segments.
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function escape_javascript($javascript = '') {
-    $pattern = array();    $replace = array();
-    $pattern[] = '/\\\\/'; $replace[] = '\\\\\\';
-    $pattern[] = '/<\//';  $replace[] = '<\\/';
-    $pattern[] = "/\r\n/"; $replace[] = '\n';
-    $pattern[] = "/\n/";   $replace[] = '\n';
-    $pattern[] = "/\r/";   $replace[] = '\n';
-    $pattern[] = '/"/';    $replace[] = '\\"';
-    $pattern[] = "/'/";    $replace[] = "\\'";
-
-    $javascript = preg_replace($pattern, $replace, $javascript);
-    return $javascript;
-  }
-
-  /**
-   * Returns a JavaScript tag with the '$content' inside.
-   * Example:
-   *   JsHelper::javascript_tag("alert('All is good')");
-   *   => <script type="text/javascript">alert('All is good')</script>
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function javascript_tag($content) {
-    return TagHelper::content_tag('script',
-                                  JsHelper::js_cdata_section($content),
-                                  array('type' => 'text/javascript'));
-  }
-
-  /**
-   * @ignore
-   */
-  function js_cdata_section($content) {
-    return "\n//".TagHelper::cdata_section("\n$content\n//")."\n";
-  }
-
-  /**
-   * @ignore
-   */
-  function options_for_javascript($opt) {
-    $opts = array();
-    foreach ($opt as $key => $value)
-      $opts[] = "$key:$value";
-    sort($opts);
-
-    return '{'.join(', ', $opts).'}';
-  }
-}
diff --git a/vendor/flexi/lib/helper/prototype_helper.php b/vendor/flexi/lib/helper/prototype_helper.php
deleted file mode 100644
index 33f8821..0000000
--- a/vendor/flexi/lib/helper/prototype_helper.php
+++ /dev/null
@@ -1,764 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * PrototypeHelper.
- *
- *
- * @package    flexi
- * @subpackage helper
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @author    David Heinemeier Hansson
- * @copyright (c) Authors
- * @version   $Id: prototype_helper.php 3437 2006-05-27 11:38:58Z mlunzena $
- */
-
-class PrototypeHelper {
-
-  /**
-   * Returns a link to a remote action defined by 'url' (using the 'url_for()'
-   * format) that's called in the background using XMLHttpRequest. The result of
-   * that request can then be inserted into a DOM object whose id can be
-   * specified with 'update'.
-   *
-   * Examples:
-   *  link_to_remote('Delete this post',
-   *                 array('update' => 'posts', 'url' => 'destroy?id='.$id))
-   *
-   * You can also specify a hash for 'update' to allow for
-   * easy redirection of output to an other DOM element if a server-side error
-   * occurs:
-   *
-   * Example:
-   *  link_to_remote('Delete this post',
-   *                 array('update' => array('success' => 'posts',
-   *                                         'failure' => 'error'),
-   *                       'url' => 'destroy?id='.$id))
-   *
-   * Optionally, you can use the 'position' parameter to influence
-   * how the target DOM element is updated. It must be one of 'before', 'top',
-   * 'bottom', or 'after'.
-   *
-   * By default, these remote requests are processed asynchronous during
-   * which various JavaScript callbacks can be triggered (for progress
-   * indicators and the likes). All callbacks get access to the 'request'
-   * object, which holds the underlying XMLHttpRequest.
-   *
-   * The callbacks that may be specified are (in order):
-   *
-   * 'loading'                 Called when the remote document is being
-   *                           loaded with data by the browser.
-   * 'loaded'                  Called when the browser has finished loading
-   *                           the remote document.
-   * 'interactive'             Called when the user can interact with the
-   *                           remote document, even though it has not
-   *                           finished loading.
-   * 'success'                 Called when the XMLHttpRequest is completed,
-   *                           and the HTTP status code is in the 2XX range.
-   * 'failure'                 Called when the XMLHttpRequest is completed,
-   *                           and the HTTP status code is not in the 2XX
-   *                           range.
-   * 'complete'                Called when the XMLHttpRequest is complete
-   *                           (fires after success/failure if present).
-   *
-   * You can further refine 'success' and 'failure' by adding additional
-   * callbacks for specific status codes:
-   *
-   * Example:
-   *   link_to_remote($word, array('url' => $rule,
-   *                               '404' => "alert('Not found...?')",
-   *                               'failure' => "alert('HTTPError!')"))
-   *
-   * A status code callback overrides the success/failure handlers if present.
-   *
-   * If you for some reason or another need synchronous processing (that'll
-   * block the browser while the request is happening), you can specify
-   * 'type' => 'synchronous'.
-   *
-   * You can customize further browser side call logic by passing
-   * in JavaScript code snippets via some optional parameters. In
-   * their order of use these are:
-   *
-   * 'confirm'             Adds confirmation dialog.
-   * 'condition'           Perform remote request conditionally
-   *                       by this expression. Use this to
-   *                       describe browser-side conditions when
-   *                       request should not be initiated.
-   * 'before'              Called before request is initiated.
-   * 'after'               Called immediately after request was
-   *                       initiated and before 'loading'.
-   * 'submit'              Specifies the DOM element ID that's used
-   *                       as the parent of the form elements. By
-   *                       default this is the current form, but
-   *                       it could just as well be the ID of a
-   *                       table row or any other DOM element.
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function link_to_remote($name, $options = array(), $html_options = array()) {
-    return JsHelper::link_to_function($name,
-      PrototypeHelper::remote_function($options), $html_options);
-  }
-
-  /**
-   * Periodically calls the specified url ['url'] every ['frequency'] seconds
-   * (default is 10). Usually used to update a specified div ['update'] with the
-   * results of the remote call. The options for specifying the target with
-   * 'url' and defining callbacks is the same as 'link_to_remote()'.
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function periodically_call_remote($options = array()) {
-    $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-    $code = sprintf('new PeriodicalExecuter(function() {%s}, %d)',
-                    PrototypeHelper::remote_function($options), $frequency);
-    return JsHelper::javascript_tag($code);
-  }
-
-  /**
-   * Returns a form tag that will submit using XMLHttpRequest in the background
-   * instead of the regular reloading POST arrangement. Even though it's using
-   * JavaScript to serialize the form elements, the form submission will work
-   * just like a regular submission as viewed by the receiving side
-   * (all elements available in 'params'). The options for specifying the target
-   * with 'url' and defining callbacks are the same as 'link_to_remote()'.
-   *
-   * A "fall-through" target for browsers that don't do JavaScript can be
-   * specified with the 'action' and 'method' options on '$html_options'.
-   *
-   * Example:
-   *   form_remote_tag(array(
-   *     'url'      => 'tag_add',
-   *     'update'   => 'question_tags',
-   *     'loading'  => "Element.show('indicator'); tag.value = ''",
-   *     'complete' => "Element.hide('indicator');".
-   *                   visual_effect('highlight', 'question_tags')))
-   *
-   * The hash passed as a second argument is equivalent to the options (2nd)
-   * argument in the form_tag() helper.
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function form_remote_tag($options = array(), $html_options = array()) {
-
-    $options = TagHelper::_parse_attributes($options);
-    $html_options = TagHelper::_parse_attributes($html_options);
-
-    $options['form'] = TRUE;
-
-    $html_options['onsubmit'] = PrototypeHelper::remote_function($options).
-                                '; return false;';
-    $html_options['action'] = isset($html_options['action'])
-                              ? $html_options['action']
-                              : $options['url'];
-
-    $html_options['method'] = isset($html_options['method'])
-                              ? $html_options['method']
-                              : 'post';
-
-    return TagHelper::tag('form', $html_options, TRUE);
-  }
-
-  /**
-   * Returns a button input tag that will submit form using XMLHttpRequest in
-   * the background instead of regular reloading POST arrangement. The '$opt'
-   * argument is the same as in 'form_remote_tag()'.
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function submit_to_remote($name, $value, $options = array()) {
-
-    if (!isset($options['with']))
-      $options['with'] = 'Form.serialize(this.form)';
-
-    if (!isset($options['html']))
-      $options['html'] = array();
-
-    $options['html']['type'] = 'button';
-    $options['html']['onclick'] = PrototypeHelper::remote_function($options).
-                                  '; return false;';
-    $options['html']['name'] = $name;
-    $options['html']['value'] = $value;
-
-    return TagHelper::tag('input', $options['html']);
-  }
-
-  /**
-   * Returns a Javascript function (or expression) that will update a DOM
-   * element '$element_id' according to the '$opt' passed.
-   *
-   * Possible '$opt' are:
-   * 'content'    The content to use for updating.
-   * 'action'     Valid options are 'update' (default), 'empty', 'remove'
-   * 'position'   If the 'action' is 'update', you can optionally specify one of
-   *              the following positions: 'before', 'top', 'bottom', 'after'.
-   *
-   * Example:
-   *   update_element_function('products',
-   *                           array('position' => 'bottom',
-   *                                 'content'  => "<p>New product!</p>"));
-   *
-   *
-   * This method can also be used in combination with remote method call
-   * where the result is evaluated afterwards to cause multiple updates on a
-   * page.
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function update_element_function($element_id, $options = array()) {
-
-    $content = JsHelper::escape_javascript(isset($options['content'])
-                                           ? $options['content']
-                                           : '');
-
-    $value = isset($options['action']) ? $options['action'] : 'update';
-
-    switch ($value) {
-
-      case 'update':
-        $js_func = $options['position']
-                   ? sprintf("new Insertion.%s('%s','%s')",
-                             TextHelper::camelize($options['position']),
-                             $element_id, $content)
-                   : "\$('$element_id').innerHTML = '$content'";
-        break;
-
-      case 'empty':
-        $js_func = "\$('$element_id').innerHTML = ''";
-        break;
-
-      case 'remove':
-        $js_func = "Element.remove('$element_id')";
-        break;
-
-      default:
-        trigger_error('Invalid action, choose one of update, remove, empty');
-        exit;
-    }
-
-    $js_func .= ";\n";
-
-    return isset($options['binding']) ? $js_func.$options['binding'] : $js_func;
-  }
-
-  /**
-   * Returns 'eval(request.responseText)', which is the Javascript function that
-   * 'form_remote_tag()' can call in 'complete' to evaluate a multiple update
-   * return document using 'update_element_function()' calls.
-   *
-   * @return type <description>
-   */
-  function evaluate_remote_response() {
-    return 'eval(request.responseText)';
-  }
-
-  /**
-   * Returns the javascript needed for a remote function.
-   * Takes the same arguments as 'link_to_remote()'.
-   *
-   * Example:
-   *   <select id="options" onchange="<?=
-   *     remote_function(array('update' => 'options',
-   *                           'url' => '@update_options')) ?>">
-   *     <option value="0">Hello</option>
-   *     <option value="1">World</option>
-   *   </select>
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function remote_function($options) {
-    $javascript_options = PrototypeHelper::options_for_ajax($options);
-
-    $update = '';
-    if (isset($options['update']) && is_array($options['update'])) {
-
-      $update = array();
-      if (isset($options['update']['success']))
-        $update[] = "success:'".$options['update']['success']."'";
-
-      if (isset($options['update']['failure']))
-        $update[] = "failure:'".$options['update']['failure']."'";
-
-      $update = '{'.join(',', $update).'}';
-
-    } else if (isset($options['update'])) {
-      $update .= "'".$options['update']."'";
-    }
-
-    $function = sprintf("new Ajax.%s(%s'%s', %s)",
-                        $update ? 'Updater' : 'Request',
-                        $update ? "$update, " : '',
-                        $options['url'],
-                        $javascript_options);
-
-    if (isset($options['before']))
-      $function = $options['before'].'; '.$function;
-
-    if (isset($options['after']))
-      $function = $function.'; '.$options['after'];
-
-    if (isset($options['condition']))
-      $function = 'if ('.$options['condition'].') { '.$function.'; }';
-
-    if (isset($options['confirm'])) {
-      $function = "if (confirm('" .
-                  JsHelper::escape_javascript($options['confirm']) .
-                  "')) { $function; }";
-      if (isset($options['cancel']))
-        $function .= ' else { '.$options['cancel'].' }';
-    }
-
-    return $function;
-  }
-
-  /**
-   * Observes the field with the DOM ID specified by '$field_id' and makes
-   * an AJAX call when its contents have changed.
-   *
-   * Required '$options' are:
-   * 'url'                 'url_for()'-style options for the action to call
-   *                       when the field has changed.
-   *
-   * Additional options are:
-   * 'frequency'           The frequency (in seconds) at which changes to
-   *                       this field will be detected. Not setting this
-   *                       option at all or to a value equal to or less than
-   *                       zero will use event based observation instead of
-   *                       time based observation.
-   * 'update'              Specifies the DOM ID of the element whose
-   *                       innerHTML should be updated with the
-   *                       XMLHttpRequest response text.
-   * 'with'                A JavaScript expression specifying the
-   *                       parameters for the XMLHttpRequest. This defaults
-   *                       to 'value', which in the evaluated context
-   *                       refers to the new field value.
-   *
-   * Additionally, you may specify any of the options documented in
-   * link_to_remote().
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function observe_field($field_id, $options = array()) {
-    $name = isset($options['frequency']) && $options['frequency'] > 0
-            ? 'Form.Element.Observer'
-            : 'Form.Element.EventObserver';
-    return PrototypeHelper::build_observer($name, $field_id, $options);
-  }
-
-  /**
-   * Like 'observe_field()', but operates on an entire form identified by the
-   * DOM ID '$form_id'. '$options' are the same as 'observe_field()', except
-   * the default value of the 'with' option evaluates to the
-   * serialized (request string) value of the form.
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function observe_form($form_id, $options = array()) {
-    $name = isset($options['frequency']) && $options['frequency'] > 0
-            ? 'Form.Observer'
-            : 'Form.EventObserver';
-    return PrototypeHelper::build_observer($name, $form_id, $options);
-  }
-
-  /**
-   * @ignore
-   */
-  function options_for_ajax($options) {
-    $js_opt = PrototypeHelper::build_callbacks($options);
-
-    $js_opt['asynchronous'] = isset($options['type'])
-                              ? $options['type'] != 'synchronous' : 'true';
-
-    if (isset($options['method']))
-      $js_opt['method'] = PrototypeHelper::method_option_to_s($options['method']);
-
-    if (isset($options['position']))
-      $js_opt['insertion'] = 'Insertion.'.TextHelper::camelize($options['position']);
-
-    $js_opt['evalScripts'] = !isset($options['script']) ||
-                             $options['script'] == '0' ||
-                             $options['script'] == 'false'
-                             ? 'false' : 'true';
-
-    if (isset($options['form']))
-      $js_opt['parameters'] = 'Form.serialize(this)';
-    else if (isset($options['submit']))
-      $js_opt['parameters'] = "Form.serialize(document.getElementById('{$options['submit']}'))";
-    else if (isset($options['with']))
-      $js_opt['parameters'] = $options['with'];
-
-    return JsHelper::options_for_javascript($js_opt);
-  }
-
-  /**
-   * @ignore
-   */
-  function method_option_to_s($method) {
-    return is_string($method) && $method[0] == "'" ? $method : "'$method'";
-  }
-
-  /**
-   * @ignore
-   */
-  function build_observer($klass, $name, $options = array()) {
-    if (!isset($options['with']) && $options['update'])
-      $options['with'] = 'value';
-
-    $callback = PrototypeHelper::remote_function($options);
-
-    $javascript  = 'new '.$klass.'("'.$name.'", ';
-    if (isset($options['frequency']))
-      $javascript .= $options['frequency'].", ";
-
-    $javascript .= 'function(element, value) {';
-    $javascript .= $callback.'});';
-
-    return JsHelper::javascript_tag($javascript);
-  }
-
-  /**
-   * @ignore
-   */
-  function build_callbacks($options) {
-    $callbacks = array();
-    foreach (PrototypeHelper::get_callbacks() as $callback) {
-      if (isset($options[$callback])) {
-        $name = 'on'.ucfirst($callback);
-        $code = $options[$callback];
-        $callbacks[$name] = 'function(request, json){'.$code.'}';
-      }
-    }
-
-    return $callbacks;
-  }
-
-  /**
-   * @ignore
-   */
-  function get_callbacks() {
-    static $callbacks;
-    if (!$callbacks)
-      $callbacks = array_merge(range(100, 599),
-                               array('uninitialized', 'loading', 'loaded',
-                                     'interactive', 'complete', 'failure',
-                                     'success'));
-    return $callbacks;
-  }
-
-  /**
-   * @ignore
-   */
-  function get_ajax_options() {
-    static $ajax_options;
-    if (!$ajax_options)
-      $ajax_options = array('before', 'after', 'condition', 'url',
-                            'asynchronous', 'method', 'insertion', 'position',
-                            'form', 'with', 'update', 'script')
-                      + PrototypeHelper::get_callbacks();
-    return $ajax_options;
-  }
-}
-
-/**
- * JavaScriptGenerator generates blocks of JavaScript code that allow you to
- * change the content and presentation of multiple DOM elements. Use this in
- * your Ajax response bodies, either in a <script> tag or as plain JavaScript
- * sent with a Content-type of "text/javascript".
- *
- * @package   flexi
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id: prototype_helper.php 3437 2006-05-27 11:38:58Z mlunzena $
- */
-
-class Flexi_JavascriptGenerator {
-
-  /**
-   * internal variables
-   * @ignore
-   */
-  var $lines = array();
-
-  /**
-   * @ignore
-   */
-  function to_s() {
-    $javascript = implode("\n", $this->lines);
-    return "try {\n".$javascript."\n} catch (e) { ".
-           "alert('JS error:\\n\\n' + e.toString()); throw e }";
-  }
-
-################################################################################
-# function []
-# function select
-# function draggable
-# function drop_receiving
-# function sortable
-################################################################################
-
-  /**
-   * Inserts HTML at the specified 'position' relative to the DOM element
-   * identified by the given 'id'.
-   *
-   * 'position' may be one of:
-   *
-   * 'top'::    HTML is inserted inside the element, before the
-   *            element's existing content.
-   * 'bottom':: HTML is inserted inside the element, after the
-   *            element's existing content.
-   * 'before':: HTML is inserted immediately preceeding the element.
-   * 'after'::  HTML is inserted immediately following the element.
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function insert_html($position, $id, $content) {
-    $insertion = TextHelper::camelize($position);
-    $this->call('new Insertion.'.$insertion, $id, $content);
-  }
-
-  /**
-   * Replaces the inner HTML of the DOM element with the given 'id'.
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function replace_html($id, $content) {
-    $this->call('Element.update', $id, $content);
-  }
-
-  /**
-   * Replaces the "outer HTML" (i.e., the entire element, not just its
-   * contents) of the DOM element with the given 'id'.
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return void
-   */
-  function replace($id, $content) {
-    $this->call('Element.replace', $id, $content);
-  }
-
-  /**
-   * Removes the DOM elements with the given 'ids' from the page.
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function remove($ids) {
-    $ids = func_get_args();
-    $this->record($this->javascript_object_for($ids).".each(Element.remove)");
-  }
-
-  /**
-   * Shows hidden DOM elements with the given 'ids'.
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function show($ids) {
-    $ids = func_get_args();
-    array_unshift($ids, 'Element.show');
-    call_user_func_array(array(&$this, 'call'), $ids);
-  }
-
-  /**
-   * Hides the visible DOM elements with the given 'ids'.
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function hide($ids) {
-    $ids = func_get_args();
-    array_unshift($ids, 'Element.hide');
-    call_user_func_array(array(&$this, 'call'), $ids);
-  }
-
-  /**
-   * Toggles the visibility of the DOM elements with the given 'ids'.
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function toggle($ids) {
-    $ids = func_get_args();
-    array_unshift($ids, 'Element.toggle');
-    call_user_func_array(array(&$this, 'call'), $ids);
-  }
-
-  /**
-   * Displays an alert dialog with the given 'message'.
-   *
-   * @param string the given message.
-   *
-   * @return void
-   */
-  function alert($message) {
-    $this->call('alert', $message);
-  }
-
-  /**
-   * Redirects the browser to the given 'location'.
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function redirect_to($location) {
-    $this->assign('window.location.href', $location);
-  }
-
-  /**
-   * Calls the JavaScript 'function', optionally with the given 'arguments'.
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function call($function) {
-    $arguments = func_get_args();
-    array_shift($arguments);
-    $this->record($function.'('.$this->arguments_for_call($arguments).')');
-  }
-
-  /**
-   * Assigns the JavaScript 'variable' the given 'value'.
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return void
-   */
-  function assign($variable, $value) {
-    $this->record($variable.' = '.$this->javascript_object_for($value));
-  }
-
-  /**
-   * Writes raw JavaScript to the page.
-   *
-   * @param string the raw JavaScript
-   *
-   * @return void
-   */
-  function append($javascript) {
-    $this->lines[] = $javascript;
-  }
-
-  /**
-   * Executes the given javascript after a delay of 'seconds'.
-   *
-   * # TODO (mlunzena) this function has side effects and has to be explained or deleted
-   *
-   * @param type <description>
-   *
-   * @return void
-   */
-  function delay($seconds = 1) {
-    static $in_delay = FALSE;
-
-    if (!$in_delay) {
-      $in_delay = TRUE;
-      $this->record("setTimeout(function() {\n\n");
-    }
-
-    else {
-      $in_delay = FALSE;
-      $this->record(sprintf("\n}, %d)", $seconds * 1000));
-    }
-
-    return $in_delay;
-  }
-
-  /**
-   * Starts a script.aculo.us visual effect. See
-   * ScriptaculousHelper for more information.
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return void
-   */
-  function visual_effect($name, $id = FALSE, $js_opt = array()) {
-    $this->record(ScriptaculousHelper::visual_effect($name, $id, $js_opt));
-  }
-
-  /**
-   * @ignore
-   */
-  function record($line) {
-    $line = preg_replace('/\;$/', '', rtrim($line)) . ';';
-    $this->append($line);
-  }
-
-  /**
-   * @ignore
-   */
-  function javascript_object_for($object) {
-    return json_encode($object);
-  }
-
-  /**
-   * @ignore
-   */
-  function arguments_for_call($arguments) {
-    $mapped = array();
-    foreach ($arguments as $argument)
-      $mapped[] = $this->javascript_object_for($argument);
-    return join(',', $mapped);
-  }
-}
diff --git a/vendor/flexi/lib/helper/scriptaculous_helper.php b/vendor/flexi/lib/helper/scriptaculous_helper.php
deleted file mode 100644
index 643ad24..0000000
--- a/vendor/flexi/lib/helper/scriptaculous_helper.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * ScriptaculousHelper.
- *
- *
- * @package    flexi
- * @subpackage helper
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @author    David Heinemeier Hansson
- * @copyright (c) Authors
- * @version   $Id: scriptaculous_helper.php 3437 2006-05-27 11:38:58Z mlunzena $
- */
-
-class ScriptaculousHelper {
-
-  /**
-   * Returns a JavaScript snippet to be used on the AJAX callbacks for starting
-   * visual effects.
-   *
-   * Example:
-   *  ScriptaculousHelper::visual_effect('highlight', 'posts',
-   *    array('duration' => 0.5 ));
-   *
-   * If no '$element_id' is given, it assumes "element" which should be a local
-   * variable in the generated JavaScript execution context. This can be used
-   * for example with drop_receiving_element():
-   *
-   *  ScriptaculousHelper::drop_receving_element(..., array(...
-   *        'loading' => ScriptaculousHelper::visual_effect('fade')));
-   *
-   * This would fade the element that was dropped on the drop receiving element.
-   *
-   * You can change the behaviour with various options, see
-   * http://script.aculo.us for more documentation.
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return string <description>
-   */
-  function visual_effect($name, $element_id = FALSE, $js_opt = array()) {
-
-    $element = $element_id ? "'$element_id'" : 'element';
-
-    switch ($name) {
-      case 'toggle_appear':
-      case 'toggle_blind':
-      case 'toggle_slide':
-        return sprintf("new Effect.toggle(%s, '%s', %s)",
-                       $element, substr($name, 7),
-                       JsHelper::options_for_javascript($js_opt));
-    }
-
-    return sprintf("new Effect.%s(%s, %s)",
-                   TextHelper::camelize($name),
-                   $element, JsHelper::options_for_javascript($js_opt));
-  }
-
-
-  /**
-   * Makes the elements with the DOM ID specified by '$element_id' sortable
-   * by drag-and-drop and make an AJAX call whenever the sort order has
-   * changed. By default, the action called gets the serialized sortable
-   * element as parameters.
-   *
-   * Example:
-   *   <php echo sortable_element($my_list, array(
-   *      'url' => '@order',
-   *   )) ?>
-   *
-   * In the example, the action gets a '$my_list' array parameter
-   * containing the values of the ids of elements the sortable consists
-   * of, in the current order.
-   *
-   * You can change the behaviour with various options, see
-   * http://script.aculo.us for more documentation.
-   */
-  function sortable_element($element_id, $options = array()) {
-
-    if (!isset($options['with']))
-      $options['with'] = "Sortable.serialize('$element_id')";
-
-    if (!isset($options['onUpdate']))
-      $options['onUpdate'] =
-        sprintf('function(){%s}', PrototypeHelper::remote_function($options));
-
-    foreach (PrototypeHelper::get_ajax_options() as $key)
-      unset($options[$key]);
-
-    foreach (array('tag', 'overlap', 'constraint', 'handle') as $option)
-      if (isset($options[$option]))
-        $options[$option] = "'{$options[$option]}'";
-
-    if (isset($options['containment']))
-      $options['containment'] = self::array_or_string_for_javascript($options['containment']);
-
-    if (isset($options['hoverclass']))
-      $options['hoverclass'] = "'{$options['hoverclass']}'";
-
-    if (isset($options['only']))
-      $options['only'] = self::array_or_string_for_javascript($options['only']);
-
-    return JsHelper::javascript_tag(
-      sprintf("Sortable.create('%s', %s)",
-              $element_id, JsHelper::options_for_javascript($options)));
-  }
-
-
-  /**
-   * @ignore
-   */
-  function array_or_string_for_javascript($option) {
-    if (is_array($option)) {
-      return "['".join("','", $option)."']";
-    } else if ($option) {
-      return "'$option'";
-    }
-  }
-}
diff --git a/vendor/flexi/lib/helper/tag_helper.php b/vendor/flexi/lib/helper/tag_helper.php
deleted file mode 100644
index 673c5c1..0000000
--- a/vendor/flexi/lib/helper/tag_helper.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * TagHelper defines some base helpers to construct html tags.
- * This is poor man’s Builder for the rare cases where you need to
- * programmatically make tags but can’t use Builder.
- *
- * @package    flexi
- * @subpackage helper
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @author    Fabien Potencier <fabien.potencier@symfony-project.com>
- * @author    David Heinemeier Hansson
- * @copyright (c) Authors
- * @version   $Id: tag_helper.php 3437 2006-05-27 11:38:58Z mlunzena $
- */
-
-class TagHelper {
-
-  /**
-   * Constructs an html tag.
-   *
-   * @param  $name    string  tag name
-   * @param  $options array   tag options
-   * @param  $open    boolean true to leave tag open
-   *
-   * @return string
-   */
-  function tag($name, $options = array(), $open = false) {
-    if (!$name) return '';
-    return '<'.$name.TagHelper::_tag_options($options).($open ? '>' : ' />');
-  }
-
-  /**
-   * Helper function for content tags.
-   *
-   * @param type <description>
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function content_tag($name, $content = '', $options = array()) {
-    if (!$name) return '';
-    return '<'.$name.TagHelper::_tag_options($options).'>'.$content.'</'.$name.'>';
-  }
-
-  /**
-   * Helper function for CDATA sections.
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function cdata_section($content) {
-    return '<![CDATA['.$content.']]>';
-  }
-
-  /**
-   * @ignore
-   */
-  function _tag_options($options = array()) {
-    $options = TagHelper::_parse_attributes($options);
-    $html = '';
-    foreach ($options as $key => $value)
-      $html .= ' '.$key.'="'.$value.'"';
-    return $html;
-  }
-
-  /**
-   * @ignore
-   */
-  function _parse_attributes($string) {
-    return is_array($string) ? $string : TagHelper::string_to_array($string);
-  }
-
-  /**
-   * <MethodDescription>
-   *
-   * @param string <description>
-   *
-   * @return array <description>
-   */
-  function string_to_array($string) {
-    preg_match_all('/
-      \s*(\w+)              # key                               \\1
-      \s*=\s*               # =
-      (\'|")?               # values may be included in \' or " \\2
-      (.*?)                 # value                             \\3
-      (?(2) \\2)            # matching \' or " if needed        \\4
-      \s*(?:
-        (?=\w+\s*=) | \s*$  # followed by another key= or the end of the string
-      )
-    /x', $string, $matches, PREG_SET_ORDER);
-
-    $attributes = array();
-    foreach ($matches as $val)
-      $attributes[$val[1]] = $val[3];
-
-    return $attributes;
-  }
-}
diff --git a/vendor/flexi/lib/helper/text_helper.php b/vendor/flexi/lib/helper/text_helper.php
deleted file mode 100644
index c596727..0000000
--- a/vendor/flexi/lib/helper/text_helper.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * TextHelper.
- *
- *
- * @package    flexi
- * @subpackage helper
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class TextHelper {
-
-  /**
-   * Holds the internal cycles.
-   *
-   * @ignore
-   */
-  private static $cycles = array();
-
-
-  /**
-   * Returns a camelized string from a lower case and underscored string by
-   * replacing slash with underscore and upper-casing each letter preceded
-   * by an underscore.
-   *
-   * @param string String to camelize.
-   *
-   * @return string Camelized string.
-   */
-  function camelize($word) {
-    return str_replace(' ', '',
-                       ucwords(str_replace(array('_', '/'),
-                                           array(' ', ' '), $word)));
-  }
-
-
-  /**
-   * Creates a Cycle object whose +__toString method cycles through elements of
-   * an array every time it is called. This can be used for example, to
-   * alternate classes for table rows:
-   *
-   *   <? foreach ($items as $item) : ?>
-   *     <tr class="<?= TextHelper::cycle('odd', 'even') ?>">
-   *       <td><?= item ?></td>
-   *     </tr>
-   *   <? endforeach ?>
-   *
-   * You can use named cycles to allow nesting in loops.  Passing a single array
-   * as the only parameter with a <tt>name</tt> key will create a named cycle.
-   * You can manually reset a cycle by calling reset_cycle and passing the
-   * name of the cycle.
-   *
-   *   <? foreach($items as $item) : ?>
-   *     <tr class="<?= TextHelper::cycle(array("even", "odd", "name" => "row_class")) ?>">
-   *       <td>
-   *         <? foreach ($item->values as $value) : ?>
-   *           <span style="color:<?= TextHelper::cycle(array("red", "green", "blue", "name" => "colors")) : ?>">
-   *             <?= $value ?>
-   *           </span>
-   *         <? endforeach ?>
-   *         <? TextHelper::reset_cycle("colors") ?>
-   *       </td>
-   *    </tr>
-   *  <? endforeach ?>
-   */
-  static function cycle($first_value) {
-
-    $values = func_get_args();
-
-
-    if (sizeof($values) == 1 && is_array($values[0])) {
-      $values = $values[0];
-      $name = isset($values['name']) ? $values['name'] : 'default';
-      unset($values['name']);
-    }
-    else {
-      $name = 'default';
-    }
-
-    $cycle = self::get_cycle($name);
-    if (is_null($cycle) || $cycle->values !== $values) {
-      $cycle = self::set_cycle($name, new TextHelperCycle($values));
-    }
-
-    return (string) $cycle;
-  }
-
-
-  /**
-   * Resets a cycle so that it starts from the first element the next time
-   * it is called. Pass in +name+ to reset a named cycle.
-   *
-   * @param  string   an optional name of a cycle
-   *
-   * @return void
-   */
-  public static function reset_cycle($name = 'default') {
-    $cycle = self::get_cycle($name);
-    if (isset($cycle)) {
-      $cycle->reset();
-    }
-  }
-
-
-  /**
-   * @ignore
-   */
-  private static function get_cycle($name) {
-    return isset(self::$cycles[$name]) ? self::$cycles[$name] : NULL;
-  }
-
-  /**
-   * @ignore
-   */
-  private static function set_cycle($name, $cycle) {
-    return self::$cycles[$name] = $cycle;
-  }
-}
-
-
-/**
- * This class holds an array of string and cycles through them.
- *
- * @package     flexi
- * @subpackage  helper
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class TextHelperCycle {
-
-
-  public $values;
-
-
-  function __construct($values) {
-    $this->values = (array) $values;
-  }
-
-
-  function cycle() {
-    $result = current($this->values);
-    if (next($this->values) === FALSE)
-      $this->reset();
-    return $result;
-  }
-
-
-  function reset() {
-    reset($this->values);
-  }
-
-
-  function __toString() {
-    return $this->cycle();
-  }
-}
diff --git a/vendor/flexi/lib/js_template.php b/vendor/flexi/lib/js_template.php
deleted file mode 100644
index d2113a6..0000000
--- a/vendor/flexi/lib/js_template.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * A template engine that renders Javascript templates.
- *
- * @package   flexi
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class Flexi_JsTemplate extends Flexi_PhpTemplate {
-
-  /**
-   * Parse, render and return the presentation.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function _render() {
-
-    # put attributes into scope
-    extract($this->_attributes);
-
-    # get generator object
-    $update_page = new Flexi_JavascriptGenerator();
-
-    # include template, parse it and remove output
-    ob_start();
-    require $this->_template;
-    ob_end_clean();
-
-    return $update_page->to_s();
-  }
-}
diff --git a/vendor/flexi/lib/mustache_template.php b/vendor/flexi/lib/mustache_template.php
deleted file mode 100644
index 2051a2e..0000000
--- a/vendor/flexi/lib/mustache_template.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../vendor/mustache.php/Mustache.php';
-
-/**
- * A template engine that uses PHP to render templates.
- *
- * @package   flexi
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class Flexi_MustacheTemplate extends Flexi_Template {
-
-  /**
-   * Parse, render and return the presentation.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function _render() {
-    ${0} = new MyMustache($this);
-    $content_for_layout = ${0}->render();
-
-    // include layout, parse it and get output
-    if (isset($this->_layout)) {
-      $defined = get_defined_vars();
-      unset($defined['this'], $defined['0']);
-      $content_for_layout = $this->_layout->render($defined);
-    }
-
-    return $content_for_layout;
-  }
-
-  function getPartial($tag_name) {
-      $file = dirname($this->_template) . '/' . $tag_name . '.mustache';
-      var_dump($file);
-      if (file_exists($file)) {
-          return file_get_contents($file);
-      }
-      return '';
-  }
-}
-
-class MyMustache extends Mustache {
-
-    public function __construct($flexi) {
-        parent::__construct(file_get_contents($flexi->_template), $flexi->_attributes);
-        $this->_flexi = $flexi;
-    }
-
-    protected function _getPartial($tag_name) {
-
-        if ($partial = $this->_flexi->getPartial($tag_name)) {
-            return $partial;
-        }
-
-        if ($this->_throwsException(MustacheException::UNKNOWN_PARTIAL)) {
-            throw new MustacheException('Unknown partial: ' . $tag_name, MustacheException::UNKNOWN_PARTIAL);
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/vendor/flexi/lib/php_template.php b/vendor/flexi/lib/php_template.php
deleted file mode 100644
index af808b4..0000000
--- a/vendor/flexi/lib/php_template.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * A template engine that uses PHP to render templates.
- *
- * @package   flexi
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class Flexi_PhpTemplate extends Flexi_Template {
-
-  /**
-   * Parse, render and return the presentation.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function _render() {
-
-    extract($this->_attributes);
-
-    # include template, parse it and get output
-    ob_start();
-    require $this->_template;
-    $content_for_layout = ob_get_clean();
-
-
-    # include layout, parse it and get output
-    if (isset($this->_layout)) {
-      $defined = get_defined_vars();
-      unset($defined['this']);
-      $content_for_layout = $this->_layout->render($defined);
-    }
-
-    return $content_for_layout;
-  }
-
-
-  /**
-   * Parse, render and return the presentation of a partial template.
-   *
-   * @param string A name of a partial template.
-   * @param array  An optional associative array of attributes and their
-   *               associated values.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function render_partial($partial, $attributes = array()) {
-    return $this->_factory->render($partial, $attributes + $this->_attributes);
-  }
-
-
-  /**
-   * Renders a partial template with every member of a collection. This member
-   * can be accessed by a template variable with the same name as the name of
-   * the partial template.
-   *
-   * Example:
-   *
-   *   # template entry.php contains:
-   *   <li><?= $entry ?></li>
-   *
-   *
-   *   $entries = array('lorem', 'ipsum');
-   *   $template->render_partial_collection('entry', $entries);
-   *
-   *   # results in:
-   *   <li>lorem</li>
-   *   <li>ipsum</li>
-   *
-   * TODO (mlunzena) spacer and attributes must be described
-   *
-   * @param string A name of a partial template.
-   * @param array  The collection to be rendered.
-   * @param string Optional a name of a partial template used as spacer.
-   * @param array  An optional associative array of attributes and their
-   *               associated values.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function render_partial_collection($partial, $collection,
-                                     $spacer = NULL, $attributes = array()) {
-
-    $template = $this->_factory->open($partial);
-    $template->set_attributes($this->_attributes);
-    $template->set_attributes($attributes);
-
-    $collected = array();
-    $iterator_name = pathinfo($partial, PATHINFO_FILENAME);
-    foreach ($collection as $element)
-      $collected[] = $template->render(array($iterator_name => $element));
-
-    $spacer = isset($spacer) ? $this->render_partial($spacer, $attributes) : '';
-
-    return join($spacer, $collected);
-  }
-}
diff --git a/vendor/flexi/lib/template.php b/vendor/flexi/lib/template.php
deleted file mode 100644
index b4d97e8..0000000
--- a/vendor/flexi/lib/template.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * Abstract template class representing the presentation layer of an action.
- * Output can be customized by supplying attributes, which a template can
- * manipulate and display.
- *
- * @package   flexi
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-abstract class Flexi_Template {
-
-  /**
-   * @ignore
-   */
-  public $_attributes, $_factory, $_options, $_layout, $_template;
-
-
-  /**
-   * Constructor
-   *
-   * @param string                 the path of the template.
-   * @param Flexi_TemplateFactory  the factory creating this template
-   * @param array                  optional array of options
-   *
-   * @return void
-   */
-  function __construct($template, &$factory, $options = array()) {
-
-    # set template
-    $this->_template = $template;
-
-    # set factory
-    $this->_factory = $factory;
-
-    # set options
-    $this->_options = $options;
-
-    # init attributes
-    $this->clear_attributes();
-
-    # set layout
-    $this->set_layout(NULL);
-  }
-
-
-  /**
-   * __set() is a magic method run when writing data to inaccessible members.
-   * In this class it is used to set attributes for the template in a
-   * comfortable way.
-   *
-   * @see http://php.net/__set
-   *
-   * @param  string     the name of the member field
-   * @param  mixed      the value for the member field
-   *
-   * @return void
-   */
-  function __set($name, $value) {
-    $this->set_attribute($name, $value);
-  }
-
-
-  /**
-   * __get() is a magic method utilized for reading data from inaccessible
-   * members.
-   * In this class it is used to get attributes for the template in a
-   * comfortable way.
-   *
-   * @see http://php.net/__set
-   *
-   * @param  string     the name of the member field
-   *
-   * @return mixed      the value for the member field
-   */
-  function __get($name) {
-    return $this->get_attribute($name);
-  }
-
-
-  /**
-   * __isset() is a magic method triggered by calling isset() or empty() on
-   * inaccessible members.
-   * In this class it is used to check for attributes for the template in a
-   * comfortable way.
-   *
-   * @see http://php.net/__set
-   *
-   * @param  string     the name of the member field
-   *
-   * @return bool       TRUE if that attribute exists, FALSE otherwise
-   */
-  function __isset($name) {
-    return isset($this->_attributes[$name]);
-  }
-
-
-  /**
-   * __unset() is a magic method invoked when unset() is used on inaccessible
-   * members.
-   * In this class it is used to check for attributes for the template in a
-   * comfortable way.
-   *
-   * @see http://php.net/__set
-   *
-   * @param  string     the name of the member field
-   *
-   * @return void
-   */
-  function __unset($name) {
-    $this->clear_attribute($name);
-  }
-
-
-  /**
-   * Parse, render and return the presentation.
-   *
-   * @param array  An optional associative array of attributes and their
-   *               associated values.
-   * @param string A name of a layout template.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function render($attributes = null, $layout = null) {
-
-    if (isset($layout)) {
-      $this->set_layout($layout);
-    }
-
-    # merge attributes
-    $this->set_attributes($attributes);
-
-    return $this->_render();
-  }
-
-
-  /**
-   * Parse, render and return the presentation.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  abstract function _render();
-
-
-  /**
-   * Returns the value of an attribute.
-   *
-   * @param string An attribute name.
-   * @param mixed  An attribute value.
-   *
-   * @return mixed  An attribute value.
-   */
-  function get_attribute($name) {
-    return isset($this->_attributes[$name]) ? $this->_attributes[$name] : NULL;
-  }
-
-
-  /**
-   * Set an array of attributes.
-   *
-   * @return array An associative array of attributes and their associated
-   *               values.
-   */
-  function get_attributes() {
-    return $this->_attributes;
-  }
-
-
-  /**
-   * Set an attribute.
-   *
-   * @param string An attribute name.
-   * @param mixed  An attribute value.
-   *
-   * @return void
-   */
-  function set_attribute($name, $value) {
-    $this->_attributes[$name] = $value;
-  }
-
-
-  /**
-   * Set an array of attributes.
-   *
-   * @param array An associative array of attributes and their associated
-   *              values.
-   *
-   * @return void
-   */
-  function set_attributes($attributes) {
-    $this->_attributes = (array)$attributes + (array)$this->_attributes;
-  }
-
-
-  /**
-   * Clear all attributes associated with this template.
-   *
-   * @return void
-   */
-  function clear_attributes() {
-    $this->_attributes = array();
-  }
-
-
-  /**
-   * Clear an attribute associated with this template.
-   *
-   * @param string The name of the attribute to be cleared.
-   *
-   * @return void
-   */
-  function clear_attribute($name) {
-    unset($this->_attributes[$name]);
-  }
-
-
-  /**
-   * Set the template's layout.
-   *
-   * @param mixed A name of a layout template or a layout template.
-   *
-   * @return void
-   */
-  function set_layout($layout) {
-    $this->_layout = $this->_factory->open($layout);
-  }
-}
diff --git a/vendor/flexi/lib/template_factory.php b/vendor/flexi/lib/template_factory.php
deleted file mode 100644
index dfdc74e..0000000
--- a/vendor/flexi/lib/template_factory.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-/**
- * Using this factory you can create new Template objects.
- *
- * @package   flexi
- *
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class Flexi_TemplateFactory {
-
-
-  /**
-   * include path for templates
-   *
-   * @var string
-   */
-  protected $path;
-
-
-  /**
-   * mapping of file extensions to supported template classes
-   *
-   * @var array
-   */
-  protected $handlers = array(
-      'php' => array('Flexi_PhpTemplate', array()),
-      'pjs' => array('Flexi_JsTemplate',  array())
-  );
-
-
-  /**
-   * Constructor of TemplateFactory.
-   *
-   * @param string the template include path
-   *
-   * @return void
-   */
-  function __construct($path) {
-    $this->set_path($path);
-  }
-
-
-  /**
-   * Sets a new include path for the factory and returns the old one.
-   *
-   * @param string the new path
-   *
-   * @return string the old path
-   */
-  function set_path($path) {
-
-    $old_path = $this->get_path();
-
-    if (substr($path, -1) != '/')
-      $path .= '/';
-
-    $this->path = $path;
-
-    return $old_path;
-  }
-
-
-  /**
-   * Returns the include path of the factory
-   *
-   * @return string the current include path
-   */
-  function get_path() {
-    return $this->path;
-  }
-
-
-  /**
-   * Open a template of the given name using the factory method pattern.
-   * If a string was given, the path of the factory is searched for a matching
-   * template.
-   * If this string starts with a slash or with /\w+:\/\//, the string is
-   * interpreted as an absolute path. Otherwise the path of the factory will be
-   * prepended.
-   * After that the factory searches for a file extension in this string. If
-   * there is none, the directory where the template is supposed to live is
-   * searched for a file starting with the template string and a supported
-   * file extension.
-   * At last the factory instantiates a template object of the matching template
-   * class.
-   *
-   * Examples:
-   *
-   *   $factory->open('/path/to/template')
-   *     does not prepend the factory's path but searches for "template.*" in
-   *     "/path/to"
-   *
-   *   $factory->open('template')
-   *     prepends the factory's path and searches there for "template.*"
-   *
-   *  $factory->open('template.php')
-   *     prepends the factory's path but does not search and instantiates a
-   *     PHPTemplate instead
-   *
-   * This method returns it's parameter, if it is not a string. This
-   * functionality is useful for helper methods like #render_partial
-   *
-   * @throws Flexi_TemplateNotFoundException
-   *
-   * @param string A name of a template.
-   *
-   * @return mixed the factored object
-   *
-   * @throws Flexi_TemplateNotFoundException  if the template could not be found
-   */
-  function open($template) {
-
-    # if it is not a string, this method behaves like identity
-    if (!is_string($template)) {
-      return $template;
-    }
-
-    # get file
-    $file = $this->get_template_file($template);
-
-    # retrieve handler
-    list($class, $options) = $this->get_template_handler($file);
-
-    return new $class($file, $this, $options);
-  }
-
-
-  /**
-   * This method returns the absolute filename of the template
-   *
-   * @param  string     a template string
-   *
-   * @return string     an absolute filename
-   *
-   * @throws Flexi_TemplateNotFoundException  if the template could not be found
-   */
-  function get_template_file($template0) {
-
-    $template = $this->get_absolute_path($template0);
-    $extension = $this->get_extension($template);
-
-    # extension defined, is there a matching template class?
-    if ($extension !== NULL) {
-      if (file_exists($template)) {
-        return $template;
-      }
-    }
-
-    # no extension defined, find it
-    else {
-      $file = $this->find_template($template);
-      if ($file !== NULL) {
-        return $file;
-      }
-    }
-
-    # falling through to throw exception
-    throw new Flexi_TemplateNotFoundException(
-      sprintf('Missing template "%s" in "%s".', $template0, $this->path));
-  }
-
-
-  /**
-   * Matches an extension to a template handler.
-   *
-   * @param  string     the template
-   *
-   * @return array      an array containing the class name and an array of
-   *                    options of the matched extension;
-   *                    or NULL if the extension did not match
-   */
-  function get_template_handler($template) {
-    $extension = $this->get_extension($template);
-    return isset($this->handlers[$extension])
-           ? $this->handlers[$extension]
-           : NULL;
-  }
-
-
-  /**
-   * Registers a handler for templates with a matching extension.
-   *
-   * @param string  the extension of the templates to handle
-   * @param string  the name of the already loaded class
-   * @param array   optional; an array of options which is used
-   *                when constructing a new instance
-   */
-  function add_handler($extension, $class, $options = array())
-  {
-      $this->handlers[$extension] = array($class, $options);
-  }
-
-
-  /**
-   * Returns the absolute path to the template. If the given argument starts
-   * with a slash or with a protocoll, this method just returns its arguments.
-   *
-   * @param  string     an incomplete template name
-   *
-   * @return string     an absolute path to the incomplete template name
-   */
-  function get_absolute_path($template) {
-    return preg_match('#^(/|\w+://)#', $template)
-           ? $template
-           : $this->get_path() . $template;
-  }
-
-
-  /**
-   * Find template given w/o extension.
-   *
-   * @param  string     the template's filename w/o extension
-   *
-   * @return mixed      NULL if there no such file could be found, a string
-   *                    containing the complete file name otherwise
-   */
-  function find_template($template) {
-    foreach ($this->handlers as $ext => $handler) {
-      $file = "$template.$ext";
-      if (file_exists($file)) {
-        return $file;
-      }
-    }
-    return NULL;
-  }
-
-
-  /**
-   * Returns the file extension if there is one.
-   *
-   * @param  string     an possibly incomplete template file name
-   *
-   * @return mixed      a string containing the file extension if there is one,
-   *                    NULL otherwise
-   */
-  function get_extension($file) {
-    $matches = array();
-    $matched = preg_match('/\.([^\/.]+)$/', $file, $matches);
-    return $matched ? $matches[1] : NULL;
-  }
-
-
-  /**
-   * Class method to parse, render and return the presentation of a
-   * template.
-   *
-   * @param string A name of a template.
-   * @param array  An associative array of attributes and their associated
-   *               values.
-   * @param string A name of a layout template.
-   *
-   * @return string A string representing the rendered presentation.
-   */
-  function render($name, $attributes = null, $layout = null) {
-    return $this->open($name)->render($attributes, $layout);
-  }
-}
diff --git a/vendor/flexi/test/all_tests.php b/vendor/flexi/test/all_tests.php
deleted file mode 100644
index 939413a..0000000
--- a/vendor/flexi/test/all_tests.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# load required files
-require_once 'simpletest/unit_tester.php';
-require_once 'simpletest/reporter.php';
-require_once 'simpletest/collector.php';
-
-
-# collect all tests
-$all = new TestSuite('All tests');
-
-$all->collect(dirname(__FILE__).'/lib', new SimplePatternCollector('/test.php$/'));
-$all->collect(dirname(__FILE__).'/lib/helper', new SimplePatternCollector('/test.php$/'));
-
-# use text reporter if cli
-if (sizeof($_SERVER['argv']))
-  $all->run(new TextReporter());
-
-# use html reporter if cgi
-else
-  $all->run(new HtmlReporter());
diff --git a/vendor/flexi/test/coverage.php b/vendor/flexi/test/coverage.php
deleted file mode 100644
index cbf694a..0000000
--- a/vendor/flexi/test/coverage.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-# Copyright (c)  2007 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-$PHPCOVERAGE_HOME = '/usr/share/php/spikephpcoverage/src/';
-$PHPCOVERAGE_REPORT_DIR = '/tmp/report/';
-$PHPCOVERAGE_APPBASE_PATH = '/tmp/report/';
-
-require_once $PHPCOVERAGE_HOME . 'phpcoverage.inc.php';
-require_once $PHPCOVERAGE_HOME . 'CoverageRecorder.php';
-require_once $PHPCOVERAGE_HOME . 'reporter/HtmlCoverageReporter.php';
-
-$reporter = new HtmlCoverageReporter('Code Coverage Report', '', $PHPCOVERAGE_REPORT_DIR);
-
-$includePaths = array('../lib');
-$excludePaths = array();
-$cov = new CoverageRecorder($includePaths, $excludePaths, $reporter);
-
-$cov->startInstrumentation();
-include 'all_tests.php';
-$cov->stopInstrumentation();
-
-$cov->generateReport();
-$reporter->printTextSummary();
diff --git a/vendor/flexi/test/flexi_tests.php b/vendor/flexi/test/flexi_tests.php
deleted file mode 100644
index d012ffc..0000000
--- a/vendor/flexi/test/flexi_tests.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once 'simpletest/unit_tester.php';
-require_once 'simpletest/mock_objects.php';
-require_once 'simpletest/autorun.php';
-
-require_once 'varstream.php';
-
-/**
- * Setting up tests for flexi.
- *
- * @package     flexi
- * @subpackage  test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class Flexi_Tests {
-
-  /**
-   * Calling this function initializes everything necessary to test flexi.
-   *
-   * @return void
-   */
-  function setup() {
-    static $once;
-
-    if (!$once) {
-
-      # define TEST_DIR
-      define('TEST_DIR', dirname(__FILE__));
-
-      # load required files
-      require_once TEST_DIR . '/../lib/flexi.php';
-
-      $once = TRUE;
-    }
-  }
-}
diff --git a/vendor/flexi/test/lib/helper/js_helper_test.php b/vendor/flexi/test/lib/helper/js_helper_test.php
deleted file mode 100644
index f7c36ff..0000000
--- a/vendor/flexi/test/lib/helper/js_helper_test.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../../flexi_tests.php';
-Flexi_Tests::setup();
-require_once dirname(__FILE__) . '/../../../lib/helper/js_helper.php';
-
-/**
- * Testcase for JsHelper.
- *
- * @package    flexi
- * @subpackage test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: js_helper_test.php 4194 2006-10-24 14:52:31Z mlunzena $
- */
-
-class JsHelperTestCase extends UnitTestCase {
-
-  function setUp() {
-  }
-
-  function tearDown() {
-  }
-
-
-  function test_link_to_function() {
-    $foo = JsHelper::link_to_function('Greeting', "alert('Hello world!')",
-                                      array('title' => 'hello'));
-    $exp = '<a title="hello" href="#" onclick="alert(\'Hello world!\'); '.
-           'return false;">Greeting</a>';
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_button_to_function() {
-    $foo = JsHelper::button_to_function("Greeting", "alert('Hello world!')");
-    $exp = '<input type="button" value="Greeting" '.
-           'onclick="alert(\'Hello world!\');" />';
-    $this->assertEqual($exp, $foo);
-
-    $foo = JsHelper::button_to_function("Greeting", "alert('Hello world!')",
-                                        array('onclick' => 'alert(\'One\')'));
-    $exp = '<input onclick="alert(\'One\'); alert(\'Hello world!\');" '.
-           'type="button" value="Greeting" />';
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_escape_javascript() {
-    $strings = array(
-    "\r" => '\n',
-    "\n" => '\n',
-    '\\' => '\\\\',
-    '</' => '<\\/',
-    '"'  => '\\"',
-    "'"  => "\\'"
-    );
-    foreach ($strings as $string => $expect) {
-      $this->assertEqual(JsHelper::escape_javascript($string), $expect);
-    }
-  }
-
-  function test_javascript_tag() {
-    $foo = JsHelper::javascript_tag("alert('All is good')");
-    $exp = <<<EXPECTED
-<script type="text/javascript">
-//<![CDATA[
-alert('All is good')
-//]]>
-</script>
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-}
diff --git a/vendor/flexi/test/lib/helper/prototype_helper_test.php b/vendor/flexi/test/lib/helper/prototype_helper_test.php
deleted file mode 100644
index 3307f6a..0000000
--- a/vendor/flexi/test/lib/helper/prototype_helper_test.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../../flexi_tests.php';
-Flexi_Tests::setup();
-require_once dirname(__FILE__) . '/../../../lib/helper/prototype_helper.php';
-
-/**
- * Testcase for JsHelper.
- *
- * @package    flexi
- * @subpackage test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: prototype_helper_test.php 4194 2006-10-24 14:52:31Z mlunzena $
- */
-
-class PrototypeHelperTestCase extends UnitTestCase {
-
-  function setUp() {
-  }
-
-  function tearDown() {
-  }
-
-  function test_link_to_remote() {
-
-    $foo = PrototypeHelper::link_to_remote('Delete this post',
-      array('update' => 'posts',
-            'url' => 'http://destroy?id=1'));
-    $exp = '<a href="#" onclick="new Ajax.Updater(\'posts\', \'http://destroy?id=1\', {asynchronous:true, evalScripts:false}); return false;">Delete this post</a>';
-    $this->assertEqual($exp, $foo);
-
-
-    $foo = PrototypeHelper::link_to_remote('Delete this post',
-      array('update' => array('success' => 'posts',
-                              'failure' => 'error'),
-            'url' => 'http://destroy?id=1'));
-    $exp = '<a href="#" onclick="new Ajax.Updater({success:\'posts\',failure:\'error\'}, \'http://destroy?id=1\', {asynchronous:true, evalScripts:false}); return false;">Delete this post</a>';
-    $this->assertEqual($exp, $foo);
-
-
-    $foo = PrototypeHelper::link_to_remote('Delete this post',
-      array('url' => 'http://destroy?id=1',
-            404 => "alert('Not found...?')",
-            'failure' => "alert('HTTPError!')"));
-    $exp = '<a href="#" onclick="new Ajax.Request(\'http://destroy?id=1\', {asynchronous:true, evalScripts:false, on404:function(request, json){alert(\'Not found...?\')}, onFailure:function(request, json){alert(\'HTTPError!\')}}); return false;">Delete this post</a>';
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_periodically_call_remote() {
-    $foo = PrototypeHelper::periodically_call_remote(
-      array('url' => 'http://clock',
-            'frequency' => 2,
-            'update' => 'clock'));
-    $exp = <<<EXPECTED
-<script type="text/javascript">
-//<![CDATA[
-new PeriodicalExecuter(function() {new Ajax.Updater('clock', 'http://clock', {asynchronous:true, evalScripts:false})}, 2)
-//]]>
-</script>
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_form_remote_tag() {
-
-    $foo = PrototypeHelper::form_remote_tag(array(
-      'url'      => 'http://tag_add',
-      'update'   => 'question_tags',
-      'loading'  => "Element.show('indicator'); tag.value = '';",
-      'complete' => "Element.hide('indicator');"));
-    $exp = <<<EXPECTED
-<form onsubmit="new Ajax.Updater('question_tags', 'http://tag_add', {asynchronous:true, evalScripts:false, onComplete:function(request, json){Element.hide('indicator');}, onLoading:function(request, json){Element.show('indicator'); tag.value = '';}, parameters:Form.serialize(this)}); return false;" action="http://tag_add" method="post">
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_submit_to_remote() {
-    $foo = PrototypeHelper::submit_to_remote('name', 'value',
-      array(
-        'url'      => 'http://tag_add',
-        'update'   => 'question_tags',
-        'loading'  => "Element.show('indicator'); tag.value = '';",
-        'complete' => "Element.hide('indicator');"));
-    $exp = <<<EXPECTED
-<input type="button" onclick="new Ajax.Updater('question_tags', 'http://tag_add', {asynchronous:true, evalScripts:false, onComplete:function(request, json){Element.hide('indicator');}, onLoading:function(request, json){Element.show('indicator'); tag.value = '';}, parameters:Form.serialize(this.form)}); return false;" name="name" value="value" />
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_update_element_function() {
-    $foo = PrototypeHelper::update_element_function('element_id',
-      array('position' => 'bottom', 'content' => "<p>New product!</p>"));
-    $exp = "new Insertion.Bottom('element_id','<p>New product!<\/p>');\n";
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_evaluate_remote_response() {
-    $foo = PrototypeHelper::evaluate_remote_response();
-    $exp = 'eval(request.responseText)';
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_remote_function() {
-    $foo = PrototypeHelper::remote_function(array('update' => 'options',
-                                                  'url' => 'http://update'));
-    $exp = <<<EXPECTED
-new Ajax.Updater('options', 'http://update', {asynchronous:true, evalScripts:false})
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_observe_field() {
-    $foo = PrototypeHelper::observe_field('element_id',
-      array('url'       => 'http://update',
-            'frequency' => 0,
-            'update'    => 'update_id'));
-    $exp = <<<EXPECTED
-<script type="text/javascript">
-//<![CDATA[
-new Form.Element.EventObserver("element_id", 0, function(element, value) {new Ajax.Updater('update_id', 'http://update', {asynchronous:true, evalScripts:false, parameters:value})});
-//]]>
-</script>
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_observe_form() {
-    $foo = PrototypeHelper::observe_form('form_id',
-      array('url'       => 'http://update',
-            'frequency' => 0,
-            'update'    => 'update_id'));
-    $exp = <<<EXPECTED
-<script type="text/javascript">
-//<![CDATA[
-new Form.EventObserver("form_id", 0, function(element, value) {new Ajax.Updater('update_id', 'http://update', {asynchronous:true, evalScripts:false, parameters:value})});
-//]]>
-</script>
-EXPECTED;
-    $this->assertEqual($exp, $foo);
-  }
-
-  function test_jsgen() {
-    $page = new Flexi_JavascriptGenerator();
-    $page->insert_html('bottom', 'list', '<li>Last item</li>');
-    $page->replace_html('person-45', 'Deleted.');
-    $page->replace('person-45', 'Deleted.');
-    $page->remove('id-1', 'id-2', 'id-3');
-    $page->show('id-1', 'id-2', 'id-3');
-    $page->hide('id-1', 'id-2', 'id-3');
-    $page->toggle('id-1', 'id-2', 'id-3');
-    $page->alert('Some "Message"!\/');
-    $page->redirect_to('http://www.google.com');
-    $page->delay('alert("Hallo Welt")', 23);
-    $page->visual_effect('highlight', 'id-42');
-    # TODO (mlunzena) no asserts
-    # var_dump($page->to_s());
-  }
-}
diff --git a/vendor/flexi/test/lib/helper/scriptaculous_helper_test.php b/vendor/flexi/test/lib/helper/scriptaculous_helper_test.php
deleted file mode 100644
index 30531f9..0000000
--- a/vendor/flexi/test/lib/helper/scriptaculous_helper_test.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../../flexi_tests.php';
-Flexi_Tests::setup();
-require_once dirname(__FILE__) . '/../../../lib/helper/scriptaculous_helper.php';
-
-/**
- * Testcase for ScriptaculousHelper.
- *
- * @package    flexi
- * @subpackage test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class ScriptaculousHelperTestCase extends UnitTestCase {
-
-  function setUp() {
-  }
-
-  function tearDown() {
-  }
-
-  function test_visual_effect() {
-    $result = ScriptaculousHelper::visual_effect('toggle_blind', 'id');
-    $expected = 'new Effect.toggle(\'id\', \'blind\', {})';
-    $this->assertEqual($result, $expected);
-  }
-
-  function test_sortable_element() {
-    $result = ScriptaculousHelper::sortable_element('list', array(
-      'url'         => '/',
-      'containment' => array('left', 'right'),
-      'only'        => 'middle',
-    ));
-    $expected = <<<SCRIPT
-<script type="text/javascript">
-//<![CDATA[
-Sortable.create('list', {containment:['left','right'], onUpdate:function(){new Ajax.Request('/', {asynchronous:true, evalScripts:false, parameters:Sortable.serialize('list')})}, only:'middle'})
-//]]>
-</script>
-SCRIPT;
-    $this->assertEqual($result, $expected);
-  }
-}
diff --git a/vendor/flexi/test/lib/helper/tag_helper_test.php b/vendor/flexi/test/lib/helper/tag_helper_test.php
deleted file mode 100644
index bd872f7..0000000
--- a/vendor/flexi/test/lib/helper/tag_helper_test.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../../flexi_tests.php';
-Flexi_Tests::setup();
-require_once dirname(__FILE__) . '/../../../lib/helper/tag_helper.php';
-
-/**
- * Testcase for TagHelper.
- *
- * @package    flexi
- * @subpackage test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: tag_helper_test.php 4194 2006-10-24 14:52:31Z mlunzena $
- */
-
-class TagHelperTestCase extends UnitTestCase {
-
-  function setUp() {
-  }
-
-  function tearDown() {
-  }
-
-  function test_tag() {
-    $foo = TagHelper::tag('img', array('src' => 'test.gif'));
-    $this->assertEqual('<img src="test.gif" />', $foo);
-  }
-
-  function test_content_tag() {
-    $foo = TagHelper::content_tag('a', '#', array('href' => '#'));
-    $this->assertEqual('<a href="#">#</a>', $foo);
-  }
-
-  function test_cdata_section() {
-    $foo = TagHelper::cdata_section('foo');
-    $this->assertEqual('<![CDATA[foo]]>', $foo);
-  }
-
-  function test_string_to_array() {
-    $array = TagHelper::string_to_array('id="anId" class=\'aClass\'');
-    $this->assertEqual(array('id' => 'anId', 'class' => 'aClass'), $array);
-  }
-}
diff --git a/vendor/flexi/test/lib/helper/text_helper_test.php b/vendor/flexi/test/lib/helper/text_helper_test.php
deleted file mode 100644
index 1ac7834..0000000
--- a/vendor/flexi/test/lib/helper/text_helper_test.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../../flexi_tests.php';
-Flexi_Tests::setup();
-require_once dirname(__FILE__) . '/../../../lib/helper/text_helper.php';
-
-/**
- * Testcase for TextHelper.
- *
- * @package    flexi
- * @subpackage test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id$
- */
-
-class TextHelperTestCase extends UnitTestCase {
-
-  function setUp() {
-  }
-
-  function tearDown() {
-    TextHelper::reset_cycle();
-  }
-
-  function test_camelize() {
-    $foo = TextHelper::camelize('foo_bar_baz/FOO is great');
-    $this->assertEqual('FooBarBazFOOIsGreat', $foo);
-  }
-
-  function test_simple_cycle() {
-    $this->assertEqual('odd',  TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('even', TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('odd',  TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('even', TextHelper::cycle('odd', 'even'));
-  }
-
-  function test_reset_cycle() {
-    $this->assertEqual('odd',  TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('even', TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('odd',  TextHelper::cycle('odd', 'even'));
-    TextHelper::reset_cycle();
-    $this->assertEqual('odd',  TextHelper::cycle('odd', 'even'));
-  }
-
-  function test_double_cycle_should_reset_each_time() {
-    $this->assertEqual('odd', TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('red', TextHelper::cycle('red', 'black'));
-    $this->assertEqual('odd', TextHelper::cycle('odd', 'even'));
-    $this->assertEqual('red', TextHelper::cycle('red', 'black'));
-  }
-
-  function test_named_cycles() {
-    $this->assertEqual('odd',   TextHelper::cycle(array('odd', 'even', 'name' => '1st')));
-    $this->assertEqual('red',   TextHelper::cycle('red', 'black'));
-    $this->assertEqual('even',  TextHelper::cycle(array('odd', 'even', 'name' => '1st')));
-    $this->assertEqual('black', TextHelper::cycle('red', 'black'));
-  }
-}
diff --git a/vendor/flexi/test/lib/js_template_test.php b/vendor/flexi/test/lib/js_template_test.php
deleted file mode 100644
index 77f577b..0000000
--- a/vendor/flexi/test/lib/js_template_test.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../flexi_tests.php';
-Flexi_Tests::setup();
-
-class JsTemplateTestCase extends UnitTestCase {
-
-  var $factory;
-
-  function setUp() {
-    $this->setUpFS();
-    $this->factory = new Flexi_TemplateFactory('var://templates/');
-  }
-
-  function tearDown() {
-    unset($this->factory);
-
-    stream_wrapper_unregister("var");
-  }
-
-  function setUpFS() {
-    ArrayFileStream::set_filesystem(array(
-      'templates' => array(
-        'foo.pjs' => '',
-        'layout.pjs' => ''
-      )));
-    stream_wrapper_register("var", "ArrayFileStream") or die("Failed to register protocol");
-  }
-
-
-  function test_something() {
-    $template = $this->factory->open('foo');
-    $template->render(array('whom' => 'world'), 'layout');
-  }
-}
-
diff --git a/vendor/flexi/test/lib/php_template_test.php b/vendor/flexi/test/lib/php_template_test.php
deleted file mode 100644
index 1c6d85c..0000000
--- a/vendor/flexi/test/lib/php_template_test.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../flexi_tests.php';
-Flexi_Tests::setup();
-
-class PhpTemplateTestCase extends UnitTestCase {
-
-  var $factory;
-
-
-  function setUp() {
-    $this->setUpFS();
-    $this->factory = new Flexi_TemplateFactory('var://templates/');
-  }
-
-
-  function tearDown() {
-    unset($this->factory);
-
-    stream_wrapper_unregister("var");
-  }
-
-  function setUpFS() {
-    ArrayFileStream::set_filesystem(array(
-      'templates' => array(
-
-        'foo_using_partial.php' =>
-          'Hello, <?= $this->render_partial("foos_partial") ?>!',
-
-        'foos_partial.php' =>
-          '<h1><?= $whom ?> at <?= $when ?></h1>',
-
-        'foo_with_partial_collection.php' =>
-          '[<?= $this->render_partial_collection("item", $items, "spacer") ?>]',
-
-        'item.php' =>
-          '"<?= $item ?>"',
-
-        'spacer.php' =>
-          ', ',
-
-        'attributes.php' =>
-          '<? foreach (get_defined_vars() as $name => $value) : ?>' .
-          '<?= $name ?><?= $value ?>'.
-          '<? endforeach ?>',
-
-        'foo.php' =>
-          'Hello, <?= $whom ?>!',
-
-        'layout.php' =>
-          '[<?= $content_for_layout ?>]',
-      )));
-    stream_wrapper_register("var", "ArrayFileStream") or die("Failed to register protocol");
-  }
-
-  function test_render_partial() {
-    $template = $this->factory->open('foo_using_partial');
-    $template->set_attribute('whom', 'bar');
-    $output = $template->render(array('when' => 'now'));
-    $spec = "Hello, <h1>bar at now</h1>!";
-    $this->assertEqual($output, $spec);
-  }
-
-
-  function test_render_partial_collection() {
-    $template = $this->factory->open('foo_with_partial_collection');
-    $result = $template->render_partial_collection('item',
-                                                   range(1, 3),
-                                                   'spacer');
-    $this->assertEqual('"1", "2", "3"', $result);
-  }
-
-
-   function test_should_override_attributes_with_those_passed_to_render() {
-
-     $template = $this->factory->open('attributes');
-     $template->set_attribute('foo',  'baz');
-
-     $template->render(array('foo' => 'bar'));
-
-     $bar = $template->get_attribute('foo');
-     $this->assertEqual($bar, 'bar');
-
-     $out = $template->render();
-
-     $bar = $template->get_attribute('foo');
-     $this->assertEqual($bar, 'bar');
-   }
-
-   function test_render_without_layout() {
-     $foo = $this->factory->open('foo');
-     $foo->set_attribute('whom', 'bar');
-     $out = $foo->render();
-     $this->assertEqual('Hello, bar!', $out);
-   }
-
-   function test_render_with_layout() {
-     $foo = $this->factory->open('foo');
-     $foo->set_attribute('whom', 'bar');
-     $foo->set_layout('layout');
-     $out = $foo->render();
-     $this->assertEqual('[Hello, bar!]', $out);
-   }
-
-   function test_render_with_layout_inline() {
-     $out = $this->factory->render('foo', array('whom' => 'bar'), 'layout');
-     $this->assertEqual('[Hello, bar!]', $out);
-   }
-
-   function test_render_with_missing_layout() {
-     $foo = $this->factory->open('foo');
-     $this->expectException("Flexi_TemplateNotFoundException");
-     $foo->set_layout('nosuchlayout');
-   }
-
-   function test_render_with_attributes() {
-     $foo = $this->factory->open('foo');
-     $foo->set_attribute('whom', 'bar');
-     $foo->set_layout('layout');
-     $foo_out = $foo->render();
-
-     $bar = $this->factory->open('foo');
-     $bar_out = $bar->render(array('whom' => 'bar'), 'layout');
-
-     $this->assertEqual($foo_out, $bar_out);
-   }
-}
-
-
-class PhpTemplatePartialBugTestCase extends UnitTestCase {
-  function setUp() {
-    $this->setUpFS();
-    $this->factory = new Flexi_TemplateFactory('var://templates/');
-  }
-
-  function tearDown() {
-    unset($this->factory);
-
-    stream_wrapper_unregister("var");
-  }
-
-  function setUpFS() {
-    ArrayFileStream::set_filesystem(array(
-      'templates' => array(
-        'layout.php' =>
-          '<? $do_not_echo_this = $this->render_partial_collection("partial", range(1, 5));'.
-          'echo $content_for_layout;',
-        'partial.php' =>
-          'partial',
-        'template.php' =>
-          'template',
-      )));
-    stream_wrapper_register("var", "ArrayFileStream") or die("Failed to register protocol");
-  }
-
-  function test_partial_bug() {
-    $template = $this->factory->open('template');
-    $template->set_layout('layout');
-    $result = $template->render();
-    $this->assertEqual($result, "template");
-  }
-}
diff --git a/vendor/flexi/test/lib/template_factory_test.php b/vendor/flexi/test/lib/template_factory_test.php
deleted file mode 100644
index c2166da..0000000
--- a/vendor/flexi/test/lib/template_factory_test.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../flexi_tests.php';
-Flexi_Tests::setup();
-
-/**
- * Testcase for TemplateFactory.php.
- *
- * @package    flexi
- * @subpackage test
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: template_test.php 4194 2006-10-24 14:52:31Z mlunzena $
- */
-
-class TemplateFactoryTestCase extends UnitTestCase {
-
-  var $factory;
-
-  function setUp() {
-    $this->setUpFS();
-    $this->factory = new Flexi_TemplateFactory('var://templates');
-  }
-
-  function tearDown() {
-    unset($this->factory);
-    stream_wrapper_unregister("var");
-  }
-
-  function setUpFS() {
-    ArrayFileStream::set_filesystem(array(
-      'templates' => array(
-        'foo.php'     => 'some content',
-        'baz.unknown' => 'some content',
-        'multiplebasenames' => array(
-          'foo.txt' => 'there is no matching template class',
-          'foo.php' => 'some content',
-          'bar.txt' => 'there is no matching template class'
-        )
-      )
-    ));
-    stream_wrapper_register("var", "ArrayFileStream")
-      or die("Failed to register protocol");
-  }
-
-  function test_should_create_factory() {
-    $factory = new Flexi_TemplateFactory('.');
-    $this->assertNotNull($factory);
-  }
-
-  function test_should_create_factory_using_path() {
-    $path = 'var://';
-    $factory = new Flexi_TemplateFactory($path);
-    $this->assertNotNull($factory);
-  }
-
-  function test_should_open_template_using_relative_path() {
-    $foo = $this->factory->open('foo');
-    $this->assertNotNull($foo);
-  }
-
-  function test_should_open_template_using_absolute_path() {
-    $foo = $this->factory->open('var://templates/foo');
-    $this->assertNotNull($foo);
-  }
-
-  function test_should_throw_an_exception_opening_a_missing_template_without_file_extension() {
-    $this->expectException('Flexi_TemplateNotFoundException');
-    $bar = $this->factory->open('bar');
-  }
-
-  function test_should_throw_an_exception_opening_a_missing_template_with_file_extension() {
-    $this->expectException('Flexi_TemplateNotFoundException');
-    $bar = $this->factory->open('bar.php');
-  }
-
-  function test_should_open_template_using_extension() {
-    $foo = $this->factory->open('foo.php');
-    $this->assertIsA($foo, 'Flexi_PhpTemplate');
-  }
-
-  function test_should_throw_an_exception_when_opening_a_template_with_unknown_extension() {
-    $this->expectException('Flexi_TemplateNotFoundException');
-    $baz = $this->factory->open('baz');
-  }
-
-  function test_should_throw_an_exception_opening_a_template_in_a_non_existing_directory() {
-    $this->expectException('Flexi_TemplateNotFoundException');
-    $this->factory->open('doesnotexist/foo');
-  }
-
-  function test_should_search_for_a_supported_template() {
-    $template = $this->factory->open('multiplebasenames/foo');
-    $this->assertIsA($template, 'Flexi_PhpTemplate');
-  }
-}
diff --git a/vendor/flexi/test/lib/template_test.php b/vendor/flexi/test/lib/template_test.php
deleted file mode 100644
index e0f2e0b..0000000
--- a/vendor/flexi/test/lib/template_test.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-# Copyright (c)  2008 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_once dirname(__FILE__) . '/../flexi_tests.php';
-Flexi_Tests::setup();
-
-Mock::generate('Flexi_TemplateFactory');
-Mock::generatePartial('Flexi_Template', 'MockTemplate', array('_render'));
-
-class AnEmptyTemplate extends UnitTestCase {
-
-
-  var $factory;
-
-
-  function setUp() {
-    $this->factory = new MockFlexi_TemplateFactory(TEST_DIR . '/templates/template_tests');
-    $template = new MockTemplate();
-    $template->__construct('foo', $this->factory);
-    $this->factory->setReturnValue('open', $template);
-  }
-
-
-  function tearDown() {
-    unset($this->factory);
-  }
-
-
-  function test_should_have_no_attributes() {
-    $template = $this->factory->open('');
-    $this->assertEqual(0, sizeof($template->get_attributes()));
-  }
-
-
-  function test_should_not_be_empty_after_setting_an_attribute() {
-    $template = $this->factory->open('');
-    $template->set_attribute('foo', 'bar');
-    $this->assertNotEqual(0, sizeof($template->get_attributes()));
-  }
-
-
-  function test_should_be_empty_after_clear() {
-
-    $template = $this->factory->open('foo');
-
-    $this->assertEqual(0, sizeof($template->get_attributes()));
-
-    $template->clear_attributes();
-    $this->assertEqual(0, sizeof($template->get_attributes()));
-  }
-}
-
-
-class ATemplate extends UnitTestCase {
-
-
-  var $factory;
-
-
-  function setUp() {
-    $this->factory = new MockFlexi_TemplateFactory(TEST_DIR . '/templates/template_tests');
-    $template = new MockTemplate();
-    $template->__construct('foo', $this->factory);
-    $this->factory->setReturnValue('open', $template);
-  }
-
-
-  function tearDown() {
-    unset($this->factory);
-  }
-
-
-  function test_should_return_an_previously_set_attribute() {
-    $template = $this->factory->open('foo');
-    $template->set_attribute('whom', 'bar');
-    $this->assertEqual('bar', $template->get_attribute('whom'));
-  }
-
-
-  function test_should_return_previously_set_attributes() {
-
-    $template = $this->factory->open('foo');
-    $template->set_attributes(array('whom' => 'bar', 'foo' => 'baz'));
-
-    $attributes = $template->get_attributes();
-    $this->assertIsA($attributes, 'array');
-    $this->assertEqual(2, sizeof($attributes));
-    $this->assertEqual('bar', $attributes['whom']);
-    $this->assertEqual('baz', $attributes['foo']);
-  }
-
-
-  function test_should_merge_attributes_with_set_attributes() {
-
-    $template = $this->factory->open('foo');
-    $template->set_attributes(array('a' => 1, 'b' => 2));
-
-    $this->assertEqual(2, sizeof($template->get_attributes()));
-    $this->assertEqual(1, $template->get_attribute('a'));
-    $this->assertEqual(2, $template->get_attribute('b'));
-
-    $template->set_attributes(array('b' => 8, 'c' => 9));
-
-    $this->assertEqual(3, sizeof($template->get_attributes()));
-    $this->assertEqual(1, $template->get_attribute('a'));
-    $this->assertEqual(8, $template->get_attribute('b'));
-    $this->assertEqual(9, $template->get_attribute('c'));
-  }
-
-
-  function test_should_be_empty_after_clear() {
-
-    $template = $this->factory->open('foo');
-
-    $template->set_attributes(array('a' => 1, 'b' => 2));
-    $this->assertNotEqual(0, sizeof($template->get_attributes()));
-
-    $template->clear_attributes();
-    $this->assertEqual(0, sizeof($template->get_attributes()));
-  }
-}
-
-
-
-class MagicMethodsTemplate extends UnitTestCase {
-
-
-  var $factory;
-
-
-  function setUp() {
-    $this->factory = new MockFlexi_TemplateFactory(TEST_DIR . '/templates/template_tests');
-    $this->template = new MockTemplate();
-    $this->template->__construct('foo', $this->factory);
-  }
-
-
-  function tearDown() {
-    unset($this->factory);
-    unset($this->template);
-  }
-
-
-  function test_should_set_an_attribute_using_the_magic_methods() {
-    $this->template->foo = 'bar';
-    $this->assertEqual('bar', $this->template->get_attribute('foo'));
-  }
-
-
-  function test_should_not_set_a_protected_member_field_as_an_attribute() {
-    $this->template->_layout = 'bar';
-    $this->assertNull($this->template->get_attribute('_layout'));
-    $this->assertEqual('bar', $this->template->_layout);
-  }
-
-  function test_should_overwrite_an_attribute() {
-    $this->template->set_attribute('foo', 'bar');
-    $this->template->foo = 'baz';
-    $this->assertEqual('baz', $this->template->get_attribute('foo'));
-  }
-
-  function test_should_return_an_existing_attribute_using_the_magic_methods() {
-    $this->template->set_attribute('foo', 'bar');
-    $this->assertEqual('bar', $this->template->foo);
-  }
-
-
-  function test_should_return_null_for_a_non_existing_attribute_using_the_magic_methods() {
-    $this->assertNull($this->template->foo);
-  }
-
-
-  function test_should_unset_an_attribute_using_the_magic_methods() {
-    $this->template->foo = 'bar';
-    unset($this->template->foo);
-    $this->assertNull($this->template->foo);
-  }
-
-
-  function test_should_return_null_on_unsetting_a_non_attribute() {
-    unset($this->template->foo);
-    $this->assertNull($this->template->foo);
-  }
-
-
-  function test_should_return_true_on_isset_for_an_attribute() {
-    $this->template->foo = 'bar';
-    $this->assertTrue(isset($this->template->foo));
-  }
-
-
-  function test_should_return_false_on_isset_for_a_non_existing_attribute() {
-    $this->assertFalse(isset($this->template->foo));
-  }
-}
-
diff --git a/vendor/flexi/test/templates/factory_tests/baz.unknown_extension b/vendor/flexi/test/templates/factory_tests/baz.unknown_extension
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/flexi/test/templates/factory_tests/foo.php b/vendor/flexi/test/templates/factory_tests/foo.php
deleted file mode 100644
index 0150355..0000000
--- a/vendor/flexi/test/templates/factory_tests/foo.php
+++ /dev/null
@@ -1 +0,0 @@
-Hallo, <?= $whom ?>!
\ No newline at end of file
diff --git a/vendor/flexi/test/templates/layout_with_partials/layout.php b/vendor/flexi/test/templates/layout_with_partials/layout.php
deleted file mode 100644
index a037f25..0000000
--- a/vendor/flexi/test/templates/layout_with_partials/layout.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?
-$do_not_echo_this = $this->render_partial_collection('partial', range(1, 5));
-echo $content_for_layout ?>
diff --git a/vendor/flexi/test/templates/layout_with_partials/partial.php b/vendor/flexi/test/templates/layout_with_partials/partial.php
deleted file mode 100644
index b648ac9..0000000
--- a/vendor/flexi/test/templates/layout_with_partials/partial.php
+++ /dev/null
@@ -1 +0,0 @@
-partial
diff --git a/vendor/flexi/test/templates/layout_with_partials/template.php b/vendor/flexi/test/templates/layout_with_partials/template.php
deleted file mode 100644
index 3236cba..0000000
--- a/vendor/flexi/test/templates/layout_with_partials/template.php
+++ /dev/null
@@ -1 +0,0 @@
-template
diff --git a/vendor/flexi/test/templates/template_tests/attributes.php b/vendor/flexi/test/templates/template_tests/attributes.php
deleted file mode 100644
index 8ee269a..0000000
--- a/vendor/flexi/test/templates/template_tests/attributes.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<? foreach (get_defined_vars() as $name => $value) : ?>
-<?= $name ?><?= $value ?>
-<? endforeach ?>
diff --git a/vendor/flexi/test/templates/template_tests/foo.php b/vendor/flexi/test/templates/template_tests/foo.php
deleted file mode 100644
index 0150355..0000000
--- a/vendor/flexi/test/templates/template_tests/foo.php
+++ /dev/null
@@ -1 +0,0 @@
-Hallo, <?= $whom ?>!
\ No newline at end of file
diff --git a/vendor/flexi/test/templates/template_tests/foo_using_partial.php b/vendor/flexi/test/templates/template_tests/foo_using_partial.php
deleted file mode 100644
index 813a0b6..0000000
--- a/vendor/flexi/test/templates/template_tests/foo_using_partial.php
+++ /dev/null
@@ -1 +0,0 @@
-Hallo, <?= $this->render_partial('foos_partial') ?>!
diff --git a/vendor/flexi/test/templates/template_tests/foo_with_partial_collection.php b/vendor/flexi/test/templates/template_tests/foo_with_partial_collection.php
deleted file mode 100644
index 3deeeed..0000000
--- a/vendor/flexi/test/templates/template_tests/foo_with_partial_collection.php
+++ /dev/null
@@ -1 +0,0 @@
-[<?= $this->render_partial_collection('item', $items, 'spacer') ?>]
diff --git a/vendor/flexi/test/templates/template_tests/foos_partial.php b/vendor/flexi/test/templates/template_tests/foos_partial.php
deleted file mode 100644
index 8746c07..0000000
--- a/vendor/flexi/test/templates/template_tests/foos_partial.php
+++ /dev/null
@@ -1 +0,0 @@
-<h1><?= $whom ?> at <?= $when ?></h1>
diff --git a/vendor/flexi/test/templates/template_tests/item.php b/vendor/flexi/test/templates/template_tests/item.php
deleted file mode 100644
index 6cf5418..0000000
--- a/vendor/flexi/test/templates/template_tests/item.php
+++ /dev/null
@@ -1 +0,0 @@
-"<?= $item ?>"
diff --git a/vendor/flexi/test/templates/template_tests/layouts/layout.php b/vendor/flexi/test/templates/template_tests/layouts/layout.php
deleted file mode 100644
index 860be85..0000000
--- a/vendor/flexi/test/templates/template_tests/layouts/layout.php
+++ /dev/null
@@ -1 +0,0 @@
-[<?=$content_for_layout?>]
\ No newline at end of file
diff --git a/vendor/flexi/test/templates/template_tests/spacer.php b/vendor/flexi/test/templates/template_tests/spacer.php
deleted file mode 100644
index 41622b4..0000000
--- a/vendor/flexi/test/templates/template_tests/spacer.php
+++ /dev/null
@@ -1 +0,0 @@
-,
\ No newline at end of file
diff --git a/vendor/flexi/test/varstream.php b/vendor/flexi/test/varstream.php
deleted file mode 100644
index 2dd7c68..0000000
--- a/vendor/flexi/test/varstream.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-class ArrayFileStream {
-
-  private $open_file, $position;
-
-  private static $fs;
-
-  static function set_filesystem(array $fs) {
-    ArrayFileStream::$fs = $fs;
-  }
-
-  private static function &get_element($path) {
-    $result =& ArrayFileStream::$fs;
-    foreach (preg_split('/\//', $path, -1, PREG_SPLIT_NO_EMPTY) as $element) {
-      if (!isset($result[$element])) {
-        $null = NULL;
-        return $null;
-      }
-      $result =& $result[$element];
-    }
-    return $result;
-  }
-
-  private static function &get_file($path) {
-    $url = parse_url($path);
-    $file =& self::get_element($url['host'] . $url['path']);
-
-    if (is_null($file)) {
-      throw new Exception("file not found.");
-    }
-    return $file;
-  }
-
-  function stream_close() {
-
-    # nothing to do
-  }
-
-  function stream_flush() {
-
-    # nothing to do
-  }
-
-  function stream_open($path, $mode, $options, $opened_path) {
-
-    try {
-      $this->open_file =& self::get_file($path);
-      $this->position = 0;
-      return true;
-    } catch (Exception $e) {
-      return false;
-    }
-  }
-
-  function stream_read($count) {
-
-    $ret = substr($this->open_file, $this->position, $count);
-    $this->position += strlen($ret);
-    return $ret;
-  }
-
-  function stream_write($data) {
-
-    $left  = substr($this->open_file, 0, $this->position);
-    $right = substr($this->open_file, $this->position + strlen($data));
-    $this->open_file = $left . $data . $right;
-    $this->position += strlen($data);
-    return strlen($data);
-  }
-
-  function stream_tell() {
-
-    return $this->position;
-  }
-
-  function stream_eof() {
-
-    return $this->position >= strlen($this->open_file);
-  }
-
-  function stream_seek($offset, $whence) {
-
-    switch ($whence) {
-      case SEEK_SET:
-        if ($offset < strlen($this->open_file) && $offset >= 0) {
-          $this->position = $offset;
-          return true;
-        }
-        else {
-          return false;
-        }
-        break;
-
-      case SEEK_CUR:
-        if ($offset >= 0) {
-          $this->position += $offset;
-          return true;
-        }
-        else {
-          return false;
-        }
-        break;
-
-      case SEEK_END:
-        if (strlen($this->open_file) + $offset >= 0) {
-          $this->position = strlen($this->open_file) + $offset;
-          return true;
-        }
-        else {
-          return false;
-        }
-        break;
-
-      default:
-        return false;
-    }
-  }
-
-  function stream_stat() {
-
-    return array('size' => is_array($this->open_file)
-                           ? sizeof($this->open_file)
-                           : strlen($this->open_file));
-  }
-
-  function unlink($path) {
-
-    $parent =& self::get_file(dirname($path));
-
-    if (is_array($parent) && isset($parent[basename($path)])) {
-      unset($parent[basename($path)]);
-      return TRUE;
-    }
-
-    return FALSE;
-  }
-
-  function rename($path_from, $path_to) {
-
-    throw new Exception('not implemented yet');
-  }
-
-  function mkdir($path, $mode, $options) {
-
-    throw new Exception('not implemented yet');
-  }
-
-  function rmdir($path, $options) {
-
-    throw new Exception('not implemented yet');
-  }
-
-  function dir_opendir($path, $options) {
-    try {
-      $this->open_file =& self::get_file($path);
-    } catch (Exception $e) {
-      return FALSE;
-    }
-
-    return is_array($this->open_file);
-  }
-
-  function url_stat($path, $flags) {
-
-    try {
-      $file =& self::get_file($path);
-    } catch (Exception $e) {
-      return FALSE;
-    }
-
-    $time = time();
-    $keys = array(
-      'dev'     => 0,
-      'ino'     => 0,
-      'mode'    => is_array($file) ? 16832 : 33216, // chmod 700
-      'nlink'   => 0,
-      'uid'     => function_exists('posix_getuid') ? posix_getuid() : 0,
-      'gid'     => function_exists('posix_getgid') ? posix_getgid() : 0,
-      'rdev'    => 0,
-      'size'    => $flags & STREAM_URL_STAT_QUIET
-                   ? @strlen($file) : strlen($file),
-      'atime'   => $time,
-      'mtime'   => $time,
-      'ctime'   => $time,
-      'blksize' => 0,
-      'blocks'  => 0
-    );
-    return array_merge(array_values($keys), $keys);
-  }
-
-  function dir_readdir() {
-    if (!is_array($this->open_file)) {
-      return FALSE;
-    }
-    $result = key($this->open_file);
-    if ($result === NULL) {
-      return FALSE;
-    }
-    next($this->open_file);
-    return $result;
-  }
-
-  function dir_rewinddir() {
-
-    throw new Exception('not implemented yet');
-  }
-
-  function dir_closedir() {
-    reset($this->open_file);
-    unset($this->open_file);
-  }
-}
-
-
-#ArrayFileStream::set_filesystem(
-#  array('tmp' =>
-#    array('a' => 'my content',
-#          'b' => '<? echo "hallo welt!";')));
-
-
-#stream_wrapper_register("var", "ArrayFileStream")
-#    or die("Failed to register protocol");
-
-#$fp = fopen("var://tmp/a", "rw+");
-
-
-#while (!feof($fp)) {
-#    var_dump(fgets($fp));
-#}
-
-#fwrite($fp, "line1\n");
-#fwrite($fp, "line2\n");
-#fwrite($fp, "line3\n");
-
-#rewind($fp);
-
-#var_dump(file_get_contents('var://tmp/a'));
-
-#fclose($fp);
-#unlink('var://tmp/a');
-
-#var_dump(include 'var://tmp/b');
-
diff --git a/vendor/flexi/vendor/mustache.php/LICENSE b/vendor/flexi/vendor/mustache.php/LICENSE
deleted file mode 100644
index 63c95ac..0000000
--- a/vendor/flexi/vendor/mustache.php/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2010 Justin Hileman
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/flexi/vendor/mustache.php/Mustache.php b/vendor/flexi/vendor/mustache.php/Mustache.php
deleted file mode 100644
index 18236aa..0000000
--- a/vendor/flexi/vendor/mustache.php/Mustache.php
+++ /dev/null
@@ -1,931 +0,0 @@
-<?php
-
-/**
- * A Mustache implementation in PHP.
- *
- * {@link http://defunkt.github.com/mustache}
- *
- * Mustache is a framework-agnostic logic-less templating language. It enforces separation of view
- * logic from template files. In fact, it is not even possible to embed logic in the template.
- *
- * This is very, very rad.
- *
- * @author Justin Hileman {@link http://justinhileman.com}
- */
-class Mustache {
-
-	const VERSION      = '1.1.0';
-	const SPEC_VERSION = '1.1.2';
-
-	/**
-	 * Should this Mustache throw exceptions when it finds unexpected tags?
-	 *
-	 * @see self::_throwsException()
-	 */
-	protected $_throwsExceptions = array(
-		MustacheException::UNKNOWN_VARIABLE         => false,
-		MustacheException::UNCLOSED_SECTION         => true,
-		MustacheException::UNEXPECTED_CLOSE_SECTION => true,
-		MustacheException::UNKNOWN_PARTIAL          => false,
-		MustacheException::UNKNOWN_PRAGMA           => true,
-	);
-
-	// Override the escaper function. Defaults to `htmlspecialchars`.
-	protected $_escape;
-
-	// Override charset passed to htmlentities() and htmlspecialchars(). Defaults to UTF-8.
-	protected $_charset = 'UTF-8';
-
-	/**
-	 * Pragmas are macro-like directives that, when invoked, change the behavior or
-	 * syntax of Mustache.
-	 *
-	 * They should be considered extremely experimental. Most likely their implementation
-	 * will change in the future.
-	 */
-
-	/**
-	 * The {{%UNESCAPED}} pragma swaps the meaning of the {{normal}} and {{{unescaped}}}
-	 * Mustache tags. That is, once this pragma is activated the {{normal}} tag will not be
-	 * escaped while the {{{unescaped}}} tag will be escaped.
-	 *
-	 * Pragmas apply only to the current template. Partials, even those included after the
-	 * {{%UNESCAPED}} call, will need their own pragma declaration.
-	 *
-	 * This may be useful in non-HTML Mustache situations.
-	 */
-	const PRAGMA_UNESCAPED    = 'UNESCAPED';
-
-	/**
-	 * Constants used for section and tag RegEx
-	 */
-	const SECTION_TYPES = '\^#\/';
-	const TAG_TYPES = '#\^\/=!<>\\{&';
-
-	protected $_otag = '{{';
-	protected $_ctag = '}}';
-
-	protected $_tagRegEx;
-
-	protected $_template = '';
-	protected $_context  = array();
-	protected $_partials = array();
-	protected $_pragmas  = array();
-
-	protected $_pragmasImplemented = array(
-		self::PRAGMA_UNESCAPED
-	);
-
-	protected $_localPragmas = array();
-
-	/**
-	 * Mustache class constructor.
-	 *
-	 * This method accepts a $template string and a $view object. Optionally, pass an associative
-	 * array of partials as well.
-	 *
-	 * Passing an $options array allows overriding certain Mustache options during instantiation:
-	 *
-	 *     $options = array(
-	 *         // `escape` -- custom escaper callback; must be callable.
-	 *         'escape' => function($text) {
-	 *             return htmlspecialchars($text, ENT_COMPAT, 'UTF-8');
-	 *         },
-	 *
-	 *         // `charset` -- must be supported by `htmlspecialentities()`. defaults to 'UTF-8'
-	 *         'charset' => 'ISO-8859-1',
-	 *
-	 *         // opening and closing delimiters, as an array or a space-separated string
-	 *         'delimiters' => '<% %>',
-	 *
-	 *         // an array of pragmas to enable/disable
-	 *         'pragmas' => array(
-	 *             Mustache::PRAGMA_UNESCAPED => true
-	 *         ),
-	 *
-	 *         // an array of thrown exceptions to enable/disable
-	 *         'throws_exceptions' => array(
-	 *             MustacheException::UNKNOWN_VARIABLE         => false,
-	 *             MustacheException::UNCLOSED_SECTION         => true,
-	 *             MustacheException::UNEXPECTED_CLOSE_SECTION => true,
-	 *             MustacheException::UNKNOWN_PARTIAL          => false,
-	 *             MustacheException::UNKNOWN_PRAGMA           => true,
-	 *         ),
-	 *     );
-	 *
-	 * @access public
-	 * @param string $template (default: null)
-	 * @param mixed $view (default: null)
-	 * @param array $partials (default: null)
-	 * @param array $options (default: array())
-	 * @return void
-	 */
-	public function __construct($template = null, $view = null, $partials = null, array $options = null) {
-		if ($template !== null) $this->_template = $template;
-		if ($partials !== null) $this->_partials = $partials;
-		if ($view !== null)     $this->_context = array($view);
-		if ($options !== null)  $this->_setOptions($options);
-	}
-
-	/**
-	 * Helper function for setting options from constructor args.
-	 *
-	 * @access protected
-	 * @param array $options
-	 * @return void
-	 */
-	protected function _setOptions(array $options) {
-		if (isset($options['escape'])) {
-			if (!is_callable($options['escape'])) {
-				throw new InvalidArgumentException('Mustache constructor "escape" option must be callable');
-			}
-			$this->_escape = $options['escape'];
-		}
-
-		if (isset($options['charset'])) {
-			$this->_charset = $options['charset'];
-		}
-
-		if (isset($options['delimiters'])) {
-			$delims = $options['delimiters'];
-			if (!is_array($delims)) {
-				$delims = array_map('trim', explode(' ', $delims, 2));
-			}
-			$this->_otag = $delims[0];
-			$this->_ctag = $delims[1];
-		}
-
-		if (isset($options['pragmas'])) {
-			foreach ($options['pragmas'] as $pragma_name => $pragma_value) {
-				if (!in_array($pragma_name, $this->_pragmasImplemented, true)) {
-					throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
-				}
-			}
-			$this->_pragmas = $options['pragmas'];
-		}
-
-		if (isset($options['throws_exceptions'])) {
-			foreach ($options['throws_exceptions'] as $exception => $value) {
-				$this->_throwsExceptions[$exception] = $value;
-			}
-		}
-	}
-
-	/**
-	 * Mustache class clone method.
-	 *
-	 * A cloned Mustache instance should have pragmas, delimeters and root context
-	 * reset to default values.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function __clone() {
-		$this->_otag = '{{';
-		$this->_ctag = '}}';
-		$this->_localPragmas = array();
-
-		if ($keys = array_keys($this->_context)) {
-			$last = array_pop($keys);
-			if ($this->_context[$last] instanceof Mustache) {
-				$this->_context[$last] =& $this;
-			}
-		}
-	}
-
-	/**
-	 * Render the given template and view object.
-	 *
-	 * Defaults to the template and view passed to the class constructor unless a new one is provided.
-	 * Optionally, pass an associative array of partials as well.
-	 *
-	 * @access public
-	 * @param string $template (default: null)
-	 * @param mixed $view (default: null)
-	 * @param array $partials (default: null)
-	 * @return string Rendered Mustache template.
-	 */
-	public function render($template = null, $view = null, $partials = null) {
-		if ($template === null) $template = $this->_template;
-		if ($partials !== null) $this->_partials = $partials;
-
-		$otag_orig = $this->_otag;
-		$ctag_orig = $this->_ctag;
-
-		if ($view) {
-			$this->_context = array($view);
-		} else if (empty($this->_context)) {
-			$this->_context = array($this);
-		}
-
-		$template = $this->_renderPragmas($template);
-		$template = $this->_renderTemplate($template);
-
-		$this->_otag = $otag_orig;
-		$this->_ctag = $ctag_orig;
-
-		return $template;
-	}
-
-	/**
-	 * Wrap the render() function for string conversion.
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public function __toString() {
-		// PHP doesn't like exceptions in __toString.
-		// catch any exceptions and convert them to strings.
-		try {
-			$result = $this->render();
-			return $result;
-		} catch (Exception $e) {
-			return "Error rendering mustache: " . $e->getMessage();
-		}
-	}
-
-	/**
-	 * Internal render function, used for recursive calls.
-	 *
-	 * @access protected
-	 * @param string $template
-	 * @return string Rendered Mustache template.
-	 */
-	protected function _renderTemplate($template) {
-		if ($section = $this->_findSection($template)) {
-			list($before, $type, $tag_name, $content, $after) = $section;
-
-			$rendered_before = $this->_renderTags($before);
-
-			$rendered_content = '';
-			$val = $this->_getVariable($tag_name);
-			switch($type) {
-				// inverted section
-				case '^':
-					if (empty($val)) {
-						$rendered_content = $this->_renderTemplate($content);
-					}
-					break;
-
-				// regular section
-				case '#':
-					// higher order sections
-					if ($this->_varIsCallable($val)) {
-						$rendered_content = $this->_renderTemplate(call_user_func($val, $content));
-					} else if ($this->_varIsIterable($val)) {
-						foreach ($val as $local_context) {
-							$this->_pushContext($local_context);
-							$rendered_content .= $this->_renderTemplate($content);
-							$this->_popContext();
-						}
-					} else if ($val) {
-						if (is_array($val) || is_object($val)) {
-							$this->_pushContext($val);
-							$rendered_content = $this->_renderTemplate($content);
-							$this->_popContext();
-						} else {
-							$rendered_content = $this->_renderTemplate($content);
-						}
-					}
-					break;
-			}
-
-			return $rendered_before . $rendered_content . $this->_renderTemplate($after);
-		}
-
-		return $this->_renderTags($template);
-	}
-
-	/**
-	 * Prepare a section RegEx string for the given opening/closing tags.
-	 *
-	 * @access protected
-	 * @param string $otag
-	 * @param string $ctag
-	 * @return string
-	 */
-	protected function _prepareSectionRegEx($otag, $ctag) {
-		return sprintf(
-			'/(?:(?<=\\n)[ \\t]*)?%s(?:(?P<type>[%s])(?P<tag_name>.+?)|=(?P<delims>.*?)=)%s\\n?/s',
-			preg_quote($otag, '/'),
-			self::SECTION_TYPES,
-			preg_quote($ctag, '/')
-		);
-	}
-
-	/**
-	 * Extract the first section from $template.
-	 *
-	 * @access protected
-	 * @param string $template
-	 * @return array $before, $type, $tag_name, $content and $after
-	 */
-	protected function _findSection($template) {
-		$regEx = $this->_prepareSectionRegEx($this->_otag, $this->_ctag);
-
-		$section_start = null;
-		$section_type  = null;
-		$content_start = null;
-
-		$search_offset = 0;
-
-		$section_stack = array();
-		$matches = array();
-		while (preg_match($regEx, $template, $matches, PREG_OFFSET_CAPTURE, $search_offset)) {
-			if (isset($matches['delims'][0])) {
-				list($otag, $ctag) = explode(' ', $matches['delims'][0]);
-				$regEx = $this->_prepareSectionRegEx($otag, $ctag);
-				$search_offset = $matches[0][1] + strlen($matches[0][0]);
-				continue;
-			}
-
-			$match    = $matches[0][0];
-			$offset   = $matches[0][1];
-			$type     = $matches['type'][0];
-			$tag_name = trim($matches['tag_name'][0]);
-
-			$search_offset = $offset + strlen($match);
-
-			switch ($type) {
-				case '^':
-				case '#':
-					if (empty($section_stack)) {
-						$section_start = $offset;
-						$section_type  = $type;
-						$content_start = $search_offset;
-					}
-					array_push($section_stack, $tag_name);
-					break;
-				case '/':
-					if (empty($section_stack) || ($tag_name !== array_pop($section_stack))) {
-						if ($this->_throwsException(MustacheException::UNEXPECTED_CLOSE_SECTION)) {
-							throw new MustacheException('Unexpected close section: ' . $tag_name, MustacheException::UNEXPECTED_CLOSE_SECTION);
-						}
-					}
-
-					if (empty($section_stack)) {
-						// $before, $type, $tag_name, $content, $after
-						return array(
-							substr($template, 0, $section_start),
-							$section_type,
-							$tag_name,
-							substr($template, $content_start, $offset - $content_start),
-							substr($template, $search_offset),
-						);
-					}
-					break;
-			}
-		}
-
-		if (!empty($section_stack)) {
-			if ($this->_throwsException(MustacheException::UNCLOSED_SECTION)) {
-				throw new MustacheException('Unclosed section: ' . $section_stack[0], MustacheException::UNCLOSED_SECTION);
-			}
-		}
-	}
-
-	/**
-	 * Prepare a pragma RegEx for the given opening/closing tags.
-	 *
-	 * @access protected
-	 * @param string $otag
-	 * @param string $ctag
-	 * @return string
-	 */
-	protected function _preparePragmaRegEx($otag, $ctag) {
-		return sprintf(
-			'/%s%%\\s*(?P<pragma_name>[\\w_-]+)(?P<options_string>(?: [\\w]+=[\\w]+)*)\\s*%s\\n?/s',
-			preg_quote($otag, '/'),
-			preg_quote($ctag, '/')
-		);
-	}
-
-	/**
-	 * Initialize pragmas and remove all pragma tags.
-	 *
-	 * @access protected
-	 * @param string $template
-	 * @return string
-	 */
-	protected function _renderPragmas($template) {
-		$this->_localPragmas = $this->_pragmas;
-
-		// no pragmas
-		if (strpos($template, $this->_otag . '%') === false) {
-			return $template;
-		}
-
-		$regEx = $this->_preparePragmaRegEx($this->_otag, $this->_ctag);
-		return preg_replace_callback($regEx, array($this, '_renderPragma'), $template);
-	}
-
-	/**
-	 * A preg_replace helper to remove {{%PRAGMA}} tags and enable requested pragma.
-	 *
-	 * @access protected
-	 * @param mixed $matches
-	 * @return void
-	 * @throws MustacheException unknown pragma
-	 */
-	protected function _renderPragma($matches) {
-		$pragma         = $matches[0];
-		$pragma_name    = $matches['pragma_name'];
-		$options_string = $matches['options_string'];
-
-		if (!in_array($pragma_name, $this->_pragmasImplemented)) {
-			if ($this->_throwsException(MustacheException::UNKNOWN_PRAGMA)) {
-				throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
-			} else {
-				return '';
-			}
-		}
-
-		$options = array();
-		foreach (explode(' ', trim($options_string)) as $o) {
-			if ($p = trim($o)) {
-				$p = explode('=', $p);
-				$options[$p[0]] = $p[1];
-			}
-		}
-
-		if (empty($options)) {
-			$this->_localPragmas[$pragma_name] = true;
-		} else {
-			$this->_localPragmas[$pragma_name] = $options;
-		}
-
-		return '';
-	}
-
-	/**
-	 * Check whether this Mustache has a specific pragma.
-	 *
-	 * @access protected
-	 * @param string $pragma_name
-	 * @return bool
-	 */
-	protected function _hasPragma($pragma_name) {
-		if (array_key_exists($pragma_name, $this->_localPragmas) && $this->_localPragmas[$pragma_name]) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Return pragma options, if any.
-	 *
-	 * @access protected
-	 * @param string $pragma_name
-	 * @return mixed
-	 * @throws MustacheException Unknown pragma
-	 */
-	protected function _getPragmaOptions($pragma_name) {
-		if (!$this->_hasPragma($pragma_name)) {
-			if ($this->_throwsException(MustacheException::UNKNOWN_PRAGMA)) {
-				throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
-			}
-		}
-
-		return (is_array($this->_localPragmas[$pragma_name])) ? $this->_localPragmas[$pragma_name] : array();
-	}
-
-	/**
-	 * Check whether this Mustache instance throws a given exception.
-	 *
-	 * Expects exceptions to be MustacheException error codes (i.e. class constants).
-	 *
-	 * @access protected
-	 * @param mixed $exception
-	 * @return void
-	 */
-	protected function _throwsException($exception) {
-		return (isset($this->_throwsExceptions[$exception]) && $this->_throwsExceptions[$exception]);
-	}
-
-	/**
-	 * Prepare a tag RegEx for the given opening/closing tags.
-	 *
-	 * @access protected
-	 * @param string $otag
-	 * @param string $ctag
-	 * @return string
-	 */
-	protected function _prepareTagRegEx($otag, $ctag, $first = false) {
-		return sprintf(
-			'/(?P<leading>(?:%s\\r?\\n)[ \\t]*)?%s(?P<type>[%s]?)(?P<tag_name>.+?)(?:\\2|})?%s(?P<trailing>\\s*(?:\\r?\\n|\\Z))?/s',
-			($first ? '\\A|' : ''),
-			preg_quote($otag, '/'),
-			self::TAG_TYPES,
-			preg_quote($ctag, '/')
-		);
-	}
-
-	/**
-	 * Loop through and render individual Mustache tags.
-	 *
-	 * @access protected
-	 * @param string $template
-	 * @return void
-	 */
-	protected function _renderTags($template) {
-		if (strpos($template, $this->_otag) === false) {
-			return $template;
-		}
-
-		$first = true;
-		$this->_tagRegEx = $this->_prepareTagRegEx($this->_otag, $this->_ctag, true);
-
-		$html = '';
-		$matches = array();
-		while (preg_match($this->_tagRegEx, $template, $matches, PREG_OFFSET_CAPTURE)) {
-			$tag      = $matches[0][0];
-			$offset   = $matches[0][1];
-			$modifier = $matches['type'][0];
-			$tag_name = trim($matches['tag_name'][0]);
-
-			if (isset($matches['leading']) && $matches['leading'][1] > -1) {
-				$leading = $matches['leading'][0];
-			} else {
-				$leading = null;
-			}
-
-			if (isset($matches['trailing']) && $matches['trailing'][1] > -1) {
-				$trailing = $matches['trailing'][0];
-			} else {
-				$trailing = null;
-			}
-
-			$html .= substr($template, 0, $offset);
-
-			$next_offset = $offset + strlen($tag);
-			if ((substr($html, -1) == "\n") && (substr($template, $next_offset, 1) == "\n")) {
-				$next_offset++;
-			}
-			$template = substr($template, $next_offset);
-
-			$html .= $this->_renderTag($modifier, $tag_name, $leading, $trailing);
-
-			if ($first == true) {
-				$first = false;
-				$this->_tagRegEx = $this->_prepareTagRegEx($this->_otag, $this->_ctag);
-			}
-		}
-
-		return $html . $template;
-	}
-
-	/**
-	 * Render the named tag, given the specified modifier.
-	 *
-	 * Accepted modifiers are `=` (change delimiter), `!` (comment), `>` (partial)
-	 * `{` or `&` (don't escape output), or none (render escaped output).
-	 *
-	 * @access protected
-	 * @param string $modifier
-	 * @param string $tag_name
-	 * @param string $leading Whitespace
-	 * @param string $trailing Whitespace
-	 * @throws MustacheException Unmatched section tag encountered.
-	 * @return string
-	 */
-	protected function _renderTag($modifier, $tag_name, $leading, $trailing) {
-		switch ($modifier) {
-			case '=':
-				return $this->_changeDelimiter($tag_name, $leading, $trailing);
-				break;
-			case '!':
-				return $this->_renderComment($tag_name, $leading, $trailing);
-				break;
-			case '>':
-			case '<':
-				return $this->_renderPartial($tag_name, $leading, $trailing);
-				break;
-			case '{':
-				// strip the trailing } ...
-				if ($tag_name[(strlen($tag_name) - 1)] == '}') {
-					$tag_name = substr($tag_name, 0, -1);
-				}
-			case '&':
-				if ($this->_hasPragma(self::PRAGMA_UNESCAPED)) {
-					return $this->_renderEscaped($tag_name, $leading, $trailing);
-				} else {
-					return $this->_renderUnescaped($tag_name, $leading, $trailing);
-				}
-				break;
-			case '#':
-			case '^':
-			case '/':
-				// remove any leftover section tags
-				return $leading . $trailing;
-				break;
-			default:
-				if ($this->_hasPragma(self::PRAGMA_UNESCAPED)) {
-					return $this->_renderUnescaped($modifier . $tag_name, $leading, $trailing);
-				} else {
-					return $this->_renderEscaped($modifier . $tag_name, $leading, $trailing);
-				}
-				break;
-		}
-	}
-
-	/**
-	 * Returns true if any of its args contains the "\r" character.
-	 *
-	 * @access protected
-	 * @param string $str
-	 * @return boolean
-	 */
-	protected function _stringHasR($str) {
-		foreach (func_get_args() as $arg) {
-			if (strpos($arg, "\r") !== false) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Escape and return the requested tag.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @param string $leading Whitespace
-	 * @param string $trailing Whitespace
-	 * @return string
-	 */
-	protected function _renderEscaped($tag_name, $leading, $trailing) {
-		$value = $this->_renderUnescaped($tag_name, '', '');
-		if (isset($this->_escape)) {
-			$rendered = call_user_func($this->_escape, $value);
-		} else {
-			$rendered = htmlentities($value, ENT_COMPAT, $this->_charset);
-		}
-
-		return $leading . $rendered . $trailing;
-	}
-
-	/**
-	 * Render a comment (i.e. return an empty string).
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @param string $leading Whitespace
-	 * @param string $trailing Whitespace
-	 * @return string
-	 */
-	protected function _renderComment($tag_name, $leading, $trailing) {
-		if ($leading !== null && $trailing !== null) {
-			if (strpos($leading, "\n") === false) {
-				return '';
-			}
-			return $this->_stringHasR($leading, $trailing) ? "\r\n" : "\n";
-		}
-		return $leading . $trailing;
-	}
-
-	/**
-	 * Return the requested tag unescaped.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @param string $leading Whitespace
-	 * @param string $trailing Whitespace
-	 * @return string
-	 */
-	protected function _renderUnescaped($tag_name, $leading, $trailing) {
-		$val = $this->_getVariable($tag_name);
-
-		if ($this->_varIsCallable($val)) {
-			$val = $this->_renderTemplate(call_user_func($val));
-		}
-
-		return $leading . $val . $trailing;
-	}
-
-	/**
-	 * Render the requested partial.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @param string $leading Whitespace
-	 * @param string $trailing Whitespace
-	 * @return string
-	 */
-	protected function _renderPartial($tag_name, $leading, $trailing) {
-		$partial = $this->_getPartial($tag_name);
-		if ($leading !== null && $trailing !== null) {
-			$whitespace = trim($leading, "\r\n");
-			$partial = preg_replace('/(\\r?\\n)(?!$)/s', "\\1" . $whitespace, $partial);
-		}
-
-		$view = clone($this);
-
-		if ($leading !== null && $trailing !== null) {
-			return $leading . $view->render($partial);
-		} else {
-			return $leading . $view->render($partial) . $trailing;
-		}
-	}
-
-	/**
-	 * Change the Mustache tag delimiter. This method also replaces this object's current
-	 * tag RegEx with one using the new delimiters.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @param string $leading Whitespace
-	 * @param string $trailing Whitespace
-	 * @return string
-	 */
-	protected function _changeDelimiter($tag_name, $leading, $trailing) {
-		list($otag, $ctag) = explode(' ', $tag_name);
-		$this->_otag = $otag;
-		$this->_ctag = $ctag;
-
-		$this->_tagRegEx = $this->_prepareTagRegEx($this->_otag, $this->_ctag);
-
-		if ($leading !== null && $trailing !== null) {
-			if (strpos($leading, "\n") === false) {
-				return '';
-			}
-			return $this->_stringHasR($leading, $trailing) ? "\r\n" : "\n";
-		}
-		return $leading . $trailing;
-	}
-
-	/**
-	 * Push a local context onto the stack.
-	 *
-	 * @access protected
-	 * @param array &$local_context
-	 * @return void
-	 */
-	protected function _pushContext(&$local_context) {
-		$new = array();
-		$new[] =& $local_context;
-		foreach (array_keys($this->_context) as $key) {
-			$new[] =& $this->_context[$key];
-		}
-		$this->_context = $new;
-	}
-
-	/**
-	 * Remove the latest context from the stack.
-	 *
-	 * @access protected
-	 * @return void
-	 */
-	protected function _popContext() {
-		$new = array();
-
-		$keys = array_keys($this->_context);
-		array_shift($keys);
-		foreach ($keys as $key) {
-			$new[] =& $this->_context[$key];
-		}
-		$this->_context = $new;
-	}
-
-	/**
-	 * Get a variable from the context array.
-	 *
-	 * If the view is an array, returns the value with array key $tag_name.
-	 * If the view is an object, this will check for a public member variable
-	 * named $tag_name. If none is available, this method will execute and return
-	 * any class method named $tag_name. Failing all of the above, this method will
-	 * return an empty string.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @throws MustacheException Unknown variable name.
-	 * @return string
-	 */
-	protected function _getVariable($tag_name) {
-		if ($tag_name === '.') {
-			return $this->_context[0];
-		} else if (strpos($tag_name, '.') !== false) {
-			$chunks = explode('.', $tag_name);
-			$first = array_shift($chunks);
-
-			$ret = $this->_findVariableInContext($first, $this->_context);
-			foreach ($chunks as $next) {
-				// Slice off a chunk of context for dot notation traversal.
-				$c = array($ret);
-				$ret = $this->_findVariableInContext($next, $c);
-			}
-			return $ret;
-		} else {
-			return $this->_findVariableInContext($tag_name, $this->_context);
-		}
-	}
-
-	/**
-	 * Get a variable from the context array. Internal helper used by getVariable() to abstract
-	 * variable traversal for dot notation.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @param array $context
-	 * @throws MustacheException Unknown variable name.
-	 * @return string
-	 */
-	protected function _findVariableInContext($tag_name, $context) {
-		foreach ($context as $view) {
-			if (is_object($view)) {
-				if (method_exists($view, $tag_name)) {
-					return $view->$tag_name();
-				} else if (isset($view->$tag_name)) {
-					return $view->$tag_name;
-				}
-			} else if (is_array($view) && array_key_exists($tag_name, $view)) {
-				return $view[$tag_name];
-			}
-		}
-
-		if ($this->_throwsException(MustacheException::UNKNOWN_VARIABLE)) {
-			throw new MustacheException("Unknown variable: " . $tag_name, MustacheException::UNKNOWN_VARIABLE);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Retrieve the partial corresponding to the requested tag name.
-	 *
-	 * Silently fails (i.e. returns '') when the requested partial is not found.
-	 *
-	 * @access protected
-	 * @param string $tag_name
-	 * @throws MustacheException Unknown partial name.
-	 * @return string
-	 */
-	protected function _getPartial($tag_name) {
-		if ((is_array($this->_partials) || $this->_partials instanceof ArrayAccess) && isset($this->_partials[$tag_name])) {
-			return $this->_partials[$tag_name];
-		}
-
-		if ($this->_throwsException(MustacheException::UNKNOWN_PARTIAL)) {
-			throw new MustacheException('Unknown partial: ' . $tag_name, MustacheException::UNKNOWN_PARTIAL);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Check whether the given $var should be iterated (i.e. in a section context).
-	 *
-	 * @access protected
-	 * @param mixed $var
-	 * @return bool
-	 */
-	protected function _varIsIterable($var) {
-		return $var instanceof Traversable || (is_array($var) && !array_diff_key($var, array_keys(array_keys($var))));
-	}
-
-	/**
-	 * Higher order sections helper: tests whether the section $var is a valid callback.
-	 *
-	 * In Mustache.php, a variable is considered 'callable' if the variable is:
-	 *
-	 *  1. an anonymous function.
-	 *  2. an object and the name of a public function, i.e. `array($SomeObject, 'methodName')`
-	 *  3. a class name and the name of a public static function, i.e. `array('SomeClass', 'methodName')`
-	 *
-	 * @access protected
-	 * @param mixed $var
-	 * @return bool
-	 */
-	protected function _varIsCallable($var) {
-	  return !is_string($var) && is_callable($var);
-	}
-}
-
-
-/**
- * MustacheException class.
- *
- * @extends Exception
- */
-class MustacheException extends Exception {
-
-	// An UNKNOWN_VARIABLE exception is thrown when a {{variable}} is not found
-	// in the current context.
-	const UNKNOWN_VARIABLE         = 0;
-
-	// An UNCLOSED_SECTION exception is thrown when a {{#section}} is not closed.
-	const UNCLOSED_SECTION         = 1;
-
-	// An UNEXPECTED_CLOSE_SECTION exception is thrown when {{/section}} appears
-	// without a corresponding {{#section}} or {{^section}}.
-	const UNEXPECTED_CLOSE_SECTION = 2;
-
-	// An UNKNOWN_PARTIAL exception is thrown whenever a {{>partial}} tag appears
-	// with no associated partial.
-	const UNKNOWN_PARTIAL          = 3;
-
-	// An UNKNOWN_PRAGMA exception is thrown whenever a {{%PRAGMA}} tag appears
-	// which can't be handled by this Mustache instance.
-	const UNKNOWN_PRAGMA           = 4;
-
-}
diff --git a/vendor/flexi/vendor/mustache.php/MustacheLoader.php b/vendor/flexi/vendor/mustache.php/MustacheLoader.php
deleted file mode 100644
index 9c4b386..0000000
--- a/vendor/flexi/vendor/mustache.php/MustacheLoader.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * A Mustache Partial filesystem loader.
- *
- * @author Justin Hileman {@link http://justinhileman.com}
- */
-class MustacheLoader implements ArrayAccess {
-
-	protected $baseDir;
-	protected $partialsCache = array();
-	protected $extension;
-
-	/**
-	 * MustacheLoader constructor.
-	 *
-	 * @access public
-	 * @param  string $baseDir   Base template directory.
-	 * @param  string $extension File extension for Mustache files (default: 'mustache')
-	 * @return void
-	 */
-	public function __construct($baseDir, $extension = 'mustache') {
-		if (!is_dir($baseDir)) {
-			throw new InvalidArgumentException('$baseDir must be a valid directory, ' . $baseDir . ' given.');
-		}
-
-		$this->baseDir   = $baseDir;
-		$this->extension = $extension;
-	}
-
-	/**
-	 * @param  string $offset Name of partial
-	 * @return boolean
-	 */
-	public function offsetExists($offset) {
-		return (isset($this->partialsCache[$offset]) || file_exists($this->pathName($offset)));
-	}
-	
-	/**
-	 * @throws InvalidArgumentException if the given partial doesn't exist
-	 * @param  string $offset Name of partial
-	 * @return string Partial template contents
-	 */
-	public function offsetGet($offset) {
-		if (!$this->offsetExists($offset)) {
-			throw new InvalidArgumentException('Partial does not exist: ' . $offset);
-		}
-
-		if (!isset($this->partialsCache[$offset])) {
-			$this->partialsCache[$offset] = file_get_contents($this->pathName($offset));
-		}
-
-		return $this->partialsCache[$offset];
-	}
-	
-	/**
-	 * MustacheLoader is an immutable filesystem loader. offsetSet throws a LogicException if called.
-	 *
-	 * @throws LogicException
-	 * @return void
-	 */
-	public function offsetSet($offset, $value) {
-		throw new LogicException('Unable to set offset: MustacheLoader is an immutable ArrayAccess object.');
-	}
-	
-	/**
-	 * MustacheLoader is an immutable filesystem loader. offsetUnset throws a LogicException if called.
-	 *
-	 * @throws LogicException
-	 * @return void
-	 */
-	public function offsetUnset($offset) {
-		throw new LogicException('Unable to unset offset: MustacheLoader is an immutable ArrayAccess object.');
-	}
-
-	/**
-	 * An internal helper for generating path names.
-	 * 
-	 * @param  string $file Partial name
-	 * @return string File path
-	 */
-	protected function pathName($file) {
-		return $this->baseDir . '/' . $file . '.' . $this->extension;
-	}
-}
diff --git a/vendor/flexi/vendor/mustache.php/README.markdown b/vendor/flexi/vendor/mustache.php/README.markdown
deleted file mode 100644
index 989ff97..0000000
--- a/vendor/flexi/vendor/mustache.php/README.markdown
+++ /dev/null
@@ -1,98 +0,0 @@
-Mustache.php
-============
-
-A [Mustache](http://defunkt.github.com/mustache/) implementation in PHP.
-
-
-Usage
------
-
-A quick example:
-
-```php
-<?php
-include('Mustache.php');
-$m = new Mustache;
-echo $m->render('Hello {{planet}}', array('planet' => 'World!'));
-// "Hello World!"
-```
-
-
-And a more in-depth example--this is the canonical Mustache template:
-
-```
-Hello {{name}}
-You have just won ${{value}}!
-{{#in_ca}}
-Well, ${{taxed_value}}, after taxes.
-{{/in_ca}}
-```
-
-
-Along with the associated Mustache class:
-
-```php
-<?php
-class Chris extends Mustache {
-    public $name = "Chris";
-    public $value = 10000;
-    
-    public function taxed_value() {
-        return $this->value - ($this->value * 0.4);
-    }
-
-    public $in_ca = true;
-}
-```
-
-
-Render it like so:
-
-```php
-<?php
-$chris = new Chris;
-echo $chris->render($template);
-```
-
-
-Here's the same thing, a different way:
-
-Create a view object--which could also be an associative array, but those don't do functions quite as well:
-
-```php
-<?php
-class Chris {
-    public $name = "Chris";
-    public $value = 10000;
-
-    public function taxed_value() {
-        return $this->value - ($this->value * 0.4);
-    }
-
-    public $in_ca = true;
-}
-```
-
-
-And render it:
-
-```php
-<?php
-$chris = new Chris;
-$m = new Mustache;
-echo $m->render($template, $chris);
-```
-
-
-Known Issues
-------------
-
- * As of Mustache spec v1.1.2, there are a couple of whitespace bugs around section tags... Despite these failing tests, this
-   version is actually *closer* to correct than previous releases.
-
-
-See Also
---------
-
- * [Readme for the Ruby Mustache implementation](http://github.com/defunkt/mustache/blob/master/README.md).
- * [mustache(1)](http://mustache.github.com/mustache.1.html) and [mustache(5)](http://mustache.github.com/mustache.5.html) man pages.
diff --git a/vendor/flexi/vendor/mustache.php/bin/create_example.php b/vendor/flexi/vendor/mustache.php/bin/create_example.php
deleted file mode 100644
index 1f0b894..0000000
--- a/vendor/flexi/vendor/mustache.php/bin/create_example.php
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * A commandline script to create an example and the needed files:
- *
- *     $ bin/create_example.php my_new_example
- *
- * ... and the folder my_new_example will be created in the examples/ folder containing 3 files:
- *
- *     my_new_example/my_new_example.mustache
- *     my_new_example/my_new_example.txt
- *     my_new_example/MyNewExample.php
- */
-
-// some constants
-define('USAGE', <<<USAGE
-USAGE: {$argv[0]} example_name
-
-This creates a new example and the corresponding files in the examples/ directory
-
-USAGE
-);
-
-define('DS', DIRECTORY_SEPARATOR);
-define('EXAMPLE_PATH', realpath(dirname(__FILE__) . DS . ".." . DS . "examples"));
-
-
-/**
- * transform a string to lowercase using underlines.
- * Examples:
- * String -> string
- * AString -> a_string
- * SomeStrings -> some_strings
- * AStringMore -> a_string_more
- *
- * @param string $name
- * @access public
- * @return string
- */
-function getLowerCaseName($name) {
-	return preg_replace_callback("/([A-Z])/", create_function (
-		'$match',
-		'return "_" . strtolower($match[1]);'
-	), lcfirst($name));
-}
-
-/**
- * transform a string to Uppercase (camelcase)
- * Examples
- * string -> String
- * a_string -> AString
- * some_strings -> SomeStrings
- * a_string_more -> AStringMore -> a_string_more
- *
- * @param string $name
- * @access public
- * @return string
- */
-function getUpperCaseName($name) {
-	return preg_replace_callback("/_([a-z])/", create_function (
-		'$match',
-		'return strtoupper($match{1});'
-	), ucfirst($name));
-}
-
-
-/**
- * return the given value and echo it out appending "\n"
- *
- * @param mixed $value
- * @access public
- * @return mixed
- */
-function out($value) {
-	echo $value . "\n";
-	return $value;
-}
-
-/**
- * create Path for certain files in an example
- * returns the directory name if only $directory is given.
- * if an extension is given a complete filename is returned.
- * the returned filename will be echoed out
- *
- * @param string $directory directory without / at the end
- * @param string $filename filename without path and extension
- * @param string $extension extension of the file without "."
- * @access public
- * @return string
- */
-function buildPath($directory, $filename = null,  $extension = null) {
-	return out(EXAMPLE_PATH . DS . $directory.
-					($extension !== null && $filename !== null ? DS . $filename. "." . $extension : ""));
-}
-
-/**
- * creates the directory for the example
- * the script die()'s if mkdir() fails
- *
- * @param string $directory
- * @access public
- * @return void
- */
-function createDirectory($directory) {
-	if(!@mkdir(buildPath($directory))) {
-		die("FAILED to create directory\n");
-	}
-}
-
-/**
- * create a file for the example with the given $content
- * the script die()'s if fopen() fails
- *
- * @param string $directory directory without / at the end
- * @param string $filename filename without path and extension
- * @param string $extension extension of the file without "."
- * @param string $content the content of the file
- * @access public
- * @return void
- */
-function createFile($directory, $filename, $extension, $content = "") {
-	$handle = @fopen(buildPath($directory, $filename, $extension), "w");
-	if($handle) {
-		fwrite($handle, $content);
-		fclose($handle);
-	} else {
-		die("FAILED to create file\n");
-	}
-}
-
-
-/**
- * routine to create the example directory and 3 files
- *
- * if the $example_name is "SomeThing" the following files will be created
- * examples/some_thing
- * examples/some_thing/some_thing.mustache
- * examples/some_thing/some_thing.txt
- * examples/some_thing/SomeThing.php
- *
- * @param mixed $example_name
- * @access public
- * @return void
- */
-function main($example_name) {
-	$lowercase = getLowerCaseName($example_name);
-	$uppercase = getUpperCaseName($example_name);
-	createDirectory($lowercase);
-	createFile($lowercase, $lowercase, "mustache");
-	createFile($lowercase, $lowercase, "txt");
-	createFile($lowercase, $uppercase, "php", <<<CONTENT
-<?php
-
-class {$uppercase} extends Mustache {
-
-}
-
-CONTENT
-	);
-}
-
-// check if enougth arguments are given
-if(count($argv) > 1) {
-	// get the name of the example
-	$example_name = $argv[1];
-
-	main($example_name);
-
-} else {
-	echo USAGE;
-}
diff --git a/vendor/flexi/vendor/mustache.php/examples/child_context/ChildContext.php b/vendor/flexi/vendor/mustache.php/examples/child_context/ChildContext.php
deleted file mode 100644
index b652356..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/child_context/ChildContext.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class ChildContext extends Mustache {
-	public $parent = array(
-		'child' => 'child works',
-	);
-	
-	public $grandparent = array(
-		'parent' => array(
-			'child' => 'grandchild works',
-		),
-	);
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/child_context/child_context.mustache b/vendor/flexi/vendor/mustache.php/examples/child_context/child_context.mustache
deleted file mode 100644
index e1f2ebc..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/child_context/child_context.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>{{#parent}}{{child}}{{/parent}}</h1>
-<h2>{{#grandparent}}{{#parent}}{{child}}{{/parent}}{{/grandparent}}</h2>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/child_context/child_context.txt b/vendor/flexi/vendor/mustache.php/examples/child_context/child_context.txt
deleted file mode 100644
index cfb76bf..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/child_context/child_context.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>child works</h1>
-<h2>grandchild works</h2>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/comments/Comments.php b/vendor/flexi/vendor/mustache.php/examples/comments/Comments.php
deleted file mode 100644
index 7f028ba..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/comments/Comments.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class Comments extends Mustache {
-	public function title() {
-		return 'A Comedy of Errors';
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/comments/comments.mustache b/vendor/flexi/vendor/mustache.php/examples/comments/comments.mustache
deleted file mode 100644
index 846e449..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/comments/comments.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<h1>{{title}}{{! just something interesting... #or ^not... }}</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/comments/comments.txt b/vendor/flexi/vendor/mustache.php/examples/comments/comments.txt
deleted file mode 100644
index 9f40e77..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/comments/comments.txt
+++ /dev/null
@@ -1 +0,0 @@
-<h1>A Comedy of Errors</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/complex/complex.mustache b/vendor/flexi/vendor/mustache.php/examples/complex/complex.mustache
deleted file mode 100644
index 807c201..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/complex/complex.mustache
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1>{{header}}</h1>
-{{#notEmpty}}
-<ul>
-{{#item}}
-{{#current}}
-    <li><strong>{{name}}</strong></li>
-{{/current}}
-{{^current}}
-    <li><a href="{{url}}">{{name}}</a></li>
-{{/current}}
-{{/item}}
-</ul>
-{{/notEmpty}}
-{{#isEmpty}}
-<p>The list is empty.</p>
-{{/isEmpty}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/complex/complex.php b/vendor/flexi/vendor/mustache.php/examples/complex/complex.php
deleted file mode 100644
index 32b0917..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/complex/complex.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class Complex extends Mustache {
-	public $header = 'Colors';
-
-	public $item = array(
-		array('name' => 'red', 'current' => true, 'url' => '#Red'),
-		array('name' => 'green', 'current' => false, 'url' => '#Green'),
-		array('name' => 'blue', 'current' => false, 'url' => '#Blue'),
-	);
-
-	public function notEmpty() {
-		return !($this->isEmpty());
-	}
-
-	public function isEmpty() {
-		return count($this->item) === 0;
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/complex/complex.txt b/vendor/flexi/vendor/mustache.php/examples/complex/complex.txt
deleted file mode 100644
index facee6d..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/complex/complex.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Colors</h1>
-<ul>
-    <li><strong>red</strong></li>
-    <li><a href="#Green">green</a></li>
-    <li><a href="#Blue">blue</a></li>
-</ul>
diff --git a/vendor/flexi/vendor/mustache.php/examples/delimiters/Delimiters.php b/vendor/flexi/vendor/mustache.php/examples/delimiters/Delimiters.php
deleted file mode 100644
index be372fa..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/delimiters/Delimiters.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Delimiters extends Mustache {
-	public $start = "It worked the first time.";
-
-	public function middle() {
-		return array(
-			array('item' => "And it worked the second time."),
-			array('item' => "As well as the third."),
-		);
-	}
-
-	public $final = "Then, surprisingly, it worked the final time.";
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.mustache b/vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.mustache
deleted file mode 100644
index e9b0332..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.mustache
+++ /dev/null
@@ -1,8 +0,0 @@
-{{=<% %>=}}
-* <% start %>
-<%=| |=%>
-|# middle |
-* | item |
-|/ middle |
-|={{ }}=|
-* {{ final }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.txt b/vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.txt
deleted file mode 100644
index e6b2d7a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/delimiters/delimiters.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* It worked the first time.
-* And it worked the second time.
-* As well as the third.
-* Then, surprisingly, it worked the final time.
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/dot_notation/DotNotation.php b/vendor/flexi/vendor/mustache.php/examples/dot_notation/DotNotation.php
deleted file mode 100644
index 7dd0a4e..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/dot_notation/DotNotation.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * DotNotation example class. Uses DOT_NOTATION pragma.
- *
- * @extends Mustache
- */
-class DotNotation extends Mustache {
-	public $person = array(
-		'name' => array('first' => 'Chris', 'last' => 'Firescythe'),
-		'age' => 24,
-		'hobbies' => array('Cycling', 'Fishing'),
-		'hometown' => array(
-			'city' => 'Cincinnati',
-			'state' => 'OH',
-		),
-	);
-
-	public $normal = 'Normal';
-}
diff --git a/vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.mustache b/vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.mustache
deleted file mode 100644
index 0135a2a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-* {{person.name.first}} {{person.name.last}}
-* {{person.age}}
-* {{person.hobbies.0}}, {{person.hobbies.1}}
-* {{person.hometown.city}}, {{person.hometown.state}}
-* {{normal}}
diff --git a/vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.txt b/vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.txt
deleted file mode 100644
index e5c1ed9..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/dot_notation/dot_notation.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-* Chris Firescythe
-* 24
-* Cycling, Fishing
-* Cincinnati, OH
-* Normal
diff --git a/vendor/flexi/vendor/mustache.php/examples/double_section/DoubleSection.php b/vendor/flexi/vendor/mustache.php/examples/double_section/DoubleSection.php
deleted file mode 100644
index f9d3dbb..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/double_section/DoubleSection.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class DoubleSection extends Mustache {
-	public function t() {
-		return true;
-	}
-
-	public $two = "second";
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/double_section/double_section.mustache b/vendor/flexi/vendor/mustache.php/examples/double_section/double_section.mustache
deleted file mode 100644
index c831645..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/double_section/double_section.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#t}}
-* first
-{{/t}}
-* {{two}}
-{{#t}}
-* third
-{{/t}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/double_section/double_section.txt b/vendor/flexi/vendor/mustache.php/examples/double_section/double_section.txt
deleted file mode 100644
index 5433688..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/double_section/double_section.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* first
-* second
-* third
diff --git a/vendor/flexi/vendor/mustache.php/examples/escaped/Escaped.php b/vendor/flexi/vendor/mustache.php/examples/escaped/Escaped.php
deleted file mode 100644
index 2852196..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/escaped/Escaped.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Escaped extends Mustache {
-	public $title = '"Bear" > "Shark"';
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/escaped/escaped.mustache b/vendor/flexi/vendor/mustache.php/examples/escaped/escaped.mustache
deleted file mode 100644
index 8be4ccb..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/escaped/escaped.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<h1>{{title}}</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/escaped/escaped.txt b/vendor/flexi/vendor/mustache.php/examples/escaped/escaped.txt
deleted file mode 100644
index 6ba3657..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/escaped/escaped.txt
+++ /dev/null
@@ -1 +0,0 @@
-<h1>&quot;Bear&quot; &gt; &quot;Shark&quot;</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/GrandParentContext.php b/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/GrandParentContext.php
deleted file mode 100644
index 5a59ed9..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/GrandParentContext.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-class GrandParentContext extends Mustache {
-	public $grand_parent_id = 'grand_parent1';
-	public $parent_contexts = array();
-	
-	public function __construct() {
-		parent::__construct();
-		
-		$this->parent_contexts[] = array('parent_id' => 'parent1', 'child_contexts' => array(
-			array('child_id' => 'parent1-child1'),
-			array('child_id' => 'parent1-child2')
-		));
-		
-		$parent2 = new stdClass();
-		$parent2->parent_id = 'parent2';
-		$parent2->child_contexts = array(
-			array('child_id' => 'parent2-child1'),
-			array('child_id' => 'parent2-child2')
-		);
-		
-		$this->parent_contexts[] = $parent2;
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.mustache b/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.mustache
deleted file mode 100644
index 6d03ddf..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-{{grand_parent_id}}
-{{#parent_contexts}}
-  {{parent_id}} ({{grand_parent_id}})
-  {{#child_contexts}}
-    {{child_id}} ({{parent_id}} << {{grand_parent_id}})
-  {{/child_contexts}}
-{{/parent_contexts}}
diff --git a/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.txt b/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.txt
deleted file mode 100644
index 2687f84..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/grand_parent_context/grand_parent_context.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-grand_parent1
-  parent1 (grand_parent1)
-    parent1-child1 (parent1 << grand_parent1)
-    parent1-child2 (parent1 << grand_parent1)
-  parent2 (grand_parent1)
-    parent2-child1 (parent2 << grand_parent1)
-    parent2-child2 (parent2 << grand_parent1)
diff --git a/vendor/flexi/vendor/mustache.php/examples/i18n/I18n.php b/vendor/flexi/vendor/mustache.php/examples/i18n/I18n.php
deleted file mode 100644
index 7e0fcce..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/i18n/I18n.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-class I18n extends Mustache {
-
-    // Variable to be interpolated
-    public $name = 'Bob';
-
-    // Add a {{#__}} lambda for i18n
-    public $__ = array(__CLASS__, '__trans');
-
-    // A *very* small i18n dictionary :)
-    private static $dictionary = array(
-        'Hello.' => 'Hola.',
-        'My name is {{ name }}.' => 'Me llamo {{ name }}.',
-    );
-
-    public static function __trans($text) {
-        return isset(self::$dictionary[$text]) ? self::$dictionary[$text] : $text;
-    }
-}
diff --git a/vendor/flexi/vendor/mustache.php/examples/i18n/i18n.mustache b/vendor/flexi/vendor/mustache.php/examples/i18n/i18n.mustache
deleted file mode 100644
index eef169b..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/i18n/i18n.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{#__}}Hello.{{/__}} {{#__}}My name is {{ name }}.{{/__}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/i18n/i18n.txt b/vendor/flexi/vendor/mustache.php/examples/i18n/i18n.txt
deleted file mode 100644
index 650a71a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/i18n/i18n.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hola. Me llamo Bob.
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/ImplicitIterator.php b/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/ImplicitIterator.php
deleted file mode 100644
index c01fef0..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/ImplicitIterator.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class ImplicitIterator extends Mustache {
-	protected $data = array('Donkey Kong', 'Luigi', 'Mario', 'Peach', 'Yoshi');
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.mustache b/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.mustache
deleted file mode 100644
index b8d58ff..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.mustache
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#data}}
-* {{.}}
-{{/data}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.txt b/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.txt
deleted file mode 100644
index bd7e945..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/implicit_iterator/implicit_iterator.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-* Donkey Kong
-* Luigi
-* Mario
-* Peach
-* Yoshi
diff --git a/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/InvertedDoubleSection.php b/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/InvertedDoubleSection.php
deleted file mode 100644
index 3dc2231..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/InvertedDoubleSection.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class InvertedDoubleSection extends Mustache {
-	public $t = false;
-	public $two = 'second';
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.mustache b/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.mustache
deleted file mode 100644
index acc3ae0..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-{{^t}}
-* first
-{{/t}}
-* {{two}}
-{{^t}}
-* third
-{{/t}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.txt b/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.txt
deleted file mode 100644
index 5433688..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/inverted_double_section/inverted_double_section.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* first
-* second
-* third
diff --git a/vendor/flexi/vendor/mustache.php/examples/inverted_section/InvertedSection.php b/vendor/flexi/vendor/mustache.php/examples/inverted_section/InvertedSection.php
deleted file mode 100644
index 18eeb86..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/inverted_section/InvertedSection.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class InvertedSection extends Mustache {
-	public $repo = array();
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.mustache b/vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.mustache
deleted file mode 100644
index bee60ff..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{#repo}}<b>{{name}}</b>{{/repo}}
-{{^repo}}No repos :({{/repo}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.txt b/vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.txt
deleted file mode 100644
index 2b9ed3f..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/inverted_section/inverted_section.txt
+++ /dev/null
@@ -1 +0,0 @@
-No repos :(
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/partials/Partials.php b/vendor/flexi/vendor/mustache.php/examples/partials/Partials.php
deleted file mode 100644
index 093257b..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/partials/Partials.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class Partials extends Mustache {
-	public $name = 'ilmich';
-	public $data = array(
-		array('name' => 'federica', 'age' => 27, 'gender' => 'female'),
-		array('name' => 'marco', 'age' => 32, 'gender' => 'male'),
-	);
-
-	protected $_partials = array(
-		'children' => "{{#data}}{{name}} - {{age}} - {{gender}}\n{{/data}}",
-	);
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/partials/partials.mustache b/vendor/flexi/vendor/mustache.php/examples/partials/partials.mustache
deleted file mode 100644
index 037e1b3..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/partials/partials.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-Children of {{name}}:
-{{>children}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/partials/partials.txt b/vendor/flexi/vendor/mustache.php/examples/partials/partials.txt
deleted file mode 100644
index d967e15..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/partials/partials.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Children of ilmich:
-federica - 27 - female
-marco - 32 - male
diff --git a/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/PartialsWithViewClass.php b/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/PartialsWithViewClass.php
deleted file mode 100644
index 56e0d86..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/PartialsWithViewClass.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class PartialsWithViewClass extends Mustache {
-	public function __construct($template = null, $view = null, $partials = null) {
-		// Use an object of an arbitrary class as a View for this Mustache instance:
-		$view = new StdClass();
-		$view->name = 'ilmich';
-		$view->data = array(
-			array('name' => 'federica', 'age' => 27, 'gender' => 'female'),
-			array('name' => 'marco', 'age' => 32, 'gender' => 'male'),
-		);
-
-		$partials = array(
-			'children' => "{{#data}}{{name}} - {{age}} - {{gender}}\n{{/data}}",
-		);
-
-		parent::__construct($template, $view, $partials);
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.mustache b/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.mustache
deleted file mode 100644
index 037e1b3..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-Children of {{name}}:
-{{>children}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.txt b/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.txt
deleted file mode 100644
index d967e15..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/partials_with_view_class/partials_with_view_class.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Children of ilmich:
-federica - 27 - female
-marco - 32 - male
diff --git a/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/PragmaUnescaped.php b/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/PragmaUnescaped.php
deleted file mode 100644
index b4e0e21..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/PragmaUnescaped.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class PragmaUnescaped extends Mustache {
-	public $vs = 'Bear > Shark';
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.mustache b/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.mustache
deleted file mode 100644
index 76095d7..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.mustache
+++ /dev/null
@@ -1,3 +0,0 @@
-{{%UNESCAPED}}
-{{vs}}
-{{{vs}}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.txt b/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.txt
deleted file mode 100644
index 2860f61..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/pragma_unescaped/pragma_unescaped.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Bear > Shark
-Bear &gt; Shark
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/PragmasInPartials.php b/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/PragmasInPartials.php
deleted file mode 100644
index 7458289..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/PragmasInPartials.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class PragmasInPartials extends Mustache {
-	public $say = '< RAWR!! >';
-	protected $_partials = array(
-		'dinosaur' => '{{say}}'
-	);
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.mustache b/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.mustache
deleted file mode 100644
index abd6ef4..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.mustache
+++ /dev/null
@@ -1,3 +0,0 @@
-{{%UNESCAPED}}
-{{say}}
-{{>dinosaur}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.txt b/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.txt
deleted file mode 100644
index c8e77e3..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/pragmas_in_partials/pragmas_in_partials.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-< RAWR!! >
-&lt; RAWR!! &gt;
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/recursive_partials/RecursivePartials.php b/vendor/flexi/vendor/mustache.php/examples/recursive_partials/RecursivePartials.php
deleted file mode 100644
index 04e8af8..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/recursive_partials/RecursivePartials.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class RecursivePartials extends Mustache {
-	protected $_partials = array(
-		'child' => " > {{ name }}{{#child}}{{>child}}{{/child}}",
-	);
-
-	public $name  = 'George';
-	public $child = array(
-		'name'  => 'Dan',
-		'child' => array(
-			'name'  => 'Justin',
-			'child' => false,
-		)
-	);
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.mustache b/vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.mustache
deleted file mode 100644
index 0bc5d03..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{name}}{{#child}}{{>child}}{{/child}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.txt b/vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.txt
deleted file mode 100644
index 681cdef..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/recursive_partials/recursive_partials.txt
+++ /dev/null
@@ -1 +0,0 @@
-George > Dan > Justin
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/SectionIteratorObjects.php b/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/SectionIteratorObjects.php
deleted file mode 100644
index 7b65597..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/SectionIteratorObjects.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class SectionIteratorObjects extends Mustache {
-	public $start = "It worked the first time.";
-
-	protected $_data = array(
-		array('item' => 'And it worked the second time.'),
-		array('item' => 'As well as the third.'),
-	);
-
-	public function middle() {
-		return new ArrayIterator($this->_data);
-	}
-
-	public $final = "Then, surprisingly, it worked the final time.";
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.mustache b/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.mustache
deleted file mode 100644
index 44dfce4..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-* {{ start }}
-{{# middle }}
-* {{ item }}
-{{/ middle }}
-* {{ final }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.txt b/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.txt
deleted file mode 100644
index e6b2d7a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_iterator_objects/section_iterator_objects.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* It worked the first time.
-* And it worked the second time.
-* As well as the third.
-* Then, surprisingly, it worked the final time.
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/SectionMagicObjects.php b/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/SectionMagicObjects.php
deleted file mode 100644
index ebb0031..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/SectionMagicObjects.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class SectionMagicObjects extends Mustache {
-	public $start = "It worked the first time.";
-
-	public function middle() {
-		return new MagicObject();
-	}
-
-	public $final = "Then, surprisingly, it worked the final time.";
-}
-
-class MagicObject {
-	protected $_data = array(
-		'foo' => 'And it worked the second time.',
-		'bar' => 'As well as the third.'
-	);
-
-	public function __get($key) {
-		return isset($this->_data[$key]) ? $this->_data[$key] : NULL;
-	}
-
-	public function __isset($key) {
-		return isset($this->_data[$key]);
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.mustache b/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.mustache
deleted file mode 100644
index 9119608..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.mustache
+++ /dev/null
@@ -1,6 +0,0 @@
-* {{ start }}
-{{# middle }}
-* {{ foo }}
-* {{ bar }}
-{{/ middle }}
-* {{ final }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.txt b/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.txt
deleted file mode 100644
index e6b2d7a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_magic_objects/section_magic_objects.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* It worked the first time.
-* And it worked the second time.
-* As well as the third.
-* Then, surprisingly, it worked the final time.
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_objects/SectionObjects.php b/vendor/flexi/vendor/mustache.php/examples/section_objects/SectionObjects.php
deleted file mode 100644
index 41b7d84..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_objects/SectionObjects.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class SectionObjects extends Mustache {
-	public $start = "It worked the first time.";
-
-	public function middle() {
-		return new SectionObject;
-	}
-
-	public $final = "Then, surprisingly, it worked the final time.";
-}
-
-class SectionObject {
-	public $foo = 'And it worked the second time.';
-	public $bar = 'As well as the third.';
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.mustache b/vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.mustache
deleted file mode 100644
index 9119608..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.mustache
+++ /dev/null
@@ -1,6 +0,0 @@
-* {{ start }}
-{{# middle }}
-* {{ foo }}
-* {{ bar }}
-{{/ middle }}
-* {{ final }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.txt b/vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.txt
deleted file mode 100644
index e6b2d7a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/section_objects/section_objects.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* It worked the first time.
-* And it worked the second time.
-* As well as the third.
-* Then, surprisingly, it worked the final time.
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/sections/Sections.php b/vendor/flexi/vendor/mustache.php/examples/sections/Sections.php
deleted file mode 100644
index fb78354..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/sections/Sections.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Sections extends Mustache {
-	public $start = "It worked the first time.";
-
-	public function middle() {
-		return array(
-			array('item' => "And it worked the second time."),
-			array('item' => "As well as the third."),
-		);
-	}
-
-	public $final = "Then, surprisingly, it worked the final time.";
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/sections/sections.mustache b/vendor/flexi/vendor/mustache.php/examples/sections/sections.mustache
deleted file mode 100644
index 44dfce4..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/sections/sections.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-* {{ start }}
-{{# middle }}
-* {{ item }}
-{{/ middle }}
-* {{ final }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/sections/sections.txt b/vendor/flexi/vendor/mustache.php/examples/sections/sections.txt
deleted file mode 100644
index e6b2d7a..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/sections/sections.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* It worked the first time.
-* And it worked the second time.
-* As well as the third.
-* Then, surprisingly, it worked the final time.
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/sections_nested/SectionsNested.php b/vendor/flexi/vendor/mustache.php/examples/sections_nested/SectionsNested.php
deleted file mode 100644
index ec01b75..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/sections_nested/SectionsNested.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-class SectionsNested extends Mustache {
-	public $name = 'Little Mac';
-
-	public function enemies() {
-		return array(
-			array(
-				'name' => 'Von Kaiser',
-				'enemies' => array(
-					array('name' => 'Super Macho Man'),
-					array('name' => 'Piston Honda'),
-					array('name' => 'Mr. Sandman'),
-				)
-			),
-			array(
-				'name' => 'Mike Tyson',
-				'enemies' => array(
-					array('name' => 'Soda Popinski'),
-					array('name' => 'King Hippo'),
-					array('name' => 'Great Tiger'),
-					array('name' => 'Glass Joe'),
-				)
-			),
-			array(
-				'name' => 'Don Flamenco',
-				'enemies' => array(
-					array('name' => 'Bald Bull'),
-				)
-			),
-		);
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.mustache b/vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.mustache
deleted file mode 100644
index 9f8007d..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-Enemies of {{ name }}:
-{{# enemies }}
-{{ name }} ... who also has enemies:
-{{# enemies }}
---> {{ name }}
-{{/ enemies }}
-{{/ enemies }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.txt b/vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.txt
deleted file mode 100644
index 72c44d0..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/sections_nested/sections_nested.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Enemies of Little Mac:
-Von Kaiser ... who also has enemies:
---> Super Macho Man
---> Piston Honda
---> Mr. Sandman
-Mike Tyson ... who also has enemies:
---> Soda Popinski
---> King Hippo
---> Great Tiger
---> Glass Joe
-Don Flamenco ... who also has enemies:
---> Bald Bull
diff --git a/vendor/flexi/vendor/mustache.php/examples/simple/Simple.php b/vendor/flexi/vendor/mustache.php/examples/simple/Simple.php
deleted file mode 100644
index 6d07dac..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/simple/Simple.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-class Simple extends Mustache {
-	public $name = "Chris";
-	public $value = 10000;
-
-	public function taxed_value() {
-		return $this->value - ($this->value * 0.4);
-	}
-
-	public $in_ca = true;
-};
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/simple/simple.mustache b/vendor/flexi/vendor/mustache.php/examples/simple/simple.mustache
deleted file mode 100644
index 03df206..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/simple/simple.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-Hello {{name}}
-You have just won ${{value}}!
-{{#in_ca}}
-Well, ${{ taxed_value }}, after taxes.
-{{/in_ca}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/simple/simple.txt b/vendor/flexi/vendor/mustache.php/examples/simple/simple.txt
deleted file mode 100644
index 5d75d65..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/simple/simple.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello Chris
-You have just won $10000!
-Well, $6000, after taxes.
diff --git a/vendor/flexi/vendor/mustache.php/examples/unescaped/Unescaped.php b/vendor/flexi/vendor/mustache.php/examples/unescaped/Unescaped.php
deleted file mode 100644
index 41b10cb..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/unescaped/Unescaped.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Unescaped extends Mustache {
-	public $title = "Bear > Shark";
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.mustache b/vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.mustache
deleted file mode 100644
index 9982708..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<h1>{{{title}}}</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.txt b/vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.txt
deleted file mode 100644
index 01fa404..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/unescaped/unescaped.txt
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Bear > Shark</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/utf8/UTF8.php b/vendor/flexi/vendor/mustache.php/examples/utf8/UTF8.php
deleted file mode 100644
index 7843f53..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/utf8/UTF8.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class UTF8Unescaped extends Mustache {
-	public $test = '中文又来啦';
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/utf8/utf8.mustache b/vendor/flexi/vendor/mustache.php/examples/utf8/utf8.mustache
deleted file mode 100644
index 6954d47..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/utf8/utf8.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<h1>中文 {{test}}</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/utf8/utf8.txt b/vendor/flexi/vendor/mustache.php/examples/utf8/utf8.txt
deleted file mode 100644
index bf17971..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/utf8/utf8.txt
+++ /dev/null
@@ -1 +0,0 @@
-<h1>中文 中文又来啦</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/UTF8Unescaped.php b/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/UTF8Unescaped.php
deleted file mode 100644
index d097cbe..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/UTF8Unescaped.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class UTF8 extends Mustache {
-	public $test = '中文又来啦';
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.mustache b/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.mustache
deleted file mode 100644
index fd7fe4b..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<h1>中文 {{{test}}}</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.txt b/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.txt
deleted file mode 100644
index bf17971..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/utf8_unescaped/utf8_unescaped.txt
+++ /dev/null
@@ -1 +0,0 @@
-<h1>中文 中文又来啦</h1>
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/whitespace/Whitespace.php b/vendor/flexi/vendor/mustache.php/examples/whitespace/Whitespace.php
deleted file mode 100644
index 3be9689..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/whitespace/Whitespace.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Whitespace test for tag names.
- *
- * Per http://github.com/janl/mustache.js/issues/issue/34/#comment_244396
- * tags should strip leading and trailing whitespace in key names.
- *
- * `{{> tag }}` and `{{> tag}}` and `{{>tag}}` should all be equivalent.
- *
- * @extends Mustache
- */
-class Whitespace extends Mustache {
-	public $foo = 'alpha';
-
-	public $bar = 'beta';
-
-	public function baz() {
-		return 'gamma';
-	}
-
-	public function qux() {
-		return array(
-			array('key with space' => 'A'),
-			array('key with space' => 'B'),
-			array('key with space' => 'C'),
-			array('key with space' => 'D'),
-			array('key with space' => 'E'),
-			array('key with space' => 'F'),
-			array('key with space' => 'G'),
-		);
-	}
-
-	protected $_partials = array(
-		'alphabet' => " * {{.}}\n",
-	);
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.mustache b/vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.mustache
deleted file mode 100644
index 0b3ba00..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.mustache
+++ /dev/null
@@ -1,10 +0,0 @@
-{{^ inverted section test }}
-These are some things:
-{{/inverted section test	}}
-* {{  foo  }}
-* {{ bar}}
-* {{    baz	}}
-{{#  qux		 }}
-* {{ key with space }}
-{{/ qux		}}
-{{#qux}}.{{/qux}}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.txt b/vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.txt
deleted file mode 100644
index 5226c69..0000000
--- a/vendor/flexi/vendor/mustache.php/examples/whitespace/whitespace.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-These are some things:
-* alpha
-* beta
-* gamma
-* A
-* B
-* C
-* D
-* E
-* F
-* G
-.......
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheCallTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheCallTest.php
deleted file mode 100644
index 366d2c4..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheCallTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-class MustacheCallTest extends PHPUnit_Framework_TestCase {
-
-	public function testCallEatsContext() {
-		$foo = new ClassWithCall();
-		$foo->name = 'Bob';
-
-		$template = '{{# foo }}{{ label }}: {{ name }}{{/ foo }}';
-		$data = array('label' => 'name', 'foo' => $foo);
-		$m = new Mustache($template, $data);
-
-		$this->assertEquals('name: Bob', $m->render());
-	}
-}
-
-class ClassWithCall {
-	public $name;
-	public function __call($method, $args) {
-		return 'unknown value';
-	}
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheExceptionTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheExceptionTest.php
deleted file mode 100644
index 2a40223..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheExceptionTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-class MustacheExceptionTest extends PHPUnit_Framework_TestCase {
-
-	const TEST_CLASS = 'Mustache';
-
-	protected $pickyMustache;
-	protected $slackerMustache;
-
-	public function setUp() {
-		$this->pickyMustache      = new PickyMustache();
-		$this->slackerMustache    = new SlackerMustache();
-	}
-
-	/**
-	 * @group interpolation
-	 * @expectedException MustacheException
-	 */
-	public function testThrowsUnknownVariableException() {
-		$this->pickyMustache->render('{{not_a_variable}}');
-	}
-
-	/**
-	 * @group sections
-	 * @expectedException MustacheException
-	 */
-	public function testThrowsUnclosedSectionException() {
-		$this->pickyMustache->render('{{#unclosed}}');
-	}
-
-	/**
-	 * @group sections
-	 * @expectedException MustacheException
-	 */
-	public function testThrowsUnclosedInvertedSectionException() {
-		$this->pickyMustache->render('{{^unclosed}}');
-	}
-
-	/**
-	 * @group sections
-	 * @expectedException MustacheException
-	 */
-	public function testThrowsUnexpectedCloseSectionException() {
-		$this->pickyMustache->render('{{/unopened}}');
-	}
-
-	/**
-	 * @group partials
-	 * @expectedException MustacheException
-	 */
-	public function testThrowsUnknownPartialException() {
-		$this->pickyMustache->render('{{>impartial}}');
-	}
-
-	/**
-	 * @group pragmas
-	 * @expectedException MustacheException
-	 */
-	public function testThrowsUnknownPragmaException() {
-		$this->pickyMustache->render('{{%SWEET-MUSTACHE-BRO}}');
-	}
-
-	/**
-	 * @group sections
-	 */
-	public function testDoesntThrowUnclosedSectionException() {
-		$this->assertEquals('', $this->slackerMustache->render('{{#unclosed}}'));
-	}
-
-	/**
-	 * @group sections
-	 */
-	public function testDoesntThrowUnexpectedCloseSectionException() {
-		$this->assertEquals('', $this->slackerMustache->render('{{/unopened}}'));
-	}
-
-	/**
-	 * @group partials
-	 */
-	public function testDoesntThrowUnknownPartialException() {
-		$this->assertEquals('', $this->slackerMustache->render('{{>impartial}}'));
-	}
-
-	/**
-	 * @group pragmas
-	 * @expectedException MustacheException
-	 */
-	public function testGetPragmaOptionsThrowsExceptionsIfItThinksYouHaveAPragmaButItTurnsOutYouDont() {
-		$mustache = new TestableMustache();
-		$mustache->testableGetPragmaOptions('PRAGMATIC');
-	}
-
-	public function testOverrideThrownExceptionsViaConstructorOptions() {
-		$exceptions = array(
-			MustacheException::UNKNOWN_VARIABLE,
-			MustacheException::UNCLOSED_SECTION,
-			MustacheException::UNEXPECTED_CLOSE_SECTION,
-			MustacheException::UNKNOWN_PARTIAL,
-			MustacheException::UNKNOWN_PRAGMA,
-		);
-
-		$one = new TestableMustache(null, null, null, array(
-			'throws_exceptions' => array_fill_keys($exceptions, true)
-		));
-
-		$thrownExceptions = $one->getThrownExceptions();
-		foreach ($exceptions as $exception) {
-			$this->assertTrue($thrownExceptions[$exception]);
-		}
-
-		$two = new TestableMustache(null, null, null, array(
-			'throws_exceptions' => array_fill_keys($exceptions, false)
-		));
-
-		$thrownExceptions = $two->getThrownExceptions();
-		foreach ($exceptions as $exception) {
-			$this->assertFalse($thrownExceptions[$exception]);
-		}
-	}
-}
-
-class PickyMustache extends Mustache {
-	protected $_throwsExceptions = array(
-		MustacheException::UNKNOWN_VARIABLE         => true,
-		MustacheException::UNCLOSED_SECTION         => true,
-		MustacheException::UNEXPECTED_CLOSE_SECTION => true,
-		MustacheException::UNKNOWN_PARTIAL          => true,
-		MustacheException::UNKNOWN_PRAGMA           => true,
-	);
-}
-
-class SlackerMustache extends Mustache {
-	protected $_throwsExceptions = array(
-		MustacheException::UNKNOWN_VARIABLE         => false,
-		MustacheException::UNCLOSED_SECTION         => false,
-		MustacheException::UNEXPECTED_CLOSE_SECTION => false,
-		MustacheException::UNKNOWN_PARTIAL          => false,
-		MustacheException::UNKNOWN_PRAGMA           => false,
-	);
-}
-
-class TestableMustache extends Mustache {
-	public function testableGetPragmaOptions($pragma_name) {
-		return $this->_getPragmaOptions($pragma_name);
-	}
-
-	public function getThrownExceptions() {
-		return $this->_throwsExceptions;
-	}
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheHigherOrderSectionsTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheHigherOrderSectionsTest.php
deleted file mode 100644
index 87e4142..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheHigherOrderSectionsTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-class MustacheHigherOrderSectionsTest extends PHPUnit_Framework_TestCase {
-
-	public function setUp() {
-		$this->foo = new Foo();
-	}
-
-	public function testAnonymousFunctionSectionCallback() {
-		if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-			$this->markTestSkipped('Unable to test anonymous function section callbacks in PHP < 5.3');
-			return;
-		}
-
-		$this->foo->wrapper = function($text) {
-			return sprintf('<div class="anonymous">%s</div>', $text);
-		};
-
-		$this->assertEquals(
-			sprintf('<div class="anonymous">%s</div>', $this->foo->name),
-			$this->foo->render('{{#wrapper}}{{name}}{{/wrapper}}')
-		);
-	}
-
-	public function testSectionCallback() {
-		$this->assertEquals(sprintf('%s', $this->foo->name), $this->foo->render('{{name}}'));
-		$this->assertEquals(sprintf('<em>%s</em>', $this->foo->name), $this->foo->render('{{#wrap}}{{name}}{{/wrap}}'));
-	}
-
-	public function testRuntimeSectionCallback() {
-		$this->foo->double_wrap = array($this->foo, 'wrapWithBoth');
-		$this->assertEquals(
-			sprintf('<strong><em>%s</em></strong>', $this->foo->name),
-			$this->foo->render('{{#double_wrap}}{{name}}{{/double_wrap}}')
-		);
-	}
-
-	public function testStaticSectionCallback() {
-		$this->foo->trimmer = array(get_class($this->foo), 'staticTrim');
-		$this->assertEquals($this->foo->name, $this->foo->render('{{#trimmer}}    {{name}}    {{/trimmer}}'));
-	}
-
-	public function testViewArraySectionCallback() {
-		$data = array(
-			'name' => 'Bob',
-			'trim' => array(get_class($this->foo), 'staticTrim'),
-		);
-		$this->assertEquals($data['name'], $this->foo->render('{{#trim}}    {{name}}    {{/trim}}', $data));
-	}
-
-	public function testViewArrayAnonymousSectionCallback() {
-		if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-			$this->markTestSkipped('Unable to test anonymous function section callbacks in PHP < 5.3');
-			return;
-		}
-		$data = array(
-			'name' => 'Bob',
-			'wrap' => function($text) {
-				return sprintf('[[%s]]', $text);
-			}
-		);
-		$this->assertEquals(
-			sprintf('[[%s]]', $data['name']),
-			$this->foo->render('{{#wrap}}{{name}}{{/wrap}}', $data)
-		);
-	}
-
-	public function testMonsters() {
-		$frank = new Monster();
-		$frank->title = 'Dr.';
-		$frank->name  = 'Frankenstein';
-		$this->assertEquals('Dr. Frankenstein', $frank->render());
-
-		$dracula = new Monster();
-		$dracula->title = 'Count';
-		$dracula->name  = 'Dracula';
-		$this->assertEquals('Count Dracula', $dracula->render());
-	}
-}
-
-class Foo extends Mustache {
-	public $name = 'Justin';
-	public $lorem = 'Lorem ipsum dolor sit amet,';
-	public $wrap;
-
-	public function __construct($template = null, $view = null, $partials = null) {
-		$this->wrap = array($this, 'wrapWithEm');
-		parent::__construct($template, $view, $partials);
-	}
-
-	public function wrapWithEm($text) {
-		return sprintf('<em>%s</em>', $text);
-	}
-
-	public function wrapWithStrong($text) {
-		return sprintf('<strong>%s</strong>', $text);
-	}
-
-	public function wrapWithBoth($text) {
-		return self::wrapWithStrong(self::wrapWithEm($text));
-	}
-
-	public static function staticTrim($text) {
-		return trim($text);
-	}
-}
-
-class Monster extends Mustache {
-	public $_template = '{{#title}}{{title}} {{/title}}{{name}}';
-	public $title;
-	public $name;
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheInjectionTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheInjectionTest.php
deleted file mode 100644
index de74943..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheInjectionTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-/**
- * @group mustache_injection
- */
-class MustacheInjectionSectionTest extends PHPUnit_Framework_TestCase {
-
-    // interpolation
-
-    public function testInterpolationInjection() {
-        $data = array(
-            'a' => '{{ b }}',
-            'b' => 'FAIL'
-        );
-        $template = '{{ a }}';
-        $output = '{{ b }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data));
-    }
-
-    public function testUnescapedInterpolationInjection() {
-        $data = array(
-            'a' => '{{ b }}',
-            'b' => 'FAIL'
-        );
-        $template = '{{{ a }}}';
-        $output = '{{ b }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data));
-    }
-
-
-    // sections
-
-    public function testSectionInjection() {
-        $data = array(
-            'a' => true,
-            'b' => '{{ c }}',
-            'c' => 'FAIL'
-        );
-        $template = '{{# a }}{{ b }}{{/ a }}';
-        $output = '{{ c }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data));
-    }
-
-    public function testUnescapedSectionInjection() {
-        $data = array(
-            'a' => true,
-            'b' => '{{ c }}',
-            'c' => 'FAIL'
-        );
-        $template = '{{# a }}{{{ b }}}{{/ a }}';
-        $output = '{{ c }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data));
-    }
-
-
-    // partials
-
-    public function testPartialInjection() {
-        $data = array(
-            'a' => '{{ b }}',
-            'b' => 'FAIL'
-        );
-        $template = '{{> partial }}';
-        $partials = array(
-            'partial' => '{{ a }}',
-        );
-        $output = '{{ b }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data, $partials));
-    }
-
-    public function testPartialUnescapedInjection() {
-        $data = array(
-            'a' => '{{ b }}',
-            'b' => 'FAIL'
-        );
-        $template = '{{> partial }}';
-        $partials = array(
-            'partial' => '{{{ a }}}',
-        );
-        $output = '{{ b }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data, $partials));
-    }
-
-
-    // lambdas
-
-    public function testLambdaInterpolationInjection() {
-        $data = array(
-            'a' => array($this, 'interpolationLambda'),
-            'b' => '{{ c }}',
-            'c' => 'FAIL'
-        );
-        $template = '{{ a }}';
-        $output = '{{ c }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data));
-    }
-
-    public function interpolationLambda() {
-        return '{{ b }}';
-    }
-
-    public function testLambdaSectionInjection() {
-        $data = array(
-            'a' => array($this, 'sectionLambda'),
-            'b' => '{{ c }}',
-            'c' => 'FAIL'
-        );
-        $template = '{{# a }}b{{/ a }}';
-        $output = '{{ c }}';
-        $m = new Mustache();
-        $this->assertEquals($output, $m->render($template, $data));
-    }
-
-    public function sectionLambda($content) {
-        return '{{ ' . $content . ' }}';
-    }
-
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheLoaderTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheLoaderTest.php
deleted file mode 100644
index 2674a0f..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheLoaderTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-require_once '../MustacheLoader.php';
-
-/**
- * @group loader
- */
-class MustacheLoaderTest extends PHPUnit_Framework_TestCase {
-
-	public function testTheActualFilesystemLoader() {
-		$loader = new MustacheLoader(dirname(__FILE__).'/fixtures');
-		$this->assertEquals(file_get_contents(dirname(__FILE__).'/fixtures/foo.mustache'), $loader['foo']);
-		$this->assertEquals(file_get_contents(dirname(__FILE__).'/fixtures/bar.mustache'), $loader['bar']);
-	}
-
-	public function testMustacheUsesFilesystemLoader() {
-		$template = '{{> foo }} {{> bar }}';
-		$data = array(
-			'truthy' => true,
-			'foo'    => 'FOO',
-			'bar'    => 'BAR',
-		);
-		$output = 'FOO BAR';
-		$m = new Mustache();
-		$partials = new MustacheLoader(dirname(__FILE__).'/fixtures');
-		$this->assertEquals($output, $m->render($template, $data, $partials));
-	}
-
-	public function testMustacheUsesDifferentLoadersToo() {
-		$template = '{{> foo }} {{> bar }}';
-		$data = array(
-			'truthy' => true,
-			'foo'    => 'FOO',
-			'bar'    => 'BAR',
-		);
-		$output = 'FOO BAR';
-		$m = new Mustache();
-		$partials = new DifferentMustacheLoader();
-		$this->assertEquals($output, $m->render($template, $data, $partials));
-	}
-}
-
-class DifferentMustacheLoader implements ArrayAccess {
-	protected $partials = array(
-		'foo' => '{{ foo }}',
-		'bar' => '{{# truthy }}{{ bar }}{{/ truthy }}',
-	);
-
-	public function offsetExists($offset) {
-		return isset($this->partials[$offset]);
-	}
-
-	public function offsetGet($offset) {
-		return $this->partials[$offset];
-	}
-
-	public function offsetSet($offset, $value) {}
-	public function offsetUnset($offset) {}
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheObjectSectionTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheObjectSectionTest.php
deleted file mode 100644
index 82405d6..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheObjectSectionTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-/**
- * @group sections
- */
-class MustacheObjectSectionTest extends PHPUnit_Framework_TestCase {
-	public function testBasicObject() {
-		$alpha = new Alpha();
-		$this->assertEquals('Foo', $alpha->render('{{#foo}}{{name}}{{/foo}}'));
-	}
-
-	public function testObjectWithGet() {
-		$beta = new Beta();
-		$this->assertEquals('Foo', $beta->render('{{#foo}}{{name}}{{/foo}}'));
-	}
-
-	public function testSectionObjectWithGet() {
-		$gamma = new Gamma();
-		$this->assertEquals('Foo', $gamma->render('{{#bar}}{{#foo}}{{name}}{{/foo}}{{/bar}}'));
-	}
-
-	public function testSectionObjectWithFunction() {
-		$alpha = new Alpha();
-		$alpha->foo = new Delta();
-		$this->assertEquals('Foo', $alpha->render('{{#foo}}{{name}}{{/foo}}'));
-	}
-}
-
-class Alpha extends Mustache {
-	public $foo;
-
-	public function __construct() {
-		$this->foo = new StdClass();
-		$this->foo->name = 'Foo';
-		$this->foo->number = 1;
-	}
-}
-
-class Beta extends Mustache {
-	protected $_data = array();
-
-	public function __construct() {
-		$this->_data['foo'] = new StdClass();
-		$this->_data['foo']->name = 'Foo';
-		$this->_data['foo']->number = 1;
-	}
-
-	public function __isset($name) {
-		return array_key_exists($name, $this->_data);
-	}
-
-	public function __get($name) {
-		return $this->_data[$name];
-	}
-}
-
-class Gamma extends Mustache {
-	public $bar;
-
-	public function __construct() {
-		$this->bar = new Beta();
-	}
-}
-
-class Delta extends Mustache {
-	protected $_name = 'Foo';
-
-	public function name() {
-		return $this->_name;
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustachePragmaTest.php b/vendor/flexi/vendor/mustache.php/test/MustachePragmaTest.php
deleted file mode 100644
index c00441c..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustachePragmaTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-/**
- * @group pragmas
- */
-class MustachePragmaTest extends PHPUnit_Framework_TestCase {
-
-	public function testUnknownPragmaException() {
-		$m = new Mustache();
-
-		try {
-			$m->render('{{%I-HAVE-THE-GREATEST-MUSTACHE}}');
-		} catch (MustacheException $e) {
-			$this->assertEquals(MustacheException::UNKNOWN_PRAGMA, $e->getCode(), 'Caught exception code was not MustacheException::UNKNOWN_PRAGMA');
-			return;
-		}
-
-		$this->fail('Mustache should have thrown an unknown pragma exception');
-	}
-
-	public function testSuppressUnknownPragmaException() {
-		$m = new LessWhinyMustache();
-
-		try {
-			$this->assertEquals('', $m->render('{{%I-HAVE-THE-GREATEST-MUSTACHE}}'));
-		} catch (MustacheException $e) {
-			if ($e->getCode() == MustacheException::UNKNOWN_PRAGMA) {
-				$this->fail('Mustache should have thrown an unknown pragma exception');
-			} else {
-				throw $e;
-			}
-		}
-	}
-
-	public function testPragmaReplace() {
-		$m = new Mustache();
-		$this->assertEquals('', $m->render('{{%UNESCAPED}}'), 'Pragma tag not removed');
-	}
-
-	public function testPragmaReplaceMultiple() {
-		$m = new Mustache();
-
-		$this->assertEquals('', $m->render('{{%  UNESCAPED  }}'), 'Pragmas should allow whitespace');
-		$this->assertEquals('', $m->render('{{% 	UNESCAPED 	foo=bar  }}'), 'Pragmas should allow whitespace');
-		$this->assertEquals('', $m->render("{{%UNESCAPED}}\n{{%UNESCAPED}}"), 'Multiple pragma tags not removed');
-		$this->assertEquals(' ', $m->render('{{%UNESCAPED}} {{%UNESCAPED}}'), 'Multiple pragma tags not removed');
-	}
-
-	public function testPragmaReplaceNewline() {
-		$m = new Mustache();
-		$this->assertEquals('', $m->render("{{%UNESCAPED}}\n"), 'Trailing newline after pragma tag not removed');
-		$this->assertEquals("\n", $m->render("\n{{%UNESCAPED}}\n"), 'Too many newlines removed with pragma tag');
-		$this->assertEquals("1\n23", $m->render("1\n2{{%UNESCAPED}}\n3"), 'Wrong newline removed with pragma tag');
-	}
-
-	public function testPragmaReset() {
-		$m = new Mustache('', array('symbol' => '>>>'));
-		$this->assertEquals('>>>', $m->render('{{{symbol}}}'));
-		$this->assertEquals('>>>', $m->render('{{%UNESCAPED}}{{symbol}}'));
-		$this->assertEquals('>>>', $m->render('{{{symbol}}}'));
-	}
-}
-
-class LessWhinyMustache extends Mustache {
-	protected $_throwsExceptions = array(
-		MustacheException::UNKNOWN_VARIABLE         => false,
-		MustacheException::UNCLOSED_SECTION         => true,
-		MustacheException::UNEXPECTED_CLOSE_SECTION => true,
-		MustacheException::UNKNOWN_PARTIAL          => false,
-		MustacheException::UNKNOWN_PRAGMA           => false,
-	);
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustachePragmaUnescapedTest.php b/vendor/flexi/vendor/mustache.php/test/MustachePragmaUnescapedTest.php
deleted file mode 100644
index df6d94c..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustachePragmaUnescapedTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-/**
- * @group pragmas
- */
-class MustachePragmaUnescapedTest extends PHPUnit_Framework_TestCase {
-
-	public function testPragmaUnescaped() {
-		$m = new Mustache(null, array('title' => 'Bear > Shark'));
-		
-		$this->assertEquals('Bear > Shark', $m->render('{{%UNESCAPED}}{{title}}'));
-		$this->assertEquals('Bear &gt; Shark', $m->render('{{title}}'));
-		$this->assertEquals('Bear &gt; Shark', $m->render('{{%UNESCAPED}}{{{title}}}'));
-		$this->assertEquals('Bear > Shark', $m->render('{{{title}}}'));
-	}
-
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheSpecTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheSpecTest.php
deleted file mode 100644
index d3a3413..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheSpecTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-require_once './lib/yaml/lib/sfYamlParser.php';
-
-/**
- * A PHPUnit test case wrapping the Mustache Spec
- *
- * @group mustache-spec
- */
-class MustacheSpecTest extends PHPUnit_Framework_TestCase {
-
-	/**
-	 * For some reason data providers can't mark tests skipped, so this test exists
-	 * simply to provide a 'skipped' test if the `spec` submodule isn't initialized.
-	 */
-	public function testSpecInitialized() {
-		$spec_dir = dirname(__FILE__) . '/spec/specs/';
-		if (!file_exists($spec_dir)) {
-			$this->markTestSkipped('Mustache spec submodule not initialized: run "git submodule update --init"');
-		}
-	}
-
-	/**
-	 * @group comments
-	 * @dataProvider loadCommentSpec
-	 */
-	public function testCommentSpec($desc, $template, $data, $partials, $expected) {
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	/**
-	 * @group delimiters
-	 * @dataProvider loadDelimitersSpec
-	 */
-	public function testDelimitersSpec($desc, $template, $data, $partials, $expected) {
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	/**
-	 * @group interpolation
-	 * @dataProvider loadInterpolationSpec
-	 */
-	public function testInterpolationSpec($desc, $template, $data, $partials, $expected) {
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	/**
-	 * @group inverted-sections
-	 * @dataProvider loadInvertedSpec
-	 */
-	public function testInvertedSpec($desc, $template, $data, $partials, $expected) {
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	/**
-	 * @group lambdas
-	 * @dataProvider loadLambdasSpec
-	 */
-	public function testLambdasSpec($desc, $template, $data, $partials, $expected) {
-		if (!version_compare(PHP_VERSION, '5.3.0', '>=')) {
-			$this->markTestSkipped('Unable to test Lambdas spec with PHP < 5.3.');
-		}
-
-		$data = $this->prepareLambdasSpec($data);
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	/**
-	 * Extract and lambdafy any 'lambda' values found in the $data array.
-	 */
-	protected function prepareLambdasSpec($data) {
-		foreach ($data as $key => $val) {
-			if ($key === 'lambda') {
-				if (!isset($val['php'])) {
-					$this->markTestSkipped(sprintf('PHP lambda test not implemented for this test.'));
-				}
-
-				$func = $val['php'];
-				$data[$key] = function($text = null) use ($func) { return eval($func); };
-			} else if (is_array($val)) {
-				$data[$key] = $this->prepareLambdasSpec($val);
-			}
-		}
-		return $data;
-	}
-
-	/**
-	 * @group partials
-	 * @dataProvider loadPartialsSpec
-	 */
-	public function testPartialsSpec($desc, $template, $data, $partials, $expected) {
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	/**
-	 * @group sections
-	 * @dataProvider loadSectionsSpec
-	 */
-	public function testSectionsSpec($desc, $template, $data, $partials, $expected) {
-		$m = new Mustache($template, $data, $partials);
-		$this->assertEquals($expected, $m->render(), $desc);
-	}
-
-	public function loadCommentSpec() {
-		return $this->loadSpec('comments');
-	}
-
-	public function loadDelimitersSpec() {
-		return $this->loadSpec('delimiters');
-	}
-
-	public function loadInterpolationSpec() {
-		return $this->loadSpec('interpolation');
-	}
-
-	public function loadInvertedSpec() {
-		return $this->loadSpec('inverted');
-	}
-
-	public function loadLambdasSpec() {
-		return $this->loadSpec('~lambdas');
-	}
-
-	public function loadPartialsSpec() {
-		return $this->loadSpec('partials');
-	}
-
-	public function loadSectionsSpec() {
-		return $this->loadSpec('sections');
-	}
-
-	/**
-	 * Data provider for the mustache spec test.
-	 *
-	 * Loads YAML files from the spec and converts them to PHPisms.
-	 *
-	 * @access public
-	 * @return array
-	 */
-	protected function loadSpec($name) {
-		$filename = dirname(__FILE__) . '/spec/specs/' . $name . '.yml';
-		if (!file_exists($filename)) {
-			return array();
-		}
-
-		$data = array();
-		$yaml = new sfYamlParser();
-		$file = file_get_contents($filename);
-
-		// @hack: pre-process the 'lambdas' spec so the Symfony YAML parser doesn't complain.
-		if ($name === '~lambdas') {
-			$file = str_replace(" !code\n", "\n", $file);
-		}
-
-		$spec = $yaml->parse($file);
-		foreach ($spec['tests'] as $test) {
-			$data[] = array(
-				$test['name'] . ': ' . $test['desc'],
-				$test['template'],
-				$test['data'],
-				isset($test['partials']) ? $test['partials'] : array(),
-				$test['expected'],
-			);
-		}
-		return $data;
-	}
-}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/MustacheTest.php b/vendor/flexi/vendor/mustache.php/test/MustacheTest.php
deleted file mode 100644
index 0c0bb13..0000000
--- a/vendor/flexi/vendor/mustache.php/test/MustacheTest.php
+++ /dev/null
@@ -1,464 +0,0 @@
-<?php
-
-require_once '../Mustache.php';
-
-/**
- * A PHPUnit test case for Mustache.php.
- *
- * This is a very basic, very rudimentary unit test case. It's probably more important to have tests
- * than to have elegant tests, so let's bear with it for a bit.
- *
- * This class assumes an example directory exists at `../examples` with the following structure:
- *
- * @code
- *    examples
- *        foo
- *            Foo.php
- *            foo.mustache
- *            foo.txt
- *        bar
- *            Bar.php
- *            bar.mustache
- *            bar.txt
- * @endcode
- *
- * To use this test:
- *
- *  1. {@link http://www.phpunit.de/manual/current/en/installation.html Install PHPUnit}
- *  2. run phpunit from the `test` directory:
- *        `phpunit MustacheTest`
- *  3. Fix bugs. Lather, rinse, repeat.
- *
- * @extends PHPUnit_Framework_TestCase
- */
-class MustacheTest extends PHPUnit_Framework_TestCase {
-
-	const TEST_CLASS = 'Mustache';
-
-	protected $knownIssues = array(
-		// Just the whitespace ones...
-	);
-
-	/**
-	 * Test Mustache constructor.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function test__construct() {
-		$template = '{{#mustaches}}{{#last}}and {{/last}}{{type}}{{^last}}, {{/last}}{{/mustaches}}';
-		$data     = array(
-			'mustaches' => array(
-				array('type' => 'Natural'),
-				array('type' => 'Hungarian'),
-				array('type' => 'Dali'),
-				array('type' => 'English'),
-				array('type' => 'Imperial'),
-				array('type' => 'Freestyle', 'last' => 'true'),
-			)
-		);
-		$output = 'Natural, Hungarian, Dali, English, Imperial, and Freestyle';
-
-		$m1 = new Mustache();
-		$this->assertEquals($output, $m1->render($template, $data));
-
-		$m2 = new Mustache($template);
-		$this->assertEquals($output, $m2->render(null, $data));
-
-		$m3 = new Mustache($template, $data);
-		$this->assertEquals($output, $m3->render());
-
-		$m4 = new Mustache(null, $data);
-		$this->assertEquals($output, $m4->render($template));
-	}
-
-	/**
-	 * @dataProvider constructorOptions
-	 */
-	public function testConstructorOptions($options, $charset, $delimiters, $pragmas) {
-		$mustache = new MustacheExposedOptionsStub(null, null, null, $options);
-		$this->assertEquals($charset,    $mustache->getCharset());
-		$this->assertEquals($delimiters, $mustache->getDelimiters());
-		$this->assertEquals($pragmas,    $mustache->getPragmas());
-	}
-
-	public function constructorOptions() {
-		return array(
-			array(
-				array(),
-				'UTF-8',
-				array('{{', '}}'),
-				array(),
-			),
-			array(
-				array(
-					'charset'    => 'UTF-8',
-					'delimiters' => '<< >>',
-					'pragmas'    => array(Mustache::PRAGMA_UNESCAPED => true)
-				),
-				'UTF-8',
-				array('<<', '>>'),
-				array(Mustache::PRAGMA_UNESCAPED => true),
-			),
-			array(
-				array(
-					'charset'    => 'cp866',
-					'delimiters' => array('[[[[', ']]]]'),
-					'pragmas'    => array(Mustache::PRAGMA_UNESCAPED => true)
-				),
-				'cp866',
-				array('[[[[', ']]]]'),
-				array(Mustache::PRAGMA_UNESCAPED => true),
-			),
-		);
-	}
-
-	/**
-	 * @expectedException MustacheException
-	 */
-	public function testConstructorInvalidPragmaOptionsThrowExceptions() {
-		$mustache = new Mustache(null, null, null, array('pragmas' => array('banana phone' => true)));
-	}
-
-	/**
-	 * Test __toString() function.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function test__toString() {
-		$m = new Mustache('{{first_name}} {{last_name}}', array('first_name' => 'Karl', 'last_name' => 'Marx'));
-
-		$this->assertEquals('Karl Marx', $m->__toString());
-		$this->assertEquals('Karl Marx', (string) $m);
-
-		$m2 = $this->getMock(self::TEST_CLASS, array('render'), array());
-		$m2->expects($this->once())
-			->method('render')
-			->will($this->returnValue('foo'));
-
-		$this->assertEquals('foo', $m2->render());
-	}
-
-	public function test__toStringException() {
-		$m = $this->getMock(self::TEST_CLASS, array('render'), array());
-		$m->expects($this->once())
-			->method('render')
-			->will($this->throwException(new Exception));
-
-		try {
-			$out = (string) $m;
-		} catch (Exception $e) {
-			$this->fail('__toString should catch all exceptions');
-		}
-	}
-
-	/**
-	 * Test render().
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function testRender() {
-		$m = new Mustache();
-
-		$this->assertEquals('', $m->render(''));
-		$this->assertEquals('foo', $m->render('foo'));
-		$this->assertEquals('', $m->render(null));
-
-		$m2 = new Mustache('foo');
-		$this->assertEquals('foo', $m2->render());
-
-		$m3 = new Mustache('');
-		$this->assertEquals('', $m3->render());
-
-		$m3 = new Mustache();
-		$this->assertEquals('', $m3->render(null));
-	}
-
-	/**
-	 * Test render() with data.
-	 *
-	 * @group interpolation
-	 */
-	public function testRenderWithData() {
-		$m = new Mustache('{{first_name}} {{last_name}}');
-		$this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin')));
-		$this->assertEquals('Zappa, Frank', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa')));
-	}
-
-	/**
-	 * @group partials
-	 */
-	public function testRenderWithPartials() {
-		$m = new Mustache('{{>stache}}', null, array('stache' => '{{first_name}} {{last_name}}'));
-		$this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin')));
-		$this->assertEquals('Zappa, Frank', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa')));
-	}
-
-	/**
-	 * @group interpolation
-	 * @dataProvider interpolationData
-	 */
-	public function testDoubleRenderMustacheTags($template, $context, $expected) {
-		$m = new Mustache($template, $context);
-		$this->assertEquals($expected, $m->render());
-	}
-
-	public function interpolationData() {
-		return array(
-			array(
-				'{{#a}}{{=<% %>=}}{{b}} c<%={{ }}=%>{{/a}}',
-				array('a' => array(array('b' => 'Do Not Render'))),
-				'{{b}} c'
-			),
-			array(
-				'{{#a}}{{b}}{{/a}}',
-				array('a' => array('b' => '{{c}}'), 'c' => 'FAIL'),
-				'{{c}}'
-			),
-		);
-	}
-
-	/**
-	 * Mustache should allow newlines (and other whitespace) in comments and all other tags.
-	 *
-	 * @group comments
-	 */
-	public function testNewlinesInComments() {
-		$m = new Mustache("{{! comment \n \t still a comment... }}");
-		$this->assertEquals('', $m->render());
-	}
-
-	/**
-	 * Mustache should return the same thing when invoked multiple times.
-	 */
-	public function testMultipleInvocations() {
-		$m = new Mustache('x');
-		$first = $m->render();
-		$second = $m->render();
-
-		$this->assertEquals('x', $first);
-		$this->assertEquals($first, $second);
-	}
-
-	/**
-	 * Mustache should return the same thing when invoked multiple times.
-	 *
-	 * @group interpolation
-	 */
-	public function testMultipleInvocationsWithTags() {
-		$m = new Mustache('{{one}} {{two}}', array('one' => 'foo', 'two' => 'bar'));
-		$first = $m->render();
-		$second = $m->render();
-
-		$this->assertEquals('foo bar', $first);
-		$this->assertEquals($first, $second);
-	}
-
-	/**
-	 * Mustache should not use templates passed to the render() method for subsequent invocations.
-	 */
-	public function testResetTemplateForMultipleInvocations() {
-		$m = new Mustache('Sirve.');
-		$this->assertEquals('No sirve.', $m->render('No sirve.'));
-		$this->assertEquals('Sirve.', $m->render());
-
-		$m2 = new Mustache();
-		$this->assertEquals('No sirve.', $m2->render('No sirve.'));
-		$this->assertEquals('', $m2->render());
-	}
-
-	/**
-	 * Test the __clone() magic function.
-	 *
-	 * @group examples
-	 * @dataProvider getExamples
-	 *
-	 * @param string $class
-	 * @param string $template
-	 * @param string $output
-	 */
-	public function test__clone($class, $template, $output) {
-		if (isset($this->knownIssues[$class])) {
-			return $this->markTestSkipped($this->knownIssues[$class]);
-		}
-
-		$m = new $class;
-		$n = clone $m;
-
-		$n_output = $n->render($template);
-
-		$o = clone $n;
-
-		$this->assertEquals($m->render($template), $n_output);
-		$this->assertEquals($n_output, $o->render($template));
-
-		$this->assertNotSame($m, $n);
-		$this->assertNotSame($n, $o);
-		$this->assertNotSame($m, $o);
-	}
-
-	/**
-	 * Test everything in the `examples` directory.
-	 *
-	 * @group examples
-	 * @dataProvider getExamples
-	 *
-	 * @param string $class
-	 * @param string $template
-	 * @param string $output
-	 */
-	public function testExamples($class, $template, $output) {
-		if (isset($this->knownIssues[$class])) {
-			return $this->markTestSkipped($this->knownIssues[$class]);
-		}
-
-		$m = new $class;
-		$this->assertEquals($output, $m->render($template));
-	}
-
-	/**
-	 * Data provider for testExamples method.
-	 *
-	 * Assumes that an `examples` directory exists inside parent directory.
-	 * This examples directory should contain any number of subdirectories, each of which contains
-	 * three files: one Mustache class (.php), one Mustache template (.mustache), and one output file
-	 * (.txt).
-	 *
-	 * This whole mess will be refined later to be more intuitive and less prescriptive, but it'll
-	 * do for now. Especially since it means we can have unit tests :)
-	 *
-	 * @return array
-	 */
-	public function getExamples() {
-		$basedir = dirname(__FILE__) . '/../examples/';
-
-		$ret = array();
-
-		$files = new RecursiveDirectoryIterator($basedir);
-		while ($files->valid()) {
-
-			if ($files->hasChildren() && $children = $files->getChildren()) {
-				$example  = $files->getSubPathname();
-				$class    = null;
-				$template = null;
-				$output   = null;
-
-				foreach ($children as $file) {
-					if (!$file->isFile()) continue;
-
-					$filename = $file->getPathname();
-					$info = pathinfo($filename);
-
-					if (isset($info['extension'])) {
-						switch($info['extension']) {
-							case 'php':
-								$class = $info['filename'];
-								include_once($filename);
-								break;
-
-							case 'mustache':
-								$template = file_get_contents($filename);
-								break;
-
-							case 'txt':
-								$output = file_get_contents($filename);
-								break;
-						}
-					}
-				}
-
-				if (!empty($class)) {
-					$ret[$example] = array($class, $template, $output);
-				}
-			}
-
-			$files->next();
-		}
-		return $ret;
-	}
-
-	/**
-	 * @group delimiters
-	 */
-	public function testCrazyDelimiters() {
-		$m = new Mustache(null, array('result' => 'success'));
-		$this->assertEquals('success', $m->render('{{=[[ ]]=}}[[ result ]]'));
-		$this->assertEquals('success', $m->render('{{=(( ))=}}(( result ))'));
-		$this->assertEquals('success', $m->render('{{={$ $}=}}{$ result $}'));
-		$this->assertEquals('success', $m->render('{{=<.. ..>=}}<.. result ..>'));
-		$this->assertEquals('success', $m->render('{{=^^ ^^}}^^ result ^^'));
-		$this->assertEquals('success', $m->render('{{=// \\\\}}// result \\\\'));
-	}
-
-	/**
-	 * @group delimiters
-	 */
-	public function testResetDelimiters() {
-		$m = new Mustache(null, array('result' => 'success'));
-		$this->assertEquals('success', $m->render('{{=[[ ]]=}}[[ result ]]'));
-		$this->assertEquals('success', $m->render('{{=<< >>=}}<< result >>'));
-		$this->assertEquals('success', $m->render('{{=<% %>=}}<% result %>'));
-	}
-
-	/**
-	 * @group delimiters
-	 */
-	public function testStickyDelimiters() {
-		$m = new Mustache(null, array('result' => 'FAIL'));
-		$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}{{ result }}[[={{ }}=]]'));
-		$this->assertEquals('{{#result}}{{/result}}', $m->render('{{=[[ ]]=}}{{#result}}{{/result}}[[={{ }}=]]'));
-		$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]][[={{ }}=]]'));
-		$this->assertEquals('{{ result }}', $m->render('{{#result}}{{=[[ ]]=}}{{ result }}[[/result]][[^result]][[={{ }}=]][[ result ]]{{/result}}'));
-	}
-
-	/**
-	 * @group sections
-	 * @dataProvider poorlyNestedSections
-	 * @expectedException MustacheException
-	 */
-	public function testPoorlyNestedSections($template) {
-		$m = new Mustache($template);
-		$m->render();
-	}
-
-	public function poorlyNestedSections() {
-		return array(
-			array('{{#foo}}'),
-			array('{{#foo}}{{/bar}}'),
-			array('{{#foo}}{{#bar}}{{/foo}}'),
-			array('{{#foo}}{{#bar}}{{/foo}}{{/bar}}'),
-			array('{{#foo}}{{/bar}}{{/foo}}'),
-		);
-	}
-
-	/**
-	 * Ensure that Mustache doesn't double-render sections (allowing mustache injection).
-	 *
-	 * @group sections
-	 */
-	public function testMustacheInjection() {
-		$template = '{{#foo}}{{bar}}{{/foo}}';
-		$view = array(
-			'foo' => true,
-			'bar' => '{{win}}',
-			'win' => 'FAIL',
-		);
-
-		$m = new Mustache($template, $view);
-		$this->assertEquals('{{win}}', $m->render());
-	}
-}
-
-class MustacheExposedOptionsStub extends Mustache {
-	public function getPragmas() {
-		return $this->_pragmas;
-	}
-	public function getCharset() {
-		return $this->_charset;
-	}
-	public function getDelimiters() {
-		return array($this->_otag, $this->_ctag);
-	}
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/fixtures/bar.mustache b/vendor/flexi/vendor/mustache.php/test/fixtures/bar.mustache
deleted file mode 100644
index 139594d..0000000
--- a/vendor/flexi/vendor/mustache.php/test/fixtures/bar.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{# truthy }}{{ bar }}{{/ truthy }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/fixtures/foo.mustache b/vendor/flexi/vendor/mustache.php/test/fixtures/foo.mustache
deleted file mode 100644
index 008c714..0000000
--- a/vendor/flexi/vendor/mustache.php/test/fixtures/foo.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{ foo }}
\ No newline at end of file
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/LICENSE b/vendor/flexi/vendor/mustache.php/test/lib/yaml/LICENSE
deleted file mode 100644
index 3cef853..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2008-2009 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/README.markdown b/vendor/flexi/vendor/mustache.php/test/lib/yaml/README.markdown
deleted file mode 100644
index e4f80cf..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/README.markdown
+++ /dev/null
@@ -1,15 +0,0 @@
-Symfony YAML: A PHP library that speaks YAML
-============================================
-
-Symfony YAML is a PHP library that parses YAML strings and converts them to
-PHP arrays. It can also converts PHP arrays to YAML strings. Its official
-website is at http://components.symfony-project.org/yaml/.
-
-The documentation is to be found in the `doc/` directory.
-
-Symfony YAML is licensed under the MIT license (see LICENSE file).
-
-The Symfony YAML library is developed and maintained by the
-[symfony](http://www.symfony-project.org/) project team. It has been extracted
-from symfony to be used as a standalone library. Symfony YAML is part of the
-[symfony components project](http://components.symfony-project.org/).
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/00-Introduction.markdown b/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/00-Introduction.markdown
deleted file mode 100644
index e592758..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/00-Introduction.markdown
+++ /dev/null
@@ -1,143 +0,0 @@
-Introduction
-============
-
-This book is about *Symfony YAML*, a PHP library part of the Symfony
-Components project. Its official website is at
-http://components.symfony-project.org/yaml/.
-
->**SIDEBAR**
->About the Symfony Components
->
->[Symfony Components](http://components.symfony-project.org/) are
->standalone PHP classes that can be easily used in any
->PHP project. Most of the time, they have been developed as part of the
->[Symfony framework](http://www.symfony-project.org/), and decoupled from the
->main framework later on. You don't need to use the Symfony MVC framework to use
->the components.
-
-What is it?
------------
-
-Symfony YAML is a PHP library that parses YAML strings and converts them to
-PHP arrays. It can also converts PHP arrays to YAML strings.
-
-[YAML](http://www.yaml.org/), YAML Ain't Markup Language, is a human friendly
-data serialization standard for all programming languages. YAML is a great
-format for your configuration files. YAML files are as expressive as XML files
-and as readable as INI files.
-
-### Easy to use
-
-There is only one archive to download, and you are ready to go. No
-configuration, No installation. Drop the files in a directory and start using
-it today in your projects.
-
-### Open-Source
-
-Released under the MIT license, you are free to do whatever you want, even in
-a commercial environment. You are also encouraged to contribute.
-
-
-### Used by popular Projects
-
-Symfony YAML was initially released as part of the symfony framework, one of
-the most popular PHP web framework. It is also embedded in other popular
-projects like PHPUnit or Doctrine.
-
-### Documented
-
-Symfony YAML is fully documented, with a dedicated online book, and of course
-a full API documentation.
-
-### Fast
-
-One of the goal of Symfony YAML is to find the right balance between speed and
-features. It supports just the needed feature to handle configuration files.
-
-### Unit tested
-
-The library is fully unit-tested. With more than 400 unit tests, the library
-is stable and is already used in large projects.
-
-### Real Parser
-
-It sports a real parser and is able to parse a large subset of the YAML
-specification, for all your configuration needs. It also means that the parser
-is pretty robust, easy to understand, and simple enough to extend.
-
-### Clear error messages
-
-Whenever you have a syntax problem with your YAML files, the library outputs a
-helpful message with the filename and the line number where the problem
-occurred. It eases the debugging a lot.
-
-### Dump support
-
-It is also able to dump PHP arrays to YAML with object support, and inline
-level configuration for pretty outputs.
-
-### Types Support
-
-It supports most of the YAML built-in types like dates, integers, octals,
-booleans, and much more...
-
-
-### Full merge key support
-
-Full support for references, aliases, and full merge key. Don't repeat
-yourself by referencing common configuration bits.
-
-### PHP Embedding
-
-YAML files are dynamic. By embedding PHP code inside a YAML file, you have
-even more power for your configuration files.
-
-Installation
-------------
-
-Symfony YAML can be installed by downloading the source code as a
-[tar](http://github.com/fabpot/yaml/tarball/master) archive or a
-[zip](http://github.com/fabpot/yaml/zipball/master) one.
-
-To stay up-to-date, you can also use the official Subversion
-[repository](http://svn.symfony-project.com/components/yaml/).
-
-If you are a Git user, there is an official
-[mirror](http://github.com/fabpot/yaml), which is updated every 10 minutes.
-
-If you prefer to install the component globally on your machine, you can use
-the symfony [PEAR](http://pear.symfony-project.com/) channel server.
-
-Support
--------
-
-Support questions and enhancements can be discussed on the
-[mailing-list](http://groups.google.com/group/symfony-components).
-
-If you find a bug, you can create a ticket at the symfony
-[trac](http://trac.symfony-project.org/newticket) under the *YAML* component.
-
-License
--------
-
-The Symfony YAML component is licensed under the *MIT license*:
-
->Copyright (c) 2008-2009 Fabien Potencier
->
->Permission is hereby granted, free of charge, to any person obtaining a copy
->of this software and associated documentation files (the "Software"), to deal
->in the Software without restriction, including without limitation the rights
->to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
->copies of the Software, and to permit persons to whom the Software is furnished
->to do so, subject to the following conditions:
->
->The above copyright notice and this permission notice shall be included in all
->copies or substantial portions of the Software.
->
->THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
->IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
->FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
->AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
->LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
->OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
->THE SOFTWARE.
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/01-Usage.markdown b/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/01-Usage.markdown
deleted file mode 100644
index 644cf11..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/01-Usage.markdown
+++ /dev/null
@@ -1,110 +0,0 @@
-Using Symfony YAML
-==================
-
-The Symfony YAML library is very simple and consists of two main classes: one
-to parse YAML strings (`sfYamlParser`), and the other to dump a PHP array to
-a YAML string (`sfYamlDumper`).
-
-On top of these two core classes, the main `sfYaml` class acts as a thin
-wrapper and simplifies common uses.
-
-Reading YAML Files
-------------------
-
-The `sfYamlParser::parse()` method parses a YAML string and converts it to a
-PHP array:
-
-    [php]
-    $yaml = new sfYamlParser();
-    $value = $yaml->parse(file_get_contents('/path/to/file.yaml'));
-
-If an error occurs during parsing, the parser throws an exception indicating
-the error type and the line in the original YAML string where the error
-occurred:
-
-    [php]
-    try
-    {
-      $value = $yaml->parse(file_get_contents('/path/to/file.yaml'));
-    }
-    catch (InvalidArgumentException $e)
-    {
-      // an error occurred during parsing
-      echo "Unable to parse the YAML string: ".$e->getMessage();
-    }
-
->**TIP**
->As the parser is reentrant, you can use the same parser object to load
->different YAML strings.
-
-When loading a YAML file, it is sometimes better to use the `sfYaml::load()`
-wrapper method:
-
-    [php]
-    $loader = sfYaml::load('/path/to/file.yml');
-
-The `sfYaml::load()` static method takes a YAML string or a file containing
-YAML. Internally, it calls the `sfYamlParser::parse()` method, but with some
-added bonuses:
-
-  * It executes the YAML file as if it was a PHP file, so that you can embed
-    PHP commands in YAML files;
-
-  * When a file cannot be parsed, it automatically adds the file name to the
-    error message, simplifying debugging when your application is loading
-    several YAML files.
-
-Writing YAML Files
-------------------
-
-The `sfYamlDumper` dumps any PHP array to its YAML representation:
-
-    [php]
-    $array = array('foo' => 'bar', 'bar' => array('foo' => 'bar', 'bar' => 'baz'));
-
-    $dumper = new sfYamlDumper();
-    $yaml = $dumper->dump($array);
-    file_put_contents('/path/to/file.yaml', $yaml);
-
->**NOTE**
->Of course, the Symfony YAML dumper is not able to dump resources. Also,
->even if the dumper is able to dump PHP objects, it is to be considered
->an alpha feature.
-
-If you only need to dump one array, you can use the `sfYaml::dump()` static
-method shortcut:
-
-    [php]
-    $yaml = sfYaml::dump($array, $inline);
-
-The YAML format supports two kind of representation for arrays, the expanded
-one, and the inline one. By default, the dumper uses the inline
-representation:
-
-    [yml]
-    { foo: bar, bar: { foo: bar, bar: baz } }
-
-The second argument of the `dump()` method customizes the level at which the
-output switches from the expanded representation to the inline one:
-
-    [php]
-    echo $dumper->dump($array, 1);
-
--
-
-    [yml]
-    foo: bar
-    bar: { foo: bar, bar: baz }
-
--
-
-    [php]
-    echo $dumper->dump($array, 2);
-
--
-
-    [yml]
-    foo: bar
-    bar:
-      foo: bar
-      bar: baz
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/02-YAML.markdown b/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/02-YAML.markdown
deleted file mode 100644
index a64c19e..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/02-YAML.markdown
+++ /dev/null
@@ -1,312 +0,0 @@
-The YAML Format
-===============
-
-According to the official [YAML](http://yaml.org/) website, YAML is "a human
-friendly data serialization standard for all programming languages".
-
-Even if the YAML format can describe complex nested data structure, this
-chapter only describes the minimum set of features needed to use YAML as a
-configuration file format.
-
-YAML is a simple language that describes data. As PHP, it has a syntax for
-simple types like strings, booleans, floats, or integers. But unlike PHP, it
-makes a difference between arrays (sequences) and hashes (mappings).
-
-Scalars
--------
-
-The syntax for scalars is similar to the PHP syntax.
-
-### Strings
-
-    [yml]
-    A string in YAML
-
--
-
-    [yml]
-    'A singled-quoted string in YAML'
-
->**TIP**
->In a single quoted string, a single quote `'` must be doubled:
->
->     [yml]
->     'A single quote '' in a single-quoted string'
-
-    [yml]
-    "A double-quoted string in YAML\n"
-
-Quoted styles are useful when a string starts or ends with one or more
-relevant spaces.
-
->**TIP**
->The double-quoted style provides a way to express arbitrary strings, by
->using `\` escape sequences. It is very useful when you need to embed a
->`\n` or a unicode character in a string.
-
-When a string contains line breaks, you can use the literal style, indicated
-by the pipe (`|`), to indicate that the string will span several lines. In
-literals, newlines are preserved:
-
-    [yml]
-    |
-      \/ /| |\/| |
-      / / | |  | |__
-
-Alternatively, strings can be written with the folded style, denoted by `>`,
-where each line break is replaced by a space:
-
-    [yml]
-    >
-      This is a very long sentence
-      that spans several lines in the YAML
-      but which will be rendered as a string
-      without carriage returns.
-
->**NOTE**
->Notice the two spaces before each line in the previous examples. They
->won't appear in the resulting PHP strings.
-
-### Numbers
-
-    [yml]
-    # an integer
-    12
-
--
-
-    [yml]
-    # an octal
-    014
-
--
-
-    [yml]
-    # an hexadecimal
-    0xC
-
--
-
-    [yml]
-    # a float
-    13.4
-
--
-
-    [yml]
-    # an exponential number
-    1.2e+34
-
--
-
-    [yml]
-    # infinity
-    .inf
-
-### Nulls
-
-Nulls in YAML can be expressed with `null` or `~`.
-
-### Booleans
-
-Booleans in YAML are expressed with `true` and `false`.
-
->**NOTE**
->The symfony YAML parser also recognize `on`, `off`, `yes`, and `no` but
->it is strongly discouraged to use them as it has been removed from the
->1.2 YAML specifications.
-
-### Dates
-
-YAML uses the ISO-8601 standard to express dates:
-
-    [yml]
-    2001-12-14t21:59:43.10-05:00
-
--
-
-    [yml]
-    # simple date
-    2002-12-14
-
-Collections
------------
-
-A YAML file is rarely used to describe a simple scalar. Most of the time, it
-describes a collection. A collection can be a sequence or a mapping of
-elements. Both sequences and mappings are converted to PHP arrays.
-
-Sequences use a dash followed by a space (`- `):
-
-    [yml]
-    - PHP
-    - Perl
-    - Python
-
-The previous YAML file is equivalent to the following PHP code:
-
-    [php]
-    array('PHP', 'Perl', 'Python');
-
-Mappings use a colon followed by a space (`: `) to mark each key/value pair:
-
-    [yml]
-    PHP: 5.2
-    MySQL: 5.1
-    Apache: 2.2.20
-
-which is equivalent to this PHP code:
-
-    [php]
-    array('PHP' => 5.2, 'MySQL' => 5.1, 'Apache' => '2.2.20');
-
->**NOTE**
->In a mapping, a key can be any valid scalar.
-
-The number of spaces between the colon and the value does not matter:
-
-    [yml]
-    PHP:    5.2
-    MySQL:  5.1
-    Apache: 2.2.20
-
-YAML uses indentation with one or more spaces to describe nested collections:
-
-    [yml]
-    "symfony 1.0":
-      PHP:    5.0
-      Propel: 1.2
-    "symfony 1.2":
-      PHP:    5.2
-      Propel: 1.3
-
-The following YAML is equivalent to the following PHP code:
-
-    [php]
-    array(
-      'symfony 1.0' => array(
-        'PHP'    => 5.0,
-        'Propel' => 1.2,
-      ),
-      'symfony 1.2' => array(
-        'PHP'    => 5.2,
-        'Propel' => 1.3,
-      ),
-    );
-
-There is one important thing you need to remember when using indentation in a
-YAML file: *Indentation must be done with one or more spaces, but never with
-tabulations*.
-
-You can nest sequences and mappings as you like:
-
-    [yml]
-    'Chapter 1':
-      - Introduction
-      - Event Types
-    'Chapter 2':
-      - Introduction
-      - Helpers
-
-YAML can also use flow styles for collections, using explicit indicators
-rather than indentation to denote scope.
-
-A sequence can be written as a comma separated list within square brackets
-(`[]`):
-
-    [yml]
-    [PHP, Perl, Python]
-
-A mapping can be written as a comma separated list of key/values within curly
-braces (`{}`):
-
-    [yml]
-    { PHP: 5.2, MySQL: 5.1, Apache: 2.2.20 }
-
-You can mix and match styles to achieve a better readability:
-
-    [yml]
-    'Chapter 1': [Introduction, Event Types]
-    'Chapter 2': [Introduction, Helpers]
-
--
-
-    [yml]
-    "symfony 1.0": { PHP: 5.0, Propel: 1.2 }
-    "symfony 1.2": { PHP: 5.2, Propel: 1.3 }
-
-Comments
---------
-
-Comments can be added in YAML by prefixing them with a hash mark (`#`):
-
-    [yml]
-    # Comment on a line
-    "symfony 1.0": { PHP: 5.0, Propel: 1.2 } # Comment at the end of a line
-    "symfony 1.2": { PHP: 5.2, Propel: 1.3 }
-
->**NOTE**
->Comments are simply ignored by the YAML parser and do not need to be
->indented according to the current level of nesting in a collection.
-
-Dynamic YAML files
-------------------
-
-In symfony, a YAML file can contain PHP code that is evaluated just before the
-parsing occurs:
-
-    [php]
-    1.0:
-      version: <?php echo file_get_contents('1.0/VERSION')."\n" ?>
-    1.1:
-      version: "<?php echo file_get_contents('1.1/VERSION') ?>"
-
-Be careful to not mess up with the indentation. Keep in mind the following
-simple tips when adding PHP code to a YAML file:
-
- * The `<?php ?>` statements must always start the line or be embedded in a
-   value.
-
- * If a `<?php ?>` statement ends a line, you need to explicitly output a new
-   line ("\n").
-
-<div class="pagebreak"></div>
-
-A Full Length Example
----------------------
-
-The following example illustrates most YAML notations explained in this
-document:
-
-    [yml]
-    "symfony 1.0":
-      end_of_maintainance: 2010-01-01
-      is_stable:           true
-      release_manager:     "Grégoire Hubert"
-      description: >
-        This stable version is the right choice for projects
-        that need to be maintained for a long period of time.
-      latest_beta:         ~
-      latest_minor:        1.0.20
-      supported_orms:      [Propel]
-      archives:            { source: [zip, tgz], sandbox: [zip, tgz] }
-
-    "symfony 1.2":
-      end_of_maintainance: 2008-11-01
-      is_stable:           true
-      release_manager:     'Fabian Lange'
-      description: >
-        This stable version is the right choice
-        if you start a new project today.
-      latest_beta:         null
-      latest_minor:        1.2.5
-      supported_orms:
-        - Propel
-        - Doctrine
-      archives:
-        source:
-          - zip
-          - tgz
-        sandbox:
-          - zip
-          - tgz
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/A-License.markdown b/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/A-License.markdown
deleted file mode 100644
index 49cdd7c..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/doc/A-License.markdown
+++ /dev/null
@@ -1,108 +0,0 @@
-Appendix A - License
-====================
-
-Attribution-Share Alike 3.0 Unported License
---------------------------------------------
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-  a. **"Adaptation"** means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-
-  b. **"Collection"** means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-
-  c. **"Creative Commons Compatible License"** means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-
-  d. **"Distribute"** means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-
-  e. **"License Elements"** means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-
-  f. **"Licensor"** means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-
-  g. **"Original Author"** means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-
-  h. **"Work"** means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-
-  i. **"You"** means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-
-  j. **"Publicly Perform"** means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-
-  k. **"Reproduce"** means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights
-
-  Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant
-
-  Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-  a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-
-  b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-
-  c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-
-  d. to Distribute and Publicly Perform Adaptations.
-
-  e. For the avoidance of doubt:
-
-    i. **Non-waivable Compulsory License Schemes**. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-
-    ii. **Waivable Compulsory License Schemes**. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-
-    iii. **Voluntary License Schemes**. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-  The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions
-
-  The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-  a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-
-  b. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-
-  c. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-
-  d. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-  UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability
-
-  EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-  a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-
-  b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-  a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-
-  b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-
-  c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-  d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-
-  e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-
-  f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
-
->**SIDEBAR**
->Creative Commons Notice
->
->Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
->
->Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License.
->
->Creative Commons may be contacted at http://creativecommons.org/.
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYaml.php b/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYaml.php
deleted file mode 100644
index 1d89ccc..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYaml.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfYaml offers convenience methods to load and dump YAML.
- *
- * @package    symfony
- * @subpackage yaml
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfYaml.class.php 8988 2008-05-15 20:24:26Z fabien $
- */
-class sfYaml
-{
-  static protected
-    $spec = '1.2';
-
-  /**
-   * Sets the YAML specification version to use.
-   *
-   * @param string $version The YAML specification version
-   */
-  static public function setSpecVersion($version)
-  {
-    if (!in_array($version, array('1.1', '1.2')))
-    {
-      throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
-    }
-
-    self::$spec = $version;
-  }
-
-  /**
-   * Gets the YAML specification version to use.
-   *
-   * @return string The YAML specification version
-   */
-  static public function getSpecVersion()
-  {
-    return self::$spec;
-  }
-
-  /**
-   * Loads YAML into a PHP array.
-   *
-   * The load method, when supplied with a YAML stream (string or file),
-   * will do its best to convert YAML in a file into a PHP array.
-   *
-   *  Usage:
-   *  <code>
-   *   $array = sfYaml::load('config.yml');
-   *   print_r($array);
-   *  </code>
-   *
-   * @param string $input Path of YAML file or string containing YAML
-   *
-   * @return array The YAML converted to a PHP array
-   *
-   * @throws InvalidArgumentException If the YAML is not valid
-   */
-  public static function load($input)
-  {
-    $file = '';
-
-    // if input is a file, process it
-    if (strpos($input, "\n") === false && is_file($input))
-    {
-      $file = $input;
-
-      ob_start();
-      $retval = include($input);
-      $content = ob_get_clean();
-
-      // if an array is returned by the config file assume it's in plain php form else in YAML
-      $input = is_array($retval) ? $retval : $content;
-    }
-
-    // if an array is returned by the config file assume it's in plain php form else in YAML
-    if (is_array($input))
-    {
-      return $input;
-    }
-
-    require_once dirname(__FILE__).'/sfYamlParser.php';
-
-    $yaml = new sfYamlParser();
-
-    try
-    {
-      $ret = $yaml->parse($input);
-    }
-    catch (Exception $e)
-    {
-      throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
-    }
-
-    return $ret;
-  }
-
-  /**
-   * Dumps a PHP array to a YAML string.
-   *
-   * The dump method, when supplied with an array, will do its best
-   * to convert the array into friendly YAML.
-   *
-   * @param array   $array PHP array
-   * @param integer $inline The level where you switch to inline YAML
-   *
-   * @return string A YAML string representing the original PHP array
-   */
-  public static function dump($array, $inline = 2)
-  {
-    require_once dirname(__FILE__).'/sfYamlDumper.php';
-
-    $yaml = new sfYamlDumper();
-
-    return $yaml->dump($array, $inline);
-  }
-}
-
-/**
- * Wraps echo to automatically provide a newline.
- *
- * @param string $string The string to echo with new line
- */
-function echoln($string)
-{
-  echo $string."\n";
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlDumper.php b/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlDumper.php
deleted file mode 100644
index 0ada2b3..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlDumper.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfYamlInline.php');
-
-/**
- * sfYamlDumper dumps PHP variables to YAML strings.
- *
- * @package    symfony
- * @subpackage yaml
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfYamlDumper.class.php 10575 2008-08-01 13:08:42Z nicolas $
- */
-class sfYamlDumper
-{
-  /**
-   * Dumps a PHP value to YAML.
-   *
-   * @param  mixed   $input  The PHP value
-   * @param  integer $inline The level where you switch to inline YAML
-   * @param  integer $indent The level o indentation indentation (used internally)
-   *
-   * @return string  The YAML representation of the PHP value
-   */
-  public function dump($input, $inline = 0, $indent = 0)
-  {
-    $output = '';
-    $prefix = $indent ? str_repeat(' ', $indent) : '';
-
-    if ($inline <= 0 || !is_array($input) || empty($input))
-    {
-      $output .= $prefix.sfYamlInline::dump($input);
-    }
-    else
-    {
-      $isAHash = array_keys($input) !== range(0, count($input) - 1);
-
-      foreach ($input as $key => $value)
-      {
-        $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
-
-        $output .= sprintf('%s%s%s%s',
-          $prefix,
-          $isAHash ? sfYamlInline::dump($key).':' : '-',
-          $willBeInlined ? ' ' : "\n",
-          $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
-        ).($willBeInlined ? "\n" : '');
-      }
-    }
-
-    return $output;
-  }
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlInline.php b/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlInline.php
deleted file mode 100644
index a88cbb3..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlInline.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once dirname(__FILE__).'/sfYaml.php';
-
-/**
- * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
- *
- * @package    symfony
- * @subpackage yaml
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfYamlInline.class.php 16177 2009-03-11 08:32:48Z fabien $
- */
-class sfYamlInline
-{
-  const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
-
-  /**
-   * Convert a YAML string to a PHP array.
-   *
-   * @param string $value A YAML string
-   *
-   * @return array A PHP array representing the YAML string
-   */
-  static public function load($value)
-  {
-    $value = trim($value);
-
-    if (0 == strlen($value))
-    {
-      return '';
-    }
-
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
-    {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('ASCII');
-    }
-
-    switch ($value[0])
-    {
-      case '[':
-        $result = self::parseSequence($value);
-        break;
-      case '{':
-        $result = self::parseMapping($value);
-        break;
-      default:
-        $result = self::parseScalar($value);
-    }
-
-    if (isset($mbEncoding))
-    {
-      mb_internal_encoding($mbEncoding);
-    }
-
-    return $result;
-  }
-
-  /**
-   * Dumps a given PHP variable to a YAML string.
-   *
-   * @param mixed $value The PHP variable to convert
-   *
-   * @return string The YAML string representing the PHP array
-   */
-  static public function dump($value)
-  {
-    if ('1.1' === sfYaml::getSpecVersion())
-    {
-      $trueValues = array('true', 'on', '+', 'yes', 'y');
-      $falseValues = array('false', 'off', '-', 'no', 'n');
-    }
-    else
-    {
-      $trueValues = array('true');
-      $falseValues = array('false');
-    }
-
-    switch (true)
-    {
-      case is_resource($value):
-        throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
-      case is_object($value):
-        return '!!php/object:'.serialize($value);
-      case is_array($value):
-        return self::dumpArray($value);
-      case null === $value:
-        return 'null';
-      case true === $value:
-        return 'true';
-      case false === $value:
-        return 'false';
-      case ctype_digit($value):
-        return is_string($value) ? "'$value'" : (int) $value;
-      case is_numeric($value):
-        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
-      case false !== strpos($value, "\n") || false !== strpos($value, "\r"):
-        return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value));
-      case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
-      case '' == $value:
-        return "''";
-      case preg_match(self::getTimestampRegex(), $value):
-        return "'$value'";
-      case in_array(strtolower($value), $trueValues):
-        return "'$value'";
-      case in_array(strtolower($value), $falseValues):
-        return "'$value'";
-      case in_array(strtolower($value), array('null', '~')):
-        return "'$value'";
-      default:
-        return $value;
-    }
-  }
-
-  /**
-   * Dumps a PHP array to a YAML string.
-   *
-   * @param array $value The PHP array to dump
-   *
-   * @return string The YAML string representing the PHP array
-   */
-  static protected function dumpArray($value)
-  {
-    // array
-    $keys = array_keys($value);
-    if (
-      (1 == count($keys) && '0' == $keys[0])
-      ||
-      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
-    {
-      $output = array();
-      foreach ($value as $val)
-      {
-        $output[] = self::dump($val);
-      }
-
-      return sprintf('[%s]', implode(', ', $output));
-    }
-
-    // mapping
-    $output = array();
-    foreach ($value as $key => $val)
-    {
-      $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
-    }
-
-    return sprintf('{ %s }', implode(', ', $output));
-  }
-
-  /**
-   * Parses a scalar to a YAML string.
-   *
-   * @param scalar  $scalar
-   * @param string  $delimiters
-   * @param array   $stringDelimiter
-   * @param integer $i
-   * @param boolean $evaluate
-   *
-   * @return string A YAML string
-   */
-  static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
-  {
-    if (in_array($scalar[$i], $stringDelimiters))
-    {
-      // quoted scalar
-      $output = self::parseQuotedScalar($scalar, $i);
-    }
-    else
-    {
-      // "normal" string
-      if (!$delimiters)
-      {
-        $output = substr($scalar, $i);
-        $i += strlen($output);
-
-        // remove comments
-        if (false !== $strpos = strpos($output, ' #'))
-        {
-          $output = rtrim(substr($output, 0, $strpos));
-        }
-      }
-      else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match))
-      {
-        $output = $match[1];
-        $i += strlen($output);
-      }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
-      }
-
-      $output = $evaluate ? self::evaluateScalar($output) : $output;
-    }
-
-    return $output;
-  }
-
-  /**
-   * Parses a quoted scalar to YAML.
-   *
-   * @param string  $scalar
-   * @param integer $i
-   *
-   * @return string A YAML string
-   */
-  static protected function parseQuotedScalar($scalar, &$i)
-  {
-    if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match))
-    {
-      throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
-    }
-
-    $output = substr($match[0], 1, strlen($match[0]) - 2);
-
-    if ('"' == $scalar[$i])
-    {
-      // evaluate the string
-      $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
-    }
-    else
-    {
-      // unescape '
-      $output = str_replace('\'\'', '\'', $output);
-    }
-
-    $i += strlen($match[0]);
-
-    return $output;
-  }
-
-  /**
-   * Parses a sequence to a YAML string.
-   *
-   * @param string  $sequence
-   * @param integer $i
-   *
-   * @return string A YAML string
-   */
-  static protected function parseSequence($sequence, &$i = 0)
-  {
-    $output = array();
-    $len = strlen($sequence);
-    $i += 1;
-
-    // [foo, bar, ...]
-    while ($i < $len)
-    {
-      switch ($sequence[$i])
-      {
-        case '[':
-          // nested sequence
-          $output[] = self::parseSequence($sequence, $i);
-          break;
-        case '{':
-          // nested mapping
-          $output[] = self::parseMapping($sequence, $i);
-          break;
-        case ']':
-          return $output;
-        case ',':
-        case ' ':
-          break;
-        default:
-          $isQuoted = in_array($sequence[$i], array('"', "'"));
-          $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
-
-          if (!$isQuoted && false !== strpos($value, ': '))
-          {
-            // embedded mapping?
-            try
-            {
-              $value = self::parseMapping('{'.$value.'}');
-            }
-            catch (InvalidArgumentException $e)
-            {
-              // no, it's not
-            }
-          }
-
-          $output[] = $value;
-
-          --$i;
-      }
-
-      ++$i;
-    }
-
-    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
-  }
-
-  /**
-   * Parses a mapping to a YAML string.
-   *
-   * @param string  $mapping
-   * @param integer $i
-   *
-   * @return string A YAML string
-   */
-  static protected function parseMapping($mapping, &$i = 0)
-  {
-    $output = array();
-    $len = strlen($mapping);
-    $i += 1;
-
-    // {foo: bar, bar:foo, ...}
-    while ($i < $len)
-    {
-      switch ($mapping[$i])
-      {
-        case ' ':
-        case ',':
-          ++$i;
-          continue 2;
-        case '}':
-          return $output;
-      }
-
-      // key
-      $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
-
-      // value
-      $done = false;
-      while ($i < $len)
-      {
-        switch ($mapping[$i])
-        {
-          case '[':
-            // nested sequence
-            $output[$key] = self::parseSequence($mapping, $i);
-            $done = true;
-            break;
-          case '{':
-            // nested mapping
-            $output[$key] = self::parseMapping($mapping, $i);
-            $done = true;
-            break;
-          case ':':
-          case ' ':
-            break;
-          default:
-            $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i);
-            $done = true;
-            --$i;
-        }
-
-        ++$i;
-
-        if ($done)
-        {
-          continue 2;
-        }
-      }
-    }
-
-    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
-  }
-
-  /**
-   * Evaluates scalars and replaces magic values.
-   *
-   * @param string $scalar
-   *
-   * @return string A YAML string
-   */
-  static protected function evaluateScalar($scalar)
-  {
-    $scalar = trim($scalar);
-
-    if ('1.1' === sfYaml::getSpecVersion())
-    {
-      $trueValues = array('true', 'on', '+', 'yes', 'y');
-      $falseValues = array('false', 'off', '-', 'no', 'n');
-    }
-    else
-    {
-      $trueValues = array('true');
-      $falseValues = array('false');
-    }
-
-    switch (true)
-    {
-      case 'null' == strtolower($scalar):
-      case '' == $scalar:
-      case '~' == $scalar:
-        return null;
-      case 0 === strpos($scalar, '!str'):
-        return (string) substr($scalar, 5);
-      case 0 === strpos($scalar, '! '):
-        return intval(self::parseScalar(substr($scalar, 2)));
-      case 0 === strpos($scalar, '!!php/object:'):
-        return unserialize(substr($scalar, 13));
-      case ctype_digit($scalar):
-        $raw = $scalar;
-        $cast = intval($scalar);
-        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
-      case in_array(strtolower($scalar), $trueValues):
-        return true;
-      case in_array(strtolower($scalar), $falseValues):
-        return false;
-      case is_numeric($scalar):
-        return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar);
-      case 0 == strcasecmp($scalar, '.inf'):
-      case 0 == strcasecmp($scalar, '.NaN'):
-        return -log(0);
-      case 0 == strcasecmp($scalar, '-.inf'):
-        return log(0);
-      case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
-        return floatval(str_replace(',', '', $scalar));
-      case preg_match(self::getTimestampRegex(), $scalar):
-        return strtotime($scalar);
-      default:
-        return (string) $scalar;
-    }
-  }
-
-  static protected function getTimestampRegex()
-  {
-    return <<<EOF
-    ~^
-    (?P<year>[0-9][0-9][0-9][0-9])
-    -(?P<month>[0-9][0-9]?)
-    -(?P<day>[0-9][0-9]?)
-    (?:(?:[Tt]|[ \t]+)
-    (?P<hour>[0-9][0-9]?)
-    :(?P<minute>[0-9][0-9])
-    :(?P<second>[0-9][0-9])
-    (?:\.(?P<fraction>[0-9]*))?
-    (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
-    (?::(?P<tz_minute>[0-9][0-9]))?))?)?
-    $~x
-EOF;
-  }
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlParser.php b/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlParser.php
deleted file mode 100644
index 91da2dc..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/lib/sfYamlParser.php
+++ /dev/null
@@ -1,622 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfYamlInline.php');
-
-if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
-{
-  define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
-}
-
-/**
- * sfYamlParser parses YAML strings to convert them to PHP arrays.
- *
- * @package    symfony
- * @subpackage yaml
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfYamlParser.class.php 10832 2008-08-13 07:46:08Z fabien $
- */
-class sfYamlParser
-{
-  protected
-    $offset        = 0,
-    $lines         = array(),
-    $currentLineNb = -1,
-    $currentLine   = '',
-    $refs          = array();
-
-  /**
-   * Constructor
-   *
-   * @param integer $offset The offset of YAML document (used for line numbers in error messages)
-   */
-  public function __construct($offset = 0)
-  {
-    $this->offset = $offset;
-  }
-
-  /**
-   * Parses a YAML string to a PHP value.
-   *
-   * @param  string $value A YAML string
-   *
-   * @return mixed  A PHP value
-   *
-   * @throws InvalidArgumentException If the YAML is not valid
-   */
-  public function parse($value)
-  {
-    $this->currentLineNb = -1;
-    $this->currentLine = '';
-    $this->lines = explode("\n", $this->cleanup($value));
-
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
-    {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('UTF-8');
-    }
-
-    $data = array();
-    while ($this->moveToNextLine())
-    {
-      if ($this->isCurrentLineEmpty())
-      {
-        continue;
-      }
-
-      // tab?
-      if (preg_match('#^\t+#', $this->currentLine))
-      {
-        throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-
-      $isRef = $isInPlace = $isProcessed = false;
-      if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
-      {
-        if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
-        {
-          $isRef = $matches['ref'];
-          $values['value'] = $matches['value'];
-        }
-
-        // array
-        if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
-        {
-          $c = $this->getRealCurrentLineNb() + 1;
-          $parser = new sfYamlParser($c);
-          $parser->refs =& $this->refs;
-          $data[] = $parser->parse($this->getNextEmbedBlock());
-        }
-        else
-        {
-          if (isset($values['leadspaces'])
-            && ' ' == $values['leadspaces']
-            && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches))
-          {
-            // this is a compact notation element, add to next block and parse
-            $c = $this->getRealCurrentLineNb();
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
-
-            $block = $values['value'];
-            if (!$this->isNextLineIndented())
-            {
-              $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
-            }
-
-            $data[] = $parser->parse($block);
-          }
-          else
-          {
-            $data[] = $this->parseValue($values['value']);
-          }
-        }
-      }
-      else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
-      {
-        $key = sfYamlInline::parseScalar($values['key']);
-
-        if ('<<' === $key)
-        {
-          if (isset($values['value']) && '*' === substr($values['value'], 0, 1))
-          {
-            $isInPlace = substr($values['value'], 1);
-            if (!array_key_exists($isInPlace, $this->refs))
-            {
-              throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
-            }
-          }
-          else
-          {
-            if (isset($values['value']) && $values['value'] !== '')
-            {
-              $value = $values['value'];
-            }
-            else
-            {
-              $value = $this->getNextEmbedBlock();
-            }
-            $c = $this->getRealCurrentLineNb() + 1;
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
-            $parsed = $parser->parse($value);
-
-            $merged = array();
-            if (!is_array($parsed))
-            {
-              throw new InvalidArgumentException(sprintf("YAML merge keys used with a scalar value instead of an array at line %s (%s)", $this->getRealCurrentLineNb() + 1, $this->currentLine));
-            }
-            else if (isset($parsed[0]))
-            {
-              // Numeric array, merge individual elements
-              foreach (array_reverse($parsed) as $parsedItem)
-              {
-                if (!is_array($parsedItem))
-                {
-                  throw new InvalidArgumentException(sprintf("Merge items must be arrays at line %s (%s).", $this->getRealCurrentLineNb() + 1, $parsedItem));
-                }
-                $merged = array_merge($parsedItem, $merged);
-              }
-            }
-            else
-            {
-              // Associative array, merge
-              $merged = array_merge($merge, $parsed);
-            }
-
-            $isProcessed = $merged;
-          }
-        }
-        else if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
-        {
-          $isRef = $matches['ref'];
-          $values['value'] = $matches['value'];
-        }
-
-        if ($isProcessed)
-        {
-          // Merge keys
-          $data = $isProcessed;
-        }
-        // hash
-        else if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
-        {
-          // if next line is less indented or equal, then it means that the current value is null
-          if ($this->isNextLineIndented())
-          {
-            $data[$key] = null;
-          }
-          else
-          {
-            $c = $this->getRealCurrentLineNb() + 1;
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
-            $data[$key] = $parser->parse($this->getNextEmbedBlock());
-          }
-        }
-        else
-        {
-          if ($isInPlace)
-          {
-            $data = $this->refs[$isInPlace];
-          }
-          else
-          {
-            $data[$key] = $this->parseValue($values['value']);
-          }
-        }
-      }
-      else
-      {
-        // 1-liner followed by newline
-        if (2 == count($this->lines) && empty($this->lines[1]))
-        {
-          $value = sfYamlInline::load($this->lines[0]);
-          if (is_array($value))
-          {
-            $first = reset($value);
-            if ('*' === substr($first, 0, 1))
-            {
-              $data = array();
-              foreach ($value as $alias)
-              {
-                $data[] = $this->refs[substr($alias, 1)];
-              }
-              $value = $data;
-            }
-          }
-
-          if (isset($mbEncoding))
-          {
-            mb_internal_encoding($mbEncoding);
-          }
-
-          return $value;
-        }
-
-        switch (preg_last_error())
-        {
-          case PREG_INTERNAL_ERROR:
-            $error = 'Internal PCRE error on line';
-            break;
-          case PREG_BACKTRACK_LIMIT_ERROR:
-            $error = 'pcre.backtrack_limit reached on line';
-            break;
-          case PREG_RECURSION_LIMIT_ERROR:
-            $error = 'pcre.recursion_limit reached on line';
-            break;
-          case PREG_BAD_UTF8_ERROR:
-            $error = 'Malformed UTF-8 data on line';
-            break;
-          case PREG_BAD_UTF8_OFFSET_ERROR:
-            $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point on line';
-            break;
-          default:
-            $error = 'Unable to parse line';
-        }
-
-        throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-
-      if ($isRef)
-      {
-        $this->refs[$isRef] = end($data);
-      }
-    }
-
-    if (isset($mbEncoding))
-    {
-      mb_internal_encoding($mbEncoding);
-    }
-
-    return empty($data) ? null : $data;
-  }
-
-  /**
-   * Returns the current line number (takes the offset into account).
-   *
-   * @return integer The current line number
-   */
-  protected function getRealCurrentLineNb()
-  {
-    return $this->currentLineNb + $this->offset;
-  }
-
-  /**
-   * Returns the current line indentation.
-   *
-   * @return integer The current line indentation
-   */
-  protected function getCurrentLineIndentation()
-  {
-    return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
-  }
-
-  /**
-   * Returns the next embed block of YAML.
-   *
-   * @param integer $indentation The indent level at which the block is to be read, or null for default
-   *
-   * @return string A YAML string
-   */
-  protected function getNextEmbedBlock($indentation = null)
-  {
-    $this->moveToNextLine();
-
-    if (null === $indentation)
-    {
-      $newIndent = $this->getCurrentLineIndentation();
-
-      if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
-      {
-        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-    }
-    else
-    {
-      $newIndent = $indentation;
-    }
-
-    $data = array(substr($this->currentLine, $newIndent));
-
-    while ($this->moveToNextLine())
-    {
-      if ($this->isCurrentLineEmpty())
-      {
-        if ($this->isCurrentLineBlank())
-        {
-          $data[] = substr($this->currentLine, $newIndent);
-        }
-
-        continue;
-      }
-
-      $indent = $this->getCurrentLineIndentation();
-
-      if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match))
-      {
-        // empty line
-        $data[] = $match['text'];
-      }
-      else if ($indent >= $newIndent)
-      {
-        $data[] = substr($this->currentLine, $newIndent);
-      }
-      else if (0 == $indent)
-      {
-        $this->moveToPreviousLine();
-
-        break;
-      }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-    }
-
-    return implode("\n", $data);
-  }
-
-  /**
-   * Moves the parser to the next line.
-   */
-  protected function moveToNextLine()
-  {
-    if ($this->currentLineNb >= count($this->lines) - 1)
-    {
-      return false;
-    }
-
-    $this->currentLine = $this->lines[++$this->currentLineNb];
-
-    return true;
-  }
-
-  /**
-   * Moves the parser to the previous line.
-   */
-  protected function moveToPreviousLine()
-  {
-    $this->currentLine = $this->lines[--$this->currentLineNb];
-  }
-
-  /**
-   * Parses a YAML value.
-   *
-   * @param  string $value A YAML value
-   *
-   * @return mixed  A PHP value
-   */
-  protected function parseValue($value)
-  {
-    if ('*' === substr($value, 0, 1))
-    {
-      if (false !== $pos = strpos($value, '#'))
-      {
-        $value = substr($value, 1, $pos - 2);
-      }
-      else
-      {
-        $value = substr($value, 1);
-      }
-
-      if (!array_key_exists($value, $this->refs))
-      {
-        throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
-      }
-      return $this->refs[$value];
-    }
-
-    if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches))
-    {
-      $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
-
-      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers)));
-    }
-    else
-    {
-      return sfYamlInline::load($value);
-    }
-  }
-
-  /**
-   * Parses a folded scalar.
-   *
-   * @param  string  $separator   The separator that was used to begin this folded scalar (| or >)
-   * @param  string  $indicator   The indicator that was used to begin this folded scalar (+ or -)
-   * @param  integer $indentation The indentation that was used to begin this folded scalar
-   *
-   * @return string  The text value
-   */
-  protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
-  {
-    $separator = '|' == $separator ? "\n" : ' ';
-    $text = '';
-
-    $notEOF = $this->moveToNextLine();
-
-    while ($notEOF && $this->isCurrentLineBlank())
-    {
-      $text .= "\n";
-
-      $notEOF = $this->moveToNextLine();
-    }
-
-    if (!$notEOF)
-    {
-      return '';
-    }
-
-    if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches))
-    {
-      $this->moveToPreviousLine();
-
-      return '';
-    }
-
-    $textIndent = $matches['indent'];
-    $previousIndent = 0;
-
-    $text .= $matches['text'].$separator;
-    while ($this->currentLineNb + 1 < count($this->lines))
-    {
-      $this->moveToNextLine();
-
-      if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches))
-      {
-        if (' ' == $separator && $previousIndent != $matches['indent'])
-        {
-          $text = substr($text, 0, -1)."\n";
-        }
-        $previousIndent = $matches['indent'];
-
-        $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
-      }
-      else if (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches))
-      {
-        $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
-      }
-      else
-      {
-        $this->moveToPreviousLine();
-
-        break;
-      }
-    }
-
-    if (' ' == $separator)
-    {
-      // replace last separator by a newline
-      $text = preg_replace('/ (\n*)$/', "\n$1", $text);
-    }
-
-    switch ($indicator)
-    {
-      case '':
-        $text = preg_replace('#\n+$#s', "\n", $text);
-        break;
-      case '+':
-        break;
-      case '-':
-        $text = preg_replace('#\n+$#s', '', $text);
-        break;
-    }
-
-    return $text;
-  }
-
-  /**
-   * Returns true if the next line is indented.
-   *
-   * @return Boolean Returns true if the next line is indented, false otherwise
-   */
-  protected function isNextLineIndented()
-  {
-    $currentIndentation = $this->getCurrentLineIndentation();
-    $notEOF = $this->moveToNextLine();
-
-    while ($notEOF && $this->isCurrentLineEmpty())
-    {
-      $notEOF = $this->moveToNextLine();
-    }
-
-    if (false === $notEOF)
-    {
-      return false;
-    }
-
-    $ret = false;
-    if ($this->getCurrentLineIndentation() <= $currentIndentation)
-    {
-      $ret = true;
-    }
-
-    $this->moveToPreviousLine();
-
-    return $ret;
-  }
-
-  /**
-   * Returns true if the current line is blank or if it is a comment line.
-   *
-   * @return Boolean Returns true if the current line is empty or if it is a comment line, false otherwise
-   */
-  protected function isCurrentLineEmpty()
-  {
-    return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
-  }
-
-  /**
-   * Returns true if the current line is blank.
-   *
-   * @return Boolean Returns true if the current line is blank, false otherwise
-   */
-  protected function isCurrentLineBlank()
-  {
-    return '' == trim($this->currentLine, ' ');
-  }
-
-  /**
-   * Returns true if the current line is a comment line.
-   *
-   * @return Boolean Returns true if the current line is a comment line, false otherwise
-   */
-  protected function isCurrentLineComment()
-  {
-    //checking explicitly the first char of the trim is faster than loops or strpos
-    $ltrimmedLine = ltrim($this->currentLine, ' ');
-    return $ltrimmedLine[0] === '#';
-  }
-
-  /**
-   * Cleanups a YAML string to be parsed.
-   *
-   * @param  string $value The input YAML string
-   *
-   * @return string A cleaned up YAML string
-   */
-  protected function cleanup($value)
-  {
-    $value = str_replace(array("\r\n", "\r"), "\n", $value);
-
-    if (!preg_match("#\n$#", $value))
-    {
-      $value .= "\n";
-    }
-
-    // strip YAML header
-    $count = 0;
-    $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
-    $this->offset += $count;
-
-    // remove leading comments
-    $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-    if ($count == 1)
-    {
-      // items have been removed, update the offset
-      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-      $value = $trimmedValue;
-    }
-
-    // remove start of the document marker (---)
-    $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-    if ($count == 1)
-    {
-      // items have been removed, update the offset
-      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-      $value = $trimmedValue;
-
-      // remove end of the document marker (...)
-      $value = preg_replace('#\.\.\.\s*$#s', '', $value);
-    }
-
-    return $value;
-  }
-}
diff --git a/vendor/flexi/vendor/mustache.php/test/lib/yaml/package.xml b/vendor/flexi/vendor/mustache.php/test/lib/yaml/package.xml
deleted file mode 100644
index 1869ae9..0000000
--- a/vendor/flexi/vendor/mustache.php/test/lib/yaml/package.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
- <name>YAML</name>
- <channel>pear.symfony-project.com</channel>
- <summary>The Symfony YAML Component.</summary>
- <description>The Symfony YAML Component.</description>
- <lead>
-  <name>Fabien Potencier</name>
-  <user>fabpot</user>
-  <email>fabien.potencier@symfony-project.org</email>
-  <active>yes</active>
- </lead>
- <date>2009-12-01</date>
- <version>
-   <release>1.0.2</release>
-   <api>1.0.0</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license">MIT license</license>
- <notes>-</notes>
- <contents>
-   <dir name="/">
-     <file name="README.markdown" role="doc" />
-     <file name="LICENSE" role="doc" />
-
-     <dir name="lib">
-       <file install-as="SymfonyComponents/YAML/sfYaml.php" name="sfYaml.php" role="php" />
-       <file install-as="SymfonyComponents/YAML/sfYamlDumper.php" name="sfYamlDumper.php" role="php" />
-       <file install-as="SymfonyComponents/YAML/sfYamlInline.php" name="sfYamlInline.php" role="php" />
-       <file install-as="SymfonyComponents/YAML/sfYamlParser.php" name="sfYamlParser.php" role="php" />
-     </dir>
-   </dir>
- </contents>
-
- <dependencies>
-  <required>
-   <php>
-    <min>5.2.4</min>
-   </php>
-   <pearinstaller>
-    <min>1.4.1</min>
-   </pearinstaller>
-  </required>
- </dependencies>
-
- <phprelease>
- </phprelease>
-
- <changelog>
-   <release>
-     <version>
-       <release>1.0.2</release>
-       <api>1.0.0</api>
-     </version>
-     <stability>
-       <release>stable</release>
-       <api>stable</api>
-     </stability>
-     <license uri="http://www.symfony-project.com/license">MIT license</license>
-     <date>2009-12-01</date>
-     <license>MIT</license>
-     <notes>
-       * fabien: fixed \ usage in quoted string
-     </notes>
-   </release>
-   <release>
-     <version>
-       <release>1.0.1</release>
-       <api>1.0.0</api>
-     </version>
-     <stability>
-       <release>stable</release>
-       <api>stable</api>
-     </stability>
-     <license uri="http://www.symfony-project.com/license">MIT license</license>
-     <date>2009-12-01</date>
-     <license>MIT</license>
-     <notes>
-       * fabien: fixed a possible loop in parsing a non-valid quoted string
-     </notes>
-   </release>
-   <release>
-     <version>
-       <release>1.0.0</release>
-       <api>1.0.0</api>
-     </version>
-     <stability>
-       <release>stable</release>
-       <api>stable</api>
-     </stability>
-     <license uri="http://www.symfony-project.com/license">MIT license</license>
-     <date>2009-11-30</date>
-     <license>MIT</license>
-     <notes>
-       * fabien: first stable release as a Symfony Component
-     </notes>
-   </release>
- </changelog>
-</package>
diff --git a/vendor/flexi/vendor/mustache.php/test/phpunit.xml b/vendor/flexi/vendor/mustache.php/test/phpunit.xml
deleted file mode 100644
index 891fa8e..0000000
--- a/vendor/flexi/vendor/mustache.php/test/phpunit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true">
-	<testsuite name="Mustache">
-		<directory>./</directory>
-	</testsuite>
-	<blacklist>
-		<directory suffix=".php">../examples</directory>
-		<directory suffix=".php">./</directory>
-	</blacklist>
-</phpunit>
\ No newline at end of file
diff --git a/vendor/trails/src/controller.php b/vendor/trails/src/controller.php
index c8e7b8e..6ab9542 100644
--- a/vendor/trails/src/controller.php
+++ b/vendor/trails/src/controller.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * A Trails_Controller is responsible for matching the unconsumed part of an URI
  * to an action using the left over words as arguments for that action. The
@@ -286,13 +285,6 @@ class Trails_Controller {
     $factory = $this->get_template_factory();
     $template = $factory->open($template_name);
 
-    # template requires setup ?
-    switch (get_class($template)) {
-      case 'Flexi_JsTemplate':
-        $this->set_content_type('text/javascript');
-        break;
-    }
-
     $template->set_attributes($this->get_assigned_variables());
 
     if (isset($layout)) {
@@ -306,10 +298,10 @@ class Trails_Controller {
   /**
    * Create and return a template factory for this controller.
    *
-   * @return a Flexi_TemplateFactory
+   * @return Flexi\Factory
    */
   function get_template_factory() {
-    return new Flexi_TemplateFactory($this->dispatcher->trails_root .
+    return new Flexi\Factory($this->dispatcher->trails_root .
                                      '/views/');
   }
 
diff --git a/vendor/trails/trails-abridged.php b/vendor/trails/trails-abridged.php
index 812c1f1..07b337a 100644
--- a/vendor/trails/trails-abridged.php
+++ b/vendor/trails/trails-abridged.php
@@ -1,2 +1,3 @@
 <?php
- define('TRAILS_VERSION','0.6.9');class Trails_Dispatcher{public$trails_root;public$trails_uri;public$default_controller;function __construct($trails_root,$trails_uri,$default_controller){$this->trails_root=$trails_root;$this->trails_uri=$trails_uri;$this->default_controller=$default_controller;}function dispatch($uri){$old_handler=set_error_handler(array($this,'error_handler'),5888);ob_start();$level=ob_get_level();$this->map_uri_to_response($this->clean_request_uri((string)$uri))->output();while(ob_get_level()>=$level){ob_end_flush();}if(isset($old_handler)){set_error_handler($old_handler);}}function map_uri_to_response($uri){try{list($controller_path,$unconsumed)=''===$uri?$this->default_route():$this->parse($uri);$controller=$this->load_controller($controller_path);$response=$controller->perform($unconsumed);}catch(Exception$e){$response=isset($controller)?$controller->rescue($e):$this->trails_error($e);}return$response;}function default_route(){if(!$this->file_exists($this->default_controller.'.php')){throw new Trails_MissingFile("Default controller '{$this->default_controller}' not found'");}return array($this->default_controller,'');}function trails_error($exception){ob_clean();$detailed=@$_SERVER['REMOTE_ADDR']==='127.0.0.1';$body=sprintf('<html><head><title>Trails Error</title></head>'.'<body><h1>%s</h1><pre>%s</pre></body></html>',htmlentities($exception->__toString()),$detailed?htmlentities($exception->getTraceAsString()):'');if($exception instanceof Trails_Exception){$response=new Trails_Response($body,$exception->headers,$exception->getCode(),$exception->getMessage());}else{$response=new Trails_Response($body,array(),500,$exception->getMessage());}return$response;}function clean_request_uri($uri){if(FALSE!==($pos=strpos($uri,'?'))){$uri=substr($uri,0,$pos);}return ltrim($uri,'/');}function parse($unconsumed,$controller=NULL){list($head,$tail)=$this->split_on_first_slash($unconsumed);if(!preg_match('/^\w+$/',$head)){throw new Trails_RoutingError("No route matches '$head'");}$controller=(isset($controller)?$controller.'/':'').$head;if($this->file_exists($controller.'.php')){return array($controller,$tail);}else if($this->file_exists($controller)){return$this->parse($tail,$controller);}throw new Trails_RoutingError("No route matches '$head'");}function split_on_first_slash($str){preg_match(":([^/]*)(/+)?(.*):",$str,$matches);return array($matches[1],$matches[3]);}function file_exists($path){return file_exists("{$this->trails_root}/controllers/$path");}function load_controller($controller){require_once"{$this->trails_root}/controllers/{$controller}.php";$class=Trails_Inflector::camelize($controller).'Controller';if(!class_exists($class)){throw new Trails_UnknownController("Controller missing: '$class'");}return new$class($this);}function error_handler($errno,$string,$file,$line,$context){if(!(5888&$errno))return false;throw new Trails_Exception(500,$string);}}class Trails_Response{public$body='',$status,$reason,$headers=array();function __construct($body='',$headers=array(),$status=NULL,$reason=NULL){$this->set_body($body);$this->headers=$headers;if(isset($status)){$this->set_status($status,$reason);}}function set_body($body){$this->body=$body;return$this;}function set_status($status,$reason=NULL){$this->status=$status;$this->reason=isset($reason)?$reason:$this->get_reason($status);return$this;}function get_reason($status){$reason=array(100=>'Continue','Switching Protocols',200=>'OK','Created','Accepted','Non-Authoritative Information','No Content','Reset Content','Partial Content',300=>'Multiple Choices','Moved Permanently','Found','See Other','Not Modified','Use Proxy','(Unused)','Temporary Redirect',400=>'Bad Request','Unauthorized','Payment Required','Forbidden','Not Found','Method Not Allowed','Not Acceptable','Proxy Authentication Required','Request Timeout','Conflict','Gone','Length Required','Precondition Failed','Request Entity Too Large','Request-URI Too Long','Unsupported Media Type','Requested Range Not Satisfiable','Expectation Failed',500=>'Internal Server Error','Not Implemented','Bad Gateway','Service Unavailable','Gateway Timeout','HTTP Version Not Supported');return isset($reason[$status])?$reason[$status]:'';}function add_header($key,$value){$this->headers[$key]=$value;return$this;}function output(){if(isset($this->status)){$this->send_header(sprintf('HTTP/1.1 %d %s',$this->status,$this->reason),TRUE,$this->status);}foreach($this->headers as$k=>$v){$this->send_header("$k: $v");}echo$this->body;}function send_header($header,$replace=FALSE,$status=NULL){if(isset($status)){header($header,$replace,$status);}else{header($header,$replace);}}}class Trails_Controller{protected$dispatcher,$response,$performed,$layout;function __construct($dispatcher){$this->dispatcher=$dispatcher;$this->erase_response();}function erase_response(){$this->performed=FALSE;$this->response=new Trails_Response();}function get_response(){return$this->response;}function perform($unconsumed){list($action,$args,$format)=$this->extract_action_and_args($unconsumed);$this->format=isset($format)?$format:'html';$before_filter_result=$this->before_filter($action,$args);if(!(FALSE===$before_filter_result||$this->performed)){$callable=$this->map_action($action);if(is_callable($callable)){call_user_func_array($callable,$args);}else{$this->does_not_understand($action,$args);}if(!$this->performed){$this->render_action($action);}$this->after_filter($action,$args);}return$this->response;}function extract_action_and_args($string){if(''===$string){return$this->default_action_and_args();}$format=NULL;if(preg_match('/^(.*[^\/.])\.(\w+)$/',$string,$matches)){list($_,$string,$format)=$matches;}$args=explode('/',$string);$action=array_shift($args);return array($action,$args,$format);}function default_action_and_args(){return array('index',array(),NULL);}function map_action($action){return array(&$this,$action.'_action');}function before_filter(&$action,&$args){}function after_filter($action,$args){}function does_not_understand($action,$args){throw new Trails_UnknownAction("No action responded to '$action'.");}function redirect($to){if($this->performed){throw new Trails_DoubleRenderError();}$this->performed=TRUE;$url=preg_match('#^(/|\w+://)#',$to)?$to:$this->url_for($to);$this->response->add_header('Location',$url)->set_status(302);}function render_text($text=' '){if($this->performed){throw new Trails_DoubleRenderError();}$this->performed=TRUE;$this->response->set_body($text);}function render_nothing(){$this->render_text('');}function render_action($action){$this->render_template($this->get_default_template($action),$this->layout);}function get_default_template($action){$class=get_class($this);$controller_name=Trails_Inflector::underscore(substr($class,0,-10));return$controller_name.'/'.$action;}function render_template($template_name,$layout=NULL){$factory=$this->get_template_factory();$template=$factory->open($template_name);switch(get_class($template)){case'Flexi_JsTemplate':$this->set_content_type('text/javascript');break;}$template->set_attributes($this->get_assigned_variables());if(isset($layout)){$template->set_layout($layout);}$this->render_text($template->render());}function get_template_factory(){return new Flexi_TemplateFactory($this->dispatcher->trails_root.'/views/');}function get_assigned_variables(){$assigns=array();$protected=get_class_vars(get_class($this));foreach(get_object_vars($this)as$var=>$value){if(!array_key_exists($var,$protected)){$assigns[$var]=&$this->$var;}}$assigns['controller']=$this;return$assigns;}function set_layout($layout){$this->layout=$layout;}function url_for($to){$args=func_get_args();$args=array_map('urlencode',$args);$args[0]=$to;return$this->dispatcher->trails_uri.'/'.join('/',$args);}function set_status($status,$reason_phrase=NULL){$this->response->set_status($status,$reason_phrase);}function set_content_type($type){$this->response->add_header('Content-Type',$type);}function rescue($exception){return$this->dispatcher->trails_error($exception);}function respond_to($ext){return$this->format===$ext;}}class Trails_Inflector{static function camelize($word){$parts=explode('/',$word);foreach($parts as$key=>$part){$parts[$key]=str_replace(' ','',ucwords(str_replace('_',' ',$part)));}return join('_',$parts);}static function underscore($word){$parts=explode('_',$word);foreach($parts as$key=>$part){$parts[$key]=preg_replace('/(?<=\w)([A-Z])/','_\\1',$part);}return strtolower(join('/',$parts));}}class Trails_Flash implements ArrayAccess{public$flash=array(),$used=array();static function instance(){if(!isset($_SESSION)){throw new Trails_SessionRequiredException();}if(!isset($_SESSION['trails_flash'])){$_SESSION['trails_flash']=new Trails_Flash();}return$_SESSION['trails_flash'];}function offsetExists($offset){return isset($this->flash[$offset]);}function offsetGet($offset){return$this->get($offset);}function offsetSet($offset,$value){$this->set($offset,$value);}function offsetUnset($offset){unset($this->flash[$offset],$this->used[$offset]);}function _use($k=NULL,$v=TRUE){if($k){$this->used[$k]=$v;}else{foreach($this->used as$k=>$value){$this->_use($k,$v);}}}function discard($k=NULL){$this->_use($k);}function&get($k){$return=NULL;if(isset($this->flash[$k])){$return=&$this->flash[$k];}return$return;}function keep($k=NULL){$this->_use($k,FALSE);}function set($k,$v){$this->keep($k);$this->flash[$k]=$v;}function set_ref($k,&$v){$this->keep($k);$this->flash[$k]=&$v;}function sweep(){foreach(array_keys($this->flash)as$k){if($this->used[$k]){unset($this->flash[$k],$this->used[$k]);}else{$this->_use($k);}}$fkeys=array_keys($this->flash);$ukeys=array_keys($this->used);foreach(array_diff($fkeys,$ukeys)as$k=>$v){unset($this->used[$k]);}}function __toString(){$values=array();foreach($this->flash as$k=>$v){$values[]=sprintf("'%s': [%s, '%s']",$k,var_export($v,TRUE),$this->used[$k]?"used":"unused");}return"{".join(", ",$values)."}\n";}function __sleep(){$this->sweep();return array('flash','used');}function __wakeUp(){$this->discard();}}class Trails_Exception extends Exception{public$headers;function __construct($status=500,$reason=NULL,$headers=array()){if($reason===NULL){$reason=Trails_Response::get_reason($status);}parent::__construct($reason,$status);$this->headers=$headers;}function __toString(){return"{$this->code} {$this->message}";}}class Trails_DoubleRenderError extends Trails_Exception{function __construct(){$message="Render and/or redirect were called multiple times in this action. "."Please note that you may only call render OR redirect, and at most "."once per action.";parent::__construct(500,$message);}}class Trails_MissingFile extends Trails_Exception{function __construct($message){parent::__construct(500,$message);}}class Trails_RoutingError extends Trails_Exception{function __construct($message){parent::__construct(400,$message);}}class Trails_UnknownAction extends Trails_Exception{function __construct($message){parent::__construct(404,$message);}}class Trails_UnknownController extends Trails_Exception{function __construct($message){parent::__construct(404,$message);}}class Trails_SessionRequiredException extends Trails_Exception{function __construct(){$message="Tried to access a non existing session.";parent::__construct(500,$message);}}
+
+define('TRAILS_VERSION','0.6.9');class Trails_Dispatcher{public$trails_root;public$trails_uri;public$default_controller;function __construct($trails_root, $trails_uri, $default_controller){$this->trails_root=$trails_root;$this->trails_uri=$trails_uri;$this->default_controller=$default_controller;}function dispatch($uri){$old_handler=set_error_handler(array($this, 'error_handler'),5888);ob_start();$level=ob_get_level();$this->map_uri_to_response($this->clean_request_uri((string)$uri))->output();while(ob_get_level()>=$level){ob_end_flush();}if(isset($old_handler)){set_error_handler($old_handler);}}function map_uri_to_response($uri){try{[$controller_path, $unconsumed]=''===$uri?$this->default_route():$this->parse($uri);$controller=$this->load_controller($controller_path);$response=$controller->perform($unconsumed);}catch(Exception$e){$response=isset($controller)?$controller->rescue($e):$this->trails_error($e);}return$response;}function default_route(){if(!$this->file_exists($this->default_controller.'.php')){throw new Trails_MissingFile("Default controller '{$this->default_controller}' not found'");}return array($this->default_controller, '');}function trails_error($exception){ob_clean();$detailed=@$_SERVER['REMOTE_ADDR']==='127.0.0.1';$body=sprintf('<html><head><title>Trails Error</title></head>'.'<body><h1>%s</h1><pre>%s</pre></body></html>',htmlentities($exception->__toString()),$detailed?htmlentities($exception->getTraceAsString()):'');if($exception instanceof Trails_Exception){$response=new Trails_Response($body,$exception->headers,$exception->getCode(),$exception->getMessage());}else{$response=new Trails_Response($body,array(),500,$exception->getMessage());}return$response;}function clean_request_uri($uri){if(FALSE!==($pos=strpos($uri,'?'))){$uri=substr($uri,0,$pos);}return ltrim($uri,'/');}function parse($unconsumed, $controller=NULL){[$head, $tail]=$this->split_on_first_slash($unconsumed);if(!preg_match('/^\w+$/',$head)){throw new Trails_RoutingError("No route matches '$head'");}$controller=(isset($controller)?$controller.'/':'').$head;if($this->file_exists($controller.'.php')){return array($controller, $tail);}else if($this->file_exists($controller)){return$this->parse($tail,$controller);}throw new Trails_RoutingError("No route matches '$head'");}function split_on_first_slash($str){preg_match(":([^/]*)(/+)?(.*):",$str,$matches);return array($matches[1], $matches[3]);}function file_exists($path){return file_exists("{$this->trails_root}/controllers/$path");}function load_controller($controller){require_once"{$this->trails_root}/controllers/{$controller}.php";$class=Trails_Inflector::camelize($controller).'Controller';if(!class_exists($class)){throw new Trails_UnknownController("Controller missing: '$class'");}return new$class($this);}function error_handler($errno, $string, $file, $line, $context){if(!(5888&$errno))return false;throw new Trails_Exception(500,$string);}}class Trails_Response{public$body='',$status,$reason,$headers=array();function __construct($body='', $headers=array(), $status=NULL, $reason=NULL){$this->set_body($body);$this->headers=$headers;if(isset($status)){$this->set_status($status,$reason);}}function set_body($body){$this->body=$body;return$this;}function set_status($status, $reason=NULL){$this->status=$status;$this->reason=isset($reason)?$reason:$this->get_reason($status);return$this;}function get_reason($status){$reason=array(100 =>'Continue', 'Switching Protocols', 200 =>'OK', 'Created', 'Accepted', 'Non-Authoritative Information', 'No Content', 'Reset Content', 'Partial Content', 300 =>'Multiple Choices', 'Moved Permanently', 'Found', 'See Other', 'Not Modified', 'Use Proxy', '(Unused)', 'Temporary Redirect', 400 =>'Bad Request', 'Unauthorized', 'Payment Required', 'Forbidden', 'Not Found', 'Method Not Allowed', 'Not Acceptable', 'Proxy Authentication Required', 'Request Timeout', 'Conflict', 'Gone', 'Length Required', 'Precondition Failed', 'Request Entity Too Large', 'Request-URI Too Long', 'Unsupported Media Type', 'Requested Range Not Satisfiable', 'Expectation Failed', 500 =>'Internal Server Error', 'Not Implemented', 'Bad Gateway', 'Service Unavailable', 'Gateway Timeout', 'HTTP Version Not Supported');return isset($reason[$status])? $reason[$status]:'';}function add_header($key, $value){$this->headers[$key]=$value;return$this;}function output(){if(isset($this->status)){$this->send_header(sprintf('HTTP/1.1 %d %s',$this->status,$this->reason),TRUE,$this->status);}foreach($this->headers as $k=> $v){$this->send_header("$k: $v");}echo$this->body;}function send_header($header, $replace=FALSE, $status=NULL){if(isset($status)){header($header,$replace,$status);}else{header($header,$replace);}}}class Trails_Controller{protected$dispatcher,$response,$performed,$layout;function __construct($dispatcher){$this->dispatcher=$dispatcher;$this->erase_response();}function erase_response(){$this->performed=FALSE;$this->response=new Trails_Response();}function get_response(){return$this->response;}function perform($unconsumed){[$action, $args, $format]=$this->extract_action_and_args($unconsumed);$this->format=isset($format)?$format:'html';$before_filter_result=$this->before_filter($action,$args);if(!(FALSE===$before_filter_result||$this->performed)){$callable=$this->map_action($action);if(is_callable($callable)){call_user_func_array($callable,$args);}else{$this->does_not_understand($action,$args);}if(!$this->performed){$this->render_action($action);}$this->after_filter($action,$args);}return$this->response;}function extract_action_and_args($string){if(''===$string){return$this->default_action_and_args();}$format=NULL;if(preg_match('/^(.*[^\/.])\.(\w+)$/',$string,$matches)){[$_, $string, $format]=$matches;}$args=explode('/',$string);$action=array_shift($args);return array($action, $args, $format);}function default_action_and_args(){return array('index', array(), NULL);}function map_action($action){return array(&$this, $action.'_action');}function before_filter(&$action, &$args){}function after_filter($action, $args){}function does_not_understand($action, $args){throw new Trails_UnknownAction("No action responded to '$action'.");}function redirect($to){if($this->performed){throw new Trails_DoubleRenderError();}$this->performed=TRUE;$url=preg_match('#^(/|\w+://)#',$to)?$to:$this->url_for($to);$this->response->add_header('Location',$url)->set_status(302);}function render_text($text=' '){if($this->performed){throw new Trails_DoubleRenderError();}$this->performed=TRUE;$this->response->set_body($text);}function render_nothing(){$this->render_text('');}function render_action($action){$this->render_template($this->get_default_template($action),$this->layout);}function get_default_template($action){$class=get_class($this);$controller_name=Trails_Inflector::underscore(substr($class,0,-10));return$controller_name.'/'.$action;}function render_template($template_name, $layout=NULL){$factory=$this->get_template_factory();$template=$factory->open($template_name);$template->set_attributes($this->get_assigned_variables());if(isset($layout)){$template->set_layout($layout);}$this->render_text($template->render());}function get_template_factory(){return new Flexi\Factory($this->dispatcher->trails_root.'/views/');}function get_assigned_variables(){$assigns=array();$protected=get_class_vars(get_class($this));foreach(get_object_vars($this) as $var=> $value){if(!array_key_exists($var,$protected)){$assigns[$var]=&$this->$var;}}$assigns['controller']=$this;return$assigns;}function set_layout($layout){$this->layout=$layout;}function url_for($to){$args=func_get_args();$args=array_map('urlencode',$args);$args[0]=$to;return$this->dispatcher->trails_uri.'/'.join('/',$args);}function set_status($status, $reason_phrase=NULL){$this->response->set_status($status,$reason_phrase);}function set_content_type($type){$this->response->add_header('Content-Type',$type);}function rescue($exception){return$this->dispatcher->trails_error($exception);}function respond_to($ext){return$this->format===$ext;}}class Trails_Inflector{static function camelize($word){$parts=explode('/',$word);foreach($parts as $key=> $part){$parts[$key]=str_replace(' ','',ucwords(str_replace('_',' ',$part)));}return join('_',$parts);}static function underscore($word){$parts=explode('_',$word);foreach($parts as $key=> $part){$parts[$key]=preg_replace('/(?<=\w)([A-Z])/','_\\1',$part);}return strtolower(join('/',$parts));}}class Trails_Flash implements ArrayAccess{public$flash=array(),$used=array();static function instance(){if(!isset($_SESSION)){throw new Trails_SessionRequiredException();}if(!isset($_SESSION['trails_flash'])){$_SESSION['trails_flash']=new Trails_Flash();}return $_SESSION['trails_flash'];}function offsetExists($offset){return isset($this->flash[$offset]);}function offsetGet($offset){return$this->get($offset);}function offsetSet($offset, $value){$this->set($offset,$value);}function offsetUnset($offset){unset($this->flash[$offset], $this->used[$offset]);}function _use($k=NULL, $v=TRUE){if($k){$this->used[$k]=$v;}else{foreach($this->used as $k=> $value){$this->_use($k,$v);}}}function discard($k=NULL){$this->_use($k);}function&get($k){$return=NULL;if(isset($this->flash[$k])){$return=& $this->flash[$k];}return$return;}function keep($k=NULL){$this->_use($k,FALSE);}function set($k, $v){$this->keep($k);$this->flash[$k]=$v;}function set_ref($k, &$v){$this->keep($k);$this->flash[$k]=&$v;}function sweep(){foreach(array_keys($this->flash) as $k){if($this->used[$k]){unset($this->flash[$k], $this->used[$k]);}else{$this->_use($k);}}$fkeys=array_keys($this->flash);$ukeys=array_keys($this->used);foreach(array_diff($fkeys,$ukeys) as $k=> $v){unset($this->used[$k]);}}function __toString(){$values=array();foreach($this->flash as $k=> $v){$values[]=sprintf("'%s': [%s, '%s']",$k,var_export($v,TRUE), $this->used[$k]?"used":"unused");}return"{".join(", ",$values)."}\n";}function __sleep(){$this->sweep();return array('flash', 'used');}function __wakeUp(){$this->discard();}}class Trails_Exception extends Exception{public$headers;function __construct($status=500, $reason=NULL, $headers=array()){if($reason===NULL){$reason=Trails_Response::get_reason($status);}parent::__construct($reason,$status);$this->headers=$headers;}function __toString(){return"{$this->code} {$this->message}";}}class Trails_DoubleRenderError extends Trails_Exception{function __construct(){$message="Render and/or redirect were called multiple times in this action. "."Please note that you may only call render OR redirect, and at most "."once per action.";parent::__construct(500,$message);}}class Trails_MissingFile extends Trails_Exception{function __construct($message){parent::__construct(500,$message);}}class Trails_RoutingError extends Trails_Exception{function __construct($message){parent::__construct(400,$message);}}class Trails_UnknownAction extends Trails_Exception{function __construct($message){parent::__construct(404,$message);}}class Trails_UnknownController extends Trails_Exception{function __construct($message){parent::__construct(404,$message);}}class Trails_SessionRequiredException extends Trails_Exception{function __construct(){$message="Tried to access a non existing session.";parent::__construct(500,$message);}}
diff --git a/vendor/trails/trails.php b/vendor/trails/trails.php
index 96b9562..9117655 100644
--- a/vendor/trails/trails.php
+++ b/vendor/trails/trails.php
@@ -24,6 +24,7 @@
 /**
  * The version of the trails library.
  */
+
 define('TRAILS_VERSION', '0.6.9');
 
 
@@ -749,13 +750,6 @@ class Trails_Controller {
     $factory = $this->get_template_factory();
     $template = $factory->open($template_name);
 
-    # template requires setup ?
-    switch (get_class($template)) {
-      case 'Flexi_JsTemplate':
-        $this->set_content_type('text/javascript');
-        break;
-    }
-
     $template->set_attributes($this->get_assigned_variables());
 
     if (isset($layout)) {
@@ -769,10 +763,10 @@ class Trails_Controller {
   /**
    * Create and return a template factory for this controller.
    *
-   * @return a Flexi_TemplateFactory
+   * @return Flexi\Factory
    */
   function get_template_factory() {
-    return new Flexi_TemplateFactory($this->dispatcher->trails_root .
+    return new Flexi\Factory($this->dispatcher->trails_root .
                                      '/views/');
   }
 
-- 
cgit v1.0


From 1c2240fefb9250a6c466f80e464ea28c24bd7c09 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 16 May 2024 14:05:04 +0200
Subject: fix incorrect calls to Template::render(), re #4101

---
 app/views/fachabschluss/abschluesse/index.php   | 2 +-
 app/views/fachabschluss/faecher/index.php       | 2 +-
 app/views/module/module/index.php               | 2 +-
 app/views/search/module/index.php               | 2 +-
 app/views/shared/contacts/index.php             | 2 +-
 app/views/studiengaenge/studiengaenge/index.php | 2 +-
 app/views/studiengaenge/versionen/index.php     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/fachabschluss/abschluesse/index.php b/app/views/fachabschluss/abschluesse/index.php
index 2b39000..d650717 100644
--- a/app/views/fachabschluss/abschluesse/index.php
+++ b/app/views/fachabschluss/abschluesse/index.php
@@ -62,7 +62,7 @@
                         $pagination->set_attribute('page', $page);
                         $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_abschluesse=%s';
                         $pagination->set_attribute('pagelink', $page_link);
-                        echo $pagination->render('shared/pagechooser');
+                        echo $pagination->render();
                     ?>
 
                     </td>
diff --git a/app/views/fachabschluss/faecher/index.php b/app/views/fachabschluss/faecher/index.php
index 352dcb7..dcd9134 100644
--- a/app/views/fachabschluss/faecher/index.php
+++ b/app/views/fachabschluss/faecher/index.php
@@ -63,7 +63,7 @@
                         $pagination->set_attribute('page', $page);
                         $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_faecher=%s';
                         $pagination->set_attribute('pagelink', $page_link);
-                        echo $pagination->render('shared/pagechooser');
+                        echo $pagination->render();
                         ?>
 
                     </td>
diff --git a/app/views/module/module/index.php b/app/views/module/module/index.php
index 7f3df8b..6cd63e9 100644
--- a/app/views/module/module/index.php
+++ b/app/views/module/module/index.php
@@ -29,7 +29,7 @@
                     $pagination->set_attribute('page', $page);
                     $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_module=%s';
                     $pagination->set_attribute('pagelink', $page_link);
-                    echo $pagination->render('shared/pagechooser');
+                    echo $pagination->render();
                     ?>
                 </td>
             </tr>
diff --git a/app/views/search/module/index.php b/app/views/search/module/index.php
index c072cf0..8eac916 100644
--- a/app/views/search/module/index.php
+++ b/app/views/search/module/index.php
@@ -53,7 +53,7 @@
                     $pagination->set_attribute('page', $page);
                     $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_module=%s';
                     $pagination->set_attribute('pagelink', $page_link);
-                    echo $pagination->render('shared/pagechooser');
+                    echo $pagination->render();
                 ?>
             <? endif; ?>
             </td>
diff --git a/app/views/shared/contacts/index.php b/app/views/shared/contacts/index.php
index 6073574..6604263 100644
--- a/app/views/shared/contacts/index.php
+++ b/app/views/shared/contacts/index.php
@@ -84,7 +84,7 @@
                     $pagination->set_attribute('page', $page);
                     $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_contacts=%s';
                     $pagination->set_attribute('pagelink', $page_link);
-                    echo $pagination->render('shared/pagechooser');
+                    echo $pagination->render();
                     ?>
                 </td>
             </tr>
diff --git a/app/views/studiengaenge/studiengaenge/index.php b/app/views/studiengaenge/studiengaenge/index.php
index 26249d0..37d4d1d 100644
--- a/app/views/studiengaenge/studiengaenge/index.php
+++ b/app/views/studiengaenge/studiengaenge/index.php
@@ -42,7 +42,7 @@
                         $parts = explode('?', $controller->action_url('index'));
                         $page_link = reset($parts) . '?page_studiengaenge=%s';
                         $pagination->set_attribute('pagelink', $page_link);
-                        echo $pagination->render('shared/pagechooser');
+                        echo $pagination->render();
                         ?>
 
                     </td>
diff --git a/app/views/studiengaenge/versionen/index.php b/app/views/studiengaenge/versionen/index.php
index ebf8fb1..6460a59 100644
--- a/app/views/studiengaenge/versionen/index.php
+++ b/app/views/studiengaenge/versionen/index.php
@@ -29,7 +29,7 @@
                         $pagination->set_attribute('num_postings', $count);
                         $pagination->set_attribute('page', $page);
                         $pagination->set_attribute('pagelink', '?page=%s');
-                        echo $pagination->render('shared/pagechooser');
+                        echo $pagination->render();
                         ?>
                     </td>
                 </tr>
-- 
cgit v1.0


From f6c4560482983c4e48c94853cd221772f1b1a050 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 16 May 2024 14:19:11 +0200
Subject: fix incorrect calls to Template::render(), re #4101

---
 app/views/lvgruppen/lvgruppen/index.php   | 2 +-
 app/views/materialien/files/index.php     | 2 +-
 app/views/studiengaenge/faecher/index.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/lvgruppen/lvgruppen/index.php b/app/views/lvgruppen/lvgruppen/index.php
index d5ab6a8..2ce6014 100644
--- a/app/views/lvgruppen/lvgruppen/index.php
+++ b/app/views/lvgruppen/lvgruppen/index.php
@@ -91,7 +91,7 @@
                     $pagination->set_attribute('page', $page);
                     $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_lvgruppen=%s';
                     $pagination->set_attribute('pagelink', $page_link);
-                    echo $pagination->render("shared/pagechooser");
+                    echo $pagination->render();
                     ?>
                 </td>
             </tr>
diff --git a/app/views/materialien/files/index.php b/app/views/materialien/files/index.php
index 1b00cec..6b89847 100644
--- a/app/views/materialien/files/index.php
+++ b/app/views/materialien/files/index.php
@@ -111,7 +111,7 @@
                 // ARGH!
                 $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_files=%s';
                 $pagination->set_attribute('pagelink', $page_link);
-                echo $pagination->render("shared/pagechooser");
+                echo $pagination->render();
                 ?>
             </td>
         </tr>
diff --git a/app/views/studiengaenge/faecher/index.php b/app/views/studiengaenge/faecher/index.php
index 1b3f325..485d922 100644
--- a/app/views/studiengaenge/faecher/index.php
+++ b/app/views/studiengaenge/faecher/index.php
@@ -64,7 +64,7 @@
                         $parts = explode('?', $controller->action_url('index'));
                         $page_link = reset($parts) . '?page_faecher=%s';
                         $pagination->set_attribute('pagelink', $page_link);
-                        echo $pagination->render("shared/pagechooser");
+                        echo $pagination->render();
                         ?>
                     </td>
                 </tr>
-- 
cgit v1.0


From 9de74a2b988fca0f163894d64509044e39c10542 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 16 May 2024 14:35:00 +0200
Subject: remove calls to TextHelper class, re #4101

---
 app/views/admin/webservice_access/index.php        |  2 +-
 app/views/course/lvgselector/form.php              |  4 ++--
 app/views/course/lvgselector/subtree.php           |  2 +-
 .../course/wizard/steps/lvgroups/lvgroup_entry.php |  2 +-
 .../wizard/steps/lvgroups/lvgroup_searchentry.php  |  2 +-
 app/views/shared/log_event/show.php                |  2 +-
 app/views/studiengaenge/versionen/abschnitte.php   |  3 +--
 .../studiengaenge/versionen/details_abschnitt.php  |  2 +-
 resources/assets/stylesheets/scss/mvv.scss         | 24 ----------------------
 templates/mail/notification_html.php               |  2 +-
 10 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/app/views/admin/webservice_access/index.php b/app/views/admin/webservice_access/index.php
index 07edb4c..223e5c3 100644
--- a/app/views/admin/webservice_access/index.php
+++ b/app/views/admin/webservice_access/index.php
@@ -28,7 +28,7 @@
   </th>
 </tr>
 <? foreach ($ws_rules as $rule): ?>
-  <tr class="<?= TextHelper::cycle('table_row_even', 'table_row_odd') ?>">
+  <tr>
     <? if (isset($edit) && $edit == $rule->id) :?>
         <td>
             <a name="edit"></a>
diff --git a/app/views/course/lvgselector/form.php b/app/views/course/lvgselector/form.php
index 86e2af9..a1ae506 100644
--- a/app/views/course/lvgselector/form.php
+++ b/app/views/course/lvgselector/form.php
@@ -48,12 +48,12 @@
         <em><?= sprintf(_("Der Suchbegriff '%s' lieferte kein Ergebnis."), htmlReady($selection->getSearchKey())) ?></em>
       <? else : ?>
         <h3><?= _('Suchergebnisse') ?>:</h3>
-        <? TextHelper::reset_cycle(); $show_path = TRUE; $show_link = FALSE; ?>
+        <? $show_path = TRUE; $show_link = FALSE; ?>
         <? foreach ($selection->getSearchResult() as $area) : ?>
             <? // MVV: show LvGruppen with complete trails only ?>
             <? $pathes = ModuleManagementModelTreeItem::getPathes($area->getTrails(['Modulteil', 'StgteilabschnittModul',  'StgteilAbschnitt', 'StgteilVersion', 'Studiengang'])); ?>
             <? if (count($pathes)) : ?>
-          <div class="<?= TextHelper::cycle('odd', 'even') ?>">
+          <div>
             <?= $this->render_partial('course/lvgselector/entry', compact('area', 'show_path', 'show_link', 'pathes')); ?>
           </div>
             <? endif; ?>
diff --git a/app/views/course/lvgselector/subtree.php b/app/views/course/lvgselector/subtree.php
index f61463f..b8e05d4 100644
--- a/app/views/course/lvgselector/subtree.php
+++ b/app/views/course/lvgselector/subtree.php
@@ -8,7 +8,7 @@
                 $has_children = $child->hasChildren();
             ?>
 
-            <div class="<?= TextHelper::cycle('odd', 'even') ?>">
+            <div>
                 <?= $this->render_partial('course/lvgselector/entry',
                                           ['area' => $child,
                                                 'show_link' => $has_children]) ?>
diff --git a/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php b/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
index 09d2405..a7e2cd0 100644
--- a/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
+++ b/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
@@ -2,7 +2,7 @@
 # Lifter010: TODO
 $_id = htmlReady(implode('_', (array) $area->getId()));
 ?>
-<li id="lvgroup-tree-assigned-<?= $_id ?>" class="<?= TextHelper::cycle('odd', 'even') ?>">
+<li id="lvgroup-tree-assigned-<?= $_id ?>">
 <? if (!$locked) : ?>
    <?= Icon::create('trash', 'clickable')->asInput(["name" => 'lvgruppe_selection[remove]['.$_id.']', "onclick" => "return STUDIP.MVV.CourseWizard.removeLVGroup('".$_id."')", "class" => '',
        "data-id" => $_id, "data-course_id" => htmlReady($course_id)]) ?>
diff --git a/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php b/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
index a6715da..7c51448 100644
--- a/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
+++ b/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
@@ -1,7 +1,7 @@
 <?php
 $_id = htmlReady(implode('_', (array) $area->getId()));
 ?>
-<li id="lvgruppe_search_<?= $_id ?>" class="<?= TextHelper::cycle('odd', 'even') ?>">
+<li id="lvgruppe_search_<?= $_id ?>">
 
    <?= Icon::create('arr_2left', Icon::ROLE_SORT)->asInput([
        'name'    => "assign[{$_id}]",
diff --git a/app/views/shared/log_event/show.php b/app/views/shared/log_event/show.php
index ea96f89..eec2164 100644
--- a/app/views/shared/log_event/show.php
+++ b/app/views/shared/log_event/show.php
@@ -32,7 +32,7 @@ use Studip\Button, Studip\LinkButton;
         </th>
       </tr>
       <? foreach ($log_events as $log_event): ?>
-        <tr class="<?= TextHelper::cycle('table_row_even', 'table_row_odd') ?>">
+        <tr>
           <td style="font-size: smaller; white-space: nowrap;">
             <?= date('d.m.Y H:i:s', $log_event['time']) ?>
           </td>
diff --git a/app/views/studiengaenge/versionen/abschnitte.php b/app/views/studiengaenge/versionen/abschnitte.php
index 1620450..83c1173 100644
--- a/app/views/studiengaenge/versionen/abschnitte.php
+++ b/app/views/studiengaenge/versionen/abschnitte.php
@@ -59,8 +59,7 @@
                     </tr>
                 <? endif; ?>
             </tbody>
-        <? endforeach;
-        TextHelper::reset_cycle(); ?>
+        <? endforeach; ?>
         <? if (count($version->abschnitte) > 0 && MvvPerm::haveFieldPermModul_zuordnungen('StgteilAbschnitt', MvvPerm::PERM_CREATE)
         ) : ?>
             <tbody>
diff --git a/app/views/studiengaenge/versionen/details_abschnitt.php b/app/views/studiengaenge/versionen/details_abschnitt.php
index 3b1c0e7..79f8da7 100644
--- a/app/views/studiengaenge/versionen/details_abschnitt.php
+++ b/app/views/studiengaenge/versionen/details_abschnitt.php
@@ -59,7 +59,7 @@
                 </tr>
                 <? endif; ?>
             </tbody>
-        <? endforeach; TextHelper::reset_cycle(); ?>
+        <? endforeach; ?>
         <? if (MvvPerm::haveFieldPermModul_zuordnungen($abschnitt, MvvPerm::PERM_CREATE)) : ?>
             <tbody>
                 <tr>
diff --git a/resources/assets/stylesheets/scss/mvv.scss b/resources/assets/stylesheets/scss/mvv.scss
index c93b214..ce85701 100644
--- a/resources/assets/stylesheets/scss/mvv.scss
+++ b/resources/assets/stylesheets/scss/mvv.scss
@@ -253,22 +253,6 @@ ul {
         dd {
             margin: 0;
         }
-
-        &.even {
-            background-color: var(--dark-gray-color-10);
-
-            &:hover {
-                background-color: var(--content-color-60);
-            }
-        }
-
-        &.odd {
-            background-color: var(--dark-gray-color-5);
-
-            &:hover {
-                background-color: var(--content-color-40);
-            }
-        }
     }
 
     &.mvv-modul li {
@@ -559,14 +543,6 @@ form.default .mvv-inst-chooser select {
     h3 {
         margin-top: 1em;
     }
-
-    &.odd {
-        background-color: var(--dark-gray-color-5);
-    }
-
-    &.even {
-        background-color: var(--content-color-20);
-    }
 }
 
 #lvgruppe_selection_chosen {
diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php
index 4502ae5..93bc1a8 100644
--- a/templates/mail/notification_html.php
+++ b/templates/mail/notification_html.php
@@ -111,7 +111,7 @@
                   </td>
                 </tr>
                 <? foreach ($data as $module) : ?>
-                <tr class="<?= TextHelper::cycle('hover_odd', 'hover_even') ?>">
+                <tr>
                   <td>
                     <a href="<?= URLHelper::getLink($module['url'], ['sso' => $sso]) ?>"><?= htmlReady($module['text']) ?></a>
                   </td>
-- 
cgit v1.0


From cf20da4779a8818f2cb471b713319c353ea0f935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Thu, 16 May 2024 12:46:45 +0000
Subject: =?UTF-8?q?Resolve=20#4146=20"Verwaltung=20von=20Veranstaltungen:?=
 =?UTF-8?q?=20Lehrendenfilter=20zeigt=20zuviele=20Eintr=C3=A4ge"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4146

Merge request studip/studip!2988
---
 app/controllers/admin/courses.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 27b6ca6..a798880 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -556,7 +556,9 @@ class Admin_CoursesController extends AuthenticatedController
             if (!$config->MY_INSTITUTES_DEFAULT) {
                 $config->delete('ADMIN_COURSES_TEACHERFILTER');
             } else {
-                $exists = InstituteMember::countBySQL("INNER JOIN `auth_user_md5` USING (`user_id`) WHERE `user_inst`.`user_id` = :user_id AND `user_inst`.`Institut_id` = :institut_id AND `auth_user_md5`.`perms` = 'dozent' ", [
+                $include_children = $GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN ? ' OR Institute.fakultaets_id = :institut_id ' : '';
+
+                $exists = InstituteMember::countBySQL("INNER JOIN `Institute` USING (`Institut_id`) WHERE `user_inst`.`user_id` = :user_id AND (`Institute`.`Institut_id` = :institut_id $include_children) AND `user_inst`.`inst_perms` = 'dozent' ", [
                     'user_id' => $config->ADMIN_COURSES_TEACHERFILTER,
                     'institut_id' => $config->MY_INSTITUTES_DEFAULT
                 ]) > 0;
@@ -1679,11 +1681,20 @@ class Admin_CoursesController extends AuthenticatedController
      */
     private function getTeacherWidget($institut_id = null)
     {
-        $institut_id = $institut_id ?: $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
-        if (str_contains($institut_id, '_')) {
-            $institut_id = substr($institut_id, 0, strpos($institut_id, '_'));
+        if ($institut_id) {
+            if (str_contains($institut_id, '_')) {
+                $institut_id = substr($institut_id, 0, strpos($institut_id, '_'));
+                $GLOBALS['user']->cfg->store('MY_INSTITUTES_INCLUDE_CHILDREN', 1);
+            } else {
+                $GLOBALS['user']->cfg->store('MY_INSTITUTES_INCLUDE_CHILDREN', 0);
+            }
+        } else {
+            $institut_id = $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
         }
+
         $teachers = [];
+        $include_children = $GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN ? ' OR Institute.fakultaets_id = :institut_id ' : '';
+
         if ($institut_id) {
             $teachers = DBManager::get()->fetchAll("
                 SELECT auth_user_md5.*, user_info.*
@@ -1691,8 +1702,8 @@ class Admin_CoursesController extends AuthenticatedController
                     LEFT JOIN user_info ON (auth_user_md5.user_id = user_info.user_id)
                     INNER JOIN user_inst ON (user_inst.user_id = auth_user_md5.user_id)
                     INNER JOIN Institute ON (Institute.Institut_id = user_inst.Institut_id)
-                WHERE (Institute.Institut_id = :institut_id OR Institute.fakultaets_id = :institut_id)
-                    AND auth_user_md5.perms = 'dozent'
+                WHERE (Institute.Institut_id = :institut_id $include_children)
+                    AND user_inst.inst_perms = 'dozent'
                 GROUP BY auth_user_md5.user_id
                 ORDER BY auth_user_md5.Nachname ASC, auth_user_md5.Vorname ASC
             ", [
-- 
cgit v1.0


From 1b282d0fc3303c2ecfed9073bc60497012ac078a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 17 May 2024 07:28:29 +0000
Subject: set correct return type, fixes #4180

Closes #4180

Merge request studip/studip!3020
---
 lib/classes/JsonApi/JsonApiController.php    | 6 +++---
 lib/classes/JsonApi/NonJsonApiController.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/classes/JsonApi/JsonApiController.php b/lib/classes/JsonApi/JsonApiController.php
index 1718c52..614650d 100644
--- a/lib/classes/JsonApi/JsonApiController.php
+++ b/lib/classes/JsonApi/JsonApiController.php
@@ -375,12 +375,12 @@ class JsonApiController
      *
      * @param Request $request Request der eingehende Request
      *
-     * @return mixed entweder null oder das User-Objekt des
-     *               "eingeloggten" Nutzers
+     * @return null|\User entweder null oder das User-Objekt des "eingeloggten"
+     *                    Nutzers
      */
     public function getUser(Request $request)
     {
-        return $request->getAttribute(Authentication::USER_KEY, null);
+        return $request->getAttribute(Authentication::USER_KEY);
     }
 
     /**
diff --git a/lib/classes/JsonApi/NonJsonApiController.php b/lib/classes/JsonApi/NonJsonApiController.php
index 8384b54..bfc51af 100644
--- a/lib/classes/JsonApi/NonJsonApiController.php
+++ b/lib/classes/JsonApi/NonJsonApiController.php
@@ -49,11 +49,11 @@ class NonJsonApiController
     }
 
     /**
-     * @return mixed
+     * @return null|\User
      */
     protected function getUser(Request $request)
     {
-        return $request->getAttribute(Authentication::USER_KEY, null);
+        return $request->getAttribute(Authentication::USER_KEY);
     }
 
     /**
-- 
cgit v1.0


From 214ed2e8c66825e05e6d367f12f785721d6803b4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 17 May 2024 08:44:33 +0000
Subject: fixes #4181

Closes #4181

Merge request studip/studip!3021
---
 lib/flexi/Factory.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/flexi/Factory.php b/lib/flexi/Factory.php
index b6c30fd..c33bd43 100644
--- a/lib/flexi/Factory.php
+++ b/lib/flexi/Factory.php
@@ -224,10 +224,10 @@ class Factory
      * Class method to parse, render and return the presentation of a
      * template.
      *
-     * @param Template|string $template   A name of a template or a template
-     * @param array           $attributes An associative array of attributes and their
-     *                                    associated values.
-     * @param string|null     $layout     A name of a layout template.
+     * @param Template|string      $template   A name of a template or a template
+     * @param array                $attributes An associative array of attributes and their
+     *                                         associated values.
+     * @param Template|string|null $layout     A name of a layout template or a template.
      *
      * @return string A string representing the rendered presentation.
      *
@@ -236,7 +236,7 @@ class Factory
     public function render(
         Template|string $template,
         array $attributes = [],
-        ?string $layout = null
+        Template|string|null $layout = null
     ): string {
         return $this->open($template)->render($attributes, $layout);
     }
-- 
cgit v1.0


From 8ff3266e14f93c712eea0098bfa727858114e9b0 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 17 May 2024 09:44:29 +0000
Subject: remove obsolet functions, fixes #4179

Closes #4179

Merge request studip/studip!3019
---
 RELEASE-NOTES.md  |  14 ++
 lib/dates.inc.php | 514 ++++++++++++++----------------------------------------
 2 files changed, 148 insertions(+), 380 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9ac30a3..d30f929 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -41,6 +41,20 @@
 
   Sollte ein Plugin manuell Flexi einbinden, so wird dies zu einem Fehler führen. Jegliches Einbinden von Dateien
   unterhalb von `vendor/flexi` muss ersatzlos entfernt werden.
+- Die folgenden Funktionen wurden entfernt ([Issue #4179](https://gitlab.studip.de/studip/studip/-/issues/4179))
+  - `getWeekdays($short = true)`
+  - `veranstaltung_beginn($seminar_id = '', $return_mode = '')`
+  - `veranstaltung_beginn_from_metadata($reg_irreg, $sem_begin, $start_woche, $start_termin,$turnus_data, $return_mode='int')`
+  - `get_sem_name ($time)`
+  - `get_sem_num ($time)`
+  - `get_sem_num_sem_browse ()`
+  - `get_semester($seminar_id)`
+  - `delete_date($termin_id, $topic_delete = TRUE, $folder_move = TRUE, $sem_id=0)`
+  - `delete_range_of_dates($range_id, $topics = FALSE)`
+  - `isSchedule ($sem_id, $presence_dates_only = TRUE, $clearcache = FALSE)`
+  - `isMetadateCorrespondingDate ($termin_id, $begin = '', $end = '', $seminar_id='')`
+  - `getPresenceTypes()`
+
 
 ## Security related issues
 
diff --git a/lib/dates.inc.php b/lib/dates.inc.php
index 851ee92..497a5d1 100644
--- a/lib/dates.inc.php
+++ b/lib/dates.inc.php
@@ -1,86 +1,48 @@
 <?php
-# Lifter002: TODO
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: DONE - no forms
-
-/*
-dates.inc.php - basale Routinen zur Terminveraltung.
-Copyright (C) 2001 Stefan Suchi <suchi@gmx.de>, André Noack <anoack@mcis.de>
-
-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.
-*/
+/**
+ * dates.inc.php - basale Routinen zur Terminveraltung.
+ * Copyright (C) 2001 Stefan Suchi <suchi@gmx.de>, André Noack <anoack@mcis.de>
+ *
+ * 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 'lib/calendar_functions.inc.php';
-require_once 'lib/raumzeit/raumzeit_functions.inc.php'; // Helper-Funktionen
+require_once 'lib/raumzeit/raumzeit_functions.inc.php';
 
-/*
+/**
  * getWeekday liefert einen String mit einem Tagesnamen.
  *
- * day_num  integer PHP-konformer Tag (0-6)
- * short    boolean Wenn gesetzt wird der Tag verkürzt zurückgegeben.
+ * @param int $day_num integer PHP-konformer Tag (0-6)
+ * @param bool $short boolean Wenn gesetzt wird der Tag verkürzt zurückgegeben.
+ *
+ * @throws Exception
  */
-function getWeekday($day_num, $short = true): string
+function getWeekday(int $day_num, bool $short = true): string
 {
     if ($day_num < 0 || $day_num > 6) {
         throw new Exception('Invalid day number');
     }
-    switch ($day_num) {
-        case 0:
-            $day = $short ? _("So") : _("Sonntag");
-            break;
-        case 1:
-            $day = $short ? _("Mo") : _("Montag");
-            break;
-        case 2:
-            $day = $short ? _("Di") : _("Dienstag");
-            break;
-        case 3:
-            $day = $short ? _("Mi") : _("Mittwoch");
-            break;
-        case 4:
-            $day = $short ? _("Do") : _("Donnerstag");
-            break;
-        case 5:
-            $day = $short ? _("Fr") : _("Freitag");
-            break;
-        case 6:
-            $day = $short ? _("Sa") : _("Samstag");
-            break;
-    }
-    return $day;
-}
-
-
-/**
- * Returns an array with strings of all weekdays, starting on monday.
- *
- * @param bool $short If this parameter is set to true, a short
- *     version of the day is returned. Defaults to true.
- */
-function getWeekdays($short = true)
-{
-    return [
-        getWeekday(1, $short), //Monday
-        getWeekday(2, $short), //Tuesday
-        getWeekday(3, $short), //Wednesday
-        getWeekday(4, $short), //Thursday
-        getWeekday(5, $short), //Friday
-        getWeekday(6, $short), //Saturday
-        getWeekday(0, $short)  //Sunday
-    ];
+    return match($day_num) {
+        0 => $short ? _('So') : _('Sonntag'),
+        1 => $short ? _('Mo') : _('Montag'),
+        2 => $short ? _('Di') : _('Dienstag'),
+        3 => $short ? _('Mi') : _('Mittwoch'),
+        4 => $short ? _('Do') : _('Donnerstag'),
+        5 => $short ? _('Fr') : _('Freitag'),
+        6 => $short ? _('Sa') : _('Samstag'),
+    };
 }
 
 
@@ -88,28 +50,29 @@ function getWeekdays($short = true)
  * getMonthName returns the localized name of a certain month in
  * either the abbreviated form (default) or as the actual name.
  *
- * @param int  $month Month number
+ * @param string $month Month number
  * @param bool $short Display the abbreviated version or the actual
  *                    name of the month (defaults to abbreviated)
- * @return String Month name
+ * @return string Month name
  * @throws Exception when passed an invalid month number
  */
-function getMonthName($month, $short = true) {
+function getMonthName(string $month, bool $short = true): string
+{
     $month = (int)$month;
 
     $months = [
-         1 => [_('Januar'),    _('Jan.')],
-         2 => [_('Februar'),   _('Feb.')],
-         3 => [_('März'),      _('März')],
-         4 => [_('April'),     _('Apr.')],
-         5 => [_('Mai'),       _('Mai')],
-         6 => [_('Juni'),      _('Juni')],
-         7 => [_('Juli'),      _('Juli')],
-         8 => [_('August'),    _('Aug.')],
-         9 => [_('September'), _('Sep.')],
-        10 => [_('Oktober'),   _('Okt.')],
-        11 => [_('November'),  _('Nov.')],
-        12 => [_('Dezember'),  _('Dez.')],
+        1  => [_('Januar'), _('Jan.')],
+        2  => [_('Februar'), _('Feb.')],
+        3  => [_('März'), _('März')],
+        4  => [_('April'), _('Apr.')],
+        5  => [_('Mai'), _('Mai')],
+        6  => [_('Juni'), _('Juni')],
+        7  => [_('Juli'), _('Juli')],
+        8  => [_('August'), _('Aug.')],
+        9  => [_('September'), _('Sep.')],
+        10 => [_('Oktober'), _('Okt.')],
+        11 => [_('November'), _('Nov.')],
+        12 => [_('Dezember'), _('Dez.')],
     ];
     if (!isset($months[$month])) {
         throw new Exception("Invalid month '{$month}'");
@@ -117,81 +80,41 @@ function getMonthName($month, $short = true) {
     return $months[$month][(int)$short];
 }
 
-function leadingZero($num) {
+function leadingZero(string $num): string
+{
     if ($num == '') return '00';
     if (mb_strlen($num) < 2) {
-        return '0'.$num;
+        return '0' . $num;
     } else {
         return $num;
     }
 }
 
-/* veranstaltung_beginn liefert den tatsächlichen ersten Termin einer Veranstaltung */
-function veranstaltung_beginn($seminar_id = '', $return_mode = '') {
-    if ($seminar_id == '') return 'dates.inc.php:veranstaltung_beginn - Fehlerhafter Aufruf!';
-    $sem = new Seminar($seminar_id);
-    return $sem->getFirstDate($return_mode);
-}
 
-/*
-Die Funktion veranstaltung_beginn_from_metadata errechnet den ersten Seminartermin aus dem Turnus Daten.
-Zurueckgegeben wird ausschließlich ein Timestamp
-Diese Funktion arbeitet im 'ad hoc' Modus und erwartet die einzelnen Variabeln des Metadaten-Arrays als Uebergabe.
-Konkrete Termine werde dabei NICHT mit beruecksichtigt!
-*/
-function veranstaltung_beginn_from_metadata($reg_irreg, $sem_begin, $start_woche, $start_termin,$turnus_data, $return_mode='int') {
-    $ret_time = 0;
-    if( $return_mode != 'int'){
-        echo "<br>Fehler in dates.inc.php: veranstaltung_beginn_from_metadata() unterstuetzt nur den return mode 'int'.";
-        die();
-    }
-    $semester = Semester::findByTimestamp($sem_begin);
-    $dow = date("w", $semester['vorles_beginn']);
-    if ($dow <= 5)
-        $corr = ($dow -1) * -1;
-    elseif ($dow == 6)
-        $corr = 2;
-    elseif ($dow == 0)
-        $corr = 1;
-    else
-    $corr = 0;
-
-    if(is_array($turnus_data)){
-        foreach ($turnus_data as $key => $val) {
-            $start_time = mktime ((int)$val['start_stunde'], (int)$val['start_minute'], 0, date("n", $semester['vorles_beginn']), (date("j", $semester['vorles_beginn'])+$corr) + ($val['day'] -1) + ($start_woche * 7), date("Y", $semester['vorles_beginn']));
-            if (($start_time < $ret_time) || ($ret_time == 0)) {
-                $ret_time = $start_time;
-            }
-        }
-    }
-
-    return $ret_time;
-}
-
-
-/*
+/**
  * The function shrink_dates expects an array of dates where the start_time and the end_time is noted
  * and creates a compressed version (spanning f.e. multiple dates).
  *
- * Returns an array, where each element is one condensed entry. (f.e. 10.6 - 14.6 8:00 - 12:00,)
+ * Returns an array, where each element is one condensed entry. (f.e. 10.6 - 14.6 8:00 - 12:00)
  */
-function shrink_dates($dates) {
+function shrink_dates(array $dates): array
+{
     $ret = [];
 
     // First step: Clean out all duplicate dates (the dates are sorted)
     foreach ($dates as $key => $date) {
         if (isset($dates[$key + 1])) {
-            if ($dates[$key + 1]['start_time'] == $date['start_time']
-                    && $dates[$key + 1]['end_time'] == $date['end_time']) {
+            if ($dates[$key + 1]['start_time'] === $date['start_time']
+                && $dates[$key + 1]['end_time'] === $date['end_time']) {
                 unset($dates[$key]);
             }
         }
     }
 
     // Second step: Make sure the dates are still ordered by start- and end-time without any holes
-    usort($dates, function($a, $b) {
-        if ($a['start_time'] == $b['start_time']) {
-            if ($a['end_time'] == $b['end_time']) return 0;
+    usort($dates, function ($a, $b) {
+        if ($a['start_time'] === $b['start_time']) {
+            if ($a['end_time'] === $b['end_time']) return 0;
             return ($a['end_time'] > $b['end_time']) ? 1 : -1;
         }
 
@@ -199,18 +122,18 @@ function shrink_dates($dates) {
     });
 
     // Third step: Check which dates are follow-ups
-    for ($i=1; $i < sizeof($dates); $i++) {
-        if (((date("G", $dates[$i-1]["start_time"])) == date("G", $dates[$i]["start_time"]))
-                && ((date("i", $dates[$i-1]["start_time"])) == date("i", $dates[$i]["start_time"]))
-                && ((date("G", $dates[$i-1]["end_time"])) == date("G", $dates[$i]["end_time"]))
-                && ((date("i", $dates[$i-1]["end_time"])) == date("i", $dates[$i]["end_time"]))) {
-            $dates[$i]["time_match"] = true;
+    for ($i = 1; $i < sizeof($dates); $i++) {
+        if (((date('G', $dates[$i - 1]['start_time'])) === date('G', $dates[$i]['start_time']))
+            && ((date('i', $dates[$i - 1]['start_time'])) === date('i', $dates[$i]['start_time']))
+            && ((date('G', $dates[$i - 1]['end_time'])) === date('G', $dates[$i]['end_time']))
+            && ((date('i', $dates[$i - 1]['end_time'])) === date('i', $dates[$i]['end_time']))) {
+            $dates[$i]['time_match'] = true;
         }
 
-        if (((date ("z", $dates[$i]["start_time"])-1) == date ("z", $dates[$i-1]["start_time"]))
-                || ((date ("z", $dates[$i]["start_time"]) == 0) && (date ("j", $dates[$i-1]["start_time"]) == 0))) {
-            if (!empty($dates[$i]["time_match"])) {
-                $dates[$i]["conjuncted"] = true;
+        if (((date('z', $dates[$i]['start_time']) - 1) === date('z', $dates[$i - 1]['start_time']))
+            || ((date('z', $dates[$i]['start_time']) == 0) && (date('j', $dates[$i - 1]['start_time']) == 0))) {
+            if (!empty($dates[$i]['time_match'])) {
+                $dates[$i]['conjuncted'] = true;
             }
         }
     }
@@ -218,37 +141,37 @@ function shrink_dates($dates) {
     // Fourth step: aggregate the dates with follow-ups
     $return_string = '';
     // create text-output
-    for ($i=0; $i < sizeof($dates); $i++) {
+    for ($i = 0; $i < count($dates); $i++) {
         $conjuncted = true;
-        if (empty($dates[$i]["conjuncted"])) {
+        if (empty($dates[$i]['conjuncted'])) {
             $conjuncted = false;
         }
 
-        if (empty($dates[$i]["conjuncted"]) || empty($dates[$i+1]["conjuncted"])) {
+        if (empty($dates[$i]['conjuncted']) || empty($dates[$i + 1]['conjuncted'])) {
             $return_string .= strftime(' %A, %d.%m.%Y', $dates[$i]['start_time']);
         }
 
-        if (!$conjuncted && !empty($dates[$i+1]["conjuncted"])) {
+        if (!$conjuncted && !empty($dates[$i + 1]['conjuncted'])) {
             $return_string .= ' -';
-            $conjuncted = true;
-        } else if (empty($dates[$i+1]["conjuncted"]) && !empty($dates[$i+1]["time_match"])) {
+            $conjuncted    = true;
+        } else if (empty($dates[$i + 1]['conjuncted']) && !empty($dates[$i + 1]['time_match'])) {
             $return_string .= ',';
         }
 
-        if (empty($dates[$i+1]["time_match"])) {
+        if (empty($dates[$i + 1]['time_match'])) {
             // check if the current date is for a whole day
-            if ((($dates[$i]["end_time"] - $dates[$i]["start_time"]) / 60 / 60) > 23) {
-                $return_string .= ' ('. _('ganztägig') . ')';
+            if ((($dates[$i]['end_time'] - $dates[$i]['start_time']) / 60 / 60) > 23) {
+                $return_string .= ' (' . _('ganztägig') . ')';
             } else {
-                $return_string .= ' ' . date("H:i", $dates[$i]["start_time"]);
-                if (date("H:i", $dates[$i]["start_time"]) != date("H:i", $dates[$i]["end_time"])) {
-                    $return_string .= ' - ' . date("H:i", $dates[$i]["end_time"]);
+                $return_string .= ' ' . date('H:i', $dates[$i]['start_time']);
+                if (date('H:i', $dates[$i]['start_time']) != date('H:i', $dates[$i]['end_time'])) {
+                    $return_string .= ' - ' . date('H:i', $dates[$i]['end_time']);
                 }
             }
         }
 
-        if ($return_string != '' && empty($dates[$i+1]['conjuncted']) && empty($dates[$i+1]['time_match'])) {
-            $ret[] = $return_string;
+        if ($return_string != '' && empty($dates[$i + 1]['conjuncted']) && empty($dates[$i + 1]['time_match'])) {
+            $ret[]         = $return_string;
             $return_string = '';
         }
     }
@@ -256,39 +179,40 @@ function shrink_dates($dates) {
     return $ret;
 }
 
-/*
-Die Funktion Vorbesprechung ueberpueft, ob es eine Vorbesprechung gibt und gibt in diesem
-Falle den entsprechenden Timestamp zurueck. Ansonsten wird FALSE zurueckgegeben.
-*/
+/**
+ * The preliminary meeting function checks whether there is a preliminary meeting and in this case,
+ * returns the corresponding preliminary meeting location. Otherwise FALSE is returned.
+ *
+ * @param string $seminar_id
+ * @param string $type
+ * @return false|string|null
+ */
 
-function vorbesprechung ($seminar_id, $type = 'standard')
+function vorbesprechung(string $seminar_id, string $type = 'standard'): false|string|null
 {
-    $query = "SELECT termin_id
-              FROM termine
-              WHERE range_id = ? AND date_typ = '2'
-              ORDER BY date";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$seminar_id]);
-    $termin_id = $statement->fetchColumn();
+    $termin_id = DBManager::get()->fetchColumn(
+        "SELECT termin_id FROM termine WHERE range_id = ? AND date_typ = '2' ORDER BY date",
+        [$seminar_id]
+    );
 
     if (!$termin_id) {
         return false;
     }
 
     $termin = new SingleDate($termin_id);
-    $ret = $termin->toString();
+    $ret    = $termin->toString();
     if ($termin->getResourceID()) {
-        $ret .= ', '._("Ort:").' ';
+        $ret .= ', ' . _("Ort:") . ' ';
         switch ($type) {
             case 'export':
                 $room = Room::find($termin->getResourceID());
-                $ret .= $room->name;
+                $ret  .= $room->name;
                 break;
 
             case 'standard':
             default:
                 $resource = Resource::find($termin->getResourceID());
-                $ret .= '<a href="' . $resource->getActionLink('show') . '" data-dialog="1">'
+                $ret      .= '<a href="' . $resource->getActionLink('show') . '" data-dialog="1">'
                     . htmlReady($resource->name) . '</a>';
                 break;
         }
@@ -296,180 +220,25 @@ function vorbesprechung ($seminar_id, $type = 'standard')
     return $ret;
 }
 
-/*
-Die Funktion get_sem_name gibt den Namen eines Semester, in dem ein uebergebener Timestamp liegt, zurueck
-*/
-
-function get_sem_name ($time) {
-    $semester = Semester::findByTimestamp($time);
-    return $semester->name;
-}
-
-/*
-Die Funktion get_sem_num gibt die Nummer eines Semester, in dem ein uebergebener Timestamp liegt, zurueck
-*/
-
-function get_sem_num ($time) {
-    $all_semester = Semester::findAllVisible(false);
-    foreach ($all_semester as $key=>$val)
-        if (($time >= $val["beginn"]) AND ($time <= $val["ende"]))
-            return $key;
-
-}
-
-function get_sem_num_sem_browse () {
-    $all_semester = Semester::findAllVisible(false);
-    $time = time();
-    $ret = false;
-    foreach ($all_semester as $key=>$val){
-        if ($ret && ($val["vorles_ende"] >= $time)){
-            $ret = $key;
-            break;
-        }
-        if ($time >= $val["vorles_ende"]){
-            $ret = true;
-        }
-    }
-    return $ret;
-}
 
 /**
- * Die Funktion get_semester gibt den oder die Semester einer speziellen Veranstaltung aus.
- * @deprecated
+ * a small helper funktion to get the type query for "Sitzungstermine"
+ * (this dates are important to get the regularly, presence dates
+ * for a seminar
+ *
+ * @return string  the SQL-clause to select only the "Sitzungstermine"
+ *
  */
-function get_semester($seminar_id)
-{
-    $course = Course::find($seminar_id);
-    return $course->semester_text;
-}
-
-/*
-Die function delete_date löscht einen Termin und verschiebt daran haegende
-Ordner in den allgemeinen Ordner.
-Der erste Parameter ist die termin_id des zu löschenden Termins.
-Der zweite Parameter topic_id gibt an, ob auch die zu diesem Termin gehoerenden
-Postings im Forensystem geloescht werden sollen.
-0 bzw. FALSE : keine Topics loeschen
-> 0 : rekursives loeschen von topic_id
-Der dritte Parameter gibt analog an, ob auch die zu diesem Terminen gehoerenden
-Folder im Ordnersystem geloescht werden sollen.
-Der Rückgabewert der Funktion ist die Anzahl der insgesamt gelöschten Items.
--1 bedeutet einen Fehler beim Loeschen des Termins.
-Ausgabe wird keine produziert.
-Es erfolgt keine Überprüfung der Berechtigung innerhalb der Funktion,
-dies muss das aufrufende Script sicherstellen.
-*/
-
-function delete_date($termin_id, $topic_delete = TRUE, $folder_move = TRUE, $sem_id=0)
-{
-    //Deleting folders was removed since folders can't be assigned to
-    //single dates, only to topics.
-
-    ## Und den Termin selbst loeschen
-    $query = "DELETE FROM termine WHERE termin_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$termin_id]);
-
-    if ($statement->rowCount() && Config::get()->RESOURCES_ENABLE) {
-        //The date has been successfully deleted:
-        //Now we must delete all resource bookings which are
-        //attached to it:
-        ResourceBooking::deleteBySql(
-            'assign_user_id = :range_id',
-            [
-                'range_id' => $termin_id
-            ]
-        );
-    }
-}
-
-/*
-Die function delete_range_of_dates löscht Termine mit allen daran haengenden Items.
-Der erste Parameter ist die range_id der zu löschenden Termine.
-Es koennen also mit einem Aufruf alle Termine eines Seminares,
-eines Institutes oder persoenliche Termine eines Benutzers aus der Datenbank entfernt werden.
-Dokumente und Literatur an diesen Terminen werden auf jeden Fall gelöscht.
-Der zweite Parameter topics gibt an, ob auch die zu diesen Terminen gehoerenden
-Postings im Forensystem geloescht werden sollen.
-0 bzw. FALSE : keine Topics loeschen
-1 bzw. TURE : rekursives Loeschen der Postings
-Der Rückgabewert der Funktion ist die Anzahl der gelöschten Termine.
-Ausgabe wird keine produziert.
-Es erfolgt keine Überprüfung der Berechtigung innerhalb der Funktion,
-dies muss das aufrufende Script sicherstellen.
-*/
-
-function delete_range_of_dates($range_id, $topics = FALSE)
-{
-    $count = 0;
-
-    ## Termine finden...
-    $query = "SELECT termin_id FROM termine WHERE range_id = ?";
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$range_id]);
-
-    while ($termin_id = $statement->fetchColumn()) {       // ...und nacheinander...
-        delete_date($termin_id, $topics, true, $range_id);
-        $count++;
-    }
-
-    return $count;
-}
-
-
-//Checkt, ob Ablaufplantermine zu gespeicherten Metadaten vorliegen
-function isSchedule ($sem_id, $presence_dates_only = TRUE, $clearcache = FALSE)
+function getPresenceTypeClause(): string
 {
-    $query = "SELECT COUNT(*)
-              FROM termine
-              WHERE range_id = ? AND metadate_id != '' AND metadate_id IS NOT NULL";
-    if ($presence_dates_only) {
-        $query .= " AND date_typ IN " . getPresenceTypeClause();
-    }
-
-    $statement = DBManager::get()->prepare($query);
-    $statement->execute([$sem_id]);
-
-    return $statement->fetchColumn();
-}
-
-
-/**
-* this functions checks, if a date corresponds with a metadate
-*
-* @param        string  termin_id
-* @return       boolean TRUE, if the date corresponds to a metadate
-*
-*/
-function isMetadateCorrespondingDate ($termin_id, $begin = '', $end = '', $seminar_id='')
-{
-    $termin = new SingleDate($termin_id);
-    if ($termin->getMetaDateID()) {
-        return $termin->getRangeId();
-    }
-
-    return false;
-}
-
-
-/**
-* a small helper funktion to get the type query for "Sitzungstermine"
-* (this dates are important to get the regularly, presence dates
-* for a seminar
-*
-* @return   string  the SQL-clause to select only the "Sitzungstermine"
-*
-*/
-function getPresenceTypeClause() {
-    global $TERMIN_TYP;
-
-    $i=0;
+    $i          = 0;
     $typ_clause = "(";
-    foreach ($TERMIN_TYP as $key=>$val) {
-        if ($val["sitzung"]) {
-            if ($i)
+    foreach ($GLOBALS['TERMIN_TYP'] as $key => $val) {
+        if ($val['sitzung']) {
+            if ($i) {
                 $typ_clause .= ", ";
-            $typ_clause .= "'".$key."' ";
+            }
+            $typ_clause .= "'" . $key . "' ";
             $i++;
         }
     }
@@ -478,40 +247,26 @@ function getPresenceTypeClause() {
     return $typ_clause;
 }
 
-function getPresenceTypes() {
-    global $TERMIN_TYP;
-
-    foreach ($TERMIN_TYP as $key=>$val) {
-        if ($val["sitzung"]) {
-            $types[] = $key;
-        }
-    }
-
-    return $types;
-}
-
 /**
  * Return an array of room snippets, possibly linked
  *
- * @param array $rooms  an associative array of rooms
- * @param bool  $html   true if you want links, otherwise false
+ * @param array $rooms an associative array of rooms
+ * @param bool $html true if you want links, otherwise false
  *
  * @return array  an array of (formatted) room snippets
  */
-function getFormattedRooms($rooms, $link = false)
+function getFormattedRooms(array $rooms, bool $link = false): array
 {
     $room_list = [];
 
-    if (is_array($rooms)) {
-        foreach ($rooms as $room_id => $count) {
-            if ($room_id && Config::get()->RESOURCES_ENABLE) {
-                $room = Room::find($room_id);
-                if ($link) {
-                    $room_list[] = '<a href="' . $room->getActionLink('show') . '" data-dialog="1">'
-                        . htmlReady($room->name) . '</a>';
-                } else {
-                    $room_list[] = htmlReady($room->name);
-                }
+    foreach ($rooms as $room_id => $count) {
+        if ($room_id && Config::get()->RESOURCES_ENABLE) {
+            $room = Room::find($room_id);
+            if ($link) {
+                $room_list[] = '<a href="' . $room->getActionLink() . '" data-dialog="1">'
+                    . htmlReady($room->name) . '</a>';
+            } else {
+                $room_list[] = htmlReady($room->name);
             }
         }
     }
@@ -522,19 +277,18 @@ function getFormattedRooms($rooms, $link = false)
 /**
  * Return an array of room snippets without any formatting
  *
- * @param array $rooms  an associative array of rooms
+ * @param array $rooms an associative array of rooms
  *
  * @return array  an array of room snippets
  */
-function getPlainRooms($rooms) {
+function getPlainRooms(array $rooms): array
+{
     $room_list = [];
 
-    if (is_array($rooms)) {
-        foreach ($rooms as $room_id => $count) {
-            if ($room_id) {
-                $room = Room::find($room_id);
-                $room_list[] = $room->name;
-            }
+    foreach ($rooms as $room_id => $count) {
+        if ($room_id) {
+            $room        = Room::find($room_id);
+            $room_list[] = $room->name;
         }
     }
 
-- 
cgit v1.0


From 06d7582a1c628fac933868cc56cbd3135277b7e7 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 17 May 2024 11:59:30 +0000
Subject: remote AuxLockRules, fixes #4187

Closes #4187

Merge request studip/studip!3023
---
 RELEASE-NOTES.md                   |   2 +-
 lib/classes/AuxLockRules.class.php | 124 -------------------------------------
 2 files changed, 1 insertion(+), 125 deletions(-)
 delete mode 100644 lib/classes/AuxLockRules.class.php

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d30f929..d28e57f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -54,7 +54,7 @@
   - `isSchedule ($sem_id, $presence_dates_only = TRUE, $clearcache = FALSE)`
   - `isMetadateCorrespondingDate ($termin_id, $begin = '', $end = '', $seminar_id='')`
   - `getPresenceTypes()`
-
+- Die Klasse `AuxLockRules` wurde ausgebaut. ([Issue #4187](https://gitlab.studip.de/studip/studip/-/issues/4187))
 
 ## Security related issues
 
diff --git a/lib/classes/AuxLockRules.class.php b/lib/classes/AuxLockRules.class.php
deleted file mode 100644
index 4d06ca2..0000000
--- a/lib/classes/AuxLockRules.class.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?
-# Lifter002: DONE
-# Lifter007: TODO
-# Lifter003: TEST
-# Lifter010: TODO
-/**
-* ZusatzLockRules.class.php - Sichtbarkeits-Administration fuer Zusatzangaben bei Teilnehmerlisten
-*
-* Copyright (C) 2006 Till Glöggler <tgloeggl@inspace.de>
-*
-* 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.
-*/
-
-/**
- * @deprecated since Stud.IP 5.3
- */
-class AuxLockRules
-{
-
-    static function _toArray($data)
-    {
-        return [
-            'lock_id' => $data['lock_id'],
-            'name' => $data['name'],
-            'description' => $data['description'],
-            'attributes' => json_decode($data['attributes'], true),
-            'order' => json_decode($data['sorting'], true)
-        ];
-    }
-
-    static function getAllLockRules()
-    {
-        $ret = [];
-        $db = DBManager::get()->query("SELECT * FROM aux_lock_rules");
-        while ($data = $db->fetch(PDO::FETCH_ASSOC)) {
-            $ret[$data['lock_id']] = AuxLockRules::_toArray($data);
-        }
-
-        return $ret;
-    }
-
-    static function getLockRuleById($id)
-    {
-        $stmt = DBManager::get()->prepare("SELECT * FROM aux_lock_rules WHERE lock_id = ?");
-        $stmt->execute([$id]);
-        $data = $stmt->fetch(PDO::FETCH_ASSOC);
-        return AuxLockRules::_toArray($data);
-    }
-
-    static function getLockRuleBySemId($sem_id)
-    {
-        $stmt = DBManager::get()->prepare("SELECT aux_lock_rule FROM seminare WHERE Seminar_id = ?");
-        $stmt->execute([$sem_id]);
-        $lock_rule = $stmt->fetchColumn();
-        if ($lock_rule) {
-            return AuxLockRules::getLockRuleById($lock_rule);
-        }
-        return NULL;
-    }
-
-    static function createLockRule($name, $description, $fields, $order)
-    {
-        $id = md5(uniqid(rand()));
-        $attributes = json_encode($fields);
-        $sorting = json_encode($order);
-        $stmt = DBManager::get()->prepare('INSERT INTO aux_lock_rules '
-                    . '(lock_id, name, description, attributes, sorting) '
-                . 'VALUES (?, ?, ?, ?, ?)');
-        $stmt->execute([$id, $name, $description, $attributes, $sorting]);
-        return $id;
-    }
-
-    static function updateLockRule($id, $name, $description, $fields, $order)
-    {
-        $attributes = json_encode($fields);
-        $sorting = json_encode($order);
-        $stmt = DBManager::get()->prepare('UPDATE aux_lock_rules '
-                    . 'SET name = ?, description = ?, attributes = ?, sorting = ? '
-                    . 'WHERE lock_id = ?');
-        return $stmt->execute([$name, $description, $attributes, $sorting, $id]);
-    }
-
-    static function deleteLockRule($id)
-    {
-        $stmt = DBManager::get()->prepare('SELECT COUNT(*) as c FROM seminare WHERE aux_lock_rule = ?');
-        $stmt->execute([$id]);
-        if ($stmt->fetchColumn() > 0) return false;
-
-        $stmt = DBManager::get()->prepare('DELETE FROM aux_lock_rules WHERE lock_id = ?');
-        return $stmt->execute([$id]);
-    }
-
-    static function getSemFields()
-    {
-        return [
-            'vasemester' => 'Semester',
-            'vanr' => 'Veranstaltungsnummer',
-            'vatitle' => 'Veranstaltungstitel',
-            'vadozent' => 'Dozent'
-        ];
-    }
-
-    static function checkLockRule($fields)
-    {
-        $entries = DataField::getDataFields('usersemdata');
-        foreach ($entries as $id => $entry) {
-            if ($fields[$entry->datafield_id] == 1) return true;
-        }
-
-        return false;
-    }
-}
-- 
cgit v1.0


From 5e0842ceba062adbc2615bd522cecb1b54e201af Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 17 May 2024 12:02:47 +0000
Subject: fixes #4190

Closes #4190

Merge request studip/studip!3025
---
 app/controllers/profile.php            | 2 +-
 app/views/course/overview/index.php    | 2 +-
 app/views/institute/overview/index.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index b9a7cf7..226890e 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -220,7 +220,7 @@ class ProfileController extends AuthenticatedController
                 $template = $homepageplugin->getHomepageTemplate($this->current_user->user_id);
                 // create output of the plugins
                 if (!empty($template)) {
-                    $render .= $template->render(null, $layout);
+                    $render .= $template->render(layout: $layout);
                 }
                 $layout->clear_attributes();
             }
diff --git a/app/views/course/overview/index.php b/app/views/course/overview/index.php
index 4e69b4a..b238740 100644
--- a/app/views/course/overview/index.php
+++ b/app/views/course/overview/index.php
@@ -76,7 +76,7 @@ if (!empty($plugins)) {
         $template = $plugin->getInfoTemplate($course_id);
 
         if ($template) {
-            echo $template->render(null, $layout);
+            echo $template->render(layout: $layout);
             $layout->clear_attributes();
         }
     }
diff --git a/app/views/institute/overview/index.php b/app/views/institute/overview/index.php
index 7ed8546..53b66a8 100644
--- a/app/views/institute/overview/index.php
+++ b/app/views/institute/overview/index.php
@@ -61,7 +61,7 @@ foreach ($plugins as $plugin) {
     $template = $plugin->getInfoTemplate($institute_id);
 
     if ($template) {
-        echo $template->render(NULL, $layout);
+        echo $template->render(layout: $layout);
         $layout->clear_attributes();
     }
 }
-- 
cgit v1.0


From 364005681b3ec2e6e9b50ce8762e3ca83ba5e601 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 17 May 2024 13:38:02 +0000
Subject: remove ProfilModel, fixes #4185

Closes #4185

Merge request studip/studip!3022
---
 RELEASE-NOTES.md             |   1 +
 app/controllers/profile.php  | 173 +++++++++++++++++++++++++++++++++--
 lib/classes/ProfileModel.php | 213 -------------------------------------------
 3 files changed, 165 insertions(+), 222 deletions(-)
 delete mode 100644 lib/classes/ProfileModel.php

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index d28e57f..3253801 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -55,6 +55,7 @@
   - `isMetadateCorrespondingDate ($termin_id, $begin = '', $end = '', $seminar_id='')`
   - `getPresenceTypes()`
 - Die Klasse `AuxLockRules` wurde ausgebaut. ([Issue #4187](https://gitlab.studip.de/studip/studip/-/issues/4187))
+- Die Klasse `ProfileModel` wurde gelöscht. Die darin enthaltenen Methoden wurden in den `Profile_Controller` verschoben. ([Issue #4185]https://gitlab.studip.de/studip/studip/-/issues/4185))
 
 ## Security related issues
 
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 226890e..697bc68 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -106,11 +106,11 @@ class ProfileController extends AuthenticatedController
 
         // Additional user information
         $this->public_email = get_visible_email($this->current_user->user_id);
-        $this->motto        = $this->profile->getVisibilityValue('motto');
-        $this->private_nr   = $this->profile->getVisibilityValue('privatnr', 'private_phone');
-        $this->private_cell = $this->profile->getVisibilityValue('privatcell', 'private_cell');
-        $this->privadr      = $this->profile->getVisibilityValue('privadr', 'privadr');
-        $this->homepage     = $this->profile->getVisibilityValue('Home', 'homepage');
+        $this->motto        = $this->getVisibilityValue('motto');
+        $this->private_nr   = $this->getVisibilityValue('privatnr', 'private_phone');
+        $this->private_cell = $this->getVisibilityValue('privatcell', 'private_cell');
+        $this->privadr      = $this->getVisibilityValue('privadr', 'privadr');
+        $this->homepage     = $this->getVisibilityValue('Home', 'homepage');
 
         // skype informations
         $this->skype_name = '';
@@ -119,8 +119,8 @@ class ProfileController extends AuthenticatedController
         }
 
         // get generic datafield entries
-        $this->shortDatafields = $this->profile->getShortDatafields();
-        $this->longDatafields  = $this->profile->getLongDatafields();
+        $this->shortDatafields = $this->getShortDatafields();
+        $this->longDatafields  = $this->getLongDatafields();
 
         // get working station of an user (institutes)
         $this->institutes = $this->getInstitutInformation();
@@ -206,7 +206,7 @@ class ProfileController extends AuthenticatedController
 
         // Anzeige der Seminare, falls User = dozent
         if ($this->current_user['perms'] == 'dozent') {
-            $this->seminare = array_filter($this->profile->getDozentSeminars());
+            $this->seminare = array_filter($this->getTeacherSeminars());
         }
 
         // Hompageplugins
@@ -234,7 +234,7 @@ class ProfileController extends AuthenticatedController
         foreach ($category as $cat) {
             $head = $cat->name;
             $body = $cat->content;
-            $vis_text = "";
+            $vis_text = '';
 
             if ($this->user->user_id == $this->current_user->user_id) {
                 $vis_text .= ' (' . Visibility::getStateDescription('kat_' . $cat->kategorie_id) . ')';
@@ -521,4 +521,159 @@ class ProfileController extends AuthenticatedController
         PageLayout::setTitle(sprintf(_('Profil von %s'), $external_user['name']));
         $this->user = $external_user;
     }
+
+    /**
+     * Collect user datafield informations
+     *
+     * @return array
+     */
+    private function getDatafields(): array
+    {
+        $short_datafields = [];
+        $long_datafields  = [];
+        foreach (DataFieldEntry::getDataFieldEntries($this->current_user->user_id, 'user') as $entry) {
+            if ($entry->isVisible() && $entry->getDisplayValue()
+                && Visibility::verify($entry->getID(), $this->current_user->user_id))
+            {
+                if ($entry instanceof DataFieldTextareaEntry) {
+                    $long_datafields[] = $entry;
+                } else {
+                    $short_datafields[] = $entry;
+                }
+            }
+        }
+
+        return [
+            'long'  => $long_datafields,
+            'short' => $short_datafields,
+        ];
+    }
+
+    /**
+     * Filter long datafiels from the datafields
+     *
+     * @return array
+     */
+    private function getLongDatafields(): array
+    {
+        $datafields = $this->getDatafields();
+        $array      = [];
+
+        if (!empty($datafields)) {
+            foreach ($datafields['long'] as $entry) {
+                $array[(string)$entry->getName()] = [
+                    'content' => $entry->getDisplayValue(),
+                    'visible' => '(' . $entry->getPermsDescription() . ')',
+                ];
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Filter short datafiels from the datafields
+     *
+     * @return array
+     */
+    private function getShortDatafields(): array
+    {
+        $shortDatafields = $this->getDatafields();
+        $array = [];
+
+        if (!empty($shortDatafields)) {
+            foreach ($shortDatafields['short'] as $entry) {
+                $array[(string)$entry->getName()] = [
+                    'content' => $entry->getDisplayValue(),
+                    'visible' => '(' . $entry->getPermsDescription() . ')',
+                ];
+            }
+        }
+        return $array;
+    }
+
+    /**
+     * Creates an array with all seminars
+     *
+     * @return array
+     */
+    private function getTeacherSeminars(): array
+    {
+        $courses = [];
+        $semester = [];
+        $next_semester = Semester::findNext();
+        $current_semester = Semester::findCurrent();
+        $previous_semester = Semester::findPrevious();
+        if ($next_semester) {
+            $semester[$next_semester->id] = $next_semester;
+        }
+        if ($current_semester) {
+            $semester[$current_semester->id] = $current_semester;
+        }
+        if ($previous_semester) {
+            $semester[$previous_semester->id] = $previous_semester;
+        }
+        $field = 'name';
+        if (Config::get()->IMPORTANT_SEMNUMBER) {
+            $field = "veranstaltungsnummer,{$field}";
+        }
+        $allcourses = new SimpleCollection(
+            Course::findBySQL(
+                "INNER JOIN seminar_user USING(Seminar_id) WHERE user_id=? AND seminar_user.status='dozent' AND seminare.visible=1",
+                [
+                    $this->current_user->id
+                ]
+            )
+        );
+        foreach (array_filter($semester) as $one) {
+            $courses[(string) $one->name] = $allcourses->filter(function ($c) use ($one) {
+                if (Config::get()->HIDE_STUDYGROUPS_FROM_PROFILE && $c->isStudygroup()) {
+                    return false;
+                }
+                if (!$c->isOpenEnded()) {
+                    return $c->isInSemester($one);
+                } elseif ($one->isCurrent()) {
+                    return $c;
+                }
+                return false;
+            })->orderBy($field);
+
+            if (!$courses[(string) $one->name]->count()) {
+                unset($courses[(string) $one->name]);
+            }
+        }
+        return $courses;
+    }
+
+    /**
+     * Get the homepagevisibilities
+     *
+     * @return array
+     */
+    private function getHomepageVisibilities(): array
+    {
+        $visibilities = get_local_visibility_by_id(
+            $this->current_user ? $this->current_user->id : null,
+            'homepage'
+        );
+        if (is_array(json_decode($visibilities, true))) {
+            return json_decode($visibilities, true);
+        }
+        return [];
+    }
+
+    /**
+     * Returns the visibility value
+     *
+     * @param string $param
+     * @param string $visibility
+     * @return string|bool
+     */
+    private function getVisibilityValue(string $param, string $visibility = ''): string|bool
+    {
+        if (Visibility::verify($visibility ?: $param, $this->current_user->user_id)) {
+            return $this->current_user->$param;
+        }
+        return false;
+    }
 }
diff --git a/lib/classes/ProfileModel.php b/lib/classes/ProfileModel.php
deleted file mode 100644
index 6827ba6..0000000
--- a/lib/classes/ProfileModel.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
- * ProfileModel
- *
- * 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.
- *
- * @author      David Siegfried <david.siegfried@uni-oldenburg.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- */
-
-class ProfileModel
-{
-    protected $perm;
-    /**
-     * Internal current selected user id
-     * @var String
-     */
-    protected $current_user;
-
-    /**
-     * Internal current logged in user id
-     * @var String
-     */
-    protected $user;
-
-    /**
-     * Internal user homepage visbilities
-     * @var array
-     */
-    protected $visibilities;
-
-    /**
-     * Get informations on depending selected user
-     * @param String $current_user
-     * @param String $user
-     */
-    public function __construct($current_user, $user)
-    {
-        $this->current_user = User::find($current_user);
-        $this->user         = User::find($user);
-        $this->visibilities = $this->getHomepageVisibilities();
-        $this->perm         = $GLOBALS['perm'];
-    }
-
-    /**
-     * Get the homepagevisibilities
-     *
-     * @return array
-     */
-    public function getHomepageVisibilities()
-    {
-        $visibilities = get_local_visibility_by_id(
-            $this->current_user ? $this->current_user->id : null,
-            'homepage'
-        );
-        if (is_array(json_decode($visibilities, true))) {
-            return json_decode($visibilities, true);
-        }
-        return [];
-    }
-
-    /**
-     * Returns the visibility value
-     *
-     * @return String
-     */
-    public function getVisibilityValue($param, $visibility = '')
-    {
-        if (Visibility::verify($visibility ?: $param, $this->current_user->user_id)) {
-            return $this->current_user->$param;
-        }
-        return false;
-    }
-
-    /**
-     * Returns a specific value of the visibilies
-     * @param String $param
-     * @return String
-     */
-
-    public function getSpecificVisibilityValue($param)
-    {
-        if (!empty($this->visibilities[$param])) {
-            return $this->visibilities[$param];
-        }
-        return false;
-    }
-
-    /**
-     * Creates an array with all seminars
-     *
-     * @return array
-     */
-    public function getDozentSeminars()
-    {
-        $courses = [];
-        $semester = [];
-        $next_semester = Semester::findNext();
-        $current_semester = Semester::findCurrent();
-        $previous_semester = Semester::findPrevious();
-        if ($next_semester) {
-            $semester[$next_semester->id] = $next_semester;
-        }
-        if ($current_semester) {
-            $semester[$current_semester->id] = $current_semester;
-        }
-        if ($previous_semester) {
-            $semester[$previous_semester->id] = $previous_semester;
-        }
-        $field = 'name';
-        if (Config::get()->IMPORTANT_SEMNUMBER) {
-            $field = "veranstaltungsnummer,{$field}";
-        }
-        $allcourses = new SimpleCollection(Course::findBySQL("INNER JOIN seminar_user USING(Seminar_id) WHERE user_id=? AND seminar_user.status='dozent' AND seminare.visible=1", [$this->current_user->id]));
-        foreach (array_filter($semester) as $one) {
-            $courses[(string) $one->name] = $allcourses->filter(function ($c) use ($one) {
-                if (Config::get()->HIDE_STUDYGROUPS_FROM_PROFILE && $c->isStudygroup()) {
-                    return false;
-                }
-                if (!$c->isOpenEnded()) {
-                    return $c->isInSemester($one);
-                } elseif ($one->isCurrent()) {
-                    return $c;
-                }
-                return false;
-            })->orderBy($field);
-
-            if (!$courses[(string) $one->name]->count()) {
-                unset($courses[(string) $one->name]);
-            }
-        }
-        return $courses;
-    }
-
-    /**
-     * Collect user datafield informations
-     *
-     * @return array
-     */
-    public function getDatafields()
-    {
-        // generische Datenfelder aufsammeln
-        $short_datafields = [];
-        $long_datafields  = [];
-        foreach (DataFieldEntry::getDataFieldEntries($this->current_user->user_id, 'user') as $entry) {
-            if ($entry->isVisible() && $entry->getDisplayValue()
-                && Visibility::verify($entry->getID(), $this->current_user->user_id))
-            {
-                if ($entry instanceof DataFieldTextareaEntry) {
-                    $long_datafields[] = $entry;
-                } else {
-                    $short_datafields[] = $entry;
-                }
-            }
-        }
-
-        return [
-            'long'  => $long_datafields,
-            'short' => $short_datafields,
-        ];
-    }
-
-    /**
-     * Filter long datafiels from the datafields
-     *
-     * @return array
-     */
-    public function getLongDatafields()
-    {
-        $datafields = $this->getDatafields();
-        $array      = [];
-
-        if (empty($datafields)) {
-            return null;
-        }
-        foreach ($datafields['long'] as $entry) {
-            $array[(string) $entry->getName()] = [
-                'content' => $entry->getDisplayValue(),
-                'visible' => '(' . $entry->getPermsDescription() . ')',
-            ];
-        }
-
-        return $array;
-    }
-
-    /**
-     * Filter short datafiels from the datafields
-     *
-     * @return array
-     */
-    public function getShortDatafields()
-    {
-        $shortDatafields = $this->getDatafields();
-        $array = [];
-
-        if (empty($shortDatafields)) {
-            return null;
-        }
-
-        foreach ($shortDatafields['short'] as $entry) {
-            $array[(string) $entry->getName()] = [
-                'content' => $entry->getDisplayValue(),
-                'visible' => '(' . $entry->getPermsDescription() . ')',
-            ];
-        }
-        return $array;
-    }
-}
-- 
cgit v1.0


From c19d75ac88d74ec9ff602cdf3344b861b49a3d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Fri, 17 May 2024 13:42:01 +0000
Subject: Resolve "Listenelemente sind nicht syntaktisch korrekt ausgezeichnet"

Closes #4088

Merge request studip/studip!2929
---
 app/views/profile/seminare.php               | 25 +++++++++++++-----------
 resources/assets/stylesheets/scss/lists.scss | 13 +++++++++++++
 resources/assets/stylesheets/studip.scss     |  2 --
 templates/start/quickselection.php           | 29 +++++++++++++++-------------
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/app/views/profile/seminare.php b/app/views/profile/seminare.php
index b218eca..1d1c7c7 100644
--- a/app/views/profile/seminare.php
+++ b/app/views/profile/seminare.php
@@ -6,17 +6,20 @@
     </header>
 
     <section>
-    <? foreach ($seminare as $semester => $seminar) :?>
-    <b><?= htmlReady($semester) ?></b><br>
-
-        <? foreach ($seminar as $one) :?>
-            <a href="<?= URLHelper::getScriptLink('dispatch.php/course/details', ['sem_id' => $one->id])?>">
-                <?= htmlReady($one->getFullName('number-name')) ?>
-                <? if ($one->start_semester !== $one->end_semester) : ?>
-                    (<?= htmlReady($one->getFullName('sem-duration-name')) ?>)
-                <? endif ?>
-            </a><br>
+    <? foreach ($seminare as $semester => $seminar) : ?>
+        <b><?= htmlReady($semester) ?></b><br>
+        <ul class="clean">
+        <? foreach ($seminar as $one) : ?>
+            <li>
+                <a href="<?= URLHelper::getScriptLink('dispatch.php/course/details', ['sem_id' => $one->id])?>">
+                    <?= htmlReady($one->getFullName('number-name')) ?>
+                    <? if ($one->start_semester !== $one->end_semester) : ?>
+                        (<?= htmlReady($one->getFullName('sem-duration-name')) ?>)
+                    <? endif ?>
+                </a>
+            </li>
         <?endforeach?>
+        </ul>
     <?endforeach?>
     </section>
-</article>
\ No newline at end of file
+</article>
diff --git a/resources/assets/stylesheets/scss/lists.scss b/resources/assets/stylesheets/scss/lists.scss
index 6de2004..80796b7 100644
--- a/resources/assets/stylesheets/scss/lists.scss
+++ b/resources/assets/stylesheets/scss/lists.scss
@@ -66,6 +66,19 @@ ol {
     }
 }
 
+.list-slash-separated-small {
+    @extend .list-csv;
+
+    > li {
+        padding-right: 0;
+        font-size: small;
+
+        &::after {
+            content: "/";
+        }
+    }
+}
+
 dl {
     dt {
         font-weight: bold;
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index 037aad4..0f329a4 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -243,8 +243,6 @@ ol.clean {
     padding: 5px;
 }
 
-
-
 .minor {
     color: var(--black);
     font-size: 0.75em;
diff --git a/templates/start/quickselection.php b/templates/start/quickselection.php
index e465d8d..bcf3fb3 100644
--- a/templates/start/quickselection.php
+++ b/templates/start/quickselection.php
@@ -1,28 +1,31 @@
 <div id="quickSelectionWrap" style="padding: 1ex;">
 <? foreach ($navigation as $nav) : ?>
     <? if ($nav->isVisible()) : ?>
-        <div class="mainmenu">
+        <ul class="mainmenu list-unstyled">
             <? if (is_internal_url($url = $nav->getURL())) : ?>
-                <a href="<?= URLHelper::getLink($url) ?>">
+                <li><a href="<?= URLHelper::getLink($url) ?>">
             <? else : ?>
-                <a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
+                <li><a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
             <? endif ?>
-            <?= htmlReady($nav->getTitle()) ?></a>
-            <? $pos = 0 ?>
+            <?= htmlReady($nav->getTitle()) ?></a></li>
+
+        <li>
+        <ul class="list-slash-separated-small">
             <? foreach ($nav as $subnav) : ?>
                 <? if ($subnav->isVisible()) : ?>
-                    <font size="-1">
-                        <?= $pos++ ? ' / ' : '<br>' ?>
+                    <li>
                         <? if (is_internal_url($url = $subnav->getURL())) : ?>
-                            <a href="<?= URLHelper::getLink($url) ?>">
-                        <? else : ?>
+                        <a href="<?= URLHelper::getLink($url) ?>">
+                            <? else : ?>
                             <a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
-                        <? endif ?>
-                        <?= htmlReady($subnav->getTitle()) ?></a>
-                    </font>
+                                <? endif ?>
+                                <?= htmlReady($subnav->getTitle()) ?></a>
+                    </li>
                 <? endif ?>
             <? endforeach ?>
-        </div>
+        </ul>
+        </li>
+    </ul>
     <? endif ?>
 <? endforeach ?>
 </div>
-- 
cgit v1.0


From 2cc48e888d92517381e902c1b1a34a76d2293c34 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Sun, 19 May 2024 09:11:44 +0200
Subject: remove call to ProfileModel, re #4185

---
 app/controllers/profile.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 697bc68..7738bb3 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -37,11 +37,6 @@ class ProfileController extends AuthenticatedController
             'username',
             $this->user ? $this->user->username : null
         ));
-        // get additional informations to selected user
-        $this->profile = new ProfileModel(
-            $this->current_user ? $this->current_user->id : null,
-            $this->user ? $this->user->id : null
-        );
 
         // set the page title depending on user selection
         if (
-- 
cgit v1.0


From c89b17558da887a4e1c4164307b54b0576c23376 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 21 May 2024 07:13:15 +0000
Subject: remove StudipTransformFormat, fixes #4188

Closes #4188

Merge request studip/studip!3024
---
 RELEASE-NOTES.md                      |  1 +
 lib/classes/StudipTransformFormat.php | 99 -----------------------------------
 2 files changed, 1 insertion(+), 99 deletions(-)
 delete mode 100644 lib/classes/StudipTransformFormat.php

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3253801..556cee6 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -56,6 +56,7 @@
   - `getPresenceTypes()`
 - Die Klasse `AuxLockRules` wurde ausgebaut. ([Issue #4187](https://gitlab.studip.de/studip/studip/-/issues/4187))
 - Die Klasse `ProfileModel` wurde gelöscht. Die darin enthaltenen Methoden wurden in den `Profile_Controller` verschoben. ([Issue #4185]https://gitlab.studip.de/studip/studip/-/issues/4185))
+- Die Klasse `StudipTransformFormat` wurde ausgebaut ([Issue #4188](https://gitlab.studip.de/studip/studip/-/issues/4188))
 
 ## Security related issues
 
diff --git a/lib/classes/StudipTransformFormat.php b/lib/classes/StudipTransformFormat.php
deleted file mode 100644
index 04cf7a3..0000000
--- a/lib/classes/StudipTransformFormat.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @author      <mlunzena@uos.de
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * Format class to transform text before it is saved into the database.
- * @deprecated since Stud.IP 5.3
- */
-class StudipTransformFormat extends TextFormat
-{
-    /**
-     * list of global Stud.IP transform markup rules
-     */
-    private static $studip_rules = [
-        'signature' => [
-            'start'    => '(?<!~)~~~(?!~)',
-            'callback' => 'StudipTransformFormat::markupSignature'
-        ]
-        ,'nop' => [
-            'start'    => '\[nop\](.*?)\[\/nop\]',
-            'callback' => 'StudipTransformFormat::markupNoFormat'
-        ],        
-    ];
-
-    /**
-     * Returns the list of global Stud.IP markup rules as an array.
-     * Each entry has the following attributes: 'start', 'end' and
-     * 'callback'. The rule name is used as the entry's array key.
-     *
-     * @return array list of all markup rules
-     */
-    public static function getStudipMarkups()
-    {
-        return self::$studip_rules;
-    }
-
-    /**
-     * Adds a new markup rule to the global Stud.IP markup set. This can
-     * also be used to replace an existing markup rule. The end regular
-     * expression is optional (i.e. may be NULL) to indicate that this
-     * rule has an empty content model. The callback is called whenever
-     * the rule matches and is passed the following arguments:
-     *
-     * - $markup    the markup parser object
-     * - $matches   match results of preg_match for $start
-     * - $contents  (parsed) contents of this markup rule
-     *
-     * @param string $name      name of this rule
-     * @param string $start     start regular expression
-     * @param string $end       end regular expression (optional)
-     * @param callback $callback function generating output of this rule
-     */
-    public static function addStudipMarkup($name, $start, $end, $callback)
-    {
-        self::$studip_rules[$name] = compact('start', 'end', 'callback');
-    }
-
-    /**
-     * Removes a markup rule from the global Stud.IP markup set.
-     *
-     * @param string $name      name of the rule
-     */
-    public static function removeStudipMarkup($name)
-    {
-        unset(self::$studip_rules[$name]);
-    }
-
-    /**
-     * Initializes a new StudipFormat instance.
-     */
-    public function __construct()
-    {
-        parent::__construct(self::getStudipMarkups());
-    }
-
-    /**
-     * Stud.IP markup for signatures
-     */
-    protected static function markupSignature($markup, $matches)
-    {
-        return get_fullname();
-    }
-
-    /**
-     * Stud.IP markup for unformatted text
-     */
-    protected static function markupNoFormat($markup, $matches)
-    {
-        return '[nop]' . $markup->quote($matches[1]) . '[/nop]';
-    }
-}
-- 
cgit v1.0


From e986fe03b58ae15f0ba307ed6c673f3eda402f00 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 21 May 2024 08:38:10 +0000
Subject: fixes #4195

Closes #4195

Merge request studip/studip!3026
---
 app/controllers/admin/cache.php                  |  5 ++--
 resources/vue/components/CacheAdministration.vue | 34 ++++++++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admin/cache.php b/app/controllers/admin/cache.php
index 3e9d970..c016af5 100644
--- a/app/controllers/admin/cache.php
+++ b/app/controllers/admin/cache.php
@@ -81,11 +81,10 @@ class Admin_CacheController extends AuthenticatedController
 
     /**
      * Fetches necessary configuration for given cache type.
-     *
-     * @param string $className
      */
-    public function get_config_action($className)
+    public function get_config_action()
     {
+        $className = Request::get('cache');
         $type = CacheType::findOneByClass_name($className);
 
         $this->render_json($type->class_name::getConfig());
diff --git a/resources/vue/components/CacheAdministration.vue b/resources/vue/components/CacheAdministration.vue
index af3d461..5da9568 100644
--- a/resources/vue/components/CacheAdministration.vue
+++ b/resources/vue/components/CacheAdministration.vue
@@ -82,24 +82,24 @@ export default {
          * @param event
          */
         getCacheConfig (event) {
-            fetch(STUDIP.URLHelper.getURL(`dispatch.php/admin/cache/get_config/${this.selectedCacheType}`))
-                .then((response) => {
-                    if (!response.ok) {
-                        throw response
-                    }
+            const url = STUDIP.URLHelper.getURL(
+                'dispatch.php/admin/cache/get_config',
+                {cache: this.selectedCacheType},
+                true
+            );
+            fetch(url).then((response) => {
+                if (!response.ok) {
+                    throw response
+                }
 
-                    response.json()
-                        .then((json) => {
-                            this.configComponent = json.component
-                            this.configProps = json.props
-                        }).catch((error) => {
-                            console.error(error)
-                            console.error(error.status + ': ', error.statusText)
-                        })
-                }).catch((error) => {
-                    console.error(error)
-                    console.error(error.status + ': ', error.statusText)
-                })
+                response.json().then((json) => {
+                    this.configComponent = json.component
+                    this.configProps = json.props
+                });
+            }).catch((error) => {
+                console.error(error)
+                console.error(error.status + ': ', error.statusText)
+            })
         },
         validateConfig () {
             if (this.configComponent == null || this.isValid) {
-- 
cgit v1.0


From c0aade671ebcf6afe6c918e1d2192fe5cf4cb32c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 21 May 2024 08:45:14 +0000
Subject: fixes #4196

Closes #4196

Merge request studip/studip!3027
---
 db/migrations/6.0.6_adjust_default_cache_name.php | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 db/migrations/6.0.6_adjust_default_cache_name.php

diff --git a/db/migrations/6.0.6_adjust_default_cache_name.php b/db/migrations/6.0.6_adjust_default_cache_name.php
new file mode 100644
index 0000000..ea71f35
--- /dev/null
+++ b/db/migrations/6.0.6_adjust_default_cache_name.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @see https://gitlab.studip.de/studip/studip/-/issues/4196
+ */
+return new class extends Migration
+{
+    public function description()
+    {
+        return 'Adjust the default cache in table "config" as well"';
+    }
+
+    protected function up()
+    {
+        $query = "UPDATE `config`
+                  SET `value` = JSON_REPLACE(`value`, '$.type', ?)
+                  WHERE `field` = 'SYSTEMCACHE'";
+        DBManager::get()->execute($query, [Studip\Cache\DbCache::class]);
+    }
+
+    protected function down()
+    {
+        $query = "UPDATE `config`
+                  SET `value` = JSON_REPLACE(`value`, '$.type', ?)
+                  WHERE `field` = 'SYSTEMCACHE'";
+        DBManager::get()->execute($query, [StudipDbCache::class]);
+    }
+};
-- 
cgit v1.0


From 98ee46ee0cb82934ff111a72d5cb7a93b68219d8 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 21 May 2024 11:17:33 +0000
Subject: fixes #4197

Closes #4197

Merge request studip/studip!3028
---
 lib/flexi/Template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/flexi/Template.php b/lib/flexi/Template.php
index de2547e..d5c0310 100644
--- a/lib/flexi/Template.php
+++ b/lib/flexi/Template.php
@@ -193,7 +193,7 @@ abstract class Template
      */
     public function set_layout(Template|string|null $layout): void
     {
-        $this->layout = $this->factory->open($layout);
+        $this->layout = $layout ? $this->factory->open($layout) : null;
     }
 
     /**
-- 
cgit v1.0


From c21817bfe8bd8695f612e47c2a1d8de03148fb88 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 21 May 2024 11:41:55 +0000
Subject: implement jsonapi for clipboard and clipboard items and replace old
 clipboards route with new ones, fixes #4198

Closes #4198

Merge request studip/studip!3029
---
 lib/classes/JsonApi/RouteMap.php                   |  19 ++-
 .../JsonApi/Routes/Clipboards/Authority.php        |  28 ++++
 .../Routes/Clipboards/ClipboardItemsCreate.php     | 106 +++++++++++++
 .../Routes/Clipboards/ClipboardItemsDelete.php     |  54 +++++++
 .../Routes/Clipboards/ClipboardItemsShow.php       |  28 ++++
 .../JsonApi/Routes/Clipboards/ClipboardsCreate.php |  46 ++++++
 .../JsonApi/Routes/Clipboards/ClipboardsDelete.php |  31 ++++
 .../JsonApi/Routes/Clipboards/ClipboardsUpdate.php |  50 ++++++
 lib/classes/JsonApi/SchemaMap.php                  |   4 +
 lib/classes/JsonApi/Schemas/Clipboard.php          |  81 ++++++++++
 lib/classes/JsonApi/Schemas/ClipboardItem.php      |  61 ++++++++
 lib/models/ClipboardItem.class.php                 |  32 ++--
 .../assets/javascripts/bootstrap/clipboard.js      |  13 +-
 resources/assets/javascripts/lib/abstract-api.js   |  27 +++-
 resources/assets/javascripts/lib/clipboard.js      | 144 ++++++++----------
 tests/_support/Helper/StudipDb.php                 |   8 -
 tests/jsonapi/ClipboardRoutesTest.php              | 167 +++++++++++++++++++++
 tests/jsonapi/ConsultationHelper.php               | 108 +------------
 tests/jsonapi/JSONAPIHelperTrait.php               | 117 +++++++++++++++
 19 files changed, 904 insertions(+), 220 deletions(-)
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/Authority.php
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsCreate.php
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsDelete.php
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsShow.php
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/ClipboardsCreate.php
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/ClipboardsDelete.php
 create mode 100644 lib/classes/JsonApi/Routes/Clipboards/ClipboardsUpdate.php
 create mode 100644 lib/classes/JsonApi/Schemas/Clipboard.php
 create mode 100644 lib/classes/JsonApi/Schemas/ClipboardItem.php
 create mode 100644 tests/jsonapi/ClipboardRoutesTest.php
 create mode 100644 tests/jsonapi/JSONAPIHelperTrait.php

diff --git a/lib/classes/JsonApi/RouteMap.php b/lib/classes/JsonApi/RouteMap.php
index d81bbbf..149f681 100644
--- a/lib/classes/JsonApi/RouteMap.php
+++ b/lib/classes/JsonApi/RouteMap.php
@@ -5,8 +5,6 @@ namespace JsonApi;
 use JsonApi\Contracts\JsonApiPlugin;
 use JsonApi\Middlewares\Authentication;
 use JsonApi\Middlewares\DangerousRouteHandler;
-use JsonApi\Middlewares\JsonApi as JsonApiMiddleware;
-use JsonApi\Middlewares\StudipMockNavigation;
 use JsonApi\Routes\Holidays\HolidaysShow;
 use Slim\Routing\RouteCollectorProxy;
 
@@ -49,7 +47,6 @@ use Slim\Routing\RouteCollectorProxy;
  *
  *   $this->app->post('/article/{id}/comments', MeineRoute::class);
  *
- * @see \JsonApi\Middlewares\JsonApi
  * @see \JsonApi\Middlewares\Authentication
  * @see \JsonApi\Contracts\JsonApiPlugin
  * @see http://www.slimframework.com/docs/objects/router.html#how-to-create-routes
@@ -118,6 +115,7 @@ class RouteMap
         $group->get('/status-groups/{id}', Routes\StatusgroupShow::class);
 
         $this->addAuthenticatedBlubberRoutes($group);
+        $this->addAuthenticatedClipboardRoutes($group);
         $this->addAuthenticatedConsultationRoutes($group);
         $this->addAuthenticatedContactsRoutes($group);
         $this->addAuthenticatedCoursesRoutes($group);
@@ -205,6 +203,21 @@ class RouteMap
         );
     }
 
+    private function addAuthenticatedClipboardRoutes(RouteCollectorProxy $group): void
+    {
+        $group->post('/clipboards', Routes\Clipboards\ClipboardsCreate::class);
+        $group->patch('/clipboards/{id}', Routes\Clipboards\ClipboardsUpdate::class);
+        $group->delete('/clipboards/{id}', Routes\Clipboards\ClipboardsDelete::class);
+
+        $group->get('/clipboard-items/{id}', Routes\Clipboards\ClipboardItemsShow::class);
+        $group->post('/clipboards/{id}/items', Routes\Clipboards\ClipboardItemsCreate::class);
+        $group->delete('/clipboards/{id}/items', Routes\Clipboards\ClipboardItemsDelete::class);
+        $group->delete('/clipboards/{id}/items/{itemId}', Routes\Clipboards\ClipboardItemsDelete::class);
+
+        $group->post('/clipboard-items', Routes\Clipboards\ClipboardItemsCreate::class);
+        $group->delete('/clipboard-items/{id}', Routes\Clipboards\ClipboardItemsDelete::class);
+    }
+
     private function addAuthenticatedConsultationRoutes(RouteCollectorProxy $group): void
     {
         $group->get('/{type:courses|institutes|users}/{id}/consultations', Routes\Consultations\BlocksByRangeIndex::class);
diff --git a/lib/classes/JsonApi/Routes/Clipboards/Authority.php b/lib/classes/JsonApi/Routes/Clipboards/Authority.php
new file mode 100644
index 0000000..5cc053a
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/Authority.php
@@ -0,0 +1,28 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use User;
+
+final class Authority
+{
+    public static function canCreateClipboard(User $user): bool
+    {
+        return true;
+    }
+
+    public static function canAccessClipboard(User $user, \Clipboard $clipboard): bool
+    {
+        return $user->id === $clipboard->user_id
+            || $user->perms === 'root';
+    }
+
+    public static function canUpdateClipboard(User $user, \Clipboard $clipboard): bool
+    {
+        return self::canAccessClipboard($user, $clipboard);
+    }
+
+    public static function canDeleteClipboard(User $user, \Clipboard $clipboard): bool
+    {
+        return self::canUpdateClipboard($user, $clipboard);
+    }
+}
diff --git a/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsCreate.php b/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsCreate.php
new file mode 100644
index 0000000..d57d0c5
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsCreate.php
@@ -0,0 +1,106 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use JsonApi\Errors\AuthorizationFailedException;
+use JsonApi\JsonApiController;
+use JsonApi\Routes\ValidationTrait;
+use JsonApi\Schemas\Clipboard;
+use Psr\Http\Message\{
+    ResponseInterface as Response,
+    ServerRequestInterface as Request
+};
+
+final class ClipboardItemsCreate extends JsonApiController
+{
+    use ValidationTrait;
+
+    public function __invoke(Request $request, Response $response, $args): Response
+    {
+        $json = $this->validate($request, $args);
+
+        $clipboard_id = $args['id'] ?? $json['data']['relationships']['clipboard']['data']['id'];
+        $clipboard = \Clipboard::find($clipboard_id);
+
+        $user = $this->getUser($request);
+        if (!Authority::canUpdateClipboard($user, $clipboard)) {
+            throw new AuthorizationFailedException();
+        }
+
+        $range_id   = $json['data']['attributes']['range_id'];
+        $range_type = $json['data']['attributes']['range_type'];
+
+        $item = \ClipboardItem::findOneBySql(
+            'clipboard_id = ? AND range_id = ? AND range_type = ?',
+            [$clipboard_id, $range_id, $range_type]
+        );
+
+        if ($item) {
+            return $this->getCodeResponse(302, [
+                'Location' => $this->getLinkToItem($item),
+            ]);
+        }
+
+        $item = \ClipboardItem::create([
+            'clipboard_id' => $clipboard_id,
+            'range_id'     => $range_id,
+            'range_type'   => $range_type,
+        ]);
+
+        return $this->getContentResponse($item);
+    }
+
+    protected function validateResourceDocument($json, $data)
+    {
+        $clipboardValidationError = $this->validateRequestContainsValidClipboard($json, $data);
+        if ($clipboardValidationError !== null) {
+            return $clipboardValidationError;
+        }
+
+        if (!self::arrayHas($json, 'data.attributes.range_id')) {
+            return 'No range_id defined';
+        }
+
+        if (!self::arrayHas($json, 'data.attributes.range_type')) {
+            return 'No range_type defined';
+        }
+
+        $range_type = self::arrayGet($json, 'data.attributes.range_type');
+        if (!is_a($range_type, \StudipItem::class, true)) {
+            return 'Range type must implement interface StudipItem';
+        }
+
+        return null;
+    }
+
+    private function validateRequestContainsValidClipboard($json, $data): ?string
+    {
+        if (isset($data['id'])) {
+            if (!\Clipboard::exists($data['id'])) {
+                return 'Provided clipboard id is invalid';
+            }
+        } else {
+            if (!self::arrayHas($json, 'data.relationships.clipboard')) {
+                return 'No clipboard relationship defined';
+            }
+
+            $clipboard = self::arrayGet($json, 'data.relationships.clipboard');
+            if (
+                !isset($clipboard['data']['type'], $clipboard['data']['id'])
+                || $clipboard['data']['type'] !== Clipboard::TYPE
+            ) {
+                return 'Defined clipboard relationship has invalid format.';
+            }
+            if (!\Clipboard::exists($clipboard['data']['id'])) {
+                return 'Related clipboard does not exist.';
+            }
+        }
+
+        return null;
+    }
+
+    private function getLinkToItem(\ClipboardItem $item): string
+    {
+        $json = $this->encoder->encodeData($item);
+        return json_decode($json, true)['data']['links']['self'];
+    }
+}
diff --git a/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsDelete.php b/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsDelete.php
new file mode 100644
index 0000000..a9c7cd4
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsDelete.php
@@ -0,0 +1,54 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use JsonApi\Errors\BadRequestException;
+use JsonApi\Errors\RecordNotFoundException;
+use JsonApi\JsonApiController;
+use Psr\Http\Message\{
+    ResponseInterface as Response,
+    ServerRequestInterface as Request
+};
+
+final class ClipboardItemsDelete extends JsonApiController
+{
+    protected $allowedFilteringParameters = ['range_id'];
+
+    public function __invoke(Request $request, Response $response, $args): Response
+    {
+        $clipboard = \Clipboard::find($args['id']);
+        if (!$clipboard) {
+            throw new RecordNotFoundException('Clipboard not found');
+        }
+
+        $user = $this->getUser($request);
+        if (!Authority::canUpdateClipboard($user, $clipboard)) {
+            throw new \AccessDeniedException();
+        }
+
+        $item = null;
+        if (isset($args['itemId'])) {
+            $item = \ClipboardItem::find($args['itemId']);
+        } else {
+            $filtering = iterator_to_array($this->getQueryParameters()->getFilters());
+            if (!isset($filtering['range_id'])) {
+                throw new BadRequestException('No range_id filter given');
+            }
+            $item = \ClipboardItem::findOneBySQL(
+                'clipboard_id = ? AND range_id = ?',
+                [$clipboard->id, $filtering['range_id']]
+            );
+        }
+
+        if (!$item) {
+            throw new RecordNotFoundException('Item not found');
+        }
+
+        if ($item->clipboard_id !== $clipboard->id) {
+            throw new BadRequestException('Item does not belong to clipboard');
+        }
+
+        $item->delete();
+
+        return $this->getCodeResponse(204);
+    }
+}
diff --git a/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsShow.php b/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsShow.php
new file mode 100644
index 0000000..3c91708
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/ClipboardItemsShow.php
@@ -0,0 +1,28 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use JsonApi\Errors\AuthorizationFailedException;
+use JsonApi\Errors\RecordNotFoundException;
+use JsonApi\JsonApiController;
+use Psr\Http\Message\{
+    ResponseInterface as Response,
+    ServerRequestInterface as Request
+};
+
+final class ClipboardItemsShow extends JsonApiController
+{
+    public function __invoke(Request $request, Response $response, $args): Response
+    {
+        $item = \ClipboardItem::find($args['id']);
+        if (!$item) {
+            throw new RecordNotFoundException();
+        }
+
+        $user = $this->getUser($request);
+        if (!Authority::canAccessClipboard($user, $item->clipboard)) {
+            throw new AuthorizationFailedException();
+        }
+
+        return $this->getContentResponse($item);
+    }
+}
diff --git a/lib/classes/JsonApi/Routes/Clipboards/ClipboardsCreate.php b/lib/classes/JsonApi/Routes/Clipboards/ClipboardsCreate.php
new file mode 100644
index 0000000..57fd9b9
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/ClipboardsCreate.php
@@ -0,0 +1,46 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use JsonApi\Errors\AuthorizationFailedException;
+use JsonApi\JsonApiController;
+use JsonApi\Routes\ValidationTrait;
+use Psr\Http\Message\{
+    ResponseInterface as Response,
+    ServerRequestInterface as Request
+};
+
+final class ClipboardsCreate extends JsonApiController
+{
+    use ValidationTrait;
+
+    public function __invoke(Request $request, Response $response, $args): Response
+    {
+        $user = $this->getUser($request);
+
+        if (!Authority::canCreateClipboard($user)) {
+            throw new AuthorizationFailedException();
+        }
+
+        $json = $this->validate($request, $args);
+
+        $clipboard = \Clipboard::create([
+            'name'    => $json['data']['attributes']['name'],
+            'user_id' => $user->id,
+        ]);
+
+        return $this->getContentResponse($clipboard);
+    }
+
+    protected function validateResourceDocument($json, $data)
+    {
+        if (!self::arrayHas($json, 'data.attributes.name')) {
+            return 'No name for the clipboard defined';
+        }
+
+        if (!trim(self::arrayGet($json, 'data.attributes.name'))) {
+            return 'Name of the clipboard may not be empty';
+        }
+
+        return null;
+    }
+}
diff --git a/lib/classes/JsonApi/Routes/Clipboards/ClipboardsDelete.php b/lib/classes/JsonApi/Routes/Clipboards/ClipboardsDelete.php
new file mode 100644
index 0000000..0897843
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/ClipboardsDelete.php
@@ -0,0 +1,31 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use JsonApi\Errors\AuthorizationFailedException;
+use JsonApi\Errors\RecordNotFoundException;
+use JsonApi\JsonApiController;
+use Psr\Http\Message\{
+    ResponseInterface as Response,
+    ServerRequestInterface as Request
+};
+
+final class ClipboardsDelete extends JsonApiController
+{
+    public function __invoke(Request $request, Response $response, $args): Response
+    {
+        $clipboard = \Clipboard::find($args['id']);
+        if (!$clipboard) {
+            throw new RecordNotFoundException();
+        }
+
+        $user = $this->getUser($request);
+
+        if (!Authority::canDeleteClipboard($user, $clipboard)) {
+            throw new AuthorizationFailedException();
+        }
+
+        $clipboard->delete();
+
+        return $this->getCodeResponse(204);
+    }
+}
diff --git a/lib/classes/JsonApi/Routes/Clipboards/ClipboardsUpdate.php b/lib/classes/JsonApi/Routes/Clipboards/ClipboardsUpdate.php
new file mode 100644
index 0000000..83d9539
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Clipboards/ClipboardsUpdate.php
@@ -0,0 +1,50 @@
+<?php
+namespace JsonApi\Routes\Clipboards;
+
+use JsonApi\Errors\AuthorizationFailedException;
+use JsonApi\Errors\RecordNotFoundException;
+use JsonApi\JsonApiController;
+use JsonApi\Routes\ValidationTrait;
+use Psr\Http\Message\{
+    ResponseInterface as Response,
+    ServerRequestInterface as Request
+};
+
+final class ClipboardsUpdate extends JsonApiController
+{
+    use ValidationTrait;
+
+    public function __invoke(Request $request, Response $response, $args): Response
+    {
+        $clipboard = \Clipboard::find($args['id']);
+        if (!$clipboard) {
+            throw new RecordNotFoundException();
+        }
+
+        $user = $this->getUser($request);
+
+        if (!Authority::canUpdateClipboard($user, $clipboard)) {
+            throw new AuthorizationFailedException();
+        }
+
+        $json = $this->validate($request, $args);
+
+        $clipboard->name = $json['data']['attributes']['name'];
+        $clipboard->store();
+
+        return $this->getContentResponse($clipboard);
+    }
+
+    protected function validateResourceDocument($json, $data)
+    {
+        if (!self::arrayHas($json, 'data.attributes.name')) {
+            return 'No name for the clipboard defined';
+        }
+
+        if (!trim(self::arrayGet($json, 'data.attributes.name'))) {
+            return 'Name of the clipboard may not be empty';
+        }
+
+        return null;
+    }
+}
diff --git a/lib/classes/JsonApi/SchemaMap.php b/lib/classes/JsonApi/SchemaMap.php
index 97212bc..1498daf 100644
--- a/lib/classes/JsonApi/SchemaMap.php
+++ b/lib/classes/JsonApi/SchemaMap.php
@@ -2,6 +2,8 @@
 
 namespace JsonApi;
 
+use JsonApi\Schemas\Clipboard;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -19,6 +21,8 @@ class SchemaMap
             \BlubberThread::class => Schemas\BlubberThread::class,
 
             \CalendarDateAssignment::class => Schemas\CalendarDateAssignment::class,
+            \Clipboard::class => Schemas\Clipboard::class,
+            \ClipboardItem::class => Schemas\ClipboardItem::class,
             \ConsultationBlock::class => Schemas\ConsultationBlock::class,
             \ConsultationBooking::class => Schemas\ConsultationBooking::class,
             \ConsultationSlot::class => Schemas\ConsultationSlot::class,
diff --git a/lib/classes/JsonApi/Schemas/Clipboard.php b/lib/classes/JsonApi/Schemas/Clipboard.php
new file mode 100644
index 0000000..af90d73
--- /dev/null
+++ b/lib/classes/JsonApi/Schemas/Clipboard.php
@@ -0,0 +1,81 @@
+<?php
+namespace JsonApi\Schemas;
+
+use Neomerx\JsonApi\Contracts\Schema\ContextInterface;
+use Neomerx\JsonApi\Schema\Link;
+
+final class Clipboard extends SchemaProvider
+{
+    public const TYPE = 'clipboards';
+    public const REL_USER = 'user';
+    public const REL_ITEMS = 'clipboard-items';
+
+    /**
+     * @param \Clipboard $resource
+     */
+    public function getId($resource): ?string
+    {
+        return (string) $resource->id;
+    }
+
+    /**
+     * @param \Clipboard $resource
+     */
+    public function getAttributes($resource, ContextInterface $context): iterable
+    {
+        return [
+            'name'              => $resource->name,
+            'handler'           => $resource->handler,
+            'allows_item_class' => $resource->allowed_item_class,
+            'mkdate'            => date('c', $resource->mkdate),
+            'chdate'            => date('c', $resource->chdate),
+        ];
+    }
+
+    /**
+     * @param \Clipboard $resource
+     */
+    public function getRelationships($resource, ContextInterface $context): iterable
+    {
+        $relationships = [];
+
+        $isPrimary = $context->getPosition()->getLevel() === 0;
+        if ($isPrimary) {
+            $relationships = $this->getUserRelationship($relationships, $resource, $this->shouldInclude($context, self::REL_USER));
+            $relationships = $this->getItemsRelationship($relationships, $resource, $this->shouldInclude($context, self::REL_ITEMS));
+        }
+
+
+        return $relationships;
+    }
+
+    private function getUserRelationship(array $relationships, \Clipboard $clipboard, bool $includeData): array
+    {
+        $relationships[self::REL_USER] = [
+            self::RELATIONSHIP_LINKS => [
+                Link::RELATED => $this->createLinkToResource($clipboard->user),
+            ],
+            self::RELATIONSHIP_DATA => $includeData ? $clipboard->user : \User::build(['id' => $clipboard->user_id], false),
+        ];
+
+        return $relationships;
+    }
+
+    private function getItemsRelationship(array $relationships, \Clipboard $clipboard, bool $includeData): array
+    {
+        if ($includeData) {
+            $relatedItems = $clipboard->items;
+        } else {
+            $relatedItems = $clipboard->items->map(fn($item) => \ClipboardItem::build(['id' => $item->id], false));
+        }
+
+        $relationships[self::REL_ITEMS] = [
+            self::RELATIONSHIP_LINKS => [
+                Link::RELATED => $this->getRelationshipRelatedLink($clipboard, self::REL_ITEMS),
+            ],
+            self::RELATIONSHIP_DATA => $relatedItems,
+        ];
+
+        return $relationships;
+    }
+}
diff --git a/lib/classes/JsonApi/Schemas/ClipboardItem.php b/lib/classes/JsonApi/Schemas/ClipboardItem.php
new file mode 100644
index 0000000..9c84823
--- /dev/null
+++ b/lib/classes/JsonApi/Schemas/ClipboardItem.php
@@ -0,0 +1,61 @@
+<?php
+namespace JsonApi\Schemas;
+
+use Neomerx\JsonApi\Contracts\Schema\ContextInterface;
+use Neomerx\JsonApi\Schema\Link;
+
+final class ClipboardItem extends SchemaProvider
+{
+    public const TYPE = 'clipboard-items';
+    public const REL_CLIPBOARD = 'clipboard';
+
+    /**
+     * @param \ClipboardItem $resource
+     */
+    public function getId($resource): ?string
+    {
+        return (string) $resource->id;
+    }
+
+    /**
+     * @param \ClipboardItem $resource
+     */
+    public function getAttributes($resource, ContextInterface $context): iterable
+    {
+        return [
+            'range_id'   => $resource->range_id,
+            'range_type' => $resource->range_type,
+            'name'       => $resource->name,
+            'mkdate'     => date('c', $resource->mkdate),
+            'chdate'     => date('c', $resource->chdate),
+        ];
+    }
+
+    /**
+     * @param \ClipboardItem $resource
+     */
+    public function getRelationships($resource, ContextInterface $context): iterable
+    {
+        $relationships = [];
+
+        $isPrimary = $context->getPosition()->getLevel() === 0;
+        if ($isPrimary) {
+            $relationships = $this->getClipboardRelationship($relationships, $resource, $this->shouldInclude($context, self::REL_CLIPBOARD));
+        }
+
+
+        return $relationships;
+    }
+
+    private function getClipboardRelationship(array $relationships, \ClipboardItem $clipboardItem, bool $includeData): array
+    {
+        $relationships[self::REL_CLIPBOARD] = [
+            self::RELATIONSHIP_LINKS => [
+                Link::RELATED => $this->createLinkToResource($clipboardItem->clipboard),
+            ],
+            self::RELATIONSHIP_DATA => $includeData ? $clipboardItem->clipboard : \User::build(['id' => $clipboardItem->clipboard_id], false),
+        ];
+
+        return $relationships;
+    }
+}
diff --git a/lib/models/ClipboardItem.class.php b/lib/models/ClipboardItem.class.php
index 030388a..888250f 100644
--- a/lib/models/ClipboardItem.class.php
+++ b/lib/models/ClipboardItem.class.php
@@ -23,6 +23,8 @@
  * @property int $mkdate database column
  * @property int $chdate database column
  * @property Clipboard $clipboard belongs_to Clipboard
+ *
+ * @property-read string $name
  */
 class ClipboardItem extends SimpleORMap
 {
@@ -36,36 +38,32 @@ class ClipboardItem extends SimpleORMap
             'assoc_func' => 'find'
         ];
 
+        $config['additional_fields']['name'] = [
+            'get' => fn(ClipboardItem $item) => $item->__toString(),
+        ];
+
         parent::configure($config);
     }
 
-
     /**
      * @returns string representation of this clipboard item.
      */
     public function __toString()
     {
-        //Get the class $range_type and the object with ID $range_id,
-        //if $range_type is a StudipItem:
-
-        $use_generic_name = true;
-        $object = null;
-        if (is_subclass_of($this->range_type, 'StudipItem', true)) {
+        // Get the class $range_type and the object with ID $range_id,
+        // if $range_type is a StudipItem:
+        if (is_subclass_of($this->range_type, StudipItem::class)) {
             $range_class_name = $this->range_type;
             $object = $range_class_name::find($this->range_id);
             if ($object) {
-                $use_generic_name = false;
+                return $object->getItemName(false);
             }
         }
 
-        if ($use_generic_name) {
-            //$range_type is not a class name of a StudipItem class
-            //or no object of a StudipItem class could be found:
-            //We cannot determine the name and must therefore use
-            //a generic name:
-            return $this->range_type . '_' . $this->range_id;
-        } else {
-            return $object->getItemName(false);
-        }
+        // $range_type is not a class name of a StudipItem class
+        // or no object of a StudipItem class could be found:
+        // We cannot determine the name and must therefore use
+        // a generic name:
+        return $this->range_type . '_' . $this->range_id;
     }
 }
diff --git a/resources/assets/javascripts/bootstrap/clipboard.js b/resources/assets/javascripts/bootstrap/clipboard.js
index e525b35..a64a605 100644
--- a/resources/assets/javascripts/bootstrap/clipboard.js
+++ b/resources/assets/javascripts/bootstrap/clipboard.js
@@ -25,7 +25,9 @@ STUDIP.domReady(function () {
 
     jQuery(document).on('click', '.clipboard-remove-button', function (event) {
         event.preventDefault();
-        STUDIP.Dialog.confirm($(this).data('confirm-message'), function() {
+
+        const message = $(this).data('confirm-message');
+        STUDIP.Dialog.confirm(message).done(() => {
             STUDIP.Clipboard.handleRemoveClick(event.target);
         });
     });
@@ -62,10 +64,11 @@ STUDIP.domReady(function () {
         });
     });
 
-    jQuery(document).on('submit', '.clipboard-widget .new-clipboard-form', function (event) {
-        event.preventDefault();
-        STUDIP.Clipboard.handleAddForm(event);
-    });
+    jQuery(document).on(
+        'submit',
+        '.clipboard-widget .new-clipboard-form',
+        STUDIP.Clipboard.handleAddForm
+    );
 
     jQuery(document).on('click', '.clipboard-add-item-button', function (event) {
         event.preventDefault();
diff --git a/resources/assets/javascripts/lib/abstract-api.js b/resources/assets/javascripts/lib/abstract-api.js
index eafca85..cf9aed1 100644
--- a/resources/assets/javascripts/lib/abstract-api.js
+++ b/resources/assets/javascripts/lib/abstract-api.js
@@ -52,6 +52,8 @@ class AbstractAPI
 
         var deferred;
 
+        const request = this.#createRequest(url, options);
+
         if (options.async && this.request_count > 0) {
             // Request should be sent asynchronous after every other request
             // is finished. The configuration for this particular request is
@@ -73,10 +75,10 @@ class AbstractAPI
             this.total_requests += 1;
 
             // Actual request
-            deferred = $.ajax(STUDIP.URLHelper.getURL(`${this.base_url}/${url}`, {}, true), {
+            deferred = $.ajax(request.url, {
                 contentType: options.contentType || 'application/x-www-form-urlencoded; charset=UTF-8',
                 method: options.method.toUpperCase(),
-                data: this.encodeData(options.data, options.method.toUpperCase()),
+                data: this.encodeData(request.data, options.method.toUpperCase()),
                 headers: options.headers
             }).always(() => {
                 // Decrease request counter, remove overlay if neccessary
@@ -93,6 +95,27 @@ class AbstractAPI
             }
         }).promise();
     }
+
+    #createRequest(url, options) {
+        const hasBody = ['post', 'put', 'patch'].includes(options.method.toLowerCase());
+        const query = hasBody ? '' : `?${this.convertDataToRequestParameters(options.data)}`;
+
+        return {
+            url: STUDIP.URLHelper.getURL(`${this.base_url}/${url}${query}`, {}, true),
+            data: hasBody ? options.data : {},
+        };
+    }
+
+    convertDataToRequestParameters(data, prefix = '') {
+        return Object.entries(data).map(([key, value]) => {
+            const name = prefix ? `${prefix}[${key}]` : `${key}`;
+            if (value.constructor.name === 'Object') {
+                return this.convertDataToRequestParameters(value, name);
+            } else {
+                return `${name}=${value}`;
+            }
+        }).join('&');
+    }
 }
 
 // Create shortcut methods for easier access by method
diff --git a/resources/assets/javascripts/lib/clipboard.js b/resources/assets/javascripts/lib/clipboard.js
index e5890ab..8af3111 100644
--- a/resources/assets/javascripts/lib/clipboard.js
+++ b/resources/assets/javascripts/lib/clipboard.js
@@ -1,4 +1,14 @@
-import {$gettext} from './gettext';
+function extractAttribute(node, attribute) {
+    return node.querySelector(`input[name="${attribute}"]`)?.value.trim();
+}
+
+function extractAttributes(node, attributes) {
+    const result = {};
+    for (const key of attributes) {
+        result[key] = extractAttribute(node, key);
+    }
+    return result;
+}
 
 const Clipboard = {
     switchClipboard: function(event) {
@@ -32,32 +42,30 @@ const Clipboard = {
         }
     },
 
-    handleAddForm: function(event) {
-        if (!event) {
-            return false;
-        }
-
+    handleAddForm(event) {
+        event.preventDefault();
 
+        const attributes = extractAttributes(event.target, ['name', 'allowed_item_class']);
 
         //Check if a name is entered in the form:
-        let name_input = jQuery(event.target).find('input[type="text"][name="name"]');
+        const name_input = event.target.querySelector('input[name="name"]');
         if (!name_input) {
             //Something is wrong with the HTML:
             return false;
         }
-        let name = jQuery(name_input).val().trim();
-        if (!name) {
+        if (!attributes.name) {
             //The name field is empty. Why send an empty field?
             return false;
         }
 
-        //Submit the form via AJAX:
-        STUDIP.api.POST(
-            'clipboard/add',
-            {
-                data: jQuery(event.target).serialize()
-            }
-        ).done(STUDIP.Clipboard.add);
+        // Submit the form via AJAX:
+        STUDIP.jsonapi.POST('clipboards', {data: {data: {attributes}}}).done(({data}) => {
+            STUDIP.Clipboard.add({
+                id: data.id,
+                name: data.attributes.name,
+                widget_id: extractAttribute(event.target, 'widget_id')
+            });
+        });
     },
 
     add: function(data) {
@@ -134,11 +142,9 @@ const Clipboard = {
         jQuery(widget_node).find('#clipboard-group-container').removeClass('invisible');
 
         //Call the droppable jQuery method on the new clipboard area:
-        jQuery(clipboard_node).droppable(
-            {
-                drop: STUDIP.Clipboard.handleItemDrop
-            }
-        );
+        jQuery(clipboard_node).droppable({
+            drop: STUDIP.Clipboard.handleItemDrop
+        });
 
         //Clear the text input in the "add clipboard" form:
         jQuery(widget_node).find(
@@ -238,17 +244,19 @@ const Clipboard = {
         }
 
         //Add the item to the clipboard via AJAX:
-        STUDIP.api.POST(
-            'clipboard/' + clipboard_id + '/item',
-            {
+        STUDIP.jsonapi.POST(`clipboards/${clipboard_id}/items`, {
+            data: {
                 data: {
-                    'range_id': range_id,
-                    'range_type': range_type,
-                    'widget_id': widget_id
+                    attributes: { range_id, range_type }
                 }
             }
-        ).done(function(data) {
-            STUDIP.Clipboard.addDroppedItem(data);
+        }).done(({data}) => {
+            STUDIP.Clipboard.addDroppedItem({
+                id: data.id,
+                name: data.attributes.name,
+                range_id: data.attributes.range_id,
+                widget_id
+            });
         });
     },
 
@@ -263,6 +271,7 @@ const Clipboard = {
         let widget = jQuery('#ClipboardWidget_' + response_data['widget_id']);
         let clipboard_id = jQuery(widget).find(".clipboard-selector").val();
 
+
         if (!widget) {
             //The widget with the speicified widget-ID
             //is not present on the current page.
@@ -325,25 +334,16 @@ const Clipboard = {
         );
     },
 
-    rename: function(widget_id) {
-         if (!widget_id) {
-            //Required data are missing!
-            return;
-        }
+    rename(widget_id) {
+        const widget = jQuery('#ClipboardWidget_' + widget_id);
+        const clipboard_id = widget.find('.clipboard-selector').val();
+        const name = widget.find('input.clipboard-name').val();
 
-        let widget = jQuery('#ClipboardWidget_' + widget_id);
-        let clipboard_id = jQuery(widget).find(".clipboard-selector").val();
-        let namer = jQuery(widget).find("input.clipboard-name");
-
-        STUDIP.api.PUT(
-            'clipboard/' + clipboard_id,
-            {
-                data: {
-                    name: namer.val()
-                }
-            }
-        ).done(function(data) {
-            STUDIP.Clipboard.update(data, widget_id)
+        STUDIP.jsonapi.PATCH(`clipboards/${clipboard_id}`, {data: {data: {attributes: {name}}}}).done(({data}) => {
+            STUDIP.Clipboard.update({
+                id: data.id,
+                name: data.attributes.name,
+            }, widget_id)
         });
     },
 
@@ -358,7 +358,7 @@ const Clipboard = {
         STUDIP.Clipboard.toggleEditButtons(widget_id);
     },
 
-    remove: function(clipboard_id, widget_id) {
+    remove(clipboard_id, widget_id) {
         if (!clipboard_id || !widget_id) {
             //Required data are missing!
             return;
@@ -427,10 +427,6 @@ const Clipboard = {
     },
 
     handleRemoveClick: function(delete_icon) {
-        if (!delete_icon) {
-            return;
-        }
-
         //Get the data of the clipboard:
         let clipboard_select = jQuery(delete_icon).siblings('.clipboard-selector')[0];
         if (!clipboard_select) {
@@ -444,52 +440,42 @@ const Clipboard = {
             //Another case where something is wrong with the HTML.
             return;
         }
-        let widget_id = jQuery(widget).data('widget_id');
 
-        STUDIP.api.DELETE(
-            'clipboard/' + clipboard_id,
-            {
-                data: {
-                    widget_id: widget_id
-                }
-            }
-        ).done(function() {
+        const widget_id = jQuery(widget).data('widget_id');
+
+        STUDIP.jsonapi.DELETE(`clipboards/${clipboard_id}`).done(() => {
             STUDIP.Clipboard.remove(clipboard_id, widget_id);
         });
     },
 
-    removeItem: function(delete_icon) {
-        if (!delete_icon) {
-            return;
-        }
-
-        //Get the item-ID:
-        let item_html = jQuery(delete_icon).parents('tr');
-        let range_id = jQuery(item_html).data('range_id');
-        let clipboard_element = jQuery(item_html).parents('table');
-        let clipboard_id = jQuery(clipboard_element).data('id');
+    removeItem(delete_icon) {
+        // Get the item-ID:
+        const item_element = jQuery(delete_icon).parents('tr');
+        const range_id = jQuery(item_element).data('range_id');
+        const clipboard_element = jQuery(item_element).parents('table');
+        const clipboard_id = jQuery(clipboard_element).data('id');
 
         if (!range_id || !clipboard_id) {
             //We cannot proceed without the item-ID and the clipboard-ID!
             return;
         }
 
-        STUDIP.api.DELETE(
-            'clipboard/' + clipboard_id + '/item/' + range_id
-        ).done(function() {
+        STUDIP.jsonapi.DELETE(`clipboards/${clipboard_id}/items`, {
+            data: {
+                filter: { range_id }
+            }
+        }).done(() => {
             //Check if the item has siblings:
-            let siblings = jQuery(item_html).siblings();
+            let siblings = item_element.siblings();
             if (siblings.length < 3) {
                 //Only the "no items" element and the template
                 //are siblings of the item.
                 //We must display the "no items" element:
-                jQuery(item_html).siblings(
-                    '.empty-clipboard-message'
-                ).removeClass('invisible');
+                item_element.siblings('.empty-clipboard-message').removeClass('invisible');
                 jQuery("#clipboard-group-container").find('.widget-links').addClass('invisible');
             }
             //Finally remove the item:
-            jQuery(item_html).remove();
+            item_element.remove();
         });
     },
 
diff --git a/tests/_support/Helper/StudipDb.php b/tests/_support/Helper/StudipDb.php
index c80338c..b95e703 100644
--- a/tests/_support/Helper/StudipDb.php
+++ b/tests/_support/Helper/StudipDb.php
@@ -11,19 +11,11 @@ class StudipDb extends \Codeception\Module
 {
     /**
      * @api
-     *
-     * @var
      */
     public ?\StudipPdo $dbh;
 
-    /**
-     * @var array
-     */
     protected array $config = [];
 
-    /**
-     * @var array
-     */
     protected array $requiredFields = ['dsn', 'user', 'password'];
 
     /**
diff --git a/tests/jsonapi/ClipboardRoutesTest.php b/tests/jsonapi/ClipboardRoutesTest.php
new file mode 100644
index 0000000..71a851a
--- /dev/null
+++ b/tests/jsonapi/ClipboardRoutesTest.php
@@ -0,0 +1,167 @@
+<?php
+
+use JsonApi\Routes\Clipboards\ClipboardItemsCreate;
+use JsonApi\Routes\Clipboards\ClipboardItemsDelete;
+use JsonApi\Routes\Clipboards\ClipboardsCreate;
+use JsonApi\Routes\Clipboards\ClipboardsDelete;
+use JsonApi\Routes\Clipboards\ClipboardsUpdate;
+use JsonApi\Schemas\Clipboard as ClipboardSchema;
+use JsonApi\Schemas\ClipboardItem as ClipboardItemSchema;
+use WoohooLabs\Yang\JsonApi\Response\JsonApiResponse;
+use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObject;
+
+require_once __DIR__ . '/JSONAPIHelperTrait.php';
+
+class ClipboardRoutesTest extends Codeception\Test\Unit
+{
+    use JSONAPIHelperTrait;
+
+    public function testCreateClipboard(): void
+    {
+        $resource = $this->createClipboard(
+            $this->tester->getCredentialsForTestDozent()
+        );
+
+        $this->assertHasRelations($resource, 'user', 'clipboard-items');
+        $this->assertEquals(ClipboardSchema::TYPE, $resource->type());
+        $this->assertEquals('Test-Clipboard', $resource->attribute('name'));
+    }
+
+    public function testUpdateClipboard(): void
+    {
+        $credentials = $this->tester->getCredentialsForTestDozent();
+        $resource = $this->createClipboard($credentials);
+
+        $response = $this->sendMockRequest(
+            "/clipboards/{id}",
+            ClipboardsUpdate::class,
+            $credentials,
+            ['id' => $resource->id()],
+            [
+                'considered_successful' => [200],
+                'method' => 'PATCH',
+                'json_body' => [
+                    'data' => [
+                        'attributes' => ['name' => 'Foo Bar'],
+                    ],
+                ],
+            ],
+        );
+
+        $resource = $this->getResourceFromResponse($response);
+
+        $this->assertEquals('Foo Bar', $resource->attribute('name'));
+    }
+
+    public function testDeleteClipboard(): void
+    {
+        $credentials = $this->tester->getCredentialsForTestDozent();
+
+        $resource = $this->createClipboard($credentials);
+
+        $this->sendMockRequest(
+            "/clipboards/{id}",
+            ClipboardsDelete::class,
+            $credentials,
+            ['id' => $resource->id()],
+            [
+                'considered_successful' => [204],
+                'method' => 'DELETE',
+            ],
+        );
+    }
+
+    public function testAddItemToClipboard(): void
+    {
+        $credentials = $this->tester->getCredentialsForTestDozent();
+        $resource = $this->createClipboard($credentials);
+
+        $resource = $this->createClipboardItem(
+            $credentials,
+            $resource->id(),
+            'abcd1234',
+            'Room'
+        );
+
+        $this->assertHasRelations($resource, 'clipboard');
+        $this->assertEquals(ClipboardItemSchema::TYPE, $resource->type());
+        $this->assertEquals('abcd1234', $resource->attribute('range_id'));
+        $this->assertEquals('Room', $resource->attribute('range_type'));
+    }
+
+    public function testRemoveItemFromClipboard(): void
+    {
+        $credentials = $this->tester->getCredentialsForTestDozent();
+        $clipboard = $this->createClipboard($credentials);
+        $item = $this->createClipboardItem(
+            $credentials,
+            $clipboard->id(),
+            'abcd1234',
+            'Room'
+        );
+
+        $this->sendMockRequest(
+            "/clipboards/{id}/items/{itemId}",
+            ClipboardItemsDelete::class,
+            $credentials,
+            [
+                'id' => $clipboard->id(),
+                'itemId' => $item->id(),
+            ],
+            [
+                'considered_successful' => [204],
+                'method' => 'DELETE',
+            ],
+        );
+    }
+
+    protected function createClipboard(array $credentials, string $name = 'Test-Clipboard'): ResourceObject
+    {
+        $response = $this->sendMockRequest(
+            "/clipboards",
+            ClipboardsCreate::class,
+            $credentials,
+            [],
+            [
+                'considered_successful' => [200],
+                'method' => 'POST',
+                'json_body' => [
+                    'data' => [
+                        'type' => ClipboardSchema::TYPE,
+                        'attributes' => ['name' => $name],
+                    ],
+                ],
+            ],
+        );
+
+        return $this->getResourceFromResponse($response);
+    }
+
+    protected function createClipboardItem(
+        array $credentials,
+        string $clipboard_id,
+        string $range_id,
+        string $range_type
+    ): ResourceObject {
+        $response = $this->sendMockRequest(
+            "/clipboards/{id}/items",
+            ClipboardItemsCreate::class,
+            $credentials,
+            ['id' => $clipboard_id],
+            [
+                'considered_successful' => [200],
+                'method' => 'POST',
+                'json_body' => [
+                    'data' => [
+                        'attributes' => [
+                            'range_id'   => $range_id,
+                            'range_type' => $range_type,
+                        ],
+                    ],
+                ],
+            ],
+        );
+
+        return $this->getResourceFromResponse($response);
+    }
+}
diff --git a/tests/jsonapi/ConsultationHelper.php b/tests/jsonapi/ConsultationHelper.php
index 673174e..f84820b 100644
--- a/tests/jsonapi/ConsultationHelper.php
+++ b/tests/jsonapi/ConsultationHelper.php
@@ -1,19 +1,9 @@
 <?php
-use WoohooLabs\Yang\JsonApi\Response\JsonApiResponse;
-use WoohooLabs\Yang\JsonApi\Schema\Document;
-use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObject;
+require_once __DIR__ . '/JSONAPIHelperTrait.php';
 
 trait ConsultationHelper
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
-    protected function _before()
-    {
-        \DBManager::getInstance()->setConnection('studip', $this->getModule('\\Helper\\StudipDb')->dbh);
-    }
+    use JSONAPIHelperTrait;
 
     protected static $BLOCK_DATA = [
         'room'              => 'Testraum',
@@ -88,23 +78,6 @@ trait ConsultationHelper
         return $block->slots->first();
     }
 
-    protected function withStudipEnv(array $credentials, callable $fn)
-    {
-        // Create global template factory if neccessary
-        $has_template_factory = isset($GLOBALS['template_factory']);
-        if (!$has_template_factory) {
-            $GLOBALS['template_factory'] = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
-        }
-
-        $result = $this->tester->withPHPLib($credentials, $fn);
-
-        if (!$has_template_factory) {
-            unset($GLOBALS['template_factory']);
-        }
-
-        return $result;
-    }
-
     protected function createBookingForSlot(array $credentials, ConsultationSlot $slot, User $user): ConsultationBooking
     {
         return $this->withStudipEnv(
@@ -122,81 +95,4 @@ trait ConsultationHelper
             }
         );
     }
-
-    protected function sendMockRequest(string $route, string $handler, array $credentials, array $variables = [], array $options = []): JsonApiResponse
-    {
-        $options = array_merge([
-            'method'                => 'GET',
-            'considered_successful' => [200],
-            'json_body'             => null,
-        ], $options);
-
-        $app = $this->tester->createApp(
-            $credentials,
-            strtolower($options['method']),
-            $route,
-            $handler
-        );
-
-        $evaluated_route = preg_replace_callback(
-            '/\{(.+?)(:[^}]+)?}/',
-            function ($match) use ($variables) {
-                $key = $match[1];
-                if (!isset($variables[$key])) {
-                    throw new Exception("No variable '{$key}' defined");
-                }
-                return $variables[$key];
-            },
-            $route
-        );
-
-        $requestBuilder = $this->tester->createRequestBuilder($credentials);
-        $requestBuilder->setUri($evaluated_route)->setMethod(strtoupper($options['method']));
-
-        if (isset($options['json_body'])) {
-            $requestBuilder->setJsonApiBody($options['json_body']);
-
-        }
-
-        /** @var JsonApiResponse $response */
-        $response = $this->withStudipEnv($credentials, function () use ($app, $requestBuilder) {
-            return $this->tester->sendMockRequest($app, $requestBuilder->getRequest());
-        });
-
-        if ($options['considered_successful']) {
-            $this->assertTrue(
-                $response->isSuccessful($options['considered_successful']),
-                'Actual status code is ' . $response->getStatusCode()
-            );
-        }
-
-        return $response;
-    }
-
-    protected function getSingleResourceDocument(JsonApiResponse $response): Document
-    {
-        $this->assertTrue($response->hasDocument());
-
-        $document = $response->document();
-        $this->assertTrue($document->isSingleResourceDocument());
-
-        return $document;
-    }
-
-    protected function getResourceCollectionDocument(JsonApiResponse $response): Document
-    {
-        $this->assertTrue($response->hasDocument());
-
-        $document = $response->document();
-        $this->assertTrue($document->isResourceCollectionDocument());
-
-        return $document;
-    }
-
-    protected function assertHasRelations(ResourceObject $resource, ...$relations)
-    {
-        foreach ($relations as $relation) {
-            $this->assertTrue($resource->hasRelationship($relation));
-        }
-    }
 }
diff --git a/tests/jsonapi/JSONAPIHelperTrait.php b/tests/jsonapi/JSONAPIHelperTrait.php
new file mode 100644
index 0000000..666e198
--- /dev/null
+++ b/tests/jsonapi/JSONAPIHelperTrait.php
@@ -0,0 +1,117 @@
+<?php
+
+use WoohooLabs\Yang\JsonApi\Response\JsonApiResponse;
+use WoohooLabs\Yang\JsonApi\Schema\Document;
+use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObject;
+
+trait JSONAPIHelperTrait
+{
+    protected JSONAPITester $tester;
+
+    protected function _before()
+    {
+        DBManager::getInstance()->setConnection(
+            'studip',
+            $this->getModule('\\Helper\\StudipDb')->dbh
+        );
+    }
+
+    protected function withStudipEnv(array $credentials, callable $fn)
+    {
+        // Create global template factory if neccessary
+        $has_template_factory = isset($GLOBALS['template_factory']);
+        if (!$has_template_factory) {
+            $GLOBALS['template_factory'] = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+        }
+
+        $result = $this->tester->withPHPLib($credentials, $fn);
+
+        if (!$has_template_factory) {
+            unset($GLOBALS['template_factory']);
+        }
+
+        return $result;
+    }
+
+    protected function sendMockRequest(string $route, string $handler, array $credentials, array $variables = [], array $options = []): JsonApiResponse
+    {
+        $options = array_merge([
+            'method'                => 'GET',
+            'considered_successful' => [200],
+            'json_body'             => null,
+        ], $options);
+
+        $app = $this->tester->createApp(
+            $credentials,
+            strtolower($options['method']),
+            $route,
+            $handler
+        );
+
+        $evaluated_route = preg_replace_callback(
+            '/\{(.+?)(:[^}]+)?}/',
+            function ($match) use ($variables) {
+                $key = $match[1];
+                if (!isset($variables[$key])) {
+                    throw new Exception("No variable '{$key}' defined");
+                }
+                return $variables[$key];
+            },
+            $route
+        );
+
+        $requestBuilder = $this->tester->createRequestBuilder($credentials);
+        $requestBuilder->setUri($evaluated_route)->setMethod(strtoupper($options['method']));
+
+        if (isset($options['json_body'])) {
+            $requestBuilder->setJsonApiBody($options['json_body']);
+
+        }
+
+        /** @var JsonApiResponse $response */
+        $response = $this->withStudipEnv($credentials, function () use ($app, $requestBuilder) {
+            return $this->tester->sendMockRequest($app, $requestBuilder->getRequest());
+        });
+
+        if ($options['considered_successful']) {
+            $this->assertTrue(
+                $response->isSuccessful($options['considered_successful']),
+                'Actual status code is ' . $response->getStatusCode()
+            );
+        }
+
+        return $response;
+    }
+
+    protected function getSingleResourceDocument(JsonApiResponse $response): Document
+    {
+        $this->assertTrue($response->hasDocument());
+
+        $document = $response->document();
+        $this->assertTrue($document->isSingleResourceDocument());
+
+        return $document;
+    }
+
+    protected function getResourceCollectionDocument(JsonApiResponse $response): Document
+    {
+        $this->assertTrue($response->hasDocument());
+
+        $document = $response->document();
+        $this->assertTrue($document->isResourceCollectionDocument());
+
+        return $document;
+    }
+
+    protected function assertHasRelations(ResourceObject $resource, ...$relations)
+    {
+        foreach ($relations as $relation) {
+            $this->assertTrue($resource->hasRelationship($relation));
+        }
+    }
+
+    protected function getResourceFromResponse(JsonApiResponse $response): ResourceObject
+    {
+        return $this->getSingleResourceDocument($response)->primaryResource();
+    }
+}
-- 
cgit v1.0


From faf3ec11f570f015be02c96a2adbf69886e1de4c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 21 May 2024 13:46:00 +0200
Subject: remove debug message, re #4198

---
 resources/assets/javascripts/lib/clipboard.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/assets/javascripts/lib/clipboard.js b/resources/assets/javascripts/lib/clipboard.js
index 8af3111..6fd1489 100644
--- a/resources/assets/javascripts/lib/clipboard.js
+++ b/resources/assets/javascripts/lib/clipboard.js
@@ -311,7 +311,6 @@ const Clipboard = {
         jQuery(new_item_node).removeClass('invisible');
 
         let name_column = jQuery(new_item_node).find('td.item-name');
-        console.log(name_column);
         jQuery('<span/>').text(response_data['name']).appendTo(name_column)
         let id_field = jQuery(new_item_node).find("input[name='selected_clipboard_items[]']");
         jQuery(id_field).val(checkbox_id);
-- 
cgit v1.0


From 2958898f7559ad65dc44a96f5b8f20f71ea1f926 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 22 May 2024 07:03:28 +0000
Subject: add more and more checks (the controller needs some serious rework),
 fixes #4010

Closes #4010

Merge request studip/studip!2863
---
 app/controllers/course/room_requests.php                    | 4 ++--
 app/views/course/room_requests/_new_request_form_footer.php | 5 +----
 lib/models/resources/ResourceCategory.class.php             | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index a6c7a44..a31e61a 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -254,7 +254,7 @@ class Course_RoomRequestsController extends AuthenticatedController
         $this->selected_room = Resource::find($_SESSION[$request_id]['room_id'] ?: $this->request->resource_id);
 
         $this->selected_room_category_id = $this->selected_room->category_id ?? $_SESSION[$request_id]['room_category_id'] ?? null;
-        $this->category = ResourceCategory::find($this->selected_room_category_id);
+        $this->category = $this->selected_room_category_id ? ResourceCategory::find($this->selected_room_category_id) : null;
 
         $_SESSION[$request_id]['room_category_id'] = $_SESSION[$request_id]['room_category_id'] ?? $this->selected_room->category_id ?? null;
 
@@ -546,7 +546,7 @@ class Course_RoomRequestsController extends AuthenticatedController
 
         $_SESSION[$request_id]['search_by'] = $this->selected_room ? 'roomname' : 'category';
         $_SESSION[$request_id]['room_category_id'] = $this->selected_room_category->id;
-        $_SESSION[$request_id]['room_id'] = $this->selected_room->id;
+        $_SESSION[$request_id]['room_id'] = $this->selected_room ? $this->selected_room->id : '';
     }
 
     public function store_request_action($request_id)
diff --git a/app/views/course/room_requests/_new_request_form_footer.php b/app/views/course/room_requests/_new_request_form_footer.php
index 0bad076..0d50467 100644
--- a/app/views/course/room_requests/_new_request_form_footer.php
+++ b/app/views/course/room_requests/_new_request_form_footer.php
@@ -27,10 +27,7 @@
         <? if (
             (
                 $step === 1
-                && (
-                    !isset($_SESSION[$request_id]['room_category_id'])
-                    || $_SESSION[$request_id]['room_category_id'] !== '0'
-                )
+                && !empty($_SESSION[$request_id]['room_category_id'])
             )
             || $step === 2
         ) : ?>
diff --git a/lib/models/resources/ResourceCategory.class.php b/lib/models/resources/ResourceCategory.class.php
index f4ae14d..766a5f6 100644
--- a/lib/models/resources/ResourceCategory.class.php
+++ b/lib/models/resources/ResourceCategory.class.php
@@ -85,7 +85,7 @@ class ResourceCategory extends SimpleORMap
     public static function find($id)
     {
         $all = self::findAll();
-        return $all[$id] ?: null;
+        return $all[$id] ?? null;
     }
 
     /**
-- 
cgit v1.0


From e158827837689ad95e5d71e9d7a71d30a92ae181 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 22 May 2024 16:21:56 +0000
Subject: fixes #4206

Closes #4206

Merge request studip/studip!3033
---
 public/install.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/install.php b/public/install.php
index 24725c3..e9b0bf6 100644
--- a/public/install.php
+++ b/public/install.php
@@ -18,7 +18,6 @@ set_include_path($GLOBALS['STUDIP_BASE_PATH']);
 require_once 'composer/autoload.php';
 require_once 'lib/visual.inc.php';
 require_once 'vendor/trails/trails.php';
-require_once 'vendor/flexi/flexi.php';
 require_once 'lib/classes/URLHelper.php';
 require_once 'lib/classes/LayoutMessage.interface.php';
 require_once 'lib/classes/MessageBox.class.php';
@@ -30,6 +29,10 @@ require_once 'lib/classes/StudipInstaller.php';
 require_once 'lib/classes/SystemChecker.php';
 require_once 'lib/classes/Markup.class.php';
 require_once 'lib/exceptions/AccessDeniedException.php';
+require_once 'lib/flexi/Factory.php';
+require_once 'lib/flexi/PhpTemplate.php';
+require_once 'lib/flexi/Template.php';
+require_once 'lib/flexi/TemplateNotFoundException.php';
 require_once 'vendor/phpass/PasswordHash.php';
 
 // Mock gettext functions if extension is not available
-- 
cgit v1.0


From 9268a3d31255f895dedb5224b0e655f88b8ab45e Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 23 May 2024 10:14:55 +0000
Subject: made texts more accessible, fixes #4022

Closes #4022

Merge request studip/studip!2874
---
 app/controllers/course/studygroup.php                 |  2 +-
 app/controllers/settings/settings.php                 |  4 ++--
 app/views/accessibility/forms/report_barrier.php      |  2 +-
 app/views/admin/plugin/edit_automaticupdate.php       |  2 +-
 app/views/course/enrolment/_priocourses.php           | 10 +++++-----
 app/views/news/display.php                            |  5 +++--
 app/views/oer/admin/hosts.php                         |  2 +-
 app/views/oer/market/licenseinfo.php                  |  2 +-
 app/views/questionnaire/widget.php                    |  2 +-
 app/views/resources/room_group/permissions.php        |  2 +-
 app/views/settings/notification.php                   |  2 +-
 lib/admissionrules/termsadmission/templates/input.php |  2 +-
 lib/classes/StudygroupModel.php                       |  4 ++--
 templates/check_object_exception.php                  |  2 +-
 templates/login_emailactivation.php                   |  4 ++--
 15 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php
index 500a0b6..c375778 100644
--- a/app/controllers/course/studygroup.php
+++ b/app/controllers/course/studygroup.php
@@ -785,7 +785,7 @@ class Course_StudygroupController extends AuthenticatedController
             // send invite message to user
             $msg     = new messaging();
             $sem     = new Seminar($id);
-            $message = sprintf(_("%s möchte Sie auf die Studiengruppe %s aufmerksam machen. Klicken Sie auf den untenstehenden Link, um direkt zur Studiengruppe zu gelangen.\n\n %s"),
+            $message = sprintf(_("%s möchte Sie auf die Studiengruppe %s aufmerksam machen. Klicken Sie auf den folgenden Link, um direkt zur Studiengruppe zu gelangen.\n\n %s"),
                 get_fullname(), $sem->name, URLHelper::getlink("dispatch.php/course/studygroup/details/" . $id, ['cid' => null]));
             $subject = _("Sie wurden in eine Studiengruppe eingeladen");
             $msg->insert_message($message, get_username($receiver), '', '', '', '', '', $subject);
diff --git a/app/controllers/settings/settings.php b/app/controllers/settings/settings.php
index 0346c24..327b62d 100644
--- a/app/controllers/settings/settings.php
+++ b/app/controllers/settings/settings.php
@@ -46,11 +46,11 @@ abstract class Settings_SettingsController extends AuthenticatedController
             $exception = new AccessDeniedException(_('Sie dürfen dieses Profil nicht bearbeiten'));
             $exception->setDetails([
                 _("Wahrscheinlich ist Ihre Session abgelaufen. Bitte "
-                 ."nutzen Sie in diesem Fall den untenstehenden Link, "
+                 ."nutzen Sie in diesem Fall den folgenden Link, "
                  ."um zurück zur Anmeldung zu gelangen.\n\n"
                  ."Eine andere Ursache kann der Versuch des Zugriffs "
                  ."auf Userdaten, die Sie nicht bearbeiten dürfen, sein. "
-                 ."Nutzen Sie den untenstehenden Link, um zurück auf "
+                 ."Nutzen Sie den folgenden Link, um zurück auf "
                  ."die Startseite zu gelangen."),
             ]);
             throw $exception;
diff --git a/app/views/accessibility/forms/report_barrier.php b/app/views/accessibility/forms/report_barrier.php
index 5dd8d7d..51ca079 100644
--- a/app/views/accessibility/forms/report_barrier.php
+++ b/app/views/accessibility/forms/report_barrier.php
@@ -1,2 +1,2 @@
-<?= MessageBox::info(_('Auf dieser Seite können Sie eine Barriere melden, die die Nutzbarkeit von Stud.IP für Sie einschränkt. Füllen Sie dazu das untenstehende Formular aus.'))->hideClose() ?></p>
+<?= MessageBox::info(_('Auf dieser Seite können Sie eine Barriere melden, die die Nutzbarkeit von Stud.IP für Sie einschränkt. Füllen Sie dazu das folgende Formular aus.'))->hideClose() ?></p>
 <?= $form->render() ?>
diff --git a/app/views/admin/plugin/edit_automaticupdate.php b/app/views/admin/plugin/edit_automaticupdate.php
index 7e87c31..2feb1bc 100644
--- a/app/views/admin/plugin/edit_automaticupdate.php
+++ b/app/views/admin/plugin/edit_automaticupdate.php
@@ -46,7 +46,7 @@ if ($_SERVER['HTTPS'] == 'on' && $_SERVER['SERVER_PORT'] != 443 ||
     <fieldset>
         <legend><?= _("Daten für das bereitstellende System") ?></legend>
         <p class="info">
-            <?= _("Tragen Sie bei gitlab, github.com oder dem Pluginmarktplatz untenstehende URL ein, die der Webhook aufrufen soll.") ?>
+            <?= _("Tragen Sie bei gitlab, github.com oder dem Pluginmarktplatz die folgende URL ein, die der Webhook aufrufen soll.") ?>
             <? if ($plugin['automatic_update_secret']) : ?>
             <?= _("Dieser Aufruf muss noch mit dem Sicherheitstoken abgesichert werden.") ?>
             <? endif ?>
diff --git a/app/views/course/enrolment/_priocourses.php b/app/views/course/enrolment/_priocourses.php
index 749a19c..a1e1bce 100644
--- a/app/views/course/enrolment/_priocourses.php
+++ b/app/views/course/enrolment/_priocourses.php
@@ -36,15 +36,15 @@ asort($user_prio);
 <? endif; ?>
 
     <p class="hidden-medium-down">
-        <?= _('Ziehen Sie die in Frage kommenden Veranstaltungen auf die rechte Seite '
+        <?= _('Ziehen Sie die in Frage kommenden Veranstaltungen in den Bereich für ausgewählte Veranstaltungen '
             . 'und ordnen Sie sie dort in der Reihenfolge der von Ihnen gewünschten '
-            . 'Priorität an. Sie können mehr Veranstaltungen nach rechts ziehen als Sie '
+            . 'Priorität an. Sie können mehr Veranstaltungen ziehen als Sie '
             . 'tatsächlich belegen wollen.') ?>
     </p>
     <p class="hidden-medium-up">
-        <?= _('Sortieren Sie die in Frage kommenden Veranstaltungen auf die rechte Seite '
+        <?= _('Sortieren Sie die in Frage kommenden Veranstaltungen im Bereich für ausgewählte Veranstaltungen '
             . 'und ordnen Sie sie dort in der Reihenfolge der von Ihnen gewünschten '
-            . 'Priorität an. Sie können mehr Veranstaltungen nach rechts zuweisen als Sie '
+            . 'Priorität an. Sie können mehr Veranstaltungen zuweisen als Sie '
             . 'tatsächlich belegen wollen.') ?>
     </p>
 
@@ -79,7 +79,7 @@ asort($user_prio);
             <ul id="selected-courses">
                 <li class="empty">
                     <span class="hidden-medium-up">
-                        <?= _('Die gewünschten Veranstaltungen links auswählen') ?>
+                        <?= _('Die gewünschten Veranstaltungen aus der Liste der verfügbaren Veranstaltungen auswählen') ?>
                     </span>
                     <span class="hidden-medium-down">
                         <?= _('Gewünschte Veranstaltungen hierhin ziehen') ?>
diff --git a/app/views/news/display.php b/app/views/news/display.php
index 356ec1f..7d9e2d0 100644
--- a/app/views/news/display.php
+++ b/app/views/news/display.php
@@ -8,7 +8,8 @@
         </h1>
         <nav>
         <? if ($perm): ?>
-            <a href="<?= $controller->link_for('news/edit_news/new/' . $range); ?>" data-dialog>
+            <a href="<?= $controller->link_for('news/edit_news/new/' . $range); ?>" data-dialog
+               title="<?= _('Hinzufügen') ?>">
                 <?= Icon::create('add') ?>
             </a>
         <? endif; ?>
@@ -49,7 +50,7 @@
     <? endforeach; ?>
     <? if (!$news): ?>
     <section>
-        <?= _('Es sind keine aktuellen Ankündigungen vorhanden. Um neue Ankündigungen zu erstellen, klicken Sie rechts auf das Plus-Zeichen.') ?>
+        <?= _('Es sind aktuell keine Ankündigungen vorhanden. Nutzen Sie die Funktion „Hinzufügen“, um eine neue Ankündigung zu erstellen.') ?>
     </section>
         <? if ($perm && $count_all_news) : ?>
             <footer>
diff --git a/app/views/oer/admin/hosts.php b/app/views/oer/admin/hosts.php
index c60c937..0289d90 100644
--- a/app/views/oer/admin/hosts.php
+++ b/app/views/oer/admin/hosts.php
@@ -78,7 +78,7 @@
         <form action="<?= $controller->link_for("oer/admin/add_new_host") ?>" method="post">
             <h2><?= _('Werden Sie Teil des weltweiten Stud.IP Lernmarktplatzes!') ?></h2>
             <div>
-                <?= _('Der Lernmarktplatz ist ein Ort des Austauschs von kostenlosen und freien Lernmaterialien. Daher wäre es schade, wenn er nur auf Ihr einzelnes Stud.IP beschränkt wäre. Der Lernmarktplatz ist daher als dezentrales Netzwerk konzipiert, bei dem alle Nutzer aller Stud.IPs sich gegenseitig Lernmaterialien tauschen können und nach Lernmaterialien anderer Nutzer suchen können. <em>Dezentral</em> heißt dieses Netzwerk, weil es nicht einen einzigen zentralen Server gibt, der wie eine große Suchmaschine alle Informationen bereit hält. Stattdessen sind im besten Fall alle Stud.IPs mit allen anderen Stud.IPs direkt vernetzt. So ein dezentrales Netz ist sehr ausfallsicher und es passt zur Opensource-Idee von Stud.IP, weil man sich von keiner zentralen Institution abhängig macht. Aber Ihr Stud.IP muss irgendwo einen ersten Kontakt zum großen Netzwerk aller Lernmarktplätze finden, um loslegen zu können. Wählen Sie dazu irgendeinen der unten aufgeführten Server aus. Sie werden Index-Server genannt und bilden das Tor zum Rest des ganzen Netzwerks. Achten Sie darauf, dass Sie mit mindestens einem, aber auch nicht zu vielen Indexservern verbunden sind.') ?>
+                <?= _('Der Lernmarktplatz ist ein Ort des Austauschs von kostenlosen und freien Lernmaterialien. Daher wäre es schade, wenn er nur auf Ihr einzelnes Stud.IP beschränkt wäre. Der Lernmarktplatz ist daher als dezentrales Netzwerk konzipiert, bei dem alle Nutzer aller Stud.IPs sich gegenseitig Lernmaterialien tauschen können und nach Lernmaterialien anderer Nutzer suchen können. <em>Dezentral</em> heißt dieses Netzwerk, weil es nicht einen einzigen zentralen Server gibt, der wie eine große Suchmaschine alle Informationen bereit hält. Stattdessen sind im besten Fall alle Stud.IPs mit allen anderen Stud.IPs direkt vernetzt. So ein dezentrales Netz ist sehr ausfallsicher und es passt zur Opensource-Idee von Stud.IP, weil man sich von keiner zentralen Institution abhängig macht. Aber Ihr Stud.IP muss irgendwo einen ersten Kontakt zum großen Netzwerk aller Lernmarktplätze finden, um loslegen zu können. Wählen Sie dazu irgendeinen der folgenden Server aus. Sie werden Index-Server genannt und bilden das Tor zum Rest des ganzen Netzwerks. Achten Sie darauf, dass Sie mit mindestens einem, aber auch nicht zu vielen Indexservern verbunden sind.') ?>
             </div>
 
             <ul class="clean" style="text-align: center;">
diff --git a/app/views/oer/market/licenseinfo.php b/app/views/oer/market/licenseinfo.php
index 4618027..eda2658 100644
--- a/app/views/oer/market/licenseinfo.php
+++ b/app/views/oer/market/licenseinfo.php
@@ -18,7 +18,7 @@
 </p>
 <h2><?= _('Lizenzen auf dem Marktplatz') ?></h2>
 <p>
-    <?= _('Zum Glück gibt es kluge Menschen, die sich zum Thema <em>Lizenzen</em> kluge Gedanken gemacht haben. Daher gibt es die sogenannten CreativeCommons-Lizenzen. Die sind international gültig und besagen genau das, was oben gefordert ist. Damit haben alle, die den Marktplatz nutzen, absolute Rechtssicherheit. Diese Lizenzen kommen auch außerhalb des Marktplatzes sehr oft zum Einsatz. Musikerinnen und Musiker lizensieren ihre Musikrohdateien damit, Schriftsteller und Schriftstellerinnen ihre Gedichte und Lehrende auch ganz natürlich ihre Vorlesungsfolien. Die einzige echte Auflage ist, dass bei Weitergabe oder bei der Bearbeitung der Materialien alle Autorinnen und Autoren in irgendeiner Form transparent genannt werden müssen!') ?>
+    <?= _('Zum Glück gibt es kluge Menschen, die sich zum Thema <em>Lizenzen</em> kluge Gedanken gemacht haben. Daher gibt es die sogenannten CreativeCommons-Lizenzen. Die sind international gültig und besagen genau das, was im vorangegangenen Text gefordert ist. Damit haben alle, die den Marktplatz nutzen, absolute Rechtssicherheit. Diese Lizenzen kommen auch außerhalb des Marktplatzes sehr oft zum Einsatz. Musikerinnen und Musiker lizensieren ihre Musikrohdateien damit, Schriftsteller und Schriftstellerinnen ihre Gedichte und Lehrende auch ganz natürlich ihre Vorlesungsfolien. Die einzige echte Auflage ist, dass bei Weitergabe oder bei der Bearbeitung der Materialien alle Autorinnen und Autoren in irgendeiner Form transparent genannt werden müssen!') ?>
 </p>
 <p>
     <?= _('Dabei eine kleine Warnung: Wenn Sie vorhaben, mit ihren Vorlesungsfolien oder Übungsblättern und Musterlösungen noch Millionen Euro zu verdienen, dann stellen Sie diese Materialien nicht auf den Marktplatz, denn die Nutzung aller Materialien ist unentgeltlich (selbstverständlich verdienen auch wir nichts damit) und die Materialien können, wenn sie einmal heruntergeladen worden sind, auch noch beliebig weiter verteilt werden. Es gibt zwar eine CreativeCommons-Lizenz, die kommerzielle Nutzung ausschließt. Die ist aber explizit für den Marktplatz nicht praktikabel. Denn stellen Sie sich diese Frage: Wenn Lehrende Material vom Marktplatz innerhalb ihrer Veranstaltungen verwenden und zum Beispiel eine Infografik aus einer Präsentation an die Wand projizieren, ist das dann eine kommerzielle Nutzung? Ja, irgendwie schon, denn sie werden natürlich für ihre Lehrtätigkeit bezahlt. Wir legen besonderen Wert auf die Rechtssicherheit aller Nutzer und Nutzerinnen. Deswegen kommen auf unseren Marktplatz keine Materialien, die die kommerzielle Nutzung ausschließen. Nichtsdestotrotz haben Sie weiterhin alle Rechte, ihre Vorlesungsfolien auf anderem Wege über einen Verlag zu veröffentlichen und Tantiemen zu bekommen.') ?>
diff --git a/app/views/questionnaire/widget.php b/app/views/questionnaire/widget.php
index 044f246..9804b24 100644
--- a/app/views/questionnaire/widget.php
+++ b/app/views/questionnaire/widget.php
@@ -31,7 +31,7 @@
         <section class="noquestionnaires">
             <?= _('Es sind keine Fragebögen vorhanden.') ?>
             <? if ($allowed_to_add) : ?>
-                <?= _("Um neue Fragebögen zu erstellen, klicken Sie rechts auf das Plus.") ?>
+                <?= _("Nutzen Sie die Aktion „Fragebogen hinzufügen“ um einen neuen Fragebogen hinzuzufügen.") ?>
             <? endif ?>
         </section>
     <? endif; ?>
diff --git a/app/views/resources/room_group/permissions.php b/app/views/resources/room_group/permissions.php
index 17090ce..1dd970d 100644
--- a/app/views/resources/room_group/permissions.php
+++ b/app/views/resources/room_group/permissions.php
@@ -28,7 +28,7 @@
         <?= $this->render_partial(
             'resources/resource/permissions',
             [
-                'custom_empty_list_message' => _('Es sind keine gemeinsamen Rechte für die oben aufgeführten Räume vorhanden.'),
+                'custom_empty_list_message' => _('Es sind keine gemeinsamen Rechte für die zuvor aufgelisteten Räume vorhanden.'),
                 'custom_save_button_text' => _('Zuweisen'),
                 'custom_form_action_link' => URLHelper::getLink('dispatch.php/resources/room_group/permissions/' . $clipboard->id),
                 'custom_hidden_fields' => [
diff --git a/app/views/settings/notification.php b/app/views/settings/notification.php
index b46ea45..2fd4f9c 100644
--- a/app/views/settings/notification.php
+++ b/app/views/settings/notification.php
@@ -24,7 +24,7 @@
             </tr>
             <tr>
                 <td colspan="2">
-                    <?= _('Benachrichtigung für unten aufgeführte Veranstaltungen:') ?>
+                    <?= _('Benachrichtigungen für die folgenden Veranstaltungen:') ?>
                 </td>
                 <? $i = 0; ?>
                 <? foreach ($modules as $index => $data): ?>
diff --git a/lib/admissionrules/termsadmission/templates/input.php b/lib/admissionrules/termsadmission/templates/input.php
index 4c91f7f..0151c54 100644
--- a/lib/admissionrules/termsadmission/templates/input.php
+++ b/lib/admissionrules/termsadmission/templates/input.php
@@ -6,5 +6,5 @@
 
 <label>
     <input type="checkbox" name="terms_accepted" value="1">
-    <?= _('Hiermit akzeptiere ich die oben angezeigten Teilnahmebedingungen') ?>
+    <?= _('Hiermit akzeptiere ich die Teilnahmebedingungen') ?>
 </label>
diff --git a/lib/classes/StudygroupModel.php b/lib/classes/StudygroupModel.php
index 76899f1..051ada7 100644
--- a/lib/classes/StudygroupModel.php
+++ b/lib/classes/StudygroupModel.php
@@ -532,7 +532,7 @@ class StudygroupModel
         if (StudygroupModel::isInvited($user_id, $sem_id)) {
             $subject .= ' ' . _('Einladung akzeptiert');
             $message = sprintf(
-                _("%s hat die Einladung zur Studiengruppe %s akzeptiert. Klicken Sie auf den untenstehenden Link, um direkt zur Studiengruppe zu gelangen.\n\n [Direkt zur Studiengruppe]%s"),
+                _("%s hat die Einladung zur Studiengruppe %s akzeptiert. Klicken Sie auf den folgenden Link, um direkt zur Studiengruppe zu gelangen.\n\n [Direkt zur Studiengruppe]%s"),
                 get_fullname($user_id),
                 $sem->getName(),
                 URLHelper::getlink(
@@ -543,7 +543,7 @@ class StudygroupModel
         } else {
             $subject .= ' ' . _('Neuer Mitgliedsantrag');
             $message = sprintf(
-                _("%s möchte der Studiengruppe %s beitreten. Klicken Sie auf den untenstehenden Link, um direkt zur Studiengruppe zu gelangen.\n\n [Direkt zur Studiengruppe]%s"),
+                _("%s möchte der Studiengruppe %s beitreten. Klicken Sie auf den folgenden Link, um direkt zur Studiengruppe zu gelangen.\n\n [Direkt zur Studiengruppe]%s"),
                 get_fullname($user_id),
                 $sem->getName(),
                 URLHelper::getlink(
diff --git a/templates/check_object_exception.php b/templates/check_object_exception.php
index 64a5188..bb54ddf 100644
--- a/templates/check_object_exception.php
+++ b/templates/check_object_exception.php
@@ -3,7 +3,7 @@ $current_page = _('Kein Objekt gewählt')
 ?>
     <?= MessageBox::exception(htmlReady($exception->getMessage()), [
             _('Dieser Teil des Systems kann nur genutzt werden, wenn Sie vorher ein Objekt (Veranstaltung oder Einrichtung) gewählt haben.'),
-            sprintf(_('Dieser Fehler tritt auch auf, wenn Ihre Session abgelaufen ist. Bitte nutzen Sie in diesem Fall den untenstehenden Link, um zurück zur Anmeldung zu gelangen.'))]) ?>
+            sprintf(_('Dieser Fehler tritt auch auf, wenn Ihre Session abgelaufen ist. Bitte nutzen Sie in diesem Fall den folgenden Link, um zurück zur Anmeldung zu gelangen.'))]) ?>
 
     <? if ($last_edited = Request::get('content') . Request::get('description') . Request::get('body')) : ?>
         <p>
diff --git a/templates/login_emailactivation.php b/templates/login_emailactivation.php
index 4f75807..cf8221a 100644
--- a/templates/login_emailactivation.php
+++ b/templates/login_emailactivation.php
@@ -9,7 +9,7 @@ use Studip\Button, Studip\LinkButton;
  <b><?= _('E-Mail Aktivierung') ?></b>
 </td></tr>
 <tr><td style="background-color: #fff; padding: 1.5em;">
-<?= _('Sie haben Ihre E-Mail-Adresse geändert. Um diese frei zu schalten müssen Sie den Ihnen an Ihre neue Adresse zugeschickten Aktivierungs Schlüssel im unten stehenden Eingabefeld eintragen.'); ?>
+<?= _('Sie haben Ihre E-Mail-Adresse geändert. Um diese frei zu schalten müssen Sie den Ihnen an Ihre neue Adresse zugeschickten Aktivierungs Schlüssel im folgenden Eingabefeld eintragen.'); ?>
 <br><form action="activate_email.php" method="post">
  <?= CSRFProtection::tokenTag() ?>
  <input name="key">
@@ -25,7 +25,7 @@ use Studip\Button, Studip\LinkButton;
  <b><?= _('E-Mail Aktivierung neu senden') ?></b>
 </td></tr>
 <tr><td style="background-color: #fff; padding: 1.5em;">
-<?= _('Sollten Sie keine E-Mail erhalten haben, können Sie sich einen neuen Aktivierungsschlüssel zuschicken lassen. Geben Sie dazu Ihre gewünschte E-Mail-Adresse unten an:'); ?>
+<?= _('Sollten Sie keine E-Mail erhalten haben, können Sie sich einen neuen Aktivierungsschlüssel zuschicken lassen. Geben Sie dazu Ihre gewünschte E-Mail-Adresse im folgenden Formular an:'); ?>
 <form action="activate_email.php" method="post">
 <?= CSRFProtection::tokenTag() ?>
 <input type="hidden" name="uid" value="<?= $uid ?>">
-- 
cgit v1.0


From d8ff37d845edb99a5ad24ae57c0b087e213c70d6 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Thu, 23 May 2024 10:26:23 +0000
Subject: remove fallback to non-existing flash player, fixes #4207

Closes #4207

Merge request studip/studip!3036
---
 lib/classes/StudipCoreFormat.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/classes/StudipCoreFormat.php b/lib/classes/StudipCoreFormat.php
index 24c4ddc..7e3358c 100644
--- a/lib/classes/StudipCoreFormat.php
+++ b/lib/classes/StudipCoreFormat.php
@@ -605,11 +605,6 @@ class StudipCoreFormat extends TextFormat
             $title
         );
 
-        if ($tag === 'audio') {
-            $random_id = 'audio-' . mb_substr(md5(uniqid('audio', true)), -8);
-            $media = str_replace('<audio ', '<audio id="' . $random_id . '" onerror="STUDIP.Audio.handle(this);" ', $media);
-        }
-
         if ($link && $tag === "img") {
             $media = sprintf('<a href="%s"%s>%s</a>',
                 $link,
-- 
cgit v1.0


From 3d550b181e5a1963010a5c61002779f9ada62e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Thu, 23 May 2024 10:30:12 +0000
Subject: Resolve "Release 5.5"

Merge request studip/studip!3032
---
 config/config.inc.php.dist           |   3 +-
 db/studip.sql                        | 332 ++++++++++++++++++++++-------------
 db/studip_default_data.sql           |  85 ++++++---
 db/studip_demo_data.sql              |  60 +++----
 db/studip_resources_default_data.sql |   1 +
 db/studip_resources_demo_data.sql    |  58 +++---
 6 files changed, 325 insertions(+), 214 deletions(-)

diff --git a/config/config.inc.php.dist b/config/config.inc.php.dist
index 1562248..7b0400f 100644
--- a/config/config.inc.php.dist
+++ b/config/config.inc.php.dist
@@ -38,7 +38,6 @@ global
   $INST_ADMIN_DATAFIELDS_VIEW,
   $INST_MODULES,
   $INST_TYPE,
-  $LIT_LIST_FORMAT_TEMPLATE,
   $NAME_FORMAT_DESC,
   $PERS_TERMIN_KAT,
   $SCM_PRESET,
@@ -69,7 +68,7 @@ $UNI_URL = "http://www.studip.de";
 $UNI_LOGIN_ADD='';
 $UNI_LOGOUT_ADD=sprintf(_("Und hier geht's zur %sStud.IP Portalseite%s&nbsp;"), "<a href=\"http://www.studip.de\"><b>", "</b></a>");
 $UNI_CONTACT = "<please insert your general contact mail-adress here>";
-$UNI_INFO = "Stud.IP 5.4 - Studienbegleitender Internetsupport von Präsenzlehre";
+$UNI_INFO = "Stud.IP 5.5 - Studienbegleitender Internetsupport von Präsenzlehre";
 
 
 /* $SEM_CLASS and $SEM_TYPE configuration moved to database
diff --git a/db/studip.sql b/db/studip.sql
index 5a8f395..d490e28 100644
--- a/db/studip.sql
+++ b/db/studip.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.35, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.36, for Linux (x86_64)
 --
--- Host: localhost    Database: studip_54
+-- Host: localhost    Database: studip_55
 -- ------------------------------------------------------
--- Server version	8.0.35-0ubuntu0.22.04.1
+-- Server version	8.0.36-0ubuntu0.22.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -360,6 +360,7 @@ CREATE TABLE `auth_user_md5` (
   `lock_comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `locked_by` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `visible` enum('global','always','yes','unknown','no','never') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'unknown',
+  `matriculation_number` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`user_id`),
   UNIQUE KEY `k_username` (`username`),
   KEY `perms` (`perms`)
@@ -620,36 +621,75 @@ CREATE TABLE `cache_types` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `calendar_event`
+-- Table structure for table `calendar_date_assignments`
 --
 
-DROP TABLE IF EXISTS `calendar_event`;
+DROP TABLE IF EXISTS `calendar_date_assignments`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `calendar_event` (
+CREATE TABLE `calendar_date_assignments` (
   `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `event_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `group_status` tinyint unsigned NOT NULL DEFAULT '0',
-  `mkdate` int unsigned NOT NULL,
-  `chdate` int unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`range_id`,`event_id`)
+  `calendar_date_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `mkdate` int NOT NULL DEFAULT '0',
+  `chdate` int NOT NULL DEFAULT '0',
+  `participation` enum('','ACCEPTED','DECLINED','ACKNOWLEDGED') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+  PRIMARY KEY (`range_id`,`calendar_date_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `calendar_user`
+-- Table structure for table `calendar_date_exceptions`
 --
 
-DROP TABLE IF EXISTS `calendar_user`;
+DROP TABLE IF EXISTS `calendar_date_exceptions`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `calendar_user` (
-  `owner_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `permission` int NOT NULL,
-  `mkdate` int unsigned NOT NULL,
-  `chdate` int unsigned NOT NULL,
-  PRIMARY KEY (`owner_id`,`user_id`)
+CREATE TABLE `calendar_date_exceptions` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `calendar_date_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `date` date NOT NULL,
+  `mkdate` int unsigned NOT NULL DEFAULT '0',
+  `chdate` int unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `calendar_date_id` (`calendar_date_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `calendar_dates`
+--
+
+DROP TABLE IF EXISTS `calendar_dates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `calendar_dates` (
+  `id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `author_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `editor_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+  `unique_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `begin` int NOT NULL DEFAULT '0',
+  `end` int NOT NULL DEFAULT '0',
+  `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
+  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `access` enum('PUBLIC','PRIVATE','CONFIDENTIAL') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'PRIVATE',
+  `user_category` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '',
+  `category` tinyint unsigned NOT NULL DEFAULT '0',
+  `location` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT '',
+  `interval` tinyint DEFAULT '0',
+  `offset` tinyint DEFAULT '0',
+  `days` varchar(7) COLLATE utf8mb4_unicode_ci DEFAULT '',
+  `month` tinyint unsigned DEFAULT NULL,
+  `repetition_type` enum('SINGLE','DAILY','WEEKLY','MONTHLY','YEARLY') COLLATE utf8mb4_unicode_ci DEFAULT 'SINGLE',
+  `number_of_dates` smallint unsigned NOT NULL DEFAULT '1',
+  `repetition_end` bigint NOT NULL DEFAULT '0',
+  `mkdate` int unsigned NOT NULL DEFAULT '0',
+  `chdate` int unsigned NOT NULL DEFAULT '0',
+  `import_date` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `unique_id` (`unique_id`),
+  KEY `autor_id` (`author_id`),
+  KEY `repetition_type` (`repetition_type`,`repetition_end`),
+  KEY `begin` (`begin`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -806,6 +846,7 @@ CREATE TABLE `consultation_blocks` (
   `calendar_events` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Create events for slots',
   `show_participants` tinyint unsigned NOT NULL DEFAULT '0',
   `require_reason` enum('no','optional','yes') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'optional',
+  `mail_to_tutors` tinyint unsigned NOT NULL DEFAULT '1',
   `confirmation_text` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `size` tinyint unsigned NOT NULL DEFAULT '1' COMMENT 'How many people may book a slot',
@@ -900,13 +941,48 @@ DROP TABLE IF EXISTS `contact`;
 CREATE TABLE `contact` (
   `owner_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
   `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `mkdate` int unsigned DEFAULT NULL,
+  `mkdate` int NOT NULL DEFAULT '0',
+  `chdate` int NOT NULL DEFAULT '0',
+  `calendar_permissions` enum('','READ','WRITE') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
   PRIMARY KEY (`owner_id`,`user_id`),
   KEY `user_id` (`user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `contact_group_items`
+--
+
+DROP TABLE IF EXISTS `contact_group_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `contact_group_items` (
+  `group_id` bigint unsigned NOT NULL,
+  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `mkdate` int unsigned NOT NULL DEFAULT '0',
+  `chdate` int unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`group_id`,`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `contact_groups`
+--
+
+DROP TABLE IF EXISTS `contact_groups`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `contact_groups` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `owner_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `mkdate` int unsigned NOT NULL DEFAULT '0',
+  `chdate` int unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `content_terms_of_use_entries`
 --
 
@@ -1167,6 +1243,7 @@ CREATE TABLE `cw_blocks` (
   `position` int NOT NULL,
   `block_type` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `visible` tinyint(1) NOT NULL,
+  `commentable` tinyint(1) NOT NULL,
   `payload` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `mkdate` int NOT NULL,
   `chdate` int NOT NULL,
@@ -1203,6 +1280,7 @@ CREATE TABLE `cw_certificates` (
   `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `course_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `unit_id` int NOT NULL,
+  `fileref_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `mkdate` int NOT NULL,
   PRIMARY KEY (`id`),
   KEY `index_user_id` (`user_id`),
@@ -1220,14 +1298,14 @@ DROP TABLE IF EXISTS `cw_clipboards`;
 CREATE TABLE `cw_clipboards` (
   `id` int NOT NULL AUTO_INCREMENT,
   `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `description` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `block_id` int DEFAULT NULL,
   `container_id` int DEFAULT NULL,
   `structural_element_id` int DEFAULT NULL,
   `object_type` enum('courseware-structural-elements','courseware-containers','courseware-blocks') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `object_kind` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `backup` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `backup` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `mkdate` int unsigned NOT NULL,
   `chdate` int unsigned NOT NULL,
   PRIMARY KEY (`id`),
@@ -1341,10 +1419,11 @@ CREATE TABLE `cw_structural_elements` (
   `position` int NOT NULL,
   `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `image_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `image_type` enum('FileRef','StockImage') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'FileRef',
+  `image_type` enum('FileRef','StockImage') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'FileRef',
   `purpose` enum('content','draft','task','template','oer','other','portfolio') CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `payload` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `public` tinyint(1) NOT NULL,
+  `commentable` tinyint(1) NOT NULL,
   `release_date` int NOT NULL,
   `withdraw_date` int NOT NULL,
   `read_approval` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -1394,6 +1473,8 @@ CREATE TABLE `cw_task_groups` (
   `task_template_id` int NOT NULL,
   `solver_may_add_blocks` tinyint(1) NOT NULL,
   `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `start_date` int NOT NULL,
+  `end_date` int NOT NULL,
   `mkdate` int NOT NULL,
   `chdate` int NOT NULL,
   PRIMARY KEY (`id`),
@@ -1415,7 +1496,6 @@ CREATE TABLE `cw_tasks` (
   `structural_element_id` int NOT NULL,
   `solver_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `solver_type` enum('autor','group') CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `submission_date` int NOT NULL,
   `submitted` tinyint(1) NOT NULL,
   `renewal` enum('pending','granted','declined') CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `renewal_date` int NOT NULL,
@@ -1460,6 +1540,7 @@ CREATE TABLE `cw_units` (
   `range_type` enum('course','user') CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `structural_element_id` int NOT NULL,
   `content_type` enum('courseware') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `position` int DEFAULT NULL,
   `public` tinyint NOT NULL DEFAULT '1',
   `creator_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `release_date` int unsigned DEFAULT NULL,
@@ -1956,47 +2037,6 @@ CREATE TABLE `evalquestion` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `event_data`
---
-
-DROP TABLE IF EXISTS `event_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `event_data` (
-  `event_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `author_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `editor_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `start` int unsigned NOT NULL DEFAULT '0',
-  `end` int unsigned NOT NULL DEFAULT '0',
-  `summary` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `class` enum('PUBLIC','PRIVATE','CONFIDENTIAL') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'PRIVATE',
-  `categories` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `category_intern` tinyint unsigned NOT NULL DEFAULT '0',
-  `priority` tinyint unsigned NOT NULL DEFAULT '0',
-  `location` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `ts` int unsigned NOT NULL DEFAULT '0',
-  `linterval` smallint unsigned DEFAULT NULL,
-  `sinterval` smallint unsigned DEFAULT NULL,
-  `wdays` varchar(7) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `month` tinyint unsigned DEFAULT NULL,
-  `day` tinyint unsigned DEFAULT NULL,
-  `rtype` enum('SINGLE','DAILY','WEEKLY','MONTHLY','YEARLY') CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'SINGLE',
-  `duration` smallint unsigned NOT NULL DEFAULT '0',
-  `count` smallint DEFAULT '0',
-  `expire` int unsigned NOT NULL DEFAULT '0',
-  `exceptions` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `mkdate` int unsigned NOT NULL DEFAULT '0',
-  `chdate` int unsigned NOT NULL DEFAULT '0',
-  `importdate` int unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`event_id`),
-  UNIQUE KEY `uid` (`uid`),
-  KEY `autor_id` (`author_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `ex_termine`
 --
 
@@ -2024,23 +2064,28 @@ CREATE TABLE `ex_termine` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `extern_config`
+-- Table structure for table `extern_pages_configs`
 --
 
-DROP TABLE IF EXISTS `extern_config`;
+DROP TABLE IF EXISTS `extern_pages_configs`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `extern_config` (
-  `config_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `config_type` int NOT NULL DEFAULT '0',
+CREATE TABLE `extern_pages_configs` (
+  `config_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `type` varchar(50) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `is_standard` tinyint unsigned NOT NULL DEFAULT '0',
-  `config` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` tinytext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `conf` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `template` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `author_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `editor_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `mkdate` int unsigned NOT NULL DEFAULT '0',
   `chdate` int unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`config_id`,`range_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+  PRIMARY KEY (`config_id`),
+  KEY `range_id` (`range_id`),
+  KEY `type` (`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2105,6 +2150,7 @@ CREATE TABLE `feedback` (
   `mode` int unsigned NOT NULL,
   `results_visible` tinyint unsigned NOT NULL,
   `commentable` tinyint unsigned NOT NULL,
+  `anonymous_entries` tinyint(1) NOT NULL DEFAULT '0',
   `mkdate` int unsigned NOT NULL,
   `chdate` int unsigned NOT NULL,
   PRIMARY KEY (`id`),
@@ -2127,6 +2173,7 @@ CREATE TABLE `feedback_entries` (
   `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `comment` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `rating` tinyint unsigned NOT NULL,
+  `anonymous` tinyint(1) NOT NULL DEFAULT '0',
   `mkdate` int unsigned NOT NULL,
   `chdate` int unsigned NOT NULL,
   PRIMARY KEY (`id`),
@@ -2444,6 +2491,7 @@ CREATE TABLE `grading_instances` (
   `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `rawgrade` decimal(6,5) unsigned NOT NULL,
   `feedback` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `passed` tinyint NOT NULL DEFAULT '0',
   `mkdate` int unsigned NOT NULL,
   `chdate` int unsigned NOT NULL,
   PRIMARY KEY (`definition_id`,`user_id`)
@@ -2757,6 +2805,21 @@ CREATE TABLE `log_events` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `login_faq`
+--
+
+DROP TABLE IF EXISTS `login_faq`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `login_faq` (
+  `faq_id` int NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`faq_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `loginbackgrounds`
 --
 
@@ -4450,10 +4513,10 @@ CREATE TABLE `plugins` (
   `dependentonid` int unsigned DEFAULT NULL,
   `automatic_update_url` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `automatic_update_secret` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `description` text COLLATE utf8mb4_unicode_ci,
-  `description_mode` enum('add','override_description','replace_all') COLLATE utf8mb4_unicode_ci DEFAULT 'add',
+  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `description_mode` enum('add','override_description','replace_all') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'add',
   `highlight_until` int unsigned DEFAULT NULL,
-  `highlight_text` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `highlight_text` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`pluginid`),
   KEY `highlight_until` (`highlight_until`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
@@ -5038,7 +5101,9 @@ CREATE TABLE `schedule_seminare` (
   `metadate_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `visible` tinyint unsigned NOT NULL DEFAULT '1',
   `color` tinyint DEFAULT NULL,
-  PRIMARY KEY (`user_id`,`seminar_id`,`metadate_id`)
+  PRIMARY KEY (`user_id`,`seminar_id`,`metadate_id`),
+  KEY `seminar_id` (`seminar_id`),
+  KEY `metadate_id` (`metadate_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -5113,6 +5178,7 @@ CREATE TABLE `sem_classes` (
   `title_autor_plural` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `show_raumzeit` tinyint unsigned NOT NULL DEFAULT '1',
   `is_group` tinyint unsigned NOT NULL DEFAULT '0',
+  `unlimited_forbidden` tinyint unsigned NOT NULL DEFAULT '0',
   `mkdate` int unsigned NOT NULL,
   `chdate` int unsigned NOT NULL,
   PRIMARY KEY (`id`),
@@ -5460,6 +5526,8 @@ CREATE TABLE `siteinfo_details` (
   `detail_id` smallint unsigned NOT NULL AUTO_INCREMENT,
   `rubric_id` smallint unsigned NOT NULL,
   `position` tinyint unsigned DEFAULT NULL,
+  `draft_status` tinyint NOT NULL DEFAULT '0',
+  `page_disabled_nobody` tinyint NOT NULL DEFAULT '0',
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (`detail_id`)
@@ -5740,7 +5808,7 @@ DROP TABLE IF EXISTS `user_info`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `user_info` (
   `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `hobby` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `hobby` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `lebenslauf` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `publi` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `schwerp` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -6057,76 +6125,88 @@ CREATE TABLE `widget_user` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `wiki`
+-- Table structure for table `wiki_links`
 --
 
-DROP TABLE IF EXISTS `wiki`;
+DROP TABLE IF EXISTS `wiki_links`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `wiki` (
+CREATE TABLE `wiki_links` (
   `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
-  `keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
-  `body` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `ancestor` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
-  `chdate` int unsigned DEFAULT NULL,
-  `version` int NOT NULL DEFAULT '0',
-  `mkdate` int unsigned DEFAULT NULL,
-  PRIMARY KEY (`range_id`,`keyword`,`version`),
-  KEY `user_id` (`user_id`),
-  KEY `chdate` (`chdate`)
+  `from_page_id` int unsigned NOT NULL,
+  `to_page_id` int unsigned NOT NULL,
+  PRIMARY KEY (`range_id`,`to_page_id`,`from_page_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `wiki_links`
+-- Table structure for table `wiki_online_editing_users`
 --
 
-DROP TABLE IF EXISTS `wiki_links`;
+DROP TABLE IF EXISTS `wiki_online_editing_users`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `wiki_links` (
-  `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `from_keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
-  `to_keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
-  PRIMARY KEY (`range_id`,`to_keyword`,`from_keyword`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `wiki_online_editing_users` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `page_id` int NOT NULL,
+  `editing` tinyint(1) NOT NULL DEFAULT '0',
+  `editing_request` tinyint(1) NOT NULL DEFAULT '0',
+  `chdate` int NOT NULL,
+  `mkdate` int NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `user_id_2` (`user_id`,`page_id`),
+  KEY `user_id` (`user_id`),
+  KEY `page_id` (`page_id`),
+  KEY `chdate` (`chdate`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `wiki_locks`
+-- Table structure for table `wiki_pages`
 --
 
-DROP TABLE IF EXISTS `wiki_locks`;
+DROP TABLE IF EXISTS `wiki_pages`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `wiki_locks` (
-  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
-  `chdate` int unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`range_id`,`user_id`,`keyword`),
-  KEY `user_id` (`user_id`),
-  KEY `chdate` (`chdate`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `wiki_pages` (
+  `page_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `content` mediumtext COLLATE utf8mb4_unicode_ci,
+  `parent_id` int DEFAULT NULL,
+  `read_permission` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'all',
+  `write_permission` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'all',
+  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `locked_since` bigint DEFAULT NULL,
+  `locked_by_user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+  `chdate` bigint NOT NULL,
+  `mkdate` bigint NOT NULL,
+  PRIMARY KEY (`page_id`),
+  KEY `read_permission` (`read_permission`),
+  KEY `write_permission` (`write_permission`),
+  KEY `range_id` (`range_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `wiki_page_config`
+-- Table structure for table `wiki_versions`
 --
 
-DROP TABLE IF EXISTS `wiki_page_config`;
+DROP TABLE IF EXISTS `wiki_versions`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `wiki_page_config` (
-  `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
-  `keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
-  `read_restricted` tinyint unsigned NOT NULL DEFAULT '0',
-  `edit_restricted` tinyint unsigned NOT NULL DEFAULT '0',
-  `mkdate` int unsigned DEFAULT NULL,
-  `chdate` int unsigned DEFAULT NULL,
-  PRIMARY KEY (`range_id`,`keyword`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `wiki_versions` (
+  `version_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `page_id` int unsigned NOT NULL,
+  `name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `content` text COLLATE utf8mb4_unicode_ci,
+  `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+  `mkdate` bigint NOT NULL,
+  PRIMARY KEY (`version_id`),
+  KEY `page_id` (`page_id`),
+  KEY `mkdate` (`mkdate`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -6138,4 +6218,4 @@ CREATE TABLE `wiki_page_config` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-11-01 17:15:52
+-- Dump completed on 2024-05-22 15:47:52
diff --git a/db/studip_default_data.sql b/db/studip_default_data.sql
index df7ee8b..bf50f30 100644
--- a/db/studip_default_data.sql
+++ b/db/studip_default_data.sql
@@ -175,6 +175,7 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('CONSULTATION_TAB_TITLE', 'Terminvergabe', 'i18n', 'range', 'Terminvergabe', 1640797277, 1640797277, 'Der Name des Reiters für die Terminvergabe');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('CONTENTMODULES_TILED_DISPLAY', '1', 'boolean', 'user', '', 1698855218, 1698855218, 'Bevorzugt ein Nutzer eine Kachelansicht auf der Werkzeugseite in den Veranstaltungen oder lieber eine Tabelle?');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('CONVERT_IDNA_URL', '1', 'boolean', 'global', 'global', 1510849314, 1510849314, 'If true, urls with german \"umlauts\" are converted');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('COURSEWARE_CERTIFICATES_ENABLE', '1', 'boolean', 'global', '', 1716385357, 1716385357, 'Schaltet Courseware-Zertifikate, -Erinnerungen und -Fortschrittsrücksetzung ein oder aus');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('COURSEWARE_FAVORITE_BLOCK_TYPES', '[]', 'array', 'user', '', 1640797279, 1640797279, 'In dieser Konfigurationseinstellung können Nutzende ihre Lieblingsblocktypen speichern.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('COURSEWARE_LAST_ELEMENT', '[]', 'array', 'user', '', 1640797279, 1640797279, 'In dieser Konfigurationseinstellung werden die zuletzt besuchten Elemente in allen Coursewares abgelegt.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('COURSE_ADMIN_NOTICE', '', 'string', 'course', '', 1640797279, 1640797279, 'Admins: Notiz zu einer Veranstaltung');
@@ -199,6 +200,7 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('DISPLAY_DOWNLOAD_COUNTER', 'always', 'string', 'global', 'files', 1591630777, 1591630777, 'Steuert die Anzeige der Anzahl der Downloads in Dateisichten (\"always\" zeigt die Anzahl immer an, \"flat\" nur in \"Alle Dateien\", jeder andere Wert schaltet die Anzeige komplett aus)');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('DISPLAY_STGTEILVERSION_USERFILTER', '0', 'boolean', 'global', 'coursesets', 1591630778, 1591630778, 'Steuert die Anzeige des Studiengangteil-Version Filters beim Erstellen von bedingten Anmelderegeln.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('DOZENT_ALWAYS_VISIBLE', '1', 'boolean', 'global', 'privacy', 1293118059, 1293118059, 'Legt fest, ob Personen mit Lehrendenrechten immer global sichtbar sind und das auch nicht selbst ändern können.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EASY_READ_URL', 'dispatch.php/siteinfo/show/1/9', 'string', 'global', 'accessibility', 1716385357, 1716385357, 'URL zur Seite \"Leichte Sprache\"');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('ELEARNING_INTERFACE_ENABLE', '0', 'boolean', 'global', 'modules', 1293118059, 1293118059, 'Schaltet ein oder aus, ob die Lernmodule global verfügbar sind.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EMAIL_DOMAIN_RESTRICTION', '', 'string', 'global', '', 1157107088, 1157107088, 'Beschränkt die gültigkeit von Email-Adressen bei freier Registrierung auf die angegebenen Domains. Komma-separierte Liste von Domains ohne vorangestelltes @.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EMAIL_VISIBILITY_DEFAULT', '1', 'boolean', 'global', 'privacy', 1326799691, 1326799691, 'Ist die eigene Emailadresse sichtbar, falls der Nutzer nichts anderes eingestellt hat?');
@@ -215,13 +217,10 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EVAL_AUSWERTUNG_GRAPH_FORMAT', 'png', 'string', 'global', 'evaluation', 1141225624, 1141225624, 'Das Format, in dem die Diagramme der grafischen Evaluationsauswertung erstellt werden (jpg, png, gif).');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EVAL_ENABLE', '1', 'boolean', 'global', 'evaluation', 1686150733, 1686150733, 'Sollen die alten Evaluationen weiterhin eingeschaltet bleiben? Achtung, die alten Evaluationen werden in einem zukünftigen Stud.IP-Release entfernt.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EXPORT_ENABLE', '1', 'boolean', 'global', 'modules', 1293118059, 1293118059, 'Schaltet ein oder aus, ob der Export global verfügbar ist.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EXTERN_ALLOW_ACCESS_WITHOUT_CONFIG', '0', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Free access to external pages (without the need of a configuration), independent of SRI settings above');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EXTERN_ENABLE', '1', 'boolean', 'global', 'modules', 1293118059, 1293118059, 'Schaltet ein oder aus, ob die externen Seiten global verfügbar sind.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EXTERN_SRI_ENABLE', '0', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Allow the usage of SRI-interface (Stud.IP Remote Include)');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EXTERN_SRI_ENABLE_BY_ROOT', '0', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Only root allows the usage of SRI-interface for specific institutes');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('EXTERN_PAGES_ERROR_MESSAGE', 'Ein Fehler ist aufgetreten. Die Inhalte können nicht angezeigt werden.', 'string', 'global', 'external_pages', 1716385357, 1716385357, 'Allgemeine Fehlermeldung,die auf der Webseite ausgegeben wird, auf der der Inhalt der externe Seite angezeigt werden soll. Diese Meldung wird ausgegeben, wenn z.B. das Template fehlerhaft ist.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('FEEDBACK_ADMIN_PERM', 'tutor', 'string', 'course', '', 1591630778, 1591630778, 'Voreinstellung für Berechtigungslevel, um Einstellung zu Feedback-Elementen zu verwalten');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('FEEDBACK_CREATE_PERM', 'tutor', 'string', 'course', '', 1591630778, 1591630778, 'Voreinstellung für Berechtigungslevel, um Feedback-Elemente anzulegen.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('FOP_ENABLE', '1', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Soll Export mit FOP erlaubt sein?');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('FORUM_ANONYMOUS_POSTINGS', '0', 'boolean', 'global', 'privacy', 1293118059, 1293118059, 'Legt fest, ob Forenbeiträge anonym verfasst werden dürfen (Root sieht aber immer den Urheber).');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('FORUM_SETTINGS', '{\"neuauf\":false,\"rateallopen\":true,\"showimages\":true,\"sortthemes\":\"last\",\"themeview\":\"mixed\",\"presetview\":\"mixed\",\"shrink\":604800}', 'array', 'user', '', 1403258015, 1403258015, 'persönliche Einstellungen Forum');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('GLOBALSEARCH_ASYNC_QUERIES', '0', 'boolean', 'global', 'globalsearch', 1530289048, 1530289048, 'Sollen die Suchanfragen asynchron über mysqli gestellt werden? Andernfalls wird PDO verwendet.');
@@ -245,8 +244,10 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LAST_LOGIN_TIMESTAMP', '0', 'integer', 'user', '', 1403258015, 1403258015, 'Zeitstempel des vorherigen Logins');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LIBRARY_ADD_ITEM_ACTION_DESCRIPTION', 'Sie können digitale Originaldokumente direkt aus der Bibliothek beziehen. Sie erhalten Materialien mit geklärten Rechten und in hochwertiger Qualität. Bei Bedarf kann die Bibliothek zur Bereitstellung eingebunden werden.', 'string', 'global', 'Library', 1607702429, 1607702429, 'Der Beschreibungstext für die Aktion zum Hinzufügen eines Bibliothekseintrags in den Dateibereich.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LITERATURE_ENABLE', '0', 'boolean', 'global', 'modules', 1293118059, 1293118059, 'Schaltet ein oder aus, ob die Literaturverwaltung global verfügbar ist.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LOAD_EXTERNAL_MEDIA', 'deny', 'string', 'global', '', 1293118060, 1293118060, 'Sollen externe Medien über [img/flash/audio/video] eingebunden werden? deny=nicht erlaubt, allow=erlaubt, proxy=proxy benutzen.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LOAD_EXTERNAL_MEDIA', 'deny', 'string', 'global', '', 1293118060, 1293118060, 'Sollen externe Medien über [img/audio/video] eingebunden werden? deny=nicht erlaubt, allow=erlaubt, proxy=proxy benutzen.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LOCK_RULE_ADMIN_PERM', 'admin', 'string', 'global', 'permissions', 1240427632, 1240427632, 'mit welchem Status dürfen Sperrebenen angepasst werden (admin, root)');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LOGIN_FAQ_TITLE', 'Hinweise zum Login', 'i18n', 'global', 'Loginseite', 1716385357, 1716385357, 'Überschrift für den FAQ-Bereich auf der Loginseite');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LOGIN_FAQ_VISIBILITY', '1', 'boolean', 'global', 'Loginseite', 1716385357, 1716385357, 'Soll der FAQ-Bereich auf der Loginseite sichtbar sein?');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LOG_ENABLE', '1', 'boolean', 'global', 'modules', 1293118059, 1293118059, 'Schaltet ein oder aus, ob das Log global verfügbar ist.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('LTI_TOOL_TITLE', 'LTI-Tool', 'string', 'course', '', 1557244743, 1557244743, 'Voreinstellung für den Titel des Reiters \"LTI-Tool\" im Kurs.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MAILQUEUE_ENABLE', '0', 'boolean', 'global', 'global', 1403258017, 1403258017, 'Aktiviert bzw. deaktiviert die Mailqueue');
@@ -263,6 +264,14 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_ACCESS_ASSIGN_LVGRUPPEN', 'admin', 'string', 'global', 'mvv', 1483462780, 1483462780, 'Ab welchem Rechtestatus können Veranstaltungen Modulen (LV-Gruppen) zugeordnet werden. Bei Angabe von fakadmin darf nur dieser Zuordnungen vornehmen.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_ALLOW_CREATE_LVGRUPPEN_INDEPENDENTLY', '0', 'boolean', 'global', 'mvv', 1573236812, 1573236812, 'Soll das Anlegen von LV-Gruppen unabhängig von bestehenden Modulteilen auf der Verwaltungsseite für LV-Gruppen möglich sein?');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_OVERLAPPING_SHOW_VERSIONS_INSIDE_MULTIPLE_STUDY_COURSES', '0', 'boolean', 'global', 'mvv', 1591630777, 1591630777, 'Zeigt als zweite Auswahl bei Mehrfachstudiengängen nur Versionen der dazugehörigen Teilstudiengänge an.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_ABSCHLUSS', '', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for degrees. Possible placeholders: {{degree_name}}, {{degree_short_name}}. If empty a default name will be displayed.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_FACHBEREICH', '{{faculty_short_name}} - {{name}}', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for departments. Possible placeholders: {{department_name}}, {{faculty_short_name}}. Used only if the department is not a faculty. If empty the name of the institution will be displayed.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_MODUL', '{{module_name}} ({{semester_validity}})', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for modules. Possible placeholders: {{module_code}}, {{module_name}}, {{semester_validity}}');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_MODULTEIL', '', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for module parts. Possible placeholders: {{part_number}}, {{part_number_label}}, {{part_name}}, {{teaching_method}}. If empty a default name will be displayed.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_STGTEILABSCHNITTMODUL', '{{module_code}} - {{module_name}} ({{semester_validity}})', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for modules displayed in the context of a study course. Possible placeholders: {{module_code}}, {{module_name}}, {{semester_validity}}. If empty a default name will be displayed.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_STGTEILVERSION', '{{subject_name}} {{credit_points CP}} {{purpose_addition}}{{, version_ordinal_number}} {{version_type}} {{semester_validity}}', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for versions of study courses. Possible placeholders: {{subject_name}}, {{credit_points}}, {{purpose_addition}}, {{version_number}}, {{version_type}}, {{version_ordinal_number}}, {{semester_validity}}.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_STUDIENGANG', '{{study_course_name}} ({{degree_category}})', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for the name of a study course. Possible placeholders: {{study_course_name}}, {{degree_name}}, {{degree_category}}.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MVV_TEMPLATE_NAME_STUDIENGANGTEIL', '{{subject_name}} {{credit_points}} CP {{purpose_addition}}', 'string', 'global', 'mvv', 1716385357, 1716385357, 'Template for parts of a study course. Possible placeholders: {{subject_name}}, {{credit_points}}, {{purpose_addition}}.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MY_COURSES_DEFAULT_CYCLE', 'last', 'string', 'global', 'MeineVeranstaltungen', 1462287310, 1462287310, 'Standardeinstellung für den Semester-Filter, falls noch keine Auswahl getätigt wurde. (all, future, current, last)');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MY_COURSES_ENABLE_ALL_SEMESTERS', '1', 'boolean', 'global', 'MeineVeranstaltungen', 1416496224, 1416496224, 'Ermöglicht die Anzeige von allen Semestern unter meine Veranstaltungen.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('MY_COURSES_ENABLE_STUDYGROUPS', '1', 'boolean', 'global', 'MeineVeranstaltungen', 1416496224, 1416496224, 'Sollen Studiengruppen in einem eigenen Bereich angezeigt werden (Neues Navigationelement in Meine Veranstaltungen)?.');
@@ -293,6 +302,7 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('ONLINE_NAME_FORMAT', 'full_rev', 'string', 'user', '', 1153814980, 1153814980, 'Default-Wert für wer-ist-online Namensformatierung');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('ONLINE_VISIBILITY_DEFAULT', '1', 'boolean', 'global', 'privacy', 1326799691, 1326799691, 'Sind Nutzer sichtbar in der Wer ist online-Liste, falls sie nichts anderes eingestellt haben?');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('OPENGRAPH_ENABLE', '1', 'boolean', 'global', 'global', 1403258018, 1403258018, 'De-/Aktiviert OpenGraph-Informationen und deren Abrufen.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('PASSWORD_TOOLTIP_TEXT', '', 'i18n', 'global', 'Loginseite', 1716385357, 1716385357, 'Text für den Tooltip des Benutzernamens auf der Loginseite');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('PDF_LOGO', '', 'string', 'global', 'global', 1311411856, 1311411856, 'Geben Sie hier den absoluten Pfad auf Ihrem Server (also ohne http) zu einem Logo an, das bei PDF-Exporten im Kopfbereich verwendet wird.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('PERSONAL_DETAILS_INFO_TEXT', 'Einige Ihrer persönlichen Daten werden nicht in Stud.IP verwaltet und können daher hier nicht geändert werden.', 'i18n', 'global', 'global', 1698855217, 1698855217, 'Der Infotext der unter Profil->Persönliche Angaben->Grunddaten angezeigt wird, wenn man nicht die Standard-Auth nutzt.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('PERSONAL_NOTIFICATIONS_ACTIVATED', '1', 'boolean', 'global', 'privacy', 1403258015, 1403258015, 'Sollen persönliche Benachrichtigungen aktiviert sein?');
@@ -305,6 +315,7 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('PROFILE_LAST_VISIT', '0', 'integer', 'user', '', 1403258015, 1403258015, 'Zeitstempel des letzten Besuchs der Profilseite');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('PROPOSED_TEACHER_LABELS', '', 'string', 'global', 'global', 1326799692, 1326799692, 'Write a list of comma separated possible labels for teachers and tutor here.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('RANGE_TREE_ADMIN_PERM', 'root', 'string', 'global', 'permissions', 1219328498, 1219328498, 'mit welchem Status darf die Einrichtungshierarchie bearbeitet werden (admin oder root)');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('REPORT_BARRIER_MODE', 'on', 'string', 'global', 'accessibility', 1716385357, 1716385357, 'Einstellungen zum Formular zu Melden einer Barriere (\"on\" = immer an, \"logged-in\" = nur für angemeldete Personen, \"off\" = ausgeschaltet)');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('RESOURCES_ADDITIONAL_TEXT_ROOM_EXPORT', '', 'string', 'global', 'resources', 1656513808, 1656513808, 'Zusatztext, der beim Seriendruck unter jedem Raumplan angezeigt werden soll');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('RESOURCES_ALLOW_ROOM_PROPERTY_REQUESTS', '1', 'boolean', 'global', 'resources', 0, 1074780851, 'Schaltet in der Ressourcenverwaltung die Möglichkeit, im Rahmen einer Anfrage Raumeigenschaften zu wünschen, ein oder aus');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('RESOURCES_ALLOW_ROOM_REQUESTS', '1', 'boolean', 'global', 'resources', 0, 1100709567, 'Schaltet in der Ressourcenverwaltung das System zum Stellen und Bearbeiten von Raumanfragen ein oder aus');
@@ -364,7 +375,8 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('TFA_TRUST_DURATION', '30', 'integer', 'global', 'Zwei-Faktor-Authentifizierung', 1656513809, 1656513809, 'Dauer, denen Geräte vertraut werden soll in Tagen (0 für dauerhaftes Vertrauen)');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('TOURS_ENABLE', '1', 'boolean', 'global', 'global', 1416496223, 1416496223, 'Aktiviert die Funktionen zum Anbieten von Touren in Stud.IP');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('UNI_NAME_CLEAN', 'Stud.IP', 'string', 'global', 'global', 1510849314, 1510849314, 'Name der Stud.IP-Installation bzw. Hochschule.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('USERNAME_REGULAR_EXPRESSION', '/^([a-zA-Z0-9_@.-]{4,})$/', 'string', 'global', 'global', 1510849314, 1510849314, 'Regex for allowed characters in usernames');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('USERNAME_REGULAR_EXPRESSION', '/^([a-zA-Z0-9_@.-]{4,})$/', 'string', 'global', 'global', 1510849314, 1510849314, 'Regulärer Ausdruck für erlaubte Zeichen in Benutzernamen. Das Kommentarfeld kann genutzt werden, um eine Fehlermeldung anzugeben, die zum Beispiel im Registrierungsformular ausgegeben wird, wenn der Ausdruck nicht erfüllt wird.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('USERNAME_TOOLTIP_TEXT', '', 'i18n', 'global', 'Loginseite', 1716385357, 1716385357, 'Text für den Tooltip des Benutzernamens auf der Loginseite');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('USER_HIGH_CONTRAST', '0', 'boolean', 'user', 'accessibility', 1669041528, 1669041528, 'Schaltet ein barrierefreies Stylesheet mit hohem Kontrast ein oder aus.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('USER_VISIBILITY_CHECK', '1', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Enable presentation of visibility decision texts for users after first login. see lib/include/header.php and lib/user_visible.inc.php for further info');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('USER_VISIBILITY_UNKNOWN', '1', 'boolean', 'global', 'privacy', 1153815901, 1153815901, 'Sollen Nutzer mit Sichtbarkeit \"unknown\" wie sichtbare behandelt werden?');
@@ -377,9 +389,10 @@ INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `c
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WEBSERVICES_ENABLE', '0', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Schaltet die Webservice-Schnittstelle an.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WIKI_COMMENTS_ENABLE', '0', 'boolean', 'user', '', 1591630778, 1591630778, 'Einstellung für die Anzeige von Kommentaren in Wiki als Icon');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WIKI_COURSE_EDIT_RESTRICTED', '0', 'boolean', 'course', '', 1557244742, 1557244742, 'Legt fest, dass nur Teilnehmende ab Rechtestufe \"tutor\" das Wiki bearbeiten dürfen.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WIKI_CREATE_PERMISSION', 'all', 'string', 'course', '', 1716385357, 1716385357, 'Status, den es braucht, um neue Wiki-Seiten anzulegen.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WIKI_ENABLE', '1', 'boolean', 'global', 'modules', 1293118059, 1293118059, 'Schaltet ein oder aus, ob das Wiki global verfügbar ist.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WYSIWYG', '1', 'boolean', 'global', 'global', 1403258021, 1403258021, 'Aktiviert den WYSIWYG Editor im JavaScript.');
-INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('XSLT_ENABLE', '1', 'boolean', 'global', 'global', 1510849314, 1510849314, 'Soll Export mit XSLT angeschaltet sein?');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WIKI_RENAME_PERMISSION', 'all', 'string', 'course', '', 1716385357, 1716385357, 'Status, den es braucht, um Wiki-Seiten umzubenennen.');
+INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('WIKI_STARTPAGE_ID', '', 'string', 'course', '', 1716385357, 1716385357, 'ID der Wiki-Startseite des Wikis.');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('ZIP_DOWNLOAD_MAX_FILES', '400', 'integer', 'global', 'files', 1219328498, 1219328498, 'Die maximale Anzahl an Dateien, die gezippt heruntergeladen werden kann');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('ZIP_DOWNLOAD_MAX_SIZE', '200', 'integer', 'global', 'files', 1219328498, 1219328498, 'Die maximale Größe aller Dateien, die zusammen in einem Zip heruntergeladen werden kann (in Megabytes).');
 INSERT INTO `config` (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`) VALUES('ZIP_UPLOAD_ENABLE', '1', 'boolean', 'global', 'files', 1130840930, 1130840930, 'Ermöglicht es, ein Zip Archiv hochzuladen, welches automatisch entpackt wird');
@@ -403,6 +416,7 @@ INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `
 INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('69f3cf620a3ee6a3e77a554163685520', '81f150b1a22210a1d6fac70220faa831', 1, NULL, NULL, '{\"verbose\":false}', 'normal', 'periodic', 41, 1, NULL, NULL, NULL, 1686181260, NULL, NULL, 0, 1686150733, 1686150733);
 INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('6eef46d414b104b153402be299e16515', '2f2713671892bd9624fc27866cfd4630', 0, NULL, '', '{\"verbose\":\"1\",\"send_messages\":\"1\"}', 'normal', 'periodic', -30, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, 1403258015, 1403258130);
 INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('81411d712690ab3a82032439dbcdc8c1', '9c4ad2a8fe47d07e61475d25f5e539db', 0, NULL, NULL, '[]', 'normal', 'periodic', NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, 1403258017, 1403258017);
+INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('8541eec0e512e4e0caa2a5566dd3633b', '5ecaecd21cd6dd3712d3d294de51c776', 0, NULL, NULL, 'null', 'normal', 'periodic', 45, 1, NULL, NULL, NULL, 0, NULL, NULL, 0, 1716385357, 1716385357);
 INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('b6e232acce27674e496bd2182aab5aaa', '43f9da3d9245d0f01b43f744e0b8cdce', 0, NULL, NULL, 'null', 'normal', 'periodic', 55, 0, NULL, NULL, NULL, 1530312900, NULL, NULL, 0, 1530289049, 1530290418);
 INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('cdf293c6c5ae966d87dc5ee723d9880d', '823875ed4a4b2e87baca0e5137243d96', 0, NULL, '', '{\"verbose\":\"1\"}', 'normal', 'periodic', 33, 2, NULL, NULL, NULL, 1530318780, NULL, NULL, 0, 1403258015, 1530290419);
 INSERT INTO `cronjobs_schedules` (`schedule_id`, `task_id`, `active`, `title`, `description`, `parameters`, `priority`, `type`, `minute`, `hour`, `day`, `month`, `day_of_week`, `next_execution`, `last_execution`, `last_result`, `execution_count`, `mkdate`, `chdate`) VALUES('dc849ba21c484ffbb82f7ef9edea3d7d', '208619e89a59895771c2967076daf59e', 0, NULL, NULL, '[]', 'low', 'periodic', -30, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, 1403258015, 1403258015);
@@ -414,11 +428,11 @@ INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `executi
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('3428a64935e8c6a5ab5dcf5bf95fe556', 'lib/cronjobs/session_gc.class.php', 'SessionGcJob', 1, 0, 0, NULL, NULL);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('43f9da3d9245d0f01b43f744e0b8cdce', 'lib/classes/FilesSearch/Cronjob.php', 'FilesSearch\\Cronjob', 1, 0, 2, NULL, NULL);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('532b3fe76447dd85e10949a6fc5f3aa8', 'lib/cronjobs/cleanup_log.class.php', 'CleanupLogJob', 1, 0, 0, NULL, NULL);
+INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('5ecaecd21cd6dd3712d3d294de51c776', 'lib/cronjobs/import_ilias_testresults.php', 'ImportIliasTestresults', 1, 0, 1, 1716385357, 1716385357);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('81f150b1a22210a1d6fac70220faa831', 'lib/cronjobs/courseware.php', 'CoursewareCronjob', 1, 0, 1, 1686150733, 1686150733);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('823875ed4a4b2e87baca0e5137243d96', 'lib/cronjobs/garbage_collector.class.php', 'GarbageCollectorJob', 1, 0, 0, NULL, NULL);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('9c4ad2a8fe47d07e61475d25f5e539db', 'lib/cronjobs/send_mail_queue.class.php', 'SendMailQueueJob', 1, 0, 0, NULL, NULL);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('ca6df41746dbd2077d993d3bfddbf10c', 'lib/cronjobs/remind_oer_upload.class.php', 'RemindOerUpload', 1, 0, 0, NULL, NULL);
-INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('d0a556faa0bb93df823ccae8905b21d3', 'lib/cronjobs/clean_object_user_visits.php', 'CleanObjectUserVisits', 1, 0, 0, NULL, NULL);
 INSERT INTO `cronjobs_tasks` (`task_id`, `filename`, `class`, `active`, `execution_count`, `assigned_count`, `mkdate`, `chdate`) VALUES('d19f37c382fec524b4fd51b3c5a1ada3', 'lib/cronjobs/send_mail_notifications.class.php', 'SendMailNotificationsJob', 1, 0, 0, NULL, NULL);
 
 INSERT INTO `datafields` (`datafield_id`, `name`, `object_type`, `object_class`, `edit_perms`, `view_perms`, `institut_id`, `priority`, `mkdate`, `chdate`, `type`, `typeparam`, `is_required`, `default_value`, `is_userfilter`, `description`, `system`) VALUES('0c63321a8e93b3ccc927611709248e07', 'default Planungsfarbe', 'inst', NULL, 'admin', 'root', NULL, 0, NULL, NULL, 'textline', '', 0, NULL, 0, 'Default Farben im Veranstaltungsplaner', 0);
@@ -996,6 +1010,7 @@ INSERT INTO `loginbackgrounds` (`background_id`, `filename`, `mobile`, `desktop`
 
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('005df8d5eb23c66214b28b3c9792680b', 'SEM_CHANGED_ACCESS', 'Zugangsberechtigungen geändert', '%user ändert die Zugangsberechtigungen der Veranstaltung %sem(%affected).', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('00af9c41fc56b617097bdef1e7dca397', 'MVV_FACHINST_NEW', 'MVV: Fach-Einrichtung Zuweisung erstellen', '%user weist das Fach %fach(%affected) der Einrichtung %inst(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('03d980e11c5a6b57e2bd680cf9bbc890', 'MVV_CONTACT_RANGE_UPDATE', 'MVV: Zuordnung der Kontaktperson ändern', '%user ändert die Zuordnung der Kontaktperson %contact(%affected) zum Bereich %range(%coaffected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('04061e4d13b416e10d6094679e7c9d9c', 'MVV_MODULTEIL_DEL', 'MVV: Modulteil löschen', '%user löscht Modulteil %modulteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('060390e972f9580ab92c7febb99fb2fa', 'MVV_LVSEMINAR_NEW', 'MVV: LV-Gruppe zu Veranstaltung Zuweisung erstellen', '%user weist der LV-Gruppe %lvgruppe(%affected) der Veranstaltung %sem(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('07c384b8328f56a33b4edb2570e85a48', 'MVV_MODULTEIL_DESK_NEW', 'MVV: Modulteil Deskriptor erstellen', '%user erstellt neuen Modulteil Deskriptor %modulteildesk(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1009,9 +1024,13 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('10916a5a08ca16bfd055e4823311377a', 'MVV_DOK_ZUORD_DEL', 'MVV: Dokumentzuordnung löschen', '%user löscht die Zuweisung des Dokumentes %dokument(%affected) zu %object_type(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('10c31be1aec819c03b0dc299d0111576', 'CHANGE_BASIC_DATA', 'Basisdaten geändert', '%user hat in Veranstaltung %sem(%affected) die Daten %info geändert.', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('10c320bc80022f1ff1381857af46f474', 'SEM_DEL_FROM_GROUP', 'Veranstaltung aus Gruppe entfernen', '%user entfernt Veranstaltung %sem(%affected) aus der Gruppe %sem(%coaffected).', 1, 0, NULL, NULL, 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('10e9a21d0dc5b627a529dda76a89a884', 'MVV_FILE_FILEREF_UPDATE', 'MVV: Datei ändern', '%user ändert Datei %fileref(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('13b5297079e1600ccc3ca6f49081099f', 'MVV_STG_STGTEIL_DEL', 'MVV: Studiengang zu Studiengangteil Zuweisung löschen', '%user löscht die Zuweisung des Studienganges %stg(%affected) zum Studiengangteil %stgteil(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('143ade01ac63524ee2ed0fac5a6f0c33', 'MVV_FILE_RANGE_NEW', 'MVV: Material/Dokument zuordnen', '%user ordnet Material/Dokument %fileref(%affected) zum Bereich %range(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('157f75beb242c7de8ff790d4005a259e', 'MVV_FACH_DEL', 'MVV: Fach löschen', '%user löscht Fach %fach(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('1585bb70e5e403fd818e59bb622db4a3', 'STATUSGROUP_ADD_USER', 'Nutzer wird zu einer Statusgruppe hinzugefügt', '%user fügt %user(%affected) zur %group(%coaffected) hinzu.', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('15b9fcdf82a617e9bd9d0ca112ecebac', 'MVV_FILE_FILEREF_DELETE', 'MVV: Datei löschen', '%user löscht Datei %fileref(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('1601bfdca4988a309636d2bbbd3adb47', 'MVV_EXTERN_CONTACT_NEW', 'MVV: Externe Kontaktperson erstellen', '%user erstellt neue externe Kontaktperson %contact(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('17f0a527e9db7dec09687a70681559cf', 'RES_ASSIGN_DEL_SINGLE', 'Direktbuchung löschen', '%user löscht Direktbuchung für %res(%affected) (%info).', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('1a1e8c9c3125ea8d2c58c875a41226d6', 'INST_DEL', 'Einrichtung löschen', '%user löscht Einrichtung %info (%affected).', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('1a27a101df926fafce35635f0dd72522', 'MVV_MODULTEIL_NEW', 'MVV: Modulteil erstellen', '%user erstellt neuen Modulteil %modulteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1023,8 +1042,10 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('248f54105b7102e5cbcc36e9439504fb', 'STUDYAREA_ADD', 'Studienbereich hinzufügen', '%user legt Studienbereich %studyarea(%affected) an.', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('292b1cf6c0b46d7038baa75e0b273299', 'MVV_MODUL_DEL', 'MV: Modul löschen', '%user löscht Modul %modul(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('293a742d791a1edbaaa738f8991aeb7b', 'MVV_LVSEMINAR_UPDATE', 'MVV: LV-Gruppe zu Veranstaltung Zuweisung ändern', '%user ändert die Zuweisung der LV-Gruppe %lvgruppe(%affected) zur Veranstaltung %sem(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('2d5a23cf47bea8e77dcce0f3a100727c', 'MVV_EXTERN_CONTACT_UPDATE', 'MVV: Externe Kontaktperson ändern', '%user ändert externe Kontaktperson %contact(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('2dd254c28cac83c59856fe89500e3bc3', 'MVV_STGTEILABS_MODUL_DEL', 'MVV: Stgteilabschnitt-Modul Zuweisung löschen', '%user löscht die Zuweisung des Studiengangteilabschnitts %stgteilabs(%affected) zum Modul %modul(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('2e816bfd792e4a99913f11c04ad49198', 'SEM_UNDELETE_SINGLEDATE', 'Einzeltermin wiederherstellen', '%user stellt Einzeltermin %singledate(%affected) in %sem(%coaffected) wieder her.', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('2e8ac58e7f181243e3a736ddd65416e1', 'MVV_FILE_UPDATE', 'MVV: Material/Dokument ändern', '%user ändert Material/Dokument %file(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('30dfb509cb1a8e228af3bd17dd6c8d1d', 'RES_ASSIGN_SEM', 'Buchen einer Ressource (VA)', '%user bucht %res(%affected) für %sem(%coaffected) (%info).', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('31fd4549853915608facb8c3e2b101d6', 'MVV_STGTEIL_DEL', 'MVV: Studiengangteil löschen', '%user löscht Studiengangteil %stgteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('347738302758bea951248b255409fa85', 'MVV_KATEGORIE_UPDATE', 'MVV: Abschluss-Kategorie ändern', '%user ändert Abschluss-Kategorie %abskategorie(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1032,9 +1053,11 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('3861d5249b8fe7f2be57adfda8944f4d', 'MVV_LVGRUPPE_UPDATE', 'MVV: LV-Gruppe ändern', '%user ändert LV-Gruppe %lvgruppe(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('39082f4fbfe61ff3aee8e93f47bc1722', 'FILE_DELETE', 'Nutzer löscht Datei', '%user löscht Datei %info (File-Id: %affected)', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('398c62a78ec7e2b72d88cce504c2730f', 'MVV_MODULTEIL_STGTEILABS_NEW', 'MVV: Studiengangteilabschnitt zu Modulteil Zuweisung erstellen', '%user weist den Modulteil %modulteil(%affected) dem Studiengangteilabschnitt %stgteilabs(%coaffected) im %fachsem. Fachsemester zu.', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
-INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('3f7dcf6cc85d6fba1281d18c4d9aba6f', 'SEM_ADD_SINGLEDATE', 'Einzeltermin hinzufügen', '%user hat in %sem(%affected) den Einzeltermin <em>%coaffected</em> hinzugefügt', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('3f7dcf6cc85d6fba1281d18c4d9aba6f', 'SEM_ADD_SINGLEDATE', 'Einzeltermin hinzufügen', '%user hat in %sem(%affected) den Einzeltermin %singledate(%coaffected) hinzugefügt', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('3f9b68eacae768ff01cc1cc2d0d82174', 'MVV_FACHBERATER_NEW', 'MVV: Person zu Fach Zuweisung erstellen', '%user weist dem Studiengangteil %stgteil(%affected) %user(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('4015db0d107d4df6d071bf7ffc70f0a4', 'MVV_CONTACT_RANGE_DELETE', 'MVV: Zuordnung der Kontaktperson löschen', '%user löscht die Zuordnung der Kontaktperson %contact(%affected) zum Bereich %range(%coaffected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('40455e06f6a679cd87c68c375c9dfa5a', 'MVV_STGTEILBEZ_DEL', 'MVV: Studiengangteil-Bezeichnung löschen', '%user löscht Studiengangteil-Bezeichnung %stgteilbez(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('4159b9cb03abe9bbe4a60d6083969544', 'MVV_CONTACT_DELETE', 'MVV: Kontaktperson löschen', '%user löscht Kontaktperson %contact(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('428c09d5a31b1057b08ca5e3b3877109', 'MVV_FACHBERATER_UPDATE', 'MVV: Person zu Fach Zuweisung ändern', '%user ändert die Zuweisung von %user(%coaffected) zum Studiengangteil %stgteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('42b01c873e3066a840ab3237e3aa0911', 'RES_PERM_CHANGE', 'Änderung der Berechtigungsstufe an einer Ressource.', '%user ändert Berechtigung von %res(%affected): %info', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('447d6ae1b51b97b04f7ae290c6b002d7', 'MVV_DOKUMENT_DEL', 'MVV: Dokument löschen', '%user löscht Dokument %dokument(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1049,11 +1072,13 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('4b08c6b8539466a1f1968b44ec2996ed', 'MVV_LVMODULTEIL_DEL', 'MVV: LV-Gruppe zu Modulteil Zuweisung löschen', '%user löscht die Zuweisung der LV-Gruppe %lv(%affected) zum Modulteil %modulteil(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('4dd6b4101f7bf3bd7fe8374042da95e9', 'USER_NEWPWD', 'Neues Passwort', '%user generiert neues Passwort für %user(%affected)', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('4e2cf05ca311e5a616a7612ce8f5a885', 'MVV_MODULTEIL_STGTEILABS_DEL', 'MVV: Studiengangteilabschnitt zu Modulteil Zuweisung löschen', '%user löscht die Zuweisung des Modulteils %modulteil(%affected) im %fachsem. des Studiengangteilabschnitt %stgteilabs(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('4e705f2d91569d31dd0c9c197b3f28b5', 'MVV_FILE_FILEREF_NEW', 'MVV: Datei erstellen', '%user erstellt neue Datei %fileref(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('535010528d6c012ec0e3535e2d754f66', 'SEM_USER_ADD', 'In Veranstaltung eingetragen', '%user hat %user(%coaffected) für %sem(%affected) mit dem status %info eingetragen. (%dbg_info)', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('54fb2968cd737ed53f300864ee507260', 'USER_UNLOCK', 'Nutzer wird entsperrt', '%user entsperrt %user(%affected) (%info)', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('566a614092e9f502d9340467ecef59d1', 'MVV_STGTEILVERSION_UPDATE', 'MVV: Studiengangteilversion ändern', '%user ändert Studiengangteilversion %version(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('5a34b0ea6a824f96c0117a035d1cf9e9', 'MVV_DOKUMENT_UPDATE', 'MVV: Dokument ändern', '%user ändert Dokument %dokument(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('5b96f2fe994637253ba0fe4a94ad1b98', 'SEM_ARCHIVE', 'Veranstaltung archivieren', '%user archiviert %info (ID: %affected).', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('5f75cc8482e27c430eb5714b70c63c7d', 'MVV_FILE_NEW', 'MVV: Material/Dokument erstellen', '%user erstellt neues Material/Dokument %file(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('5f8fda12a4c0bd6eadbb94861de83696', 'SEM_ADD_CYCLE', 'Regelmäßige Zeit hinzugefügt', '%user hat in %sem(%affected) die regelmäßige Zeit %info hinzugefügt.', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('5fd9b4ddb5c4e035c0b0e7751613cd94', 'MVV_STGTEILABS_MODUL_NEW', 'MVV: Stgteilabschnitt-Modul Zuweisung erstellen', '%user weist dem Studiengangteilabschnitt %stgteilabs(%affected) dem Modul %Modul(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('63031a1eb903c1092752521ccf4b7456', 'FOLDER_DELETE', 'Nutzer löscht Ordner', '%user löscht Datei %info (Folder-Id: %affected)', 1, 0, NULL, NULL, NULL, NULL, NULL);
@@ -1066,6 +1091,7 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('6c5d5ed836c464be1c5547adcec3eae0', 'MVV_MODULTEIL_LANG_UPDATE', 'MVV: Sprache zu Modulteil Zuweisung ändern', '%user ändert die Zuweisung der Unterrichtssprache %language(%coaffected) zum Modulteil %modulteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('6e2b789a57b9125af59c0273f5b47cb1', 'SEM_USER_DEL', 'Aus Veranstaltung ausgetragen', '%user hat %user(%coaffected) aus %sem(%affected) ausgetragen. (%info)', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('6f4bb66c1caf89879d89f3b1921a93dd', 'SEM_DELETE_CYCLE', 'Regelmäßige Zeit gelöscht', '%user hat in %sem(%affected) die regelmäßige Zeit %info gelöscht.', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('700efdc3f172bb73d326ce9824ec2580', 'MVV_FILE_RANGE_UPDATE', 'MVV: Zuordnung von Material/Dokument zu Bereich ändern.', '%user ändert Zuordnung von Material/Dokument %fileref(%affected) zu Bereich %range(%coaffected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('71bfea5eb0d9a85d1247b83383ac5b7e', 'MVV_MODUL_DESK_NEW', 'MVV: Modul Deskriptor erstellen', '%user erstellt neuen Modul Deskriptor %moduldesk(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('754708c8c0c61a916855c5031014acbb', 'SEM_DELETE_STUDYAREA', 'Studienbereich aus Veranst. löschen', '%user entfernt Studienbereich \"%studyarea(%coaffected)\" aus %sem(%affected).', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('770f76504dcbbfa6bdc51a8c0f6df4b2', 'MVV_STGTEILABS_DEL', 'MVV: Studiengangteilabschnitt löschen', '%user löscht Studiengangteilabschnitt %stgteilabs(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1074,6 +1100,7 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('7d37d874592eea50eef5239fb7b8e3d7', 'MVV_MODULTEIL_LANG_DEL', 'MVV: Sprache zu Modulteil Zuweisung löschen', '%user löscht die Zuweisung der Unterrichtssprache %language(%coaffected) zum Modulteil %modulteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('7f2ec1cbf988eee849de7cfa031b68f9', 'MVV_STGTEILVERSION_DEL', 'MVV: Studiengangteilversion löschen', '%user löscht Studiengangteilversion %version(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('7f335b5d0d9f8d37652718cb89937b38', 'MVV_STGTEIL_NEW', 'MVV: Studiengangteil erstellen', '%user erstellt neuen Studiengangteil %stgteil(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('811c6650f12229280382ff2793a4cb22', 'MVV_FILE_DELETE', 'MVV: Material/Dokument löschen', '%user löscht Material/Dokument %file(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('8216cba6119cf4a4de82ec3ce8ac51b7', 'MVV_MODUL_USER_UPDATE', 'MVV: Person zu Modul Zuweisung ändern', '%user ändert die Zuweisung von %user(%coaffected) als %gruppe zum Modul %modul(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('89114dcd6f02dd7f94488a616c21a7c3', 'PLUGIN_ENABLE', 'Plugin einschalten', '%user hat in Veranstaltung %sem(%affected) das Plugin %plugin(%coaffected) aktiviert.', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('897207a36c411d736947052219624b72', 'USER_CHANGE_PASSWORD', 'Nutzerpasswort geändert', '%user ändert/setzt das Passwort für %user(%affected)', 0, 0, NULL, NULL, NULL, NULL, NULL);
@@ -1086,7 +1113,7 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('997cf01328d4d9f36b9f50ac9b6ace47', 'SEM_DELETE_SINGLEDATE', 'Einzeltermin löschen', '%user löscht Einzeltermin %singledate(%affected) in %sem(%coaffected).', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('9a7a5112de76fa0b8bd8910174d5f107', 'MVV_STGTEILBEZ_UPDATE', 'MVV: Studiengangteil-Bezeichnung ändern', '%user ändert Studiengangteil-Bezeichnung %stgteilbez(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('9d13643a1833c061dc3d10b4fb227f12', 'SEM_SET_ENDSEMESTER', 'Semesterlaufzeit ändern', '%user hat in %sem(%affected) die Laufzeit auf %semester(%coaffected) geändert', 1, 0, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('9d642dc93540580d42ba2ea502c3fbf6', 'SINGLEDATE_CHANGE_TIME', 'Einzeltermin bearbeiten', '%user hat in %sem(%affected) den Einzeltermin %coaffected geändert.', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('9d642dc93540580d42ba2ea502c3fbf6', 'SINGLEDATE_CHANGE_TIME', 'Einzeltermin bearbeiten', '%user hat in %sem(%affected) den Einzeltermin %singledate(%coaffected) geändert.', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('9ed46a3ca3d4f43e17f91e314224dcae', 'SEM_CHANGE_CYCLE', 'Regelmäßige Zeit geändert', '%user hat in %sem(%affected) die regelmäßige Zeit %info geändert', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('9eea9c8ec3fa6916fae974559f3a6e64', 'MVV_STGTEILABS_MODUL_UPDATE', 'MVV: Stgteilabschnitt-Modul Zuweisung ändern', '%user ändert die Zuweisung des Studiengangteilabschnitts %stgteilabs(%affected) zum Modul %modul(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('a06bd1ca1b5eec038c079042eb25acb0', 'MVV_DOKUMENT_NEW', 'MVV: Dokument erstellen', '%user erstellt neues Dokument %dokument(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1119,7 +1146,9 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d07c8b37c6d3e206cd012d07ba8028b1', 'SEM_CHANGED_RIGHTS', 'Veranstaltungsrechte geändert', '%user hat %user(%coaffected) in %sem(%affected) als %info eingetragen. (%dbg_info)', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d18d750fb2c166e1c425976e8bca96e7', 'USER_CHANGE_EMAIL', 'E-Mail-Adresse ändern', '%user ändert/setzt E-Mail-Adresse für %user(%affected): %info.', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d1989a21fc77ffc34e705bb3dc215ebb', 'STATUSGROUP_REMOVE_USER', 'Nutzer wird aus einer Statusgruppe gelöscht', '%user entfernt %user(%affected) aus %group(%coaffected).', 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d2ec04856dc8ca6776dac29fa9842aeb', 'MVV_CONTACT_NEW', 'MVV: Kontaktperson erstellen', '%user erstellt neue Kontaktperson %contact(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d4e99ffb6ffb32a20c0d9075bb73889d', 'MVV_ABS_ZUORD_UPDATE', 'MVV: Abschluss-Kategorien Zuweisung  ändern', '%user ändert die Zuweisung des Abschlusses %abschluss(%affected) zur Kategorie %abskategorie(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d5706ac17db2223637042af1c107ff44', 'MVV_EXTERN_CONTACT_DELETE', 'MVV: Externe Kontaktperson löschen', '%user löscht externe Kontaktperson %contact(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('d8e863ca143ff87cce89f17b2e3b409e', 'MVV_ABSCHLUSS_UPDATE', 'MVV: Abschluss ändern', '%user ändert Abschluss %abschluss(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('dcd16239a49c367e37faf8ffe9ae0081', 'SEM_ADD_TO_GROUP', 'Veranstaltung zu Gruppe hinzufügen', '%user ordnet Veranstaltung %sem(%affected) der Gruppe %sem(%coaffected) zu.', 1, 0, NULL, NULL, 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('df41cc74f6fd857b1690e36dafa070a9', 'MVV_MODUL_LANG_DEL', 'MVV: Sprache zu Modul Zuweisung löschen', '%user löscht die Zuweisung der Unterrichtssprache %language(%coaffected) zum Modul %modul(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
@@ -1131,12 +1160,15 @@ INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`,
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('e8423589894e5df742804e57f54fa5aa', 'MVV_MODULTEIL_STGTEILABS_UPDATE', 'MVV: Studiengangteilabschnitt zu Modulteil Zuweisung ändern', '%user ändert die Zuweisung des Modulteils %modulteil(%affected) im %fachsem. des Studiengangteilabschnitt %stgteilabs(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('e8646729e5e04970954c8b9679af389b', 'USER_DEL', 'Benutzer löschen', '%user löscht %user(%affected) (%info)', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('e8b1105ca4f2305ef0db6c961d2fbe4c', 'RES_ASSIGN_SINGLE', 'Buchen einer Ressource (Einzel)', '%user bucht %res(%affected) direkt (%info).', 0, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('e8d19770cc42028d124ca5a91beb1085', 'MVV_FILE_RANGE_DELETE', 'MVV: Zuordnung von Material/Dokument zu Bereich löschen', '%user löscht Zuordnung von Material/Dokument %fileref(%affected) von Bereich %range/%coaffected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('eac0850398466b86ec6af4068cff74ab', 'MVV_MODULTEIL_DESK_DEL', 'MVV: Modulteil Deskriptor löschen', '%user löscht Modulteil Deskriptor %modulteildesk(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('efe4f97f61a5f61ac69d9edad7d9b16f', 'MVV_CONTACT_UPDATE', 'MVV: Kontaktperson ändern', '%user ändert Kontaktperson %contact(%affected).', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('f363c6db07203dfcec893b1b8fc0eaee', 'MVV_FACHINST_UPDATE', 'MVV: Fach-Einrichtung Zuweisung ändern', '%user ändert die Zuweisung des Faches %fach(%affected) zur Einrichtung %inst(%coaffected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('f858b05c11f5faa2198a109a783087a8', 'SEM_CREATE', 'Veranstaltung anlegen', '%user legt %sem(%affected) an.', 1, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('f97335d7f45fd87a4e5e2c1d17f38dc0', 'MVV_MODUL_DESK_UPDATE', 'MVV: Modul Deskriptor ändern', '%user ändert Modul Deskriptor %moduldesk(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('fb550711e786f5d7d6a9ef8b4eb915f6', 'MVV_MODULINST_NEW', 'MVV: Modul-Einrichtung Beziehung erstellen', '%user weist dem Modul %modul(%affected) die Einrichtungen %inst(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('fc72d34ddb15a9819919fc42716830b3', 'MVV_MODUL_NEW', 'MVV: Modul erstellen', '%user erstellt neues Modul %modul(%affected).', 1, 0, NULL, 'MVV', 'core', NULL, NULL);
+INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('fd599d69434d1024255fac81ed90a6ac', 'MVV_CONTACT_RANGE_NEW', 'MVV: Kontaktperson zuordnen', '%user ordnet die Kontaktperson %contact(%affected) dem Bereich %range(%coaffected) zu.', 1, 0, NULL, 'MVV', 'core', 1716385357, 1716385357);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('fd74339a9ea038d084569e33e2655b6a', 'CHANGE_INSTITUTE_DATA', 'Beteiligte Einrichtungen geändert', '%user hat in Veranstaltung %sem(%affected) die Daten geändert. %info', 0, 0, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `log_actions` (`action_id`, `name`, `description`, `info_template`, `active`, `expires`, `filename`, `class`, `type`, `mkdate`, `chdate`) VALUES('ff806b4b26f8bc8c3e65e29d14176cd9', 'RES_REQUEST_RESOLVE', 'Aufgelöste Raumanfrage', '%user löst Raumanfrage für %sem(%affected), Raum %res(%coaffected) auf.', 0, 0, NULL, NULL, NULL, NULL, NULL);
 
@@ -1386,20 +1418,22 @@ INSERT INTO `roles_studipperms` (`roleid`, `permname`) VALUES(6, 'tutor');
 INSERT INTO `roles_user` (`roleid`, `userid`, `institut_id`) VALUES(7, 'nobody', '');
 
 INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '1', 327);
-INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.1', 52);
+INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.1', 58);
 INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.2', 15);
-INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.3', 21);
-INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.4', 15);
+INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.3', 23);
+INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.4', 17);
+INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.5', 28);
+INSERT INTO `schema_version` (`domain`, `branch`, `version`) VALUES('studip', '5.5.23', 1);
 
 INSERT INTO `semester_data` (`semester_id`, `name`, `semester_token`, `beginn`, `ende`, `sem_wechsel`, `vorles_beginn`, `vorles_ende`, `visible`, `external_id`, `mkdate`, `chdate`) VALUES('322f640f3f4643ebe514df65f1163eb1', 'SS 2024', '', 1711922400, 1727733599, NULL, 1712527200, 1720821599, 1, '', NULL, 1698856529);
-INSERT INTO `semester_data` (`semester_id`, `name`, `semester_token`, `beginn`, `ende`, `sem_wechsel`, `vorles_beginn`, `vorles_ende`, `visible`, `external_id`, `mkdate`, `chdate`) VALUES('4967f0a483e36554b77e3dc47aa58941', 'WS 2023/2024', '', 1696111200, 1711922399, NULL, 1698012000, 1707519599, 1, '', NULL, 1686151054);
+INSERT INTO `semester_data` (`semester_id`, `name`, `semester_token`, `beginn`, `ende`, `sem_wechsel`, `vorles_beginn`, `vorles_ende`, `visible`, `external_id`, `mkdate`, `chdate`) VALUES('4967f0a483e36554b77e3dc47aa58941', 'WS 2024/2025', '', 1727733600, 1743458399, NULL, 1729461600, 1738969199, 1, '', NULL, 1716387028);
 
-INSERT INTO `semester_holiday` (`holiday_id`, `semester_id`, `name`, `description`, `beginn`, `ende`, `mkdate`, `chdate`) VALUES('704038f0cb3ea0a285ba0a453788ebed', '', 'Unterbrechung', '', 1703286000, 1704495599, NULL, 1686151122);
+INSERT INTO `semester_holiday` (`holiday_id`, `semester_id`, `name`, `description`, `beginn`, `ende`, `mkdate`, `chdate`) VALUES('704038f0cb3ea0a285ba0a453788ebed', '', 'Unterbrechung', '', 1734908400, 1736117999, NULL, 1716387135);
 
-INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `mkdate`, `chdate`) VALUES(1, 'Lehre', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreDocuments\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"1\",\"sticky\":\"0\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreParticipants\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreSchedule\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"ConsultationModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreElearningInterface\":{\"activated\":\"0\",\"sticky\":\"0\"},\"IliasInterfaceModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"LtiToolModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"GradebookModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"FeedbackModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreCalendar\":{\"activated\":\"0\",\"sticky\":\"1\"}}', 'Hier finden Sie alle in Stud.IP registrierten Lehrveranstaltungen', '', 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, 1366882120, 1641229573);
-INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `mkdate`, `chdate`) VALUES(2, 'Organisation', 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreParticipants\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreDocuments\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreSchedule\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreElearningInterface\":{\"activated\":\"0\",\"sticky\":\"0\"},\"LtiToolModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"GradebookModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"ConsultationModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreCalendar\":{\"activated\":\"0\",\"sticky\":\"0\"},\"FeedbackModule\":{\"activated\":\"0\",\"sticky\":\"0\"}}', 'Hier finden Sie virtuelle Veranstaltungen zu verschiedenen Gremien an der Universit&auml;t', '', 0, 0, 0, 'LeiterIn', 'LeiterInnen', 'Mitglied', 'Mitglieder', NULL, NULL, 1, 0, 1366882120, 1641229564);
-INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `mkdate`, `chdate`) VALUES(3, 'Community', 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreParticipants\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreDocuments\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"0\",\"sticky\":\"0\"},\"LtiToolModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"GradebookModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"FeedbackModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreSchedule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"ConsultationModule\":{\"activated\":\"0\",\"sticky\":\"0\"}}', 'Hier finden Sie virtuelle Veranstaltungen zu unterschiedlichen Themen', '', 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, 1366882120, 1641229633);
-INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `mkdate`, `chdate`) VALUES(99, 'Studiengruppen', 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreStudygroupAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreStudygroupParticipants\":{\"activated\":\"1\",\"sticky\":\"1\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreDocuments\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreCalendar\":{\"activated\":\"0\",\"sticky\":\"1\"}}', '', '', 1, 0, 0, 'GruppengründerIn', 'GruppengründerInnen', 'ModeratorIn', 'ModeratorInnen', 'Mitglied', 'Mitglieder', 0, 0, 1366882120, 1641229657);
+INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `unlimited_forbidden`, `mkdate`, `chdate`) VALUES(1, 'Lehre', 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreDocuments\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"1\",\"sticky\":\"0\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreParticipants\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreSchedule\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"ConsultationModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreElearningInterface\":{\"activated\":\"0\",\"sticky\":\"0\"},\"IliasInterfaceModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"LtiToolModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"GradebookModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"FeedbackModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreCalendar\":{\"activated\":\"0\",\"sticky\":\"1\"}}', 'Hier finden Sie alle in Stud.IP registrierten Lehrveranstaltungen', '', 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, 0, 1366882120, 1641229573);
+INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `unlimited_forbidden`, `mkdate`, `chdate`) VALUES(2, 'Organisation', 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreParticipants\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreDocuments\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreSchedule\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreElearningInterface\":{\"activated\":\"0\",\"sticky\":\"0\"},\"LtiToolModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"GradebookModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"ConsultationModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreCalendar\":{\"activated\":\"0\",\"sticky\":\"0\"},\"FeedbackModule\":{\"activated\":\"0\",\"sticky\":\"0\"}}', 'Hier finden Sie virtuelle Veranstaltungen zu verschiedenen Gremien an der Universit&auml;t', '', 0, 0, 0, 'LeiterIn', 'LeiterInnen', 'Mitglied', 'Mitglieder', NULL, NULL, 1, 0, 0, 1366882120, 1641229564);
+INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `unlimited_forbidden`, `mkdate`, `chdate`) VALUES(3, 'Community', 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreParticipants\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreDocuments\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"0\",\"sticky\":\"0\"},\"LtiToolModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"GradebookModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"FeedbackModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreSchedule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"ConsultationModule\":{\"activated\":\"0\",\"sticky\":\"0\"}}', 'Hier finden Sie virtuelle Veranstaltungen zu unterschiedlichen Themen', '', 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, 0, 1366882120, 1641229633);
+INSERT INTO `sem_classes` (`id`, `name`, `only_inst_user`, `default_read_level`, `default_write_level`, `bereiche`, `module`, `show_browse`, `write_access_nobody`, `topic_create_autor`, `visible`, `course_creation_forbidden`, `modules`, `description`, `create_description`, `studygroup_mode`, `admission_prelim_default`, `admission_type_default`, `title_dozent`, `title_dozent_plural`, `title_tutor`, `title_tutor_plural`, `title_autor`, `title_autor_plural`, `show_raumzeit`, `is_group`, `unlimited_forbidden`, `mkdate`, `chdate`) VALUES(99, 'Studiengruppen', 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '{\"CoreOverview\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreStudygroupAdmin\":{\"activated\":\"1\",\"sticky\":\"1\"},\"CoreStudygroupParticipants\":{\"activated\":\"1\",\"sticky\":\"1\"},\"Blubber\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreForum\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreDocuments\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoreScm\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreWiki\":{\"activated\":\"1\",\"sticky\":\"0\"},\"CoursewareModule\":{\"activated\":\"0\",\"sticky\":\"0\"},\"CoreCalendar\":{\"activated\":\"0\",\"sticky\":\"1\"}}', '', '', 1, 0, 0, 'GruppengründerIn', 'GruppengründerInnen', 'ModeratorIn', 'ModeratorInnen', 'Mitglied', 'Mitglieder', 0, 0, 0, 1366882120, 1641229657);
 
 INSERT INTO `sem_types` (`id`, `name`, `class`, `mkdate`, `chdate`) VALUES(1, 'Vorlesung', 1, 1366882120, 1366882120);
 INSERT INTO `sem_types` (`id`, `name`, `class`, `mkdate`, `chdate`) VALUES(2, 'Seminar', 1, 1366882120, 1366882120);
@@ -1416,11 +1450,12 @@ INSERT INTO `sem_types` (`id`, `name`, `class`, `mkdate`, `chdate`) VALUES(12, '
 INSERT INTO `sem_types` (`id`, `name`, `class`, `mkdate`, `chdate`) VALUES(13, 'sonstige', 3, 1366882120, 1366882120);
 INSERT INTO `sem_types` (`id`, `name`, `class`, `mkdate`, `chdate`) VALUES(99, 'Studiengruppe', 99, 1366882120, 1366882120);
 
-INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `name`, `content`) VALUES(1, 1, NULL, '[lang=de]Ansprechpartner[/lang][lang=en]Contact[/lang]', '[style=float: right]\r\n[img]https://develop.studip.de/logos/logoklein.png\r\n**Version:** (:version:)\r\n[/style]\r\n[lang=de]Für diese Stud.IP-Installation ((:uniname:)) sind folgende Administratoren zuständig:[/lang]\r\n[lang=en]The following administrators are responsible for this Stud.IP installation ((:uniname:)):[/lang]\r\n(:rootlist:)\r\n[lang=de]allgemeine Anfragen wie Passwort-Anforderungen u.a. richten Sie bitte an:[/lang]\r\n[lang=en]General queries e.g., password queries, please contact:[/lang]\r\n(:unicontact:)\r\n[lang=de]Folgende Einrichtungen sind beteiligt:\r\n(Genannt werden die jeweiligen Administratoren der Einrichtungen für entsprechende Anfragen)[/lang]\r\n[lang=en]The following institutes participate:\r\n(Named are the institutes administrators responsible for the corresponding query areas)[/lang]\r\n(:adminlist:)');
-INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `name`, `content`) VALUES(2, 1, NULL, '[lang=de]Entwickler[/lang][lang=en]Developer[/lang]', '[style=float: right]\r\n\r\n[img]https://develop.studip.de/logos/logoklein.png\r\n\r\n**Version:** (:version:)\r\n\r\n[/style]\r\n\r\n[lang=de]Stud.IP ist ein Open Source Projekt zur Unterstützung von Präsenzlehre an Universitäten, Hochschulen und anderen Bildungseinrichtungen. Das System entstand am Zentrum für interdisziplinäre Medienwissenschaft (ZiM) der Georg-August-Universität Göttingen unter Mitwirkung der Suchi & Berg GmbH (data-quest) , Göttingen. Heute erfolgt die Weiterentwicklung von Stud.IP verteilt an vielen Standorten (Göttingen, Osnabrück, Oldenburg, Bremen, Hannover, Jena und weiteren). Die Koordination der Entwicklung erfolgt durch die Stud.IP-CoreGroup.\r\n\r\nStud.IP steht unter der GNU General Public License, Version 2.\r\n\r\n\r\n\r\nWeitere Informationen finden sie auf ** [www.studip.de]http://www.studip.de **,**  [develop.studip.de]http://develop.studip.de **.[/lang]\r\n\r\n\r\n\r\n[lang=en]Stud.IP is an opensource project for supporting attendance courses offered by universities, institutions of higher education and other educational institutions. The system was established at the Zentrum für interdisziplinäre Medienwissenschaft (ZiM) in the Georg-August-Universität Göttingen in cooperation with Suchi & Berg GmbH (data-quest) , Göttingen. At the present further developing takes place at various locations (among others Göttingen, Osnabrück, Oldenburg, Bremen, Hannover, Jena) under coordination through the Stud.IP-CoreGroup.\r\n\r\n\r\n\r\nStud.IP is covered by the GNU General Public Licence, version 2.\r\n\r\n\r\n\r\nFurther information can be found under ** [www.studip.de]http://www.studip.de **,**  [develop.studip.de]http://develop.studip.de **.[/lang]\r\n\r\n\r\n\r\n(:coregroup:)\r\n\r\n[lang=de]Sie erreichen uns auch über folgende **Mailinglisten**:\r\n\r\n\r\n\r\n**Nutzer-Anfragen**, E-Mail: studip-users@lists.sourceforge.net : Fragen, Anregungen und Vorschläge an die Entwickler - bitte __keine__ Passwort Anfragen!\r\n\r\n**News-Mailingsliste**, E-Mail: studip-news@lists.sourceforge.net : News rund um Stud.IP (Eintragung notwendig)\r\n\r\n\r\n\r\nWir laden alle Entwickler, Betreiber und Nutzer von Stud.IP ein, sich auf dem Developer-Server http://develop.studip.de an den Diskussionen rund um die Weiterentwicklung und Nutzung der Plattform zu beteiligen.[/lang]\r\n\r\n[lang=en]You can contact us via the following **mailing lists**:\r\n\r\n\r\n\r\n**User enquiries**, E-Mail: studip-users@lists.sourceforge.net : Questions, suggestions and recommendations to the developers - __please no password queries__!\r\n\r\n\r\n\r\n**News mailing list**, E-Mail: studip-news@lists.sourceforge.net : News about Stud.IP (registration necessary)\r\n\r\n\r\n\r\nWe invite all developers, administrators and users of Stud.IP to join the discussions on further developing and using the platform available at the developer server http://develop.studip.de[/lang]');
-INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `name`, `content`) VALUES(5, 2, NULL, 'History', '(:history:)');
-INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `name`, `content`) VALUES(7, 1, NULL, 'Datenschutzerklärung', '++**Datenschutzerklärung**++\n\nSie erhalten als Nutzer/-in unserer Internetseite in dieser Datenschutzerklärung notwendige Informationen darüber, wie und in welchem Umfang sowie zu welchem Zweck die  **[Betreibereinrichtung]** Daten von Ihnen erhebt und wie diese verwendet werden. Die Daten werden nur innerhalb der **[Betreibereinrichtung]** verarbeitet und verwendet und nicht an Dritte weitergegeben.\n\n\n++**Rechtsgrundlagen**++\n\nDie Erhebung und Nutzung Ihrer Daten erfolgt streng nach den gesetzlichen Vorgaben. Regelungen dazu finden sich in:\nEuropäische Datenschutzgrundverordnung (EU DSGVO)\nBundesdatenschutzgesetz (BDSG)\nNiedersächsisches Datenschutzgesetz (NDSG)\nTeledienstegesetz (TDG)\nMediendienste-Staatsvertrag (MDStV)\nTeledienstedatenschutzgesetz (TDDSG).\n\n\n++**Personenbezogene Daten**++\n\nPersonenbezogene Daten werden zum Zwecke der administrativen Nutzerverwaltung, zur Kontaktaufnahme und Interaktion mit Ihnen sowie zur Bereitstellung personalisierter Dienste [zur Durchführung Ihres Studium bzw. Ihrer Arbeit an **[Betreibereinrichtung]**] von uns gespeichert.\nFür die Nutzung von Stud.IP  werden folgende Daten abgefragt und gespeichert:\n- Nutzername\n- Vorname, Nachname\n- Mailadresse\n- [ggf. weitere Daten]\n\n\nWeitere Daten, die evtl. Ihnen gespeichert werden, sind Inhalte, die Sie selbst im Rahmen Ihrer Arbeit oder Ihres Studiums in Stud.IP einstellen. Dazu gehören:\n- Freiwillige Angaben zur Person\n- Beiträge in Foren\n- hochgeladene Dateien\n- Chatverläufe in Blubber\n- interne Nachrichten\n- Kalendereinträge und Stundenpläne\n- Teilnahme an Lehrveranstaltungen, Studiengruppen, Orgagremien\n- Persönliche Einstellungen und Konfigurationen\n- [ggf. Plugindaten]\n\n\nDiese Inhalte werden mit Ihrem Klarnamen gespeichert und angezeigt. Sie haben die Möglichkeit über die Privatsphäreeinstellungen selbst zu bestimmen, ob und ggf. welche Personengruppen diese Daten sehen dürfen. Diese Daten werden von Stud.IP intern verschlüsselt abgelegt.\n\n\n++**Aufbewahrungsfristen **++\n\nIhre personenbezogenen Daten werden für die Dauer Ihres Studiums/Ihrer Arbeit bei [Beitreibereinrichtung] gespeichert. Nach Beendigung ihrer Tätigkeit und Ablauf der gesetzlichen Aufbewahrungsfristen werden Ihre Daten gelöscht.\n\n\n++**Auskunft, Löschung, Sperrung**++\n\nSie erhalten jederzeit auf Anfrage Auskunft über die von uns über Sie gespeicherten personenbezogenen Daten sowie dem Zweck von Datenerhebung sowie Datenverarbeitung. Bitte wenden Sie sich hierzu an o.g. Kontaktadresse.\n\nAußerdem haben Sie das Recht, die Berichtigung, die Sperrung oder Löschung Ihrer Daten zu verlangen. Sie können Ihre Einwilligung ohne Angabe von Gründen durch Schreiben an die o.g. Kontakadresse widerrufen. Ihre Daten werden dann umgehend gelöscht. Eine weitere Nutzung der Lernplattform Stud.IP ist dann aber nicht mehr möglich.\n\nAusgenommen von der Löschung sind Daten, die aufgrund gesetzlicher Vorschriften aufbewahrt oder zur ordnungsgemäßen Geschäftsabwicklung benötigt werden. Damit eine Datensperre jederzeit realisiert werden kann, werden Daten zu Kontrollzwecken in einer Sperrdatei vorgehalten.\n\nWerden Daten nicht von einer gesetzlichen Archivierungspflicht erfasst, löschen wir Ihre Daten auf Ihren Wunsch. Greift die Archivierungspflicht, sperren wir Ihre Daten. Für alle Fragen und Anliegen zur Berichtigung, Sperrung oder Löschung von personenbezogenen Daten wenden Sie sich bitte an unsere Datenschutzbeauftragten unter den Kontaktdaten in dieser Datenschutzerklärung bzw. an die im Impressum genannte Adresse.\n\n\n++**Datenübertragbarkeit**++\n\nSie haben das Recht, jederzeit Ihre Daten ausgehändigt zu bekommen. Auf Anfrage stellen wir Ihnen Ihre Daten in menschenlesbaren, gängigen und bearbeitbaren Formaten zur Verfügung.\n\n\n++**Cookies**++\n\nStud.IP verwendet ein Session-Cookie. Diese kleine Textdatei beinhaltet lediglich eine verschlüsselte Zeichenfolge, die bei der Navigation im System hilft. Das Cookie wird bei der Abmeldung aus Stud.IP oder beim Schließen des Browsers gelöscht.\n\n\n++**Server Logfiles**++\n\nMit dem Zugriff auf Stud.IP werden IP-Adresse, Datum, Uhrzeit und Browserversion zum Zeitpunkt des Zugriffs registriert und anonymisiert gespeichert. Die Erhebung und Nutzung dieser Log-File-Daten dient lediglich der Auswertung zu rein statistischen Forschungs- und Evaluationszwecken der Lernplattform, werden also nicht in Verbindung mit Namen oder Mailadresse gespeichert oder ausgewertet. Diese Daten werden für die Zeit von [X] Monaten auf gesicherten Systemen der **[Betreibereinrichtung]** gespeichert und ebenfalls nicht an Dritte weitergegeben.\n\n\n++**SSL-Verschlüsselung**++\n\nDie Verbindung zu Stud.IP erfolgt mit einer SSL-Verschlüsselung. Über SSL verschlüsselte Daten sind nicht von Dritten lesbar. Übermitteln Sie Ihre vertraulichen Informationen nur bei aktivierter SSL-Verschlüsselung und wenden Sie sich im Zweifel an uns.\n\n\n++Kontaktdaten:++\n**Name:**\n**Telefonnummer:**\n**E-Mail-Adresse:**\n**Unternehmensbezeichnung:**\n\n++Datenschutzbeauftragte/-r:++\n**Name:**\n**Telefonnummer:**\n**E-Mail-Adresse:**\n**Unternehmensbezeichnung:**\n\n\n');
-INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `name`, `content`) VALUES(8, 1, NULL, 'Barrierefreiheitserklärung', '<!--HTML--><p>[lang=de]</p> <h1>Mustertext Erklärung zur Barrierefreiheit für Stud.IP</h1><p>[Text in eckigen Klammern ist ggf. zu ergänzen, zu streichen oder sprachlich anzupassen, je nachdem, wie das Ergebnis der Überprüfung der Barrierefreiheit ausfällt.]</p><p>Diese Erklärung zur Barrierefreiheit gilt für die Stud.IP-Installation unter der [URL der ergänzen; bitte Version und Datum angeben] der [Betreiber der Stud.IP-Installation ergänzen].</p><p>Als öffentliche Stelle im Sinne der Richtlinie (EU) 2016/2102 sind wir bemüht, unsere Websites und mobilen Anwendungen im Einklang mit den Bestimmungen des Behindertengleichstellungsgesetzes des Bundes (BGG) sowie der Barrierefreien-Informationstechnik-Verordnung (BITV 2.0) zur Umsetzung der Richtlinie (EU) 2016/2102 barrierefrei zugänglich zu machen.</p><p>[Hier ggf. jeweilige Landesverordnung zusätzlich einfügen, z.B. für Niedersachsen <i>§ 9 NBGG.</i>]</p><h2>Stand der Vereinbarkeit mit den Anforderungen</h2><p>Die Anforderungen der Barrierefreiheit ergeben sich aus §§ 3 Absätze 1 bis 4 und 4 der BITV 2.0, die auf der Grundlage von § 12d BGG erlassen wurde.</p><p>Die Überprüfung der Einhaltung der Anforderungen beruht auf einer von Materna Information &amp; Communications SE Anfang 2022 vorgenommenen Bewertung. Maßstab der Prüfung ist die EN 301 549 und der A sowie AA Status der WCAG 2.1. Überprüft wurden die Vorgaben der WCAG 2.1 (Konformitätsstufen A und AA) anhand der 98 Prüfschritte des BITV/WCAG-Tests.</p><p>Die Überprüfung bezieht sich auf das Stud.IP-Release 5.0 [Plugins und Inhalte müssen standortspezifisch geprüft und ggf. dokumentiert/diese Erklärung angepasst werden. Bitte ggf. ergänzen.]</p><p>Diese Stud.IP-Installation ist nicht vollständig mit den für uns geltenden Vorschriften zur Barrierefreiheit vereinbar. Im Einzelnen:</p><ul><li>Überschriftenhierarchien werden auf manchen Seiten nicht vollständig eingehalten.</li><li>Für Bilder, Bedienelemente und grafische Elemente sind in manchen Fällen keine, falsche oder unzureichende Alternativen vorhanden.</li><li>Grafiken und Bedienelementen fehlen in manchen Fällen korrekte Auszeichnungen, so dass sie von Assistenzsystemen nicht richtig erfasst werden können.</li><li>Die Sprache in Alternativtexten ist teilweise in Englisch angegeben ohne das der Sprachwechsel korrekt ausgezeichnet ist.</li><li>Listeneinträge, Tabellen(-spalten) und Formulare sind teilweise nicht korrekt ausgezeichnet.</li><li>Die sichtbare Reihenfolge von Seitenelementen weicht teilweise von der Reihenfolge im Quelltext ab.</li><li>Die Mindestanforderung an Kontraste ist nicht überall erfüllt.</li><li>Die Tastatursteuerung ist nicht uneingeschränkt benutzbar.</li><li>Auf der Startseite fehlt die Bereitstellung der Erläuterungen über die Website in Leichter Sprache und in Deutscher Gebärdensprache.</li><li>&nbsp;</li></ul><p>Zudem können von Nutzerinnen und Nutzern eingestellte Inhalte, z.B. PDFs oder Videos, Barrieren aufweisen.</p><p>Stud.IP wurde in Bezug auf Barrierefreiheit überarbeitet. Folgende Maßnahmen zur Verringerung von Barrieren sind in die Releases ab Stud.IP-Version 5.1 eingeflossen:</p><ul><li>Attribute und Alternativtexte wurden hinzugefügt und korrigiert, damit Screen Reader Schaltflächen, Links, Bedienelemente und Grafiken korrekt interpretieren und passende Texte ausgeben können.</li><li>Die Hierarchien von Überschriften und Reihenfolge von Seitenelementen wurden überarbeitet/korrigiert.</li><li>Sprachauszeichnungen wurden vereinheitlicht.</li><li>Listeneinträge, Tabellen(-spalten) und Formulare wurden korrekt ausgezeichnet und sinnvoll verknüpft.</li><li>Eine Möglichkeit den Kontrast zu verändern, wurde implementiert.</li><li>Die Tastatursteuerung wurde korrigiert.</li><li>Aktionsmenüs und Akkordeonelemente wurden überarbeitet.</li><li>Die responsive Navigation wurde verbessert.</li><li>Eine Mustererklärung zur leichten Sprache soll in Stud.IP 5.5 eingehen.</li></ul><p>&nbsp;</p><p>Folgende Inhalte sind aufgrund der Absicht, ein höheres Maß an digitaler Barrierefreiheit als gesetzlich gefordert umzusetzen, realisiert:<br>[Geben Sie die jeweiligen Inhalte an]</p><h2>Datum der Erstellung bzw. der letzten Aktualisierung der Erklärung</h2><p>Diese Erklärung wurde am [09/2023] erstellt und zuletzt am [Datum] aktualisiert.</p><h2>Barrieren melden: Kontakt zu den Feedback Ansprechpartnern</h2><p>Sie möchten uns bestehende Barrieren mitteilen oder Informationen zur Umsetzung der Barrierefreiheit erfragen? Für Ihr Feedback sowie alle weiteren Informationen sprechen Sie unsere verantwortlichen Kontaktpersonen unter xxx an.</p><p>[verlinkte URL mit Namen des Feedback-Mechanismus, z. B. „Barrieren melden“ angeben. Dabei sollte der Leitfaden „Erklärung zur Barrierefreiheit“ und der Leitfaden „Feedback-Mechanismus“ beachtet werden]</p><h2>Schlichtungsverfahren</h2><p>[Nicht zutreffende Stelle streichen ggf. Stelle Ihres Bundeslandes einfügen]</p><p>Wenn auch nach Ihrem Feedback an den oben genannten Kontakt keine zufriedenstellende Lösung gefunden wurde, können Sie sich an die Schlichtungsstelle nach § 16 BGG wenden. Die Schlichtungsstelle BGG hat die Aufgabe, bei Konflikten zum Thema Barrierefreiheit zwischen Menschen mit Behinderungen und öffentlichen Stellen des Bundes eine außergerichtliche Streitbeilegung zu unterstützen. Das Schlichtungsverfahren ist kostenlos. Es muss kein Rechtsbeistand eingeschaltet werden. Weitere Informationen zum Schlichtungsverfahren und den Möglichkeiten der Antragstellung erhalten Sie unter: <a href=\"http://www.schlichtungsstelle-bgg.de/\"><u>www.schlichtungsstelle-bgg.de</u></a>.</p><p>Direkt kontaktieren können Sie die Schlichtungsstelle BGG unter <a href=\"mailto:info@schlichtungsstelle-bgg.de\"><u>info@schlichtungsstelle-bgg.de</u></a>.</p><p>(:reportbarrierlink:)[/lang]&nbsp;</p><p>[lang=en]</p><h1>Sample Text Accessibility Statement</h1><p>[Text in square brackets may need to be added, deleted, or linguistically adjusted depending on the outcome of the accessibility review].</p><p>This accessibility statement applies to the Stud.IP installation at the [add URL of; please specify version and date] of the [add operator of Stud.IP installation].</p><p>As a public body within the meaning of Directive (EU) 2016/2102, we strive to make our websites and mobile applications accessible in accordance with the provisions of the Federal Disability Equality Act (BGG) and the Barrier-Free Information Technology Ordinance (BITV 2.0) implementing Directive (EU) 2016/2102.</p><p>[Here, if necessary, insert the respective state ordinance additionally, e.g. for Lower Saxony § 9 NBGG].</p><h2>Status of compatibility with the requirements</h2><p>The accessibility requirements result from §§ 3 paragraphs 1 to 4 and 4 of BITV 2.0, which was issued on the basis of § 12d BGG.</p><p>The review of compliance with the requirements is based on</p><p>an assessment performed by Materna Information &amp; Communications SE in the beginning of 2022. The benchmark for the test is EN 301 549 and the A and AA status of WCAG 2.1. The requirements of WCAG 2.1 (conformance levels A and AA) were checked using the 98 test steps of the BITV/WCAG test.</p><p>The check refers to Stud.IP release 5.0 [Plugins and content must be checked site-specifically and documented/adapted to this statement if necessary. Please add if necessary].</p><p>This Stud.IP installation is not fully compliant with the accessibility regulations that apply to us. In detail:</p><ul><li>Heading hierarchies are not fully respected on some pages.</li><li>In some cases, there are no, incorrect or insufficient alternatives for images, control elements and graphical elements.</li><li>Graphics and control elements lack correct markup in some cases, so that they cannot be correctly detected by assistance systems.</li><li>The language in alternative texts is sometimes specified in English without the language change being correctly marked.</li><li>List entries, tables (columns) and forms are sometimes not correctly labelled.</li><li>The visible order of page elements sometimes differs from the order in the source text.</li><li>The minimum requirement for contrasts is not met everywhere.</li><li>The keyboard control is not fully usable.</li><li>The home page lacks the provision of explanations about the website in plain language and in German sign language.</li></ul><p>In addition, content posted by users, e.g. PDFs or videos, may have barriers.</p><p>Stud.IP is currently being revised with regard to accessibility. The following measures to reduce barriers are expected to be included in the release of Stud.IP 5.1 and following:</p><ul><li>Attributes and alternative texts are added and corrected so that screen readers can correctly interpret buttons, links, controls and graphics and output appropriate texts.</li><li>Heading hierarchies and page element order are revised/corrected.</li><li>Language mark-ups will be standardized.</li><li>List entries, tables (columns) and forms will be labelled correctly and linked in a meaningful way.</li><li>A possibility to change the contrast is implemented.</li><li>The keyboard control is corrected.</li><li>Action menus and accordion elements are revised.</li><li>Responsive navigation will be improved.</li><li>A sample declaration on easy language should be included in Stud.IP 5.5.</li></ul><p>&nbsp;</p><p>The following content is implemented due to the intention to implement a higher level of digital accessibility than required by law:</p><p>[Specify the respective content]</p><h2>Date of preparation or last update of the declaration</h2><p>This statement was created on [09/2021] and last updated on [date].</p><h2>Report Barriers: Contact Feedback Contacts</h2><p>Would you like to report existing barriers or request information on implementing accessibility? For your feedback as well as any further information, please contact our responsible contact persons at xxx.</p><p>[provide linked URL with name of feedback mechanism, e.g. \"Report barriers\". The \"Accessibility Statement\" guide and the \"Feedback Mechanism\" guide should be followed].</p><h2>Arbitration</h2><p>[Delete non-applicable body, if necessary insert body of your federal state].</p><p>If a satisfactory solution has not been found even after you have sent feedback to the above-mentioned contact, you can turn to the conciliation body pursuant to Section 16 BGG. The BGG conciliation body is tasked with supporting out-of-court dispute resolution in the event of conflicts on the topic of accessibility between people with disabilities and federal public agencies. The conciliation procedure is free of charge. No legal counsel needs to be involved. For more information on the conciliation process and how to submit a request, visit: www.schlichtungsstelle-bgg.de.</p><p>You can contact the BGG conciliation body directly at <a href=\"mailto:info@schlichtungsstelle-bgg.de\"><u>info@schlichtungsstelle-bgg.de</u></a>.</p><p>(:reportbarrierlink:)[/lang]</p>');
+INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `draft_status`, `page_disabled_nobody`, `name`, `content`) VALUES(1, 1, 1, 0, 0, '[lang=de]Ansprechpartner[/lang][lang=en]Contact[/lang]', '[style=float: right]\r\n[img]https://develop.studip.de/logos/logoklein.png\r\n**Version:** (:version:)\r\n[/style]\r\n[lang=de]Für diese Stud.IP-Installation ((:uniname:)) sind folgende Administratoren zuständig:[/lang]\r\n[lang=en]The following administrators are responsible for this Stud.IP installation ((:uniname:)):[/lang]\r\n(:rootlist:)\r\n[lang=de]allgemeine Anfragen wie Passwort-Anforderungen u.a. richten Sie bitte an:[/lang]\r\n[lang=en]General queries e.g., password queries, please contact:[/lang]\r\n(:unicontact:)\r\n[lang=de]Folgende Einrichtungen sind beteiligt:\r\n(Genannt werden die jeweiligen Administratoren der Einrichtungen für entsprechende Anfragen)[/lang]\r\n[lang=en]The following institutes participate:\r\n(Named are the institutes administrators responsible for the corresponding query areas)[/lang]\r\n(:adminlist:)');
+INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `draft_status`, `page_disabled_nobody`, `name`, `content`) VALUES(2, 1, 2, 0, 0, '[lang=de]Entwickler[/lang][lang=en]Developer[/lang]', '[style=float: right]\r\n\r\n[img]https://develop.studip.de/logos/logoklein.png\r\n\r\n**Version:** (:version:)\r\n\r\n[/style]\r\n\r\n[lang=de]Stud.IP ist ein Open Source Projekt zur Unterstützung von Präsenzlehre an Universitäten, Hochschulen und anderen Bildungseinrichtungen. Das System entstand am Zentrum für interdisziplinäre Medienwissenschaft (ZiM) der Georg-August-Universität Göttingen unter Mitwirkung der Suchi & Berg GmbH (data-quest) , Göttingen. Heute erfolgt die Weiterentwicklung von Stud.IP verteilt an vielen Standorten (Göttingen, Osnabrück, Oldenburg, Bremen, Hannover, Jena und weiteren). Die Koordination der Entwicklung erfolgt durch die Stud.IP-CoreGroup.\r\n\r\nStud.IP steht unter der GNU General Public License, Version 2.\r\n\r\n\r\n\r\nWeitere Informationen finden sie auf ** [www.studip.de]http://www.studip.de **,**  [develop.studip.de]http://develop.studip.de **.[/lang]\r\n\r\n\r\n\r\n[lang=en]Stud.IP is an opensource project for supporting attendance courses offered by universities, institutions of higher education and other educational institutions. The system was established at the Zentrum für interdisziplinäre Medienwissenschaft (ZiM) in the Georg-August-Universität Göttingen in cooperation with Suchi & Berg GmbH (data-quest) , Göttingen. At the present further developing takes place at various locations (among others Göttingen, Osnabrück, Oldenburg, Bremen, Hannover, Jena) under coordination through the Stud.IP-CoreGroup.\r\n\r\n\r\n\r\nStud.IP is covered by the GNU General Public Licence, version 2.\r\n\r\n\r\n\r\nFurther information can be found under ** [www.studip.de]http://www.studip.de **,**  [develop.studip.de]http://develop.studip.de **.[/lang]\r\n\r\n\r\n\r\n(:coregroup:)\r\n\r\n[lang=de]Sie erreichen uns auch über folgende **Mailinglisten**:\r\n\r\n\r\n\r\n**Nutzer-Anfragen**, E-Mail: studip-users@lists.sourceforge.net : Fragen, Anregungen und Vorschläge an die Entwickler - bitte __keine__ Passwort Anfragen!\r\n\r\n**News-Mailingsliste**, E-Mail: studip-news@lists.sourceforge.net : News rund um Stud.IP (Eintragung notwendig)\r\n\r\n\r\n\r\nWir laden alle Entwickler, Betreiber und Nutzer von Stud.IP ein, sich auf dem Developer-Server http://develop.studip.de an den Diskussionen rund um die Weiterentwicklung und Nutzung der Plattform zu beteiligen.[/lang]\r\n\r\n[lang=en]You can contact us via the following **mailing lists**:\r\n\r\n\r\n\r\n**User enquiries**, E-Mail: studip-users@lists.sourceforge.net : Questions, suggestions and recommendations to the developers - __please no password queries__!\r\n\r\n\r\n\r\n**News mailing list**, E-Mail: studip-news@lists.sourceforge.net : News about Stud.IP (registration necessary)\r\n\r\n\r\n\r\nWe invite all developers, administrators and users of Stud.IP to join the discussions on further developing and using the platform available at the developer server http://develop.studip.de[/lang]');
+INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `draft_status`, `page_disabled_nobody`, `name`, `content`) VALUES(5, 2, 1, 0, 0, 'History', '(:history:)');
+INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `draft_status`, `page_disabled_nobody`, `name`, `content`) VALUES(7, 1, 3, 0, 0, 'Datenschutzerklärung', '<!--HTML--><p>[lang=de]</p><h1><strong>Mustertext Datenschutzerklärung</strong></h1><p>Es handelt sich um einen Mustertext. Bitte passen Sie die entsprechenden Stellen in eckigen Klammern an und ergänzen, wo nötig, entsprechende Kontaktdaten/Links und streichen Unzutreffendes!</p><p>&nbsp;</p><h1><strong>Datenschutzerklärung:</strong></h1><p>Sie erhalten als Nutzer/in unserer Internetseite in dieser Datenschutzerklärung notwendige Informationen darüber, wie und in welchem Umfang sowie zu welchem Zweck die <strong>[Betreibereinrichtung]</strong> Daten von Ihnen erhebt und wie diese verwendet werden. Die Daten werden nur innerhalb der <strong>[Betreibereinrichtung]</strong> verarbeitet und verwendet und nicht an Dritte weitergegeben.&nbsp;<br><br><strong>1. Rechtsgrundlagen</strong>&nbsp;<br>Die Erhebung und Nutzung Ihrer Daten erfolgt streng nach den gesetzlichen Vorgaben. Regelungen dazu finden sich in:&nbsp;&nbsp;<br>&nbsp;</p><ul><li>Europäische Datenschutzgrundverordnung (EU DSGVO)</li><li>Bundesdatenschutzgesetz (BDSG)</li><li>Niedersächsisches Datenschutzgesetz (NDSG)</li><li>Teledienstegesetz (TDG)</li><li>Mediendienste-Staatsvertrag (MDStV)</li><li>Teledienstedatenschutzgesetz (TDDSG)</li></ul><p>&nbsp;</p><p><strong>2. Personenbezogene Daten</strong>&nbsp;<br>Personenbezogene Daten werden zum Zwecke der administrativen Nutzerverwaltung, zur Kontaktaufnahme und Interaktion mit Ihnen sowie zur Bereitstellung personalisierter Dienste <i>[zur Durchführung Ihres Studiums bzw. Ihrer Arbeit an</i> <i><strong>[Betreibereinrichtung]]</strong></i> von uns gespeichert.&nbsp;<br>Für die Nutzung von Stud.IP werden folgende Daten abgefragt und gespeichert:</p><ul><li>Nutzername</li><li>Vorname, Nachname</li><li>Mailadresse</li><li>[ggf. weitere Daten]</li></ul><p>Weitere Daten von Ihnen, die evtl. gespeichert werden, sind Inhalte, die Sie selbst im Rahmen Ihrer Arbeit selbst in Stud.IP einstellen. Dazu gehören:</p><ul><li>Freiwillige Angaben zur Person</li><li>Beiträge in Foren</li><li>hochgeladene Dateien</li><li>Chatverläufe</li><li>interne Nachrichten</li><li>Kalendereinträge und Stundenpläne</li><li>Teilnahme an Lehrveranstaltungen, Studiengruppen, Gremien</li><li>Persönliche Einstellungen und Konfigurationen</li><li>[ggf. Plugindaten]</li></ul><p>Diese Inhalte werden mit Ihrem Klarnamen gespeichert und angezeigt. Sie haben die Möglichkeit über die Privatsphäreeinstellungen selbst zu bestimmen, ob und ggf. welche Personengruppen diese Daten sehen dürfen. Diese Daten werden von Stud.IP intern verschlüsselt abgelegt.&nbsp;<br><br><br><strong>3. Aufbewahrungsfristen&nbsp;</strong>&nbsp;<br>Ihre personenbezogenen Daten werden für die Dauer Ihres Studiums/Ihrer Arbeit bei <strong>[Betreibereinrichtung]</strong> gespeichert. Nach Beendigung Ihrer Tätigkeit und Ablauf der gesetzlichen Aufbewahrungsfristen werden Ihre Daten gelöscht.</p><p><strong>4. Auskunft, Löschung, Sperrung</strong>&nbsp;<br>Sie erhalten jederzeit auf Anfrage Auskunft über die von uns über Sie gespeicherten personenbezogenen Daten sowie dem Zweck von Datenerhebung sowie Datenverarbeitung. Bitte wenden Sie sich hierzu an u.g. Kontaktadresse.&nbsp;<br><br>Außerdem haben Sie das Recht, die Berichtigung, die Sperrung oder Löschung Ihrer Daten zu verlangen. Sie können Ihre Einwilligung ohne Angabe von Gründen durch Schreiben an die o.g. Kontaktadresse widerrufen. Ihre Daten werden dann umgehend gelöscht. Eine weitere Nutzung von Stud.IP <strong>[der Betreibereinrichtung]</strong> ist dann aber nicht mehr möglich.&nbsp;<br><br>Ausgenommen von der Löschung sind Daten, die aufgrund gesetzlicher Vorschriften aufbewahrt oder zur ordnungsgemäßen Geschäftsabwicklung benötigt werden. Damit eine Datensperre jederzeit realisiert werden kann, werden Daten zu Kontrollzwecken in einer Sperrdatei vorgehalten.&nbsp;<br><br>Werden Daten nicht von einer gesetzlichen Archivierungspflicht erfasst, löschen wir Ihre Daten auf Ihren Wunsch. Greift die Archivierungspflicht, sperren wir Ihre Daten. Für alle Fragen und Anliegen zur Berichtigung, Sperrung oder Löschung von personenbezogenen Daten wenden Sie sich bitte an unsere Datenschutzbeauftragten unter den Kontaktdaten in dieser Datenschutzerklärung bzw. an die im Impressum genannte Adresse.&nbsp;<br><br><br><strong>5. Datenübertragbarkeit</strong>&nbsp;<br>Sie haben das Recht, jederzeit Ihre Daten ausgehändigt zu bekommen. Auf Anfrage stellen wir Ihnen Ihre Daten in menschenlesbaren, gängigen und bearbeitbaren Formaten zur Verfügung.&nbsp;<br><br><br><strong>6. Cookies</strong>&nbsp;<br>Stud.IP verwendet ein Session-Cookie. Diese kleine Textdatei beinhaltet lediglich eine verschlüsselte Zeichenfolge, die bei der Navigation im System hilft. Das Cookie wird bei der Abmeldung aus Stud.IP oder beim Schließen des Browsers gelöscht.&nbsp;<br><br><br><strong>7. Server Logfiles</strong>&nbsp;<br>Mit dem Zugriff auf Stud.IP werden IP-Adresse, Datum, Uhrzeit und Browserversion zum Zeitpunkt des Zugriffs registriert und anonymisiert gespeichert. Die Erhebung und Nutzung dieser Log-File-Daten dient lediglich der Auswertung zu rein statistischen Forschungs- und Evaluationszwecken der Lernplattform, werden also nicht in Verbindung mit Namen oder Mailadresse gespeichert oder ausgewertet. Diese Daten werden für die Zeit von <strong>[X]</strong> Monaten auf gesicherten Systemen der <strong>[Betreibereinrichtung]</strong> gespeichert und ebenfalls nicht an Dritte weitergegeben.&nbsp;<br><br><br><strong>8. SSL-Verschlüsselung</strong>&nbsp;<br>Die Verbindung zu Stud.IP erfolgt mit einer SSL-Verschlüsselung. Über SSL verschlüsselte Daten sind nicht von Dritten lesbar. Übermitteln Sie Ihre vertraulichen Informationen nur bei aktivierter SSL-Verschlüsselung und wenden Sie sich im Zweifel an uns.</p><p><br><strong>9. Kontaktdaten</strong></p><p><strong>[Adresse, Verantwortliche Person/ggf. Datenschutzbeauftragte/r, Mailkontakt, Telefonnummer]</strong></p><p>[/lang] [lang=en]</p><p><strong>Sample text privacy policy</strong></p><p>This is a sample text. Please adapt the relevant passages in square brackets and, where necessary, add the relevant contact details/links and delete what does not apply!</p><p><strong>Privacy policy:</strong></p><p>As a user of our website, you will receive the necessary information in this privacy policy about how and to what extent and for what purpose the <strong>[operatoring organization]</strong> collects data from you and how it is used. The data will only be processed and used within the <strong>[operating organization]</strong> and will not be passed on to third parties.</p><p><strong>1. Legal basis</strong></p><p>Your data is collected and used strictly in accordance with legal requirements. Regulations can be found in:</p><p>· European General Data Protection Regulation (EU GDPR)</p><p>· Federal Data Protection Act (BDSG)</p><p>· Lower Saxony Data Protection Act (NDSG)</p><p>· Teleservices Act (TDG)</p><p>· Interstate Media Services Treaty (MDStV)</p><p>· Teleservices Data Protection Act (TDDSG)</p><p><strong>2. Personal data</strong></p><p>Personal data is stored by us for the purpose of administrative user management, for contacting and interacting with you and for providing personalised services <i>[to carry out your studies or your work at</i> <i><strong>[operating institution]]</strong></i>.</p><p>The following data is requested and stored for the use of Stud.IP:</p><p>· User name</p><p>· First name, surname</p><p>· e-mail address</p><p>· [other data if applicable]</p><p>Other data that may be stored are contents that you yourself enter in Stud.IP as part of your work. This includes</p><p>· Voluntary personal details</p><p>· Posts in forums</p><p>· Uploaded files</p><p>· chat histories</p><p>· internal messages</p><p>· Calendar entries and timetables</p><p>· Participation in courses, study groups, committees</p><p>· Personal settings and configurations</p><p>· [Plugin data, if applicable]</p><p>This content is saved and displayed with your real name. You can use the privacy settings to determine whether and, if so, which groups of people are allowed to see this data. This data is stored internally encrypted by Stud.IP.</p><p><strong>3. Retention periods</strong></p><p>Your personal data will be stored for the duration of your studies/your work at <strong>[operating organization]</strong>. Your data will be deleted after the end of your employment and expiry of the statutory retention periods.</p><p><strong>4. Information, deletion, blocking</strong></p><p>You can request information about the personal data we have stored about you and the purpose of data collection and data processing at any time. Please use the contact address below for this purpose.</p><p>You also have the right to request the correction, blocking or deletion of your data. You can revoke your consent without giving reasons by writing to the above contact address. Your data will then be deleted immediately. However, further use of Stud.IP [the operating organization] is then no longer possible.</p><p>Excluded from the deletion are data that are stored due to legal regulations or are required for proper business transactions. To ensure that a data lock can be realised at any time, data is stored in a lock file for control purposes.</p><p>&nbsp;</p><p>If data is not covered by a statutory archiving obligation, we will delete your data at your request. If the archiving obligation applies, we will block your data. For all questions and concerns regarding the correction, blocking or deletion of personal data, please contact our data protection officer using the contact details in this privacy policy.</p><p><strong>5. Data portability</strong></p><p>You have the right to receive your data at any time. On request, we will provide you with your data in human-readable, common and editable formats.</p><p><strong>6. Cookies</strong></p><p>Stud.IP uses a session cookie. This small text file only contains an encrypted character string that helps you navigate the system. The cookie is deleted when you log out of Stud.IP or close the browser.</p><p><strong>7. Server log files</strong></p><p>When Stud.IP is accessed, the IP address, date, time and browser version at the time of access are registered and stored in anonymised form. This log file data is only collected and used for purely statistical research and evaluation purposes of the learning platform and is therefore not stored or analysed in connection with names or email addresses. This data is stored for a period of <strong>[X]</strong> months on secure systems of the <strong>[operating organization]</strong> and is also not passed on to third parties.</p><p><strong>8. SSL encryption</strong></p><p>The connection to Stud.IP is made using SSL encryption. Data encrypted via SSL cannot be read by third parties. Only transmit your confidential information if SSL encryption is activated and contact us if in doubt.</p><p><strong>9. Contact details</strong></p><p><strong>[Address, person responsible / data protection officer, email contact, telephone number]</strong></p><p>&nbsp;</p><p>[/lang]</p>');
+INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `draft_status`, `page_disabled_nobody`, `name`, `content`) VALUES(8, 1, 4, 0, 0, 'Barrierefreiheitserklärung', '<!--HTML--><p>[lang=de]</p> <h1>Mustertext Erklärung zur Barrierefreiheit für Stud.IP</h1><p>[Text in eckigen Klammern ist ggf. zu ergänzen, zu streichen oder sprachlich anzupassen, je nachdem, wie das Ergebnis der Überprüfung der Barrierefreiheit ausfällt.]</p><p>Diese Erklärung zur Barrierefreiheit gilt für die Stud.IP-Installation unter der [URL der ergänzen; bitte Version und Datum angeben] der [Betreiber der Stud.IP-Installation ergänzen].</p><p>Als öffentliche Stelle im Sinne der Richtlinie (EU) 2016/2102 sind wir bemüht, unsere Websites und mobilen Anwendungen im Einklang mit den Bestimmungen des Behindertengleichstellungsgesetzes des Bundes (BGG) sowie der Barrierefreien-Informationstechnik-Verordnung (BITV 2.0) zur Umsetzung der Richtlinie (EU) 2016/2102 barrierefrei zugänglich zu machen.</p><p>[Hier ggf. jeweilige Landesverordnung zusätzlich einfügen, z.B. für Niedersachsen <i>§ 9 NBGG.</i>]</p><h2>Stand der Vereinbarkeit mit den Anforderungen</h2><p>Die Anforderungen der Barrierefreiheit ergeben sich aus §§ 3 Absätze 1 bis 4 und 4 der BITV 2.0, die auf der Grundlage von § 12d BGG erlassen wurde.</p><p>Die Überprüfung der Einhaltung der Anforderungen beruht auf einer von Materna Information &amp; Communications SE Anfang 2022 vorgenommenen Bewertung. Maßstab der Prüfung ist die EN 301 549 und der A sowie AA Status der WCAG 2.1. Überprüft wurden die Vorgaben der WCAG 2.1 (Konformitätsstufen A und AA) anhand der 98 Prüfschritte des BITV/WCAG-Tests.</p><p>Die Überprüfung bezieht sich auf das Stud.IP-Release 5.0 [Plugins und Inhalte müssen standortspezifisch geprüft und ggf. dokumentiert/diese Erklärung angepasst werden. Bitte ggf. ergänzen.]</p><p>Diese Stud.IP-Installation ist nicht vollständig mit den für uns geltenden Vorschriften zur Barrierefreiheit vereinbar. Im Einzelnen:</p><ul><li>Überschriftenhierarchien werden auf manchen Seiten nicht vollständig eingehalten.</li><li>Für Bilder, Bedienelemente und grafische Elemente sind in manchen Fällen keine, falsche oder unzureichende Alternativen vorhanden.</li><li>Grafiken und Bedienelementen fehlen in manchen Fällen korrekte Auszeichnungen, so dass sie von Assistenzsystemen nicht richtig erfasst werden können.</li><li>Die Sprache in Alternativtexten ist teilweise in Englisch angegeben ohne das der Sprachwechsel korrekt ausgezeichnet ist.</li><li>Listeneinträge, Tabellen(-spalten) und Formulare sind teilweise nicht korrekt ausgezeichnet.</li><li>Die sichtbare Reihenfolge von Seitenelementen weicht teilweise von der Reihenfolge im Quelltext ab.</li><li>Die Mindestanforderung an Kontraste ist nicht überall erfüllt.</li><li>Die Tastatursteuerung ist nicht uneingeschränkt benutzbar.</li><li>Auf der Startseite fehlt die Bereitstellung der Erläuterungen über die Website in Leichter Sprache und in Deutscher Gebärdensprache.</li><li>&nbsp;</li></ul><p>Zudem können von Nutzerinnen und Nutzern eingestellte Inhalte, z.B. PDFs oder Videos, Barrieren aufweisen.</p><p>Stud.IP wurde in Bezug auf Barrierefreiheit überarbeitet. Folgende Maßnahmen zur Verringerung von Barrieren sind in die Releases ab Stud.IP-Version 5.1 eingeflossen:</p><ul><li>Attribute und Alternativtexte wurden hinzugefügt und korrigiert, damit Screen Reader Schaltflächen, Links, Bedienelemente und Grafiken korrekt interpretieren und passende Texte ausgeben können.</li><li>Die Hierarchien von Überschriften und Reihenfolge von Seitenelementen wurden überarbeitet/korrigiert.</li><li>Sprachauszeichnungen wurden vereinheitlicht.</li><li>Listeneinträge, Tabellen(-spalten) und Formulare wurden korrekt ausgezeichnet und sinnvoll verknüpft.</li><li>Eine Möglichkeit den Kontrast zu verändern, wurde implementiert.</li><li>Die Tastatursteuerung wurde korrigiert.</li><li>Aktionsmenüs und Akkordeonelemente wurden überarbeitet.</li><li>Die responsive Navigation wurde verbessert.</li><li>Eine Mustererklärung zur leichten Sprache soll in Stud.IP 5.5 eingehen.</li></ul><p>&nbsp;</p><p>Folgende Inhalte sind aufgrund der Absicht, ein höheres Maß an digitaler Barrierefreiheit als gesetzlich gefordert umzusetzen, realisiert:<br>[Geben Sie die jeweiligen Inhalte an]</p><h2>Datum der Erstellung bzw. der letzten Aktualisierung der Erklärung</h2><p>Diese Erklärung wurde am [09/2023] erstellt und zuletzt am [Datum] aktualisiert.</p><h2>Barrieren melden: Kontakt zu den Feedback Ansprechpartnern</h2><p>Sie möchten uns bestehende Barrieren mitteilen oder Informationen zur Umsetzung der Barrierefreiheit erfragen? Für Ihr Feedback sowie alle weiteren Informationen sprechen Sie unsere verantwortlichen Kontaktpersonen unter xxx an.</p><p>[verlinkte URL mit Namen des Feedback-Mechanismus, z. B. „Barrieren melden“ angeben. Dabei sollte der Leitfaden „Erklärung zur Barrierefreiheit“ und der Leitfaden „Feedback-Mechanismus“ beachtet werden]</p><h2>Schlichtungsverfahren</h2><p>[Nicht zutreffende Stelle streichen ggf. Stelle Ihres Bundeslandes einfügen]</p><p>Wenn auch nach Ihrem Feedback an den oben genannten Kontakt keine zufriedenstellende Lösung gefunden wurde, können Sie sich an die Schlichtungsstelle nach § 16 BGG wenden. Die Schlichtungsstelle BGG hat die Aufgabe, bei Konflikten zum Thema Barrierefreiheit zwischen Menschen mit Behinderungen und öffentlichen Stellen des Bundes eine außergerichtliche Streitbeilegung zu unterstützen. Das Schlichtungsverfahren ist kostenlos. Es muss kein Rechtsbeistand eingeschaltet werden. Weitere Informationen zum Schlichtungsverfahren und den Möglichkeiten der Antragstellung erhalten Sie unter: <a href=\"http://www.schlichtungsstelle-bgg.de/\"><u>www.schlichtungsstelle-bgg.de</u></a>.</p><p>Direkt kontaktieren können Sie die Schlichtungsstelle BGG unter <a href=\"mailto:info@schlichtungsstelle-bgg.de\"><u>info@schlichtungsstelle-bgg.de</u></a>.</p><p>(:reportbarrierlink:)[/lang]&nbsp;</p><p>[lang=en]</p><h1>Sample Text Accessibility Statement</h1><p>[Text in square brackets may need to be added, deleted, or linguistically adjusted depending on the outcome of the accessibility review].</p><p>This accessibility statement applies to the Stud.IP installation at the [add URL of; please specify version and date] of the [add operator of Stud.IP installation].</p><p>As a public body within the meaning of Directive (EU) 2016/2102, we strive to make our websites and mobile applications accessible in accordance with the provisions of the Federal Disability Equality Act (BGG) and the Barrier-Free Information Technology Ordinance (BITV 2.0) implementing Directive (EU) 2016/2102.</p><p>[Here, if necessary, insert the respective state ordinance additionally, e.g. for Lower Saxony § 9 NBGG].</p><h2>Status of compatibility with the requirements</h2><p>The accessibility requirements result from §§ 3 paragraphs 1 to 4 and 4 of BITV 2.0, which was issued on the basis of § 12d BGG.</p><p>The review of compliance with the requirements is based on</p><p>an assessment performed by Materna Information &amp; Communications SE in the beginning of 2022. The benchmark for the test is EN 301 549 and the A and AA status of WCAG 2.1. The requirements of WCAG 2.1 (conformance levels A and AA) were checked using the 98 test steps of the BITV/WCAG test.</p><p>The check refers to Stud.IP release 5.0 [Plugins and content must be checked site-specifically and documented/adapted to this statement if necessary. Please add if necessary].</p><p>This Stud.IP installation is not fully compliant with the accessibility regulations that apply to us. In detail:</p><ul><li>Heading hierarchies are not fully respected on some pages.</li><li>In some cases, there are no, incorrect or insufficient alternatives for images, control elements and graphical elements.</li><li>Graphics and control elements lack correct markup in some cases, so that they cannot be correctly detected by assistance systems.</li><li>The language in alternative texts is sometimes specified in English without the language change being correctly marked.</li><li>List entries, tables (columns) and forms are sometimes not correctly labelled.</li><li>The visible order of page elements sometimes differs from the order in the source text.</li><li>The minimum requirement for contrasts is not met everywhere.</li><li>The keyboard control is not fully usable.</li><li>The home page lacks the provision of explanations about the website in plain language and in German sign language.</li></ul><p>In addition, content posted by users, e.g. PDFs or videos, may have barriers.</p><p>Stud.IP is currently being revised with regard to accessibility. The following measures to reduce barriers are expected to be included in the release of Stud.IP 5.1 and following:</p><ul><li>Attributes and alternative texts are added and corrected so that screen readers can correctly interpret buttons, links, controls and graphics and output appropriate texts.</li><li>Heading hierarchies and page element order are revised/corrected.</li><li>Language mark-ups will be standardized.</li><li>List entries, tables (columns) and forms will be labelled correctly and linked in a meaningful way.</li><li>A possibility to change the contrast is implemented.</li><li>The keyboard control is corrected.</li><li>Action menus and accordion elements are revised.</li><li>Responsive navigation will be improved.</li><li>A sample declaration on easy language should be included in Stud.IP 5.5.</li></ul><p>&nbsp;</p><p>The following content is implemented due to the intention to implement a higher level of digital accessibility than required by law:</p><p>[Specify the respective content]</p><h2>Date of preparation or last update of the declaration</h2><p>This statement was created on [09/2021] and last updated on [date].</p><h2>Report Barriers: Contact Feedback Contacts</h2><p>Would you like to report existing barriers or request information on implementing accessibility? For your feedback as well as any further information, please contact our responsible contact persons at xxx.</p><p>[provide linked URL with name of feedback mechanism, e.g. \"Report barriers\". The \"Accessibility Statement\" guide and the \"Feedback Mechanism\" guide should be followed].</p><h2>Arbitration</h2><p>[Delete non-applicable body, if necessary insert body of your federal state].</p><p>If a satisfactory solution has not been found even after you have sent feedback to the above-mentioned contact, you can turn to the conciliation body pursuant to Section 16 BGG. The BGG conciliation body is tasked with supporting out-of-court dispute resolution in the event of conflicts on the topic of accessibility between people with disabilities and federal public agencies. The conciliation procedure is free of charge. No legal counsel needs to be involved. For more information on the conciliation process and how to submit a request, visit: www.schlichtungsstelle-bgg.de.</p><p>You can contact the BGG conciliation body directly at <a href=\"mailto:info@schlichtungsstelle-bgg.de\"><u>info@schlichtungsstelle-bgg.de</u></a>.</p><p>(:reportbarrierlink:)[/lang]</p>');
+INSERT INTO `siteinfo_details` (`detail_id`, `rubric_id`, `position`, `draft_status`, `page_disabled_nobody`, `name`, `content`) VALUES(9, 1, 5, 1, 0, 'Leichte Sprache', '++**Leichte Sprache**\n\n1) Beschreibung des Anbieters und des Zwecks der Seite\nDies sind die Internet-Seiten für Inhalte zum Lernen und Lehren von **[Einrichtung einsetzen]** .\nEine [anpassen: Universität/Hochschule/Volks-Hochschule/ oder anderes] ist ein Ort an dem man nach der normalen Schule weiter lernen kann.\nWenn man hier lernt [ggf. anpassen/arbeitet/eine Ausbildung macht] oder als Lehrer arbeitet, bekommt man Anmelde-Daten.\nWenn man angemeldet ist, findet man Material zum Unterricht.\nAußerdem kann man seinen Kalender und Stundenplan sehen.\nMan kann mit anderen Nachrichten schreiben.\n\n2) Hinweise zur Navigation\nUm sich anzumelden, braucht man einen Benutzer-Namen und ein Passwort.\nBenutzer-Name und Passwort bekommt man von **[Name bzw. Einrichtung angeben].**\nMan meldet sich in dem Kasten an, wo Login steht.\nHilfe bei der Anmeldung findet man [Link von Einrichtung einzusetzen oder Text von Einrichtung zu ergänzen].\n[Falls auf der Startseite vorhanden:\nHilfe gibt es oben rechts [ggf. anpassen] bei dem Fragezeichen.\nGanz unten bei Impressum findet man Angaben dazu, wer die Seite gemacht hat.\nGanz unten bei Datenschutz steht, welche Daten von Besuchern der Seite verwendet werden.\nGanz unten kann man unter Barriere melden sich beschweren, wenn man die Seite nicht bedienen kann.\n\n3) Erläuterung der wesentlichen Inhalte der Erklärung zur Barrierefreiheit\n[Je nach Standort sind ggf. die Gesetzesstellen und Behörden anzupassen.]\n\nErklärung zur Barriere-Freiheit in leichter Sprache\nDie [Betreibername einsetzen] ist für Barriere-Freiheit im Internet.\nDas bedeutet: Alle Menschen bekommen alle wichtigen Infos.\nZum Beispiel können blinde Menschen Vorlese-Programme nutzen.\n\nDie [Betreibername einsetzen] beachtet die Vorschriften.\nDazu ist man gesetzlich verpflichtet.\n\nDas sind:\n- das Behinderten-Gleichstellungs-Gesetz (BGG)\n- Verordnung zur Schaffung barrierefreier Informations-Technik nach dem Behinderten-Gleichstellungs-Gesetz (BITV)\n- das Behinderten-Gleichstellungs-Gesetz des [Bundesland oder Bund einfügen]\n\n[Da es Pflicht ist, auf bekannte Barrieren hinzuweisen, sind diese hier vom jeweiligen Betreiber zusammenzufassen und in leichter Sprache zu erläutern.\nIn etwa:\n- Auf manchen Seiten sind die Überschriften ein bisschen durcheinander. Zum Beispiel: Da steht was unten mit kleinen Buchstaben. Das müsste aber oben mit größeren Buchstaben stehen.\n- Manche Sachen werden so vorgelesen, dass blinde Menschen sie schlecht verstehen. Sie sehen das ja nicht.\n…]\n\nSind Sie nicht zufrieden?\nHaben Sie eine Barriere gefunden?\nSie können uns schreiben.\n**Hier ist ein Formular:**\n[jeweiliges Barriere-melden-Formular am Standort verlinken]\n\n**Hier ist unsere Adresse:**\n[Adresse einfügen]\n\n**Sie können uns anrufen:**\n[Telefonnummer einfügen]\n\nEs gibt die **Schlichtungs-Stelle.**\n\n**Schlichtung** bedeutet:\n- Sich einigen.\n- Sich vertragen.\nDie Schlichtungs-Stelle **hilft bei einem Streit.**\n\nZum Beispiel:\n1. Es gibt eine Barriere bei der [Einrichtung einfügen] auf den Internet-Seiten.\n2. Sie haben sich darüber beschwert.\n3. Die Barriere bleibt aber.\n\nJetzt kann die **Schlichtungs-Stelle helfen.**\nDer Streit muss dann nicht vor ein Gericht.\nBeide Seiten sollen sich vertragen.\nSie können eine **Schlichtung beantragen.**\n\nZum Beispiel:\nSie sind mit einer Antwort von [Einrichtung einfügen] zur Barriere-Freiheit nicht zufrieden.\n\nEine **Schlichtung** kostet nichts.\nSie brauchen **keinen Anwalt.**\nSie können den **Antrag in Leichter Sprache oder in Deutscher Gebärden-Sprache** stellen.\n\n**Hier gibt es weitere Informationen:**\n[Idealerweise Link auf jeweilige Schlichtungsstelle und deren Informationen in leichter Sprache einfügen]\n\n**Hier ist die Adresse der Schlichtungs-Stelle:**\n[jeweils zuständige Stelle einfügen]\n\n**Hier ist die Telefonnummer:**\n[Telefonnummer einfügen]\n\n4) Hinweise auf weitere in diesem Auftritt vorhandene Informationen in Deutscher Gebärdensprache und in Leichter Sprache\n\n[So weitere Hinweise in Leichter Sprache oder Gebärdensprache vorhanden sind, muss auf die entsprechenden Orte verwiesen werden.]\nHier finden Sie weitere Hinweise in Leichter Sprache: [Link einfügen]\nOder:\nEs sind keine weiteren Informationen auf diesen Seiten in leichter oder Gebärden-Sprache enthalten.++\n');
 
 INSERT INTO `siteinfo_rubrics` (`rubric_id`, `position`, `name`) VALUES(1, NULL, '[lang=de]Kontakt[/lang][lang=en]Contact[/lang]');
 INSERT INTO `siteinfo_rubrics` (`rubric_id`, `position`, `name`) VALUES(2, NULL, '[lang=de]Über Stud.IP[/lang][lang=en]About Stud.IP[/lang]');
diff --git a/db/studip_demo_data.sql b/db/studip_demo_data.sql
index 672ace2..7c0a571 100644
--- a/db/studip_demo_data.sql
+++ b/db/studip_demo_data.sql
@@ -9,11 +9,12 @@ REPLACE INTO `abschluss` (`abschluss_id`, `name`, `name_kurz`, `beschreibung`, `
 -- Daten für Tabelle `auth_user_md5`
 --
 
-REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`) VALUES('76ed43ef286fb55cf9e41beadb484a9f', 'root@studip', '$2a$08$SRoCYxAhWPFVF8V8CO15TOyzr.PpLRfVD9lVWVrmmBw4brkRTE/2G', 'root', 'Root', 'Studip', 'root@localhost', '', 'standard', 0, NULL, NULL, 'unknown');
-REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`) VALUES('205f3efb7997a0fc9755da2b535038da', 'test_dozent', '$2a$08$ajIvgEjd17MiiDcFr6msc.xldknH/tTGajUXVhDxDKNJVX0H0iv0i', 'dozent', 'Testaccount', 'Dozent', 'dozent@studip.de', '', 'standard', 0, NULL, NULL, 'unknown');
-REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`) VALUES('6235c46eb9e962866ebdceece739ace5', 'test_admin', '$2a$08$svvSma20vIxIR4J5gc0jIu31gws1WibmiQ/HDhCTukFA5GqhscY1G', 'admin', 'Testaccount', 'Admin', 'admin@studip.de', '', 'standard', 0, NULL, NULL, 'unknown');
-REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`) VALUES('7e81ec247c151c02ffd479511e24cc03', 'test_tutor', '$2a$08$mGhBl85TPsiItumZ4xjbgOnQ1vqIhLAC9giCfWcFzpkE1jqe4lmby', 'tutor', 'Testaccount', 'Tutor', 'tutor@studip.de', '', 'standard', 0, NULL, NULL, 'unknown');
-REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`) VALUES('e7a0a84b161f3e8c09b4a0a2e8a58147', 'test_autor', '$2a$08$xvbrvPhkcsvkzPZsNh.kceLw2IIwiNJ.1jGOwY3.H/dR2f8PG5X3O', 'autor', 'Testaccount', 'Autor', 'autor@studip.de', '', 'standard', 0, NULL, NULL, 'unknown');
+REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`, `matriculation_number`) VALUES('205f3efb7997a0fc9755da2b535038da', 'test_dozent', 0x24326124303824616a497667456a6431374d696944634672366d73632e786c646b6e482f745447616a555856684478444b4e4a565830483069763069, 'dozent', 'Testaccount', 'Dozent', 'dozent@studip.de', '', 'standard', 0, NULL, NULL, 'unknown', NULL);
+REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`, `matriculation_number`) VALUES('6235c46eb9e962866ebdceece739ace5', 'test_admin', 0x24326124303824737676536d6132307649784952344a356763306a49753331677773315769626d69512f4844684354756b4641354771687363593147, 'admin', 'Testaccount', 'Admin', 'admin@studip.de', '', 'standard', 0, NULL, NULL, 'unknown', NULL);
+REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`, `matriculation_number`) VALUES('76ed43ef286fb55cf9e41beadb484a9f', 'root@studip', 0x2432612430382453526f43597841685750465646385638434f3135544f797a722e50704c52665644396c565756726d6d42773462726b5254452f3247, 'root', 'Root', 'Studip', 'root@localhost', '', 'standard', 0, NULL, NULL, 'yes', NULL);
+REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`, `matriculation_number`) VALUES('7e81ec247c151c02ffd479511e24cc03', 'test_tutor', 0x243261243038246d4768426c3835545073694974756d5a34786a62674f6e5131767149684c414339676943665763467a706b45316a7165346c6d6279, 'tutor', 'Testaccount', 'Tutor', 'tutor@studip.de', '', 'standard', 0, NULL, NULL, 'unknown', NULL);
+REPLACE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`, `matriculation_number`) VALUES('e7a0a84b161f3e8c09b4a0a2e8a58147', 'test_autor', 0x24326124303824787662727650686b6373766b7a505a734e682e6b63654c7732494977694e4a2e316a474f7759332e482f645232663850473558334f, 'autor', 'Testaccount', 'Autor', 'autor@studip.de', '', 'standard', 0, NULL, NULL, 'unknown', '1234567');
+
 
 --
 -- Daten für Tabelle `config_values`
@@ -23,15 +24,6 @@ REPLACE INTO `config_values` (`field`, `range_id`, `value`, `mkdate`, `chdate`,
 REPLACE INTO `config_values` (`field`, `range_id`, `value`, `mkdate`, `chdate`, `comment`) VALUES('STUDYGROUP_DEFAULT_INST', 'studip', 'ec2e364b28357106c0f8c282733dbe56', 1268739461, 1268739461, '');
 REPLACE INTO `config_values` (`field`, `range_id`, `value`, `mkdate`, `chdate`, `comment`) VALUES('STUDYGROUP_TERMS', 'studip', 'Mir ist bekannt, dass ich die Gruppe nicht zu rechtswidrigen Zwecken nutzen darf. Dazu zählen u.a. Urheberrechtsverletzungen, Beleidigungen und andere Persönlichkeitsdelikte.\r\n\r\nIch erkläre mich damit einverstanden, dass Administratorinnen und Administratoren die Inhalte der Gruppe zu Kontrollzwecken einsehen dürfen.', 1268739461, 1268739461, '');
 
---
--- Daten für Tabelle `datafields`
---
-
-REPLACE INTO `datafields` (`datafield_id`, `name`, `object_type`, `object_class`, `edit_perms`, `view_perms`, `priority`, `mkdate`, `chdate`, `type`, `typeparam`, `is_required`, `default_value`, `is_userfilter`, `description`, `system`) VALUES('ce73a10d07b3bb13c0132d363549efda', 'Matrikelnummer', 'user', '7', 'user', 'dozent', 0, NULL, NULL, 'textline', '', 0, NULL, 0, '', 0);
-
-REPLACE INTO `datafields_entries` (`datafield_id`, `range_id`, `content`, `mkdate`, `chdate`, `sec_range_id`, `lang`) VALUES('ce73a10d07b3bb13c0132d363549efda', 'e7a0a84b161f3e8c09b4a0a2e8a58147', '1234567', 1530292487, 1530292487, '', '');
-
-
 
 --
 -- Dumping data for table `fach`
@@ -56,7 +48,7 @@ REPLACE INTO `file_refs` (`id`, `file_id`, `folder_id`, `downloads`, `descriptio
 -- Dumping data for table `folders`
 --
 
-REPLACE INTO `folders` (`id`, `user_id`, `parent_id`, `range_id`, `range_type`, `folder_type`, `name`, `data_content`, `description`, `mkdate`, `chdate`) VALUES('012cb91a42cf85e5fafdd84e54ed2ec3', '76ed43ef286fb55cf9e41beadb484a9f', 'f7fc5ae64d2c453daa9619a820a6467e', 'a07535cf2f8a72df33c12ddfa4b53dde', 'course', 'CourseDateFolder', '15. Klausur am Do., 21.02.2019, 12:00 - 14:00', '{\"termin_id\":\"9ff59e18112a686c553412761a5df85c\",\"permission\":5}', '', 1543859055, 1543859055);
+REPLACE INTO `folders` (`id`, `user_id`, `parent_id`, `range_id`, `range_type`, `folder_type`, `name`, `data_content`, `description`, `mkdate`, `chdate`) VALUES('012cb91a42cf85e5fafdd84e54ed2ec3', '76ed43ef286fb55cf9e41beadb484a9f', 'f7fc5ae64d2c453daa9619a820a6467e', 'a07535cf2f8a72df33c12ddfa4b53dde', 'course', 'CourseDateFolder', '15. Klausur am Sa., 15.02.2025, 11:00 - 12:30', '{\"termin_id\":\"86de155d92a8f2da7ed6cd8ed9c08d71\",\"permission\":5}', '', 1543859055, 1543859055);
 REPLACE INTO `folders` (`id`, `user_id`, `parent_id`, `range_id`, `range_type`, `folder_type`, `name`, `data_content`, `description`, `mkdate`, `chdate`) VALUES('3cc9006789bceef5d3ea7bed680790b4', '76ed43ef286fb55cf9e41beadb484a9f', '', '110ce78ffefaf1e5f167cd7019b728bf', 'institute', 'RootFolder', 'externe Einrichtung B', '', '', 1510849315, 1510849315);
 REPLACE INTO `folders` (`id`, `user_id`, `parent_id`, `range_id`, `range_type`, `folder_type`, `name`, `data_content`, `description`, `mkdate`, `chdate`) VALUES('694cdcef09c2b8e70a7313b028e36fb6', '', '3cc9006789bceef5d3ea7bed680790b4', '110ce78ffefaf1e5f167cd7019b728bf', 'institute', 'StandardFolder', 'Allgemeiner Dateiordner', '', 'Ablage für allgemeine Ordner und Dokumente der Einrichtung', 1156516698, 1156516698);
 REPLACE INTO `folders` (`id`, `user_id`, `parent_id`, `range_id`, `range_type`, `folder_type`, `name`, `data_content`, `description`, `mkdate`, `chdate`) VALUES('76b822dcc7f1458ae6e144c3c0fb544e', '76ed43ef286fb55cf9e41beadb484a9f', '', 'ec2e364b28357106c0f8c282733dbe56', 'institute', 'RootFolder', 'externe Bildungseinrichtungen', '', '', 1510849315, 1510849315);
@@ -162,7 +154,7 @@ REPLACE INTO `semester_courses` (`semester_id`, `course_id`, `mkdate`, `chdate`)
 --
 
 REPLACE INTO `seminare` (`Seminar_id`, `VeranstaltungsNummer`, `Institut_id`, `Name`, `Untertitel`, `status`, `Beschreibung`, `Ort`, `Sonstiges`, `Lesezugriff`, `Schreibzugriff`, `start_time`, `duration_time`, `art`, `teilnehmer`, `vorrausetzungen`, `lernorga`, `leistungsnachweis`, `mkdate`, `chdate`, `ects`, `admission_turnout`, `admission_binding`, `admission_prelim`, `admission_prelim_txt`, `admission_disable_waitlist`, `visible`, `showscore`, `aux_lock_rule`, `aux_lock_rule_forced`, `lock_rule`, `admission_waitlist_max`, `admission_disable_waitlist_move`, `completion`, `parent_course`) VALUES('7cb72dab1bf896a0b55c6aa7a70a3a86', '', 'ec2e364b28357106c0f8c282733dbe56', 'Test Studiengruppe', '', 99, 'Studiengruppen sind eine einfache Möglichkeit, mit KommilitonInnen, KollegInnen und anderen zusammenzuarbeiten.', '', '', 1, 1, 1680300000, -1, '', '', '', '', '', 1268739824, 1607705186, '', 0, 0, 0, '', 0, 1, 0, NULL, 0, NULL, 0, 0, 0, NULL);
-REPLACE INTO `seminare` (`Seminar_id`, `VeranstaltungsNummer`, `Institut_id`, `Name`, `Untertitel`, `status`, `Beschreibung`, `Ort`, `Sonstiges`, `Lesezugriff`, `Schreibzugriff`, `start_time`, `duration_time`, `art`, `teilnehmer`, `vorrausetzungen`, `lernorga`, `leistungsnachweis`, `mkdate`, `chdate`, `ects`, `admission_turnout`, `admission_binding`, `admission_prelim`, `admission_prelim_txt`, `admission_disable_waitlist`, `visible`, `showscore`, `aux_lock_rule`, `aux_lock_rule_forced`, `lock_rule`, `admission_waitlist_max`, `admission_disable_waitlist_move`, `completion`, `parent_course`) VALUES('a07535cf2f8a72df33c12ddfa4b53dde', '12345', '2560f7c7674942a7dce8eeb238e15d93', 'Test Lehrveranstaltung', 'eine normale Lehrveranstaltung', 1, '', '', '', 1, 1, 1696111200, 0, '', 'für alle Studierenden', 'abgeschlossenes Grundstudium', 'Referate in Gruppenarbeit', 'Klausur', 1343924407, 1641229951, '4', 0, 0, 0, '', 0, 1, 0, NULL, 0, NULL, 0, 0, 0, NULL);
+REPLACE INTO `seminare` (`Seminar_id`, `VeranstaltungsNummer`, `Institut_id`, `Name`, `Untertitel`, `status`, `Beschreibung`, `Ort`, `Sonstiges`, `Lesezugriff`, `Schreibzugriff`, `start_time`, `duration_time`, `art`, `teilnehmer`, `vorrausetzungen`, `lernorga`, `leistungsnachweis`, `mkdate`, `chdate`, `ects`, `admission_turnout`, `admission_binding`, `admission_prelim`, `admission_prelim_txt`, `admission_disable_waitlist`, `visible`, `showscore`, `aux_lock_rule`, `aux_lock_rule_forced`, `lock_rule`, `admission_waitlist_max`, `admission_disable_waitlist_move`, `completion`, `parent_course`) VALUES('a07535cf2f8a72df33c12ddfa4b53dde', '12345', '2560f7c7674942a7dce8eeb238e15d93', 'Test Lehrveranstaltung', 'eine normale Lehrveranstaltung', 1, '', '', '', 1, 1, 1727733600, 0, '', 'für alle Studierenden', 'abgeschlossenes Grundstudium', 'Referate in Gruppenarbeit', 'Klausur', 1343924407, 1716388347, '4', 0, 0, 0, '', 0, 1, 0, NULL, 0, NULL, 0, 0, 0, NULL);
 
 --
 -- Dumping data for table `seminar_cycle_dates`
@@ -227,28 +219,30 @@ REPLACE INTO `statusgruppe_user` (`statusgruppe_id`, `user_id`, `position`, `vis
 
 --
 -- Dumping data for table `termine`
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('005be9fa51cae40cb7864420ef20cc21', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1700467200, 1700474400, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('04907423f4fecaf2326bde7d595e3fa6', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1706515200, 1706522400, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('0a32d2bb1d24c471fd62d2f542fee471', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1701676800, 1701684000, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('3b74ff2f7ce0964146a90b3d723ee594', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1702281600, 1702288800, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('68985894e2389e16c9922f28bc88447b', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1704700800, 1704708000, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('86de155d92a8f2da7ed6cd8ed9c08d71', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1707991200, 1707996600, 1698856983, 1698856983, 3, '', NULL);
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('8c145ae92eef055db022e79df007af19', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1705305600, 1705312800, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('953ce88c783cbc921f82e41e4af7a6af', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1702886400, 1702893600, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('ab8e1dca6db2eb7dec5a2c99af8338ec', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1699257600, 1699264800, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('afde51cfbc49f0e5fcd8be6bd32cc1d1', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1698652800, 1698660000, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('ba543c308e144270c44406288393c041', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1699862400, 1699869600, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('bb87ee9eb1711bf15d84e3814c1cd4ce', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1707120000, 1707127200, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('dfaef63fdf5d7b7349190b5ae131463e', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1701072000, 1701079200, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('f08b3ef4fe781e7e32d3153832ca5e21', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1698044400, 1698051600, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
-REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('fe11571844e66b495fc12114b48ec161', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1705910400, 1705917600, 1698856934, 1698857418, 1, '', 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('1199f2c43a6ddcd05fd61456e6ac1451', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1736755200, 1736762400, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('132eec0a28623f5afde092a6960e45f4', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1736150400, 1736157600, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('13bf7a5cd577bcba5bff88d46512baad', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1732521600, 1732528800, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('221bb1927fcd93fab3ec7dde7c6b3cce', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1734336000, 1734343200, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('4f47c3d25eca9ab8fb2a1644209074ae', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1733126400, 1733133600, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('5f87ebde55d5527ceb27ccd6dcd9f66e', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1733731200, 1733738400, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('60b4659f960ef05807cbaea6368158aa', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1730707200, 1730714400, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('749e52b43a4fe025442f355779489a9d', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1729494000, 1729501200, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('7aaa9681da31192e49eaa63a4cef3dfb', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1737360000, 1737367200, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('7ec82c654e1b41819cd476ec72e77a76', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1730102400, 1730109600, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('86de155d92a8f2da7ed6cd8ed9c08d71', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1739613600, 1739619000, 1698856983, 1716388379, 3, '', NULL);
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('a8f402ada308f68d5f24374923d25580', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1737964800, 1737972000, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('be1ad3a4bc5c933d4bfbaa2b313d3ab5', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1738569600, 1738576800, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('c729ae36a1503f471a407802e8f72cec', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1731916800, 1731924000, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+REPLACE INTO `termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`) VALUES('e8212b6e58109ae94ad2a31796c4a520', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1731312000, 1731319200, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1');
+
 
 --
 -- Daten für Tabelle `ex_termine`
 --
 
-REPLACE INTO `ex_termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`, `resource_id`) VALUES('3887db95c939fc701fddc2f906a87287', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1704096000, 1704103200, 1698856934, 1698856934, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1', '');
-REPLACE INTO `ex_termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`, `resource_id`) VALUES('d1f461421c4357b55bbfd6b16a6d1c81', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1703491200, 1703498400, 1698856934, 1698856934, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1', '');
+REPLACE INTO `ex_termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`, `resource_id`) VALUES('1bd10ae335fd2c499ad701e49a2b52cb', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1734940800, 1734948000, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1', '');
+REPLACE INTO `ex_termine` (`termin_id`, `range_id`, `autor_id`, `content`, `date`, `end_time`, `mkdate`, `chdate`, `date_typ`, `raum`, `metadate_id`, `resource_id`) VALUES('4b4657a993609ac0f7d4a0183507a5a2', 'a07535cf2f8a72df33c12ddfa4b53dde', '76ed43ef286fb55cf9e41beadb484a9f', '', 1735545600, 1735552800, 1716388347, 1716388347, 1, NULL, 'fc3c44f257e448e3cd36a88406a8a9c1', '');
+
 
 --
 -- Daten für Tabelle `user_info`
diff --git a/db/studip_resources_default_data.sql b/db/studip_resources_default_data.sql
index 5f7adc0..a249ac1 100644
--- a/db/studip_resources_default_data.sql
+++ b/db/studip_resources_default_data.sql
@@ -61,3 +61,4 @@ INSERT INTO `resource_property_definitions` (`property_id`, `name`, `description
 INSERT INTO `resource_property_definitions` (`property_id`, `name`, `description`, `type`, `options`, `system`, `info_label`, `display_name`, `searchable`, `range_search`, `write_permission_level`, `property_group_id`, `property_group_pos`, `mkdate`, `chdate`) VALUES('afb8675e2257c03098aa34b2893ba686', 'has_computer', '', 'bool', 'vorhanden', 1, 0, 'Dozentenrechner', 1, 0, 'admin-global', NULL, NULL, 0, 0);
 INSERT INTO `resource_property_definitions` (`property_id`, `name`, `description`, `type`, `options`, `system`, `info_label`, `display_name`, `searchable`, `range_search`, `write_permission_level`, `property_group_id`, `property_group_pos`, `mkdate`, `chdate`) VALUES('b79b77f40706ed598f5403f953c1f791', 'accessible', '', 'bool', 'vorhanden', 1, 0, 'behindertengerecht', 1, 0, 'admin-global', NULL, NULL, 0, 0);
 INSERT INTO `resource_property_definitions` (`property_id`, `name`, `description`, `type`, `options`, `system`, `info_label`, `display_name`, `searchable`, `range_search`, `write_permission_level`, `property_group_id`, `property_group_pos`, `mkdate`, `chdate`) VALUES('c4f13691419a6c12d38ad83daa926c7c', 'address', '', 'text', '', 1, 0, 'Adresse', 0, 0, 'admin-global', NULL, NULL, 0, 0);
+
diff --git a/db/studip_resources_demo_data.sql b/db/studip_resources_demo_data.sql
index e9e2ecb..54ecee5 100644
--- a/db/studip_resources_demo_data.sql
+++ b/db/studip_resources_demo_data.sql
@@ -34,39 +34,41 @@ REPLACE INTO `resources` (`id`, `parent_id`, `category_id`, `level`, `name`, `de
 -- Dumping data for table `resource_bookings`
 --
 
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('09fe718f2b03958790c175c22b9ead30', '728f1578de643fb08b32b4b8afb2db77', 'bb87ee9eb1711bf15d84e3814c1cd4ce', '', 1707120000, 1707127200, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('308995121c82d01691e3dc9a920257d8', '728f1578de643fb08b32b4b8afb2db77', 'ba543c308e144270c44406288393c041', '', 1699862400, 1699869600, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('386690efb8f4c1d892f9c24123264229', '728f1578de643fb08b32b4b8afb2db77', 'dfaef63fdf5d7b7349190b5ae131463e', '', 1701072000, 1701079200, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('41ed2b95b0b6d86db1a48ddf8eee8f6d', '728f1578de643fb08b32b4b8afb2db77', '8c145ae92eef055db022e79df007af19', '', 1705305600, 1705312800, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('61422bd079e18a365c9b170e28289eca', '728f1578de643fb08b32b4b8afb2db77', '953ce88c783cbc921f82e41e4af7a6af', '', 1702886400, 1702893600, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('7ea453895c4dd2b0ac791ef14d91c601', '728f1578de643fb08b32b4b8afb2db77', '0a32d2bb1d24c471fd62d2f542fee471', '', 1701676800, 1701684000, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('8b0a5177c0ebdf2116d71f077a9da1dd', '728f1578de643fb08b32b4b8afb2db77', '3b74ff2f7ce0964146a90b3d723ee594', '', 1702281600, 1702288800, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('a2960560876542106dddf761add7c4ba', '728f1578de643fb08b32b4b8afb2db77', '04907423f4fecaf2326bde7d595e3fa6', '', 1706515200, 1706522400, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('aac383acadc20d7019bd12c3436540d8', '728f1578de643fb08b32b4b8afb2db77', 'fe11571844e66b495fc12114b48ec161', '', 1705910400, 1705917600, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('b9063c4e391e0ca22f9df2c26f7325bf', '728f1578de643fb08b32b4b8afb2db77', '005be9fa51cae40cb7864420ef20cc21', '', 1700467200, 1700474400, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('bc4de36334c1e3bc04d1ed438f713f7a', '728f1578de643fb08b32b4b8afb2db77', 'ab8e1dca6db2eb7dec5a2c99af8338ec', '', 1699257600, 1699264800, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('d1cf3828b5cbfb567a23ebc925818e8d', '728f1578de643fb08b32b4b8afb2db77', '68985894e2389e16c9922f28bc88447b', '', 1704700800, 1704708000, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('f03962407e755a182d79725663c065c8', '728f1578de643fb08b32b4b8afb2db77', 'afde51cfbc49f0e5fcd8be6bd32cc1d1', '', 1698652800, 1698660000, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
-REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('f9347670839cbf98d8351e55ebc80a00', '728f1578de643fb08b32b4b8afb2db77', 'f08b3ef4fe781e7e32d3153832ca5e21', '', 1698044400, 1698051600, NULL, 1698857418, 1698857418, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('06a133ec2958178551ee6b48957058b6', '728f1578de643fb08b32b4b8afb2db77', '221bb1927fcd93fab3ec7dde7c6b3cce', '', 1734336000, 1734343200, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('2a251bfb01a99e533b3bbc841fc02ca7', '728f1578de643fb08b32b4b8afb2db77', '5f87ebde55d5527ceb27ccd6dcd9f66e', '', 1733731200, 1733738400, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('413cca32dbe8c3499ae1b7dae46b6e77', '728f1578de643fb08b32b4b8afb2db77', '7ec82c654e1b41819cd476ec72e77a76', '', 1730102400, 1730109600, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('4effa9b74ecbe244bac766e6256a361c', '728f1578de643fb08b32b4b8afb2db77', '132eec0a28623f5afde092a6960e45f4', '', 1736150400, 1736157600, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('577b04b04575ce3a60328cf97ff801c8', '728f1578de643fb08b32b4b8afb2db77', '60b4659f960ef05807cbaea6368158aa', '', 1730707200, 1730714400, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('6cb4d34009cee46357a98006ef824930', '728f1578de643fb08b32b4b8afb2db77', '13bf7a5cd577bcba5bff88d46512baad', '', 1732521600, 1732528800, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('9e55f071dc674f92ef7c0032bdc623f4', '728f1578de643fb08b32b4b8afb2db77', '4f47c3d25eca9ab8fb2a1644209074ae', '', 1733126400, 1733133600, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('a01a39e448aa6dbab5dd5dffaae78926', '728f1578de643fb08b32b4b8afb2db77', 'be1ad3a4bc5c933d4bfbaa2b313d3ab5', '', 1738569600, 1738576800, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('a672b97ead875ef080706c6f6da33a44', '728f1578de643fb08b32b4b8afb2db77', 'c729ae36a1503f471a407802e8f72cec', '', 1731916800, 1731924000, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('aec837593cbd51d21d58b97e9af9ba19', '728f1578de643fb08b32b4b8afb2db77', '7aaa9681da31192e49eaa63a4cef3dfb', '', 1737360000, 1737367200, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('bd9806b968f39178225603cb6812f2b0', '728f1578de643fb08b32b4b8afb2db77', '749e52b43a4fe025442f355779489a9d', '', 1729494000, 1729501200, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('cde83098d29a75de33e76a71b8a71a21', '728f1578de643fb08b32b4b8afb2db77', '1199f2c43a6ddcd05fd61456e6ac1451', '', 1736755200, 1736762400, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('e70aaf4655d2de64852b2212b04a0e67', '728f1578de643fb08b32b4b8afb2db77', 'a8f402ada308f68d5f24374923d25580', '', 1737964800, 1737972000, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+REPLACE INTO `resource_bookings` (`id`, `resource_id`, `range_id`, `description`, `begin`, `end`, `repeat_end`, `mkdate`, `chdate`, `internal_comment`, `preparation_time`, `booking_type`, `booking_user_id`, `repetition_interval`) VALUES('ed37afe9ff2d96c489d5cf6e2b4fba80', '728f1578de643fb08b32b4b8afb2db77', 'e8212b6e58109ae94ad2a31796c4a520', '', 1731312000, 1731319200, NULL, 1716456982, 1716456982, '', 0, 0, '76ed43ef286fb55cf9e41beadb484a9f', '');
+
 
 --
 -- Dumping data for table `resource_booking_intervals`
 --
 
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('00aa3e6189e3d2a88698902eddd886e6', '728f1578de643fb08b32b4b8afb2db77', 'f03962407e755a182d79725663c065c8', 1698652800, 1698660000, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('23ceb8ae093abf4b800f6a6428fb26c7', '728f1578de643fb08b32b4b8afb2db77', '308995121c82d01691e3dc9a920257d8', 1699862400, 1699869600, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('26410654a334c4bf611ef284d319fae0', '728f1578de643fb08b32b4b8afb2db77', '41ed2b95b0b6d86db1a48ddf8eee8f6d', 1705305600, 1705312800, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('2b08833600e7f62dd64c1088e239acad', '728f1578de643fb08b32b4b8afb2db77', 'f9347670839cbf98d8351e55ebc80a00', 1698044400, 1698051600, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('4cb9c7ebd8d2b8f9dd8edf7d7efee689', '728f1578de643fb08b32b4b8afb2db77', '8b0a5177c0ebdf2116d71f077a9da1dd', 1702281600, 1702288800, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('5c4d0760b3eeb38940922b2e6e1dc501', '728f1578de643fb08b32b4b8afb2db77', '61422bd079e18a365c9b170e28289eca', 1702886400, 1702893600, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('7fa0f8495e920486ce023f1edf27d63d', '728f1578de643fb08b32b4b8afb2db77', 'b9063c4e391e0ca22f9df2c26f7325bf', 1700467200, 1700474400, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('9e046c83f532548b28dcf63c6a0972ab', '728f1578de643fb08b32b4b8afb2db77', '7ea453895c4dd2b0ac791ef14d91c601', 1701676800, 1701684000, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('a63c9ef59a074de9b6c81fcd7a302f1a', '728f1578de643fb08b32b4b8afb2db77', '09fe718f2b03958790c175c22b9ead30', 1707120000, 1707127200, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('b2fbaebbb83524970b728734c1fc06cf', '728f1578de643fb08b32b4b8afb2db77', '386690efb8f4c1d892f9c24123264229', 1701072000, 1701079200, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('b9d912ccfbd1df39e9cfeeb134062ff0', '728f1578de643fb08b32b4b8afb2db77', 'd1cf3828b5cbfb567a23ebc925818e8d', 1704700800, 1704708000, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('c59c88cf0a268bfed2c96d833401d04b', '728f1578de643fb08b32b4b8afb2db77', 'bc4de36334c1e3bc04d1ed438f713f7a', 1699257600, 1699264800, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('c9d45a65b84d4606c04ed80d0e83ead6', '728f1578de643fb08b32b4b8afb2db77', 'aac383acadc20d7019bd12c3436540d8', 1705910400, 1705917600, 1698857418, 1698857418, 1);
-REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('dffbf273272a70eed2ff3d22fa59c3ba', '728f1578de643fb08b32b4b8afb2db77', 'a2960560876542106dddf761add7c4ba', 1706515200, 1706522400, 1698857418, 1698857418, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('103172da14b07526e9c6ceb224c11c23', '728f1578de643fb08b32b4b8afb2db77', 'ed37afe9ff2d96c489d5cf6e2b4fba80', 1731312000, 1731319200, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('107c4ff6a9c207cfda35a80260a3f8c2', '728f1578de643fb08b32b4b8afb2db77', 'a672b97ead875ef080706c6f6da33a44', 1731916800, 1731924000, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('1f3b18df65f42101408da9ca0f8b06ae', '728f1578de643fb08b32b4b8afb2db77', 'aec837593cbd51d21d58b97e9af9ba19', 1737360000, 1737367200, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('22589cca9cf15513c507d6658d267492', '728f1578de643fb08b32b4b8afb2db77', '6cb4d34009cee46357a98006ef824930', 1732521600, 1732528800, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('2273be6840eb462735458020165dc663', '728f1578de643fb08b32b4b8afb2db77', '577b04b04575ce3a60328cf97ff801c8', 1730707200, 1730714400, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('298b0bc9d1be4d072c93c7cbc2647be1', '728f1578de643fb08b32b4b8afb2db77', '4effa9b74ecbe244bac766e6256a361c', 1736150400, 1736157600, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('4bf38db5dff602e6bef5a3d281783bc7', '728f1578de643fb08b32b4b8afb2db77', 'cde83098d29a75de33e76a71b8a71a21', 1736755200, 1736762400, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('5a7c2cd2975447334f0b3575513a5e6e', '728f1578de643fb08b32b4b8afb2db77', '9e55f071dc674f92ef7c0032bdc623f4', 1733126400, 1733133600, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('5bff17112dccfc248aa354748afceb46', '728f1578de643fb08b32b4b8afb2db77', 'a01a39e448aa6dbab5dd5dffaae78926', 1738569600, 1738576800, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('783aa785a85845d7eae547983afc0091', '728f1578de643fb08b32b4b8afb2db77', 'bd9806b968f39178225603cb6812f2b0', 1729494000, 1729501200, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('7f7470f79dc5ca2cc9e2e73ac50b6287', '728f1578de643fb08b32b4b8afb2db77', '413cca32dbe8c3499ae1b7dae46b6e77', 1730102400, 1730109600, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('914b8a1d43e28ed42cccd4bdc52d0b5c', '728f1578de643fb08b32b4b8afb2db77', '2a251bfb01a99e533b3bbc841fc02ca7', 1733731200, 1733738400, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('d566a5583c94cb7bbdbb67596780852c', '728f1578de643fb08b32b4b8afb2db77', 'e70aaf4655d2de64852b2212b04a0e67', 1737964800, 1737972000, 1716456982, 1716456982, 1);
+REPLACE INTO `resource_booking_intervals` (`interval_id`, `resource_id`, `booking_id`, `begin`, `end`, `mkdate`, `chdate`, `takes_place`) VALUES('deaa9da8e6003da444d2ff4756bbab9a', '728f1578de643fb08b32b4b8afb2db77', '06a133ec2958178551ee6b48957058b6', 1734336000, 1734343200, 1716456982, 1716456982, 1);
+
 
 
 
-- 
cgit v1.0


From c17e1b501bf3b15e65690537a0f7d76af65fc506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Thu, 23 May 2024 11:51:31 +0000
Subject: history.txt "Release 5.5"

Merge request studip/studip!3037
---
 public/history.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/history.txt b/public/history.txt
index e6d4960..1dc4b3f 100644
--- a/public/history.txt
+++ b/public/history.txt
@@ -18,8 +18,6 @@ __15.03.2024 V 5.5__
 - Courseware: Neue Sortierfunktionen für Lernmaterialien
 - Courseware: Seiten im Inhaltsverzeichnis anlegen und umbenennen
 - Courseware: Lerninhalte und Seiten hinzufügen, kopieren und importieren als eine Aktion
-- Unter der Haube: Parallelisierte Cronjobs
-- Unter der Haube: Integration Storybook.js
 - Unter der Haube: Mindestanforderung an PHP auf 7.4 angehoben
 - Unter der Haube: Mehr Bilder werden als WebP gespeichert
 
-- 
cgit v1.0


From fa353181c068cb4778a696234d88c59007399bd0 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 23 May 2024 14:39:17 +0000
Subject: provide empty string as alternative for HTTP_ACCEPT_LANGUAGE, fixes
 #4209

Closes #4209

Merge request studip/studip!3038
---
 public/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/install.php b/public/install.php
index e9b0bf6..4e54575 100644
--- a/public/install.php
+++ b/public/install.php
@@ -43,7 +43,7 @@ if (!function_exists('_')) {
 } else {
     require_once 'lib/language.inc.php';
 
-    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang) {
+    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? '') as $lang) {
         [$lang, ] = explode(';', $lang);
         $lang = substr($lang, 0, 2);
 
-- 
cgit v1.0


From bd7eab466355de7e86adcb991c369a8dd9518824 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 24 May 2024 07:48:31 +0000
Subject: MultiPersonSearch: made icons for starting and resetting the search
 accessible, fixes #4029

Closes #4029

Merge request studip/studip!2901
---
 app/views/multipersonsearch/js_form.php        | 8 ++++++--
 resources/assets/stylesheets/scss/buttons.scss | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/views/multipersonsearch/js_form.php b/app/views/multipersonsearch/js_form.php
index ca1a1ab..1862c84 100644
--- a/app/views/multipersonsearch/js_form.php
+++ b/app/views/multipersonsearch/js_form.php
@@ -10,8 +10,12 @@
             <span><?= htmlReady($description); ?></span>
             <input id="<?= $name . '_searchinput'; ?>" type="text" placeholder="<?= _("Suchen"); ?>" value="" name="<?= $name . '_searchinput'; ?>" style="width: 260px;" aria-label="<?= _("Suchen"); ?>">
 
-            <?= Icon::create('search', 'clickable', ['title' => _('Suche starten')])->asImg(16, ['onclick' => 'STUDIP.MultiPersonSearch.search()']) ?>
-            <?= Icon::create('decline', 'clickable', ['title' => _('Suche zurücksetzen')])->asImg(16, ['onclick' => 'STUDIP.MultiPersonSearch.resetSearch()']) ?>
+            <button class="icon-button enter-accessible" onclick='STUDIP.MultiPersonSearch.search();return false' title="<?= _('Suche starten') ?>">
+                <?= Icon::create('search')->asImg(['class' => 'text-bottom']) ?>
+            </button>
+            <button class="icon-button enter-accessible" onclick='STUDIP.MultiPersonSearch.resetSearch(); return false' title="<?= _('Suche zurücksetzen') ?>">
+                <?= Icon::create('decline')->asImg(['class' => 'text-bottom']) ?>
+            </button>
         </label>
         <p><? foreach($quickfilter as $title => $users) : ?>
             <a href="#" class="quickfilter" data-quickfilter="<?= md5($title); ?>"><?= htmlReady($title); ?> (<?= count($users); ?>)</a>
diff --git a/resources/assets/stylesheets/scss/buttons.scss b/resources/assets/stylesheets/scss/buttons.scss
index 6c5d070..c148b72 100644
--- a/resources/assets/stylesheets/scss/buttons.scss
+++ b/resources/assets/stylesheets/scss/buttons.scss
@@ -140,7 +140,8 @@ button,
 .button {
     &.as-link,
     &.styleless,
-    &.undecorated {
+    &.undecorated,
+    &.icon-button {
         background-color: unset;
         border: 0;
     }
-- 
cgit v1.0


From c25ceca96c47524fb1a78c3f52cb07136a8f875a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Fri, 24 May 2024 10:45:30 +0200
Subject: remove duplicated inclusion of phpoffice/phpspreadsheet, fixes #4213,
 re #4162

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index ac010e5..143b532 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,6 @@
         "ksubileau/color-thief-php": "^2.0",
         "symfony/polyfill-php82": "1.29.0",
         "symfony/polyfill-php83": "1.29.0",
-        "phpoffice/phpspreadsheet": "^1.19",
         "phpoffice/phpspreadsheet": "2.1.0",
         "psy/psysh": "0.12.3",
         "okvpn/clock-lts": "^1.0",
-- 
cgit v1.0


From e82be6c8a2c29fb5c432bd28185a7a366c2771d9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 24 May 2024 10:18:31 +0000
Subject: replace neomerx/json-api 4.0.1 with laravel-json-api/neomerx-json-api
 5.0.2, fixes #4212

Closes #4212

Merge request studip/studip!3041
---
 composer.json |   4 +-
 composer.lock | 132 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 73 insertions(+), 63 deletions(-)

diff --git a/composer.json b/composer.json
index 143b532..8ec6778 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,6 @@
     "require": {
         "php": "^8.1",
         "guzzlehttp/psr7": "2.6.2",
-        "neomerx/json-api": "4.0.1",
         "spomky-labs/otphp": "11.2.2",
         "tuupola/cors-middleware": "^1.2.1",
         "tecnickcom/tcpdf": "6.7.5",
@@ -61,7 +60,8 @@
         "okvpn/clock-lts": "^1.0",
         "vlucas/phpdotenv": "^5.6",
         "edu-sharing/auth-plugin": "8.0.x-dev",
-        "psr/cache": "3.0.0"
+        "psr/cache": "3.0.0",
+        "laravel-json-api/neomerx-json-api": "5.0.2"
     },
     "replace": {
         "symfony/polyfill-php73": "*",
diff --git a/composer.lock b/composer.lock
index c2d073c..f2e656d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ce45f97b00f8fa90b09d0b907b3a4f53",
+    "content-hash": "7b19d8591a65485c94fb1794c93eef90",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -740,6 +740,76 @@
             "time": "2022-11-12T10:09:40+00:00"
         },
         {
+            "name": "laravel-json-api/neomerx-json-api",
+            "version": "v5.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel-json-api/neomerx-json-api.git",
+                "reference": "00841feae83ab95f4490c6f2086f02f298293381"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel-json-api/neomerx-json-api/zipball/00841feae83ab95f4490c6f2086f02f298293381",
+                "reference": "00841feae83ab95f4490c6f2086f02f298293381",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.4|^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.17",
+                "mockery/mockery": "^1.4.4",
+                "phpmd/phpmd": "^2.11.1",
+                "phpunit/phpunit": "^9.5.10",
+                "scrutinizer/ocular": "^1.8",
+                "squizlabs/php_codesniffer": "^3.6.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/I18n/format.php"
+                ],
+                "psr-4": {
+                    "Neomerx\\JsonApi\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "neomerx",
+                    "email": "info@neomerx.com"
+                },
+                {
+                    "name": "Christopher Gammie",
+                    "email": "contact@gammie.co.uk"
+                }
+            ],
+            "description": "Framework agnostic JSON API (jsonapi.org) implementation",
+            "homepage": "https://github.com/neomerx/json-api",
+            "keywords": [
+                "JSON-API",
+                "api",
+                "json",
+                "jsonapi",
+                "jsonapi.org",
+                "neomerx"
+            ],
+            "support": {
+                "issues": "https://github.com/neomerx/json-api/issues",
+                "source": "https://github.com/laravel-json-api/neomerx-json-api/tree/v5.0.2"
+            },
+            "time": "2023-05-29T14:50:09+00:00"
+        },
+        {
             "name": "laravel/serializable-closure",
             "version": "v1.3.3",
             "source": {
@@ -1594,66 +1664,6 @@
             "time": "2019-02-14T10:35:50+00:00"
         },
         {
-            "name": "neomerx/json-api",
-            "version": "v4.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/neomerx/json-api.git",
-                "reference": "0e45254a4574a3118e0ed663312b43aca23b89c7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/neomerx/json-api/zipball/0e45254a4574a3118e0ed663312b43aca23b89c7",
-                "reference": "0e45254a4574a3118e0ed663312b43aca23b89c7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.14",
-                "mockery/mockery": "^1.0",
-                "phpmd/phpmd": "^2.6",
-                "phpunit/phpunit": "^7.0",
-                "scrutinizer/ocular": "^1.4",
-                "squizlabs/php_codesniffer": "^2.9"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/I18n/format.php"
-                ],
-                "psr-4": {
-                    "Neomerx\\JsonApi\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "neomerx",
-                    "email": "info@neomerx.com"
-                }
-            ],
-            "description": "Framework agnostic JSON API (jsonapi.org) implementation",
-            "homepage": "https://github.com/neomerx/json-api",
-            "keywords": [
-                "JSON-API",
-                "api",
-                "json",
-                "jsonapi",
-                "jsonapi.org",
-                "neomerx"
-            ],
-            "support": {
-                "issues": "https://github.com/neomerx/json-api/issues",
-                "source": "https://github.com/neomerx/json-api/tree/develop"
-            },
-            "time": "2020-03-03T05:56:54+00:00"
-        },
-        {
             "name": "nikic/fast-route",
             "version": "v1.3.0",
             "source": {
-- 
cgit v1.0


From e48767859758c9e12cf464313ca104482d5bec4d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 27 May 2024 05:47:15 +0000
Subject: fixes #4210

Closes #4210

Merge request studip/studip!3040
---
 app/controllers/resources/booking.php          | 2 +-
 app/views/admin/lockrules/_form.php            | 8 +++++---
 app/views/resources/booking/_add_edit_form.php | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/resources/booking.php b/app/controllers/resources/booking.php
index 45ccb16..a4722ed 100644
--- a/app/controllers/resources/booking.php
+++ b/app/controllers/resources/booking.php
@@ -1352,7 +1352,7 @@ class Resources_BookingController extends AuthenticatedController
                     $resource,
                     $time_intervals,
                     [1, 3],
-                    ($this->booking->id ? [$this->booking->id] : [])
+                    isset($this->booking->id) ? [$this->booking->id] : []
                 );
                 $reservations_to_overwrite = array_merge(
                     $reservations_to_overwrite,
diff --git a/app/views/admin/lockrules/_form.php b/app/views/admin/lockrules/_form.php
index c4ef111..b96c7b6 100644
--- a/app/views/admin/lockrules/_form.php
+++ b/app/views/admin/lockrules/_form.php
@@ -85,12 +85,14 @@ use Studip\Button;
                         </td>
                         <td>
                             <input type="radio"
-                                   name="lockdata_attributes[<?= $attr ?>]" <?= ($lock_rule['attributes'][$attr] ? 'checked' : '') ?>
-                                   value="1"/>
+                                   name="lockdata_attributes[<?= $attr ?>]"
+                                   <?= !empty($lock_rule['attributes'][$attr]) ? 'checked' : '' ?>
+                                   value="1">
                         </td>
                         <td>
                             <input type="radio"
-                                   name="lockdata_attributes[<?= $attr ?>]" <?= (!$lock_rule['attributes'][$attr] ? 'checked' : '') ?>
+                                   name="lockdata_attributes[<?= $attr ?>]"
+                                   <?= empty($lock_rule['attributes'][$attr]) ? 'checked' : '' ?>
                                    value="0"/>
                         </td>
                     </tr>
diff --git a/app/views/resources/booking/_add_edit_form.php b/app/views/resources/booking/_add_edit_form.php
index 571ff63..f982c37 100644
--- a/app/views/resources/booking/_add_edit_form.php
+++ b/app/views/resources/booking/_add_edit_form.php
@@ -537,7 +537,7 @@
                 <label>
                     <input type="checkbox" value="1"
                            name="overwrite_bookings"
-                        <?= $overwrite_bookings ? 'checked="checked"' : '' ?>>
+                        <?= !empty($overwrite_bookings) ? 'checked' : '' ?>>
                     <?= _('Vorhandene Buchungen überschreiben') ?>
                 </label>
             </fieldset>
-- 
cgit v1.0


From addf6e2dd8296b9c05cd648641158788175b7b88 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 27 May 2024 05:51:08 +0000
Subject: add Studip\OAuth1 class to sign or verify PSR7 requests, fixes #4203

Closes #4203

Merge request studip/studip!3030
---
 app/controllers/course/lti.php                   |  31 ++---
 lib/classes/LtiLink.php                          |  16 ++-
 lib/classes/OAuth1.php                           | 167 +++++++++++++++++++++++
 lib/classes/auth_plugins/StudipAuthLTI.class.php |  21 +--
 tests/unit/lib/classes/OAuth1Test.php            | 118 ++++++++++++++++
 5 files changed, 312 insertions(+), 41 deletions(-)
 create mode 100644 lib/classes/OAuth1.php
 create mode 100644 tests/unit/lib/classes/OAuth1Test.php

diff --git a/app/controllers/course/lti.php b/app/controllers/course/lti.php
index e0ca2cf..4db7776 100644
--- a/app/controllers/course/lti.php
+++ b/app/controllers/course/lti.php
@@ -1,4 +1,7 @@
 <?php
+
+use Studip\OAuth2\NegotiatesWithPsr7;
+
 /**
  * course/lti.php - LTI consumer API for Stud.IP
  *
@@ -13,6 +16,8 @@
 
 class Course_LtiController extends StudipController
 {
+    use NegotiatesWithPsr7;
+
     /**
      * Callback function being called before an action is executed.
      */
@@ -268,22 +273,15 @@ class Course_LtiController extends StudipController
      */
     public function save_link_action($tool_id)
     {
-        require_once 'vendor/oauth-php/library/OAuthRequestVerifier.php';
-
         $tool = LtiTool::find($tool_id);
         $lti_msg = Request::get('lti_msg');
         $lti_errormsg = Request::get('lti_errormsg');
         $content_items = Request::get('content_items');
         $content_items = json_decode($content_items, true);
 
-        OAuthStore::instance('PDO', [
-            'dsn' => 'mysql:host=' . $GLOBALS['DB_STUDIP_HOST'] . ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE'],
-            'username' => $GLOBALS['DB_STUDIP_USER'],
-            'password' => $GLOBALS['DB_STUDIP_PASSWORD']
-        ]);
-
-        $oarv = new OAuthRequestVerifier();
-        $oarv->verifySignature($tool->consumer_secret, false, false);
+        if (!Studip\OAuth1::verifyRequest($this->getPsrRequest(), $tool->consumer_secret, '')) {
+            throw new Exception('Could not verify request.');
+        }
 
         if (is_array($content_items) && count($content_items['@graph'])) {
             // we only support selecting a single content item
@@ -452,18 +450,11 @@ class Course_LtiController extends StudipController
      */
     public function outcome_action($id)
     {
-        require_once 'vendor/oauth-php/library/OAuthRequestVerifier.php';
-
         $lti_data = LtiData::find($id);
 
-        OAuthStore::instance('PDO', [
-            'dsn' => 'mysql:host=' . $GLOBALS['DB_STUDIP_HOST'] . ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE'],
-            'username' => $GLOBALS['DB_STUDIP_USER'],
-            'password' => $GLOBALS['DB_STUDIP_PASSWORD']
-        ]);
-
-        $oarv = new OAuthRequestVerifier();
-        $oarv->verifySignature($lti_data->getConsumerSecret(), false, false);
+        if (!Studip\OAuth1::verifyRequest($this->getPsrRequest(), $lti_data->getConsumerSecret(), '')) {
+            throw new Exception('Could not verify request.');
+        }
 
         // fetch and parse POST data
         $message = file_get_contents('php://input');
diff --git a/lib/classes/LtiLink.php b/lib/classes/LtiLink.php
index 801b6c0..1423cef 100644
--- a/lib/classes/LtiLink.php
+++ b/lib/classes/LtiLink.php
@@ -310,12 +310,14 @@ class LtiLink
         // posted form data will always use CR LF
         $launch_params = preg_replace("/\r?\n/", "\r\n", $launch_params);
 
-        // In OAuth, request parameters must be sorted by name
-        ksort($launch_params);
-        $launch_params = http_build_query($launch_params, '', '&', PHP_QUERY_RFC3986);
-        $base_string = 'POST&' . rawurlencode($launch_url) . '&' . rawurlencode($launch_params);
-        $secret = rawurlencode($this->consumer_secret) . '&';
-
-        return base64_encode(hash_hmac($this->oauth_signature_method, $base_string, $secret, true));
+        return Studip\OAuth1::signRequest(
+            (new Slim\Psr7\Factory\ServerRequestFactory())->createServerRequest(
+                'POST',
+                $launch_url
+            )->withQueryParams($launch_params),
+            $this->consumer_secret,
+            '',
+            $this->oauth_signature_method
+        );
     }
 }
diff --git a/lib/classes/OAuth1.php b/lib/classes/OAuth1.php
new file mode 100644
index 0000000..1695f9f
--- /dev/null
+++ b/lib/classes/OAuth1.php
@@ -0,0 +1,167 @@
+<?php
+namespace Studip;
+
+use Psr\Http\Message\ServerRequestInterface as Request;
+use RuntimeException;
+
+/**
+ * Basic oauth1 request handling for Stud.IP using PSR-7 http messages.
+ *
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since Stud.IP 6.0
+ */
+final class OAuth1
+{
+    /**
+     * Signs a given request.
+     *
+     * @throws RuntimeException if a request for any other oauth version then
+     *                          1.0 shall be signed
+     */
+    public static function signRequest(
+        Request $request,
+        string  $consumerSecret,
+        string  $tokenSecret,
+        string  $method
+    ): string {
+        if (
+            isset($request->getQueryParams()['oauth_version'])
+            && $request->getQueryParams()['oauth_version'] !== '1.0'
+        ) {
+            throw new RuntimeException(self::class . ' only supports OAuth 1.0 requests');
+        }
+
+        return self::hash(
+            $method,
+            self::getSignatureBaseString($request),
+            self::urlencode($consumerSecret) . '&' . self::urlencode($tokenSecret)
+        );
+    }
+
+    /**
+     * Verifies an oauth request.
+     *
+     * @throws RuntimeException if any necessary oauth parameter is missing
+     */
+    public static function verifyRequest(
+        Request $request,
+        string  $consumerSecret,
+        string  $tokenSecret
+    ): bool {
+        $parameters = self::extractParameters($request);
+
+        $required = [
+            'oauth_consumer_key',
+            'oauth_nonce',
+            'oauth_signature',
+            'oauth_signature_method',
+            'oauth_timestamp',
+        ];
+
+        $missing = array_diff($required, array_keys($parameters));
+        if (count($missing) > 0) {
+            throw new RuntimeException('Missing oauth parameters ' . implode(', ', $missing));
+        }
+
+        $signatureToVerify = $parameters['oauth_signature'];
+        unset($parameters['oauth_signature']);
+
+        $signature = self::signRequest(
+            $request->withQueryParams($parameters),
+            $consumerSecret,
+            $tokenSecret,
+            $parameters['oauth_signature_method']
+        );
+
+        return $signature === $signatureToVerify;
+    }
+
+    /**
+     * Extracts the oauth parameters either from the Authorization header or
+     * from the query string.
+     */
+    public static function extractParameters(Request $request): array
+    {
+        $parameters = $request->getQueryParams();
+
+        $header = $request->getHeaderLine('Authorization');
+        if ($header && str_starts_with($header, 'OAuth ')) {
+            $temp = substr($header, 6);
+            $chunks = explode(',', $temp);
+
+            foreach ($chunks as $chunk) {
+                [$key, $value] = explode('=', $chunk, 2);
+                $value = trim($value, '"');
+                $parameters[$key] = self::urldecode($value);
+            }
+        }
+
+        return $parameters;
+    }
+
+    /**
+     * Creates the base string for the signature. It consists of:
+     *
+     * - The uppercase request method
+     * - The request URL
+     * - the sorted and urlencoded parameters of the request
+     *
+     * The urlencoded parts are concatenated together into a single string
+     * separated by the '&' character.
+     *
+     *
+     */
+    public static function getSignatureBaseString(Request $request): string
+    {
+        $parameters = $request->getQueryParams();
+        ksort($parameters);
+
+        return implode('&', array_map(
+            self::urlencode(...),
+            [
+                strtoupper($request->getMethod()),
+                (string) $request->getUri()->withQuery(''),
+                http_build_query($parameters, '', '&', PHP_QUERY_RFC3986),
+            ]
+        ));
+    }
+
+    /**
+     * Hashes a given text with a given key by the given method.
+     *
+     * @throws RuntimeException if the given hash method is not supported
+     */
+    public static function hash(string $method, string $text, string $key): string
+    {
+        $method = strtolower($method);
+        return match ($method) {
+            'hmac-sha1',   'sha1'   => base64_encode(hash_hmac('sha1', $text, $key, true)),
+            'hmac-sha256', 'sha256' => base64_encode(hash_hmac('sha256', $text, $key, true)),
+            'hmac-sha512', 'sha512' => base64_encode(hash_hmac('sha512', $text, $key, true)),
+
+            'plaintext' => $key,
+
+            default => throw new RuntimeException('Unsupported sigature method "' . $method . '"'),
+        };
+    }
+
+    /**
+     * Urlencodes a given input
+     */
+    public static function urldecode(string $input): string
+    {
+        return rawurldecode($input);
+    }
+
+    /**
+     * Urldecodes a given input
+     */
+    public static function urlencode(string $input): string
+    {
+        $encoded = rawurlencode($input);
+        return str_starts_with($encoded, '/%7E')
+            ? str_replace('/%7E', '/~', $encoded)
+            : $encoded;
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthLTI.class.php b/lib/classes/auth_plugins/StudipAuthLTI.class.php
index e8c316f..07ab8c3 100644
--- a/lib/classes/auth_plugins/StudipAuthLTI.class.php
+++ b/lib/classes/auth_plugins/StudipAuthLTI.class.php
@@ -9,8 +9,12 @@
  * the License, or (at your option) any later version.
  */
 
+use Studip\OAuth2\NegotiatesWithPsr7;
+
 class StudipAuthLTI extends StudipAuthSSO
 {
+    use NegotiatesWithPsr7;
+
     public $consumer_keys;
     public $username;
     public $domain;
@@ -62,24 +66,15 @@ class StudipAuthLTI extends StudipAuthSSO
      *
      * @return  bool    true if authentication succeeds
      *
-     * @throws OAuthException2  if the signature verification failed
-     *
      */
     public function isAuthenticated($username, $password)
     {
-        require_once 'vendor/oauth-php/library/OAuthRequestVerifier.php';
-
-        OAuthStore::instance('PDO', [
-            'dsn' => 'mysql:host=' . $GLOBALS['DB_STUDIP_HOST'] . ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE'],
-            'username' => $GLOBALS['DB_STUDIP_USER'],
-            'password' => $GLOBALS['DB_STUDIP_PASSWORD']
-        ]);
-
         $consumer_key = Request::get('oauth_consumer_key');
         $consumer_secret = $this->consumer_keys[$consumer_key]['consumer_secret'];
 
-        $oarv = new OAuthRequestVerifier();
-        $oarv->verifySignature($consumer_secret, false, false);
+        if (!Studip\OAuth1::verifyRequest($this->getPsrRequest(), $consumer_secret, '')) {
+            return false;
+        }
 
         return parent::isAuthenticated($username, $password);
     }
@@ -93,8 +88,6 @@ class StudipAuthLTI extends StudipAuthSSO
      * @param   string $password the password (ignored)
      *
      * @return  mixed   if authentication succeeds: the Stud.IP user, else false
-     *
-     * @throws OAuthException2  if the signature verification failed
      */
     public function authenticateUser($username, $password)
     {
diff --git a/tests/unit/lib/classes/OAuth1Test.php b/tests/unit/lib/classes/OAuth1Test.php
new file mode 100644
index 0000000..84d4fb2
--- /dev/null
+++ b/tests/unit/lib/classes/OAuth1Test.php
@@ -0,0 +1,118 @@
+<?php
+
+use Psr\Http\Message\ServerRequestInterface;
+use Studip\OAuth1;
+
+/**
+ * All values are from the OAuth 1.0 Authentication Sandbox (using the example
+ * used in the OAuth Specification).
+ *
+ * @see http://lti.tools/oauth/
+ */
+final class OAuth1Test extends \Codeception\Test\Unit
+{
+    /**
+     * @covers OAuth1::getSignatureBaseString
+     */
+    public function testCreationOfBaseString(): void
+    {
+        $this->assertEquals(
+            'GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal',
+            OAuth1::getSignatureBaseString($this->getDefaultTestRequest())
+        );
+    }
+
+    /**
+     * @covers OAuth1::signRequest
+     */
+    public function testSigningARequest(): void
+    {
+        $this->assertEquals(
+            'tR3+Ty81lMeYAr/Fid0kMTYa/WM=',
+            OAuth1::signRequest(
+                $this->getDefaultTestRequest(),
+                'kd94hf93k423kf44',
+                'pfkkdhi9sl3r4s00',
+                'HMAC-SHA1'
+            )
+        );
+    }
+
+    /**
+     * @covers OAuth1::verifyRequest
+     */
+    public function testVerifyingARequest(): void
+    {
+        $this->assertTrue(
+            OAuth1::verifyRequest(
+                $this->getDefaultTestRequest(['oauth_signature' => 'tR3+Ty81lMeYAr/Fid0kMTYa/WM=']),
+                'kd94hf93k423kf44',
+                'pfkkdhi9sl3r4s00'
+            )
+        );
+    }
+
+    /**
+     * @covers OAuth1::verifyRequest
+     * @covers OAuth1::extractParameters
+     */
+    public function testVerifyingARequestFromAuthorizationHeader(): void
+    {
+        $parameters = [
+            ...$this->getDefaultParameters(),
+            'oauth_signature' => 'tR3+Ty81lMeYAr/Fid0kMTYa/WM='
+        ];
+
+
+        $request = $this->getTestRequest()->withHeader(
+            'Authorization',
+            'OAuth ' . implode(',', array_map(
+                fn($key, $value) => sprintf('%s="%s"', $key, $value),
+                array_keys($parameters),
+                array_values($parameters)
+            ))
+        );
+
+        $this->assertTrue(
+            OAuth1::verifyRequest(
+                $request,
+                'kd94hf93k423kf44',
+                'pfkkdhi9sl3r4s00'
+            )
+        );
+    }
+
+    private function getTestRequest(): ServerRequestInterface
+    {
+        $factory = new Slim\Psr7\Factory\ServerRequestFactory();
+        return $factory->createServerRequest(
+            'GET',
+            'http://photos.example.net/photos'
+        )->withQueryParams([
+            'size' => 'original',
+            'file' => 'vacation.jpg',
+        ]);
+    }
+
+    private function getDefaultTestRequest(array $parameters = []): ServerRequestInterface
+    {
+        $request = $this->getTestRequest();
+        return $request->withQueryParams([
+            ...$request->getQueryParams(),
+            ...$this->getDefaultParameters(),
+            ...$parameters,
+        ]);
+    }
+
+    private function getDefaultParameters(): array
+    {
+        return [
+            'oauth_consumer_key' => 'dpf43f3p2l4k3l03',
+            'oauth_token' => 'nnch734d00sl2jdk',
+            'oauth_nonce' => 'kllo9940pd9333jh',
+            'oauth_timestamp' => '1191242096',
+            'oauth_signature_method' => 'HMAC-SHA1',
+            'oauth_version' => '1.0',
+        ];
+    }
+}
-- 
cgit v1.0


From 05fefe4a2d9582e48131c82cee4d25cef2db40f5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 27 May 2024 05:56:33 +0000
Subject: remove oauth1 from jsonapi, fixes #4204

Closes #4204

Merge request studip/studip!3031
---
 .../JsonApi/Middlewares/Auth/OAuth1Strategy.php    | 114 ---------------------
 lib/classes/JsonApi/Middlewares/Authentication.php |   1 -
 2 files changed, 115 deletions(-)
 delete mode 100644 lib/classes/JsonApi/Middlewares/Auth/OAuth1Strategy.php

diff --git a/lib/classes/JsonApi/Middlewares/Auth/OAuth1Strategy.php b/lib/classes/JsonApi/Middlewares/Auth/OAuth1Strategy.php
deleted file mode 100644
index 113ee09..0000000
--- a/lib/classes/JsonApi/Middlewares/Auth/OAuth1Strategy.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace JsonApi\Middlewares\Auth;
-
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-
-class OAuth1Strategy implements Strategy
-{
-    /** @var callable */
-    protected $authenticator;
-
-    /** @var Request */
-    protected $request;
-
-    /** @var ?\User */
-    protected $user;
-
-    /**
-     * @param callable $authenticator
-     */
-    public function __construct(Request $request, $authenticator)
-    {
-        $this->request = $request;
-        $this->authenticator = $authenticator;
-
-        \OAuthStore::instance('PDO', ['conn' => \DBManager::get()]);
-    }
-
-    public function check()
-    {
-        return !is_null($this->user());
-    }
-
-    public function user()
-    {
-        if (!is_null($this->user)) {
-            return $this->user;
-        }
-
-        $this->user = $this->detect();
-
-        return $this->user;
-    }
-
-    public function addChallenge(Response $response)
-    {
-        return $response; //->withHeader('WWW-Authenticate', sprintf('Basic realm="%s"', 'Stud.IP JSON-API'));
-    }
-
-    private function detect(): ?\User
-    {
-        if (!\OAuthRequestVerifier::requestIsSigned()) {
-            return null;
-        }
-
-        $uri = (string) $this->request->getUri();
-        $method = $this->request->getMethod();
-
-        if ('GET' === strtoupper(($method))) {
-            $parameters = (array) $this->request->getQueryParams();
-        } elseif ('POST' === strtoupper(($method))) {
-            $parameters = (array) $this->request->getParsedBody();
-        } else {
-            $parameters = [];
-        }
-        $parameters = $this->getParamsFromAuthorizationHeader($this->request, $parameters);
-
-        $req = new \OAuthRequestVerifier($uri, $method, $parameters);
-
-        // Check oauth timestamp and deny access if timestamp is outdated
-        if ($req->getParam('oauth_timestamp') < strtotime('-6 hours')) {
-            return null;
-        }
-
-        $result = $req->verifyExtended('access');
-
-        $query = 'SELECT user_id FROM api_oauth_user_mapping WHERE oauth_id = ?';
-        $statement = \DBManager::get()->prepare($query);
-        $statement->execute([$result['user_id']]);
-
-        if (!$userId = $statement->fetchColumn()) {
-            return null;
-        }
-
-        /** @var \User */
-        return \User::find($userId);
-    }
-
-    private function getParamsFromAuthorizationHeader(Request $request, array $params): array
-    {
-        if ($request->hasHeader('Authorization')) {
-            $auth = $request->getHeaderLine('Authorization');
-            if (0 == strncasecmp($auth, 'OAuth', 4)) {
-                foreach (explode(',', substr($auth, 6)) as $v) {
-                    if (!strpos($v, '=')) {
-                        continue;
-                    }
-                    $v = trim($v);
-                    list($name, $value) = explode('=', $v, 2);
-                    if (!empty($value) && '"' == $value[0] && '"' == substr($value, -1)) {
-                        $value = substr(substr($value, 1), 0, -1);
-                    }
-
-                    if (0 != strcasecmp($name, 'realm')) {
-                        $params[$name] = $value;
-                    }
-                }
-            }
-        }
-
-        return $params;
-    }
-}
diff --git a/lib/classes/JsonApi/Middlewares/Authentication.php b/lib/classes/JsonApi/Middlewares/Authentication.php
index b84f6f9..bbcfef1 100644
--- a/lib/classes/JsonApi/Middlewares/Authentication.php
+++ b/lib/classes/JsonApi/Middlewares/Authentication.php
@@ -107,7 +107,6 @@ class Authentication
             'session' => new Auth\SessionStrategy(),
             'basic'   => new Auth\HttpBasicAuthStrategy($request, $this->authenticator),
             'oauth2'  => new Auth\OAuth2Strategy($request, $this->authenticator),
-            'oauth1'  => new Auth\OAuth1Strategy($request, $this->authenticator),
         ];
 
         foreach ($this->excluded_strategies as $strategy) {
-- 
cgit v1.0


From 4f847abc09405f0cf848f7b4b5a5a283acc6131d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 27 May 2024 06:11:25 +0000
Subject: integrate trails, fixes #4102

Closes #4102

Merge request studip/studip!3034
---
 app/controllers/admin/domain.php                   |    2 +-
 app/controllers/admin/install.php                  |    2 +-
 app/controllers/admin/lockrules.php                |    4 +-
 app/controllers/api/oauth2/applications.php        |    4 +-
 app/controllers/api/oauth2/authorize.php           |    2 +-
 app/controllers/api/oauth2/oauth2_controller.php   |    2 +-
 app/controllers/api/oauth2/token.php               |    4 +-
 app/controllers/contents/courseware.php            |    2 +-
 app/controllers/course/admission.php               |    8 +-
 app/controllers/course/block_appointments.php      |    2 +-
 app/controllers/course/cancel_dates.php            |    2 +-
 app/controllers/course/change_view.php             |    5 +-
 app/controllers/course/details.php                 |    2 +-
 app/controllers/course/enrolment.php               |    2 +-
 app/controllers/course/forum/forum_controller.php  |    2 +-
 app/controllers/course/gradebook/lecturers.php     |    4 +-
 app/controllers/course/lvgselector.php             |    4 +-
 app/controllers/course/members.php                 |    4 +-
 app/controllers/course/room_requests.php           |    4 +-
 app/controllers/course/scm.php                     |    2 +-
 app/controllers/course/statusgroups.php            |    2 +-
 app/controllers/course/study_areas.php             |    3 +-
 app/controllers/course/studygroup.php              |    4 +-
 app/controllers/course/timesrooms.php              |   10 +-
 app/controllers/document.php                       |    2 +-
 app/controllers/extern.php                         |    2 +-
 app/controllers/fachabschluss/kategorien.php       |    6 +-
 app/controllers/file.php                           |   30 +-
 app/controllers/files.php                          |    4 +-
 app/controllers/materialien/files.php              |    2 +-
 app/controllers/media_proxy.php                    |    2 +-
 app/controllers/module/module.php                  |   12 +-
 app/controllers/module/mvv_controller.php          |    6 +-
 app/controllers/oer/endpoints.php                  |    2 +-
 app/controllers/search/studiengaenge.php           |    2 +-
 app/controllers/settings/settings.php              |    2 +-
 app/controllers/shared/contacts.php                |    4 +-
 app/controllers/siteinfo.php                       |    2 +-
 app/controllers/studiengaenge/abschluesse.php      |    6 +-
 app/controllers/studiengaenge/fachbereiche.php     |    2 +-
 .../studiengaenge/fachbereichestgteile.php         |    2 +-
 app/controllers/studiengaenge/faecher.php          |    2 +-
 app/controllers/studiengaenge/kategorien.php       |    4 +-
 app/controllers/studiengaenge/shared_version.php   |   22 +-
 app/controllers/studiengaenge/studiengaenge.php    |    4 +-
 app/controllers/studiengaenge/studiengangteile.php |    2 +-
 app/controllers/studiengaenge/versionen.php        |    4 +-
 app/views/consultation/admin/create.php            |    2 +-
 app/views/news/admin_news.php                      |    2 +-
 cli/Commands/Checks/HelpTours.php                  |    4 +-
 lib/bootstrap-autoload.php                         |   29 +-
 lib/bootstrap-definitions.php                      |    2 +-
 lib/classes/OAuth2/NegotiatesWithPsr7.php          |    6 +-
 lib/classes/StudipController.php                   |   34 +-
 lib/classes/StudipDispatcher.php                   |   64 +-
 lib/classes/StudipResponse.php                     |    2 +-
 lib/functions.php                                  |   17 +-
 lib/modules/EvaluationsWidget.php                  |    2 +-
 lib/modules/MyCoursesWidget.php                    |    2 +-
 lib/modules/NewsWidget.php                         |    2 +-
 lib/modules/TerminWidget.php                       |    2 +-
 lib/plugins/core/StudIPPlugin.class.php            |    4 +-
 lib/seminar_open.php                               |    2 +-
 lib/trails/Controller.php                          |  411 +++++++
 lib/trails/Dispatcher.php                          |  262 ++++
 lib/trails/Exception.php                           |   43 +
 lib/trails/Exceptions/DoubleRenderError.php        |   13 +
 lib/trails/Exceptions/MissingFile.php              |   10 +
 lib/trails/Exceptions/RoutingError.php             |   10 +
 lib/trails/Exceptions/SessionRequiredException.php |   11 +
 lib/trails/Exceptions/UnknownAction.php            |   10 +
 lib/trails/Exceptions/UnknownController.php        |   10 +
 lib/trails/Flash.php                               |  184 +++
 lib/trails/Inflector.php                           |   44 +
 lib/trails/Response.php                            |  185 +++
 public/assets.php                                  |    2 +-
 public/dispatch.php                                |    2 +-
 public/install.php                                 |   15 +-
 public/sendfile.php                                |    6 +-
 public/web_migrate.php                             |    2 +-
 tests/unit/_bootstrap.php                          |   13 +-
 tests/unit/lib/FunctionsTest.php                   |    5 +-
 tests/unit/lib/classes/StudipControllerTest.php    |    6 +-
 tests/unit/lib/classes/TrailsTest.php              |   25 +
 vendor/trails/extras/tramp.php                     |   55 -
 vendor/trails/src/HEADER.php                       |   27 -
 vendor/trails/src/controller.php                   |  430 -------
 vendor/trails/src/dispatcher.php                   |  269 ----
 vendor/trails/src/exception.php                    |  101 --
 vendor/trails/src/flash.php                        |  241 ----
 vendor/trails/src/inflector.php                    |   49 -
 vendor/trails/src/response.php                     |  166 ---
 vendor/trails/src/trails.php                       |   16 -
 vendor/trails/trails-abridged.php                  |    3 -
 vendor/trails/trails.php                           | 1289 --------------------
 95 files changed, 1443 insertions(+), 2856 deletions(-)
 create mode 100644 lib/trails/Controller.php
 create mode 100644 lib/trails/Dispatcher.php
 create mode 100644 lib/trails/Exception.php
 create mode 100644 lib/trails/Exceptions/DoubleRenderError.php
 create mode 100644 lib/trails/Exceptions/MissingFile.php
 create mode 100644 lib/trails/Exceptions/RoutingError.php
 create mode 100644 lib/trails/Exceptions/SessionRequiredException.php
 create mode 100644 lib/trails/Exceptions/UnknownAction.php
 create mode 100644 lib/trails/Exceptions/UnknownController.php
 create mode 100644 lib/trails/Flash.php
 create mode 100644 lib/trails/Inflector.php
 create mode 100644 lib/trails/Response.php
 create mode 100644 tests/unit/lib/classes/TrailsTest.php
 delete mode 100644 vendor/trails/extras/tramp.php
 delete mode 100644 vendor/trails/src/HEADER.php
 delete mode 100644 vendor/trails/src/controller.php
 delete mode 100644 vendor/trails/src/dispatcher.php
 delete mode 100644 vendor/trails/src/exception.php
 delete mode 100644 vendor/trails/src/flash.php
 delete mode 100644 vendor/trails/src/inflector.php
 delete mode 100644 vendor/trails/src/response.php
 delete mode 100644 vendor/trails/src/trails.php
 delete mode 100644 vendor/trails/trails-abridged.php
 delete mode 100644 vendor/trails/trails.php

diff --git a/app/controllers/admin/domain.php b/app/controllers/admin/domain.php
index e4bb9c8..37ab11f 100644
--- a/app/controllers/admin/domain.php
+++ b/app/controllers/admin/domain.php
@@ -70,7 +70,7 @@ class Admin_DomainController extends AuthenticatedController
     {
         foreach ($args as $arg) {
             if ($arg && !preg_match('/' . UserDomain::REGEXP . '/', $arg)) {
-                throw new Trails_Exception(400);
+                throw new Trails\Exception(400);
             }
         }
 
diff --git a/app/controllers/admin/install.php b/app/controllers/admin/install.php
index 9ede078..e45c281 100644
--- a/app/controllers/admin/install.php
+++ b/app/controllers/admin/install.php
@@ -1,7 +1,7 @@
 <?php
 require_once __DIR__ . '/../../../lib/classes/StudipControllerPropertiesTrait.php';
 
-class Admin_InstallController extends Trails_Controller
+class Admin_InstallController extends Trails\Controller
 {
     use StudipControllerPropertiesTrait;
 
diff --git a/app/controllers/admin/lockrules.php b/app/controllers/admin/lockrules.php
index 56879fe..202a2e9 100644
--- a/app/controllers/admin/lockrules.php
+++ b/app/controllers/admin/lockrules.php
@@ -164,7 +164,7 @@ class Admin_LockrulesController extends AuthenticatedController
     {
         $this->lock_rule = LockRule::find($lock_rule_id);
         if (!(!$this->lock_rule->isNew() && ($GLOBALS['perm']->have_perm('root') || $this->lock_rule->user_id === $GLOBALS['user']->id))) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
         CSRFProtection::verifyUnsafeRequest();
         if ($this->lock_rule->delete()) {
@@ -186,4 +186,4 @@ class Admin_LockrulesController extends AuthenticatedController
         }
         return $this->lock_rule->store();
     }
-}
\ No newline at end of file
+}
diff --git a/app/controllers/api/oauth2/applications.php b/app/controllers/api/oauth2/applications.php
index d08ec1e..fd6a1bb 100644
--- a/app/controllers/api/oauth2/applications.php
+++ b/app/controllers/api/oauth2/applications.php
@@ -31,7 +31,7 @@ class Api_Oauth2_ApplicationsController extends AuthenticatedController
         $this->application = $this->formatApplication($accessToken);
 
         if (!$this->application) {
-            throw new Trails_Exception(500, 'Error finding client.');
+            throw new Trails\Exception(500, 'Error finding client.');
         }
     }
 
@@ -42,7 +42,7 @@ class Api_Oauth2_ApplicationsController extends AuthenticatedController
         $user = User::findCurrent();
         $accessToken = AccessToken::find(Request::option('application'));
         if (!$accessToken) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         if ($accessToken['user_id'] !== $user->id) {
             throw new AccessDeniedException();
diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index 5628d49..451b766 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -13,7 +13,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         parent::before_filter($action, $args);
 
         if ('index' !== $action) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         $action = $this->determineAction();
diff --git a/app/controllers/api/oauth2/oauth2_controller.php b/app/controllers/api/oauth2/oauth2_controller.php
index fd02ea9..6b3dacd 100644
--- a/app/controllers/api/oauth2/oauth2_controller.php
+++ b/app/controllers/api/oauth2/oauth2_controller.php
@@ -42,7 +42,7 @@ abstract class OAuth2Controller extends StudipController
             return $this->convertPsrResponse($psrResponse);
         }
 
-        return new Trails_Response($exception->getMessage(), [], 500);
+        return new Trails\Response($exception->getMessage(), [], 500);
     }
 
     protected function getAuthorizationServer(): AuthorizationServer
diff --git a/app/controllers/api/oauth2/token.php b/app/controllers/api/oauth2/token.php
index 0ae7ffb..755d6b7 100644
--- a/app/controllers/api/oauth2/token.php
+++ b/app/controllers/api/oauth2/token.php
@@ -8,11 +8,11 @@ class Api_Oauth2_TokenController extends OAuth2Controller
         parent::before_filter($action, $args);
 
         if ('index' !== $action) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         if (!Request::isPost()) {
-            throw new Trails_Exception(405);
+            throw new Trails\Exception(405);
         }
 
         $action = 'issue_token';
diff --git a/app/controllers/contents/courseware.php b/app/controllers/contents/courseware.php
index c1d807f..d4291df 100644
--- a/app/controllers/contents/courseware.php
+++ b/app/controllers/contents/courseware.php
@@ -311,7 +311,7 @@ class Contents_CoursewareController extends CoursewareController
         );
 
         if (!$struct) {
-            throw new Trails_Exception(404, _('Der geteilte Inhalt kann nicht gefunden werden.'));
+            throw new Trails\Exception(404, _('Der geteilte Inhalt kann nicht gefunden werden.'));
         }
 
         if (!$struct->canRead($user) && !$struct->canEdit($user)) {
diff --git a/app/controllers/course/admission.php b/app/controllers/course/admission.php
index 56342bb..14a9b20 100644
--- a/app/controllers/course/admission.php
+++ b/app/controllers/course/admission.php
@@ -31,7 +31,7 @@ class Course_AdmissionController extends AuthenticatedController
         if (!get_object_type($this->course_id, ['sem']) ||
             SeminarCategories::GetBySeminarId($this->course_id)->studygroup_mode ||
             !$GLOBALS['perm']->have_studip_perm('tutor', $this->course_id)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
 
         $this->course = Course::find($this->course_id);
@@ -488,7 +488,7 @@ class Course_AdmissionController extends AuthenticatedController
             }
             $this->course_set_name = $course_set->getName();
         } else {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
     }
 
@@ -503,7 +503,7 @@ class Course_AdmissionController extends AuthenticatedController
                 $this->redirect($response->headers['Location']);
             }
         } else {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
     }
 
@@ -518,7 +518,7 @@ class Course_AdmissionController extends AuthenticatedController
                 $this->redirect($response->headers['Location']);
             }
         } else {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
     }
 
diff --git a/app/controllers/course/block_appointments.php b/app/controllers/course/block_appointments.php
index fef0d31..ad28b1e 100644
--- a/app/controllers/course/block_appointments.php
+++ b/app/controllers/course/block_appointments.php
@@ -33,7 +33,7 @@ class Course_BlockAppointmentsController extends AuthenticatedController
             SeminarCategories::GetBySeminarId($this->course_id)->studygroup_mode ||
             !$GLOBALS['perm']->have_studip_perm("tutor", $this->course_id)
         ) {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
         PageLayout::setHelpKeyword('Basis.VeranstaltungenVerwaltenAendernVonZeitenUndTerminen');
         PageLayout::setTitle(Course::findCurrent()->getFullName() . " - " . _('Blockveranstaltungstermine anlegen'));
diff --git a/app/controllers/course/cancel_dates.php b/app/controllers/course/cancel_dates.php
index 0d5463c..8da0d09 100644
--- a/app/controllers/course/cancel_dates.php
+++ b/app/controllers/course/cancel_dates.php
@@ -39,7 +39,7 @@ class Course_CancelDatesController extends AuthenticatedController
             $this->course_id = $this->dates[0]->range_id;
         }
         if (!get_object_type($this->course_id, ['sem']) || !$perm->have_studip_perm("tutor", $this->course_id)) {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
         PageLayout::setHelpKeyword('Basis.VeranstaltungenVerwaltenAendernVonZeitenUndTerminen');
         PageLayout::setTitle(Course::findCurrent()->getFullName() . " - " . _('Veranstaltungstermine absagen'));
diff --git a/app/controllers/course/change_view.php b/app/controllers/course/change_view.php
index 156a68a..63395b6 100644
--- a/app/controllers/course/change_view.php
+++ b/app/controllers/course/change_view.php
@@ -16,7 +16,6 @@
  */
 class Course_ChangeViewController extends AuthenticatedController
 {
-    // see Trails_Controller#before_filter
     public function before_filter(&$action, &$args)
     {
         parent::before_filter($action, $args);
@@ -28,7 +27,7 @@ class Course_ChangeViewController extends AuthenticatedController
      * Sets the current course into participant view.
      * Only available for tutor upwards.
      *
-     * @throws Trails_Exception Someone with unfitting rights tried to call here.
+     * @throws Trails\Exception Someone with unfitting rights tried to call here.
      */
     public function set_changed_view_action()
     {
@@ -43,7 +42,7 @@ class Course_ChangeViewController extends AuthenticatedController
      * Resets a course currently in participant view to normal view
      * with real rights.
      *
-     * @throws Trails_Exception Someone with unfitting rights tried to call here.
+     * @throws Trails\Exception Someone with unfitting rights tried to call here.
      */
     public function reset_changed_view_action()
     {
diff --git a/app/controllers/course/details.php b/app/controllers/course/details.php
index 2a330e3..e1c9493 100644
--- a/app/controllers/course/details.php
+++ b/app/controllers/course/details.php
@@ -32,7 +32,7 @@ class Course_DetailsController extends AuthenticatedController
 
         $this->course = Course::find($course_id);
         if (!$this->course) {
-            throw new Trails_Exception(
+            throw new Trails\Exception(
                 404,
                 _('Es konnte keine Veranstaltung gefunden werden')
             );
diff --git a/app/controllers/course/enrolment.php b/app/controllers/course/enrolment.php
index eb4428e..420b5ca 100644
--- a/app/controllers/course/enrolment.php
+++ b/app/controllers/course/enrolment.php
@@ -37,7 +37,7 @@ class Course_EnrolmentController extends AuthenticatedController
             return false;
         }
         if (!get_object_type($this->course_id, ['sem'])) {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
         $course = Seminar::GetInstance($this->course_id);
         $enrolment_info = $course->getEnrolmentInfo($GLOBALS['user']->id);
diff --git a/app/controllers/course/forum/forum_controller.php b/app/controllers/course/forum/forum_controller.php
index 71d1aa0..65eec63 100644
--- a/app/controllers/course/forum/forum_controller.php
+++ b/app/controllers/course/forum/forum_controller.php
@@ -23,7 +23,7 @@ abstract class ForumController extends StudipController {
 
         parent::before_filter($action, $args);
 
-        $this->flash = Trails_Flash::instance();
+        $this->flash = Trails\Flash::instance();
 
         // Set help keyword for Stud.IP's user-documentation and page title
         PageLayout::setHelpKeyword('Basis.Forum');
diff --git a/app/controllers/course/gradebook/lecturers.php b/app/controllers/course/gradebook/lecturers.php
index b3b1f82..7ab02e7 100644
--- a/app/controllers/course/gradebook/lecturers.php
+++ b/app/controllers/course/gradebook/lecturers.php
@@ -258,7 +258,7 @@ class Course_Gradebook_LecturersController extends AuthenticatedController
     public function edit_custom_definition_action($definitionId)
     {
         if (!$this->definition = Definition::findOneBySQL('id = ? AND course_id = ?', [$definitionId, \Context::getId()])) {
-            throw new \Trails_Exception(404);
+            throw new \Trails\Exception(404);
         }
 
         // show template
@@ -271,7 +271,7 @@ class Course_Gradebook_LecturersController extends AuthenticatedController
     {
         CSRFProtection::verifyUnsafeRequest();
         if (!$definition = Definition::findOneBySQL('id = ? AND course_id = ?', [$definitionId, \Context::getId()])) {
-            throw new \Trails_Exception(404);
+            throw new \Trails\Exception(404);
         }
 
         $name = trim(\Request::get('name', ''));
diff --git a/app/controllers/course/lvgselector.php b/app/controllers/course/lvgselector.php
index 171f3d5..c8223a9 100644
--- a/app/controllers/course/lvgselector.php
+++ b/app/controllers/course/lvgselector.php
@@ -17,15 +17,13 @@ require 'config/mvv_config.php';
 
 class Course_LvgselectorController extends AuthenticatedController
 {
-
-    // see Trails_Controller#before_filter
     public function before_filter(&$action, &$args)
     {
         parent::before_filter($action, $args);
 
         $this->course = Course::findCurrent();
         if (!$this->course) {
-            throw new Trails_Exception(404, _('Es wurde keine Veranstaltung ausgewählt!'));
+            throw new Trails\Exception(404, _('Es wurde keine Veranstaltung ausgewählt!'));
         }
         $this->course_id = $this->course->id;
         if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->course_id)) {
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 3eae083..1ec1587 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -232,7 +232,7 @@ class Course_MembersController extends AuthenticatedController
             $course_member = AdmissionApplication::find([$user_id, $this->course_id]);
         }
         if (is_null($course_member)) {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
         $this->comment = $course_member->comment;
         $this->user = User::find($user_id);
@@ -265,7 +265,7 @@ class Course_MembersController extends AuthenticatedController
             $course_member = AdmissionApplication::find([$user_id, $this->course_id]);
         }
         if (!Request::submitted('save') || is_null($course_member)) {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
         $course_member->comment = Request::get('comment');
 
diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index a31e61a..926e000 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -46,7 +46,7 @@ class Course_RoomRequestsController extends AuthenticatedController
             SeminarCategories::GetBySeminarId($this->course_id)->studygroup_mode ||
             !$GLOBALS['perm']->have_studip_perm("tutor", $this->course_id)
         ) {
-            throw new Trails_Exception(400);
+            throw new Trails\Exception(400);
         }
 
         PageLayout::setHelpKeyword('Basis.VeranstaltungenVerwaltenAendernVonZeitenUndTerminen');
@@ -663,7 +663,7 @@ class Course_RoomRequestsController extends AuthenticatedController
     {
         $request = RoomRequest::find($request_id);
         if (!$request) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
         if (Request::isGet()) {
             PageLayout::postQuestion(sprintf(
diff --git a/app/controllers/course/scm.php b/app/controllers/course/scm.php
index 66af981..4c5d4eb 100644
--- a/app/controllers/course/scm.php
+++ b/app/controllers/course/scm.php
@@ -93,7 +93,7 @@ class Course_ScmController extends AuthenticatedController
         $this->scm  = $id ? $this->scms->find($id) : $this->scms->first();
 
         if (!$this->scm && $this->scms->count() > 0) {
-            throw new Trails_Exception(404, _('Es konnte keine freie Informationsseite mit der angegebenen Id gefunden werden.'));
+            throw new Trails\Exception(404, _('Es konnte keine freie Informationsseite mit der angegebenen Id gefunden werden.'));
         }
 
         if (Request::get('verify') === 'delete') {
diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php
index 48939bd..6f96299 100644
--- a/app/controllers/course/statusgroups.php
+++ b/app/controllers/course/statusgroups.php
@@ -762,7 +762,7 @@ class Course_StatusgroupsController extends AuthenticatedController
 
             // Safety check if no group_id at all.
             if (!$group_id) {
-                throw new Trails_Exception(400);
+                throw new Trails\Exception(400);
             }
         }
 
diff --git a/app/controllers/course/study_areas.php b/app/controllers/course/study_areas.php
index df54bb4..e951d11 100644
--- a/app/controllers/course/study_areas.php
+++ b/app/controllers/course/study_areas.php
@@ -18,7 +18,6 @@ require_once 'lib/webservices/api/studip_lecture_tree.php';
 
 class Course_StudyAreasController extends AuthenticatedController
 {
-    // see Trails_Controller#before_filter
     public function before_filter(&$action, &$args)
     {
         parent::before_filter($action, $args);
@@ -101,7 +100,7 @@ class Course_StudyAreasController extends AuthenticatedController
     public function save_action()
     {
         if($this->locked) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
 
         $params = [];
diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php
index c375778..cd08ba3 100644
--- a/app/controllers/course/studygroup.php
+++ b/app/controllers/course/studygroup.php
@@ -10,8 +10,6 @@ require_once 'lib/user_visible.inc.php';
  */
 class Course_StudygroupController extends AuthenticatedController
 {
-
-    // see Trails_Controller#before_filter
     public function before_filter(&$action, &$args)
     {
         parent::before_filter($action, $args);
@@ -851,7 +849,7 @@ class Course_StudygroupController extends AuthenticatedController
                 return;
             }
         }
-        throw new Trails_Exception(401);
+        throw new Trails\Exception(401);
     }
 
 
diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index ddd6883..f6cab24 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -14,7 +14,7 @@ class Course_TimesroomsController extends AuthenticatedController
      * @param String $action Action to be executed
      * @param Array  $args Arguments passed to the action
      *
-     * @throws Trails_Exception when either no course was found or the user
+     * @throws Trails\Exception when either no course was found or the user
      *                          may not access this area
      */
     public function before_filter(&$action, &$args)
@@ -23,7 +23,7 @@ class Course_TimesroomsController extends AuthenticatedController
 
         // Try to find a valid course
         if (!Course::findCurrent()) {
-            throw new Trails_Exception(404, _('Es wurde keine Veranstaltung ausgewählt!'));
+            throw new Trails\Exception(404, _('Es wurde keine Veranstaltung ausgewählt!'));
         }
 
         if (!$GLOBALS['perm']->have_studip_perm('tutor', Course::findCurrent()->id)) {
@@ -250,7 +250,7 @@ class Course_TimesroomsController extends AuthenticatedController
     /**
      * Edit the start-semester of a course
      *
-     * @throws Trails_DoubleRenderError
+     * @throws Trails\Exceptions\DoubleRenderError
      */
     public function editSemester_action()
     {
@@ -368,7 +368,7 @@ class Course_TimesroomsController extends AuthenticatedController
      *
      * @param $termin_id
      *
-     * @throws Trails_DoubleRenderError
+     * @throws Trails\Exceptions\DoubleRenderError
      */
     public function saveDate_action($termin_id)
     {
@@ -544,7 +544,7 @@ class Course_TimesroomsController extends AuthenticatedController
     /**
      * Save Single Date
      *
-     * @throws Trails_DoubleRenderError
+     * @throws Trails\Exceptions\DoubleRenderError
      */
     public function saveSingleDate_action()
     {
diff --git a/app/controllers/document.php b/app/controllers/document.php
index da15ebe..5057d9e 100644
--- a/app/controllers/document.php
+++ b/app/controllers/document.php
@@ -21,7 +21,7 @@ class DocumentController extends StudipController
         if ($file_ref) {
             $this->redirect($file_ref->getDownloadURL($disposition === 'inline' ? 'normal' : 'force'));
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
     }
 }
diff --git a/app/controllers/extern.php b/app/controllers/extern.php
index 6cde6f3..9296a34 100644
--- a/app/controllers/extern.php
+++ b/app/controllers/extern.php
@@ -21,7 +21,7 @@ class ExternController extends StudipController
      * Action shows rendered external page.
      *
      * @param string $config_id The id of the configuration of the external page to show.
-     * @throws Trails_DoubleRenderError
+     * @throws Trails\Exceptions\DoubleRenderError
      */
     public function index_action(string $config_id)
     {
diff --git a/app/controllers/fachabschluss/kategorien.php b/app/controllers/fachabschluss/kategorien.php
index 205f1f1..f9ba041 100644
--- a/app/controllers/fachabschluss/kategorien.php
+++ b/app/controllers/fachabschluss/kategorien.php
@@ -114,7 +114,7 @@ class Fachabschluss_KategorienController extends MVVController
             if (Request::submitted('delete')) {
                 CSRFProtection::verifyUnsafeRequest();
                 if (!MvvPerm::get('AbschlussKategorie')->haveFieldPerm('position')) {
-                    throw new Trails_Exception(403);
+                    throw new Trails\Exception(403);
                 }
                 if (!count($abschluss_kategorie->abschluesse)) {
                     PageLayout::postSuccess(sprintf(
@@ -142,7 +142,7 @@ class Fachabschluss_KategorienController extends MVVController
         $orderedIds = Request::getArray('newOrder');
         if ($list === 'abschluss_kategorien') {
             if (!MvvPerm::get('AbschlussKategorie')->haveFieldPerm('position')) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $kategorien = SimpleORMapCollection::createFromArray(
                 AbschlussKategorie::findBySql('1 ORDER BY position')
@@ -162,7 +162,7 @@ class Fachabschluss_KategorienController extends MVVController
             }
         } else {
             if (!MvvPerm::get('AbschlussZuord')->haveFieldPerm('position')) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             list(, $kategorie_id) = explode('_', $list);
             $abschluss_kategorie = AbschlussKategorie::find($kategorie_id);
diff --git a/app/controllers/file.php b/app/controllers/file.php
index 095e295..376a74e 100644
--- a/app/controllers/file.php
+++ b/app/controllers/file.php
@@ -66,7 +66,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $folder = $plugin->getFolder($folder_id);
         } else {
@@ -184,10 +184,10 @@ class FileController extends AuthenticatedController
             //Plugin file area.
             $plugin = PluginManager::getInstance()->getPlugin($this->to_plugin);
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             if (!($plugin instanceof FilesystemPlugin)) {
-                throw new Trails_Exception(400, _('Das Plugin ist kein Dateibereich-Plugin.'));
+                throw new Trails\Exception(400, _('Das Plugin ist kein Dateibereich-Plugin.'));
             }
             $file_ids = Request::getArray('file_refs');
             foreach ($file_ids as $file_id) {
@@ -294,7 +294,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin($this->from_plugin);
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $this->file = $plugin->getPreparedFile($file_id);
         } else {
@@ -383,7 +383,7 @@ class FileController extends AuthenticatedController
             $file_ref_id = $file_id;
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
 
             $this->file = $plugin->getPreparedFile($file_id);
@@ -666,7 +666,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $this->file = $plugin->getPreparedFile($file_id);
             $this->from_plugin = Request::get("from_plugin");
@@ -760,7 +760,7 @@ class FileController extends AuthenticatedController
 
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
 
             $this->file_ref = $plugin->getPreparedFile($file_id);
@@ -814,7 +814,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $foldertype = $plugin->getFolder($folder_id);
 
@@ -1325,7 +1325,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $filetype = $plugin->getPreparedFile($file_id);
             $folder = $filetype->getFolderType();
@@ -1335,7 +1335,7 @@ class FileController extends AuthenticatedController
             $filetype = $file_ref->getFileType();
         }
         if (!$filetype) {
-            throw new Trails_Exception(404, _('Datei nicht gefunden.'));
+            throw new Trails\Exception(404, _('Datei nicht gefunden.'));
         }
 
         if (!$filetype->isWritable($GLOBALS['user']->id)) {
@@ -1792,7 +1792,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("to_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $this->top_folder = $plugin->getFolder($folder_id);
         } else {
@@ -1857,7 +1857,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $parent_folder = $plugin->getFolder($folder_id);
         } else {
@@ -1963,7 +1963,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $folder = $plugin->getFolder($folder_id);
         } else {
@@ -2050,7 +2050,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $folder = $plugin->getFolder($folder_id);
         } else {
@@ -2085,7 +2085,7 @@ class FileController extends AuthenticatedController
             }
             $plugin = PluginManager::getInstance()->getPlugin(Request::get("from_plugin"));
             if (!$plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $parent_folder = $plugin->getFolder($folder_id);
         } else {
diff --git a/app/controllers/files.php b/app/controllers/files.php
index 2d4de4e..df4657c 100644
--- a/app/controllers/files.php
+++ b/app/controllers/files.php
@@ -711,7 +711,7 @@ class FilesController extends AuthenticatedController
 
             $destination_plugin = PluginManager::getInstance()->getPlugin($to_plugin);
             if (!$destination_plugin) {
-                throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                throw new Trails\Exception(404, _('Plugin existiert nicht.'));
             }
             $destination_folder = $destination_plugin->getFolder($destination_id);
         } else {
@@ -731,7 +731,7 @@ class FilesController extends AuthenticatedController
                 if ($from_plugin) {
                     $source_plugin = PluginManager::getInstance()->getPlugin($from_plugin);
                     if (!$source_plugin) {
-                        throw new Trails_Exception(404, _('Plugin existiert nicht.'));
+                        throw new Trails\Exception(404, _('Plugin existiert nicht.'));
                     }
                     if (Request::get("isfolder")) {
                         if ($source_folder = $source_plugin->getFolder($fileref)) {
diff --git a/app/controllers/materialien/files.php b/app/controllers/materialien/files.php
index 804668e..6f45767 100644
--- a/app/controllers/materialien/files.php
+++ b/app/controllers/materialien/files.php
@@ -510,7 +510,7 @@ class Materialien_FilesController extends MVVController
 
         $mvv_file = MvvFile::find($mvvfile_id);
         if (!$mvv_file) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         $this->doc_year = $mvv_file->year;
diff --git a/app/controllers/media_proxy.php b/app/controllers/media_proxy.php
index 50dc3df..b98b49c 100644
--- a/app/controllers/media_proxy.php
+++ b/app/controllers/media_proxy.php
@@ -46,7 +46,7 @@ class MediaProxyController extends StudipController
         ini_set('default_socket_timeout', 5);
         $this->render_nothing();
 
-        //stop output buffering started in Trails_Dispatcher::dispatch()
+        //stop output buffering started in Trails\Dispatcher::dispatch()
         while (ob_get_level()) {
             ob_end_clean();
         }
diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php
index e57156f..854b045 100644
--- a/app/controllers/module/module.php
+++ b/app/controllers/module/module.php
@@ -395,17 +395,17 @@ class Module_ModuleController extends MVVController
      * Deletes a descriptor from module
      *
      * @param type $deskriptor_id
-     * @throws Trails_Exception
+     * @throws Trails\Exception
      */
     public function delete_modul_deskriptor_action($deskriptor_id, $language)
     {
         $deskriptor = ModulDeskriptor::find($deskriptor_id);
         if (is_null($deskriptor)) {
-            throw new Trails_Exception(404, _('Unbekannter Deskriptor'));
+            throw new Trails\Exception(404, _('Unbekannter Deskriptor'));
         }
         $def_lang = $deskriptor->modul->getDefaultLanguage();
         if ($language === $def_lang) {
-            throw new Trails_Exception(403, _('Ein Deskriptor in der Original-Sprache kann nicht gelöscht werden.'));
+            throw new Trails\Exception(403, _('Ein Deskriptor in der Original-Sprache kann nicht gelöscht werden.'));
         }
         if (Request::submitted('delete')) {
             CSRFProtection::verifyUnsafeRequest();
@@ -819,17 +819,17 @@ class Module_ModuleController extends MVVController
      * Deletes a descriptor from Modulteil
      *
      * @param type $deskriptor_id
-     * @throws Trails_Exception
+     * @throws Trails\Exception
      */
     public function delete_modulteil_deskriptor_action($deskriptor_id, $language)
     {
         $deskriptor = ModulteilDeskriptor::find($deskriptor_id);
         if (is_null($deskriptor)) {
-            throw new Trails_Exception(404, _('Unbekannter Deskriptor'));
+            throw new Trails\Exception(404, _('Unbekannter Deskriptor'));
         }
         $def_lang = $deskriptor->modulteil->getDefaultLanguage();
         if ($language === $def_lang) {
-            throw new Trails_Exception(403, _('Ein Deskriptor in der Original-Sprache kann nicht gelöscht werden.'));
+            throw new Trails\Exception(403, _('Ein Deskriptor in der Original-Sprache kann nicht gelöscht werden.'));
         }
         if (Request::submitted('delete')) {
             CSRFProtection::verifyUnsafeRequest();
diff --git a/app/controllers/module/mvv_controller.php b/app/controllers/module/mvv_controller.php
index e84b37c..b70ddef 100644
--- a/app/controllers/module/mvv_controller.php
+++ b/app/controllers/module/mvv_controller.php
@@ -77,7 +77,7 @@ abstract class MVVController extends AuthenticatedController
         PageLayout::setTitle(_('Module'));
 
         // Setup flash instance
-        $this->flash = Trails_Flash::instance();
+        $this->flash = Trails\Flash::instance();
 
         $this->me             = 'mvv';
         self::$items_per_page = Config::get()->getValue('ENTRIES_PER_PAGE');
@@ -218,7 +218,7 @@ abstract class MVVController extends AuthenticatedController
      * This action is used to show a select box instead of an input field
      * if the user has clicked on the magnifier icon of a quicksearch.
      *
-     * @throws Trails_Exception
+     * @throws Trails\Exception
      */
     public function qs_result_action()
     {
@@ -228,7 +228,7 @@ abstract class MVVController extends AuthenticatedController
                 Request::get('qs_term')
             ));
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
     }
 
diff --git a/app/controllers/oer/endpoints.php b/app/controllers/oer/endpoints.php
index 31563f5..9a0f3f5 100644
--- a/app/controllers/oer/endpoints.php
+++ b/app/controllers/oer/endpoints.php
@@ -410,7 +410,7 @@ class Oer_EndpointsController extends StudipController
             $this->response->add_header('Content-Length', filesize($this->material->getFrontImageFilePath()));
             $this->render_text(file_get_contents($this->material->getFrontImageFilePath()));
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
     }
 
diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php
index ae27106..e17eb2a 100644
--- a/app/controllers/search/studiengaenge.php
+++ b/app/controllers/search/studiengaenge.php
@@ -423,7 +423,7 @@ class Search_StudiengaengeController extends MVVController
     {
         $this->abschnitt = StgteilAbschnitt::find($abschnitt_id);
         if (!$this->abschnitt) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->render_template('search/studiengaenge/kommentar', $this->layout);
     }
diff --git a/app/controllers/settings/settings.php b/app/controllers/settings/settings.php
index 327b62d..9cd00c0 100644
--- a/app/controllers/settings/settings.php
+++ b/app/controllers/settings/settings.php
@@ -121,7 +121,7 @@ abstract class Settings_SettingsController extends AuthenticatedController
     public function get_default_template($action)
     {
         $class = get_class($this);
-        $controller_name = Trails_Inflector::underscore(mb_substr($class, 0, -10));
+        $controller_name = Trails\Inflector::underscore(mb_substr($class, 0, -10));
         return file_exists($this->dispatcher->trails_root . '/views/' . $controller_name . '.php')
             ? $controller_name
             : $controller_name . '/' . $action;
diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php
index 62dd7a8..820d2ab 100644
--- a/app/controllers/shared/contacts.php
+++ b/app/controllers/shared/contacts.php
@@ -114,7 +114,7 @@ class Shared_ContactsController extends MVVController
         if ($this->contact_id) {
             $contact_range = MvvContactRange::findOneBySQL('contact_id=?', [$this->contact_id]);
             if (!$contact_range) {
-                throw new Trails_Exception(404);
+                throw new Trails\Exception(404);
             }
             $this->relations = $contact_range->getRelations($this->filter);
             $this->origin = 'index';
@@ -155,7 +155,7 @@ class Shared_ContactsController extends MVVController
     {
         $this->contact_range = MvvContactRange::findOneBySQL('contact_id = ?', [$contact_id]);
         if (!$this->contact_range) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         $this->relations = $this->contact_range->getRelations($this->filter);
diff --git a/app/controllers/siteinfo.php b/app/controllers/siteinfo.php
index ab81660..7bc95cb 100644
--- a/app/controllers/siteinfo.php
+++ b/app/controllers/siteinfo.php
@@ -37,7 +37,7 @@ class SiteinfoController extends StudipController
         } else {
             $action = 'show';
             if ($this->page_is_draft || ($this->page_disabled_nobody && $GLOBALS['user']->id === 'nobody')) {
-                throw new Trails_Exception(404);
+                throw new Trails\Exception(404);
             }
         }
         $this->add_navigation($action);
diff --git a/app/controllers/studiengaenge/abschluesse.php b/app/controllers/studiengaenge/abschluesse.php
index 8ec055b..60bc091 100644
--- a/app/controllers/studiengaenge/abschluesse.php
+++ b/app/controllers/studiengaenge/abschluesse.php
@@ -50,7 +50,7 @@ class Studiengaenge_AbschluesseController extends Studiengaenge_StudiengaengeCon
         $perm_institutes = MvvPerm::getOwnInstitutes();
         $abschluss = Abschluss::find($abschluss_id);
         if (!$abschluss) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->abschluss_id = $abschluss->id;
         if (count($perm_institutes)) {
@@ -59,7 +59,7 @@ class Studiengaenge_AbschluesseController extends Studiengaenge_StudiengaengeCon
                 $perm_institutes
             );
             if (!count($institutes_abschluss)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $this->studiengaenge = SimpleORMapCollection::createFromArray(
                 Studiengang::findByAbschluss_id($this->abschluss_id)
@@ -91,4 +91,4 @@ class Studiengaenge_AbschluesseController extends Studiengaenge_StudiengaengeCon
             $this->perform_relayed('index');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/controllers/studiengaenge/fachbereiche.php b/app/controllers/studiengaenge/fachbereiche.php
index 970c8d9..35f997b 100644
--- a/app/controllers/studiengaenge/fachbereiche.php
+++ b/app/controllers/studiengaenge/fachbereiche.php
@@ -51,7 +51,7 @@ class Studiengaenge_FachbereicheController extends Studiengaenge_StudiengaengeCo
         $this->fachbereich_id = $fachbereich_id;
         if (count($perm_institutes)) {
             if (!in_array($this->fachbereich_id, $perm_institutes)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
         }
 
diff --git a/app/controllers/studiengaenge/fachbereichestgteile.php b/app/controllers/studiengaenge/fachbereichestgteile.php
index c8037dc..73ad2aa 100644
--- a/app/controllers/studiengaenge/fachbereichestgteile.php
+++ b/app/controllers/studiengaenge/fachbereichestgteile.php
@@ -67,7 +67,7 @@ class Studiengaenge_FachbereichestgteileController extends Studiengaenge_Studien
             $this->fachbereich = $fachbereich;
             $this->perform_relayed('stgteil');
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
     }
 }
diff --git a/app/controllers/studiengaenge/faecher.php b/app/controllers/studiengaenge/faecher.php
index c9546a3..9990f7d 100644
--- a/app/controllers/studiengaenge/faecher.php
+++ b/app/controllers/studiengaenge/faecher.php
@@ -83,7 +83,7 @@ class Studiengaenge_FaecherController extends Studiengaenge_StudiengangteileCont
             $this->stgteil = StudiengangTeil::get();
             $this->stgteil->assignFach($fach->getId());
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->perform_relayed('stgteil');
     }
diff --git a/app/controllers/studiengaenge/kategorien.php b/app/controllers/studiengaenge/kategorien.php
index 03d28fc..8f6a98d 100644
--- a/app/controllers/studiengaenge/kategorien.php
+++ b/app/controllers/studiengaenge/kategorien.php
@@ -73,7 +73,7 @@ class Studiengaenge_KategorienController extends Studiengaenge_StudiengaengeCont
             
             if (count($perm_institutes)) {
                 if (!in_array($studiengang->institut_id, $perm_institutes)) {
-                    throw new Trails_Exception(403);
+                    throw new Trails\Exception(403);
                 }
             }
             
@@ -98,4 +98,4 @@ class Studiengaenge_KategorienController extends Studiengaenge_StudiengaengeCont
             $this->perform_relayed('index');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/controllers/studiengaenge/shared_version.php b/app/controllers/studiengaenge/shared_version.php
index 696fac0..a6265b0 100644
--- a/app/controllers/studiengaenge/shared_version.php
+++ b/app/controllers/studiengaenge/shared_version.php
@@ -11,18 +11,18 @@ abstract class SharedVersionController extends MVVController
     {
         $this->stgteil = StudiengangTeil::find($stgteil_id);
         if (!$this->stgteil) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         if (!MvvPerm::haveFieldPermVersionen($this->stgteil, MvvPerm::PERM_READ)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
 
         if (!isset($this->version)) {
             $this->version = StgteilVersion::find($version_id);
             if (!$this->version) {
                 if (!MvvPerm::haveFieldPermVersionen($this->stgteil, MvvPerm::PERM_CREATE)) {
-                    throw new Trails_Exception(403);
+                    throw new Trails\Exception(403);
                 }
                 $this->version = new StgteilVersion();
             }
@@ -51,7 +51,7 @@ abstract class SharedVersionController extends MVVController
         if (Request::submitted('store')) {
             CSRFProtection::verifyUnsafeRequest();
             if (!MvvPerm::haveFieldPermVersionen($this->stgteil)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $stored = false;
             $this->version->stgteil_id = $this->stgteil->getId();
@@ -220,7 +220,7 @@ abstract class SharedVersionController extends MVVController
     {
         $version = StgteilVersion::find($version_id);
         if (!$version) {
-             throw new Trails_Exception(404, _('Unbekannte Version'));
+             throw new Trails\Exception(404, _('Unbekannte Version'));
         }
         if (Request::isPost()) {
             CSRFProtection::verifyUnsafeRequest();
@@ -267,16 +267,16 @@ abstract class SharedVersionController extends MVVController
         $perm = MvvPerm::get($this->version);
 
         if (!$perm->haveFieldPerm('abschnitte', MvvPerm::PERM_READ)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
         if ($this->abschnitt->isNew() && !$perm->haveFieldPerm('abschnitte', MvvPerm::PERM_CREATE)) {
-            throw new Trails_Exception(403);
+            throw new Trails\Exception(403);
         }
 
         if (Request::submitted('store')) {
             CSRFProtection::verifyUnsafeRequest();
             if (!$perm->haveFieldPerm('abschnitte', MvvPerm::PERM_WRITE)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $this->abschnitt->version_id = $this->version->getId();
             $this->abschnitt->name = Request::i18n('name')->trim();
@@ -494,7 +494,7 @@ abstract class SharedVersionController extends MVVController
         $abschnitt = StgteilAbschnitt::find($abschnitt_id);
         if ($abschnitt) {
             if (!MvvPerm::haveFieldPermModul_zuordnungen($abschnitt, MvvPerm::PERM_CREATE)) {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
             $modul = Modul::find($modul_id);
             if (!$modul) {
@@ -614,7 +614,7 @@ abstract class SharedVersionController extends MVVController
     {
         $version = StgteilVersion::find($version_id);
         if (!$version) {
-             throw new Trails_Exception(404, _('Unbekannte Version'));
+             throw new Trails\Exception(404, _('Unbekannte Version'));
         } else {
             if (Request::isPost()) {
                 CSRFProtection::verifyUnsafeRequest();
@@ -754,7 +754,7 @@ abstract class SharedVersionController extends MVVController
                     $this->redirect($this->action_url('abschnitte/' . $version_id));
                 }
             } else {
-                throw new Trails_Exception(403);
+                throw new Trails\Exception(403);
             }
         }
         if (Request::isXhr()) {
diff --git a/app/controllers/studiengaenge/studiengaenge.php b/app/controllers/studiengaenge/studiengaenge.php
index d053f48..8465665 100644
--- a/app/controllers/studiengaenge/studiengaenge.php
+++ b/app/controllers/studiengaenge/studiengaenge.php
@@ -541,7 +541,7 @@ class Studiengaenge_StudiengaengeController extends MVVController
                 if (Request::isPost()) {
                     CSRFProtection::verifyRequest();
                     if (!MvvPerm::haveFieldPermStudiengangteile($studiengang, MvvPerm::PERM_CREATE)) {
-                        throw new Trails_Exception(403);
+                        throw new Trails\Exception(403);
                     }
                     $stgteil_name = $this->stg_stgteil->stgteil_name;
                     $stgbez_name = $this->stg_stgteil->stgbez_name;
@@ -588,7 +588,7 @@ class Studiengaenge_StudiengaengeController extends MVVController
                 if (Request::isPost()) {
                     CSRFProtection::verifyUnsafeRequest();
                     if (!MvvPerm::haveFieldPermStudiengangteile($studiengang, MvvPerm::PERM_CREATE)) {
-                        throw new Trails_Exception(403);
+                        throw new Trails\Exception(403);
                     }
                     $stgteil_name = $stg_stgteil->stgteil_name;
                     $stgbez_name = $stg_stgteil->stgbez_name;
diff --git a/app/controllers/studiengaenge/studiengangteile.php b/app/controllers/studiengaenge/studiengangteile.php
index 0fddd44..bc1449f 100644
--- a/app/controllers/studiengaenge/studiengangteile.php
+++ b/app/controllers/studiengaenge/studiengangteile.php
@@ -144,7 +144,7 @@ class Studiengaenge_StudiengangteileController extends SharedVersionController
             $this->stgteil->contact_assignments = $stgteil_orig->contact_assignments;
 
         } else {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
         $this->perform_relayed('stgteil');
     }
diff --git a/app/controllers/studiengaenge/versionen.php b/app/controllers/studiengaenge/versionen.php
index 9b60b3d..41625bf 100644
--- a/app/controllers/studiengaenge/versionen.php
+++ b/app/controllers/studiengaenge/versionen.php
@@ -52,7 +52,7 @@ class Studiengaenge_VersionenController extends SharedVersionController
                 $this->redirect($this->action_url('index/' .  $this->chooser_filter['stgteile']));
                 return;
             default :
-                throw new Trails_Exception(400);
+                throw new Trails\Exception(400);
         }
         $this->name = $list;
         if (!empty($this->lists[$list]['elements'])) {
@@ -218,7 +218,7 @@ class Studiengaenge_VersionenController extends SharedVersionController
         if ($stgteil_id) {
             $this->stgteil = StudiengangTeil::find($stgteil_id);
             if (!$this->stgteil) {
-                throw new Trails_Exception(404, _('Unbekannter Studiengangteil'));
+                throw new Trails\Exception(404, _('Unbekannter Studiengangteil'));
             }
 
             $this->initPageParams();
diff --git a/app/views/consultation/admin/create.php b/app/views/consultation/admin/create.php
index c973ccf..3da70e0 100644
--- a/app/views/consultation/admin/create.php
+++ b/app/views/consultation/admin/create.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var Consultation_AdminController $controller
- * @var Trails_Flash $flash
+ * @var Trails\Flash $flash
  * @var string|null $room
  * @var array $responsible
  * @var Range $range
diff --git a/app/views/news/admin_news.php b/app/views/news/admin_news.php
index db07d03..e12047a 100644
--- a/app/views/news/admin_news.php
+++ b/app/views/news/admin_news.php
@@ -2,7 +2,7 @@
 /**
  * @var NewsController $controller
  * @var string $area_type
- * @var Trails_Flash $flash
+ * @var Trails\Flash $flash
  * @var string $news_searchterm
  * @var string $news_startdate
  * @var string $news_enddate
diff --git a/cli/Commands/Checks/HelpTours.php b/cli/Commands/Checks/HelpTours.php
index b4b2fa7..b0c201a 100644
--- a/cli/Commands/Checks/HelpTours.php
+++ b/cli/Commands/Checks/HelpTours.php
@@ -59,7 +59,7 @@ class HelpTours extends Command
                         $plugin = new $plugin_info['class']();
 
                         if ($result[1]) {
-                            $dispatcher = app(\Trails_Dispatcher::class);
+                            $dispatcher = app(\Trails\Dispatcher::class);
                             $dispatcher->trails_root = $GLOBALS['ABSOLUTE_PATH_STUDIP'] . $plugin->getPluginPath();
                             $dispatcher->trails_uri = rtrim(\PluginEngine::getLink($plugin, [], null, true), '/');
                             $dispatcher->default_controller = 'index';
@@ -71,7 +71,7 @@ class HelpTours extends Command
                             }
                         }
                     } elseif (match_route('dispatch.php/*', $step->route)) {
-                        $dispatcher = app(\Trails_Dispatcher::class);
+                        $dispatcher = app(\Trails\Dispatcher::class);
                         $parsed = $dispatcher->parse(substr($step->route, strlen('dispatch.php') + 1));
                         $controller = $dispatcher->load_controller($parsed[0]);
                         if ($parsed[1] && !$controller->has_action($parsed[1])) {
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index 0bbad81..cc39fe7 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -63,6 +63,22 @@ class_alias(Flexi\Template::class, 'Flexi_Template');
 class_alias(Flexi\Factory::class, 'Flexi_TemplateFactory');
 class_alias(Flexi\TemplateNotFoundException::class, 'Flexi_TemplateNotFoundException');
 
+// Trails
+StudipAutoloader::addAutoloadPath('lib/trails', 'Trails');
+class_alias(Trails\Controller::class, 'Trails_Controller');
+class_alias(Trails\Dispatcher::class, 'Trails_Dispatcher');
+class_alias(Trails\Exception::class, 'Trails_Exception');
+class_alias(Trails\Flash::class, 'Trails_Flash');
+class_alias(Trails\Inflector::class, 'Trails_Inflector');
+class_alias(Trails\Response::class, 'Trails_Response');
+
+class_alias(Trails\Exceptions\DoubleRenderError::class, 'Trails_DoubleRenderError');
+class_alias(Trails\Exceptions\MissingFile::class, 'Trails_MissingFile');
+class_alias(Trails\Exceptions\RoutingError::class, 'Trails_RoutingError');
+class_alias(Trails\Exceptions\SessionRequiredException::class, 'Trails_SessionRequiredException');
+class_alias(Trails\Exceptions\UnknownAction::class, 'Trails_UnknownAction');
+class_alias(Trails\Exceptions\UnknownController::class, 'Trails_UnknownController');
+
 // Messy file names
 StudipAutoloader::addClassLookups([
     'email_validation_class' => 'lib/phplib/email_validation.class.php',
@@ -71,19 +87,6 @@ StudipAutoloader::addClassLookups([
     'MVVController'          => 'app/controllers/module/mvv_controller.php'
 ]);
 
-// Trails
-$trails_classes = [
-    'Trails_Dispatcher', 'Trails_Response', 'Trails_Controller',
-    'Trails_Inflector', 'Trails_Flash',
-    'Trails_Exception', 'Trails_DoubleRenderError', 'Trails_MissingFile',
-    'Trails_RoutingError', 'Trails_UnknownAction', 'Trails_UnknownController',
-    'Trails_SessionRequiredException',
-];
-StudipAutoloader::addClassLookup(
-    $trails_classes,
-    'vendor/trails/trails.php'
-);
-
 // Vendor
 StudipAutoloader::addClassLookups([
     'PasswordHash' => 'vendor/phpass/PasswordHash.php',
diff --git a/lib/bootstrap-definitions.php b/lib/bootstrap-definitions.php
index ee80135..d34d023 100644
--- a/lib/bootstrap-definitions.php
+++ b/lib/bootstrap-definitions.php
@@ -20,7 +20,7 @@ return [
     StudipPDO::class => DI\factory(function () {
         return DBManager::get();
     }),
-    Trails_Dispatcher::class => DI\factory(function (ContainerInterface $container) {
+    Trails\Dispatcher::class => DI\factory(function (ContainerInterface $container) {
         return new \StudipDispatcher($container);
     }),
 ];
diff --git a/lib/classes/OAuth2/NegotiatesWithPsr7.php b/lib/classes/OAuth2/NegotiatesWithPsr7.php
index 0edf243..b2ee5a1 100644
--- a/lib/classes/OAuth2/NegotiatesWithPsr7.php
+++ b/lib/classes/OAuth2/NegotiatesWithPsr7.php
@@ -5,7 +5,7 @@ namespace Studip\OAuth2;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Psr7\Response;
-use Trails_Response;
+use Trails\Response as TrailsResponse;
 
 trait NegotiatesWithPsr7
 {
@@ -19,9 +19,9 @@ trait NegotiatesWithPsr7
         return new Response();
     }
 
-    protected function convertPsrResponse(ResponseInterface $response): Trails_Response
+    protected function convertPsrResponse(ResponseInterface $response): TrailsResponse
     {
-        $trailsResponse = new Trails_Response((string) $response->getBody(), [], $response->getStatusCode());
+        $trailsResponse = new TrailsResponse((string) $response->getBody(), [], $response->getStatusCode());
         foreach ($response->getHeaders() as $key => $values) {
             foreach ($values as $value) {
                 $trailsResponse->add_header($key, $value);
diff --git a/lib/classes/StudipController.php b/lib/classes/StudipController.php
index ae316c1..4fbcc42 100644
--- a/lib/classes/StudipController.php
+++ b/lib/classes/StudipController.php
@@ -16,7 +16,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 /**
  * @property StudipResponse $response
  */
-abstract class StudipController extends Trails_Controller
+abstract class StudipController extends Trails\Controller
 {
     use StudipControllerPropertiesTrait;
 
@@ -48,7 +48,7 @@ abstract class StudipController extends Trails_Controller
             $GLOBALS['auth']->login_if((Request::get('again') || !$this->allow_nobody) && $GLOBALS['user']->id == 'nobody');
 
             // Setup flash instance
-            $this->flash = Trails_Flash::instance();
+            $this->flash = Trails\Flash::instance();
 
             // set up user session
             include 'lib/seminar_open.php';
@@ -107,7 +107,7 @@ abstract class StudipController extends Trails_Controller
      *
      * @param String $unconsumed_path Path segment containing action and
      *                                optionally arguments or format
-     * @return Trails_Response from parent controller
+     * @return Trails\Response from parent controller
      */
     public function perform($unconsumed_path)
     {
@@ -212,7 +212,7 @@ abstract class StudipController extends Trails_Controller
 
                 case 'option':
                     if (preg_match('/[^\\w,-]/', $arg)) {
-                        throw new Trails_Exception(400);
+                        throw new Trails\Exception(400);
                     }
                     break;
 
@@ -231,7 +231,7 @@ abstract class StudipController extends Trails_Controller
 
                     $sorm = $reflection->newInstance($id);
                     if (!$info['optional'] && $sorm->isNew()) {
-                        throw new Trails_Exception(
+                        throw new Trails\Exception(
                             404,
                             "Parameter {$info['var']} could not be resolved with value {$arg}"
                         );
@@ -247,7 +247,7 @@ abstract class StudipController extends Trails_Controller
                     break;
 
                 default:
-                    throw new Trails_Exception(500, 'Unknown type "' . $type . '"');
+                    throw new Trails\Exception(500, 'Unknown type "' . $type . '"');
             }
         }
 
@@ -497,11 +497,11 @@ abstract class StudipController extends Trails_Controller
         $chunk_size = 262144
     ) {
         if (!file_exists($file)) {
-            throw new Trails_Exception(404);
+            throw new Trails\Exception(404);
         }
 
         if (!is_readable($file)) {
-            throw new Trails_Exception(500);
+            throw new Trails\Exception(500);
         }
 
         if ($content_type === null) {
@@ -593,7 +593,7 @@ abstract class StudipController extends Trails_Controller
      * through
      *
      * @param string $to_uri a trails route
-     * @return Trails_Response
+     * @return Trails\Response
      */
     public function relay($to_uri/* , ... */)
     {
@@ -617,11 +617,11 @@ abstract class StudipController extends Trails_Controller
      * Relays current request and performs redirect if neccessary.
      *
      * @param string $to_uri a trails route
-     * @return Trails_Response
+     * @return Trails\Response
      *
      * @see StudipController::relay()
      */
-    public function relayWithRedirect(...$args): Trails_Response
+    public function relayWithRedirect(...$args): Trails\Response
     {
         $response = $this->relay(...$args);
 
@@ -641,7 +641,7 @@ abstract class StudipController extends Trails_Controller
      *
      * @see perform
      * @param string $unconsumed
-     * @return Trails_Response
+     * @return Trails\Response
      */
     public function perform_relayed($unconsumed/* , ... */)
     {
@@ -695,9 +695,9 @@ abstract class StudipController extends Trails_Controller
      *    <code>$controller->baz($param)</code>
      *
      * @param String $method    Called method name
-     * @param array  $argumetns Provided arguments
-     * @return url to the requested action
-     * @throws Trails_UnknownAction if no action matches the method
+     * @param array  $arguments Provided arguments
+     * @return string url to the requested action
+     * @throws Trails\Exceptions\UnknownAction if no action matches the method
      */
     public function __call($method, $arguments)
     {
@@ -710,7 +710,7 @@ abstract class StudipController extends Trails_Controller
         }
 
         if (!$this->has_action($method)) {
-            throw new Trails_UnknownAction("Unknown action '{$method}'");
+            throw new Trails\Exceptions\UnknownAction("Unknown action '{$method}'");
         }
 
         array_unshift($arguments, $method);
@@ -858,7 +858,7 @@ abstract class StudipController extends Trails_Controller
 
         // Extract controller name from class name
         $controller = preg_replace('/Controller$/', '', get_class($this));
-        $controller = Trails_Inflector::underscore($controller);
+        $controller = Trails\Inflector::underscore($controller);
 
         // Build main parts of the body element id
         $body_id_parts = explode('/', $controller);
diff --git a/lib/classes/StudipDispatcher.php b/lib/classes/StudipDispatcher.php
index af0ea48..a41635a 100644
--- a/lib/classes/StudipDispatcher.php
+++ b/lib/classes/StudipDispatcher.php
@@ -18,29 +18,31 @@ use Psr\Container\ContainerInterface;
 
 /**
  * Use this subclass to easily get an Stud.IP specific
- * Trails_Dispatcher.
+ * Trails\Dispatcher.
  *
  * Example of use:
+ *
  * @code
  * // deep in the Stud.IP jungle
  * $dispatcher = new StudipDispatcher();
  * $dispatcher->dispatch($requested_uri);
  * @endcode
  */
-class StudipDispatcher extends Trails_Dispatcher {
-
-  /**
-   * This variable contains the DI-Container.
-   * @var ContainerInterface
-   */
-  protected $container;
+class StudipDispatcher extends Trails\Dispatcher
+{
+    /**
+     * This variable contains the DI-Container.
+     *
+     * @var ContainerInterface
+     */
+    protected $container;
 
-  /**
-   * Create a new Trails_Dispatcher with Stud.IP specific parameters
-   * for: trails_root is "$STUDIP_BASE_PATH/app", trails_uri is
-   * "dispatch.php" and default_controller is "default" (which does
-   * not map to anything).
-   */
+    /**
+     * Create a new Trails\Dispatcher with Stud.IP specific parameters
+     * for: trails_root is "$STUDIP_BASE_PATH/app", trails_uri is
+     * "dispatch.php" and default_controller is "default" (which does
+     * not map to anything).
+     */
     public function __construct(ContainerInterface $container)
     {
         global $STUDIP_BASE_PATH, $ABSOLUTE_URI_STUDIP;
@@ -58,6 +60,7 @@ class StudipDispatcher extends Trails_Dispatcher {
      * exception instead of the standard trails handling.
      *
      * @param Exception $exception The exception that occured
+     *
      * @throws Exception
      */
     public function trails_error($exception)
@@ -66,21 +69,22 @@ class StudipDispatcher extends Trails_Dispatcher {
     }
 
     /**
-   * Loads the controller file for a given controller path and return an
-   * instance of that controller. If an error occures, an exception will be
-   * thrown.
-   *
-   * @param  string            the relative controller path
-   *
-   * @return TrailsController  an instance of that controller
-   */
-  function load_controller($controller) {
-    require_once "{$this->trails_root}/controllers/{$controller}.php";
-    $class = Trails_Inflector::camelize($controller) . 'Controller';
-    if (!class_exists($class)) {
-      throw new Trails_UnknownController("Controller missing: '$class'");
-    }
+     * Loads the controller file for a given controller path and return an
+     * instance of that controller. If an error occures, an exception will be
+     * thrown.
+     *
+     * @param string $controller the relative controller path
+     * @return Trails\Controller  an instance of that controller
+     * @throws \Trails\Exceptions\UnknownController
+     */
+    public function load_controller($controller)
+    {
+        require_once "{$this->trails_root}/controllers/{$controller}.php";
+        $class = Trails\Inflector::camelize($controller) . 'Controller';
+        if (!class_exists($class)) {
+            throw new Trails\Exceptions\UnknownController("Controller missing: '$class'");
+        }
 
-    return $this->container->make($class, ['dispatcher' => $this]);
-  }
+        return $this->container->make($class, ['dispatcher' => $this]);
+    }
 }
diff --git a/lib/classes/StudipResponse.php b/lib/classes/StudipResponse.php
index 1c15326..a9f1a4c 100644
--- a/lib/classes/StudipResponse.php
+++ b/lib/classes/StudipResponse.php
@@ -1,5 +1,5 @@
 <?php
-class StudipResponse extends Trails_Response
+class StudipResponse extends Trails\Response
 {
     /**
      * Outputs this response to the client using "echo" and "header".
diff --git a/lib/functions.php b/lib/functions.php
index 6b00608..e1b29ed 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1319,7 +1319,7 @@ function get_route($route = '')
         $route = 'plugins.php/' . $pieces[0] . (!empty($pieces[1]) ? '/' . $pieces[1] : '') . (!empty($pieces[2]) ? '/' . $pieces[2] : '');
     } elseif (mb_strpos($route, 'dispatch.php/') !== false) {
         $trails = explode('dispatch.php/', $route);
-        $dispatcher = app(\Trails_Dispatcher::class);
+        $dispatcher = app(\Trails\Dispatcher::class);
         $pieces = explode('/', $trails[1]);
         $trail = '';
         foreach ($pieces as $index => $piece) {
@@ -1399,7 +1399,7 @@ function studip_default_exception_handler($exception) {
     } elseif ($exception instanceof LoginException) {
         $GLOBALS['auth']->login_if(true);
     } else {
-        if ($exception instanceOf Trails_Exception) {
+        if ($exception instanceOf Trails\Exception) {
             $status = $exception->getCode();
         } else {
             $status = 500;
@@ -1458,6 +1458,19 @@ function strtocamelcase($string, $ucfirst = false) {
 }
 
 /**
+ * Converts a string to PascalCase.
+ *
+ * @param String $string  The string that should be converted
+ * @return String containing the converted input string
+ */
+function strtopascalcase(string $string): string {
+    return strtocamelcase(
+        str_replace('_', ' ', $string),
+        true
+    );
+}
+
+/**
  * Converts a string to snake_case.
  *
  * @param String $string  The string that should be converted
diff --git a/lib/modules/EvaluationsWidget.php b/lib/modules/EvaluationsWidget.php
index dab271f..21410e2 100644
--- a/lib/modules/EvaluationsWidget.php
+++ b/lib/modules/EvaluationsWidget.php
@@ -43,7 +43,7 @@ class EvaluationsWidget extends CorePlugin implements PortalPlugin
         }
 
         // include and show votes and tests
-        $controller = app(AuthenticatedController::class, ['dispatcher' => app(\Trails_Dispatcher::class)]);
+        $controller = app(AuthenticatedController::class, ['dispatcher' => app(\Trails\Dispatcher::class)]);
         $controller->suppress_empty_output = true;
         $response = $controller->relay('questionnaire/widget/start')->body;
 
diff --git a/lib/modules/MyCoursesWidget.php b/lib/modules/MyCoursesWidget.php
index 81aceed..ba73e5b 100644
--- a/lib/modules/MyCoursesWidget.php
+++ b/lib/modules/MyCoursesWidget.php
@@ -26,7 +26,7 @@ class MyCoursesWidget extends CorePlugin implements PortalPlugin
     public function getPortalTemplate()
     {
         // get the MyCoursesController in order to prepare the correct data for the overview
-        $controller = app(MyCoursesController::class, ['dispatcher' => app(\Trails_Dispatcher::class)]);
+        $controller = app(MyCoursesController::class, ['dispatcher' => app(\Trails\Dispatcher::class)]);
         $data = $controller->getPortalWidgetData();
 
         // add the json data to the head so vue can grab it
diff --git a/lib/modules/NewsWidget.php b/lib/modules/NewsWidget.php
index fc3befd..ae211f2 100644
--- a/lib/modules/NewsWidget.php
+++ b/lib/modules/NewsWidget.php
@@ -25,7 +25,7 @@ class NewsWidget extends CorePlugin implements PortalPlugin
 
     function getPortalTemplate()
     {
-        $controller = app(\Trails_Dispatcher::class)->load_controller('news');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('news');
         $response = $controller->relayWithRedirect('news/display/studip');
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;
diff --git a/lib/modules/TerminWidget.php b/lib/modules/TerminWidget.php
index 773e692..4274ee4 100644
--- a/lib/modules/TerminWidget.php
+++ b/lib/modules/TerminWidget.php
@@ -26,7 +26,7 @@ class TerminWidget extends CorePlugin implements PortalPlugin
 
     public function getPortalTemplate()
     {
-        $controller = app(\Trails_Dispatcher::class)->load_controller('calendar/contentbox');
+        $controller = app(\Trails\Dispatcher::class)->load_controller('calendar/contentbox');
         $response = $controller->relay('calendar/contentbox/display/'.$GLOBALS['user']->id);
         $template = $GLOBALS['template_factory']->open('shared/string');
         $template->content = $response->body;
diff --git a/lib/plugins/core/StudIPPlugin.class.php b/lib/plugins/core/StudIPPlugin.class.php
index ea5c8ff..fe74259 100644
--- a/lib/plugins/core/StudIPPlugin.class.php
+++ b/lib/plugins/core/StudIPPlugin.class.php
@@ -196,14 +196,14 @@ abstract class StudIPPlugin
         $action = $args[0] !== '' ? array_shift($args).'_action' : 'show_action';
 
         if (!method_exists($this, $action)) {
-            $dispatcher = app(\Trails_Dispatcher::class);
+            $dispatcher = app(\Trails\Dispatcher::class);
             $dispatcher->trails_root = $this->getPluginPath();
             $dispatcher->trails_uri = rtrim(PluginEngine::getLink($this, [], null, true), '/');
             $dispatcher->default_controller = 'index';
             $dispatcher->current_plugin = $this;
             try {
                 $dispatcher->dispatch($unconsumed_path);
-            } catch (Trails_UnknownAction $exception) {
+            } catch (Trails\Exceptions\UnknownAction $exception) {
                 if (count($args) > 0) {
                     throw $exception;
                 } else {
diff --git a/lib/seminar_open.php b/lib/seminar_open.php
index 1c0056b..2e831bf 100644
--- a/lib/seminar_open.php
+++ b/lib/seminar_open.php
@@ -216,7 +216,7 @@ if (is_object($GLOBALS['user'])
     if (!Request::isXhr()) {
         header('Location: ' . URLHelper::getURL('dispatch.php/terms', ['return_to' => $_SERVER['REQUEST_URI'], 'redirect_token' => Token::create(600)], true));
     } else {
-        throw new Trails_Exception(400);
+        throw new Trails\Exception(400);
     }
     page_close();
     die;
diff --git a/lib/trails/Controller.php b/lib/trails/Controller.php
new file mode 100644
index 0000000..a5a0ba7
--- /dev/null
+++ b/lib/trails/Controller.php
@@ -0,0 +1,411 @@
+<?php
+namespace Trails;
+
+use Flexi\Factory;
+use Flexi\Template;
+use Flexi\TemplateNotFoundException;
+use Trails\Exceptions\DoubleRenderError;
+use Trails\Exceptions\UnknownAction;
+
+/**
+ * A Controller is responsible for matching the unconsumed part of an URI
+ * to an action using the left over words as arguments for that action. The
+ * action is then mapped to method of the controller instance which is called
+ * with the just mentioned arguments. That method can send the #render_action,
+ * #render_template, #render_text, #render_nothing or #redirect method.
+ * Otherwise the #render_action is called with the current action as argument.
+ * If the action method sets instance variables during performing, they will be
+ * be used as attributes for the flexi-template opened by #render_action or
+ * #render_template. A controller's response's body is populated with the output
+ * of the #render_* methods. The action methods can add additional headers or
+ * change the status of that response.
+ *
+ * @package       trails
+ *
+ * @author        mlunzena
+ * @copyright (c) Authors
+ * @version       $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
+ */
+class Controller
+{
+    protected Dispatcher $dispatcher;
+    protected Response $response;
+    protected bool $performed = false;
+    protected Template|string|null $layout;
+    protected string $format = 'html';
+
+    /**
+     * @param Dispatcher $dispatcher the dispatcher who creates this instance
+     */
+    public function __construct(Dispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+        $this->erase_response();
+    }
+
+    /**
+     * Resets the response of the controller
+     *
+     * @return void
+     */
+    public function erase_response()
+    {
+        $this->performed = false;
+        $this->response = new Response();
+    }
+
+    /**
+     * Return this controller's response
+     *
+     * @return Response the controller's response
+     */
+    public function get_response()
+    {
+        return $this->response;
+    }
+
+    /**
+     * This method extracts an action string and further arguments from it's
+     * parameter. The action string is mapped to a method being called afterwards
+     * using the said arguments. That method is called and a response object is
+     * generated, populated and sent back to the dispatcher.
+     *
+     * @param string $unconsumed
+     *
+     * @return Response
+     * @throws UnknownAction
+     */
+    public function perform($unconsumed)
+    {
+        [$action, $args, $format] = $this->extract_action_and_args($unconsumed);
+
+        $this->format = $format ?? 'html';
+
+        $before_filter_result = $this->before_filter($action, $args);
+
+        # send action to controller
+        # TODO (mlunzena) shouldn't the after filter be triggered too?
+        if (!($before_filter_result === false || $this->performed)) {
+
+            $callable = $this->map_action($action);
+
+            if (is_callable($callable)) {
+                $callable(...$args);
+            } else {
+                $this->does_not_understand($action, $args);
+            }
+
+            if (!$this->performed) {
+                $this->render_action($action);
+            }
+
+            $this->after_filter($action, $args);
+        }
+
+        return $this->response;
+    }
+
+    /**
+     * Extracts action and args from a string.
+     *
+     * @param string $string the processed string
+     * @return array        an array with two elements - a string containing the
+     *                      action and an array of strings representing the args
+     */
+    public function extract_action_and_args($string)
+    {
+        if ('' === $string) {
+            return $this->default_action_and_args();
+        }
+
+        // find optional file extension
+        $format = null;
+        if (preg_match('/^(.*[^\/.])\.(\w+)$/', $string, $matches)) {
+            [, $string, $format] = $matches;
+        }
+
+        // TODO this should possibly remove empty tokens
+        $args = explode('/', $string);
+        $action = array_shift($args);
+        return [$action, $args, $format];
+    }
+
+    /**
+     * Return the default action and arguments
+     *
+     * @return array containing the action, an array of args and the format
+     */
+    public function default_action_and_args()
+    {
+        return ['index', [], null];
+    }
+
+    /**
+     * Maps the action to an actual method name.
+     *
+     * @param string $action
+     * @return array  the mapped method name
+     */
+    public function map_action($action)
+    {
+        return [&$this, $action . '_action'];
+    }
+
+    /**
+     * Callback function being called before an action is executed. If this
+     * function does not return FALSE, the action will be called, otherwise
+     * an error will be generated and processing will be aborted. If this function
+     * already #rendered or #redirected, further processing of the action is
+     * withheld.
+     *
+     * @param string $action Name of the action to perform.
+     * @param array  $args   An array of arguments to the action.
+     * @return bool|void
+     */
+    public function before_filter(&$action, &$args)
+    {
+    }
+
+    /**
+     * Callback function being called after an action is executed.
+     *
+     * @param string $action Name of the action to perform.
+     * @param array  $args   An array of arguments to the action.
+     * @return void
+     */
+    public function after_filter($action, $args)
+    {
+    }
+
+    /**
+     * @param string $action
+     * @param array  $args
+     * @return void
+     * @throws UnknownAction
+     */
+    public function does_not_understand($action, $args)
+    {
+        throw new Exceptions\UnknownAction("No action responded to '$action'.");
+    }
+
+    /**
+     * @param string $to
+     *
+     * @return void
+     * @throws DoubleRenderError
+     */
+    public function redirect($to)
+    {
+        if ($this->performed) {
+            throw new Exceptions\DoubleRenderError();
+        }
+
+        $this->performed = true;
+
+        # get uri; keep absolute URIs
+        $url = preg_match('#^(/|\w+://)#', $to)
+            ? $to
+            : $this->url_for($to);
+
+        $this->response->add_header('Location', $url)->set_status(302);
+    }
+
+    /**
+     * Renders the given text as the body of the response.
+     *
+     * @param string $text the text to be rendered
+     * @return void
+     * @throws DoubleRenderError
+     */
+    public function render_text($text = ' ')
+    {
+        if ($this->performed) {
+            throw new Exceptions\DoubleRenderError();
+        }
+
+        $this->performed = true;
+
+        $this->response->set_body($text);
+    }
+
+    /**
+     * Renders the empty string as the response's body.
+     *
+     * @return void
+     * @throws DoubleRenderError
+     */
+    public function render_nothing()
+    {
+        $this->render_text('');
+    }
+
+    /**
+     * Renders the template of the given action as the response's body.
+     *
+     * @param string $action the action
+     * @return void
+     */
+    public function render_action($action)
+    {
+        $this->render_template(
+            $this->get_default_template($action),
+            $this->layout
+        );
+    }
+
+    public function get_default_template($action)
+    {
+        $controller_name = Inflector::underscore(
+            substr(static::class, 0, -10)
+        );
+        return $controller_name . '/' . $action;
+    }
+
+    /**
+     * Renders a template using an optional layout template.
+     *
+     * @param Template|string      $template_name a flexi template
+     * @param Template|string|null $layout        a flexi template which is used as layout
+     *
+     * @return void
+     * @throws DoubleRenderError
+     * @throws TemplateNotFoundException
+     */
+    public function render_template($template_name, $layout = null)
+    {
+        $factory = $this->get_template_factory();
+        $template = $factory->open($template_name);
+
+        $template->set_attributes($this->get_assigned_variables());
+
+        if (isset($layout)) {
+            $template->set_layout($layout);
+        }
+
+        $this->render_text($template->render());
+    }
+
+    /**
+     * Create and return a template factory for this controller.
+     *
+     * @return Factory
+     */
+    public function get_template_factory()
+    {
+        return new Factory($this->dispatcher->trails_root . '/views/');
+    }
+
+    /**
+     * This method returns all the set instance variables to be used as attributes
+     * for a template. This controller is returned too as value for
+     * key 'controller'.
+     *
+     * @return array  an associative array of variables for the template
+     */
+    public function get_assigned_variables()
+    {
+        $assigns = [];
+        $protected = get_class_vars(static::class);
+
+        foreach (get_object_vars($this) as $var => $value) {
+            if (!array_key_exists($var, $protected)) {
+                $assigns[$var] =& $this->$var;
+            }
+        }
+
+        $assigns['controller'] = $this;
+
+        return $assigns;
+    }
+
+    /**
+     * Sets the layout to be used by this controller per default.
+     *
+     * @param Template|string|null $layout a flexi template to be used as layout
+     * @return void
+     */
+    public function set_layout($layout)
+    {
+        $this->layout = $layout;
+    }
+
+    /**
+     * Returns a URL to a specified route to your Trails application.
+     *
+     * Example:
+     * Your Trails application is located at 'http://example.com/dispatch.php'.
+     * So your dispatcher's trails_uri is set to 'http://example.com/dispatch.php'
+     * If you want the URL to your 'wiki' controller with action 'show' and
+     * parameter 'page' you should send:
+     *
+     *   $url = $controller->url_for('wiki/show', 'page');
+     *
+     * $url should then contain 'http://example.com/dispatch.php/wiki/show/page'.
+     *
+     * The first parameter is a string containing the controller and optionally an
+     * action:
+     *
+     *   - "{controller}/{action}"
+     *   - "path/to/controller/action"
+     *   - "controller"
+     *
+     * This "controller/action" string is not url encoded. You may provide
+     * additional parameter which will be urlencoded and concatenated with
+     * slashes:
+     *
+     *     $controller->url_for('wiki/show', 'page');
+     *     -> 'wiki/show/page'
+     *
+     *     $controller->url_for('wiki/show', 'page', 'one and a half');
+     *     -> 'wiki/show/page/one+and+a+half'
+     *
+     * @param string $to a string containing a controller and optionally an action
+     * @return string  a URL to this route
+     */
+    public function url_for($to/*, ...*/)
+    {
+        # urlencode all but the first argument
+        $args = func_get_args();
+        $args = array_map('urlencode', $args);
+        $args[0] = $to;
+
+        return $this->dispatcher->trails_uri . '/' . implode('/', $args);
+    }
+
+    /**
+     * @param int $status
+     * @return void
+     */
+    public function set_status($status, $reason_phrase = null)
+    {
+        $this->response->set_status($status, $reason_phrase);
+    }
+
+    /**
+     * Sets the content type of the controller's response.
+     *
+     * @param string $type the content type
+     * @return void
+     */
+    public function set_content_type($type)
+    {
+        $this->response->add_header('Content-Type', $type);
+    }
+
+    /**
+     * Exception handler called when the performance of an action raises an
+     * exception.
+     *
+     * @param \Throwable $exception the thrown exception
+     * @return Response  a response object
+     */
+    public function rescue($exception)
+    {
+        return $this->dispatcher->trails_error($exception);
+    }
+
+    public function respond_to($ext)
+    {
+        return $this->format === $ext;
+    }
+}
diff --git a/lib/trails/Dispatcher.php b/lib/trails/Dispatcher.php
new file mode 100644
index 0000000..efa90c7
--- /dev/null
+++ b/lib/trails/Dispatcher.php
@@ -0,0 +1,262 @@
+<?php
+namespace Trails;
+
+use Trails\Exceptions\MissingFile;
+use Trails\Exceptions\RoutingError;
+use Trails\Exceptions\UnknownController;
+
+/**
+ * The Dispatcher is used to map an incoming HTTP request to a Controller
+ * producing a response which is then rendered. To initialize an instance of
+ * class Dispatcher you have to give three configuration settings:
+ *
+ *          trails_root - the absolute file path to a directory containing the
+ *                        applications controllers, views etc.
+ *           trails_uri - the URI to which routes to mapped Controller/Actions
+ *                        are appended
+ *   default_controller - the route to a controller, that is used if no
+ *                        controller is given, that is the route is equal to '/'
+ *
+ * After instantiation of a dispatcher you have to call method #dispatch with
+ * the request uri to be mapped to a controller/action pair.
+ *
+ * @package       trails
+ *
+ * @author        mlunzena
+ * @copyright (c) Authors
+ * @version       $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
+ */
+class Dispatcher
+{
+    # TODO (mlunzena) Konfiguration muss anders geschehen
+
+    /**
+     * This is the absolute file path to the trails application directory.
+     */
+    public string $trails_root;
+
+    /**
+     * This is the URI to which routes to controller/actions are appended.
+     */
+    public string $trails_uri;
+
+    /**
+     * This variable contains the route to the default controller.
+     */
+    public string $default_controller;
+
+    /**
+     * @param string $trails_root        absolute file path to a directory containing the
+     *                 applications controllers, views etc.
+     * @param string $trails_uri         the URI to which routes to mapped Controller/Actions
+     *                 are appended
+     * @param string $default_controller the route to a controller, that is used if no
+     *                 controller is given, that is the route is equal to '/'
+     */
+    public function __construct(
+        string $trails_root,
+        string $trails_uri,
+        string $default_controller
+    ) {
+        $this->trails_root = $trails_root;
+        $this->trails_uri = $trails_uri;
+        $this->default_controller = $default_controller;
+    }
+
+    /**
+     * Maps a string to a response which is then rendered.
+     *
+     * @param string $uri The requested URI.
+     */
+    public function dispatch($uri)
+    {
+        # E_USER_ERROR|E_USER_WARNING|E_USER_NOTICE|E_RECOVERABLE_ERROR = 5888
+        $old_handler = set_error_handler([$this, 'error_handler'], 5888);
+
+        ob_start();
+        $level = ob_get_level();
+
+        $this->map_uri_to_response($this->clean_request_uri((string) $uri))->output();
+
+        while (ob_get_level() >= $level) {
+            ob_end_flush();
+        }
+
+        if (isset($old_handler)) {
+            set_error_handler($old_handler);
+        }
+    }
+
+    /**
+     * Maps an URI to a response by figuring out first what controller to
+     * instantiate, then delegating the unconsumed part of the URI to the
+     * controller who returns an appropriate response object or throws an
+     * Exception.
+     *
+     * @param string $uri the URI string
+     * @return Response a response object
+     */
+    public function map_uri_to_response($uri)
+    {
+        try {
+            [$controller_path, $unconsumed] = '' === $uri ? $this->default_route() : $this->parse($uri);
+
+            $controller = $this->load_controller($controller_path);
+
+            $response = $controller->perform($unconsumed);
+        } catch (Exception $e) {
+            $response = isset($controller) ? $controller->rescue($e) : $this->trails_error($e);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @return array  an array containing the default controller and an
+     *                empty unconsumed route
+     * @throws MissingFile
+     */
+    public function default_route()
+    {
+        if (!$this->file_exists($this->default_controller . '.php')) {
+            throw new Exceptions\MissingFile(
+                "Default controller '{$this->default_controller}' not found'"
+            );
+        }
+        return [$this->default_controller, ''];
+    }
+
+    public function trails_error($exception)
+    {
+        ob_clean();
+
+        # show details for local requests
+        $detailed = @$_SERVER['REMOTE_ADDR'] === '127.0.0.1';
+
+        $body = sprintf('<html><head><title>Trails Error</title></head>' .
+            '<body><h1>%s</h1><pre>%s</pre></body></html>',
+            htmlentities($exception->__toString()),
+            $detailed
+                ? htmlentities($exception->getTraceAsString())
+                : '');
+
+        if ($exception instanceof Exception) {
+            $response = new Response(
+                $body,
+                $exception->getHeaders(),
+                $exception->getCode(),
+                $exception->getMessage()
+            );
+        } else {
+            $response = new Response(
+                $body,
+                [],
+                500,
+                $exception->getMessage()
+            );
+        }
+
+        return $response;
+    }
+
+    /**
+     * Clean up URI string by removing the query part and leading slashes.
+     *
+     * @param string $uri an URI string
+     * @return string  the cleaned string
+     */
+    public function clean_request_uri($uri)
+    {
+        $pos = strpos($uri, '?');
+        if ($pos !== false) {
+            $uri = substr($uri, 0, $pos);
+        }
+        return ltrim($uri, '/');
+    }
+
+    /**
+     * @param string $unconsumed
+     * @param string $controller
+     * @return array
+     * @throws RoutingError
+     */
+    public function parse($unconsumed, $controller = null)
+    {
+        [$head, $tail] = $this->split_on_first_slash($unconsumed);
+
+        if (!preg_match('/^\w+$/', $head)) {
+            throw new RoutingError("No route matches '$head'");
+        }
+
+        $controller = (isset($controller) ? $controller . '/' : '') . $head;
+
+        if ($this->file_exists($controller . '.php')) {
+            return [$controller, $tail];
+        }
+
+        if ($this->file_exists($controller)) {
+            return $this->parse($tail, $controller);
+        }
+
+        throw new RoutingError("No route matches '$head'");
+    }
+
+    /**
+     * @param string $str
+     * @return array
+     */
+    public function split_on_first_slash($str)
+    {
+        preg_match(":([^/]*)(/+)?(.*):", $str, $matches);
+        return [$matches[1], $matches[3]];
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function file_exists($path)
+    {
+        return file_exists("{$this->trails_root}/controllers/$path");
+    }
+
+    /**
+     * Loads the controller file for a given controller path and return an
+     * instance of that controller. If an error occures, an exception will be
+     * thrown.
+     *
+     * @param string $controller the relative controller path
+     * @return Controller  an instance of that controller
+     * @throws UnknownController
+     */
+    public function load_controller($controller)
+    {
+        require_once "{$this->trails_root}/controllers/{$controller}.php";
+        $class = Inflector::camelize($controller) . 'Controller';
+        if (!class_exists($class)) {
+            throw new UnknownController("Controller missing: '$class'");
+        }
+        return new $class($this);
+    }
+
+    /**
+     * This method transforms E_USER_* and E_RECOVERABLE_ERROR to
+     * Exceptions.
+     *
+     * @param integer $errno  the level of the error raised
+     * @param string  $string the error message
+     * @param string  $file   the filename that the error was raised in
+     * @param integer $line   the line number the error was raised at
+     *
+     * @return bool
+     * @throws Exception
+     *
+     */
+    public function error_handler($errno, $string, $file, $line)
+    {
+        if (!(5888 & $errno)) {
+            return false;
+        }
+        throw new Exception(500, $string);
+    }
+}
diff --git a/lib/trails/Exception.php b/lib/trails/Exception.php
new file mode 100644
index 0000000..fd92b35
--- /dev/null
+++ b/lib/trails/Exception.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Trails;
+
+/**
+ * @author        mlunzena
+ * @copyright (c) Authors
+ * @version       $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
+ */
+class Exception extends \Exception
+{
+    protected array $headers;
+
+    /**
+     * @param int         $status  the status code to be set in the response
+     * @param string|null $reason  a human readable presentation of the status code
+     * @param array       $headers a hash of additional headers to be set in the response
+     */
+    public function __construct(int $status = 500, string $reason = null, array $headers = [])
+    {
+        parent::__construct(
+            $reason ?? Response::get_reason($status),
+            $status
+        );
+
+        $this->setHeaders($headers);
+    }
+
+    public function setHeaders(array $headers): void
+    {
+        $this->headers = $headers;
+    }
+
+    public function getHeaders(): array
+    {
+        return $this->headers;
+    }
+
+    public function __toString(): string
+    {
+        return "{$this->code} {$this->message}";
+    }
+}
diff --git a/lib/trails/Exceptions/DoubleRenderError.php b/lib/trails/Exceptions/DoubleRenderError.php
new file mode 100644
index 0000000..c2dfe9e
--- /dev/null
+++ b/lib/trails/Exceptions/DoubleRenderError.php
@@ -0,0 +1,13 @@
+<?php
+namespace Trails\Exceptions;
+
+class DoubleRenderError extends \Trails\Exception
+{
+    public function __construct()
+    {
+        $message  = 'Render and/or redirect were called multiple times in this ';
+        $message .= 'action. Please note that you may only call render OR ';
+        $message .= 'redirect, and at most once per action.';
+        parent::__construct(500, $message);
+    }
+}
diff --git a/lib/trails/Exceptions/MissingFile.php b/lib/trails/Exceptions/MissingFile.php
new file mode 100644
index 0000000..59e8480
--- /dev/null
+++ b/lib/trails/Exceptions/MissingFile.php
@@ -0,0 +1,10 @@
+<?php
+namespace Trails\Exceptions;
+
+class MissingFile extends \Trails\Exception
+{
+    public function __construct(string $message)
+    {
+        parent::__construct(500, $message);
+    }
+}
diff --git a/lib/trails/Exceptions/RoutingError.php b/lib/trails/Exceptions/RoutingError.php
new file mode 100644
index 0000000..e62459e
--- /dev/null
+++ b/lib/trails/Exceptions/RoutingError.php
@@ -0,0 +1,10 @@
+<?php
+namespace Trails\Exceptions;
+
+class RoutingError extends \Trails\Exception
+{
+    public function __construct(string $message)
+    {
+        parent::__construct(400, $message);
+    }
+}
diff --git a/lib/trails/Exceptions/SessionRequiredException.php b/lib/trails/Exceptions/SessionRequiredException.php
new file mode 100644
index 0000000..b77a344
--- /dev/null
+++ b/lib/trails/Exceptions/SessionRequiredException.php
@@ -0,0 +1,11 @@
+<?php
+namespace Trails\Exceptions;
+
+class SessionRequiredException extends \Trails\Exception
+{
+    public function __construct()
+    {
+        $message = 'Tried to access a non existing session.';
+        parent::__construct(500, $message);
+    }
+}
diff --git a/lib/trails/Exceptions/UnknownAction.php b/lib/trails/Exceptions/UnknownAction.php
new file mode 100644
index 0000000..f749a51
--- /dev/null
+++ b/lib/trails/Exceptions/UnknownAction.php
@@ -0,0 +1,10 @@
+<?php
+namespace Trails\Exceptions;
+
+class UnknownAction extends \Trails\Exception
+{
+    public function __construct(string $message)
+    {
+        parent::__construct(404, $message);
+    }
+}
diff --git a/lib/trails/Exceptions/UnknownController.php b/lib/trails/Exceptions/UnknownController.php
new file mode 100644
index 0000000..420c238
--- /dev/null
+++ b/lib/trails/Exceptions/UnknownController.php
@@ -0,0 +1,10 @@
+<?php
+namespace Trails\Exceptions;
+
+class UnknownController extends \Trails\Exception
+{
+    public function __construct(string $message)
+    {
+        parent::__construct(404, $message);
+    }
+}
diff --git a/lib/trails/Flash.php b/lib/trails/Flash.php
new file mode 100644
index 0000000..eede7af
--- /dev/null
+++ b/lib/trails/Flash.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace Trails;
+
+use Trails\Exceptions\SessionRequiredException;
+
+/**
+ * The flash provides a way to pass temporary objects between actions.
+ * Anything you place in the flash will be exposed to the very next action and
+ * then cleared out. This is a great way of doing notices and alerts, such as
+ * a create action that sets
+ * <tt>$flash->set('notice', "Successfully created")</tt>
+ * before redirecting to a display action that can then expose the flash to its
+ * template.
+ *
+ * @package       trails
+ *
+ * @author        mlunzena
+ * @copyright (c) Authors
+ * @version       $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
+ */
+final class Flash implements \ArrayAccess
+{
+    private array $flash = [];
+    private array $used = [];
+
+    /**
+     * @return self
+     * @throws SessionRequiredException
+     */
+    public static function instance()
+    {
+        if (!isset($_SESSION)) {
+            throw new Exceptions\SessionRequiredException();
+        }
+
+        if (!isset($_SESSION[self::class])) {
+            $_SESSION[self::class] = new self();
+        }
+        return $_SESSION[self::class];
+    }
+
+    public function offsetExists($offset): bool
+    {
+        return isset($this->flash[$offset]);
+    }
+
+    public function offsetGet($offset): mixed
+    {
+        return $this->get($offset);
+    }
+
+    public function offsetSet($offset, $value): void
+    {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset): void
+    {
+        unset($this->flash[$offset], $this->used[$offset]);
+    }
+
+    /**
+     * Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
+     *     use()               # marks the entire flash as used
+     *     use('msg')          # marks the "msg" entry as used
+     *     use(null, false)    # marks the entire flash as unused
+     *                         # (keeps it around for one more action)
+     *     use('msg', false)   # marks the "msg" entry as unused
+     *                         # (keeps it around for one more action)
+     *
+     */
+    private function use(?string $key = null, bool $isUsed = true): void
+    {
+        if ($key) {
+            $this->used[$key] = $isUsed;
+        } else {
+            foreach (array_keys($this->used) as $key) {
+                $this->use($key, $isUsed);
+            }
+        }
+    }
+
+    /**
+     * Marks the entire flash or a single flash entry to be discarded by the end
+     * of the current action.
+     *
+     *     $flash->discard()             # discards entire flash
+     *                                   # (it'll still be available for the
+     *                                   # current action)
+     *     $flash->discard('warning')    # discard the "warning" entry
+     *                                   # (it'll still be available for the
+     *                                   # current action)
+     */
+    public function discard(?string $key = null): void
+    {
+        $this->use($key);
+    }
+
+    /**
+     * Returns the value to the specified key.
+     *
+     * @return mixed the key's value.
+     */
+    public function &get(string $key): mixed
+    {
+        $return = null;
+        if (isset($this->flash[$key])) {
+            $return =& $this->flash[$key];
+        }
+        return $return;
+    }
+
+    /**
+     * Keeps either the entire current flash or a specific flash entry available
+     * for the next action:
+     *
+     *    $flash->keep()           # keeps the entire flash
+     *    $flash->keep('notice')   # keeps only the "notice" entry, the rest of
+     *                             # the flash is discarded
+     */
+    public function keep(?string $key = null): void
+    {
+        $this->use($key, false);
+    }
+
+    /**
+     * Sets a key's value.
+     */
+    public function set(string $key, mixed $value): void
+    {
+        $this->keep($key);
+        $this->flash[$key] = $value;
+    }
+
+    /**
+     * Sets a key's value by reference.
+     */
+    public function set_ref(string $key, mixed &$value): void
+    {
+        $this->keep($key);
+        $this->flash[$key] =& $valze;
+    }
+
+    /**
+     * Removes all used values
+     */
+    public function sweep(): void
+    {
+        foreach (array_keys($this->flash) as $k) {
+            if ($this->used[$k]) {
+                unset($this->flash[$k], $this->used[$k]);
+            } else {
+                $this->use($k);
+            }
+        }
+    }
+
+    public function __toString()
+    {
+        $values = [];
+        foreach ($this->flash as $key => $value) {
+            $values[] = sprintf(
+                "'%s': [%s, '%s']",
+                $key,
+                var_export($value, true),
+                !empty($this->used[$key]) ? 'used' : 'unused'
+            );
+        }
+        return '{' . implode(', ', $values) . '}'. "\n";
+    }
+
+    public function __sleep(): array
+    {
+        $this->sweep();
+        return ['flash', 'used'];
+    }
+
+
+    public function __wakeUp()
+    {
+        $this->discard();
+    }
+}
diff --git a/lib/trails/Inflector.php b/lib/trails/Inflector.php
new file mode 100644
index 0000000..bbc6b58
--- /dev/null
+++ b/lib/trails/Inflector.php
@@ -0,0 +1,44 @@
+<?php
+namespace Trails;
+
+/**
+ * The Inflector class is a namespace for inflections methods.
+ *
+ * @package       trails
+ *
+ * @author        mlunzena
+ * @copyright (c) Authors
+ * @version       $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
+ */
+class Inflector
+{
+    /**
+     * Returns a camelized string from a lower case and underscored string by
+     * replacing slash with underscore and upper-casing each letter preceded
+     * by an underscore.
+     *
+     * @param string $word String to camelize.
+     * @return string Camelized string.
+     */
+    public static function camelize(string $word): string
+    {
+        $parts = explode('/', $word);
+        foreach ($parts as $key => $part) {
+            $parts[$key] = strtopascalcase($part);
+        }
+        return implode('_', $parts);
+    }
+
+    /**
+     * @param string $word
+     * @return string
+     */
+    public static function underscore(string $word): string
+    {
+        $parts = explode('_', $word);
+        foreach ($parts as $key => $part) {
+            $parts[$key] = strtosnakecase($part);
+        }
+        return implode('/', $parts);
+    }
+}
diff --git a/lib/trails/Response.php b/lib/trails/Response.php
new file mode 100644
index 0000000..b3f14d8
--- /dev/null
+++ b/lib/trails/Response.php
@@ -0,0 +1,185 @@
+<?php
+namespace Trails;
+
+/**
+ * This class represents a response returned by a controller that was asked to
+ * perform for a given request. A Response contains the body, status and
+ * additional headers which can be renderer back to the client.
+ *
+ * @package       trails
+ *
+ * @author        mlunzena
+ * @copyright (c) Authors
+ * @version       $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
+ */
+class Response
+{
+    public $body = '';
+    public $status;
+    public $reason;
+    public $headers = [];
+
+    /**
+     * Constructor.
+     *
+     * @param string      $body    the body of the response defaulting to ''
+     * @param array       $headers an array of additional headers defaulting to an
+     *                             empty array
+     * @param int|null    $status  the status code of the response defaulting to a
+     *                             regular 200
+     * @param string|null $reason  the descriptional reason for a status code defaulting to
+     *                             the standard reason phrases defined in RFC 2616
+     */
+    public function __construct(
+        string $body = '',
+        array $headers = [],
+        ?int $status = null,
+        ?string $reason = null
+    ) {
+        $this->set_body($body);
+
+        $this->headers = $headers;
+
+        if (isset($status)) {
+            $this->set_status($status, $reason);
+        }
+    }
+
+    /**
+     * Sets the body of the response.
+     *
+     * @param string $body the body
+     * @return static   this response object. Useful for cascading method calls.
+     */
+    public function set_body($body)
+    {
+        $this->body = $body;
+        return $this;
+    }
+
+    /**
+     * Sets the status code and an optional custom reason. If none is given, the
+     * standard reason phrase as of RFC 2616 is used.
+     *
+     * @param integer $status the status code
+     * @param string  $reason the custom reason, defaulting to the one given in RFC 2616
+     * @return static    this response object. Useful for cascading method calls.
+     */
+    public function set_status($status, $reason = null)
+    {
+        $this->status = $status;
+        $this->reason = $reason ?? self::get_reason($status);
+        return $this;
+    }
+
+    /**
+     * Returns the reason phrase of this response according to RFC2616.
+     *
+     * @param int $status the response's status
+     * @return string  the reason phrase for this response's status
+     */
+    public static function get_reason($status)
+    {
+        return match ($status) {
+            100 => 'Continue',
+            101 => 'Switching Protocols',
+
+            200 => 'OK',
+            201 => 'Created',
+            202 => 'Accepted',
+            203 => 'Non-Authoritative Information',
+            204 => 'No Content',
+            205 => 'Reset Content',
+            206 => 'Partial Content',
+
+            300 => 'Multiple Choices',
+            301 => 'Moved Permanently',
+            302 => 'Found',
+            303 => 'See Other',
+            304 => 'Not Modified',
+            305 => 'Use Proxy',
+            306 => '(Unused)',
+            307 => 'Temporary Redirect',
+
+            400 => 'Bad Request',
+            401 => 'Unauthorized',
+            402 => 'Payment Required',
+            403 => 'Forbidden',
+            404 => 'Not Found',
+            405 => 'Method Not Allowed',
+            406 => 'Not Acceptable',
+            407 => 'Proxy Authentication Required',
+            408 => 'Request Timeout',
+            409 => 'Conflict',
+            410 => 'Gone',
+            411 => 'Length Required',
+            412 => 'Precondition Failed',
+            413 => 'Request Entity Too Large',
+            414 => 'Request-URI Too Long',
+            415 => 'Unsupported Media Type',
+            416 => 'Requested Range Not Satisfiable',
+            417 => 'Expectation Failed',
+
+            500 => 'Internal Server Error',
+            501 => 'Not Implemented',
+            502 => 'Bad Gateway',
+            503 => 'Service Unavailable',
+            504 => 'Gateway Timeout',
+            505 => 'HTTP Version Not Supported',
+
+            default => '',
+        };
+    }
+
+    /**
+     * Adds an additional header to the response.
+     *
+     * @param string $key   the left hand key part
+     * @param string $value the right hand value part
+     * @return static   this response object. Useful for cascading method calls.
+     */
+    public function add_header($key, $value)
+    {
+        $this->headers[$key] = $value;
+        return $this;
+    }
+
+    /**
+     * Outputs this response to the client using "echo" and "header".
+     * @return void
+     */
+    public function output()
+    {
+        if (isset($this->status)) {
+            $this->send_header(
+                "HTTP/1.1 {$this->status} {$this->reason}",
+                true,
+                $this->status
+            );
+        }
+
+        foreach ($this->headers as $k => $v) {
+            $this->send_header("{$k}: {$v}");
+        }
+
+        echo $this->body;
+    }
+
+    /**
+     * Internally used function to actually send headers
+     *
+     * @param string  $header  the HTTP header
+     * @param bool    $replace optional; TRUE if previously sent header should be
+     *                    replaced - FALSE otherwise (default)
+     * @param integer $status  optional; the HTTP response code
+     * @return void
+     */
+    public function send_header($header, $replace = false, $status = null)
+    {
+        if (isset($status)) {
+            header($header, $replace, $status);
+        } else {
+            header($header, $replace);
+        }
+    }
+}
diff --git a/public/assets.php b/public/assets.php
index a0baa6d..3610a13 100644
--- a/public/assets.php
+++ b/public/assets.php
@@ -19,7 +19,7 @@ $uri = ltrim(Request::pathInfo(), '/');
 list($type, $id) = explode('/', $uri, 2);
 
 // Setup response
-$response = new Trails_Response();
+$response = new Trails\Response();
 
 // Create response
 if (!$type || !$id) {
diff --git a/public/dispatch.php b/public/dispatch.php
index 68d0399..77c5933 100644
--- a/public/dispatch.php
+++ b/public/dispatch.php
@@ -21,5 +21,5 @@ require '../lib/bootstrap.php';
 // prepare environment
 URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
 
-$dispatcher = app(\Trails_Dispatcher::class);
+$dispatcher = app(\Trails\Dispatcher::class);
 $dispatcher->dispatch(Request::pathInfo());
diff --git a/public/install.php b/public/install.php
index 4e54575..e32cf75 100644
--- a/public/install.php
+++ b/public/install.php
@@ -17,7 +17,6 @@ set_include_path($GLOBALS['STUDIP_BASE_PATH']);
 
 require_once 'composer/autoload.php';
 require_once 'lib/visual.inc.php';
-require_once 'vendor/trails/trails.php';
 require_once 'lib/classes/URLHelper.php';
 require_once 'lib/classes/LayoutMessage.interface.php';
 require_once 'lib/classes/MessageBox.class.php';
@@ -33,6 +32,18 @@ require_once 'lib/flexi/Factory.php';
 require_once 'lib/flexi/PhpTemplate.php';
 require_once 'lib/flexi/Template.php';
 require_once 'lib/flexi/TemplateNotFoundException.php';
+require_once 'lib/trails/Controller.php';
+require_once 'lib/trails/Dispatcher.php';
+require_once 'lib/trails/Exception.php';
+require_once 'lib/trails/Flash.php';
+require_once 'lib/trails/Inflector.php';
+require_once 'lib/trails/Response.php';
+require_once 'lib/trails/Exceptions/DoubleRenderError.php';
+require_once 'lib/trails/Exceptions/MissingFile.php';
+require_once 'lib/trails/Exceptions/RoutingError.php';
+require_once 'lib/trails/Exceptions/SessionRequiredException.php';
+require_once 'lib/trails/Exceptions/UnknownAction.php';
+require_once 'lib/trails/Exceptions/UnknownController.php';
 require_once 'vendor/phpass/PasswordHash.php';
 
 // Mock gettext functions if extension is not available
@@ -61,5 +72,5 @@ $GLOBALS['template_factory'] = new Flexi\Factory('../templates/');
 # get plugin class from request
 $dispatch_to = ltrim(Request::pathInfo(), '/');
 
-$dispatcher = new Trails_Dispatcher( '../app', $_SERVER['SCRIPT_NAME'], 'admin/install');
+$dispatcher = new Trails\Dispatcher( '../app', $_SERVER['SCRIPT_NAME'], 'admin/install');
 $dispatcher->dispatch("admin/install/{$dispatch_to}");
diff --git a/public/sendfile.php b/public/sendfile.php
index 7d6517c..03157b8 100644
--- a/public/sendfile.php
+++ b/public/sendfile.php
@@ -156,7 +156,7 @@ if (
 ) {
     $link_data = FileManager::fetchURLMetadata($file_ref->file->metadata['url']);
     if ($link_data['response_code'] != 200) {
-        throw new Trails_Exception(404, _("Diese Datei wird von einem externen Server geladen und ist dort momentan nicht erreichbar!"));
+        throw new Trails\Exception(404, _("Diese Datei wird von einem externen Server geladen und ist dort momentan nicht erreichbar!"));
     }
     $content_type = $link_data['Content-Type'] ? strstr($link_data['Content-Type'], ';', true) : get_mime_type($file_name);
 
@@ -166,7 +166,7 @@ if (
 if (isset($file)) {
     $filesize = $file->getSize();
     if ($filesize === false) {
-        throw new Trails_Exception(404, _('Fehler beim Laden der Inhalte der Datei'));
+        throw new Trails\Exception(404, _('Fehler beim Laden der Inhalte der Datei'));
     }
 }
 
@@ -186,7 +186,7 @@ if (isset($file_ref, $file_ref->file, $file_ref->file->metadata['access_type'])
 
 // Check if file actually exists
 if (!parse_url($path_file, PHP_URL_SCHEME) && !file_exists($path_file)) {
-    throw new Trails_Exception(404, _('Fehler beim Laden der Inhalte der Datei'));
+    throw new Trails\Exception(404, _('Fehler beim Laden der Inhalte der Datei'));
 }
 
 $allowed_mime_types = get_mime_types();
diff --git a/public/web_migrate.php b/public/web_migrate.php
index c01c600..0ee4de5 100644
--- a/public/web_migrate.php
+++ b/public/web_migrate.php
@@ -36,6 +36,6 @@ $GLOBALS['template_factory'] = new Flexi\Factory('../templates/');
 # get plugin class from request
 $dispatch_to = Request::pathInfo() ?: '';
 
-$dispatcher = app(\Trails_Dispatcher::class);
+$dispatcher = app(\Trails\Dispatcher::class);
 $dispatcher->trails_uri = $_SERVER['SCRIPT_NAME'];
 $dispatcher->dispatch("web_migrate/{$dispatch_to}");
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index a1dbdd1..87dedca 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -62,18 +62,7 @@ StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
 StudipAutoloader::addAutoloadPath('lib/plugins/engine');
 StudipAutoloader::addAutoloadPath('lib/plugins/core');
 StudipAutoloader::addAutoloadPath('lib/plugins/db');
-
-$trails_classes = [
-    'Trails_Dispatcher', 'Trails_Response', 'Trails_Controller',
-    'Trails_Inflector', 'Trails_Flash',
-    'Trails_Exception', 'Trails_DoubleRenderError', 'Trails_MissingFile',
-    'Trails_RoutingError', 'Trails_UnknownAction', 'Trails_UnknownController',
-    'Trails_SessionRequiredException',
-];
-StudipAutoloader::addClassLookup(
-    $trails_classes,
-    'vendor/trails/trails.php'
-);
+StudipAutoloader::addAutoloadPath('lib/trails', 'Trails');
 
 // load config-variables
 $added_configs = [];
diff --git a/tests/unit/lib/FunctionsTest.php b/tests/unit/lib/FunctionsTest.php
index 670d00c..c254fda 100644
--- a/tests/unit/lib/FunctionsTest.php
+++ b/tests/unit/lib/FunctionsTest.php
@@ -75,11 +75,12 @@ class FunctionsTest extends \Codeception\Test\Unit
     }
 
     /**
-     * @covers Trails_Controller::extract_action_and_args()
+     * @covers Trails\Controller::extract_action_and_args()
      */
     public function testTrailsControllerExtractActionAndArgs()
     {
-        $controller = new Trails_Controller(null);
+        $dispatcher = new Trails\Dispatcher('', '', '');
+        $controller = new Trails\Controller($dispatcher);
         [$action, $args, $format] = $controller->extract_action_and_args('foo/bar//42.html');
 
         $this->assertEquals('foo', $action);
diff --git a/tests/unit/lib/classes/StudipControllerTest.php b/tests/unit/lib/classes/StudipControllerTest.php
index f7e4ef4..51359ab 100644
--- a/tests/unit/lib/classes/StudipControllerTest.php
+++ b/tests/unit/lib/classes/StudipControllerTest.php
@@ -27,13 +27,13 @@ final class StudipControllerTest extends Codeception\Test\Unit
         parent::tearDown();
     }
 
-    private function getDispatcher(): Trails_Dispatcher
+    private function getDispatcher(): Trails\Dispatcher
     {
         $trails_root = $GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . 'app';
         $trails_uri = rtrim($GLOBALS['ABSOLUTE_URI_STUDIP'], '/') . '/dispatch.php';
         $default_controller = 'default';
 
-        return new Trails_Dispatcher($trails_root, $trails_uri, $default_controller);
+        return new Trails\Dispatcher($trails_root, $trails_uri, $default_controller);
     }
 
     private function getController(): StudipController
@@ -247,7 +247,7 @@ final class StudipControllerTest extends Codeception\Test\Unit
     {
         $args = [$should_fail];
 
-        $this->expectException(Trails_Exception::class);
+        $this->expectException(Trails\Exception::class);
         $this->getController()->validate_args($args);
     }
 
diff --git a/tests/unit/lib/classes/TrailsTest.php b/tests/unit/lib/classes/TrailsTest.php
new file mode 100644
index 0000000..d51b795
--- /dev/null
+++ b/tests/unit/lib/classes/TrailsTest.php
@@ -0,0 +1,25 @@
+<?php
+class TrailsTest extends \Codeception\Test\Unit
+{
+    /**
+     * @covers Trails\Inflector::camelize
+     */
+    public function testInflectorCamelize(): void
+    {
+        $this->assertEquals(
+            'Path_SubPath_UnderscoreController',
+            Trails\Inflector::camelize('path/sub_path/underscore_controller')
+        );
+    }
+
+    /**
+     * @covers Trails\Inflector::underscore
+     */
+    public function testInflectorUnderscore(): void
+    {
+        $this->assertEquals(
+            'path/sub_path/underscore_controller',
+            Trails\Inflector::underscore('Path_SubPath_UnderscoreController')
+        );
+    }
+}
diff --git a/vendor/trails/extras/tramp.php b/vendor/trails/extras/tramp.php
deleted file mode 100644
index 9292a96..0000000
--- a/vendor/trails/extras/tramp.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-# Copyright (c)  2007 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-class Tramp_Controller extends Trails_Controller {
-
-  /**
-   * Extracts action and args from a string.
-   *
-   * @param  string       the processed string
-   *
-   * @return arraye       an array with two elements - a string containing the
-   *                      action and an array of strings representing the args
-   */
-  protected function extract_action_and_args($string) {
-    return array($this->get_verb(), explode('/', $string));
-  }
-
-
-  protected function map_action($action) {
-    return strtolower($action);
-  }
-
-
-  protected function get_verb() {
-
-    $verb = strtoupper(isset($_REQUEST['_method'])
-      ? $_REQUEST['_method'] : @$_SERVER['REQUEST_METHOD']);
-
-    if (!preg_match('/^DELETE|GET|POST|PUT|HEAD|OPTIONS$/', $verb)) {
-      throw new Trails_Exception(405);
-    }
-
-    return $verb;
-  }
-}
diff --git a/vendor/trails/src/HEADER.php b/vendor/trails/src/HEADER.php
deleted file mode 100644
index 75bb516..0000000
--- a/vendor/trails/src/HEADER.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?
-
-# Copyright (c)  2007 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-/**
- * The version of the trails library.
- */
-define('TRAILS_VERSION', '0.6.9');
diff --git a/vendor/trails/src/controller.php b/vendor/trails/src/controller.php
deleted file mode 100644
index 6ab9542..0000000
--- a/vendor/trails/src/controller.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-/**
- * A Trails_Controller is responsible for matching the unconsumed part of an URI
- * to an action using the left over words as arguments for that action. The
- * action is then mapped to method of the controller instance which is called
- * with the just mentioned arguments. That method can send the #render_action,
- * #render_template, #render_text, #render_nothing or #redirect method.
- * Otherwise the #render_action is called with the current action as argument.
- * If the action method sets instance variables during performing, they will be
- * be used as attributes for the flexi-template opened by #render_action or
- * #render_template. A controller's response's body is populated with the output
- * of the #render_* methods. The action methods can add additional headers or
- * change the status of that response.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Controller {
-
-
-  /**
-   * @ignore
-   */
-  protected
-    $dispatcher,
-    $response,
-    $performed,
-    $layout;
-
-
-  /**
-   * Constructor.
-   *
-   * @param  mixed  the dispatcher who creates this instance
-   *
-   * @return void
-   */
-  function __construct($dispatcher) {
-    $this->dispatcher = $dispatcher;
-    $this->erase_response();
-  }
-
-
-  /**
-   * Resets the response of the controller
-   *
-   * @return void
-   */
-  function erase_response() {
-    $this->performed = FALSE;
-    $this->response = new Trails_Response();
-  }
-
-
-  /**
-   * Return this controller's response
-   *
-   * @return mixed  the controller's response
-   */
-  function get_response() {
-    return $this->response;
-  }
-
-
-  /**
-   * This method extracts an action string and further arguments from it's
-   * parameter. The action string is mapped to a method being called afterwards
-   * using the said arguments. That method is called and a response object is
-   * generated, populated and sent back to the dispatcher.
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function perform($unconsumed) {
-
-    list($action, $args, $format) = $this->extract_action_and_args($unconsumed);
-
-    $this->format = isset($format) ? $format : 'html';
-
-    $before_filter_result = $this->before_filter($action, $args);
-
-    # send action to controller
-    # TODO (mlunzena) shouldn't the after filter be triggered too?
-    if (!(FALSE === $before_filter_result || $this->performed)) {
-
-      $callable = $this->map_action($action);
-
-      if (is_callable($callable)) {
-        call_user_func_array($callable, $args);
-      }
-      else {
-        $this->does_not_understand($action, $args);
-      }
-
-      if (!$this->performed) {
-        $this->render_action($action);
-      }
-
-      $this->after_filter($action, $args);
-    }
-
-    return $this->response;
-  }
-
-
-  /**
-   * Extracts action and args from a string.
-   *
-   * @param  string       the processed string
-   *
-   * @return array        an array with two elements - a string containing the
-   *                      action and an array of strings representing the args
-   */
-  function extract_action_and_args($string) {
-
-    if ('' === $string) {
-      return $this->default_action_and_args();
-    }
-
-    // find optional file extension
-    $format = NULL;
-    if (preg_match('/^(.*[^\/.])\.(\w+)$/', $string, $matches)) {
-      list($_, $string, $format) = $matches;
-    }
-
-    // TODO this should possibly remove empty tokens
-    $args = explode('/', $string);
-    $action = array_shift($args);
-    return array($action, $args, $format);
-  }
-
-  /**
-   * Return the default action and arguments
-   *
-   * @return an array containing the action, an array of args and the format
-   *
-   */
-  function default_action_and_args() {
-    return array('index', array(), NULL);
-  }
-
-  /**
-   * Maps the action to an actual method name.
-   *
-   * @param  string  the action
-   *
-   * @return string  the mapped method name
-   */
-  function map_action($action) {
-    return array(&$this, $action . '_action');
-  }
-
-
-  /**
-   * Callback function being called before an action is executed. If this
-   * function does not return FALSE, the action will be called, otherwise
-   * an error will be generated and processing will be aborted. If this function
-   * already #rendered or #redirected, further processing of the action is
-   * withheld.
-   *
-   * @param string  Name of the action to perform.
-   * @param array   An array of arguments to the action.
-   *
-   * @return bool
-   */
-  function before_filter(&$action, &$args) {
-  }
-
-
-  /**
-   * Callback function being called after an action is executed.
-   *
-   * @param string Name of the action to perform.
-   * @param array  An array of arguments to the action.
-   *
-   * @return void
-   */
-  function after_filter($action, $args) {
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return void
-   */
-  function does_not_understand($action, $args) {
-    throw new Trails_UnknownAction("No action responded to '$action'.");
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param string <description>
-   *
-   * @return void
-   */
-  function redirect($to) {
-
-    if ($this->performed) {
-      throw new Trails_DoubleRenderError();
-    }
-
-    $this->performed = TRUE;
-
-    # get uri; keep absolute URIs
-    $url = preg_match('#^(/|\w+://)#', $to)
-           ? $to
-           : $this->url_for($to);
-
-    $this->response->add_header('Location', $url)->set_status(302);
-  }
-
-
-  /**
-   * Renders the given text as the body of the response.
-   *
-   * @param string  the text to be rendered
-   *
-   * @return void
-   */
-  function render_text($text = ' ') {
-
-    if ($this->performed) {
-      throw new Trails_DoubleRenderError();
-    }
-
-    $this->performed = TRUE;
-
-    $this->response->set_body($text);
-  }
-
-
-  /**
-   * Renders the empty string as the response's body.
-   *
-   * @return void
-   */
-  function render_nothing() {
-    $this->render_text('');
-  }
-
-
-  /**
-   * Renders the template of the given action as the response's body.
-   *
-   * @param string  the action
-   *
-   * @return void
-   */
-  function render_action($action) {
-    $this->render_template($this->get_default_template($action), $this->layout);
-  }
-
-
-  function get_default_template($action)
-  {
-    $class = get_class($this);
-    $controller_name =
-      Trails_Inflector::underscore(substr($class, 0, -10));
-    return $controller_name.'/'.$action;
-  }
-
-
-  /**
-   * Renders a template using an optional layout template.
-   *
-   * @param mixed  a flexi template
-   * @param mixes  a flexi template which is used as layout
-   *
-   * @return void
-   */
-  function render_template($template_name, $layout = NULL) {
-
-    # open template
-    $factory = $this->get_template_factory();
-    $template = $factory->open($template_name);
-
-    $template->set_attributes($this->get_assigned_variables());
-
-    if (isset($layout)) {
-      $template->set_layout($layout);
-    }
-
-    $this->render_text($template->render());
-  }
-
-
-  /**
-   * Create and return a template factory for this controller.
-   *
-   * @return Flexi\Factory
-   */
-  function get_template_factory() {
-    return new Flexi\Factory($this->dispatcher->trails_root .
-                                     '/views/');
-  }
-
-
-  /**
-   * This method returns all the set instance variables to be used as attributes
-   * for a template. This controller is returned too as value for
-   * key 'controller'.
-   *
-   * @return array  an associative array of variables for the template
-   */
-  function get_assigned_variables() {
-
-    $assigns = array();
-    $protected = get_class_vars(get_class($this));
-
-    foreach (get_object_vars($this) as $var => $value) {
-      if (!array_key_exists($var, $protected)) {
-        $assigns[$var] =& $this->$var;
-      }
-    }
-
-    $assigns['controller'] = $this;
-
-    return $assigns;
-  }
-
-
-  /**
-   * Sets the layout to be used by this controller per default.
-   *
-   * @param  mixed  a flexi template to be used as layout
-   *
-   * @return void
-   */
-  function set_layout($layout) {
-    $this->layout = $layout;
-  }
-
-
-  /**
-   * Returns a URL to a specified route to your Trails application.
-   *
-   * Example:
-   * Your Trails application is located at 'http://example.com/dispatch.php'.
-   * So your dispatcher's trails_uri is set to 'http://example.com/dispatch.php'
-   * If you want the URL to your 'wiki' controller with action 'show' and
-   * parameter 'page' you should send:
-   *
-   *   $url = $controller->url_for('wiki/show', 'page');
-   *
-   * $url should then contain 'http://example.com/dispatch.php/wiki/show/page'.
-   *
-   * The first parameter is a string containing the controller and optionally an
-   * action:
-   *
-   *   - "{controller}/{action}"
-   *   - "path/to/controller/action"
-   *   - "controller"
-   *
-   * This "controller/action" string is not url encoded. You may provide
-   * additional parameter which will be urlencoded and concatenated with
-   * slashes:
-   *
-   *     $controller->url_for('wiki/show', 'page');
-   *     -> 'wiki/show/page'
-   *
-   *     $controller->url_for('wiki/show', 'page', 'one and a half');
-   *     -> 'wiki/show/page/one+and+a+half'
-   *
-   * @param  string   a string containing a controller and optionally an action
-   * @param  strings  optional arguments
-   *
-   * @return string  a URL to this route
-   */
-  function url_for($to/*, ...*/) {
-
-    # urlencode all but the first argument
-    $args = func_get_args();
-    $args = array_map('urlencode', $args);
-    $args[0] = $to;
-
-    return $this->dispatcher->trails_uri . '/' . join('/', $args);
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function set_status($status, $reason_phrase = NULL) {
-    $this->response->set_status($status, $reason_phrase);
-  }
-
-
-  /**
-   * Sets the content type of the controller's response.
-   *
-   * @param  string  the content type
-   *
-   * @return void
-   */
-  function set_content_type($type) {
-    $this->response->add_header('Content-Type', $type);
-  }
-
-
-  /**
-   * Exception handler called when the performance of an action raises an
-   * exception.
-   *
-   * @param  object     the thrown exception
-   *
-   * @return object     a response object
-   */
-  function rescue($exception) {
-    return $this->dispatcher->trails_error($exception);
-  }
-
-  function respond_to($ext) {
-    return $this->format === $ext;
-  }
-}
diff --git a/vendor/trails/src/dispatcher.php b/vendor/trails/src/dispatcher.php
deleted file mode 100644
index 58f55b1..0000000
--- a/vendor/trails/src/dispatcher.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-
-/**
- * The Dispatcher is used to map an incoming HTTP request to a Controller
- * producing a response which is then rendered. To initialize an instance of
- * class Trails_Dispatcher you have to give three configuration settings:
- *
- *          trails_root - the absolute file path to a directory containing the
- *                        applications controllers, views etc.
- *           trails_uri - the URI to which routes to mapped Controller/Actions
- *                        are appended
- *   default_controller - the route to a controller, that is used if no
- *                        controller is given, that is the route is equal to '/'
- *
- * After instantiation of a dispatcher you have to call method #dispatch with
- * the request uri to be mapped to a controller/action pair.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Dispatcher {
-
-  # TODO (mlunzena) Konfiguration muss anders geschehen
-
-  /**
-   * This is the absolute file path to the trails application directory.
-   *
-   * @access public
-   * @var    string
-   */
-  public $trails_root;
-
-
-  /**
-   * This is the URI to which routes to controller/actions are appended.
-   *
-   * @access public
-   * @var    string
-   */
-  public $trails_uri;
-
-
-  /**
-   * This variable contains the route to the default controller.
-   *
-   * @access public
-   * @var    string
-   */
-  public $default_controller;
-
-
-  /**
-   * Constructor.
-   *
-   * @param  string  absolute file path to a directory containing the
-   *                 applications controllers, views etc.
-   * @param  string  the URI to which routes to mapped Controller/Actions
-   *                 are appended
-   * @param  string  the route to a controller, that is used if no
-   *                 controller is given, that is the route is equal to '/'
-   *
-   * @return void
-   */
-  function __construct($trails_root,
-                       $trails_uri,
-                       $default_controller) {
-
-    $this->trails_root        = $trails_root;
-    $this->trails_uri         = $trails_uri;
-    $this->default_controller = $default_controller;
-  }
-
-
-  /**
-   * Maps a string to a response which is then rendered.
-   *
-   * @param string The requested URI.
-   *
-   * @return void
-   */
-  function dispatch($uri) {
-
-    # E_USER_ERROR|E_USER_WARNING|E_USER_NOTICE|E_RECOVERABLE_ERROR = 5888
-    $old_handler = set_error_handler(array($this, 'error_handler'), 5888);
-
-    ob_start();
-    $level = ob_get_level();
-
-    $this->map_uri_to_response($this->clean_request_uri((string) $uri))->output();
-
-    while (ob_get_level() >= $level) {
-      ob_end_flush();
-    }
-
-    if (isset($old_handler)) {
-      set_error_handler($old_handler);
-    }
-  }
-
-
-  /**
-   * Maps an URI to a response by figuring out first what controller to
-   * instantiate, then delegating the unconsumed part of the URI to the
-   * controller who returns an appropriate response object or throws a
-   * Trails_Exception.
-   *
-   * @param  string  the URI string
-   *
-   * @return mixed   a response object
-   */
-  function map_uri_to_response($uri) {
-
-    try {
-
-      list($controller_path, $unconsumed) =
-          '' === $uri
-          ? $this->default_route()
-            : $this->parse($uri);
-
-      $controller = $this->load_controller($controller_path);
-
-      $response = $controller->perform($unconsumed);
-
-    } catch (Exception $e) {
-
-      $response = isset($controller) ? $controller->rescue($e)
-                                     : $this->trails_error($e);
-    }
-
-    return $response;
-  }
-
-
-  /**
-   *
-   * @return array  an array containing the default controller and an
-   *                empty unconsumed route
-   */
-  function default_route() {
-      if (!$this->file_exists($this->default_controller . '.php')) {
-          throw new Trails_MissingFile(
-              "Default controller '{$this->default_controller}' not found'");
-      }
-      return array($this->default_controller, '');
-  }
-
-
-  function trails_error($exception) {
-    ob_clean();
-
-    # show details for local requests
-    $detailed = @$_SERVER['REMOTE_ADDR'] === '127.0.0.1';
-
-    $body = sprintf('<html><head><title>Trails Error</title></head>'.
-                    '<body><h1>%s</h1><pre>%s</pre></body></html>',
-                    htmlentities($exception->__toString()),
-                    $detailed
-                      ? htmlentities($exception->getTraceAsString())
-                      : '');
-
-    if ($exception instanceof Trails_Exception) {
-      $response = new Trails_Response($body,
-                                      $exception->headers,
-                                      $exception->getCode(),
-                                      $exception->getMessage());
-    }
-    else {
-      $response = new Trails_Response($body, array(), 500,
-                                      $exception->getMessage());
-    }
-
-    return $response;
-  }
-
-
-  /**
-   * Clean up URI string by removing the query part and leading slashes.
-   *
-   * @param  string  an URI string
-   *
-   * @return string  the cleaned string
-   */
-  function clean_request_uri($uri) {
-    if (FALSE !== ($pos = strpos($uri, '?'))) {
-      $uri = substr($uri, 0, $pos);
-    }
-    return ltrim($uri, '/');
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function parse($unconsumed, $controller = NULL) {
-    list($head, $tail) = $this->split_on_first_slash($unconsumed);
-
-    if (!preg_match('/^\w+$/', $head)) {
-      throw new Trails_RoutingError("No route matches '$head'");
-    }
-
-    $controller = (isset($controller) ? $controller . '/' : '') . $head;
-
-    if ($this->file_exists($controller . '.php')) {
-      return array($controller, $tail);
-    }
-    else if ($this->file_exists($controller)) {
-      return $this->parse($tail, $controller);
-    }
-
-    throw new Trails_RoutingError("No route matches '$head'");
-  }
-
-  function split_on_first_slash($str) {
-    preg_match(":([^/]*)(/+)?(.*):", $str, $matches);
-    return array($matches[1], $matches[3]);
-  }
-
-  function file_exists($path) {
-    return file_exists("{$this->trails_root}/controllers/$path");
-  }
-
-  /**
-   * Loads the controller file for a given controller path and return an
-   * instance of that controller. If an error occures, an exception will be
-   * thrown.
-   *
-   * @param  string            the relative controller path
-   *
-   * @return TrailsController  an instance of that controller
-   */
-  function load_controller($controller) {
-    require_once "{$this->trails_root}/controllers/{$controller}.php";
-    $class = Trails_Inflector::camelize($controller) . 'Controller';
-    if (!class_exists($class)) {
-      throw new Trails_UnknownController("Controller missing: '$class'");
-    }
-    return new $class($this);
-  }
-
-
-  /**
-   * This method transforms E_USER_* and E_RECOVERABLE_ERROR to
-   * Trails_Exceptions.
-   *
-   * @param  integer    the level of the error raised
-   * @param  string     the error message
-   * @param  string     the filename that the error was raised in
-   * @param  integer    the line number the error was raised at
-   *
-   * @throws Trails_Exception
-   *
-   * @return void
-   */
-  function error_handler($errno, $string, $file, $line) {
-    if (!(5888 & $errno)) {
-      return false;
-    }
-    throw new Trails_Exception(500, $string);
-  }
-}
diff --git a/vendor/trails/src/exception.php b/vendor/trails/src/exception.php
deleted file mode 100644
index 4c21831..0000000
--- a/vendor/trails/src/exception.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * TODO
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Exception extends Exception {
-
-  /**
-   * <FieldDescription>
-   *
-   * @access private
-   * @var <type>
-   */
-  public $headers;
-
-
-  /**
-   * @param  int     the status code to be set in the response
-   * @param  string  a human readable presentation of the status code
-   * @param  array   a hash of additional headers to be set in the response
-   *
-   * @return void
-   */
-  function __construct($status = 500, $reason = NULL, $headers = array()) {
-    if ($reason === NULL) {
-      $reason = Trails_Response::get_reason($status);
-    }
-    parent::__construct($reason, $status);
-    $this->headers = $headers;
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function __toString() {
-    return "{$this->code} {$this->message}";
-  }
-}
-
-
-class Trails_DoubleRenderError extends Trails_Exception {
-
-  function __construct() {
-    $message =
-      "Render and/or redirect were called multiple times in this action. ".
-      "Please note that you may only call render OR redirect, and at most ".
-      "once per action.";
-    parent::__construct(500, $message);
-  }
-}
-
-
-class Trails_MissingFile extends Trails_Exception {
-  function __construct($message) {
-    parent::__construct(500, $message);
-  }
-}
-
-
-class Trails_RoutingError extends Trails_Exception {
-
-  function __construct($message) {
-    parent::__construct(400, $message);
-  }
-}
-
-
-class Trails_UnknownAction extends Trails_Exception {
-
-  function __construct($message) {
-    parent::__construct(404, $message);
-  }
-}
-
-
-class Trails_UnknownController extends Trails_Exception {
-
-  function __construct($message) {
-    parent::__construct(404, $message);
-  }
-}
-
-
-class Trails_SessionRequiredException extends Trails_Exception {
-  function __construct() {
-    $message = "Tried to access a non existing session.";
-    parent::__construct(500, $message);
-  }
-}
diff --git a/vendor/trails/src/flash.php b/vendor/trails/src/flash.php
deleted file mode 100644
index cee08e5..0000000
--- a/vendor/trails/src/flash.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-/**
- * The flash provides a way to pass temporary objects between actions.
- * Anything you place in the flash will be exposed to the very next action and
- * then cleared out. This is a great way of doing notices and alerts, such as
- * a create action that sets
- * <tt>$flash->set('notice', "Successfully created")</tt>
- * before redirecting to a display action that can then expose the flash to its
- * template.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Flash implements ArrayAccess {
-
-
-  /**
-   * @ignore
-   */
-  public
-    $flash = array(), $used = array();
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @return type       <description>
-   */
-  static function instance() {
-
-    if (!isset($_SESSION)) {
-      throw new Trails_SessionRequiredException();
-    }
-
-
-    if (!isset($_SESSION['trails_flash'])) {
-      $_SESSION['trails_flash'] = new Trails_Flash();
-    }
-    return $_SESSION['trails_flash'];
-  }
-
-
-  function offsetExists($offset) {
-    return isset($this->flash[$offset]);
-  }
-
-
-  function offsetGet($offset) {
-    return $this->get($offset);
-  }
-
-
-  function offsetSet($offset, $value) {
-    $this->set($offset, $value);
-  }
-
-
-  function offsetUnset($offset) {
-    unset($this->flash[$offset], $this->used[$offset]);
-  }
-
-
-  /**
-   * Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-   *     use()               # marks the entire flash as used
-   *     use('msg')          # marks the "msg" entry as used
-   *     use(null, false)    # marks the entire flash as unused
-   *                         # (keeps it around for one more action)
-   *     use('msg', false)   # marks the "msg" entry as unused
-   *                         # (keeps it around for one more action)
-   *
-   * @param mixed  a key.
-   * @param bool   used flag.
-   *
-   * @return void
-   */
-  function _use($k = NULL, $v = TRUE) {
-    if ($k) {
-      $this->used[$k] = $v;
-    }
-    else {
-      foreach ($this->used as $k => $value) {
-        $this->_use($k, $v);
-      }
-    }
-  }
-
-
-  /**
-   * Marks the entire flash or a single flash entry to be discarded by the end
-   * of the current action.
-   *
-   *     $flash->discard()             # discards entire flash
-   *                                   # (it'll still be available for the
-   *                                   # current action)
-   *     $flash->discard('warning')    # discard the "warning" entry
-   *                                   # (it'll still be available for the
-   *                                   # current action)
-   *
-   * @param mixed  a key.
-   *
-   * @return void
-   */
-  function discard($k = NULL) {
-    $this->_use($k);
-  }
-
-
-  /**
-   * Returns the value to the specified key.
-   *
-   * @param mixed  a key.
-   *
-   * @return mixed the key's value.
-   */
-  function &get($k) {
-    $return = NULL;
-    if (isset($this->flash[$k])) {
-      $return =& $this->flash[$k];
-    }
-    return $return;
-  }
-
-
-  /**
-   * Keeps either the entire current flash or a specific flash entry available
-   * for the next action:
-   *
-   *    $flash->keep()           # keeps the entire flash
-   *    $flash->keep('notice')   # keeps only the "notice" entry, the rest of
-   *                             # the flash is discarded
-   *
-   * @param mixed  a key.
-   *
-   * @return void
-   */
-  function keep($k = NULL) {
-    $this->_use($k, FALSE);
-  }
-
-
-  /**
-   * Sets a key's value.
-   *
-   * @param mixed  a key.
-   * @param mixed  its value.
-   *
-   * @return void
-   */
-  function set($k, $v) {
-    $this->keep($k);
-    $this->flash[$k] = $v;
-  }
-
-
-  /**
-   * Sets a key's value by reference.
-   *
-   * @param mixed  a key.
-   * @param mixed  its value.
-   *
-   * @return void
-   */
-  function set_ref($k, &$v) {
-    $this->keep($k);
-    $this->flash[$k] =& $v;
-  }
-
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @return type       <description>
-   */
-  function sweep() {
-
-    # remove used values
-    foreach (array_keys($this->flash) as $k) {
-      if ($this->used[$k]) {
-        unset($this->flash[$k], $this->used[$k]);
-      } else {
-        $this->_use($k);
-      }
-    }
-
-    # cleanup if someone meddled with flash or used
-    $fkeys = array_keys($this->flash);
-    $ukeys = array_keys($this->used);
-    foreach (array_diff($fkeys, $ukeys) as $k => $v) {
-      unset($this->used[$k]);
-    }
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @return type       <description>
-   */
-  function __toString() {
-    $values = array();
-    foreach ($this->flash as $k => $v) {
-      $values[] = sprintf("'%s': [%s, '%s']",
-                          $k, var_export($v, TRUE),
-                          $this->used[$k] ? "used" : "unused");
-    }
-    return "{" . join(", ", $values) . "}\n";
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function __sleep() {
-    $this->sweep();
-    return array('flash', 'used');
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function __wakeUp() {
-    $this->discard();
-  }
-}
-
diff --git a/vendor/trails/src/inflector.php b/vendor/trails/src/inflector.php
deleted file mode 100644
index 6646eee..0000000
--- a/vendor/trails/src/inflector.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * The Inflector class is a namespace for inflections methods.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Inflector {
-
-
-  /**
-   * Returns a camelized string from a lower case and underscored string by
-   * replacing slash with underscore and upper-casing each letter preceded
-   * by an underscore. TODO
-   *
-   * @param string String to camelize.
-   *
-   * @return string Camelized string.
-   */
-  static function camelize($word) {
-    $parts = explode('/', $word);
-    foreach ($parts as $key => $part) {
-      $parts[$key] = str_replace(' ', '',
-                                 ucwords(str_replace('_', ' ', $part)));
-    }
-    return join('_', $parts);
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  static function underscore($word) {
-    $parts = explode('_', $word);
-    foreach ($parts as $key => $part) {
-      $parts[$key] = preg_replace('/(?<=\w)([A-Z])/', '_\\1', $part);
-    }
-    return strtolower(join('/', $parts));
-  }
-}
diff --git a/vendor/trails/src/response.php b/vendor/trails/src/response.php
deleted file mode 100644
index 474bfc1..0000000
--- a/vendor/trails/src/response.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-/**
- * This class represents a response returned by a controller that was asked to
- * perform for a given request. A Trails_Response contains the body, status and
- * additional headers which can be renderer back to the client.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Response {
-
-
-  /**
-   * @ignore
-   */
-  public
-    $body = '',
-    $status,
-    $reason,
-    $headers = array();
-
-
-  /**
-   * Constructor.
-   *
-   * @param  string   the body of the response defaulting to ''
-   * @param  array    an array of additional headers defaulting to an
-   *                  empty array
-   * @param  integer  the status code of the response defaulting to a
-   *                  regular 200
-   * @param  string   the descriptional reason for a status code defaulting to
-   *                  the standard reason phrases defined in RFC 2616
-   *
-   * @return void
-   */
-  function __construct($body = '', $headers = array(),
-                       $status = NULL, $reason = NULL) {
-
-    $this->set_body($body);
-
-    $this->headers = $headers;
-
-    if (isset($status)) {
-      $this->set_status($status, $reason);
-    }
-  }
-
-
-  /**
-   * Sets the body of the response.
-   *
-   * @param  string  the body
-   *
-   * @return mixed   this response object. Useful for cascading method calls.
-   */
-  function set_body($body) {
-    $this->body = $body;
-    return $this;
-  }
-
-
-  /**
-   * Sets the status code and an optional custom reason. If none is given, the
-   * standard reason phrase as of RFC 2616 is used.
-   *
-   * @param  integer  the status code
-   * @param  string   the custom reason, defaulting to the one given in RFC 2616
-   *
-   * @return mixed    this response object. Useful for cascading method calls.
-   */
-  function set_status($status, $reason = NULL) {
-    $this->status = $status;
-    $this->reason = isset($reason) ? $reason : self::get_reason($status);
-    return $this;
-  }
-
-
-  /**
-   * Returns the reason phrase of this response according to RFC2616.
-   *
-   * @param int      the response's status
-   *
-   * @return string  the reason phrase for this response's status
-   */
-  public static function get_reason($status) {
-    $reason = array(
-      100 => 'Continue', 'Switching Protocols',
-      200 => 'OK', 'Created', 'Accepted', 'Non-Authoritative Information',
-             'No Content', 'Reset Content', 'Partial Content',
-      300 => 'Multiple Choices', 'Moved Permanently', 'Found', 'See Other',
-             'Not Modified', 'Use Proxy', '(Unused)', 'Temporary Redirect',
-      400 => 'Bad Request', 'Unauthorized', 'Payment Required','Forbidden',
-             'Not Found', 'Method Not Allowed', 'Not Acceptable',
-             'Proxy Authentication Required', 'Request Timeout', 'Conflict',
-             'Gone', 'Length Required', 'Precondition Failed',
-             'Request Entity Too Large', 'Request-URI Too Long',
-             'Unsupported Media Type', 'Requested Range Not Satisfiable',
-             'Expectation Failed',
-      500 => 'Internal Server Error', 'Not Implemented', 'Bad Gateway',
-             'Service Unavailable', 'Gateway Timeout',
-             'HTTP Version Not Supported');
-
-    return isset($reason[$status]) ? $reason[$status] : '';
-  }
-
-
-  /**
-   * Adds an additional header to the response.
-   *
-   * @param  string  the left hand key part
-   * @param  string  the right hand value part
-   *
-   * @return mixed   this response object. Useful for cascading method calls.
-   */
-  function add_header($key, $value) {
-    $this->headers[$key] = $value;
-    return $this;
-  }
-
-
-  /**
-   * Outputs this response to the client using "echo" and "header".
-   *
-   * @return void
-   */
-  function output() {
-    if (isset($this->status)) {
-      $this->send_header(sprintf('HTTP/1.1 %d %s',
-                                 $this->status, $this->reason),
-                         TRUE,
-                         $this->status);
-    }
-
-    foreach ($this->headers as $k => $v) {
-      $this->send_header("$k: $v");
-    }
-
-    echo $this->body;
-  }
-
-
-  /**
-   * Internally used function to actually send headers
-   *
-   * @param  string     the HTTP header
-   * @param  bool       optional; TRUE if previously sent header should be
-   *                    replaced - FALSE otherwise (default)
-   * @param  integer    optional; the HTTP response code
-   *
-   * @return void
-   */
-  function send_header($header, $replace = FALSE, $status = NULL) {
-    if (isset($status)) {
-      header($header, $replace, $status);
-    }
-    else {
-      header($header, $replace);
-    }
-  }
-}
-
diff --git a/vendor/trails/src/trails.php b/vendor/trails/src/trails.php
deleted file mode 100644
index 2e9e8e2..0000000
--- a/vendor/trails/src/trails.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-function fgc($files/*, ... */) {
-  $result = '';
-  $files = func_get_args();
-  foreach ($files as $file) {
-    $string = file_get_contents(dirname(__FILE__)."/$file.php");
-    $result .= preg_replace("/^(<\?(php)?)|(\?>)\s*\v+$/", "", $string);
-  }
-  return $result;
-}
-?>
-<?= "<?php" ?>
-<?= fgc("HEADER") ?>
-
-<?= fgc("dispatcher", "response", "controller",
-        "inflector", "flash", "exception") ?>
diff --git a/vendor/trails/trails-abridged.php b/vendor/trails/trails-abridged.php
deleted file mode 100644
index 07b337a..0000000
--- a/vendor/trails/trails-abridged.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-define('TRAILS_VERSION','0.6.9');class Trails_Dispatcher{public$trails_root;public$trails_uri;public$default_controller;function __construct($trails_root, $trails_uri, $default_controller){$this->trails_root=$trails_root;$this->trails_uri=$trails_uri;$this->default_controller=$default_controller;}function dispatch($uri){$old_handler=set_error_handler(array($this, 'error_handler'),5888);ob_start();$level=ob_get_level();$this->map_uri_to_response($this->clean_request_uri((string)$uri))->output();while(ob_get_level()>=$level){ob_end_flush();}if(isset($old_handler)){set_error_handler($old_handler);}}function map_uri_to_response($uri){try{[$controller_path, $unconsumed]=''===$uri?$this->default_route():$this->parse($uri);$controller=$this->load_controller($controller_path);$response=$controller->perform($unconsumed);}catch(Exception$e){$response=isset($controller)?$controller->rescue($e):$this->trails_error($e);}return$response;}function default_route(){if(!$this->file_exists($this->default_controller.'.php')){throw new Trails_MissingFile("Default controller '{$this->default_controller}' not found'");}return array($this->default_controller, '');}function trails_error($exception){ob_clean();$detailed=@$_SERVER['REMOTE_ADDR']==='127.0.0.1';$body=sprintf('<html><head><title>Trails Error</title></head>'.'<body><h1>%s</h1><pre>%s</pre></body></html>',htmlentities($exception->__toString()),$detailed?htmlentities($exception->getTraceAsString()):'');if($exception instanceof Trails_Exception){$response=new Trails_Response($body,$exception->headers,$exception->getCode(),$exception->getMessage());}else{$response=new Trails_Response($body,array(),500,$exception->getMessage());}return$response;}function clean_request_uri($uri){if(FALSE!==($pos=strpos($uri,'?'))){$uri=substr($uri,0,$pos);}return ltrim($uri,'/');}function parse($unconsumed, $controller=NULL){[$head, $tail]=$this->split_on_first_slash($unconsumed);if(!preg_match('/^\w+$/',$head)){throw new Trails_RoutingError("No route matches '$head'");}$controller=(isset($controller)?$controller.'/':'').$head;if($this->file_exists($controller.'.php')){return array($controller, $tail);}else if($this->file_exists($controller)){return$this->parse($tail,$controller);}throw new Trails_RoutingError("No route matches '$head'");}function split_on_first_slash($str){preg_match(":([^/]*)(/+)?(.*):",$str,$matches);return array($matches[1], $matches[3]);}function file_exists($path){return file_exists("{$this->trails_root}/controllers/$path");}function load_controller($controller){require_once"{$this->trails_root}/controllers/{$controller}.php";$class=Trails_Inflector::camelize($controller).'Controller';if(!class_exists($class)){throw new Trails_UnknownController("Controller missing: '$class'");}return new$class($this);}function error_handler($errno, $string, $file, $line, $context){if(!(5888&$errno))return false;throw new Trails_Exception(500,$string);}}class Trails_Response{public$body='',$status,$reason,$headers=array();function __construct($body='', $headers=array(), $status=NULL, $reason=NULL){$this->set_body($body);$this->headers=$headers;if(isset($status)){$this->set_status($status,$reason);}}function set_body($body){$this->body=$body;return$this;}function set_status($status, $reason=NULL){$this->status=$status;$this->reason=isset($reason)?$reason:$this->get_reason($status);return$this;}function get_reason($status){$reason=array(100 =>'Continue', 'Switching Protocols', 200 =>'OK', 'Created', 'Accepted', 'Non-Authoritative Information', 'No Content', 'Reset Content', 'Partial Content', 300 =>'Multiple Choices', 'Moved Permanently', 'Found', 'See Other', 'Not Modified', 'Use Proxy', '(Unused)', 'Temporary Redirect', 400 =>'Bad Request', 'Unauthorized', 'Payment Required', 'Forbidden', 'Not Found', 'Method Not Allowed', 'Not Acceptable', 'Proxy Authentication Required', 'Request Timeout', 'Conflict', 'Gone', 'Length Required', 'Precondition Failed', 'Request Entity Too Large', 'Request-URI Too Long', 'Unsupported Media Type', 'Requested Range Not Satisfiable', 'Expectation Failed', 500 =>'Internal Server Error', 'Not Implemented', 'Bad Gateway', 'Service Unavailable', 'Gateway Timeout', 'HTTP Version Not Supported');return isset($reason[$status])? $reason[$status]:'';}function add_header($key, $value){$this->headers[$key]=$value;return$this;}function output(){if(isset($this->status)){$this->send_header(sprintf('HTTP/1.1 %d %s',$this->status,$this->reason),TRUE,$this->status);}foreach($this->headers as $k=> $v){$this->send_header("$k: $v");}echo$this->body;}function send_header($header, $replace=FALSE, $status=NULL){if(isset($status)){header($header,$replace,$status);}else{header($header,$replace);}}}class Trails_Controller{protected$dispatcher,$response,$performed,$layout;function __construct($dispatcher){$this->dispatcher=$dispatcher;$this->erase_response();}function erase_response(){$this->performed=FALSE;$this->response=new Trails_Response();}function get_response(){return$this->response;}function perform($unconsumed){[$action, $args, $format]=$this->extract_action_and_args($unconsumed);$this->format=isset($format)?$format:'html';$before_filter_result=$this->before_filter($action,$args);if(!(FALSE===$before_filter_result||$this->performed)){$callable=$this->map_action($action);if(is_callable($callable)){call_user_func_array($callable,$args);}else{$this->does_not_understand($action,$args);}if(!$this->performed){$this->render_action($action);}$this->after_filter($action,$args);}return$this->response;}function extract_action_and_args($string){if(''===$string){return$this->default_action_and_args();}$format=NULL;if(preg_match('/^(.*[^\/.])\.(\w+)$/',$string,$matches)){[$_, $string, $format]=$matches;}$args=explode('/',$string);$action=array_shift($args);return array($action, $args, $format);}function default_action_and_args(){return array('index', array(), NULL);}function map_action($action){return array(&$this, $action.'_action');}function before_filter(&$action, &$args){}function after_filter($action, $args){}function does_not_understand($action, $args){throw new Trails_UnknownAction("No action responded to '$action'.");}function redirect($to){if($this->performed){throw new Trails_DoubleRenderError();}$this->performed=TRUE;$url=preg_match('#^(/|\w+://)#',$to)?$to:$this->url_for($to);$this->response->add_header('Location',$url)->set_status(302);}function render_text($text=' '){if($this->performed){throw new Trails_DoubleRenderError();}$this->performed=TRUE;$this->response->set_body($text);}function render_nothing(){$this->render_text('');}function render_action($action){$this->render_template($this->get_default_template($action),$this->layout);}function get_default_template($action){$class=get_class($this);$controller_name=Trails_Inflector::underscore(substr($class,0,-10));return$controller_name.'/'.$action;}function render_template($template_name, $layout=NULL){$factory=$this->get_template_factory();$template=$factory->open($template_name);$template->set_attributes($this->get_assigned_variables());if(isset($layout)){$template->set_layout($layout);}$this->render_text($template->render());}function get_template_factory(){return new Flexi\Factory($this->dispatcher->trails_root.'/views/');}function get_assigned_variables(){$assigns=array();$protected=get_class_vars(get_class($this));foreach(get_object_vars($this) as $var=> $value){if(!array_key_exists($var,$protected)){$assigns[$var]=&$this->$var;}}$assigns['controller']=$this;return$assigns;}function set_layout($layout){$this->layout=$layout;}function url_for($to){$args=func_get_args();$args=array_map('urlencode',$args);$args[0]=$to;return$this->dispatcher->trails_uri.'/'.join('/',$args);}function set_status($status, $reason_phrase=NULL){$this->response->set_status($status,$reason_phrase);}function set_content_type($type){$this->response->add_header('Content-Type',$type);}function rescue($exception){return$this->dispatcher->trails_error($exception);}function respond_to($ext){return$this->format===$ext;}}class Trails_Inflector{static function camelize($word){$parts=explode('/',$word);foreach($parts as $key=> $part){$parts[$key]=str_replace(' ','',ucwords(str_replace('_',' ',$part)));}return join('_',$parts);}static function underscore($word){$parts=explode('_',$word);foreach($parts as $key=> $part){$parts[$key]=preg_replace('/(?<=\w)([A-Z])/','_\\1',$part);}return strtolower(join('/',$parts));}}class Trails_Flash implements ArrayAccess{public$flash=array(),$used=array();static function instance(){if(!isset($_SESSION)){throw new Trails_SessionRequiredException();}if(!isset($_SESSION['trails_flash'])){$_SESSION['trails_flash']=new Trails_Flash();}return $_SESSION['trails_flash'];}function offsetExists($offset){return isset($this->flash[$offset]);}function offsetGet($offset){return$this->get($offset);}function offsetSet($offset, $value){$this->set($offset,$value);}function offsetUnset($offset){unset($this->flash[$offset], $this->used[$offset]);}function _use($k=NULL, $v=TRUE){if($k){$this->used[$k]=$v;}else{foreach($this->used as $k=> $value){$this->_use($k,$v);}}}function discard($k=NULL){$this->_use($k);}function&get($k){$return=NULL;if(isset($this->flash[$k])){$return=& $this->flash[$k];}return$return;}function keep($k=NULL){$this->_use($k,FALSE);}function set($k, $v){$this->keep($k);$this->flash[$k]=$v;}function set_ref($k, &$v){$this->keep($k);$this->flash[$k]=&$v;}function sweep(){foreach(array_keys($this->flash) as $k){if($this->used[$k]){unset($this->flash[$k], $this->used[$k]);}else{$this->_use($k);}}$fkeys=array_keys($this->flash);$ukeys=array_keys($this->used);foreach(array_diff($fkeys,$ukeys) as $k=> $v){unset($this->used[$k]);}}function __toString(){$values=array();foreach($this->flash as $k=> $v){$values[]=sprintf("'%s': [%s, '%s']",$k,var_export($v,TRUE), $this->used[$k]?"used":"unused");}return"{".join(", ",$values)."}\n";}function __sleep(){$this->sweep();return array('flash', 'used');}function __wakeUp(){$this->discard();}}class Trails_Exception extends Exception{public$headers;function __construct($status=500, $reason=NULL, $headers=array()){if($reason===NULL){$reason=Trails_Response::get_reason($status);}parent::__construct($reason,$status);$this->headers=$headers;}function __toString(){return"{$this->code} {$this->message}";}}class Trails_DoubleRenderError extends Trails_Exception{function __construct(){$message="Render and/or redirect were called multiple times in this action. "."Please note that you may only call render OR redirect, and at most "."once per action.";parent::__construct(500,$message);}}class Trails_MissingFile extends Trails_Exception{function __construct($message){parent::__construct(500,$message);}}class Trails_RoutingError extends Trails_Exception{function __construct($message){parent::__construct(400,$message);}}class Trails_UnknownAction extends Trails_Exception{function __construct($message){parent::__construct(404,$message);}}class Trails_UnknownController extends Trails_Exception{function __construct($message){parent::__construct(404,$message);}}class Trails_SessionRequiredException extends Trails_Exception{function __construct(){$message="Tried to access a non existing session.";parent::__construct(500,$message);}}
diff --git a/vendor/trails/trails.php b/vendor/trails/trails.php
deleted file mode 100644
index 9117655..0000000
--- a/vendor/trails/trails.php
+++ /dev/null
@@ -1,1289 +0,0 @@
-<?php
-
-# Copyright (c)  2007 - Marcus Lunzenauer <mlunzena@uos.de>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-/**
- * The version of the trails library.
- */
-
-define('TRAILS_VERSION', '0.6.9');
-
-
-
-/**
- * The Dispatcher is used to map an incoming HTTP request to a Controller
- * producing a response which is then rendered. To initialize an instance of
- * class Trails_Dispatcher you have to give three configuration settings:
- *
- *          trails_root - the absolute file path to a directory containing the
- *                        applications controllers, views etc.
- *           trails_uri - the URI to which routes to mapped Controller/Actions
- *                        are appended
- *   default_controller - the route to a controller, that is used if no
- *                        controller is given, that is the route is equal to '/'
- *
- * After instantiation of a dispatcher you have to call method #dispatch with
- * the request uri to be mapped to a controller/action pair.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Dispatcher {
-
-  # TODO (mlunzena) Konfiguration muss anders geschehen
-
-  /**
-   * This is the absolute file path to the trails application directory.
-   *
-   * @access public
-   * @var    string
-   */
-  public $trails_root;
-
-
-  /**
-   * This is the URI to which routes to controller/actions are appended.
-   *
-   * @access public
-   * @var    string
-   */
-  public $trails_uri;
-
-
-  /**
-   * This variable contains the route to the default controller.
-   *
-   * @access public
-   * @var    string
-   */
-  public $default_controller;
-
-
-  /**
-   * Constructor.
-   *
-   * @param  string  absolute file path to a directory containing the
-   *                 applications controllers, views etc.
-   * @param  string  the URI to which routes to mapped Controller/Actions
-   *                 are appended
-   * @param  string  the route to a controller, that is used if no
-   *                 controller is given, that is the route is equal to '/'
-   *
-   * @return void
-   */
-  function __construct($trails_root,
-                       $trails_uri,
-                       $default_controller) {
-
-    $this->trails_root        = $trails_root;
-    $this->trails_uri         = $trails_uri;
-    $this->default_controller = $default_controller;
-  }
-
-
-  /**
-   * Maps a string to a response which is then rendered.
-   *
-   * @param string The requested URI.
-   *
-   * @return void
-   */
-  function dispatch($uri) {
-
-    # E_USER_ERROR|E_USER_WARNING|E_USER_NOTICE|E_RECOVERABLE_ERROR = 5888
-    $old_handler = set_error_handler(array($this, 'error_handler'), 5888);
-
-    ob_start();
-    $level = ob_get_level();
-
-    $this->map_uri_to_response($this->clean_request_uri((string) $uri))->output();
-
-    while (ob_get_level() >= $level) {
-      ob_end_flush();
-    }
-
-    if (isset($old_handler)) {
-      set_error_handler($old_handler);
-    }
-  }
-
-
-  /**
-   * Maps an URI to a response by figuring out first what controller to
-   * instantiate, then delegating the unconsumed part of the URI to the
-   * controller who returns an appropriate response object or throws a
-   * Trails_Exception.
-   *
-   * @param  string  the URI string
-   *
-   * @return mixed   a response object
-   */
-  function map_uri_to_response($uri) {
-
-    try {
-
-      list($controller_path, $unconsumed) =
-          '' === $uri
-          ? $this->default_route()
-            : $this->parse($uri);
-
-      $controller = $this->load_controller($controller_path);
-
-      $response = $controller->perform($unconsumed);
-
-    } catch (Exception $e) {
-
-      $response = isset($controller) ? $controller->rescue($e)
-                                     : $this->trails_error($e);
-    }
-
-    return $response;
-  }
-
-
-  /**
-   *
-   * @return array  an array containing the default controller and an
-   *                empty unconsumed route
-   */
-  function default_route() {
-      if (!$this->file_exists($this->default_controller . '.php')) {
-          throw new Trails_MissingFile(
-              "Default controller '{$this->default_controller}' not found'");
-      }
-      return array($this->default_controller, '');
-  }
-
-
-  function trails_error($exception) {
-    ob_clean();
-
-    # show details for local requests
-    $detailed = @$_SERVER['REMOTE_ADDR'] === '127.0.0.1';
-
-    $body = sprintf('<html><head><title>Trails Error</title></head>'.
-                    '<body><h1>%s</h1><pre>%s</pre></body></html>',
-                    htmlentities($exception->__toString()),
-                    $detailed
-                      ? htmlentities($exception->getTraceAsString())
-                      : '');
-
-    if ($exception instanceof Trails_Exception) {
-      $response = new Trails_Response($body,
-                                      $exception->headers,
-                                      $exception->getCode(),
-                                      $exception->getMessage());
-    }
-    else {
-      $response = new Trails_Response($body, array(), 500,
-                                      $exception->getMessage());
-    }
-
-    return $response;
-  }
-
-
-  /**
-   * Clean up URI string by removing the query part and leading slashes.
-   *
-   * @param  string  an URI string
-   *
-   * @return string  the cleaned string
-   */
-  function clean_request_uri($uri) {
-    if (FALSE !== ($pos = strpos($uri, '?'))) {
-      $uri = substr($uri, 0, $pos);
-    }
-    return ltrim($uri, '/');
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function parse($unconsumed, $controller = NULL) {
-    list($head, $tail) = $this->split_on_first_slash($unconsumed);
-
-    if (!preg_match('/^\w+$/', $head)) {
-      throw new Trails_RoutingError("No route matches '$head'");
-    }
-
-    $controller = (isset($controller) ? $controller . '/' : '') . $head;
-
-    if ($this->file_exists($controller . '.php')) {
-      return array($controller, $tail);
-    }
-    else if ($this->file_exists($controller)) {
-      return $this->parse($tail, $controller);
-    }
-
-    throw new Trails_RoutingError("No route matches '$head'");
-  }
-
-  function split_on_first_slash($str) {
-    preg_match(":([^/]*)(/+)?(.*):", $str, $matches);
-    return array($matches[1], $matches[3]);
-  }
-
-  function file_exists($path) {
-    return file_exists("{$this->trails_root}/controllers/$path");
-  }
-
-  /**
-   * Loads the controller file for a given controller path and return an
-   * instance of that controller. If an error occures, an exception will be
-   * thrown.
-   *
-   * @param  string            the relative controller path
-   *
-   * @return TrailsController  an instance of that controller
-   */
-  function load_controller($controller) {
-    require_once "{$this->trails_root}/controllers/{$controller}.php";
-    $class = Trails_Inflector::camelize($controller) . 'Controller';
-    if (!class_exists($class)) {
-      throw new Trails_UnknownController("Controller missing: '$class'");
-    }
-    return new $class($this);
-  }
-
-
-  /**
-   * This method transforms E_USER_* and E_RECOVERABLE_ERROR to
-   * Trails_Exceptions.
-   *
-   * @param  integer    the level of the error raised
-   * @param  string     the error message
-   * @param  string     the filename that the error was raised in
-   * @param  integer    the line number the error was raised at
-   *
-   * @throws Trails_Exception
-   *
-   * @return void
-   */
-  function error_handler($errno, $string, $file, $line) {
-    if (!(5888 & $errno)) {
-      return false;
-    }
-    throw new Trails_Exception(500, $string);
-  }
-}
-
-
-/**
- * This class represents a response returned by a controller that was asked to
- * perform for a given request. A Trails_Response contains the body, status and
- * additional headers which can be renderer back to the client.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Response {
-
-
-  /**
-   * @ignore
-   */
-  public
-    $body = '',
-    $status,
-    $reason,
-    $headers = array();
-
-
-  /**
-   * Constructor.
-   *
-   * @param  string   the body of the response defaulting to ''
-   * @param  array    an array of additional headers defaulting to an
-   *                  empty array
-   * @param  integer  the status code of the response defaulting to a
-   *                  regular 200
-   * @param  string   the descriptional reason for a status code defaulting to
-   *                  the standard reason phrases defined in RFC 2616
-   *
-   * @return void
-   */
-  function __construct($body = '', $headers = array(),
-                       $status = NULL, $reason = NULL) {
-
-    $this->set_body($body);
-
-    $this->headers = $headers;
-
-    if (isset($status)) {
-      $this->set_status($status, $reason);
-    }
-  }
-
-
-  /**
-   * Sets the body of the response.
-   *
-   * @param  string  the body
-   *
-   * @return mixed   this response object. Useful for cascading method calls.
-   */
-  function set_body($body) {
-    $this->body = $body;
-    return $this;
-  }
-
-
-  /**
-   * Sets the status code and an optional custom reason. If none is given, the
-   * standard reason phrase as of RFC 2616 is used.
-   *
-   * @param  integer  the status code
-   * @param  string   the custom reason, defaulting to the one given in RFC 2616
-   *
-   * @return mixed    this response object. Useful for cascading method calls.
-   */
-  function set_status($status, $reason = NULL) {
-    $this->status = $status;
-    $this->reason = isset($reason) ? $reason : self::get_reason($status);
-    return $this;
-  }
-
-
-  /**
-   * Returns the reason phrase of this response according to RFC2616.
-   *
-   * @param int      the response's status
-   *
-   * @return string  the reason phrase for this response's status
-   */
-  public static function get_reason($status) {
-    $reason = array(
-      100 => 'Continue', 'Switching Protocols',
-      200 => 'OK', 'Created', 'Accepted', 'Non-Authoritative Information',
-             'No Content', 'Reset Content', 'Partial Content',
-      300 => 'Multiple Choices', 'Moved Permanently', 'Found', 'See Other',
-             'Not Modified', 'Use Proxy', '(Unused)', 'Temporary Redirect',
-      400 => 'Bad Request', 'Unauthorized', 'Payment Required','Forbidden',
-             'Not Found', 'Method Not Allowed', 'Not Acceptable',
-             'Proxy Authentication Required', 'Request Timeout', 'Conflict',
-             'Gone', 'Length Required', 'Precondition Failed',
-             'Request Entity Too Large', 'Request-URI Too Long',
-             'Unsupported Media Type', 'Requested Range Not Satisfiable',
-             'Expectation Failed',
-      500 => 'Internal Server Error', 'Not Implemented', 'Bad Gateway',
-             'Service Unavailable', 'Gateway Timeout',
-             'HTTP Version Not Supported');
-
-    return isset($reason[$status]) ? $reason[$status] : '';
-  }
-
-
-  /**
-   * Adds an additional header to the response.
-   *
-   * @param  string  the left hand key part
-   * @param  string  the right hand value part
-   *
-   * @return mixed   this response object. Useful for cascading method calls.
-   */
-  function add_header($key, $value) {
-    $this->headers[$key] = $value;
-    return $this;
-  }
-
-
-  /**
-   * Outputs this response to the client using "echo" and "header".
-   *
-   * @return void
-   */
-  function output() {
-    if (isset($this->status)) {
-      $this->send_header(sprintf('HTTP/1.1 %d %s',
-                                 $this->status, $this->reason),
-                         TRUE,
-                         $this->status);
-    }
-
-    foreach ($this->headers as $k => $v) {
-      $this->send_header("$k: $v");
-    }
-
-    echo $this->body;
-  }
-
-
-  /**
-   * Internally used function to actually send headers
-   *
-   * @param  string     the HTTP header
-   * @param  bool       optional; TRUE if previously sent header should be
-   *                    replaced - FALSE otherwise (default)
-   * @param  integer    optional; the HTTP response code
-   *
-   * @return void
-   */
-  function send_header($header, $replace = FALSE, $status = NULL) {
-    if (isset($status)) {
-      header($header, $replace, $status);
-    }
-    else {
-      header($header, $replace);
-    }
-  }
-}
-
-
-
-/**
- * A Trails_Controller is responsible for matching the unconsumed part of an URI
- * to an action using the left over words as arguments for that action. The
- * action is then mapped to method of the controller instance which is called
- * with the just mentioned arguments. That method can send the #render_action,
- * #render_template, #render_text, #render_nothing or #redirect method.
- * Otherwise the #render_action is called with the current action as argument.
- * If the action method sets instance variables during performing, they will be
- * be used as attributes for the flexi-template opened by #render_action or
- * #render_template. A controller's response's body is populated with the output
- * of the #render_* methods. The action methods can add additional headers or
- * change the status of that response.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Controller {
-
-
-  /**
-   * @ignore
-   */
-  protected
-    $dispatcher,
-    $response,
-    $performed,
-    $layout;
-
-
-  /**
-   * Constructor.
-   *
-   * @param  mixed  the dispatcher who creates this instance
-   *
-   * @return void
-   */
-  function __construct($dispatcher) {
-    $this->dispatcher = $dispatcher;
-    $this->erase_response();
-  }
-
-
-  /**
-   * Resets the response of the controller
-   *
-   * @return void
-   */
-  function erase_response() {
-    $this->performed = FALSE;
-    $this->response = new Trails_Response();
-  }
-
-
-  /**
-   * Return this controller's response
-   *
-   * @return mixed  the controller's response
-   */
-  function get_response() {
-    return $this->response;
-  }
-
-
-  /**
-   * This method extracts an action string and further arguments from it's
-   * parameter. The action string is mapped to a method being called afterwards
-   * using the said arguments. That method is called and a response object is
-   * generated, populated and sent back to the dispatcher.
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  function perform($unconsumed) {
-
-    list($action, $args, $format) = $this->extract_action_and_args($unconsumed);
-
-    $this->format = isset($format) ? $format : 'html';
-
-    $before_filter_result = $this->before_filter($action, $args);
-
-    # send action to controller
-    # TODO (mlunzena) shouldn't the after filter be triggered too?
-    if (!(FALSE === $before_filter_result || $this->performed)) {
-
-      $callable = $this->map_action($action);
-
-      if (is_callable($callable)) {
-        call_user_func_array($callable, $args);
-      }
-      else {
-        $this->does_not_understand($action, $args);
-      }
-
-      if (!$this->performed) {
-        $this->render_action($action);
-      }
-
-      $this->after_filter($action, $args);
-    }
-
-    return $this->response;
-  }
-
-
-  /**
-   * Extracts action and args from a string.
-   *
-   * @param  string       the processed string
-   *
-   * @return array        an array with two elements - a string containing the
-   *                      action and an array of strings representing the args
-   */
-  function extract_action_and_args($string) {
-
-    if ('' === $string) {
-      return $this->default_action_and_args();
-    }
-
-    // find optional file extension
-    $format = NULL;
-    if (preg_match('/^(.*[^\/.])\.(\w+)$/', $string, $matches)) {
-      list($_, $string, $format) = $matches;
-    }
-
-    // TODO this should possibly remove empty tokens
-    $args = explode('/', $string);
-    $action = array_shift($args);
-    return array($action, $args, $format);
-  }
-
-  /**
-   * Return the default action and arguments
-   *
-   * @return an array containing the action, an array of args and the format
-   *
-   */
-  function default_action_and_args() {
-    return array('index', array(), NULL);
-  }
-
-  /**
-   * Maps the action to an actual method name.
-   *
-   * @param  string  the action
-   *
-   * @return string  the mapped method name
-   */
-  function map_action($action) {
-    return array(&$this, $action . '_action');
-  }
-
-
-  /**
-   * Callback function being called before an action is executed. If this
-   * function does not return FALSE, the action will be called, otherwise
-   * an error will be generated and processing will be aborted. If this function
-   * already #rendered or #redirected, further processing of the action is
-   * withheld.
-   *
-   * @param string  Name of the action to perform.
-   * @param array   An array of arguments to the action.
-   *
-   * @return bool
-   */
-  function before_filter(&$action, &$args) {
-  }
-
-
-  /**
-   * Callback function being called after an action is executed.
-   *
-   * @param string Name of the action to perform.
-   * @param array  An array of arguments to the action.
-   *
-   * @return void
-   */
-  function after_filter($action, $args) {
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param type <description>
-   * @param type <description>
-   *
-   * @return void
-   */
-  function does_not_understand($action, $args) {
-    throw new Trails_UnknownAction("No action responded to '$action'.");
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param string <description>
-   *
-   * @return void
-   */
-  function redirect($to) {
-
-    if ($this->performed) {
-      throw new Trails_DoubleRenderError();
-    }
-
-    $this->performed = TRUE;
-
-    # get uri; keep absolute URIs
-    $url = preg_match('#^(/|\w+://)#', $to)
-           ? $to
-           : $this->url_for($to);
-
-    $this->response->add_header('Location', $url)->set_status(302);
-  }
-
-
-  /**
-   * Renders the given text as the body of the response.
-   *
-   * @param string  the text to be rendered
-   *
-   * @return void
-   */
-  function render_text($text = ' ') {
-
-    if ($this->performed) {
-      throw new Trails_DoubleRenderError();
-    }
-
-    $this->performed = TRUE;
-
-    $this->response->set_body($text);
-  }
-
-
-  /**
-   * Renders the empty string as the response's body.
-   *
-   * @return void
-   */
-  function render_nothing() {
-    $this->render_text('');
-  }
-
-
-  /**
-   * Renders the template of the given action as the response's body.
-   *
-   * @param string  the action
-   *
-   * @return void
-   */
-  function render_action($action) {
-    $this->render_template($this->get_default_template($action), $this->layout);
-  }
-
-
-  function get_default_template($action)
-  {
-    $class = get_class($this);
-    $controller_name =
-      Trails_Inflector::underscore(substr($class, 0, -10));
-    return $controller_name.'/'.$action;
-  }
-
-
-  /**
-   * Renders a template using an optional layout template.
-   *
-   * @param mixed  a flexi template
-   * @param mixes  a flexi template which is used as layout
-   *
-   * @return void
-   */
-  function render_template($template_name, $layout = NULL) {
-
-    # open template
-    $factory = $this->get_template_factory();
-    $template = $factory->open($template_name);
-
-    $template->set_attributes($this->get_assigned_variables());
-
-    if (isset($layout)) {
-      $template->set_layout($layout);
-    }
-
-    $this->render_text($template->render());
-  }
-
-
-  /**
-   * Create and return a template factory for this controller.
-   *
-   * @return Flexi\Factory
-   */
-  function get_template_factory() {
-    return new Flexi\Factory($this->dispatcher->trails_root .
-                                     '/views/');
-  }
-
-
-  /**
-   * This method returns all the set instance variables to be used as attributes
-   * for a template. This controller is returned too as value for
-   * key 'controller'.
-   *
-   * @return array  an associative array of variables for the template
-   */
-  function get_assigned_variables() {
-
-    $assigns = array();
-    $protected = get_class_vars(get_class($this));
-
-    foreach (get_object_vars($this) as $var => $value) {
-      if (!array_key_exists($var, $protected)) {
-        $assigns[$var] =& $this->$var;
-      }
-    }
-
-    $assigns['controller'] = $this;
-
-    return $assigns;
-  }
-
-
-  /**
-   * Sets the layout to be used by this controller per default.
-   *
-   * @param  mixed  a flexi template to be used as layout
-   *
-   * @return void
-   */
-  function set_layout($layout) {
-    $this->layout = $layout;
-  }
-
-
-  /**
-   * Returns a URL to a specified route to your Trails application.
-   *
-   * Example:
-   * Your Trails application is located at 'http://example.com/dispatch.php'.
-   * So your dispatcher's trails_uri is set to 'http://example.com/dispatch.php'
-   * If you want the URL to your 'wiki' controller with action 'show' and
-   * parameter 'page' you should send:
-   *
-   *   $url = $controller->url_for('wiki/show', 'page');
-   *
-   * $url should then contain 'http://example.com/dispatch.php/wiki/show/page'.
-   *
-   * The first parameter is a string containing the controller and optionally an
-   * action:
-   *
-   *   - "{controller}/{action}"
-   *   - "path/to/controller/action"
-   *   - "controller"
-   *
-   * This "controller/action" string is not url encoded. You may provide
-   * additional parameter which will be urlencoded and concatenated with
-   * slashes:
-   *
-   *     $controller->url_for('wiki/show', 'page');
-   *     -> 'wiki/show/page'
-   *
-   *     $controller->url_for('wiki/show', 'page', 'one and a half');
-   *     -> 'wiki/show/page/one+and+a+half'
-   *
-   * @param  string   a string containing a controller and optionally an action
-   * @param  strings  optional arguments
-   *
-   * @return string  a URL to this route
-   */
-  function url_for($to/*, ...*/) {
-
-    # urlencode all but the first argument
-    $args = func_get_args();
-    $args = array_map('urlencode', $args);
-    $args[0] = $to;
-
-    return $this->dispatcher->trails_uri . '/' . join('/', $args);
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function set_status($status, $reason_phrase = NULL) {
-    $this->response->set_status($status, $reason_phrase);
-  }
-
-
-  /**
-   * Sets the content type of the controller's response.
-   *
-   * @param  string  the content type
-   *
-   * @return void
-   */
-  function set_content_type($type) {
-    $this->response->add_header('Content-Type', $type);
-  }
-
-
-  /**
-   * Exception handler called when the performance of an action raises an
-   * exception.
-   *
-   * @param  object     the thrown exception
-   *
-   * @return object     a response object
-   */
-  function rescue($exception) {
-    return $this->dispatcher->trails_error($exception);
-  }
-
-  function respond_to($ext) {
-    return $this->format === $ext;
-  }
-}
-
-
-/**
- * The Inflector class is a namespace for inflections methods.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Inflector {
-
-
-  /**
-   * Returns a camelized string from a lower case and underscored string by
-   * replacing slash with underscore and upper-casing each letter preceded
-   * by an underscore. TODO
-   *
-   * @param string String to camelize.
-   *
-   * @return string Camelized string.
-   */
-  static function camelize($word) {
-    $parts = explode('/', $word);
-    foreach ($parts as $key => $part) {
-      $parts[$key] = str_replace(' ', '',
-                                 ucwords(str_replace('_', ' ', $part)));
-    }
-    return join('_', $parts);
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param type <description>
-   *
-   * @return type <description>
-   */
-  static function underscore($word) {
-    $parts = explode('_', $word);
-    foreach ($parts as $key => $part) {
-      $parts[$key] = preg_replace('/(?<=\w)([A-Z])/', '_\\1', $part);
-    }
-    return strtolower(join('/', $parts));
-  }
-}
-
-
-/**
- * The flash provides a way to pass temporary objects between actions.
- * Anything you place in the flash will be exposed to the very next action and
- * then cleared out. This is a great way of doing notices and alerts, such as
- * a create action that sets
- * <tt>$flash->set('notice', "Successfully created")</tt>
- * before redirecting to a display action that can then expose the flash to its
- * template.
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Flash implements ArrayAccess {
-
-
-  /**
-   * @ignore
-   */
-  public
-    $flash = array(), $used = array();
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @return type       <description>
-   */
-  static function instance() {
-
-    if (!isset($_SESSION)) {
-      throw new Trails_SessionRequiredException();
-    }
-
-
-    if (!isset($_SESSION['trails_flash'])) {
-      $_SESSION['trails_flash'] = new Trails_Flash();
-    }
-    return $_SESSION['trails_flash'];
-  }
-
-
-  #[ReturnTypeWillChange]
-  function offsetExists($offset) {
-    return isset($this->flash[$offset]);
-  }
-
-
-  #[ReturnTypeWillChange]
-  function offsetGet($offset) {
-    return $this->get($offset);
-  }
-
-
-  function offsetSet($offset, $value) {
-    $this->set($offset, $value);
-  }
-
-
-  #[ReturnTypeWillChange]
-  function offsetUnset($offset) {
-    unset($this->flash[$offset], $this->used[$offset]);
-  }
-
-
-  /**
-   * Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-   *     use()               # marks the entire flash as used
-   *     use('msg')          # marks the "msg" entry as used
-   *     use(null, false)    # marks the entire flash as unused
-   *                         # (keeps it around for one more action)
-   *     use('msg', false)   # marks the "msg" entry as unused
-   *                         # (keeps it around for one more action)
-   *
-   * @param mixed  a key.
-   * @param bool   used flag.
-   *
-   * @return void
-   */
-  function _use($k = NULL, $v = TRUE) {
-    if ($k) {
-      $this->used[$k] = $v;
-    }
-    else {
-      foreach ($this->used as $k => $value) {
-        $this->_use($k, $v);
-      }
-    }
-  }
-
-
-  /**
-   * Marks the entire flash or a single flash entry to be discarded by the end
-   * of the current action.
-   *
-   *     $flash->discard()             # discards entire flash
-   *                                   # (it'll still be available for the
-   *                                   # current action)
-   *     $flash->discard('warning')    # discard the "warning" entry
-   *                                   # (it'll still be available for the
-   *                                   # current action)
-   *
-   * @param mixed  a key.
-   *
-   * @return void
-   */
-  function discard($k = NULL) {
-    $this->_use($k);
-  }
-
-
-  /**
-   * Returns the value to the specified key.
-   *
-   * @param mixed  a key.
-   *
-   * @return mixed the key's value.
-   */
-  function &get($k) {
-    $return = NULL;
-    if (isset($this->flash[$k])) {
-      $return =& $this->flash[$k];
-    }
-    return $return;
-  }
-
-
-  /**
-   * Keeps either the entire current flash or a specific flash entry available
-   * for the next action:
-   *
-   *    $flash->keep()           # keeps the entire flash
-   *    $flash->keep('notice')   # keeps only the "notice" entry, the rest of
-   *                             # the flash is discarded
-   *
-   * @param mixed  a key.
-   *
-   * @return void
-   */
-  function keep($k = NULL) {
-    $this->_use($k, FALSE);
-  }
-
-
-  /**
-   * Sets a key's value.
-   *
-   * @param mixed  a key.
-   * @param mixed  its value.
-   *
-   * @return void
-   */
-  function set($k, $v) {
-    $this->keep($k);
-    $this->flash[$k] = $v;
-  }
-
-
-  /**
-   * Sets a key's value by reference.
-   *
-   * @param mixed  a key.
-   * @param mixed  its value.
-   *
-   * @return void
-   */
-  function set_ref($k, &$v) {
-    $this->keep($k);
-    $this->flash[$k] =& $v;
-  }
-
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @return type       <description>
-   */
-  function sweep() {
-
-    # remove used values
-    foreach (array_keys($this->flash) as $k) {
-      if ($this->used[$k]) {
-        unset($this->flash[$k], $this->used[$k]);
-      } else {
-        $this->_use($k);
-      }
-    }
-
-    # cleanup if someone meddled with flash or used
-    $fkeys = array_keys($this->flash);
-    $ukeys = array_keys($this->used);
-    foreach (array_diff($fkeys, $ukeys) as $k => $v) {
-      unset($this->used[$k]);
-    }
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @return type       <description>
-   */
-  function __toString() {
-    $values = array();
-    foreach ($this->flash as $k => $v) {
-      $values[] = sprintf("'%s': [%s, '%s']",
-                          $k, var_export($v, TRUE),
-                          $this->used[$k] ? "used" : "unused");
-    }
-    return "{" . join(", ", $values) . "}\n";
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function __sleep() {
-    $this->sweep();
-    return array('flash', 'used');
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function __wakeUp() {
-    $this->discard();
-  }
-}
-
-
-
-/**
- * TODO
- *
- * @package   trails
- *
- * @author    mlunzena
- * @copyright (c) Authors
- * @version   $Id: trails.php 7001 2008-04-04 11:20:27Z mlunzena $
- */
-
-class Trails_Exception extends Exception {
-
-  /**
-   * <FieldDescription>
-   *
-   * @access private
-   * @var <type>
-   */
-  public $headers;
-
-
-  /**
-   * @param  int     the status code to be set in the response
-   * @param  string  a human readable presentation of the status code
-   * @param  array   a hash of additional headers to be set in the response
-   *
-   * @return void
-   */
-  function __construct($status = 500, $reason = NULL, $headers = array()) {
-    if ($reason === NULL) {
-      $reason = Trails_Response::get_reason($status);
-    }
-    parent::__construct($reason, $status);
-    $this->headers = $headers;
-  }
-
-
-  /**
-   * <MethodDescription>
-   *
-   * @param  type       <description>
-   *
-   * @return type       <description>
-   */
-  function __toString() {
-    return "{$this->code} {$this->message}";
-  }
-}
-
-
-class Trails_DoubleRenderError extends Trails_Exception {
-
-  function __construct() {
-    $message =
-      "Render and/or redirect were called multiple times in this action. ".
-      "Please note that you may only call render OR redirect, and at most ".
-      "once per action.";
-    parent::__construct(500, $message);
-  }
-}
-
-
-class Trails_MissingFile extends Trails_Exception {
-  function __construct($message) {
-    parent::__construct(500, $message);
-  }
-}
-
-
-class Trails_RoutingError extends Trails_Exception {
-
-  function __construct($message) {
-    parent::__construct(400, $message);
-  }
-}
-
-
-class Trails_UnknownAction extends Trails_Exception {
-
-  function __construct($message) {
-    parent::__construct(404, $message);
-  }
-}
-
-
-class Trails_UnknownController extends Trails_Exception {
-
-  function __construct($message) {
-    parent::__construct(404, $message);
-  }
-}
-
-
-class Trails_SessionRequiredException extends Trails_Exception {
-  function __construct() {
-    $message = "Tried to access a non existing session.";
-    parent::__construct(500, $message);
-  }
-}
-- 
cgit v1.0


From 801a4916a263bed0aeecb6c62e8a25138ee5612a Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 27 May 2024 11:52:23 +0000
Subject: use current date when creating calendar dates, fixes #3920

Closes #3920

Merge request studip/studip!3043
---
 app/controllers/calendar/calendar.php            | 4 ++--
 app/controllers/calendar/date.php                | 8 ++++++++
 resources/assets/javascripts/lib/fullcalendar.js | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index 89421cb..fa33e2e 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -39,7 +39,7 @@ class Calendar_CalendarController extends AuthenticatedController
                 _('Termin anlegen'),
                 $this->url_for('calendar/date/add', $params),
                 Icon::create('add'),
-                ['data-dialog' => 'size=auto']
+                ['data-dialog' => 'size=auto', 'class' => 'calendar-action']
             );
         }
 
@@ -446,7 +446,7 @@ class Calendar_CalendarController extends AuthenticatedController
             _('Termin anlegen'),
             $this->url_for('calendar/date/add/course_' . $course->id),
             Icon::create('add'),
-            ['data-dialog' => 'size=default']
+            ['data-dialog' => 'size=default', 'class' => 'calendar-action']
         );
         $actions->addLink(
             _('Drucken'),
diff --git a/app/controllers/calendar/date.php b/app/controllers/calendar/date.php
index eda171b..cb61a7e 100644
--- a/app/controllers/calendar/date.php
+++ b/app/controllers/calendar/date.php
@@ -232,6 +232,14 @@ class Calendar_DateController extends AuthenticatedController
             $this->date->repetition_end = $this->date->end;
         } else {
             $time = new DateTime();
+            if (Request::submitted('timestamp')) {
+                $time->setTimestamp(Request::int('timestamp'));
+            } elseif (Request::submitted('defaultDate')) {
+                $date_parts = explode('-', Request::get('defaultDate'));
+                if (count($date_parts) === 3) {
+                    $time->setDate($date_parts[0], $date_parts[1], $date_parts[2]);
+                }
+            }
             $time = $time->add(new DateInterval('PT1H'));
             $time->setTime(intval($time->format('H')), 0, 0);
             $this->date->begin = $time->getTimestamp();
diff --git a/resources/assets/javascripts/lib/fullcalendar.js b/resources/assets/javascripts/lib/fullcalendar.js
index 49274f4..b001ab4 100644
--- a/resources/assets/javascripts/lib/fullcalendar.js
+++ b/resources/assets/javascripts/lib/fullcalendar.js
@@ -731,9 +731,9 @@ class Fullcalendar
             //Get the timestamp:
             let timestamp = changedMoment.getTime() / 1000;
 
-            jQuery('a.resource-bookings-actions').each(function () {
+            jQuery('a.resource-bookings-actions, a.calendar-action').each(function () {
                 const url = new URL(this.href);
-                url.searchParams.set('timestamp', timestamp)
+                url.searchParams.set('timestamp', timestamp.toString())
                 url.searchParams.set('defaultDate', changed_date)
                 this.href = url.toString();
             });
-- 
cgit v1.0


From d9d2b00def5aaf0574688685a90e622a4056152a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 27 May 2024 11:59:42 +0000
Subject: filter null values and fail safe condition, fixes #4218

Closes #4218

Merge request studip/studip!3044
---
 resources/assets/javascripts/lib/abstract-api.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/assets/javascripts/lib/abstract-api.js b/resources/assets/javascripts/lib/abstract-api.js
index cf9aed1..70a88db 100644
--- a/resources/assets/javascripts/lib/abstract-api.js
+++ b/resources/assets/javascripts/lib/abstract-api.js
@@ -107,9 +107,11 @@ class AbstractAPI
     }
 
     convertDataToRequestParameters(data, prefix = '') {
-        return Object.entries(data).map(([key, value]) => {
+        return Object.entries(data).filter(([key, value]) => {
+            return value !== null;
+        }).map(([key, value]) => {
             const name = prefix ? `${prefix}[${key}]` : `${key}`;
-            if (value.constructor.name === 'Object') {
+            if (value.constructor?.name === 'Object') {
                 return this.convertDataToRequestParameters(value, name);
             } else {
                 return `${name}=${value}`;
-- 
cgit v1.0


From 0efc30590f18a568ebe021b72da2aa4033e38a78 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Mon, 27 May 2024 13:06:55 +0000
Subject: =?UTF-8?q?Resolve=20"Fehler=20in=20der=20Datei-=20und=20Aktivit?=
 =?UTF-8?q?=C3=A4ts=C3=BCbersicht:=20Tabelle=20"wiki"=20existiert=20nicht?=
 =?UTF-8?q?=20mehr"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4219

Merge request studip/studip!3045
---
 app/controllers/admin/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index 54aa0c4..1d8361c 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1440,7 +1440,7 @@ class Admin_UserController extends AuthenticatedController
         ];
         $queries[] = [
             'desc'  => _("Anzahl der Wikiseiten"),
-            'query' => "SELECT COUNT(*) FROM wiki WHERE user_id = ? GROUP BY user_id",
+            'query' => "SELECT COUNT(*) FROM `wiki_pages` WHERE `user_id` = ? GROUP BY `user_id`",
         ];
         $queries[] = [
             'desc'  => _("Anzahl der Umfragen"),
-- 
cgit v1.0


From a0dd66e71949fc78f6ea9d88a0d4cd241185f373 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 27 May 2024 15:37:49 +0000
Subject: set defaultDate on changed calendar dates in sidebar widgets, fixes
 #3924

Closes #3924

Merge request studip/studip!3046
---
 app/controllers/calendar/calendar.php            |  6 +++++-
 resources/assets/javascripts/lib/fullcalendar.js | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index fa33e2e..0cb96ad 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -111,6 +111,8 @@ class Calendar_CalendarController extends AuthenticatedController
     {
         PageLayout::setTitle(_('Kalender'));
 
+        $default_date = \Studip\Calendar\Helper::getDefaultCalendarDate();
+
         if (Request::isPost()) {
             //In case the checkbox of the options widget is clicked, the resulting
             //POST request must be catched here and result in a redirect.
@@ -203,6 +205,7 @@ class Calendar_CalendarController extends AuthenticatedController
             if ($calendar_owner && $calendar_owner->id === User::findCurrent()->id) {
                 //The user is viewing their own calendar.
                 $options = new OptionsWidget();
+                $options->addLayoutCSSClass('calendar-action');
                 $options->addCheckbox(
                     _('Abgelehnte Termine anzeigen'),
                     Request::bool('show_declined'),
@@ -237,6 +240,7 @@ class Calendar_CalendarController extends AuthenticatedController
                         $this->url_for('calendar/calendar/index', ['view' => 'group']),
                         'group_id'
                     );
+                    $group_select->addLayoutCSSClass('calendar-action');
                     $options = [
                         '' => _('(bitte wählen)')
                     ];
@@ -263,6 +267,7 @@ class Calendar_CalendarController extends AuthenticatedController
                     $this->url_for('calendar/calendar'),
                     'user_id'
                 );
+                $calendar_select->addLayoutCSSClass('calendar-action');
                 $select_options = [
                     '' => _('(bitte wählen)'),
                     User::findCurrent()->id => _('Eigener Kalender')
@@ -335,7 +340,6 @@ class Calendar_CalendarController extends AuthenticatedController
         $slot_durations = $this->getUserCalendarSlotSettings();
 
         //Create the fullcalendar object:
-        $default_date = \Studip\Calendar\Helper::getDefaultCalendarDate();
 
         $data_url_params = [];
         if (Request::bool('show_declined')) {
diff --git a/resources/assets/javascripts/lib/fullcalendar.js b/resources/assets/javascripts/lib/fullcalendar.js
index b001ab4..3b8fa11 100644
--- a/resources/assets/javascripts/lib/fullcalendar.js
+++ b/resources/assets/javascripts/lib/fullcalendar.js
@@ -737,6 +737,25 @@ class Fullcalendar
                 url.searchParams.set('defaultDate', changed_date)
                 this.href = url.toString();
             });
+            jQuery('.sidebar-widget.calendar-action').each(function() {
+                //Each sidebar widget is different. The placement of the defaultDate URL parameter
+                //has to reflect that.
+                jQuery(this).find('button[formaction]').each(function() {
+                    //Modify the formaction attribute:
+                    let url = new URL(jQuery(this).attr('formaction'));
+                    url.searchParams.set('defaultDate', changed_date);
+                    jQuery(this).attr('formaction', url.toString());
+                });
+                jQuery(this).find('form[action]').each(function() {
+                    //Add a hidden input with the defaultDate:
+                    let hidden_input = jQuery(this).find('input[name="defaultDate"]')[0];
+                    if (!hidden_input) {
+                        hidden_input = jQuery('<input type="hidden" name="defaultDate">');
+                        jQuery(this).append(hidden_input);
+                    }
+                    jQuery(hidden_input).val(changed_date);
+                });
+            });
 
             // Now change the URL of the window.
             const url = new URL(window.location.href);
-- 
cgit v1.0


From 203eb5a996d40d7acd17db5e9c342059eabde749 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 27 May 2024 15:43:58 +0000
Subject: QuickSearch.vue: reset input after selection, fixes #3963

Closes #3963

Merge request studip/studip!2876
---
 resources/vue/components/Quicksearch.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/vue/components/Quicksearch.vue b/resources/vue/components/Quicksearch.vue
index 94b0a3a..0f37ae0 100644
--- a/resources/vue/components/Quicksearch.vue
+++ b/resources/vue/components/Quicksearch.vue
@@ -119,6 +119,7 @@ export default {
             this.results = [];
 
             this.$emit('input', this.returnValue, this.inputValue);
+            this.inputValue = '';
         },
         selectUp () {
             if (this.selected > 0) {
-- 
cgit v1.0


From e1c2f5b8f32ddb3de73499cef9bc50efbe142409 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 27 May 2024 16:39:20 +0000
Subject: fixed accessibility issues when assigning courses to a colour group,
 fixes #4047

Closes #4047

Merge request studip/studip!2902
---
 app/views/my_courses/groups.php                   |  9 ++++--
 resources/assets/stylesheets/scss/my_courses.scss | 39 ++++++++++++++++-------
 templates/header.php                              |  3 +-
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/app/views/my_courses/groups.php b/app/views/my_courses/groups.php
index 22628c5..4476aeb 100644
--- a/app/views/my_courses/groups.php
+++ b/app/views/my_courses/groups.php
@@ -25,7 +25,7 @@
         <thead>
             <tr>
                 <th><?= _('Veranstaltung') ?></th>
-                <th colspan="100%"><?= _('Gruppen/Farbe') ?></th>
+                <th colspan="100%"><?= _('Gruppe/Farbe') ?></th>
             </tr>
         </thead>
         <? foreach ($groups as $group_id => $group_members): ?>
@@ -58,11 +58,14 @@
                 <? for ($i = 0; $i < 9; $i++): ?>
                     <td class="gruppe<?= $i ?> mycourses-group-selector" onclick="this.querySelector('input').checked = true;">
                         <input type="radio" name="gruppe[<?= $member['seminar_id'] ?>]" value="<?= $i ?>"
-                               aria-label="<?= _('Zugeordnet zu Gruppe ') . ($i + 1) ?>"
+                               aria-label="<?= sprintf(_('Gruppe %u zuordnen'), $i + 1) ?>"
                                id="course-group-<?= htmlReady($member['seminar_id']) ?>-<?= $i ?>"
                             <? if ($my_sem[$member['seminar_id']]['gruppe'] == $i) echo 'checked'; ?>>
                         <label for="course-group-<?= htmlReady($member['seminar_id']) ?>-<?= $i ?>">
-                            <?= sprintf(_('Gruppe %u zuordnen'), $i + 1) ?>
+                            <span class="group-number"><?= $i + 1 ?></span>
+                            <span class="checked-icon">
+                                <?= Icon::create('accept', Icon::ROLE_INFO)->asImg(20) ?>
+                            </span>
                         </label>
                     </td>
                 <? endfor; ?>
diff --git a/resources/assets/stylesheets/scss/my_courses.scss b/resources/assets/stylesheets/scss/my_courses.scss
index b82ec2b..769f3d2 100644
--- a/resources/assets/stylesheets/scss/my_courses.scss
+++ b/resources/assets/stylesheets/scss/my_courses.scss
@@ -9,7 +9,7 @@
     background: var(--white);
 }
 
-.mycourses-group-selector {
+form.default .mycourses-group-selector {
     position: relative;
 
     background-clip: padding-box;
@@ -19,26 +19,41 @@
         @extend .sr-only;
 
         &:checked + label {
-            @include background-icon(accept, info);
+            .group-number {
+                display: none;
+            }
+            .checked-icon {
+                display: inline;
+            }
         }
     }
 
     &:hover label {
-        @include background-icon(accept, info);
+        .group-number {
+            display: none;
+        }
+        .checked-icon {
+            display: inline;
+        }
     }
 
     label {
-        @include hide-text();
+        text-align: center;
+        font-size: large;
+        font-weight: bold;
+        cursor: pointer;
 
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
+        background-color: var(--white);
+        margin-bottom: 0;
+        text-indent: 0;
 
-        background-position: center;
-        background-repeat: no-repeat;
+        height: 1.2em;
 
-        cursor: pointer;
+        .group-number {
+            display: inline;
+        }
+        .checked-icon {
+            display: none;
+        }
     }
 }
diff --git a/templates/header.php b/templates/header.php
index 5a935b3..b875038 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -277,7 +277,8 @@ if ($navigation) {
                 <? $membership = CourseMember::find([Context::get()->id, $GLOBALS['user']->id]) ?>
                 <? if ($membership) : ?>
                     <a href="<?= URLHelper::getLink('dispatch.php/my_courses/groups') ?>"
-                       data-dialog
+                       data-dialog aria-label="<?= _('Gruppenzuordnung der Veranstaltung ändern') ?>"
+                       title="<?= _('Gruppenzuordnung der Veranstaltung ändern') ?>"
                        class="colorblock gruppe<?= $membership ? $membership['gruppe'] : 1 ?>"></a>
                 <? endif ?>
             <? endif ?>
-- 
cgit v1.0


From 4e798558115a71c61d9a5f77a909356aeb0873b6 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Tue, 28 May 2024 04:50:35 +0000
Subject: Resolve "VA-Administration: Filter nach Text-Datenfelder
 funktionieren nicht"

Closes #4215

Merge request studip/studip!3042
---
 templates/sidebar/search-widget.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/templates/sidebar/search-widget.php b/templates/sidebar/search-widget.php
index 6d870ba..5bbc77e 100644
--- a/templates/sidebar/search-widget.php
+++ b/templates/sidebar/search-widget.php
@@ -1,6 +1,7 @@
 <form action="<?= URLHelper::getLink($url) ?>"
       method="<?= $method ?>"
-      <? if (isset($id)) printf('id="%s"', htmlReady($id)); ?>
+      <? $id = $id ?? 'form-'.md5(uniqid()) ?>
+      <? printf('id="%s"', htmlReady($id)) ?>
       <?= $onsubmit ? 'onsubmit="'.htmlReady($onsubmit).'"' : '' ?>
       class="sidebar-search">
 <? foreach ($url_params as $key => $value): ?>
@@ -8,9 +9,10 @@
 <? endforeach; ?>
     <ul class="needles">
     <? foreach ($needles as $needle): ?>
+        <? $hash = md5($url . '|' . $needle['name']) ?>
         <li <? if ($needle['quick_search'] && $needle['quick_search']->hasExtendedLayout()) echo 'class="extendedLayout" id="' . $needle['quick_search']->getId() . '_frame"'; ?>>
             <div class="input-group files-search">
-                <label for="needle-<?= $hash = md5($url . '|' . $needle['name']) ?>" <? if ($needle['placeholder']) echo 'style="display:none;"'; ?>>
+                <label for="needle-<?= $hash ?>" <? if ($needle['placeholder']) echo 'style="display:none;"'; ?>>
                     <?= htmlReady($needle['label']) ?>
                 </label>
                 <? if ($needle['quick_search']): ?>
@@ -23,10 +25,19 @@
                        <?= arrayToHtmlAttributes($needle['attributes']) ?>>
                 <? endif; ?>
                 <? if ($reset_link): ?>
-                    <a class="reset-search" href="<?= $reset_link ?>" tabindex="0" role="button"
-                       title="<?= _('Suche zurücksetzen') ?>">
-                        <?= Icon::create('decline')->asImg(20) ?>
-                    </a>
+                    <? if ($onsubmit) : ?>
+                        <?= Icon::create('decline')->asInput([
+                            'title' =>  _('Suche zurücksetzen'),
+                            'class' => 'reset-search',
+                            'onclick' => "window.document.getElementById('needle-".$hash."').value = '';"
+                        ]) ?>
+                    <? else : ?>
+                        <a class="reset-search" href="<?= $reset_link ?>" tabindex="0" role="button"
+                            <?= $onsubmit ? 'onclick="'."window.document.getElementById('needle-".$hash."').value = ''; window.document.getElementById('".$id."').submit(); return false; ".'"' : '' ?>
+                           title="<?= _('Suche zurücksetzen') ?>">
+                            <?= Icon::create('decline')->asImg(20) ?>
+                        </a>
+                    <? endif ?>
                 <? endif; ?>
                 <button type="submit" class="submit-search<?= $reset_link ? ' is-executed' : '' ?>"
                         title="<?= _('Suche ausführen') ?>">
-- 
cgit v1.0


From fe2b584cb79ba8a2c642be085cacdd82d526df25 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 28 May 2024 07:55:24 +0000
Subject: add debug bar, fixes #4220

Closes #4220

Merge request studip/studip!3049
---
 .env.dist                             |  2 +
 app/controllers/debugbar.php          | 17 +++++++++
 composer.json                         |  3 +-
 composer.lock                         | 70 ++++++++++++++++++++++++++++++++++-
 lib/bootstrap-definitions.php         | 46 ++++++++++++++++++++++-
 lib/bootstrap.php                     | 11 ++----
 lib/classes/Debug/DebugBar.php        | 12 ++++++
 lib/classes/Debug/TrailsCollector.php | 69 ++++++++++++++++++++++++++++++++++
 lib/classes/PageLayout.php            | 15 ++++++++
 lib/classes/StudipController.php      | 16 +++++++-
 templates/layouts/base.php            |  6 +++
 11 files changed, 256 insertions(+), 11 deletions(-)
 create mode 100644 app/controllers/debugbar.php
 create mode 100644 lib/classes/Debug/DebugBar.php
 create mode 100644 lib/classes/Debug/TrailsCollector.php

diff --git a/.env.dist b/.env.dist
index 3d1b90b..e22ca4d 100644
--- a/.env.dist
+++ b/.env.dist
@@ -3,6 +3,8 @@
 # MYSQL_PASSWORD=""
 # MYSQL_DATABASE=""
 
+# DEBUG_BAR="1" // Enable to display the debug bar in development mode
+
 # STUDIP_CACHING_ENABLE=""
 # STUDIP_CACHE_IS_SESSION_STORAGE=""
 # STUDIP_ENV=""
diff --git a/app/controllers/debugbar.php b/app/controllers/debugbar.php
new file mode 100644
index 0000000..a80000d
--- /dev/null
+++ b/app/controllers/debugbar.php
@@ -0,0 +1,17 @@
+<?php
+final class DebugbarController extends Trails_Controller
+{
+    public function css_action(): void
+    {
+        $this->set_content_type('text/css;charset=utf-8');
+        $this->render_nothing();
+        app()->get(DebugBar\DebugBar::class)->getJavascriptRenderer()->dumpCssAssets();
+    }
+
+    public function js_action(): void
+    {
+        $this->set_content_type('text/javascript;charset=utf-8');
+        $this->render_nothing();
+        app()->get(DebugBar\DebugBar::class)->getJavascriptRenderer()->setIncludeVendors(false)->dumpJsAssets();
+    }
+}
diff --git a/composer.json b/composer.json
index 8ec6778..bd01b28 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
         "codeception/module-asserts": "3.0.0",
         "overtrue/phplint": "9.3.0",
         "phpstan/phpstan": "1.11.0",
-        "symfony/var-dumper": "6.4.7"
+        "symfony/var-dumper": "6.4.7",
+        "maximebf/debugbar": "1.22.3"
     },
     "require": {
         "php": "^8.1",
diff --git a/composer.lock b/composer.lock
index f2e656d..2392a40 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7b19d8591a65485c94fb1794c93eef90",
+    "content-hash": "3cab15d3a1cd08dde4cd02d5bb19c760",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -5497,6 +5497,74 @@
             "time": "2024-02-02T19:21:00+00:00"
         },
         {
+            "name": "maximebf/debugbar",
+            "version": "v1.22.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maximebf/php-debugbar.git",
+                "reference": "7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96",
+                "reference": "7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8",
+                "psr/log": "^1|^2|^3",
+                "symfony/var-dumper": "^4|^5|^6|^7"
+            },
+            "require-dev": {
+                "dbrekelmans/bdi": "^1",
+                "phpunit/phpunit": "^8|^9",
+                "symfony/panther": "^1|^2.1",
+                "twig/twig": "^1.38|^2.7|^3.0"
+            },
+            "suggest": {
+                "kriswallsmith/assetic": "The best way to manage assets",
+                "monolog/monolog": "Log using Monolog",
+                "predis/predis": "Redis storage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.22-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\": "src/DebugBar/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "maxime.bouroumeau@gmail.com",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Debug bar in the browser for php application",
+            "homepage": "https://github.com/maximebf/php-debugbar",
+            "keywords": [
+                "debug",
+                "debugbar"
+            ],
+            "support": {
+                "issues": "https://github.com/maximebf/php-debugbar/issues",
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.3"
+            },
+            "time": "2024-04-03T19:39:26+00:00"
+        },
+        {
             "name": "myclabs/deep-copy",
             "version": "1.11.1",
             "source": {
diff --git a/lib/bootstrap-definitions.php b/lib/bootstrap-definitions.php
index d34d023..2f59dc9 100644
--- a/lib/bootstrap-definitions.php
+++ b/lib/bootstrap-definitions.php
@@ -1,10 +1,18 @@
 <?php
 
+use DebugBar\DataCollector\ExceptionsCollector;
+use DebugBar\DataCollector\MemoryCollector;
+use DebugBar\DataCollector\MessagesCollector;
+use DebugBar\DataCollector\PhpInfoCollector;
+use DebugBar\DataCollector\RequestDataCollector;
+use DebugBar\DataCollector\TimeDataCollector;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
+use function DI\create;
+
 return [
     LoggerInterface::class => DI\factory(function () {
         return new Logger('studip', [
@@ -17,10 +25,46 @@ return [
     \Studip\Cache\Cache::class => DI\factory(function () {
         return \Studip\Cache\Factory::getCache();
     }),
-    StudipPDO::class => DI\factory(function () {
+    PDO::class => DI\factory(function () {
         return DBManager::get();
     }),
     Trails\Dispatcher::class => DI\factory(function (ContainerInterface $container) {
         return new \StudipDispatcher($container);
     }),
+    DebugBar\DebugBar::class => DI\factory(function (ContainerInterface $container) {
+        $debugBar = new DebugBar\DebugBar();
+        $debugBar->addCollector(new PhpInfoCollector());
+        $debugBar->addCollector(new RequestDataCollector());
+        $debugBar->addCollector(new MemoryCollector());
+        $debugBar->addCollector(new ExceptionsCollector());
+
+        // Future Improvements, not used/activated right now
+        # $debugBar->addCollector(new MessagesCollector());
+        # $debugBar->addCollector(new TimeDataCollector());
+
+        $config = iterator_to_array(Config::getInstance()->getIterator());
+        ksort($config);
+        $debugBar->addCollector(new DebugBar\DataCollector\ConfigCollector($config));
+
+        $pdo = $container->get(PDO::class);
+        if ($pdo instanceof DebugBar\DataCollector\PDO\TraceablePDO) {
+            $collector = new DebugBar\DataCollector\PDO\PDOCollector($pdo);
+            $debugBar->addCollector($collector);
+        }
+
+        return $debugBar;
+    }),
+    StudipPDO::class => DI\factory(function () {
+        $pdo = new StudipPDO(
+            "mysql:host={$GLOBALS['DB_STUDIP_HOST']};dbname={$GLOBALS['DB_STUDIP_DATABASE']};charset=utf8mb4",
+            $GLOBALS['DB_STUDIP_USER'],
+            $GLOBALS['DB_STUDIP_PASSWORD']
+        );
+
+        if (Studip\Debug\DebugBar::isActivated()) {
+            $pdo = new DebugBar\DataCollector\PDO\TraceablePDO($pdo);
+        }
+
+        return $pdo;
+    }),
 ];
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index e9c9bb5..8c618ff 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -129,13 +129,10 @@ $GLOBALS['template_factory'] = new Flexi\Factory("{$STUDIP_BASE_PATH}/templates"
 
 // set default pdo connection
 try {
-    DBManager::getInstance()
-        ->setConnection('studip',
-            'mysql:host=' . $GLOBALS['DB_STUDIP_HOST'] .
-            ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE'] .
-            ';charset=utf8mb4',
-            $GLOBALS['DB_STUDIP_USER'],
-            $GLOBALS['DB_STUDIP_PASSWORD']);
+    DBManager::getInstance()->setConnection(
+        'studip',
+        app(StudipPDO::class)
+    );
 } catch (PDOException $exception) {
     if (Studip\ENV === 'development') {
         throw $exception;
diff --git a/lib/classes/Debug/DebugBar.php b/lib/classes/Debug/DebugBar.php
new file mode 100644
index 0000000..bbd80c9
--- /dev/null
+++ b/lib/classes/Debug/DebugBar.php
@@ -0,0 +1,12 @@
+<?php
+namespace Studip\Debug;
+
+final class DebugBar
+{
+    public static function isActivated(): bool
+    {
+        return \Studip\ENV === 'development'
+            && ($_ENV['DEBUG_BAR'] ?? false)
+            && class_exists(\DebugBar\DebugBar::class);
+    }
+}
diff --git a/lib/classes/Debug/TrailsCollector.php b/lib/classes/Debug/TrailsCollector.php
new file mode 100644
index 0000000..f4b8a65
--- /dev/null
+++ b/lib/classes/Debug/TrailsCollector.php
@@ -0,0 +1,69 @@
+<?php
+namespace Studip\Debug;
+
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\Renderable;
+use Trails\Controller;
+
+final class TrailsCollector extends DataCollector implements Renderable
+{
+    public function __construct(
+        private readonly Controller $controller
+    ) {
+        $this->useHtmlVarDumper(false);
+    }
+
+    public function collect()
+    {
+        $data = [];
+        foreach ($this->controller->get_assigned_variables() as $k => $v) {
+            if ($this->isHtmlVarDumperUsed()) {
+                $v = $this->getVarDumper()->renderVar($v);
+            } else if (!is_string($v)) {
+                $v = $this->getDataFormatter()->formatVar($v);
+            }
+            $data[$k] = $v;
+        }
+
+        ksort($data);
+
+        return $data;
+    }
+
+    public function getName()
+    {
+        return 'trails';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAssets()
+    {
+        return $this->isHtmlVarDumperUsed() ? $this->getVarDumper()->getAssets() : [];
+    }
+
+    /**
+     * @return array[]
+     */
+    public function getWidgets()
+    {
+        $name = $this->getName();
+        $widget = $this->isHtmlVarDumperUsed()
+            ? 'PhpDebugBar.Widgets.HtmlVariableListWidget'
+            : 'PhpDebugBar.Widgets.VariableListWidget';
+
+        return [
+            $name => [
+                'icon'   => 'code',
+                'widget' => $widget,
+                'map' => $name,
+                'default' => '{}'
+            ],
+            "{$name}:badge" => [
+                'map' => "{$name}:variable__count",
+                'default' => count($this->controller->get_assigned_variables()),
+            ],
+        ];
+    }
+}
diff --git a/lib/classes/PageLayout.php b/lib/classes/PageLayout.php
index d3f3028..a4178a5 100644
--- a/lib/classes/PageLayout.php
+++ b/lib/classes/PageLayout.php
@@ -139,6 +139,21 @@ class PageLayout
         self::addScript('studip-wysiwyg.js?v=' . $v);
 
         self::addStylesheet('print.css?v=' . $v, ['media' => 'print']);
+
+        if (Studip\Debug\DebugBar::isActivated()) {
+            $old_base = URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
+
+            self::addHeadElement('link', [
+                'href' => URLHelper::getURL('dispatch.php/debugbar/css'),
+                'rel' => 'stylesheet',
+                'type' => 'text/css',
+            ]);
+            self::addHeadElement('script', [
+                'src' => URLHelper::getURL('dispatch.php/debugbar/js'),
+            ]);
+
+            URLHelper::setBaseURL($old_base);
+        }
     }
 
     /**
diff --git a/lib/classes/StudipController.php b/lib/classes/StudipController.php
index 4fbcc42..0643836 100644
--- a/lib/classes/StudipController.php
+++ b/lib/classes/StudipController.php
@@ -9,6 +9,7 @@
  * the License, or (at your option) any later version.
  */
 
+use DebugBar\DebugBar;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
@@ -294,7 +295,7 @@ abstract class StudipController extends Trails\Controller
 
         // Extract fragment (if any)
         if (strpos($to, '#') !== false) {
-            list($args[0], $fragment) = explode('#', $to);
+            [$args[0], $fragment] = explode('#', $to);
         }
 
         // Extract parameters (if any)
@@ -666,6 +667,19 @@ abstract class StudipController extends Trails\Controller
         return $this->response;
     }
 
+    public function render_template($template_name, $layout = null)
+    {
+        if (Studip\Debug\DebugBar::isActivated()) {
+            $debugbar = app()->get(Debugbar::class);
+            if (!isset($debugbar['trails'])) {
+                $collector = new \Studip\Debug\TrailsCollector($this);
+                $debugbar->addCollector($collector);
+            }
+        }
+
+        parent::render_template($template_name, $layout);
+    }
+
     /**
      * Renders a given template and returns the resulting string.
      *
diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index 2db1f7e..cd32e3b 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -103,6 +103,12 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
     <?= $this->render_partial('footer', ['link_params' => $header_template->link_params]); ?>
     <?= SkipLinks::getHTML() ?>
     <section class="sr-only" id="notes_for_screenreader" aria-live="polite"></section>
+
+<?php
+if (Studip\Debug\DebugBar::isActivated()) {
+    echo app()->get(\DebugBar\DebugBar::class)->getJavascriptRenderer()->render();
+}
+?>
 </body>
 </html>
 <?php NotificationCenter::postNotification('PageDidRender', PageLayout::getBodyElementId());
-- 
cgit v1.0


From 0afb9c16eab3f9c1fd069b350d4fa9fee4c0ec73 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 28 May 2024 08:47:35 +0000
Subject: allow abstract api to work with real promises instead of deferreds
 and use it, fixes #3643

Closes #3643

Merge request studip/studip!2885
---
 .../assets/javascripts/bootstrap/consultations.js  |  4 +--
 resources/assets/javascripts/init.js               |  2 +-
 resources/assets/javascripts/lib/abstract-api.js   | 40 ++++++++++++++++++++++
 resources/assets/javascripts/lib/jsonapi.js        | 31 -----------------
 resources/assets/javascripts/lib/jsonapi.ts        | 31 +++++++++++++++++
 resources/assets/javascripts/studip-ui.js          |  4 +--
 resources/vue/components/MyCoursesTiles.vue        |  6 ++--
 resources/vue/store/ContentModulesStore.js         |  2 +-
 resources/vue/store/MyCoursesStore.js              |  2 +-
 9 files changed, 81 insertions(+), 41 deletions(-)
 delete mode 100644 resources/assets/javascripts/lib/jsonapi.js
 create mode 100644 resources/assets/javascripts/lib/jsonapi.ts

diff --git a/resources/assets/javascripts/bootstrap/consultations.js b/resources/assets/javascripts/bootstrap/consultations.js
index ef79d9c..51ffa85 100644
--- a/resources/assets/javascripts/bootstrap/consultations.js
+++ b/resources/assets/javascripts/bootstrap/consultations.js
@@ -10,9 +10,9 @@ $(document).on('click', '.consultation-delete-check:not(.ignore)', event => {
     }
 
     let requests = ids.map(id => {
-        return STUDIP.jsonapi.GET(`consultation-slots/${id}/bookings`).then(result => result.data.length);
+        return STUDIP.jsonapi.withPromises().get(`consultation-slots/${id}/bookings`).then(response => response.data.length);
     });
-    $.when(...requests).done((...results) => {
+    Promise.all(requests).then((...results) => {
         if (results.some(result => result > 0)) {
             $(event.target).addClass('ignore').click().removeClass('ignore');
         } else {
diff --git a/resources/assets/javascripts/init.js b/resources/assets/javascripts/init.js
index 2d592be..fe20c9a 100644
--- a/resources/assets/javascripts/init.js
+++ b/resources/assets/javascripts/init.js
@@ -38,7 +38,7 @@ import HeaderMagic from './lib/header_magic.js';
 import i18n from './lib/i18n.js';
 import Instschedule from './lib/instschedule.js';
 import InlineEditing from './lib/inline-editing.js';
-import JSONAPI, { jsonapi } from './lib/jsonapi.js';
+import JSONAPI, { jsonapi } from './lib/jsonapi.ts';
 import JSUpdater from './lib/jsupdater.js';
 import Lightbox from './lib/lightbox.js';
 import Markup from './lib/markup.js';
diff --git a/resources/assets/javascripts/lib/abstract-api.js b/resources/assets/javascripts/lib/abstract-api.js
index 70a88db..95ae015 100644
--- a/resources/assets/javascripts/lib/abstract-api.js
+++ b/resources/assets/javascripts/lib/abstract-api.js
@@ -1,5 +1,20 @@
 import Overlay from './overlay.js';
 
+class APIError extends Error
+{
+    static createWithJqXhr(message, jqXhr) {
+        const error = new APIError(message);
+        error.setJqXhr(jqXhr);
+        return error;
+    }
+
+    jqXhr = null;
+
+    setJqXhr(jqXhr) {
+        this.jqXhr = jqXhr;
+    }
+}
+
 class AbstractAPI
 {
     static get supportedMethods() {
@@ -118,6 +133,31 @@ class AbstractAPI
             }
         }).join('&');
     }
+
+    withPromises() {
+        return new Proxy(this, {
+            get(target, prop, receiver) {
+                // This will allow http methods to be written as lowercase when called as methods
+                // (e.g. api.patch() instead of api.PATCH())
+                if (target[prop] === undefined && AbstractAPI.supportedMethods.includes(prop.toUpperCase())) {
+                    prop = prop.toUpperCase();
+                }
+
+                // Only handle calls to request methods
+                if (prop !== 'request') {
+                    return Reflect.get(target, prop, receiver);
+                }
+
+                // Return a wrapped promise that handles the deferred
+                return (url, options = {}) => new Promise((resolve, reject) => {
+                    target[prop].apply(target, [url, options]).then(
+                        (response) => resolve(response),
+                        (jqXhr, textStatus, errorThrown) => reject(APIError.createWithJqXhr(errorThrown || textStatus, jqXhr))
+                    );
+                });
+            }
+        })
+    }
 }
 
 // Create shortcut methods for easier access by method
diff --git a/resources/assets/javascripts/lib/jsonapi.js b/resources/assets/javascripts/lib/jsonapi.js
deleted file mode 100644
index f3217bc..0000000
--- a/resources/assets/javascripts/lib/jsonapi.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import AbstractAPI from './abstract-api.js';
-
-// Actual JSONAPI object
-class JSONAPI extends AbstractAPI
-{
-    constructor(version = 1) {
-        super(`jsonapi.php/v${version}`);
-    }
-
-    encodeData (data, method) {
-        data = super.encodeData(data);
-
-        if (['DELETE', 'GET', 'HEAD'].includes(method)) {
-            return data;
-        }
-
-        if (Object.keys(data).length === 0) {
-            return null;
-        }
-
-        return JSON.stringify(data);
-    }
-
-    request (url, options = {}) {
-        options.contentType = 'application/vnd.api+json';
-        return super.request(url, options);
-    }
-}
-
-export default JSONAPI;
-export const jsonapi = new JSONAPI();
diff --git a/resources/assets/javascripts/lib/jsonapi.ts b/resources/assets/javascripts/lib/jsonapi.ts
new file mode 100644
index 0000000..80176cc
--- /dev/null
+++ b/resources/assets/javascripts/lib/jsonapi.ts
@@ -0,0 +1,31 @@
+import AbstractAPI from './abstract-api.js';
+
+// Actual JSONAPI object
+class JSONAPI extends AbstractAPI
+{
+    constructor(version: number = 1) {
+        super(`jsonapi.php/v${version}`);
+    }
+
+    encodeData (data: any, method: string): any {
+        data = super.encodeData(data);
+
+        if (['DELETE', 'GET', 'HEAD'].includes(method)) {
+            return data;
+        }
+
+        if (Object.keys(data).length === 0) {
+            return null;
+        }
+
+        return JSON.stringify(data);
+    }
+
+    request (url: string, options: any = {}) {
+        options.contentType = 'application/vnd.api+json';
+        return super.request(url, options);
+    }
+}
+
+export default JSONAPI;
+export const jsonapi: JSONAPI = new JSONAPI();
diff --git a/resources/assets/javascripts/studip-ui.js b/resources/assets/javascripts/studip-ui.js
index f581295..e611150 100644
--- a/resources/assets/javascripts/studip-ui.js
+++ b/resources/assets/javascripts/studip-ui.js
@@ -33,9 +33,9 @@ import eventBus from "./lib/event-bus.ts";
         if (STUDIP.UI.restrictedDates[year] === undefined) {
             STUDIP.UI.restrictedDates[year] = {};
 
-            STUDIP.jsonapi.GET('holidays', {data: {
+            STUDIP.jsonapi.withPromises().get('holidays', {data: {
                 'filter[year]': year
-            }}).done(response => {
+            }}).then(response => {
                 // Since PHP will return an empty object as an array,
                 // we need to check
                 if (Array.isArray(response)) {
diff --git a/resources/vue/components/MyCoursesTiles.vue b/resources/vue/components/MyCoursesTiles.vue
index 73f8aad..12b2627 100644
--- a/resources/vue/components/MyCoursesTiles.vue
+++ b/resources/vue/components/MyCoursesTiles.vue
@@ -136,7 +136,7 @@ export default {
             return this.shownColorPicker === course.id;
         },
         changeColor(course, index) {
-            STUDIP.jsonapi.PATCH(`course-memberships/${course.id}_${this.userid}`, {
+            STUDIP.jsonapi.withPromises().patch(`course-memberships/${course.id}_${this.userid}`, {
                 data: {
                     data: {
                         type: 'course-memberships',
@@ -145,9 +145,9 @@ export default {
                         }
                     }
                 }
-            }).done(() => {
+            }).then(() => {
                 course.group = index;
-            }).always(() => {
+            }).finally(() => {
                 this.shownColorPicker = null;
             });
         },
diff --git a/resources/vue/store/ContentModulesStore.js b/resources/vue/store/ContentModulesStore.js
index 9dc4609..141a178 100644
--- a/resources/vue/store/ContentModulesStore.js
+++ b/resources/vue/store/ContentModulesStore.js
@@ -52,7 +52,7 @@ export default {
                 attributes: { value: view === 'tiles' }
             };
 
-            return STUDIP.jsonapi.PATCH(`config-values/${documentId}`, { data: { data } }) ;
+            return STUDIP.jsonapi.withPromises().patch(`config-values/${documentId}`, { data: { data } }) ;
         },
         exchangeModules({ commit, state }, modules) {
             const order = modules.filter(module => module.active)
diff --git a/resources/vue/store/MyCoursesStore.js b/resources/vue/store/MyCoursesStore.js
index 08c0389..af8e0fc 100644
--- a/resources/vue/store/MyCoursesStore.js
+++ b/resources/vue/store/MyCoursesStore.js
@@ -71,7 +71,7 @@ export default {
                 attributes: { value: configValue[configKey] }
             };
 
-            return STUDIP.jsonapi.PATCH(`config-values/${documentId}`, { data: { data } })
+            return STUDIP.jsonapi.withPromises().patch(`config-values/${documentId}`, { data: { data } })
         },
         toggleOpenGroup ({ state, dispatch }, group) {
             let open_groups = [ ...state.config.open_groups ];
-- 
cgit v1.0


From 789a31471fdf6ec2e97c34a07d036533b4f83f47 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 28 May 2024 09:06:28 +0000
Subject: fixes #4217

Closes #4217

Merge request studip/studip!3051
---
 lib/phplib/email_validation.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/phplib/email_validation.class.php b/lib/phplib/email_validation.class.php
index 070fa02..f825e82 100644
--- a/lib/phplib/email_validation.class.php
+++ b/lib/phplib/email_validation.class.php
@@ -121,7 +121,7 @@ class email_validation_class
      */
     public function ValidateEmailAddress($email, $domains = '')
     {
-        $converted_email = $this->idna_convert->convert($email);
+        $converted_email = $this->idna_convert->convertEmailAddress($email);
         if (!filter_var($converted_email, FILTER_VALIDATE_EMAIL)) {
             return false;
         }
-- 
cgit v1.0


From 387222b63ac0cc5daacf15969fdb7d50329e375b Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 28 May 2024 10:19:47 +0000
Subject: refine debugbar integration, re #4220

Merge request studip/studip!3050
---
 app/controllers/debugbar.php             | 11 +++++--
 config/config_defaults.inc.php           |  2 +-
 lib/bootstrap-definitions.php            |  6 ++--
 lib/classes/Debug/TraceableStudipPDO.php | 24 ++++++++++++++
 lib/classes/StudipPDO.class.php          | 21 ------------
 templates/debug/db-log.php               | 55 --------------------------------
 templates/debug/trace-row.php            | 13 --------
 templates/footer.php                     | 24 --------------
 8 files changed, 37 insertions(+), 119 deletions(-)
 create mode 100644 lib/classes/Debug/TraceableStudipPDO.php
 delete mode 100644 templates/debug/db-log.php
 delete mode 100644 templates/debug/trace-row.php

diff --git a/app/controllers/debugbar.php b/app/controllers/debugbar.php
index a80000d..59627f2 100644
--- a/app/controllers/debugbar.php
+++ b/app/controllers/debugbar.php
@@ -1,17 +1,24 @@
 <?php
 final class DebugbarController extends Trails_Controller
 {
+    public function __construct(
+        Trails\Dispatcher $dispatcher,
+        private readonly DebugBar\DebugBar $debugbar
+    ) {
+        parent::__construct($dispatcher);
+    }
+
     public function css_action(): void
     {
         $this->set_content_type('text/css;charset=utf-8');
         $this->render_nothing();
-        app()->get(DebugBar\DebugBar::class)->getJavascriptRenderer()->dumpCssAssets();
+        $this->debugbar->getJavascriptRenderer()->dumpCssAssets();
     }
 
     public function js_action(): void
     {
         $this->set_content_type('text/javascript;charset=utf-8');
         $this->render_nothing();
-        app()->get(DebugBar\DebugBar::class)->getJavascriptRenderer()->setIncludeVendors(false)->dumpJsAssets();
+        $this->debugbar->getJavascriptRenderer()->setIncludeVendors(false)->dumpJsAssets();
     }
 }
diff --git a/config/config_defaults.inc.php b/config/config_defaults.inc.php
index de63800..78d5356 100644
--- a/config/config_defaults.inc.php
+++ b/config/config_defaults.inc.php
@@ -14,7 +14,7 @@ $DB_STUDIP_HOST = $_ENV['MYSQL_HOST'] ?? 'localhost';
 $DB_STUDIP_USER = $_ENV['MYSQL_USER'] ?? '';
 $DB_STUDIP_PASSWORD = $_ENV['MYSQL_PASSWORD'] ?? '';
 $DB_STUDIP_DATABASE = $_ENV['MYSQL_DATABASE'] ?? 'studip';
-$DEBUG_ALL_DB_QUERIES_WITH_TRACE = false;
+
 /*
 // optional Stud.IP slave database
 $DB_STUDIP_SLAVE_HOST = "localhost";
diff --git a/lib/bootstrap-definitions.php b/lib/bootstrap-definitions.php
index 2f59dc9..8afb8ce 100644
--- a/lib/bootstrap-definitions.php
+++ b/lib/bootstrap-definitions.php
@@ -40,14 +40,14 @@ return [
 
         // Future Improvements, not used/activated right now
         # $debugBar->addCollector(new MessagesCollector());
-        # $debugBar->addCollector(new TimeDataCollector());
+        $debugBar->addCollector(new TimeDataCollector());
 
         $config = iterator_to_array(Config::getInstance()->getIterator());
         ksort($config);
         $debugBar->addCollector(new DebugBar\DataCollector\ConfigCollector($config));
 
         $pdo = $container->get(PDO::class);
-        if ($pdo instanceof DebugBar\DataCollector\PDO\TraceablePDO) {
+        if ($pdo instanceof Studip\Debug\TraceableStudipPDO) {
             $collector = new DebugBar\DataCollector\PDO\PDOCollector($pdo);
             $debugBar->addCollector($collector);
         }
@@ -62,7 +62,7 @@ return [
         );
 
         if (Studip\Debug\DebugBar::isActivated()) {
-            $pdo = new DebugBar\DataCollector\PDO\TraceablePDO($pdo);
+            $pdo = new Studip\Debug\TraceableStudipPDO($pdo);
         }
 
         return $pdo;
diff --git a/lib/classes/Debug/TraceableStudipPDO.php b/lib/classes/Debug/TraceableStudipPDO.php
new file mode 100644
index 0000000..6100c22
--- /dev/null
+++ b/lib/classes/Debug/TraceableStudipPDO.php
@@ -0,0 +1,24 @@
+<?php
+namespace Studip\Debug;
+
+use DebugBar\DataCollector\PDO\TraceablePDO;
+
+final class TraceableStudipPDO extends TraceablePDO
+{
+    /**
+     * Quotes a string for use in a query.
+     *
+     * @link   http://php.net/manual/en/pdo.quote.php
+     * @param  string $string The string to be quoted.
+     * @param  int    $parameter_type [optional] Provides a data type hint for drivers that have
+     * alternate quoting styles.
+     * @return string|bool A quoted string that is theoretically safe to pass into an SQL statement.
+     * Returns FALSE if the driver does not support quoting in this way.
+     */
+    #[\ReturnTypeWillChange]
+    public function quote($string, $parameter_type = null)
+    {
+        return $this->pdo->quote($string, $parameter_type);
+    }
+
+}
diff --git a/lib/classes/StudipPDO.class.php b/lib/classes/StudipPDO.class.php
index 8fa3418..8a1422b 100644
--- a/lib/classes/StudipPDO.class.php
+++ b/lib/classes/StudipPDO.class.php
@@ -23,7 +23,6 @@ class StudipPDO extends PDO
 
     // Counter for the queries sent to the database
     public $query_count = 0;
-    public $queries     = [];
 
     /**
      * Verifies that the given SQL query only contains a single statement.
@@ -42,26 +41,6 @@ class StudipPDO extends PDO
         // Count executed queries (this is placed here since this is the only
         // method that is executed on every call to the database)
         $this->query_count += 1;
-
-        if (!empty($GLOBALS['DEBUG_ALL_DB_QUERIES'])) {
-            $trace = debug_backtrace();
-
-            $classes = [];
-            if (isset($trace[2]['class']) && $trace[2]['class'] === 'SimpleORMap') {
-                $classes[] = 'sorm';
-            }
-            if (isset($trace[1]) && $trace[1]['function'] === 'prepare') {
-                $classes[] = 'prepared';
-            }
-
-            $this->queries[] = [
-                'query'   => implode("\n", array_filter(array_map('trim', explode("\n", $statement)))),
-                'classes' => implode(' ', $classes),
-                'trace'   => $GLOBALS['DEBUG_ALL_DB_QUERIES_WITH_TRACE']
-                           ? array_slice($trace, 2)
-                           : null,
-            ];
-        }
     }
 
     /**
diff --git a/templates/debug/db-log.php b/templates/debug/db-log.php
deleted file mode 100644
index 9797295..0000000
--- a/templates/debug/db-log.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<? if (!empty($GLOBALS['DEBUG_ALL_DB_QUERIES'])) : ?>
-    <style>
-    #all_db_queries td:first-child {
-        border-left: 4px solid transparent;
-        border-right: 4px solid red;
-    }
-    #all_db_queries .sorm td:first-child {
-        border-left-color: blue;
-    }
-    #all_db_queries .prepared td:first-child {
-        border-right-color: green;
-    }
-    #all_db_queries .query {
-        white-space: pre-wrap;
-    }
-    #all_db_queries ul {
-        counter-reset: queries -1;
-    }
-    #all_db_queries li:hover {
-        text-decoration: underline;
-    }
-    #all_db_queries li::before {
-        content: "#" counter(queries);
-        counter-increment: queries;
-    }
-    #all_db_queries li::before,
-    #all_db_queries span {
-        font-weight: lighter;
-    }
-    </style>
-    <div style="display: none;" id="all_db_queries">
-        <table class="default">
-            <tbody>
-            <? foreach ((array) DBManager::get()->queries as $query) : ?>
-                <tr class="<?= $query['classes'] ?>">
-                    <td>
-                        <code class="query"><?= htmlReady($query['query']) ?></code>
-                    </td>
-                <? if ($GLOBALS['DEBUG_ALL_DB_QUERIES_WITH_TRACE']) : ?>
-                    <td>
-                        <ul class="list-unstyled">
-                        <? foreach ($query['trace'] as $i => $row): ?>
-                            <li>
-                                <?= $this->render_partial('debug/trace-row.php', $row) ?>
-                            </li>
-                        <? endforeach; ?>
-                        </ul>
-                    </td>
-                <? endif ?>
-                </tr>
-            <? endforeach ?>
-            </tbody>
-        </table>
-    </div>
-<? endif ?>
diff --git a/templates/debug/trace-row.php b/templates/debug/trace-row.php
deleted file mode 100644
index f3d29be..0000000
--- a/templates/debug/trace-row.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$file = ltrim(str_replace($GLOBALS['STUDIP_BASE_PATH'], '', $file), '/');
-$trac = htmlReady("https://develop.studip.de/trac/browser/trunk/{$file}#L{$line}");
-?>
-<code>
-    <?= htmlReady(sprintf(
-        '%s(%s)',
-        isset($class) ? "{$class}{$type}{$function}" : $function,
-        implode(', ', array_map(function ($arg) { return is_object($arg) ? get_class($arg) : (string) $arg; }, $args))
-    )) ?>
-</code>
-<span>called at</span>
-<a href="<?= $trac ?>" target="_blank"><?= htmlReady("{$file}:{$line}") ?></a>
diff --git a/templates/footer.php b/templates/footer.php
index 164b054..63cb064 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -9,29 +9,6 @@
                   htmlReady($GLOBALS['user']->perms)) ?>
         |
         <?= strftime('%x, %X') ?>
-    <? if (Studip\ENV === 'development'): ?>
-        [
-        <? if (DBManager::get('studip') === DBManager::get('studip-slave')): ?>
-            <?= sprintf('%u db queries', DBManager::get('studip')->query_count) ?>
-        <? else: ?>
-            <?= sprintf(
-                'M%u/S%u = %u db queries',
-                DBManager::get('studip')->query_count,
-                DBManager::get('studip-slave')->query_count,
-                DBManager::get('studip')->query_count + DBManager::get('studip-slave')->query_count
-            ) ?>
-        <? endif; ?>
-            /
-            <?= relsize(memory_get_peak_usage(true), false) ?> mem
-            /
-            <?= sprintf('%.5f sec', microtime(true) - $GLOBALS['STUDIP_STARTUP_TIME']) ?>
-        ]
-        <? if (!empty($GLOBALS['DEBUG_ALL_DB_QUERIES'])) : ?>
-            <a href="" onClick="jQuery('#all_db_queries').toggle(); return false;">
-                <?= Icon::create("code", "info_alt")->asImg(16, ['class' => "text-bottom"]) ?>
-            </a>
-        <? endif ?>
-    <? endif; ?>
     </div>
 <? endif; ?>
 
@@ -57,5 +34,4 @@
 <? endif; ?>
 </footer>
 <? endif; ?>
-<?= $this->render_partial('debug/db-log.php') ?>
 <!-- Ende Footer -->
-- 
cgit v1.0


From d536c58fdbd69c9a853993c7e1b5ca83547ba22f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 28 May 2024 12:00:09 +0000
Subject: fixes #4222

Closes #4222

Merge request studip/studip!3053
---
 lib/navigation/BrowseNavigation.php | 13 +++++--------
 lib/navigation/CourseNavigation.php |  4 +---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/navigation/BrowseNavigation.php b/lib/navigation/BrowseNavigation.php
index 8a89d6c..7faf0c6 100644
--- a/lib/navigation/BrowseNavigation.php
+++ b/lib/navigation/BrowseNavigation.php
@@ -22,14 +22,10 @@ class BrowseNavigation extends Navigation
      */
     public function __construct()
     {
-        global $user, $perm;
+        global $perm;
 
         $courselink = null;
-        // check if logged in
-        $coursetext = '';
-        $courseinfo = '';
-        $courselink = null;
-        if (is_object($user) && $user->id != 'nobody') {
+        if (User::findCurrent()) {
             $coursetext = _('Veranstaltungen');
             $courseinfo = _('Meine Veranstaltungen & Einrichtungen');
 
@@ -37,14 +33,15 @@ class BrowseNavigation extends Navigation
                 $courselink = 'dispatch.php/admin/courses';
             }
         } else {
-            $coursetext = _('Freie');
+            $coursetext = _('Freie Veranstaltungen');
             $courseinfo = _('Freie Veranstaltungen');
             $courselink = 'dispatch.php/public_courses';
         }
 
         parent::__construct($coursetext, $courselink);
+
         if (!Context::getId()) {
-            $this->setImage(Icon::create('seminar', 'navigation', ["title" => $courseinfo]));
+            $this->setImage(Icon::create('seminar', Icon::ROLE_NAVIGATION, ['title' => $courseinfo]));
         }
     }
 
diff --git a/lib/navigation/CourseNavigation.php b/lib/navigation/CourseNavigation.php
index a22b89e..7db8019 100644
--- a/lib/navigation/CourseNavigation.php
+++ b/lib/navigation/CourseNavigation.php
@@ -28,15 +28,13 @@ class CourseNavigation extends Navigation
 
         $this->range = $range;
 
-        global $user;
-
         // check if logged in
         if (User::findCurrent()) {
             $coursetext = _('Veranstaltungen');
             $courseinfo = _('Meine Veranstaltungen & Einrichtungen');
             $courselink = 'dispatch.php/my_courses';
         } else {
-            $coursetext = _('Freie');
+            $coursetext = _('Freie Veranstaltungen');
             $courseinfo = _('Freie Veranstaltungen');
             $courselink = 'dispatch.php/public_courses';
         }
-- 
cgit v1.0


From 334a223e13db9110f255b4e5f56de4666aa8db49 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 28 May 2024 12:02:25 +0000
Subject: =?UTF-8?q?Resolve=20"Frageb=C3=B6gen:=20Frageoptionen=20werden=20?=
 =?UTF-8?q?=C3=BCberschrieben=20wenn=20Fragen=20kopiert=20werden"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4208

Merge request studip/studip!3052
---
 resources/assets/javascripts/lib/questionnaire.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/javascripts/lib/questionnaire.js b/resources/assets/javascripts/lib/questionnaire.js
index 08d3a75..9a89348 100644
--- a/resources/assets/javascripts/lib/questionnaire.js
+++ b/resources/assets/javascripts/lib/questionnaire.js
@@ -112,7 +112,7 @@ const Questionnaire = {
                                 id: id,
                                 questiontype: this.questions[i].questiontype,
                                 internal_name: this.questions[i].internal_name,
-                                questiondata: Object.assign({}, this.questions[i].questiondata)
+                                questiondata: JSON.parse(JSON.stringify(this.questions[i].questiondata)),
                             });
                             this.activeTab = id;
                         },
-- 
cgit v1.0


From e9806e73f7d91f0810a298bc6c9139e6da138575 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Tue, 28 May 2024 12:58:57 +0000
Subject: Resolve "Barrierefreiheit: Globale Suche nicht barrierefrei nutzbar"

Closes #4072

Merge request studip/studip!2918
---
 lib/classes/globalsearch/GlobalSearchCourses.php   |  4 +-
 .../globalsearch/GlobalSearchCourseware.php        |  2 +-
 lib/classes/globalsearch/GlobalSearchMessages.php  |  6 +--
 lib/classes/globalsearch/GlobalSearchMyCourses.php |  4 +-
 lib/classes/globalsearch/GlobalSearchUsers.php     |  2 +-
 .../assets/javascripts/bootstrap/global_search.js  | 45 ++++++++++++++++++++++
 resources/assets/javascripts/lib/global_search.js  | 14 ++++---
 .../assets/stylesheets/scss/globalsearch.scss      |  4 +-
 templates/globalsearch/searchbar.php               | 19 +++++++--
 9 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/lib/classes/globalsearch/GlobalSearchCourses.php b/lib/classes/globalsearch/GlobalSearchCourses.php
index bf29ca0..9de5535 100644
--- a/lib/classes/globalsearch/GlobalSearchCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchCourses.php
@@ -225,9 +225,9 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull
                     array_map(
                         function ($lecturer, $index) use ($search, $course) {
                             if ($index < 3) {
-                                return '<a href="' . URLHelper::getURL('dispatch.php/profile', ['username' => $lecturer->username]) . '">' . self::mark($lecturer->getUserFullname(), $search) . '</a>';
+                                return self::mark($lecturer->getUserFullname(), $search);
                             } else if ($index == 3) {
-                                return '<a href="' . URLHelper::getURL('dispatch.php/course/details/index/' . $course->id) . '">... (' . _('mehr') . ') </a>';
+                                return '... (' . _('mehr') . ')';
                             }
                         },
                         $lecturers,
diff --git a/lib/classes/globalsearch/GlobalSearchCourseware.php b/lib/classes/globalsearch/GlobalSearchCourseware.php
index d4c53b1..de069fe 100644
--- a/lib/classes/globalsearch/GlobalSearchCourseware.php
+++ b/lib/classes/globalsearch/GlobalSearchCourseware.php
@@ -142,7 +142,7 @@ class GlobalSearchCourseware extends GlobalSearchModule implements GlobalSearchF
                 'description' => $description,
                 'url' => $pageData['url'],
                 'img' => $structural_element->image ? $structural_element->getImageUrl() : Icon::create('courseware')->asImagePath(),
-                'additional' => '<a href="' . htmlReady($pageData['originUrl']) . '" title="' . htmlReady($pageData['originName']) . '">' . htmlReady($pageData['originName']) . '</a>',
+                'additional' => htmlReady($pageData['originName']),
                 'date' => $date->format('d.m.Y H:i'),
                 'structural-element-id' => $structural_element->id,
                 'expand' => null
diff --git a/lib/classes/globalsearch/GlobalSearchMessages.php b/lib/classes/globalsearch/GlobalSearchMessages.php
index d1a91a5..5f64b40 100644
--- a/lib/classes/globalsearch/GlobalSearchMessages.php
+++ b/lib/classes/globalsearch/GlobalSearchMessages.php
@@ -79,11 +79,7 @@ class GlobalSearchMessages extends GlobalSearchModule
 
             if ($user) {
                 $username = $user->getFullName();
-                $additional = sprintf(
-                    '<a href="%s">%s</a>',
-                    URLHelper::getLink('dispatch.php/profile', ['username' => $user->username]),
-                    self::mark($user->getFullName(), $search)
-                );
+                $additional = self::mark($user->getFullName(), $search);
             }
         }
 
diff --git a/lib/classes/globalsearch/GlobalSearchMyCourses.php b/lib/classes/globalsearch/GlobalSearchMyCourses.php
index f8f2f11..6558f78 100644
--- a/lib/classes/globalsearch/GlobalSearchMyCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchMyCourses.php
@@ -162,9 +162,9 @@ class GlobalSearchMyCourses extends GlobalSearchModule
                     array_map(
                         function ($lecturer, $index) use ($search, $course) {
                             if ($index < 3) {
-                                return '<a href="' . URLHelper::getURL('dispatch.php/profile', ['username' => $lecturer->username]) . '">' . self::mark($lecturer->getUserFullname(), $search) . '</a>';
+                                return self::mark($lecturer->getUserFullname(), $search);
                             } else if ($index == 3) {
-                                return '<a href="' . URLHelper::getURL('dispatch.php/course/details/index/' . $course->id) . '">... (' . _('mehr') . ') </a>';
+                                return '... (' . _('mehr') . ')';
                             }
                         },
                         $lecturers,
diff --git a/lib/classes/globalsearch/GlobalSearchUsers.php b/lib/classes/globalsearch/GlobalSearchUsers.php
index fb8677a..458f098 100644
--- a/lib/classes/globalsearch/GlobalSearchUsers.php
+++ b/lib/classes/globalsearch/GlobalSearchUsers.php
@@ -86,7 +86,7 @@ class GlobalSearchUsers extends GlobalSearchModule implements GlobalSearchFullte
                 ['username' => $user->username],
                 true
             ),
-            'additional' => '<a href="' . URLHelper::getLink('dispatch.php/profile', ['username' => $user->username]) . '">' . self::mark($user->username, $search) . '</a>',
+            'additional' => self::mark($user->username, $search),
             'expand'     => self::getSearchURL($search),
             'img'        => Avatar::getAvatar($user->id)->getUrl(Avatar::MEDIUM),
         ];
diff --git a/resources/assets/javascripts/bootstrap/global_search.js b/resources/assets/javascripts/bootstrap/global_search.js
index 4d0738e..a85f2f0 100644
--- a/resources/assets/javascripts/bootstrap/global_search.js
+++ b/resources/assets/javascripts/bootstrap/global_search.js
@@ -36,6 +36,51 @@ STUDIP.domReady(() => {
             return false;
         }
     });
+    $('#globalsearch-input').on('keypress', function(e) {
+        if (e.which === 13) {
+            STUDIP.GlobalSearch.doSearch();
+            return false;
+        }
+    });
+    $('#globalsearch-searchbar').on('keydown', function(e) {
+        if (e.originalEvent.code === 'ArrowDown') {
+            if ($('#globalsearch-list [role=listitem]:focus').length === 0) {
+                $('#globalsearch-list [role=listitem]:visible').first().focus();
+            } else {
+                let n = $('#globalsearch-list [role=listitem]:focus').next();
+                if (n.length > 0 && n.is('[role=listitem]:visible')) {
+                    n.focus();
+                } else {
+                    n = $('#globalsearch-list [role=listitem]:focus').parent().next().find('[role=listitem]:visible').first();
+                    if (n.length > 0) {
+                        n.focus();
+                    } else {
+                        $('#globalsearch-list [role=listitem]:visible').first().focus();
+                    }
+                }
+            }
+            return false;
+        }
+        if (e.originalEvent.code === 'ArrowUp') {
+            if ($('#globalsearch-list [role=listitem]:focus').length === 0) {
+                $('#globalsearch-list [role=listitem]:visible').last().focus();
+            } else {
+                let n = $('#globalsearch-list [role=listitem]:focus').prev();
+                if (n.length > 0 && n.is('[role=listitem]:visible')) {
+                    n.focus();
+                } else {
+                    n = $('#globalsearch-list [role=listitem]:focus').parent().prev().find('[role=listitem]:visible').last();
+                    if (n.length > 0) {
+                        n.focus();
+                    } else {
+                        $('#globalsearch-list [role=listitem]:visible').last().focus();
+                    }
+                }
+            }
+            return false;
+        }
+    });
+
 
     // Close search on click on page.
     $('#navigation-level-1, #current-page-structure, #main-footer').on('click', function() {
diff --git a/resources/assets/javascripts/lib/global_search.js b/resources/assets/javascripts/lib/global_search.js
index 05a53aa..394b7e3 100644
--- a/resources/assets/javascripts/lib/global_search.js
+++ b/resources/assets/javascripts/lib/global_search.js
@@ -9,6 +9,7 @@ const GlobalSearch = {
      */
     toggleSearchBar: function(visible, cleanup) {
         $('#globalsearch-searchbar').toggleClass('is-visible', visible);
+        $('#globalsearch-input').attr('aria-expanded', visible ? 'true' : 'false');
         $('#globalsearch-input').toggleClass('hidden-small-down', !visible);
         $('#globalsearch-icon').toggleClass('hidden-small-down', visible);
         $('#globalsearch-clear').toggleClass('hidden-small-down', !visible);
@@ -70,7 +71,7 @@ const GlobalSearch = {
             // Iterate over each result category.
             $.each(json, function(name, value) {
                 // Create an <article> for category.
-                var category = $(`<article id="globalsearch-${name}">`),
+                var category = $(`<article id="globalsearch-${name}" role="list">`),
                     header = $('<header>').appendTo(category),
                     counter = 0;
 
@@ -96,7 +97,7 @@ const GlobalSearch = {
                 // Process results and create corresponding entries.
                 $.each(value.content, function(index, result) {
                     // Create single result entry.
-                    var single = $('<section>'),
+                    var single = $(`<a href="${result.url}" role="listitem" ${dataDialog}>`),
                         data = $('<div class="globalsearch-result-data">'),
                         details = $('<div class="globalsearch-result-details">');
 
@@ -107,17 +108,17 @@ const GlobalSearch = {
                     // Which result types should be opened via dialog?
                     const openInDialog = ['GlobalSearchFiles', 'GlobalSearchMessages'];
                     var dataDialog = (openInDialog.indexOf(name) >= 0 ? dataDialog = 'data-dialog' : dataDialog = '');
-                    var link = $(`<a href="${result.url}" ${dataDialog}>`).appendTo(single);
+                    //var link = $(`<a href="${result.url}" ${dataDialog}>`).appendTo(single);
 
                     // Optional image...
                     if (result.img !== null) {
                         $(`<img src="${result.img}" alt="">`)
                             .wrap('<div class="globalsearch-result-img">')
                             .parent() // Element is now the wrapper
-                            .appendTo(link);
+                            .appendTo(single);
                     }
 
-                    link.append(data);
+                    single.append(data);
 
                     // Name/title
                     $('<div class="globalsearch-result-title">')
@@ -144,7 +145,7 @@ const GlobalSearch = {
                     if (result.date !== null) {
                         $('<div class="globalsearch-result-time">')
                             .html(result.date)
-                            .appendTo(link);
+                            .appendTo(single);
                     }
 
                     // "Expand" attribute for further, result-related search
@@ -178,6 +179,7 @@ const GlobalSearch = {
         GlobalSearch.lastSearch = null;
 
         $('#globalsearch-searchbar').removeClass('is-visible has-value');
+        $('#globalsearch-input').attr('aria-expanded', 'false');
         $('#globalsearch-input').val('');
         $('#globalsearch-results').html('');
         $('#globalsearch-input').focus();
diff --git a/resources/assets/stylesheets/scss/globalsearch.scss b/resources/assets/stylesheets/scss/globalsearch.scss
index 4faee5f..ef7c6e6 100644
--- a/resources/assets/stylesheets/scss/globalsearch.scss
+++ b/resources/assets/stylesheets/scss/globalsearch.scss
@@ -171,7 +171,7 @@
                 }
             }
 
-            section {
+            a[role=listitem] {
                 display: flex;
                 flex-direction: row;
                 flex-wrap: nowrap;
@@ -189,7 +189,7 @@
                     display: none;
                 }
 
-                & > a {
+                & > span.detail {
                     display: flex;
                     flex-direction: row;
                     flex-wrap: nowrap;
diff --git a/templates/globalsearch/searchbar.php b/templates/globalsearch/searchbar.php
index 93a8ab5..837931c 100644
--- a/templates/globalsearch/searchbar.php
+++ b/templates/globalsearch/searchbar.php
@@ -1,6 +1,16 @@
-<div id="globalsearch-searchbar" role="search" aria-label="<?= _('Globale Suche') ?>">
-    <input class="hidden-small-down" type="text" name="globalsearchterm" id="globalsearch-input"
-           placeholder="<?= _('Was suchen Sie?') ?>" role="searchbox">
+<div id="globalsearch-searchbar"
+     role="search"
+     aria-label="<?= _('Globale Suche') ?>">
+    <input class="hidden-small-down"
+           type="text"
+           name="globalsearchterm"
+           id="globalsearch-input"
+           placeholder="<?= _('Was suchen Sie?') ?>"
+           role="combobox"
+           aria-haspopup="listbox"
+           aria-expanded="false"
+           aria-controls="globalsearch-list"
+           aria-label="Suche nach Objekten und Personen in Stud.IP">
     <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asInput([
         'id'    => 'globalsearch-clear',
         'class' => 'hidden-small-down',
@@ -10,7 +20,8 @@
         'id'  => 'globalsearch-icon',
         'alt' => _('Suche starten')
     ]) ?>
-    <div id="globalsearch-list">
+    <div id="globalsearch-list"
+         role="listbox">
         <a href="#" id="globalsearch-togglehints" data-toggle-text="<?= _('Tipps ausblenden') ?>">
             <?= _('Tipps einblenden') ?>
         </a>
-- 
cgit v1.0


From cc617253eb92d8e57d82dcc269a2f535681931a4 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 28 May 2024 14:31:53 +0000
Subject: display skip links for first and second navigagion layer only when
 there are elements, fixes #4049

Closes #4049

Merge request studip/studip!2949
---
 app/controllers/start.php       | 1 +
 lib/classes/sidebar/Sidebar.php | 4 ++--
 templates/header.php            | 8 ++++++--
 templates/tabs.php              | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/controllers/start.php b/app/controllers/start.php
index 3040d58..8231095 100644
--- a/app/controllers/start.php
+++ b/app/controllers/start.php
@@ -59,6 +59,7 @@ class StartController extends AuthenticatedController
 
         $nav = $sidebar->addWidget(new NavigationWidget());
         $nav->setTitle(_('Sprungmarken'));
+        $nav->setId('navigation-layer-3');
         foreach (array_merge(...$this->columns) as $widget) {
             $nav->addLink(
                 $widget->getPluginName(),
diff --git a/lib/classes/sidebar/Sidebar.php b/lib/classes/sidebar/Sidebar.php
index 65fc62d..ba1e609 100644
--- a/lib/classes/sidebar/Sidebar.php
+++ b/lib/classes/sidebar/Sidebar.php
@@ -186,7 +186,7 @@ class Sidebar extends WidgetContainer
         static $actions_widget_added = false;
 
 
-        if ($widget instanceof NavigationWidget && !$navigation_widget_added) {
+        if ($widget instanceof NavigationWidget && !$navigation_widget_added && $widget->hasElements()) {
             SkipLinks::addIndex(
                 _('Dritte Navigationsebene'),
                 $widget->getId(),
@@ -197,7 +197,7 @@ class Sidebar extends WidgetContainer
             $navigation_widget_added = true;
         }
 
-        if ($widget instanceof ActionsWidget && !$actions_widget_added) {
+        if ($widget instanceof ActionsWidget && !$actions_widget_added && $widget->hasElements()) {
             if (!$widget->getId()) {
                 $widget->setId('sidebar-actions');
             }
diff --git a/templates/header.php b/templates/header.php
index b875038..711d517 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -216,7 +216,9 @@ if ($navigation) {
 
     <!-- Main navigation and right-hand logo -->
     <nav id="navigation-level-1" aria-label="<?= _('Hauptnavigation') ?>">
-        <? SkipLinks::addIndex(_('Hauptnavigation'), 'navigation-level-1', 2, false); ?>
+        <? if (!empty($header_nav['visible'])) : ?>
+            <? SkipLinks::addIndex(_('Hauptnavigation'), 'navigation-level-1', 2, false) ?>
+        <? endif ?>
         <ul id="navigation-level-1-items" <? if (count($header_nav['hidden']) > 0) echo 'class="overflown"'; ?>>
         <? foreach ($header_nav['visible'] as $path => $nav): ?>
             <?= $this->render_partial(
@@ -297,10 +299,12 @@ if ($navigation) {
                 </div>
             <? endif ?>
 
-            <? SkipLinks::addIndex(_('Zweite Navigationsebene'), 'navigation-level-2', 910) ?>
             <nav id="navigation-level-2" aria-label="<?= _('Zweite Navigationsebene') ?>">
 
                 <? if (PageLayout::isHeaderEnabled() /*&& isset($navigation)*/) : ?>
+                    <? if (!empty($navigation)) : ?>
+                        <? SkipLinks::addIndex(_('Zweite Navigationsebene'), 'navigation-level-2', 910) ?>
+                    <? endif ?>
                     <?= $this->render_partial('tabs', compact('navigation')) ?>
                 <? endif; ?>
             </nav>
diff --git a/templates/tabs.php b/templates/tabs.php
index 987e0fd..24597cb 100644
--- a/templates/tabs.php
+++ b/templates/tabs.php
@@ -7,10 +7,10 @@ foreach (Navigation::getItem("/")->getSubNavigation() as $path => $nav) {
 }
 ?>
 <div class="tabs_wrapper">
-    <? SkipLinks::addIndex(_('Zweite Navigationsebene'), 'navigation-level-2', 10, false); ?>
     <ul id="tabs">
         <? if (!empty($navigation)): ?>
-        <? foreach ($navigation as $path => $nav) : ?>
+            <? SkipLinks::addIndex(_('Zweite Navigationsebene'), 'navigation-level-2', 10, false); ?>
+            <? foreach ($navigation as $path => $nav) : ?>
             <? if ($nav->isVisible()) : ?>
                 <li id="nav_<?= $path1 ?? '' ?>_<?= $path ?>"<?= $nav->isActive() ? ' class="current"' : '' ?>>
                     <? if ($nav->isEnabled()): ?>
-- 
cgit v1.0


From d28f3aff4a6cf4e55e070015106948b720076bef Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 28 May 2024 14:41:49 +0000
Subject: added aria-label text for icons on the profile page, fixes #4046

Closes #4046

Merge request studip/studip!3047
---
 app/views/calendar/contentbox/_termin.php         |  6 +++---
 app/views/calendar/contentbox/display.php         |  4 ++--
 app/views/news/_actions.php                       |  9 ++++++---
 app/views/news/display.php                        | 11 +++++++----
 app/views/questionnaire/_widget_questionnaire.php |  5 +++--
 app/views/questionnaire/widget.php                |  9 ++++++---
 6 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/views/calendar/contentbox/_termin.php b/app/views/calendar/contentbox/_termin.php
index ded7d0b..3daf699 100644
--- a/app/views/calendar/contentbox/_termin.php
+++ b/app/views/calendar/contentbox/_termin.php
@@ -13,19 +13,19 @@
             </span>
             <? if ($admin && $isProfile && $termin->getObjectClass() === 'CalendarDateAssignment') : ?>
                 <a href="<?= URLHelper::getLink('dispatch.php/calendar/calendar') ?>"
-                   title="<?= _('Zum Kalender') ?>">
+                   title="<?= _('Zum Kalender') ?>" aria-label="<?= _('Zum Kalender') ?>">
                     <?= Icon::create('schedule')->asImg(['class' => 'text-bottom']) ?>
                 </a>
                 <? if ($termin->calendar_date->isWritable($GLOBALS['user']->id)) : ?>
                     <a href="<?= URLHelper::getLink('dispatch.php/calendar/date/edit/' . $termin->getPrimaryObjectId()) ?>"
-                       title="<?= _('Termin bearbeiten') ?>"
+                       title="<?= _('Termin bearbeiten') ?>" aria-label="<?= _('Termin bearbeiten') ?>"
                        data-dialog>
                         <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?>
                     </a>
                 <? endif ?>
             <? elseif (!$course_range && in_array($termin->getObjectClass(), ['CourseDate', 'CourseExDate'])) : ?>
                 <a href="<?= URLHelper::getLink('dispatch.php/course/dates', ['cid' => $termin->getPrimaryObjectId()]) ?>"
-                   title="<?= _('Zur Veranstaltung') ?>">
+                   title="<?= _('Zur Veranstaltung') ?>" aria-label="<?= _('Zur Veranstaltung') ?>">
                     <?= Icon::create('seminar')->asImg(['class'=> 'text-bottom']) ?>
                 </a>
             <? endif ?>
diff --git a/app/views/calendar/contentbox/display.php b/app/views/calendar/contentbox/display.php
index c0387fd..bd7b266 100644
--- a/app/views/calendar/contentbox/display.php
+++ b/app/views/calendar/contentbox/display.php
@@ -10,12 +10,12 @@
                     <? if ($isProfile) : ?>
                         <a href="<?= URLHelper::getLink('dispatch.php/calendar/date/add') ?>"
                            data-dialog="reload-on-close"
-                           title="<?= _('Neuen Termin anlegen') ?>">
+                           title="<?= _('Neuen Termin anlegen') ?>" aria-label="<?= _('Neuen Termin anlegen') ?>">
                             <?= Icon::create('add', 'clickable')->asImg(['class' => 'text-bottom']) ?>
                         </a>
                     <? else: ?>
                         <a href="<?= URLHelper::getLink("dispatch.php/course/timesrooms", ['cid' => $range_id]) ?>"
-                           title="<?= _('Neuen Termin anlegen') ?>">
+                           title="<?= _('Neuen Termin anlegen') ?>" aria-label="<?= _('Neuen Termin anlegen') ?>">
                             <?= Icon::create('admin', 'clickable')->asImg(['class' => 'text-bottom']) ?>
                         </a>
                     <? endif ?>
diff --git a/app/views/news/_actions.php b/app/views/news/_actions.php
index 343cd10..d67de26 100644
--- a/app/views/news/_actions.php
+++ b/app/views/news/_actions.php
@@ -37,16 +37,19 @@ if ($new['allow_comments']) :
 
 
 <? if ($new->havePermission('edit')): ?>
-    <a href="<?= URLHelper::getLink('dispatch.php/news/edit_news/' . $new->id) ?>" data-dialog>
+    <a href="<?= URLHelper::getLink('dispatch.php/news/edit_news/' . $new->id) ?>" data-dialog
+       title="<?= _('Bearbeiten') ?>" aria-label="<?= _('Bearbeiten') ?>">
         <?= Icon::create('edit') ?>
     </a>
     <? if ($new->havePermission('unassign', $range)): ?>
-        <a href=" <?= URLHelper::getLink('', ['remove_news' => $new->id, 'news_range' => $range]) ?>" >
+        <a href=" <?= URLHelper::getLink('', ['remove_news' => $new->id, 'news_range' => $range]) ?>"
+           title="<?= _('Nicht mehr abonnieren') ?>" aria-label="<?= _('Nicht mehr abonnieren') ?>">
             <?= Icon::create('remove') ?>
         </a>
     <? endif; ?>
     <? if ($new->havePermission('delete')): ?>
-        <a href=" <?= URLHelper::getLink('', ['delete_news' => $new->id]) ?>" >
+        <a href=" <?= URLHelper::getLink('', ['delete_news' => $new->id]) ?>"
+           title="<?= _('Löschen') ?>" aria-label="<?= _('Löschen') ?>">
             <?= Icon::create('trash') ?>
         </a>
     <? endif; ?>
diff --git a/app/views/news/display.php b/app/views/news/display.php
index 7d9e2d0..5f62443 100644
--- a/app/views/news/display.php
+++ b/app/views/news/display.php
@@ -9,18 +9,21 @@
         <nav>
         <? if ($perm): ?>
             <a href="<?= $controller->link_for('news/edit_news/new/' . $range); ?>" data-dialog
-               title="<?= _('Hinzufügen') ?>">
+               title="<?= _('Hinzufügen') ?>" aria-label="<?= _('Hinzufügen') ?>">
                 <?= Icon::create('add') ?>
             </a>
         <? endif; ?>
         <? if ($perm && Config::get()->NEWS_RSS_EXPORT_ENABLE): ?>
-            <a data-dialog="size=auto;reload-on-close" title="<?=_('RSS-Feed konfigurieren') ?>" href="<?= $controller->link_for('news/rss_config/' . $range); ?>">
+            <a data-dialog="size=auto;reload-on-close" title="<?=_('RSS-Feed konfigurieren') ?>"
+               aria-label="<?=_('RSS-Feed konfigurieren') ?>"
+               href="<?= $controller->link_for('news/rss_config/' . $range); ?>">
                 <?= Icon::create('admin') ?>
             </a>
         <? endif; ?>
         <? if ($rss_id): ?>
-            <a href="<?= URLHelper::getLink('rss.php', ['id' => $rss_id]) ?>">
-                <?= Icon::create('rss')->asImg(['title' => _('RSS-Feed')]) ?>
+            <a href="<?= URLHelper::getLink('rss.php', ['id' => $rss_id]) ?>"
+               title="<?= _('RSS-Feed') ?>" aria-label="<?= _('RSS-Feed') ?>">
+                <?= Icon::create('rss') ?>
             </a>
         <? endif; ?>
         </nav>
diff --git a/app/views/questionnaire/_widget_questionnaire.php b/app/views/questionnaire/_widget_questionnaire.php
index 22ecf72..4f625c2 100644
--- a/app/views/questionnaire/_widget_questionnaire.php
+++ b/app/views/questionnaire/_widget_questionnaire.php
@@ -30,7 +30,7 @@
             <span title="<?= _("Anzahl der Antworten") ?>">
                 <?= $questionnaire->countAnswers() ?>
             </span>
-            <span title="<?= _("QR-Code zu diesem Fragebogen anzeigen") ?>">
+            <span>
                 <? $oldbase = URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']) ?>
                 <a href="<?=
                          URLHelper::getLink(
@@ -38,7 +38,8 @@
                              compact('range_type', 'range_id')
                          ) ?>"
                    class="questionnaire-qr"
-                    data-qr-code>
+                   title="<?= _("QR-Code zu diesem Fragebogen anzeigen") ?>" aria-label="<?= _("QR-Code zu diesem Fragebogen anzeigen") ?>"
+                   data-qr-code>
                     <? URLHelper::setBaseURL($oldbase) ?>
                     <?= Icon::create("code-qr", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
                 </a>
diff --git a/app/views/questionnaire/widget.php b/app/views/questionnaire/widget.php
index 9804b24..6d7f4b3 100644
--- a/app/views/questionnaire/widget.php
+++ b/app/views/questionnaire/widget.php
@@ -8,15 +8,18 @@
         <nav>
             <? if ($allowed_to_add) : ?>
                 <? if ($statusgruppen_ids): ?>
-                    <a href="<?= $controller->link_for('questionnaire/add_to_context') ?>" data-dialog="size=auto" title="<?= _('Fragebogen hinzufügen') ?>">
+                    <a href="<?= $controller->link_for('questionnaire/add_to_context') ?>" data-dialog="size=auto"
+                       title="<?= _('Fragebogen hinzufügen') ?>" aria-label="<?= _('Fragebogen hinzufügen') ?>">
                         <?= Icon::create("add", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                     </a>
                 <? else: ?>
-                    <a href="<?= $controller->link_for('questionnaire/edit', compact('range_type', 'range_id')) ?>" data-dialog title="<?= _('Fragebogen hinzufügen') ?>">
+                    <a href="<?= $controller->link_for('questionnaire/edit', compact('range_type', 'range_id')) ?>" data-dialog
+                       title="<?= _('Fragebogen hinzufügen') ?>" aria-label="<?= _('Fragebogen hinzufügen') ?>">
                         <?= Icon::create("add", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                     </a>
                 <? endif ?>
-                <a href="<?= URLHelper::getLink("dispatch.php/questionnaire/" . ($range_type == 'course' || $range_type == 'institute' ? 'course' : ''). "overview") ?>" title="<?= _('Fragebögen verwalten') ?>">
+                <a href="<?= URLHelper::getLink("dispatch.php/questionnaire/" . ($range_type == 'course' || $range_type == 'institute' ? 'course' : ''). "overview") ?>"
+                   title="<?= _('Fragebögen verwalten') ?>" aria-label="<?= _('Fragebögen verwalten') ?>">
                     <?= Icon::create("admin", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                 </a>
             <? endif ?>
-- 
cgit v1.0


From 062a7f9a03ae39ed083f42d89681318fb0cd6321 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 28 May 2024 15:22:18 +0000
Subject: fixed screen reader output for tooltips, fixes #3962

Closes #3962

Merge request studip/studip!2859
---
 lib/visual.inc.php                                |  15 +-
 resources/assets/javascripts/bootstrap/tooltip.js |  67 -------
 resources/assets/javascripts/entry-base.js        |   1 -
 resources/assets/javascripts/init.js              |   2 -
 resources/assets/javascripts/lib/tooltip.js       | 227 ----------------------
 resources/assets/stylesheets/scss/tooltip.scss    |  10 +-
 templates/shared/tooltip.php                      |   7 +-
 7 files changed, 21 insertions(+), 308 deletions(-)
 delete mode 100644 resources/assets/javascripts/bootstrap/tooltip.js
 delete mode 100644 resources/assets/javascripts/lib/tooltip.js

diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 86efbfb..9dca1d1 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -596,7 +596,12 @@ function tooltipIcon($text, $important = false, $html = false): string
 
     // render tooltip
     $template = $GLOBALS['template_factory']->open('shared/tooltip');
-    return $template->render(compact('text', 'important', 'html'));
+    return $template->render([
+        'text'       => $text,
+        'important'  => $important,
+        'html'       => $html,
+        'tooltip_id' => md5($text)
+    ]);
 }
 
 /**
@@ -608,9 +613,13 @@ function tooltipIcon($text, $important = false, $html = false): string
 function tooltipHtmlIcon($text, $important = false)
 {
     // render tooltip
-    $html = true;
     $template = $GLOBALS['template_factory']->open('shared/tooltip');
-    return $template->render(compact('text', 'important', 'html'));
+    return $template->render([
+        'text'       => $text,
+        'important'  => $important,
+        'html'       => true,
+        'tooltip_id' => md5($text)
+    ]);
 }
 
 /**
diff --git a/resources/assets/javascripts/bootstrap/tooltip.js b/resources/assets/javascripts/bootstrap/tooltip.js
deleted file mode 100644
index c84042b..0000000
--- a/resources/assets/javascripts/bootstrap/tooltip.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Attach global hover handler for tooltips.
-// Applies to all elements having a "data-tooltip" attribute.
-// Tooltip may be provided in the data-attribute itself or by
-// defining a title attribute. The latter is prefered due to
-// the obvious accessibility issues.
-
-var timeout = null;
-
-STUDIP.Tooltip.threshold = 6;
-
-$(document).on('mouseenter mouseleave focusin focusout', '[data-tooltip],.tooltip:has(.tooltip-content)', function(event) {
-    let data = $(this).data();
-
-    const visible = event.type === 'mouseenter' || event.type === 'focusin';
-    const offset = $(this).offset();
-    const x = offset.left + $(this).outerWidth(true) / 2;
-    const y = offset.top;
-    const delay = data.tooltipDelay ?? 300;
-
-    let content;
-    let tooltip;
-
-    if (!data.tooltipObject) {
-        // If tooltip has not yet been created (first hover), obtain it's
-        // contents and create the actual tooltip object.
-        if (!data.tooltip || !$.isPlainObject(data.tooltip)) {
-            content = $('<div/>').text(data.tooltip || $(this).attr('title')).html();
-        } else if (data.tooltip.html !== undefined) {
-            content = data.tooltip.html;
-        } else if (data.tooltip.text !== undefined) {
-            content = data.tooltip.text;
-        } else {
-            throw "Invalid content for tooltip via data";
-        }
-        if (!content) {
-            content = $(this).find('.tooltip-content').remove().html();
-        }
-        $(this).attr('title', null);
-        $(this).attr('data-tooltip', content);
-
-        tooltip = new STUDIP.Tooltip(x, y, content);
-
-        data.tooltipObject = tooltip;
-        $(this).attr('aria-describedby', tooltip.id);
-
-        $(this).on('remove', function() {
-            tooltip.remove();
-        });
-    } else if (visible) {
-        // If tooltip has already been created, update it's position.
-        // This is neccessary if the surrounding content is scrollable AND has
-        // been scrolled. Otherwise the tooltip would appear at it's previous
-        // and now wrong location.
-        data.tooltipObject.position(x, y);
-    }
-
-    if (visible) {
-        $('.studip-tooltip').not(data.tooltipObject).hide();
-        data.tooltipObject.show();
-    } else {
-        timeout = setTimeout(() => data.tooltipObject.hide(), delay);
-    }
-}).on('mouseenter focusin', '.studip-tooltip', () => {
-    clearTimeout(timeout);
-}).on('mouseleave focusout', '.studip-tooltip', function() {
-    $(this).hide();
-});
diff --git a/resources/assets/javascripts/entry-base.js b/resources/assets/javascripts/entry-base.js
index 73b1aaa..2683439 100644
--- a/resources/assets/javascripts/entry-base.js
+++ b/resources/assets/javascripts/entry-base.js
@@ -55,7 +55,6 @@ import "./bootstrap/article.js"
 import "./bootstrap/copyable_links.js"
 import "./bootstrap/selection.js"
 import "./bootstrap/data_secure.js"
-import "./bootstrap/tooltip.js"
 import "./bootstrap/lightbox.js"
 import "./bootstrap/application.js"
 import "./bootstrap/global_search.js"
diff --git a/resources/assets/javascripts/init.js b/resources/assets/javascripts/init.js
index fe20c9a..36a72a5 100644
--- a/resources/assets/javascripts/init.js
+++ b/resources/assets/javascripts/init.js
@@ -76,7 +76,6 @@ import Statusgroups from './lib/statusgroups.js';
 import study_area_selection from './lib/study_area_selection.js';
 import Table from './lib/table.js';
 import TableOfContents from './lib/table-of-contents.js';
-import Tooltip from './lib/tooltip.js';
 import Tour from './lib/tour.js';
 import * as Gettext from './lib/gettext';
 import UserFilter from './lib/user_filter.js';
@@ -164,7 +163,6 @@ window.STUDIP = _.assign(window.STUDIP || {}, {
     study_area_selection,
     Table,
     TableOfContents,
-    Tooltip,
     Tour,
     URLHelper,
     UserFilter,
diff --git a/resources/assets/javascripts/lib/tooltip.js b/resources/assets/javascripts/lib/tooltip.js
deleted file mode 100644
index 2cdac27..0000000
--- a/resources/assets/javascripts/lib/tooltip.js
+++ /dev/null
@@ -1,227 +0,0 @@
-import CSS from './css.js';
-
-/**
- * Tooltip library for Stud.IP
- *
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @copyright Stud.IP Core Group 2014
- * @license GPL2 or any later version
- * @since Stud.IP 3.1
- */
-
-let count = 0;
-let threshold = 0;
-
-class Tooltip {
-    static get count() {
-        return count;
-    }
-
-    static set count(value) {
-        count = value;
-    }
-
-    // Threshold used for "edge detection" (imagine a padding along the edges)
-    static get threshold() {
-        return threshold;
-    }
-
-    static set threshold(value) {
-        threshold = value;
-    }
-
-    /**
-     * Returns a new unique id of a tooltip.
-     *
-     * @return {string} Unique id
-     * @static
-     */
-    static getId() {
-        const id = `studip-tooltip-${Tooltip.count}`;
-        Tooltip.count += 1;
-        return id;
-    }
-
-    /**
-     * Constructs a new tooltip at given location with given content.
-     * The applied css class may be changed by the fourth parameter.
-     *
-     * @class
-     * @classdesc Stud.IP tooltips provide an improved layout and handling
-     *            of contents (including html) than the browser's default
-     *            tooltip through title attribute would
-     *
-     * @param {int} x - Horizontal position of the tooltip
-     * @param {int} y - Vertical position of the tooltip
-     * @param {string} content - Content of the tooltip (may be html)
-     * @param {string} css_class - Optional name of the applied css class /
-     *                             defaults to 'studip-tooltip'
-     */
-    constructor(x, y, content, css_class) {
-        // Obtain unique id of the tooltip
-        this.id = Tooltip.getId();
-
-        // Create dom element of the tooltip, apply id and class and attach
-        // to dom
-        this.element = $('<div>');
-        this.element.addClass(css_class || 'studip-tooltip');
-        this.element.attr('id', this.id);
-        this.element.attr('role', 'tooltip');
-        this.element.appendTo('body');
-
-        // Set position and content and paint the tooltip
-        this.position(x, y);
-        this.update(content);
-        this.paint();
-    }
-
-    /**
-     * Translates the arrow(s) under a tooltip using css3 translate
-     * transforms. This is needed at the edges of the screen.
-     * This implies that a current browser is used. The translation could
-     * also be achieved by adjusting margins but that way we would need
-     * to hardcode values into this function since it's a struggle to
-     * obtain the neccessary values from the CSS pseudo selectors in JS.
-     *
-     * Internal, css rules are dynamically created and applied to the current
-     * document by using the methods provided in the file studip-css.js.
-     *
-     * @param {int} x - Horizontal offset
-     * @param {int} y - Vertical offset
-     */
-    translateArrows(x, y, left_arrow = false) {
-        CSS.removeRule(`#${this.id}::before`);
-        CSS.removeRule(`#${this.id}::after`);
-
-        if (x !== 0 || y !== 0) {
-            let before_rule = {
-                transform: `translate(${x}px, ${y}px);`
-            };
-            if (left_arrow) {
-                before_rule.transform = `translate(${x}px, ${y}px) rotate(90deg);`;
-            }
-            let after_rule = before_rule;
-            if (left_arrow) {
-                after_rule['border-width'] = '9px';
-            }
-            CSS.addRule(`#${this.id}::before`, before_rule, ['-ms-', '-webkit-']);
-            CSS.addRule(`#${this.id}::after`, after_rule, ['-ms-', '-webkit-']);
-        }
-    }
-
-    /**
-     * Updates the position of the tooltip.
-     *
-     * @param {int} x - Horizontal position of the tooltip
-     * @param {int} y - Vertical position of the tooltip
-     */
-    position(x, y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    /**
-     * Updates the contents of the tooltip.
-     *
-     * @param {string} content - Content of the tooltip (may be html)
-     */
-    update(content) {
-        this.element.html(content);
-    }
-
-    /**
-     * "Paints" the tooltip. This method actually computes the dimensions of
-     * the tooltips, checks for screen edges and calculates the actual offset
-     * in the current document.
-     * This method is neccessary due to the fact that position and content
-     * can be changed apart from each other.
-     * Thus: Don't forget to repaint after adjusting any of the two.
-     */
-    paint() {
-        const width = this.element.outerWidth(true);
-        const height = this.element.outerHeight(true);
-        const maxWidth = $(document).width();
-        const maxHeight = $(document).height();
-        let x = this.x - width / 2;
-        let y = this.y - height;
-        //The arrow offset is the offset from the bottom right corner of
-        //the tooltip "frame".
-        let arrow_offset_x = 0;
-        let arrow_offset_y = 0;
-        let left_arrow = false;
-
-        if (y < 0) {
-            y = 0;
-            x = this.x + 20;
-            //Put the arrow on the left side and move the tooltip,
-            //if there is still enough place left on the right.
-            left_arrow = true;
-            arrow_offset_y = -height + this.y + 10;
-            if (arrow_offset_y > -20) {
-                y+= arrow_offset_y + 20;
-                arrow_offset_y = -20;
-            }
-            arrow_offset_x = -width / 2 - 8;
-        } else if (y + height > maxHeight) {
-            y = maxHeight - height;
-        }
-
-        if (x < 0) {
-            arrow_offset_x = 0;
-            x = 0;
-        } else if (x + width > maxWidth) {
-            arrow_offset_x = x + width - maxWidth;
-            x = maxWidth - width;
-        }
-        this.translateArrows(arrow_offset_x, arrow_offset_y, left_arrow);
-
-        this.element.css({
-            left: x,
-            top: y
-        });
-    }
-
-    /**
-     * Toggles the visibility of the tooltip. If no state is provided,
-     * the tooltip will be hidden if visible and vice versa. Pretty straight
-     * forward and no surprises here.
-     * This method implicitely calls paint before a tooltip is shown (in case
-     * it was forgotten).
-     *
-     * @param {bool} visible - Optional visibility parameter to set the
-     *                         tooltip to a certain state
-     */
-    toggle(visible) {
-        if (visible) {
-            this.paint();
-        }
-        this.element.toggle(visible);
-    }
-
-    /**
-     * Reveals the tooltip.
-     *
-     * @see Tooltip.toggle
-     */
-    show() {
-        this.toggle(true);
-    }
-
-    /**
-     * Hides the tooltip.
-     *
-     * @see Tooltip.toggle
-     */
-    hide() {
-        this.toggle(false);
-    }
-
-    /**
-     * Removes the tooltip
-     */
-    remove() {
-        this.element.remove();
-    }
-}
-
-export default Tooltip;
diff --git a/resources/assets/stylesheets/scss/tooltip.scss b/resources/assets/stylesheets/scss/tooltip.scss
index 4b7b36b..ac570a8 100644
--- a/resources/assets/stylesheets/scss/tooltip.scss
+++ b/resources/assets/stylesheets/scss/tooltip.scss
@@ -7,7 +7,7 @@
     box-shadow: 0 1px 0 fade-out($white, 0.5) inset;
     font-size: var(--font-size-base);
     margin-bottom: 8px;
-    max-width: 230px;
+    max-width: $grid-element-width;
     padding: 10px;
     position: absolute;
     text-align: left;
@@ -38,11 +38,13 @@
         @extend %tooltip;
         display: none;
     }
-    &:hover .tooltip-content {
+
+    &:hover .tooltip-content,
+    &:focus .tooltip-content {
         bottom: 100%;
         display: inline-block;
         left: 50%;
-        margin-left: -129px;
-        width: 230px;
+        margin-left: - calc($grid-element-width / 2) - 10px;
+        width: $grid-element-width;
     }
 }
diff --git a/templates/shared/tooltip.php b/templates/shared/tooltip.php
index a97c73f..8dbcd38 100644
--- a/templates/shared/tooltip.php
+++ b/templates/shared/tooltip.php
@@ -1,5 +1,4 @@
-<span class="tooltip tooltip-icon <? if ($important) echo 'tooltip-important'; ?>" data-tooltip <? if (!$html) printf('title="%s"', htmlReady($text)) ?> tabindex="0">
-<? if ($html): ?>
-    <span class="tooltip-content"><?= $text ?></span>
-<? endif; ?>
+<span class="tooltip tooltip-icon <? if ($important) echo 'tooltip-important'; ?>"
+      tabindex="0" aria-label="<?= $html ? kill_format($text) : htmlReady($text) ?>">
+    <span class="tooltip-content"><?= $html ? $text : htmlReady($text) ?></span>
 </span>
-- 
cgit v1.0


From e57aea00657ca40bb1799b645f87dc074f59f11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Wed, 29 May 2024 07:25:26 +0000
Subject: fixes #4224

Closes #4224

Merge request studip/studip!3056
---
 app/views/calendar/schedule/settings.php |  9 ++++++---
 app/views/file/add_files_window.php      |  2 +-
 app/views/file/add_url.php               | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/views/calendar/schedule/settings.php b/app/views/calendar/schedule/settings.php
index a9f24b2..0e2674e 100644
--- a/app/views/calendar/schedule/settings.php
+++ b/app/views/calendar/schedule/settings.php
@@ -2,10 +2,9 @@
     <?= CSRFProtection::tokenTag() ?>
     <fieldset>
         <legend>
-            <?= _('Darstellung des Stundenplans ändern') ?>
+            <?= _('Angezeigter Zeitraum') ?>
         </legend>
         <section>
-            <?= _('Angezeigter Zeitraum') ?>
             <section class="hgroup">
                 <label>
                     <?= _('von') ?>
@@ -22,8 +21,12 @@
                 <?= _('Uhr') ?><br>
             </section>
         </section>
-        <section class='settings'>
+    </fieldset>
+    <fieldset>
+        <legend>
             <?= _('Angezeigte Wochentage') ?>
+        </legend>
+        <section class='settings'>
             <? foreach ([1, 2, 3, 4, 5, 6, 0] as $day) : ?>
                 <label>
                     <input type="checkbox" name="days[]" value="<?= $day ?>"
diff --git a/app/views/file/add_files_window.php b/app/views/file/add_files_window.php
index c7630c5..8b963e7 100644
--- a/app/views/file/add_files_window.php
+++ b/app/views/file/add_files_window.php
@@ -38,7 +38,7 @@ if ($folder_id) {
                 <?= Icon::create('computer')->asImg(50) ?>
                 <?= _('Mein Computer') ?>
             </a>
-            <a href="<?= $controller->link_for('file/add_url/' . $folder_id, array_merge($options, ['from_plugin' => ""])) ?>" data-dialog>
+            <a href="<?= $controller->link_for('file/add_url/' . $folder_id, array_merge($options, ['from_plugin' => ""])) ?>" data-dialog="size=medium">
                 <?= Icon::create('globe')->asImg(50) ?>
                 <?= _('Webadresse') ?>
             </a>
diff --git a/app/views/file/add_url.php b/app/views/file/add_url.php
index 1b7196b..8a172c9 100644
--- a/app/views/file/add_url.php
+++ b/app/views/file/add_url.php
@@ -13,25 +13,25 @@
                    value="<?= htmlReady(Request::get('name')) ?>">
         </label>
 
-        <label>
-            <?= _('Zugriffsart') ?>
-        </label>
+    </fieldset>
+    <fieldset>
+        <legend><?= _('Zugriffsart') ?></legend>
         <label>
             <input type="radio" name="access_type" value="redirect"
-                   <? if (Request::option('access_type') !== 'proxy') echo 'checked'; ?>>
+                <? if (Request::option('access_type') !== 'proxy') echo 'checked'; ?>>
             <?= _('Direktlink')?>
         </label>
         <label>
             <input type="radio" name="access_type" value="proxy"
-                    <? if (Request::option('access_type') === 'proxy') echo 'checked'; ?>>
+                <? if (Request::option('access_type') === 'proxy') echo 'checked'; ?>>
             <?= _('Link über Proxy')?>
         </label>
-        <?= $this->render_partial('file/_terms_of_use_select.php', [
-            'content_terms_of_use_entries' => $content_terms_of_use_entries,
-            'selected_terms_of_use_id'     => $content_terms_of_use_id,
-        ]) ?>
-    </fieldset>
 
+    </fieldset>
+    <?= $this->render_partial('file/_terms_of_use_select.php', [
+        'content_terms_of_use_entries' => $content_terms_of_use_entries,
+        'selected_terms_of_use_id'     => $content_terms_of_use_id,
+    ]) ?>
     <footer data-dialog-button>
         <?= Studip\Button::createAccept(_('Speichern'), 'store') ?>
         <?= Studip\LinkButton::createCancel(
-- 
cgit v1.0


From 555475cd45519532f9e05b4336788c8d6a3241d7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 29 May 2024 07:51:45 +0000
Subject: remove duplicated code and make moving the focus less complex, re
 #4072

Merge request studip/studip!3054
---
 .../assets/javascripts/bootstrap/global_search.js  | 77 +++++++++-------------
 1 file changed, 32 insertions(+), 45 deletions(-)

diff --git a/resources/assets/javascripts/bootstrap/global_search.js b/resources/assets/javascripts/bootstrap/global_search.js
index a85f2f0..0e179b7 100644
--- a/resources/assets/javascripts/bootstrap/global_search.js
+++ b/resources/assets/javascripts/bootstrap/global_search.js
@@ -27,58 +27,45 @@ STUDIP.domReady(() => {
     // Enlarge search input on focus and show hints.
     $('#globalsearch-input').on('focus', function() {
         STUDIP.GlobalSearch.toggleSearchBar(true, false);
-    });
-
-    // Start search on Enter
-    $('#globalsearch-input').on('keypress', function(e) {
-        if (e.which === 13) {
-            STUDIP.GlobalSearch.doSearch();
-            return false;
-        }
-    });
-    $('#globalsearch-input').on('keypress', function(e) {
-        if (e.which === 13) {
+    }).on('keypress', (e) => {
+        // Start search on Enter
+        if (e.key === 'Enter') {
             STUDIP.GlobalSearch.doSearch();
             return false;
         }
     });
     $('#globalsearch-searchbar').on('keydown', function(e) {
-        if (e.originalEvent.code === 'ArrowDown') {
-            if ($('#globalsearch-list [role=listitem]:focus').length === 0) {
-                $('#globalsearch-list [role=listitem]:visible').first().focus();
-            } else {
-                let n = $('#globalsearch-list [role=listitem]:focus').next();
-                if (n.length > 0 && n.is('[role=listitem]:visible')) {
-                    n.focus();
-                } else {
-                    n = $('#globalsearch-list [role=listitem]:focus').parent().next().find('[role=listitem]:visible').first();
-                    if (n.length > 0) {
-                        n.focus();
-                    } else {
-                        $('#globalsearch-list [role=listitem]:visible').first().focus();
-                    }
-                }
-            }
-            return false;
+        if (!['ArrowDown', 'ArrowUp'].includes(e.key)) {
+            return;
         }
-        if (e.originalEvent.code === 'ArrowUp') {
-            if ($('#globalsearch-list [role=listitem]:focus').length === 0) {
-                $('#globalsearch-list [role=listitem]:visible').last().focus();
-            } else {
-                let n = $('#globalsearch-list [role=listitem]:focus').prev();
-                if (n.length > 0 && n.is('[role=listitem]:visible')) {
-                    n.focus();
-                } else {
-                    n = $('#globalsearch-list [role=listitem]:focus').parent().prev().find('[role=listitem]:visible').last();
-                    if (n.length > 0) {
-                        n.focus();
-                    } else {
-                        $('#globalsearch-list [role=listitem]:visible').last().focus();
-                    }
-                }
-            }
-            return false;
+
+        e.preventDefault();
+
+        // Get all possible items
+        const items = $('#globalsearch-list [role=listitem]:visible');
+
+        // Find focussed element
+        const focussed = items.filter(':focus');
+
+        // Get index of focussed element in all items
+        let index = focussed.length > 0 ? items.index(focussed[0]) : null;
+
+        // Move focussed element up or down in items
+        if (e.key === 'ArrowDown') {
+            index = (index ?? -1) + 1;
+        } else {
+            index = (index ?? items.length) - 1;
         }
+
+        // Clamp index to sane boundaries
+        if (index < 0) {
+            index = 0;
+        } else if (index > items.length - 1) {
+            index = items.length - 1;
+        }
+
+        // Focus new element by index
+        items.get(index).focus();
     });
 
 
-- 
cgit v1.0


From 647f833254e5a56c54eb17d6ac91fa72803325a8 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 29 May 2024 08:33:12 +0000
Subject: Resolve "TIC: Einfacheres Arbeiten mit dem Formbuilder"

Closes #4117

Merge request studip/studip!2960
---
 lib/classes/forms/Form.php                      |  2 ++
 lib/classes/forms/Input.php                     | 11 ++++++++---
 resources/assets/javascripts/bootstrap/forms.js | 10 +++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/classes/forms/Form.php b/lib/classes/forms/Form.php
index 36a2e7d..9c22c4f 100644
--- a/lib/classes/forms/Form.php
+++ b/lib/classes/forms/Form.php
@@ -297,6 +297,8 @@ class Form extends Part
                     \PageLayout::postSuccess($this->success_message);
                 }
                 page_close();
+                //This indicates that the form has been stored successfully.
+                echo "STUDIPFORM_STORE_SUCCESS";
                 die();
             }
         }
diff --git a/lib/classes/forms/Input.php b/lib/classes/forms/Input.php
index 9d2ad32..ef506e9 100644
--- a/lib/classes/forms/Input.php
+++ b/lib/classes/forms/Input.php
@@ -150,12 +150,17 @@ abstract class Input
     }
 
     /**
-     * Returns the value of this input.
-     * @return null
+     * Returns the value of this input. If $this->value is a callable this->getValue() returns the computed result.
+     * @return mixed
      */
     public function getValue()
     {
-        return $this->value;
+        if (is_callable($this->value)) {
+            $callable = $this->value;
+            return $callable();
+        } else {
+            return $this->value;
+        }
     }
 
     /**
diff --git a/resources/assets/javascripts/bootstrap/forms.js b/resources/assets/javascripts/bootstrap/forms.js
index c34a0c1..7643612 100644
--- a/resources/assets/javascripts/bootstrap/forms.js
+++ b/resources/assets/javascripts/bootstrap/forms.js
@@ -1,4 +1,5 @@
 import { $gettext, $gettextInterpolate } from '../lib/gettext';
+import Report from '../lib/report.js';
 
 // Allow fieldsets to collapse
 $(document).on(
@@ -291,9 +292,12 @@ STUDIP.ready(function () {
                                         url: v.STUDIPFORM_AUTOSAVEURL,
                                         data: params,
                                         type: 'post',
-                                        success() {
-                                            if (v.STUDIPFORM_REDIRECTURL) {
-                                                window.location.href = v.STUDIPFORM_REDIRECTURL
+                                        success(output) {
+                                            if (output === 'STUDIPFORM_STORE_SUCCESS' && v.STUDIPFORM_REDIRECTURL) {
+                                                //The form has been stored successfully:
+                                                window.location.href = v.STUDIPFORM_REDIRECTURL;
+                                            } else if (output !== 'STUDIPFORM_STORE_SUCCESS') {
+                                                Report.error($gettext('Es ist ein Fehler aufgetreten'), output);
                                             }
                                         }
                                     });
-- 
cgit v1.0


From 96bca3ad8e3e9c4e6abd15b8d126fa35b5cd9176 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 29 May 2024 08:35:44 +0000
Subject: fixes #4020

Closes #4020

Merge request studip/studip!2869
---
 resources/vue/components/StudipWysiwyg.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/resources/vue/components/StudipWysiwyg.vue b/resources/vue/components/StudipWysiwyg.vue
index e343e80..799c5f1 100644
--- a/resources/vue/components/StudipWysiwyg.vue
+++ b/resources/vue/components/StudipWysiwyg.vue
@@ -2,7 +2,7 @@
     <ckeditor
         :editor="editor"
         :config="editorConfig"
-        @ready="prefill"
+        @ready="onReady"
         v-model="currentText"
         @input="onInput"
     />
@@ -29,11 +29,15 @@ export default {
             },
             default: 'classic',
         },
+        autofocus: Boolean,
     },
     data() {
         return {
             currentText: '',
             editorConfig: {},
+
+            createdEditor: null,
+            shouldFocus: this.autofocus,
         };
     },
     computed: {
@@ -48,13 +52,25 @@ export default {
         },
     },
     methods: {
-        prefill(editor) {
+        onReady(editor) {
+            this.createdEditor = editor;
             this.currentText = this.text;
+
+            if (this.shouldFocus) {
+                this.focus();
+            }
         },
         onInput(value) {
             this.currentText = value;
             this.$emit('input', value);
         },
+        focus() {
+            if (this.createdEditor) {
+                this.createdEditor.focus();
+            } else {
+                this.shouldFocus = true;
+            }
+        }
     },
     created() {
         STUDIP.loadChunk('mathjax');
-- 
cgit v1.0


From f530ef20c0f55cbc17f81d9f3468f6152c416341 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 29 May 2024 10:27:09 +0000
Subject: fixes #4228

Closes #4228

Merge request studip/studip!3059
---
 lib/flexi/PhpTemplate.php            | 15 +++++----------
 lib/flexi/Template.php               |  2 +-
 tests/unit/lib/flexi/FactoryTest.php |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/flexi/PhpTemplate.php b/lib/flexi/PhpTemplate.php
index 8110b50..4eb0da1 100644
--- a/lib/flexi/PhpTemplate.php
+++ b/lib/flexi/PhpTemplate.php
@@ -17,20 +17,15 @@ class PhpTemplate extends Template
      * @return string A string representing the rendered presentation.
      * @throws TemplateNotFoundException
      */
-    public function _render(): string
+    protected function _render(): string
     {
         extract($this->get_attributes());
 
         # include template, parse it and get output
-        try {
-            ob_start();
-            require $this->template;
-            $content_for_layout = ob_get_contents();
-        } catch (\Error $e) {
-            throw new TemplateNotFoundException(previous: $e);
-        } finally {
-            ob_end_clean();
-        }
+        ob_start();
+        require $this->template;
+        $content_for_layout = ob_get_contents();
+        ob_end_clean();
 
         # include layout, parse it and get output
         if (isset($this->layout)) {
diff --git a/lib/flexi/Template.php b/lib/flexi/Template.php
index d5c0310..44eefbe 100644
--- a/lib/flexi/Template.php
+++ b/lib/flexi/Template.php
@@ -18,7 +18,7 @@ abstract class Template
      *
      * @return string A string representing the rendered presentation.
      */
-    abstract public function _render(): string;
+    abstract protected function _render(): string;
 
     protected array $attributes = [];
     protected Template|null $layout = null;
diff --git a/tests/unit/lib/flexi/FactoryTest.php b/tests/unit/lib/flexi/FactoryTest.php
index 2df9f6a..f8b9b87 100644
--- a/tests/unit/lib/flexi/FactoryTest.php
+++ b/tests/unit/lib/flexi/FactoryTest.php
@@ -108,7 +108,7 @@ final class FactoryTestCase extends \Codeception\Test\Unit
     public function testShouldRespondToAddedHandlers()
     {
         $handler = new class('', $this->factory) extends Flexi\Template {
-            public function _render(): string
+            protected function _render(): string
             {
                 return '';
             }
-- 
cgit v1.0


From d5f07fc21b9b72388e9d18c05e5a436a5026f0c5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 29 May 2024 12:19:46 +0000
Subject: fixes #4230

Closes #4230

Merge request studip/studip!3061
---
 lib/bootstrap-autoload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index cc39fe7..e2554c7 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -42,6 +42,7 @@ StudipAutoloader::addAutoloadPath('lib/calendar');
 StudipAutoloader::addAutoloadPath('lib/calendar', 'Studip\\Calendar');
 StudipAutoloader::addAutoloadPath('lib/exceptions');
 StudipAutoloader::addAutoloadPath('lib/exceptions/resources');
+StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
 StudipAutoloader::addAutoloadPath('lib/filesystem');
 StudipAutoloader::addAutoloadPath('lib/migrations');
 StudipAutoloader::addAutoloadPath('lib/modules');
-- 
cgit v1.0


From 3e885087795dcec19f0685b30a2cc9beccff1f88 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 29 May 2024 13:03:36 +0000
Subject: fixes #4227

Closes #4227

Merge request studip/studip!3058
---
 resources/assets/stylesheets/scss/tables.scss |  8 +--
 resources/vue/components/FilesTable.vue       | 79 ++++++++-------------------
 2 files changed, 25 insertions(+), 62 deletions(-)

diff --git a/resources/assets/stylesheets/scss/tables.scss b/resources/assets/stylesheets/scss/tables.scss
index 058569f..9e05f01 100644
--- a/resources/assets/stylesheets/scss/tables.scss
+++ b/resources/assets/stylesheets/scss/tables.scss
@@ -271,15 +271,11 @@ tr.sortable {
     }
 
     th.sortasc {
-        span[role=img] {
-            @include icon('after', 'arr_1up', 'clickable');
-        }
+        @include icon('after', 'arr_1up', 'clickable');
     }
 
     th.sortdesc {
-        span[role=img] {
-            @include icon('after', 'arr_1down', 'clickable');
-        }
+        @include icon('after', 'arr_1down', 'clickable');
     }
 }
 
diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index 2a0a15a..0c9dbda 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -54,109 +54,73 @@
                     <th @click="sort('mime_type')"
                         :class="sortClasses('mime_type')"
                         :aria-sort="getAriaSortString('mime_type')"
-                        :aria-labelledby="sortedBy === 'mime_type' ? 'sort-indicator-mime_type' : null">
+                        :aria-label="getAriaSortLabel('mime_type', $gettext('Typ'))"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Typ sortieren')">
                             {{ $gettext('Typ') }}
                         </a>
-                        <span v-if="sortedBy === 'mime_type'"
-                              role="img"
-                              id="sort-indicator-mime_type"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach der Spalte Typ sortiert.')
-                                : $gettext('Es wird absteigend nach der Spalte Typ sortiert.')">
-                        </span>
                     </th>
                     <th @click="sort('name')"
                         :class="sortClasses('name')"
                         :aria-sort="getAriaSortString('name')"
-                        :aria-labelledby="sortedBy === 'name' ? 'sort-indicator-name' : null">
+                        :aria-label="getAriaSortLabel('name', $gettext('Name'))"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Name sortieren')">
                             {{ $gettext('Name') }}
                         </a>
-                        <span v-if="sortedBy === 'name'"
-                              role="img"
-                              id="sort-indicator-name"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach der Spalte Name sortiert.')
-                                : $gettext('Es wird absteigend nach der Spalte Name sortiert.')">
-                        </span>
                     </th>
                     <th @click="sort('size')"
                         class="responsive-hidden"
                         :class="sortClasses('size')"
                         :aria-sort="getAriaSortString('size')"
-                        :aria-labelledby="sortedBy === 'size' ? 'sort-indicator-size' : null">
+                        :aria-label="getAriaSortLabel('size', $gettext('Größe'))"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Größe sortieren')">
                             {{ $gettext('Größe') }}
                         </a>
-                        <span v-if="sortedBy === 'size'"
-                              role="img"
-                              id="sort-indicator-size"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach der Spalte Größe sortiert.')
-                                : $gettext('Es wird absteigend nach der Spalte Größe sortiert.')">
-                        </span>
                     </th>
                     <th v-if="showdownloads"
                         @click="sort('downloads')"
                         class="responsive-hidden"
                         :class="sortClasses('downloads')"
                         :aria-sort="getAriaSortString('downloads')"
-                        :aria-labelledby="sortedBy === 'downloads' ? 'sort-indicator-downloads' : null">
+                        :aria-label="getAriaSortLabel('downloads', $gettext('Downloads'))"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Downloads sortieren')">
                             {{ $gettext('Downloads') }}
                         </a>
-                        <span v-if="sortedBy === 'downloads'"
-                              role="img"
-                              id="sort-indicator-downloads"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach der Spalte Downloads sortiert.')
-                                : $gettext('Es wird absteigend nach der Spalte Downloads sortiert.')">
-                        </span>
                     </th>
                     <th class="responsive-hidden"
                         @click="sort('author_name')"
                         :class="sortClasses('author_name')"
                         :aria-sort="getAriaSortString('author_name')"
-                        :aria-labelledby="sortedBy === 'author_name' ? 'sort-indicator-author_name' : null">
+                        :aria-label="getAriaSortLabel('author_name', $gettext('Autor/-in'))"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Autor/-in sortieren')">
                             {{ $gettext('Autor/-in') }}
                         </a>
-                        <span v-if="sortedBy === 'author_name'"
-                              role="img"
-                              id="sort-indicator-author_name"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach der Spalte Autor-/in sortiert.')
-                                : $gettext('Es wird absteigend nach der Spalte Autor-/in sortiert.')">
-                        </span>
                     </th>
                     <th class="responsive-hidden"
                         @click="sort('chdate')"
                         :class="sortClasses('chdate')"
                         :aria-sort="getAriaSortString('chdate')"
-                        :aria-labelledby="sortedBy === 'chdate' ? 'sort-indicator-chdate' : null">
+                        :aria-label="getAriaSortLabel('chdate', $gettext('Datum'))"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettext('Nach Datum sortieren')">
                             {{ $gettext('Datum') }}
                         </a>
-                        <span v-if="sortedBy === 'chdate'"
-                              role="img"
-                              id="sort-indicator-chdate"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettext('Es wird aufsteigend nach der Spalte Datum sortiert.')
-                                : $gettext('Es wird absteigend nach der Spalte Datum sortiert.')">
-                        </span>
                     </th>
                     <th v-for="(name, index) in additionalColumns"
                         :key="index"
@@ -164,19 +128,13 @@
                         class="responsive-hidden"
                         :class="sortClasses(index)"
                         :aria-sort="getAriaSortString(name)"
-                        :aria-labelledby="sortedBy === name ? 'sort-indicator-' + name : null">
+                        :aria-label="getAriaSortLabel(name, name)"
+                    >
                         <a href="#"
                            @click.prevent
                            :title="$gettextInterpolate($gettext('Nach %{ colName } sortieren'), {colName: name})">
                             {{name}}
                         </a>
-                        <span v-if="sortedBy === name"
-                              role="img"
-                              :id="'sort-indicator-' + name"
-                              :aria-label="sortDirection === 'asc'
-                                ? $gettextInterpolate($gettext('Es wird aufsteigend nach der Spalte %{colName} sortiert.'), {colName: name})
-                                : $gettextInterpolate($gettext('Es wird absteigend nach der Spalte %{colName} sortiert.'), {colName: name})">
-                        </span>
                     </th>
                     <th class="actions" data-sort="false">{{ $gettext('Aktionen') }}</th>
                 </tr>
@@ -514,6 +472,15 @@ export default {
             return column === this.sortedBy
                 ? (this.sortDirection === 'asc' ? 'ascending' : 'descending')
                 : null;
+        },
+        getAriaSortLabel(column, label) {
+            if (column !== this.sortedBy) {
+                return null;
+            }
+            const template = this.sortDirection === 'asc'
+                ? this.$gettext('Es wird aufsteigend nach der Spalte %{ label } sortiert.')
+                : this.$gettext('Es wird absteigend nach der Spalte %{ label } sortiert.');
+            return this.$gettextInterpolate(template, { label });
         }
     },
     computed: {
-- 
cgit v1.0


From f67c292bdc904f3826ee89e4611a3d64a96467bb Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 29 May 2024 13:29:07 +0000
Subject: Resolve "Neue Externe Seiten zeigen auch unsichtbare VA an"

Closes #4229

Merge request studip/studip!3060
---
 lib/extern/ExternPageCourses.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/extern/ExternPageCourses.php b/lib/extern/ExternPageCourses.php
index 0e6b461..e1868c9 100644
--- a/lib/extern/ExternPageCourses.php
+++ b/lib/extern/ExternPageCourses.php
@@ -117,7 +117,8 @@ class ExternPageCourses extends ExternPage
         }
         $query .= "
             WHERE (`semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`))
-                AND ISNULL(`seminare`.`parent_course`) "
+                AND ISNULL(`seminare`.`parent_course`)
+                AND `seminare`.`visible` = 1 "
             . $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids)
             . $this->getInstitutesSQL($params)
             . $this->getSemtypesSQL($params)
@@ -304,7 +305,8 @@ class ExternPageCourses extends ExternPage
         }
         $query .= "
             WHERE (`semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`))
-                AND ISNULL(`seminare`.`parent_course`) "
+                AND ISNULL(`seminare`.`parent_course`)
+                AND `seminare`.`visible` = 1 "
                 . $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids)
                 . $this->getInstitutesSQL($params)
                 . $this->getSemtypesSQL($params)
-- 
cgit v1.0


From a01e9fc71e4eea50f357fc2fa9ccdfa1388972f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Wed, 29 May 2024 13:40:08 +0000
Subject: fixes #4225

Closes #4225

Merge request studip/studip!3062
---
 resources/assets/stylesheets/highcontrast.scss | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/resources/assets/stylesheets/highcontrast.scss b/resources/assets/stylesheets/highcontrast.scss
index 4e1e4ef..277e383 100644
--- a/resources/assets/stylesheets/highcontrast.scss
+++ b/resources/assets/stylesheets/highcontrast.scss
@@ -1309,3 +1309,18 @@ form.default {
         border: 1px solid var(--black);
     }
 }
+
+.studip-tree-course {
+    .course-dates {
+        color: var(--black) !important;
+
+    }
+}
+
+div.avatar-widget {
+    .profile-avatar {
+        .avatar-overlay {
+            background-color: fade-out($base-color, 0.1);
+        }
+    }
+}
-- 
cgit v1.0


From b506b133d371742ef23b3a22cc1c6bb20c860d40 Mon Sep 17 00:00:00 2001
From: Peter Thienel <thienel@data-quest.de>
Date: Wed, 29 May 2024 15:35:25 +0000
Subject: =?UTF-8?q?Resolve=20"Externe=20Seiten:=20Die=20Sichbarkeit=20von?=
 =?UTF-8?q?=20Veranstaltungen=20wird=20an=20weiteren=20Stellen=20nicht=20b?=
 =?UTF-8?q?er=C3=BCcksichtigt"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4231

Merge request studip/studip!3063
---
 lib/extern/ExternPagePersBrowse.php    | 3 ++-
 lib/extern/ExternPagePersonDetails.php | 3 ++-
 lib/extern/ExternPageTimetable.php     | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/extern/ExternPagePersBrowse.php b/lib/extern/ExternPagePersBrowse.php
index ceb72d5..1eb5a04 100644
--- a/lib/extern/ExternPagePersBrowse.php
+++ b/lib/extern/ExternPagePersBrowse.php
@@ -32,7 +32,7 @@ class ExternPagePersBrowse extends ExternPage
 
     /**
      * @see ExternPage::getDataFields()
-     
+
      * @param array $classes
      * @return array
      */
@@ -343,6 +343,7 @@ class ExternPagePersBrowse extends ExternPage
                         LEFT JOIN auth_user_md5 aum ON su.user_id = aum.user_id
                     WHERE ui.Institut_id = ?
                         AND su.status = 'dozent'
+                        AND s.visible = 1
                         AND ui.externdefault = 1
                         AND " . get_ext_vis_query() . "
                         AND ui.inst_perms = 'dozent'
diff --git a/lib/extern/ExternPagePersonDetails.php b/lib/extern/ExternPagePersonDetails.php
index 8fb6540..a62d482 100644
--- a/lib/extern/ExternPagePersonDetails.php
+++ b/lib/extern/ExternPagePersonDetails.php
@@ -146,7 +146,8 @@ class ExternPagePersonDetails extends ExternPage
                 LEFT JOIN `seminar_user` USING(`seminar_id`)
                 LEFT JOIN `sem_types`
                     ON `sem_types`.`id` = `seminare`.`status`
-            WHERE `semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`)
+            WHERE `seminare`.`visible` = 1
+                AND `semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`)
                 AND `seminar_user`.`user_id` = :user_id
                 AND `seminar_user`.`status` = 'dozent'
                 AND `sem_types`.`class` IN (:semclasses)";
diff --git a/lib/extern/ExternPageTimetable.php b/lib/extern/ExternPageTimetable.php
index 5d8dfd9..1e0e66a 100644
--- a/lib/extern/ExternPageTimetable.php
+++ b/lib/extern/ExternPageTimetable.php
@@ -119,7 +119,11 @@ class ExternPageTimetable extends ExternPage
                 LEFT JOIN `seminar_inst`
                     ON `seminare`.`Seminar_id` = `seminar_inst`.`Seminar_id`";
         $query .= "
-            WHERE (`termine`.`date` >= :start AND `termine`.`date` <= :end) "
+            WHERE (
+                `seminare`.`visible` = 1
+                    AND termine`.`date` >= :start
+                    AND `termine`.`date` <= :end
+            )"
             . $this->getEventTypeSQL($params)
             . $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids)
             . $this->getInstitutesSQL($params)
-- 
cgit v1.0


From cb11393661f5cdf9a1ddacb8cd9602de70f5b8f9 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 30 May 2024 06:57:51 +0000
Subject: fixes #4221

Closes #4221

Merge request studip/studip!3064
---
 app/controllers/admin/user.php                      | 2 +-
 app/controllers/course/dates.php                    | 5 ++++-
 app/controllers/course/wiki.php                     | 6 +++---
 app/controllers/oer/endpoints.php                   | 2 +-
 app/controllers/quicksearch.php                     | 2 +-
 app/views/activityfeed/configuration.php            | 2 +-
 app/views/admin/autoinsert/manual.php               | 6 +++---
 app/views/admin/cronjobs/schedules/index.php        | 2 +-
 app/views/admin/user/edit.php                       | 4 ++--
 app/views/file/choose_destination.php               | 2 +-
 lib/classes/ForumEntry.php                          | 4 ++--
 lib/classes/exportdocument/ExportPDF.class.php      | 5 ++++-
 lib/classes/librarysearch/LibraryDocument.class.php | 4 ++--
 lib/phplib/Seminar_Auth.class.php                   | 2 +-
 lib/visual.inc.php                                  | 2 +-
 templates/filesystem/group_folder/edit.php          | 2 +-
 templates/filesystem/topic_folder/edit.php          | 2 +-
 17 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index 1d8361c..37a5d2e 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -1719,7 +1719,7 @@ class Admin_UserController extends AuthenticatedController
         )->asDialog();
         $actions->addLink(
             _('Konten zusammenführen'),
-            $this->url_for('admin/user/migrate/' . ((!empty($this->user) && is_array($this->user)) ? $this->user['user_id'] : '')),
+            $this->url_for('admin/user/migrate/' . (!empty($this->user['user_id']) ? $this->user['user_id'] : '')),
             Icon::create('community')
         );
 
diff --git a/app/controllers/course/dates.php b/app/controllers/course/dates.php
index a4e18e9..f64d66b 100644
--- a/app/controllers/course/dates.php
+++ b/app/controllers/course/dates.php
@@ -80,7 +80,10 @@ class Course_DatesController extends AuthenticatedController
             )->asDialog();
         }
 
-        if (Seminar::setInstance(new Seminar(Course::findCurrent()))->getSlotModule('documents') && CourseDateFolder::availableInRange(Course::findCurrent(), User::findCurrent()->id)) {
+        if (
+            Seminar::setInstance(new Seminar(Course::findCurrent()))->getSlotModule('documents')
+            && CourseDateFolder::availableInRange(Course::findCurrent(), User::findCurrent() ? User::findCurrent()->id : null)
+        ) {
             $actions->addLink(
                 _('Sitzungsordner anlegen'),
                 $this->url_for('course/dates/create_folders'),
diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 0bb6c71..4de56a7 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -455,7 +455,7 @@ class Course_WikiController extends AuthenticatedController
         );
         $pageData = [
             'page_id' => $page->id,
-            'user_id' => $user->id
+            'user_id' => $user ? $user->id : null,
         ];
         $online_user = WikiOnlineEditingUser::findOneBySQL(
             '`page_id` = :page_id AND `user_id` = :user_id',
@@ -466,7 +466,7 @@ class Course_WikiController extends AuthenticatedController
         }
         $editingUsers = WikiOnlineEditingUser::countBySQL(
             "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
-            [$page->id, $user->id]
+            [$page->id, $user ? $user->id : null]
         );
         $online_user->editing = $editingUsers === 0 ? 1 : 0;
         $online_user->chdate = time();
@@ -635,7 +635,7 @@ class Course_WikiController extends AuthenticatedController
         $statement->execute([
             'range_id' => $this->range->id,
             'threshold' => $this->last_visit,
-            'me' => User::findCurrent()->id
+            'me' => User::findCurrent() ? User::findCurrent()->id : null
         ]);
         $this->num_entries = $statement->fetch(PDO::FETCH_COLUMN);
         $this->pagenumber = Request::int('page', 0);
diff --git a/app/controllers/oer/endpoints.php b/app/controllers/oer/endpoints.php
index 9a0f3f5..1ce9626 100644
--- a/app/controllers/oer/endpoints.php
+++ b/app/controllers/oer/endpoints.php
@@ -374,7 +374,7 @@ class Oer_EndpointsController extends StudipController
 
         header("Expires: Mon, 12 Dec 2001 08:00:00 GMT");
         header("Last-Modified: " . gmdate ("D, d M Y H:i:s") . " GMT");
-        if ($_SERVER['HTTPS'] == "on") {
+        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
             header("Pragma: public");
             header("Cache-Control: private");
         } else {
diff --git a/app/controllers/quicksearch.php b/app/controllers/quicksearch.php
index 194f317..9c6a4ae 100644
--- a/app/controllers/quicksearch.php
+++ b/app/controllers/quicksearch.php
@@ -94,7 +94,7 @@ class QuicksearchController extends AuthenticatedController
                 if (!empty($result[3])) {
                     $formatted['item_description'] = sprintf('%s (%s)', $result[2], $result[3]);
                 } else {
-                    $formatted['item_description'] = $result[2];
+                    $formatted['item_description'] = $result[2] ?? '';
                 }
             } else if ($this->search instanceof SearchType) {
                  $formatted['item_name'] = $this->search->getAvatarImageTag($result[0], Avatar::SMALL, ['title' => '']) . $formatted['item_name'];
diff --git a/app/views/activityfeed/configuration.php b/app/views/activityfeed/configuration.php
index ceb87eb..9161db0 100644
--- a/app/views/activityfeed/configuration.php
+++ b/app/views/activityfeed/configuration.php
@@ -15,7 +15,7 @@
             <? foreach ($provider as $prv_id => $prv_name) : ?>
             <label>
                 <input type="checkbox" name="provider[<?= $context ?>][]" value="<?= htmlReady($prv_id) ?>"
-                    <?= empty($config) || (is_array($config[$context]) && in_array($prv_id, $config[$context])) ? 'checked' : ''?>>
+                    <?= empty($config) || (isset($config[$context]) && is_array($config[$context]) && in_array($prv_id, $config[$context])) ? 'checked' : ''?>>
                 <?= htmlReady($prv_name) ?>
             </label>
             <? endforeach ?>
diff --git a/app/views/admin/autoinsert/manual.php b/app/views/admin/autoinsert/manual.php
index dd0f834..a4f5f5e 100644
--- a/app/views/admin/autoinsert/manual.php
+++ b/app/views/admin/autoinsert/manual.php
@@ -114,14 +114,14 @@
                             <? foreach ($values[$type] as $key => $value): ?>
                                 <? if (is_array($value)): ?>
                                     <option value="<?= $key ?>"
-                                            class="nested-item-header" <?= in_array($key, (array)@$filter[$type]) ? 'selected="selected"' : '' ?>><?= htmlReady($value['name']) ?></option>
+                                            class="nested-item-header" <?= in_array($key, $filter[$type] ?? []) ? 'selected' : '' ?>><?= htmlReady($value['name']) ?></option>
                                     <? foreach ($value['values'] as $k => $v): ?>
                                         <option value="<?= $k ?>"
-                                                class="nested-item" <?= in_array($k, (array)@$filter[$type]) ? 'selected="selected"' : '' ?>><?= htmlReady($v) ?></option>
+                                                class="nested-item" <?= in_array($k, $filter[$type] ?? []) ? 'selected' : '' ?>><?= htmlReady($v) ?></option>
                                     <? endforeach; ?>
                                 <? else: ?>
                                     <option
-                                        value="<?= $key ?>" <?= in_array($key, (array)@$filter[$type]) ? 'selected="selected"' : '' ?>><?= htmlReady($value) ?></option>
+                                        value="<?= $key ?>" <?= in_array($key, $filter[$type] ?? []) ? 'selected' : '' ?>><?= htmlReady($value) ?></option>
                                 <? endif ?>
                             <? endforeach; ?>
                         </select>
diff --git a/app/views/admin/cronjobs/schedules/index.php b/app/views/admin/cronjobs/schedules/index.php
index f4b0b13..79a65be 100644
--- a/app/views/admin/cronjobs/schedules/index.php
+++ b/app/views/admin/cronjobs/schedules/index.php
@@ -23,7 +23,7 @@ use Studip\Button, Studip\LinkButton;
             <select name="filter[task_id]" id="task_id" class="submit-upon-select">
                 <option value=""><?= _('Alle Cronjobs anzeigen') ?></option>
                 <? foreach ($tasks as $task): ?>
-                    <option value="<?= $task->task_id ?>" <? if ($filter['task_id'] === $task->task_id) echo 'selected'; ?>>
+                    <option value="<?= $task->task_id ?>" <? if (isset($filter['task_id']) && $filter['task_id'] === $task->task_id) echo 'selected'; ?>>
                         <?= htmlReady($task->name) ?>
                     </option>
                 <? endforeach; ?>
diff --git a/app/views/admin/user/edit.php b/app/views/admin/user/edit.php
index c92efe6..47596a9 100644
--- a/app/views/admin/user/edit.php
+++ b/app/views/admin/user/edit.php
@@ -344,7 +344,7 @@ use Studip\Button, Studip\LinkButton;
 
             <br>
 
-            <? if ($user->online->last_lifesign): ?>
+            <? if (!empty($user->online->last_lifesign)): ?>
                 <abbr title="<?= strftime('%x %X', $user->online->last_lifesign) ?>">
                     <?= reltime($user->online->last_lifesign, true, 2) ?>
                 </abbr>
@@ -434,7 +434,7 @@ use Studip\Button, Studip\LinkButton;
                     <?= sprintf(
                         '%s, %s, %s. %s',
                         htmlReady($usc->studycourse->name),
-                        htmlReady($usc->degree->name),
+                        htmlReady($usc->degree->name ?? _('Unbekannt')),
                         htmlReady($usc->semester),
                         _('Fachsemester')
                     ) ?>
diff --git a/app/views/file/choose_destination.php b/app/views/file/choose_destination.php
index 9a39883..c71f072 100644
--- a/app/views/file/choose_destination.php
+++ b/app/views/file/choose_destination.php
@@ -33,7 +33,7 @@ $options = array_filter([
                 <?= Icon::create('folder-parent', Icon::ROLE_CLICKABLE)->asInput(50, ['formaction' => $controller->action_url('choose_folder/' . $parent_folder->getId()), 'to_plugin' => $options['from_plugin'] ?? null]) ?>
                 <button
                     class="undecorated"
-                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if ($options['from_plugin']): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin'] ?? null) ?>"<? endif; ?>
+                    formaction="<?= $controller->action_link('choose_folder/' . $parent_folder->getId()) ?>" <? if (!empty($options['from_plugin'])): ?> name="to_plugin" value="<?= htmlReady($options['from_plugin']) ?>"<? endif; ?>
                     data-dialog="size=medium">
                     <?= _('Aktueller Ordner') ?>
                 </button>
diff --git a/lib/classes/ForumEntry.php b/lib/classes/ForumEntry.php
index f98e59c..7ac5306 100644
--- a/lib/classes/ForumEntry.php
+++ b/lib/classes/ForumEntry.php
@@ -218,7 +218,7 @@ class ForumEntry  implements PrivacyObject
         array_pop($path);
         $data = array_pop($path);
 
-        return $data['id'] ?: false;
+        return $data['id'] ?? false;
     }
 
 
@@ -1029,7 +1029,7 @@ class ForumEntry  implements PrivacyObject
         $stmt = DBManager::get()->prepare("SELECT chdate FROM forum_entries
             WHERE lft > ? AND rgt < ? AND seminar_id = ?
             ORDER BY chdate DESC LIMIT 1");
-        $stmt->execute([$parent['lft'], $parent['rgt'], $parent['seminar_id']]);
+        $stmt->execute([$parent['lft'] ?? null, $parent['rgt'] ?? null, $parent['seminar_id'] ?? null]);
         $chdate = $stmt->fetchColumn();
 
         $stmt_insert = DBManager::get()->prepare("UPDATE forum_entries
diff --git a/lib/classes/exportdocument/ExportPDF.class.php b/lib/classes/exportdocument/ExportPDF.class.php
index 8645f5b..915cfde 100644
--- a/lib/classes/exportdocument/ExportPDF.class.php
+++ b/lib/classes/exportdocument/ExportPDF.class.php
@@ -115,12 +115,15 @@ class ExportPDF extends TCPDF implements ExportDocument
             // Fetch headers from url, handle possible redirects
             do {
                 $headers = get_headers($url, true, get_default_http_stream_context($url));
+                if (!$headers) {
+                    break;
+                }
                 list(, $status) = explode(' ', $headers[0]);
 
                 $url = $headers['Location'] ?? $headers['location'] ?? $url;
             } while (in_array($status, [300, 301, 302, 303, 305, 307]));
 
-            $status = $status ?: 404;
+            $status = $status ?? 404;
 
             // Replace image with link on error (and not internal), otherwise return sainitized
             // url
diff --git a/lib/classes/librarysearch/LibraryDocument.class.php b/lib/classes/librarysearch/LibraryDocument.class.php
index 46e11b2..c1d297e 100644
--- a/lib/classes/librarysearch/LibraryDocument.class.php
+++ b/lib/classes/librarysearch/LibraryDocument.class.php
@@ -321,8 +321,8 @@ class LibraryDocument
         $doc->csl_data = $data['csl_data'];
         $doc->datafields = $data['datafields'];
         $doc->search_params = $data['search_params'];
-        $doc->catalog = $data['catalog'];
-        $doc->opac_link = $data['opac_link'];
+        $doc->catalog = $data['catalog'] ?? null;
+        $doc->opac_link = $data['opac_link'] ?? null;
         return $doc;
     }
 
diff --git a/lib/phplib/Seminar_Auth.class.php b/lib/phplib/Seminar_Auth.class.php
index 0a566d1..4849ece 100644
--- a/lib/phplib/Seminar_Auth.class.php
+++ b/lib/phplib/Seminar_Auth.class.php
@@ -326,7 +326,7 @@ class Seminar_Auth
         // load the default set of plugins
         PluginEngine::loadPlugins();
 
-        if (Request::get('loginname') && !$_COOKIE[get_class($GLOBALS['sess'])]) {
+        if (Request::get('loginname') && empty($_COOKIE[get_class($GLOBALS['sess'])])) {
             $login_template = $GLOBALS['template_factory']->open('nocookies');
         } else if (isset($this->need_email_activation)) {
             $this->unauth();
diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 9dca1d1..66f8e65 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -648,7 +648,7 @@ function TransformInternalLinks($str){
             $domain_data['domains'] = preg_replace("'\|[^/|]*'", '$0[^/]*?', $domain_data['domains']);
             $domain_data['domains'] = mb_substr($domain_data['domains'], 1);
             $domain_data['user_domain'] = preg_replace("'^({$domain_data['domains']})(.*)$'i", "\\1", $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-            $domain_data['user_domain_scheme'] = 'http' . (($_SERVER['HTTPS'] || $_SERVER['SERVER_PORT'] == 443) ? 's' : '') . '://';
+            $domain_data['user_domain_scheme'] = 'http' . ((!empty($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443) ? 's' : '') . '://';
             $GLOBALS['TransformInternalLinks_domainData'] = $domain_data;
         }
         $domain_data = $GLOBALS['TransformInternalLinks_domainData'];
diff --git a/templates/filesystem/group_folder/edit.php b/templates/filesystem/group_folder/edit.php
index 1d438bf..a5dc2f4 100644
--- a/templates/filesystem/group_folder/edit.php
+++ b/templates/filesystem/group_folder/edit.php
@@ -10,7 +10,7 @@ $groups = Statusgruppen::findBySeminar_id(Request::get('cid'));
         </option>
     <? endif; ?>
     <? foreach ($groups as $one_group): ?>
-        <option <?=(@$group->id === $one_group->id ? 'selected' : '')?> value="<?= htmlReady($one_group->id) ?>">
+        <option <?= isset($group) && $group->id === $one_group->id ? 'selected' : '' ?> value="<?= htmlReady($one_group->id) ?>">
             <?= htmlReady($one_group->name) ?>
         </option>
     <? endforeach; ?>
diff --git a/templates/filesystem/topic_folder/edit.php b/templates/filesystem/topic_folder/edit.php
index 1ac39af..e4eb6b0 100644
--- a/templates/filesystem/topic_folder/edit.php
+++ b/templates/filesystem/topic_folder/edit.php
@@ -10,7 +10,7 @@ $topics = CourseTopic::findBySeminar_id($folder->range_id);
         </option>
     <? endif; ?>
     <? foreach ($topics as $one_topic): ?>
-        <option <?=(@$topic->id === $one_topic->id ? 'selected' : '')?> value="<?= htmlReady($one_topic->id) ?>">
+        <option <?= isset($topic) && $topic->id === $one_topic->id ? 'selected' : '' ?> value="<?= htmlReady($one_topic->id) ?>">
             <?= htmlReady($one_topic->title) ?>
         </option>
     <? endforeach; ?>
-- 
cgit v1.0


From 7feed0729ba93cc07a4d9569ee8170a9e8433eb8 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 30 May 2024 09:45:28 +0000
Subject: fixes #4234

Closes #4234

Merge request studip/studip!3067
---
 lib/models/ConsultationBlock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/ConsultationBlock.php b/lib/models/ConsultationBlock.php
index e42daaf..9113547 100644
--- a/lib/models/ConsultationBlock.php
+++ b/lib/models/ConsultationBlock.php
@@ -71,7 +71,7 @@ class ConsultationBlock extends SimpleORMap implements PrivacyObject
             if ($block->range instanceof User) {
                 return $block->range->getFullName() . ' <' . $block->range->email . '>';
             }
-            if ($block->range instanceof Course || $block->range instanceof Institute) {
+            if ($block->range instanceof Course) {
                 return sprintf(_('Veranstaltung: %s'), $block->range->getFullName());
             }
 
-- 
cgit v1.0


From 435a68d4ccd2d531e47a1b76ee83e16ab762585e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Thu, 30 May 2024 11:53:17 +0000
Subject: fixes #4235

Closes #4235

Merge request studip/studip!3069
---
 app/views/admin/cronjobs/logs/index.php    | 2 +-
 app/views/admin/cronjobs/tasks/index.php   | 2 +-
 app/views/contact/index.php                | 2 +-
 app/views/course/members/accepted_list.php | 2 +-
 app/views/course/members/autor_list.php    | 4 ++--
 app/views/course/members/awaiting_list.php | 4 ++--
 app/views/course/members/tutor_list.php    | 2 +-
 app/views/course/members/user_list.php     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/cronjobs/logs/index.php b/app/views/admin/cronjobs/logs/index.php
index 1073d1b..d17a4a5 100644
--- a/app/views/admin/cronjobs/logs/index.php
+++ b/app/views/admin/cronjobs/logs/index.php
@@ -135,7 +135,7 @@ use Studip\Button, Studip\LinkButton;
         <tfoot>
         <tr>
             <td colspan="6">
-                <select name="action" data-activates="button[name=bulk]">
+                <select name="action" data-activates="button[name=bulk]" aria-label="<?= _('Aktion auswählen') ?>">
                     <option value="">- <?= _('Aktion auswählen') ?></option>
                     <option value="delete"><?= _('Löschen') ?></option>
                 </select>
diff --git a/app/views/admin/cronjobs/tasks/index.php b/app/views/admin/cronjobs/tasks/index.php
index c39df93..0edd191 100644
--- a/app/views/admin/cronjobs/tasks/index.php
+++ b/app/views/admin/cronjobs/tasks/index.php
@@ -78,7 +78,7 @@ use Studip\Button;
         <tfoot>
             <tr>
                 <td colspan="6">
-                    <select name="action" data-activates=".cronjobs button[name=bulk]">
+                    <select name="action" data-activates=".cronjobs button[name=bulk]" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="activate"><?= _('Aktivieren') ?></option>
                         <option value="deactivate"><?= _('Deaktivieren') ?></option>
diff --git a/app/views/contact/index.php b/app/views/contact/index.php
index a988191..81f5004 100644
--- a/app/views/contact/index.php
+++ b/app/views/contact/index.php
@@ -106,7 +106,7 @@
         <tfoot>
             <tr>
                 <td colspan="5">
-                    <select name="action_contact" id="contact_action" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_contact" id="contact_action" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="remove"><?= $filter ? _('Kontakte aus Gruppe entfernen') : _('Kontakte entfernen') ?></option>
                     </select>
diff --git a/app/views/course/members/accepted_list.php b/app/views/course/members/accepted_list.php
index 8bcd5f8..39cdca7 100644
--- a/app/views/course/members/accepted_list.php
+++ b/app/views/course/members/accepted_list.php
@@ -153,7 +153,7 @@
         <tfoot>
             <tr>
                 <td class="printhead" colspan="6">
-                    <select name="action_accepted" id="action_accepted" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_accepted" id="action_accepted" aria-label="<?= _('Aktion wählen') ?>">
                         <option value="">- <?= _('Aktion wählen') ?></option>
                         <option value="upgrade"><?= _('Akzeptieren') ?></option>
                         <option value="remove"><?= _('Austragen') ?></option>
diff --git a/app/views/course/members/autor_list.php b/app/views/course/members/autor_list.php
index e19868f..31ed8fa 100644
--- a/app/views/course/members/autor_list.php
+++ b/app/views/course/members/autor_list.php
@@ -183,8 +183,8 @@
         <tfoot>
             <tr>
                 <td colspan="<?= $cols_foot ?>">
-                    <select name="action_autor" id="action_autor" aria-label="<?= _('Aktion ausführen') ?>">
-                        <option value="">- <?= _('Aktion wählen') ?></option>
+                    <select name="action_autor" id="action_autor" aria-label="<?= _('Aktion auswählen') ?>">
+                        <option value="">- <?= _('Aktion auswählen') ?></option>
                     <? if($is_dozent) : ?>
                         <option value="upgrade">
                             <?= sprintf(_('Zu %s hochstufen'), htmlReady($status_groups['tutor'])) ?>
diff --git a/app/views/course/members/awaiting_list.php b/app/views/course/members/awaiting_list.php
index 86e76b7..c57bd2d 100644
--- a/app/views/course/members/awaiting_list.php
+++ b/app/views/course/members/awaiting_list.php
@@ -139,8 +139,8 @@
         <tfoot>
             <tr>
                 <td colspan="6">
-                    <select name="action_awaiting" id="action_awaiting" aria-label="<?= _('Aktion ausführen') ?>">
-                        <option value="">- <?= _('Aktion wählen') ?></option>
+                    <select name="action_awaiting" id="action_awaiting" aria-label="<?= _('Aktion auswählen') ?>">
+                        <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="upgrade_autor">
                             <?= sprintf(_('Zu %s hochstufen'), htmlReady($status_groups['autor'])) ?>
                         </option>
diff --git a/app/views/course/members/tutor_list.php b/app/views/course/members/tutor_list.php
index a8d46c6..350d83d 100644
--- a/app/views/course/members/tutor_list.php
+++ b/app/views/course/members/tutor_list.php
@@ -163,7 +163,7 @@
         <tfoot>
             <tr>
                 <td colspan="6">
-                    <select name="action_tutor" id="tutor_action" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_tutor" id="tutor_action" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="downgrade"><?= sprintf(_('Zu %s herunterstufen'), htmlReady($status_groups['autor'])) ?></option>
                         <option value="remove"><?= _('Austragen') ?></option>
diff --git a/app/views/course/members/user_list.php b/app/views/course/members/user_list.php
index 04da780..21409b5 100644
--- a/app/views/course/members/user_list.php
+++ b/app/views/course/members/user_list.php
@@ -154,7 +154,7 @@
         <tfoot>
             <tr>
                 <td colspan="6">
-                    <select name="action_user" id="user_action" aria-label="<?= _('Aktion ausführen') ?>">
+                    <select name="action_user" id="user_action" aria-label="<?= _('Aktion auswählen') ?>">
                         <option value="">- <?= _('Aktion auswählen') ?></option>
                         <option value="upgrade">
                             <?= sprintf(_('Zu %s hochstufen'), htmlReady($status_groups['autor'])) ?>
-- 
cgit v1.0


From 2fbb62227874ac3c93c26fc2efea678516c2b3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Thu, 30 May 2024 13:44:06 +0000
Subject: fixes #4091

Closes #4091

Merge request studip/studip!3071
---
 resources/vue/components/blubber/Composer.vue | 4 ++++
 templates/sidebar/search-widget.php           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/vue/components/blubber/Composer.vue b/resources/vue/components/blubber/Composer.vue
index f4b6aff..72a5d1c 100644
--- a/resources/vue/components/blubber/Composer.vue
+++ b/resources/vue/components/blubber/Composer.vue
@@ -1,6 +1,9 @@
 <template>
     <div class="writer" :style="composerStyle">
         <studip-icon shape="blubber" :size="30" role="info"></studip-icon>
+        <label for="blubber-placeholder" class="sr-only">
+            {{ placeholder || $gettext('Schreib was, frag was. Enter zum Abschicken.') }}
+        </label>
         <textarea
             :placeholder="placeholder || $gettext('Schreib was, frag was. Enter zum Abschicken.')"
             v-model="localText"
@@ -10,6 +13,7 @@
             @keyup.up.exact="editPreviousComment"
             @keyup="saveCommentToSession"
             ref="textarea"
+            id="blubber-placeholder"
         ></textarea>
         <a class="send" @click="submit" :title="$gettext('Abschicken')">
             <studip-icon shape="arr_2up" :size="30"></studip-icon>
diff --git a/templates/sidebar/search-widget.php b/templates/sidebar/search-widget.php
index 5bbc77e..300147e 100644
--- a/templates/sidebar/search-widget.php
+++ b/templates/sidebar/search-widget.php
@@ -12,7 +12,7 @@
         <? $hash = md5($url . '|' . $needle['name']) ?>
         <li <? if ($needle['quick_search'] && $needle['quick_search']->hasExtendedLayout()) echo 'class="extendedLayout" id="' . $needle['quick_search']->getId() . '_frame"'; ?>>
             <div class="input-group files-search">
-                <label for="needle-<?= $hash ?>" <? if ($needle['placeholder']) echo 'style="display:none;"'; ?>>
+                <label for="needle-<?= $hash ?>" <? if ($needle['placeholder']) echo 'class="sr-only"'; ?>>
                     <?= htmlReady($needle['label']) ?>
                 </label>
                 <? if ($needle['quick_search']): ?>
-- 
cgit v1.0


From 626397496a304c962bf4d95679449152d03f2f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Thu, 30 May 2024 13:46:58 +0000
Subject: fixes #4237

Closes #4237

Merge request studip/studip!3070
---
 app/views/messages/write.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/messages/write.php b/app/views/messages/write.php
index 1f818b4..d344143 100644
--- a/app/views/messages/write.php
+++ b/app/views/messages/write.php
@@ -7,7 +7,11 @@
     <fieldset>
         <legend><?= _('Neue Nachricht') ?></legend>
     <div class="message-user-list">
-        <label><?= _("An") ?></label>
+        <label>
+            <span class="required">
+                <?= _("An") ?>
+            </span>
+        </label>
         <ul class="list-csv" id="adressees">
             <li id="template_adressee" style="display: none;" class="adressee">
                 <input type="hidden" name="message_to[]" value="">
@@ -51,7 +55,9 @@
     </div>
     <div>
         <label>
-            <?= _("Betreff") ?>
+            <span class="required">
+                <?= _("Betreff") ?>
+            </span>
             <input type="text" name="message_subject" required value="<?= htmlReady($default_message['subject']) ?>">
         </label>
     </div>
-- 
cgit v1.0


From 5c893613b3a567eb86e4346d4175deb9e093cd6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Thu, 30 May 2024 13:50:09 +0000
Subject: fixes #4183

Closes #4183

Merge request studip/studip!3072
---
 app/views/calendar/schedule/_semester_chooser.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/calendar/schedule/_semester_chooser.php b/app/views/calendar/schedule/_semester_chooser.php
index 3af4018..a8a783e 100644
--- a/app/views/calendar/schedule/_semester_chooser.php
+++ b/app/views/calendar/schedule/_semester_chooser.php
@@ -1,7 +1,8 @@
 <form method="post" class="default" action="<?= $controller->link_for(
     isset($inst_mode) && $inst_mode == true ? 'calendar/instschedule/index' : 'calendar/schedule/index'
 ) ?>">
-    <select name="semester_id" class="submit-upon-select">
+    <label for="semester_id" class="sr-only"><?= _('Angezeigtes Semester') ?></label>
+    <select name="semester_id" class="submit-upon-select" id="semester_id">
         <? foreach ($semesters as $semester) : ?>
             <? if ($semester['ende'] > time() - strtotime('1year 1day')) : ?>
                 <option
-- 
cgit v1.0


From cf95f93f5c363da6565efb6b5be628de1845daa3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 30 May 2024 17:26:11 +0000
Subject: fixes #4191

Closes #4191

Merge request studip/studip!3068
---
 resources/vue/store/blubber.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/vue/store/blubber.js b/resources/vue/store/blubber.js
index 9cc474a..d0bd7f6 100644
--- a/resources/vue/store/blubber.js
+++ b/resources/vue/store/blubber.js
@@ -166,7 +166,7 @@ export default {
 
             // if total is missing, there are more comments to fetch
             const total = rootGetters['blubber-comments/lastMeta']?.page?.total;
-            const hasMore = !total;
+            const hasMore = total ?? true;
             commit('setMoreOlder', { id, hasMore });
         },
 
-- 
cgit v1.0


From 1a70031983001e10469b2d186dcf30de10aec3db Mon Sep 17 00:00:00 2001
From: Nico Mexis <nico.mexis@kabelmail.de>
Date: Thu, 30 May 2024 17:28:32 +0000
Subject: Fix OAuth 2.0 keys being generated with PKCS1

Closes #4223

Merge request studip/studip!3055
---
 cli/Commands/OAuth2/Keys.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/Commands/OAuth2/Keys.php b/cli/Commands/OAuth2/Keys.php
index 609ac4e..93282ba 100644
--- a/cli/Commands/OAuth2/Keys.php
+++ b/cli/Commands/OAuth2/Keys.php
@@ -47,8 +47,8 @@ class Keys extends Command
         $this->storeKeyContentsToFile($encryptionKey, $this->generateEncryptionKey());
 
         $keys = RSA::createKey(4096);
-        $this->storeKeyContentsToFile($publicKey, $keys->getPublicKey()->toString('PKCS1'));
-        $this->storeKeyContentsToFile($privateKey, $keys->toString('PKCS1'));
+        $this->storeKeyContentsToFile($publicKey, (string) $key->getPublicKey());
+        $this->storeKeyContentsToFile($privateKey, (string) $key);
 
         $io->info('Schlüsseldateien erfolgreich angelegt.');
 
-- 
cgit v1.0


From d12dd2e0a0d84159b211b21296c93965ef09ec52 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 30 May 2024 17:30:47 +0000
Subject: fixes #4226

Closes #4226

Merge request studip/studip!3057
---
 resources/vue/components/AdminCourses.vue | 45 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/resources/vue/components/AdminCourses.vue b/resources/vue/components/AdminCourses.vue
index 4c5d79c..23f9375 100644
--- a/resources/vue/components/AdminCourses.vue
+++ b/resources/vue/components/AdminCourses.vue
@@ -221,22 +221,28 @@ export default {
             });
         },
         sortArray (array) {
+            const mappedFields = {
+                last_activity: 'last_activity_raw',
+                semester: 'semester_sort',
+            };
+
             if (!array.length) {
                 return [];
             }
-            let sortby = this.sort.by;
-            if (!this.activatedFields.includes(sortby) && sortby !== 'completion') {
+            if (!this.activatedFields.includes(this.sort.by) && this.sort.by !== 'completion') {
                 return array;
             }
 
             const striptags = function (text) {
-                if (typeof text === "string") {
+                if (typeof text === 'string') {
                     return text.replace(/(<([^>]+)>)/gi, "");
                 } else {
                     return text;
                 }
             };
 
+            let sortby = mappedFields[this.sort.by] ?? this.sort.by;
+
             // Define sort direction by this factor
             const directionFactor = this.sort.direction === 'ASC' ? 1 : -1;
 
@@ -246,35 +252,28 @@ export default {
                 sensitivity: 'base'
             });
             let sortFunction = function (a, b) {
-                return collator.compare(striptags(a[sortby]), striptags(b[sortby]));
+                return collator.compare(striptags(a[sortby]), striptags(b[sortby]))
+                    || collator.compare(striptags(a.number), striptags(b.number));
             };
 
-            if (sortby === 'last_activity') {
-                sortFunction = (a, b) => a.last_activity_raw - b.last_activity_raw;
-            } else if (sortby === 'name') {
-                sortFunction = (a, b) => {
-                    return collator.compare(striptags(a.name), striptags(b.name))
-                        || collator.compare(striptags(a.number), striptags(b.number));
-                };
-            } else if (sortby === 'number') {
+            if (sortby === 'number') {
                 sortFunction = (a, b) => {
                     return collator.compare(striptags(a.number), striptags(b.number))
                         || collator.compare(striptags(a.name), striptags(b.name));
                 };
-            } else if (sortby === 'semester') {
-                sortFunction = (a, b) => a.semester_sort - b.semester_sort;
             } else {
-                let is_numeric = true;
-                for (let i in array) {
-                    if (striptags(array[i][sortby]) && isNaN(striptags(array[i][sortby]))) {
-                        is_numeric = false;
-                        break;
-                    }
-                }
+                let is_numeric = !array.some(i => {
+                    const value = striptags(i[sortby]);
+                    return value && isNaN(parseInt(value, 10));
+                });
+
                 if (is_numeric) {
                     sortFunction = function (a, b) {
-                        return (striptags(a[sortby]) ? parseInt(striptags(a[sortby]), 10) : 0)
-                            - (striptags(b[sortby]) ? parseInt(striptags(b[sortby]), 10) : 0);
+                        const aValue = (striptags(a[sortby]) ? parseInt(striptags(a[sortby]), 10) : 0);
+                        const bValue = (striptags(b[sortby]) ? parseInt(striptags(b[sortby]), 10) : 0);
+
+                        return aValue - bValue
+                            || collator.compare(striptags(a.number), striptags(b.number));
                     };
                 }
             }
-- 
cgit v1.0


From 200d0cc16c57958486ae6f339edc04b723fe3e8e Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Fri, 31 May 2024 05:47:18 +0200
Subject: Fix typo in 1a70031983001e10469b2d186dcf30de10aec3db.

Fixes #4239.
---
 cli/Commands/OAuth2/Keys.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/Commands/OAuth2/Keys.php b/cli/Commands/OAuth2/Keys.php
index 93282ba..9132ad6 100644
--- a/cli/Commands/OAuth2/Keys.php
+++ b/cli/Commands/OAuth2/Keys.php
@@ -46,7 +46,7 @@ class Keys extends Command
 
         $this->storeKeyContentsToFile($encryptionKey, $this->generateEncryptionKey());
 
-        $keys = RSA::createKey(4096);
+        $key = RSA::createKey(4096);
         $this->storeKeyContentsToFile($publicKey, (string) $key->getPublicKey());
         $this->storeKeyContentsToFile($privateKey, (string) $key);
 
-- 
cgit v1.0


From 4b2395ccc3ee028f16143506ceaebf1009964165 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Fri, 31 May 2024 07:36:31 +0000
Subject: combine search filters into a single widget, fixes #4238

Closes #4238

Merge request studip/studip!3075
---
 app/controllers/search/globalsearch.php            | 57 ++++++++++++----------
 resources/assets/javascripts/bootstrap/search.js   |  2 -
 resources/assets/javascripts/lib/search.js         | 10 ++--
 .../assets/stylesheets/scss/admin-courses.scss     |  4 --
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/app/controllers/search/globalsearch.php b/app/controllers/search/globalsearch.php
index ed4ed6e..05fcda2 100644
--- a/app/controllers/search/globalsearch.php
+++ b/app/controllers/search/globalsearch.php
@@ -72,37 +72,40 @@ class Search_GlobalsearchController extends AuthenticatedController
             }
         }
 
-        $semester_filter = $sidebar->addWidget(new OptionsWidget(_('Semester')));
-        $semester_filter->id = 'semester_filter';
-        $semester_filter->addSelect(
-            _('Semester'),
-            null,
-            'semester',
-            $this->getSemesters(),
-            'future',
-            ['id' => 'semester_select']
+        $filter_widget = $sidebar->addWidget(new OptionsWidget(_('Filter')));
+        $filter_widget->id = 'filter_widget';
+
+        $filter_widget->addElement(
+            new SelectListElement(
+                _('Semester'),
+                'semester',
+                $this->getSemesters(),
+                'future',
+                ['id' => 'semester_select']
+            ),
+            'semester_filter'
         );
 
-        $seminar_type_filter = $sidebar->addWidget(new OptionsWidget(_('Veranstaltungstypen')));
-        $seminar_type_filter->id = 'seminar_type_filter';
-        $seminar_type_filter->addSelect(
-            _('Typ der Veranstaltung'),
-            null,
-            'seminar_type',
-            $this->getSemClasses(),
-            '',
-            ['id' => 'seminar_type_select']
+        $filter_widget->addElement(
+            new SelectListElement(
+                _('Typ der Veranstaltung'),
+                'seminar_type',
+                $this->getSemClasses(),
+                '',
+                ['id' => 'seminar_type_select']
+            ),
+            'seminar_type_filter'
         );
 
-        $institute_filter = $sidebar->addWidget(new OptionsWidget(_('Einrichtungen')));
-        $institute_filter->id = 'institute_filter';
-        $institute_filter->addSelect(
-            _('Einrichtung'),
-            null,
-            'institute',
-            $this->getInstitutes(),
-            '',
-            ['id' => 'institute_select']
+        $filter_widget->addElement(
+            new SelectListElement(
+                _('Einrichtung'),
+                'institute',
+                $this->getInstitutes(),
+                '',
+                ['id' => 'institute_select']
+            ),
+            'institute_filter'
         );
     }
 
diff --git a/resources/assets/javascripts/bootstrap/search.js b/resources/assets/javascripts/bootstrap/search.js
index 6a0559b..7d4fb76 100644
--- a/resources/assets/javascripts/bootstrap/search.js
+++ b/resources/assets/javascripts/bootstrap/search.js
@@ -2,8 +2,6 @@ STUDIP.domReady(() => {
     var cache = STUDIP.Search.getCache();
     // initially hide all filters except for the semester filter
     $('#reset-search').hide();
-    STUDIP.Search.hideAllFilters();
-    $('div#semester_filter').show();
     STUDIP.Search.setActiveCategory('show_all_categories');
     STUDIP.Search.showActiveFilters(STUDIP.Search.getFilter());
 
diff --git a/resources/assets/javascripts/lib/search.js b/resources/assets/javascripts/lib/search.js
index 2f97f43..f8108cd 100644
--- a/resources/assets/javascripts/lib/search.js
+++ b/resources/assets/javascripts/lib/search.js
@@ -339,7 +339,8 @@ const Search = {
      * Hide all select filters in the sidebar.
      */
     hideAllFilters: function () {
-        $('div[id$="_filter"]').hide();
+        $('#filter_widget').hide();
+        $('#filter_widget *[id$="_filter"]').hide();
     },
 
     /**
@@ -350,12 +351,11 @@ const Search = {
     showFilter: function (category) {
         var filters = $('#search-results').data('filters');
         STUDIP.Search.hideAllFilters();
-        if (filters && filters[category] !== undefined && category != 'show_all_categories') {
+        if (filters && filters[category] !== undefined && filters[category].length > 0) {
+            $('#filter_widget').show();
             for (let i = 0; i < filters[category].length; i++) {
                 $(`#${filters[category][i]}_filter`).show();
             }
-        } else if (category === 'show_all_categories') {
-            $('#semester_filter').show();
         }
     },
 
@@ -547,7 +547,7 @@ const Search = {
             if (item != 'category') {
                 var value = filter[item];
                 if (value.trim()) {
-                    var name = $(`#${item}_filter .sidebar-widget-header`).text().trim();
+                    var name = $(`#${item}_filter .label-text`).text().trim();
                     var value_text = $(`#${item}_select option:selected`).text().trim();
                     var filterItem = $('<button></button>').addClass('button remove-filter').text(name + ': ' + value_text).attr('data-filter-name', item);
                     filterItem.on('click', function () {
diff --git a/resources/assets/stylesheets/scss/admin-courses.scss b/resources/assets/stylesheets/scss/admin-courses.scss
index 753e56b..09ec6ca 100644
--- a/resources/assets/stylesheets/scss/admin-courses.scss
+++ b/resources/assets/stylesheets/scss/admin-courses.scss
@@ -29,10 +29,6 @@
     }
 }
 
-#admin-filter-widget .label-text {
-    display: block;
-}
-
 .action-menu.filter {
     margin-left: 1em;
 }
-- 
cgit v1.0


From 555e162607bdb39e450fd79fe5997e71745cb481 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 31 May 2024 08:10:40 +0000
Subject: fixes #4233

Closes #4233

Merge request studip/studip!3066
---
 lib/classes/SimpleORMap.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/classes/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
index 499149c..7124cc4 100644
--- a/lib/classes/SimpleORMap.class.php
+++ b/lib/classes/SimpleORMap.class.php
@@ -1555,6 +1555,13 @@ class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
                              }
                              $this->setValue($options['foreign_key'], $assoc_foreign_key_value);
                          }
+                     } elseif (
+                         $value === null
+                         && $this->db_fields()[$options['foreign_key']]['null'] === 'YES'
+                     ) {
+                         $this->resetRelation($field);
+                         $this->setValue($options['foreign_key'], null);
+
                      } else {
                          throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
                      }
-- 
cgit v1.0


From 4047e28efd43011ff70d8c5b596aa1e8673a6246 Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Fri, 31 May 2024 11:35:04 +0000
Subject: Initialize `Trails\Controller#layout` before accessing it.

Closes #4246

Merge request studip/studip!3077
---
 lib/trails/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/trails/Controller.php b/lib/trails/Controller.php
index a5a0ba7..bafb8db 100644
--- a/lib/trails/Controller.php
+++ b/lib/trails/Controller.php
@@ -31,7 +31,7 @@ class Controller
     protected Dispatcher $dispatcher;
     protected Response $response;
     protected bool $performed = false;
-    protected Template|string|null $layout;
+    protected Template|string|null $layout = null;
     protected string $format = 'html';
 
     /**
-- 
cgit v1.0


From eba1fe03484ef9bd2d5974bc18a0da48f2c0ef0b Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Sat, 1 Jun 2024 07:37:38 +0000
Subject: fixes #4248

Closes #4248

Merge request studip/studip!3079
---
 lib/classes/StudipController.php | 3 +--
 lib/trails/Controller.php        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/classes/StudipController.php b/lib/classes/StudipController.php
index 0643836..a908a47 100644
--- a/lib/classes/StudipController.php
+++ b/lib/classes/StudipController.php
@@ -649,8 +649,7 @@ abstract class StudipController extends Trails\Controller
         $args = func_get_args();
         $unconsumed = array_shift($args);
 
-        [$action, $extracted_args, $format] = $this->extract_action_and_args($unconsumed);
-        $this->format = isset($format) ? $format : 'html';
+        [$action, $extracted_args] = $this->extract_action_and_args($unconsumed);
         $this->current_action = $action;
         $args = array_merge($extracted_args, $args);
         $callable = $this->map_action($action);
diff --git a/lib/trails/Controller.php b/lib/trails/Controller.php
index bafb8db..1918380 100644
--- a/lib/trails/Controller.php
+++ b/lib/trails/Controller.php
@@ -32,7 +32,7 @@ class Controller
     protected Response $response;
     protected bool $performed = false;
     protected Template|string|null $layout = null;
-    protected string $format = 'html';
+    private string $format = 'html';
 
     /**
      * @param Dispatcher $dispatcher the dispatcher who creates this instance
-- 
cgit v1.0


From cf80ca9ce1cc74ca31cdc3d540acd75ccddcf501 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 3 Jun 2024 06:50:03 +0000
Subject: fixes #4242

Closes #4242

Merge request studip/studip!3076
---
 templates/layouts/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index cd32e3b..6597fd8 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -100,7 +100,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
         <?= Icon::create('arr_1up', 'info_alt')->asImg(24, ['class' => '']) ?>
     </a>
 
-    <?= $this->render_partial('footer', ['link_params' => $header_template->link_params]); ?>
+    <?= $this->render_partial('footer', ['link_params' => $header_template->link_params ?? null]); ?>
     <?= SkipLinks::getHTML() ?>
     <section class="sr-only" id="notes_for_screenreader" aria-live="polite"></section>
 
-- 
cgit v1.0


From d4bdf98b3e49d79d568051968054ef155635c0bf Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 3 Jun 2024 11:49:37 +0000
Subject: fixed removal of exceptions from calendar dates, fixes #4250

Closes #4250

Merge request studip/studip!3082
---
 .../vue/components/form_inputs/DateListInput.vue     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/vue/components/form_inputs/DateListInput.vue b/resources/vue/components/form_inputs/DateListInput.vue
index 05f3c57..d77c993 100644
--- a/resources/vue/components/form_inputs/DateListInput.vue
+++ b/resources/vue/components/form_inputs/DateListInput.vue
@@ -2,11 +2,11 @@
     <div class="formpart">
         <div class="sr-only" aria-live="polite" ref="list_message_field"></div>
         <ul>
-            <li v-for="date in selected_date_list" v-bind="selected_date_list" :key="date">
+            <li v-for="date in selected_date_list" v-bind="selected_date_list" :key="getISODate(date)">
                 <input type="hidden" :name="input_name + '[]'" :value="getISODate(date)">
                 <studip-date-time :timestamp="Math.floor(date.getTime() / 1000)" :date_only="true"></studip-date-time>
-                <studip-icon shape="trash" :title="$gettext('Löschen')" @click="removeDate"
-                             class="enter-accessible" aria-role="button" tabindex="0"></studip-icon>
+                <studip-icon shape="trash" :title="$gettext('Löschen')" @click="removeDate(date)"
+                             class="icon enter-accessible button undecorated" aria-role="button" tabindex="0"></studip-icon>
             </li>
         </ul>
         <label>
@@ -82,13 +82,13 @@ export default {
             this.selected_date_list.push(new Date(reformatted_date));
             this.$refs.list_message_field.innerText = $gettextInterpolate($gettext('Datum %{date} hinzugefügt'), {date: this.selected_date_value});
         },
-        removeDate(date_key) {
-            if (date_key) {
-                let date = this.selected_date_list.at(date_key);
-                let formatted_date = STUDIP.DateTime.getStudipDate(date, false, true);
-                this.selected_date_list.splice(date_key, 1);
-                this.$refs.list_message_field.innerText = $gettextInterpolate($gettext('Datum %{date} entfernt'), {date: formatted_date});
-            }
+        removeDate(date) {
+            this.selected_date_list = this.selected_date_list.filter(d => d !== date);
+
+            this.$refs.list_message_field.innerText = $gettextInterpolate(
+                $gettext('Datum %{date} entfernt'),
+                {date: STUDIP.DateTime.getStudipDate(date, false, true)}
+            );
         },
         getISODate(date) {
             return STUDIP.DateTime.getISODate(date);
-- 
cgit v1.0


From 46d7f6b5a0ee5276d7fd64b5463da977c321d307 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 3 Jun 2024 12:08:10 +0000
Subject: fixes #4252

Closes #4252

Merge request studip/studip!3083
---
 app/controllers/profile.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 7738bb3..72a500e 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -659,12 +659,8 @@ class ProfileController extends AuthenticatedController
 
     /**
      * Returns the visibility value
-     *
-     * @param string $param
-     * @param string $visibility
-     * @return string|bool
      */
-    private function getVisibilityValue(string $param, string $visibility = ''): string|bool
+    private function getVisibilityValue(string $param, string $visibility = ''): mixed
     {
         if (Visibility::verify($visibility ?: $param, $this->current_user->user_id)) {
             return $this->current_user->$param;
-- 
cgit v1.0


From 23b47edc40c9e5e1a2144cf8288581ce92bc40bd Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 3 Jun 2024 12:32:36 +0000
Subject: fixes #4251

Closes #4251

Merge request studip/studip!3081
---
 templates/shared/tooltip.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/templates/shared/tooltip.php b/templates/shared/tooltip.php
index 8dbcd38..513700f 100644
--- a/templates/shared/tooltip.php
+++ b/templates/shared/tooltip.php
@@ -1,4 +1,11 @@
+<?php
+/**
+ * @var bool $important
+ * @var bool $html
+ * @var string $text
+ */
+?>
 <span class="tooltip tooltip-icon <? if ($important) echo 'tooltip-important'; ?>"
-      tabindex="0" aria-label="<?= $html ? kill_format($text) : htmlReady($text) ?>">
+      tabindex="0" aria-label="<?= $html ? htmlReady(strip_tags($text)) : htmlReady($text) ?>">
     <span class="tooltip-content"><?= $html ? $text : htmlReady($text) ?></span>
 </span>
-- 
cgit v1.0


From c0791ae86fc89c61a140bead95d231631500bf8a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 4 Jun 2024 07:12:54 +0000
Subject: fixes #4254

Closes #4254

Merge request studip/studip!3085
---
 public/install.php | 61 +++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/public/install.php b/public/install.php
index e32cf75..ffbf90f 100644
--- a/public/install.php
+++ b/public/install.php
@@ -15,36 +15,37 @@ if (file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php')
 
 set_include_path($GLOBALS['STUDIP_BASE_PATH']);
 
-require_once 'composer/autoload.php';
-require_once 'lib/visual.inc.php';
-require_once 'lib/classes/URLHelper.php';
-require_once 'lib/classes/LayoutMessage.interface.php';
-require_once 'lib/classes/MessageBox.class.php';
-require_once 'lib/classes/Request.class.php';
-require_once 'lib/classes/Interactable.class.php';
-require_once 'lib/classes/Button.class.php';
-require_once 'lib/classes/LinkButton.class.php';
-require_once 'lib/classes/StudipInstaller.php';
-require_once 'lib/classes/SystemChecker.php';
-require_once 'lib/classes/Markup.class.php';
-require_once 'lib/exceptions/AccessDeniedException.php';
-require_once 'lib/flexi/Factory.php';
-require_once 'lib/flexi/PhpTemplate.php';
-require_once 'lib/flexi/Template.php';
-require_once 'lib/flexi/TemplateNotFoundException.php';
-require_once 'lib/trails/Controller.php';
-require_once 'lib/trails/Dispatcher.php';
-require_once 'lib/trails/Exception.php';
-require_once 'lib/trails/Flash.php';
-require_once 'lib/trails/Inflector.php';
-require_once 'lib/trails/Response.php';
-require_once 'lib/trails/Exceptions/DoubleRenderError.php';
-require_once 'lib/trails/Exceptions/MissingFile.php';
-require_once 'lib/trails/Exceptions/RoutingError.php';
-require_once 'lib/trails/Exceptions/SessionRequiredException.php';
-require_once 'lib/trails/Exceptions/UnknownAction.php';
-require_once 'lib/trails/Exceptions/UnknownController.php';
-require_once 'vendor/phpass/PasswordHash.php';
+require 'composer/autoload.php';
+require 'lib/visual.inc.php';
+require 'lib/functions.php';
+require 'lib/classes/URLHelper.php';
+require 'lib/classes/LayoutMessage.interface.php';
+require 'lib/classes/MessageBox.class.php';
+require 'lib/classes/Request.class.php';
+require 'lib/classes/Interactable.class.php';
+require 'lib/classes/Button.class.php';
+require 'lib/classes/LinkButton.class.php';
+require 'lib/classes/StudipInstaller.php';
+require 'lib/classes/SystemChecker.php';
+require 'lib/classes/Markup.class.php';
+require 'lib/exceptions/AccessDeniedException.php';
+require 'lib/flexi/Factory.php';
+require 'lib/flexi/Template.php';
+require 'lib/flexi/PhpTemplate.php';
+require 'lib/flexi/TemplateNotFoundException.php';
+require 'lib/trails/Controller.php';
+require 'lib/trails/Dispatcher.php';
+require 'lib/trails/Exception.php';
+require 'lib/trails/Flash.php';
+require 'lib/trails/Inflector.php';
+require 'lib/trails/Response.php';
+require 'lib/trails/Exceptions/DoubleRenderError.php';
+require 'lib/trails/Exceptions/MissingFile.php';
+require 'lib/trails/Exceptions/RoutingError.php';
+require 'lib/trails/Exceptions/SessionRequiredException.php';
+require 'lib/trails/Exceptions/UnknownAction.php';
+require 'lib/trails/Exceptions/UnknownController.php';
+require 'vendor/phpass/PasswordHash.php';
 
 // Mock gettext functions if extension is not available
 if (!function_exists('_')) {
-- 
cgit v1.0


From 44d0923e7a000755ef6d8338e0d382e9e97a0106 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 4 Jun 2024 08:12:58 +0000
Subject: add User::hasPermission(), fixes #3453

Closes #3453

Merge request studip/studip!2348
---
 RELEASE-NOTES.md          |  1 +
 lib/models/User.class.php | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 556cee6..37f5fa2 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -5,6 +5,7 @@
 ## Neue Features
 
 - Der Stud.IP-Cache ist nun kompatibel zu PSR-6. ([TIC #3701](https://gitlab.studip.de/studip/studip/-/issues/3701))
+- Das `User`-Model hat die Methode `hasPermissionLevel()` erhalten, um einfach abfragen zu können, ob eine Person einen bestimmten Berechtigungsstatus hat. ([Issue #3453](https://gitlab.studip.de/studip/studip/-/issues/3453))
 
 ## Breaking changes
 
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
index a9dbc14..4894031 100644
--- a/lib/models/User.class.php
+++ b/lib/models/User.class.php
@@ -1622,4 +1622,29 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
                 return '';
         }
     }
+
+    /*
+     * Returns whether the user has the given permission (for the given range).
+     *
+     * @param string     $permission
+     * @param Range|null $for_range
+     *
+     * @return bool
+     */
+    public function hasPermissionLevel(string $permission, ?Range $for_range = null): bool
+    {
+        if (func_num_args() === 1) {
+            return $GLOBALS['perm']->have_perm($permission, $this->id);
+        }
+
+        if ($for_range === null) {
+            throw new Exception('No valid range given');
+        }
+
+        if ($for_range instanceof User) {
+            return $GLOBALS['perm']->have_profile_perm($permission, $for_range->id, $this->id);
+        }
+
+        return $GLOBALS['perm']->have_studip_perm($permission, $for_range->id, $this->id);
+    }
 }
-- 
cgit v1.0


From 639d258e2aaa4a79161cc161903ce0192b04e59a Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Tue, 4 Jun 2024 08:57:37 +0000
Subject: Create plugins using the dependency injection.

Closes #4247

Merge request studip/studip!3078
---
 lib/bootstrap-definitions.php              | 1 +
 lib/plugins/engine/PluginManager.class.php | 2 +-
 tests/functional/_bootstrap.php            | 1 +
 tests/jsonapi/_bootstrap.php               | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/bootstrap-definitions.php b/lib/bootstrap-definitions.php
index 8afb8ce..e3bf88a 100644
--- a/lib/bootstrap-definitions.php
+++ b/lib/bootstrap-definitions.php
@@ -67,4 +67,5 @@ return [
 
         return $pdo;
     }),
+    PluginManager::class => DI\factory([PluginManager::class, 'getInstance']),
 ];
diff --git a/lib/plugins/engine/PluginManager.class.php b/lib/plugins/engine/PluginManager.class.php
index fc81d7f..7e36fa0 100644
--- a/lib/plugins/engine/PluginManager.class.php
+++ b/lib/plugins/engine/PluginManager.class.php
@@ -591,7 +591,7 @@ class PluginManager
         }
 
         if ($plugin_class) {
-            $plugin = $plugin_class->newInstance();
+            $plugin = app()->get($class);
         }
 
         return $this->plugin_cache[$class] = $plugin;
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
index 1745a1a..322883d 100644
--- a/tests/functional/_bootstrap.php
+++ b/tests/functional/_bootstrap.php
@@ -19,6 +19,7 @@ $inc_path .= PATH_SEPARATOR . __DIR__ . '/../../config';
 ini_set('include_path', $inc_path);
 
 require 'lib/classes/StudipAutoloader.php';
+require 'lib/helpers.php';
 require 'lib/functions.php';
 require_once 'lib/language.inc.php';
 require 'lib/visual.inc.php';
diff --git a/tests/jsonapi/_bootstrap.php b/tests/jsonapi/_bootstrap.php
index dea1c81..7987b34 100644
--- a/tests/jsonapi/_bootstrap.php
+++ b/tests/jsonapi/_bootstrap.php
@@ -29,6 +29,7 @@ date_default_timezone_set('Europe/Berlin');
 
 require 'config.inc.php';
 
+require 'lib/helpers.php';
 require 'lib/functions.php';
 require 'lib/language.inc.php';
 require 'lib/visual.inc.php';
-- 
cgit v1.0


From a1d387e2e3fa2a7591da5e834b0f51cd4ccc869e Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 4 Jun 2024 09:39:54 +0000
Subject: fix #4186

Closes #4186

Merge request studip/studip!3086
---
 .../vue/components/courseware/blocks/CoursewareDocumentBlock.vue  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue b/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue
index 73f0985..55e7b01 100644
--- a/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareDocumentBlock.vue
@@ -420,7 +420,7 @@ export default {
             if (this.currentUrl) {
                 let view = this;
                 view.pdfEventBus = new EventBus();
-                view.pdfLoadingTask = getDocument(this.currentUrl).promise;
+                view.pdfLoadingTask = getDocument({ url: this.currentUrl, verbosity: 0 }).promise;
                 view.pdfLoadingTask.__PDFDocumentLoadingTask = true;
                 // Link Service
                 view.pdfLinkService = new PDFLinkService({
@@ -487,7 +487,11 @@ export default {
                     .then((pdfPage) => {
                         view.pdfPage = pdfPage;
                         const width = outerContainer.offsetWidth;
-                        view.baseScale = (width / pdfPage.view[2] / 1.33).toFixed(2);
+                        let pdfWidth = pdfPage.view[2];
+                        if (pdfPage.rotate === 90 || pdfPage.rotate === 270) {
+                            pdfWidth = pdfPage.view[3];
+                        }
+                        view.baseScale = (width / pdfWidth / 1.33).toFixed(2);
                         view.scale = view.baseScale;
                         // Creating the page view with default parameters.
                         let defaultViewport = pdfPage.getViewport({
-- 
cgit v1.0


From 2b6384aa7708cdf2345da768b0446b02768db85d Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Wed, 5 Jun 2024 14:58:39 +0000
Subject: sort mails in mailqueue by tries and mkdate, closes #3524

Closes #3524

Merge request studip/studip!2409
---
 lib/models/MailQueueEntry.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/MailQueueEntry.class.php b/lib/models/MailQueueEntry.class.php
index bc956e7..d0f9685 100644
--- a/lib/models/MailQueueEntry.class.php
+++ b/lib/models/MailQueueEntry.class.php
@@ -104,7 +104,7 @@ class MailQueueEntry extends SimpleORMap
 
             $status_messages[] = $status_message;
         }, "tries = 0 " .
-           "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY mkdate".
+           "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY tries, mkdate".
            ($limit > 0 ? " LIMIT ". (int) $limit : "")
         );
 
-- 
cgit v1.0


From 417e1fcd43b903e9a0e2c72c8776da828a9ec69b Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Thu, 6 Jun 2024 06:20:04 +0000
Subject: Resolve "Veranstaltungshierarchie: Fehler beim Anlegen von
 Unterelementen"

Closes #4257

Merge request studip/studip!3087
---
 app/controllers/admin/tree.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/tree.php b/app/controllers/admin/tree.php
index 1afc438..c8f2a8f 100644
--- a/app/controllers/admin/tree.php
+++ b/app/controllers/admin/tree.php
@@ -130,12 +130,15 @@ class Admin_TreeController extends AuthenticatedController
         $node->parent_id = Request::option('parent_id');
 
         $parent = $classname::getNode(Request::option('parent_id'));
-        $maxprio = max(array_map(
-            function ($c) {
-                return $c->priority;
-            },
-            $parent->getChildNodes()
-        ));
+        $children = $parent->getChildNodes();
+        $maxprio = !empty($children)
+            ? max(array_map(
+                function ($c) {
+                    return $c->priority;
+                },
+                $children
+            ))
+            : 0;
         $node->priority = $maxprio + 1;
 
         if (Request::option('studip_object_id')) {
-- 
cgit v1.0


From 3e48540846d70bea1b3322e4d14f66d824c2413d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 6 Jun 2024 12:31:04 +0000
Subject: fixes #4260

Closes #4260

Merge request studip/studip!3088
---
 resources/assets/stylesheets/print.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/assets/stylesheets/print.scss b/resources/assets/stylesheets/print.scss
index bace5fb..7f6c043 100644
--- a/resources/assets/stylesheets/print.scss
+++ b/resources/assets/stylesheets/print.scss
@@ -3,7 +3,6 @@
 @import "scss/visibility";
 @import "scss/fullcalendar-print";
 @import "scss/resources-print";
-@import "scss/schedule" ;
 
 
 /*******************************************************************************
-- 
cgit v1.0


From be521fa623b22c128d9072403e36ba94b9ca276f Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 6 Jun 2024 13:53:00 +0000
Subject: fix for BIESt 4048, closes #4048

Closes #4048

Merge request studip/studip!3074
---
 app/views/calendar/schedule/_colorpicker.php    | 7 +++++--
 resources/assets/stylesheets/scss/schedule.scss | 6 +-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/calendar/schedule/_colorpicker.php b/app/views/calendar/schedule/_colorpicker.php
index 79ad8b2..e1f1266 100644
--- a/app/views/calendar/schedule/_colorpicker.php
+++ b/app/views/calendar/schedule/_colorpicker.php
@@ -4,8 +4,11 @@
     <? foreach ($GLOBALS['PERS_TERMIN_KAT'] as $index => $data): ?>
         <span>
             <input type="radio" name="entry_color" value="<?= $index ?>" id="color-<?= $index ?>"
-                   <? if ($index == $selected) echo 'checked'; ?>>
-            <label class="undecorated schedule-category<?= $index ?>" for="color-<?= $index ?>"></label>
+                   <?= $index === $selected ? 'checked' : '' ?>>
+            <label class="undecorated schedule-category<?= $index ?> enter-accessible"
+                   for="color-<?= $index ?>"
+                   aria-label="<?= sprintf(_('Farbe %u zuordnen'), $index) ?>"
+                   title="<?= sprintf(_('Farbe %u zuordnen'), $index) ?>"></label>
         </span>
     <? endforeach; ?>
     </div>
diff --git a/resources/assets/stylesheets/scss/schedule.scss b/resources/assets/stylesheets/scss/schedule.scss
index bc00b5b..a09e3ad 100644
--- a/resources/assets/stylesheets/scss/schedule.scss
+++ b/resources/assets/stylesheets/scss/schedule.scss
@@ -185,10 +185,6 @@ td.schedule-adminbind {
 }
 
 #color_picker {
-    div {
-        display: flex;
-        flex-wrap: wrap;
-    }
 
     span {
         flex: 0 0 auto;
@@ -198,7 +194,7 @@ td.schedule-adminbind {
     }
 
     input[type="radio"] {
-        display: none;
+        @extend .sr-only;
 
         &:checked + label {
             outline: 1px solid var(--black);
-- 
cgit v1.0


From 04e8ec75eaefe4ba1c0455636454ead3c35452ac Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Fri, 7 Jun 2024 11:25:27 +0200
Subject: re #4220

---
 lib/classes/PageLayout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/classes/PageLayout.php b/lib/classes/PageLayout.php
index a4178a5..d6b28ec 100644
--- a/lib/classes/PageLayout.php
+++ b/lib/classes/PageLayout.php
@@ -150,7 +150,7 @@ class PageLayout
             ]);
             self::addHeadElement('script', [
                 'src' => URLHelper::getURL('dispatch.php/debugbar/js'),
-            ]);
+            ], '');
 
             URLHelper::setBaseURL($old_base);
         }
-- 
cgit v1.0


From 69144f9cdc6bfe93ea528fd5c328ad8206fd1ee1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Fri, 7 Jun 2024 13:48:46 +0200
Subject: clear layout attributes, re #4101

---
 app/views/start/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/start/index.php b/app/views/start/index.php
index 1fa65ca..6a177f6 100644
--- a/app/views/start/index.php
+++ b/app/views/start/index.php
@@ -30,6 +30,7 @@ if (Config::get()->BANNER_ADS_ENABLE) {
                 <li class="studip-widget-wrapper" id="<?= $widget->getPluginId() ?>">
                     <div class="ui-widget-content studip-widget">
                         <? if ($template = $widget->getPortalTemplate()): ?>
+                            <? $widget_layout->clear_attributes() ?>
                             <? $template->set_layout($widget_layout) ?>
                             <?= $this->render_partial($template, compact('widget')) ?>
                         <? else: ?>
-- 
cgit v1.0


From a6a1ecba56245030b0a79b3a6a368b42efaf37ff Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 10 Jun 2024 09:42:52 +0000
Subject: fixes #4275

Closes #4275

Merge request studip/studip!3093
---
 app/views/course/dates/_date_row.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/course/dates/_date_row.php b/app/views/course/dates/_date_row.php
index 8aea8b3..b10deac 100644
--- a/app/views/course/dates/_date_row.php
+++ b/app/views/course/dates/_date_row.php
@@ -15,7 +15,7 @@ $dialog_url = $show_raumzeit
             ? $controller->url_for('course/dates/details/' . $date->id)
             : $controller->url_for('course/dates/singledate/' . $date->id);
 ?>
-<tr id="date_<?= $date->id ?>" <? if ($is_next_date) echo 'class="nextdate" title="' . _('Der nächste Termin') . '"'; ?> data-termin-id="<?= htmlReady($date->id) ?>">
+<tr id="date_<?= $date->id ?>" <? if (!empty($is_next_date)) echo 'class="nextdate" title="' . _('Der nächste Termin') . '"'; ?> data-termin-id="<?= htmlReady($date->id) ?>">
     <td data-sort-value="<?= htmlReady($date->date) ?>" class="date_name">
         <a href="<?= $dialog_url ?>" data-dialog>
             <?= Icon::create($icon)->asImg(['class' => 'text-bottom']) ?>
-- 
cgit v1.0


From 100c538e2b4c003d63dc3ee8a428ea7e9e428025 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 10 Jun 2024 12:19:40 +0000
Subject: fixes #4274

Closes #4274

Merge request studip/studip!3094
---
 resources/assets/stylesheets/scss/sidebar.scss | 18 ++++++++++------
 templates/sidebar/search-widget.php            | 29 +++++++++++++-------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index 9a97976..c161778 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -313,6 +313,7 @@ select.sidebar-selectlist {
                     flex: 1;
                     padding: .25em .5em;
                     width: 100%;
+                    order: 1;
                 }
 
                 .submit-search {
@@ -324,17 +325,22 @@ select.sidebar-selectlist {
                     cursor: pointer;
                     font: 0/0 a;
                     text-shadow: none;
+                    order: 3;
                 }
 
                 .reset-search {
-                    background-color: transparent;
-                    border: 1px solid var(--dark-gray-color-30);
-                    border-left: 0;
-                    border-right: 0;
+                    background: unset;
                     display: inline-block;
-                    padding-right: 5px;
-                    padding-top: 4px;
                     cursor: pointer;
+                    order: 2;
+                    height: 100%;
+                    box-sizing: border-box;
+                    margin-right: 2px;
+                    margin-left: -22px;
+
+                    img {
+                        padding-top: 4px;
+                    }
                 }
 
             }
diff --git a/templates/sidebar/search-widget.php b/templates/sidebar/search-widget.php
index 300147e..c314673 100644
--- a/templates/sidebar/search-widget.php
+++ b/templates/sidebar/search-widget.php
@@ -24,25 +24,24 @@
                        <? if ($needle['placeholder']) printf('placeholder="%s"', htmlReady($needle['label'])); ?>
                        <?= arrayToHtmlAttributes($needle['attributes']) ?>>
                 <? endif; ?>
-                <? if ($reset_link): ?>
-                    <? if ($onsubmit) : ?>
-                        <?= Icon::create('decline')->asInput([
-                            'title' =>  _('Suche zurücksetzen'),
-                            'class' => 'reset-search',
-                            'onclick' => "window.document.getElementById('needle-".$hash."').value = '';"
-                        ]) ?>
-                    <? else : ?>
-                        <a class="reset-search" href="<?= $reset_link ?>" tabindex="0" role="button"
-                            <?= $onsubmit ? 'onclick="'."window.document.getElementById('needle-".$hash."').value = ''; window.document.getElementById('".$id."').submit(); return false; ".'"' : '' ?>
-                           title="<?= _('Suche zurücksetzen') ?>">
-                            <?= Icon::create('decline')->asImg(20) ?>
-                        </a>
-                    <? endif ?>
-                <? endif; ?>
                 <button type="submit" class="submit-search<?= $reset_link ? ' is-executed' : '' ?>"
                         title="<?= _('Suche ausführen') ?>">
                     <?= Icon::create('search')->asImg(20) ?>
                 </button>
+            <? if ($reset_link): ?>
+                <? if ($onsubmit) : ?>
+                    <?= Icon::create('decline')->asInput([
+                        'title' =>  _('Suche zurücksetzen'),
+                        'class' => 'reset-search',
+                        'onclick' => "document.getElementById('needle-".$hash."').value = ''; this.remove();"
+                    ]) ?>
+                <? else : ?>
+                    <a class="reset-search" href="<?= $reset_link ?>" tabindex="0" role="button"
+                       title="<?= _('Suche zurücksetzen') ?>">
+                        <?= Icon::create('decline')->asImg(20) ?>
+                    </a>
+                <? endif ?>
+            <? endif; ?>
         </li>
     <? endforeach; ?>
     </ul>
-- 
cgit v1.0


From 41c5d920cb57729cc54c0de29f58b26c8b8967cd Mon Sep 17 00:00:00 2001
From: Sebastian Schenk <sebastian.schenk@itz.uni-halle.de>
Date: Tue, 11 Jun 2024 13:46:40 +0000
Subject: Added links in resource requests, fixes #2982

Closes #2982

Merge request studip/studip!3092
---
 locale/de/LC_MAILS/close_resource_request.php | 6 ++++--
 locale/en/LC_MAILS/close_resource_request.php | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/locale/de/LC_MAILS/close_resource_request.php b/locale/de/LC_MAILS/close_resource_request.php
index 2ff931f..dada45f 100644
--- a/locale/de/LC_MAILS/close_resource_request.php
+++ b/locale/de/LC_MAILS/close_resource_request.php
@@ -1,5 +1,5 @@
 Eine Anfrage <?= $request->course instanceof Course
-               ? 'für die Veranstaltung ' . $request->course->getFullName('number-name')
+               ? 'für die Veranstaltung [' .$request->course->getFullName('number-name') . ']' . $request->course->getItemURL()
                : '' ?> wurde bearbeitet.
 
 <? if ($request->course): ?>
@@ -17,7 +17,9 @@ Gebuchte Räume: <?= $booked_rooms ?>
 Art der Anfrage: <?= $request->getTypeString() ?>
 
 
-Die folgenden Zeiträume wurden gebucht:
+Die folgenden Zeiträume wurden gebucht<?= $request->course->isToolActive('CoreSchedule')
+               ? ' und im [Ablaufplan]' . str_replace( 'details/index', 'dates', $request->course->getItemURL()) . ' eingetragen'
+               : '' ?>:
 <? foreach ($metadates as $metadate) : ?>
 
 - <?= $metadate->toString('full') ?>
diff --git a/locale/en/LC_MAILS/close_resource_request.php b/locale/en/LC_MAILS/close_resource_request.php
index 2adcad9..b1bbe4c 100644
--- a/locale/en/LC_MAILS/close_resource_request.php
+++ b/locale/en/LC_MAILS/close_resource_request.php
@@ -1,5 +1,5 @@
 A request <?= $request->course instanceof Course
-            ? 'for the course ' . $request->course->getFullName('number-name')
+            ? 'for the course [' .$request->course->getFullName('number-name') . ']' . $request->course->getItemURL()
             : '' ?> has been processed.
 
 <? if ($request->course): ?>
@@ -17,7 +17,9 @@ Booked rooms: <?= $booked_rooms ?>
 Request type: <?= $request->getTypeString() ?>
 
 
-The following time ranges have been booked:
+The following time ranges have been booked<?= $request->course->isToolActive('CoreSchedule')
+               ? ' and added to [Schedule]' . str_replace( 'details/index', 'dates', $request->course->getItemURL())
+               : '' ?>:
 <? foreach ($metadates as $metadate) : ?>
 
 - <?= $metadate->toString('full') ?>
-- 
cgit v1.0


From cca44456cc9132981d05c7ed2f66f023a7c5dc94 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 11 Jun 2024 20:11:25 +0000
Subject: allow updating of mvv files, fixes #696

Closes #696

Merge request studip/studip!3095
---
 app/controllers/materialien/files.php        |  61 +++----
 app/views/materialien/files/add_dokument.php |  26 ++-
 lib/filesystem/MVVFolder.php                 |   2 +-
 lib/filesystem/StandardFolder.php            |   9 +-
 resources/assets/javascripts/mvv.js          | 229 ++++++++++++++++-----------
 5 files changed, 201 insertions(+), 126 deletions(-)

diff --git a/app/controllers/materialien/files.php b/app/controllers/materialien/files.php
index 6f45767..429a98c 100644
--- a/app/controllers/materialien/files.php
+++ b/app/controllers/materialien/files.php
@@ -362,29 +362,37 @@ class Materialien_FilesController extends MVVController
 
     public function upload_attachment_action()
     {
-        if ($GLOBALS['user']->id === "nobody") {
+        $user = User::findCurrent();
+        if (!$user) {
             throw new AccessDeniedException();
         }
 
-        $file = $_FILES['file'];
-        $output = [
-            'name' => $file['name'],
-            'size' => $file['size']];
-
         $mvvfile_id = Request::option('mvvfile_id');
-        $output['mvvfile_id'] = $mvvfile_id;
-        $range_id = Request::option('range_id', $mvvfile_id);
-        $output['range_id'] = $range_id;
-        $file_language = Request::option('file_language');
+        $document_id = Request::option('document_id');
 
-        $top_folder = $this->getTopFolder($mvvfile_id);
-
-        $user = User::findCurrent();
-
-        $file = StandardFile::create($_FILES['file']);
-        $error = $top_folder->validateUpload($file, $GLOBALS['user']->id);
-        if ($error != null) {
-            $file->delete();
+        $file = $_FILES['file'];
+        $output = [
+            'name'       => $file['name'],
+            'size'       => $file['size'],
+            'mvvfile_id' => $mvvfile_id,
+            'range_id'   => Request::option('range_id', $mvvfile_id),
+        ];
+
+        $top_folder = $this->getTopFolder($output['mvvfile_id']);
+
+        if ($document_id) {
+            $file = File::find($document_id);
+            $file->mime_type = $_FILES['file']['type'] ?? get_mime_type($_FILES['file']['name']);
+            $file->size = $_FILES['file']['size'] ?? filesize($_FILES['file']['tmp_name']);
+            $file->connectWithDataFile($_FILES['file']['tmp_name']);
+        } else {
+            $file = StandardFile::create($_FILES['file']);
+        }
+        $error = $top_folder->validateUpload($file, $user->id);
+        if ($error !== null) {
+            if (!$document_id) {
+                $file->delete();
+            }
             $this->response->set_status(400);
             $this->render_json(compact('error'));
             return;
@@ -399,18 +407,15 @@ class Materialien_FilesController extends MVVController
             return;
         }
 
-        $mvv_file_fileref = new MvvFileFileref([$mvvfile_id, $file_language]);
-        $mvv_file_fileref->fileref_id = $file->getId();
+        $mvv_file_fileref = new MvvFileFileref([
+            $output['mvvfile_id'],
+            Request::option('file_language'),
+        ]);
+        $mvv_file_fileref->fileref_id = $file->id;
         $mvv_file_fileref->store();
 
-        $output['document_id'] = $file->getId();
-
-        $output['icon'] = Icon::create(
-            FileManager::getIconNameForMimeType(
-                $file->getMimeType()
-            ),
-            'clickable'
-        )->asImg(['class' => "text-bottom"]);
+        $output['document_id'] = $file->id;
+        $output['icon'] = $file->getIcon(Icon::ROLE_CLICKABLE)->asImg(['class' => 'text-bottom']);
 
         $this->render_json($output);
     }
diff --git a/app/views/materialien/files/add_dokument.php b/app/views/materialien/files/add_dokument.php
index 3b706e9..a940e95 100644
--- a/app/views/materialien/files/add_dokument.php
+++ b/app/views/materialien/files/add_dokument.php
@@ -47,7 +47,18 @@
                                 <span class="icon"></span>
                                 <span class="name"></span>
                                 <span class="size"></span>
-                                <a class="remove_attachment"><?= Icon::create('trash')->asImg(['class' => 'text-bottom']) ?></a>
+                                <button class="refresh_attachment as-link" data-language="<?= htmlReady($key) ?>">
+                                    <?= Icon::create('refresh')->asImg([
+                                        'class' => 'text-bottom',
+                                        'title' => _('Datei aktualisieren'),
+                                    ]) ?>
+                                </button>
+                                <button class="remove_attachment as-link">
+                                    <?= Icon::create('trash')->asImg([
+                                        'class' => 'text-bottom',
+                                        'title' => _('Datei löschen'),
+                                    ]) ?>
+                                </button>
                             </li>
                         </ul>
                         <div id="statusbar_container">
@@ -79,7 +90,18 @@
                             <span class="icon"><?= Icon::create('file', Icon::ROLE_INFO, ['class' => 'text-bottom']); ?></span>
                             <span class="name"><?= htmlReady($documents[$key]->filename) ?></span>
                             <span class="size"></span>
-                            <a class="remove_attachment"><?= Icon::create('trash', 'clickable')->asImg(['class' => "text-bottom"]) ?></a>
+                            <button class="refresh_attachment as-link" data-language="<?= htmlReady($key) ?>">
+                                <?= Icon::create('refresh')->asImg([
+                                    'class' => 'text-bottom',
+                                    'title' => _('Datei aktualisieren'),
+                                ]) ?>
+                            </button>
+                            <button class="remove_attachment as-link">
+                                <?= Icon::create('trash')->asImg([
+                                    'class' => 'text-bottom',
+                                    'title' => _('Datei löschen'),
+                                ]) ?>
+                            </button>
                         </li>
                     <? endif; ?>
                     </ul>
diff --git a/lib/filesystem/MVVFolder.php b/lib/filesystem/MVVFolder.php
index c5373b9..2d153dc 100644
--- a/lib/filesystem/MVVFolder.php
+++ b/lib/filesystem/MVVFolder.php
@@ -82,7 +82,7 @@ class MVVFolder extends StandardFolder
         if ($folder) {
             $topfolder = $folder->getTypedFolder();
         }
-        return $topfolder ?: null;
+        return $topfolder ?? null;
     }
 
     /**
diff --git a/lib/filesystem/StandardFolder.php b/lib/filesystem/StandardFolder.php
index bbbb1fc..c387bb9 100644
--- a/lib/filesystem/StandardFolder.php
+++ b/lib/filesystem/StandardFolder.php
@@ -224,14 +224,13 @@ class StandardFolder implements FolderType
     }
 
     /**
-     * @param FileType $newfile
-     * @param string $user_id
+     * @param string   $user_id
      * @return string
      */
-    public function validateUpload(FileType $newfile, $user_id)
+    public function validateUpload(FileType $file, $user_id)
     {
         $upload_type = FileManager::getUploadTypeConfig($this->range_id, $user_id);
-        return $this->getValidationMessages($upload_type, $newfile);
+        return $this->getValidationMessages($upload_type, $file);
     }
 
     protected function getValidationMessages($upload_type, $newfile)
@@ -256,6 +255,8 @@ class StandardFolder implements FolderType
         if (in_array($ext, $types) && $upload_type['type'] === 'allow') {
             return sprintf(_('Sie dürfen den Dateityp %s nicht hochladen!'), $ext);
         }
+
+        return null;
     }
 
     /**
diff --git a/resources/assets/javascripts/mvv.js b/resources/assets/javascripts/mvv.js
index a339624..92dcd68 100644
--- a/resources/assets/javascripts/mvv.js
+++ b/resources/assets/javascripts/mvv.js
@@ -67,10 +67,17 @@ jQuery(function ($) {
     });
 
     $(document).on('click', '.stgfile .remove_attachment', function($event) {
-        STUDIP.MVV.Document.remove_attachment($(this));
+        STUDIP.Dialog.confirm($gettext('Soll die Datei wirklich gelöscht werden?')).done(() => {
+            STUDIP.MVV.Document.remove_attachment(this);
+        });
         return false;
     });
 
+    $(document).on('click', '.stgfile .refresh_attachment', (event) => {
+        STUDIP.MVV.Document.refresh_attachment(event.target);
+        event.preventDefault();
+    });
+
     STUDIP.dialogReady(
         function() {
 
@@ -663,27 +670,55 @@ STUDIP.MVV.Document = {
             })
         }, 100);
     },
-    remove_attachment: function(item) {
-        jQuery.ajax({
-            url: STUDIP.ABSOLUTE_URI_STUDIP + 'dispatch.php/materialien/files/delete_attachment',
-            data: {
-                mvvfile_id: jQuery('#mvvfile_id').val(),
-                fileref_id: item.closest('li')
-                                .find('input[name=document_id]')
-                                .val()
-            },
-            type: 'POST'
+    refresh_attachment(item) {
+        const language = item.closest('button').dataset.language;
+        const document_id = item.closest('.stgfile').querySelector('[name="document_id"]').value;
+
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.hidden = true;
+
+        input.addEventListener('cancel', () => {
+            input.remove();
         });
-        item.parents('td').find('.attachments').toggle();
-        item.closest('li')
-            .fadeOut(300, function() {
-                jQuery(this).remove();
+        input.addEventListener('change', () => {
+            const fd = new FormData();
+            fd.append('file', input.files[0], input.files[0].name);
+            fd.append('mvvfile_id', jQuery('#mvvfile_id').val());
+            fd.append('range_id', jQuery('#range_id').val());
+            fd.append('document_id', document_id);
+            fd.append('file_language', language);
+
+            const statusbar = $('#statusbar_container .statusbar')
+                .first()
+                .clone()
+                .show();
+            statusbar.appendTo('#statusbar_container');
+
+            STUDIP.MVV.Document.upload_file(fd, statusbar, true).then(() => {
+                input.remove();
+            });
+        });
+
+        item.parentNode.after(input);
+        input.click();
+    },
+    remove_attachment(item) {
+        const url = STUDIP.URLHelper.getURL('dispatch.php/materialien/files/delete_attachment', {
+            mvvfile_id: document.getElementById('mvvfile_id').value,
+            fileref_id: item.closest('li').querySelector('input[name=document_id]').value,
+        });
+        $.post(url).done(() => {
+            $(item).closest('td').find('.attachments').toggle();
+            $(item).closest('li').fadeOut(300, function () {
+                this.remove();
                 jQuery('#upload_chooser').show();
             });
+        });
     },
-    upload_from_input: function(input, file_language) {
+    upload_from_input(input, file_language) {
         STUDIP.MVV.Document.upload_files(input.files, file_language);
-        jQuery(input).val('');
+        input.value = '';
     },
     fileIDQueue: 1,
     upload_files: function(files, file_language) {
@@ -701,82 +736,94 @@ STUDIP.MVV.Document = {
             STUDIP.MVV.Document.upload_file(fd, statusbar);
         }
     },
-    upload_file: function(formdata, statusbar) {
-        $.ajax({
-            xhr: function() {
-                var xhrobj = $.ajaxSettings.xhr();
-                if (xhrobj.upload) {
-                    xhrobj.upload.addEventListener(
-                        'progress',
-                        function(event) {
-                            var percent = 0;
-                            var position = event.loaded || event.position;
-                            var total = event.total;
-                            if (event.lengthComputable) {
-                                percent = Math.ceil((position / total) * 100);
-                            }
-                            //Set progress
-                            statusbar.find('.progress').css({ 'min-width': percent + '%', 'max-width': percent + '%' });
-                            statusbar
-                                .find('.progresstext')
-                                .text(percent === 100 ? jQuery('#upload_finished').text() : percent + '%');
-                        },
-                        false
-                    );
+    upload_file(formdata, statusbar, update = false) {
+        return new Promise((resolve, reject) => {
+            $.ajax({
+                xhr() {
+                    var xhrobj = $.ajaxSettings.xhr();
+                    if (xhrobj.upload) {
+                        xhrobj.upload.addEventListener(
+                            'progress',
+                            function(event) {
+                                var percent = 0;
+                                var position = event.loaded || event.position;
+                                var total = event.total;
+                                if (event.lengthComputable) {
+                                    percent = Math.ceil((position / total) * 100);
+                                }
+                                //Set progress
+                                statusbar.find('.progress').css({ 'min-width': percent + '%', 'max-width': percent + '%' });
+                                statusbar
+                                    .find('.progresstext')
+                                    .text(percent === 100 ? jQuery('#upload_finished').text() : percent + '%');
+                            },
+                            false
+                        );
+                    }
+                    return xhrobj;
+                },
+                url: STUDIP.ABSOLUTE_URI_STUDIP + 'dispatch.php/materialien/files/upload_attachment',
+                type: 'POST',
+                contentType: false,
+                processData: false,
+                cache: false,
+                data: formdata,
+                dataType: 'json'
+            }).done((data) => {
+                const language = formdata.get('file_language');
+
+                statusbar.find('.progress').css({ 'min-width': '100%', 'max-width': '100%' });
+                var file = jQuery('#fileselector_'+formdata.get('file_language')).find('.stgfiles > .stgfile')
+                    .first()
+                    .clone();
+                file.find('.name').text(data.name);
+                if (data.size < 1024) {
+                    file.find('.size').text(data.size + 'B');
                 }
-                return xhrobj;
-            },
-            url: STUDIP.ABSOLUTE_URI_STUDIP + 'dispatch.php/materialien/files/upload_attachment',
-            type: 'POST',
-            contentType: false,
-            processData: false,
-            cache: false,
-            data: formdata,
-            dataType: 'json'
-        })
-        .done(function(data) {
-            statusbar.find('.progress').css({ 'min-width': '100%', 'max-width': '100%' });
-            var file = jQuery('#fileselector_'+formdata.get('file_language')).find('.stgfiles > .stgfile')
-                .first()
-                .clone();
-            file.find('.name').text(data.name);
-            if (data.size < 1024) {
-                file.find('.size').text(data.size + 'B');
-            }
-            if (data.size > 1024 && data.size < 1024 * 1024) {
-                file.find('.size').text(Math.floor(data.size / 1024) + 'KB');
-            }
-            if (data.size > 1024 * 1024 && data.size < 1024 * 1024 * 1024) {
-                file.find('.size').text(Math.floor(data.size / 1024 / 1024) + 'MB');
-            }
-            if (data.size > 1024 * 1024 * 1024) {
-                file.find('.size').text(Math.floor(data.size / 1024 / 1024 / 1024) + 'GB');
-            }
-            file.find('.icon').html(data.icon);
-            file.find('input[name=document_id]').attr('value', data.document_id);
-            jQuery('#fileviewer_'+formdata.get('file_language')).find('.stgfiles').append(file);
-            jQuery('#fileselector_'+formdata.get('file_language')).toggle();
-            jQuery('#fileselector_'+formdata.get('file_language')).parents('.attachments').toggle();
-            jQuery('#fileselector_'+formdata.get('file_language')).parents('.attachments').find('span').toggle();
-            file.fadeIn(300);
-            statusbar.find('.progresstext').text(jQuery('#upload_received_data').text());
-            statusbar.delay(1000).fadeOut(300, function() {
-                jQuery('#upload_chooser').hide();
-                jQuery(this).remove();
-            });
-        })
-        .fail(function(jqxhr, status, errorThrown) {
-            var error = jqxhr.responseJSON.error;
-
-            statusbar
-                .find('.progress')
-                .addClass('progress-error')
-                .attr('title', error);
-            statusbar.find('.progresstext').html(error);
-            statusbar.on('click', function() {
-                jQuery(this).fadeOut(300, function() {
-                    jQuery(this).remove();
+                if (data.size > 1024 && data.size < 1024 * 1024) {
+                    file.find('.size').text(Math.floor(data.size / 1024) + 'KB');
+                }
+                if (data.size > 1024 * 1024 && data.size < 1024 * 1024 * 1024) {
+                    file.find('.size').text(Math.floor(data.size / 1024 / 1024) + 'MB');
+                }
+                if (data.size > 1024 * 1024 * 1024) {
+                    file.find('.size').text(Math.floor(data.size / 1024 / 1024 / 1024) + 'GB');
+                }
+                file.find('.icon').html(data.icon);
+                file.find('input[name=document_id]').attr('value', data.document_id);
+                if (update) {
+                    $(`#fileviewer_${language} .stgfiles`).empty().append(file);
+                    file.show();
+                } else {
+                    $(`#fileviewer_${language}`).find('.stgfiles').append(file);
+                    $(`#fileselector_${language}`)
+                        .toggle()
+                        .parents('.attachments').toggle()
+                        .find('span').toggle();
+                    file.fadeIn(300);
+                }
+                statusbar.find('.progresstext').text(jQuery('#upload_received_data').text());
+                statusbar.delay(1000).fadeOut(300, function() {
+                    $('#upload_chooser').hide();
+                    this.remove();
                 });
+
+                resolve();
+            }).fail(function(jqxhr, status, errorThrown) {
+                var error = jqxhr.responseJSON.error;
+
+                statusbar
+                    .find('.progress')
+                    .addClass('progress-error')
+                    .attr('title', error);
+                statusbar.find('.progresstext').html(error);
+                statusbar.on('click', function() {
+                    jQuery(this).fadeOut(300, function() {
+                        jQuery(this).remove();
+                    });
+                });
+
+                reject(new Error(error));
             });
         });
     }
-- 
cgit v1.0


From cac4551262c87b71cb0d1b0767fd5c35731af9a3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 11 Jun 2024 20:32:43 +0000
Subject: convert consultation creator to vue and fix several problems, fixes
 #3349

Closes #3349, #1872, #1871, and #3350

Merge request studip/studip!3039
---
 app/controllers/consultation/admin.php             |  11 +-
 .../consultation/consultation_controller.php       |  11 +-
 app/controllers/consultation/overview.php          |   2 +
 app/views/consultation/admin/create.php            | 264 +----------
 app/views/consultation/admin/edit.php              |  10 +-
 app/views/consultation/admin/index.php             |   2 +-
 app/views/consultation/admin/ungrouped.php         |   2 +-
 app/views/consultation/overview/ungrouped.php      |  11 +
 ....0.7_add_consecutive_flag_for_consultations.php |  45 ++
 lib/classes/JsonApi/RouteMap.php                   |   4 +
 .../Routes/Consultations/SlotCreationCount.php     | 105 +++++
 lib/models/ConsultationBlock.php                   |  11 +-
 lib/models/ConsultationSlot.php                    |  45 +-
 resources/assets/javascripts/bootstrap/vue.js      |  12 +-
 .../javascripts/lib/RestrictedDatesHelper.ts       |  89 ++++
 resources/assets/javascripts/studip-ui.js          |  84 +---
 resources/assets/stylesheets/scss/forms.scss       |  22 +
 resources/vue/components/ConsultationCreator.vue   | 496 +++++++++++++++++++++
 resources/vue/components/Datepicker.vue            | 146 ++++--
 resources/vue/components/StudipTooltipIcon.vue     |   3 +
 resources/vue/components/Timepicker.vue            |  37 ++
 21 files changed, 1023 insertions(+), 389 deletions(-)
 create mode 100644 db/migrations/6.0.7_add_consecutive_flag_for_consultations.php
 create mode 100644 lib/classes/JsonApi/Routes/Consultations/SlotCreationCount.php
 create mode 100644 resources/assets/javascripts/lib/RestrictedDatesHelper.ts
 create mode 100644 resources/vue/components/ConsultationCreator.vue
 create mode 100644 resources/vue/components/Timepicker.vue

diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php
index bc63a1a..8ee7575 100644
--- a/app/controllers/consultation/admin.php
+++ b/app/controllers/consultation/admin.php
@@ -138,6 +138,7 @@ class Consultation_AdminController extends ConsultationController
 
         $this->room = '';
         $this->responsible = false;
+        $this->slot_count_threshold = self::SLOT_COUNT_THRESHOLD;
 
         // TODO: inst_default?
         if ($this->range instanceof User) {
@@ -155,6 +156,8 @@ class Consultation_AdminController extends ConsultationController
             $block->range = $this->range;
             $this->responsible = $block->getPossibleResponsibilites();
         }
+
+        $this->response->add_header('X-No-Buttons', '');
     }
 
     public function store_action()
@@ -186,7 +189,7 @@ class Consultation_AdminController extends ConsultationController
                 $end,
                 Request::int('day-of-week'),
                 Request::int('interval'),
-                Request::int('duration'),
+                $duration,
                 $pause_time,
                 $pause_duration
             );
@@ -214,6 +217,7 @@ class Consultation_AdminController extends ConsultationController
                 $block->note              = Request::get('note');
                 $block->size              = Request::int('size', 1);
                 $block->lock_time         = Request::int('lock_time');
+                $block->consecutive       = Request::bool('consecutive', false);
 
                 $slots = $block->createSlots(Request::int('duration'), $pause_time, $pause_duration);
                 if (count($slots) === 0) {
@@ -403,6 +407,7 @@ class Consultation_AdminController extends ConsultationController
         $this->block->mail_to_tutors = Request::bool('mail-to-tutors', false);
         $this->block->confirmation_text = trim(Request::get('confirmation-text'));
         $this->block->lock_time = Request::int('lock_time');
+        $this->block->consecutive = Request::bool('consecutive', false);
 
         foreach ($this->block->slots as $slot) {
             $slot->note = '';
@@ -535,7 +540,7 @@ class Consultation_AdminController extends ConsultationController
     public function toggle_action($what, $state, $expired = false)
     {
         if ($what === 'messages') {
-            // TODO: Applicable     everywhere?
+            // TODO: Applicable everywhere?
             $this->getUserConfig()->store(
                 'CONSULTATION_SEND_MESSAGES',
                 (bool) $state
@@ -808,7 +813,7 @@ class Consultation_AdminController extends ConsultationController
             _('Terminblöcke anlegen'),
             $this->createURL(),
             Icon::create('add')
-        )->asDialog('size=auto');
+        )->asDialog('size=big');
         $actions->addLink(
             _('Namen des Reiters ändern'),
             $this->tabURL($action === 'expired'),
diff --git a/app/controllers/consultation/consultation_controller.php b/app/controllers/consultation/consultation_controller.php
index d6927af..00e10ad 100644
--- a/app/controllers/consultation/consultation_controller.php
+++ b/app/controllers/consultation/consultation_controller.php
@@ -19,7 +19,7 @@ abstract class ConsultationController extends AuthenticatedController
             $this->range = Context::get();
             $type = 'object';
         } else {
-            $this->range = $GLOBALS['user']->getAuthenticatedUser();
+            $this->range = User::findCurrent();
         }
 
         if (!$this->range) {
@@ -60,7 +60,7 @@ abstract class ConsultationController extends AuthenticatedController
         $this->render_template('consultation/not_found', $this->layout);
     }
 
-    protected function activateNavigation($path)
+    protected function activateNavigation($path): void
     {
         $path = ltrim($path, '/');
 
@@ -73,7 +73,7 @@ abstract class ConsultationController extends AuthenticatedController
         }
     }
 
-    protected function getConsultationTitle()
+    protected function getConsultationTitle(): string
     {
         return $this->range->getConfiguration()->CONSULTATION_TAB_TITLE;
     }
@@ -103,7 +103,8 @@ abstract class ConsultationController extends AuthenticatedController
         return $block;
     }
 
-    protected function loadSlot($block_id, $slot_id)
+
+    protected function loadSlot($block_id, $slot_id): ConsultationSlot
     {
         $block = $this->loadBlock($block_id);
         $slot  = $block->slots->find($slot_id);
@@ -115,7 +116,7 @@ abstract class ConsultationController extends AuthenticatedController
         return $slot;
     }
 
-    protected function loadBooking($block_id, $slot_id, $booking_id)
+    protected function loadBooking($block_id, $slot_id, $booking_id): ConsultationBooking
     {
         $slot    = $this->loadSlot($block_id, $slot_id);
         $booking = $slot->bookings->find($booking_id);
diff --git a/app/controllers/consultation/overview.php b/app/controllers/consultation/overview.php
index ce6cd31..2afb710 100644
--- a/app/controllers/consultation/overview.php
+++ b/app/controllers/consultation/overview.php
@@ -71,6 +71,8 @@ class Consultation_OverviewController extends ConsultationController
 
             if ($this->slot->isOccupied()) {
                 PageLayout::postError(_('Dieser Termin ist bereits belegt.'));
+            } elseif (!$this->slot->isBookable()) {
+                PageLayout::postError(_('Dieser Termin ist für Buchungen gesperrt.'));
             } else {
                 $booking = new ConsultationBooking();
                 $booking->slot_id = $this->slot->id;
diff --git a/app/views/consultation/admin/create.php b/app/views/consultation/admin/create.php
index 3da70e0..34385b5 100644
--- a/app/views/consultation/admin/create.php
+++ b/app/views/consultation/admin/create.php
@@ -5,248 +5,32 @@
  * @var string|null $room
  * @var array $responsible
  * @var Range $range
+ * @var int $slot_count_threshold
  */
 
-$days_of_the_week = [
-    _('Montag')     => 1,
-    _('Dienstag')   => 2,
-    _('Mittwoch')   => 3,
-    _('Donnerstag') => 4,
-    _('Freitag')    => 5,
-    _('Samstag')    => 6,
-    _('Sonntag')    => 0
-];
-$intervals = [
-    _('wöchentlich')     => 1,
-    _('zweiwöchentlich') => 2,
-    _('dreiwöchentlich') => 3,
-    _('monatlich')       => 4,
-];
-?>
-
-<form action="<?= $controller->store() ?>" method="post" class="default" data-dialog>
-    <?= CSRFProtection::tokenTag() ?>
-
-<? if ($flash['confirm-many']): ?>
-    <?= MessageBox::info(
-        _('Sie erstellen eine sehr große Anzahl an Terminen.') . ' ' .
-        _('Bitte bestätigen Sie diese Aktion.'),
-        [
-            '<label><input type="checkbox" name="confirmed" value="1">' .
-            sprintf(
-                _('Ja, ich möchte wirklich %s Termine erstellen.'),
-                number_format($flash['confirm-many'], 0, ',', '.')
-            ) .
-            '</label>'
-        ]
-    )->hideClose() ?>
-<? endif; ?>
-
-    <fieldset>
-        <legend>
-            <?= _('Ort und Zeit') ?>
-        </legend>
-
-        <label>
-            <span class="required"><?= _('Ort') ?></span>
-
-            <input required type="text" name="room"
-                   value="<?= htmlReady(Request::get('room', $room)) ?>"
-                   placeholder="<?= _('Ort') ?>">
-        </label>
-
-        <label class="col-3">
-            <span class="required"><?= _('Beginn') ?></span>
-
-            <input required type="text" name="start-date" id="start-date"
-                   value="<?= htmlReady(Request::get('start-date', strftime('%d.%m.%Y', strtotime('+7 days'))))  ?>"
-                   placeholder="<?= _('tt.mm.jjjj') ?>"
-                   data-date-picker='{">=":"today","disable_holidays": true}'>
-        </label>
-
-        <label class="col-3">
-            <span class="required"><?= _('Ende') ?></span>
-
-            <input required type="text" name="end-date" id="end-date"
-                   value="<?= htmlReady(Request::get('end-date', strftime('%d.%m.%Y', strtotime('+4 weeks'))))  ?>"
-                   placeholder="<?= _('tt.mm.jjjj') ?>"
-                   data-date-picker='{">=":"#start-date","disable_holidays": true}'>
-        </label>
-
-        <label class="col-3">
-            <span class="required"><?= _('Am Wochentag') ?></span>
-
-            <select required name="day-of-week">
-            <? foreach ($days_of_the_week as $day => $value): ?>
-                <option value="<?= $value ?>" <? if (Request::get('day-of-week', strftime('%w')) == $value) echo 'selected'; ?>>
-                    <?= htmlReady($day) ?>
-                </option>
-            <? endforeach; ?>
-            </select>
-        </label>
-
-        <label class="col-3">
-            <span class="required"><?= _('Intervall') ?></span>
-            <select required name="interval">
-            <? foreach ($intervals as $interval => $value): ?>
-                <option value="<?= $value ?>" <? if (Request::int('interval') == $value) echo 'selected'; ?>>
-                    <?= htmlReady($interval) ?>
-                </option>
-            <? endforeach; ?>
-            </select>
-        </label>
-
-        <label for="start-time" class="col-3">
-            <span class="required"><?= _('Von') ?></span>
-
-            <input required type="text" name="start-time" id="start-time"
-                   value="<?= htmlReady(Request::get('start-time', '08:00')) ?>"
-                   placeholder="<?= _('HH:mm') ?>"
-                   data-time-picker='{"<":"#end-time"}'>
-        </label>
-
-        <label for="ende_hour" class="col-3">
-            <span class="required"><?= _('Bis') ?></span>
-
-            <input required type="text" name="end-time" id="end-time"
-                   value="<?= htmlReady(Request::get('end-time', '09:00')) ?>"
-                   placeholder="<?= _('HH:mm') ?>"
-                   data-time-picker='{">":"#start-time"}'>
-        </label>
-
-        <label class="col-3">
-            <span class="required"><?= _('Dauer eines Termins in Minuten') ?></span>
-            <input required type="text" name="duration"
-                   value="<?= htmlReady(Request::int('duration', 15)) ?>"
-                   maxlength="3" pattern="^\d+$">
-        </label>
+$convertResponsibilities = function ($input) {
+    if ($input === false) {
+        return json_encode(false);
+    }
 
-        <label class="col-3">
-            <?= _('Maximale Teilnehmerzahl') ?>
-            <?= tooltipIcon(_('Falls Sie mehrere Personen zulassen wollen (wie z.B. zu einer Klausureinsicht), so geben Sie hier die maximale Anzahl an Personen an, die sich anmelden dürfen.')) ?>
-            <input required type="text" name="size" id="size"
-                   min="1" max="50" value="<?= Request::int('size', 1) ?>">
-        </label>
+    foreach ($input as $key => $values) {
+        $input[$key] = array_map(
+            fn($item) => ['id' => $item->id, 'label' => $item instanceof Statusgruppen ? $item->getName() : $item->getFullName()],
+            $values
+        );
+    }
 
-        <label>
-            <input type="checkbox" name="pause" value="1"
-                   data-shows=".pause-inputs" data-activates=".pause-inputs input"
-                    <? if (Request::bool('pause')) echo 'checked'; ?>>
-            <?= _('Pausen zwischen den Terminen einfügen?') ?>
-        </label>
+    return json_encode($input);
+}
 
-        <label class="col-3 pause-inputs">
-            <?= _('Eine Pause nach wie vielen Minuten einfügen?') ?>
-            <input type="number" name="pause_time"
-                   value="<?= htmlReady(Request::int('pause_time', 45)) ?>"
-                   min="1">
-        </label>
-
-        <label class="col-3 pause-inputs">
-            <?= _('Dauer der Pause in Minuten') ?>
-            <input type="number" name="pause_duration"
-                   value="<?= Request::int('pause_duration', 15) ?>"
-                   min="1">
-        </label>
-
-        <label>
-            <input type="checkbox" name="lock" value="1" data-shows=".lock-inputs" data-activates=".lock-inputs input">
-            <?= _('Termine für Buchungen sperren?') ?>
-        </label>
-
-        <label class="lock-inputs">
-            <?= _('Wieviele Stunden vor Beginn des Blocks sollen die Termine für Buchungen gesperrt werden?') ?>
-            <input type="number" name="lock_time"
-                   value="<?= htmlReady(Request::int('lock_time', 24)) ?>"
-                   min="1">
-        </label>
-    </fieldset>
-
-<? if ($responsible): ?>
-    <fieldset>
-        <legend><?= _('Durchführende Personen, Gruppen oder Einrichtungen') ?></legend>
-
-    <? if ($range instanceof Institute): ?>
-        <p>
-            <?= _('Bei Einrichtungen muss mindestens eine durchführende Person, Gruppe oder Einrichtung zugewiesen '
-                . 'werden.') ?>
-        </p>
-        <p>
-            <?= _('Bitte beachten Sie, dass bei Zuweisungen von Statusgruppen alle Personen der Gruppe mit dem Status '
-                . '"tutor" und "dozent" als durchführende Personen zugewiesen werden und über alle Buchungen '
-                . 'informiert werden.') ?>
-            <?= _('Gleiches gilt für eine zugewiesene Einrichtung. Bitte achten Sie darauf, dass Sie Ihre hier '
-                . ' getroffene Auswahl in Absprache tätigen.') ?>
-        </p>
-    <? endif; ?>
-
-        <?= $this->render_partial('consultation/admin/block-responsibilities.php', compact('responsible')) ?>
-    </fieldset>
-<? endif; ?>
-
-    <fieldset>
-        <legend><?= _('Weitere Einstellungen') ?></legend>
-
-        <label>
-            <?= _('Information zu den Terminen in diesem Block') ?>
-            <textarea name="note"><?= htmlReady(Request::get('note')) ?></textarea>
-        </label>
-
-        <label>
-            <input type="checkbox" name="calender-events" value="1"
-                    <? if (Request::bool('calender-events')) echo 'checked'; ?>>
-            <?= _('Die freien Termine auch im Kalender markieren') ?>
-        </label>
-
-    <? if ($range instanceof Course): ?>
-        <label>
-            <input type="checkbox" name="mail-to-tutors" value="1" checked>
-            <?= _('Tutor/innen beim Versand von Buchungsbenachrichtigungen berücksichtigen?') ?>
-        </label>
-    <? endif; ?>
-
-        <label>
-            <input type="checkbox" name="show-participants" value="1"
-                    <? if (Request::bool('show-participants')) echo 'checked'; ?>>
-            <?= _('Namen der buchenden Personen sind öffentlich sichtbar') ?>
-        </label>
-
-        <label>
-            <?= _('Grund der Buchung abfragen') ?>
-        </label>
-        <div class="hgroup">
-            <label>
-                <input type="radio" name="require-reason" value="yes"
-                       <? if (Request::get('require-reason') === 'yes') echo 'checked'; ?>>
-                <?= _('Ja, zwingend erforderlich') ?>
-            </label>
-
-            <label>
-                <input type="radio" name="require-reason" value="optional"
-                       <? if (Request::get('require-reason', 'optional') === 'optional') echo 'checked'; ?>>
-                <?= _('Ja, optional') ?>
-            </label>
-
-            <label>
-                <input type="radio" name="require-reason" value="no"
-                       <? if (Request::get('require-reason') === 'no') echo 'checked'; ?>>
-                <?= _('Nein') ?>
-            </label>
-        </div>
-
-        <label>
-            <?= _('Bestätigung für folgenden Text einholen') ?>
-            (<?= _('optional') ?>)
-            <?= tooltipIcon(_('Wird hier ein Text eingegeben, so müssen Buchende bestätigen, dass sie diesen Text gelesen haben.')) ?>
-            <textarea name="confirmation-text"><?= htmlReady(Request::get('confirmation-text')) ?></textarea>
-        </label>
-    </fieldset>
-
-    <footer data-dialog-button>
-        <?= Studip\Button::createAccept(_('Termin speichern')) ?>
-        <?= Studip\LinkButton::createCancel(
-            _('Abbrechen'),
-            $controller->indexURL()
-        ) ?>
-    </footer>
-</form>
+?>
+<div data-vue-app="<?= htmlReady(json_encode(['components' => ['ConsultationCreator']])) ?>"
+     is="ConsultationCreator"
+     cancel-url="<?= $controller->indexURL() ?>"
+     store-url="<?= $controller->storeURL() ?>"
+     :with-responsible="<?= htmlReady($convertResponsibilities($responsible)) ?>"
+     range-type="<?= get_class($range) ?>"
+     default-room="<?= htmlReady($room) ?>"
+     :slot-count-threshold="<?= htmlReady($slot_count_threshold) ?>"
+     :as-dialog="<?= json_encode(Request::isXhr()) ?>"
+></div>
diff --git a/app/views/consultation/admin/edit.php b/app/views/consultation/admin/edit.php
index 347a05a..f9b416a 100644
--- a/app/views/consultation/admin/edit.php
+++ b/app/views/consultation/admin/edit.php
@@ -41,8 +41,8 @@
         </label>
 
         <? if ($responsible): ?>
-        <?= $this->render_partial('consultation/admin/block-responsibilities.php', compact('responsible', 'block')) ?>
-    <? endif; ?>
+            <?= $this->render_partial('consultation/admin/block-responsibilities.php', compact('responsible', 'block')) ?>
+        <? endif; ?>
 
         <label>
             <?= _('Maximale Teilnehmerzahl') ?>
@@ -72,6 +72,12 @@
         </label>
 
         <label>
+            <input type="checkbox" name="consecutive" value="1"
+                   <? if ($block->consecutive) echo 'checked'; ?>>
+            <?= _('Termine innerhalb dieses Blocks nur fortlaufend vergeben') ?>
+        </label>
+
+        <label>
             <?= _('Grund der Buchung abfragen') ?>
         </label>
         <div class="hgroup">
diff --git a/app/views/consultation/admin/index.php b/app/views/consultation/admin/index.php
index 52a352c..43cd5bf 100644
--- a/app/views/consultation/admin/index.php
+++ b/app/views/consultation/admin/index.php
@@ -13,7 +13,7 @@
 <?= MessageBox::info(sprintf(
     implode('<br>', [
         _('Derzeit sind keine Termine eingetragen.'),
-        '<a href="%s" class="button" data-dialog="size=auto">%s</a>',
+        '<a href="%s" class="button" data-dialog="size=big">%s</a>',
     ]),
     $controller->create(),
     _('Terminblöcke anlegen')
diff --git a/app/views/consultation/admin/ungrouped.php b/app/views/consultation/admin/ungrouped.php
index f21dc6a..1796e31 100644
--- a/app/views/consultation/admin/ungrouped.php
+++ b/app/views/consultation/admin/ungrouped.php
@@ -14,7 +14,7 @@
 <?= MessageBox::info(sprintf(
     implode('<br>', [
         _('Derzeit sind keine Termine eingetragen.'),
-        '<a href="%s" class="button" data-dialog="size=auto">%s</a>',
+        '<a href="%s" class="button" data-dialog="size=big">%s</a>',
     ]),
     $controller->create(),
     _('Terminblöcke anlegen')
diff --git a/app/views/consultation/overview/ungrouped.php b/app/views/consultation/overview/ungrouped.php
index b4d5c62..147f588 100644
--- a/app/views/consultation/overview/ungrouped.php
+++ b/app/views/consultation/overview/ungrouped.php
@@ -1,3 +1,14 @@
+<?php
+/**
+ * @var ConsultationBlock[] $blocks
+ * @var Consultation_OverviewController $controller
+ * @var int $count
+ * @var int $limit
+ * @var int $page
+ *
+ * @var callable $displayNote
+ */
+?>
 <? if (count($blocks) === 0): ?>
 
 <?= MessageBox::info(_('Aktuell werden keine Termine angeboten.'))->hideClose() ?>
diff --git a/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php b/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php
new file mode 100644
index 0000000..52b623d
--- /dev/null
+++ b/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php
@@ -0,0 +1,45 @@
+<?php
+return new class extends Migration
+{
+    public function description()
+    {
+        return 'Adds new flag "consecutive" to table "consultation_blocks" and stores previous slot information per slot';
+    }
+
+    protected function up()
+    {
+        $query = "ALTER TABLE `consultation_blocks`
+                  ADD COLUMN `consecutive` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `lock_time`";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `consultation_slots`
+                  ADD COLUMN `previous_slot_id` INT(11) UNSIGNED DEFAULT NULL AFTER `block_id`";
+        DBManager::get()->exec($query);
+
+        // THis will set the previous slot relation for all slots
+        $query = "UPDATE consultation_slots AS s0
+                  JOIN consultation_slots AS s1
+                    ON s1.slot_id = (
+                      SELECT slot_id
+                      FROM consultation_slots AS s2
+                      WHERE s2.block_id = s0.block_id
+                        AND s2.start_time < s0.start_time
+                        AND s2.slot_id != s0.slot_id
+                      ORDER BY s2.start_time DESC
+                      LIMIT 1
+                    )
+                  SET s0.previous_slot_id = s1.slot_id";
+        DBManager::get()->exec($query);
+    }
+
+    protected function down()
+    {
+        $query = "ALTER TABLE `consultation_slots`
+                  DROP COLUMN `previous_slot_id`";
+        DBManager::get()->exec($query);
+
+        $query = "ALTER TABLE `consultation_blocks`
+                  DROP COLUMN `consecutive`";
+        DBManager::get()->exec($query);
+    }
+};
diff --git a/lib/classes/JsonApi/RouteMap.php b/lib/classes/JsonApi/RouteMap.php
index 149f681..63c69e6 100644
--- a/lib/classes/JsonApi/RouteMap.php
+++ b/lib/classes/JsonApi/RouteMap.php
@@ -5,6 +5,7 @@ namespace JsonApi;
 use JsonApi\Contracts\JsonApiPlugin;
 use JsonApi\Middlewares\Authentication;
 use JsonApi\Middlewares\DangerousRouteHandler;
+use JsonApi\Routes\Consultations\SlotCreationCount;
 use JsonApi\Routes\Holidays\HolidaysShow;
 use Slim\Routing\RouteCollectorProxy;
 
@@ -220,6 +221,9 @@ class RouteMap
 
     private function addAuthenticatedConsultationRoutes(RouteCollectorProxy $group): void
     {
+        // TODO: I know, not very JSONAPI-like but it's a NonJsonApiController ¯\_(ツ)_/¯
+        $group->get('/consultation-slots/count', SlotCreationCount::class);
+
         $group->get('/{type:courses|institutes|users}/{id}/consultations', Routes\Consultations\BlocksByRangeIndex::class);
 
         $group->get('/consultation-blocks/{id}', Routes\Consultations\BlockShow::class);
diff --git a/lib/classes/JsonApi/Routes/Consultations/SlotCreationCount.php b/lib/classes/JsonApi/Routes/Consultations/SlotCreationCount.php
new file mode 100644
index 0000000..c378771
--- /dev/null
+++ b/lib/classes/JsonApi/Routes/Consultations/SlotCreationCount.php
@@ -0,0 +1,105 @@
+<?php
+namespace JsonApi\Routes\Consultations;
+
+use ConsultationBlock;
+use JsonApi\Errors\BadRequestException;
+use JsonApi\NonJsonApiController;
+use Neomerx\JsonApi\Exceptions\JsonApiException;
+use Neomerx\JsonApi\Schema\ErrorCollection;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+final class SlotCreationCount extends NonJsonApiController
+{
+    public function __invoke(Request $request, Response $response, array $args)
+    {
+        $parameters = $request->getQueryParams();
+
+        $this->validateParameters($parameters);
+
+        // Determine duration of a slot and pause times
+        $slot_count = ConsultationBlock::countSlots(
+            strtotime($parameters['start']),
+            strtotime($parameters['end']),
+            $parameters['dow'],
+            $parameters['interval'],
+            $parameters['duration'],
+            $parameters['pause_time'] ?? null,
+            $parameters['pause_duration'] ?? null
+        );
+
+        $response->getBody()->write((string) $slot_count);
+        return $response->withAddedHeader('Content-Type', 'application/json');
+    }
+
+    private function validateParameters(array $parameters): void
+    {
+        $collection = new ErrorCollection();
+
+        foreach (['start', 'end', 'dow', 'interval', 'duration'] as $key) {
+            if (!isset($parameters[$key])) {
+                $collection->addQueryParameterError($key, 'Parameter is missing');
+            }
+        }
+
+        if (isset($parameters['start'], $parameters['end'])) {
+            $start = strtotime($parameters['start']);
+            $end = strtotime($parameters['end']);
+
+            if (!$start) {
+                $collection->addQueryParameterError('start', 'Parameter has invalid datetime format');
+            }
+
+            if (!$end) {
+                $collection->addQueryParameterError('end', 'Parameter has invalid datetime format');
+            }
+
+            if ($start && $end && $start > $end) {
+                $collection->addQueryParameterError('start', 'Datetime value of start must be before end');
+            }
+        }
+
+        if (
+            isset($parameters['dow'])
+            && (
+                !ctype_digit($parameters['dow'])
+                || $parameters['dow'] < 0
+                || $parameters['dow'] > 6
+            )
+        ) {
+            $collection->addQueryParameterError('dow', 'Parameter must be a number between 0 and 6');
+        }
+
+        if (
+            isset($parameters['interval'])
+            && (
+                !ctype_digit($parameters['interval'])
+                || $parameters['interval'] < 0
+                || $parameters['interval'] > 4
+            )
+        ) {
+            $collection->addQueryParameterError('interval', 'Parameter must be a number between 0 and 4');
+        }
+
+        if (
+            isset($parameters['duration'])
+            && (
+                !ctype_digit($parameters['duration'])
+                || $parameters['duration'] <= 0
+            )
+        ) {
+            $collection->addQueryParameterError('duration', 'Parameter must be a positive number');
+        }
+
+        if (
+            isset($parameters['pause_time'], $parameters['duration'])
+            && $parameters['pause_time'] < $parameters['duration']
+        ) {
+            $collection->addQueryParameterError('pause_time', 'The defined time to a pause is shorter than the duration of a slot.');
+        }
+
+        if (count($collection) > 0) {
+            throw new JsonApiException($collection);
+        }
+    }
+}
diff --git a/lib/models/ConsultationBlock.php b/lib/models/ConsultationBlock.php
index 9113547..cde8f77 100644
--- a/lib/models/ConsultationBlock.php
+++ b/lib/models/ConsultationBlock.php
@@ -25,6 +25,7 @@
  * @property string $note database column
  * @property int $size database column
  * @property int|null $lock_time database column
+ * @property bool $consecutive database column
  * @property int $mkdate database column
  * @property int $chdate database column
  * @property SimpleORMapCollection|ConsultationSlot[] $slots has_many ConsultationSlot
@@ -211,6 +212,10 @@ class ConsultationBlock extends SimpleORMap implements PrivacyObject
                 );
             }
 
+            if (!$interval) {
+                break;
+            }
+
             $current = strtotime("+{$interval} weeks", $current);
         }
 
@@ -274,9 +279,9 @@ class ConsultationBlock extends SimpleORMap implements PrivacyObject
             }
 
             $slots[] = ConsultationSlot::build([
-                'block_id'   => $this->id,
-                'start_time' => $now,
-                'end_time'   => strtotime("+{$duration} minutes", $now),
+                'block_id'      => $this->id,
+                'start_time'    => $now,
+                'end_time'      => strtotime("+{$duration} minutes", $now),
             ]);
 
             $now = strtotime("+{$duration} minutes", $now);
diff --git a/lib/models/ConsultationSlot.php b/lib/models/ConsultationSlot.php
index 0da02df..c46e47c 100644
--- a/lib/models/ConsultationSlot.php
+++ b/lib/models/ConsultationSlot.php
@@ -9,6 +9,7 @@
  * @property int $id alias column for slot_id
  * @property int $slot_id database column
  * @property int $block_id database column
+ * @property int $previous_slot_id database column
  * @property int $start_time database column
  * @property int $end_time database column
  * @property string $note database column
@@ -17,6 +18,7 @@
  * @property SimpleORMapCollection|ConsultationBooking[] $bookings has_many ConsultationBooking
  * @property SimpleORMapCollection|ConsultationEvent[] $events has_many ConsultationEvent
  * @property ConsultationBlock $block belongs_to ConsultationBlock
+ * @property ConsultationSlot|null $previous_slot has_one ConsultationSlot
  * @property-read mixed $has_bookings additional field
  * @property-read mixed $is_expired additional field
  */
@@ -45,15 +47,36 @@ class ConsultationSlot extends SimpleORMap
             'assoc_foreign_key' => 'slot_id',
             'on_delete'         => 'delete',
         ];
+        $config['has_one']['previous_slot'] = [
+            'class_name'        => ConsultationSlot::class,
+            'foreign_key'       => 'previous_slot_id',
+        ];
 
         $config['registered_callbacks']['before_create'][] = function (ConsultationSlot $slot) {
             $slot->updateEvents();
         };
+        $config['registered_callbacks']['before_store'][] = function (ConsultationSlot $slot) {
+            $previous = static::findOneBySQL(
+                "block_id = ? AND start_time < ? ORDER BY start_time DESC",
+                [$slot->block_id, $slot->start_time]
+            );
+            $slot->previous_slot_id = $previous?->id;
+        };
         $config['registered_callbacks']['after_delete'][] = function ($slot) {
             $block = $slot->block;
             if ($block && count($block->slots) === 0) {
                 $block->delete();
             }
+
+            // Close gap
+            self::findEachBySQL(
+                function (ConsultationSlot $s) use ($slot) {
+                    $s->previous_slot_id = $slot->previous_slot_id;
+                    $s->store();
+                },
+                'previous_slot_id = ?',
+                [$slot->id]
+            );
         };
 
         $config['additional_fields']['has_bookings']['get'] = function ($slot): bool {
@@ -139,10 +162,6 @@ class ConsultationSlot extends SimpleORMap
 
     /**
      * Returns whether this slot is occupied (by a given user).
-     *
-     * @param  mixed $user_id Id of the user (optional)
-     * @return boolean indicating whether the slot is occupied (by the given
-     *                 user)
      */
     public function isOccupied($user_id = null)
     {
@@ -154,7 +173,6 @@ class ConsultationSlot extends SimpleORMap
     /**
      * Returns whether the slot is locked for bookings.
      *
-     * @return bool
      */
     public function isLocked(): bool
     {
@@ -163,6 +181,20 @@ class ConsultationSlot extends SimpleORMap
     }
 
     /**
+     * Returns whether the slot is bookable for the given user_id
+     */
+    public function isBookable(?string $user_id = null): bool
+    {
+        return !$this->isOccupied($user_id)
+            && !$this->isLocked()
+            && !(
+                $this->block->consecutive
+                && $this->previous_slot
+                && !$this->previous_slot->isOccupied()
+            );
+    }
+
+    /**
      * Creates a Stud.IP calendar event relating to the slot.
      *
      * @param  User $user User object to create the event for
@@ -306,8 +338,7 @@ class ConsultationSlot extends SimpleORMap
         $user = $user ?? User::findCurrent();
 
         return ConsultationBooking::userMayCreateBookingForRange($this->block->range, $user)
-            && !$this->isOccupied()
-            && !$this->isLocked();
+            && $this->isBookable($user->id);
     }
 
 
diff --git a/resources/assets/javascripts/bootstrap/vue.js b/resources/assets/javascripts/bootstrap/vue.js
index b8c938d..c6816a2 100644
--- a/resources/assets/javascripts/bootstrap/vue.js
+++ b/resources/assets/javascripts/bootstrap/vue.js
@@ -28,27 +28,17 @@ STUDIP.ready(() => {
         });
 
         STUDIP.Vue.load().then(async ({createApp, store}) => {
-            let vm;
             if (config.store) {
                 const storeConfig = await import(`../../../vue/store/${config.store}.js`);
-                console.log('store', storeConfig.default);
 
                 store.registerModule(config.id, storeConfig.default, {root: true});
 
                 Object.keys(data).forEach(command => {
                     store.commit(`${config.id}/${command}`, data[command]);
                 });
-                vm = createApp({components});
-            } else {
-                vm = createApp({data, components});
             }
-            // import myCoursesStore from '../stores/MyCoursesStore.js';
-            //
-            // myCoursesStore.namespaced = true;
-            //
-            // store.registerModule('my-courses', myCoursesStore);
 
-            vm.$mount(this);
+            createApp({components, data}).$mount(this);
         });
 
         $(this).attr('data-vue-app-created', '');
diff --git a/resources/assets/javascripts/lib/RestrictedDatesHelper.ts b/resources/assets/javascripts/lib/RestrictedDatesHelper.ts
new file mode 100644
index 0000000..bcc0af2
--- /dev/null
+++ b/resources/assets/javascripts/lib/RestrictedDatesHelper.ts
@@ -0,0 +1,89 @@
+import { jsonapi } from "./jsonapi";
+
+type RestrictedDate = {
+    year: Number,
+    month: Number,
+    day: Number,
+
+    reason: string | null,
+    lock: boolean
+}
+
+class RestrictedDatesHelper
+{
+    static #loadedYears : Number[] = [];
+    static #restrictedDates: RestrictedDate[] = [];
+
+    static isDateRestricted(date: Date, returnBoolean: Boolean = false): RestrictedDate | Boolean {
+        const restrictedDate : RestrictedDate | undefined = this.#restrictedDates.find(item => {
+            return item.year === date.getFullYear()
+                && item.month === date.getMonth() + 1
+                && item.day === date.getDate();
+        });
+
+        if (returnBoolean) {
+            return !!restrictedDate;
+        }
+
+        return restrictedDate ?? this.#convertDate(date, null, false);
+    }
+
+    static async loadRestrictedDatesByYear(year: Number): Promise<void> {
+        if (this.#loadedYears.includes(year)) {
+            return Promise.reject();
+        }
+
+        this.#loadedYears.push(year);
+
+        jsonapi.withPromises().request('holidays', {data: {
+            'filter[year]': year
+        }}).then((response: [] | Object) => {
+            // Since PHP will return an empty object as an array,
+            // we need to check
+            if (Array.isArray(response)) {
+                return;
+            }
+
+            for (const [date, data] of Object.entries(response)) {
+                this.#addRestrictedDate(
+                    new Date(date),
+                    data.holiday,
+                    data.mandatory
+                );
+            }
+        });
+    }
+
+    static #addRestrictedDate(date: Date, reason: string, lock: boolean = true): void {
+        const restricted = this.#convertDate(date, reason, lock);
+
+        this.#restrictedDates = this.#restrictedDates.filter(item => {
+            return item.year !== restricted.year
+                || item.month !== restricted.month
+                || item.day !== restricted.day;
+        });
+
+        this.#restrictedDates.push(restricted);
+    }
+
+    static removeRestrictedDate(date: Date): void {
+        this.#restrictedDates = this.#restrictedDates.filter(item => {
+            return item.year !== date.getFullYear()
+                || item.month !== date.getMonth() + 1
+                || item.day !== date.getDate();
+        });
+    }
+
+    static #convertDate(date: Date, reason: string | null, lock: boolean): RestrictedDate {
+        return {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate(),
+
+            reason,
+            lock
+        };
+    }
+}
+
+export default RestrictedDatesHelper;
diff --git a/resources/assets/javascripts/studip-ui.js b/resources/assets/javascripts/studip-ui.js
index e611150..f98ba94 100644
--- a/resources/assets/javascripts/studip-ui.js
+++ b/resources/assets/javascripts/studip-ui.js
@@ -1,5 +1,6 @@
 import { $gettext } from './lib/gettext';
 import eventBus from "./lib/event-bus.ts";
+import RestrictedDatesHelper from './lib/RestrictedDatesHelper';
 
 /**
  * This file contains extensions/adjustments for jQuery UI.
@@ -28,33 +29,11 @@ import eventBus from "./lib/event-bus.ts";
     }
 
     function disableHolidaysBeforeShow(date) {
-        const year = date.getFullYear();
-
-        if (STUDIP.UI.restrictedDates[year] === undefined) {
-            STUDIP.UI.restrictedDates[year] = {};
-
-            STUDIP.jsonapi.withPromises().get('holidays', {data: {
-                'filter[year]': year
-            }}).then(response => {
-                // Since PHP will return an empty object as an array,
-                // we need to check
-                if (Array.isArray(response)) {
-                    return;
-                }
-
-                for (const [date, data] of Object.entries(response)) {
-                    STUDIP.UI.addRestrictedDate(
-                        new Date(date),
-                        data.holiday,
-                        data.mandatory
-                    );
-                }
-
-                $(this).datepicker('refresh');
-            });
-        }
-
-        const {reason, lock} = STUDIP.UI.isDateRestricted(date, false);
+        RestrictedDatesHelper.loadRestrictedDatesByYear(date.getFullYear()).then(
+            () => $(this).datepicker('refresh'),
+            () => null
+        );
+        const {reason, lock} = RestrictedDatesHelper.isDateRestricted(date);
         return [!lock, lock ? 'ui-datepicker-is-locked' : null, reason];
     }
 
@@ -83,57 +62,8 @@ import eventBus from "./lib/event-bus.ts";
         return;
     }
 
+    STUDIP.UI = {};
     // Setup Stud.IP's own datepicker extensions
-    STUDIP.UI = Object.assign(STUDIP.UI || {}, {
-        restrictedDates: {},
-        addRestrictedDate(date, reason = '', lock = true) {
-            if (this.isDateRestricted(date)) {
-                return;
-            }
-
-            const [year, month, day] = this.convertDateForRestriction(date);
-            if (this.restrictedDates[year] === undefined) {
-                this.restrictedDates[year] = {};
-            }
-            if (this.restrictedDates[year][month] === undefined) {
-                this.restrictedDates[year][month] = {};
-            }
-
-            this.restrictedDates[year][month][day] = {reason, lock};
-        },
-        removeRestrictedDate(date) {
-            if (!this.isDateRestricted(date)) {
-                return false;
-            }
-            const [year, month, day] = this.convertDateForRestriction(date);
-
-            delete this.restrictedDates[year][month][day];
-
-            if (Object.keys(this.restrictedDates[year][month]).length === 0) {
-                delete this.restrictedDates[year][month];
-            }
-
-            return true;
-        },
-        isDateRestricted(date, return_bool = true) {
-            const [year, month, day] = this.convertDateForRestriction(date);
-            if (
-                this.restrictedDates[year] === undefined
-                || this.restrictedDates[year][month] === undefined
-                || this.restrictedDates[year][month][day] === undefined
-            ) {
-                return return_bool ? false : {
-                    reason: null,
-                    lock: false,
-                };
-            }
-
-            return return_bool ? true : this.restrictedDates[year][month][day];
-        },
-        convertDateForRestriction(date) {
-            return [date.getFullYear(), date.getMonth() + 1, date.getDate()];
-        }
-    });
     STUDIP.UI.Datepicker = {
         selector: '.has-date-picker,[data-date-picker]',
         // Initialize all datepickers that not yet been initialized (e.g. in dialogs)
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index c647ee8..888cf56 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -621,6 +621,28 @@ form.inline {
     }
 }
 
+.studip-dialog {
+    form[data-vue-app] {
+        display: flex;
+        flex-direction: column;
+        min-height: 100%;
+
+        fieldset {
+            flex: 0;
+        }
+
+        footer[data-dialog-button] {
+            background: var(--white);
+            border-top-color: var(--base-color-20);
+            bottom: -0.5em;
+            margin-top: auto;
+            padding: 1.3em 0;
+            position: sticky;
+            text-align: center;
+        }
+    }
+}
+
 @media (min-width: 800px) {
     form.default .form-columns {
         display: flex;
diff --git a/resources/vue/components/ConsultationCreator.vue b/resources/vue/components/ConsultationCreator.vue
new file mode 100644
index 0000000..375e98a
--- /dev/null
+++ b/resources/vue/components/ConsultationCreator.vue
@@ -0,0 +1,496 @@
+<template>
+    <form :action="storeUrl" method="post" class="default" :data-dialog="asDialog ? '' : null" @submit="validateInputs">
+        <input type="hidden" :name="csrf.name" :value="csrf.value">
+        <input v-for="id in responsibleGroups" type="hidden" name="responsibilities[statusgroup][]" :value="id" :key="`group-${id}`">
+        <input v-for="id in responsibleInstitutes" type="hidden" name="responsibilities[institute][]" :value="id" :key="`institute-${id}`">
+        <input v-for="id in responsibleUsers" type="hidden" name="responsibilities[user][]" :value="id" :key="`user-${id}`">
+
+        <StudipMessageBox type="info" v-if="errors.length > 0">
+            {{ $gettext('Folgende Angaben müssen korrigiert werden, um das Formular abschicken zu können:') }}
+
+            <template #details>
+                <ul>
+                    <li v-for="(error, index) in errors" :key="`error-${index}`">
+                        {{ error }}
+                    </li>
+                </ul>
+            </template>
+        </StudipMessageBox>
+
+        <fieldset>
+            <legend>{{ $gettext('Ort und Zeit') }}</legend>
+
+            <label>
+                <span class="required">{{ $gettext('Ort') }}</span>
+
+                <input required type="text" name="room"
+                       v-model="room"
+                       :placeholder="$gettext('Ort')">
+            </label>
+
+            <label :class="{'col-3': !isSingleDay}">
+                <span class="required">{{ $gettext('Intervall') }}</span>
+                <select required name="interval" v-model="interval">
+                    <option v-for="(label, value) in intervals" :key="value" :value="value">
+                        {{ label }}
+                    </option>
+                </select>
+            </label>
+
+            <label class="col-3" v-if="!isSingleDay">
+                <span class="required">{{ $gettext('Am Wochentag') }}</span>
+
+                <select required name="day-of-week" v-model="dayOfWeek">
+                    <option v-for="(label, value) in daysOfTheWeek" :value="value" :key="value">
+                        {{ label }}
+                    </option>
+                </select>
+            </label>
+
+            <label :class="{'col-3': !isSingleDay}">
+                <span class="required">{{ isSingleDay ? $gettext('Datum') : $gettext('Beginn') }}</span>
+
+                <Datepicker v-model="startDate"
+                            name="start-date"
+                            :disable-holidays="true"
+                            :placeholder="$gettext('tt.mm.jjjj')"
+                            mindate="today"
+                            :emit-date="true"
+                ></Datepicker>
+            </label>
+
+            <label class="col-3" v-if="!isSingleDay">
+                <span class="required">{{ $gettext('Ende') }}</span>
+
+                <Datepicker v-model="endDate"
+                            name="end-date"
+                            :disable-holidays="true"
+                            :placeholder="$gettext('tt.mm.jjjj')"
+                            :mindate="startDate"
+                            :emit-date="true"
+                ></Datepicker>
+            </label>
+
+            <label for="start-time" class="col-3">
+                <span class="required">{{ $gettext('Von') }}</span>
+
+                <Timepicker name="start-time"
+                            v-model="startTime"
+                            :maxtime="endTime"
+                ></Timepicker>
+            </label>
+
+            <label for="ende_hour" class="col-3">
+                <span class="required">{{ $gettext('Bis') }}</span>
+
+                <Timepicker name="end-time"
+                            v-model="endTime"
+                            :mintime="startTime"
+                ></Timepicker>
+            </label>
+
+            <label class="col-3">
+                <span class="required">{{ $gettext('Dauer eines Termins in Minuten') }}</span>
+                <input required type="number" name="duration" min="1"
+                       v-model="duration">
+            </label>
+
+            <label class="col-3">
+                {{ $gettext('Maximale Teilnehmerzahl') }}
+                <StudipTooltipIcon :text="$gettext('Falls Sie mehrere Personen zulassen wollen (wie z.B. zu einer Klausureinsicht), so geben Sie hier die maximale Anzahl an Personen an, die sich anmelden dürfen.')"></StudipTooltipIcon>
+                <input required type="text" name="size" id="size" min="1" max="50"
+                       v-model="size">
+            </label>
+
+            <label>
+                <input type="checkbox" name="pause" value="1"
+                       v-model="pause">
+                {{ $gettext('Pausen zwischen den Terminen einfügen?') }}
+            </label>
+
+            <label class="col-3" v-if="pause">
+                {{ $gettext('Eine Pause nach wie vielen Minuten einfügen?') }}
+                <input type="number" name="pause_time" min="1"
+                       v-model="pauseTime">
+            </label>
+
+            <label class="col-3" v-if="pause">
+                {{ $gettext('Dauer der Pause in Minuten') }}
+                <input type="number" name="pause_duration" min="1"
+                       v-model="pauseDuration">
+            </label>
+
+            <label>
+                <input type="checkbox" name="lock" value="1"
+                       v-model="lock">
+                {{ $gettext('Termine für Buchungen sperren?') }}
+            </label>
+
+            <label v-if="lock">
+                {{ $gettext('Wieviele Stunden vor Beginn des Blocks sollen die Termine für Buchungen gesperrt werden?') }}
+                <input type="number" name="lock_time" min="1"
+                       v-model="lockTime">
+            </label>
+
+            <label>
+                <input type="checkbox" name="consecutive" value="1"
+                       v-model="consecutive">
+                {{ $gettext('Termine innerhalb der Blöcke nur fortlaufend vergeben') }}
+            </label>
+
+            <slot name="extension-point-1"></slot>
+        </fieldset>
+
+        <fieldset v-if="withResponsible">
+            <legend>{{ $gettext('Durchführende Personen, Gruppen oder Einrichtungen') }}</legend>
+
+            <template v-if="isInstitute">
+                <p>
+                    {{ $gettext('Bei Einrichtungen muss mindestens eine durchführende Person, Gruppe oder Einrichtung zugewiesen werden.') }}
+                </p>
+                <p>
+                    {{ $gettext('Bitte beachten Sie, dass bei Zuweisungen von Statusgruppen alle Personen der Gruppe mit dem Status '
+                        + '"tutor" und "dozent" als durchführende Personen zugewiesen werden und über alle Buchungen '
+                        + 'informiert werden.') }}
+                    {{ $gettext('Gleiches gilt für eine zugewiesene Einrichtung. Bitte achten Sie darauf, dass Sie Ihre hier '
+                        + ' getroffene Auswahl in Absprache tätigen.') }}
+                </p>
+            </template>
+
+            <label v-if="withResponsible.users">
+                {{ $gettext('Durchführende Personen') }}
+                <StudipSelect v-model="responsibleUsers"
+                              :options="withResponsible.users"
+                              :reduce="option => option.id"
+                              multiple
+                              :clearable="true"
+                >
+                    <template #open-indicator>
+                        <span><studip-icon shape="arr_1down" :size="10" /></span>
+                    </template>
+                </StudipSelect>
+            </label>
+
+            <label v-if="withResponsible.groups">
+                {{ $gettext('Durchführende Gruppen') }}
+                <StudipSelect v-model="responsibleGroups"
+                              :options="withResponsible.groups"
+                              :reduce="option => option.id"
+                              multiple
+                              :clearable="true"
+                >
+                    <template #open-indicator>
+                        <span><studip-icon shape="arr_1down" :size="10" /></span>
+                    </template>
+                </StudipSelect>
+            </label>
+
+            <label v-if="withResponsible.institutes">
+                {{ $gettext('Durchführende Einrichtungen') }}
+                <StudipSelect v-model="responsibleInstitutes"
+                              :options="withResponsible.institutes"
+                              :reduce="option => option.id"
+                              multiple
+                              :clearable="true"
+                >
+                    <template #open-indicator>
+                        <span><studip-icon shape="arr_1down" :size="10" /></span>
+                    </template>
+                </StudipSelect>
+            </label>
+        </fieldset>
+
+        <fieldset>
+            <legend>{{ $gettext('Weitere Einstellungen') }}</legend>
+
+            <label>
+                {{ $gettext('Information zu den Terminen in diesem Block') }}
+                <textarea name="note" v-model="note"></textarea>
+            </label>
+
+            <label>
+                <input type="checkbox" name="calender-events" value="1"
+                       v-model="calendarEvents">
+                {{ $gettext('Die freien Termine auch im Kalender markieren') }}
+            </label>
+
+            <label v-if="isCourse">
+                <input type="checkbox" name="mail-to-tutors" value="1"
+                       v-model="mailToTutors">
+                {{ $gettext('Tutor/innen beim Versand von Buchungsbenachrichtigungen berücksichtigen?') }}
+            </label>
+
+            <label>
+                <input type="checkbox" name="show-participants" value="1"
+                       v-model="showParticipants">
+                {{ $gettext('Namen der buchenden Personen sind öffentlich sichtbar') }}
+            </label>
+
+            <label>{{ $gettext('Grund der Buchung abfragen') }}</label>
+            <div class="hgroup">
+                <label>
+                    <input type="radio" name="require-reason" value="yes"
+                           v-model="requireReason">
+                    {{ $gettext('Ja, zwingend erforderlich') }}
+                </label>
+
+                <label>
+                    <input type="radio" name="require-reason" value="optional"
+                           v-model="requireReason">
+                    {{ $gettext('Ja, optional') }}
+                </label>
+
+                <label>
+                    <input type="radio" name="require-reason" value="no"
+                           v-model="requireReason">
+                    {{ $gettext('Nein') }}
+                </label>
+            </div>
+
+            <label>
+                {{ $gettext('Bestätigung für folgenden Text einholen') }}
+                ({{ $gettext('optional') }})
+                <StudipTooltipIcon :text="$gettext('Wird hier ein Text eingegeben, so müssen Buchende bestätigen, dass sie diesen Text gelesen haben.')"></StudipTooltipIcon>
+                <textarea name="confirmation-text" v-model="confirmationText"></textarea>
+            </label>
+
+            <slot name="extension-point-2"></slot>
+        </fieldset>
+
+        <fieldset v-if="needsConfirmation">
+            <legend>{{ $gettext('Bestätigung der Erstellung vieler Termine') }}</legend>
+
+            <p>
+                {{ $gettext('Sie erstellen eine sehr große Anzahl an Terminen.') }}
+                {{ $gettext('Bitte bestätigen Sie diese Aktion.') }}
+            </p>
+
+            <label>
+                <input type="checkbox" v-model="confirmed">
+                {{ $gettextInterpolate(
+                    $gettext('Ja, ich möchte wirklich %{ n } Termine erstellen.'),
+                    { n: slotCount }
+                ) }}
+            </label>
+        </fieldset>
+
+        <footer data-dialog-button>
+            <button class="accept button" :disabled="!confirmed">
+                {{ $gettext('Termin speichern') }}
+            </button>
+            <a :href="cancelUrl" class="cancel button" @click="evt => closeCreator(evt)">
+                {{ $gettext('Abbrechen') }}
+            </a>
+        </footer>
+    </form>
+</template>
+<script>
+import StudipTooltipIcon from './StudipTooltipIcon.vue';
+import Datepicker from './Datepicker.vue';
+
+import moment from 'moment';
+import StudipSelect from './StudipSelect.vue';
+import Timepicker from './Timepicker.vue';
+
+export default {
+    name: 'ConsultationCreator',
+    components: {Datepicker, StudipSelect, StudipTooltipIcon, Timepicker},
+    props: {
+        asDialog: {
+            type: Boolean,
+            default: false,
+        },
+        cancelUrl: {
+            type: String,
+            required: true
+        },
+        defaultRoom: String,
+        rangeType: {
+            type: String,
+            required: true,
+        },
+        slotCountThreshold: {
+            type: Number,
+            required: true,
+        },
+        storeUrl: {
+            type: String,
+            required: true
+        },
+        withResponsible: {
+            type: [Boolean, Object],
+            default: false,
+        },
+    },
+    data() {
+        return {
+            calendarEvents: false,
+            confirmationText: '',
+            confirmed: false,
+            consecutive: false,
+            dayOfWeek: (new Date()).getDay(),
+            duration: 15,
+            endDate: moment().add(4, 'weeks').toDate(),
+            endTime: '09:00',
+            errors: [],
+            interval: 1,
+            lock: false,
+            lockTime: 24,
+            mailToTutors: true,
+            note: '',
+            pause: false,
+            pauseDuration: 15,
+            pauseTime: 45,
+            requireReason: 'optional',
+            responsibleGroups: [],
+            responsibleInstitutes: [],
+            responsibleUsers: [],
+            room: this.defaultRoom,
+            showParticipants: false,
+            size: 1,
+
+            slotCount: null,
+            startDate: moment().add(1, 'weeks').toDate(),
+            startTime: '08:00',
+        }
+    },
+    computed: {
+        csrf() {
+            return STUDIP.CSRF_TOKEN;
+        },
+        daysOfTheWeek() {
+            return {
+                1: this.$gettext('Montag'),
+                2: this.$gettext('Dienstag'),
+                3: this.$gettext('Mittwoch'),
+                4: this.$gettext('Donnerstag'),
+                5: this.$gettext('Freitag'),
+                6: this.$gettext('Samstag'),
+                0: this.$gettext('Sonntag'),
+            };
+        },
+        intervals() {
+            return {
+                0: this.$gettext('einmalig (ohne Wiederholung)'),
+                1: this.$gettext('wöchentlich'),
+                2: this.$gettext('zweiwöchentlich'),
+                3: this.$gettext('dreiwöchentlich'),
+                4: this.$gettext('monatlich'),
+            };
+        },
+        isCourse() {
+            return this.rangeType === 'Course';
+        },
+        isInstitute() {
+            return this.rangeType === 'Institute';
+        },
+        isSingleDay() {
+            return this.interval === '0';
+        },
+        needsConfirmation() {
+            return this.slotCount > this.slotCountThreshold;
+        },
+        recalculationProperty() {
+            return [
+                this.startDate,
+                this.startTime,
+                this.endDate,
+                this.endTime,
+                this.dayOfWeek,
+                this.interval,
+                this.duration,
+                this.pause,
+                this.pauseTime,
+                this.pauseDuration,
+            ].join();
+        },
+    },
+    methods: {
+        closeCreator(event) {
+            if (this.$el.closest('.studip-dialog')) {
+                STUDIP.Dialog.close();
+                event.preventDefault();
+            }
+        },
+        validateInputs(event) {
+            const errors = [];
+
+            if (this.startTime > this.endTime) {
+                errors.push(this.$gettext('Die Endzeit liegt vor der Startzeit!'));
+            }
+
+            if (this.startDate > this.endDate) {
+                errors.push(this.$gettext('Das Enddatum liegt vor dem Startdatum!'));
+            }
+
+            if (this.pauseTime && this.pauseTime < this.duration) {
+                errors.push(this.$gettext('Die definierte Zeit bis zur Pause ist kleiner als die Dauer eines Termins.'));
+            }
+
+            if (
+                this.isInstitute
+                && this.responsibleGroups.length === 0
+                && this.responsibleInstitutes.length === 0
+                && this.responsibleUsers.length === 0
+            ) {
+                errors.push(this.$gettext('Es muss mindestens eine durchführende Person, Statusgruppe oder Einrichtung ausgewählt werden.'));
+            }
+
+            if (this.needsConfirmation && !this.confirmed) {
+                errors.push(this.$gettext('Sie müssen bestätigen, dass sie eine große Anzahl von Terminen erstellen möchten.'));
+
+            }
+
+            if (errors.length > 0) {
+                this.errors = errors;
+                event.preventDefault();
+            }
+        },
+        combineDateAndTime(date, time) {
+            const [hour, minute] = time.split(':').map(item => parseInt(item, 10));
+            const result = new Date(date);
+            result.setHours(hour);
+            result.setMinutes(minute);
+            result.setSeconds(0);
+            return result;
+        }
+    },
+    watch: {
+        interval(current) {
+            if (current === '0') {
+                this.endDate = new Date(this.startDate);
+            }
+        },
+        recalculationProperty: {
+            handler() {
+                STUDIP.jsonapi.withPromises().GET('consultation-slots/count', {
+                    data: {
+                        start: this.combineDateAndTime(this.startDate, this.startTime).toISOString(),
+                        end: this.combineDateAndTime(this.endDate, this.endTime).toISOString(),
+                        dow: this.dayOfWeek,
+                        interval: this.interval,
+                        duration: this.duration,
+                        pause_time: this.pause ? this.pauseTime : null,
+                        pause_duration: this.pause ? this.pauseDuration : null,
+                    }
+                }).then((count) => {
+                    this.slotCount = count;
+                    this.confirmed = count <= this.slotCountThreshold;
+                });
+            },
+            immediate: true
+        },
+        startDate(current) {
+            this.dayOfWeek = current.getDay();
+        },
+    },
+    beforeCreate() {
+        STUDIP.Vue.emit('ConsultationCreatorWillCreate', this);
+    }
+}
+</script>
+<style scoped>
+form.default label input[type="time"] {
+    max-width: 48em;
+}
+</style>
diff --git a/resources/vue/components/Datepicker.vue b/resources/vue/components/Datepicker.vue
index 3db44ce..5c2c0f7 100644
--- a/resources/vue/components/Datepicker.vue
+++ b/resources/vue/components/Datepicker.vue
@@ -1,75 +1,143 @@
 <template>
     <span>
-        <input type="hidden" :name="name" :value="value">
+        <input type="hidden" :name="name" :value="returnValue">
         <input type="text"
                ref="visibleInput"
                class="visible_input"
-               @change="setUnixTimestamp"
                v-bind="$attrs"
-               v-on="$listeners">
+               v-on="$listeners"
+               :placeholder="placeholder">
     </span>
 </template>
 
 <script>
+import RestrictedDatesHelper from '../../assets/javascripts/lib/RestrictedDatesHelper';
+
 export default {
-    name: "datepicker",
+    name: 'Datepicker',
     inheritAttrs: false,
     props: {
         name: {
             type: String,
             required: false
         },
-        value: {
-            required: false
+        value: [Date, String, Number],
+        mindate: [Date, Number, String],
+        maxdate: [Date, Number, String],
+        placeholder: String,
+        disableHolidays: {
+            type: Boolean,
+            default: false,
         },
-        mindate: {
-            required: false
+        emitDate: {
+            type: Boolean,
+            default: false,
         },
-        maxdate: {
-            required: false
+        returnAs: {
+            type: String,
+            default: 'localized',
+            validator(value) {
+                return ['localized', 'unix', 'iso'].includes(value);
+            }
+        }
+    },
+    computed: {
+        input() {
+            return $(this.$refs.visibleInput);
+        },
+        parameters() {
+            let params = {
+                onSelect: () => {
+                    this.setUnixTimestamp();
+                },
+                maxDate: this.convertInputToNativeDate(this.maxdate),
+                minDate: this.convertInputToNativeDate(this.mindate),
+            };
+            if (this.disableHolidays) {
+                params.beforeShowDay = (date) => {
+                    RestrictedDatesHelper.loadRestrictedDatesByYear(date.getFullYear()).then(
+                        () => this.input.datepicker('refresh'),
+                        () => null
+                    );
+
+                    const {reason, lock} = RestrictedDatesHelper.isDateRestricted(date);
+                    return [!lock, lock ? 'ui-datepicker-is-locked' : null, reason];
+                };
+            }
+
+            return params;
+        },
+        returnValue() {
+            if (this.returnAs === 'unix') {
+                return this.convertInputToUnixTimestamp(this.value);
+            }
+
+            if (this.returnAs === 'iso') {
+                return this.convertInputToNativeDate(this.value).toISOString();
+            }
+
+            return this.convertInputToNativeDate(this.value).toLocaleDateString();
         }
     },
     methods: {
+        convertInputToNativeDate(input) {
+            if (input instanceof Date) {
+                return input;
+            }
+
+            if (input === 'today') {
+                return new Date();
+            }
+
+            return input ? new Date(input * 1000) : null;
+        },
+        convertInputToUnixTimestamp(input) {
+            if (input instanceof Date) {
+                return Math.floor(input.getTime() / 1000);
+            }
+
+            if (!isNaN(parseInt(input, 10))) {
+                return parseInt(input, 10);
+            }
+
+            return input;
+        },
         setUnixTimestamp () {
-            let formatted_date = this.$refs.visibleInput.value;
-            let date = formatted_date.match(/(\d+)/g);
-            date = new Date(`${date[2]}-${date[1]}-${date[0]} ${date[3]}:${date[4]}`);
-            this.$emit('input', Math.floor(date / 1000));
+            let date = this.input.datepicker('getDate');
+            this.$emit('input', this.emitDate ? date : Math.floor(date.getTime() / 1000));
         }
     },
     mounted () {
-        let value = !isNaN(parseInt(this.value, 10)) ? parseInt(this.value, 10) : this.value;
+        let value = this.convertInputToUnixTimestamp(this.value);
+
         if (Number.isInteger(value)) {
             let date = new Date(value * 1000);
-            let formatted_date =
-                (date.getDate() < 10 ? "0" : "") + date.getDate()
-                + "."
-                + (date.getMonth() < 9 ? "0" : "") + (date.getMonth() + 1)
-                + "."
-                + date.getFullYear();
-            this.$refs.visibleInput.value = formatted_date;
+            this.input.val(date.toLocaleDateString());
         } else {
-            this.$refs.visibleInput.value = value;
-        }
-        let params = {
-            onSelect: () => {
-                this.setUnixTimestamp();
-            }
-        };
-        if (this.mindate) {
-            params.minDate = new Date(this.mindate * 1000)
-        }
-        if (this.maxdate) {
-            params.maxDate = new Date(this.maxdate * 1000)
+            this.input.val(value);
         }
-        $(this.$refs.visibleInput).datetimepicker(params);
+        this.input.datepicker(this.parameters);
     },
     watch: {
-        mindate (new_data, old_data) {
-            $(this.$refs.visibleInput).datetimepicker('option', 'minDate', new Date(new_data * 1000));
+        maxdate(current) {
+            this.input.datepicker(
+                'option',
+                'maxDate',
+                this.convertInputToNativeDate(current)
+            );
         },
-        maxdate (new_data, old_data) {
-            $(this.$refs.visibleInput).datetimepicker('option', 'maxDate', new Date(new_data * 1000));
+        mindate(current) {
+            this.input.datepicker(
+                'option',
+                'minDate',
+                this.convertInputToNativeDate(current)
+            );
+        },
+        value(current, previous) {
+            if (current.toISOString() !== previous.toISOString()) {
+                this.input.datepicker('setDate', current);
+                this.input.datepicker('refresh');
+            }
         }
     }
 }
diff --git a/resources/vue/components/StudipTooltipIcon.vue b/resources/vue/components/StudipTooltipIcon.vue
index 39856bb..30d2033 100644
--- a/resources/vue/components/StudipTooltipIcon.vue
+++ b/resources/vue/components/StudipTooltipIcon.vue
@@ -37,6 +37,9 @@
 </script>
 
 <style lang="scss" scoped>
+.tooltip img {
+    vertical-align: text-bottom;
+}
 .tooltip.tooltip-icon::before {
     display: none;
 }
diff --git a/resources/vue/components/Timepicker.vue b/resources/vue/components/Timepicker.vue
new file mode 100644
index 0000000..e0b0feb
--- /dev/null
+++ b/resources/vue/components/Timepicker.vue
@@ -0,0 +1,37 @@
+<template>
+    <input type="time"
+           ref="visibleInput"
+           class="hasTimepicker"
+           v-model="timeValue"
+           :placeholder="placeholder"
+           :min="mintime"
+           :max="maxtime"
+           :name="name">
+</template>
+
+<script>
+export default {
+    name: 'Timepicker',
+    inheritAttrs: false,
+    props: {
+        name: {
+            type: String,
+            required: false
+        },
+        value: String,
+        mintime: String,
+        maxtime: String,
+        placeholder: String,
+    },
+    computed: {
+        timeValue: {
+            get() {
+                return this.value;
+            },
+            set(value) {
+                this.$emit('input', value);
+            }
+        }
+    }
+}
+</script>
-- 
cgit v1.0


From 6ce2578fea9a45ab45a93ca9a6584dc97ab1bc80 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 12 Jun 2024 07:07:40 +0000
Subject: fix logging, fixes #4280

Closes #4280

Merge request studip/studip!3097
---
 lib/models/FileRef.php | 3 ++-
 lib/models/Folder.php  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/models/FileRef.php b/lib/models/FileRef.php
index c70d171..6bffbf3 100644
--- a/lib/models/FileRef.php
+++ b/lib/models/FileRef.php
@@ -86,9 +86,10 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange
     public function cbLogDeleteFileRef()
     {
         StudipLog::log('FILE_DELETE',
-            $this->id,
+            User::findCurrent()->id,
             null,
             sprintf(
+                'Kommentar: %s',
                 $this->name
             )
         );
diff --git a/lib/models/Folder.php b/lib/models/Folder.php
index b2e8886..7b66621 100644
--- a/lib/models/Folder.php
+++ b/lib/models/Folder.php
@@ -97,9 +97,10 @@ class Folder extends SimpleORMap implements FeedbackRange
     protected function cbLogDeleteFolder()
     {
         StudipLog::log('FOLDER_DELETE',
-            $this->id,
+            User::findCurrent()->id,
             null,
             sprintf(
+                'Kommentar: %s',
                 $this->name
             )
         );
-- 
cgit v1.0


From 91ba000b9598c48a7609507ce1e7de6c84a68c35 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 12 Jun 2024 09:25:17 +0000
Subject: fixes #4279, fixes #4281

Closes #4279 and #4281

Merge request studip/studip!3100
---
 app/controllers/course/room_requests.php     |  8 +++++---
 app/views/materialien/files/add_dokument.php | 28 ++++++++++++++++------------
 lib/models/AuxLockRule.php                   |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index 926e000..b091047 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -583,9 +583,11 @@ class Course_RoomRequestsController extends AuthenticatedController
             $this->request->store();
 
             //Store the properties:
-            foreach ($_SESSION[$request_id]['selected_properties'] as $name => $state) {
-                if (!empty($state)) {
-                    $this->request->setProperty($name, $state);
+            if (isset($_SESSION[$request_id]['selected_properties'])) {
+                foreach ($_SESSION[$request_id]['selected_properties'] as $name => $state) {
+                    if (!empty($state)) {
+                        $this->request->setProperty($name, $state);
+                    }
                 }
             }
 
diff --git a/app/views/materialien/files/add_dokument.php b/app/views/materialien/files/add_dokument.php
index a940e95..db6c7c6 100644
--- a/app/views/materialien/files/add_dokument.php
+++ b/app/views/materialien/files/add_dokument.php
@@ -1,21 +1,21 @@
-<form class="default" action="<?= $controller->action_link('add_dokument', $origin,  $range_type, $range_id, $mvvfile_id) ?>" method="post" data-dialog="size=auto">
-    <input type="hidden" name="mvvfile_id" id="mvvfile_id" value="<?= htmlReady($mvvfile_id) ?>">
-    <input type="hidden" name="range_id" id="range_id" value="<?= htmlReady($range_id) ?>">
-    <input type="hidden" name="range_type" id="range_type" value="<?= htmlReady($range_type) ?>">
-
-
+<form class="default" action="<?= $controller->action_link('add_dokument', $origin ?? null,  $range_type ?? null, $range_id ?? null, $mvvfile_id ?? null) ?>" method="post" data-dialog="size=auto">
+    <input type="hidden" name="mvvfile_id" id="mvvfile_id" value="<?= htmlReady($mvvfile_id ?? '') ?>">
+    <input type="hidden" name="range_id" id="range_id" value="<?= htmlReady($range_id ?? null) ?>">
+    <input type="hidden" name="range_type" id="range_type" value="<?= htmlReady($range_type ?? null) ?>">
 
     <label>
         <?= _('Jahr') ?>
-        <input name="doc_year" type="text" value="<?= htmlReady($doc_year) ?>"<?= $perm->disable('year') ?>>
+        <input name="doc_year" type="text" value="<?= htmlReady($doc_year ?? '') ?>"<?= $perm->disable('year') ?>>
     </label>
 
-    <input type="hidden" name="doc_type" value="<?= $doc_type ?>">
+    <input type="hidden" name="doc_type" value="<?= htmlReady($doc_type ?? '') ?>">
     <label>
         <?= _('Art der Datei') ?>
         <select name="doc_type"<?= $perm->haveFieldPerm('type') ? '' : ' disable' ?>>
         <? foreach ($GLOBALS['MVV_DOCUMENTS']['TYPE']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == $doc_type ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= htmlReady($key) ?>"<?= isset($doc_type) && $key == $doc_type ? ' selected' : '' ?>>
+                <?= htmlReady($entry['name']) ?>
+            </option>
         <? endforeach; ?>
         </select>
     </label>
@@ -115,7 +115,9 @@
         <?= _('Kategoriezuordnung') ?>
         <select name="doc_cat">
         <? foreach ($GLOBALS['MVV_DOCUMENTS']['CATEGORY']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == $doc_cat ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= htmlReady($key) ?>"<?= isset($doc_cat) && $key == $doc_cat ? ' selected' : '' ?>>
+                <?= htmlReady($entry['name']) ?>
+            </option>
         <? endforeach; ?>
         </select>
     </label>
@@ -125,13 +127,15 @@
         <select id="mvv-files-tags" multiple name="doc_tags[]">
             <option value=""></option>
         <? foreach ($GLOBALS['MVV_DOCUMENTS']['TAG']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == in_array($key, explode(';', $doc_tags))? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= htmlReady($key) ?>"<?= $key == in_array($key, explode(';', $doc_tags ?? ''))? ' selected' : '' ?>>
+                <?= htmlReady($entry['name']) ?>
+            </option>
         <? endforeach; ?>
         </select>
     </label>
 
     <label>
-        <input name="doc_extvisible" type="checkbox" value="1" <?= $doc_extvisible?'checked':''; ?>>
+        <input name="doc_extvisible" type="checkbox" value="1" <?= !empty($doc_extvisible) ? 'checked' : '' ?>>
         <?= _('Sichtbarkeit nach außen') ?>
     </label>
 
diff --git a/lib/models/AuxLockRule.php b/lib/models/AuxLockRule.php
index abd3327..f5ebfac 100644
--- a/lib/models/AuxLockRule.php
+++ b/lib/models/AuxLockRule.php
@@ -164,7 +164,7 @@ class AuxLockRule extends SimpleORMap
             foreach ($this->datafields as $field => $useless_value_pls_refactor) {
 
                 // if standard get it from the mapping else get it from the datafield
-                if ($mapping[$field]) {
+                if (!empty($mapping[$field])) {
                     $result['head'][$field] = $head_mapping[$field];
                     $new[$field] = htmlReady($mapping[$field]);
                 } else {
-- 
cgit v1.0


From a32a769990c1e5ebfd7ddbcbfc9c102f6639003a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 12 Jun 2024 11:51:48 +0000
Subject: increase node version to >= 18, fixes #4285

Closes #4285

Merge request studip/studip!3102
---
 .gitlab-ci.yml                | 2 +-
 docker/studip/Dockerfile      | 2 +-
 docker/tests/php74/Dockerfile | 4 ++--
 docker/tests/php81/Dockerfile | 2 +-
 docker/tests/php82/Dockerfile | 2 +-
 docker/tests/php83/Dockerfile | 2 +-
 package.json                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a5b71e..2a95a53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
   # Use faster docker driver
   DOCKER_DRIVER: overlay2
   # Images
-  NODE_IMAGE: node:16-slim
+  NODE_IMAGE: node:18-slim
   # Directories
   CACHE_DIR: .caches
   REPORT_DIR: .reports
diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index 0689c3a..fe9fc8c 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -19,7 +19,7 @@ RUN apt update && apt install -y --no-install-recommends \
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl
 
-FROM node:16 as nodejs
+FROM node:18 as nodejs
 
 # Install node modules
 COPY . /studip
diff --git a/docker/tests/php74/Dockerfile b/docker/tests/php74/Dockerfile
index b982414..17d404a 100644
--- a/docker/tests/php74/Dockerfile
+++ b/docker/tests/php74/Dockerfile
@@ -14,8 +14,8 @@ RUN apt update && apt install -y  --no-install-recommends \
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
 
-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+# Install node
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt update && apt install -y --no-install-recommends nodejs \
         curl apt-transport-https ca-certificates gnupg unzip git \
     && rm -rf /var/lib/apt/lists/*
diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile
index 7d0478e..ceb1d2d 100644
--- a/docker/tests/php81/Dockerfile
+++ b/docker/tests/php81/Dockerfile
@@ -16,7 +16,7 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+COPY --from=node:18-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index c8abd9d..eee9aad 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -16,7 +16,7 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+COPY --from=node:18-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
index 68d1764..b93795a 100644
--- a/docker/tests/php83/Dockerfile
+++ b/docker/tests/php83/Dockerfile
@@ -16,7 +16,7 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+COPY --from=node:18-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/package.json b/package.json
index 3d382e5..16574bf 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
         "url": "https://develop.studip.de/svn/studip"
     },
     "engines": {
-        "node": ">=16"
+        "node": ">=18"
     },
     "devDependencies": {
         "@axe-core/playwright": "^4.6.1",
-- 
cgit v1.0


From c2d1b27813e61b1c4fc44858e091a15e56a29451 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Wed, 12 Jun 2024 15:13:20 +0200
Subject: update package lock as well, re #4285

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index cef443d..ad7b1d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -139,7 +139,7 @@
                 "webpack-notifier": "^1.15.0"
             },
             "engines": {
-                "node": ">=16"
+                "node": ">=18"
             }
         },
         "node_modules/@aashutoshrathi/word-wrap": {
-- 
cgit v1.0


From e32eea963ad73556dcb2d4ec15b015c644898706 Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Thu, 13 Jun 2024 08:00:05 +0000
Subject: Re-throw error when failing to load a chunk.

Closes #4287

Merge request studip/studip!3103
---
 resources/assets/javascripts/chunk-loader.js | 153 ++++++++++++++-------------
 1 file changed, 79 insertions(+), 74 deletions(-)

diff --git a/resources/assets/javascripts/chunk-loader.js b/resources/assets/javascripts/chunk-loader.js
index dcd95cc..f372286 100644
--- a/resources/assets/javascripts/chunk-loader.js
+++ b/resources/assets/javascripts/chunk-loader.js
@@ -8,95 +8,100 @@ export const loadScript = function (script_name) {
     });
 };
 
-export const loadChunk = (function () {
-    let mathjax_promise = null;
+let mathjax_promise = null;
 
-    return function (chunk) {
-        let promise = null;
-        switch (chunk) {
+/** This function dynamically loads JS features organized in chunks.
+ *
+ * @param {string} chunk  The name of the chunk to load.
+ * @param {{ silent: boolean }} options Options for loading the chunk.
+ *                                      Pass `{ silent: true }` to supress
+ *                                      error messages.
+ * @return {Promise}
+ */
+export const loadChunk = function (chunk, { silent = false } = {}) {
+    let promise = null;
+    switch (chunk) {
+        case 'code-highlight':
+            promise = import(
+                /* webpackChunkName: "code-highlight" */
+                './chunks/code-highlight'
+            ).then(({ default: hljs }) => {
+                return hljs;
+            });
+            break;
 
-            case 'code-highlight':
-                promise = import(
-                    /* webpackChunkName: "code-highlight" */
-                    './chunks/code-highlight'
-                ).then(({default: hljs}) => {
-                    return hljs;
-                });
-                break;
+        case 'courseware':
+            promise = Promise.all([
+                STUDIP.loadChunk('vue'),
+                import(
+                    /* webpackChunkName: "courseware" */
+                    './chunks/courseware'
+                ),
+            ]).then(([Vue]) => Vue);
+            break;
 
-            case 'courseware':
-                promise = Promise.all([
-                    STUDIP.loadChunk('vue'),
-                    import(
-                        /* webpackChunkName: "courseware" */
-                        './chunks/courseware'
-                    ),
-                ]).then(([Vue]) => Vue);
-                break;
+        case 'chartist':
+            promise = import(
+                /* webpackChunkName: "chartist" */
+                './chunks/chartist'
+            ).then(({ default: Chartist }) => Chartist);
+            break;
 
-            case 'chartist':
-                promise = import(
-                    /* webpackChunkName: "chartist" */
-                    './chunks/chartist'
-                ).then(({ default: Chartist }) => Chartist);
-                break;
+        case 'fullcalendar':
+            promise = import(
+                /* webpackChunkName: "fullcalendar" */
+                './chunks/fullcalendar'
+            );
+            break;
 
-            case 'fullcalendar':
-                promise = import(
-                    /* webpackChunkName: "fullcalendar" */
-                    './chunks/fullcalendar'
-                );
-                break;
+        case 'tablesorter':
+            promise = import(
+                /* webpackChunkName: "tablesorter" */
+                './chunks/tablesorter'
+            );
+            break;
 
-            case 'tablesorter':
-                promise = import(
-                    /* webpackChunkName: "tablesorter" */
-                    './chunks/tablesorter'
-                );
-                break;
-
-            case 'mathjax':
-                if (mathjax_promise === null) {
-                    mathjax_promise = STUDIP.loadScript(
-                        'javascripts/mathjax/MathJax.js?config=TeX-AMS_HTML,default'
-                    ).then(() => {
+        case 'mathjax':
+            if (mathjax_promise === null) {
+                mathjax_promise = STUDIP.loadScript('javascripts/mathjax/MathJax.js?config=TeX-AMS_HTML,default')
+                    .then(() => {
                         (function (origPrint) {
                             window.print = function () {
-                                window.MathJax.Hub.Queue(
-                                    ['Delay', window.MathJax.Callback, 700],
-                                    origPrint
-                                );
+                                window.MathJax.Hub.Queue(['Delay', window.MathJax.Callback, 700], origPrint);
                             };
                         })(window.print);
 
                         return window.MathJax;
-                    }).catch(() => {
-                        console.log('Could not load mathjax')
+                    })
+                    .catch(() => {
+                        throw new Error('Could not load mathjax');
                     });
-                }
-                promise = mathjax_promise;
-                break;
+            }
+            promise = mathjax_promise;
+            break;
 
-            case 'vue':
-                promise = import(
-                    /* webpackChunkName: "vue.js" */
-                    './chunks/vue'
-                );
-                break;
+        case 'vue':
+            promise = import(
+                /* webpackChunkName: "vue.js" */
+                './chunks/vue'
+            );
+            break;
 
-            case 'wysiwyg':
-                promise = import(
-                    /* webpackChunkName: "wysiwyg.js" */
-                    './chunks/wysiwyg'
-                );
-                break;
+        case 'wysiwyg':
+            promise = import(
+                /* webpackChunkName: "wysiwyg.js" */
+                './chunks/wysiwyg'
+            );
+            break;
 
-            default:
-                promise = Promise.reject(new Error(`Unknown chunk: ${chunk}`));
-        }
+        default:
+            promise = Promise.reject(new Error(`Unknown chunk: ${chunk}`));
+    }
 
-        return promise.catch((error) => {
+    return promise.catch((error) => {
+        if (!silent) {
             console.error(`Could not load chunk ${chunk}`, error);
-        });
-    };
-}());
+        }
+        throw error;
+    });
+};
-- 
cgit v1.0


From 2df5804d3d034db26cef5a9ca8c584be3222c074 Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Fri, 14 Jun 2024 08:59:22 +0000
Subject: Add __(un)serialize to `StudipArrayObject` to remove Warnings.

Closes #4135

Merge request studip/studip!3098
---
 lib/classes/StudipArrayObject.class.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lib/classes/StudipArrayObject.class.php b/lib/classes/StudipArrayObject.class.php
index 531da67..da7e66e 100644
--- a/lib/classes/StudipArrayObject.class.php
+++ b/lib/classes/StudipArrayObject.class.php
@@ -135,6 +135,38 @@ class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable,
     }
 
     /**
+     * Called when serializing an ArrayObject
+     */
+    public function __serialize(): array
+    {
+        return get_object_vars($this);
+    }
+
+    /**
+     * Called when unserializing an ArrayObject
+     */
+    public function __unserialize(array $data): void
+    {
+        foreach ($data as $k => $v) {
+            switch ($k) {
+                case 'flag':
+                    $this->setFlags($v);
+                    break;
+                case 'storage':
+                    $this->exchangeArray($v);
+                    break;
+                case 'iteratorClass':
+                    $this->setIteratorClass($v);
+                    break;
+                case 'protectedProperties':
+                    break;
+                default:
+                    $this->__set($k, $v);
+            }
+        }
+    }
+
+    /**
      * Appends the value
      *
      * @param  mixed $value
-- 
cgit v1.0


From b6e85daf65db7398fc1c11f73ea09432d09ec4b6 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 14 Jun 2024 11:34:07 +0000
Subject: add new config-option MAX_SHOW_ADMIN_COURSES, fixes #2853

Closes #2853

Merge request studip/studip!1931
---
 app/controllers/admin/courses.php                  |  2 +-
 .../6.0.8_add_max_show_admin_courses_config.php    | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 db/migrations/6.0.8_add_max_show_admin_courses_config.php

diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index a798880..5f60442 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -294,7 +294,7 @@ class Admin_CoursesController extends AuthenticatedController
         PageLayout::setTitle(_('Verwaltung von Veranstaltungen und Einrichtungen'));
         // Add admission functions.
         PageLayout::addScript('studip-admission.js');
-        $this->max_show_courses = 500;
+        $this->max_show_courses = Config::get()->MAX_SHOW_ADMIN_COURSES;
     }
 
     /**
diff --git a/db/migrations/6.0.8_add_max_show_admin_courses_config.php b/db/migrations/6.0.8_add_max_show_admin_courses_config.php
new file mode 100644
index 0000000..dbc1929
--- /dev/null
+++ b/db/migrations/6.0.8_add_max_show_admin_courses_config.php
@@ -0,0 +1,32 @@
+<?php
+
+final class AddMaxShowAdminCoursesConfig extends Migration
+{
+    public function description()
+    {
+        return 'Adds the configuration MAX_SHOW_ADMIN_COURSES, if it doesn\'t exist yet and set a default value.';
+    }
+
+    public function up()
+    {
+        DBManager::get()->exec("INSERT IGNORE INTO `config`
+             (`field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`)
+             VALUES
+             (
+              'MAX_SHOW_ADMIN_COURSES',
+              500,
+              'integer',
+              'global',
+              'MeineVeranstaltungen',
+              UNIX_TIMESTAMP(),
+              UNIX_TIMESTAMP(),
+              'Wie viele Veranstaltungen sollen auf der Admin-Veranstaltungsseite angezeigt werden.'
+             )"
+        );
+    }
+
+    public function down()
+    {
+        DBManager::get()->exec("DELETE FROM `config_values` WHERE `field` = 'MAX_SHOW_ADMIN_COURSES'");
+    }
+}
-- 
cgit v1.0


From 688865a6a8359bf672988381e271927257109475 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 14 Jun 2024 11:48:30 +0000
Subject: fixes #4292

Closes #4292

Merge request studip/studip!3107
---
 db/migrations/6.0.7_add_consecutive_flag_for_consultations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php b/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php
index 52b623d..9c45a2a 100644
--- a/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php
+++ b/db/migrations/6.0.7_add_consecutive_flag_for_consultations.php
@@ -21,7 +21,7 @@ return new class extends Migration
                   JOIN consultation_slots AS s1
                     ON s1.slot_id = (
                       SELECT slot_id
-                      FROM consultation_slots AS s2
+                      FROM (SELECT slot_id, block_id, start_time FROM consultation_slots) AS s2
                       WHERE s2.block_id = s0.block_id
                         AND s2.start_time < s0.start_time
                         AND s2.slot_id != s0.slot_id
-- 
cgit v1.0


From e0cea7c6578f479f777c2002753899ee759f99d4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 14 Jun 2024 12:01:19 +0000
Subject: fixes #4288

Closes #4288

Merge request studip/studip!3104
---
 app/controllers/api/oauth2/authorize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index 451b766..b71f3d1 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -55,7 +55,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         if ('nobody' === $GLOBALS['user']->id && 'Standard' !== $authPlugin && !Request::option('sso')) {
             $queryParams = $psrRequest->getQueryParams();
             $queryParams['sso'] = strtolower($authPlugin);
-            $this->redirect($this->authorizeURL($queryParams));
+            $this->redirect($this->url_for('api/oaut2/authorize', $queryParams));
 
             return;
         } else {
-- 
cgit v1.0


From 2ab989c714d65a80a946939defce66d1b7c8f2cc Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Fri, 14 Jun 2024 14:23:27 +0000
Subject: =?UTF-8?q?Resolve=20"Fragebogen:=20Single=20Choice=20CSV-Export?=
 =?UTF-8?q?=20unn=C3=B6tig=20kompliziert"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4308

Merge request studip/studip!3110
---
 lib/models/Vote.php | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/lib/models/Vote.php b/lib/models/Vote.php
index ede0cea..a434f7b 100644
--- a/lib/models/Vote.php
+++ b/lib/models/Vote.php
@@ -113,28 +113,49 @@ class Vote extends QuestionnaireQuestion implements QuestionType
         $output = [];
 
         $options = $this['questiondata']['options'] ? $this['questiondata']['options']->getArrayCopy() : [];
+        $multiplechoice = (bool) $this['questiondata']['multiplechoice'];
+
+        if ($multiplechoice) {
+            foreach ($options as $key => $option) {
+                $answerOption = [];
+                $countNobodys = 0;
+
+                foreach ($this->answers as $answer) {
+                    $answerData = $answer['answerdata']->getArrayCopy();
+
+                    if ($answer['user_id'] && $answer['user_id'] != 'nobody') {
+                        $userId = $answer['user_id'];
+                    } else {
+                        $countNobodys++;
+                        $userId = _('unbekannt') . ' ' . $countNobodys;
+                    }
+
+                    if (in_array($key, (array) $answerData['answers'])) {
+                        $answerOption[$userId] = 1;
+                    } else {
+                        $answerOption[$userId] = 0;
+                    }
+                }
+                $output[$option] = $answerOption;
+            }
+        } else {
 
-        foreach ($options as $key => $option) {
             $answerOption = [];
             $countNobodys = 0;
 
             foreach ($this->answers as $answer) {
                 $answerData = $answer['answerdata']->getArrayCopy();
 
-                if ($answer['user_id'] && $answer['user_id'] != 'nobody') {
+                if ($answer['user_id'] && $answer['user_id'] !== 'nobody') {
                     $userId = $answer['user_id'];
                 } else {
-                    $countNobodys++;
-                    $userId = _('unbekannt').' '.$countNobodys;
-                }
-
-                if (in_array($key, (array) $answerData['answers'])) {
-                    $answerOption[$userId] = 1;
-                } else {
-                    $answerOption[$userId] = 0;
+                    $userId = _('unbekannt') . ' ' . ++$countNobodys;
                 }
+                $answerOption[$userId] = $options[$answerData['answers']];
             }
-            $output[$option] = $answerOption;
+
+            $question = strip_tags($this['questiondata']['description']);
+            $output[$question] = $answerOption;
         }
         return $output;
     }
-- 
cgit v1.0


From 9d7610060f6b6befdb11ee559447d1e3d0b01a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Mon, 17 Jun 2024 05:58:46 +0000
Subject: Resolve #4283 "Gradebook: Beim Speichern einer Note wird das chdate
 immer aktualisiert"

Closes #4283

Merge request studip/studip!3101
---
 lib/models/Grading/Instance.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/models/Grading/Instance.php b/lib/models/Grading/Instance.php
index 14ab25a..7f362d3 100644
--- a/lib/models/Grading/Instance.php
+++ b/lib/models/Grading/Instance.php
@@ -66,4 +66,22 @@ class Instance extends \SimpleORMap
 
         return self::findBySql('definition_id IN (?) AND user_id = ?', [$definitionIds, $user->id]);
     }
+
+    /**
+     * setter for the rawgrade column. The database type is decimal(6,5) UNSIGNED, therefore
+     * the setter mimics the database behaviour to get valid results from ::isFieldDirty()
+     *
+     * @param mixed $grade
+     * @return string
+     */
+    public function setRawgrade($grade = 0): string
+    {
+        if ($grade < 0) {
+            $grade = 0;
+        }
+        if ($grade >= 10) {
+            $grade = 9.99999;
+        }
+        return $this->content['rawgrade'] = number_format($grade, 5, '.', '');
+    }
 }
-- 
cgit v1.0


From a815a566e2fb858f692eb15950fc538d45231e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCttl=C3=B6ffel?=
 <schuettloeffel@zqs.uni-hannover.de>
Date: Mon, 17 Jun 2024 06:59:12 +0000
Subject: Resolve "Selbst hochgeladene Dateien in Ordnern ohne Lesezugriff
 schlecht sichtbar"

Closes #2954

Merge request studip/studip!1997
---
 .../JsonApi/Routes/Files/RangeFileRefsIndex.php    |  2 +-
 .../JsonApi/Routes/Files/SubfilerefsIndex.php      | 11 +++++++--
 lib/classes/JsonApi/Schemas/File.php               |  2 +-
 lib/classes/JsonApi/Schemas/Folder.php             | 12 +++++++++-
 lib/filesystem/HomeworkFolder.php                  | 26 ++++++++++++++++++----
 lib/filesystem/PermissionEnabledFolder.php         | 23 ++++++++++++++++++-
 lib/filesystem/TimedFolder.php                     | 21 +++++++++++------
 .../filesystem/homework_folder/description.php     |  9 +-------
 templates/filesystem/timed_folder/description.php  | 11 ---------
 9 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/lib/classes/JsonApi/Routes/Files/RangeFileRefsIndex.php b/lib/classes/JsonApi/Routes/Files/RangeFileRefsIndex.php
index 8f69d6a..773071e 100644
--- a/lib/classes/JsonApi/Routes/Files/RangeFileRefsIndex.php
+++ b/lib/classes/JsonApi/Routes/Files/RangeFileRefsIndex.php
@@ -13,7 +13,7 @@ class RangeFileRefsIndex extends AbstractRangeIndex
 
         $filerefs = [];
         foreach ($filesAndFolders['files'] as $file_object) {
-            if (method_exists($file_object, "getFileRef")) {
+            if (method_exists($file_object, 'getFileRef')) {
                 $filerefs[] = $file_object->getFileRef();
             }
         }
diff --git a/lib/classes/JsonApi/Routes/Files/SubfilerefsIndex.php b/lib/classes/JsonApi/Routes/Files/SubfilerefsIndex.php
index 0ff0603..2ed1a23 100644
--- a/lib/classes/JsonApi/Routes/Files/SubfilerefsIndex.php
+++ b/lib/classes/JsonApi/Routes/Files/SubfilerefsIndex.php
@@ -2,6 +2,7 @@
 
 namespace JsonApi\Routes\Files;
 
+use FileRef;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use JsonApi\Errors\AuthorizationFailedException;
@@ -28,8 +29,14 @@ class SubfilerefsIndex extends JsonApiController
             throw new AuthorizationFailedException();
         }
 
-        $fileRefs = $folder->file_refs->getArrayCopy();
-        list($offset, $limit) = $this->getOffsetAndLimit();
+        $fileRefs = array_map(
+            function (\FileType $file): FileRef {
+                return $file->getFileRef();
+            },
+            $folder->getFiles()
+        );
+
+        [$offset, $limit] = $this->getOffsetAndLimit();
 
         return $this->getPaginatedContentResponse(
             array_slice($fileRefs, $offset, $limit),
diff --git a/lib/classes/JsonApi/Schemas/File.php b/lib/classes/JsonApi/Schemas/File.php
index 8eb8046..df0263a 100644
--- a/lib/classes/JsonApi/Schemas/File.php
+++ b/lib/classes/JsonApi/Schemas/File.php
@@ -29,7 +29,7 @@ class File extends SchemaProvider
             'chdate' => date('c', $resource['chdate']),
         ];
 
-        if ($resource['metadata']['url']) {
+        if (!empty($resource['metadata']['url'])) {
             if (FilesAuthority::canUpdateFile($this->currentUser, $resource)) {
                 $attributes['url'] = $resource['metadata']['url'];
             }
diff --git a/lib/classes/JsonApi/Schemas/Folder.php b/lib/classes/JsonApi/Schemas/Folder.php
index 2c61cae..4cb277e 100644
--- a/lib/classes/JsonApi/Schemas/Folder.php
+++ b/lib/classes/JsonApi/Schemas/Folder.php
@@ -169,14 +169,24 @@ class Folder extends SchemaProvider
         return $relationships;
     }
 
+    /**
+     * @param \FolderType $resource
+     */
     private function getFilesRelationship(array $relationships, $resource)
     {
+        $fileRefs = array_map(
+            function (\FileType $file): \FileRef {
+                return $file->getFileRef();
+            },
+            $resource->getFiles()
+        );
+
         $relationships[self::REL_FILE_REFS] = [
             self::RELATIONSHIP_LINKS => [
                 Link::RELATED => $this->getRelationshipRelatedLink($resource, self::REL_FILE_REFS),
             ],
             self::RELATIONSHIP_META => [
-                'count' => count($resource->file_refs)
+                'count' => count($fileRefs),
             ],
         ];
 
diff --git a/lib/filesystem/HomeworkFolder.php b/lib/filesystem/HomeworkFolder.php
index 70447fb..fb93ef8 100644
--- a/lib/filesystem/HomeworkFolder.php
+++ b/lib/filesystem/HomeworkFolder.php
@@ -82,10 +82,6 @@ class HomeworkFolder extends PermissionEnabledFolder
         $template = $GLOBALS['template_factory']->open('filesystem/homework_folder/description.php');
         $template->folder     = $this;
         $template->folderdata = $this->folderdata;
-        if (!Seminar_Perm::get()->have_studip_perm('tutor', $this->range_id)) {
-            $files = new SimpleCollection($this->getFiles());
-            $template->own_files = $files->findBy('user_id', $GLOBALS['user']->id)->orderBy('name');
-        }
 
         return $template;
     }
@@ -101,6 +97,28 @@ class HomeworkFolder extends PermissionEnabledFolder
     }
 
     /**
+     * @param string $user_id
+     * @return bool
+     */
+    public function isReadable($user_id = null)
+    {
+        return StandardFolder::isReadable($user_id);
+    }
+
+    /**
+     * Determines if a user may see the file.
+     * @param FileRef|string $fileref_or_id
+     * @param string $user_id
+     * @return bool
+     */
+    public function isFileVisible($fileref_or_id, $user_id)
+    {
+        $fileref = FileRef::toObject($fileref_or_id);
+
+        return $fileref->user_id === $user_id || parent::isReadable($user_id);
+    }
+
+    /**
      * @param FileRef|string $fileref_or_id
      * @param string $user_id
      * @return bool
diff --git a/lib/filesystem/PermissionEnabledFolder.php b/lib/filesystem/PermissionEnabledFolder.php
index d41ebe3..c286c53 100644
--- a/lib/filesystem/PermissionEnabledFolder.php
+++ b/lib/filesystem/PermissionEnabledFolder.php
@@ -118,6 +118,27 @@ class PermissionEnabledFolder extends StandardFolder
     }
 
     /**
+     * @return FileType[]
+     */
+    public function getFiles()
+    {
+        return array_filter(parent::getFiles(), function($file) {
+            return $this->isFileVisible($file->getFileRef(), $GLOBALS['user']->id);
+        });
+    }
+
+    /**
+     * Determines if a user may see the file.
+     * @param FileRef|string $fileref_or_id
+     * @param string $user_id
+     * @return bool
+     */
+    public function isFileVisible($fileref_or_id, $user_id)
+    {
+        return $this->isReadable($user_id);
+    }
+
+    /**
      * @param $fileref_or_id
      * @param $user_id
      * @return bool
@@ -127,7 +148,7 @@ class PermissionEnabledFolder extends StandardFolder
         $fileref = FileRef::toObject($fileref_or_id);
 
         if (is_object($fileref)) {
-            if ($this->isVisible($user_id) && $this->isReadable($user_id)) {
+            if ($this->isVisible($user_id) && $this->isFileVisible($fileref, $user_id)) {
                 return $fileref->terms_of_use->isDownloadable($this->range_id, $this->range_type, true, $user_id);
             }
         }
diff --git a/lib/filesystem/TimedFolder.php b/lib/filesystem/TimedFolder.php
index d5f933b..0c159d6 100644
--- a/lib/filesystem/TimedFolder.php
+++ b/lib/filesystem/TimedFolder.php
@@ -81,7 +81,7 @@ class TimedFolder extends PermissionEnabledFolder
                 ($this->end_time == 0 || $this->end_time >= $now)
                 ||
                 $GLOBALS['perm']->have_studip_perm($this->must_have_perm, $this->range_id, $user_id)) &&
-            parent::isReadable($user_id);
+            StandardFolder::isReadable($user_id);
     }
 
     public function isWritable($user_id = null)
@@ -96,6 +96,19 @@ class TimedFolder extends PermissionEnabledFolder
     }
 
     /**
+     * Determines if a user may see the file.
+     * @param FileRef|string $fileref_or_id
+     * @param string $user_id
+     * @return bool
+     */
+    public function isFileVisible($fileref_or_id, $user_id)
+    {
+        $fileref = FileRef::toObject($fileref_or_id);
+
+        return $fileref->user_id === $user_id || parent::isReadable($user_id);
+    }
+
+    /**
      * This function returns the suitable Icon for this folder type (TimedFolder)
      *
      * @return Icon The icon object for this folder type
@@ -143,12 +156,6 @@ class TimedFolder extends PermissionEnabledFolder
         $template->folder     = $this;
         $template->folderdata = $this->folderdata;
 
-        if (!Seminar_Perm::get()->have_studip_perm('tutor', $this->range_id) &&
-                $this->isWritable($GLOBALS['user']->id) && !$this->isReadable($GLOBALS['user']->id)) {
-            $files = new SimpleCollection($this->getFiles());
-            $template->own_files = $files->findBy('user_id', $GLOBALS['user']->id)->orderBy('name');
-        }
-
         return $template;
     }
 
diff --git a/templates/filesystem/homework_folder/description.php b/templates/filesystem/homework_folder/description.php
index b3bc7f1..c47d6b0 100644
--- a/templates/filesystem/homework_folder/description.php
+++ b/templates/filesystem/homework_folder/description.php
@@ -1,14 +1,7 @@
 <div style="font-style: italic">
     <?=_("Dieser Ordner ist ein Hausaufgabenordner. Es können nur Dateien eingestellt werden.")?>
 </div>
-<? if (!empty($own_files) && count($own_files) > 0) : ?>
-<?= _("Sie selbst haben folgende Dateien in diesen Ordner eingestellt:") ?>
-    <ul>
-        <? foreach ($own_files as $own_file) :?>
-            <li><?=htmlReady($own_file->name)?> - <?=strftime('%x %X', $own_file->chdate)?></li>
-        <? endforeach ?>
-    </ul>
-<? endif ?>
+
 <? if ($folderdata['description']) : ?>
 <hr>
     <div>
diff --git a/templates/filesystem/timed_folder/description.php b/templates/filesystem/timed_folder/description.php
index ae5bd9e..396a286 100644
--- a/templates/filesystem/timed_folder/description.php
+++ b/templates/filesystem/timed_folder/description.php
@@ -36,17 +36,6 @@
 <? endif ?>
 </div>
 
-<? if (!empty($own_files) && count($own_files) > 0) : ?>
-    <div>
-        <?= _('Sie selbst haben folgende Dateien in diesen Ordner eingestellt:') ?>
-        <ul>
-            <? foreach ($own_files as $own_file) : ?>
-                <li><?= htmlReady($own_file->name) ?> - <?= strftime('%x %X', $own_file->chdate) ?></li>
-            <? endforeach ?>
-        </ul>
-    </div>
-<? endif ?>
-
 <? if ($folderdata['description']) : ?>
 <hr>
     <div>
-- 
cgit v1.0


From fddbe49917aaa43b5b3fff3a505fa6afcf627a92 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 17 Jun 2024 07:01:46 +0000
Subject: prevent php-warnings, closes #4310

Closes #4310

Merge request studip/studip!3114
---
 app/controllers/course/timesrooms.php   |  6 +++-
 app/controllers/new_password.php        | 56 +++++++++++++++------------------
 app/views/course/cancel_dates/index.php |  2 +-
 app/views/oer/addfile/choose_file.php   |  2 +-
 lib/filesystem/CourseDateFolder.php     |  2 +-
 lib/models/RangeScale.php               |  8 +++--
 lib/raumzeit/SingleDate.class.php       |  6 ++--
 7 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index f6cab24..f452f4d 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -444,7 +444,11 @@ class Course_TimesroomsController extends AuthenticatedController
         }
 
         // Set Room
-        $old_room_id = $termin->room_booking->resource_id;
+        if ($termin->room_booking) {
+            $old_room_id = $termin->room_booking->resource_id;
+        } else {
+            $old_room_id = null;
+        }
         $singledate = new SingleDate($termin);
         if ($singledate->setTime($date, $end_time)) {
             $singledate->store();
diff --git a/app/controllers/new_password.php b/app/controllers/new_password.php
index 525d73b..1e58659 100644
--- a/app/controllers/new_password.php
+++ b/app/controllers/new_password.php
@@ -41,36 +41,32 @@ class NewPasswordController extends StudipController
 
         $users = User::findByEmail(Request::get('mail'));
 
-        if (sizeof($users) == 1) {
-            $user = $users[0];
-        } else if (sizeof($users) > 1) {
-            setTempLanguage($users[0]->id);
-
-            // there are mutliple accounts with this mail addresses!
-            $subject = sprintf(
-                _("[Stud.IP - %s] Passwortänderung angefordert"),
-                Config::get()->UNI_NAME_CLEAN
-            );
-
-            $mailbody = sprintf(
-                _("Dies ist eine Informationsmail des Stud.IP-Systems\n"
-                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
-                    . "Für die Mail-Adresse %s wurde ein Link angefordert\n"
-                    . "um das Passwort zurückzusetzen.\n"
-                    . "Dieser Mail-Adresse sind jedoch mehrere Zugänge zugeordnet,\n"
-                    . "deshalb ist es nicht möglich, das Passwort hierüber zurückzusetzen.\n"
-                    . "Wenden sie sich bitte stattdessen an\n%s"
-                ),
-                Config::get()->UNI_NAME_CLEAN,
-                $users[0]->email,
-                $GLOBALS['UNI_CONTACT']
-            );
-
-            StudipMail::sendMessage($users[0]->email, $subject, $mailbody);
-
-            restoreLanguage();
-        }
-
+        $user = $users[0];
+        setTempLanguage($user->id);
+
+        // there are mutliple accounts with this mail addresses!
+        $subject = sprintf(
+            _("[Stud.IP - %s] Passwortänderung angefordert"),
+            Config::get()->UNI_NAME_CLEAN
+        );
+
+        $mailbody = sprintf(
+            _("Dies ist eine Informationsmail des Stud.IP-Systems\n"
+                ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
+                . "Für die Mail-Adresse %s wurde ein Link angefordert\n"
+                . "um das Passwort zurückzusetzen.\n"
+                . "Dieser Mail-Adresse sind jedoch mehrere Zugänge zugeordnet,\n"
+                . "deshalb ist es nicht möglich, das Passwort hierüber zurückzusetzen.\n"
+                . "Wenden sie sich bitte stattdessen an\n%s"
+            ),
+            Config::get()->UNI_NAME_CLEAN,
+            $users[0]->email,
+            $GLOBALS['UNI_CONTACT']
+        );
+
+        StudipMail::sendMessage($user->email, $subject, $mailbody);
+
+        restoreLanguage();
         if ($user) {
             // spam/abuse-protection
             // if there are more than 5 tokens present, do NOT send another mail
diff --git a/app/views/course/cancel_dates/index.php b/app/views/course/cancel_dates/index.php
index 3c092bc..4f3e297 100644
--- a/app/views/course/cancel_dates/index.php
+++ b/app/views/course/cancel_dates/index.php
@@ -20,7 +20,7 @@
             <?= _('Benachrichtigung über ausfallende Termine an alle Teilnehmenden verschicken') ?>
         </label>
     </fieldset>
-    <? if ($issue_id) : ?>
+    <? if (!empty($issue_id)) : ?>
         <input type="hidden" name="issue_id" value="<?= $issue_id ?>">
     <? else : ?>
         <input type="hidden" name="termin_id" value="<?= $dates[0]->getTerminId() ?>">
diff --git a/app/views/oer/addfile/choose_file.php b/app/views/oer/addfile/choose_file.php
index 6c896cf..feb5b0f 100644
--- a/app/views/oer/addfile/choose_file.php
+++ b/app/views/oer/addfile/choose_file.php
@@ -12,7 +12,7 @@ if ($best_nine_tags && count($best_nine_tags) > 0) {
 <form class="oer_search"
       action="<?= $controller->link_for("oer/market/search") ?>"
       method="GET"
-      data-searchresults="<?= htmlReady(json_encode($material_data)) ?>"
+      data-searchresults="<?= htmlReady(json_encode($material_data ?? [])) ?>"
       data-filteredtag="<?= htmlReady(Request::get("tag")) ?>"
       data-filteredcategory="<?= htmlReady(Request::get("category")) ?>"
       data-tags="<?= htmlReady(json_encode($tags)) ?>"
diff --git a/lib/filesystem/CourseDateFolder.php b/lib/filesystem/CourseDateFolder.php
index 7c91c87..8bd54d2 100644
--- a/lib/filesystem/CourseDateFolder.php
+++ b/lib/filesystem/CourseDateFolder.php
@@ -119,7 +119,7 @@ class CourseDateFolder extends PermissionEnabledFolder implements FolderType
         } else {
             $this->folderdata['data_content']['permission'] = 5;
         }
-        $this->folderdata['description'] = $request['description'] ?: '';
+        $this->folderdata['description'] = $request['description'] ?? '';
         return $this;
     }
 
diff --git a/lib/models/RangeScale.php b/lib/models/RangeScale.php
index 44b946b..f935e4f 100644
--- a/lib/models/RangeScale.php
+++ b/lib/models/RangeScale.php
@@ -20,7 +20,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
 {
     public static function getIcon(bool $active = false) : Icon
     {
-        return Icon::create(static::getIconShape(), $active ? 'clickable' : 'info');
+        return Icon::create(static::getIconShape(), $active ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO);
     }
 
     /**
@@ -64,7 +64,11 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
         $answer = $this->getMyAnswer();
 
         $answers = Request::getArray('answers');
-        $userAnswer = (array) $answers[$this->getId()]['answerdata']['answers'];
+        if (!empty($answers[$this->getId()])) {
+            $userAnswer = (array)$answers[$this->getId()]['answerdata']['answers'];
+        } else {
+            $userAnswer = [];
+        }
         $answer->setData(['answerdata' => ['answers' => $userAnswer ] ]);
         return $answer;
     }
diff --git a/lib/raumzeit/SingleDate.class.php b/lib/raumzeit/SingleDate.class.php
index 3268935..2e8f41e 100644
--- a/lib/raumzeit/SingleDate.class.php
+++ b/lib/raumzeit/SingleDate.class.php
@@ -75,7 +75,7 @@ class SingleDate
         if ($data instanceOf CourseDate || $data instanceof CourseExDate) {
             $single_date_data = $data->toArray();
             $single_date_data['ex_termin'] = $data instanceOf CourseDate ? 0 : 1;
-            $single_date_data['resource_id'] = $data->room_booking->resource_id ?: '';
+            $single_date_data['resource_id'] = $data->room_booking->resource_id ?? '';
             if ($data instanceOf CourseDate) {
                 $single_date_data['related_persons'] = $data->dozenten->pluck('user_id');
                 $single_date_data['related_groups'] = $data->statusgruppen->pluck('statusgruppe_id');
@@ -147,9 +147,9 @@ class SingleDate
                 $after = $this->toString();
                 // logging
                 if ($before) {
-                    StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->id, $before . ' -> ' . $after);
+                    StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->termin_id, $before . ' -> ' . $after);
                 } else {
-                    StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->id, $after);
+                    StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->termin_id, $after);
                 }
 
                 return true;
-- 
cgit v1.0


From 8f3ad43e9375a242f64a21d3c651834849db2d10 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 17 Jun 2024 07:11:34 +0000
Subject: fixes #3990

Closes #3990

Merge request studip/studip!2839
---
 app/views/course/forum/index/_post.php   |  2 +-
 lib/classes/OpenGraph.php                | 81 +++++++++++++++++++++++---------
 templates/shared/opengraphinfo_wide.php  |  4 +-
 tests/unit/lib/VisualTest.php            |  1 -
 tests/unit/lib/classes/OpenGraphTest.php | 34 ++++++++++++++
 5 files changed, 96 insertions(+), 26 deletions(-)
 create mode 100644 tests/unit/lib/classes/OpenGraphTest.php

diff --git a/app/views/course/forum/index/_post.php b/app/views/course/forum/index/_post.php
index 7b6aaa0..192a414 100644
--- a/app/views/course/forum/index/_post.php
+++ b/app/views/course/forum/index/_post.php
@@ -91,7 +91,7 @@
 
             <span data-show-topic="<?= $post['topic_id'] ?>" data-topic-content="<?= $post['topic_id'] ?>" <?= $edit_posting != $post['topic_id'] ? '' : 'style="display: none;"' ?>>
                 <?= ForumHelpers::highlight($post['content'], $highlight) ?>
-                <?= OpenGraph::extract(formatReady(ForumEntry::removeQuotes($post['content_raw'])))->render() ?>
+                <?= OpenGraph::extract(ForumEntry::removeQuotes($post['content_raw']))->render() ?>
             </span>
         </div>
 
diff --git a/lib/classes/OpenGraph.php b/lib/classes/OpenGraph.php
index 75326aa..fb0ac5c 100644
--- a/lib/classes/OpenGraph.php
+++ b/lib/classes/OpenGraph.php
@@ -11,34 +11,71 @@ class OpenGraph
     /**
      * Extracts urls and their according open graph infos from a given string
      *
-     * @param String $string Text to extract urls and open graph infos from
+     * @param string $string Text to extract urls and open graph infos from
      * @return OpenGraphURLCollection containing the extracted urls
      */
-    public static function extract($string)
+    public static function extract(string $string): OpenGraphURLCollection
     {
-        $collection = new OpenGraphURLCollection;
-
-        if (Config::get()->OPENGRAPH_ENABLE) {
-            $regexp = StudipCoreFormat::getStudipMarkup('links')['start'];
-            $matched = preg_match_all('/' . $regexp . '/ums', $string, $matches, PREG_SET_ORDER);
-            foreach ($matches as $match) {
-                $url = $match[2];
-
-                if (!$url) {
-                    continue;
-                }
-
-                if (!isLinkIntern($url)) {
-                    $og_url = OpenGraphURL::fromURL($url);
-                    if ($og_url && !$collection->find($og_url->id)) {
-                        $og_url->store();
-
-                        $collection[] = $og_url;
-                    }
-                }
+        $collection = new OpenGraphURLCollection();
+
+        if (!Config::get()->OPENGRAPH_ENABLE) {
+            return $collection;
+        }
+
+        if (Studip\Markup::isHtml($string)) {
+            $urls = self::extractUrlsFromHtml($string);
+        } else {
+            $urls = self::extractUrlsFromText($string);
+        }
+
+        foreach ($urls as $url) {
+            $og_url = OpenGraphURL::fromURL($url);
+            if ($og_url && !$collection->find($og_url->id)) {
+                $og_url->store();
+
+                $collection[] = $og_url;
             }
         }
 
         return $collection;
     }
+
+    public static function filterURLs(array $urls): array
+    {
+        return array_filter($urls, function (string $url): bool {
+            if (!$url) {
+                return false;
+            }
+
+            return !isLinkIntern($url);
+        });
+    }
+
+    public static function extractUrlsFromText(string $text): array
+    {
+        $regexp = StudipCoreFormat::getStudipMarkup('links')['start'];
+        preg_match_all('/' . $regexp . '/ums', $text, $matches, PREG_SET_ORDER);
+        $urls = array_column($matches, 2);
+
+        return self::filterURLs($urls);
+    }
+
+    public static function extractUrlsFromHtml(string $html): array
+    {
+        $document = new DOMDocument();
+        $document->loadHTML($html, LIBXML_NOWARNING | LIBXML_NOERROR);
+
+        $elements = $document->getElementsByTagName('a');
+
+        $urls = [];
+        foreach ($elements as $element) {
+            if (!$element->hasAttribute('href')) {
+                continue;
+            }
+
+            $urls[] = $element->getAttribute('href');
+        }
+
+        return self::filterURLs($urls);
+    }
 }
diff --git a/templates/shared/opengraphinfo_wide.php b/templates/shared/opengraphinfo_wide.php
index ddcd19c..44ce918 100644
--- a/templates/shared/opengraphinfo_wide.php
+++ b/templates/shared/opengraphinfo_wide.php
@@ -18,12 +18,12 @@ if (Config::get()->LOAD_EXTERNAL_MEDIA === "proxy" && Seminar_Session::is_curren
 ?>
 <div class="opengraph <? if (count($videofiles) > 0) echo 'video'; ?> <? if (count($audiofiles) > 0) echo 'audio'; ?>">
 <? if ($og['image'] && count($videofiles) === 0): ?>
-    <a href="<?= URLHelper::getLink($og['url'], [], false) ?>" class="image"
+    <a href="<?= URLHelper::getLink($og['url'], [], true) ?>" class="image"
        target="_blank" rel="noopener noreferrer"
        style="background-image:url(<?= htmlReady($media_url_func($og['image'])) ?>)">
     </a>
 <? endif; ?>
-    <a href="<?= URLHelper::getLink($og['url'], [], false) ?>" class="info"
+    <a href="<?= URLHelper::getLink($og['url'], [], true) ?>" class="info"
        target="_blank" rel="noopener noreferrer">
         <strong><?= htmlReady($og['title']) ?></strong>
     <? if (!count($videofiles)) : ?>
diff --git a/tests/unit/lib/VisualTest.php b/tests/unit/lib/VisualTest.php
index ae9263f..2e75b1f 100644
--- a/tests/unit/lib/VisualTest.php
+++ b/tests/unit/lib/VisualTest.php
@@ -10,7 +10,6 @@
  */
 
 require_once 'lib/classes/SimpleORMap.class.php';
-require_once 'lib/models/OpenGraphURL.class.php';
 require_once 'lib/visual.inc.php';
 require_once 'lib/classes/Config.class.php';
 
diff --git a/tests/unit/lib/classes/OpenGraphTest.php b/tests/unit/lib/classes/OpenGraphTest.php
new file mode 100644
index 0000000..416660b
--- /dev/null
+++ b/tests/unit/lib/classes/OpenGraphTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ */
+class OpenGraphTest extends \Codeception\Test\Unit
+{
+    public function setUp(): void
+    {
+        static $config = [
+            'OPENGRAPH_ENABLE'    => true,
+        ];
+
+        Config::set(new Config($config));
+    }
+
+    public function testURLExtraction()
+    {
+        $text = 'this is a link: https://example.org?foo=bar&bar=foo - believe it or not';
+        $urls = OpenGraph::extractUrlsFromText($text);
+
+        $this->assertCount(1, $urls);
+        $this->assertEquals('https://example.org?foo=bar&bar=foo', $urls[0]);
+    }
+
+    public function testURLExtractionFromHTML()
+    {
+        $html = Studip\Markup::HTML_MARKER . '<a href="https://example.org?foo=bar&amp;bar=foo">this is a link</a> - believe it or not';
+        $urls = OpenGraph::extractUrlsFromHtml($html);
+
+        $this->assertCount(1, $urls);
+        $this->assertEquals('https://example.org?foo=bar&bar=foo', $urls[0]);
+    }
+}
-- 
cgit v1.0


From 0850b4ce0be34ac6cae3077293e04059ba8324aa Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 17 Jun 2024 07:56:14 +0000
Subject: fixes #4311

Closes #4311

Merge request studip/studip!3115
---
 lib/classes/helpbar/Helpbar.php |  2 +-
 templates/helpbar/helpbar.php   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/classes/helpbar/Helpbar.php b/lib/classes/helpbar/Helpbar.php
index cc2c619..c4abfc4 100644
--- a/lib/classes/helpbar/Helpbar.php
+++ b/lib/classes/helpbar/Helpbar.php
@@ -265,7 +265,7 @@ class Helpbar extends WidgetContainer
             $template = $GLOBALS['template_factory']->open('helpbar/helpbar');
             $template->widgets   = $this->widgets;
             $template->open      = $this->open;
-            $template->tour_data = $tour_data;
+            $template->tour_data = $tour_data ?? null;
             $content = $template->render();
         }
 
diff --git a/templates/helpbar/helpbar.php b/templates/helpbar/helpbar.php
index cc77053..6f8efbb 100644
--- a/templates/helpbar/helpbar.php
+++ b/templates/helpbar/helpbar.php
@@ -1,5 +1,11 @@
+<?php
+/**
+ * @var bool $open
+ * @var Widget[] $widgets
+ */
+?>
 <div class="helpbar-container">
-    <?= SkipLinks::addIndex(_('Tipps & Hilfe'), 'helpbar_icon', 920) ?>
+    <? SkipLinks::addIndex(_('Tipps & Hilfe'), 'helpbar_icon', 920) ?>
     <a id="helpbar_icon" href="#" class="helpbar-toggler" data-toggles=".helpbar" role="button"
        title="<?= _('Hilfelasche anzeigen/verstecken') ?>" aria-controls="helpbar-content"
        aria-expanded="<?= $open ? 'true' : 'false' ?>">
@@ -41,7 +47,7 @@
         </ul>
     </div>
 </div>
-<? if ($tour_data['active_tour_id']) : ?>
+<? if (!empty($tour_data['active_tour_id'])) : ?>
     <script>
         STUDIP.Tour.init('<?=$tour_data['active_tour_id']?>', '<?=$tour_data['active_tour_step_nr']?>')
     </script>
-- 
cgit v1.0


From f2dd56afd93cae70a7462cfc6336b89dfeee7fb5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 17 Jun 2024 08:21:04 +0000
Subject: fixes #4277

Closes #4277

Merge request studip/studip!3116
---
 .../JsonApi/Routes/Files/SubfoldersIndex.php       | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/classes/JsonApi/Routes/Files/SubfoldersIndex.php b/lib/classes/JsonApi/Routes/Files/SubfoldersIndex.php
index e8f4d13..f0ad18c 100644
--- a/lib/classes/JsonApi/Routes/Files/SubfoldersIndex.php
+++ b/lib/classes/JsonApi/Routes/Files/SubfoldersIndex.php
@@ -19,20 +19,31 @@ class SubfoldersIndex extends JsonApiController
      */
     public function __invoke(Request $request, Response $response, $args)
     {
-        if (!$folder = \FileManager::getTypedFolder($args['id'])) {
+        $folder = \FileManager::getTypedFolder($args['id']);
+        if (!$folder) {
             throw new RecordNotFoundException();
         }
 
-        if (!Authority::canShowFolder($this->getUser($request), $folder)) {
+        $user = $this->getUser($request);
+
+        if (!Authority::canShowFolder($user, $folder)) {
             throw new AuthorizationFailedException();
         }
 
-        $subfolders = array_map(
-            function ($subfolder) {
-                return $subfolder->getTypedFolder();
+        $subfolders = array_reduce(
+            $folder->subfolders->getArrayCopy(),
+            function ($result, $subfolder) use ($user) {
+                $folder = $subfolder->getTypedFolder();
+
+                if (Authority::canShowFolder($user, $folder)) {
+                    $result[] = $folder;
+                }
+
+                return $result;
             },
-            $folder->subfolders->getArrayCopy()
+            []
         );
+
         list($offset, $limit) = $this->getOffsetAndLimit();
 
         return $this->getPaginatedContentResponse(
-- 
cgit v1.0


From 16fb672ada8af96ec6b991e89e4d7220363a0cc4 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 17 Jun 2024 11:05:45 +0000
Subject: dont ignore cid, closes #4313

Closes #4313

Merge request studip/studip!3117
---
 lib/navigation/LoginNavigation.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/navigation/LoginNavigation.php b/lib/navigation/LoginNavigation.php
index f5a1a38..7eb3cf0 100644
--- a/lib/navigation/LoginNavigation.php
+++ b/lib/navigation/LoginNavigation.php
@@ -36,7 +36,11 @@ class LoginNavigation extends Navigation
                 $standard_login_active = true;
             }
             if ($auth_plugin instanceof StudipAuthSSO && isset($auth_plugin->login_description)) {
-                $navigation = new Navigation($auth_plugin->plugin_fullname . ' ' . _('Login'), '?sso=' . $auth_plugin->plugin_name);
+                $navigation = new Navigation(
+                    $auth_plugin->plugin_fullname . ' ' . _('Login'),
+                    Request::url(),
+                    ['again' => 'yes', 'sso' => $auth_plugin->plugin_name, 'cancel_login' => 1]
+                );
                 $navigation->setDescription($auth_plugin->login_description);
                 $this->addSubNavigation('login_' . $auth_plugin->plugin_name, $navigation);
             }
-- 
cgit v1.0


From d7b52c34df2c8dc1b41127f966a42277b3dc510f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 18 Jun 2024 06:36:17 +0000
Subject: add illuminate/collections, fixes #4314

Closes #4314

Merge request studip/studip!3118
---
 composer.json |   3 +-
 composer.lock | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 198 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index bd01b28..218f448 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,8 @@
         "vlucas/phpdotenv": "^5.6",
         "edu-sharing/auth-plugin": "8.0.x-dev",
         "psr/cache": "3.0.0",
-        "laravel-json-api/neomerx-json-api": "5.0.2"
+        "laravel-json-api/neomerx-json-api": "5.0.2",
+        "illuminate/collections": "^10.48"
     },
     "replace": {
         "symfony/polyfill-php73": "*",
diff --git a/composer.lock b/composer.lock
index 2392a40..c9814d0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3cab15d3a1cd08dde4cd02d5bb19c760",
+    "content-hash": "be0994b08d5455c5b4d6512e6d019659",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -533,6 +533,201 @@
             "time": "2023-12-03T20:05:35+00:00"
         },
         {
+            "name": "illuminate/collections",
+            "version": "v10.48.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/illuminate/collections.git",
+                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95",
+                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/conditionable": "^10.0",
+                "illuminate/contracts": "^10.0",
+                "illuminate/macroable": "^10.0",
+                "php": "^8.1"
+            },
+            "suggest": {
+                "symfony/var-dumper": "Required to use the dump method (^6.2)."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "10.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "helpers.php"
+                ],
+                "psr-4": {
+                    "Illuminate\\Support\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "The Illuminate Collections package.",
+            "homepage": "https://laravel.com",
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2024-03-20T20:09:13+00:00"
+        },
+        {
+            "name": "illuminate/conditionable",
+            "version": "v10.48.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/illuminate/conditionable.git",
+                "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/illuminate/conditionable/zipball/d0958e4741fc9d6f516a552060fd1b829a85e009",
+                "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Illuminate\\Support\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "The Illuminate Conditionable package.",
+            "homepage": "https://laravel.com",
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2023-02-03T08:06:17+00:00"
+        },
+        {
+            "name": "illuminate/contracts",
+            "version": "v10.48.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/illuminate/contracts.git",
+                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
+                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1",
+                "psr/container": "^1.1.1|^2.0.1",
+                "psr/simple-cache": "^1.0|^2.0|^3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Illuminate\\Contracts\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "The Illuminate Contracts package.",
+            "homepage": "https://laravel.com",
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2024-01-15T18:52:32+00:00"
+        },
+        {
+            "name": "illuminate/macroable",
+            "version": "v10.48.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/illuminate/macroable.git",
+                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27",
+                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Illuminate\\Support\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "The Illuminate Macroable package.",
+            "homepage": "https://laravel.com",
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2023-06-05T12:46:42+00:00"
+        },
+        {
             "name": "jakeasmith/http_build_url",
             "version": "1.0.1",
             "source": {
-- 
cgit v1.0


From 1251e31ff927669abbddf61d08e458667d1d515b Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 18 Jun 2024 07:41:19 +0000
Subject: Resolve "Exception in OpenGraph::extract() bei null-String"

Closes #4319

Merge request studip/studip!3119
---
 lib/classes/OpenGraph.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/classes/OpenGraph.php b/lib/classes/OpenGraph.php
index fb0ac5c..845f5cb 100644
--- a/lib/classes/OpenGraph.php
+++ b/lib/classes/OpenGraph.php
@@ -11,14 +11,14 @@ class OpenGraph
     /**
      * Extracts urls and their according open graph infos from a given string
      *
-     * @param string $string Text to extract urls and open graph infos from
+     * @param string|null $string Text to extract urls and open graph infos from
      * @return OpenGraphURLCollection containing the extracted urls
      */
-    public static function extract(string $string): OpenGraphURLCollection
+    public static function extract(?string $string): OpenGraphURLCollection
     {
         $collection = new OpenGraphURLCollection();
 
-        if (!Config::get()->OPENGRAPH_ENABLE) {
+        if (!Config::get()->OPENGRAPH_ENABLE || !$string) {
             return $collection;
         }
 
-- 
cgit v1.0


From a79395ee66aafbe16e8e257bc2d0d0addc7780ce Mon Sep 17 00:00:00 2001
From: Stefan Suchi <suchi@data-quest.de>
Date: Tue, 18 Jun 2024 09:37:33 +0000
Subject: prepare release 5.4.3

(cherry picked from commit ac7f33a104585134c8fe112cefe2810fb6151873)

(cherry picked from commit ddbb9d7bb7ac4f7e91f7e1159751680e50aeed18)
---
 ChangeLog.md | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 236 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index f835d5d..78662e6 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,239 @@
+# 18.06.2024 v 5.4.3
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.4.3&state=all
+- Verwaltung von Veranstaltungen: Lehrendenfilter wird angewendet, obwohl das nicht angezeigt wird [#991]
+- Nachrichten: Dialoge haben kein data-secure [#2908]
+- Verlinkung bei der Raumverwaltung > Auflösen von Raumanfragen [#2956]
+- Courseware: Bildvergleich im Tabs und Accordion Abschnitt im Lesemodus "weg" [#3192]
+- Veranstaltungshierarchie: Aktionen in der Contentbar funktionieren nach Schließen des Dialogs nicht mehr [#3490]
+- Textarea fängt an rückwärts zu schreiben [#3510]
+- MyCoursesController::getMyCoursesData(): Argument 1 ($sem_courses) must be of type array, null given [#3740]
+- Courseware: Bild zum Lernmaterial kann nicht mehr entfernt werden [#3742]
+- Contentbar verdeckt Content im Wiki im Kompaktmodus [#3749]
+- Icons von Meetings, Kalender und Stoodle sind schwarz statt blau [#3801]
+- Semesterfilter für Benutzer verwendet noch all [#3803]
+- Forum: Beitrag zitieren/antworten hat neuerdings verwirrende UI [#3816]
+- Nachladen bei Blubber funktioniert nicht [#3817]
+- Blubber: Performance der Routen zum Teil überarbeitungswürdig [#3819]
+- Blubber: Avatare sind schwammig [#3820]
+- Semesterfilter für Benutzer verwendet noch all [#3821]
+- MyRealmModel - Warning: max(): Array must contain at least one element [#3822]
+- Fehler bei einer Raumanfrage [#3825]
+- Warnungen in den Raumanfragen [#3833]
+- Doc-Block in Contact.class.php fehlerhaft [#3839]
+- Semesterwechsel funktioniert nicht [#3844]
+- Anzahl der Veranstaltungen in der Unterebene beim VVZ passt nicht [#3852]
+- Sichtbarkeitseinstellung: irreführender Hinweis [#3859]
+- Umschalten der Ansicht im Veranstaltungsverzeichnis springt wieder an den Anfang zurück [#3867]
+- Raumverwaltung: Raumplanung > Anfragenplan [#3873]
+- Sortierung im Admin-Veranstaltungs-Übersichtsbereich [#3888]
+- Falsche Information für Admin-Verwaltung bei TN-Zahl [#3906]
+- CW: Bilderpool kann nur einmal bei Lernmaterialien ausgewählt werden [#3908]
+- PDF-Export der Veranstaltungsübersicht ist leer [#3925]
+- Sortieren nach Semester auf Veranstaltungsadminseite alphabetisch nicht zeitlich [#3926]
+- Kompaktmodus: Wiki und Benutzerverwaltung [#3927]
+- Veranstaltungsadministration - Verwaiste View [#3930]
+- Docker-Container zum Testen sollen mit WebP umgehen können und  im "main" mit PHP 8.3 statt PHP 8.2 laufen [#3935]
+- Logout Success Messagebox fehlt ab 5.4 [#3937]
+- PHP-Warnungen im Blubber [#3939]
+- Kopieren und einfügen aus der Merkliste mit Text Blöcken wirft Fehler [#3942]
+- Modulfilter bei "Meine Veranstaltungen" [#3946]
+- Raumanfragen - Gewünschte Eigenschaften werden leer abgespeichert [#3947]
+- PDFs werden nicht richtig skaliert [#3948]
+- Blubber - Neue Konversation erstellen - Dialog sieht kaputt aus [#3952]
+- Verwendung von get_called_class() in SimpleORMap behindert Discovery in IDEs [#3976]
+- Raumanfragen brechen mit einem Fehler ab [#3980]
+- SQL-Fehler im Stundenplan [#3981]
+- CLI-Cronjobs ohne ID führt zu einem Fehler [#3982]
+- Fehler in den Raumanfragen aus Raum/Zeit [#3991]
+- Nicht mehr benötigte Funktion im Admin_CoursesController [#3996]
+- Performance von AdminCourseFilter::getCourses() ist nicht optimal [#3999]
+- Weitere Probleme in den Raumanfragen [#4000]
+- PHP-Warnungen in der showNews.inc.php [#4001]
+- Fehler bei einer Raumanfrage bei der Anzahl der Sitzplätze [#4004]
+- Raumanfrage: Call to a member function getRequestableProperties() on null [#4010]
+- Admin-Filter nach Lehrenden und Studiengangteilen werden nicht zurückgesetzt [#4018]
+- VA-Admin, Filter Veranstaltungsverwaltung, Veranstaltungszugriff in Veranstaltungen [#4030]
+- Mangelnde Tastatur-Bedienbarkeit im Veranstaltungsverzeichnis [#4031]
+- Beim Navigieren durch das Vorlesungsverzeichnis aktualisiert sich der Seitentitel nicht [#4035]
+- Lehrendenfilter zeigt keine Einträge bei "Einrichtung + Institute" [#4050]
+- Einrichtungsfilter zeigt falschen Wert bei "Einrichtung + Institute" [#4051]
+- Verwaltung von Veranstaltungen: Lehrendenfilter wird angewendet, obwohl das nicht angezeigt wird [#4053]
+- PHP - Fehler im Kalender [#4063]
+- PHP8-Warnungen [#4086]
+- PERSONALDOCUMENT_ENABLE wird noch verwendet? [#4093]
+- PHP - Warnungen in den Fragebögen [#4098]
+- PHP8 Warning Administration von Veranstaltungen [#4107]
+- Verwaltung von Veranstaltungen: Einrichtungsfilter filtert bei "Fakultät + Institute" nur auf die Fakultät [#4108]
+- SimpleOrMapNodbTest.php:testI18nFields schlägt fehl, wenn man nur eine Sprache konfiguriert hat [#4129]
+- SORM und IDE vertragen sich nicht so gut [#4130]
+- Verwaltung von Veranstaltungen: Lehrendenfilter zeigt zuviele Einträge [#4146]
+- Courseware: DokumentenBlock skaliert falsch [#4186]
+- Fragebögen: Frageoptionen werden überschrieben wenn Fragen kopiert werden [#4208]
+- VA-Administration: Filter nach Text-Datenfelder funktionieren nicht [#4215]
+- CLI-Kommando oauth2:keys ist (immer noch) defekt [#4223]
+- Sortierung auf der Veranstaltungsseite für Admins ist nicht konsistent [#4226]
+- Alter Blubber: Kontrastverhältnisse Text zu Hintergrund prüfen und korrigieren (Hochkontrastansicht) [#4232]
+- Fix typo in cli command `oauth2:keys`. [#4239]
+- Veranstaltungshierarchie: Fehler beim Anlegen von Unterelementen [#4257]
+- Suche in der Sidebar löscht ihren Inhalt beim Drücken von Enter [#4274]
+- Loggin im Dateibereich defekt [#4280]
+- PHP-Warnungen in den Raumanfragen [#4281]
+
+# 17.06.2023 v 5.3.6
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.3.6&state=all
+- Courseware - Import schlägt fehl [#2565]
+- Fehler bei der Anzeige aus Arbeitsplatz in Veranstaltung kopierter Fragebögen [#2927]
+- Courseware: Fehler beim Verschieben von Blöcken in einen Tabs-Abschnitt [#3151]
+- Studierende mit Schreibrechten können sich die Schreibrechte und Leserechte entziehen [#3340]
+- Fragebogen: Likertskala und Polskala zeigen Aussagen immer in zufälliger Reihenfolge an [#3460]
+- Fragebögen: Einleitungstext kann bei Likert-Skala und Pol-Skala nicht eingegeben werden [#3466]
+- Fragebogen: Auswahlfrage zeigt Aussagen in zufälliger Reihenfolge an [#3526]
+- Fragebogen: Änderung der Option "Pflichtfrage" wird nicht gespeichert [#3691]
+- Mein Arbeitsplatz: Text läuft aus Kachel in mobiler Ansicht [#3725]
+- PHP8-Warnungen [#3741]
+- PHP8-Warnungen [#3793]
+- Modulkontakte sortieren [#3797]
+- Courseware - VUE Warnungen [#3829]
+- aria-expanded ist bei der responsiven Navigation am falschen Element [#3858]
+- PHP8-Warnungen [#3890]
+- Raumanfrage: Liste der Räume steht nicht mehr rechts im Dialog [#3903]
+- Fragebögen: Zu Auswahlfrage ohne Antworten können keine Antworten hinzugefügt werden [#3914]
+- Fragebögen: Auswahlfrage ohne Fragetext wird beim Bearbeiten "geleert" [#3915]
+- Fragebögen: Fehler beim Speichern, wenn man als Startzeitpunkt "händisch" auswählt [#3916]
+- PHP Warnung in den Plugin-Administration [#3928]
+- Courseware - DateiordnerBlock funktioniert nicht richtig [#3934]
+- Barrierefreiheit: "Back to top" ist nicht per Tabulator erreichbar [#3941]
+- I18NString ignoriert  den default-Wert [#3943]
+- PHP - Fehler in der Courseware [#3949]
+- Barrierefreiheit: Auf- und Zuklappverhalten für Screenreader kennzeichnen [#3960]
+- Return Type Probleme beim DI-Container [#3968]
+- Tägliche Benachrichtigungen:  seminar_id statt range_id  in  notification_text.php [#3978]
+- Methode NewsRangesSearch::getResults() ist für Berechtigung "admin" defekt [#3992]
+- CSS-Klasse "list-unstyled" ist verlorengegangen [#3997]
+- Responsive Navigation erscheint auf dem Desktop nicht, wenn ein Anker angesprungen wird [#4005]
+- Weitere PHP8-Warnings [#4012]
+- Avatare und Asset-Images via Vue haben kein alt-Attribut im Image-Tag [#4014]
+- PHP-Warnungen in den Studiengruppen [#4019]
+- CLI-Kommando "check:globalized-config" ist defekt [#4024]
+- Weitere PHP8-Warnungen [#4026]
+- Meine Veranstaltungen: Fehlende Textalternativen für die angezeigte Farbgruppierung [#4036]
+- Fehlende textuelle Beschreibungen für Icons im Dateibereich [#4037]
+- Dialogtitel sind nicht als Überschrift gekennzeichnet und nicht modal [#4038]
+- article.studip und fieldsets kennzeichnen nicht ihren auf-/zugeklappten Zustand für Screenreader mit aria-expanded [#4040]
+- BlubberThread::getContextTemplate() geht von falscher Annahme für StudipModule::getTabNavigation() aus [#4041]
+- Das Skiplink-Menü enthält Skiplinks, die nirgendwohin verweisen [#4049]
+- Fehlende aria-Informationen für Warndialoge und fehlerhafte Aria-Sortierinformation für Tabellen [#4064]
+- Vertikale Ausrichtung von Text wird nicht übernommen [#4067]
+- Responsive Ansicht von Veranstaltungen unterscheidet sich von der normalen Ansicht [#4076]
+- PHP8-Warnungen [#4077]
+- Listenelemente sind nicht syntaktisch korrekt ausgezeichnet [#4088]
+- Datentabellen im Bereich "Forum" sind nicht korrekt aufgebaut/beschriftet [#4089]
+- Formularfelder sind nicht mit einem label verknüpft [#4091]
+- CLI-Kommando `plugin:register` hat ein anderes Verhalten [#4099]
+- PHP8-Warnungen in SimpleORMap::import() [#4100]
+- Formular zum Barrieremelden lässt sich effektiv nicht abschalten [#4112]
+- PHP - Warnungen im OER-Campus [#4114]
+- Formular zum Melden einer Barriere erzeugt ggf. unnötig lange URLs [#4115]
+- PHP8  Warnungen im Forum [#4127]
+- PHP8-Warnungen [#4128]
+- Courseware Abschnitt-Liste-Element Bearbeitungsmodus Icons verschoben [#4142]
+- Globale Variable ASSETS_URL soll erst nach dem Laden der Konfiguration gesetzt werden [#4143]
+- PHP8-Warnungen [#4168]
+- PHP - Warnungen in dates.inc.php [#4178]
+- Beschriftung des Formularfelds ist nicht mit dem dazugehörigen Feld verknüpft [#4183]
+- PHP8-Warnungen [#4210]
+- PHP8-Warnungen [#4221]
+- Gruppen von Formularelementen strukturieren [#4224]
+- Kontrastverhältnisse Text zu Hintergrund prüfen und korrigieren (Normal- und Hochkontrastansicht) [#4225]
+- Sortierungspfeile im Tabellenkopf sind verloren gegangen [#4227]
+- Name des markierten Formularfeldes enthält nicht den sichtbaren Text [#4235]
+- Pflichtfelder beim Schreiben einer neuen Nachricht werden nicht als solche gekennzeichnet [#4237]
+- PHP8-Warnung bei  Verwendungen von PageLayout::disableHeader() [#4242]
+- Suchfeld im Adminbereich verschwunden [#4249]
+- Ablaufplan: Warnmeldung, wenn Termin "ohne Semester" ist [#4275]
+- PHP8-Warnungen [#4279]
+- Fragebogen: Single Choice CSV-Export unnötig kompliziert [#4308]
+- PHP - Warnungen / Fehler [#4310]
+- PHP8-Warnungen, wenn die Hilfetouren abgeschaltet sind [#4311]
+
+# 17.06.2024 v 5.2.8
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.2.8&state=all
+- Fehler im Quellcode der Raumverwaltung -> Raumübersicht [#1421]
+- CW: Externe Ansicht bei einigen Blöcken [#3887]
+- Angabe fürs Umfärben des Platzhalters von Eingabefeldern im Hochkontrastmodus wird nicht übernommen [#3902]
+- admin oder root kann eine Veranstaltung in eine Studiengruppe umwandeln [#3921]
+- Barrierefreiheit: Leeres alt-Attribut bei Verwendung von studip-icon [#3931]
+- Nachträgliche Gruppenzuweisung zu einem Termin wird nicht übernommen [#3995]
+- Falscher Link zu OER-Material in Abo-Nachricht [#4052]
+- Cronjobs: Exceptions beim Ausführen werden nicht korrekt verarbeitet [#4096]
+- TypeError: STUDIP.Audio is undefined [#4207]
+- Gradebook: Beim Speichern einer Note wird das chdate immer aktualisiert [#4283]
+- Fehler beim Authorisieren einer OAuth2-App mittels SSO [#4288]
+
+# 17.06.2024 v 5.1.9
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.1.9&state=all
+- Datenfelder: Undefined variable $object_type [#1757]
+- JSON-API: OAuthRequestVerifier prüft falsche Signatur, wenn ein Request-Parameter als Array übergeben wird [#1971]
+- Log-Events für Aktion SINGLEDATE_CHANGE_TIME und SEM_ADD_SINGLEDATE werden mit ungültigem Werten angelegt [#2735]
+- Selbst hochgeladene Dateien in Ordnern ohne Lesezugriff schlecht sichtbar [#2954]
+- MailQueueEntry::send prüft nicht darauf, ob die Mail Empfänger hat [#3523]
+- Nested fieldsets erben styling vom collapsable [#3704]
+- CW-IFRAME-Block [#3823]
+- Statusgruppen werfen beim Löschen ein Fehler [#3845]
+- SORM: Mehrere Aliase auf die gleiche Spalte sind nicht möglich [#3876]
+- PHP Warning:  call_user_func_array() expects parameter 1 to be a valid callback, class 'Statusgruppen' does not have a method 'cbRemoveTasks' [#3891]
+- Request::getDateTime() liefert falschen Zeitpunkt [#3895]
+- Wiki: Übergeordnete Seite im Inhaltsverzeichnis geht bei Import verloren [#3900]
+- Temporäre Buchungsrechte: Rechte- und Buchungszeitraum identisch [#3907]
+- Nutzerverwaltung: "gesperrt von" zeigt eigenen Username [#3932]
+- OER-Campus: Suche speichert nicht korrekt, dass schonmal in kürzester Zeit gesucht wurde [#3944]
+- Studiengruppennamen bleiben rot [#3956]
+- Dialog „Nachricht schreiben“: „Mehrere Adressaten hinzufügen“ hat drei Beschreibungen, die vorgelesen werden [#3961]
+- Der Text von Tooltip-Icons wird nur als „leer“ vorgelesen [#3962]
+- OER Campus: Suche nach Autoren von Materialien hat schlechte Performance [#3964]
+- ILIAS Schnittstelle: SOAP Methode getUser wird noch an einer Stelle verwendet [#3966]
+- CSS-Klasse .list-csv hat unnötigen Abstand nach rechts [#3969]
+- Plugin wird weiterhin als StandardPlugin angesehen [#3977]
+- OpenGraph: Anzeige der URL escapet zuviel [#3990]
+- Funktion zum Erstellen einer Raumanfrage gehört nicht in den Dialog [#4003]
+- Barrierefreiheit: Größer gestellter Text wächst aus Box [#4006]
+- Auswahlelemente von Datei-Nutzungsbedingungen und Ordnertyp: Radio-Buttons sind nicht als solche erkennbar [#4009]
+- URL-Validierung in CoursewareIframeBlock sollte überarbeitet werden [#4021]
+- Positionsangaben von Elementen in Texten sind nicht barrierefrei [#4022]
+- Barrierefreiheit: Blubber für 200% [#4023]
+- Links von der Admin-Verwaltungsseite sollten immer auf die Grunddaten einer Veranstaltung zeigen [#4028]
+- MultiPersonSearch: Icons zum Suchen und Zurücksetzen sind nicht per Tastatur erreichbar [#4029]
+- Installationsskript kann nicht gestartet werden, wenn Warnungen aktiviert sind [#4034]
+- Doppeltes Id Attribut auf der Nachrichtenseite [#4039]
+- MessageBox sollte als Statusmeldung ausgezeichnet werden [#4042]
+- PHP 8: Too few arguments to function Trails_Dispatcher::error_handler() [#4045]
+- Profilseite: Icons von Aktionen haben keine Textalternative [#4046]
+- Gruppenzuordnung von Veranstaltungen ist nicht barrierefrei [#4047]
+- Stundenplan: Auswahl der Farbe für Termine ist nicht barrierefrei [#4048]
+- Verwaltung von Veranstaltungen: Duplikate im Lehrendenfilter [#4054]
+- Zeiten/Räume-Seite: Aktionen „Neue Raumanfrage“ und „Raumanfrage bearbeiten“ im Drei-Punkte-Menü von Einzelterminen funktioniert nicht in Stud.IP 5.3 [#4057]
+- Barrierefreiheit: Blubber Benachrichtigungsstatus ist nicht für Screenreader erkennbar [#4061]
+- Seite "Anzeige der Log-Events" ist sehr langsam, wenn kein Filter gewählt ist [#4062]
+- ResourceNavigation wird nicht richtig initialisiert [#4065]
+- Barrierefreiheit: Globale Suche nicht barrierefrei nutzbar [#4072]
+- Ilias Schnittstelle: Automatisch angelegte Benutzer können sich in Ilias nicht anmelden (Ilias 8) [#4081]
+- Anzeige von freier Raumangabe enthält zu viele Klammern [#4092]
+- Vue-Fehler in Blubber (Developer-Server) [#4097]
+- Terminvergabe: Ortsangabe bei nicht gruppierter Anzeige falsch [#4103]
+- Anmeldesets: Nutzer können beliebige Anmeldesets löschen [#4144]
+- Fehlende Indizes bei schedule_seminare verlangsamen Löschen von VAs [#4157]
+- "Freie" sollte "Freie Veranstaltungen" heissen [#4222]
+- SORM-Relation kann nicht auf NULL gesetzt werden [#4233]
+- ConsultationBlock::range_display gibt für Einrichtungen fälschlicherweise "Veranstaltung" aus [#4234]
+- Kaputte Darstellung von Tooltips [#4251]
+- JSON-API: Route "/folders/{id}/folders" zeigt unsichtbare Unterordner an [#4277]
+- Fehlerbehandlung im Chunk Loader [#4287]
+- STUDIP.loadChunk is not a function [#4293]
+
 # 14.03.2024 v 5.4.2
 
 https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.4.2&state=all
-- 
cgit v1.0


From f32966b5a9d88f780d440c1e731ba5649a0df904 Mon Sep 17 00:00:00 2001
From: Stefan Suchi <suchi@data-quest.de>
Date: Tue, 18 Jun 2024 10:28:33 +0000
Subject: prepare release 5.5, re #3614

(cherry picked from commit 3b4d2a4d6b508865c71586054233c7d9cbb15442)
---
 ChangeLog.md | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 228 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 78662e6..beec59b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,231 @@
+# 18.06.2024 v 5.5
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.5&state=all
+- Anspringen von Ankündigungen soll diese gleich öffnen [#912]
+- Überarbeitung des Terminkalenders in Stud.IP [#1354]
+- Kalender/Stundenplan: Teilweise schwierige Kontraste der Farbboxen [#1368]
+- Wiki: Autor:innenzuordnung in der Versionierung ausschließlich über Farben [#1377]
+- Registrierungsformular mit FormBuilder neu bauen [#1559]
+- Wiki: Wiki-Seiten sollen umbenannt werden können [#1790]
+- StEP00370 Neuprogrammierung der "Externen Seiten" [#1800]
+- Neuentwicklung der Exporte [#1959]
+- Aktuelle Termine führen nicht zur Veranstaltung [#2011]
+- LESS/SCSS-Farbvariablen durch CSS-Variablen ersetzen [#2125]
+- Courseware: Bewertung von Lernmaterialien [#2472]
+- Werkzeugleiste für Courseware [#2488]
+- Hinzufügen von Blöcken/Abschnitten per Drag&Drop [#2532]
+- Courseware-CSS nur bei Bedarf laden [#2627]
+- Nutzendenfreundliche Umgestaltung der Loginseite [#2660]
+- Fragebogen: Sortierung nach Spaltenüberschriften [#2822]
+- Likertskala und Polskala sollen absolute Zahlen in der Auswertungen anzeigen [#2911]
+- Nachrichten: Textstrings „Nachrichten im Posteingang löschen“ und „Nachrichten im Postausgang löschen“ ersetzen [#2975]
+- Trennlinien in Aktionsmenüs ermöglichen [#3013]
+- Fehler beim Zustellen von E-Mails an den Absender senden lassen [#3023]
+- Lernmaterialien in Courseware sortieren [#3032]
+- Array bei UNI_LOGOUT_ADD zulassen [#3092]
+- Widget-Verwaltung der Startseite auf SORM umstellen [#3094]
+- Neugestaltung der ersten Seite eines Lernmaterials (Courseware) [#3111]
+- Lernmaterial OER-Metadaten nur bei Inhaltstyp OER-Material anzeigen [#3112]
+- Aufräumen von object_user_visits in den GarbageCollector aufnehmen [#3113]
+- Mindestanforderung auf PHP 7.4 hochsetzen [#3123]
+- Informationsseite zu Leichter Sprache bereitstellen [#3132]
+- Avatare als WebP statt als PNG speichern [#3183]
+- JSONAPI Routen für Feedback Elemente und Einträge [#3185]
+- Keine unbegrenzten Veranstaltungen mehr in der Kategorie Lehre [#3193]
+- Deprecation-Warnings im Autoloader mit PHP8.2 [#3201]
+- Fehler bei StudipFileloader::load() bei den Tests mit PHP 8.2 [#3202]
+- Warnungen und Fehler bei Unit-Tests mit PHP8.2 (vermutlich auch 8.0 und 8.1) [#3204]
+- Warnungen und Fehler bei den Tests der JSONAPI mit PHP8.2 (vermutlich auch 8.0 und 8.1) [#3206]
+- Wiki modernisieren [#3215]
+- "Bewegung reduzieren" vereinheitlichen und anders lösen [#3216]
+- Polyfills für PHP 8.2 und 8.3 hinzufügen [#3221]
+- Properties der SORM-Models korrekt definieren [#3225]
+- Einstellung zum Deaktivieren des ckeditor entfernen [#3227]
+- Trennlinien in Sidebar-Widgets ermöglichen [#3235]
+- Dependabot-gitlab für Stud.IP ermöglichen [#3242]
+- Überarbeitung der Kommentarfunktion von Courseware [#3255]
+- Courseware Seiten-Export als eine Aktion [#3257]
+- Courseware Lerninhalte und Seiten hinzufügen, kopieren und importieren als eine Aktion [#3258]
+- Courseware Ansichten entfernen [#3260]
+- Courseware Seiten im Inhaltsverzeichnis anlegen und umbenennen [#3261]
+- Erweiterter Dateiwähler als Vue-Komponente [#3262]
+- Lernmaterial im Inhaltsverzeichnis prominenter darstellen [#3266]
+- Courseware Aufgaben erweitern [#3286]
+- Updates der Bibliotheken zur 5.5 [#3315]
+- Erweiterung der Courseware-Zertifikate [#3319]
+- Impressum mit Option ausstatten: Seiten für nicht eingeloggte Nutzer ausblenden, Reihenfolge ändern, Entwurfsmodus [#3331]
+- Matrikelnummer als Feld in auth_user_md5 [#3336]
+- Testergebnisse aus ILIAS in das Stud.IP Gradebook importieren [#3344]
+- Bump @vue/eslint-config-typescript from 11.0.3 to 12.0.0. [#3352]
+- Courseware CSS aufteilen [#3361]
+- Optimierung der Courseware-Ladezeiten [#3364]
+- Flash-Altlasten entfernen [#3371]
+- Dialog-Titel ist schwarz und nicht lesbar [#3372]
+- Sprechstunden: Link zum kopieren anbieten & Fehler mit falscher URL vermeiden [#3373]
+- Fehler beim Aufruf von web_migrate [#3374]
+- MVV: Logging von Personen und Dateizuordnungen [#3384]
+- MVV: Ausgabetemplates für Objektnamen [#3386]
+- MVV: Suche (Filter) nach Abschlüssen und Fächern im Backend [#3387]
+- AudioBlock modernisieren [#3388]
+- SimpleORMap::__clone() sollte die Kopie als "neu" markieren [#3398]
+- Parameter `-f` bei mysql-Kommandos entfernen [#3417]
+- Sidebar in "Veranstaltungen->Administration" ist zu lang [#3421]
+- JSON-API: Auflisten von Nutzern einer Einrichtung ermöglichen [#3429]
+- Sprechstunden: Möglichkeit schaffen, dass TutorInnen vom Emfpang der Buchungsbenachrichtigung ausgeschlossen werden [#3435]
+- Belegungsplan eines Raumes - Bearbeiten ist nicht verlinkt [#3451]
+- TIC 3336: Nach dem Feld Matrikelnummer kann in admin/user nicht sortiert werden [#3455]
+- Dateigrößen im FileArchiveManager besser lesbar machen [#3463]
+- Admin-Benutzerverwaltung - Tabellenfusszeile ist kaputt [#3470]
+- UserManagement->deleteUser verschickt jedes mal eine E-Mail [#3473]
+- Felder bei den Einrichtungsdaten mehrsprachig erlauben [#3474]
+- Checkboxen in Aktionsmenüs werden als "Link" vorgelesen [#3482]
+- Polishing: CoursewareStructuralElement Komponente aufräumen [#3501]
+- Polishing: Überarbeitung der Sprechblasen in Blubber [#3512]
+- SelectListElement ignoriert Parameter $selected_option [#3522]
+- Verwaltung -> Grunddaten: Bereich „Beschreibungen“ umbenennen in „Weitere Angaben“ [#3525]
+- Ungenutzte Dateien in "public/pictures/blubberstream" entfernen [#3530]
+- Die Designänderungen in TIC 3512 funktionieren nicht mit dem Hochkontrastmodus [#3537]
+- Anzeige des Avatars bei Einrichtungen zu groß [#3540]
+- Courseware: Abruf des Zertifikats, obwohl das für die Unit gar nicht aktiviert ist [#3548]
+- Fehlendes CSS - Arbeitsplatz -> Courseware -> Meine Veranstaltungen [#3564]
+- Layout Fehler in Courseware [#3589]
+- Login: Fokusmarkierung ist links und rechts abgeschnitten [#3601]
+- PHP8-Warnung auf der Loginseite [#3603]
+- Änderungen aus MR !2437 sind verloren gegangen [#3604]
+- Barriere in der Nutzung des Login-Formulars [#3605]
+- Änderungen aus MR !1905 sind durch den Login Step wieder verloren gegangen [#3606]
+- CSRFProtection ist defekt [#3609]
+- Neuer Login: Fehlermeldung verschiebt die anderen Boxen [#3612]
+- Layout des Loginformulars [#3620]
+- Skiplinks auf Login-Seite funktionieren nicht [#3621]
+- Fullcalendar-Ladeindikator ist größer als der Ladeindikator auf anderen Seiten [#3626]
+- Bildvergleich Block fehlt mapgetters. [#3627]
+- Polishing: Aktion „Gruppen verwalten“ zum neuen Terminkalender hinzufügen [#3629]
+- Fehlendes CSS in Courseware [#3630]
+- Fullcalendar wird bei breiten Bildschirmen zu breit [#3633]
+- Courseware Layout Polishing [#3634]
+- Polishing: „Kalender teilen“ + „Kalender veröffentlichen“ in einem Dialog vereinheitlichen [#3635]
+- Fragebögen: Standardsortierung nach Titel ist nicht hilfreich [#3646]
+- Login: Eingabeformular wird nicht angezeigt, obwohl es der primäre Login ist [#3647]
+- Wiki ab 5.5: Autor:innenzuordnung zeigt nichts an [#3650]
+- Wiki Aktivitäten haben keinen korrekten Link mehr [#3651]
+- Wiki ab 5.5: Fehler nach dem Merge im Main [#3652]
+- Spalte wiki_version.user_id hat falsche Collation [#3655]
+- Fehler beim Abrufen der Aktivitäten [#3656]
+- PHP8-Warning im JSUpdater [#3657]
+- Courseware - Lernmaterialien lassen sich nicht importieren [#3666]
+- Neues Wiki (ab 5.5): Speichern-Button ist nach dem automatischen Speichern ausgegraut [#3668]
+- Fehlerhafte Darstellung der Plus/Minus-Icons auf der Seite der Änderungen [#3673]
+- Wegzeugleiste toggelt Bearbeitungsmodus [#3675]
+- Das Registrierungsformular tut nichts [#3678]
+- Hinweise zum Login: Editor schreibt nur fett [#3683]
+- Terminkalender-StEP hat die falsche Migrationsnummer 5.4.1.1 [#3684]
+- FormBuilder macht kein autoStore() mehr [#3690]
+- JSONAPI: Course-Schema gibt für Studiengruppen das CourseAvatar zurück [#3700]
+- Probleme im Registrierungsformular (autocomplete, Titel, Geschlecht fehlt) [#3705]
+- Login-Formular: deprecation-Warnungen unter PHP 8.3 [#3708]
+- PHP 8.3 deprecation Warning in SimpleCollection [#3709]
+- PHP 8.3 deprecation-Warnung in StudipPDO [#3710]
+- CLI-Skript `migrate:matrikelnummer` umbenennen [#3711]
+- PHP 8.3 deprecation-Warnungen in Trails [#3712]
+- PHP 8.3 deprecation-Warnung in PluginManager [#3713]
+- Fatal Error in der Rangliste und beim zusammenführen wegen nicht mehr existenten Kalendertabellen [#3715]
+- Courseware: Falsches Icon beim verknüpfen [#3748]
+- Exception: Class 'CalendarEvent' not found [#3750]
+- Typo im JS des Wiki [#3751]
+- Login FAQ ist nicht übersetzbar [#3780]
+- Wiki Suche läuft in Exception WikiVersion::chdate not found [#3784]
+- Teilnehmerexport läuft in Fehler: Call to undefined function export_link() [#3785]
+- Veranstaltungskalender kann nicht aufgerufen werden: AccessDeniedException [#3792]
+- VA-Kalender: Call to undefined method Course::calendarWritable() [#3794]
+- Mehrtägige Termine werden in der Wochenansicht des Kalenders mehrfach an den Folgetagen ausgegeben [#3795]
+- Persönliche Startseite „Kalender“ funktioniert nicht mehr [#3798]
+- Terminkalender: Datumsformat im Sidebarwidget "Datum auswählen" defekt [#3809]
+- Enddatum einer Terminwiederholung nicht auswählbar [#3810]
+- Nach dem Bearbeiten eines Wiederholungstermins springt die Ansicht zum ersten Termin der Wiederholungsserie [#3813]
+- Terminkalender - Einträge ohne Farbe [#3818]
+- Terminkalender: Termine im VA-Kalender können mit „tutor“-Berechtigungen nicht geändert werden [#3824]
+- Terminkalender: Andere Kalender zeigen immer die eigenen Termine [#3826]
+- Info-Dialog zu Terminen zeigt den Ort des Termins nicht an [#3828]
+- Coursware - Sichtbarkeit einer Seite lässt sich nicht ändern [#3830]
+- Fehler im Wiki [#3831]
+- Fehler beim Kalenderexport [#3832]
+- Fehler in den Sprechstunden [#3834]
+- ScheduleWidget ist seit dem Umbau des Kalenders kaputt [#3836]
+- ICAL Export fehlt das UID Attribut [#3837]
+- Kalender hat alle geteilten Kalender verloren [#3840]
+- Teilnehmerexport liefert nicht alle TeilnehmerInnen [#3841]
+- Wiederholungstermine werden am Tag der Sommerzeitumstellung nicht korrekt angezeigt [#3843]
+- Verkehrte Woche [#3847]
+- Zeitbereich ziehen funktioniert nicht im Veranstaltungskalender [#3849]
+- Gruppenkalender zeigt Termine mehrfach an, wenn mehrere Personen der Gruppe den Termin im Kalender haben [#3850]
+- Kalender: Austragen von Personen aus einem Termin funktioniert nicht [#3854]
+- Zeilenumbrüche in Terminbeschreibung fehlen [#3861]
+- Verschieben eines Termins durch Änderung des Datums [#3862]
+- Falsche Darstellung ganztägiger Termine an den Tagen der Sommer-/Winterzeitumstellung [#3864]
+- Terminkalender: Tages- und Wochenansicht endet um 23:00 Uhr [#3868]
+- Ganztägige Termine über mehrere Tage können nicht angelegt werden [#3872]
+- Nachdem der Kalender „(bitte wählen)“ ausgewählt wurde, wird eine AccessDeniedException angezeigt [#3874]
+- Ganztägige Termine über mehrere Tage werden nicht als Ganztagstermine dargestellt [#3875]
+- Termine können nicht gelöscht werden, wenn diese zusätzlich noch in weiteren Kalendern eingetragen sind [#3877]
+- Ganztägige Termine, die über einen Tag gehen, werden an 2 Tagen angezeigt [#3878]
+- Die Kopfzeile des Terminkalenders enthält keine Informationen zum Datum [#3879]
+- Die Elemente in der Kopfzeile des Terminkalenders brechen bei kleinen Displaybreiten (Mobilansicht) nicht um [#3880]
+- Kalenderauswahl: Titel bei getFullName() verwirrend [#3881]
+- Beim Löschen eines Termins aus mehreren Terminkalendern wird nicht nachgefragt, ob der Termin für alle gelöscht werden soll oder nur für einen selbst [#3882]
+- Beim Löschen eines Termins aus dem Terminkalender wird in der Benachrichtigungsmail die falsche Person genannt [#3884]
+- Exception beim Klick auf „Bearbeiten“ in der Contentbar eines leeren Wikis [#3885]
+- REST-API Routen für den Kalender sind kaputt [#3886]
+- Ganztagestermine werden im Gruppenterminkalender nicht dargestellt [#3889]
+- Performance des persönlichen Kalenders / Gruppenkalender ist schlecht [#3893]
+- Wiki: navigation item '/course/wiki/allpages' not found [#3898]
+- Wiki: Incorrect integer value: '-' for column `studip`.`wiki_pages`.`parent_id` at row 1 [#3899]
+- lib/models/WikiPage.class.php: @property veraltet [#3901]
+- Wiki: Hierarchie kaputt bei Seiten ohne parent [#3904]
+- Courseware: Auflösung der generiertenSchmuckbilder zu gering [#3905]
+- Terminkalender/Stundenplan: nur 15 Farben verfügbar [#3909]
+- Statistik: Table 'studip.wiki' doesn't exist [#3913]
+- Doppeltes CSS in questionnaire.scss [#3917]
+- Courseware Schmuckbilder haben durch höhere Auflösung falsche Dimensionen [#3918]
+- Im Datepicker Woche/Datum anzeigen, in der ich mich befinde [#3920]
+- Widget "Meine aktuellen Termine" sortiert falsch [#3922]
+- Termin im falschen Kalender eingetragen [#3923]
+- Kalender soll in der gleichen Woche/Tag/Monat bleiben, wenn man auf andere Person schaltet [#3924]
+- Coursware - Nach dem Erstellen eine Lernmaterials und eines Abschnittes lassen sich keine Blöcke hinzufügen [#3933]
+- iCal Export liefert abgewählte Veranstaltungstermine mit aus [#3938]
+- PHP-Warnung im Kalender [#3940]
+- Leerer Abschnitt auf erster Seite im Lernmaterial [#3945]
+- PHP - Fehler im JS-Updater [#3950]
+- Blubber - Avatare sind zu groß [#3951]
+- iCal Export zeigt Terminserie an, die schon abgelaufen ist [#3953]
+- Terminkalender - Veranstaltung hinzufügen funktioniert nicht [#3954]
+- Gruppenterminkalender Suchfeld Personen [#3963]
+- PHP Warnungen im WIKI [#3967]
+- Wiki-Bearbeiten wird nicht freigegeben, wenn gespeichert wird [#3970]
+- Wiki Änderungen seit letztem Besuch zeigt zu viel Text an [#3972]
+- Wikiseite angeblich vom 1.1.1970 [#3973]
+- SQL-Fehler im Kalender [#3983]
+- CW: Bearbeitungsleiste und Scrollbalken überlappen sich [#4033]
+- PHP Fehler im Wiki [#4044]
+- Terminkalender: Bei Eintragen eines Termins in fremdem Kalender wird der Termin nur bei einem selbst eingetragen [#4058]
+- Wiki: Einzelne Wikiversionen können nicht mehr gelöscht werden [#4079]
+- Terminkalender: Täglich wiederholte Termine werden nicht angezeigt [#4080]
+- Courseware: Block kann manchmal nicht hinzugefüt werden [#4083]
+- Terminkalender: Dialog des Termin-Exports schließt sich nicht nach Download [#4094]
+- Layout-Fehler: Ordner wählen [#4121]
+- Fehlerhaftes Layout: Courseware Titelseite [#4122]
+- PHP - Warnungen in den externen Seiten [#4124]
+- Suchfunktion Wiki [#4126]
+- CLI-Kommando "sorm:describe" läuft in Fehler [#4145]
+- Bei einem leeren Blubber-Thread dreht sich dauerhaft das Lade-Icon am linken Rand des Hauptbereiches [#4191]
+- Warning im Installationsassistent unter PHP 8.1 [#4209]
+- Fehler in der Datei- und Aktivitätsübersicht: Tabelle "wiki" existiert nicht mehr [#4219]
+- Neue Externe Seiten zeigen auch unsichtbare VA an [#4229]
+- Externe Seiten: Die Sichbarkeit von Veranstaltungen wird an weiteren Stellen nicht berücksichtigt [#4231]
+- Semesterwahl in der globalen Suche versteckt das Label nicht mehr [#4238]
+- Kalender: Beim Löschen von Ausnahmen von Wiederholungsterminen wird immer die erste Ausnahme gelöscht [#4250]
+- Loginmaske verliert die CID [#4313]
+
 # 18.06.2024 v 5.4.3
 
 https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.4.3&state=all
-- 
cgit v1.0


From ab3352dec1bc28b5b828b35afb5f2d974d6c3fb1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 13:21:26 +0200
Subject: fix npm in dockerfile, re #3935, re #4285

---
 docker/tests/php81/Dockerfile | 5 ++++-
 docker/tests/php82/Dockerfile | 5 ++++-
 docker/tests/php83/Dockerfile | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile
index ceb1d2d..bcd805a 100644
--- a/docker/tests/php81/Dockerfile
+++ b/docker/tests/php81/Dockerfile
@@ -16,7 +16,10 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:18-slim /usr/local/bin /usr/local/bin
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index eee9aad..7f18e4e 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -16,7 +16,10 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:18-slim /usr/local/bin /usr/local/bin
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
index b93795a..54bb541 100644
--- a/docker/tests/php83/Dockerfile
+++ b/docker/tests/php83/Dockerfile
@@ -16,7 +16,10 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:18-slim /usr/local/bin /usr/local/bin
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
-- 
cgit v1.0


From 26e02e32841671fa162cf11cb0fa925aa4452da5 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Tue, 18 Jun 2024 12:18:17 +0000
Subject: =?UTF-8?q?Resolve=20"Neues=20Benachrichtungssystem=20f=C3=BCr=20S?=
 =?UTF-8?q?tud.IP"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #660

Merge request studip/studip!2557
---
 app/controllers/course/basicdata.php               |   8 +
 app/controllers/settings/general.php               |   2 +
 app/views/course/basicdata/view.php                |   6 -
 app/views/settings/general.php                     |  15 ++
 db/migrations/6.0.9_notification_positioning.php   |  35 +++++
 lib/classes/MessageBox.class.php                   |   9 ++
 lib/classes/PageLayout.php                         |  12 +-
 lib/phplib/Seminar_Auth.class.php                  |   4 +-
 .../javascripts/bootstrap/system-notifications.js  |  11 ++
 resources/assets/javascripts/entry-base.js         |   2 +
 resources/assets/stylesheets/scss/responsive.scss  |  20 +++
 .../stylesheets/scss/system-notifications.scss     | 174 +++++++++++++++++++++
 resources/assets/stylesheets/studip.scss           |   1 +
 resources/vue/components/SystemNotification.vue    | 156 ++++++++++++++++++
 .../vue/components/SystemNotificationManager.vue   |  52 ++++++
 .../courseware/layouts/CoursewareCompanionBox.vue  |  46 ++++--
 .../layouts/CoursewareCompanionOverlay.vue         |  55 ++++---
 .../store/courseware/courseware-shelf.module.js    |  24 +--
 .../vue/store/courseware/courseware.module.js      |  20 +--
 templates/layouts/base.php                         |   9 +-
 templates/loginform.php                            |  19 +--
 21 files changed, 592 insertions(+), 88 deletions(-)
 create mode 100644 db/migrations/6.0.9_notification_positioning.php
 create mode 100644 resources/assets/javascripts/bootstrap/system-notifications.js
 create mode 100644 resources/assets/stylesheets/scss/system-notifications.scss
 create mode 100644 resources/vue/components/SystemNotification.vue
 create mode 100644 resources/vue/components/SystemNotificationManager.vue

diff --git a/app/controllers/course/basicdata.php b/app/controllers/course/basicdata.php
index f4f50fe..97ec053 100644
--- a/app/controllers/course/basicdata.php
+++ b/app/controllers/course/basicdata.php
@@ -445,6 +445,14 @@ class Course_BasicdataController extends AuthenticatedController
             $widget = new CourseManagementSelectWidget();
             $sidebar->addWidget($widget);
         }
+
+        foreach ($this->flash['msg'] ?? [] as $msg) {
+            match ($msg[0]) {
+                'msg'   => PageLayout::postSuccess($msg[1]),
+                'error' => PageLayout::postError($msg[1]),
+                'info'  => PageLayout::postInfo($msg[1]),
+            };
+        }
     }
 
     /**
diff --git a/app/controllers/settings/general.php b/app/controllers/settings/general.php
index 734cca1..0e8ec70 100644
--- a/app/controllers/settings/general.php
+++ b/app/controllers/settings/general.php
@@ -44,6 +44,7 @@ class Settings_GeneralController extends Settings_SettingsController
     public function index_action()
     {
         $this->user_language = getUserLanguage($this->user->id);
+        $this->notifications_placement = User::findCurrent()->getConfiguration()->SYSTEM_NOTIFICATIONS_PLACEMENT;
     }
 
     /**
@@ -80,6 +81,7 @@ class Settings_GeneralController extends Settings_SettingsController
         } else {
             PersonalNotifications::deactivateAudioFeedback($this->user->id);
         }
+        $this->config->store('SYSTEM_NOTIFICATIONS_PLACEMENT', Request::get('system_notifications_placement'));
 
         PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.'));
         $this->redirect('settings/general');
diff --git a/app/views/course/basicdata/view.php b/app/views/course/basicdata/view.php
index 380fdb4..9438aeb 100644
--- a/app/views/course/basicdata/view.php
+++ b/app/views/course/basicdata/view.php
@@ -12,14 +12,8 @@ use Studip\Button, Studip\LinkButton;
  */
 
 $dialog_attr = Request::isXhr() ? ' data-dialog="size=50%"' : '';
-
-$message_types = ['msg' => "success", 'error' => "error", 'info' => "info"];
 ?>
 
-<? if (is_array($flash['msg'])) foreach ($flash['msg'] as $msg) : ?>
-    <?= MessageBox::{$message_types[$msg[0]]}($msg[1]) ?>
-<? endforeach ?>
-
 <form name="course-details" name="details" method="post" action="<?= $controller->link_for('course/basicdata/set', $course_id) ?>" <?= $dialog_attr ?> class="default collapsable">
     <?= CSRFProtection::tokenTag() ?>
     <input id="open_variable" type="hidden" name="open" value="<?= $flash['open'] ?>">
diff --git a/app/views/settings/general.php b/app/views/settings/general.php
index 4bd5433..32b1a6f 100644
--- a/app/views/settings/general.php
+++ b/app/views/settings/general.php
@@ -93,6 +93,21 @@ $start_pages = [
                 '- auch wenn Sie gerade einen anderen Browsertab anschauen. Der Plopp ist ' .
                 'nur zu hören, wenn Sie die Benachrichtigungen über Javascript aktiviert haben.')) ?>
         </label>
+
+        <label>
+            <?= _('Platzierung von Systembenachrichtigungen im Browserfenster') ?>
+            <?= tooltipIcon(_('Sie können entscheiden, an welcher Stelle Ihres Browserfensters ' .
+                'Systembenachrichtigungen erscheinen sollen: mittig am oberen Rand oder rechts unten.')) ?>
+            <select name="system_notifications_placement"
+                   aria-describedby="system_notifications_notifications_placement_description">
+                <option value="topcenter"<?= $notifications_placement === 'topcenter' ? ' selected' : '' ?>>
+                    <?= _('zentriert am oberen Rand') ?>
+                </option>
+                <option value="bottomright"<?= $notifications_placement === 'bottomright' ? ' selected' : '' ?>>
+                    <?= _('am rechten unteren Rand') ?>
+                </option>
+            </select>
+        </label>
     </fieldset>
 
     <fieldset>
diff --git a/db/migrations/6.0.9_notification_positioning.php b/db/migrations/6.0.9_notification_positioning.php
new file mode 100644
index 0000000..d6693f3
--- /dev/null
+++ b/db/migrations/6.0.9_notification_positioning.php
@@ -0,0 +1,35 @@
+<?php
+class NotificationPositioning extends Migration
+{
+    public function description()
+    {
+        return 'Adds a personal config option to select the on-screen position of system notifications';
+    }
+
+    protected function up()
+    {
+        DBManager::get()->execute(
+            "INSERT IGNORE INTO `config` VALUES (:field, :value, :type, :range, :section, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), :desc)",
+            [
+                'field' => 'SYSTEM_NOTIFICATIONS_PLACEMENT',
+                'value' => 'topcenter',
+                'type' => 'string',
+                'range' => 'user',
+                'section' => '',
+                'desc' => 'Wo sollen Systembenachrichtigungen im Fenster angezeigt werden? Gültige Werte sind "topcenter" und "bottomright"'
+            ]
+        );
+    }
+
+    protected function down()
+    {
+        DBManager::get()->execute(
+            "DELETE FROM `config_values` WHERE `field` = :field",
+            ['field' => 'SYSTEM_NOTIFICATIONS_PLACEMENT']
+        );
+        DBManager::get()->execute(
+            "DELETE FROM `config` WHERE `field` = :field",
+            ['field' => 'SYSTEM_NOTIFICATIONS_PLACEMENT']
+        );
+    }
+};
diff --git a/lib/classes/MessageBox.class.php b/lib/classes/MessageBox.class.php
index c0d94b2..8936ebe 100644
--- a/lib/classes/MessageBox.class.php
+++ b/lib/classes/MessageBox.class.php
@@ -142,6 +142,15 @@ class MessageBox implements LayoutMessage
     }
 
     /**
+     * Return whether this messagebox can be closed or not.
+     * @return bool
+     */
+    public function isCloseable(): bool
+    {
+        return $this->hide_close;
+    }
+
+    /**
      * This method renders a MessageBox object to a string.
      *
      * @return string   html output of the message box
diff --git a/lib/classes/PageLayout.php b/lib/classes/PageLayout.php
index d6b28ec..7f95b7a 100644
--- a/lib/classes/PageLayout.php
+++ b/lib/classes/PageLayout.php
@@ -599,10 +599,18 @@ class PageLayout
         if (!isset($_SESSION['messages'])) {
             $_SESSION['messages'] = [];
         }
+
+        $structure = [
+            'type' => $message->class,
+            'message' => $message->message,
+            'details' => $message->details,
+            'closeable' => $message->isCloseable()
+        ];
+
         if ($id === null ) {
-            $_SESSION['messages'][] = $message;
+            $_SESSION['messages'][] = $structure;
         } else {
-            $_SESSION['messages'][$id] = $message;
+            $_SESSION['messages'][$id] = $structure;
         }
     }
 
diff --git a/lib/phplib/Seminar_Auth.class.php b/lib/phplib/Seminar_Auth.class.php
index 4849ece..2c1c60c 100644
--- a/lib/phplib/Seminar_Auth.class.php
+++ b/lib/phplib/Seminar_Auth.class.php
@@ -336,7 +336,9 @@ class Seminar_Auth
         } else {
             unset($_SESSION['semi_logged_in']); // used by email activation
             $login_template = $GLOBALS['template_factory']->open('loginform');
-            $login_template->set_attribute('loginerror', (isset($this->auth["uname"]) && $this->error_msg));
+            if (isset($this->auth['uname']) && $this->error_msg) {
+                PageLayout::postException(_('Bei der Anmeldung trat ein Fehler auf!'), $this->error_msg);
+            }
             $login_template->set_attribute('error_msg', $this->error_msg);
             $login_template->set_attribute('uname', (isset($this->auth["uname"]) ? $this->auth["uname"] : Request::username('loginname')));
             $login_template->set_attribute('self_registration_activated', Config::get()->ENABLE_SELF_REGISTRATION);
diff --git a/resources/assets/javascripts/bootstrap/system-notifications.js b/resources/assets/javascripts/bootstrap/system-notifications.js
new file mode 100644
index 0000000..7a85fcd
--- /dev/null
+++ b/resources/assets/javascripts/bootstrap/system-notifications.js
@@ -0,0 +1,11 @@
+import SystemNotificationManager from '../../../vue/components/SystemNotificationManager.vue';
+
+STUDIP.domReady(() => {
+    document.getElementById('system-notifications')?.classList.add('vueified');
+    STUDIP.Vue.load().then(({ createApp }) => {
+        createApp({
+            el: '#system-notifications',
+            components: { SystemNotificationManager }
+        });
+    });
+});
diff --git a/resources/assets/javascripts/entry-base.js b/resources/assets/javascripts/entry-base.js
index 2683439..5f88c30 100644
--- a/resources/assets/javascripts/entry-base.js
+++ b/resources/assets/javascripts/entry-base.js
@@ -16,6 +16,8 @@ import "./init.js"
 import "./bootstrap/responsive.js"
 import "./bootstrap/vue.js"
 
+import "./bootstrap/system-notifications.js"
+
 import "./bootstrap/my-courses.js";
 
 import "./studip-ui.js"
diff --git a/resources/assets/stylesheets/scss/responsive.scss b/resources/assets/stylesheets/scss/responsive.scss
index c4317e9..e84a8a8 100644
--- a/resources/assets/stylesheets/scss/responsive.scss
+++ b/resources/assets/stylesheets/scss/responsive.scss
@@ -537,6 +537,26 @@ $sidebarOut: -330px;
             }
         }
     }
+
+    #system-notifications {
+        top: 0;
+        position: fixed;
+        left: 0;
+        width: 100%;
+        z-index: 1001;
+    }
+
+    .system-notification {
+        &.system-notification-slide-enter,
+        &.system-notification-slide-leave-to {
+            transform: translateY(-100%);
+        }
+
+        &.system-notification-slide-leave,
+        &.system-notification-slide-enter-to {
+            transform: translateY(0);
+        }
+    }
 }
 
 /* Settings especially for fullscreen mode */
diff --git a/resources/assets/stylesheets/scss/system-notifications.scss b/resources/assets/stylesheets/scss/system-notifications.scss
new file mode 100644
index 0000000..1da1ec2
--- /dev/null
+++ b/resources/assets/stylesheets/scss/system-notifications.scss
@@ -0,0 +1,174 @@
+#system-notifications {
+    &.bottom-right {
+        bottom: 50px;
+        right: 15px;
+
+        .system-notification {
+            box-shadow: 5px 5px var(--dark-gray-color-10);
+
+            &.system-notification-slide-enter,
+            &.system-notification-slide-leave-to {
+                opacity: 0;
+                transform: translateX(100%);
+            }
+
+            &.system-notification-slide-leave,
+            &.system-notification-slide-enter-to {
+                opacity: 1;
+                transform: translateX(0);
+            }
+        }
+    }
+
+    &.top-center {
+        left: calc(50% - 300px);
+        top: 0;
+
+        .system-notification {
+            box-shadow: 0 0 0 3px var(--dark-gray-color-10);
+
+            &.system-notification-slide-enter,
+            &.system-notification-slide-leave-to {
+                opacity: 0;
+                transform: translateY(-100%);
+            }
+
+            &.system-notification-slide-leave,
+            &.system-notification-slide-enter-to {
+                opacity: 1;
+                transform: translateY(0);
+            }
+        }
+    }
+
+    &:not(.system-notifications-login) {
+        position: fixed;
+        width: 600px;
+    }
+
+    &.system-notifications-login {
+        margin-bottom: 15px;
+    }
+
+    overflow: hidden;
+    z-index: 1001;
+}
+
+.system-notification {
+    background-color: var(--content-color-20);
+    border: thin solid var(--content-color-40);
+    color: var(--black);
+    cursor: pointer;
+    display: flex;
+    padding: 10px;
+    position: relative;
+
+    &.system-notification-slide-enter-active,
+    &.system-notification-slide-leave-active {
+        transition: all var(--transition-duration-slow) ease-in-out;
+    }
+
+    .system-notification-icon {
+        flex: 0;
+        padding: 10px;
+    }
+
+    .system-notification-content {
+        flex: 1;
+        height: auto;
+        margin: auto 25px auto 10px;
+        word-wrap: break-word;
+
+        .system-notification-details {
+            .system-notification-details-content {
+                padding-left: 10px;
+            }
+        }
+    }
+
+    .system-notification-close {
+        align-self: normal;
+        flex: 0;
+        height: 20px;
+        width: 20px;
+
+        img, svg {
+            cursor: pointer;
+            position: absolute;
+            right: 10px;
+            top: 10px;
+        }
+    }
+
+    .system-notification-timeout {
+        &.system-notification-timeout-enter-active,
+        &.system-notification-timeout-leave-active {
+            transition: width 5s linear;
+        }
+
+        &.system-notification-timeout-enter {
+            width: 100%;
+        }
+
+        &.system-notification-timeout-leave {
+            width: 0;
+        }
+
+        background-color: var(--base-color-40);
+        bottom: 0;
+        height: 5px;
+        left: 0;
+        position: absolute;
+        width: 0;
+    }
+
+    a:not(.system-notification-message) {
+        color: var(--black);
+        text-decoration-line: underline;
+    }
+
+    a.system-notification-message {
+        color: var(--text-color);
+        text-decoration: unset;
+    }
+}
+
+.system-notification-exception {
+    background-color: var(--red-40);
+
+    .system-notification-timeout {
+        background-color: var(--red);
+    }
+}
+
+.system-notification-error {
+    background-color: var(--red-20);
+
+    .system-notification-timeout {
+        background-color: var(--red-80);
+    }
+}
+
+.system-notification-warning {
+    background-color: var(--yellow-20);
+
+    .system-notification-timeout {
+        background-color: var(--yellow-80);
+    }
+}
+
+.system-notification-success {
+    background-color: var(--green-20);
+
+    .system-notification-timeout {
+        background-color: var(--green-80);
+    }
+}
+
+.system-notification-info {
+    background-color: var(--dark-violet-20);
+
+    .system-notification-timeout {
+        background-color: var(--dark-violet-60);
+    }
+}
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index 0f329a4..a322400 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -96,6 +96,7 @@
 @import "scss/studygroup";
 @import "scss/studip-overlay";
 @import "scss/studip-selection";
+@import "scss/system-notifications";
 @import "scss/table_of_contents";
 @import "scss/tables";
 @import "scss/tabs";
diff --git a/resources/vue/components/SystemNotification.vue b/resources/vue/components/SystemNotification.vue
new file mode 100644
index 0000000..bf804ae
--- /dev/null
+++ b/resources/vue/components/SystemNotification.vue
@@ -0,0 +1,156 @@
+<template>
+    <transition name="system-notification-slide" appear>
+        <div v-if="showMe"
+            :class="'system-notification system-notification-' + notification.type"
+            @mouseover="disruptTimeout"
+            @mouseout="initTimeout"
+            @focus="disruptTimeout"
+            @blur="initTimeout">
+            <div class="system-notification-icon">
+                <studip-icon :shape="icon.shape"
+                             :size="48"
+                             :role="icon.color"
+                             alt=""
+                             title=""></studip-icon>
+            </div>
+            <div class="system-notification-content">
+                <p v-html="notification.message"></p>
+                <p class="sr-only" v-if="hasTimeout">
+                    {{ $gettext('Strg+Alt+T hält das automatische Ausblenden der Meldung an bzw. setzt es wieder fort.') }}
+                </p>
+                <details v-if="notification.details?.length > 0"
+                     class="system-notification-details">
+                    <summary>
+                        {{ $gettext('Details') }}
+                    </summary>
+                    <template v-if="Array.isArray(notification.details)">
+                        <p v-for="(detail, index) in notification.details"
+                           :key="index"
+                           v-html="detail"></p>
+                    </template>
+                    <p v-else v-html="notification.details"></p>
+                </details>
+            </div>
+            <button v-if="allowClosing"
+                    class="system-notification-close undecorated"
+                    :title="$gettext('Diese Meldung schließen')"
+                    @click.prevent="destroyMe"
+                    @keydown.space="destroyMe"
+                    tabindex="0">
+                <studip-icon shape="decline"
+                             :size="20"
+                             class="close-system-notification"/>
+            </button>
+            <transition v-if="hasTimeout"
+                        name="system-notification-timeout"
+                        appear>
+                <div v-if="!stopTimeout"
+                     class="system-notification-timeout"
+                     ref="timeout-counter"></div>
+            </transition>
+        </div>
+    </transition>
+</template>
+
+<script>
+export default {
+    name: 'SystemNotification',
+    props: {
+        notification: {
+            type: Object,
+            required: true
+        },
+        visibleFor: {
+            type: Number,
+            default: 5000
+        },
+        appendTo: {
+            type: String,
+            default: null
+        },
+        allowClosing: {
+            type: Boolean,
+            default: true
+        }
+    },
+    data() {
+        return {
+            showMe: false,
+            stopTimeout: false
+        }
+    },
+    computed: {
+        icon() {
+            let iconShape = 'info-circle';
+            let iconColor = 'info';
+            switch (this.type) {
+                case 'exception':
+                    iconShape = 'exclaim-circle';
+                    iconColor = 'info_alt';
+                    break;
+                case 'error':
+                    iconShape = 'exclaim-circle';
+                    iconColor = 'status-red';
+                    break;
+                case 'warning':
+                    iconShape = 'exclaim-circle';
+                    iconColor = 'status-yellow';
+                    break;
+                case 'success':
+                    iconShape = 'check-circle';
+                    iconColor = 'status-green';
+                    break;
+            }
+            return { shape: iconShape, color: iconColor };
+        },
+        hasTimeout() {
+            return !['exception', 'error'].includes(this.notification.type);
+        }
+    },
+    methods: {
+        initTimeout() {
+            if (this.hasTimeout && this.visibleFor > 0) {
+                this.stopTimeout = false;
+                setTimeout(() => {
+                    if (!this.stopTimeout) {
+                        this.destroyMe();
+                    }
+                }, this.visibleFor);
+            }
+        },
+        disruptTimeout() {
+            this.stopTimeout = true;
+        },
+        destroyMe() {
+            this.showMe = false;
+            this.$emit('destroyMe');
+        }
+    },
+    mounted() {
+        if (this.appendTo !== null) {
+            const target = document.querySelector(this.appendTo);
+
+            // Create a live area for screen reader compatibility.
+            const div = document.createElement('div');
+            div.setAttribute('role', 'alert');
+            div.appendChild(this.$el);
+            if (target) {
+                target.prepend(div);
+            }
+        }
+
+        if (!STUDIP.config?.PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED) {
+            const audio = new Audio(STUDIP.ASSETS_URL + '/sounds/blubb.mp3');
+            audio.play();
+        }
+        this.showMe = true;
+
+        this.initTimeout();
+        window.addEventListener('keydown', evt => {
+            if (evt.altKey && evt.ctrlKey && evt.code === 'KeyT') {
+                this.stopTimeout ? this.initTimeout() : this.disruptTimeout();
+            }
+        })
+    }
+}
+</script>
diff --git a/resources/vue/components/SystemNotificationManager.vue b/resources/vue/components/SystemNotificationManager.vue
new file mode 100644
index 0000000..72c4dbf
--- /dev/null
+++ b/resources/vue/components/SystemNotificationManager.vue
@@ -0,0 +1,52 @@
+<template>
+    <div role="alert"
+         :class="'system-notifications ' + (placement === 'topcenter' ? 'top-center' : 'bottom-right')">
+        <system-notification v-for="(notification, index) in allNotifications"
+                             :key="'message-' + index"
+                             :notification="notification"></system-notification>
+    </div>
+</template>
+
+<script>
+import SystemNotification from './SystemNotification.vue';
+
+export default {
+    name: 'SystemNotificationManager',
+    components: { SystemNotification },
+    props: {
+        notifications: {
+            type: Array,
+            default: () => []
+        },
+        placement: {
+            type: String,
+            default: 'topcenter',
+            validator: value => {
+                return ['topcenter', 'bottomright'].includes(value);
+            }
+        },
+        appendAllTo: {
+            type: String,
+            default: null
+        }
+    },
+    data() {
+        return {
+            allNotifications: this.notifications
+        }
+    },
+    methods: {
+        getNotifications(type) {
+            return this.allNotifications.filter((n) => n.type === type);
+        },
+        destroyNotification(type, index) {
+
+        }
+    },
+    mounted() {
+        this.globalOn('push-system-notification', notification => {
+            this.allNotifications.push(notification);
+        });
+    }
+}
+</script>
diff --git a/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue b/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue
index f617e5a..c40edd1 100644
--- a/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue
@@ -1,12 +1,3 @@
-<template>
-    <div class="cw-companion-box" :class="[mood]">
-        <div>
-            <p v-html="msgCompanion"></p>
-            <slot name="companionActions"></slot>
-        </div>
-    </div>
-</template>
-
 <script>
 export default {
     name: 'courseware-companion-box',
@@ -20,5 +11,40 @@ export default {
             }
         }
     },
+    computed: {
+        msgType() {
+            let type = 'info';
+            switch (this.mood) {
+                case 'special':
+                case 'unsure':
+                    type = 'warning';
+                    break;
+                case 'sad':
+                    type = 'error';
+                    break;
+                case 'happy':
+                    type = 'success';
+                    break
+                case 'pointing':
+                case 'curious':
+            }
+            return type;
+        }
+    },
+    watch: {
+        msgCompanion: {
+            handler(current) {
+                if (current.trim().length === 0) {
+                    return;
+                }
+                const notification = {
+                    type: this.msgType,
+                    message: current
+                };
+                this.globalEmit('push-system-notification', notification);
+            },
+            immediate: true
+        }
+    }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue b/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue
index ff177f7..a45da11 100644
--- a/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue
@@ -1,23 +1,3 @@
-<template>
-    <div class="cw-companion-overlay-wrapper">
-        <div
-            class="cw-companion-overlay"
-            :class="[showCompanion ? 'cw-companion-overlay-in' : '', showCompanion ? '' : 'cw-companion-overlay-out', styleCompanion]"
-            aria-hidden="true"
-        >
-            <div class="cw-companion-overlay-content" v-html="msgCompanion"></div>
-            <button class="cw-compantion-overlay-close" @click="hideCompanion"></button>
-        </div>
-        <div
-            class="sr-only"
-            aria-live="polite"
-            role="log"
-        >
-            <p>{{ msgCompanion }}</p>
-        </div>
-    </div>
-</template>
-
 <script>
 import { mapActions, mapGetters } from 'vuex';
 
@@ -30,6 +10,24 @@ export default {
             styleCompanion: 'styleCompanionOverlay',
             showToolbar: 'showToolbar',
         }),
+        msgType() {
+            let type = 'info';
+            switch (this.styleCompanion) {
+                case 'special':
+                case 'unsure':
+                    type = 'warning';
+                    break;
+                case 'sad':
+                    type = 'error';
+                    break;
+                case 'happy':
+                    type = 'success';
+                    break
+                case 'pointing':
+                case 'curious':
+            }
+            return type;
+        }
     },
     methods: {
         ...mapActions({
@@ -49,11 +47,24 @@ export default {
             }
         },
         showToolbar(newValue, oldValue) {
-            // hide companion when toolbar is closed 
+            // hide companion when toolbar is closed
             if (oldValue === true && newValue === false) {
                 this.hideCompanion();
             }
+        },
+        msgCompanion: {
+            handler(current) {
+                if (current.trim().length === 0) {
+                    return;
+                }
+                const notification = {
+                    type: this.msgType,
+                    message: current
+                };
+                this.globalEmit('push-system-notification', notification);
+            },
+            immediate: true
         }
-    },
+    }
 };
 </script>
diff --git a/resources/vue/store/courseware/courseware-shelf.module.js b/resources/vue/store/courseware/courseware-shelf.module.js
index dc92a23..d907ee4 100644
--- a/resources/vue/store/courseware/courseware-shelf.module.js
+++ b/resources/vue/store/courseware/courseware-shelf.module.js
@@ -249,33 +249,23 @@ export const actions = {
         }
     },
     async companionInfo({ dispatch }, { info }) {
-        await dispatch('setStyleCompanionOverlay', 'default');
-        await dispatch('setMsgCompanionOverlay', info);
-        return dispatch('setShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'info', message: info});
     },
 
     async companionSuccess({ dispatch }, { info }) {
-        await dispatch('setStyleCompanionOverlay', 'happy');
-        await dispatch('setMsgCompanionOverlay', info);
-        return dispatch('setShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'success', message: info});
     },
 
     async companionError({ dispatch }, { info }) {
-        await dispatch('setStyleCompanionOverlay', 'sad');
-        await dispatch('setMsgCompanionOverlay', info);
-        return dispatch('setShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'error', message: info});
     },
 
     async companionWarning({ dispatch }, { info }) {
-        await dispatch('setStyleCompanionOverlay', 'alert');
-        await dispatch('setMsgCompanionOverlay', info);
-        return dispatch('setShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'warning', message: info});
     },
 
     async companionSpecial({ dispatch }, { info }) {
-        await dispatch('setStyleCompanionOverlay', 'special');
-        await dispatch('setMsgCompanionOverlay', info);
-        return dispatch('setShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'info', message: info});
     },
     coursewareShowCompanionOverlay({dispatch}, { data }) {
         return dispatch('setShowCompanionOverlay', data);
@@ -310,7 +300,7 @@ export const actions = {
 
         return dispatch(loadUnits, state.context.id);
     },
-    
+
     async sortUnits({ dispatch, state }, data) {
         let loadUnits = null;
         if (state.context.type === 'courses') {
@@ -321,7 +311,7 @@ export const actions = {
         }
 
         await state.httpClient.post(`${state.context.type}/${state.context.id}/courseware-units/sort`, {data: data});
-        
+
         return dispatch(loadUnits, state.context.id);
     },
 
diff --git a/resources/vue/store/courseware/courseware.module.js b/resources/vue/store/courseware/courseware.module.js
index c44bba1..784b750 100644
--- a/resources/vue/store/courseware/courseware.module.js
+++ b/resources/vue/store/courseware/courseware.module.js
@@ -874,33 +874,23 @@ export const actions = {
     },
 
     async companionInfo({ dispatch }, { info }) {
-        await dispatch('coursewareStyleCompanionOverlay', 'default');
-        await dispatch('coursewareMsgCompanionOverlay', info);
-        return dispatch('coursewareShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'info', message: info});
     },
 
     async companionSuccess({ dispatch }, { info }) {
-        await dispatch('coursewareStyleCompanionOverlay', 'happy');
-        await dispatch('coursewareMsgCompanionOverlay', info);
-        return dispatch('coursewareShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'success', message: info});
     },
 
     async companionError({ dispatch }, { info }) {
-        await dispatch('coursewareStyleCompanionOverlay', 'sad');
-        await dispatch('coursewareMsgCompanionOverlay', info);
-        return dispatch('coursewareShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'error', message: info});
     },
 
     async companionWarning({ dispatch }, { info }) {
-        await dispatch('coursewareStyleCompanionOverlay', 'alert');
-        await dispatch('coursewareMsgCompanionOverlay', info);
-        return dispatch('coursewareShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'exception', message: info});
     },
 
     async companionSpecial({ dispatch }, { info }) {
-        await dispatch('coursewareStyleCompanionOverlay', 'special');
-        await dispatch('coursewareMsgCompanionOverlay', info);
-        return dispatch('coursewareShowCompanionOverlay', true);
+        STUDIP.eventBus.emit('push-system-notification', { type: 'warning', message: info});
     },
 
     // adds a favorite block type using the `type` of the BlockType
diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index 6597fd8..d7fc1f1 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -53,7 +53,9 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
                 'ACTIONMENU_THRESHOLD' => Config::get()->ACTION_MENU_THRESHOLD,
                 'ENTRIES_PER_PAGE'     => Config::get()->ENTRIES_PER_PAGE,
                 'OPENGRAPH_ENABLE'     => Config::get()->OPENGRAPH_ENABLE,
-                'COURSEWARE_CERTIFICATES_ENABLE' => Config::get()->COURSEWARE_CERTIFICATES_ENABLE
+                'COURSEWARE_CERTIFICATES_ENABLE' => Config::get()->COURSEWARE_CERTIFICATES_ENABLE,
+                'PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED' =>
+                    (bool) User::findCurrent()->getConfiguration()->PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED,
             ]) ?>,
         }
     </script>
@@ -90,9 +92,12 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
                     <?= Icon::create('zoom-out2')->asImg(24) ?>
                 </button>
             <? endif; ?>
-            <?= implode(PageLayout::getMessages()) ?>
             <?= $content_for_layout ?>
         </div>
+        <system-notification-manager
+            id="system-notifications"
+            :notifications='<?= htmlReady(json_encode(PageLayout::getMessages())) ?>'
+            placement="<?= User::findCurrent()->getConfiguration()->SYSTEM_NOTIFICATIONS_PLACEMENT ?>"></system-notification-manager>
     </main>
     <!-- End main content -->
 
diff --git a/templates/loginform.php b/templates/loginform.php
index 69fc1f0..da717eb 100644
--- a/templates/loginform.php
+++ b/templates/loginform.php
@@ -32,20 +32,14 @@ $show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
 
     <div id="login_flex">
         <div>
-            <? if ($loginerror): ?>
-                <!-- failed login code -->
-                <?= MessageBox::error(_('Bei der Anmeldung trat ein Fehler auf!'), [
-                    $error_msg,
-                    sprintf(
-                        _('Bitte wenden Sie sich bei Problemen an: <a href="mailto:%1$s">%1$s</a>'),
-                        $GLOBALS['UNI_CONTACT']
-                    )
-                ]) ?>
-            <? endif ?>
-
-            <?= implode('', PageLayout::getMessages()); ?>
             <div id="loginbox">
                 <header>
+                    <system-notification-manager
+                        id="system-notifications"
+                        class="system-notifications-login"
+                        :notifications='<?= htmlReady(json_encode(PageLayout::getMessages())) ?>'
+                        append-all-to="#loginbox"></system-notification-manager>
+
                     <h1><?= htmlReady(Config::get()->UNI_NAME_CLEAN) ?></h1>
                 </header>
 
@@ -139,7 +133,6 @@ $show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
 
     </div>
 
-
 </main>
 
 <script type="text/javascript" language="javascript">
-- 
cgit v1.0


From d60234434db13549306a596dcdc95d4f81bdef0b Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 18 Jun 2024 12:22:05 +0000
Subject: add english locale, fixes #4321

Closes #4321

Merge request studip/studip!3120
---
 docker/studip/Dockerfile     | 6 ++++++
 docker/studip/Dockerfile-Dev | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index fe9fc8c..92eb5b5 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -12,9 +12,15 @@ RUN apt update && apt install -y --no-install-recommends \
         libzip-dev \
         libicu-dev \
         libwebp-dev \
+        locales \
         vim \
     && rm -rf /var/lib/apt/lists/*
 
+# Install locales
+RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
+    && dpkg-reconfigure --frontend=noninteractive locales \
+    && update-locale
+
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl
diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev
index 112825a..3c2b2c5 100644
--- a/docker/studip/Dockerfile-Dev
+++ b/docker/studip/Dockerfile-Dev
@@ -12,9 +12,15 @@ RUN apt update && apt install -y --no-install-recommends \
         libzip-dev \
         libicu-dev \
         libwebp-dev \
+        locales \
         vim \
     && rm -rf /var/lib/apt/lists/*
 
+# Install locales
+RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
+    && dpkg-reconfigure --frontend=noninteractive locales \
+    && update-locale
+
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
 RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
-- 
cgit v1.0


From b83cf219bbb921b796f1df06c5c9ab223f0a34ca Mon Sep 17 00:00:00 2001
From: Stefan Suchi <suchi@data-quest.de>
Date: Tue, 18 Jun 2024 12:47:29 +0000
Subject: Update release number, re #3804

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 9020358..43d1c2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-RELEASE 5.4.alpha
+RELEASE 6.0.alpha
-- 
cgit v1.0


From 03388cb4f2eee8dfce2c1655252471e5e04ba4b3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 14:51:47 +0200
Subject: update release number, re #3804

---
 Doxyfile                   | 2 +-
 config/config.inc.php.dist | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index 198a95a..967f25b 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Stud.IP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 5.4
+PROJECT_NUMBER         = 6.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/config.inc.php.dist b/config/config.inc.php.dist
index 7b0400f..aaed66b 100644
--- a/config/config.inc.php.dist
+++ b/config/config.inc.php.dist
@@ -68,7 +68,7 @@ $UNI_URL = "http://www.studip.de";
 $UNI_LOGIN_ADD='';
 $UNI_LOGOUT_ADD=sprintf(_("Und hier geht's zur %sStud.IP Portalseite%s&nbsp;"), "<a href=\"http://www.studip.de\"><b>", "</b></a>");
 $UNI_CONTACT = "<please insert your general contact mail-adress here>";
-$UNI_INFO = "Stud.IP 5.5 - Studienbegleitender Internetsupport von Präsenzlehre";
+$UNI_INFO = "Stud.IP 6.0 - Studienbegleitender Internetsupport von Präsenzlehre";
 
 
 /* $SEM_CLASS and $SEM_TYPE configuration moved to database
-- 
cgit v1.0


From 1156c025e004e2b4ed90faad1112093ee2473f45 Mon Sep 17 00:00:00 2001
From: Stefan Suchi <suchi@data-quest.de>
Date: Tue, 18 Jun 2024 12:54:20 +0000
Subject: minimum PHP version, re #3804

---
 RELEASE-NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 37f5fa2..5a3d972 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -9,6 +9,7 @@
 
 ## Breaking changes
 
+- Mindestanforderung an PHP auf 8.1 angehoben
 - Im Rahmen von [Issue #3788](https://gitlab.studip.de/studip/studip/-/issues/3788) wurden die Zusätze an allen Icons entfernt. Dadurch kann es sein, dass manche Plugins nicht mehr erscheinen. Diese müssen dann auf eine Variante ohne Zusätze umgestellt werden.
 - Die Funktion `get_config()` wurde entfernt. Stattdessen muss die Methode `Config::get()->getValue('CONFIG_KEY')` bzw. der Shortcut `Config::get()->CONFIG_KEY` verwendet werden. ([Issue #2797](https://gitlab.studip.de/studip/studip/-/issues/2797))
 - Die Funktion `smile()` wurde entfernt. Sie kann ersatzlos entfernt werden. ([Issue #3158](https://gitlab.studip.de/studip/studip/-/issues/3158))
-- 
cgit v1.0


From 4fb559eedcf91b6a3ed08891f4085394eeb57209 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 14:55:30 +0200
Subject: re #3805

---
 app/views/admin/configuration/type-edit.php | 2 +-
 tests/unit/_bootstrap.php                   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/configuration/type-edit.php b/app/views/admin/configuration/type-edit.php
index 9fddb45..1cec3f0 100644
--- a/app/views/admin/configuration/type-edit.php
+++ b/app/views/admin/configuration/type-edit.php
@@ -16,7 +16,7 @@
             <input name="value" type="number" id="item-value"
                    value="<?= htmlReady($value) ?>">
         <? elseif ($type === 'array') : ?>
-            <?php $v = version_compare(PHP_VERSION, '5.4.0', '>=') ? json_encode($value, JSON_UNESCAPED_UNICODE) : json_encode($value) ?>
+            <?php $v = json_encode($value, JSON_UNESCAPED_UNICODE) ?>
             <textarea cols="80" rows="5" name="value" id="item-value"><?= htmlReady($v, true, true) ?></textarea>
         <? elseif ($type === 'i18n'): ?>
             <?= I18N::textarea('value', $value, [
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index 87dedca..b15eeb0 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -21,10 +21,7 @@
 // SOFTWARE.
 
 // set error reporting
-error_reporting(E_ALL & ~E_NOTICE);
-if (version_compare(phpversion(), '5.4', '>=')) {
-    error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
-}
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 // set include path
 $inc_path = ini_get('include_path');
-- 
cgit v1.0


From 42d46671c0309bddb71a91bbfdc5f2fa2e44384e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 14:57:05 +0200
Subject: refine 1156c025e004e2b4ed90faad1112093ee2473f45, re #3804

---
 RELEASE-NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 5a3d972..0995c63 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -9,7 +9,7 @@
 
 ## Breaking changes
 
-- Mindestanforderung an PHP auf 8.1 angehoben
+- Mindestanforderung an PHP auf 8.1 angehoben ([TIC #3805](https://gitlab.studip.de/studip/studip/issues/3805))
 - Im Rahmen von [Issue #3788](https://gitlab.studip.de/studip/studip/-/issues/3788) wurden die Zusätze an allen Icons entfernt. Dadurch kann es sein, dass manche Plugins nicht mehr erscheinen. Diese müssen dann auf eine Variante ohne Zusätze umgestellt werden.
 - Die Funktion `get_config()` wurde entfernt. Stattdessen muss die Methode `Config::get()->getValue('CONFIG_KEY')` bzw. der Shortcut `Config::get()->CONFIG_KEY` verwendet werden. ([Issue #2797](https://gitlab.studip.de/studip/studip/-/issues/2797))
 - Die Funktion `smile()` wurde entfernt. Sie kann ersatzlos entfernt werden. ([Issue #3158](https://gitlab.studip.de/studip/studip/-/issues/3158))
-- 
cgit v1.0


From 33fd1358507b4a5abb3dcebe78d407d0567717c1 Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Tue, 18 Jun 2024 13:18:06 +0000
Subject: Deprecate `StudipAutoloader` and use composer's `autoload`

Closes #4282

Merge request studip/studip!3099
---
 app/controllers/questionnaire.php                  |    2 -
 composer.json                                      |   62 +-
 composer.lock                                      | 1108 ++++----
 db/migrations/1.2_step_102_datenfeldtypen.php      |    2 +-
 .../1.6_step_25_raumzeit_db_conversion.php         |    4 +-
 .../ConditionalAdmission.class.php                 |  563 ----
 .../conditionaladmission/ConditionalAdmission.php  |  563 ++++
 .../CourseMemberAdmission.class.php                |  260 --
 .../CourseMemberAdmission.php                      |  260 ++
 .../limitedadmission/LimitedAdmission.class.php    |  284 --
 .../limitedadmission/LimitedAdmission.php          |  284 ++
 .../lockedadmission/LockedAdmission.class.php      |  136 -
 .../lockedadmission/LockedAdmission.php            |  136 +
 .../ParticipantRestrictedAdmission.class.php       |  230 --
 .../ParticipantRestrictedAdmission.php             |  230 ++
 .../passwordadmission/PasswordAdmission.class.php  |  241 --
 .../passwordadmission/PasswordAdmission.php        |  241 ++
 .../PreferentialAdmission.class.php                |  540 ----
 .../PreferentialAdmission.php                      |  540 ++++
 .../termsadmission/TermsAdmission.class.php        |  171 --
 .../termsadmission/TermsAdmission.php              |  171 ++
 .../timedadmission/TimedAdmission.class.php        |  243 --
 .../timedadmission/TimedAdmission.php              |  243 ++
 lib/bootstrap-autoload.php                         |   81 -
 lib/bootstrap.php                                  |    2 +-
 lib/calendar/CalendarColumn.class.php              |  371 ---
 lib/calendar/CalendarColumn.php                    |  371 +++
 lib/calendar/CalendarView.class.php                |  344 ---
 lib/calendar/CalendarView.php                      |  344 +++
 lib/calendar/CalendarWeekView.class.php            |  124 -
 lib/calendar/CalendarWeekView.php                  |  124 +
 lib/classes/AdminCourseFilter.class.php            |  220 --
 lib/classes/AdminCourseFilter.php                  |  220 ++
 lib/classes/Assets.class.php                       |  439 ---
 lib/classes/Assets.php                             |  439 +++
 lib/classes/AuthorObject.class.php                 |  139 -
 lib/classes/AuthorObject.php                       |  139 +
 lib/classes/AutoInsert.class.php                   |  342 ---
 lib/classes/AutoInsert.php                         |  342 +++
 lib/classes/Avatar.class.php                       |  635 -----
 lib/classes/Avatar.php                             |  635 +++++
 lib/classes/BreadCrumb.class.php                   |  103 -
 lib/classes/BreadCrumb.php                         |  103 +
 lib/classes/Button.class.php                       |   58 -
 lib/classes/Button.php                             |   58 +
 lib/classes/CSVArrayObject.class.php               |   47 -
 lib/classes/CSVArrayObject.php                     |   47 +
 lib/classes/Color.class.php                        |  370 ---
 lib/classes/Color.php                              |  370 +++
 lib/classes/Config.class.php                       |  469 ----
 lib/classes/Config.php                             |  469 ++++
 lib/classes/CourseAvatar.class.php                 |   44 -
 lib/classes/CourseAvatar.php                       |   44 +
 lib/classes/CourseConfig.class.php                 |   23 -
 lib/classes/CourseConfig.php                       |   23 +
 lib/classes/CronJob.class.php                      |  140 -
 lib/classes/CronJob.php                            |  140 +
 lib/classes/CronjobScheduler.class.php             |  333 ---
 lib/classes/CronjobScheduler.php                   |  333 +++
 lib/classes/DBManager.class.php                    |  250 --
 lib/classes/DBManager.php                          |  250 ++
 lib/classes/DataFieldBoolEntry.class.php           |   35 -
 lib/classes/DataFieldBoolEntry.php                 |   35 +
 lib/classes/DataFieldComboEntry.class.php          |   79 -
 lib/classes/DataFieldComboEntry.php                |   79 +
 lib/classes/DataFieldDateEntry.class.php           |   80 -
 lib/classes/DataFieldDateEntry.php                 |   80 +
 lib/classes/DataFieldEmailEntry.class.php          |   25 -
 lib/classes/DataFieldEmailEntry.php                |   25 +
 lib/classes/DataFieldEntry.class.php               |  588 ----
 lib/classes/DataFieldEntry.php                     |  588 ++++
 lib/classes/DataFieldLinkEntry.class.php           |   54 -
 lib/classes/DataFieldLinkEntry.php                 |   54 +
 lib/classes/DataFieldPhoneEntry.class.php          |  122 -
 lib/classes/DataFieldPhoneEntry.php                |  122 +
 lib/classes/DataFieldRadioEntry.class.php          |   39 -
 lib/classes/DataFieldRadioEntry.php                |   39 +
 lib/classes/DataFieldSelectboxEntry.class.php      |  100 -
 lib/classes/DataFieldSelectboxEntry.php            |  100 +
 .../DataFieldSelectboxMultipleEntry.class.php      |   93 -
 lib/classes/DataFieldSelectboxMultipleEntry.php    |   93 +
 lib/classes/DataFieldTextareaEntry.class.php       |   29 -
 lib/classes/DataFieldTextareaEntry.php             |   29 +
 lib/classes/DataFieldTextareai18nEntry.class.php   |   21 -
 lib/classes/DataFieldTextareai18nEntry.php         |   21 +
 lib/classes/DataFieldTextlineEntry.class.php       |   14 -
 lib/classes/DataFieldTextlineEntry.php             |   14 +
 lib/classes/DataFieldTextlinei18nEntry.class.php   |   21 -
 lib/classes/DataFieldTextlinei18nEntry.php         |   21 +
 lib/classes/DataFieldTextmarkupEntry.class.php     |   35 -
 lib/classes/DataFieldTextmarkupEntry.php           |   35 +
 lib/classes/DataFieldTextmarkupi18nEntry.class.php |   47 -
 lib/classes/DataFieldTextmarkupi18nEntry.php       |   47 +
 lib/classes/DataFieldTimeEntry.class.php           |   50 -
 lib/classes/DataFieldTimeEntry.php                 |   50 +
 lib/classes/DatabaseObject.class.php               |  149 -
 lib/classes/DatabaseObject.php                     |  149 +
 lib/classes/DateFormatter.class.php                |  176 --
 lib/classes/DateFormatter.php                      |  176 ++
 lib/classes/DbSnapshot.class.php                   |  370 ---
 lib/classes/DbSnapshot.php                         |  370 +++
 lib/classes/DbView.class.php                       |  378 ---
 lib/classes/DbView.php                             |  378 +++
 lib/classes/Event.interface.php                    |  184 --
 lib/classes/Event.php                              |  184 ++
 lib/classes/Feedback.class.php                     |  101 -
 lib/classes/Feedback.php                           |  101 +
 lib/classes/FeedbackRange.interface.php            |   55 -
 lib/classes/FeedbackRange.php                      |   55 +
 lib/classes/FileLock.class.php                     |   74 -
 lib/classes/FileLock.php                           |   74 +
 lib/classes/Fullcalendar.class.php                 |  109 -
 lib/classes/Fullcalendar.php                       |  109 +
 lib/classes/Icon.class.php                         |  395 ---
 lib/classes/Icon.php                               |  395 +++
 lib/classes/InstituteAvatar.class.php              |   45 -
 lib/classes/InstituteAvatar.php                    |   45 +
 lib/classes/InstituteCalendarHelper.class.php      |  810 ------
 lib/classes/InstituteCalendarHelper.php            |  810 ++++++
 lib/classes/InstituteConfig.class.php              |   15 -
 lib/classes/InstituteConfig.php                    |   15 +
 lib/classes/Interactable.class.php                 |  204 --
 lib/classes/Interactable.php                       |  204 ++
 lib/classes/JSONArrayObject.class.php              |   40 -
 lib/classes/JSONArrayObject.php                    |   40 +
 lib/classes/LayoutMessage.interface.php            |   18 -
 lib/classes/LayoutMessage.php                      |   18 +
 lib/classes/LinkButton.class.php                   |   58 -
 lib/classes/LinkButton.php                         |   58 +
 lib/classes/LockRules.class.php                    |  247 --
 lib/classes/LockRules.php                          |  247 ++
 lib/classes/Loggable.class.php                     |   53 -
 lib/classes/Loggable.php                           |   53 +
 lib/classes/MVV.class.php                          |  849 ------
 lib/classes/MVV.php                                |  849 ++++++
 lib/classes/Markup.class.php                       |  788 ------
 lib/classes/Markup.php                             |  788 ++++++
 lib/classes/MessageBox.class.php                   |  177 --
 lib/classes/MessageBox.php                         |  177 ++
 lib/classes/ModulesNotification.class.php          |  182 --
 lib/classes/ModulesNotification.php                |  182 ++
 lib/classes/MultiDimArrayObject.class.php          |  129 -
 lib/classes/MultiDimArrayObject.php                |  129 +
 lib/classes/MultiPersonSearch.class.php            |  548 ----
 lib/classes/MultiPersonSearch.php                  |  548 ++++
 lib/classes/NotificationCenter.class.php           |  174 --
 lib/classes/NotificationCenter.php                 |  174 ++
 lib/classes/PrivacyObject.interface.php            |   11 -
 lib/classes/PrivacyObject.php                      |   11 +
 lib/classes/QuestionType.interface.php             |  118 -
 lib/classes/QuestionType.php                       |  118 +
 lib/classes/QuickSearch.class.php                  |  503 ----
 lib/classes/QuickSearch.php                        |  503 ++++
 lib/classes/Range.interface.php                    |   66 -
 lib/classes/Range.php                              |   66 +
 lib/classes/RangeConfig.class.php                  |  223 --
 lib/classes/RangeConfig.php                        |  223 ++
 lib/classes/RangeTreeObject.class.php              |  294 --
 lib/classes/RangeTreeObject.php                    |  294 ++
 lib/classes/RangeTreeObjectFak.class.php           |   56 -
 lib/classes/RangeTreeObjectFak.php                 |   56 +
 lib/classes/RangeTreeObjectInst.class.php          |   71 -
 lib/classes/RangeTreeObjectInst.php                |   71 +
 lib/classes/Request.class.php                      |  828 ------
 lib/classes/Request.php                            |  828 ++++++
 lib/classes/ResetButton.class.php                  |   53 -
 lib/classes/ResetButton.php                        |   53 +
 lib/classes/Score.class.php                        |  225 --
 lib/classes/Score.php                              |  225 ++
 lib/classes/SemBrowse.class.php                    | 1264 ---------
 lib/classes/SemBrowse.php                          | 1264 +++++++++
 lib/classes/SemClass.class.php                     |  644 -----
 lib/classes/SemClass.php                           |  644 +++++
 lib/classes/SemType.class.php                      |  257 --
 lib/classes/SemType.php                            |  257 ++
 lib/classes/Seminar.class.php                      | 2439 ----------------
 lib/classes/Seminar.php                            | 2439 ++++++++++++++++
 lib/classes/SeminarCategories.class.php            |  138 -
 lib/classes/SeminarCategories.php                  |  138 +
 lib/classes/SessionDecoder.class.php               |  246 --
 lib/classes/SessionDecoder.php                     |  246 ++
 lib/classes/SimpleCollection.class.php             |  782 ------
 lib/classes/SimpleCollection.php                   |  782 ++++++
 lib/classes/SimpleORMap.class.php                  | 2483 ----------------
 lib/classes/SimpleORMap.php                        | 2483 ++++++++++++++++
 lib/classes/SimpleORMapCollection.class.php        |  258 --
 lib/classes/SimpleORMapCollection.php              |  258 ++
 lib/classes/StudipArrayObject.class.php            |  471 ----
 lib/classes/StudipArrayObject.php                  |  471 ++++
 lib/classes/StudipForm.class.php                   |  590 ----
 lib/classes/StudipForm.php                         |  590 ++++
 lib/classes/StudipItem.interface.php               |   72 -
 lib/classes/StudipItem.php                         |   72 +
 lib/classes/StudipKing.class.php                   |  173 --
 lib/classes/StudipKing.php                         |  173 ++
 lib/classes/StudipLink.class.php                   |   47 -
 lib/classes/StudipLink.php                         |   47 +
 lib/classes/StudipLock.class.php                   |   99 -
 lib/classes/StudipLock.php                         |   99 +
 lib/classes/StudipLog.class.php                    |  380 ---
 lib/classes/StudipLog.php                          |  380 +++
 lib/classes/StudipLvgruppeSelection.class.php      |  359 ---
 lib/classes/StudipLvgruppeSelection.php            |  359 +++
 lib/classes/StudipMail.class.php                   |  487 ----
 lib/classes/StudipMail.php                         |  487 ++++
 lib/classes/StudipObject.class.php                 |  199 --
 lib/classes/StudipObject.php                       |  199 ++
 lib/classes/StudipPDO.class.php                    |  385 ---
 lib/classes/StudipPDO.php                          |  385 +++
 lib/classes/StudipRangeTree.class.php              |  222 --
 lib/classes/StudipRangeTree.php                    |  222 ++
 lib/classes/StudipRangeTreeView.class.php          |  101 -
 lib/classes/StudipRangeTreeView.php                |  101 +
 lib/classes/StudipRangeTreeViewAdmin.class.php     |  837 ------
 lib/classes/StudipRangeTreeViewAdmin.php           |  837 ++++++
 lib/classes/StudipSemRangeTreeViewSimple.class.php |  247 --
 lib/classes/StudipSemRangeTreeViewSimple.php       |  247 ++
 lib/classes/StudipSemSearch.class.php              |  191 --
 lib/classes/StudipSemSearch.php                    |  191 ++
 lib/classes/StudipSemSearchHelper.class.php        |  239 --
 lib/classes/StudipSemSearchHelper.php              |  239 ++
 lib/classes/StudipSemTree.class.php                |  312 --
 lib/classes/StudipSemTree.php                      |  312 ++
 lib/classes/StudipSemTreeSearch.class.php          |  241 --
 lib/classes/StudipSemTreeSearch.php                |  241 ++
 lib/classes/StudipSemTreeView.class.php            |  215 --
 lib/classes/StudipSemTreeView.php                  |  215 ++
 lib/classes/StudipSemTreeViewAdmin.class.php       |  825 ------
 lib/classes/StudipSemTreeViewAdmin.php             |  825 ++++++
 lib/classes/StudipSemTreeViewSimple.class.php      |  244 --
 lib/classes/StudipSemTreeViewSimple.php            |  244 ++
 lib/classes/StudipStudyAreaSelection.class.php     |  332 ---
 lib/classes/StudipStudyAreaSelection.php           |  332 +++
 lib/classes/StudygroupAvatar.class.php             |   16 -
 lib/classes/StudygroupAvatar.php                   |   16 +
 lib/classes/TreeAbstract.class.php                 |  431 ---
 lib/classes/TreeAbstract.php                       |  431 +++
 lib/classes/TreeView.class.php                     |  446 ---
 lib/classes/TreeView.php                           |  446 +++
 lib/classes/UpdateInformation.class.php            |  118 -
 lib/classes/UpdateInformation.php                  |  118 +
 lib/classes/UserConfig.class.php                   |   40 -
 lib/classes/UserConfig.php                         |   40 +
 lib/classes/UserLookup.class.php                   |  503 ----
 lib/classes/UserLookup.php                         |  503 ++++
 lib/classes/UserManagement.class.php               | 1353 ---------
 lib/classes/UserManagement.php                     | 1353 +++++++++
 lib/classes/admission/AdmissionAlgorithm.class.php |   35 -
 lib/classes/admission/AdmissionAlgorithm.php       |   35 +
 lib/classes/admission/AdmissionPriority.class.php  |  253 --
 lib/classes/admission/AdmissionPriority.php        |  253 ++
 lib/classes/admission/AdmissionRule.class.php      |  456 ---
 lib/classes/admission/AdmissionRule.php            |  456 +++
 lib/classes/admission/AdmissionUserList.class.php  |  405 ---
 lib/classes/admission/AdmissionUserList.php        |  405 +++
 lib/classes/admission/CourseSet.class.php          | 1185 --------
 lib/classes/admission/CourseSet.php                | 1185 ++++++++
 lib/classes/admission/RandomAlgorithm.class.php    |  437 ---
 lib/classes/admission/RandomAlgorithm.php          |  437 +++
 lib/classes/admission/UserFilter.class.php         |  279 --
 lib/classes/admission/UserFilter.php               |  279 ++
 lib/classes/admission/UserFilterField.class.php    |  473 ----
 lib/classes/admission/UserFilterField.php          |  473 ++++
 .../userfilter/DatafieldCondition.class.php        |  164 --
 .../admission/userfilter/DatafieldCondition.php    |  164 ++
 .../admission/userfilter/DegreeCondition.class.php |   51 -
 .../admission/userfilter/DegreeCondition.php       |   51 +
 .../userfilter/PermissionCondition.class.php       |   46 -
 .../admission/userfilter/PermissionCondition.php   |   46 +
 .../userfilter/SemesterOfStudyCondition.class.php  |   81 -
 .../userfilter/SemesterOfStudyCondition.php        |   81 +
 .../userfilter/StgteilVersionCondition.class.php   |   83 -
 .../userfilter/StgteilVersionCondition.php         |   83 +
 .../userfilter/SubjectCondition.class.php          |   52 -
 .../admission/userfilter/SubjectCondition.php      |   52 +
 .../userfilter/SubjectConditionAny.class.php       |   50 -
 .../admission/userfilter/SubjectConditionAny.php   |   50 +
 .../auth_plugins/StudipAuthAbstract.class.php      |  578 ----
 lib/classes/auth_plugins/StudipAuthAbstract.php    |  578 ++++
 lib/classes/auth_plugins/StudipAuthCAS.class.php   |   89 -
 lib/classes/auth_plugins/StudipAuthCAS.php         |   89 +
 lib/classes/auth_plugins/StudipAuthIP.class.php    |   20 -
 lib/classes/auth_plugins/StudipAuthIP.php          |   20 +
 lib/classes/auth_plugins/StudipAuthLTI.class.php   |  135 -
 lib/classes/auth_plugins/StudipAuthLTI.php         |  135 +
 lib/classes/auth_plugins/StudipAuthLdap.class.php  |  216 --
 lib/classes/auth_plugins/StudipAuthLdap.php        |  216 ++
 .../StudipAuthLdapReadAndBind.class.php            |   81 -
 .../auth_plugins/StudipAuthLdapReadAndBind.php     |   81 +
 lib/classes/auth_plugins/StudipAuthOIDC.class.php  |  112 -
 lib/classes/auth_plugins/StudipAuthOIDC.php        |  112 +
 lib/classes/auth_plugins/StudipAuthSSO.class.php   |   51 -
 lib/classes/auth_plugins/StudipAuthSSO.php         |   51 +
 lib/classes/auth_plugins/StudipAuthShib.class.php  |  139 -
 lib/classes/auth_plugins/StudipAuthShib.php        |  139 +
 .../auth_plugins/StudipAuthStandard.class.php      |   89 -
 lib/classes/auth_plugins/StudipAuthStandard.php    |   89 +
 lib/classes/cache/Cache.class.php                  |  213 --
 lib/classes/cache/Cache.php                        |  213 ++
 lib/classes/cache/DbCache.class.php                |  143 -
 lib/classes/cache/DbCache.php                      |  143 +
 lib/classes/cache/Factory.class.php                |  206 --
 lib/classes/cache/Factory.php                      |  206 ++
 lib/classes/cache/FileCache.class.php              |  278 --
 lib/classes/cache/FileCache.php                    |  278 ++
 lib/classes/cache/Item.class.php                   |  164 --
 lib/classes/cache/Item.php                         |  164 ++
 lib/classes/cache/MemcachedCache.class.php         |  151 -
 lib/classes/cache/MemcachedCache.php               |  151 +
 lib/classes/cache/MemoryCache.class.php            |   98 -
 lib/classes/cache/MemoryCache.php                  |   98 +
 lib/classes/cache/Proxy.class.php                  |  123 -
 lib/classes/cache/Proxy.php                        |  123 +
 lib/classes/cache/RedisCache.class.php             |  198 --
 lib/classes/cache/RedisCache.php                   |  198 ++
 lib/classes/cache/Wrapper.class.php                |   95 -
 lib/classes/cache/Wrapper.php                      |   95 +
 lib/classes/calendar/EventData.class.php           |  114 -
 lib/classes/calendar/EventData.php                 |  114 +
 lib/classes/calendar/EventSource.interface.php     |   64 -
 lib/classes/calendar/EventSource.php               |   64 +
 lib/classes/calendar/ICalendarExport.class.php     |  628 -----
 lib/classes/calendar/ICalendarExport.php           |  628 +++++
 lib/classes/calendar/ICalendarImport.class.php     |  678 -----
 lib/classes/calendar/ICalendarImport.php           |  678 +++++
 lib/classes/calendar/Owner.interface.php           |   40 -
 lib/classes/calendar/Owner.php                     |   40 +
 .../exportdocument/ExportDocument.interface.php    |   59 -
 lib/classes/exportdocument/ExportDocument.php      |   59 +
 lib/classes/exportdocument/ExportPDF.class.php     |  369 ---
 lib/classes/exportdocument/ExportPDF.php           |  369 +++
 .../librarysearch/LibraryDocument.class.php        |  442 ---
 lib/classes/librarysearch/LibraryDocument.php      |  442 +++
 .../LibraryResultParser.interface.php              |   40 -
 lib/classes/librarysearch/LibraryResultParser.php  |   40 +
 lib/classes/librarysearch/LibrarySearch.class.php  |  150 -
 lib/classes/librarysearch/LibrarySearch.php        |  150 +
 .../librarysearch/LibrarySearchManager.class.php   |  174 --
 lib/classes/librarysearch/LibrarySearchManager.php |  174 ++
 .../BASELibraryResultParser.class.php              |  158 --
 .../resultparsers/BASELibraryResultParser.php      |  158 ++
 .../K10PlusLibraryResultParser.class.php           |   84 -
 .../resultparsers/K10PlusLibraryResultParser.php   |   84 +
 .../MarcxmlLibraryResultParser.class.php           |  234 --
 .../resultparsers/MarcxmlLibraryResultParser.php   |  234 ++
 .../resultparsers/SRULibraryResultParser.class.php |   96 -
 .../resultparsers/SRULibraryResultParser.php       |   96 +
 .../searchmodules/BASELibrarySearch.class.php      |  114 -
 .../searchmodules/BASELibrarySearch.php            |  114 +
 .../K10PlusZentralLibrarySearch.class.php          |  149 -
 .../searchmodules/K10PlusZentralLibrarySearch.php  |  149 +
 .../searchmodules/SRULibrarySearch.class.php       |  153 -
 .../searchmodules/SRULibrarySearch.php             |  153 +
 lib/classes/searchtypes/MyCoursesSearch.class.php  |  220 --
 lib/classes/searchtypes/MyCoursesSearch.php        |  220 ++
 lib/classes/searchtypes/PermissionSearch.class.php |  219 --
 lib/classes/searchtypes/PermissionSearch.php       |  219 ++
 lib/classes/searchtypes/RangeSearch.class.php      |   87 -
 lib/classes/searchtypes/RangeSearch.php            |   87 +
 lib/classes/searchtypes/ResourceSearch.class.php   |  362 ---
 lib/classes/searchtypes/ResourceSearch.php         |  362 +++
 lib/classes/searchtypes/RoomSearch.class.php       |  192 --
 lib/classes/searchtypes/RoomSearch.php             |  192 ++
 lib/classes/searchtypes/SQLSearch.class.php        |  179 --
 lib/classes/searchtypes/SQLSearch.php              |  179 ++
 lib/classes/searchtypes/SearchType.class.php       |  107 -
 lib/classes/searchtypes/SearchType.php             |  107 +
 lib/classes/searchtypes/SeminarSearch.class.php    |  101 -
 lib/classes/searchtypes/SeminarSearch.php          |  101 +
 lib/classes/searchtypes/StandardSearch.class.php   |  206 --
 lib/classes/searchtypes/StandardSearch.php         |  206 ++
 lib/classes/searchtypes/TreeSearch.class.php       |   96 -
 lib/classes/searchtypes/TreeSearch.php             |   96 +
 lib/classes/sidebar/ClipboardWidget.class.php      |  143 -
 lib/classes/sidebar/ClipboardWidget.php            |  143 +
 .../sidebar/InstituteSelectWidget.class.php        |  111 -
 lib/classes/sidebar/InstituteSelectWidget.php      |  111 +
 lib/classes/sidebar/ResourceTreeWidget.class.php   |  145 -
 lib/classes/sidebar/ResourceTreeWidget.php         |  145 +
 lib/classes/sidebar/RoomClipboardWidget.class.php  |   57 -
 lib/classes/sidebar/RoomClipboardWidget.php        |   57 +
 lib/classes/sidebar/RoomSearchTreeWidget.class.php |   41 -
 lib/classes/sidebar/RoomSearchTreeWidget.php       |   41 +
 lib/classes/sidebar/RoomSearchWidget.class.php     |  595 ----
 lib/classes/sidebar/RoomSearchWidget.php           |  595 ++++
 lib/cronjobs/check_admission.class.php             |  147 -
 lib/cronjobs/check_admission.php                   |  147 +
 lib/cronjobs/cleanup_log.class.php                 |  114 -
 lib/cronjobs/cleanup_log.php                       |  114 +
 lib/cronjobs/garbage_collector.class.php           |  202 --
 lib/cronjobs/garbage_collector.php                 |  202 ++
 lib/cronjobs/purge_cache.class.php                 |   92 -
 lib/cronjobs/purge_cache.php                       |   92 +
 lib/cronjobs/remind_oer_upload.class.php           |   73 -
 lib/cronjobs/remind_oer_upload.php                 |   73 +
 lib/cronjobs/send_mail_notifications.class.php     |  141 -
 lib/cronjobs/send_mail_notifications.php           |  141 +
 lib/cronjobs/send_mail_queue.class.php             |   70 -
 lib/cronjobs/send_mail_queue.php                   |   70 +
 lib/cronjobs/session_gc.class.php                  |   29 -
 lib/cronjobs/session_gc.php                        |   29 +
 lib/elearning/ConnectedCMS.class.php               |  466 ---
 lib/elearning/ConnectedCMS.php                     |  466 +++
 lib/elearning/ConnectedLink.class.php              |  129 -
 lib/elearning/ConnectedLink.php                    |  129 +
 lib/elearning/ConnectedPermissions.class.php       |   57 -
 lib/elearning/ConnectedPermissions.php             |   57 +
 lib/elearning/ConnectedUser.class.php              |  512 ----
 lib/elearning/ConnectedUser.php                    |  512 ++++
 lib/elearning/ContentModule.class.php              |  388 ---
 lib/elearning/ContentModule.php                    |  388 +++
 lib/elearning/ContentModuleView.class.php          |  189 --
 lib/elearning/ContentModuleView.php                |  189 ++
 lib/elearning/ELearningUtils.class.php             |  612 ----
 lib/elearning/ELearningUtils.php                   |  612 ++++
 lib/elearning/Ilias3ConnectedCMS.class.php         |  350 ---
 lib/elearning/Ilias3ConnectedCMS.php               |  350 +++
 lib/elearning/Ilias3ConnectedLink.class.php        |  188 --
 lib/elearning/Ilias3ConnectedLink.php              |  188 ++
 lib/elearning/Ilias3ConnectedPermissions.class.php |  256 --
 lib/elearning/Ilias3ConnectedPermissions.php       |  256 ++
 lib/elearning/Ilias3ConnectedUser.class.php        |  345 ---
 lib/elearning/Ilias3ConnectedUser.php              |  345 +++
 lib/elearning/Ilias3ContentModule.class.php        |  292 --
 lib/elearning/Ilias3ContentModule.php              |  292 ++
 lib/elearning/Ilias3ObjectXMLParser.class.php      |  236 --
 lib/elearning/Ilias3ObjectXMLParser.php            |  236 ++
 lib/elearning/Ilias3SaxParser.class.php            |  230 --
 lib/elearning/Ilias3SaxParser.php                  |  230 ++
 lib/elearning/Ilias3Soap.class.php                 | 1069 -------
 lib/elearning/Ilias3Soap.php                       | 1069 +++++++
 lib/elearning/Ilias4ConnectedCMS.class.php         |  272 --
 lib/elearning/Ilias4ConnectedCMS.php               |  272 ++
 lib/elearning/Ilias4ConnectedLink.class.php        |  124 -
 lib/elearning/Ilias4ConnectedLink.php              |  124 +
 lib/elearning/Ilias4ConnectedPermissions.class.php |  126 -
 lib/elearning/Ilias4ConnectedPermissions.php       |  126 +
 lib/elearning/Ilias4ConnectedUser.class.php        |  168 --
 lib/elearning/Ilias4ConnectedUser.php              |  168 ++
 lib/elearning/Ilias4ContentModule.class.php        |  106 -
 lib/elearning/Ilias4ContentModule.php              |  106 +
 lib/elearning/Ilias4Soap.class.php                 |  181 --
 lib/elearning/Ilias4Soap.php                       |  181 ++
 lib/elearning/Ilias5ConnectedCMS.class.php         |   21 -
 lib/elearning/Ilias5ConnectedCMS.php               |   21 +
 lib/elearning/Ilias5ConnectedLink.class.php        |   16 -
 lib/elearning/Ilias5ConnectedLink.php              |   16 +
 lib/elearning/Ilias5ConnectedPermissions.class.php |   17 -
 lib/elearning/Ilias5ConnectedPermissions.php       |   17 +
 lib/elearning/Ilias5ConnectedUser.class.php        |   40 -
 lib/elearning/Ilias5ConnectedUser.php              |   40 +
 lib/elearning/Ilias5ContentModule.class.php        |   16 -
 lib/elearning/Ilias5ContentModule.php              |   16 +
 lib/elearning/Ilias5Soap.class.php                 |  114 -
 lib/elearning/Ilias5Soap.php                       |  114 +
 lib/elearning/LonCapaConnectedCMS.class.php        |   67 -
 lib/elearning/LonCapaConnectedCMS.php              |   67 +
 lib/elearning/LonCapaConnectedLink.class.php       |   67 -
 lib/elearning/LonCapaConnectedLink.php             |   67 +
 lib/elearning/LonCapaContentModule.class.php       |   86 -
 lib/elearning/LonCapaContentModule.php             |   86 +
 lib/elearning/LonCapaRequest.class.php             |  110 -
 lib/elearning/LonCapaRequest.php                   |  110 +
 lib/elearning/ObjectConnections.class.php          |  254 --
 lib/elearning/ObjectConnections.php                |  254 ++
 lib/elearning/PmWikiConnectedCMS.class.php         |   86 -
 lib/elearning/PmWikiConnectedCMS.php               |   86 +
 lib/elearning/PmWikiConnectedLink.class.php        |  134 -
 lib/elearning/PmWikiConnectedLink.php              |  134 +
 lib/elearning/PmWikiContentModule.class.php        |  115 -
 lib/elearning/PmWikiContentModule.php              |  115 +
 lib/exceptions/ClipboardException.class.php        |   25 -
 lib/exceptions/ClipboardException.php              |   25 +
 .../GlobalResourceLockException.class.php          |   25 -
 .../resources/GlobalResourceLockException.php      |   25 +
 .../GlobalResourceLockOverlapException.class.php   |   25 -
 .../GlobalResourceLockOverlapException.php         |   25 +
 .../InvalidResourceCategoryException.class.php     |   25 -
 .../resources/InvalidResourceCategoryException.php |   25 +
 .../InvalidResourceClassException.class.php        |   24 -
 .../resources/InvalidResourceClassException.php    |   24 +
 .../resources/InvalidResourceException.class.php   |   25 -
 .../resources/InvalidResourceException.php         |   25 +
 .../InvalidResourceRequestException.class.php      |   22 -
 .../resources/InvalidResourceRequestException.php  |   22 +
 .../resources/NoResourceClassException.class.php   |   11 -
 .../resources/NoResourceClassException.php         |   11 +
 .../resources/ResourceBookingException.class.php   |   24 -
 .../resources/ResourceBookingException.php         |   24 +
 .../ResourceBookingOverlapException.class.php      |   24 -
 .../resources/ResourceBookingOverlapException.php  |   24 +
 .../ResourceBookingRangeException.class.php        |   24 -
 .../resources/ResourceBookingRangeException.php    |   24 +
 .../resources/ResourceException.class.php          |   23 -
 lib/exceptions/resources/ResourceException.php     |   23 +
 .../ResourceNoTimeRangeException.class.php         |   24 -
 .../resources/ResourceNoTimeRangeException.php     |   24 +
 .../ResourcePermissionException.class.php          |   24 -
 .../resources/ResourcePermissionException.php      |   24 +
 .../ResourcePropertyDefinitionException.class.php  |   25 -
 .../ResourcePropertyDefinitionException.php        |   25 +
 .../resources/ResourcePropertyException.class.php  |   25 -
 .../resources/ResourcePropertyException.php        |   25 +
 .../ResourcePropertyStateException.class.php       |   23 -
 .../resources/ResourcePropertyStateException.php   |   23 +
 .../resources/ResourceRequestException.class.php   |   24 -
 .../resources/ResourceRequestException.php         |   24 +
 .../ResourceUnavailableException.class.php         |   24 -
 .../resources/ResourceUnavailableException.php     |   24 +
 .../ResourceUnlockableException.class.php          |   24 -
 .../resources/ResourceUnlockableException.php      |   24 +
 .../resources/SeparableRoomException.class.php     |   24 -
 .../resources/SeparableRoomException.php           |   24 +
 lib/filesystem/FileArchiveManager.class.php        |  998 -------
 lib/filesystem/FileArchiveManager.php              |  998 +++++++
 .../FileArchiveManagerException.class.php          |   17 -
 lib/filesystem/FileArchiveManagerException.php     |   17 +
 lib/filesystem/LibraryFile.class.php               |  401 ---
 lib/filesystem/LibraryFile.php                     |  401 +++
 lib/filesystem/ResourceFolder.class.php            |  149 -
 lib/filesystem/ResourceFolder.php                  |  149 +
 lib/ilias_interface/ConnectedIlias.class.php       | 1370 ---------
 lib/ilias_interface/ConnectedIlias.php             | 1370 +++++++++
 lib/ilias_interface/IliasModule.class.php          |  371 ---
 lib/ilias_interface/IliasModule.php                |  371 +++
 .../IliasObjectConnections.class.php               |  311 --
 lib/ilias_interface/IliasObjectConnections.php     |  311 ++
 lib/ilias_interface/IliasSoap.class.php            | 1709 -----------
 lib/ilias_interface/IliasSoap.php                  | 1709 +++++++++++
 lib/ilias_interface/IliasUser.class.php            |  528 ----
 lib/ilias_interface/IliasUser.php                  |  528 ++++
 lib/models/AdmissionApplication.class.php          |  296 --
 lib/models/AdmissionApplication.php                |  296 ++
 lib/models/ArchivedCourse.class.php                |  105 -
 lib/models/ArchivedCourse.php                      |  105 +
 lib/models/ArchivedCourseMember.class.php          |   68 -
 lib/models/ArchivedCourseMember.php                |   68 +
 lib/models/AuthUserMd5.class.php                   |   42 -
 lib/models/AuthUserMd5.php                         |   42 +
 lib/models/Banner.class.php                        |  232 --
 lib/models/Banner.php                              |  232 ++
 lib/models/BannerRoles.class.php                   |  122 -
 lib/models/BannerRoles.php                         |  122 +
 lib/models/Clipboard.class.php                     |  335 ---
 lib/models/Clipboard.php                           |  335 +++
 lib/models/ClipboardItem.class.php                 |   69 -
 lib/models/ClipboardItem.php                       |   69 +
 lib/models/ColourValue.class.php                   |  104 -
 lib/models/ColourValue.php                         |  104 +
 lib/models/ConfigEntry.class.php                   |   51 -
 lib/models/ConfigEntry.php                         |   51 +
 lib/models/Contact.class.php                       |   51 -
 lib/models/Contact.php                             |   51 +
 lib/models/ContactGroup.class.php                  |   44 -
 lib/models/ContactGroup.php                        |   44 +
 lib/models/ContactGroupItem.class.php              |   61 -
 lib/models/ContactGroupItem.php                    |   61 +
 lib/models/ContentTermsOfUse.class.php             |  225 --
 lib/models/ContentTermsOfUse.php                   |  225 ++
 lib/models/Course.class.php                        | 1181 --------
 lib/models/Course.php                              | 1181 ++++++++
 lib/models/CourseDate.class.php                    |  665 -----
 lib/models/CourseDate.php                          |  665 +++++
 lib/models/CourseExDate.class.php                  |  422 ---
 lib/models/CourseExDate.php                        |  422 +++
 lib/models/CourseMember.class.php                  |  465 ---
 lib/models/CourseMember.php                        |  465 +++
 lib/models/CourseTopic.class.php                   |  261 --
 lib/models/CourseTopic.php                         |  261 ++
 lib/models/CronjobLog.class.php                    |   70 -
 lib/models/CronjobLog.php                          |   70 +
 lib/models/CronjobSchedule.class.php               |  272 --
 lib/models/CronjobSchedule.php                     |  272 ++
 lib/models/CronjobTask.class.php                   |  239 --
 lib/models/CronjobTask.php                         |  239 ++
 lib/models/DataField.class.php                     |  289 --
 lib/models/DataField.php                           |  289 ++
 lib/models/DatafieldEntryModel.class.php           |  261 --
 lib/models/DatafieldEntryModel.php                 |  261 ++
 lib/models/DatafieldEntryModelI18N.class.php       |   36 -
 lib/models/DatafieldEntryModelI18N.php             |   36 +
 lib/models/Degree.class.php                        |   84 -
 lib/models/Degree.php                              |   84 +
 lib/models/Freetext.php                            |    2 +-
 lib/models/HelpContent.class.php                   |  189 --
 lib/models/HelpContent.php                         |  189 ++
 lib/models/HelpTour.class.php                      |  407 ---
 lib/models/HelpTour.php                            |  407 +++
 lib/models/HelpTourAudience.class.php              |   48 -
 lib/models/HelpTourAudience.php                    |   48 +
 lib/models/HelpTourSettings.class.php              |   48 -
 lib/models/HelpTourSettings.php                    |   48 +
 lib/models/HelpTourStep.class.php                  |  107 -
 lib/models/HelpTourStep.php                        |  107 +
 lib/models/HelpTourUser.class.php                  |   69 -
 lib/models/HelpTourUser.php                        |   69 +
 lib/models/Institute.class.php                     |  368 ---
 lib/models/Institute.php                           |  368 +++
 lib/models/InstituteMember.class.php               |  221 --
 lib/models/InstituteMember.php                     |  221 ++
 lib/models/InstitutePlanColumn.class.php           |   72 -
 lib/models/InstitutePlanColumn.php                 |   72 +
 lib/models/Kategorie.class.php                     |   76 -
 lib/models/Kategorie.php                           |   76 +
 lib/models/LikertScale.php                         |    2 -
 lib/models/LockRule.class.php                      |  135 -
 lib/models/LockRule.php                            |  135 +
 lib/models/LoginBackground.class.php               |  127 -
 lib/models/LoginBackground.php                     |  127 +
 lib/models/LoginFaq.class.php                      |   33 -
 lib/models/LoginFaq.php                            |   33 +
 lib/models/MailQueueEntry.class.php                |  141 -
 lib/models/MailQueueEntry.php                      |  141 +
 lib/models/Message.class.php                       |  343 ---
 lib/models/Message.php                             |  343 +++
 lib/models/MessageUser.class.php                   |   98 -
 lib/models/MessageUser.php                         |   98 +
 lib/models/MvvOverlappingConflict.class.php        |  115 -
 lib/models/MvvOverlappingConflict.php              |  115 +
 lib/models/MvvOverlappingSelection.class.php       |  339 ---
 lib/models/MvvOverlappingSelection.php             |  339 +++
 lib/models/NewsRange.class.php                     |   71 -
 lib/models/NewsRange.php                           |   71 +
 lib/models/NewsRoles.class.php                     |  142 -
 lib/models/NewsRoles.php                           |  142 +
 lib/models/OpenGraphURL.class.php                  |  326 ---
 lib/models/OpenGraphURL.php                        |  326 +++
 lib/models/OpenGraphURLCollection.class.php        |   57 -
 lib/models/OpenGraphURLCollection.php              |   57 +
 lib/models/PersonalNotifications.class.php         |  470 ----
 lib/models/PersonalNotifications.php               |  470 ++++
 lib/models/RangeScale.php                          |    2 -
 lib/models/Semester.class.php                      |  515 ----
 lib/models/Semester.php                            |  515 ++++
 lib/models/SemesterCourse.class.php                |   45 -
 lib/models/SemesterCourse.php                      |   45 +
 lib/models/SemesterHoliday.class.php               |  146 -
 lib/models/SemesterHoliday.php                     |  146 +
 lib/models/SeminarCycleDate.class.php              |  819 ------
 lib/models/SeminarCycleDate.php                    |  819 ++++++
 lib/models/StudipComment.class.php                 |  115 -
 lib/models/StudipComment.php                       |  115 +
 lib/models/StudipNews.class.php                    |  696 -----
 lib/models/StudipNews.php                          |  696 +++++
 lib/models/StudipScmEntry.class.php                |   55 -
 lib/models/StudipScmEntry.php                      |   55 +
 lib/models/StudipStudyArea.class.php               |  637 -----
 lib/models/StudipStudyArea.php                     |  637 +++++
 lib/models/StudyCourse.class.php                   |   77 -
 lib/models/StudyCourse.php                         |   77 +
 lib/models/User.class.php                          | 1650 -----------
 lib/models/User.php                                | 1650 +++++++++++
 lib/models/UserInfo.class.php                      |   60 -
 lib/models/UserInfo.php                            |   60 +
 lib/models/UserOnline.class.php                    |   27 -
 lib/models/UserOnline.php                          |   27 +
 lib/models/UserStudyCourse.class.php               |   94 -
 lib/models/UserStudyCourse.php                     |   94 +
 lib/models/Vote.php                                |    2 -
 lib/models/WebserviceAccessRule.class.php          |  133 -
 lib/models/WebserviceAccessRule.php                |  133 +
 lib/models/WikiPage.class.php                      |  311 --
 lib/models/WikiPage.php                            |  311 ++
 lib/models/calendar/CalendarCourseDate.class.php   |   80 -
 lib/models/calendar/CalendarCourseDate.php         |   80 +
 lib/models/calendar/CalendarCourseExDate.class.php |   35 -
 lib/models/calendar/CalendarCourseExDate.php       |   35 +
 lib/models/calendar/CalendarDate.class.php         |  946 -------
 lib/models/calendar/CalendarDate.php               |  946 +++++++
 .../calendar/CalendarDateAssignment.class.php      |  722 -----
 lib/models/calendar/CalendarDateAssignment.php     |  722 +++++
 .../calendar/CalendarDateException.class.php       |   40 -
 lib/models/calendar/CalendarDateException.php      |   40 +
 lib/models/resources/BrokenResource.class.php      |  274 --
 lib/models/resources/BrokenResource.php            |  274 ++
 lib/models/resources/Building.class.php            |  534 ----
 lib/models/resources/Building.php                  |  534 ++++
 lib/models/resources/GlobalResourceLock.class.php  |   88 -
 lib/models/resources/GlobalResourceLock.php        |   88 +
 lib/models/resources/Location.class.php            |  455 ---
 lib/models/resources/Location.php                  |  455 +++
 lib/models/resources/Resource.class.php            | 2965 --------------------
 lib/models/resources/Resource.php                  | 2965 ++++++++++++++++++++
 lib/models/resources/ResourceBooking.class.php     | 1946 -------------
 lib/models/resources/ResourceBooking.php           | 1946 +++++++++++++
 .../resources/ResourceBookingInterval.class.php    |  122 -
 lib/models/resources/ResourceBookingInterval.php   |  122 +
 lib/models/resources/ResourceCategory.class.php    |  806 ------
 lib/models/resources/ResourceCategory.php          |  806 ++++++
 .../resources/ResourceCategoryProperty.class.php   |   74 -
 lib/models/resources/ResourceCategoryProperty.php  |   74 +
 lib/models/resources/ResourceLabel.class.php       |  267 --
 lib/models/resources/ResourceLabel.php             |  267 ++
 lib/models/resources/ResourcePermission.class.php  |  188 --
 lib/models/resources/ResourcePermission.php        |  188 ++
 lib/models/resources/ResourceProperty.class.php    |  127 -
 lib/models/resources/ResourceProperty.php          |  127 +
 .../resources/ResourcePropertyDefinition.class.php |  409 ---
 .../resources/ResourcePropertyDefinition.php       |  409 +++
 .../resources/ResourcePropertyGroup.class.php      |   39 -
 lib/models/resources/ResourcePropertyGroup.php     |   39 +
 lib/models/resources/ResourceRequest.class.php     | 2478 ----------------
 lib/models/resources/ResourceRequest.php           | 2478 ++++++++++++++++
 .../resources/ResourceRequestAppointment.class.php |   49 -
 .../resources/ResourceRequestAppointment.php       |   49 +
 .../resources/ResourceRequestProperty.class.php    |   80 -
 lib/models/resources/ResourceRequestProperty.php   |   80 +
 .../ResourceTemporaryPermission.class.php          |  254 --
 .../resources/ResourceTemporaryPermission.php      |  254 ++
 lib/models/resources/Room.class.php                |  723 -----
 lib/models/resources/Room.php                      |  723 +++++
 lib/models/resources/RoomRequest.class.php         |   98 -
 lib/models/resources/RoomRequest.php               |   98 +
 lib/models/resources/SeparableRoom.class.php       |  190 --
 lib/models/resources/SeparableRoom.php             |  190 ++
 lib/models/resources/SeparableRoomPart.class.php   |   54 -
 lib/models/resources/SeparableRoomPart.php         |   54 +
 lib/modules/Blubber.class.php                      |  136 -
 lib/modules/Blubber.php                            |  136 +
 lib/modules/ConsultationModule.class.php           |  202 --
 lib/modules/ConsultationModule.php                 |  202 ++
 lib/modules/CoreAdmin.class.php                    |  142 -
 lib/modules/CoreAdmin.php                          |  142 +
 lib/modules/CoreCalendar.class.php                 |   65 -
 lib/modules/CoreCalendar.php                       |   65 +
 lib/modules/CoreDocuments.class.php                |  205 --
 lib/modules/CoreDocuments.php                      |  205 ++
 lib/modules/CoreElearningInterface.class.php       |  143 -
 lib/modules/CoreElearningInterface.php             |  143 +
 lib/modules/CoreForum.class.php                    |  210 --
 lib/modules/CoreForum.php                          |  210 ++
 lib/modules/CoreOverview.class.php                 |  125 -
 lib/modules/CoreOverview.php                       |  125 +
 lib/modules/CoreParticipants.class.php             |  224 --
 lib/modules/CoreParticipants.php                   |  224 ++
 lib/modules/CorePersonal.class.php                 |   61 -
 lib/modules/CorePersonal.php                       |   61 +
 lib/modules/CoreSchedule.class.php                 |  130 -
 lib/modules/CoreSchedule.php                       |  130 +
 lib/modules/CoreScm.class.php                      |  163 --
 lib/modules/CoreScm.php                            |  163 ++
 lib/modules/CoreStudygroupAdmin.class.php          |   70 -
 lib/modules/CoreStudygroupAdmin.php                |   70 +
 lib/modules/CoreStudygroupParticipants.class.php   |   61 -
 lib/modules/CoreStudygroupParticipants.php         |   61 +
 lib/modules/CoreWiki.class.php                     |  205 --
 lib/modules/CoreWiki.php                           |  205 ++
 lib/modules/CoursewareModule.class.php             |  166 --
 lib/modules/CoursewareModule.php                   |  166 ++
 lib/modules/FeedbackModule.class.php               |   71 -
 lib/modules/FeedbackModule.php                     |   71 +
 lib/modules/GradebookModule.class.php              |  181 --
 lib/modules/GradebookModule.php                    |  181 ++
 lib/modules/IliasInterfaceModule.class.php         |  164 --
 lib/modules/IliasInterfaceModule.php               |  164 ++
 lib/modules/LtiToolModule.class.php                |  124 -
 lib/modules/LtiToolModule.php                      |  124 +
 lib/modules/StudipModule.class.php                 |   72 -
 lib/modules/StudipModule.php                       |   72 +
 lib/phplib/CT_Cache.class.php                      |   68 -
 lib/phplib/CT_Cache.php                            |   68 +
 lib/phplib/CT_Sql.class.php                        |  101 -
 lib/phplib/CT_Sql.php                              |  101 +
 lib/phplib/DB_Sql.class.php                        |  260 --
 lib/phplib/DB_Sql.php                              |  260 ++
 lib/phplib/Seminar_Auth.class.php                  |  450 ---
 lib/phplib/Seminar_Auth.php                        |  450 +++
 lib/phplib/Seminar_Default_Auth.class.php          |   19 -
 lib/phplib/Seminar_Default_Auth.php                |   19 +
 lib/phplib/Seminar_Perm.class.php                  |  350 ---
 lib/phplib/Seminar_Perm.php                        |  350 +++
 lib/phplib/Seminar_Register_Auth.class.php         |  242 --
 lib/phplib/Seminar_Register_Auth.php               |  242 ++
 lib/phplib/Seminar_Session.class.php               |  436 ---
 lib/phplib/Seminar_Session.php                     |  436 +++
 lib/phplib/Seminar_User.class.php                  |  116 -
 lib/phplib/Seminar_User.php                        |  116 +
 lib/phplib/email_validation.class.php              |  271 --
 lib/phplib/email_validation.php                    |  271 ++
 lib/plugins/core/AdminCourseAction.class.php       |   22 -
 lib/plugins/core/AdminCourseAction.php             |   22 +
 lib/plugins/core/AdminCourseContents.class.php     |   25 -
 lib/plugins/core/AdminCourseContents.php           |   25 +
 lib/plugins/core/AdminCourseWidgetPlugin.class.php |   42 -
 lib/plugins/core/AdminCourseWidgetPlugin.php       |   42 +
 lib/plugins/core/AdministrationPlugin.class.php    |   19 -
 lib/plugins/core/AdministrationPlugin.php          |   19 +
 lib/plugins/core/DetailspagePlugin.class.php       |   27 -
 lib/plugins/core/DetailspagePlugin.php             |   27 +
 lib/plugins/core/FileUploadHook.class.php          |   12 -
 lib/plugins/core/FileUploadHook.php                |   12 +
 lib/plugins/core/FilesystemPlugin.class.php        |   83 -
 lib/plugins/core/FilesystemPlugin.php              |   83 +
 lib/plugins/core/ForumModule.class.php             |  140 -
 lib/plugins/core/ForumModule.php                   |  140 +
 lib/plugins/core/HomepagePlugin.class.php          |   33 -
 lib/plugins/core/HomepagePlugin.php                |   33 +
 lib/plugins/core/LibraryPlugin.class.php           |   55 -
 lib/plugins/core/LibraryPlugin.php                 |   55 +
 lib/plugins/core/MetricsPlugin.class.php           |   23 -
 lib/plugins/core/MetricsPlugin.php                 |   23 +
 lib/plugins/core/PortalPlugin.class.php            |   33 -
 lib/plugins/core/PortalPlugin.php                  |   33 +
 lib/plugins/core/PrivacyPlugin.class.php           |   24 -
 lib/plugins/core/PrivacyPlugin.php                 |   24 +
 .../core/QuestionnaireAssignmentPlugin.class.php   |   57 -
 lib/plugins/core/QuestionnaireAssignmentPlugin.php |   57 +
 lib/plugins/core/RESTAPIPlugin.class.php           |   26 -
 lib/plugins/core/RESTAPIPlugin.php                 |   26 +
 lib/plugins/core/Role.class.php                    |   89 -
 lib/plugins/core/Role.php                          |   89 +
 lib/plugins/core/ScorePlugin.class.php             |   29 -
 lib/plugins/core/ScorePlugin.php                   |   29 +
 lib/plugins/core/StandardPlugin.class.php          |   17 -
 lib/plugins/core/StandardPlugin.php                |   17 +
 lib/plugins/core/StudIPPlugin.class.php            |  257 --
 lib/plugins/core/StudIPPlugin.php                  |  257 ++
 lib/plugins/core/SystemPlugin.class.php            |   17 -
 lib/plugins/core/SystemPlugin.php                  |   17 +
 lib/plugins/core/WebServicePlugin.class.php        |   14 -
 lib/plugins/core/WebServicePlugin.php              |   14 +
 lib/plugins/db/RolePersistence.class.php           |  721 -----
 lib/plugins/db/RolePersistence.php                 |  721 +++++
 lib/plugins/engine/PluginEngine.class.php          |  154 -
 lib/plugins/engine/PluginEngine.php                |  154 +
 lib/plugins/engine/PluginManager.class.php         |  719 -----
 lib/plugins/engine/PluginManager.php               |  719 +++++
 lib/plugins/engine/PluginRepository.class.php      |  160 --
 lib/plugins/engine/PluginRepository.php            |  160 ++
 lib/raumzeit/CycleData.class.php                   |  434 ---
 lib/raumzeit/CycleData.php                         |  434 +++
 lib/raumzeit/CycleDataDB.class.php                 |  271 --
 lib/raumzeit/CycleDataDB.php                       |  271 ++
 lib/raumzeit/Issue.class.php                       |  268 --
 lib/raumzeit/Issue.php                             |  268 ++
 lib/raumzeit/IssueDB.class.php                     |  153 -
 lib/raumzeit/IssueDB.php                           |  153 +
 lib/raumzeit/MetaDate.class.php                    |  697 -----
 lib/raumzeit/MetaDate.php                          |  697 +++++
 lib/raumzeit/MetaDateDB.class.php                  |   55 -
 lib/raumzeit/MetaDateDB.php                        |   55 +
 lib/raumzeit/SeminarDB.class.php                   |  264 --
 lib/raumzeit/SeminarDB.php                         |  264 ++
 lib/raumzeit/SingleDate.class.php                  |  978 -------
 lib/raumzeit/SingleDate.php                        |  978 +++++++
 lib/raumzeit/SingleDateDB.class.php                |  299 --
 lib/raumzeit/SingleDateDB.php                      |  299 ++
 lib/resources/ResourceManager.class.php            | 1472 ----------
 lib/resources/ResourceManager.php                  | 1472 ++++++++++
 lib/resources/RoomManager.class.php                |  994 -------
 lib/resources/RoomManager.php                      |  994 +++++++
 lib/soap/StudipSoapClient.class.php                |   58 -
 lib/soap/StudipSoapClient.php                      |   58 +
 lib/soap/StudipSoapClient_PHP5.class.php           |   63 -
 lib/soap/StudipSoapClient_PHP5.php                 |   63 +
 public/install.php                                 |   14 +-
 tests/_support/Helper/StudipDb.php                 |    2 +-
 tests/functional/_bootstrap.php                    |   22 -
 tests/jsonapi/_bootstrap.php                       |   49 +-
 tests/unit/_bootstrap.php                          |   56 +-
 tests/unit/lib/CalendarcolumnClassTest.php         |    2 +-
 tests/unit/lib/CalendarviewClassTest.php           |    2 +-
 tests/unit/lib/VisualTest.php                      |    4 +-
 tests/unit/lib/classes/AvatarClassTest.php         |    2 +-
 tests/unit/lib/classes/MarkupClassTest.php         |   10 +-
 tests/unit/lib/classes/PluginRepositoryTest.php    |    2 +-
 .../library/session/OAuthSessionAbstract.class.php |   44 -
 .../library/session/OAuthSessionAbstract.php       |   44 +
 .../OAuthSignatureMethod.class.php                 |   69 -
 .../signature_method/OAuthSignatureMethod.php      |   69 +
 .../library/store/OAuthStoreAbstract.class.php     |  151 -
 .../oauth-php/library/store/OAuthStoreAbstract.php |  151 +
 872 files changed, 109002 insertions(+), 108992 deletions(-)
 delete mode 100644 lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
 create mode 100644 lib/admissionrules/conditionaladmission/ConditionalAdmission.php
 delete mode 100644 lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php
 create mode 100644 lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
 delete mode 100644 lib/admissionrules/limitedadmission/LimitedAdmission.class.php
 create mode 100644 lib/admissionrules/limitedadmission/LimitedAdmission.php
 delete mode 100644 lib/admissionrules/lockedadmission/LockedAdmission.class.php
 create mode 100644 lib/admissionrules/lockedadmission/LockedAdmission.php
 delete mode 100644 lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php
 create mode 100644 lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
 delete mode 100644 lib/admissionrules/passwordadmission/PasswordAdmission.class.php
 create mode 100644 lib/admissionrules/passwordadmission/PasswordAdmission.php
 delete mode 100644 lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
 create mode 100644 lib/admissionrules/preferentialadmission/PreferentialAdmission.php
 delete mode 100644 lib/admissionrules/termsadmission/TermsAdmission.class.php
 create mode 100644 lib/admissionrules/termsadmission/TermsAdmission.php
 delete mode 100644 lib/admissionrules/timedadmission/TimedAdmission.class.php
 create mode 100644 lib/admissionrules/timedadmission/TimedAdmission.php
 delete mode 100644 lib/calendar/CalendarColumn.class.php
 create mode 100644 lib/calendar/CalendarColumn.php
 delete mode 100644 lib/calendar/CalendarView.class.php
 create mode 100644 lib/calendar/CalendarView.php
 delete mode 100644 lib/calendar/CalendarWeekView.class.php
 create mode 100644 lib/calendar/CalendarWeekView.php
 delete mode 100644 lib/classes/AdminCourseFilter.class.php
 create mode 100644 lib/classes/AdminCourseFilter.php
 delete mode 100644 lib/classes/Assets.class.php
 create mode 100644 lib/classes/Assets.php
 delete mode 100644 lib/classes/AuthorObject.class.php
 create mode 100644 lib/classes/AuthorObject.php
 delete mode 100644 lib/classes/AutoInsert.class.php
 create mode 100644 lib/classes/AutoInsert.php
 delete mode 100644 lib/classes/Avatar.class.php
 create mode 100644 lib/classes/Avatar.php
 delete mode 100644 lib/classes/BreadCrumb.class.php
 create mode 100644 lib/classes/BreadCrumb.php
 delete mode 100644 lib/classes/Button.class.php
 create mode 100644 lib/classes/Button.php
 delete mode 100644 lib/classes/CSVArrayObject.class.php
 create mode 100644 lib/classes/CSVArrayObject.php
 delete mode 100644 lib/classes/Color.class.php
 create mode 100644 lib/classes/Color.php
 delete mode 100644 lib/classes/Config.class.php
 create mode 100644 lib/classes/Config.php
 delete mode 100644 lib/classes/CourseAvatar.class.php
 create mode 100644 lib/classes/CourseAvatar.php
 delete mode 100644 lib/classes/CourseConfig.class.php
 create mode 100644 lib/classes/CourseConfig.php
 delete mode 100644 lib/classes/CronJob.class.php
 create mode 100644 lib/classes/CronJob.php
 delete mode 100644 lib/classes/CronjobScheduler.class.php
 create mode 100644 lib/classes/CronjobScheduler.php
 delete mode 100644 lib/classes/DBManager.class.php
 create mode 100644 lib/classes/DBManager.php
 delete mode 100644 lib/classes/DataFieldBoolEntry.class.php
 create mode 100644 lib/classes/DataFieldBoolEntry.php
 delete mode 100644 lib/classes/DataFieldComboEntry.class.php
 create mode 100644 lib/classes/DataFieldComboEntry.php
 delete mode 100644 lib/classes/DataFieldDateEntry.class.php
 create mode 100644 lib/classes/DataFieldDateEntry.php
 delete mode 100644 lib/classes/DataFieldEmailEntry.class.php
 create mode 100644 lib/classes/DataFieldEmailEntry.php
 delete mode 100644 lib/classes/DataFieldEntry.class.php
 create mode 100644 lib/classes/DataFieldEntry.php
 delete mode 100644 lib/classes/DataFieldLinkEntry.class.php
 create mode 100644 lib/classes/DataFieldLinkEntry.php
 delete mode 100644 lib/classes/DataFieldPhoneEntry.class.php
 create mode 100644 lib/classes/DataFieldPhoneEntry.php
 delete mode 100644 lib/classes/DataFieldRadioEntry.class.php
 create mode 100644 lib/classes/DataFieldRadioEntry.php
 delete mode 100644 lib/classes/DataFieldSelectboxEntry.class.php
 create mode 100644 lib/classes/DataFieldSelectboxEntry.php
 delete mode 100644 lib/classes/DataFieldSelectboxMultipleEntry.class.php
 create mode 100644 lib/classes/DataFieldSelectboxMultipleEntry.php
 delete mode 100644 lib/classes/DataFieldTextareaEntry.class.php
 create mode 100644 lib/classes/DataFieldTextareaEntry.php
 delete mode 100644 lib/classes/DataFieldTextareai18nEntry.class.php
 create mode 100644 lib/classes/DataFieldTextareai18nEntry.php
 delete mode 100644 lib/classes/DataFieldTextlineEntry.class.php
 create mode 100644 lib/classes/DataFieldTextlineEntry.php
 delete mode 100644 lib/classes/DataFieldTextlinei18nEntry.class.php
 create mode 100644 lib/classes/DataFieldTextlinei18nEntry.php
 delete mode 100644 lib/classes/DataFieldTextmarkupEntry.class.php
 create mode 100644 lib/classes/DataFieldTextmarkupEntry.php
 delete mode 100644 lib/classes/DataFieldTextmarkupi18nEntry.class.php
 create mode 100644 lib/classes/DataFieldTextmarkupi18nEntry.php
 delete mode 100644 lib/classes/DataFieldTimeEntry.class.php
 create mode 100644 lib/classes/DataFieldTimeEntry.php
 delete mode 100644 lib/classes/DatabaseObject.class.php
 create mode 100644 lib/classes/DatabaseObject.php
 delete mode 100644 lib/classes/DateFormatter.class.php
 create mode 100644 lib/classes/DateFormatter.php
 delete mode 100644 lib/classes/DbSnapshot.class.php
 create mode 100644 lib/classes/DbSnapshot.php
 delete mode 100644 lib/classes/DbView.class.php
 create mode 100644 lib/classes/DbView.php
 delete mode 100644 lib/classes/Event.interface.php
 create mode 100644 lib/classes/Event.php
 delete mode 100644 lib/classes/Feedback.class.php
 create mode 100644 lib/classes/Feedback.php
 delete mode 100644 lib/classes/FeedbackRange.interface.php
 create mode 100644 lib/classes/FeedbackRange.php
 delete mode 100644 lib/classes/FileLock.class.php
 create mode 100644 lib/classes/FileLock.php
 delete mode 100644 lib/classes/Fullcalendar.class.php
 create mode 100644 lib/classes/Fullcalendar.php
 delete mode 100644 lib/classes/Icon.class.php
 create mode 100644 lib/classes/Icon.php
 delete mode 100644 lib/classes/InstituteAvatar.class.php
 create mode 100644 lib/classes/InstituteAvatar.php
 delete mode 100644 lib/classes/InstituteCalendarHelper.class.php
 create mode 100644 lib/classes/InstituteCalendarHelper.php
 delete mode 100644 lib/classes/InstituteConfig.class.php
 create mode 100644 lib/classes/InstituteConfig.php
 delete mode 100644 lib/classes/Interactable.class.php
 create mode 100644 lib/classes/Interactable.php
 delete mode 100644 lib/classes/JSONArrayObject.class.php
 create mode 100644 lib/classes/JSONArrayObject.php
 delete mode 100644 lib/classes/LayoutMessage.interface.php
 create mode 100644 lib/classes/LayoutMessage.php
 delete mode 100644 lib/classes/LinkButton.class.php
 create mode 100644 lib/classes/LinkButton.php
 delete mode 100644 lib/classes/LockRules.class.php
 create mode 100644 lib/classes/LockRules.php
 delete mode 100644 lib/classes/Loggable.class.php
 create mode 100644 lib/classes/Loggable.php
 delete mode 100644 lib/classes/MVV.class.php
 create mode 100644 lib/classes/MVV.php
 delete mode 100644 lib/classes/Markup.class.php
 create mode 100644 lib/classes/Markup.php
 delete mode 100644 lib/classes/MessageBox.class.php
 create mode 100644 lib/classes/MessageBox.php
 delete mode 100644 lib/classes/ModulesNotification.class.php
 create mode 100644 lib/classes/ModulesNotification.php
 delete mode 100644 lib/classes/MultiDimArrayObject.class.php
 create mode 100644 lib/classes/MultiDimArrayObject.php
 delete mode 100644 lib/classes/MultiPersonSearch.class.php
 create mode 100644 lib/classes/MultiPersonSearch.php
 delete mode 100644 lib/classes/NotificationCenter.class.php
 create mode 100644 lib/classes/NotificationCenter.php
 delete mode 100644 lib/classes/PrivacyObject.interface.php
 create mode 100644 lib/classes/PrivacyObject.php
 delete mode 100644 lib/classes/QuestionType.interface.php
 create mode 100644 lib/classes/QuestionType.php
 delete mode 100644 lib/classes/QuickSearch.class.php
 create mode 100644 lib/classes/QuickSearch.php
 delete mode 100644 lib/classes/Range.interface.php
 create mode 100644 lib/classes/Range.php
 delete mode 100644 lib/classes/RangeConfig.class.php
 create mode 100644 lib/classes/RangeConfig.php
 delete mode 100644 lib/classes/RangeTreeObject.class.php
 create mode 100644 lib/classes/RangeTreeObject.php
 delete mode 100644 lib/classes/RangeTreeObjectFak.class.php
 create mode 100644 lib/classes/RangeTreeObjectFak.php
 delete mode 100644 lib/classes/RangeTreeObjectInst.class.php
 create mode 100644 lib/classes/RangeTreeObjectInst.php
 delete mode 100644 lib/classes/Request.class.php
 create mode 100644 lib/classes/Request.php
 delete mode 100644 lib/classes/ResetButton.class.php
 create mode 100644 lib/classes/ResetButton.php
 delete mode 100644 lib/classes/Score.class.php
 create mode 100644 lib/classes/Score.php
 delete mode 100644 lib/classes/SemBrowse.class.php
 create mode 100644 lib/classes/SemBrowse.php
 delete mode 100644 lib/classes/SemClass.class.php
 create mode 100644 lib/classes/SemClass.php
 delete mode 100644 lib/classes/SemType.class.php
 create mode 100644 lib/classes/SemType.php
 delete mode 100644 lib/classes/Seminar.class.php
 create mode 100644 lib/classes/Seminar.php
 delete mode 100644 lib/classes/SeminarCategories.class.php
 create mode 100644 lib/classes/SeminarCategories.php
 delete mode 100644 lib/classes/SessionDecoder.class.php
 create mode 100644 lib/classes/SessionDecoder.php
 delete mode 100644 lib/classes/SimpleCollection.class.php
 create mode 100644 lib/classes/SimpleCollection.php
 delete mode 100644 lib/classes/SimpleORMap.class.php
 create mode 100644 lib/classes/SimpleORMap.php
 delete mode 100644 lib/classes/SimpleORMapCollection.class.php
 create mode 100644 lib/classes/SimpleORMapCollection.php
 delete mode 100644 lib/classes/StudipArrayObject.class.php
 create mode 100644 lib/classes/StudipArrayObject.php
 delete mode 100644 lib/classes/StudipForm.class.php
 create mode 100644 lib/classes/StudipForm.php
 delete mode 100644 lib/classes/StudipItem.interface.php
 create mode 100644 lib/classes/StudipItem.php
 delete mode 100644 lib/classes/StudipKing.class.php
 create mode 100644 lib/classes/StudipKing.php
 delete mode 100644 lib/classes/StudipLink.class.php
 create mode 100644 lib/classes/StudipLink.php
 delete mode 100644 lib/classes/StudipLock.class.php
 create mode 100644 lib/classes/StudipLock.php
 delete mode 100644 lib/classes/StudipLog.class.php
 create mode 100644 lib/classes/StudipLog.php
 delete mode 100644 lib/classes/StudipLvgruppeSelection.class.php
 create mode 100644 lib/classes/StudipLvgruppeSelection.php
 delete mode 100644 lib/classes/StudipMail.class.php
 create mode 100644 lib/classes/StudipMail.php
 delete mode 100644 lib/classes/StudipObject.class.php
 create mode 100644 lib/classes/StudipObject.php
 delete mode 100644 lib/classes/StudipPDO.class.php
 create mode 100644 lib/classes/StudipPDO.php
 delete mode 100644 lib/classes/StudipRangeTree.class.php
 create mode 100644 lib/classes/StudipRangeTree.php
 delete mode 100644 lib/classes/StudipRangeTreeView.class.php
 create mode 100644 lib/classes/StudipRangeTreeView.php
 delete mode 100644 lib/classes/StudipRangeTreeViewAdmin.class.php
 create mode 100644 lib/classes/StudipRangeTreeViewAdmin.php
 delete mode 100644 lib/classes/StudipSemRangeTreeViewSimple.class.php
 create mode 100644 lib/classes/StudipSemRangeTreeViewSimple.php
 delete mode 100644 lib/classes/StudipSemSearch.class.php
 create mode 100644 lib/classes/StudipSemSearch.php
 delete mode 100644 lib/classes/StudipSemSearchHelper.class.php
 create mode 100644 lib/classes/StudipSemSearchHelper.php
 delete mode 100644 lib/classes/StudipSemTree.class.php
 create mode 100644 lib/classes/StudipSemTree.php
 delete mode 100644 lib/classes/StudipSemTreeSearch.class.php
 create mode 100644 lib/classes/StudipSemTreeSearch.php
 delete mode 100644 lib/classes/StudipSemTreeView.class.php
 create mode 100644 lib/classes/StudipSemTreeView.php
 delete mode 100644 lib/classes/StudipSemTreeViewAdmin.class.php
 create mode 100644 lib/classes/StudipSemTreeViewAdmin.php
 delete mode 100644 lib/classes/StudipSemTreeViewSimple.class.php
 create mode 100644 lib/classes/StudipSemTreeViewSimple.php
 delete mode 100644 lib/classes/StudipStudyAreaSelection.class.php
 create mode 100644 lib/classes/StudipStudyAreaSelection.php
 delete mode 100644 lib/classes/StudygroupAvatar.class.php
 create mode 100644 lib/classes/StudygroupAvatar.php
 delete mode 100644 lib/classes/TreeAbstract.class.php
 create mode 100644 lib/classes/TreeAbstract.php
 delete mode 100644 lib/classes/TreeView.class.php
 create mode 100644 lib/classes/TreeView.php
 delete mode 100644 lib/classes/UpdateInformation.class.php
 create mode 100644 lib/classes/UpdateInformation.php
 delete mode 100644 lib/classes/UserConfig.class.php
 create mode 100644 lib/classes/UserConfig.php
 delete mode 100644 lib/classes/UserLookup.class.php
 create mode 100644 lib/classes/UserLookup.php
 delete mode 100644 lib/classes/UserManagement.class.php
 create mode 100644 lib/classes/UserManagement.php
 delete mode 100644 lib/classes/admission/AdmissionAlgorithm.class.php
 create mode 100644 lib/classes/admission/AdmissionAlgorithm.php
 delete mode 100644 lib/classes/admission/AdmissionPriority.class.php
 create mode 100644 lib/classes/admission/AdmissionPriority.php
 delete mode 100644 lib/classes/admission/AdmissionRule.class.php
 create mode 100644 lib/classes/admission/AdmissionRule.php
 delete mode 100644 lib/classes/admission/AdmissionUserList.class.php
 create mode 100644 lib/classes/admission/AdmissionUserList.php
 delete mode 100644 lib/classes/admission/CourseSet.class.php
 create mode 100644 lib/classes/admission/CourseSet.php
 delete mode 100644 lib/classes/admission/RandomAlgorithm.class.php
 create mode 100644 lib/classes/admission/RandomAlgorithm.php
 delete mode 100644 lib/classes/admission/UserFilter.class.php
 create mode 100644 lib/classes/admission/UserFilter.php
 delete mode 100644 lib/classes/admission/UserFilterField.class.php
 create mode 100644 lib/classes/admission/UserFilterField.php
 delete mode 100644 lib/classes/admission/userfilter/DatafieldCondition.class.php
 create mode 100644 lib/classes/admission/userfilter/DatafieldCondition.php
 delete mode 100644 lib/classes/admission/userfilter/DegreeCondition.class.php
 create mode 100644 lib/classes/admission/userfilter/DegreeCondition.php
 delete mode 100644 lib/classes/admission/userfilter/PermissionCondition.class.php
 create mode 100644 lib/classes/admission/userfilter/PermissionCondition.php
 delete mode 100644 lib/classes/admission/userfilter/SemesterOfStudyCondition.class.php
 create mode 100644 lib/classes/admission/userfilter/SemesterOfStudyCondition.php
 delete mode 100644 lib/classes/admission/userfilter/StgteilVersionCondition.class.php
 create mode 100644 lib/classes/admission/userfilter/StgteilVersionCondition.php
 delete mode 100644 lib/classes/admission/userfilter/SubjectCondition.class.php
 create mode 100644 lib/classes/admission/userfilter/SubjectCondition.php
 delete mode 100644 lib/classes/admission/userfilter/SubjectConditionAny.class.php
 create mode 100644 lib/classes/admission/userfilter/SubjectConditionAny.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthAbstract.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthAbstract.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthCAS.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthCAS.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthIP.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthIP.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthLTI.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthLTI.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthLdap.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthLdap.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthLdapReadAndBind.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthOIDC.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthOIDC.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthSSO.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthSSO.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthShib.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthShib.php
 delete mode 100644 lib/classes/auth_plugins/StudipAuthStandard.class.php
 create mode 100644 lib/classes/auth_plugins/StudipAuthStandard.php
 delete mode 100644 lib/classes/cache/Cache.class.php
 create mode 100644 lib/classes/cache/Cache.php
 delete mode 100644 lib/classes/cache/DbCache.class.php
 create mode 100644 lib/classes/cache/DbCache.php
 delete mode 100644 lib/classes/cache/Factory.class.php
 create mode 100644 lib/classes/cache/Factory.php
 delete mode 100644 lib/classes/cache/FileCache.class.php
 create mode 100644 lib/classes/cache/FileCache.php
 delete mode 100644 lib/classes/cache/Item.class.php
 create mode 100644 lib/classes/cache/Item.php
 delete mode 100644 lib/classes/cache/MemcachedCache.class.php
 create mode 100644 lib/classes/cache/MemcachedCache.php
 delete mode 100644 lib/classes/cache/MemoryCache.class.php
 create mode 100644 lib/classes/cache/MemoryCache.php
 delete mode 100644 lib/classes/cache/Proxy.class.php
 create mode 100644 lib/classes/cache/Proxy.php
 delete mode 100644 lib/classes/cache/RedisCache.class.php
 create mode 100644 lib/classes/cache/RedisCache.php
 delete mode 100644 lib/classes/cache/Wrapper.class.php
 create mode 100644 lib/classes/cache/Wrapper.php
 delete mode 100644 lib/classes/calendar/EventData.class.php
 create mode 100644 lib/classes/calendar/EventData.php
 delete mode 100644 lib/classes/calendar/EventSource.interface.php
 create mode 100644 lib/classes/calendar/EventSource.php
 delete mode 100644 lib/classes/calendar/ICalendarExport.class.php
 create mode 100644 lib/classes/calendar/ICalendarExport.php
 delete mode 100644 lib/classes/calendar/ICalendarImport.class.php
 create mode 100644 lib/classes/calendar/ICalendarImport.php
 delete mode 100644 lib/classes/calendar/Owner.interface.php
 create mode 100644 lib/classes/calendar/Owner.php
 delete mode 100644 lib/classes/exportdocument/ExportDocument.interface.php
 create mode 100644 lib/classes/exportdocument/ExportDocument.php
 delete mode 100644 lib/classes/exportdocument/ExportPDF.class.php
 create mode 100644 lib/classes/exportdocument/ExportPDF.php
 delete mode 100644 lib/classes/librarysearch/LibraryDocument.class.php
 create mode 100644 lib/classes/librarysearch/LibraryDocument.php
 delete mode 100644 lib/classes/librarysearch/LibraryResultParser.interface.php
 create mode 100644 lib/classes/librarysearch/LibraryResultParser.php
 delete mode 100644 lib/classes/librarysearch/LibrarySearch.class.php
 create mode 100644 lib/classes/librarysearch/LibrarySearch.php
 delete mode 100644 lib/classes/librarysearch/LibrarySearchManager.class.php
 create mode 100644 lib/classes/librarysearch/LibrarySearchManager.php
 delete mode 100644 lib/classes/librarysearch/resultparsers/BASELibraryResultParser.class.php
 create mode 100644 lib/classes/librarysearch/resultparsers/BASELibraryResultParser.php
 delete mode 100644 lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.class.php
 create mode 100644 lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.php
 delete mode 100644 lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.class.php
 create mode 100644 lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.php
 delete mode 100644 lib/classes/librarysearch/resultparsers/SRULibraryResultParser.class.php
 create mode 100644 lib/classes/librarysearch/resultparsers/SRULibraryResultParser.php
 delete mode 100644 lib/classes/librarysearch/searchmodules/BASELibrarySearch.class.php
 create mode 100644 lib/classes/librarysearch/searchmodules/BASELibrarySearch.php
 delete mode 100644 lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.class.php
 create mode 100644 lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.php
 delete mode 100644 lib/classes/librarysearch/searchmodules/SRULibrarySearch.class.php
 create mode 100644 lib/classes/librarysearch/searchmodules/SRULibrarySearch.php
 delete mode 100644 lib/classes/searchtypes/MyCoursesSearch.class.php
 create mode 100644 lib/classes/searchtypes/MyCoursesSearch.php
 delete mode 100644 lib/classes/searchtypes/PermissionSearch.class.php
 create mode 100644 lib/classes/searchtypes/PermissionSearch.php
 delete mode 100644 lib/classes/searchtypes/RangeSearch.class.php
 create mode 100644 lib/classes/searchtypes/RangeSearch.php
 delete mode 100644 lib/classes/searchtypes/ResourceSearch.class.php
 create mode 100644 lib/classes/searchtypes/ResourceSearch.php
 delete mode 100644 lib/classes/searchtypes/RoomSearch.class.php
 create mode 100644 lib/classes/searchtypes/RoomSearch.php
 delete mode 100644 lib/classes/searchtypes/SQLSearch.class.php
 create mode 100644 lib/classes/searchtypes/SQLSearch.php
 delete mode 100644 lib/classes/searchtypes/SearchType.class.php
 create mode 100644 lib/classes/searchtypes/SearchType.php
 delete mode 100644 lib/classes/searchtypes/SeminarSearch.class.php
 create mode 100644 lib/classes/searchtypes/SeminarSearch.php
 delete mode 100644 lib/classes/searchtypes/StandardSearch.class.php
 create mode 100644 lib/classes/searchtypes/StandardSearch.php
 delete mode 100644 lib/classes/searchtypes/TreeSearch.class.php
 create mode 100644 lib/classes/searchtypes/TreeSearch.php
 delete mode 100644 lib/classes/sidebar/ClipboardWidget.class.php
 create mode 100644 lib/classes/sidebar/ClipboardWidget.php
 delete mode 100644 lib/classes/sidebar/InstituteSelectWidget.class.php
 create mode 100644 lib/classes/sidebar/InstituteSelectWidget.php
 delete mode 100644 lib/classes/sidebar/ResourceTreeWidget.class.php
 create mode 100644 lib/classes/sidebar/ResourceTreeWidget.php
 delete mode 100644 lib/classes/sidebar/RoomClipboardWidget.class.php
 create mode 100644 lib/classes/sidebar/RoomClipboardWidget.php
 delete mode 100644 lib/classes/sidebar/RoomSearchTreeWidget.class.php
 create mode 100644 lib/classes/sidebar/RoomSearchTreeWidget.php
 delete mode 100644 lib/classes/sidebar/RoomSearchWidget.class.php
 create mode 100644 lib/classes/sidebar/RoomSearchWidget.php
 delete mode 100644 lib/cronjobs/check_admission.class.php
 create mode 100644 lib/cronjobs/check_admission.php
 delete mode 100644 lib/cronjobs/cleanup_log.class.php
 create mode 100644 lib/cronjobs/cleanup_log.php
 delete mode 100644 lib/cronjobs/garbage_collector.class.php
 create mode 100644 lib/cronjobs/garbage_collector.php
 delete mode 100644 lib/cronjobs/purge_cache.class.php
 create mode 100644 lib/cronjobs/purge_cache.php
 delete mode 100644 lib/cronjobs/remind_oer_upload.class.php
 create mode 100644 lib/cronjobs/remind_oer_upload.php
 delete mode 100644 lib/cronjobs/send_mail_notifications.class.php
 create mode 100644 lib/cronjobs/send_mail_notifications.php
 delete mode 100644 lib/cronjobs/send_mail_queue.class.php
 create mode 100644 lib/cronjobs/send_mail_queue.php
 delete mode 100644 lib/cronjobs/session_gc.class.php
 create mode 100644 lib/cronjobs/session_gc.php
 delete mode 100644 lib/elearning/ConnectedCMS.class.php
 create mode 100644 lib/elearning/ConnectedCMS.php
 delete mode 100644 lib/elearning/ConnectedLink.class.php
 create mode 100644 lib/elearning/ConnectedLink.php
 delete mode 100644 lib/elearning/ConnectedPermissions.class.php
 create mode 100644 lib/elearning/ConnectedPermissions.php
 delete mode 100644 lib/elearning/ConnectedUser.class.php
 create mode 100644 lib/elearning/ConnectedUser.php
 delete mode 100644 lib/elearning/ContentModule.class.php
 create mode 100644 lib/elearning/ContentModule.php
 delete mode 100644 lib/elearning/ContentModuleView.class.php
 create mode 100644 lib/elearning/ContentModuleView.php
 delete mode 100644 lib/elearning/ELearningUtils.class.php
 create mode 100644 lib/elearning/ELearningUtils.php
 delete mode 100644 lib/elearning/Ilias3ConnectedCMS.class.php
 create mode 100644 lib/elearning/Ilias3ConnectedCMS.php
 delete mode 100644 lib/elearning/Ilias3ConnectedLink.class.php
 create mode 100644 lib/elearning/Ilias3ConnectedLink.php
 delete mode 100644 lib/elearning/Ilias3ConnectedPermissions.class.php
 create mode 100644 lib/elearning/Ilias3ConnectedPermissions.php
 delete mode 100644 lib/elearning/Ilias3ConnectedUser.class.php
 create mode 100644 lib/elearning/Ilias3ConnectedUser.php
 delete mode 100644 lib/elearning/Ilias3ContentModule.class.php
 create mode 100644 lib/elearning/Ilias3ContentModule.php
 delete mode 100644 lib/elearning/Ilias3ObjectXMLParser.class.php
 create mode 100644 lib/elearning/Ilias3ObjectXMLParser.php
 delete mode 100644 lib/elearning/Ilias3SaxParser.class.php
 create mode 100644 lib/elearning/Ilias3SaxParser.php
 delete mode 100644 lib/elearning/Ilias3Soap.class.php
 create mode 100644 lib/elearning/Ilias3Soap.php
 delete mode 100644 lib/elearning/Ilias4ConnectedCMS.class.php
 create mode 100644 lib/elearning/Ilias4ConnectedCMS.php
 delete mode 100644 lib/elearning/Ilias4ConnectedLink.class.php
 create mode 100644 lib/elearning/Ilias4ConnectedLink.php
 delete mode 100644 lib/elearning/Ilias4ConnectedPermissions.class.php
 create mode 100644 lib/elearning/Ilias4ConnectedPermissions.php
 delete mode 100644 lib/elearning/Ilias4ConnectedUser.class.php
 create mode 100644 lib/elearning/Ilias4ConnectedUser.php
 delete mode 100644 lib/elearning/Ilias4ContentModule.class.php
 create mode 100644 lib/elearning/Ilias4ContentModule.php
 delete mode 100644 lib/elearning/Ilias4Soap.class.php
 create mode 100644 lib/elearning/Ilias4Soap.php
 delete mode 100644 lib/elearning/Ilias5ConnectedCMS.class.php
 create mode 100644 lib/elearning/Ilias5ConnectedCMS.php
 delete mode 100644 lib/elearning/Ilias5ConnectedLink.class.php
 create mode 100644 lib/elearning/Ilias5ConnectedLink.php
 delete mode 100644 lib/elearning/Ilias5ConnectedPermissions.class.php
 create mode 100644 lib/elearning/Ilias5ConnectedPermissions.php
 delete mode 100644 lib/elearning/Ilias5ConnectedUser.class.php
 create mode 100644 lib/elearning/Ilias5ConnectedUser.php
 delete mode 100644 lib/elearning/Ilias5ContentModule.class.php
 create mode 100644 lib/elearning/Ilias5ContentModule.php
 delete mode 100644 lib/elearning/Ilias5Soap.class.php
 create mode 100644 lib/elearning/Ilias5Soap.php
 delete mode 100644 lib/elearning/LonCapaConnectedCMS.class.php
 create mode 100644 lib/elearning/LonCapaConnectedCMS.php
 delete mode 100644 lib/elearning/LonCapaConnectedLink.class.php
 create mode 100644 lib/elearning/LonCapaConnectedLink.php
 delete mode 100644 lib/elearning/LonCapaContentModule.class.php
 create mode 100644 lib/elearning/LonCapaContentModule.php
 delete mode 100644 lib/elearning/LonCapaRequest.class.php
 create mode 100644 lib/elearning/LonCapaRequest.php
 delete mode 100644 lib/elearning/ObjectConnections.class.php
 create mode 100644 lib/elearning/ObjectConnections.php
 delete mode 100644 lib/elearning/PmWikiConnectedCMS.class.php
 create mode 100644 lib/elearning/PmWikiConnectedCMS.php
 delete mode 100644 lib/elearning/PmWikiConnectedLink.class.php
 create mode 100644 lib/elearning/PmWikiConnectedLink.php
 delete mode 100644 lib/elearning/PmWikiContentModule.class.php
 create mode 100644 lib/elearning/PmWikiContentModule.php
 delete mode 100644 lib/exceptions/ClipboardException.class.php
 create mode 100644 lib/exceptions/ClipboardException.php
 delete mode 100644 lib/exceptions/resources/GlobalResourceLockException.class.php
 create mode 100644 lib/exceptions/resources/GlobalResourceLockException.php
 delete mode 100644 lib/exceptions/resources/GlobalResourceLockOverlapException.class.php
 create mode 100644 lib/exceptions/resources/GlobalResourceLockOverlapException.php
 delete mode 100644 lib/exceptions/resources/InvalidResourceCategoryException.class.php
 create mode 100644 lib/exceptions/resources/InvalidResourceCategoryException.php
 delete mode 100644 lib/exceptions/resources/InvalidResourceClassException.class.php
 create mode 100644 lib/exceptions/resources/InvalidResourceClassException.php
 delete mode 100644 lib/exceptions/resources/InvalidResourceException.class.php
 create mode 100644 lib/exceptions/resources/InvalidResourceException.php
 delete mode 100644 lib/exceptions/resources/InvalidResourceRequestException.class.php
 create mode 100644 lib/exceptions/resources/InvalidResourceRequestException.php
 delete mode 100644 lib/exceptions/resources/NoResourceClassException.class.php
 create mode 100644 lib/exceptions/resources/NoResourceClassException.php
 delete mode 100644 lib/exceptions/resources/ResourceBookingException.class.php
 create mode 100644 lib/exceptions/resources/ResourceBookingException.php
 delete mode 100644 lib/exceptions/resources/ResourceBookingOverlapException.class.php
 create mode 100644 lib/exceptions/resources/ResourceBookingOverlapException.php
 delete mode 100644 lib/exceptions/resources/ResourceBookingRangeException.class.php
 create mode 100644 lib/exceptions/resources/ResourceBookingRangeException.php
 delete mode 100644 lib/exceptions/resources/ResourceException.class.php
 create mode 100644 lib/exceptions/resources/ResourceException.php
 delete mode 100644 lib/exceptions/resources/ResourceNoTimeRangeException.class.php
 create mode 100644 lib/exceptions/resources/ResourceNoTimeRangeException.php
 delete mode 100644 lib/exceptions/resources/ResourcePermissionException.class.php
 create mode 100644 lib/exceptions/resources/ResourcePermissionException.php
 delete mode 100644 lib/exceptions/resources/ResourcePropertyDefinitionException.class.php
 create mode 100644 lib/exceptions/resources/ResourcePropertyDefinitionException.php
 delete mode 100644 lib/exceptions/resources/ResourcePropertyException.class.php
 create mode 100644 lib/exceptions/resources/ResourcePropertyException.php
 delete mode 100644 lib/exceptions/resources/ResourcePropertyStateException.class.php
 create mode 100644 lib/exceptions/resources/ResourcePropertyStateException.php
 delete mode 100644 lib/exceptions/resources/ResourceRequestException.class.php
 create mode 100644 lib/exceptions/resources/ResourceRequestException.php
 delete mode 100644 lib/exceptions/resources/ResourceUnavailableException.class.php
 create mode 100644 lib/exceptions/resources/ResourceUnavailableException.php
 delete mode 100644 lib/exceptions/resources/ResourceUnlockableException.class.php
 create mode 100644 lib/exceptions/resources/ResourceUnlockableException.php
 delete mode 100644 lib/exceptions/resources/SeparableRoomException.class.php
 create mode 100644 lib/exceptions/resources/SeparableRoomException.php
 delete mode 100644 lib/filesystem/FileArchiveManager.class.php
 create mode 100644 lib/filesystem/FileArchiveManager.php
 delete mode 100644 lib/filesystem/FileArchiveManagerException.class.php
 create mode 100644 lib/filesystem/FileArchiveManagerException.php
 delete mode 100644 lib/filesystem/LibraryFile.class.php
 create mode 100644 lib/filesystem/LibraryFile.php
 delete mode 100644 lib/filesystem/ResourceFolder.class.php
 create mode 100644 lib/filesystem/ResourceFolder.php
 delete mode 100644 lib/ilias_interface/ConnectedIlias.class.php
 create mode 100644 lib/ilias_interface/ConnectedIlias.php
 delete mode 100644 lib/ilias_interface/IliasModule.class.php
 create mode 100644 lib/ilias_interface/IliasModule.php
 delete mode 100644 lib/ilias_interface/IliasObjectConnections.class.php
 create mode 100644 lib/ilias_interface/IliasObjectConnections.php
 delete mode 100644 lib/ilias_interface/IliasSoap.class.php
 create mode 100644 lib/ilias_interface/IliasSoap.php
 delete mode 100644 lib/ilias_interface/IliasUser.class.php
 create mode 100644 lib/ilias_interface/IliasUser.php
 delete mode 100644 lib/models/AdmissionApplication.class.php
 create mode 100644 lib/models/AdmissionApplication.php
 delete mode 100644 lib/models/ArchivedCourse.class.php
 create mode 100644 lib/models/ArchivedCourse.php
 delete mode 100644 lib/models/ArchivedCourseMember.class.php
 create mode 100644 lib/models/ArchivedCourseMember.php
 delete mode 100644 lib/models/AuthUserMd5.class.php
 create mode 100644 lib/models/AuthUserMd5.php
 delete mode 100644 lib/models/Banner.class.php
 create mode 100644 lib/models/Banner.php
 delete mode 100644 lib/models/BannerRoles.class.php
 create mode 100644 lib/models/BannerRoles.php
 delete mode 100644 lib/models/Clipboard.class.php
 create mode 100644 lib/models/Clipboard.php
 delete mode 100644 lib/models/ClipboardItem.class.php
 create mode 100644 lib/models/ClipboardItem.php
 delete mode 100644 lib/models/ColourValue.class.php
 create mode 100644 lib/models/ColourValue.php
 delete mode 100644 lib/models/ConfigEntry.class.php
 create mode 100644 lib/models/ConfigEntry.php
 delete mode 100644 lib/models/Contact.class.php
 create mode 100644 lib/models/Contact.php
 delete mode 100644 lib/models/ContactGroup.class.php
 create mode 100644 lib/models/ContactGroup.php
 delete mode 100644 lib/models/ContactGroupItem.class.php
 create mode 100644 lib/models/ContactGroupItem.php
 delete mode 100644 lib/models/ContentTermsOfUse.class.php
 create mode 100644 lib/models/ContentTermsOfUse.php
 delete mode 100644 lib/models/Course.class.php
 create mode 100644 lib/models/Course.php
 delete mode 100644 lib/models/CourseDate.class.php
 create mode 100644 lib/models/CourseDate.php
 delete mode 100644 lib/models/CourseExDate.class.php
 create mode 100644 lib/models/CourseExDate.php
 delete mode 100644 lib/models/CourseMember.class.php
 create mode 100644 lib/models/CourseMember.php
 delete mode 100644 lib/models/CourseTopic.class.php
 create mode 100644 lib/models/CourseTopic.php
 delete mode 100644 lib/models/CronjobLog.class.php
 create mode 100644 lib/models/CronjobLog.php
 delete mode 100644 lib/models/CronjobSchedule.class.php
 create mode 100644 lib/models/CronjobSchedule.php
 delete mode 100644 lib/models/CronjobTask.class.php
 create mode 100644 lib/models/CronjobTask.php
 delete mode 100644 lib/models/DataField.class.php
 create mode 100644 lib/models/DataField.php
 delete mode 100644 lib/models/DatafieldEntryModel.class.php
 create mode 100644 lib/models/DatafieldEntryModel.php
 delete mode 100644 lib/models/DatafieldEntryModelI18N.class.php
 create mode 100644 lib/models/DatafieldEntryModelI18N.php
 delete mode 100644 lib/models/Degree.class.php
 create mode 100644 lib/models/Degree.php
 delete mode 100644 lib/models/HelpContent.class.php
 create mode 100644 lib/models/HelpContent.php
 delete mode 100644 lib/models/HelpTour.class.php
 create mode 100644 lib/models/HelpTour.php
 delete mode 100644 lib/models/HelpTourAudience.class.php
 create mode 100644 lib/models/HelpTourAudience.php
 delete mode 100644 lib/models/HelpTourSettings.class.php
 create mode 100644 lib/models/HelpTourSettings.php
 delete mode 100644 lib/models/HelpTourStep.class.php
 create mode 100644 lib/models/HelpTourStep.php
 delete mode 100644 lib/models/HelpTourUser.class.php
 create mode 100644 lib/models/HelpTourUser.php
 delete mode 100644 lib/models/Institute.class.php
 create mode 100644 lib/models/Institute.php
 delete mode 100644 lib/models/InstituteMember.class.php
 create mode 100644 lib/models/InstituteMember.php
 delete mode 100644 lib/models/InstitutePlanColumn.class.php
 create mode 100644 lib/models/InstitutePlanColumn.php
 delete mode 100644 lib/models/Kategorie.class.php
 create mode 100644 lib/models/Kategorie.php
 delete mode 100644 lib/models/LockRule.class.php
 create mode 100644 lib/models/LockRule.php
 delete mode 100644 lib/models/LoginBackground.class.php
 create mode 100644 lib/models/LoginBackground.php
 delete mode 100644 lib/models/LoginFaq.class.php
 create mode 100644 lib/models/LoginFaq.php
 delete mode 100644 lib/models/MailQueueEntry.class.php
 create mode 100644 lib/models/MailQueueEntry.php
 delete mode 100644 lib/models/Message.class.php
 create mode 100644 lib/models/Message.php
 delete mode 100644 lib/models/MessageUser.class.php
 create mode 100644 lib/models/MessageUser.php
 delete mode 100644 lib/models/MvvOverlappingConflict.class.php
 create mode 100644 lib/models/MvvOverlappingConflict.php
 delete mode 100644 lib/models/MvvOverlappingSelection.class.php
 create mode 100644 lib/models/MvvOverlappingSelection.php
 delete mode 100644 lib/models/NewsRange.class.php
 create mode 100644 lib/models/NewsRange.php
 delete mode 100644 lib/models/NewsRoles.class.php
 create mode 100644 lib/models/NewsRoles.php
 delete mode 100644 lib/models/OpenGraphURL.class.php
 create mode 100644 lib/models/OpenGraphURL.php
 delete mode 100644 lib/models/OpenGraphURLCollection.class.php
 create mode 100644 lib/models/OpenGraphURLCollection.php
 delete mode 100644 lib/models/PersonalNotifications.class.php
 create mode 100644 lib/models/PersonalNotifications.php
 delete mode 100644 lib/models/Semester.class.php
 create mode 100644 lib/models/Semester.php
 delete mode 100644 lib/models/SemesterCourse.class.php
 create mode 100644 lib/models/SemesterCourse.php
 delete mode 100644 lib/models/SemesterHoliday.class.php
 create mode 100644 lib/models/SemesterHoliday.php
 delete mode 100644 lib/models/SeminarCycleDate.class.php
 create mode 100644 lib/models/SeminarCycleDate.php
 delete mode 100644 lib/models/StudipComment.class.php
 create mode 100644 lib/models/StudipComment.php
 delete mode 100644 lib/models/StudipNews.class.php
 create mode 100644 lib/models/StudipNews.php
 delete mode 100644 lib/models/StudipScmEntry.class.php
 create mode 100644 lib/models/StudipScmEntry.php
 delete mode 100644 lib/models/StudipStudyArea.class.php
 create mode 100644 lib/models/StudipStudyArea.php
 delete mode 100644 lib/models/StudyCourse.class.php
 create mode 100644 lib/models/StudyCourse.php
 delete mode 100644 lib/models/User.class.php
 create mode 100644 lib/models/User.php
 delete mode 100644 lib/models/UserInfo.class.php
 create mode 100644 lib/models/UserInfo.php
 delete mode 100644 lib/models/UserOnline.class.php
 create mode 100644 lib/models/UserOnline.php
 delete mode 100644 lib/models/UserStudyCourse.class.php
 create mode 100644 lib/models/UserStudyCourse.php
 delete mode 100644 lib/models/WebserviceAccessRule.class.php
 create mode 100644 lib/models/WebserviceAccessRule.php
 delete mode 100644 lib/models/WikiPage.class.php
 create mode 100644 lib/models/WikiPage.php
 delete mode 100644 lib/models/calendar/CalendarCourseDate.class.php
 create mode 100644 lib/models/calendar/CalendarCourseDate.php
 delete mode 100644 lib/models/calendar/CalendarCourseExDate.class.php
 create mode 100644 lib/models/calendar/CalendarCourseExDate.php
 delete mode 100644 lib/models/calendar/CalendarDate.class.php
 create mode 100644 lib/models/calendar/CalendarDate.php
 delete mode 100644 lib/models/calendar/CalendarDateAssignment.class.php
 create mode 100644 lib/models/calendar/CalendarDateAssignment.php
 delete mode 100644 lib/models/calendar/CalendarDateException.class.php
 create mode 100644 lib/models/calendar/CalendarDateException.php
 delete mode 100644 lib/models/resources/BrokenResource.class.php
 create mode 100644 lib/models/resources/BrokenResource.php
 delete mode 100644 lib/models/resources/Building.class.php
 create mode 100644 lib/models/resources/Building.php
 delete mode 100644 lib/models/resources/GlobalResourceLock.class.php
 create mode 100644 lib/models/resources/GlobalResourceLock.php
 delete mode 100644 lib/models/resources/Location.class.php
 create mode 100644 lib/models/resources/Location.php
 delete mode 100644 lib/models/resources/Resource.class.php
 create mode 100644 lib/models/resources/Resource.php
 delete mode 100644 lib/models/resources/ResourceBooking.class.php
 create mode 100644 lib/models/resources/ResourceBooking.php
 delete mode 100644 lib/models/resources/ResourceBookingInterval.class.php
 create mode 100644 lib/models/resources/ResourceBookingInterval.php
 delete mode 100644 lib/models/resources/ResourceCategory.class.php
 create mode 100644 lib/models/resources/ResourceCategory.php
 delete mode 100644 lib/models/resources/ResourceCategoryProperty.class.php
 create mode 100644 lib/models/resources/ResourceCategoryProperty.php
 delete mode 100644 lib/models/resources/ResourceLabel.class.php
 create mode 100644 lib/models/resources/ResourceLabel.php
 delete mode 100644 lib/models/resources/ResourcePermission.class.php
 create mode 100644 lib/models/resources/ResourcePermission.php
 delete mode 100644 lib/models/resources/ResourceProperty.class.php
 create mode 100644 lib/models/resources/ResourceProperty.php
 delete mode 100644 lib/models/resources/ResourcePropertyDefinition.class.php
 create mode 100644 lib/models/resources/ResourcePropertyDefinition.php
 delete mode 100644 lib/models/resources/ResourcePropertyGroup.class.php
 create mode 100644 lib/models/resources/ResourcePropertyGroup.php
 delete mode 100644 lib/models/resources/ResourceRequest.class.php
 create mode 100644 lib/models/resources/ResourceRequest.php
 delete mode 100644 lib/models/resources/ResourceRequestAppointment.class.php
 create mode 100644 lib/models/resources/ResourceRequestAppointment.php
 delete mode 100644 lib/models/resources/ResourceRequestProperty.class.php
 create mode 100644 lib/models/resources/ResourceRequestProperty.php
 delete mode 100644 lib/models/resources/ResourceTemporaryPermission.class.php
 create mode 100644 lib/models/resources/ResourceTemporaryPermission.php
 delete mode 100644 lib/models/resources/Room.class.php
 create mode 100644 lib/models/resources/Room.php
 delete mode 100644 lib/models/resources/RoomRequest.class.php
 create mode 100644 lib/models/resources/RoomRequest.php
 delete mode 100644 lib/models/resources/SeparableRoom.class.php
 create mode 100644 lib/models/resources/SeparableRoom.php
 delete mode 100644 lib/models/resources/SeparableRoomPart.class.php
 create mode 100644 lib/models/resources/SeparableRoomPart.php
 delete mode 100644 lib/modules/Blubber.class.php
 create mode 100644 lib/modules/Blubber.php
 delete mode 100644 lib/modules/ConsultationModule.class.php
 create mode 100644 lib/modules/ConsultationModule.php
 delete mode 100644 lib/modules/CoreAdmin.class.php
 create mode 100644 lib/modules/CoreAdmin.php
 delete mode 100644 lib/modules/CoreCalendar.class.php
 create mode 100644 lib/modules/CoreCalendar.php
 delete mode 100644 lib/modules/CoreDocuments.class.php
 create mode 100644 lib/modules/CoreDocuments.php
 delete mode 100644 lib/modules/CoreElearningInterface.class.php
 create mode 100644 lib/modules/CoreElearningInterface.php
 delete mode 100644 lib/modules/CoreForum.class.php
 create mode 100644 lib/modules/CoreForum.php
 delete mode 100644 lib/modules/CoreOverview.class.php
 create mode 100644 lib/modules/CoreOverview.php
 delete mode 100644 lib/modules/CoreParticipants.class.php
 create mode 100644 lib/modules/CoreParticipants.php
 delete mode 100644 lib/modules/CorePersonal.class.php
 create mode 100644 lib/modules/CorePersonal.php
 delete mode 100644 lib/modules/CoreSchedule.class.php
 create mode 100644 lib/modules/CoreSchedule.php
 delete mode 100644 lib/modules/CoreScm.class.php
 create mode 100644 lib/modules/CoreScm.php
 delete mode 100644 lib/modules/CoreStudygroupAdmin.class.php
 create mode 100644 lib/modules/CoreStudygroupAdmin.php
 delete mode 100644 lib/modules/CoreStudygroupParticipants.class.php
 create mode 100644 lib/modules/CoreStudygroupParticipants.php
 delete mode 100644 lib/modules/CoreWiki.class.php
 create mode 100644 lib/modules/CoreWiki.php
 delete mode 100644 lib/modules/CoursewareModule.class.php
 create mode 100644 lib/modules/CoursewareModule.php
 delete mode 100644 lib/modules/FeedbackModule.class.php
 create mode 100644 lib/modules/FeedbackModule.php
 delete mode 100644 lib/modules/GradebookModule.class.php
 create mode 100644 lib/modules/GradebookModule.php
 delete mode 100644 lib/modules/IliasInterfaceModule.class.php
 create mode 100644 lib/modules/IliasInterfaceModule.php
 delete mode 100644 lib/modules/LtiToolModule.class.php
 create mode 100644 lib/modules/LtiToolModule.php
 delete mode 100644 lib/modules/StudipModule.class.php
 create mode 100644 lib/modules/StudipModule.php
 delete mode 100644 lib/phplib/CT_Cache.class.php
 create mode 100644 lib/phplib/CT_Cache.php
 delete mode 100644 lib/phplib/CT_Sql.class.php
 create mode 100644 lib/phplib/CT_Sql.php
 delete mode 100644 lib/phplib/DB_Sql.class.php
 create mode 100644 lib/phplib/DB_Sql.php
 delete mode 100644 lib/phplib/Seminar_Auth.class.php
 create mode 100644 lib/phplib/Seminar_Auth.php
 delete mode 100644 lib/phplib/Seminar_Default_Auth.class.php
 create mode 100644 lib/phplib/Seminar_Default_Auth.php
 delete mode 100644 lib/phplib/Seminar_Perm.class.php
 create mode 100644 lib/phplib/Seminar_Perm.php
 delete mode 100644 lib/phplib/Seminar_Register_Auth.class.php
 create mode 100644 lib/phplib/Seminar_Register_Auth.php
 delete mode 100644 lib/phplib/Seminar_Session.class.php
 create mode 100644 lib/phplib/Seminar_Session.php
 delete mode 100644 lib/phplib/Seminar_User.class.php
 create mode 100644 lib/phplib/Seminar_User.php
 delete mode 100644 lib/phplib/email_validation.class.php
 create mode 100644 lib/phplib/email_validation.php
 delete mode 100644 lib/plugins/core/AdminCourseAction.class.php
 create mode 100644 lib/plugins/core/AdminCourseAction.php
 delete mode 100644 lib/plugins/core/AdminCourseContents.class.php
 create mode 100644 lib/plugins/core/AdminCourseContents.php
 delete mode 100644 lib/plugins/core/AdminCourseWidgetPlugin.class.php
 create mode 100644 lib/plugins/core/AdminCourseWidgetPlugin.php
 delete mode 100644 lib/plugins/core/AdministrationPlugin.class.php
 create mode 100644 lib/plugins/core/AdministrationPlugin.php
 delete mode 100644 lib/plugins/core/DetailspagePlugin.class.php
 create mode 100644 lib/plugins/core/DetailspagePlugin.php
 delete mode 100644 lib/plugins/core/FileUploadHook.class.php
 create mode 100644 lib/plugins/core/FileUploadHook.php
 delete mode 100644 lib/plugins/core/FilesystemPlugin.class.php
 create mode 100644 lib/plugins/core/FilesystemPlugin.php
 delete mode 100644 lib/plugins/core/ForumModule.class.php
 create mode 100644 lib/plugins/core/ForumModule.php
 delete mode 100644 lib/plugins/core/HomepagePlugin.class.php
 create mode 100644 lib/plugins/core/HomepagePlugin.php
 delete mode 100644 lib/plugins/core/LibraryPlugin.class.php
 create mode 100644 lib/plugins/core/LibraryPlugin.php
 delete mode 100644 lib/plugins/core/MetricsPlugin.class.php
 create mode 100644 lib/plugins/core/MetricsPlugin.php
 delete mode 100644 lib/plugins/core/PortalPlugin.class.php
 create mode 100644 lib/plugins/core/PortalPlugin.php
 delete mode 100644 lib/plugins/core/PrivacyPlugin.class.php
 create mode 100644 lib/plugins/core/PrivacyPlugin.php
 delete mode 100644 lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
 create mode 100644 lib/plugins/core/QuestionnaireAssignmentPlugin.php
 delete mode 100644 lib/plugins/core/RESTAPIPlugin.class.php
 create mode 100644 lib/plugins/core/RESTAPIPlugin.php
 delete mode 100644 lib/plugins/core/Role.class.php
 create mode 100644 lib/plugins/core/Role.php
 delete mode 100644 lib/plugins/core/ScorePlugin.class.php
 create mode 100644 lib/plugins/core/ScorePlugin.php
 delete mode 100644 lib/plugins/core/StandardPlugin.class.php
 create mode 100644 lib/plugins/core/StandardPlugin.php
 delete mode 100644 lib/plugins/core/StudIPPlugin.class.php
 create mode 100644 lib/plugins/core/StudIPPlugin.php
 delete mode 100644 lib/plugins/core/SystemPlugin.class.php
 create mode 100644 lib/plugins/core/SystemPlugin.php
 delete mode 100644 lib/plugins/core/WebServicePlugin.class.php
 create mode 100644 lib/plugins/core/WebServicePlugin.php
 delete mode 100644 lib/plugins/db/RolePersistence.class.php
 create mode 100644 lib/plugins/db/RolePersistence.php
 delete mode 100644 lib/plugins/engine/PluginEngine.class.php
 create mode 100644 lib/plugins/engine/PluginEngine.php
 delete mode 100644 lib/plugins/engine/PluginManager.class.php
 create mode 100644 lib/plugins/engine/PluginManager.php
 delete mode 100644 lib/plugins/engine/PluginRepository.class.php
 create mode 100644 lib/plugins/engine/PluginRepository.php
 delete mode 100644 lib/raumzeit/CycleData.class.php
 create mode 100644 lib/raumzeit/CycleData.php
 delete mode 100644 lib/raumzeit/CycleDataDB.class.php
 create mode 100644 lib/raumzeit/CycleDataDB.php
 delete mode 100644 lib/raumzeit/Issue.class.php
 create mode 100644 lib/raumzeit/Issue.php
 delete mode 100644 lib/raumzeit/IssueDB.class.php
 create mode 100644 lib/raumzeit/IssueDB.php
 delete mode 100644 lib/raumzeit/MetaDate.class.php
 create mode 100644 lib/raumzeit/MetaDate.php
 delete mode 100644 lib/raumzeit/MetaDateDB.class.php
 create mode 100644 lib/raumzeit/MetaDateDB.php
 delete mode 100644 lib/raumzeit/SeminarDB.class.php
 create mode 100644 lib/raumzeit/SeminarDB.php
 delete mode 100644 lib/raumzeit/SingleDate.class.php
 create mode 100644 lib/raumzeit/SingleDate.php
 delete mode 100644 lib/raumzeit/SingleDateDB.class.php
 create mode 100644 lib/raumzeit/SingleDateDB.php
 delete mode 100644 lib/resources/ResourceManager.class.php
 create mode 100644 lib/resources/ResourceManager.php
 delete mode 100644 lib/resources/RoomManager.class.php
 create mode 100644 lib/resources/RoomManager.php
 delete mode 100644 lib/soap/StudipSoapClient.class.php
 create mode 100644 lib/soap/StudipSoapClient.php
 delete mode 100644 lib/soap/StudipSoapClient_PHP5.class.php
 create mode 100644 lib/soap/StudipSoapClient_PHP5.php
 delete mode 100644 vendor/oauth-php/library/session/OAuthSessionAbstract.class.php
 create mode 100644 vendor/oauth-php/library/session/OAuthSessionAbstract.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod.class.php
 create mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreAbstract.class.php
 create mode 100644 vendor/oauth-php/library/store/OAuthStoreAbstract.php

diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index 4016b9d..94e4d04 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'lib/classes/QuestionType.interface.php';
-
 class QuestionnaireController extends AuthenticatedController
 {
     protected $allow_nobody = true; //nobody is allowed
diff --git a/composer.json b/composer.json
index 218f448..56db8e1 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,65 @@
             "php": "8.1"
         }
     },
+    "autoload": {
+        "psr-4": {
+            "exTpl\\": "lib/exTpl/",
+            "Flexi\\": "lib/flexi/",
+            "Studip\\Activity\\": "lib/activities/",
+            "Studip\\Cache\\": "lib/classes/cache/",
+            "Studip\\Calendar\\": "lib/classes/calendar/",
+            "Studip\\": "lib/classes/",
+            "Trails\\": "lib/trails/",
+            "": [
+                "lib/calendar/",
+                "lib/calendar/lib/",
+                "lib/classes/",
+                "lib/classes/admission/",
+                "lib/classes/admission/userfilter/",
+                "lib/classes/auth_plugins/",
+                "lib/classes/calendar/",
+                "lib/classes/coursewizardsteps/",
+                "lib/classes/exportdocument/",
+                "lib/classes/forms/",
+                "lib/classes/globalsearch/",
+                "lib/classes/helpbar/",
+                "lib/classes/librarysearch/",
+                "lib/classes/librarysearch/resultparsers/",
+                "lib/classes/librarysearch/searchmodules/",
+                "lib/classes/searchtypes/",
+                "lib/classes/sidebar/",
+                "lib/classes/visibility/",
+                "lib/classes/wiki/",
+                "lib/elearning/",
+                "lib/exTpl', 'exTpl/",
+                "lib/exceptions/",
+                "lib/exceptions/resources/",
+                "lib/extern/",
+                "lib/filesystem/",
+                "lib/ilias_interface",
+                "lib/migrations/",
+                "lib/models/",
+                "lib/models/calendar/",
+                "lib/models/resources/",
+                "lib/modules/",
+                "lib/navigation/",
+                "lib/phplib/",
+                "lib/plugins/core/",
+                "lib/plugins/db/",
+                "lib/plugins/engine/",
+                "lib/raumzeit/",
+                "lib/resources/"
+            ]
+        },
+        "classmap": [
+            "lib/phplib/email_validation.php",
+            "lib/messaging.inc.php",
+            "lib/plugins/core/StudIPPlugin.php",
+            "app/controllers/module/mvv_controller.php",
+            "vendor/phpass/PasswordHash.php",
+            "composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc"
+        ]
+    },
     "require-dev": {
         "woohoolabs/yang": "3.0.0",
         "codeception/codeception": "5.1.2",
@@ -14,7 +73,8 @@
         "overtrue/phplint": "9.3.0",
         "phpstan/phpstan": "1.11.0",
         "symfony/var-dumper": "6.4.7",
-        "maximebf/debugbar": "1.22.3"
+        "maximebf/debugbar": "1.22.3",
+        "codeception/specify": "^2.0"
     },
     "require": {
         "php": "^8.1",
diff --git a/composer.lock b/composer.lock
index c9814d0..e4b114b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "be0994b08d5455c5b4d6512e6d019659",
+    "content-hash": "d524d0543302bb6f60235cbdecb3f811",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -196,12 +196,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/edu-sharing/php-auth-plugin.git",
-                "reference": "4dc40c400afea63bd75ddd5ad4cea8033e477e72"
+                "reference": "d0384dce4023449220052d1b648bb1b41babd3d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/edu-sharing/php-auth-plugin/zipball/4dc40c400afea63bd75ddd5ad4cea8033e477e72",
-                "reference": "4dc40c400afea63bd75ddd5ad4cea8033e477e72",
+                "url": "https://api.github.com/repos/edu-sharing/php-auth-plugin/zipball/d0384dce4023449220052d1b648bb1b41babd3d0",
+                "reference": "d0384dce4023449220052d1b648bb1b41babd3d0",
                 "shasum": ""
             },
             "require": {
@@ -235,7 +235,7 @@
                 "issues": "https://github.com/edu-sharing/php-auth-plugin/issues",
                 "source": "https://github.com/edu-sharing/php-auth-plugin/tree/8.0"
             },
-            "time": "2024-04-02T10:02:58+00:00"
+            "time": "2024-06-03T10:59:11+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
@@ -1066,16 +1066,16 @@
         },
         {
             "name": "lcobucci/jwt",
-            "version": "5.2.0",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211"
+                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0ba88aed12c04bd2ed9924f500673f32b67a6211",
-                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
+                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
                 "shasum": ""
             },
             "require": {
@@ -1123,7 +1123,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.2.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.3.0"
             },
             "funding": [
                 {
@@ -1135,7 +1135,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-11-20T21:17:42+00:00"
+            "time": "2024-04-11T23:07:54+00:00"
         },
         {
             "name": "league/event",
@@ -1455,29 +1455,35 @@
         },
         {
             "name": "maennchen/zipstream-php",
-            "version": "2.1.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58"
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
                 "shasum": ""
             },
             "require": {
-                "myclabs/php-enum": "^1.5",
-                "php": ">= 7.1",
-                "psr/http-message": "^1.0",
-                "symfony/polyfill-mbstring": "^1.0"
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php-64bit": "^8.1"
             },
             "require-dev": {
                 "ext-zip": "*",
-                "guzzlehttp/guzzle": ">= 6.3",
+                "friendsofphp/php-cs-fixer": "^3.16",
+                "guzzlehttp/guzzle": "^7.5",
                 "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": ">= 7.5"
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10.0",
+                "vimeo/psalm": "^5.0"
+            },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
             },
             "type": "library",
             "autoload": {
@@ -1514,7 +1520,7 @@
             ],
             "support": {
                 "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0"
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
             },
             "funding": [
                 {
@@ -1526,7 +1532,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2020-05-30T13:11:16+00:00"
+            "time": "2023-06-21T14:59:35+00:00"
         },
         {
             "name": "markbaker/complex",
@@ -1637,16 +1643,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.9.1",
+            "version": "2.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
+                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215",
+                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215",
                 "shasum": ""
             },
             "require": {
@@ -1667,8 +1673,8 @@
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
                 "phpspec/prophecy": "^1.15",
-                "phpstan/phpstan": "^0.12.91",
-                "phpunit/phpunit": "^8.5.14",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5.38 || ^9.6.19",
                 "predis/predis": "^1.1 || ^2.0",
                 "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
@@ -1723,7 +1729,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.1"
+                "source": "https://github.com/Seldaek/monolog/tree/2.9.3"
             },
             "funding": [
                 {
@@ -1735,94 +1741,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-06T13:44:46+00:00"
-        },
-        {
-            "name": "myclabs/php-enum",
-            "version": "1.7.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "d178027d1e679832db9f38248fcc7200647dc2b7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7",
-                "reference": "d178027d1e679832db9f38248fcc7200647dc2b7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7",
-                "squizlabs/php_codesniffer": "1.*",
-                "vimeo/psalm": "^3.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "MyCLabs\\Enum\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP Enum contributors",
-                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-                }
-            ],
-            "description": "PHP Enum implementation",
-            "homepage": "http://github.com/myclabs/php-enum",
-            "keywords": [
-                "enum"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/php-enum/issues",
-                "source": "https://github.com/myclabs/php-enum/tree/1.7.7"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-14T18:14:52+00:00"
+            "time": "2024-04-12T20:52:51+00:00"
         },
         {
             "name": "neomerx/cors-psr7",
-            "version": "v2.0.2",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/neomerx/cors-psr7.git",
-                "reference": "454e923aaf9ba4aa162f7aca2a514e41708b6ba5"
+                "reference": "515d7fdb60b9d475da70029d4e5662beaae1875f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/neomerx/cors-psr7/zipball/454e923aaf9ba4aa162f7aca2a514e41708b6ba5",
-                "reference": "454e923aaf9ba4aa162f7aca2a514e41708b6ba5",
+                "url": "https://api.github.com/repos/neomerx/cors-psr7/zipball/515d7fdb60b9d475da70029d4e5662beaae1875f",
+                "reference": "515d7fdb60b9d475da70029d4e5662beaae1875f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.0",
+                "php": ">=8.0.0",
                 "psr/http-message": "^1.0",
-                "psr/log": "^1.0"
+                "psr/log": "^3.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.14",
+                "friendsofphp/php-cs-fixer": "^3.11",
                 "mockery/mockery": "^1.0",
-                "phpmd/phpmd": "^2.6",
-                "phpunit/phpunit": "^7.0",
+                "phpunit/phpunit": "^9.2",
                 "scrutinizer/ocular": "^1.4",
-                "squizlabs/php_codesniffer": "^2.9"
+                "squizlabs/php_codesniffer": "^3.0"
             },
             "type": "library",
             "autoload": {
@@ -1854,9 +1799,9 @@
             ],
             "support": {
                 "issues": "https://github.com/neomerx/cors-psr7/issues",
-                "source": "https://github.com/neomerx/cors-psr7/tree/develop"
+                "source": "https://github.com/neomerx/cors-psr7/tree/3.0.2"
             },
-            "time": "2019-02-14T10:35:50+00:00"
+            "time": "2022-11-28T03:29:06+00:00"
         },
         {
             "name": "nikic/fast-route",
@@ -2218,16 +2163,16 @@
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
                 "shasum": ""
             },
             "require": {
@@ -2281,7 +2226,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2022-06-14T06:56:20+00:00"
+            "time": "2024-05-08T12:18:48+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -2438,24 +2383,26 @@
         },
         {
             "name": "php-di/invoker",
-            "version": "2.0.0",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-DI/Invoker.git",
-                "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a"
+                "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/540c27c86f663e20fe39a24cd72fa76cdb21d41a",
-                "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a",
+                "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86",
+                "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86",
                 "shasum": ""
             },
             "require": {
-                "psr/container": "~1.0"
+                "php": ">=7.3",
+                "psr/container": "^1.0|^2.0"
             },
             "require-dev": {
                 "athletic/athletic": "~0.1.8",
-                "phpunit/phpunit": "~4.5"
+                "mnapoli/hard-mode": "~0.3.0",
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "autoload": {
@@ -2479,9 +2426,15 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-DI/Invoker/issues",
-                "source": "https://github.com/PHP-DI/Invoker/tree/master"
+                "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4"
             },
-            "time": "2017-03-20T19:28:22+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/mnapoli",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-09-08T09:24:21+00:00"
         },
         {
             "name": "php-di/php-di",
@@ -2899,21 +2852,21 @@
         },
         {
             "name": "phpxmlrpc/extras",
-            "version": "1.0.0-beta2",
+            "version": "1.0.0-beta4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/gggeek/phpxmlrpc-extras.git",
-                "reference": "4bf48852955f7b4698b37ae91cce83c49f658b4c"
+                "reference": "7aedeb5100b0bca4085692a2c626fafb726c73b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/gggeek/phpxmlrpc-extras/zipball/4bf48852955f7b4698b37ae91cce83c49f658b4c",
-                "reference": "4bf48852955f7b4698b37ae91cce83c49f658b4c",
+                "url": "https://api.github.com/repos/gggeek/phpxmlrpc-extras/zipball/7aedeb5100b0bca4085692a2c626fafb726c73b6",
+                "reference": "7aedeb5100b0bca4085692a2c626fafb726c73b6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.0 || ^7.0 || ^8.0",
-                "phpxmlrpc/phpxmlrpc": "^4.6.0"
+                "php": "^5.4.0 || ^7.0 || ^8.0",
+                "phpxmlrpc/phpxmlrpc": "^4.10.1"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -2945,22 +2898,22 @@
             ],
             "support": {
                 "issues": "https://github.com/gggeek/phpxmlrpc-extras/issues",
-                "source": "https://github.com/gggeek/phpxmlrpc-extras/tree/1.0.0-beta2"
+                "source": "https://github.com/gggeek/phpxmlrpc-extras/tree/1.0.0-beta4"
             },
-            "time": "2023-01-19T14:20:38+00:00"
+            "time": "2024-04-16T15:48:39+00:00"
         },
         {
             "name": "phpxmlrpc/phpxmlrpc",
-            "version": "4.10.0",
+            "version": "4.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/gggeek/phpxmlrpc.git",
-                "reference": "7103864975ca0b930574cabc8b4593093ee4432e"
+                "reference": "6725f215cd7d7c7d36c1d773aa89902aef2da67c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/gggeek/phpxmlrpc/zipball/7103864975ca0b930574cabc8b4593093ee4432e",
-                "reference": "7103864975ca0b930574cabc8b4593093ee4432e",
+                "url": "https://api.github.com/repos/gggeek/phpxmlrpc/zipball/6725f215cd7d7c7d36c1d773aa89902aef2da67c",
+                "reference": "6725f215cd7d7c7d36c1d773aa89902aef2da67c",
                 "shasum": ""
             },
             "require": {
@@ -2968,7 +2921,8 @@
                 "php": "^5.4.0 || ^7.0 || ^8.0"
             },
             "conflict": {
-                "phpxmlrpc/extras": "<= 0.6.3"
+                "phpxmlrpc/extras": "<= 1.0.0-beta2",
+                "phpxmlrpc/jsonrpc": "<= 1.0.0-beta1"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -3004,9 +2958,9 @@
             ],
             "support": {
                 "issues": "https://github.com/gggeek/phpxmlrpc/issues",
-                "source": "https://github.com/gggeek/phpxmlrpc/tree/4.10.0"
+                "source": "https://github.com/gggeek/phpxmlrpc/tree/4.10.3"
             },
-            "time": "2023-02-11T17:10:30+00:00"
+            "time": "2024-04-23T10:50:06+00:00"
         },
         {
             "name": "psr/cache",
@@ -3107,22 +3061,27 @@
         },
         {
             "name": "psr/container",
-            "version": "1.1.2",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -3149,27 +3108,27 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.2"
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
             },
-            "time": "2021-11-05T16:50:12+00:00"
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -3189,7 +3148,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -3201,26 +3160,26 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
@@ -3244,7 +3203,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -3256,9 +3215,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
@@ -3315,21 +3274,21 @@
         },
         {
             "name": "psr/http-server-handler",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-server-handler.git",
-                "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7"
+                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
-                "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7",
+                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -3349,7 +3308,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP server-side request handler",
@@ -3365,28 +3324,27 @@
                 "server"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/http-server-handler/issues",
-                "source": "https://github.com/php-fig/http-server-handler/tree/master"
+                "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2"
             },
-            "time": "2018-10-30T16:46:14+00:00"
+            "time": "2023-04-10T20:06:20+00:00"
         },
         {
             "name": "psr/http-server-middleware",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-server-middleware.git",
-                "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5"
+                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5",
-                "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.0 || ^2.0",
                 "psr/http-server-handler": "^1.0"
             },
             "type": "library",
@@ -3407,7 +3365,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP server-side middleware",
@@ -3423,36 +3381,36 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/http-server-middleware/issues",
-                "source": "https://github.com/php-fig/http-server-middleware/tree/master"
+                "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2"
             },
-            "time": "2018-10-30T17:12:04+00:00"
+            "time": "2023-04-11T06:14:47+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "Psr\\Log\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3473,31 +3431,31 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
+                "source": "https://github.com/php-fig/log/tree/3.0.0"
             },
-            "time": "2021-05-03T11:20:27+00:00"
+            "time": "2021-07-14T16:46:02+00:00"
         },
         {
             "name": "psr/simple-cache",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -3512,7 +3470,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for simple caching",
@@ -3524,9 +3482,9 @@
                 "simple-cache"
             ],
             "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
             },
-            "time": "2017-10-23T01:57:42+00:00"
+            "time": "2021-10-29T13:26:27+00:00"
         },
         {
             "name": "psy/psysh",
@@ -4706,16 +4664,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69"
+                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69",
-                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69",
+                "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
                 "shasum": ""
             },
             "require": {
@@ -4772,7 +4730,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.7"
+                "source": "https://github.com/symfony/string/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -4788,7 +4746,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -5651,6 +5609,52 @@
             "time": "2022-02-16T19:48:08+00:00"
         },
         {
+            "name": "codeception/specify",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Specify.git",
+                "reference": "b718b4b9bb722be4756aa7c9aa7e89b6babc2cf6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Specify/zipball/b718b4b9bb722be4756aa7c9aa7e89b6babc2cf6",
+                "reference": "b718b4b9bb722be4756aa7c9aa7e89b6babc2cf6",
+                "shasum": ""
+            },
+            "require": {
+                "myclabs/deep-copy": "^1.10",
+                "php": ">=7.4.0",
+                "phpunit/phpunit": "^8.0|^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@codeception.com"
+                },
+                {
+                    "name": "Gustavo Nieves",
+                    "homepage": "https://medium.com/@ganieves"
+                }
+            ],
+            "description": "BDD code blocks for PHPUnit and Codeception",
+            "support": {
+                "issues": "https://github.com/Codeception/Specify/issues",
+                "source": "https://github.com/Codeception/Specify/tree/2.0.0"
+            },
+            "time": "2021-11-22T00:16:11+00:00"
+        },
+        {
             "name": "codeception/stub",
             "version": "4.1.3",
             "source": {
@@ -5692,6 +5696,76 @@
             "time": "2024-02-02T19:21:00+00:00"
         },
         {
+            "name": "doctrine/instantiator",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^11",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "https://ocramius.github.io/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-30T00:23:10+00:00"
+        },
+        {
             "name": "maximebf/debugbar",
             "version": "v1.22.3",
             "source": {
@@ -5761,16 +5835,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
@@ -5778,11 +5852,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -5808,7 +5883,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -5816,7 +5891,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
         },
         {
             "name": "overtrue/phplint",
@@ -6034,34 +6109,29 @@
         },
         {
             "name": "php-http/httplug",
-            "version": "2.3.0",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/httplug.git",
-                "reference": "f640739f80dfa1152533976e3c112477f69274eb"
+                "reference": "625ad742c360c8ac580fcc647a1541d29e257f67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb",
-                "reference": "f640739f80dfa1152533976e3c112477f69274eb",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67",
+                "reference": "625ad742c360c8ac580fcc647a1541d29e257f67",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0",
                 "php-http/promise": "^1.1",
                 "psr/http-client": "^1.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "require-dev": {
-                "friends-of-phpspec/phpspec-code-coverage": "^4.1",
-                "phpspec/phpspec": "^5.1 || ^6.0"
+                "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0",
+                "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Http\\Client\\": "src/"
@@ -6090,37 +6160,32 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/httplug/issues",
-                "source": "https://github.com/php-http/httplug/tree/2.3.0"
+                "source": "https://github.com/php-http/httplug/tree/2.4.0"
             },
-            "time": "2022-02-21T09:52:22+00:00"
+            "time": "2023-04-14T15:10:03+00:00"
         },
         {
             "name": "php-http/promise",
-            "version": "1.1.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/promise.git",
-                "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88"
+                "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88",
-                "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
+                "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "friends-of-phpspec/phpspec-code-coverage": "^4.3.2",
-                "phpspec/phpspec": "^5.1.2 || ^6.2"
+                "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3",
+                "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Http\\Promise\\": "src/"
@@ -6147,9 +6212,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/promise/issues",
-                "source": "https://github.com/php-http/promise/tree/1.1.0"
+                "source": "https://github.com/php-http/promise/tree/1.3.1"
             },
-            "time": "2020-07-07T09:29:14+00:00"
+            "time": "2024-03-15T13:55:21+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -6211,16 +6276,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.14",
+            "version": "9.2.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
                 "shasum": ""
             },
             "require": {
@@ -6228,18 +6293,18 @@
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=8.1",
-                "phpunit/php-file-iterator": "^4.0",
-                "phpunit/php-text-template": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^3.0",
-                "sebastian/complexity": "^3.0",
-                "sebastian/environment": "^6.0",
-                "sebastian/lines-of-code": "^2.0",
-                "sebastian/version": "^4.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
                 "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.1"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -6248,7 +6313,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.1-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -6277,7 +6342,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
             },
             "funding": [
                 {
@@ -6285,32 +6350,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-12T15:33:41+00:00"
+            "time": "2024-03-02T06:37:42+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "4.1.0",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -6337,8 +6402,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -6346,28 +6410,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T06:24:48+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "4.0.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
-                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -6375,7 +6439,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -6401,7 +6465,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
             },
             "funding": [
                 {
@@ -6409,32 +6473,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:56:09+00:00"
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "3.0.1",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -6460,8 +6524,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
             "funding": [
                 {
@@ -6469,32 +6532,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T14:07:24+00:00"
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "6.0.0",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
-                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -6520,7 +6583,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
             "funding": [
                 {
@@ -6528,23 +6591,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:57:52+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.20",
+            "version": "9.6.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
+                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8",
+                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8",
                 "shasum": ""
             },
             "require": {
+                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -6554,26 +6618,27 @@
                 "myclabs/deep-copy": "^1.10.1",
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
-                "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.5",
-                "phpunit/php-file-iterator": "^4.0",
-                "phpunit/php-invoker": "^4.0",
-                "phpunit/php-text-template": "^3.0",
-                "phpunit/php-timer": "^6.0",
-                "sebastian/cli-parser": "^2.0",
-                "sebastian/code-unit": "^2.0",
-                "sebastian/comparator": "^5.0",
-                "sebastian/diff": "^5.0",
-                "sebastian/environment": "^6.0",
-                "sebastian/exporter": "^5.1",
-                "sebastian/global-state": "^6.0.1",
-                "sebastian/object-enumerator": "^5.0",
-                "sebastian/recursion-context": "^5.0",
-                "sebastian/type": "^4.0",
-                "sebastian/version": "^4.0"
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.28",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.8",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.5",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.2",
+                "sebastian/version": "^3.0.2"
             },
             "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files"
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "bin": [
                 "phpunit"
@@ -6581,7 +6646,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
@@ -6613,7 +6678,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19"
             },
             "funding": [
                 {
@@ -6629,7 +6694,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-24T06:32:35+00:00"
+            "time": "2024-04-05T04:35:58+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -6683,28 +6748,28 @@
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "2.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.0-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -6727,8 +6792,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -6736,32 +6800,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:12:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "2.0.0",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
-                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.0-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -6784,7 +6848,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
             },
             "funding": [
                 {
@@ -6792,32 +6856,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:58:43+00:00"
+            "time": "2020-10-26T13:08:54+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "3.0.0",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
-                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -6839,7 +6903,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -6847,36 +6911,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:59:15+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.1",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-mbstring": "*",
-                "php": ">=8.1",
-                "sebastian/diff": "^5.0",
-                "sebastian/exporter": "^5.0"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.3"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -6915,8 +6977,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -6924,33 +6985,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-14T13:18:12+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "3.2.0",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.2-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -6973,8 +7034,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -6982,33 +7042,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-21T08:37:17+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "5.1.1",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0",
-                "symfony/process": "^6.4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7040,8 +7100,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -7049,27 +7108,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:15:17+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "6.1.0",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -7077,7 +7136,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.1-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -7096,7 +7155,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "https://github.com/sebastianbergmann/environment",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -7104,8 +7163,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -7113,34 +7171,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-23T08:47:14+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "5.1.2",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
-                "php": ">=8.1",
-                "sebastian/recursion-context": "^5.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7182,8 +7240,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -7191,35 +7248,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:17:12+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "6.0.2",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "sebastian/object-reflector": "^3.0",
-                "sebastian/recursion-context": "^5.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-uopz": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7238,14 +7298,13 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "https://www.github.com/sebastianbergmann/global-state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -7253,33 +7312,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:19:19+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "2.0.2",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.0-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -7302,8 +7361,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -7311,34 +7369,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-21T08:38:20+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "5.0.0",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
-                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "sebastian/object-reflector": "^3.0",
-                "sebastian/recursion-context": "^5.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7360,7 +7418,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -7368,32 +7426,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:08:32+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "3.0.0",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
-                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -7415,7 +7473,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -7423,32 +7481,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:06:18+00:00"
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "5.0.0",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
-                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -7478,7 +7536,7 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
@@ -7486,32 +7544,86 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:05:40+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "3.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "4.0.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
-                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -7534,7 +7646,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
@@ -7542,29 +7654,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:10:45+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "4.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
-                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -7587,7 +7699,7 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
             "funding": [
                 {
@@ -7595,20 +7707,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-07T11:34:05+00:00"
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a"
+                "reference": "287142df5579ce223c485b3872df3efae8390984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/b9e9b93c9817ec6c789c7943f5e54b57a041c16a",
-                "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/287142df5579ce223c485b3872df3efae8390984",
+                "reference": "287142df5579ce223c485b3872df3efae8390984",
                 "shasum": ""
             },
             "require": {
@@ -7675,7 +7787,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.7"
+                "source": "https://github.com/symfony/cache/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7691,7 +7803,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/cache-contracts",
@@ -7771,16 +7883,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b"
+                "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c5d5c2103c3762aff27a27e1e2409e30a79083b",
-                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08",
+                "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08",
                 "shasum": ""
             },
             "require": {
@@ -7816,7 +7928,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.7"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7832,20 +7944,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f"
+                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f",
-                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b",
+                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b",
                 "shasum": ""
             },
             "require": {
@@ -7896,7 +8008,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7912,7 +8024,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -7992,16 +8104,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764"
+                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764",
-                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
+                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
                 "shasum": ""
             },
             "require": {
@@ -8036,7 +8148,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.7"
+                "source": "https://github.com/symfony/finder/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -8052,20 +8164,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-23T10:36:43+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed"
+                "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a3c92b490716ba6771f5beced13c6eda7183eed",
-                "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22ab9e9101ab18de37839074f8a1197f55590c1b",
+                "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b",
                 "shasum": ""
             },
             "require": {
@@ -8103,7 +8215,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.4.7"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -8119,20 +8231,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405"
+                "reference": "792ca836f99b340f2e9ca9497c7953948c49a504"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/825f9b00c37bbe1c1691cc1aff9b5451fc9b4405",
-                "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/792ca836f99b340f2e9ca9497c7953948c49a504",
+                "reference": "792ca836f99b340f2e9ca9497c7953948c49a504",
                 "shasum": ""
             },
             "require": {
@@ -8180,7 +8292,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.4.7"
+                "source": "https://github.com/symfony/var-exporter/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -8196,7 +8308,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/db/migrations/1.2_step_102_datenfeldtypen.php b/db/migrations/1.2_step_102_datenfeldtypen.php
index 1e7b552..b639132 100644
--- a/db/migrations/1.2_step_102_datenfeldtypen.php
+++ b/db/migrations/1.2_step_102_datenfeldtypen.php
@@ -63,7 +63,7 @@ class Step102Datenfeldtypen extends Migration {
       return;
     }
 
-    require_once 'lib/classes/DataFieldStructure.class.php';
+    require_once 'lib/classes/DataFieldStructure.php';
 
     $ids = array_keys(DataFieldStructure::getDataFieldStructures());
 
diff --git a/db/migrations/1.6_step_25_raumzeit_db_conversion.php b/db/migrations/1.6_step_25_raumzeit_db_conversion.php
index 1dd8edf..9a8ffd7 100644
--- a/db/migrations/1.6_step_25_raumzeit_db_conversion.php
+++ b/db/migrations/1.6_step_25_raumzeit_db_conversion.php
@@ -55,8 +55,8 @@ class Step25RaumzeitDbConversion extends Migration
 
 
         // include business logic
-        require_once('lib/classes/Seminar.class.php');
-        require_once('lib/resources/lib/VeranstaltungResourcesAssign.class.php');
+        require_once('lib/classes/Seminar.php');
+        require_once('lib/resources/lib/VeranstaltungResourcesAssign.php');
 
 
 
diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
deleted file mode 100644
index 7fdbc00..0000000
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php
+++ /dev/null
@@ -1,563 +0,0 @@
-<?php
-
-/**
- * ConditionalAdmission.class.php
- *
- * An admission rule that specifies conditions for course admission, like
- * degree, study course or semester.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class ConditionalAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * All conditions that must be fulfilled for successful admission.
-     */
-    public $conditions = [];
-
-    /**
-     * Grouped conditions that must be fulfilled for successful admission.
-     */
-    public $conditiongroups = [];
-
-    /**
-     * Conditions that must be fulfilled for successful admission.
-     */
-    public $ungrouped_conditions = [];
-
-    /**
-     * Quota for grouped conditions
-     */
-    public $quota = [];
-
-    /**
-     * Are condition groups allowed?
-     */
-    public $conditiongroups_allowed = null;
-
-    /**
-     * courseset siblings of this rule
-     */
-    public $siblings = [];
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor.
-     *
-     * @param  String $ruleId If this rule has been saved previously, it
-     *      will be loaded from database.
-     * @return ConditionalAdmission the current object (this).
-     */
-    public function __construct($ruleId='', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-        $this->default_message = _('Sie erfüllen nicht die Bedingung: %s');
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('conditionaladmissions');
-        }
-        return $this;
-    }
-
-    /**
-     * Adds a new UserFilter to this rule.
-     *
-     * @param  UserFilter $condition
-     * @param  String $group
-     * @param  Int $quota
-     * @return ConditionalAdmission
-     */
-    public function addCondition($condition, $group = '', $quota = 0)
-    {
-        if ($group) {
-            $this->conditiongroups[$group][$condition->getId()] = $condition;
-            $this->quota[$group] = $quota;
-        } else {
-            $this->ungrouped_conditions[$condition->getId()] = $condition;
-        }
-        return $this;
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete()
-    {
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `conditionaladmissions`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete all associated conditions...
-        foreach ($this->ungrouped_conditions as $condition) {
-            $condition->delete();
-        }
-        foreach ($this->conditiongroups as $conditions) {
-            foreach ($conditions as $condition) {
-                $condition->delete();
-            }
-        }
-        // ... and their connection to this rule.
-        $stmt = DBManager::get()->prepare("DELETE `admission_condition`, `admission_conditiongroup` FROM `admission_condition`
-            LEFT JOIN `admission_conditiongroup` USING( `conditiongroup_id`)
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Gets all users that are matched by thís rule.
-     *
-     * @return Array An array containing IDs of users who are matched by
-     *      this rule.
-     */
-    public function getAffectedUsers()
-    {
-        $users = [];
-        foreach ($this->ungrouped_conditions as $condition) {
-            $users = array_intersect($users, $condition->getAffectedUsers());
-        }
-        foreach ($this->conditiongroups as $conditions) {
-            foreach ($conditions as $condition) {
-                $users = array_intersect($users, $condition->getAffectedUsers());
-            }
-        }
-        return $users;
-    }
-
-    /**
-     * Gets all defined conditions.
-     *
-     * @return Array
-     */
-    public function getConditions()
-    {
-        return $this->conditions;
-    }
-
-    /**
-     * Gets all grouped conditiongroups.
-     *
-     * @return Array
-     */
-    public function getConditionGroups()
-    {
-        return $this->conditiongroups;
-    }
-
-    /**
-     * Gets all grouped conditiongroups.
-     *
-     * @return Array
-     */
-    public function getUngroupedConditions()
-    {
-        return $this->ungrouped_conditions;
-    }
-
-    /**
-     * Gets quota for given conditiongroup.
-     *
-     * @return Array
-     */
-    public function getQuota($group_id)
-    {
-        return $this->quota[$group_id];
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription()
-    {
-        return _('Über eine Menge von Bedingungen kann festgelegt werden, '.
-            'wer zur Anmeldung zu den Veranstaltungen des Anmeldesets '.
-            'zugelassen ist. Es muss nur eine der Bedingungen erfüllt sein, '.
-            'innerhalb einer Bedingung müssen aber alle Datenfelder '.
-            'zutreffen.');
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName()
-    {
-        return _('Bedingte Anmeldung');
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate()
-    {
-        // Open generic admission rule template.
-        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
-        $tpl->set_attribute('rule', $this);
-        $factory = new Flexi\Factory(__DIR__ . '/templates/');
-        // Now open specific template for this rule and insert base template.
-        $tpl2 = $factory->open('configure');
-        $tpl2->set_attribute('rule', $this);
-        $tpl2->set_attribute('tpl', $tpl->render());
-        return $tpl2->render();
-    }
-
-    /**
-     * Helper function for loading data from DB. Generic AdmissionRule data is
-     * loaded with the parent load() method.
-     */
-    public function load()
-    {
-        // Load basic data.
-        $stmt = DBManager::get()->prepare("SELECT *
-            FROM `conditionaladmissions` WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->message = $current['message'];
-            $this->startTime = $current['start_time'];
-            $this->endTime = $current['end_time'];
-            // Retrieve conditions.
-            $stmt = DBManager::get()->prepare("SELECT *
-                FROM `admission_condition` LEFT JOIN `admission_conditiongroup` USING (`conditiongroup_id`) WHERE `rule_id`=?");
-            $stmt->execute([$this->id]);
-            $conditions = $stmt->fetchAll(PDO::FETCH_ASSOC);
-            foreach ($conditions as $condition) {
-                $currentCondition = new UserFilter($condition['filter_id']);
-                if ($condition['conditiongroup_id']) {
-                    $this->conditiongroups[$condition['conditiongroup_id']][$condition['filter_id']] = $currentCondition;
-                    $this->quota[$condition['conditiongroup_id']] = $condition['quota'];
-                } else {
-                    $this->ungrouped_conditions[$condition['filter_id']] = $currentCondition;
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks if condition groups are allowed.
-     *
-     * @return Boolean
-     */
-    public function conditiongroupsAllowed()
-    {
-        if ($this->conditiongroups_allowed === null) {
-            foreach ($this->getSiblings() as $rule) {
-                if (get_class($rule) == 'ParticipantRestrictedAdmission') {
-                    if ($rule->getDistributionTime() > time()) {
-                        $this->conditiongroups_allowed = true;
-                    }
-                }
-            }
-        }
-        return $this->conditiongroups_allowed;
-    }
-
-    /**
-     * Removes condition groups and sets all conditions as ungrouped.
-     *
-     */
-    public function removeConditionGroups()
-    {
-       foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
-           foreach ($conditions as $condition_id => $condition) {
-               $this->ungrouped_conditions[$condition_id] = $condition;
-           }
-       }
-       $this->conditiongroups = [];
-    }
-
-    /**
-     * Removes the condition with the given ID from the rule.
-     *
-     * @param  String $conditionId
-     * @return ConditionalAdmission
-     */
-    public function removeCondition($conditionId)
-    {
-        if (isset($this->ungrouped_conditions[$conditionId])) {
-            $this->ungrouped_conditions[$conditionId]->delete();
-            unset($this->ungrouped_conditions[$conditionId]);
-        } else {
-            foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
-                if (isset($conditions[$conditionId])) {
-                    $this->conditiongroups[$conditiongroup_id]->conditions[$conditionId]->delete();
-                    unset($this->conditiongroups[$conditiongroup_id]->conditions[$conditionId]);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Checks whether the given user fulfills the configured
-     * admission conditions. Only one of the conditions needs to be
-     * fulfilled (logical operator OR). The fields in a condition are
-     * in conjunction (logical operator AND).
-     *
-     * @param String $userId
-     * @param String $courseId
-     * @return Array Array with conditions that have failed. If array
-     *               is empty, everything's all right.
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        $failed = [];
-        // Check for rule validity time frame.
-        if ($this->checkTimeFrame()) {
-            // Check all configured conditions.
-            foreach ($this->ungrouped_conditions as $condition) {
-                if (!$condition->isFulfilled($userId)) {
-                    $failed[] = $this->getMessage($condition->toString());
-                } else {
-                    $failed = [];
-                    break;
-                }
-            }
-            foreach ($this->conditiongroups as $conditions) {
-                foreach ($conditions as $condition) {
-                    if (!$condition->isFulfilled($userId)) {
-                        $failed[] = $this->getMessage($condition->toString());
-                    } else {
-                        $failed = [];
-                        break 2;
-                    }
-                }
-            }
-        }
-        return $failed;
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data)
-    {
-        UserFilterField::getAvailableFilterFields();
-        parent::setAllData($data);
-        $this->conditions = [];
-        $this->ungrouped_conditions = [];
-        $this->conditiongroups = [];
-        $this->quota = [];
-        foreach ($data['conditions'] as $ser_con) {
-            $condition = ObjectBuilder::build($ser_con, 'UserFilter');
-            $this->addCondition($condition, $data['conditiongroup_'.$condition->getId()], $data['quota_'.$data['conditiongroup_'.$condition->getId()]] ?? 0);
-        }
-        foreach ($this->getConditiongroups() as $conditiongroup_id => $conditions) {
-            if (mb_strlen($conditiongroup_id) < 32) {
-                $group = md5(uniqid('conditiongroups' . microtime(), true));
-
-                $this->conditiongroups[$group] = $this->conditiongroups[$conditiongroup_id];
-                unset($this->conditiongroups[$conditiongroup_id]);
-
-                $this->quota[$group] = $this->quota[$conditiongroup_id];
-                unset($this->quota[$conditiongroup_id]);
-            }
-        }
-        if (count($this->getConditiongroups()) && $data['conditiongroups_allowed']) {
-            $this->conditiongroups_allowed = true;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Helper function for storing data to DB.
-     */
-    public function store()
-    {
-        // Store rule data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `conditionaladmissions`
-            (`rule_id`, `message`, `start_time`, `end_time`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `message`=VALUES(`message`),
-            `start_time`=VALUES(`start_time`),
-            `end_time`=VALUES(`end_time`),
-            `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->message, (int)$this->startTime,
-            (int)$this->endTime, time(), time()]);
-        // prepare condition data.
-        $keys = array_keys($this->ungrouped_conditions);
-        foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
-            $keys = array_merge($keys, array_keys($conditions));
-        }
-
-        // Delete removed conditions from DB.
-        $stmt = DBManager::get()->prepare("SELECT `filter_id`, `conditiongroup_id` FROM
-            `admission_condition` WHERE `rule_id`=? AND `filter_id` NOT IN ('".
-                implode("', '", $keys)."')");
-        $stmt->execute([$this->id]);
-        $groups = [];
-        foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $entry) {
-            $current = new UserFilter($entry['filter_id']);
-            $current->delete();
-            $groups[] = $entry['conditiongroup_id'];
-        }
-        DBManager::get()->exec("DELETE FROM `admission_condition`
-            WHERE `rule_id`='".$this->id."' AND `filter_id` NOT IN ('".
-                    implode("', '", $keys)."')");
-        // Store all conditions.
-        $queries = [];
-        $parameters = [];
-        $groupqueries = [];
-        $groupparameters = [];
-        foreach ($this->ungrouped_conditions as $condition) {
-            // Store each ungrouped condition...
-            $condition->store();
-            $queries[] = "(?, ?, ?, ?)";
-            $parameters[] = $this->id;
-            $parameters[] = $condition->getId();
-            $parameters[] = '';
-            $parameters[] = time();
-        }
-
-        foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
-            $groupqueries[] = "(?, ?)";
-            $groupparameters[] = $conditiongroup_id;
-            $groupparameters[] = $this->quota[$conditiongroup_id];
-            foreach ($conditions as $condition) {
-                // Store each group of conditions...
-                $condition->store();
-                $queries[] = "(?, ?, ?, ?)";
-                $parameters[] = $this->id;
-                $parameters[] = $condition->getId();
-                $parameters[] = $conditiongroup_id;
-                $parameters[] = time();
-            }
-        }
-
-        // Store all assignments between rule and condition.
-        if (count($queries) > 0) {
-            $stmt = DBManager::get()->prepare("INSERT INTO `admission_condition`
-                (`rule_id`, `filter_id`, `conditiongroup_id`, `mkdate`)
-                VALUES " . implode(',', $queries) . " ON DUPLICATE KEY UPDATE
-                `filter_id`=VALUES(`filter_id`), `conditiongroup_id`=VALUES(`conditiongroup_id`)");
-            $stmt->execute($parameters);
-        }
-
-        // Store all assignments between condition and conditiongroup.
-        if (count($groupqueries) > 0) {
-            $stmt = DBManager::get()->prepare("INSERT INTO `admission_conditiongroup`
-                (`conditiongroup_id`, `quota`)
-                VALUES " . implode(',', $groupqueries) . " ON DUPLICATE KEY UPDATE
-                `quota`=VALUES(`quota`)");
-            $stmt->execute($groupparameters);
-        }
-
-        return $this;
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString()
-    {
-        $factory = new Flexi\Factory(__DIR__ . '/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array $data Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if (!$data['conditions'] || !is_array($data['conditions'])) {
-            $errors[] = _('Es muss mindestens eine Auswahlbedingung angegeben werden.');
-            return $errors;
-        }
-        $quota = [];
-        $quota_total = 0;
-        $grouped = 0;
-        $ungrouped = 0;
-        $no_quota = 0;
-        foreach ($data['conditions'] as $ser_con) {
-            $condition = ObjectBuilder::build($ser_con, 'UserFilter');
-            if ($data['conditiongroup_'.$condition->getId()]) {
-                $grouped++;
-            } else {
-                $ungrouped++;
-            }
-            $quota[$data['conditiongroup_' . $condition->getId()]] = $data['quota_' . $data['conditiongroup_' . $condition->getId()]] ?? 0;
-            if (!$quota[$data['conditiongroup_' . $condition->getId()]]) {
-                $no_quota++;
-            }
-        }
-        foreach ($quota as $part) {
-            $quota_total += $part;
-        }
-        if ($grouped && $ungrouped) {
-            $errors[] = sprintf(_('Es müssen entweder alle Bedingungen Teil einer Gruppe sein, oder keine. %s Bedingungen sind keiner Gruppe zugeordnet.'), $ungrouped);
-        } elseif ($grouped && $quota_total !== 100) {
-            $errors[] = _('Die Gesamtsumme der Kontingente muss 100 Prozent betragen.');
-        } elseif ($grouped && $no_quota) {
-            $errors[] = sprintf(_('Für %s Gruppen muss noch ein Kontingent festgelegt werden.'), $no_quota);
-        }
-        return $errors;
-    }
-
-    public function getMessage($condition = null)
-    {
-        $message = parent::getMessage();
-        if ($condition) {
-            return sprintf($message, $condition);
-        } else {
-            return $message;
-        }
-    }
-
-    public function __clone()
-    {
-        $this->id = md5(uniqid(get_class($this)));
-        $this->courseSetId = null;
-        $cloned_conditions = [];
-        foreach ($this->ungrouped_conditions as $condition) {
-            $dolly = clone $condition;
-            $cloned_conditions[$dolly->id] = $dolly;
-        }
-        $this->ungrouped_conditions = $cloned_conditions;
-        $cloned_conditiongroups = [];
-        $cloned_quota = [];
-        foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
-            $cloned_conditiongroup_id = md5(uniqid($conditiongroup_id));
-            $cloned_quota[$cloned_conditiongroup_id] = $this->quota[$conditiongroup_id];
-            foreach ($conditions as $condition) {
-                $dolly = clone $condition;
-                $cloned_conditiongroups[$cloned_conditiongroup_id][$dolly->id] = $dolly;
-            }
-        }
-        $this->conditiongroups = $cloned_conditiongroups;
-        $this->quota = $cloned_quota;
-    }
-
-    public function setSiblings($siblings = [])
-    {
-        parent::setSiblings($siblings);
-        $this->conditiongroups_allowed = null;
-    }
-}
diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
new file mode 100644
index 0000000..7fdbc00
--- /dev/null
+++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
@@ -0,0 +1,563 @@
+<?php
+
+/**
+ * ConditionalAdmission.class.php
+ *
+ * An admission rule that specifies conditions for course admission, like
+ * degree, study course or semester.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class ConditionalAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * All conditions that must be fulfilled for successful admission.
+     */
+    public $conditions = [];
+
+    /**
+     * Grouped conditions that must be fulfilled for successful admission.
+     */
+    public $conditiongroups = [];
+
+    /**
+     * Conditions that must be fulfilled for successful admission.
+     */
+    public $ungrouped_conditions = [];
+
+    /**
+     * Quota for grouped conditions
+     */
+    public $quota = [];
+
+    /**
+     * Are condition groups allowed?
+     */
+    public $conditiongroups_allowed = null;
+
+    /**
+     * courseset siblings of this rule
+     */
+    public $siblings = [];
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor.
+     *
+     * @param  String $ruleId If this rule has been saved previously, it
+     *      will be loaded from database.
+     * @return ConditionalAdmission the current object (this).
+     */
+    public function __construct($ruleId='', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+        $this->default_message = _('Sie erfüllen nicht die Bedingung: %s');
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('conditionaladmissions');
+        }
+        return $this;
+    }
+
+    /**
+     * Adds a new UserFilter to this rule.
+     *
+     * @param  UserFilter $condition
+     * @param  String $group
+     * @param  Int $quota
+     * @return ConditionalAdmission
+     */
+    public function addCondition($condition, $group = '', $quota = 0)
+    {
+        if ($group) {
+            $this->conditiongroups[$group][$condition->getId()] = $condition;
+            $this->quota[$group] = $quota;
+        } else {
+            $this->ungrouped_conditions[$condition->getId()] = $condition;
+        }
+        return $this;
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete()
+    {
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `conditionaladmissions`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete all associated conditions...
+        foreach ($this->ungrouped_conditions as $condition) {
+            $condition->delete();
+        }
+        foreach ($this->conditiongroups as $conditions) {
+            foreach ($conditions as $condition) {
+                $condition->delete();
+            }
+        }
+        // ... and their connection to this rule.
+        $stmt = DBManager::get()->prepare("DELETE `admission_condition`, `admission_conditiongroup` FROM `admission_condition`
+            LEFT JOIN `admission_conditiongroup` USING( `conditiongroup_id`)
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Gets all users that are matched by thís rule.
+     *
+     * @return Array An array containing IDs of users who are matched by
+     *      this rule.
+     */
+    public function getAffectedUsers()
+    {
+        $users = [];
+        foreach ($this->ungrouped_conditions as $condition) {
+            $users = array_intersect($users, $condition->getAffectedUsers());
+        }
+        foreach ($this->conditiongroups as $conditions) {
+            foreach ($conditions as $condition) {
+                $users = array_intersect($users, $condition->getAffectedUsers());
+            }
+        }
+        return $users;
+    }
+
+    /**
+     * Gets all defined conditions.
+     *
+     * @return Array
+     */
+    public function getConditions()
+    {
+        return $this->conditions;
+    }
+
+    /**
+     * Gets all grouped conditiongroups.
+     *
+     * @return Array
+     */
+    public function getConditionGroups()
+    {
+        return $this->conditiongroups;
+    }
+
+    /**
+     * Gets all grouped conditiongroups.
+     *
+     * @return Array
+     */
+    public function getUngroupedConditions()
+    {
+        return $this->ungrouped_conditions;
+    }
+
+    /**
+     * Gets quota for given conditiongroup.
+     *
+     * @return Array
+     */
+    public function getQuota($group_id)
+    {
+        return $this->quota[$group_id];
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription()
+    {
+        return _('Über eine Menge von Bedingungen kann festgelegt werden, '.
+            'wer zur Anmeldung zu den Veranstaltungen des Anmeldesets '.
+            'zugelassen ist. Es muss nur eine der Bedingungen erfüllt sein, '.
+            'innerhalb einer Bedingung müssen aber alle Datenfelder '.
+            'zutreffen.');
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName()
+    {
+        return _('Bedingte Anmeldung');
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate()
+    {
+        // Open generic admission rule template.
+        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
+        $tpl->set_attribute('rule', $this);
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
+        // Now open specific template for this rule and insert base template.
+        $tpl2 = $factory->open('configure');
+        $tpl2->set_attribute('rule', $this);
+        $tpl2->set_attribute('tpl', $tpl->render());
+        return $tpl2->render();
+    }
+
+    /**
+     * Helper function for loading data from DB. Generic AdmissionRule data is
+     * loaded with the parent load() method.
+     */
+    public function load()
+    {
+        // Load basic data.
+        $stmt = DBManager::get()->prepare("SELECT *
+            FROM `conditionaladmissions` WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->message = $current['message'];
+            $this->startTime = $current['start_time'];
+            $this->endTime = $current['end_time'];
+            // Retrieve conditions.
+            $stmt = DBManager::get()->prepare("SELECT *
+                FROM `admission_condition` LEFT JOIN `admission_conditiongroup` USING (`conditiongroup_id`) WHERE `rule_id`=?");
+            $stmt->execute([$this->id]);
+            $conditions = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            foreach ($conditions as $condition) {
+                $currentCondition = new UserFilter($condition['filter_id']);
+                if ($condition['conditiongroup_id']) {
+                    $this->conditiongroups[$condition['conditiongroup_id']][$condition['filter_id']] = $currentCondition;
+                    $this->quota[$condition['conditiongroup_id']] = $condition['quota'];
+                } else {
+                    $this->ungrouped_conditions[$condition['filter_id']] = $currentCondition;
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks if condition groups are allowed.
+     *
+     * @return Boolean
+     */
+    public function conditiongroupsAllowed()
+    {
+        if ($this->conditiongroups_allowed === null) {
+            foreach ($this->getSiblings() as $rule) {
+                if (get_class($rule) == 'ParticipantRestrictedAdmission') {
+                    if ($rule->getDistributionTime() > time()) {
+                        $this->conditiongroups_allowed = true;
+                    }
+                }
+            }
+        }
+        return $this->conditiongroups_allowed;
+    }
+
+    /**
+     * Removes condition groups and sets all conditions as ungrouped.
+     *
+     */
+    public function removeConditionGroups()
+    {
+       foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
+           foreach ($conditions as $condition_id => $condition) {
+               $this->ungrouped_conditions[$condition_id] = $condition;
+           }
+       }
+       $this->conditiongroups = [];
+    }
+
+    /**
+     * Removes the condition with the given ID from the rule.
+     *
+     * @param  String $conditionId
+     * @return ConditionalAdmission
+     */
+    public function removeCondition($conditionId)
+    {
+        if (isset($this->ungrouped_conditions[$conditionId])) {
+            $this->ungrouped_conditions[$conditionId]->delete();
+            unset($this->ungrouped_conditions[$conditionId]);
+        } else {
+            foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
+                if (isset($conditions[$conditionId])) {
+                    $this->conditiongroups[$conditiongroup_id]->conditions[$conditionId]->delete();
+                    unset($this->conditiongroups[$conditiongroup_id]->conditions[$conditionId]);
+                }
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Checks whether the given user fulfills the configured
+     * admission conditions. Only one of the conditions needs to be
+     * fulfilled (logical operator OR). The fields in a condition are
+     * in conjunction (logical operator AND).
+     *
+     * @param String $userId
+     * @param String $courseId
+     * @return Array Array with conditions that have failed. If array
+     *               is empty, everything's all right.
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        $failed = [];
+        // Check for rule validity time frame.
+        if ($this->checkTimeFrame()) {
+            // Check all configured conditions.
+            foreach ($this->ungrouped_conditions as $condition) {
+                if (!$condition->isFulfilled($userId)) {
+                    $failed[] = $this->getMessage($condition->toString());
+                } else {
+                    $failed = [];
+                    break;
+                }
+            }
+            foreach ($this->conditiongroups as $conditions) {
+                foreach ($conditions as $condition) {
+                    if (!$condition->isFulfilled($userId)) {
+                        $failed[] = $this->getMessage($condition->toString());
+                    } else {
+                        $failed = [];
+                        break 2;
+                    }
+                }
+            }
+        }
+        return $failed;
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data)
+    {
+        UserFilterField::getAvailableFilterFields();
+        parent::setAllData($data);
+        $this->conditions = [];
+        $this->ungrouped_conditions = [];
+        $this->conditiongroups = [];
+        $this->quota = [];
+        foreach ($data['conditions'] as $ser_con) {
+            $condition = ObjectBuilder::build($ser_con, 'UserFilter');
+            $this->addCondition($condition, $data['conditiongroup_'.$condition->getId()], $data['quota_'.$data['conditiongroup_'.$condition->getId()]] ?? 0);
+        }
+        foreach ($this->getConditiongroups() as $conditiongroup_id => $conditions) {
+            if (mb_strlen($conditiongroup_id) < 32) {
+                $group = md5(uniqid('conditiongroups' . microtime(), true));
+
+                $this->conditiongroups[$group] = $this->conditiongroups[$conditiongroup_id];
+                unset($this->conditiongroups[$conditiongroup_id]);
+
+                $this->quota[$group] = $this->quota[$conditiongroup_id];
+                unset($this->quota[$conditiongroup_id]);
+            }
+        }
+        if (count($this->getConditiongroups()) && $data['conditiongroups_allowed']) {
+            $this->conditiongroups_allowed = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Helper function for storing data to DB.
+     */
+    public function store()
+    {
+        // Store rule data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `conditionaladmissions`
+            (`rule_id`, `message`, `start_time`, `end_time`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `message`=VALUES(`message`),
+            `start_time`=VALUES(`start_time`),
+            `end_time`=VALUES(`end_time`),
+            `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->message, (int)$this->startTime,
+            (int)$this->endTime, time(), time()]);
+        // prepare condition data.
+        $keys = array_keys($this->ungrouped_conditions);
+        foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
+            $keys = array_merge($keys, array_keys($conditions));
+        }
+
+        // Delete removed conditions from DB.
+        $stmt = DBManager::get()->prepare("SELECT `filter_id`, `conditiongroup_id` FROM
+            `admission_condition` WHERE `rule_id`=? AND `filter_id` NOT IN ('".
+                implode("', '", $keys)."')");
+        $stmt->execute([$this->id]);
+        $groups = [];
+        foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $entry) {
+            $current = new UserFilter($entry['filter_id']);
+            $current->delete();
+            $groups[] = $entry['conditiongroup_id'];
+        }
+        DBManager::get()->exec("DELETE FROM `admission_condition`
+            WHERE `rule_id`='".$this->id."' AND `filter_id` NOT IN ('".
+                    implode("', '", $keys)."')");
+        // Store all conditions.
+        $queries = [];
+        $parameters = [];
+        $groupqueries = [];
+        $groupparameters = [];
+        foreach ($this->ungrouped_conditions as $condition) {
+            // Store each ungrouped condition...
+            $condition->store();
+            $queries[] = "(?, ?, ?, ?)";
+            $parameters[] = $this->id;
+            $parameters[] = $condition->getId();
+            $parameters[] = '';
+            $parameters[] = time();
+        }
+
+        foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
+            $groupqueries[] = "(?, ?)";
+            $groupparameters[] = $conditiongroup_id;
+            $groupparameters[] = $this->quota[$conditiongroup_id];
+            foreach ($conditions as $condition) {
+                // Store each group of conditions...
+                $condition->store();
+                $queries[] = "(?, ?, ?, ?)";
+                $parameters[] = $this->id;
+                $parameters[] = $condition->getId();
+                $parameters[] = $conditiongroup_id;
+                $parameters[] = time();
+            }
+        }
+
+        // Store all assignments between rule and condition.
+        if (count($queries) > 0) {
+            $stmt = DBManager::get()->prepare("INSERT INTO `admission_condition`
+                (`rule_id`, `filter_id`, `conditiongroup_id`, `mkdate`)
+                VALUES " . implode(',', $queries) . " ON DUPLICATE KEY UPDATE
+                `filter_id`=VALUES(`filter_id`), `conditiongroup_id`=VALUES(`conditiongroup_id`)");
+            $stmt->execute($parameters);
+        }
+
+        // Store all assignments between condition and conditiongroup.
+        if (count($groupqueries) > 0) {
+            $stmt = DBManager::get()->prepare("INSERT INTO `admission_conditiongroup`
+                (`conditiongroup_id`, `quota`)
+                VALUES " . implode(',', $groupqueries) . " ON DUPLICATE KEY UPDATE
+                `quota`=VALUES(`quota`)");
+            $stmt->execute($groupparameters);
+        }
+
+        return $this;
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString()
+    {
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array $data Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if (!$data['conditions'] || !is_array($data['conditions'])) {
+            $errors[] = _('Es muss mindestens eine Auswahlbedingung angegeben werden.');
+            return $errors;
+        }
+        $quota = [];
+        $quota_total = 0;
+        $grouped = 0;
+        $ungrouped = 0;
+        $no_quota = 0;
+        foreach ($data['conditions'] as $ser_con) {
+            $condition = ObjectBuilder::build($ser_con, 'UserFilter');
+            if ($data['conditiongroup_'.$condition->getId()]) {
+                $grouped++;
+            } else {
+                $ungrouped++;
+            }
+            $quota[$data['conditiongroup_' . $condition->getId()]] = $data['quota_' . $data['conditiongroup_' . $condition->getId()]] ?? 0;
+            if (!$quota[$data['conditiongroup_' . $condition->getId()]]) {
+                $no_quota++;
+            }
+        }
+        foreach ($quota as $part) {
+            $quota_total += $part;
+        }
+        if ($grouped && $ungrouped) {
+            $errors[] = sprintf(_('Es müssen entweder alle Bedingungen Teil einer Gruppe sein, oder keine. %s Bedingungen sind keiner Gruppe zugeordnet.'), $ungrouped);
+        } elseif ($grouped && $quota_total !== 100) {
+            $errors[] = _('Die Gesamtsumme der Kontingente muss 100 Prozent betragen.');
+        } elseif ($grouped && $no_quota) {
+            $errors[] = sprintf(_('Für %s Gruppen muss noch ein Kontingent festgelegt werden.'), $no_quota);
+        }
+        return $errors;
+    }
+
+    public function getMessage($condition = null)
+    {
+        $message = parent::getMessage();
+        if ($condition) {
+            return sprintf($message, $condition);
+        } else {
+            return $message;
+        }
+    }
+
+    public function __clone()
+    {
+        $this->id = md5(uniqid(get_class($this)));
+        $this->courseSetId = null;
+        $cloned_conditions = [];
+        foreach ($this->ungrouped_conditions as $condition) {
+            $dolly = clone $condition;
+            $cloned_conditions[$dolly->id] = $dolly;
+        }
+        $this->ungrouped_conditions = $cloned_conditions;
+        $cloned_conditiongroups = [];
+        $cloned_quota = [];
+        foreach ($this->conditiongroups as $conditiongroup_id => $conditions) {
+            $cloned_conditiongroup_id = md5(uniqid($conditiongroup_id));
+            $cloned_quota[$cloned_conditiongroup_id] = $this->quota[$conditiongroup_id];
+            foreach ($conditions as $condition) {
+                $dolly = clone $condition;
+                $cloned_conditiongroups[$cloned_conditiongroup_id][$dolly->id] = $dolly;
+            }
+        }
+        $this->conditiongroups = $cloned_conditiongroups;
+        $this->quota = $cloned_quota;
+    }
+
+    public function setSiblings($siblings = [])
+    {
+        parent::setSiblings($siblings);
+        $this->conditiongroups_allowed = null;
+    }
+}
diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php
deleted file mode 100644
index a3309e8..0000000
--- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-/**
- * CourseMemberAdmission.class.php
- *
- * Specifies a mandatory course membership for course admission.
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class CourseMemberAdmission extends AdmissionRule
-{
-    const MODE_MUST_BE_IN_COURSES = 0;
-    const MODE_MAY_NOT_BE_IN_COURSES = 1;
-    // --- ATTRIBUTES ---
-
-    /**
-     * End of course admission.
-     */
-    public $courses_to_add = '[]';
-    public $modus = '';
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor
-     *
-     * @param  String $ruleId
-     * @param  String e
-     */
-    public function __construct($ruleId = '', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('coursememberadmissions');
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete()
-    {
-        parent::delete();
-
-        // Delete rule data.
-        DBManager::get()->execute(
-            "DELETE FROM `coursememberadmissions` WHERE `rule_id` = ?",
-            [$this->id]
-        );
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription()
-    {
-        return _("Anmelderegeln dieses Typs legen eine Veranstaltung fest, in der die Nutzer bereits eingetragen sein müssen, oder in der sie nicht eingetragen sein dürfen, um sich zu Veranstaltungen des Anmeldesets anmelden zu können.");
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName()
-    {
-        return _("Veranstaltungsbezogene Anmeldung");
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate()
-    {
-        // Open generic admission rule template.
-        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
-        $tpl->set_attribute('rule', $this);
-
-        return $this->getTemplateFactory()->render('configure', [
-            'rule'    => $this,
-            'tpl'     => $tpl->render(),
-            'courses' => $this->getDecodedCourses(),
-        ]);
-    }
-
-    /**
-     * Helper function for loading rule definition from database.
-     */
-    public function load()
-    {
-        // Load data.
-        $stmt = DBManager::get()->prepare("SELECT *
-            FROM `coursememberadmissions` WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetchOne()) {
-            $this->message = $current['message'];
-            $this->startTime = $current['start_time'];
-            $this->endTime = $current['end_time'];
-            $this->courses_to_add = $current['courses'];
-            $this->modus = (int) $current['modus'];
-        }
-    }
-
-    /**
-     * Is admission allowed according to the defined time frame?
-     *
-     * @param  String $userId
-     * @param  String $courseId
-     * @return Array
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        $errors = [];
-        if ($this->checkTimeFrame()) {
-            $courses = $this->getDecodedCourses();
-            foreach ($courses as $course) {
-                $is_member = CourseMember::exists([$course->id, $userId]);
-
-                if (($this->modus == self::MODE_MUST_BE_IN_COURSES && !$is_member)
-                    || ($this->modus == self::MODE_MAY_NOT_BE_IN_COURSES && $is_member)
-                ) {
-                    $errors[] = $this->getMessage($course);
-                }
-            }
-
-            // mode: "Mitgliedschaft ist in mindestens einer dieser Veranstaltungen notwendig"
-            if ($this->modus == self::MODE_MUST_BE_IN_COURSES && count($errors) < count($courses)) {
-                $errors = [];
-            }
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data)
-    {
-        parent::setAllData($data);
-
-        $this->modus = (int) $data['modus'];
-        $this->courses_to_add = json_encode(array_keys($data['courses_to_add']));
-        return $this;
-    }
-
-    /**
-     * Store rule definition to database.
-     */
-    public function store()
-    {
-        // Store data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `coursememberadmissions`
-            (`rule_id`, `message`, `courses`, `modus`, `start_time`,
-            `end_time`, `mkdate`, `chdate`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE `start_time`=VALUES(`start_time`),
-            `end_time`=VALUES(`end_time`),message=VALUES(message),courses=VALUES(courses),modus=VALUES(modus), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->message, $this->courses_to_add, (int)$this->modus, (int)$this->startTime,
-            (int)$this->endTime,  time(), time()]);
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString()
-    {
-        return $this->getTemplateFactory()->render('info', [
-            'courses' => $this->getDecodedCourses(),
-            'rule'    => $this,
-            'modus'   => $this->modus,
-        ]);
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array $data Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if (!$data['courses_to_add']) {
-            $errors[] = _('Bitte wählen Sie eine Veranstaltung aus.');
-        }
-        return $errors;
-    }
-
-    public function getMessage($course = null)
-    {
-        $message = parent::getMessage();
-
-        if ($course) {
-            return sprintf($message, $course->getFullName('number-name'));
-        } else {
-            return $message;
-        }
-    }
-
-    private function getDecodedCourses()
-    {
-        $decoded_courses = json_decode($this->courses_to_add, true);
-        if (!$decoded_courses) {
-            return [];
-        }
-        return Course::findMany($decoded_courses);
-    }
-
-    public function getValidityPeriod(): string
-    {
-        if ($this->getStartTime() && $this->getEndTime()) {
-            return sprintf(
-                _('Diese Regel gilt von %s bis %s.'),
-                strftime('%d.%m.%Y %H:%M', $this->getStartTime()),
-                strftime('%d.%m.%Y %H:%M', $this->getEndTime())
-            );
-        }
-
-        if ($this->getStartTime() && !$this->getEndTime()) {
-            return sprintf(
-                _('Diese Regel gilt ab %s.'),
-                strftime('%d.%m.%Y %H:%M', $this->getStartTime())
-            );
-        }
-
-        if (!$this->getStartTime() && $this->getEndTime()) {
-            return sprintf(
-                _('Diese Regel gilt bis %s.'),
-                strftime('%d.%m.%Y %H:%M', $this->getEndTime())
-            );
-        }
-
-        return '';
-    }
-
-    private function getTemplateFactory(): Flexi\Factory
-    {
-        return new Flexi\Factory(__DIR__ . '/templates/');
-    }
-}
diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
new file mode 100644
index 0000000..a3309e8
--- /dev/null
+++ b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
@@ -0,0 +1,260 @@
+<?php
+
+/**
+ * CourseMemberAdmission.class.php
+ *
+ * Specifies a mandatory course membership for course admission.
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class CourseMemberAdmission extends AdmissionRule
+{
+    const MODE_MUST_BE_IN_COURSES = 0;
+    const MODE_MAY_NOT_BE_IN_COURSES = 1;
+    // --- ATTRIBUTES ---
+
+    /**
+     * End of course admission.
+     */
+    public $courses_to_add = '[]';
+    public $modus = '';
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor
+     *
+     * @param  String $ruleId
+     * @param  String e
+     */
+    public function __construct($ruleId = '', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('coursememberadmissions');
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete()
+    {
+        parent::delete();
+
+        // Delete rule data.
+        DBManager::get()->execute(
+            "DELETE FROM `coursememberadmissions` WHERE `rule_id` = ?",
+            [$this->id]
+        );
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription()
+    {
+        return _("Anmelderegeln dieses Typs legen eine Veranstaltung fest, in der die Nutzer bereits eingetragen sein müssen, oder in der sie nicht eingetragen sein dürfen, um sich zu Veranstaltungen des Anmeldesets anmelden zu können.");
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName()
+    {
+        return _("Veranstaltungsbezogene Anmeldung");
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate()
+    {
+        // Open generic admission rule template.
+        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
+        $tpl->set_attribute('rule', $this);
+
+        return $this->getTemplateFactory()->render('configure', [
+            'rule'    => $this,
+            'tpl'     => $tpl->render(),
+            'courses' => $this->getDecodedCourses(),
+        ]);
+    }
+
+    /**
+     * Helper function for loading rule definition from database.
+     */
+    public function load()
+    {
+        // Load data.
+        $stmt = DBManager::get()->prepare("SELECT *
+            FROM `coursememberadmissions` WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetchOne()) {
+            $this->message = $current['message'];
+            $this->startTime = $current['start_time'];
+            $this->endTime = $current['end_time'];
+            $this->courses_to_add = $current['courses'];
+            $this->modus = (int) $current['modus'];
+        }
+    }
+
+    /**
+     * Is admission allowed according to the defined time frame?
+     *
+     * @param  String $userId
+     * @param  String $courseId
+     * @return Array
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        $errors = [];
+        if ($this->checkTimeFrame()) {
+            $courses = $this->getDecodedCourses();
+            foreach ($courses as $course) {
+                $is_member = CourseMember::exists([$course->id, $userId]);
+
+                if (($this->modus == self::MODE_MUST_BE_IN_COURSES && !$is_member)
+                    || ($this->modus == self::MODE_MAY_NOT_BE_IN_COURSES && $is_member)
+                ) {
+                    $errors[] = $this->getMessage($course);
+                }
+            }
+
+            // mode: "Mitgliedschaft ist in mindestens einer dieser Veranstaltungen notwendig"
+            if ($this->modus == self::MODE_MUST_BE_IN_COURSES && count($errors) < count($courses)) {
+                $errors = [];
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data)
+    {
+        parent::setAllData($data);
+
+        $this->modus = (int) $data['modus'];
+        $this->courses_to_add = json_encode(array_keys($data['courses_to_add']));
+        return $this;
+    }
+
+    /**
+     * Store rule definition to database.
+     */
+    public function store()
+    {
+        // Store data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `coursememberadmissions`
+            (`rule_id`, `message`, `courses`, `modus`, `start_time`,
+            `end_time`, `mkdate`, `chdate`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+            ON DUPLICATE KEY UPDATE `start_time`=VALUES(`start_time`),
+            `end_time`=VALUES(`end_time`),message=VALUES(message),courses=VALUES(courses),modus=VALUES(modus), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->message, $this->courses_to_add, (int)$this->modus, (int)$this->startTime,
+            (int)$this->endTime,  time(), time()]);
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString()
+    {
+        return $this->getTemplateFactory()->render('info', [
+            'courses' => $this->getDecodedCourses(),
+            'rule'    => $this,
+            'modus'   => $this->modus,
+        ]);
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array $data Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if (!$data['courses_to_add']) {
+            $errors[] = _('Bitte wählen Sie eine Veranstaltung aus.');
+        }
+        return $errors;
+    }
+
+    public function getMessage($course = null)
+    {
+        $message = parent::getMessage();
+
+        if ($course) {
+            return sprintf($message, $course->getFullName('number-name'));
+        } else {
+            return $message;
+        }
+    }
+
+    private function getDecodedCourses()
+    {
+        $decoded_courses = json_decode($this->courses_to_add, true);
+        if (!$decoded_courses) {
+            return [];
+        }
+        return Course::findMany($decoded_courses);
+    }
+
+    public function getValidityPeriod(): string
+    {
+        if ($this->getStartTime() && $this->getEndTime()) {
+            return sprintf(
+                _('Diese Regel gilt von %s bis %s.'),
+                strftime('%d.%m.%Y %H:%M', $this->getStartTime()),
+                strftime('%d.%m.%Y %H:%M', $this->getEndTime())
+            );
+        }
+
+        if ($this->getStartTime() && !$this->getEndTime()) {
+            return sprintf(
+                _('Diese Regel gilt ab %s.'),
+                strftime('%d.%m.%Y %H:%M', $this->getStartTime())
+            );
+        }
+
+        if (!$this->getStartTime() && $this->getEndTime()) {
+            return sprintf(
+                _('Diese Regel gilt bis %s.'),
+                strftime('%d.%m.%Y %H:%M', $this->getEndTime())
+            );
+        }
+
+        return '';
+    }
+
+    private function getTemplateFactory(): Flexi\Factory
+    {
+        return new Flexi\Factory(__DIR__ . '/templates/');
+    }
+}
diff --git a/lib/admissionrules/limitedadmission/LimitedAdmission.class.php b/lib/admissionrules/limitedadmission/LimitedAdmission.class.php
deleted file mode 100644
index a193bda..0000000
--- a/lib/admissionrules/limitedadmission/LimitedAdmission.class.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-/**
- * LimitedAdmission.class.php
- *
- * Represents rules for admission to a limited number of courses.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class LimitedAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-
-    /**
-     * Maximal number of courses that a user can register for.
-     */
-    public $maxNumber = 1;
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor.
-     *
-     * @param  String ruleId
-     * @return LimitedAdmission
-     */
-    public function __construct($ruleId='', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-        $this->default_message = _('Sie haben sich bereits zur maximalen Anzahl von %s Veranstaltungen angemeldet.');
-
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('limitedadmissions');
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete() {
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `limitedadmissions`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete all custom max numbers.
-        $stmt = DBManager::get()->prepare("DELETE FROM `userlimits`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Users can specify their own maximal number of courses they want
-     * to be registered for. This method gets the specified value for the
-     * given user or the max number that has been specified  by the rule if no
-     * custom number was set.
-     *
-     * @param  userId
-     * @return Integer
-     */
-    public function getCustomMaxNumber($userId)
-    {
-        // Initially we use the number given per admission rule.
-        $maxNumber = $this->maxNumber;
-        $stmt = DBManager::get()->prepare("SELECT `maxnumber`
-            FROM `userlimits` WHERE rule_id=? AND user_id=?");
-        $stmt->execute([$this->id, $userId]);
-        // The user has given some custom number.
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            // Custom number must be smaller than rule max number.
-            $maxNumber = min($maxNumber, $current['maxnumber']);
-        }
-        return $maxNumber;
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription() {
-        return _("Diese Art von Anmelderegel legt eine Maximalzahl von ".
-            "Veranstaltungen fest, an denen Nutzer im aktuellen ".
-            "Anmeldeset teilnehmen können.");
-    }
-
-    /**
-     * Gets the maximal number of courses that users can be registered for.
-     *
-     * @return Integer
-     */
-    public function getMaxNumber()
-    {
-        return (int)$this->maxNumber;
-    }
-
-    public function getMaxNumberForUser($userId)
-    {
-        return min($this->maxNumber, $this->getCustomMaxNumber($userId));
-    }
-
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName() {
-        return _("Anmeldung zu maximal n Veranstaltungen");
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate() {
-        // Open generic admission rule template.
-        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
-        $tpl->set_attribute('rule', $this);
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        // Now open specific template for this rule and insert base template.
-        $tpl2 = $factory->open('configure');
-        $tpl2->set_attribute('rule', $this);
-        $tpl2->set_attribute('tpl', $tpl->render());
-        return $tpl2->render();
-    }
-
-    /**
-     * Internal helper function for loading rule definition from database.
-     */
-    public function load() {
-        $stmt = DBManager::get()->prepare("SELECT *
-            FROM `limitedadmissions` WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->message = $current['message'];
-            $this->startTime = $current['start_time'];
-            $this->endTime = $current['end_time'];
-            $this->maxNumber = $current['maxnumber'];
-        }
-    }
-
-    /**
-     * Does the current rule allow the given user to register as participant
-     * in the given course? That only happens when the user has no more than
-     * the given number of registrations at the other courses in the course set.
-     *
-     * @param  String userId
-     * @param  String courseId
-     * @return Array Any errors that occurred on admission.
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        $errors = [];
-        // Check for rule validity time frame.
-        if ($this->checkTimeFrame()) {
-            // How many courses from this set has the user already registered for?
-            $db = DBManager::get();
-            $number = $db->fetchColumn("SELECT COUNT(*)
-                FROM `seminar_user` WHERE `user_id`=? AND `status` IN ('user', 'autor') AND `Seminar_id` IN (
-                    SELECT `Seminar_id` FROM `seminar_courseset` WHERE `set_id`=?)", [$userId, $this->courseSetId]);
-            $number += $db->fetchColumn("SELECT COUNT(*)
-                FROM `admission_seminar_user` WHERE `user_id`=? AND `Seminar_id` IN (
-                    SELECT `Seminar_id` FROM `seminar_courseset` WHERE `set_id`=?)", [$userId, $this->courseSetId]);
-            // Check if the number is smaller than admission rule limit
-            if (!($number <
-                    $this->getMaxNumber())) {
-                $errors[] = $this->getMessage($this->getMaxNumber());
-            }
-        }
-        return $errors;
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data) {
-        parent::setAllData($data);
-        $this->maxNumber = intval($data['maxnumber']);
-        return $this;
-    }
-
-    /**
-     * Sets a new maximal number of courses that the given user can
-     * register for.
-     *
-     * @param  String userId
-     * @param  Integer maxNumber
-     * @return LimitedAdmission
-     */
-    public function setCustomMaxNumber($userId, $maxNumber)
-    {
-        $stmt = DBManager::get()->prepare("INSERT INTO `userlimits`
-            (`rule_id`, `user_id`, `maxnumber`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `maxnumber`=VALUES(`maxnumber`), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $userId,
-            min($this->maxNumber, $maxNumber), time(), time()]);
-        return $this;
-    }
-
-    /**
-     * Sets a new maximal number of courses for registration of the same user.
-     *
-     * @param  Integer newMaxNumber
-     * @return LimitedAdmission
-     */
-    public function setMaxNumber($newMaxNumber)
-    {
-        $this->maxNumber = $newMaxNumber;
-        return $this;
-    }
-
-    /**
-     * Helper function for storing data to DB.
-     */
-    public function store() {
-        // Store data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `limitedadmissions`
-            (`rule_id`, `message`, `start_time`, `end_time`, `maxnumber`,
-                `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `message`=VALUES(`message`), `start_time`=VALUES(`start_time`),
-            `end_time`=VALUES(`end_time`), `maxnumber`=VALUES(`maxnumber`),
-            `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->message, (int)$this->startTime,
-            (int)$this->endTime, $this->maxNumber, time(), time()]);
-        return $this;
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString() {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if (!$data['maxnumber']) {
-            $errors[] = _('Bitte geben Sie die maximale Anzahl erlaubter Anmeldungen an.');
-        }
-        return $errors;
-    }
-
-    public function getMessage($max_number = null)
-    {
-        $message = parent::getMessage();
-        if (isset($max_number)) {
-            return sprintf($message, $max_number);
-        } else {
-            return $message;
-        }
-    }
-} /* end of class LimitedAdmission */
-
-?>
diff --git a/lib/admissionrules/limitedadmission/LimitedAdmission.php b/lib/admissionrules/limitedadmission/LimitedAdmission.php
new file mode 100644
index 0000000..a193bda
--- /dev/null
+++ b/lib/admissionrules/limitedadmission/LimitedAdmission.php
@@ -0,0 +1,284 @@
+<?php
+
+/**
+ * LimitedAdmission.class.php
+ *
+ * Represents rules for admission to a limited number of courses.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class LimitedAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+
+    /**
+     * Maximal number of courses that a user can register for.
+     */
+    public $maxNumber = 1;
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor.
+     *
+     * @param  String ruleId
+     * @return LimitedAdmission
+     */
+    public function __construct($ruleId='', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+        $this->default_message = _('Sie haben sich bereits zur maximalen Anzahl von %s Veranstaltungen angemeldet.');
+
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('limitedadmissions');
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete() {
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `limitedadmissions`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete all custom max numbers.
+        $stmt = DBManager::get()->prepare("DELETE FROM `userlimits`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Users can specify their own maximal number of courses they want
+     * to be registered for. This method gets the specified value for the
+     * given user or the max number that has been specified  by the rule if no
+     * custom number was set.
+     *
+     * @param  userId
+     * @return Integer
+     */
+    public function getCustomMaxNumber($userId)
+    {
+        // Initially we use the number given per admission rule.
+        $maxNumber = $this->maxNumber;
+        $stmt = DBManager::get()->prepare("SELECT `maxnumber`
+            FROM `userlimits` WHERE rule_id=? AND user_id=?");
+        $stmt->execute([$this->id, $userId]);
+        // The user has given some custom number.
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            // Custom number must be smaller than rule max number.
+            $maxNumber = min($maxNumber, $current['maxnumber']);
+        }
+        return $maxNumber;
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription() {
+        return _("Diese Art von Anmelderegel legt eine Maximalzahl von ".
+            "Veranstaltungen fest, an denen Nutzer im aktuellen ".
+            "Anmeldeset teilnehmen können.");
+    }
+
+    /**
+     * Gets the maximal number of courses that users can be registered for.
+     *
+     * @return Integer
+     */
+    public function getMaxNumber()
+    {
+        return (int)$this->maxNumber;
+    }
+
+    public function getMaxNumberForUser($userId)
+    {
+        return min($this->maxNumber, $this->getCustomMaxNumber($userId));
+    }
+
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName() {
+        return _("Anmeldung zu maximal n Veranstaltungen");
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate() {
+        // Open generic admission rule template.
+        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
+        $tpl->set_attribute('rule', $this);
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        // Now open specific template for this rule and insert base template.
+        $tpl2 = $factory->open('configure');
+        $tpl2->set_attribute('rule', $this);
+        $tpl2->set_attribute('tpl', $tpl->render());
+        return $tpl2->render();
+    }
+
+    /**
+     * Internal helper function for loading rule definition from database.
+     */
+    public function load() {
+        $stmt = DBManager::get()->prepare("SELECT *
+            FROM `limitedadmissions` WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->message = $current['message'];
+            $this->startTime = $current['start_time'];
+            $this->endTime = $current['end_time'];
+            $this->maxNumber = $current['maxnumber'];
+        }
+    }
+
+    /**
+     * Does the current rule allow the given user to register as participant
+     * in the given course? That only happens when the user has no more than
+     * the given number of registrations at the other courses in the course set.
+     *
+     * @param  String userId
+     * @param  String courseId
+     * @return Array Any errors that occurred on admission.
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        $errors = [];
+        // Check for rule validity time frame.
+        if ($this->checkTimeFrame()) {
+            // How many courses from this set has the user already registered for?
+            $db = DBManager::get();
+            $number = $db->fetchColumn("SELECT COUNT(*)
+                FROM `seminar_user` WHERE `user_id`=? AND `status` IN ('user', 'autor') AND `Seminar_id` IN (
+                    SELECT `Seminar_id` FROM `seminar_courseset` WHERE `set_id`=?)", [$userId, $this->courseSetId]);
+            $number += $db->fetchColumn("SELECT COUNT(*)
+                FROM `admission_seminar_user` WHERE `user_id`=? AND `Seminar_id` IN (
+                    SELECT `Seminar_id` FROM `seminar_courseset` WHERE `set_id`=?)", [$userId, $this->courseSetId]);
+            // Check if the number is smaller than admission rule limit
+            if (!($number <
+                    $this->getMaxNumber())) {
+                $errors[] = $this->getMessage($this->getMaxNumber());
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data) {
+        parent::setAllData($data);
+        $this->maxNumber = intval($data['maxnumber']);
+        return $this;
+    }
+
+    /**
+     * Sets a new maximal number of courses that the given user can
+     * register for.
+     *
+     * @param  String userId
+     * @param  Integer maxNumber
+     * @return LimitedAdmission
+     */
+    public function setCustomMaxNumber($userId, $maxNumber)
+    {
+        $stmt = DBManager::get()->prepare("INSERT INTO `userlimits`
+            (`rule_id`, `user_id`, `maxnumber`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `maxnumber`=VALUES(`maxnumber`), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $userId,
+            min($this->maxNumber, $maxNumber), time(), time()]);
+        return $this;
+    }
+
+    /**
+     * Sets a new maximal number of courses for registration of the same user.
+     *
+     * @param  Integer newMaxNumber
+     * @return LimitedAdmission
+     */
+    public function setMaxNumber($newMaxNumber)
+    {
+        $this->maxNumber = $newMaxNumber;
+        return $this;
+    }
+
+    /**
+     * Helper function for storing data to DB.
+     */
+    public function store() {
+        // Store data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `limitedadmissions`
+            (`rule_id`, `message`, `start_time`, `end_time`, `maxnumber`,
+                `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `message`=VALUES(`message`), `start_time`=VALUES(`start_time`),
+            `end_time`=VALUES(`end_time`), `maxnumber`=VALUES(`maxnumber`),
+            `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->message, (int)$this->startTime,
+            (int)$this->endTime, $this->maxNumber, time(), time()]);
+        return $this;
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString() {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if (!$data['maxnumber']) {
+            $errors[] = _('Bitte geben Sie die maximale Anzahl erlaubter Anmeldungen an.');
+        }
+        return $errors;
+    }
+
+    public function getMessage($max_number = null)
+    {
+        $message = parent::getMessage();
+        if (isset($max_number)) {
+            return sprintf($message, $max_number);
+        } else {
+            return $message;
+        }
+    }
+} /* end of class LimitedAdmission */
+
+?>
diff --git a/lib/admissionrules/lockedadmission/LockedAdmission.class.php b/lib/admissionrules/lockedadmission/LockedAdmission.class.php
deleted file mode 100644
index 0ca324b..0000000
--- a/lib/admissionrules/lockedadmission/LockedAdmission.class.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * LockedAdmission.class.php
- * 
- * Represents a rule for completely locking courses for admission.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class LockedAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor.
-     *
-     * @param  String ruleId
-     */
-    public function __construct($ruleId='', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-        $this->default_message = _('Die Anmeldung ist gesperrt.');
-        
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('lockedadmissions');
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete() {
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `lockedadmissions` 
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective 
-     * subclass) does.
-     */
-    public static function getDescription() {
-        return _("Diese Art von Anmelderegel sperrt die Anmeldung ".
-            "zu allen zugehörigen Veranstaltungen, sodass sich niemand ".
-            "eintragen kann.");
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName() {
-        return _("Anmeldung gesperrt");
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     * 
-     * @return String
-     */
-    public function getTemplate() {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        // Now open specific template for this rule and insert base template. 
-        $tpl = $factory->open('configure');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Internal helper function for loading rule definition from database.
-     */
-    public function load() {
-        $stmt = DBManager::get()->prepare("SELECT * FROM `lockedadmissions`
-            WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->message = $current['message'];
-        }
-    }
-
-    /**
-     * Does the current rule allow the given user to register as participant 
-     * in the given course? Never happens here as admission is completely
-     * locked.
-     *
-     * @param  String userId
-     * @param  String courseId
-     * @return Array Any errors that occurred on admission.
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        // YOU CANNOT PASS!
-        return [$this->getMessage()];
-    }
-
-    /**
-     * Helper function for storing data to DB.
-     */
-    public function store() {
-        // Store data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `lockedadmissions`
-            (`rule_id`, `message`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `message`=VALUES(`message`), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->message, time(), time()]);
-        return $this;
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString() {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-} /* end of class LockedAdmission */
-
-?>
diff --git a/lib/admissionrules/lockedadmission/LockedAdmission.php b/lib/admissionrules/lockedadmission/LockedAdmission.php
new file mode 100644
index 0000000..0ca324b
--- /dev/null
+++ b/lib/admissionrules/lockedadmission/LockedAdmission.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * LockedAdmission.class.php
+ * 
+ * Represents a rule for completely locking courses for admission.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class LockedAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor.
+     *
+     * @param  String ruleId
+     */
+    public function __construct($ruleId='', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+        $this->default_message = _('Die Anmeldung ist gesperrt.');
+        
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('lockedadmissions');
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete() {
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `lockedadmissions` 
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective 
+     * subclass) does.
+     */
+    public static function getDescription() {
+        return _("Diese Art von Anmelderegel sperrt die Anmeldung ".
+            "zu allen zugehörigen Veranstaltungen, sodass sich niemand ".
+            "eintragen kann.");
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName() {
+        return _("Anmeldung gesperrt");
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     * 
+     * @return String
+     */
+    public function getTemplate() {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        // Now open specific template for this rule and insert base template. 
+        $tpl = $factory->open('configure');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Internal helper function for loading rule definition from database.
+     */
+    public function load() {
+        $stmt = DBManager::get()->prepare("SELECT * FROM `lockedadmissions`
+            WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->message = $current['message'];
+        }
+    }
+
+    /**
+     * Does the current rule allow the given user to register as participant 
+     * in the given course? Never happens here as admission is completely
+     * locked.
+     *
+     * @param  String userId
+     * @param  String courseId
+     * @return Array Any errors that occurred on admission.
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        // YOU CANNOT PASS!
+        return [$this->getMessage()];
+    }
+
+    /**
+     * Helper function for storing data to DB.
+     */
+    public function store() {
+        // Store data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `lockedadmissions`
+            (`rule_id`, `message`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `message`=VALUES(`message`), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->message, time(), time()]);
+        return $this;
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString() {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+} /* end of class LockedAdmission */
+
+?>
diff --git a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php
deleted file mode 100644
index 28a910d..0000000
--- a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-/**
- * ParticipantRestrictedAdmission.class.php
- *
- * Specifies restricted number of participants for course admission.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class ParticipantRestrictedAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * Timestamp for execution of seat distribution algorithm
-     */
-    public $distributionTime = null;
-
-    public $first_come_first_served_allowed = false;
-
-    public $minimum_timespan_to_distribution_time = 120;
-
-    public $prio_exists = false;
-
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor
-     *
-     * @param  String $ruleId
-     * @param  String $courseSetId
-     */
-    public function __construct($ruleId = '', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-        $this->first_come_first_served_allowed = (bool)Config::get()->ENABLE_COURSESET_FCFS;
-        $this->default_message = _('Es stehen keine weiteren Plätze zur Verfügung.');
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('participantrestrictedadmissions');
-        }
-    }
-
-    public function isFCFSallowed()
-    {
-        return $this->first_come_first_served_allowed;
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete()
-    {
-        if ($this->prio_exists) {
-            $set_id = DBManager::get()->fetchColumn("SELECT set_id FROM courseset_rule WHERE rule_id = ? LIMIT 1", [$this->id]);
-            //Delete priorities
-            AdmissionPriority::unsetAllPriorities($set_id);
-        }
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `participantrestrictedadmissions`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription()
-    {
-        return _("Anmelderegeln dieses Typs legen fest, ob die zugeordneten Veranstaltungen eine maximale Teilnehmendenanzahl haben. Die Platzverteilung erfolgt automatisiert.");
-    }
-
-    /**
-     * Gets the time for seat distribution algorithm.
-     *
-     * @return int
-     */
-    public function getDistributionTime()
-    {
-        return $this->distributionTime;
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName()
-    {
-        return _("Beschränkte Teilnehmendenanzahl");
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate()
-    {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        // Open specific template for this rule and insert base template.
-        $tpl = $factory->open('configure');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Helper function for loading rule definition from database.
-     */
-    public function load()
-    {
-        // Load data.
-        $stmt = DBManager::get()->prepare("SELECT *
-            FROM `participantrestrictedadmissions` WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->message = $current['message'];
-            $this->distributionTime = $current['distribution_time'];
-            if ($current['distribution_time'] > 0) {
-                $this->prio_exists = DBManager::get()->fetchColumn("SELECT 1 FROM courseset_rule INNER JOIN priorities USING(set_id) WHERE rule_id = ? LIMIT 1", [$this->id]);
-            }
-        }
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data)
-    {
-        parent::setAllData($data);
-        if (!empty($data['distributiondate'])) {
-            if (!$data['distributiontime']) {
-                $data['distributiontime'] = '23:59';
-            }
-            $ddate = strtotime($data['distributiondate'] . ' ' . $data['distributiontime']);
-            $this->setDistributionTime($ddate);
-        }
-        if (!empty($data['enable_FCFS'])) {
-            $this->setDistributionTime(0);
-        }
-        if (!empty($data['startdate'])) {
-             $starttime = strtotime($data['startdate'] . ' ' . $data['starttime']);
-             if ($starttime > time()) {
-                 $this->minimum_timespan_to_distribution_time = $this->minimum_timespan_to_distribution_time + (($starttime - time()) / 60);
-             }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a new timestamp for seat distribution algorithm execution.
-     *
-     * @param  int $newDistributionTime
-     * @return ParticipantRestrictedAdmission
-     */
-    public function setDistributionTime($newDistributionTime)
-    {
-        $this->distributionTime = $newDistributionTime;
-        return $this;
-    }
-
-
-    /**
-     * Store rule definition to database.
-     */
-    public function store()
-    {
-        // Store data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `participantrestrictedadmissions`
-            (`rule_id`, `message`, `distribution_time`,
-             `mkdate`, `chdate`) VALUES (?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE
-            `distribution_time`=VALUES(`distribution_time`),
-             message=VALUES(message), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, (string)$this->message,
-            (int)$this->distributionTime, time(), time()]);
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString()
-    {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array $data Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if (!$data['distributiontime']) {
-            $data['distributiontime'] = '23:59';
-        }
-        $ddate = strtotime($data['distributiondate'] . ' ' . $data['distributiontime']);
-        if (empty($data['enable_FCFS']) && (empty($data['distributiondate']) || $ddate < (time() + $this->minimum_timespan_to_distribution_time * 60))) {
-            $errors[] = sprintf(_('Bitte geben Sie für die Platzverteilung ein Datum an, das weiter in der Zukunft liegt. Das frühestmögliche Datum ist %s.'), strftime('%x %R', time() + $this->minimum_timespan_to_distribution_time*60));
-        }
-        if (!empty($data['enable_FCFS']) && $data['distributiondate']) {
-            $errors[] = _('Sie können kein Datum für die automatische Platzverteilung einstellen und gleichzeitig die automatische Platzverteilung ausschalten.');
-        }
-        return $errors;
-    }
-}
diff --git a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
new file mode 100644
index 0000000..28a910d
--- /dev/null
+++ b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
@@ -0,0 +1,230 @@
+<?php
+
+/**
+ * ParticipantRestrictedAdmission.class.php
+ *
+ * Specifies restricted number of participants for course admission.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class ParticipantRestrictedAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * Timestamp for execution of seat distribution algorithm
+     */
+    public $distributionTime = null;
+
+    public $first_come_first_served_allowed = false;
+
+    public $minimum_timespan_to_distribution_time = 120;
+
+    public $prio_exists = false;
+
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor
+     *
+     * @param  String $ruleId
+     * @param  String $courseSetId
+     */
+    public function __construct($ruleId = '', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+        $this->first_come_first_served_allowed = (bool)Config::get()->ENABLE_COURSESET_FCFS;
+        $this->default_message = _('Es stehen keine weiteren Plätze zur Verfügung.');
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('participantrestrictedadmissions');
+        }
+    }
+
+    public function isFCFSallowed()
+    {
+        return $this->first_come_first_served_allowed;
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete()
+    {
+        if ($this->prio_exists) {
+            $set_id = DBManager::get()->fetchColumn("SELECT set_id FROM courseset_rule WHERE rule_id = ? LIMIT 1", [$this->id]);
+            //Delete priorities
+            AdmissionPriority::unsetAllPriorities($set_id);
+        }
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `participantrestrictedadmissions`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription()
+    {
+        return _("Anmelderegeln dieses Typs legen fest, ob die zugeordneten Veranstaltungen eine maximale Teilnehmendenanzahl haben. Die Platzverteilung erfolgt automatisiert.");
+    }
+
+    /**
+     * Gets the time for seat distribution algorithm.
+     *
+     * @return int
+     */
+    public function getDistributionTime()
+    {
+        return $this->distributionTime;
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName()
+    {
+        return _("Beschränkte Teilnehmendenanzahl");
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate()
+    {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        // Open specific template for this rule and insert base template.
+        $tpl = $factory->open('configure');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Helper function for loading rule definition from database.
+     */
+    public function load()
+    {
+        // Load data.
+        $stmt = DBManager::get()->prepare("SELECT *
+            FROM `participantrestrictedadmissions` WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->message = $current['message'];
+            $this->distributionTime = $current['distribution_time'];
+            if ($current['distribution_time'] > 0) {
+                $this->prio_exists = DBManager::get()->fetchColumn("SELECT 1 FROM courseset_rule INNER JOIN priorities USING(set_id) WHERE rule_id = ? LIMIT 1", [$this->id]);
+            }
+        }
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data)
+    {
+        parent::setAllData($data);
+        if (!empty($data['distributiondate'])) {
+            if (!$data['distributiontime']) {
+                $data['distributiontime'] = '23:59';
+            }
+            $ddate = strtotime($data['distributiondate'] . ' ' . $data['distributiontime']);
+            $this->setDistributionTime($ddate);
+        }
+        if (!empty($data['enable_FCFS'])) {
+            $this->setDistributionTime(0);
+        }
+        if (!empty($data['startdate'])) {
+             $starttime = strtotime($data['startdate'] . ' ' . $data['starttime']);
+             if ($starttime > time()) {
+                 $this->minimum_timespan_to_distribution_time = $this->minimum_timespan_to_distribution_time + (($starttime - time()) / 60);
+             }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets a new timestamp for seat distribution algorithm execution.
+     *
+     * @param  int $newDistributionTime
+     * @return ParticipantRestrictedAdmission
+     */
+    public function setDistributionTime($newDistributionTime)
+    {
+        $this->distributionTime = $newDistributionTime;
+        return $this;
+    }
+
+
+    /**
+     * Store rule definition to database.
+     */
+    public function store()
+    {
+        // Store data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `participantrestrictedadmissions`
+            (`rule_id`, `message`, `distribution_time`,
+             `mkdate`, `chdate`) VALUES (?, ?, ?, ?, ?)
+            ON DUPLICATE KEY UPDATE
+            `distribution_time`=VALUES(`distribution_time`),
+             message=VALUES(message), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, (string)$this->message,
+            (int)$this->distributionTime, time(), time()]);
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString()
+    {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array $data Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if (!$data['distributiontime']) {
+            $data['distributiontime'] = '23:59';
+        }
+        $ddate = strtotime($data['distributiondate'] . ' ' . $data['distributiontime']);
+        if (empty($data['enable_FCFS']) && (empty($data['distributiondate']) || $ddate < (time() + $this->minimum_timespan_to_distribution_time * 60))) {
+            $errors[] = sprintf(_('Bitte geben Sie für die Platzverteilung ein Datum an, das weiter in der Zukunft liegt. Das frühestmögliche Datum ist %s.'), strftime('%x %R', time() + $this->minimum_timespan_to_distribution_time*60));
+        }
+        if (!empty($data['enable_FCFS']) && $data['distributiondate']) {
+            $errors[] = _('Sie können kein Datum für die automatische Platzverteilung einstellen und gleichzeitig die automatische Platzverteilung ausschalten.');
+        }
+        return $errors;
+    }
+}
diff --git a/lib/admissionrules/passwordadmission/PasswordAdmission.class.php b/lib/admissionrules/passwordadmission/PasswordAdmission.class.php
deleted file mode 100644
index 0650630..0000000
--- a/lib/admissionrules/passwordadmission/PasswordAdmission.class.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-/**
- * PasswordAdmission.class.php
- *
- * Represents a rule for course access with a given password.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-require_once 'vendor/phpass/PasswordHash.php';
-
-class PasswordAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-    /*
-     * Password hasher (phpass library)
-     */
-    public $hasher = null;
-
-    /*
-     * Crypted password.
-     */
-    public $password = '';
-
-    // --- OPERATIONS ---
-
-    public $new = false;
-    /**
-     * Standard constructor.
-     *
-     * @param  String ruleId
-     */
-    public function __construct($ruleId='', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-        $this->default_message = _('Das eingegebene Passwort ist falsch.');
-        // Create a new bcrypt password hasher (exclude weaker algorithms).
-        $this->hasher = new PasswordHash(8, false);
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('passwordadmissions');
-            $this->new = true;
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete() {
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `passwordadmissions`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription() {
-        return _("Mit dieser Anmelderegel können Sie ein Passwort für Zugang ".
-            "zu den zugeordneten Veranstaltungen vergeben. Die Anmeldung ist ".
-            "dann nur für Personen möglich, die dieses Passwort kennen.");
-    }
-
-    /**
-     * Shows an input form where the user can enter a password and try to get
-     * past the holy gates.
-     *
-     * @return String A template-based input form.
-     */
-    public function getInput() {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        $tpl = $factory->open('input');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName() {
-        return _("Anmeldung mit Passwort");
-    }
-
-    /**
-     * Gets the bcrypted hash of the current password.
-     *
-     * @return String
-     */
-    public function getPassword() {
-        return $this->password;
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate() {
-        // Open generic admission rule template.
-        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
-        $tpl->set_attribute('rule', $this);
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        // Now open specific template for this rule and insert base template.
-        $tpl2 = $factory->open('configure');
-        $tpl2->set_attribute('rule', $this);
-        $tpl2->set_attribute('tpl', $tpl->render());
-        return $tpl2->render();
-    }
-
-    /**
-     * Internal helper function for loading rule definition from database.
-     */
-    public function load() {
-        $stmt = DBManager::get()->prepare("SELECT * FROM `passwordadmissions`
-            WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->message = $current['message'];
-            $this->startTime = $current['start_time'];
-            $this->endTime = $current['end_time'];
-            $this->password = $current['password'];
-        }
-    }
-
-    /**
-     * Does the current rule allow the given user to register as participant
-     * in the given course? Here, a given password (via the getInput method) is
-     * compared to the stored encrypted one.
-     *
-     * @param  String userId
-     * @param  String courseId
-     * @return array
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        $errors = [];
-        if ($this->checkTimeFrame()) {
-            if (Request::get('pwarule_password') === null) {
-                $errors[] = _('Die Eingabe eines Passwortes ist erforderlich.');
-            } else {
-                CSRFProtection::verifyUnsafeRequest();
-                $pwcheck = $this->hasher->CheckPassword(Request::get('pwarule_password'),
-                        $this->getPassword());
-                //migrated passwords
-                $pwcheck_m = $this->hasher->CheckPassword(md5(Request::get('pwarule_password')),
-                        $this->getPassword());
-                if (!($pwcheck || $pwcheck_m)) {
-                    $errors[] = $this->getMessage();
-                }
-            }
-        }
-        return $errors;
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data) {
-        parent::setAllData($data);
-        if ($this->new || $data['password1'] !== '') {
-            $this->setPassword($data['password1']);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the password by bcrypting the given clear text password.
-     *
-     * @param  String $clearText The clear text password to be set.
-     * @return PasswordAdmission
-     */
-    public function setPassword($clearText) {
-        $this->password = $this->hasher->HashPassword($clearText);
-        return $this;
-    }
-
-    /**
-     * Helper function for storing data to DB.
-     */
-    public function store() {
-        // Store data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `passwordadmissions`
-            (`rule_id`, `message`, `start_time`, `end_time`, `password`,
-                `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `message`=VALUES(`message`), `start_time`=VALUES(`start_time`),
-            `end_time`=VALUES(`end_time`), `password`=VALUES(`password`),
-            `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->message, (int)$this->startTime, (int)$this->endTime, $this->password,
-            time(), time()]);
-        return $this;
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString() {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if ($data['password1'] === '' && $this->new) {
-            $errors[] = _('Das Passwort darf nicht leer sein.');
-        }
-        if ($data['password1'] !== $data['password2']) {
-            $errors[] = _('Das Passwort stimmt nicht mit der Wiederholung überein.');
-        }
-        return $errors;
-    }
-}
diff --git a/lib/admissionrules/passwordadmission/PasswordAdmission.php b/lib/admissionrules/passwordadmission/PasswordAdmission.php
new file mode 100644
index 0000000..0650630
--- /dev/null
+++ b/lib/admissionrules/passwordadmission/PasswordAdmission.php
@@ -0,0 +1,241 @@
+<?php
+
+/**
+ * PasswordAdmission.class.php
+ *
+ * Represents a rule for course access with a given password.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+require_once 'vendor/phpass/PasswordHash.php';
+
+class PasswordAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+    /*
+     * Password hasher (phpass library)
+     */
+    public $hasher = null;
+
+    /*
+     * Crypted password.
+     */
+    public $password = '';
+
+    // --- OPERATIONS ---
+
+    public $new = false;
+    /**
+     * Standard constructor.
+     *
+     * @param  String ruleId
+     */
+    public function __construct($ruleId='', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+        $this->default_message = _('Das eingegebene Passwort ist falsch.');
+        // Create a new bcrypt password hasher (exclude weaker algorithms).
+        $this->hasher = new PasswordHash(8, false);
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('passwordadmissions');
+            $this->new = true;
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete() {
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `passwordadmissions`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription() {
+        return _("Mit dieser Anmelderegel können Sie ein Passwort für Zugang ".
+            "zu den zugeordneten Veranstaltungen vergeben. Die Anmeldung ist ".
+            "dann nur für Personen möglich, die dieses Passwort kennen.");
+    }
+
+    /**
+     * Shows an input form where the user can enter a password and try to get
+     * past the holy gates.
+     *
+     * @return String A template-based input form.
+     */
+    public function getInput() {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        $tpl = $factory->open('input');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName() {
+        return _("Anmeldung mit Passwort");
+    }
+
+    /**
+     * Gets the bcrypted hash of the current password.
+     *
+     * @return String
+     */
+    public function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate() {
+        // Open generic admission rule template.
+        $tpl = $GLOBALS['template_factory']->open('admission/rules/configure');
+        $tpl->set_attribute('rule', $this);
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        // Now open specific template for this rule and insert base template.
+        $tpl2 = $factory->open('configure');
+        $tpl2->set_attribute('rule', $this);
+        $tpl2->set_attribute('tpl', $tpl->render());
+        return $tpl2->render();
+    }
+
+    /**
+     * Internal helper function for loading rule definition from database.
+     */
+    public function load() {
+        $stmt = DBManager::get()->prepare("SELECT * FROM `passwordadmissions`
+            WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->message = $current['message'];
+            $this->startTime = $current['start_time'];
+            $this->endTime = $current['end_time'];
+            $this->password = $current['password'];
+        }
+    }
+
+    /**
+     * Does the current rule allow the given user to register as participant
+     * in the given course? Here, a given password (via the getInput method) is
+     * compared to the stored encrypted one.
+     *
+     * @param  String userId
+     * @param  String courseId
+     * @return array
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        $errors = [];
+        if ($this->checkTimeFrame()) {
+            if (Request::get('pwarule_password') === null) {
+                $errors[] = _('Die Eingabe eines Passwortes ist erforderlich.');
+            } else {
+                CSRFProtection::verifyUnsafeRequest();
+                $pwcheck = $this->hasher->CheckPassword(Request::get('pwarule_password'),
+                        $this->getPassword());
+                //migrated passwords
+                $pwcheck_m = $this->hasher->CheckPassword(md5(Request::get('pwarule_password')),
+                        $this->getPassword());
+                if (!($pwcheck || $pwcheck_m)) {
+                    $errors[] = $this->getMessage();
+                }
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data) {
+        parent::setAllData($data);
+        if ($this->new || $data['password1'] !== '') {
+            $this->setPassword($data['password1']);
+        }
+        return $this;
+    }
+
+    /**
+     * Sets the password by bcrypting the given clear text password.
+     *
+     * @param  String $clearText The clear text password to be set.
+     * @return PasswordAdmission
+     */
+    public function setPassword($clearText) {
+        $this->password = $this->hasher->HashPassword($clearText);
+        return $this;
+    }
+
+    /**
+     * Helper function for storing data to DB.
+     */
+    public function store() {
+        // Store data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `passwordadmissions`
+            (`rule_id`, `message`, `start_time`, `end_time`, `password`,
+                `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `message`=VALUES(`message`), `start_time`=VALUES(`start_time`),
+            `end_time`=VALUES(`end_time`), `password`=VALUES(`password`),
+            `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->message, (int)$this->startTime, (int)$this->endTime, $this->password,
+            time(), time()]);
+        return $this;
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString() {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if ($data['password1'] === '' && $this->new) {
+            $errors[] = _('Das Passwort darf nicht leer sein.');
+        }
+        if ($data['password1'] !== $data['password2']) {
+            $errors[] = _('Das Passwort stimmt nicht mit der Wiederholung überein.');
+        }
+        return $errors;
+    }
+}
diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
deleted file mode 100644
index bee3e19..0000000
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-
-/**
- * PreferentialAdmission.class.php
- *
- * An admission rule that favors selected courses of study or semesters of study.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-require_once('lib/classes/admission/AdmissionRule.class.php');
-require_once('lib/classes/admission/UserFilter.class.php');
-
-class PreferentialAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * Stores IDs of userlists generated for representing the selected
-     * conditions. These lists are created on seat distribution in the course
-     * set and are deleted immediately after.
-     */
-    public $userlists = [];
-
-    /**
-     * Conditions for selecting the favored people in seat distribution.
-     */
-    public $conditions = [];
-
-    /**
-     * Should higher semesters of study be favored?
-     */
-    public $favorSemester = false;
-
-    /**
-     * If semesters are favored, which bonus difference shall be set between
-     * each semester of study?
-     */
-    public $bonus_difference = 100;
-
-    /**
-     * The courseset this rule belongs to.
-     */
-    public $courseset = null;
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor.
-     *
-     * @param  String ruleId If this rule has been saved previously, it
-     *      will be loaded from database.
-     * @return AdmissionRule the current object (this).
-     */
-    public function __construct($ruleId='')
-    {
-        $this->id = $ruleId;
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('prefadmissions');
-        }
-    }
-
-    /**
-     * Adds a new UserFilter to this rule.
-     *
-     * @param  UserFilter condition
-     * @return PreferentialAdmission
-     */
-    public function addCondition($condition)
-    {
-        $this->conditions[$condition->getId()] = $condition;
-        return $this;
-    }
-
-    /**
-     * Hook that can be called after the seat distribution on the courseset
-     * has completed. User lists that were generated before are removed now.
-     */
-    public function afterSeatDistribution($courseset)
-    {
-        foreach ($this->userlists as $id) {
-            $current = new AdmissionUserList($id);
-            $courseset->removeUserList($id);
-            $current->delete();
-        }
-    }
-
-    /**
-     * Hook that can be called when the seat distribution on the courseset
-     * starts. This type of admission rule gets all users that fulfill the
-     * specified conditions and generates user lists with modified chances
-     * in seat distribution.
-     *
-     * @param CourseSet The courseset this rule belongs to.
-     */
-    public function beforeSeatDistribution($courseset)
-    {
-        $this->courseset = $courseset;
-        /*
-         * First, we need to calculate the maximum of persons applying
-         * for a single course as that number will influence the numbers
-         * to set for preferation.
-         */
-        $this->bonus_difference = DBManager::get()->fetchColumn("SELECT MAX(users) FROM (
-                SELECT `priority`, COUNT(DISTINCT `user_id`) AS users
-                FROM `priorities`
-                WHERE `set_id` = ?
-                GROUP BY `priority`
-            ) t", [$courseset->getId()]);
-        $users = $this->getAffectedUsers();
-
-        // No study semester variation, just put all users together.
-        if (!$this->favorSemester) {
-
-            $userlist = new AdmissionUserList();
-            $userlist->setUsers($users)->setFactor($this->bonus_difference + 1)->store();
-            $this->userlists[] = $userlist->getId();
-            $courseset->addUserList($userlist->getId());
-
-        // Study semesters need to be considered for differentiation...
-        } else {
-            /*
-             * Build data grouped by semester of study for users affected
-             * by given conditions.
-             */
-            if ($this->conditions) {
-                $grouped = $this->getSemesterGroups($users, true);
-
-                /*
-                 * Build data grouped by semester of study for all users
-                 * (excluding all users affected by given conditions).
-                 */
-                $rest = $this->getSemesterGroups(
-                    array_keys(AdmissionPriority::getPriorities($courseset->getId())),
-                    false, $users);
-
-                /*
-                 * Now set bonus factors to higher semesters. We are processing
-                 * users not affected by conditions first so that we get the
-                 * maximum bonus these users get and can build on top of that
-                 * for users affected by conditions.
-                 */
-                $maxbonus = $this->setSemesterBonus($courseset, $rest);
-
-                /*
-                 * Finally, set bonuses for the users affected by conditions.
-                 */
-                $endbonus = $this->setSemesterBonus($courseset, $grouped, $maxbonus + 1);
-            /*
-             * No conditions given, just group all users
-             * by their semester of study.
-             */
-            } else {
-                // Build list of users by semester of study.
-                $grouped = $this->getSemesterGroups(
-                    array_keys(AdmissionPriority::getPriorities($courseset->getId())),
-                    false);
-
-                // Assign corresponding bonus to users.
-                $maxbonus = $this->setSemesterBonus($courseset, $grouped);
-            }
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete()
-    {
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `prefadmissions`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete all associated conditions...
-        foreach ($this->conditions as $condition) {
-            $condition->delete();
-        }
-        // ... and their connection to this rule.
-        $stmt = DBManager::get()->prepare("DELETE FROM `prefadmission_condition`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Gets all users that are matched by thís rule.
-     *
-     * @return Array An array containing IDs of users who are matched by
-     *      this rule.
-     */
-    public function getAffectedUsers()
-    {
-        $users = [];
-        if ($this->conditions) {
-            // Get users from all specified conditions.
-            foreach ($this->conditions as $condition) {
-                $users = array_unique(array_merge($users, $condition->getUsers()));
-            }
-        } else {
-            $users = array_keys(AdmissionPriority::getPriorities($this->courseset->getId()));
-        }
-        return $users;
-    }
-
-    /**
-     * Gets all defined conditions.
-     *
-     * @return Array
-     */
-    public function getConditions()
-    {
-        return $this->conditions;
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription()
-    {
-        return _('Sie können hier festlegen, dass bestimmte Studiengänge, '.
-            'Fachsemester etc. bei der Platzverteilung zu Veranstaltungen '.
-            'bevorzugt behandelt werden sollen.');
-    }
-
-    /**
-     * Returns whether higher semesters of study should be favored.
-     *
-     * @return bool
-     */
-    public function getFavorSemester()
-    {
-        return $this->favorSemester;
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName()
-    {
-        return _('Bevorzugte Anmeldung');
-    }
-
-    /**
-     * Gets the semesters of study for the given users. If conditions are
-     * set and should be considered, only the semesters of study belonging
-     * to the given conditions are set.
-     *
-     * @param $users user IDs to process
-     * @param $considerConditions should only the semesters of study belonging
-     *                            to given conditions be considered?
-     * @param array $exclude user IDs to exclude
-     * @return array Users with their maximal semester of study.
-     */
-    public function getSemesterGroups($users, $considerConditions, $exclude = [])
-    {
-        /*
-         * Get all selected condition values so that the study semester
-         * can be matched against that data; we don't want some "general"
-         * value for a user's study semester, but the one that is assigned
-         * to a given subject and degree.
-         */
-        $queryParts = [];
-        $values = [$users];
-        if ($exclude) {
-            $values[] = $exclude;
-        }
-        if ($considerConditions) {
-            foreach ($this->conditions as $condition) {
-                $queryPart = "";
-                // Search for subject and degree entries.
-                foreach ($condition->getFields() as $field) {
-                    switch (get_class($field)) {
-                        case 'DegreeCondition':
-                            if ($queryPart) {
-                                $queryPart .= " AND ";
-                            }
-                            $queryPart .= "`abschluss_id`".$field->getCompareOperator()."?";
-                            $values[] = $field->getValue() ?: '';
-                            break;
-                        case 'SubjectCondition':
-                            if ($queryPart) {
-                                $queryPart .= " AND ";
-                            }
-                            $queryPart .= "`fach_id`".$field->getCompareOperator()."?";
-                            $values[] = $field->getValue() ?: '';
-                            break;
-                        case 'SemesterOfStudyCondition':
-                            if ($queryPart) {
-                                $queryPart .= " AND ";
-                            }
-                            $queryPart .= "`semester`".$field->getCompareOperator()."?";
-                            $values[] = $field->getValue() ?: '';
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                if ($queryPart) {
-                    $queryParts[] = $queryPart;
-                }
-            }
-        }
-        // Build SQL query with affected users and selected subjects and degrees.
-        $query = "SELECT `user_id`, MAX(`semester`) AS semester
-                FROM `user_studiengang`
-                WHERE `user_id` IN (?)";
-        if ($exclude) {
-            $query .= " AND `user_id` NOT IN (?)";
-        }
-        if ($queryParts) {
-            $query .= " AND ((".implode(") OR (", $queryParts)."))";
-        }
-        $query .= " GROUP BY `user_id` ORDER BY `semester`, `user_id`";
-        $groups = [];
-        foreach (DBManager::get()->fetchAll($query, $values) as $entry) {
-            if (intval($entry['semester'])) {
-                $groups[intval($entry['semester'])][] = $entry['user_id'];
-            }
-        }
-        ksort($groups);
-        return $groups;
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate()
-    {
-        $factory = new Flexi\Factory(__DIR__.'/templates/');
-        // Now open specific template for this rule and insert base template.
-        $tpl = $factory->open('configure');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Helper function for loading data from DB. Generic AdmissionRule data is
-     * loaded with the parent load() method.
-     */
-    public function load()
-    {
-        // Load basic data.
-        $stmt = DBManager::get()->prepare("SELECT *
-            FROM `prefadmissions` WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->favorSemester = $current['favor_semester'];
-            // Retrieve conditions.
-            $stmt = DBManager::get()->prepare("SELECT *
-                FROM `prefadmission_condition` WHERE `rule_id`=?");
-            $stmt->execute([$this->id]);
-            $conditions = $stmt->fetchAll(PDO::FETCH_ASSOC);
-            foreach ($conditions as $condition) {
-                $currentCondition = new UserFilter($condition['condition_id']);
-                $this->conditions[$condition['condition_id']] = $currentCondition;
-            }
-        }
-    }
-
-    /**
-     * Removes the condition with the given ID from the rule.
-     *
-     * @param  String conditionId
-     * @return PreferentialAdmission
-     */
-    public function removeCondition($conditionId)
-    {
-        $this->conditions[$conditionId]->delete();
-        unset($this->conditions[$conditionId]);
-        return $this;
-    }
-
-    /**
-     * Admission is open for everyone. On seat distribution, the rule conditions
-     * will be used to generate user lists with the specified chance.
-     *
-     * @param String $userId
-     * @param String $courseId
-     * @return Array Is the user allowed to register or are there any errors?
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        return [];
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data)
-    {
-        UserFilterField::getAvailableFilterFields();
-        parent::setAllData($data);
-        $this->favorSemester = (bool) $data['favor_semester'];
-        $this->conditions = [];
-        if ($data['conditions']) {
-            foreach ($data['conditions'] as $condition) {
-                $this->addCondition(ObjectBuilder::build($condition, 'UserFilter'));
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * New setting for favoring higher semesters of study.
-     *
-     * @param  bool $newFavorSemester
-     * @return PreferentialAdmission
-     */
-    public function setFavorSemester($newFavorSemester) {
-        $this->favorSemester = $newFavorSemester;
-        return $this;
-    }
-
-    /**
-     * Create user lists and set bonus corresponding to
-     * the maximal available semester of study for given users.
-     *
-     * @param $courseset CourseSet to add user lists to
-     * @param $grouped associative array of users in the form
-     *               <semester> => array(<user_id1>, <user_id2, ...))
-     * @param $baseBonus basic bonus to start with, defaults to 0.
-     */
-    public function setSemesterBonus($courseset, $grouped, $baseBonus = 1)
-    {
-        // Create user lists from each semester group.
-        $bonus = $baseBonus;
-        foreach ($grouped as $semester => $members) {
-            $userlist = new AdmissionUserList();
-            $userlist->setUsers($members);
-            $userlist->setFactor($bonus);
-            $userlist->store();
-            $bonus = $bonus + ($this->bonus_difference + 1);
-            $courseset->addUserList($userlist->getId());
-            $this->userlists[] = $userlist->getId();
-        }
-        return $bonus;
-    }
-
-    /**
-     * Helper function for storing data to DB.
-     */
-    public function store()
-    {
-        // Store rule data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `prefadmissions`
-            (`rule_id`, `favor_semester`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `favor_semester`=VALUES(`favor_semester`),
-            `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->favorSemester, time(), time()]);
-        // Delete removed conditions from DB.
-        $entries = DBManager::get()->fetchAll("SELECT `condition_id` FROM
-            `prefadmission_condition` WHERE `rule_id`=? AND `condition_id` NOT IN (?)",
-            [$this->id, array_keys($this->conditions)]);
-        foreach ($entries as $entry) {
-            $current = new UserFilter($entry['condition_id']);
-            $current->delete();
-        }
-        DBManager::get()->execute("DELETE FROM `prefadmission_condition`
-            WHERE `rule_id`=? AND `condition_id` NOT IN (?)", [$this->id, array_keys($this->conditions)]);
-        // Store all conditions.
-        $queries = [];
-        $parameters = [];
-        if ($this->conditions) {
-            foreach ($this->conditions as $condition) {
-                // Store each condition...
-                $condition->store();
-                $queries[] = "(?, ?, ?)";
-                $parameters[] = $this->id;
-                $parameters[] = $condition->getId();
-                $parameters[] = time();
-            }
-            // Store all assignments between rule and condition.
-            $stmt = DBManager::get()->execute("INSERT INTO `prefadmission_condition`
-                (`rule_id`, `condition_id`, `mkdate`)
-                VALUES ".implode(",", $queries)." ON DUPLICATE KEY UPDATE
-                `condition_id`=VALUES(`condition_id`)", $parameters);
-        }
-        return $this;
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString()
-    {
-        $factory = new Flexi\Factory(__DIR__.'/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if (!$data['conditions'] && !$data['favor_semester']) {
-            $errors[] = _('Es muss mindestens eine Auswahlbedingung angegeben werden.');
-        }
-        return $errors;
-    }
-
-    public function __clone()
-    {
-        $this->id = md5(uniqid(get_class($this)));
-        $this->courseSetId = null;
-        $cloned_conditions = [];
-        foreach ($this->conditions as $condition) {
-            $dolly = clone $condition;
-            $cloned_conditions[$dolly->id] = $dolly;
-        }
-        $this->conditions = $cloned_conditions;
-    }
-
-} /* end of class PreferentialAdmission */
diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
new file mode 100644
index 0000000..bee3e19
--- /dev/null
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
@@ -0,0 +1,540 @@
+<?php
+
+/**
+ * PreferentialAdmission.class.php
+ *
+ * An admission rule that favors selected courses of study or semesters of study.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+require_once('lib/classes/admission/AdmissionRule.class.php');
+require_once('lib/classes/admission/UserFilter.class.php');
+
+class PreferentialAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * Stores IDs of userlists generated for representing the selected
+     * conditions. These lists are created on seat distribution in the course
+     * set and are deleted immediately after.
+     */
+    public $userlists = [];
+
+    /**
+     * Conditions for selecting the favored people in seat distribution.
+     */
+    public $conditions = [];
+
+    /**
+     * Should higher semesters of study be favored?
+     */
+    public $favorSemester = false;
+
+    /**
+     * If semesters are favored, which bonus difference shall be set between
+     * each semester of study?
+     */
+    public $bonus_difference = 100;
+
+    /**
+     * The courseset this rule belongs to.
+     */
+    public $courseset = null;
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor.
+     *
+     * @param  String ruleId If this rule has been saved previously, it
+     *      will be loaded from database.
+     * @return AdmissionRule the current object (this).
+     */
+    public function __construct($ruleId='')
+    {
+        $this->id = $ruleId;
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('prefadmissions');
+        }
+    }
+
+    /**
+     * Adds a new UserFilter to this rule.
+     *
+     * @param  UserFilter condition
+     * @return PreferentialAdmission
+     */
+    public function addCondition($condition)
+    {
+        $this->conditions[$condition->getId()] = $condition;
+        return $this;
+    }
+
+    /**
+     * Hook that can be called after the seat distribution on the courseset
+     * has completed. User lists that were generated before are removed now.
+     */
+    public function afterSeatDistribution($courseset)
+    {
+        foreach ($this->userlists as $id) {
+            $current = new AdmissionUserList($id);
+            $courseset->removeUserList($id);
+            $current->delete();
+        }
+    }
+
+    /**
+     * Hook that can be called when the seat distribution on the courseset
+     * starts. This type of admission rule gets all users that fulfill the
+     * specified conditions and generates user lists with modified chances
+     * in seat distribution.
+     *
+     * @param CourseSet The courseset this rule belongs to.
+     */
+    public function beforeSeatDistribution($courseset)
+    {
+        $this->courseset = $courseset;
+        /*
+         * First, we need to calculate the maximum of persons applying
+         * for a single course as that number will influence the numbers
+         * to set for preferation.
+         */
+        $this->bonus_difference = DBManager::get()->fetchColumn("SELECT MAX(users) FROM (
+                SELECT `priority`, COUNT(DISTINCT `user_id`) AS users
+                FROM `priorities`
+                WHERE `set_id` = ?
+                GROUP BY `priority`
+            ) t", [$courseset->getId()]);
+        $users = $this->getAffectedUsers();
+
+        // No study semester variation, just put all users together.
+        if (!$this->favorSemester) {
+
+            $userlist = new AdmissionUserList();
+            $userlist->setUsers($users)->setFactor($this->bonus_difference + 1)->store();
+            $this->userlists[] = $userlist->getId();
+            $courseset->addUserList($userlist->getId());
+
+        // Study semesters need to be considered for differentiation...
+        } else {
+            /*
+             * Build data grouped by semester of study for users affected
+             * by given conditions.
+             */
+            if ($this->conditions) {
+                $grouped = $this->getSemesterGroups($users, true);
+
+                /*
+                 * Build data grouped by semester of study for all users
+                 * (excluding all users affected by given conditions).
+                 */
+                $rest = $this->getSemesterGroups(
+                    array_keys(AdmissionPriority::getPriorities($courseset->getId())),
+                    false, $users);
+
+                /*
+                 * Now set bonus factors to higher semesters. We are processing
+                 * users not affected by conditions first so that we get the
+                 * maximum bonus these users get and can build on top of that
+                 * for users affected by conditions.
+                 */
+                $maxbonus = $this->setSemesterBonus($courseset, $rest);
+
+                /*
+                 * Finally, set bonuses for the users affected by conditions.
+                 */
+                $endbonus = $this->setSemesterBonus($courseset, $grouped, $maxbonus + 1);
+            /*
+             * No conditions given, just group all users
+             * by their semester of study.
+             */
+            } else {
+                // Build list of users by semester of study.
+                $grouped = $this->getSemesterGroups(
+                    array_keys(AdmissionPriority::getPriorities($courseset->getId())),
+                    false);
+
+                // Assign corresponding bonus to users.
+                $maxbonus = $this->setSemesterBonus($courseset, $grouped);
+            }
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete()
+    {
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `prefadmissions`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete all associated conditions...
+        foreach ($this->conditions as $condition) {
+            $condition->delete();
+        }
+        // ... and their connection to this rule.
+        $stmt = DBManager::get()->prepare("DELETE FROM `prefadmission_condition`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Gets all users that are matched by thís rule.
+     *
+     * @return Array An array containing IDs of users who are matched by
+     *      this rule.
+     */
+    public function getAffectedUsers()
+    {
+        $users = [];
+        if ($this->conditions) {
+            // Get users from all specified conditions.
+            foreach ($this->conditions as $condition) {
+                $users = array_unique(array_merge($users, $condition->getUsers()));
+            }
+        } else {
+            $users = array_keys(AdmissionPriority::getPriorities($this->courseset->getId()));
+        }
+        return $users;
+    }
+
+    /**
+     * Gets all defined conditions.
+     *
+     * @return Array
+     */
+    public function getConditions()
+    {
+        return $this->conditions;
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription()
+    {
+        return _('Sie können hier festlegen, dass bestimmte Studiengänge, '.
+            'Fachsemester etc. bei der Platzverteilung zu Veranstaltungen '.
+            'bevorzugt behandelt werden sollen.');
+    }
+
+    /**
+     * Returns whether higher semesters of study should be favored.
+     *
+     * @return bool
+     */
+    public function getFavorSemester()
+    {
+        return $this->favorSemester;
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName()
+    {
+        return _('Bevorzugte Anmeldung');
+    }
+
+    /**
+     * Gets the semesters of study for the given users. If conditions are
+     * set and should be considered, only the semesters of study belonging
+     * to the given conditions are set.
+     *
+     * @param $users user IDs to process
+     * @param $considerConditions should only the semesters of study belonging
+     *                            to given conditions be considered?
+     * @param array $exclude user IDs to exclude
+     * @return array Users with their maximal semester of study.
+     */
+    public function getSemesterGroups($users, $considerConditions, $exclude = [])
+    {
+        /*
+         * Get all selected condition values so that the study semester
+         * can be matched against that data; we don't want some "general"
+         * value for a user's study semester, but the one that is assigned
+         * to a given subject and degree.
+         */
+        $queryParts = [];
+        $values = [$users];
+        if ($exclude) {
+            $values[] = $exclude;
+        }
+        if ($considerConditions) {
+            foreach ($this->conditions as $condition) {
+                $queryPart = "";
+                // Search for subject and degree entries.
+                foreach ($condition->getFields() as $field) {
+                    switch (get_class($field)) {
+                        case 'DegreeCondition':
+                            if ($queryPart) {
+                                $queryPart .= " AND ";
+                            }
+                            $queryPart .= "`abschluss_id`".$field->getCompareOperator()."?";
+                            $values[] = $field->getValue() ?: '';
+                            break;
+                        case 'SubjectCondition':
+                            if ($queryPart) {
+                                $queryPart .= " AND ";
+                            }
+                            $queryPart .= "`fach_id`".$field->getCompareOperator()."?";
+                            $values[] = $field->getValue() ?: '';
+                            break;
+                        case 'SemesterOfStudyCondition':
+                            if ($queryPart) {
+                                $queryPart .= " AND ";
+                            }
+                            $queryPart .= "`semester`".$field->getCompareOperator()."?";
+                            $values[] = $field->getValue() ?: '';
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                if ($queryPart) {
+                    $queryParts[] = $queryPart;
+                }
+            }
+        }
+        // Build SQL query with affected users and selected subjects and degrees.
+        $query = "SELECT `user_id`, MAX(`semester`) AS semester
+                FROM `user_studiengang`
+                WHERE `user_id` IN (?)";
+        if ($exclude) {
+            $query .= " AND `user_id` NOT IN (?)";
+        }
+        if ($queryParts) {
+            $query .= " AND ((".implode(") OR (", $queryParts)."))";
+        }
+        $query .= " GROUP BY `user_id` ORDER BY `semester`, `user_id`";
+        $groups = [];
+        foreach (DBManager::get()->fetchAll($query, $values) as $entry) {
+            if (intval($entry['semester'])) {
+                $groups[intval($entry['semester'])][] = $entry['user_id'];
+            }
+        }
+        ksort($groups);
+        return $groups;
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate()
+    {
+        $factory = new Flexi\Factory(__DIR__.'/templates/');
+        // Now open specific template for this rule and insert base template.
+        $tpl = $factory->open('configure');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Helper function for loading data from DB. Generic AdmissionRule data is
+     * loaded with the parent load() method.
+     */
+    public function load()
+    {
+        // Load basic data.
+        $stmt = DBManager::get()->prepare("SELECT *
+            FROM `prefadmissions` WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->favorSemester = $current['favor_semester'];
+            // Retrieve conditions.
+            $stmt = DBManager::get()->prepare("SELECT *
+                FROM `prefadmission_condition` WHERE `rule_id`=?");
+            $stmt->execute([$this->id]);
+            $conditions = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            foreach ($conditions as $condition) {
+                $currentCondition = new UserFilter($condition['condition_id']);
+                $this->conditions[$condition['condition_id']] = $currentCondition;
+            }
+        }
+    }
+
+    /**
+     * Removes the condition with the given ID from the rule.
+     *
+     * @param  String conditionId
+     * @return PreferentialAdmission
+     */
+    public function removeCondition($conditionId)
+    {
+        $this->conditions[$conditionId]->delete();
+        unset($this->conditions[$conditionId]);
+        return $this;
+    }
+
+    /**
+     * Admission is open for everyone. On seat distribution, the rule conditions
+     * will be used to generate user lists with the specified chance.
+     *
+     * @param String $userId
+     * @param String $courseId
+     * @return Array Is the user allowed to register or are there any errors?
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        return [];
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data)
+    {
+        UserFilterField::getAvailableFilterFields();
+        parent::setAllData($data);
+        $this->favorSemester = (bool) $data['favor_semester'];
+        $this->conditions = [];
+        if ($data['conditions']) {
+            foreach ($data['conditions'] as $condition) {
+                $this->addCondition(ObjectBuilder::build($condition, 'UserFilter'));
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * New setting for favoring higher semesters of study.
+     *
+     * @param  bool $newFavorSemester
+     * @return PreferentialAdmission
+     */
+    public function setFavorSemester($newFavorSemester) {
+        $this->favorSemester = $newFavorSemester;
+        return $this;
+    }
+
+    /**
+     * Create user lists and set bonus corresponding to
+     * the maximal available semester of study for given users.
+     *
+     * @param $courseset CourseSet to add user lists to
+     * @param $grouped associative array of users in the form
+     *               <semester> => array(<user_id1>, <user_id2, ...))
+     * @param $baseBonus basic bonus to start with, defaults to 0.
+     */
+    public function setSemesterBonus($courseset, $grouped, $baseBonus = 1)
+    {
+        // Create user lists from each semester group.
+        $bonus = $baseBonus;
+        foreach ($grouped as $semester => $members) {
+            $userlist = new AdmissionUserList();
+            $userlist->setUsers($members);
+            $userlist->setFactor($bonus);
+            $userlist->store();
+            $bonus = $bonus + ($this->bonus_difference + 1);
+            $courseset->addUserList($userlist->getId());
+            $this->userlists[] = $userlist->getId();
+        }
+        return $bonus;
+    }
+
+    /**
+     * Helper function for storing data to DB.
+     */
+    public function store()
+    {
+        // Store rule data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `prefadmissions`
+            (`rule_id`, `favor_semester`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `favor_semester`=VALUES(`favor_semester`),
+            `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->favorSemester, time(), time()]);
+        // Delete removed conditions from DB.
+        $entries = DBManager::get()->fetchAll("SELECT `condition_id` FROM
+            `prefadmission_condition` WHERE `rule_id`=? AND `condition_id` NOT IN (?)",
+            [$this->id, array_keys($this->conditions)]);
+        foreach ($entries as $entry) {
+            $current = new UserFilter($entry['condition_id']);
+            $current->delete();
+        }
+        DBManager::get()->execute("DELETE FROM `prefadmission_condition`
+            WHERE `rule_id`=? AND `condition_id` NOT IN (?)", [$this->id, array_keys($this->conditions)]);
+        // Store all conditions.
+        $queries = [];
+        $parameters = [];
+        if ($this->conditions) {
+            foreach ($this->conditions as $condition) {
+                // Store each condition...
+                $condition->store();
+                $queries[] = "(?, ?, ?)";
+                $parameters[] = $this->id;
+                $parameters[] = $condition->getId();
+                $parameters[] = time();
+            }
+            // Store all assignments between rule and condition.
+            $stmt = DBManager::get()->execute("INSERT INTO `prefadmission_condition`
+                (`rule_id`, `condition_id`, `mkdate`)
+                VALUES ".implode(",", $queries)." ON DUPLICATE KEY UPDATE
+                `condition_id`=VALUES(`condition_id`)", $parameters);
+        }
+        return $this;
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString()
+    {
+        $factory = new Flexi\Factory(__DIR__.'/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if (!$data['conditions'] && !$data['favor_semester']) {
+            $errors[] = _('Es muss mindestens eine Auswahlbedingung angegeben werden.');
+        }
+        return $errors;
+    }
+
+    public function __clone()
+    {
+        $this->id = md5(uniqid(get_class($this)));
+        $this->courseSetId = null;
+        $cloned_conditions = [];
+        foreach ($this->conditions as $condition) {
+            $dolly = clone $condition;
+            $cloned_conditions[$dolly->id] = $dolly;
+        }
+        $this->conditions = $cloned_conditions;
+    }
+
+} /* end of class PreferentialAdmission */
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.class.php b/lib/admissionrules/termsadmission/TermsAdmission.class.php
deleted file mode 100644
index 50c8712..0000000
--- a/lib/admissionrules/termsadmission/TermsAdmission.class.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * TermsAdmission.class.php
- *
- * Represents a rule for course access with conditions of admission to be accepted.
- *
- * 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.
- *
- * @author      Niklas Dettmer <ndettmer@uos.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-require_once 'lib/classes/admission/AdmissionRule.class.php';
-
-class TermsAdmission extends AdmissionRule
-{
-    // Terms of admission
-    public $terms;
-
-    /**
-     * Standard constructor.
-     *
-     * @param  String ruleId
-     */
-    public function __construct($ruleId = '', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('termsadmissions');
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete()
-    {
-        parent::delete();
-
-        $stmt = DBManager::get()->prepare('DELETE FROM termsadmissions WHERE rule_id = ?');
-        $stmt->execute([$this->getId()]);
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription()
-    {
-        return _('Mit dieser Anmelderegel können Sie einen Kurs mit spezifischen Teilnahmebedingungen realisieren. '
-               . 'Die Anmeldung ist erst möglich, nachdem diese akzeptiert wurden.');
-    }
-
-    /**
-     * Shows an input form
-     *
-     * @return string A template-based input form.
-     * @throws Flexi\TemplateNotFoundException
-     */
-    public function getInput()
-    {
-        $factory = new Flexi\Factory(__DIR__ . '/templates');
-        $template = $factory->open('input');
-        $template->rule = $this;
-
-        return (string) MessageBox::info($template->render())->hideClose();
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName() {
-        return _('Kurs mit Teilnahmebedingungen');
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     * @throws Flexi\TemplateNotFoundException
-     */
-    public function getTemplate()
-    {
-        $factory = new Flexi\Factory(__DIR__ . '/templates');
-        $template = $factory->open('configure');
-        $template->rule = $this;
-
-        return $template->render();
-    }
-
-    /**
-     * Does the current rule allow the given user to register as participant
-     * in the given course?
-     *
-     * @param  String userId
-     * @param  String courseId
-     * @return Array
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        $errors = [];
-
-        // check if the user has accepted the terms
-        if (Request::int('terms_accepted')) {
-            $_SESSION['terms_accepted_' . $this->getId()] = true;
-        }
-        if (!$_SESSION['terms_accepted_' . $this->getId()]) {
-            $errors[] = _('Um sich anzumelden, müssen Sie die Teilnahmebedingungen akzeptieren.');
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data)
-    {
-        parent::setAllData($data);
-        $this->terms = trim($data['terms']);
-        return $this;
-    }
-
-    /**
-     * Internal helper function for loading rule definition from database.
-     */
-    public function load()
-    {
-        $rule = DBManager::get()->fetchOne('SELECT * FROM termsadmissions WHERE rule_id = ?', [$this->getId()]);
-        $this->terms = $rule['terms'];
-        return $this;
-    }
-
-    /**
-     * Store rule definition to database.
-     */
-    public function store()
-    {
-        // Store data.
-        $stmt = DBManager::get()->prepare('INSERT INTO termsadmissions (rule_id, terms, mkdate, chdate) VALUES (?, ?, ?, ?)
-                                            ON DUPLICATE KEY UPDATE terms = VALUES(terms), chdate = VALUES(chdate)');
-        $stmt->execute([$this->id, $this->terms, time(), time()]);
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     * @throws Flexi\TemplateNotFoundException
-     */
-    public function toString()
-    {
-        $factory = new Flexi\Factory(__DIR__ . '/templates/');
-        $template = $factory->open('info');
-        $template->rule = $this;
-
-        return $template->render();
-    }
-}
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.php b/lib/admissionrules/termsadmission/TermsAdmission.php
new file mode 100644
index 0000000..50c8712
--- /dev/null
+++ b/lib/admissionrules/termsadmission/TermsAdmission.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * TermsAdmission.class.php
+ *
+ * Represents a rule for course access with conditions of admission to be accepted.
+ *
+ * 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.
+ *
+ * @author      Niklas Dettmer <ndettmer@uos.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+require_once 'lib/classes/admission/AdmissionRule.class.php';
+
+class TermsAdmission extends AdmissionRule
+{
+    // Terms of admission
+    public $terms;
+
+    /**
+     * Standard constructor.
+     *
+     * @param  String ruleId
+     */
+    public function __construct($ruleId = '', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('termsadmissions');
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete()
+    {
+        parent::delete();
+
+        $stmt = DBManager::get()->prepare('DELETE FROM termsadmissions WHERE rule_id = ?');
+        $stmt->execute([$this->getId()]);
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription()
+    {
+        return _('Mit dieser Anmelderegel können Sie einen Kurs mit spezifischen Teilnahmebedingungen realisieren. '
+               . 'Die Anmeldung ist erst möglich, nachdem diese akzeptiert wurden.');
+    }
+
+    /**
+     * Shows an input form
+     *
+     * @return string A template-based input form.
+     * @throws Flexi\TemplateNotFoundException
+     */
+    public function getInput()
+    {
+        $factory = new Flexi\Factory(__DIR__ . '/templates');
+        $template = $factory->open('input');
+        $template->rule = $this;
+
+        return (string) MessageBox::info($template->render())->hideClose();
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName() {
+        return _('Kurs mit Teilnahmebedingungen');
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     * @throws Flexi\TemplateNotFoundException
+     */
+    public function getTemplate()
+    {
+        $factory = new Flexi\Factory(__DIR__ . '/templates');
+        $template = $factory->open('configure');
+        $template->rule = $this;
+
+        return $template->render();
+    }
+
+    /**
+     * Does the current rule allow the given user to register as participant
+     * in the given course?
+     *
+     * @param  String userId
+     * @param  String courseId
+     * @return Array
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        $errors = [];
+
+        // check if the user has accepted the terms
+        if (Request::int('terms_accepted')) {
+            $_SESSION['terms_accepted_' . $this->getId()] = true;
+        }
+        if (!$_SESSION['terms_accepted_' . $this->getId()]) {
+            $errors[] = _('Um sich anzumelden, müssen Sie die Teilnahmebedingungen akzeptieren.');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data)
+    {
+        parent::setAllData($data);
+        $this->terms = trim($data['terms']);
+        return $this;
+    }
+
+    /**
+     * Internal helper function for loading rule definition from database.
+     */
+    public function load()
+    {
+        $rule = DBManager::get()->fetchOne('SELECT * FROM termsadmissions WHERE rule_id = ?', [$this->getId()]);
+        $this->terms = $rule['terms'];
+        return $this;
+    }
+
+    /**
+     * Store rule definition to database.
+     */
+    public function store()
+    {
+        // Store data.
+        $stmt = DBManager::get()->prepare('INSERT INTO termsadmissions (rule_id, terms, mkdate, chdate) VALUES (?, ?, ?, ?)
+                                            ON DUPLICATE KEY UPDATE terms = VALUES(terms), chdate = VALUES(chdate)');
+        $stmt->execute([$this->id, $this->terms, time(), time()]);
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     * @throws Flexi\TemplateNotFoundException
+     */
+    public function toString()
+    {
+        $factory = new Flexi\Factory(__DIR__ . '/templates/');
+        $template = $factory->open('info');
+        $template->rule = $this;
+
+        return $template->render();
+    }
+}
diff --git a/lib/admissionrules/timedadmission/TimedAdmission.class.php b/lib/admissionrules/timedadmission/TimedAdmission.class.php
deleted file mode 100644
index e167bd8..0000000
--- a/lib/admissionrules/timedadmission/TimedAdmission.class.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-/**
- * TimedAdmission.class.php
- *
- * Specifies a time frame for course admission.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class TimedAdmission extends AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * End of course admission.
-     */
-    public $endTime = 0;
-
-    /**
-     * Start of course admission.
-     */
-    public $startTime = 0;
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor
-     *
-     * @param  String ruleId
-     */
-    public function __construct($ruleId='', $courseSetId = '')
-    {
-        parent::__construct($ruleId, $courseSetId);
-        $this->default_message = _('Sie befinden sich nicht innerhalb des Anmeldezeitraums.');
-        if ($ruleId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId('timedadmissions');
-        }
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete() {
-        parent::delete();
-        // Delete rule data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `timedadmissions`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription() {
-        return _("Anmelderegeln dieses Typs legen ein Zeitfenster fest, in ".
-            "dem die Anmeldung zu Veranstaltungen möglich ist. Es kann auch ".
-            "nur ein Start- oder Endzeitpunkt angegeben werden.");
-    }
-
-    /**
-     * Gets the end of course admission.
-     *
-     * @return int
-     */
-    public function getEndTime()
-    {
-        return $this->endTime;
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName() {
-        return _("Zeitgesteuerte Anmeldung");
-    }
-
-    /**
-     * Gets the start of course admission.
-     *
-     * @return int
-     */
-    public function getStartTime()
-    {
-        return $this->startTime;
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate() {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        // Open specific template for this rule and insert base template.
-        $tpl = $factory->open('configure');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Helper function for loading rule definition from database.
-     */
-    public function load() {
-        // Load data.
-        $stmt = DBManager::get()->prepare("SELECT *
-            FROM `timedadmissions` WHERE `rule_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->message = $current['message'];
-            $this->startTime = $current['start_time'];
-            $this->endTime = $current['end_time'];
-        }
-    }
-
-    /**
-     * Is admission allowed according to the defined time frame?
-     *
-     * @param  String userId
-     * @param  String courseId
-     * @return Array
-     */
-    public function ruleApplies($userId, $courseId) {
-        $errors = [];
-        if (!$this->checkTimeFrame()) {
-            $errors[] = $this->getMessage();
-        }
-        return $errors;
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data) {
-        parent::setAllData($data);
-        if ($data['startdate']) {
-            $sdate = $data['startdate'];
-            $stime = $data['starttime'];
-            $parsed = date_parse($sdate.' '.$stime);
-            $timestamp = mktime($parsed['hour'], $parsed['minute'], 0, $parsed['month'], $parsed['day'], $parsed['year']);
-            $this->setStartTime($timestamp);
-        }
-        if ($data['enddate']) {
-            $edate = $data['enddate'];
-            $etime = $data['endtime'];
-            if (!$etime) {
-                $etime = '23:59';
-            }
-            $parsed = date_parse($edate.' '.$etime);
-            $timestamp = mktime($parsed['hour'], $parsed['minute'], 0, $parsed['month'], $parsed['day'], $parsed['year']);
-            $this->setEndTime($timestamp);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets a new end timestamp for course admission.
-     *
-     * @param  int newEndTime
-     * @return TimedAdmission
-     */
-    public function setEndTime($newEndTime)
-    {
-        $this->endTime = $newEndTime;
-        return $this;
-    }
-
-    /**
-     * Sets a new start timestamp for course admission.
-     *
-     * @param  int newStartTime
-     * @return TimedAdmission
-     */
-    public function setStartTime($newStartTime)
-    {
-        $this->startTime = $newStartTime;
-        return $this;
-    }
-
-    /**
-     * Store rule definition to database.
-     */
-    public function store() {
-        // Store data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `timedadmissions`
-            (`rule_id`, `message`, `start_time`,
-            `end_time`, `mkdate`, `chdate`) VALUES (?, ?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE `start_time`=VALUES(`start_time`),
-            `end_time`=VALUES(`end_time`),message=VALUES(message), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->message, (int)$this->startTime,
-            (int)$this->endTime, time(), time()]);
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString()
-    {
-        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
-        $tpl = $factory->open('info');
-        $tpl->set_attribute('rule', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = parent::validate($data);
-        if (!$data['startdate'] && !$data['enddate']) {
-            $errors[] = _('Bitte geben Sie entweder ein Start- oder Enddatum an.');
-        }
-        if ($data['startdate'] && $data['enddate'] && strtotime($data['enddate'] . ' ' . $data['endtime']) < strtotime($data['startdate']. ' ' . $data['starttime'])) {
-            $errors[] = _('Das Enddatum darf nicht vor dem Startdatum liegen.');
-        }
-        return $errors;
-    }
-
-} /* end of class TimedAdmission */
-
-?>
diff --git a/lib/admissionrules/timedadmission/TimedAdmission.php b/lib/admissionrules/timedadmission/TimedAdmission.php
new file mode 100644
index 0000000..e167bd8
--- /dev/null
+++ b/lib/admissionrules/timedadmission/TimedAdmission.php
@@ -0,0 +1,243 @@
+<?php
+
+/**
+ * TimedAdmission.class.php
+ *
+ * Specifies a time frame for course admission.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class TimedAdmission extends AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * End of course admission.
+     */
+    public $endTime = 0;
+
+    /**
+     * Start of course admission.
+     */
+    public $startTime = 0;
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor
+     *
+     * @param  String ruleId
+     */
+    public function __construct($ruleId='', $courseSetId = '')
+    {
+        parent::__construct($ruleId, $courseSetId);
+        $this->default_message = _('Sie befinden sich nicht innerhalb des Anmeldezeitraums.');
+        if ($ruleId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId('timedadmissions');
+        }
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete() {
+        parent::delete();
+        // Delete rule data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `timedadmissions`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription() {
+        return _("Anmelderegeln dieses Typs legen ein Zeitfenster fest, in ".
+            "dem die Anmeldung zu Veranstaltungen möglich ist. Es kann auch ".
+            "nur ein Start- oder Endzeitpunkt angegeben werden.");
+    }
+
+    /**
+     * Gets the end of course admission.
+     *
+     * @return int
+     */
+    public function getEndTime()
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName() {
+        return _("Zeitgesteuerte Anmeldung");
+    }
+
+    /**
+     * Gets the start of course admission.
+     *
+     * @return int
+     */
+    public function getStartTime()
+    {
+        return $this->startTime;
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate() {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        // Open specific template for this rule and insert base template.
+        $tpl = $factory->open('configure');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Helper function for loading rule definition from database.
+     */
+    public function load() {
+        // Load data.
+        $stmt = DBManager::get()->prepare("SELECT *
+            FROM `timedadmissions` WHERE `rule_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->message = $current['message'];
+            $this->startTime = $current['start_time'];
+            $this->endTime = $current['end_time'];
+        }
+    }
+
+    /**
+     * Is admission allowed according to the defined time frame?
+     *
+     * @param  String userId
+     * @param  String courseId
+     * @return Array
+     */
+    public function ruleApplies($userId, $courseId) {
+        $errors = [];
+        if (!$this->checkTimeFrame()) {
+            $errors[] = $this->getMessage();
+        }
+        return $errors;
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data) {
+        parent::setAllData($data);
+        if ($data['startdate']) {
+            $sdate = $data['startdate'];
+            $stime = $data['starttime'];
+            $parsed = date_parse($sdate.' '.$stime);
+            $timestamp = mktime($parsed['hour'], $parsed['minute'], 0, $parsed['month'], $parsed['day'], $parsed['year']);
+            $this->setStartTime($timestamp);
+        }
+        if ($data['enddate']) {
+            $edate = $data['enddate'];
+            $etime = $data['endtime'];
+            if (!$etime) {
+                $etime = '23:59';
+            }
+            $parsed = date_parse($edate.' '.$etime);
+            $timestamp = mktime($parsed['hour'], $parsed['minute'], 0, $parsed['month'], $parsed['day'], $parsed['year']);
+            $this->setEndTime($timestamp);
+        }
+        return $this;
+    }
+
+    /**
+     * Sets a new end timestamp for course admission.
+     *
+     * @param  int newEndTime
+     * @return TimedAdmission
+     */
+    public function setEndTime($newEndTime)
+    {
+        $this->endTime = $newEndTime;
+        return $this;
+    }
+
+    /**
+     * Sets a new start timestamp for course admission.
+     *
+     * @param  int newStartTime
+     * @return TimedAdmission
+     */
+    public function setStartTime($newStartTime)
+    {
+        $this->startTime = $newStartTime;
+        return $this;
+    }
+
+    /**
+     * Store rule definition to database.
+     */
+    public function store() {
+        // Store data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `timedadmissions`
+            (`rule_id`, `message`, `start_time`,
+            `end_time`, `mkdate`, `chdate`) VALUES (?, ?, ?, ?, ?, ?)
+            ON DUPLICATE KEY UPDATE `start_time`=VALUES(`start_time`),
+            `end_time`=VALUES(`end_time`),message=VALUES(message), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->message, (int)$this->startTime,
+            (int)$this->endTime, time(), time()]);
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString()
+    {
+        $factory = new Flexi\Factory(dirname(__FILE__).'/templates/');
+        $tpl = $factory->open('info');
+        $tpl->set_attribute('rule', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = parent::validate($data);
+        if (!$data['startdate'] && !$data['enddate']) {
+            $errors[] = _('Bitte geben Sie entweder ein Start- oder Enddatum an.');
+        }
+        if ($data['startdate'] && $data['enddate'] && strtotime($data['enddate'] . ' ' . $data['endtime']) < strtotime($data['startdate']. ' ' . $data['starttime'])) {
+            $errors[] = _('Das Enddatum darf nicht vor dem Startdatum liegen.');
+        }
+        return $errors;
+    }
+
+} /* end of class TimedAdmission */
+
+?>
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index e2554c7..7d99f86 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -3,102 +3,21 @@
 require 'lib/classes/StudipAutoloader.php';
 StudipAutoloader::register();
 
-// General classes folders
-StudipAutoloader::addAutoloadPath('lib/models');
-StudipAutoloader::addAutoloadPath('lib/models/calendar');
-StudipAutoloader::addAutoloadPath('lib/models/resources');
-StudipAutoloader::addAutoloadPath('lib/classes');
-StudipAutoloader::addAutoloadPath('lib/classes', 'Studip');
-
-// Plugins
-StudipAutoloader::addAutoloadPath('lib/plugins/core');
-StudipAutoloader::addAutoloadPath('lib/plugins/db');
-StudipAutoloader::addAutoloadPath('lib/plugins/engine');
-
-// Specialized folders
-StudipAutoloader::addAutoloadPath('lib/classes/admission');
-StudipAutoloader::addAutoloadPath('lib/classes/admission/userfilter');
-StudipAutoloader::addAutoloadPath('lib/classes/auth_plugins');
-StudipAutoloader::addAutoloadPath('lib/classes/calendar');
-
-StudipAutoloader::addAutoloadPath('lib/classes/cache', 'Studip\\Cache');
 class_alias(\Studip\Cache\Factory::class, 'StudipCacheFactory');
 class_alias(\Studip\Cache\Cache::class, 'StudipCache');
-
-StudipAutoloader::addAutoloadPath('lib/classes/exportdocument');
-StudipAutoloader::addAutoloadPath('lib/classes/forms');
-StudipAutoloader::addAutoloadPath('lib/classes/globalsearch');
-StudipAutoloader::addAutoloadPath('lib/classes/helpbar');
-StudipAutoloader::addAutoloadPath('lib/classes/librarysearch/resultparsers');
-StudipAutoloader::addAutoloadPath('lib/classes/librarysearch/searchmodules');
-StudipAutoloader::addAutoloadPath('lib/classes/librarysearch');
-StudipAutoloader::addAutoloadPath('lib/classes/searchtypes');
-StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
-StudipAutoloader::addAutoloadPath('lib/classes/visibility');
-StudipAutoloader::addAutoloadPath('lib/classes/coursewizardsteps');
-StudipAutoloader::addAutoloadPath('lib/classes/wiki');
-
-StudipAutoloader::addAutoloadPath('lib/calendar');
-StudipAutoloader::addAutoloadPath('lib/calendar', 'Studip\\Calendar');
-StudipAutoloader::addAutoloadPath('lib/exceptions');
-StudipAutoloader::addAutoloadPath('lib/exceptions/resources');
-StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
-StudipAutoloader::addAutoloadPath('lib/filesystem');
-StudipAutoloader::addAutoloadPath('lib/migrations');
-StudipAutoloader::addAutoloadPath('lib/modules');
-StudipAutoloader::addAutoloadPath('lib/navigation');
-StudipAutoloader::addAutoloadPath('lib/phplib');
-StudipAutoloader::addAutoloadPath('lib/raumzeit');
-StudipAutoloader::addAutoloadPath('lib/resources');
-StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
-
-StudipAutoloader::addAutoloadPath('lib/calendar/lib');
-StudipAutoloader::addAutoloadPath('lib/elearning');
-StudipAutoloader::addAutoloadPath('lib/extern');
-StudipAutoloader::addAutoloadPath('lib/ilias_interface');
-
-// Flexi
-StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
 class_alias(Flexi\PhpTemplate::class, 'Flexi_PhpTemplate');
 class_alias(Flexi\Template::class, 'Flexi_Template');
 class_alias(Flexi\Factory::class, 'Flexi_TemplateFactory');
 class_alias(Flexi\TemplateNotFoundException::class, 'Flexi_TemplateNotFoundException');
-
-// Trails
-StudipAutoloader::addAutoloadPath('lib/trails', 'Trails');
 class_alias(Trails\Controller::class, 'Trails_Controller');
 class_alias(Trails\Dispatcher::class, 'Trails_Dispatcher');
 class_alias(Trails\Exception::class, 'Trails_Exception');
 class_alias(Trails\Flash::class, 'Trails_Flash');
 class_alias(Trails\Inflector::class, 'Trails_Inflector');
 class_alias(Trails\Response::class, 'Trails_Response');
-
 class_alias(Trails\Exceptions\DoubleRenderError::class, 'Trails_DoubleRenderError');
 class_alias(Trails\Exceptions\MissingFile::class, 'Trails_MissingFile');
 class_alias(Trails\Exceptions\RoutingError::class, 'Trails_RoutingError');
 class_alias(Trails\Exceptions\SessionRequiredException::class, 'Trails_SessionRequiredException');
 class_alias(Trails\Exceptions\UnknownAction::class, 'Trails_UnknownAction');
 class_alias(Trails\Exceptions\UnknownController::class, 'Trails_UnknownController');
-
-// Messy file names
-StudipAutoloader::addClassLookups([
-    'email_validation_class' => 'lib/phplib/email_validation.class.php',
-    'messaging'              => 'lib/messaging.inc.php',
-    'StudipPlugin'           => 'lib/plugins/core/StudIPPlugin.class.php',
-    'MVVController'          => 'app/controllers/module/mvv_controller.php'
-]);
-
-// Vendor
-StudipAutoloader::addClassLookups([
-    'PasswordHash' => 'vendor/phpass/PasswordHash.php',
-]);
-
-// XMLRpc
-StudipAutoloader::addClassLookup(
-    ['xmlrpcval', 'xmlrpcmsg', 'xmlrpcresp', 'xmlrpc_client'],
-    'composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc'
-);
-StudipAutoloader::addClassLookup(
-    ['xmlrpc_server'],
-    'composer/phpxmlrpc/phpxmlrpc/lib/xmlrpcs.inc'
-);
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 8c618ff..478ca0e 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -224,7 +224,7 @@ if (Config::get()->CALENDAR_ENABLE) {
 }
 
 if (Config::get()->SOAP_ENABLE) {
-    require_once 'lib/soap/StudipSoapClient' . (Config::get()->SOAP_USE_PHP5 ? '_PHP5' : '' ) . '.class.php';
+    require_once 'lib/soap/StudipSoapClient' . (Config::get()->SOAP_USE_PHP5 ? '_PHP5' : '' ) . '.php';
 }
 
 if (Config::Get()->ILIAS_INTERFACE_ENABLE) {
diff --git a/lib/calendar/CalendarColumn.class.php b/lib/calendar/CalendarColumn.class.php
deleted file mode 100644
index cc3abea..0000000
--- a/lib/calendar/CalendarColumn.class.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * CalendarColumn.class.php - a column for a CalendarView
- *
- * This class represents an entry-column like "monday" in the calendar
- *
- * 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.
- *
- * @author      Rasmus Fuhse <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @deprecated since Stud.IP 5.5
- */
-
-class CalendarColumn
-{
-    protected static $number = 0;
-    protected $title = "";
-    protected $id = "";
-    public    $entries = [];
-    protected $url = "";
-    protected $grouped = false;
-    protected $sorted_entries = null;
-
-    /**
-     * creates instance of type CalendarColumn
-     *
-     * @param string  $id  necessary if you want JavaScript enabled for this calendar
-     * @return CalendarColumn
-     */
-    static public function create($id = null) {
-        $column = new CalendarColumn($id);
-        return $column;
-    }
-
-    /**
-     * constructor
-     *
-     * @param string  $id  necessary if you want JavaScript enabled for this column
-     */
-    public function __construct($id = null) {
-        $id !== null || $id = md5(uniqid("CalendarColumn_".self::$number++));
-        $this->setId($id);
-    }
-
-    /**
-     * returns the id of the column
-     *
-     * @return string
-     */
-    public function getId() {
-        return $this->id;
-    }
-
-    /**
-     * sets the id for this column, which is only necessary if you want
-     * Javascript to be enabled for this calendar
-     *
-     * @param string  $id  new id for this column
-     * @return CalendarColumn
-     */
-    public function setId($id) {
-        $this->id = $id;
-        return $this;
-    }
-
-    /**
-     * sets a title like "monday" for this column, which will be displayed in the calendar
-     *
-     * @param string  $new_title  new title
-     * @return CalendarColumn
-     */
-    public function setTitle($new_title) {
-        $this->title = $new_title;
-        return $this;
-    }
-
-    /**
-     * returns the title of this column like "monday"
-     *
-     * @return string title of column
-     */
-    public function getTitle() {
-        return $this->title;
-    }
-
-    /**
-     * sets the url to be directed to when clicking on the title of the column.
-     * Usually this is a single-day-view of the calendar.
-     *
-     * @param string  $new_url  an url
-     * @return CalendarColumn
-     */
-    public function setURL($new_url) {
-        $this->url = $new_url;
-        return $this;
-    }
-
-    /**
-     * returns the URL of the column (see setURL)
-     *
-     * @return string an url
-     */
-    public function getURL() {
-        return $this->url;
-    }
-
-    /**
-     * adds a new entry in the column. The entry needs to be an associative array
-     * with parameters as follows:
-     *
-     * @param array  $entry_array  associative array for an entry in the column like
-     * array (
-     *    'color' => the color in hex (css-like, without the #)
-     *    'start' => the (start hour * 100) + (start minute)
-     *    'end'   => the (end hour * 100) + (end minute)
-     *    'title' => the entry`s title
-     *    'content' => whatever shall be the content of the entry as a string
-     * )
-     */
-    public function addEntry($entry_array) {
-        if (!isset($entry_array['start']) || !isset($entry_array['end'])
-                || !isset($entry_array['title']) ) {
-            throw new InvalidArgumentException('The entry '. print_r($entry_array, true) .' does not follow the specifications!');
-        } else {
-            $this->entries[] = $entry_array;
-        }
-        return $this;
-    }
-
-    /**
-     * adds many entries to the column. For the syntax of an entry see addEntry()
-     *
-     * @param array  $entries_array
-     * @return CalendarColumn
-     */
-    public function addEntries($entries_array = []) {
-        foreach ($entries_array as $entry_array) {
-            $this->addEntry($entry_array);
-        }
-        return $this;
-    }
-
-    /**
-     * returns all entries of this column
-     *
-     * @return array of arrays like
-     * array (
-     *    'color' => the color in hex (css-like, without the #)
-     *    'start' => the (start hour * 100) + (start minute)
-     *    'end'   => the (end hour * 100) + (end minute)
-     *    'title' => the entry`s title
-     *    'content' => whatever shall be the content of the entry as a string
-     * )
-     */
-    public function getEntries() {
-        return $this->entries;
-    }
-
-    /**
-     * deletes all entries of this column. So the only way to edit an entry is
-     * getting all entries with getEntries, edit this entry, eraseEntries() and
-     * addEntries(). Not very short, but at least it works.
-     *
-     * @return CalendarColumn
-     */
-    public function eraseEntries() {
-        $this->entries = [];
-        return $this;
-    }
-
-    /**
-     * Returns an array of calendar-entries, grouped by day and additionally grouped by same start and end
-     * if groupEntries(true) has been called.
-     *
-     * @return  mixed  the (double-)grouped entries
-     */
-    public function getGroupedEntries()
-    {
-        if (empty($this->sorted_entries)) {
-            if ($this->isGrouped()) {
-                $this->sorted_entries = $this->sortAndGroupEntries();
-            } else {
-                $this->sorted_entries = $this->sortEntries();
-            }
-        }
-
-        return $this->sorted_entries;
-    }
-
-    /**
-     * sorts and groups entries and returns them
-     * only used by columns with grouped entries like instituteschedules
-     *
-     * @return array
-     */
-    public function sortAndGroupEntries()
-    {
-        $day = $this->getTitle();
-
-        $entries_for_column = $this->getEntries();
-        $result = [];
-        $new_entries = [];
-
-        // 1st step - group all entries with the same duration
-        foreach ($entries_for_column as $entry_id => $entry) {
-            $new_entries[$entry['start'] .'_'. $entry['end']][] = $entry;
-        }
-
-        $column = 0;
-
-        // 2nd step - optimize the groups
-        while (sizeof($new_entries) > 0) {
-            $lstart = 2399; $lend = 0;
-
-            foreach ($new_entries as $time => $grouped_entries) {
-                list($start, $end) = explode('_', $time);
-                if ($start < $lstart /*&& ($end - $start) >= ($lend - $lstart)*/ )  {
-                    $lstart = $start;
-                    $lend = $end;
-                }
-            }
-
-            $result['col_'. $column][] = $new_entries[$lstart .'_'. $lend];
-            unset($new_entries[$lstart .'_'. $lend]);
-
-            $hit = true;
-
-            while ($hit) {
-                $hit = false;
-                $hstart = 2399; $hend = 2399;
-
-                // check, if there is something, that can be placed after
-                foreach ($new_entries as $time => $grouped_entries) {
-                    list($start, $end) = explode('_', $time);
-
-                    if ( ($start >= $lend) && ($start < $hstart) ) {
-                        $hstart = $start;
-                        $hend = $end;
-                        $hit = true;
-                    }
-                }
-
-                if ($hit) {
-                    $lend = $hend;
-                    $result['col_'. $column][] = $new_entries[$hstart .'_'. $hend];
-                    unset($new_entries[$hstart .'_'. $hend]);
-                }
-            }
-
-            $column++;
-        } // 2nd step
-
-        return $result;
-
-    }
-
-    /**
-     * sorts entries and returns them
-     *
-     * @return array
-     */
-    public function sortEntries()
-    {
-        $entries_for_column = $this->getEntries();
-
-        $result = [];
-        $column = 0;
-
-        // 2nd step - optimize the groups
-        while (sizeof($entries_for_column) > 0) {
-            $lstart = 2399; $lend = 0; $lkey = null;
-
-            foreach ($entries_for_column as $entry_key => $entry) {
-                if ($entry['start'] < $lstart /*&& ($end - $start) >= ($lend - $lstart)*/ )  {
-                    $lstart = $entry['start'];
-                    $lend = $entry['end'];
-                    $lkey = $entry_key;
-                }
-            }
-
-            $result['col_'. $column][] = $entries_for_column[$lkey];
-            unset($entries_for_column[$lkey]);
-
-            $hit = true;
-
-            while ($hit) {
-                $hit = false;
-                $hstart = 2399; $hend = 2399; $hkey = null;
-
-                // check, if there is something, that can be placed after
-                foreach ($entries_for_column as $entry_key => $entry) {
-                    if ( ($entry['start'] >= $lend) && ($entry['start'] < $hstart) ) {
-                        // && (($end - $start) > ($hend - $hstart)) ) {
-                        $hstart = $entry['start'];
-                        $hend = $entry['end'];
-                        $hkey = $entry_key;
-                        $hit = true;
-                    }
-                }
-
-                if ($hit) {
-                    $lend = $hend;
-                    $result['col_'. $column][] = $entries_for_column[$hkey];
-                    unset($entries_for_column[$hkey]);
-                }
-            }
-
-            $column++;
-        } // 2nd step
-        return $result;
-
-    }
-
-    /**
-     * returns a matrix that tells the number of entries for a given timeslot
-     *
-     * @return array
-     */
-    public function getMatrix() {
-        $group_matrix = [];
-        foreach ($this->getGroupedEntries() as $groups) {
-            foreach ($groups as $group) {
-                if (isset($group[0]) && is_array($group[0])) {
-                    $data = $group[0];
-                } else {
-                    $data = $group;
-                }
-
-                for ($i = floor($data['start'] / 100); $i <= floor($data['end'] / 100); $i++) {
-                    for ($j = 0; $j < 60; $j++) {
-                        if (($i * 100) + $j >= $data['start'] && ($i * 100) + $j < $data['end']) {
-                            if (!isset($group_matrix[$i * 100 + $j])) {
-                                $group_matrix[$i * 100 + $j] = 0;
-                            }
-                            $group_matrix[$i * 100 + $j]++;
-                        }
-                    }
-                }
-            }
-        }
-        return $group_matrix;
-    }
-
-    /**
-     * check, if a grouped view of the entries is requested
-     *
-     * @return bool true if grouped, false otherwise
-     */
-    public function isGrouped()
-    {
-        return $this->grouped;
-    }
-
-    /**
-     * Call this function th enable/disable the grouping of entries with the same start and end.
-     *
-     * @param  bool  $group optional, defaults to true
-     * @return void
-     */
-    public function groupEntries($grouped = true)
-    {
-        $this->grouped = $grouped;
-    }
-
-}
diff --git a/lib/calendar/CalendarColumn.php b/lib/calendar/CalendarColumn.php
new file mode 100644
index 0000000..cc3abea
--- /dev/null
+++ b/lib/calendar/CalendarColumn.php
@@ -0,0 +1,371 @@
+<?php
+# Lifter010: TODO
+/**
+ * CalendarColumn.class.php - a column for a CalendarView
+ *
+ * This class represents an entry-column like "monday" in the calendar
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @deprecated since Stud.IP 5.5
+ */
+
+class CalendarColumn
+{
+    protected static $number = 0;
+    protected $title = "";
+    protected $id = "";
+    public    $entries = [];
+    protected $url = "";
+    protected $grouped = false;
+    protected $sorted_entries = null;
+
+    /**
+     * creates instance of type CalendarColumn
+     *
+     * @param string  $id  necessary if you want JavaScript enabled for this calendar
+     * @return CalendarColumn
+     */
+    static public function create($id = null) {
+        $column = new CalendarColumn($id);
+        return $column;
+    }
+
+    /**
+     * constructor
+     *
+     * @param string  $id  necessary if you want JavaScript enabled for this column
+     */
+    public function __construct($id = null) {
+        $id !== null || $id = md5(uniqid("CalendarColumn_".self::$number++));
+        $this->setId($id);
+    }
+
+    /**
+     * returns the id of the column
+     *
+     * @return string
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * sets the id for this column, which is only necessary if you want
+     * Javascript to be enabled for this calendar
+     *
+     * @param string  $id  new id for this column
+     * @return CalendarColumn
+     */
+    public function setId($id) {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * sets a title like "monday" for this column, which will be displayed in the calendar
+     *
+     * @param string  $new_title  new title
+     * @return CalendarColumn
+     */
+    public function setTitle($new_title) {
+        $this->title = $new_title;
+        return $this;
+    }
+
+    /**
+     * returns the title of this column like "monday"
+     *
+     * @return string title of column
+     */
+    public function getTitle() {
+        return $this->title;
+    }
+
+    /**
+     * sets the url to be directed to when clicking on the title of the column.
+     * Usually this is a single-day-view of the calendar.
+     *
+     * @param string  $new_url  an url
+     * @return CalendarColumn
+     */
+    public function setURL($new_url) {
+        $this->url = $new_url;
+        return $this;
+    }
+
+    /**
+     * returns the URL of the column (see setURL)
+     *
+     * @return string an url
+     */
+    public function getURL() {
+        return $this->url;
+    }
+
+    /**
+     * adds a new entry in the column. The entry needs to be an associative array
+     * with parameters as follows:
+     *
+     * @param array  $entry_array  associative array for an entry in the column like
+     * array (
+     *    'color' => the color in hex (css-like, without the #)
+     *    'start' => the (start hour * 100) + (start minute)
+     *    'end'   => the (end hour * 100) + (end minute)
+     *    'title' => the entry`s title
+     *    'content' => whatever shall be the content of the entry as a string
+     * )
+     */
+    public function addEntry($entry_array) {
+        if (!isset($entry_array['start']) || !isset($entry_array['end'])
+                || !isset($entry_array['title']) ) {
+            throw new InvalidArgumentException('The entry '. print_r($entry_array, true) .' does not follow the specifications!');
+        } else {
+            $this->entries[] = $entry_array;
+        }
+        return $this;
+    }
+
+    /**
+     * adds many entries to the column. For the syntax of an entry see addEntry()
+     *
+     * @param array  $entries_array
+     * @return CalendarColumn
+     */
+    public function addEntries($entries_array = []) {
+        foreach ($entries_array as $entry_array) {
+            $this->addEntry($entry_array);
+        }
+        return $this;
+    }
+
+    /**
+     * returns all entries of this column
+     *
+     * @return array of arrays like
+     * array (
+     *    'color' => the color in hex (css-like, without the #)
+     *    'start' => the (start hour * 100) + (start minute)
+     *    'end'   => the (end hour * 100) + (end minute)
+     *    'title' => the entry`s title
+     *    'content' => whatever shall be the content of the entry as a string
+     * )
+     */
+    public function getEntries() {
+        return $this->entries;
+    }
+
+    /**
+     * deletes all entries of this column. So the only way to edit an entry is
+     * getting all entries with getEntries, edit this entry, eraseEntries() and
+     * addEntries(). Not very short, but at least it works.
+     *
+     * @return CalendarColumn
+     */
+    public function eraseEntries() {
+        $this->entries = [];
+        return $this;
+    }
+
+    /**
+     * Returns an array of calendar-entries, grouped by day and additionally grouped by same start and end
+     * if groupEntries(true) has been called.
+     *
+     * @return  mixed  the (double-)grouped entries
+     */
+    public function getGroupedEntries()
+    {
+        if (empty($this->sorted_entries)) {
+            if ($this->isGrouped()) {
+                $this->sorted_entries = $this->sortAndGroupEntries();
+            } else {
+                $this->sorted_entries = $this->sortEntries();
+            }
+        }
+
+        return $this->sorted_entries;
+    }
+
+    /**
+     * sorts and groups entries and returns them
+     * only used by columns with grouped entries like instituteschedules
+     *
+     * @return array
+     */
+    public function sortAndGroupEntries()
+    {
+        $day = $this->getTitle();
+
+        $entries_for_column = $this->getEntries();
+        $result = [];
+        $new_entries = [];
+
+        // 1st step - group all entries with the same duration
+        foreach ($entries_for_column as $entry_id => $entry) {
+            $new_entries[$entry['start'] .'_'. $entry['end']][] = $entry;
+        }
+
+        $column = 0;
+
+        // 2nd step - optimize the groups
+        while (sizeof($new_entries) > 0) {
+            $lstart = 2399; $lend = 0;
+
+            foreach ($new_entries as $time => $grouped_entries) {
+                list($start, $end) = explode('_', $time);
+                if ($start < $lstart /*&& ($end - $start) >= ($lend - $lstart)*/ )  {
+                    $lstart = $start;
+                    $lend = $end;
+                }
+            }
+
+            $result['col_'. $column][] = $new_entries[$lstart .'_'. $lend];
+            unset($new_entries[$lstart .'_'. $lend]);
+
+            $hit = true;
+
+            while ($hit) {
+                $hit = false;
+                $hstart = 2399; $hend = 2399;
+
+                // check, if there is something, that can be placed after
+                foreach ($new_entries as $time => $grouped_entries) {
+                    list($start, $end) = explode('_', $time);
+
+                    if ( ($start >= $lend) && ($start < $hstart) ) {
+                        $hstart = $start;
+                        $hend = $end;
+                        $hit = true;
+                    }
+                }
+
+                if ($hit) {
+                    $lend = $hend;
+                    $result['col_'. $column][] = $new_entries[$hstart .'_'. $hend];
+                    unset($new_entries[$hstart .'_'. $hend]);
+                }
+            }
+
+            $column++;
+        } // 2nd step
+
+        return $result;
+
+    }
+
+    /**
+     * sorts entries and returns them
+     *
+     * @return array
+     */
+    public function sortEntries()
+    {
+        $entries_for_column = $this->getEntries();
+
+        $result = [];
+        $column = 0;
+
+        // 2nd step - optimize the groups
+        while (sizeof($entries_for_column) > 0) {
+            $lstart = 2399; $lend = 0; $lkey = null;
+
+            foreach ($entries_for_column as $entry_key => $entry) {
+                if ($entry['start'] < $lstart /*&& ($end - $start) >= ($lend - $lstart)*/ )  {
+                    $lstart = $entry['start'];
+                    $lend = $entry['end'];
+                    $lkey = $entry_key;
+                }
+            }
+
+            $result['col_'. $column][] = $entries_for_column[$lkey];
+            unset($entries_for_column[$lkey]);
+
+            $hit = true;
+
+            while ($hit) {
+                $hit = false;
+                $hstart = 2399; $hend = 2399; $hkey = null;
+
+                // check, if there is something, that can be placed after
+                foreach ($entries_for_column as $entry_key => $entry) {
+                    if ( ($entry['start'] >= $lend) && ($entry['start'] < $hstart) ) {
+                        // && (($end - $start) > ($hend - $hstart)) ) {
+                        $hstart = $entry['start'];
+                        $hend = $entry['end'];
+                        $hkey = $entry_key;
+                        $hit = true;
+                    }
+                }
+
+                if ($hit) {
+                    $lend = $hend;
+                    $result['col_'. $column][] = $entries_for_column[$hkey];
+                    unset($entries_for_column[$hkey]);
+                }
+            }
+
+            $column++;
+        } // 2nd step
+        return $result;
+
+    }
+
+    /**
+     * returns a matrix that tells the number of entries for a given timeslot
+     *
+     * @return array
+     */
+    public function getMatrix() {
+        $group_matrix = [];
+        foreach ($this->getGroupedEntries() as $groups) {
+            foreach ($groups as $group) {
+                if (isset($group[0]) && is_array($group[0])) {
+                    $data = $group[0];
+                } else {
+                    $data = $group;
+                }
+
+                for ($i = floor($data['start'] / 100); $i <= floor($data['end'] / 100); $i++) {
+                    for ($j = 0; $j < 60; $j++) {
+                        if (($i * 100) + $j >= $data['start'] && ($i * 100) + $j < $data['end']) {
+                            if (!isset($group_matrix[$i * 100 + $j])) {
+                                $group_matrix[$i * 100 + $j] = 0;
+                            }
+                            $group_matrix[$i * 100 + $j]++;
+                        }
+                    }
+                }
+            }
+        }
+        return $group_matrix;
+    }
+
+    /**
+     * check, if a grouped view of the entries is requested
+     *
+     * @return bool true if grouped, false otherwise
+     */
+    public function isGrouped()
+    {
+        return $this->grouped;
+    }
+
+    /**
+     * Call this function th enable/disable the grouping of entries with the same start and end.
+     *
+     * @param  bool  $group optional, defaults to true
+     * @return void
+     */
+    public function groupEntries($grouped = true)
+    {
+        $this->grouped = $grouped;
+    }
+
+}
diff --git a/lib/calendar/CalendarView.class.php b/lib/calendar/CalendarView.class.php
deleted file mode 100644
index 3d89ef1..0000000
--- a/lib/calendar/CalendarView.class.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-# Lifter010: TODO
-
- /**
- * CalendarView.class.php - generates a calendar
- *
- * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
- *
- * 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.
- *
- * @author      Rasmus Fuhse <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * Kind of bean class for the calendar view.
- *
- * Example of use:
- *
- *  // create a calendar-view and add a column
- *  $plan = new CalendarView();
- *  $plan->addColumn(_('Spalte 1'))
- *      ->addEntry(array(
- *          'id'    => 1,
- *          'color' => '#5C2D64',
- *          'start' => '0930',
- *          'end'   => '1100',
- *          'title' => 'Mathe 2',
- *          'content' => 'Die Mathematiker kreiden sich mal wieder was an.'
- *      )
- *  );
- *
- *  // display the calendar (containing one column)
- *  print $plan->render();
- *
- * @since      2.0
- *
- * @deprecated since Stud.IP 5.5
- */
-
-class CalendarView
-{
-
-    protected $entries        = [];
-    protected $entry_columns  = [];
-    protected $height         = 40;
-    protected $grouped        = false;
-    protected $start_hour     = 8;
-    protected $end_hour       = 21;
-    protected $insertFunction = "";
-    protected $templates      = [];
-    protected $read_only      = false;
-
-    protected static $number_of_instances = 1;
-    protected $view_id;
-
-    public $sorted_entries = [];
-
-
-    /**
-     * You need to pass an instance of this class to the template. The constructor
-     * expects an array of entries of the following type:
-     *  array(
-     *   $day_number => array(array (
-     *    'color' => the color in hex (css-like, without the #)
-     *    'start' => the (start hour * 100) + (start minute)
-     *    'end'   => the (end hour * 100) + (end minute)
-     *    //'day'   => day of week (0 = Sunday, ... , 6 = Saturday)
-     *    'title' => the entry`s title
-     *    'content' => whatever shall be the content of the entry as a string
-     *   ) ...) ...
-     *  )
-     *
-     * @param  mixed  $entries     an array of entries (see above)
-     * @param  string $controller  the name of the controller. Used to create links.
-     */
-    public function __construct($entries = [])
-    {
-        if (!is_array($entries)) {
-            throw new Exception('You need to pass some entries to the CalendarView!');
-        }
-        $this->view_id = self::$number_of_instances++;
-        $this->checkEntries($entries);
-        $this->entries = $entries;
-    }
-
-    /**
-     * set the height for one hour. This value is used to calculate the whole height of the schedule.
-     *
-     * @param  int  $entry_height  the height of one hour in the schedule
-     */
-    public function setHeight($height)
-    {
-        $this->height = $height;
-    }
-
-    /**
-     * set the range of hours to be displayed. the start_hour has to be smaller than the end_hour
-     *
-     * @param  int  $start_hour  the hour to start displaying at
-     * @param  int  $end_hour    the hour to stop displaying at
-     */
-    public function setRange($start_hour, $end_hour)
-    {
-        $this->start_hour = $start_hour;
-        $this->end_hour = $end_hour;
-    }
-
-    /**
-     * does some plausability checks on an array of calendar-entries
-     *
-     * @param  mixed  $entries  an array of calendar-entries
-     *
-     * @return  bool  false if check failed, true otherwise
-     */
-    protected function checkEntries($entries)
-    {
-        foreach ($entries as $column) {
-            if (!$column instanceof CalendarColumn) {
-                throw new Exception('A column of the entries in the CalenarView is not of type CalendarColumn.');
-            }
-        }
-        return true;
-    }
-
-    /**
-     * adds a new column to this view. All entries created with addEntry will be
-     * added to this column.
-     *
-     * @param string  $title  like "monday" to be displayed on top of the column
-     * @param string  $url    to be called when clicked on the title of the column
-     * @param string  $id     any kind of id of the column
-     * @return CalendarView
-     */
-    public function addColumn($title, $url = "", $id = null)
-    {
-        $this->entries[] = CalendarColumn::create($id)
-                        ->setTitle($title)
-                        ->setURL($url);
-        return $this;
-    }
-
-
-    /**
-     * adds a new entry to the last current column. The entry needs to be an
-     * associative array with parameters as follows:
-     * @param array $entry_array: associative array for an entry in the column like
-     * array (
-     *    'color' => the color in hex (css-like, without the #)
-     *    'start' => the (start hour * 100) + (start minute)
-     *    'end'   => the (end hour * 100) + (end minute)
-     *    'title' => the entry`s title
-     *    'content' => whatever shall be the content of the entry as a string
-     * )
-     * @return CalendarView
-     */
-    public function addEntry($entry_array)
-    {
-        if (count($this->entries)) {
-            $this->entries[count($this->entries)-1]->addEntry($entry_array);
-        } else {
-            throw new InvalidArgumentException(_("Es existiert noch keine Spalte in der Ansicht, zu der der Eintrag hinzugefügt werden kann."));
-        }
-        return $this;
-    }
-
-
-    /**
-     * Call this function to enable/disable the grouping of entries with the same start and end.
-     *
-     * @param  bool  $group  optional, defaults to true
-     */
-    public function groupEntries($grouped = true)
-    {
-        $this->grouped = $grouped;
-        foreach($this->getColumns() as $entry_column) {
-            $entry_column->groupEntries();
-        }
-    }
-
-    /**
-     * When a column is clicked at no entry this function is called.
-     * First the templates generates a new entry at the clicked time. Then this
-     * js-function is called which gets the parameters
-     *   "function (new_entry_dom_object, column_id, hour) { ... }"
-     *   with new_entry_dom_object: a real dom-object of the div of the entry
-     *   column_id: id of the column
-     *   hour: integer number from 0 to 23
-     * If js_function_object is an empty string, nothing will be done.
-     *
-     * @param string  $js_function_object  name of js-function or anonymous js-function
-     * @return CalendarView
-     */
-    public function setInsertFunction($js_function_object)
-    {
-        $this->insertFunction = $js_function_object;
-        return $this;
-    }
-
-    /**
-     * outputs the CalendarView with all (grouped) dates in columns.
-     *
-     * @param  array  $params  you can pass some additional variables to the templates
-     *
-     * @return string
-     */
-    public function render($params = [])
-    {
-        $style_parameters = [
-            'whole_height' => $this->getOverallHeight(),
-            'entry_height' => $this->getHeight()
-        ];
-        $factory = new Flexi\Factory(dirname(__file__).'/../../app/views');
-        PageLayout::addStyle($factory->render('calendar/schedule/stylesheet', $style_parameters));
-
-        $template = $GLOBALS['template_factory']->open("calendar/calendar_view.php");
-        $template->set_attribute("calendar_view", $this);
-        $template->set_attribute("view_id", $this->view_id);
-        return $template->render($params);
-    }
-
-
-    /* * * * * * * * * * * * * * *
-     * * *   G E T T E R S   * * *
-     * * * * * * * * * * * * * * */
-
-    /**
-     * Returns an array of calendar-entries, grouped by day and additionally grouped by same start and end
-     * if groupEntries(true) has been called.
-     *
-     * @return  mixed  the (double-)grouped entries
-     */
-    public function getEntries()
-    {
-        $this->sorted_entries = [];
-        foreach ($this->getColumns() as $entry_column) {
-            $this->sorted_entries['day_'. $entry_column->getId()] = $entry_column->getGroupedEntries();
-        }
-        return $this->sorted_entries;
-    }
-
-    /**
-     * Returns an array where for each hour the number of concurrent entries is denoted.
-     * Used by the calendar to display the entries in parallel.
-     *
-     * @return  mixed  concurrent entries at each hour
-     */
-    public function getMatrix()
-    {
-        $matrix = [];
-        foreach ($this->getColumns() as $day => $entry_column) {
-            $matrix['day_'.$day] = $entry_column->getMatrix();
-        }
-        return $matrix;
-    }
-
-
-    /**
-     * returns the previously set start- and end-hour, denoting the
-     * range of entries to be displayed in the current calendar-view
-     *
-     * @return array consisting of the start and end hour
-     */
-    public function getRange()
-    {
-        return [$this->start_hour, $this->end_hour];
-    }
-
-    /**
-     * the calendar can be used in two modes. Use this function to check,
-     * if the grouping-mode is enabled for the current calendar-view
-     *
-     * @return bool true if grouped, false otherwise
-     */
-    public function isGrouped()
-    {
-        return $this->grouped;
-    }
-
-    /**
-     * returns the previously set height for one hour
-     *
-     * @return mixed the height
-     */
-    public function getHeight()
-    {
-        return $this->height;
-    }
-
-    /**
-     * returns the overall height of the calendar
-     *
-     * @return mixed the overall height
-     */
-    public function getOverallHeight()
-    {
-        return $this->height * ($this->end_hour - $this->start_hour) + $this->height
-                + 2 + ($this->end_hour - $this->start_hour) * 2;
-    }
-
-    /**
-     * returns the previously set javasscript insert-function
-     *
-     * @return  string  name of js-function or anonymous js-function
-     */
-    public function getInsertFunction() {
-        return $this->insertFunction;
-    }
-
-    /**
-     * returns all columns of the calendar-view
-     *
-     * @return  array  of CalendarColumn
-     */
-    public function getColumns() {
-        return $this->entries;
-    }
-
-    /**
-     * Set the read-only status of the calendar
-     *
-     * @param bool  $readonly  true to make it read only, false otherwise
-     *
-     * @return void
-     */
-    public function setReadOnly($readonly = true)
-    {
-        $this->read_only = $readonly;
-    }
-
-    /**
-     * Return the read-only status of this calendar
-     *
-     * @return bool the read-only status of this calendar
-     */
-    public function getReadOnly() {
-        return $this->read_only;
-    }
-
-}
diff --git a/lib/calendar/CalendarView.php b/lib/calendar/CalendarView.php
new file mode 100644
index 0000000..3d89ef1
--- /dev/null
+++ b/lib/calendar/CalendarView.php
@@ -0,0 +1,344 @@
+<?php
+# Lifter010: TODO
+
+ /**
+ * CalendarView.class.php - generates a calendar
+ *
+ * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * Kind of bean class for the calendar view.
+ *
+ * Example of use:
+ *
+ *  // create a calendar-view and add a column
+ *  $plan = new CalendarView();
+ *  $plan->addColumn(_('Spalte 1'))
+ *      ->addEntry(array(
+ *          'id'    => 1,
+ *          'color' => '#5C2D64',
+ *          'start' => '0930',
+ *          'end'   => '1100',
+ *          'title' => 'Mathe 2',
+ *          'content' => 'Die Mathematiker kreiden sich mal wieder was an.'
+ *      )
+ *  );
+ *
+ *  // display the calendar (containing one column)
+ *  print $plan->render();
+ *
+ * @since      2.0
+ *
+ * @deprecated since Stud.IP 5.5
+ */
+
+class CalendarView
+{
+
+    protected $entries        = [];
+    protected $entry_columns  = [];
+    protected $height         = 40;
+    protected $grouped        = false;
+    protected $start_hour     = 8;
+    protected $end_hour       = 21;
+    protected $insertFunction = "";
+    protected $templates      = [];
+    protected $read_only      = false;
+
+    protected static $number_of_instances = 1;
+    protected $view_id;
+
+    public $sorted_entries = [];
+
+
+    /**
+     * You need to pass an instance of this class to the template. The constructor
+     * expects an array of entries of the following type:
+     *  array(
+     *   $day_number => array(array (
+     *    'color' => the color in hex (css-like, without the #)
+     *    'start' => the (start hour * 100) + (start minute)
+     *    'end'   => the (end hour * 100) + (end minute)
+     *    //'day'   => day of week (0 = Sunday, ... , 6 = Saturday)
+     *    'title' => the entry`s title
+     *    'content' => whatever shall be the content of the entry as a string
+     *   ) ...) ...
+     *  )
+     *
+     * @param  mixed  $entries     an array of entries (see above)
+     * @param  string $controller  the name of the controller. Used to create links.
+     */
+    public function __construct($entries = [])
+    {
+        if (!is_array($entries)) {
+            throw new Exception('You need to pass some entries to the CalendarView!');
+        }
+        $this->view_id = self::$number_of_instances++;
+        $this->checkEntries($entries);
+        $this->entries = $entries;
+    }
+
+    /**
+     * set the height for one hour. This value is used to calculate the whole height of the schedule.
+     *
+     * @param  int  $entry_height  the height of one hour in the schedule
+     */
+    public function setHeight($height)
+    {
+        $this->height = $height;
+    }
+
+    /**
+     * set the range of hours to be displayed. the start_hour has to be smaller than the end_hour
+     *
+     * @param  int  $start_hour  the hour to start displaying at
+     * @param  int  $end_hour    the hour to stop displaying at
+     */
+    public function setRange($start_hour, $end_hour)
+    {
+        $this->start_hour = $start_hour;
+        $this->end_hour = $end_hour;
+    }
+
+    /**
+     * does some plausability checks on an array of calendar-entries
+     *
+     * @param  mixed  $entries  an array of calendar-entries
+     *
+     * @return  bool  false if check failed, true otherwise
+     */
+    protected function checkEntries($entries)
+    {
+        foreach ($entries as $column) {
+            if (!$column instanceof CalendarColumn) {
+                throw new Exception('A column of the entries in the CalenarView is not of type CalendarColumn.');
+            }
+        }
+        return true;
+    }
+
+    /**
+     * adds a new column to this view. All entries created with addEntry will be
+     * added to this column.
+     *
+     * @param string  $title  like "monday" to be displayed on top of the column
+     * @param string  $url    to be called when clicked on the title of the column
+     * @param string  $id     any kind of id of the column
+     * @return CalendarView
+     */
+    public function addColumn($title, $url = "", $id = null)
+    {
+        $this->entries[] = CalendarColumn::create($id)
+                        ->setTitle($title)
+                        ->setURL($url);
+        return $this;
+    }
+
+
+    /**
+     * adds a new entry to the last current column. The entry needs to be an
+     * associative array with parameters as follows:
+     * @param array $entry_array: associative array for an entry in the column like
+     * array (
+     *    'color' => the color in hex (css-like, without the #)
+     *    'start' => the (start hour * 100) + (start minute)
+     *    'end'   => the (end hour * 100) + (end minute)
+     *    'title' => the entry`s title
+     *    'content' => whatever shall be the content of the entry as a string
+     * )
+     * @return CalendarView
+     */
+    public function addEntry($entry_array)
+    {
+        if (count($this->entries)) {
+            $this->entries[count($this->entries)-1]->addEntry($entry_array);
+        } else {
+            throw new InvalidArgumentException(_("Es existiert noch keine Spalte in der Ansicht, zu der der Eintrag hinzugefügt werden kann."));
+        }
+        return $this;
+    }
+
+
+    /**
+     * Call this function to enable/disable the grouping of entries with the same start and end.
+     *
+     * @param  bool  $group  optional, defaults to true
+     */
+    public function groupEntries($grouped = true)
+    {
+        $this->grouped = $grouped;
+        foreach($this->getColumns() as $entry_column) {
+            $entry_column->groupEntries();
+        }
+    }
+
+    /**
+     * When a column is clicked at no entry this function is called.
+     * First the templates generates a new entry at the clicked time. Then this
+     * js-function is called which gets the parameters
+     *   "function (new_entry_dom_object, column_id, hour) { ... }"
+     *   with new_entry_dom_object: a real dom-object of the div of the entry
+     *   column_id: id of the column
+     *   hour: integer number from 0 to 23
+     * If js_function_object is an empty string, nothing will be done.
+     *
+     * @param string  $js_function_object  name of js-function or anonymous js-function
+     * @return CalendarView
+     */
+    public function setInsertFunction($js_function_object)
+    {
+        $this->insertFunction = $js_function_object;
+        return $this;
+    }
+
+    /**
+     * outputs the CalendarView with all (grouped) dates in columns.
+     *
+     * @param  array  $params  you can pass some additional variables to the templates
+     *
+     * @return string
+     */
+    public function render($params = [])
+    {
+        $style_parameters = [
+            'whole_height' => $this->getOverallHeight(),
+            'entry_height' => $this->getHeight()
+        ];
+        $factory = new Flexi\Factory(dirname(__file__).'/../../app/views');
+        PageLayout::addStyle($factory->render('calendar/schedule/stylesheet', $style_parameters));
+
+        $template = $GLOBALS['template_factory']->open("calendar/calendar_view.php");
+        $template->set_attribute("calendar_view", $this);
+        $template->set_attribute("view_id", $this->view_id);
+        return $template->render($params);
+    }
+
+
+    /* * * * * * * * * * * * * * *
+     * * *   G E T T E R S   * * *
+     * * * * * * * * * * * * * * */
+
+    /**
+     * Returns an array of calendar-entries, grouped by day and additionally grouped by same start and end
+     * if groupEntries(true) has been called.
+     *
+     * @return  mixed  the (double-)grouped entries
+     */
+    public function getEntries()
+    {
+        $this->sorted_entries = [];
+        foreach ($this->getColumns() as $entry_column) {
+            $this->sorted_entries['day_'. $entry_column->getId()] = $entry_column->getGroupedEntries();
+        }
+        return $this->sorted_entries;
+    }
+
+    /**
+     * Returns an array where for each hour the number of concurrent entries is denoted.
+     * Used by the calendar to display the entries in parallel.
+     *
+     * @return  mixed  concurrent entries at each hour
+     */
+    public function getMatrix()
+    {
+        $matrix = [];
+        foreach ($this->getColumns() as $day => $entry_column) {
+            $matrix['day_'.$day] = $entry_column->getMatrix();
+        }
+        return $matrix;
+    }
+
+
+    /**
+     * returns the previously set start- and end-hour, denoting the
+     * range of entries to be displayed in the current calendar-view
+     *
+     * @return array consisting of the start and end hour
+     */
+    public function getRange()
+    {
+        return [$this->start_hour, $this->end_hour];
+    }
+
+    /**
+     * the calendar can be used in two modes. Use this function to check,
+     * if the grouping-mode is enabled for the current calendar-view
+     *
+     * @return bool true if grouped, false otherwise
+     */
+    public function isGrouped()
+    {
+        return $this->grouped;
+    }
+
+    /**
+     * returns the previously set height for one hour
+     *
+     * @return mixed the height
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * returns the overall height of the calendar
+     *
+     * @return mixed the overall height
+     */
+    public function getOverallHeight()
+    {
+        return $this->height * ($this->end_hour - $this->start_hour) + $this->height
+                + 2 + ($this->end_hour - $this->start_hour) * 2;
+    }
+
+    /**
+     * returns the previously set javasscript insert-function
+     *
+     * @return  string  name of js-function or anonymous js-function
+     */
+    public function getInsertFunction() {
+        return $this->insertFunction;
+    }
+
+    /**
+     * returns all columns of the calendar-view
+     *
+     * @return  array  of CalendarColumn
+     */
+    public function getColumns() {
+        return $this->entries;
+    }
+
+    /**
+     * Set the read-only status of the calendar
+     *
+     * @param bool  $readonly  true to make it read only, false otherwise
+     *
+     * @return void
+     */
+    public function setReadOnly($readonly = true)
+    {
+        $this->read_only = $readonly;
+    }
+
+    /**
+     * Return the read-only status of this calendar
+     *
+     * @return bool the read-only status of this calendar
+     */
+    public function getReadOnly() {
+        return $this->read_only;
+    }
+
+}
diff --git a/lib/calendar/CalendarWeekView.class.php b/lib/calendar/CalendarWeekView.class.php
deleted file mode 100644
index c1e0f24..0000000
--- a/lib/calendar/CalendarWeekView.class.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-# Lifter010: TODO
-
-/**
- * CalendarWeekView.class.php - a specialized calendar view for displaying weeks
- *
- * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
- *
- * 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.
- *
- * @author      Till Glöggler <tgloeggl@uos.de> & Rasmus Fuhse <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * Kind of bean class for the calendar view.
- *
- * @since      2.0
- *
- * @deprecated since Stud.IP 5.5
- */
-
-class CalendarWeekView extends CalendarView
-{
-    protected $days = [1,2,3,4,5];
-    protected $context;
-
-
-    /**
-     * You need to pass an instance of this class to the template. The constructor
-     * expects an array of entries of the following type:
-     *  array(
-     *   $day_number => array(array (
-     *    'color' => the color in hex (css-like, without the #)
-     *    'start' => the (start hour * 100) + (start minute)
-     *    'end'   => the (end hour * 100) + (end minute)
-     *    //'day'   => day of week (0 = Sunday, ... , 6 = Saturday)
-     *    'title' => the entry`s title
-     *    'content' => whatever shall be the content of the entry as a string
-     *   ) ...) ...
-     *  )
-     *
-     * @param  mixed  $entries     an array of entries (see above)
-     * @param  string $controller  the name of the controller. Used to create links.
-     */
-    public function __construct($entries, $controller)
-    {
-        parent::__construct($entries);
-        $this->context = $controller;
-    }
-
-    /**
-     * Call this function th enable/disable the grouping of entries with the same start and end.
-     *
-     * @param  bool  $group  optional, defaults to true
-     */
-    public function groupEntries($grouped = true)
-    {
-        $this->grouped = $grouped;
-        foreach($this->entries as $entry_column) {
-            $entry_column->groupEntries();
-        }
-    }
-
-    /* * * * * * * * * * * * * * *
-     * * *   G E T T E R S   * * *
-     * * * * * * * * * * * * * * */
-
-    /**
-     * @return mixed the context
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * @return mixed the days
-     */
-    public function getDays()
-    {
-        return $this->days;
-    }
-
-    /**
-     * returns the previously set javasscript insert-function only
-     * if read_only is not set.
-     *
-     * @return  string  name of js-function or anonymous js-function
-     */
-    public function getInsertFunction() {
-        if (!$this->read_only) {
-            return parent::getInsertFunction();
-        }
-
-        return false;
-    }
-
-    /**
-     * returns all columns of the calendar-view nad removes the url if
-     * read_only is set
-     *
-     * @return  array  of CalendarColumn
-     */
-    public function getColumns() {
-        // remove links and urls if calendar-view is read-only
-        if ($this->read_only) {
-            foreach ($this->entries as $column) {
-                $column->setURL(false);
-                foreach ($column->entries as $key => $entry) {
-                    unset($column->entries[$key]['url']);
-                    unset($column->entries[$key]['onClick']);
-                    unset($column->entries[$key]['icons']);
-                }
-            }
-        }
-
-        return parent::getColumns();
-    }
-}
diff --git a/lib/calendar/CalendarWeekView.php b/lib/calendar/CalendarWeekView.php
new file mode 100644
index 0000000..c1e0f24
--- /dev/null
+++ b/lib/calendar/CalendarWeekView.php
@@ -0,0 +1,124 @@
+<?php
+# Lifter010: TODO
+
+/**
+ * CalendarWeekView.class.php - a specialized calendar view for displaying weeks
+ *
+ * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
+ *
+ * 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.
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de> & Rasmus Fuhse <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * Kind of bean class for the calendar view.
+ *
+ * @since      2.0
+ *
+ * @deprecated since Stud.IP 5.5
+ */
+
+class CalendarWeekView extends CalendarView
+{
+    protected $days = [1,2,3,4,5];
+    protected $context;
+
+
+    /**
+     * You need to pass an instance of this class to the template. The constructor
+     * expects an array of entries of the following type:
+     *  array(
+     *   $day_number => array(array (
+     *    'color' => the color in hex (css-like, without the #)
+     *    'start' => the (start hour * 100) + (start minute)
+     *    'end'   => the (end hour * 100) + (end minute)
+     *    //'day'   => day of week (0 = Sunday, ... , 6 = Saturday)
+     *    'title' => the entry`s title
+     *    'content' => whatever shall be the content of the entry as a string
+     *   ) ...) ...
+     *  )
+     *
+     * @param  mixed  $entries     an array of entries (see above)
+     * @param  string $controller  the name of the controller. Used to create links.
+     */
+    public function __construct($entries, $controller)
+    {
+        parent::__construct($entries);
+        $this->context = $controller;
+    }
+
+    /**
+     * Call this function th enable/disable the grouping of entries with the same start and end.
+     *
+     * @param  bool  $group  optional, defaults to true
+     */
+    public function groupEntries($grouped = true)
+    {
+        $this->grouped = $grouped;
+        foreach($this->entries as $entry_column) {
+            $entry_column->groupEntries();
+        }
+    }
+
+    /* * * * * * * * * * * * * * *
+     * * *   G E T T E R S   * * *
+     * * * * * * * * * * * * * * */
+
+    /**
+     * @return mixed the context
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
+
+    /**
+     * @return mixed the days
+     */
+    public function getDays()
+    {
+        return $this->days;
+    }
+
+    /**
+     * returns the previously set javasscript insert-function only
+     * if read_only is not set.
+     *
+     * @return  string  name of js-function or anonymous js-function
+     */
+    public function getInsertFunction() {
+        if (!$this->read_only) {
+            return parent::getInsertFunction();
+        }
+
+        return false;
+    }
+
+    /**
+     * returns all columns of the calendar-view nad removes the url if
+     * read_only is set
+     *
+     * @return  array  of CalendarColumn
+     */
+    public function getColumns() {
+        // remove links and urls if calendar-view is read-only
+        if ($this->read_only) {
+            foreach ($this->entries as $column) {
+                $column->setURL(false);
+                foreach ($column->entries as $key => $entry) {
+                    unset($column->entries[$key]['url']);
+                    unset($column->entries[$key]['onClick']);
+                    unset($column->entries[$key]['icons']);
+                }
+            }
+        }
+
+        return parent::getColumns();
+    }
+}
diff --git a/lib/classes/AdminCourseFilter.class.php b/lib/classes/AdminCourseFilter.class.php
deleted file mode 100644
index f643e09..0000000
--- a/lib/classes/AdminCourseFilter.class.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-/**
- * Class AdminCourseFilter
- *
- * The main class to filter all courses for admins. It's a singleton class, so you
- * better call it with AdminCourseFilter::get(). The whole class is created to
- * provide a nice hook for plugins to add special filters into the admin-area of
- * Stud.IP.
- *
- * To add a filter with a plugin, listen to the notification "AdminCourseFilterWillQuery"
- * like this:
- *
- *     NotificationCenter::addObserver($this, "addMyFilter", "AdminCourseFilterWillQuery");
- *
- * Where $this is an object and "addMyFilter" a method. Such a method might look like this:
- *
- *     public function addLectureshipFilter($event, $filter)
- *     {
- *         if ($GLOBALS['user']->cfg->getValue("LECTURESHIP_FILTER")) {
- *             $filter->query->join('lehrauftrag', 'seminare.Seminar_id = lehrauftrag.seminar_id');
- *         }
- *     }
- *
- * Within this method you alter the public $filter->query object. That query object is of type SQLQuery.
- *
- */
-class AdminCourseFilter
-{
-    static protected $instance = null;
-
-    /** @var SQLQuery|null  */
-    public $query = null;
-    public $max_show_courses = 500;
-    public $settings = [];
-
-    /**
-     * returns an AdminCourseFilter singleton object
-     * @return AdminCourseFilter or derived-class object
-     */
-    static public function get($reset_settings = false)
-    {
-        if (!self::$instance) {
-            $class = get_called_class();
-            self::$instance = new $class($reset_settings);
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Constructor of the singleton-object.
-     */
-    public function __construct()
-    {
-        $this->initSettings();
-    }
-
-    protected function initSettings()
-    {
-        $this->query = SQLQuery::table('seminare');
-        $this->query->join('sem_types', 'sem_types', 'sem_types.id = seminare.status');
-        $this->query->join('sem_classes', 'sem_classes', 'sem_classes.id = sem_types.class');
-        $this->query->where("sem_classes.studygroup_mode = '0'");
-        $this->query->groupBy('seminare.Seminar_id');
-
-        if ($GLOBALS['user']->cfg->ADMIN_COURSES_SEARCHTEXT) {
-            $this->query->join('teachers_su', 'seminar_user', "teachers_su.Seminar_id = seminare.Seminar_id AND teachers_su.status = 'dozent'");
-            $this->query->join('teachers', 'auth_user_md5', 'teachers.user_id = teachers_su.user_id');
-            $this->query->where(
-                'search',
-                "(seminare.name LIKE :search OR seminare.VeranstaltungsNummer LIKE :search OR seminare.untertitel LIKE :search OR CONCAT(teachers.Vorname, ' ', teachers.Nachname) LIKE :search)",
-                ['search' => '%'.$GLOBALS['user']->cfg->ADMIN_COURSES_SEARCHTEXT.'%']
-            );
-        }
-        if (Request::option('course_id')) {
-            $this->query->where('course_id', 'seminare.Seminar_id = :course_id', ['course_id' => Request::option('course_id')]);
-        }
-        $inst_ids = [];
-
-        if (
-            !$GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT
-            || $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT === 'all'
-        ) {
-            $inst = new SimpleCollection(Institute::getMyInstitutes($GLOBALS['user']->id));
-            $inst_ids = $inst->map(function ($a) {
-                return $a['Institut_id'];
-            });
-        } else {
-
-            $inst_id = $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
-            $inst_ids[] = $inst_id;
-
-            if ($GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN) {
-                $inst = Institute::find($inst_id);
-                if ($inst && $inst->isFaculty()) {
-                    foreach ($inst->sub_institutes->pluck('Institut_id') as $institut_id) {
-                        $inst_ids[] = $institut_id;
-                    }
-                }
-            }
-        }
-
-        if (Config::get()->ALLOW_ADMIN_RELATED_INST) {
-            $this->query->where('seminar_inst', 'EXISTS (SELECT 1 FROM seminar_inst WHERE seminar_id = seminare.Seminar_id AND institut_id IN (:institut_ids))');
-        } else {
-            $this->query->where("seminar_inst", "seminare.institut_id IN (:institut_ids)");
-        }
-        $this->query->parameter('institut_ids', $inst_ids);
-
-        if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) {
-            $this->query->join('semester_courses', 'semester_courses.course_id = seminare.Seminar_id', 'LEFT JOIN');
-            $this->query->where('semester_id', '(semester_courses.semester_id = :semester_id OR semester_courses.semester_id IS NULL)', [
-                'semester_id' => $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE
-            ]);
-        }
-
-        if ($GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER && $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER !== 'all') {
-            if (str_contains($GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER, '_')) {
-                list($sem_class_id, $sem_type_id) = explode('_', $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER);
-                $this->query->where('course_type', 'seminare.status = :course_type', ['course_type' => $sem_type_id]);
-            } else {
-                //sem class
-                $this->query->where('course_class', 'sem_types.class = :course_class', [
-                    'course_class' => $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER
-                ]);
-            }
-
-        }
-
-        if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL) {
-            $this->query->join('mvv_lvgruppe_seminar', '`mvv_lvgruppe_seminar`.`seminar_id` = `seminare`.`Seminar_id`');
-            $this->query->join('mvv_lvgruppe_modulteil', '`mvv_lvgruppe_modulteil`.`lvgruppe_id` = `mvv_lvgruppe_seminar`.`lvgruppe_id`');
-            $this->query->join('mvv_modulteil', '`mvv_modulteil`.`modulteil_id` = `mvv_lvgruppe_modulteil`.`modulteil_id`');
-            $this->query->join('mvv_modul', '`mvv_modul`.`modul_id` = `mvv_modulteil`.`modul_id`');
-            $this->query->join('mvv_stgteilabschnitt_modul', '`mvv_stgteilabschnitt_modul`.`modul_id` = `mvv_modul`.`modul_id`');
-            $this->query->join('mvv_stgteilabschnitt', '`mvv_stgteilabschnitt`.`abschnitt_id` = `mvv_stgteilabschnitt_modul`.`abschnitt_id`');
-            $this->query->join('mvv_stgteilversion', '`mvv_stgteilversion`.`version_id` = `mvv_stgteilabschnitt`.`version_id`');
-            $this->query->where('stgteil', 'mvv_stgteilversion.stgteil_id = :stgteil_id', [
-                'stgteil_id' => $GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL
-            ]);
-        }
-
-        if ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER) {
-            $this->query->join('teachers_su', 'seminar_user', "teachers_su.Seminar_id = seminare.Seminar_id AND teachers_su.status = 'dozent'");
-            $this->query->where(
-                'teacher_filter',
-                "teachers_su.user_id = :teacher_id",
-                ['teacher_id' => $GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER]
-            );
-        }
-
-
-
-        $datafields_filters = $GLOBALS['user']->cfg->ADMIN_COURSES_DATAFIELDS_FILTERS;
-        foreach ($datafields_filters as $datafield_id => $value) {
-            $this->query->join('de_'.$datafield_id, 'datafields_entries', 'de_'.$datafield_id.'.range_id = seminare.Seminar_id AND `de_'.$datafield_id.'`.datafield_id = :de_'.$datafield_id.'_id');
-            $this->query->where('de_' . $datafield_id . '_contents', 'de_' . $datafield_id . '.`content` LIKE :de_' . $datafield_id . '_content',
-                [
-                    'de_' . $datafield_id . '_id' => $datafield_id,
-                    'de_' . $datafield_id . '_content' => '%' . $value . '%'
-                ]);
-        }
-    }
-
-    /**
-     * Returns the data of the resultset of the AdminCourseFilter.
-     * Also saves the settings in the session.
-     * Note that a notification AdminCourseFilterWillQuery will be posted, before the result is computed.
-     * Plugins may register at this event to fully alter this AdminCourseFilter-object and so the resultset.
-     * @return array associative array with seminar_ids as keys and seminar-data-arrays as values.
-     */
-    public function getCourses()
-    {
-        NotificationCenter::postNotification("AdminCourseFilterWillQuery", $this);
-        return $this->query->fetchAll(Course::class);
-    }
-
-    /**
-     * @return integer number of courses that this filter would return
-     */
-    public function countCourses()
-    {
-        NotificationCenter::postNotification("AdminCourseFilterWillQuery", $this);
-        return $this->query->count();
-    }
-
-    /**
-     * @param int|null $limit
-     * @return Course[]
-     */
-    public function fetchCourses(?int $limit = null): array
-    {
-        NotificationCenter::postNotification('AdminCourseFilterWillQuery', $this);
-        return $this->query->fetchAll(Course::class, $limit);
-    }
-
-    /**
-     * Returns the data of the resultset of the AdminCourseFilter.
-     *
-     * @param string $order_by possible values name or number
-     *
-     * Note that a notification AdminCourseFilterWillQuery will be posted, before the result is computed.
-     * Plugins may register at this event to fully alter this AdminCourseFilter-object and so the resultset.
-     * @return array associative array with seminar_ids as keys and seminar-data-arrays as values.
-     */
-    public function getCoursesForAdminWidget(string $order_by = 'name')
-    {
-        try {
-            $order = 'seminare.name';
-            if ($order_by === 'number') {
-                $order = 'seminare.veranstaltungsnummer, seminare.name';
-            }
-            $this->query->orderBy($order);
-            return $this->fetchCourses($this->max_show_courses);
-        } catch (OverflowException $e) {
-            return [];
-        }
-    }
-
-}
diff --git a/lib/classes/AdminCourseFilter.php b/lib/classes/AdminCourseFilter.php
new file mode 100644
index 0000000..f643e09
--- /dev/null
+++ b/lib/classes/AdminCourseFilter.php
@@ -0,0 +1,220 @@
+<?php
+
+/**
+ * Class AdminCourseFilter
+ *
+ * The main class to filter all courses for admins. It's a singleton class, so you
+ * better call it with AdminCourseFilter::get(). The whole class is created to
+ * provide a nice hook for plugins to add special filters into the admin-area of
+ * Stud.IP.
+ *
+ * To add a filter with a plugin, listen to the notification "AdminCourseFilterWillQuery"
+ * like this:
+ *
+ *     NotificationCenter::addObserver($this, "addMyFilter", "AdminCourseFilterWillQuery");
+ *
+ * Where $this is an object and "addMyFilter" a method. Such a method might look like this:
+ *
+ *     public function addLectureshipFilter($event, $filter)
+ *     {
+ *         if ($GLOBALS['user']->cfg->getValue("LECTURESHIP_FILTER")) {
+ *             $filter->query->join('lehrauftrag', 'seminare.Seminar_id = lehrauftrag.seminar_id');
+ *         }
+ *     }
+ *
+ * Within this method you alter the public $filter->query object. That query object is of type SQLQuery.
+ *
+ */
+class AdminCourseFilter
+{
+    static protected $instance = null;
+
+    /** @var SQLQuery|null  */
+    public $query = null;
+    public $max_show_courses = 500;
+    public $settings = [];
+
+    /**
+     * returns an AdminCourseFilter singleton object
+     * @return AdminCourseFilter or derived-class object
+     */
+    static public function get($reset_settings = false)
+    {
+        if (!self::$instance) {
+            $class = get_called_class();
+            self::$instance = new $class($reset_settings);
+        }
+        return self::$instance;
+    }
+
+    /**
+     * Constructor of the singleton-object.
+     */
+    public function __construct()
+    {
+        $this->initSettings();
+    }
+
+    protected function initSettings()
+    {
+        $this->query = SQLQuery::table('seminare');
+        $this->query->join('sem_types', 'sem_types', 'sem_types.id = seminare.status');
+        $this->query->join('sem_classes', 'sem_classes', 'sem_classes.id = sem_types.class');
+        $this->query->where("sem_classes.studygroup_mode = '0'");
+        $this->query->groupBy('seminare.Seminar_id');
+
+        if ($GLOBALS['user']->cfg->ADMIN_COURSES_SEARCHTEXT) {
+            $this->query->join('teachers_su', 'seminar_user', "teachers_su.Seminar_id = seminare.Seminar_id AND teachers_su.status = 'dozent'");
+            $this->query->join('teachers', 'auth_user_md5', 'teachers.user_id = teachers_su.user_id');
+            $this->query->where(
+                'search',
+                "(seminare.name LIKE :search OR seminare.VeranstaltungsNummer LIKE :search OR seminare.untertitel LIKE :search OR CONCAT(teachers.Vorname, ' ', teachers.Nachname) LIKE :search)",
+                ['search' => '%'.$GLOBALS['user']->cfg->ADMIN_COURSES_SEARCHTEXT.'%']
+            );
+        }
+        if (Request::option('course_id')) {
+            $this->query->where('course_id', 'seminare.Seminar_id = :course_id', ['course_id' => Request::option('course_id')]);
+        }
+        $inst_ids = [];
+
+        if (
+            !$GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT
+            || $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT === 'all'
+        ) {
+            $inst = new SimpleCollection(Institute::getMyInstitutes($GLOBALS['user']->id));
+            $inst_ids = $inst->map(function ($a) {
+                return $a['Institut_id'];
+            });
+        } else {
+
+            $inst_id = $GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT;
+            $inst_ids[] = $inst_id;
+
+            if ($GLOBALS['user']->cfg->MY_INSTITUTES_INCLUDE_CHILDREN) {
+                $inst = Institute::find($inst_id);
+                if ($inst && $inst->isFaculty()) {
+                    foreach ($inst->sub_institutes->pluck('Institut_id') as $institut_id) {
+                        $inst_ids[] = $institut_id;
+                    }
+                }
+            }
+        }
+
+        if (Config::get()->ALLOW_ADMIN_RELATED_INST) {
+            $this->query->where('seminar_inst', 'EXISTS (SELECT 1 FROM seminar_inst WHERE seminar_id = seminare.Seminar_id AND institut_id IN (:institut_ids))');
+        } else {
+            $this->query->where("seminar_inst", "seminare.institut_id IN (:institut_ids)");
+        }
+        $this->query->parameter('institut_ids', $inst_ids);
+
+        if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE) {
+            $this->query->join('semester_courses', 'semester_courses.course_id = seminare.Seminar_id', 'LEFT JOIN');
+            $this->query->where('semester_id', '(semester_courses.semester_id = :semester_id OR semester_courses.semester_id IS NULL)', [
+                'semester_id' => $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE
+            ]);
+        }
+
+        if ($GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER && $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER !== 'all') {
+            if (str_contains($GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER, '_')) {
+                list($sem_class_id, $sem_type_id) = explode('_', $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER);
+                $this->query->where('course_type', 'seminare.status = :course_type', ['course_type' => $sem_type_id]);
+            } else {
+                //sem class
+                $this->query->where('course_class', 'sem_types.class = :course_class', [
+                    'course_class' => $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER
+                ]);
+            }
+
+        }
+
+        if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL) {
+            $this->query->join('mvv_lvgruppe_seminar', '`mvv_lvgruppe_seminar`.`seminar_id` = `seminare`.`Seminar_id`');
+            $this->query->join('mvv_lvgruppe_modulteil', '`mvv_lvgruppe_modulteil`.`lvgruppe_id` = `mvv_lvgruppe_seminar`.`lvgruppe_id`');
+            $this->query->join('mvv_modulteil', '`mvv_modulteil`.`modulteil_id` = `mvv_lvgruppe_modulteil`.`modulteil_id`');
+            $this->query->join('mvv_modul', '`mvv_modul`.`modul_id` = `mvv_modulteil`.`modul_id`');
+            $this->query->join('mvv_stgteilabschnitt_modul', '`mvv_stgteilabschnitt_modul`.`modul_id` = `mvv_modul`.`modul_id`');
+            $this->query->join('mvv_stgteilabschnitt', '`mvv_stgteilabschnitt`.`abschnitt_id` = `mvv_stgteilabschnitt_modul`.`abschnitt_id`');
+            $this->query->join('mvv_stgteilversion', '`mvv_stgteilversion`.`version_id` = `mvv_stgteilabschnitt`.`version_id`');
+            $this->query->where('stgteil', 'mvv_stgteilversion.stgteil_id = :stgteil_id', [
+                'stgteil_id' => $GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL
+            ]);
+        }
+
+        if ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER) {
+            $this->query->join('teachers_su', 'seminar_user', "teachers_su.Seminar_id = seminare.Seminar_id AND teachers_su.status = 'dozent'");
+            $this->query->where(
+                'teacher_filter',
+                "teachers_su.user_id = :teacher_id",
+                ['teacher_id' => $GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER]
+            );
+        }
+
+
+
+        $datafields_filters = $GLOBALS['user']->cfg->ADMIN_COURSES_DATAFIELDS_FILTERS;
+        foreach ($datafields_filters as $datafield_id => $value) {
+            $this->query->join('de_'.$datafield_id, 'datafields_entries', 'de_'.$datafield_id.'.range_id = seminare.Seminar_id AND `de_'.$datafield_id.'`.datafield_id = :de_'.$datafield_id.'_id');
+            $this->query->where('de_' . $datafield_id . '_contents', 'de_' . $datafield_id . '.`content` LIKE :de_' . $datafield_id . '_content',
+                [
+                    'de_' . $datafield_id . '_id' => $datafield_id,
+                    'de_' . $datafield_id . '_content' => '%' . $value . '%'
+                ]);
+        }
+    }
+
+    /**
+     * Returns the data of the resultset of the AdminCourseFilter.
+     * Also saves the settings in the session.
+     * Note that a notification AdminCourseFilterWillQuery will be posted, before the result is computed.
+     * Plugins may register at this event to fully alter this AdminCourseFilter-object and so the resultset.
+     * @return array associative array with seminar_ids as keys and seminar-data-arrays as values.
+     */
+    public function getCourses()
+    {
+        NotificationCenter::postNotification("AdminCourseFilterWillQuery", $this);
+        return $this->query->fetchAll(Course::class);
+    }
+
+    /**
+     * @return integer number of courses that this filter would return
+     */
+    public function countCourses()
+    {
+        NotificationCenter::postNotification("AdminCourseFilterWillQuery", $this);
+        return $this->query->count();
+    }
+
+    /**
+     * @param int|null $limit
+     * @return Course[]
+     */
+    public function fetchCourses(?int $limit = null): array
+    {
+        NotificationCenter::postNotification('AdminCourseFilterWillQuery', $this);
+        return $this->query->fetchAll(Course::class, $limit);
+    }
+
+    /**
+     * Returns the data of the resultset of the AdminCourseFilter.
+     *
+     * @param string $order_by possible values name or number
+     *
+     * Note that a notification AdminCourseFilterWillQuery will be posted, before the result is computed.
+     * Plugins may register at this event to fully alter this AdminCourseFilter-object and so the resultset.
+     * @return array associative array with seminar_ids as keys and seminar-data-arrays as values.
+     */
+    public function getCoursesForAdminWidget(string $order_by = 'name')
+    {
+        try {
+            $order = 'seminare.name';
+            if ($order_by === 'number') {
+                $order = 'seminare.veranstaltungsnummer, seminare.name';
+            }
+            $this->query->orderBy($order);
+            return $this->fetchCourses($this->max_show_courses);
+        } catch (OverflowException $e) {
+            return [];
+        }
+    }
+
+}
diff --git a/lib/classes/Assets.class.php b/lib/classes/Assets.class.php
deleted file mode 100644
index 928c47c..0000000
--- a/lib/classes/Assets.class.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter005: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
- * Assets.class.php - assets helper
- *
- * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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 class is used to construct URLs for static content like images,
- * stylesheets or javascripts. As the URL to the "assets" directory is
- * configurable one always has to construct the above mentioned URLs
- * dynamically.
- *
- * Example:
- *
- *     # construct the URL for the image "blank.gif"
- *     $url = Assets::image_path('blank.gif');
- *
- * @package   studip
- *
- * @author    mlunzena
- * @copyright (c) Authors
- */
-class Assets
-{
-
-    const NUMBER_OF_ALIASES = 2;
-
-    /**
-     * @ignore
-     */
-    private static $assets_url;
-    private static $assets_path;
-    private static $dynamic;
-    private static $counter_cache;
-
-    /**
-     * This method sets the URL to your assets.
-     *
-     * @param string $path the path to the assets
-     */
-    public static function set_assets_path(string $path): void
-    {
-        self::$assets_path = $path;
-    }
-
-    /**
-     * This method sets the URL to your assets.
-     *
-     * @param  string       the URL to the assets
-     *
-     * @return void
-     */
-    public static function set_assets_url($url)
-    {
-        self::$assets_url = $url;
-        self::$counter_cache = NULL;
-        self::$dynamic = mb_strpos($url, '%d') !== FALSE;
-    }
-
-    /**
-     * This class method is an accessor to the URL "prefix" for all things "asset"
-     * Prepend the return value of this method to the relative path of the wanted
-     * static content.
-     *
-     * Additionally if the ASSETS_URL contains the string '%d', it will be
-     * replaced with a random number between 0 and 3. If you passed an argument
-     * this number will not be random but specific to that argument thus being
-     * referentially transparent.
-     *
-     * Example:
-     *
-     *  # static ASSETS_URL
-     *  $ASSETS_URL = 'http://www.example.com/public/';
-     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
-     *  echo Assets::url('javascripts/prototype.js')    . "\n";
-     *
-     *  # output
-     *  http://www.example.com/public/javascripts/prototype.js
-     *  http://www.example.com/public/javascripts/prototype.js
-     *
-     *
-     *  # dynamic ASSETS_URL
-     *  $ASSETS_URL = 'http://www%d.example.com/public/';
-     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
-     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
-     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
-     *  echo Assets::url('javascripts/prototype.js')    . "\n";
-     *  echo Assets::url('javascripts/prototype.js')    . "\n";
-     *  echo Assets::url('javascripts/prototype.js')    . "\n";
-     *
-     *  # output
-     *  http://www0.example.com/public/javascripts/prototype.js
-     *  http://www1.example.com/public/javascripts/prototype.js
-     *  http://www2.example.com/public/javascripts/prototype.js
-     *  http://www1.example.com/public/javascripts/prototype.js
-     *  http://www1.example.com/public/javascripts/prototype.js
-     *  http://www1.example.com/public/javascripts/prototype.js
-     *
-     *
-     * @param string an optional suffix which is used to construct a number if
-     *               ASSETS_URL is dynamic (contains '%d')
-     *
-     * @return string the URL "prefix"
-     */
-    public static function url($to = '')
-    {
-        if (!self::$dynamic) {
-            return self::$assets_url . $to;
-        }
-
-        # dynamic ASSETS_URL
-        return sprintf(self::$assets_url,
-            $to == ''
-                ? self::$counter_cache++ % self::NUMBER_OF_ALIASES
-                # alternative implementation
-                # : hexdec(mb_substr(sha1($to),-1)) & 3)
-                : ord($to[1]) & (self::NUMBER_OF_ALIASES - 1))
-
-        . $to;
-    }
-
-    /**
-     * This class method is an accessor to the path "prefix" for all things "asset"
-     */
-    public static function path($to = ''): string
-    {
-        return self::$assets_path . $to;
-    }
-
-    /**
-     * Returns an image tag using options as html attributes on the
-     * tag, but with these special cases:
-     *
-     * 'alt'  - If no alt text is given, the file name part of the $source is used
-     *   (capitalized and without the extension)
-     * * 'size' - Supplied as "X@Y", so "30@45" becomes width="30" and height="45"
-     *
-     * The source can be supplied as a...
-     * * full path, like "/my_images/image.gif"
-     * * file name, like "rss.png", that gets expanded to "/images/rss.png"
-     * * file name without extension, like "logo", that gets expanded to "/images/logo.png"
-     *
-     * Do not use this to render icons. Use the more appropiate class
-     * Icon for this.
-     */
-    public static function img($source, $opt = [])
-    {
-        if (!$source) {
-            return '';
-        }
-
-        $size = $opt['size'] ?? null;
-
-        $opt = self::parse_attributes($opt);
-
-        $opt['src'] = self::image_path($source);
-
-        if (!isset($opt['alt'])) {
-            $opt['alt'] = ucfirst(current(explode('.', basename($opt['src']))));
-        }
-
-        if (isset($size) && !isset($opt['width'])) {
-            $size = explode('@', $size, 2);
-            $opt['width'] = $size[0];
-            $opt['height'] = $size[1] ?? null;
-
-            unset($opt['size']);
-        }
-
-        return self::tag('img', $opt);
-    }
-
-
-    /**
-     * Returns an input tag using options as html attributes on the
-     * tag, but with these special cases:
-     *
-     * * 'size' - Supplied as "X@Y", so "30@45" becomes width="30" and height="45"
-     *
-     * The source can be supplied as a...
-     * * full path, like "/my_images/image.gif"
-     * * file name, like "rss.png", that gets expanded to "/images/rss.png"
-     * * file name without extension, like "logo", that gets expanded to "/images/logo.png"
-     *
-     * Do not use this to render icons. Use the more appropiate class
-     * Icon for this.
-     */
-    public static function input($source, $opt = [])
-    {
-
-        if (!$source) {
-            return '';
-        }
-
-        $parts = explode('/', $source);
-
-        $size = $opt['size'];
-
-        $opt = self::parse_attributes($opt);
-
-        $opt['src'] = self::image_path($source);
-        $opt['type'] = 'image';
-
-        if (isset($size) && !isset($opt['width'])) {
-            [$opt['width'], $opt['height']] = explode('@', $size, 2);
-            unset($opt['size']);
-        }
-
-        return self::tag('input', $opt);
-    }
-
-    /**
-     * Returns path to an image asset.
-     *
-     * Example:
-     *
-     * The src can be supplied as a...
-     *
-     * full path,
-     *   like "/my_images/image.gif"
-     *
-     * file name,
-     *   like "rss.png", that gets expanded to "/images/rss.png"
-     *
-     * file name without extension,
-     *   like "logo", that gets expanded to "/images/logo.png"
-     *
-     * Note: This function should be private/depracated for the use in other
-     * scripts, as we would like to always generate the complete <image> oder
-     * <input> tag. Please use Assets::img or Assets::input instead.
-     */
-    public static function image_path($source, $respect_retina = false)
-    {
-        $path = self::compute_public_path($source, 'images', 'png');
-
-        return $path;
-    }
-
-    /**
-     * Returns a script include tag per source given as argument.
-     *
-     * Examples:
-     *
-     *   Assets::script('prototype') =>
-     *     <script src="/javascript/prototype.js"></script>
-     *
-     *   Assets::script('common.javascript', '/elsewhere/cools') =>
-     *     <script src="/js/common.javascript"></script>
-     *     <script src="/elsewhere/cools.js"></script>
-     */
-    public static function script($atLeastOneArgument)
-    {
-        $html = '';
-        foreach (func_get_args() as $source) {
-            $source = self::javascript_path($source);
-            $html .= self::content_tag('script', '',
-                ['src' => $source]);
-            $html .= "\n";
-        }
-
-        return $html;
-    }
-
-
-    /**
-     * Returns path to a javascript asset.
-     *
-     * Example:
-     *
-     *   Assets::javascript_path('ajax') => /javascripts/ajax.js
-     */
-    public static function javascript_path($source)
-    {
-        return self::compute_public_path($source, 'javascripts', 'js');
-    }
-
-
-    /**
-     * Returns a css link tag per source given as argument.
-     *
-     * Examples:
-     *
-     *   Assets::stylesheet('style') =>
-     *     <link href="/stylesheets/style.css" media="screen" rel="stylesheet">
-     *
-     *   Assets::stylesheet('style', array('media' => 'all'))  =>
-     *     <link href="/stylesheets/style.css" media="all" rel="stylesheet">
-     *
-     *   Assets::stylesheet('random.styles', '/css/stylish') =>
-     *     <link href="/stylesheets/random.styles" media="screen" rel="stylesheet">
-     *     <link href="/css/stylish.css" media="screen" rel="stylesheet">
-     */
-    public static function stylesheet($atLeastOneArgument)
-    {
-        $sources = func_get_args();
-        $sourceOptions = (func_num_args() > 1 &&
-            is_array($sources[func_num_args() - 1]))
-            ? array_pop($sources)
-            : [];
-
-        $html = '';
-        foreach ($sources as $source) {
-            $source = self::stylesheet_path($source);
-            $opt = array_merge(['rel' => 'stylesheet',
-                    'media' => 'screen',
-                    'href' => $source],
-                $sourceOptions);
-            $html .= self::tag('link', $opt) . "\n";
-        }
-
-        return $html;
-    }
-
-
-    /**
-     * Returns path to a stylesheet asset.
-     *
-     * Example:
-     *
-     *   stylesheet_path('style') => /stylesheets/style.css
-     */
-    public static function stylesheet_path($source)
-    {
-        return self::compute_public_path($source, 'stylesheets', 'css');
-    }
-
-
-    /**
-     * This function computes the public path to the given source by using default
-     * dir and ext if not specified by the source. If source is not an absolute
-     * URL, the assets url is incorporated.
-     *
-     * @ignore
-     */
-    private static function compute_public_path($source, $dir, $ext)
-    {
-
-        # add extension if not present
-        if ('' == mb_substr(mb_strrchr($source, "."), 1))
-            $source .= ".$ext";
-
-        # if source is not absolute
-        if (FALSE === mb_strpos($source, ':')) {
-
-            # add dir if url does not contain a path
-            if ('/' !== $source[0])
-                $source = "$dir/$source";
-
-            # consider asset host
-            $source = self::url(ltrim($source, '/'));
-        }
-
-        return $source;
-    }
-
-
-    /**
-     * Constructs an html tag.
-     *
-     * @ignore
-     *
-     * @param  string  tag name
-     * @param  array   tag options
-     * @param  boolean true to leave tag open
-     *
-     * @return string
-     */
-    private static function tag($name, $options = [], $open = FALSE)
-    {
-        if (!$name) {
-            return '';
-        }
-
-        ksort($options);
-        return '<' . $name . ' ' . arrayToHtmlAttributes($options) . ($open ? '>' : '>');
-    }
-
-
-    /**
-     * Helper function for content tags.
-     *
-     * @param string $name    tag name
-     * @param string $content tag content
-     * @param array $options tag options
-     *
-     * @return string
-     */
-    private static function content_tag($name, $content = '', $options = [])
-    {
-        if (!$name) {
-            return '';
-        }
-        return '<' . $name . ' ' . arrayToHtmlAttributes($options) . '>' .
-        $content .
-        '</' . $name . '>';
-    }
-
-    /**
-     * Parse a HTML attribute string into an array.
-     *
-     * @ignore
-     */
-    private static function parse_attributes($stringOrArray)
-    {
-
-        if (is_array($stringOrArray))
-            return $stringOrArray;
-
-        preg_match_all('/
-      \s*(\w+)              # key                               \\1
-      \s*=\s*               # =
-      (\'|")?               # values may be included in \' or " \\2
-      (.*?)                 # value                             \\3
-      (?(2) \\2)            # matching \' or " if needed        \\4
-      \s*(?:
-        (?=\w+\s*=) | \s*$  # followed by another key= or the end of the string
-      )
-    /x', $stringOrArray, $matches, PREG_SET_ORDER);
-
-        $attributes = [];
-        foreach ($matches as $val)
-            $attributes[$val[1]] = $val[3];
-
-        return $attributes;
-    }
-}
diff --git a/lib/classes/Assets.php b/lib/classes/Assets.php
new file mode 100644
index 0000000..928c47c
--- /dev/null
+++ b/lib/classes/Assets.php
@@ -0,0 +1,439 @@
+<?php
+# Lifter002: TODO
+# Lifter005: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/*
+ * Assets.class.php - assets helper
+ *
+ * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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 class is used to construct URLs for static content like images,
+ * stylesheets or javascripts. As the URL to the "assets" directory is
+ * configurable one always has to construct the above mentioned URLs
+ * dynamically.
+ *
+ * Example:
+ *
+ *     # construct the URL for the image "blank.gif"
+ *     $url = Assets::image_path('blank.gif');
+ *
+ * @package   studip
+ *
+ * @author    mlunzena
+ * @copyright (c) Authors
+ */
+class Assets
+{
+
+    const NUMBER_OF_ALIASES = 2;
+
+    /**
+     * @ignore
+     */
+    private static $assets_url;
+    private static $assets_path;
+    private static $dynamic;
+    private static $counter_cache;
+
+    /**
+     * This method sets the URL to your assets.
+     *
+     * @param string $path the path to the assets
+     */
+    public static function set_assets_path(string $path): void
+    {
+        self::$assets_path = $path;
+    }
+
+    /**
+     * This method sets the URL to your assets.
+     *
+     * @param  string       the URL to the assets
+     *
+     * @return void
+     */
+    public static function set_assets_url($url)
+    {
+        self::$assets_url = $url;
+        self::$counter_cache = NULL;
+        self::$dynamic = mb_strpos($url, '%d') !== FALSE;
+    }
+
+    /**
+     * This class method is an accessor to the URL "prefix" for all things "asset"
+     * Prepend the return value of this method to the relative path of the wanted
+     * static content.
+     *
+     * Additionally if the ASSETS_URL contains the string '%d', it will be
+     * replaced with a random number between 0 and 3. If you passed an argument
+     * this number will not be random but specific to that argument thus being
+     * referentially transparent.
+     *
+     * Example:
+     *
+     *  # static ASSETS_URL
+     *  $ASSETS_URL = 'http://www.example.com/public/';
+     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
+     *  echo Assets::url('javascripts/prototype.js')    . "\n";
+     *
+     *  # output
+     *  http://www.example.com/public/javascripts/prototype.js
+     *  http://www.example.com/public/javascripts/prototype.js
+     *
+     *
+     *  # dynamic ASSETS_URL
+     *  $ASSETS_URL = 'http://www%d.example.com/public/';
+     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
+     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
+     *  echo Assets::url() . 'javascripts/prototype.js' . "\n";
+     *  echo Assets::url('javascripts/prototype.js')    . "\n";
+     *  echo Assets::url('javascripts/prototype.js')    . "\n";
+     *  echo Assets::url('javascripts/prototype.js')    . "\n";
+     *
+     *  # output
+     *  http://www0.example.com/public/javascripts/prototype.js
+     *  http://www1.example.com/public/javascripts/prototype.js
+     *  http://www2.example.com/public/javascripts/prototype.js
+     *  http://www1.example.com/public/javascripts/prototype.js
+     *  http://www1.example.com/public/javascripts/prototype.js
+     *  http://www1.example.com/public/javascripts/prototype.js
+     *
+     *
+     * @param string an optional suffix which is used to construct a number if
+     *               ASSETS_URL is dynamic (contains '%d')
+     *
+     * @return string the URL "prefix"
+     */
+    public static function url($to = '')
+    {
+        if (!self::$dynamic) {
+            return self::$assets_url . $to;
+        }
+
+        # dynamic ASSETS_URL
+        return sprintf(self::$assets_url,
+            $to == ''
+                ? self::$counter_cache++ % self::NUMBER_OF_ALIASES
+                # alternative implementation
+                # : hexdec(mb_substr(sha1($to),-1)) & 3)
+                : ord($to[1]) & (self::NUMBER_OF_ALIASES - 1))
+
+        . $to;
+    }
+
+    /**
+     * This class method is an accessor to the path "prefix" for all things "asset"
+     */
+    public static function path($to = ''): string
+    {
+        return self::$assets_path . $to;
+    }
+
+    /**
+     * Returns an image tag using options as html attributes on the
+     * tag, but with these special cases:
+     *
+     * 'alt'  - If no alt text is given, the file name part of the $source is used
+     *   (capitalized and without the extension)
+     * * 'size' - Supplied as "X@Y", so "30@45" becomes width="30" and height="45"
+     *
+     * The source can be supplied as a...
+     * * full path, like "/my_images/image.gif"
+     * * file name, like "rss.png", that gets expanded to "/images/rss.png"
+     * * file name without extension, like "logo", that gets expanded to "/images/logo.png"
+     *
+     * Do not use this to render icons. Use the more appropiate class
+     * Icon for this.
+     */
+    public static function img($source, $opt = [])
+    {
+        if (!$source) {
+            return '';
+        }
+
+        $size = $opt['size'] ?? null;
+
+        $opt = self::parse_attributes($opt);
+
+        $opt['src'] = self::image_path($source);
+
+        if (!isset($opt['alt'])) {
+            $opt['alt'] = ucfirst(current(explode('.', basename($opt['src']))));
+        }
+
+        if (isset($size) && !isset($opt['width'])) {
+            $size = explode('@', $size, 2);
+            $opt['width'] = $size[0];
+            $opt['height'] = $size[1] ?? null;
+
+            unset($opt['size']);
+        }
+
+        return self::tag('img', $opt);
+    }
+
+
+    /**
+     * Returns an input tag using options as html attributes on the
+     * tag, but with these special cases:
+     *
+     * * 'size' - Supplied as "X@Y", so "30@45" becomes width="30" and height="45"
+     *
+     * The source can be supplied as a...
+     * * full path, like "/my_images/image.gif"
+     * * file name, like "rss.png", that gets expanded to "/images/rss.png"
+     * * file name without extension, like "logo", that gets expanded to "/images/logo.png"
+     *
+     * Do not use this to render icons. Use the more appropiate class
+     * Icon for this.
+     */
+    public static function input($source, $opt = [])
+    {
+
+        if (!$source) {
+            return '';
+        }
+
+        $parts = explode('/', $source);
+
+        $size = $opt['size'];
+
+        $opt = self::parse_attributes($opt);
+
+        $opt['src'] = self::image_path($source);
+        $opt['type'] = 'image';
+
+        if (isset($size) && !isset($opt['width'])) {
+            [$opt['width'], $opt['height']] = explode('@', $size, 2);
+            unset($opt['size']);
+        }
+
+        return self::tag('input', $opt);
+    }
+
+    /**
+     * Returns path to an image asset.
+     *
+     * Example:
+     *
+     * The src can be supplied as a...
+     *
+     * full path,
+     *   like "/my_images/image.gif"
+     *
+     * file name,
+     *   like "rss.png", that gets expanded to "/images/rss.png"
+     *
+     * file name without extension,
+     *   like "logo", that gets expanded to "/images/logo.png"
+     *
+     * Note: This function should be private/depracated for the use in other
+     * scripts, as we would like to always generate the complete <image> oder
+     * <input> tag. Please use Assets::img or Assets::input instead.
+     */
+    public static function image_path($source, $respect_retina = false)
+    {
+        $path = self::compute_public_path($source, 'images', 'png');
+
+        return $path;
+    }
+
+    /**
+     * Returns a script include tag per source given as argument.
+     *
+     * Examples:
+     *
+     *   Assets::script('prototype') =>
+     *     <script src="/javascript/prototype.js"></script>
+     *
+     *   Assets::script('common.javascript', '/elsewhere/cools') =>
+     *     <script src="/js/common.javascript"></script>
+     *     <script src="/elsewhere/cools.js"></script>
+     */
+    public static function script($atLeastOneArgument)
+    {
+        $html = '';
+        foreach (func_get_args() as $source) {
+            $source = self::javascript_path($source);
+            $html .= self::content_tag('script', '',
+                ['src' => $source]);
+            $html .= "\n";
+        }
+
+        return $html;
+    }
+
+
+    /**
+     * Returns path to a javascript asset.
+     *
+     * Example:
+     *
+     *   Assets::javascript_path('ajax') => /javascripts/ajax.js
+     */
+    public static function javascript_path($source)
+    {
+        return self::compute_public_path($source, 'javascripts', 'js');
+    }
+
+
+    /**
+     * Returns a css link tag per source given as argument.
+     *
+     * Examples:
+     *
+     *   Assets::stylesheet('style') =>
+     *     <link href="/stylesheets/style.css" media="screen" rel="stylesheet">
+     *
+     *   Assets::stylesheet('style', array('media' => 'all'))  =>
+     *     <link href="/stylesheets/style.css" media="all" rel="stylesheet">
+     *
+     *   Assets::stylesheet('random.styles', '/css/stylish') =>
+     *     <link href="/stylesheets/random.styles" media="screen" rel="stylesheet">
+     *     <link href="/css/stylish.css" media="screen" rel="stylesheet">
+     */
+    public static function stylesheet($atLeastOneArgument)
+    {
+        $sources = func_get_args();
+        $sourceOptions = (func_num_args() > 1 &&
+            is_array($sources[func_num_args() - 1]))
+            ? array_pop($sources)
+            : [];
+
+        $html = '';
+        foreach ($sources as $source) {
+            $source = self::stylesheet_path($source);
+            $opt = array_merge(['rel' => 'stylesheet',
+                    'media' => 'screen',
+                    'href' => $source],
+                $sourceOptions);
+            $html .= self::tag('link', $opt) . "\n";
+        }
+
+        return $html;
+    }
+
+
+    /**
+     * Returns path to a stylesheet asset.
+     *
+     * Example:
+     *
+     *   stylesheet_path('style') => /stylesheets/style.css
+     */
+    public static function stylesheet_path($source)
+    {
+        return self::compute_public_path($source, 'stylesheets', 'css');
+    }
+
+
+    /**
+     * This function computes the public path to the given source by using default
+     * dir and ext if not specified by the source. If source is not an absolute
+     * URL, the assets url is incorporated.
+     *
+     * @ignore
+     */
+    private static function compute_public_path($source, $dir, $ext)
+    {
+
+        # add extension if not present
+        if ('' == mb_substr(mb_strrchr($source, "."), 1))
+            $source .= ".$ext";
+
+        # if source is not absolute
+        if (FALSE === mb_strpos($source, ':')) {
+
+            # add dir if url does not contain a path
+            if ('/' !== $source[0])
+                $source = "$dir/$source";
+
+            # consider asset host
+            $source = self::url(ltrim($source, '/'));
+        }
+
+        return $source;
+    }
+
+
+    /**
+     * Constructs an html tag.
+     *
+     * @ignore
+     *
+     * @param  string  tag name
+     * @param  array   tag options
+     * @param  boolean true to leave tag open
+     *
+     * @return string
+     */
+    private static function tag($name, $options = [], $open = FALSE)
+    {
+        if (!$name) {
+            return '';
+        }
+
+        ksort($options);
+        return '<' . $name . ' ' . arrayToHtmlAttributes($options) . ($open ? '>' : '>');
+    }
+
+
+    /**
+     * Helper function for content tags.
+     *
+     * @param string $name    tag name
+     * @param string $content tag content
+     * @param array $options tag options
+     *
+     * @return string
+     */
+    private static function content_tag($name, $content = '', $options = [])
+    {
+        if (!$name) {
+            return '';
+        }
+        return '<' . $name . ' ' . arrayToHtmlAttributes($options) . '>' .
+        $content .
+        '</' . $name . '>';
+    }
+
+    /**
+     * Parse a HTML attribute string into an array.
+     *
+     * @ignore
+     */
+    private static function parse_attributes($stringOrArray)
+    {
+
+        if (is_array($stringOrArray))
+            return $stringOrArray;
+
+        preg_match_all('/
+      \s*(\w+)              # key                               \\1
+      \s*=\s*               # =
+      (\'|")?               # values may be included in \' or " \\2
+      (.*?)                 # value                             \\3
+      (?(2) \\2)            # matching \' or " if needed        \\4
+      \s*(?:
+        (?=\w+\s*=) | \s*$  # followed by another key= or the end of the string
+      )
+    /x', $stringOrArray, $matches, PREG_SET_ORDER);
+
+        $attributes = [];
+        foreach ($matches as $val)
+            $attributes[$val[1]] = $val[3];
+
+        return $attributes;
+    }
+}
diff --git a/lib/classes/AuthorObject.class.php b/lib/classes/AuthorObject.class.php
deleted file mode 100644
index b3e98e3..0000000
--- a/lib/classes/AuthorObject.class.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-# Lifter002: TEST
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// AuthorObject.class.php
-//
-// Class to provide basic properties of an object in Stud.IP
-//
-// Copyright (c) 2003 Alexander Willner <mail@AlexanderWillner.de>
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-define("ERROR_NORMAL", "1");
-define("ERROR_CRITICAL", "8");
-
-
-/**
- * AuthorObject.class.php
- *
- * Class to provide basic properties of an object in Stud.IP
- *
- * @author      Alexander Willner <mail@alexanderwillner.de>
- * @copyright   2003 Stud.IP-Project
- * @access      public
- * @package     studip_core
- * @modulegroup core
- */
-class AuthorObject
-{
-
-    /**
-     * Holds the code and description of an internal error
-     * @access   private
-     * @var      array $errorArray
-     */
-    public $errorArray;
-
-    /**
-     * Holds the type of object. See INSTANCEOF_*
-     * @access   private
-     * @var      string $instanceof
-     */
-    public $instanceof;
-
-    /**
-     * Constructor
-     * @access   public
-     */
-    public function __construct()
-    {
-        $this->instanceof = 'AuthorObject';
-        $this->errorArray = [];
-    }
-
-    /**
-     * Gets the type of object
-     * @access  public
-     * @return  string The type of object. See INSTANCEOF_*
-     */
-    public function x_instanceof()
-    {
-        return $this->instanceof;
-    }
-
-    /**
-     * Gives the internal errorcode
-     * @access public
-     * @return boolean True if an error exists
-     */
-    public function isError()
-    {
-        return count($this->errorArray) > 0;
-    }
-
-    /**
-     * Gives the codes and descriptions of the internal errors
-     * @access  public
-     * @return  array  The errors as an Array like "1" => "Could not open DB"
-     */
-    public function getErrors()
-    {
-        return $this->errorArray;
-    }
-
-    /**
-     * Resets the errorcodes and descriptions
-     * @access public
-     */
-    public function resetErrors()
-    {
-        $this->errorArray = [];
-    }
-
-    /**
-     * Sets the errorcode (internal)
-     * @access  public
-     * @param integer $errcode The code of the error
-     * @param string $errstring The description of the error
-     */
-    public function throwError($errcode, $errstring)
-    {
-        if (!is_array($this->errorArray)) {
-            $this->errorArray = [];
-        }
-
-        $this->errorArray [] = [
-            'code'   => $errcode,
-            'string' => $errstring,
-        ];
-    }
-
-    /**
-     * Sets the errorcode from other classes (internal)
-     * @access  private
-     * @param object $class The class with the error
-     */
-    public function throwErrorFromClass(AuthorObject $class)
-    {
-        $this->errorArray = $class->getErrors();
-        $class->resetErrors();
-    }
-}
-
diff --git a/lib/classes/AuthorObject.php b/lib/classes/AuthorObject.php
new file mode 100644
index 0000000..b3e98e3
--- /dev/null
+++ b/lib/classes/AuthorObject.php
@@ -0,0 +1,139 @@
+<?php
+# Lifter002: TEST
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// AuthorObject.class.php
+//
+// Class to provide basic properties of an object in Stud.IP
+//
+// Copyright (c) 2003 Alexander Willner <mail@AlexanderWillner.de>
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+define("ERROR_NORMAL", "1");
+define("ERROR_CRITICAL", "8");
+
+
+/**
+ * AuthorObject.class.php
+ *
+ * Class to provide basic properties of an object in Stud.IP
+ *
+ * @author      Alexander Willner <mail@alexanderwillner.de>
+ * @copyright   2003 Stud.IP-Project
+ * @access      public
+ * @package     studip_core
+ * @modulegroup core
+ */
+class AuthorObject
+{
+
+    /**
+     * Holds the code and description of an internal error
+     * @access   private
+     * @var      array $errorArray
+     */
+    public $errorArray;
+
+    /**
+     * Holds the type of object. See INSTANCEOF_*
+     * @access   private
+     * @var      string $instanceof
+     */
+    public $instanceof;
+
+    /**
+     * Constructor
+     * @access   public
+     */
+    public function __construct()
+    {
+        $this->instanceof = 'AuthorObject';
+        $this->errorArray = [];
+    }
+
+    /**
+     * Gets the type of object
+     * @access  public
+     * @return  string The type of object. See INSTANCEOF_*
+     */
+    public function x_instanceof()
+    {
+        return $this->instanceof;
+    }
+
+    /**
+     * Gives the internal errorcode
+     * @access public
+     * @return boolean True if an error exists
+     */
+    public function isError()
+    {
+        return count($this->errorArray) > 0;
+    }
+
+    /**
+     * Gives the codes and descriptions of the internal errors
+     * @access  public
+     * @return  array  The errors as an Array like "1" => "Could not open DB"
+     */
+    public function getErrors()
+    {
+        return $this->errorArray;
+    }
+
+    /**
+     * Resets the errorcodes and descriptions
+     * @access public
+     */
+    public function resetErrors()
+    {
+        $this->errorArray = [];
+    }
+
+    /**
+     * Sets the errorcode (internal)
+     * @access  public
+     * @param integer $errcode The code of the error
+     * @param string $errstring The description of the error
+     */
+    public function throwError($errcode, $errstring)
+    {
+        if (!is_array($this->errorArray)) {
+            $this->errorArray = [];
+        }
+
+        $this->errorArray [] = [
+            'code'   => $errcode,
+            'string' => $errstring,
+        ];
+    }
+
+    /**
+     * Sets the errorcode from other classes (internal)
+     * @access  private
+     * @param object $class The class with the error
+     */
+    public function throwErrorFromClass(AuthorObject $class)
+    {
+        $this->errorArray = $class->getErrors();
+        $class->resetErrors();
+    }
+}
+
diff --git a/lib/classes/AutoInsert.class.php b/lib/classes/AutoInsert.class.php
deleted file mode 100644
index b2168cc..0000000
--- a/lib/classes/AutoInsert.class.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @author      Nico Müller <nico.mueller@uni-oldenburg.de>
- * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
- * @author      Jan Hendrik Willms <jan.hendrik.willms@uni-oldenburg.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.1
- */
-
-/**
- * AutoInsert.class.php
- * Provides functions required by StEP00216:
- * - Assign seminars for automatic registration of certain user types
- * - Maintenance of registration rules
- *
- * Example of use:
- * @code
- *
- *   # show all auto insert seminars
- *   $auto_sems = AutoInsert::getAllSeminars();
- *
- *   # Save a new auto insert seminar with the user status
- *   AutoInsert::saveSeminar($sem_id, $rechte);
- *
- * @endcode
- */
-class AutoInsert
-{
-    private static $instance = null;
-    protected static $seminar_cache = null;
-
-    private $settings = [];
-
-    public static function instance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
-
-    public function __construct()
-    {
-        $this->loadSettings();
-    }
-
-    private function loadSettings()
-    {
-        $query = "SELECT a.seminar_id, GROUP_CONCAT(a.status,IF(LENGTH(a.domain_id)=0,':keine',CONCAT(':',a.domain_id))) AS domain_status, s.Name, s.Schreibzugriff, s.start_time ";
-        $query .= "FROM auto_insert_sem a ";
-        $query .= "JOIN seminare AS s USING (Seminar_id) ";
-        $query .= "GROUP BY s.seminar_id ";
-        $query .= "ORDER BY s.Name";
-        $statement = DBManager::get()->query($query);
-        $results   = $statement->fetchAll(PDO::FETCH_ASSOC);
-        foreach ($results as $result) {
-            if ($result['Schreibzugriff'] < 3) {
-                $domains = explode(',', $result['domain_status']);
-
-                foreach ($domains as $domain) {
-                    $array                                       = explode(':', $domain);
-                    $key                                         = $array[1] . '.' . $array[0];
-                    $this->settings[$key][$result['seminar_id']] = ['Seminar_id'     => $result['seminar_id'],
-                                                                    'name'           => $result['Name'],
-                                                                    'Schreibzugriff' => $result['Schreibzugriff'],
-                                                                    'start_time'     => $result['start_time']];
-                }
-            }
-        }
-    }
-
-
-    private function getUserSeminars($user_id, $seminare)
-    {
-        $statement = DBManager::get()->prepare("SELECT Seminar_id,s.name,s.Schreibzugriff,s.start_time,su.status
-            FROM seminar_user su
-            INNER JOIN seminare s USING(Seminar_id)
-            WHERE user_id = ? AND Seminar_id IN(?)");
-        $statement->execute([$user_id, $seminare]);
-        return $statement->fetchAll(PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * Trägt den Benutzer in den Eingestellten veranstaltungen automatisch ein.
-     * @param string $user_id
-     * @param string|bool $status Wenn Status nicht angegeben wird, wird der Status des Users aus user_id genommen
-     * @return array 'added' Namen der Seminare in die der User eingetragen wurde
-     *                     array 'removed' Namen der Seminare aus denen der User ausgetragen wurde
-     */
-    public function saveUser($user_id, $status = false)
-    {
-        $domains = [];
-        if (!$status) {
-            $status = $GLOBALS['perm']->get_perm($user_id);
-        }
-        foreach (UserDomain::getUserDomainsForUser($user_id) as $d) {
-            $domains [] = $d->id; //Domains des Users
-        }
-
-        if (count($domains) === 0) {
-            $domains [] = 'keine';
-        }
-        $settings     = [];
-        $all_seminare = [];
-        foreach ($domains as $domain) {
-
-            $key = $domain . '.' . $status;
-            if (is_array($this->settings[$key])) {
-                foreach ($this->settings[$key] as $id => $value) {
-                    $settings[$id] = $value;
-                }
-            }
-            foreach ($this->settings as $key) {
-                foreach ($key as $id => $sem) {
-                    $all_seminare[$id] = $sem;
-                }
-            }
-        }
-
-        $seminare              = [];
-        $seminare_tutor_dozent = [];
-        foreach ($this->getUserSeminars($user_id, array_keys($all_seminare)) as $sem) {
-            $seminare[$sem['Seminar_id']] = $sem;
-            if (in_array($sem['status'], ['tutor', 'dozent'])) {
-                $seminare_tutor_dozent[$sem['Seminar_id']] = $sem;
-            }
-        }
-        $toAdd    = array_diff_key($settings, $seminare);
-        $toRemove = array_diff_key($all_seminare, $toAdd, $settings, $seminare_tutor_dozent);
-
-        $added   = [];
-        $removed = [];
-
-        foreach ($toAdd as $id => $seminar) {
-            if ($this->addUser($user_id, $seminar)) $added[] = $seminar['name'];
-        }
-        foreach ($toRemove as $id => $seminar) {
-            if ($this->removeUser($user_id, $seminar)) $removed[] = $seminar['name'];
-        }
-
-        return ['added' => $added, 'removed' => $removed];
-    }
-
-    private function addUser($user_id, $seminar)
-    {
-        return CourseMember::insertCourseMember($seminar['Seminar_id'], $user_id, 'autor');
-    }
-
-    private function removeUser($user_id, $seminar)
-    {
-        $rows = CourseMember::deleteBySQL(' user_id = ? AND Seminar_id = ?', [$user_id, $seminar['Seminar_id']]);
-        $statusgruppe_rows =  StatusgruppeUser::deleteBySQL(
-            'user_id = ? AND statusgruppe_id IN (SELECT statusgruppe_id FROM statusgruppen WHERE range_id = ?)',
-            [$user_id, $seminar['Seminar_id']]
-        );
-        if ($rows > 0 || $statusgruppe_rows > 0) return true;
-
-        return false;
-    }
-
-    /**
-     * Tests if a seminar already has an autoinsert record
-     * @param  string $seminar_id Id of the seminar
-     * @return bool   Indicating whether the seminar already has an autoinsert record
-     */
-    public static function checkSeminar($seminar_id, $domain_id = false)
-    {
-        $cached = self::getSeminarCache();
-
-        if (!isset($cached[$seminar_id])) {
-            $query = "SELECT domain_id, 1
-                      FROM auto_insert_sem
-                      WHERE seminar_id = ?";
-            $cached[$seminar_id] = DBManager::get()->fetchGroupedPairs(
-                $query,
-                [$seminar_id],
-                function ($value) {
-                    return (bool) $value;
-                }
-            );
-        }
-
-        return array_key_exists($domain_id ?: '', $cached[$seminar_id])
-             ? $cached[$seminar_id][$domain_id ?: '']
-             : false;
-    }
-
-    /**
-     * Enables a seminar for autoinsertion of users with the given status(ses)
-     * @param string $seminar_id Id of the seminar
-     * @param mixed $status      Either a single string or an array of strings
-     *                           containing the status(ses) to enable for
-     *                           autoinsertion
-     */
-    public static function saveSeminar($seminar_id, $status, $domain_id)
-    {
-        $query     = "INSERT INTO auto_insert_sem (seminar_id, status,domain_id) VALUES (?, ?,?)";
-        $statement = DBManager::get()->prepare($query);
-
-        foreach ((array)$status as $s) {
-            $statement->execute([$seminar_id, $s, $domain_id]);
-        }
-    }
-
-    /**
-     * Updates an autoinsert record for a given seminar, dependent on the
-     * parameter $remove it either inserts or removes the record for the given
-     * parameters
-     *
-     * @param string $seminar_id Id of the seminar
-     * @param string $status     Status for autoinsertion
-     * @param bool $remove       Whether the record should be added or removed
-     */
-    public static function updateSeminar($seminar_id, $domain, $status, $remove = false)
-    {
-        $query     = $remove ? "DELETE FROM auto_insert_sem WHERE seminar_id = ? AND status= ? AND domain_id = ?" : "INSERT IGNORE INTO auto_insert_sem (seminar_id, status,domain_id) VALUES (?, ?, ?)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id, $status, $domain]);
-
-        if ($remove) {
-            unset(self::getSeminarCache()[$seminar_id]);
-        }
-    }
-
-    /**
-     * Removes a seminar from the autoinsertion process.
-     * @param string $seminar_id Id of the seminar
-     */
-    public static function deleteSeminar($seminar_id): bool
-    {
-        $query     = "DELETE FROM auto_insert_sem WHERE seminar_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $result = $statement->execute([$seminar_id]);
-
-        unset(self::getSeminarCache()[$seminar_id]);
-
-        return $result > 0;
-    }
-
-    /**
-     * Returns a list of all seminars enabled for autoinsertion
-     * @param  bool  Indicates whether only the seminar ids (true) or the full
-     *               dataset shall be returned (false)
-     * @return array The list of all enabled seminars (format according to $only_sem_id)
-     */
-    public static function getAllSeminars($only_sem_id = false)
-    {
-        if ($only_sem_id) {
-            $query     = "SELECT DISTINCT seminar_id FROM auto_insert_sem";
-            $statement = DBManager::get()->query($query);
-            $results   = $statement->fetchAll(PDO::FETCH_COLUMN);
-        } else {
-            $query = "SELECT a.seminar_id, GROUP_CONCAT(a.status,IF(LENGTH(a.domain_id)=0,':keine',CONCAT(':',a.domain_id))) AS domain_status, s.Name, s.Schreibzugriff, s.start_time ";
-            $query .= "FROM auto_insert_sem a ";
-            $query .= "JOIN seminare AS s USING (Seminar_id) ";
-
-            $query .= "GROUP BY s.seminar_id ";
-            $query .= "ORDER BY s.Name";
-            $statement = DBManager::get()->query($query);
-            $results   = $statement->fetchAll(PDO::FETCH_ASSOC);
-            foreach ($results as $index => $result) {
-                $domains = explode(',', $result['domain_status']);
-                foreach ($domains as $domain) {
-                    $array                                  = explode(':', $domain);
-                    $results[$index]['status'][$array[1]][] = $array[0];
-                }
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Returns a seminar's info for autoinsertion
-     * @param  string $seminar_id Id of the seminar
-     * @return array  The seminar's data as an associative array
-     */
-    public static function getSeminar($seminar_id)
-    {
-        $query = "SELECT a.seminar_id, GROUP_CONCAT(a.status) AS status, s.Name ";
-        $query .= "FROM auto_insert_sem a ";
-        $query .= "JOIN seminare AS s USING (Seminar_id) ";
-        $query .= "WHERE a.seminar_id = ? ";
-        $query .= "GROUP BY s.seminar_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id]);
-
-        $result           = $statement->fetch(PDO::FETCH_ASSOC);
-        $result['status'] = explode(',', $result['status']);
-        return $result;
-    }
-
-    /**
-     * Store the user's automatic registration in a seminar redundantly to
-     * avoid an annoying reregistration although the user explicitely left the
-     * according seminar
-     * @param string $user_id    Id of the user
-     * @param string $seminar_id Id of the seminar
-     */
-    public static function saveAutoInsertUser($seminar_id, $user_id)
-    {
-        $query = "INSERT IGNORE INTO auto_insert_user (Seminar_id, user_id, mkdate)
-                  SELECT ?, user_id, UNIX_TIMESTAMP()
-                  FROM auth_user_md5
-                  WHERE user_id = ? AND perms NOT IN ('root','admin')";
-        return DBManager::get()->execute($query, [$seminar_id, $user_id]);
-    }
-
-    /**
-     * Tests whether a user was already automatically registered for a certain
-     * seminar.
-     * @param  string $seminar_id Id of the seminar
-     * @param  string $user_id    If of the user
-     * @return bool   Indicates whether the user was already registered
-     */
-    public static function checkAutoInsertUser($seminar_id, $user_id)
-    {
-        $query     = "SELECT 1 FROM auto_insert_user WHERE seminar_id = ? AND user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id, $user_id]);
-        $result = $statement->fetchColumn();
-
-        return $result > 0;
-    }
-
-    /**
-     * Returns the cache for seminars.
-     */
-    protected static function getSeminarCache(): StudipCachedArray
-    {
-        if (self::$seminar_cache === null) {
-            self::$seminar_cache = new StudipCachedArray('AutoInsertSeminars');
-        }
-        return self::$seminar_cache;
-    }
-}
diff --git a/lib/classes/AutoInsert.php b/lib/classes/AutoInsert.php
new file mode 100644
index 0000000..b2168cc
--- /dev/null
+++ b/lib/classes/AutoInsert.php
@@ -0,0 +1,342 @@
+<?php
+/**
+ * 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.
+ *
+ * @author      Nico Müller <nico.mueller@uni-oldenburg.de>
+ * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
+ * @author      Jan Hendrik Willms <jan.hendrik.willms@uni-oldenburg.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.1
+ */
+
+/**
+ * AutoInsert.class.php
+ * Provides functions required by StEP00216:
+ * - Assign seminars for automatic registration of certain user types
+ * - Maintenance of registration rules
+ *
+ * Example of use:
+ * @code
+ *
+ *   # show all auto insert seminars
+ *   $auto_sems = AutoInsert::getAllSeminars();
+ *
+ *   # Save a new auto insert seminar with the user status
+ *   AutoInsert::saveSeminar($sem_id, $rechte);
+ *
+ * @endcode
+ */
+class AutoInsert
+{
+    private static $instance = null;
+    protected static $seminar_cache = null;
+
+    private $settings = [];
+
+    public static function instance()
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+
+    public function __construct()
+    {
+        $this->loadSettings();
+    }
+
+    private function loadSettings()
+    {
+        $query = "SELECT a.seminar_id, GROUP_CONCAT(a.status,IF(LENGTH(a.domain_id)=0,':keine',CONCAT(':',a.domain_id))) AS domain_status, s.Name, s.Schreibzugriff, s.start_time ";
+        $query .= "FROM auto_insert_sem a ";
+        $query .= "JOIN seminare AS s USING (Seminar_id) ";
+        $query .= "GROUP BY s.seminar_id ";
+        $query .= "ORDER BY s.Name";
+        $statement = DBManager::get()->query($query);
+        $results   = $statement->fetchAll(PDO::FETCH_ASSOC);
+        foreach ($results as $result) {
+            if ($result['Schreibzugriff'] < 3) {
+                $domains = explode(',', $result['domain_status']);
+
+                foreach ($domains as $domain) {
+                    $array                                       = explode(':', $domain);
+                    $key                                         = $array[1] . '.' . $array[0];
+                    $this->settings[$key][$result['seminar_id']] = ['Seminar_id'     => $result['seminar_id'],
+                                                                    'name'           => $result['Name'],
+                                                                    'Schreibzugriff' => $result['Schreibzugriff'],
+                                                                    'start_time'     => $result['start_time']];
+                }
+            }
+        }
+    }
+
+
+    private function getUserSeminars($user_id, $seminare)
+    {
+        $statement = DBManager::get()->prepare("SELECT Seminar_id,s.name,s.Schreibzugriff,s.start_time,su.status
+            FROM seminar_user su
+            INNER JOIN seminare s USING(Seminar_id)
+            WHERE user_id = ? AND Seminar_id IN(?)");
+        $statement->execute([$user_id, $seminare]);
+        return $statement->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * Trägt den Benutzer in den Eingestellten veranstaltungen automatisch ein.
+     * @param string $user_id
+     * @param string|bool $status Wenn Status nicht angegeben wird, wird der Status des Users aus user_id genommen
+     * @return array 'added' Namen der Seminare in die der User eingetragen wurde
+     *                     array 'removed' Namen der Seminare aus denen der User ausgetragen wurde
+     */
+    public function saveUser($user_id, $status = false)
+    {
+        $domains = [];
+        if (!$status) {
+            $status = $GLOBALS['perm']->get_perm($user_id);
+        }
+        foreach (UserDomain::getUserDomainsForUser($user_id) as $d) {
+            $domains [] = $d->id; //Domains des Users
+        }
+
+        if (count($domains) === 0) {
+            $domains [] = 'keine';
+        }
+        $settings     = [];
+        $all_seminare = [];
+        foreach ($domains as $domain) {
+
+            $key = $domain . '.' . $status;
+            if (is_array($this->settings[$key])) {
+                foreach ($this->settings[$key] as $id => $value) {
+                    $settings[$id] = $value;
+                }
+            }
+            foreach ($this->settings as $key) {
+                foreach ($key as $id => $sem) {
+                    $all_seminare[$id] = $sem;
+                }
+            }
+        }
+
+        $seminare              = [];
+        $seminare_tutor_dozent = [];
+        foreach ($this->getUserSeminars($user_id, array_keys($all_seminare)) as $sem) {
+            $seminare[$sem['Seminar_id']] = $sem;
+            if (in_array($sem['status'], ['tutor', 'dozent'])) {
+                $seminare_tutor_dozent[$sem['Seminar_id']] = $sem;
+            }
+        }
+        $toAdd    = array_diff_key($settings, $seminare);
+        $toRemove = array_diff_key($all_seminare, $toAdd, $settings, $seminare_tutor_dozent);
+
+        $added   = [];
+        $removed = [];
+
+        foreach ($toAdd as $id => $seminar) {
+            if ($this->addUser($user_id, $seminar)) $added[] = $seminar['name'];
+        }
+        foreach ($toRemove as $id => $seminar) {
+            if ($this->removeUser($user_id, $seminar)) $removed[] = $seminar['name'];
+        }
+
+        return ['added' => $added, 'removed' => $removed];
+    }
+
+    private function addUser($user_id, $seminar)
+    {
+        return CourseMember::insertCourseMember($seminar['Seminar_id'], $user_id, 'autor');
+    }
+
+    private function removeUser($user_id, $seminar)
+    {
+        $rows = CourseMember::deleteBySQL(' user_id = ? AND Seminar_id = ?', [$user_id, $seminar['Seminar_id']]);
+        $statusgruppe_rows =  StatusgruppeUser::deleteBySQL(
+            'user_id = ? AND statusgruppe_id IN (SELECT statusgruppe_id FROM statusgruppen WHERE range_id = ?)',
+            [$user_id, $seminar['Seminar_id']]
+        );
+        if ($rows > 0 || $statusgruppe_rows > 0) return true;
+
+        return false;
+    }
+
+    /**
+     * Tests if a seminar already has an autoinsert record
+     * @param  string $seminar_id Id of the seminar
+     * @return bool   Indicating whether the seminar already has an autoinsert record
+     */
+    public static function checkSeminar($seminar_id, $domain_id = false)
+    {
+        $cached = self::getSeminarCache();
+
+        if (!isset($cached[$seminar_id])) {
+            $query = "SELECT domain_id, 1
+                      FROM auto_insert_sem
+                      WHERE seminar_id = ?";
+            $cached[$seminar_id] = DBManager::get()->fetchGroupedPairs(
+                $query,
+                [$seminar_id],
+                function ($value) {
+                    return (bool) $value;
+                }
+            );
+        }
+
+        return array_key_exists($domain_id ?: '', $cached[$seminar_id])
+             ? $cached[$seminar_id][$domain_id ?: '']
+             : false;
+    }
+
+    /**
+     * Enables a seminar for autoinsertion of users with the given status(ses)
+     * @param string $seminar_id Id of the seminar
+     * @param mixed $status      Either a single string or an array of strings
+     *                           containing the status(ses) to enable for
+     *                           autoinsertion
+     */
+    public static function saveSeminar($seminar_id, $status, $domain_id)
+    {
+        $query     = "INSERT INTO auto_insert_sem (seminar_id, status,domain_id) VALUES (?, ?,?)";
+        $statement = DBManager::get()->prepare($query);
+
+        foreach ((array)$status as $s) {
+            $statement->execute([$seminar_id, $s, $domain_id]);
+        }
+    }
+
+    /**
+     * Updates an autoinsert record for a given seminar, dependent on the
+     * parameter $remove it either inserts or removes the record for the given
+     * parameters
+     *
+     * @param string $seminar_id Id of the seminar
+     * @param string $status     Status for autoinsertion
+     * @param bool $remove       Whether the record should be added or removed
+     */
+    public static function updateSeminar($seminar_id, $domain, $status, $remove = false)
+    {
+        $query     = $remove ? "DELETE FROM auto_insert_sem WHERE seminar_id = ? AND status= ? AND domain_id = ?" : "INSERT IGNORE INTO auto_insert_sem (seminar_id, status,domain_id) VALUES (?, ?, ?)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id, $status, $domain]);
+
+        if ($remove) {
+            unset(self::getSeminarCache()[$seminar_id]);
+        }
+    }
+
+    /**
+     * Removes a seminar from the autoinsertion process.
+     * @param string $seminar_id Id of the seminar
+     */
+    public static function deleteSeminar($seminar_id): bool
+    {
+        $query     = "DELETE FROM auto_insert_sem WHERE seminar_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $result = $statement->execute([$seminar_id]);
+
+        unset(self::getSeminarCache()[$seminar_id]);
+
+        return $result > 0;
+    }
+
+    /**
+     * Returns a list of all seminars enabled for autoinsertion
+     * @param  bool  Indicates whether only the seminar ids (true) or the full
+     *               dataset shall be returned (false)
+     * @return array The list of all enabled seminars (format according to $only_sem_id)
+     */
+    public static function getAllSeminars($only_sem_id = false)
+    {
+        if ($only_sem_id) {
+            $query     = "SELECT DISTINCT seminar_id FROM auto_insert_sem";
+            $statement = DBManager::get()->query($query);
+            $results   = $statement->fetchAll(PDO::FETCH_COLUMN);
+        } else {
+            $query = "SELECT a.seminar_id, GROUP_CONCAT(a.status,IF(LENGTH(a.domain_id)=0,':keine',CONCAT(':',a.domain_id))) AS domain_status, s.Name, s.Schreibzugriff, s.start_time ";
+            $query .= "FROM auto_insert_sem a ";
+            $query .= "JOIN seminare AS s USING (Seminar_id) ";
+
+            $query .= "GROUP BY s.seminar_id ";
+            $query .= "ORDER BY s.Name";
+            $statement = DBManager::get()->query($query);
+            $results   = $statement->fetchAll(PDO::FETCH_ASSOC);
+            foreach ($results as $index => $result) {
+                $domains = explode(',', $result['domain_status']);
+                foreach ($domains as $domain) {
+                    $array                                  = explode(':', $domain);
+                    $results[$index]['status'][$array[1]][] = $array[0];
+                }
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Returns a seminar's info for autoinsertion
+     * @param  string $seminar_id Id of the seminar
+     * @return array  The seminar's data as an associative array
+     */
+    public static function getSeminar($seminar_id)
+    {
+        $query = "SELECT a.seminar_id, GROUP_CONCAT(a.status) AS status, s.Name ";
+        $query .= "FROM auto_insert_sem a ";
+        $query .= "JOIN seminare AS s USING (Seminar_id) ";
+        $query .= "WHERE a.seminar_id = ? ";
+        $query .= "GROUP BY s.seminar_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id]);
+
+        $result           = $statement->fetch(PDO::FETCH_ASSOC);
+        $result['status'] = explode(',', $result['status']);
+        return $result;
+    }
+
+    /**
+     * Store the user's automatic registration in a seminar redundantly to
+     * avoid an annoying reregistration although the user explicitely left the
+     * according seminar
+     * @param string $user_id    Id of the user
+     * @param string $seminar_id Id of the seminar
+     */
+    public static function saveAutoInsertUser($seminar_id, $user_id)
+    {
+        $query = "INSERT IGNORE INTO auto_insert_user (Seminar_id, user_id, mkdate)
+                  SELECT ?, user_id, UNIX_TIMESTAMP()
+                  FROM auth_user_md5
+                  WHERE user_id = ? AND perms NOT IN ('root','admin')";
+        return DBManager::get()->execute($query, [$seminar_id, $user_id]);
+    }
+
+    /**
+     * Tests whether a user was already automatically registered for a certain
+     * seminar.
+     * @param  string $seminar_id Id of the seminar
+     * @param  string $user_id    If of the user
+     * @return bool   Indicates whether the user was already registered
+     */
+    public static function checkAutoInsertUser($seminar_id, $user_id)
+    {
+        $query     = "SELECT 1 FROM auto_insert_user WHERE seminar_id = ? AND user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id, $user_id]);
+        $result = $statement->fetchColumn();
+
+        return $result > 0;
+    }
+
+    /**
+     * Returns the cache for seminars.
+     */
+    protected static function getSeminarCache(): StudipCachedArray
+    {
+        if (self::$seminar_cache === null) {
+            self::$seminar_cache = new StudipCachedArray('AutoInsertSeminars');
+        }
+        return self::$seminar_cache;
+    }
+}
diff --git a/lib/classes/Avatar.class.php b/lib/classes/Avatar.class.php
deleted file mode 100644
index 959523f..0000000
--- a/lib/classes/Avatar.class.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-/**
- * 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. *
- *
- * @author  André Klaßen (aklassen@uos)
- * @author  Marcus Lunzenauer (mlunzena@uos)
- * @author  Jan-Hendirk Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since   1.7
- */
-class Avatar
-{
-    public const AVATAR_TYPE = 'user';
-    protected const CREATE_CHUNKED_FOLDERS = true;
-
-    public const EXTENSION = 'webp';
-    public const IMAGE_QUALITY = 90;
-
-    /**
-     * This constant stands for the maximal size of a user picture.
-     */
-    public const ORIGINAL = 'original';
-
-    /**
-     * This constant stands for the maximal size of a user picture.
-     */
-    public const NORMAL = 'normal';
-
-    /**
-     * This constant stands for a medium size of a user picture.
-     */
-    public const MEDIUM = 'medium';
-
-    /**
-     * This constant stands for an icon size of a user picture.
-     */
-    public const SMALL    = 'small';
-
-    /**
-     * This constant represents the maximal size of a user picture in bytes.
-     */
-    public const MAX_FILE_SIZE = 10485760;
-
-    /**
-     * This constant holds the username and ID of the "nobody" avatar.
-     */
-    protected const NOBODY = 'nobody';
-
-    /**
-     * Holds the user's id
-     *
-     * @var string
-     */
-    protected $user_id;
-
-    /**
-     * Holds the user's username
-     *
-     * @var string
-     */
-    protected $username;
-
-    /**
-     * Returns an avatar object of the appropriate class.
-     *
-     * @param string $id the user's id
-     * @param string $username the user's username (optional)
-     *
-     * @return static the user's avatar.
-     */
-    public static function getAvatar($id)
-    {
-        $username = null;
-
-        if (func_num_args() === 2) {
-            $username = func_get_arg(1);
-        }
-
-        return new static($id, $username);
-    }
-
-    /**
-     * Returns an avatar object for "nobody".
-     *
-     * @return Avatar the user's avatar.
-     */
-    public static function getNobody()
-    {
-        return new static(static::NOBODY, static::NOBODY);
-    }
-
-    /**
-     * Returns the url to the customized avatars
-     *
-     * @return string
-     */
-    public function getAvatarDirectoryUrl()
-    {
-        return sprintf(
-            '%s/%s%s',
-            $GLOBALS['DYNAMIC_CONTENT_URL'],
-            static::AVATAR_TYPE,
-            static::CREATE_CHUNKED_FOLDERS ? '/' . substr($this->user_id, 0, 2) : ''
-        );
-    }
-
-    /**
-     * Returns the path to the customized avatars
-     *
-     * @return string
-     */
-    public function getAvatarDirectoryPath()
-    {
-        return sprintf(
-            '%s/%s%s',
-            $GLOBALS['DYNAMIC_CONTENT_PATH'],
-            static::AVATAR_TYPE,
-            static::CREATE_CHUNKED_FOLDERS ? '/' . substr($this->user_id, 0, 2) : ''
-        );
-    }
-
-    /**
-     * Returns the url to the default avatars
-     */
-    public function getDefaultAvatarDirectoryUrl(): string
-    {
-        return Assets::url('images/avatars/' . static::AVATAR_TYPE);
-    }
-
-    /**
-     * Returns the path to the default avatars
-     */
-    public function getDefaultAvatarDirectoryPath(): string
-    {
-        return Assets::path('images/avatars/' . static::AVATAR_TYPE);
-    }
-
-    /**
-     * Returns the url to a customized avatar
-     *
-     * @return string
-     */
-    public function getCustomAvatarUrl($size)
-    {
-        if ($this->isNobody()) {
-            return sprintf(
-                '%s/%s_%s.%s',
-                $this->getDefaultAvatarDirectoryUrl(),
-                $this->user_id,
-                $size,
-                self::EXTENSION
-            );
-        }
-
-        return sprintf(
-            '%s/%s_%s.%s?d=%s',
-            $this->getAvatarDirectoryUrl(),
-            $this->user_id,
-            $size,
-            self::EXTENSION,
-            @filemtime($this->getCustomAvatarPath($size)) ?: "0"
-        );
-    }
-
-    /**
-     * Returns the path to a customized avatar
-     *
-     * @return string
-     */
-    public function getCustomAvatarPath($size)
-    {
-        if ($this->isNobody()) {
-            return sprintf(
-                '%s/%s_%s.%s',
-                $this->getDefaultAvatarDirectoryPath(),
-                $this->user_id,
-                $size,
-                self::EXTENSION
-            );
-        }
-
-        return sprintf(
-            '%s/%s_%s.%s',
-            $this->getAvatarDirectoryPath(),
-            $this->user_id,
-            $size,
-            self::EXTENSION
-        );
-    }
-
-    /**
-     * Constructs a new Avatar object belonging to a user with the given id.
-     *
-     * @param string $user_id  the user's id
-     * @param string $username the user's username (optional)
-     */
-    protected function __construct($user_id, $username = null)
-    {
-        $this->user_id = $user_id;
-        $this->username = $username;
-
-        $this->checkAvatarVisibility();
-    }
-
-    /**
-     * Returns the file name of a user's avatar.
-     *
-     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
-     *
-     * @return string    the absolute file path to the avatar
-     */
-    public function getFilename($size)
-    {
-        return $this->is_customized()
-            ? $this->getCustomAvatarPath($size)
-            : $this->getNobody()->getCustomAvatarPath($size);
-    }
-
-    /**
-     * Returns the URL of a user's picture.
-     *
-     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
-     *
-     * @return string    the URL to the user's picture
-     */
-    # TODO (mlunzena) in Url umbenennen
-    public function getURL($size)
-    {
-        return $this->is_customized()
-            ? $this->getCustomAvatarUrl($size)
-            : $this->getNobody()->getCustomAvatarUrl($size);
-    }
-
-    /**
-     * Returns whether this avatar is a default/"nobody" avatar.
-     */
-    public function isNobody(): bool
-    {
-        return $this->user_id === static::NOBODY;
-    }
-
-    /**
-     * Returns whether a customized file exists
-     */
-    public function customizedFileExists(): bool
-    {
-        return file_exists($this->getCustomAvatarPath(static::MEDIUM));
-    }
-
-    /**
-     * Returns whether a user has uploaded a custom picture.
-     *
-     * @return boolean    returns TRUE if the user customized her picture, FALSE
-     *                                    otherwise.
-     */
-    public function is_customized()
-    {
-        return !$this->isNobody()
-            && $this->customizedFileExists();
-    }
-
-    /**
-     * Returns the CSS class to use for this avatar image.
-     *
-     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
-     *
-     * @return string CSS class to use for the avatar
-     */
-    protected function getCssClass($size)
-    {
-        if (!isset($this->username)) {
-            $this->username = get_username($this->user_id);
-        }
-
-        return sprintf(
-            'avatar-%s user-%s' . ($this->is_customized() ? '' : ' recolor'),
-            $size,
-            htmlReady($this->username)
-        );
-    }
-
-    /**
-     * Constructs a desired HTML image tag for an Avatar. Additional
-     * html attributes may also be specified using the $opt parameter.
-     *
-     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
-     * @param array  $opt  array of attributes to add to the HTML image tag
-     *
-     * @return string returns the HTML image tag
-     */
-    public function getImageTag($size = self::MEDIUM, $opt = [])
-    {
-        $opt['src'] = $this->getURL($size);
-
-        if (isset($opt['class'])) {
-            $opt['class'] = $this->getCssClass($size) . ' ' . $opt['class'];
-        } else {
-            $opt['class'] = $this->getCssClass($size);
-        }
-
-        // Apply cast to string for title if necessary
-        if (isset($opt['title']) && !is_string($opt['title'])) {
-            $opt['title'] = (string) $opt['title'];
-        }
-
-        if (!empty($opt['title']) && $opt['title'] !== html_entity_decode($opt['title'])) {
-            // Decode already htmlready encoded titles (which were used until
-            // all attributes were encoded inside this method)
-            $opt['title'] = html_entity_decode($opt['title']);
-
-            if (Studip\ENV === 'development') {
-                $trace  = debug_backtrace();
-                $caller = array_shift($trace);
-
-                $file = str_replace("{$GLOBALS['STUDIP_BASE_PATH']}/", '', $caller['file']);
-                trigger_error(
-                    "{$file}:{$caller['line']}: Passes already encoded title to Avatar::getImageTag()",
-                    E_USER_DEPRECATED
-                );
-            }
-        }
-
-        if (!isset($opt['alt']) && !isset($opt['title'])) {
-            //Add an empty alt attribute to prevent screen readers from
-            //reading the URL of the icon:
-            $opt['alt'] = '';
-        }
-
-        return '<img ' . arrayToHtmlAttributes($opt) . '>';
-    }
-
-    /**
-     * Creates all the different sized thumbnails for an uploaded file.
-     *
-     * @param string $userfile the key of the uploaded file, see documentation about $_FILES
-     *
-     * @return void
-     */
-    public function createFromUpload($userfile)
-    {
-        try {
-            // keine Datei ausgewählt!
-            if (!$_FILES[$userfile]['name']) {
-                throw new Exception(_('Sie haben keine Datei zum Hochladen ausgewählt!'));
-            }
-
-            // Fehler beim Hochladen
-            if ($_FILES[$userfile]['error'] !== UPLOAD_ERR_OK) {
-                throw new Exception(_('Es gab einen Fehler beim Hochladen der Datei!'));
-            }
-
-
-            // Bilddatei ist zu groß
-            if ($_FILES[$userfile]['size'] > self::MAX_FILE_SIZE) {
-                throw new Exception(sprintf(
-                    _('Die hochgeladene Bilddatei ist %s KB groß. Die maximale Dateigröße beträgt %s KB!'),
-                    round($_FILES[$userfile]['size'] / 1024),
-                    self::MAX_FILE_SIZE / 1024)
-                );
-            }
-
-            // get extension
-            $pathinfo = pathinfo($_FILES[$userfile]['name']);
-            $ext = mb_strtolower($pathinfo['extension']);
-
-            // passende Endung ?
-            if (!in_array($ext, words('jpg jpeg gif png webp'))) {
-                throw new Exception(sprintf(
-                    _('Der Dateityp der Bilddatei ist falsch (%s). Es sind nur die Dateiendungen .gif, .png, .jpeg, .jpg oder .webp erlaubt!'),
-                    $ext
-                ));
-            }
-
-            // na dann kopieren wir mal...
-            $filename = tempnam($GLOBALS['TMP_PATH'], 'avatar-upload');
-
-            if (!@move_uploaded_file($_FILES[$userfile]['tmp_name'], $filename)) {
-                throw new Exception(_("Es ist ein Fehler beim Kopieren der Datei aufgetreten. Das Bild wurde nicht hochgeladen!"));
-            }
-
-            // set permissions for uploaded file
-            @chmod($filename, 0666 & ~umask());
-
-            $this->sanitizeOrientation($filename);
-            $this->createFrom($filename);
-        } finally {
-            if (isset($filename)) {
-                @unlink($filename);
-            }
-        }
-    }
-
-    /**
-     * Creates thumbnails from an image.
-     *
-     * @param string $filename filename of the image to create thumbnails from
-     *
-     * @return void
-     */
-    public function createFrom($filename)
-    {
-        if (!extension_loaded('gd')) {
-            throw new Exception(_('Es ist ein Fehler beim Bearbeiten des Bildes aufgetreten.') . ' (' . _('Fehlende GD-Lib') . ')');
-        }
-
-        set_error_handler([__CLASS__, 'error_handler']);
-
-        NotificationCenter::postNotification('AvatarWillCreate', $this->user_id);
-        $this->resize(static::NORMAL, $filename);
-        $this->resize(static::MEDIUM, $filename);
-        $this->resize(static::SMALL,  $filename);
-        NotificationCenter::postNotification('AvatarDidCreate', $this->user_id);
-
-        restore_error_handler();
-    }
-
-    /**
-     * Removes all uploaded pictures of a user.
-     */
-    public function reset()
-    {
-        if ($this->is_customized()) {
-            NotificationCenter::postNotification('AvatarWillDelete', $this->user_id);
-            @unlink($this->getCustomAvatarPath(static::NORMAL));
-            @unlink($this->getCustomAvatarPath(static::SMALL));
-            @unlink($this->getCustomAvatarPath(static::MEDIUM));
-            NotificationCenter::postNotification('AvatarDidDelete', $this->user_id);
-        }
-    }
-
-    /**
-     * Return the dimension of a size
-     *
-     * @param string $size the dimension of a size
-     * @return array{0: int, 1: int} a tupel of integers [width, height]
-     */
-    public static function getDimension($size)
-    {
-        $dimensions = [
-            static::NORMAL => [250, 250],
-            static::MEDIUM => [100, 100],
-            static::SMALL  => [25, 25]
-        ];
-        return $dimensions[$size];
-    }
-
-    /**
-     * Create from an image thumbnails of a specified size.
-     *
-     * @param string $size     the size of the thumbnail to create
-     * @param string $filename the filename of the image to make thumbnail of
-     */
-    private function resize(string $size, string $filename)
-    {
-        [$thumb_width, $thumb_height] = static::getDimension($size);
-
-        $thumb_width = $thumb_width * 2;
-        $thumb_height = $thumb_height * 2;
-
-        [$width, $height, $type] = getimagesize($filename);
-
-        # create image resource from filename
-        $lookup = [
-            IMAGETYPE_GIF  => 'imagecreatefromgif',
-            IMAGETYPE_JPEG => 'imagecreatefromjpeg',
-            IMAGETYPE_PNG  => 'imagecreatefrompng',
-            IMAGETYPE_WEBP => 'imagecreatefromwebp',
-        ];
-        if (!isset($lookup[$type])) {
-            throw new Exception(_("Der Typ des Bilds wird nicht unterstützt."));
-        }
-        $image = $lookup[$type]($filename);
-
-        imagealphablending($image, false);
-        imagesavealpha($image, true);
-
-        # resize image if needed
-        if ($height > $thumb_height || $width > $thumb_width) {
-            $factor = max($thumb_width / $width, $thumb_height / $height);
-            $resized_width  = round($width * $factor);
-            $resized_height = round($height * $factor);
-        } else {
-            $resized_width  = $width;
-            $resized_height = $height;
-        }
-
-        $image = self::imageresize($image, $width, $height, $resized_width, $resized_height);
-
-        $dst = imagecreatetruecolor($thumb_width, $thumb_height);
-        imagealphablending($dst, false);
-        imagesavealpha($dst, true);
-
-        $trans_colour = imagecolorallocatealpha($dst, 0, 0, 0, 127);
-        imagefill($dst, 0, 0, $trans_colour);
-
-        // center the new image
-        $ypos = intval($thumb_height - $resized_height) >> 1;
-        $xpos = intval($thumb_width - $resized_width) >> 1;
-
-        imagecopy(
-            $dst, $image,
-            $xpos, $ypos,
-            0, 0,
-            $resized_width, $resized_height
-        );
-
-        $output_file = $this->getCustomAvatarPath($size);
-        $directory = dirname($output_file);
-        if (!is_dir($directory) && !mkdir($directory)) {
-            throw new Exception(_('Das Verzeichnis zum Speichern der Datei konnte nicht angelegt werden.'));
-        }
-
-        imagewebp($dst, $output_file, self::IMAGE_QUALITY);
-    }
-
-    private function imageresize($image, $current_width, $current_height, $width, $height)
-    {
-        $image_resized = imagecreatetruecolor($width, $height);
-
-        imagealphablending($image_resized, false);
-        imagesavealpha($image_resized, true);
-        imagecopyresampled(
-            $image_resized, $image,
-            0, 0,
-            0, 0,
-            $width, $height,
-            $current_width, $current_height
-        );
-
-        return $image_resized;
-    }
-
-    public static function error_handler($errno, $errstr, $errfile, $errline)
-    {
-        if (defined('E_RECOVERABLE_ERROR')
-            && $errno == constant('E_RECOVERABLE_ERROR'))
-        {
-            $message = sprintf(
-                'Recoverable error "%s" occured in file %s line %u.',
-                $errstr,
-                $errfile,
-                $errline
-            );
-            throw new Exception($message);
-        }
-
-        # execute PHP internal error handler
-        return false;
-    }
-
-    /**
-     * Return the default title of the avatar.
-     * @return string the default title
-     */
-    public function getDefaultTitle()
-    {
-        if ($this->isNobody()) {
-            return static::NOBODY;
-        }
-
-        require_once 'lib/functions.php';
-        return get_fullname($this->user_id);
-    }
-
-    /**
-     * Return if avatar is visible to the current user.
-     * Also set the user_id of avatar to nobody if not visible to current user.
-     * @return boolean: true if visible
-     */
-    protected function checkAvatarVisibility()
-    {
-        $visible = Visibility::verify('picture', $this->user_id);
-        if (!$visible) {
-            $this->user_id = self::NOBODY;
-        }
-        return $visible;
-    }
-
-    /**
-     * Corrects the orientation of images from iOS/OS X devices which might
-     * lead to a rotated image. EXIF information is checked and when the
-     * orientation is set by EXIF data, we rotate the image accordingly.
-     *
-     * @param string $filename Filename of the image to correct
-     */
-    protected function sanitizeOrientation($filename)
-    {
-        if (!function_exists('exif_read_data')) {
-            return;
-        }
-
-        if (exif_imagetype($filename) !== IMAGETYPE_JPEG) {
-            return;
-        }
-
-        $exif = exif_read_data($filename);
-        if (!$exif || !$exif['Orientation'] || $exif['Orientation'] == 1) {
-            return;
-        }
-
-        $degree = 0;
-        switch ($exif['Orientation']) {
-            case 3:
-                $degree = 180;
-                break;
-            case 6:
-                $degree = -90;
-                break;
-            case 8:
-                $degree = 90;
-                break;
-        }
-
-        if ($degree) {
-            $img = imagecreatefromstring(file_get_contents($filename));
-            $img = imagerotate($img, $degree, 0);
-
-            $extension = pathinfo($filename, PATHINFO_EXTENSION);
-            if ($extension === 'jpg' || $extension === 'jpeg') {
-                imagejpeg($img, $filename, 95);
-            } elseif ($extension === 'gif') {
-                imagegif($img, $filename);
-            } elseif ($extension === 'png') {
-                imagepng($img, $filename, 9);
-            } else {
-                imagewebp($img, $filename, self::IMAGE_QUALITY);
-            }
-
-            imagedestroy($img);
-        }
-    }
-}
diff --git a/lib/classes/Avatar.php b/lib/classes/Avatar.php
new file mode 100644
index 0000000..959523f
--- /dev/null
+++ b/lib/classes/Avatar.php
@@ -0,0 +1,635 @@
+<?php
+/**
+ * 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. *
+ *
+ * @author  André Klaßen (aklassen@uos)
+ * @author  Marcus Lunzenauer (mlunzena@uos)
+ * @author  Jan-Hendirk Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since   1.7
+ */
+class Avatar
+{
+    public const AVATAR_TYPE = 'user';
+    protected const CREATE_CHUNKED_FOLDERS = true;
+
+    public const EXTENSION = 'webp';
+    public const IMAGE_QUALITY = 90;
+
+    /**
+     * This constant stands for the maximal size of a user picture.
+     */
+    public const ORIGINAL = 'original';
+
+    /**
+     * This constant stands for the maximal size of a user picture.
+     */
+    public const NORMAL = 'normal';
+
+    /**
+     * This constant stands for a medium size of a user picture.
+     */
+    public const MEDIUM = 'medium';
+
+    /**
+     * This constant stands for an icon size of a user picture.
+     */
+    public const SMALL    = 'small';
+
+    /**
+     * This constant represents the maximal size of a user picture in bytes.
+     */
+    public const MAX_FILE_SIZE = 10485760;
+
+    /**
+     * This constant holds the username and ID of the "nobody" avatar.
+     */
+    protected const NOBODY = 'nobody';
+
+    /**
+     * Holds the user's id
+     *
+     * @var string
+     */
+    protected $user_id;
+
+    /**
+     * Holds the user's username
+     *
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * Returns an avatar object of the appropriate class.
+     *
+     * @param string $id the user's id
+     * @param string $username the user's username (optional)
+     *
+     * @return static the user's avatar.
+     */
+    public static function getAvatar($id)
+    {
+        $username = null;
+
+        if (func_num_args() === 2) {
+            $username = func_get_arg(1);
+        }
+
+        return new static($id, $username);
+    }
+
+    /**
+     * Returns an avatar object for "nobody".
+     *
+     * @return Avatar the user's avatar.
+     */
+    public static function getNobody()
+    {
+        return new static(static::NOBODY, static::NOBODY);
+    }
+
+    /**
+     * Returns the url to the customized avatars
+     *
+     * @return string
+     */
+    public function getAvatarDirectoryUrl()
+    {
+        return sprintf(
+            '%s/%s%s',
+            $GLOBALS['DYNAMIC_CONTENT_URL'],
+            static::AVATAR_TYPE,
+            static::CREATE_CHUNKED_FOLDERS ? '/' . substr($this->user_id, 0, 2) : ''
+        );
+    }
+
+    /**
+     * Returns the path to the customized avatars
+     *
+     * @return string
+     */
+    public function getAvatarDirectoryPath()
+    {
+        return sprintf(
+            '%s/%s%s',
+            $GLOBALS['DYNAMIC_CONTENT_PATH'],
+            static::AVATAR_TYPE,
+            static::CREATE_CHUNKED_FOLDERS ? '/' . substr($this->user_id, 0, 2) : ''
+        );
+    }
+
+    /**
+     * Returns the url to the default avatars
+     */
+    public function getDefaultAvatarDirectoryUrl(): string
+    {
+        return Assets::url('images/avatars/' . static::AVATAR_TYPE);
+    }
+
+    /**
+     * Returns the path to the default avatars
+     */
+    public function getDefaultAvatarDirectoryPath(): string
+    {
+        return Assets::path('images/avatars/' . static::AVATAR_TYPE);
+    }
+
+    /**
+     * Returns the url to a customized avatar
+     *
+     * @return string
+     */
+    public function getCustomAvatarUrl($size)
+    {
+        if ($this->isNobody()) {
+            return sprintf(
+                '%s/%s_%s.%s',
+                $this->getDefaultAvatarDirectoryUrl(),
+                $this->user_id,
+                $size,
+                self::EXTENSION
+            );
+        }
+
+        return sprintf(
+            '%s/%s_%s.%s?d=%s',
+            $this->getAvatarDirectoryUrl(),
+            $this->user_id,
+            $size,
+            self::EXTENSION,
+            @filemtime($this->getCustomAvatarPath($size)) ?: "0"
+        );
+    }
+
+    /**
+     * Returns the path to a customized avatar
+     *
+     * @return string
+     */
+    public function getCustomAvatarPath($size)
+    {
+        if ($this->isNobody()) {
+            return sprintf(
+                '%s/%s_%s.%s',
+                $this->getDefaultAvatarDirectoryPath(),
+                $this->user_id,
+                $size,
+                self::EXTENSION
+            );
+        }
+
+        return sprintf(
+            '%s/%s_%s.%s',
+            $this->getAvatarDirectoryPath(),
+            $this->user_id,
+            $size,
+            self::EXTENSION
+        );
+    }
+
+    /**
+     * Constructs a new Avatar object belonging to a user with the given id.
+     *
+     * @param string $user_id  the user's id
+     * @param string $username the user's username (optional)
+     */
+    protected function __construct($user_id, $username = null)
+    {
+        $this->user_id = $user_id;
+        $this->username = $username;
+
+        $this->checkAvatarVisibility();
+    }
+
+    /**
+     * Returns the file name of a user's avatar.
+     *
+     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
+     *
+     * @return string    the absolute file path to the avatar
+     */
+    public function getFilename($size)
+    {
+        return $this->is_customized()
+            ? $this->getCustomAvatarPath($size)
+            : $this->getNobody()->getCustomAvatarPath($size);
+    }
+
+    /**
+     * Returns the URL of a user's picture.
+     *
+     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
+     *
+     * @return string    the URL to the user's picture
+     */
+    # TODO (mlunzena) in Url umbenennen
+    public function getURL($size)
+    {
+        return $this->is_customized()
+            ? $this->getCustomAvatarUrl($size)
+            : $this->getNobody()->getCustomAvatarUrl($size);
+    }
+
+    /**
+     * Returns whether this avatar is a default/"nobody" avatar.
+     */
+    public function isNobody(): bool
+    {
+        return $this->user_id === static::NOBODY;
+    }
+
+    /**
+     * Returns whether a customized file exists
+     */
+    public function customizedFileExists(): bool
+    {
+        return file_exists($this->getCustomAvatarPath(static::MEDIUM));
+    }
+
+    /**
+     * Returns whether a user has uploaded a custom picture.
+     *
+     * @return boolean    returns TRUE if the user customized her picture, FALSE
+     *                                    otherwise.
+     */
+    public function is_customized()
+    {
+        return !$this->isNobody()
+            && $this->customizedFileExists();
+    }
+
+    /**
+     * Returns the CSS class to use for this avatar image.
+     *
+     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
+     *
+     * @return string CSS class to use for the avatar
+     */
+    protected function getCssClass($size)
+    {
+        if (!isset($this->username)) {
+            $this->username = get_username($this->user_id);
+        }
+
+        return sprintf(
+            'avatar-%s user-%s' . ($this->is_customized() ? '' : ' recolor'),
+            $size,
+            htmlReady($this->username)
+        );
+    }
+
+    /**
+     * Constructs a desired HTML image tag for an Avatar. Additional
+     * html attributes may also be specified using the $opt parameter.
+     *
+     * @param string $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
+     * @param array  $opt  array of attributes to add to the HTML image tag
+     *
+     * @return string returns the HTML image tag
+     */
+    public function getImageTag($size = self::MEDIUM, $opt = [])
+    {
+        $opt['src'] = $this->getURL($size);
+
+        if (isset($opt['class'])) {
+            $opt['class'] = $this->getCssClass($size) . ' ' . $opt['class'];
+        } else {
+            $opt['class'] = $this->getCssClass($size);
+        }
+
+        // Apply cast to string for title if necessary
+        if (isset($opt['title']) && !is_string($opt['title'])) {
+            $opt['title'] = (string) $opt['title'];
+        }
+
+        if (!empty($opt['title']) && $opt['title'] !== html_entity_decode($opt['title'])) {
+            // Decode already htmlready encoded titles (which were used until
+            // all attributes were encoded inside this method)
+            $opt['title'] = html_entity_decode($opt['title']);
+
+            if (Studip\ENV === 'development') {
+                $trace  = debug_backtrace();
+                $caller = array_shift($trace);
+
+                $file = str_replace("{$GLOBALS['STUDIP_BASE_PATH']}/", '', $caller['file']);
+                trigger_error(
+                    "{$file}:{$caller['line']}: Passes already encoded title to Avatar::getImageTag()",
+                    E_USER_DEPRECATED
+                );
+            }
+        }
+
+        if (!isset($opt['alt']) && !isset($opt['title'])) {
+            //Add an empty alt attribute to prevent screen readers from
+            //reading the URL of the icon:
+            $opt['alt'] = '';
+        }
+
+        return '<img ' . arrayToHtmlAttributes($opt) . '>';
+    }
+
+    /**
+     * Creates all the different sized thumbnails for an uploaded file.
+     *
+     * @param string $userfile the key of the uploaded file, see documentation about $_FILES
+     *
+     * @return void
+     */
+    public function createFromUpload($userfile)
+    {
+        try {
+            // keine Datei ausgewählt!
+            if (!$_FILES[$userfile]['name']) {
+                throw new Exception(_('Sie haben keine Datei zum Hochladen ausgewählt!'));
+            }
+
+            // Fehler beim Hochladen
+            if ($_FILES[$userfile]['error'] !== UPLOAD_ERR_OK) {
+                throw new Exception(_('Es gab einen Fehler beim Hochladen der Datei!'));
+            }
+
+
+            // Bilddatei ist zu groß
+            if ($_FILES[$userfile]['size'] > self::MAX_FILE_SIZE) {
+                throw new Exception(sprintf(
+                    _('Die hochgeladene Bilddatei ist %s KB groß. Die maximale Dateigröße beträgt %s KB!'),
+                    round($_FILES[$userfile]['size'] / 1024),
+                    self::MAX_FILE_SIZE / 1024)
+                );
+            }
+
+            // get extension
+            $pathinfo = pathinfo($_FILES[$userfile]['name']);
+            $ext = mb_strtolower($pathinfo['extension']);
+
+            // passende Endung ?
+            if (!in_array($ext, words('jpg jpeg gif png webp'))) {
+                throw new Exception(sprintf(
+                    _('Der Dateityp der Bilddatei ist falsch (%s). Es sind nur die Dateiendungen .gif, .png, .jpeg, .jpg oder .webp erlaubt!'),
+                    $ext
+                ));
+            }
+
+            // na dann kopieren wir mal...
+            $filename = tempnam($GLOBALS['TMP_PATH'], 'avatar-upload');
+
+            if (!@move_uploaded_file($_FILES[$userfile]['tmp_name'], $filename)) {
+                throw new Exception(_("Es ist ein Fehler beim Kopieren der Datei aufgetreten. Das Bild wurde nicht hochgeladen!"));
+            }
+
+            // set permissions for uploaded file
+            @chmod($filename, 0666 & ~umask());
+
+            $this->sanitizeOrientation($filename);
+            $this->createFrom($filename);
+        } finally {
+            if (isset($filename)) {
+                @unlink($filename);
+            }
+        }
+    }
+
+    /**
+     * Creates thumbnails from an image.
+     *
+     * @param string $filename filename of the image to create thumbnails from
+     *
+     * @return void
+     */
+    public function createFrom($filename)
+    {
+        if (!extension_loaded('gd')) {
+            throw new Exception(_('Es ist ein Fehler beim Bearbeiten des Bildes aufgetreten.') . ' (' . _('Fehlende GD-Lib') . ')');
+        }
+
+        set_error_handler([__CLASS__, 'error_handler']);
+
+        NotificationCenter::postNotification('AvatarWillCreate', $this->user_id);
+        $this->resize(static::NORMAL, $filename);
+        $this->resize(static::MEDIUM, $filename);
+        $this->resize(static::SMALL,  $filename);
+        NotificationCenter::postNotification('AvatarDidCreate', $this->user_id);
+
+        restore_error_handler();
+    }
+
+    /**
+     * Removes all uploaded pictures of a user.
+     */
+    public function reset()
+    {
+        if ($this->is_customized()) {
+            NotificationCenter::postNotification('AvatarWillDelete', $this->user_id);
+            @unlink($this->getCustomAvatarPath(static::NORMAL));
+            @unlink($this->getCustomAvatarPath(static::SMALL));
+            @unlink($this->getCustomAvatarPath(static::MEDIUM));
+            NotificationCenter::postNotification('AvatarDidDelete', $this->user_id);
+        }
+    }
+
+    /**
+     * Return the dimension of a size
+     *
+     * @param string $size the dimension of a size
+     * @return array{0: int, 1: int} a tupel of integers [width, height]
+     */
+    public static function getDimension($size)
+    {
+        $dimensions = [
+            static::NORMAL => [250, 250],
+            static::MEDIUM => [100, 100],
+            static::SMALL  => [25, 25]
+        ];
+        return $dimensions[$size];
+    }
+
+    /**
+     * Create from an image thumbnails of a specified size.
+     *
+     * @param string $size     the size of the thumbnail to create
+     * @param string $filename the filename of the image to make thumbnail of
+     */
+    private function resize(string $size, string $filename)
+    {
+        [$thumb_width, $thumb_height] = static::getDimension($size);
+
+        $thumb_width = $thumb_width * 2;
+        $thumb_height = $thumb_height * 2;
+
+        [$width, $height, $type] = getimagesize($filename);
+
+        # create image resource from filename
+        $lookup = [
+            IMAGETYPE_GIF  => 'imagecreatefromgif',
+            IMAGETYPE_JPEG => 'imagecreatefromjpeg',
+            IMAGETYPE_PNG  => 'imagecreatefrompng',
+            IMAGETYPE_WEBP => 'imagecreatefromwebp',
+        ];
+        if (!isset($lookup[$type])) {
+            throw new Exception(_("Der Typ des Bilds wird nicht unterstützt."));
+        }
+        $image = $lookup[$type]($filename);
+
+        imagealphablending($image, false);
+        imagesavealpha($image, true);
+
+        # resize image if needed
+        if ($height > $thumb_height || $width > $thumb_width) {
+            $factor = max($thumb_width / $width, $thumb_height / $height);
+            $resized_width  = round($width * $factor);
+            $resized_height = round($height * $factor);
+        } else {
+            $resized_width  = $width;
+            $resized_height = $height;
+        }
+
+        $image = self::imageresize($image, $width, $height, $resized_width, $resized_height);
+
+        $dst = imagecreatetruecolor($thumb_width, $thumb_height);
+        imagealphablending($dst, false);
+        imagesavealpha($dst, true);
+
+        $trans_colour = imagecolorallocatealpha($dst, 0, 0, 0, 127);
+        imagefill($dst, 0, 0, $trans_colour);
+
+        // center the new image
+        $ypos = intval($thumb_height - $resized_height) >> 1;
+        $xpos = intval($thumb_width - $resized_width) >> 1;
+
+        imagecopy(
+            $dst, $image,
+            $xpos, $ypos,
+            0, 0,
+            $resized_width, $resized_height
+        );
+
+        $output_file = $this->getCustomAvatarPath($size);
+        $directory = dirname($output_file);
+        if (!is_dir($directory) && !mkdir($directory)) {
+            throw new Exception(_('Das Verzeichnis zum Speichern der Datei konnte nicht angelegt werden.'));
+        }
+
+        imagewebp($dst, $output_file, self::IMAGE_QUALITY);
+    }
+
+    private function imageresize($image, $current_width, $current_height, $width, $height)
+    {
+        $image_resized = imagecreatetruecolor($width, $height);
+
+        imagealphablending($image_resized, false);
+        imagesavealpha($image_resized, true);
+        imagecopyresampled(
+            $image_resized, $image,
+            0, 0,
+            0, 0,
+            $width, $height,
+            $current_width, $current_height
+        );
+
+        return $image_resized;
+    }
+
+    public static function error_handler($errno, $errstr, $errfile, $errline)
+    {
+        if (defined('E_RECOVERABLE_ERROR')
+            && $errno == constant('E_RECOVERABLE_ERROR'))
+        {
+            $message = sprintf(
+                'Recoverable error "%s" occured in file %s line %u.',
+                $errstr,
+                $errfile,
+                $errline
+            );
+            throw new Exception($message);
+        }
+
+        # execute PHP internal error handler
+        return false;
+    }
+
+    /**
+     * Return the default title of the avatar.
+     * @return string the default title
+     */
+    public function getDefaultTitle()
+    {
+        if ($this->isNobody()) {
+            return static::NOBODY;
+        }
+
+        require_once 'lib/functions.php';
+        return get_fullname($this->user_id);
+    }
+
+    /**
+     * Return if avatar is visible to the current user.
+     * Also set the user_id of avatar to nobody if not visible to current user.
+     * @return boolean: true if visible
+     */
+    protected function checkAvatarVisibility()
+    {
+        $visible = Visibility::verify('picture', $this->user_id);
+        if (!$visible) {
+            $this->user_id = self::NOBODY;
+        }
+        return $visible;
+    }
+
+    /**
+     * Corrects the orientation of images from iOS/OS X devices which might
+     * lead to a rotated image. EXIF information is checked and when the
+     * orientation is set by EXIF data, we rotate the image accordingly.
+     *
+     * @param string $filename Filename of the image to correct
+     */
+    protected function sanitizeOrientation($filename)
+    {
+        if (!function_exists('exif_read_data')) {
+            return;
+        }
+
+        if (exif_imagetype($filename) !== IMAGETYPE_JPEG) {
+            return;
+        }
+
+        $exif = exif_read_data($filename);
+        if (!$exif || !$exif['Orientation'] || $exif['Orientation'] == 1) {
+            return;
+        }
+
+        $degree = 0;
+        switch ($exif['Orientation']) {
+            case 3:
+                $degree = 180;
+                break;
+            case 6:
+                $degree = -90;
+                break;
+            case 8:
+                $degree = 90;
+                break;
+        }
+
+        if ($degree) {
+            $img = imagecreatefromstring(file_get_contents($filename));
+            $img = imagerotate($img, $degree, 0);
+
+            $extension = pathinfo($filename, PATHINFO_EXTENSION);
+            if ($extension === 'jpg' || $extension === 'jpeg') {
+                imagejpeg($img, $filename, 95);
+            } elseif ($extension === 'gif') {
+                imagegif($img, $filename);
+            } elseif ($extension === 'png') {
+                imagepng($img, $filename, 9);
+            } else {
+                imagewebp($img, $filename, self::IMAGE_QUALITY);
+            }
+
+            imagedestroy($img);
+        }
+    }
+}
diff --git a/lib/classes/BreadCrumb.class.php b/lib/classes/BreadCrumb.class.php
deleted file mode 100644
index 73a2086..0000000
--- a/lib/classes/BreadCrumb.class.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * breadcrumb.php - Provides bread crumb navigation
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       3.5
- */
-class BreadCrumb
-{
-
-    /**
-     * Array with parts of bread crumb navigation.
-     *
-     * @var array
-     */
-    private $trail = [];
-
-    public function __construct()
-    {
-        URLHelper::bindLinkParam('trail', $this->trail);
-    }
-
-    /**
-     * Appends a new element to the end of the bread crumb navigation.
-     *
-     * @param MvvTreeItem $object The MvvTreeItem object of the current view
-     * to append.
-     * @param string $action The url to the current view.
-     */
-    public function append($object, $action)
-    {
-        $trail = $this->getTrail();
-        $id = '';
-        if (is_object($object)) {
-            $type = get_class($object);
-            $id = $object->id;
-            $trail[$type] = [
-                'id' => $object->id,
-                'actn' => $action
-            ];
-        } else if (is_array($object)) {
-            $id = reset($object)->id;
-            $type = get_class(reset($object));
-            foreach ($object as $obj) {
-                if ($obj && $obj->id != $id) {
-                    $additional_objects[get_class($obj)] = $obj->id;
-                }
-            }
-            $trail[$type] = [
-                'id' => $id,
-                'add' => $additional_objects,
-                'actn' => $action
-            ];
-        } else {
-            $trail[$action] = [
-                'name' => $object,
-                'actn' => $action
-            ];
-        }
-        $newTrail = [];
-        $lastElement = false;
-        foreach ($trail as $key => $trail_item) {
-            if ($lastElement) break;
-            $newTrail[$key] = $trail_item;
-            $lastElement = $key === $id;
-        }
-        $this->trail = $newTrail;
-    }
-
-    /**
-     * Removes the last element from the bread crumb navigation.
-     */
-    public function pop()
-    {
-        array_pop($this->trail);
-    }
-
-    /**
-     * Returns all elements of the bread crumb navigation.
-     *
-     * @return array All elements of the bread crumb navigation
-     */
-    public function getTrail()
-    {
-        return $this->trail;
-    }
-
-    /**
-     * Initialize a new bread crumb navigation.
-     */
-    public function init()
-    {
-        $this->trail = [];
-    }
-
-}
diff --git a/lib/classes/BreadCrumb.php b/lib/classes/BreadCrumb.php
new file mode 100644
index 0000000..73a2086
--- /dev/null
+++ b/lib/classes/BreadCrumb.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * breadcrumb.php - Provides bread crumb navigation
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       3.5
+ */
+class BreadCrumb
+{
+
+    /**
+     * Array with parts of bread crumb navigation.
+     *
+     * @var array
+     */
+    private $trail = [];
+
+    public function __construct()
+    {
+        URLHelper::bindLinkParam('trail', $this->trail);
+    }
+
+    /**
+     * Appends a new element to the end of the bread crumb navigation.
+     *
+     * @param MvvTreeItem $object The MvvTreeItem object of the current view
+     * to append.
+     * @param string $action The url to the current view.
+     */
+    public function append($object, $action)
+    {
+        $trail = $this->getTrail();
+        $id = '';
+        if (is_object($object)) {
+            $type = get_class($object);
+            $id = $object->id;
+            $trail[$type] = [
+                'id' => $object->id,
+                'actn' => $action
+            ];
+        } else if (is_array($object)) {
+            $id = reset($object)->id;
+            $type = get_class(reset($object));
+            foreach ($object as $obj) {
+                if ($obj && $obj->id != $id) {
+                    $additional_objects[get_class($obj)] = $obj->id;
+                }
+            }
+            $trail[$type] = [
+                'id' => $id,
+                'add' => $additional_objects,
+                'actn' => $action
+            ];
+        } else {
+            $trail[$action] = [
+                'name' => $object,
+                'actn' => $action
+            ];
+        }
+        $newTrail = [];
+        $lastElement = false;
+        foreach ($trail as $key => $trail_item) {
+            if ($lastElement) break;
+            $newTrail[$key] = $trail_item;
+            $lastElement = $key === $id;
+        }
+        $this->trail = $newTrail;
+    }
+
+    /**
+     * Removes the last element from the bread crumb navigation.
+     */
+    public function pop()
+    {
+        array_pop($this->trail);
+    }
+
+    /**
+     * Returns all elements of the bread crumb navigation.
+     *
+     * @return array All elements of the bread crumb navigation
+     */
+    public function getTrail()
+    {
+        return $this->trail;
+    }
+
+    /**
+     * Initialize a new bread crumb navigation.
+     */
+    public function init()
+    {
+        $this->trail = [];
+    }
+
+}
diff --git a/lib/classes/Button.class.php b/lib/classes/Button.class.php
deleted file mode 100644
index 1c2c437..0000000
--- a/lib/classes/Button.class.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * Copyright (c) 2011 mlunzena@uos.de, aklassen@uos.de
- *
- * 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.
- */
-
-
-namespace Studip;
-
-/**
- * Represents an HTML button element. Class Button inherits from
- * Interactable and customizes the HTML output.
- */
-class Button extends Interactable
-{
-
-    /**
-     * Initialize a Button.
-     * The second parameter is used as @name attribute of the
-     * resulting <button> HTML element.
-     *
-     * @param string $label       the label of the button element
-     * @param string $name        the @name element of the button element
-     * @param array  $attributes  the attributes of the button element
-     */
-    protected function initialize($label, $name, $attributes)
-    {
-        $this->attributes['name'] = $name ?: $this->label;
-    }
-
-    /**
-     * @return  string returns a HTML representation of this button.
-     */
-    public function __toString()
-    {
-        // add "button" to attribute @class
-        if (!isset($this->attributes['class'])) {
-            $this->attributes['class'] = '';
-        }
-        $this->attributes['class'] .= ' button';
-
-        $attributes = [];
-        ksort($this->attributes);
-        foreach ($this->attributes as $k => $v) {
-            $attributes[] = sprintf(' %s="%s"', $k, htmlReady($v));
-        }
-
-        return sprintf(
-            '<button type="submit"%s>%s</button>',
-            join('', $attributes),
-            htmlReady($this->label)
-        );
-    }
-}
diff --git a/lib/classes/Button.php b/lib/classes/Button.php
new file mode 100644
index 0000000..1c2c437
--- /dev/null
+++ b/lib/classes/Button.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * Copyright (c) 2011 mlunzena@uos.de, aklassen@uos.de
+ *
+ * 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.
+ */
+
+
+namespace Studip;
+
+/**
+ * Represents an HTML button element. Class Button inherits from
+ * Interactable and customizes the HTML output.
+ */
+class Button extends Interactable
+{
+
+    /**
+     * Initialize a Button.
+     * The second parameter is used as @name attribute of the
+     * resulting <button> HTML element.
+     *
+     * @param string $label       the label of the button element
+     * @param string $name        the @name element of the button element
+     * @param array  $attributes  the attributes of the button element
+     */
+    protected function initialize($label, $name, $attributes)
+    {
+        $this->attributes['name'] = $name ?: $this->label;
+    }
+
+    /**
+     * @return  string returns a HTML representation of this button.
+     */
+    public function __toString()
+    {
+        // add "button" to attribute @class
+        if (!isset($this->attributes['class'])) {
+            $this->attributes['class'] = '';
+        }
+        $this->attributes['class'] .= ' button';
+
+        $attributes = [];
+        ksort($this->attributes);
+        foreach ($this->attributes as $k => $v) {
+            $attributes[] = sprintf(' %s="%s"', $k, htmlReady($v));
+        }
+
+        return sprintf(
+            '<button type="submit"%s>%s</button>',
+            join('', $attributes),
+            htmlReady($this->label)
+        );
+    }
+}
diff --git a/lib/classes/CSVArrayObject.class.php b/lib/classes/CSVArrayObject.class.php
deleted file mode 100644
index f075795..0000000
--- a/lib/classes/CSVArrayObject.class.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * This class works like an array.
- * The internal array is constructed from a comma separated string
- * When used in an string context, it is automatically converted to a comma
- * separated string
- *
- * Usage:
- * @code
- * $csvarray = new CSVArrayObject('eins,zwei,drei');
- * $csvarray[] = 'vier';
- * echo $csvarray; // prints out "eins,zwei,drei,vier"
- * @endcode
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @link http://www.php.net/manual/en/class.arrayobject.php
- */
-class CSVArrayObject extends StudipArrayObject
-{
-    /**
-     * Construct an array object from a string of comma separated items
-     *
-     * @param string $input a string of comma separated items
-     */
-    function __construct($input)
-    {
-        if (is_string($input)) {
-            $input = mb_strlen($input) ? array_map('trim', explode(',', $input)) : [];
-        }
-        parent::__construct((array)$input);
-    }
-
-    /**
-     * magic method for use of object in string context
-     *
-     * @return string internal array itmes converted to a comma separated list
-     */
-    function __toString()
-    {
-        return implode(',', $this->getArrayCopy());
-    }
-}
diff --git a/lib/classes/CSVArrayObject.php b/lib/classes/CSVArrayObject.php
new file mode 100644
index 0000000..f075795
--- /dev/null
+++ b/lib/classes/CSVArrayObject.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * This class works like an array.
+ * The internal array is constructed from a comma separated string
+ * When used in an string context, it is automatically converted to a comma
+ * separated string
+ *
+ * Usage:
+ * @code
+ * $csvarray = new CSVArrayObject('eins,zwei,drei');
+ * $csvarray[] = 'vier';
+ * echo $csvarray; // prints out "eins,zwei,drei,vier"
+ * @endcode
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @link http://www.php.net/manual/en/class.arrayobject.php
+ */
+class CSVArrayObject extends StudipArrayObject
+{
+    /**
+     * Construct an array object from a string of comma separated items
+     *
+     * @param string $input a string of comma separated items
+     */
+    function __construct($input)
+    {
+        if (is_string($input)) {
+            $input = mb_strlen($input) ? array_map('trim', explode(',', $input)) : [];
+        }
+        parent::__construct((array)$input);
+    }
+
+    /**
+     * magic method for use of object in string context
+     *
+     * @return string internal array itmes converted to a comma separated list
+     */
+    function __toString()
+    {
+        return implode(',', $this->getArrayCopy());
+    }
+}
diff --git a/lib/classes/Color.class.php b/lib/classes/Color.class.php
deleted file mode 100644
index a9b4506..0000000
--- a/lib/classes/Color.class.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-/**
- * lib/classes/Color.class.php - class to mix colors and convert them between different types
- *
- * 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.
- *
- * @author      Rasmus Fuhse <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * class to mix colors and convert them between different types
- *
- * @since       2.1
- */
-class Color {
-    /**
-     * HTML-4-Standard color-names plus a few additions
-     * May be expanded in a later version to allow
-     *  X11 color names as described in
-     *  http://en.wikipedia.org/wiki/Web_colors
-     *
-     * @var array
-     */
-    static $colorstrings = [
-        'aqua'           => [0, 255, 255, 1],
-        'azure'          => [240, 255, 255, 1],
-        'blue'           => [0, 0, 255, 1],
-        'cyan'           => [0, 255, 255, 1],
-        'darkblue'       => [0, 0, 139, 1],
-        'darkred'        => [139, 0, 0, 1],
-        'gold'           => [255, 215, 0, 1],
-        'gray'           => [128, 128, 128, 1],
-        'indigo'         => [75, 0, 130, 1],
-        'lightsteelblue' => [176, 196, 222, 1],
-        'lightyellow'    => [255, 255, 224, 1],
-        'lime'           => [0, 255, 0, 1],
-        'magenta'        => [255, 0, 255, 1],
-        'navy'           => [0, 0, 128, 1],
-        'olive'          => [128, 128, 0, 1],
-        'orange'         => [255, 165, 0, 1],
-        'pink'           => [255, 192, 203, 1],
-        'red'            => [255, 0, 0, 1],
-        'purple'         => [128, 0, 128, 1],
-        'violet'         => [238, 130, 238, 1],
-        'yellow'         => [255, 255, 0, 1],
-        'black'          => [0, 0, 0, 1],
-        'white'          => [255, 255, 255, 1]
-    ];
-
-    /**
-     * converts a css-hex-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function hex2array($color) {
-        $color = str_replace('#','',$color);
-        $arr[0] = hexdec(mb_substr($color,0,2));
-        $arr[1] = hexdec(mb_substr($color,2,2));
-        $arr[2] = hexdec(mb_substr($color,4,2));
-        $arr[3] = 1.0;
-        return $arr;
-    }
-
-    /**
-     * converts a css-rgba-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function rgba2array($color) {
-        preg_match("/rgba\(\s*(\d+\%?),\s*(\d+\%?),\s*(\d+\%?),\s*(\d*\.?\d*)\s*\)/", $color, $matches);
-        array_shift($matches);
-        $matches[3] = floatval($matches[3]);
-        return $matches;
-    }
-
-    /**
-     * converts a css-rgb-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function rgb2array($color) {
-        preg_match("/rgb\(\s*(\d+\%?),\s*(\d+\%?),\s*(\d+\%?)\s*\)/", $color, $matches);
-        array_shift($matches);
-        $matches[3] = 1.0;
-        return $matches;
-    }
-
-    /**
-     * converts a css-hsl-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function hsl2array($color) {
-        preg_match("/hsl\(\s*(\d+),\s*(\d+)\%,\s*(\d+)\%\s*\)/", $color, $matches);
-        array_shift($matches);
-        $matches[0] %= 360;
-        $matches[3] = 1.0;
-        $h = $matches[0];
-        $s = $matches[1];
-        $l = $matches[2];
-        $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
-        $m1 = $l * 2 - $m2;
-        return [self::_color_hue2rgb($m1, $m2, $h + 0.33333),
-            self::_color_hue2rgb($m1, $m2, $h),
-            self::_color_hue2rgb($m1, $m2, $h - 0.33333),
-            1.0
-        ];
-    }
-
-    static private function _color_hue2rgb($m1, $m2, $h) {
-        $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-        if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-        if ($h * 2 < 1) return $m2;
-        if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
-        return $m1;
-    }
-
-    /**
-     * Mixes two colors by preferring the first one with $percentOfColor1 percent.
-     * If color2 is the only color with alpha-chanel, it will return a color
-     * in the format of color2 else (most of the time) in the format of color1.
-     * @return string: "#ffffff", "rgb(...)", "rgba(...)" depending on color1 and alpha-chanel
-     */
-    static function mix($color1, $color2, $percentOfColor1 = 50, $f = null) {
-        $percentOfColor1 = $percentOfColor1 > 100
-                            ? 100
-                            : ($percentOfColor1 < 0 ? 0 : $percentOfColor1);
-        list($color1, $format1) = self::_normalize($color1);
-        list($color2, $format2) = self::_normalize($color2);
-        $color_new[0] = floor(($color1[0] * $percentOfColor1
-                            + $color2[0] * (100 - $percentOfColor1)) / 100);
-        $color_new[1] = floor(($color1[1] * $percentOfColor1
-                            + $color2[1] * (100 - $percentOfColor1)) / 100);
-        $color_new[2] = floor(($color1[2] * $percentOfColor1
-                            + $color2[2] * (100 - $percentOfColor1)) / 100);
-        $color_new[3] = ($color1[3] * $percentOfColor1
-                            + $color2[3] * (100 - $percentOfColor1)) / 100;
-        $format = ((mb_strpos($format2, "a") !== false) && (mb_strpos($format1, "a") === false))
-                    ? $format2
-                    : $format1;
-        $func = "_array2" . $format;
-        return self::$func($color_new);
-    }
-
-    /**
-     * Sets the opacity for a color. Hue and saturation is kept, but opacity is changed.
-     * Returns a format with alpha-chanel (rgba or hsla) depending on the given format.
-     */
-    static function opacity($color, $opacity) {
-        list($color, $format) = self::_normalize($color);
-        if (in_array($format, ["hex", "rgb"])) {
-            $format = "rgba";
-        } elseif ($format = "hsl") {
-            $format = "hsla";
-        }
-        $color[3] = floatval($opacity);
-        $color[3] = $color[3] < 0 ? 0 : ($color[3] > 1 ? 1 : $color[3]);
-        $func = "_array2" . $format;
-        return self::$func($color);
-    }
-
-    /**
-     * Make the passed color brighter
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     *
-     * @param  string  $color  any type of css-valid color
-     * @param  int  $factor  percentage of brightning, 100 for white and 0 for no changes to color
-     * @return string  brightened color in same format as the passed one
-     */
-    static function brighten($color, $factor = 35) {
-        // convert to color to rgba
-        list($color, $format) = self::_normalize($color);
-        if ($factor > 100) {
-            $factor = 100;
-        } elseif($factor < 0) {
-            $factor = 0;
-        }
-
-        // return the color itself, if the conversion failed
-        if (!$format) return $color;
-
-        // brighten the color
-        $color[0] = floor(($color[0] * (100 - $factor) + 255 * $factor) / 100);
-        $color[1] = floor(($color[1] * (100 - $factor) + 255 * $factor) / 100);
-        $color[2] = floor(($color[2] * (100 - $factor) + 255 * $factor) / 100);
-
-        // convert the color back (if possible)
-        $func = "_array2" . $format;
-        return self::$func($color);
-    }
-
-    /**
-     * converts any css-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    private static function _normalize($color) {
-        if ($color[0] === "#") {
-            $format = "hex";
-            $arr = self::hex2array($color);
-        } elseif (preg_match("/\(.*\)/", $color)) {
-            $format = mb_substr($color, 0, mb_strpos($color, "("));
-            $func = $format."2array";
-            $arr = self::$func($color);
-        } elseif (self::$colorstrings[mb_strtolower($color)]) {
-            $format = "rgb"; //we don't want colors as strings like "red"
-            $arr = self::$colorstrings[mb_strtolower($color)];
-        }
-        return [$arr, $format];
-    }
-
-    /**
-     * converts a css-rgba-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function rgba($color) {
-        list($arr, $format) = self::_normalize($color);
-        return self::_array2rgba($arr);
-    }
-
-    /**
-     * converts a css-rgb-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function rgb($color) {
-        list($arr, $format) = self::_normalize($color);
-        return self::_array2rgb($arr);
-    }
-
-    /**
-     * converts a css-hex-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function hex($color) {
-        list($arr, $format) = self::_normalize($color);
-        return self::_array2hex($arr);
-    }
-
-    /**
-     * converts a css-hsl-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function hsl($color) {
-        list($arr, $format) = self::_normalize($color);
-        return self::_array2hsl($arr);
-    }
-
-    /**
-     * converts a css-hsla-color into a rgba-quadruple
-     *
-     * @param  string  $color  the color to be converted
-     * @return array   colors as rgba-quadruple
-     */
-    static function hsla($color) {
-        list($arr, $format) = self::_normalize($color);
-        return self::_array2hsla($arr);
-    }
-
-
-    /**
-     * converts a rgba-quadruple into a css-hex-color
-     *
-     * @param  array  $arr  the rgba-quadruple to be converted
-     * @return array  colors as css-hex
-     */
-    static private function _array2hex($arr) {
-        return "#" .
-            ($arr[0] < 16 ? "0" : "").dechex($arr[0]) .
-            ($arr[1] < 16 ? "0" : "").dechex($arr[1]) .
-            ($arr[2] < 16 ? "0" : "").dechex($arr[2]);
-    }
-
-    /**
-     * converts a rgba-quadruple into a css-rgb-color
-     *
-     * @param  array  $arr  the rgba-quadruple to be converted
-     * @return array  colors as css-rgb
-     */
-    static private function _array2rgb($arr) {
-        array_pop($arr);
-        return "rgb(".implode(", ", $arr).")";
-    }
-
-    /**
-     * converts a rgba-quadruple into a css-rgba-color
-     *
-     * @param  array  $arr  the rgba-quadruple to be converted
-     * @return array  colors as css-rgba
-     */
-    static private function _array2rgba($arr) {
-        return "rgba(".implode(", ", $arr).")";
-    }
-
-    /**
-     * converts a rgba-quadruple into a css-hsl-color
-     *
-     * @param  array  $arr  the rgba-quadruple to be converted
-     * @return array  colors as css-hsl
-     */
-    static private function _array2hsl($arr) {
-        $arr = self::_calculate_hsl($arr);
-        return "hsl(".$arr[0].", ".$arr[1]."%, ".$arr[2]."%)";
-    }
-
-    /**
-     * converts a rgba-quadruple into a css-hsla-color
-     *
-     * @param  array  $arr  the rgba-quadruple to be converted
-     * @return array  colors as css-hsla
-     */
-    static private function _array2hsla($arr) {
-        $hsl = self::_calculate_hsl($arr);
-        return "hsl(".$hsl[0].", ".$hsl[1]."%, ".$hsl[2]."%, ".$arr[3].")";
-    }
-
-    static private function _calculate_hsl($arr) {
-        $clrR = ($arr[0]);
-        $clrG = ($arr[1]);
-        $clrB = ($arr[2]);
-
-        $clrMin = min($clrR, $clrG, $clrB);
-        $clrMax = max($clrR, $clrG, $clrB);
-        $deltaMax = $clrMax - $clrMin;
-
-        $L = ($clrMax + $clrMin) / 510;
-
-        if (0 == $deltaMax) {
-            $H = 0;
-            $S = 0;
-        } else {
-            if (0.5 > $L) {
-                $S = $deltaMax / ($clrMax + $clrMin);
-            } else {
-                $S = $deltaMax / (510 - $clrMax - $clrMin);
-            }
-
-            if ($clrMax == $clrR) {
-                $H = ($clrG - $clrB) / (6.0 * $deltaMax);
-            } else if ($clrMax == $clrG) {
-                $H = 1/3 + ($clrB - $clrR) / (6.0 * $deltaMax);
-            } else {
-                $H = 2 / 3 + ($clrR - $clrG) / (6.0 * $deltaMax);
-            }
-
-            if (0 > $H) $H += 1;
-            if (1 < $H) $H -= 1;
-        }
-        return [$H, $S, $L];
-    }
-
-}
\ No newline at end of file
diff --git a/lib/classes/Color.php b/lib/classes/Color.php
new file mode 100644
index 0000000..a9b4506
--- /dev/null
+++ b/lib/classes/Color.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * lib/classes/Color.class.php - class to mix colors and convert them between different types
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * class to mix colors and convert them between different types
+ *
+ * @since       2.1
+ */
+class Color {
+    /**
+     * HTML-4-Standard color-names plus a few additions
+     * May be expanded in a later version to allow
+     *  X11 color names as described in
+     *  http://en.wikipedia.org/wiki/Web_colors
+     *
+     * @var array
+     */
+    static $colorstrings = [
+        'aqua'           => [0, 255, 255, 1],
+        'azure'          => [240, 255, 255, 1],
+        'blue'           => [0, 0, 255, 1],
+        'cyan'           => [0, 255, 255, 1],
+        'darkblue'       => [0, 0, 139, 1],
+        'darkred'        => [139, 0, 0, 1],
+        'gold'           => [255, 215, 0, 1],
+        'gray'           => [128, 128, 128, 1],
+        'indigo'         => [75, 0, 130, 1],
+        'lightsteelblue' => [176, 196, 222, 1],
+        'lightyellow'    => [255, 255, 224, 1],
+        'lime'           => [0, 255, 0, 1],
+        'magenta'        => [255, 0, 255, 1],
+        'navy'           => [0, 0, 128, 1],
+        'olive'          => [128, 128, 0, 1],
+        'orange'         => [255, 165, 0, 1],
+        'pink'           => [255, 192, 203, 1],
+        'red'            => [255, 0, 0, 1],
+        'purple'         => [128, 0, 128, 1],
+        'violet'         => [238, 130, 238, 1],
+        'yellow'         => [255, 255, 0, 1],
+        'black'          => [0, 0, 0, 1],
+        'white'          => [255, 255, 255, 1]
+    ];
+
+    /**
+     * converts a css-hex-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function hex2array($color) {
+        $color = str_replace('#','',$color);
+        $arr[0] = hexdec(mb_substr($color,0,2));
+        $arr[1] = hexdec(mb_substr($color,2,2));
+        $arr[2] = hexdec(mb_substr($color,4,2));
+        $arr[3] = 1.0;
+        return $arr;
+    }
+
+    /**
+     * converts a css-rgba-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function rgba2array($color) {
+        preg_match("/rgba\(\s*(\d+\%?),\s*(\d+\%?),\s*(\d+\%?),\s*(\d*\.?\d*)\s*\)/", $color, $matches);
+        array_shift($matches);
+        $matches[3] = floatval($matches[3]);
+        return $matches;
+    }
+
+    /**
+     * converts a css-rgb-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function rgb2array($color) {
+        preg_match("/rgb\(\s*(\d+\%?),\s*(\d+\%?),\s*(\d+\%?)\s*\)/", $color, $matches);
+        array_shift($matches);
+        $matches[3] = 1.0;
+        return $matches;
+    }
+
+    /**
+     * converts a css-hsl-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function hsl2array($color) {
+        preg_match("/hsl\(\s*(\d+),\s*(\d+)\%,\s*(\d+)\%\s*\)/", $color, $matches);
+        array_shift($matches);
+        $matches[0] %= 360;
+        $matches[3] = 1.0;
+        $h = $matches[0];
+        $s = $matches[1];
+        $l = $matches[2];
+        $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+        $m1 = $l * 2 - $m2;
+        return [self::_color_hue2rgb($m1, $m2, $h + 0.33333),
+            self::_color_hue2rgb($m1, $m2, $h),
+            self::_color_hue2rgb($m1, $m2, $h - 0.33333),
+            1.0
+        ];
+    }
+
+    static private function _color_hue2rgb($m1, $m2, $h) {
+        $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
+        if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
+        if ($h * 2 < 1) return $m2;
+        if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+        return $m1;
+    }
+
+    /**
+     * Mixes two colors by preferring the first one with $percentOfColor1 percent.
+     * If color2 is the only color with alpha-chanel, it will return a color
+     * in the format of color2 else (most of the time) in the format of color1.
+     * @return string: "#ffffff", "rgb(...)", "rgba(...)" depending on color1 and alpha-chanel
+     */
+    static function mix($color1, $color2, $percentOfColor1 = 50, $f = null) {
+        $percentOfColor1 = $percentOfColor1 > 100
+                            ? 100
+                            : ($percentOfColor1 < 0 ? 0 : $percentOfColor1);
+        list($color1, $format1) = self::_normalize($color1);
+        list($color2, $format2) = self::_normalize($color2);
+        $color_new[0] = floor(($color1[0] * $percentOfColor1
+                            + $color2[0] * (100 - $percentOfColor1)) / 100);
+        $color_new[1] = floor(($color1[1] * $percentOfColor1
+                            + $color2[1] * (100 - $percentOfColor1)) / 100);
+        $color_new[2] = floor(($color1[2] * $percentOfColor1
+                            + $color2[2] * (100 - $percentOfColor1)) / 100);
+        $color_new[3] = ($color1[3] * $percentOfColor1
+                            + $color2[3] * (100 - $percentOfColor1)) / 100;
+        $format = ((mb_strpos($format2, "a") !== false) && (mb_strpos($format1, "a") === false))
+                    ? $format2
+                    : $format1;
+        $func = "_array2" . $format;
+        return self::$func($color_new);
+    }
+
+    /**
+     * Sets the opacity for a color. Hue and saturation is kept, but opacity is changed.
+     * Returns a format with alpha-chanel (rgba or hsla) depending on the given format.
+     */
+    static function opacity($color, $opacity) {
+        list($color, $format) = self::_normalize($color);
+        if (in_array($format, ["hex", "rgb"])) {
+            $format = "rgba";
+        } elseif ($format = "hsl") {
+            $format = "hsla";
+        }
+        $color[3] = floatval($opacity);
+        $color[3] = $color[3] < 0 ? 0 : ($color[3] > 1 ? 1 : $color[3]);
+        $func = "_array2" . $format;
+        return self::$func($color);
+    }
+
+    /**
+     * Make the passed color brighter
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     *
+     * @param  string  $color  any type of css-valid color
+     * @param  int  $factor  percentage of brightning, 100 for white and 0 for no changes to color
+     * @return string  brightened color in same format as the passed one
+     */
+    static function brighten($color, $factor = 35) {
+        // convert to color to rgba
+        list($color, $format) = self::_normalize($color);
+        if ($factor > 100) {
+            $factor = 100;
+        } elseif($factor < 0) {
+            $factor = 0;
+        }
+
+        // return the color itself, if the conversion failed
+        if (!$format) return $color;
+
+        // brighten the color
+        $color[0] = floor(($color[0] * (100 - $factor) + 255 * $factor) / 100);
+        $color[1] = floor(($color[1] * (100 - $factor) + 255 * $factor) / 100);
+        $color[2] = floor(($color[2] * (100 - $factor) + 255 * $factor) / 100);
+
+        // convert the color back (if possible)
+        $func = "_array2" . $format;
+        return self::$func($color);
+    }
+
+    /**
+     * converts any css-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    private static function _normalize($color) {
+        if ($color[0] === "#") {
+            $format = "hex";
+            $arr = self::hex2array($color);
+        } elseif (preg_match("/\(.*\)/", $color)) {
+            $format = mb_substr($color, 0, mb_strpos($color, "("));
+            $func = $format."2array";
+            $arr = self::$func($color);
+        } elseif (self::$colorstrings[mb_strtolower($color)]) {
+            $format = "rgb"; //we don't want colors as strings like "red"
+            $arr = self::$colorstrings[mb_strtolower($color)];
+        }
+        return [$arr, $format];
+    }
+
+    /**
+     * converts a css-rgba-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function rgba($color) {
+        list($arr, $format) = self::_normalize($color);
+        return self::_array2rgba($arr);
+    }
+
+    /**
+     * converts a css-rgb-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function rgb($color) {
+        list($arr, $format) = self::_normalize($color);
+        return self::_array2rgb($arr);
+    }
+
+    /**
+     * converts a css-hex-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function hex($color) {
+        list($arr, $format) = self::_normalize($color);
+        return self::_array2hex($arr);
+    }
+
+    /**
+     * converts a css-hsl-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function hsl($color) {
+        list($arr, $format) = self::_normalize($color);
+        return self::_array2hsl($arr);
+    }
+
+    /**
+     * converts a css-hsla-color into a rgba-quadruple
+     *
+     * @param  string  $color  the color to be converted
+     * @return array   colors as rgba-quadruple
+     */
+    static function hsla($color) {
+        list($arr, $format) = self::_normalize($color);
+        return self::_array2hsla($arr);
+    }
+
+
+    /**
+     * converts a rgba-quadruple into a css-hex-color
+     *
+     * @param  array  $arr  the rgba-quadruple to be converted
+     * @return array  colors as css-hex
+     */
+    static private function _array2hex($arr) {
+        return "#" .
+            ($arr[0] < 16 ? "0" : "").dechex($arr[0]) .
+            ($arr[1] < 16 ? "0" : "").dechex($arr[1]) .
+            ($arr[2] < 16 ? "0" : "").dechex($arr[2]);
+    }
+
+    /**
+     * converts a rgba-quadruple into a css-rgb-color
+     *
+     * @param  array  $arr  the rgba-quadruple to be converted
+     * @return array  colors as css-rgb
+     */
+    static private function _array2rgb($arr) {
+        array_pop($arr);
+        return "rgb(".implode(", ", $arr).")";
+    }
+
+    /**
+     * converts a rgba-quadruple into a css-rgba-color
+     *
+     * @param  array  $arr  the rgba-quadruple to be converted
+     * @return array  colors as css-rgba
+     */
+    static private function _array2rgba($arr) {
+        return "rgba(".implode(", ", $arr).")";
+    }
+
+    /**
+     * converts a rgba-quadruple into a css-hsl-color
+     *
+     * @param  array  $arr  the rgba-quadruple to be converted
+     * @return array  colors as css-hsl
+     */
+    static private function _array2hsl($arr) {
+        $arr = self::_calculate_hsl($arr);
+        return "hsl(".$arr[0].", ".$arr[1]."%, ".$arr[2]."%)";
+    }
+
+    /**
+     * converts a rgba-quadruple into a css-hsla-color
+     *
+     * @param  array  $arr  the rgba-quadruple to be converted
+     * @return array  colors as css-hsla
+     */
+    static private function _array2hsla($arr) {
+        $hsl = self::_calculate_hsl($arr);
+        return "hsl(".$hsl[0].", ".$hsl[1]."%, ".$hsl[2]."%, ".$arr[3].")";
+    }
+
+    static private function _calculate_hsl($arr) {
+        $clrR = ($arr[0]);
+        $clrG = ($arr[1]);
+        $clrB = ($arr[2]);
+
+        $clrMin = min($clrR, $clrG, $clrB);
+        $clrMax = max($clrR, $clrG, $clrB);
+        $deltaMax = $clrMax - $clrMin;
+
+        $L = ($clrMax + $clrMin) / 510;
+
+        if (0 == $deltaMax) {
+            $H = 0;
+            $S = 0;
+        } else {
+            if (0.5 > $L) {
+                $S = $deltaMax / ($clrMax + $clrMin);
+            } else {
+                $S = $deltaMax / (510 - $clrMax - $clrMin);
+            }
+
+            if ($clrMax == $clrR) {
+                $H = ($clrG - $clrB) / (6.0 * $deltaMax);
+            } else if ($clrMax == $clrG) {
+                $H = 1/3 + ($clrB - $clrR) / (6.0 * $deltaMax);
+            } else {
+                $H = 2 / 3 + ($clrR - $clrG) / (6.0 * $deltaMax);
+            }
+
+            if (0 > $H) $H += 1;
+            if (1 < $H) $H -= 1;
+        }
+        return [$H, $S, $L];
+    }
+
+}
\ No newline at end of file
diff --git a/lib/classes/Config.class.php b/lib/classes/Config.class.php
deleted file mode 100644
index 642665d..0000000
--- a/lib/classes/Config.class.php
+++ /dev/null
@@ -1,469 +0,0 @@
-<?php
-/**
- * Config.class.php
- * provides access to global configuration
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class Config implements ArrayAccess, Countable, IteratorAggregate
-{
-    private static $instance = null;
-
-    /**
-     * contains all config entries as field => value pairs
-     * @var array
-     */
-    protected $data = [];
-    /**
-     * contains additional metadata for config fields
-     * @var array
-     */
-    protected $metadata = [];
-
-    /**
-     * returns singleton instance
-     * @return Config
-     */
-    public static function get()
-    {
-        if (self::$instance === null) {
-            $config = new Config();
-            self::$instance = $config;
-        }
-        return self::$instance;
-    }
-
-    /**
-     * alias of Config::get() for compatibility
-     * @return Config
-     */
-    public static function getInstance()
-    {
-        return self::get();
-    }
-
-    /**
-     * use to set singleton instance for testing
-     * or to unset by passing null
-     * @param Config $my_instance
-     */
-    public static function set()
-    {
-        $my_instance = func_get_arg(0);
-        self::$instance = $my_instance;
-    }
-
-    /**
-     * pass array of config entries in field => value pairs
-     * to circumvent fetching from database
-     * @param array $data
-     */
-    public function __construct($data = null)
-    {
-        $this->fetchData($data);
-    }
-
-    /**
-     * returns a list of config entry names, filtered by
-     * given params
-     * @param string filter by range: global, range, user, course or institute
-     * @param string filter by section
-     * @param string filter by part of name
-     * @return array
-     */
-    public function getFields($range = null, $section = null, $name = null)
-    {
-        if ($range && !in_array($range, words('global range user course institute'))) {
-            throw new Exception('Invalid range type');
-        }
-
-        $temp = $this->metadata;
-
-        if ($range) {
-            $temp = array_filter($temp, function ($a) use ($range) {
-                return $a['range'] === $range
-                    || ($a['range'] === 'range' && in_array($range, words('user course institute')));
-            });
-        }
-        if ($section) {
-            $temp = array_filter($temp, function ($a) use ($section) {
-                return $a['section'] === $section;
-            });
-        }
-        if ($name) {
-            $temp = array_filter($temp, function ($a) use ($name) {
-                return mb_stripos($a['field'], $name) !== false;
-            });
-        }
-
-        return array_keys($temp);
-    }
-
-    /**
-     * returns metadata for config entry
-     * @param string $field
-     * @return array
-     */
-    public function getMetadata($field)
-    {
-        return $this->metadata[$field] ?? [];
-    }
-
-    /**
-     * returns value of config entry
-     * for compatibility reasons an existing variable in global
-     * namespace with the same name is also returned
-     * @param string $field
-     * @return mixed
-     */
-    public function getValue($field)
-    {
-        if ($this->fromEnv($field)) {
-            return $_ENV["STUDIP_CONFIG_{$field}"];
-        }
-
-        if (array_key_exists($field, $this->data)) {
-            return $this->data[$field];
-        }
-
-        if (isset($GLOBALS[$field]) && !isset($_REQUEST[$field])) {
-            return $GLOBALS[$field];
-        }
-
-        return null;
-    }
-
-    /**
-     * set config entry to given value, but don't store it
-     * in database
-     * @param string $field
-     * @param mixed $value
-     * @return
-     */
-    public function setValue($field, $value)
-    {
-        if (array_key_exists($field, $this->data)) {
-            return $this->data[$field] = $value;
-        }
-    }
-
-    /**
-     * IteratorAggregate
-     */
-    public function getIterator(): Traversable
-    {
-        return new ArrayIterator($this->data);
-    }
-
-    /**
-     * magic method for dynamic properties
-     */
-    public function __get($field)
-    {
-        return $this->getValue($field);
-    }
-
-    /**
-     * magic method for dynamic properties
-     */
-    public function __set($field, $value)
-    {
-         return $this->setValue($field, $value);
-    }
-
-    /**
-     * magic method for dynamic properties
-     */
-    public function __isset($field)
-    {
-        return isset($this->data[$field]);
-    }
-
-    /**
-     * ArrayAccess: Check whether the given offset exists.
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->$offset);
-    }
-
-    /**
-     * ArrayAccess: Get the value at the given offset.
-     */
-    public function offsetGet($offset): mixed
-    {
-        return $this->$offset;
-    }
-
-    /**
-     * ArrayAccess: Set the value at the given offset.
-     */
-    public function offsetSet($offset, $value): void
-    {
-        $this->$offset = $value;
-    }
-
-    /**
-     * ArrayAccess: unset the value at the given offset (not applicable)
-     */
-    public function offsetUnset($offset): void
-    {
-
-    }
-
-    /**
-     * Countable
-     */
-    public function count(): int
-    {
-        return count($this->data);
-    }
-
-    /**
-     * fetch config data from table config
-     * pass array to override database access
-     * @param array $data
-     */
-    protected function fetchData($data = null)
-    {
-        if ($data !== null) {
-            $this->data = $data;
-        } else {
-            $this->data = [];
-            $db = DBManager::get();
-
-            try {
-                $query = "SELECT config.field, IFNULL(config_values.value, config.value) AS value, type, section, `range`, description,
-                                 config_values.comment, config_values.value = config.value AS is_default
-                          FROM config
-                          LEFT JOIN config_values ON config.field = config_values.field AND range_id = 'studip'
-                          ORDER BY section, config.field";
-                $rs = $db->query($query);
-            } catch (Exception $e) {
-                //if migration is smaller than 226 and Stud.IP needs to be migrated to version 4.1 or greater:
-                $query = "SELECT field, value, type, section, `range`, description, comment, is_default
-                          FROM `config`
-                          ORDER BY is_default DESC, section, field";
-                $rs = $db->query($query);
-            }
-
-            while ($row = $rs->fetch(PDO::FETCH_ASSOC)) {
-                // set the the type of the default entry for the modified entry
-                if (!empty($this->metadata[$row['field']])) {
-                    $row['type'] = $this->metadata[$row['field']]['type'];
-                }
-
-                $this->data[$row['field']] = $this->convertFromDatabase(
-                    $row['type'],
-                    $row['value'],
-                    $row['field']
-                );
-
-                $this->metadata[$row['field']] = array_intersect_key($row, array_flip(words('type section range description is_default comment')));
-                $this->metadata[$row['field']]['field'] = $row['field'];
-                $this->metadata[$row['field']]['type']  = $row['type'] ?: 'string';
-            }
-        }
-    }
-
-    /**
-     * store new value for existing config entry in database
-     * posts notification ConfigValueChanged if entry is changed
-     * @param string $field
-     * @param string $data
-     * @throws InvalidArgumentException
-     * @return boolean
-     */
-    public function store($field, $data)
-    {
-        if (!is_array($data) || !isset($data['value'])) {
-            $values['value'] = $data;
-        } else {
-            $values = $data;
-        }
-
-        $values['value'] = $this->convertForDatabase(
-            $this->metadata[$field]['type'],
-            $values['value'],
-            $field
-        );
-
-        $entry = ConfigEntry::find($field);
-        if (!isset($entry)) {
-            throw new InvalidArgumentException($field . " not found in config table");
-        }
-        $ret = 0;
-        if (isset($values['value'])) {
-            $value_entry = new ConfigValue([$field, 'studip']);
-            $old_value = $value_entry->isNew() ? $entry->value : $value_entry->value;
-            $value_entry->value = $values['value'];
-            if (isset($values['comment'])) {
-                $value_entry->comment = $values['comment'];
-            }
-            if ($entry->isDefault($value_entry)) {
-                $ret += $value_entry->delete();
-            } else {
-                $ret += $value_entry->store();
-            }
-        }
-
-        if (isset($values['section'])) {
-            $entry->section = $values['section'];
-            $ret += $entry->store();
-        }
-
-        if ($ret) {
-            $this->fetchData();
-            if (isset($value_entry)) {
-               NotificationCenter::postNotification('ConfigValueDidChange', $this, [
-                   'field'     => $field,
-                   'old_value' => $old_value,
-                   'new_value' => $value_entry->value,
-               ]);
-            }
-        }
-        return $ret > 0;
-    }
-
-    /**
-     * creates a new config entry in database
-     * @param string name of entry
-     * @param array data to insert as assoc array
-     * @throws InvalidArgumentException
-     * @return null|ConfigEntry
-     */
-    public function create($field, $data = [])
-    {
-        if (!$field) {
-            throw new InvalidArgumentException("config fieldname is mandatory");
-        }
-        $entry = new ConfigEntry($field);
-        if (!$entry->isNew()) {
-            throw new InvalidArgumentException("config $field already exists");
-        }
-        $entry->setData($data);
-        $ret = $entry->store() ? $entry : null;
-        if ($ret) {
-            $this->fetchData();
-        }
-        return $ret;
-    }
-
-    /**
-     * delete config entry from database
-     * @param string name of entry
-     * @throws InvalidArgumentException
-     * @return integer number of deleted rows
-     */
-    public function delete($field)
-    {
-        if (!$field) {
-            throw new InvalidArgumentException("config fieldname is mandatory");
-        }
-        ConfigValue::deleteBySql('field=?', [$field]);
-        $deleted = ConfigEntry::deleteBySql('field=?', [$field]);
-        if ($deleted) {
-            $this->fetchData();
-        }
-        return $deleted;
-    }
-
-    /**
-     * Returns the identifier for the i18n field.
-     * @param  string $field
-     * @return string
-     */
-    protected function getI18NIdentifier($field)
-    {
-        return md5($field);
-    }
-
-    /**
-     * Transforms the data from the database for use.
-     *
-     * @param  string $type
-     * @param  mixed  $value
-     * @param  string $field
-     * @return mixed
-     */
-    public function convertFromDatabase($type, $value, $field)
-    {
-        if ($type === 'integer') {
-            return (int) $value;
-        }
-
-        if ($type === 'boolean') {
-            return (bool) $value;
-        }
-
-        if ($type === 'array') {
-            return (array) json_decode($value, true);
-        }
-
-        if ($type === 'i18n') {
-            return new I18NString($value, null, [
-                'object_id' => $this->getI18NIdentifier($field),
-                'table'     => 'config',
-                'field'     => 'value',
-            ]);
-        }
-
-        return (string) $value;
-    }
-
-    /**
-     * Transforms the given value to be stored in the database.
-     *
-     * @param  string $type
-     * @param  mixed  $value
-     * @param  string $field
-     * @return mixed
-     */
-    public function convertForDatabase($type, $value, $field)
-    {
-        if ($type === 'boolean') {
-            return (bool) $value;
-        }
-
-        if ($type === 'integer') {
-            return (int) $value;
-        }
-
-        if ($type === 'array') {
-            return json_encode($value);
-        }
-
-        if ($type === 'i18n') {
-            $value->setMetadata([
-                'object_id' => $this->getI18NIdentifier($field),
-                'table'     => 'config',
-                'field'     => 'value',
-            ]);
-            $value->storeTranslations();
-
-            return $value->original();
-        }
-
-        return (string) $value;
-    }
-
-    /**
-     * Returns whether the value was set from the environment.
-     *
-     * @param string $field
-     * @return bool
-     */
-    public function fromEnv(string $field): bool
-    {
-        return isset($_ENV["STUDIP_CONFIG_{$field}"]);
-    }
-}
diff --git a/lib/classes/Config.php b/lib/classes/Config.php
new file mode 100644
index 0000000..642665d
--- /dev/null
+++ b/lib/classes/Config.php
@@ -0,0 +1,469 @@
+<?php
+/**
+ * Config.class.php
+ * provides access to global configuration
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class Config implements ArrayAccess, Countable, IteratorAggregate
+{
+    private static $instance = null;
+
+    /**
+     * contains all config entries as field => value pairs
+     * @var array
+     */
+    protected $data = [];
+    /**
+     * contains additional metadata for config fields
+     * @var array
+     */
+    protected $metadata = [];
+
+    /**
+     * returns singleton instance
+     * @return Config
+     */
+    public static function get()
+    {
+        if (self::$instance === null) {
+            $config = new Config();
+            self::$instance = $config;
+        }
+        return self::$instance;
+    }
+
+    /**
+     * alias of Config::get() for compatibility
+     * @return Config
+     */
+    public static function getInstance()
+    {
+        return self::get();
+    }
+
+    /**
+     * use to set singleton instance for testing
+     * or to unset by passing null
+     * @param Config $my_instance
+     */
+    public static function set()
+    {
+        $my_instance = func_get_arg(0);
+        self::$instance = $my_instance;
+    }
+
+    /**
+     * pass array of config entries in field => value pairs
+     * to circumvent fetching from database
+     * @param array $data
+     */
+    public function __construct($data = null)
+    {
+        $this->fetchData($data);
+    }
+
+    /**
+     * returns a list of config entry names, filtered by
+     * given params
+     * @param string filter by range: global, range, user, course or institute
+     * @param string filter by section
+     * @param string filter by part of name
+     * @return array
+     */
+    public function getFields($range = null, $section = null, $name = null)
+    {
+        if ($range && !in_array($range, words('global range user course institute'))) {
+            throw new Exception('Invalid range type');
+        }
+
+        $temp = $this->metadata;
+
+        if ($range) {
+            $temp = array_filter($temp, function ($a) use ($range) {
+                return $a['range'] === $range
+                    || ($a['range'] === 'range' && in_array($range, words('user course institute')));
+            });
+        }
+        if ($section) {
+            $temp = array_filter($temp, function ($a) use ($section) {
+                return $a['section'] === $section;
+            });
+        }
+        if ($name) {
+            $temp = array_filter($temp, function ($a) use ($name) {
+                return mb_stripos($a['field'], $name) !== false;
+            });
+        }
+
+        return array_keys($temp);
+    }
+
+    /**
+     * returns metadata for config entry
+     * @param string $field
+     * @return array
+     */
+    public function getMetadata($field)
+    {
+        return $this->metadata[$field] ?? [];
+    }
+
+    /**
+     * returns value of config entry
+     * for compatibility reasons an existing variable in global
+     * namespace with the same name is also returned
+     * @param string $field
+     * @return mixed
+     */
+    public function getValue($field)
+    {
+        if ($this->fromEnv($field)) {
+            return $_ENV["STUDIP_CONFIG_{$field}"];
+        }
+
+        if (array_key_exists($field, $this->data)) {
+            return $this->data[$field];
+        }
+
+        if (isset($GLOBALS[$field]) && !isset($_REQUEST[$field])) {
+            return $GLOBALS[$field];
+        }
+
+        return null;
+    }
+
+    /**
+     * set config entry to given value, but don't store it
+     * in database
+     * @param string $field
+     * @param mixed $value
+     * @return
+     */
+    public function setValue($field, $value)
+    {
+        if (array_key_exists($field, $this->data)) {
+            return $this->data[$field] = $value;
+        }
+    }
+
+    /**
+     * IteratorAggregate
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->data);
+    }
+
+    /**
+     * magic method for dynamic properties
+     */
+    public function __get($field)
+    {
+        return $this->getValue($field);
+    }
+
+    /**
+     * magic method for dynamic properties
+     */
+    public function __set($field, $value)
+    {
+         return $this->setValue($field, $value);
+    }
+
+    /**
+     * magic method for dynamic properties
+     */
+    public function __isset($field)
+    {
+        return isset($this->data[$field]);
+    }
+
+    /**
+     * ArrayAccess: Check whether the given offset exists.
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->$offset);
+    }
+
+    /**
+     * ArrayAccess: Get the value at the given offset.
+     */
+    public function offsetGet($offset): mixed
+    {
+        return $this->$offset;
+    }
+
+    /**
+     * ArrayAccess: Set the value at the given offset.
+     */
+    public function offsetSet($offset, $value): void
+    {
+        $this->$offset = $value;
+    }
+
+    /**
+     * ArrayAccess: unset the value at the given offset (not applicable)
+     */
+    public function offsetUnset($offset): void
+    {
+
+    }
+
+    /**
+     * Countable
+     */
+    public function count(): int
+    {
+        return count($this->data);
+    }
+
+    /**
+     * fetch config data from table config
+     * pass array to override database access
+     * @param array $data
+     */
+    protected function fetchData($data = null)
+    {
+        if ($data !== null) {
+            $this->data = $data;
+        } else {
+            $this->data = [];
+            $db = DBManager::get();
+
+            try {
+                $query = "SELECT config.field, IFNULL(config_values.value, config.value) AS value, type, section, `range`, description,
+                                 config_values.comment, config_values.value = config.value AS is_default
+                          FROM config
+                          LEFT JOIN config_values ON config.field = config_values.field AND range_id = 'studip'
+                          ORDER BY section, config.field";
+                $rs = $db->query($query);
+            } catch (Exception $e) {
+                //if migration is smaller than 226 and Stud.IP needs to be migrated to version 4.1 or greater:
+                $query = "SELECT field, value, type, section, `range`, description, comment, is_default
+                          FROM `config`
+                          ORDER BY is_default DESC, section, field";
+                $rs = $db->query($query);
+            }
+
+            while ($row = $rs->fetch(PDO::FETCH_ASSOC)) {
+                // set the the type of the default entry for the modified entry
+                if (!empty($this->metadata[$row['field']])) {
+                    $row['type'] = $this->metadata[$row['field']]['type'];
+                }
+
+                $this->data[$row['field']] = $this->convertFromDatabase(
+                    $row['type'],
+                    $row['value'],
+                    $row['field']
+                );
+
+                $this->metadata[$row['field']] = array_intersect_key($row, array_flip(words('type section range description is_default comment')));
+                $this->metadata[$row['field']]['field'] = $row['field'];
+                $this->metadata[$row['field']]['type']  = $row['type'] ?: 'string';
+            }
+        }
+    }
+
+    /**
+     * store new value for existing config entry in database
+     * posts notification ConfigValueChanged if entry is changed
+     * @param string $field
+     * @param string $data
+     * @throws InvalidArgumentException
+     * @return boolean
+     */
+    public function store($field, $data)
+    {
+        if (!is_array($data) || !isset($data['value'])) {
+            $values['value'] = $data;
+        } else {
+            $values = $data;
+        }
+
+        $values['value'] = $this->convertForDatabase(
+            $this->metadata[$field]['type'],
+            $values['value'],
+            $field
+        );
+
+        $entry = ConfigEntry::find($field);
+        if (!isset($entry)) {
+            throw new InvalidArgumentException($field . " not found in config table");
+        }
+        $ret = 0;
+        if (isset($values['value'])) {
+            $value_entry = new ConfigValue([$field, 'studip']);
+            $old_value = $value_entry->isNew() ? $entry->value : $value_entry->value;
+            $value_entry->value = $values['value'];
+            if (isset($values['comment'])) {
+                $value_entry->comment = $values['comment'];
+            }
+            if ($entry->isDefault($value_entry)) {
+                $ret += $value_entry->delete();
+            } else {
+                $ret += $value_entry->store();
+            }
+        }
+
+        if (isset($values['section'])) {
+            $entry->section = $values['section'];
+            $ret += $entry->store();
+        }
+
+        if ($ret) {
+            $this->fetchData();
+            if (isset($value_entry)) {
+               NotificationCenter::postNotification('ConfigValueDidChange', $this, [
+                   'field'     => $field,
+                   'old_value' => $old_value,
+                   'new_value' => $value_entry->value,
+               ]);
+            }
+        }
+        return $ret > 0;
+    }
+
+    /**
+     * creates a new config entry in database
+     * @param string name of entry
+     * @param array data to insert as assoc array
+     * @throws InvalidArgumentException
+     * @return null|ConfigEntry
+     */
+    public function create($field, $data = [])
+    {
+        if (!$field) {
+            throw new InvalidArgumentException("config fieldname is mandatory");
+        }
+        $entry = new ConfigEntry($field);
+        if (!$entry->isNew()) {
+            throw new InvalidArgumentException("config $field already exists");
+        }
+        $entry->setData($data);
+        $ret = $entry->store() ? $entry : null;
+        if ($ret) {
+            $this->fetchData();
+        }
+        return $ret;
+    }
+
+    /**
+     * delete config entry from database
+     * @param string name of entry
+     * @throws InvalidArgumentException
+     * @return integer number of deleted rows
+     */
+    public function delete($field)
+    {
+        if (!$field) {
+            throw new InvalidArgumentException("config fieldname is mandatory");
+        }
+        ConfigValue::deleteBySql('field=?', [$field]);
+        $deleted = ConfigEntry::deleteBySql('field=?', [$field]);
+        if ($deleted) {
+            $this->fetchData();
+        }
+        return $deleted;
+    }
+
+    /**
+     * Returns the identifier for the i18n field.
+     * @param  string $field
+     * @return string
+     */
+    protected function getI18NIdentifier($field)
+    {
+        return md5($field);
+    }
+
+    /**
+     * Transforms the data from the database for use.
+     *
+     * @param  string $type
+     * @param  mixed  $value
+     * @param  string $field
+     * @return mixed
+     */
+    public function convertFromDatabase($type, $value, $field)
+    {
+        if ($type === 'integer') {
+            return (int) $value;
+        }
+
+        if ($type === 'boolean') {
+            return (bool) $value;
+        }
+
+        if ($type === 'array') {
+            return (array) json_decode($value, true);
+        }
+
+        if ($type === 'i18n') {
+            return new I18NString($value, null, [
+                'object_id' => $this->getI18NIdentifier($field),
+                'table'     => 'config',
+                'field'     => 'value',
+            ]);
+        }
+
+        return (string) $value;
+    }
+
+    /**
+     * Transforms the given value to be stored in the database.
+     *
+     * @param  string $type
+     * @param  mixed  $value
+     * @param  string $field
+     * @return mixed
+     */
+    public function convertForDatabase($type, $value, $field)
+    {
+        if ($type === 'boolean') {
+            return (bool) $value;
+        }
+
+        if ($type === 'integer') {
+            return (int) $value;
+        }
+
+        if ($type === 'array') {
+            return json_encode($value);
+        }
+
+        if ($type === 'i18n') {
+            $value->setMetadata([
+                'object_id' => $this->getI18NIdentifier($field),
+                'table'     => 'config',
+                'field'     => 'value',
+            ]);
+            $value->storeTranslations();
+
+            return $value->original();
+        }
+
+        return (string) $value;
+    }
+
+    /**
+     * Returns whether the value was set from the environment.
+     *
+     * @param string $field
+     * @return bool
+     */
+    public function fromEnv(string $field): bool
+    {
+        return isset($_ENV["STUDIP_CONFIG_{$field}"]);
+    }
+}
diff --git a/lib/classes/CourseAvatar.class.php b/lib/classes/CourseAvatar.class.php
deleted file mode 100644
index 8c153a8..0000000
--- a/lib/classes/CourseAvatar.class.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * This class represents the avatar of a course.
- *
- * @author    Marcus Lunzenauer (mlunzena@uos)
- * @copyright (c) Authors
- * @license GPL2 or any later version
- * @since     1.10
- */
-class CourseAvatar extends Avatar
-{
-    public const AVATAR_TYPE = 'course';
-
-    /**
-     * Returns the CSS class to use for this avatar image.
-     *
-     * @param string  one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
-     *
-     * @return string CSS class to use for the avatar
-     */
-    protected function getCssClass($size)
-    {
-        return "course-avatar-{$size} course-{$this->user_id}";
-    }
-
-    /**
-     * Return the default title of the avatar.
-     * @return string the default title
-     */
-    public function getDefaultTitle()
-    {
-        return Seminar::GetInstance($this->user_id)->name;
-    }
-    
-    /**
-     * Return if avatar is visible to the current user.
-     * @return boolean: true if visible
-     */
-    protected function checkAvatarVisibility()
-    {
-        //no special conditions for visibility of course-avatars yet
-        return true;
-    }
-}
diff --git a/lib/classes/CourseAvatar.php b/lib/classes/CourseAvatar.php
new file mode 100644
index 0000000..8c153a8
--- /dev/null
+++ b/lib/classes/CourseAvatar.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * This class represents the avatar of a course.
+ *
+ * @author    Marcus Lunzenauer (mlunzena@uos)
+ * @copyright (c) Authors
+ * @license GPL2 or any later version
+ * @since     1.10
+ */
+class CourseAvatar extends Avatar
+{
+    public const AVATAR_TYPE = 'course';
+
+    /**
+     * Returns the CSS class to use for this avatar image.
+     *
+     * @param string  one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
+     *
+     * @return string CSS class to use for the avatar
+     */
+    protected function getCssClass($size)
+    {
+        return "course-avatar-{$size} course-{$this->user_id}";
+    }
+
+    /**
+     * Return the default title of the avatar.
+     * @return string the default title
+     */
+    public function getDefaultTitle()
+    {
+        return Seminar::GetInstance($this->user_id)->name;
+    }
+    
+    /**
+     * Return if avatar is visible to the current user.
+     * @return boolean: true if visible
+     */
+    protected function checkAvatarVisibility()
+    {
+        //no special conditions for visibility of course-avatars yet
+        return true;
+    }
+}
diff --git a/lib/classes/CourseConfig.class.php b/lib/classes/CourseConfig.class.php
deleted file mode 100644
index ad62be0..0000000
--- a/lib/classes/CourseConfig.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * CourseConfig.class.php
- * provides access to course preferences
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class CourseConfig extends RangeConfig
-{
-    /**
-     * range type
-     */
-    const RANGE_TYPE = 'course';
-}
diff --git a/lib/classes/CourseConfig.php b/lib/classes/CourseConfig.php
new file mode 100644
index 0000000..ad62be0
--- /dev/null
+++ b/lib/classes/CourseConfig.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * CourseConfig.class.php
+ * provides access to course preferences
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class CourseConfig extends RangeConfig
+{
+    /**
+     * range type
+     */
+    const RANGE_TYPE = 'course';
+}
diff --git a/lib/classes/CronJob.class.php b/lib/classes/CronJob.class.php
deleted file mode 100644
index 1e7fb41..0000000
--- a/lib/classes/CronJob.class.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * CronJob - Abstract cronjob class. All cronjobs derive from this.
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Cronjob.class.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-abstract class CronJob
-{
-    /**
-     * Return the name of the cronjob.
-     */
-    abstract public static function getName();
-
-    /**
-     * Return the description of the cronjob.
-     */
-    abstract public static function getDescription();
-
-    /**
-     * Execute the cronjob.
-     *
-     * @param mixed $last_result What the last execution of this cronjob
-     *                           returned.
-     * @param Array $parameters Parameters for this cronjob instance which
-     *                          were defined during scheduling.
-     */
-    abstract public function execute($last_result, $parameters = []);
-
-    /**
-     * Returns a list of available parameters for this cronjob.
-     *
-     * Each parameter is an entry in the resulting with a unique identifier
-     * with the following array fields:
-     *
-     * - "type" which is one of the following:
-     *   - boolean, a simple binary option
-     *   - string, a single line of text
-     *   - text, a multiline chunk of text
-     *   - integer, a number
-     *   - select, a defined set of values (define in the field "values" as
-     *     an array)
-     * - "default" provides a default value for this field (optional)
-     * - "status" is either "optional" or "mandatory" (optional, defaults to
-     *   optional)
-     * - "description" provides a decription for this parameter
-     *
-     * Example:
-     *
-     * <code>
-     * return array(
-     *   'area' => array(
-     *      'type'        => 'select',
-     *      'values'      => array('seminar', 'institute', 'user'),
-     *      'description' => 'Example parameter #1',
-     *    ),
-     *   'verbose' => array(
-     *     'type'        => 'boolean',
-     *     'default'     => false,
-     *     'status'      => 'optional',
-     *     'description' => 'Example parameter #2',
-     *   ),
-     * );
-     * </code>
-     *
-     * @param Array List of paramters in the format described above.
-     */
-    public static function getParameters()
-    {
-        return [];
-    }
-
-    /**
-     * Setup method.
-     */
-    public function setUp()
-    {
-    }
-
-    /**
-     * Teardown method.
-     */
-    public function tearDown()
-    {
-    }
-
-// Convenience methods to ease the usage
-
-    /**
-     * Registers the cronjob and/or returns the corresponding task.
-     *
-     * @return CronjobTask Task for this cronjob
-     */
-    public static function register()
-    {
-        $class_name = get_called_class();
-        $reflection = new ReflectionClass($class_name);
-
-        $task_id = CronjobScheduler::getInstance()->registerTask($reflection->newInstance());
-
-        return CronjobTask::find($task_id);
-    }
-
-    /**
-     * Unregisters a previously registered task.
-     */
-    public static function unregister()
-    {
-        $class_name = get_called_class();
-        $task       = CronjobTask::findOneByClass($class_name);
-
-        if ($task !== null) {
-            CronjobScheduler::getInstance()->unregisterTask($task->id);
-        }
-    }
-
-}
diff --git a/lib/classes/CronJob.php b/lib/classes/CronJob.php
new file mode 100644
index 0000000..1e7fb41
--- /dev/null
+++ b/lib/classes/CronJob.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * CronJob - Abstract cronjob class. All cronjobs derive from this.
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ */
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// Cronjob.class.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+abstract class CronJob
+{
+    /**
+     * Return the name of the cronjob.
+     */
+    abstract public static function getName();
+
+    /**
+     * Return the description of the cronjob.
+     */
+    abstract public static function getDescription();
+
+    /**
+     * Execute the cronjob.
+     *
+     * @param mixed $last_result What the last execution of this cronjob
+     *                           returned.
+     * @param Array $parameters Parameters for this cronjob instance which
+     *                          were defined during scheduling.
+     */
+    abstract public function execute($last_result, $parameters = []);
+
+    /**
+     * Returns a list of available parameters for this cronjob.
+     *
+     * Each parameter is an entry in the resulting with a unique identifier
+     * with the following array fields:
+     *
+     * - "type" which is one of the following:
+     *   - boolean, a simple binary option
+     *   - string, a single line of text
+     *   - text, a multiline chunk of text
+     *   - integer, a number
+     *   - select, a defined set of values (define in the field "values" as
+     *     an array)
+     * - "default" provides a default value for this field (optional)
+     * - "status" is either "optional" or "mandatory" (optional, defaults to
+     *   optional)
+     * - "description" provides a decription for this parameter
+     *
+     * Example:
+     *
+     * <code>
+     * return array(
+     *   'area' => array(
+     *      'type'        => 'select',
+     *      'values'      => array('seminar', 'institute', 'user'),
+     *      'description' => 'Example parameter #1',
+     *    ),
+     *   'verbose' => array(
+     *     'type'        => 'boolean',
+     *     'default'     => false,
+     *     'status'      => 'optional',
+     *     'description' => 'Example parameter #2',
+     *   ),
+     * );
+     * </code>
+     *
+     * @param Array List of paramters in the format described above.
+     */
+    public static function getParameters()
+    {
+        return [];
+    }
+
+    /**
+     * Setup method.
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Teardown method.
+     */
+    public function tearDown()
+    {
+    }
+
+// Convenience methods to ease the usage
+
+    /**
+     * Registers the cronjob and/or returns the corresponding task.
+     *
+     * @return CronjobTask Task for this cronjob
+     */
+    public static function register()
+    {
+        $class_name = get_called_class();
+        $reflection = new ReflectionClass($class_name);
+
+        $task_id = CronjobScheduler::getInstance()->registerTask($reflection->newInstance());
+
+        return CronjobTask::find($task_id);
+    }
+
+    /**
+     * Unregisters a previously registered task.
+     */
+    public static function unregister()
+    {
+        $class_name = get_called_class();
+        $task       = CronjobTask::findOneByClass($class_name);
+
+        if ($task !== null) {
+            CronjobScheduler::getInstance()->unregisterTask($task->id);
+        }
+    }
+
+}
diff --git a/lib/classes/CronjobScheduler.class.php b/lib/classes/CronjobScheduler.class.php
deleted file mode 100644
index cc4cf8b..0000000
--- a/lib/classes/CronjobScheduler.class.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/**
- * CronjobScheduler - Scheduler for the cronjobs.
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// CronjobScheduler.class.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-class CronjobScheduler
-{
-    protected static $instance = null;
-
-    /**
-     * Returns the scheduler object. Implements the singleton pattern to
-     * ensure that only one scheduler exists.
-     *
-     * @return CronjobScheduler The scheduler object
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Private constructor to ensure the singleton pattern is used correctly.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Registers a new executable task.
-     *
-     * @param mixed $task Either path of the task class filename (relative
-     *                    to Stud.IP root) or an instance of CronJob
-     * @param bool   $active Indicates whether the task should be set active
-     *                       or not
-     * @return String Id of the created task
-     * @throws InvalidArgumentException when the task class file does not
-     *         exist
-     * @throws RuntimeException when task has already been registered
-     */
-    public function registerTask($task, $active = true)
-    {
-        if (is_object($task)) {
-            $reflection = new ReflectionClass($task);
-            $class = $reflection->getName();
-            $class_filename = studip_relative_path($reflection->getFileName());
-        } else {
-            $filename = $GLOBALS['STUDIP_BASE_PATH'] . '/' . $task;
-            if (!file_exists($filename)) {
-                $message = sprintf('Task class file "%s" does not exist.', $task);
-                throw new InvalidArgumentException($message);
-            }
-            $class_filename = $task;
-
-            $classes = get_declared_classes();
-            require_once $filename;
-            $new_classes = array_diff(get_declared_classes(), $classes);
-            $new_classes = array_filter($new_classes, function ($class) {
-                return is_subclass_of($class, 'CronJob', true);
-            });
-            $class = end($new_classes);
-
-            if (empty($class)) {
-                throw new RuntimeException('No valid class was defined in file.');
-            }
-
-            $reflection = new ReflectionClass($class);
-        }
-
-        if (!$reflection->isSubclassOf('CronJob')) {
-            $message = sprintf('Job class "%s" (defined in %s) does not extend the abstract CronJob class.', $class, $filename);
-            throw new RuntimeException($message);
-        }
-
-        if ($task = CronjobTask::findOneByClass($class)) {
-            return $task->task_id;
-        }
-
-        $task = new CronjobTask();
-        $task->filename = $class_filename;
-        $task->class    = $class;
-        $task->active   = (int)$active;
-        $task->store();
-
-        return $task->task_id;
-    }
-
-    /**
-     * Unregisters a previously registered task.
-     *
-     * @param String $task_id Id of the task to be unregistered
-     * @return CronjobScheduler to allow chaining
-     * @throws InvalidArgumentException when no task with the given id exists
-     */
-    public function unregisterTask($task_id)
-    {
-        $task = CronjobTask::find($task_id);
-        if ($task === null) {
-            $message = sprintf('A task with the id "%s" does not exist.', $task_id);
-            throw new InvalidArgumentException($message);
-        }
-        $task->delete();
-
-        return $this;
-    }
-
-    /**
-     * Schedules a task for periodic execution with the provided schedule.
-     *
-     * @param String $task_id     The id of the task to be executed
-     * @param mixed  $minute      Minute part of the schedule:
-     *                            - null for "every minute" a.k.a. "don't care"
-     *                            - x < 0 for "every x minutes"
-     *                            - x >= 0 for "only at minute x"
-     * @param mixed  $hour        Hour part of the schedule:
-     *                            - null for "every hour" a.k.a. "don't care"
-     *                            - x < 0 for "every x hours"
-     *                            - x >= 0 for "only at hour x"
-     * @param mixed  $day         Day part of the schedule:
-     *                            - null for "every day" a.k.a. "don't care"
-     *                            - x < 0 for "every x days"
-     *                            - x > 0 for "only at day x"
-     * @param mixed  $month       Month part of the schedule:
-     *                            - null for "every month" a.k.a. "don't care"
-     *                            - x < 0 for "every x months"
-     *                            - x > 0 for "only at month x"
-     * @param mixed  $day_of_week Day of week part of the schedule:
-     *                            - null for "every day" a.k.a. "don't care"
-     *                            - 1 >= x >= 7 for "exactly at day of week x"
-     *                              (x starts with monday at 1 and ends with
-     *                               sunday at 7)
-     * @param Array  $parameters Optional parameters passed to the task
-     * @return CronjobSchedule The generated schedule object.
-     */
-    public function schedule(
-        string $task_id,
-        ?int $minute = null,
-        ?int $hour = null,
-        ?int $day = null,
-        ?int $month = null,
-        ?int $day_of_week = null,
-        array $parameters = []
-    ): CronjobSchedule {
-        $schedule = new CronjobSchedule();
-        $schedule->task_id    = $task_id;
-        $schedule->parameters = $parameters;
-
-        $schedule->minute = $minute;
-        $schedule->hour = $hour;
-        $schedule->day = $day;
-        $schedule->month = $month;
-        $schedule->day_of_week = $day_of_week;
-
-        $schedule->store();
-
-        $task = $schedule->task;
-        $task->assigned_count += 1;
-        $task->store();
-
-        return $schedule;
-    }
-
-    /**
-     * An alias for schedule for backwards compatibility.
-     *
-     * @see CronjobScheduler::schedule()
-     */
-    public function schedulePeriodic(
-        $task_id,
-        $minute = null,
-        $hour = null,
-        $day = null,
-        $month = null,
-        $day_of_week = null,
-        $priority = null,
-        $parameters = []
-    ) {
-        return $this->schedule($task_id, $minute, $hour, $day, $month, $day_of_week, $parameters);
-    }
-
-    /**
-     * Cancels the provided schedule.
-     *
-     * @param String $schedule_id Id of the schedule to be canceled
-     */
-    public function cancel($schedule_id)
-    {
-        CronjobSchedule::find($schedule_id)->delete();
-    }
-
-    /**
-     * Cancels all schedules of the provided task.
-     *
-     * @param String $task_id Id of the task which schedules shall be canceled
-     */
-    public function cancelByTask($task_id)
-    {
-        $schedules = CronjobSchedule::findByTask_id($task_id);
-        foreach ($schedules as $schedule) {
-            $schedule->delete();
-        }
-    }
-
-    /**
-     * Executes the available schedules if they are to be executed.
-     * This method can only be run once - even if one execution takes more
-     * than planned. This is ensured by a locking mechanism.
-     */
-    public function run()
-    {
-        if (!Config::get()->CRONJOBS_ENABLE) {
-            return;
-        }
-
-        $lock = new FileLock('studip-cronjob');
-
-        // Check whether a previous cronjob worker is still running.
-        if (!$lock->tryLock()) {
-            return;
-        }
-
-        // Find all schedules that are due to execute and which task is active
-        $temp = CronjobSchedule::findBySQL('`active` = 1 AND `next_execution` <= UNIX_TIMESTAMP() '
-                                          .'ORDER BY `next_execution`');
-        $schedules = array_filter($temp, function ($schedule) { return $schedule->task->active; });
-
-        if (count($schedules) === 0) {
-            return;
-        }
-
-        foreach ($schedules as $schedule) {
-            $log = new CronjobLog();
-            $log->schedule_id = $schedule->schedule_id;
-            $log->scheduled   = $schedule->next_execution;
-            $log->executed    = time();
-            $log->exception   = null;
-            $log->duration    = -1;
-
-            try {
-                // Skip schedules with missing task classes
-                if (!$schedule->task->valid) {
-                    throw new Exception(_('Die Klasse für den Cronjob-Task konnte nicht gefunden werden'));
-                }
-
-                // Start capturing output and measuring duration
-                ob_start();
-                $start_time = microtime(true);
-
-                $schedule->execute();
-
-                // Actually capture output and duration
-                $end_time = microtime(true);
-                $output = ob_get_clean();
-
-                // Complete log
-                $log->output    = $output;
-                $log->duration  = $end_time - $start_time;
-                $log->store();
-            } catch (Exception $e) {
-                $log->exception = $e;
-                $log->store();
-
-                // Deactivate schedule
-                $schedule->deactivate();
-
-                // Send mail to root accounts
-                $subject = sprintf('[Cronjobs] %s: %s',
-                                   _('Fehlerhafte Ausführung'),
-                                   $schedule->title);
-
-                $message = sprintf(_('Der Cronjob "%s" wurde deaktiviert, da bei der Ausführung ein Fehler aufgetreten ist.'), $schedule->title) . "\n";
-                $message .= "\n";
-                $message .= display_exception($e) . "\n";
-
-                $message .= _('Für weiterführende Informationen klicken Sie bitten den folgenden Link:') . "\n";
-
-                $old = URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
-                $message .= URLHelper::getURL('dispatch.php/admin/cronjobs/logs/schedule/' . $schedule->schedule_id);
-                URLHelper::setBaseURL($old);
-
-                $this->sendMailToRoots($subject, $message);
-            }
-        }
-
-        // Release lock
-        $lock->release();
-    }
-
-    /**
-     * Sends an internal mail with the provided subject and message to all
-     * users with a global permission of "root".
-     *
-     * @param String $subject The subject of the message
-     * @param String $message The message itself
-     */
-    private function sendMailToRoots($subject, $message)
-    {
-        $temp  = User::findByPerms('root');
-        $roots = SimpleORMapCollection::createFromArray($temp)
-            ->filter(function($r) { return $r->locked == 0; })
-            ->pluck('username');
-
-        $msging = new messaging;
-        $msging->insert_message($message, $roots, '____%system%____', null, null, null, null, $subject, false, 'high');
-    }
-}
diff --git a/lib/classes/CronjobScheduler.php b/lib/classes/CronjobScheduler.php
new file mode 100644
index 0000000..cc4cf8b
--- /dev/null
+++ b/lib/classes/CronjobScheduler.php
@@ -0,0 +1,333 @@
+<?php
+/**
+ * CronjobScheduler - Scheduler for the cronjobs.
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ */
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// CronjobScheduler.class.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+class CronjobScheduler
+{
+    protected static $instance = null;
+
+    /**
+     * Returns the scheduler object. Implements the singleton pattern to
+     * ensure that only one scheduler exists.
+     *
+     * @return CronjobScheduler The scheduler object
+     */
+    public static function getInstance()
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * Private constructor to ensure the singleton pattern is used correctly.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Registers a new executable task.
+     *
+     * @param mixed $task Either path of the task class filename (relative
+     *                    to Stud.IP root) or an instance of CronJob
+     * @param bool   $active Indicates whether the task should be set active
+     *                       or not
+     * @return String Id of the created task
+     * @throws InvalidArgumentException when the task class file does not
+     *         exist
+     * @throws RuntimeException when task has already been registered
+     */
+    public function registerTask($task, $active = true)
+    {
+        if (is_object($task)) {
+            $reflection = new ReflectionClass($task);
+            $class = $reflection->getName();
+            $class_filename = studip_relative_path($reflection->getFileName());
+        } else {
+            $filename = $GLOBALS['STUDIP_BASE_PATH'] . '/' . $task;
+            if (!file_exists($filename)) {
+                $message = sprintf('Task class file "%s" does not exist.', $task);
+                throw new InvalidArgumentException($message);
+            }
+            $class_filename = $task;
+
+            $classes = get_declared_classes();
+            require_once $filename;
+            $new_classes = array_diff(get_declared_classes(), $classes);
+            $new_classes = array_filter($new_classes, function ($class) {
+                return is_subclass_of($class, 'CronJob', true);
+            });
+            $class = end($new_classes);
+
+            if (empty($class)) {
+                throw new RuntimeException('No valid class was defined in file.');
+            }
+
+            $reflection = new ReflectionClass($class);
+        }
+
+        if (!$reflection->isSubclassOf('CronJob')) {
+            $message = sprintf('Job class "%s" (defined in %s) does not extend the abstract CronJob class.', $class, $filename);
+            throw new RuntimeException($message);
+        }
+
+        if ($task = CronjobTask::findOneByClass($class)) {
+            return $task->task_id;
+        }
+
+        $task = new CronjobTask();
+        $task->filename = $class_filename;
+        $task->class    = $class;
+        $task->active   = (int)$active;
+        $task->store();
+
+        return $task->task_id;
+    }
+
+    /**
+     * Unregisters a previously registered task.
+     *
+     * @param String $task_id Id of the task to be unregistered
+     * @return CronjobScheduler to allow chaining
+     * @throws InvalidArgumentException when no task with the given id exists
+     */
+    public function unregisterTask($task_id)
+    {
+        $task = CronjobTask::find($task_id);
+        if ($task === null) {
+            $message = sprintf('A task with the id "%s" does not exist.', $task_id);
+            throw new InvalidArgumentException($message);
+        }
+        $task->delete();
+
+        return $this;
+    }
+
+    /**
+     * Schedules a task for periodic execution with the provided schedule.
+     *
+     * @param String $task_id     The id of the task to be executed
+     * @param mixed  $minute      Minute part of the schedule:
+     *                            - null for "every minute" a.k.a. "don't care"
+     *                            - x < 0 for "every x minutes"
+     *                            - x >= 0 for "only at minute x"
+     * @param mixed  $hour        Hour part of the schedule:
+     *                            - null for "every hour" a.k.a. "don't care"
+     *                            - x < 0 for "every x hours"
+     *                            - x >= 0 for "only at hour x"
+     * @param mixed  $day         Day part of the schedule:
+     *                            - null for "every day" a.k.a. "don't care"
+     *                            - x < 0 for "every x days"
+     *                            - x > 0 for "only at day x"
+     * @param mixed  $month       Month part of the schedule:
+     *                            - null for "every month" a.k.a. "don't care"
+     *                            - x < 0 for "every x months"
+     *                            - x > 0 for "only at month x"
+     * @param mixed  $day_of_week Day of week part of the schedule:
+     *                            - null for "every day" a.k.a. "don't care"
+     *                            - 1 >= x >= 7 for "exactly at day of week x"
+     *                              (x starts with monday at 1 and ends with
+     *                               sunday at 7)
+     * @param Array  $parameters Optional parameters passed to the task
+     * @return CronjobSchedule The generated schedule object.
+     */
+    public function schedule(
+        string $task_id,
+        ?int $minute = null,
+        ?int $hour = null,
+        ?int $day = null,
+        ?int $month = null,
+        ?int $day_of_week = null,
+        array $parameters = []
+    ): CronjobSchedule {
+        $schedule = new CronjobSchedule();
+        $schedule->task_id    = $task_id;
+        $schedule->parameters = $parameters;
+
+        $schedule->minute = $minute;
+        $schedule->hour = $hour;
+        $schedule->day = $day;
+        $schedule->month = $month;
+        $schedule->day_of_week = $day_of_week;
+
+        $schedule->store();
+
+        $task = $schedule->task;
+        $task->assigned_count += 1;
+        $task->store();
+
+        return $schedule;
+    }
+
+    /**
+     * An alias for schedule for backwards compatibility.
+     *
+     * @see CronjobScheduler::schedule()
+     */
+    public function schedulePeriodic(
+        $task_id,
+        $minute = null,
+        $hour = null,
+        $day = null,
+        $month = null,
+        $day_of_week = null,
+        $priority = null,
+        $parameters = []
+    ) {
+        return $this->schedule($task_id, $minute, $hour, $day, $month, $day_of_week, $parameters);
+    }
+
+    /**
+     * Cancels the provided schedule.
+     *
+     * @param String $schedule_id Id of the schedule to be canceled
+     */
+    public function cancel($schedule_id)
+    {
+        CronjobSchedule::find($schedule_id)->delete();
+    }
+
+    /**
+     * Cancels all schedules of the provided task.
+     *
+     * @param String $task_id Id of the task which schedules shall be canceled
+     */
+    public function cancelByTask($task_id)
+    {
+        $schedules = CronjobSchedule::findByTask_id($task_id);
+        foreach ($schedules as $schedule) {
+            $schedule->delete();
+        }
+    }
+
+    /**
+     * Executes the available schedules if they are to be executed.
+     * This method can only be run once - even if one execution takes more
+     * than planned. This is ensured by a locking mechanism.
+     */
+    public function run()
+    {
+        if (!Config::get()->CRONJOBS_ENABLE) {
+            return;
+        }
+
+        $lock = new FileLock('studip-cronjob');
+
+        // Check whether a previous cronjob worker is still running.
+        if (!$lock->tryLock()) {
+            return;
+        }
+
+        // Find all schedules that are due to execute and which task is active
+        $temp = CronjobSchedule::findBySQL('`active` = 1 AND `next_execution` <= UNIX_TIMESTAMP() '
+                                          .'ORDER BY `next_execution`');
+        $schedules = array_filter($temp, function ($schedule) { return $schedule->task->active; });
+
+        if (count($schedules) === 0) {
+            return;
+        }
+
+        foreach ($schedules as $schedule) {
+            $log = new CronjobLog();
+            $log->schedule_id = $schedule->schedule_id;
+            $log->scheduled   = $schedule->next_execution;
+            $log->executed    = time();
+            $log->exception   = null;
+            $log->duration    = -1;
+
+            try {
+                // Skip schedules with missing task classes
+                if (!$schedule->task->valid) {
+                    throw new Exception(_('Die Klasse für den Cronjob-Task konnte nicht gefunden werden'));
+                }
+
+                // Start capturing output and measuring duration
+                ob_start();
+                $start_time = microtime(true);
+
+                $schedule->execute();
+
+                // Actually capture output and duration
+                $end_time = microtime(true);
+                $output = ob_get_clean();
+
+                // Complete log
+                $log->output    = $output;
+                $log->duration  = $end_time - $start_time;
+                $log->store();
+            } catch (Exception $e) {
+                $log->exception = $e;
+                $log->store();
+
+                // Deactivate schedule
+                $schedule->deactivate();
+
+                // Send mail to root accounts
+                $subject = sprintf('[Cronjobs] %s: %s',
+                                   _('Fehlerhafte Ausführung'),
+                                   $schedule->title);
+
+                $message = sprintf(_('Der Cronjob "%s" wurde deaktiviert, da bei der Ausführung ein Fehler aufgetreten ist.'), $schedule->title) . "\n";
+                $message .= "\n";
+                $message .= display_exception($e) . "\n";
+
+                $message .= _('Für weiterführende Informationen klicken Sie bitten den folgenden Link:') . "\n";
+
+                $old = URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']);
+                $message .= URLHelper::getURL('dispatch.php/admin/cronjobs/logs/schedule/' . $schedule->schedule_id);
+                URLHelper::setBaseURL($old);
+
+                $this->sendMailToRoots($subject, $message);
+            }
+        }
+
+        // Release lock
+        $lock->release();
+    }
+
+    /**
+     * Sends an internal mail with the provided subject and message to all
+     * users with a global permission of "root".
+     *
+     * @param String $subject The subject of the message
+     * @param String $message The message itself
+     */
+    private function sendMailToRoots($subject, $message)
+    {
+        $temp  = User::findByPerms('root');
+        $roots = SimpleORMapCollection::createFromArray($temp)
+            ->filter(function($r) { return $r->locked == 0; })
+            ->pluck('username');
+
+        $msging = new messaging;
+        $msging->insert_message($message, $roots, '____%system%____', null, null, null, null, $subject, false, 'high');
+    }
+}
diff --git a/lib/classes/DBManager.class.php b/lib/classes/DBManager.class.php
deleted file mode 100644
index 7854cff..0000000
--- a/lib/classes/DBManager.class.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-# Lifter010: TODO
-
-/*
- * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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 class provides a singleton instance that is used to manage PDO database
- * connections.
- *
- * Example of use:
- * @code
- *   # get hold of the DBManager's singleton
- *   $manager = DBManager::getInstance();
- *
- *   # set PDO connections using a DSN
- *   $manager->setConnection('example',
- *                           'mysql:host=localhost;dbname=example',
- *                           'root', '');
- *   # or an existing instance of PDO
- *   $manager->setConnection('example2', $existingPdo);
- *
- *   # retrieve a PDO connection later in your code
- *   $db = $manager->getConnection("studip");
- *
- *   # or as a shortcut
- *   $db = DBManager::get("studip");
- *
- *   # or even shorter ("studip" is the default key)
- *   $db = DBManager::get();
- *
- *   # and use the connection
- *   $db->query('SELECT * FROM user_info');
- *
- *   # you may even alias connections
- *   $manager->aliasConnection("studip", "studip-slave");
- *
- *   # but this is just sugar for
- *   $studip = $manager->getConnection("studip");
- *   $manager->setConnection("studip-slave", $studip);
- *
- * @endcode
- */
-class DBManager
-{
-
-
-    /**
-     * the singleton instance
-     *
-     * @access  private
-     * @var     DBManager
-     */
-    static private $instance;
-
-
-    /**
-     * an array of connections of the singleton instance
-     *
-     * @access  private
-     * @var     array
-     */
-    private $connections;
-
-
-    /**
-     * @access private
-     *
-     * @return void
-     */
-    private function __construct()
-    {
-        $this->connections = [];
-    }
-
-
-    /**
-     * This method returns the singleton instance of this class.
-     *
-     * @return DBManager  the singleton instance
-     */
-    static public function getInstance()
-    {
-        if (is_null(DBManager::$instance)) {
-            DBManager::$instance = new DBManager();
-        }
-        return DBManager::$instance;
-    }
-
-
-    /**
-     * This method returns the database connection to the given key. Throws a
-     * DBManagerException if there is no such connection.
-     *
-     * Example usage:
-     * @code
-     * try {
-     *     $db = DBManager::getInstance()->getConnection("foo");
-     *     $db->exec($sql);
-     * } catch (DBManagerException $e) {
-     *     echo "oops";
-     * }
-     * @endcode
-     *
-     * @param  string  the key
-     *
-     * @throw DBManagerException
-     *
-     * @return PDO     the database connection
-     */
-    public function getConnection($database)
-    {
-
-        if (!isset($this->connections[$database])) {
-            throw new DBManagerException('Database connection: "'.$database.
-                                         '" does not exist.');
-        }
-
-        return $this->connections[$database];
-    }
-
-
-    /**
-     * This method maps the specified key to the specified database connection.
-     *
-     * You can either use an instance of class PDO or specify a DSN (optionally
-     * with username/password).
-     *
-     * The (possibly newly created) connection is configured to throw exceptions
-     * and to buffer queries if it is a MySQL connection.
-     *
-     * Examples:
-     * @code
-     *    $dbManager = DBManager::getInstance();
-     *
-     *    // using an existing PDO connection
-     *    $existingPdo = new LoggingPDO($dsn);
-     *    $dbManager->setConnection('studip', $pdo);
-     *
-     *    // using a DSN with username and password
-     *    $dbManager->setConnection('studip', $dsn , $username, $password);
-     * @endcode
-     *
-     * @param  string      the key
-     * @param  string|PDO  either a DSN or an existing PDO connection
-     * @param  string      (optional) the connection's username
-     * @param  array       (optional) the connection's password
-     *
-     * @return DBManager this instance, useful for cascading method calls
-     */
-    public function setConnection($database, $dsnOrConnection, $user = NULL,
-                                  $pass = NULL)
-    {
-        $connection = $dsnOrConnection instanceof PDO
-            ? $dsnOrConnection
-            : new StudipPDO($dsnOrConnection, $user, $pass);
-
-        $this->configureConnection($connection);
-        $this->connections[$database] = $connection;
-
-        return $this;
-    }
-
-
-    // PDO connection should throw exceptions and use buffered queries
-    private function configureConnection($connection)
-    {
-
-        $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        if ($connection->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
-            $connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
-            // $connection->exec('SET CHARACTER SET latin1');
-        }
-    }
-
-    /**
-     * This method creates an alias for a database connection.
-     *
-     * This is useful if you want to use different keys but access the same
-     * database, e.g. if you want to use master-slave replication in the future
-     *
-     * @param  string    the old key of the database connection
-     * @param  string    the new key of the database connection
-     *
-     * @return DBManager this instance, useful for cascading method calls
-     */
-    public function aliasConnection($old, $new)
-    {
-
-        if (!isset($this->connections[$old])) {
-            throw new DBManagerException('No database found using key: ' . $old);
-        }
-
-        $this->connections[$new] = $this->connections[$old];
-
-        return $this;
-    }
-
-
-    /**
-     * Shortcut static method to retrieve the database connection for a given
-     * key.
-     *
-     * Example usage:
-     * @code
-     * // instead of
-     * $db = DBManager::getInstance()->getConnection("studip");
-     *
-     * // this can be shortened to
-     * $db = DBManager::get("studip");
-     *
-     * // or in this case (as "studip" is the default key)
-     * $db = DBManager::get();
-     * @endcode
-     *
-     * @param  string  the key
-     *
-     * @return StudipPDO     the database connection
-     */
-    static public function get($database = 'studip')
-    {
-        $manager = DBManager::getInstance();
-        return $manager->getConnection($database);
-    }
-}
-
-
-/**
- * The DBManager throws this exception if it cannot find a connection using
- * a non existant key.
- */
-class DBManagerException extends Exception
-{
-
-    /**
-     * @param  string   the message of this exception
-     *
-     * @return void
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
-}
diff --git a/lib/classes/DBManager.php b/lib/classes/DBManager.php
new file mode 100644
index 0000000..7854cff
--- /dev/null
+++ b/lib/classes/DBManager.php
@@ -0,0 +1,250 @@
+<?php
+# Lifter010: TODO
+
+/*
+ * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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 class provides a singleton instance that is used to manage PDO database
+ * connections.
+ *
+ * Example of use:
+ * @code
+ *   # get hold of the DBManager's singleton
+ *   $manager = DBManager::getInstance();
+ *
+ *   # set PDO connections using a DSN
+ *   $manager->setConnection('example',
+ *                           'mysql:host=localhost;dbname=example',
+ *                           'root', '');
+ *   # or an existing instance of PDO
+ *   $manager->setConnection('example2', $existingPdo);
+ *
+ *   # retrieve a PDO connection later in your code
+ *   $db = $manager->getConnection("studip");
+ *
+ *   # or as a shortcut
+ *   $db = DBManager::get("studip");
+ *
+ *   # or even shorter ("studip" is the default key)
+ *   $db = DBManager::get();
+ *
+ *   # and use the connection
+ *   $db->query('SELECT * FROM user_info');
+ *
+ *   # you may even alias connections
+ *   $manager->aliasConnection("studip", "studip-slave");
+ *
+ *   # but this is just sugar for
+ *   $studip = $manager->getConnection("studip");
+ *   $manager->setConnection("studip-slave", $studip);
+ *
+ * @endcode
+ */
+class DBManager
+{
+
+
+    /**
+     * the singleton instance
+     *
+     * @access  private
+     * @var     DBManager
+     */
+    static private $instance;
+
+
+    /**
+     * an array of connections of the singleton instance
+     *
+     * @access  private
+     * @var     array
+     */
+    private $connections;
+
+
+    /**
+     * @access private
+     *
+     * @return void
+     */
+    private function __construct()
+    {
+        $this->connections = [];
+    }
+
+
+    /**
+     * This method returns the singleton instance of this class.
+     *
+     * @return DBManager  the singleton instance
+     */
+    static public function getInstance()
+    {
+        if (is_null(DBManager::$instance)) {
+            DBManager::$instance = new DBManager();
+        }
+        return DBManager::$instance;
+    }
+
+
+    /**
+     * This method returns the database connection to the given key. Throws a
+     * DBManagerException if there is no such connection.
+     *
+     * Example usage:
+     * @code
+     * try {
+     *     $db = DBManager::getInstance()->getConnection("foo");
+     *     $db->exec($sql);
+     * } catch (DBManagerException $e) {
+     *     echo "oops";
+     * }
+     * @endcode
+     *
+     * @param  string  the key
+     *
+     * @throw DBManagerException
+     *
+     * @return PDO     the database connection
+     */
+    public function getConnection($database)
+    {
+
+        if (!isset($this->connections[$database])) {
+            throw new DBManagerException('Database connection: "'.$database.
+                                         '" does not exist.');
+        }
+
+        return $this->connections[$database];
+    }
+
+
+    /**
+     * This method maps the specified key to the specified database connection.
+     *
+     * You can either use an instance of class PDO or specify a DSN (optionally
+     * with username/password).
+     *
+     * The (possibly newly created) connection is configured to throw exceptions
+     * and to buffer queries if it is a MySQL connection.
+     *
+     * Examples:
+     * @code
+     *    $dbManager = DBManager::getInstance();
+     *
+     *    // using an existing PDO connection
+     *    $existingPdo = new LoggingPDO($dsn);
+     *    $dbManager->setConnection('studip', $pdo);
+     *
+     *    // using a DSN with username and password
+     *    $dbManager->setConnection('studip', $dsn , $username, $password);
+     * @endcode
+     *
+     * @param  string      the key
+     * @param  string|PDO  either a DSN or an existing PDO connection
+     * @param  string      (optional) the connection's username
+     * @param  array       (optional) the connection's password
+     *
+     * @return DBManager this instance, useful for cascading method calls
+     */
+    public function setConnection($database, $dsnOrConnection, $user = NULL,
+                                  $pass = NULL)
+    {
+        $connection = $dsnOrConnection instanceof PDO
+            ? $dsnOrConnection
+            : new StudipPDO($dsnOrConnection, $user, $pass);
+
+        $this->configureConnection($connection);
+        $this->connections[$database] = $connection;
+
+        return $this;
+    }
+
+
+    // PDO connection should throw exceptions and use buffered queries
+    private function configureConnection($connection)
+    {
+
+        $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        if ($connection->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
+            $connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
+            // $connection->exec('SET CHARACTER SET latin1');
+        }
+    }
+
+    /**
+     * This method creates an alias for a database connection.
+     *
+     * This is useful if you want to use different keys but access the same
+     * database, e.g. if you want to use master-slave replication in the future
+     *
+     * @param  string    the old key of the database connection
+     * @param  string    the new key of the database connection
+     *
+     * @return DBManager this instance, useful for cascading method calls
+     */
+    public function aliasConnection($old, $new)
+    {
+
+        if (!isset($this->connections[$old])) {
+            throw new DBManagerException('No database found using key: ' . $old);
+        }
+
+        $this->connections[$new] = $this->connections[$old];
+
+        return $this;
+    }
+
+
+    /**
+     * Shortcut static method to retrieve the database connection for a given
+     * key.
+     *
+     * Example usage:
+     * @code
+     * // instead of
+     * $db = DBManager::getInstance()->getConnection("studip");
+     *
+     * // this can be shortened to
+     * $db = DBManager::get("studip");
+     *
+     * // or in this case (as "studip" is the default key)
+     * $db = DBManager::get();
+     * @endcode
+     *
+     * @param  string  the key
+     *
+     * @return StudipPDO     the database connection
+     */
+    static public function get($database = 'studip')
+    {
+        $manager = DBManager::getInstance();
+        return $manager->getConnection($database);
+    }
+}
+
+
+/**
+ * The DBManager throws this exception if it cannot find a connection using
+ * a non existant key.
+ */
+class DBManagerException extends Exception
+{
+
+    /**
+     * @param  string   the message of this exception
+     *
+     * @return void
+     */
+    public function __construct($message)
+    {
+        parent::__construct($message);
+    }
+}
diff --git a/lib/classes/DataFieldBoolEntry.class.php b/lib/classes/DataFieldBoolEntry.class.php
deleted file mode 100644
index da294b6..0000000
--- a/lib/classes/DataFieldBoolEntry.class.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldBoolEntry extends DataFieldEntry
-{
-    protected $template = 'bool.php';
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        return $this->getValue() ? _('Ja') : _('Nein');
-    }
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($submitted_value)
-    {
-        $this->setValue((int) $submitted_value);
-    }
-}
diff --git a/lib/classes/DataFieldBoolEntry.php b/lib/classes/DataFieldBoolEntry.php
new file mode 100644
index 0000000..da294b6
--- /dev/null
+++ b/lib/classes/DataFieldBoolEntry.php
@@ -0,0 +1,35 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldBoolEntry extends DataFieldEntry
+{
+    protected $template = 'bool.php';
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        return $this->getValue() ? _('Ja') : _('Nein');
+    }
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($submitted_value)
+    {
+        $this->setValue((int) $submitted_value);
+    }
+}
diff --git a/lib/classes/DataFieldComboEntry.class.php b/lib/classes/DataFieldComboEntry.class.php
deleted file mode 100644
index 6047050..0000000
--- a/lib/classes/DataFieldComboEntry.class.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldComboEntry extends DataFieldEntry
-{
-    protected $template = 'combo.php';
-
-    /**
-     * Constructs this datafield
-     *
-     * @param DataField $datafield Underlying model
-     * @param String    $rangeID   Range id
-     * @param mixed     $value     Value
-     */
-    public function __construct(DataField $struct, $range_id, $value)
-    {
-        parent::__construct($struct, $range_id, $value);
-
-        if ($this->getValue() === null) {
-            $parameters = $this->getParameters();
-            $this->setValue($parameters[0]); // first selectbox entry is default
-        }
-    }
-
-    /**
-     * Returns the number of html fields this datafield uses for input.
-     *
-     * @return int representing the number of html fields
-     */
-    public function numberOfHTMLFields()
-    {
-        return 2;
-    }
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($value)
-    {
-        $index = $value['combo'];
-        $value = $value[$index];
-        parent::setValueFromSubmit($value);
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        return parent::getHTML($name, $variables + [
-            'values' => $this->getParameters(),
-        ]);
-    }
-
-    /**
-     * Returns the individual type parameters.
-     *
-     * @return array containing the individual type parameters
-     */
-    protected function getParameters()
-    {
-        $parameters = explode("\n", rtrim($this->model->typeparam));
-        $parameters = array_map('trim', $parameters);
-        return $parameters;
-    }
-}
diff --git a/lib/classes/DataFieldComboEntry.php b/lib/classes/DataFieldComboEntry.php
new file mode 100644
index 0000000..6047050
--- /dev/null
+++ b/lib/classes/DataFieldComboEntry.php
@@ -0,0 +1,79 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldComboEntry extends DataFieldEntry
+{
+    protected $template = 'combo.php';
+
+    /**
+     * Constructs this datafield
+     *
+     * @param DataField $datafield Underlying model
+     * @param String    $rangeID   Range id
+     * @param mixed     $value     Value
+     */
+    public function __construct(DataField $struct, $range_id, $value)
+    {
+        parent::__construct($struct, $range_id, $value);
+
+        if ($this->getValue() === null) {
+            $parameters = $this->getParameters();
+            $this->setValue($parameters[0]); // first selectbox entry is default
+        }
+    }
+
+    /**
+     * Returns the number of html fields this datafield uses for input.
+     *
+     * @return int representing the number of html fields
+     */
+    public function numberOfHTMLFields()
+    {
+        return 2;
+    }
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($value)
+    {
+        $index = $value['combo'];
+        $value = $value[$index];
+        parent::setValueFromSubmit($value);
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        return parent::getHTML($name, $variables + [
+            'values' => $this->getParameters(),
+        ]);
+    }
+
+    /**
+     * Returns the individual type parameters.
+     *
+     * @return array containing the individual type parameters
+     */
+    protected function getParameters()
+    {
+        $parameters = explode("\n", rtrim($this->model->typeparam));
+        $parameters = array_map('trim', $parameters);
+        return $parameters;
+    }
+}
diff --git a/lib/classes/DataFieldDateEntry.class.php b/lib/classes/DataFieldDateEntry.class.php
deleted file mode 100644
index bf7d518..0000000
--- a/lib/classes/DataFieldDateEntry.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldDateEntry extends DataFieldEntry
-{
-    protected $template = 'date.php';
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($value)
-    {
-        if ($value) {
-            $value = trim($value);
-            $items = explode(".", $value);
-            $value = array_reverse($items);
-            $value = array_filter($value);
-            $date  = implode('-', $value);
-            parent::setValueFromSubmit($date);
-        }
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entries = true)
-    {
-        if ($this->isValid()) {
-            $value = trim($this->value);
-            $value = explode('-', $value);
-            $value = array_reverse($value);
-            $value = implode('.', $value);
-            return $value;
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        return parent::getHTML($name, $variables + [
-            'timestamp' => strtotime(trim($this->value)),
-        ]);
-    }
-
-    /**
-     * Returns whether the datafield contents are valid
-     *
-     * @return boolean indicating whether the datafield contents are valid
-     */
-    public function isValid()
-    {
-        $value = trim($this->value);
-
-        if (!$value) {
-            return parent::isValid();
-        }
-
-        return parent::isValid() && strtotime($value) !== false;
-    }
-}
diff --git a/lib/classes/DataFieldDateEntry.php b/lib/classes/DataFieldDateEntry.php
new file mode 100644
index 0000000..bf7d518
--- /dev/null
+++ b/lib/classes/DataFieldDateEntry.php
@@ -0,0 +1,80 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldDateEntry extends DataFieldEntry
+{
+    protected $template = 'date.php';
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($value)
+    {
+        if ($value) {
+            $value = trim($value);
+            $items = explode(".", $value);
+            $value = array_reverse($items);
+            $value = array_filter($value);
+            $date  = implode('-', $value);
+            parent::setValueFromSubmit($date);
+        }
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entries = true)
+    {
+        if ($this->isValid()) {
+            $value = trim($this->value);
+            $value = explode('-', $value);
+            $value = array_reverse($value);
+            $value = implode('.', $value);
+            return $value;
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        return parent::getHTML($name, $variables + [
+            'timestamp' => strtotime(trim($this->value)),
+        ]);
+    }
+
+    /**
+     * Returns whether the datafield contents are valid
+     *
+     * @return boolean indicating whether the datafield contents are valid
+     */
+    public function isValid()
+    {
+        $value = trim($this->value);
+
+        if (!$value) {
+            return parent::isValid();
+        }
+
+        return parent::isValid() && strtotime($value) !== false;
+    }
+}
diff --git a/lib/classes/DataFieldEmailEntry.class.php b/lib/classes/DataFieldEmailEntry.class.php
deleted file mode 100644
index aafe7bb..0000000
--- a/lib/classes/DataFieldEmailEntry.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldEmailEntry extends DataFieldEntry
-{
-    protected $template = 'email.php';
-
-    /**
-     * Returns whether the datafield contents are valid
-     *
-     * @return boolean indicating whether the datafield contents are valid
-     */
-    public function isValid()
-    {
-        return parent::isValid()
-            && (!$this->getValue() || filter_var($this->getValue(), FILTER_VALIDATE_EMAIL));
-    }
-}
diff --git a/lib/classes/DataFieldEmailEntry.php b/lib/classes/DataFieldEmailEntry.php
new file mode 100644
index 0000000..aafe7bb
--- /dev/null
+++ b/lib/classes/DataFieldEmailEntry.php
@@ -0,0 +1,25 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldEmailEntry extends DataFieldEntry
+{
+    protected $template = 'email.php';
+
+    /**
+     * Returns whether the datafield contents are valid
+     *
+     * @return boolean indicating whether the datafield contents are valid
+     */
+    public function isValid()
+    {
+        return parent::isValid()
+            && (!$this->getValue() || filter_var($this->getValue(), FILTER_VALIDATE_EMAIL));
+    }
+}
diff --git a/lib/classes/DataFieldEntry.class.php b/lib/classes/DataFieldEntry.class.php
deleted file mode 100644
index fd50a0b..0000000
--- a/lib/classes/DataFieldEntry.class.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-/**
- * DataFieldEntry.class.php
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-abstract class DataFieldEntry
-{
-    protected static $supported_types = [
-        'bool',
-        'textline',
-        'textlinei18n',
-        'textarea',
-        'textareai18n',
-        'textmarkup',
-        'textmarkupi18n',
-        'selectbox',
-        'selectboxmultiple',
-        'date',
-        'time',
-        'email',
-        'phone',
-        'radio',
-        'combo',
-        'link',
-    ];
-
-    protected $language = '';
-    protected $template = null;
-
-    /**
-     * Returns all supported datafield types.
-     *
-     * @param string Object type of the datafield.
-     * @return array of supported types
-     */
-    public static function getSupportedTypes($object_type = null)
-    {
-        // no i18n fields for descriptors
-        if (in_array($object_type, ['moduldeskriptor', 'modulteildeskriptor'])) {
-            return array_diff(
-                self::$supported_types,
-                [
-                    'textlinei18n',
-                    'textareai18n',
-                    'textmarkupi18n'
-                ]);
-        }
-        return self::$supported_types;
-    }
-
-    /**
-     * Returns the according class for a given type.
-     *
-     * @param String $type Type of the datafield
-     * @return String class name
-     */
-    private static function getClassForType($type)
-    {
-        if ($type === 'selectboxmultiple') {
-            return 'DataFieldSelectboxMultipleEntry';
-        }
-        return 'DataField' . ucfirst($type) . 'Entry';
-    }
-
-    /**
-     * Factory method that returns the appropriate datafield object
-     * for the given parameters.
-     *
-     * @param DataField $datafield Underlying structure
-     * @param String    $rangeID   Range id
-     * @param mixed     $value     Value of the entry
-     * @return DataFieldEntry instance of appropriate type
-     */
-    public static function createDataFieldEntry(DataField $datafield, $rangeID = '', $value = null)
-    {
-        $type = $datafield->type;
-        if (!in_array($type, self::getSupportedTypes())) {
-            return false;
-        }
-
-        $entry_class = self::getClassForType($type);
-        $entry = new $entry_class($datafield, $rangeID, $value);
-
-        return $entry;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $range_id
-     * @param string $object_type
-     * @param string $object_class_hint
-     * @return array
-     */
-    public static function getDataFieldEntries($range_id, $object_type = '', $object_class_hint = '')
-    {
-        if (!$range_id) {
-            return []; // we necessarily need a range ID
-        }
-        $parameters = [];
-        $clause1 = '';
-        $clause2 = '';
-        $clause3 = '';
-        if(is_array($range_id)) {
-            // rangeID may be an array ("classic" rangeID and second rangeID used for user roles)
-            $secRangeID = $range_id[1];
-            $rangeID = $range_id[0]; // to keep compatible with following code
-            if('usersemdata' !== $object_type && 'roleinstdata' !== $object_type) {
-                $object_type = 'userinstrole';
-            }
-            $clause1 = "AND sec_range_id= :sec_range_id";
-            $parameters[':sec_range_id'] = $secRangeID;
-        } else {
-            $rangeID = $range_id;
-        }
-        if (!$object_type) {
-            $object_type = get_object_type($rangeID);
-        }
-
-        if($object_type) {
-            switch ($object_type) {
-                case 'sem':
-                    if ($object_class_hint) {
-                        $object_class = SeminarCategories::GetByTypeId($object_class_hint);
-                    } else {
-                        $object_class = SeminarCategories::GetBySeminarId($rangeID);
-                    }
-
-                    $clause2 = "object_class = :object_class OR object_class IS NULL";
-                    $parameters[':object_class'] = (int) $object_class->id;
-                    $clause3 = 'a.institut_id IS NULL OR a.institut_id IN (:institut_ids)';
-                    $query = "SELECT institut_id FROM seminar_inst WHERE seminar_id = :seminar_id";
-                    $statement = DBManager::get()->prepare($query);
-                    $statement->execute([':seminar_id' => $rangeID]);
-                    $parameters[':institut_ids'] = array_keys($statement->fetchGrouped());
-                    break;
-                case 'inst':
-                case 'fak':
-
-                    if ($object_class_hint) {
-                        $object_class = $object_class_hint;
-                    } else {
-                        $query = "SELECT type FROM Institute WHERE Institut_id = ?";
-                        $statement = DBManager::get()->prepare($query);
-                        $statement->execute([$rangeID]);
-                        $object_class = $statement->fetchColumn();
-                    }
-                    $object_type = "inst";
-                    $clause2 = "object_class = :object_class OR object_class IS NULL";
-                    $parameters[':object_class'] = (int) $object_class;
-                    $clause3 = 'a.institut_id IS NULL OR a.institut_id = :institut_id';
-                    $parameters[':institut_id'] = $rangeID;
-                    break;
-                case 'roleinstdata': //hmm tja, vermutlich so
-                case 'moduldeskriptor':
-                case 'modulteildeskriptor':
-                case 'studycourse':
-                    $clause2 = '1';
-                    $clause3 = '1';
-                    if (is_array($range_id) && isset($range_id[0])) {
-                        $clause3 = 'a.institut_id IS NULL OR a.institut_id = :institut_id';
-                        $parameters[':institut_id'] = $range_id[0];
-                    }
-                    break;
-                case 'user':
-                case 'userinstrole':
-                case 'usersemdata':
-                    $object_class = is_object($GLOBALS['perm']) ? DataField::permMask($GLOBALS['perm']->get_perm($rangeID)) : 0;
-                    $clause2 = "((object_class & :object_class) OR object_class IS NULL)";
-                    $parameters[':object_class'] = (int) $object_class;
-
-                    $clause3 = 'a.institut_id IS NULL OR a.institut_id IN (:institut_ids)';
-                    $query = "SELECT institut_id FROM user_inst WHERE user_id = :user_id";
-                    $statement = DBManager::get()->prepare($query);
-                    $statement->execute([':user_id' => $rangeID]);
-                    $parameters[':institut_ids'] = array_keys($statement->fetchGrouped());
-                    break;
-            }
-            $query = "SELECT a.*, content
-                      FROM datafields AS a
-                      LEFT JOIN datafields_entries AS b
-                        ON (a.datafield_id = b.datafield_id AND range_id = :range_id {$clause1})
-                      WHERE object_type = :object_type AND ({$clause2}) AND ($clause3)
-                      ORDER BY priority";
-            $parameters[':range_id']    = $rangeID;
-            $parameters[':object_type'] = $object_type;
-
-            $rs = DBManager::get()->prepare($query);
-            $rs->execute($parameters);
-
-            $entries = [];
-            while ($data = $rs->fetch(PDO::FETCH_ASSOC)) {
-                $datafield = DataField::buildExisting($data);
-                $entries[$data['datafield_id']] = DataFieldEntry::createDataFieldEntry($datafield, $range_id, $data['content']);
-            }
-        }
-        return $entries ?: [];
-    }
-
-    /**
-     * Removes all datafields from a given range_id (and secondary range
-     * id if passed as array)
-     *
-     * @param mixed $range_id Range id (or array with range id and secondary
-     *                        range id)
-     * @return int representing the number of deleted entries
-     */
-    public static function removeAll($range_id)
-    {
-        if (is_array($range_id)) {
-            list ($rangeID, $secRangeID) = $range_id;
-        } else {
-            $rangeID = $range_id;
-            $secRangeID = "";
-        }
-
-        if (!$rangeID && !$secRangeID) {
-            return;
-        }
-
-        $conditions = [];
-        $parameters = [];
-
-        if ($rangeID) {
-            $conditions[] = 'range_id = ?';
-            $parameters[] = $rangeID;
-        }
-        if ($secRangeID) {
-            $conditions[] = 'sec_range_id = ?';
-            $parameters[] = $secRangeID;
-        }
-
-        $where = implode(' AND ', $conditions);
-
-        return DatafieldEntryModel::deleteBySQL($where, $parameters);
-    }
-
-    public $value;
-    public $model;
-    public $rangeID;
-
-    /**
-     * Constructs this datafield
-     *
-     * @param DataField $datafield Underlying model
-     * @param mixed $range_id Range id (or array with range id and secondary
-     *                        range id)
-     * @param mixed     $value     Value
-     */
-    public function __construct(DataField $datafield = null, $rangeID = '', $value = null)
-    {
-        $this->model   = $datafield;
-        $this->rangeID = $rangeID;
-        $this->value   = isset($value) ? $value : $datafield->default_value;
-    }
-
-    /**
-     * Stores this datafield entry
-     *
-     * @return int representing the number of changed entries
-     */
-    public function store()
-    {
-        $id = [
-            $this->model->id,
-            (string) $this->getRangeID(),
-            (string) $this->getSecondRangeID(),
-            (string) $this->language
-        ];
-        $entry = new DatafieldEntryModel($id);
-        $entry->lang = (string) $this->language;
-
-        $old_value = $entry->content;
-        $entry->content = $this->getValue();
-
-        if ($entry->content == $this->model->default_value) {
-            $result = $entry->isNew() ? 0 : $entry->delete();
-        } else {
-            $result = $entry->store();
-        }
-
-        if ($result) {
-            NotificationCenter::postNotification('DatafieldDidUpdate', $this, [
-                'changed'   => $result,
-                'old_value' => $old_value,
-            ]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns whether this datafield is required
-     *
-     * @return bool indicating whether the datafield is required or not
-     */
-    public function isRequired()
-    {
-        return $this->model->is_required;
-    }
-
-    /**
-     * Returns the description of this datafield
-     *
-     * @return String containing the description
-     */
-    public function getDescription()
-    {
-        return $this->model->description;
-    }
-
-    /**
-     * Returns the type of this datafield
-     *
-     * @return string type of entry
-     */
-    public function getType()
-    {
-        $class = mb_strtolower(get_class($this));
-        return mb_substr($class, 9, mb_strpos($class, 'entry') - 9);
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        if ($entities) {
-            return htmlReady($this->getValue());
-        }
-        return $this->getValue();
-    }
-
-    /**
-     * Returns the value of the datafield
-     *
-     * @return mixed containing the value
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the name of the datafield
-     *
-     * @return String containing the name
-     */
-    public function getName()
-    {
-        return $this->model->name;
-    }
-
-    /**
-     * Returns the id of the datafield
-     *
-     * @return String containing the id
-     */
-    public function getId()
-    {
-        return $this->model->id;
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        $variables = array_merge([
-            'name'  => $name,
-            'entry' => $this,
-            'model' => $this->model,
-            'value' => $this->getValue(),
-        ], $variables);
-
-        return $GLOBALS['template_factory']->render('datafields/' . $this->template, $variables);
-    }
-
-    /**
-     * Sets the value
-     *
-     * @param mixed $value The value
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($submitted_value)
-    {
-        $this->setValue($submitted_value);
-    }
-
-    /**
-     * Sets the range id
-     *
-     * @param String $range_id Range id
-     */
-    public function setRangeID($range_id)
-    {
-        $this->rangeID = $range_id;
-    }
-
-    /**
-     * Sets the secondary range id
-     *
-     * @param String $sec_range_id Secondary range id
-     */
-    public function setSecondRangeID($sec_range_id)
-    {
-        $this->rangeID = [$this->getRangeID(), $sec_range_id];
-    }
-
-    /**
-     * Sets the prefered content language if this is an i18n datafield.
-     *
-     * @param string $language The prefered display language
-     */
-    public function setContentLanguage($language)
-    {
-        if (!Config::get()->CONTENT_LANGUAGES[$language]) {
-            throw new InvalidArgumentException('Language not configured.');
-        }
-
-        $languages = array_keys(Config::get()->CONTENT_LANGUAGES);
-        if ($language == reset($languages)) {
-            $language = '';
-        }
-
-        $this->language = $language;
-    }
-
-    /**
-     * Checks if datafield is empty (was not set)
-     *
-     * @return bool true if empty, else false
-     */
-    public function isEmpty()
-    {
-        return $this->getValue() == '';
-    }
-
-    /**
-     * Returns whether the datafield contents are valid
-     *
-     * @return boolean indicating whether the datafield contents are valid
-     */
-    public function isValid()
-    {
-        return trim($this->getValue())
-            || !$this->model->is_required;
-    }
-
-    /**
-     * Returns the number of html fields this datafield uses for input.
-     *
-     * @return int representing the number of html fields
-     */
-    public function numberOfHTMLFields()
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the range id
-     *
-     * @return String containing the range id
-     */
-    public function getRangeID()
-    {
-        if (is_array($this->rangeID)) {
-            return reset($this->rangeID);
-        }
-        return $this->rangeID;
-    }
-
-    /**
-     * Returns the secondary range id
-     *
-     * @return String containing the secondary range id
-     */
-    public function getSecondRangeID()
-    {
-        if (is_array($this->rangeID)) {
-            list (, $secRangeID) = $this->rangeID;
-            return $secRangeID;
-        }
-        return '';
-    }
-
-    /**
-     * Returns whether the datafield is visible for the current user
-     *
-     * @param String $perm Permissions to test against (optional, default to
-     *                     the current user's permissions)
-     * @param bool $test_ownership Defines whether the ownership of the field
-     *                             should be taken into account; a field may
-     *                             be invisible for a user according to the
-     *                             permissions but since the datafield belongs
-     *                             to the user, it is visible.
-     * @return boolean indicating whether the datafield is visible
-     */
-    public function isVisible($perm = null, $test_ownership = true)
-    {
-        if ($test_ownership) {
-            return $this->model->accessAllowed($perm,
-                                               $GLOBALS['user']->id,
-                                               $this->getRangeID());
-        }
-        return $this->model->accessAllowed($perm);
-    }
-
-    /**
-     * Returns whether the datafield is editable for the current user
-     *
-     * @param mixed $perms Perms to test against (optional, defaults to logged
-     *                     in user's perms)
-     * @return boolean indicating whether the datafield is editable
-     */
-    public function isEditable($perms = null)
-    {
-        return $this->model->editAllowed($perms ?: $GLOBALS['perm']->get_perm());
-    }
-
-    /**
-     * Returns a human readable string describing the view permissions
-     *
-     * @return String containing the descriptons of the view permissions
-     */
-    public function getPermsDescription()
-    {
-        if ($this->model->view_perms === 'all') {
-            return _('sichtbar für alle');
-        }
-        return sprintf(_('sichtbar nur für Sie und alle %s'),
-                       $this->prettyPrintViewPerms());
-    }
-
-    /**
-     * Generates a full status description depending on the the perms
-     *
-     * @return string
-     */
-    protected function prettyPrintViewPerms()
-    {
-        switch ($this->model->view_perms) {
-            case 'all':
-                return _('alle');
-                break;
-            case 'root':
-                return _('Systemadministrator/-innen');
-                break;
-            case 'admin':
-                return _('Administrator/-innen');
-                break;
-            case 'dozent':
-                return _('Lehrenden');
-                break;
-            case 'tutor':
-                return _('Tutor/-innen');
-                break;
-            case 'autor':
-                return _('Studierenden');
-                break;
-            case 'user':
-                return _('Nutzer/-innen');
-                break;
-        }
-        return '';
-    }
-
-}
diff --git a/lib/classes/DataFieldEntry.php b/lib/classes/DataFieldEntry.php
new file mode 100644
index 0000000..fd50a0b
--- /dev/null
+++ b/lib/classes/DataFieldEntry.php
@@ -0,0 +1,588 @@
+<?php
+/**
+ * DataFieldEntry.class.php
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+abstract class DataFieldEntry
+{
+    protected static $supported_types = [
+        'bool',
+        'textline',
+        'textlinei18n',
+        'textarea',
+        'textareai18n',
+        'textmarkup',
+        'textmarkupi18n',
+        'selectbox',
+        'selectboxmultiple',
+        'date',
+        'time',
+        'email',
+        'phone',
+        'radio',
+        'combo',
+        'link',
+    ];
+
+    protected $language = '';
+    protected $template = null;
+
+    /**
+     * Returns all supported datafield types.
+     *
+     * @param string Object type of the datafield.
+     * @return array of supported types
+     */
+    public static function getSupportedTypes($object_type = null)
+    {
+        // no i18n fields for descriptors
+        if (in_array($object_type, ['moduldeskriptor', 'modulteildeskriptor'])) {
+            return array_diff(
+                self::$supported_types,
+                [
+                    'textlinei18n',
+                    'textareai18n',
+                    'textmarkupi18n'
+                ]);
+        }
+        return self::$supported_types;
+    }
+
+    /**
+     * Returns the according class for a given type.
+     *
+     * @param String $type Type of the datafield
+     * @return String class name
+     */
+    private static function getClassForType($type)
+    {
+        if ($type === 'selectboxmultiple') {
+            return 'DataFieldSelectboxMultipleEntry';
+        }
+        return 'DataField' . ucfirst($type) . 'Entry';
+    }
+
+    /**
+     * Factory method that returns the appropriate datafield object
+     * for the given parameters.
+     *
+     * @param DataField $datafield Underlying structure
+     * @param String    $rangeID   Range id
+     * @param mixed     $value     Value of the entry
+     * @return DataFieldEntry instance of appropriate type
+     */
+    public static function createDataFieldEntry(DataField $datafield, $rangeID = '', $value = null)
+    {
+        $type = $datafield->type;
+        if (!in_array($type, self::getSupportedTypes())) {
+            return false;
+        }
+
+        $entry_class = self::getClassForType($type);
+        $entry = new $entry_class($datafield, $rangeID, $value);
+
+        return $entry;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $range_id
+     * @param string $object_type
+     * @param string $object_class_hint
+     * @return array
+     */
+    public static function getDataFieldEntries($range_id, $object_type = '', $object_class_hint = '')
+    {
+        if (!$range_id) {
+            return []; // we necessarily need a range ID
+        }
+        $parameters = [];
+        $clause1 = '';
+        $clause2 = '';
+        $clause3 = '';
+        if(is_array($range_id)) {
+            // rangeID may be an array ("classic" rangeID and second rangeID used for user roles)
+            $secRangeID = $range_id[1];
+            $rangeID = $range_id[0]; // to keep compatible with following code
+            if('usersemdata' !== $object_type && 'roleinstdata' !== $object_type) {
+                $object_type = 'userinstrole';
+            }
+            $clause1 = "AND sec_range_id= :sec_range_id";
+            $parameters[':sec_range_id'] = $secRangeID;
+        } else {
+            $rangeID = $range_id;
+        }
+        if (!$object_type) {
+            $object_type = get_object_type($rangeID);
+        }
+
+        if($object_type) {
+            switch ($object_type) {
+                case 'sem':
+                    if ($object_class_hint) {
+                        $object_class = SeminarCategories::GetByTypeId($object_class_hint);
+                    } else {
+                        $object_class = SeminarCategories::GetBySeminarId($rangeID);
+                    }
+
+                    $clause2 = "object_class = :object_class OR object_class IS NULL";
+                    $parameters[':object_class'] = (int) $object_class->id;
+                    $clause3 = 'a.institut_id IS NULL OR a.institut_id IN (:institut_ids)';
+                    $query = "SELECT institut_id FROM seminar_inst WHERE seminar_id = :seminar_id";
+                    $statement = DBManager::get()->prepare($query);
+                    $statement->execute([':seminar_id' => $rangeID]);
+                    $parameters[':institut_ids'] = array_keys($statement->fetchGrouped());
+                    break;
+                case 'inst':
+                case 'fak':
+
+                    if ($object_class_hint) {
+                        $object_class = $object_class_hint;
+                    } else {
+                        $query = "SELECT type FROM Institute WHERE Institut_id = ?";
+                        $statement = DBManager::get()->prepare($query);
+                        $statement->execute([$rangeID]);
+                        $object_class = $statement->fetchColumn();
+                    }
+                    $object_type = "inst";
+                    $clause2 = "object_class = :object_class OR object_class IS NULL";
+                    $parameters[':object_class'] = (int) $object_class;
+                    $clause3 = 'a.institut_id IS NULL OR a.institut_id = :institut_id';
+                    $parameters[':institut_id'] = $rangeID;
+                    break;
+                case 'roleinstdata': //hmm tja, vermutlich so
+                case 'moduldeskriptor':
+                case 'modulteildeskriptor':
+                case 'studycourse':
+                    $clause2 = '1';
+                    $clause3 = '1';
+                    if (is_array($range_id) && isset($range_id[0])) {
+                        $clause3 = 'a.institut_id IS NULL OR a.institut_id = :institut_id';
+                        $parameters[':institut_id'] = $range_id[0];
+                    }
+                    break;
+                case 'user':
+                case 'userinstrole':
+                case 'usersemdata':
+                    $object_class = is_object($GLOBALS['perm']) ? DataField::permMask($GLOBALS['perm']->get_perm($rangeID)) : 0;
+                    $clause2 = "((object_class & :object_class) OR object_class IS NULL)";
+                    $parameters[':object_class'] = (int) $object_class;
+
+                    $clause3 = 'a.institut_id IS NULL OR a.institut_id IN (:institut_ids)';
+                    $query = "SELECT institut_id FROM user_inst WHERE user_id = :user_id";
+                    $statement = DBManager::get()->prepare($query);
+                    $statement->execute([':user_id' => $rangeID]);
+                    $parameters[':institut_ids'] = array_keys($statement->fetchGrouped());
+                    break;
+            }
+            $query = "SELECT a.*, content
+                      FROM datafields AS a
+                      LEFT JOIN datafields_entries AS b
+                        ON (a.datafield_id = b.datafield_id AND range_id = :range_id {$clause1})
+                      WHERE object_type = :object_type AND ({$clause2}) AND ($clause3)
+                      ORDER BY priority";
+            $parameters[':range_id']    = $rangeID;
+            $parameters[':object_type'] = $object_type;
+
+            $rs = DBManager::get()->prepare($query);
+            $rs->execute($parameters);
+
+            $entries = [];
+            while ($data = $rs->fetch(PDO::FETCH_ASSOC)) {
+                $datafield = DataField::buildExisting($data);
+                $entries[$data['datafield_id']] = DataFieldEntry::createDataFieldEntry($datafield, $range_id, $data['content']);
+            }
+        }
+        return $entries ?: [];
+    }
+
+    /**
+     * Removes all datafields from a given range_id (and secondary range
+     * id if passed as array)
+     *
+     * @param mixed $range_id Range id (or array with range id and secondary
+     *                        range id)
+     * @return int representing the number of deleted entries
+     */
+    public static function removeAll($range_id)
+    {
+        if (is_array($range_id)) {
+            list ($rangeID, $secRangeID) = $range_id;
+        } else {
+            $rangeID = $range_id;
+            $secRangeID = "";
+        }
+
+        if (!$rangeID && !$secRangeID) {
+            return;
+        }
+
+        $conditions = [];
+        $parameters = [];
+
+        if ($rangeID) {
+            $conditions[] = 'range_id = ?';
+            $parameters[] = $rangeID;
+        }
+        if ($secRangeID) {
+            $conditions[] = 'sec_range_id = ?';
+            $parameters[] = $secRangeID;
+        }
+
+        $where = implode(' AND ', $conditions);
+
+        return DatafieldEntryModel::deleteBySQL($where, $parameters);
+    }
+
+    public $value;
+    public $model;
+    public $rangeID;
+
+    /**
+     * Constructs this datafield
+     *
+     * @param DataField $datafield Underlying model
+     * @param mixed $range_id Range id (or array with range id and secondary
+     *                        range id)
+     * @param mixed     $value     Value
+     */
+    public function __construct(DataField $datafield = null, $rangeID = '', $value = null)
+    {
+        $this->model   = $datafield;
+        $this->rangeID = $rangeID;
+        $this->value   = isset($value) ? $value : $datafield->default_value;
+    }
+
+    /**
+     * Stores this datafield entry
+     *
+     * @return int representing the number of changed entries
+     */
+    public function store()
+    {
+        $id = [
+            $this->model->id,
+            (string) $this->getRangeID(),
+            (string) $this->getSecondRangeID(),
+            (string) $this->language
+        ];
+        $entry = new DatafieldEntryModel($id);
+        $entry->lang = (string) $this->language;
+
+        $old_value = $entry->content;
+        $entry->content = $this->getValue();
+
+        if ($entry->content == $this->model->default_value) {
+            $result = $entry->isNew() ? 0 : $entry->delete();
+        } else {
+            $result = $entry->store();
+        }
+
+        if ($result) {
+            NotificationCenter::postNotification('DatafieldDidUpdate', $this, [
+                'changed'   => $result,
+                'old_value' => $old_value,
+            ]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns whether this datafield is required
+     *
+     * @return bool indicating whether the datafield is required or not
+     */
+    public function isRequired()
+    {
+        return $this->model->is_required;
+    }
+
+    /**
+     * Returns the description of this datafield
+     *
+     * @return String containing the description
+     */
+    public function getDescription()
+    {
+        return $this->model->description;
+    }
+
+    /**
+     * Returns the type of this datafield
+     *
+     * @return string type of entry
+     */
+    public function getType()
+    {
+        $class = mb_strtolower(get_class($this));
+        return mb_substr($class, 9, mb_strpos($class, 'entry') - 9);
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        if ($entities) {
+            return htmlReady($this->getValue());
+        }
+        return $this->getValue();
+    }
+
+    /**
+     * Returns the value of the datafield
+     *
+     * @return mixed containing the value
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Returns the name of the datafield
+     *
+     * @return String containing the name
+     */
+    public function getName()
+    {
+        return $this->model->name;
+    }
+
+    /**
+     * Returns the id of the datafield
+     *
+     * @return String containing the id
+     */
+    public function getId()
+    {
+        return $this->model->id;
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        $variables = array_merge([
+            'name'  => $name,
+            'entry' => $this,
+            'model' => $this->model,
+            'value' => $this->getValue(),
+        ], $variables);
+
+        return $GLOBALS['template_factory']->render('datafields/' . $this->template, $variables);
+    }
+
+    /**
+     * Sets the value
+     *
+     * @param mixed $value The value
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($submitted_value)
+    {
+        $this->setValue($submitted_value);
+    }
+
+    /**
+     * Sets the range id
+     *
+     * @param String $range_id Range id
+     */
+    public function setRangeID($range_id)
+    {
+        $this->rangeID = $range_id;
+    }
+
+    /**
+     * Sets the secondary range id
+     *
+     * @param String $sec_range_id Secondary range id
+     */
+    public function setSecondRangeID($sec_range_id)
+    {
+        $this->rangeID = [$this->getRangeID(), $sec_range_id];
+    }
+
+    /**
+     * Sets the prefered content language if this is an i18n datafield.
+     *
+     * @param string $language The prefered display language
+     */
+    public function setContentLanguage($language)
+    {
+        if (!Config::get()->CONTENT_LANGUAGES[$language]) {
+            throw new InvalidArgumentException('Language not configured.');
+        }
+
+        $languages = array_keys(Config::get()->CONTENT_LANGUAGES);
+        if ($language == reset($languages)) {
+            $language = '';
+        }
+
+        $this->language = $language;
+    }
+
+    /**
+     * Checks if datafield is empty (was not set)
+     *
+     * @return bool true if empty, else false
+     */
+    public function isEmpty()
+    {
+        return $this->getValue() == '';
+    }
+
+    /**
+     * Returns whether the datafield contents are valid
+     *
+     * @return boolean indicating whether the datafield contents are valid
+     */
+    public function isValid()
+    {
+        return trim($this->getValue())
+            || !$this->model->is_required;
+    }
+
+    /**
+     * Returns the number of html fields this datafield uses for input.
+     *
+     * @return int representing the number of html fields
+     */
+    public function numberOfHTMLFields()
+    {
+        return 1;
+    }
+
+    /**
+     * Returns the range id
+     *
+     * @return String containing the range id
+     */
+    public function getRangeID()
+    {
+        if (is_array($this->rangeID)) {
+            return reset($this->rangeID);
+        }
+        return $this->rangeID;
+    }
+
+    /**
+     * Returns the secondary range id
+     *
+     * @return String containing the secondary range id
+     */
+    public function getSecondRangeID()
+    {
+        if (is_array($this->rangeID)) {
+            list (, $secRangeID) = $this->rangeID;
+            return $secRangeID;
+        }
+        return '';
+    }
+
+    /**
+     * Returns whether the datafield is visible for the current user
+     *
+     * @param String $perm Permissions to test against (optional, default to
+     *                     the current user's permissions)
+     * @param bool $test_ownership Defines whether the ownership of the field
+     *                             should be taken into account; a field may
+     *                             be invisible for a user according to the
+     *                             permissions but since the datafield belongs
+     *                             to the user, it is visible.
+     * @return boolean indicating whether the datafield is visible
+     */
+    public function isVisible($perm = null, $test_ownership = true)
+    {
+        if ($test_ownership) {
+            return $this->model->accessAllowed($perm,
+                                               $GLOBALS['user']->id,
+                                               $this->getRangeID());
+        }
+        return $this->model->accessAllowed($perm);
+    }
+
+    /**
+     * Returns whether the datafield is editable for the current user
+     *
+     * @param mixed $perms Perms to test against (optional, defaults to logged
+     *                     in user's perms)
+     * @return boolean indicating whether the datafield is editable
+     */
+    public function isEditable($perms = null)
+    {
+        return $this->model->editAllowed($perms ?: $GLOBALS['perm']->get_perm());
+    }
+
+    /**
+     * Returns a human readable string describing the view permissions
+     *
+     * @return String containing the descriptons of the view permissions
+     */
+    public function getPermsDescription()
+    {
+        if ($this->model->view_perms === 'all') {
+            return _('sichtbar für alle');
+        }
+        return sprintf(_('sichtbar nur für Sie und alle %s'),
+                       $this->prettyPrintViewPerms());
+    }
+
+    /**
+     * Generates a full status description depending on the the perms
+     *
+     * @return string
+     */
+    protected function prettyPrintViewPerms()
+    {
+        switch ($this->model->view_perms) {
+            case 'all':
+                return _('alle');
+                break;
+            case 'root':
+                return _('Systemadministrator/-innen');
+                break;
+            case 'admin':
+                return _('Administrator/-innen');
+                break;
+            case 'dozent':
+                return _('Lehrenden');
+                break;
+            case 'tutor':
+                return _('Tutor/-innen');
+                break;
+            case 'autor':
+                return _('Studierenden');
+                break;
+            case 'user':
+                return _('Nutzer/-innen');
+                break;
+        }
+        return '';
+    }
+
+}
diff --git a/lib/classes/DataFieldLinkEntry.class.php b/lib/classes/DataFieldLinkEntry.class.php
deleted file mode 100644
index 702907f..0000000
--- a/lib/classes/DataFieldLinkEntry.class.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldLinkEntry extends DataFieldEntry
-{
-    protected $template = 'link.php';
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        if ($entities) {
-            return formatLinks($this->getValue());
-        }
-        return $this->getValue();
-    }
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($submitted_value)
-    {
-        if ($submitted_value === 'http://') {
-            $submitted_value = '';
-        }
-        $this->setValue($submitted_value);
-    }
-
-    /**
-     * Returns whether the datafield contents are valid
-     *
-     * @return boolean indicating whether the datafield contents are valid
-     */
-    public function isValid()
-    {
-        return parent::isValid()
-            && (!$this->getValue()
-                || (filter_var($this->getValue(), FILTER_VALIDATE_URL)
-                    && preg_match('%^(https?|ftp)://%', $this->getValue())));
-    }
-}
diff --git a/lib/classes/DataFieldLinkEntry.php b/lib/classes/DataFieldLinkEntry.php
new file mode 100644
index 0000000..702907f
--- /dev/null
+++ b/lib/classes/DataFieldLinkEntry.php
@@ -0,0 +1,54 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldLinkEntry extends DataFieldEntry
+{
+    protected $template = 'link.php';
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        if ($entities) {
+            return formatLinks($this->getValue());
+        }
+        return $this->getValue();
+    }
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($submitted_value)
+    {
+        if ($submitted_value === 'http://') {
+            $submitted_value = '';
+        }
+        $this->setValue($submitted_value);
+    }
+
+    /**
+     * Returns whether the datafield contents are valid
+     *
+     * @return boolean indicating whether the datafield contents are valid
+     */
+    public function isValid()
+    {
+        return parent::isValid()
+            && (!$this->getValue()
+                || (filter_var($this->getValue(), FILTER_VALIDATE_URL)
+                    && preg_match('%^(https?|ftp)://%', $this->getValue())));
+    }
+}
diff --git a/lib/classes/DataFieldPhoneEntry.class.php b/lib/classes/DataFieldPhoneEntry.class.php
deleted file mode 100644
index d3a0e70..0000000
--- a/lib/classes/DataFieldPhoneEntry.class.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldPhoneEntry extends DataFieldEntry
-{
-    protected $template = 'phone.php';
-
-    /**
-     * Returns the number of html fields this datafield uses for input.
-     *
-     * @return int representing the number of html fields
-     */
-    public function numberOfHTMLFields()
-    {
-        return 3;
-    }
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($value)
-    {
-        if (is_array($value)) {
-            $value = array_slice($value, 0, 3);
-            $value = implode("\n", $value);
-            $value = str_replace(' ', '', $value);
-
-            parent::setValueFromSubmit($value);
-        }
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        list($country, $area, $phone) = $this->getNumberParts();
-
-        if ($country || $area || $phone) {
-            if ($country) {
-                $country = "+$country";
-            }
-
-            return "$country $area $phone";
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        return parent::getHTML($name, $variables + [
-            'values' => $this->getNumberParts()
-        ]);
-    }
-
-    /**
-     * Checks if the datafield is empty (was not set)
-     *
-     * @return bool true if empty, else false
-     */
-    public function isEmpty()
-    {
-        return $this->getValue() == "\n\n";
-    }
-
-    /**
-     * Returns whether the datafield contents are valid
-     *
-     * @return boolean indicating whether the datafield contents are valid
-     */
-    public function isValid()
-    {
-        $value = trim($this->value);
-
-        if (!$value) {
-            return parent::isValid();
-        }
-
-        return parent::isValid()
-            && preg_match('/^([1-9]\d*)?\n[1-9]\d+\n[1-9]\d+(-\d+)?$/', $value);
-    }
-
-    /**
-     * Retturns the individual parts of the telephone number.
-     * The resulting array is always padded to contain at least
-     * three items.
-     *
-     * @return array containing the individual parts.
-     */
-    protected function getNumberParts()
-    {
-        $values = explode("\n", $this->value);
-
-        // pad values array to a size of 3 by inserting empty values from left
-        while (count($values) < 3) {
-            array_unshift($values, '');
-        }
-
-        return $values;
-    }
-}
-
diff --git a/lib/classes/DataFieldPhoneEntry.php b/lib/classes/DataFieldPhoneEntry.php
new file mode 100644
index 0000000..d3a0e70
--- /dev/null
+++ b/lib/classes/DataFieldPhoneEntry.php
@@ -0,0 +1,122 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldPhoneEntry extends DataFieldEntry
+{
+    protected $template = 'phone.php';
+
+    /**
+     * Returns the number of html fields this datafield uses for input.
+     *
+     * @return int representing the number of html fields
+     */
+    public function numberOfHTMLFields()
+    {
+        return 3;
+    }
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($value)
+    {
+        if (is_array($value)) {
+            $value = array_slice($value, 0, 3);
+            $value = implode("\n", $value);
+            $value = str_replace(' ', '', $value);
+
+            parent::setValueFromSubmit($value);
+        }
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        list($country, $area, $phone) = $this->getNumberParts();
+
+        if ($country || $area || $phone) {
+            if ($country) {
+                $country = "+$country";
+            }
+
+            return "$country $area $phone";
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        return parent::getHTML($name, $variables + [
+            'values' => $this->getNumberParts()
+        ]);
+    }
+
+    /**
+     * Checks if the datafield is empty (was not set)
+     *
+     * @return bool true if empty, else false
+     */
+    public function isEmpty()
+    {
+        return $this->getValue() == "\n\n";
+    }
+
+    /**
+     * Returns whether the datafield contents are valid
+     *
+     * @return boolean indicating whether the datafield contents are valid
+     */
+    public function isValid()
+    {
+        $value = trim($this->value);
+
+        if (!$value) {
+            return parent::isValid();
+        }
+
+        return parent::isValid()
+            && preg_match('/^([1-9]\d*)?\n[1-9]\d+\n[1-9]\d+(-\d+)?$/', $value);
+    }
+
+    /**
+     * Retturns the individual parts of the telephone number.
+     * The resulting array is always padded to contain at least
+     * three items.
+     *
+     * @return array containing the individual parts.
+     */
+    protected function getNumberParts()
+    {
+        $values = explode("\n", $this->value);
+
+        // pad values array to a size of 3 by inserting empty values from left
+        while (count($values) < 3) {
+            array_unshift($values, '');
+        }
+
+        return $values;
+    }
+}
+
diff --git a/lib/classes/DataFieldRadioEntry.class.php b/lib/classes/DataFieldRadioEntry.class.php
deleted file mode 100644
index 8699b69..0000000
--- a/lib/classes/DataFieldRadioEntry.class.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldRadioEntry extends DataFieldSelectboxEntry
-{
-    protected $template = 'radio.php';
-
-    /**
-     * Returns the number of html fields this datafield uses for input.
-     *
-     * @return int representing the number of html fields
-     */
-    public function numberOfHTMLFields()
-    {
-        return count($this->type_param);
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        return parent::getHTML($name, $variables + [
-            'type_param' => $this->type_param,
-            'is_assoc'   => $this->is_assoc_param
-        ]);
-    }
-}
diff --git a/lib/classes/DataFieldRadioEntry.php b/lib/classes/DataFieldRadioEntry.php
new file mode 100644
index 0000000..8699b69
--- /dev/null
+++ b/lib/classes/DataFieldRadioEntry.php
@@ -0,0 +1,39 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldRadioEntry extends DataFieldSelectboxEntry
+{
+    protected $template = 'radio.php';
+
+    /**
+     * Returns the number of html fields this datafield uses for input.
+     *
+     * @return int representing the number of html fields
+     */
+    public function numberOfHTMLFields()
+    {
+        return count($this->type_param);
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        return parent::getHTML($name, $variables + [
+            'type_param' => $this->type_param,
+            'is_assoc'   => $this->is_assoc_param
+        ]);
+    }
+}
diff --git a/lib/classes/DataFieldSelectboxEntry.class.php b/lib/classes/DataFieldSelectboxEntry.class.php
deleted file mode 100644
index 8ac1a3c..0000000
--- a/lib/classes/DataFieldSelectboxEntry.class.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldSelectboxEntry extends DataFieldEntry
-{
-    protected $template = 'selectbox.php';
-    protected $type_param;
-    protected $is_assoc_param = false;
-
-    /**
-     * Constructs this datafield
-     *
-     * @param DataField $datafield Underlying model
-     * @param String    $rangeID   Range id
-     * @param mixed     $value     Value
-     */
-    public function __construct(DataField $struct = null, $range_id = '', $value = null)
-    {
-        parent::__construct($struct, $range_id, $value);
-
-        list($values, $is_assoc) = $this->getParameters();
-        $this->is_assoc_param = $is_assoc;
-        $this->type_param     = $values;
-
-        if ($this->getValue() === null) {
-            reset($values);
-
-            if ($is_assoc) {
-                $this->setValue((string)key($values));
-            } else {
-                $this->setValue(current($values)); // first selectbox entry is default
-            }
-        }
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        $variables = array_merge([
-            'multiple'   => false,
-            'type_param' => $this->type_param,
-            'is_assoc'   => $this->is_assoc_param,
-        ], $variables);
-
-        return parent::getHTML($name, $variables);
-    }
-
-    /**
-     * Returns the individual type parameters.
-     *
-     * @return array containing the individual type parameters
-     */
-    public function getParameters()
-    {
-        $params = explode("\n", rtrim($this->model->typeparam));
-        $params = array_map('trim', $params);
-
-        $ret = [];
-        $is_assoc = false;
-
-        foreach ($params as $i => $p) {
-            if (mb_strpos($p, '=>') !== false) {
-                $is_assoc = true;
-
-                list($key, $value) = array_map('trim', explode('=>', $p, 2));
-                $ret[$key] = $value;
-            } else {
-                $ret[$i] = $p;
-            }
-        }
-        return [$ret, $is_assoc];
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        $value = $this->is_assoc_param
-               ? $this->type_param[$this->getValue()]
-               : $this->getValue();
-        return $entities ? htmlReady($value) : $value;
-    }
-}
diff --git a/lib/classes/DataFieldSelectboxEntry.php b/lib/classes/DataFieldSelectboxEntry.php
new file mode 100644
index 0000000..8ac1a3c
--- /dev/null
+++ b/lib/classes/DataFieldSelectboxEntry.php
@@ -0,0 +1,100 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldSelectboxEntry extends DataFieldEntry
+{
+    protected $template = 'selectbox.php';
+    protected $type_param;
+    protected $is_assoc_param = false;
+
+    /**
+     * Constructs this datafield
+     *
+     * @param DataField $datafield Underlying model
+     * @param String    $rangeID   Range id
+     * @param mixed     $value     Value
+     */
+    public function __construct(DataField $struct = null, $range_id = '', $value = null)
+    {
+        parent::__construct($struct, $range_id, $value);
+
+        list($values, $is_assoc) = $this->getParameters();
+        $this->is_assoc_param = $is_assoc;
+        $this->type_param     = $values;
+
+        if ($this->getValue() === null) {
+            reset($values);
+
+            if ($is_assoc) {
+                $this->setValue((string)key($values));
+            } else {
+                $this->setValue(current($values)); // first selectbox entry is default
+            }
+        }
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        $variables = array_merge([
+            'multiple'   => false,
+            'type_param' => $this->type_param,
+            'is_assoc'   => $this->is_assoc_param,
+        ], $variables);
+
+        return parent::getHTML($name, $variables);
+    }
+
+    /**
+     * Returns the individual type parameters.
+     *
+     * @return array containing the individual type parameters
+     */
+    public function getParameters()
+    {
+        $params = explode("\n", rtrim($this->model->typeparam));
+        $params = array_map('trim', $params);
+
+        $ret = [];
+        $is_assoc = false;
+
+        foreach ($params as $i => $p) {
+            if (mb_strpos($p, '=>') !== false) {
+                $is_assoc = true;
+
+                list($key, $value) = array_map('trim', explode('=>', $p, 2));
+                $ret[$key] = $value;
+            } else {
+                $ret[$i] = $p;
+            }
+        }
+        return [$ret, $is_assoc];
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        $value = $this->is_assoc_param
+               ? $this->type_param[$this->getValue()]
+               : $this->getValue();
+        return $entities ? htmlReady($value) : $value;
+    }
+}
diff --git a/lib/classes/DataFieldSelectboxMultipleEntry.class.php b/lib/classes/DataFieldSelectboxMultipleEntry.class.php
deleted file mode 100644
index 3abb373..0000000
--- a/lib/classes/DataFieldSelectboxMultipleEntry.class.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldSelectboxMultipleEntry extends DataFieldSelectboxEntry
-{
-    const SEPARATOR = '|';
-
-    /**
-     * Constructs this datafield
-     *
-     * @param DataField $datafield Underlying model
-     * @param String    $rangeID   Range id
-     * @param mixed     $value     Value
-     */
-    public function __construct(DataField $datafield = null, $rangeID = '', $value = null)
-    {
-        parent::__construct($datafield, $rangeID, $value);
-
-        if ($this->getValue() === null) {
-            $this->setValue('');
-        }
-    }
-
-    /**
-     * Returns the according input elements as html for this datafield
-     *
-     * @param String $name      Name prefix of the associated input
-     * @param Array  $variables Additional variables
-     * @return String containing the required html
-     */
-    public function getHTML($name = '', $variables = [])
-    {
-        return parent::getHTML($name, $variables + [
-            'multiple' => true,
-            'value'    => explode(self::SEPARATOR, $this->value)
-        ]);
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        $value = $this->getValue();
-        if ($value) {
-            $type_param = $this->type_param;
-
-            $mapper = 'trim';
-            if ($this->is_assoc_param) {
-                $mapper = function ($a) use ($type_param) {
-                    $a = trim($a);
-                    return $type_param[$a];
-                };
-            }
-
-            $value = explode(self::SEPARATOR, $value);
-            $value = array_map($mapper, $value);
-            $value = implode('; ', $value);
-        }
-        return $entities
-            ? htmlReady($value)
-            : $value;
-    }
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($value)
-    {
-        if (is_array($value)) {
-            $value = array_map('trim', $value);
-            $value = array_filter($value);
-            $value = array_unique($value);
-            $value = implode(self::SEPARATOR, $value);
-        } else {
-            $value = '';
-        }
-
-        parent::setValueFromSubmit($value);
-    }
-}
diff --git a/lib/classes/DataFieldSelectboxMultipleEntry.php b/lib/classes/DataFieldSelectboxMultipleEntry.php
new file mode 100644
index 0000000..3abb373
--- /dev/null
+++ b/lib/classes/DataFieldSelectboxMultipleEntry.php
@@ -0,0 +1,93 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldSelectboxMultipleEntry extends DataFieldSelectboxEntry
+{
+    const SEPARATOR = '|';
+
+    /**
+     * Constructs this datafield
+     *
+     * @param DataField $datafield Underlying model
+     * @param String    $rangeID   Range id
+     * @param mixed     $value     Value
+     */
+    public function __construct(DataField $datafield = null, $rangeID = '', $value = null)
+    {
+        parent::__construct($datafield, $rangeID, $value);
+
+        if ($this->getValue() === null) {
+            $this->setValue('');
+        }
+    }
+
+    /**
+     * Returns the according input elements as html for this datafield
+     *
+     * @param String $name      Name prefix of the associated input
+     * @param Array  $variables Additional variables
+     * @return String containing the required html
+     */
+    public function getHTML($name = '', $variables = [])
+    {
+        return parent::getHTML($name, $variables + [
+            'multiple' => true,
+            'value'    => explode(self::SEPARATOR, $this->value)
+        ]);
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        $value = $this->getValue();
+        if ($value) {
+            $type_param = $this->type_param;
+
+            $mapper = 'trim';
+            if ($this->is_assoc_param) {
+                $mapper = function ($a) use ($type_param) {
+                    $a = trim($a);
+                    return $type_param[$a];
+                };
+            }
+
+            $value = explode(self::SEPARATOR, $value);
+            $value = array_map($mapper, $value);
+            $value = implode('; ', $value);
+        }
+        return $entities
+            ? htmlReady($value)
+            : $value;
+    }
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($value)
+    {
+        if (is_array($value)) {
+            $value = array_map('trim', $value);
+            $value = array_filter($value);
+            $value = array_unique($value);
+            $value = implode(self::SEPARATOR, $value);
+        } else {
+            $value = '';
+        }
+
+        parent::setValueFromSubmit($value);
+    }
+}
diff --git a/lib/classes/DataFieldTextareaEntry.class.php b/lib/classes/DataFieldTextareaEntry.class.php
deleted file mode 100644
index a48be98..0000000
--- a/lib/classes/DataFieldTextareaEntry.class.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldTextareaEntry extends DataFieldEntry
-{
-    protected $template = 'textarea.php';
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        if ($entities) {
-            return htmlReady($this->getValue(), true, true);
-        }
-
-        return $this->getValue();
-    }
-}
diff --git a/lib/classes/DataFieldTextareaEntry.php b/lib/classes/DataFieldTextareaEntry.php
new file mode 100644
index 0000000..a48be98
--- /dev/null
+++ b/lib/classes/DataFieldTextareaEntry.php
@@ -0,0 +1,29 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldTextareaEntry extends DataFieldEntry
+{
+    protected $template = 'textarea.php';
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        if ($entities) {
+            return htmlReady($this->getValue(), true, true);
+        }
+
+        return $this->getValue();
+    }
+}
diff --git a/lib/classes/DataFieldTextareai18nEntry.class.php b/lib/classes/DataFieldTextareai18nEntry.class.php
deleted file mode 100644
index 9b6db40..0000000
--- a/lib/classes/DataFieldTextareai18nEntry.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * DataFieldTextareai18nEntry.php
- * Representation of datafields of type textarea with i18n support.
- *
- * 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.
- *
- * @author      Peter Thienel <pthienel@data-quest.de>
- * @copyright   2017 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.1
- *
- */
-class DataFieldTextareai18nEntry extends DataFieldI18NEntry
-{
-    protected $template = 'textareai18n.php';
-}
diff --git a/lib/classes/DataFieldTextareai18nEntry.php b/lib/classes/DataFieldTextareai18nEntry.php
new file mode 100644
index 0000000..9b6db40
--- /dev/null
+++ b/lib/classes/DataFieldTextareai18nEntry.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * DataFieldTextareai18nEntry.php
+ * Representation of datafields of type textarea with i18n support.
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <pthienel@data-quest.de>
+ * @copyright   2017 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.1
+ *
+ */
+class DataFieldTextareai18nEntry extends DataFieldI18NEntry
+{
+    protected $template = 'textareai18n.php';
+}
diff --git a/lib/classes/DataFieldTextlineEntry.class.php b/lib/classes/DataFieldTextlineEntry.class.php
deleted file mode 100644
index 6062ed1..0000000
--- a/lib/classes/DataFieldTextlineEntry.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldTextlineEntry extends DataFieldEntry
-{
-    protected $template = 'textline.php';
-}
diff --git a/lib/classes/DataFieldTextlineEntry.php b/lib/classes/DataFieldTextlineEntry.php
new file mode 100644
index 0000000..6062ed1
--- /dev/null
+++ b/lib/classes/DataFieldTextlineEntry.php
@@ -0,0 +1,14 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldTextlineEntry extends DataFieldEntry
+{
+    protected $template = 'textline.php';
+}
diff --git a/lib/classes/DataFieldTextlinei18nEntry.class.php b/lib/classes/DataFieldTextlinei18nEntry.class.php
deleted file mode 100644
index 9d1f344..0000000
--- a/lib/classes/DataFieldTextlinei18nEntry.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * DataFieldTextlinei18nEntry.php
- * Representation of datafields of type textline with i18n support.
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @copyright   2017 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.1
- *
- */
-class DataFieldTextlinei18nEntry extends DataFieldI18NEntry
-{
-    protected $template = 'textlinei18n.php';
-}
diff --git a/lib/classes/DataFieldTextlinei18nEntry.php b/lib/classes/DataFieldTextlinei18nEntry.php
new file mode 100644
index 0000000..9d1f344
--- /dev/null
+++ b/lib/classes/DataFieldTextlinei18nEntry.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * DataFieldTextlinei18nEntry.php
+ * Representation of datafields of type textline with i18n support.
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @copyright   2017 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.1
+ *
+ */
+class DataFieldTextlinei18nEntry extends DataFieldI18NEntry
+{
+    protected $template = 'textlinei18n.php';
+}
diff --git a/lib/classes/DataFieldTextmarkupEntry.class.php b/lib/classes/DataFieldTextmarkupEntry.class.php
deleted file mode 100644
index 50115b9..0000000
--- a/lib/classes/DataFieldTextmarkupEntry.class.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @author  Elmar Ludwig <elmar.ludwig@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldTextmarkupEntry extends DataFieldTextareaEntry
-{
-    protected $template = 'textmarkup.php';
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($submitted_value)
-    {
-        $this->setValue(Studip\Markup::purifyHtml($submitted_value));
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        if ($entities) {
-            return formatReady($this->getValue());
-        }
-
-        return $this->getValue();
-    }
-}
diff --git a/lib/classes/DataFieldTextmarkupEntry.php b/lib/classes/DataFieldTextmarkupEntry.php
new file mode 100644
index 0000000..50115b9
--- /dev/null
+++ b/lib/classes/DataFieldTextmarkupEntry.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @author  Elmar Ludwig <elmar.ludwig@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldTextmarkupEntry extends DataFieldTextareaEntry
+{
+    protected $template = 'textmarkup.php';
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($submitted_value)
+    {
+        $this->setValue(Studip\Markup::purifyHtml($submitted_value));
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        if ($entities) {
+            return formatReady($this->getValue());
+        }
+
+        return $this->getValue();
+    }
+}
diff --git a/lib/classes/DataFieldTextmarkupi18nEntry.class.php b/lib/classes/DataFieldTextmarkupi18nEntry.class.php
deleted file mode 100644
index 0b3d7e6..0000000
--- a/lib/classes/DataFieldTextmarkupi18nEntry.class.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * DataFieldTextmarkup18nEntry.php
- * Representation of datafields of type textmarkup with i18n support.
- *
- * 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.
- *
- * @author      Peter Thienel <pthienel@data-quest.de>
- * @copyright   2017 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.1
- *
- */
-class DataFieldTextmarkupi18nEntry extends DataFieldTextareai18nEntry
-{
-    protected $template = 'textmarkupi18n.php';
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($submitted_value)
-    {
-        array_walk($submitted_value, 'Studip\Markup::purifyHtml');
-        parent::setValueFromSubmit($submitted_value);
-    }
-
-    /**
-     * Returns the display/rendered value of this datafield
-     *
-     * @param bool $entities Should html entities be encoded (defaults to true)
-     * @return String containg the rendered value
-     */
-    public function getDisplayValue($entities = true)
-    {
-        if ($entities) {
-            return formatReady($this->getValue());
-        }
-
-        return $this->getValue();
-    }
-}
diff --git a/lib/classes/DataFieldTextmarkupi18nEntry.php b/lib/classes/DataFieldTextmarkupi18nEntry.php
new file mode 100644
index 0000000..0b3d7e6
--- /dev/null
+++ b/lib/classes/DataFieldTextmarkupi18nEntry.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * DataFieldTextmarkup18nEntry.php
+ * Representation of datafields of type textmarkup with i18n support.
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <pthienel@data-quest.de>
+ * @copyright   2017 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.1
+ *
+ */
+class DataFieldTextmarkupi18nEntry extends DataFieldTextareai18nEntry
+{
+    protected $template = 'textmarkupi18n.php';
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($submitted_value)
+    {
+        array_walk($submitted_value, 'Studip\Markup::purifyHtml');
+        parent::setValueFromSubmit($submitted_value);
+    }
+
+    /**
+     * Returns the display/rendered value of this datafield
+     *
+     * @param bool $entities Should html entities be encoded (defaults to true)
+     * @return String containg the rendered value
+     */
+    public function getDisplayValue($entities = true)
+    {
+        if ($entities) {
+            return formatReady($this->getValue());
+        }
+
+        return $this->getValue();
+    }
+}
diff --git a/lib/classes/DataFieldTimeEntry.class.php b/lib/classes/DataFieldTimeEntry.class.php
deleted file mode 100644
index 96e5835..0000000
--- a/lib/classes/DataFieldTimeEntry.class.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter007: TEST
-
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author  Marcus Lunzenauer <mlunzena@uos.de>
- * @author  Martin Gieseking  <mgieseki@uos.de>
- * @license GPL2 or any later version
- */
-class DataFieldTimeEntry extends DataFieldEntry
-{
-    protected $template = 'time.php';
-
-    /**
-     * Sets the value from a post request
-     *
-     * @param mixed $submitted_value The value from request
-     */
-    public function setValueFromSubmit($value)
-    {
-        if ($value) {
-            parent::setValueFromSubmit($value);
-        }
-    }
-
-    /**
-     * Checks if the datafield is empty (was not set)
-     *
-     * @return bool true if empty, else false
-     */
-    public function isEmpty()
-    {
-        return $this->getValue() == ':';
-    }
-
-    /**
-     * Returns whether the datafield contents are valid
-     *
-     * @return boolean indicating whether the datafield contents are valid
-     */
-    public function isValid()
-    {
-        $parts = explode(':', $this->value);
-
-        return parent::isValid()
-            && $parts[0] >= 0 && $parts[0] <= 24
-            && $parts[1] >= 0 && $parts[1] <= 59;
-    }
-}
diff --git a/lib/classes/DataFieldTimeEntry.php b/lib/classes/DataFieldTimeEntry.php
new file mode 100644
index 0000000..96e5835
--- /dev/null
+++ b/lib/classes/DataFieldTimeEntry.php
@@ -0,0 +1,50 @@
+<?php
+# Lifter002: DONE
+# Lifter007: TEST
+
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @author  Marcus Lunzenauer <mlunzena@uos.de>
+ * @author  Martin Gieseking  <mgieseki@uos.de>
+ * @license GPL2 or any later version
+ */
+class DataFieldTimeEntry extends DataFieldEntry
+{
+    protected $template = 'time.php';
+
+    /**
+     * Sets the value from a post request
+     *
+     * @param mixed $submitted_value The value from request
+     */
+    public function setValueFromSubmit($value)
+    {
+        if ($value) {
+            parent::setValueFromSubmit($value);
+        }
+    }
+
+    /**
+     * Checks if the datafield is empty (was not set)
+     *
+     * @return bool true if empty, else false
+     */
+    public function isEmpty()
+    {
+        return $this->getValue() == ':';
+    }
+
+    /**
+     * Returns whether the datafield contents are valid
+     *
+     * @return boolean indicating whether the datafield contents are valid
+     */
+    public function isValid()
+    {
+        $parts = explode(':', $this->value);
+
+        return parent::isValid()
+            && $parts[0] >= 0 && $parts[0] <= 24
+            && $parts[1] >= 0 && $parts[1] <= 59;
+    }
+}
diff --git a/lib/classes/DatabaseObject.class.php b/lib/classes/DatabaseObject.class.php
deleted file mode 100644
index 2258adb..0000000
--- a/lib/classes/DatabaseObject.class.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-# Lifter002: TEST
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// DatabaseObject.class.php
-//
-// Class to provide basic properties of an DatabseObject in Stud.IP
-//
-// Copyright (c) 2003 Alexander Willner <mail@AlexanderWillner.de>
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-# Define all required constants ============================================= #
-/**
- * @const INSTANCEOF_STUDIPOBJECT Is instance of a studip object
- * @access public
- */
-define("INSTANCEOF_DATABASEOBJECT", "DatabaseObject");
-# =========================================================================== #
-
-
-/**
- * DatabaseObject.class.php
- *
- * Class to provide basic properties of an DatabaseObject in Stud.IP
- *
- * @author      Alexander Willner <mail@alexanderwillner.de>
- * @copyright   2003 Stud.IP-Project
- * @access      public
- * @package     studip_core
- * @modulegroup core
- */
-class DatabaseObject extends AuthorObject
-{
-    public $authorID;
-    public $objectID;
-    public $rangeID;
-
-# Define constructor and destructor ========================================= #
-    /**
-     * Constructor
-     *
-     * @access   public
-     */
-    public function __construct()
-    {
-        /* For good OOP: Call constructor ------------------------------------- */
-        parent::__construct();
-        $this->instanceof = INSTANCEOF_DATABASEOBJECT;
-        /* -------------------------------------------------------------------- */
-    }
-# =========================================================================== #
-
-
-# Define public functions =================================================== #
-    /**
-     * Gets the objectID
-     *
-     * @access  public
-     * @return  string  The objectID
-     */
-    public function getObjectID()
-    {
-        return $this->objectID;
-    }
-
-    /**
-     * Sets the objectID
-     *
-     * @access  public
-     *
-     * @param   String $objectID The object ID
-     */
-    public function setObjectID($objectID)
-    {
-        if (empty ($objectID))
-            $this->throwError(1, _("Die ObjectID darf nicht leer sein."));
-        else
-            $this->objectID = $objectID;
-    }
-
-    /**
-     * Gets the authorID
-     *
-     * @access  public
-     * @return  string  The authorID
-     */
-    public function getAuthorID()
-    {
-        return $this->authorID;
-    }
-
-    /**
-     * Sets the authorID
-     *
-     * @access  public
-     *
-     * @param   String $authorID The author ID
-     */
-    public function setAuthorID($authorID)
-    {
-        if (empty ($authorID))
-            $this->throwError(1, _("Die AuthorID darf nicht leer sein."));
-        else
-            $this->authorID = $authorID;
-    }
-
-    /**
-     * Gets the rangeID
-     *
-     * @access  public
-     * @return  string  The rangeID
-     */
-    public function getRangeID()
-    {
-        return $this->objectID;
-    }
-
-    /**
-     * Sets the rangeID
-     *
-     * @access  public
-     *
-     * @param   String $rangeID The range ID
-     */
-    public function setRangeID($rangeID)
-    {
-        if (empty ($rangeID))
-            $this->throwError(1, _("Die RangeID darf nicht leer sein."));
-        else
-            $this->rangeID = $rangeID;
-    }
-
-}
diff --git a/lib/classes/DatabaseObject.php b/lib/classes/DatabaseObject.php
new file mode 100644
index 0000000..2258adb
--- /dev/null
+++ b/lib/classes/DatabaseObject.php
@@ -0,0 +1,149 @@
+<?php
+# Lifter002: TEST
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// DatabaseObject.class.php
+//
+// Class to provide basic properties of an DatabseObject in Stud.IP
+//
+// Copyright (c) 2003 Alexander Willner <mail@AlexanderWillner.de>
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+# Define all required constants ============================================= #
+/**
+ * @const INSTANCEOF_STUDIPOBJECT Is instance of a studip object
+ * @access public
+ */
+define("INSTANCEOF_DATABASEOBJECT", "DatabaseObject");
+# =========================================================================== #
+
+
+/**
+ * DatabaseObject.class.php
+ *
+ * Class to provide basic properties of an DatabaseObject in Stud.IP
+ *
+ * @author      Alexander Willner <mail@alexanderwillner.de>
+ * @copyright   2003 Stud.IP-Project
+ * @access      public
+ * @package     studip_core
+ * @modulegroup core
+ */
+class DatabaseObject extends AuthorObject
+{
+    public $authorID;
+    public $objectID;
+    public $rangeID;
+
+# Define constructor and destructor ========================================= #
+    /**
+     * Constructor
+     *
+     * @access   public
+     */
+    public function __construct()
+    {
+        /* For good OOP: Call constructor ------------------------------------- */
+        parent::__construct();
+        $this->instanceof = INSTANCEOF_DATABASEOBJECT;
+        /* -------------------------------------------------------------------- */
+    }
+# =========================================================================== #
+
+
+# Define public functions =================================================== #
+    /**
+     * Gets the objectID
+     *
+     * @access  public
+     * @return  string  The objectID
+     */
+    public function getObjectID()
+    {
+        return $this->objectID;
+    }
+
+    /**
+     * Sets the objectID
+     *
+     * @access  public
+     *
+     * @param   String $objectID The object ID
+     */
+    public function setObjectID($objectID)
+    {
+        if (empty ($objectID))
+            $this->throwError(1, _("Die ObjectID darf nicht leer sein."));
+        else
+            $this->objectID = $objectID;
+    }
+
+    /**
+     * Gets the authorID
+     *
+     * @access  public
+     * @return  string  The authorID
+     */
+    public function getAuthorID()
+    {
+        return $this->authorID;
+    }
+
+    /**
+     * Sets the authorID
+     *
+     * @access  public
+     *
+     * @param   String $authorID The author ID
+     */
+    public function setAuthorID($authorID)
+    {
+        if (empty ($authorID))
+            $this->throwError(1, _("Die AuthorID darf nicht leer sein."));
+        else
+            $this->authorID = $authorID;
+    }
+
+    /**
+     * Gets the rangeID
+     *
+     * @access  public
+     * @return  string  The rangeID
+     */
+    public function getRangeID()
+    {
+        return $this->objectID;
+    }
+
+    /**
+     * Sets the rangeID
+     *
+     * @access  public
+     *
+     * @param   String $rangeID The range ID
+     */
+    public function setRangeID($rangeID)
+    {
+        if (empty ($rangeID))
+            $this->throwError(1, _("Die RangeID darf nicht leer sein."));
+        else
+            $this->rangeID = $rangeID;
+    }
+
+}
diff --git a/lib/classes/DateFormatter.class.php b/lib/classes/DateFormatter.class.php
deleted file mode 100644
index 5f7c558..0000000
--- a/lib/classes/DateFormatter.class.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * DateFormater.class.php - Handles the formatting of one date and associated rooms.
- *
- * 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.
- *
- * @author      sbrummer <soenke.brummerloh@uni-osnabrueck.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * Formates one SingleDate object or a series of SingleDate objects into a nice format.
- */
-class DateFormatter {
-    /**
-     * @var array holds the dates use for formatting
-     */
-    private $dates;
-
-    /**
-     * @var string holds the return-type, may be int or string
-     */
-    private $return_mode;
-
-    /**
-     * @param $dates an array with an array of SingleDate objects.
-     * @param string $return_mode expected values are 'int', 'string' and 'export'. The default value is 'string'.
-     * @return void
-     */
-    private function __construct($dates, $return_mode = 'string')
-    {
-        $this->dates = $dates;
-        $this->return_mode = $return_mode;
-    }
-
-    /**
-     * Formats one single date into a nice format.
-     * @static
-     * @param $date SingleDate object
-     * @param string $return_mode expected values are 'int', 'string' and 'export'. The default value is 'string'.
-     * @return string
-     */
-    public static function formatDateAndRoom($date, $return_mode = 'string')
-    {
-        $dates = DateFormatter::wrapDateWithArray($date);
-        return DateFormatter::formatDateWithAllRooms($dates, $return_mode);
-    }
-
-    /**
-     * Formats a series of SingleDate objects into a nice format. The dates parameter is an array of dates.
-     * The array has to have the key 'termin' with an array of SingleDate objects as value.
-     * @static
-     * @param  $dates an array with an array of SingleDate objects
-     * @param string $return_mode expected values are 'int', 'string' and 'export'. The default value is 'string'.
-     * @return string
-     */
-    public static function formatDateWithAllRooms($dates, $return_mode = 'string')
-    {
-        $dateFormatter = new DateFormatter($dates, $return_mode);
-        return $dateFormatter->internalFormatDateWithAllRooms();
-    }
-
-    private static function wrapDateWithArray($date)
-    {
-        $dates = [];
-        $dates['termin'] = [$date];
-        return $dates;
-    }
-
-    private function internalFormatDateWithAllRooms()
-    {
-        $dateWithRooms = '';
-        if ($this->dates['termin']) {
-            // if we have multiple rooms at the same time we display them all
-            foreach ($this->dates['termin'] as $num => $termin_id) {
-                $date = new SingleDate($termin_id);
-
-                // if we want an int and format the date ourself
-                if ($this->return_mode == 'int') {
-                    return $date->getStartTime();
-                }
-
-                $isFirstDate = ($num == 0);
-                if ($isFirstDate) {
-                    $dateWithRooms = $this->internalFormatDateAndRoom($date);
-                } else {
-                    $dateWithRooms .= ', ' . $this->formatRoom($date);
-                }
-            }
-        }
-        return $dateWithRooms;
-    }
-
-    private function internalFormatDateAndRoom($date)
-    {
-        $ret = $this->formatDate($date);
-
-        if ($this->return_mode != 'int') {
-            $formatedRooms = $this->formatRoom($date);
-            if ($formatedRooms) {
-                $ret .= ', ';
-                $ret .= _("Ort:") . ' ';
-                $ret .= $formatedRooms;
-            }
-        }
-
-        return $ret;
-    }
-
-    private function formatDate($date)
-    {
-        if ($this->return_mode == 'int') {
-            return $date->getStartTime();
-        }
-        else {
-            return $date->toString();
-        }
-    }
-
-    private function formatRoom($date)
-    {
-        if ($this->return_mode == 'int') {
-            return '';
-        }
-        else {
-            return $this->formatLocationText($date);
-        }
-    }
-
-    private function formatLocationText($date)
-    {
-        if ($this->hasResource($date)) {
-            $resObj = Resource::find($date->getResourceID());
-            return $this->generateLocationTextFromResourceObject($resObj);
-        } else if ($this->hasFreeRoomText($date)) {
-            return $this->generateLocationTextFromFreeRoomText($date);
-        } else {
-            return '';
-        }
-    }
-
-    private function generateLocationTextFromResourceObject($resObj)
-    {
-        if ($resObj) {
-            if ($this->return_mode == 'string') {
-                return '<a href="' . $resObj->getActionLink() . '" data-dialog="1">'
-                    . htmlReady($resObj->name)
-                    . '</a>';
-            }
-            else {
-                return htmlReady($resObj->name);
-            }
-        }
-        return '';
-    }
-
-    private function generateLocationTextFromFreeRoomText($date)
-    {
-        return '(' . htmlReady($date->getFreeRoomText()) . ')';
-    }
-
-    private function hasResource($date)
-    {
-        return $date && $date->getResourceID();
-    }
-
-    private function hasFreeRoomText($date)
-    {
-        return $date && $date->getFreeRoomText();
-    }
-}
diff --git a/lib/classes/DateFormatter.php b/lib/classes/DateFormatter.php
new file mode 100644
index 0000000..5f7c558
--- /dev/null
+++ b/lib/classes/DateFormatter.php
@@ -0,0 +1,176 @@
+<?php
+# Lifter010: TODO
+/**
+ * DateFormater.class.php - Handles the formatting of one date and associated rooms.
+ *
+ * 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.
+ *
+ * @author      sbrummer <soenke.brummerloh@uni-osnabrueck.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * Formates one SingleDate object or a series of SingleDate objects into a nice format.
+ */
+class DateFormatter {
+    /**
+     * @var array holds the dates use for formatting
+     */
+    private $dates;
+
+    /**
+     * @var string holds the return-type, may be int or string
+     */
+    private $return_mode;
+
+    /**
+     * @param $dates an array with an array of SingleDate objects.
+     * @param string $return_mode expected values are 'int', 'string' and 'export'. The default value is 'string'.
+     * @return void
+     */
+    private function __construct($dates, $return_mode = 'string')
+    {
+        $this->dates = $dates;
+        $this->return_mode = $return_mode;
+    }
+
+    /**
+     * Formats one single date into a nice format.
+     * @static
+     * @param $date SingleDate object
+     * @param string $return_mode expected values are 'int', 'string' and 'export'. The default value is 'string'.
+     * @return string
+     */
+    public static function formatDateAndRoom($date, $return_mode = 'string')
+    {
+        $dates = DateFormatter::wrapDateWithArray($date);
+        return DateFormatter::formatDateWithAllRooms($dates, $return_mode);
+    }
+
+    /**
+     * Formats a series of SingleDate objects into a nice format. The dates parameter is an array of dates.
+     * The array has to have the key 'termin' with an array of SingleDate objects as value.
+     * @static
+     * @param  $dates an array with an array of SingleDate objects
+     * @param string $return_mode expected values are 'int', 'string' and 'export'. The default value is 'string'.
+     * @return string
+     */
+    public static function formatDateWithAllRooms($dates, $return_mode = 'string')
+    {
+        $dateFormatter = new DateFormatter($dates, $return_mode);
+        return $dateFormatter->internalFormatDateWithAllRooms();
+    }
+
+    private static function wrapDateWithArray($date)
+    {
+        $dates = [];
+        $dates['termin'] = [$date];
+        return $dates;
+    }
+
+    private function internalFormatDateWithAllRooms()
+    {
+        $dateWithRooms = '';
+        if ($this->dates['termin']) {
+            // if we have multiple rooms at the same time we display them all
+            foreach ($this->dates['termin'] as $num => $termin_id) {
+                $date = new SingleDate($termin_id);
+
+                // if we want an int and format the date ourself
+                if ($this->return_mode == 'int') {
+                    return $date->getStartTime();
+                }
+
+                $isFirstDate = ($num == 0);
+                if ($isFirstDate) {
+                    $dateWithRooms = $this->internalFormatDateAndRoom($date);
+                } else {
+                    $dateWithRooms .= ', ' . $this->formatRoom($date);
+                }
+            }
+        }
+        return $dateWithRooms;
+    }
+
+    private function internalFormatDateAndRoom($date)
+    {
+        $ret = $this->formatDate($date);
+
+        if ($this->return_mode != 'int') {
+            $formatedRooms = $this->formatRoom($date);
+            if ($formatedRooms) {
+                $ret .= ', ';
+                $ret .= _("Ort:") . ' ';
+                $ret .= $formatedRooms;
+            }
+        }
+
+        return $ret;
+    }
+
+    private function formatDate($date)
+    {
+        if ($this->return_mode == 'int') {
+            return $date->getStartTime();
+        }
+        else {
+            return $date->toString();
+        }
+    }
+
+    private function formatRoom($date)
+    {
+        if ($this->return_mode == 'int') {
+            return '';
+        }
+        else {
+            return $this->formatLocationText($date);
+        }
+    }
+
+    private function formatLocationText($date)
+    {
+        if ($this->hasResource($date)) {
+            $resObj = Resource::find($date->getResourceID());
+            return $this->generateLocationTextFromResourceObject($resObj);
+        } else if ($this->hasFreeRoomText($date)) {
+            return $this->generateLocationTextFromFreeRoomText($date);
+        } else {
+            return '';
+        }
+    }
+
+    private function generateLocationTextFromResourceObject($resObj)
+    {
+        if ($resObj) {
+            if ($this->return_mode == 'string') {
+                return '<a href="' . $resObj->getActionLink() . '" data-dialog="1">'
+                    . htmlReady($resObj->name)
+                    . '</a>';
+            }
+            else {
+                return htmlReady($resObj->name);
+            }
+        }
+        return '';
+    }
+
+    private function generateLocationTextFromFreeRoomText($date)
+    {
+        return '(' . htmlReady($date->getFreeRoomText()) . ')';
+    }
+
+    private function hasResource($date)
+    {
+        return $date && $date->getResourceID();
+    }
+
+    private function hasFreeRoomText($date)
+    {
+        return $date && $date->getFreeRoomText();
+    }
+}
diff --git a/lib/classes/DbSnapshot.class.php b/lib/classes/DbSnapshot.class.php
deleted file mode 100644
index dfb4f89..0000000
--- a/lib/classes/DbSnapshot.class.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// DbSnapshot.class.php
-// Class to provide snapshots of mysql result sets
-// Uses PHPLib DB Abstraction
-// Copyright (c) 2002 André Noack <andre.noack@gmx.net>
-// +---------------------------------------------------------------------------+
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or 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.
-// +---------------------------------------------------------------------------+
-
-
-/**
- * Class to provide snapshots of mysql result sets
- *
- * Uses DB abstraction layer of PHPLib
- *
- * @access   public
- * @author   André Noack <andre.noack@gmx.net>
- * @package  DBTools
- **/
-class DbSnapshot
-{
-
-    /**
-     * the used db abstraction class
-     *
-     *
-     * @access   private
-     * @var      string $DbClass
-     */
-    var $DbClass = "DB_Sql";
-    /**
-     * the used db result set
-     *
-     *
-     * @access   private
-     * @var      object DB_Sql   $dbResult
-     */
-    var $dbResult = null;
-    /**
-     * array to store the result set
-     *
-     *
-     * @access   private
-     * @var      array $result
-     */
-    var $result = [];
-    /**
-     * array to store metadata oh the result set
-     *
-     *
-     * @access   private
-     * @var      array $metaData
-     */
-    var $metaData = [];
-    /**
-     * the number of fields in the result set
-     *
-     *
-     * @access   public
-     * @var      integer $numFields
-     */
-    var $numFields = 0;
-    /**
-     * the number of rows in the result set
-     *
-     *
-     * @access   public
-     * @var      integer $numRows
-     */
-    var $numRows = 0;
-    /**
-     * the internal row pointer
-     *
-     *
-     * @access   private
-     * @var      mixed $pos
-     */
-    var $pos = false;
-    /**
-     * turn on/off debugging
-     *
-     *
-     * @access   public
-     * @var      boolean $debug
-     */
-    var $debug = false;
-
-    /**
-     * Constructor
-     *
-     * Pass instance of DbClass or nothing to specify result set later
-     *
-     * @access   public
-     *
-     * @param    object DB_Sql   $dbresult
-     */
-    public function __construct($dbresult = null)
-    {
-        if (is_object($dbresult)) {
-            $this->dbResult = $dbresult;
-            $this->getSnapshot();
-        }
-
-    }
-
-    function isDbResult()
-    {
-        if (!is_subclass_of($this->dbResult, $this->DbClass))
-            $this->halt("Result set has wrong type!");
-        if (!$this->dbResult->query_id())
-            $this->halt("No result set (missing query?)");
-
-        return true;
-    }
-
-    public function getSnapshot()
-    {
-        if ($this->isDbResult()) {
-            $this->numFields = $this->dbResult->num_fields();
-            $this->numRows   = $this->dbResult->num_rows();
-            $this->metaData  = $this->dbResult->metadata();
-            $this->result    = [];
-            while ($this->dbResult->next_record()) {
-                $this->result[] = $this->dbResult->Record;
-            }
-            unset($this->dbResult);
-            $this->pos = false;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public function nextRow()
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-        if ($this->pos === false) {
-            $this->pos = 0;
-
-            return true;
-        }
-        if (++$this->pos < $this->numRows)
-            return true;
-        else
-            return false;
-    }
-
-    public function resetPos()
-    {
-        $this->pos = false;
-    }
-
-    public function isField($name)
-    {
-        for ($i = 0; $i < $this->numFields; ++$i) {
-            if ($name == $this->metaData[$i]['name']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function getRow($row = false)
-    {
-        if (!$row === false AND !$this->result[$row])
-            $this->halt("Snapshot has only " . ($this->numRows - 1) . " rows!");
-
-        return ($row === false) ? $this->result[$this->pos] : $this->result[$row];
-    }
-
-    public function getFieldList()
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-        $ret = [];
-        for ($i = 0; $i < $this->numFields; ++$i) {
-            $ret[] = $this->metaData[$i]['name'];
-        }
-
-        return $ret;
-    }
-
-    public function getField($field = 0)
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-
-        return ($this->pos === false) ? false : $this->result[$this->pos][$field];
-    }
-
-    public function getRows($fieldname = 0)
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-        $ret = [];
-        for ($i = 0; $i < $this->numRows; ++$i) {
-            $ret[] = $this->result[$i][$fieldname];
-        }
-
-        return $ret;
-    }
-
-    public function getDistinctRows($fieldname)
-    {
-        if (!$this->isField($fieldname))
-            $this->halt("Field: $fieldname not found in result set!");
-        $ret = [];
-        for ($i = 0; $i < $this->numRows; ++$i) {
-            $ret[$this->result[$i][$fieldname]]        = $this->result[$i];
-            $ret[$this->result[$i][$fieldname]]['row'] = $i;
-        }
-
-        return $ret;
-    }
-
-    public function sortRows($fieldname = 0, $order = "ASC", $stype = false)
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-        $sortfields = $this->getRows($fieldname);
-        if ($stype !== false) {
-            $sortfunc = ($order == "ASC") ? "asort" : "arsort";
-            $sortfunc($sortfields, $stype);
-        } else {
-            uasort($sortfields, function ($a,$b) {
-                $a = mb_strtolower($a);
-                $a = str_replace('ä', 'ae', $a);
-                $a = str_replace('ö', 'oe', $a);
-                $a = str_replace('ü', 'ue', $a);
-
-                $b = mb_strtolower($b);
-                $b = str_replace('ä', 'ae', $b);
-                $b = str_replace('ö', 'oe', $b);
-                $b = str_replace('ü', 'ue', $b);
-
-                return strnatcasecmp($a, $b);
-            });
-            if ($order == "DESC") {
-                $sortfields = array_reverse($sortfields, true);
-            }
-        }
-        $sortresult = [];
-        foreach ($sortfields as $key => $value) {
-            $sortresult[] = $this->result[$key];
-        }
-        $this->result = $sortresult;
-        $this->resetPos();
-
-        return true;
-    }
-
-    public function searchFields($fieldname, $searchstr)
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-        $ret        = false;
-        $sortfields = $this->getRows($fieldname);
-        foreach ($sortfields as $key => $value) {
-            if (preg_match($searchstr, $value)) {
-                $ret       = true;
-                $this->pos = $key;
-                break;
-            }
-        }
-
-        return $ret;
-    }
-
-    public function getGroupedResult($group_by_field, $fields_to_group = null)
-    {
-        if (!$this->numRows)
-            $this->halt("No snapshot available or empty result!");
-        $fieldlist = $this->getFieldList();
-        if (!in_array($group_by_field, $fieldlist))
-            $this->halt("group_by_field not found in result set!");
-        if (is_array($fields_to_group))
-            $fieldlist = $fields_to_group;
-        $num_fields = count($fieldlist);
-        $ret        = [];
-        for ($i = 0; $i < $this->numRows; ++$i) {
-            for ($j = 0; $j < $num_fields; ++$j) {
-                if ($fieldlist[$j] != $group_by_field) {
-                    if (empty($ret[$this->result[$i][$group_by_field]][$fieldlist[$j]][$this->result[$i][$fieldlist[$j]]])) {
-                        $ret[$this->result[$i][$group_by_field]][$fieldlist[$j]][$this->result[$i][$fieldlist[$j]]] = 0;
-                    }
-                    ++$ret[$this->result[$i][$group_by_field]][$fieldlist[$j]][$this->result[$i][$fieldlist[$j]]];
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    public function mergeSnapshot($m_snap, $key_field = false, $mode = "ADD")
-    {
-        if ($mode == "ADD") {
-            for ($i = 0; $i < $m_snap->numRows; ++$i) {
-                $this->result[] = $m_snap->result[$i];
-            }
-        } elseif ($mode == "AND") {
-            if (!$this->numRows || !$m_snap->numRows) {
-                $this->result = [];
-            } elseif ($m_snap->numRows) {
-                $m_result = $m_snap->getDistinctRows($key_field);
-                for ($i = 0; $i < $this->numRows; ++$i) {
-                    if (!($m_result[$this->result[$i][$key_field]] && $this->result[$i][$key_field])) {
-                        unset($this->result[$i]);
-                    }
-                }
-            }
-        } elseif ($mode == "OR") {
-            if (!$this->numRows) {
-                $this->result = $m_snap->result;
-            } elseif ($m_snap->numRows) {
-                $result = $this->getDistinctRows($key_field);
-                for ($i = 0; $i < $m_snap->numRows; ++$i) {
-                    if (empty($result[$m_snap->result[$i][$key_field]])) {
-                        $this->result[] = $m_snap->result[$i];
-                    }
-                }
-            }
-        }
-        $this->result  = array_merge([], (array)$this->result);
-        $this->numRows = count($this->result);
-        $this->resetPos();
-
-        return $this->numRows;
-    }
-
-    /**
-     * print error message and exit script
-     *
-     * @access   private
-     *
-     * @param    string $msg the message to print
-     */
-    public function halt($msg)
-    {
-        echo "<hr>$msg<hr>";
-        if ($this->debug) {
-            echo "<pre>";
-            print_r($this);
-            echo "</pre>";
-            die;
-        }
-
-    }
-}
-
-?>
diff --git a/lib/classes/DbSnapshot.php b/lib/classes/DbSnapshot.php
new file mode 100644
index 0000000..dfb4f89
--- /dev/null
+++ b/lib/classes/DbSnapshot.php
@@ -0,0 +1,370 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// DbSnapshot.class.php
+// Class to provide snapshots of mysql result sets
+// Uses PHPLib DB Abstraction
+// Copyright (c) 2002 André Noack <andre.noack@gmx.net>
+// +---------------------------------------------------------------------------+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or 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.
+// +---------------------------------------------------------------------------+
+
+
+/**
+ * Class to provide snapshots of mysql result sets
+ *
+ * Uses DB abstraction layer of PHPLib
+ *
+ * @access   public
+ * @author   André Noack <andre.noack@gmx.net>
+ * @package  DBTools
+ **/
+class DbSnapshot
+{
+
+    /**
+     * the used db abstraction class
+     *
+     *
+     * @access   private
+     * @var      string $DbClass
+     */
+    var $DbClass = "DB_Sql";
+    /**
+     * the used db result set
+     *
+     *
+     * @access   private
+     * @var      object DB_Sql   $dbResult
+     */
+    var $dbResult = null;
+    /**
+     * array to store the result set
+     *
+     *
+     * @access   private
+     * @var      array $result
+     */
+    var $result = [];
+    /**
+     * array to store metadata oh the result set
+     *
+     *
+     * @access   private
+     * @var      array $metaData
+     */
+    var $metaData = [];
+    /**
+     * the number of fields in the result set
+     *
+     *
+     * @access   public
+     * @var      integer $numFields
+     */
+    var $numFields = 0;
+    /**
+     * the number of rows in the result set
+     *
+     *
+     * @access   public
+     * @var      integer $numRows
+     */
+    var $numRows = 0;
+    /**
+     * the internal row pointer
+     *
+     *
+     * @access   private
+     * @var      mixed $pos
+     */
+    var $pos = false;
+    /**
+     * turn on/off debugging
+     *
+     *
+     * @access   public
+     * @var      boolean $debug
+     */
+    var $debug = false;
+
+    /**
+     * Constructor
+     *
+     * Pass instance of DbClass or nothing to specify result set later
+     *
+     * @access   public
+     *
+     * @param    object DB_Sql   $dbresult
+     */
+    public function __construct($dbresult = null)
+    {
+        if (is_object($dbresult)) {
+            $this->dbResult = $dbresult;
+            $this->getSnapshot();
+        }
+
+    }
+
+    function isDbResult()
+    {
+        if (!is_subclass_of($this->dbResult, $this->DbClass))
+            $this->halt("Result set has wrong type!");
+        if (!$this->dbResult->query_id())
+            $this->halt("No result set (missing query?)");
+
+        return true;
+    }
+
+    public function getSnapshot()
+    {
+        if ($this->isDbResult()) {
+            $this->numFields = $this->dbResult->num_fields();
+            $this->numRows   = $this->dbResult->num_rows();
+            $this->metaData  = $this->dbResult->metadata();
+            $this->result    = [];
+            while ($this->dbResult->next_record()) {
+                $this->result[] = $this->dbResult->Record;
+            }
+            unset($this->dbResult);
+            $this->pos = false;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function nextRow()
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+        if ($this->pos === false) {
+            $this->pos = 0;
+
+            return true;
+        }
+        if (++$this->pos < $this->numRows)
+            return true;
+        else
+            return false;
+    }
+
+    public function resetPos()
+    {
+        $this->pos = false;
+    }
+
+    public function isField($name)
+    {
+        for ($i = 0; $i < $this->numFields; ++$i) {
+            if ($name == $this->metaData[$i]['name']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function getRow($row = false)
+    {
+        if (!$row === false AND !$this->result[$row])
+            $this->halt("Snapshot has only " . ($this->numRows - 1) . " rows!");
+
+        return ($row === false) ? $this->result[$this->pos] : $this->result[$row];
+    }
+
+    public function getFieldList()
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+        $ret = [];
+        for ($i = 0; $i < $this->numFields; ++$i) {
+            $ret[] = $this->metaData[$i]['name'];
+        }
+
+        return $ret;
+    }
+
+    public function getField($field = 0)
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+
+        return ($this->pos === false) ? false : $this->result[$this->pos][$field];
+    }
+
+    public function getRows($fieldname = 0)
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+        $ret = [];
+        for ($i = 0; $i < $this->numRows; ++$i) {
+            $ret[] = $this->result[$i][$fieldname];
+        }
+
+        return $ret;
+    }
+
+    public function getDistinctRows($fieldname)
+    {
+        if (!$this->isField($fieldname))
+            $this->halt("Field: $fieldname not found in result set!");
+        $ret = [];
+        for ($i = 0; $i < $this->numRows; ++$i) {
+            $ret[$this->result[$i][$fieldname]]        = $this->result[$i];
+            $ret[$this->result[$i][$fieldname]]['row'] = $i;
+        }
+
+        return $ret;
+    }
+
+    public function sortRows($fieldname = 0, $order = "ASC", $stype = false)
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+        $sortfields = $this->getRows($fieldname);
+        if ($stype !== false) {
+            $sortfunc = ($order == "ASC") ? "asort" : "arsort";
+            $sortfunc($sortfields, $stype);
+        } else {
+            uasort($sortfields, function ($a,$b) {
+                $a = mb_strtolower($a);
+                $a = str_replace('ä', 'ae', $a);
+                $a = str_replace('ö', 'oe', $a);
+                $a = str_replace('ü', 'ue', $a);
+
+                $b = mb_strtolower($b);
+                $b = str_replace('ä', 'ae', $b);
+                $b = str_replace('ö', 'oe', $b);
+                $b = str_replace('ü', 'ue', $b);
+
+                return strnatcasecmp($a, $b);
+            });
+            if ($order == "DESC") {
+                $sortfields = array_reverse($sortfields, true);
+            }
+        }
+        $sortresult = [];
+        foreach ($sortfields as $key => $value) {
+            $sortresult[] = $this->result[$key];
+        }
+        $this->result = $sortresult;
+        $this->resetPos();
+
+        return true;
+    }
+
+    public function searchFields($fieldname, $searchstr)
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+        $ret        = false;
+        $sortfields = $this->getRows($fieldname);
+        foreach ($sortfields as $key => $value) {
+            if (preg_match($searchstr, $value)) {
+                $ret       = true;
+                $this->pos = $key;
+                break;
+            }
+        }
+
+        return $ret;
+    }
+
+    public function getGroupedResult($group_by_field, $fields_to_group = null)
+    {
+        if (!$this->numRows)
+            $this->halt("No snapshot available or empty result!");
+        $fieldlist = $this->getFieldList();
+        if (!in_array($group_by_field, $fieldlist))
+            $this->halt("group_by_field not found in result set!");
+        if (is_array($fields_to_group))
+            $fieldlist = $fields_to_group;
+        $num_fields = count($fieldlist);
+        $ret        = [];
+        for ($i = 0; $i < $this->numRows; ++$i) {
+            for ($j = 0; $j < $num_fields; ++$j) {
+                if ($fieldlist[$j] != $group_by_field) {
+                    if (empty($ret[$this->result[$i][$group_by_field]][$fieldlist[$j]][$this->result[$i][$fieldlist[$j]]])) {
+                        $ret[$this->result[$i][$group_by_field]][$fieldlist[$j]][$this->result[$i][$fieldlist[$j]]] = 0;
+                    }
+                    ++$ret[$this->result[$i][$group_by_field]][$fieldlist[$j]][$this->result[$i][$fieldlist[$j]]];
+                }
+            }
+        }
+
+        return $ret;
+    }
+
+    public function mergeSnapshot($m_snap, $key_field = false, $mode = "ADD")
+    {
+        if ($mode == "ADD") {
+            for ($i = 0; $i < $m_snap->numRows; ++$i) {
+                $this->result[] = $m_snap->result[$i];
+            }
+        } elseif ($mode == "AND") {
+            if (!$this->numRows || !$m_snap->numRows) {
+                $this->result = [];
+            } elseif ($m_snap->numRows) {
+                $m_result = $m_snap->getDistinctRows($key_field);
+                for ($i = 0; $i < $this->numRows; ++$i) {
+                    if (!($m_result[$this->result[$i][$key_field]] && $this->result[$i][$key_field])) {
+                        unset($this->result[$i]);
+                    }
+                }
+            }
+        } elseif ($mode == "OR") {
+            if (!$this->numRows) {
+                $this->result = $m_snap->result;
+            } elseif ($m_snap->numRows) {
+                $result = $this->getDistinctRows($key_field);
+                for ($i = 0; $i < $m_snap->numRows; ++$i) {
+                    if (empty($result[$m_snap->result[$i][$key_field]])) {
+                        $this->result[] = $m_snap->result[$i];
+                    }
+                }
+            }
+        }
+        $this->result  = array_merge([], (array)$this->result);
+        $this->numRows = count($this->result);
+        $this->resetPos();
+
+        return $this->numRows;
+    }
+
+    /**
+     * print error message and exit script
+     *
+     * @access   private
+     *
+     * @param    string $msg the message to print
+     */
+    public function halt($msg)
+    {
+        echo "<hr>$msg<hr>";
+        if ($this->debug) {
+            echo "<pre>";
+            print_r($this);
+            echo "</pre>";
+            die;
+        }
+
+    }
+}
+
+?>
diff --git a/lib/classes/DbView.class.php b/lib/classes/DbView.class.php
deleted file mode 100644
index 81e9b91..0000000
--- a/lib/classes/DbView.class.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// DbView.class.php
-// Class to provide simple Views and Prepared Statements
-// Mainly for MySql, may work with other DBs (not tested)
-// Copyright (c) 2002 André Noack <andre.noack@gmx.net>
-// +---------------------------------------------------------------------------+
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or 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.
-// +---------------------------------------------------------------------------+
-
-
-/**
- * Class to provide simple Views and Prepared Statements
- *
- * Only tested with MySql, needs MySql >= 3.23
- * Uses DB abstraction layer of PHPLib
- *
- * @access   public
- * @author   André Noack <andre.noack@gmx.net>
- * @package  DBTools
- */
-class DbView
-{
-    /**
-     * the processed list of queries
-     *
-     *
-     * @access   private
-     * @var      array $query_list
-     */
-    private $query_list = [];
-    /**
-     * list of parameters
-     *
-     *
-     * @access   public
-     * @var      array $params
-     */
-    public $params = [];
-
-    /**
-     * Database Object
-     *
-     *
-     * @access   private
-     * @var      object $db
-     */
-    private $db;
-    /**
-     * Database Object Type
-     *
-     * Use your subclass of db_mysql here, or pass existing object to constuctor
-     *
-     * @access   private
-     * @var      string $db_class_name
-     * @see      DbView()
-     */
-    private $db_class_name = "DB_Seminar";
-    /**
-     * Temp Table Type
-     *
-     * MyISAM is always safe, HEAP may provide better performance
-     *
-     * @access   private
-     * @var      string $temp_table_type
-     */
-    private $temp_table_type = "MyISAM";
-    /**
-     * Primary Key used in Temp Table
-     *
-     * If none is set in your view, an auto_increment row is used
-     *
-     * @access   private
-     * @var      string $pk
-     * @see      get_temp_table()
-     */
-    private $pk = "";
-    /**
-     * delete the params array after each query execution
-     *
-     *
-     * @access   public
-     * @var      boolean $auto_free_params
-     */
-    public $auto_free_params = true;
-    /**
-     * turn on/off debugging
-     *
-     *
-     * @access   public
-     * @var      boolean $debug
-     */
-    public $debug = false;
-
-    static protected $dbviewfiles = [];
-
-    static protected $dbviews = [];
-
-    public static function addView($view)
-    {
-        $view = mb_strtolower($view);
-        if (!isset(self::$dbviewfiles[$view])) {
-            self::$dbviewfiles[$view] = 0;
-        }
-    }
-
-    /**
-     * Convenience method that combines addView() and returns an instance.
-     *
-     * @param String $view Required view (at least this will be present in the
-     *                     returned instance)
-     * @param mixed  $db classname of db abstraction or existing db object
-     *
-     * @return DbView Instance of self with at least the required view loaded
-     */
-    public static function getView($view, $db = '')
-    {
-        self::addView($view);
-
-        return new self($db);
-    }
-
-    /**
-     * Constructor
-     *
-     * Pass nothing to use a new instance of db_class_name, the classname for a new instance, or existing instance
-     *
-     * @access   public
-     *
-     * @param    mixed $db classname of used db abstraction or existing db object
-     */
-    public function __construct($db = "")
-    {
-        if (is_object($db)) {
-            $this->db = $db;
-        } else if ($db != "") {
-            $this->db            = new $db;
-            $this->db_class_name = $db;
-        } else {
-            $this->db = new $this->db_class_name;
-        }
-        $this->init_views();
-    }
-
-    public function init_views()
-    {
-        foreach (self::$dbviewfiles as $view => $status) {
-            if ($status === 0) {
-                $views = include 'lib/dbviews/' . $view . '.view.php';
-                self::$dbviews += $views;
-
-                self::$dbviewfiles[$view] = 1;
-            }
-        }
-    }
-
-    public function __get($view)
-    {
-        if (isset(self::$dbviews[$view])) {
-            return self::$dbviews[$view];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * print error message and exit script
-     *
-     * @access   private
-     *
-     * @param    string $msg the message to print
-     */
-    public function halt($msg)
-    {
-        echo "<hr>$msg<hr>";
-        if ($this->debug) {
-            echo "<pre>";
-            print_r($this);
-            echo "</pre>";
-        }
-        die;
-    }
-
-    public function get_query()
-    {
-        $parsed_query = $this->get_parsed_query(func_get_args());
-        $this->db->query($parsed_query);
-        return $this->db;
-    }
-
-    public function get_parsed_query($query_list)
-    {
-        $parsed_query     = "";
-        $this->query_list = [];
-        (is_array($query_list)) ? $this->query_list = $query_list : $this->query_list[] = $query_list;
-        if (count($this->query_list) == 1) {
-            $spl = explode(":", $this->query_list[0]);
-            if ($spl[0] == "view") {
-                $this->query_list = $this->get_view(trim($spl[1]));
-            }
-        }
-        $this->parse_query($this->query_list);
-        if (is_array($this->query_list)) {
-            $parsed_query = $this->query_list[0];
-        } else {
-            $parsed_query = $this->query_list;
-        }
-
-        return $parsed_query;
-    }
-
-
-    public function parse_query(&$query)
-    {
-        if (is_array($query)) {
-            for ($i = (count($query) - 1); $i > 0; --$i) {
-                $spl = explode(":", $query[$i]);
-                if ($spl[0] == "view") {
-                    $query[$i] = $this->get_view(trim($spl[1]), $spl[2]);
-                }
-                $query[$i]  = $this->parse_query($query[$i]);
-                $repl_query = (is_array($query[$i])) ? $query[$i][0] : $query[$i];
-                for ($j = 0; $j < $i; ++$j) {
-                    $spl = mb_stristr($query[$j], "where");
-                    if (!$spl)
-                        $spl = mb_stristr($query[$j], "having");
-                    if ($spl) {
-                        $pos = mb_strpos($spl, "{" . $i . "}");
-                        if (!$pos === false)
-                            $repl_query = $this->get_temp_values($repl_query);
-                    }
-                    if (!$spl OR $pos === false) {
-                        $pos = mb_strpos($query[$j], "{" . $i . "}");
-                        if (!$pos === false)
-                            $repl_query = $this->get_temp_table($repl_query);
-                    }
-                    $query[$j] = str_replace("{" . $i . "}", $repl_query, $query[$j]);
-                }
-            }
-        }
-
-        return $query;
-    }
-
-
-    public function get_temp_table($sub_query)
-    {
-        $id    = self::get_uniqid();
-        $pk    = $this->pk ? "PRIMARY KEY($this->pk)" : "auto_" . $id . " INT NOT NULL AUTO_INCREMENT PRIMARY KEY";
-        $query = "CREATE TEMPORARY TABLE temp_$id ($pk) ENGINE=$this->temp_table_type $sub_query";
-        $this->db->query($query);
-
-        return " temp_" . $id . " ";
-    }
-
-
-    public function get_temp_values($sub_query)
-    {
-        $this->db->query($sub_query);
-        if (!$this->db->num_rows())
-            $this->halt("Sub Query: <b>$sub_query</b> returns nothing!");
-        else {
-            while ($this->db->next_record()) {
-                $result[] = $this->db->Record[0];
-            }
-            $value_list = $this->get_value_list($result);
-        }
-
-        return $value_list;
-    }
-
-    public static function get_uniqid()
-    {
-        mt_srand((double)microtime() * 1000000);
-
-        return md5(uniqid(mt_rand(), 1));
-    }
-
-    public function get_value_list($list)
-    {
-        $value_list = false;
-        if (count($list) == 1)
-            $value_list = "'$list[0]'";
-        else
-            $value_list = "'" . join("','", $list) . "'";
-
-        return $value_list;
-    }
-
-    public function get_view($name)
-    {
-        if (!empty(self::$dbviews[$name]["pk"])) {
-            $this->pk = self::$dbviews[$name]["pk"];
-        }
-        if (!empty(self::$dbviews[$name]["temp_table_type"])) {
-            $this->temp_table_type = self::$dbviews[$name]["temp_table_type"];
-        }
-        if (!$query_list = self::$dbviews[$name]["query"])
-            $this->halt("View not found: $name");
-        (is_array($query_list)) ? $query = $query_list[0] : $query = $query_list;
-        $tokens = preg_split("/[\?§\&]/u", $query);
-        if (count($tokens) > 1) {
-            $types = [];
-            $token = 0;
-            foreach (preg_split('//u', $query, null, PREG_SPLIT_NO_EMPTY) as $i => $c) {
-                switch ($c) {
-                    case '?':
-                        $types[$token++] = 1;
-                        break;
-                    case '§':
-                        $types[$token++] = 2;
-                        break;
-                    case '&':
-                        $types[$token++] = 3;
-                        break;
-                }
-            }
-            if (count($this->params) != count($types))
-                $this->halt("Wrong parameter count in view: $name");
-            $query = "";
-            for ($i = 0; $i < count($this->params); ++$i) {
-                $query .= $tokens[$i];
-                if (is_null($this->params[$i])) {
-                    $query .= 'NULL';
-                } else {
-                    switch ($types[$i]) {
-                        case 1:
-                            $query .= "'" . $this->params[$i] . "'";
-                            break;
-                        case 2:
-                            $query .= $this->params[$i];
-                            break;
-                        case 3:
-                            $query .= (is_array($this->params[$i])) ? "'" . join("','", $this->params[$i]) . "'" : "'" . $this->params[$i] . "'";
-                            break;
-                    }
-                }
-            }
-            $query .= $tokens[$i];
-            if ($this->auto_free_params)
-                $this->params = [];
-        }
-        (is_array($query_list)) ? $query_list[0] = $query : $query_list = $query;
-        return $query_list;
-    }
-
-    public function Get_union()
-    {
-        $queries     = func_get_args();
-        $view        = new DbView();
-        $union_table = $view->get_temp_table($view->get_parsed_query($queries[0]));
-        if ($queries[1]) {
-            for ($i = 1; $i < count($queries); ++$i) {
-                $view->db->query("REPLACE INTO $union_table " . $view->get_parsed_query($queries[$i]));
-            }
-        }
-
-        return $union_table;
-    }
-}
-
-?>
diff --git a/lib/classes/DbView.php b/lib/classes/DbView.php
new file mode 100644
index 0000000..81e9b91
--- /dev/null
+++ b/lib/classes/DbView.php
@@ -0,0 +1,378 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// DbView.class.php
+// Class to provide simple Views and Prepared Statements
+// Mainly for MySql, may work with other DBs (not tested)
+// Copyright (c) 2002 André Noack <andre.noack@gmx.net>
+// +---------------------------------------------------------------------------+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or 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.
+// +---------------------------------------------------------------------------+
+
+
+/**
+ * Class to provide simple Views and Prepared Statements
+ *
+ * Only tested with MySql, needs MySql >= 3.23
+ * Uses DB abstraction layer of PHPLib
+ *
+ * @access   public
+ * @author   André Noack <andre.noack@gmx.net>
+ * @package  DBTools
+ */
+class DbView
+{
+    /**
+     * the processed list of queries
+     *
+     *
+     * @access   private
+     * @var      array $query_list
+     */
+    private $query_list = [];
+    /**
+     * list of parameters
+     *
+     *
+     * @access   public
+     * @var      array $params
+     */
+    public $params = [];
+
+    /**
+     * Database Object
+     *
+     *
+     * @access   private
+     * @var      object $db
+     */
+    private $db;
+    /**
+     * Database Object Type
+     *
+     * Use your subclass of db_mysql here, or pass existing object to constuctor
+     *
+     * @access   private
+     * @var      string $db_class_name
+     * @see      DbView()
+     */
+    private $db_class_name = "DB_Seminar";
+    /**
+     * Temp Table Type
+     *
+     * MyISAM is always safe, HEAP may provide better performance
+     *
+     * @access   private
+     * @var      string $temp_table_type
+     */
+    private $temp_table_type = "MyISAM";
+    /**
+     * Primary Key used in Temp Table
+     *
+     * If none is set in your view, an auto_increment row is used
+     *
+     * @access   private
+     * @var      string $pk
+     * @see      get_temp_table()
+     */
+    private $pk = "";
+    /**
+     * delete the params array after each query execution
+     *
+     *
+     * @access   public
+     * @var      boolean $auto_free_params
+     */
+    public $auto_free_params = true;
+    /**
+     * turn on/off debugging
+     *
+     *
+     * @access   public
+     * @var      boolean $debug
+     */
+    public $debug = false;
+
+    static protected $dbviewfiles = [];
+
+    static protected $dbviews = [];
+
+    public static function addView($view)
+    {
+        $view = mb_strtolower($view);
+        if (!isset(self::$dbviewfiles[$view])) {
+            self::$dbviewfiles[$view] = 0;
+        }
+    }
+
+    /**
+     * Convenience method that combines addView() and returns an instance.
+     *
+     * @param String $view Required view (at least this will be present in the
+     *                     returned instance)
+     * @param mixed  $db classname of db abstraction or existing db object
+     *
+     * @return DbView Instance of self with at least the required view loaded
+     */
+    public static function getView($view, $db = '')
+    {
+        self::addView($view);
+
+        return new self($db);
+    }
+
+    /**
+     * Constructor
+     *
+     * Pass nothing to use a new instance of db_class_name, the classname for a new instance, or existing instance
+     *
+     * @access   public
+     *
+     * @param    mixed $db classname of used db abstraction or existing db object
+     */
+    public function __construct($db = "")
+    {
+        if (is_object($db)) {
+            $this->db = $db;
+        } else if ($db != "") {
+            $this->db            = new $db;
+            $this->db_class_name = $db;
+        } else {
+            $this->db = new $this->db_class_name;
+        }
+        $this->init_views();
+    }
+
+    public function init_views()
+    {
+        foreach (self::$dbviewfiles as $view => $status) {
+            if ($status === 0) {
+                $views = include 'lib/dbviews/' . $view . '.view.php';
+                self::$dbviews += $views;
+
+                self::$dbviewfiles[$view] = 1;
+            }
+        }
+    }
+
+    public function __get($view)
+    {
+        if (isset(self::$dbviews[$view])) {
+            return self::$dbviews[$view];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * print error message and exit script
+     *
+     * @access   private
+     *
+     * @param    string $msg the message to print
+     */
+    public function halt($msg)
+    {
+        echo "<hr>$msg<hr>";
+        if ($this->debug) {
+            echo "<pre>";
+            print_r($this);
+            echo "</pre>";
+        }
+        die;
+    }
+
+    public function get_query()
+    {
+        $parsed_query = $this->get_parsed_query(func_get_args());
+        $this->db->query($parsed_query);
+        return $this->db;
+    }
+
+    public function get_parsed_query($query_list)
+    {
+        $parsed_query     = "";
+        $this->query_list = [];
+        (is_array($query_list)) ? $this->query_list = $query_list : $this->query_list[] = $query_list;
+        if (count($this->query_list) == 1) {
+            $spl = explode(":", $this->query_list[0]);
+            if ($spl[0] == "view") {
+                $this->query_list = $this->get_view(trim($spl[1]));
+            }
+        }
+        $this->parse_query($this->query_list);
+        if (is_array($this->query_list)) {
+            $parsed_query = $this->query_list[0];
+        } else {
+            $parsed_query = $this->query_list;
+        }
+
+        return $parsed_query;
+    }
+
+
+    public function parse_query(&$query)
+    {
+        if (is_array($query)) {
+            for ($i = (count($query) - 1); $i > 0; --$i) {
+                $spl = explode(":", $query[$i]);
+                if ($spl[0] == "view") {
+                    $query[$i] = $this->get_view(trim($spl[1]), $spl[2]);
+                }
+                $query[$i]  = $this->parse_query($query[$i]);
+                $repl_query = (is_array($query[$i])) ? $query[$i][0] : $query[$i];
+                for ($j = 0; $j < $i; ++$j) {
+                    $spl = mb_stristr($query[$j], "where");
+                    if (!$spl)
+                        $spl = mb_stristr($query[$j], "having");
+                    if ($spl) {
+                        $pos = mb_strpos($spl, "{" . $i . "}");
+                        if (!$pos === false)
+                            $repl_query = $this->get_temp_values($repl_query);
+                    }
+                    if (!$spl OR $pos === false) {
+                        $pos = mb_strpos($query[$j], "{" . $i . "}");
+                        if (!$pos === false)
+                            $repl_query = $this->get_temp_table($repl_query);
+                    }
+                    $query[$j] = str_replace("{" . $i . "}", $repl_query, $query[$j]);
+                }
+            }
+        }
+
+        return $query;
+    }
+
+
+    public function get_temp_table($sub_query)
+    {
+        $id    = self::get_uniqid();
+        $pk    = $this->pk ? "PRIMARY KEY($this->pk)" : "auto_" . $id . " INT NOT NULL AUTO_INCREMENT PRIMARY KEY";
+        $query = "CREATE TEMPORARY TABLE temp_$id ($pk) ENGINE=$this->temp_table_type $sub_query";
+        $this->db->query($query);
+
+        return " temp_" . $id . " ";
+    }
+
+
+    public function get_temp_values($sub_query)
+    {
+        $this->db->query($sub_query);
+        if (!$this->db->num_rows())
+            $this->halt("Sub Query: <b>$sub_query</b> returns nothing!");
+        else {
+            while ($this->db->next_record()) {
+                $result[] = $this->db->Record[0];
+            }
+            $value_list = $this->get_value_list($result);
+        }
+
+        return $value_list;
+    }
+
+    public static function get_uniqid()
+    {
+        mt_srand((double)microtime() * 1000000);
+
+        return md5(uniqid(mt_rand(), 1));
+    }
+
+    public function get_value_list($list)
+    {
+        $value_list = false;
+        if (count($list) == 1)
+            $value_list = "'$list[0]'";
+        else
+            $value_list = "'" . join("','", $list) . "'";
+
+        return $value_list;
+    }
+
+    public function get_view($name)
+    {
+        if (!empty(self::$dbviews[$name]["pk"])) {
+            $this->pk = self::$dbviews[$name]["pk"];
+        }
+        if (!empty(self::$dbviews[$name]["temp_table_type"])) {
+            $this->temp_table_type = self::$dbviews[$name]["temp_table_type"];
+        }
+        if (!$query_list = self::$dbviews[$name]["query"])
+            $this->halt("View not found: $name");
+        (is_array($query_list)) ? $query = $query_list[0] : $query = $query_list;
+        $tokens = preg_split("/[\?§\&]/u", $query);
+        if (count($tokens) > 1) {
+            $types = [];
+            $token = 0;
+            foreach (preg_split('//u', $query, null, PREG_SPLIT_NO_EMPTY) as $i => $c) {
+                switch ($c) {
+                    case '?':
+                        $types[$token++] = 1;
+                        break;
+                    case '§':
+                        $types[$token++] = 2;
+                        break;
+                    case '&':
+                        $types[$token++] = 3;
+                        break;
+                }
+            }
+            if (count($this->params) != count($types))
+                $this->halt("Wrong parameter count in view: $name");
+            $query = "";
+            for ($i = 0; $i < count($this->params); ++$i) {
+                $query .= $tokens[$i];
+                if (is_null($this->params[$i])) {
+                    $query .= 'NULL';
+                } else {
+                    switch ($types[$i]) {
+                        case 1:
+                            $query .= "'" . $this->params[$i] . "'";
+                            break;
+                        case 2:
+                            $query .= $this->params[$i];
+                            break;
+                        case 3:
+                            $query .= (is_array($this->params[$i])) ? "'" . join("','", $this->params[$i]) . "'" : "'" . $this->params[$i] . "'";
+                            break;
+                    }
+                }
+            }
+            $query .= $tokens[$i];
+            if ($this->auto_free_params)
+                $this->params = [];
+        }
+        (is_array($query_list)) ? $query_list[0] = $query : $query_list = $query;
+        return $query_list;
+    }
+
+    public function Get_union()
+    {
+        $queries     = func_get_args();
+        $view        = new DbView();
+        $union_table = $view->get_temp_table($view->get_parsed_query($queries[0]));
+        if ($queries[1]) {
+            for ($i = 1; $i < count($queries); ++$i) {
+                $view->db->query("REPLACE INTO $union_table " . $view->get_parsed_query($queries[$i]));
+            }
+        }
+
+        return $union_table;
+    }
+}
+
+?>
diff --git a/lib/classes/Event.interface.php b/lib/classes/Event.interface.php
deleted file mode 100644
index 23f092b..0000000
--- a/lib/classes/Event.interface.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-/*
- * Event.interface.php - An interface for calendar events.
- *
- * 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.
- *
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-
-/**
- * The Event interface represents calendar events.
- */
-interface Event
-{
-    /**
-     * Retrieves events that lie in a given time range.
-     *
-     * @param DateTime $begin The beginning of the time range.
-     *
-     * @param DateTime $end The end of the time range.
-     *
-     * @param string $range_id The range for which to get the events. This may be a user-ID,
-     *     course-ID or another kind of ID.
-     *
-     * @return Event[] An array with event objects.
-     */
-    public static function getEvents(DateTime $begin, DateTime $end, string $range_id) : array;
-
-    /**
-     * Returns the ID of the event. This is the ID that is only
-     * valid inside of Stud.IP.
-     *
-     * @return string The ID of the event object.
-     */
-    public function getObjectId() : string;
-
-    /**
-     * Returns the ID of the primary object where this object is linked to
-     * in a primary-secondary relationship where this object is a secondary object.
-     *
-     * Example: A course date is a secondary object and the course it belongs to
-     * is the primary object.
-     *
-     * @return string The ID of the primary object or an empty string if the
-     *     implementation of the Event interface is a class of primary objects.
-     */
-    public function getPrimaryObjectID() : string;
-
-    /**
-     * Returns the class of the Event implementation.
-     *
-     * @return string The class name of the Event instance.
-     */
-    public function getObjectClass() : string;
-
-    /**
-     * Returns the title of this event.
-     * If the user has not the permission Event::PERMISSION_READABLE,
-     * the title is "Keine Berechtigung.".
-     *
-     * @return string The title of the event.
-     */
-    public function getTitle() : string;
-
-    /**
-     * Returns the start time of the event.
-     *
-     * @return DateTime The start time of the event.
-     */
-    public function getBegin() : DateTime;
-
-    /**
-     * Returns the end time of the event.
-     *
-     * @return DateTime The end time of the event.
-     */
-    public function getEnd() : DateTime;
-
-    /**
-     * Returns the duration of the event.
-     *
-     * @return DateInterval The duration of the event.
-     */
-    public function getDuration() : DateInterval;
-
-    /**
-     * Returns the location where the event takes place, if applicable.
-     *
-     * @return string The location of the event.
-     */
-    public function getLocation() : string;
-
-    /**
-     * Returns the global unique id of the event.
-     *
-     * @return string The global unique id of the event.
-     */
-    public function getUniqueId() : string;
-
-    /**
-     * Returns the description of the event.
-     *
-     * @return string The description of the event.
-     */
-    public function getDescription() : string;
-
-    /**
-     * Returns additional descriptions of the Event object.
-     * These are specific for each implementation.
-     *
-     * @return array Additional descriptions for the Event implementation.
-     *     Each array key represents a heading for the description and the
-     *     value contains the description itself as plain text.
-     *     In case this is not applicable for the implementation,
-     *     an empty array is returned.
-     */
-    public function getAdditionalDescriptions() : array;
-
-    /**
-     * Returns whether the event is an all day event or not.
-     *
-     * @return bool True, if the event is an all day event, false otherwise.
-     */
-    public function isAllDayEvent() : bool;
-
-    /**
-     * Determines whether the specified user has write permissions for the event.
-     *
-     * @param string $user_id The user for which to check write permissions.
-     *
-     * @return bool True, if the user has write permissions, false otherwise.
-     */
-    public function isWritable(string $user_id) : bool;
-
-    /**
-     * Returns the creation date of the event.
-     *
-     * @return DateTime The creation date of the event.
-     */
-    public function getCreationDate() : DateTime;
-
-    /**
-     * Returns the modification date of the event.
-     *
-     * @return DateTime The modification date of the event.
-     */
-    public function getModificationDate() : DateTime;
-
-    /**
-     * Returns the import date of the event.
-     *
-     * @return DateTime The import date of the event.
-     */
-    public function getImportDate() : DateTime;
-
-    /**
-     * Returns the author of this event as user object.
-     *
-     * @return User|null The user object of the author of the event, if available.
-     */
-    public function getAuthor() : ?User;
-
-    /**
-     * Returns the editor of this event as user object.
-     *
-     * @return User|null The user object of the editor of the event, if available.
-     */
-    public function getEditor() : ?User;
-
-    /**
-     * Returns a JSON-encoded fullcalendar event object that represents the event.
-     *
-     * @param $user_id string The user for which to generate the fullcalendar event.
-     *
-     * @return \Studip\Calendar\EventData The EventData representation of the event.
-     */
-    public function toEventData(string $user_id) : \Studip\Calendar\EventData;
-}
diff --git a/lib/classes/Event.php b/lib/classes/Event.php
new file mode 100644
index 0000000..23f092b
--- /dev/null
+++ b/lib/classes/Event.php
@@ -0,0 +1,184 @@
+<?php
+
+/*
+ * Event.interface.php - An interface for calendar events.
+ *
+ * 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.
+ *
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+
+/**
+ * The Event interface represents calendar events.
+ */
+interface Event
+{
+    /**
+     * Retrieves events that lie in a given time range.
+     *
+     * @param DateTime $begin The beginning of the time range.
+     *
+     * @param DateTime $end The end of the time range.
+     *
+     * @param string $range_id The range for which to get the events. This may be a user-ID,
+     *     course-ID or another kind of ID.
+     *
+     * @return Event[] An array with event objects.
+     */
+    public static function getEvents(DateTime $begin, DateTime $end, string $range_id) : array;
+
+    /**
+     * Returns the ID of the event. This is the ID that is only
+     * valid inside of Stud.IP.
+     *
+     * @return string The ID of the event object.
+     */
+    public function getObjectId() : string;
+
+    /**
+     * Returns the ID of the primary object where this object is linked to
+     * in a primary-secondary relationship where this object is a secondary object.
+     *
+     * Example: A course date is a secondary object and the course it belongs to
+     * is the primary object.
+     *
+     * @return string The ID of the primary object or an empty string if the
+     *     implementation of the Event interface is a class of primary objects.
+     */
+    public function getPrimaryObjectID() : string;
+
+    /**
+     * Returns the class of the Event implementation.
+     *
+     * @return string The class name of the Event instance.
+     */
+    public function getObjectClass() : string;
+
+    /**
+     * Returns the title of this event.
+     * If the user has not the permission Event::PERMISSION_READABLE,
+     * the title is "Keine Berechtigung.".
+     *
+     * @return string The title of the event.
+     */
+    public function getTitle() : string;
+
+    /**
+     * Returns the start time of the event.
+     *
+     * @return DateTime The start time of the event.
+     */
+    public function getBegin() : DateTime;
+
+    /**
+     * Returns the end time of the event.
+     *
+     * @return DateTime The end time of the event.
+     */
+    public function getEnd() : DateTime;
+
+    /**
+     * Returns the duration of the event.
+     *
+     * @return DateInterval The duration of the event.
+     */
+    public function getDuration() : DateInterval;
+
+    /**
+     * Returns the location where the event takes place, if applicable.
+     *
+     * @return string The location of the event.
+     */
+    public function getLocation() : string;
+
+    /**
+     * Returns the global unique id of the event.
+     *
+     * @return string The global unique id of the event.
+     */
+    public function getUniqueId() : string;
+
+    /**
+     * Returns the description of the event.
+     *
+     * @return string The description of the event.
+     */
+    public function getDescription() : string;
+
+    /**
+     * Returns additional descriptions of the Event object.
+     * These are specific for each implementation.
+     *
+     * @return array Additional descriptions for the Event implementation.
+     *     Each array key represents a heading for the description and the
+     *     value contains the description itself as plain text.
+     *     In case this is not applicable for the implementation,
+     *     an empty array is returned.
+     */
+    public function getAdditionalDescriptions() : array;
+
+    /**
+     * Returns whether the event is an all day event or not.
+     *
+     * @return bool True, if the event is an all day event, false otherwise.
+     */
+    public function isAllDayEvent() : bool;
+
+    /**
+     * Determines whether the specified user has write permissions for the event.
+     *
+     * @param string $user_id The user for which to check write permissions.
+     *
+     * @return bool True, if the user has write permissions, false otherwise.
+     */
+    public function isWritable(string $user_id) : bool;
+
+    /**
+     * Returns the creation date of the event.
+     *
+     * @return DateTime The creation date of the event.
+     */
+    public function getCreationDate() : DateTime;
+
+    /**
+     * Returns the modification date of the event.
+     *
+     * @return DateTime The modification date of the event.
+     */
+    public function getModificationDate() : DateTime;
+
+    /**
+     * Returns the import date of the event.
+     *
+     * @return DateTime The import date of the event.
+     */
+    public function getImportDate() : DateTime;
+
+    /**
+     * Returns the author of this event as user object.
+     *
+     * @return User|null The user object of the author of the event, if available.
+     */
+    public function getAuthor() : ?User;
+
+    /**
+     * Returns the editor of this event as user object.
+     *
+     * @return User|null The user object of the editor of the event, if available.
+     */
+    public function getEditor() : ?User;
+
+    /**
+     * Returns a JSON-encoded fullcalendar event object that represents the event.
+     *
+     * @param $user_id string The user for which to generate the fullcalendar event.
+     *
+     * @return \Studip\Calendar\EventData The EventData representation of the event.
+     */
+    public function toEventData(string $user_id) : \Studip\Calendar\EventData;
+}
diff --git a/lib/classes/Feedback.class.php b/lib/classes/Feedback.class.php
deleted file mode 100644
index 26dbf55..0000000
--- a/lib/classes/Feedback.class.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @author Nils Gehrke <nils.gehrke@uni-goettingen.de>
- */
-class Feedback
-{
-    /**
-     * Returns the html code for feedback elements for a given range, if the module is activated within a course
-     *
-     * @return string
-     */
-    public static function getHTML(string $range_id, string $range_type)
-    {
-        if (!$range_id) {
-            return null;
-        }
-        $course_id = null;
-        if (is_subclass_of($range_type, \FeedbackRange::class)) {
-            $range_object = $range_type::find($range_id);
-            if ($range_object) {
-                $course_id = $range_object->getRangeCourseId();
-            }
-        }
-        if ($course_id && Feedback::isActivated($course_id) && Feedback::hasRangeAccess($range_id, $range_type)) {
-            return '<div class="feedback-elements" for="' . $range_id . '" type="' . $range_type . '" context="' . $course_id . '"></div>';
-        } else {
-            return null;
-        }
-    }
-    /**
-     * Returns activation status of the feedback module in currently active course
-     *
-     * @param string $course_id  optional; use this course_id instead of the current context
-     *
-     * @return boolean
-     */
-    public static function isActivated(string $course_id = null): bool
-    {
-        $course_id          = $course_id ?? Context::getId();
-        $plugin_manager     = PluginManager::getInstance();
-        $feedback_module    = $plugin_manager->getPluginInfo('FeedbackModule');
-
-        return $plugin_manager->isPluginActivated($feedback_module['id'], $course_id) ?? false;
-    }
-
-    /**
-     * Returns admin permission of current user within given course
-     *
-     * @param string $course_id  the course
-     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
-     *
-     * @return boolean
-     *
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
-    public static function hasAdminPerm($course_id, string $user_id = null): bool
-    {
-        $user_id = $user_id ?? $GLOBALS['user']->id;
-        $admin_perm_level =  CourseConfig::get($course_id)->FEEDBACK_ADMIN_PERM;
-        $admin_perm = $GLOBALS['perm']->have_studip_perm($admin_perm_level, $course_id, $user_id);
-
-        return $admin_perm;
-    }
-
-    /**
-     * Returns create permission of current user within given course
-     *
-     * @param string $course_id  the course
-     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
-     *
-     * @return boolean
-     *
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
-    public static function hasCreatePerm($course_id, string $user_id = null): bool
-    {
-        $user_id = $user_id ?? $GLOBALS['user']->id;
-        $create_perm_level =  CourseConfig::get($course_id)->FEEDBACK_CREATE_PERM;
-        $create_perm = $GLOBALS['perm']->have_studip_perm($create_perm_level, $course_id, $user_id);
-
-        return $create_perm;
-    }
-
-    /**
-     * Returns range access permission of current user for given range
-     *
-     * @param string $range_id
-     * @param string $range_type
-     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
-     *
-     * @return boolean
-     */
-    public static function hasRangeAccess($range_id, $range_type, string $user_id = null): bool
-    {
-        $user_id = $user_id ?? $GLOBALS['user']->id;
-        $range = $range_type::find($range_id);
-        return $range->isRangeAccessible($user_id);
-    }
-
-}
diff --git a/lib/classes/Feedback.php b/lib/classes/Feedback.php
new file mode 100644
index 0000000..26dbf55
--- /dev/null
+++ b/lib/classes/Feedback.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @author Nils Gehrke <nils.gehrke@uni-goettingen.de>
+ */
+class Feedback
+{
+    /**
+     * Returns the html code for feedback elements for a given range, if the module is activated within a course
+     *
+     * @return string
+     */
+    public static function getHTML(string $range_id, string $range_type)
+    {
+        if (!$range_id) {
+            return null;
+        }
+        $course_id = null;
+        if (is_subclass_of($range_type, \FeedbackRange::class)) {
+            $range_object = $range_type::find($range_id);
+            if ($range_object) {
+                $course_id = $range_object->getRangeCourseId();
+            }
+        }
+        if ($course_id && Feedback::isActivated($course_id) && Feedback::hasRangeAccess($range_id, $range_type)) {
+            return '<div class="feedback-elements" for="' . $range_id . '" type="' . $range_type . '" context="' . $course_id . '"></div>';
+        } else {
+            return null;
+        }
+    }
+    /**
+     * Returns activation status of the feedback module in currently active course
+     *
+     * @param string $course_id  optional; use this course_id instead of the current context
+     *
+     * @return boolean
+     */
+    public static function isActivated(string $course_id = null): bool
+    {
+        $course_id          = $course_id ?? Context::getId();
+        $plugin_manager     = PluginManager::getInstance();
+        $feedback_module    = $plugin_manager->getPluginInfo('FeedbackModule');
+
+        return $plugin_manager->isPluginActivated($feedback_module['id'], $course_id) ?? false;
+    }
+
+    /**
+     * Returns admin permission of current user within given course
+     *
+     * @param string $course_id  the course
+     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
+     *
+     * @return boolean
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public static function hasAdminPerm($course_id, string $user_id = null): bool
+    {
+        $user_id = $user_id ?? $GLOBALS['user']->id;
+        $admin_perm_level =  CourseConfig::get($course_id)->FEEDBACK_ADMIN_PERM;
+        $admin_perm = $GLOBALS['perm']->have_studip_perm($admin_perm_level, $course_id, $user_id);
+
+        return $admin_perm;
+    }
+
+    /**
+     * Returns create permission of current user within given course
+     *
+     * @param string $course_id  the course
+     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
+     *
+     * @return boolean
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public static function hasCreatePerm($course_id, string $user_id = null): bool
+    {
+        $user_id = $user_id ?? $GLOBALS['user']->id;
+        $create_perm_level =  CourseConfig::get($course_id)->FEEDBACK_CREATE_PERM;
+        $create_perm = $GLOBALS['perm']->have_studip_perm($create_perm_level, $course_id, $user_id);
+
+        return $create_perm;
+    }
+
+    /**
+     * Returns range access permission of current user for given range
+     *
+     * @param string $range_id
+     * @param string $range_type
+     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
+     *
+     * @return boolean
+     */
+    public static function hasRangeAccess($range_id, $range_type, string $user_id = null): bool
+    {
+        $user_id = $user_id ?? $GLOBALS['user']->id;
+        $range = $range_type::find($range_id);
+        return $range->isRangeAccessible($user_id);
+    }
+
+}
diff --git a/lib/classes/FeedbackRange.interface.php b/lib/classes/FeedbackRange.interface.php
deleted file mode 100644
index 863c197..0000000
--- a/lib/classes/FeedbackRange.interface.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Interface FeedbackRange
- *
- * The FeedbackRange defines methods for range objects
- * that can reveive feedback.
- *
- * @author Nils Gehrke <nils.gehrke@uni-goettingen.de>
- */
-
-interface FeedbackRange
-{
-    /**
-     * Returns the ID of this range.
-     *
-     * @return string|integer The ID of the range.
-     */
-    public function getId();
-
-    /**
-     * Returns a human-friendly representation of the FeedbackRange object instance's name.
-     *
-     * @return string A human-friendly name for the FeedbackRange object instance.
-     */
-    public function getRangeName();
-
-    /**
-     * Returns the icon object that shall be used with the FeedbackRange object instance.
-     *
-     * @param string $role role of icon
-     * @return Icon icon for the FeedbackRange object instance.
-     */
-    public function getRangeIcon($role);
-
-    /**
-     * Returns the URL of FeedbackRange view, where the object instance is visible
-     * together with the related feedback element(s).
-     * @return string Path that is usable with the url_for and link_for methods.
-     */
-    public function getRangeUrl();
-
-    /**
-     * Returns the course id of FeedbackRange object instance
-     * @return string course_id
-     */
-    public function getRangeCourseId();
-
-    /**
-     * Returns the accessebility of FeedbackRange object instance for current active user
-     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
-     * @return bool range object accessebility
-     */
-    public function isRangeAccessible(string $user_id = null): bool;
-}
diff --git a/lib/classes/FeedbackRange.php b/lib/classes/FeedbackRange.php
new file mode 100644
index 0000000..863c197
--- /dev/null
+++ b/lib/classes/FeedbackRange.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Interface FeedbackRange
+ *
+ * The FeedbackRange defines methods for range objects
+ * that can reveive feedback.
+ *
+ * @author Nils Gehrke <nils.gehrke@uni-goettingen.de>
+ */
+
+interface FeedbackRange
+{
+    /**
+     * Returns the ID of this range.
+     *
+     * @return string|integer The ID of the range.
+     */
+    public function getId();
+
+    /**
+     * Returns a human-friendly representation of the FeedbackRange object instance's name.
+     *
+     * @return string A human-friendly name for the FeedbackRange object instance.
+     */
+    public function getRangeName();
+
+    /**
+     * Returns the icon object that shall be used with the FeedbackRange object instance.
+     *
+     * @param string $role role of icon
+     * @return Icon icon for the FeedbackRange object instance.
+     */
+    public function getRangeIcon($role);
+
+    /**
+     * Returns the URL of FeedbackRange view, where the object instance is visible
+     * together with the related feedback element(s).
+     * @return string Path that is usable with the url_for and link_for methods.
+     */
+    public function getRangeUrl();
+
+    /**
+     * Returns the course id of FeedbackRange object instance
+     * @return string course_id
+     */
+    public function getRangeCourseId();
+
+    /**
+     * Returns the accessebility of FeedbackRange object instance for current active user
+     * @param string $user_id    optional; use this ID instead of $GLOBALS['user']->id
+     * @return bool range object accessebility
+     */
+    public function isRangeAccessible(string $user_id = null): bool;
+}
diff --git a/lib/classes/FileLock.class.php b/lib/classes/FileLock.class.php
deleted file mode 100644
index 064d41e..0000000
--- a/lib/classes/FileLock.class.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * file_lock.php
- * Simple lock mechanism on a file basis.
- *
- * With the help of this class you can manage persistent locks. Locks are
- * stored in files and potential additional data is stored as json.
- *
- * 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.
- *
- * @author    Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @copyright 2013 Stud.IP Core-Group
- * @license   http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category  Stud.IP
- * @since     2.4
- */
-
-class FileLock
-{
-    protected $file;
-
-    /**
-     * Constructs a new lock object with the provided id.
-     *
-     * @param String $id Identifier of the lock
-     */
-    public function __construct($id)
-    {
-        $this->file = fopen("{$GLOBALS['TMP_PATH']}/$id.json", 'c+');
-
-        if (!$this->file) {
-            throw new RuntimeException('failed to create lock file.');
-        }
-    }
-    
-    /**
-     * Try to aquire a file lock. The provided lock information will
-     * be stored with the lock. If the lock cannot be aquired, the
-     * lock information in $data is updated from the lock file.
-     *
-     * @param array $data additional data to be stored with the lock
-     * @return boolean true on success or false on failure
-     */
-    public function tryLock(&$data = [])
-    {
-        rewind($this->file);
-
-        if (flock($this->file, LOCK_EX | LOCK_NB)) {
-            ftruncate($this->file, 0);
-            fwrite($this->file, json_encode($data));
-            fflush($this->file);
-
-            return true;
-        } else {
-            $json = stream_get_contents($this->file);
-            $data = json_decode($json, true);
-
-            return false;
-        }
-    }
-
-    /**
-     * Releases a previously obtained lock
-     *
-     * @return boolean true on success or false on failure
-     */
-    public function release()
-    {
-        return flock($this->file, LOCK_UN);
-    }
-}
diff --git a/lib/classes/FileLock.php b/lib/classes/FileLock.php
new file mode 100644
index 0000000..064d41e
--- /dev/null
+++ b/lib/classes/FileLock.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * file_lock.php
+ * Simple lock mechanism on a file basis.
+ *
+ * With the help of this class you can manage persistent locks. Locks are
+ * stored in files and potential additional data is stored as json.
+ *
+ * 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.
+ *
+ * @author    Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @copyright 2013 Stud.IP Core-Group
+ * @license   http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category  Stud.IP
+ * @since     2.4
+ */
+
+class FileLock
+{
+    protected $file;
+
+    /**
+     * Constructs a new lock object with the provided id.
+     *
+     * @param String $id Identifier of the lock
+     */
+    public function __construct($id)
+    {
+        $this->file = fopen("{$GLOBALS['TMP_PATH']}/$id.json", 'c+');
+
+        if (!$this->file) {
+            throw new RuntimeException('failed to create lock file.');
+        }
+    }
+    
+    /**
+     * Try to aquire a file lock. The provided lock information will
+     * be stored with the lock. If the lock cannot be aquired, the
+     * lock information in $data is updated from the lock file.
+     *
+     * @param array $data additional data to be stored with the lock
+     * @return boolean true on success or false on failure
+     */
+    public function tryLock(&$data = [])
+    {
+        rewind($this->file);
+
+        if (flock($this->file, LOCK_EX | LOCK_NB)) {
+            ftruncate($this->file, 0);
+            fwrite($this->file, json_encode($data));
+            fflush($this->file);
+
+            return true;
+        } else {
+            $json = stream_get_contents($this->file);
+            $data = json_decode($json, true);
+
+            return false;
+        }
+    }
+
+    /**
+     * Releases a previously obtained lock
+     *
+     * @return boolean true on success or false on failure
+     */
+    public function release()
+    {
+        return flock($this->file, LOCK_UN);
+    }
+}
diff --git a/lib/classes/Fullcalendar.class.php b/lib/classes/Fullcalendar.class.php
deleted file mode 100644
index db8364a..0000000
--- a/lib/classes/Fullcalendar.class.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-
-namespace Studip;
-
-
-class Fullcalendar
-{
-    protected $title;
-
-    /**
-     * Fullcalendar configuration options.
-     * They are passed to the JavaScript fullcalendar class.
-     */
-    protected $config;
-
-    /**
-     * Additional HTML attributes that shall be attached to the
-     * section element in which the fullcalendar instance is created.
-     */
-    protected $attributes;
-
-
-    /**
-     * The name of the fullcalendar for the data attribute. This is set
-     * to "fullcalendar" by default, but custom fullcalendars may require
-     * special data attributes to prevent the default Fullcalendar JS
-     * initialiser to be executed.
-     */
-    protected $data_name;
-
-
-    public static function create(
-        $title = '',
-        $config = [],
-        $attributes = [],
-        $data_name = 'fullcalendar'
-    )
-    {
-        $instance = new \Studip\Fullcalendar(
-            $title,
-            $config,
-            $attributes,
-            $data_name
-        );
-
-        return $instance->render();
-    }
-
-
-    public function __construct(
-        $title = '',
-        $config = [],
-        $attributes = [],
-        $data_name = 'fullcalendar'
-    )
-    {
-        $this->title = $title;
-        $this->config = $config;
-        $this->attributes = $attributes;
-        $this->data_name = $data_name;
-    }
-
-
-    public function render()
-    {
-        $factory = new \Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
-        $template = $factory->open('studip-fullcalendar.php');
-        $real_data_name = sprintf('data-%s', $this->data_name);
-        return $template->render(
-            [
-                'title' => $this->title,
-                'config' => $this->config,
-                'attributes' => array_merge(
-                    $this->attributes,
-                    [$real_data_name => '1']
-                )
-            ]
-        );
-    }
-
-
-    /**
-     * Creates an array with data for a Fullcalendar instance
-     * from Stud.IP objects that implement the EventSource interface.
-     */
-    public static function createData($objects = [], $begin = null, $end = null)
-    {
-        if (!count($objects)) {
-            //No data means there is nothing to do.
-            return [];
-        }
-
-        $data = [];
-
-        foreach ($objects as $object) {
-            if ($object instanceof \Studip\Calendar\EventSource) {
-                $events = $object->getFilteredEventData(
-                    $GLOBALS['user']->id, null, null, $begin, $end
-                );
-
-                foreach ($events as $event) {
-                    $data[] = $event->toFullcalendarEvent();
-                }
-            }
-        }
-        return $data;
-    }
-}
diff --git a/lib/classes/Fullcalendar.php b/lib/classes/Fullcalendar.php
new file mode 100644
index 0000000..db8364a
--- /dev/null
+++ b/lib/classes/Fullcalendar.php
@@ -0,0 +1,109 @@
+<?php
+
+
+namespace Studip;
+
+
+class Fullcalendar
+{
+    protected $title;
+
+    /**
+     * Fullcalendar configuration options.
+     * They are passed to the JavaScript fullcalendar class.
+     */
+    protected $config;
+
+    /**
+     * Additional HTML attributes that shall be attached to the
+     * section element in which the fullcalendar instance is created.
+     */
+    protected $attributes;
+
+
+    /**
+     * The name of the fullcalendar for the data attribute. This is set
+     * to "fullcalendar" by default, but custom fullcalendars may require
+     * special data attributes to prevent the default Fullcalendar JS
+     * initialiser to be executed.
+     */
+    protected $data_name;
+
+
+    public static function create(
+        $title = '',
+        $config = [],
+        $attributes = [],
+        $data_name = 'fullcalendar'
+    )
+    {
+        $instance = new \Studip\Fullcalendar(
+            $title,
+            $config,
+            $attributes,
+            $data_name
+        );
+
+        return $instance->render();
+    }
+
+
+    public function __construct(
+        $title = '',
+        $config = [],
+        $attributes = [],
+        $data_name = 'fullcalendar'
+    )
+    {
+        $this->title = $title;
+        $this->config = $config;
+        $this->attributes = $attributes;
+        $this->data_name = $data_name;
+    }
+
+
+    public function render()
+    {
+        $factory = new \Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/templates');
+        $template = $factory->open('studip-fullcalendar.php');
+        $real_data_name = sprintf('data-%s', $this->data_name);
+        return $template->render(
+            [
+                'title' => $this->title,
+                'config' => $this->config,
+                'attributes' => array_merge(
+                    $this->attributes,
+                    [$real_data_name => '1']
+                )
+            ]
+        );
+    }
+
+
+    /**
+     * Creates an array with data for a Fullcalendar instance
+     * from Stud.IP objects that implement the EventSource interface.
+     */
+    public static function createData($objects = [], $begin = null, $end = null)
+    {
+        if (!count($objects)) {
+            //No data means there is nothing to do.
+            return [];
+        }
+
+        $data = [];
+
+        foreach ($objects as $object) {
+            if ($object instanceof \Studip\Calendar\EventSource) {
+                $events = $object->getFilteredEventData(
+                    $GLOBALS['user']->id, null, null, $begin, $end
+                );
+
+                foreach ($events as $event) {
+                    $data[] = $event->toFullcalendarEvent();
+                }
+            }
+        }
+        return $data;
+    }
+}
diff --git a/lib/classes/Icon.class.php b/lib/classes/Icon.class.php
deleted file mode 100644
index 6c586a0..0000000
--- a/lib/classes/Icon.class.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * Icon class is used to create icon objects which can be rendered as
- * svg. Output will be html. Optionally, the icon can be rendered
- * as a css background.
- *
- * @author    Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @copyright Stud.IP Core Group
- * @license   GPL2 or any later version
- * @since     3.2
- */
-class Icon
-{
-    const SVG = 1;
-    const CSS_BACKGROUND = 4;
-    const INPUT = 256;
-
-    const DEFAULT_SIZE = 16;
-    const DEFAULT_COLOR = 'blue';
-    const DEFAULT_ROLE = 'clickable';
-
-    const ROLE_INFO          = 'info';
-    const ROLE_CLICKABLE     = 'clickable';
-    const ROLE_ACCEPT        = 'accept';
-    const ROLE_STATUS_GREEN  = 'status-green';
-    const ROLE_INACTIVE      = 'inactive';
-    const ROLE_NAVIGATION    = 'navigation';
-    const ROLE_NEW           = 'new';
-    const ROLE_ATTENTION     = 'attention';
-    const ROLE_STATUS_RED    = 'status-red';
-    const ROLE_INFO_ALT      = 'info_alt';
-    const ROLE_SORT          = 'sort';
-    const ROLE_STATUS_YELLOW = 'status-yellow';
-
-
-    protected $shape;
-    protected $role;
-    protected $attributes = [];
-
-
-    /**
-     * This is the magical Role to Color mapping.
-     */
-    private static $roles_to_colors = [
-        self::ROLE_INFO          => 'black',
-        self::ROLE_CLICKABLE     => 'blue',
-        self::ROLE_ACCEPT        => 'green',
-        self::ROLE_STATUS_GREEN  => 'green',
-        self::ROLE_INACTIVE      => 'grey',
-        self::ROLE_NAVIGATION    => 'blue',
-        self::ROLE_NEW           => 'red',
-        self::ROLE_ATTENTION     => 'red',
-        self::ROLE_STATUS_RED    => 'red',
-        self::ROLE_INFO_ALT      => 'white',
-        self::ROLE_SORT          => 'blue',
-        self::ROLE_STATUS_YELLOW => 'yellow'
-    ];
-
-    // return the color associated to a role
-    private static function roleToColor($role)
-    {
-        if (!isset(self::$roles_to_colors[$role])) {
-            throw new \InvalidArgumentException('Unknown role: "' . $role . '"');
-        }
-        return self::$roles_to_colors[$role];
-    }
-
-    // return the roles! associated to a color
-    public static function colorToRoles($color)
-    {
-        static $colors_to_roles;
-
-        if (!$colors_to_roles) {
-            foreach (self::$roles_to_colors as $r => $c) {
-                $colors_to_roles[$c][] = $r;
-            }
-        }
-
-        if (!isset($colors_to_roles[$color])) {
-            throw new \InvalidArgumentException('Unknown color: "' . $color . '"');
-        }
-
-        return $colors_to_roles[$color];
-    }
-
-    /**
-     * Create a new Icon object.
-     *
-     * This is just a factory method. You could easily just call the
-     * constructor instead.
-     *
-     * @param String $shape      Shape of the icon, may contain a mixed definition
-     *                           like 'seminar'
-     * @param String $role       Role of the icon, defaults to Icon::DEFAULT_ROLE
-     * @param Array $attributes  Additional attributes like 'title';
-     *                           only use semantic ones describing
-     *                           this icon regardless of its later
-     *                           rendering in a view
-     * @return Icon object
-     */
-    public static function create($shape, $role = Icon::DEFAULT_ROLE, $attributes = [])
-    {
-        // $role may be omitted
-        if (is_array($role)) {
-            $attributes = $role;
-            $role = Icon::DEFAULT_ROLE;
-        }
-
-        return new self($shape, $role, $attributes);
-    }
-
-    /**
-     * Constructor of the object.
-     *
-     * @param String $shape      Shape of the icon, may contain a mixed definition
-     *                           like 'seminar'
-     * @param String $role       Role of the icon, defaults to Icon::DEFAULT_ROLE
-     * @param Array $attributes  Additional attributes like 'title';
-     *                           only use semantic ones describing
-     *                           this icon regardless of its later
-     *                           rendering in a view
-     */
-    public function __construct($shape, $role = Icon::DEFAULT_ROLE, array $attributes = [])
-    {
-
-        // only defined roles
-        if (!isset(self::$roles_to_colors[$role])) {
-            throw new \InvalidArgumentException('Creating an Icon without proper role: "' . $role . '"');
-        }
-
-        // only semantic attributes
-        if ($non_semantic = array_filter(array_keys($attributes), function ($attr) {
-            return !in_array($attr, ['title']);
-        })) {
-            // DEPRECATED
-            // TODO starting with the v3.6 the following line should
-            // be enabled to prevent non-semantic attributes in this position
-            # throw new \InvalidArgumentException('Creating an Icon with non-semantic attributes:' . json_encode($non_semantic));
-        }
-
-        $this->shape      = $shape;
-        $this->role       = $role;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * Returns the `shape` -- the string describing the shape of this instance.
-     * @return String  the shape of this Icon
-     */
-    public function getShape()
-    {
-        return $this->shapeToPath($this->shape);
-    }
-
-    /**
-     * Returns the `role` -- the string describing the role of this instance.
-     * @return String  the role of this Icon
-     */
-    public function getRole()
-    {
-        return $this->role;
-    }
-
-    /**
-     * Returns the semantic `attributes` of this instance, e.g. the title of this Icon
-     * @return Array  the semantic attribiutes of the Icon
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Returns whether this icon intends to signal attention.
-     *
-     * @todo This is currently just a heuristic based on the associated icon
-     *       role. Although this is sufficient for the current requirements,
-     *       it could probably in a better, more suitable way.
-     *
-     * @return bool
-     * @since Stud.IP 5.0
-     */
-    public function signalsAttention()
-    {
-        return $this->roleToColor($this->role) === 'red';
-    }
-
-    /**
-     * Function to be called whenever the object is converted to
-     * string. Internally the same as calling Icon::asImg
-     *
-     * @return String representation
-     */
-    public function __toString()
-    {
-        return $this->asImg();
-    }
-
-    /**
-     * Renders the icon inside an img html tag.
-     *
-     * @param int   $size             Optional; Defines the dimension in px of the rendered icon; FALSE prevents any
-     *                                width or height attributes
-     * @param Array $view_attributes  Optional; Additional attributes to pass
-     *                                into the rendered output
-     * @return String containing the html representation for the icon.
-     */
-    public function asImg($size = null, $view_attributes = [])
-    {
-        if (is_array($size)) {
-            list($view_attributes, $size) = [$size, null];
-        }
-        return sprintf(
-            '<img %s>',
-            arrayToHtmlAttributes(
-                $this->prepareHTMLAttributes($size, $view_attributes)
-            )
-        );
-    }
-
-    /**
-     * Renders the icon inside an input html tag.
-     *
-     * @param int   $size             Optional; Defines the dimension in px of the rendered icon; FALSE prevents any
-     *                                width or height attributes
-     * @param Array $view_attributes  Optional; Additional attributes to pass
-     *                                into the rendered output
-     * @return String containing the html representation for the icon.
-     */
-    public function asInput($size = null, $view_attributes = [])
-    {
-        if (is_array($size)) {
-            list($view_attributes, $size) = [$size, null];
-        }
-        return sprintf(
-            '<input type="image" %s>',
-            arrayToHtmlAttributes(
-                $this->prepareHTMLAttributes($size, $view_attributes)
-            )
-        );
-    }
-
-    /**
-     * Renders the icon as a set of css background rules.
-     *
-     * @param int $size  Optional; Defines the size in px of the rendered icon
-     * @return String containing the html representation for css backgrounds
-     */
-    public function asCSS($size = null)
-    {
-        if (self::isStatic($this->shape)) {
-            return sprintf(
-                'background-image:url(%1$s);background-size:%2$upx %2$upx;',
-                $this->shapeToPath($this->shape),
-                $this->get_size($size)
-            );
-        }
-
-        return sprintf(
-            'background-image:url(%1$s);background-size:%2$upx %2$upx;',
-            $this->get_asset_svg(),
-            $this->get_size($size)
-        );
-    }
-
-    /**
-     * Returns a path to the SVG matching the icon.
-     *
-     * @return String containing the html representation for css backgrounds
-     */
-    public function asImagePath()
-    {
-        return $this->prepareHTMLAttributes(false, [])['src'];
-    }
-
-    /**
-     * Returns a new Icon with a changed shape
-     * @param mixed  $shape  New value of `shape`
-     * @return Icon  A new Icon with a new `shape`
-     */
-    public function copyWithShape($shape)
-    {
-        $clone = clone $this;
-        $clone->shape = $shape;
-        return $clone;
-    }
-
-    /**
-     * Returns a new Icon with a changed role
-     * @param mixed  $role  New value of `role`
-     * @return Icon  A new Icon with a new `role`
-     */
-    public function copyWithRole($role)
-    {
-        $clone = clone $this;
-        $clone->role = $role;
-        return $clone;
-    }
-
-    /**
-     * Returns a new Icon with new attributes
-     * @param mixed  $attributes  New value of `attributes`
-     * @return Icon  A new Icon with a new `attributes`
-     */
-    public function copyWithAttributes($attributes)
-    {
-        $clone = clone $this;
-        $clone->attributes = $attributes;
-        return $clone;
-    }
-
-    /**
-     * Prepares the html attributes for use assembling HTML attributes
-     * from given shape, role, size, semantic and view attributes
-     *
-     * @param int   $size       Size of the icon
-     * @param array $attributes Additional attributes
-     * @return Array containing the merged attributes
-     */
-    private function prepareHTMLAttributes($size, $attributes)
-    {
-        $dimensions = [];
-        if ($size !== false) {
-            $size = $this->get_size($size);
-            $dimensions = ['width'  => $size, 'height' => $size];
-        }
-
-        $result = array_merge($this->attributes, $attributes, $dimensions, [
-            'src' => self::isStatic($this->shape) ? $this->shape : $this->get_asset_svg(),
-        ]);
-
-        if (!isset($result['alt']) && !isset($result['title'])) {
-            //Add an empty alt attribute to prevent screen readers from
-            //reading the URL of the icon:
-            $result['alt'] = '';
-        }
-
-        $classNames = 'icon-role-' . $this->role;
-
-        if (!self::isStatic($this->shape)) {
-            $classNames .= ' icon-shape-' . $this->shapeToPath($this->shape);
-        }
-
-        $result['class'] = isset($result['class']) ? $result['class'] . ' ' . $classNames : $classNames;
-
-        return $result;
-    }
-
-    /**
-     * Get the correct asset for an SVG icon.
-     *
-     * @return String containing the url of the corresponding asset
-     */
-    protected function get_asset_svg()
-    {
-        return Assets::url('images/icons/' . self::roleToColor($this->role) . '/' . $this->shapeToPath($this->shape) . '.svg');
-    }
-
-    /**
-     * Get the size of the icon. If a size was passed as a parameter and
-     * inside the attributes array during icon construction, the size from
-     * the attributes will be used.
-     *
-     * @param int $size  size of the icon
-     * @return int Size of the icon in pixels
-     */
-    protected function get_size($size)
-    {
-        $size = $size ?: Icon::DEFAULT_SIZE;
-        if (isset($this->attributes['size'])) {
-            $parts =  explode('@', $this->attributes['size'], 2);
-            $size = $parts[0];
-            $temp = $parts[1] ?? null;
-            unset($this->attributes['size']);
-        }
-        return (int)$size;
-    }
-
-    // an icon is static if it starts with 'http'
-    private static function isStatic($shape)
-    {
-        return mb_strpos($shape, 'http') === 0;
-    }
-
-    // transforms a shape w/ possible additions (`shape`) to a path `(addition/)?shape`
-    private function shapeToPath()
-    {
-        if (self::isStatic($this->shape)) {
-            return $this->shape;
-        }
-        $shape = array_reverse(explode('/', $this->shape))[0];
-        $shape = explode('+', $shape)[0];
-        return $shape;
-    }
-}
diff --git a/lib/classes/Icon.php b/lib/classes/Icon.php
new file mode 100644
index 0000000..6c586a0
--- /dev/null
+++ b/lib/classes/Icon.php
@@ -0,0 +1,395 @@
+<?php
+/**
+ * Icon class is used to create icon objects which can be rendered as
+ * svg. Output will be html. Optionally, the icon can be rendered
+ * as a css background.
+ *
+ * @author    Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @copyright Stud.IP Core Group
+ * @license   GPL2 or any later version
+ * @since     3.2
+ */
+class Icon
+{
+    const SVG = 1;
+    const CSS_BACKGROUND = 4;
+    const INPUT = 256;
+
+    const DEFAULT_SIZE = 16;
+    const DEFAULT_COLOR = 'blue';
+    const DEFAULT_ROLE = 'clickable';
+
+    const ROLE_INFO          = 'info';
+    const ROLE_CLICKABLE     = 'clickable';
+    const ROLE_ACCEPT        = 'accept';
+    const ROLE_STATUS_GREEN  = 'status-green';
+    const ROLE_INACTIVE      = 'inactive';
+    const ROLE_NAVIGATION    = 'navigation';
+    const ROLE_NEW           = 'new';
+    const ROLE_ATTENTION     = 'attention';
+    const ROLE_STATUS_RED    = 'status-red';
+    const ROLE_INFO_ALT      = 'info_alt';
+    const ROLE_SORT          = 'sort';
+    const ROLE_STATUS_YELLOW = 'status-yellow';
+
+
+    protected $shape;
+    protected $role;
+    protected $attributes = [];
+
+
+    /**
+     * This is the magical Role to Color mapping.
+     */
+    private static $roles_to_colors = [
+        self::ROLE_INFO          => 'black',
+        self::ROLE_CLICKABLE     => 'blue',
+        self::ROLE_ACCEPT        => 'green',
+        self::ROLE_STATUS_GREEN  => 'green',
+        self::ROLE_INACTIVE      => 'grey',
+        self::ROLE_NAVIGATION    => 'blue',
+        self::ROLE_NEW           => 'red',
+        self::ROLE_ATTENTION     => 'red',
+        self::ROLE_STATUS_RED    => 'red',
+        self::ROLE_INFO_ALT      => 'white',
+        self::ROLE_SORT          => 'blue',
+        self::ROLE_STATUS_YELLOW => 'yellow'
+    ];
+
+    // return the color associated to a role
+    private static function roleToColor($role)
+    {
+        if (!isset(self::$roles_to_colors[$role])) {
+            throw new \InvalidArgumentException('Unknown role: "' . $role . '"');
+        }
+        return self::$roles_to_colors[$role];
+    }
+
+    // return the roles! associated to a color
+    public static function colorToRoles($color)
+    {
+        static $colors_to_roles;
+
+        if (!$colors_to_roles) {
+            foreach (self::$roles_to_colors as $r => $c) {
+                $colors_to_roles[$c][] = $r;
+            }
+        }
+
+        if (!isset($colors_to_roles[$color])) {
+            throw new \InvalidArgumentException('Unknown color: "' . $color . '"');
+        }
+
+        return $colors_to_roles[$color];
+    }
+
+    /**
+     * Create a new Icon object.
+     *
+     * This is just a factory method. You could easily just call the
+     * constructor instead.
+     *
+     * @param String $shape      Shape of the icon, may contain a mixed definition
+     *                           like 'seminar'
+     * @param String $role       Role of the icon, defaults to Icon::DEFAULT_ROLE
+     * @param Array $attributes  Additional attributes like 'title';
+     *                           only use semantic ones describing
+     *                           this icon regardless of its later
+     *                           rendering in a view
+     * @return Icon object
+     */
+    public static function create($shape, $role = Icon::DEFAULT_ROLE, $attributes = [])
+    {
+        // $role may be omitted
+        if (is_array($role)) {
+            $attributes = $role;
+            $role = Icon::DEFAULT_ROLE;
+        }
+
+        return new self($shape, $role, $attributes);
+    }
+
+    /**
+     * Constructor of the object.
+     *
+     * @param String $shape      Shape of the icon, may contain a mixed definition
+     *                           like 'seminar'
+     * @param String $role       Role of the icon, defaults to Icon::DEFAULT_ROLE
+     * @param Array $attributes  Additional attributes like 'title';
+     *                           only use semantic ones describing
+     *                           this icon regardless of its later
+     *                           rendering in a view
+     */
+    public function __construct($shape, $role = Icon::DEFAULT_ROLE, array $attributes = [])
+    {
+
+        // only defined roles
+        if (!isset(self::$roles_to_colors[$role])) {
+            throw new \InvalidArgumentException('Creating an Icon without proper role: "' . $role . '"');
+        }
+
+        // only semantic attributes
+        if ($non_semantic = array_filter(array_keys($attributes), function ($attr) {
+            return !in_array($attr, ['title']);
+        })) {
+            // DEPRECATED
+            // TODO starting with the v3.6 the following line should
+            // be enabled to prevent non-semantic attributes in this position
+            # throw new \InvalidArgumentException('Creating an Icon with non-semantic attributes:' . json_encode($non_semantic));
+        }
+
+        $this->shape      = $shape;
+        $this->role       = $role;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * Returns the `shape` -- the string describing the shape of this instance.
+     * @return String  the shape of this Icon
+     */
+    public function getShape()
+    {
+        return $this->shapeToPath($this->shape);
+    }
+
+    /**
+     * Returns the `role` -- the string describing the role of this instance.
+     * @return String  the role of this Icon
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+
+    /**
+     * Returns the semantic `attributes` of this instance, e.g. the title of this Icon
+     * @return Array  the semantic attribiutes of the Icon
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Returns whether this icon intends to signal attention.
+     *
+     * @todo This is currently just a heuristic based on the associated icon
+     *       role. Although this is sufficient for the current requirements,
+     *       it could probably in a better, more suitable way.
+     *
+     * @return bool
+     * @since Stud.IP 5.0
+     */
+    public function signalsAttention()
+    {
+        return $this->roleToColor($this->role) === 'red';
+    }
+
+    /**
+     * Function to be called whenever the object is converted to
+     * string. Internally the same as calling Icon::asImg
+     *
+     * @return String representation
+     */
+    public function __toString()
+    {
+        return $this->asImg();
+    }
+
+    /**
+     * Renders the icon inside an img html tag.
+     *
+     * @param int   $size             Optional; Defines the dimension in px of the rendered icon; FALSE prevents any
+     *                                width or height attributes
+     * @param Array $view_attributes  Optional; Additional attributes to pass
+     *                                into the rendered output
+     * @return String containing the html representation for the icon.
+     */
+    public function asImg($size = null, $view_attributes = [])
+    {
+        if (is_array($size)) {
+            list($view_attributes, $size) = [$size, null];
+        }
+        return sprintf(
+            '<img %s>',
+            arrayToHtmlAttributes(
+                $this->prepareHTMLAttributes($size, $view_attributes)
+            )
+        );
+    }
+
+    /**
+     * Renders the icon inside an input html tag.
+     *
+     * @param int   $size             Optional; Defines the dimension in px of the rendered icon; FALSE prevents any
+     *                                width or height attributes
+     * @param Array $view_attributes  Optional; Additional attributes to pass
+     *                                into the rendered output
+     * @return String containing the html representation for the icon.
+     */
+    public function asInput($size = null, $view_attributes = [])
+    {
+        if (is_array($size)) {
+            list($view_attributes, $size) = [$size, null];
+        }
+        return sprintf(
+            '<input type="image" %s>',
+            arrayToHtmlAttributes(
+                $this->prepareHTMLAttributes($size, $view_attributes)
+            )
+        );
+    }
+
+    /**
+     * Renders the icon as a set of css background rules.
+     *
+     * @param int $size  Optional; Defines the size in px of the rendered icon
+     * @return String containing the html representation for css backgrounds
+     */
+    public function asCSS($size = null)
+    {
+        if (self::isStatic($this->shape)) {
+            return sprintf(
+                'background-image:url(%1$s);background-size:%2$upx %2$upx;',
+                $this->shapeToPath($this->shape),
+                $this->get_size($size)
+            );
+        }
+
+        return sprintf(
+            'background-image:url(%1$s);background-size:%2$upx %2$upx;',
+            $this->get_asset_svg(),
+            $this->get_size($size)
+        );
+    }
+
+    /**
+     * Returns a path to the SVG matching the icon.
+     *
+     * @return String containing the html representation for css backgrounds
+     */
+    public function asImagePath()
+    {
+        return $this->prepareHTMLAttributes(false, [])['src'];
+    }
+
+    /**
+     * Returns a new Icon with a changed shape
+     * @param mixed  $shape  New value of `shape`
+     * @return Icon  A new Icon with a new `shape`
+     */
+    public function copyWithShape($shape)
+    {
+        $clone = clone $this;
+        $clone->shape = $shape;
+        return $clone;
+    }
+
+    /**
+     * Returns a new Icon with a changed role
+     * @param mixed  $role  New value of `role`
+     * @return Icon  A new Icon with a new `role`
+     */
+    public function copyWithRole($role)
+    {
+        $clone = clone $this;
+        $clone->role = $role;
+        return $clone;
+    }
+
+    /**
+     * Returns a new Icon with new attributes
+     * @param mixed  $attributes  New value of `attributes`
+     * @return Icon  A new Icon with a new `attributes`
+     */
+    public function copyWithAttributes($attributes)
+    {
+        $clone = clone $this;
+        $clone->attributes = $attributes;
+        return $clone;
+    }
+
+    /**
+     * Prepares the html attributes for use assembling HTML attributes
+     * from given shape, role, size, semantic and view attributes
+     *
+     * @param int   $size       Size of the icon
+     * @param array $attributes Additional attributes
+     * @return Array containing the merged attributes
+     */
+    private function prepareHTMLAttributes($size, $attributes)
+    {
+        $dimensions = [];
+        if ($size !== false) {
+            $size = $this->get_size($size);
+            $dimensions = ['width'  => $size, 'height' => $size];
+        }
+
+        $result = array_merge($this->attributes, $attributes, $dimensions, [
+            'src' => self::isStatic($this->shape) ? $this->shape : $this->get_asset_svg(),
+        ]);
+
+        if (!isset($result['alt']) && !isset($result['title'])) {
+            //Add an empty alt attribute to prevent screen readers from
+            //reading the URL of the icon:
+            $result['alt'] = '';
+        }
+
+        $classNames = 'icon-role-' . $this->role;
+
+        if (!self::isStatic($this->shape)) {
+            $classNames .= ' icon-shape-' . $this->shapeToPath($this->shape);
+        }
+
+        $result['class'] = isset($result['class']) ? $result['class'] . ' ' . $classNames : $classNames;
+
+        return $result;
+    }
+
+    /**
+     * Get the correct asset for an SVG icon.
+     *
+     * @return String containing the url of the corresponding asset
+     */
+    protected function get_asset_svg()
+    {
+        return Assets::url('images/icons/' . self::roleToColor($this->role) . '/' . $this->shapeToPath($this->shape) . '.svg');
+    }
+
+    /**
+     * Get the size of the icon. If a size was passed as a parameter and
+     * inside the attributes array during icon construction, the size from
+     * the attributes will be used.
+     *
+     * @param int $size  size of the icon
+     * @return int Size of the icon in pixels
+     */
+    protected function get_size($size)
+    {
+        $size = $size ?: Icon::DEFAULT_SIZE;
+        if (isset($this->attributes['size'])) {
+            $parts =  explode('@', $this->attributes['size'], 2);
+            $size = $parts[0];
+            $temp = $parts[1] ?? null;
+            unset($this->attributes['size']);
+        }
+        return (int)$size;
+    }
+
+    // an icon is static if it starts with 'http'
+    private static function isStatic($shape)
+    {
+        return mb_strpos($shape, 'http') === 0;
+    }
+
+    // transforms a shape w/ possible additions (`shape`) to a path `(addition/)?shape`
+    private function shapeToPath()
+    {
+        if (self::isStatic($this->shape)) {
+            return $this->shape;
+        }
+        $shape = array_reverse(explode('/', $this->shape))[0];
+        $shape = explode('+', $shape)[0];
+        return $shape;
+    }
+}
diff --git a/lib/classes/InstituteAvatar.class.php b/lib/classes/InstituteAvatar.class.php
deleted file mode 100644
index 8adbfba..0000000
--- a/lib/classes/InstituteAvatar.class.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * This class represents the avatar of a institute.
- *
- * @author    André Noack <noack@data-quest.de>
- * @author    Marcus Lunzenauer <mlunzena@uos>
- * @copyright (c) Authors
- * @license   GPL2 or any later version
- * @since     1.10
- */
-class InstituteAvatar extends CourseAvatar
-{
-    public const AVATAR_TYPE = 'institute';
-
-    /**
-     * Returns the CSS class to use for this avatar image.
-     *
-     * @param string  $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
-     * @return string CSS class to use for the avatar
-     */
-    protected function getCssClass($size)
-    {
-        return "institute-avatar-{$size} institute-{$this->user_id}";
-    }
-
-    /**
-     * Return the default title of the avatar.
-     * @return string the default title
-     */
-    public function getDefaultTitle()
-    {
-        $institute = Institute::find($this->user_id);
-        return $institute ? (string) $institute->name : self::NOBODY;
-    }
-    
-    /**
-     * Return if avatar is visible to the current user.
-     * @return boolean: true if visible
-     */
-    protected function checkAvatarVisibility()
-    {
-        //no special conditions for visibility of course-avatars yet
-        return true;
-    }
-}
diff --git a/lib/classes/InstituteAvatar.php b/lib/classes/InstituteAvatar.php
new file mode 100644
index 0000000..8adbfba
--- /dev/null
+++ b/lib/classes/InstituteAvatar.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * This class represents the avatar of a institute.
+ *
+ * @author    André Noack <noack@data-quest.de>
+ * @author    Marcus Lunzenauer <mlunzena@uos>
+ * @copyright (c) Authors
+ * @license   GPL2 or any later version
+ * @since     1.10
+ */
+class InstituteAvatar extends CourseAvatar
+{
+    public const AVATAR_TYPE = 'institute';
+
+    /**
+     * Returns the CSS class to use for this avatar image.
+     *
+     * @param string  $size one of the constants Avatar::(NORMAL|MEDIUM|SMALL)
+     * @return string CSS class to use for the avatar
+     */
+    protected function getCssClass($size)
+    {
+        return "institute-avatar-{$size} institute-{$this->user_id}";
+    }
+
+    /**
+     * Return the default title of the avatar.
+     * @return string the default title
+     */
+    public function getDefaultTitle()
+    {
+        $institute = Institute::find($this->user_id);
+        return $institute ? (string) $institute->name : self::NOBODY;
+    }
+    
+    /**
+     * Return if avatar is visible to the current user.
+     * @return boolean: true if visible
+     */
+    protected function checkAvatarVisibility()
+    {
+        //no special conditions for visibility of course-avatars yet
+        return true;
+    }
+}
diff --git a/lib/classes/InstituteCalendarHelper.class.php b/lib/classes/InstituteCalendarHelper.class.php
deleted file mode 100644
index 4302cf1..0000000
--- a/lib/classes/InstituteCalendarHelper.class.php
+++ /dev/null
@@ -1,810 +0,0 @@
-<?php
-
-/**
- * InstituteCalendarHelper.class.php - class for institute calendar convenience functions
- *
- * @author      Timo Hartge <hartge@data-quest>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- */
-
-class InstituteCalendarHelper
-{
-    const COLUMN_DATAFIELD_ID = '69f6485f3c937766866a03d9d642ecbb';
-    const COLOR_DATAFIELD_ID = '41cda2be71fe9efd6e28b853fc0681f3';
-    const INST_DEFAULT_COLOR_DATAFIELD_ID = '0c63321a8e93b3ccc927611709248e07';
-    const DEFAULT_EVENT_COLOR = '#899ab9';
-
-    /**
-     * Returns the default calendar columns.
-     *
-     * @return array   default column names
-     */
-    private static function getDefaultColumns()
-    {
-        return [
-            1 => ['Spalte 1', 1],
-            2 => ['Spalte 2', 1],
-            3 => ['Spalte 3', 1],
-            4 => ['Spalte 4', 1],
-            5 => ['Spalte 5', 1],
-            6 => ['Spalte 6', 1]
-        ];
-    }
-
-    /**
-     * Fetches the stores columns merged with defaults.
-     *
-     * @param string $institut_id
-     * @param boolean $only_visible only return visible columns
-     *
-     * @return array column array in a fullcalender expected format
-     */
-    public static function getResourceColumns($institut_id, $only_visible = false)
-    {
-        $columns = [];
-        $inst_columns = [
-            0 => ['Sammelspalte', 1]
-        ];
-
-        $db_inst_columns = InstitutePlanColumn::findByInstitute($institut_id);
-
-        if ($db_inst_columns) {
-            foreach ($db_inst_columns as $col_info) {
-                $inst_columns[$col_info['column']] = [$col_info['name'], $col_info['visible']];
-            }
-        } else {
-            $inst_columns = array_merge($inst_columns, self::getDefaultColumns());
-        }
-        foreach ($inst_columns as $id => $info) {
-            if ($only_visible && !$info[1]) continue;
-            $columns[] = ['id' => $id, 'title' => $info[0], 'visible' => $info[1]];
-        }
-        return $columns;
-    }
-
-    /**
-     * Adds the default resource columns
-     *
-     * @param string $institut_id
-     *
-     * @return int last resource column number
-     */
-    public static function addDefaultResourceColumns($institut_id)
-    {
-        $max_col = 0;
-        foreach (self::getDefaultColumns() as $col_id => $col_info) {
-            $new_col = new InstitutePlanColumn([$institut_id, $col_id]);
-            $new_col->name = $col_info[0];
-            $new_col->visible = $col_info[1];
-            if ($new_col->store()) {
-                $max_col = $col_id;
-            }
-        }
-        return $max_col;
-    }
-
-    /**
-     * Adds a resource column
-     *
-     * @param string $institut_id
-     * @param string $name
-     * @param int $specific_column_number
-     *
-     * @return int number of affected rows
-     */
-    public static function addResourceColumn($institut_id, $name, $specific_column_number = 0)
-    {
-        $last_col = InstitutePlanColumn::getLastColumnOfInstitute($institut_id);
-        if ($last_col !== null) {
-            $max_col = $last_col->column;
-        } else {
-            $max_col = self::addDefaultResourceColumns($institut_id);
-        }
-        $column_number = $specific_column_number>0?$specific_column_number:intval($max_col)+1;
-        $new_col = new InstitutePlanColumn([$institut_id, $column_number]);
-        $new_col->name = $name;
-        $new_col->visible = 1;
-        return $new_col->store();
-    }
-
-    /**
-     * Looks up column id for course events
-     *
-     * @param Course $course
-     *
-     * @return array course events with column id
-     */
-    public static function getCourseEventcolumns(Course $course)
-    {
-        $df = DatafieldEntryModel::findByModel($course, self::COLUMN_DATAFIELD_ID);
-        if ($df[0] && $df[0]->content) {
-            $event_columns = unserialize($df[0]->content);
-        } else {
-            $event_columns = [];
-        }
-        return $event_columns;
-    }
-
-    /**
-     * Sets the column id for course events
-     *
-     * @param Course $course
-     * @param string $event_id SeminarCycleDate id
-     * @param string $institut_id
-     * @param string $column number of the column
-     *
-     * @return bool stored
-     */
-    public static function setCourseEventcolumn($course, $event_id, $institut_id, $column)
-    {
-        $df = DatafieldEntryModel::findByModel($course, self::COLUMN_DATAFIELD_ID);
-        if ($df[0]) {
-            $event_columns = self::getCourseEventcolumns($course);
-            if (!is_array($event_columns[$event_id])) {
-                unset($event_columns[$event_id]);
-            }
-            $event_columns[$event_id][$institut_id] = $column;
-            $df[0]->content = serialize($event_columns);
-            return $df[0]->store();
-        }
-        return false;
-    }
-
-    /**
-     * Looks up color value for course events
-     *
-     * @param Course $course
-     *
-     * @return array course events with color value
-     */
-    public static function getCourseEventcolors($course)
-    {
-        $df = DatafieldEntryModel::findByModel($course, self::COLOR_DATAFIELD_ID);
-        if ($df[0] && $df[0]->content) {
-            $event_colors = unserialize($df[0]->content);
-        } else {
-            $event_colors = [];
-        }
-        return $event_colors;
-    }
-
-    /**
-     * Sets color value for course events
-     *
-     * @param Course $course
-     * @param string $event_id SeminarCycleDate id
-     * @param string $institut_id
-     * @param string $color colorcode
-     *
-     * @return bool stored
-     */
-    public static function setCourseEventcolor($course, $event_id, $institut_id, $color)
-    {
-        $df = DatafieldEntryModel::findByModel($course, self::COLOR_DATAFIELD_ID);
-        if ($df[0]) {
-            $event_colors = self::getCourseEventcolors($course);
-            if (!is_array($event_colors[$event_id])) {
-                unset($event_colors[$event_id]);
-            }
-            $event_colors[$event_id][$institut_id] = $color;
-            $df[0]->content = serialize($event_colors);
-            return $df[0]->store();
-        }
-        return false;
-    }
-
-    /**
-     * Looks up default color value for institute course events
-     *
-     * @param SimpleORMap $context
-     *
-     * @return array course events with color value
-     */
-    public static function getInstituteDefaultEventcolors($context)
-    {
-        $df = DatafieldEntryModel::findByModel($context, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
-        if ($df && $df[0]->content) {
-            $event_colors = unserialize($df[0]->content);
-        } else {
-            $event_colors = [];
-        }
-        return $event_colors;
-    }
-
-    /**
-     * Sets default institute course events color value for semtypes
-     *
-     * @param SimpleORMap $context
-     * @param string $semtype
-     * @param string $color colorcode
-     *
-     * @return bool stored
-     */
-    public static function setInstituteDefaultEventcolor($context, $semtype, $color)
-    {
-        $df = DatafieldEntryModel::findByModel($context, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
-        if ($df[0]) {
-            $event_colors = self::getInstituteDefaultEventcolors($context);
-            $event_colors[$semtype['name']] = $color;
-            $df[0]->content = serialize($event_colors);
-            return $df[0]->store();
-        }
-        return false;
-    }
-
-    /**
-     * Sets color value for every course events of given courses semtype
-     *
-     * @param Course $course
-     * @param string $institut_id
-     * @param string $color colorcode
-     *
-     * @return bool stored
-     */
-    public static function setSemtypeEventcolor($course, $institut_id, $color)
-    {
-        $semtype = $course->getSemType();
-        $institut = Institute::find($institut_id);
-        if ($institut) {
-            self::setInstituteDefaultEventcolor($institut, $semtype, $color);
-        }
-        $courses = Course::findBySQL('status =? AND Institut_id=?', [$semtype['id'], $course->institut_id]);
-        if ($courses) {
-            foreach ($courses as $semtype_course) {
-                foreach (SeminarCycleDate::findBySeminar($semtype_course->seminar_id) as $cycle_date) {
-                    self::setCourseEventcolor($semtype_course, $cycle_date->id, $institut_id, $color);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Prepares an array of course id and names for creation of dropable calendar events
-     *
-     * @param array $courses Array of courses
-     * @param array $semester Semester
-     *
-     * @return array prepared array
-     */
-    public static function getEventlessCourses($courses, $semester = null)
-    {
-        $eventless = [];
-        foreach (array_keys($courses) as $cid) {
-            $course = Course::find($cid);
-            $cycle_dates = SeminarCycleDate::findBySeminar($course->seminar_id);
-            if (count($cycle_dates) < 1) {
-                $eventless[$cid] = $course->getFullName('number-name');
-            } elseif ($semester) {
-                $has_date_in_semester = false;
-                foreach ($cycle_dates as $cycle_date) {
-                    foreach ($cycle_date->getAllDates() as $course_date) {
-                        if ($course_date->date >= $semester->beginn && $course_date->date <= $semester->ende) {
-                            $has_date_in_semester = true;
-                            break;
-                        }
-                    }
-                    if ($has_date_in_semester) break;
-                }
-                if (!$has_date_in_semester) {
-                    $eventless[$cid] = $course->getFullName('number-name');
-                }
-            }
-        }
-        return $eventless;
-    }
-
-    /**
-     * Creates FullCalendar event date of course events
-     *
-     * @param array $courses Array of courses
-     * @param string $institut_id
-     * @param array $semester Semester
-     * @param array $specific_weekday fetch only events for specific weekday
-     *
-     * @return array fullcalendar events
-     */
-    public static function getEvents($courses, $institut_id, $semester = null, $specific_weekday = null)
-    {
-        $today = date('w');
-
-        $user_insts = array_map(function ($arr) {
-            return $arr['Institut_id'];
-        }, Institute::getMyInstitutes($GLOBALS['user']->id));
-
-        $min_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR);
-        $minbigtime = (int) $min_time[0];
-        $max_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_END_HOUR);
-        $maxbigtime = (int) $max_time[0];
-
-        $institut = Institute::find($institut_id);
-
-        if (!$institut) {
-            return [];
-        }
-
-        $inst_default_colors = self::getInstituteDefaultEventcolors($institut);
-
-        $events = [];
-        Course::findEachMany(function ($course) use (
-            $courses,
-            &$events,
-            $today,
-            $minbigtime,
-            $maxbigtime,
-            $user_insts,
-            $institut_id,
-            $inst_default_colors,
-            $semester,
-            $specific_weekday
-        ) {
-            $semtype = $course->getSemType();
-
-            $event_columns = self::getCourseEventcolumns($course) ?: [];
-            $event_colors = self::getCourseEventcolors($course) ?: [];
-
-            if (in_array($course->institut_id, $user_insts)) {
-                $is_editable = true;
-                $is_start_editable = !LockRules::Check($course->id, 'room_time');
-                $is_duration_editable = false;
-            } else {
-                $is_editable = false;
-                $is_start_editable = false;
-                $is_duration_editable = false;
-            }
-
-            foreach (SeminarCycleDate::findBySeminar($course->seminar_id) as $cycle_date) {
-                if ($semester) {
-                    $has_date_in_semester = false;
-                    foreach ($cycle_date->getAllDates() as $course_date) {
-                        if ($course_date->date >= $semester->beginn && $course_date->date <= $semester->ende) {
-                            $has_date_in_semester = true;
-                            break;
-                        }
-                    }
-                    if (!$has_date_in_semester) {
-                        continue;
-                    }
-                }
-
-                if (is_numeric($specific_weekday) && $specific_weekday != $cycle_date['weekday']) {
-                    continue;
-                }
-
-                $conform = true;
-
-                if ($cycle_date['weekday'] == 0) {
-                    $day_offset = 7 - $today;
-                } else {
-                    $day_offset = $cycle_date['weekday'] - $today;
-                }
-
-                $start_time = explode(':', $cycle_date['start_time']);
-                $bigtime = (int) $start_time[0];
-                if ($bigtime > $maxbigtime || $bigtime < $minbigtime) {
-                    $conform = false;
-                } elseif ($bigtime % 2) {
-                    $bigtime--;
-                }
-                $start_time = $bigtime . ':00:00';
-
-                $end_time = explode(':', $start_time);
-                $end_time[0] += 2;
-                $end_time = implode(':', $end_time);
-
-                $move_url = URLHelper::getURL('dispatch.php/admin/courseplanning/move_event');
-                $name = $course->getFullName('number-name');
-
-                if ($start_time != $cycle_date['start_time'] && $end_time != $cycle_date['end_time']) {
-                    $start = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['start_time']);
-                    $end = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['end_time']);
-                    $backgroundcolor = '#6c737a';
-                    $textcolor = '#ffffff';
-                } else {
-                    $start = self::iso8601date(strtotime($day_offset . ' days'), $start_time);
-                    $end = self::iso8601date(strtotime($day_offset . ' days'), $end_time);
-
-                    $backgroundcolor = null;
-                    if (array_key_exists($cycle_date->id, $event_colors)) {
-                        if (is_array($event_colors[$cycle_date->id]) && array_key_exists($institut_id, $event_colors[$cycle_date->id])) {
-                            $backgroundcolor = $event_colors[$cycle_date->id][$institut_id];
-                        }
-                    }
-                    if (!$backgroundcolor) {
-                        $backgroundcolor = array_key_exists($semtype['name'], $inst_default_colors)
-                            ? $inst_default_colors[$semtype['name']]
-                            : self::DEFAULT_EVENT_COLOR;
-                    }
-
-                    $textcolor = '#ffffff';
-                    if (self::calculateLuminosityRatio($backgroundcolor, $textcolor) < 3) {
-                        $textcolor = '#000000';
-                    }
-                }
-                if (!$is_editable) {
-                    $backgroundcolor = '#c4c7c9';
-                    $textcolor = '#000000';
-                }
-
-                $resource_column = '0';
-                if (array_key_exists($cycle_date->id, $event_columns)) {
-                    if (is_array($event_columns[$cycle_date->id]) && array_key_exists($institut_id, $event_columns[$cycle_date->id])) {
-                        $resource_column = $event_columns[$cycle_date->id][$institut_id];
-                    }
-                }
-
-                $events[] = [
-                    'resourceId'       => $resource_column,
-                    'id'               => $cycle_date->id,
-                    'title'            => $name,
-                    'start'            => $start,
-                    'end'              => $end,
-                    'textColor'        => $textcolor,
-                    'backgroundColor'  => $backgroundcolor,
-                    'borderColor'      => '#000',
-                    'editable'         => $is_editable,
-                    'startEditable'    => $is_start_editable,
-                    'durationEditable' => $is_duration_editable,
-                    'resourceEditable' => true,
-                    'studip_api_urls'  => ['move' => $move_url],
-                    'studip_view_urls' => ['edit' => URLHelper::getURL('dispatch.php/course/details/index/' . $cycle_date->seminar_id)],
-                    'metadate_id'      => $cycle_date->metadate_id,
-                    'course_id'        => $cycle_date->seminar_id,
-                    'tooltip'          => self::getCycleInfos($course, $cycle_date),
-                    'icon'             => $is_start_editable ? '' : 'lock-locked',
-                    'conform'          => $conform,
-                ];
-            }
-        }, array_keys($courses));
-
-        return $events;
-    }
-
-    /**
-     * Creates a fullcalendar event of given SeminarCycleDate
-     *
-     * @param SeminarCycleDate $cycle_date
-     * @param string $institut_id
-     *
-     * @return array enriched course info string for tooltip
-     */
-    public static function getCycleEvent($cycle_date, $institut_id)
-    {
-        $course = Course::find($cycle_date->seminar_id);
-        $semtype = $course->getSemType();
-        $institut = Institute::find($institut_id);
-        $inst_default_colors = self::getInstituteDefaultEventcolors($institut);
-
-        $today = date('w');
-        $user_insts = array_map(function ($arr) {
-            return $arr['Institut_id'];
-        }, Institute::getMyInstitutes($GLOBALS['user']->id));
-
-        $min_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR);
-        $minbigtime = (int) $min_time[0];
-        $max_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_END_HOUR);
-        $maxbigtime = (int) $max_time[0];
-
-        $start_time = explode(':', $cycle_date['start_time']);
-        $bigtime = (int) $start_time[0];
-
-        if ($bigtime > $maxbigtime || $bigtime < $minbigtime) {
-            return null;
-        } elseif ($bigtime % 2) {
-            $bigtime--;
-        }
-        $start_time = $bigtime . ':00:00';
-
-        $end_time = explode(':', $start_time);
-        $end_time[0] += 2;
-        $end_time = implode(':', $end_time);
-
-        if (in_array($course->institut_id, $user_insts)) {
-            $is_editable = true;
-            $is_start_editable = !LockRules::Check($cycle_date->seminar_id, 'room_time');
-            $is_duration_editable = false;
-        } else {
-            $is_editable = false;
-            $is_start_editable = false;
-            $is_duration_editable = false;
-        }
-
-        if ($cycle_date['weekday'] == 0) {
-            $day_offset = (7 - $today);
-        } else {
-            $day_offset = ($cycle_date['weekday'] - $today);
-        }
-
-        $event_columns = self::getCourseEventcolumns($course);
-        $event_colors = self::getCourseEventcolors($course);
-
-        $move_url = URLHelper::getURL('dispatch.php/admin/courseplanning/move_event');
-        $name = $course->getFullName('number-name');
-
-        if ($start_time != $cycle_date['start_time'] && $end_time != $cycle_date['end_time']) {
-            $start = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['start_time']);
-            $end = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['end_time']);
-            $backgroundcolor = '#6c737a';
-            $textcolor = '#ffffff';
-        } else {
-            $start = self::iso8601date(strtotime($day_offset . ' days'), $start_time);
-            $end = self::iso8601date(strtotime($day_offset . ' days'), $end_time);
-
-            $backgroundcolor = null;
-            if (array_key_exists($cycle_date->id, $event_colors)) {
-                if (is_array($event_colors[$cycle_date->id]) && array_key_exists($institut_id, $event_colors[$cycle_date->id])) {
-                    $backgroundcolor = $event_colors[$cycle_date->id][$institut_id];
-                }
-            }
-            if (!$backgroundcolor) {
-                $backgroundcolor = array_key_exists($semtype['name'], $inst_default_colors)?$inst_default_colors[$semtype['name']]:self::DEFAULT_EVENT_COLOR;
-            }
-
-            $textcolor = '#ffffff';
-            if (self::calculateLuminosityRatio($backgroundcolor, $textcolor) < 3) {
-                $textcolor = '#000000';
-            }
-        }
-        if (!$is_editable) {
-            $backgroundcolor = '#c4c7c9';
-            $textcolor = '#000000';
-        }
-
-        $resource_column = '0';
-        if (array_key_exists($cycle_date->id, $event_columns)) {
-            if (is_array($event_columns[$cycle_date->id]) && array_key_exists($institut_id, $event_columns[$cycle_date->id])) {
-                $resource_column = $event_columns[$cycle_date->id][$institut_id];
-            }
-        }
-
-        return [
-            'resourceId'       => $resource_column,
-            'id'               => $cycle_date->id,
-            'title'            => $name,
-            'start'            => $start,
-            'end'              => $end,
-            'textColor'        => $textcolor,
-            'backgroundColor'  => $backgroundcolor,
-            'borderColor'      => '#000',
-            'editable'         => $is_editable,
-            'startEditable'    => $is_start_editable,
-            'durationEditable' => $is_duration_editable,
-            'resourceEditable' => true,
-            'studip_api_urls'  => ['move' => $move_url],
-            'studip_view_urls' => ['edit' => URLHelper::getURL('dispatch.php/course/details/index/' . $cycle_date->seminar_id)],
-            'metadate_id'      => $cycle_date->metadate_id,
-            'course_id'        => $cycle_date->seminar_id,
-            'tooltip'          => self::getCycleInfos($course, $cycle_date),
-            'icon'             => $is_start_editable ? '' : 'lock-locked'
-        ];
-    }
-
-    /**
-     * Creates a string with course infos to be displayed as a tooltip in calendar events
-     *
-     * @param SeminarCycleDate $cycle_date
-     *
-     * @return string enriched course info string for tooltip
-     */
-    private static function getCycleInfos($course, $cycle_date)
-    {
-
-        $info_string = $course->getFullName('number-name') . "\n";
-
-        $dozenten = [];
-        foreach (CourseMember::findByCourseAndStatus($course->id, 'dozent') as $cmember) {
-            $dozenten[$cmember->user->user_id] = $cmember->user->getFullName();
-        }
-        if ($dozenten) {
-            $info_string .= implode(', ', $dozenten) . "\n";
-        }
-
-        $rooms = [];
-        foreach ($cycle_date->getAllDates() as $course_date) {
-            $room = $course_date->getRoom();
-            if ($room) {
-                $rooms[$room->id] = $room->name;
-            }
-        }
-        if ($rooms) {
-            $info_string .= implode(', ', $rooms) . "\n";
-        }
-
-        if ($course->getSemClass()->offsetGet('module')) {
-            $mvv_pathes = [];
-            $course_start = $course->start_time;
-            $course_end = ($course->end_time < 0 || is_null($course->end_time))
-                        ? PHP_INT_MAX
-                        : $course->end_time;
-            // set filter to show only pathes with valid semester data
-            ModuleManagementModelTreeItem::setObjectFilter('Modul',
-                function ($modul) use ($course_start, $course_end) {
-                    // check for public status
-                    if (!$GLOBALS['MVV_MODUL']['STATUS']['values'][$modul->stat]['public']) {
-                        return false;
-                    }
-                    $modul_start = Semester::find($modul->start)->beginn ?: 0;
-                    $modul_end = Semester::find($modul->end)->ende ?: PHP_INT_MAX;
-                    return ($modul_start <= $course_end && $modul_end >= $course_start);
-                }
-            );
-
-            ModuleManagementModelTreeItem::setObjectFilter('StgteilVersion',
-                function ($version) {
-                    return (bool) $GLOBALS['MVV_STGTEILVERSION']['STATUS']['values'][$version->stat]['public'];
-                }
-            );
-
-            $trail_classes = ['Modulteil', 'StgteilabschnittModul', 'StgteilAbschnitt', 'StgteilVersion'];
-            $mvv_object_pathes = MvvCourse::get($course->getId())->getTrails($trail_classes);
-            if ($mvv_object_pathes) {
-                if (Config::get()->COURSE_SEM_TREE_DISPLAY) {
-                    $mvv_tree = [];
-                    foreach ($mvv_object_pathes as $mvv_object_path) {
-                        // show only complete pathes
-                        if (count($mvv_object_path) == 4) {
-                            // flatten the pathes to a linked list
-                            $stg = reset($mvv_object_path);
-                            $parent_id = 'root';
-                            foreach ($mvv_object_path as $mvv_object) {
-                                $mvv_object_id = $mvv_object instanceof StgteilabschnittModul
-                                        ? $mvv_object->modul_id
-                                        : $mvv_object->id;
-                                $mvv_tree[$parent_id][$mvv_object_id] = [
-                                    'id'    => $mvv_object_id,
-                                    'name'  => $mvv_object->getDisplayName(),
-                                    'class' => get_class($mvv_object),
-                                 ];
-                                $parent_id = $mvv_object_id;
-                            }
-                        }
-                    }
-                    if (count($mvv_tree)) {
-                        // add the root node
-                        $mvv_tree['start'][] = [
-                            'id'    => 'root',
-                            'name'  => Config::get()->UNI_NAME_CLEAN,
-                            'class' => ''
-                        ];
-                    }
-                } else {
-                    foreach ($mvv_object_pathes as $mvv_object_path) {
-                        // show only complete pathes
-                        if (count($mvv_object_path) == 4) {
-                            $mvv_object_names = [];
-                            $modul_id = '';
-                            foreach ($mvv_object_path as $mvv_object) {
-                                if ($mvv_object instanceof StgteilabschnittModul) {
-                                    $modul_id = $mvv_object->modul_id;
-                                }
-                                $mvv_object_names[] = $mvv_object->getDisplayName();
-                            }
-                            $mvv_pathes[] = [$modul_id => $mvv_object_names];
-                        }
-                    }
-                }
-                // to prevent collisions of object ids in the tree
-                // in the case of same objects listed in more than one part
-                // of the tree
-                $id_sfx = new stdClass();
-                $id_sfx->c = 1;
-            }
-            foreach ($mvv_pathes as $mvv_path) {
-                foreach ($mvv_path as $mvv_path_content) {
-                    $info_string .= implode(' > ', $mvv_path_content) . "\n";
-                }
-            }
-        }
-
-        return $info_string;
-    }
-
-    public static function getBackgroundEvents($start = null)
-    {
-        $datetime = new DateTime();
-        $slot_duration = 1;
-        $start_time = 8;
-        $end_time = 16;
-        $events = [];
-        $day_interval = 1;
-
-        if ($start == null) {
-            $datetime->modify('monday this week');
-            $datetime->add(new DateInterval('PT' . $start_time . 'H'));
-            $day_interval = 7;
-        }
-
-        for ($i = 1; $i <= $day_interval; $i++) {
-            for ($slot = $start_time; $slot < $end_time; $slot += $slot_duration) {
-                if ($slot % 2) {
-                    $datetime->setTime($slot, 0);
-                    $events[] = [
-                        'start'     => self::iso8601date($datetime, $slot),
-                        'end'       => self::iso8601date($datetime, $slot + $slot_duration),
-                        'rendering' => 'background',
-                    ];
-
-                }
-            }
-            $datetime->setTime($start_time, 0);
-            $datetime->add(new DateInterval('P1D'));
-        };
-        return $events;
-    }
-
-    private static function iso8601date($date, $time = '00:00:00', $timezone = '+00:00')
-    {
-        // If only date parameter is passed and is a DateTimeInterface object or
-        // unix timestamp, assume time from date
-        if (func_num_args() === 1 && ($date instanceof DateTimeInterface || ctype_digit($date))) {
-            $time = $date;
-        }
-
-        // Get time
-        if ($time instanceof DateTimeInterface) {
-            $time = $time->format('H:i:s');
-        } elseif (ctype_digit($time)) {
-            $time = date('H:i:s', $time);
-        } elseif (sscanf($time, '%u:%u:%u', $hours, $minutes, $seconds)) {
-            $time = sprintf('%02u:%02u:%02u', $hours, $minutes, $seconds);
-        }
-
-        // Get date
-        if ($date instanceof DateTimeInterface) {
-            $date = $date->format('Y-m-d');
-        } elseif (ctype_digit($date)) {
-            $date = date('Y-m-d', $date);
-        }
-
-        return "{$date}T{$time}{$timezone}";
-    }
-
-
-    // calculates the luminosity of an given RGB color
-    // the color code must be in the format of RRGGBB
-    // the luminosity equations are from the WCAG 2 requirements
-    // http://www.w3.org/TR/WCAG20/#relativeluminancedef
-    private static function calculateLuminosity($color)
-    {
-        $r = hexdec(substr($color, 0, 2)) / 255; // red value
-        $g = hexdec(substr($color, 2, 2)) / 255; // green value
-        $b = hexdec(substr($color, 4, 2)) / 255; // blue value
-        if ($r <= 0.03928) {
-            $r = $r / 12.92;
-        } else {
-            $r = pow(($r + 0.055) / 1.055, 2.4);
-        }
-        if ($g <= 0.03928) {
-            $g = $g / 12.92;
-        } else {
-            $g = pow(($g + 0.055) / 1.055, 2.4);
-        }
-        if ($b <= 0.03928) {
-            $b = $b / 12.92;
-        } else {
-            $b = pow(($b + 0.055) / 1.055, 2.4);
-        }
-        $luminosity = 0.2126 * $r + 0.7152 * $g + 0.0722 * $b;
-        return $luminosity;
-    }
-
-    // calculates the luminosity ratio of two colors
-    // the luminosity ratio equations are from the WCAG 2 requirements
-    // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-    private static function calculateLuminosityRatio($color1, $color2)
-    {
-        $c1 = ltrim($color1, '#');
-        $c2 = ltrim($color2, '#');
-        $l1 = self::calculateLuminosity($c1);
-        $l2 = self::calculateLuminosity($c2);
-        if ($l1 > $l2) {
-            $ratio = ($l1 + 0.05) / ($l2 + 0.05);
-        } else {
-            $ratio = ($l2 + 0.05) / ($l1 + 0.05);
-        }
-        return $ratio;
-    }
-}
diff --git a/lib/classes/InstituteCalendarHelper.php b/lib/classes/InstituteCalendarHelper.php
new file mode 100644
index 0000000..4302cf1
--- /dev/null
+++ b/lib/classes/InstituteCalendarHelper.php
@@ -0,0 +1,810 @@
+<?php
+
+/**
+ * InstituteCalendarHelper.class.php - class for institute calendar convenience functions
+ *
+ * @author      Timo Hartge <hartge@data-quest>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ */
+
+class InstituteCalendarHelper
+{
+    const COLUMN_DATAFIELD_ID = '69f6485f3c937766866a03d9d642ecbb';
+    const COLOR_DATAFIELD_ID = '41cda2be71fe9efd6e28b853fc0681f3';
+    const INST_DEFAULT_COLOR_DATAFIELD_ID = '0c63321a8e93b3ccc927611709248e07';
+    const DEFAULT_EVENT_COLOR = '#899ab9';
+
+    /**
+     * Returns the default calendar columns.
+     *
+     * @return array   default column names
+     */
+    private static function getDefaultColumns()
+    {
+        return [
+            1 => ['Spalte 1', 1],
+            2 => ['Spalte 2', 1],
+            3 => ['Spalte 3', 1],
+            4 => ['Spalte 4', 1],
+            5 => ['Spalte 5', 1],
+            6 => ['Spalte 6', 1]
+        ];
+    }
+
+    /**
+     * Fetches the stores columns merged with defaults.
+     *
+     * @param string $institut_id
+     * @param boolean $only_visible only return visible columns
+     *
+     * @return array column array in a fullcalender expected format
+     */
+    public static function getResourceColumns($institut_id, $only_visible = false)
+    {
+        $columns = [];
+        $inst_columns = [
+            0 => ['Sammelspalte', 1]
+        ];
+
+        $db_inst_columns = InstitutePlanColumn::findByInstitute($institut_id);
+
+        if ($db_inst_columns) {
+            foreach ($db_inst_columns as $col_info) {
+                $inst_columns[$col_info['column']] = [$col_info['name'], $col_info['visible']];
+            }
+        } else {
+            $inst_columns = array_merge($inst_columns, self::getDefaultColumns());
+        }
+        foreach ($inst_columns as $id => $info) {
+            if ($only_visible && !$info[1]) continue;
+            $columns[] = ['id' => $id, 'title' => $info[0], 'visible' => $info[1]];
+        }
+        return $columns;
+    }
+
+    /**
+     * Adds the default resource columns
+     *
+     * @param string $institut_id
+     *
+     * @return int last resource column number
+     */
+    public static function addDefaultResourceColumns($institut_id)
+    {
+        $max_col = 0;
+        foreach (self::getDefaultColumns() as $col_id => $col_info) {
+            $new_col = new InstitutePlanColumn([$institut_id, $col_id]);
+            $new_col->name = $col_info[0];
+            $new_col->visible = $col_info[1];
+            if ($new_col->store()) {
+                $max_col = $col_id;
+            }
+        }
+        return $max_col;
+    }
+
+    /**
+     * Adds a resource column
+     *
+     * @param string $institut_id
+     * @param string $name
+     * @param int $specific_column_number
+     *
+     * @return int number of affected rows
+     */
+    public static function addResourceColumn($institut_id, $name, $specific_column_number = 0)
+    {
+        $last_col = InstitutePlanColumn::getLastColumnOfInstitute($institut_id);
+        if ($last_col !== null) {
+            $max_col = $last_col->column;
+        } else {
+            $max_col = self::addDefaultResourceColumns($institut_id);
+        }
+        $column_number = $specific_column_number>0?$specific_column_number:intval($max_col)+1;
+        $new_col = new InstitutePlanColumn([$institut_id, $column_number]);
+        $new_col->name = $name;
+        $new_col->visible = 1;
+        return $new_col->store();
+    }
+
+    /**
+     * Looks up column id for course events
+     *
+     * @param Course $course
+     *
+     * @return array course events with column id
+     */
+    public static function getCourseEventcolumns(Course $course)
+    {
+        $df = DatafieldEntryModel::findByModel($course, self::COLUMN_DATAFIELD_ID);
+        if ($df[0] && $df[0]->content) {
+            $event_columns = unserialize($df[0]->content);
+        } else {
+            $event_columns = [];
+        }
+        return $event_columns;
+    }
+
+    /**
+     * Sets the column id for course events
+     *
+     * @param Course $course
+     * @param string $event_id SeminarCycleDate id
+     * @param string $institut_id
+     * @param string $column number of the column
+     *
+     * @return bool stored
+     */
+    public static function setCourseEventcolumn($course, $event_id, $institut_id, $column)
+    {
+        $df = DatafieldEntryModel::findByModel($course, self::COLUMN_DATAFIELD_ID);
+        if ($df[0]) {
+            $event_columns = self::getCourseEventcolumns($course);
+            if (!is_array($event_columns[$event_id])) {
+                unset($event_columns[$event_id]);
+            }
+            $event_columns[$event_id][$institut_id] = $column;
+            $df[0]->content = serialize($event_columns);
+            return $df[0]->store();
+        }
+        return false;
+    }
+
+    /**
+     * Looks up color value for course events
+     *
+     * @param Course $course
+     *
+     * @return array course events with color value
+     */
+    public static function getCourseEventcolors($course)
+    {
+        $df = DatafieldEntryModel::findByModel($course, self::COLOR_DATAFIELD_ID);
+        if ($df[0] && $df[0]->content) {
+            $event_colors = unserialize($df[0]->content);
+        } else {
+            $event_colors = [];
+        }
+        return $event_colors;
+    }
+
+    /**
+     * Sets color value for course events
+     *
+     * @param Course $course
+     * @param string $event_id SeminarCycleDate id
+     * @param string $institut_id
+     * @param string $color colorcode
+     *
+     * @return bool stored
+     */
+    public static function setCourseEventcolor($course, $event_id, $institut_id, $color)
+    {
+        $df = DatafieldEntryModel::findByModel($course, self::COLOR_DATAFIELD_ID);
+        if ($df[0]) {
+            $event_colors = self::getCourseEventcolors($course);
+            if (!is_array($event_colors[$event_id])) {
+                unset($event_colors[$event_id]);
+            }
+            $event_colors[$event_id][$institut_id] = $color;
+            $df[0]->content = serialize($event_colors);
+            return $df[0]->store();
+        }
+        return false;
+    }
+
+    /**
+     * Looks up default color value for institute course events
+     *
+     * @param SimpleORMap $context
+     *
+     * @return array course events with color value
+     */
+    public static function getInstituteDefaultEventcolors($context)
+    {
+        $df = DatafieldEntryModel::findByModel($context, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
+        if ($df && $df[0]->content) {
+            $event_colors = unserialize($df[0]->content);
+        } else {
+            $event_colors = [];
+        }
+        return $event_colors;
+    }
+
+    /**
+     * Sets default institute course events color value for semtypes
+     *
+     * @param SimpleORMap $context
+     * @param string $semtype
+     * @param string $color colorcode
+     *
+     * @return bool stored
+     */
+    public static function setInstituteDefaultEventcolor($context, $semtype, $color)
+    {
+        $df = DatafieldEntryModel::findByModel($context, self::INST_DEFAULT_COLOR_DATAFIELD_ID);
+        if ($df[0]) {
+            $event_colors = self::getInstituteDefaultEventcolors($context);
+            $event_colors[$semtype['name']] = $color;
+            $df[0]->content = serialize($event_colors);
+            return $df[0]->store();
+        }
+        return false;
+    }
+
+    /**
+     * Sets color value for every course events of given courses semtype
+     *
+     * @param Course $course
+     * @param string $institut_id
+     * @param string $color colorcode
+     *
+     * @return bool stored
+     */
+    public static function setSemtypeEventcolor($course, $institut_id, $color)
+    {
+        $semtype = $course->getSemType();
+        $institut = Institute::find($institut_id);
+        if ($institut) {
+            self::setInstituteDefaultEventcolor($institut, $semtype, $color);
+        }
+        $courses = Course::findBySQL('status =? AND Institut_id=?', [$semtype['id'], $course->institut_id]);
+        if ($courses) {
+            foreach ($courses as $semtype_course) {
+                foreach (SeminarCycleDate::findBySeminar($semtype_course->seminar_id) as $cycle_date) {
+                    self::setCourseEventcolor($semtype_course, $cycle_date->id, $institut_id, $color);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Prepares an array of course id and names for creation of dropable calendar events
+     *
+     * @param array $courses Array of courses
+     * @param array $semester Semester
+     *
+     * @return array prepared array
+     */
+    public static function getEventlessCourses($courses, $semester = null)
+    {
+        $eventless = [];
+        foreach (array_keys($courses) as $cid) {
+            $course = Course::find($cid);
+            $cycle_dates = SeminarCycleDate::findBySeminar($course->seminar_id);
+            if (count($cycle_dates) < 1) {
+                $eventless[$cid] = $course->getFullName('number-name');
+            } elseif ($semester) {
+                $has_date_in_semester = false;
+                foreach ($cycle_dates as $cycle_date) {
+                    foreach ($cycle_date->getAllDates() as $course_date) {
+                        if ($course_date->date >= $semester->beginn && $course_date->date <= $semester->ende) {
+                            $has_date_in_semester = true;
+                            break;
+                        }
+                    }
+                    if ($has_date_in_semester) break;
+                }
+                if (!$has_date_in_semester) {
+                    $eventless[$cid] = $course->getFullName('number-name');
+                }
+            }
+        }
+        return $eventless;
+    }
+
+    /**
+     * Creates FullCalendar event date of course events
+     *
+     * @param array $courses Array of courses
+     * @param string $institut_id
+     * @param array $semester Semester
+     * @param array $specific_weekday fetch only events for specific weekday
+     *
+     * @return array fullcalendar events
+     */
+    public static function getEvents($courses, $institut_id, $semester = null, $specific_weekday = null)
+    {
+        $today = date('w');
+
+        $user_insts = array_map(function ($arr) {
+            return $arr['Institut_id'];
+        }, Institute::getMyInstitutes($GLOBALS['user']->id));
+
+        $min_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR);
+        $minbigtime = (int) $min_time[0];
+        $max_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_END_HOUR);
+        $maxbigtime = (int) $max_time[0];
+
+        $institut = Institute::find($institut_id);
+
+        if (!$institut) {
+            return [];
+        }
+
+        $inst_default_colors = self::getInstituteDefaultEventcolors($institut);
+
+        $events = [];
+        Course::findEachMany(function ($course) use (
+            $courses,
+            &$events,
+            $today,
+            $minbigtime,
+            $maxbigtime,
+            $user_insts,
+            $institut_id,
+            $inst_default_colors,
+            $semester,
+            $specific_weekday
+        ) {
+            $semtype = $course->getSemType();
+
+            $event_columns = self::getCourseEventcolumns($course) ?: [];
+            $event_colors = self::getCourseEventcolors($course) ?: [];
+
+            if (in_array($course->institut_id, $user_insts)) {
+                $is_editable = true;
+                $is_start_editable = !LockRules::Check($course->id, 'room_time');
+                $is_duration_editable = false;
+            } else {
+                $is_editable = false;
+                $is_start_editable = false;
+                $is_duration_editable = false;
+            }
+
+            foreach (SeminarCycleDate::findBySeminar($course->seminar_id) as $cycle_date) {
+                if ($semester) {
+                    $has_date_in_semester = false;
+                    foreach ($cycle_date->getAllDates() as $course_date) {
+                        if ($course_date->date >= $semester->beginn && $course_date->date <= $semester->ende) {
+                            $has_date_in_semester = true;
+                            break;
+                        }
+                    }
+                    if (!$has_date_in_semester) {
+                        continue;
+                    }
+                }
+
+                if (is_numeric($specific_weekday) && $specific_weekday != $cycle_date['weekday']) {
+                    continue;
+                }
+
+                $conform = true;
+
+                if ($cycle_date['weekday'] == 0) {
+                    $day_offset = 7 - $today;
+                } else {
+                    $day_offset = $cycle_date['weekday'] - $today;
+                }
+
+                $start_time = explode(':', $cycle_date['start_time']);
+                $bigtime = (int) $start_time[0];
+                if ($bigtime > $maxbigtime || $bigtime < $minbigtime) {
+                    $conform = false;
+                } elseif ($bigtime % 2) {
+                    $bigtime--;
+                }
+                $start_time = $bigtime . ':00:00';
+
+                $end_time = explode(':', $start_time);
+                $end_time[0] += 2;
+                $end_time = implode(':', $end_time);
+
+                $move_url = URLHelper::getURL('dispatch.php/admin/courseplanning/move_event');
+                $name = $course->getFullName('number-name');
+
+                if ($start_time != $cycle_date['start_time'] && $end_time != $cycle_date['end_time']) {
+                    $start = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['start_time']);
+                    $end = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['end_time']);
+                    $backgroundcolor = '#6c737a';
+                    $textcolor = '#ffffff';
+                } else {
+                    $start = self::iso8601date(strtotime($day_offset . ' days'), $start_time);
+                    $end = self::iso8601date(strtotime($day_offset . ' days'), $end_time);
+
+                    $backgroundcolor = null;
+                    if (array_key_exists($cycle_date->id, $event_colors)) {
+                        if (is_array($event_colors[$cycle_date->id]) && array_key_exists($institut_id, $event_colors[$cycle_date->id])) {
+                            $backgroundcolor = $event_colors[$cycle_date->id][$institut_id];
+                        }
+                    }
+                    if (!$backgroundcolor) {
+                        $backgroundcolor = array_key_exists($semtype['name'], $inst_default_colors)
+                            ? $inst_default_colors[$semtype['name']]
+                            : self::DEFAULT_EVENT_COLOR;
+                    }
+
+                    $textcolor = '#ffffff';
+                    if (self::calculateLuminosityRatio($backgroundcolor, $textcolor) < 3) {
+                        $textcolor = '#000000';
+                    }
+                }
+                if (!$is_editable) {
+                    $backgroundcolor = '#c4c7c9';
+                    $textcolor = '#000000';
+                }
+
+                $resource_column = '0';
+                if (array_key_exists($cycle_date->id, $event_columns)) {
+                    if (is_array($event_columns[$cycle_date->id]) && array_key_exists($institut_id, $event_columns[$cycle_date->id])) {
+                        $resource_column = $event_columns[$cycle_date->id][$institut_id];
+                    }
+                }
+
+                $events[] = [
+                    'resourceId'       => $resource_column,
+                    'id'               => $cycle_date->id,
+                    'title'            => $name,
+                    'start'            => $start,
+                    'end'              => $end,
+                    'textColor'        => $textcolor,
+                    'backgroundColor'  => $backgroundcolor,
+                    'borderColor'      => '#000',
+                    'editable'         => $is_editable,
+                    'startEditable'    => $is_start_editable,
+                    'durationEditable' => $is_duration_editable,
+                    'resourceEditable' => true,
+                    'studip_api_urls'  => ['move' => $move_url],
+                    'studip_view_urls' => ['edit' => URLHelper::getURL('dispatch.php/course/details/index/' . $cycle_date->seminar_id)],
+                    'metadate_id'      => $cycle_date->metadate_id,
+                    'course_id'        => $cycle_date->seminar_id,
+                    'tooltip'          => self::getCycleInfos($course, $cycle_date),
+                    'icon'             => $is_start_editable ? '' : 'lock-locked',
+                    'conform'          => $conform,
+                ];
+            }
+        }, array_keys($courses));
+
+        return $events;
+    }
+
+    /**
+     * Creates a fullcalendar event of given SeminarCycleDate
+     *
+     * @param SeminarCycleDate $cycle_date
+     * @param string $institut_id
+     *
+     * @return array enriched course info string for tooltip
+     */
+    public static function getCycleEvent($cycle_date, $institut_id)
+    {
+        $course = Course::find($cycle_date->seminar_id);
+        $semtype = $course->getSemType();
+        $institut = Institute::find($institut_id);
+        $inst_default_colors = self::getInstituteDefaultEventcolors($institut);
+
+        $today = date('w');
+        $user_insts = array_map(function ($arr) {
+            return $arr['Institut_id'];
+        }, Institute::getMyInstitutes($GLOBALS['user']->id));
+
+        $min_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_START_HOUR);
+        $minbigtime = (int) $min_time[0];
+        $max_time = explode(':', Config::get()->INSTITUTE_COURSE_PLAN_END_HOUR);
+        $maxbigtime = (int) $max_time[0];
+
+        $start_time = explode(':', $cycle_date['start_time']);
+        $bigtime = (int) $start_time[0];
+
+        if ($bigtime > $maxbigtime || $bigtime < $minbigtime) {
+            return null;
+        } elseif ($bigtime % 2) {
+            $bigtime--;
+        }
+        $start_time = $bigtime . ':00:00';
+
+        $end_time = explode(':', $start_time);
+        $end_time[0] += 2;
+        $end_time = implode(':', $end_time);
+
+        if (in_array($course->institut_id, $user_insts)) {
+            $is_editable = true;
+            $is_start_editable = !LockRules::Check($cycle_date->seminar_id, 'room_time');
+            $is_duration_editable = false;
+        } else {
+            $is_editable = false;
+            $is_start_editable = false;
+            $is_duration_editable = false;
+        }
+
+        if ($cycle_date['weekday'] == 0) {
+            $day_offset = (7 - $today);
+        } else {
+            $day_offset = ($cycle_date['weekday'] - $today);
+        }
+
+        $event_columns = self::getCourseEventcolumns($course);
+        $event_colors = self::getCourseEventcolors($course);
+
+        $move_url = URLHelper::getURL('dispatch.php/admin/courseplanning/move_event');
+        $name = $course->getFullName('number-name');
+
+        if ($start_time != $cycle_date['start_time'] && $end_time != $cycle_date['end_time']) {
+            $start = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['start_time']);
+            $end = self::iso8601date(strtotime($day_offset . ' days'), $cycle_date['end_time']);
+            $backgroundcolor = '#6c737a';
+            $textcolor = '#ffffff';
+        } else {
+            $start = self::iso8601date(strtotime($day_offset . ' days'), $start_time);
+            $end = self::iso8601date(strtotime($day_offset . ' days'), $end_time);
+
+            $backgroundcolor = null;
+            if (array_key_exists($cycle_date->id, $event_colors)) {
+                if (is_array($event_colors[$cycle_date->id]) && array_key_exists($institut_id, $event_colors[$cycle_date->id])) {
+                    $backgroundcolor = $event_colors[$cycle_date->id][$institut_id];
+                }
+            }
+            if (!$backgroundcolor) {
+                $backgroundcolor = array_key_exists($semtype['name'], $inst_default_colors)?$inst_default_colors[$semtype['name']]:self::DEFAULT_EVENT_COLOR;
+            }
+
+            $textcolor = '#ffffff';
+            if (self::calculateLuminosityRatio($backgroundcolor, $textcolor) < 3) {
+                $textcolor = '#000000';
+            }
+        }
+        if (!$is_editable) {
+            $backgroundcolor = '#c4c7c9';
+            $textcolor = '#000000';
+        }
+
+        $resource_column = '0';
+        if (array_key_exists($cycle_date->id, $event_columns)) {
+            if (is_array($event_columns[$cycle_date->id]) && array_key_exists($institut_id, $event_columns[$cycle_date->id])) {
+                $resource_column = $event_columns[$cycle_date->id][$institut_id];
+            }
+        }
+
+        return [
+            'resourceId'       => $resource_column,
+            'id'               => $cycle_date->id,
+            'title'            => $name,
+            'start'            => $start,
+            'end'              => $end,
+            'textColor'        => $textcolor,
+            'backgroundColor'  => $backgroundcolor,
+            'borderColor'      => '#000',
+            'editable'         => $is_editable,
+            'startEditable'    => $is_start_editable,
+            'durationEditable' => $is_duration_editable,
+            'resourceEditable' => true,
+            'studip_api_urls'  => ['move' => $move_url],
+            'studip_view_urls' => ['edit' => URLHelper::getURL('dispatch.php/course/details/index/' . $cycle_date->seminar_id)],
+            'metadate_id'      => $cycle_date->metadate_id,
+            'course_id'        => $cycle_date->seminar_id,
+            'tooltip'          => self::getCycleInfos($course, $cycle_date),
+            'icon'             => $is_start_editable ? '' : 'lock-locked'
+        ];
+    }
+
+    /**
+     * Creates a string with course infos to be displayed as a tooltip in calendar events
+     *
+     * @param SeminarCycleDate $cycle_date
+     *
+     * @return string enriched course info string for tooltip
+     */
+    private static function getCycleInfos($course, $cycle_date)
+    {
+
+        $info_string = $course->getFullName('number-name') . "\n";
+
+        $dozenten = [];
+        foreach (CourseMember::findByCourseAndStatus($course->id, 'dozent') as $cmember) {
+            $dozenten[$cmember->user->user_id] = $cmember->user->getFullName();
+        }
+        if ($dozenten) {
+            $info_string .= implode(', ', $dozenten) . "\n";
+        }
+
+        $rooms = [];
+        foreach ($cycle_date->getAllDates() as $course_date) {
+            $room = $course_date->getRoom();
+            if ($room) {
+                $rooms[$room->id] = $room->name;
+            }
+        }
+        if ($rooms) {
+            $info_string .= implode(', ', $rooms) . "\n";
+        }
+
+        if ($course->getSemClass()->offsetGet('module')) {
+            $mvv_pathes = [];
+            $course_start = $course->start_time;
+            $course_end = ($course->end_time < 0 || is_null($course->end_time))
+                        ? PHP_INT_MAX
+                        : $course->end_time;
+            // set filter to show only pathes with valid semester data
+            ModuleManagementModelTreeItem::setObjectFilter('Modul',
+                function ($modul) use ($course_start, $course_end) {
+                    // check for public status
+                    if (!$GLOBALS['MVV_MODUL']['STATUS']['values'][$modul->stat]['public']) {
+                        return false;
+                    }
+                    $modul_start = Semester::find($modul->start)->beginn ?: 0;
+                    $modul_end = Semester::find($modul->end)->ende ?: PHP_INT_MAX;
+                    return ($modul_start <= $course_end && $modul_end >= $course_start);
+                }
+            );
+
+            ModuleManagementModelTreeItem::setObjectFilter('StgteilVersion',
+                function ($version) {
+                    return (bool) $GLOBALS['MVV_STGTEILVERSION']['STATUS']['values'][$version->stat]['public'];
+                }
+            );
+
+            $trail_classes = ['Modulteil', 'StgteilabschnittModul', 'StgteilAbschnitt', 'StgteilVersion'];
+            $mvv_object_pathes = MvvCourse::get($course->getId())->getTrails($trail_classes);
+            if ($mvv_object_pathes) {
+                if (Config::get()->COURSE_SEM_TREE_DISPLAY) {
+                    $mvv_tree = [];
+                    foreach ($mvv_object_pathes as $mvv_object_path) {
+                        // show only complete pathes
+                        if (count($mvv_object_path) == 4) {
+                            // flatten the pathes to a linked list
+                            $stg = reset($mvv_object_path);
+                            $parent_id = 'root';
+                            foreach ($mvv_object_path as $mvv_object) {
+                                $mvv_object_id = $mvv_object instanceof StgteilabschnittModul
+                                        ? $mvv_object->modul_id
+                                        : $mvv_object->id;
+                                $mvv_tree[$parent_id][$mvv_object_id] = [
+                                    'id'    => $mvv_object_id,
+                                    'name'  => $mvv_object->getDisplayName(),
+                                    'class' => get_class($mvv_object),
+                                 ];
+                                $parent_id = $mvv_object_id;
+                            }
+                        }
+                    }
+                    if (count($mvv_tree)) {
+                        // add the root node
+                        $mvv_tree['start'][] = [
+                            'id'    => 'root',
+                            'name'  => Config::get()->UNI_NAME_CLEAN,
+                            'class' => ''
+                        ];
+                    }
+                } else {
+                    foreach ($mvv_object_pathes as $mvv_object_path) {
+                        // show only complete pathes
+                        if (count($mvv_object_path) == 4) {
+                            $mvv_object_names = [];
+                            $modul_id = '';
+                            foreach ($mvv_object_path as $mvv_object) {
+                                if ($mvv_object instanceof StgteilabschnittModul) {
+                                    $modul_id = $mvv_object->modul_id;
+                                }
+                                $mvv_object_names[] = $mvv_object->getDisplayName();
+                            }
+                            $mvv_pathes[] = [$modul_id => $mvv_object_names];
+                        }
+                    }
+                }
+                // to prevent collisions of object ids in the tree
+                // in the case of same objects listed in more than one part
+                // of the tree
+                $id_sfx = new stdClass();
+                $id_sfx->c = 1;
+            }
+            foreach ($mvv_pathes as $mvv_path) {
+                foreach ($mvv_path as $mvv_path_content) {
+                    $info_string .= implode(' > ', $mvv_path_content) . "\n";
+                }
+            }
+        }
+
+        return $info_string;
+    }
+
+    public static function getBackgroundEvents($start = null)
+    {
+        $datetime = new DateTime();
+        $slot_duration = 1;
+        $start_time = 8;
+        $end_time = 16;
+        $events = [];
+        $day_interval = 1;
+
+        if ($start == null) {
+            $datetime->modify('monday this week');
+            $datetime->add(new DateInterval('PT' . $start_time . 'H'));
+            $day_interval = 7;
+        }
+
+        for ($i = 1; $i <= $day_interval; $i++) {
+            for ($slot = $start_time; $slot < $end_time; $slot += $slot_duration) {
+                if ($slot % 2) {
+                    $datetime->setTime($slot, 0);
+                    $events[] = [
+                        'start'     => self::iso8601date($datetime, $slot),
+                        'end'       => self::iso8601date($datetime, $slot + $slot_duration),
+                        'rendering' => 'background',
+                    ];
+
+                }
+            }
+            $datetime->setTime($start_time, 0);
+            $datetime->add(new DateInterval('P1D'));
+        };
+        return $events;
+    }
+
+    private static function iso8601date($date, $time = '00:00:00', $timezone = '+00:00')
+    {
+        // If only date parameter is passed and is a DateTimeInterface object or
+        // unix timestamp, assume time from date
+        if (func_num_args() === 1 && ($date instanceof DateTimeInterface || ctype_digit($date))) {
+            $time = $date;
+        }
+
+        // Get time
+        if ($time instanceof DateTimeInterface) {
+            $time = $time->format('H:i:s');
+        } elseif (ctype_digit($time)) {
+            $time = date('H:i:s', $time);
+        } elseif (sscanf($time, '%u:%u:%u', $hours, $minutes, $seconds)) {
+            $time = sprintf('%02u:%02u:%02u', $hours, $minutes, $seconds);
+        }
+
+        // Get date
+        if ($date instanceof DateTimeInterface) {
+            $date = $date->format('Y-m-d');
+        } elseif (ctype_digit($date)) {
+            $date = date('Y-m-d', $date);
+        }
+
+        return "{$date}T{$time}{$timezone}";
+    }
+
+
+    // calculates the luminosity of an given RGB color
+    // the color code must be in the format of RRGGBB
+    // the luminosity equations are from the WCAG 2 requirements
+    // http://www.w3.org/TR/WCAG20/#relativeluminancedef
+    private static function calculateLuminosity($color)
+    {
+        $r = hexdec(substr($color, 0, 2)) / 255; // red value
+        $g = hexdec(substr($color, 2, 2)) / 255; // green value
+        $b = hexdec(substr($color, 4, 2)) / 255; // blue value
+        if ($r <= 0.03928) {
+            $r = $r / 12.92;
+        } else {
+            $r = pow(($r + 0.055) / 1.055, 2.4);
+        }
+        if ($g <= 0.03928) {
+            $g = $g / 12.92;
+        } else {
+            $g = pow(($g + 0.055) / 1.055, 2.4);
+        }
+        if ($b <= 0.03928) {
+            $b = $b / 12.92;
+        } else {
+            $b = pow(($b + 0.055) / 1.055, 2.4);
+        }
+        $luminosity = 0.2126 * $r + 0.7152 * $g + 0.0722 * $b;
+        return $luminosity;
+    }
+
+    // calculates the luminosity ratio of two colors
+    // the luminosity ratio equations are from the WCAG 2 requirements
+    // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
+    private static function calculateLuminosityRatio($color1, $color2)
+    {
+        $c1 = ltrim($color1, '#');
+        $c2 = ltrim($color2, '#');
+        $l1 = self::calculateLuminosity($c1);
+        $l2 = self::calculateLuminosity($c2);
+        if ($l1 > $l2) {
+            $ratio = ($l1 + 0.05) / ($l2 + 0.05);
+        } else {
+            $ratio = ($l2 + 0.05) / ($l1 + 0.05);
+        }
+        return $ratio;
+    }
+}
diff --git a/lib/classes/InstituteConfig.class.php b/lib/classes/InstituteConfig.class.php
deleted file mode 100644
index d1a51cb..0000000
--- a/lib/classes/InstituteConfig.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * InstituteConfig.class.php
- * provides access to institute preferences
- *
- * @author  Jan-Hendrik Wullms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- */
-class InstituteConfig extends RangeConfig
-{
-    /**
-     * range type
-     */
-    const RANGE_TYPE = 'institute';
-}
diff --git a/lib/classes/InstituteConfig.php b/lib/classes/InstituteConfig.php
new file mode 100644
index 0000000..d1a51cb
--- /dev/null
+++ b/lib/classes/InstituteConfig.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * InstituteConfig.class.php
+ * provides access to institute preferences
+ *
+ * @author  Jan-Hendrik Wullms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ */
+class InstituteConfig extends RangeConfig
+{
+    /**
+     * range type
+     */
+    const RANGE_TYPE = 'institute';
+}
diff --git a/lib/classes/Interactable.class.php b/lib/classes/Interactable.class.php
deleted file mode 100644
index 9796f91..0000000
--- a/lib/classes/Interactable.class.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/*
- * Copyright (c) 2011 mlunzena@uos.de, aklassen@uos.de
- *
- * 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.
- */
-
-namespace Studip;
-
-/**
- * Represents an abstract interactable element.
- */
-abstract class Interactable
-{
-    public $label, $attributes;
-
-    /**
-     * Constructs a new element to interact e.g. button or link
-     *
-     * @param string $label      the label of the button
-     * @param array  $attributes the attributes of the button element
-     */
-    final public function __construct($label, $attributes)
-    {
-        $this->label      = $label;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * Magic method (triggered when invoking inaccessible methods in a static
-     * context) used to dynamically create an interactable element with an
-     * additional CSSclass. This works for every static method call matching:
-     * /^create(.+)/ The matched group is used as CSS class for the
-     * interactable element.
-     *
-     * @code
-     * echo Button::createSubmit();
-     *
-     * # => <button ... class="submit">...
-     * @endcode
-     *
-     * @param string $name  name of the method being called
-     * @param array  $args  enumerated array containing the parameters
-     *                      passed to the $name'ed method
-     *
-     * @return Interactable returns a Button, if $name =~ /^create/
-     * @throws              throws a BadMethodCallException if $name does not
-     *                      match
-     */
-    public static function __callStatic($name, $args)
-    {
-        # only trigger, if $name =~ /^create/ and at least using $label
-        if (0 === strncasecmp($name, 'create', 6)) {
-
-            # instantiate button from arguments
-            $interactable = call_user_func_array([get_called_class(), 'create'], $args);
-            # but customize with class from $name:
-            $class = self::hyphenate(mb_substr($name, 6));
-
-            # a.) set name unless set
-            if (empty($args[1]) || !is_string($args[1])) {
-                $interactable->attributes['name'] =  $class;
-            }
-
-            # b.) set/append CSS class
-            if (array_key_exists('class', $interactable->attributes)) {
-                $interactable->attributes['class'] .= " $class";
-            } else {
-                $interactable->attributes['class'] =  $class;
-            }
-
-            return $interactable;
-        }
-
-        # otherwise bail out
-        throw new \BadMethodCallException();
-    }
-
-    /**
-     * Easy factory method to create an Interactable instance.
-     * All parameters are optional.
-     *
-     * @code
-     * // example using subclass Button
-     *
-     * echo Button::create();
-     * # => <button type="submit" name="ok">ok</button>
-     *
-     * echo Button::create('Yes')
-     * # => <button type="submit" name="yes">yes</button>
-     *
-     * echo Button::create('Yes', 'aName')
-     * # => <button type="submit" name="aName">yes</button>
-     *
-     * echo Button::create('Yes', array('a' => 1, 'b' => 2))
-     * # => <button type="submit" a="1" b="2" name="yes">yes</button>
-     *
-     * echo Button::create('Yes', 'aName', array('a' => 1, 'b' => 2)),
-     * # => <button type="submit" a="1" b="2" name="aName">yes</button>
-     * @endcode
-     *
-     * @param string $label      the label of the current element
-     * @param string $trait      the specific trait of the current element
-     * @param array  $attributes the attributes of the button element
-     *
-     * @return Interactable element
-     */
-    public static function create($label = NULL, $trait = NULL, $attributes = [])
-    {
-        $argc = func_num_args();
-
-        // if label is empty, use default
-        $label = $label ?: _('ok');
-
-        // if there are two parameters, there are two cases:
-        //   1.) label and trait OR
-        //   2.) label and attributes
-        //
-        // in the latter case, use parameter $trait as attributes
-        // and use the default for name
-        if ($argc === 2 && is_array($trait)) {
-            list($attributes, $trait) = [$trait, NULL];
-        }
-
-        $interactable = new static($label, $attributes);
-        $interactable->initialize($label, $trait, $attributes);
-
-        return $interactable;
-    }
-
-    /**
-     * Initialize an interactable element.
-     * The parameters to create are handed over to enable subclass
-     * specific customization.
-     *
-     * @param string $label      the label of the current element
-     * @param string $trait      the specific trait of the current element
-     * @param array  $attributes the attributes of the button element
-     */
-    abstract protected function initialize($label, $trait, $attributes);
-
-    /**
-     * Convenience method used for autocompletion hints by your
-     * editor.
-     *
-     * Without this method #__callStatic would do the same.
-     *
-     * @param string $label      the label of the current element
-     * @param string $trait      the specific trait of the current element
-     * @param array  $attributes the attributes of the button element
-     */
-    public static function createAccept($label = NULL, $trait = NULL, $attributes = [])
-    {
-        $args = func_num_args() ? func_get_args() : [_('Übernehmen')];
-        return self::__callStatic(__FUNCTION__, $args);
-    }
-
-    /**
-     * Convenience method used for autocompletion hints by your
-     * editor.
-     *
-     * Without this method #__callStatic would do the same.
-     *
-     * @param string $label      the label of the current element
-     * @param string $trait      the specific trait of the current element
-     * @param array  $attributes the attributes of the button element
-     */
-    public static function createEdit($label = NULL, $trait = NULL, $attributes = [])
-    {
-        $args = func_num_args() ? func_get_args() : [_('Bearbeiten')];
-        return self::__callStatic(__FUNCTION__, $args);
-    }
-
-    /**
-     * Convenience method used for autocompletion hints by your
-     * editor.
-     *
-     * Without this method #__callStatic would do the same.
-     *
-     * @param string $label      the label of the current element
-     * @param string $trait      the specific trait of the current element
-     * @param array  $attributes the attributes of the button element
-     */
-    public static function createCancel($label = NULL, $trait = NULL, $attributes = [])
-    {
-        $args = func_num_args() ? func_get_args() : [_('Abbrechen')];
-        return self::__callStatic(__FUNCTION__, $args);
-    }
-
-    /**
-     * Hyphenates the passed word.
-     *
-     * @param string $word  word to be hyphenated
-     *
-     * @return string   hyphenated word
-     */
-    private static function hyphenate($word)
-    {
-        return mb_strtolower(preg_replace('/(?<=\w)([A-Z])/', '-\\1', $word));
-    }
-}
diff --git a/lib/classes/Interactable.php b/lib/classes/Interactable.php
new file mode 100644
index 0000000..9796f91
--- /dev/null
+++ b/lib/classes/Interactable.php
@@ -0,0 +1,204 @@
+<?php
+/*
+ * Copyright (c) 2011 mlunzena@uos.de, aklassen@uos.de
+ *
+ * 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.
+ */
+
+namespace Studip;
+
+/**
+ * Represents an abstract interactable element.
+ */
+abstract class Interactable
+{
+    public $label, $attributes;
+
+    /**
+     * Constructs a new element to interact e.g. button or link
+     *
+     * @param string $label      the label of the button
+     * @param array  $attributes the attributes of the button element
+     */
+    final public function __construct($label, $attributes)
+    {
+        $this->label      = $label;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * Magic method (triggered when invoking inaccessible methods in a static
+     * context) used to dynamically create an interactable element with an
+     * additional CSSclass. This works for every static method call matching:
+     * /^create(.+)/ The matched group is used as CSS class for the
+     * interactable element.
+     *
+     * @code
+     * echo Button::createSubmit();
+     *
+     * # => <button ... class="submit">...
+     * @endcode
+     *
+     * @param string $name  name of the method being called
+     * @param array  $args  enumerated array containing the parameters
+     *                      passed to the $name'ed method
+     *
+     * @return Interactable returns a Button, if $name =~ /^create/
+     * @throws              throws a BadMethodCallException if $name does not
+     *                      match
+     */
+    public static function __callStatic($name, $args)
+    {
+        # only trigger, if $name =~ /^create/ and at least using $label
+        if (0 === strncasecmp($name, 'create', 6)) {
+
+            # instantiate button from arguments
+            $interactable = call_user_func_array([get_called_class(), 'create'], $args);
+            # but customize with class from $name:
+            $class = self::hyphenate(mb_substr($name, 6));
+
+            # a.) set name unless set
+            if (empty($args[1]) || !is_string($args[1])) {
+                $interactable->attributes['name'] =  $class;
+            }
+
+            # b.) set/append CSS class
+            if (array_key_exists('class', $interactable->attributes)) {
+                $interactable->attributes['class'] .= " $class";
+            } else {
+                $interactable->attributes['class'] =  $class;
+            }
+
+            return $interactable;
+        }
+
+        # otherwise bail out
+        throw new \BadMethodCallException();
+    }
+
+    /**
+     * Easy factory method to create an Interactable instance.
+     * All parameters are optional.
+     *
+     * @code
+     * // example using subclass Button
+     *
+     * echo Button::create();
+     * # => <button type="submit" name="ok">ok</button>
+     *
+     * echo Button::create('Yes')
+     * # => <button type="submit" name="yes">yes</button>
+     *
+     * echo Button::create('Yes', 'aName')
+     * # => <button type="submit" name="aName">yes</button>
+     *
+     * echo Button::create('Yes', array('a' => 1, 'b' => 2))
+     * # => <button type="submit" a="1" b="2" name="yes">yes</button>
+     *
+     * echo Button::create('Yes', 'aName', array('a' => 1, 'b' => 2)),
+     * # => <button type="submit" a="1" b="2" name="aName">yes</button>
+     * @endcode
+     *
+     * @param string $label      the label of the current element
+     * @param string $trait      the specific trait of the current element
+     * @param array  $attributes the attributes of the button element
+     *
+     * @return Interactable element
+     */
+    public static function create($label = NULL, $trait = NULL, $attributes = [])
+    {
+        $argc = func_num_args();
+
+        // if label is empty, use default
+        $label = $label ?: _('ok');
+
+        // if there are two parameters, there are two cases:
+        //   1.) label and trait OR
+        //   2.) label and attributes
+        //
+        // in the latter case, use parameter $trait as attributes
+        // and use the default for name
+        if ($argc === 2 && is_array($trait)) {
+            list($attributes, $trait) = [$trait, NULL];
+        }
+
+        $interactable = new static($label, $attributes);
+        $interactable->initialize($label, $trait, $attributes);
+
+        return $interactable;
+    }
+
+    /**
+     * Initialize an interactable element.
+     * The parameters to create are handed over to enable subclass
+     * specific customization.
+     *
+     * @param string $label      the label of the current element
+     * @param string $trait      the specific trait of the current element
+     * @param array  $attributes the attributes of the button element
+     */
+    abstract protected function initialize($label, $trait, $attributes);
+
+    /**
+     * Convenience method used for autocompletion hints by your
+     * editor.
+     *
+     * Without this method #__callStatic would do the same.
+     *
+     * @param string $label      the label of the current element
+     * @param string $trait      the specific trait of the current element
+     * @param array  $attributes the attributes of the button element
+     */
+    public static function createAccept($label = NULL, $trait = NULL, $attributes = [])
+    {
+        $args = func_num_args() ? func_get_args() : [_('Übernehmen')];
+        return self::__callStatic(__FUNCTION__, $args);
+    }
+
+    /**
+     * Convenience method used for autocompletion hints by your
+     * editor.
+     *
+     * Without this method #__callStatic would do the same.
+     *
+     * @param string $label      the label of the current element
+     * @param string $trait      the specific trait of the current element
+     * @param array  $attributes the attributes of the button element
+     */
+    public static function createEdit($label = NULL, $trait = NULL, $attributes = [])
+    {
+        $args = func_num_args() ? func_get_args() : [_('Bearbeiten')];
+        return self::__callStatic(__FUNCTION__, $args);
+    }
+
+    /**
+     * Convenience method used for autocompletion hints by your
+     * editor.
+     *
+     * Without this method #__callStatic would do the same.
+     *
+     * @param string $label      the label of the current element
+     * @param string $trait      the specific trait of the current element
+     * @param array  $attributes the attributes of the button element
+     */
+    public static function createCancel($label = NULL, $trait = NULL, $attributes = [])
+    {
+        $args = func_num_args() ? func_get_args() : [_('Abbrechen')];
+        return self::__callStatic(__FUNCTION__, $args);
+    }
+
+    /**
+     * Hyphenates the passed word.
+     *
+     * @param string $word  word to be hyphenated
+     *
+     * @return string   hyphenated word
+     */
+    private static function hyphenate($word)
+    {
+        return mb_strtolower(preg_replace('/(?<=\w)([A-Z])/', '-\\1', $word));
+    }
+}
diff --git a/lib/classes/JSONArrayObject.class.php b/lib/classes/JSONArrayObject.class.php
deleted file mode 100644
index 896be3e..0000000
--- a/lib/classes/JSONArrayObject.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * This class works like an array.
- * The internal array is constructed from a a json string
- * When used in an string context, it is automatically converted to a json string
- * utf8 de and encoding is done
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @link http://www.php.net/manual/en/class.arrayobject.php
- */
-class JSONArrayObject extends MultiDimArrayObject
-{
-    /**
-     * Construct an array object from a json string
-     *
-     * @param string $input a json string
-     */
-    function __construct($input)
-    {
-        if (is_string($input)) {
-            $input = (array)json_decode($input, true);
-        }
-        parent::__construct($input);
-    }
-
-    /**
-     * magic method for use of object in string context
-     *
-     * @return string internal array converted to json
-     */
-    function __toString()
-    {
-        return json_encode($this->getArrayCopy());
-    }
-}
diff --git a/lib/classes/JSONArrayObject.php b/lib/classes/JSONArrayObject.php
new file mode 100644
index 0000000..896be3e
--- /dev/null
+++ b/lib/classes/JSONArrayObject.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * This class works like an array.
+ * The internal array is constructed from a a json string
+ * When used in an string context, it is automatically converted to a json string
+ * utf8 de and encoding is done
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @link http://www.php.net/manual/en/class.arrayobject.php
+ */
+class JSONArrayObject extends MultiDimArrayObject
+{
+    /**
+     * Construct an array object from a json string
+     *
+     * @param string $input a json string
+     */
+    function __construct($input)
+    {
+        if (is_string($input)) {
+            $input = (array)json_decode($input, true);
+        }
+        parent::__construct($input);
+    }
+
+    /**
+     * magic method for use of object in string context
+     *
+     * @return string internal array converted to json
+     */
+    function __toString()
+    {
+        return json_encode($this->getArrayCopy());
+    }
+}
diff --git a/lib/classes/LayoutMessage.interface.php b/lib/classes/LayoutMessage.interface.php
deleted file mode 100644
index 7072788..0000000
--- a/lib/classes/LayoutMessage.interface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Generic interface for messages that may be displayed in Stud.IP at the
- * top of the layout's content.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since   Stud.IP 4.2
- */
-interface LayoutMessage
-{
-    /**
-     * Renders the message as html.
-     *
-     * @return string
-     */
-    public function __toString();
-}
diff --git a/lib/classes/LayoutMessage.php b/lib/classes/LayoutMessage.php
new file mode 100644
index 0000000..7072788
--- /dev/null
+++ b/lib/classes/LayoutMessage.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Generic interface for messages that may be displayed in Stud.IP at the
+ * top of the layout's content.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since   Stud.IP 4.2
+ */
+interface LayoutMessage
+{
+    /**
+     * Renders the message as html.
+     *
+     * @return string
+     */
+    public function __toString();
+}
diff --git a/lib/classes/LinkButton.class.php b/lib/classes/LinkButton.class.php
deleted file mode 100644
index 40044b6..0000000
--- a/lib/classes/LinkButton.class.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * Copyright (c) 2011 mlunzena@uos.de, aklassen@uos.de
- *
- * 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.
- */
-
-
-namespace Studip;
-
-/**
- * Represents an HTML link element.
- */
-class LinkButton extends Interactable
-{
-    /**
-     * Initialize a Hyperlink used as button.
-     * The second parameter is used as @href attribute of the
-     * resulting <a> HTML element.
-     *
-     * @param string $label       the label of the <a> element
-     * @param string $url         the @href element of the <a> element
-     * @param array  $attributes  the attributes of the <a> element
-     */
-    protected function initialize($label, $url, $attributes)
-    {
-        $this->attributes['href'] = $url ?: \URLHelper::getURL();
-    }
-
-    /**
-     * @return string returns a HTML representation of this hyperlink.
-     */
-    public function __toString()
-    {
-        if (
-            isset($this->attributes['disabled'])
-            && $this->attributes['disabled'] !== false
-        ) {
-            return (string) Button::create($this->label, 'none', $this->attributes);
-        }
-
-        // add "button" to attribute @class
-        if (empty($this->attributes['class'])) {
-            $this->attributes['class'] = '';
-        }
-        $this->attributes['class'] .= ' button';
-
-        // TODO: URLHelper...?!
-        return sprintf(
-            '<a %s>%s</a>',
-            arrayToHtmlAttributes($this->attributes),
-            htmlReady($this->label)
-        );
-    }
-}
diff --git a/lib/classes/LinkButton.php b/lib/classes/LinkButton.php
new file mode 100644
index 0000000..40044b6
--- /dev/null
+++ b/lib/classes/LinkButton.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * Copyright (c) 2011 mlunzena@uos.de, aklassen@uos.de
+ *
+ * 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.
+ */
+
+
+namespace Studip;
+
+/**
+ * Represents an HTML link element.
+ */
+class LinkButton extends Interactable
+{
+    /**
+     * Initialize a Hyperlink used as button.
+     * The second parameter is used as @href attribute of the
+     * resulting <a> HTML element.
+     *
+     * @param string $label       the label of the <a> element
+     * @param string $url         the @href element of the <a> element
+     * @param array  $attributes  the attributes of the <a> element
+     */
+    protected function initialize($label, $url, $attributes)
+    {
+        $this->attributes['href'] = $url ?: \URLHelper::getURL();
+    }
+
+    /**
+     * @return string returns a HTML representation of this hyperlink.
+     */
+    public function __toString()
+    {
+        if (
+            isset($this->attributes['disabled'])
+            && $this->attributes['disabled'] !== false
+        ) {
+            return (string) Button::create($this->label, 'none', $this->attributes);
+        }
+
+        // add "button" to attribute @class
+        if (empty($this->attributes['class'])) {
+            $this->attributes['class'] = '';
+        }
+        $this->attributes['class'] .= ' button';
+
+        // TODO: URLHelper...?!
+        return sprintf(
+            '<a %s>%s</a>',
+            arrayToHtmlAttributes($this->attributes),
+            htmlReady($this->label)
+        );
+    }
+}
diff --git a/lib/classes/LockRules.class.php b/lib/classes/LockRules.class.php
deleted file mode 100644
index 59679db..0000000
--- a/lib/classes/LockRules.class.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * LockRules.class.php
- *
- *
- * 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.
- *
- * @author      Mark Sievers <msievers@uos.de>
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2011 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-/**
-* LockRules.class.php
-*
-* This class contains only static methods dealing with lock rules
-*
-*/
-
-class LockRules {
-
-    private static $lockmap = [];
-    private static $lockrules = [];
-
-    /**
-     * get lockrule object for given id
-     * from static object pool
-     *
-     * @param string $lock_id id of lockrule
-     * @return LockRule
-     */
-    public static function get($lock_id)
-    {
-        if(!array_key_exists($lock_id, self::$lockrules)) {
-            self::$lockrules[$lock_id] = LockRule::find($lock_id);
-        }
-        return self::$lockrules[$lock_id];
-    }
-
-    /**
-     * returns a list of lockrules that can be administrated
-     * with the given user id
-     *
-     * @param string $user_id id of user
-     * @return array of LockRule objects
-     */
-    public static function getAdministrableSeminarRules($user_id)
-    {
-        return array_filter(LockRule::findAllByType('sem'), function ($rule) use ($user_id) {
-            return $GLOBALS['perm']->get_perm($user_id) === 'root'
-                || (
-                    $rule->user_id === $user_id
-                    && !in_array($rule->permission, ['root', 'admin'])
-                );
-        });
-    }
-
-    /**
-     * returns a list of lockrules that can be applied to a course
-     * with the given user id
-     *
-     * @param string $user_id id of user
-     * @return array of LockRule objects
-     */
-    public static function getAvailableSeminarRules($user_id)
-    {
-        return array_filter(LockRule::findAllByType('sem'), function ($rule) use ($user_id) {
-            return $GLOBALS['perm']->get_perm($user_id) === 'root'
-                || !in_array($rule->permission, ['root', 'admin']);
-        });
-    }
-
-    /**
-     * returns the lock rule object for the given id, else null
-     *
-     * @param string $object_id id of course, institute or user
-     * @param bool $renew if true, reloads the rule from database
-     * @param string|null $object_type : The type of object you want to check: "user", "sem" or "inst"
-     * @return LockRule
-     */
-    public static function getObjectRule($object_id, $renew = false, $object_type = null)
-    {
-        if (!array_key_exists($object_id, self::$lockmap) || $renew) {
-            self::$lockmap[$object_id] = null;
-            if ($object_type === null) {
-                $object_type = get_object_type($object_id, words('sem inst user'));
-            }
-            if ($object_type) {
-                $methodmap = ['sem'  => 'Seminar',
-                                   'inst' => 'Institute',
-                                   'fak'  => 'Institute',
-                                   'user' => 'User'];
-                $lr = call_user_func(['LockRule', 'FindBy' . $methodmap[$object_type]], $object_id);
-                if ($lr) {
-                    self::$lockmap[$object_id] = $lr->getId();
-                    self::$lockrules[$lr->getId()] = $lr;
-                }
-            }
-        }
-        return self::$lockrules[self::$lockmap[$object_id]] ?? null;
-    }
-
-    /**
-     * checks if an attribute of an entity is locked for the current user
-     * see self::getLockRuleConfig() for the list of attributes
-     *
-     * @param string $object_id id of course, institute or user
-     * @param string $attribute the name of an lockable attribute
-     * @param string|null $object_type : The type of object you want to check: "user", "sem" or "inst"
-     * @return boolean true if attribute is locked for the current user
-     */
-    public static function Check($object_id, $attribute, $object_type = null)
-    {
-        $lr = self::getObjectRule($object_id, false, $object_type);
-        if ($lr) {
-            return $lr['attributes'][mb_strtolower($attribute)] == 1 && self::CheckLockRulePermission($object_id);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * checks if given entity is locked for the current user
-     *
-     * @param string $object_id id of course, institute or user
-     * @return boolean true if given entity is locked fpr the current user
-     */
-    public static function CheckLockRulePermission($object_id)
-    {
-        $perms = ['autor','tutor','dozent','admin','root','god'];
-        $lr = self::getObjectRule($object_id);
-
-        if ($lr) {
-            $pk = array_search($lr->permission, $perms);
-            $check_perm = $perms[$pk + 1];
-            if ($lr->object_type == 'sem') {
-                return ($lr->permission == 'root' || !$GLOBALS['perm']->have_studip_perm($check_perm, $object_id));
-    }
-            if ($lr->object_type == 'inst') {
-                return ($lr->permission == 'root' || !$GLOBALS['perm']->have_perm('root'));
-            }
-            if ($lr->object_type == 'user') {
-                return ($lr->permission == 'root' || !$GLOBALS['perm']->have_perm($check_perm));
-            }
-        }
-        return false;
-    }
-
-    /**
-     * returns an array containing all lockable attributes for
-     * given entity type
-     *
-     * @param string $type entity type, one of [sem,inst,user]
-     * @return array
-     */
-    public static function getLockRuleConfig($type)
-    {
-        $groups['basic'] = _("Grunddaten");
-        $groups['personnel'] = _("Personen und Einordnung");
-        $groups['misc'] = _("weitere Daten");
-        $groups['room_time'] = _("Zeiten/Räume");
-        $groups['access'] = _("Zugangsberechtigungen");
-        $groups['actions'] = _("spezielle Aktionen");
-
-        $attributes['sem']['veranstaltungsnummer'] = ['name' => _("Veranstaltungsnummer"), 'group' => 'basic'];
-        $attributes['sem']['seminar_inst'] = ['name' => _("beteiligte Einrichtungen"), 'group' => 'basic'];
-        $attributes['sem']['name'] = ['name' => _("Name"), 'group' => 'basic'];
-        $attributes['sem']['untertitel'] = ['name' => _("Untertitel"), 'group' => 'basic'];
-        $attributes['sem']['status'] = ['name' => _("Status"), 'group' => 'basic'];
-        $attributes['sem']['beschreibung'] = ['name' => _("Beschreibung"), 'group' => 'basic'];
-        $attributes['sem']['ort'] = ['name' => _("Ort"), 'group' => 'basic'];
-        $attributes['sem']['art'] = ['name' => _("Veranstaltungstyp"), 'group' => 'basic'];
-        $attributes['sem']['ects'] = ['name' => _("ECTS-Punkte"), 'group' => 'basic'];
-        $attributes['sem']['admission_turnout'] = ['name' => _("Teilnehmendenzahl"), 'group' => 'basic'];
-        $attributes['sem']['dozent'] = ['name' => _("Lehrende"), 'group' => 'personnel'];
-        $attributes['sem']['tutor'] = ['name' => _("Tutor/-innen"), 'group' => 'personnel'];
-        $attributes['sem']['institut_id'] = ['name' => _("Heimateinrichtung"), 'group' => 'personnel'];
-        $attributes['sem']['sem_tree'] = ['name' => _("Studienbereiche"), 'group' => 'personnel'];
-        $attributes['sem']['mvv_lvgruppe'] = ['name' => _("Modulzuordnung"), 'group' => 'personnel'];
-        $attributes['sem']['participants'] = ['name' => _("Personen hinzufügen/löschen"), 'group' => 'personnel'];
-        $attributes['sem']['groups'] = ['name' => _("Gruppen hinzufügen/löschen"), 'group' => 'personnel'];
-        $attributes['sem']['sonstiges'] = ['name' => _("Sonstiges"), 'group' => 'misc'];
-        $attributes['sem']['teilnehmer'] = ['name' => _("Beschreibung des Teilnehmendenkreises"), 'group' => 'misc'];
-        $attributes['sem']['voraussetzungen'] = ['name' => _("Teilnahmevoraussetzungen"), 'group' => 'misc'];
-        $attributes['sem']['lernorga'] = ['name' => _("Lernorganisation"), 'group' => 'misc'];
-        $attributes['sem']['leistungsnachweis'] = ['name' => _("Leistungsnachweis"), 'group' => 'misc'];
-        $attributes['sem']['room_time'] = ['name' => _("Zeiten/Räume"), 'group' => 'room_time'];
-        $attributes['sem']['cancelled_dates'] = ['name' => _("Termine ausfallen lassen"), 'group' => 'room_time'];
-        $attributes['sem']['edit_dates_in_schedule'] = ['name' => _("Erweiterte Termindaten im Ablaufplan ändern"), 'group' => 'room_time'];
-        $attributes['sem']['admission_endtime'] = ['name' => _("Zeit/Datum der Platzverteilung/Kontingentierung"), 'group' => 'access'];
-        $attributes['sem']['admission_disable_waitlist'] = ['name' => _("Aktivieren/Deaktivieren der Warteliste"), 'group' => 'access'];
-        $attributes['sem']['admission_binding'] = ['name' => _("Verbindlichkeit der Anmeldung"), 'group' => 'access'];
-        $attributes['sem']['admission_type'] = ['name' => _("Typ des Anmeldeverfahrens"), 'group' => 'access'];
-        $attributes['sem']['admission_prelim'] = ['name' => _("zugelassenene Studiengänge"), 'group' => 'access'];
-        $attributes['sem']['admission_prelim_txt'] = ['name' => _("Vorläufigkeit der Anmeldungen"), 'group' => 'access'];
-        $attributes['sem']['admission_disable_waitlist'] = ['name' => _("Hinweistext bei Anmeldungen"), 'group' => 'access'];
-        $attributes['sem']['admission_starttime'] = ['name' => _("Startzeitpunkt der Anmeldemöglichkeit"), 'group' => 'access'];
-        $attributes['sem']['admission_endtime_sem'] = ['name' => _("Endzeitpunkt der Anmeldemöglichkeit"), 'group' => 'access'];
-        $attributes['sem']['lesezugriff'] = ['name' => _("Lesezugriff"), 'group' => 'access'];
-        $attributes['sem']['schreibzugriff'] = ['name' => _("Schreibzugriff"), 'group' => 'access'];
-        $attributes['sem']['passwort'] = ['name' => _("Passwort"), 'group' => 'access'];
-        $attributes['sem']['user_domain'] = ['name' => _("Nutzerdomänen zuordnen"), 'group' => 'access'];
-        $attributes['sem']['seminar_copy'] = ['name' => _("Veranstaltung kopieren"), 'group' => 'actions'];
-        $attributes['sem']['seminar_archive'] = ['name' => _("Veranstaltung archivieren"), 'group' => 'actions'];
-        $attributes['sem']['seminar_visibility'] = ['name' => _("Veranstaltung sichtbar/unsichtbar schalten"), 'group' => 'actions'];
-
-        $attributes['inst']['name'] = ['name' => _("Name"), 'group' => 'basic'];
-        $attributes['inst']['fakultaets_id'] = ['name' => _("Fakultät"), 'group' => 'basic'];
-        $attributes['inst']['type'] = ['name' => _("Bezeichnung"), 'group' => 'basic'];
-        $attributes['inst']['strasse'] = ['name' => _("Straße"), 'group' => 'basic'];
-        $attributes['inst']['plz'] = ['name' => _("Ort"), 'group' => 'basic'];
-        $attributes['inst']['telefon'] = ['name' => _("Telefonnummer"), 'group' => 'basic'];
-        $attributes['inst']['fax'] = ['name' => _("Faxnummer"), 'group' => 'basic'];
-        $attributes['inst']['email'] = ['name' => _("E-Mail-Adresse"), 'group' => 'basic'];
-        $attributes['inst']['url'] = ['name' => _("Homepage"), 'group' => 'basic'];
-        $attributes['inst']['participants'] = ['name' => _("Mitarbeiter hinzufügen/löschen"), 'group' => 'personnel'];
-        $attributes['inst']['groups'] = ['name' => _("Gruppen hinzufügen/löschen"), 'group' => 'personnel'];
-
-        $attributes['user']['name'] = ['name' => _("Vor- und Nachname"), 'group' => 'basic'];
-        $attributes['user']['username'] = ['name' => _("Nutzername"), 'group' => 'basic'];
-        $attributes['user']['password'] = ['name' => _("Passwort"), 'group' => 'basic'];
-        $attributes['user']['email'] = ['name' => _("E-Mail"), 'group' => 'basic'];
-        $attributes['user']['title'] = ['name' => _("Titel"), 'group' => 'basic'];
-        $attributes['user']['gender'] = ['name' => _("Geschlecht"), 'group' => 'basic'];
-        $attributes['user']['privatnr'] = ['name' => _("Telefon (privat)"), 'group' => 'basic'];
-        $attributes['user']['privatcell'] = ['name' => _("Mobiltelefon"), 'group' => 'basic'];
-        $attributes['user']['privadr'] = ['name' => _("Adresse (privat)"), 'group' => 'basic'];
-        $attributes['user']['hobby'] = ['name' => _("Hobbys"), 'group' => 'basic'];
-        $attributes['user']['lebenslauf'] = ['name' => _("Lebenslauf"), 'group' => 'basic'];
-        $attributes['user']['home'] = ['name' => _("Homepage"), 'group' => 'basic'];
-        $attributes['user']['publi'] = ['name' => _("Schwerpunkte"), 'group' => 'misc'];
-        $attributes['user']['schwerp'] = ['name' => _("Publikationen"), 'group' => 'misc'];
-        $attributes['user']['institute_data'] = ['name' => _("Einrichtungsdaten"), 'group' => 'misc'];
-
-        foreach(DataField::getDataFields($type) as $df) {
-            $attributes[$type][$df->datafield_id] = ['name' => $df->name, 'group' => 'misc'];
-        }
-
-        return ['groups' => $groups,'attributes' => $attributes[$type]];
-    }
-
-}
diff --git a/lib/classes/LockRules.php b/lib/classes/LockRules.php
new file mode 100644
index 0000000..59679db
--- /dev/null
+++ b/lib/classes/LockRules.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * LockRules.class.php
+ *
+ *
+ * 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.
+ *
+ * @author      Mark Sievers <msievers@uos.de>
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2011 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+/**
+* LockRules.class.php
+*
+* This class contains only static methods dealing with lock rules
+*
+*/
+
+class LockRules {
+
+    private static $lockmap = [];
+    private static $lockrules = [];
+
+    /**
+     * get lockrule object for given id
+     * from static object pool
+     *
+     * @param string $lock_id id of lockrule
+     * @return LockRule
+     */
+    public static function get($lock_id)
+    {
+        if(!array_key_exists($lock_id, self::$lockrules)) {
+            self::$lockrules[$lock_id] = LockRule::find($lock_id);
+        }
+        return self::$lockrules[$lock_id];
+    }
+
+    /**
+     * returns a list of lockrules that can be administrated
+     * with the given user id
+     *
+     * @param string $user_id id of user
+     * @return array of LockRule objects
+     */
+    public static function getAdministrableSeminarRules($user_id)
+    {
+        return array_filter(LockRule::findAllByType('sem'), function ($rule) use ($user_id) {
+            return $GLOBALS['perm']->get_perm($user_id) === 'root'
+                || (
+                    $rule->user_id === $user_id
+                    && !in_array($rule->permission, ['root', 'admin'])
+                );
+        });
+    }
+
+    /**
+     * returns a list of lockrules that can be applied to a course
+     * with the given user id
+     *
+     * @param string $user_id id of user
+     * @return array of LockRule objects
+     */
+    public static function getAvailableSeminarRules($user_id)
+    {
+        return array_filter(LockRule::findAllByType('sem'), function ($rule) use ($user_id) {
+            return $GLOBALS['perm']->get_perm($user_id) === 'root'
+                || !in_array($rule->permission, ['root', 'admin']);
+        });
+    }
+
+    /**
+     * returns the lock rule object for the given id, else null
+     *
+     * @param string $object_id id of course, institute or user
+     * @param bool $renew if true, reloads the rule from database
+     * @param string|null $object_type : The type of object you want to check: "user", "sem" or "inst"
+     * @return LockRule
+     */
+    public static function getObjectRule($object_id, $renew = false, $object_type = null)
+    {
+        if (!array_key_exists($object_id, self::$lockmap) || $renew) {
+            self::$lockmap[$object_id] = null;
+            if ($object_type === null) {
+                $object_type = get_object_type($object_id, words('sem inst user'));
+            }
+            if ($object_type) {
+                $methodmap = ['sem'  => 'Seminar',
+                                   'inst' => 'Institute',
+                                   'fak'  => 'Institute',
+                                   'user' => 'User'];
+                $lr = call_user_func(['LockRule', 'FindBy' . $methodmap[$object_type]], $object_id);
+                if ($lr) {
+                    self::$lockmap[$object_id] = $lr->getId();
+                    self::$lockrules[$lr->getId()] = $lr;
+                }
+            }
+        }
+        return self::$lockrules[self::$lockmap[$object_id]] ?? null;
+    }
+
+    /**
+     * checks if an attribute of an entity is locked for the current user
+     * see self::getLockRuleConfig() for the list of attributes
+     *
+     * @param string $object_id id of course, institute or user
+     * @param string $attribute the name of an lockable attribute
+     * @param string|null $object_type : The type of object you want to check: "user", "sem" or "inst"
+     * @return boolean true if attribute is locked for the current user
+     */
+    public static function Check($object_id, $attribute, $object_type = null)
+    {
+        $lr = self::getObjectRule($object_id, false, $object_type);
+        if ($lr) {
+            return $lr['attributes'][mb_strtolower($attribute)] == 1 && self::CheckLockRulePermission($object_id);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * checks if given entity is locked for the current user
+     *
+     * @param string $object_id id of course, institute or user
+     * @return boolean true if given entity is locked fpr the current user
+     */
+    public static function CheckLockRulePermission($object_id)
+    {
+        $perms = ['autor','tutor','dozent','admin','root','god'];
+        $lr = self::getObjectRule($object_id);
+
+        if ($lr) {
+            $pk = array_search($lr->permission, $perms);
+            $check_perm = $perms[$pk + 1];
+            if ($lr->object_type == 'sem') {
+                return ($lr->permission == 'root' || !$GLOBALS['perm']->have_studip_perm($check_perm, $object_id));
+    }
+            if ($lr->object_type == 'inst') {
+                return ($lr->permission == 'root' || !$GLOBALS['perm']->have_perm('root'));
+            }
+            if ($lr->object_type == 'user') {
+                return ($lr->permission == 'root' || !$GLOBALS['perm']->have_perm($check_perm));
+            }
+        }
+        return false;
+    }
+
+    /**
+     * returns an array containing all lockable attributes for
+     * given entity type
+     *
+     * @param string $type entity type, one of [sem,inst,user]
+     * @return array
+     */
+    public static function getLockRuleConfig($type)
+    {
+        $groups['basic'] = _("Grunddaten");
+        $groups['personnel'] = _("Personen und Einordnung");
+        $groups['misc'] = _("weitere Daten");
+        $groups['room_time'] = _("Zeiten/Räume");
+        $groups['access'] = _("Zugangsberechtigungen");
+        $groups['actions'] = _("spezielle Aktionen");
+
+        $attributes['sem']['veranstaltungsnummer'] = ['name' => _("Veranstaltungsnummer"), 'group' => 'basic'];
+        $attributes['sem']['seminar_inst'] = ['name' => _("beteiligte Einrichtungen"), 'group' => 'basic'];
+        $attributes['sem']['name'] = ['name' => _("Name"), 'group' => 'basic'];
+        $attributes['sem']['untertitel'] = ['name' => _("Untertitel"), 'group' => 'basic'];
+        $attributes['sem']['status'] = ['name' => _("Status"), 'group' => 'basic'];
+        $attributes['sem']['beschreibung'] = ['name' => _("Beschreibung"), 'group' => 'basic'];
+        $attributes['sem']['ort'] = ['name' => _("Ort"), 'group' => 'basic'];
+        $attributes['sem']['art'] = ['name' => _("Veranstaltungstyp"), 'group' => 'basic'];
+        $attributes['sem']['ects'] = ['name' => _("ECTS-Punkte"), 'group' => 'basic'];
+        $attributes['sem']['admission_turnout'] = ['name' => _("Teilnehmendenzahl"), 'group' => 'basic'];
+        $attributes['sem']['dozent'] = ['name' => _("Lehrende"), 'group' => 'personnel'];
+        $attributes['sem']['tutor'] = ['name' => _("Tutor/-innen"), 'group' => 'personnel'];
+        $attributes['sem']['institut_id'] = ['name' => _("Heimateinrichtung"), 'group' => 'personnel'];
+        $attributes['sem']['sem_tree'] = ['name' => _("Studienbereiche"), 'group' => 'personnel'];
+        $attributes['sem']['mvv_lvgruppe'] = ['name' => _("Modulzuordnung"), 'group' => 'personnel'];
+        $attributes['sem']['participants'] = ['name' => _("Personen hinzufügen/löschen"), 'group' => 'personnel'];
+        $attributes['sem']['groups'] = ['name' => _("Gruppen hinzufügen/löschen"), 'group' => 'personnel'];
+        $attributes['sem']['sonstiges'] = ['name' => _("Sonstiges"), 'group' => 'misc'];
+        $attributes['sem']['teilnehmer'] = ['name' => _("Beschreibung des Teilnehmendenkreises"), 'group' => 'misc'];
+        $attributes['sem']['voraussetzungen'] = ['name' => _("Teilnahmevoraussetzungen"), 'group' => 'misc'];
+        $attributes['sem']['lernorga'] = ['name' => _("Lernorganisation"), 'group' => 'misc'];
+        $attributes['sem']['leistungsnachweis'] = ['name' => _("Leistungsnachweis"), 'group' => 'misc'];
+        $attributes['sem']['room_time'] = ['name' => _("Zeiten/Räume"), 'group' => 'room_time'];
+        $attributes['sem']['cancelled_dates'] = ['name' => _("Termine ausfallen lassen"), 'group' => 'room_time'];
+        $attributes['sem']['edit_dates_in_schedule'] = ['name' => _("Erweiterte Termindaten im Ablaufplan ändern"), 'group' => 'room_time'];
+        $attributes['sem']['admission_endtime'] = ['name' => _("Zeit/Datum der Platzverteilung/Kontingentierung"), 'group' => 'access'];
+        $attributes['sem']['admission_disable_waitlist'] = ['name' => _("Aktivieren/Deaktivieren der Warteliste"), 'group' => 'access'];
+        $attributes['sem']['admission_binding'] = ['name' => _("Verbindlichkeit der Anmeldung"), 'group' => 'access'];
+        $attributes['sem']['admission_type'] = ['name' => _("Typ des Anmeldeverfahrens"), 'group' => 'access'];
+        $attributes['sem']['admission_prelim'] = ['name' => _("zugelassenene Studiengänge"), 'group' => 'access'];
+        $attributes['sem']['admission_prelim_txt'] = ['name' => _("Vorläufigkeit der Anmeldungen"), 'group' => 'access'];
+        $attributes['sem']['admission_disable_waitlist'] = ['name' => _("Hinweistext bei Anmeldungen"), 'group' => 'access'];
+        $attributes['sem']['admission_starttime'] = ['name' => _("Startzeitpunkt der Anmeldemöglichkeit"), 'group' => 'access'];
+        $attributes['sem']['admission_endtime_sem'] = ['name' => _("Endzeitpunkt der Anmeldemöglichkeit"), 'group' => 'access'];
+        $attributes['sem']['lesezugriff'] = ['name' => _("Lesezugriff"), 'group' => 'access'];
+        $attributes['sem']['schreibzugriff'] = ['name' => _("Schreibzugriff"), 'group' => 'access'];
+        $attributes['sem']['passwort'] = ['name' => _("Passwort"), 'group' => 'access'];
+        $attributes['sem']['user_domain'] = ['name' => _("Nutzerdomänen zuordnen"), 'group' => 'access'];
+        $attributes['sem']['seminar_copy'] = ['name' => _("Veranstaltung kopieren"), 'group' => 'actions'];
+        $attributes['sem']['seminar_archive'] = ['name' => _("Veranstaltung archivieren"), 'group' => 'actions'];
+        $attributes['sem']['seminar_visibility'] = ['name' => _("Veranstaltung sichtbar/unsichtbar schalten"), 'group' => 'actions'];
+
+        $attributes['inst']['name'] = ['name' => _("Name"), 'group' => 'basic'];
+        $attributes['inst']['fakultaets_id'] = ['name' => _("Fakultät"), 'group' => 'basic'];
+        $attributes['inst']['type'] = ['name' => _("Bezeichnung"), 'group' => 'basic'];
+        $attributes['inst']['strasse'] = ['name' => _("Straße"), 'group' => 'basic'];
+        $attributes['inst']['plz'] = ['name' => _("Ort"), 'group' => 'basic'];
+        $attributes['inst']['telefon'] = ['name' => _("Telefonnummer"), 'group' => 'basic'];
+        $attributes['inst']['fax'] = ['name' => _("Faxnummer"), 'group' => 'basic'];
+        $attributes['inst']['email'] = ['name' => _("E-Mail-Adresse"), 'group' => 'basic'];
+        $attributes['inst']['url'] = ['name' => _("Homepage"), 'group' => 'basic'];
+        $attributes['inst']['participants'] = ['name' => _("Mitarbeiter hinzufügen/löschen"), 'group' => 'personnel'];
+        $attributes['inst']['groups'] = ['name' => _("Gruppen hinzufügen/löschen"), 'group' => 'personnel'];
+
+        $attributes['user']['name'] = ['name' => _("Vor- und Nachname"), 'group' => 'basic'];
+        $attributes['user']['username'] = ['name' => _("Nutzername"), 'group' => 'basic'];
+        $attributes['user']['password'] = ['name' => _("Passwort"), 'group' => 'basic'];
+        $attributes['user']['email'] = ['name' => _("E-Mail"), 'group' => 'basic'];
+        $attributes['user']['title'] = ['name' => _("Titel"), 'group' => 'basic'];
+        $attributes['user']['gender'] = ['name' => _("Geschlecht"), 'group' => 'basic'];
+        $attributes['user']['privatnr'] = ['name' => _("Telefon (privat)"), 'group' => 'basic'];
+        $attributes['user']['privatcell'] = ['name' => _("Mobiltelefon"), 'group' => 'basic'];
+        $attributes['user']['privadr'] = ['name' => _("Adresse (privat)"), 'group' => 'basic'];
+        $attributes['user']['hobby'] = ['name' => _("Hobbys"), 'group' => 'basic'];
+        $attributes['user']['lebenslauf'] = ['name' => _("Lebenslauf"), 'group' => 'basic'];
+        $attributes['user']['home'] = ['name' => _("Homepage"), 'group' => 'basic'];
+        $attributes['user']['publi'] = ['name' => _("Schwerpunkte"), 'group' => 'misc'];
+        $attributes['user']['schwerp'] = ['name' => _("Publikationen"), 'group' => 'misc'];
+        $attributes['user']['institute_data'] = ['name' => _("Einrichtungsdaten"), 'group' => 'misc'];
+
+        foreach(DataField::getDataFields($type) as $df) {
+            $attributes[$type][$df->datafield_id] = ['name' => $df->name, 'group' => 'misc'];
+        }
+
+        return ['groups' => $groups,'attributes' => $attributes[$type]];
+    }
+
+}
diff --git a/lib/classes/Loggable.class.php b/lib/classes/Loggable.class.php
deleted file mode 100644
index ed0e162..0000000
--- a/lib/classes/Loggable.class.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Loggable
- * This interface provides necessary functions to use the Stud.IP internal
- * logging.
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       3.0
- */
-
-/**
- * Loggable
- * This interface provides necessary functions to use the Stud.IP internal
- * logging.
- * 
- * @see StudipLog
- */
-interface Loggable
-{
-    
-    /**
-     * This function is used to format the info_template of the
-     * action used by the given event and its properties. It is the first step
-     * in the formatting process. It returns a string that will
-     * be formatted by the replacements for the Stud.IP standard objects
-     * (e.g. User, Seminar, Institute,...).
-     * See LogEvent::formatEvent().
-     * 
-     * @param LogEvent $event
-     */
-    public static function logFormat(LogEvent $event);
-
-    /**
-     * This function is used to search for objects related to log events.
-     * The search has to accept a string as part of the name or the id of the
-     * object.
-     * See search functions in StudipLog.
-     * 
-     * @param string $needle The needle to search for (object id or part of the
-     * name)
-     * @param string $action_name The name of the action.
-     */
-    public static function logSearch($needle, $action_name = null);
-    
-}
\ No newline at end of file
diff --git a/lib/classes/Loggable.php b/lib/classes/Loggable.php
new file mode 100644
index 0000000..ed0e162
--- /dev/null
+++ b/lib/classes/Loggable.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Loggable
+ * This interface provides necessary functions to use the Stud.IP internal
+ * logging.
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       3.0
+ */
+
+/**
+ * Loggable
+ * This interface provides necessary functions to use the Stud.IP internal
+ * logging.
+ * 
+ * @see StudipLog
+ */
+interface Loggable
+{
+    
+    /**
+     * This function is used to format the info_template of the
+     * action used by the given event and its properties. It is the first step
+     * in the formatting process. It returns a string that will
+     * be formatted by the replacements for the Stud.IP standard objects
+     * (e.g. User, Seminar, Institute,...).
+     * See LogEvent::formatEvent().
+     * 
+     * @param LogEvent $event
+     */
+    public static function logFormat(LogEvent $event);
+
+    /**
+     * This function is used to search for objects related to log events.
+     * The search has to accept a string as part of the name or the id of the
+     * object.
+     * See search functions in StudipLog.
+     * 
+     * @param string $needle The needle to search for (object id or part of the
+     * name)
+     * @param string $action_name The name of the action.
+     */
+    public static function logSearch($needle, $action_name = null);
+    
+}
\ No newline at end of file
diff --git a/lib/classes/MVV.class.php b/lib/classes/MVV.class.php
deleted file mode 100644
index 517514c..0000000
--- a/lib/classes/MVV.class.php
+++ /dev/null
@@ -1,849 +0,0 @@
-<?php
-/**
- * MVV.class.php
- * Helper class
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @author      Timo Hartge <hartge@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.1
- */
-
-
-require_once 'config/mvv_config.php';
-
-class MVV implements Loggable {
-
-    /**
-     * The global key used by mvv classes to store values in cache.
-     */
-    const CACHE_KEY = 'MVV';
-
-    /**
-     * Determines whether the mvv backend is visible.
-     *
-     * @return boolean True if backend is visible
-     */
-    public static function isVisible() {
-        if (!$GLOBALS['perm']) {
-            return false;
-        }
-        if ($GLOBALS['perm']->have_perm('root') || ($GLOBALS['perm']->have_perm('admin')
-                && RolePersistence::isAssignedRole(
-                        $GLOBALS['user']->id, 'MVVAdmin'))) {
-            return true;
-        }
-        if (RolePersistence::isAssignedRole(
-                        $GLOBALS['user']->id, 'MVVEntwickler')) {
-            return true;
-        }
-        if (RolePersistence::isAssignedRole(
-                        $GLOBALS['user']->id, 'MVVRedakteur')) {
-            return true;
-        }
-        if (RolePersistence::isAssignedRole(
-                        $GLOBALS['user']->id, 'MVVTranslator')) {
-            return true;
-        }
-        if (RolePersistence::isAssignedRole(
-                        $GLOBALS['user']->id, 'MVVFreigabe')) {
-            return true;
-        }
-        if (RolePersistence::isAssignedRole(
-                        $GLOBALS['user']->id, 'MVVLvGruppenAdmin')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Determines whether the search for modules is visible in the global search.
-     *
-     * @return boolean True if backend is visible in search
-     */
-    public static function isVisibleSearch()
-    {
-        return isset($GLOBALS['perm'])
-            && ($GLOBALS['perm']->have_perm('autor') || Config::get()->COURSE_SEARCH_IS_VISIBLE_NOBODY)
-            && Modul::publicModulesAvailable();
-    }
-
-    /**
-     * This method enriches the logentry templates with data of the mvv classes
-     *
-     * @param  LogEvent  log event entry
-     *
-     * @return void
-     */
-    public static function logFormat(LogEvent $event)
-    {
-        $templ = $event->action->info_template;
-
-        $table = explode('.', $event->info);
-        switch ($table[0]) {
-
-            case 'abschluss':
-                $abschluss = Abschluss::find($event->affected_range_id);
-                if ($abschluss) {
-                    $url = URLHelper::getURL('dispatch.php/fachabschluss/abschluesse/details/' . $abschluss->getId(), [], true);
-                    $templ = str_replace('%abschluss(%affected)', '<a href="' . $url . '">' . htmlReady($abschluss->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_abschl_kategorie':
-                $abskategorie = AbschlussKategorie::find($event->affected_range_id);
-                if ($abskategorie) {
-                    $url = URLHelper::getURL('dispatch.php/fachabschluss/kategorien/details/' . $abskategorie->getId(), [], true);
-                    $templ = str_replace('%abskategorie(%affected)', '<a href="' . $url . '">' . htmlReady($abskategorie->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_abschl_zuord':
-                $abschluss = Abschluss::find($event->affected_range_id);
-                if ($abschluss) {
-                    $url = URLHelper::getURL('dispatch.php/fachabschluss/abschluesse/details/' . $abschluss->getId(), [], true);
-                    $templ = str_replace('%abschluss(%affected)', '<a href="' . $url . '">' . htmlReady($abschluss->getDisplayName()) . '</a>', $templ);
-                }
-                $co_kategorie = AbschlussKategorie::find($event->coaffected_range_id);
-                if ($co_kategorie) {
-                    $url = URLHelper::getURL('dispatch.php/fachabschluss/kategorien/details/' . $co_kategorie->getId(), [], true);
-                    $templ = str_replace('%abskategorie(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_kategorie->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'fach':
-            case 'mvv_fach_inst':
-                $fach = Fach::find($event->affected_range_id);
-                if ($fach) {
-                    $url = URLHelper::getURL('dispatch.php/fachabschluss/faecher/details/' . $fach->getId(), [], true);
-                    $templ = str_replace('%fach(%affected)', '<a href="' . $url . '">' . htmlReady($fach->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_lvgruppe':
-            case 'mvv_lvgruppe_seminar':
-                $lvgruppe = Lvgruppe::find($event->affected_range_id);
-                if ($lvgruppe) {
-                    $url = URLHelper::getURL('dispatch.php/lvgruppen/lvgruppen/details/' . $lvgruppe->getId(), [], true);
-                    $templ = str_replace('%lvgruppe(%affected)', '<a href="' . $url . '">' . htmlReady($lvgruppe->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_lvgruppe_modulteil':
-                $lvgruppe = Lvgruppe::find($event->affected_range_id);
-                if ($lvgruppe) {
-                    $url = URLHelper::getURL('dispatch.php/lvgruppen/lvgruppen/details/' . $lvgruppe->getId(), [], true);
-                    $templ = str_replace('%lv(%affected)', '<a href="' . $url . '">' . htmlReady($lvgruppe->getDisplayName()) . '</a>', $templ);
-                }
-                $co_modulteil = Modulteil::find($event->coaffected_range_id);
-                if ($co_modulteil) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $co_modulteil->getId(), [], true);
-                    $templ = str_replace('%modulteil(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_modulteil->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_modul':
-            case 'mvv_modul_user':
-            case 'mvv_modul_inst':
-                $modul = Modul::find($event->affected_range_id);
-                if ($modul) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $modul->getId(), [], true);
-                    $templ = str_replace('%modul(%affected)', '<a href="' . $url . '">' . htmlReady($modul->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_modulteil':
-                $modulteil = Modulteil::find($event->affected_range_id);
-                if ($modulteil) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modulteil->getId(), [], true);
-                    $templ = str_replace('%modulteil(%affected)', '<a href="' . $url . '">' . htmlReady($modulteil->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_modulteil_deskriptor':
-                $modulteil_desk = ModulteilDeskriptor::find($event->affected_range_id);
-                if ($modulteil_desk) {
-                    $modteil = Modulteil::find($modulteil_desk->modulteil_id);
-                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modteil->getId(), [], true);
-                    $templ = str_replace('%modulteildesk(%affected)', 'in Modulteil <a href="' . $url . '">' . htmlReady($modteil->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_modulteil_language':
-                $modulteil = Modulteil::find($event->affected_range_id);
-                if ($modulteil) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modulteil->getId(), [], true);
-                    $templ = str_replace('%modulteil(%affected)', '<a href="' . $url . '">' . htmlReady($modulteil->getDisplayName()) . '</a>', $templ);
-                }
-                $co_mtlanguage = ModulteilLanguage::find([
-                    $event->affected_range_id,
-                    $event->coaffected_range_id
-                ]);
-                if ($co_mtlanguage) {
-                    $templ = str_replace('%language(%coaffected)', htmlReady($co_mtlanguage->getDisplayName()), $templ);
-                }
-                break;
-
-            case 'mvv_modulteil_stgteilabschnitt':
-                $modulteil = Modulteil::find($event->affected_range_id);
-                if ($modulteil) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modulteil->getId(), [], true);
-                    $templ = str_replace('%modulteil(%affected)', '<a href="' . $url . '">' . htmlReady($modulteil->getDisplayName()) . '</a>', $templ);
-                }
-                $co_stgteilabs = StgteilAbschnitt::find($event->coaffected_range_id);
-                if ($co_stgteilabs) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/details_abschnitt/' . $co_stgteilabs->getId(), [], true);
-                    $templ = str_replace('%stgteilabs(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_stgteilabs->getDisplayName()) . '</a>', $templ);
-                    $templ = str_replace('%fachsem', $event->dbg_info, $templ);
-                }
-                break;
-
-            case 'mvv_modul_deskriptor':
-                $modul_desk = ModulDeskriptor::find($event->affected_range_id);
-                if ($modul_desk) {
-                    $mod = Modul::find($modul_desk->modul_id);
-                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $mod->getId(), [], true);
-                    $templ = str_replace('%moduldesk(%affected)', 'in Modul <a href="' . $url . '">' . htmlReady($mod->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_modul_language':
-                $modul = Modul::find($event->affected_range_id);
-                if ($modul) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $modul->getId(), [], true);
-                    $templ = str_replace('%modul(%affected)', '<a href="' . $url . '">' . htmlReady($modul->getDisplayName()) . '</a>', $templ);
-                }
-                $co_mlanguage = ModulLanguage::find([
-                    $event->affected_range_id,
-                    $event->coaffected_range_id
-                ]);
-                if ($co_mlanguage) {
-                    $templ = str_replace('%language(%coaffected)', htmlReady($co_mlanguage->getDisplayName()), $templ);
-                }
-                break;
-
-            case 'mvv_stgteil':
-            case 'mvv_fachberater':
-                $stgteil = StudiengangTeil::find($event->affected_range_id);
-                if ($stgteil) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengangteile/details_versionen/' . $stgteil->getId(), [], true);
-                    $templ = str_replace('%stgteil(%affected)', '<a href="' . $url . '">' . htmlReady($stgteil->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_stgteilabschnitt':
-                $stgteilabs = StgteilAbschnitt::find($event->affected_range_id);
-                if ($stgteilabs) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/details_abschnitt/' . $stgteilabs->getId(), [], true);
-                    $templ = str_replace('%stgteilabs(%affected)', '<a href="' . $url . '">' . htmlReady($stgteilabs->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_stgteilabschnitt_modul':
-                $stgteilabs = StgteilAbschnitt::find($event->affected_range_id);
-                if ($stgteilabs) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/details_abschnitt/' . $stgteilabs->getId(), [], true);
-                    $templ = str_replace('%stgteilabs(%affected)', '<a href="' . $url . '">' . htmlReady($stgteilabs->getDisplayName()) . '</a>', $templ);
-                }
-                $co_modul = Modul::find($event->coaffected_range_id);
-                if ($co_modul) {
-                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $co_modul->getId(), [], true);
-                    $templ = str_replace('%modul(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_modul->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_stgteilversion':
-                $version = StgteilVersion::find($event->affected_range_id);
-                if ($version) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/abschnitte/' . $version->getId(), [], true);
-                    $templ = str_replace('%version(%affected)', '<a href="' . $url . '">' . htmlReady($version->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_stgteil_bez':
-                $stgteilbez = StgteilBezeichnung::find($event->affected_range_id);
-                if ($stgteilbez) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/stgteilbezeichnungen/details/' . $stgteilbez->getId(), [], true);
-                    $templ = str_replace('%stgteilbez(%affected)', '<a href="' . $url . '">' . htmlReady($stgteilbez->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_stg_stgteil':
-                $stg = Studiengang::find($event->affected_range_id);
-                if ($stg) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $stg->getId(), [], true);
-                    $templ = str_replace('%stg(%affected)', '<a href="' . $url . '">' . htmlReady($stg->getDisplayName()) . '</a>', $templ);
-                }
-                $co_stgteil = StudiengangTeil::find($event->coaffected_range_id);
-                if ($co_stgteil) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengangteile/details_versionen/' . $co_stgteil->getId(), [], true);
-                    $templ = str_replace('%stgteil(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_stgteil->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_studiengang':
-                $stg = Studiengang::find($event->affected_range_id);
-                if ($stg) {
-                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $stg->getId(), [], true);
-                    $templ = str_replace('%stg(%affected)', '<a href="' . $url . '">' . htmlReady($stg->getDisplayName()) . '</a>', $templ);
-                }
-                break;
-
-            case 'mvv_contacts':
-                $contact = MvvContact::find($event->affected_range_id);
-                if ($contact) {
-                    $url = URLHelper::getLink('dispatch.php/shared/contacts/details/index/' . $contact->id);
-                    $templ = str_replace(
-                        '%contact(%affected)',
-                        '<a href="' . $url . '">' . htmlReady($contact->getDisplayName()) . '</a>',
-                        $templ
-                    );
-                }
-                break;
-
-            case 'mvv_contacts_ranges':
-                $contact_range = MvvContactRange::find($event->dbg_info);
-                if ($contact_range) {
-                    if ($contact_range->contact) {
-                        $url_affected = URLHelper::getLink(
-                            'dispatch.php/shared/contacts/details/index/' . $contact_range->contact->id);
-                        $templ = str_replace(
-                            '%contact(%affected)',
-                            '<a href="' . $url_affected . '">' . htmlReady($contact_range->contact->getDisplayName()) . '</a>',
-                            $templ
-                        );
-                    }
-                    $range = null;
-                    switch ($contact_range->range_type) {
-                        case 'Modul':
-                            $range = Modul::find($event->coaffected_range_id);
-                            $url_coaffected = URLHelper::getLink(
-                                'dispatch.php/module/module/details/' . $range->id,
-                                [],
-                                true
-                            );
-                            break;
-                        case 'Studiengang':
-                            $range = Studiengang::find($event->coaffected_range_id);
-                            $url_coaffected = URLHelper::getLink(
-                                'dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $range->id,
-                                [],
-                                true
-                            );
-                            break;
-                        case 'StudiengangTeil':
-                            $range = StudiengangTeil::find($event->coaffected_range_id);
-                            $url_coaffected = URLHelper::getLink(
-                                'dispatch.php/studiengaenge/studiengangteile/details_versionen/' . $range->id,
-                                [],
-                                true
-                            );
-
-                    }
-                    if ($range) {
-                        $templ = str_replace(
-                            '%range(%coaffected)',
-                            '<a href="' . $url_coaffected . '">' . htmlReady($range->getDisplayName()) . '</a>',
-                            $templ
-                        );
-                    }
-                }
-                break;
-
-            case 'mvv_extern_contacts':
-                $extern_contact = MvvExternContact::find($event->affected_range_id);
-                if ($extern_contact) {
-                    $url = URLHelper::getLink('dispatch.php/shared/contacts/details/index/' . $extern_contact->id);
-                    $templ = str_replace(
-                        '%contact(%affected)',
-                        '<a href="' . $url . '">' . htmlReady($extern_contact->getDisplayName()) . '</a>',
-                        $templ
-                    );
-                }
-                break;
-
-            case 'mvv_files':
-                $file = MvvFile::find($event->affected_range_id);
-                if ($file) {
-                    $url = URLHelper::getLink('dispatch.php/materialien/files/index/' . $file->id);
-                    $templ = str_replace(
-                        '%file(%affected)',
-                        '<a href="' . $url . '">' . htmlReady($file->getDisplayName()) . '</a>',
-                        $templ
-                    );
-                }
-                break;
-
-            case 'mvv_files_filerefs':
-                $fileref = MvvFileFileref::find($event->affected_range_id);
-                if ($fileref) {
-                    $url = URLHelper::getLink('dispatch.php/materialien/index/' . $fileref->mvvfile_id);
-                    $templ = str_replace(
-                        '%fileref(%affected)',
-                        '<a href="' . $url . '">' . htmlReady($fileref->getDisplayName()) . '</a>',
-                        $templ
-                    );
-                }
-                break;
-
-            case 'mvv_files_ranges':
-                $file_range = MvvFileRange::find([
-                    $event->affected_range_id,
-                    $event->coaffected_range_id
-                ]);
-                if ($file_range) {
-                    if ($file_range->mvv_file) {
-                        $url_affected = URLHelper::getLink(
-                            'dispatch.php/materialien/index/' . $file_range->mvvfile_id
-                        );
-                        $templ = str_replace(
-                            '%fileref(%affected)',
-                            '<a href="' . $url_affected . '">' . htmlReady($file_range->mvv_file->getDisplayName()) . '</a>',
-                            $templ
-                        );
-                    }
-                    $range = null;
-                    switch ($file_range->range_type) {
-                        case 'Studiengang':
-                            $range = Studiengang::find($event->coaffected_range_id);
-                            $url_coaffected = URLHelper::getLink(
-                                'dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $range->id,
-                                [],
-                                true
-                            );
-                            break;
-                        case 'StgteilVersion':
-                            $range = StgteilVersion::find($event->coaffected_range_id);
-                            $url_coaffected = URLHelper::getLink(
-                                'dispatch.php/studiengaenge/studiengangteile/version/' . $range->id,
-                                [],
-                                true
-                            );
-
-                    }
-                    if ($range) {
-                        $templ = str_replace(
-                            '%range(%coaffected)',
-                            '<a href="' . $url_coaffected . '">' . htmlReady($range->getDisplayName()) . '</a>',
-                            $templ
-                        );
-                    }
-                }
-                break;
-
-            default:
-                break;
-        }
-
-        // specials
-        // Benutzergruppen im Modul z.B. Modulverantwortlicher
-        $templ = str_replace('%gruppe', $event->dbg_info, $templ);
-        // Objekt konnte nicht eingesetzt werden da es vermutlich nicht mehr existiert, beim delete landet der alte Bezeichner im debug
-        $templ = str_replace('%modul(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%modulteil(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%modulteildesk(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%moduldesk(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%stg(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%stgteil(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%stgteilabs(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%version(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%stgteilbez(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%lvgruppe(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%fach(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%abschluss(%affected)', $event->dbg_info, $templ);
-        $templ = str_replace('%abskategorie(%affected)', $event->dbg_info, $templ);
-
-        $templ = str_replace('%abskategorie(%coaffected)', $event->dbg_info, $templ);
-        $templ = str_replace('%modulteil(%coaffected)', $event->dbg_info, $templ);
-        $templ = str_replace('%modul(%coaffected)', $event->dbg_info, $templ);
-        $templ = str_replace('%language(%coaffected)', $event->dbg_info, $templ);
-        $templ = str_replace('%stgteilabs(%coaffected)', $event->dbg_info, $templ);
-        $templ = str_replace('%stgteil(%coaffected)', $event->dbg_info, $templ);
-        $templ = str_replace('%contact', $event->dbg_info, $templ);
-
-        return $templ;
-    }
-
-    /**
-     * This method searches the log-entries for log-actions of the mvv classes.
-     * Used by search function on log page.
-     *
-     * @param  string  $needle The search term.
-     * @param  string  $action_name The name of the log action.
-     *
-     * @return array Found log events.
-     */
-    public static function logSearch($needle, $action_name = null)
-    {
-        $result = [];
-
-        $modul_actions = [
-            'MVV_MODUL_NEW',
-            'MVV_MODUL_UPDATE',
-            'MVV_MODUL_DEL',
-            'MVV_MODUL_DESK_NEW',
-            'MVV_MODUL_DESK_UPDATE',
-            'MVV_MODUL_DESK_DEL',
-            'MVV_MODULINST_NEW',
-            'MVV_MODULINST_DEL',
-            'MVV_MODULINST_UPDATE',
-            'MVV_MODUL_USER_NEW',
-            'MVV_MODUL_USER_DEL',
-            'MVV_MODUL_USER_UPDATE',
-            'MVV_MODUL_LANG_NEW',
-            'MVV_MODUL_LANG_DEL',
-            'MVV_MODUL_LANG_UPDATE',
-            'MVV_MODULTEIL_STGTEILABS_NEW',
-            'MVV_MODULTEIL_STGTEILABS_DEL',
-            'MVV_MODULTEIL_STGTEILABS_UPDATE',
-            'MVV_STGTEILABS_MODUL_NEW',
-            'MVV_STGTEILABS_MODUL_DEL',
-            'MVV_STGTEILABS_MODUL_UPDATE'
-        ];
-
-        if (in_array($action_name, $modul_actions)) {
-            $module = Modul::findBySQL(
-                "code LIKE CONCAT('%', :needle, '%') OR modul_id = :needle"
-            );
-            $deskriptoren = ModulDeskriptor::findBySql(
-                "bezeichnung LIKE CONCAT('%', :needle, '%')
-                 OR deskriptor_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($module as $modul) {
-                $result[] = [
-                    $modul->getId(),
-                    $modul->getDisplayName()
-                ];
-            }
-            foreach ($deskriptoren as $desk) {
-                $modul = Modul::find($desk->modul_id);
-                $result[] = [
-                    $modul->getId(),
-                    $modul->getDisplayName()
-                ];
-            }
-        }
-
-        $modulteile_actions = [
-            'MVV_MODULTEIL_NEW',
-            'MVV_MODULTEIL_UPDATE',
-            'MVV_MODULTEIL_DEL',
-            'MVV_MODULTEIL_DESK_NEW',
-            'MVV_MODULTEIL_DESK_UPDATE',
-            'MVV_MODULTEIL_DESK_DEL',
-            'MVV_MODULTEIL_LANG_NEW',
-            'MVV_MODULTEIL_LANG_DEL',
-            'MVV_MODULTEIL_LANG_UPDATE',
-            'MVV_LVMODULTEIL_NEW',
-            'MVV_LVMODULTEIL_DEL',
-            'MVV_LVMODULTEIL_UPDATE'
-        ];
-
-        if (in_array($action_name, $modulteile_actions)) {
-            $deskriptoren = ModulDeskriptor::findBySql(
-                "bezeichnung LIKE CONCAT('%', :needle, '%')
-                 OR deskriptor_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($deskriptoren as $desk) {
-                $modulteil = Modulteil::find($desk->modulteil_id);
-                $result[] = [
-                    $modulteil->getId(),
-                    $modulteil->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_STUDIENGANG_NEW',
-            'MVV_STUDIENGANG_UPDATE',
-            'MVV_STUDIENGANG_DEL',
-            'MVV_STG_STGTEIL_NEW',
-            'MVV_STG_STGTEIL_DEL',
-            'MVV_STG_STGTEIL_UPDATE'
-        ])) {
-            $stg = Studiengang::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR studiengang_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($stg as $studiengang) {
-                $result[] = [
-                    $studiengang->getId(),
-                    $studiengang->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_STGTEIL_NEW',
-            'MVV_STGTEIL_UPDATE',
-            'MVV_STGTEIL_DEL',
-            'MVV_FACHBERATER_NEW',
-            'MVV_FACHBERATER_UPDATE',
-            'MVV_FACHBERATER_DEL'
-        ])) {
-            $stgteile = StudiengangTeil::findBySQL(
-                "zusatz LIKE CONCAT('%', :needle, '%')
-                 OR zusatz_en LIKE CONCAT('%', :needle, '%')
-                 OR stgteil_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($stgteile as $stgteil) {
-                $result[] = [
-                    $stgteil->getId(),
-                    $stgteil->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_STGTEILVERSION_NEW',
-            'MVV_STGTEILVERSION_UPDATE',
-            'MVV_STGTEILVERSION_DEL'
-        ])) {
-            $versionen = StgteilVersion::findBySQL(
-                "code LIKE CONCAT('%', :needle, '%')
-                 OR version_id = :needle
-                 OR stgteil_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($versionen as $version) {
-                $result[] = [
-                    $version->getId(),
-                    $version->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_STGTEILBEZ_NEW',
-            'MVV_STGTEILBEZ_UPDATE',
-            'MVV_STGTEILBEZ_DEL'
-        ])) {
-            $stgbez = StgteilBezeichnung::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR name_en LIKE CONCAT('%', :needle, '%')
-                 OR stgteil_bez_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($stgbez as $bez) {
-                $result[] = [
-                    $bez->getId(),
-                    $bez->getDisplayName()
-                ];
-            }
-        }
-
-        $stgteil_actions = [
-            'MVV_STGTEILABS_NEW',
-            'MVV_STGTEILABS_UPDATE',
-            'MVV_STGTEILABS_DEL',
-            'MVV_MODULTEIL_STGTEILABS_NEW',
-            'MVV_MODULTEIL_STGTEILABS_DEL',
-            'MVV_MODULTEIL_STGTEILABS_UPDATE',
-            'MVV_STG_STGTEIL_NEW',
-            'MVV_STG_STGTEIL_DEL',
-            'MVV_STG_STGTEIL_UPDATE',
-            'MVV_STGTEILABS_MODUL_NEW',
-            'MVV_STGTEILABS_MODUL_DEL',
-            'MVV_STGTEILABS_MODUL_UPDATE'
-        ];
-
-        if (in_array($action_name, $stgteil_actions)) {
-            $stgteilabs = Lvgruppe::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR name_en LIKE CONCAT('%', :needle, '%')
-                 OR abschnitt_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($stgteilabs as $abschnitt) {
-                $result[] = [
-                    $abschnitt->getId(),
-                    $abschnitt->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_LVGRUPPE_NEW',
-            'MVV_LVGRUPPE_DEL',
-            'MVV_LVGRUPPE_UPDATE',
-            'MVV_LVMODULTEIL_NEW',
-            'MVV_LVMODULTEIL_DEL',
-            'MVV_LVMODULTEIL_UPDATE',
-            'MVV_LVSEMINAR_NEW',
-            'MVV_LVSEMINAR_DEL',
-            'MVV_LVSEMINAR_UPDATE'
-        ])) {
-            $lvgruppen = Lvgruppe::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR name_en LIKE CONCAT('%', :needle, '%')
-                 OR lvgruppe_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($lvgruppen as $lvgruppe) {
-                $result[] = [
-                    $lvgruppe->getId(),
-                    $lvgruppe->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_FACH_NEW',
-            'MVV_FACH_UPDATE',
-            'MVV_FACH_DEL',
-            'MVV_FACHINST_NEW',
-            'MVV_FACHINST_DEL',
-            'MVV_FACHINST_UPDATE'
-        ])) {
-            $faecher = Fach::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR name_en LIKE CONCAT('%', :needle, '%')
-                 OR fach_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($faecher as $fach) {
-                $result[] = [
-                    $fach->getId(),
-                    $fach->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_ABSCHLUSS_NEW',
-            'MVV_ABSCHLUSS_UPDATE',
-            'MVV_ABSCHLUSS_DEL',
-            'MVV_ABS_ZUORD_NEW',
-            'MVV_ABS_ZUORD_DEL',
-            'MVV_ABS_ZUORD_UPDATE'
-        ])) {
-            $abschluesse = Abschluss::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR name_en LIKE CONCAT('%', :needle, '%')
-                 OR abschluss_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($abschluesse as $abschluss) {
-                $result[] = [
-                    $abschluss->getId(),
-                    $abschluss->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_KATEGORIE_NEW',
-            'MVV_KATEGORIE_UPDATE',
-            'MVV_KATEGORIE_DEL',
-            'MVV_ABS_ZUORD_NEW',
-            'MVV_ABS_ZUORD_DEL',
-            'MVV_ABS_ZUORD_UPDATE'
-        ])) {
-            $abskategorien = AbschlussKategorie::findBySQL(
-                "name LIKE CONCAT('%', :needle, '%')
-                 OR name_en LIKE CONCAT('%', :needle, '%')
-                 OR kategorie_id = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($abskategorien as $abskategorie) {
-                $result[] = [
-                    $abskategorie->getId(),
-                    $abskategorie->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_CONTACT_NEW',
-            'MVV_CONTACT_UPDATE',
-            'MVV_CONTACT_DELETE',
-            'MVV_CONTACT_RANGE_NEW',
-            'MVV_CONTACT_RANGE_UPDATE',
-            'MVV_CONTACT_RANGE_DELETE',
-            'MVV_CONTACT_EXTERN_NEW',
-            'MVV_CONTACT_EXTERN_UPDATE',
-            'MVV_CONTACT_EXTERN_DELETE'
-        ])) {
-            $contacts_intern = MvvContact::findBySQL(
-                "LEFT JOIN `auth_user_md5`
-                   ON `mvv_contacts`.`contact_id` = `auth_user_md5`.`user_id`
-                 WHERE `auth_user_md5`.`username` LIKE CONCAT('%', :needle, '%')
-                    OR `auth_user_md5`.`nachname` LIKE CONCAT('%', :needle, '%')
-                    OR `auth_user_md5`.`email` = :needle",
-                [':needle' => $needle]
-            );
-            $contacts_extern = MvvContact::findBySQL(
-                "LEFT JOIN `mvv_extern_contacts`
-                   ON `mvv_contacts`.`contact_id` = `mvv_extern_contacts`.`extern_contact_id`
-                 WHERE `mvv_extern_contacts`.`name` = :needle
-                    OR `mvv_extern_contacts`.`mail` = :needle",
-                [':needle' => $needle]
-            );
-            $contacts = array_merge($contacts_intern, $contacts_extern);
-            foreach ($contacts as $contact) {
-                $result[] = [
-                    $contact->id,
-                    $contact->getDisplayName()
-                ];
-            }
-        }
-
-        if (in_array($action_name, [
-            'MVV_FILE_NEW',
-            'MVV_FILE_UPDATE',
-            'MVV_FILE_DELETE',
-            'MVV_FILE_RANGE_NEW',
-            'MVV_FILE_RANGE_UPDATE',
-            'MVV_FILE_RANGE_DELETE',
-            'MVV_FILE_FILEREF_NEW',
-            'MVV_FILE_FILEREF_UPDATE',
-            'MVV_FILE_FILEREF_DEL'
-        ])) {
-            $files = MvvFile::findBySQL(
-                "LEFT JOIN `mvv_files_filerefs` USING (`mvvfile_id`)
-                 LEFT JOIN `file_refs`
-                   ON `mvv_files_filerefs`.`fileref_id` = `file_refs`.`id`
-                 LEFT JOIN `files`
-                   ON `file_refs`.`file_id` = `files`.`id`
-                 WHERE `mvv_files`.`tags` LIKE CONCAT('%', :needle, '%')
-                    OR `mvv_files_filerefs`.`name` LIKE CONCAT('%', :needle, '%')
-                    OR `file_refs`.`name` LIKE CONCAT('%', :needle, '%')
-                    OR `files`.`name` = :needle
-                    OR `files`.`author_name` = :needle",
-                [':needle' => $needle]
-            );
-            foreach ($files as $file) {
-                $result[$file->id] = [
-                    $file->id,
-                    $file->getDisplayName()
-                ];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns imagepath for given language, used by MVV
-     * First tries $GLOBALS['CONTENT_LANGUAGES'], if not defined returns hardcoded path
-     *
-     * @param string $language e.g. 'DE'
-     * @return string path to language icon
-     */
-    public static function getContentLanguageImagePath($language): string
-    {
-        $content_language = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]['content_language'];
-        return 'languages/' . ($GLOBALS['CONTENT_LANGUAGES'][$content_language]['picture'] ?? 'lang_' . mb_strtolower($language) . '.gif');
-    }
-
-}
diff --git a/lib/classes/MVV.php b/lib/classes/MVV.php
new file mode 100644
index 0000000..517514c
--- /dev/null
+++ b/lib/classes/MVV.php
@@ -0,0 +1,849 @@
+<?php
+/**
+ * MVV.class.php
+ * Helper class
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @author      Timo Hartge <hartge@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.1
+ */
+
+
+require_once 'config/mvv_config.php';
+
+class MVV implements Loggable {
+
+    /**
+     * The global key used by mvv classes to store values in cache.
+     */
+    const CACHE_KEY = 'MVV';
+
+    /**
+     * Determines whether the mvv backend is visible.
+     *
+     * @return boolean True if backend is visible
+     */
+    public static function isVisible() {
+        if (!$GLOBALS['perm']) {
+            return false;
+        }
+        if ($GLOBALS['perm']->have_perm('root') || ($GLOBALS['perm']->have_perm('admin')
+                && RolePersistence::isAssignedRole(
+                        $GLOBALS['user']->id, 'MVVAdmin'))) {
+            return true;
+        }
+        if (RolePersistence::isAssignedRole(
+                        $GLOBALS['user']->id, 'MVVEntwickler')) {
+            return true;
+        }
+        if (RolePersistence::isAssignedRole(
+                        $GLOBALS['user']->id, 'MVVRedakteur')) {
+            return true;
+        }
+        if (RolePersistence::isAssignedRole(
+                        $GLOBALS['user']->id, 'MVVTranslator')) {
+            return true;
+        }
+        if (RolePersistence::isAssignedRole(
+                        $GLOBALS['user']->id, 'MVVFreigabe')) {
+            return true;
+        }
+        if (RolePersistence::isAssignedRole(
+                        $GLOBALS['user']->id, 'MVVLvGruppenAdmin')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Determines whether the search for modules is visible in the global search.
+     *
+     * @return boolean True if backend is visible in search
+     */
+    public static function isVisibleSearch()
+    {
+        return isset($GLOBALS['perm'])
+            && ($GLOBALS['perm']->have_perm('autor') || Config::get()->COURSE_SEARCH_IS_VISIBLE_NOBODY)
+            && Modul::publicModulesAvailable();
+    }
+
+    /**
+     * This method enriches the logentry templates with data of the mvv classes
+     *
+     * @param  LogEvent  log event entry
+     *
+     * @return void
+     */
+    public static function logFormat(LogEvent $event)
+    {
+        $templ = $event->action->info_template;
+
+        $table = explode('.', $event->info);
+        switch ($table[0]) {
+
+            case 'abschluss':
+                $abschluss = Abschluss::find($event->affected_range_id);
+                if ($abschluss) {
+                    $url = URLHelper::getURL('dispatch.php/fachabschluss/abschluesse/details/' . $abschluss->getId(), [], true);
+                    $templ = str_replace('%abschluss(%affected)', '<a href="' . $url . '">' . htmlReady($abschluss->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_abschl_kategorie':
+                $abskategorie = AbschlussKategorie::find($event->affected_range_id);
+                if ($abskategorie) {
+                    $url = URLHelper::getURL('dispatch.php/fachabschluss/kategorien/details/' . $abskategorie->getId(), [], true);
+                    $templ = str_replace('%abskategorie(%affected)', '<a href="' . $url . '">' . htmlReady($abskategorie->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_abschl_zuord':
+                $abschluss = Abschluss::find($event->affected_range_id);
+                if ($abschluss) {
+                    $url = URLHelper::getURL('dispatch.php/fachabschluss/abschluesse/details/' . $abschluss->getId(), [], true);
+                    $templ = str_replace('%abschluss(%affected)', '<a href="' . $url . '">' . htmlReady($abschluss->getDisplayName()) . '</a>', $templ);
+                }
+                $co_kategorie = AbschlussKategorie::find($event->coaffected_range_id);
+                if ($co_kategorie) {
+                    $url = URLHelper::getURL('dispatch.php/fachabschluss/kategorien/details/' . $co_kategorie->getId(), [], true);
+                    $templ = str_replace('%abskategorie(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_kategorie->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'fach':
+            case 'mvv_fach_inst':
+                $fach = Fach::find($event->affected_range_id);
+                if ($fach) {
+                    $url = URLHelper::getURL('dispatch.php/fachabschluss/faecher/details/' . $fach->getId(), [], true);
+                    $templ = str_replace('%fach(%affected)', '<a href="' . $url . '">' . htmlReady($fach->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_lvgruppe':
+            case 'mvv_lvgruppe_seminar':
+                $lvgruppe = Lvgruppe::find($event->affected_range_id);
+                if ($lvgruppe) {
+                    $url = URLHelper::getURL('dispatch.php/lvgruppen/lvgruppen/details/' . $lvgruppe->getId(), [], true);
+                    $templ = str_replace('%lvgruppe(%affected)', '<a href="' . $url . '">' . htmlReady($lvgruppe->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_lvgruppe_modulteil':
+                $lvgruppe = Lvgruppe::find($event->affected_range_id);
+                if ($lvgruppe) {
+                    $url = URLHelper::getURL('dispatch.php/lvgruppen/lvgruppen/details/' . $lvgruppe->getId(), [], true);
+                    $templ = str_replace('%lv(%affected)', '<a href="' . $url . '">' . htmlReady($lvgruppe->getDisplayName()) . '</a>', $templ);
+                }
+                $co_modulteil = Modulteil::find($event->coaffected_range_id);
+                if ($co_modulteil) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $co_modulteil->getId(), [], true);
+                    $templ = str_replace('%modulteil(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_modulteil->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_modul':
+            case 'mvv_modul_user':
+            case 'mvv_modul_inst':
+                $modul = Modul::find($event->affected_range_id);
+                if ($modul) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $modul->getId(), [], true);
+                    $templ = str_replace('%modul(%affected)', '<a href="' . $url . '">' . htmlReady($modul->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_modulteil':
+                $modulteil = Modulteil::find($event->affected_range_id);
+                if ($modulteil) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modulteil->getId(), [], true);
+                    $templ = str_replace('%modulteil(%affected)', '<a href="' . $url . '">' . htmlReady($modulteil->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_modulteil_deskriptor':
+                $modulteil_desk = ModulteilDeskriptor::find($event->affected_range_id);
+                if ($modulteil_desk) {
+                    $modteil = Modulteil::find($modulteil_desk->modulteil_id);
+                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modteil->getId(), [], true);
+                    $templ = str_replace('%modulteildesk(%affected)', 'in Modulteil <a href="' . $url . '">' . htmlReady($modteil->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_modulteil_language':
+                $modulteil = Modulteil::find($event->affected_range_id);
+                if ($modulteil) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modulteil->getId(), [], true);
+                    $templ = str_replace('%modulteil(%affected)', '<a href="' . $url . '">' . htmlReady($modulteil->getDisplayName()) . '</a>', $templ);
+                }
+                $co_mtlanguage = ModulteilLanguage::find([
+                    $event->affected_range_id,
+                    $event->coaffected_range_id
+                ]);
+                if ($co_mtlanguage) {
+                    $templ = str_replace('%language(%coaffected)', htmlReady($co_mtlanguage->getDisplayName()), $templ);
+                }
+                break;
+
+            case 'mvv_modulteil_stgteilabschnitt':
+                $modulteil = Modulteil::find($event->affected_range_id);
+                if ($modulteil) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/modulteil_lvg/' . $modulteil->getId(), [], true);
+                    $templ = str_replace('%modulteil(%affected)', '<a href="' . $url . '">' . htmlReady($modulteil->getDisplayName()) . '</a>', $templ);
+                }
+                $co_stgteilabs = StgteilAbschnitt::find($event->coaffected_range_id);
+                if ($co_stgteilabs) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/details_abschnitt/' . $co_stgteilabs->getId(), [], true);
+                    $templ = str_replace('%stgteilabs(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_stgteilabs->getDisplayName()) . '</a>', $templ);
+                    $templ = str_replace('%fachsem', $event->dbg_info, $templ);
+                }
+                break;
+
+            case 'mvv_modul_deskriptor':
+                $modul_desk = ModulDeskriptor::find($event->affected_range_id);
+                if ($modul_desk) {
+                    $mod = Modul::find($modul_desk->modul_id);
+                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $mod->getId(), [], true);
+                    $templ = str_replace('%moduldesk(%affected)', 'in Modul <a href="' . $url . '">' . htmlReady($mod->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_modul_language':
+                $modul = Modul::find($event->affected_range_id);
+                if ($modul) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $modul->getId(), [], true);
+                    $templ = str_replace('%modul(%affected)', '<a href="' . $url . '">' . htmlReady($modul->getDisplayName()) . '</a>', $templ);
+                }
+                $co_mlanguage = ModulLanguage::find([
+                    $event->affected_range_id,
+                    $event->coaffected_range_id
+                ]);
+                if ($co_mlanguage) {
+                    $templ = str_replace('%language(%coaffected)', htmlReady($co_mlanguage->getDisplayName()), $templ);
+                }
+                break;
+
+            case 'mvv_stgteil':
+            case 'mvv_fachberater':
+                $stgteil = StudiengangTeil::find($event->affected_range_id);
+                if ($stgteil) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengangteile/details_versionen/' . $stgteil->getId(), [], true);
+                    $templ = str_replace('%stgteil(%affected)', '<a href="' . $url . '">' . htmlReady($stgteil->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_stgteilabschnitt':
+                $stgteilabs = StgteilAbschnitt::find($event->affected_range_id);
+                if ($stgteilabs) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/details_abschnitt/' . $stgteilabs->getId(), [], true);
+                    $templ = str_replace('%stgteilabs(%affected)', '<a href="' . $url . '">' . htmlReady($stgteilabs->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_stgteilabschnitt_modul':
+                $stgteilabs = StgteilAbschnitt::find($event->affected_range_id);
+                if ($stgteilabs) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/details_abschnitt/' . $stgteilabs->getId(), [], true);
+                    $templ = str_replace('%stgteilabs(%affected)', '<a href="' . $url . '">' . htmlReady($stgteilabs->getDisplayName()) . '</a>', $templ);
+                }
+                $co_modul = Modul::find($event->coaffected_range_id);
+                if ($co_modul) {
+                    $url = URLHelper::getURL('dispatch.php/module/module/details/' . $co_modul->getId(), [], true);
+                    $templ = str_replace('%modul(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_modul->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_stgteilversion':
+                $version = StgteilVersion::find($event->affected_range_id);
+                if ($version) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/versionen/abschnitte/' . $version->getId(), [], true);
+                    $templ = str_replace('%version(%affected)', '<a href="' . $url . '">' . htmlReady($version->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_stgteil_bez':
+                $stgteilbez = StgteilBezeichnung::find($event->affected_range_id);
+                if ($stgteilbez) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/stgteilbezeichnungen/details/' . $stgteilbez->getId(), [], true);
+                    $templ = str_replace('%stgteilbez(%affected)', '<a href="' . $url . '">' . htmlReady($stgteilbez->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_stg_stgteil':
+                $stg = Studiengang::find($event->affected_range_id);
+                if ($stg) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $stg->getId(), [], true);
+                    $templ = str_replace('%stg(%affected)', '<a href="' . $url . '">' . htmlReady($stg->getDisplayName()) . '</a>', $templ);
+                }
+                $co_stgteil = StudiengangTeil::find($event->coaffected_range_id);
+                if ($co_stgteil) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengangteile/details_versionen/' . $co_stgteil->getId(), [], true);
+                    $templ = str_replace('%stgteil(%coaffected)', '<a href="' . $url . '">' . htmlReady($co_stgteil->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_studiengang':
+                $stg = Studiengang::find($event->affected_range_id);
+                if ($stg) {
+                    $url = URLHelper::getURL('dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $stg->getId(), [], true);
+                    $templ = str_replace('%stg(%affected)', '<a href="' . $url . '">' . htmlReady($stg->getDisplayName()) . '</a>', $templ);
+                }
+                break;
+
+            case 'mvv_contacts':
+                $contact = MvvContact::find($event->affected_range_id);
+                if ($contact) {
+                    $url = URLHelper::getLink('dispatch.php/shared/contacts/details/index/' . $contact->id);
+                    $templ = str_replace(
+                        '%contact(%affected)',
+                        '<a href="' . $url . '">' . htmlReady($contact->getDisplayName()) . '</a>',
+                        $templ
+                    );
+                }
+                break;
+
+            case 'mvv_contacts_ranges':
+                $contact_range = MvvContactRange::find($event->dbg_info);
+                if ($contact_range) {
+                    if ($contact_range->contact) {
+                        $url_affected = URLHelper::getLink(
+                            'dispatch.php/shared/contacts/details/index/' . $contact_range->contact->id);
+                        $templ = str_replace(
+                            '%contact(%affected)',
+                            '<a href="' . $url_affected . '">' . htmlReady($contact_range->contact->getDisplayName()) . '</a>',
+                            $templ
+                        );
+                    }
+                    $range = null;
+                    switch ($contact_range->range_type) {
+                        case 'Modul':
+                            $range = Modul::find($event->coaffected_range_id);
+                            $url_coaffected = URLHelper::getLink(
+                                'dispatch.php/module/module/details/' . $range->id,
+                                [],
+                                true
+                            );
+                            break;
+                        case 'Studiengang':
+                            $range = Studiengang::find($event->coaffected_range_id);
+                            $url_coaffected = URLHelper::getLink(
+                                'dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $range->id,
+                                [],
+                                true
+                            );
+                            break;
+                        case 'StudiengangTeil':
+                            $range = StudiengangTeil::find($event->coaffected_range_id);
+                            $url_coaffected = URLHelper::getLink(
+                                'dispatch.php/studiengaenge/studiengangteile/details_versionen/' . $range->id,
+                                [],
+                                true
+                            );
+
+                    }
+                    if ($range) {
+                        $templ = str_replace(
+                            '%range(%coaffected)',
+                            '<a href="' . $url_coaffected . '">' . htmlReady($range->getDisplayName()) . '</a>',
+                            $templ
+                        );
+                    }
+                }
+                break;
+
+            case 'mvv_extern_contacts':
+                $extern_contact = MvvExternContact::find($event->affected_range_id);
+                if ($extern_contact) {
+                    $url = URLHelper::getLink('dispatch.php/shared/contacts/details/index/' . $extern_contact->id);
+                    $templ = str_replace(
+                        '%contact(%affected)',
+                        '<a href="' . $url . '">' . htmlReady($extern_contact->getDisplayName()) . '</a>',
+                        $templ
+                    );
+                }
+                break;
+
+            case 'mvv_files':
+                $file = MvvFile::find($event->affected_range_id);
+                if ($file) {
+                    $url = URLHelper::getLink('dispatch.php/materialien/files/index/' . $file->id);
+                    $templ = str_replace(
+                        '%file(%affected)',
+                        '<a href="' . $url . '">' . htmlReady($file->getDisplayName()) . '</a>',
+                        $templ
+                    );
+                }
+                break;
+
+            case 'mvv_files_filerefs':
+                $fileref = MvvFileFileref::find($event->affected_range_id);
+                if ($fileref) {
+                    $url = URLHelper::getLink('dispatch.php/materialien/index/' . $fileref->mvvfile_id);
+                    $templ = str_replace(
+                        '%fileref(%affected)',
+                        '<a href="' . $url . '">' . htmlReady($fileref->getDisplayName()) . '</a>',
+                        $templ
+                    );
+                }
+                break;
+
+            case 'mvv_files_ranges':
+                $file_range = MvvFileRange::find([
+                    $event->affected_range_id,
+                    $event->coaffected_range_id
+                ]);
+                if ($file_range) {
+                    if ($file_range->mvv_file) {
+                        $url_affected = URLHelper::getLink(
+                            'dispatch.php/materialien/index/' . $file_range->mvvfile_id
+                        );
+                        $templ = str_replace(
+                            '%fileref(%affected)',
+                            '<a href="' . $url_affected . '">' . htmlReady($file_range->mvv_file->getDisplayName()) . '</a>',
+                            $templ
+                        );
+                    }
+                    $range = null;
+                    switch ($file_range->range_type) {
+                        case 'Studiengang':
+                            $range = Studiengang::find($event->coaffected_range_id);
+                            $url_coaffected = URLHelper::getLink(
+                                'dispatch.php/studiengaenge/studiengaenge/details_studiengang/' . $range->id,
+                                [],
+                                true
+                            );
+                            break;
+                        case 'StgteilVersion':
+                            $range = StgteilVersion::find($event->coaffected_range_id);
+                            $url_coaffected = URLHelper::getLink(
+                                'dispatch.php/studiengaenge/studiengangteile/version/' . $range->id,
+                                [],
+                                true
+                            );
+
+                    }
+                    if ($range) {
+                        $templ = str_replace(
+                            '%range(%coaffected)',
+                            '<a href="' . $url_coaffected . '">' . htmlReady($range->getDisplayName()) . '</a>',
+                            $templ
+                        );
+                    }
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        // specials
+        // Benutzergruppen im Modul z.B. Modulverantwortlicher
+        $templ = str_replace('%gruppe', $event->dbg_info, $templ);
+        // Objekt konnte nicht eingesetzt werden da es vermutlich nicht mehr existiert, beim delete landet der alte Bezeichner im debug
+        $templ = str_replace('%modul(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%modulteil(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%modulteildesk(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%moduldesk(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%stg(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%stgteil(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%stgteilabs(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%version(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%stgteilbez(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%lvgruppe(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%fach(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%abschluss(%affected)', $event->dbg_info, $templ);
+        $templ = str_replace('%abskategorie(%affected)', $event->dbg_info, $templ);
+
+        $templ = str_replace('%abskategorie(%coaffected)', $event->dbg_info, $templ);
+        $templ = str_replace('%modulteil(%coaffected)', $event->dbg_info, $templ);
+        $templ = str_replace('%modul(%coaffected)', $event->dbg_info, $templ);
+        $templ = str_replace('%language(%coaffected)', $event->dbg_info, $templ);
+        $templ = str_replace('%stgteilabs(%coaffected)', $event->dbg_info, $templ);
+        $templ = str_replace('%stgteil(%coaffected)', $event->dbg_info, $templ);
+        $templ = str_replace('%contact', $event->dbg_info, $templ);
+
+        return $templ;
+    }
+
+    /**
+     * This method searches the log-entries for log-actions of the mvv classes.
+     * Used by search function on log page.
+     *
+     * @param  string  $needle The search term.
+     * @param  string  $action_name The name of the log action.
+     *
+     * @return array Found log events.
+     */
+    public static function logSearch($needle, $action_name = null)
+    {
+        $result = [];
+
+        $modul_actions = [
+            'MVV_MODUL_NEW',
+            'MVV_MODUL_UPDATE',
+            'MVV_MODUL_DEL',
+            'MVV_MODUL_DESK_NEW',
+            'MVV_MODUL_DESK_UPDATE',
+            'MVV_MODUL_DESK_DEL',
+            'MVV_MODULINST_NEW',
+            'MVV_MODULINST_DEL',
+            'MVV_MODULINST_UPDATE',
+            'MVV_MODUL_USER_NEW',
+            'MVV_MODUL_USER_DEL',
+            'MVV_MODUL_USER_UPDATE',
+            'MVV_MODUL_LANG_NEW',
+            'MVV_MODUL_LANG_DEL',
+            'MVV_MODUL_LANG_UPDATE',
+            'MVV_MODULTEIL_STGTEILABS_NEW',
+            'MVV_MODULTEIL_STGTEILABS_DEL',
+            'MVV_MODULTEIL_STGTEILABS_UPDATE',
+            'MVV_STGTEILABS_MODUL_NEW',
+            'MVV_STGTEILABS_MODUL_DEL',
+            'MVV_STGTEILABS_MODUL_UPDATE'
+        ];
+
+        if (in_array($action_name, $modul_actions)) {
+            $module = Modul::findBySQL(
+                "code LIKE CONCAT('%', :needle, '%') OR modul_id = :needle"
+            );
+            $deskriptoren = ModulDeskriptor::findBySql(
+                "bezeichnung LIKE CONCAT('%', :needle, '%')
+                 OR deskriptor_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($module as $modul) {
+                $result[] = [
+                    $modul->getId(),
+                    $modul->getDisplayName()
+                ];
+            }
+            foreach ($deskriptoren as $desk) {
+                $modul = Modul::find($desk->modul_id);
+                $result[] = [
+                    $modul->getId(),
+                    $modul->getDisplayName()
+                ];
+            }
+        }
+
+        $modulteile_actions = [
+            'MVV_MODULTEIL_NEW',
+            'MVV_MODULTEIL_UPDATE',
+            'MVV_MODULTEIL_DEL',
+            'MVV_MODULTEIL_DESK_NEW',
+            'MVV_MODULTEIL_DESK_UPDATE',
+            'MVV_MODULTEIL_DESK_DEL',
+            'MVV_MODULTEIL_LANG_NEW',
+            'MVV_MODULTEIL_LANG_DEL',
+            'MVV_MODULTEIL_LANG_UPDATE',
+            'MVV_LVMODULTEIL_NEW',
+            'MVV_LVMODULTEIL_DEL',
+            'MVV_LVMODULTEIL_UPDATE'
+        ];
+
+        if (in_array($action_name, $modulteile_actions)) {
+            $deskriptoren = ModulDeskriptor::findBySql(
+                "bezeichnung LIKE CONCAT('%', :needle, '%')
+                 OR deskriptor_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($deskriptoren as $desk) {
+                $modulteil = Modulteil::find($desk->modulteil_id);
+                $result[] = [
+                    $modulteil->getId(),
+                    $modulteil->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_STUDIENGANG_NEW',
+            'MVV_STUDIENGANG_UPDATE',
+            'MVV_STUDIENGANG_DEL',
+            'MVV_STG_STGTEIL_NEW',
+            'MVV_STG_STGTEIL_DEL',
+            'MVV_STG_STGTEIL_UPDATE'
+        ])) {
+            $stg = Studiengang::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR studiengang_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($stg as $studiengang) {
+                $result[] = [
+                    $studiengang->getId(),
+                    $studiengang->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_STGTEIL_NEW',
+            'MVV_STGTEIL_UPDATE',
+            'MVV_STGTEIL_DEL',
+            'MVV_FACHBERATER_NEW',
+            'MVV_FACHBERATER_UPDATE',
+            'MVV_FACHBERATER_DEL'
+        ])) {
+            $stgteile = StudiengangTeil::findBySQL(
+                "zusatz LIKE CONCAT('%', :needle, '%')
+                 OR zusatz_en LIKE CONCAT('%', :needle, '%')
+                 OR stgteil_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($stgteile as $stgteil) {
+                $result[] = [
+                    $stgteil->getId(),
+                    $stgteil->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_STGTEILVERSION_NEW',
+            'MVV_STGTEILVERSION_UPDATE',
+            'MVV_STGTEILVERSION_DEL'
+        ])) {
+            $versionen = StgteilVersion::findBySQL(
+                "code LIKE CONCAT('%', :needle, '%')
+                 OR version_id = :needle
+                 OR stgteil_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($versionen as $version) {
+                $result[] = [
+                    $version->getId(),
+                    $version->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_STGTEILBEZ_NEW',
+            'MVV_STGTEILBEZ_UPDATE',
+            'MVV_STGTEILBEZ_DEL'
+        ])) {
+            $stgbez = StgteilBezeichnung::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR name_en LIKE CONCAT('%', :needle, '%')
+                 OR stgteil_bez_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($stgbez as $bez) {
+                $result[] = [
+                    $bez->getId(),
+                    $bez->getDisplayName()
+                ];
+            }
+        }
+
+        $stgteil_actions = [
+            'MVV_STGTEILABS_NEW',
+            'MVV_STGTEILABS_UPDATE',
+            'MVV_STGTEILABS_DEL',
+            'MVV_MODULTEIL_STGTEILABS_NEW',
+            'MVV_MODULTEIL_STGTEILABS_DEL',
+            'MVV_MODULTEIL_STGTEILABS_UPDATE',
+            'MVV_STG_STGTEIL_NEW',
+            'MVV_STG_STGTEIL_DEL',
+            'MVV_STG_STGTEIL_UPDATE',
+            'MVV_STGTEILABS_MODUL_NEW',
+            'MVV_STGTEILABS_MODUL_DEL',
+            'MVV_STGTEILABS_MODUL_UPDATE'
+        ];
+
+        if (in_array($action_name, $stgteil_actions)) {
+            $stgteilabs = Lvgruppe::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR name_en LIKE CONCAT('%', :needle, '%')
+                 OR abschnitt_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($stgteilabs as $abschnitt) {
+                $result[] = [
+                    $abschnitt->getId(),
+                    $abschnitt->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_LVGRUPPE_NEW',
+            'MVV_LVGRUPPE_DEL',
+            'MVV_LVGRUPPE_UPDATE',
+            'MVV_LVMODULTEIL_NEW',
+            'MVV_LVMODULTEIL_DEL',
+            'MVV_LVMODULTEIL_UPDATE',
+            'MVV_LVSEMINAR_NEW',
+            'MVV_LVSEMINAR_DEL',
+            'MVV_LVSEMINAR_UPDATE'
+        ])) {
+            $lvgruppen = Lvgruppe::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR name_en LIKE CONCAT('%', :needle, '%')
+                 OR lvgruppe_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($lvgruppen as $lvgruppe) {
+                $result[] = [
+                    $lvgruppe->getId(),
+                    $lvgruppe->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_FACH_NEW',
+            'MVV_FACH_UPDATE',
+            'MVV_FACH_DEL',
+            'MVV_FACHINST_NEW',
+            'MVV_FACHINST_DEL',
+            'MVV_FACHINST_UPDATE'
+        ])) {
+            $faecher = Fach::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR name_en LIKE CONCAT('%', :needle, '%')
+                 OR fach_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($faecher as $fach) {
+                $result[] = [
+                    $fach->getId(),
+                    $fach->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_ABSCHLUSS_NEW',
+            'MVV_ABSCHLUSS_UPDATE',
+            'MVV_ABSCHLUSS_DEL',
+            'MVV_ABS_ZUORD_NEW',
+            'MVV_ABS_ZUORD_DEL',
+            'MVV_ABS_ZUORD_UPDATE'
+        ])) {
+            $abschluesse = Abschluss::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR name_en LIKE CONCAT('%', :needle, '%')
+                 OR abschluss_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($abschluesse as $abschluss) {
+                $result[] = [
+                    $abschluss->getId(),
+                    $abschluss->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_KATEGORIE_NEW',
+            'MVV_KATEGORIE_UPDATE',
+            'MVV_KATEGORIE_DEL',
+            'MVV_ABS_ZUORD_NEW',
+            'MVV_ABS_ZUORD_DEL',
+            'MVV_ABS_ZUORD_UPDATE'
+        ])) {
+            $abskategorien = AbschlussKategorie::findBySQL(
+                "name LIKE CONCAT('%', :needle, '%')
+                 OR name_en LIKE CONCAT('%', :needle, '%')
+                 OR kategorie_id = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($abskategorien as $abskategorie) {
+                $result[] = [
+                    $abskategorie->getId(),
+                    $abskategorie->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_CONTACT_NEW',
+            'MVV_CONTACT_UPDATE',
+            'MVV_CONTACT_DELETE',
+            'MVV_CONTACT_RANGE_NEW',
+            'MVV_CONTACT_RANGE_UPDATE',
+            'MVV_CONTACT_RANGE_DELETE',
+            'MVV_CONTACT_EXTERN_NEW',
+            'MVV_CONTACT_EXTERN_UPDATE',
+            'MVV_CONTACT_EXTERN_DELETE'
+        ])) {
+            $contacts_intern = MvvContact::findBySQL(
+                "LEFT JOIN `auth_user_md5`
+                   ON `mvv_contacts`.`contact_id` = `auth_user_md5`.`user_id`
+                 WHERE `auth_user_md5`.`username` LIKE CONCAT('%', :needle, '%')
+                    OR `auth_user_md5`.`nachname` LIKE CONCAT('%', :needle, '%')
+                    OR `auth_user_md5`.`email` = :needle",
+                [':needle' => $needle]
+            );
+            $contacts_extern = MvvContact::findBySQL(
+                "LEFT JOIN `mvv_extern_contacts`
+                   ON `mvv_contacts`.`contact_id` = `mvv_extern_contacts`.`extern_contact_id`
+                 WHERE `mvv_extern_contacts`.`name` = :needle
+                    OR `mvv_extern_contacts`.`mail` = :needle",
+                [':needle' => $needle]
+            );
+            $contacts = array_merge($contacts_intern, $contacts_extern);
+            foreach ($contacts as $contact) {
+                $result[] = [
+                    $contact->id,
+                    $contact->getDisplayName()
+                ];
+            }
+        }
+
+        if (in_array($action_name, [
+            'MVV_FILE_NEW',
+            'MVV_FILE_UPDATE',
+            'MVV_FILE_DELETE',
+            'MVV_FILE_RANGE_NEW',
+            'MVV_FILE_RANGE_UPDATE',
+            'MVV_FILE_RANGE_DELETE',
+            'MVV_FILE_FILEREF_NEW',
+            'MVV_FILE_FILEREF_UPDATE',
+            'MVV_FILE_FILEREF_DEL'
+        ])) {
+            $files = MvvFile::findBySQL(
+                "LEFT JOIN `mvv_files_filerefs` USING (`mvvfile_id`)
+                 LEFT JOIN `file_refs`
+                   ON `mvv_files_filerefs`.`fileref_id` = `file_refs`.`id`
+                 LEFT JOIN `files`
+                   ON `file_refs`.`file_id` = `files`.`id`
+                 WHERE `mvv_files`.`tags` LIKE CONCAT('%', :needle, '%')
+                    OR `mvv_files_filerefs`.`name` LIKE CONCAT('%', :needle, '%')
+                    OR `file_refs`.`name` LIKE CONCAT('%', :needle, '%')
+                    OR `files`.`name` = :needle
+                    OR `files`.`author_name` = :needle",
+                [':needle' => $needle]
+            );
+            foreach ($files as $file) {
+                $result[$file->id] = [
+                    $file->id,
+                    $file->getDisplayName()
+                ];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns imagepath for given language, used by MVV
+     * First tries $GLOBALS['CONTENT_LANGUAGES'], if not defined returns hardcoded path
+     *
+     * @param string $language e.g. 'DE'
+     * @return string path to language icon
+     */
+    public static function getContentLanguageImagePath($language): string
+    {
+        $content_language = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]['content_language'];
+        return 'languages/' . ($GLOBALS['CONTENT_LANGUAGES'][$content_language]['picture'] ?? 'lang_' . mb_strtolower($language) . '.gif');
+    }
+
+}
diff --git a/lib/classes/Markup.class.php b/lib/classes/Markup.class.php
deleted file mode 100644
index fbde67b..0000000
--- a/lib/classes/Markup.class.php
+++ /dev/null
@@ -1,788 +0,0 @@
-<?php
-/**
- * Markup.class.php - Handling of Stud.IP- and HTML-markup.
- **
- * 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.
- *
- * @category    Stud.IP
- * @copyright   (c) 2014 Stud.IP e.V.
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       File available since Release 3.0
- * @author      Robert Costa <rcosta@uos.de>
- */
-namespace Studip;
-
-require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_ClassifyLinks.php';
-require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_ClassifyTables.php';
-require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_LinkifyEmail.php';
-require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_TransformLinks.php';
-require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_Unlinkify.php';
-
-class Markup
-{
-    /**
-     * Apply markup rules and clean the text up.
-     *
-     * @param TextFormat $markup  Markup rules applied on marked-up text.
-     * @param string     $text    Marked-up text on which rules are applied.
-     * @param boolean    $trim    Trim text before applying markup rules, if TRUE.
-     *
-     * @return string  HTML code computed from marked-up text.
-     */
-    public static function apply($markup, $text, $trim)
-    {
-        return $markup->format(self::markupToHtml($text, $trim, false));
-    }
-
-    // signature for HTML entries
-    const HTML_MARKER = '<!--HTML-->';
-
-    // signature for HTML fallback entries
-    const HTML_MARKER_FALLBACK = '<!-- HTML: Insert text after this line only. -->';
-
-    // regular expression for detecting HTML signature
-    const HTML_MARKER_REGEXP = '/^\s*<!--\s*HTML.*?-->/i';
-
-    /**
-     * Return `true` if the WYSIWYG editor is enabled for this user.
-     * @deprecated since Stud.IP 5.5
-     *
-     * @return boolean  always returns `true`.
-     */
-    public static function editorEnabled()
-    {
-        return true;
-    }
-
-    /**
-     * Return `true` for HTML code and `false` for plain text.
-     *
-     * HTML code must either match `HTML_MARKER_REGEXP` or begin
-     * with '<' and end with '>' (leading and trailing whitespace
-     * is ignored). Everything else is considered to be plain
-     * text.
-     *
-     * @param string $text  HTML code or plain text.
-     *
-     * @return boolean  `true` for HTML code, `false` for plain text.
-     */
-    public static function isHtml($text)
-    {
-        return self::hasHtmlMarker($text);
-    }
-
-    /**
-     * Return `true` for Stud.IP-HTML and `false` otherwise.
-     *
-     * Stud.IP-HTML is HTML that can contain Stud.IP Markup.
-     *
-     * Stud.IP-HTML must match Stud.IP 3.2's HTML marker.
-     * Leading and trailing whitespace is ignored.
-     *
-     * Everything else is considered not Stud.IP-HTML. In other
-     * words, if it's not Stud.IP-HTML it might be everything
-     * from plain text to binary code. But usually it's either
-     * Stud.IP markup or plain HTML code, then.
-     *
-     * @param string $text  Text that is or isn't Stud.IP-HTML.
-     *
-     * @return boolean  `true` for Stud.IP-HTML
-     */
-    public static function isHtmlFallback($text)
-    {
-        $text = trim($text);
-
-        // it's not fallback if the new HTML marker is detected
-        if (MarkupPrivate\Text\startsWith($text, self::HTML_MARKER)) {
-            return false;
-        }
-
-        // it's Stud.IP-HTML if Stud.IP 3.2's HTML marker is detected
-        if (MarkupPrivate\Text\startsWith($text, self::HTML_MARKER_FALLBACK)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Return `true` for HTML code and `false` for plain text.
-     *
-     * HTML code must start with a match for `HTML_MARKER_REGEXP`.
-     *
-     * @param string $text  HTML code or plain text.
-     *
-     * @return boolean  `true` for HTML code, `false` for plain text.
-     */
-    public static function hasHtmlMarker($text)
-    {
-        return preg_match(self::HTML_MARKER_REGEXP, $text);
-    }
-
-    /**
-     * Mark a given text as HTML code.
-     *
-     * No sanity-checking is done on the given text. It is simply
-     * marked up so to be identified by Markup::isHtml as HTML
-     * code.
-     *
-     * @param string $text  The text to be marked up as HTML code.
-     *
-     * @return string  The text marked up as HTML code.
-     */
-    public static function markAsHtml($text)
-    {
-        // NOTE keep this function in sync with the JavaScript
-        // function markAsHtml in WyswygHtmlHead.php
-        if (self::hasHtmlMarker($text) || trim($text) === '') {
-            return $text; // marker already set, don't set twice
-        }
-        return self::HTML_MARKER . $text;
-    }
-
-    /**
-     * Apply markup rules after running text through HTML ready.
-     *
-     * @param TextFormat $markup  Markup rules applied on marked-up text.
-     * @param string     $text    Marked-up text on which rules are applied.
-     * @param boolean    $trim    Trim text before applying markup rules, if TRUE.
-     *
-     * @return string  HTML code computed from marked-up text.
-     */
-    private static function markupHtmlReady($markup, $text, $trim)
-    {
-        return str_replace("\n", '<br>', self::markupText(
-            $markup, self::htmlReady(self::unixEOL($text), $trim)));
-    }
-
-    /**
-     * Convert line break to Unix format.
-     *
-     * @param string $text  Text with possibly mixed line breaks (Win, Mac, Unix).
-     *
-     * @return string  Text with Unix line breaks only.
-     */
-    private static function unixEOL($text)
-    {
-        return preg_replace("/\r\n?/", "\n", $text);
-    }
-
-    /**
-     * Apply markup rules on plain text.
-     *
-     * @param TextFormat $markup  Markup rules applied on marked-up text.
-     * @param string     $text    Marked-up text on which rules are applied.
-     *
-     * @return string  HTML code computed from marked-up text.
-     */
-    private static function markupText($markup, $text)
-    {
-        return symbol($markup->format($text));
-    }
-
-    /**
-     * Call HTMLPurifier to create safe HTML.
-     *
-     * @param   string  $dirty_html  Unsafe or 'uncleaned' HTML code.
-     * @param   boolean $autoformat  Apply the AutoFormat rules
-     * @return  string              Clean and safe HTML code.
-     */
-    private static function purify($dirty_html, $autoformat = true)
-    {
-        $purifier = self::createPurifier($autoformat);
-
-        return $purifier->purify($dirty_html);
-    }
-
-    /**
-     * Call HTMLPurifier to filter the HTML code (if the source is detected
-     * to contain HTML, returns the argument unchanged otherwise). The HTML
-     * marker is restored afterwards, if it was present.
-     *
-     * @param   string  $dirty_html  Unsafe or 'uncleaned' HTML code.
-     * @return  string              Clean and safe HTML code.
-     */
-    public static function purifyHtml($html)
-    {
-        if ($html instanceof \I18NString) {
-            $base = self::purifyHtml($html->original());
-            $lang = $html->toArray();
-
-            foreach ($lang as &$value) {
-                $value = self::purifyHtml($value);
-            }
-
-            return new \I18NString($base, $lang);
-        }
-
-        if (self::isHtml($html)) {
-            $html = self::markAsHtml(self::purify($html));
-        }
-
-        return $html;
-    }
-
-    /**
-     * Create HTML purifier instance with Stud.IP-specific configuration.
-     *
-     * @param  boolean $autoformat  Apply the AutoFormat rules
-     * @return \HTMLPurifier A new instance of the HTML purifier.
-     */
-    private static function createPurifier($autoformat)
-    {
-        $config = \HTMLPurifier_Config::createDefault();
-        $config->set('Cache.SerializerPath', $GLOBALS['TMP_PATH']);
-        $config->set('Core.RemoveInvalidImg', true);
-
-        // restrict allowed HTML tags and attributes
-        //
-        // note that changes here should also be reflected in CKEditor's
-        // settings!!
-        //
-        // NOTE The list could be restricted even further by allowing only
-        // specific values for some attributes and CSS styles, but that is not
-        // directly supported by HTMLPurifier and would need to be implemented
-        // with a filter similar to ClassifyLinks.
-        //
-        // This is a list of further restrictions that can/should be introduced
-        // at a later time point maybe, if possible:
-        //
-        // - always open external links in a new tab or window
-        //   a[class="link-extern" href="..." target="_blank"]
-        // - only allow left margin and horizontal text alignment to be set in
-        //   divs (NOTE maybe remove these two features completely?):
-        //   div[style="margin-left:(40|80|...)px; text-align:(center|right|justify)"]
-        // - img[style] should only allow float:left or float:right
-        // - only allow text color and background color to be set in a span's
-        //   style attribute (NOTE 'wiki-links' are currently set here due to
-        //   implementation difficulties, but probably this should be
-        //   changed...):
-        //   span[style="color:(#000000|#800000|...);
-        //               background-color:(#000000|#800000|...)"
-        //        class="wiki-link"]
-        // - tables should always have the class "content" (it should not be
-        //   optional and no other class should be set):
-        //   table[class="content"]
-        // - table headings should have a column and/or a row scope or no scope
-        //   at all, but nothing else:
-        //   th[scope="(col | row)"]
-        // - fonts: only Stud.IP-specific fonts should be allowed
-        //
-        $config->set('HTML.Allowed', '
-            a[class|href|target|rel|name|id]
-            audio[controls|src|height|width|style]
-            big
-            blockquote
-            br
-            caption
-            code[class]
-            div[class|style]
-            em
-            figure[class|style]
-            figcaption
-            h1
-            h2
-            h3
-            h4
-            h5
-            h6
-            hr
-            i
-            img[alt|src|height|width|class|style]
-            li
-            ol[reversed|start|style]
-            p[style]
-            pre[class]
-            span[style|class]
-            strong
-            u
-            ul[style]
-            s
-            small
-            sub
-            sup
-            table[class|style]
-            tbody
-            td[colspan|rowspan|style]
-            thead
-            th[colspan|rowspan|style|scope]
-            tr
-            tt
-            video[controls|src|height|width|style]
-        ');
-
-        $config->set('Attr.AllowedFrameTargets', ['_blank']);
-        $config->set('Attr.AllowedRel', ['nofollow']);
-        $config->set('Attr.EnableID', true);
-        $config->set('Attr.AllowedClasses', [
-            'author',
-            'content',
-            'image',
-            'image-style-side',
-            'image_resized',
-            'language-cpp',
-            'language-css',
-            'language-diff',
-            'language-java',
-            'language-javascript',
-            'language-json',
-            'language-php',
-            'language-python',
-            'language-ruby',
-            'language-scss',
-            'language-sql',
-            'language-xml',
-            'link-extern',
-            'link-intern',
-            'math-tex',
-            'table',
-            'usercode',
-            'wiki-link'
-        ]);
-        $config->set('CSS.AllowedFonts', [
-            'serif',
-            'sans-serif',
-            'monospace',
-            'cursive'
-        ]);
-        $config->set('CSS.AllowedProperties', [
-            'margin-left',
-            'text-align',
-            'width',
-            'height',
-            'color',
-            'background-color', // needed by span, td
-            'border-color',
-            'border-style',
-            'float',
-            'border',
-            'vertical-align'
-        ]);
-        $config->set('CSS.MaxImgLength', null);
-
-        if ($autoformat) {
-            $config->set('AutoFormat.Linkify', true);
-            $config->set('AutoFormat.Custom', [
-                'ClassifyLinks',
-                'ClassifyTables',
-                'LinkifyEmail'
-            ]);
-            $config->set('AutoFormat.RemoveSpansWithoutAttributes', true);
-        } else {
-            $config->set('AutoFormat.Custom', ['TransformLinks']);
-        }
-
-        // avoid <img src="evil_CSRF_stuff">
-        $def = $config->getHTMLDefinition(true);
-        $img = $def->addBlankElement('img');
-        $img->attr_transform_post[]
-            = new MarkupPrivate\Purifier\AttrTransform_Image_Source();
-
-        $def->addElement('audio', 'Inline', 'Flow', 'Common', [
-              'src*' => 'URI',
-              'width' => 'Length',
-              'height' => 'Length',
-              'controls' => 'Text',     // Bool triggers bug in HTMLPurifier
-        ]);
-
-        $def->addElement('video', 'Inline', 'Flow', 'Common', [
-              'src*' => 'URI',
-              'width' => 'Length',
-              'height' => 'Length',
-              'controls' => 'Text',     // Bool triggers bug in HTMLPurifier
-        ]);
-
-        $def->addElement('figcaption', 'Inline', 'Flow', 'Common');
-        $def->addElement('figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common');
-
-        $def->addAttribute('ol', 'reversed', 'Bool');
-        $def->addAttribute('ol', 'style', 'Text');
-        $def->addAttribute('ul', 'style', 'Text');
-
-        return new \HTMLPurifier($config);
-    }
-
-    /**
-     * Convert special characters to HTML entities, and clean up.
-     *
-     * @param  string  $text  This text's special chars will be converted.
-     * @param  boolean $trim  Trim text before applying markup rules, if TRUE.
-     * @param  boolean $br    Replace newlines by <br>, if TRUE.
-     * @param  boolean $double_encode  Encode existing HTML entities, if TRUE.
-     * @return string         The converted string.
-     */
-    public static function htmlReady(
-        $text, $trim = true, $br = false, $double_encode = true
-    ) {
-        $text = htmlspecialchars($text, ENT_QUOTES, 'utf-8', $double_encode);
-
-        if ($trim) {
-            $text = trim($text);
-        }
-        if ($br) { // fix newlines
-            $text = nl2br($text, false);
-        }
-        return $text;
-    }
-
-    /**
-     * Prepare text for wysiwyg (if enabled), otherwise convert special
-     * characters using htmlReady.
-     *
-     * @param  string  $text  The text.
-     * @param  boolean $trim  Trim text before applying markup rules, if TRUE.
-     * @param  boolean $br    Replace newlines by <br>, if TRUE and wysiwyg editor disabled.
-     * @param  boolean $double_encode  Encode existing HTML entities, if TRUE and wysiwyg editor disabled.
-     * @return string         The converted string.
-     */
-    public static function wysiwygReady(
-        $text, $trim = true, $br = false, $double_encode = true
-    ) {
-        if (self::editorEnabled()) {
-            $text = self::markupToHtml($text, $trim);
-        }
-        return self::htmlReady($text, $trim, $br, $double_encode);
-    }
-
-    /**
-     * Convert Stud.IP markup (possibly mixed with HTML if fallback mode is
-     * enabled) to editable HTML. Pure HTML will only run through the purifier.
-     *
-     * @param  string  $text  The text.
-     * @param  boolean $trim  Trim text before applying markup rules, if TRUE.
-     * @param  boolean $mark  Mark result text as HTML, if TRUE.
-     * @return string         The converted string.
-     */
-    public static function markupToHtml($text, $trim = true, $mark = true)
-    {
-        if (!trim($text)) {
-            return $text;
-        }
-        if (self::isHtml($text)) {
-            $is_fallback = self::isHtmlFallback($text);
-            $text = self::purify($text, false);
-
-            if ($is_fallback) {
-                $text = self::markupText(new \StudipCoreFormat(), $text);
-            }
-        } else {
-            $text = self::markupHtmlReady(new \StudipCoreFormat(), $text, $trim);
-        }
-
-        return $mark ? self::markAsHtml($text) : $text;
-    }
-
-    /**
-     * Call HTMLPurifier to remove all HTML tags from the string (if the source
-     * is detected to contain HTML, returns the argument unchanged otherwise).
-     *
-     * @param   string  $html  HTML code to filter
-     * @return  string         The converted string.
-     */
-    public static function removeHtml($html)
-    {
-        if (self::isHtml($html)) {
-            $config = \HTMLPurifier_Config::createDefault();
-            $config->set('Cache.SerializerPath', $GLOBALS['TMP_PATH']);
-            $config->set('HTML.Allowed', 'a[href],img[alt|src],br');
-            $config->set('AutoFormat.Custom', ['Unlinkify']);
-
-            $html = str_replace('</li>', '</li><br>', $html);
-            $html = str_replace('</ol>', '</ol><br>', $html);
-            $html = str_replace('</ul>', '</ul><br>', $html);
-            $html = str_replace('</tr>', '</tr><br>', $html);
-            $html = str_replace('</p>', '</p><br><br>', $html);
-            $html = str_replace('</div>', '</div><br><br>', $html);
-
-            $purifier = new \HTMLPurifier($config);
-            $html = $purifier->purify($html);
-
-            // Replace new lines with simple line break; twice because we don't
-            // want to create unneccessary white space if a <br /> is followed
-            // by a new line
-            $html = str_replace('<br />' . PHP_EOL, PHP_EOL, $html);
-            $html = str_replace('<br />', PHP_EOL, $html);
-
-            $html = \decodeHTML(trim($html));
-        }
-
-        return $html;
-    }
-}
-
-/**
- * Members of Studip\MarkupPrivate must not be used outside of this file!!
- */
-
-namespace Studip\MarkupPrivate\Purifier;
-
-use Studip\MarkupPrivate\MediaProxy;
-
-/**
- * Remove invalid <img src> attributes.
- */
-class AttrTransform_Image_Source extends \HTMLPurifier_AttrTransform
-{
-    /**
-     * Implements abstract method of base class.
-     */
-    function transform($attr, $config, $context)
-    {
-        try {
-            $attr['src'] = MediaProxy\getMediaUrl($attr['src']);
-        } catch (MediaProxy\InvalidInternalLinkException $e) {
-            // invalid internal link ==> remove <img src> attribute
-            $GLOBALS['msg'][] = _('Ungültige interne Medienverknüpfung entfernt: ')
-                . \htmlentities($e->getUrl());
-            $attr['src'] = NULL; // remove <img src> attribute
-        } catch (MediaProxy\ExternalMediaDeniedException $e) {
-            $GLOBALS['msg'][] = _('Verbotene externe Medienverknüpfung entfernt: ')
-                . \htmlentities($e->getUrl());
-            $attr['src'] = NULL; // remove <img src> attribute
-        }
-        return $attr;
-    }
-}
-
-//// media proxy //////////////////////////////////////////////////////////////
-
-namespace Studip\MarkupPrivate\MediaProxy;
-
-use Studip\MarkupPrivate\Text;
-
-/**
- * Check if media proxy should be used and if so return the respective URL.
- *
- * @param string $url   URL to media file.
- * @return mixed        URL string to media file (possibly 'proxied')
- *                      or NULL if URL is invalid.
- */
-function getMediaUrl($url) {
-    // even though proxied URLs shouldn't be stored in the database, the
-    // next line will handle those cases where they're accidentally there
-    $url = decodeMediaProxyUrl($url);
-
-    // handle internal media links
-    if (isStudipMediaUrl($url)) {
-        return transformInternalIdnaLink($url);
-    }
-    if (isInternalLink($url)) {
-        // link is studip-internal, but not to a valid media location
-        throw new InvalidInternalLinkException($url);
-    }
-
-    // handle external media links
-    $external_media = \Config::get()->LOAD_EXTERNAL_MEDIA;
-    if ($external_media === 'proxy' &&
-        \Seminar_Session::is_current_session_authenticated()
-    ) {
-        // media proxy must be accessed by an internal link
-        return encodeMediaProxyUrl($url);
-    }
-    if ($external_media === 'allow') {
-        return $url;
-    }
-    throw new ExternalMediaDeniedException($url);
-}
-
-/**
- * Return media proxy URL for an unproxied URL.
- *
- * @params string $url  Unproxied media URL.
- * @return string       Media proxy URL for accessing the same resource.
- */
-function encodeMediaProxyUrl($url) {
-    return transformInternalIdnaLink(
-        getMediaProxyUrl() .'?url=' . \urlencode(\idna_link($url)));
-}
-
-/**
- * Extract the original URL from a media proxy URL.
- *
- * @param string  $url  The media proxy URL.
- * return string  The original URL. If $url does not point to the media
- *                proxy then this is the exact same value given by $url.
- */
-function decodeMediaProxyUrl($url) {
-    # TODO make it work for 'url=' at any position in query
-    $urlpath = removeStudipDomain($url);
-    $proxypath = removeStudipDomain(getMediaProxyUrl()) . '?url=';
-    if (Text\startsWith($urlpath, $proxypath)) {
-        return \urldecode(Text\removePrefix($urlpath, $proxypath));
-    }
-    return $url;
-}
-
-/**
- * Return Stud.IP's absolute media proxy URL.
- */
-function getMediaProxyUrl() {
-    return $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/media_proxy';
-}
-
-/**
- * Test if an URL points to a valid internal Stud.IP media path.
- *
- * @param   string   $url  Internal Stud.IP URL.
- * @returns boolean  TRUE for internal media link URLs, FALSE otherwise.
- */
-function isStudipMediaUrl($url) {
-    return isInternalLink($url) &&
-        isStudipMediaUrlPath(getStudipRelativePath($url));
-}
-
-function isInternalLink($url) {
-    return is_internal_url(transformInternalIdnaLink($url));
-}
-
-//// url utilities ////////////////////////////////////////////////////////////
-
-/**
- * Remove domain name from internal URLs.
- *
- * Remove scheme, domain and authentication information from internal
- * Stud.IP URLs. Leave external URLs untouched.
- *
- * @param string $url   URL from which to remove internal domain.
- * @returns string      URL without internal domain or the exact same
- *                      value as $url for external URLs.
- */
-function removeStudipDomain($url) {
-    if (!isInternalLink($url)) {
-        return $url;
-    }
-    $parsed_url = \parse_url(transformInternalIdnaLink($url));
-    $path = isset($parsed_url['path']) ? $parsed_url['path'] : '';
-    $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
-    $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
-    return $path . $query . $fragment;
-}
-
-/**
- * Return a URL's path component with the absolute Stud.IP path removed.
- *
- * NOTE: If the URL is not an internal Stud.IP URL, the path component will
- * nevertheless be returned without issuing an error message.
- *
- * Example:
- * >>> getStudipRelativePath('http://localhost:8080'
- *      . '/studip/sendfile.php?type=0&file_id=ABC123&file_name=nice.jpg')
- * 'sendfile.php'
- *
- * @param string $url   The URL from which to return the Stud.IP-relative
- *                      path component.
- * returns string Stud.IP-relative path component of $url.
- */
-function getStudipRelativePath($url) {
-    $parsed_url = \parse_url(transformInternalIdnaLink($url));
-    $parsed_studip_url = getParsedStudipUrl();
-    return Text\removePrefix($parsed_url['path'], $parsed_studip_url['path']);
-}
-
-/**
- * Return an associative array containing the Stud.IP URL elements.
- *
- * see also: http://php.net/manual/en/function.parse-url.php
- *
- * @returns mixed  Same values that PHP's parse_url() returns.
- */
-function getParsedStudipUrl() {
-    return \parse_url($GLOBALS['ABSOLUTE_URI_STUDIP']);
-}
-
-/**
- * Test if path is valid for internal Stud.IP media URLs.
- *
- * @params string $path The path component of an URL.
- * return boolean       TRUE for valid media paths, FALSE otherwise.
- */
-function isStudipMediaUrlPath($path) {
-    list($path_head) = \explode('/', $path);
-    $valid_paths = ['sendfile.php', 'download', 'assets', 'pictures'];
-    return \mb_strpos(\urldecode($path), '../') === false && \in_array($path_head, $valid_paths);
-}
-
-/**
- * Return a normalized, internal URL.
- *
- * @params string $url  An internal URL.
- * @returns string      Normalized internal URL.
- */
-function transformInternalIdnaLink($url) {
-    return \idna_link(\TransformInternalLinks($url));
-}
-
-//// url exceptions ///////////////////////////////////////////////////////////
-
-class UrlException extends \Exception
-{
-    private $url;
-
-    public function __construct($url) {
-        parent::__construct();
-        $this->url = $url;
-    }
-
-    public function getUrl()
-    {
-        return $this->url;
-    }
-}
-
-class InvalidInternalLinkException extends UrlException
-{
-}
-
-class ExternalMediaDeniedException extends UrlException
-{
-}
-
-//// string utilities /////////////////////////////////////////////////////////
-
-namespace Studip\MarkupPrivate\Text;
-
-/**
- * Test if string starts with prefix.
- *
- * @param string $string  Tested string.
- * @param string $prefix  Prefix of tested string.
- *
- * @return boolean  TRUE if string starts with prefix.
- */
-function startsWith($string, $prefix) {
-    return \mb_substr($string, 0, \mb_strlen($prefix)) === $prefix;
-}
-
-/**
- * Test if string ends with suffix.
- *
- * @param string $string  Tested string.
- * @param string $suffix  Suffix of tested string.
- *
- * @return boolean  TRUE if string ends with suffix.
- */
-function endsWith($string, $suffix) {
-    return \mb_substr($string, - \mb_strlen($suffix)) === $suffix;
-}
-
-/**
- * Remove prefix from string.
- *
- * Does not change the string if it has a different prefix.
- *
- * @param string $string The string that must start with the prefix.
- * @param string $prefix The prefix of the string.
- *
- * @return string String without prefix.
- */
-function removePrefix($string, $prefix) {
-    return startsWith($string, $prefix) ? \mb_substr($string, \mb_strlen($prefix)) : $string;
-}
diff --git a/lib/classes/Markup.php b/lib/classes/Markup.php
new file mode 100644
index 0000000..fbde67b
--- /dev/null
+++ b/lib/classes/Markup.php
@@ -0,0 +1,788 @@
+<?php
+/**
+ * Markup.class.php - Handling of Stud.IP- and HTML-markup.
+ **
+ * 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.
+ *
+ * @category    Stud.IP
+ * @copyright   (c) 2014 Stud.IP e.V.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @since       File available since Release 3.0
+ * @author      Robert Costa <rcosta@uos.de>
+ */
+namespace Studip;
+
+require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_ClassifyLinks.php';
+require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_ClassifyTables.php';
+require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_LinkifyEmail.php';
+require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_TransformLinks.php';
+require_once __DIR__ . '/htmlpurifier/HTMLPurifier_Injector_Unlinkify.php';
+
+class Markup
+{
+    /**
+     * Apply markup rules and clean the text up.
+     *
+     * @param TextFormat $markup  Markup rules applied on marked-up text.
+     * @param string     $text    Marked-up text on which rules are applied.
+     * @param boolean    $trim    Trim text before applying markup rules, if TRUE.
+     *
+     * @return string  HTML code computed from marked-up text.
+     */
+    public static function apply($markup, $text, $trim)
+    {
+        return $markup->format(self::markupToHtml($text, $trim, false));
+    }
+
+    // signature for HTML entries
+    const HTML_MARKER = '<!--HTML-->';
+
+    // signature for HTML fallback entries
+    const HTML_MARKER_FALLBACK = '<!-- HTML: Insert text after this line only. -->';
+
+    // regular expression for detecting HTML signature
+    const HTML_MARKER_REGEXP = '/^\s*<!--\s*HTML.*?-->/i';
+
+    /**
+     * Return `true` if the WYSIWYG editor is enabled for this user.
+     * @deprecated since Stud.IP 5.5
+     *
+     * @return boolean  always returns `true`.
+     */
+    public static function editorEnabled()
+    {
+        return true;
+    }
+
+    /**
+     * Return `true` for HTML code and `false` for plain text.
+     *
+     * HTML code must either match `HTML_MARKER_REGEXP` or begin
+     * with '<' and end with '>' (leading and trailing whitespace
+     * is ignored). Everything else is considered to be plain
+     * text.
+     *
+     * @param string $text  HTML code or plain text.
+     *
+     * @return boolean  `true` for HTML code, `false` for plain text.
+     */
+    public static function isHtml($text)
+    {
+        return self::hasHtmlMarker($text);
+    }
+
+    /**
+     * Return `true` for Stud.IP-HTML and `false` otherwise.
+     *
+     * Stud.IP-HTML is HTML that can contain Stud.IP Markup.
+     *
+     * Stud.IP-HTML must match Stud.IP 3.2's HTML marker.
+     * Leading and trailing whitespace is ignored.
+     *
+     * Everything else is considered not Stud.IP-HTML. In other
+     * words, if it's not Stud.IP-HTML it might be everything
+     * from plain text to binary code. But usually it's either
+     * Stud.IP markup or plain HTML code, then.
+     *
+     * @param string $text  Text that is or isn't Stud.IP-HTML.
+     *
+     * @return boolean  `true` for Stud.IP-HTML
+     */
+    public static function isHtmlFallback($text)
+    {
+        $text = trim($text);
+
+        // it's not fallback if the new HTML marker is detected
+        if (MarkupPrivate\Text\startsWith($text, self::HTML_MARKER)) {
+            return false;
+        }
+
+        // it's Stud.IP-HTML if Stud.IP 3.2's HTML marker is detected
+        if (MarkupPrivate\Text\startsWith($text, self::HTML_MARKER_FALLBACK)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return `true` for HTML code and `false` for plain text.
+     *
+     * HTML code must start with a match for `HTML_MARKER_REGEXP`.
+     *
+     * @param string $text  HTML code or plain text.
+     *
+     * @return boolean  `true` for HTML code, `false` for plain text.
+     */
+    public static function hasHtmlMarker($text)
+    {
+        return preg_match(self::HTML_MARKER_REGEXP, $text);
+    }
+
+    /**
+     * Mark a given text as HTML code.
+     *
+     * No sanity-checking is done on the given text. It is simply
+     * marked up so to be identified by Markup::isHtml as HTML
+     * code.
+     *
+     * @param string $text  The text to be marked up as HTML code.
+     *
+     * @return string  The text marked up as HTML code.
+     */
+    public static function markAsHtml($text)
+    {
+        // NOTE keep this function in sync with the JavaScript
+        // function markAsHtml in WyswygHtmlHead.php
+        if (self::hasHtmlMarker($text) || trim($text) === '') {
+            return $text; // marker already set, don't set twice
+        }
+        return self::HTML_MARKER . $text;
+    }
+
+    /**
+     * Apply markup rules after running text through HTML ready.
+     *
+     * @param TextFormat $markup  Markup rules applied on marked-up text.
+     * @param string     $text    Marked-up text on which rules are applied.
+     * @param boolean    $trim    Trim text before applying markup rules, if TRUE.
+     *
+     * @return string  HTML code computed from marked-up text.
+     */
+    private static function markupHtmlReady($markup, $text, $trim)
+    {
+        return str_replace("\n", '<br>', self::markupText(
+            $markup, self::htmlReady(self::unixEOL($text), $trim)));
+    }
+
+    /**
+     * Convert line break to Unix format.
+     *
+     * @param string $text  Text with possibly mixed line breaks (Win, Mac, Unix).
+     *
+     * @return string  Text with Unix line breaks only.
+     */
+    private static function unixEOL($text)
+    {
+        return preg_replace("/\r\n?/", "\n", $text);
+    }
+
+    /**
+     * Apply markup rules on plain text.
+     *
+     * @param TextFormat $markup  Markup rules applied on marked-up text.
+     * @param string     $text    Marked-up text on which rules are applied.
+     *
+     * @return string  HTML code computed from marked-up text.
+     */
+    private static function markupText($markup, $text)
+    {
+        return symbol($markup->format($text));
+    }
+
+    /**
+     * Call HTMLPurifier to create safe HTML.
+     *
+     * @param   string  $dirty_html  Unsafe or 'uncleaned' HTML code.
+     * @param   boolean $autoformat  Apply the AutoFormat rules
+     * @return  string              Clean and safe HTML code.
+     */
+    private static function purify($dirty_html, $autoformat = true)
+    {
+        $purifier = self::createPurifier($autoformat);
+
+        return $purifier->purify($dirty_html);
+    }
+
+    /**
+     * Call HTMLPurifier to filter the HTML code (if the source is detected
+     * to contain HTML, returns the argument unchanged otherwise). The HTML
+     * marker is restored afterwards, if it was present.
+     *
+     * @param   string  $dirty_html  Unsafe or 'uncleaned' HTML code.
+     * @return  string              Clean and safe HTML code.
+     */
+    public static function purifyHtml($html)
+    {
+        if ($html instanceof \I18NString) {
+            $base = self::purifyHtml($html->original());
+            $lang = $html->toArray();
+
+            foreach ($lang as &$value) {
+                $value = self::purifyHtml($value);
+            }
+
+            return new \I18NString($base, $lang);
+        }
+
+        if (self::isHtml($html)) {
+            $html = self::markAsHtml(self::purify($html));
+        }
+
+        return $html;
+    }
+
+    /**
+     * Create HTML purifier instance with Stud.IP-specific configuration.
+     *
+     * @param  boolean $autoformat  Apply the AutoFormat rules
+     * @return \HTMLPurifier A new instance of the HTML purifier.
+     */
+    private static function createPurifier($autoformat)
+    {
+        $config = \HTMLPurifier_Config::createDefault();
+        $config->set('Cache.SerializerPath', $GLOBALS['TMP_PATH']);
+        $config->set('Core.RemoveInvalidImg', true);
+
+        // restrict allowed HTML tags and attributes
+        //
+        // note that changes here should also be reflected in CKEditor's
+        // settings!!
+        //
+        // NOTE The list could be restricted even further by allowing only
+        // specific values for some attributes and CSS styles, but that is not
+        // directly supported by HTMLPurifier and would need to be implemented
+        // with a filter similar to ClassifyLinks.
+        //
+        // This is a list of further restrictions that can/should be introduced
+        // at a later time point maybe, if possible:
+        //
+        // - always open external links in a new tab or window
+        //   a[class="link-extern" href="..." target="_blank"]
+        // - only allow left margin and horizontal text alignment to be set in
+        //   divs (NOTE maybe remove these two features completely?):
+        //   div[style="margin-left:(40|80|...)px; text-align:(center|right|justify)"]
+        // - img[style] should only allow float:left or float:right
+        // - only allow text color and background color to be set in a span's
+        //   style attribute (NOTE 'wiki-links' are currently set here due to
+        //   implementation difficulties, but probably this should be
+        //   changed...):
+        //   span[style="color:(#000000|#800000|...);
+        //               background-color:(#000000|#800000|...)"
+        //        class="wiki-link"]
+        // - tables should always have the class "content" (it should not be
+        //   optional and no other class should be set):
+        //   table[class="content"]
+        // - table headings should have a column and/or a row scope or no scope
+        //   at all, but nothing else:
+        //   th[scope="(col | row)"]
+        // - fonts: only Stud.IP-specific fonts should be allowed
+        //
+        $config->set('HTML.Allowed', '
+            a[class|href|target|rel|name|id]
+            audio[controls|src|height|width|style]
+            big
+            blockquote
+            br
+            caption
+            code[class]
+            div[class|style]
+            em
+            figure[class|style]
+            figcaption
+            h1
+            h2
+            h3
+            h4
+            h5
+            h6
+            hr
+            i
+            img[alt|src|height|width|class|style]
+            li
+            ol[reversed|start|style]
+            p[style]
+            pre[class]
+            span[style|class]
+            strong
+            u
+            ul[style]
+            s
+            small
+            sub
+            sup
+            table[class|style]
+            tbody
+            td[colspan|rowspan|style]
+            thead
+            th[colspan|rowspan|style|scope]
+            tr
+            tt
+            video[controls|src|height|width|style]
+        ');
+
+        $config->set('Attr.AllowedFrameTargets', ['_blank']);
+        $config->set('Attr.AllowedRel', ['nofollow']);
+        $config->set('Attr.EnableID', true);
+        $config->set('Attr.AllowedClasses', [
+            'author',
+            'content',
+            'image',
+            'image-style-side',
+            'image_resized',
+            'language-cpp',
+            'language-css',
+            'language-diff',
+            'language-java',
+            'language-javascript',
+            'language-json',
+            'language-php',
+            'language-python',
+            'language-ruby',
+            'language-scss',
+            'language-sql',
+            'language-xml',
+            'link-extern',
+            'link-intern',
+            'math-tex',
+            'table',
+            'usercode',
+            'wiki-link'
+        ]);
+        $config->set('CSS.AllowedFonts', [
+            'serif',
+            'sans-serif',
+            'monospace',
+            'cursive'
+        ]);
+        $config->set('CSS.AllowedProperties', [
+            'margin-left',
+            'text-align',
+            'width',
+            'height',
+            'color',
+            'background-color', // needed by span, td
+            'border-color',
+            'border-style',
+            'float',
+            'border',
+            'vertical-align'
+        ]);
+        $config->set('CSS.MaxImgLength', null);
+
+        if ($autoformat) {
+            $config->set('AutoFormat.Linkify', true);
+            $config->set('AutoFormat.Custom', [
+                'ClassifyLinks',
+                'ClassifyTables',
+                'LinkifyEmail'
+            ]);
+            $config->set('AutoFormat.RemoveSpansWithoutAttributes', true);
+        } else {
+            $config->set('AutoFormat.Custom', ['TransformLinks']);
+        }
+
+        // avoid <img src="evil_CSRF_stuff">
+        $def = $config->getHTMLDefinition(true);
+        $img = $def->addBlankElement('img');
+        $img->attr_transform_post[]
+            = new MarkupPrivate\Purifier\AttrTransform_Image_Source();
+
+        $def->addElement('audio', 'Inline', 'Flow', 'Common', [
+              'src*' => 'URI',
+              'width' => 'Length',
+              'height' => 'Length',
+              'controls' => 'Text',     // Bool triggers bug in HTMLPurifier
+        ]);
+
+        $def->addElement('video', 'Inline', 'Flow', 'Common', [
+              'src*' => 'URI',
+              'width' => 'Length',
+              'height' => 'Length',
+              'controls' => 'Text',     // Bool triggers bug in HTMLPurifier
+        ]);
+
+        $def->addElement('figcaption', 'Inline', 'Flow', 'Common');
+        $def->addElement('figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common');
+
+        $def->addAttribute('ol', 'reversed', 'Bool');
+        $def->addAttribute('ol', 'style', 'Text');
+        $def->addAttribute('ul', 'style', 'Text');
+
+        return new \HTMLPurifier($config);
+    }
+
+    /**
+     * Convert special characters to HTML entities, and clean up.
+     *
+     * @param  string  $text  This text's special chars will be converted.
+     * @param  boolean $trim  Trim text before applying markup rules, if TRUE.
+     * @param  boolean $br    Replace newlines by <br>, if TRUE.
+     * @param  boolean $double_encode  Encode existing HTML entities, if TRUE.
+     * @return string         The converted string.
+     */
+    public static function htmlReady(
+        $text, $trim = true, $br = false, $double_encode = true
+    ) {
+        $text = htmlspecialchars($text, ENT_QUOTES, 'utf-8', $double_encode);
+
+        if ($trim) {
+            $text = trim($text);
+        }
+        if ($br) { // fix newlines
+            $text = nl2br($text, false);
+        }
+        return $text;
+    }
+
+    /**
+     * Prepare text for wysiwyg (if enabled), otherwise convert special
+     * characters using htmlReady.
+     *
+     * @param  string  $text  The text.
+     * @param  boolean $trim  Trim text before applying markup rules, if TRUE.
+     * @param  boolean $br    Replace newlines by <br>, if TRUE and wysiwyg editor disabled.
+     * @param  boolean $double_encode  Encode existing HTML entities, if TRUE and wysiwyg editor disabled.
+     * @return string         The converted string.
+     */
+    public static function wysiwygReady(
+        $text, $trim = true, $br = false, $double_encode = true
+    ) {
+        if (self::editorEnabled()) {
+            $text = self::markupToHtml($text, $trim);
+        }
+        return self::htmlReady($text, $trim, $br, $double_encode);
+    }
+
+    /**
+     * Convert Stud.IP markup (possibly mixed with HTML if fallback mode is
+     * enabled) to editable HTML. Pure HTML will only run through the purifier.
+     *
+     * @param  string  $text  The text.
+     * @param  boolean $trim  Trim text before applying markup rules, if TRUE.
+     * @param  boolean $mark  Mark result text as HTML, if TRUE.
+     * @return string         The converted string.
+     */
+    public static function markupToHtml($text, $trim = true, $mark = true)
+    {
+        if (!trim($text)) {
+            return $text;
+        }
+        if (self::isHtml($text)) {
+            $is_fallback = self::isHtmlFallback($text);
+            $text = self::purify($text, false);
+
+            if ($is_fallback) {
+                $text = self::markupText(new \StudipCoreFormat(), $text);
+            }
+        } else {
+            $text = self::markupHtmlReady(new \StudipCoreFormat(), $text, $trim);
+        }
+
+        return $mark ? self::markAsHtml($text) : $text;
+    }
+
+    /**
+     * Call HTMLPurifier to remove all HTML tags from the string (if the source
+     * is detected to contain HTML, returns the argument unchanged otherwise).
+     *
+     * @param   string  $html  HTML code to filter
+     * @return  string         The converted string.
+     */
+    public static function removeHtml($html)
+    {
+        if (self::isHtml($html)) {
+            $config = \HTMLPurifier_Config::createDefault();
+            $config->set('Cache.SerializerPath', $GLOBALS['TMP_PATH']);
+            $config->set('HTML.Allowed', 'a[href],img[alt|src],br');
+            $config->set('AutoFormat.Custom', ['Unlinkify']);
+
+            $html = str_replace('</li>', '</li><br>', $html);
+            $html = str_replace('</ol>', '</ol><br>', $html);
+            $html = str_replace('</ul>', '</ul><br>', $html);
+            $html = str_replace('</tr>', '</tr><br>', $html);
+            $html = str_replace('</p>', '</p><br><br>', $html);
+            $html = str_replace('</div>', '</div><br><br>', $html);
+
+            $purifier = new \HTMLPurifier($config);
+            $html = $purifier->purify($html);
+
+            // Replace new lines with simple line break; twice because we don't
+            // want to create unneccessary white space if a <br /> is followed
+            // by a new line
+            $html = str_replace('<br />' . PHP_EOL, PHP_EOL, $html);
+            $html = str_replace('<br />', PHP_EOL, $html);
+
+            $html = \decodeHTML(trim($html));
+        }
+
+        return $html;
+    }
+}
+
+/**
+ * Members of Studip\MarkupPrivate must not be used outside of this file!!
+ */
+
+namespace Studip\MarkupPrivate\Purifier;
+
+use Studip\MarkupPrivate\MediaProxy;
+
+/**
+ * Remove invalid <img src> attributes.
+ */
+class AttrTransform_Image_Source extends \HTMLPurifier_AttrTransform
+{
+    /**
+     * Implements abstract method of base class.
+     */
+    function transform($attr, $config, $context)
+    {
+        try {
+            $attr['src'] = MediaProxy\getMediaUrl($attr['src']);
+        } catch (MediaProxy\InvalidInternalLinkException $e) {
+            // invalid internal link ==> remove <img src> attribute
+            $GLOBALS['msg'][] = _('Ungültige interne Medienverknüpfung entfernt: ')
+                . \htmlentities($e->getUrl());
+            $attr['src'] = NULL; // remove <img src> attribute
+        } catch (MediaProxy\ExternalMediaDeniedException $e) {
+            $GLOBALS['msg'][] = _('Verbotene externe Medienverknüpfung entfernt: ')
+                . \htmlentities($e->getUrl());
+            $attr['src'] = NULL; // remove <img src> attribute
+        }
+        return $attr;
+    }
+}
+
+//// media proxy //////////////////////////////////////////////////////////////
+
+namespace Studip\MarkupPrivate\MediaProxy;
+
+use Studip\MarkupPrivate\Text;
+
+/**
+ * Check if media proxy should be used and if so return the respective URL.
+ *
+ * @param string $url   URL to media file.
+ * @return mixed        URL string to media file (possibly 'proxied')
+ *                      or NULL if URL is invalid.
+ */
+function getMediaUrl($url) {
+    // even though proxied URLs shouldn't be stored in the database, the
+    // next line will handle those cases where they're accidentally there
+    $url = decodeMediaProxyUrl($url);
+
+    // handle internal media links
+    if (isStudipMediaUrl($url)) {
+        return transformInternalIdnaLink($url);
+    }
+    if (isInternalLink($url)) {
+        // link is studip-internal, but not to a valid media location
+        throw new InvalidInternalLinkException($url);
+    }
+
+    // handle external media links
+    $external_media = \Config::get()->LOAD_EXTERNAL_MEDIA;
+    if ($external_media === 'proxy' &&
+        \Seminar_Session::is_current_session_authenticated()
+    ) {
+        // media proxy must be accessed by an internal link
+        return encodeMediaProxyUrl($url);
+    }
+    if ($external_media === 'allow') {
+        return $url;
+    }
+    throw new ExternalMediaDeniedException($url);
+}
+
+/**
+ * Return media proxy URL for an unproxied URL.
+ *
+ * @params string $url  Unproxied media URL.
+ * @return string       Media proxy URL for accessing the same resource.
+ */
+function encodeMediaProxyUrl($url) {
+    return transformInternalIdnaLink(
+        getMediaProxyUrl() .'?url=' . \urlencode(\idna_link($url)));
+}
+
+/**
+ * Extract the original URL from a media proxy URL.
+ *
+ * @param string  $url  The media proxy URL.
+ * return string  The original URL. If $url does not point to the media
+ *                proxy then this is the exact same value given by $url.
+ */
+function decodeMediaProxyUrl($url) {
+    # TODO make it work for 'url=' at any position in query
+    $urlpath = removeStudipDomain($url);
+    $proxypath = removeStudipDomain(getMediaProxyUrl()) . '?url=';
+    if (Text\startsWith($urlpath, $proxypath)) {
+        return \urldecode(Text\removePrefix($urlpath, $proxypath));
+    }
+    return $url;
+}
+
+/**
+ * Return Stud.IP's absolute media proxy URL.
+ */
+function getMediaProxyUrl() {
+    return $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/media_proxy';
+}
+
+/**
+ * Test if an URL points to a valid internal Stud.IP media path.
+ *
+ * @param   string   $url  Internal Stud.IP URL.
+ * @returns boolean  TRUE for internal media link URLs, FALSE otherwise.
+ */
+function isStudipMediaUrl($url) {
+    return isInternalLink($url) &&
+        isStudipMediaUrlPath(getStudipRelativePath($url));
+}
+
+function isInternalLink($url) {
+    return is_internal_url(transformInternalIdnaLink($url));
+}
+
+//// url utilities ////////////////////////////////////////////////////////////
+
+/**
+ * Remove domain name from internal URLs.
+ *
+ * Remove scheme, domain and authentication information from internal
+ * Stud.IP URLs. Leave external URLs untouched.
+ *
+ * @param string $url   URL from which to remove internal domain.
+ * @returns string      URL without internal domain or the exact same
+ *                      value as $url for external URLs.
+ */
+function removeStudipDomain($url) {
+    if (!isInternalLink($url)) {
+        return $url;
+    }
+    $parsed_url = \parse_url(transformInternalIdnaLink($url));
+    $path = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+    $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+    $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+    return $path . $query . $fragment;
+}
+
+/**
+ * Return a URL's path component with the absolute Stud.IP path removed.
+ *
+ * NOTE: If the URL is not an internal Stud.IP URL, the path component will
+ * nevertheless be returned without issuing an error message.
+ *
+ * Example:
+ * >>> getStudipRelativePath('http://localhost:8080'
+ *      . '/studip/sendfile.php?type=0&file_id=ABC123&file_name=nice.jpg')
+ * 'sendfile.php'
+ *
+ * @param string $url   The URL from which to return the Stud.IP-relative
+ *                      path component.
+ * returns string Stud.IP-relative path component of $url.
+ */
+function getStudipRelativePath($url) {
+    $parsed_url = \parse_url(transformInternalIdnaLink($url));
+    $parsed_studip_url = getParsedStudipUrl();
+    return Text\removePrefix($parsed_url['path'], $parsed_studip_url['path']);
+}
+
+/**
+ * Return an associative array containing the Stud.IP URL elements.
+ *
+ * see also: http://php.net/manual/en/function.parse-url.php
+ *
+ * @returns mixed  Same values that PHP's parse_url() returns.
+ */
+function getParsedStudipUrl() {
+    return \parse_url($GLOBALS['ABSOLUTE_URI_STUDIP']);
+}
+
+/**
+ * Test if path is valid for internal Stud.IP media URLs.
+ *
+ * @params string $path The path component of an URL.
+ * return boolean       TRUE for valid media paths, FALSE otherwise.
+ */
+function isStudipMediaUrlPath($path) {
+    list($path_head) = \explode('/', $path);
+    $valid_paths = ['sendfile.php', 'download', 'assets', 'pictures'];
+    return \mb_strpos(\urldecode($path), '../') === false && \in_array($path_head, $valid_paths);
+}
+
+/**
+ * Return a normalized, internal URL.
+ *
+ * @params string $url  An internal URL.
+ * @returns string      Normalized internal URL.
+ */
+function transformInternalIdnaLink($url) {
+    return \idna_link(\TransformInternalLinks($url));
+}
+
+//// url exceptions ///////////////////////////////////////////////////////////
+
+class UrlException extends \Exception
+{
+    private $url;
+
+    public function __construct($url) {
+        parent::__construct();
+        $this->url = $url;
+    }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+}
+
+class InvalidInternalLinkException extends UrlException
+{
+}
+
+class ExternalMediaDeniedException extends UrlException
+{
+}
+
+//// string utilities /////////////////////////////////////////////////////////
+
+namespace Studip\MarkupPrivate\Text;
+
+/**
+ * Test if string starts with prefix.
+ *
+ * @param string $string  Tested string.
+ * @param string $prefix  Prefix of tested string.
+ *
+ * @return boolean  TRUE if string starts with prefix.
+ */
+function startsWith($string, $prefix) {
+    return \mb_substr($string, 0, \mb_strlen($prefix)) === $prefix;
+}
+
+/**
+ * Test if string ends with suffix.
+ *
+ * @param string $string  Tested string.
+ * @param string $suffix  Suffix of tested string.
+ *
+ * @return boolean  TRUE if string ends with suffix.
+ */
+function endsWith($string, $suffix) {
+    return \mb_substr($string, - \mb_strlen($suffix)) === $suffix;
+}
+
+/**
+ * Remove prefix from string.
+ *
+ * Does not change the string if it has a different prefix.
+ *
+ * @param string $string The string that must start with the prefix.
+ * @param string $prefix The prefix of the string.
+ *
+ * @return string String without prefix.
+ */
+function removePrefix($string, $prefix) {
+    return startsWith($string, $prefix) ? \mb_substr($string, \mb_strlen($prefix)) : $string;
+}
diff --git a/lib/classes/MessageBox.class.php b/lib/classes/MessageBox.class.php
deleted file mode 100644
index 8936ebe..0000000
--- a/lib/classes/MessageBox.class.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * MessageBox.class.php
- *
- * html boxes for different kinds of messages
- *
- * 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.
- *
- * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL Licence 2
- * @category    Stud.IP
- * @package     layout
- * @since       1.10
- *
- */
-
-/**
- * class MessageBox
- *
- * usage:
- *
- * echo MessageBox::error('Nachricht', ['optional details']);
- *
- * use the optional parameter $close_details for displaying the message box with
- * closed details
- *
- * echo MessageBox::success('Nachricht', ['optional details'], true);
- *
- */
-class MessageBox implements LayoutMessage
-{
-    /**
-     * type and contents of the message box
-     */
-    public $class;
-    public $message;
-    public $details;
-    public $close_details;
-    protected $hide_close = false;
-    public static $counter = 0;
-
-    /**
-     * This function returns an exception message box. Use it only for system errors
-     * or security related problems.
-     *
-     * @param string $message
-     * @param array $details
-     * @param boolean $close_details
-     * @return object MessageBox object
-     */
-    public static function exception($message, $details = [], $close_details = false)
-    {
-        return new MessageBox('exception', $message, $details, $close_details);
-    }
-
-    /**
-     * This function returns an error message box. Use it for validation errors,
-     * problems and other wrong user input.
-     *
-     * @param string $message
-     * @param array $details (optional)
-     * @param boolean $close_details (optional)
-     * @return object MessageBox object
-     */
-    public static function error($message, $details = [], $close_details = false)
-    {
-        return new MessageBox('error', $message, $details, $close_details);
-    }
-
-    /**
-     * This function returns a success message box. Use it for confirmation of user
-     * interaction.
-     *
-     * @param string $message
-     * @param array $details (optional)
-     * @param boolean $close_details (optional)
-     * @return object MessageBox object
-     */
-    public static function success($message, $details = [], $close_details = false)
-    {
-        return new MessageBox('success', $message, $details, $close_details);
-    }
-
-    /**
-     * This function returns an info message box. Use it to report neutral
-     * informations.
-     *
-     * @param string $message
-     * @param array $details (optional)
-     * @param boolean $close_details (optional)
-     * @return object MessageBox object
-     */
-    public static function info($message, $details = [], $close_details = false)
-    {
-        return new MessageBox('info', $message, $details, $close_details);
-    }
-
-    /**
-     * This function returns a warning message box. Use it to report potentially
-     * wrong behaviour.
-     *
-     * @param string $message
-     * @param array $details (optional)
-     * @param boolean $close_details (optional)
-     * @return object MessageBox object
-     */
-    public static function warning($message, $details = [], $close_details = false)
-    {
-        return new MessageBox('warning', $message, $details, $close_details);
-    }
-
-    /**
-     * Initializes a new MessageBox object of the given class.
-     *
-     * @param string $class the type of this message
-     * @param string $message
-     * @param array $details (optional)
-     * @param boolean $close_details (optional)
-     */
-    protected function __construct($class, $message, $details = [], $close_details = false)
-    {
-        $this->class         = $class;
-        $this->message       = $message;
-        $this->details       = $details;
-        $this->close_details = $close_details;
-    }
-
-    /**
-     * Sets the state whether the close button should be hidden or not.
-     *
-     * @param  boolean $state Whether the close button should be hidden or not
-     * @return MessageBox instance to allow chaining
-     */
-    public function hideClose($state = true)
-    {
-        $this->hide_close = (bool) $state;
-        return $this;
-    }
-
-    /**
-     * Return whether this messagebox can be closed or not.
-     * @return bool
-     */
-    public function isCloseable(): bool
-    {
-        return $this->hide_close;
-    }
-
-    /**
-     * This method renders a MessageBox object to a string.
-     *
-     * @return string   html output of the message box
-     */
-    public function __toString()
-    {
-        $label = [
-            'exception' => _('Systemfehler'),
-            'error'     => _('Fehler'),
-            'warning'   => _('Warnung'),
-            'info'      => _('Hinweis'),
-            'success'   => _('Erfolg'),
-        ];
-        return $GLOBALS['template_factory']->render('shared/message_box', [
-            'class'         => $this->class,
-            'message'       => $this->message,
-            'details'       => is_array($this->details) ? $this->details : [],
-            'close_details' => $this->close_details,
-            'hide_close'    => $this->hide_close,
-            'label'         => $label[$this->class],
-            'counter'       => self::$counter++,
-        ]);
-    }
-}
diff --git a/lib/classes/MessageBox.php b/lib/classes/MessageBox.php
new file mode 100644
index 0000000..8936ebe
--- /dev/null
+++ b/lib/classes/MessageBox.php
@@ -0,0 +1,177 @@
+<?php
+# Lifter010: TODO
+/**
+ * MessageBox.class.php
+ *
+ * html boxes for different kinds of messages
+ *
+ * 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.
+ *
+ * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL Licence 2
+ * @category    Stud.IP
+ * @package     layout
+ * @since       1.10
+ *
+ */
+
+/**
+ * class MessageBox
+ *
+ * usage:
+ *
+ * echo MessageBox::error('Nachricht', ['optional details']);
+ *
+ * use the optional parameter $close_details for displaying the message box with
+ * closed details
+ *
+ * echo MessageBox::success('Nachricht', ['optional details'], true);
+ *
+ */
+class MessageBox implements LayoutMessage
+{
+    /**
+     * type and contents of the message box
+     */
+    public $class;
+    public $message;
+    public $details;
+    public $close_details;
+    protected $hide_close = false;
+    public static $counter = 0;
+
+    /**
+     * This function returns an exception message box. Use it only for system errors
+     * or security related problems.
+     *
+     * @param string $message
+     * @param array $details
+     * @param boolean $close_details
+     * @return object MessageBox object
+     */
+    public static function exception($message, $details = [], $close_details = false)
+    {
+        return new MessageBox('exception', $message, $details, $close_details);
+    }
+
+    /**
+     * This function returns an error message box. Use it for validation errors,
+     * problems and other wrong user input.
+     *
+     * @param string $message
+     * @param array $details (optional)
+     * @param boolean $close_details (optional)
+     * @return object MessageBox object
+     */
+    public static function error($message, $details = [], $close_details = false)
+    {
+        return new MessageBox('error', $message, $details, $close_details);
+    }
+
+    /**
+     * This function returns a success message box. Use it for confirmation of user
+     * interaction.
+     *
+     * @param string $message
+     * @param array $details (optional)
+     * @param boolean $close_details (optional)
+     * @return object MessageBox object
+     */
+    public static function success($message, $details = [], $close_details = false)
+    {
+        return new MessageBox('success', $message, $details, $close_details);
+    }
+
+    /**
+     * This function returns an info message box. Use it to report neutral
+     * informations.
+     *
+     * @param string $message
+     * @param array $details (optional)
+     * @param boolean $close_details (optional)
+     * @return object MessageBox object
+     */
+    public static function info($message, $details = [], $close_details = false)
+    {
+        return new MessageBox('info', $message, $details, $close_details);
+    }
+
+    /**
+     * This function returns a warning message box. Use it to report potentially
+     * wrong behaviour.
+     *
+     * @param string $message
+     * @param array $details (optional)
+     * @param boolean $close_details (optional)
+     * @return object MessageBox object
+     */
+    public static function warning($message, $details = [], $close_details = false)
+    {
+        return new MessageBox('warning', $message, $details, $close_details);
+    }
+
+    /**
+     * Initializes a new MessageBox object of the given class.
+     *
+     * @param string $class the type of this message
+     * @param string $message
+     * @param array $details (optional)
+     * @param boolean $close_details (optional)
+     */
+    protected function __construct($class, $message, $details = [], $close_details = false)
+    {
+        $this->class         = $class;
+        $this->message       = $message;
+        $this->details       = $details;
+        $this->close_details = $close_details;
+    }
+
+    /**
+     * Sets the state whether the close button should be hidden or not.
+     *
+     * @param  boolean $state Whether the close button should be hidden or not
+     * @return MessageBox instance to allow chaining
+     */
+    public function hideClose($state = true)
+    {
+        $this->hide_close = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return whether this messagebox can be closed or not.
+     * @return bool
+     */
+    public function isCloseable(): bool
+    {
+        return $this->hide_close;
+    }
+
+    /**
+     * This method renders a MessageBox object to a string.
+     *
+     * @return string   html output of the message box
+     */
+    public function __toString()
+    {
+        $label = [
+            'exception' => _('Systemfehler'),
+            'error'     => _('Fehler'),
+            'warning'   => _('Warnung'),
+            'info'      => _('Hinweis'),
+            'success'   => _('Erfolg'),
+        ];
+        return $GLOBALS['template_factory']->render('shared/message_box', [
+            'class'         => $this->class,
+            'message'       => $this->message,
+            'details'       => is_array($this->details) ? $this->details : [],
+            'close_details' => $this->close_details,
+            'hide_close'    => $this->hide_close,
+            'label'         => $label[$this->class],
+            'counter'       => self::$counter++,
+        ]);
+    }
+}
diff --git a/lib/classes/ModulesNotification.class.php b/lib/classes/ModulesNotification.class.php
deleted file mode 100644
index f414071..0000000
--- a/lib/classes/ModulesNotification.class.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-# Lifter002: DONE - no html output in this file
-# Lifter007: TODO
-# Lifter003: TEST
-# Lifter010: DONE - no html output in this file
-/**
-* ModulesNotification.class.php
-*
-* check for modules (global and local for institutes and Veranstaltungen), read and write
-*
-*
-* @author       Peter Thienel <thienel@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
-* @access       public
-* @modulegroup      core
-* @package      studip_core
-*/
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Modules.class.php
-// Checks fuer Module (global und lokal fuer Veranstaltungen und Einrichtungen), Schreib-/Lesezugriff
-// Copyright (C) 2003 Cornelis Kater <ckater@gwdg.de>, Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-class ModulesNotification
-{
-
-    public $registered_notification_modules = [];
-    public $subject;
-
-    public function __construct ()
-    {
-        foreach (MyRealmModel::getDefaultModules() as $id => $module) {
-            if (!is_object($module)) {
-                continue;
-            }
-
-            $metadata = $module->getMetadata();
-
-            $this->registered_notification_modules[$id] = [
-                'icon' => !empty($metadata['icon']) ? $metadata['icon'] : null,
-                'name' => !empty($metadata['displayname'])  ? $metadata['displayname'] : $module->getPluginName(),
-            ];
-            if ($module instanceof CoreOverview) {
-                $this->registered_notification_modules[$id]['name'] = _("Ankündigungen");
-                $this->registered_notification_modules[$id]['icon'] = Icon::create('news');
-            }
-            if (!is_object($this->registered_notification_modules[$id]['icon'])) {
-                $icon = $module->getPluginURL() . '/' . $this->registered_notification_modules[$id]['icon'];
-                $this->registered_notification_modules[$id]['icon'] = Icon::create($icon);
-            }
-        }
-        $this->registered_notification_modules[-1] =
-            [
-                'name' => _("Umfragen und Tests"),
-                'icon' => Icon::create('vote')
-            ];
-        $this->registered_notification_modules[0] =
-            [
-                'name' => _("Grunddaten der Veranstaltung"),
-                'icon' => Icon::create('seminar')
-            ];
-
-        $this->subject = _("Stud.IP Benachrichtigung");
-    }
-
-
-
-    public function getAllNotifications ($user_id = null)
-    {
-        if ($user_id === null) {
-            $user_id = $GLOBALS['user']->id;
-        }
-
-        $my_sem = [];
-        $query = "SELECT s.Seminar_id, s.Name, s.chdate, s.start_time, IFNULL(visitdate, :threshold) AS visitdate
-                  FROM seminar_user_notifications su
-                  JOIN seminar_user USING (user_id, seminar_id)
-                  JOIN seminare s USING (Seminar_id)
-                  LEFT JOIN object_user_visits ouv
-                    ON (
-                        ouv.object_id = su.Seminar_id
-                        AND ouv.user_id = :user_id
-                        AND ouv.plugin_id = 0
-                    )
-                  WHERE su.user_id = :user_id";
-
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':threshold', object_get_visit_threshold());
-        $statement->execute();
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $seminar_id = $row['Seminar_id'];
-            $tools = ToolActivation::findbyRange_id($seminar_id);
-            $notification = CourseMemberNotification::find([$user_id, $seminar_id]);
-
-            if (!$notification || count($notification->notification_data) === 0) {
-                continue;
-            }
-
-            $my_sem[$seminar_id] = [
-                'name'         => $row['Name'],
-                'chdate'       => $row['chdate'],
-                'start_time'   => $row['start_time'],
-                'tools'        => new SimpleCollection($tools),
-                'visitdate'    => $row['visitdate'],
-                'notification' => $notification->notification_data->getArrayCopy(),
-            ];
-        }
-        $visit_data = get_objects_visits(array_keys($my_sem), 'sem', null, $user_id, array_keys($this->registered_notification_modules));
-        $news = [];
-        foreach ($my_sem as $seminar_id => $s_data) {
-            $navigation = MyRealmModel::getAdditionalNavigations($seminar_id, $s_data, null, $user_id, $visit_data[$seminar_id]);
-            $n_data = [];
-            foreach ($this->registered_notification_modules as $id => $m_data) {
-                if (
-                    in_array($id, $s_data['notification'])
-                    && isset($navigation[$id])
-                    && $navigation[$id]->getImage()
-                    && $navigation[$id]->getImage()->getRole() === Icon::ROLE_ATTENTION
-                ) {
-                    $data = $this->getPluginText($navigation[$id], $seminar_id, $id);
-                    if ($data) {
-                        $n_data[] = $data;
-                    }
-                }
-            }
-            if (count($n_data)) {
-                $news[$s_data['name']] = $n_data;
-            }
-        }
-        if (count($news)) {
-            $user = User::find($user_id);
-            $auth_plugin = $user->auth_plugin;
-            if (!is_a('StudipAuth' . ucfirst($auth_plugin), 'StudipAuthSSO', true)) {
-                $auth_plugin = null;
-            }
-            $template = $GLOBALS['template_factory']->open('mail/notification_html');
-            $template->set_attribute('lang', getUserLanguagePath($user_id));
-            $template->set_attribute('rec_fullname', $user->getFullname('full'));
-            $template->set_attribute('rec_username', $user->username);
-            $template->set_attribute('news', $news);
-            $template->set_attribute('sso', $auth_plugin);
-
-            $template_text = $GLOBALS['template_factory']->open('mail/notification_text');
-            $template_text->set_attribute('news', $news);
-            $template_text->set_attribute('sso', $auth_plugin);
-            return ['text' => $template_text->render(), 'html' => $template->render()];
-        }
-
-        return null;
-    }
-
-    function getPluginText($nav, $seminar_id, $id)
-    {
-        $base_url = URLHelper::setBaseURL('');
-        URLHelper::setBaseURl($base_url);
-        if ($nav instanceof Navigation && $nav->isVisible(true)) {
-            $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&');
-            $icon = $nav->getImage();
-            $text = $nav->getTitle();
-            if (!$text) {
-                $text = $this->registered_notification_modules[$id]['name'];
-            }
-            $text .= ' - ' .  $nav->getLinkAttributes()['title'];
-            return compact('text', 'url', 'icon', 'seminar_id');
-        }
-    }
-}
diff --git a/lib/classes/ModulesNotification.php b/lib/classes/ModulesNotification.php
new file mode 100644
index 0000000..f414071
--- /dev/null
+++ b/lib/classes/ModulesNotification.php
@@ -0,0 +1,182 @@
+<?php
+# Lifter002: DONE - no html output in this file
+# Lifter007: TODO
+# Lifter003: TEST
+# Lifter010: DONE - no html output in this file
+/**
+* ModulesNotification.class.php
+*
+* check for modules (global and local for institutes and Veranstaltungen), read and write
+*
+*
+* @author       Peter Thienel <thienel@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+* @access       public
+* @modulegroup      core
+* @package      studip_core
+*/
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// Modules.class.php
+// Checks fuer Module (global und lokal fuer Veranstaltungen und Einrichtungen), Schreib-/Lesezugriff
+// Copyright (C) 2003 Cornelis Kater <ckater@gwdg.de>, Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+class ModulesNotification
+{
+
+    public $registered_notification_modules = [];
+    public $subject;
+
+    public function __construct ()
+    {
+        foreach (MyRealmModel::getDefaultModules() as $id => $module) {
+            if (!is_object($module)) {
+                continue;
+            }
+
+            $metadata = $module->getMetadata();
+
+            $this->registered_notification_modules[$id] = [
+                'icon' => !empty($metadata['icon']) ? $metadata['icon'] : null,
+                'name' => !empty($metadata['displayname'])  ? $metadata['displayname'] : $module->getPluginName(),
+            ];
+            if ($module instanceof CoreOverview) {
+                $this->registered_notification_modules[$id]['name'] = _("Ankündigungen");
+                $this->registered_notification_modules[$id]['icon'] = Icon::create('news');
+            }
+            if (!is_object($this->registered_notification_modules[$id]['icon'])) {
+                $icon = $module->getPluginURL() . '/' . $this->registered_notification_modules[$id]['icon'];
+                $this->registered_notification_modules[$id]['icon'] = Icon::create($icon);
+            }
+        }
+        $this->registered_notification_modules[-1] =
+            [
+                'name' => _("Umfragen und Tests"),
+                'icon' => Icon::create('vote')
+            ];
+        $this->registered_notification_modules[0] =
+            [
+                'name' => _("Grunddaten der Veranstaltung"),
+                'icon' => Icon::create('seminar')
+            ];
+
+        $this->subject = _("Stud.IP Benachrichtigung");
+    }
+
+
+
+    public function getAllNotifications ($user_id = null)
+    {
+        if ($user_id === null) {
+            $user_id = $GLOBALS['user']->id;
+        }
+
+        $my_sem = [];
+        $query = "SELECT s.Seminar_id, s.Name, s.chdate, s.start_time, IFNULL(visitdate, :threshold) AS visitdate
+                  FROM seminar_user_notifications su
+                  JOIN seminar_user USING (user_id, seminar_id)
+                  JOIN seminare s USING (Seminar_id)
+                  LEFT JOIN object_user_visits ouv
+                    ON (
+                        ouv.object_id = su.Seminar_id
+                        AND ouv.user_id = :user_id
+                        AND ouv.plugin_id = 0
+                    )
+                  WHERE su.user_id = :user_id";
+
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':threshold', object_get_visit_threshold());
+        $statement->execute();
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $seminar_id = $row['Seminar_id'];
+            $tools = ToolActivation::findbyRange_id($seminar_id);
+            $notification = CourseMemberNotification::find([$user_id, $seminar_id]);
+
+            if (!$notification || count($notification->notification_data) === 0) {
+                continue;
+            }
+
+            $my_sem[$seminar_id] = [
+                'name'         => $row['Name'],
+                'chdate'       => $row['chdate'],
+                'start_time'   => $row['start_time'],
+                'tools'        => new SimpleCollection($tools),
+                'visitdate'    => $row['visitdate'],
+                'notification' => $notification->notification_data->getArrayCopy(),
+            ];
+        }
+        $visit_data = get_objects_visits(array_keys($my_sem), 'sem', null, $user_id, array_keys($this->registered_notification_modules));
+        $news = [];
+        foreach ($my_sem as $seminar_id => $s_data) {
+            $navigation = MyRealmModel::getAdditionalNavigations($seminar_id, $s_data, null, $user_id, $visit_data[$seminar_id]);
+            $n_data = [];
+            foreach ($this->registered_notification_modules as $id => $m_data) {
+                if (
+                    in_array($id, $s_data['notification'])
+                    && isset($navigation[$id])
+                    && $navigation[$id]->getImage()
+                    && $navigation[$id]->getImage()->getRole() === Icon::ROLE_ATTENTION
+                ) {
+                    $data = $this->getPluginText($navigation[$id], $seminar_id, $id);
+                    if ($data) {
+                        $n_data[] = $data;
+                    }
+                }
+            }
+            if (count($n_data)) {
+                $news[$s_data['name']] = $n_data;
+            }
+        }
+        if (count($news)) {
+            $user = User::find($user_id);
+            $auth_plugin = $user->auth_plugin;
+            if (!is_a('StudipAuth' . ucfirst($auth_plugin), 'StudipAuthSSO', true)) {
+                $auth_plugin = null;
+            }
+            $template = $GLOBALS['template_factory']->open('mail/notification_html');
+            $template->set_attribute('lang', getUserLanguagePath($user_id));
+            $template->set_attribute('rec_fullname', $user->getFullname('full'));
+            $template->set_attribute('rec_username', $user->username);
+            $template->set_attribute('news', $news);
+            $template->set_attribute('sso', $auth_plugin);
+
+            $template_text = $GLOBALS['template_factory']->open('mail/notification_text');
+            $template_text->set_attribute('news', $news);
+            $template_text->set_attribute('sso', $auth_plugin);
+            return ['text' => $template_text->render(), 'html' => $template->render()];
+        }
+
+        return null;
+    }
+
+    function getPluginText($nav, $seminar_id, $id)
+    {
+        $base_url = URLHelper::setBaseURL('');
+        URLHelper::setBaseURl($base_url);
+        if ($nav instanceof Navigation && $nav->isVisible(true)) {
+            $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&');
+            $icon = $nav->getImage();
+            $text = $nav->getTitle();
+            if (!$text) {
+                $text = $this->registered_notification_modules[$id]['name'];
+            }
+            $text .= ' - ' .  $nav->getLinkAttributes()['title'];
+            return compact('text', 'url', 'icon', 'seminar_id');
+        }
+    }
+}
diff --git a/lib/classes/MultiDimArrayObject.class.php b/lib/classes/MultiDimArrayObject.class.php
deleted file mode 100644
index b578018..0000000
--- a/lib/classes/MultiDimArrayObject.class.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * MultiDimArrayObject
- *
- *
- * @author      André Noack <noack@data-quest.de>
- *
- */
-class MultiDimArrayObject extends StudipArrayObject
-{
-    /**
-     * Constructor
-     *
-     * @param array  $input
-     * @param int    $flags
-     * @param string $iteratorClass
-     */
-    public function __construct($input = [], $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
-    {
-        parent::__construct([], $flags, $iteratorClass);
-        $this->exchangeArray($input);
-    }
-
-    /**
-     * Appends the value
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function append($value)
-    {
-        $this->offsetSet(null, $value);
-    }
-
-    /**
-     * Exchange the array for another one.
-     *
-     * @param  array|ArrayObject $data
-     * @return array
-     */
-    public function exchangeArray($data)
-    {
-        if (!is_array($data) && !is_object($data)) {
-            throw new InvalidArgumentException('Passed variable is not an array or object');
-        }
-
-        if ($data instanceof \StudipArrayObject) {
-            $data = $data->getArrayCopy();
-        }
-        if (!is_array($data)) {
-            $data = (array) $data;
-        }
-
-        $storage = $this->storage;
-
-        $this->storage = $this->recursiveArrayToArrayObjects($data);
-
-        return $storage;
-    }
-
-    /**
-     * Creates a copy of the ArrayObject.
-     *
-     * @return array
-     */
-    public function getArrayCopy()
-    {
-        $ret = [];
-        foreach($this->storage as $key => $value) {
-            if ($value instanceOf StudipArrayObject) {
-                $ret[$key] = $value->getArrayCopy();
-            } else {
-                $ret[$key] = $value;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Create a new iterator from an ArrayObject instance
-     */
-    public function getIterator(): Traversable
-    {
-        $class = $this->iteratorClass;
-
-        return new $class($this->getArrayCopy());
-    }
-
-    /**
-     * Sets the value at the specified key to value
-     *
-     * @param  mixed $key
-     * @param  mixed $value
-     */
-    public function offsetSet($key, $value): void
-    {
-        $new_value = $this->recursiveArrayToArrayObjects($value);
-        if (is_array($new_value)) {
-            $class = get_called_class();
-            $new_value = new $class($new_value, $this->getFlags(), $this->getIteratorClass());
-        }
-        if (is_null($key)) {
-            $this->storage[] = $new_value;
-        } else {
-            $this->storage[$key] = $new_value;
-        }
-    }
-
-    protected function recursiveArrayToArrayObjects($data)
-    {
-        if ($data instanceOf StudipArrayObject) {
-            $data = $data->getArrayCopy();
-        }
-        if (is_array($data)) {
-            $new_data = [];
-            foreach ($data as $key => $value) {
-                $new_value = $this->recursiveArrayToArrayObjects($value);
-                if (is_array($new_value)) {
-                    $class = get_called_class();
-                    $new_data[$key] = new $class($new_value, $this->getFlags(), $this->getIteratorClass());
-                } else {
-                    $new_data[$key] = $value;
-                }
-            }
-            return $new_data;
-        }
-        return $data;
-    }
-}
diff --git a/lib/classes/MultiDimArrayObject.php b/lib/classes/MultiDimArrayObject.php
new file mode 100644
index 0000000..b578018
--- /dev/null
+++ b/lib/classes/MultiDimArrayObject.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * MultiDimArrayObject
+ *
+ *
+ * @author      André Noack <noack@data-quest.de>
+ *
+ */
+class MultiDimArrayObject extends StudipArrayObject
+{
+    /**
+     * Constructor
+     *
+     * @param array  $input
+     * @param int    $flags
+     * @param string $iteratorClass
+     */
+    public function __construct($input = [], $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
+    {
+        parent::__construct([], $flags, $iteratorClass);
+        $this->exchangeArray($input);
+    }
+
+    /**
+     * Appends the value
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function append($value)
+    {
+        $this->offsetSet(null, $value);
+    }
+
+    /**
+     * Exchange the array for another one.
+     *
+     * @param  array|ArrayObject $data
+     * @return array
+     */
+    public function exchangeArray($data)
+    {
+        if (!is_array($data) && !is_object($data)) {
+            throw new InvalidArgumentException('Passed variable is not an array or object');
+        }
+
+        if ($data instanceof \StudipArrayObject) {
+            $data = $data->getArrayCopy();
+        }
+        if (!is_array($data)) {
+            $data = (array) $data;
+        }
+
+        $storage = $this->storage;
+
+        $this->storage = $this->recursiveArrayToArrayObjects($data);
+
+        return $storage;
+    }
+
+    /**
+     * Creates a copy of the ArrayObject.
+     *
+     * @return array
+     */
+    public function getArrayCopy()
+    {
+        $ret = [];
+        foreach($this->storage as $key => $value) {
+            if ($value instanceOf StudipArrayObject) {
+                $ret[$key] = $value->getArrayCopy();
+            } else {
+                $ret[$key] = $value;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Create a new iterator from an ArrayObject instance
+     */
+    public function getIterator(): Traversable
+    {
+        $class = $this->iteratorClass;
+
+        return new $class($this->getArrayCopy());
+    }
+
+    /**
+     * Sets the value at the specified key to value
+     *
+     * @param  mixed $key
+     * @param  mixed $value
+     */
+    public function offsetSet($key, $value): void
+    {
+        $new_value = $this->recursiveArrayToArrayObjects($value);
+        if (is_array($new_value)) {
+            $class = get_called_class();
+            $new_value = new $class($new_value, $this->getFlags(), $this->getIteratorClass());
+        }
+        if (is_null($key)) {
+            $this->storage[] = $new_value;
+        } else {
+            $this->storage[$key] = $new_value;
+        }
+    }
+
+    protected function recursiveArrayToArrayObjects($data)
+    {
+        if ($data instanceOf StudipArrayObject) {
+            $data = $data->getArrayCopy();
+        }
+        if (is_array($data)) {
+            $new_data = [];
+            foreach ($data as $key => $value) {
+                $new_value = $this->recursiveArrayToArrayObjects($value);
+                if (is_array($new_value)) {
+                    $class = get_called_class();
+                    $new_data[$key] = new $class($new_value, $this->getFlags(), $this->getIteratorClass());
+                } else {
+                    $new_data[$key] = $value;
+                }
+            }
+            return $new_data;
+        }
+        return $data;
+    }
+}
diff --git a/lib/classes/MultiPersonSearch.class.php b/lib/classes/MultiPersonSearch.class.php
deleted file mode 100644
index af10e6b..0000000
--- a/lib/classes/MultiPersonSearch.class.php
+++ /dev/null
@@ -1,548 +0,0 @@
-<?php
-/**
- * MultiPersonSearch.class.php
- *
- * This class provides a GUI-element for searching, adding and removing
- * multiple persons. If JavaScript is enabled the GUI-element is shown
- * as a dialog on the current page. Otherwise the GUI-element is shown
- * on a separate page.
- *
- * 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
- * he License, or (at your option) any later version.
- *
- * @author      Sebastian Hobert <sebastian.hobert@uni-goettingen.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @link        http://docs.studip.de/develop/Entwickler/MultiPersonSearch
- */
-class MultiPersonSearch {
-
-    private $name;
-    private $linkIconPath = "";
-    private $linkText = "";
-    private $title = "";
-    private $description = "";
-    private $executeURL;
-    private $jsFunction = null;
-    private $pageURL = null;
-    private $quickfilterIds = [];
-    private $defaultSelectableUsersIDs = [];
-    private $defaultSelectedUsersIDs = [];
-    private $searchObject = null;
-    private $additionalHMTL = "";
-    private $navigationItem = "";
-    private $dataDialogStatus = false;
-
-    /**
-     * restores a MultiPersonSearch object.
-     *
-     * @param string name of the object
-     *
-     * @return MultiPersonSearch
-     */
-    public static function load($name)
-    {
-        $mp = new MultiPersonSearch($name);
-        $mp->restoreFromSession();
-        return $mp;
-    }
-
-    /**
-     * returns a MultiPersonSearch object.
-     *
-     * @param string name of the object
-     *
-     * @return MultiPersonSearch
-     */
-    public static function get($name)
-    {
-        $mp = new MultiPersonSearch($name);
-        return $mp;
-    }
-
-    /**
-     * contsructs a new MultiPersonSearch object.
-     *
-     * @param string name of the object and html ids
-     */
-    public function __construct($name)
-    {
-       $this->name = $name;
-       $_SESSION['multipersonsearch'][$this->name]['lastUse'] = time();
-       $this->collectGarbage();
-       $this->setDefaultValues();
-
-    }
-
-    /**
-     * returns the newly added persons. The array will contain all
-     * persons which are selected (on the right side of the dialog) but
-     * without the defaultSelectedUsers.
-     *
-     * @return array containing all new persons
-     */
-    public function getAddedUsers() {
-        return $_SESSION['multipersonsearch'][$this->name]['added'] ?? [];
-    }
-
-    /**
-     * saves the added persons to $_SESSION.
-     */
-    public function saveAddedUsersToSession() {
-        $addedUsers = [];
-        foreach (Request::optionArray($this->name . '_selectbox') as $selected) {
-            if (!in_array($selected, $_SESSION['multipersonsearch'][$this->name]['defaultSelectedUsersIDs'])) {
-                $addedUsers[] = $selected;
-            }
-        }
-        $_SESSION['multipersonsearch'][$this->name]['added'] = $addedUsers;
-        $_SESSION['multipersonsearch'][$this->name]['additional'] = Request::optionArray('additional');
-    }
-
-    /**
-     * returns the removed persons. The array will contain all
-     * persons which were selected by default (on the right side of the
-     * dialog) and then removed by the user.
-     *
-     * @return array containing all removed persons
-     */
-    public function getRemovedUsers() {
-        return $_SESSION['multipersonsearch'][$this->name]['removed'];
-    }
-
-    /**
-     * saves the removed persons to $_SESSION.
-     */
-    public function saveRemovedUsersToSession() {
-        $removedUsers = [];
-        foreach ($this->defaultSelectedUsersIDs as $default) {
-            if (!in_array($default, Request::optionArray($this->name . '_selectbox'))) {
-                $removedUsers[] = $default;
-            }
-        }
-        $_SESSION['multipersonsearch'][$this->name]['removed'] =  $removedUsers;
-    }
-
-    /**
-     * renders a link to open the multipersonsearch dialog.
-     *
-     * @param string $with_link_text include link text in output
-     */
-    public function render($with_link_text = true) {
-        $template = $GLOBALS['template_factory']->open('multipersonsearch/link.php');
-
-        $template->set_attribute('linkIconPath', $this->linkIconPath);
-        $template->set_attribute('linkText', $with_link_text ? $this->linkText : '');
-        $template->set_attribute('title', $this->title);
-        $template->set_attribute('name', $this->name);
-        $template->set_attribute('description', $this->description);
-        $template->set_attribute('executeURL', $this->executeURL);
-        $template->set_attribute('jsFunction', $this->jsFunction);
-        $this->storeToSession();
-        return $template->render();
-    }
-
-    /**
-     * sets the icon of the link to open the dialog. To hide the icon an
-     * empty string can be set.
-     *
-     * @param string path ot the icon
-     *
-     * @return MultiPersonSearch
-     */
-    public function setLinkIconPath($path) {
-        $this->linkIconPath = $path;
-
-        return $this;
-    }
-
-    /**
-     * returns the icon of the link to open the dialog.
-     *
-     * @return string path ot the icon.
-     */
-    public function getLinkIconPath() {
-        return $this->linkIconPath;
-    }
-
-    /**
-     * sets the link text of the link to open the dialog. To hide the
-     * text an empty string can be set.
-     *
-     * @param string text of the link
-     *
-     * @return MultiPersonSearch
-     *
-     */
-    public function setLinkText($text = "") {
-        $this->linkText = $text;
-
-        return $this;
-    }
-
-    /**
-     * returns the link text of the link.
-     *
-     * @return string text of the link.
-     */
-    public function getLinkText() {
-        return $this->linkText;
-    }
-
-    /**
-     * sets the action which will handle the added and removed persons after saving the dialog.
-     *
-     * @param string action
-     *
-     * @return MultiPersonSearch
-     */
-    public function setExecuteURL($action) {
-        $this->executeURL = $action;
-
-        return $this;
-    }
-
-    /**
-     * returns the action which will handle the added and removed persons after saving the dialog.
-     *
-     * @return string action which will handle the form data.
-     */
-    public function getExecuteURL() {
-        return $this->executeURL;
-    }
-
-    /**
-     * sets a JavaScript-function to be fired when the user has pressed the submit-button.
-     * Arguments are:
-     * function fireme(id_of_item, text_of_item)
-     * example setting: MPS->setJSFunctionOnSubmit('fireme');
-     *
-     * @param string $function_name the name of the javascript function
-     *
-     * @return MultiPersonSearch
-     */
-    public function setJSFunctionOnSubmit($function_name)
-    {
-        $this->jsFunction = $function_name;
-        return $this;
-    }
-
-    /**
-     * returns a JavaScript-function which should be fired when the user has pressed the submit button.
-     *
-     * @return string function name
-     */
-    public function getJSFunctionOnSubmit()
-    {
-        return $this->jsFunction;
-    }
-
-    /**
-     * sets the search object.
-     *
-     * @param SearchType object of type SearchType (e.g. SQLSearch.class.php)
-     *
-     * @return MultiPersonSearch
-     */
-    public function setSearchObject($searchType) {
-        $this->searchObject = $searchType;
-
-        return $this;
-    }
-
-    /**
-     * returns the search object.
-     *
-     * @return SearchType
-     */
-    public function getSearchObject() {
-        return $this->searchObject;
-    }
-
-    /**
-     * sets html code which will be shown inside the form element.
-     *
-     * @param string html code
-     *
-     * @return MultiPersonSearch
-     */
-    public function setAdditionalHTML($html) {
-        $this->additionalHMTL = $html;
-
-        return $this;
-    }
-
-
-    /**
-     * enables or disabled data-dialog
-     * @param boolean $status
-     * @return $this
-     */
-    public function setDataDialogStatus($status) {
-        $this->dataDialogStatus = $status;
-
-        return $this;
-    }
-
-    /**
-     * returns if data-dialog is enabled or disabled
-     * @return bool
-     */
-    public function getDataDialogStatus() {
-        return $this->dataDialogStatus;
-    }
-    /**
-     * returns html code which will be shown inside the form element.
-     *
-     * @return string html code
-     */
-    public function getAdditionHTML() {
-        return $this->additionalHMTL;
-    }
-
-    /**
-     * returns an additional option array.
-     *
-     * @return string html code
-     */
-    public function getAdditionalOptionArray() {
-        return $_SESSION['multipersonsearch'][$this->name]['additional'];
-    }
-
-    /**
-     * sets the persons which will be shown as selectable by default on
-     * the left side of the dialoag.
-     *
-     * @param array array containing user-ids
-     */
-    public function setDefaultSelectableUser($userArray) {
-        $userArray = array_unique($userArray);
-        $this->defaultSelectableUsersIDs = [];
-        if (is_array($userArray)) {
-            foreach ($userArray as $userId) {
-                $this->defaultSelectableUsersIDs[] = $userId;
-            }
-        }
-        return $this;
-    }
-    /**
-     * returns the ids of defaultselectable users.
-     *
-     * @return array
-     */
-    public function getDefaultSelectableUsersIDs() {
-        return $this->defaultSelectableUsersIDs;
-    }
-
-    /**
-     * sets the persons which will be shown as selected by default on
-     * the right side of the dialoag.
-     *
-     * @param array array containing user-ids
-     */
-    public function setDefaultSelectedUser($userArray) {
-        $userArray = array_unique($userArray);
-        $this->defaultSelectedUsersIDs = [];
-        if (is_array($userArray)) {
-            foreach ($userArray as $userId) {
-                $this->defaultSelectedUsersIDs[]  = $userId;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * returns the ids of defaultselected users.
-     *
-     * @return array
-     */
-    public function getDefaultSelectedUsersIDs() {
-        return $this->defaultSelectedUsersIDs;
-    }
-
-
-    /**
-     * sets the title of the dialog.
-     *
-     * @param string  $title title of the dialog
-     *
-     * @return MultiPersonSearch
-     */
-    public function setTitle($title) {
-        $this->title = $title;
-        return $this;
-    }
-
-    /**
-     * returns the title.
-     *
-     * @return string
-     */
-    public function getTitle() {
-        return $this->title;
-    }
-
-
-    /**
-     * sets the description of the dialog.
-     *
-     * @param string  $desc description of the dialog
-     *
-     * @return MultiPersonSearch
-     */
-    public function setDescription($desc) {
-        $this->description = $desc;
-        return $this;
-    }
-
-    /**
-     * returns the description.
-     *
-     * @return string
-     */
-    public function getDescription() {
-        return $this->description;
-    }
-
-    /**
-     * returns the url of the page where the GUI element is added.
-     *
-     * @return string
-     */
-    public function getPageUrl() {
-        return $this->pageURL;
-    }
-
-    /**
-     * adds a new quickfilter.
-     *
-     * @param string $title title of the new quickfilter
-     * @param array $userArray containing all user-ids belonging to the quickfilter
-     *
-     * @return MultiPersonSearch
-     */
-    public function addQuickfilter($title, $userArray) {
-        $users = [];
-        $usersIds = [];
-        if (is_array($userArray)) {
-            foreach ($userArray as $userId) {
-                $usersIds[]  = $userId;
-            }
-        }
-        $this->quickfilterIds[(string) $title] = $usersIds;
-
-        return $this;
-    }
-
-    /**
-     * returns the ids of quickfilters.
-     *
-     * @return array
-     */
-    public function getQuickfilterIds()
-    {
-        return $this->quickfilterIds ?: [];
-    }
-
-    /**
-     * clears all quickfilters.
-     *
-     * @return MultiPersonSearch
-     */
-    public function clearQuickfilters() {
-        $this->quickfilterIds = [];
-
-        return $this;
-    }
-
-    /**
-     * sets the navigation item.
-     *
-     * @param string  $navigationItem navigation item
-     *
-     * @return MultiPersonSearch
-     */
-    public function setNavigationItem($navigationItem) {
-        $this->navigationItem = $navigationItem;
-
-        return $this;
-    }
-
-    /**
-     * returns the navigation item.
-     *
-     * @return string
-     */
-    public function getNavigationItem() {
-        return $this->navigationItem;
-    }
-
-    /**
-     * stores the internal data to a session.
-     */
-    public function storeToSession() {
-        $_SESSION['multipersonsearch'][$this->name]['title'] = $this->title;
-        $_SESSION['multipersonsearch'][$this->name]['description'] = $this->description;
-        $_SESSION['multipersonsearch'][$this->name]['additionalHMTL'] = $this->additionalHMTL;
-        $_SESSION['multipersonsearch'][$this->name]['executeURL'] = $this->executeURL;
-        $_SESSION['multipersonsearch'][$this->name]['jsFunction'] = $this->jsFunction;
-        $_SESSION['multipersonsearch'][$this->name]['pageURL'] = Request::url();
-        $_SESSION['multipersonsearch'][$this->name]['defaultSelectableUsersIDs'] = $this->defaultSelectableUsersIDs;
-        $_SESSION['multipersonsearch'][$this->name]['defaultSelectedUsersIDs'] = $this->defaultSelectedUsersIDs;
-        $_SESSION['multipersonsearch'][$this->name]['quickfilterIds'] = $this->quickfilterIds;
-        $_SESSION['multipersonsearch'][$this->name]['searchObject'] = serialize($this->searchObject);
-        $_SESSION['multipersonsearch'][$this->name]['navigationItem'] = $this->navigationItem;
-        $_SESSION['multipersonsearch'][$this->name]['dataDialogStatus'] = $this->dataDialogStatus;
-    }
-
-    /**
-     * restores the internal data from a session.
-     */
-    public function restoreFromSession() {
-        if (isset($_SESSION['multipersonsearch'][$this->name])) {
-            $this->title = $_SESSION['multipersonsearch'][$this->name]['title'] ?? '';
-            $this->description = $_SESSION['multipersonsearch'][$this->name]['description'] ?? '';
-            $this->quickfilterIds = $_SESSION['multipersonsearch'][$this->name]['quickfilterIds'] ?? [];
-            $this->additionalHMTL = $_SESSION['multipersonsearch'][$this->name]['additionalHMTL'] ?? '';
-            $this->executeURL = html_entity_decode($_SESSION['multipersonsearch'][$this->name]['executeURL'] ?? '');
-            $this->jsFunction = $_SESSION['multipersonsearch'][$this->name]['jsFunction'] ?? '';
-            $this->pageURL = $_SESSION['multipersonsearch'][$this->name]['pageURL'] ?? '';
-            $this->defaultSelectableUsersIDs = $_SESSION['multipersonsearch'][$this->name]['defaultSelectableUsersIDs'] ?? [];
-            $this->defaultSelectedUsersIDs = $_SESSION['multipersonsearch'][$this->name]['defaultSelectedUsersIDs'] ?? [];
-            $this->searchObject = unserialize($_SESSION['multipersonsearch'][$this->name]['searchObject'] ?? null);
-            $this->navigationItem = $_SESSION['multipersonsearch'][$this->name]['navigationItem'] ?? null;
-            $this->dataDialogStatus = $_SESSION['multipersonsearch'][$this->name]['dataDialogStatus'] ?? '';
-        }
-    }
-
-    /**
-     * clears the session data.
-     */
-    public function clearSession() {
-        unset($_SESSION['multipersonsearch'][$this->name]);
-    }
-
-    /**
-     * sets default values of the internal variables.
-     */
-    private function setDefaultValues() {
-        $this->title = '';
-        $this->description = _('Bitte wählen Sie aus, wen Sie hinzufügen möchten.');
-        $this->linkIconPath = Icon::create('add');
-    }
-
-    /**
-     * clear unused sessions.
-     */
-    private function collectGarbage() {
-        $maxLifeTime = 30; // minutes
-        foreach ($_SESSION['multipersonsearch'] as $key=>$value) {
-            if (time() - $value['lastUse'] > $maxLifeTime * 60) {
-                unset($_SESSION['multipersonsearch'][$key]);
-            }
-        }
-    }
-
-}
diff --git a/lib/classes/MultiPersonSearch.php b/lib/classes/MultiPersonSearch.php
new file mode 100644
index 0000000..af10e6b
--- /dev/null
+++ b/lib/classes/MultiPersonSearch.php
@@ -0,0 +1,548 @@
+<?php
+/**
+ * MultiPersonSearch.class.php
+ *
+ * This class provides a GUI-element for searching, adding and removing
+ * multiple persons. If JavaScript is enabled the GUI-element is shown
+ * as a dialog on the current page. Otherwise the GUI-element is shown
+ * on a separate page.
+ *
+ * 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
+ * he License, or (at your option) any later version.
+ *
+ * @author      Sebastian Hobert <sebastian.hobert@uni-goettingen.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @link        http://docs.studip.de/develop/Entwickler/MultiPersonSearch
+ */
+class MultiPersonSearch {
+
+    private $name;
+    private $linkIconPath = "";
+    private $linkText = "";
+    private $title = "";
+    private $description = "";
+    private $executeURL;
+    private $jsFunction = null;
+    private $pageURL = null;
+    private $quickfilterIds = [];
+    private $defaultSelectableUsersIDs = [];
+    private $defaultSelectedUsersIDs = [];
+    private $searchObject = null;
+    private $additionalHMTL = "";
+    private $navigationItem = "";
+    private $dataDialogStatus = false;
+
+    /**
+     * restores a MultiPersonSearch object.
+     *
+     * @param string name of the object
+     *
+     * @return MultiPersonSearch
+     */
+    public static function load($name)
+    {
+        $mp = new MultiPersonSearch($name);
+        $mp->restoreFromSession();
+        return $mp;
+    }
+
+    /**
+     * returns a MultiPersonSearch object.
+     *
+     * @param string name of the object
+     *
+     * @return MultiPersonSearch
+     */
+    public static function get($name)
+    {
+        $mp = new MultiPersonSearch($name);
+        return $mp;
+    }
+
+    /**
+     * contsructs a new MultiPersonSearch object.
+     *
+     * @param string name of the object and html ids
+     */
+    public function __construct($name)
+    {
+       $this->name = $name;
+       $_SESSION['multipersonsearch'][$this->name]['lastUse'] = time();
+       $this->collectGarbage();
+       $this->setDefaultValues();
+
+    }
+
+    /**
+     * returns the newly added persons. The array will contain all
+     * persons which are selected (on the right side of the dialog) but
+     * without the defaultSelectedUsers.
+     *
+     * @return array containing all new persons
+     */
+    public function getAddedUsers() {
+        return $_SESSION['multipersonsearch'][$this->name]['added'] ?? [];
+    }
+
+    /**
+     * saves the added persons to $_SESSION.
+     */
+    public function saveAddedUsersToSession() {
+        $addedUsers = [];
+        foreach (Request::optionArray($this->name . '_selectbox') as $selected) {
+            if (!in_array($selected, $_SESSION['multipersonsearch'][$this->name]['defaultSelectedUsersIDs'])) {
+                $addedUsers[] = $selected;
+            }
+        }
+        $_SESSION['multipersonsearch'][$this->name]['added'] = $addedUsers;
+        $_SESSION['multipersonsearch'][$this->name]['additional'] = Request::optionArray('additional');
+    }
+
+    /**
+     * returns the removed persons. The array will contain all
+     * persons which were selected by default (on the right side of the
+     * dialog) and then removed by the user.
+     *
+     * @return array containing all removed persons
+     */
+    public function getRemovedUsers() {
+        return $_SESSION['multipersonsearch'][$this->name]['removed'];
+    }
+
+    /**
+     * saves the removed persons to $_SESSION.
+     */
+    public function saveRemovedUsersToSession() {
+        $removedUsers = [];
+        foreach ($this->defaultSelectedUsersIDs as $default) {
+            if (!in_array($default, Request::optionArray($this->name . '_selectbox'))) {
+                $removedUsers[] = $default;
+            }
+        }
+        $_SESSION['multipersonsearch'][$this->name]['removed'] =  $removedUsers;
+    }
+
+    /**
+     * renders a link to open the multipersonsearch dialog.
+     *
+     * @param string $with_link_text include link text in output
+     */
+    public function render($with_link_text = true) {
+        $template = $GLOBALS['template_factory']->open('multipersonsearch/link.php');
+
+        $template->set_attribute('linkIconPath', $this->linkIconPath);
+        $template->set_attribute('linkText', $with_link_text ? $this->linkText : '');
+        $template->set_attribute('title', $this->title);
+        $template->set_attribute('name', $this->name);
+        $template->set_attribute('description', $this->description);
+        $template->set_attribute('executeURL', $this->executeURL);
+        $template->set_attribute('jsFunction', $this->jsFunction);
+        $this->storeToSession();
+        return $template->render();
+    }
+
+    /**
+     * sets the icon of the link to open the dialog. To hide the icon an
+     * empty string can be set.
+     *
+     * @param string path ot the icon
+     *
+     * @return MultiPersonSearch
+     */
+    public function setLinkIconPath($path) {
+        $this->linkIconPath = $path;
+
+        return $this;
+    }
+
+    /**
+     * returns the icon of the link to open the dialog.
+     *
+     * @return string path ot the icon.
+     */
+    public function getLinkIconPath() {
+        return $this->linkIconPath;
+    }
+
+    /**
+     * sets the link text of the link to open the dialog. To hide the
+     * text an empty string can be set.
+     *
+     * @param string text of the link
+     *
+     * @return MultiPersonSearch
+     *
+     */
+    public function setLinkText($text = "") {
+        $this->linkText = $text;
+
+        return $this;
+    }
+
+    /**
+     * returns the link text of the link.
+     *
+     * @return string text of the link.
+     */
+    public function getLinkText() {
+        return $this->linkText;
+    }
+
+    /**
+     * sets the action which will handle the added and removed persons after saving the dialog.
+     *
+     * @param string action
+     *
+     * @return MultiPersonSearch
+     */
+    public function setExecuteURL($action) {
+        $this->executeURL = $action;
+
+        return $this;
+    }
+
+    /**
+     * returns the action which will handle the added and removed persons after saving the dialog.
+     *
+     * @return string action which will handle the form data.
+     */
+    public function getExecuteURL() {
+        return $this->executeURL;
+    }
+
+    /**
+     * sets a JavaScript-function to be fired when the user has pressed the submit-button.
+     * Arguments are:
+     * function fireme(id_of_item, text_of_item)
+     * example setting: MPS->setJSFunctionOnSubmit('fireme');
+     *
+     * @param string $function_name the name of the javascript function
+     *
+     * @return MultiPersonSearch
+     */
+    public function setJSFunctionOnSubmit($function_name)
+    {
+        $this->jsFunction = $function_name;
+        return $this;
+    }
+
+    /**
+     * returns a JavaScript-function which should be fired when the user has pressed the submit button.
+     *
+     * @return string function name
+     */
+    public function getJSFunctionOnSubmit()
+    {
+        return $this->jsFunction;
+    }
+
+    /**
+     * sets the search object.
+     *
+     * @param SearchType object of type SearchType (e.g. SQLSearch.class.php)
+     *
+     * @return MultiPersonSearch
+     */
+    public function setSearchObject($searchType) {
+        $this->searchObject = $searchType;
+
+        return $this;
+    }
+
+    /**
+     * returns the search object.
+     *
+     * @return SearchType
+     */
+    public function getSearchObject() {
+        return $this->searchObject;
+    }
+
+    /**
+     * sets html code which will be shown inside the form element.
+     *
+     * @param string html code
+     *
+     * @return MultiPersonSearch
+     */
+    public function setAdditionalHTML($html) {
+        $this->additionalHMTL = $html;
+
+        return $this;
+    }
+
+
+    /**
+     * enables or disabled data-dialog
+     * @param boolean $status
+     * @return $this
+     */
+    public function setDataDialogStatus($status) {
+        $this->dataDialogStatus = $status;
+
+        return $this;
+    }
+
+    /**
+     * returns if data-dialog is enabled or disabled
+     * @return bool
+     */
+    public function getDataDialogStatus() {
+        return $this->dataDialogStatus;
+    }
+    /**
+     * returns html code which will be shown inside the form element.
+     *
+     * @return string html code
+     */
+    public function getAdditionHTML() {
+        return $this->additionalHMTL;
+    }
+
+    /**
+     * returns an additional option array.
+     *
+     * @return string html code
+     */
+    public function getAdditionalOptionArray() {
+        return $_SESSION['multipersonsearch'][$this->name]['additional'];
+    }
+
+    /**
+     * sets the persons which will be shown as selectable by default on
+     * the left side of the dialoag.
+     *
+     * @param array array containing user-ids
+     */
+    public function setDefaultSelectableUser($userArray) {
+        $userArray = array_unique($userArray);
+        $this->defaultSelectableUsersIDs = [];
+        if (is_array($userArray)) {
+            foreach ($userArray as $userId) {
+                $this->defaultSelectableUsersIDs[] = $userId;
+            }
+        }
+        return $this;
+    }
+    /**
+     * returns the ids of defaultselectable users.
+     *
+     * @return array
+     */
+    public function getDefaultSelectableUsersIDs() {
+        return $this->defaultSelectableUsersIDs;
+    }
+
+    /**
+     * sets the persons which will be shown as selected by default on
+     * the right side of the dialoag.
+     *
+     * @param array array containing user-ids
+     */
+    public function setDefaultSelectedUser($userArray) {
+        $userArray = array_unique($userArray);
+        $this->defaultSelectedUsersIDs = [];
+        if (is_array($userArray)) {
+            foreach ($userArray as $userId) {
+                $this->defaultSelectedUsersIDs[]  = $userId;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * returns the ids of defaultselected users.
+     *
+     * @return array
+     */
+    public function getDefaultSelectedUsersIDs() {
+        return $this->defaultSelectedUsersIDs;
+    }
+
+
+    /**
+     * sets the title of the dialog.
+     *
+     * @param string  $title title of the dialog
+     *
+     * @return MultiPersonSearch
+     */
+    public function setTitle($title) {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * returns the title.
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return $this->title;
+    }
+
+
+    /**
+     * sets the description of the dialog.
+     *
+     * @param string  $desc description of the dialog
+     *
+     * @return MultiPersonSearch
+     */
+    public function setDescription($desc) {
+        $this->description = $desc;
+        return $this;
+    }
+
+    /**
+     * returns the description.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return $this->description;
+    }
+
+    /**
+     * returns the url of the page where the GUI element is added.
+     *
+     * @return string
+     */
+    public function getPageUrl() {
+        return $this->pageURL;
+    }
+
+    /**
+     * adds a new quickfilter.
+     *
+     * @param string $title title of the new quickfilter
+     * @param array $userArray containing all user-ids belonging to the quickfilter
+     *
+     * @return MultiPersonSearch
+     */
+    public function addQuickfilter($title, $userArray) {
+        $users = [];
+        $usersIds = [];
+        if (is_array($userArray)) {
+            foreach ($userArray as $userId) {
+                $usersIds[]  = $userId;
+            }
+        }
+        $this->quickfilterIds[(string) $title] = $usersIds;
+
+        return $this;
+    }
+
+    /**
+     * returns the ids of quickfilters.
+     *
+     * @return array
+     */
+    public function getQuickfilterIds()
+    {
+        return $this->quickfilterIds ?: [];
+    }
+
+    /**
+     * clears all quickfilters.
+     *
+     * @return MultiPersonSearch
+     */
+    public function clearQuickfilters() {
+        $this->quickfilterIds = [];
+
+        return $this;
+    }
+
+    /**
+     * sets the navigation item.
+     *
+     * @param string  $navigationItem navigation item
+     *
+     * @return MultiPersonSearch
+     */
+    public function setNavigationItem($navigationItem) {
+        $this->navigationItem = $navigationItem;
+
+        return $this;
+    }
+
+    /**
+     * returns the navigation item.
+     *
+     * @return string
+     */
+    public function getNavigationItem() {
+        return $this->navigationItem;
+    }
+
+    /**
+     * stores the internal data to a session.
+     */
+    public function storeToSession() {
+        $_SESSION['multipersonsearch'][$this->name]['title'] = $this->title;
+        $_SESSION['multipersonsearch'][$this->name]['description'] = $this->description;
+        $_SESSION['multipersonsearch'][$this->name]['additionalHMTL'] = $this->additionalHMTL;
+        $_SESSION['multipersonsearch'][$this->name]['executeURL'] = $this->executeURL;
+        $_SESSION['multipersonsearch'][$this->name]['jsFunction'] = $this->jsFunction;
+        $_SESSION['multipersonsearch'][$this->name]['pageURL'] = Request::url();
+        $_SESSION['multipersonsearch'][$this->name]['defaultSelectableUsersIDs'] = $this->defaultSelectableUsersIDs;
+        $_SESSION['multipersonsearch'][$this->name]['defaultSelectedUsersIDs'] = $this->defaultSelectedUsersIDs;
+        $_SESSION['multipersonsearch'][$this->name]['quickfilterIds'] = $this->quickfilterIds;
+        $_SESSION['multipersonsearch'][$this->name]['searchObject'] = serialize($this->searchObject);
+        $_SESSION['multipersonsearch'][$this->name]['navigationItem'] = $this->navigationItem;
+        $_SESSION['multipersonsearch'][$this->name]['dataDialogStatus'] = $this->dataDialogStatus;
+    }
+
+    /**
+     * restores the internal data from a session.
+     */
+    public function restoreFromSession() {
+        if (isset($_SESSION['multipersonsearch'][$this->name])) {
+            $this->title = $_SESSION['multipersonsearch'][$this->name]['title'] ?? '';
+            $this->description = $_SESSION['multipersonsearch'][$this->name]['description'] ?? '';
+            $this->quickfilterIds = $_SESSION['multipersonsearch'][$this->name]['quickfilterIds'] ?? [];
+            $this->additionalHMTL = $_SESSION['multipersonsearch'][$this->name]['additionalHMTL'] ?? '';
+            $this->executeURL = html_entity_decode($_SESSION['multipersonsearch'][$this->name]['executeURL'] ?? '');
+            $this->jsFunction = $_SESSION['multipersonsearch'][$this->name]['jsFunction'] ?? '';
+            $this->pageURL = $_SESSION['multipersonsearch'][$this->name]['pageURL'] ?? '';
+            $this->defaultSelectableUsersIDs = $_SESSION['multipersonsearch'][$this->name]['defaultSelectableUsersIDs'] ?? [];
+            $this->defaultSelectedUsersIDs = $_SESSION['multipersonsearch'][$this->name]['defaultSelectedUsersIDs'] ?? [];
+            $this->searchObject = unserialize($_SESSION['multipersonsearch'][$this->name]['searchObject'] ?? null);
+            $this->navigationItem = $_SESSION['multipersonsearch'][$this->name]['navigationItem'] ?? null;
+            $this->dataDialogStatus = $_SESSION['multipersonsearch'][$this->name]['dataDialogStatus'] ?? '';
+        }
+    }
+
+    /**
+     * clears the session data.
+     */
+    public function clearSession() {
+        unset($_SESSION['multipersonsearch'][$this->name]);
+    }
+
+    /**
+     * sets default values of the internal variables.
+     */
+    private function setDefaultValues() {
+        $this->title = '';
+        $this->description = _('Bitte wählen Sie aus, wen Sie hinzufügen möchten.');
+        $this->linkIconPath = Icon::create('add');
+    }
+
+    /**
+     * clear unused sessions.
+     */
+    private function collectGarbage() {
+        $maxLifeTime = 30; // minutes
+        foreach ($_SESSION['multipersonsearch'] as $key=>$value) {
+            if (time() - $value['lastUse'] > $maxLifeTime * 60) {
+                unset($_SESSION['multipersonsearch'][$key]);
+            }
+        }
+    }
+
+}
diff --git a/lib/classes/NotificationCenter.class.php b/lib/classes/NotificationCenter.class.php
deleted file mode 100644
index aaaa9e8..0000000
--- a/lib/classes/NotificationCenter.class.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-# Lifter010: TODO
-/*
- * NotificationCenter.class.php - NotificationCenter class
- *
- * Copyright (c) 2009  Elmar Ludwig
- *
- * 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.
- */
-
-// ########################################################################
-//  MODULE DEFINITION
-/** @defgroup notifications Notifications */
-
-/**
- * Special Exception that can be thrown to veto an announced change.
- * Only some types of events support this (see documentation).
- */
-class NotificationVetoException extends Exception
-{
-}
-
-/**
- * The NotificationCenter class is the central event dispatcher
- * for Stud.IP. Objects interested in receiving notifications for
- * particular events need to register with the NotificationCenter:
- *
- * NotificationCenter::addObserver($this, 'update', 'shutdown');
- *
- * Event notifications are sent via the postNotification() method:
- *
- * NotificationCenter::postNotification('shutdown', $sender);
- */
-class NotificationCenter
-{
-    /**
-     * array of registered notification observers
-     */
-    private static $observers = [];
-
-    /**
-     * Register an object to be notified. The same object may be
-     * registered several times (e.g. for different notifications).
-     * The event name may contain shell-style wildcards (like '*').
-     *
-     * @param object $observer  object to be notified
-     * @param string $method    method that will be called
-     * @param string $event     name of event (may be NULL)
-     * @param mixed  $object    subject to observe (may be NULL)
-     */
-    public static function addObserver($observer, $method, $event, $object = NULL)
-    {
-        if ($event === NULL) {
-            $event = '';
-        }
-
-        $predicate = null;
-
-        if ($object) {
-            $predicate = is_callable($object)
-                ? $object
-                : function ($other) use ($object) {
-                    return $object === $other;
-                  };
-        }
-
-        self::$observers[$event][] = [
-            'predicate' => $predicate,
-            'observer'  => [$observer, $method]
-        ];
-    }
-
-    /**
-     * Remove an object registered with the NotificationCenter.
-     * Trying to remove an observer that was not registered is
-     * allowed and has no effect.
-     *
-     * @param object $observer  object to be removed
-     * @param string $event     name of event (may be NULL)
-     * @param mixed  $object    subject to observe (may be NULL)
-     */
-    public static function removeObserver($observer, $event = NULL, $object = NULL)
-    {
-        if ($event === NULL) {
-            $events = array_keys(self::$observers);
-        } else if (isset(self::$observers[$event])) {
-            $events = [$event];
-        } else {
-            return;
-        }
-
-        foreach ($events as $event) {
-            foreach (self::$observers[$event] as $index => $list) {
-                if ($object === NULL
-                    || $list['predicate'] && $list['predicate']($object)) {
-
-                    if ($list['observer'][0] === $observer) {
-                        unset(self::$observers[$event][$index]);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Post an event notification to all registered observers.
-     * Only observers registered for this event type and subject
-     * are notified.
-     *
-     * @param string $event     name of this notification
-     * @param mixed  $object    subject of this notification
-     * @param mixed  $user_data additional information (optional)
-     *
-     * @throws NotificationVetoException  on observer veto
-     */
-    public static function postNotification($event, $object, $user_data = null)
-    {
-        $current_observers = [];
-        foreach (self::$observers as $e => $l) {
-            if ($e === '' || fnmatch($e, $event, FNM_NOESCAPE)) {
-                $current_observers = array_merge($current_observers, $l);
-            }
-        }
-
-        foreach ($current_observers as $list) {
-            if (!$list['predicate'] || $list['predicate']($object)) {
-                call_user_func($list['observer'], $event, $object, $user_data);
-            }
-        }
-    }
-
-    /**
-     * Convenience method that uses a jQuery like structure for event
-     * registration by closures.
-     *
-     * @param string   $event
-     * @param Callable $callback
-     * @param mixed    $object
-     * @since Stud.IP 4.2
-     */
-    public static function on($event, Callable $callback, $object = null)
-    {
-        if ($callback instanceof Closure || is_object($callback)) {
-            static::addObserver($callback, '__invoke', $event, $object);
-        } elseif (is_array($callback)) {
-            static::addObserver($callback[0], $callback[1], $event, $object);
-        } elseif (is_string($callback)) {
-            throw new Exception('Strings as callable may not be passed to ' . __METHOD__);
-        }
-    }
-
-    /**
-     * Convenience method that uses a jQuery like structure for event
-     * unregistration by closures.
-     *
-     * @param string   $event
-     * @param Callable $callback
-     * @param mixed    $object
-     * @since Stud.IP 4.2
-     */
-    public static function off($event, Callable $callback, $object = null)
-    {
-        if ($callback instanceof Closure || is_object($callback)) {
-            static::removeObserver($callback, $event, $object);
-        } elseif (is_array($callback)) {
-            static::removeObserver($callback[0], $event, $object);
-        } elseif (is_string($callback)) {
-            throw new Exception('Strings as callable may not be passed to ' . __METHOD__);
-        }
-    }
-}
diff --git a/lib/classes/NotificationCenter.php b/lib/classes/NotificationCenter.php
new file mode 100644
index 0000000..aaaa9e8
--- /dev/null
+++ b/lib/classes/NotificationCenter.php
@@ -0,0 +1,174 @@
+<?php
+# Lifter010: TODO
+/*
+ * NotificationCenter.class.php - NotificationCenter class
+ *
+ * Copyright (c) 2009  Elmar Ludwig
+ *
+ * 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.
+ */
+
+// ########################################################################
+//  MODULE DEFINITION
+/** @defgroup notifications Notifications */
+
+/**
+ * Special Exception that can be thrown to veto an announced change.
+ * Only some types of events support this (see documentation).
+ */
+class NotificationVetoException extends Exception
+{
+}
+
+/**
+ * The NotificationCenter class is the central event dispatcher
+ * for Stud.IP. Objects interested in receiving notifications for
+ * particular events need to register with the NotificationCenter:
+ *
+ * NotificationCenter::addObserver($this, 'update', 'shutdown');
+ *
+ * Event notifications are sent via the postNotification() method:
+ *
+ * NotificationCenter::postNotification('shutdown', $sender);
+ */
+class NotificationCenter
+{
+    /**
+     * array of registered notification observers
+     */
+    private static $observers = [];
+
+    /**
+     * Register an object to be notified. The same object may be
+     * registered several times (e.g. for different notifications).
+     * The event name may contain shell-style wildcards (like '*').
+     *
+     * @param object $observer  object to be notified
+     * @param string $method    method that will be called
+     * @param string $event     name of event (may be NULL)
+     * @param mixed  $object    subject to observe (may be NULL)
+     */
+    public static function addObserver($observer, $method, $event, $object = NULL)
+    {
+        if ($event === NULL) {
+            $event = '';
+        }
+
+        $predicate = null;
+
+        if ($object) {
+            $predicate = is_callable($object)
+                ? $object
+                : function ($other) use ($object) {
+                    return $object === $other;
+                  };
+        }
+
+        self::$observers[$event][] = [
+            'predicate' => $predicate,
+            'observer'  => [$observer, $method]
+        ];
+    }
+
+    /**
+     * Remove an object registered with the NotificationCenter.
+     * Trying to remove an observer that was not registered is
+     * allowed and has no effect.
+     *
+     * @param object $observer  object to be removed
+     * @param string $event     name of event (may be NULL)
+     * @param mixed  $object    subject to observe (may be NULL)
+     */
+    public static function removeObserver($observer, $event = NULL, $object = NULL)
+    {
+        if ($event === NULL) {
+            $events = array_keys(self::$observers);
+        } else if (isset(self::$observers[$event])) {
+            $events = [$event];
+        } else {
+            return;
+        }
+
+        foreach ($events as $event) {
+            foreach (self::$observers[$event] as $index => $list) {
+                if ($object === NULL
+                    || $list['predicate'] && $list['predicate']($object)) {
+
+                    if ($list['observer'][0] === $observer) {
+                        unset(self::$observers[$event][$index]);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Post an event notification to all registered observers.
+     * Only observers registered for this event type and subject
+     * are notified.
+     *
+     * @param string $event     name of this notification
+     * @param mixed  $object    subject of this notification
+     * @param mixed  $user_data additional information (optional)
+     *
+     * @throws NotificationVetoException  on observer veto
+     */
+    public static function postNotification($event, $object, $user_data = null)
+    {
+        $current_observers = [];
+        foreach (self::$observers as $e => $l) {
+            if ($e === '' || fnmatch($e, $event, FNM_NOESCAPE)) {
+                $current_observers = array_merge($current_observers, $l);
+            }
+        }
+
+        foreach ($current_observers as $list) {
+            if (!$list['predicate'] || $list['predicate']($object)) {
+                call_user_func($list['observer'], $event, $object, $user_data);
+            }
+        }
+    }
+
+    /**
+     * Convenience method that uses a jQuery like structure for event
+     * registration by closures.
+     *
+     * @param string   $event
+     * @param Callable $callback
+     * @param mixed    $object
+     * @since Stud.IP 4.2
+     */
+    public static function on($event, Callable $callback, $object = null)
+    {
+        if ($callback instanceof Closure || is_object($callback)) {
+            static::addObserver($callback, '__invoke', $event, $object);
+        } elseif (is_array($callback)) {
+            static::addObserver($callback[0], $callback[1], $event, $object);
+        } elseif (is_string($callback)) {
+            throw new Exception('Strings as callable may not be passed to ' . __METHOD__);
+        }
+    }
+
+    /**
+     * Convenience method that uses a jQuery like structure for event
+     * unregistration by closures.
+     *
+     * @param string   $event
+     * @param Callable $callback
+     * @param mixed    $object
+     * @since Stud.IP 4.2
+     */
+    public static function off($event, Callable $callback, $object = null)
+    {
+        if ($callback instanceof Closure || is_object($callback)) {
+            static::removeObserver($callback, $event, $object);
+        } elseif (is_array($callback)) {
+            static::removeObserver($callback[0], $event, $object);
+        } elseif (is_string($callback)) {
+            throw new Exception('Strings as callable may not be passed to ' . __METHOD__);
+        }
+    }
+}
diff --git a/lib/classes/PrivacyObject.interface.php b/lib/classes/PrivacyObject.interface.php
deleted file mode 100644
index 8129634..0000000
--- a/lib/classes/PrivacyObject.interface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-interface PrivacyObject
-{
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage);
-}
diff --git a/lib/classes/PrivacyObject.php b/lib/classes/PrivacyObject.php
new file mode 100644
index 0000000..8129634
--- /dev/null
+++ b/lib/classes/PrivacyObject.php
@@ -0,0 +1,11 @@
+<?php
+interface PrivacyObject
+{
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage);
+}
diff --git a/lib/classes/QuestionType.interface.php b/lib/classes/QuestionType.interface.php
deleted file mode 100644
index 03019fe..0000000
--- a/lib/classes/QuestionType.interface.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Interface QuestionType
- * This is a question-object with a specific type. Note that an object of class QuestionType
- * is also always derived from SORM class 'QuestionnairQuestion'. So additionally to all methods
- * here, the QuestionType object also knows about the data-attribute from QuestionnaireQuestion
- * and what the Questionnaire-object is by calling $this->questionnaire.
- */
-interface QuestionType {
-
-    /**
-     * Returns a specific icon for this type of question. Note this is not bound to the
-     * object but called staticly.
-     * @return Icon the specific icon for this type of question
-     */
-    static public function getIcon(bool $active = false) : Icon;
-
-
-    /**
-     * Returns the shape of the icon that is used in vue.
-     * @return string
-     */
-    static public function getIconShape();
-
-    /**
-     * Returns the name of the type of question like "Frage" or "Test" or "Dateiablage"
-     * This name is not showed to the participant of the questionnaire, but to the editor.
-     * It might get displayed like "add another Frage to questionnaire", where 'Frage'
-     * is the name of the type.
-     * @return string : the name of this type of question.
-     */
-    static public function getName();
-
-    /**
-     * Returns an array with two parts: First one is the name of the component for editing the question. Second
-     * one is the import path of the component. Plugins can use this to get their component imported.
-     * @return Array
-     */
-    static public function getEditingComponent();
-
-    /**
-     * Usually the $questiondata is already in the correct format. But for some question types
-     * some data have to be manipulated by for example the HTML-purifier. So this takes
-     * the questiondata and changed them before they get stored.
-     * @param $questiondata
-     * @return mixed
-     */
-    public function beforeStoringQuestiondata($questiondata);
-
-    /**
-     * Display the question to the user. This template will be embedded into a
-     * html <form>-tag. Maybe more questions will appear in that form and maybe
-     * more questions of the same type. This is important to know, so that you
-     * prefix all the input-fields.
-     *
-     * Wrong: <input type="checkbox" name="anser_a" value="1" <?= Request::get("anser_a") ? " checked" : "" ?>">
-     *
-     * Right: <input type="checkbox" name="answer[<?= $this->getId() ?>][a]" value="1" <?= Request::getArray("answer")[$this->getId()]['a'] ? " checked" : "" ?>">
-     *
-     * Try to prefix all your input variables at least with the id of the question,
-     * so that they will never conflict with other variables.
-     *
-     * @return Flexi\Template
-     */
-    public function getDisplayTemplate();
-
-    /**
-     * Uses current user and Request-variables to create an answer for the question.
-     * Return this answer. It does not necessarily be stored to the database!
-     * @return QuestionnaireAnswer or derived
-     */
-    public function createAnswer();
-
-    /**
-     * In the evaluation of the questionnaire you can click on a certain answer and get the evaluation filtered
-     * by the the people that have given that answer. This method asks from the question, what user_ids have
-     * given the answer_option. Answer option could be anything that this question understands as an answer.
-     * @param $answer_option
-     * @return mixed
-     */
-    public function getUserIdsOfFilteredAnswer($answer_option);
-
-    /**
-     * Returns a template with the results of this question.
-     *
-     * @param $only_user_ids : array\null array of user_ids that the results should be restricted to.
-     *                         this is used to show only a subset of results to the user for
-     *                         visible evaluation of the results. If the questionnaire is anonymous
-     *                         just do nothing.
-     *
-     * @return Flexi\Template
-     */
-    public function getResultTemplate($only_user_ids = null);
-
-    /**
-     * This method is called to generate a csv-export from a whole questionnaire.
-     * The returned array looks like this:
-     *     array(
-     *         'Answer 1' => array('e7a0a84b161f3e8c09b4a0a2e8a58147' => "1", '7e81ec247c151c02ffd479511e24cc03' => "0"),
-     *         'Answer 2' => array('e7a0a84b161f3e8c09b4a0a2e8a58147' => "1", '7e81ec247c151c02ffd479511e24cc03' => "1")
-     *     )
-     * This is a two-dimensional array. The first array provides a set of answers. The values of
-     * this array are themselves arrays with the user_ids as indexes and the user's
-     * answers as the values. With this construction you can evaluate single-choice tests
-     * as well as multiple-choice tests.
-     * @return array : indexed with user_id and valued with the value of the answer.
-     *                 If your QuestionType allows more than one value (i.e. multiple-choice)
-     *                 you might need to serialize it.
-     */
-    public function getResultArray();
-
-    /**
-     * A method to be called after the questionnaire has ended.
-     * @return void
-     */
-    public function onEnding();
-}
diff --git a/lib/classes/QuestionType.php b/lib/classes/QuestionType.php
new file mode 100644
index 0000000..03019fe
--- /dev/null
+++ b/lib/classes/QuestionType.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Interface QuestionType
+ * This is a question-object with a specific type. Note that an object of class QuestionType
+ * is also always derived from SORM class 'QuestionnairQuestion'. So additionally to all methods
+ * here, the QuestionType object also knows about the data-attribute from QuestionnaireQuestion
+ * and what the Questionnaire-object is by calling $this->questionnaire.
+ */
+interface QuestionType {
+
+    /**
+     * Returns a specific icon for this type of question. Note this is not bound to the
+     * object but called staticly.
+     * @return Icon the specific icon for this type of question
+     */
+    static public function getIcon(bool $active = false) : Icon;
+
+
+    /**
+     * Returns the shape of the icon that is used in vue.
+     * @return string
+     */
+    static public function getIconShape();
+
+    /**
+     * Returns the name of the type of question like "Frage" or "Test" or "Dateiablage"
+     * This name is not showed to the participant of the questionnaire, but to the editor.
+     * It might get displayed like "add another Frage to questionnaire", where 'Frage'
+     * is the name of the type.
+     * @return string : the name of this type of question.
+     */
+    static public function getName();
+
+    /**
+     * Returns an array with two parts: First one is the name of the component for editing the question. Second
+     * one is the import path of the component. Plugins can use this to get their component imported.
+     * @return Array
+     */
+    static public function getEditingComponent();
+
+    /**
+     * Usually the $questiondata is already in the correct format. But for some question types
+     * some data have to be manipulated by for example the HTML-purifier. So this takes
+     * the questiondata and changed them before they get stored.
+     * @param $questiondata
+     * @return mixed
+     */
+    public function beforeStoringQuestiondata($questiondata);
+
+    /**
+     * Display the question to the user. This template will be embedded into a
+     * html <form>-tag. Maybe more questions will appear in that form and maybe
+     * more questions of the same type. This is important to know, so that you
+     * prefix all the input-fields.
+     *
+     * Wrong: <input type="checkbox" name="anser_a" value="1" <?= Request::get("anser_a") ? " checked" : "" ?>">
+     *
+     * Right: <input type="checkbox" name="answer[<?= $this->getId() ?>][a]" value="1" <?= Request::getArray("answer")[$this->getId()]['a'] ? " checked" : "" ?>">
+     *
+     * Try to prefix all your input variables at least with the id of the question,
+     * so that they will never conflict with other variables.
+     *
+     * @return Flexi\Template
+     */
+    public function getDisplayTemplate();
+
+    /**
+     * Uses current user and Request-variables to create an answer for the question.
+     * Return this answer. It does not necessarily be stored to the database!
+     * @return QuestionnaireAnswer or derived
+     */
+    public function createAnswer();
+
+    /**
+     * In the evaluation of the questionnaire you can click on a certain answer and get the evaluation filtered
+     * by the the people that have given that answer. This method asks from the question, what user_ids have
+     * given the answer_option. Answer option could be anything that this question understands as an answer.
+     * @param $answer_option
+     * @return mixed
+     */
+    public function getUserIdsOfFilteredAnswer($answer_option);
+
+    /**
+     * Returns a template with the results of this question.
+     *
+     * @param $only_user_ids : array\null array of user_ids that the results should be restricted to.
+     *                         this is used to show only a subset of results to the user for
+     *                         visible evaluation of the results. If the questionnaire is anonymous
+     *                         just do nothing.
+     *
+     * @return Flexi\Template
+     */
+    public function getResultTemplate($only_user_ids = null);
+
+    /**
+     * This method is called to generate a csv-export from a whole questionnaire.
+     * The returned array looks like this:
+     *     array(
+     *         'Answer 1' => array('e7a0a84b161f3e8c09b4a0a2e8a58147' => "1", '7e81ec247c151c02ffd479511e24cc03' => "0"),
+     *         'Answer 2' => array('e7a0a84b161f3e8c09b4a0a2e8a58147' => "1", '7e81ec247c151c02ffd479511e24cc03' => "1")
+     *     )
+     * This is a two-dimensional array. The first array provides a set of answers. The values of
+     * this array are themselves arrays with the user_ids as indexes and the user's
+     * answers as the values. With this construction you can evaluate single-choice tests
+     * as well as multiple-choice tests.
+     * @return array : indexed with user_id and valued with the value of the answer.
+     *                 If your QuestionType allows more than one value (i.e. multiple-choice)
+     *                 you might need to serialize it.
+     */
+    public function getResultArray();
+
+    /**
+     * A method to be called after the questionnaire has ended.
+     * @return void
+     */
+    public function onEnding();
+}
diff --git a/lib/classes/QuickSearch.class.php b/lib/classes/QuickSearch.class.php
deleted file mode 100644
index d3983a3..0000000
--- a/lib/classes/QuickSearch.class.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * QuickSearch.class.php - GUI class for quciksearch
- *
- * 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.
- *
- * @author      Rasmus <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This class provides a small and intuitive GUI-element for an instant search of
- * courses, persons, institutes or other items. Mainly the structure to include
- * a QuickSearch-field is the following:
- *  //code-begin
- *  $sf = new QuickSearch("username");
- *    $sf->withButton();
- *  $sf->specialSQL("SELECT username, CONCAT(Vorname, \" \", Nachname) " .
- *     "FROM auth_user_md5 " .
- *     "WHERE CONCAT(Vorname, \" \", Nachname) LIKE :input " .
- *        "AND perms = 'dozent'", _("Dozenten suchen"));
- *  print $sf->render();
- *  //code-end
- * This code should be included into an html <form>-tag. It will provide a nice looking
- * input-field with a button (this is the $sf->withButton() command for), a javascript
- * instant-search for your items (in this case 'Dozenten') and also a non-javascript
- * oldschool version of a searchfield with a select-box in step 2 of the search (first
- * write what you search, click on the button and then select in the select-box what
- * you wanted to have).
- * You can handle the searchfield in your form-tag as if you have written an
- * '<input type="text" name="username">'.
- *
- * For most cases you may only want to search for persons, courses or institutes.
- * Thus a shortcut is implemented in this class. You may write
- *  //code-begin
- *  $sf = new QuickSearch("username", "username");
- *    $sf->withButton();
- *  print $sf->render();
- *  //code-end
- * to receive a searchfield that is automatically searching for users and inserts
- * the selected users's username in the searchfield. The first parameter of the
- * constructor 'new Quicksearch' is the name of the variable in your form and is
- * completely free to name. The (optional) second parameter describes what you are
- * searching for: username, user_id, Seminar_id or Institut_id.
- *
- * Also you can do method-chaining with this class, so you can press everything
- * you need infront of your semicolon. Watch this example:
- *  //code-begin
- *  print QuickSearch::get("username", "username")->withButton->render();
- *  //code-end
- *
- * Lastly you can replace the second argument of the constructor (or get-method)
- * by an object whose class extends the SearchType-class. This might be
- * useful to create your own searches and handle them with oop-style or even
- * use a totally different search-engine like lucene-index! All you need to
- * do so is implement your searchclass and follow this example:
- *  //code-begin
- *  class TeacherSearch extends SearchType {
- *    ...
- *  }
- *  $searcher = new TeacherSearch();
- *  print QuickSearch::get("username", $searcher)->withButton->render();
- *  //code-end
- * Watch the SearchType class in lib/classes/searchtypes/SearchType.class.php
- * for details.
- * Enjoy!
- */
-class QuickSearch
-{
-
-    const GC_LIFETIME = 10800; // = 3 * 60 * 60 = 3 hours
-
-    static $count_QS = 0;       //static counter of all instances of this class
-
-    private $name;              //name of the input/select field
-    private $search;            //may be an object or a string
-    private $avatarLike;        //like "user_id", "username", "Seminar_id" or stuff
-    private $withButton;        //if true, the field will be displayed with a looking-glass-button to click on
-    private $selectBox = true;
-    private $withAttributes = [];
-    private $box_width = "233"; //width of the box withButton
-    private $box_align = "right";//align of the lookingglass in the withButton-box
-    private $autocomplete_disabled = false;
-    private $search_button_name;
-    private $reset_button_name;
-    private $defaultID = null;
-    private $defaultName = null;
-    private $jsfunction = null;
-    private $inputClass = null;
-    private $inputStyle = null;
-    private $specialQuery = null;
-    private $minLength = 3;
-
-
-    /**
-     * Deletes all older requests that have not been used for three hours
-     * from the session
-     *
-     * @return int Number of removed searches
-     */
-    public static function garbageCollect()
-    {
-        if (empty($_SESSION['QuickSearches'])) {
-            return 0;
-        }
-        $count = count($_SESSION['QuickSearches']);
-
-        $_SESSION['QuickSearches'] = array_filter($_SESSION['QuickSearches'], function ($query) {
-            return $query['time'] + QuickSearch::GC_LIFETIME > time();
-        });
-
-        return $count - count($_SESSION['QuickSearches']);
-    }
-
-    /**
-     * Retrieves the search object for the given id previously stored in
-     * the session.
-     *
-     * @param String $query_id Id of the quicksearch object
-     * @return SearchType Quicksearch object
-     * @throws RuntimeException when the given query does not exist in session
-     */
-    public static function getFromSession($query_id)
-    {
-        self::garbageCollect();
-
-        if (!isset($_SESSION['QuickSearches'][$query_id])) {
-            throw new RuntimeException('Quicksearch id not in session');
-        }
-
-        // Store last access to search
-        $_SESSION['QuickSearches'][$query_id]['time'] = time();
-
-        $query = $_SESSION['QuickSearches'][$query_id];
-
-        if ($query['includePath']) {
-            include_once $query['includePath'];
-        }
-
-        return unserialize($query['object']);
-
-    }
-
-    /**
-     * returns an instance of QuickSearch so you can use it as singleton
-     *
-     * @param string $name the name of the destinated variable in your html-form. Handle it
-     * as if it was an '<input type="text" name="yourname">' input.
-     * @param string $search if set to user_id, username, Seminar_id, Arbeitsgruppe_id or Institute_id
-     * the searchfield will automatically search for persons, courses, workgroups, institutes and
-     * you don't need to call the specialSearch-method.
-     *
-     * @return object of type QuickSearch
-     */
-    public static function get($name, $search = NULL)
-    {
-        return new static($name, $search);
-    }
-
-
-    /**
-     * constructor which prepares a searchfield for persons, courses, institutes or
-     * special items you may want to search for. This is a GUI-class, see
-     * QuickSearch.class.php for further documentation.
-     *
-     * @param string $name the name of the destinated variable in your html-form. Handle it
-     * as if it was an '<input type="text" name="yourname">' input.
-     * @param string $search if set to user_id, username, Seminar_id, Arbeitsgruppe_id or Institute_id
-     * the searchfield will automatically search for persons, courses, workgroups, institutes and
-     * you don't need to call the specialSearch-method.
-     *
-     * @return void
-     */
-    final public function __construct($name, $search = NULL)
-    {
-        self::$count_QS++;
-        $this->name = $name;
-        $this->withButton = false;
-        $this->avatarLike = "";
-        if ($search instanceof SearchType) {
-            $this->search = $search;
-        } else {
-            $this->search = NULL;
-        }
-        $this->setAttributes([]);
-    }
-
-    /**
-     * if set to true, the searchfield will be a nice-looking grey searchfield with
-     * a magnifier-symbol as a submit-button. Set this to false to create your own
-     * submit-button and style of the form.
-     * @param mixed $design  associative array of params.
-     *
-     * @return QuickSearch
-     */
-    public function withButton($design = [])
-    {
-        $this->withButton = true;
-        if (isset($design['width'])) {
-            $this->box_width = $design['width'];
-        }
-        $this->box_align = $design['align'] ?? "right";
-        $this->search_button_name = $design['search_button_name'] ?? '';
-        $this->reset_button_name = $design['reset_button_name'] ?? '';
-        return $this;
-    }
-
-    /**
-     * this will disable a submit button for the searchfield
-     *
-     * @return QuickSearch
-     */
-    public function withoutButton()
-    {
-        $this->withButton = false;
-        return $this;
-    }
-
-    /**
-     * Here you can set a default-value for the searchfield
-     *
-     * @param string $valueID the default-ID that should be stored
-     * @param string $valueName the default value, that should be displayed
-     * - remember that these may not be the same, they may be
-     *   something like "ae2b1fca515949e5d54fb22b8ed95575", "test_dozent"
-     *
-     * @return QuickSearch
-     */
-    public function defaultValue($valueID, $valueName)
-    {
-        $this->defaultID = $valueID;
-        $this->defaultName = $valueName;
-        return $this;
-    }
-
-    /**
-     * defines a css class for the searchfield
-     *
-     * @param string $class any css class name for the "input type=text" tag
-     *
-     * @return QuickSearch
-     */
-    public function setInputClass($class)
-    {
-        $this->withAttributes['class'] = $class;
-        return $this;
-    }
-
-    /**
-     * defines css-proporties for searchfield that will be included as 'style="$style"'
-     *
-     * @param string $style one or more css-proporties separated with ";"
-     *
-     * @return QuickSearch
-     */
-    public function setInputStyle($style)
-    {
-        $this->withAttributes['style'] = $style;
-        return $this;
-    }
-
-    /**
-     * Set the minimum length to start searching
-     *
-     * @param int $minLength
-     *
-     * @return QuickSearch
-     */
-    public function setMinLength(int $minLength)
-    {
-        $this->minLength = $minLength;
-
-        return $this;
-    }
-
-    /**
-     * disables the select-box, which is displayed for non-JS users who will
-     * choose with this box, which item they want to have.
-     *
-     * @param bool $set false if we DO want a select-box, false otherwise
-     *
-     * @return QuickSearch
-     */
-    public function noSelectbox($set = true)
-    {
-        $this->selectBox = !$set;
-        return $this;
-    }
-
-    /**
-     * disables the ajax autocomplete for this searchfield
-     * If you want to disable all QuickSearches, you better use the
-     * config variable global -> AJAX_AUTOCOMPLETE_DISABLED
-     * @param disable boolean: true (default) to disable, false to enable
-     * autocomplete via ajax.
-     * @return QuickSearch
-     */
-    public function disableAutocomplete($disable = true) {
-        $this->autocomplete_disabled = $disable;
-        return $this;
-    }
-
-    /**
-     * set a JavaScript-function to be fired after the user has selected a
-     * value in the QuickSearch field. Arguments are:
-     * function fireme(id_of_item, text_of_item)
-     * example setting: QS->fireJSFunctionOnSelect('fireme');
-     *
-     * @param string $function_name the name of the javascript function
-     *
-     * @return QuickSearch
-     */
-    public function fireJSFunctionOnSelect($function_name)
-    {
-        $this->jsfunction = $function_name;
-        return $this;
-    }
-
-    /**
-     * assigns special attributes to the html-element of the searchfield
-     *
-     * @param array $ttr_array like array("title" => "hello world")
-     *
-     * @return QuickSearch
-     */
-    public function setAttributes($attr_array)
-    {
-        if (is_array($attr_array)) {
-            $this->withAttributes = $attr_array;
-        }
-        if (!isset($this->withAttributes['aria-label'])
-                && !isset($this->withAttributes['aria-labelledby'])
-                && $this->search) {
-            $this->withAttributes['aria-label'] = $this->search->getTitle();
-        }
-        return $this;
-    }
-
-    /**
-     * Returns whether the underlying search type requires an extended
-     * layout.
-     *
-     * @return bool indicating whether an extended layout is required
-     */
-    public function hasExtendedLayout()
-    {
-        return !empty($this->search->extendedLayout);
-    }
-
-    /**
-     * last step: display everything and be happy!
-     * comment: the Ajax-Result (for the javascript-instant-search) will be also displayed here,
-     * but that does not need to concern you.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        if (trim(Request::get($this->name.'_parameter'))
-               && (Request::get($this->name.'_parameter') != $this->beschriftung())
-               && !Request::get($this->name)
-               && $this->selectBox) {
-            //No Javascript activated and having searched:
-            $searchresults = $this->searchresults(Request::get($this->name.'_parameter'));
-
-            $template = $GLOBALS['template_factory']->open('quicksearch/selectbox.php');
-            $template->set_attribute('withButton', $this->withButton);
-            $template->set_attribute('box_align', $this->box_align);
-            $template->set_attribute('box_width', $this->box_width);
-            $template->set_attribute('withAttributes', $this->withAttributes);
-            $template->set_attribute('searchresults', $searchresults);
-            $template->set_attribute('name', $this->name);
-            $template->set_attribute('search_button_name', $this->search_button_name);
-            $template->set_attribute('reset_button_name', $this->reset_button_name);
-            $template->set_attribute('extendedLayout', $this->hasExtendedLayout());
-            return $template->render();
-
-        } else {
-            $query_id = $this->storeSearchInSession();
-
-            //Ausgabe:
-            $template = $GLOBALS['template_factory']->open('quicksearch/inputfield.php');
-            $template->set_attribute('withButton', $this->withButton);
-            $template->set_attribute('box_align', $this->box_align);
-            $template->set_attribute('box_width', $this->box_width);
-            $template->set_attribute('inputStyle', $this->inputStyle ?? '');
-            $template->set_attribute('beschriftung', $this->beschriftung());
-            $template->set_attribute('name', $this->name);
-            $template->set_attribute('defaultID', $this->defaultID);
-            $template->set_attribute('defaultName', $this->defaultName);
-            $template->set_attribute('withAttributes', $this->withAttributes ? $this->withAttributes : []);
-            $template->set_attribute('jsfunction', $this->jsfunction);
-            $template->set_attribute('autocomplete_disabled', Config::get()->getValue("AJAX_AUTOCOMPLETE_DISABLED") || $this->autocomplete_disabled);
-            $template->set_attribute('count_QS', self::$count_QS);
-            $template->set_attribute('id', $this->getId());
-            $template->set_attribute('query_id', $query_id);
-            $template->set_attribute('minLength', $this->minLength);
-            $template->set_attribute('search_button_name', $this->search_button_name);
-            $template->set_attribute('reset_button_name', $this->reset_button_name);
-            $template->set_attribute('extendedLayout', $this->hasExtendedLayout());
-            return $template->render();
-        }
-    }
-
-    /**
-     * Convert quicksearch to string by rendering it
-     *
-     * @return string rendered html
-     */
-    public function __toString()
-    {
-        return $this->render();
-    }
-
-    /**
-     * returns the id string used for the input field
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return "qs_".md5($this->name) . '_' . (int)self::$count_QS;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    //                               private-methods                            //
-    //////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * private method to get a result-array in the way of array(array(item_id, item-name)).
-     *
-     * @param string $request the request from the searchfield typed by the user.
-     *
-     * @return array array(array(item_id, item-name), ...).
-     */
-    private function searchresults($request)
-    {
-        if ($this->search instanceof SearchType) {
-            try {
-                $results = $this->search->getResults($request, $_REQUEST);
-            } catch (Exception $exception) {
-                //Der Programmierer will ja seine Fehler sehen:
-                return [["", $exception->getMessage()]];
-            }
-            return $results;
-        } else {
-            $result = [["", _("Kein korrektes Suchobjekt angegeben.")]];
-            return $result;
-        }
-    }
-
-    /**
-     * get the label of the searchfield that is written in javascript and disappears
-     * when the user focusses on the searchfield.
-     *
-     * @return string localized-string
-     */
-    private function beschriftung()
-    {
-        if ($this->search instanceof SearchType) {
-            return $this->search->getTitle();
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Abfrage in der Session speichern
-     *
-     * @return string
-     */
-    protected function storeSearchInSession(): string
-    {
-        $query_id = md5(serialize($this->search));
-
-        // Prepare object
-        $item = [
-            'time' => time(),
-        ];
-
-        if ($this->search instanceof SearchType) {
-            $item['object'] = serialize($this->search);
-            if ($this->search instanceof SearchType) {
-                $item['includePath'] = $this->search->includePath();
-            }
-        } else {
-            $item['query'] = $this->search;
-        }
-
-        // Actually storing in session
-        if (!isset($_SESSION['QuickSearches'])) {
-            $_SESSION['QuickSearches'] = [];
-        }
-        $_SESSION['QuickSearches'][$query_id] = $item;
-
-        return $query_id;
-    }
-}
diff --git a/lib/classes/QuickSearch.php b/lib/classes/QuickSearch.php
new file mode 100644
index 0000000..d3983a3
--- /dev/null
+++ b/lib/classes/QuickSearch.php
@@ -0,0 +1,503 @@
+<?php
+# Lifter010: TODO
+/**
+ * QuickSearch.class.php - GUI class for quciksearch
+ *
+ * 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.
+ *
+ * @author      Rasmus <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This class provides a small and intuitive GUI-element for an instant search of
+ * courses, persons, institutes or other items. Mainly the structure to include
+ * a QuickSearch-field is the following:
+ *  //code-begin
+ *  $sf = new QuickSearch("username");
+ *    $sf->withButton();
+ *  $sf->specialSQL("SELECT username, CONCAT(Vorname, \" \", Nachname) " .
+ *     "FROM auth_user_md5 " .
+ *     "WHERE CONCAT(Vorname, \" \", Nachname) LIKE :input " .
+ *        "AND perms = 'dozent'", _("Dozenten suchen"));
+ *  print $sf->render();
+ *  //code-end
+ * This code should be included into an html <form>-tag. It will provide a nice looking
+ * input-field with a button (this is the $sf->withButton() command for), a javascript
+ * instant-search for your items (in this case 'Dozenten') and also a non-javascript
+ * oldschool version of a searchfield with a select-box in step 2 of the search (first
+ * write what you search, click on the button and then select in the select-box what
+ * you wanted to have).
+ * You can handle the searchfield in your form-tag as if you have written an
+ * '<input type="text" name="username">'.
+ *
+ * For most cases you may only want to search for persons, courses or institutes.
+ * Thus a shortcut is implemented in this class. You may write
+ *  //code-begin
+ *  $sf = new QuickSearch("username", "username");
+ *    $sf->withButton();
+ *  print $sf->render();
+ *  //code-end
+ * to receive a searchfield that is automatically searching for users and inserts
+ * the selected users's username in the searchfield. The first parameter of the
+ * constructor 'new Quicksearch' is the name of the variable in your form and is
+ * completely free to name. The (optional) second parameter describes what you are
+ * searching for: username, user_id, Seminar_id or Institut_id.
+ *
+ * Also you can do method-chaining with this class, so you can press everything
+ * you need infront of your semicolon. Watch this example:
+ *  //code-begin
+ *  print QuickSearch::get("username", "username")->withButton->render();
+ *  //code-end
+ *
+ * Lastly you can replace the second argument of the constructor (or get-method)
+ * by an object whose class extends the SearchType-class. This might be
+ * useful to create your own searches and handle them with oop-style or even
+ * use a totally different search-engine like lucene-index! All you need to
+ * do so is implement your searchclass and follow this example:
+ *  //code-begin
+ *  class TeacherSearch extends SearchType {
+ *    ...
+ *  }
+ *  $searcher = new TeacherSearch();
+ *  print QuickSearch::get("username", $searcher)->withButton->render();
+ *  //code-end
+ * Watch the SearchType class in lib/classes/searchtypes/SearchType.class.php
+ * for details.
+ * Enjoy!
+ */
+class QuickSearch
+{
+
+    const GC_LIFETIME = 10800; // = 3 * 60 * 60 = 3 hours
+
+    static $count_QS = 0;       //static counter of all instances of this class
+
+    private $name;              //name of the input/select field
+    private $search;            //may be an object or a string
+    private $avatarLike;        //like "user_id", "username", "Seminar_id" or stuff
+    private $withButton;        //if true, the field will be displayed with a looking-glass-button to click on
+    private $selectBox = true;
+    private $withAttributes = [];
+    private $box_width = "233"; //width of the box withButton
+    private $box_align = "right";//align of the lookingglass in the withButton-box
+    private $autocomplete_disabled = false;
+    private $search_button_name;
+    private $reset_button_name;
+    private $defaultID = null;
+    private $defaultName = null;
+    private $jsfunction = null;
+    private $inputClass = null;
+    private $inputStyle = null;
+    private $specialQuery = null;
+    private $minLength = 3;
+
+
+    /**
+     * Deletes all older requests that have not been used for three hours
+     * from the session
+     *
+     * @return int Number of removed searches
+     */
+    public static function garbageCollect()
+    {
+        if (empty($_SESSION['QuickSearches'])) {
+            return 0;
+        }
+        $count = count($_SESSION['QuickSearches']);
+
+        $_SESSION['QuickSearches'] = array_filter($_SESSION['QuickSearches'], function ($query) {
+            return $query['time'] + QuickSearch::GC_LIFETIME > time();
+        });
+
+        return $count - count($_SESSION['QuickSearches']);
+    }
+
+    /**
+     * Retrieves the search object for the given id previously stored in
+     * the session.
+     *
+     * @param String $query_id Id of the quicksearch object
+     * @return SearchType Quicksearch object
+     * @throws RuntimeException when the given query does not exist in session
+     */
+    public static function getFromSession($query_id)
+    {
+        self::garbageCollect();
+
+        if (!isset($_SESSION['QuickSearches'][$query_id])) {
+            throw new RuntimeException('Quicksearch id not in session');
+        }
+
+        // Store last access to search
+        $_SESSION['QuickSearches'][$query_id]['time'] = time();
+
+        $query = $_SESSION['QuickSearches'][$query_id];
+
+        if ($query['includePath']) {
+            include_once $query['includePath'];
+        }
+
+        return unserialize($query['object']);
+
+    }
+
+    /**
+     * returns an instance of QuickSearch so you can use it as singleton
+     *
+     * @param string $name the name of the destinated variable in your html-form. Handle it
+     * as if it was an '<input type="text" name="yourname">' input.
+     * @param string $search if set to user_id, username, Seminar_id, Arbeitsgruppe_id or Institute_id
+     * the searchfield will automatically search for persons, courses, workgroups, institutes and
+     * you don't need to call the specialSearch-method.
+     *
+     * @return object of type QuickSearch
+     */
+    public static function get($name, $search = NULL)
+    {
+        return new static($name, $search);
+    }
+
+
+    /**
+     * constructor which prepares a searchfield for persons, courses, institutes or
+     * special items you may want to search for. This is a GUI-class, see
+     * QuickSearch.class.php for further documentation.
+     *
+     * @param string $name the name of the destinated variable in your html-form. Handle it
+     * as if it was an '<input type="text" name="yourname">' input.
+     * @param string $search if set to user_id, username, Seminar_id, Arbeitsgruppe_id or Institute_id
+     * the searchfield will automatically search for persons, courses, workgroups, institutes and
+     * you don't need to call the specialSearch-method.
+     *
+     * @return void
+     */
+    final public function __construct($name, $search = NULL)
+    {
+        self::$count_QS++;
+        $this->name = $name;
+        $this->withButton = false;
+        $this->avatarLike = "";
+        if ($search instanceof SearchType) {
+            $this->search = $search;
+        } else {
+            $this->search = NULL;
+        }
+        $this->setAttributes([]);
+    }
+
+    /**
+     * if set to true, the searchfield will be a nice-looking grey searchfield with
+     * a magnifier-symbol as a submit-button. Set this to false to create your own
+     * submit-button and style of the form.
+     * @param mixed $design  associative array of params.
+     *
+     * @return QuickSearch
+     */
+    public function withButton($design = [])
+    {
+        $this->withButton = true;
+        if (isset($design['width'])) {
+            $this->box_width = $design['width'];
+        }
+        $this->box_align = $design['align'] ?? "right";
+        $this->search_button_name = $design['search_button_name'] ?? '';
+        $this->reset_button_name = $design['reset_button_name'] ?? '';
+        return $this;
+    }
+
+    /**
+     * this will disable a submit button for the searchfield
+     *
+     * @return QuickSearch
+     */
+    public function withoutButton()
+    {
+        $this->withButton = false;
+        return $this;
+    }
+
+    /**
+     * Here you can set a default-value for the searchfield
+     *
+     * @param string $valueID the default-ID that should be stored
+     * @param string $valueName the default value, that should be displayed
+     * - remember that these may not be the same, they may be
+     *   something like "ae2b1fca515949e5d54fb22b8ed95575", "test_dozent"
+     *
+     * @return QuickSearch
+     */
+    public function defaultValue($valueID, $valueName)
+    {
+        $this->defaultID = $valueID;
+        $this->defaultName = $valueName;
+        return $this;
+    }
+
+    /**
+     * defines a css class for the searchfield
+     *
+     * @param string $class any css class name for the "input type=text" tag
+     *
+     * @return QuickSearch
+     */
+    public function setInputClass($class)
+    {
+        $this->withAttributes['class'] = $class;
+        return $this;
+    }
+
+    /**
+     * defines css-proporties for searchfield that will be included as 'style="$style"'
+     *
+     * @param string $style one or more css-proporties separated with ";"
+     *
+     * @return QuickSearch
+     */
+    public function setInputStyle($style)
+    {
+        $this->withAttributes['style'] = $style;
+        return $this;
+    }
+
+    /**
+     * Set the minimum length to start searching
+     *
+     * @param int $minLength
+     *
+     * @return QuickSearch
+     */
+    public function setMinLength(int $minLength)
+    {
+        $this->minLength = $minLength;
+
+        return $this;
+    }
+
+    /**
+     * disables the select-box, which is displayed for non-JS users who will
+     * choose with this box, which item they want to have.
+     *
+     * @param bool $set false if we DO want a select-box, false otherwise
+     *
+     * @return QuickSearch
+     */
+    public function noSelectbox($set = true)
+    {
+        $this->selectBox = !$set;
+        return $this;
+    }
+
+    /**
+     * disables the ajax autocomplete for this searchfield
+     * If you want to disable all QuickSearches, you better use the
+     * config variable global -> AJAX_AUTOCOMPLETE_DISABLED
+     * @param disable boolean: true (default) to disable, false to enable
+     * autocomplete via ajax.
+     * @return QuickSearch
+     */
+    public function disableAutocomplete($disable = true) {
+        $this->autocomplete_disabled = $disable;
+        return $this;
+    }
+
+    /**
+     * set a JavaScript-function to be fired after the user has selected a
+     * value in the QuickSearch field. Arguments are:
+     * function fireme(id_of_item, text_of_item)
+     * example setting: QS->fireJSFunctionOnSelect('fireme');
+     *
+     * @param string $function_name the name of the javascript function
+     *
+     * @return QuickSearch
+     */
+    public function fireJSFunctionOnSelect($function_name)
+    {
+        $this->jsfunction = $function_name;
+        return $this;
+    }
+
+    /**
+     * assigns special attributes to the html-element of the searchfield
+     *
+     * @param array $ttr_array like array("title" => "hello world")
+     *
+     * @return QuickSearch
+     */
+    public function setAttributes($attr_array)
+    {
+        if (is_array($attr_array)) {
+            $this->withAttributes = $attr_array;
+        }
+        if (!isset($this->withAttributes['aria-label'])
+                && !isset($this->withAttributes['aria-labelledby'])
+                && $this->search) {
+            $this->withAttributes['aria-label'] = $this->search->getTitle();
+        }
+        return $this;
+    }
+
+    /**
+     * Returns whether the underlying search type requires an extended
+     * layout.
+     *
+     * @return bool indicating whether an extended layout is required
+     */
+    public function hasExtendedLayout()
+    {
+        return !empty($this->search->extendedLayout);
+    }
+
+    /**
+     * last step: display everything and be happy!
+     * comment: the Ajax-Result (for the javascript-instant-search) will be also displayed here,
+     * but that does not need to concern you.
+     *
+     * @return string
+     */
+    public function render()
+    {
+        if (trim(Request::get($this->name.'_parameter'))
+               && (Request::get($this->name.'_parameter') != $this->beschriftung())
+               && !Request::get($this->name)
+               && $this->selectBox) {
+            //No Javascript activated and having searched:
+            $searchresults = $this->searchresults(Request::get($this->name.'_parameter'));
+
+            $template = $GLOBALS['template_factory']->open('quicksearch/selectbox.php');
+            $template->set_attribute('withButton', $this->withButton);
+            $template->set_attribute('box_align', $this->box_align);
+            $template->set_attribute('box_width', $this->box_width);
+            $template->set_attribute('withAttributes', $this->withAttributes);
+            $template->set_attribute('searchresults', $searchresults);
+            $template->set_attribute('name', $this->name);
+            $template->set_attribute('search_button_name', $this->search_button_name);
+            $template->set_attribute('reset_button_name', $this->reset_button_name);
+            $template->set_attribute('extendedLayout', $this->hasExtendedLayout());
+            return $template->render();
+
+        } else {
+            $query_id = $this->storeSearchInSession();
+
+            //Ausgabe:
+            $template = $GLOBALS['template_factory']->open('quicksearch/inputfield.php');
+            $template->set_attribute('withButton', $this->withButton);
+            $template->set_attribute('box_align', $this->box_align);
+            $template->set_attribute('box_width', $this->box_width);
+            $template->set_attribute('inputStyle', $this->inputStyle ?? '');
+            $template->set_attribute('beschriftung', $this->beschriftung());
+            $template->set_attribute('name', $this->name);
+            $template->set_attribute('defaultID', $this->defaultID);
+            $template->set_attribute('defaultName', $this->defaultName);
+            $template->set_attribute('withAttributes', $this->withAttributes ? $this->withAttributes : []);
+            $template->set_attribute('jsfunction', $this->jsfunction);
+            $template->set_attribute('autocomplete_disabled', Config::get()->getValue("AJAX_AUTOCOMPLETE_DISABLED") || $this->autocomplete_disabled);
+            $template->set_attribute('count_QS', self::$count_QS);
+            $template->set_attribute('id', $this->getId());
+            $template->set_attribute('query_id', $query_id);
+            $template->set_attribute('minLength', $this->minLength);
+            $template->set_attribute('search_button_name', $this->search_button_name);
+            $template->set_attribute('reset_button_name', $this->reset_button_name);
+            $template->set_attribute('extendedLayout', $this->hasExtendedLayout());
+            return $template->render();
+        }
+    }
+
+    /**
+     * Convert quicksearch to string by rendering it
+     *
+     * @return string rendered html
+     */
+    public function __toString()
+    {
+        return $this->render();
+    }
+
+    /**
+     * returns the id string used for the input field
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return "qs_".md5($this->name) . '_' . (int)self::$count_QS;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    //                               private-methods                            //
+    //////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * private method to get a result-array in the way of array(array(item_id, item-name)).
+     *
+     * @param string $request the request from the searchfield typed by the user.
+     *
+     * @return array array(array(item_id, item-name), ...).
+     */
+    private function searchresults($request)
+    {
+        if ($this->search instanceof SearchType) {
+            try {
+                $results = $this->search->getResults($request, $_REQUEST);
+            } catch (Exception $exception) {
+                //Der Programmierer will ja seine Fehler sehen:
+                return [["", $exception->getMessage()]];
+            }
+            return $results;
+        } else {
+            $result = [["", _("Kein korrektes Suchobjekt angegeben.")]];
+            return $result;
+        }
+    }
+
+    /**
+     * get the label of the searchfield that is written in javascript and disappears
+     * when the user focusses on the searchfield.
+     *
+     * @return string localized-string
+     */
+    private function beschriftung()
+    {
+        if ($this->search instanceof SearchType) {
+            return $this->search->getTitle();
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Abfrage in der Session speichern
+     *
+     * @return string
+     */
+    protected function storeSearchInSession(): string
+    {
+        $query_id = md5(serialize($this->search));
+
+        // Prepare object
+        $item = [
+            'time' => time(),
+        ];
+
+        if ($this->search instanceof SearchType) {
+            $item['object'] = serialize($this->search);
+            if ($this->search instanceof SearchType) {
+                $item['includePath'] = $this->search->includePath();
+            }
+        } else {
+            $item['query'] = $this->search;
+        }
+
+        // Actually storing in session
+        if (!isset($_SESSION['QuickSearches'])) {
+            $_SESSION['QuickSearches'] = [];
+        }
+        $_SESSION['QuickSearches'][$query_id] = $item;
+
+        return $query_id;
+    }
+}
diff --git a/lib/classes/Range.interface.php b/lib/classes/Range.interface.php
deleted file mode 100644
index 97aa074..0000000
--- a/lib/classes/Range.interface.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Generic range interface. Ranges may be a lot of things in Stud.IP.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- */
-interface Range
-{
-    /**
-     * Returns a descriptive text for the range type.
-     *
-     * @return string
-     */
-    public function describeRange();
-
-    /**
-     * Returns a unique identificator for the range type.
-     *
-     * @return string
-     */
-    public function getRangeType();
-
-    /**
-     * Returns the id of the current range
-     *
-     * @return mixed (string|int)
-     */
-    public function getRangeId();
-
-    /**
-     * Returns the full name of the range (in given format).
-     *
-     * @param  string $format
-     * @return string
-     */
-    public function getFullName($format = 'default');
-
-    /**
-     * Returns the configuration object for this range.
-     * @return RangeConfig
-     */
-    public function getConfiguration();
-
-    /**
-     * Decides whether the user may access the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     */
-    public function isAccessibleToUser($user_id = null);
-
-    /**
-     * Decides whether the user may edit/alter the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     */
-    public function isEditableByUser($user_id = null);
-
-
-    /**
-     * @return string A string representation of the Range instance.
-     */
-    public function __toString() : string;
-}
diff --git a/lib/classes/Range.php b/lib/classes/Range.php
new file mode 100644
index 0000000..97aa074
--- /dev/null
+++ b/lib/classes/Range.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Generic range interface. Ranges may be a lot of things in Stud.IP.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ */
+interface Range
+{
+    /**
+     * Returns a descriptive text for the range type.
+     *
+     * @return string
+     */
+    public function describeRange();
+
+    /**
+     * Returns a unique identificator for the range type.
+     *
+     * @return string
+     */
+    public function getRangeType();
+
+    /**
+     * Returns the id of the current range
+     *
+     * @return mixed (string|int)
+     */
+    public function getRangeId();
+
+    /**
+     * Returns the full name of the range (in given format).
+     *
+     * @param  string $format
+     * @return string
+     */
+    public function getFullName($format = 'default');
+
+    /**
+     * Returns the configuration object for this range.
+     * @return RangeConfig
+     */
+    public function getConfiguration();
+
+    /**
+     * Decides whether the user may access the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     */
+    public function isAccessibleToUser($user_id = null);
+
+    /**
+     * Decides whether the user may edit/alter the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     */
+    public function isEditableByUser($user_id = null);
+
+
+    /**
+     * @return string A string representation of the Range instance.
+     */
+    public function __toString() : string;
+}
diff --git a/lib/classes/RangeConfig.class.php b/lib/classes/RangeConfig.class.php
deleted file mode 100644
index b1030e3..0000000
--- a/lib/classes/RangeConfig.class.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * RangeConfig.class.php
- * provides access to object preferences
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class RangeConfig extends Config
-{
-    /**
-     * range type
-     */
-    const RANGE_TYPE = 'range';
-
-    /**
-     * cache of created RangeConfig instances
-     * @var array
-     */
-    protected static $instances = [];
-
-    /**
-     * range_id
-     * @var string
-     */
-    private $range_id;
-
-    /**
-     * returns cached instance for given range_id
-     * creates new objects if needed
-     * @param string $range_id
-     * @return RangeConfig
-     */
-    public static function get()
-    {
-        if (func_num_args() === 0 || func_get_arg(0) === null) {
-            return new static(true);
-        }
-
-        $range_id = func_get_arg(0);
-
-        if ($range_id instanceof Range) {
-            $range_id = $range_id->getRangeId();
-        }
-
-        if (!isset(static::$instances[$range_id])) {
-            static::$instances[$range_id] = new static($range_id);
-        }
-        return static::$instances[$range_id];
-    }
-
-    /**
-     * set cached instance for given range_id
-     * use for testing or to unset cached instance by passing
-     * null as second param
-     * @param string $range_id
-     * @param RangeConfig $my_instance
-     */
-    public static function set()
-    {
-        list($range_id, $my_instance) = func_get_args();
-        self::$instances[$range_id] = $my_instance;
-    }
-
-    /**
-     * passing null as first param is for compatibility and
-     * should be considered deprecated.
-     * passing data array as second param only for testing
-     * @param string $range_id
-     * @param array $data
-     */
-    final public function __construct($range_id = null, $data = null)
-    {
-        $this->range_id = $range_id;
-        if ($range_id !== null || $data !== null) {
-            $this->fetchData($data);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function fetchData($data = null)
-    {
-        if ($data !== null) {
-            $this->data = $data;
-        } else {
-            $this->data = [];
-            foreach (Config::get()->getFields(static::RANGE_TYPE) as $field) {
-                $this->data[$field] = Config::get()->$field;
-                $this->metadata[$field] = Config::get()->getMetadata($field);
-            }
-            try {
-                $query = "SELECT `config_values`.`field`, `config_values`.`value`
-                          FROM `config_values`
-                          LEFT JOIN `config` USING (`field`)
-                          WHERE `range_id` = :id
-                            AND (
-                                `field` IN (:fields)
-                                OR `config`.`field` IS NULL
-                            )";
-                $statement = DBManager::get()->prepare($query);
-                $statement->bindValue(':id', $this->range_id);
-                $statement->bindValue(':fields', array_keys($this->data));
-                $statement->execute();
-            } catch (Exception $e) {
-                //in case we have not migrated 226 yet:
-                $query = 'SELECT field, value FROM user_config WHERE user_id = :id';
-                $statement = DBManager::get()->prepare($query);
-                $statement->bindValue(':id', $this->range_id);
-                $statement->execute();
-            }
-            while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-                $this->data[$row['field']] = $this->convertFromDatabase(
-                    $this->metadata[$row['field']]['type'] ?? 'string',
-                    $row['value'],
-                    $row['field']
-                );
-            }
-        }
-    }
-
-    /**
-     * returns the range id
-     *
-     * @return string
-     */
-    public function getRangeId()
-    {
-        return $this->range_id;
-    }
-
-    /**
-     * @see lib/classes/Config::getValue()
-     */
-    public function getValue($field)
-    {
-        if (array_key_exists($field, $this->data)) {
-            return $this->data[$field];
-        }
-        return null;
-    }
-
-    /**
-     * @param string $field
-     * @return bool
-     */
-    public function unsetValue($field)
-    {
-        return $this->delete($field);
-    }
-
-    /**
-     * @see lib/classes/Config::store()
-     */
-    public function store($field, $value)
-    {
-        $entry = new ConfigValue([$field, $this->range_id]);
-        $this->data[$field] = $value;
-
-        // Check if entry is default and if so, delete it
-        if (Config::get()->getValue($field) == $value) {
-            $entry->delete();
-            return 1;
-        }
-
-        // Otherwise convert it to an appropriate format and store it
-        $metadata = Config::get()->getMetadata($field);
-        $entry->value = $this->convertForDatabase($metadata['type'] ?? 'string', $value, $field);
-
-        $ret = $entry->store();
-        if ($ret) {
-            $this->fetchData();
-        }
-
-        return $ret;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function create($field, $data = [])
-    {
-        if (!isset($data['range'])) {
-            $data['range'] = static::RANGE_TYPE;
-        }
-
-        return parent::create($field, $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($field)
-    {
-        $entry = ConfigValue::find([$field, $this->range_id]);
-        if (!$entry) {
-            return null;
-        }
-
-        if ($ret = $entry->delete()) {
-            $this->data[$field] = Config::get()->$field;
-        }
-        return $ret;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getI18NIdentifier($field)
-    {
-        return md5("{$field}|{$this->range_id}");
-    }
-}
diff --git a/lib/classes/RangeConfig.php b/lib/classes/RangeConfig.php
new file mode 100644
index 0000000..b1030e3
--- /dev/null
+++ b/lib/classes/RangeConfig.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * RangeConfig.class.php
+ * provides access to object preferences
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class RangeConfig extends Config
+{
+    /**
+     * range type
+     */
+    const RANGE_TYPE = 'range';
+
+    /**
+     * cache of created RangeConfig instances
+     * @var array
+     */
+    protected static $instances = [];
+
+    /**
+     * range_id
+     * @var string
+     */
+    private $range_id;
+
+    /**
+     * returns cached instance for given range_id
+     * creates new objects if needed
+     * @param string $range_id
+     * @return RangeConfig
+     */
+    public static function get()
+    {
+        if (func_num_args() === 0 || func_get_arg(0) === null) {
+            return new static(true);
+        }
+
+        $range_id = func_get_arg(0);
+
+        if ($range_id instanceof Range) {
+            $range_id = $range_id->getRangeId();
+        }
+
+        if (!isset(static::$instances[$range_id])) {
+            static::$instances[$range_id] = new static($range_id);
+        }
+        return static::$instances[$range_id];
+    }
+
+    /**
+     * set cached instance for given range_id
+     * use for testing or to unset cached instance by passing
+     * null as second param
+     * @param string $range_id
+     * @param RangeConfig $my_instance
+     */
+    public static function set()
+    {
+        list($range_id, $my_instance) = func_get_args();
+        self::$instances[$range_id] = $my_instance;
+    }
+
+    /**
+     * passing null as first param is for compatibility and
+     * should be considered deprecated.
+     * passing data array as second param only for testing
+     * @param string $range_id
+     * @param array $data
+     */
+    final public function __construct($range_id = null, $data = null)
+    {
+        $this->range_id = $range_id;
+        if ($range_id !== null || $data !== null) {
+            $this->fetchData($data);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function fetchData($data = null)
+    {
+        if ($data !== null) {
+            $this->data = $data;
+        } else {
+            $this->data = [];
+            foreach (Config::get()->getFields(static::RANGE_TYPE) as $field) {
+                $this->data[$field] = Config::get()->$field;
+                $this->metadata[$field] = Config::get()->getMetadata($field);
+            }
+            try {
+                $query = "SELECT `config_values`.`field`, `config_values`.`value`
+                          FROM `config_values`
+                          LEFT JOIN `config` USING (`field`)
+                          WHERE `range_id` = :id
+                            AND (
+                                `field` IN (:fields)
+                                OR `config`.`field` IS NULL
+                            )";
+                $statement = DBManager::get()->prepare($query);
+                $statement->bindValue(':id', $this->range_id);
+                $statement->bindValue(':fields', array_keys($this->data));
+                $statement->execute();
+            } catch (Exception $e) {
+                //in case we have not migrated 226 yet:
+                $query = 'SELECT field, value FROM user_config WHERE user_id = :id';
+                $statement = DBManager::get()->prepare($query);
+                $statement->bindValue(':id', $this->range_id);
+                $statement->execute();
+            }
+            while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+                $this->data[$row['field']] = $this->convertFromDatabase(
+                    $this->metadata[$row['field']]['type'] ?? 'string',
+                    $row['value'],
+                    $row['field']
+                );
+            }
+        }
+    }
+
+    /**
+     * returns the range id
+     *
+     * @return string
+     */
+    public function getRangeId()
+    {
+        return $this->range_id;
+    }
+
+    /**
+     * @see lib/classes/Config::getValue()
+     */
+    public function getValue($field)
+    {
+        if (array_key_exists($field, $this->data)) {
+            return $this->data[$field];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $field
+     * @return bool
+     */
+    public function unsetValue($field)
+    {
+        return $this->delete($field);
+    }
+
+    /**
+     * @see lib/classes/Config::store()
+     */
+    public function store($field, $value)
+    {
+        $entry = new ConfigValue([$field, $this->range_id]);
+        $this->data[$field] = $value;
+
+        // Check if entry is default and if so, delete it
+        if (Config::get()->getValue($field) == $value) {
+            $entry->delete();
+            return 1;
+        }
+
+        // Otherwise convert it to an appropriate format and store it
+        $metadata = Config::get()->getMetadata($field);
+        $entry->value = $this->convertForDatabase($metadata['type'] ?? 'string', $value, $field);
+
+        $ret = $entry->store();
+        if ($ret) {
+            $this->fetchData();
+        }
+
+        return $ret;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($field, $data = [])
+    {
+        if (!isset($data['range'])) {
+            $data['range'] = static::RANGE_TYPE;
+        }
+
+        return parent::create($field, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete($field)
+    {
+        $entry = ConfigValue::find([$field, $this->range_id]);
+        if (!$entry) {
+            return null;
+        }
+
+        if ($ret = $entry->delete()) {
+            $this->data[$field] = Config::get()->$field;
+        }
+        return $ret;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getI18NIdentifier($field)
+    {
+        return md5("{$field}|{$this->range_id}");
+    }
+}
diff --git a/lib/classes/RangeTreeObject.class.php b/lib/classes/RangeTreeObject.class.php
deleted file mode 100644
index 579db43..0000000
--- a/lib/classes/RangeTreeObject.class.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// RangeTreeObject.class.php
-// Class to handle items in the "range tree"
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* base class for items in the "range tree"
-*
-* This class is used for items
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class RangeTreeObject {
-
-    /**
-    * item_id in range_tree
-    *
-    *
-    * @access   public
-    * @var      string $tree_item_id
-    */
-    var $tree_item_id;
-    /**
-    * References the tree object
-    *
-    *
-    * @access   private
-    * @var      object StudipRangeTree $tree
-    */
-    var $tree;
-    /**
-    * associative array with data from database fields
-    *
-    *
-    * @access   public
-    * @var      array $item_data
-    */
-    var $item_data = null;
-
-    /**
-    * associative array with mapping for database fields
-    *
-    *
-    * @access   public
-    * @var      array $item_data_mapping
-    */
-    var $item_data_mapping = null;
-
-    /**
-    * Factory method
-    *
-    *
-    * @access public
-    * @static
-    * @param    string  $item_id
-    * @return   object RangeTreeObject
-    */
-    public static function GetInstance($item_id){
-        $tree = TreeAbstract::GetInstance("StudipRangeTree", false);
-        $class_name = "RangeTreeObject" . ucfirst($tree->tree_data[$item_id]['studip_object']);
-        return new $class_name($item_id);
-    }
-
-    /**
-    * Constructor
-    *
-    * Do not use directly, call factory method instead
-    * @access private
-    * @param    string  $item_id
-    */
-    function __construct($item_id) {
-        $this->tree = TreeAbstract::GetInstance("StudipRangeTree", false);
-        $this->tree_item_id = $item_id;
-        $this->item_data = $this->tree->tree_data[$item_id] ?? null;
-    }
-
-    /**
-    * Returns all tree items which are kids of this object
-    *
-    *
-    * @access public
-    * @param    boolean $as_value_list
-    * @return   mixed   returns numeric array if param is false, else comma separated string
-    */
-    function getAllItemKids($as_value_list = false){
-        return ($as_value_list) ? $this->getValueList($this->tree->getKidsKids($this->tree_item_id)) : $this->tree->getKidsKids($this->tree_item_id);
-    }
-
-    /**
-    * Returns all tree items which are kids of this object and are "real" Stud.IP objects
-    *
-    *
-    * @access public
-    * @param    boolean $as_value_list
-    * @return   mixed   returns numeric array if param is false, else comma separated string
-    */
-    function getAllObjectKids($as_value_list = false){
-        $all_object_kids = array_merge((array)$this->getInstKids(), (array)$this->getFakKids());
-        return ($as_value_list) ? $this->getValueList($all_object_kids) : $all_object_kids;
-    }
-
-    /**
-    * Returns all tree items which are kids of this object and are Stud.IP "Einrichtungen"
-    *
-    *
-    * @access public
-    * @param    boolean $as_value_list
-    * @return   mixed   returns numeric array if param is false, else comma separated string
-    */
-    function getInstKids($as_value_list = false){
-        $all_kids = $this->tree->getKidsKids($this->tree_item_id);
-        $inst_kids = [];
-        for ($i = 0; $i < count($all_kids); ++$i){
-            if ($this->tree->tree_data[$all_kids[$i]]['studip_object'] == 'inst'){
-                $inst_kids[] = $this->tree->tree_data[$all_kids[$i]]['studip_object_id'];
-            }
-        }
-        return ($as_value_list) ? $this->getValueList($inst_kids) : $inst_kids;
-    }
-
-    /**
-    * Returns all tree items which are kids of this object and are Stud.IP "Fakultaeten"
-    *
-    *
-    * @access public
-    * @param    boolean $as_value_list
-    * @return   mixed   returns numeric array if param is false, else comma separated string
-    */
-    function getFakKids($as_value_list = false){
-        $all_kids = $this->tree->getKidsKids($this->tree_item_id);
-        $fak_kids = [];
-        for ($i = 0; $i < count($all_kids); ++$i){
-            if ($this->tree->tree_data[$all_kids[$i]]['studip_object'] == 'fak'){
-                $inst_kids[] = $this->tree->tree_data[$all_kids[$i]]['studip_object_id'];
-            }
-        }
-        return ($as_value_list) ? $this->getValueList($fak_kids) : $fak_kids;
-    }
-
-    /**
-    * Returns array of Stud.IP range_ids of "real" objects
-    *
-    * This function is a wrapper for the according function in StudipRangeTree
-    * @see StudipRangeTree::getAdminRange()
-    * @access   public
-    * @return   array   of primary keys from table "institute"
-    */
-    function getAdminRange(){
-        return $this->tree->getAdminRange($this->tree_item_id);
-    }
-
-    /**
-    * Only useful in RangeTreeObjectInst ,all other items are always in the correct branch
-    *
-    * @access   public
-    * @return   bool
-    */
-    function isInCorrectBranch(){
-        return true;
-    }
-
-    /**
-    * Returns tree path of the current object
-    *
-    * This function is a wrapper for the according function in StudipRangeTree
-    * @see StudipRangeTree::getItemPath()
-    * @access public
-    * @return   string
-    */
-    function getItemPath(){
-        return $this->tree->getItemPath($this->tree_item_id);
-    }
-
-    /**
-    * extends the $item_data array
-    *
-    * This function fills the $item_data array with fields from the according database table (is of no use in the base class)
-    * @abstract
-    * @access private
-    */
-    function initItemDetail(){
-        if ($type = $this->item_data['studip_object']){
-            $view = DbView::getView('range_tree');
-            $view->params = [$this->tree->studip_objects[$type]['table'],
-                                $this->tree->studip_objects[$type]['pk'],
-                                $this->item_data['studip_object_id']];
-            $snap = new DbSnapshot($view->get_query("view:TREE_OBJECT_DETAIL"));
-            if ($snap->numRows){
-                $fields = $snap->getFieldList();
-                $snap->nextRow();
-                for ($i = 0; $i < count($fields); ++$i){
-                    $this->item_data[$fields[$i]] = $snap->getField($fields[$i]);
-                }
-            }
-        return true;
-        }
-    return false;
-    }
-
-    /**
-    * fetch categories of this object from database
-    *
-    * the categories are appended to the $item_data array, key 'categories', value is object of type DbSnapshot
-    * @access private
-    * @return   boolean true if categories were found
-    */
-    function fetchCategories(){
-        $view = DbView::getView('range_tree');
-        $view->params[] = $this->tree_item_id;
-        $rs = $view->get_query("view:TREE_OBJECT_CAT");
-        if (is_object($rs)){
-            $this->item_data['categories'] = new DbSnapshot($rs);
-            return true;
-        }
-    return false;
-    }
-
-    /**
-    * getter method for categories of this object
-    *
-    *
-    * @access public
-    * @return   object DbSnapshot
-    */
-    function &getCategories(){
-        if (empty($this->item_data['categories']) || !is_object($this->item_data['categories'])){
-            $this->fetchCategories();
-        }
-        return $this->item_data['categories'];
-    }
-
-    function fetchNumStaff(){
-        $view = DbView::getView('range_tree');
-        if (!($view->params[0] = $this->item_data['studip_object_id']))
-            $view->params[0] = $this->tree_item_id;
-        $rs = $view->get_query("view:STATUS_COUNT");
-        if ($rs->next_record()){
-            $this->item_data['num_staff'] = $rs->f(0);
-            return true;
-        }
-        return false;
-    }
-
-    function getNumStaff(){
-        if(!isset($this->item_data['num_staff'])){
-            $this->fetchNumStaff();
-        }
-        return $this->item_data['num_staff'];
-    }
-
-
-    /**
-    * transform numerical array into a comma separated string
-    *
-    * the result could be used in a SQL query
-    * @access private
-    * @param    array   $list
-    * @return   string
-    */
-
-    function getValueList($list){
-        $value_list = false;
-        if (count($list) == 1)
-            $value_list = "'$list[0]'";
-        else
-            $value_list = "'".join("','",$list)."'";
-        return $value_list;
-    }
-
-}
diff --git a/lib/classes/RangeTreeObject.php b/lib/classes/RangeTreeObject.php
new file mode 100644
index 0000000..579db43
--- /dev/null
+++ b/lib/classes/RangeTreeObject.php
@@ -0,0 +1,294 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// RangeTreeObject.class.php
+// Class to handle items in the "range tree"
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* base class for items in the "range tree"
+*
+* This class is used for items
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class RangeTreeObject {
+
+    /**
+    * item_id in range_tree
+    *
+    *
+    * @access   public
+    * @var      string $tree_item_id
+    */
+    var $tree_item_id;
+    /**
+    * References the tree object
+    *
+    *
+    * @access   private
+    * @var      object StudipRangeTree $tree
+    */
+    var $tree;
+    /**
+    * associative array with data from database fields
+    *
+    *
+    * @access   public
+    * @var      array $item_data
+    */
+    var $item_data = null;
+
+    /**
+    * associative array with mapping for database fields
+    *
+    *
+    * @access   public
+    * @var      array $item_data_mapping
+    */
+    var $item_data_mapping = null;
+
+    /**
+    * Factory method
+    *
+    *
+    * @access public
+    * @static
+    * @param    string  $item_id
+    * @return   object RangeTreeObject
+    */
+    public static function GetInstance($item_id){
+        $tree = TreeAbstract::GetInstance("StudipRangeTree", false);
+        $class_name = "RangeTreeObject" . ucfirst($tree->tree_data[$item_id]['studip_object']);
+        return new $class_name($item_id);
+    }
+
+    /**
+    * Constructor
+    *
+    * Do not use directly, call factory method instead
+    * @access private
+    * @param    string  $item_id
+    */
+    function __construct($item_id) {
+        $this->tree = TreeAbstract::GetInstance("StudipRangeTree", false);
+        $this->tree_item_id = $item_id;
+        $this->item_data = $this->tree->tree_data[$item_id] ?? null;
+    }
+
+    /**
+    * Returns all tree items which are kids of this object
+    *
+    *
+    * @access public
+    * @param    boolean $as_value_list
+    * @return   mixed   returns numeric array if param is false, else comma separated string
+    */
+    function getAllItemKids($as_value_list = false){
+        return ($as_value_list) ? $this->getValueList($this->tree->getKidsKids($this->tree_item_id)) : $this->tree->getKidsKids($this->tree_item_id);
+    }
+
+    /**
+    * Returns all tree items which are kids of this object and are "real" Stud.IP objects
+    *
+    *
+    * @access public
+    * @param    boolean $as_value_list
+    * @return   mixed   returns numeric array if param is false, else comma separated string
+    */
+    function getAllObjectKids($as_value_list = false){
+        $all_object_kids = array_merge((array)$this->getInstKids(), (array)$this->getFakKids());
+        return ($as_value_list) ? $this->getValueList($all_object_kids) : $all_object_kids;
+    }
+
+    /**
+    * Returns all tree items which are kids of this object and are Stud.IP "Einrichtungen"
+    *
+    *
+    * @access public
+    * @param    boolean $as_value_list
+    * @return   mixed   returns numeric array if param is false, else comma separated string
+    */
+    function getInstKids($as_value_list = false){
+        $all_kids = $this->tree->getKidsKids($this->tree_item_id);
+        $inst_kids = [];
+        for ($i = 0; $i < count($all_kids); ++$i){
+            if ($this->tree->tree_data[$all_kids[$i]]['studip_object'] == 'inst'){
+                $inst_kids[] = $this->tree->tree_data[$all_kids[$i]]['studip_object_id'];
+            }
+        }
+        return ($as_value_list) ? $this->getValueList($inst_kids) : $inst_kids;
+    }
+
+    /**
+    * Returns all tree items which are kids of this object and are Stud.IP "Fakultaeten"
+    *
+    *
+    * @access public
+    * @param    boolean $as_value_list
+    * @return   mixed   returns numeric array if param is false, else comma separated string
+    */
+    function getFakKids($as_value_list = false){
+        $all_kids = $this->tree->getKidsKids($this->tree_item_id);
+        $fak_kids = [];
+        for ($i = 0; $i < count($all_kids); ++$i){
+            if ($this->tree->tree_data[$all_kids[$i]]['studip_object'] == 'fak'){
+                $inst_kids[] = $this->tree->tree_data[$all_kids[$i]]['studip_object_id'];
+            }
+        }
+        return ($as_value_list) ? $this->getValueList($fak_kids) : $fak_kids;
+    }
+
+    /**
+    * Returns array of Stud.IP range_ids of "real" objects
+    *
+    * This function is a wrapper for the according function in StudipRangeTree
+    * @see StudipRangeTree::getAdminRange()
+    * @access   public
+    * @return   array   of primary keys from table "institute"
+    */
+    function getAdminRange(){
+        return $this->tree->getAdminRange($this->tree_item_id);
+    }
+
+    /**
+    * Only useful in RangeTreeObjectInst ,all other items are always in the correct branch
+    *
+    * @access   public
+    * @return   bool
+    */
+    function isInCorrectBranch(){
+        return true;
+    }
+
+    /**
+    * Returns tree path of the current object
+    *
+    * This function is a wrapper for the according function in StudipRangeTree
+    * @see StudipRangeTree::getItemPath()
+    * @access public
+    * @return   string
+    */
+    function getItemPath(){
+        return $this->tree->getItemPath($this->tree_item_id);
+    }
+
+    /**
+    * extends the $item_data array
+    *
+    * This function fills the $item_data array with fields from the according database table (is of no use in the base class)
+    * @abstract
+    * @access private
+    */
+    function initItemDetail(){
+        if ($type = $this->item_data['studip_object']){
+            $view = DbView::getView('range_tree');
+            $view->params = [$this->tree->studip_objects[$type]['table'],
+                                $this->tree->studip_objects[$type]['pk'],
+                                $this->item_data['studip_object_id']];
+            $snap = new DbSnapshot($view->get_query("view:TREE_OBJECT_DETAIL"));
+            if ($snap->numRows){
+                $fields = $snap->getFieldList();
+                $snap->nextRow();
+                for ($i = 0; $i < count($fields); ++$i){
+                    $this->item_data[$fields[$i]] = $snap->getField($fields[$i]);
+                }
+            }
+        return true;
+        }
+    return false;
+    }
+
+    /**
+    * fetch categories of this object from database
+    *
+    * the categories are appended to the $item_data array, key 'categories', value is object of type DbSnapshot
+    * @access private
+    * @return   boolean true if categories were found
+    */
+    function fetchCategories(){
+        $view = DbView::getView('range_tree');
+        $view->params[] = $this->tree_item_id;
+        $rs = $view->get_query("view:TREE_OBJECT_CAT");
+        if (is_object($rs)){
+            $this->item_data['categories'] = new DbSnapshot($rs);
+            return true;
+        }
+    return false;
+    }
+
+    /**
+    * getter method for categories of this object
+    *
+    *
+    * @access public
+    * @return   object DbSnapshot
+    */
+    function &getCategories(){
+        if (empty($this->item_data['categories']) || !is_object($this->item_data['categories'])){
+            $this->fetchCategories();
+        }
+        return $this->item_data['categories'];
+    }
+
+    function fetchNumStaff(){
+        $view = DbView::getView('range_tree');
+        if (!($view->params[0] = $this->item_data['studip_object_id']))
+            $view->params[0] = $this->tree_item_id;
+        $rs = $view->get_query("view:STATUS_COUNT");
+        if ($rs->next_record()){
+            $this->item_data['num_staff'] = $rs->f(0);
+            return true;
+        }
+        return false;
+    }
+
+    function getNumStaff(){
+        if(!isset($this->item_data['num_staff'])){
+            $this->fetchNumStaff();
+        }
+        return $this->item_data['num_staff'];
+    }
+
+
+    /**
+    * transform numerical array into a comma separated string
+    *
+    * the result could be used in a SQL query
+    * @access private
+    * @param    array   $list
+    * @return   string
+    */
+
+    function getValueList($list){
+        $value_list = false;
+        if (count($list) == 1)
+            $value_list = "'$list[0]'";
+        else
+            $value_list = "'".join("','",$list)."'";
+        return $value_list;
+    }
+
+}
diff --git a/lib/classes/RangeTreeObjectFak.class.php b/lib/classes/RangeTreeObjectFak.class.php
deleted file mode 100644
index 76cc366..0000000
--- a/lib/classes/RangeTreeObjectFak.class.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// RangeTreeObjectFak.class.php
-// Class to handle items in the "range tree"
-// 
-// Copyright (c) 2002 André Noack <noack@data-quest.de> 
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* class for items in the "range tree"
-*
-* This class is used for items in the tree which are "Fakultäten"
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package  
-*/
-class RangeTreeObjectFak extends RangeTreeObject {
-    
-    /**
-    * Constructor
-    *
-    * Do not use directly, call factory method in base class instead
-    * @access private
-    * @param    string  $item_id
-    */
-    function __construct($item_id) {
-        parent::__construct($item_id); //calling the baseclass constructor
-        $this->initItemDetail();
-        $this->item_data_mapping = ['Strasse' => _("Straße"), 'Plz' => _("Ort"), 'telefon' => _("Tel."), 'fax' => _("Fax"),
-                                        'url' => _("Homepage"), 'email' => _("Kontakt")];
-        $this->item_data['type_num'] = $this->item_data['type'];
-        $this->item_data['type'] = ($this->item_data['type']) ? $GLOBALS['INST_TYPE'][$this->item_data['type']]['name'] : $GLOBALS['INST_TYPE'][1]['name'];
-    
-    }
-}
-?>
diff --git a/lib/classes/RangeTreeObjectFak.php b/lib/classes/RangeTreeObjectFak.php
new file mode 100644
index 0000000..76cc366
--- /dev/null
+++ b/lib/classes/RangeTreeObjectFak.php
@@ -0,0 +1,56 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// RangeTreeObjectFak.class.php
+// Class to handle items in the "range tree"
+// 
+// Copyright (c) 2002 André Noack <noack@data-quest.de> 
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* class for items in the "range tree"
+*
+* This class is used for items in the tree which are "Fakultäten"
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package  
+*/
+class RangeTreeObjectFak extends RangeTreeObject {
+    
+    /**
+    * Constructor
+    *
+    * Do not use directly, call factory method in base class instead
+    * @access private
+    * @param    string  $item_id
+    */
+    function __construct($item_id) {
+        parent::__construct($item_id); //calling the baseclass constructor
+        $this->initItemDetail();
+        $this->item_data_mapping = ['Strasse' => _("Straße"), 'Plz' => _("Ort"), 'telefon' => _("Tel."), 'fax' => _("Fax"),
+                                        'url' => _("Homepage"), 'email' => _("Kontakt")];
+        $this->item_data['type_num'] = $this->item_data['type'];
+        $this->item_data['type'] = ($this->item_data['type']) ? $GLOBALS['INST_TYPE'][$this->item_data['type']]['name'] : $GLOBALS['INST_TYPE'][1]['name'];
+    
+    }
+}
+?>
diff --git a/lib/classes/RangeTreeObjectInst.class.php b/lib/classes/RangeTreeObjectInst.class.php
deleted file mode 100644
index c291dfc..0000000
--- a/lib/classes/RangeTreeObjectInst.class.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// RangeTreeObjectInst.class.php
-// Class to handle items in the "range tree"
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-/**
-* class for items in the "range tree"
-*
-* This class is used for items which are "Einrichtungen"
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class RangeTreeObjectInst extends RangeTreeObject {
-
-    /**
-    * Constructor
-    *
-    * Do not use directly, call factory method in base class instead
-    * @access private
-    * @param    string  $item_id
-    */
-    function __construct($item_id) {
-        parent::__construct($item_id); //calling the baseclass constructor
-        $this->initItemDetail();
-        $this->item_data_mapping = ['Strasse' => _("Straße"), 'Plz' => _("Ort"), 'telefon' => _("Tel."), 'fax' => _("Fax"),
-                                        'url' => _("Homepage"), 'email' => _("Kontakt")];
-        $this->item_data['type_num'] = $this->item_data['type'];
-        $this->item_data['type'] = ($this->item_data['type']) ? $GLOBALS['INST_TYPE'][$this->item_data['type']]['name'] : $GLOBALS['INST_TYPE'][1]['name'];
-
-    }
-
-    /**
-    * Returns true, if fakultaets_id of the item is found in its parents
-    *
-    * @access   public
-    * @return   bool
-    */
-    function isInCorrectBranch(){
-        $parents = $this->tree->getParents($this->tree_item_id);
-        if (is_array($parents) && in_array($this->item_data['fakultaets_id'],$parents)){
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-}
-?>
diff --git a/lib/classes/RangeTreeObjectInst.php b/lib/classes/RangeTreeObjectInst.php
new file mode 100644
index 0000000..c291dfc
--- /dev/null
+++ b/lib/classes/RangeTreeObjectInst.php
@@ -0,0 +1,71 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// RangeTreeObjectInst.class.php
+// Class to handle items in the "range tree"
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+/**
+* class for items in the "range tree"
+*
+* This class is used for items which are "Einrichtungen"
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class RangeTreeObjectInst extends RangeTreeObject {
+
+    /**
+    * Constructor
+    *
+    * Do not use directly, call factory method in base class instead
+    * @access private
+    * @param    string  $item_id
+    */
+    function __construct($item_id) {
+        parent::__construct($item_id); //calling the baseclass constructor
+        $this->initItemDetail();
+        $this->item_data_mapping = ['Strasse' => _("Straße"), 'Plz' => _("Ort"), 'telefon' => _("Tel."), 'fax' => _("Fax"),
+                                        'url' => _("Homepage"), 'email' => _("Kontakt")];
+        $this->item_data['type_num'] = $this->item_data['type'];
+        $this->item_data['type'] = ($this->item_data['type']) ? $GLOBALS['INST_TYPE'][$this->item_data['type']]['name'] : $GLOBALS['INST_TYPE'][1]['name'];
+
+    }
+
+    /**
+    * Returns true, if fakultaets_id of the item is found in its parents
+    *
+    * @access   public
+    * @return   bool
+    */
+    function isInCorrectBranch(){
+        $parents = $this->tree->getParents($this->tree_item_id);
+        if (is_array($parents) && in_array($this->item_data['fakultaets_id'],$parents)){
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+}
+?>
diff --git a/lib/classes/Request.class.php b/lib/classes/Request.class.php
deleted file mode 100644
index d72a6a9..0000000
--- a/lib/classes/Request.class.php
+++ /dev/null
@@ -1,828 +0,0 @@
-<?php
-# Lifter007: TODO
-/*
- * Request.php - class representing a HTTP request in Stud.IP
- *
- * Copyright (c) 2009  Elmar Ludwig
- *
- * 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.
- */
-
-/**
- * Singleton class representing a HTTP request in Stud.IP.
- */
-class Request implements ArrayAccess, IteratorAggregate
-{
-    /**
-     * cached request parameter array
-     */
-    private $params;
-
-    /**
-     * Initialize a new Request instance.
-     */
-    private function __construct()
-    {
-        $this->params = array_merge($_GET, $_POST);
-    }
-
-    /**
-     * Return the Request singleton instance.
-     */
-    public static function getInstance()
-    {
-        static $instance;
-
-        if (isset($instance)) {
-            return $instance;
-        }
-
-        return $instance = new Request();
-    }
-
-    /**
-     * ArrayAccess: Check whether the given offset exists.
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->params[$offset]);
-    }
-
-    /**
-     * ArrayAccess: Get the value at the given offset.
-     */
-    public function offsetGet($offset): mixed
-    {
-        return $this->params[$offset] ?? null;
-    }
-
-    /**
-     * ArrayAccess: Set the value at the given offset.
-     */
-    public function offsetSet($offset, $value): void
-    {
-        $this->params[$offset] = $value;
-    }
-
-    /**
-     * ArrayAccess: Delete the value at the given offset.
-     */
-    public function offsetUnset($offset): void
-    {
-        unset($this->params[$offset]);
-    }
-
-    /**
-     * IteratorAggregate: Create iterator for request parameters.
-     */
-    public function getIterator(): Traversable
-    {
-        return new ArrayIterator((array)$this->params);
-    }
-
-    /**
-     * Return the current URL, including query parameters.
-     */
-    public static function url()
-    {
-        return self::protocol() . '://' . self::server() . self::path();
-    }
-
-    /**
-     * Return the current protocol ('http' or 'https').
-     */
-    public static function protocol()
-    {
-
-        // If a reverse proxy tells us the required protocol we should respect that
-        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            return $_SERVER['HTTP_X_FORWARDED_PROTO'];
-        }
-
-        return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
-            ? 'https'
-            : 'http';
-    }
-
-    /**
-     * Return the current server name and port (host:port).
-     */
-    public static function server()
-    {
-        $host = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        $ssl  = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
-
-        if ($ssl && $port != 443 || !$ssl && $port != 80) {
-            $host .= ':' . $port;
-        }
-
-        return $host;
-    }
-
-    /**
-     * Return the current request path, relative to the server root.
-     */
-    public static function path()
-    {
-        return $_SERVER['REQUEST_URI'];
-    }
-
-    /**
-     * Return the filename of the currently executing script.
-     * @return string
-     */
-    public static function scriptName(): string
-    {
-        return $_SERVER['SCRIPT_NAME'];
-    }
-
-    /**
-     * Returns the complete path info including duplicated slashes.
-     * $_SERVER['PATH_INFO'] will remove them.
-     */
-    public static function pathInfo(): string
-    {
-        $script_name = self::scriptName();
-        $script_name = preg_quote($script_name, '#');
-        $script_name = str_replace('/', '/+', $script_name);
-
-        $path_info = preg_replace(
-            "#^{$script_name}#",
-            '',
-            urldecode(self::path())
-        );
-        return parse_url($path_info, PHP_URL_PATH) ?? '';
-    }
-
-    /**
-     * Set the selected query parameter to a specific value.
-     *
-     * @param string $param    parameter name
-     * @param mixed  $value    parameter value (string or array)
-     */
-    public static function set($param, $value)
-    {
-        $request = self::getInstance();
-
-        $request->params[$param] = $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as a string.
-     *
-     * @param string $param    parameter name
-     * @param string $default  default value if parameter is not set
-     *
-     * @return string  parameter value as string (if set), else NULL
-     */
-    public static function get($param, $default = NULL)
-    {
-        $request = self::getInstance();
-
-        return (isset($request[$param]) && is_string($request[$param]))
-             ? $request[$param]
-             : $default;
-    }
-
-    /**
-     * Return the value of the selected query parameter as an I18NString.
-     *
-     * @param string   $param    parameter name
-     * @param string   $default  default value if parameter is not set
-     * @param Callable $op       Operation to perform on each text string
-     *
-     * @return I18NString  parameter value as string (if set), else NULL
-     */
-    public static function i18n($param, $default = NULL, Callable $op = null)
-    {
-        $value = self::get($param, $default);
-
-        if (isset($value)) {
-            $lang = self::getArray($param . '_i18n');
-
-            if ($op) {
-                $value = $op($value);
-                $lang  = array_map($op, $lang);
-            }
-
-            $value = new I18NString($value, $lang);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as a string.
-     * The contents of the string is quoted with addslashes().
-     *
-     * @param string $param    parameter name
-     * @param string $default  default value if parameter is not set
-     *
-     * @return string  parameter value as string (if set), else NULL
-     */
-    public static function quoted($param, $default = NULL)
-    {
-        $value = self::get($param, $default);
-
-        if (isset($value)) {
-            $value = addslashes($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as an alphanumeric
-     * string (consisting of only digits, letters and underscores).
-     *
-     * @param string $param    parameter name
-     * @param string $default  default value if parameter is not set
-     *
-     * @return string  parameter value as string (if set), else NULL
-     */
-    public static function option($param, $default = NULL)
-    {
-        $value = self::get($param, $default);
-
-        if (!isset($value) || preg_match('/\\W/', $value)) {
-            $value = $default;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as an integer.
-     *
-     * @param string $param    parameter name
-     * @param int    $default  default value if parameter is not set
-     *
-     * @return int     parameter value as integer (if set), else NULL
-     */
-    public static function int($param, $default = NULL)
-    {
-        $value = self::get($param, $default);
-
-        if (isset($value)) {
-            $value = (int) $value;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as a float.
-     *
-     * @param string $param    parameter name
-     * @param float  $default  default value if parameter is not set
-     *
-     * @return float   parameter value as float (if set), else NULL
-     */
-    public static function float($param, $default = NULL)
-    {
-        $value = self::get($param, $default);
-
-        if (isset($value)) {
-            $value = (float) strtr($value, ',', '.');
-        }
-
-        return $value;
-    }
-
-
-    /**
-     * Returns the date and time values from one or two fields
-     * as a DateTime object. The $second_param and $second_format
-     * parameters are handy in case the date and time values
-     * come from different fields.
-     *
-     * @param string $param The name of the date/time field.
-     * @param string $format The date format of the date/time field.
-     * @param string $second_param The name of the second field, if used.
-     *     This parameter is optional.
-     * @param string $second_format The time format of the second field, if used.
-     *     This parameter is optional.
-     * @param DateTime|null $default Either a default DateTime object
-     *     or null if no default shall be set. In the latter case a DateTime
-     *     object representing the unix timestamp 0 is returned.
-     *
-     * @returns DateTime|bool A DateTime object containing the
-     *     date and time values of the specified date and time field.
-     *     In case something went wrong the boolean value false is returned.
-     *
-     * @see the following PHP documentation page for a list of
-     *     accepted date and time formats:
-     *     https://secure.php.net/manual/en/datetime.createfromformat.php
-     */
-    public static function getDateTime(
-        $param = 'date',
-        $format = 'Y-m-d',
-        $second_param = null,
-        $second_format = null,
-        $default = null
-    )
-    {
-        $value = self::get($param);
-
-        if (!$value) {
-            //In case the first field is not set
-            //use the default value, if any:
-            if ($default instanceof DateTime) {
-                return $default;
-            } else {
-                $datetime = new DateTime();
-                $datetime->setTimestamp(0);
-                return $datetime;
-            }
-        }
-
-        //Combine the format specifications and the
-        //values into one string each.
-        $combined_format = $format;
-        $combined_value = $value;
-
-        //The second format and value is only added
-        //when $second_param and $second_format are set
-        //and a second value could be retrieved.
-        if ($second_param && $second_format) {
-            $second_value = Request::get($second_param);
-            if ($second_value) {
-                $combined_format .= ' ' . $second_format;
-                $combined_value .= ' ' . $second_value;
-            }
-        }
-
-        //The time zone may not be set in the fields
-        //so we use the default timezone from a new
-        //DateTime object:
-        $value = new DateTime();
-        $time_zone = $value->getTimezone();
-
-        //Now we return a DateTime object created from the
-        //specified date value(s):
-        $result = DateTime::createFromFormat(
-            $combined_format,
-            $combined_value,
-            $time_zone
-        );
-
-        if (
-            $result
-            && !$second_param
-            && !$second_format
-            && !preg_match('/[aAghGHisvu]/', $format) // Ensure no time in format
-        ) {
-            $result->setTime(0, 0);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Retrieves a parameter that stores time data and converts the time data
-     * to a DateTime object. If a date is specified using an existing DateTime
-     * object, the time will be set on the existing DateTime object and the
-     * modified object is returned.
-     *
-     * @param string $param The name of the time field.
-     *
-     * @param string $format The time format of the time field.
-     *
-     * @param DateTime|null $date An optional DateTime object whose time
-     *     shall be set from the specified parameter.
-     *
-     * @returns DateTime|bool A DateTime object containing the
-     *     time value of the specified date and time field.
-     *     In case something went wrong the boolean value false is returned.
-     *
-     */
-    public static function getTime(
-        $param = 'time',
-        $format = 'H:i',
-        $date = null
-    )
-    {
-        $value = Request::get($param);
-
-        //Get the timezone before parsing the time
-        //so that the resulting DateTime object
-        //will have the current timezone set.
-        $tz_get = new DateTime();
-        $time_zone = $tz_get->getTimezone();
-        $converted_value = DateTime::createFromFormat(
-            $format,
-            $value,
-            $time_zone
-        );
-
-        if ($date instanceof DateTime) {
-            //Modify the time information of the specified
-            //DateTime object and return the modified object.
-            $date->setTime(
-                intval($converted_value->format('H')),
-                intval($converted_value->format('i')),
-                intval($converted_value->format('s'))
-            );
-
-            return $date;
-        }
-
-        //Return the time value.
-        return $converted_value;
-    }
-
-
-    /**
-     * Return the value of the selected query parameter as a string
-     * consisting only of allowed characters for usernames.
-     *
-     * @param string $param    parameter name
-     * @param string  $default  default value if parameter is not set
-     *
-     * @return string   parameter value (if set), else NULL
-     */
-    public static function username($param, $default = NULL)
-    {
-        $value = self::get($param, $default);
-
-        if (!isset($value) || !preg_match(Config::get()->USERNAME_REGULAR_EXPRESSION, $value)) {
-            $value = $default;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as an array.
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     */
-    public static function getArray($param)
-    {
-        $request = self::getInstance();
-
-        return (isset($request[$param]) && is_array($request[$param]))
-            ? $request[$param]
-            : [];
-    }
-
-    /**
-     * Return the value of the selected query parameter as a string array.
-     * The contents of each element is quoted with addslashes().
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     */
-    public static function quotedArray($param)
-    {
-        $array = self::getArray($param);
-
-        return self::addslashes($array);
-    }
-
-    /**
-     * Return the value of the selected query parameter as an array of
-     * alphanumeric strings (consisting of only digits, letters and
-     * underscores).
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     */
-    public static function optionArray($param)
-    {
-        $array = self::getArray($param);
-
-        foreach ($array as $key => $value) {
-            if (preg_match('/\\W/', $value)) {
-                unset($array[$key]);
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * Return the value of the selected query parameter as an integer array.
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     */
-    public static function intArray($param)
-    {
-        $array = self::getArray($param);
-
-        foreach ($array as $key => $value) {
-            $array[$key] = (int) $value;
-        }
-
-        return $array;
-    }
-
-    /**
-     * Return the value of the selected query parameter as a float array.
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     */
-    public static function floatArray($param)
-    {
-        $array = self::getArray($param);
-
-        foreach ($array as $key => $value) {
-            $array[$key] = (float) strtr($value, ',', '.');
-        }
-
-        return $array;
-    }
-
-    /**
-     * Return the value of the selected query parameter as a boolean.
-     *
-     * @param string $param   parameter name
-     * @param bool   $default default value if parameter is not set
-     *
-     * @return bool parameter value as bool (if set), else NULL
-     *
-     * @since Stud.IP 4.4
-     */
-    public static function bool($param, $default = null)
-    {
-        $value = self::get($param, $default);
-
-        if (isset($value)) {
-            $value = (bool) $value;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Return the value of the selected query parameter as a boolean array.
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     *
-     * @since Stud.IP 4.4
-     */
-    public static function boolArray($param)
-    {
-        $array = self::getArray($param);
-
-        foreach ($array as $key => $value) {
-            $array[$key] = (bool) $value;
-        }
-
-        return $array;
-    }
-
-    /**
-     * Return the value of the selected query parameter as an array of
-     * strings consisting only of allowed characters for usernames.
-     *
-     * @param string $param    parameter name
-     *
-     * @return array  parameter value as array (if set), else an empty array
-     */
-    public static function usernameArray($param)
-    {
-        $array = self::getArray($param);
-
-        foreach ($array as $key => $value) {
-            if (!preg_match(Config::get()->USERNAME_REGULAR_EXPRESSION, $value)) {
-                unset($array[$key]);
-            }
-        }
-
-        return $array;
-    }
-    /**
-     * Check whether a form submit button has been pressed. This works for
-     * both image and text submit buttons.
-     *
-     * @param string $param    submit button name
-     *
-     * @returns boolean  true if the button has been submitted, else false
-     */
-    public static function submitted($param)
-    {
-        $request = self::getInstance();
-
-        return isset($request[$param])
-            || isset($request[$param . '_x']);
-    }
-
-    /**
-     * Check whether one of the form submit buttons has been
-     * pressed. This works for both image and text submit buttons.
-     *
-     * @param string ...
-     *                 a variable argument list of submit button names
-     *
-     * @returns boolean  true if any button has been submitted, else false
-     */
-    public static function submittedSome($param/*, ... */)
-    {
-        foreach(func_get_args() as $button) {
-            if (self::submitted($button)) {
-                return TRUE;
-            }
-        }
-        return FALSE;
-    }
-
-    /**
-     * Quote a given string or array using addslashes(). If the parameter
-     * is an array, the quoting is applied recursively.
-     *
-     * @param mixed $value    string or array value to be quoted
-     *
-     * @return mixed  quoted string or array
-     */
-    public static function addslashes($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $key => $val) {
-                $value[$key] = self::addslashes($val);
-            }
-        } else {
-            $value = addslashes($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Returns the (uppercase) request method.
-     *
-     * @return string  the uppercased method of the request
-     */
-    public static function method()
-    {
-        return mb_strtoupper($_SERVER['X_HTTP_METHOD_OVERRIDE'] ?? $_SERVER['REQUEST_METHOD']);
-    }
-
-    /**
-     * @return boolean  true if this a GET request
-     */
-    public static function isGet()
-    {
-        return self::method() === 'GET';
-    }
-
-    /**
-     * @return boolean  true if this a POST request
-     */
-    public static function isPost()
-    {
-        return self::method() === 'POST';
-    }
-
-    /**
-     * @return boolean  true if this a PUT request
-     */
-    public static function isPut()
-    {
-        return self::method() === 'PUT';
-    }
-
-    /**
-     * @return boolean  true if this a DELETE request
-     */
-    public static function isDelete()
-    {
-        return self::method() === 'DELETE';
-    }
-
-
-    /**
-     * @return boolean  true if this an XmlHttpRequest sent by jQuery/prototype
-     */
-    public static function isXhr()
-    {
-        return isset($_SERVER['HTTP_X_REQUESTED_WITH']) &&
-            strcasecmp($_SERVER['HTTP_X_REQUESTED_WITH'], 'xmlhttprequest') === 0;
-    }
-
-    /**
-     * This is an alias of Request::isXhr
-     *
-     * @return boolean  true if this an XmlHttpRequest sent by jQuery/prototype
-     */
-    public static function isAjax()
-    {
-        return self::isXhr();
-    }
-
-    /**
-     * extracts some params from request, the desired params must be a comma separated list
-     * for each param, the type of used extraction method can be specified after the name,
-     * default is get
-     * null values are not returned
-     *
-     * e.g.:
-     * $data = Request::extract('admission_prelim int, admission_binding submitted, admission_prelim_txt');
-     * will yield
-     * array(3) {
-     *    ["admission_prelim"]=>
-     *    int(1)
-     *    ["admission_binding"]=>
-     *    bool(false)
-     *    ["admission_prelim_txt"]=>
-     *    string(0) ""
-     *  }
-     * @param string $what comma separated list of param names and types
-     * @return array assoc array with extracted data
-     */
-    public static function extract($what)
-    {
-        $extract = [];
-        $return = [];
-        foreach (explode(',', $what) as $one) {
-            $extract[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
-        }
-        foreach ($extract as $one) {
-            [$param, $func] = $one;
-            if (!$func) {
-                $func = 'get';
-            }
-            $value = self::$func($param);
-            if ($value !== null) {
-                $return[$param] = $value;
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * returns true if http header indicates that the response will be rendered as dialog
-     *
-     * @return bool
-     */
-    public static function isDialog()
-    {
-        return self::isXhr() && isset($_SERVER['HTTP_X_DIALOG']);
-    }
-
-    /**
-     * Returns an object that has previously been serialized using the
-     * ObjectBuilder.
-     *
-     * @param String $param         parameter name
-     * @param mixed $expected_class Expected class name of object (optional)
-     * @param bool   $allow_null    If true, return null on error; otherwise an
-     *                              exception is thrown
-     * @return mixed Object of arbitrary type or null on error and $allow_null
-     * @throws Exception when an error occurs and $allow_null = false
-     * @see ObjectBuilder
-     */
-    public static function getObject($param, $expected_class = null, $allow_null = true)
-    {
-        try {
-            return ObjectBuilder::build(Request::get($param), $expected_class);
-        } catch (Exception $e) {
-            if ($allow_null) {
-                return null;
-            }
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns a collection of objects that have previously been serialized
-     * using the ObjectBuilder.
-     *
-     * @param String $param         parameter name
-     * @param mixed $expected_class Expected class name of objects (optional)
-     * @param bool   $allow_null    If true, return empty array on error;
-     *                              otherwise an exception is thrown
-     * @return array as collection of objects
-     * @throws Exception when an error occurs and $allow_null = false
-     * @see ObjectBuilder
-     */
-    public static function getManyObjects($param, $expected_class = null, $allow_null = true)
-    {
-        try {
-            $request = self::getInstance();
-            return ObjectBuilder::buildMany($request[$param] ?? null, $expected_class);
-        } catch (Exception $e) {
-            if ($allow_null) {
-                return [];
-            }
-
-            throw $e;
-        }
-    }
-}
diff --git a/lib/classes/Request.php b/lib/classes/Request.php
new file mode 100644
index 0000000..d72a6a9
--- /dev/null
+++ b/lib/classes/Request.php
@@ -0,0 +1,828 @@
+<?php
+# Lifter007: TODO
+/*
+ * Request.php - class representing a HTTP request in Stud.IP
+ *
+ * Copyright (c) 2009  Elmar Ludwig
+ *
+ * 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.
+ */
+
+/**
+ * Singleton class representing a HTTP request in Stud.IP.
+ */
+class Request implements ArrayAccess, IteratorAggregate
+{
+    /**
+     * cached request parameter array
+     */
+    private $params;
+
+    /**
+     * Initialize a new Request instance.
+     */
+    private function __construct()
+    {
+        $this->params = array_merge($_GET, $_POST);
+    }
+
+    /**
+     * Return the Request singleton instance.
+     */
+    public static function getInstance()
+    {
+        static $instance;
+
+        if (isset($instance)) {
+            return $instance;
+        }
+
+        return $instance = new Request();
+    }
+
+    /**
+     * ArrayAccess: Check whether the given offset exists.
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->params[$offset]);
+    }
+
+    /**
+     * ArrayAccess: Get the value at the given offset.
+     */
+    public function offsetGet($offset): mixed
+    {
+        return $this->params[$offset] ?? null;
+    }
+
+    /**
+     * ArrayAccess: Set the value at the given offset.
+     */
+    public function offsetSet($offset, $value): void
+    {
+        $this->params[$offset] = $value;
+    }
+
+    /**
+     * ArrayAccess: Delete the value at the given offset.
+     */
+    public function offsetUnset($offset): void
+    {
+        unset($this->params[$offset]);
+    }
+
+    /**
+     * IteratorAggregate: Create iterator for request parameters.
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator((array)$this->params);
+    }
+
+    /**
+     * Return the current URL, including query parameters.
+     */
+    public static function url()
+    {
+        return self::protocol() . '://' . self::server() . self::path();
+    }
+
+    /**
+     * Return the current protocol ('http' or 'https').
+     */
+    public static function protocol()
+    {
+
+        // If a reverse proxy tells us the required protocol we should respect that
+        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+            return $_SERVER['HTTP_X_FORWARDED_PROTO'];
+        }
+
+        return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
+            ? 'https'
+            : 'http';
+    }
+
+    /**
+     * Return the current server name and port (host:port).
+     */
+    public static function server()
+    {
+        $host = $_SERVER['SERVER_NAME'];
+        $port = $_SERVER['SERVER_PORT'];
+        $ssl  = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+
+        if ($ssl && $port != 443 || !$ssl && $port != 80) {
+            $host .= ':' . $port;
+        }
+
+        return $host;
+    }
+
+    /**
+     * Return the current request path, relative to the server root.
+     */
+    public static function path()
+    {
+        return $_SERVER['REQUEST_URI'];
+    }
+
+    /**
+     * Return the filename of the currently executing script.
+     * @return string
+     */
+    public static function scriptName(): string
+    {
+        return $_SERVER['SCRIPT_NAME'];
+    }
+
+    /**
+     * Returns the complete path info including duplicated slashes.
+     * $_SERVER['PATH_INFO'] will remove them.
+     */
+    public static function pathInfo(): string
+    {
+        $script_name = self::scriptName();
+        $script_name = preg_quote($script_name, '#');
+        $script_name = str_replace('/', '/+', $script_name);
+
+        $path_info = preg_replace(
+            "#^{$script_name}#",
+            '',
+            urldecode(self::path())
+        );
+        return parse_url($path_info, PHP_URL_PATH) ?? '';
+    }
+
+    /**
+     * Set the selected query parameter to a specific value.
+     *
+     * @param string $param    parameter name
+     * @param mixed  $value    parameter value (string or array)
+     */
+    public static function set($param, $value)
+    {
+        $request = self::getInstance();
+
+        $request->params[$param] = $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as a string.
+     *
+     * @param string $param    parameter name
+     * @param string $default  default value if parameter is not set
+     *
+     * @return string  parameter value as string (if set), else NULL
+     */
+    public static function get($param, $default = NULL)
+    {
+        $request = self::getInstance();
+
+        return (isset($request[$param]) && is_string($request[$param]))
+             ? $request[$param]
+             : $default;
+    }
+
+    /**
+     * Return the value of the selected query parameter as an I18NString.
+     *
+     * @param string   $param    parameter name
+     * @param string   $default  default value if parameter is not set
+     * @param Callable $op       Operation to perform on each text string
+     *
+     * @return I18NString  parameter value as string (if set), else NULL
+     */
+    public static function i18n($param, $default = NULL, Callable $op = null)
+    {
+        $value = self::get($param, $default);
+
+        if (isset($value)) {
+            $lang = self::getArray($param . '_i18n');
+
+            if ($op) {
+                $value = $op($value);
+                $lang  = array_map($op, $lang);
+            }
+
+            $value = new I18NString($value, $lang);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as a string.
+     * The contents of the string is quoted with addslashes().
+     *
+     * @param string $param    parameter name
+     * @param string $default  default value if parameter is not set
+     *
+     * @return string  parameter value as string (if set), else NULL
+     */
+    public static function quoted($param, $default = NULL)
+    {
+        $value = self::get($param, $default);
+
+        if (isset($value)) {
+            $value = addslashes($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as an alphanumeric
+     * string (consisting of only digits, letters and underscores).
+     *
+     * @param string $param    parameter name
+     * @param string $default  default value if parameter is not set
+     *
+     * @return string  parameter value as string (if set), else NULL
+     */
+    public static function option($param, $default = NULL)
+    {
+        $value = self::get($param, $default);
+
+        if (!isset($value) || preg_match('/\\W/', $value)) {
+            $value = $default;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as an integer.
+     *
+     * @param string $param    parameter name
+     * @param int    $default  default value if parameter is not set
+     *
+     * @return int     parameter value as integer (if set), else NULL
+     */
+    public static function int($param, $default = NULL)
+    {
+        $value = self::get($param, $default);
+
+        if (isset($value)) {
+            $value = (int) $value;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as a float.
+     *
+     * @param string $param    parameter name
+     * @param float  $default  default value if parameter is not set
+     *
+     * @return float   parameter value as float (if set), else NULL
+     */
+    public static function float($param, $default = NULL)
+    {
+        $value = self::get($param, $default);
+
+        if (isset($value)) {
+            $value = (float) strtr($value, ',', '.');
+        }
+
+        return $value;
+    }
+
+
+    /**
+     * Returns the date and time values from one or two fields
+     * as a DateTime object. The $second_param and $second_format
+     * parameters are handy in case the date and time values
+     * come from different fields.
+     *
+     * @param string $param The name of the date/time field.
+     * @param string $format The date format of the date/time field.
+     * @param string $second_param The name of the second field, if used.
+     *     This parameter is optional.
+     * @param string $second_format The time format of the second field, if used.
+     *     This parameter is optional.
+     * @param DateTime|null $default Either a default DateTime object
+     *     or null if no default shall be set. In the latter case a DateTime
+     *     object representing the unix timestamp 0 is returned.
+     *
+     * @returns DateTime|bool A DateTime object containing the
+     *     date and time values of the specified date and time field.
+     *     In case something went wrong the boolean value false is returned.
+     *
+     * @see the following PHP documentation page for a list of
+     *     accepted date and time formats:
+     *     https://secure.php.net/manual/en/datetime.createfromformat.php
+     */
+    public static function getDateTime(
+        $param = 'date',
+        $format = 'Y-m-d',
+        $second_param = null,
+        $second_format = null,
+        $default = null
+    )
+    {
+        $value = self::get($param);
+
+        if (!$value) {
+            //In case the first field is not set
+            //use the default value, if any:
+            if ($default instanceof DateTime) {
+                return $default;
+            } else {
+                $datetime = new DateTime();
+                $datetime->setTimestamp(0);
+                return $datetime;
+            }
+        }
+
+        //Combine the format specifications and the
+        //values into one string each.
+        $combined_format = $format;
+        $combined_value = $value;
+
+        //The second format and value is only added
+        //when $second_param and $second_format are set
+        //and a second value could be retrieved.
+        if ($second_param && $second_format) {
+            $second_value = Request::get($second_param);
+            if ($second_value) {
+                $combined_format .= ' ' . $second_format;
+                $combined_value .= ' ' . $second_value;
+            }
+        }
+
+        //The time zone may not be set in the fields
+        //so we use the default timezone from a new
+        //DateTime object:
+        $value = new DateTime();
+        $time_zone = $value->getTimezone();
+
+        //Now we return a DateTime object created from the
+        //specified date value(s):
+        $result = DateTime::createFromFormat(
+            $combined_format,
+            $combined_value,
+            $time_zone
+        );
+
+        if (
+            $result
+            && !$second_param
+            && !$second_format
+            && !preg_match('/[aAghGHisvu]/', $format) // Ensure no time in format
+        ) {
+            $result->setTime(0, 0);
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Retrieves a parameter that stores time data and converts the time data
+     * to a DateTime object. If a date is specified using an existing DateTime
+     * object, the time will be set on the existing DateTime object and the
+     * modified object is returned.
+     *
+     * @param string $param The name of the time field.
+     *
+     * @param string $format The time format of the time field.
+     *
+     * @param DateTime|null $date An optional DateTime object whose time
+     *     shall be set from the specified parameter.
+     *
+     * @returns DateTime|bool A DateTime object containing the
+     *     time value of the specified date and time field.
+     *     In case something went wrong the boolean value false is returned.
+     *
+     */
+    public static function getTime(
+        $param = 'time',
+        $format = 'H:i',
+        $date = null
+    )
+    {
+        $value = Request::get($param);
+
+        //Get the timezone before parsing the time
+        //so that the resulting DateTime object
+        //will have the current timezone set.
+        $tz_get = new DateTime();
+        $time_zone = $tz_get->getTimezone();
+        $converted_value = DateTime::createFromFormat(
+            $format,
+            $value,
+            $time_zone
+        );
+
+        if ($date instanceof DateTime) {
+            //Modify the time information of the specified
+            //DateTime object and return the modified object.
+            $date->setTime(
+                intval($converted_value->format('H')),
+                intval($converted_value->format('i')),
+                intval($converted_value->format('s'))
+            );
+
+            return $date;
+        }
+
+        //Return the time value.
+        return $converted_value;
+    }
+
+
+    /**
+     * Return the value of the selected query parameter as a string
+     * consisting only of allowed characters for usernames.
+     *
+     * @param string $param    parameter name
+     * @param string  $default  default value if parameter is not set
+     *
+     * @return string   parameter value (if set), else NULL
+     */
+    public static function username($param, $default = NULL)
+    {
+        $value = self::get($param, $default);
+
+        if (!isset($value) || !preg_match(Config::get()->USERNAME_REGULAR_EXPRESSION, $value)) {
+            $value = $default;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as an array.
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     */
+    public static function getArray($param)
+    {
+        $request = self::getInstance();
+
+        return (isset($request[$param]) && is_array($request[$param]))
+            ? $request[$param]
+            : [];
+    }
+
+    /**
+     * Return the value of the selected query parameter as a string array.
+     * The contents of each element is quoted with addslashes().
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     */
+    public static function quotedArray($param)
+    {
+        $array = self::getArray($param);
+
+        return self::addslashes($array);
+    }
+
+    /**
+     * Return the value of the selected query parameter as an array of
+     * alphanumeric strings (consisting of only digits, letters and
+     * underscores).
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     */
+    public static function optionArray($param)
+    {
+        $array = self::getArray($param);
+
+        foreach ($array as $key => $value) {
+            if (preg_match('/\\W/', $value)) {
+                unset($array[$key]);
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Return the value of the selected query parameter as an integer array.
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     */
+    public static function intArray($param)
+    {
+        $array = self::getArray($param);
+
+        foreach ($array as $key => $value) {
+            $array[$key] = (int) $value;
+        }
+
+        return $array;
+    }
+
+    /**
+     * Return the value of the selected query parameter as a float array.
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     */
+    public static function floatArray($param)
+    {
+        $array = self::getArray($param);
+
+        foreach ($array as $key => $value) {
+            $array[$key] = (float) strtr($value, ',', '.');
+        }
+
+        return $array;
+    }
+
+    /**
+     * Return the value of the selected query parameter as a boolean.
+     *
+     * @param string $param   parameter name
+     * @param bool   $default default value if parameter is not set
+     *
+     * @return bool parameter value as bool (if set), else NULL
+     *
+     * @since Stud.IP 4.4
+     */
+    public static function bool($param, $default = null)
+    {
+        $value = self::get($param, $default);
+
+        if (isset($value)) {
+            $value = (bool) $value;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the value of the selected query parameter as a boolean array.
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     *
+     * @since Stud.IP 4.4
+     */
+    public static function boolArray($param)
+    {
+        $array = self::getArray($param);
+
+        foreach ($array as $key => $value) {
+            $array[$key] = (bool) $value;
+        }
+
+        return $array;
+    }
+
+    /**
+     * Return the value of the selected query parameter as an array of
+     * strings consisting only of allowed characters for usernames.
+     *
+     * @param string $param    parameter name
+     *
+     * @return array  parameter value as array (if set), else an empty array
+     */
+    public static function usernameArray($param)
+    {
+        $array = self::getArray($param);
+
+        foreach ($array as $key => $value) {
+            if (!preg_match(Config::get()->USERNAME_REGULAR_EXPRESSION, $value)) {
+                unset($array[$key]);
+            }
+        }
+
+        return $array;
+    }
+    /**
+     * Check whether a form submit button has been pressed. This works for
+     * both image and text submit buttons.
+     *
+     * @param string $param    submit button name
+     *
+     * @returns boolean  true if the button has been submitted, else false
+     */
+    public static function submitted($param)
+    {
+        $request = self::getInstance();
+
+        return isset($request[$param])
+            || isset($request[$param . '_x']);
+    }
+
+    /**
+     * Check whether one of the form submit buttons has been
+     * pressed. This works for both image and text submit buttons.
+     *
+     * @param string ...
+     *                 a variable argument list of submit button names
+     *
+     * @returns boolean  true if any button has been submitted, else false
+     */
+    public static function submittedSome($param/*, ... */)
+    {
+        foreach(func_get_args() as $button) {
+            if (self::submitted($button)) {
+                return TRUE;
+            }
+        }
+        return FALSE;
+    }
+
+    /**
+     * Quote a given string or array using addslashes(). If the parameter
+     * is an array, the quoting is applied recursively.
+     *
+     * @param mixed $value    string or array value to be quoted
+     *
+     * @return mixed  quoted string or array
+     */
+    public static function addslashes($value)
+    {
+        if (is_array($value)) {
+            foreach ($value as $key => $val) {
+                $value[$key] = self::addslashes($val);
+            }
+        } else {
+            $value = addslashes($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Returns the (uppercase) request method.
+     *
+     * @return string  the uppercased method of the request
+     */
+    public static function method()
+    {
+        return mb_strtoupper($_SERVER['X_HTTP_METHOD_OVERRIDE'] ?? $_SERVER['REQUEST_METHOD']);
+    }
+
+    /**
+     * @return boolean  true if this a GET request
+     */
+    public static function isGet()
+    {
+        return self::method() === 'GET';
+    }
+
+    /**
+     * @return boolean  true if this a POST request
+     */
+    public static function isPost()
+    {
+        return self::method() === 'POST';
+    }
+
+    /**
+     * @return boolean  true if this a PUT request
+     */
+    public static function isPut()
+    {
+        return self::method() === 'PUT';
+    }
+
+    /**
+     * @return boolean  true if this a DELETE request
+     */
+    public static function isDelete()
+    {
+        return self::method() === 'DELETE';
+    }
+
+
+    /**
+     * @return boolean  true if this an XmlHttpRequest sent by jQuery/prototype
+     */
+    public static function isXhr()
+    {
+        return isset($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+            strcasecmp($_SERVER['HTTP_X_REQUESTED_WITH'], 'xmlhttprequest') === 0;
+    }
+
+    /**
+     * This is an alias of Request::isXhr
+     *
+     * @return boolean  true if this an XmlHttpRequest sent by jQuery/prototype
+     */
+    public static function isAjax()
+    {
+        return self::isXhr();
+    }
+
+    /**
+     * extracts some params from request, the desired params must be a comma separated list
+     * for each param, the type of used extraction method can be specified after the name,
+     * default is get
+     * null values are not returned
+     *
+     * e.g.:
+     * $data = Request::extract('admission_prelim int, admission_binding submitted, admission_prelim_txt');
+     * will yield
+     * array(3) {
+     *    ["admission_prelim"]=>
+     *    int(1)
+     *    ["admission_binding"]=>
+     *    bool(false)
+     *    ["admission_prelim_txt"]=>
+     *    string(0) ""
+     *  }
+     * @param string $what comma separated list of param names and types
+     * @return array assoc array with extracted data
+     */
+    public static function extract($what)
+    {
+        $extract = [];
+        $return = [];
+        foreach (explode(',', $what) as $one) {
+            $extract[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
+        }
+        foreach ($extract as $one) {
+            [$param, $func] = $one;
+            if (!$func) {
+                $func = 'get';
+            }
+            $value = self::$func($param);
+            if ($value !== null) {
+                $return[$param] = $value;
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * returns true if http header indicates that the response will be rendered as dialog
+     *
+     * @return bool
+     */
+    public static function isDialog()
+    {
+        return self::isXhr() && isset($_SERVER['HTTP_X_DIALOG']);
+    }
+
+    /**
+     * Returns an object that has previously been serialized using the
+     * ObjectBuilder.
+     *
+     * @param String $param         parameter name
+     * @param mixed $expected_class Expected class name of object (optional)
+     * @param bool   $allow_null    If true, return null on error; otherwise an
+     *                              exception is thrown
+     * @return mixed Object of arbitrary type or null on error and $allow_null
+     * @throws Exception when an error occurs and $allow_null = false
+     * @see ObjectBuilder
+     */
+    public static function getObject($param, $expected_class = null, $allow_null = true)
+    {
+        try {
+            return ObjectBuilder::build(Request::get($param), $expected_class);
+        } catch (Exception $e) {
+            if ($allow_null) {
+                return null;
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Returns a collection of objects that have previously been serialized
+     * using the ObjectBuilder.
+     *
+     * @param String $param         parameter name
+     * @param mixed $expected_class Expected class name of objects (optional)
+     * @param bool   $allow_null    If true, return empty array on error;
+     *                              otherwise an exception is thrown
+     * @return array as collection of objects
+     * @throws Exception when an error occurs and $allow_null = false
+     * @see ObjectBuilder
+     */
+    public static function getManyObjects($param, $expected_class = null, $allow_null = true)
+    {
+        try {
+            $request = self::getInstance();
+            return ObjectBuilder::buildMany($request[$param] ?? null, $expected_class);
+        } catch (Exception $e) {
+            if ($allow_null) {
+                return [];
+            }
+
+            throw $e;
+        }
+    }
+}
diff --git a/lib/classes/ResetButton.class.php b/lib/classes/ResetButton.class.php
deleted file mode 100644
index 8702c4b..0000000
--- a/lib/classes/ResetButton.class.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- * Copyright (c) 2012 tleilax+studip@gmail.com
- *
- * 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.
- */
-
-
-namespace Studip;
-
-/**
- * Represents an HTML reset button element. Class Button inherits from
- * Interactable and customizes the HTML output.
- */
-class ResetButton extends Interactable
-{
-
-    /**
-     * Initialize a Button.
-     * The second parameter is used as @name attribute of the
-     * resulting <button> HTML element.
-     *
-     * @param string $label       the label of the button element
-     * @param string $name        the @name element of the button element
-     * @param array  $attributes  the attributes of the button element
-     */
-    protected function initialize($label, $name, $attributes)
-    {
-//        $this->attributes['name'] = $name ?: $this->label;
-    }
-
-    /**
-     * @return string  returns a HTML representation of this button.
-     */
-    public function __toString()
-    {
-        // add "button" to attribute @class
-        @$this->attributes["class"] .= " button";
-
-        $attributes = [];
-        ksort($this->attributes);
-        foreach ($this->attributes as $k => $v) {
-            $attributes[] = sprintf(' %s="%s"', $k, htmlReady($v));
-        }
-
-        return sprintf('<button type="reset"%s>%s</button>',
-                       join('', $attributes),
-                       htmlReady($this->label));
-    }
-}
diff --git a/lib/classes/ResetButton.php b/lib/classes/ResetButton.php
new file mode 100644
index 0000000..8702c4b
--- /dev/null
+++ b/lib/classes/ResetButton.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ * Copyright (c) 2012 tleilax+studip@gmail.com
+ *
+ * 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.
+ */
+
+
+namespace Studip;
+
+/**
+ * Represents an HTML reset button element. Class Button inherits from
+ * Interactable and customizes the HTML output.
+ */
+class ResetButton extends Interactable
+{
+
+    /**
+     * Initialize a Button.
+     * The second parameter is used as @name attribute of the
+     * resulting <button> HTML element.
+     *
+     * @param string $label       the label of the button element
+     * @param string $name        the @name element of the button element
+     * @param array  $attributes  the attributes of the button element
+     */
+    protected function initialize($label, $name, $attributes)
+    {
+//        $this->attributes['name'] = $name ?: $this->label;
+    }
+
+    /**
+     * @return string  returns a HTML representation of this button.
+     */
+    public function __toString()
+    {
+        // add "button" to attribute @class
+        @$this->attributes["class"] .= " button";
+
+        $attributes = [];
+        ksort($this->attributes);
+        foreach ($this->attributes as $k => $v) {
+            $attributes[] = sprintf(' %s="%s"', $k, htmlReady($v));
+        }
+
+        return sprintf('<button type="reset"%s>%s</button>',
+                       join('', $attributes),
+                       htmlReady($this->label));
+    }
+}
diff --git a/lib/classes/Score.class.php b/lib/classes/Score.class.php
deleted file mode 100644
index 4d114d5..0000000
--- a/lib/classes/Score.class.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?
-/**
- * Score.class.php - Score class
- *
- * 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.
- *
- * @author      Ralf Stockmann <rstockm@gwdg.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class Score
-{
-    // How long is the duration of a score-block?
-    const MEASURING_STEP = 1800; // half an hour
-
-    public static function getScoreContent($persons)
-    {
-        $user_ids = array_keys($persons);
-
-        // News
-        $query = "SELECT nr.range_id as user_id, COUNT(*) AS newscount
-                  FROM news_range AS nr
-                  INNER JOIN news AS n ON (nr.news_id = n.news_id)
-                  WHERE nr.range_id IN (?) AND UNIX_TIMESTAMP() <= n.date + n.expire
-                  GROUP BY nr.range_id
-                  ORDER BY NULL";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_ids]);
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $persons[$row['user_id']]['newscount'] = $row['newscount'];
-        }
-
-        // Events
-        $query = "SELECT `range_id` AS user_id, COUNT(*) AS eventcount
-                  FROM `calendar_date_assignments`
-                  INNER JOIN `calendar_dates`
-                  ON (`calendar_date_assignments`.`calendar_date_id` = `calendar_dates`.`id` AND `access` = 'PUBLIC')
-                  WHERE `range_id` IN (?) AND UNIX_TIMESTAMP() <= `end`
-                  GROUP BY `range_id`
-                  ORDER BY NULL";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_ids]);
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $persons[$row['user_id']]['eventcount'] = $row['eventcount'];
-        }
-
-        // Votes
-        if (Config::get()->VOTE_ENABLE){
-            $query = "SELECT questionnaire_assignments.range_id as user_id, COUNT(*) AS votecount
-                      FROM questionnaire_assignments
-                      WHERE questionnaire_assignments.range_id IN (?)
-                          AND questionnaire_assignments.range_type = 'user'
-                      GROUP BY questionnaire_assignments.range_id
-                      ORDER BY NULL";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$user_ids]);
-            while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-                $persons[$row['user_id']]['votecount'] = $row['votecount'];
-            }
-        }
-
-        return $persons;
-    }
-
-    /**
-    * Retrieves the titel for a given studip score
-    *
-    * @param        integer a score value
-    * @param        integer gender (0: unknown, 1: male; 2: female)
-    * @return       string  the titel
-    *
-    */
-    public static function getTitel($score, $gender = 0)
-    {
-        if ($score) {
-            $logscore = floor(log10($score) / log10(2));
-        } else {
-            $logscore = 0;
-        }
-
-        if ($logscore > 20) {
-            $logscore = 20;
-        }
-
-        $titel = [];
-        $titel[0]  = [_('Unbeschriebenes Blatt'), _('Unbeschriebenes Blatt')];
-        $titel[1]  = [_('Unbeschriebenes Blatt'), _('Unbeschriebenes Blatt')];
-        $titel[2]  = [_('Unbeschriebenes Blatt'), _('Unbeschriebenes Blatt')];
-        $titel[3]  = [_('Neuling'), _('Neuling')];
-        $titel[4]  = [_('Greenhorn'), _('Greenhorn')];
-        $titel[5]  = [_('Anfänger'), _('Anfängerin')];
-        $titel[6]  = [_('Einsteiger'), _('Einsteigerin')];
-        $titel[7]  = [_('Beginner'), _('Beginnerin')];
-        $titel[8]  = [_('Novize'), _('Novizin')];
-        $titel[9]  = [_('Fortgeschrittener'), _('Fortgeschrittene')];
-        $titel[10] = [_('Kenner'), _('Kennerin')];
-        $titel[11] = [_('Könner'), _('Könnerin')];
-        $titel[12] = [_('Profi'), _('Profi')];
-        $titel[13] = [_('Experte'), _('Expertin')];
-        $titel[14] = [_('Meister'), _('Meisterin')];
-        $titel[15] = [_('Großmeister'), _('Großmeisterin')];
-        $titel[16] = [_('Idol'), _('Idol')];
-        $titel[17] = [_('Guru'), _('Hohepriesterin')];
-        $titel[18] = [_('Lichtgestalt'), _('Lichtgestalt')];
-        $titel[19] = [_('Halbgott'), _('Halbgöttin')];
-        $titel[20] = [_('Gott'), _('Göttin')];
-
-        return $titel[$logscore][$gender == 2 ? 1 : 0];
-    }
-
-    /**
-    * Retrieves the score for the current user
-    *
-    * @return       integer the score
-    *
-    */
-    public static function GetMyScore($user_or_id = null)
-    {
-        $user = $user_or_id ? User::toObject($user_or_id) : User::findCurrent();
-        $cache = \Studip\Cache\Factory::getCache();
-        if ($cache->read("user_score_of_".$user->id)) {
-            return $cache->read("user_score_of_".$user->id);
-        }
-        //Behold! The all new mighty score algorithm!
-        //Step 1: Select all activities as mkdate-timestamps.
-        //Step 2: Group these activities to timeslots of halfhours
-        //        with COUNT(*) as a weigh of the timeslot.
-        //Step 3: Calculate the measurement of the timeslot from the weigh of it.
-        //        This makes the first activity count fully, the second
-        //        almost half and so on. We use log_n to make huge amounts of
-        //        activities to not count so much.
-        //Step 4: Calculate a single score for each timeslot depending on the
-        //        measurement and the mkdate-timestamp. Use arctan as the function
-        //        here so that older activities tend to zero.
-        //Step 5: Sum all scores from all timeslots together.
-        $sql = "
-            SELECT round(SUM((-atan(measurement / " . round(31556926 / self::MEASURING_STEP) . ") / PI() + 0.5) * 200)) as score
-            FROM (
-                SELECT ((unix_timestamp() / " . self::MEASURING_STEP . ") - timeslot) / (LN(weigh) + 1) AS measurement
-                FROM (
-                    SELECT (round(mkdate / " . self::MEASURING_STEP . ")) as timeslot, COUNT(*) AS weigh
-                    FROM (
-                        " . self::createTimestampQuery() . "
-                    ) as mkdates
-                    GROUP BY timeslot
-                ) as measurements
-            ) as dates
-        ";
-        $stmt = DBManager::get()->prepare($sql);
-        $stmt->execute([':user' => $user->id]);
-        $score = $stmt->fetchColumn();
-        if ($user->score && $user->score != $score) {
-            $user->score = $score;
-            $user->store();
-        }
-        $cache->write("user_score_of_{$user->id}", $score, 60 * 5);
-
-        return $score;
-    }
-
-    protected static function createTimestampQuery()
-    {
-        $statements = [];
-        foreach (self::getActivityTables() as $table) {
-            $statements[] = "SELECT "
-                . ($table['date_column'] ?? 'mkdate')
-                . " AS mkdate FROM "
-                . $table['table']
-                . " WHERE "
-                . ($table['user_id_column'] ?? 'user_id')
-                . " = :user "
-                . (!empty($table['where']) ? (' AND ' . $table['where']) : '');
-        }
-        return join(' UNION ', $statements);
-    }
-
-    protected static function getActivityTables()
-    {
-        $tables = [];
-        $tables[] = ['table' => 'user_info'];
-        $tables[] = ['table' => 'comments'];
-        $tables[] = ['table' => 'file_refs'];
-        $tables[] = ['table' => 'forum_entries'];
-        $tables[] = ['table' => 'news'];
-        $tables[] = ['table' => 'seminar_user'];
-        $tables[] = [
-            'table' => 'blubber_threads'
-        ];
-        $tables[] = [
-            'table' => 'blubber_comments'
-        ];
-        $tables[] = [
-            'table'          => 'kategorien',
-            'user_id_column' => 'range_id',
-        ];
-        $tables[] = [
-            'table'          => 'message',
-            'user_id_column' => 'autor_id'
-        ];
-        $tables[] = ['table' => 'questionnaires'];
-        $tables[] = [
-            'table'       => 'questionnaire_answers',
-            'date_column' => 'chdate',
-        ];
-        $tables[] = ['table' => 'questionnaire_anonymous_answers'];
-        $tables[] = [
-            'table'       => 'wiki_pages',
-            'date_column' => 'chdate'
-        ];
-
-        foreach (PluginManager::getInstance()->getPlugins(ScorePlugin::class) as $plugin) {
-            foreach ((array) $plugin->getPluginActivityTables() as $table) {
-                if ($table['table']) {
-                    $tables[] = $table;
-                }
-            }
-        }
-
-        return $tables;
-    }
-}
diff --git a/lib/classes/Score.php b/lib/classes/Score.php
new file mode 100644
index 0000000..4d114d5
--- /dev/null
+++ b/lib/classes/Score.php
@@ -0,0 +1,225 @@
+<?
+/**
+ * Score.class.php - Score class
+ *
+ * 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.
+ *
+ * @author      Ralf Stockmann <rstockm@gwdg.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class Score
+{
+    // How long is the duration of a score-block?
+    const MEASURING_STEP = 1800; // half an hour
+
+    public static function getScoreContent($persons)
+    {
+        $user_ids = array_keys($persons);
+
+        // News
+        $query = "SELECT nr.range_id as user_id, COUNT(*) AS newscount
+                  FROM news_range AS nr
+                  INNER JOIN news AS n ON (nr.news_id = n.news_id)
+                  WHERE nr.range_id IN (?) AND UNIX_TIMESTAMP() <= n.date + n.expire
+                  GROUP BY nr.range_id
+                  ORDER BY NULL";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_ids]);
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $persons[$row['user_id']]['newscount'] = $row['newscount'];
+        }
+
+        // Events
+        $query = "SELECT `range_id` AS user_id, COUNT(*) AS eventcount
+                  FROM `calendar_date_assignments`
+                  INNER JOIN `calendar_dates`
+                  ON (`calendar_date_assignments`.`calendar_date_id` = `calendar_dates`.`id` AND `access` = 'PUBLIC')
+                  WHERE `range_id` IN (?) AND UNIX_TIMESTAMP() <= `end`
+                  GROUP BY `range_id`
+                  ORDER BY NULL";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_ids]);
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $persons[$row['user_id']]['eventcount'] = $row['eventcount'];
+        }
+
+        // Votes
+        if (Config::get()->VOTE_ENABLE){
+            $query = "SELECT questionnaire_assignments.range_id as user_id, COUNT(*) AS votecount
+                      FROM questionnaire_assignments
+                      WHERE questionnaire_assignments.range_id IN (?)
+                          AND questionnaire_assignments.range_type = 'user'
+                      GROUP BY questionnaire_assignments.range_id
+                      ORDER BY NULL";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$user_ids]);
+            while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+                $persons[$row['user_id']]['votecount'] = $row['votecount'];
+            }
+        }
+
+        return $persons;
+    }
+
+    /**
+    * Retrieves the titel for a given studip score
+    *
+    * @param        integer a score value
+    * @param        integer gender (0: unknown, 1: male; 2: female)
+    * @return       string  the titel
+    *
+    */
+    public static function getTitel($score, $gender = 0)
+    {
+        if ($score) {
+            $logscore = floor(log10($score) / log10(2));
+        } else {
+            $logscore = 0;
+        }
+
+        if ($logscore > 20) {
+            $logscore = 20;
+        }
+
+        $titel = [];
+        $titel[0]  = [_('Unbeschriebenes Blatt'), _('Unbeschriebenes Blatt')];
+        $titel[1]  = [_('Unbeschriebenes Blatt'), _('Unbeschriebenes Blatt')];
+        $titel[2]  = [_('Unbeschriebenes Blatt'), _('Unbeschriebenes Blatt')];
+        $titel[3]  = [_('Neuling'), _('Neuling')];
+        $titel[4]  = [_('Greenhorn'), _('Greenhorn')];
+        $titel[5]  = [_('Anfänger'), _('Anfängerin')];
+        $titel[6]  = [_('Einsteiger'), _('Einsteigerin')];
+        $titel[7]  = [_('Beginner'), _('Beginnerin')];
+        $titel[8]  = [_('Novize'), _('Novizin')];
+        $titel[9]  = [_('Fortgeschrittener'), _('Fortgeschrittene')];
+        $titel[10] = [_('Kenner'), _('Kennerin')];
+        $titel[11] = [_('Könner'), _('Könnerin')];
+        $titel[12] = [_('Profi'), _('Profi')];
+        $titel[13] = [_('Experte'), _('Expertin')];
+        $titel[14] = [_('Meister'), _('Meisterin')];
+        $titel[15] = [_('Großmeister'), _('Großmeisterin')];
+        $titel[16] = [_('Idol'), _('Idol')];
+        $titel[17] = [_('Guru'), _('Hohepriesterin')];
+        $titel[18] = [_('Lichtgestalt'), _('Lichtgestalt')];
+        $titel[19] = [_('Halbgott'), _('Halbgöttin')];
+        $titel[20] = [_('Gott'), _('Göttin')];
+
+        return $titel[$logscore][$gender == 2 ? 1 : 0];
+    }
+
+    /**
+    * Retrieves the score for the current user
+    *
+    * @return       integer the score
+    *
+    */
+    public static function GetMyScore($user_or_id = null)
+    {
+        $user = $user_or_id ? User::toObject($user_or_id) : User::findCurrent();
+        $cache = \Studip\Cache\Factory::getCache();
+        if ($cache->read("user_score_of_".$user->id)) {
+            return $cache->read("user_score_of_".$user->id);
+        }
+        //Behold! The all new mighty score algorithm!
+        //Step 1: Select all activities as mkdate-timestamps.
+        //Step 2: Group these activities to timeslots of halfhours
+        //        with COUNT(*) as a weigh of the timeslot.
+        //Step 3: Calculate the measurement of the timeslot from the weigh of it.
+        //        This makes the first activity count fully, the second
+        //        almost half and so on. We use log_n to make huge amounts of
+        //        activities to not count so much.
+        //Step 4: Calculate a single score for each timeslot depending on the
+        //        measurement and the mkdate-timestamp. Use arctan as the function
+        //        here so that older activities tend to zero.
+        //Step 5: Sum all scores from all timeslots together.
+        $sql = "
+            SELECT round(SUM((-atan(measurement / " . round(31556926 / self::MEASURING_STEP) . ") / PI() + 0.5) * 200)) as score
+            FROM (
+                SELECT ((unix_timestamp() / " . self::MEASURING_STEP . ") - timeslot) / (LN(weigh) + 1) AS measurement
+                FROM (
+                    SELECT (round(mkdate / " . self::MEASURING_STEP . ")) as timeslot, COUNT(*) AS weigh
+                    FROM (
+                        " . self::createTimestampQuery() . "
+                    ) as mkdates
+                    GROUP BY timeslot
+                ) as measurements
+            ) as dates
+        ";
+        $stmt = DBManager::get()->prepare($sql);
+        $stmt->execute([':user' => $user->id]);
+        $score = $stmt->fetchColumn();
+        if ($user->score && $user->score != $score) {
+            $user->score = $score;
+            $user->store();
+        }
+        $cache->write("user_score_of_{$user->id}", $score, 60 * 5);
+
+        return $score;
+    }
+
+    protected static function createTimestampQuery()
+    {
+        $statements = [];
+        foreach (self::getActivityTables() as $table) {
+            $statements[] = "SELECT "
+                . ($table['date_column'] ?? 'mkdate')
+                . " AS mkdate FROM "
+                . $table['table']
+                . " WHERE "
+                . ($table['user_id_column'] ?? 'user_id')
+                . " = :user "
+                . (!empty($table['where']) ? (' AND ' . $table['where']) : '');
+        }
+        return join(' UNION ', $statements);
+    }
+
+    protected static function getActivityTables()
+    {
+        $tables = [];
+        $tables[] = ['table' => 'user_info'];
+        $tables[] = ['table' => 'comments'];
+        $tables[] = ['table' => 'file_refs'];
+        $tables[] = ['table' => 'forum_entries'];
+        $tables[] = ['table' => 'news'];
+        $tables[] = ['table' => 'seminar_user'];
+        $tables[] = [
+            'table' => 'blubber_threads'
+        ];
+        $tables[] = [
+            'table' => 'blubber_comments'
+        ];
+        $tables[] = [
+            'table'          => 'kategorien',
+            'user_id_column' => 'range_id',
+        ];
+        $tables[] = [
+            'table'          => 'message',
+            'user_id_column' => 'autor_id'
+        ];
+        $tables[] = ['table' => 'questionnaires'];
+        $tables[] = [
+            'table'       => 'questionnaire_answers',
+            'date_column' => 'chdate',
+        ];
+        $tables[] = ['table' => 'questionnaire_anonymous_answers'];
+        $tables[] = [
+            'table'       => 'wiki_pages',
+            'date_column' => 'chdate'
+        ];
+
+        foreach (PluginManager::getInstance()->getPlugins(ScorePlugin::class) as $plugin) {
+            foreach ((array) $plugin->getPluginActivityTables() as $table) {
+                if ($table['table']) {
+                    $tables[] = $table;
+                }
+            }
+        }
+
+        return $tables;
+    }
+}
diff --git a/lib/classes/SemBrowse.class.php b/lib/classes/SemBrowse.class.php
deleted file mode 100644
index 536b7e3..0000000
--- a/lib/classes/SemBrowse.class.php
+++ /dev/null
@@ -1,1264 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter005: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-require_once 'lib/dates.inc.php';
-
-class SemBrowse {
-
-    public $sem_browse_data;
-    public $persistent_fields = [
-        'level', 'cmd', 'start_item_id', 'show_class', 'group_by',
-        'search_result', 'default_sem', 'sem_status', 'show_entries', 'sset'
-    ];
-    public $search_obj;
-    public $sem_tree;
-    public $range_tree;
-    public $show_result;
-    public $sem_number;
-    public $group_by_fields = [];
-    public $target_url;
-    public $target_id;
-    public $classes_show_module;
-    public $classes_show_class;
-
-    public function __construct($sem_browse_data_init = [])
-    {
-
-        $this->group_by_fields =
-                [
-                    [
-                        'name'        => _('Semester'),
-                        'group_field' => 'sem_number'
-                    ],
-                    [
-                        'name'        => _('Bereich'),
-                        'group_field' => 'bereich'
-                    ],
-                    [
-                        'name'         => _('Lehrende'),
-                        'group_field'  => 'fullname',
-                        'unique_field' => 'username'
-                    ],
-                    [
-                        'name'        => _('Typ'),
-                        'group_field' => 'status'
-                    ],
-                    [
-                        'name'         => _('Einrichtung'),
-                        'group_field'  => 'Institut',
-                        'unique_field' => 'Institut_id'
-                    ]
-                ];
-
-        if (empty($_SESSION['sem_browse_data'])) {
-            $_SESSION['sem_browse_data'] = $sem_browse_data_init;
-        }
-        $this->sem_browse_data =& $_SESSION['sem_browse_data'];
-
-        $level_change = Request::option('start_item_id') || Request::submitted('search_sem_sem_change');
-
-        for ($i = 0; $i < count($this->persistent_fields); ++$i){
-            $persistend_field = $this->persistent_fields[$i];
-            if (Request::get($persistend_field) != null) {
-                $this->sem_browse_data[$persistend_field] = Request::option($persistend_field);
-            }
-        }
-        $this->search_obj = new StudipSemSearch(
-            'search_sem',
-            false,
-            !(is_object($GLOBALS['perm']) && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)),
-            $this->sem_browse_data['show_class'] ?? null
-        );
-
-
-        if (Request::get($this->search_obj->form_name . '_scope_choose')) {
-            $this->sem_browse_data['start_item_id'] =
-                    Request::option($this->search_obj->form_name . '_scope_choose');
-        }
-        if (Request::get($this->search_obj->form_name . '_range_choose')) {
-            $this->sem_browse_data['start_item_id'] =
-                    Request::option($this->search_obj->form_name . '_range_choose');
-        }
-        if (Request::get($this->search_obj->form_name . '_sem')) {
-            $this->sem_browse_data['default_sem'] =
-                    Request::option($this->search_obj->form_name . '_sem');
-        }
-
-        if (
-            Request::get('keep_result_set')
-            || !empty($this->sem_browse_data['sset'])
-            || (!empty($this->sem_browse_data['search_result']) && !empty($this->sem_browse_data['show_entries']))
-        ) {
-            $this->show_result = true;
-        }
-
-        if (isset($this->sem_browse_data['cmd']) && $this->sem_browse_data['cmd'] === 'xts') {
-            if ($this->search_obj->new_search_button_clicked) {
-                $this->show_result = false;
-                $this->sem_browse_data['sset'] = false;
-                $this->sem_browse_data['search_result'] = [];
-            }
-        }
-
-        if (!isset($this->sem_browse_data['default_sem'])) {
-            $this->sem_number[0] = 0;
-        } elseif ($this->sem_browse_data['default_sem'] != 'all') {
-            $this->sem_number[0] = intval($this->sem_browse_data['default_sem']);
-        } else {
-            $this->sem_number = false;
-        }
-
-        $sem_status = (!empty($this->sem_browse_data['sem_status']) && is_array($this->sem_browse_data['sem_status'])) ? $this->sem_browse_data['sem_status'] : false;
-
-        if ($this->sem_browse_data['level'] == 'vv') {
-            if (empty($this->sem_browse_data['start_item_id'])) {
-                $this->sem_browse_data['start_item_id'] = 'root';
-            }
-            $this->sem_tree = new StudipSemTreeViewSimple(
-                    $this->sem_browse_data['start_item_id'],
-                    $this->sem_number, $sem_status,
-                    !(is_object($GLOBALS['perm'])
-                            && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)));
-            if (Request::option('cmd') != 'show_sem_range'
-                    && $level_change
-                    && !$this->search_obj->search_button_clicked ) {
-                $this->get_sem_range($this->sem_browse_data['start_item_id'], false);
-                $this->show_result = true;
-                $this->sem_browse_data['show_entries'] = 'level';
-                $this->sem_browse_data['sset'] = false;
-            }
-            if ($this->search_obj->sem_change_button_clicked) {
-                $this->get_sem_range($this->sem_browse_data['start_item_id'],
-                        ($this->sem_browse_data['show_entries'] == 'sublevels'));
-                $this->show_result = true;
-            }
-        }
-
-        if ($this->sem_browse_data['level'] == 'ev'){
-            if (!$this->sem_browse_data['start_item_id']) {
-                $this->sem_browse_data['start_item_id'] = 'root';
-            }
-            $this->range_tree = new StudipSemRangeTreeViewSimple(
-                    $this->sem_browse_data['start_item_id'],
-                    $this->sem_number,
-                    $sem_status,
-                    !(is_object($GLOBALS['perm'])
-                            && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)));
-            if (Request::option('cmd') != 'show_sem_range_tree'
-                    && $level_change
-                    && !$this->search_obj->search_button_clicked ) {
-                $this->get_sem_range_tree($this->sem_browse_data['start_item_id'], false);
-                $this->show_result = true;
-                $this->sem_browse_data['show_entries'] = 'level';
-                $this->sem_browse_data['sset'] = false;
-            }
-            if ($this->search_obj->sem_change_button_clicked) {
-                $this->get_sem_range_tree($this->sem_browse_data['start_item_id'],
-                        ($this->sem_browse_data['show_entries'] == 'sublevels'));
-                $this->show_result = true;
-            }
-        }
-
-        if ($this->search_obj->search_button_clicked
-                && !$this->search_obj->new_search_button_clicked) {
-            $this->search_obj->override_sem = $this->sem_number;
-            $this->search_obj->doSearch();
-            if ($this->search_obj->found_rows) {
-                $this->sem_browse_data['search_result'] = array_flip($this->search_obj->search_result->getRows('seminar_id'));
-            } else {
-                $this->sem_browse_data['search_result'] = [];
-            }
-            $this->show_result = true;
-            $this->sem_browse_data['show_entries'] = false;
-            $this->sem_browse_data['sset'] = Request::get($this->search_obj->form_name . "_quick_search_parameter");
-        }
-
-
-        if (Request::option('cmd') == 'show_sem_range') {
-            $tmp = explode('_', Request::option('item_id'));
-            $this->get_sem_range($tmp[0], isset($tmp[1]));
-            $this->show_result = true;
-            $this->sem_browse_data['show_entries'] = (isset($tmp[1])) ? 'sublevels' : 'level';
-            $this->sem_browse_data['sset'] = false;
-        }
-
-        if (Request::option('cmd') == 'show_sem_range_tree') {
-            $tmp = explode('_', Request::option('item_id'));
-            $this->get_sem_range_tree($tmp[0],isset($tmp[1]));
-            $this->show_result = true;
-            $this->sem_browse_data['show_entries'] = (isset($tmp[1])) ? 'sublevels' : 'level';
-            $this->sem_browse_data['sset'] = false;
-        }
-
-        if (Request::option('do_show_class')
-                && count($this->sem_browse_data['sem_status'])) {
-            $this->get_sem_class();
-        }
-
-    }
-
-    /**
-     * Returns whether the search for modules has to be displayed.
-     *
-     * @return boolean True if search for modules has to be displayed.
-     */
-    private function showModules()
-    {
-        if ($this->sem_browse_data['show_class'] == 'all') {
-            return true;
-        }
-        if (!is_array($this->classes_show_module)) {
-            $this->classes_show_class = [];
-            foreach ($GLOBALS['SEM_CLASS'] as $sem_class_key => $sem_class){
-                if ($sem_class['module']) {
-                    $this->classes_show_module[] = $sem_class_key;
-                }
-            }
-        }
-        return in_array($this->sem_browse_data['show_class'], $this->classes_show_class);
-    }
-
-    public function show_class()
-    {
-        if ($this->sem_browse_data['show_class'] == 'all') {
-            return true;
-        }
-        if (!is_array($this->classes_show_class)) {
-            $this->classes_show_class = [];
-            foreach ($GLOBALS['SEM_CLASS'] as $sem_class_key => $sem_class) {
-                if ($sem_class['bereiche']) {
-                    $this->classes_show_class[] = $sem_class_key;
-                }
-            }
-        }
-        return in_array($this->sem_browse_data['show_class'], $this->classes_show_class);
-    }
-
-    public function get_sem_class()
-    {
-        $query = "SELECT `Seminar_id`
-                  FROM `seminare`
-                  WHERE `status` IN (?)";
-
-        $show_all = is_object($GLOBALS['perm'])
-                 && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM);
-        if (!$show_all) {
-            $query .= ' AND visible = 1';
-        }
-
-        $sem_ids = DBManager::get()->fetchFirst($query);
-        if (is_array($sem_ids)) {
-            $this->sem_browse_data['search_result'] = array_flip($sem_ids);
-        }
-        $this->sem_browse_data['sset'] = true;
-        $this->show_result = true;
-    }
-
-    public function get_sem_range($item_id, $with_kids)
-    {
-        if (!is_object($this->sem_tree)) {
-            $sem_status = (is_array($this->sem_browse_data['sem_status'])) ? $this->sem_browse_data['sem_status'] : false;
-            $this->sem_tree = new StudipSemTreeViewSimple(
-                    $this->sem_browse_data['start_item_id'],
-                    $this->sem_number,
-                    $sem_status,
-                    !(is_object($GLOBALS['perm'])
-                            && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)));
-        }
-        $sem_ids = $this->sem_tree->tree->getSemIds($item_id,$with_kids);
-        if (is_array($sem_ids)) {
-            $this->sem_browse_data['search_result'] = array_flip($sem_ids);
-        } else {
-            $this->sem_browse_data['search_result'] = [];
-        }
-    }
-
-    public function get_sem_range_tree($item_id, $with_kids)
-    {
-        $range_object = RangeTreeObject::GetInstance($item_id);
-        if ($with_kids) {
-            $inst_ids = $range_object->getAllObjectKids();
-        }
-        $inst_ids[] = $range_object->item_data['studip_object_id'];
-        $db_view = DbView::getView('sem_tree');
-        $db_view->params[0] = $inst_ids;
-        $db_view->params[1] = (is_object($GLOBALS['perm']) && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) ? '' : ' AND c.visible=1';
-        $db_view->params[1] .= !empty($this->sem_browse_data['sem_status']) && is_array($this->sem_browse_data['sem_status'])
-                ? " AND c.status IN('" . join("','", $this->sem_browse_data['sem_status']) ."')"
-                : '';
-        $db_view->params[2] = is_array($this->sem_number)
-                ? ' HAVING sem_number IN ('
-                    . join(',', $this->sem_number)
-                    . ') OR (sem_number <= '
-                    . $this->sem_number[count($this->sem_number) - 1]
-                    . '  AND (sem_number_end >= '
-                    . $this->sem_number[count($this->sem_number) - 1]
-                    . ' OR sem_number_end = -1)) '
-                : '';
-        $db_snap = new DbSnapshot($db_view->get_query('view:SEM_INST_GET_SEM'));
-        if ($db_snap->numRows) {
-            $sem_ids = $db_snap->getRows('Seminar_id');
-            $this->sem_browse_data['search_result'] = array_flip($sem_ids);
-        } else {
-            $this->sem_browse_data['search_result'] = [];
-        }
-    }
-
-    /**
-     * Prints the quicksearch form.
-     */
-    private function printQuickSearch()
-    {
-        if ($this->sem_browse_data['level'] === 'vv') {
-            $this->search_obj->sem_tree =& $this->sem_tree->tree;
-            if ($this->sem_tree->start_item_id !== 'root') {
-                $this->search_obj->search_scopes[] = $this->sem_tree->start_item_id;
-            }
-        } elseif ($this->sem_browse_data['level'] === 'ev') {
-            $this->search_obj->range_tree =& $this->range_tree->tree;
-            if ($this->range_tree->start_item_id !== 'root'){
-                $this->search_obj->search_ranges[] = $this->range_tree->start_item_id;
-            }
-        }
-
-        $template = $GLOBALS['template_factory']->open('sembrowse/quick-search.php');
-        $template->search_obj      = $this->search_obj;
-        $template->sem_browse_data = $this->sem_browse_data;
-        $template->sem_tree        = $this->sem_tree;
-        $template->range_tree      = $this->range_tree;
-        $template->quicksearch     = $this->getQuicksearch();
-
-        echo $template->render();
-    }
-
-    private function getQuicksearch()
-    {
-        $quicksearch = QuickSearch::get(
-            $this->search_obj->form_name . '_quick_search',
-            new SeminarSearch()
-        );
-
-        $quicksearch->setAttributes([
-            'aria-label' => _('Suchbegriff'),
-            'autofocus'  => '',
-        ]);
-        $quicksearch->fireJSFunctionOnSelect('selectSem');
-        $quicksearch->noSelectbox();
-        $quicksearch->defaultValue(
-            $this->sem_browse_data['sset'] ?: '',
-            $this->sem_browse_data['sset'] ?: ''
-        );
-
-        return $quicksearch;
-    }
-
-    private function printExtendedSearch()
-    {
-        $template = $GLOBALS['template_factory']->open('sembrowse/extended-search.php');
-        $template->search_obj      = $this->search_obj;
-        $template->sem_browse_data = $this->sem_browse_data;
-        $template->show_class      = $this->show_class();
-        echo $template->render();
-    }
-
-    public function do_output()
-    {
-        if ($this->sem_browse_data['cmd'] == 'xts') {
-            $this->printExtendedSearch();
-        }
-        $path_id = Request::option('path_id');
-        URLHelper::addLinkParam('path_id', $path_id);
-        $this->print_level($path_id);
-    }
-
-    public function print_level($start_id = null)
-    {
-        ob_start();
-
-        echo "\n" . '<table id="sem_search_level" class="course-search" style="width: 100%">' . "\n";
-        if ($this->sem_browse_data['level'] == 'vv') {
-            echo "\n" . '<caption class="legend">'._('Studienbereiche').'<caption>';
-            echo "\n" . '<tr><td style="text-align: center">';
-            $this->sem_tree->show_entries = $this->sem_browse_data['show_entries'] ?? false;
-            $this->sem_tree->showSemTree($start_id);
-        }
-        if ($this->sem_browse_data['level'] == 'ev') {
-            echo "\n" . '<caption class="legend">'._('Einrichtungen').'<caption>';
-            echo "\n" . '<tr><td style="text-align: center">';
-            $this->range_tree->show_entries = $this->sem_browse_data['show_entries'] ?? false;
-            $this->range_tree->showSemRangeTree($start_id);
-        }
-
-        if ($this->show_result) {
-            $this->print_result();
-        }
-
-        echo '</td></tr></table>';
-        ob_end_flush();
-    }
-
-    public function print_result()
-    {
-        ob_start();
-        global $SEM_TYPE, $SEM_CLASS;
-
-        if (is_array($this->sem_browse_data['search_result'])
-                && count($this->sem_browse_data['search_result'])) {
-            if (!is_object($this->sem_tree)) {
-                $this->sem_tree = new StudipSemTreeViewSimple(
-                        $this->sem_browse_data['start_item_id'] ?? null,
-                        $this->sem_number,
-                        !empty($this->sem_browse_data['sem_status']) && is_array($this->sem_browse_data['sem_status'])
-                            ? $this->sem_browse_data['sem_status'] : false,
-                        !(is_object($GLOBALS['perm']) && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM))
-                );
-            }
-            $the_tree = $this->sem_tree->tree;
-
-            list($group_by_data, $sem_data) = $this->get_result();
-
-            $visibles = $sem_data;
-            if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
-                $visibles = array_filter($visibles, function ($c) {
-                    return key($c['visible']) == 1;
-                });
-            }
-
-            echo '<table class="default" id="sem_search_result" style="width: calc(100% - 21px);" >';
-            foreach ($group_by_data as $group_field => $sem_ids) {
-                if (Config::get()->COURSE_SEARCH_SHOW_ADMISSION_STATE) {
-                    echo '<tr><th colspan="6">';
-                } else {
-                    echo '<tr><th colspan="5">';
-                }
-                switch ($this->sem_browse_data['group_by'] ?? null) {
-                    case 0:
-                        echo htmlReady($this->search_obj->sem_dates[$group_field]['name'] ?? '');
-                        break;
-                    case 1:
-                        if ($the_tree->tree_data[$group_field]) {
-                            echo htmlReady($the_tree->getShortPath($group_field));
-                            if (is_object($this->sem_tree)){
-                                echo $this->sem_tree->getInfoIcon($group_field);
-                            }
-                        } else {
-                            echo _('keine Studienbereiche eingetragen');
-                        }
-                        break;
-                    case 3:
-                        echo htmlReady($SEM_TYPE[$group_field]['name']
-                                . ' ('
-                                . $SEM_CLASS[$SEM_TYPE[$group_field]['class']]['name']
-                                . ')');
-                        break;
-                    default:
-                        echo htmlReady($group_field);
-                }
-                echo '</th></tr>';
-                ob_end_flush();
-                ob_start();
-                if (is_array($sem_ids['Seminar_id'])) {
-                    foreach(array_keys($sem_ids['Seminar_id']) as $seminar_id){
-                        echo $this->printCourseRow($seminar_id, $sem_data);
-                    }
-                }
-            }
-            echo '</table>';
-        } elseif ($this->search_obj->search_button_clicked
-                && !$this->search_obj->new_search_button_clicked) {
-            $details = [];
-            if ($this->search_obj->found_rows === false) {
-                $details = [_('Der Suchbegriff fehlt oder ist zu kurz')];
-            }
-            if ($details) {
-                PageLayout::postError(_('Ihre Suche ergab keine Treffer'), $details);
-            } else {
-                PageLayout::postInfo(_('Ihre Suche ergab keine Treffer'));
-            }
-            $this->sem_browse_data['sset'] = 0;
-        }
-        ob_end_flush();
-    }
-
-    public function get_result()
-    {
-        global $_fullname_sql, $user;
-        if ($this->sem_browse_data['group_by'] == 1) {
-            if (!is_object($this->sem_tree)) {
-                $the_tree = TreeAbstract::GetInstance('StudipSemTree', false);
-            } else {
-                $the_tree = $this->sem_tree->tree;
-            }
-            $sem_tree_query = '';
-            if ($this->sem_browse_data['start_item_id'] != 'root'
-                    && ($this->sem_browse_data['level'] == 'vv'
-                    || $this->sem_browse_data['level'] == 'sbb')) {
-                $allowed_ranges = $the_tree->getKidsKids($this->sem_browse_data['start_item_id']);
-                $allowed_ranges[] = $this->sem_browse_data['start_item_id'];
-                $sem_tree_query = " AND sem_tree_id IN('" . join("','", $allowed_ranges) . "') ";
-            }
-            $add_fields = 'seminar_sem_tree.sem_tree_id AS bereich,';
-            $add_query = "LEFT JOIN seminar_sem_tree ON (seminare.Seminar_id = seminar_sem_tree.seminar_id $sem_tree_query)";
-        } else if ($this->sem_browse_data['group_by'] == 4){
-            $add_fields = 'Institute.Name AS Institut,Institute.Institut_id,';
-            $add_query = 'LEFT JOIN seminar_inst
-                            ON (seminare.Seminar_id = seminar_inst.Seminar_id)
-                          LEFT JOIN Institute
-                            ON (Institute.Institut_id = seminar_inst.institut_id)';
-        } else {
-            $add_fields = '';
-            $add_query = '';
-        }
-
-        $dbv = DbView::getView('sem_tree');
-
-        $query = "
-            SELECT seminare.Seminar_id, VeranstaltungsNummer, seminare.status,
-                IF(seminare.visible = 0, CONCAT(seminare.Name, ' " . _('(versteckt)')
-                    . "'), seminare.Name) AS Name,"
-                . $add_fields
-                . $_fullname_sql['full'] . " AS fullname,
-                    auth_user_md5.username,"
-                . $dbv->sem_number_sql . ' AS sem_number, '
-                . $dbv->sem_number_end_sql . ' AS sem_number_end,
-                seminar_user.position AS position, seminare.parent_course, seminare.visible
-            FROM seminare
-                LEFT JOIN seminar_user
-                    ON (seminare.Seminar_id=seminar_user.Seminar_id AND seminar_user.status = ' . "'dozent'" . ')
-                LEFT JOIN auth_user_md5
-                    USING (user_id)
-                LEFT JOIN user_info
-                    USING (user_id) '
-                . $add_query . "
-            WHERE (seminare.Seminar_id IN('" . join("','", array_keys($this->sem_browse_data['search_result'])) . "')
-                OR seminare.parent_course IN ('" . join("','", array_keys($this->sem_browse_data['search_result'])) . "'))";
-
-        // don't show Studiengruppen if user not logged in
-        if (!$GLOBALS['user'] || $GLOBALS['user']->id == 'nobody') {
-            $studygroup_types = DBManager::get()->quote(studygroup_sem_types());
-            $query .= " AND seminare.status NOT IN ({$studygroup_types})";
-        }
-
-        $db = new DB_Seminar($query);
-        $snap = new DbSnapshot($db);
-        $group_field = $this->group_by_fields[$this->sem_browse_data['group_by']]['group_field'];
-        $data_fields[0] = 'Seminar_id';
-        if (!empty($this->group_by_fields[$this->sem_browse_data['group_by']]['unique_field'])) {
-            $data_fields[1] = $this->group_by_fields[$this->sem_browse_data['group_by']]['unique_field'];
-        }
-        if($user->id == 'nobody' && $snap->numRows == 0){
-            $group_by_data = $sem_data = [];
-        }else{
-            $group_by_data = $snap->getGroupedResult($group_field, $data_fields);
-            $sem_data = $snap->getGroupedResult('Seminar_id');
-        }
-
-        if ($this->sem_browse_data['group_by'] == 0) {
-            if($user->id == 'nobody' && $snap->numRows == 0){
-                $group_by_duration = [];
-            }else{
-                $group_by_duration = $snap->getGroupedResult('sem_number_end', ['sem_number', 'Seminar_id']);
-            }
-            foreach ($group_by_duration as $sem_number_end => $detail) {
-                if ($sem_number_end != -1
-                        && ($detail['sem_number'][$sem_number_end]
-                                && count($detail['sem_number']) == 1)) {
-                    continue;
-                }
-
-                $current_semester_index = Semester::getIndexById(Semester::findCurrent()->semester_id, true, true);
-                foreach (array_keys($detail['Seminar_id']) as $seminar_id) {
-                    $start_sem = key($sem_data[$seminar_id]['sem_number']);
-                    if ($sem_number_end == -1) {
-                        if ($this->sem_number === false) {
-                            $sem_number_end = $current_semester_index && isset($this->search_obj->sem_dates[$current_semester_index + 1]) ? $current_semester_index + 1 : count($this->search_obj->sem_dates) -1;
-                        } else {
-                            $sem_number_end = $this->sem_number[0];
-                        }
-                    }
-                    for ($i = $start_sem; $i <= $sem_number_end; ++$i) {
-                        if ($this->sem_number === false
-                                || is_array($this->sem_number)
-                                && in_array($i, $this->sem_number)) {
-                            if (!empty($group_by_data[$i]) && empty($tmp_group_by_data[$i])) {
-                                foreach (array_keys($group_by_data[$i]['Seminar_id']) as $id) {
-                                    $tmp_group_by_data[$i]['Seminar_id'][$id] = true;
-                                }
-                            }
-                            $tmp_group_by_data[$i]['Seminar_id'][$seminar_id] = true;
-                        }
-                    }
-                }
-            }
-            if (!empty($tmp_group_by_data) && is_array($tmp_group_by_data)) {
-                if ($this->sem_number !== false) {
-                    unset($group_by_data);
-                }
-                foreach ($tmp_group_by_data as $start_sem => $detail) {
-                    $group_by_data[$start_sem] = $detail;
-                }
-            }
-        }
-
-        //release memory
-        unset($snap);
-        unset($tmp_group_by_data);
-
-        foreach ($group_by_data as $group_field => $sem_ids) {
-            foreach ($sem_ids['Seminar_id'] as $seminar_id => $foo) {
-                $name = mb_strtolower(key($sem_data[$seminar_id]['Name']));
-                $name = str_replace(['ä', 'ö', 'ü'], ['ae', 'oe', 'ue'], $name);
-                if (Config::get()->IMPORTANT_SEMNUMBER && key($sem_data[$seminar_id]['VeranstaltungsNummer'])) {
-                    $name = key($sem_data[$seminar_id]['VeranstaltungsNummer']) . ' ' . $name;
-                }
-                $group_by_data[$group_field]['Seminar_id'][$seminar_id] = $name;
-            }
-            uasort($group_by_data[$group_field]['Seminar_id'], 'strnatcmp');
-        }
-
-        switch ($this->sem_browse_data['group_by']) {
-            case 0:
-                krsort($group_by_data, SORT_NUMERIC);
-                break;
-            case 1:
-                uksort($group_by_data, function($a,$b) {
-                    $the_tree = TreeAbstract::GetInstance('StudipSemTree', false);
-                    $the_tree->buildIndex();
-                    return $the_tree->tree_data[$a]['index'] - $the_tree->tree_data[$b]['index'];
-                });
-                break;
-            case 3:
-                uksort($group_by_data, function ($a,$b) {
-                    global $SEM_CLASS,$SEM_TYPE;
-                    return strnatcasecmp($SEM_TYPE[$a]['name'], $SEM_TYPE[$b]['name'])
-                        ?: strnatcasecmp(
-                               $SEM_CLASS[$SEM_TYPE[$a]['class']]['name'],
-                               $SEM_CLASS[$SEM_TYPE[$b]["class"]]['name']
-                           );
-                });
-                break;
-            default:
-                uksort($group_by_data, 'strnatcasecmp');
-        }
-
-        return [$group_by_data, $sem_data];
-    }
-
-    /**
-     * Creates HTML code for a single course row. This has been extracted
-     * into a separate function as that makes handling and outputting
-     * course children easier.
-     *
-     * @param string $seminar_id a single course id to output
-     * @param mixed $sem_data collected data for all found courses
-     * @param bool $child call in "child mode" -> force output because here children are listed
-     * @return string A HTML table row.
-     */
-    private function printCourseRow($seminar_id, &$sem_data, $child = false)
-    {
-        global $SEM_TYPE;
-
-        $row = '';
-
-        /*
-         * As we include child courses now, we need an extra check for visibility.
-         * Child courses are not shown extra, but summarized under their parent if
-         * the parent is part of the search result.
-         */
-        if (($GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)
-                || key($sem_data[$seminar_id]['visible']) == 1)
-                && (empty($sem_data[key($sem_data[$seminar_id]['parent_course'])])
-                        || $child)) {
-            // create instance of seminar-object
-            $seminar_obj = new Seminar($seminar_id);
-            // is this sem a studygroup?
-            $studygroup_mode = SeminarCategories::GetByTypeId($seminar_obj->getStatus())->studygroup_mode;
-
-            $sem_name = $seminar_obj->getFullName('type-name');
-            $seminar_number = key($sem_data[$seminar_id]['VeranstaltungsNummer']);
-
-            $visibleChildren = [];
-
-            $row .= '<tr';
-            // Set necessary classes if we are displaying subcourses.
-            if ($child) {
-                $row .= ' class="hidden-js subcourses subcourses-' . key($sem_data[$seminar_id]['parent_course']) . '"' ;
-            }
-            $row .= '>';
-
-            if ($studygroup_mode) {
-                $sem_name .= ' (' . _('Studiengruppe');
-                if ($seminar_obj->admission_prelim) $sem_name .= ', ' . _('Zutritt auf Anfrage');
-                $sem_name .= ')';
-                $row .= '<td width="1%" class="hidden-tiny-down">';
-                $row .= StudygroupAvatar::getAvatar($seminar_id)->getImageTag(Avatar::SMALL, ['title' => $seminar_obj->getName()]);
-                $row .= '</td>';
-            } else {
-                $sem_number_start = key($sem_data[$seminar_id]['sem_number']);
-                $sem_number_end = key($sem_data[$seminar_id]['sem_number_end']);
-                if ($sem_number_start != $sem_number_end) {
-                    $sem_name .= ' (' . $this->search_obj->sem_dates[$sem_number_start]['name'] . ' - ';
-                    $sem_name .= (($sem_number_end == -1)
-                            ? _('unbegrenzt')
-                            : $this->search_obj->sem_dates[$sem_number_end]['name']) . ')';
-                } elseif ($this->sem_browse_data['group_by']) {
-                    $sem_name .= " (" . $this->search_obj->sem_dates[$sem_number_start]['name'] . ')';
-                }
-                $row .= '<td width="1%" class="hidden-tiny-down">';
-                $row .= CourseAvatar::getAvatar($seminar_id)->getImageTag(Avatar::SMALL, ['title' => $seminar_obj->getName()]);
-                $row .= '</td>';
-
-            }
-            $send_from_search = URLHelper::getUrl(basename($_SERVER['PHP_SELF']), ['keep_result_set' => 1, 'cid' => null]);
-            $send_from_search_link = URLHelper::getLink($this->target_url,
-                    [
-                        $this->target_id => $seminar_id,
-                        'cid' => null,
-                        'send_from_search' => 1,
-                        'send_from_search_page' => $send_from_search
-                    ]);
-            $row .= '<td style="width: 66%" colspan="2">';
-
-            // Show the "more" icon only if there are visible children.
-            if (count($seminar_obj->children) > 0) {
-
-                // If you are not root, perhaps not all available subcourses are visible.
-                $visibleChildren = $seminar_obj->children;
-                if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
-                    $visibleChildren = $visibleChildren->filter(function($c) {
-                        return $c->visible;
-                    });
-                }
-                if (count($visibleChildren) > 0) {
-                    $row .= Icon::create('add', Icon::ROLE_CLICKABLE ,[
-                            'id' => 'show-subcourses-' . $seminar_id,
-                            'title' => sprintf(_('%u Unterveranstaltungen anzeigen'), count($visibleChildren)),
-                            'onclick' => "jQuery('tr.subcourses-" . $seminar_id . "').removeClass('hidden-js');jQuery(this).closest('tr').addClass('has-subcourses');jQuery(this).hide();jQuery('#hide-subcourses-" . $seminar_id . "').show();"
-                        ])->asImg(12) . ' ';
-                    $row .= Icon::create('remove', Icon::ROLE_CLICKABLE ,[
-                            'id' => 'hide-subcourses-' . $seminar_id,
-                            'style' => 'display:none',
-                            'title' => sprintf(_('%u Unterveranstaltungen ausblenden'), count($visibleChildren)),
-                            'onclick' => "jQuery('tr.subcourses-" . $seminar_id . "').addClass('hidden-js'); jQuery(this).closest('tr').removeClass('has-subcourses');jQuery(this).hide();jQuery('#show-subcourses-" . $seminar_id . "').show();"
-                        ])->asImg(12) . ' ';
-                }
-            }
-
-            $row .= '<a href="' . $send_from_search_link . '">';
-            if (Config::get()->IMPORTANT_SEMNUMBER && $seminar_number) {
-                $row .= htmlReady($seminar_number) . " ";
-            }
-            $row .= htmlReady($sem_name) . '</a><br>';
-            //create Turnus field
-            if ($studygroup_mode) {
-                $row .= '<div style="font-size:smaller">'
-                        . htmlReady(mb_substr($seminar_obj->description, 0, 100))
-                        . '</div>';
-            } else {
-                $temp_turnus_string = $seminar_obj->getDatesExport(
-                    [
-                        'short' => true,
-                        'shrink' => true,
-                        'semester_id' => ''
-                    ]
-                );
-                //Shorten, if string too long (add link for details.php)
-                if (mb_strlen($temp_turnus_string) > 70) {
-                    $temp_turnus_string = htmlReady(mb_substr($temp_turnus_string, 0, mb_strpos(mb_substr($temp_turnus_string, 70, mb_strlen($temp_turnus_string)), ',') + 71));
-                    $temp_turnus_string .= ' ... <a href="' . $send_from_search_link . '">(' . _('mehr') . ')</a>';
-                } else {
-                    $temp_turnus_string = htmlReady($temp_turnus_string);
-                }
-                if (!Config::get()->IMPORTANT_SEMNUMBER) {
-                    $row .= '<div style="margin-left:5px;font-size:smaller">' . htmlReady($seminar_number) . '</div>';
-                }
-                $row .= '<div style="margin-left:5px;font-size:smaller">' . $temp_turnus_string . '</div>';
-                if (count($seminar_obj->children) > 0 && count($visibleChildren) > 0) {
-                    $row .= '<div style="margin-left:5px;font-size:smaller">';
-                    $row .= sprintf(_('%u Unterveranstaltungen'), count($visibleChildren));
-                    $row .= '</div>';
-                }
-            }
-            $row .= '</td>';
-            $row .= '<td style="text-align: right">(';
-            $doz_name = [];
-            $c = 0;
-            reset($sem_data[$seminar_id]['fullname']);
-            foreach ($sem_data[$seminar_id]['username'] as $anzahl1) {
-                if ($c == 0) {
-                    $d_name = key($sem_data[$seminar_id]['fullname']);
-                    $anzahl2 = current($sem_data[$seminar_id]['fullname']);
-                    next($sem_data[$seminar_id]['fullname']);
-                    $c = $anzahl2 / $anzahl1;
-                    $doz_name = array_merge($doz_name, array_fill(0, $c, $d_name));
-                }
-                --$c;
-            }
-            $doz_uname = array_keys($sem_data[$seminar_id]['username']);
-            $doz_position = array_keys($sem_data[$seminar_id]['position']);
-            if (count($doz_name)) {
-                if (count($doz_position) != count($doz_uname)) {
-                    $doz_position = range(1, count($doz_uname));
-                }
-                array_multisort($doz_position, $doz_name, $doz_uname);
-                $i = 0;
-                foreach ($doz_name as $index => $value) {
-                    if ($value) {  // hide dozenten with empty username
-                        if ($i == 4) {
-                            $row .= '... <a href="' . $send_from_search_link . '">(' . _('mehr') . ')</a>';
-                            break;
-                        }
-                        $row .= '<a href="' . URLHelper::getLink('dispatch.php/profile', ['username' => $doz_uname[$index]]) . '">' . htmlReady($value) . '</a>';
-                        if ($i != count($doz_name) - 1) {
-                            $row .= ', ';
-                        }
-                    }
-                    ++$i;
-                }
-                $row .= ')</td>';
-                if (Config::get()->COURSE_SEARCH_SHOW_ADMISSION_STATE) {
-                    $row .= '<td>';
-                    switch (self::getStatusCourseAdmission($seminar_id,
-                            $seminar_obj->admission_prelim)) {
-                        case 1:
-                            $row .= Icon::create(
-                                'info-circle',
-                                Icon::ROLE_STATUS_YELLOW,
-                                tooltip2(_('Eingeschränkter Zugang'))
-                            );
-                            break;
-                        case 2:
-                            $row .= Icon::create(
-                                'decline-circle',
-                                Icon::ROLE_STATUS_RED,
-                                tooltip2(_('Kein Zugang'))
-                            );
-                            break;
-                        default:
-                            $row .= Icon::create(
-                                'check-circle',
-                                Icon::ROLE_STATUS_GREEN,
-                                tooltip2(_('Uneingeschränkter Zugang'))
-                            );
-                    }
-                    $row .= '</td>';
-                }
-                $row .= '</tr>';
-            }
-
-            // Process children.
-            foreach ($seminar_obj->children as $child) {
-                $row .= $this->printCourseRow($child->id, $sem_data, true);
-            }
-
-        }
-
-        return $row;
-    }
-
-
-    /**
-     * Returns a new navigation object corresponding to the given target and
-     * name of the option. The target has two possibel values "sidebar" and
-     * "course" and indicates the place where the navigation is shown.
-     * The option name is the key of an entry in the array with the navigation
-     * options.
-     *
-     * The navigation options are configured in the global configuration as an
-     * array. For further details see documentation of entry
-     * COURSE_SEARCH_NAVIGATION_OPTIONS in global configuration.
-     *
-     * This is an example with all possible options:
-     *
-     * {
-     *     // "courses", "semtree" and "rangetree" are the "old" search options.
-     *     // The link text is fixed.
-     *     "courses":{
-     *         "visible":true,
-     *         // The target indicates where the link to this search option is
-     *         // placed. Possible values are "sidebar" for a link in the sidebar
-     *         // or "courses" to show a link (maybe with picture) below the
-     *         // "course search".
-     *         "target":"sidebar"
-     *     },
-     *     "semtree":{
-     *         "visible":true,
-     *         "target":"sidebar"
-     *     },
-     *     "rangetree":{
-     *         "visible":false,
-     *         "target":"sidebar"
-     *     },
-     *     // New option to acivate the search for modules and the systematic
-     *     // search in studycourses, field of study and degrees.
-     *     "module":{
-     *         "visible":true,
-     *         "target":"sidebar"
-     *     },
-     *     // This option shows a direct link in the sidebar to an entry (level)
-     *     // in the range tree. The link text is the name of the level.
-     *     "fb3_hist":{
-     *         "visible":true,
-     *         "target":"sidebar",
-     *         "range_tree_id":"d1a07cf0c8057c664279214cc070b580"
-     *     },
-     *     // The same for an entry in the sem tree.
-     *     "grundstudium":{
-     *         "visible":true,
-     *         "target":"sidebar",
-     *         "sem_tree_id":"e1a07cf0c8057c664279214cc070b580"
-     *     },
-     *     // This shows a link in the sidebar to the course search. The text is
-     *     // availlable in two languages.
-     *     "vvz":{
-     *         "visible":true,
-     *         "target":"sidebar",
-     *         "url":"dispatch.php/search/courses?level=f&option=vav",
-     *         "title":{
-     *             "de_DE":"Veranstaltungsverzeichnis",
-     *             "en_GB":"Course Catalogue"
-     *         }
-     *     },
-     *     // This option uses an url with search option and shows a link in the
-     *     // sidebar to an entry in the range tree with all courses.
-     *     "test":{
-     *         "visible":true,
-     *         "target":"sidebar",
-     *         "url":"dispatch.php/search/courses?start_item_id=d1a07cf0c8057c664279214cc070b580&cmd=show_sem_range_tree&item_id=d1a07cf0c8057c664279214cc070b580_withkids&level=ev",
-     *         "title":{
-     *             "de_DE":"Historisches Institut",
-     *             "en_GB":"Historical Institute"
-     *         }
-     *     },
-     *     // This option shows a link to the sem tree with picture below the
-     *     // course search (target: courses).
-     *     // This is the behaviour of Stud.IP < 4.2.
-     *     "csemtree":{
-     *         "visible":true,
-     *         "target":"courses",
-     *         "url":"dispatch.php/search/courses?level=vv",
-     *         "img":{
-     *             "filename":"directory-search.png",
-     *             "attributes":{
-     *                 "size":"260@100"
-     *             }
-     *         },
-     *         "title":{
-     *             "de_DE":"Suche im Vorlesungsverzeichnis",
-     *             "en_GB":"Search course directory"
-     *         }
-     *     },
-     *     // This option shows a link to the range tree with picture below the
-     *     // course search (target: courses).
-     *     // This is the behaviour of Stud.IP < 4.2.
-     *     "crangetree":{
-     *         "visible":true,
-     *         "target":"courses",
-     *         "url":"dispatch.php/search/courses?level=ev",
-     *         "img":{
-     *             "filename":"institute-search.png",
-     *             "attributes":{
-     *                 "size":"260@100"
-     *             }
-     *         },
-     *         "title":{
-     *             "de_DE":"Suche in Einrichtungen",
-     *             "en_GB":"Search institutes"
-     *         }
-     *     }
-     * }
-     *
-     *
-     * @param string $target
-     * @param string $option_name
-     * @return Navigation|null
-     */
-    public static function getSearchOptionNavigation($target, $option_name = null): ?Navigation
-    {
-        // return first visible search option
-        if (is_null($option_name)) {
-            $options = Config::get()->COURSE_SEARCH_NAVIGATION_OPTIONS;
-            foreach ($options as $name => $option) {
-                if ($option['visible'] && $option['target'] === $target) {
-                    return self::getSearchOptionNavigation($target, $name);
-                }
-            }
-            return null;
-        }
-
-        $installed_languages = array_keys(Config::get()->INSTALLED_LANGUAGES);
-        $language = $_SESSION['_language'] ?? reset($installed_languages);
-        $option = Config::get()->COURSE_SEARCH_NAVIGATION_OPTIONS[$option_name];
-        if (!$option['visible'] || $option['target'] !== $target) {
-            return null;
-        }
-        if (empty($option['url'])) {
-            switch ($option_name) {
-                case 'courses':
-                case 'semtree':
-                    return new Navigation(_('Vorlesungsverzeichnis'),
-                            URLHelper::getURL('dispatch.php/search/courses',
-                                    [
-                                        'type' => 'semtree'
-                                    ], true));
-                case 'rangetree':
-                    return new Navigation(_('Einrichtungsverzeichnis'),
-                            URLHelper::getURL('dispatch.php/search/courses',
-                                    [
-                                        'type' => 'rangetree'
-                                    ], true));
-                case 'module':
-                    return new MVVSearchNavigation(_('Modulverzeichnis'),
-                            URLHelper::getURL('dispatch.php/search/module'),null, true);
-            }
-        } else {
-            return new Navigation($option['title'][$language],
-                    URLHelper::getURL($option['url'], ['option' => $option_name], true));
-        }
-        if (!empty($option['sem_tree_id'])) {
-            $study_area = StudipStudyArea::find($option['sem_tree_id']);
-            return new Navigation($study_area->name,
-                    URLHelper::getURL('dispatch.php/search/courses',
-                        [
-                            'start_item_id' => $option['sem_tree_id'],
-                            'path_id'       => $option['sem_tree_id'],
-                            'cmd'           => 'show_sem_range',
-                            'item_id'       => $option['sem_tree_id'] . '_withkids',
-                            'level'         => 'vv',
-                            'option'        => $option_name
-                        ], true));
-        }
-        if (!empty($option['range_tree_id'])) {
-            $item_name = DBManager::get()->fetchColumn('
-                    SELECT `name`
-                    FROM `range_tree`
-                    WHERE item_id = ?',
-                    [$option['range_tree_id']]);
-            return new Navigation($item_name,
-                    URLHelper::getURL('dispatch.php/search/courses',
-                        [
-                            'start_item_id' => $option['range_tree_id'],
-                            'path_id'       => $option['range_tree_id'],
-                            'cmd'           => 'show_sem_range_tree',
-                            'item_id'       => $option['range_tree_id'] . '_withkids',
-                            'level'         => 'ev',
-                            'option'        => $option_name
-                        ], true));
-        }
-
-        return null;
-    }
-
-    /**
-     * The class SemBrowse uses a vast number of variables stored in the
-     * session. This function sets the default values or transfers some
-     * of them to url parameters if a filter in the sidebar has been changed.
-     *
-     * @see SemBrowse::setClassesSelector()
-     * @see SemBrowse::setSemesterSelector()
-     */
-    public static function transferSessionData()
-    {
-        if (empty($_SESSION['sem_browse_data']) || Request::option('reset_all')) {
-            $_SESSION['sem_browse_data'] = [];
-        }
-
-        $_SESSION['sem_browse_data']['qs_choose'] = Request::get('search_sem_qs_choose',
-                $_SESSION['sem_browse_data']['qs_choose'] ?? null);
-
-        // simulate button clicked if semester was changed
-        $old_default_sem = $_SESSION['sem_browse_data']['default_sem'] ?? null;
-        if (Request::option('search_sem_sem', $old_default_sem) != $old_default_sem) {
-            $_SESSION['sem_browse_data']['default_sem'] = Request::option('search_sem_sem');
-            if ($_SESSION['sem_browse_data']['sset']) {
-                Request::set('search_sem_quick_search_parameter', $_SESSION['sem_browse_data']['sset']);
-                Request::set('search_sem_quick_search', $_SESSION['sem_browse_data']['sset']);
-                Request::set('search_sem_qs_choose', $_SESSION['sem_browse_data']['qs_choose']);
-                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
-                Request::set('search_sem_do_search', '1');
-                Request::set('search_sem_' . md5('is_sended'), '1');
-            } else {
-                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
-                Request::set('search_sem_sem_change', '1');
-                Request::set('search_sem_sem_select', '1');
-            }
-        }
-
-        // simulate button clicked if class was changed
-        $old_show_class = $_SESSION['sem_browse_data']['show_class'] ?? null;
-        if (Request::option('show_class', $old_show_class) != $old_show_class) {
-            $_SESSION['sem_browse_data']['show_class'] = Request::option('show_class');
-
-            if ($_SESSION['sem_browse_data']['show_class']
-                    && $_SESSION['sem_browse_data']['show_class'] != 'all') {
-                $class = $GLOBALS['SEM_CLASS'][$_SESSION['sem_browse_data']['show_class']];
-                $_SESSION['sem_browse_data']['sem_status'] = array_keys($class->getSemTypes());
-            } else {
-                $_SESSION['sem_browse_data']['sem_status'] = false;
-            }
-
-            if ($_SESSION['sem_browse_data']['sset']) {
-                Request::set('search_sem_quick_search_parameter', $_SESSION['sem_browse_data']['sset']);
-                Request::set('search_sem_quick_search', $_SESSION['sem_browse_data']['sset']);
-                Request::set('search_sem_qs_choose', $_SESSION['sem_browse_data']['qs_choose']);
-                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
-                Request::set('search_sem_do_search', '1');
-                Request::set('search_sem_' . md5('is_sended'), '1');
-            } else {
-                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
-                Request::set('search_sem_sem_change', '1');
-                Request::set('search_sem_sem_select', '1');
-            }
-        }
-
-        // set default values
-        if (empty($_SESSION['sem_browse_data']['default_sem'])) {
-            $_SESSION['sem_browse_data']['default_sem'] =
-                Semester::getIndexById(self::getDefaultSemester(), true, true)
-                        ?: 'all';
-        }
-        $_SESSION['sem_browse_data']['show_class'] =
-                $_SESSION['sem_browse_data']['show_class'] ?? 'all';
-        $_SESSION['sem_browse_data']['group_by'] =
-                $_SESSION['sem_browse_data']['group_by'] ?? '0';
-    }
-
-    /**
-     * Retrieves the default semester from session or calculate it considering
-     * the value from SEMESTER_TIME_SWITCH.
-     *
-     * @return Semester The semester object of the default semester.
-     */
-    public static function getDefaultSemester()
-    {
-        $default_sem = $_SESSION['_default_sem'];
-        if (!$default_sem) {
-            $current_sem = Semester::findDefault();
-            $default_sem = $current_sem->id;
-        }
-
-        return $default_sem;
-    }
-
-    /**
-     * Adds a widget to the sidebar to select a course class. The result set is
-     * filtered by this class.
-     *
-     * @param string $submit_url The submit url.
-     */
-    public static function setClassesSelector($submit_url)
-    {
-        $classes_filter = new SelectWidget(_('Veranstaltungsklassen'),
-                $submit_url, 'show_class');
-        $classes_filter->addElement(new SelectElement('all', _('Alle'),
-                ($_SESSION['sem_browse_data']['show_class'] ?: 'all') === 'all'));
-        foreach ($GLOBALS['SEM_CLASS'] as $key => $val) {
-            $classes_filter->addElement(new SelectElement($key, $val['name'],
-                    ($_SESSION['sem_browse_data']['show_class'] == $key)));
-        }
-        Sidebar::Get()->addWidget($classes_filter);
-    }
-
-    /**
-     * Adds a widget to the sidebar to select a semester. The result set is
-     * filtered by this semester.
-     *
-     * @param string $submit_url The submit url.
-     */
-    public static function setSemesterSelector($submit_url)
-    {
-        $semesters = Semester::findAllVisible();
-        $sidebar = Sidebar::Get();
-        $list = new SelectWidget(_('Semester'),
-                $submit_url, 'search_sem_sem');
-        $list->addElement(new SelectElement('all', _('Alle'),
-                ($_SESSION['sem_browse_data']['default_sem']) === 'all'));
-        foreach(array_reverse($semesters, true) as $i => $semester_data) {
-            $list->addElement(new SelectElement(
-                $i,
-                $semester_data['name'],
-                ($_SESSION['sem_browse_data']['default_sem'] !== 'all'
-                    && intval($_SESSION['sem_browse_data']['default_sem']) === $i)
-            ));
-        }
-        $sidebar->addWidget($list, 'filter_semester');
-    }
-
-    /**
-     * Returns the admission status for a course.
-     *
-     * @param string $seminar_id Id of the course
-     * @param bool   $prelim     State of preliminary setting
-     * @return int
-     */
-    public static function getStatusCourseAdmission($seminar_id, $prelim)
-    {
-        $sql = "SELECT COUNT(`type`) AS `types`,
-                       SUM(IF(`type` = 'LockedAdmission', 1, 0)) AS `type_locked`
-                FROM `seminar_courseset`
-	            INNER JOIN `courseset_rule` USING (`set_id`)
-	            WHERE `seminar_id` = ?
-                GROUP BY `set_id`";
-
-	    $stmt = DBManager::get()->prepare($sql);
-	    $stmt->execute([$seminar_id]);
-	    $result = $stmt->fetch();
-
-        if (!empty($result['types'])) {
-            if ($result['type_locked']) {
-                return 2;
-            }
-            return 1;
-        }
-
-        if ($prelim) {
-            return 1;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns a Quick Search form to put inside a WidgetElement.
-     *
-     * @param string   $level     The Level of search , expected ('f', 'vv', 'ev')
-     * @return string $search_form_content Contains a form element with a quick search input, predefined (hidden) inputs and search button
-     */
-    public function getQuickSearchForm()
-    {
-        if ($this->sem_browse_data['level'] === 'vv') {
-            $this->search_obj->sem_tree =& $this->sem_tree->tree;
-            if ($this->sem_tree->start_item_id !== 'root') {
-                $this->search_obj->search_scopes[] = $this->sem_tree->start_item_id;
-            }
-        } elseif ($this->sem_browse_data['level'] === 'ev') {
-            $this->search_obj->range_tree =& $this->range_tree->tree;
-            if ($this->range_tree->start_item_id !== 'root'){
-                $this->search_obj->search_ranges[] = $this->range_tree->start_item_id;
-            }
-        }
-
-        $search_form_content = $this->search_obj->getFormStart(URLHelper::getLink(), ['class' => '']);
-        $quicksearch = $this->getQuicksearch();
-        $quicksearch->setInputStyle('height:22px;width: 100%;');
-        $quicksearch->withButton(['search_button_name'=> 'course_search_button']);
-        $quicksearch->disableAutocomplete();
-        $search_form_content .= $quicksearch->render();
-        $search_form_content .= $this->search_obj->getHiddenField('qs_choose','title_lecturer_number');
-
-        if($this->sem_browse_data['level'] == 'vv')
-            $search_form_content .= $this->search_obj->getHiddenField('scope_choose', $this->sem_tree->start_item_id);
-
-        if($this->sem_browse_data['level'] == 'ev')
-            $search_form_content .= $this->search_obj->getHiddenField('range_choose', $this->range_tree->start_item_id);
-
-        $search_form_content .= $this->search_obj->getHiddenField('level', $this->sem_browse_data['level']);
-        $search_form_content .= $this->search_obj->getHiddenField('sem', htmlReady($_SESSION['sem_browse_data']['default_sem']));
-
-        $search_form_content .= $this->search_obj->getFormEnd();
-        return $search_form_content;
-    }
-}
diff --git a/lib/classes/SemBrowse.php b/lib/classes/SemBrowse.php
new file mode 100644
index 0000000..536b7e3
--- /dev/null
+++ b/lib/classes/SemBrowse.php
@@ -0,0 +1,1264 @@
+<?php
+# Lifter002: TODO
+# Lifter005: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+require_once 'lib/dates.inc.php';
+
+class SemBrowse {
+
+    public $sem_browse_data;
+    public $persistent_fields = [
+        'level', 'cmd', 'start_item_id', 'show_class', 'group_by',
+        'search_result', 'default_sem', 'sem_status', 'show_entries', 'sset'
+    ];
+    public $search_obj;
+    public $sem_tree;
+    public $range_tree;
+    public $show_result;
+    public $sem_number;
+    public $group_by_fields = [];
+    public $target_url;
+    public $target_id;
+    public $classes_show_module;
+    public $classes_show_class;
+
+    public function __construct($sem_browse_data_init = [])
+    {
+
+        $this->group_by_fields =
+                [
+                    [
+                        'name'        => _('Semester'),
+                        'group_field' => 'sem_number'
+                    ],
+                    [
+                        'name'        => _('Bereich'),
+                        'group_field' => 'bereich'
+                    ],
+                    [
+                        'name'         => _('Lehrende'),
+                        'group_field'  => 'fullname',
+                        'unique_field' => 'username'
+                    ],
+                    [
+                        'name'        => _('Typ'),
+                        'group_field' => 'status'
+                    ],
+                    [
+                        'name'         => _('Einrichtung'),
+                        'group_field'  => 'Institut',
+                        'unique_field' => 'Institut_id'
+                    ]
+                ];
+
+        if (empty($_SESSION['sem_browse_data'])) {
+            $_SESSION['sem_browse_data'] = $sem_browse_data_init;
+        }
+        $this->sem_browse_data =& $_SESSION['sem_browse_data'];
+
+        $level_change = Request::option('start_item_id') || Request::submitted('search_sem_sem_change');
+
+        for ($i = 0; $i < count($this->persistent_fields); ++$i){
+            $persistend_field = $this->persistent_fields[$i];
+            if (Request::get($persistend_field) != null) {
+                $this->sem_browse_data[$persistend_field] = Request::option($persistend_field);
+            }
+        }
+        $this->search_obj = new StudipSemSearch(
+            'search_sem',
+            false,
+            !(is_object($GLOBALS['perm']) && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)),
+            $this->sem_browse_data['show_class'] ?? null
+        );
+
+
+        if (Request::get($this->search_obj->form_name . '_scope_choose')) {
+            $this->sem_browse_data['start_item_id'] =
+                    Request::option($this->search_obj->form_name . '_scope_choose');
+        }
+        if (Request::get($this->search_obj->form_name . '_range_choose')) {
+            $this->sem_browse_data['start_item_id'] =
+                    Request::option($this->search_obj->form_name . '_range_choose');
+        }
+        if (Request::get($this->search_obj->form_name . '_sem')) {
+            $this->sem_browse_data['default_sem'] =
+                    Request::option($this->search_obj->form_name . '_sem');
+        }
+
+        if (
+            Request::get('keep_result_set')
+            || !empty($this->sem_browse_data['sset'])
+            || (!empty($this->sem_browse_data['search_result']) && !empty($this->sem_browse_data['show_entries']))
+        ) {
+            $this->show_result = true;
+        }
+
+        if (isset($this->sem_browse_data['cmd']) && $this->sem_browse_data['cmd'] === 'xts') {
+            if ($this->search_obj->new_search_button_clicked) {
+                $this->show_result = false;
+                $this->sem_browse_data['sset'] = false;
+                $this->sem_browse_data['search_result'] = [];
+            }
+        }
+
+        if (!isset($this->sem_browse_data['default_sem'])) {
+            $this->sem_number[0] = 0;
+        } elseif ($this->sem_browse_data['default_sem'] != 'all') {
+            $this->sem_number[0] = intval($this->sem_browse_data['default_sem']);
+        } else {
+            $this->sem_number = false;
+        }
+
+        $sem_status = (!empty($this->sem_browse_data['sem_status']) && is_array($this->sem_browse_data['sem_status'])) ? $this->sem_browse_data['sem_status'] : false;
+
+        if ($this->sem_browse_data['level'] == 'vv') {
+            if (empty($this->sem_browse_data['start_item_id'])) {
+                $this->sem_browse_data['start_item_id'] = 'root';
+            }
+            $this->sem_tree = new StudipSemTreeViewSimple(
+                    $this->sem_browse_data['start_item_id'],
+                    $this->sem_number, $sem_status,
+                    !(is_object($GLOBALS['perm'])
+                            && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)));
+            if (Request::option('cmd') != 'show_sem_range'
+                    && $level_change
+                    && !$this->search_obj->search_button_clicked ) {
+                $this->get_sem_range($this->sem_browse_data['start_item_id'], false);
+                $this->show_result = true;
+                $this->sem_browse_data['show_entries'] = 'level';
+                $this->sem_browse_data['sset'] = false;
+            }
+            if ($this->search_obj->sem_change_button_clicked) {
+                $this->get_sem_range($this->sem_browse_data['start_item_id'],
+                        ($this->sem_browse_data['show_entries'] == 'sublevels'));
+                $this->show_result = true;
+            }
+        }
+
+        if ($this->sem_browse_data['level'] == 'ev'){
+            if (!$this->sem_browse_data['start_item_id']) {
+                $this->sem_browse_data['start_item_id'] = 'root';
+            }
+            $this->range_tree = new StudipSemRangeTreeViewSimple(
+                    $this->sem_browse_data['start_item_id'],
+                    $this->sem_number,
+                    $sem_status,
+                    !(is_object($GLOBALS['perm'])
+                            && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)));
+            if (Request::option('cmd') != 'show_sem_range_tree'
+                    && $level_change
+                    && !$this->search_obj->search_button_clicked ) {
+                $this->get_sem_range_tree($this->sem_browse_data['start_item_id'], false);
+                $this->show_result = true;
+                $this->sem_browse_data['show_entries'] = 'level';
+                $this->sem_browse_data['sset'] = false;
+            }
+            if ($this->search_obj->sem_change_button_clicked) {
+                $this->get_sem_range_tree($this->sem_browse_data['start_item_id'],
+                        ($this->sem_browse_data['show_entries'] == 'sublevels'));
+                $this->show_result = true;
+            }
+        }
+
+        if ($this->search_obj->search_button_clicked
+                && !$this->search_obj->new_search_button_clicked) {
+            $this->search_obj->override_sem = $this->sem_number;
+            $this->search_obj->doSearch();
+            if ($this->search_obj->found_rows) {
+                $this->sem_browse_data['search_result'] = array_flip($this->search_obj->search_result->getRows('seminar_id'));
+            } else {
+                $this->sem_browse_data['search_result'] = [];
+            }
+            $this->show_result = true;
+            $this->sem_browse_data['show_entries'] = false;
+            $this->sem_browse_data['sset'] = Request::get($this->search_obj->form_name . "_quick_search_parameter");
+        }
+
+
+        if (Request::option('cmd') == 'show_sem_range') {
+            $tmp = explode('_', Request::option('item_id'));
+            $this->get_sem_range($tmp[0], isset($tmp[1]));
+            $this->show_result = true;
+            $this->sem_browse_data['show_entries'] = (isset($tmp[1])) ? 'sublevels' : 'level';
+            $this->sem_browse_data['sset'] = false;
+        }
+
+        if (Request::option('cmd') == 'show_sem_range_tree') {
+            $tmp = explode('_', Request::option('item_id'));
+            $this->get_sem_range_tree($tmp[0],isset($tmp[1]));
+            $this->show_result = true;
+            $this->sem_browse_data['show_entries'] = (isset($tmp[1])) ? 'sublevels' : 'level';
+            $this->sem_browse_data['sset'] = false;
+        }
+
+        if (Request::option('do_show_class')
+                && count($this->sem_browse_data['sem_status'])) {
+            $this->get_sem_class();
+        }
+
+    }
+
+    /**
+     * Returns whether the search for modules has to be displayed.
+     *
+     * @return boolean True if search for modules has to be displayed.
+     */
+    private function showModules()
+    {
+        if ($this->sem_browse_data['show_class'] == 'all') {
+            return true;
+        }
+        if (!is_array($this->classes_show_module)) {
+            $this->classes_show_class = [];
+            foreach ($GLOBALS['SEM_CLASS'] as $sem_class_key => $sem_class){
+                if ($sem_class['module']) {
+                    $this->classes_show_module[] = $sem_class_key;
+                }
+            }
+        }
+        return in_array($this->sem_browse_data['show_class'], $this->classes_show_class);
+    }
+
+    public function show_class()
+    {
+        if ($this->sem_browse_data['show_class'] == 'all') {
+            return true;
+        }
+        if (!is_array($this->classes_show_class)) {
+            $this->classes_show_class = [];
+            foreach ($GLOBALS['SEM_CLASS'] as $sem_class_key => $sem_class) {
+                if ($sem_class['bereiche']) {
+                    $this->classes_show_class[] = $sem_class_key;
+                }
+            }
+        }
+        return in_array($this->sem_browse_data['show_class'], $this->classes_show_class);
+    }
+
+    public function get_sem_class()
+    {
+        $query = "SELECT `Seminar_id`
+                  FROM `seminare`
+                  WHERE `status` IN (?)";
+
+        $show_all = is_object($GLOBALS['perm'])
+                 && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM);
+        if (!$show_all) {
+            $query .= ' AND visible = 1';
+        }
+
+        $sem_ids = DBManager::get()->fetchFirst($query);
+        if (is_array($sem_ids)) {
+            $this->sem_browse_data['search_result'] = array_flip($sem_ids);
+        }
+        $this->sem_browse_data['sset'] = true;
+        $this->show_result = true;
+    }
+
+    public function get_sem_range($item_id, $with_kids)
+    {
+        if (!is_object($this->sem_tree)) {
+            $sem_status = (is_array($this->sem_browse_data['sem_status'])) ? $this->sem_browse_data['sem_status'] : false;
+            $this->sem_tree = new StudipSemTreeViewSimple(
+                    $this->sem_browse_data['start_item_id'],
+                    $this->sem_number,
+                    $sem_status,
+                    !(is_object($GLOBALS['perm'])
+                            && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)));
+        }
+        $sem_ids = $this->sem_tree->tree->getSemIds($item_id,$with_kids);
+        if (is_array($sem_ids)) {
+            $this->sem_browse_data['search_result'] = array_flip($sem_ids);
+        } else {
+            $this->sem_browse_data['search_result'] = [];
+        }
+    }
+
+    public function get_sem_range_tree($item_id, $with_kids)
+    {
+        $range_object = RangeTreeObject::GetInstance($item_id);
+        if ($with_kids) {
+            $inst_ids = $range_object->getAllObjectKids();
+        }
+        $inst_ids[] = $range_object->item_data['studip_object_id'];
+        $db_view = DbView::getView('sem_tree');
+        $db_view->params[0] = $inst_ids;
+        $db_view->params[1] = (is_object($GLOBALS['perm']) && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) ? '' : ' AND c.visible=1';
+        $db_view->params[1] .= !empty($this->sem_browse_data['sem_status']) && is_array($this->sem_browse_data['sem_status'])
+                ? " AND c.status IN('" . join("','", $this->sem_browse_data['sem_status']) ."')"
+                : '';
+        $db_view->params[2] = is_array($this->sem_number)
+                ? ' HAVING sem_number IN ('
+                    . join(',', $this->sem_number)
+                    . ') OR (sem_number <= '
+                    . $this->sem_number[count($this->sem_number) - 1]
+                    . '  AND (sem_number_end >= '
+                    . $this->sem_number[count($this->sem_number) - 1]
+                    . ' OR sem_number_end = -1)) '
+                : '';
+        $db_snap = new DbSnapshot($db_view->get_query('view:SEM_INST_GET_SEM'));
+        if ($db_snap->numRows) {
+            $sem_ids = $db_snap->getRows('Seminar_id');
+            $this->sem_browse_data['search_result'] = array_flip($sem_ids);
+        } else {
+            $this->sem_browse_data['search_result'] = [];
+        }
+    }
+
+    /**
+     * Prints the quicksearch form.
+     */
+    private function printQuickSearch()
+    {
+        if ($this->sem_browse_data['level'] === 'vv') {
+            $this->search_obj->sem_tree =& $this->sem_tree->tree;
+            if ($this->sem_tree->start_item_id !== 'root') {
+                $this->search_obj->search_scopes[] = $this->sem_tree->start_item_id;
+            }
+        } elseif ($this->sem_browse_data['level'] === 'ev') {
+            $this->search_obj->range_tree =& $this->range_tree->tree;
+            if ($this->range_tree->start_item_id !== 'root'){
+                $this->search_obj->search_ranges[] = $this->range_tree->start_item_id;
+            }
+        }
+
+        $template = $GLOBALS['template_factory']->open('sembrowse/quick-search.php');
+        $template->search_obj      = $this->search_obj;
+        $template->sem_browse_data = $this->sem_browse_data;
+        $template->sem_tree        = $this->sem_tree;
+        $template->range_tree      = $this->range_tree;
+        $template->quicksearch     = $this->getQuicksearch();
+
+        echo $template->render();
+    }
+
+    private function getQuicksearch()
+    {
+        $quicksearch = QuickSearch::get(
+            $this->search_obj->form_name . '_quick_search',
+            new SeminarSearch()
+        );
+
+        $quicksearch->setAttributes([
+            'aria-label' => _('Suchbegriff'),
+            'autofocus'  => '',
+        ]);
+        $quicksearch->fireJSFunctionOnSelect('selectSem');
+        $quicksearch->noSelectbox();
+        $quicksearch->defaultValue(
+            $this->sem_browse_data['sset'] ?: '',
+            $this->sem_browse_data['sset'] ?: ''
+        );
+
+        return $quicksearch;
+    }
+
+    private function printExtendedSearch()
+    {
+        $template = $GLOBALS['template_factory']->open('sembrowse/extended-search.php');
+        $template->search_obj      = $this->search_obj;
+        $template->sem_browse_data = $this->sem_browse_data;
+        $template->show_class      = $this->show_class();
+        echo $template->render();
+    }
+
+    public function do_output()
+    {
+        if ($this->sem_browse_data['cmd'] == 'xts') {
+            $this->printExtendedSearch();
+        }
+        $path_id = Request::option('path_id');
+        URLHelper::addLinkParam('path_id', $path_id);
+        $this->print_level($path_id);
+    }
+
+    public function print_level($start_id = null)
+    {
+        ob_start();
+
+        echo "\n" . '<table id="sem_search_level" class="course-search" style="width: 100%">' . "\n";
+        if ($this->sem_browse_data['level'] == 'vv') {
+            echo "\n" . '<caption class="legend">'._('Studienbereiche').'<caption>';
+            echo "\n" . '<tr><td style="text-align: center">';
+            $this->sem_tree->show_entries = $this->sem_browse_data['show_entries'] ?? false;
+            $this->sem_tree->showSemTree($start_id);
+        }
+        if ($this->sem_browse_data['level'] == 'ev') {
+            echo "\n" . '<caption class="legend">'._('Einrichtungen').'<caption>';
+            echo "\n" . '<tr><td style="text-align: center">';
+            $this->range_tree->show_entries = $this->sem_browse_data['show_entries'] ?? false;
+            $this->range_tree->showSemRangeTree($start_id);
+        }
+
+        if ($this->show_result) {
+            $this->print_result();
+        }
+
+        echo '</td></tr></table>';
+        ob_end_flush();
+    }
+
+    public function print_result()
+    {
+        ob_start();
+        global $SEM_TYPE, $SEM_CLASS;
+
+        if (is_array($this->sem_browse_data['search_result'])
+                && count($this->sem_browse_data['search_result'])) {
+            if (!is_object($this->sem_tree)) {
+                $this->sem_tree = new StudipSemTreeViewSimple(
+                        $this->sem_browse_data['start_item_id'] ?? null,
+                        $this->sem_number,
+                        !empty($this->sem_browse_data['sem_status']) && is_array($this->sem_browse_data['sem_status'])
+                            ? $this->sem_browse_data['sem_status'] : false,
+                        !(is_object($GLOBALS['perm']) && $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM))
+                );
+            }
+            $the_tree = $this->sem_tree->tree;
+
+            list($group_by_data, $sem_data) = $this->get_result();
+
+            $visibles = $sem_data;
+            if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
+                $visibles = array_filter($visibles, function ($c) {
+                    return key($c['visible']) == 1;
+                });
+            }
+
+            echo '<table class="default" id="sem_search_result" style="width: calc(100% - 21px);" >';
+            foreach ($group_by_data as $group_field => $sem_ids) {
+                if (Config::get()->COURSE_SEARCH_SHOW_ADMISSION_STATE) {
+                    echo '<tr><th colspan="6">';
+                } else {
+                    echo '<tr><th colspan="5">';
+                }
+                switch ($this->sem_browse_data['group_by'] ?? null) {
+                    case 0:
+                        echo htmlReady($this->search_obj->sem_dates[$group_field]['name'] ?? '');
+                        break;
+                    case 1:
+                        if ($the_tree->tree_data[$group_field]) {
+                            echo htmlReady($the_tree->getShortPath($group_field));
+                            if (is_object($this->sem_tree)){
+                                echo $this->sem_tree->getInfoIcon($group_field);
+                            }
+                        } else {
+                            echo _('keine Studienbereiche eingetragen');
+                        }
+                        break;
+                    case 3:
+                        echo htmlReady($SEM_TYPE[$group_field]['name']
+                                . ' ('
+                                . $SEM_CLASS[$SEM_TYPE[$group_field]['class']]['name']
+                                . ')');
+                        break;
+                    default:
+                        echo htmlReady($group_field);
+                }
+                echo '</th></tr>';
+                ob_end_flush();
+                ob_start();
+                if (is_array($sem_ids['Seminar_id'])) {
+                    foreach(array_keys($sem_ids['Seminar_id']) as $seminar_id){
+                        echo $this->printCourseRow($seminar_id, $sem_data);
+                    }
+                }
+            }
+            echo '</table>';
+        } elseif ($this->search_obj->search_button_clicked
+                && !$this->search_obj->new_search_button_clicked) {
+            $details = [];
+            if ($this->search_obj->found_rows === false) {
+                $details = [_('Der Suchbegriff fehlt oder ist zu kurz')];
+            }
+            if ($details) {
+                PageLayout::postError(_('Ihre Suche ergab keine Treffer'), $details);
+            } else {
+                PageLayout::postInfo(_('Ihre Suche ergab keine Treffer'));
+            }
+            $this->sem_browse_data['sset'] = 0;
+        }
+        ob_end_flush();
+    }
+
+    public function get_result()
+    {
+        global $_fullname_sql, $user;
+        if ($this->sem_browse_data['group_by'] == 1) {
+            if (!is_object($this->sem_tree)) {
+                $the_tree = TreeAbstract::GetInstance('StudipSemTree', false);
+            } else {
+                $the_tree = $this->sem_tree->tree;
+            }
+            $sem_tree_query = '';
+            if ($this->sem_browse_data['start_item_id'] != 'root'
+                    && ($this->sem_browse_data['level'] == 'vv'
+                    || $this->sem_browse_data['level'] == 'sbb')) {
+                $allowed_ranges = $the_tree->getKidsKids($this->sem_browse_data['start_item_id']);
+                $allowed_ranges[] = $this->sem_browse_data['start_item_id'];
+                $sem_tree_query = " AND sem_tree_id IN('" . join("','", $allowed_ranges) . "') ";
+            }
+            $add_fields = 'seminar_sem_tree.sem_tree_id AS bereich,';
+            $add_query = "LEFT JOIN seminar_sem_tree ON (seminare.Seminar_id = seminar_sem_tree.seminar_id $sem_tree_query)";
+        } else if ($this->sem_browse_data['group_by'] == 4){
+            $add_fields = 'Institute.Name AS Institut,Institute.Institut_id,';
+            $add_query = 'LEFT JOIN seminar_inst
+                            ON (seminare.Seminar_id = seminar_inst.Seminar_id)
+                          LEFT JOIN Institute
+                            ON (Institute.Institut_id = seminar_inst.institut_id)';
+        } else {
+            $add_fields = '';
+            $add_query = '';
+        }
+
+        $dbv = DbView::getView('sem_tree');
+
+        $query = "
+            SELECT seminare.Seminar_id, VeranstaltungsNummer, seminare.status,
+                IF(seminare.visible = 0, CONCAT(seminare.Name, ' " . _('(versteckt)')
+                    . "'), seminare.Name) AS Name,"
+                . $add_fields
+                . $_fullname_sql['full'] . " AS fullname,
+                    auth_user_md5.username,"
+                . $dbv->sem_number_sql . ' AS sem_number, '
+                . $dbv->sem_number_end_sql . ' AS sem_number_end,
+                seminar_user.position AS position, seminare.parent_course, seminare.visible
+            FROM seminare
+                LEFT JOIN seminar_user
+                    ON (seminare.Seminar_id=seminar_user.Seminar_id AND seminar_user.status = ' . "'dozent'" . ')
+                LEFT JOIN auth_user_md5
+                    USING (user_id)
+                LEFT JOIN user_info
+                    USING (user_id) '
+                . $add_query . "
+            WHERE (seminare.Seminar_id IN('" . join("','", array_keys($this->sem_browse_data['search_result'])) . "')
+                OR seminare.parent_course IN ('" . join("','", array_keys($this->sem_browse_data['search_result'])) . "'))";
+
+        // don't show Studiengruppen if user not logged in
+        if (!$GLOBALS['user'] || $GLOBALS['user']->id == 'nobody') {
+            $studygroup_types = DBManager::get()->quote(studygroup_sem_types());
+            $query .= " AND seminare.status NOT IN ({$studygroup_types})";
+        }
+
+        $db = new DB_Seminar($query);
+        $snap = new DbSnapshot($db);
+        $group_field = $this->group_by_fields[$this->sem_browse_data['group_by']]['group_field'];
+        $data_fields[0] = 'Seminar_id';
+        if (!empty($this->group_by_fields[$this->sem_browse_data['group_by']]['unique_field'])) {
+            $data_fields[1] = $this->group_by_fields[$this->sem_browse_data['group_by']]['unique_field'];
+        }
+        if($user->id == 'nobody' && $snap->numRows == 0){
+            $group_by_data = $sem_data = [];
+        }else{
+            $group_by_data = $snap->getGroupedResult($group_field, $data_fields);
+            $sem_data = $snap->getGroupedResult('Seminar_id');
+        }
+
+        if ($this->sem_browse_data['group_by'] == 0) {
+            if($user->id == 'nobody' && $snap->numRows == 0){
+                $group_by_duration = [];
+            }else{
+                $group_by_duration = $snap->getGroupedResult('sem_number_end', ['sem_number', 'Seminar_id']);
+            }
+            foreach ($group_by_duration as $sem_number_end => $detail) {
+                if ($sem_number_end != -1
+                        && ($detail['sem_number'][$sem_number_end]
+                                && count($detail['sem_number']) == 1)) {
+                    continue;
+                }
+
+                $current_semester_index = Semester::getIndexById(Semester::findCurrent()->semester_id, true, true);
+                foreach (array_keys($detail['Seminar_id']) as $seminar_id) {
+                    $start_sem = key($sem_data[$seminar_id]['sem_number']);
+                    if ($sem_number_end == -1) {
+                        if ($this->sem_number === false) {
+                            $sem_number_end = $current_semester_index && isset($this->search_obj->sem_dates[$current_semester_index + 1]) ? $current_semester_index + 1 : count($this->search_obj->sem_dates) -1;
+                        } else {
+                            $sem_number_end = $this->sem_number[0];
+                        }
+                    }
+                    for ($i = $start_sem; $i <= $sem_number_end; ++$i) {
+                        if ($this->sem_number === false
+                                || is_array($this->sem_number)
+                                && in_array($i, $this->sem_number)) {
+                            if (!empty($group_by_data[$i]) && empty($tmp_group_by_data[$i])) {
+                                foreach (array_keys($group_by_data[$i]['Seminar_id']) as $id) {
+                                    $tmp_group_by_data[$i]['Seminar_id'][$id] = true;
+                                }
+                            }
+                            $tmp_group_by_data[$i]['Seminar_id'][$seminar_id] = true;
+                        }
+                    }
+                }
+            }
+            if (!empty($tmp_group_by_data) && is_array($tmp_group_by_data)) {
+                if ($this->sem_number !== false) {
+                    unset($group_by_data);
+                }
+                foreach ($tmp_group_by_data as $start_sem => $detail) {
+                    $group_by_data[$start_sem] = $detail;
+                }
+            }
+        }
+
+        //release memory
+        unset($snap);
+        unset($tmp_group_by_data);
+
+        foreach ($group_by_data as $group_field => $sem_ids) {
+            foreach ($sem_ids['Seminar_id'] as $seminar_id => $foo) {
+                $name = mb_strtolower(key($sem_data[$seminar_id]['Name']));
+                $name = str_replace(['ä', 'ö', 'ü'], ['ae', 'oe', 'ue'], $name);
+                if (Config::get()->IMPORTANT_SEMNUMBER && key($sem_data[$seminar_id]['VeranstaltungsNummer'])) {
+                    $name = key($sem_data[$seminar_id]['VeranstaltungsNummer']) . ' ' . $name;
+                }
+                $group_by_data[$group_field]['Seminar_id'][$seminar_id] = $name;
+            }
+            uasort($group_by_data[$group_field]['Seminar_id'], 'strnatcmp');
+        }
+
+        switch ($this->sem_browse_data['group_by']) {
+            case 0:
+                krsort($group_by_data, SORT_NUMERIC);
+                break;
+            case 1:
+                uksort($group_by_data, function($a,$b) {
+                    $the_tree = TreeAbstract::GetInstance('StudipSemTree', false);
+                    $the_tree->buildIndex();
+                    return $the_tree->tree_data[$a]['index'] - $the_tree->tree_data[$b]['index'];
+                });
+                break;
+            case 3:
+                uksort($group_by_data, function ($a,$b) {
+                    global $SEM_CLASS,$SEM_TYPE;
+                    return strnatcasecmp($SEM_TYPE[$a]['name'], $SEM_TYPE[$b]['name'])
+                        ?: strnatcasecmp(
+                               $SEM_CLASS[$SEM_TYPE[$a]['class']]['name'],
+                               $SEM_CLASS[$SEM_TYPE[$b]["class"]]['name']
+                           );
+                });
+                break;
+            default:
+                uksort($group_by_data, 'strnatcasecmp');
+        }
+
+        return [$group_by_data, $sem_data];
+    }
+
+    /**
+     * Creates HTML code for a single course row. This has been extracted
+     * into a separate function as that makes handling and outputting
+     * course children easier.
+     *
+     * @param string $seminar_id a single course id to output
+     * @param mixed $sem_data collected data for all found courses
+     * @param bool $child call in "child mode" -> force output because here children are listed
+     * @return string A HTML table row.
+     */
+    private function printCourseRow($seminar_id, &$sem_data, $child = false)
+    {
+        global $SEM_TYPE;
+
+        $row = '';
+
+        /*
+         * As we include child courses now, we need an extra check for visibility.
+         * Child courses are not shown extra, but summarized under their parent if
+         * the parent is part of the search result.
+         */
+        if (($GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)
+                || key($sem_data[$seminar_id]['visible']) == 1)
+                && (empty($sem_data[key($sem_data[$seminar_id]['parent_course'])])
+                        || $child)) {
+            // create instance of seminar-object
+            $seminar_obj = new Seminar($seminar_id);
+            // is this sem a studygroup?
+            $studygroup_mode = SeminarCategories::GetByTypeId($seminar_obj->getStatus())->studygroup_mode;
+
+            $sem_name = $seminar_obj->getFullName('type-name');
+            $seminar_number = key($sem_data[$seminar_id]['VeranstaltungsNummer']);
+
+            $visibleChildren = [];
+
+            $row .= '<tr';
+            // Set necessary classes if we are displaying subcourses.
+            if ($child) {
+                $row .= ' class="hidden-js subcourses subcourses-' . key($sem_data[$seminar_id]['parent_course']) . '"' ;
+            }
+            $row .= '>';
+
+            if ($studygroup_mode) {
+                $sem_name .= ' (' . _('Studiengruppe');
+                if ($seminar_obj->admission_prelim) $sem_name .= ', ' . _('Zutritt auf Anfrage');
+                $sem_name .= ')';
+                $row .= '<td width="1%" class="hidden-tiny-down">';
+                $row .= StudygroupAvatar::getAvatar($seminar_id)->getImageTag(Avatar::SMALL, ['title' => $seminar_obj->getName()]);
+                $row .= '</td>';
+            } else {
+                $sem_number_start = key($sem_data[$seminar_id]['sem_number']);
+                $sem_number_end = key($sem_data[$seminar_id]['sem_number_end']);
+                if ($sem_number_start != $sem_number_end) {
+                    $sem_name .= ' (' . $this->search_obj->sem_dates[$sem_number_start]['name'] . ' - ';
+                    $sem_name .= (($sem_number_end == -1)
+                            ? _('unbegrenzt')
+                            : $this->search_obj->sem_dates[$sem_number_end]['name']) . ')';
+                } elseif ($this->sem_browse_data['group_by']) {
+                    $sem_name .= " (" . $this->search_obj->sem_dates[$sem_number_start]['name'] . ')';
+                }
+                $row .= '<td width="1%" class="hidden-tiny-down">';
+                $row .= CourseAvatar::getAvatar($seminar_id)->getImageTag(Avatar::SMALL, ['title' => $seminar_obj->getName()]);
+                $row .= '</td>';
+
+            }
+            $send_from_search = URLHelper::getUrl(basename($_SERVER['PHP_SELF']), ['keep_result_set' => 1, 'cid' => null]);
+            $send_from_search_link = URLHelper::getLink($this->target_url,
+                    [
+                        $this->target_id => $seminar_id,
+                        'cid' => null,
+                        'send_from_search' => 1,
+                        'send_from_search_page' => $send_from_search
+                    ]);
+            $row .= '<td style="width: 66%" colspan="2">';
+
+            // Show the "more" icon only if there are visible children.
+            if (count($seminar_obj->children) > 0) {
+
+                // If you are not root, perhaps not all available subcourses are visible.
+                $visibleChildren = $seminar_obj->children;
+                if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
+                    $visibleChildren = $visibleChildren->filter(function($c) {
+                        return $c->visible;
+                    });
+                }
+                if (count($visibleChildren) > 0) {
+                    $row .= Icon::create('add', Icon::ROLE_CLICKABLE ,[
+                            'id' => 'show-subcourses-' . $seminar_id,
+                            'title' => sprintf(_('%u Unterveranstaltungen anzeigen'), count($visibleChildren)),
+                            'onclick' => "jQuery('tr.subcourses-" . $seminar_id . "').removeClass('hidden-js');jQuery(this).closest('tr').addClass('has-subcourses');jQuery(this).hide();jQuery('#hide-subcourses-" . $seminar_id . "').show();"
+                        ])->asImg(12) . ' ';
+                    $row .= Icon::create('remove', Icon::ROLE_CLICKABLE ,[
+                            'id' => 'hide-subcourses-' . $seminar_id,
+                            'style' => 'display:none',
+                            'title' => sprintf(_('%u Unterveranstaltungen ausblenden'), count($visibleChildren)),
+                            'onclick' => "jQuery('tr.subcourses-" . $seminar_id . "').addClass('hidden-js'); jQuery(this).closest('tr').removeClass('has-subcourses');jQuery(this).hide();jQuery('#show-subcourses-" . $seminar_id . "').show();"
+                        ])->asImg(12) . ' ';
+                }
+            }
+
+            $row .= '<a href="' . $send_from_search_link . '">';
+            if (Config::get()->IMPORTANT_SEMNUMBER && $seminar_number) {
+                $row .= htmlReady($seminar_number) . " ";
+            }
+            $row .= htmlReady($sem_name) . '</a><br>';
+            //create Turnus field
+            if ($studygroup_mode) {
+                $row .= '<div style="font-size:smaller">'
+                        . htmlReady(mb_substr($seminar_obj->description, 0, 100))
+                        . '</div>';
+            } else {
+                $temp_turnus_string = $seminar_obj->getDatesExport(
+                    [
+                        'short' => true,
+                        'shrink' => true,
+                        'semester_id' => ''
+                    ]
+                );
+                //Shorten, if string too long (add link for details.php)
+                if (mb_strlen($temp_turnus_string) > 70) {
+                    $temp_turnus_string = htmlReady(mb_substr($temp_turnus_string, 0, mb_strpos(mb_substr($temp_turnus_string, 70, mb_strlen($temp_turnus_string)), ',') + 71));
+                    $temp_turnus_string .= ' ... <a href="' . $send_from_search_link . '">(' . _('mehr') . ')</a>';
+                } else {
+                    $temp_turnus_string = htmlReady($temp_turnus_string);
+                }
+                if (!Config::get()->IMPORTANT_SEMNUMBER) {
+                    $row .= '<div style="margin-left:5px;font-size:smaller">' . htmlReady($seminar_number) . '</div>';
+                }
+                $row .= '<div style="margin-left:5px;font-size:smaller">' . $temp_turnus_string . '</div>';
+                if (count($seminar_obj->children) > 0 && count($visibleChildren) > 0) {
+                    $row .= '<div style="margin-left:5px;font-size:smaller">';
+                    $row .= sprintf(_('%u Unterveranstaltungen'), count($visibleChildren));
+                    $row .= '</div>';
+                }
+            }
+            $row .= '</td>';
+            $row .= '<td style="text-align: right">(';
+            $doz_name = [];
+            $c = 0;
+            reset($sem_data[$seminar_id]['fullname']);
+            foreach ($sem_data[$seminar_id]['username'] as $anzahl1) {
+                if ($c == 0) {
+                    $d_name = key($sem_data[$seminar_id]['fullname']);
+                    $anzahl2 = current($sem_data[$seminar_id]['fullname']);
+                    next($sem_data[$seminar_id]['fullname']);
+                    $c = $anzahl2 / $anzahl1;
+                    $doz_name = array_merge($doz_name, array_fill(0, $c, $d_name));
+                }
+                --$c;
+            }
+            $doz_uname = array_keys($sem_data[$seminar_id]['username']);
+            $doz_position = array_keys($sem_data[$seminar_id]['position']);
+            if (count($doz_name)) {
+                if (count($doz_position) != count($doz_uname)) {
+                    $doz_position = range(1, count($doz_uname));
+                }
+                array_multisort($doz_position, $doz_name, $doz_uname);
+                $i = 0;
+                foreach ($doz_name as $index => $value) {
+                    if ($value) {  // hide dozenten with empty username
+                        if ($i == 4) {
+                            $row .= '... <a href="' . $send_from_search_link . '">(' . _('mehr') . ')</a>';
+                            break;
+                        }
+                        $row .= '<a href="' . URLHelper::getLink('dispatch.php/profile', ['username' => $doz_uname[$index]]) . '">' . htmlReady($value) . '</a>';
+                        if ($i != count($doz_name) - 1) {
+                            $row .= ', ';
+                        }
+                    }
+                    ++$i;
+                }
+                $row .= ')</td>';
+                if (Config::get()->COURSE_SEARCH_SHOW_ADMISSION_STATE) {
+                    $row .= '<td>';
+                    switch (self::getStatusCourseAdmission($seminar_id,
+                            $seminar_obj->admission_prelim)) {
+                        case 1:
+                            $row .= Icon::create(
+                                'info-circle',
+                                Icon::ROLE_STATUS_YELLOW,
+                                tooltip2(_('Eingeschränkter Zugang'))
+                            );
+                            break;
+                        case 2:
+                            $row .= Icon::create(
+                                'decline-circle',
+                                Icon::ROLE_STATUS_RED,
+                                tooltip2(_('Kein Zugang'))
+                            );
+                            break;
+                        default:
+                            $row .= Icon::create(
+                                'check-circle',
+                                Icon::ROLE_STATUS_GREEN,
+                                tooltip2(_('Uneingeschränkter Zugang'))
+                            );
+                    }
+                    $row .= '</td>';
+                }
+                $row .= '</tr>';
+            }
+
+            // Process children.
+            foreach ($seminar_obj->children as $child) {
+                $row .= $this->printCourseRow($child->id, $sem_data, true);
+            }
+
+        }
+
+        return $row;
+    }
+
+
+    /**
+     * Returns a new navigation object corresponding to the given target and
+     * name of the option. The target has two possibel values "sidebar" and
+     * "course" and indicates the place where the navigation is shown.
+     * The option name is the key of an entry in the array with the navigation
+     * options.
+     *
+     * The navigation options are configured in the global configuration as an
+     * array. For further details see documentation of entry
+     * COURSE_SEARCH_NAVIGATION_OPTIONS in global configuration.
+     *
+     * This is an example with all possible options:
+     *
+     * {
+     *     // "courses", "semtree" and "rangetree" are the "old" search options.
+     *     // The link text is fixed.
+     *     "courses":{
+     *         "visible":true,
+     *         // The target indicates where the link to this search option is
+     *         // placed. Possible values are "sidebar" for a link in the sidebar
+     *         // or "courses" to show a link (maybe with picture) below the
+     *         // "course search".
+     *         "target":"sidebar"
+     *     },
+     *     "semtree":{
+     *         "visible":true,
+     *         "target":"sidebar"
+     *     },
+     *     "rangetree":{
+     *         "visible":false,
+     *         "target":"sidebar"
+     *     },
+     *     // New option to acivate the search for modules and the systematic
+     *     // search in studycourses, field of study and degrees.
+     *     "module":{
+     *         "visible":true,
+     *         "target":"sidebar"
+     *     },
+     *     // This option shows a direct link in the sidebar to an entry (level)
+     *     // in the range tree. The link text is the name of the level.
+     *     "fb3_hist":{
+     *         "visible":true,
+     *         "target":"sidebar",
+     *         "range_tree_id":"d1a07cf0c8057c664279214cc070b580"
+     *     },
+     *     // The same for an entry in the sem tree.
+     *     "grundstudium":{
+     *         "visible":true,
+     *         "target":"sidebar",
+     *         "sem_tree_id":"e1a07cf0c8057c664279214cc070b580"
+     *     },
+     *     // This shows a link in the sidebar to the course search. The text is
+     *     // availlable in two languages.
+     *     "vvz":{
+     *         "visible":true,
+     *         "target":"sidebar",
+     *         "url":"dispatch.php/search/courses?level=f&option=vav",
+     *         "title":{
+     *             "de_DE":"Veranstaltungsverzeichnis",
+     *             "en_GB":"Course Catalogue"
+     *         }
+     *     },
+     *     // This option uses an url with search option and shows a link in the
+     *     // sidebar to an entry in the range tree with all courses.
+     *     "test":{
+     *         "visible":true,
+     *         "target":"sidebar",
+     *         "url":"dispatch.php/search/courses?start_item_id=d1a07cf0c8057c664279214cc070b580&cmd=show_sem_range_tree&item_id=d1a07cf0c8057c664279214cc070b580_withkids&level=ev",
+     *         "title":{
+     *             "de_DE":"Historisches Institut",
+     *             "en_GB":"Historical Institute"
+     *         }
+     *     },
+     *     // This option shows a link to the sem tree with picture below the
+     *     // course search (target: courses).
+     *     // This is the behaviour of Stud.IP < 4.2.
+     *     "csemtree":{
+     *         "visible":true,
+     *         "target":"courses",
+     *         "url":"dispatch.php/search/courses?level=vv",
+     *         "img":{
+     *             "filename":"directory-search.png",
+     *             "attributes":{
+     *                 "size":"260@100"
+     *             }
+     *         },
+     *         "title":{
+     *             "de_DE":"Suche im Vorlesungsverzeichnis",
+     *             "en_GB":"Search course directory"
+     *         }
+     *     },
+     *     // This option shows a link to the range tree with picture below the
+     *     // course search (target: courses).
+     *     // This is the behaviour of Stud.IP < 4.2.
+     *     "crangetree":{
+     *         "visible":true,
+     *         "target":"courses",
+     *         "url":"dispatch.php/search/courses?level=ev",
+     *         "img":{
+     *             "filename":"institute-search.png",
+     *             "attributes":{
+     *                 "size":"260@100"
+     *             }
+     *         },
+     *         "title":{
+     *             "de_DE":"Suche in Einrichtungen",
+     *             "en_GB":"Search institutes"
+     *         }
+     *     }
+     * }
+     *
+     *
+     * @param string $target
+     * @param string $option_name
+     * @return Navigation|null
+     */
+    public static function getSearchOptionNavigation($target, $option_name = null): ?Navigation
+    {
+        // return first visible search option
+        if (is_null($option_name)) {
+            $options = Config::get()->COURSE_SEARCH_NAVIGATION_OPTIONS;
+            foreach ($options as $name => $option) {
+                if ($option['visible'] && $option['target'] === $target) {
+                    return self::getSearchOptionNavigation($target, $name);
+                }
+            }
+            return null;
+        }
+
+        $installed_languages = array_keys(Config::get()->INSTALLED_LANGUAGES);
+        $language = $_SESSION['_language'] ?? reset($installed_languages);
+        $option = Config::get()->COURSE_SEARCH_NAVIGATION_OPTIONS[$option_name];
+        if (!$option['visible'] || $option['target'] !== $target) {
+            return null;
+        }
+        if (empty($option['url'])) {
+            switch ($option_name) {
+                case 'courses':
+                case 'semtree':
+                    return new Navigation(_('Vorlesungsverzeichnis'),
+                            URLHelper::getURL('dispatch.php/search/courses',
+                                    [
+                                        'type' => 'semtree'
+                                    ], true));
+                case 'rangetree':
+                    return new Navigation(_('Einrichtungsverzeichnis'),
+                            URLHelper::getURL('dispatch.php/search/courses',
+                                    [
+                                        'type' => 'rangetree'
+                                    ], true));
+                case 'module':
+                    return new MVVSearchNavigation(_('Modulverzeichnis'),
+                            URLHelper::getURL('dispatch.php/search/module'),null, true);
+            }
+        } else {
+            return new Navigation($option['title'][$language],
+                    URLHelper::getURL($option['url'], ['option' => $option_name], true));
+        }
+        if (!empty($option['sem_tree_id'])) {
+            $study_area = StudipStudyArea::find($option['sem_tree_id']);
+            return new Navigation($study_area->name,
+                    URLHelper::getURL('dispatch.php/search/courses',
+                        [
+                            'start_item_id' => $option['sem_tree_id'],
+                            'path_id'       => $option['sem_tree_id'],
+                            'cmd'           => 'show_sem_range',
+                            'item_id'       => $option['sem_tree_id'] . '_withkids',
+                            'level'         => 'vv',
+                            'option'        => $option_name
+                        ], true));
+        }
+        if (!empty($option['range_tree_id'])) {
+            $item_name = DBManager::get()->fetchColumn('
+                    SELECT `name`
+                    FROM `range_tree`
+                    WHERE item_id = ?',
+                    [$option['range_tree_id']]);
+            return new Navigation($item_name,
+                    URLHelper::getURL('dispatch.php/search/courses',
+                        [
+                            'start_item_id' => $option['range_tree_id'],
+                            'path_id'       => $option['range_tree_id'],
+                            'cmd'           => 'show_sem_range_tree',
+                            'item_id'       => $option['range_tree_id'] . '_withkids',
+                            'level'         => 'ev',
+                            'option'        => $option_name
+                        ], true));
+        }
+
+        return null;
+    }
+
+    /**
+     * The class SemBrowse uses a vast number of variables stored in the
+     * session. This function sets the default values or transfers some
+     * of them to url parameters if a filter in the sidebar has been changed.
+     *
+     * @see SemBrowse::setClassesSelector()
+     * @see SemBrowse::setSemesterSelector()
+     */
+    public static function transferSessionData()
+    {
+        if (empty($_SESSION['sem_browse_data']) || Request::option('reset_all')) {
+            $_SESSION['sem_browse_data'] = [];
+        }
+
+        $_SESSION['sem_browse_data']['qs_choose'] = Request::get('search_sem_qs_choose',
+                $_SESSION['sem_browse_data']['qs_choose'] ?? null);
+
+        // simulate button clicked if semester was changed
+        $old_default_sem = $_SESSION['sem_browse_data']['default_sem'] ?? null;
+        if (Request::option('search_sem_sem', $old_default_sem) != $old_default_sem) {
+            $_SESSION['sem_browse_data']['default_sem'] = Request::option('search_sem_sem');
+            if ($_SESSION['sem_browse_data']['sset']) {
+                Request::set('search_sem_quick_search_parameter', $_SESSION['sem_browse_data']['sset']);
+                Request::set('search_sem_quick_search', $_SESSION['sem_browse_data']['sset']);
+                Request::set('search_sem_qs_choose', $_SESSION['sem_browse_data']['qs_choose']);
+                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
+                Request::set('search_sem_do_search', '1');
+                Request::set('search_sem_' . md5('is_sended'), '1');
+            } else {
+                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
+                Request::set('search_sem_sem_change', '1');
+                Request::set('search_sem_sem_select', '1');
+            }
+        }
+
+        // simulate button clicked if class was changed
+        $old_show_class = $_SESSION['sem_browse_data']['show_class'] ?? null;
+        if (Request::option('show_class', $old_show_class) != $old_show_class) {
+            $_SESSION['sem_browse_data']['show_class'] = Request::option('show_class');
+
+            if ($_SESSION['sem_browse_data']['show_class']
+                    && $_SESSION['sem_browse_data']['show_class'] != 'all') {
+                $class = $GLOBALS['SEM_CLASS'][$_SESSION['sem_browse_data']['show_class']];
+                $_SESSION['sem_browse_data']['sem_status'] = array_keys($class->getSemTypes());
+            } else {
+                $_SESSION['sem_browse_data']['sem_status'] = false;
+            }
+
+            if ($_SESSION['sem_browse_data']['sset']) {
+                Request::set('search_sem_quick_search_parameter', $_SESSION['sem_browse_data']['sset']);
+                Request::set('search_sem_quick_search', $_SESSION['sem_browse_data']['sset']);
+                Request::set('search_sem_qs_choose', $_SESSION['sem_browse_data']['qs_choose']);
+                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
+                Request::set('search_sem_do_search', '1');
+                Request::set('search_sem_' . md5('is_sended'), '1');
+            } else {
+                Request::set('search_sem_category', $_SESSION['sem_browse_data']['show_class']);
+                Request::set('search_sem_sem_change', '1');
+                Request::set('search_sem_sem_select', '1');
+            }
+        }
+
+        // set default values
+        if (empty($_SESSION['sem_browse_data']['default_sem'])) {
+            $_SESSION['sem_browse_data']['default_sem'] =
+                Semester::getIndexById(self::getDefaultSemester(), true, true)
+                        ?: 'all';
+        }
+        $_SESSION['sem_browse_data']['show_class'] =
+                $_SESSION['sem_browse_data']['show_class'] ?? 'all';
+        $_SESSION['sem_browse_data']['group_by'] =
+                $_SESSION['sem_browse_data']['group_by'] ?? '0';
+    }
+
+    /**
+     * Retrieves the default semester from session or calculate it considering
+     * the value from SEMESTER_TIME_SWITCH.
+     *
+     * @return Semester The semester object of the default semester.
+     */
+    public static function getDefaultSemester()
+    {
+        $default_sem = $_SESSION['_default_sem'];
+        if (!$default_sem) {
+            $current_sem = Semester::findDefault();
+            $default_sem = $current_sem->id;
+        }
+
+        return $default_sem;
+    }
+
+    /**
+     * Adds a widget to the sidebar to select a course class. The result set is
+     * filtered by this class.
+     *
+     * @param string $submit_url The submit url.
+     */
+    public static function setClassesSelector($submit_url)
+    {
+        $classes_filter = new SelectWidget(_('Veranstaltungsklassen'),
+                $submit_url, 'show_class');
+        $classes_filter->addElement(new SelectElement('all', _('Alle'),
+                ($_SESSION['sem_browse_data']['show_class'] ?: 'all') === 'all'));
+        foreach ($GLOBALS['SEM_CLASS'] as $key => $val) {
+            $classes_filter->addElement(new SelectElement($key, $val['name'],
+                    ($_SESSION['sem_browse_data']['show_class'] == $key)));
+        }
+        Sidebar::Get()->addWidget($classes_filter);
+    }
+
+    /**
+     * Adds a widget to the sidebar to select a semester. The result set is
+     * filtered by this semester.
+     *
+     * @param string $submit_url The submit url.
+     */
+    public static function setSemesterSelector($submit_url)
+    {
+        $semesters = Semester::findAllVisible();
+        $sidebar = Sidebar::Get();
+        $list = new SelectWidget(_('Semester'),
+                $submit_url, 'search_sem_sem');
+        $list->addElement(new SelectElement('all', _('Alle'),
+                ($_SESSION['sem_browse_data']['default_sem']) === 'all'));
+        foreach(array_reverse($semesters, true) as $i => $semester_data) {
+            $list->addElement(new SelectElement(
+                $i,
+                $semester_data['name'],
+                ($_SESSION['sem_browse_data']['default_sem'] !== 'all'
+                    && intval($_SESSION['sem_browse_data']['default_sem']) === $i)
+            ));
+        }
+        $sidebar->addWidget($list, 'filter_semester');
+    }
+
+    /**
+     * Returns the admission status for a course.
+     *
+     * @param string $seminar_id Id of the course
+     * @param bool   $prelim     State of preliminary setting
+     * @return int
+     */
+    public static function getStatusCourseAdmission($seminar_id, $prelim)
+    {
+        $sql = "SELECT COUNT(`type`) AS `types`,
+                       SUM(IF(`type` = 'LockedAdmission', 1, 0)) AS `type_locked`
+                FROM `seminar_courseset`
+	            INNER JOIN `courseset_rule` USING (`set_id`)
+	            WHERE `seminar_id` = ?
+                GROUP BY `set_id`";
+
+	    $stmt = DBManager::get()->prepare($sql);
+	    $stmt->execute([$seminar_id]);
+	    $result = $stmt->fetch();
+
+        if (!empty($result['types'])) {
+            if ($result['type_locked']) {
+                return 2;
+            }
+            return 1;
+        }
+
+        if ($prelim) {
+            return 1;
+        }
+        return 0;
+    }
+
+    /**
+     * Returns a Quick Search form to put inside a WidgetElement.
+     *
+     * @param string   $level     The Level of search , expected ('f', 'vv', 'ev')
+     * @return string $search_form_content Contains a form element with a quick search input, predefined (hidden) inputs and search button
+     */
+    public function getQuickSearchForm()
+    {
+        if ($this->sem_browse_data['level'] === 'vv') {
+            $this->search_obj->sem_tree =& $this->sem_tree->tree;
+            if ($this->sem_tree->start_item_id !== 'root') {
+                $this->search_obj->search_scopes[] = $this->sem_tree->start_item_id;
+            }
+        } elseif ($this->sem_browse_data['level'] === 'ev') {
+            $this->search_obj->range_tree =& $this->range_tree->tree;
+            if ($this->range_tree->start_item_id !== 'root'){
+                $this->search_obj->search_ranges[] = $this->range_tree->start_item_id;
+            }
+        }
+
+        $search_form_content = $this->search_obj->getFormStart(URLHelper::getLink(), ['class' => '']);
+        $quicksearch = $this->getQuicksearch();
+        $quicksearch->setInputStyle('height:22px;width: 100%;');
+        $quicksearch->withButton(['search_button_name'=> 'course_search_button']);
+        $quicksearch->disableAutocomplete();
+        $search_form_content .= $quicksearch->render();
+        $search_form_content .= $this->search_obj->getHiddenField('qs_choose','title_lecturer_number');
+
+        if($this->sem_browse_data['level'] == 'vv')
+            $search_form_content .= $this->search_obj->getHiddenField('scope_choose', $this->sem_tree->start_item_id);
+
+        if($this->sem_browse_data['level'] == 'ev')
+            $search_form_content .= $this->search_obj->getHiddenField('range_choose', $this->range_tree->start_item_id);
+
+        $search_form_content .= $this->search_obj->getHiddenField('level', $this->sem_browse_data['level']);
+        $search_form_content .= $this->search_obj->getHiddenField('sem', htmlReady($_SESSION['sem_browse_data']['default_sem']));
+
+        $search_form_content .= $this->search_obj->getFormEnd();
+        return $search_form_content;
+    }
+}
diff --git a/lib/classes/SemClass.class.php b/lib/classes/SemClass.class.php
deleted file mode 100644
index 2a038e2..0000000
--- a/lib/classes/SemClass.class.php
+++ /dev/null
@@ -1,644 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-/**
- * Class to define and manage attributes of seminar classes (or seminar categories).
- * Usually all sem-classes are stored in a global variable $SEM_CLASS which is
- * an array of SemClass objects.
- *
- * SemClass::getClasses() gets you all seminar classes in an array.
- *
- * You can access the attributes of a sem-class like an associative
- * array with $sem_class['default_read_level']. The uinderlying data is stored
- * in the database in the table sem_classes.
- *
- * If you want to have a name of a sem-class like "Lehre", please use
- * $sem_class['name'] and you will get a fully localized name and not the pure
- * database entry.
- *
- * This class manages also which modules are contained in which course-slots,
- * like "what module is used as a forum in my seminars". In the database stored
- * is the name of the module like "CoreForum" or a classname of a plugin or null
- * if the forum is completely disabled by root for this sem-class. Core-modules
- * can only be used within a standard slot. Plugins may also be used as optional
- * modules not contained in a slot.
- *
- * In the field 'modules' in the database is for each modules stored in a json-string
- * if the module is activatable by the teacher or not and if it is activated as
- * a default. Please use the methods SemClass::isSlotModule, SemClass::getSlotModule,
- * SemClass::isModuleAllowed, SemClass::isModuleMandatory, SemClass::isSlotMandatory
- * or even more simple SemClass::getNavigationForSlot (see documentation there).
- */
-class SemClass implements ArrayAccess
-{
-    protected $data = [];
-
-    static protected $studygroup_forbidden_modules = [
-        'CoreAdmin',
-        'CoreParticipants',
-    ];
-
-    static protected $sem_classes = null;
-
-    static public function getDefaultSemClass() {
-        $data = [
-            'name' => "Fehlerhafte Seminarklasse!",
-            'modules' => '{"CoreOverview":{"activated":1,"sticky":1},"CoreAdmin":{"activated":1,"sticky":1}}',
-            'visible' => 1,
-            'is_group' => false
-        ];
-        return new SemClass($data);
-    }
-
-    /**
-     * Generates a dummy SemClass for institutes of this type (as defined in config.inc.php).
-     * @param integer $type   institute type
-     * @return SemClass
-     */
-    static public function getDefaultInstituteClass($type)
-    {
-        global $INST_MODULES;
-
-        // fall back to 'default' if modules are not defined
-        $type = isset($INST_MODULES[$type]) ? $type : 'default';
-
-        $data = [
-            'name'                => _('Generierte Standardinstitutsklasse'),
-            'visible'             => 1,
-            'admin'               => 'CoreAdmin',     // always available
-            'overview'            => 'CoreOverview'   // always available
-        ];
-        $slots = [
-            'forum'               => 'CoreForum',
-            'documents'           => 'CoreDocuments',
-            'scm'                 => 'CoreScm',
-            'wiki'                => 'CoreWiki',
-            'calendar'            => 'CoreCalendar',
-            'elearning_interface' => 'CoreElearningInterface',
-            'personal'            => 'CorePersonal'
-        ];
-        $modules = [
-            'CoreAdmin'           => ['activated' => 1, 'sticky' => 1],
-            'CoreOverview'        => ['activated' => 1, 'sticky' => 1],
-        ];
-
-        foreach ($slots as $slot => $module) {
-            $data[$slot] = $module;
-            $modules[$module] = ['activated' => (int) ($INST_MODULES[$type][$slot] ?? 0), 'sticky' => 0];
-        }
-        $data['modules'] = json_encode($modules);
-
-        return new SemClass($data);
-    }
-
-    /**
-     * Constructor can be set with integer of sem_class_id or an array of
-     * the old $SEM_CLASS style.
-     * @param integer | array $data
-     */
-    public function __construct($data)
-    {
-        $db = DBManager::get();
-        if (is_int($data)) {
-            $statement = $db->prepare("SELECT * FROM sem_classes WHERE id = :id ");
-            $statement->execute(['id' => $data]);
-            $this->data = $statement->fetch(PDO::FETCH_ASSOC);
-        } else {
-            $this->data = $data;
-        }
-        if (!empty($this->data['modules'])) {
-            $this->data['modules'] = self::object2array(json_decode($this->data['modules']));
-
-        } else {
-            $this->data['modules'] = [];
-        }
-        if (!empty($this->data['studygroup_mode'])) {
-            if (!isset($this->data['modules']['CoreStudygroupAdmin'])) {
-                $this->data['modules']['CoreStudygroupAdmin'] = ['activated' => 1, 'sticky' => 1];
-            }
-        } else {
-            if (!isset($this->data['modules']['CoreAdmin'])) {
-                $this->data['modules']['CoreAdmin'] = ['activated' => 1, 'sticky' => 1];
-            }
-        }
-        foreach (array_keys($this->data['modules']) as $modulename) {
-            if ($this->isModuleForbidden($modulename)) {
-                unset($this->data['modules'][$modulename]);
-            }
-        }
-    }
-
-
-    /**
-     * @param string $module
-     * @return false|int
-     */
-    public function activateModuleInCourses($module)
-    {
-        $plugin = PluginManager::getInstance()->getPlugin($module);
-        if ($plugin) {
-            return Course::findEachBySQL(function ($course) use ($plugin) {
-                return PluginManager::getInstance()->setPluginActivated($plugin->getPluginId(), $course->id, true);
-            },
-                "seminare.status IN (?)",
-                [array_keys($this->getSemTypes())]);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param string $module
-     * @return false|int
-     */
-    public function deActivateModuleInCourses($module)
-    {
-        $plugin = PluginManager::getInstance()->getPlugin($module);
-        if ($plugin) {
-            return Course::findEachBySQL(function ($course) use ($plugin) {
-                return PluginManager::getInstance()->setPluginActivated($plugin->getPluginId(), $course->id, false);
-            },
-                "seminare.status IN (?)",
-                [array_keys($this->getSemTypes())]);
-        } else {
-            return false;
-        }
-
-    }
-
-    /**
-     * Returns the number of seminars of this sem_class in Stud.IP
-     * @return integer
-     */
-    public function countSeminars()
-    {
-        $db = DBManager::get();
-        $sum = 0;
-        foreach ($GLOBALS['SEM_TYPE'] as $sem_type) {
-            if ($sem_type['class'] == $this->data['id']) {
-                $sum += $sem_type->countSeminars();
-            }
-        }
-        return $sum;
-    }
-
-
-    /**
-     * @param string $modulename
-     * @return bool
-     */
-    public function isModuleForbidden($modulename)
-    {
-        if (!empty($this->data['studygroup_mode'])) {
-            return in_array($modulename, self::$studygroup_forbidden_modules);
-        } else {
-            return strpos($modulename, 'Studygroup') !== false;
-        }
-    }
-
-    /**
-     * Returns the metadata of a module regarding this sem_class object.
-     * @param string $modulename
-     * @return array('sticky' => (bool), 'activated' => (bool))
-     */
-    public function getModuleMetadata($modulename)
-    {
-        return $this->data['modules'][$modulename];
-    }
-
-    /**
-     * Sets the metadata for each module at once.
-     * @param array $module_array: array($module_name => array('sticky' => (bool), 'activated' => (bool)), ...)
-     */
-    public function setModules($module_array)
-    {
-        $this->data['modules'] = $module_array;
-    }
-
-    /**
-     * Returns all metadata of the modules at once.
-     * @return array: array($module_name => array('sticky' => (bool), 'activated' => (bool)), ...)
-     */
-    public function getModules()
-    {
-        return $this->data['modules'];
-    }
-
-    /**
-     * @return StudipModule[]
-     */
-    public function getModuleObjects()
-    {
-        $result = [];
-        foreach (array_keys($this->getModules()) as $module) {
-            $plugin = PluginManager::getInstance()->getPlugin($module);
-            if ($plugin) {
-                $result[$plugin->getPluginId()] = $plugin;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getActivatedModules()
-    {
-        return array_keys(array_filter($this->data['modules'], function ($meta) {
-            return $meta['activated'];
-        }));
-    }
-
-    /**
-     * @return StudipModule[]
-     */
-    public function getActivatedModuleObjects()
-    {
-        $result = [];
-        foreach ($this->getActivatedModules() as $module) {
-            $plugin = PluginManager::getInstance()->getPlugin($module);
-            if ($plugin) {
-                $result[$plugin->getPluginId()] = $plugin;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @return mixed|object
-     */
-    public function getAdminModuleObject()
-    {
-        if ($this->data['studygroup_mode']) {
-            $module = 'CoreStudygroupAdmin';
-        } else {
-            $module = 'CoreAdmin';
-        }
-        return PluginManager::getInstance()->getPlugin($module);
-    }
-
-    /**
-     * Returns true if a module is activated on default for this sem_class.
-     * @param string $modulename
-     * @return boolean
-     */
-    public function isModuleActivated($modulename)
-    {
-        return isset($this->data['modules'][$modulename])
-            && $this->data['modules'][$modulename]['activated'];
-    }
-
-    /**
-     * Returns if a module is allowed to be displayed for this sem_class.
-     * @param string $modulename
-     * @return boolean
-     */
-    public function isModuleAllowed($modulename)
-    {
-        return !$this->isModuleForbidden($modulename)
-            && (
-                empty($this->data['modules'][$modulename])
-                || empty($this->data['modules'][$modulename]['sticky'])
-                || !empty($this->data['modules'][$modulename]['activated'])
-            );
-    }
-
-    /**
-     * Returns if a module is mandatory for this sem_class.
-     * @param string $module
-     * @return boolean
-     */
-    public function isModuleMandatory($module)
-    {
-        return isset($this->data['modules'][$module])
-            && !empty($this->data['modules'][$module]['sticky'])
-            && !empty($this->data['modules'][$module]['activated']);
-    }
-
-    public function getSemTypes()
-    {
-        $types = [];
-        foreach (SemType::getTypes() as $id => $type) {
-            if ($type['class'] == $this->data['id']) {
-                $types[$id] = $type;
-            }
-        }
-        return $types;
-    }
-
-    /**
-     * Checks if the current sem class is usable for course grouping.
-     */
-    public function isGroup()
-    {
-        return $this->data['is_group'];
-    }
-
-    /**
-     * Checks if any SemClasses exist that provide grouping functionality.
-     * @return SimpleCollection
-     */
-    public static function getGroupClasses()
-    {
-        return SimpleCollection::createFromArray(self::getClasses())->findBy('is_group', true);
-    }
-
-    /**
-     * stores all data in the database
-     * @return boolean success
-     */
-    public function store()
-    {
-        $db = DBManager::get();
-        $statement = $db->prepare(
-            "UPDATE sem_classes " .
-                "SET name = :name, " .
-                "description = :description, " .
-                "create_description = :create_description, " .
-                "studygroup_mode = :studygroup_mode, " .
-                "only_inst_user = :only_inst_user, " .
-                "default_read_level = :default_read_level, " .
-                "default_write_level = :default_write_level, " .
-                "bereiche = :bereiche, " .
-                "module = :module, " .
-                "show_browse = :show_browse, " .
-                "write_access_nobody = :write_access_nobody, " .
-                "topic_create_autor = :topic_create_autor, " .
-                "visible = :visible, " .
-                "course_creation_forbidden = :course_creation_forbidden, " .
-                "modules = :modules, " .
-                "title_dozent = :title_dozent, " .
-                "title_dozent_plural = :title_dozent_plural, " .
-                "title_tutor = :title_tutor, " .
-                "title_tutor_plural = :title_tutor_plural, " .
-                "title_autor = :title_autor, " .
-                "title_autor_plural = :title_autor_plural, " .
-                "admission_prelim_default = :admission_prelim_default, " .
-                "admission_type_default = :admission_type_default, " .
-                "show_raumzeit = :show_raumzeit, " .
-                "is_group = :is_group, " .
-                "unlimited_forbidden = :unlimited_forbidden, " .
-                "chdate = UNIX_TIMESTAMP() " .
-            "WHERE id = :id ".
-        "");
-        \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
-        return $statement->execute([
-            'id' => $this->data['id'],
-            'name' => $this->data['name'],
-            'description' => $this->data['description'],
-            'create_description' => $this->data['create_description'],
-            'studygroup_mode' => (int) $this->data['studygroup_mode'],
-            'only_inst_user' => (int) $this->data['only_inst_user'],
-            'default_read_level' => (int) $this->data['default_read_level'],
-            'default_write_level' => (int) $this->data['default_write_level'],
-            'bereiche' => (int) $this->data['bereiche'],
-            'module' => (int) $this->data['module'],
-            'show_browse' => (int) $this->data['show_browse'],
-            'write_access_nobody' => (int) $this->data['write_access_nobody'],
-            'topic_create_autor' => (int) $this->data['topic_create_autor'],
-            'visible' => (int) $this->data['visible'],
-            'course_creation_forbidden' => (int) $this->data['course_creation_forbidden'],
-            'modules' => json_encode((object) $this->data['modules']),
-            'title_dozent' => $this->data['title_dozent']
-                ? $this->data['title_dozent']
-                : null,
-            'title_dozent_plural' => $this->data['title_dozent_plural']
-                ? $this->data['title_dozent_plural']
-                : null,
-            'title_tutor' => $this->data['title_tutor']
-                ? $this->data['title_tutor']
-                : null,
-            'title_tutor_plural' => $this->data['title_tutor_plural']
-                ? $this->data['title_tutor_plural']
-                : null,
-            'title_autor' => $this->data['title_autor']
-                ? $this->data['title_autor']
-                : null,
-            'title_autor_plural' => $this->data['title_autor_plural']
-                ? $this->data['title_autor_plural']
-                : null,
-            'admission_prelim_default' => (int)$this->data['admission_prelim_default'],
-            'admission_type_default' => (int)$this->data['admission_type_default'],
-            'show_raumzeit' => (int) $this->data['show_raumzeit'],
-            'is_group' => (int) $this->data['is_group'],
-            'unlimited_forbidden' => (int) $this->data['unlimited_forbidden'],
-        ]);
-    }
-
-    /**
-     * Deletes the sem_class-object and all its sem_types. Will only delete,
-     * if there are no seminars in this sem_class.
-     * Remember to refresh the global $SEM_CLASS and $SEM_TYPE array.
-     * @return boolean : success of deletion
-     */
-    public function delete()
-    {
-        if ($this->countSeminars() === 0) {
-            foreach ($GLOBALS['SEM_TYPE'] as $sem_type) {
-                if ($sem_type['class'] == $this->data['id']) {
-                    $sem_type->delete();
-                }
-            }
-            $GLOBALS['SEM_TYPE'] = SemType::getTypes();
-            $db = DBManager::get();
-            $statement = $db->prepare("
-                DELETE FROM sem_classes
-                WHERE id = :id
-            ");
-            \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
-            return $statement->execute([
-                'id' => $this->data['id']
-            ]);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sets an attribute of sem_class->data
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function set($offset, $value)
-    {
-        $this->data[$offset] = $value;
-    }
-
-    /***************************************************************************
-     *                          ArrayAccess methods                            *
-     ***************************************************************************/
-
-    /**
-     * deprecated, does nothing, should not be used
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value): void
-    {
-    }
-
-    /**
-     * Compatibility function with old $SEM_CLASS variable for plugins. Maps the
-     * new array-structure to the old boolean values.
-     * @param integer $offset: name of attribute
-     */
-    public function offsetGet($offset): mixed
-    {
-        switch ($offset) {
-            case "name":
-                return gettext($this->data['name']);
-            case "only_inst_user":
-                return (bool) $this->data['only_inst_user'];
-            case "bereiche":
-                return (bool) $this->data['bereiche'];
-            case "show_browse":
-                return (bool) $this->data['show_browse'];
-            case "write_access_nobody":
-                return (bool) $this->data['write_access_nobody'];
-            case "topic_create_autor":
-                return (bool) $this->data['topic_create_autor'];
-            case "visible":
-                return (bool) $this->data['visible'];
-            case "studygroup_mode":
-                return (bool) $this->data['studygroup_mode'];
-            case "admission_prelim_default":
-               return (int) $this->data['admission_prelim_default'];
-            case "admission_type_default":
-               return (int) $this->data['admission_type_default'];
-            case "is_group":
-               return (bool) $this->data['is_group'];
-        }
-        //ansonsten
-        return $this->data[$offset] ?? null;
-    }
-
-    /**
-     * ArrayAccess method to check if an attribute exists.
-     * @param int $offset
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->data[$offset]);
-    }
-
-    /**
-     * deprecated, does nothing, should not be used
-     * @param string $offset
-     */
-    public function offsetUnset($offset): void
-    {
-    }
-
-    /***************************************************************************
-     *                            static methods                               *
-     ***************************************************************************/
-
-    /**
-     * Returns an array of all SemClasses in Stud.IP. Equivalent to global
-     * $SEM_CLASS variable. This variable is statically stored in this class.
-     * @return SemClass[] of SemClass
-     */
-    static public function getClasses()
-    {
-        if (!is_array(self::$sem_classes)) {
-            $db = DBManager::get();
-            self::$sem_classes = [];
-
-            $cache = \Studip\Cache\Factory::getCache();
-            $class_array = unserialize($cache->read('DB_SEM_CLASSES_ARRAY'));
-            if (!$class_array) {
-
-                try {
-                    $statement = $db->prepare(
-                        "SELECT * FROM sem_classes ORDER BY id ASC "
-                    );
-                    $statement->execute();
-                    $class_array = $statement->fetchAll(PDO::FETCH_ASSOC);
-
-                    if ($class_array) {
-                        $cache = \Studip\Cache\Factory::getCache();
-                        $cache->write('DB_SEM_CLASSES_ARRAY', serialize($class_array));
-                    }
-                } catch (PDOException $e) {
-                    //for use without or before migration 92
-                    $class_array = $GLOBALS['SEM_CLASS_OLD_VAR'];
-                    if (is_array($class_array)) {
-                        ksort($class_array);
-                        foreach ($class_array as $id => $class) {
-                            self::$sem_classes[$id] = new SemClass($class);
-                        }
-                    } else {
-                        self::$sem_classes[1] = self::getDefaultSemClass();
-                    }
-                }
-            }
-            foreach ($class_array as $sem_class) {
-                self::$sem_classes[$sem_class['id']] = new SemClass($sem_class);
-            }
-        }
-        return self::$sem_classes;
-    }
-
-    /**
-     * Refreshes the internal $sem_classes cache-variable.
-     * @return array of SemClass
-     */
-    static public function refreshClasses()
-    {
-        \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
-        self::$sem_classes = null;
-        return self::getClasses();
-    }
-
-    /**
-     * Static method to recursively transform an object into an associative array.
-     * @param mixed $obj: should be of class StdClass
-     * @return array
-     */
-    static public function object2array($obj)
-    {
-        $arr_raw = is_object($obj) ? get_object_vars($obj) : $obj;
-        foreach ($arr_raw as $key => $val) {
-            $val = (is_array($val) || is_object($val)) ? self::object2array($val) : $val;
-            $arr[$key] = $val;
-        }
-        return $arr;
-    }
-
-
-    /**
-     * Static method only to keep the translationstrings of the values. It is
-     * never used within the system.
-     */
-    static private function localization()
-    {
-        _("Lehre");
-        _("Forschung");
-        _("Organisation");
-        _("Community");
-        _("Arbeitsgruppen");
-        _("importierte Kurse");
-        _("Hauptveranstaltungen");
-
-        _("Hier finden Sie alle in Stud.IP registrierten Lehrveranstaltungen");
-        _("Verwenden Sie diese Kategorie, um normale Lehrveranstaltungen anzulegen");
-        _("Hier finden Sie virtuelle Veranstaltungen zum Thema Forschung an der Universität");
-        _("In dieser Kategorie können Sie virtuelle Veranstaltungen für Forschungsprojekte anlegen.");
-        _("Hier finden Sie virtuelle Veranstaltungen zu verschiedenen Gremien an der Universität");
-        _("Um virtuelle Veranstaltungen für Uni-Gremien anzulegen, verwenden Sie diese Kategorie");
-        _("Hier finden Sie virtuelle Veranstaltungen zu unterschiedlichen Themen");
-        _("Wenn Sie Veranstaltungen als Diskussiongruppen zu unterschiedlichen Themen anlegen möchten, verwenden Sie diese Kategorie.");
-        _("Hier finden Sie verschiedene Arbeitsgruppen an der %s");
-        _("Verwenden Sie diese Kategorie, um unterschiedliche Arbeitsgruppen anzulegen.");
-        _("Veranstaltungen dieser Kategorie dienen als Gruppierungselement, um die Zusammengehörigkeit von Veranstaltungen anderer Kategorien abzubilden.");
-    }
-
-}
diff --git a/lib/classes/SemClass.php b/lib/classes/SemClass.php
new file mode 100644
index 0000000..2a038e2
--- /dev/null
+++ b/lib/classes/SemClass.php
@@ -0,0 +1,644 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+/**
+ * Class to define and manage attributes of seminar classes (or seminar categories).
+ * Usually all sem-classes are stored in a global variable $SEM_CLASS which is
+ * an array of SemClass objects.
+ *
+ * SemClass::getClasses() gets you all seminar classes in an array.
+ *
+ * You can access the attributes of a sem-class like an associative
+ * array with $sem_class['default_read_level']. The uinderlying data is stored
+ * in the database in the table sem_classes.
+ *
+ * If you want to have a name of a sem-class like "Lehre", please use
+ * $sem_class['name'] and you will get a fully localized name and not the pure
+ * database entry.
+ *
+ * This class manages also which modules are contained in which course-slots,
+ * like "what module is used as a forum in my seminars". In the database stored
+ * is the name of the module like "CoreForum" or a classname of a plugin or null
+ * if the forum is completely disabled by root for this sem-class. Core-modules
+ * can only be used within a standard slot. Plugins may also be used as optional
+ * modules not contained in a slot.
+ *
+ * In the field 'modules' in the database is for each modules stored in a json-string
+ * if the module is activatable by the teacher or not and if it is activated as
+ * a default. Please use the methods SemClass::isSlotModule, SemClass::getSlotModule,
+ * SemClass::isModuleAllowed, SemClass::isModuleMandatory, SemClass::isSlotMandatory
+ * or even more simple SemClass::getNavigationForSlot (see documentation there).
+ */
+class SemClass implements ArrayAccess
+{
+    protected $data = [];
+
+    static protected $studygroup_forbidden_modules = [
+        'CoreAdmin',
+        'CoreParticipants',
+    ];
+
+    static protected $sem_classes = null;
+
+    static public function getDefaultSemClass() {
+        $data = [
+            'name' => "Fehlerhafte Seminarklasse!",
+            'modules' => '{"CoreOverview":{"activated":1,"sticky":1},"CoreAdmin":{"activated":1,"sticky":1}}',
+            'visible' => 1,
+            'is_group' => false
+        ];
+        return new SemClass($data);
+    }
+
+    /**
+     * Generates a dummy SemClass for institutes of this type (as defined in config.inc.php).
+     * @param integer $type   institute type
+     * @return SemClass
+     */
+    static public function getDefaultInstituteClass($type)
+    {
+        global $INST_MODULES;
+
+        // fall back to 'default' if modules are not defined
+        $type = isset($INST_MODULES[$type]) ? $type : 'default';
+
+        $data = [
+            'name'                => _('Generierte Standardinstitutsklasse'),
+            'visible'             => 1,
+            'admin'               => 'CoreAdmin',     // always available
+            'overview'            => 'CoreOverview'   // always available
+        ];
+        $slots = [
+            'forum'               => 'CoreForum',
+            'documents'           => 'CoreDocuments',
+            'scm'                 => 'CoreScm',
+            'wiki'                => 'CoreWiki',
+            'calendar'            => 'CoreCalendar',
+            'elearning_interface' => 'CoreElearningInterface',
+            'personal'            => 'CorePersonal'
+        ];
+        $modules = [
+            'CoreAdmin'           => ['activated' => 1, 'sticky' => 1],
+            'CoreOverview'        => ['activated' => 1, 'sticky' => 1],
+        ];
+
+        foreach ($slots as $slot => $module) {
+            $data[$slot] = $module;
+            $modules[$module] = ['activated' => (int) ($INST_MODULES[$type][$slot] ?? 0), 'sticky' => 0];
+        }
+        $data['modules'] = json_encode($modules);
+
+        return new SemClass($data);
+    }
+
+    /**
+     * Constructor can be set with integer of sem_class_id or an array of
+     * the old $SEM_CLASS style.
+     * @param integer | array $data
+     */
+    public function __construct($data)
+    {
+        $db = DBManager::get();
+        if (is_int($data)) {
+            $statement = $db->prepare("SELECT * FROM sem_classes WHERE id = :id ");
+            $statement->execute(['id' => $data]);
+            $this->data = $statement->fetch(PDO::FETCH_ASSOC);
+        } else {
+            $this->data = $data;
+        }
+        if (!empty($this->data['modules'])) {
+            $this->data['modules'] = self::object2array(json_decode($this->data['modules']));
+
+        } else {
+            $this->data['modules'] = [];
+        }
+        if (!empty($this->data['studygroup_mode'])) {
+            if (!isset($this->data['modules']['CoreStudygroupAdmin'])) {
+                $this->data['modules']['CoreStudygroupAdmin'] = ['activated' => 1, 'sticky' => 1];
+            }
+        } else {
+            if (!isset($this->data['modules']['CoreAdmin'])) {
+                $this->data['modules']['CoreAdmin'] = ['activated' => 1, 'sticky' => 1];
+            }
+        }
+        foreach (array_keys($this->data['modules']) as $modulename) {
+            if ($this->isModuleForbidden($modulename)) {
+                unset($this->data['modules'][$modulename]);
+            }
+        }
+    }
+
+
+    /**
+     * @param string $module
+     * @return false|int
+     */
+    public function activateModuleInCourses($module)
+    {
+        $plugin = PluginManager::getInstance()->getPlugin($module);
+        if ($plugin) {
+            return Course::findEachBySQL(function ($course) use ($plugin) {
+                return PluginManager::getInstance()->setPluginActivated($plugin->getPluginId(), $course->id, true);
+            },
+                "seminare.status IN (?)",
+                [array_keys($this->getSemTypes())]);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $module
+     * @return false|int
+     */
+    public function deActivateModuleInCourses($module)
+    {
+        $plugin = PluginManager::getInstance()->getPlugin($module);
+        if ($plugin) {
+            return Course::findEachBySQL(function ($course) use ($plugin) {
+                return PluginManager::getInstance()->setPluginActivated($plugin->getPluginId(), $course->id, false);
+            },
+                "seminare.status IN (?)",
+                [array_keys($this->getSemTypes())]);
+        } else {
+            return false;
+        }
+
+    }
+
+    /**
+     * Returns the number of seminars of this sem_class in Stud.IP
+     * @return integer
+     */
+    public function countSeminars()
+    {
+        $db = DBManager::get();
+        $sum = 0;
+        foreach ($GLOBALS['SEM_TYPE'] as $sem_type) {
+            if ($sem_type['class'] == $this->data['id']) {
+                $sum += $sem_type->countSeminars();
+            }
+        }
+        return $sum;
+    }
+
+
+    /**
+     * @param string $modulename
+     * @return bool
+     */
+    public function isModuleForbidden($modulename)
+    {
+        if (!empty($this->data['studygroup_mode'])) {
+            return in_array($modulename, self::$studygroup_forbidden_modules);
+        } else {
+            return strpos($modulename, 'Studygroup') !== false;
+        }
+    }
+
+    /**
+     * Returns the metadata of a module regarding this sem_class object.
+     * @param string $modulename
+     * @return array('sticky' => (bool), 'activated' => (bool))
+     */
+    public function getModuleMetadata($modulename)
+    {
+        return $this->data['modules'][$modulename];
+    }
+
+    /**
+     * Sets the metadata for each module at once.
+     * @param array $module_array: array($module_name => array('sticky' => (bool), 'activated' => (bool)), ...)
+     */
+    public function setModules($module_array)
+    {
+        $this->data['modules'] = $module_array;
+    }
+
+    /**
+     * Returns all metadata of the modules at once.
+     * @return array: array($module_name => array('sticky' => (bool), 'activated' => (bool)), ...)
+     */
+    public function getModules()
+    {
+        return $this->data['modules'];
+    }
+
+    /**
+     * @return StudipModule[]
+     */
+    public function getModuleObjects()
+    {
+        $result = [];
+        foreach (array_keys($this->getModules()) as $module) {
+            $plugin = PluginManager::getInstance()->getPlugin($module);
+            if ($plugin) {
+                $result[$plugin->getPluginId()] = $plugin;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getActivatedModules()
+    {
+        return array_keys(array_filter($this->data['modules'], function ($meta) {
+            return $meta['activated'];
+        }));
+    }
+
+    /**
+     * @return StudipModule[]
+     */
+    public function getActivatedModuleObjects()
+    {
+        $result = [];
+        foreach ($this->getActivatedModules() as $module) {
+            $plugin = PluginManager::getInstance()->getPlugin($module);
+            if ($plugin) {
+                $result[$plugin->getPluginId()] = $plugin;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @return mixed|object
+     */
+    public function getAdminModuleObject()
+    {
+        if ($this->data['studygroup_mode']) {
+            $module = 'CoreStudygroupAdmin';
+        } else {
+            $module = 'CoreAdmin';
+        }
+        return PluginManager::getInstance()->getPlugin($module);
+    }
+
+    /**
+     * Returns true if a module is activated on default for this sem_class.
+     * @param string $modulename
+     * @return boolean
+     */
+    public function isModuleActivated($modulename)
+    {
+        return isset($this->data['modules'][$modulename])
+            && $this->data['modules'][$modulename]['activated'];
+    }
+
+    /**
+     * Returns if a module is allowed to be displayed for this sem_class.
+     * @param string $modulename
+     * @return boolean
+     */
+    public function isModuleAllowed($modulename)
+    {
+        return !$this->isModuleForbidden($modulename)
+            && (
+                empty($this->data['modules'][$modulename])
+                || empty($this->data['modules'][$modulename]['sticky'])
+                || !empty($this->data['modules'][$modulename]['activated'])
+            );
+    }
+
+    /**
+     * Returns if a module is mandatory for this sem_class.
+     * @param string $module
+     * @return boolean
+     */
+    public function isModuleMandatory($module)
+    {
+        return isset($this->data['modules'][$module])
+            && !empty($this->data['modules'][$module]['sticky'])
+            && !empty($this->data['modules'][$module]['activated']);
+    }
+
+    public function getSemTypes()
+    {
+        $types = [];
+        foreach (SemType::getTypes() as $id => $type) {
+            if ($type['class'] == $this->data['id']) {
+                $types[$id] = $type;
+            }
+        }
+        return $types;
+    }
+
+    /**
+     * Checks if the current sem class is usable for course grouping.
+     */
+    public function isGroup()
+    {
+        return $this->data['is_group'];
+    }
+
+    /**
+     * Checks if any SemClasses exist that provide grouping functionality.
+     * @return SimpleCollection
+     */
+    public static function getGroupClasses()
+    {
+        return SimpleCollection::createFromArray(self::getClasses())->findBy('is_group', true);
+    }
+
+    /**
+     * stores all data in the database
+     * @return boolean success
+     */
+    public function store()
+    {
+        $db = DBManager::get();
+        $statement = $db->prepare(
+            "UPDATE sem_classes " .
+                "SET name = :name, " .
+                "description = :description, " .
+                "create_description = :create_description, " .
+                "studygroup_mode = :studygroup_mode, " .
+                "only_inst_user = :only_inst_user, " .
+                "default_read_level = :default_read_level, " .
+                "default_write_level = :default_write_level, " .
+                "bereiche = :bereiche, " .
+                "module = :module, " .
+                "show_browse = :show_browse, " .
+                "write_access_nobody = :write_access_nobody, " .
+                "topic_create_autor = :topic_create_autor, " .
+                "visible = :visible, " .
+                "course_creation_forbidden = :course_creation_forbidden, " .
+                "modules = :modules, " .
+                "title_dozent = :title_dozent, " .
+                "title_dozent_plural = :title_dozent_plural, " .
+                "title_tutor = :title_tutor, " .
+                "title_tutor_plural = :title_tutor_plural, " .
+                "title_autor = :title_autor, " .
+                "title_autor_plural = :title_autor_plural, " .
+                "admission_prelim_default = :admission_prelim_default, " .
+                "admission_type_default = :admission_type_default, " .
+                "show_raumzeit = :show_raumzeit, " .
+                "is_group = :is_group, " .
+                "unlimited_forbidden = :unlimited_forbidden, " .
+                "chdate = UNIX_TIMESTAMP() " .
+            "WHERE id = :id ".
+        "");
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
+        return $statement->execute([
+            'id' => $this->data['id'],
+            'name' => $this->data['name'],
+            'description' => $this->data['description'],
+            'create_description' => $this->data['create_description'],
+            'studygroup_mode' => (int) $this->data['studygroup_mode'],
+            'only_inst_user' => (int) $this->data['only_inst_user'],
+            'default_read_level' => (int) $this->data['default_read_level'],
+            'default_write_level' => (int) $this->data['default_write_level'],
+            'bereiche' => (int) $this->data['bereiche'],
+            'module' => (int) $this->data['module'],
+            'show_browse' => (int) $this->data['show_browse'],
+            'write_access_nobody' => (int) $this->data['write_access_nobody'],
+            'topic_create_autor' => (int) $this->data['topic_create_autor'],
+            'visible' => (int) $this->data['visible'],
+            'course_creation_forbidden' => (int) $this->data['course_creation_forbidden'],
+            'modules' => json_encode((object) $this->data['modules']),
+            'title_dozent' => $this->data['title_dozent']
+                ? $this->data['title_dozent']
+                : null,
+            'title_dozent_plural' => $this->data['title_dozent_plural']
+                ? $this->data['title_dozent_plural']
+                : null,
+            'title_tutor' => $this->data['title_tutor']
+                ? $this->data['title_tutor']
+                : null,
+            'title_tutor_plural' => $this->data['title_tutor_plural']
+                ? $this->data['title_tutor_plural']
+                : null,
+            'title_autor' => $this->data['title_autor']
+                ? $this->data['title_autor']
+                : null,
+            'title_autor_plural' => $this->data['title_autor_plural']
+                ? $this->data['title_autor_plural']
+                : null,
+            'admission_prelim_default' => (int)$this->data['admission_prelim_default'],
+            'admission_type_default' => (int)$this->data['admission_type_default'],
+            'show_raumzeit' => (int) $this->data['show_raumzeit'],
+            'is_group' => (int) $this->data['is_group'],
+            'unlimited_forbidden' => (int) $this->data['unlimited_forbidden'],
+        ]);
+    }
+
+    /**
+     * Deletes the sem_class-object and all its sem_types. Will only delete,
+     * if there are no seminars in this sem_class.
+     * Remember to refresh the global $SEM_CLASS and $SEM_TYPE array.
+     * @return boolean : success of deletion
+     */
+    public function delete()
+    {
+        if ($this->countSeminars() === 0) {
+            foreach ($GLOBALS['SEM_TYPE'] as $sem_type) {
+                if ($sem_type['class'] == $this->data['id']) {
+                    $sem_type->delete();
+                }
+            }
+            $GLOBALS['SEM_TYPE'] = SemType::getTypes();
+            $db = DBManager::get();
+            $statement = $db->prepare("
+                DELETE FROM sem_classes
+                WHERE id = :id
+            ");
+            \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
+            return $statement->execute([
+                'id' => $this->data['id']
+            ]);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Sets an attribute of sem_class->data
+     * @param string $offset
+     * @param mixed $value
+     */
+    public function set($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /***************************************************************************
+     *                          ArrayAccess methods                            *
+     ***************************************************************************/
+
+    /**
+     * deprecated, does nothing, should not be used
+     * @param string $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value): void
+    {
+    }
+
+    /**
+     * Compatibility function with old $SEM_CLASS variable for plugins. Maps the
+     * new array-structure to the old boolean values.
+     * @param integer $offset: name of attribute
+     */
+    public function offsetGet($offset): mixed
+    {
+        switch ($offset) {
+            case "name":
+                return gettext($this->data['name']);
+            case "only_inst_user":
+                return (bool) $this->data['only_inst_user'];
+            case "bereiche":
+                return (bool) $this->data['bereiche'];
+            case "show_browse":
+                return (bool) $this->data['show_browse'];
+            case "write_access_nobody":
+                return (bool) $this->data['write_access_nobody'];
+            case "topic_create_autor":
+                return (bool) $this->data['topic_create_autor'];
+            case "visible":
+                return (bool) $this->data['visible'];
+            case "studygroup_mode":
+                return (bool) $this->data['studygroup_mode'];
+            case "admission_prelim_default":
+               return (int) $this->data['admission_prelim_default'];
+            case "admission_type_default":
+               return (int) $this->data['admission_type_default'];
+            case "is_group":
+               return (bool) $this->data['is_group'];
+        }
+        //ansonsten
+        return $this->data[$offset] ?? null;
+    }
+
+    /**
+     * ArrayAccess method to check if an attribute exists.
+     * @param int $offset
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->data[$offset]);
+    }
+
+    /**
+     * deprecated, does nothing, should not be used
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
+    {
+    }
+
+    /***************************************************************************
+     *                            static methods                               *
+     ***************************************************************************/
+
+    /**
+     * Returns an array of all SemClasses in Stud.IP. Equivalent to global
+     * $SEM_CLASS variable. This variable is statically stored in this class.
+     * @return SemClass[] of SemClass
+     */
+    static public function getClasses()
+    {
+        if (!is_array(self::$sem_classes)) {
+            $db = DBManager::get();
+            self::$sem_classes = [];
+
+            $cache = \Studip\Cache\Factory::getCache();
+            $class_array = unserialize($cache->read('DB_SEM_CLASSES_ARRAY'));
+            if (!$class_array) {
+
+                try {
+                    $statement = $db->prepare(
+                        "SELECT * FROM sem_classes ORDER BY id ASC "
+                    );
+                    $statement->execute();
+                    $class_array = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+                    if ($class_array) {
+                        $cache = \Studip\Cache\Factory::getCache();
+                        $cache->write('DB_SEM_CLASSES_ARRAY', serialize($class_array));
+                    }
+                } catch (PDOException $e) {
+                    //for use without or before migration 92
+                    $class_array = $GLOBALS['SEM_CLASS_OLD_VAR'];
+                    if (is_array($class_array)) {
+                        ksort($class_array);
+                        foreach ($class_array as $id => $class) {
+                            self::$sem_classes[$id] = new SemClass($class);
+                        }
+                    } else {
+                        self::$sem_classes[1] = self::getDefaultSemClass();
+                    }
+                }
+            }
+            foreach ($class_array as $sem_class) {
+                self::$sem_classes[$sem_class['id']] = new SemClass($sem_class);
+            }
+        }
+        return self::$sem_classes;
+    }
+
+    /**
+     * Refreshes the internal $sem_classes cache-variable.
+     * @return array of SemClass
+     */
+    static public function refreshClasses()
+    {
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_CLASSES_ARRAY');
+        self::$sem_classes = null;
+        return self::getClasses();
+    }
+
+    /**
+     * Static method to recursively transform an object into an associative array.
+     * @param mixed $obj: should be of class StdClass
+     * @return array
+     */
+    static public function object2array($obj)
+    {
+        $arr_raw = is_object($obj) ? get_object_vars($obj) : $obj;
+        foreach ($arr_raw as $key => $val) {
+            $val = (is_array($val) || is_object($val)) ? self::object2array($val) : $val;
+            $arr[$key] = $val;
+        }
+        return $arr;
+    }
+
+
+    /**
+     * Static method only to keep the translationstrings of the values. It is
+     * never used within the system.
+     */
+    static private function localization()
+    {
+        _("Lehre");
+        _("Forschung");
+        _("Organisation");
+        _("Community");
+        _("Arbeitsgruppen");
+        _("importierte Kurse");
+        _("Hauptveranstaltungen");
+
+        _("Hier finden Sie alle in Stud.IP registrierten Lehrveranstaltungen");
+        _("Verwenden Sie diese Kategorie, um normale Lehrveranstaltungen anzulegen");
+        _("Hier finden Sie virtuelle Veranstaltungen zum Thema Forschung an der Universität");
+        _("In dieser Kategorie können Sie virtuelle Veranstaltungen für Forschungsprojekte anlegen.");
+        _("Hier finden Sie virtuelle Veranstaltungen zu verschiedenen Gremien an der Universität");
+        _("Um virtuelle Veranstaltungen für Uni-Gremien anzulegen, verwenden Sie diese Kategorie");
+        _("Hier finden Sie virtuelle Veranstaltungen zu unterschiedlichen Themen");
+        _("Wenn Sie Veranstaltungen als Diskussiongruppen zu unterschiedlichen Themen anlegen möchten, verwenden Sie diese Kategorie.");
+        _("Hier finden Sie verschiedene Arbeitsgruppen an der %s");
+        _("Verwenden Sie diese Kategorie, um unterschiedliche Arbeitsgruppen anzulegen.");
+        _("Veranstaltungen dieser Kategorie dienen als Gruppierungselement, um die Zusammengehörigkeit von Veranstaltungen anderer Kategorien abzubilden.");
+    }
+
+}
diff --git a/lib/classes/SemType.class.php b/lib/classes/SemType.class.php
deleted file mode 100644
index 5be1f19..0000000
--- a/lib/classes/SemType.class.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-if (isset($GLOBALS['SEM_TYPE'])) {
-    $GLOBALS['SEM_TYPE_OLD_VAR'] = $GLOBALS['SEM_TYPE'];
-}
-
-/**
- * Class to define and manage attributes of seminar types.
- * Usually all sem-types are stored in a global variable $SEM_TYPE which is
- * an array of SemType objects.
- *
- * SemType::getTypes() gets you all seminar types in an array.
- *
- * This class only represents the name of the type and gives a relation to a
- * sem_class.
- */
-class SemType implements ArrayAccess
-{
-    protected $data = [];
-    static protected $sem_types = null;
-
-    /**
-     * Constructor can be set with integer of sem_class_id or an array of
-     * the old $SEM_CLASS style.
-     * @param integer | array $data
-     */
-    public function __construct($data) {
-        $db = DBManager::get();
-        if (is_int($data)) {
-            $statement = $db->prepare("SELECT * FROM sem_types WHERE id = :id ");
-            $statement->execute(['id' => $data]);
-            $this->data = $statement->fetch(PDO::FETCH_ASSOC);
-        } else {
-            $this->data = $data;
-        }
-    }
-
-    /**
-     * Returns the number of seminars of this sem_type in Stud.IP
-     * @return integer
-     */
-    public function countSeminars() {
-        $db = DBManager::get();
-        $statement = $db->prepare("SELECT COUNT(*) FROM seminare WHERE status = :sem_type ");
-        $statement->execute(['sem_type' => $this->data['id']]);
-        return (int) $statement->fetch(PDO::FETCH_COLUMN, 0);
-    }
-
-    /**
-     * stores all data in the database
-     * @return boolean success
-     */
-    public function store() {
-        $db = DBManager::get();
-        $statement = $db->prepare(
-            "UPDATE sem_types " .
-                "SET name = :name, " .
-                "class = :class, " .
-                "chdate = UNIX_TIMESTAMP() " .
-            "WHERE id = :id ".
-        "");
-        \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
-        return $statement->execute([
-            'id' => $this->data['id'],
-            'name' => $this->data['name'],
-            'class' => $this->data['class']
-        ]);
-    }
-
-    /**
-     * Deletes the sem_type-object. Will only delete,
-     * if there are no seminars in this sem_type.
-     * Remember to refresh the global $SEM_TYPE array.
-     * @return boolean : success of deletion
-     */
-    public function delete() {
-        if ($this->countSeminars() === 0) {
-            $db = DBManager::get();
-            $statement = $db->prepare("
-                DELETE FROM sem_types
-                WHERE id = :id
-            ");
-            \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
-            return $statement->execute([
-                'id' => $this->data['id']
-            ]);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sets an attribute of sem_type->data
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function set($offset, $value) {
-        $this->data[$offset] = $value;
-    }
-
-    public function getClass() {
-        return $GLOBALS['SEM_CLASS'][$this->data['class']] ?? SemClass::getDefaultSemClass();
-    }
-
-    /***************************************************************************
-     *                          ArrayAccess methods                            *
-     ***************************************************************************/
-
-    /**
-     * deprecated, does nothing, should not be used
-     * @param string $offset
-     * @param mixed $value
-     */
-
-    public function offsetSet($offset, $value): void
-    {
-    }
-
-    /**
-     * Compatibility function with old $SEM_TYPE variable for plugins. Maps the
-     * new array-structure to the old boolean values.
-     * @param integer $offset: name of attribute
-     */
-    public function offsetGet($offset): mixed
-    {
-        switch ($offset) {
-            case "name":
-                return gettext($this->data['name']);
-            case in_array($offset, ["title_dozent", "title_tutor", "title_autor"]):
-                $sem_class = $this->getClass();
-                $title = [$sem_class[$offset], $sem_class[$offset.'_plural']];
-                return $title[0] || $title[1] ? $title : $this->data[$offset];
-        }
-        //ansonsten
-        return $this->data[$offset];
-    }
-
-    /**
-     * ArrayAccess method to check if an attribute exists.
-     * @param mixed $offset
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->data[$offset]);
-    }
-
-    /**
-     * deprecated, does nothing, should not be used
-     * @param string $offset
-     */
-    public function offsetUnset($offset): void
-    {
-    }
-
-    /***************************************************************************
-     *                            static methods                               *
-     ***************************************************************************/
-
-    /**
-     * Returns an array of all SemTypes in Stud.IP. Equivalent to global
-     * $SEM_TYPE variable. This variable is statically stored in this class.
-     * @return array of SemType
-     */
-    static public function getTypes() {
-        if (!is_array(self::$sem_types)) {
-            $db = DBManager::get();
-            self::$sem_types = [];
-
-            $cache = \Studip\Cache\Factory::getCache();
-            $types_array = unserialize($cache->read('DB_SEM_TYPES_ARRAY'));
-            if (!$types_array) {
-                try {
-                    $statement = $db->prepare(
-                        "SELECT * FROM sem_types ORDER BY id ASC "
-                    );
-                    $statement->execute();
-                    $types_array = $statement->fetchAll(PDO::FETCH_ASSOC);
-                    if ($types_array) {
-                        $cache = \Studip\Cache\Factory::getCache();
-                        $cache->write('DB_SEM_TYPES_ARRAY', serialize($types_array));
-                    }
-                } catch (PDOException $e) {
-                    //for use without or before migration 92
-                    $type_array = $GLOBALS['SEM_TYPE_OLD_VAR'];
-                    if (is_array($type_array)) {
-                        ksort($type_array);
-                        foreach ($type_array as $id => $type) {
-                            self::$sem_types[$id] = new SemType($type);
-                        }
-                    } else {
-                        self::$sem_types[1] = new SemType(['name' => 'default', 'class' => 1, 'id' => 1]);
-                    }
-                }
-            }
-            foreach ($types_array as $sem_type) {
-                self::$sem_types[$sem_type['id']] = new SemType($sem_type);
-            }
-        }
-        return self::$sem_types;
-    }
-
-    static public function refreshTypes() {
-        self::$sem_types = null;
-        \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
-        return self::getTypes();
-    }
-
-    /**
-     * Gets all SemTypes that are allowed as group parents.
-     * @return array
-     */
-    public static function getGroupingSemTypes()
-    {
-        return SimpleCollection::createFromArray(array_flatten(SemClass::getGroupClasses()->getSemTypes()))->pluck('id');
-    }
-
-    /**
-     * Gets all SemTypes that are allowed as group parents.
-     * @return array
-     */
-    public static function getNonGroupingSemTypes()
-    {
-        $non_grouping = SimpleCollection::createFromArray(SemClass::getClasses())->findBy('is_group', false)->findBy('studygroup_mode', false);
-        return SimpleCollection::createFromArray(array_flatten($non_grouping->getSemTypes()))->pluck('id');
-    }
-
-    /**
-     * Static method only to keep the translationstrings of the values. It is
-     * never used within the system.
-     */
-    static private function localization() {
-        _("Vorlesung");
-        _("Seminar");
-        _("Übung");
-        _("Praktikum");
-        _("Colloquium");
-        _("Kolloquium");
-        _("Forschungsgruppe");
-        _("sonstige");
-        _("Gremium");
-        _("Projektgruppe");
-        _("Kulturforum");
-        _("Veranstaltungsboard");
-        _("Studiengruppe");
-
-    }
-
-}
diff --git a/lib/classes/SemType.php b/lib/classes/SemType.php
new file mode 100644
index 0000000..5be1f19
--- /dev/null
+++ b/lib/classes/SemType.php
@@ -0,0 +1,257 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+if (isset($GLOBALS['SEM_TYPE'])) {
+    $GLOBALS['SEM_TYPE_OLD_VAR'] = $GLOBALS['SEM_TYPE'];
+}
+
+/**
+ * Class to define and manage attributes of seminar types.
+ * Usually all sem-types are stored in a global variable $SEM_TYPE which is
+ * an array of SemType objects.
+ *
+ * SemType::getTypes() gets you all seminar types in an array.
+ *
+ * This class only represents the name of the type and gives a relation to a
+ * sem_class.
+ */
+class SemType implements ArrayAccess
+{
+    protected $data = [];
+    static protected $sem_types = null;
+
+    /**
+     * Constructor can be set with integer of sem_class_id or an array of
+     * the old $SEM_CLASS style.
+     * @param integer | array $data
+     */
+    public function __construct($data) {
+        $db = DBManager::get();
+        if (is_int($data)) {
+            $statement = $db->prepare("SELECT * FROM sem_types WHERE id = :id ");
+            $statement->execute(['id' => $data]);
+            $this->data = $statement->fetch(PDO::FETCH_ASSOC);
+        } else {
+            $this->data = $data;
+        }
+    }
+
+    /**
+     * Returns the number of seminars of this sem_type in Stud.IP
+     * @return integer
+     */
+    public function countSeminars() {
+        $db = DBManager::get();
+        $statement = $db->prepare("SELECT COUNT(*) FROM seminare WHERE status = :sem_type ");
+        $statement->execute(['sem_type' => $this->data['id']]);
+        return (int) $statement->fetch(PDO::FETCH_COLUMN, 0);
+    }
+
+    /**
+     * stores all data in the database
+     * @return boolean success
+     */
+    public function store() {
+        $db = DBManager::get();
+        $statement = $db->prepare(
+            "UPDATE sem_types " .
+                "SET name = :name, " .
+                "class = :class, " .
+                "chdate = UNIX_TIMESTAMP() " .
+            "WHERE id = :id ".
+        "");
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
+        return $statement->execute([
+            'id' => $this->data['id'],
+            'name' => $this->data['name'],
+            'class' => $this->data['class']
+        ]);
+    }
+
+    /**
+     * Deletes the sem_type-object. Will only delete,
+     * if there are no seminars in this sem_type.
+     * Remember to refresh the global $SEM_TYPE array.
+     * @return boolean : success of deletion
+     */
+    public function delete() {
+        if ($this->countSeminars() === 0) {
+            $db = DBManager::get();
+            $statement = $db->prepare("
+                DELETE FROM sem_types
+                WHERE id = :id
+            ");
+            \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
+            return $statement->execute([
+                'id' => $this->data['id']
+            ]);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Sets an attribute of sem_type->data
+     * @param string $offset
+     * @param mixed $value
+     */
+    public function set($offset, $value) {
+        $this->data[$offset] = $value;
+    }
+
+    public function getClass() {
+        return $GLOBALS['SEM_CLASS'][$this->data['class']] ?? SemClass::getDefaultSemClass();
+    }
+
+    /***************************************************************************
+     *                          ArrayAccess methods                            *
+     ***************************************************************************/
+
+    /**
+     * deprecated, does nothing, should not be used
+     * @param string $offset
+     * @param mixed $value
+     */
+
+    public function offsetSet($offset, $value): void
+    {
+    }
+
+    /**
+     * Compatibility function with old $SEM_TYPE variable for plugins. Maps the
+     * new array-structure to the old boolean values.
+     * @param integer $offset: name of attribute
+     */
+    public function offsetGet($offset): mixed
+    {
+        switch ($offset) {
+            case "name":
+                return gettext($this->data['name']);
+            case in_array($offset, ["title_dozent", "title_tutor", "title_autor"]):
+                $sem_class = $this->getClass();
+                $title = [$sem_class[$offset], $sem_class[$offset.'_plural']];
+                return $title[0] || $title[1] ? $title : $this->data[$offset];
+        }
+        //ansonsten
+        return $this->data[$offset];
+    }
+
+    /**
+     * ArrayAccess method to check if an attribute exists.
+     * @param mixed $offset
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->data[$offset]);
+    }
+
+    /**
+     * deprecated, does nothing, should not be used
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
+    {
+    }
+
+    /***************************************************************************
+     *                            static methods                               *
+     ***************************************************************************/
+
+    /**
+     * Returns an array of all SemTypes in Stud.IP. Equivalent to global
+     * $SEM_TYPE variable. This variable is statically stored in this class.
+     * @return array of SemType
+     */
+    static public function getTypes() {
+        if (!is_array(self::$sem_types)) {
+            $db = DBManager::get();
+            self::$sem_types = [];
+
+            $cache = \Studip\Cache\Factory::getCache();
+            $types_array = unserialize($cache->read('DB_SEM_TYPES_ARRAY'));
+            if (!$types_array) {
+                try {
+                    $statement = $db->prepare(
+                        "SELECT * FROM sem_types ORDER BY id ASC "
+                    );
+                    $statement->execute();
+                    $types_array = $statement->fetchAll(PDO::FETCH_ASSOC);
+                    if ($types_array) {
+                        $cache = \Studip\Cache\Factory::getCache();
+                        $cache->write('DB_SEM_TYPES_ARRAY', serialize($types_array));
+                    }
+                } catch (PDOException $e) {
+                    //for use without or before migration 92
+                    $type_array = $GLOBALS['SEM_TYPE_OLD_VAR'];
+                    if (is_array($type_array)) {
+                        ksort($type_array);
+                        foreach ($type_array as $id => $type) {
+                            self::$sem_types[$id] = new SemType($type);
+                        }
+                    } else {
+                        self::$sem_types[1] = new SemType(['name' => 'default', 'class' => 1, 'id' => 1]);
+                    }
+                }
+            }
+            foreach ($types_array as $sem_type) {
+                self::$sem_types[$sem_type['id']] = new SemType($sem_type);
+            }
+        }
+        return self::$sem_types;
+    }
+
+    static public function refreshTypes() {
+        self::$sem_types = null;
+        \Studip\Cache\Factory::getCache()->expire('DB_SEM_TYPES_ARRAY');
+        return self::getTypes();
+    }
+
+    /**
+     * Gets all SemTypes that are allowed as group parents.
+     * @return array
+     */
+    public static function getGroupingSemTypes()
+    {
+        return SimpleCollection::createFromArray(array_flatten(SemClass::getGroupClasses()->getSemTypes()))->pluck('id');
+    }
+
+    /**
+     * Gets all SemTypes that are allowed as group parents.
+     * @return array
+     */
+    public static function getNonGroupingSemTypes()
+    {
+        $non_grouping = SimpleCollection::createFromArray(SemClass::getClasses())->findBy('is_group', false)->findBy('studygroup_mode', false);
+        return SimpleCollection::createFromArray(array_flatten($non_grouping->getSemTypes()))->pluck('id');
+    }
+
+    /**
+     * Static method only to keep the translationstrings of the values. It is
+     * never used within the system.
+     */
+    static private function localization() {
+        _("Vorlesung");
+        _("Seminar");
+        _("Übung");
+        _("Praktikum");
+        _("Colloquium");
+        _("Kolloquium");
+        _("Forschungsgruppe");
+        _("sonstige");
+        _("Gremium");
+        _("Projektgruppe");
+        _("Kulturforum");
+        _("Veranstaltungsboard");
+        _("Studiengruppe");
+
+    }
+
+}
diff --git a/lib/classes/Seminar.class.php b/lib/classes/Seminar.class.php
deleted file mode 100644
index a2d69ea..0000000
--- a/lib/classes/Seminar.class.php
+++ /dev/null
@@ -1,2439 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: TODO
-/**
- * Seminar.class.php - This class represents a Seminar in Stud.IP
- *
- * This class provides functions for seminar-members, seminar-dates, and seminar-modules
- *
- * 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.
- *
- * @author      Till Glöggler <tgloeggl@uni-osnabrueck.de>
- * @author      Stefan Suchi <suchi@data-quest>
- * @author      Suchi & Berg GmbH <info@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-require_once 'lib/dates.inc.php';
-
-class Seminar
-{
-    var $issues = null;                 // Array of Issue
-    var $irregularSingleDates = null;   // Array of SingleDates
-    var $messages = [];            // occured errors, infos, and warnings
-    var $semester = null;
-    var $filterStart = 0;
-    var $filterEnd = 0;
-    var $hasDatesOutOfDuration = -1;
-    var $message_stack = [];
-
-    var $user_number = 0;//?
-    var $commands; //?
-    var $BookedRoomsStatTemp; //???
-
-    var $request_id;//TODO
-    var $requestData;
-    var $room_request;
-
-    private $_metadate = null;               // MetaDate
-
-    private $alias = [
-        'seminar_number' => 'VeranstaltungsNummer',
-        'subtitle' => 'Untertitel',
-        'description' => 'Beschreibung',
-        'location' => 'Ort',
-        'misc' => 'Sonstiges',
-        'read_level' => 'Lesezugriff',
-        'write_level' => 'Schreibzugriff',
-        'semester_start_time' => 'start_time',
-        'semester_duration_time' => 'duration_time',
-        'form' => 'art',
-        'participants' => 'teilnehmer',
-        'requirements' => 'vorrausetzungen',
-        'orga' => 'lernorga',
-    ];
-
-    private $course = null;
-
-    private $course_set = null;
-
-    private static $seminar_object_pool;
-
-    public static function GetInstance($id = false, $refresh_cache = false)
-    {
-        if ($id) {
-            if ($refresh_cache) {
-                self::$seminar_object_pool[$id] = null;
-            }
-            if (!empty(self::$seminar_object_pool[$id]) && is_object(self::$seminar_object_pool[$id]) && self::$seminar_object_pool[$id]->getId() == $id) {
-                return self::$seminar_object_pool[$id];
-            } else {
-                self::$seminar_object_pool[$id] = new Seminar($id);
-                return self::$seminar_object_pool[$id];
-            }
-        } else {
-            return new Seminar(false);
-        }
-    }
-
-    public static function setInstance(Seminar $seminar)
-    {
-        return self::$seminar_object_pool[$seminar->id] = $seminar;
-    }
-
-    /**
-     * Constructor
-     *
-     * Pass nothing to create a seminar, or the seminar_id from an existing seminar to change or delete
-     * @access   public
-     * @param    string  $seminar_id the seminar to be retrieved
-     */
-    public function __construct($course_or_id = FALSE)
-    {
-        $course = Course::toObject($course_or_id);
-        if ($course) {
-            $this->course = $course;
-        } elseif ($course_or_id === false) {
-            $this->course = new Course();
-            $this->course->setId($this->course->getNewId());
-        } else { //hmhmhm
-            throw new Exception(sprintf(_('Fehler: Konnte das Seminar mit der ID %s nicht finden!'), $course_or_id));
-        }
-    }
-
-    public function __get($field)
-    {
-        if ($field == 'is_new') {
-            return $this->course->isNew();
-        }
-        if ($field == 'metadate') {
-            if ($this->_metadate === null) {
-                $this->_metadate = new MetaDate($this->id);
-                $this->_metadate->setSeminarStartTime($this->start_time);
-                $this->_metadate->setSeminarDurationTime($this->duration_time);
-            }
-            return $this->_metadate;
-        }
-        if(isset($this->alias[$field])) {
-            $field = $this->alias[$field];
-        }
-        return $this->course->$field;
-    }
-
-    public function __set($field, $value)
-    {
-        if(isset($this->alias[$field])) {
-            $field = $this->alias[$field];
-        }
-        if ($field == 'metadate') {
-            return $this->_metadate = $value;
-        }
-        return $this->course->$field = $value;
-    }
-
-    public function __isset($field)
-    {
-        if ($field == 'metadate') {
-            return is_object($this->_metadate);
-        }
-        if(isset($this->alias[$field])) {
-            $field = $this->alias[$field];
-        }
-        return isset($this->course->$field);
-    }
-
-    public function __call($method, $params)
-    {
-        return call_user_func_array([$this->course, $method], $params);
-    }
-
-    public static function GetSemIdByDateId($date_id)
-    {
-        $stmt = DBManager::get()->prepare("SELECT range_id FROM termine WHERE termin_id = ? LIMIT 1");
-        $stmt->execute([$date_id]);
-        return $stmt->fetchColumn();
-    }
-
-    /**
-     *
-     * creates an new id for this object
-     * @access   private
-     * @return   string  the unique id
-     */
-    public function createId()
-    {
-        return $this->course->getNewId();
-    }
-
-    public function getMembers($status = 'dozent')
-    {
-        $ret = [];
-        foreach($this->course->getMembersWithStatus($status) as $m) {
-            $ret[$m->user_id]['user_id'] = $m->user_id;
-            $ret[$m->user_id]['username'] = $m->username;
-            $ret[$m->user_id]['Vorname'] = $m->vorname;
-            $ret[$m->user_id]['Nachname'] = $m->nachname;
-            $ret[$m->user_id]['Email'] = $m->email;
-            $ret[$m->user_id]['position'] = $m->position;
-            $ret[$m->user_id]['label'] = $m->label;
-            $ret[$m->user_id]['status'] = $m->status;
-            $ret[$m->user_id]['mkdate'] = $m->mkdate;
-            $ret[$m->user_id]['fullname'] = $m->getUserFullname();
-        }
-        return $ret;
-    }
-
-    public function getAdmissionMembers($status = 'awaiting')
-    {
-        $ret = [];
-        foreach($this->course->admission_applicants->findBy('status', $status)->orderBy('position nachname') as $m) {
-            $ret[$m->user_id]['user_id'] = $m->user_id;
-            $ret[$m->user_id]['username'] = $m->username;
-            $ret[$m->user_id]['Vorname'] = $m->vorname;
-            $ret[$m->user_id]['Nachname'] = $m->nachname;
-            $ret[$m->user_id]['Email'] = $m->email;
-            $ret[$m->user_id]['position'] = $m->position;
-            $ret[$m->user_id]['status'] = $m->status;
-            $ret[$m->user_id]['mkdate'] = $m->mkdate;
-            $ret[$m->user_id]['fullname'] = $m->getUserFullname();
-        }
-        return $ret;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * return the field VeranstaltungsNummer for the seminar
-     *
-     * @return  string  the seminar-number for the current seminar
-     */
-    public function getNumber()
-    {
-        return $this->seminar_number;
-    }
-
-    public function isVisible()
-    {
-        return $this->visible;
-    }
-
-    public function getInstitutId()
-    {
-        return $this->institut_id;
-    }
-
-    public function getSemesterStartTime()
-    {
-        return $this->semester_start_time;
-    }
-
-    public function getSemesterDurationTime()
-    {
-        return $this->semester_duration_time;
-    }
-
-    public function getNextDate($return_mode = 'string')
-    {
-        $next_date = '';
-        if ($return_mode == 'int') {
-            echo __class__.'::'.__function__.', line '.__line__.', return_mode "int" ist not supported by this function!';die;
-        }
-
-        if (!$termine = SeminarDB::getNextDate($this->id))
-            return false;
-
-        foreach ($termine['termin'] as $singledate_id) {
-            $next_date .= DateFormatter::formatDateAndRoom($singledate_id, $return_mode) . '<br>';
-        }
-
-        if (!empty($termine['ex_termin'])) {
-            foreach ($termine['ex_termin'] as $ex_termin_id) {
-                $ex_termin = new SingleDate($ex_termin_id);
-                $template = $GLOBALS['template_factory']->open('dates/missing_date.php');
-                $template->formatted_date = DateFormatter::formatDateAndRoom($ex_termin_id, $return_mode);
-                $template->ex_termin = $ex_termin;
-                $missing_date = $template->render();
-
-                if (!empty($termine['termin'])) {
-                    $termin = new SingleDate($termine['termin'][0]);
-                    if ($ex_termin->getStartTime() <= $termin->getStartTime()) {
-                        return $next_date . $missing_date;
-                    } else {
-                        return $next_date;
-                    }
-                } else {
-                    return $missing_date;
-                }
-            }
-        } else {
-            return $next_date;
-        }
-
-        return false;
-    }
-
-    public function getFirstDate($return_mode = 'string') {
-        if (!$dates = SeminarDB::getFirstDate($this->id)) {
-            return false;
-        }
-
-        return DateFormatter::formatDateWithAllRooms(['termin' => $dates], $return_mode);
-    }
-
-    /**
-     * This function returns an associative array of the dates owned by this seminar
-     *
-     * @returns  mixed  a multidimensional array of seminar-dates
-     */
-    public function getUndecoratedData($filter = false)
-    {
-
-        // Caching
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache_key = 'course/undecorated_data/'. $this->id;
-
-        if ($filter) {
-            $sub_key = ($_SESSION['_language'] ?? 'none') .'/'. $this->filterStart .'-'. $this->filterEnd;
-        } else {
-            $sub_key = ($_SESSION['_language'] ?? 'none') .'/unfiltered';
-        }
-
-        $data = unserialize($cache->read($cache_key));
-
-        // build cache from scratch
-        if (empty($data) || empty($data[$sub_key])) {
-            $cycles = $this->metadate->getCycleData();
-            $dates = $this->getSingleDates($filter, $filter);
-            $rooms = [];
-
-            foreach (array_keys($cycles) as $id) {
-                if ($this->filterStart && $this->filterEnd
-                    && !$this->metadate->hasDates($id, $this->filterStart, $this->filterEnd))
-                {
-                    unset($cycles[$id]);
-                    continue;
-                }
-
-                $cycles[$id]['first_date'] = CycleDataDB::getFirstDate($id);
-                $cycles[$id]['last_date'] = CycleDataDB::getLastDate($id);
-                if (!empty($cycles[$id]['assigned_rooms'])) {
-                    foreach ($cycles[$id]['assigned_rooms'] as $room_id => $count) {
-                        if (!isset($rooms[$room_id])) {
-                            $rooms[$room_id] = 0;
-                        }
-                        $rooms[$room_id] += $count;
-                    }
-                }
-            }
-
-            // besser wieder mit direktem Query statt Objekten
-            if (is_array($cycles) && count($cycles) === 0) {
-                $cycles = false;
-            }
-
-            $ret['regular']['turnus_data'] = $cycles;
-
-            // the irregular single-dates
-            foreach ($dates as $val) {
-                $zw = [
-                    'metadate_id' => $val->getMetaDateID(),
-                    'termin_id'   => $val->getTerminID(),
-                    'date_typ'    => $val->getDateType(),
-                    'start_time'  => $val->getStartTime(),
-                    'end_time'    => $val->getEndTime(),
-                    'mkdate'      => $val->getMkDate(),
-                    'chdate'      => $val->getMkDate(),
-                    'ex_termin'   => $val->isExTermin(),
-                    'orig_ex'     => $val->isExTermin(),
-                    'range_id'    => $val->getRangeID(),
-                    'author_id'   => $val->getAuthorID(),
-                    'resource_id' => $val->getResourceID(),
-                    'raum'        => $val->getFreeRoomText(),
-                    'typ'         => $val->getDateType(),
-                    'tostring'    => $val->toString()
-                ];
-
-                if ($val->getResourceID()) {
-                    if (!isset($rooms[$val->getResourceID()])) {
-                        $rooms[$val->getResourceID()] = 0;
-                    }
-                    $rooms[$val->getResourceID()]++;
-                }
-
-                $ret['irregular'][$val->getTerminID()] = $zw;
-            }
-
-            $ret['rooms'] = $rooms;
-            $ret['ort']   = $this->location;
-
-            $data[$sub_key] = $ret;
-
-            // write data to cache
-            $cache->write($cache_key, serialize($data), 600);
-        }
-
-        return $data[$sub_key];
-    }
-
-    public function getFormattedTurnus($short = FALSE)
-    {
-        // activate this with StEP 00077
-        /* $cache = Cache::instance();
-         * $cache_key = "formatted_turnus".$this->id;
-         * if (! $return_string = $cache->read($cache_key))
-         * {
-         */
-        return $this->getDatesExport(['short' => $short, 'shrink' => true]);
-
-        // activate this with StEP 00077
-        // $cache->write($cache_key, $return_string, 60*60);
-        // }
-    }
-
-    public function getFormattedTurnusDates($short = FALSE)
-    {
-        if ($cycles = $this->metadate->getCycles()) {
-            $return_string = [];
-            foreach ($cycles as $id => $c) {
-                $return_string[$id] = $c->toString($short);
-                //hmm tja...
-                if ($c->description){
-                    $return_string[$id] .= ' ('. htmlReady($c->description) .')';
-                }
-            }
-            return $return_string;
-        } else
-            return FALSE;
-    }
-
-    public function getMetaDateCount()
-    {
-        return sizeof($this->metadate->cycles);
-    }
-
-    public function getMetaDateValue($key, $value_name)
-    {
-        return $this->metadate->cycles[$key]->$value_name;
-    }
-
-    public function setMetaDateValue($key, $value_name, $value)
-    {
-        $this->metadate->cycles[$key]->$value_name = $value;
-    }
-
-    /**
-     * restore the data
-     *
-     * the complete data of the object will be loaded from the db
-     * @access   public
-     * @throws   Exception  if there is no such course
-     * @return   boolean    always true
-     */
-    public function restore()
-    {
-        if ($this->course->id) {
-            $this->course->restore();
-        }
-        $this->irregularSingleDates = null;
-        $this->issues = null;
-        $this->_metadate = null;
-        $this->course_set = null;
-
-        return TRUE;
-    }
-
-    /**
-     * returns an array of variables from the seminar-object, excluding variables
-     * containing objects or arrays
-     *
-     * @return  array
-     */
-    public function getSettings() {
-        $settings = $this->course->toRawArray();
-        unset($settings['config']);
-        return $settings;
-    }
-
-    public function store($trigger_chdate = true)
-    {
-        // activate this with StEP 00077
-        // $cache = Cache::instance();
-        // $cache->expire("formatted_turnus".$this->id);
-
-        //check for security consistency
-        if ($this->write_level < $this->read_level) // hier wusste ein Lehrender nicht, was er tat
-            $this->write_level = $this->read_level;
-
-        if ($this->irregularSingleDates) {
-            foreach ($this->irregularSingleDates as $val) {
-                $val->store();
-            }
-        }
-
-        if ($this->issues) {
-            foreach ($this->issues as $val) {
-                $val->store();
-            }
-        }
-
-        $metadate_changed = isset($this->metadate) ? $this->metadate->store() : 0;
-        $course_changed = $this->course->store();
-        if ($metadate_changed && $trigger_chdate) {
-            return $this->course->triggerChdate();
-        } else {
-            return $course_changed ?: false;
-        }
-    }
-
-    public function setStartSemester($start)
-    {
-        global $perm;
-
-        if ($perm->have_perm('tutor') && $start != $this->semester_start_time) {
-            // logging >>>>>>
-            StudipLog::log("SEM_SET_STARTSEMESTER", $this->getId(), $start);
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-            // logging <<<<<<
-            $this->semester_start_time = $start;
-            $this->metadate->setSeminarStartTime($start);
-            $this->createMessage(_("Das Startsemester wurde geändert."));
-            $this->createInfo(_("Beachten Sie, dass Termine, die nicht mit den Einstellungen der regelmäßigen Zeit übereinstimmen (z.B. auf Grund einer Verschiebung der regelmäßigen Zeit), teilweise gelöscht sein könnten!"));
-            return TRUE;
-        }
-        return FALSE;
-    }
-
-    public function removeAndUpdateSingleDates()
-    {
-        SeminarCycleDate::removeOutRangedSingleDates(
-            $this->semester_start_time,
-            $this->getEndSemesterVorlesEnde(),
-            $this->id
-        );
-
-        foreach ($this->metadate->cycles as $key => $val) {
-            $this->metadate->cycles[$key]->readSingleDates();
-            $this->metadate->createSingleDates($key);
-            $this->metadate->cycles[$key]->termine = NULL;
-        }
-        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-    }
-
-    public function getStartSemester()
-    {
-        return $this->semester_start_time;
-    }
-
-    /*
-     * setEndSemester
-     * @param   end integer 0 (one Semester), -1 (eternal), or timestamp of last happening semester
-     * @returns TRUE on success, FALSE on failure
-     */
-    public function setEndSemester($end)
-    {
-        global $perm;
-
-        $previousEndSemester = $this->getEndSemester();     // save the end-semester before it is changed, so we can choose lateron in which semesters we need to be rebuilt the SingleDates
-
-        if ($end != $this->getEndSemester()) {  // only change Duration if it differs from the current one
-
-            if ($end == 0) {                    // the seminar takes place just in the selected start-semester
-                $this->semester_duration_time = 0;
-                $this->metadate->setSeminarDurationTime(0);
-                // logging >>>>>>
-                StudipLog::log("SEM_SET_ENDSEMESTER", $this->getId(), $end, 'Laufzeit: 1 Semester');
-                // logging <<<<<<
-            } else if ($end == -1) {    // the seminar takes place in every semester above and including the start-semester
-                // logging >>>>>>
-                StudipLog::log("SEM_SET_ENDSEMESTER", $this->getId(), $end, 'Laufzeit: unbegrenzt');
-                // logging <<<<<<
-                $this->semester_duration_time = -1;
-                $this->metadate->setSeminarDurationTime(-1);
-                SeminarCycleDate::removeOutRangedSingleDates(
-                    $this->semester_start_time,
-                    $this->getEndSemesterVorlesEnde(),
-                    $this->id
-                );
-            } else {                                    // the seminar takes place  between the selected start~ and end-semester
-                // logging >>>>>>
-                StudipLog::log("SEM_SET_ENDSEMESTER", $this->getId(), $end);
-                // logging <<<<<<
-                $this->semester_duration_time = $end - $this->semester_start_time;  // the duration is stored, not the real end-point
-                $this->metadate->setSeminarDurationTime($this->semester_duration_time);
-            }
-
-            $this->createMessage(_("Die Dauer wurde geändert."));
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-
-            /*
-             * If the duration has been changed, we have to create new SingleDates
-             * if the new duration is longer than the previous one
-             */
-            if ( ($previousEndSemester != -1) && ( ($previousEndSemester < $this->getEndSemester()) || (($previousEndSemester == 0) && ($this->getEndSemester() == -1) ) )) {
-                // if the previous duration was unlimited, the only option choosable is
-                // a shorter duration then 'ever', so there cannot be any new SingleDates
-
-                // special case: if the previous selection was 'one semester' and the new one is 'eternal',
-                // than we have to find out the end of the only semester, the start-semester
-                if ($previousEndSemester == 0) {
-                    $startAfterTimeStamp = $this->course->start_semester->ende;
-                } else {
-                    $startAfterTimeStamp = $previousEndSemester;
-                }
-
-                foreach ($this->metadate->cycles as $key => $val) {
-                    $this->metadate->createSingleDates(['metadate_id' => $key, 'startAfterTimeStamp' => $startAfterTimeStamp]);
-                    $this->metadate->cycles[$key]->termine = NULL;  // emtpy the SingleDates for each cycle, so that SingleDates, which were not in the current view, are not loaded and therefore should not be visible
-                }
-            }
-        }
-
-        return TRUE;
-    }
-
-    /*
-     * getEndSemester
-     * @returns 0 (one Semester), -1 (eternal), or TimeStamp of last Semester for this Seminar
-     */
-    public function getEndSemester()
-    {
-        if ($this->semester_duration_time == 0) return 0;                                       // seminar takes place only in the start-semester
-        if ($this->semester_duration_time == -1) return -1;                                 // seminar takes place eternally
-        return $this->semester_start_time + $this->semester_duration_time;  // seminar takes place between start~ and end-semester
-    }
-
-    public function getEndSemesterVorlesEnde()
-    {
-        if ($this->semester_duration_time == -1) {
-            $semesters = Semester::getAll();
-            $very_last_semester = array_pop($semesters);
-            return $very_last_semester->vorles_ende;
-        }
-        return $this->course->end_semester->vorles_ende;
-    }
-
-    /**
-     * return the name of the seminars start-semester
-     *
-     * @return  string  the name of the start-semester or false if there is no start-semester
-     */
-    public function getStartSemesterName()
-    {
-        return $this->course->start_semester->name;
-    }
-
-    /**
-     * return an array of singledate-objects for the submitted cycle identified by metadate_id
-     *
-     * @param  string  $metadate_id  the id identifying the cycle
-     *
-     * @return mixed   an array of singledate-objects
-     */
-    public function readSingleDatesForCycle($metadate_id)
-    {
-        return $this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
-    }
-
-    public function readSingleDates($force = FALSE, $filter = FALSE)
-    {
-        if (!$force) {
-            if (is_array($this->irregularSingleDates)) {
-                return TRUE;
-            }
-        }
-        $this->irregularSingleDates = [];
-
-        if ($filter) {
-            $data = SeminarDB::getSingleDates($this->id, $this->filterStart, $this->filterEnd);
-        } else {
-            $data = SeminarDB::getSingleDates($this->id);
-        }
-
-        foreach ($data as $val) {
-            unset($termin);
-            $termin = new SingleDate();
-            $termin->fillValuesFromArray($val);
-            $this->irregularSingleDates[$val['termin_id']] =& $termin;
-        }
-    }
-
-    public function &getSingleDate($singleDateID, $cycle_id = '')
-    {
-        if ($cycle_id == '') {
-            $this->readSingleDates();
-            return $this->irregularSingleDates[$singleDateID];
-        } else {
-            $dates = $this->metadate->getSingleDates($cycle_id, $this->filterStart, $this->filterEnd);
-            $data =& $dates;
-            return $data[$singleDateID];
-        }
-    }
-
-    public function &getSingleDates($filter = false, $force = false, $include_deleted_dates = false)
-    {
-        $this->readSingleDates($force, $filter);
-        if (!$include_deleted_dates) {
-            return $this->irregularSingleDates;
-        } else {
-            $deleted_dates = [];
-            foreach (SeminarDB::getDeletedSingleDates($this->getId(), $this->filterStart, $this->filterEnd) as $val) {
-                $termin = new SingleDate();
-                $termin->fillValuesFromArray($val);
-                $deleted_dates[$val['termin_id']] = $termin;
-            }
-            $dates = array_merge($this->irregularSingleDates, $deleted_dates);
-            uasort($dates, function($a,$b) {
-                    if ($a->getStartTime() == $b->getStartTime()) return 0;
-                    return $a->getStartTime() < $b->getStartTime() ? -1 : 1;}
-            );
-            return $dates;
-        }
-    }
-
-    public function getCycles()
-    {
-        return $this->metadate->getCycles();
-    }
-
-    public function &getSingleDatesForCycle($metadate_id)
-    {
-        if (!$this->metadate->cycles[$metadate_id]->termine) {
-            $this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
-            if (!$this->metadate->cycles[$metadate_id]->termine) {
-                $this->readSingleDates();
-                $this->metadate->createSingleDates($metadate_id, $this->irregularSingleDates);
-                $this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
-            }
-            //$this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
-        }
-        $dates = $this->metadate->getSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
-        return $dates;
-    }
-
-    public function readIssues($force = false)
-    {
-        if (!is_array($this->issues) || $force) {
-            $this->issues = [];
-            $data = SeminarDB::getIssues($this->id);
-
-            foreach ($data as $val) {
-                unset($issue);
-                $issue = new Issue();
-                $issue->fillValuesFromArray($val);
-                $this->issues[$val['issue_id']] =& $issue;
-            }
-        }
-    }
-
-    public function addSingleDate(&$singledate)
-    {
-        // logging >>>>>>
-        StudipLog::log("SEM_ADD_SINGLEDATE", $this->getId(), $singledate->toString(), 'SingleDateID: '.$singledate->getTerminID());
-        // logging <<<<<<
-
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache->expire('course/undecorated_data/'. $this->getId());
-
-        $this->readSingleDates();
-        $this->irregularSingleDates[$singledate->getSingleDateID()] =& $singledate;
-        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-        return TRUE;
-    }
-
-    public function addIssue(&$issue)
-    {
-        $this->readIssues();
-        if ($issue instanceof Issue) {
-            $max = -1;
-            if (is_array($this->issues)) foreach ($this->issues as $val) {
-                if ($val->getPriority() > $max) {
-                    $max = $val->getPriority();
-                }
-            }
-            $max++;
-            $issue->setPriority($max);
-            $this->issues[$issue->getIssueID()] =& $issue;
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
-
-    public function deleteSingleDate($date_id, $cycle_id = '')
-    {
-        $this->readSingleDates();
-        // logging >>>>>>
-        StudipLog::log("SEM_DELETE_SINGLEDATE",$date_id, $this->getId(), 'Cycle_id: '.$cycle_id);
-        // logging <<<<<<
-        if ($cycle_id == '') {
-            $this->irregularSingleDates[$date_id]->delete(true);
-            unset ($this->irregularSingleDates[$date_id]);
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-            return TRUE;
-        } else {
-            $this->metadate->deleteSingleDate($cycle_id, $date_id, $this->filterStart, $this->filterEnd);
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-            return TRUE;
-        }
-    }
-
-    public function cancelSingleDate($date_id, $cycle_id = '')
-    {
-        if ($cycle_id) {
-            return $this->deleteSingleDate($date_id, $cycle_id);
-        }
-        $this->readSingleDates();
-        // logging >>>>>>
-        StudipLog::log("SEM_DELETE_SINGLEDATE",$date_id, $this->getId(), 'appointment cancelled');
-        // logging <<<<<<
-        $this->irregularSingleDates[$date_id]->setExTermin(true);
-        $this->irregularSingleDates[$date_id]->store();
-        unset ($this->irregularSingleDates[$date_id]);
-        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-        return TRUE;
-    }
-
-    public function unDeleteSingleDate($date_id, $cycle_id = '')
-    {
-        // logging >>>>>>
-        StudipLog::log("SEM_UNDELETE_SINGLEDATE",$date_id, $this->getId(), 'Cycle_id: '.$cycle_id);
-        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-        // logging <<<<<<
-        if ($cycle_id == '') {
-            $termin = new SingleDate($date_id);
-            if (!$termin->isExTermin()) {
-                return false;
-            }
-            $termin->setExTermin(false);
-            $termin->store();
-            return true;
-        } else {
-            return $this->metadate->unDeleteSingleDate($cycle_id, $date_id, $this->filterStart, $this->filterEnd);
-        }
-    }
-
-    /**
-     * return all stacked messages as a multidimensional array
-     *
-     * The array has the following structure:
-     *   array( 'type' => ..., 'message' ... )
-     * where type is one of error, info and success
-     *
-     * @return mixed the array of stacked messages
-     */
-    public function getStackedMessages()
-    {
-        if ( is_array( $this->message_stack ) ) {
-            $ret = [];
-
-            // cycle through message types and set title and details appropriate
-            foreach ($this->message_stack as $type => $messages ) {
-                switch ( $type ) {
-                    case 'error':
-                        $ret['error'] = [
-                            'title'   => _("Es sind Fehler/Probleme aufgetreten!"),
-                            'details' => $this->message_stack['error']
-                        ];
-                        break;
-
-                    case 'info':
-                        $ret['info'] = [
-                            'title'   => implode('<br>', $this->message_stack['info']),
-                            'details' => []
-                        ];
-                        break;
-
-                    case 'success':
-                        $ret['success'] = [
-                            'title'   => _("Ihre Änderungen wurden gespeichert!"),
-                            'details' => $this->message_stack['success']
-                        ];
-                        break;
-                }
-            }
-
-            return $ret;
-        }
-
-        return false;
-    }
-
-    /**
-     * return the next stacked messag-string
-     *
-     * @return string a message-string
-     */
-    public function getNextMessage()
-    {
-        if ($this->messages[0]) {
-            $ret = $this->messages[0];
-            unset ($this->messages[0]);
-            sort($this->messages);
-            return $ret;
-        }
-        return FALSE;
-    }
-
-    /**
-     * stack an error-message
-     *
-     * @param string $text the message to stack
-     */
-    public function createError($text)
-    {
-        $this->messages[] = 'error§'.$text.'§';
-        $this->message_stack['error'][] = $text;
-    }
-
-    /**
-     * stack an info-message
-     *
-     * @param string $text the message to stack
-     */
-    public function createInfo($text)
-    {
-        $this->messages[] = 'info§'.$text.'§';
-        $this->message_stack['info'][] = $text;
-    }
-
-    /**
-     * stack a success-message
-     *
-     * @param string $text the message to stack
-     */
-    public function createMessage($text)
-    {
-        $this->messages[] = 'msg§'.$text.'§';
-        $this->message_stack['success'][] = $text;
-    }
-
-    /**
-     * add an array of messages to the message-stack
-     *
-     * @param mixed $messages array of pre-marked message-strings
-     * @param bool returns true on success
-     */
-    public function appendMessages( $messages )
-    {
-        if (!is_array($messages)) return false;
-
-        foreach ( $messages as $type => $msgs ) {
-            foreach ($msgs as $msg) {
-                $this->message_stack[$type][] = $msg;
-            }
-        }
-        return true;
-    }
-
-    public function addCycle($data = [])
-    {
-        $new_id = $this->metadate->addCycle($data);
-        if($new_id){
-            $this->setStartWeek($data['startWeek'], $new_id);
-            $this->setTurnus($data['turnus'], $new_id);
-        }
-        // logging >>>>>>
-        if($new_id){
-            $cycle_info = $this->metadate->cycles[$new_id]->toString();
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-            StudipLog::log("SEM_ADD_CYCLE", $this->getId(), NULL, $cycle_info, '<pre>'.print_r($data,true).'</pre>');
-        }
-        // logging <<<<<<
-        return $new_id;
-    }
-
-    /**
-     * Change a regular timeslot of the seminar. The data is passed as an array
-     * conatining the following fields:
-     *   start_stunde, start_minute, end_stunde, end_minute
-     *   description, turnus, startWeek, day, sws
-     *
-     * @param array $data the cycle-data
-     *
-     * @return void
-     */
-    public function editCycle($data = [])
-    {
-        $cycle = $this->metadate->cycles[$data['cycle_id']];
-        $new_start = mktime($data['start_stunde'], $data['start_minute']);
-        $new_end = mktime($data['end_stunde'], $data['end_minute']);
-        $old_start = mktime($cycle->getStartStunde(),$cycle->getStartMinute());
-        $old_end = mktime($cycle->getEndStunde(), $cycle->getEndMinute());
-        $do_changes = false;
-
-        // check, if the new timeslot exceeds the old one
-        if (($new_start < $old_start) || ($new_end > $old_end) || ($data['day'] != $cycle->day) ) {
-            $has_bookings = false;
-
-            // check, if there are any booked rooms
-            foreach($cycle->getSingleDates() as $singleDate) {
-                if ($singleDate->getStarttime() > (time() - 3600) && $singleDate->hasRoom()) {
-                    $has_bookings = true;
-                    break;
-                }
-            }
-
-            // if the timeslot exceeds the previous one and has some booked rooms
-            // they would be lost, so ask the user for permission to do so.
-            if (!$data['really_change'] && $has_bookings) {
-                $link_params = [
-                    'editCycle_x' => '1',
-                    'editCycle_y' => '1',
-                    'cycle_id' => $data['cycle_id'],
-                    'start_stunde' => $data['start_stunde'],
-                    'start_minute' => $data['start_minute'],
-                    'end_stunde' => $data['end_stunde'],
-                    'end_minute' => $data['end_minute'],
-                    'day' => $data['day'],
-                    'really_change' => 'true'
-                ];
-                $question = _("Wenn Sie die regelmäßige Zeit auf %s ändern, verlieren Sie die Raumbuchungen für alle in der Zukunft liegenden Termine!")
-                    ."\n". _("Sind Sie sicher, dass Sie die regelmäßige Zeit ändern möchten?");
-                $question_time = '**'. strftime('%A', $data['day']) .', '. $data['start_stunde'] .':'. $data['start_minute']
-                    .' - '. $data['end_stunde'] .':'. $data['end_minute'] .'**';
-
-                echo (string)QuestionBox::create(
-                    sprintf($question, $question_time),
-                    URLHelper::getURL('', $link_params)
-                );
-
-            } else {
-                $do_changes = true;
-            }
-        } else {
-            $do_changes = true;
-        }
-
-        $messages = false;
-        $same_time = false;
-
-        // only apply changes, if the user approved the change or
-        // the change does not need any approval
-        if ($do_changes) {
-            if ($data['description'] != $cycle->getDescription()) {
-                $this->createMessage(_("Die Beschreibung des regelmäßigen Eintrags wurde geändert."));
-                $message = true;
-                $do_changes = true;
-            }
-
-            if ($old_start == $new_start && $old_end == $new_end) {
-                $same_time = true;
-            }
-            if ($data['startWeek'] != $cycle->week_offset) {
-                $this->setStartWeek($data['startWeek'], $cycle->metadate_id);
-                $message = true;
-                $do_changes = true;
-            }
-            if ($data['turnus'] != $cycle->cycle) {
-                $this->setTurnus($data['turnus'], $cycle->metadate_id);
-                $message = true;
-                $do_changes = true;
-            }
-            if ($data['day'] != $cycle->day) {
-                $message = true;
-                $same_time = false;
-                $do_changes = true;
-            }
-            if (round(str_replace(',','.', $data['sws']),1) != $cycle->sws) {
-                $cycle->sws = $data['sws'];
-                $this->createMessage(_("Die Semesterwochenstunden für Lehrende des regelmäßigen Eintrags wurden geändert."));
-                $message = true;
-                $do_changes = true;
-            }
-
-            $change_from = $cycle->toString();
-            if ($this->metadate->editCycle($data)) {
-                if (!$same_time) {
-                    // logging >>>>>>
-                    StudipLog::log("SEM_CHANGE_CYCLE", $this->getId(), NULL, $change_from .' -> '. $cycle->toString());
-                    NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-                    // logging <<<<<<
-                    $this->createMessage(sprintf(_("Die regelmäßige Veranstaltungszeit wurde auf \"%s\" für alle in der Zukunft liegenden Termine geändert!"),
-                        '<b>'.getWeekday($data['day']) . ', ' . $data['start_stunde'] . ':' . $data['start_minute'].' - '.
-                        $data['end_stunde'] . ':' . $data['end_minute'] . '</b>'));
-                    $message = true;
-                }
-            } else {
-                if (!$same_time) {
-                    $this->createInfo(sprintf(_("Die regelmäßige Veranstaltungszeit wurde auf \"%s\" geändert, jedoch gab es keine Termine die davon betroffen waren."),
-                        '<b>'.getWeekday($data['day']) . ', ' . $data['start_stunde'] . ':' . $data['start_minute'].' - '.
-                        $data['end_stunde'] . ':' . $data['end_minute'] . '</b>'));
-                    $message = true;
-                }
-            }
-            $this->metadate->sortCycleData();
-
-            if (!$message) {
-                $this->createInfo("Sie haben keine Änderungen vorgenommen!");
-            }
-        }
-    }
-
-    public function deleteCycle($cycle_id)
-    {
-        // logging >>>>>>
-        $cycle_info = $this->metadate->cycles[$cycle_id]->toString();
-        StudipLog::log("SEM_DELETE_CYCLE", $this->getId(), NULL, $cycle_info);
-        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-        // logging <<<<<<
-        return $this->metadate->deleteCycle($cycle_id);
-    }
-
-    public function setTurnus($turnus, $metadate_id = false)
-    {
-        if ($this->metadate->getTurnus($metadate_id) != $turnus) {
-            $this->metadate->setTurnus($turnus, $metadate_id);
-            $key = $metadate_id ? $metadate_id : $this->metadate->getFirstMetadate()->metadate_id;
-            $this->createMessage(sprintf(_("Der Turnus für den Termin %s wurde geändert."), $this->metadate->cycles[$key]->toString()));
-            $this->metadate->createSingleDates($key);
-            $this->metadate->cycles[$key]->termine = null;
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-        }
-        return TRUE;
-    }
-
-    public function getTurnus($metadate_id = false)
-    {
-        return $this->metadate->getTurnus($metadate_id);
-    }
-
-
-    /**
-     * get StatOfNotBookedRooms returns an array:
-     * open:        number of rooms with no booking
-     * all:         number of singleDates, which can have a booking
-     * open_rooms:  array of singleDates which have no booking
-     *
-     * @param String $cycle_id Id of cycle
-     * @return array as described above
-     */
-    public function getStatOfNotBookedRooms($cycle_id)
-    {
-        if (!isset($this->BookedRoomsStatTemp[$cycle_id])) {
-            $this->BookedRoomsStatTemp[$cycle_id] = SeminarDB::getStatOfNotBookedRooms($cycle_id, $this->id, $this->filterStart, $this->filterEnd);
-        }
-        return $this->BookedRoomsStatTemp[$cycle_id];
-    }
-
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    public function getBookedRoomsTooltip($cycle_id)
-    {
-        $stat = $this->getStatOfNotBookedRooms($cycle_id);
-        $pattern = '%s , %s, %s-%s <br />';
-        $return = '';
-        if ($stat['open'] > 0 && $stat['open'] !== $stat['all']) {
-            $return = _('Folgende Termine haben keine Raumbuchung:') . '<br />';
-
-            foreach ($stat['open_rooms'] as $aSingleDate) {
-                $return .= sprintf($pattern,strftime('%a', $aSingleDate['date']),
-                    strftime('%d.%m.%Y', $aSingleDate['date']),
-                    strftime('%H:%M', $aSingleDate['date']),
-                    strftime('%H:%M', $aSingleDate['end_time']));
-            }
-        }
-
-        // are there any dates with declined room-requests?
-        if ($stat['declined'] > 0) {
-            $return .= _('Folgende Termine haben eine abgelehnte Raumanfrage') . '<br />';
-            foreach ($stat['declined_dates'] as $aSingleDate) {
-                $return .= sprintf($pattern,strftime('%a', $aSingleDate['date']),
-                    strftime('%d.%m.%Y', $aSingleDate['date']),
-                    strftime('%H:%M', $aSingleDate['date']),
-                    strftime('%H:%M', $aSingleDate['end_time']));
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * @param $cycle_id
-     * @return string
-     */
-    public function getCycleColorClass($cycle_id)
-    {
-        if (Config::get()->RESOURCES_ENABLE && Config::get()->RESOURCES_ENABLE_BOOKINGSTATUS_COLORING) {
-            if (!$this->metadate->hasDates($cycle_id, $this->filterStart, $this->filterEnd)) {
-                return 'red';
-            }
-
-            $stat = $this->getStatOfNotBookedRooms($cycle_id);
-
-            if ($stat['open'] > 0 && $stat['open'] == $stat['all']) {
-                return 'red';
-            }
-            if ($stat['open'] > 0) {
-                return 'yellow ';
-            }
-            return 'green ';
-        }
-
-        return '';
-    }
-
-    public function &getIssues($force = false)
-    {
-        $this->readIssues($force);
-        $this->renumberIssuePrioritys();
-        if (is_array($this->issues)) {
-            uasort($this->issues, function ($a, $b) {
-                return $a->getPriority() - $b->getPriority();
-            });
-        }
-        return $this->issues;
-    }
-
-    public function deleteIssue($issue_id)
-    {
-        $this->issues[$issue_id]->delete();
-        unset($this->issues[$issue_id]);
-        return TRUE;
-    }
-
-    public function &getIssue($issue_id)
-    {
-        $this->readIssues();
-        return $this->issues[$issue_id];
-    }
-
-    /*
-     * changeIssuePriority
-     *
-     * changes an issue with an given id to a new priority
-     *
-     * @param
-     * issue_id             the issue_id of the issue to be changed
-     * new_priority     the new priority
-     */
-    public function changeIssuePriority($issue_id, $new_priority)
-    {
-        /* REMARK:
-         * This function only works, when an issue is moved ONE slote higher or lower
-         * It does NOT work with ARBITRARY movements!
-         */
-        $this->readIssues();
-        $old_priority = $this->issues[$issue_id]->getPriority();    // get old priority, so we can just exchange prioritys of two issues
-        foreach ($this->issues as $id => $issue) {                              // search for the concuring issue
-            if ($issue->getPriority() == $new_priority) {
-                $this->issues[$id]->setPriority($old_priority);             // the concuring issue gets the old id of the changed issue
-                $this->issues[$id]->store();                                                    // ###store_problem###
-            }
-        }
-
-        $this->issues[$issue_id]->setPriority($new_priority);           // changed issue gets the new priority
-        $this->issues[$issue_id]->store();                                              // ###store_problem###
-
-    }
-
-    public function renumberIssuePrioritys()
-    {
-        if (is_array($this->issues)) {
-
-            $sorter = [];
-            foreach ($this->issues as $id => $issue) {
-                $sorter[$id] = $issue->getPriority();
-            }
-            asort($sorter);
-            $i = 0;
-            foreach ($sorter as $id => $old_priority) {
-                $this->issues[$id]->setPriority($i);
-                $i++;
-            }
-        }
-    }
-
-    public function autoAssignIssues($themen, $cycle_id)
-    {
-        $this->metadate->cycles[$cycle_id]->autoAssignIssues($themen, $this->filterStart, $this->filterEnd);
-    }
-
-
-    public function applyTimeFilter($start, $end)
-    {
-        $this->filterStart = $start;
-        $this->filterEnd = $end;
-    }
-
-    public function setFilter($timestamp)
-    {
-        if ($timestamp == 'all') {
-            $_SESSION['raumzeitFilter'] = 'all';
-            $this->applyTimeFilter(0, 0);
-        } else {
-            $filterSemester = Semester::findByTimestamp($timestamp);
-            $_SESSION['raumzeitFilter'] = $filterSemester->beginn;
-            $this->applyTimeFilter($filterSemester->beginn, $filterSemester->ende);
-        }
-    }
-
-    public function registerCommand($command, $function)
-    {
-        $this->commands[$command] = $function;
-    }
-
-    public function processCommands()
-    {
-        global $cmd;
-
-        // workaround for multiple submit-buttons with new Button-API
-        foreach ($this->commands as $r_cmd => $func) {
-            if (Request::submitted($r_cmd)) {
-                $cmd = $r_cmd;
-            }
-        }
-
-        if (!isset($cmd) && Request::option('cmd')) $cmd = Request::option('cmd');
-        if (!isset($cmd)) return FALSE;
-
-        if (isset($this->commands[$cmd])) {
-            call_user_func($this->commands[$cmd], $this);
-        }
-    }
-
-    public function getFreeTextPredominantRoom($cycle_id)
-    {
-        if (!($room = $this->metadate->cycles[$cycle_id]->getFreeTextPredominantRoom($this->filterStart, $this->filterEnd))) {
-            return FALSE;
-        }
-        return $room;
-    }
-
-    public function getPredominantRoom($cycle_id, $list = FALSE)
-    {
-        if (!($rooms = $this->metadate->cycles[$cycle_id]->getPredominantRoom($this->filterStart, $this->filterEnd))) {
-            return FALSE;
-        }
-        if ($list) {
-            return $rooms;
-        } else {
-            return $rooms[0];
-        }
-    }
-
-
-    public function hasDatesOutOfDuration($force = false)
-    {
-        if ($this->hasDatesOutOfDuration == -1 || $force) {
-            $this->hasDatesOutOfDuration = SeminarDB::hasDatesOutOfDuration($this->getStartSemester(), $this->getEndSemesterVorlesEnde(), $this->id);
-        }
-        return $this->hasDatesOutOfDuration;
-    }
-
-    public function getStartWeek($metadate_id = false)
-    {
-        return $this->metadate->getStartWoche($metadate_id);
-    }
-
-    public function setStartWeek($week, $metadate_id = false)
-    {
-        if ($this->metadate->getStartWoche($metadate_id) == $week) {
-            return FALSE;
-        } else {
-            $this->metadate->setStartWoche($week, $metadate_id);
-            $key = $metadate_id ? $metadate_id : $this->metadate->getFirstMetadate()->metadate_id;
-            $this->createMessage(sprintf(_("Die Startwoche für den Termin %s wurde geändert."), $this->metadate->cycles[$key]->toString()));
-            $this->metadate->createSingleDates($key);
-            $this->metadate->cycles[$key]->termine = null;
-            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
-        }
-    }
-
-
-    /**
-     * instance method
-     *
-     * returns number of participants for each usergroup in seminar,
-     * total, lecturers, tutors, authors, users
-     *
-     * @param string (optional) return count only for given usergroup
-     *
-     * @return array <description>
-     */
-
-    public function getNumberOfParticipants()
-    {
-        $args = func_get_args();
-        array_unshift($args, $this->id);
-        return call_user_func_array(["Seminar", "getNumberOfParticipantsBySeminarId"], $args);
-    }
-
-    /**
-     * class method
-     *
-     * returns number of participants for each usergroup in given seminar,
-     * total, lecturers, tutors, authors, users
-     *
-     * @param string seminar_id
-     *
-     * @param string (optional) return count only for given usergroup
-     *
-     * @return array <description>
-     */
-
-    public function getNumberOfParticipantsBySeminarId($sem_id)
-    {
-        $db = DBManager::get();
-        $stmt1 = $db->prepare("SELECT
-                               COUNT(Seminar_id) AS anzahl,
-                               COUNT(IF(status='dozent',Seminar_id,NULL)) AS anz_dozent,
-                               COUNT(IF(status='tutor',Seminar_id,NULL)) AS anz_tutor,
-                               COUNT(IF(status='autor',Seminar_id,NULL)) AS anz_autor,
-                               COUNT(IF(status='user',Seminar_id,NULL)) AS anz_user
-                               FROM seminar_user
-                               WHERE Seminar_id = ?
-                               GROUP BY Seminar_id");
-        $stmt1->execute([$sem_id]);
-        $numbers = $stmt1->fetch(PDO::FETCH_ASSOC);
-
-        $stmt2 = $db->prepare("SELECT COUNT(*) as anzahl
-                               FROM admission_seminar_user
-                               WHERE seminar_id = ?
-                               AND status = 'accepted'");
-        $stmt2->execute([$sem_id]);
-        $acceptedUsers = $stmt2->fetch(PDO::FETCH_ASSOC);
-
-
-        $count = 0;
-        if ($numbers["anzahl"]) {
-            $count += $numbers["anzahl"];
-        }
-        if ($acceptedUsers["anzahl"]) {
-            $count += $acceptedUsers["anzahl"];
-        }
-
-        $participant_count = [];
-        $participant_count['total']     = $count;
-        $participant_count['lecturers'] = $numbers['anz_dozent'] ? (int) $numbers['anz_dozent'] : 0;
-        $participant_count['tutors']    = $numbers['anz_tutor']  ? (int) $numbers['anz_tutor']  : 0;
-        $participant_count['authors']   = $numbers['anz_autor']  ? (int) $numbers['anz_autor']  : 0;
-        $participant_count['users']     = $numbers['anz_user']   ? (int) $numbers['anz_user']   : 0;
-
-        // return specific parameter if
-        $params = func_get_args();
-        if (sizeof($params) > 1) {
-            if (in_array($params[1], array_keys($participant_count))) {
-                return $participant_count[$params[1]];
-            } else {
-                trigger_error(get_class($this)."::__getParticipantInfos - unknown parameter requested");
-            }
-        }
-
-        return $participant_count;
-    }
-
-
-    /**
-     * Returns the IDs of this course's study areas.
-     *
-     * @return array     an array of IDs
-     */
-    public function getStudyAreas()
-    {
-        $stmt = DBManager::get()->prepare("SELECT DISTINCT sem_tree_id ".
-            "FROM seminar_sem_tree ".
-            "WHERE seminar_id=?");
-
-        $stmt->execute([$this->id]);
-        return $stmt->fetchAll(PDO::FETCH_COLUMN, 0);
-    }
-
-    /**
-     * Sets the study areas of this course.
-     *
-     * @param  array      an array of IDs
-     *
-     * @return void
-     */
-    public function setStudyAreas($selected)
-    {
-        $old = $this->getStudyAreas();
-        $sem_tree = TreeAbstract::GetInstance("StudipSemTree");
-        $removed = array_diff($old, $selected);
-        $added = array_diff($selected, $old);
-        $count_removed = 0;
-        $count_added = 0;
-        foreach($removed as $one){
-            $count_removed += $sem_tree->DeleteSemEntries($one, $this->getId());
-        }
-        foreach($added as $one){
-            $count_added += $sem_tree->InsertSemEntry($one, $this->getId());
-        }
-        if ($count_added || $count_removed) {
-            NotificationCenter::postNotification("CourseDidChangeStudyArea", $this);
-        }
-        return count($old) + $count_added - $count_removed;
-    }
-
-    /**
-     * @return boolean    returns TRUE if this course is publicly visible,
-     *                    FALSE otherwise
-     */
-    public function isPublic()
-    {
-        return Config::get()->ENABLE_FREE_ACCESS && $this->read_level == 0;
-    }
-
-    /**
-     * @return boolean  returns TRUE if this course is a studygroup,
-     *                  FALSE otherwise
-     */
-    public function isStudygroup()
-    {
-        global $SEM_CLASS, $SEM_TYPE;
-        return $SEM_CLASS[$SEM_TYPE[$this->status]["class"]]["studygroup_mode"];
-    }
-
-    /**
-     * @return int      returns default colour group for new members (shown in meine_seminare.php)
-     *
-     **/
-    public function getDefaultGroup()
-    {
-        if ($this->isStudygroup()) {
-            return 8;
-        } else {
-            return select_group ($this->semester_start_time);
-        }
-    }
-
-
-    /**
-     *  Deletes the current seminar
-     *
-     * @return void       returns success-message if seminar could be deleted
-     *                    otherwise an  error-message
-     */
-
-    public function delete()
-    {
-        $s_id = $this->id;
-
-        // Delete that Seminar.
-
-        // Alle Benutzer aus dem Seminar rauswerfen.
-        $db_ar = CourseMember::deleteBySQL('Seminar_id = ?', [$s_id]);
-        if ($db_ar > 0) {
-            $this->createMessage(sprintf(_("%s Teilnehmende und Lehrende archiviert."), $db_ar));
-        }
-
-        // Alle Benutzer aus Wartelisten rauswerfen
-        AdmissionApplication::deleteBySQL('seminar_id = ?', [$s_id]);
-
-        // Alle beteiligten Institute rauswerfen
-        $query = "DELETE FROM seminar_inst WHERE Seminar_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$s_id]);
-        if (($db_ar = $statement->rowCount()) > 0) {
-            $this->createMessage(sprintf(_("%s Zuordnungen zu Einrichtungen archiviert."), $db_ar));
-        }
-
-        // user aus den Statusgruppen rauswerfen
-        $count = Statusgruppen::deleteBySQL('range_id = ?', [$s_id]);
-        if ($count > 0) {
-            $this->createMessage(sprintf(_('%s Funktionen/Gruppen gelöscht.'), $count));
-        }
-
-        // seminar_sem_tree entries are deleted automatically on deletion of the Course object.
-
-        // Alle Termine mit allem was dranhaengt zu diesem Seminar loeschen.
-        if (($db_ar = SingleDateDB::deleteAllDates($s_id)) > 0) {
-            $this->createMessage(sprintf(_("%s Veranstaltungstermine archiviert."), $db_ar));
-        }
-
-        //Themen
-        IssueDB::deleteAllIssues($s_id);
-
-        //Cycles
-        SeminarCycleDate::deleteBySQL('seminar_id = ' . DBManager::get()->quote($s_id));
-
-        // Alle weiteren Postings zu diesem Seminar in den Forums-Modulen löschen
-        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
-            $plugin->deleteContents($s_id);  // delete content irrespective of plugin-activation in the seminar
-
-            if ($plugin->isActivated($s_id)) {   // only show a message, if the plugin is activated, to not confuse the user
-                $this->createMessage(sprintf(_('Einträge in %s archiviert.'), $plugin->getPluginName()));
-            }
-        }
-
-        // Alle Pluginzuordnungen entfernen
-        PluginManager::getInstance()->deactivateAllPluginsForRange('sem', $s_id);
-
-        // Alle Dokumente zu diesem Seminar loeschen.
-        $folder = Folder::findTopFolder($s_id);
-        if($folder) {
-            if($folder->delete()) {
-                $this->createMessage(_("Dokumente und Ordner archiviert."));
-            }
-        }
-
-
-        // Freie Seite zu diesem Seminar löschen
-        $db_ar = StudipScmEntry::deleteBySQL('range_id = ?', [$s_id]);
-        if ($db_ar > 0) {
-            $this->createMessage(_("Freie Seite der Veranstaltung archiviert."));
-        }
-
-        // Alle News-Verweise auf dieses Seminar löschen
-        if ( ($db_ar = StudipNews::DeleteNewsRanges($s_id)) ) {
-            $this->createMessage(sprintf(_("%s Ankündigungen gelöscht."), $db_ar));
-        }
-        //delete entry in news_rss_range
-        StudipNews::UnsetRssId($s_id);
-
-        //kill the datafields
-        DataFieldEntry::removeAll($s_id);
-
-        //kill all wiki-pages
-        $db_wiki = WikiPage::deleteBySQL('range_id = ?', [$s_id]);
-        if ($db_wiki > 0) {
-            $this->createMessage(sprintf(_("%s Wiki-Seiten archiviert."), $db_wiki));
-        }
-
-        $query = "DELETE FROM wiki_links WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$s_id]);
-
-        // delete course config values
-        ConfigValue::deleteBySQL('range_id = ?', [$s_id]);
-
-        // kill all the ressources that are assigned to the Veranstaltung (and all the linked or subordinated stuff!)
-        if (Config::get()->RESOURCES_ENABLE) {
-            ResourceBooking::deleteBySql(
-                'range_id = :course_id',
-                [
-                    'course_id' => $s_id
-                ]
-            );
-            if ($rr = RoomRequest::existsByCourse($s_id)) {
-                RoomRequest::find($rr)->delete();
-            }
-        }
-
-        // kill virtual seminar-entries in calendar
-        $query = "DELETE FROM schedule_seminare WHERE seminar_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$s_id]);
-
-        if(Config::get()->ELEARNING_INTERFACE_ENABLE){
-            global $connected_cms;
-            $del_cms = 0;
-            $cms_types = ObjectConnections::GetConnectedSystems($s_id);
-            if(count($cms_types)){
-                foreach($cms_types as $system){
-                    ELearningUtils::loadClass($system);
-                    $del_cms += $connected_cms[$system]->deleteConnectedModules($s_id);
-                }
-                $this->createMessage(sprintf(_("%s Verknüpfungen zu externen Systemen gelöscht."), $del_cms ));
-            }
-        }
-
-        //kill the object_user_vists for this seminar
-        object_kill_visits(null, $s_id);
-
-        // Logging...
-        $query = "SELECT CONCAT(seminare.VeranstaltungsNummer, ' ', seminare.name, '(', semester_data.name, ')')
-                  FROM seminare
-                  LEFT JOIN semester_data ON (seminare.start_time = semester_data.beginn)
-                  WHERE seminare.Seminar_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$s_id]);
-        $semlogname = $statement->fetchColumn() ?: sprintf('unknown sem_id: %s', $s_id);
-
-        StudipLog::log("SEM_ARCHIVE",$s_id,NULL,$semlogname);
-        // ...logged
-
-        // delete deputies if necessary
-        Deputy::deleteByRange_id($s_id);
-
-        UserDomain::removeUserDomainsForSeminar($s_id);
-
-        AutoInsert::deleteSeminar($s_id);
-
-        //Anmeldeset Zordnung entfernen
-        $cs = $this->getCourseSet();
-        if ($cs) {
-            CourseSet::removeCourseFromSet($cs->getId(), $this->getId());
-            $cs->load();
-            if (!count($cs->getCourses())
-                && $cs->isGlobal()
-                && $cs->getUserid() != '') {
-                $cs->delete();
-            }
-        }
-        AdmissionPriority::unsetAllPrioritiesForCourse($this->getId());
-        // und das Seminar loeschen.
-        $this->course->delete();
-        $this->restore();
-        return true;
-    }
-
-    /**
-     * returns a html representation of the seminar-dates
-     *
-     * @param  array  optional variables which are passed to the template
-     * @return  string  the html-representation of the dates
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    public function getDatesHTML($params = [])
-    {
-        return $this->getDatesTemplate('dates/seminar_html.php', $params);
-    }
-
-    /**
-     * returns a representation without html of the seminar-dates
-     *
-     * @param  array  optional variables which are passed to the template
-     * @return  string  the representation of the dates without html
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    public function getDatesExport($params = [])
-    {
-        return $this->getDatesTemplate('dates/seminar_export.php', $params);
-    }
-
-    /**
-     * returns a xml-representation of the seminar-dates
-     *
-     * @param  array  optional variables which are passed to the template
-     * @return  string  the xml-representation of the dates
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    public function getDatesXML($params = [])
-    {
-        return $this->getDatesTemplate('dates/seminar_xml.php', $params);
-    }
-
-    /**
-     * returns a representation of the seminar-dates with a specifiable template
-     *
-     * @param  mixed  this can be a template-object or a string pointing to a template in path_to_studip/templates
-     * @param  array  optional parameters which are passed to the template
-     * @return  string  the template output of the dates
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    public function getDatesTemplate($template, $params = [])
-    {
-        if (!$template instanceof Flexi\Template && is_string($template)) {
-            $template = $GLOBALS['template_factory']->open($template);
-        }
-
-        if (!empty($params['semester_id'])) {
-            $semester = Semester::find($params['semester_id']);
-            if ($semester) {
-                // apply filter
-                $this->applyTimeFilter($semester->beginn, $semester->ende);
-            }
-        }
-
-        $template->dates = $this->getUndecoratedData(isset($params['semester_id']));
-        $template->seminar_id = $this->getId();
-
-        $template->set_attributes($params);
-        return trim($template->render());
-    }
-
-    /**
-     * returns an asscociative array with the attributes of the seminar depending
-     * on the field-names in the database
-     * @return array
-     */
-    public function getData()
-    {
-        $data = $this->course->toArray();
-        foreach($this->alias as $a => $o) {
-            $data[$a] = $this->course->$o;
-        }
-        return $data;
-    }
-
-    /**
-     * returns an array with all IDs of Institutes this seminar is related to
-     * @param sem_id string:    optional ID of a seminar, when null, this ID will be used
-     * @return: array of IDs (not associative)
-     */
-    public function getInstitutes($sem_id = null)
-    {
-        if (!$sem_id && $this) {
-            $sem_id = $this->id;
-        }
-
-        $query = "SELECT institut_id FROM seminar_inst WHERE seminar_id = :sem_id
-                  UNION
-                  SELECT Institut_id FROM seminare WHERE Seminar_id = :sem_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute(compact('sem_id'));
-        return $statement->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * set the entries for seminar_inst table in database
-     * seminare.institut_id will always be added
-     * @param institutes array: array of Institut_id's
-     * @return bool:  if something changed
-     */
-    public function setInstitutes($institutes = [])
-    {
-        if (is_array($institutes)) {
-            $institutes[] = $this->institut_id;
-            $institutes = array_unique($institutes);
-
-            $query = "SELECT institut_id FROM seminar_inst WHERE seminar_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->id]);
-            $old_inst = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-            $todelete = array_diff($old_inst, $institutes);
-
-            $query = "DELETE FROM seminar_inst WHERE seminar_id = ? AND institut_id = ?";
-            $statement = DBManager::get()->prepare($query);
-
-            foreach($todelete as $inst) {
-                $tmp_instname= get_object_name($inst, 'inst');
-                StudipLog::log('CHANGE_INSTITUTE_DATA', $this->id, $inst, 'Die beteiligte Einrichtung "'. $tmp_instname['name'] .'" wurde gelöscht.');
-                $statement->execute([$this->id, $inst]);
-                NotificationCenter::postNotification('SeminarInstitutionDidDelete', $inst, $this->id);
-
-            }
-
-            $toinsert = array_diff($institutes, $old_inst);
-
-            $query = "INSERT INTO seminar_inst (seminar_id, institut_id) VALUES (?, ?)";
-            $statement = DBManager::get()->prepare($query);
-
-            foreach($toinsert as $inst) {
-                $tmp_instname= get_object_name($inst, 'inst');
-                StudipLog::log('CHANGE_INSTITUTE_DATA', $this->id, $inst, 'Die beteiligte Einrichtung "'. $tmp_instname['name'] .'" wurde hinzugefügt.');
-                $statement->execute([$this->id, $inst]);
-                NotificationCenter::postNotification('SeminarInstitutionDidCreate', $inst, $this->id);
-            }
-            if ($todelete || $toinsert) {
-                NotificationCenter::postNotification("CourseDidChangeInstitutes", $this);
-            }
-            return $todelete || $toinsert;
-        } else {
-            $this->createError(_("Ungültige Eingabe der Institute. Es muss " .
-                "mindestens ein Institut angegeben werden."));
-            return false;
-        }
-    }
-
-    /**
-     * adds a user to the seminar with the given status
-     * @param user_id string: ID of the user
-     * @param status string: status of the user for the seminar "user", "autor", "tutor", "dozent"
-     * @param force bool: if false (default) the user will only be upgraded and not degraded in his/her status
-     */
-    public function addMember($user_id, $status = 'autor', $force = false)
-    {
-
-        if (in_array($GLOBALS['perm']->get_perm($user_id), ["admin", "root"])) {
-            $this->createError(_("Admin und Root dürfen nicht Mitglied einer Veranstaltung sein."));
-            return false;
-        }
-        $db = DBManager::get();
-
-        $rangordnung = array_flip(['user', 'autor', 'tutor', 'dozent']);
-        if ($rangordnung[$status] > $rangordnung['autor'] && SeminarCategories::getByTypeId($this->status)->only_inst_user) {
-            //überprüfe, ob im richtigen Institut:
-            $user_institute_stmt = $db->prepare(
-                "SELECT Institut_id " .
-                "FROM user_inst " .
-                "WHERE user_id = :user_id " .
-                "");
-            $user_institute_stmt->execute(['user_id' => $user_id]);
-            $user_institute = $user_institute_stmt->fetchAll(PDO::FETCH_COLUMN, 0);
-
-            if (!in_array($this->institut_id, $user_institute) && !count(array_intersect($user_institute, $this->getInstitutes()))) {
-                $this->createError(_("Einzutragender Nutzer stammt nicht einem beteiligten Institut an."));
-
-                return false;
-            }
-        }
-        $course_member = CourseMember::findOneBySQL('user_id = ? AND Seminar_id = ?', [$user_id, $this->id]);
-        $new_position = (int) DBManager::get()->fetchColumn(
-            "SELECT MAX(position) + 1 FROM seminar_user WHERE status = ? AND Seminar_id = ?",
-            [$status, $this->id]
-        );
-        $numberOfTeachers = CourseMember::countBySql("Seminar_id = ? AND status = 'dozent'", [$this->id]);
-
-        if (!$course_member && !$force) {
-            CourseMember::create([
-                'Seminar_id' => $this->id,
-                'user_id'    => $user_id,
-                'status'     => $status,
-                'position'   => $new_position?:0,
-                'gruppe'     => (int) select_group($this->getSemesterStartTime()),
-                'visible'    => in_array($status, ['tutor', 'dozent']) ? 'yes' : 'unknown',
-            ]);
-            // delete the entries, user is now in the seminar
-            if (AdmissionApplication::deleteBySQL('user_id = ? AND seminar_id = ?', [$user_id, $this->getId()])) {
-                //renumber the waiting/accepted/lot list, a user was deleted from it
-                AdmissionApplication::renumberAdmission($this->getId());
-            }
-            $cs = $this->getCourseSet();
-            if ($cs) {
-                AdmissionPriority::unsetPriority($cs->getId(), $user_id, $this->getId());
-            }
-
-            CalendarScheduleModel::deleteSeminarEntries($user_id, $this->getId());
-            NotificationCenter::postNotification('CourseDidGetMember', $this, $user_id);
-            NotificationCenter::postNotification('UserDidEnterCourse', $this->id, $user_id);
-            StudipLog::log('SEM_USER_ADD', $this->id, $user_id, $status, 'Wurde in die Veranstaltung eingetragen');
-            $this->course->resetRelation('members');
-            $this->course->resetRelation('admission_applicants');
-
-            // Check if we need to add user to parent course as well.
-            if ($this->parent_course) {
-                $parent = new Seminar($this->parent);
-                $parent->addMember($user_id, $status, $force);
-            }
-
-            return $this;
-        } elseif (
-            ($force || $rangordnung[$course_member->status] < $rangordnung[$status])
-            && ($course_member->status !== 'dozent' || $numberOfTeachers > 1)
-        ) {
-            $visibility = $course_member->visible;
-            if (in_array($status, ['tutor', 'dozent'])) {
-                $visibility = 'yes';
-            }
-            $course_member->status = $status;
-            $course_member->visible = $visibility;
-            $course_member->position = $new_position;
-            $course_member->store();
-
-            if ($course_member->status === 'dozent') {
-                $termine = DBManager::get()->fetchFirst(
-                    "SELECT termin_id FROM termine WHERE range_id = ?",
-                    [$this->id]
-                );
-
-                DBManager::get()->execute(
-                    "DELETE FROM termin_related_persons WHERE range_id IN (?) AND user_id = ?",
-                    [$termine, $user_id]
-                );
-            }
-            NotificationCenter::postNotification('CourseDidChangeMember', $this, $user_id);
-            $this->course->resetRelation('members');
-            $this->course->resetRelation('admission_applicants');
-            return $this;
-        } else {
-            if ($course_member->status === 'dozent' && $numberOfTeachers <= 1) {
-                $this->createError(sprintf(_('Die Person kann nicht herabgestuft werden, ' .
-'da mindestens ein/eine Veranstaltungsleiter/-in (%s) in die Veranstaltung eingetragen sein muss!'),
-                        get_title_for_status('dozent', 1, $this->status)) .
-                    ' ' . sprintf(_('Tragen Sie zunächst eine weitere Person als Veranstaltungsleiter/-in (%s) ein.'),
-get_title_for_status('dozent', 1, $this->status)));
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Cancels a subscription to an admission.
-     *
-     * @param array $users
-     * @param string $status
-     * @return array
-     * @throws NotificationVetoException
-     */
-    public function cancelAdmissionSubscription(array $users, string $status): array
-    {
-        $msgs = [];
-        $messaging = new messaging;
-        $course_set = $this->getCourseSet();
-        $users = User::findMany($users);
-        foreach ($users as $user) {
-            $prio_delete = false;
-            if ($course_set) {
-                $prio_delete = AdmissionPriority::unsetPriority($course_set->getId(), $user->id, $this->getId());
-            }
-            $result = AdmissionApplication::deleteBySQL(
-                'seminar_id = ? AND user_id = ? AND status = ?',
-                [$this->getId(), $user->id, $status]
-            );
-            if ($result || $prio_delete) {
-                setTempLanguage($user->id);
-                if ($status !== 'accepted') {
-                    $message = sprintf(
-                        _('Sie wurden von der Warteliste der Veranstaltung **%s** gestrichen und sind damit __nicht__ zugelassen worden.'),
-                        $this->getFullName()
-                    );
-                } else {
-                    $message = sprintf(
-                        _('Sie wurden aus der Veranstaltung **%s** gestrichen und sind damit __nicht__ zugelassen worden.'),
-                        $this->getFullName()
-                    );
-                }
-                restoreLanguage();
-                $messaging->insert_message(
-                    $message,
-                    $user->username,
-                    '____%system%____',
-                    false,
-                    false,
-                    '1',
-                    false,
-                    sprintf('%s %s', _('Systemnachricht:'), _('nicht zugelassen in Veranstaltung')),
-                    true
-                );
-                StudipLog::log('SEM_USER_DEL', $this->getId(), $user->id, 'Wurde aus der Veranstaltung entfernt');
-                NotificationCenter::postNotification('UserDidLeaveCourse', $this->getId(), $user->id);
-
-                $msgs[] = $user->getFullName();
-            }
-        }
-        return $msgs;
-    }
-
-    /**
-     * Cancels a subscription to a course
-     * @param array $users
-     * @return array
-     * @throws Exception
-     */
-    public function cancelSubscription(array $users): array
-    {
-        $msgs = [];
-        $messaging = new messaging;
-        $users = User::findMany($users);
-        foreach ($users as $user) {
-            // delete member from seminar
-            if ($this->deleteMember($user->id)) {
-                setTempLanguage($user->id);
-                $message = sprintf(
-                    _('Ihre Anmeldung zur Veranstaltung **%s** wurde aufgehoben.'),
-                    $this->getFullName()
-                );
-                restoreLanguage();
-                $messaging->insert_message(
-                    $message,
-                    $user->username,
-                    '____%system%____',
-                    false,
-                    false,
-                    '1',
-                    false,
-                    sprintf('%s %s', _('Systemnachricht:'), _("Anmeldung aufgehoben")),
-                    true
-                );
-                $msgs[] = $user->getFullName();
-            }
-        }
-
-        return $msgs;
-    }
-
-    /**
-     * deletes a user from the seminar by respecting the rule that at least one
-     * user with status "dozent" must stay there
-     * @param string $user_id  user_id of the user to delete
-     * @return boolean
-     */
-    public function deleteMember($user_id): bool
-    {
-        $dozenten = $this->getMembers();
-        if (count($dozenten) >= 2 || empty($dozenten[$user_id])) {
-            $result = CourseMember::deleteBySQL('Seminar_id = ? AND user_id = ?', [$this->id, $user_id]);
-            if ($result === 0) {
-                return true;
-            }
-            // If this course is a child of another course...
-            if ($this->parent_course) {
-                // ... check if user is member in another sibling ...
-                $other = CourseMember::countBySQL(
-                    "`user_id` = :user AND `Seminar_id` IN (:courses) AND `Seminar_id` != :this",
-                    ['user' => $user_id, 'courses' => $this->parent->children->pluck('seminar_id'), 'this' => $this->id]
-                );
-
-                // ... and delete from parent course if this was the only
-                // course membership in this family.
-                if ($other === 0) {
-                    $s = new Seminar($this->parent);
-                    $s->deleteMember($user_id);
-                }
-            }
-
-            if ($this->children != null) {
-                foreach ($this->children as $child) {
-                    $s = new Seminar($child);
-                    $s->deleteMember($user_id);
-                }
-            }
-
-            if (!empty($dozenten[$user_id])) {
-                $query = "SELECT termin_id FROM termine WHERE range_id = ?";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([$this->id]);
-                $termine = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-                $query = "DELETE FROM termin_related_persons WHERE range_id = ? AND user_id = ?";
-                $statement = DBManager::get()->prepare($query);
-
-                foreach ($termine as $termin_id) {
-                    $statement->execute([$termin_id, $user_id]);
-                }
-                if (Deputy::isActivated()) {
-                    $other_dozenten = array_diff(array_keys($dozenten), [$user_id]);
-                    foreach (Deputy::findByRange_id($user_id) as $default_deputy) {
-                        if ($default_deputy->user_id != $GLOBALS['user']->id &&
-                                !Deputy::countBySql("range_id IN (?)", [$other_dozenten])) {
-                            Deputy::deleteBySQL("range_id = ? AND user_id = ?", [$this->id, $default_deputy->user_id]);
-                        }
-                    }
-                }
-            }
-
-            // Delete course related datafield entries
-            DatafieldEntryModel::deleteBySQL('range_id = ? AND sec_range_id = ?', [$user_id, $this->id]);
-
-            // Remove from associated status groups
-            foreach (Statusgruppen::findBySeminar_id($this->id) as $group) {
-                $group->removeUser($user_id, true);
-            }
-
-            $this->createMessage(sprintf(
-                _('Nutzer %s wurde aus der Veranstaltung entfernt.'),
-                '<i>' . htmlReady(get_fullname($user_id)) . '</i>'
-            ));
-            NotificationCenter::postNotification('CourseDidChangeMember', $this, $user_id);
-            NotificationCenter::postNotification('UserDidLeaveCourse', $this->id, $user_id);
-            StudipLog::log('SEM_USER_DEL', $this->id, $user_id, 'Wurde aus der Veranstaltung entfernt');
-            $this->course->resetRelation('members');
-            return true;
-        } else {
-            $this->createError(
-                sprintf(
-                    _('Die Veranstaltung muss wenigstens <b>einen/eine</b> VeranstaltungsleiterIn (%s) eingetragen haben!'),
-                    get_title_for_status('dozent', 1, $this->status)
-                )
-                . ' ' . _('Tragen Sie zunächst einen anderen ein, um diesen zu löschen.')
-            );
-            return false;
-        }
-    }
-
-    /**
-     * sets the almost never used column position in the table seminar_user
-     * @param array $members members array: array of user_id's - wrong IDs will be ignored
-     * @return Seminar
-     */
-    public function setMemberPriority($members): Seminar
-    {
-        CourseMember::findEachBySQL(
-            function (CourseMember $membership) use (&$members) {
-                $membership->position = array_search($membership->user_id, $members);
-                $membership->store();
-            },
-            "Seminar_id = ? AND user_id IN (?)",
-            [$this->id, $members]
-        );
-        return $this;
-    }
-
-    /**
-     * returns array with information about enrolment to this course for given user_id
-     * ['enrolment_allowed'] : true or false
-     * ['cause']: keyword to describe the cause
-     * ['description'] : readable description of the cause
-     *
-     * @param string $user_id
-     * @return array
-     */
-    public function getEnrolmentInfo($user_id)
-    {
-        $info = [];
-        $user = User::find($user_id);
-        if ($this->getSemClass()->isGroup()) {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'grouped';
-            $info['description'] = _("Dies ist eine Veranstaltungsgruppe. Sie können sich nur in deren Unterveranstaltungen eintragen.");
-            return $info;
-        }
-        if ($this->read_level == 0 && Config::get()->ENABLE_FREE_ACCESS && !$GLOBALS['perm']->get_studip_perm($this->getId(), $user_id)) {
-            $info['enrolment_allowed'] = true;
-            $info['cause'] = 'free_access';
-            $info['description'] = _("Für die Veranstaltung ist keine Anmeldung erforderlich.");
-            return $info;
-        }
-        if (!$user) {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'nobody';
-            $info['description'] = _("Sie sind nicht in Stud.IP angemeldet.");
-            return $info;
-        }
-        if ($GLOBALS['perm']->have_perm('root', $user_id)) {
-            $info['enrolment_allowed'] = true;
-            $info['cause'] = 'root';
-            $info['description'] = _("Sie dürfen ALLES.");
-            return $info;
-        }
-        if ($GLOBALS['perm']->have_studip_perm('admin', $this->getId(), $user_id)) {
-            $info['enrolment_allowed'] = true;
-            $info['cause'] = 'courseadmin';
-            $info['description'] = _("Sie sind Administrator_in der Veranstaltung.");
-            return $info;
-        }
-        if ($GLOBALS['perm']->have_perm('admin', $user_id)) {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'admin';
-            $info['description'] = _("Als Administrator_in können Sie sich nicht für eine Veranstaltung anmelden.");
-            return $info;
-        }
-        //Ist bereits Teilnehmer
-        if ($GLOBALS['perm']->have_studip_perm('user', $this->getId(), $user_id)) {
-            $info['enrolment_allowed'] = true;
-            $info['cause'] = 'member';
-            $info['description'] = _("Sie sind für die Veranstaltung angemeldet.");
-            return $info;
-        }
-        $admission_status = $user->admission_applications->findBy('seminar_id', $this->getId())->val('status');
-        if ($admission_status == 'accepted') {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'accepted';
-            $info['description'] = _("Sie wurden für diese Veranstaltung vorläufig akzeptiert.");
-            return $info;
-        }
-        if ($admission_status == 'awaiting') {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'awaiting';
-            $info['description'] = _("Sie stehen auf der Warteliste für diese Veranstaltung.");
-            return $info;
-        }
-        if ($GLOBALS['perm']->get_perm($user_id) == 'user') {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'user';
-            $info['description'] = _("Sie haben nicht die erforderliche Berechtigung sich für eine Veranstaltung anzumelden.");
-            return $info;
-        }
-        //falsche Nutzerdomäne
-        $same_domain = true;
-        $user_domains = UserDomain::getUserDomainsForUser($user_id);
-        if (count($user_domains) > 0) {
-            $seminar_domains = UserDomain::getUserDomainsForSeminar($this->getId());
-            $same_domain = UserDomain::checkUserVisibility($seminar_domains, $user_domains);;
-        }
-        if (!$same_domain && !$this->isStudygroup()) {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'domain';
-            $info['description'] = _("Sie sind nicht in einer zugelassenenen Nutzerdomäne, Sie können sich nicht eintragen!");
-            return $info;
-        }
-        //Teilnehmerverwaltung mit Sperregel belegt
-        if (LockRules::Check($this->getId(), 'participants')) {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'locked';
-            $lockdata = LockRules::getObjectRule($this->getId());
-            $info['description'] = _("In diese Veranstaltung können Sie sich nicht eintragen!") . ($lockdata['description'] ? '<br>' . formatLinks($lockdata['description']) : '');
-            return $info;
-        }
-        //Veranstaltung unsichtbar für aktuellen Nutzer
-        if (!$this->visible && !$this->isStudygroup() && !$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM, $user_id)) {
-            $info['enrolment_allowed'] = false;
-            $info['cause'] = 'invisible';
-            $info['description'] = _("Die Veranstaltung ist gesperrt, Sie können sich nicht eintragen!");
-            return $info;
-        }
-        if ($courseset = $this->getCourseSet()) {
-            $info['enrolment_allowed'] = true;
-            $info['cause'] = 'courseset';
-            $info['description'] = _("Die Anmeldung zu dieser Veranstaltung folgt speziellen Regeln. Lesen Sie den Hinweistext.");
-            $user_prio = AdmissionPriority::getPrioritiesByUser($courseset->getId(), $user_id);
-            if (isset($user_prio[$this->getId()])) {
-                if ($courseset->hasAdmissionRule('LimitedAdmission')) {
-                    $info['description'] .= ' ' . sprintf(_("(Sie stehen auf der Anmeldeliste für die automatische Platzverteilung mit der Priorität %s.)"), $user_prio[$this->getId()]);
-                } else {
-                    $info['description'] .= ' ' . _("(Sie stehen auf der Anmeldeliste für die automatische Platzverteilung.)");
-                }
-            }
-            return $info;
-        }
-        $info['enrolment_allowed'] = true;
-        $info['cause'] = 'normal';
-        $info['description'] = '';
-        return $info;
-    }
-
-    /**
-     * adds user with given id as preliminary member to course
-     *
-     * @param string $user_id
-     * @return integer 1 if successfull
-     */
-    public function addPreliminaryMember($user_id, $comment = '')
-    {
-        $new_admission_member = new AdmissionApplication();
-        $new_admission_member->user_id = $user_id;
-        $new_admission_member->position = 0;
-        $new_admission_member->status = 'accepted';
-        $new_admission_member->comment = $comment;
-        $this->course->admission_applicants[] = $new_admission_member;
-        $ok = $new_admission_member->store();
-        if ($ok && $this->isStudygroup()) {
-            StudygroupModel::applicationNotice($this->getId(), $user_id);
-        }
-        $cs = $this->getCourseSet();
-        if ($cs) {
-            $prio_delete = AdmissionPriority::unsetPriority($cs->getId(), $user_id, $this->getId());
-        }
-        // LOGGING
-        StudipLog::log('SEM_USER_ADD', $this->getId(), $user_id, 'accepted', 'Vorläufig akzeptiert');
-        return $ok;
-    }
-
-    /**
-     * returns courseset object for this  course
-     *
-     * @return CourseSet courseset object or null
-     */
-    public function getCourseSet()
-    {
-        if ($this->course_set === null) {
-            $this->course_set = CourseSet::getSetForCourse($this->id);
-            if ($this->course_set === null) {
-                $this->course_set = false;
-            }
-        }
-        return $this->course_set ?: null;
-    }
-
-    /**
-     * returns true if the number of participants of this course is limited
-     *
-     * @return boolean
-     */
-    public function isAdmissionEnabled()
-    {
-        $cs = $this->getCourseSet();
-        return ($cs && $cs->isSeatDistributionEnabled());
-    }
-
-    /**
-     * returns the number of free seats in the course or true if not limited
-     *
-     * @return integer
-     */
-    public function getFreeAdmissionSeats()
-    {
-        if ($this->isAdmissionEnabled()) {
-            return $this->course->getFreeSeats();
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * returns true if the course is locked
-     *
-     * @return boolean
-     */
-    public function isAdmissionLocked()
-    {
-        $cs = $this->getCourseSet();
-        return ($cs && $cs->hasAdmissionRule('LockedAdmission'));
-    }
-
-    /**
-     * returns true if the course is password protected
-     *
-     * @return boolean
-     */
-    public function isPasswordProtected()
-    {
-        $cs = $this->getCourseSet();
-        return ($cs && $cs->hasAdmissionRule('PasswordAdmission'));
-    }
-
-    /**
-     * returns array with start and endtime of course enrolment timeframe
-     * return null if there is no timeframe
-     *
-     * @return array assoc array with start_time end_time as keys timestamps as values
-     */
-    public function getAdmissionTimeFrame()
-    {
-        $cs = $this->getCourseSet();
-        return ($cs && $cs->hasAdmissionRule('TimedAdmission')) ?
-            ['start_time' => $cs->getAdmissionRule('TimedAdmission')->getStartTime(),
-                  'end_time' => $cs->getAdmissionRule('TimedAdmission')->getEndTime()] : [];
-    }
-
-    /**
-     * returns StudipModule object for given slot, null when deactivated or not available
-     *
-     * @param string $slot
-     * @return StudipModule|null
-     */
-    public function getSlotModule($slot): ?StudipModule
-    {
-        $module = 'Core' . ucfirst($slot);
-        if ($this->course->isToolActive($module)) {
-            return PluginEngine::getPlugin($module);
-        }
-        return null;
-    }
-
-    /**
-     * adds user with given id on waitinglist
-     *
-     * @param string $user_id
-     * @param string $which_end 'last' or 'first'
-     * @return integer|bool number on waitlist or false if not successful
-     */
-    public function addToWaitlist($user_id, $which_end = 'last')
-    {
-        if (AdmissionApplication::exists([$user_id, $this->id]) || CourseMember::find([$this->id, $user_id])) {
-            return false;
-        }
-        switch ($which_end) {
-            // Append users to waitlist end.
-            case 'last':
-                $maxpos = DBManager::get()->fetchColumn("SELECT MAX(`position`)
-                    FROM `admission_seminar_user`
-                    WHERE `seminar_id`=?
-                        AND `status`='awaiting'", [$this->id]);
-                $waitpos = $maxpos+1;
-                break;
-            // Prepend users to waitlist start.
-            case 'first':
-            default:
-                // Move all others on the waitlist up by the number of people to add.
-                AdmissionApplication::renumberAdmission($this->id);
-                $waitpos = 1;
-        }
-        $new_admission_member = new AdmissionApplication();
-        $new_admission_member->user_id = $user_id;
-        $new_admission_member->position = $waitpos;
-        $new_admission_member->status = 'awaiting';
-        $new_admission_member->seminar_id = $this->id;
-        if ($new_admission_member->store()) {
-            StudipLog::log('SEM_USER_ADD', $this->id, $user_id, 'awaiting', 'Auf Warteliste gesetzt, Position: ' . $waitpos);
-            $this->course->resetRelation('admission_applicants');
-            return $waitpos;
-        }
-        return false;
-    }
-}
diff --git a/lib/classes/Seminar.php b/lib/classes/Seminar.php
new file mode 100644
index 0000000..a2d69ea
--- /dev/null
+++ b/lib/classes/Seminar.php
@@ -0,0 +1,2439 @@
+<?
+# Lifter002: TODO
+# Lifter003: TEST
+# Lifter007: TODO
+# Lifter010: TODO
+/**
+ * Seminar.class.php - This class represents a Seminar in Stud.IP
+ *
+ * This class provides functions for seminar-members, seminar-dates, and seminar-modules
+ *
+ * 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.
+ *
+ * @author      Till Glöggler <tgloeggl@uni-osnabrueck.de>
+ * @author      Stefan Suchi <suchi@data-quest>
+ * @author      Suchi & Berg GmbH <info@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+require_once 'lib/dates.inc.php';
+
+class Seminar
+{
+    var $issues = null;                 // Array of Issue
+    var $irregularSingleDates = null;   // Array of SingleDates
+    var $messages = [];            // occured errors, infos, and warnings
+    var $semester = null;
+    var $filterStart = 0;
+    var $filterEnd = 0;
+    var $hasDatesOutOfDuration = -1;
+    var $message_stack = [];
+
+    var $user_number = 0;//?
+    var $commands; //?
+    var $BookedRoomsStatTemp; //???
+
+    var $request_id;//TODO
+    var $requestData;
+    var $room_request;
+
+    private $_metadate = null;               // MetaDate
+
+    private $alias = [
+        'seminar_number' => 'VeranstaltungsNummer',
+        'subtitle' => 'Untertitel',
+        'description' => 'Beschreibung',
+        'location' => 'Ort',
+        'misc' => 'Sonstiges',
+        'read_level' => 'Lesezugriff',
+        'write_level' => 'Schreibzugriff',
+        'semester_start_time' => 'start_time',
+        'semester_duration_time' => 'duration_time',
+        'form' => 'art',
+        'participants' => 'teilnehmer',
+        'requirements' => 'vorrausetzungen',
+        'orga' => 'lernorga',
+    ];
+
+    private $course = null;
+
+    private $course_set = null;
+
+    private static $seminar_object_pool;
+
+    public static function GetInstance($id = false, $refresh_cache = false)
+    {
+        if ($id) {
+            if ($refresh_cache) {
+                self::$seminar_object_pool[$id] = null;
+            }
+            if (!empty(self::$seminar_object_pool[$id]) && is_object(self::$seminar_object_pool[$id]) && self::$seminar_object_pool[$id]->getId() == $id) {
+                return self::$seminar_object_pool[$id];
+            } else {
+                self::$seminar_object_pool[$id] = new Seminar($id);
+                return self::$seminar_object_pool[$id];
+            }
+        } else {
+            return new Seminar(false);
+        }
+    }
+
+    public static function setInstance(Seminar $seminar)
+    {
+        return self::$seminar_object_pool[$seminar->id] = $seminar;
+    }
+
+    /**
+     * Constructor
+     *
+     * Pass nothing to create a seminar, or the seminar_id from an existing seminar to change or delete
+     * @access   public
+     * @param    string  $seminar_id the seminar to be retrieved
+     */
+    public function __construct($course_or_id = FALSE)
+    {
+        $course = Course::toObject($course_or_id);
+        if ($course) {
+            $this->course = $course;
+        } elseif ($course_or_id === false) {
+            $this->course = new Course();
+            $this->course->setId($this->course->getNewId());
+        } else { //hmhmhm
+            throw new Exception(sprintf(_('Fehler: Konnte das Seminar mit der ID %s nicht finden!'), $course_or_id));
+        }
+    }
+
+    public function __get($field)
+    {
+        if ($field == 'is_new') {
+            return $this->course->isNew();
+        }
+        if ($field == 'metadate') {
+            if ($this->_metadate === null) {
+                $this->_metadate = new MetaDate($this->id);
+                $this->_metadate->setSeminarStartTime($this->start_time);
+                $this->_metadate->setSeminarDurationTime($this->duration_time);
+            }
+            return $this->_metadate;
+        }
+        if(isset($this->alias[$field])) {
+            $field = $this->alias[$field];
+        }
+        return $this->course->$field;
+    }
+
+    public function __set($field, $value)
+    {
+        if(isset($this->alias[$field])) {
+            $field = $this->alias[$field];
+        }
+        if ($field == 'metadate') {
+            return $this->_metadate = $value;
+        }
+        return $this->course->$field = $value;
+    }
+
+    public function __isset($field)
+    {
+        if ($field == 'metadate') {
+            return is_object($this->_metadate);
+        }
+        if(isset($this->alias[$field])) {
+            $field = $this->alias[$field];
+        }
+        return isset($this->course->$field);
+    }
+
+    public function __call($method, $params)
+    {
+        return call_user_func_array([$this->course, $method], $params);
+    }
+
+    public static function GetSemIdByDateId($date_id)
+    {
+        $stmt = DBManager::get()->prepare("SELECT range_id FROM termine WHERE termin_id = ? LIMIT 1");
+        $stmt->execute([$date_id]);
+        return $stmt->fetchColumn();
+    }
+
+    /**
+     *
+     * creates an new id for this object
+     * @access   private
+     * @return   string  the unique id
+     */
+    public function createId()
+    {
+        return $this->course->getNewId();
+    }
+
+    public function getMembers($status = 'dozent')
+    {
+        $ret = [];
+        foreach($this->course->getMembersWithStatus($status) as $m) {
+            $ret[$m->user_id]['user_id'] = $m->user_id;
+            $ret[$m->user_id]['username'] = $m->username;
+            $ret[$m->user_id]['Vorname'] = $m->vorname;
+            $ret[$m->user_id]['Nachname'] = $m->nachname;
+            $ret[$m->user_id]['Email'] = $m->email;
+            $ret[$m->user_id]['position'] = $m->position;
+            $ret[$m->user_id]['label'] = $m->label;
+            $ret[$m->user_id]['status'] = $m->status;
+            $ret[$m->user_id]['mkdate'] = $m->mkdate;
+            $ret[$m->user_id]['fullname'] = $m->getUserFullname();
+        }
+        return $ret;
+    }
+
+    public function getAdmissionMembers($status = 'awaiting')
+    {
+        $ret = [];
+        foreach($this->course->admission_applicants->findBy('status', $status)->orderBy('position nachname') as $m) {
+            $ret[$m->user_id]['user_id'] = $m->user_id;
+            $ret[$m->user_id]['username'] = $m->username;
+            $ret[$m->user_id]['Vorname'] = $m->vorname;
+            $ret[$m->user_id]['Nachname'] = $m->nachname;
+            $ret[$m->user_id]['Email'] = $m->email;
+            $ret[$m->user_id]['position'] = $m->position;
+            $ret[$m->user_id]['status'] = $m->status;
+            $ret[$m->user_id]['mkdate'] = $m->mkdate;
+            $ret[$m->user_id]['fullname'] = $m->getUserFullname();
+        }
+        return $ret;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * return the field VeranstaltungsNummer for the seminar
+     *
+     * @return  string  the seminar-number for the current seminar
+     */
+    public function getNumber()
+    {
+        return $this->seminar_number;
+    }
+
+    public function isVisible()
+    {
+        return $this->visible;
+    }
+
+    public function getInstitutId()
+    {
+        return $this->institut_id;
+    }
+
+    public function getSemesterStartTime()
+    {
+        return $this->semester_start_time;
+    }
+
+    public function getSemesterDurationTime()
+    {
+        return $this->semester_duration_time;
+    }
+
+    public function getNextDate($return_mode = 'string')
+    {
+        $next_date = '';
+        if ($return_mode == 'int') {
+            echo __class__.'::'.__function__.', line '.__line__.', return_mode "int" ist not supported by this function!';die;
+        }
+
+        if (!$termine = SeminarDB::getNextDate($this->id))
+            return false;
+
+        foreach ($termine['termin'] as $singledate_id) {
+            $next_date .= DateFormatter::formatDateAndRoom($singledate_id, $return_mode) . '<br>';
+        }
+
+        if (!empty($termine['ex_termin'])) {
+            foreach ($termine['ex_termin'] as $ex_termin_id) {
+                $ex_termin = new SingleDate($ex_termin_id);
+                $template = $GLOBALS['template_factory']->open('dates/missing_date.php');
+                $template->formatted_date = DateFormatter::formatDateAndRoom($ex_termin_id, $return_mode);
+                $template->ex_termin = $ex_termin;
+                $missing_date = $template->render();
+
+                if (!empty($termine['termin'])) {
+                    $termin = new SingleDate($termine['termin'][0]);
+                    if ($ex_termin->getStartTime() <= $termin->getStartTime()) {
+                        return $next_date . $missing_date;
+                    } else {
+                        return $next_date;
+                    }
+                } else {
+                    return $missing_date;
+                }
+            }
+        } else {
+            return $next_date;
+        }
+
+        return false;
+    }
+
+    public function getFirstDate($return_mode = 'string') {
+        if (!$dates = SeminarDB::getFirstDate($this->id)) {
+            return false;
+        }
+
+        return DateFormatter::formatDateWithAllRooms(['termin' => $dates], $return_mode);
+    }
+
+    /**
+     * This function returns an associative array of the dates owned by this seminar
+     *
+     * @returns  mixed  a multidimensional array of seminar-dates
+     */
+    public function getUndecoratedData($filter = false)
+    {
+
+        // Caching
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache_key = 'course/undecorated_data/'. $this->id;
+
+        if ($filter) {
+            $sub_key = ($_SESSION['_language'] ?? 'none') .'/'. $this->filterStart .'-'. $this->filterEnd;
+        } else {
+            $sub_key = ($_SESSION['_language'] ?? 'none') .'/unfiltered';
+        }
+
+        $data = unserialize($cache->read($cache_key));
+
+        // build cache from scratch
+        if (empty($data) || empty($data[$sub_key])) {
+            $cycles = $this->metadate->getCycleData();
+            $dates = $this->getSingleDates($filter, $filter);
+            $rooms = [];
+
+            foreach (array_keys($cycles) as $id) {
+                if ($this->filterStart && $this->filterEnd
+                    && !$this->metadate->hasDates($id, $this->filterStart, $this->filterEnd))
+                {
+                    unset($cycles[$id]);
+                    continue;
+                }
+
+                $cycles[$id]['first_date'] = CycleDataDB::getFirstDate($id);
+                $cycles[$id]['last_date'] = CycleDataDB::getLastDate($id);
+                if (!empty($cycles[$id]['assigned_rooms'])) {
+                    foreach ($cycles[$id]['assigned_rooms'] as $room_id => $count) {
+                        if (!isset($rooms[$room_id])) {
+                            $rooms[$room_id] = 0;
+                        }
+                        $rooms[$room_id] += $count;
+                    }
+                }
+            }
+
+            // besser wieder mit direktem Query statt Objekten
+            if (is_array($cycles) && count($cycles) === 0) {
+                $cycles = false;
+            }
+
+            $ret['regular']['turnus_data'] = $cycles;
+
+            // the irregular single-dates
+            foreach ($dates as $val) {
+                $zw = [
+                    'metadate_id' => $val->getMetaDateID(),
+                    'termin_id'   => $val->getTerminID(),
+                    'date_typ'    => $val->getDateType(),
+                    'start_time'  => $val->getStartTime(),
+                    'end_time'    => $val->getEndTime(),
+                    'mkdate'      => $val->getMkDate(),
+                    'chdate'      => $val->getMkDate(),
+                    'ex_termin'   => $val->isExTermin(),
+                    'orig_ex'     => $val->isExTermin(),
+                    'range_id'    => $val->getRangeID(),
+                    'author_id'   => $val->getAuthorID(),
+                    'resource_id' => $val->getResourceID(),
+                    'raum'        => $val->getFreeRoomText(),
+                    'typ'         => $val->getDateType(),
+                    'tostring'    => $val->toString()
+                ];
+
+                if ($val->getResourceID()) {
+                    if (!isset($rooms[$val->getResourceID()])) {
+                        $rooms[$val->getResourceID()] = 0;
+                    }
+                    $rooms[$val->getResourceID()]++;
+                }
+
+                $ret['irregular'][$val->getTerminID()] = $zw;
+            }
+
+            $ret['rooms'] = $rooms;
+            $ret['ort']   = $this->location;
+
+            $data[$sub_key] = $ret;
+
+            // write data to cache
+            $cache->write($cache_key, serialize($data), 600);
+        }
+
+        return $data[$sub_key];
+    }
+
+    public function getFormattedTurnus($short = FALSE)
+    {
+        // activate this with StEP 00077
+        /* $cache = Cache::instance();
+         * $cache_key = "formatted_turnus".$this->id;
+         * if (! $return_string = $cache->read($cache_key))
+         * {
+         */
+        return $this->getDatesExport(['short' => $short, 'shrink' => true]);
+
+        // activate this with StEP 00077
+        // $cache->write($cache_key, $return_string, 60*60);
+        // }
+    }
+
+    public function getFormattedTurnusDates($short = FALSE)
+    {
+        if ($cycles = $this->metadate->getCycles()) {
+            $return_string = [];
+            foreach ($cycles as $id => $c) {
+                $return_string[$id] = $c->toString($short);
+                //hmm tja...
+                if ($c->description){
+                    $return_string[$id] .= ' ('. htmlReady($c->description) .')';
+                }
+            }
+            return $return_string;
+        } else
+            return FALSE;
+    }
+
+    public function getMetaDateCount()
+    {
+        return sizeof($this->metadate->cycles);
+    }
+
+    public function getMetaDateValue($key, $value_name)
+    {
+        return $this->metadate->cycles[$key]->$value_name;
+    }
+
+    public function setMetaDateValue($key, $value_name, $value)
+    {
+        $this->metadate->cycles[$key]->$value_name = $value;
+    }
+
+    /**
+     * restore the data
+     *
+     * the complete data of the object will be loaded from the db
+     * @access   public
+     * @throws   Exception  if there is no such course
+     * @return   boolean    always true
+     */
+    public function restore()
+    {
+        if ($this->course->id) {
+            $this->course->restore();
+        }
+        $this->irregularSingleDates = null;
+        $this->issues = null;
+        $this->_metadate = null;
+        $this->course_set = null;
+
+        return TRUE;
+    }
+
+    /**
+     * returns an array of variables from the seminar-object, excluding variables
+     * containing objects or arrays
+     *
+     * @return  array
+     */
+    public function getSettings() {
+        $settings = $this->course->toRawArray();
+        unset($settings['config']);
+        return $settings;
+    }
+
+    public function store($trigger_chdate = true)
+    {
+        // activate this with StEP 00077
+        // $cache = Cache::instance();
+        // $cache->expire("formatted_turnus".$this->id);
+
+        //check for security consistency
+        if ($this->write_level < $this->read_level) // hier wusste ein Lehrender nicht, was er tat
+            $this->write_level = $this->read_level;
+
+        if ($this->irregularSingleDates) {
+            foreach ($this->irregularSingleDates as $val) {
+                $val->store();
+            }
+        }
+
+        if ($this->issues) {
+            foreach ($this->issues as $val) {
+                $val->store();
+            }
+        }
+
+        $metadate_changed = isset($this->metadate) ? $this->metadate->store() : 0;
+        $course_changed = $this->course->store();
+        if ($metadate_changed && $trigger_chdate) {
+            return $this->course->triggerChdate();
+        } else {
+            return $course_changed ?: false;
+        }
+    }
+
+    public function setStartSemester($start)
+    {
+        global $perm;
+
+        if ($perm->have_perm('tutor') && $start != $this->semester_start_time) {
+            // logging >>>>>>
+            StudipLog::log("SEM_SET_STARTSEMESTER", $this->getId(), $start);
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+            // logging <<<<<<
+            $this->semester_start_time = $start;
+            $this->metadate->setSeminarStartTime($start);
+            $this->createMessage(_("Das Startsemester wurde geändert."));
+            $this->createInfo(_("Beachten Sie, dass Termine, die nicht mit den Einstellungen der regelmäßigen Zeit übereinstimmen (z.B. auf Grund einer Verschiebung der regelmäßigen Zeit), teilweise gelöscht sein könnten!"));
+            return TRUE;
+        }
+        return FALSE;
+    }
+
+    public function removeAndUpdateSingleDates()
+    {
+        SeminarCycleDate::removeOutRangedSingleDates(
+            $this->semester_start_time,
+            $this->getEndSemesterVorlesEnde(),
+            $this->id
+        );
+
+        foreach ($this->metadate->cycles as $key => $val) {
+            $this->metadate->cycles[$key]->readSingleDates();
+            $this->metadate->createSingleDates($key);
+            $this->metadate->cycles[$key]->termine = NULL;
+        }
+        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+    }
+
+    public function getStartSemester()
+    {
+        return $this->semester_start_time;
+    }
+
+    /*
+     * setEndSemester
+     * @param   end integer 0 (one Semester), -1 (eternal), or timestamp of last happening semester
+     * @returns TRUE on success, FALSE on failure
+     */
+    public function setEndSemester($end)
+    {
+        global $perm;
+
+        $previousEndSemester = $this->getEndSemester();     // save the end-semester before it is changed, so we can choose lateron in which semesters we need to be rebuilt the SingleDates
+
+        if ($end != $this->getEndSemester()) {  // only change Duration if it differs from the current one
+
+            if ($end == 0) {                    // the seminar takes place just in the selected start-semester
+                $this->semester_duration_time = 0;
+                $this->metadate->setSeminarDurationTime(0);
+                // logging >>>>>>
+                StudipLog::log("SEM_SET_ENDSEMESTER", $this->getId(), $end, 'Laufzeit: 1 Semester');
+                // logging <<<<<<
+            } else if ($end == -1) {    // the seminar takes place in every semester above and including the start-semester
+                // logging >>>>>>
+                StudipLog::log("SEM_SET_ENDSEMESTER", $this->getId(), $end, 'Laufzeit: unbegrenzt');
+                // logging <<<<<<
+                $this->semester_duration_time = -1;
+                $this->metadate->setSeminarDurationTime(-1);
+                SeminarCycleDate::removeOutRangedSingleDates(
+                    $this->semester_start_time,
+                    $this->getEndSemesterVorlesEnde(),
+                    $this->id
+                );
+            } else {                                    // the seminar takes place  between the selected start~ and end-semester
+                // logging >>>>>>
+                StudipLog::log("SEM_SET_ENDSEMESTER", $this->getId(), $end);
+                // logging <<<<<<
+                $this->semester_duration_time = $end - $this->semester_start_time;  // the duration is stored, not the real end-point
+                $this->metadate->setSeminarDurationTime($this->semester_duration_time);
+            }
+
+            $this->createMessage(_("Die Dauer wurde geändert."));
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+
+            /*
+             * If the duration has been changed, we have to create new SingleDates
+             * if the new duration is longer than the previous one
+             */
+            if ( ($previousEndSemester != -1) && ( ($previousEndSemester < $this->getEndSemester()) || (($previousEndSemester == 0) && ($this->getEndSemester() == -1) ) )) {
+                // if the previous duration was unlimited, the only option choosable is
+                // a shorter duration then 'ever', so there cannot be any new SingleDates
+
+                // special case: if the previous selection was 'one semester' and the new one is 'eternal',
+                // than we have to find out the end of the only semester, the start-semester
+                if ($previousEndSemester == 0) {
+                    $startAfterTimeStamp = $this->course->start_semester->ende;
+                } else {
+                    $startAfterTimeStamp = $previousEndSemester;
+                }
+
+                foreach ($this->metadate->cycles as $key => $val) {
+                    $this->metadate->createSingleDates(['metadate_id' => $key, 'startAfterTimeStamp' => $startAfterTimeStamp]);
+                    $this->metadate->cycles[$key]->termine = NULL;  // emtpy the SingleDates for each cycle, so that SingleDates, which were not in the current view, are not loaded and therefore should not be visible
+                }
+            }
+        }
+
+        return TRUE;
+    }
+
+    /*
+     * getEndSemester
+     * @returns 0 (one Semester), -1 (eternal), or TimeStamp of last Semester for this Seminar
+     */
+    public function getEndSemester()
+    {
+        if ($this->semester_duration_time == 0) return 0;                                       // seminar takes place only in the start-semester
+        if ($this->semester_duration_time == -1) return -1;                                 // seminar takes place eternally
+        return $this->semester_start_time + $this->semester_duration_time;  // seminar takes place between start~ and end-semester
+    }
+
+    public function getEndSemesterVorlesEnde()
+    {
+        if ($this->semester_duration_time == -1) {
+            $semesters = Semester::getAll();
+            $very_last_semester = array_pop($semesters);
+            return $very_last_semester->vorles_ende;
+        }
+        return $this->course->end_semester->vorles_ende;
+    }
+
+    /**
+     * return the name of the seminars start-semester
+     *
+     * @return  string  the name of the start-semester or false if there is no start-semester
+     */
+    public function getStartSemesterName()
+    {
+        return $this->course->start_semester->name;
+    }
+
+    /**
+     * return an array of singledate-objects for the submitted cycle identified by metadate_id
+     *
+     * @param  string  $metadate_id  the id identifying the cycle
+     *
+     * @return mixed   an array of singledate-objects
+     */
+    public function readSingleDatesForCycle($metadate_id)
+    {
+        return $this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
+    }
+
+    public function readSingleDates($force = FALSE, $filter = FALSE)
+    {
+        if (!$force) {
+            if (is_array($this->irregularSingleDates)) {
+                return TRUE;
+            }
+        }
+        $this->irregularSingleDates = [];
+
+        if ($filter) {
+            $data = SeminarDB::getSingleDates($this->id, $this->filterStart, $this->filterEnd);
+        } else {
+            $data = SeminarDB::getSingleDates($this->id);
+        }
+
+        foreach ($data as $val) {
+            unset($termin);
+            $termin = new SingleDate();
+            $termin->fillValuesFromArray($val);
+            $this->irregularSingleDates[$val['termin_id']] =& $termin;
+        }
+    }
+
+    public function &getSingleDate($singleDateID, $cycle_id = '')
+    {
+        if ($cycle_id == '') {
+            $this->readSingleDates();
+            return $this->irregularSingleDates[$singleDateID];
+        } else {
+            $dates = $this->metadate->getSingleDates($cycle_id, $this->filterStart, $this->filterEnd);
+            $data =& $dates;
+            return $data[$singleDateID];
+        }
+    }
+
+    public function &getSingleDates($filter = false, $force = false, $include_deleted_dates = false)
+    {
+        $this->readSingleDates($force, $filter);
+        if (!$include_deleted_dates) {
+            return $this->irregularSingleDates;
+        } else {
+            $deleted_dates = [];
+            foreach (SeminarDB::getDeletedSingleDates($this->getId(), $this->filterStart, $this->filterEnd) as $val) {
+                $termin = new SingleDate();
+                $termin->fillValuesFromArray($val);
+                $deleted_dates[$val['termin_id']] = $termin;
+            }
+            $dates = array_merge($this->irregularSingleDates, $deleted_dates);
+            uasort($dates, function($a,$b) {
+                    if ($a->getStartTime() == $b->getStartTime()) return 0;
+                    return $a->getStartTime() < $b->getStartTime() ? -1 : 1;}
+            );
+            return $dates;
+        }
+    }
+
+    public function getCycles()
+    {
+        return $this->metadate->getCycles();
+    }
+
+    public function &getSingleDatesForCycle($metadate_id)
+    {
+        if (!$this->metadate->cycles[$metadate_id]->termine) {
+            $this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
+            if (!$this->metadate->cycles[$metadate_id]->termine) {
+                $this->readSingleDates();
+                $this->metadate->createSingleDates($metadate_id, $this->irregularSingleDates);
+                $this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
+            }
+            //$this->metadate->readSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
+        }
+        $dates = $this->metadate->getSingleDates($metadate_id, $this->filterStart, $this->filterEnd);
+        return $dates;
+    }
+
+    public function readIssues($force = false)
+    {
+        if (!is_array($this->issues) || $force) {
+            $this->issues = [];
+            $data = SeminarDB::getIssues($this->id);
+
+            foreach ($data as $val) {
+                unset($issue);
+                $issue = new Issue();
+                $issue->fillValuesFromArray($val);
+                $this->issues[$val['issue_id']] =& $issue;
+            }
+        }
+    }
+
+    public function addSingleDate(&$singledate)
+    {
+        // logging >>>>>>
+        StudipLog::log("SEM_ADD_SINGLEDATE", $this->getId(), $singledate->toString(), 'SingleDateID: '.$singledate->getTerminID());
+        // logging <<<<<<
+
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache->expire('course/undecorated_data/'. $this->getId());
+
+        $this->readSingleDates();
+        $this->irregularSingleDates[$singledate->getSingleDateID()] =& $singledate;
+        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+        return TRUE;
+    }
+
+    public function addIssue(&$issue)
+    {
+        $this->readIssues();
+        if ($issue instanceof Issue) {
+            $max = -1;
+            if (is_array($this->issues)) foreach ($this->issues as $val) {
+                if ($val->getPriority() > $max) {
+                    $max = $val->getPriority();
+                }
+            }
+            $max++;
+            $issue->setPriority($max);
+            $this->issues[$issue->getIssueID()] =& $issue;
+            return TRUE;
+        } else {
+            return FALSE;
+        }
+    }
+
+    public function deleteSingleDate($date_id, $cycle_id = '')
+    {
+        $this->readSingleDates();
+        // logging >>>>>>
+        StudipLog::log("SEM_DELETE_SINGLEDATE",$date_id, $this->getId(), 'Cycle_id: '.$cycle_id);
+        // logging <<<<<<
+        if ($cycle_id == '') {
+            $this->irregularSingleDates[$date_id]->delete(true);
+            unset ($this->irregularSingleDates[$date_id]);
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+            return TRUE;
+        } else {
+            $this->metadate->deleteSingleDate($cycle_id, $date_id, $this->filterStart, $this->filterEnd);
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+            return TRUE;
+        }
+    }
+
+    public function cancelSingleDate($date_id, $cycle_id = '')
+    {
+        if ($cycle_id) {
+            return $this->deleteSingleDate($date_id, $cycle_id);
+        }
+        $this->readSingleDates();
+        // logging >>>>>>
+        StudipLog::log("SEM_DELETE_SINGLEDATE",$date_id, $this->getId(), 'appointment cancelled');
+        // logging <<<<<<
+        $this->irregularSingleDates[$date_id]->setExTermin(true);
+        $this->irregularSingleDates[$date_id]->store();
+        unset ($this->irregularSingleDates[$date_id]);
+        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+        return TRUE;
+    }
+
+    public function unDeleteSingleDate($date_id, $cycle_id = '')
+    {
+        // logging >>>>>>
+        StudipLog::log("SEM_UNDELETE_SINGLEDATE",$date_id, $this->getId(), 'Cycle_id: '.$cycle_id);
+        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+        // logging <<<<<<
+        if ($cycle_id == '') {
+            $termin = new SingleDate($date_id);
+            if (!$termin->isExTermin()) {
+                return false;
+            }
+            $termin->setExTermin(false);
+            $termin->store();
+            return true;
+        } else {
+            return $this->metadate->unDeleteSingleDate($cycle_id, $date_id, $this->filterStart, $this->filterEnd);
+        }
+    }
+
+    /**
+     * return all stacked messages as a multidimensional array
+     *
+     * The array has the following structure:
+     *   array( 'type' => ..., 'message' ... )
+     * where type is one of error, info and success
+     *
+     * @return mixed the array of stacked messages
+     */
+    public function getStackedMessages()
+    {
+        if ( is_array( $this->message_stack ) ) {
+            $ret = [];
+
+            // cycle through message types and set title and details appropriate
+            foreach ($this->message_stack as $type => $messages ) {
+                switch ( $type ) {
+                    case 'error':
+                        $ret['error'] = [
+                            'title'   => _("Es sind Fehler/Probleme aufgetreten!"),
+                            'details' => $this->message_stack['error']
+                        ];
+                        break;
+
+                    case 'info':
+                        $ret['info'] = [
+                            'title'   => implode('<br>', $this->message_stack['info']),
+                            'details' => []
+                        ];
+                        break;
+
+                    case 'success':
+                        $ret['success'] = [
+                            'title'   => _("Ihre Änderungen wurden gespeichert!"),
+                            'details' => $this->message_stack['success']
+                        ];
+                        break;
+                }
+            }
+
+            return $ret;
+        }
+
+        return false;
+    }
+
+    /**
+     * return the next stacked messag-string
+     *
+     * @return string a message-string
+     */
+    public function getNextMessage()
+    {
+        if ($this->messages[0]) {
+            $ret = $this->messages[0];
+            unset ($this->messages[0]);
+            sort($this->messages);
+            return $ret;
+        }
+        return FALSE;
+    }
+
+    /**
+     * stack an error-message
+     *
+     * @param string $text the message to stack
+     */
+    public function createError($text)
+    {
+        $this->messages[] = 'error§'.$text.'§';
+        $this->message_stack['error'][] = $text;
+    }
+
+    /**
+     * stack an info-message
+     *
+     * @param string $text the message to stack
+     */
+    public function createInfo($text)
+    {
+        $this->messages[] = 'info§'.$text.'§';
+        $this->message_stack['info'][] = $text;
+    }
+
+    /**
+     * stack a success-message
+     *
+     * @param string $text the message to stack
+     */
+    public function createMessage($text)
+    {
+        $this->messages[] = 'msg§'.$text.'§';
+        $this->message_stack['success'][] = $text;
+    }
+
+    /**
+     * add an array of messages to the message-stack
+     *
+     * @param mixed $messages array of pre-marked message-strings
+     * @param bool returns true on success
+     */
+    public function appendMessages( $messages )
+    {
+        if (!is_array($messages)) return false;
+
+        foreach ( $messages as $type => $msgs ) {
+            foreach ($msgs as $msg) {
+                $this->message_stack[$type][] = $msg;
+            }
+        }
+        return true;
+    }
+
+    public function addCycle($data = [])
+    {
+        $new_id = $this->metadate->addCycle($data);
+        if($new_id){
+            $this->setStartWeek($data['startWeek'], $new_id);
+            $this->setTurnus($data['turnus'], $new_id);
+        }
+        // logging >>>>>>
+        if($new_id){
+            $cycle_info = $this->metadate->cycles[$new_id]->toString();
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+            StudipLog::log("SEM_ADD_CYCLE", $this->getId(), NULL, $cycle_info, '<pre>'.print_r($data,true).'</pre>');
+        }
+        // logging <<<<<<
+        return $new_id;
+    }
+
+    /**
+     * Change a regular timeslot of the seminar. The data is passed as an array
+     * conatining the following fields:
+     *   start_stunde, start_minute, end_stunde, end_minute
+     *   description, turnus, startWeek, day, sws
+     *
+     * @param array $data the cycle-data
+     *
+     * @return void
+     */
+    public function editCycle($data = [])
+    {
+        $cycle = $this->metadate->cycles[$data['cycle_id']];
+        $new_start = mktime($data['start_stunde'], $data['start_minute']);
+        $new_end = mktime($data['end_stunde'], $data['end_minute']);
+        $old_start = mktime($cycle->getStartStunde(),$cycle->getStartMinute());
+        $old_end = mktime($cycle->getEndStunde(), $cycle->getEndMinute());
+        $do_changes = false;
+
+        // check, if the new timeslot exceeds the old one
+        if (($new_start < $old_start) || ($new_end > $old_end) || ($data['day'] != $cycle->day) ) {
+            $has_bookings = false;
+
+            // check, if there are any booked rooms
+            foreach($cycle->getSingleDates() as $singleDate) {
+                if ($singleDate->getStarttime() > (time() - 3600) && $singleDate->hasRoom()) {
+                    $has_bookings = true;
+                    break;
+                }
+            }
+
+            // if the timeslot exceeds the previous one and has some booked rooms
+            // they would be lost, so ask the user for permission to do so.
+            if (!$data['really_change'] && $has_bookings) {
+                $link_params = [
+                    'editCycle_x' => '1',
+                    'editCycle_y' => '1',
+                    'cycle_id' => $data['cycle_id'],
+                    'start_stunde' => $data['start_stunde'],
+                    'start_minute' => $data['start_minute'],
+                    'end_stunde' => $data['end_stunde'],
+                    'end_minute' => $data['end_minute'],
+                    'day' => $data['day'],
+                    'really_change' => 'true'
+                ];
+                $question = _("Wenn Sie die regelmäßige Zeit auf %s ändern, verlieren Sie die Raumbuchungen für alle in der Zukunft liegenden Termine!")
+                    ."\n". _("Sind Sie sicher, dass Sie die regelmäßige Zeit ändern möchten?");
+                $question_time = '**'. strftime('%A', $data['day']) .', '. $data['start_stunde'] .':'. $data['start_minute']
+                    .' - '. $data['end_stunde'] .':'. $data['end_minute'] .'**';
+
+                echo (string)QuestionBox::create(
+                    sprintf($question, $question_time),
+                    URLHelper::getURL('', $link_params)
+                );
+
+            } else {
+                $do_changes = true;
+            }
+        } else {
+            $do_changes = true;
+        }
+
+        $messages = false;
+        $same_time = false;
+
+        // only apply changes, if the user approved the change or
+        // the change does not need any approval
+        if ($do_changes) {
+            if ($data['description'] != $cycle->getDescription()) {
+                $this->createMessage(_("Die Beschreibung des regelmäßigen Eintrags wurde geändert."));
+                $message = true;
+                $do_changes = true;
+            }
+
+            if ($old_start == $new_start && $old_end == $new_end) {
+                $same_time = true;
+            }
+            if ($data['startWeek'] != $cycle->week_offset) {
+                $this->setStartWeek($data['startWeek'], $cycle->metadate_id);
+                $message = true;
+                $do_changes = true;
+            }
+            if ($data['turnus'] != $cycle->cycle) {
+                $this->setTurnus($data['turnus'], $cycle->metadate_id);
+                $message = true;
+                $do_changes = true;
+            }
+            if ($data['day'] != $cycle->day) {
+                $message = true;
+                $same_time = false;
+                $do_changes = true;
+            }
+            if (round(str_replace(',','.', $data['sws']),1) != $cycle->sws) {
+                $cycle->sws = $data['sws'];
+                $this->createMessage(_("Die Semesterwochenstunden für Lehrende des regelmäßigen Eintrags wurden geändert."));
+                $message = true;
+                $do_changes = true;
+            }
+
+            $change_from = $cycle->toString();
+            if ($this->metadate->editCycle($data)) {
+                if (!$same_time) {
+                    // logging >>>>>>
+                    StudipLog::log("SEM_CHANGE_CYCLE", $this->getId(), NULL, $change_from .' -> '. $cycle->toString());
+                    NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+                    // logging <<<<<<
+                    $this->createMessage(sprintf(_("Die regelmäßige Veranstaltungszeit wurde auf \"%s\" für alle in der Zukunft liegenden Termine geändert!"),
+                        '<b>'.getWeekday($data['day']) . ', ' . $data['start_stunde'] . ':' . $data['start_minute'].' - '.
+                        $data['end_stunde'] . ':' . $data['end_minute'] . '</b>'));
+                    $message = true;
+                }
+            } else {
+                if (!$same_time) {
+                    $this->createInfo(sprintf(_("Die regelmäßige Veranstaltungszeit wurde auf \"%s\" geändert, jedoch gab es keine Termine die davon betroffen waren."),
+                        '<b>'.getWeekday($data['day']) . ', ' . $data['start_stunde'] . ':' . $data['start_minute'].' - '.
+                        $data['end_stunde'] . ':' . $data['end_minute'] . '</b>'));
+                    $message = true;
+                }
+            }
+            $this->metadate->sortCycleData();
+
+            if (!$message) {
+                $this->createInfo("Sie haben keine Änderungen vorgenommen!");
+            }
+        }
+    }
+
+    public function deleteCycle($cycle_id)
+    {
+        // logging >>>>>>
+        $cycle_info = $this->metadate->cycles[$cycle_id]->toString();
+        StudipLog::log("SEM_DELETE_CYCLE", $this->getId(), NULL, $cycle_info);
+        NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+        // logging <<<<<<
+        return $this->metadate->deleteCycle($cycle_id);
+    }
+
+    public function setTurnus($turnus, $metadate_id = false)
+    {
+        if ($this->metadate->getTurnus($metadate_id) != $turnus) {
+            $this->metadate->setTurnus($turnus, $metadate_id);
+            $key = $metadate_id ? $metadate_id : $this->metadate->getFirstMetadate()->metadate_id;
+            $this->createMessage(sprintf(_("Der Turnus für den Termin %s wurde geändert."), $this->metadate->cycles[$key]->toString()));
+            $this->metadate->createSingleDates($key);
+            $this->metadate->cycles[$key]->termine = null;
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+        }
+        return TRUE;
+    }
+
+    public function getTurnus($metadate_id = false)
+    {
+        return $this->metadate->getTurnus($metadate_id);
+    }
+
+
+    /**
+     * get StatOfNotBookedRooms returns an array:
+     * open:        number of rooms with no booking
+     * all:         number of singleDates, which can have a booking
+     * open_rooms:  array of singleDates which have no booking
+     *
+     * @param String $cycle_id Id of cycle
+     * @return array as described above
+     */
+    public function getStatOfNotBookedRooms($cycle_id)
+    {
+        if (!isset($this->BookedRoomsStatTemp[$cycle_id])) {
+            $this->BookedRoomsStatTemp[$cycle_id] = SeminarDB::getStatOfNotBookedRooms($cycle_id, $this->id, $this->filterStart, $this->filterEnd);
+        }
+        return $this->BookedRoomsStatTemp[$cycle_id];
+    }
+
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    public function getBookedRoomsTooltip($cycle_id)
+    {
+        $stat = $this->getStatOfNotBookedRooms($cycle_id);
+        $pattern = '%s , %s, %s-%s <br />';
+        $return = '';
+        if ($stat['open'] > 0 && $stat['open'] !== $stat['all']) {
+            $return = _('Folgende Termine haben keine Raumbuchung:') . '<br />';
+
+            foreach ($stat['open_rooms'] as $aSingleDate) {
+                $return .= sprintf($pattern,strftime('%a', $aSingleDate['date']),
+                    strftime('%d.%m.%Y', $aSingleDate['date']),
+                    strftime('%H:%M', $aSingleDate['date']),
+                    strftime('%H:%M', $aSingleDate['end_time']));
+            }
+        }
+
+        // are there any dates with declined room-requests?
+        if ($stat['declined'] > 0) {
+            $return .= _('Folgende Termine haben eine abgelehnte Raumanfrage') . '<br />';
+            foreach ($stat['declined_dates'] as $aSingleDate) {
+                $return .= sprintf($pattern,strftime('%a', $aSingleDate['date']),
+                    strftime('%d.%m.%Y', $aSingleDate['date']),
+                    strftime('%H:%M', $aSingleDate['date']),
+                    strftime('%H:%M', $aSingleDate['end_time']));
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param $cycle_id
+     * @return string
+     */
+    public function getCycleColorClass($cycle_id)
+    {
+        if (Config::get()->RESOURCES_ENABLE && Config::get()->RESOURCES_ENABLE_BOOKINGSTATUS_COLORING) {
+            if (!$this->metadate->hasDates($cycle_id, $this->filterStart, $this->filterEnd)) {
+                return 'red';
+            }
+
+            $stat = $this->getStatOfNotBookedRooms($cycle_id);
+
+            if ($stat['open'] > 0 && $stat['open'] == $stat['all']) {
+                return 'red';
+            }
+            if ($stat['open'] > 0) {
+                return 'yellow ';
+            }
+            return 'green ';
+        }
+
+        return '';
+    }
+
+    public function &getIssues($force = false)
+    {
+        $this->readIssues($force);
+        $this->renumberIssuePrioritys();
+        if (is_array($this->issues)) {
+            uasort($this->issues, function ($a, $b) {
+                return $a->getPriority() - $b->getPriority();
+            });
+        }
+        return $this->issues;
+    }
+
+    public function deleteIssue($issue_id)
+    {
+        $this->issues[$issue_id]->delete();
+        unset($this->issues[$issue_id]);
+        return TRUE;
+    }
+
+    public function &getIssue($issue_id)
+    {
+        $this->readIssues();
+        return $this->issues[$issue_id];
+    }
+
+    /*
+     * changeIssuePriority
+     *
+     * changes an issue with an given id to a new priority
+     *
+     * @param
+     * issue_id             the issue_id of the issue to be changed
+     * new_priority     the new priority
+     */
+    public function changeIssuePriority($issue_id, $new_priority)
+    {
+        /* REMARK:
+         * This function only works, when an issue is moved ONE slote higher or lower
+         * It does NOT work with ARBITRARY movements!
+         */
+        $this->readIssues();
+        $old_priority = $this->issues[$issue_id]->getPriority();    // get old priority, so we can just exchange prioritys of two issues
+        foreach ($this->issues as $id => $issue) {                              // search for the concuring issue
+            if ($issue->getPriority() == $new_priority) {
+                $this->issues[$id]->setPriority($old_priority);             // the concuring issue gets the old id of the changed issue
+                $this->issues[$id]->store();                                                    // ###store_problem###
+            }
+        }
+
+        $this->issues[$issue_id]->setPriority($new_priority);           // changed issue gets the new priority
+        $this->issues[$issue_id]->store();                                              // ###store_problem###
+
+    }
+
+    public function renumberIssuePrioritys()
+    {
+        if (is_array($this->issues)) {
+
+            $sorter = [];
+            foreach ($this->issues as $id => $issue) {
+                $sorter[$id] = $issue->getPriority();
+            }
+            asort($sorter);
+            $i = 0;
+            foreach ($sorter as $id => $old_priority) {
+                $this->issues[$id]->setPriority($i);
+                $i++;
+            }
+        }
+    }
+
+    public function autoAssignIssues($themen, $cycle_id)
+    {
+        $this->metadate->cycles[$cycle_id]->autoAssignIssues($themen, $this->filterStart, $this->filterEnd);
+    }
+
+
+    public function applyTimeFilter($start, $end)
+    {
+        $this->filterStart = $start;
+        $this->filterEnd = $end;
+    }
+
+    public function setFilter($timestamp)
+    {
+        if ($timestamp == 'all') {
+            $_SESSION['raumzeitFilter'] = 'all';
+            $this->applyTimeFilter(0, 0);
+        } else {
+            $filterSemester = Semester::findByTimestamp($timestamp);
+            $_SESSION['raumzeitFilter'] = $filterSemester->beginn;
+            $this->applyTimeFilter($filterSemester->beginn, $filterSemester->ende);
+        }
+    }
+
+    public function registerCommand($command, $function)
+    {
+        $this->commands[$command] = $function;
+    }
+
+    public function processCommands()
+    {
+        global $cmd;
+
+        // workaround for multiple submit-buttons with new Button-API
+        foreach ($this->commands as $r_cmd => $func) {
+            if (Request::submitted($r_cmd)) {
+                $cmd = $r_cmd;
+            }
+        }
+
+        if (!isset($cmd) && Request::option('cmd')) $cmd = Request::option('cmd');
+        if (!isset($cmd)) return FALSE;
+
+        if (isset($this->commands[$cmd])) {
+            call_user_func($this->commands[$cmd], $this);
+        }
+    }
+
+    public function getFreeTextPredominantRoom($cycle_id)
+    {
+        if (!($room = $this->metadate->cycles[$cycle_id]->getFreeTextPredominantRoom($this->filterStart, $this->filterEnd))) {
+            return FALSE;
+        }
+        return $room;
+    }
+
+    public function getPredominantRoom($cycle_id, $list = FALSE)
+    {
+        if (!($rooms = $this->metadate->cycles[$cycle_id]->getPredominantRoom($this->filterStart, $this->filterEnd))) {
+            return FALSE;
+        }
+        if ($list) {
+            return $rooms;
+        } else {
+            return $rooms[0];
+        }
+    }
+
+
+    public function hasDatesOutOfDuration($force = false)
+    {
+        if ($this->hasDatesOutOfDuration == -1 || $force) {
+            $this->hasDatesOutOfDuration = SeminarDB::hasDatesOutOfDuration($this->getStartSemester(), $this->getEndSemesterVorlesEnde(), $this->id);
+        }
+        return $this->hasDatesOutOfDuration;
+    }
+
+    public function getStartWeek($metadate_id = false)
+    {
+        return $this->metadate->getStartWoche($metadate_id);
+    }
+
+    public function setStartWeek($week, $metadate_id = false)
+    {
+        if ($this->metadate->getStartWoche($metadate_id) == $week) {
+            return FALSE;
+        } else {
+            $this->metadate->setStartWoche($week, $metadate_id);
+            $key = $metadate_id ? $metadate_id : $this->metadate->getFirstMetadate()->metadate_id;
+            $this->createMessage(sprintf(_("Die Startwoche für den Termin %s wurde geändert."), $this->metadate->cycles[$key]->toString()));
+            $this->metadate->createSingleDates($key);
+            $this->metadate->cycles[$key]->termine = null;
+            NotificationCenter::postNotification("CourseDidChangeSchedule", $this);
+        }
+    }
+
+
+    /**
+     * instance method
+     *
+     * returns number of participants for each usergroup in seminar,
+     * total, lecturers, tutors, authors, users
+     *
+     * @param string (optional) return count only for given usergroup
+     *
+     * @return array <description>
+     */
+
+    public function getNumberOfParticipants()
+    {
+        $args = func_get_args();
+        array_unshift($args, $this->id);
+        return call_user_func_array(["Seminar", "getNumberOfParticipantsBySeminarId"], $args);
+    }
+
+    /**
+     * class method
+     *
+     * returns number of participants for each usergroup in given seminar,
+     * total, lecturers, tutors, authors, users
+     *
+     * @param string seminar_id
+     *
+     * @param string (optional) return count only for given usergroup
+     *
+     * @return array <description>
+     */
+
+    public function getNumberOfParticipantsBySeminarId($sem_id)
+    {
+        $db = DBManager::get();
+        $stmt1 = $db->prepare("SELECT
+                               COUNT(Seminar_id) AS anzahl,
+                               COUNT(IF(status='dozent',Seminar_id,NULL)) AS anz_dozent,
+                               COUNT(IF(status='tutor',Seminar_id,NULL)) AS anz_tutor,
+                               COUNT(IF(status='autor',Seminar_id,NULL)) AS anz_autor,
+                               COUNT(IF(status='user',Seminar_id,NULL)) AS anz_user
+                               FROM seminar_user
+                               WHERE Seminar_id = ?
+                               GROUP BY Seminar_id");
+        $stmt1->execute([$sem_id]);
+        $numbers = $stmt1->fetch(PDO::FETCH_ASSOC);
+
+        $stmt2 = $db->prepare("SELECT COUNT(*) as anzahl
+                               FROM admission_seminar_user
+                               WHERE seminar_id = ?
+                               AND status = 'accepted'");
+        $stmt2->execute([$sem_id]);
+        $acceptedUsers = $stmt2->fetch(PDO::FETCH_ASSOC);
+
+
+        $count = 0;
+        if ($numbers["anzahl"]) {
+            $count += $numbers["anzahl"];
+        }
+        if ($acceptedUsers["anzahl"]) {
+            $count += $acceptedUsers["anzahl"];
+        }
+
+        $participant_count = [];
+        $participant_count['total']     = $count;
+        $participant_count['lecturers'] = $numbers['anz_dozent'] ? (int) $numbers['anz_dozent'] : 0;
+        $participant_count['tutors']    = $numbers['anz_tutor']  ? (int) $numbers['anz_tutor']  : 0;
+        $participant_count['authors']   = $numbers['anz_autor']  ? (int) $numbers['anz_autor']  : 0;
+        $participant_count['users']     = $numbers['anz_user']   ? (int) $numbers['anz_user']   : 0;
+
+        // return specific parameter if
+        $params = func_get_args();
+        if (sizeof($params) > 1) {
+            if (in_array($params[1], array_keys($participant_count))) {
+                return $participant_count[$params[1]];
+            } else {
+                trigger_error(get_class($this)."::__getParticipantInfos - unknown parameter requested");
+            }
+        }
+
+        return $participant_count;
+    }
+
+
+    /**
+     * Returns the IDs of this course's study areas.
+     *
+     * @return array     an array of IDs
+     */
+    public function getStudyAreas()
+    {
+        $stmt = DBManager::get()->prepare("SELECT DISTINCT sem_tree_id ".
+            "FROM seminar_sem_tree ".
+            "WHERE seminar_id=?");
+
+        $stmt->execute([$this->id]);
+        return $stmt->fetchAll(PDO::FETCH_COLUMN, 0);
+    }
+
+    /**
+     * Sets the study areas of this course.
+     *
+     * @param  array      an array of IDs
+     *
+     * @return void
+     */
+    public function setStudyAreas($selected)
+    {
+        $old = $this->getStudyAreas();
+        $sem_tree = TreeAbstract::GetInstance("StudipSemTree");
+        $removed = array_diff($old, $selected);
+        $added = array_diff($selected, $old);
+        $count_removed = 0;
+        $count_added = 0;
+        foreach($removed as $one){
+            $count_removed += $sem_tree->DeleteSemEntries($one, $this->getId());
+        }
+        foreach($added as $one){
+            $count_added += $sem_tree->InsertSemEntry($one, $this->getId());
+        }
+        if ($count_added || $count_removed) {
+            NotificationCenter::postNotification("CourseDidChangeStudyArea", $this);
+        }
+        return count($old) + $count_added - $count_removed;
+    }
+
+    /**
+     * @return boolean    returns TRUE if this course is publicly visible,
+     *                    FALSE otherwise
+     */
+    public function isPublic()
+    {
+        return Config::get()->ENABLE_FREE_ACCESS && $this->read_level == 0;
+    }
+
+    /**
+     * @return boolean  returns TRUE if this course is a studygroup,
+     *                  FALSE otherwise
+     */
+    public function isStudygroup()
+    {
+        global $SEM_CLASS, $SEM_TYPE;
+        return $SEM_CLASS[$SEM_TYPE[$this->status]["class"]]["studygroup_mode"];
+    }
+
+    /**
+     * @return int      returns default colour group for new members (shown in meine_seminare.php)
+     *
+     **/
+    public function getDefaultGroup()
+    {
+        if ($this->isStudygroup()) {
+            return 8;
+        } else {
+            return select_group ($this->semester_start_time);
+        }
+    }
+
+
+    /**
+     *  Deletes the current seminar
+     *
+     * @return void       returns success-message if seminar could be deleted
+     *                    otherwise an  error-message
+     */
+
+    public function delete()
+    {
+        $s_id = $this->id;
+
+        // Delete that Seminar.
+
+        // Alle Benutzer aus dem Seminar rauswerfen.
+        $db_ar = CourseMember::deleteBySQL('Seminar_id = ?', [$s_id]);
+        if ($db_ar > 0) {
+            $this->createMessage(sprintf(_("%s Teilnehmende und Lehrende archiviert."), $db_ar));
+        }
+
+        // Alle Benutzer aus Wartelisten rauswerfen
+        AdmissionApplication::deleteBySQL('seminar_id = ?', [$s_id]);
+
+        // Alle beteiligten Institute rauswerfen
+        $query = "DELETE FROM seminar_inst WHERE Seminar_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$s_id]);
+        if (($db_ar = $statement->rowCount()) > 0) {
+            $this->createMessage(sprintf(_("%s Zuordnungen zu Einrichtungen archiviert."), $db_ar));
+        }
+
+        // user aus den Statusgruppen rauswerfen
+        $count = Statusgruppen::deleteBySQL('range_id = ?', [$s_id]);
+        if ($count > 0) {
+            $this->createMessage(sprintf(_('%s Funktionen/Gruppen gelöscht.'), $count));
+        }
+
+        // seminar_sem_tree entries are deleted automatically on deletion of the Course object.
+
+        // Alle Termine mit allem was dranhaengt zu diesem Seminar loeschen.
+        if (($db_ar = SingleDateDB::deleteAllDates($s_id)) > 0) {
+            $this->createMessage(sprintf(_("%s Veranstaltungstermine archiviert."), $db_ar));
+        }
+
+        //Themen
+        IssueDB::deleteAllIssues($s_id);
+
+        //Cycles
+        SeminarCycleDate::deleteBySQL('seminar_id = ' . DBManager::get()->quote($s_id));
+
+        // Alle weiteren Postings zu diesem Seminar in den Forums-Modulen löschen
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
+            $plugin->deleteContents($s_id);  // delete content irrespective of plugin-activation in the seminar
+
+            if ($plugin->isActivated($s_id)) {   // only show a message, if the plugin is activated, to not confuse the user
+                $this->createMessage(sprintf(_('Einträge in %s archiviert.'), $plugin->getPluginName()));
+            }
+        }
+
+        // Alle Pluginzuordnungen entfernen
+        PluginManager::getInstance()->deactivateAllPluginsForRange('sem', $s_id);
+
+        // Alle Dokumente zu diesem Seminar loeschen.
+        $folder = Folder::findTopFolder($s_id);
+        if($folder) {
+            if($folder->delete()) {
+                $this->createMessage(_("Dokumente und Ordner archiviert."));
+            }
+        }
+
+
+        // Freie Seite zu diesem Seminar löschen
+        $db_ar = StudipScmEntry::deleteBySQL('range_id = ?', [$s_id]);
+        if ($db_ar > 0) {
+            $this->createMessage(_("Freie Seite der Veranstaltung archiviert."));
+        }
+
+        // Alle News-Verweise auf dieses Seminar löschen
+        if ( ($db_ar = StudipNews::DeleteNewsRanges($s_id)) ) {
+            $this->createMessage(sprintf(_("%s Ankündigungen gelöscht."), $db_ar));
+        }
+        //delete entry in news_rss_range
+        StudipNews::UnsetRssId($s_id);
+
+        //kill the datafields
+        DataFieldEntry::removeAll($s_id);
+
+        //kill all wiki-pages
+        $db_wiki = WikiPage::deleteBySQL('range_id = ?', [$s_id]);
+        if ($db_wiki > 0) {
+            $this->createMessage(sprintf(_("%s Wiki-Seiten archiviert."), $db_wiki));
+        }
+
+        $query = "DELETE FROM wiki_links WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$s_id]);
+
+        // delete course config values
+        ConfigValue::deleteBySQL('range_id = ?', [$s_id]);
+
+        // kill all the ressources that are assigned to the Veranstaltung (and all the linked or subordinated stuff!)
+        if (Config::get()->RESOURCES_ENABLE) {
+            ResourceBooking::deleteBySql(
+                'range_id = :course_id',
+                [
+                    'course_id' => $s_id
+                ]
+            );
+            if ($rr = RoomRequest::existsByCourse($s_id)) {
+                RoomRequest::find($rr)->delete();
+            }
+        }
+
+        // kill virtual seminar-entries in calendar
+        $query = "DELETE FROM schedule_seminare WHERE seminar_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$s_id]);
+
+        if(Config::get()->ELEARNING_INTERFACE_ENABLE){
+            global $connected_cms;
+            $del_cms = 0;
+            $cms_types = ObjectConnections::GetConnectedSystems($s_id);
+            if(count($cms_types)){
+                foreach($cms_types as $system){
+                    ELearningUtils::loadClass($system);
+                    $del_cms += $connected_cms[$system]->deleteConnectedModules($s_id);
+                }
+                $this->createMessage(sprintf(_("%s Verknüpfungen zu externen Systemen gelöscht."), $del_cms ));
+            }
+        }
+
+        //kill the object_user_vists for this seminar
+        object_kill_visits(null, $s_id);
+
+        // Logging...
+        $query = "SELECT CONCAT(seminare.VeranstaltungsNummer, ' ', seminare.name, '(', semester_data.name, ')')
+                  FROM seminare
+                  LEFT JOIN semester_data ON (seminare.start_time = semester_data.beginn)
+                  WHERE seminare.Seminar_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$s_id]);
+        $semlogname = $statement->fetchColumn() ?: sprintf('unknown sem_id: %s', $s_id);
+
+        StudipLog::log("SEM_ARCHIVE",$s_id,NULL,$semlogname);
+        // ...logged
+
+        // delete deputies if necessary
+        Deputy::deleteByRange_id($s_id);
+
+        UserDomain::removeUserDomainsForSeminar($s_id);
+
+        AutoInsert::deleteSeminar($s_id);
+
+        //Anmeldeset Zordnung entfernen
+        $cs = $this->getCourseSet();
+        if ($cs) {
+            CourseSet::removeCourseFromSet($cs->getId(), $this->getId());
+            $cs->load();
+            if (!count($cs->getCourses())
+                && $cs->isGlobal()
+                && $cs->getUserid() != '') {
+                $cs->delete();
+            }
+        }
+        AdmissionPriority::unsetAllPrioritiesForCourse($this->getId());
+        // und das Seminar loeschen.
+        $this->course->delete();
+        $this->restore();
+        return true;
+    }
+
+    /**
+     * returns a html representation of the seminar-dates
+     *
+     * @param  array  optional variables which are passed to the template
+     * @return  string  the html-representation of the dates
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    public function getDatesHTML($params = [])
+    {
+        return $this->getDatesTemplate('dates/seminar_html.php', $params);
+    }
+
+    /**
+     * returns a representation without html of the seminar-dates
+     *
+     * @param  array  optional variables which are passed to the template
+     * @return  string  the representation of the dates without html
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    public function getDatesExport($params = [])
+    {
+        return $this->getDatesTemplate('dates/seminar_export.php', $params);
+    }
+
+    /**
+     * returns a xml-representation of the seminar-dates
+     *
+     * @param  array  optional variables which are passed to the template
+     * @return  string  the xml-representation of the dates
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    public function getDatesXML($params = [])
+    {
+        return $this->getDatesTemplate('dates/seminar_xml.php', $params);
+    }
+
+    /**
+     * returns a representation of the seminar-dates with a specifiable template
+     *
+     * @param  mixed  this can be a template-object or a string pointing to a template in path_to_studip/templates
+     * @param  array  optional parameters which are passed to the template
+     * @return  string  the template output of the dates
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    public function getDatesTemplate($template, $params = [])
+    {
+        if (!$template instanceof Flexi\Template && is_string($template)) {
+            $template = $GLOBALS['template_factory']->open($template);
+        }
+
+        if (!empty($params['semester_id'])) {
+            $semester = Semester::find($params['semester_id']);
+            if ($semester) {
+                // apply filter
+                $this->applyTimeFilter($semester->beginn, $semester->ende);
+            }
+        }
+
+        $template->dates = $this->getUndecoratedData(isset($params['semester_id']));
+        $template->seminar_id = $this->getId();
+
+        $template->set_attributes($params);
+        return trim($template->render());
+    }
+
+    /**
+     * returns an asscociative array with the attributes of the seminar depending
+     * on the field-names in the database
+     * @return array
+     */
+    public function getData()
+    {
+        $data = $this->course->toArray();
+        foreach($this->alias as $a => $o) {
+            $data[$a] = $this->course->$o;
+        }
+        return $data;
+    }
+
+    /**
+     * returns an array with all IDs of Institutes this seminar is related to
+     * @param sem_id string:    optional ID of a seminar, when null, this ID will be used
+     * @return: array of IDs (not associative)
+     */
+    public function getInstitutes($sem_id = null)
+    {
+        if (!$sem_id && $this) {
+            $sem_id = $this->id;
+        }
+
+        $query = "SELECT institut_id FROM seminar_inst WHERE seminar_id = :sem_id
+                  UNION
+                  SELECT Institut_id FROM seminare WHERE Seminar_id = :sem_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute(compact('sem_id'));
+        return $statement->fetchAll(PDO::FETCH_COLUMN);
+    }
+
+    /**
+     * set the entries for seminar_inst table in database
+     * seminare.institut_id will always be added
+     * @param institutes array: array of Institut_id's
+     * @return bool:  if something changed
+     */
+    public function setInstitutes($institutes = [])
+    {
+        if (is_array($institutes)) {
+            $institutes[] = $this->institut_id;
+            $institutes = array_unique($institutes);
+
+            $query = "SELECT institut_id FROM seminar_inst WHERE seminar_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->id]);
+            $old_inst = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+            $todelete = array_diff($old_inst, $institutes);
+
+            $query = "DELETE FROM seminar_inst WHERE seminar_id = ? AND institut_id = ?";
+            $statement = DBManager::get()->prepare($query);
+
+            foreach($todelete as $inst) {
+                $tmp_instname= get_object_name($inst, 'inst');
+                StudipLog::log('CHANGE_INSTITUTE_DATA', $this->id, $inst, 'Die beteiligte Einrichtung "'. $tmp_instname['name'] .'" wurde gelöscht.');
+                $statement->execute([$this->id, $inst]);
+                NotificationCenter::postNotification('SeminarInstitutionDidDelete', $inst, $this->id);
+
+            }
+
+            $toinsert = array_diff($institutes, $old_inst);
+
+            $query = "INSERT INTO seminar_inst (seminar_id, institut_id) VALUES (?, ?)";
+            $statement = DBManager::get()->prepare($query);
+
+            foreach($toinsert as $inst) {
+                $tmp_instname= get_object_name($inst, 'inst');
+                StudipLog::log('CHANGE_INSTITUTE_DATA', $this->id, $inst, 'Die beteiligte Einrichtung "'. $tmp_instname['name'] .'" wurde hinzugefügt.');
+                $statement->execute([$this->id, $inst]);
+                NotificationCenter::postNotification('SeminarInstitutionDidCreate', $inst, $this->id);
+            }
+            if ($todelete || $toinsert) {
+                NotificationCenter::postNotification("CourseDidChangeInstitutes", $this);
+            }
+            return $todelete || $toinsert;
+        } else {
+            $this->createError(_("Ungültige Eingabe der Institute. Es muss " .
+                "mindestens ein Institut angegeben werden."));
+            return false;
+        }
+    }
+
+    /**
+     * adds a user to the seminar with the given status
+     * @param user_id string: ID of the user
+     * @param status string: status of the user for the seminar "user", "autor", "tutor", "dozent"
+     * @param force bool: if false (default) the user will only be upgraded and not degraded in his/her status
+     */
+    public function addMember($user_id, $status = 'autor', $force = false)
+    {
+
+        if (in_array($GLOBALS['perm']->get_perm($user_id), ["admin", "root"])) {
+            $this->createError(_("Admin und Root dürfen nicht Mitglied einer Veranstaltung sein."));
+            return false;
+        }
+        $db = DBManager::get();
+
+        $rangordnung = array_flip(['user', 'autor', 'tutor', 'dozent']);
+        if ($rangordnung[$status] > $rangordnung['autor'] && SeminarCategories::getByTypeId($this->status)->only_inst_user) {
+            //überprüfe, ob im richtigen Institut:
+            $user_institute_stmt = $db->prepare(
+                "SELECT Institut_id " .
+                "FROM user_inst " .
+                "WHERE user_id = :user_id " .
+                "");
+            $user_institute_stmt->execute(['user_id' => $user_id]);
+            $user_institute = $user_institute_stmt->fetchAll(PDO::FETCH_COLUMN, 0);
+
+            if (!in_array($this->institut_id, $user_institute) && !count(array_intersect($user_institute, $this->getInstitutes()))) {
+                $this->createError(_("Einzutragender Nutzer stammt nicht einem beteiligten Institut an."));
+
+                return false;
+            }
+        }
+        $course_member = CourseMember::findOneBySQL('user_id = ? AND Seminar_id = ?', [$user_id, $this->id]);
+        $new_position = (int) DBManager::get()->fetchColumn(
+            "SELECT MAX(position) + 1 FROM seminar_user WHERE status = ? AND Seminar_id = ?",
+            [$status, $this->id]
+        );
+        $numberOfTeachers = CourseMember::countBySql("Seminar_id = ? AND status = 'dozent'", [$this->id]);
+
+        if (!$course_member && !$force) {
+            CourseMember::create([
+                'Seminar_id' => $this->id,
+                'user_id'    => $user_id,
+                'status'     => $status,
+                'position'   => $new_position?:0,
+                'gruppe'     => (int) select_group($this->getSemesterStartTime()),
+                'visible'    => in_array($status, ['tutor', 'dozent']) ? 'yes' : 'unknown',
+            ]);
+            // delete the entries, user is now in the seminar
+            if (AdmissionApplication::deleteBySQL('user_id = ? AND seminar_id = ?', [$user_id, $this->getId()])) {
+                //renumber the waiting/accepted/lot list, a user was deleted from it
+                AdmissionApplication::renumberAdmission($this->getId());
+            }
+            $cs = $this->getCourseSet();
+            if ($cs) {
+                AdmissionPriority::unsetPriority($cs->getId(), $user_id, $this->getId());
+            }
+
+            CalendarScheduleModel::deleteSeminarEntries($user_id, $this->getId());
+            NotificationCenter::postNotification('CourseDidGetMember', $this, $user_id);
+            NotificationCenter::postNotification('UserDidEnterCourse', $this->id, $user_id);
+            StudipLog::log('SEM_USER_ADD', $this->id, $user_id, $status, 'Wurde in die Veranstaltung eingetragen');
+            $this->course->resetRelation('members');
+            $this->course->resetRelation('admission_applicants');
+
+            // Check if we need to add user to parent course as well.
+            if ($this->parent_course) {
+                $parent = new Seminar($this->parent);
+                $parent->addMember($user_id, $status, $force);
+            }
+
+            return $this;
+        } elseif (
+            ($force || $rangordnung[$course_member->status] < $rangordnung[$status])
+            && ($course_member->status !== 'dozent' || $numberOfTeachers > 1)
+        ) {
+            $visibility = $course_member->visible;
+            if (in_array($status, ['tutor', 'dozent'])) {
+                $visibility = 'yes';
+            }
+            $course_member->status = $status;
+            $course_member->visible = $visibility;
+            $course_member->position = $new_position;
+            $course_member->store();
+
+            if ($course_member->status === 'dozent') {
+                $termine = DBManager::get()->fetchFirst(
+                    "SELECT termin_id FROM termine WHERE range_id = ?",
+                    [$this->id]
+                );
+
+                DBManager::get()->execute(
+                    "DELETE FROM termin_related_persons WHERE range_id IN (?) AND user_id = ?",
+                    [$termine, $user_id]
+                );
+            }
+            NotificationCenter::postNotification('CourseDidChangeMember', $this, $user_id);
+            $this->course->resetRelation('members');
+            $this->course->resetRelation('admission_applicants');
+            return $this;
+        } else {
+            if ($course_member->status === 'dozent' && $numberOfTeachers <= 1) {
+                $this->createError(sprintf(_('Die Person kann nicht herabgestuft werden, ' .
+'da mindestens ein/eine Veranstaltungsleiter/-in (%s) in die Veranstaltung eingetragen sein muss!'),
+                        get_title_for_status('dozent', 1, $this->status)) .
+                    ' ' . sprintf(_('Tragen Sie zunächst eine weitere Person als Veranstaltungsleiter/-in (%s) ein.'),
+get_title_for_status('dozent', 1, $this->status)));
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Cancels a subscription to an admission.
+     *
+     * @param array $users
+     * @param string $status
+     * @return array
+     * @throws NotificationVetoException
+     */
+    public function cancelAdmissionSubscription(array $users, string $status): array
+    {
+        $msgs = [];
+        $messaging = new messaging;
+        $course_set = $this->getCourseSet();
+        $users = User::findMany($users);
+        foreach ($users as $user) {
+            $prio_delete = false;
+            if ($course_set) {
+                $prio_delete = AdmissionPriority::unsetPriority($course_set->getId(), $user->id, $this->getId());
+            }
+            $result = AdmissionApplication::deleteBySQL(
+                'seminar_id = ? AND user_id = ? AND status = ?',
+                [$this->getId(), $user->id, $status]
+            );
+            if ($result || $prio_delete) {
+                setTempLanguage($user->id);
+                if ($status !== 'accepted') {
+                    $message = sprintf(
+                        _('Sie wurden von der Warteliste der Veranstaltung **%s** gestrichen und sind damit __nicht__ zugelassen worden.'),
+                        $this->getFullName()
+                    );
+                } else {
+                    $message = sprintf(
+                        _('Sie wurden aus der Veranstaltung **%s** gestrichen und sind damit __nicht__ zugelassen worden.'),
+                        $this->getFullName()
+                    );
+                }
+                restoreLanguage();
+                $messaging->insert_message(
+                    $message,
+                    $user->username,
+                    '____%system%____',
+                    false,
+                    false,
+                    '1',
+                    false,
+                    sprintf('%s %s', _('Systemnachricht:'), _('nicht zugelassen in Veranstaltung')),
+                    true
+                );
+                StudipLog::log('SEM_USER_DEL', $this->getId(), $user->id, 'Wurde aus der Veranstaltung entfernt');
+                NotificationCenter::postNotification('UserDidLeaveCourse', $this->getId(), $user->id);
+
+                $msgs[] = $user->getFullName();
+            }
+        }
+        return $msgs;
+    }
+
+    /**
+     * Cancels a subscription to a course
+     * @param array $users
+     * @return array
+     * @throws Exception
+     */
+    public function cancelSubscription(array $users): array
+    {
+        $msgs = [];
+        $messaging = new messaging;
+        $users = User::findMany($users);
+        foreach ($users as $user) {
+            // delete member from seminar
+            if ($this->deleteMember($user->id)) {
+                setTempLanguage($user->id);
+                $message = sprintf(
+                    _('Ihre Anmeldung zur Veranstaltung **%s** wurde aufgehoben.'),
+                    $this->getFullName()
+                );
+                restoreLanguage();
+                $messaging->insert_message(
+                    $message,
+                    $user->username,
+                    '____%system%____',
+                    false,
+                    false,
+                    '1',
+                    false,
+                    sprintf('%s %s', _('Systemnachricht:'), _("Anmeldung aufgehoben")),
+                    true
+                );
+                $msgs[] = $user->getFullName();
+            }
+        }
+
+        return $msgs;
+    }
+
+    /**
+     * deletes a user from the seminar by respecting the rule that at least one
+     * user with status "dozent" must stay there
+     * @param string $user_id  user_id of the user to delete
+     * @return boolean
+     */
+    public function deleteMember($user_id): bool
+    {
+        $dozenten = $this->getMembers();
+        if (count($dozenten) >= 2 || empty($dozenten[$user_id])) {
+            $result = CourseMember::deleteBySQL('Seminar_id = ? AND user_id = ?', [$this->id, $user_id]);
+            if ($result === 0) {
+                return true;
+            }
+            // If this course is a child of another course...
+            if ($this->parent_course) {
+                // ... check if user is member in another sibling ...
+                $other = CourseMember::countBySQL(
+                    "`user_id` = :user AND `Seminar_id` IN (:courses) AND `Seminar_id` != :this",
+                    ['user' => $user_id, 'courses' => $this->parent->children->pluck('seminar_id'), 'this' => $this->id]
+                );
+
+                // ... and delete from parent course if this was the only
+                // course membership in this family.
+                if ($other === 0) {
+                    $s = new Seminar($this->parent);
+                    $s->deleteMember($user_id);
+                }
+            }
+
+            if ($this->children != null) {
+                foreach ($this->children as $child) {
+                    $s = new Seminar($child);
+                    $s->deleteMember($user_id);
+                }
+            }
+
+            if (!empty($dozenten[$user_id])) {
+                $query = "SELECT termin_id FROM termine WHERE range_id = ?";
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute([$this->id]);
+                $termine = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+                $query = "DELETE FROM termin_related_persons WHERE range_id = ? AND user_id = ?";
+                $statement = DBManager::get()->prepare($query);
+
+                foreach ($termine as $termin_id) {
+                    $statement->execute([$termin_id, $user_id]);
+                }
+                if (Deputy::isActivated()) {
+                    $other_dozenten = array_diff(array_keys($dozenten), [$user_id]);
+                    foreach (Deputy::findByRange_id($user_id) as $default_deputy) {
+                        if ($default_deputy->user_id != $GLOBALS['user']->id &&
+                                !Deputy::countBySql("range_id IN (?)", [$other_dozenten])) {
+                            Deputy::deleteBySQL("range_id = ? AND user_id = ?", [$this->id, $default_deputy->user_id]);
+                        }
+                    }
+                }
+            }
+
+            // Delete course related datafield entries
+            DatafieldEntryModel::deleteBySQL('range_id = ? AND sec_range_id = ?', [$user_id, $this->id]);
+
+            // Remove from associated status groups
+            foreach (Statusgruppen::findBySeminar_id($this->id) as $group) {
+                $group->removeUser($user_id, true);
+            }
+
+            $this->createMessage(sprintf(
+                _('Nutzer %s wurde aus der Veranstaltung entfernt.'),
+                '<i>' . htmlReady(get_fullname($user_id)) . '</i>'
+            ));
+            NotificationCenter::postNotification('CourseDidChangeMember', $this, $user_id);
+            NotificationCenter::postNotification('UserDidLeaveCourse', $this->id, $user_id);
+            StudipLog::log('SEM_USER_DEL', $this->id, $user_id, 'Wurde aus der Veranstaltung entfernt');
+            $this->course->resetRelation('members');
+            return true;
+        } else {
+            $this->createError(
+                sprintf(
+                    _('Die Veranstaltung muss wenigstens <b>einen/eine</b> VeranstaltungsleiterIn (%s) eingetragen haben!'),
+                    get_title_for_status('dozent', 1, $this->status)
+                )
+                . ' ' . _('Tragen Sie zunächst einen anderen ein, um diesen zu löschen.')
+            );
+            return false;
+        }
+    }
+
+    /**
+     * sets the almost never used column position in the table seminar_user
+     * @param array $members members array: array of user_id's - wrong IDs will be ignored
+     * @return Seminar
+     */
+    public function setMemberPriority($members): Seminar
+    {
+        CourseMember::findEachBySQL(
+            function (CourseMember $membership) use (&$members) {
+                $membership->position = array_search($membership->user_id, $members);
+                $membership->store();
+            },
+            "Seminar_id = ? AND user_id IN (?)",
+            [$this->id, $members]
+        );
+        return $this;
+    }
+
+    /**
+     * returns array with information about enrolment to this course for given user_id
+     * ['enrolment_allowed'] : true or false
+     * ['cause']: keyword to describe the cause
+     * ['description'] : readable description of the cause
+     *
+     * @param string $user_id
+     * @return array
+     */
+    public function getEnrolmentInfo($user_id)
+    {
+        $info = [];
+        $user = User::find($user_id);
+        if ($this->getSemClass()->isGroup()) {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'grouped';
+            $info['description'] = _("Dies ist eine Veranstaltungsgruppe. Sie können sich nur in deren Unterveranstaltungen eintragen.");
+            return $info;
+        }
+        if ($this->read_level == 0 && Config::get()->ENABLE_FREE_ACCESS && !$GLOBALS['perm']->get_studip_perm($this->getId(), $user_id)) {
+            $info['enrolment_allowed'] = true;
+            $info['cause'] = 'free_access';
+            $info['description'] = _("Für die Veranstaltung ist keine Anmeldung erforderlich.");
+            return $info;
+        }
+        if (!$user) {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'nobody';
+            $info['description'] = _("Sie sind nicht in Stud.IP angemeldet.");
+            return $info;
+        }
+        if ($GLOBALS['perm']->have_perm('root', $user_id)) {
+            $info['enrolment_allowed'] = true;
+            $info['cause'] = 'root';
+            $info['description'] = _("Sie dürfen ALLES.");
+            return $info;
+        }
+        if ($GLOBALS['perm']->have_studip_perm('admin', $this->getId(), $user_id)) {
+            $info['enrolment_allowed'] = true;
+            $info['cause'] = 'courseadmin';
+            $info['description'] = _("Sie sind Administrator_in der Veranstaltung.");
+            return $info;
+        }
+        if ($GLOBALS['perm']->have_perm('admin', $user_id)) {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'admin';
+            $info['description'] = _("Als Administrator_in können Sie sich nicht für eine Veranstaltung anmelden.");
+            return $info;
+        }
+        //Ist bereits Teilnehmer
+        if ($GLOBALS['perm']->have_studip_perm('user', $this->getId(), $user_id)) {
+            $info['enrolment_allowed'] = true;
+            $info['cause'] = 'member';
+            $info['description'] = _("Sie sind für die Veranstaltung angemeldet.");
+            return $info;
+        }
+        $admission_status = $user->admission_applications->findBy('seminar_id', $this->getId())->val('status');
+        if ($admission_status == 'accepted') {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'accepted';
+            $info['description'] = _("Sie wurden für diese Veranstaltung vorläufig akzeptiert.");
+            return $info;
+        }
+        if ($admission_status == 'awaiting') {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'awaiting';
+            $info['description'] = _("Sie stehen auf der Warteliste für diese Veranstaltung.");
+            return $info;
+        }
+        if ($GLOBALS['perm']->get_perm($user_id) == 'user') {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'user';
+            $info['description'] = _("Sie haben nicht die erforderliche Berechtigung sich für eine Veranstaltung anzumelden.");
+            return $info;
+        }
+        //falsche Nutzerdomäne
+        $same_domain = true;
+        $user_domains = UserDomain::getUserDomainsForUser($user_id);
+        if (count($user_domains) > 0) {
+            $seminar_domains = UserDomain::getUserDomainsForSeminar($this->getId());
+            $same_domain = UserDomain::checkUserVisibility($seminar_domains, $user_domains);;
+        }
+        if (!$same_domain && !$this->isStudygroup()) {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'domain';
+            $info['description'] = _("Sie sind nicht in einer zugelassenenen Nutzerdomäne, Sie können sich nicht eintragen!");
+            return $info;
+        }
+        //Teilnehmerverwaltung mit Sperregel belegt
+        if (LockRules::Check($this->getId(), 'participants')) {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'locked';
+            $lockdata = LockRules::getObjectRule($this->getId());
+            $info['description'] = _("In diese Veranstaltung können Sie sich nicht eintragen!") . ($lockdata['description'] ? '<br>' . formatLinks($lockdata['description']) : '');
+            return $info;
+        }
+        //Veranstaltung unsichtbar für aktuellen Nutzer
+        if (!$this->visible && !$this->isStudygroup() && !$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM, $user_id)) {
+            $info['enrolment_allowed'] = false;
+            $info['cause'] = 'invisible';
+            $info['description'] = _("Die Veranstaltung ist gesperrt, Sie können sich nicht eintragen!");
+            return $info;
+        }
+        if ($courseset = $this->getCourseSet()) {
+            $info['enrolment_allowed'] = true;
+            $info['cause'] = 'courseset';
+            $info['description'] = _("Die Anmeldung zu dieser Veranstaltung folgt speziellen Regeln. Lesen Sie den Hinweistext.");
+            $user_prio = AdmissionPriority::getPrioritiesByUser($courseset->getId(), $user_id);
+            if (isset($user_prio[$this->getId()])) {
+                if ($courseset->hasAdmissionRule('LimitedAdmission')) {
+                    $info['description'] .= ' ' . sprintf(_("(Sie stehen auf der Anmeldeliste für die automatische Platzverteilung mit der Priorität %s.)"), $user_prio[$this->getId()]);
+                } else {
+                    $info['description'] .= ' ' . _("(Sie stehen auf der Anmeldeliste für die automatische Platzverteilung.)");
+                }
+            }
+            return $info;
+        }
+        $info['enrolment_allowed'] = true;
+        $info['cause'] = 'normal';
+        $info['description'] = '';
+        return $info;
+    }
+
+    /**
+     * adds user with given id as preliminary member to course
+     *
+     * @param string $user_id
+     * @return integer 1 if successfull
+     */
+    public function addPreliminaryMember($user_id, $comment = '')
+    {
+        $new_admission_member = new AdmissionApplication();
+        $new_admission_member->user_id = $user_id;
+        $new_admission_member->position = 0;
+        $new_admission_member->status = 'accepted';
+        $new_admission_member->comment = $comment;
+        $this->course->admission_applicants[] = $new_admission_member;
+        $ok = $new_admission_member->store();
+        if ($ok && $this->isStudygroup()) {
+            StudygroupModel::applicationNotice($this->getId(), $user_id);
+        }
+        $cs = $this->getCourseSet();
+        if ($cs) {
+            $prio_delete = AdmissionPriority::unsetPriority($cs->getId(), $user_id, $this->getId());
+        }
+        // LOGGING
+        StudipLog::log('SEM_USER_ADD', $this->getId(), $user_id, 'accepted', 'Vorläufig akzeptiert');
+        return $ok;
+    }
+
+    /**
+     * returns courseset object for this  course
+     *
+     * @return CourseSet courseset object or null
+     */
+    public function getCourseSet()
+    {
+        if ($this->course_set === null) {
+            $this->course_set = CourseSet::getSetForCourse($this->id);
+            if ($this->course_set === null) {
+                $this->course_set = false;
+            }
+        }
+        return $this->course_set ?: null;
+    }
+
+    /**
+     * returns true if the number of participants of this course is limited
+     *
+     * @return boolean
+     */
+    public function isAdmissionEnabled()
+    {
+        $cs = $this->getCourseSet();
+        return ($cs && $cs->isSeatDistributionEnabled());
+    }
+
+    /**
+     * returns the number of free seats in the course or true if not limited
+     *
+     * @return integer
+     */
+    public function getFreeAdmissionSeats()
+    {
+        if ($this->isAdmissionEnabled()) {
+            return $this->course->getFreeSeats();
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * returns true if the course is locked
+     *
+     * @return boolean
+     */
+    public function isAdmissionLocked()
+    {
+        $cs = $this->getCourseSet();
+        return ($cs && $cs->hasAdmissionRule('LockedAdmission'));
+    }
+
+    /**
+     * returns true if the course is password protected
+     *
+     * @return boolean
+     */
+    public function isPasswordProtected()
+    {
+        $cs = $this->getCourseSet();
+        return ($cs && $cs->hasAdmissionRule('PasswordAdmission'));
+    }
+
+    /**
+     * returns array with start and endtime of course enrolment timeframe
+     * return null if there is no timeframe
+     *
+     * @return array assoc array with start_time end_time as keys timestamps as values
+     */
+    public function getAdmissionTimeFrame()
+    {
+        $cs = $this->getCourseSet();
+        return ($cs && $cs->hasAdmissionRule('TimedAdmission')) ?
+            ['start_time' => $cs->getAdmissionRule('TimedAdmission')->getStartTime(),
+                  'end_time' => $cs->getAdmissionRule('TimedAdmission')->getEndTime()] : [];
+    }
+
+    /**
+     * returns StudipModule object for given slot, null when deactivated or not available
+     *
+     * @param string $slot
+     * @return StudipModule|null
+     */
+    public function getSlotModule($slot): ?StudipModule
+    {
+        $module = 'Core' . ucfirst($slot);
+        if ($this->course->isToolActive($module)) {
+            return PluginEngine::getPlugin($module);
+        }
+        return null;
+    }
+
+    /**
+     * adds user with given id on waitinglist
+     *
+     * @param string $user_id
+     * @param string $which_end 'last' or 'first'
+     * @return integer|bool number on waitlist or false if not successful
+     */
+    public function addToWaitlist($user_id, $which_end = 'last')
+    {
+        if (AdmissionApplication::exists([$user_id, $this->id]) || CourseMember::find([$this->id, $user_id])) {
+            return false;
+        }
+        switch ($which_end) {
+            // Append users to waitlist end.
+            case 'last':
+                $maxpos = DBManager::get()->fetchColumn("SELECT MAX(`position`)
+                    FROM `admission_seminar_user`
+                    WHERE `seminar_id`=?
+                        AND `status`='awaiting'", [$this->id]);
+                $waitpos = $maxpos+1;
+                break;
+            // Prepend users to waitlist start.
+            case 'first':
+            default:
+                // Move all others on the waitlist up by the number of people to add.
+                AdmissionApplication::renumberAdmission($this->id);
+                $waitpos = 1;
+        }
+        $new_admission_member = new AdmissionApplication();
+        $new_admission_member->user_id = $user_id;
+        $new_admission_member->position = $waitpos;
+        $new_admission_member->status = 'awaiting';
+        $new_admission_member->seminar_id = $this->id;
+        if ($new_admission_member->store()) {
+            StudipLog::log('SEM_USER_ADD', $this->id, $user_id, 'awaiting', 'Auf Warteliste gesetzt, Position: ' . $waitpos);
+            $this->course->resetRelation('admission_applicants');
+            return $waitpos;
+        }
+        return false;
+    }
+}
diff --git a/lib/classes/SeminarCategories.class.php b/lib/classes/SeminarCategories.class.php
deleted file mode 100644
index 5302f1e..0000000
--- a/lib/classes/SeminarCategories.class.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * SeminarCategories.class.php
- *
- * encapsulates configuration settings for courses from config.inc.php
- * aka $SEM_CLASS, $SEM_TYPE, $UPLOAD_TYPES
- *
- * @author      André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @access      public
- * @package     core
- */
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// SeminarCategories.class.php
-//
-// Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-class SeminarCategories {
-
-    private static $seminar_categories = [];
-
-    private $sem_class_data = [];
-    private $sem_type_data = [];
-
-    /**
-     * Enter description here...
-     *
-     * @param String $id
-     * @return Array
-     */
-    public static function Get($id)
-    {
-        if (empty(self::$seminar_categories[$id])) {
-            $cat = new SeminarCategories($id);
-            if ($cat->id !== false) {
-                self::$seminar_categories[$id] = $cat;
-            } else {
-                self::$seminar_categories[$id] = false;
-            }
-        }
-        return self::$seminar_categories[$id];
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return Array
-     */
-    public static function GetAll(){
-        $ret = [];
-        foreach($GLOBALS['SEM_CLASS'] as $id => $sem_class){
-            $ret[] = self::get($id);
-        }
-        return $ret;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String $id
-     * @return String
-     */
-    public static function GetByTypeId($id){
-        return self::Get($GLOBALS['SEM_TYPE'][$id]['class']);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String $seminar_id
-     * @return SeminarCategories
-     */
-    public static function GetBySeminarId($seminar_id){
-        return self::GetByTypeId(Seminar::GetInstance($seminar_id)->status);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String $sem_class_id
-     */
-    private function __construct($sem_class_id) {
-        if(isset($GLOBALS['SEM_CLASS'][$sem_class_id])){
-            $this->sem_class_data = $GLOBALS['SEM_CLASS'][$sem_class_id];
-            $this->sem_class_data['id'] = $sem_class_id;
-            foreach($GLOBALS['SEM_TYPE'] as $type_id => $type_data){
-                if($type_data['class'] == $sem_class_id) {
-                    $this->sem_type_data[$type_id] = $type_data['name'];
-                }
-            }
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String $type_id
-     * @return String
-     */
-    public function getNameOfType($type_id){
-        return isset($this->sem_type_data[$type_id]) ? $this->sem_type_data[$type_id] : '';
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return Array
-     */
-    public function getTypes(){
-        return $this->sem_type_data;
-    }
-
-    public function __get($attribute){
-        if(isset($this->sem_class_data[$attribute])){
-            return $this->sem_class_data[$attribute];
-        } else {
-            return false;
-        }
-    }
-}
-?>
diff --git a/lib/classes/SeminarCategories.php b/lib/classes/SeminarCategories.php
new file mode 100644
index 0000000..5302f1e
--- /dev/null
+++ b/lib/classes/SeminarCategories.php
@@ -0,0 +1,138 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+ * SeminarCategories.class.php
+ *
+ * encapsulates configuration settings for courses from config.inc.php
+ * aka $SEM_CLASS, $SEM_TYPE, $UPLOAD_TYPES
+ *
+ * @author      André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @access      public
+ * @package     core
+ */
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// SeminarCategories.class.php
+//
+// Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+class SeminarCategories {
+
+    private static $seminar_categories = [];
+
+    private $sem_class_data = [];
+    private $sem_type_data = [];
+
+    /**
+     * Enter description here...
+     *
+     * @param String $id
+     * @return Array
+     */
+    public static function Get($id)
+    {
+        if (empty(self::$seminar_categories[$id])) {
+            $cat = new SeminarCategories($id);
+            if ($cat->id !== false) {
+                self::$seminar_categories[$id] = $cat;
+            } else {
+                self::$seminar_categories[$id] = false;
+            }
+        }
+        return self::$seminar_categories[$id];
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return Array
+     */
+    public static function GetAll(){
+        $ret = [];
+        foreach($GLOBALS['SEM_CLASS'] as $id => $sem_class){
+            $ret[] = self::get($id);
+        }
+        return $ret;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param String $id
+     * @return String
+     */
+    public static function GetByTypeId($id){
+        return self::Get($GLOBALS['SEM_TYPE'][$id]['class']);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param String $seminar_id
+     * @return SeminarCategories
+     */
+    public static function GetBySeminarId($seminar_id){
+        return self::GetByTypeId(Seminar::GetInstance($seminar_id)->status);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param String $sem_class_id
+     */
+    private function __construct($sem_class_id) {
+        if(isset($GLOBALS['SEM_CLASS'][$sem_class_id])){
+            $this->sem_class_data = $GLOBALS['SEM_CLASS'][$sem_class_id];
+            $this->sem_class_data['id'] = $sem_class_id;
+            foreach($GLOBALS['SEM_TYPE'] as $type_id => $type_data){
+                if($type_data['class'] == $sem_class_id) {
+                    $this->sem_type_data[$type_id] = $type_data['name'];
+                }
+            }
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param String $type_id
+     * @return String
+     */
+    public function getNameOfType($type_id){
+        return isset($this->sem_type_data[$type_id]) ? $this->sem_type_data[$type_id] : '';
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return Array
+     */
+    public function getTypes(){
+        return $this->sem_type_data;
+    }
+
+    public function __get($attribute){
+        if(isset($this->sem_class_data[$attribute])){
+            return $this->sem_class_data[$attribute];
+        } else {
+            return false;
+        }
+    }
+}
+?>
diff --git a/lib/classes/SessionDecoder.class.php b/lib/classes/SessionDecoder.class.php
deleted file mode 100644
index d437494..0000000
--- a/lib/classes/SessionDecoder.class.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * SessionDecoder.class.php
- *
- * decodes serialized PHP session data
- *
- * @author      André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @access      public
- * @package     core
- */
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// SessionDecoder.class.php
-//
-// Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-class SessionDecoder implements ArrayAccess, Countable, Iterator {
-
-    private $encoded_session = [];
-    private $decoded_session = [];
-    private $var_names = [];
-
-    /**
-     * Usage:
-     * Pass the string containing encoded session data to the
-     * constructor, the identified session variables become public members
-     * of the object
-     *
-     * $session = new SessionDecoder($encoded_session_string);
-     * print_r($session->my_var);
-     * or
-     * print_r($session['my_var']);
-     * get the names of identified variables
-     * print_r($session->keys());
-     *
-     * @param string $encoded_session_string
-     */
-    public function __construct($encoded_session_string) {
-        $this->decode($encoded_session_string);
-    }
-
-    /**
-     * pass an encoded session string to fill the object
-     *
-     * @param string $encoded_session_string
-     * @return int number of identified variables
-     */
-    public function decode($encoded_session_string){
-        $this->encoded_session = $this->sessionRealDecode($encoded_session_string);
-        if(is_array($this->encoded_session)) {
-            $this->var_names = array_keys($this->encoded_session);
-        } else {
-            $this->encoded_session = [];
-        }
-        $this->decoded_session = [];
-
-        return count($this->encoded_session);
-    }
-
-    /**
-     * returns an array containing the names of the identified variables
-     *
-     * @return array names of identified variables
-     */
-    public function keys() {
-        return $this->var_names;
-    }
-
-    public function rewind(): void
-    {
-        reset($this->var_names);
-    }
-
-    public function current(): mixed
-    {
-        $current = current($this->var_names);
-        return $current !== false ? $this->offsetGet($current) : false;
-    }
-
-    public function key(): mixed
-    {
-        return current($this->var_names);
-    }
-
-    public function next(): void
-    {
-        next($this->var_names);
-    }
-
-    public function valid(): bool
-    {
-        $current = current($this->var_names);
-        return $current !== false;
-    }
-
-    public function offsetExists($offset): bool
-    {
-        return isset($this->encoded_session[$offset]);
-    }
-
-    /**
-     * @param string $offset
-     */
-    public function offsetGet($offset): mixed
-    {
-        if($this->offsetExists($offset) && !isset($this->decoded_session[$offset])) {
-            $this->decoded_session[$offset] = unserialize($this->encoded_session[$offset]);
-        }
-        return $this->decoded_session[$offset] ?? null;
-    }
-
-    public function offsetSet($offset, $value): void
-    {
-    }
-
-    public function offsetUnset($offset): void
-    {
-    }
-
-    public function count(): int
-    {
-        return count($this->var_names);
-    }
-
-    public function __get($name){
-        return $this->offsetGet($name);
-    }
-
-    public function __isset($name){
-        return $this->offsetExists($name);
-    }
-
-    /**
-     * a function that returns decoded session data,
-     * that seems to work in every cases,
-     * even when strings contain reserved chars
-     * (c) bmorel at ssi dot fr
-     * http://www.php.net/manual/en/function.session-decode.php#56106
-     *
-     * @param string $str
-     * @return array
-     */
-    private function sessionRealDecode($str) {
-        $ret = [];
-        $PS_DELIMITER = '|';
-        $PS_UNDEF_MARKER = '!';
-        $str = (string)$str;
-
-        $endptr = strlen($str);
-        $p = 0;
-
-        $items = 0;
-        $level = 0;
-
-        while ($p < $endptr) {
-            $q = $p;
-            while ($str[$q] != $PS_DELIMITER)
-            if (++$q >= $endptr) break 2;
-
-            if ($str[$p] == $PS_UNDEF_MARKER) {
-                $p++;
-                $has_value = false;
-            } else {
-                $has_value = true;
-            }
-
-            $name = substr($str, $p, $q - $p);
-            $q++;
-
-            $serialized = '';
-            if ($has_value) {
-                for (;;) {
-                    $p = $q;
-                    switch ($str[$q]) {
-                        case 'N': /* null */
-                        case 'b': /* boolean */
-                        case 'i': /* integer */
-                        case 'd': /* decimal */
-                            do $q++;
-                            while ( ($q < $endptr) && ($str[$q] != ';') );
-                            $q++;
-                            $serialized .= substr($str, $p, $q - $p);
-                            if ($level == 0) break 2;
-                            break;
-                        case 'R': /* reference  */
-                            $q+= 2;
-                            for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++) $id .= $str[$q];
-                            $q++;
-                            //$serialized .= 'R:' . ($id + 1) . ';'; /* increment pointer because of outer array */
-                            $serialized .= 'N;'; /* unserializing references is not possible*/
-                            if ($level == 0) break 2;
-                            break;
-                        case 's': /* string */
-                            $q+=2;
-                            for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++) $length .= $str[$q];
-                            $q+=2;
-                            $q+= (int)$length + 2;
-                            $serialized .= substr($str, $p, $q - $p);
-                            if ($level == 0) break 2;
-                            break;
-                        case 'a': /* array */
-                        case 'O': /* object */
-                            do $q++;
-                            while ( ($q < $endptr) && ($str[$q] != '{') );
-                            $q++;
-                            $level++;
-                            $serialized .= substr($str, $p, $q - $p);
-                            break;
-                        case '}': /* end of array|object */
-                            $q++;
-                            $serialized .= substr($str, $p, $q - $p);
-                            if (--$level == 0) break 2;
-                            break;
-                        default:
-                            return false;
-                    }
-                }
-            } else {
-                $serialized .= 'N;';
-                $q+= 2;
-            }
-            $items++;
-            $p = $q;
-            $ret[$name] = $serialized;
-        }
-        return $ret;
-    }
-}
-?>
diff --git a/lib/classes/SessionDecoder.php b/lib/classes/SessionDecoder.php
new file mode 100644
index 0000000..d437494
--- /dev/null
+++ b/lib/classes/SessionDecoder.php
@@ -0,0 +1,246 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+ * SessionDecoder.class.php
+ *
+ * decodes serialized PHP session data
+ *
+ * @author      André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @access      public
+ * @package     core
+ */
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// SessionDecoder.class.php
+//
+// Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+class SessionDecoder implements ArrayAccess, Countable, Iterator {
+
+    private $encoded_session = [];
+    private $decoded_session = [];
+    private $var_names = [];
+
+    /**
+     * Usage:
+     * Pass the string containing encoded session data to the
+     * constructor, the identified session variables become public members
+     * of the object
+     *
+     * $session = new SessionDecoder($encoded_session_string);
+     * print_r($session->my_var);
+     * or
+     * print_r($session['my_var']);
+     * get the names of identified variables
+     * print_r($session->keys());
+     *
+     * @param string $encoded_session_string
+     */
+    public function __construct($encoded_session_string) {
+        $this->decode($encoded_session_string);
+    }
+
+    /**
+     * pass an encoded session string to fill the object
+     *
+     * @param string $encoded_session_string
+     * @return int number of identified variables
+     */
+    public function decode($encoded_session_string){
+        $this->encoded_session = $this->sessionRealDecode($encoded_session_string);
+        if(is_array($this->encoded_session)) {
+            $this->var_names = array_keys($this->encoded_session);
+        } else {
+            $this->encoded_session = [];
+        }
+        $this->decoded_session = [];
+
+        return count($this->encoded_session);
+    }
+
+    /**
+     * returns an array containing the names of the identified variables
+     *
+     * @return array names of identified variables
+     */
+    public function keys() {
+        return $this->var_names;
+    }
+
+    public function rewind(): void
+    {
+        reset($this->var_names);
+    }
+
+    public function current(): mixed
+    {
+        $current = current($this->var_names);
+        return $current !== false ? $this->offsetGet($current) : false;
+    }
+
+    public function key(): mixed
+    {
+        return current($this->var_names);
+    }
+
+    public function next(): void
+    {
+        next($this->var_names);
+    }
+
+    public function valid(): bool
+    {
+        $current = current($this->var_names);
+        return $current !== false;
+    }
+
+    public function offsetExists($offset): bool
+    {
+        return isset($this->encoded_session[$offset]);
+    }
+
+    /**
+     * @param string $offset
+     */
+    public function offsetGet($offset): mixed
+    {
+        if($this->offsetExists($offset) && !isset($this->decoded_session[$offset])) {
+            $this->decoded_session[$offset] = unserialize($this->encoded_session[$offset]);
+        }
+        return $this->decoded_session[$offset] ?? null;
+    }
+
+    public function offsetSet($offset, $value): void
+    {
+    }
+
+    public function offsetUnset($offset): void
+    {
+    }
+
+    public function count(): int
+    {
+        return count($this->var_names);
+    }
+
+    public function __get($name){
+        return $this->offsetGet($name);
+    }
+
+    public function __isset($name){
+        return $this->offsetExists($name);
+    }
+
+    /**
+     * a function that returns decoded session data,
+     * that seems to work in every cases,
+     * even when strings contain reserved chars
+     * (c) bmorel at ssi dot fr
+     * http://www.php.net/manual/en/function.session-decode.php#56106
+     *
+     * @param string $str
+     * @return array
+     */
+    private function sessionRealDecode($str) {
+        $ret = [];
+        $PS_DELIMITER = '|';
+        $PS_UNDEF_MARKER = '!';
+        $str = (string)$str;
+
+        $endptr = strlen($str);
+        $p = 0;
+
+        $items = 0;
+        $level = 0;
+
+        while ($p < $endptr) {
+            $q = $p;
+            while ($str[$q] != $PS_DELIMITER)
+            if (++$q >= $endptr) break 2;
+
+            if ($str[$p] == $PS_UNDEF_MARKER) {
+                $p++;
+                $has_value = false;
+            } else {
+                $has_value = true;
+            }
+
+            $name = substr($str, $p, $q - $p);
+            $q++;
+
+            $serialized = '';
+            if ($has_value) {
+                for (;;) {
+                    $p = $q;
+                    switch ($str[$q]) {
+                        case 'N': /* null */
+                        case 'b': /* boolean */
+                        case 'i': /* integer */
+                        case 'd': /* decimal */
+                            do $q++;
+                            while ( ($q < $endptr) && ($str[$q] != ';') );
+                            $q++;
+                            $serialized .= substr($str, $p, $q - $p);
+                            if ($level == 0) break 2;
+                            break;
+                        case 'R': /* reference  */
+                            $q+= 2;
+                            for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++) $id .= $str[$q];
+                            $q++;
+                            //$serialized .= 'R:' . ($id + 1) . ';'; /* increment pointer because of outer array */
+                            $serialized .= 'N;'; /* unserializing references is not possible*/
+                            if ($level == 0) break 2;
+                            break;
+                        case 's': /* string */
+                            $q+=2;
+                            for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++) $length .= $str[$q];
+                            $q+=2;
+                            $q+= (int)$length + 2;
+                            $serialized .= substr($str, $p, $q - $p);
+                            if ($level == 0) break 2;
+                            break;
+                        case 'a': /* array */
+                        case 'O': /* object */
+                            do $q++;
+                            while ( ($q < $endptr) && ($str[$q] != '{') );
+                            $q++;
+                            $level++;
+                            $serialized .= substr($str, $p, $q - $p);
+                            break;
+                        case '}': /* end of array|object */
+                            $q++;
+                            $serialized .= substr($str, $p, $q - $p);
+                            if (--$level == 0) break 2;
+                            break;
+                        default:
+                            return false;
+                    }
+                }
+            } else {
+                $serialized .= 'N;';
+                $q+= 2;
+            }
+            $items++;
+            $p = $q;
+            $ret[$name] = $serialized;
+        }
+        return $ret;
+    }
+}
+?>
diff --git a/lib/classes/SimpleCollection.class.php b/lib/classes/SimpleCollection.class.php
deleted file mode 100644
index 6acc10d..0000000
--- a/lib/classes/SimpleCollection.class.php
+++ /dev/null
@@ -1,782 +0,0 @@
-<?php
-if (!defined('SORT_NATURAL')) {
-    define('SORT_NATURAL', 6);
-}
-if (!defined('SORT_FLAG_CASE')) {
-    define('SORT_FLAG_CASE', 8);
-}
-
-/**
- * SimpleCollection.class.php
- * collection of assoc arrays with convenience
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @template T
- */
-class SimpleCollection extends StudipArrayObject
-{
-    /**
-     * callable to initialize collection
-     *
-     * @var ?callable(): array<T>
-     */
-    protected $finder;
-
-    /**
-     * number of records after last init
-     *
-     * @var int
-     */
-    protected $last_count;
-
-    /**
-     * collection with deleted records
-     * @var static
-     */
-    protected $deleted;
-
-    /**
-     * creates a collection from an array of arrays
-     * all arrays should contain same keys, but is not enforced
-     *
-     * @param array<T> $data array containing assoc arrays
-     * @return SimpleCollection<T>
-     */
-    public static function createFromArray(array $data)
-    {
-        return new self($data);
-    }
-
-    /**
-     * converts arrays or objects to ArrayObject objects
-     * if ArrayAccess interface is not available
-     *
-     * @param mixed $a
-     * @return StudipArrayObject|ArrayAccess
-     */
-    public static function arrayToArrayObject($a)
-    {
-        if ($a instanceof StudipArrayObject) {
-            $a->setFlags(StudipArrayObject::ARRAY_AS_PROPS);
-            return $a;
-        }
-
-        if ($a instanceof ArrayObject) {
-            return new StudipArrayObject($a->getArrayCopy(), StudipArrayObject::ARRAY_AS_PROPS);
-        }
-
-        if ($a instanceof ArrayAccess) {
-            return $a;
-        }
-
-        return new StudipArrayObject((array) $a, StudipArrayObject::ARRAY_AS_PROPS);
-    }
-
-    /**
-     * returns closure to compare a value against given arguments
-     * using given operator
-     *
-     * @param string|callable(mixed, mixed|array): bool  $operator
-     * @param mixed|array $args
-     * @throws InvalidArgumentException
-     * @return callable(mixed): bool comparison function
-     */
-    public static function getCompFunc($operator, $args)
-    {
-        if (is_callable($operator)) {
-            $comp_func = function ($a) use ($args, $operator) {
-                return $operator($a, $args);
-            };
-        } else {
-            if (!is_array($args)) {
-                $args = [$args];
-            }
-            switch ($operator) {
-                case '==':
-                    $comp_func = function ($a) use ($args) {
-                        return in_array($a, $args);
-                    };
-                break;
-                case '===':
-                    $comp_func = function ($a) use ($args) {
-                        return in_array($a, $args, true);
-                    };
-                break;
-                case '!=':
-                case '<>':
-                    $comp_func = function ($a) use ($args) {
-                        return !in_array($a, $args);
-                    };
-                break;
-                case '!==':
-                    $comp_func = function ($a) use ($args) {
-                        return !in_array($a, $args, true);
-                    };
-                break;
-                case '<':
-                case '>':
-                case '<=':
-                case '>=':
-                    $op_func = function ($a, $b) use ($operator) {
-                        if ($operator === '<') {
-                            return $a < $b;
-                        } elseif ($operator === '<=') {
-                            return $a <= $b;
-                        } elseif ($operator === '>=') {
-                            return $a >= $b;
-                        } elseif ($operator === '>') {
-                            return $a > $b;
-                        }
-                    };
-                    $comp_func = function ($a) use ($op_func, $args) {
-                        return $op_func($a, $args[0]);
-                    };
-                break;
-                case '><':
-                    $comp_func = function ($a) use ($args) {
-                        return $a > $args[0] && $a < $args[1];
-                    };
-                break;
-                case '>=<=':
-                    $comp_func = function ($a) use ($args) {
-                        return $a >= $args[0] && $a <= $args[1];
-                    };
-                    break;
-                case '%=':
-                    $comp_func = function ($a) use ($args) {
-                        $a = mb_strtolower(static::translitLatin1($a));
-                        $args = array_map([static::class, 'translitLatin1'], $args);
-                        $args = array_map('mb_strtolower', $args);
-                        return in_array($a, $args);
-                    };
-                break;
-                case '*=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            if (mb_strpos($a, $arg) !== false) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                break;
-                case '^=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            if (mb_strpos($a, $arg) === 0) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                break;
-                case '$=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            $found = mb_strrpos($a, $arg);
-                            if ($found !== false && ($found + mb_strlen($arg)) === mb_strlen($a)) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                break;
-                case '~=':
-                    $comp_func = function ($a) use ($args) {
-                        foreach ($args as $arg) {
-                            if (preg_match($arg, $a) === 1) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    };
-                    break;
-                default:
-                    throw new InvalidArgumentException('unknown operator: ' . $operator);
-             }
-         }
-         return $comp_func;
-    }
-
-    /**
-     * transliterates latin1 string to ascii
-     *
-     * @param string $text
-     * @return string
-     */
-    public static function translitLatin1($text)
-    {
-        if (!preg_match('/[\200-\377]/', $text)) {
-            return $text;
-        }
-        $text = str_replace(['ä','Ä','ö','Ö','ü','Ü','ß'], ['a','A','o','O','u','U','s'], $text);
-        $text = str_replace(['À','Á','Â','Ã','Å','Æ'], 'A' , $text);
-        $text = str_replace(['à','á','â','ã','å','æ'], 'a' , $text);
-        $text = str_replace(['È','É','Ê','Ë'], 'E' , $text);
-        $text = str_replace(['è','é','ê','ë'], 'e' , $text);
-        $text = str_replace(['Ì','Í','Î','Ï'], 'I' , $text);
-        $text = str_replace(['ì','í','î','ï'], 'i' , $text);
-        $text = str_replace(['Ò','Ó','Õ','Ô','Ø'], 'O' , $text);
-        $text = str_replace(['ò','ó','ô','õ','ø'], 'o' , $text);
-        $text = str_replace(['Ù','Ú','Û'], 'U' , $text);
-        $text = str_replace(['ù','ú','û'], 'u' , $text);
-        $text = str_replace(['Ç','ç','Ð','Ñ','Ý','ñ','ý','ÿ'], ['C','c','D','N','Y','n','y','y'] , $text);
-        return $text;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param array<T>|callable(): array<T> $data array or closure to fill collection
-     */
-    public function __construct($data = [])
-    {
-        parent::__construct();
-        $this->finder = is_callable($data) ? $data : null;
-        $this->deleted = clone $this;
-        if (is_callable($data)) {
-            $this->refresh();
-        } else {
-            $this->exchangeArray($data);
-        }
-    }
-
-    /**
-     * @param array $input
-     * @return array
-     */
-    public function exchangeArray($input)
-    {
-        return parent::exchangeArray(array_map(
-            [static::class, 'arrayToArrayObject'],
-            $input
-        ));
-    }
-
-    /**
-     * converts the object and all elements to plain arrays
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $args = func_get_args();
-        return $this->map(function ($a) use ($args) {
-            if (method_exists($a, 'toArray')) {
-                return call_user_func_array([$a, 'toArray'], $args);
-            }
-            if (method_exists($a, 'getArrayCopy')) {
-                return $a->getArrayCopy();
-            }
-            return (array) $a;
-        }
-        );
-    }
-
-    /**
-     *
-     * @see ArrayObject::append()
-     */
-    public function append($newval)
-    {
-        parent::append(static::arrayToArrayObject($newval));
-    }
-
-    /**
-     * Sets the value at the specified index
-     * ensures the value has ArrayAccess
-     *
-     * @param mixed $index
-     * @param mixed $newval
-     *
-     * @see ArrayObject::offsetSet()
-     */
-
-    public function offsetSet($index, $newval): void
-    {
-        if (is_numeric($index)) {
-            $index = (int) $index;
-        }
-        parent::offsetSet($index, static::arrayToArrayObject($newval));
-    }
-
-    /**
-     * Unsets the value at the specified index
-     * value is moved to internal deleted collection
-     *
-     * @see ArrayObject::offsetUnset()
-     * @throws InvalidArgumentException
-     */
-    public function offsetUnset($index): void
-    {
-        if ($this->offsetExists($index)) {
-            $this->deleted[] = $this->offsetGet($index);
-        }
-        parent::offsetUnset($index);
-    }
-
-    /**
-     * sets the finder function
-     *
-     * @param callable(): array<T> $finder
-     * @return void
-     */
-    public function setFinder(callable $finder)
-    {
-        $this->finder = $finder;
-    }
-
-    /**
-     * get deleted records collection
-     * @return SimpleCollection<T>
-     */
-    public function getDeleted()
-    {
-        return $this->deleted;
-    }
-
-    /**
-     * reloads the elements of the collection
-     * by calling the finder function
-     *
-     * @return ?int of records after refresh
-     */
-    public function refresh()
-    {
-        if (is_callable($this->finder)) {
-            $data = call_user_func($this->finder);
-            $this->exchangeArray($data);
-            $this->deleted->exchangeArray([]);
-            return $this->last_count = $this->count();
-        }
-    }
-
-    /**
-     * returns a new collection containing all elements
-     * where given columns value matches given value(s) using passed operator
-     * pass array for multiple values
-     *
-     * operators:
-     * == equal, like php
-     * === identical, like php
-     * !=,<> not equal, like php
-     * !== not identical, like php
-     * <,>,<=,>= less,greater,less or equal,greater or equal
-     * >< between without borders, needs two arguments
-     * >=<= between including borders, needs two arguments
-     * %= like string, transliterate to ascii,case insensitive
-     * *= contains string
-     * ^= begins with string
-     * $= ends with string
-     * ~= regex
-     *
-     * @param string $key the column name
-     * @param mixed $values value to search for
-     * @param string|callable $op operator to find
-     * @return SimpleCollection<T> with found records
-     */
-    public function findBy($key, $values, $op = '==')
-    {
-        $comp_func = self::getCompFunc($op, $values);
-        return $this->filter(function ($record) use ($comp_func, $key) {
-            return $comp_func($record[$key]);
-        });
-    }
-
-    /**
-     * returns the first element
-     * where given column has given value(s)
-     * pass array for multiple values
-     *
-     * @param string $key the column name
-     * @param mixed $values value to search for,
-     * @param string|callable $op operator to find
-     * @return ?T found record
-     */
-    public function findOneBy($key, $values, $op = '==')
-    {
-        $comp_func = self::getCompFunc($op, $values);
-        return $this->filter(function ($record) use ($comp_func, $key) {
-            return $comp_func($record[$key]);
-        }, 1)->first();
-    }
-
-    /**
-     * apply given callback to all elements of
-     * collection
-     *
-     * @param callable(T): int $func the function to call
-     * @return int|false addition of return values
-     */
-    public function each(callable $func)
-    {
-        $result = false;
-        foreach ($this->storage as $record) {
-            $result += call_user_func($func, $record);
-        }
-        return $result;
-    }
-
-    /**
-     * apply given callback to all elements of
-     * collection and give back array of return values
-     *
-     * @param callable(T, mixed): mixed $func the function to call
-     * @return array<mixed>
-     */
-    public function map(callable $func)
-    {
-        $results = [];
-        foreach ($this->storage as $key => $value) {
-            $results[$key] = call_user_func($func, $value, $key);
-        }
-        return $results;
-    }
-
-    /**
-     * filter elements
-     * if given callback returns true
-     *
-     * @param ?callable(T, mixed): bool $func the function to call
-     * @param ?integer $limit limit number of found records
-     * @return SimpleCollection<T> containing filtered elements
-     */
-    public function filter(callable $func = null, $limit = null)
-    {
-        $results = [];
-        $found = 0;
-        foreach ($this->storage as $key => $value) {
-            if (call_user_func($func, $value, $key)) {
-                $results[$key] = $value;
-                if ($limit && (++$found == $limit)) {
-                    break;
-                }
-            }
-        }
-        return self::createFromArray($results);
-    }
-
-    /**
-     * Returns whether any element of the collection returns true for the
-     * given callback.
-     *
-     * @param  callable(T, mixed): bool $func the function to call
-     * @return bool
-     */
-    public function any(callable $func)
-    {
-        foreach ($this->storage as $key => $value) {
-            if (call_user_func($func, $value, $key)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns whether every element of the collection returns true for the
-     * given callback.
-     *
-     * @param  callable(T, mixed): bool $func the function to call
-     * @return bool
-     */
-    public function every(callable $func)
-    {
-        foreach ($this->storage as $key => $value) {
-            if (!call_user_func($func, $value, $key)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * extract array of columns values
-     * pass array or space-delimited string for multiple columns
-     *
-     * @param string|array $columns the column(s) to extract
-     * @return array of extracted values
-     */
-    public function pluck($columns)
-    {
-        if (!is_array($columns)) {
-            $columns = words($columns);
-        }
-        $func = function ($r) use ($columns) {
-            $result = [];
-            foreach ($columns as $c) {
-                $result[] = $r[$c];
-            }
-            return $result;
-        };
-        $result = $this->map($func);
-        return count($columns) === 1 ? array_map('current', $result) : $result;
-    }
-
-    /**
-     * returns the collection as grouped array
-     * first param is the column to group by, it becomes the key in
-     * the resulting array, default is pk. Limit returned fields with second param
-     * The grouped entries can optoionally go through the given
-     * callback. If no callback is provided, only the first grouped
-     * entry is returned, suitable for grouping by unique column
-     *
-     * @param string $group_by the column to group by, pk if ommitted
-     * @param string|array|null $only_these_fields limit returned fields
-     * @param ?callable $group_func closure to aggregate grouped entries
-     * @return array assoc array
-     */
-    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
-    {
-        $result = [];
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        foreach ($this->toArray() as $record) {
-            $key = $record[$group_by];
-            $ret = [];
-            if (is_array($only_these_fields)) {
-                $result[$key][] = array_intersect_key($record, array_flip($only_these_fields));
-            } else {
-                $result[$key][] = $record;
-            }
-        }
-        if ($group_func === null) {
-            $group_func = 'current';
-        }
-        return array_map($group_func, $result);
-    }
-
-    /**
-     * get the first element
-     *
-     * @return ?T first element or null
-     */
-    public function first()
-    {
-        $keys = array_keys($this->storage);
-        $first_offset = reset($keys);
-        return $this->offsetGet($first_offset ?: 0);
-    }
-
-    /**
-     * get the last element
-     *
-     * @return ?T last element or null
-     */
-    public function last()
-    {
-        $keys = array_keys($this->storage);
-        $last_offset = end($keys);
-        return $this->offsetGet($last_offset ?: 0);
-    }
-
-     /**
-     * get the the value from given key from first element
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function val($key)
-    {
-        $first = $this->first();
-        return $first[$key] ?? null;
-    }
-
-    /**
-     * mark element(s) for deletion
-     * where given column has given value(s)
-     * element(s) are moved to
-     * internal deleted collection
-     * pass array for multiple values
-     *
-     * operators:
-     * == equal, like php
-     * === identical, like php
-     * !=,<> not equal, like php
-     * !== not identical, like php
-     * <,>,<=,>= less,greater,less or equal,greater or equal
-     * >< between without borders, needs two arguments
-     * >=<= between including borders, needs two arguments
-     * %= like string, transliterate to ascii,case insensitive
-     * *= contains string
-     * ^= begins with string
-     * $= ends with string
-     * ~= regex
-     *
-     * @param string $key
-     * @param mixed $values
-     * @param string|callable(mixed, mixed|array): bool $op operator to find elements
-     * @return int|false number of unsetted elements
-     */
-    public function unsetBy($key, $values, $op = '==')
-    {
-        $ret = false;
-        $comp_func = self::getCompFunc($op, $values);
-        foreach ($this->storage as $k => $record) {
-            if ($comp_func($record[$key])) {
-                $this->offsetunset($k);
-                $ret += 1;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * sorts the collection by columns of contained elements and returns it
-     *
-     * works like sql order by:
-     * first param is a string containing combinations of column names
-     * and sort direction, separated by comma e.g.
-     *  'name asc, nummer desc '
-     *  sorts first by name ascending and then by nummer descending
-     *  second param denotes the sort type (using PHP sort constants):
-     *  SORT_LOCALE_STRING:
-     *  compare items as strings, transliterate latin1 to ascii, case insensitiv, natural order for numbers
-     *  SORT_NUMERIC:
-     *  compare items as integers
-     *  SORT_STRING:
-     *  compare items as strings
-     *  SORT_NATURAL:
-     *  compare items as strings using "natural ordering"
-     *  SORT_FLAG_CASE:
-     *  can be combined (bitwise OR) with SORT_STRING or SORT_NATURAL to sort strings case-insensitively
-     *
-     * @param string $order columns to order by
-     * @param integer $sort_flags
-     * @return $this the sorted collection
-     */
-    public function orderBy($order, $sort_flags = SORT_LOCALE_STRING)
-    {
-        //('name asc, nummer desc ')
-        $sort_locale = false;
-        switch ($sort_flags) {
-        case SORT_NATURAL:
-            $sort_func = 'strnatcmp';
-            break;
-        case SORT_NATURAL | SORT_FLAG_CASE:
-            $sort_func = 'strnatcasecmp';
-            break;
-        case SORT_STRING | SORT_FLAG_CASE:
-            $sort_func = 'strcasecmp';
-            break;
-        case SORT_STRING:
-            $sort_func = 'strcmp';
-            break;
-        case SORT_NUMERIC:
-            $sort_func = function ($a, $b) {
-                return (int) $a - (int) $b;
-            };
-            break;
-        case SORT_LOCALE_STRING:
-        default:
-            $sort_func = 'strnatcasecmp';
-            $sort_locale = true;
-        }
-
-        $sorter = [];
-        foreach (explode(',', $order) as $one) {
-            $sorter[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
-        }
-
-        $func = function ($d1, $d2) use ($sorter, $sort_func, $sort_locale) {
-            do {
-                $current_sorter = current($sorter);
-                $field = $current_sorter[0];
-                $dir = $current_sorter[1] ?? '';
-                if (!$sort_locale) {
-                    $value1 = $d1[$field];
-                    $value2 = $d2[$field];
-                } else {
-                    $value1 = static::translitLatin1(mb_substr($d1[$field], 0, 100));
-                    $value2 = static::translitLatin1(mb_substr($d2[$field], 0, 100));
-                }
-                $ret = $sort_func($value1, $value2);
-                if (strtolower($dir) == 'desc') $ret = $ret * -1;
-            } while ($ret === 0 && next($sorter));
-
-            return $ret;
-        };
-        if (count($sorter)) {
-            $this->uasort($func);
-        }
-        return $this;
-    }
-
-    /**
-     * returns a new collection contaning a sequence of original collection
-     * mimics the sql limit constrain:
-     * used with one parameter, the first x elements are extracted
-     * used with two parameters, the first parameter denotes the offset, the second the
-     * number of elements
-     *
-     * @param integer $arg1
-     * @param ?integer $arg2
-     * @return SimpleCollection<T>
-     */
-    public function limit($arg1, $arg2 = null)
-    {
-        if (is_null($arg2)) {
-            if ($arg1 > 0) {
-                $row_count = $arg1;
-                $offset = 0;
-            } else {
-                $row_count = abs($arg1);
-                $offset = $arg1;
-            }
-        } else {
-            $offset = $arg1;
-            $row_count = $arg2;
-        }
-        return self::createFromArray(array_slice($this->storage, $offset, $row_count, true));
-    }
-
-     /**
-     * calls the given method on all elements
-     * of the collection
-     * @param literal-string $method methodname to call
-     * @param array $params parameters for methodcall
-     * @return array of all return values
-     */
-    public function sendMessage($method, $params = []) {
-        $results = [];
-        foreach ($this->storage as $record) {
-            $results[] = call_user_func_array([$record, $method], $params);
-        }
-        return $results;
-    }
-
-    /**
-     * magic version of sendMessage
-     * calls undefineds methods on all elements of the collection
-     * But beware of the dark side...
-     *
-     * @param literal-string $method methodname to call
-     * @param array $params parameters for methodcall
-     * @return array of all return values
-     */
-    public function __call($method, $params)
-    {
-        return $this->sendMessage($method, $params);
-    }
-
-    /**
-     * merge in another collection, elements are appended
-     *
-     * @param SimpleCollection<T> $a_collection
-     * @return void
-     */
-    public function merge(SimpleCollection $a_collection)
-    {
-        $this->storage = array_merge($this->storage, $a_collection->getArrayCopy());
-    }
-}
diff --git a/lib/classes/SimpleCollection.php b/lib/classes/SimpleCollection.php
new file mode 100644
index 0000000..6acc10d
--- /dev/null
+++ b/lib/classes/SimpleCollection.php
@@ -0,0 +1,782 @@
+<?php
+if (!defined('SORT_NATURAL')) {
+    define('SORT_NATURAL', 6);
+}
+if (!defined('SORT_FLAG_CASE')) {
+    define('SORT_FLAG_CASE', 8);
+}
+
+/**
+ * SimpleCollection.class.php
+ * collection of assoc arrays with convenience
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @template T
+ */
+class SimpleCollection extends StudipArrayObject
+{
+    /**
+     * callable to initialize collection
+     *
+     * @var ?callable(): array<T>
+     */
+    protected $finder;
+
+    /**
+     * number of records after last init
+     *
+     * @var int
+     */
+    protected $last_count;
+
+    /**
+     * collection with deleted records
+     * @var static
+     */
+    protected $deleted;
+
+    /**
+     * creates a collection from an array of arrays
+     * all arrays should contain same keys, but is not enforced
+     *
+     * @param array<T> $data array containing assoc arrays
+     * @return SimpleCollection<T>
+     */
+    public static function createFromArray(array $data)
+    {
+        return new self($data);
+    }
+
+    /**
+     * converts arrays or objects to ArrayObject objects
+     * if ArrayAccess interface is not available
+     *
+     * @param mixed $a
+     * @return StudipArrayObject|ArrayAccess
+     */
+    public static function arrayToArrayObject($a)
+    {
+        if ($a instanceof StudipArrayObject) {
+            $a->setFlags(StudipArrayObject::ARRAY_AS_PROPS);
+            return $a;
+        }
+
+        if ($a instanceof ArrayObject) {
+            return new StudipArrayObject($a->getArrayCopy(), StudipArrayObject::ARRAY_AS_PROPS);
+        }
+
+        if ($a instanceof ArrayAccess) {
+            return $a;
+        }
+
+        return new StudipArrayObject((array) $a, StudipArrayObject::ARRAY_AS_PROPS);
+    }
+
+    /**
+     * returns closure to compare a value against given arguments
+     * using given operator
+     *
+     * @param string|callable(mixed, mixed|array): bool  $operator
+     * @param mixed|array $args
+     * @throws InvalidArgumentException
+     * @return callable(mixed): bool comparison function
+     */
+    public static function getCompFunc($operator, $args)
+    {
+        if (is_callable($operator)) {
+            $comp_func = function ($a) use ($args, $operator) {
+                return $operator($a, $args);
+            };
+        } else {
+            if (!is_array($args)) {
+                $args = [$args];
+            }
+            switch ($operator) {
+                case '==':
+                    $comp_func = function ($a) use ($args) {
+                        return in_array($a, $args);
+                    };
+                break;
+                case '===':
+                    $comp_func = function ($a) use ($args) {
+                        return in_array($a, $args, true);
+                    };
+                break;
+                case '!=':
+                case '<>':
+                    $comp_func = function ($a) use ($args) {
+                        return !in_array($a, $args);
+                    };
+                break;
+                case '!==':
+                    $comp_func = function ($a) use ($args) {
+                        return !in_array($a, $args, true);
+                    };
+                break;
+                case '<':
+                case '>':
+                case '<=':
+                case '>=':
+                    $op_func = function ($a, $b) use ($operator) {
+                        if ($operator === '<') {
+                            return $a < $b;
+                        } elseif ($operator === '<=') {
+                            return $a <= $b;
+                        } elseif ($operator === '>=') {
+                            return $a >= $b;
+                        } elseif ($operator === '>') {
+                            return $a > $b;
+                        }
+                    };
+                    $comp_func = function ($a) use ($op_func, $args) {
+                        return $op_func($a, $args[0]);
+                    };
+                break;
+                case '><':
+                    $comp_func = function ($a) use ($args) {
+                        return $a > $args[0] && $a < $args[1];
+                    };
+                break;
+                case '>=<=':
+                    $comp_func = function ($a) use ($args) {
+                        return $a >= $args[0] && $a <= $args[1];
+                    };
+                    break;
+                case '%=':
+                    $comp_func = function ($a) use ($args) {
+                        $a = mb_strtolower(static::translitLatin1($a));
+                        $args = array_map([static::class, 'translitLatin1'], $args);
+                        $args = array_map('mb_strtolower', $args);
+                        return in_array($a, $args);
+                    };
+                break;
+                case '*=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            if (mb_strpos($a, $arg) !== false) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                break;
+                case '^=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            if (mb_strpos($a, $arg) === 0) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                break;
+                case '$=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            $found = mb_strrpos($a, $arg);
+                            if ($found !== false && ($found + mb_strlen($arg)) === mb_strlen($a)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                break;
+                case '~=':
+                    $comp_func = function ($a) use ($args) {
+                        foreach ($args as $arg) {
+                            if (preg_match($arg, $a) === 1) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    };
+                    break;
+                default:
+                    throw new InvalidArgumentException('unknown operator: ' . $operator);
+             }
+         }
+         return $comp_func;
+    }
+
+    /**
+     * transliterates latin1 string to ascii
+     *
+     * @param string $text
+     * @return string
+     */
+    public static function translitLatin1($text)
+    {
+        if (!preg_match('/[\200-\377]/', $text)) {
+            return $text;
+        }
+        $text = str_replace(['ä','Ä','ö','Ö','ü','Ü','ß'], ['a','A','o','O','u','U','s'], $text);
+        $text = str_replace(['À','Á','Â','Ã','Å','Æ'], 'A' , $text);
+        $text = str_replace(['à','á','â','ã','å','æ'], 'a' , $text);
+        $text = str_replace(['È','É','Ê','Ë'], 'E' , $text);
+        $text = str_replace(['è','é','ê','ë'], 'e' , $text);
+        $text = str_replace(['Ì','Í','Î','Ï'], 'I' , $text);
+        $text = str_replace(['ì','í','î','ï'], 'i' , $text);
+        $text = str_replace(['Ò','Ó','Õ','Ô','Ø'], 'O' , $text);
+        $text = str_replace(['ò','ó','ô','õ','ø'], 'o' , $text);
+        $text = str_replace(['Ù','Ú','Û'], 'U' , $text);
+        $text = str_replace(['ù','ú','û'], 'u' , $text);
+        $text = str_replace(['Ç','ç','Ð','Ñ','Ý','ñ','ý','ÿ'], ['C','c','D','N','Y','n','y','y'] , $text);
+        return $text;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param array<T>|callable(): array<T> $data array or closure to fill collection
+     */
+    public function __construct($data = [])
+    {
+        parent::__construct();
+        $this->finder = is_callable($data) ? $data : null;
+        $this->deleted = clone $this;
+        if (is_callable($data)) {
+            $this->refresh();
+        } else {
+            $this->exchangeArray($data);
+        }
+    }
+
+    /**
+     * @param array $input
+     * @return array
+     */
+    public function exchangeArray($input)
+    {
+        return parent::exchangeArray(array_map(
+            [static::class, 'arrayToArrayObject'],
+            $input
+        ));
+    }
+
+    /**
+     * converts the object and all elements to plain arrays
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $args = func_get_args();
+        return $this->map(function ($a) use ($args) {
+            if (method_exists($a, 'toArray')) {
+                return call_user_func_array([$a, 'toArray'], $args);
+            }
+            if (method_exists($a, 'getArrayCopy')) {
+                return $a->getArrayCopy();
+            }
+            return (array) $a;
+        }
+        );
+    }
+
+    /**
+     *
+     * @see ArrayObject::append()
+     */
+    public function append($newval)
+    {
+        parent::append(static::arrayToArrayObject($newval));
+    }
+
+    /**
+     * Sets the value at the specified index
+     * ensures the value has ArrayAccess
+     *
+     * @param mixed $index
+     * @param mixed $newval
+     *
+     * @see ArrayObject::offsetSet()
+     */
+
+    public function offsetSet($index, $newval): void
+    {
+        if (is_numeric($index)) {
+            $index = (int) $index;
+        }
+        parent::offsetSet($index, static::arrayToArrayObject($newval));
+    }
+
+    /**
+     * Unsets the value at the specified index
+     * value is moved to internal deleted collection
+     *
+     * @see ArrayObject::offsetUnset()
+     * @throws InvalidArgumentException
+     */
+    public function offsetUnset($index): void
+    {
+        if ($this->offsetExists($index)) {
+            $this->deleted[] = $this->offsetGet($index);
+        }
+        parent::offsetUnset($index);
+    }
+
+    /**
+     * sets the finder function
+     *
+     * @param callable(): array<T> $finder
+     * @return void
+     */
+    public function setFinder(callable $finder)
+    {
+        $this->finder = $finder;
+    }
+
+    /**
+     * get deleted records collection
+     * @return SimpleCollection<T>
+     */
+    public function getDeleted()
+    {
+        return $this->deleted;
+    }
+
+    /**
+     * reloads the elements of the collection
+     * by calling the finder function
+     *
+     * @return ?int of records after refresh
+     */
+    public function refresh()
+    {
+        if (is_callable($this->finder)) {
+            $data = call_user_func($this->finder);
+            $this->exchangeArray($data);
+            $this->deleted->exchangeArray([]);
+            return $this->last_count = $this->count();
+        }
+    }
+
+    /**
+     * returns a new collection containing all elements
+     * where given columns value matches given value(s) using passed operator
+     * pass array for multiple values
+     *
+     * operators:
+     * == equal, like php
+     * === identical, like php
+     * !=,<> not equal, like php
+     * !== not identical, like php
+     * <,>,<=,>= less,greater,less or equal,greater or equal
+     * >< between without borders, needs two arguments
+     * >=<= between including borders, needs two arguments
+     * %= like string, transliterate to ascii,case insensitive
+     * *= contains string
+     * ^= begins with string
+     * $= ends with string
+     * ~= regex
+     *
+     * @param string $key the column name
+     * @param mixed $values value to search for
+     * @param string|callable $op operator to find
+     * @return SimpleCollection<T> with found records
+     */
+    public function findBy($key, $values, $op = '==')
+    {
+        $comp_func = self::getCompFunc($op, $values);
+        return $this->filter(function ($record) use ($comp_func, $key) {
+            return $comp_func($record[$key]);
+        });
+    }
+
+    /**
+     * returns the first element
+     * where given column has given value(s)
+     * pass array for multiple values
+     *
+     * @param string $key the column name
+     * @param mixed $values value to search for,
+     * @param string|callable $op operator to find
+     * @return ?T found record
+     */
+    public function findOneBy($key, $values, $op = '==')
+    {
+        $comp_func = self::getCompFunc($op, $values);
+        return $this->filter(function ($record) use ($comp_func, $key) {
+            return $comp_func($record[$key]);
+        }, 1)->first();
+    }
+
+    /**
+     * apply given callback to all elements of
+     * collection
+     *
+     * @param callable(T): int $func the function to call
+     * @return int|false addition of return values
+     */
+    public function each(callable $func)
+    {
+        $result = false;
+        foreach ($this->storage as $record) {
+            $result += call_user_func($func, $record);
+        }
+        return $result;
+    }
+
+    /**
+     * apply given callback to all elements of
+     * collection and give back array of return values
+     *
+     * @param callable(T, mixed): mixed $func the function to call
+     * @return array<mixed>
+     */
+    public function map(callable $func)
+    {
+        $results = [];
+        foreach ($this->storage as $key => $value) {
+            $results[$key] = call_user_func($func, $value, $key);
+        }
+        return $results;
+    }
+
+    /**
+     * filter elements
+     * if given callback returns true
+     *
+     * @param ?callable(T, mixed): bool $func the function to call
+     * @param ?integer $limit limit number of found records
+     * @return SimpleCollection<T> containing filtered elements
+     */
+    public function filter(callable $func = null, $limit = null)
+    {
+        $results = [];
+        $found = 0;
+        foreach ($this->storage as $key => $value) {
+            if (call_user_func($func, $value, $key)) {
+                $results[$key] = $value;
+                if ($limit && (++$found == $limit)) {
+                    break;
+                }
+            }
+        }
+        return self::createFromArray($results);
+    }
+
+    /**
+     * Returns whether any element of the collection returns true for the
+     * given callback.
+     *
+     * @param  callable(T, mixed): bool $func the function to call
+     * @return bool
+     */
+    public function any(callable $func)
+    {
+        foreach ($this->storage as $key => $value) {
+            if (call_user_func($func, $value, $key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns whether every element of the collection returns true for the
+     * given callback.
+     *
+     * @param  callable(T, mixed): bool $func the function to call
+     * @return bool
+     */
+    public function every(callable $func)
+    {
+        foreach ($this->storage as $key => $value) {
+            if (!call_user_func($func, $value, $key)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * extract array of columns values
+     * pass array or space-delimited string for multiple columns
+     *
+     * @param string|array $columns the column(s) to extract
+     * @return array of extracted values
+     */
+    public function pluck($columns)
+    {
+        if (!is_array($columns)) {
+            $columns = words($columns);
+        }
+        $func = function ($r) use ($columns) {
+            $result = [];
+            foreach ($columns as $c) {
+                $result[] = $r[$c];
+            }
+            return $result;
+        };
+        $result = $this->map($func);
+        return count($columns) === 1 ? array_map('current', $result) : $result;
+    }
+
+    /**
+     * returns the collection as grouped array
+     * first param is the column to group by, it becomes the key in
+     * the resulting array, default is pk. Limit returned fields with second param
+     * The grouped entries can optoionally go through the given
+     * callback. If no callback is provided, only the first grouped
+     * entry is returned, suitable for grouping by unique column
+     *
+     * @param string $group_by the column to group by, pk if ommitted
+     * @param string|array|null $only_these_fields limit returned fields
+     * @param ?callable $group_func closure to aggregate grouped entries
+     * @return array assoc array
+     */
+    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
+    {
+        $result = [];
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        foreach ($this->toArray() as $record) {
+            $key = $record[$group_by];
+            $ret = [];
+            if (is_array($only_these_fields)) {
+                $result[$key][] = array_intersect_key($record, array_flip($only_these_fields));
+            } else {
+                $result[$key][] = $record;
+            }
+        }
+        if ($group_func === null) {
+            $group_func = 'current';
+        }
+        return array_map($group_func, $result);
+    }
+
+    /**
+     * get the first element
+     *
+     * @return ?T first element or null
+     */
+    public function first()
+    {
+        $keys = array_keys($this->storage);
+        $first_offset = reset($keys);
+        return $this->offsetGet($first_offset ?: 0);
+    }
+
+    /**
+     * get the last element
+     *
+     * @return ?T last element or null
+     */
+    public function last()
+    {
+        $keys = array_keys($this->storage);
+        $last_offset = end($keys);
+        return $this->offsetGet($last_offset ?: 0);
+    }
+
+     /**
+     * get the the value from given key from first element
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function val($key)
+    {
+        $first = $this->first();
+        return $first[$key] ?? null;
+    }
+
+    /**
+     * mark element(s) for deletion
+     * where given column has given value(s)
+     * element(s) are moved to
+     * internal deleted collection
+     * pass array for multiple values
+     *
+     * operators:
+     * == equal, like php
+     * === identical, like php
+     * !=,<> not equal, like php
+     * !== not identical, like php
+     * <,>,<=,>= less,greater,less or equal,greater or equal
+     * >< between without borders, needs two arguments
+     * >=<= between including borders, needs two arguments
+     * %= like string, transliterate to ascii,case insensitive
+     * *= contains string
+     * ^= begins with string
+     * $= ends with string
+     * ~= regex
+     *
+     * @param string $key
+     * @param mixed $values
+     * @param string|callable(mixed, mixed|array): bool $op operator to find elements
+     * @return int|false number of unsetted elements
+     */
+    public function unsetBy($key, $values, $op = '==')
+    {
+        $ret = false;
+        $comp_func = self::getCompFunc($op, $values);
+        foreach ($this->storage as $k => $record) {
+            if ($comp_func($record[$key])) {
+                $this->offsetunset($k);
+                $ret += 1;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * sorts the collection by columns of contained elements and returns it
+     *
+     * works like sql order by:
+     * first param is a string containing combinations of column names
+     * and sort direction, separated by comma e.g.
+     *  'name asc, nummer desc '
+     *  sorts first by name ascending and then by nummer descending
+     *  second param denotes the sort type (using PHP sort constants):
+     *  SORT_LOCALE_STRING:
+     *  compare items as strings, transliterate latin1 to ascii, case insensitiv, natural order for numbers
+     *  SORT_NUMERIC:
+     *  compare items as integers
+     *  SORT_STRING:
+     *  compare items as strings
+     *  SORT_NATURAL:
+     *  compare items as strings using "natural ordering"
+     *  SORT_FLAG_CASE:
+     *  can be combined (bitwise OR) with SORT_STRING or SORT_NATURAL to sort strings case-insensitively
+     *
+     * @param string $order columns to order by
+     * @param integer $sort_flags
+     * @return $this the sorted collection
+     */
+    public function orderBy($order, $sort_flags = SORT_LOCALE_STRING)
+    {
+        //('name asc, nummer desc ')
+        $sort_locale = false;
+        switch ($sort_flags) {
+        case SORT_NATURAL:
+            $sort_func = 'strnatcmp';
+            break;
+        case SORT_NATURAL | SORT_FLAG_CASE:
+            $sort_func = 'strnatcasecmp';
+            break;
+        case SORT_STRING | SORT_FLAG_CASE:
+            $sort_func = 'strcasecmp';
+            break;
+        case SORT_STRING:
+            $sort_func = 'strcmp';
+            break;
+        case SORT_NUMERIC:
+            $sort_func = function ($a, $b) {
+                return (int) $a - (int) $b;
+            };
+            break;
+        case SORT_LOCALE_STRING:
+        default:
+            $sort_func = 'strnatcasecmp';
+            $sort_locale = true;
+        }
+
+        $sorter = [];
+        foreach (explode(',', $order) as $one) {
+            $sorter[] = array_values(array_filter(array_map('trim', explode(' ', $one))));
+        }
+
+        $func = function ($d1, $d2) use ($sorter, $sort_func, $sort_locale) {
+            do {
+                $current_sorter = current($sorter);
+                $field = $current_sorter[0];
+                $dir = $current_sorter[1] ?? '';
+                if (!$sort_locale) {
+                    $value1 = $d1[$field];
+                    $value2 = $d2[$field];
+                } else {
+                    $value1 = static::translitLatin1(mb_substr($d1[$field], 0, 100));
+                    $value2 = static::translitLatin1(mb_substr($d2[$field], 0, 100));
+                }
+                $ret = $sort_func($value1, $value2);
+                if (strtolower($dir) == 'desc') $ret = $ret * -1;
+            } while ($ret === 0 && next($sorter));
+
+            return $ret;
+        };
+        if (count($sorter)) {
+            $this->uasort($func);
+        }
+        return $this;
+    }
+
+    /**
+     * returns a new collection contaning a sequence of original collection
+     * mimics the sql limit constrain:
+     * used with one parameter, the first x elements are extracted
+     * used with two parameters, the first parameter denotes the offset, the second the
+     * number of elements
+     *
+     * @param integer $arg1
+     * @param ?integer $arg2
+     * @return SimpleCollection<T>
+     */
+    public function limit($arg1, $arg2 = null)
+    {
+        if (is_null($arg2)) {
+            if ($arg1 > 0) {
+                $row_count = $arg1;
+                $offset = 0;
+            } else {
+                $row_count = abs($arg1);
+                $offset = $arg1;
+            }
+        } else {
+            $offset = $arg1;
+            $row_count = $arg2;
+        }
+        return self::createFromArray(array_slice($this->storage, $offset, $row_count, true));
+    }
+
+     /**
+     * calls the given method on all elements
+     * of the collection
+     * @param literal-string $method methodname to call
+     * @param array $params parameters for methodcall
+     * @return array of all return values
+     */
+    public function sendMessage($method, $params = []) {
+        $results = [];
+        foreach ($this->storage as $record) {
+            $results[] = call_user_func_array([$record, $method], $params);
+        }
+        return $results;
+    }
+
+    /**
+     * magic version of sendMessage
+     * calls undefineds methods on all elements of the collection
+     * But beware of the dark side...
+     *
+     * @param literal-string $method methodname to call
+     * @param array $params parameters for methodcall
+     * @return array of all return values
+     */
+    public function __call($method, $params)
+    {
+        return $this->sendMessage($method, $params);
+    }
+
+    /**
+     * merge in another collection, elements are appended
+     *
+     * @param SimpleCollection<T> $a_collection
+     * @return void
+     */
+    public function merge(SimpleCollection $a_collection)
+    {
+        $this->storage = array_merge($this->storage, $a_collection->getArrayCopy());
+    }
+}
diff --git a/lib/classes/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
deleted file mode 100644
index 7124cc4..0000000
--- a/lib/classes/SimpleORMap.class.php
+++ /dev/null
@@ -1,2483 +0,0 @@
-<?php
-/**
- * SimpleORMap.class.php
- * simple object-relational mapping
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
-{
-    /**
-     * Defines `_` as character used when joining composite primary keys.
-     */
-    const ID_SEPARATOR = '_';
-
-    /**
-     * table row data
-     * @var array $content
-     */
-    protected $content = [];
-
-    /**
-     * table row data
-     * @var array $content_db
-     */
-    protected $content_db = [];
-
-    /**
-     * new state of entry
-     * @var boolean $is_new
-     */
-    protected $is_new = true;
-
-    /**
-     * deleted state of entry
-     * @var boolean $is_deleted
-     */
-    protected $is_deleted = false;
-
-     /**
-     * db table metadata
-     * @var ?array $schemes;
-     */
-    public static $schemes = null;
-
-    /**
-     * configuration data for subclasses
-     * @see self::configure()
-     * @var array $config;
-     */
-    protected static $config = [];
-
-    /**
-     * stores instantiated related objects
-     * @var array $relations
-     */
-    protected $relations = [];
-
-    /**
-     * assoc array for storing values for additional fields
-     *
-     * @var array $additional_data
-     */
-    protected $additional_data = [];
-
-    /**
-     * reserved indentifiers, fields with those names must not have an explicit getXXX() method
-     * @var array $reserved_slots
-     */
-    protected static $reserved_slots = ['value','newid','iterator','tablemetadata', 'relationvalue','wherequery','relationoptions','data','new','id'];
-
-    /**
-     * indicator for batch operations in findEachBySQL
-     *
-     * @var bool $performs_batch_operation
-     */
-    protected static $performs_batch_operation = false;
-
-    /**
-     * name of db table
-     * @return string
-     */
-    protected static function db_table()
-    {
-        return static::config('db_table');
-    }
-
-    /**
-     * table columns
-     * @return array
-     */
-    protected static function db_fields()
-    {
-        return static::config('db_fields');
-    }
-
-    /**
-     * primary key columns
-     * @return array
-     */
-    protected static function pk()
-    {
-        return static::config('pk');
-    }
-
-    /**
-     * default values for columns
-     * @return array
-     */
-    protected static function default_values()
-    {
-        return static::config('default_values');
-    }
-
-    /**
-     * list of columns to deserialize
-     * @return array key is name of column, value is name of ArrayObject class
-     */
-    protected static function serialized_fields()
-    {
-        return static::config('serialized_fields');
-    }
-
-    /**
-     * aliases for columns
-     * alias => column
-     * @return array
-     */
-    protected static function alias_fields()
-    {
-        return static::config('alias_fields');
-    }
-
-    /**
-     * multi-language fields
-     * name => boolean
-     * @return array
-     */
-    protected static function i18n_fields()
-    {
-        return static::config('i18n_fields');
-    }
-
-    /**
-     * additional computed fields
-     * name => callable
-     * @return array
-     */
-    protected static function additional_fields()
-    {
-        return static::config('additional_fields');
-    }
-
-    /**
-     * 1:n relation
-     * @return array
-     */
-    protected static function has_many()
-    {
-        return static::config('has_many');
-    }
-
-    /**
-     * 1:1 relation
-     * @return array
-     */
-    protected static function has_one()
-    {
-        return static::config('has_one');
-    }
-
-    /**
-     * n:1 relations
-     * @return array
-     */
-    protected static function belongs_to()
-    {
-        return static::config('belongs_to');
-    }
-
-    /**
-     * n:m relations
-     * @return array
-     */
-    protected static function has_and_belongs_to_many()
-    {
-        return static::config('has_and_belongs_to_many');
-    }
-
-    /**
-     * callbacks
-     * @return array<string, array<string|Closure>>
-     */
-    protected static function registered_callbacks()
-    {
-        return static::config('registered_callbacks');
-    }
-
-    /**
-     * contains an array of all used identifiers for fields
-     * (db columns + aliased columns + additional columns + relations)
-     * @return array
-     */
-    protected static function known_slots()
-    {
-        return static::config('known_slots');
-    }
-
-    /**
-     * assoc array used to map SORM callback to NotificationCenter
-     * keys are SORM callbacks, values notifications
-     * eg. 'after_create' => 'FooDidCreate'
-     *
-     * @return array
-     */
-    protected static function notification_map()
-    {
-        return static::config('notification_map');
-    }
-
-    /**
-     * assoc array for mapping get/set Methods
-     *
-     * @return array
-     */
-    protected static function getter_setter_map()
-    {
-        return static::config('getter_setter_map');
-    }
-
-    //////////////////////////////////////////////////
-
-    /**
-     * set configuration data from subclass
-     *
-     * @param ?array $config configuration data
-     * @return void
-     */
-    protected static function configure($config = [])
-    {
-        $class = static::class;
-
-        if (empty($config['db_table'])) {
-            $config['db_table'] = strtolower($class);
-        }
-
-        if (!isset($config['db_fields'])) {
-            if (static::tableScheme($config['db_table'])) {
-                $config['db_fields'] = self::$schemes[$config['db_table']]['db_fields'];
-                $config['pk'] = self::$schemes[$config['db_table']]['pk'];
-            }
-        }
-
-        if (isset($config['pk'])
-            && !isset($config['db_fields']['id'])
-            && !isset($config['alias_fields']['id'])
-            && !isset($config['additional_fields']['id'])
-        ) {
-            if (count($config['pk']) === 1) {
-                $config['alias_fields']['id'] = $config['pk'][0];
-            } else {
-                $config['additional_fields']['id'] = ['get' => '_getId',
-                                                           'set' => '_setId'];
-            }
-        }
-        if (isset($config['additional_fields'])) {
-            foreach ($config['additional_fields'] as $a_field => $a_config) {
-                if (is_array($a_config) && !(isset($a_config['get']) || isset($a_config['set']))) {
-                    $relation = $a_config[0] ?? '';
-                    $relation_field = $a_config[1] ?? '';
-                    if (!$relation) {
-                        [$relation, $relation_field] = explode('_', $a_field);
-                    }
-                    if (!$relation_field || !$relation) {
-                        throw new UnexpectedValueException('no relation found for autoget/set additional field: ' . $a_field);
-                    }
-                    $config['additional_fields'][$a_field] = ['get'            => '_getAdditionalValueFromRelation',
-                                                                   'set'            => '_setAdditionalValue',
-                                                                   'relation'       => $relation,
-                                                                   'relation_field' => $relation_field];
-                }
-            }
-        }
-        if (isset($config['serialized_fields'])) {
-            foreach ($config['serialized_fields'] as $a_field => $object_type) {
-                if (!(is_subclass_of($object_type, 'StudipArrayObject'))) {
-                    throw new UnexpectedValueException(sprintf('serialized field %s must use subclass of StudipArrayObject', $a_field));
-                }
-            }
-        }
-
-        foreach (['default_values', 'serialized_fields', 'alias_fields', 'i18n_fields', 'additional_fields'] as $fields) {
-            if (!isset($config[$fields])) {
-                $config[$fields] = [];
-            }
-        }
-
-        foreach (['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            if (isset($config[$type]) && is_array($config[$type])) {
-                foreach (array_keys($config[$type]) as $one) {
-                    $config['relations'][$one] = null;
-                }
-            } else {
-                $config[$type] = [];
-            }
-        }
-
-        $callbacks = ['before_create',
-                      'before_update',
-                      'before_store',
-                      'before_delete',
-                      'before_initialize',
-                      'after_create',
-                      'after_update',
-                      'after_store',
-                      'after_delete',
-                      'after_initialize'];
-
-        foreach ($callbacks as $callback) {
-            if (!isset($config['registered_callbacks'][$callback])) {
-                $config['registered_callbacks'][$callback] = [];
-            }
-        }
-
-        $auto_notification_map['after_create'] = $class . 'DidCreate';
-        $auto_notification_map['after_store'] = $class . 'DidStore';
-        $auto_notification_map['after_delete'] = $class . 'DidDelete';
-        $auto_notification_map['after_update'] = $class . 'DidUpdate';
-        $auto_notification_map['before_create'] = $class . 'WillCreate';
-        $auto_notification_map['before_store'] = $class . 'WillStore';
-        $auto_notification_map['before_delete'] = $class . 'WillDelete';
-        $auto_notification_map['before_update'] = $class . 'WillUpdate';
-
-        foreach ($auto_notification_map as $cb => $notification) {
-            if (isset($config['notification_map'][$cb])) {
-                if (strpos($config['notification_map'][$cb], $notification) !== false) {
-                    $config['notification_map'][$cb] .= ' ' . $notification;
-                }
-            } else {
-                $config['notification_map'][$cb] = $notification;
-            }
-        }
-
-        if (is_array($config['notification_map'])) {
-            foreach (array_keys($config['notification_map']) as $cb) {
-                $config['registered_callbacks'][$cb][] = 'cbNotificationMapper';
-            }
-        }
-
-        if (!I18N::isEnabled() || empty($config['i18n_fields'])) {
-            $config['i18n_fields'] = [];
-        } elseif (is_string($config['i18n_fields'])) {
-            $i18n_fields = words($config['i18n_fields']);
-            $config['i18n_fields'] = array_combine(
-                $i18n_fields,
-                array_fill(0, count($i18n_fields), true)
-            );
-        } elseif (array_is_list($config['i18n_fields'])) {
-            $config['i18n_fields'] = array_combine(
-                $config['i18n_fields'],
-                array_fill(0, count($config['i18n_fields']), true)
-            );
-        }
-
-        array_unshift($config['registered_callbacks']['after_initialize'], 'cbAfterInitialize');
-
-        $config['known_slots'] = array_merge(
-            array_keys($config['db_fields']),
-            array_keys($config['alias_fields'] ?? []),
-            array_keys($config['additional_fields'] ?? []),
-            array_keys($config['relations'] ?? [])
-        );
-
-        foreach (array_map('strtolower', get_class_methods($class)) as $method) {
-            if (in_array(substr($method, 0, 3), ['get', 'set'])) {
-                $verb = substr($method, 0, 3);
-                $name = substr($method, 3);
-                if (in_array($name, $config['known_slots']) && !in_array($name, static::$reserved_slots) && !isset($config['additional_fields'][$name][$verb])) {
-                    $config['getter_setter_map'][$name][$verb] = $method;
-                }
-            }
-        }
-        self::$config[$class] = $config;
-    }
-
-    /**
-     * fetch config data for the called class
-     *
-     * @param string $key config key
-     * @return mixed value of config key (null if not set)
-     */
-    protected static function config($key)
-    {
-        if (!array_key_exists(static::class, self::$config)) {
-            static::configure();
-        }
-
-        return self::$config[static::class][$key] ?? null;
-    }
-
-    /**
-     * fetch table metadata from db or from local cache
-     *
-     * @param string $db_table
-     * @return bool true if metadata could be fetched
-     */
-    public static function tableScheme($db_table)
-    {
-        if (self::$schemes === null) {
-            $cache = \Studip\Cache\Factory::getCache();
-            self::$schemes = unserialize($cache->read('DB_TABLE_SCHEMES'));
-        }
-        if (!isset(self::$schemes[$db_table])) {
-            $db = DBManager::get()->query("SHOW COLUMNS FROM $db_table");
-            while($rs = $db->fetch(PDO::FETCH_ASSOC)){
-                $db_fields[strtolower($rs['Field'])] = [
-                    'name' => $rs['Field'],
-                    'null' => $rs['Null'],
-                    'default' => $rs['Default'],
-                    'type' => $rs['Type'],
-                    'extra' => $rs['Extra']
-                ];
-                if ($rs['Key'] == 'PRI'){
-                    $pk[] = strtolower($rs['Field']);
-                }
-            }
-            self::$schemes[$db_table]['db_fields'] = $db_fields;
-            self::$schemes[$db_table]['pk'] = $pk;
-            $cache = \Studip\Cache\Factory::getCache();
-            $cache->write('DB_TABLE_SCHEMES', serialize(self::$schemes));
-        }
-        return isset(self::$schemes[$db_table]);
-    }
-
-    /**
-     * force reload of cached table metadata
-     * @return void
-     */
-    public static function expireTableScheme()
-    {
-        \Studip\Cache\Factory::getCache()->expire('DB_TABLE_SCHEMES');
-        self::$schemes = null;
-        self::$config = [];
-    }
-
-    /**
-     * Returns new instance for given key when found in the database, else null.
-     *
-     * @param string|array $id primary key
-     * @return static|null
-     */
-    public static function find($id)
-    {
-        $ref = new ReflectionClass(static::class);
-        /** @var static $record */
-        $record = $ref->newInstanceArgs(func_get_args());
-        if (!$record->isNew()) {
-            return $record;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns true if given key exists in the database.
-     *
-     * @param string|array $id primary key
-     * @return boolean
-     */
-    public static function exists($id)
-    {
-        $ret = false;
-        $db_table = static::db_table();
-        $record = new static();
-        $record->setId(...func_get_args());
-        $where_query = $record->getWhereQuery();
-        if ($where_query) {
-            $query = "SELECT 1 FROM `$db_table` WHERE "
-                    . join(" AND ", $where_query);
-            $ret = (bool)DBManager::get()->query($query)->fetchColumn();
-        }
-        return $ret;
-    }
-
-    /**
-     * returns number of records
-     *
-     * @param ?string $sql sql clause to use on the right side of WHERE
-     * @param ?array $params params for query
-     * @return int
-     */
-    public static function countBySql($sql = '1', $params = [])
-    {
-        $db_table = static::db_table();
-        $db = DBManager::get();
-        $has_join = stripos($sql, 'JOIN ');
-        if ($has_join === false || $has_join > 10) {
-            $sql = 'WHERE ' . $sql;
-        }
-        $sql = "SELECT count(*) FROM `" .  $db_table . "` " . $sql;
-        $st = $db->prepare($sql);
-        $st->execute($params);
-        return (int)$st->fetchColumn();
-    }
-
-    /**
-     * creates new record with given data in db
-     * returns the new object or null
-     * @param array $data assoc array of record
-     * @return ?static
-     */
-    public static function create($data)
-    {
-        $record = new static();
-        $record->setData($data, false);
-        if ($record->store()) {
-            return $record;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * build object with given data
-     *
-     * @param array $data assoc array of record
-     * @param ?bool $is_new set object to new state
-     * @return static
-     */
-    public static function build($data, $is_new = true)
-    {
-        $record = new static();
-        $record->setData($data, !$is_new);
-        $record->setNew($is_new);
-        return $record;
-    }
-
-    /**
-     * build object with given data and mark it as existing
-     *
-     * @param array $data assoc array of record
-     * @return static
-     */
-    public static function buildExisting($data)
-    {
-        return static::build($data, false);
-    }
-
-    /**
-     * generate SimpleORMap object structure from assoc array
-     * if given array contains data of related objects in sub-arrays
-     * they are also generated. Existing records are updated, new records are created
-     * (but changes are not yet stored)
-     *
-     * @param array $data
-     * @return static
-     */
-    public static function import($data)
-    {
-        $record_data = [];
-        $relation_data = [];
-        foreach ($data as $key => $value) {
-            $temp = static::alias_fields()[$key] ?? $key;
-            if (isset(static::db_fields()[$temp])) {
-                $record_data[$key] = $value;
-            } else {
-                $relation_data[$key] = $value;
-            }
-        }
-        $record = static::toObject($record_data);
-        if (!$record instanceof static) {
-            $record = new static();
-            $record->setData($record_data, true);
-        } else {
-            $record->setData($record_data);
-        }
-        foreach ($relation_data as $relation => $data) {
-            if (!$record->isRelation($relation)) {
-                continue;
-            }
-
-            $options = $record->getRelationOptions($relation);
-            if ($options['type'] == 'has_one') {
-                $record->{$relation} = call_user_func([$options['class_name'], 'import'], $data);
-            }
-            if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
-                foreach ($data as $one) {
-                    $current = call_user_func([$options['class_name'], 'import'], $one);
-                    if ($options['type'] == 'has_many') {
-                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $record);
-                        call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
-                    }
-                    if ($current->id !== null) {
-                        $existing = $record->{$relation}->find($current->id);
-                        if ($existing) {
-                            $existing->setData($current);
-                        } else {
-                            $record->{$relation}->append($current);
-                        }
-                    } else {
-                        $record->{$relation}->append($current);
-                    }
-                }
-            }
-        }
-        return $record;
-    }
-
-    /**
-     * returns array of instances of given class filtered by given sql
-     * @param string $sql sql clause to use on the right side of WHERE
-     * @param ?array $params parameters for query
-     * @return static[] array of "self" objects
-     */
-    public static function findBySQL($sql, $params = [])
-    {
-        $db_table = static::db_table();
-
-        $has_join = stripos($sql, 'JOIN ');
-        if ($has_join === false || $has_join > 10) {
-            $sql = 'WHERE ' . $sql;
-        }
-        $sql = "SELECT `" . $db_table . "`.* FROM `" . $db_table . "` " . $sql;
-        $stmt = DBManager::get()->prepare($sql);
-        $stmt->execute($params);
-
-        $record = static::build([], false);
-
-        $ret = [];
-        do  {
-            $clone = clone $record;
-            $clone->setNew(false);
-            $stmt->setFetchMode(PDO::FETCH_INTO, $clone);
-
-            if ($clone = $stmt->fetch()) {
-                $clone->applyCallbacks('after_initialize');
-                $ret[] = $clone;
-            }
-        } while ($clone);
-        return $ret;
-    }
-
-    /**
-     * returns one instance of given class filtered by given sql
-     * only first row of query is used
-     * @param string $where sql clause to use on the right side of WHERE
-     * @param ?array $params parameters for query
-     * @return ?static
-     */
-    public static function findOneBySQL($where, $params = [])
-    {
-        if (stripos($where, 'LIMIT') === false) {
-            $where .= " LIMIT 1";
-        }
-        $found = static::findBySQL($where, $params);
-        return isset($found[0]) ? $found[0] : null;
-    }
-
-    /**
-     * find related records for a n:m relation (has_many_and_belongs_to_many)
-     * using a combination table holding the keys
-     *
-     * @param string $foreign_key_value value of foreign key to find related records
-     * @param array $options relation options from other side of relation
-     * @return static[] array of "self" objects
-     */
-    public static function findThru($foreign_key_value, $options)
-    {
-        $thru_table = $options['thru_table'];
-        $thru_key = $options['thru_key'];
-        $thru_assoc_key = $options['thru_assoc_key'];
-        $assoc_foreign_key = $options['assoc_foreign_key'];
-
-        $db_table = static::db_table();
-
-        $sql = "SELECT `$db_table`.* FROM `$thru_table`
-        INNER JOIN `$db_table` ON `$thru_table`.`$thru_assoc_key` = `$db_table`.`$assoc_foreign_key`
-        WHERE `$thru_table`.`$thru_key` = ? " . ($options['order_by'] ?? '');
-        $st = DBManager::get()->prepare($sql);
-        $st->execute([$foreign_key_value]);
-
-        $record = static::build([], false);
-
-        $ret = [];
-        do {
-            $clone = clone $record;
-            $clone->setNew(false);
-            $st->setFetchMode(PDO::FETCH_INTO, $clone);
-
-            if ($clone = $st->fetch()) {
-                $clone->applyCallbacks('after_initialize');
-                $ret[] = $clone;
-            }
-        } while ($clone);
-        return $ret;
-    }
-
-    /**
-     * passes objects for given sql through given callback
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param string $sql where clause of sql
-     * @param ?array $params sql statement parameters
-     * @return integer number of found records
-     */
-    public static function findEachBySQL($callable, $sql, $params = [])
-    {
-        $has_join = stripos($sql, 'JOIN ');
-        if ($has_join === false || $has_join > 10) {
-            $sql = "WHERE {$sql}";
-        }
-
-        $db_table = static::db_table();
-        $st = DBManager::get()->prepare("SELECT `{$db_table}`.* FROM `{$db_table}` {$sql}");
-        $st->execute($params);
-
-        // Indicate that we are performing a batch operation
-        static::$performs_batch_operation = true;
-
-        $record = static::build([], false);
-
-        $ret = 0;
-        do {
-            $clone = clone $record;
-            $clone->setNew(false);
-            $st->setFetchMode(PDO::FETCH_INTO, $clone);
-
-            if ($clone = $st->fetch()) {
-                $clone->applyCallbacks('after_initialize');
-                $callable($clone, $ret++);
-            }
-        } while ($clone);
-
-        // Reset batch operation indicator
-        static::$performs_batch_operation = false;
-
-        return $ret;
-    }
-
-    /**
-     * returns array of instances of given class for by given pks
-     * @param ?array $pks array of primary keys
-     * @param ?string $order order by clause
-     * @param ?array $order_params
-     * @return static[]
-     */
-    public static function findMany($pks = [], $order = '', $order_params = [])
-    {
-        $db_table = static::db_table();
-        $pk = static::pk();
-        $db = DBManager::get();
-        if (count($pk) > 1) {
-            throw new Exception('not implemented yet');
-        }
-        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
-        return static::findBySQL($where . $order, $order_params);
-    }
-
-    /**
-     * passes objects for by given pks through given callback
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param ?array $pks array of primary keys of called class
-     * @param ?string $order order by sql
-     * @param ?array $order_params
-     * @return integer number of found records
-     */
-    public static function findEachMany($callable, $pks = [], $order = '', $order_params = [])
-    {
-        $db_table = static::db_table();
-        $pk = static::pk();
-        $db = DBManager::get();
-        if (count($pk) > 1) {
-            throw new Exception('not implemented yet');
-        }
-        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
-        return static::findEachBySQL($callable, $where . $order, $order_params);
-    }
-
-    /**
-     * passes objects for given sql through given callback
-     * and returns an array of callback return values
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param string $where where clause of sql
-     * @param array $params sql statement parameters
-     * @return array return values of callback
-     */
-    public static function findAndMapBySQL($callable, $where, $params = [])
-    {
-        $ret = [];
-        $calleach = function($m) use (&$ret, $callable) {
-            $ret[] = $callable($m);
-        };
-        static::findEachBySQL($calleach, $where, $params);
-        return $ret;
-    }
-
-    /**
-     * passes objects for by given pks through given callback
-     * and returns an array of callback return values
-     *
-     * @param callable $callable callback which gets the current record as param
-     * @param ?array $pks array of primary keys of called class
-     * @param ?string $order order by sql
-     * @param ?array $order_params
-     * @return array return values of callback
-     */
-    public static function findAndMapMany($callable, $pks = [], $order = '', $order_params = [])
-    {
-        $ret = [];
-        $calleach = function($m) use (&$ret, $callable) {
-            $ret[] = $callable($m);
-        };
-        $db_table = static::db_table();
-        $pk = static::pk();
-        $db = DBManager::get();
-        if (count($pk) > 1) {
-            throw new Exception('not implemented yet');
-        }
-        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
-        static::findEachBySQL($calleach, $where . $order, $order_params);
-        return $ret;
-    }
-
-    /**
-     * deletes objects specified by sql clause
-     * @param string $where sql clause to use on the right side of WHERE
-     * @param ?array $params parameters for query
-     * @return integer number of deleted records
-     */
-    public static function deleteBySQL($where, $params = [])
-    {
-        $killeach = function($record) {$record->delete();};
-        return static::findEachBySQL($killeach, $where, $params);
-    }
-
-    /**
-     * returns object of given class for given id or null
-     * the param could be a string, an assoc array containing primary key field
-     * or an already matching object. In all these cases an object is returned
-     *
-     * @param string|static|array $id_or_object id as string, object or assoc array
-     * @return static
-     */
-    public static function toObject($id_or_object)
-    {
-        if ($id_or_object instanceof static) {
-            return $id_or_object;
-        }
-        if (is_array($id_or_object)) {
-            $pk = static::pk();
-            $key_values = [];
-            foreach ($pk as $key) {
-                if (array_key_exists($key, $id_or_object)) {
-                    $key_values[] = $id_or_object[$key];
-                }
-            }
-            if (count($pk) === count($key_values)) {
-                if (count($pk) === 1) {
-                    $id = $key_values[0];
-                } else {
-                    $id = $key_values;
-                }
-            } else {
-                $id = null;
-            }
-        } else {
-            $id = $id_or_object;
-        }
-        return static::find($id);
-    }
-
-    /**
-     * interceptor for static findByColumn / findEachByColumn / countByColumn /
-     * deleteByColumn magic
-     *
-     * @param string $name
-     * @param array $arguments
-     * @throws BadMethodCallException
-     * @return int|static|static[]
-     */
-    public static function __callStatic(string $name, array $arguments)
-    {
-        $db_table = static::db_table();
-        $alias_fields = static::alias_fields();
-        $db_fields = static::db_fields();
-        $name = strtolower($name);
-        $order = '';
-        $param_arr = [];
-        $where = '';
-        $where_param = is_array($arguments[0]) ? $arguments[0] : [$arguments[0]];
-        $action = strstr($name, 'by', true);
-        $field = substr($name, strlen($action) + 2);
-        switch ($action) {
-            case 'findone':
-                $order = $arguments[1] ?? '';
-                $param_arr[0] =& $where;
-                $param_arr[1] = [$where_param];
-                $method = 'findonebysql';
-                break;
-            case 'find':
-            case 'findmany':
-                $order = $arguments[1] ?? '';
-                $param_arr[0] =& $where;
-                $param_arr[1] = [$where_param];
-                $method = 'findbysql';
-                break;
-            case 'findeach':
-            case 'findeachmany':
-                $order = $arguments[2] ?? '';
-                $param_arr[0] = $arguments[0];
-                $param_arr[1] =& $where;
-                $param_arr[2] = [$arguments[1]];
-                $method = 'findeachbysql';
-                break;
-            case 'count':
-            case 'delete':
-                $param_arr[0] =& $where;
-                $param_arr[1] = [$where_param];
-                $method = "{$action}bysql";
-                break;
-            default:
-                throw new BadMethodCallException("Method " . static::class . "::$name not found");
-        }
-        if (isset($alias_fields[$field])) {
-            $field = $alias_fields[$field];
-        }
-        if (isset($db_fields[$field])) {
-            $where = "`$db_table`.`$field` IN(?) " . $order;
-            return call_user_func_array([static::class, $method], $param_arr);
-        }
-        throw new BadMethodCallException("Method " . static::class . "::$name not found");
-    }
-
-    /**
-     * constructor, give primary key of record as param to fetch
-     * corresponding record from db if available, if not preset primary key
-     * with given value. Give null to create new record
-     *
-     * @param null|int|string|array $id primary key of table
-     */
-    function __construct($id = null)
-    {
-        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            foreach (array_keys($this->$type()) as $one) {
-                $this->relations[$one] = null;
-            }
-        }
-
-        if ($id) {
-            $this->setId($id);
-        }
-        $this->restore();
-    }
-
-    /**
-     * returns internal used id value (multiple keys concatenated with _)
-     * @param mixed $field unused parameter
-     * @return ?string
-     */
-    protected function _getId($field)
-    {
-        return is_null($this->getId())
-             ? null
-             : implode(self::ID_SEPARATOR, $this->getId());
-    }
-
-    /**
-     * sets internal used id value (multiple keys concatenated with _)
-     * @param string $field Field to set (unused since it's always the id)
-     * @param string $value Value for id field
-     * @return bool
-     */
-    protected function _setId($field, $value)
-    {
-        return $this->setId(explode(self::ID_SEPARATOR, $value));
-    }
-
-    /**
-     * retrieves an additional field value from relation
-     *
-     * @param string $field
-     * @return mixed
-     */
-    protected function _getAdditionalValueFromRelation($field)
-    {
-        [$relation, $relation_field] = [$this->additional_fields()[$field]['relation'],
-                                                $this->additional_fields()[$field]['relation_field']];
-        if (!array_key_exists($field, $this->additional_data)) {
-            $this->_setAdditionalValue($field, $this->getRelationValue($relation, $relation_field));
-        }
-        return $this->additional_data[$field];
-    }
-
-    /**
-     * sets additional value in field imported from relation
-     *
-     * @param string $field
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function _setAdditionalValueFromRelation($field, $value)
-    {
-        [$relation, $relation_field] = [$this->additional_fields()[$field]['relation'],
-                $this->additional_fields()[$field]['relation_field']];
-        $this->$relation->$field = $value;
-        unset($this->additional_data[$field]);
-        return $this->_getAdditionalValueFromRelation($field);
-    }
-
-    /**
-     * @param string $field
-     * @return mixed
-     */
-    protected function _getAdditionalValue($field)
-    {
-        return $this->additional_data[$field];
-    }
-
-    /**
-     * @param string $field
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function _setAdditionalValue($field, $value)
-    {
-        return $this->additional_data[$field] = $value;
-    }
-
-    /**
-     * clean up references after cloning
-     * @return void
-     */
-    function __clone()
-    {
-        $this->setNew(true);
-        //all references link still to old object => reset all aliases
-        foreach ($this->alias_fields() as $alias => $field) {
-            if (isset($this->db_fields()[$field])) {
-                $content_value = $this->content[$field];
-                $content_db_value = $this->content_db[$field];
-                unset($this->content[$alias]);
-                unset($this->content_db[$alias]);
-                unset($this->content[$field]);
-                unset($this->content_db[$field]);
-                if (is_object($content_value)) {
-                    $this->content[$field] = clone $content_value;
-                } else {
-                    $this->content[$field] = $content_value;
-                }
-                if (is_object($content_db_value)) {
-                    $this->content_db[$field] = clone $content_db_value;
-                } else {
-                    $this->content_db[$field] = $content_db_value;
-                }
-            }
-        }
-        foreach ($this->alias_fields() as $alias => $field) {
-            if (isset($this->db_fields()[$field])) {
-                $this->content[$alias] =& $this->content[$field];
-                $this->content_db[$alias] =& $this->content_db[$field];
-            }
-        }
-        //unset all relations for now
-        //TODO: maybe a deep copy of all belonging objects is more appropriate
-        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            foreach (array_keys($this->$type()) as $one) {
-                $this->relations[$one] = null;
-            }
-        }
-        //begun the clone war has... hmpf
-    }
-
-    /**
-     * try to determine all needed options for a relationship from
-     * configured options
-     *
-     * @param string $type
-     * @param string $name
-     * @param array $options
-     * @throws Exception if options for thru_table could not be determined
-     * @return array
-     */
-    protected function parseRelationOptions($type, $name, $options)
-    {
-        if (empty($options['class_name'])) {
-            throw new Exception('Option class_name not set for relation ' . $name);
-        }
-        if (empty($options['assoc_foreign_key'])) {
-            if ($type === 'has_many' || $type === 'has_one') {
-                $options['assoc_foreign_key'] = $this->pk()[0];
-            } else if ($type === 'belongs_to') {
-                $options['assoc_foreign_key'] = 'id';
-            }
-        }
-        if ($type === 'has_and_belongs_to_many') {
-            $thru_table = $options['thru_table'];
-            if (empty($options['thru_key'])) {
-                $options['thru_key'] = $this->pk()[0];
-            }
-            if (empty($options['thru_assoc_key']) || empty($options['assoc_foreign_key'])) {
-                $class = $options['class_name'];
-                $record = new $class();
-                $meta = $record->getTableMetadata();
-                if (empty($options['thru_assoc_key'])) {
-                    $options['thru_assoc_key'] = $meta['pk'][0];
-                }
-                if (empty($options['assoc_foreign_key'])) {
-                    $options['assoc_foreign_key']= $meta['pk'][0];
-                }
-            }
-            static::tableScheme($thru_table);
-            if (is_array(self::$schemes[$thru_table])) {
-                $thru_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_key']]);
-                $thru_assoc_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_assoc_key']]);
-            }
-            if (!$thru_assoc_key_ok || !$thru_key_ok) {
-                throw new Exception("Could not determine keys for relation " . $name . " through table " . $thru_table);
-            }
-            if ($options['assoc_foreign_key'] instanceof Closure) {
-                throw new Exception("For relation " . $name . " assoc_foreign_key must be a name of a column");
-            }
-        }
-        if (empty($options['assoc_func'])) {
-            if ($type !== 'has_and_belongs_to_many') {
-                $options['assoc_func'] = $options['assoc_foreign_key'] === 'id' ? 'find' : 'findBy' . $options['assoc_foreign_key'];
-            } else {
-                $options['assoc_func'] = 'findThru';
-            }
-        }
-        if (empty($options['foreign_key'])) {
-            $options['foreign_key'] = 'id';
-        }
-        if (isset($options['foreign_key']) && $options['foreign_key'] instanceof Closure) {
-            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return call_user_func($options['foreign_key'], $record, $name, $options);};
-        } else {
-            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return $options['foreign_key'] === 'id' ? $record->getId() : $record->getValue($options['foreign_key']);};
-        }
-        if (isset($options['assoc_foreign_key']) && $options['assoc_foreign_key'] instanceof Closure) {
-            if ($type === 'belongs_to') {
-                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $name, $options, $that);};
-            } else {
-                $options['assoc_foreign_key_setter'] = function($record, $params) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $params, $name, $options);};
-            }
-        } elseif (!empty($options['assoc_foreign_key'])) {
-            if ($type === 'belongs_to') {
-                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return $record->getValue($options['assoc_foreign_key']);};
-            } else {
-                $options['assoc_foreign_key_setter'] = function($record, $value) use ($name, $options) { return $record->setValue($options['assoc_foreign_key'], $value);};
-            }
-        } else {
-            throw new Exception("Could not determine assoc_foreign_key for relation " . $name);
-        }
-        return $options;
-    }
-
-    /**
-     * returns array with option for given relation
-     * available options:
-     * 'type':                   relation type, on of 'has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'
-     * 'class_name':             name of class for related records
-     * 'foreign_key':            name of column with foreign key
-     *                           or callback to retrieve foreign key value
-     * 'assoc_foreign_key':      name of foreign key column in related class
-     * 'assoc_func':             name of static method to call on related class to find related records
-     * 'assoc_func_params_func': callback to retrieve params for assoc_func
-     * 'thru_table':             name of relation table for n:m relation
-     * 'thru_key':               name of column holding foreign key in relation table
-     * 'thru_assoc_key':         name of column holding foreign key from related class in relation table
-     * 'on_delete':              contains simply 'delete' to indicate that related records should be deleted
-     *                           or callback to invoke before record gets deleted
-     * 'on_store':               contains simply 'store' to indicate that related records should be stored
-     *                           or callback to invoke after record gets stored
-     *
-     * @param string $relation name of relation
-     * @return array assoc array containing options
-     */
-    function getRelationOptions($relation)
-    {
-        $options = [];
-        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
-            if (isset($this->$type()[$relation])) {
-                $options = self::$config[get_class($this)][$type][$relation];
-                if (!isset($options['type'])) {
-                    $options = $this->parseRelationOptions($type, $relation, $options, $this->db_table());
-                    $options['type'] = $type;
-                    self::$config[get_class($this)][$type][$relation] = $options;
-                }
-                break;
-            }
-        }
-        return $options;
-    }
-
-    /**
-     * returns table and columns metadata
-     *
-     * @return array assoc array with columns, primary keys and name of table
-     */
-    function getTableMetadata()
-    {
-        return ['fields' => $this->db_fields(),
-                     'pk' => $this->pk(),
-                     'table' => $this->db_table(),
-                     'additional_fields' => $this->additional_fields(),
-                     'alias_fields' => $this->alias_fields(),
-                     'relations' => array_keys($this->relations)];
-    }
-
-    /**
-     * returns true, if table has an auto_increment column
-     *
-     * @return boolean
-     */
-    function hasAutoIncrementColumn()
-    {
-        return $this->db_fields()[$this->pk()[0]]['extra'] == 'auto_increment';
-    }
-
-    /**
-     * set primary key for entry, combined keys must be passed as array
-     * @param int|string|array $id primary key
-     * @throws InvalidArgumentException if given key is not complete
-     * @return boolean
-     */
-    public function setId($id)
-    {
-        if (!is_array($id)){
-            $id = [$id];
-        }
-        if (count($this->pk()) != count($id)){
-            throw new InvalidArgumentException("Invalid ID, Primary Key {$this->db_table()} is " .join(",",$this->pk()));
-        } else {
-            foreach ($this->pk() as $count => $key){
-                $this->content[$key] = $id[$count];
-            }
-            return true;
-        }
-    }
-
-    /**
-     * returns primary key, multiple keys as array
-     * @return null|string|array current primary key, null if not set
-     */
-    function getId()
-    {
-        if (count($this->pk()) == 1) {
-            return $this->content[$this->pk()[0]] ?? null;
-        } else {
-            $id = [];
-            foreach ($this->pk() as $key) {
-                if (array_key_exists($key, $this->content)) {
-                    $id[] = $this->content[$key];
-                }
-            }
-            return (count($this->pk()) == count($id) ? $id : null);
-        }
-    }
-
-    /**
-     * create new unique pk as md5 hash
-     * if pk consists of multiple columns, false is returned
-     * @return boolean|string
-     */
-    function getNewId()
-    {
-        $id = false;
-        if (count($this->pk()) == 1) {
-            do {
-                $id = md5(uniqid($this->db_table(), 1));
-                $db = DBManager::get()->query("SELECT `{$this->pk()[0]}` FROM `{$this->db_table()}` "
-                . "WHERE `{$this->pk()[0]}` = '$id'");
-            } while($db->fetch());
-        }
-        return $id;
-    }
-
-    /**
-     * returns data of table row as assoc array
-     * pass array of fieldnames or ws separated string to limit
-     * fields
-     *
-     * @param null|array|string $only_these_fields limit returned fields
-     * @return array
-     */
-    function toArray($only_these_fields = null)
-    {
-        $ret = [];
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        $fields = array_diff($this->known_slots(), array_keys($this->relations));
-        if (is_array($only_these_fields)) {
-            $only_these_fields = array_filter(array_map(function($s) {
-                return is_string($s) ? strtolower($s) : null;
-            }, $only_these_fields));
-            $fields = array_intersect($only_these_fields, $fields);
-        }
-        foreach ($fields as $field) {
-            $ret[$field] = $this->getValue($field);
-            if ($ret[$field] instanceof StudipArrayObject) {
-                $ret[$field] = $ret[$field]->getArrayCopy();
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns data of table row as assoc array with raw contents like
-     * they are in the database.
-     * Pass array of fieldnames or ws separated string to limit
-     * fields.
-     *
-     * @param null|array|string $only_these_fields
-     * @return array
-     */
-    function toRawArray($only_these_fields = null)
-    {
-        $ret = [];
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        $fields = array_keys($this->db_fields());
-        if (is_array($only_these_fields)) {
-            $only_these_fields = array_filter(array_map(function ($s) {
-                return is_string($s) ? strtolower($s) : null;
-            }, $only_these_fields));
-            $fields = array_intersect($only_these_fields, $fields);
-        }
-        foreach ($fields as $field) {
-            if ($this->content[$field] instanceof I18NString) {
-                $ret[$field] = $this->content[$field]->original();
-            } elseif ($this->content[$field] === null) {
-                $ret[$field] = null;
-            } else {
-                $ret[$field] = (string)$this->content[$field];
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * returns data of table row as assoc array
-     * including related records with a 'has*' relationship
-     * recurses one level without param
-     *
-     * $only_these_fields limits output for relationships in this way:
-     * $only_these_fields = array('field_1',
-     *                            'field_2',
-     *                            'relation1',
-     *                            'relation2' => array('rel2_f1',
-     *                                                 'rel2_f2',
-     *                                                 'rel2_rel11' => array(
-     *                                                           rel2_rel1_f1)
-     *                                                )
-     *                           )
-     * Here all fields of relation1 will be returned.
-     *
-     * @param null|array|string $only_these_fields limit returned fields
-     * @return array
-     */
-    function toArrayRecursive($only_these_fields = null)
-    {
-        if (is_string($only_these_fields)) {
-            $only_these_fields = words($only_these_fields);
-        }
-        if (is_null($only_these_fields)) {
-            $only_these_fields = $this->known_slots();
-        }
-        $ret = $this->toArray($only_these_fields);
-        $relations = [];
-        if (is_array($only_these_fields)) {
-            foreach ($only_these_fields as $key => $value) {
-                if (!is_array($value) &&
-                    array_key_exists(strtolower($value), $this->relations)
-                ) {
-                    $relations[strtolower($value)] = 0; //not null|array|string to stop recursion
-                }
-                if (array_key_exists(strtolower($key), $this->relations)) {
-                    $relations[strtolower($key)] = $value;
-                }
-            }
-        }
-        if (count($relations)) {
-            foreach ($relations as $relation_name => $relation_only_these_fields) {
-                $options = $this->getRelationOptions($relation_name);
-                if ($options['type'] === 'has_one' ||
-                        $options['type'] === 'belongs_to') {
-                    $ret[$relation_name] =
-                            $this->{$relation_name}->
-                                            toArrayRecursive($relation_only_these_fields);
-                }
-                if ($options['type'] === 'has_many' ||
-                    $options['type'] === 'has_and_belongs_to_many') {
-                    $ret[$relation_name] =
-                            $this->{$relation_name}->
-                                            sendMessage('toArrayRecursive',
-                                            [$relation_only_these_fields]);
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * returns value of a column
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if getter for additional field could not be found
-     * @param string $field
-     * @return null|string|SimpleORMapCollection
-     */
-    public function getValue($field)
-    {
-        $field = strtolower($field);
-
-        // No value defined, throw exception
-        if (!in_array($field, $this->known_slots())) {
-            throw new InvalidArgumentException(static::class . '::'.$field . ' not found.');
-        }
-
-        // Get value by getter
-        if (isset($this->getter_setter_map()[$field]['get'])) {
-            return call_user_func([$this, $this->getter_setter_map()[$field]['get']]);
-        }
-
-        // Get value from content
-        if (array_key_exists($field, $this->content)) {
-            return $this->content[$field];
-        }
-
-        // Get value from relation
-        if (array_key_exists($field, $this->relations)) {
-            $this->initRelation($field);
-            return $this->relations[$field];
-        }
-
-        // Get value from additional_field
-        if (isset($this->additional_fields()[$field]['get'])) {
-            // Getter is defined as a closure
-            if ($this->additional_fields()[$field]['get'] instanceof Closure) {
-                return call_user_func_array($this->additional_fields()[$field]['get'], [$this, $field]);
-            }
-
-            // Getter is defined as a method of this object
-            return call_user_func([$this, $this->additional_fields()[$field]['get']], $field);
-        }
-
-        // No value found, throw exception
-        throw new RuntimeException('No value could be found for ' . static::class . '::' . $field);
-    }
-
-    /**
-     * gets a value from a related object
-     * only possible, if the relation has cardinality 1
-     * e.g. 'has_one' or 'belongs_to'
-     *
-     * @param string $relation name of relation
-     * @param string $field name of column
-     * @throws InvalidArgumentException if no relation with given name is found
-     * @return mixed the value from the related object
-     */
-    function getRelationValue($relation, $field)
-    {
-        $field = strtolower($field);
-        $options = $this->getRelationOptions($relation);
-        if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
-            return $this->{$relation}->{$field} ?? null;
-        } else {
-            throw new InvalidArgumentException('Relation ' . $relation . ' not found or not applicable.');
-        }
-    }
-
-    /**
-     * returns default value for column
-     *
-     * @param string $field name of column
-     * @return mixed the default value
-     */
-     function getDefaultValue($field)
-     {
-         $default_value = null;
-         if (!isset($this->default_values()[$field])) {
-             if (!in_array($field, $this->pk())) {
-                 $meta = $this->db_fields()[$field];
-                 if (isset($meta['default'])) {
-                     $default_value = $meta['default'];
-                 } elseif ($meta['null'] == 'NO') {
-                     if (strpos($meta['type'], 'text') !== false || strpos($meta['type'], 'char') !== false) {
-                         $default_value = '';
-                     }
-                     if (strpos($meta['type'], 'int') !== false) {
-                         $default_value = '0';
-                     }
-                 }
-             }
-         } else {
-             $default_value = $this->default_values()[$field];
-         }
-         return $default_value;
-     }
-
-    /**
-     * sets value of a column
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if setter for additional field could not be found
-     * @param string $field
-     * @param mixed $value
-     * @return string
-     */
-     function setValue($field, $value)
-     {
-         $field = strtolower($field);
-         $ret = false;
-         if (in_array($field, $this->known_slots())) {
-             if (isset($this->getter_setter_map()[$field]['set'])) {
-                 return call_user_func([$this, $this->getter_setter_map()[$field]['set']], $value);
-             }
-             if (array_key_exists($field, $this->content)) {
-                 if (array_key_exists($field, $this->serialized_fields())) {
-                     $ret = $this->setSerializedValue($field, $value);
-                 } elseif ($this->isI18nField($field)) {
-                         $ret = $this->setI18nValue($field, $value);
-                 } else {
-                     $ret = ($this->content[$field] = $value);
-                 }
-             } elseif (isset($this->additional_fields()[$field]['set'])) {
-                 if ($this->additional_fields()[$field]['set'] instanceof Closure) {
-                     return call_user_func_array($this->additional_fields()[$field]['set'], [$this, $field, $value]);
-                 } else {
-                     return call_user_func([$this, $this->additional_fields()[$field]['set']], $field, $value);
-                 }
-             } elseif (array_key_exists($field, $this->relations)) {
-                 $options = $this->getRelationOptions($field);
-                 if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
-                     if (is_a($value, $options['class_name'])) {
-                         $this->relations[$field] = $value;
-                         if ($options['type'] == 'has_one') {
-                             $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                             call_user_func($options['assoc_foreign_key_setter'], $value, $foreign_key_value);
-                         } else {
-                             $assoc_foreign_key_value = call_user_func($options['assoc_foreign_key_getter'], $value, $this);
-                             if ($assoc_foreign_key_value === null) {
-                                 throw new InvalidArgumentException(sprintf('trying to set belongs_to object of type: %s, but assoc_foreign_key: %s is null', get_class($value), $options['assoc_foreign_key']));
-                             }
-                             $this->setValue($options['foreign_key'], $assoc_foreign_key_value);
-                         }
-                     } elseif (
-                         $value === null
-                         && $this->db_fields()[$options['foreign_key']]['null'] === 'YES'
-                     ) {
-                         $this->resetRelation($field);
-                         $this->setValue($options['foreign_key'], null);
-
-                     } else {
-                         throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
-                     }
-                 }
-                 if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
-                     if (is_array($value) || $value instanceof Traversable) {
-                         $new_ids = [];
-                         $old_ids = $this->{$field}->pluck('id');
-                         foreach ($value as $current) {
-                             if (!is_a($current, $options['class_name'])) {
-                                 throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
-                             }
-                             if ($options['type'] == 'has_many') {
-                                 $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                                 call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
-                             }
-                             if ($current->id !== null) {
-                                 $new_ids[] = $current->id;
-                                 $existing = $this->{$field}->find($current->id);
-                                 if ($existing) {
-                                     $existing->setData($current);
-                                 } else {
-                                     $this->{$field}->append($current);
-                                 }
-                             } else {
-                                 $this->{$field}->append($current);
-                             }
-                         }
-                         foreach (array_diff($old_ids, $new_ids) as $to_delete) {
-                             $this->{$field}->unsetByPK($to_delete);
-                         }
-                     } else {
-                         throw new InvalidArgumentException(sprintf('relation %s expects collection or array of objects of type: %s', $field, $options['class_name']));
-                     }
-                 }
-             }
-         } else {
-             throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
-         }
-         return $ret;
-     }
-
-    /**
-     * magic method for dynamic properties
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if getter for additional field could not be found
-     * @param string $field the column or additional field
-     * @return null|string|SimpleORMapCollection
-     */
-    function __get($field)
-    {
-        return $this->getValue($field);
-    }
-    /**
-     * magic method for dynamic properties
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if setter for additional field could not be found
-     * @param string $field
-     * @param string $value
-     * @return string
-     */
-    function __set($field, $value)
-    {
-        return $this->setValue($field, $value);
-    }
-    /**
-     * magic method for dynamic properties
-     *
-     * @param string $field
-     * @return bool
-     */
-    function __isset($field)
-    {
-        $field = strtolower($field);
-        if (in_array($field, $this->known_slots())) {
-            $value = $this->getValue($field);
-            return $value instanceOf SimpleORMapCollection ? (bool)count($value) : !is_null($value);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * ArrayAccess: Check whether the given offset exists.
-     *
-     * @param string $offset
-     */
-    public function offsetExists($offset): bool
-    {
-        return $this->__isset($offset);
-    }
-
-    /**
-     * ArrayAccess: Get the value at the given offset.
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if getter for additional field could not be found
-     * @param string $offset the column or additional field
-     * @return null|string|SimpleORMapCollection
-     */
-    public function offsetGet($offset): mixed
-    {
-        return $this->getValue($offset);
-    }
-
-    /**
-     * ArrayAccess: Set the value at the given offset.
-     *
-     * @throws InvalidArgumentException if column could not be found
-     * @throws BadMethodCallException if setter for additional field could not be found
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value): void
-    {
-        $this->setValue($offset, $value);
-    }
-
-    /**
-     * ArrayAccess: unset the value at the given offset (not applicable)
-     *
-     * @param string $offset
-     */
-    public function offsetUnset($offset): void
-    {
-
-    }
-
-    /**
-     * IteratorAggregate
-     */
-    public function getIterator(): ArrayIterator
-    {
-        return new ArrayIterator($this->toArray());
-    }
-
-    /**
-     * Countable
-     */
-    public function count(): int
-    {
-        return count($this->known_slots()) - count($this->relations);
-    }
-
-    /**
-     * check if given column exists in table
-     * @param string $field
-     * @return boolean
-     */
-    function isField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->db_fields()[$field]);
-    }
-
-    /**
-     * check if given relation exists in this class
-     * @param string $field
-     * @return boolean
-     */
-    function isRelation($field)
-    {
-        $field = strtolower($field);
-        return array_key_exists($field, $this->relations);
-    }
-
-    /**
-     * check if given column is additional
-     * @param string $field
-     * @return boolean
-     */
-    function isAdditionalField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->additional_fields()[$field]);
-    }
-
-    /**
-     * check if given column is an alias
-     * @param string $field
-     * @return boolean
-     */
-    function isAliasField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->alias_fields()[$field]);
-    }
-
-    /**
-     * check if given column is a multi-language field
-     * @param string $field
-     * @return boolean
-     */
-    function isI18nField($field)
-    {
-        $field = strtolower($field);
-        return isset($this->i18n_fields()[$field]);
-    }
-
-    /**
-     * set multiple column values
-     * if second param is set, existing data in object will be
-     * discarded and dirty state is cleared,
-     * else new data overrides old data
-     *
-     * @param ?iterable $data assoc array
-     * @param ?boolean $reset existing data in object will be discarded
-     * @return int|bool number of columns changed
-     */
-    function setData($data, $reset = false)
-    {
-        $count = 0;
-        if ($reset) {
-            if ($this->applyCallbacks('before_initialize') === false) {
-                return false;
-            }
-            $this->initializeContent();
-        }
-        if (is_iterable($data)) {
-            foreach($data as $key => $value) {
-                $key = strtolower($key);
-                if (isset($this->db_fields()[$key])
-                    || isset($this->alias_fields()[$key])
-                    || isset($this->additional_fields()[$key]['set'])
-                ) {
-                    $this->setValue($key, $value);
-                    ++$count;
-                }
-            }
-        }
-        if ($reset) {
-            $this->applyCallbacks('after_initialize');
-        }
-        return $count;
-    }
-
-    /**
-     * check if object exists in database
-     * @return boolean
-     */
-    function isNew()
-    {
-        return $this->is_new;
-    }
-
-    /**
-     * check if object was deleted
-     *
-     * @return boolean
-     */
-    function isDeleted()
-    {
-        return $this->is_deleted;
-    }
-
-    /**
-     * set object to new state
-     * @param boolean $is_new
-     * @return boolean
-     */
-    function setNew($is_new)
-    {
-        return $this->is_new = $is_new;
-    }
-
-    /**
-     * returns sql clause with current table and pk
-     * @throws UnexpectedValueException if the primary key is incomplete
-     * @return boolean|array<string>
-     */
-    function getWhereQuery()
-    {
-        $where_query = null;
-        $pk_not_set = [];
-        foreach ($this->pk() as $key) {
-            $pk = $this->content_db[$key] ?? $this->content[$key] ?? null;
-            if (isset($pk)) {
-                $where_query[] = "`{$this->db_table()}`.`{$key}` = "  . DBManager::get()->quote($pk);
-            } else {
-                $pk_not_set[] = $key;
-            }
-        }
-        if (!$where_query || count($pk_not_set)){
-            if ($this->isNew()) {
-                return false;
-            } else {
-                throw new UnexpectedValueException(sprintf("primary key incomplete: %s must not be null", join(',',$pk_not_set)));
-            }
-        }
-        return $where_query;
-    }
-
-    /**
-     * restore entry from database
-     * @return boolean
-     */
-    function restore()
-    {
-        $where_query = $this->getWhereQuery();
-        $id = $this->getId();
-        if ($where_query) {
-            if ($this->applyCallbacks('before_initialize') === false) {
-                return false;
-            }
-            $this->initializeContent();
-            $query = "SELECT * FROM `{$this->db_table()}` WHERE "
-                    . join(" AND ", $where_query);
-            $st = DBManager::get()->prepare($query);
-            $st->execute();
-            $st->setFetchMode(PDO::FETCH_INTO , $this);
-            if ($st->fetch()) {
-                $this->setNew(false);
-                $this->applyCallbacks('after_initialize');
-                return true;
-            }
-        }
-        $this->setData([], true);
-        $this->setNew(true);
-        if (isset($id)) {
-            $this->setId($id);
-        }
-        return false;
-    }
-
-    /**
-     * store entry in database
-     *
-     * @throws UnexpectedValueException if there are forbidden NULL values
-     * @return number|boolean
-     */
-    function store()
-    {
-        // Set id or prepare setting of id
-        if ($this->isNew() && $this->getId() === null) {
-            // Explicitly set id to 0 if auto increment pk is null
-            if ($this->hasAutoIncrementColumn()) {
-                $this->setId(0);
-            } else {
-                $this->setId($this->getNewId());
-            }
-        }
-
-        if ($this->applyCallbacks('before_store') === false) {
-            return false;
-        }
-
-        $ret = 0;
-
-        if (!$this->isDeleted() && ($this->isDirty() || $this->isNew())) {
-            $callback = $this->isNew() ? 'before_create' : 'before_update';
-            if ($this->applyCallbacks($callback) === false) {
-                return false;
-            }
-
-            // Collect i18n contents
-            $i18ncontent = [];
-            foreach (array_keys($this->i18n_fields()) as $field) {
-                if ($this->content[$field] instanceof I18NString) {
-                    $i18ncontent[$field] = $this->content[$field];
-                    $this->content[$field] = $this->content[$field]->original();
-                    $this->content_db[$field] = $this->content_db[$field]->original();
-                }
-            }
-
-            // Create sql data assignment chunks
-            foreach ($this->db_fields() as $field => $meta) {
-                $value = $this->content[$field];
-                if ($field == 'chdate' && !$this->isFieldDirty($field) && $this->isDirty()) {
-                    $value = time();
-                }
-                if ($field == 'mkdate') {
-                    if ($this->isNew()) {
-                        if (!$this->isFieldDirty($field)) {
-                            $value = time();
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-                if ($value === null && $meta['null'] == 'NO') {
-                    throw new UnexpectedValueException($this->db_table() . '.' . $field . ' must not be null.');
-                }
-                if (is_float($value)) {
-                    $value = str_replace(',', '.', $value);
-                }
-                $this->content[$field] = $value;
-                $query_part[] = "`$field` = " . DBManager::get()->quote($value) . " ";
-            }
-
-            // Create store query
-            if (!$this->isNew()) {
-                $where_query = $this->getWhereQuery();
-                $query = "UPDATE `{$this->db_table()}` SET "
-                    . implode(',', $query_part);
-                $query .= " WHERE " . join(" AND ", $where_query);
-            } else {
-                $query = "INSERT INTO `{$this->db_table()}` SET "
-                    . implode(',', $query_part);
-            }
-            $ret = DBManager::get()->exec($query);
-
-            // Retrieve generated id from database if pk is an auto increment
-            // column
-            if ($this->isNew()) {
-                if ($this->hasAutoIncrementColumn() && !$this->getId()) {
-                    $this->setId(DBManager::get()->lastInsertId());
-                }
-            }
-
-            // Store i18n contents
-            foreach ($i18ncontent as $field => $one) {
-                $meta = [
-                    'object_id' => $this->getId(),
-                    'table'     => $this->db_table(),
-                    'field'     => $field
-                ];
-                $one->setMetadata($meta);
-                $one->storeTranslations();
-                if (!$this->content[$field] instanceof I18NString) {
-                    $this->content[$field] = $one;
-                    $this->content_db[$field] = clone $one;
-                }
-            }
-
-            // Apply callbacks
-            $this->applyCallbacks($this->isNew() ? 'after_create' : 'after_update');
-        }
-        $rel_ret = $this->storeRelations();
-
-        $this->applyCallbacks('after_store');
-
-        if ($ret || $rel_ret) {
-            $this->restore();
-        }
-        return $ret + $rel_ret;
-    }
-
-    /**
-     * sends a store message to all initialized related objects
-     * if a relation has a callback for 'on_store' configured, the callback
-     * is instead invoked
-     *
-     * @param null|array|string $only_these
-     * @return int|false number addition of all return values, false if none was called
-     */
-    protected function storeRelations($only_these = null)
-    {
-        $ret = false;
-        if (is_string($only_these)) {
-            $only_these = words($only_these);
-        }
-        $relations = array_keys($this->relations);
-        if (is_array($only_these)) {
-            $only_these = array_filter(array_map(function ($s) {
-                return is_string($s) ? strtolower($s) : null;
-            }, $only_these));
-            $relations = array_intersect($only_these, $relations);
-        }
-        foreach ($relations as $relation) {
-            $options = $this->getRelationOptions($relation);
-            if (isset($options['on_store']) &&
-            ($options['type'] === 'has_one' ||
-            $options['type'] === 'has_many' ||
-            $options['type'] === 'has_and_belongs_to_many')) {
-                if ($options['on_store'] instanceof Closure) {
-                    $ret += call_user_func($options['on_store'], $this, $relation);
-                } elseif (isset($this->relations[$relation])) {
-                    $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                    if ($options['type'] === 'has_one') {
-                        call_user_func($options['assoc_foreign_key_setter'], $this->{$relation}, $foreign_key_value);
-                        $ret = call_user_func([$this->{$relation}, 'store']);
-                    } elseif ($options['type'] === 'has_many') {
-                        foreach ($this->{$relation} as $r) {
-                            call_user_func($options['assoc_foreign_key_setter'], $r, $foreign_key_value);
-                        }
-                        $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'store'));
-                        $ret += array_sum(call_user_func([$this->{$relation}->getDeleted(), 'sendMessage'], 'delete'));
-                    } else {
-                        call_user_func([$this->{$relation}, 'sendMessage'], 'store');
-                        $to_delete = array_filter($this->{$relation}->getDeleted()->pluck($options['assoc_foreign_key']));
-                        $to_insert = array_filter($this->{$relation}->pluck($options['assoc_foreign_key']));
-                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ? AND `" . $options['thru_assoc_key'] . "` = ?";
-                        $st = DBManager::get()->prepare($sql);
-                        foreach ($to_delete as $one_value) {
-                            $st->execute([$foreign_key_value, $one_value]);
-                            $ret += $st->rowCount();
-                        }
-                        $sql = "INSERT IGNORE INTO `" . $options['thru_table'] ."` SET `" . $options['thru_key'] ."` = ?, `" . $options['thru_assoc_key'] . "` = ?";
-                        $st = DBManager::get()->prepare($sql);
-                        foreach ($to_insert as $one_value) {
-                            $st->execute([$foreign_key_value, $one_value]);
-                            $ret += $st->rowCount();
-                        }
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * set chdate column to current timestamp
-     * @return boolean
-     */
-    function triggerChdate()
-    {
-        if ($this->db_fields()['chdate']) {
-            $this->content['chdate'] = time();
-            if ($where_query = $this->getWhereQuery()) {
-                DBManager::get()->exec("UPDATE `{$this->db_table()}` SET chdate={$this->content['chdate']}
-                            WHERE ". join(" AND ", $where_query));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * delete entry from database
-     * the object is cleared, but is not(!) turned to new state
-     * @return bool|int number of deleted rows
-     */
-    function delete()
-    {
-        $ret = false;
-        if (!$this->isDeleted() && !$this->isNew()) {
-            if ($this->applyCallbacks('before_delete') === false) {
-                return false;
-            }
-            $ret = $this->deleteRelations();
-            $where_query = $this->getWhereQuery();
-            if ($where_query) {
-                $query = "DELETE FROM `{$this->db_table()}` WHERE "
-                        . join(" AND ", $where_query);
-                $ret += DBManager::get()->exec($query);
-            }
-            $this->is_deleted = true;
-            $this->applyCallbacks('after_delete');
-
-            // Remove i18n translations
-            if (I18N::isEnabled()) {
-                foreach (array_keys($this->i18n_fields()) as $field) {
-                    if ($this->content[$field] instanceof I18NString) {
-                        $this->content[$field]->removeTranslations();
-                    }
-                }
-            }
-        }
-        $this->setData([], true);
-        return $ret;
-    }
-
-    /**
-     * sends a delete message to all related objects
-     * if a relation has a callback for 'on_delete' configured, the callback
-     * is invoked instead
-     *
-     * @return bool|int addition of all return values, false if none was called
-     */
-    protected function deleteRelations()
-    {
-        $ret = false;
-        foreach (array_keys($this->relations) as $relation) {
-            $options = $this->getRelationOptions($relation);
-            if (isset($options['on_delete']) &&
-                ($options['type'] === 'has_one' ||
-                $options['type'] === 'has_many' ||
-                $options['type'] === 'has_and_belongs_to_many')) {
-                if ($options['on_delete'] instanceof Closure) {
-                    $ret += call_user_func($options['on_delete'], $this, $relation);
-                } else {
-                    if ($options['type'] === 'has_one' || $options['type'] === 'has_many') {
-                        $this->initRelation($relation);
-                        if (isset($this->relations[$relation])) {
-                            if ($options['type'] === 'has_one') {
-                                $ret += call_user_func([$this->{$relation}, 'delete']);
-                            } elseif ($options['type'] === 'has_many') {
-                                $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'delete'));
-                            }
-                        }
-                    } else {
-                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ?";
-                        $st = DBManager::get()->prepare($sql);
-                        $st->execute([$foreign_key_value]);
-                        $ret += $st->rowCount();
-                    }
-                }
-                $this->relations[$relation] = null;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * init internal content arrays with nulls or defaults
-     *
-     * @throws UnexpectedValueException if there is an unmatched alias
-     * @return void
-     */
-    protected function initializeContent()
-    {
-        $this->content = [];
-        foreach (array_keys($this->db_fields()) as $field) {
-            $this->content[$field] = null;
-            $this->content_db[$field] = null;
-            $this->setValue($field, $this->getDefaultValue($field));
-        }
-        foreach ($this->alias_fields() as $alias => $field) {
-            if (isset($this->db_fields()[$field])) {
-                $this->content[$alias] =& $this->content[$field];
-                $this->content_db[$alias] =& $this->content_db[$field];
-            } else {
-                throw new UnexpectedValueException(sprintf('Column %s not found for alias %s', $field, $alias));
-            }
-        }
-        foreach (array_keys($this->relations) as $one) {
-            $this->relations[$one] = null;
-        }
-        $this->additional_data = [];
-    }
-
-    /**
-     * checks if at least one field was modified since last restore
-     *
-     * @return boolean
-     */
-    public function isDirty()
-    {
-        foreach (array_keys($this->db_fields()) as $field) {
-            if ($this->isFieldDirty($field)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * checks if given field was modified since last restore
-     *
-     * @param string $field
-     * @return boolean
-     */
-    public function isFieldDirty($field)
-    {
-        $field = strtolower($field);
-        if ($this->content[$field] === null || $this->content_db[$field] === null) {
-            return $this->content[$field] !== $this->content_db[$field];
-        } else if ($this->content[$field] instanceof I18NString || $this->content_db[$field] instanceof I18NString) {
-            return $this->content[$field] != $this->content_db[$field];
-        } else {
-            return (string)$this->content[$field] !== (string)$this->content_db[$field];
-        }
-    }
-
-    /**
-     * reverts value of given field to last restored value
-     *
-     * @param string $field
-     * @return mixed the restored value
-     */
-    public function revertValue($field)
-    {
-        $field = strtolower($field);
-        return ($this->content[$field] = $this->content_db[$field]);
-    }
-
-    /**
-     * returns unmodified value of given field
-     *
-     * @param string $field
-     * @throws InvalidArgumentException
-     * @return mixed
-     */
-    public function getPristineValue($field)
-    {
-        $field = strtolower($field);
-        if (array_key_exists($field, $this->content_db)) {
-            return $this->content_db[$field];
-        } else {
-            throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
-        }
-    }
-
-    /**
-     * intitalize a relationship and get related record(s)
-     *
-     * @param string $relation name of relation
-     * @throws InvalidArgumentException if the relation does not exists
-     * @return void
-     */
-    public function initRelation($relation)
-    {
-        if (!array_key_exists($relation, $this->relations)) {
-            throw new InvalidArgumentException('Unknown relation: ' . $relation);
-        }
-        if ($this->relations[$relation] === null) {
-            $options = $this->getRelationOptions($relation);
-            $to_call = [$options['class_name'], $options['assoc_func']];
-            if (!is_callable($to_call)) {
-                throw new RuntimeException('assoc_func: ' . join('::', $to_call) . ' is not callable.' );
-            }
-            $params = $options['assoc_func_params_func'];
-            if ($options['type'] === 'has_many') {
-                $records = function($record) use ($to_call, $params, $options) {
-                    $p = (array)$params($record);
-                    return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options['order_by'] ?? null]));
-                };
-                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
-            } elseif ($options['type'] === 'has_and_belongs_to_many') {
-                $records = function($record) use ($to_call, $params, $options) {$p = (array)$params($record); return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options]));};
-                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
-            } else {
-                $p = (array)$params($this);
-                $records = call_user_func_array($to_call, count($p) ? $p : [null]);
-                $result = is_array($records) ? ($records[0] ?? null) : $records;
-                $this->relations[$relation] = $result;
-            }
-        }
-    }
-
-    /**
-     * clear data for a relationship
-     *
-     * @param string $relation name of relation
-     * @throws InvalidArgumentException if teh relation does not exists
-     * @return void
-     */
-    public function resetRelation($relation)
-    {
-        if (!array_key_exists($relation, $this->relations)) {
-            throw new InvalidArgumentException('Unknown relation: ' . $relation);
-        }
-        $this->relations[$relation] = null;
-    }
-
-    /**
-     * invoke registered callbacks for given type
-     * if one callback returns false the following will not
-     * be invoked
-     *
-     * @param string $type type of callback
-     * @return bool return value from last callback
-     */
-    protected function applyCallbacks($type)
-    {
-        $ok = true;
-        foreach ($this->registered_callbacks()[$type] as $cb) {
-            if ($cb instanceof Closure) {
-                $function =  $cb;
-                $params = [$this, $type, $cb];
-            } else {
-                $function = [$this, $cb];
-                $params = [$type];
-            };
-            $ok = call_user_func_array($function, $params);
-            if ($ok === false) {
-                break;
-            }
-        }
-        return $ok;
-    }
-
-    /**
-     * register given callback for one or many possible callback types
-     * callback param could be a closure or method name of current class
-     *
-     * @param string|array $types types to register callback for
-     * @param callable $cb callback
-     * @throws InvalidArgumentException if the callback type is not known
-     * @return number of registered callbacks
-     */
-    protected static function registerCallback($types, $cb)
-    {
-        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
-
-        $types = is_array($types) ? $types : words($types);
-        $reg = 0;
-        foreach ($types as $type) {
-            if (isset(static::registered_callbacks()[$type])) {
-                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
-                if ($found === false) {
-                    self::$config[static::class]['registered_callbacks'][$type][] = $cb;
-                    $reg++;
-                }
-            } else {
-                throw new InvalidArgumentException('Unknown callback type: ' . $type);
-            }
-        }
-        return $reg;
-    }
-
-    /**
-     * unregister given callback for one or many possible callback types
-     *
-     * @param string|array $types types to unregister callback for
-     * @param mixed $cb
-     * @throws InvalidArgumentException if the callback type is not known
-     * @return number of unregistered callbacks
-     */
-    protected static function unregisterCallback($types, $cb)
-    {
-        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
-
-        $types = is_array($types) ? $types : words($types);
-        foreach ($types as $type) {
-            if (isset(static::registered_callbacks()[$type])) {
-                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
-                if ($found !== false) {
-                    $unreg++;
-                    unset(self::$config[static::class]['registered_callbacks'][$type][$found]);
-                }
-            } else {
-                throw new InvalidArgumentException('Unknown callback type: ' . $type);
-            }
-        }
-        return $unreg;
-    }
-
-    /**
-     * default callback used to map specific callbacks to NotificationCenter
-     *
-     * @param string $cb_type callback type
-     * @return void|boolean
-     */
-    protected function cbNotificationMapper($cb_type)
-    {
-        if (isset($this->notification_map()[$cb_type])) {
-            try {
-                foreach(words($this->notification_map()[$cb_type]) as $notification) {
-                    NotificationCenter::postNotification($notification, $this);
-                }
-            } catch (NotificationVetoException $e) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * default callback used to map specific callbacks to NotificationCenter
-     *
-     * @param string $cb_type callback type
-     * @return void|boolean
-     */
-    protected function cbAfterInitialize($cb_type)
-    {
-        foreach (array_keys($this->db_fields()) as $field) {
-            if (is_object($this->content[$field])) {
-                $this->content_db[$field] = clone $this->content[$field];
-            } else {
-                $this->content_db[$field] = $this->content[$field];
-            }
-        }
-    }
-
-    /**
-     * default setter used to proxy serialized fields with
-     * ArrayObjects
-     *
-     * @param string $field column name
-     * @param mixed $value value
-     * @return mixed
-     */
-     protected function setSerializedValue($field, $value)
-     {
-         $object_type = $this->serialized_fields()[$field];
-         if (is_null($value) || $value instanceof $object_type) {
-             $this->content[$field] = $value;
-         } else {
-             $this->content[$field] = new $object_type($value);
-         }
-         return $this->content[$field];
-     }
-
-    /**
-     * default setter used to proxy I18N fields with
-     * I18NString
-     *
-     * @param string $field column name
-     * @param mixed $value value
-     * @return mixed
-     */
-    protected function setI18nValue($field, $value)
-    {
-        $meta = ['object_id' => $this->getId(),
-                 'table'     => $this->db_table(),
-                 'field'     => $field];
-        if ($value instanceof I18NString) {
-            $value->setMetadata($meta);
-            $this->content[$field] = $value;
-        } else {
-            $this->content[$field] = new I18NString($value, null, $meta);
-        }
-        return $this->content[$field];
-    }
-
-     /**
-      * Cleans up this object. This essentially reset all relations of
-      * this object and marks them as unused so that the garbage collector may
-      * remove the objects.
-      *
-      * Use this function when you ran into memory problems and need to free
-      * some memory;
-      *
-      * @return void
-      */
-     public function cleanup()
-     {
-         foreach ($this->relations as $relation => $object) {
-             if ($object instanceof SimpleORMap || $object instanceof SimpleORMapCollection) {
-                 $this->relations[$relation]->cleanup();
-             }
-             $this->resetRelation($relation);
-         }
-     }
-}
diff --git a/lib/classes/SimpleORMap.php b/lib/classes/SimpleORMap.php
new file mode 100644
index 0000000..7124cc4
--- /dev/null
+++ b/lib/classes/SimpleORMap.php
@@ -0,0 +1,2483 @@
+<?php
+/**
+ * SimpleORMap.class.php
+ * simple object-relational mapping
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class SimpleORMap implements ArrayAccess, Countable, IteratorAggregate
+{
+    /**
+     * Defines `_` as character used when joining composite primary keys.
+     */
+    const ID_SEPARATOR = '_';
+
+    /**
+     * table row data
+     * @var array $content
+     */
+    protected $content = [];
+
+    /**
+     * table row data
+     * @var array $content_db
+     */
+    protected $content_db = [];
+
+    /**
+     * new state of entry
+     * @var boolean $is_new
+     */
+    protected $is_new = true;
+
+    /**
+     * deleted state of entry
+     * @var boolean $is_deleted
+     */
+    protected $is_deleted = false;
+
+     /**
+     * db table metadata
+     * @var ?array $schemes;
+     */
+    public static $schemes = null;
+
+    /**
+     * configuration data for subclasses
+     * @see self::configure()
+     * @var array $config;
+     */
+    protected static $config = [];
+
+    /**
+     * stores instantiated related objects
+     * @var array $relations
+     */
+    protected $relations = [];
+
+    /**
+     * assoc array for storing values for additional fields
+     *
+     * @var array $additional_data
+     */
+    protected $additional_data = [];
+
+    /**
+     * reserved indentifiers, fields with those names must not have an explicit getXXX() method
+     * @var array $reserved_slots
+     */
+    protected static $reserved_slots = ['value','newid','iterator','tablemetadata', 'relationvalue','wherequery','relationoptions','data','new','id'];
+
+    /**
+     * indicator for batch operations in findEachBySQL
+     *
+     * @var bool $performs_batch_operation
+     */
+    protected static $performs_batch_operation = false;
+
+    /**
+     * name of db table
+     * @return string
+     */
+    protected static function db_table()
+    {
+        return static::config('db_table');
+    }
+
+    /**
+     * table columns
+     * @return array
+     */
+    protected static function db_fields()
+    {
+        return static::config('db_fields');
+    }
+
+    /**
+     * primary key columns
+     * @return array
+     */
+    protected static function pk()
+    {
+        return static::config('pk');
+    }
+
+    /**
+     * default values for columns
+     * @return array
+     */
+    protected static function default_values()
+    {
+        return static::config('default_values');
+    }
+
+    /**
+     * list of columns to deserialize
+     * @return array key is name of column, value is name of ArrayObject class
+     */
+    protected static function serialized_fields()
+    {
+        return static::config('serialized_fields');
+    }
+
+    /**
+     * aliases for columns
+     * alias => column
+     * @return array
+     */
+    protected static function alias_fields()
+    {
+        return static::config('alias_fields');
+    }
+
+    /**
+     * multi-language fields
+     * name => boolean
+     * @return array
+     */
+    protected static function i18n_fields()
+    {
+        return static::config('i18n_fields');
+    }
+
+    /**
+     * additional computed fields
+     * name => callable
+     * @return array
+     */
+    protected static function additional_fields()
+    {
+        return static::config('additional_fields');
+    }
+
+    /**
+     * 1:n relation
+     * @return array
+     */
+    protected static function has_many()
+    {
+        return static::config('has_many');
+    }
+
+    /**
+     * 1:1 relation
+     * @return array
+     */
+    protected static function has_one()
+    {
+        return static::config('has_one');
+    }
+
+    /**
+     * n:1 relations
+     * @return array
+     */
+    protected static function belongs_to()
+    {
+        return static::config('belongs_to');
+    }
+
+    /**
+     * n:m relations
+     * @return array
+     */
+    protected static function has_and_belongs_to_many()
+    {
+        return static::config('has_and_belongs_to_many');
+    }
+
+    /**
+     * callbacks
+     * @return array<string, array<string|Closure>>
+     */
+    protected static function registered_callbacks()
+    {
+        return static::config('registered_callbacks');
+    }
+
+    /**
+     * contains an array of all used identifiers for fields
+     * (db columns + aliased columns + additional columns + relations)
+     * @return array
+     */
+    protected static function known_slots()
+    {
+        return static::config('known_slots');
+    }
+
+    /**
+     * assoc array used to map SORM callback to NotificationCenter
+     * keys are SORM callbacks, values notifications
+     * eg. 'after_create' => 'FooDidCreate'
+     *
+     * @return array
+     */
+    protected static function notification_map()
+    {
+        return static::config('notification_map');
+    }
+
+    /**
+     * assoc array for mapping get/set Methods
+     *
+     * @return array
+     */
+    protected static function getter_setter_map()
+    {
+        return static::config('getter_setter_map');
+    }
+
+    //////////////////////////////////////////////////
+
+    /**
+     * set configuration data from subclass
+     *
+     * @param ?array $config configuration data
+     * @return void
+     */
+    protected static function configure($config = [])
+    {
+        $class = static::class;
+
+        if (empty($config['db_table'])) {
+            $config['db_table'] = strtolower($class);
+        }
+
+        if (!isset($config['db_fields'])) {
+            if (static::tableScheme($config['db_table'])) {
+                $config['db_fields'] = self::$schemes[$config['db_table']]['db_fields'];
+                $config['pk'] = self::$schemes[$config['db_table']]['pk'];
+            }
+        }
+
+        if (isset($config['pk'])
+            && !isset($config['db_fields']['id'])
+            && !isset($config['alias_fields']['id'])
+            && !isset($config['additional_fields']['id'])
+        ) {
+            if (count($config['pk']) === 1) {
+                $config['alias_fields']['id'] = $config['pk'][0];
+            } else {
+                $config['additional_fields']['id'] = ['get' => '_getId',
+                                                           'set' => '_setId'];
+            }
+        }
+        if (isset($config['additional_fields'])) {
+            foreach ($config['additional_fields'] as $a_field => $a_config) {
+                if (is_array($a_config) && !(isset($a_config['get']) || isset($a_config['set']))) {
+                    $relation = $a_config[0] ?? '';
+                    $relation_field = $a_config[1] ?? '';
+                    if (!$relation) {
+                        [$relation, $relation_field] = explode('_', $a_field);
+                    }
+                    if (!$relation_field || !$relation) {
+                        throw new UnexpectedValueException('no relation found for autoget/set additional field: ' . $a_field);
+                    }
+                    $config['additional_fields'][$a_field] = ['get'            => '_getAdditionalValueFromRelation',
+                                                                   'set'            => '_setAdditionalValue',
+                                                                   'relation'       => $relation,
+                                                                   'relation_field' => $relation_field];
+                }
+            }
+        }
+        if (isset($config['serialized_fields'])) {
+            foreach ($config['serialized_fields'] as $a_field => $object_type) {
+                if (!(is_subclass_of($object_type, 'StudipArrayObject'))) {
+                    throw new UnexpectedValueException(sprintf('serialized field %s must use subclass of StudipArrayObject', $a_field));
+                }
+            }
+        }
+
+        foreach (['default_values', 'serialized_fields', 'alias_fields', 'i18n_fields', 'additional_fields'] as $fields) {
+            if (!isset($config[$fields])) {
+                $config[$fields] = [];
+            }
+        }
+
+        foreach (['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            if (isset($config[$type]) && is_array($config[$type])) {
+                foreach (array_keys($config[$type]) as $one) {
+                    $config['relations'][$one] = null;
+                }
+            } else {
+                $config[$type] = [];
+            }
+        }
+
+        $callbacks = ['before_create',
+                      'before_update',
+                      'before_store',
+                      'before_delete',
+                      'before_initialize',
+                      'after_create',
+                      'after_update',
+                      'after_store',
+                      'after_delete',
+                      'after_initialize'];
+
+        foreach ($callbacks as $callback) {
+            if (!isset($config['registered_callbacks'][$callback])) {
+                $config['registered_callbacks'][$callback] = [];
+            }
+        }
+
+        $auto_notification_map['after_create'] = $class . 'DidCreate';
+        $auto_notification_map['after_store'] = $class . 'DidStore';
+        $auto_notification_map['after_delete'] = $class . 'DidDelete';
+        $auto_notification_map['after_update'] = $class . 'DidUpdate';
+        $auto_notification_map['before_create'] = $class . 'WillCreate';
+        $auto_notification_map['before_store'] = $class . 'WillStore';
+        $auto_notification_map['before_delete'] = $class . 'WillDelete';
+        $auto_notification_map['before_update'] = $class . 'WillUpdate';
+
+        foreach ($auto_notification_map as $cb => $notification) {
+            if (isset($config['notification_map'][$cb])) {
+                if (strpos($config['notification_map'][$cb], $notification) !== false) {
+                    $config['notification_map'][$cb] .= ' ' . $notification;
+                }
+            } else {
+                $config['notification_map'][$cb] = $notification;
+            }
+        }
+
+        if (is_array($config['notification_map'])) {
+            foreach (array_keys($config['notification_map']) as $cb) {
+                $config['registered_callbacks'][$cb][] = 'cbNotificationMapper';
+            }
+        }
+
+        if (!I18N::isEnabled() || empty($config['i18n_fields'])) {
+            $config['i18n_fields'] = [];
+        } elseif (is_string($config['i18n_fields'])) {
+            $i18n_fields = words($config['i18n_fields']);
+            $config['i18n_fields'] = array_combine(
+                $i18n_fields,
+                array_fill(0, count($i18n_fields), true)
+            );
+        } elseif (array_is_list($config['i18n_fields'])) {
+            $config['i18n_fields'] = array_combine(
+                $config['i18n_fields'],
+                array_fill(0, count($config['i18n_fields']), true)
+            );
+        }
+
+        array_unshift($config['registered_callbacks']['after_initialize'], 'cbAfterInitialize');
+
+        $config['known_slots'] = array_merge(
+            array_keys($config['db_fields']),
+            array_keys($config['alias_fields'] ?? []),
+            array_keys($config['additional_fields'] ?? []),
+            array_keys($config['relations'] ?? [])
+        );
+
+        foreach (array_map('strtolower', get_class_methods($class)) as $method) {
+            if (in_array(substr($method, 0, 3), ['get', 'set'])) {
+                $verb = substr($method, 0, 3);
+                $name = substr($method, 3);
+                if (in_array($name, $config['known_slots']) && !in_array($name, static::$reserved_slots) && !isset($config['additional_fields'][$name][$verb])) {
+                    $config['getter_setter_map'][$name][$verb] = $method;
+                }
+            }
+        }
+        self::$config[$class] = $config;
+    }
+
+    /**
+     * fetch config data for the called class
+     *
+     * @param string $key config key
+     * @return mixed value of config key (null if not set)
+     */
+    protected static function config($key)
+    {
+        if (!array_key_exists(static::class, self::$config)) {
+            static::configure();
+        }
+
+        return self::$config[static::class][$key] ?? null;
+    }
+
+    /**
+     * fetch table metadata from db or from local cache
+     *
+     * @param string $db_table
+     * @return bool true if metadata could be fetched
+     */
+    public static function tableScheme($db_table)
+    {
+        if (self::$schemes === null) {
+            $cache = \Studip\Cache\Factory::getCache();
+            self::$schemes = unserialize($cache->read('DB_TABLE_SCHEMES'));
+        }
+        if (!isset(self::$schemes[$db_table])) {
+            $db = DBManager::get()->query("SHOW COLUMNS FROM $db_table");
+            while($rs = $db->fetch(PDO::FETCH_ASSOC)){
+                $db_fields[strtolower($rs['Field'])] = [
+                    'name' => $rs['Field'],
+                    'null' => $rs['Null'],
+                    'default' => $rs['Default'],
+                    'type' => $rs['Type'],
+                    'extra' => $rs['Extra']
+                ];
+                if ($rs['Key'] == 'PRI'){
+                    $pk[] = strtolower($rs['Field']);
+                }
+            }
+            self::$schemes[$db_table]['db_fields'] = $db_fields;
+            self::$schemes[$db_table]['pk'] = $pk;
+            $cache = \Studip\Cache\Factory::getCache();
+            $cache->write('DB_TABLE_SCHEMES', serialize(self::$schemes));
+        }
+        return isset(self::$schemes[$db_table]);
+    }
+
+    /**
+     * force reload of cached table metadata
+     * @return void
+     */
+    public static function expireTableScheme()
+    {
+        \Studip\Cache\Factory::getCache()->expire('DB_TABLE_SCHEMES');
+        self::$schemes = null;
+        self::$config = [];
+    }
+
+    /**
+     * Returns new instance for given key when found in the database, else null.
+     *
+     * @param string|array $id primary key
+     * @return static|null
+     */
+    public static function find($id)
+    {
+        $ref = new ReflectionClass(static::class);
+        /** @var static $record */
+        $record = $ref->newInstanceArgs(func_get_args());
+        if (!$record->isNew()) {
+            return $record;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns true if given key exists in the database.
+     *
+     * @param string|array $id primary key
+     * @return boolean
+     */
+    public static function exists($id)
+    {
+        $ret = false;
+        $db_table = static::db_table();
+        $record = new static();
+        $record->setId(...func_get_args());
+        $where_query = $record->getWhereQuery();
+        if ($where_query) {
+            $query = "SELECT 1 FROM `$db_table` WHERE "
+                    . join(" AND ", $where_query);
+            $ret = (bool)DBManager::get()->query($query)->fetchColumn();
+        }
+        return $ret;
+    }
+
+    /**
+     * returns number of records
+     *
+     * @param ?string $sql sql clause to use on the right side of WHERE
+     * @param ?array $params params for query
+     * @return int
+     */
+    public static function countBySql($sql = '1', $params = [])
+    {
+        $db_table = static::db_table();
+        $db = DBManager::get();
+        $has_join = stripos($sql, 'JOIN ');
+        if ($has_join === false || $has_join > 10) {
+            $sql = 'WHERE ' . $sql;
+        }
+        $sql = "SELECT count(*) FROM `" .  $db_table . "` " . $sql;
+        $st = $db->prepare($sql);
+        $st->execute($params);
+        return (int)$st->fetchColumn();
+    }
+
+    /**
+     * creates new record with given data in db
+     * returns the new object or null
+     * @param array $data assoc array of record
+     * @return ?static
+     */
+    public static function create($data)
+    {
+        $record = new static();
+        $record->setData($data, false);
+        if ($record->store()) {
+            return $record;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * build object with given data
+     *
+     * @param array $data assoc array of record
+     * @param ?bool $is_new set object to new state
+     * @return static
+     */
+    public static function build($data, $is_new = true)
+    {
+        $record = new static();
+        $record->setData($data, !$is_new);
+        $record->setNew($is_new);
+        return $record;
+    }
+
+    /**
+     * build object with given data and mark it as existing
+     *
+     * @param array $data assoc array of record
+     * @return static
+     */
+    public static function buildExisting($data)
+    {
+        return static::build($data, false);
+    }
+
+    /**
+     * generate SimpleORMap object structure from assoc array
+     * if given array contains data of related objects in sub-arrays
+     * they are also generated. Existing records are updated, new records are created
+     * (but changes are not yet stored)
+     *
+     * @param array $data
+     * @return static
+     */
+    public static function import($data)
+    {
+        $record_data = [];
+        $relation_data = [];
+        foreach ($data as $key => $value) {
+            $temp = static::alias_fields()[$key] ?? $key;
+            if (isset(static::db_fields()[$temp])) {
+                $record_data[$key] = $value;
+            } else {
+                $relation_data[$key] = $value;
+            }
+        }
+        $record = static::toObject($record_data);
+        if (!$record instanceof static) {
+            $record = new static();
+            $record->setData($record_data, true);
+        } else {
+            $record->setData($record_data);
+        }
+        foreach ($relation_data as $relation => $data) {
+            if (!$record->isRelation($relation)) {
+                continue;
+            }
+
+            $options = $record->getRelationOptions($relation);
+            if ($options['type'] == 'has_one') {
+                $record->{$relation} = call_user_func([$options['class_name'], 'import'], $data);
+            }
+            if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
+                foreach ($data as $one) {
+                    $current = call_user_func([$options['class_name'], 'import'], $one);
+                    if ($options['type'] == 'has_many') {
+                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $record);
+                        call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
+                    }
+                    if ($current->id !== null) {
+                        $existing = $record->{$relation}->find($current->id);
+                        if ($existing) {
+                            $existing->setData($current);
+                        } else {
+                            $record->{$relation}->append($current);
+                        }
+                    } else {
+                        $record->{$relation}->append($current);
+                    }
+                }
+            }
+        }
+        return $record;
+    }
+
+    /**
+     * returns array of instances of given class filtered by given sql
+     * @param string $sql sql clause to use on the right side of WHERE
+     * @param ?array $params parameters for query
+     * @return static[] array of "self" objects
+     */
+    public static function findBySQL($sql, $params = [])
+    {
+        $db_table = static::db_table();
+
+        $has_join = stripos($sql, 'JOIN ');
+        if ($has_join === false || $has_join > 10) {
+            $sql = 'WHERE ' . $sql;
+        }
+        $sql = "SELECT `" . $db_table . "`.* FROM `" . $db_table . "` " . $sql;
+        $stmt = DBManager::get()->prepare($sql);
+        $stmt->execute($params);
+
+        $record = static::build([], false);
+
+        $ret = [];
+        do  {
+            $clone = clone $record;
+            $clone->setNew(false);
+            $stmt->setFetchMode(PDO::FETCH_INTO, $clone);
+
+            if ($clone = $stmt->fetch()) {
+                $clone->applyCallbacks('after_initialize');
+                $ret[] = $clone;
+            }
+        } while ($clone);
+        return $ret;
+    }
+
+    /**
+     * returns one instance of given class filtered by given sql
+     * only first row of query is used
+     * @param string $where sql clause to use on the right side of WHERE
+     * @param ?array $params parameters for query
+     * @return ?static
+     */
+    public static function findOneBySQL($where, $params = [])
+    {
+        if (stripos($where, 'LIMIT') === false) {
+            $where .= " LIMIT 1";
+        }
+        $found = static::findBySQL($where, $params);
+        return isset($found[0]) ? $found[0] : null;
+    }
+
+    /**
+     * find related records for a n:m relation (has_many_and_belongs_to_many)
+     * using a combination table holding the keys
+     *
+     * @param string $foreign_key_value value of foreign key to find related records
+     * @param array $options relation options from other side of relation
+     * @return static[] array of "self" objects
+     */
+    public static function findThru($foreign_key_value, $options)
+    {
+        $thru_table = $options['thru_table'];
+        $thru_key = $options['thru_key'];
+        $thru_assoc_key = $options['thru_assoc_key'];
+        $assoc_foreign_key = $options['assoc_foreign_key'];
+
+        $db_table = static::db_table();
+
+        $sql = "SELECT `$db_table`.* FROM `$thru_table`
+        INNER JOIN `$db_table` ON `$thru_table`.`$thru_assoc_key` = `$db_table`.`$assoc_foreign_key`
+        WHERE `$thru_table`.`$thru_key` = ? " . ($options['order_by'] ?? '');
+        $st = DBManager::get()->prepare($sql);
+        $st->execute([$foreign_key_value]);
+
+        $record = static::build([], false);
+
+        $ret = [];
+        do {
+            $clone = clone $record;
+            $clone->setNew(false);
+            $st->setFetchMode(PDO::FETCH_INTO, $clone);
+
+            if ($clone = $st->fetch()) {
+                $clone->applyCallbacks('after_initialize');
+                $ret[] = $clone;
+            }
+        } while ($clone);
+        return $ret;
+    }
+
+    /**
+     * passes objects for given sql through given callback
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param string $sql where clause of sql
+     * @param ?array $params sql statement parameters
+     * @return integer number of found records
+     */
+    public static function findEachBySQL($callable, $sql, $params = [])
+    {
+        $has_join = stripos($sql, 'JOIN ');
+        if ($has_join === false || $has_join > 10) {
+            $sql = "WHERE {$sql}";
+        }
+
+        $db_table = static::db_table();
+        $st = DBManager::get()->prepare("SELECT `{$db_table}`.* FROM `{$db_table}` {$sql}");
+        $st->execute($params);
+
+        // Indicate that we are performing a batch operation
+        static::$performs_batch_operation = true;
+
+        $record = static::build([], false);
+
+        $ret = 0;
+        do {
+            $clone = clone $record;
+            $clone->setNew(false);
+            $st->setFetchMode(PDO::FETCH_INTO, $clone);
+
+            if ($clone = $st->fetch()) {
+                $clone->applyCallbacks('after_initialize');
+                $callable($clone, $ret++);
+            }
+        } while ($clone);
+
+        // Reset batch operation indicator
+        static::$performs_batch_operation = false;
+
+        return $ret;
+    }
+
+    /**
+     * returns array of instances of given class for by given pks
+     * @param ?array $pks array of primary keys
+     * @param ?string $order order by clause
+     * @param ?array $order_params
+     * @return static[]
+     */
+    public static function findMany($pks = [], $order = '', $order_params = [])
+    {
+        $db_table = static::db_table();
+        $pk = static::pk();
+        $db = DBManager::get();
+        if (count($pk) > 1) {
+            throw new Exception('not implemented yet');
+        }
+        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
+        return static::findBySQL($where . $order, $order_params);
+    }
+
+    /**
+     * passes objects for by given pks through given callback
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param ?array $pks array of primary keys of called class
+     * @param ?string $order order by sql
+     * @param ?array $order_params
+     * @return integer number of found records
+     */
+    public static function findEachMany($callable, $pks = [], $order = '', $order_params = [])
+    {
+        $db_table = static::db_table();
+        $pk = static::pk();
+        $db = DBManager::get();
+        if (count($pk) > 1) {
+            throw new Exception('not implemented yet');
+        }
+        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
+        return static::findEachBySQL($callable, $where . $order, $order_params);
+    }
+
+    /**
+     * passes objects for given sql through given callback
+     * and returns an array of callback return values
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param string $where where clause of sql
+     * @param array $params sql statement parameters
+     * @return array return values of callback
+     */
+    public static function findAndMapBySQL($callable, $where, $params = [])
+    {
+        $ret = [];
+        $calleach = function($m) use (&$ret, $callable) {
+            $ret[] = $callable($m);
+        };
+        static::findEachBySQL($calleach, $where, $params);
+        return $ret;
+    }
+
+    /**
+     * passes objects for by given pks through given callback
+     * and returns an array of callback return values
+     *
+     * @param callable $callable callback which gets the current record as param
+     * @param ?array $pks array of primary keys of called class
+     * @param ?string $order order by sql
+     * @param ?array $order_params
+     * @return array return values of callback
+     */
+    public static function findAndMapMany($callable, $pks = [], $order = '', $order_params = [])
+    {
+        $ret = [];
+        $calleach = function($m) use (&$ret, $callable) {
+            $ret[] = $callable($m);
+        };
+        $db_table = static::db_table();
+        $pk = static::pk();
+        $db = DBManager::get();
+        if (count($pk) > 1) {
+            throw new Exception('not implemented yet');
+        }
+        $where = "`$db_table`.`{$pk[0]}` IN ("  . $db->quote($pks) . ") ";
+        static::findEachBySQL($calleach, $where . $order, $order_params);
+        return $ret;
+    }
+
+    /**
+     * deletes objects specified by sql clause
+     * @param string $where sql clause to use on the right side of WHERE
+     * @param ?array $params parameters for query
+     * @return integer number of deleted records
+     */
+    public static function deleteBySQL($where, $params = [])
+    {
+        $killeach = function($record) {$record->delete();};
+        return static::findEachBySQL($killeach, $where, $params);
+    }
+
+    /**
+     * returns object of given class for given id or null
+     * the param could be a string, an assoc array containing primary key field
+     * or an already matching object. In all these cases an object is returned
+     *
+     * @param string|static|array $id_or_object id as string, object or assoc array
+     * @return static
+     */
+    public static function toObject($id_or_object)
+    {
+        if ($id_or_object instanceof static) {
+            return $id_or_object;
+        }
+        if (is_array($id_or_object)) {
+            $pk = static::pk();
+            $key_values = [];
+            foreach ($pk as $key) {
+                if (array_key_exists($key, $id_or_object)) {
+                    $key_values[] = $id_or_object[$key];
+                }
+            }
+            if (count($pk) === count($key_values)) {
+                if (count($pk) === 1) {
+                    $id = $key_values[0];
+                } else {
+                    $id = $key_values;
+                }
+            } else {
+                $id = null;
+            }
+        } else {
+            $id = $id_or_object;
+        }
+        return static::find($id);
+    }
+
+    /**
+     * interceptor for static findByColumn / findEachByColumn / countByColumn /
+     * deleteByColumn magic
+     *
+     * @param string $name
+     * @param array $arguments
+     * @throws BadMethodCallException
+     * @return int|static|static[]
+     */
+    public static function __callStatic(string $name, array $arguments)
+    {
+        $db_table = static::db_table();
+        $alias_fields = static::alias_fields();
+        $db_fields = static::db_fields();
+        $name = strtolower($name);
+        $order = '';
+        $param_arr = [];
+        $where = '';
+        $where_param = is_array($arguments[0]) ? $arguments[0] : [$arguments[0]];
+        $action = strstr($name, 'by', true);
+        $field = substr($name, strlen($action) + 2);
+        switch ($action) {
+            case 'findone':
+                $order = $arguments[1] ?? '';
+                $param_arr[0] =& $where;
+                $param_arr[1] = [$where_param];
+                $method = 'findonebysql';
+                break;
+            case 'find':
+            case 'findmany':
+                $order = $arguments[1] ?? '';
+                $param_arr[0] =& $where;
+                $param_arr[1] = [$where_param];
+                $method = 'findbysql';
+                break;
+            case 'findeach':
+            case 'findeachmany':
+                $order = $arguments[2] ?? '';
+                $param_arr[0] = $arguments[0];
+                $param_arr[1] =& $where;
+                $param_arr[2] = [$arguments[1]];
+                $method = 'findeachbysql';
+                break;
+            case 'count':
+            case 'delete':
+                $param_arr[0] =& $where;
+                $param_arr[1] = [$where_param];
+                $method = "{$action}bysql";
+                break;
+            default:
+                throw new BadMethodCallException("Method " . static::class . "::$name not found");
+        }
+        if (isset($alias_fields[$field])) {
+            $field = $alias_fields[$field];
+        }
+        if (isset($db_fields[$field])) {
+            $where = "`$db_table`.`$field` IN(?) " . $order;
+            return call_user_func_array([static::class, $method], $param_arr);
+        }
+        throw new BadMethodCallException("Method " . static::class . "::$name not found");
+    }
+
+    /**
+     * constructor, give primary key of record as param to fetch
+     * corresponding record from db if available, if not preset primary key
+     * with given value. Give null to create new record
+     *
+     * @param null|int|string|array $id primary key of table
+     */
+    function __construct($id = null)
+    {
+        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            foreach (array_keys($this->$type()) as $one) {
+                $this->relations[$one] = null;
+            }
+        }
+
+        if ($id) {
+            $this->setId($id);
+        }
+        $this->restore();
+    }
+
+    /**
+     * returns internal used id value (multiple keys concatenated with _)
+     * @param mixed $field unused parameter
+     * @return ?string
+     */
+    protected function _getId($field)
+    {
+        return is_null($this->getId())
+             ? null
+             : implode(self::ID_SEPARATOR, $this->getId());
+    }
+
+    /**
+     * sets internal used id value (multiple keys concatenated with _)
+     * @param string $field Field to set (unused since it's always the id)
+     * @param string $value Value for id field
+     * @return bool
+     */
+    protected function _setId($field, $value)
+    {
+        return $this->setId(explode(self::ID_SEPARATOR, $value));
+    }
+
+    /**
+     * retrieves an additional field value from relation
+     *
+     * @param string $field
+     * @return mixed
+     */
+    protected function _getAdditionalValueFromRelation($field)
+    {
+        [$relation, $relation_field] = [$this->additional_fields()[$field]['relation'],
+                                                $this->additional_fields()[$field]['relation_field']];
+        if (!array_key_exists($field, $this->additional_data)) {
+            $this->_setAdditionalValue($field, $this->getRelationValue($relation, $relation_field));
+        }
+        return $this->additional_data[$field];
+    }
+
+    /**
+     * sets additional value in field imported from relation
+     *
+     * @param string $field
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function _setAdditionalValueFromRelation($field, $value)
+    {
+        [$relation, $relation_field] = [$this->additional_fields()[$field]['relation'],
+                $this->additional_fields()[$field]['relation_field']];
+        $this->$relation->$field = $value;
+        unset($this->additional_data[$field]);
+        return $this->_getAdditionalValueFromRelation($field);
+    }
+
+    /**
+     * @param string $field
+     * @return mixed
+     */
+    protected function _getAdditionalValue($field)
+    {
+        return $this->additional_data[$field];
+    }
+
+    /**
+     * @param string $field
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function _setAdditionalValue($field, $value)
+    {
+        return $this->additional_data[$field] = $value;
+    }
+
+    /**
+     * clean up references after cloning
+     * @return void
+     */
+    function __clone()
+    {
+        $this->setNew(true);
+        //all references link still to old object => reset all aliases
+        foreach ($this->alias_fields() as $alias => $field) {
+            if (isset($this->db_fields()[$field])) {
+                $content_value = $this->content[$field];
+                $content_db_value = $this->content_db[$field];
+                unset($this->content[$alias]);
+                unset($this->content_db[$alias]);
+                unset($this->content[$field]);
+                unset($this->content_db[$field]);
+                if (is_object($content_value)) {
+                    $this->content[$field] = clone $content_value;
+                } else {
+                    $this->content[$field] = $content_value;
+                }
+                if (is_object($content_db_value)) {
+                    $this->content_db[$field] = clone $content_db_value;
+                } else {
+                    $this->content_db[$field] = $content_db_value;
+                }
+            }
+        }
+        foreach ($this->alias_fields() as $alias => $field) {
+            if (isset($this->db_fields()[$field])) {
+                $this->content[$alias] =& $this->content[$field];
+                $this->content_db[$alias] =& $this->content_db[$field];
+            }
+        }
+        //unset all relations for now
+        //TODO: maybe a deep copy of all belonging objects is more appropriate
+        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            foreach (array_keys($this->$type()) as $one) {
+                $this->relations[$one] = null;
+            }
+        }
+        //begun the clone war has... hmpf
+    }
+
+    /**
+     * try to determine all needed options for a relationship from
+     * configured options
+     *
+     * @param string $type
+     * @param string $name
+     * @param array $options
+     * @throws Exception if options for thru_table could not be determined
+     * @return array
+     */
+    protected function parseRelationOptions($type, $name, $options)
+    {
+        if (empty($options['class_name'])) {
+            throw new Exception('Option class_name not set for relation ' . $name);
+        }
+        if (empty($options['assoc_foreign_key'])) {
+            if ($type === 'has_many' || $type === 'has_one') {
+                $options['assoc_foreign_key'] = $this->pk()[0];
+            } else if ($type === 'belongs_to') {
+                $options['assoc_foreign_key'] = 'id';
+            }
+        }
+        if ($type === 'has_and_belongs_to_many') {
+            $thru_table = $options['thru_table'];
+            if (empty($options['thru_key'])) {
+                $options['thru_key'] = $this->pk()[0];
+            }
+            if (empty($options['thru_assoc_key']) || empty($options['assoc_foreign_key'])) {
+                $class = $options['class_name'];
+                $record = new $class();
+                $meta = $record->getTableMetadata();
+                if (empty($options['thru_assoc_key'])) {
+                    $options['thru_assoc_key'] = $meta['pk'][0];
+                }
+                if (empty($options['assoc_foreign_key'])) {
+                    $options['assoc_foreign_key']= $meta['pk'][0];
+                }
+            }
+            static::tableScheme($thru_table);
+            if (is_array(self::$schemes[$thru_table])) {
+                $thru_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_key']]);
+                $thru_assoc_key_ok = isset(self::$schemes[$thru_table]['db_fields'][$options['thru_assoc_key']]);
+            }
+            if (!$thru_assoc_key_ok || !$thru_key_ok) {
+                throw new Exception("Could not determine keys for relation " . $name . " through table " . $thru_table);
+            }
+            if ($options['assoc_foreign_key'] instanceof Closure) {
+                throw new Exception("For relation " . $name . " assoc_foreign_key must be a name of a column");
+            }
+        }
+        if (empty($options['assoc_func'])) {
+            if ($type !== 'has_and_belongs_to_many') {
+                $options['assoc_func'] = $options['assoc_foreign_key'] === 'id' ? 'find' : 'findBy' . $options['assoc_foreign_key'];
+            } else {
+                $options['assoc_func'] = 'findThru';
+            }
+        }
+        if (empty($options['foreign_key'])) {
+            $options['foreign_key'] = 'id';
+        }
+        if (isset($options['foreign_key']) && $options['foreign_key'] instanceof Closure) {
+            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return call_user_func($options['foreign_key'], $record, $name, $options);};
+        } else {
+            $options['assoc_func_params_func'] = function($record) use ($name, $options) { return $options['foreign_key'] === 'id' ? $record->getId() : $record->getValue($options['foreign_key']);};
+        }
+        if (isset($options['assoc_foreign_key']) && $options['assoc_foreign_key'] instanceof Closure) {
+            if ($type === 'belongs_to') {
+                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $name, $options, $that);};
+            } else {
+                $options['assoc_foreign_key_setter'] = function($record, $params) use ($name, $options) { return call_user_func($options['assoc_foreign_key'], $record, $params, $name, $options);};
+            }
+        } elseif (!empty($options['assoc_foreign_key'])) {
+            if ($type === 'belongs_to') {
+                $options['assoc_foreign_key_getter'] = function($record, $that) use ($name, $options) { return $record->getValue($options['assoc_foreign_key']);};
+            } else {
+                $options['assoc_foreign_key_setter'] = function($record, $value) use ($name, $options) { return $record->setValue($options['assoc_foreign_key'], $value);};
+            }
+        } else {
+            throw new Exception("Could not determine assoc_foreign_key for relation " . $name);
+        }
+        return $options;
+    }
+
+    /**
+     * returns array with option for given relation
+     * available options:
+     * 'type':                   relation type, on of 'has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'
+     * 'class_name':             name of class for related records
+     * 'foreign_key':            name of column with foreign key
+     *                           or callback to retrieve foreign key value
+     * 'assoc_foreign_key':      name of foreign key column in related class
+     * 'assoc_func':             name of static method to call on related class to find related records
+     * 'assoc_func_params_func': callback to retrieve params for assoc_func
+     * 'thru_table':             name of relation table for n:m relation
+     * 'thru_key':               name of column holding foreign key in relation table
+     * 'thru_assoc_key':         name of column holding foreign key from related class in relation table
+     * 'on_delete':              contains simply 'delete' to indicate that related records should be deleted
+     *                           or callback to invoke before record gets deleted
+     * 'on_store':               contains simply 'store' to indicate that related records should be stored
+     *                           or callback to invoke after record gets stored
+     *
+     * @param string $relation name of relation
+     * @return array assoc array containing options
+     */
+    function getRelationOptions($relation)
+    {
+        $options = [];
+        foreach(['has_many', 'belongs_to', 'has_one', 'has_and_belongs_to_many'] as $type) {
+            if (isset($this->$type()[$relation])) {
+                $options = self::$config[get_class($this)][$type][$relation];
+                if (!isset($options['type'])) {
+                    $options = $this->parseRelationOptions($type, $relation, $options, $this->db_table());
+                    $options['type'] = $type;
+                    self::$config[get_class($this)][$type][$relation] = $options;
+                }
+                break;
+            }
+        }
+        return $options;
+    }
+
+    /**
+     * returns table and columns metadata
+     *
+     * @return array assoc array with columns, primary keys and name of table
+     */
+    function getTableMetadata()
+    {
+        return ['fields' => $this->db_fields(),
+                     'pk' => $this->pk(),
+                     'table' => $this->db_table(),
+                     'additional_fields' => $this->additional_fields(),
+                     'alias_fields' => $this->alias_fields(),
+                     'relations' => array_keys($this->relations)];
+    }
+
+    /**
+     * returns true, if table has an auto_increment column
+     *
+     * @return boolean
+     */
+    function hasAutoIncrementColumn()
+    {
+        return $this->db_fields()[$this->pk()[0]]['extra'] == 'auto_increment';
+    }
+
+    /**
+     * set primary key for entry, combined keys must be passed as array
+     * @param int|string|array $id primary key
+     * @throws InvalidArgumentException if given key is not complete
+     * @return boolean
+     */
+    public function setId($id)
+    {
+        if (!is_array($id)){
+            $id = [$id];
+        }
+        if (count($this->pk()) != count($id)){
+            throw new InvalidArgumentException("Invalid ID, Primary Key {$this->db_table()} is " .join(",",$this->pk()));
+        } else {
+            foreach ($this->pk() as $count => $key){
+                $this->content[$key] = $id[$count];
+            }
+            return true;
+        }
+    }
+
+    /**
+     * returns primary key, multiple keys as array
+     * @return null|string|array current primary key, null if not set
+     */
+    function getId()
+    {
+        if (count($this->pk()) == 1) {
+            return $this->content[$this->pk()[0]] ?? null;
+        } else {
+            $id = [];
+            foreach ($this->pk() as $key) {
+                if (array_key_exists($key, $this->content)) {
+                    $id[] = $this->content[$key];
+                }
+            }
+            return (count($this->pk()) == count($id) ? $id : null);
+        }
+    }
+
+    /**
+     * create new unique pk as md5 hash
+     * if pk consists of multiple columns, false is returned
+     * @return boolean|string
+     */
+    function getNewId()
+    {
+        $id = false;
+        if (count($this->pk()) == 1) {
+            do {
+                $id = md5(uniqid($this->db_table(), 1));
+                $db = DBManager::get()->query("SELECT `{$this->pk()[0]}` FROM `{$this->db_table()}` "
+                . "WHERE `{$this->pk()[0]}` = '$id'");
+            } while($db->fetch());
+        }
+        return $id;
+    }
+
+    /**
+     * returns data of table row as assoc array
+     * pass array of fieldnames or ws separated string to limit
+     * fields
+     *
+     * @param null|array|string $only_these_fields limit returned fields
+     * @return array
+     */
+    function toArray($only_these_fields = null)
+    {
+        $ret = [];
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        $fields = array_diff($this->known_slots(), array_keys($this->relations));
+        if (is_array($only_these_fields)) {
+            $only_these_fields = array_filter(array_map(function($s) {
+                return is_string($s) ? strtolower($s) : null;
+            }, $only_these_fields));
+            $fields = array_intersect($only_these_fields, $fields);
+        }
+        foreach ($fields as $field) {
+            $ret[$field] = $this->getValue($field);
+            if ($ret[$field] instanceof StudipArrayObject) {
+                $ret[$field] = $ret[$field]->getArrayCopy();
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Returns data of table row as assoc array with raw contents like
+     * they are in the database.
+     * Pass array of fieldnames or ws separated string to limit
+     * fields.
+     *
+     * @param null|array|string $only_these_fields
+     * @return array
+     */
+    function toRawArray($only_these_fields = null)
+    {
+        $ret = [];
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        $fields = array_keys($this->db_fields());
+        if (is_array($only_these_fields)) {
+            $only_these_fields = array_filter(array_map(function ($s) {
+                return is_string($s) ? strtolower($s) : null;
+            }, $only_these_fields));
+            $fields = array_intersect($only_these_fields, $fields);
+        }
+        foreach ($fields as $field) {
+            if ($this->content[$field] instanceof I18NString) {
+                $ret[$field] = $this->content[$field]->original();
+            } elseif ($this->content[$field] === null) {
+                $ret[$field] = null;
+            } else {
+                $ret[$field] = (string)$this->content[$field];
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * returns data of table row as assoc array
+     * including related records with a 'has*' relationship
+     * recurses one level without param
+     *
+     * $only_these_fields limits output for relationships in this way:
+     * $only_these_fields = array('field_1',
+     *                            'field_2',
+     *                            'relation1',
+     *                            'relation2' => array('rel2_f1',
+     *                                                 'rel2_f2',
+     *                                                 'rel2_rel11' => array(
+     *                                                           rel2_rel1_f1)
+     *                                                )
+     *                           )
+     * Here all fields of relation1 will be returned.
+     *
+     * @param null|array|string $only_these_fields limit returned fields
+     * @return array
+     */
+    function toArrayRecursive($only_these_fields = null)
+    {
+        if (is_string($only_these_fields)) {
+            $only_these_fields = words($only_these_fields);
+        }
+        if (is_null($only_these_fields)) {
+            $only_these_fields = $this->known_slots();
+        }
+        $ret = $this->toArray($only_these_fields);
+        $relations = [];
+        if (is_array($only_these_fields)) {
+            foreach ($only_these_fields as $key => $value) {
+                if (!is_array($value) &&
+                    array_key_exists(strtolower($value), $this->relations)
+                ) {
+                    $relations[strtolower($value)] = 0; //not null|array|string to stop recursion
+                }
+                if (array_key_exists(strtolower($key), $this->relations)) {
+                    $relations[strtolower($key)] = $value;
+                }
+            }
+        }
+        if (count($relations)) {
+            foreach ($relations as $relation_name => $relation_only_these_fields) {
+                $options = $this->getRelationOptions($relation_name);
+                if ($options['type'] === 'has_one' ||
+                        $options['type'] === 'belongs_to') {
+                    $ret[$relation_name] =
+                            $this->{$relation_name}->
+                                            toArrayRecursive($relation_only_these_fields);
+                }
+                if ($options['type'] === 'has_many' ||
+                    $options['type'] === 'has_and_belongs_to_many') {
+                    $ret[$relation_name] =
+                            $this->{$relation_name}->
+                                            sendMessage('toArrayRecursive',
+                                            [$relation_only_these_fields]);
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * returns value of a column
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if getter for additional field could not be found
+     * @param string $field
+     * @return null|string|SimpleORMapCollection
+     */
+    public function getValue($field)
+    {
+        $field = strtolower($field);
+
+        // No value defined, throw exception
+        if (!in_array($field, $this->known_slots())) {
+            throw new InvalidArgumentException(static::class . '::'.$field . ' not found.');
+        }
+
+        // Get value by getter
+        if (isset($this->getter_setter_map()[$field]['get'])) {
+            return call_user_func([$this, $this->getter_setter_map()[$field]['get']]);
+        }
+
+        // Get value from content
+        if (array_key_exists($field, $this->content)) {
+            return $this->content[$field];
+        }
+
+        // Get value from relation
+        if (array_key_exists($field, $this->relations)) {
+            $this->initRelation($field);
+            return $this->relations[$field];
+        }
+
+        // Get value from additional_field
+        if (isset($this->additional_fields()[$field]['get'])) {
+            // Getter is defined as a closure
+            if ($this->additional_fields()[$field]['get'] instanceof Closure) {
+                return call_user_func_array($this->additional_fields()[$field]['get'], [$this, $field]);
+            }
+
+            // Getter is defined as a method of this object
+            return call_user_func([$this, $this->additional_fields()[$field]['get']], $field);
+        }
+
+        // No value found, throw exception
+        throw new RuntimeException('No value could be found for ' . static::class . '::' . $field);
+    }
+
+    /**
+     * gets a value from a related object
+     * only possible, if the relation has cardinality 1
+     * e.g. 'has_one' or 'belongs_to'
+     *
+     * @param string $relation name of relation
+     * @param string $field name of column
+     * @throws InvalidArgumentException if no relation with given name is found
+     * @return mixed the value from the related object
+     */
+    function getRelationValue($relation, $field)
+    {
+        $field = strtolower($field);
+        $options = $this->getRelationOptions($relation);
+        if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
+            return $this->{$relation}->{$field} ?? null;
+        } else {
+            throw new InvalidArgumentException('Relation ' . $relation . ' not found or not applicable.');
+        }
+    }
+
+    /**
+     * returns default value for column
+     *
+     * @param string $field name of column
+     * @return mixed the default value
+     */
+     function getDefaultValue($field)
+     {
+         $default_value = null;
+         if (!isset($this->default_values()[$field])) {
+             if (!in_array($field, $this->pk())) {
+                 $meta = $this->db_fields()[$field];
+                 if (isset($meta['default'])) {
+                     $default_value = $meta['default'];
+                 } elseif ($meta['null'] == 'NO') {
+                     if (strpos($meta['type'], 'text') !== false || strpos($meta['type'], 'char') !== false) {
+                         $default_value = '';
+                     }
+                     if (strpos($meta['type'], 'int') !== false) {
+                         $default_value = '0';
+                     }
+                 }
+             }
+         } else {
+             $default_value = $this->default_values()[$field];
+         }
+         return $default_value;
+     }
+
+    /**
+     * sets value of a column
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if setter for additional field could not be found
+     * @param string $field
+     * @param mixed $value
+     * @return string
+     */
+     function setValue($field, $value)
+     {
+         $field = strtolower($field);
+         $ret = false;
+         if (in_array($field, $this->known_slots())) {
+             if (isset($this->getter_setter_map()[$field]['set'])) {
+                 return call_user_func([$this, $this->getter_setter_map()[$field]['set']], $value);
+             }
+             if (array_key_exists($field, $this->content)) {
+                 if (array_key_exists($field, $this->serialized_fields())) {
+                     $ret = $this->setSerializedValue($field, $value);
+                 } elseif ($this->isI18nField($field)) {
+                         $ret = $this->setI18nValue($field, $value);
+                 } else {
+                     $ret = ($this->content[$field] = $value);
+                 }
+             } elseif (isset($this->additional_fields()[$field]['set'])) {
+                 if ($this->additional_fields()[$field]['set'] instanceof Closure) {
+                     return call_user_func_array($this->additional_fields()[$field]['set'], [$this, $field, $value]);
+                 } else {
+                     return call_user_func([$this, $this->additional_fields()[$field]['set']], $field, $value);
+                 }
+             } elseif (array_key_exists($field, $this->relations)) {
+                 $options = $this->getRelationOptions($field);
+                 if ($options['type'] === 'has_one' || $options['type'] === 'belongs_to') {
+                     if (is_a($value, $options['class_name'])) {
+                         $this->relations[$field] = $value;
+                         if ($options['type'] == 'has_one') {
+                             $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                             call_user_func($options['assoc_foreign_key_setter'], $value, $foreign_key_value);
+                         } else {
+                             $assoc_foreign_key_value = call_user_func($options['assoc_foreign_key_getter'], $value, $this);
+                             if ($assoc_foreign_key_value === null) {
+                                 throw new InvalidArgumentException(sprintf('trying to set belongs_to object of type: %s, but assoc_foreign_key: %s is null', get_class($value), $options['assoc_foreign_key']));
+                             }
+                             $this->setValue($options['foreign_key'], $assoc_foreign_key_value);
+                         }
+                     } elseif (
+                         $value === null
+                         && $this->db_fields()[$options['foreign_key']]['null'] === 'YES'
+                     ) {
+                         $this->resetRelation($field);
+                         $this->setValue($options['foreign_key'], null);
+
+                     } else {
+                         throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
+                     }
+                 }
+                 if ($options['type'] == 'has_many' || $options['type'] == 'has_and_belongs_to_many') {
+                     if (is_array($value) || $value instanceof Traversable) {
+                         $new_ids = [];
+                         $old_ids = $this->{$field}->pluck('id');
+                         foreach ($value as $current) {
+                             if (!is_a($current, $options['class_name'])) {
+                                 throw new InvalidArgumentException(sprintf('relation %s expects object of type: %s', $field, $options['class_name']));
+                             }
+                             if ($options['type'] == 'has_many') {
+                                 $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                                 call_user_func($options['assoc_foreign_key_setter'], $current, $foreign_key_value);
+                             }
+                             if ($current->id !== null) {
+                                 $new_ids[] = $current->id;
+                                 $existing = $this->{$field}->find($current->id);
+                                 if ($existing) {
+                                     $existing->setData($current);
+                                 } else {
+                                     $this->{$field}->append($current);
+                                 }
+                             } else {
+                                 $this->{$field}->append($current);
+                             }
+                         }
+                         foreach (array_diff($old_ids, $new_ids) as $to_delete) {
+                             $this->{$field}->unsetByPK($to_delete);
+                         }
+                     } else {
+                         throw new InvalidArgumentException(sprintf('relation %s expects collection or array of objects of type: %s', $field, $options['class_name']));
+                     }
+                 }
+             }
+         } else {
+             throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
+         }
+         return $ret;
+     }
+
+    /**
+     * magic method for dynamic properties
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if getter for additional field could not be found
+     * @param string $field the column or additional field
+     * @return null|string|SimpleORMapCollection
+     */
+    function __get($field)
+    {
+        return $this->getValue($field);
+    }
+    /**
+     * magic method for dynamic properties
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if setter for additional field could not be found
+     * @param string $field
+     * @param string $value
+     * @return string
+     */
+    function __set($field, $value)
+    {
+        return $this->setValue($field, $value);
+    }
+    /**
+     * magic method for dynamic properties
+     *
+     * @param string $field
+     * @return bool
+     */
+    function __isset($field)
+    {
+        $field = strtolower($field);
+        if (in_array($field, $this->known_slots())) {
+            $value = $this->getValue($field);
+            return $value instanceOf SimpleORMapCollection ? (bool)count($value) : !is_null($value);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * ArrayAccess: Check whether the given offset exists.
+     *
+     * @param string $offset
+     */
+    public function offsetExists($offset): bool
+    {
+        return $this->__isset($offset);
+    }
+
+    /**
+     * ArrayAccess: Get the value at the given offset.
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if getter for additional field could not be found
+     * @param string $offset the column or additional field
+     * @return null|string|SimpleORMapCollection
+     */
+    public function offsetGet($offset): mixed
+    {
+        return $this->getValue($offset);
+    }
+
+    /**
+     * ArrayAccess: Set the value at the given offset.
+     *
+     * @throws InvalidArgumentException if column could not be found
+     * @throws BadMethodCallException if setter for additional field could not be found
+     * @param string $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value): void
+    {
+        $this->setValue($offset, $value);
+    }
+
+    /**
+     * ArrayAccess: unset the value at the given offset (not applicable)
+     *
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
+    {
+
+    }
+
+    /**
+     * IteratorAggregate
+     */
+    public function getIterator(): ArrayIterator
+    {
+        return new ArrayIterator($this->toArray());
+    }
+
+    /**
+     * Countable
+     */
+    public function count(): int
+    {
+        return count($this->known_slots()) - count($this->relations);
+    }
+
+    /**
+     * check if given column exists in table
+     * @param string $field
+     * @return boolean
+     */
+    function isField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->db_fields()[$field]);
+    }
+
+    /**
+     * check if given relation exists in this class
+     * @param string $field
+     * @return boolean
+     */
+    function isRelation($field)
+    {
+        $field = strtolower($field);
+        return array_key_exists($field, $this->relations);
+    }
+
+    /**
+     * check if given column is additional
+     * @param string $field
+     * @return boolean
+     */
+    function isAdditionalField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->additional_fields()[$field]);
+    }
+
+    /**
+     * check if given column is an alias
+     * @param string $field
+     * @return boolean
+     */
+    function isAliasField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->alias_fields()[$field]);
+    }
+
+    /**
+     * check if given column is a multi-language field
+     * @param string $field
+     * @return boolean
+     */
+    function isI18nField($field)
+    {
+        $field = strtolower($field);
+        return isset($this->i18n_fields()[$field]);
+    }
+
+    /**
+     * set multiple column values
+     * if second param is set, existing data in object will be
+     * discarded and dirty state is cleared,
+     * else new data overrides old data
+     *
+     * @param ?iterable $data assoc array
+     * @param ?boolean $reset existing data in object will be discarded
+     * @return int|bool number of columns changed
+     */
+    function setData($data, $reset = false)
+    {
+        $count = 0;
+        if ($reset) {
+            if ($this->applyCallbacks('before_initialize') === false) {
+                return false;
+            }
+            $this->initializeContent();
+        }
+        if (is_iterable($data)) {
+            foreach($data as $key => $value) {
+                $key = strtolower($key);
+                if (isset($this->db_fields()[$key])
+                    || isset($this->alias_fields()[$key])
+                    || isset($this->additional_fields()[$key]['set'])
+                ) {
+                    $this->setValue($key, $value);
+                    ++$count;
+                }
+            }
+        }
+        if ($reset) {
+            $this->applyCallbacks('after_initialize');
+        }
+        return $count;
+    }
+
+    /**
+     * check if object exists in database
+     * @return boolean
+     */
+    function isNew()
+    {
+        return $this->is_new;
+    }
+
+    /**
+     * check if object was deleted
+     *
+     * @return boolean
+     */
+    function isDeleted()
+    {
+        return $this->is_deleted;
+    }
+
+    /**
+     * set object to new state
+     * @param boolean $is_new
+     * @return boolean
+     */
+    function setNew($is_new)
+    {
+        return $this->is_new = $is_new;
+    }
+
+    /**
+     * returns sql clause with current table and pk
+     * @throws UnexpectedValueException if the primary key is incomplete
+     * @return boolean|array<string>
+     */
+    function getWhereQuery()
+    {
+        $where_query = null;
+        $pk_not_set = [];
+        foreach ($this->pk() as $key) {
+            $pk = $this->content_db[$key] ?? $this->content[$key] ?? null;
+            if (isset($pk)) {
+                $where_query[] = "`{$this->db_table()}`.`{$key}` = "  . DBManager::get()->quote($pk);
+            } else {
+                $pk_not_set[] = $key;
+            }
+        }
+        if (!$where_query || count($pk_not_set)){
+            if ($this->isNew()) {
+                return false;
+            } else {
+                throw new UnexpectedValueException(sprintf("primary key incomplete: %s must not be null", join(',',$pk_not_set)));
+            }
+        }
+        return $where_query;
+    }
+
+    /**
+     * restore entry from database
+     * @return boolean
+     */
+    function restore()
+    {
+        $where_query = $this->getWhereQuery();
+        $id = $this->getId();
+        if ($where_query) {
+            if ($this->applyCallbacks('before_initialize') === false) {
+                return false;
+            }
+            $this->initializeContent();
+            $query = "SELECT * FROM `{$this->db_table()}` WHERE "
+                    . join(" AND ", $where_query);
+            $st = DBManager::get()->prepare($query);
+            $st->execute();
+            $st->setFetchMode(PDO::FETCH_INTO , $this);
+            if ($st->fetch()) {
+                $this->setNew(false);
+                $this->applyCallbacks('after_initialize');
+                return true;
+            }
+        }
+        $this->setData([], true);
+        $this->setNew(true);
+        if (isset($id)) {
+            $this->setId($id);
+        }
+        return false;
+    }
+
+    /**
+     * store entry in database
+     *
+     * @throws UnexpectedValueException if there are forbidden NULL values
+     * @return number|boolean
+     */
+    function store()
+    {
+        // Set id or prepare setting of id
+        if ($this->isNew() && $this->getId() === null) {
+            // Explicitly set id to 0 if auto increment pk is null
+            if ($this->hasAutoIncrementColumn()) {
+                $this->setId(0);
+            } else {
+                $this->setId($this->getNewId());
+            }
+        }
+
+        if ($this->applyCallbacks('before_store') === false) {
+            return false;
+        }
+
+        $ret = 0;
+
+        if (!$this->isDeleted() && ($this->isDirty() || $this->isNew())) {
+            $callback = $this->isNew() ? 'before_create' : 'before_update';
+            if ($this->applyCallbacks($callback) === false) {
+                return false;
+            }
+
+            // Collect i18n contents
+            $i18ncontent = [];
+            foreach (array_keys($this->i18n_fields()) as $field) {
+                if ($this->content[$field] instanceof I18NString) {
+                    $i18ncontent[$field] = $this->content[$field];
+                    $this->content[$field] = $this->content[$field]->original();
+                    $this->content_db[$field] = $this->content_db[$field]->original();
+                }
+            }
+
+            // Create sql data assignment chunks
+            foreach ($this->db_fields() as $field => $meta) {
+                $value = $this->content[$field];
+                if ($field == 'chdate' && !$this->isFieldDirty($field) && $this->isDirty()) {
+                    $value = time();
+                }
+                if ($field == 'mkdate') {
+                    if ($this->isNew()) {
+                        if (!$this->isFieldDirty($field)) {
+                            $value = time();
+                        }
+                    } else {
+                        continue;
+                    }
+                }
+                if ($value === null && $meta['null'] == 'NO') {
+                    throw new UnexpectedValueException($this->db_table() . '.' . $field . ' must not be null.');
+                }
+                if (is_float($value)) {
+                    $value = str_replace(',', '.', $value);
+                }
+                $this->content[$field] = $value;
+                $query_part[] = "`$field` = " . DBManager::get()->quote($value) . " ";
+            }
+
+            // Create store query
+            if (!$this->isNew()) {
+                $where_query = $this->getWhereQuery();
+                $query = "UPDATE `{$this->db_table()}` SET "
+                    . implode(',', $query_part);
+                $query .= " WHERE " . join(" AND ", $where_query);
+            } else {
+                $query = "INSERT INTO `{$this->db_table()}` SET "
+                    . implode(',', $query_part);
+            }
+            $ret = DBManager::get()->exec($query);
+
+            // Retrieve generated id from database if pk is an auto increment
+            // column
+            if ($this->isNew()) {
+                if ($this->hasAutoIncrementColumn() && !$this->getId()) {
+                    $this->setId(DBManager::get()->lastInsertId());
+                }
+            }
+
+            // Store i18n contents
+            foreach ($i18ncontent as $field => $one) {
+                $meta = [
+                    'object_id' => $this->getId(),
+                    'table'     => $this->db_table(),
+                    'field'     => $field
+                ];
+                $one->setMetadata($meta);
+                $one->storeTranslations();
+                if (!$this->content[$field] instanceof I18NString) {
+                    $this->content[$field] = $one;
+                    $this->content_db[$field] = clone $one;
+                }
+            }
+
+            // Apply callbacks
+            $this->applyCallbacks($this->isNew() ? 'after_create' : 'after_update');
+        }
+        $rel_ret = $this->storeRelations();
+
+        $this->applyCallbacks('after_store');
+
+        if ($ret || $rel_ret) {
+            $this->restore();
+        }
+        return $ret + $rel_ret;
+    }
+
+    /**
+     * sends a store message to all initialized related objects
+     * if a relation has a callback for 'on_store' configured, the callback
+     * is instead invoked
+     *
+     * @param null|array|string $only_these
+     * @return int|false number addition of all return values, false if none was called
+     */
+    protected function storeRelations($only_these = null)
+    {
+        $ret = false;
+        if (is_string($only_these)) {
+            $only_these = words($only_these);
+        }
+        $relations = array_keys($this->relations);
+        if (is_array($only_these)) {
+            $only_these = array_filter(array_map(function ($s) {
+                return is_string($s) ? strtolower($s) : null;
+            }, $only_these));
+            $relations = array_intersect($only_these, $relations);
+        }
+        foreach ($relations as $relation) {
+            $options = $this->getRelationOptions($relation);
+            if (isset($options['on_store']) &&
+            ($options['type'] === 'has_one' ||
+            $options['type'] === 'has_many' ||
+            $options['type'] === 'has_and_belongs_to_many')) {
+                if ($options['on_store'] instanceof Closure) {
+                    $ret += call_user_func($options['on_store'], $this, $relation);
+                } elseif (isset($this->relations[$relation])) {
+                    $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                    if ($options['type'] === 'has_one') {
+                        call_user_func($options['assoc_foreign_key_setter'], $this->{$relation}, $foreign_key_value);
+                        $ret = call_user_func([$this->{$relation}, 'store']);
+                    } elseif ($options['type'] === 'has_many') {
+                        foreach ($this->{$relation} as $r) {
+                            call_user_func($options['assoc_foreign_key_setter'], $r, $foreign_key_value);
+                        }
+                        $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'store'));
+                        $ret += array_sum(call_user_func([$this->{$relation}->getDeleted(), 'sendMessage'], 'delete'));
+                    } else {
+                        call_user_func([$this->{$relation}, 'sendMessage'], 'store');
+                        $to_delete = array_filter($this->{$relation}->getDeleted()->pluck($options['assoc_foreign_key']));
+                        $to_insert = array_filter($this->{$relation}->pluck($options['assoc_foreign_key']));
+                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ? AND `" . $options['thru_assoc_key'] . "` = ?";
+                        $st = DBManager::get()->prepare($sql);
+                        foreach ($to_delete as $one_value) {
+                            $st->execute([$foreign_key_value, $one_value]);
+                            $ret += $st->rowCount();
+                        }
+                        $sql = "INSERT IGNORE INTO `" . $options['thru_table'] ."` SET `" . $options['thru_key'] ."` = ?, `" . $options['thru_assoc_key'] . "` = ?";
+                        $st = DBManager::get()->prepare($sql);
+                        foreach ($to_insert as $one_value) {
+                            $st->execute([$foreign_key_value, $one_value]);
+                            $ret += $st->rowCount();
+                        }
+                    }
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * set chdate column to current timestamp
+     * @return boolean
+     */
+    function triggerChdate()
+    {
+        if ($this->db_fields()['chdate']) {
+            $this->content['chdate'] = time();
+            if ($where_query = $this->getWhereQuery()) {
+                DBManager::get()->exec("UPDATE `{$this->db_table()}` SET chdate={$this->content['chdate']}
+                            WHERE ". join(" AND ", $where_query));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * delete entry from database
+     * the object is cleared, but is not(!) turned to new state
+     * @return bool|int number of deleted rows
+     */
+    function delete()
+    {
+        $ret = false;
+        if (!$this->isDeleted() && !$this->isNew()) {
+            if ($this->applyCallbacks('before_delete') === false) {
+                return false;
+            }
+            $ret = $this->deleteRelations();
+            $where_query = $this->getWhereQuery();
+            if ($where_query) {
+                $query = "DELETE FROM `{$this->db_table()}` WHERE "
+                        . join(" AND ", $where_query);
+                $ret += DBManager::get()->exec($query);
+            }
+            $this->is_deleted = true;
+            $this->applyCallbacks('after_delete');
+
+            // Remove i18n translations
+            if (I18N::isEnabled()) {
+                foreach (array_keys($this->i18n_fields()) as $field) {
+                    if ($this->content[$field] instanceof I18NString) {
+                        $this->content[$field]->removeTranslations();
+                    }
+                }
+            }
+        }
+        $this->setData([], true);
+        return $ret;
+    }
+
+    /**
+     * sends a delete message to all related objects
+     * if a relation has a callback for 'on_delete' configured, the callback
+     * is invoked instead
+     *
+     * @return bool|int addition of all return values, false if none was called
+     */
+    protected function deleteRelations()
+    {
+        $ret = false;
+        foreach (array_keys($this->relations) as $relation) {
+            $options = $this->getRelationOptions($relation);
+            if (isset($options['on_delete']) &&
+                ($options['type'] === 'has_one' ||
+                $options['type'] === 'has_many' ||
+                $options['type'] === 'has_and_belongs_to_many')) {
+                if ($options['on_delete'] instanceof Closure) {
+                    $ret += call_user_func($options['on_delete'], $this, $relation);
+                } else {
+                    if ($options['type'] === 'has_one' || $options['type'] === 'has_many') {
+                        $this->initRelation($relation);
+                        if (isset($this->relations[$relation])) {
+                            if ($options['type'] === 'has_one') {
+                                $ret += call_user_func([$this->{$relation}, 'delete']);
+                            } elseif ($options['type'] === 'has_many') {
+                                $ret += array_sum(call_user_func([$this->{$relation}, 'sendMessage'], 'delete'));
+                            }
+                        }
+                    } else {
+                        $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+                        $sql = "DELETE FROM `" . $options['thru_table'] ."` WHERE `" . $options['thru_key'] ."` = ?";
+                        $st = DBManager::get()->prepare($sql);
+                        $st->execute([$foreign_key_value]);
+                        $ret += $st->rowCount();
+                    }
+                }
+                $this->relations[$relation] = null;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * init internal content arrays with nulls or defaults
+     *
+     * @throws UnexpectedValueException if there is an unmatched alias
+     * @return void
+     */
+    protected function initializeContent()
+    {
+        $this->content = [];
+        foreach (array_keys($this->db_fields()) as $field) {
+            $this->content[$field] = null;
+            $this->content_db[$field] = null;
+            $this->setValue($field, $this->getDefaultValue($field));
+        }
+        foreach ($this->alias_fields() as $alias => $field) {
+            if (isset($this->db_fields()[$field])) {
+                $this->content[$alias] =& $this->content[$field];
+                $this->content_db[$alias] =& $this->content_db[$field];
+            } else {
+                throw new UnexpectedValueException(sprintf('Column %s not found for alias %s', $field, $alias));
+            }
+        }
+        foreach (array_keys($this->relations) as $one) {
+            $this->relations[$one] = null;
+        }
+        $this->additional_data = [];
+    }
+
+    /**
+     * checks if at least one field was modified since last restore
+     *
+     * @return boolean
+     */
+    public function isDirty()
+    {
+        foreach (array_keys($this->db_fields()) as $field) {
+            if ($this->isFieldDirty($field)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * checks if given field was modified since last restore
+     *
+     * @param string $field
+     * @return boolean
+     */
+    public function isFieldDirty($field)
+    {
+        $field = strtolower($field);
+        if ($this->content[$field] === null || $this->content_db[$field] === null) {
+            return $this->content[$field] !== $this->content_db[$field];
+        } else if ($this->content[$field] instanceof I18NString || $this->content_db[$field] instanceof I18NString) {
+            return $this->content[$field] != $this->content_db[$field];
+        } else {
+            return (string)$this->content[$field] !== (string)$this->content_db[$field];
+        }
+    }
+
+    /**
+     * reverts value of given field to last restored value
+     *
+     * @param string $field
+     * @return mixed the restored value
+     */
+    public function revertValue($field)
+    {
+        $field = strtolower($field);
+        return ($this->content[$field] = $this->content_db[$field]);
+    }
+
+    /**
+     * returns unmodified value of given field
+     *
+     * @param string $field
+     * @throws InvalidArgumentException
+     * @return mixed
+     */
+    public function getPristineValue($field)
+    {
+        $field = strtolower($field);
+        if (array_key_exists($field, $this->content_db)) {
+            return $this->content_db[$field];
+        } else {
+            throw new InvalidArgumentException(get_class($this) . '::'. $field . ' not found.');
+        }
+    }
+
+    /**
+     * intitalize a relationship and get related record(s)
+     *
+     * @param string $relation name of relation
+     * @throws InvalidArgumentException if the relation does not exists
+     * @return void
+     */
+    public function initRelation($relation)
+    {
+        if (!array_key_exists($relation, $this->relations)) {
+            throw new InvalidArgumentException('Unknown relation: ' . $relation);
+        }
+        if ($this->relations[$relation] === null) {
+            $options = $this->getRelationOptions($relation);
+            $to_call = [$options['class_name'], $options['assoc_func']];
+            if (!is_callable($to_call)) {
+                throw new RuntimeException('assoc_func: ' . join('::', $to_call) . ' is not callable.' );
+            }
+            $params = $options['assoc_func_params_func'];
+            if ($options['type'] === 'has_many') {
+                $records = function($record) use ($to_call, $params, $options) {
+                    $p = (array)$params($record);
+                    return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options['order_by'] ?? null]));
+                };
+                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
+            } elseif ($options['type'] === 'has_and_belongs_to_many') {
+                $records = function($record) use ($to_call, $params, $options) {$p = (array)$params($record); return call_user_func_array($to_call, array_merge(count($p) ? $p : [null], [$options]));};
+                $this->relations[$relation] = new SimpleORMapCollection($records, $options, $this);
+            } else {
+                $p = (array)$params($this);
+                $records = call_user_func_array($to_call, count($p) ? $p : [null]);
+                $result = is_array($records) ? ($records[0] ?? null) : $records;
+                $this->relations[$relation] = $result;
+            }
+        }
+    }
+
+    /**
+     * clear data for a relationship
+     *
+     * @param string $relation name of relation
+     * @throws InvalidArgumentException if teh relation does not exists
+     * @return void
+     */
+    public function resetRelation($relation)
+    {
+        if (!array_key_exists($relation, $this->relations)) {
+            throw new InvalidArgumentException('Unknown relation: ' . $relation);
+        }
+        $this->relations[$relation] = null;
+    }
+
+    /**
+     * invoke registered callbacks for given type
+     * if one callback returns false the following will not
+     * be invoked
+     *
+     * @param string $type type of callback
+     * @return bool return value from last callback
+     */
+    protected function applyCallbacks($type)
+    {
+        $ok = true;
+        foreach ($this->registered_callbacks()[$type] as $cb) {
+            if ($cb instanceof Closure) {
+                $function =  $cb;
+                $params = [$this, $type, $cb];
+            } else {
+                $function = [$this, $cb];
+                $params = [$type];
+            };
+            $ok = call_user_func_array($function, $params);
+            if ($ok === false) {
+                break;
+            }
+        }
+        return $ok;
+    }
+
+    /**
+     * register given callback for one or many possible callback types
+     * callback param could be a closure or method name of current class
+     *
+     * @param string|array $types types to register callback for
+     * @param callable $cb callback
+     * @throws InvalidArgumentException if the callback type is not known
+     * @return number of registered callbacks
+     */
+    protected static function registerCallback($types, $cb)
+    {
+        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
+
+        $types = is_array($types) ? $types : words($types);
+        $reg = 0;
+        foreach ($types as $type) {
+            if (isset(static::registered_callbacks()[$type])) {
+                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
+                if ($found === false) {
+                    self::$config[static::class]['registered_callbacks'][$type][] = $cb;
+                    $reg++;
+                }
+            } else {
+                throw new InvalidArgumentException('Unknown callback type: ' . $type);
+            }
+        }
+        return $reg;
+    }
+
+    /**
+     * unregister given callback for one or many possible callback types
+     *
+     * @param string|array $types types to unregister callback for
+     * @param mixed $cb
+     * @throws InvalidArgumentException if the callback type is not known
+     * @return number of unregistered callbacks
+     */
+    protected static function unregisterCallback($types, $cb)
+    {
+        trigger_error(__METHOD__ . ' is deprecated. Please use the configuration in configure().', E_USER_DEPRECATED);
+
+        $types = is_array($types) ? $types : words($types);
+        foreach ($types as $type) {
+            if (isset(static::registered_callbacks()[$type])) {
+                $found = array_search($cb, self::$config[static::class]['registered_callbacks'][$type], true);
+                if ($found !== false) {
+                    $unreg++;
+                    unset(self::$config[static::class]['registered_callbacks'][$type][$found]);
+                }
+            } else {
+                throw new InvalidArgumentException('Unknown callback type: ' . $type);
+            }
+        }
+        return $unreg;
+    }
+
+    /**
+     * default callback used to map specific callbacks to NotificationCenter
+     *
+     * @param string $cb_type callback type
+     * @return void|boolean
+     */
+    protected function cbNotificationMapper($cb_type)
+    {
+        if (isset($this->notification_map()[$cb_type])) {
+            try {
+                foreach(words($this->notification_map()[$cb_type]) as $notification) {
+                    NotificationCenter::postNotification($notification, $this);
+                }
+            } catch (NotificationVetoException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * default callback used to map specific callbacks to NotificationCenter
+     *
+     * @param string $cb_type callback type
+     * @return void|boolean
+     */
+    protected function cbAfterInitialize($cb_type)
+    {
+        foreach (array_keys($this->db_fields()) as $field) {
+            if (is_object($this->content[$field])) {
+                $this->content_db[$field] = clone $this->content[$field];
+            } else {
+                $this->content_db[$field] = $this->content[$field];
+            }
+        }
+    }
+
+    /**
+     * default setter used to proxy serialized fields with
+     * ArrayObjects
+     *
+     * @param string $field column name
+     * @param mixed $value value
+     * @return mixed
+     */
+     protected function setSerializedValue($field, $value)
+     {
+         $object_type = $this->serialized_fields()[$field];
+         if (is_null($value) || $value instanceof $object_type) {
+             $this->content[$field] = $value;
+         } else {
+             $this->content[$field] = new $object_type($value);
+         }
+         return $this->content[$field];
+     }
+
+    /**
+     * default setter used to proxy I18N fields with
+     * I18NString
+     *
+     * @param string $field column name
+     * @param mixed $value value
+     * @return mixed
+     */
+    protected function setI18nValue($field, $value)
+    {
+        $meta = ['object_id' => $this->getId(),
+                 'table'     => $this->db_table(),
+                 'field'     => $field];
+        if ($value instanceof I18NString) {
+            $value->setMetadata($meta);
+            $this->content[$field] = $value;
+        } else {
+            $this->content[$field] = new I18NString($value, null, $meta);
+        }
+        return $this->content[$field];
+    }
+
+     /**
+      * Cleans up this object. This essentially reset all relations of
+      * this object and marks them as unused so that the garbage collector may
+      * remove the objects.
+      *
+      * Use this function when you ran into memory problems and need to free
+      * some memory;
+      *
+      * @return void
+      */
+     public function cleanup()
+     {
+         foreach ($this->relations as $relation => $object) {
+             if ($object instanceof SimpleORMap || $object instanceof SimpleORMapCollection) {
+                 $this->relations[$relation]->cleanup();
+             }
+             $this->resetRelation($relation);
+         }
+     }
+}
diff --git a/lib/classes/SimpleORMapCollection.class.php b/lib/classes/SimpleORMapCollection.class.php
deleted file mode 100644
index 7debb80..0000000
--- a/lib/classes/SimpleORMapCollection.class.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- * SimpleORMapCollection.class.php
- * simple object-relational mapping
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @extends SimpleCollection<SimpleORMap>
- *
- * @template T of SimpleORMap
- */
-class SimpleORMapCollection extends SimpleCollection
-{
-    /**
-     * @var int Exception error code denoting a wrong type of objects.
-     */
-    const WRONG_OBJECT_TYPE = 1;
-
-    /**
-     * @var int Exception error code denoting that an object of this `id` already exists.
-     */
-    const OBJECT_EXISTS = 2;
-
-    /**
-     * the record object this collection belongs to
-     *
-     * @var ?SimpleORMap
-     */
-    protected $related_record;
-
-    /**
-     * relation options
-     * @var array
-     */
-    protected $relation_options = [];
-
-    /**
-     * creates a collection from an array of objects
-     * all objects should be of the same type
-     *
-     * @throws InvalidArgumentException if first entry is not SimpleOrMap
-     * @param T[] $data array with SimpleORMap objects
-     * @param bool $strict check every element for correct type and unique pk
-     * @return SimpleORMapCollection<T>
-     */
-    public static function createFromArray(array $data, $strict = true)
-    {
-        $ret = new SimpleORMapCollection();
-        if (count($data)) {
-            $first = current($data);
-            if ($first instanceof SimpleORMap) {
-                $ret->setClassName(get_class($first));
-                if ($strict) {
-                    foreach ($data as $one) {
-                        $ret[] = $one;
-                    }
-                } else {
-                    $ret->exchangeArray($data);
-                }
-            } else {
-                throw new InvalidArgumentException('This collection only accepts objects derived from SimpleORMap', self::WRONG_OBJECT_TYPE);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param ?Closure         $finder  callable to fill collection
-     * @param ?array           $options relationship options
-     * @param SimpleORMap|null $record  related record
-     */
-    public function __construct(Closure $finder = null, array $options = null, SimpleORMap $record = null)
-    {
-        $this->relation_options = $options;
-        $this->related_record = $record;
-        parent::__construct($finder === null ? [] : $finder);
-    }
-
-    /**
-     * Sets the value at the specified index
-     * checks if the value is an object of specified class
-     *
-     * @see ArrayObject::offsetSet()
-     * @throws InvalidArgumentException if the given model does not fit (wrong type or id)
-     */
-    public function offsetSet($index, $newval): void
-    {
-        if (!is_null($index)) {
-            $index = (int)$index;
-        }
-        if (!is_a($newval, $this->getClassName())) {
-            throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
-        }
-        if ($this->related_record && $this->relation_options['type'] === 'has_many') {
-            $foreign_key_value = call_user_func($this->relation_options['assoc_func_params_func'], $this->related_record);
-            call_user_func($this->relation_options['assoc_foreign_key_setter'], $newval, $foreign_key_value);
-        }
-        if ($newval->id !== null) {
-            $exists = $this->find($newval->id);
-            if ($exists) {
-                throw new InvalidArgumentException('Element could not be appended, element with id: ' . $exists->id . ' is in the way', self::OBJECT_EXISTS);
-            }
-        }
-        parent::offsetSet($index, $newval);
-    }
-
-    /**
-     * sets the allowed class name
-     * @param class-string $class_name
-     * @return void
-     */
-    public function setClassName($class_name)
-    {
-        $this->relation_options['class_name'] = strtolower($class_name);
-        $this->deleted->relation_options['class_name'] = strtolower($class_name);
-    }
-
-    /**
-     * sets the related record
-     *
-     * @param SimpleORMap $record
-     * @return void
-     */
-    public function setRelatedRecord(SimpleORMap $record)
-    {
-        $this->related_record = $record;
-    }
-
-    /**
-     * gets the allowed classname
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        return strtolower($this->relation_options['class_name']);
-    }
-
-    /**
-     * reloads the elements of the collection
-     * by calling the finder function
-     *
-     * @throws InvalidArgumentException
-     * @return ?int number of records after refresh
-     */
-    public function refresh()
-    {
-        if (is_callable($this->finder)) {
-            $data = call_user_func($this->finder, $this->related_record);
-            foreach ($data as $one) {
-                if (!is_a($one, $this->getClassName())) {
-                    throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
-                }
-            }
-            $this->exchangeArray($data);
-            $this->deleted->exchangeArray([]);
-            return $this->last_count = $this->count();
-        }
-
-        return null;
-    }
-
-    /**
-     * returns element with given primary key value
-     *
-     * @param string $value primary key value to search for
-     * @return ?T
-     */
-    public function find($value)
-    {
-        return $this->findOneBy('id', $value);
-    }
-
-    /**
-     * returns the collection as grouped array
-     * first param is the column to group by, it becomes the key in
-     * the resulting array, default is pk. Limit returned fields with second param
-     * The grouped entries can optoionally go through the given
-     * callback. If no callback is provided, only the first grouped
-     * entry is returned, suitable for grouping by unique column
-     *
-     * @param string $group_by the column to group by, pk if ommitted
-     * @param mixed $only_these_fields limit returned fields
-     * @param ?callable $group_func closure to aggregate grouped entries
-     * @return array assoc array
-     */
-    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
-    {
-        $result = [];
-        foreach ($this as $record) {
-            $key = $record->getValue($group_by);
-            if (is_array($key)) {
-                $key = join('_', $key);
-            }
-            $result[$key][] = $record->toArray($only_these_fields);
-        }
-        if ($group_func === null) {
-            $group_func = 'current';
-        }
-        return array_map($group_func, $result);
-    }
-
-    /**
-     * mark element(s) for deletion
-     * element(s) with given primary key are moved to
-     * internal deleted collection
-     *
-     * @param string $id primary key of element
-     * @return int number of unsetted elements
-     */
-    public function unsetByPk($id)
-    {
-        return $this->unsetBy('id', $id);
-    }
-
-    /**
-     * merge in another collection, elements must be of
-     * the same type, if an element already exists it is
-     * replaced or ignored depending on second param
-     *
-     * @param SimpleORMapCollection $a_collection
-     * @param string $mode 'replace' or 'ignore'
-     * @return void
-     */
-    public function merge(SimpleCollection $a_collection, string $mode = 'ignore')
-    {
-        $mode = func_get_arg(1);
-        foreach ($a_collection as $element) {
-            try {
-                /**
-                 * @throws InvalidArgumentException
-                 * @see SimpleORMapCollection::offsetSet()
-                 */
-                $this[] = $element;
-            } catch (InvalidArgumentException $e) {
-                if ($e->getCode() === self::OBJECT_EXISTS) {
-                    if ($mode === 'replace') {
-                        $this->unsetByPk($element->id);
-                        $this[] = $element;
-                    } // else $mode means 'ignore'
-                } else {
-                    throw $e;
-                }
-            }
-        }
-        $this->storage = array_values($this->storage);
-    }
-}
diff --git a/lib/classes/SimpleORMapCollection.php b/lib/classes/SimpleORMapCollection.php
new file mode 100644
index 0000000..7debb80
--- /dev/null
+++ b/lib/classes/SimpleORMapCollection.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * SimpleORMapCollection.class.php
+ * simple object-relational mapping
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @extends SimpleCollection<SimpleORMap>
+ *
+ * @template T of SimpleORMap
+ */
+class SimpleORMapCollection extends SimpleCollection
+{
+    /**
+     * @var int Exception error code denoting a wrong type of objects.
+     */
+    const WRONG_OBJECT_TYPE = 1;
+
+    /**
+     * @var int Exception error code denoting that an object of this `id` already exists.
+     */
+    const OBJECT_EXISTS = 2;
+
+    /**
+     * the record object this collection belongs to
+     *
+     * @var ?SimpleORMap
+     */
+    protected $related_record;
+
+    /**
+     * relation options
+     * @var array
+     */
+    protected $relation_options = [];
+
+    /**
+     * creates a collection from an array of objects
+     * all objects should be of the same type
+     *
+     * @throws InvalidArgumentException if first entry is not SimpleOrMap
+     * @param T[] $data array with SimpleORMap objects
+     * @param bool $strict check every element for correct type and unique pk
+     * @return SimpleORMapCollection<T>
+     */
+    public static function createFromArray(array $data, $strict = true)
+    {
+        $ret = new SimpleORMapCollection();
+        if (count($data)) {
+            $first = current($data);
+            if ($first instanceof SimpleORMap) {
+                $ret->setClassName(get_class($first));
+                if ($strict) {
+                    foreach ($data as $one) {
+                        $ret[] = $one;
+                    }
+                } else {
+                    $ret->exchangeArray($data);
+                }
+            } else {
+                throw new InvalidArgumentException('This collection only accepts objects derived from SimpleORMap', self::WRONG_OBJECT_TYPE);
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param ?Closure         $finder  callable to fill collection
+     * @param ?array           $options relationship options
+     * @param SimpleORMap|null $record  related record
+     */
+    public function __construct(Closure $finder = null, array $options = null, SimpleORMap $record = null)
+    {
+        $this->relation_options = $options;
+        $this->related_record = $record;
+        parent::__construct($finder === null ? [] : $finder);
+    }
+
+    /**
+     * Sets the value at the specified index
+     * checks if the value is an object of specified class
+     *
+     * @see ArrayObject::offsetSet()
+     * @throws InvalidArgumentException if the given model does not fit (wrong type or id)
+     */
+    public function offsetSet($index, $newval): void
+    {
+        if (!is_null($index)) {
+            $index = (int)$index;
+        }
+        if (!is_a($newval, $this->getClassName())) {
+            throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
+        }
+        if ($this->related_record && $this->relation_options['type'] === 'has_many') {
+            $foreign_key_value = call_user_func($this->relation_options['assoc_func_params_func'], $this->related_record);
+            call_user_func($this->relation_options['assoc_foreign_key_setter'], $newval, $foreign_key_value);
+        }
+        if ($newval->id !== null) {
+            $exists = $this->find($newval->id);
+            if ($exists) {
+                throw new InvalidArgumentException('Element could not be appended, element with id: ' . $exists->id . ' is in the way', self::OBJECT_EXISTS);
+            }
+        }
+        parent::offsetSet($index, $newval);
+    }
+
+    /**
+     * sets the allowed class name
+     * @param class-string $class_name
+     * @return void
+     */
+    public function setClassName($class_name)
+    {
+        $this->relation_options['class_name'] = strtolower($class_name);
+        $this->deleted->relation_options['class_name'] = strtolower($class_name);
+    }
+
+    /**
+     * sets the related record
+     *
+     * @param SimpleORMap $record
+     * @return void
+     */
+    public function setRelatedRecord(SimpleORMap $record)
+    {
+        $this->related_record = $record;
+    }
+
+    /**
+     * gets the allowed classname
+     *
+     * @return string
+     */
+    public function getClassName()
+    {
+        return strtolower($this->relation_options['class_name']);
+    }
+
+    /**
+     * reloads the elements of the collection
+     * by calling the finder function
+     *
+     * @throws InvalidArgumentException
+     * @return ?int number of records after refresh
+     */
+    public function refresh()
+    {
+        if (is_callable($this->finder)) {
+            $data = call_user_func($this->finder, $this->related_record);
+            foreach ($data as $one) {
+                if (!is_a($one, $this->getClassName())) {
+                    throw new InvalidArgumentException('This collection only accepts objects of type: ' .  $this->getClassName(), self::WRONG_OBJECT_TYPE);
+                }
+            }
+            $this->exchangeArray($data);
+            $this->deleted->exchangeArray([]);
+            return $this->last_count = $this->count();
+        }
+
+        return null;
+    }
+
+    /**
+     * returns element with given primary key value
+     *
+     * @param string $value primary key value to search for
+     * @return ?T
+     */
+    public function find($value)
+    {
+        return $this->findOneBy('id', $value);
+    }
+
+    /**
+     * returns the collection as grouped array
+     * first param is the column to group by, it becomes the key in
+     * the resulting array, default is pk. Limit returned fields with second param
+     * The grouped entries can optoionally go through the given
+     * callback. If no callback is provided, only the first grouped
+     * entry is returned, suitable for grouping by unique column
+     *
+     * @param string $group_by the column to group by, pk if ommitted
+     * @param mixed $only_these_fields limit returned fields
+     * @param ?callable $group_func closure to aggregate grouped entries
+     * @return array assoc array
+     */
+    public function toGroupedArray($group_by = 'id', $only_these_fields = null, callable $group_func = null)
+    {
+        $result = [];
+        foreach ($this as $record) {
+            $key = $record->getValue($group_by);
+            if (is_array($key)) {
+                $key = join('_', $key);
+            }
+            $result[$key][] = $record->toArray($only_these_fields);
+        }
+        if ($group_func === null) {
+            $group_func = 'current';
+        }
+        return array_map($group_func, $result);
+    }
+
+    /**
+     * mark element(s) for deletion
+     * element(s) with given primary key are moved to
+     * internal deleted collection
+     *
+     * @param string $id primary key of element
+     * @return int number of unsetted elements
+     */
+    public function unsetByPk($id)
+    {
+        return $this->unsetBy('id', $id);
+    }
+
+    /**
+     * merge in another collection, elements must be of
+     * the same type, if an element already exists it is
+     * replaced or ignored depending on second param
+     *
+     * @param SimpleORMapCollection $a_collection
+     * @param string $mode 'replace' or 'ignore'
+     * @return void
+     */
+    public function merge(SimpleCollection $a_collection, string $mode = 'ignore')
+    {
+        $mode = func_get_arg(1);
+        foreach ($a_collection as $element) {
+            try {
+                /**
+                 * @throws InvalidArgumentException
+                 * @see SimpleORMapCollection::offsetSet()
+                 */
+                $this[] = $element;
+            } catch (InvalidArgumentException $e) {
+                if ($e->getCode() === self::OBJECT_EXISTS) {
+                    if ($mode === 'replace') {
+                        $this->unsetByPk($element->id);
+                        $this[] = $element;
+                    } // else $mode means 'ignore'
+                } else {
+                    throw $e;
+                }
+            }
+        }
+        $this->storage = array_values($this->storage);
+    }
+}
diff --git a/lib/classes/StudipArrayObject.class.php b/lib/classes/StudipArrayObject.class.php
deleted file mode 100644
index da7e66e..0000000
--- a/lib/classes/StudipArrayObject.class.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?php
-/**
- * StudipArrayObject
- *
- * This ArrayObject is a rewrite of the implementation to fix
- * issues with php's implementation of ArrayObject regarding cyclic references
- * based on Zend\Stdlib\ArrayObject\PhpReferenceCompatibility
- *
- * @author      André Noack <noack@data-quest.de>
- *
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Countable
-{
-    /**
-     * Properties of the object have their normal functionality
-     * when accessed as list (var_dump, foreach, etc.).
-     */
-    const STD_PROP_LIST = 1;
-
-    /**
-     * Entries can be accessed as properties (read and write).
-     */
-    const ARRAY_AS_PROPS = 2;
-
-    /**
-     * @var array
-     */
-    protected $storage;
-
-    /**
-     * @var int
-     */
-    protected $flag;
-
-    /**
-     * @var string
-     */
-    protected $iteratorClass;
-
-    /**
-     * @var array
-     */
-    protected $protectedProperties;
-
-    /**
-     * Constructor
-     *
-     * @param array  $input
-     * @param int    $flags
-     * @param string $iteratorClass
-     */
-    public function __construct($input = [], $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
-    {
-        $this->setFlags($flags);
-        $this->storage = $input;
-        $this->setIteratorClass($iteratorClass);
-        $this->protectedProperties = array_keys(get_object_vars($this));
-    }
-
-    /**
-     * Returns whether the requested key exists
-     *
-     * @param  mixed $key
-     * @return bool
-     */
-    public function __isset($key)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            return $this->offsetExists($key);
-        }
-
-        $this->validateKeyUsage($key);
-
-        return isset($this->$key);
-    }
-
-    /**
-     * Sets the value at the specified key to value
-     *
-     * @param  mixed $key
-     * @param  mixed $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            $this->offsetSet($key, $value);
-            return;
-        }
-
-        $this->validateKeyUsage($key);
-
-        $this->$key = $value;
-    }
-
-    /**
-     * Unsets the value at the specified key
-     *
-     * @param  mixed $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            $this->offsetUnset($key);
-            return;
-        }
-
-        $this->validateKeyUsage($key);
-
-        unset($this->$key);
-    }
-
-    /**
-     * Returns the value at the specified key
-     *
-     * @param  mixed $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            $ret = $this->offsetGet($key);
-            return $ret;
-        }
-
-        $this->validateKeyUsage($key);
-
-        return $this->$key;
-    }
-
-    /**
-     * Called when serializing an ArrayObject
-     */
-    public function __serialize(): array
-    {
-        return get_object_vars($this);
-    }
-
-    /**
-     * Called when unserializing an ArrayObject
-     */
-    public function __unserialize(array $data): void
-    {
-        foreach ($data as $k => $v) {
-            switch ($k) {
-                case 'flag':
-                    $this->setFlags($v);
-                    break;
-                case 'storage':
-                    $this->exchangeArray($v);
-                    break;
-                case 'iteratorClass':
-                    $this->setIteratorClass($v);
-                    break;
-                case 'protectedProperties':
-                    break;
-                default:
-                    $this->__set($k, $v);
-            }
-        }
-    }
-
-    /**
-     * Appends the value
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function append($value)
-    {
-        $this->storage[] = $value;
-    }
-
-    /**
-     * Sort the entries by value
-     *
-     * @return void
-     */
-    public function asort()
-    {
-        asort($this->storage);
-    }
-
-    /**
-     * Get the number of public properties in the ArrayObject
-     */
-    public function count(): int
-    {
-        return count($this->storage);
-    }
-
-    /**
-     * Exchange the array for another one.
-     *
-     * @param  array|ArrayObject $data
-     * @return array
-     */
-    public function exchangeArray($data)
-    {
-        if (!is_array($data) && !is_object($data)) {
-            throw new InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
-        }
-
-        if (is_object($data) && ($data instanceof self || $data instanceof \ArrayObject)) {
-            $data = $data->getArrayCopy();
-        }
-        if (!is_array($data)) {
-            $data = (array) $data;
-        }
-
-        $storage = $this->storage;
-
-        $this->storage = $data;
-
-        return $storage;
-    }
-
-    /**
-     * Creates a copy of the ArrayObject.
-     *
-     * @return array
-     */
-    public function getArrayCopy()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * Gets the behavior flags.
-     *
-     * @return int
-     */
-    public function getFlags()
-    {
-        return $this->flag;
-    }
-
-    /**
-     * Create a new iterator from an ArrayObject instance
-     */
-    public function getIterator(): Traversable
-    {
-        $class = $this->iteratorClass;
-
-        return new $class($this->storage);
-    }
-
-    /**
-     * Gets the iterator classname for the ArrayObject.
-     *
-     * @return string
-     */
-    public function getIteratorClass()
-    {
-        return $this->iteratorClass;
-    }
-
-    /**
-     * Sort the entries by key
-     *
-     * @return void
-     */
-    public function ksort()
-    {
-        ksort($this->storage);
-    }
-
-    /**
-     * Sort an array using a case insensitive "natural order" algorithm
-     *
-     * @return void
-     */
-    public function natcasesort()
-    {
-        natcasesort($this->storage);
-    }
-
-    /**
-     * Sort entries using a "natural order" algorithm
-     *
-     * @return void
-     */
-    public function natsort()
-    {
-        natsort($this->storage);
-    }
-
-    /**
-     * Returns whether the requested key exists
-     *
-     * @param  mixed $key
-     */
-    public function offsetExists($key): bool
-    {
-        return isset($this->storage[$key]);
-    }
-
-    /**
-     * Returns the value at the specified key
-     *
-     * @param  mixed $key
-     */
-    public function offsetGet($key): mixed
-    {
-        $ret = null;
-        if (!$this->offsetExists($key)) {
-            return $ret;
-        }
-        $ret = $this->storage[$key];
-
-        return $ret;
-    }
-
-    /**
-     * Sets the value at the specified key to value
-     *
-     * @param  mixed $key
-     * @param  mixed $value
-     */
-    public function offsetSet($key, $value): void
-    {
-        if (is_null($key)) {
-            $this->append($value);
-            return;
-        }
-        $this->storage[$key] = $value;
-    }
-
-    /**
-     * Unsets the value at the specified key
-     *
-     * @param  mixed $key
-     */
-    public function offsetUnset($key): void
-    {
-        if ($this->offsetExists($key)) {
-            unset($this->storage[$key]);
-        }
-    }
-
-    /**
-     * Serialize an ArrayObject
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize(get_object_vars($this));
-    }
-
-    /**
-     * Sets the behavior flags
-     *
-     * @param  int  $flags
-     * @return void
-     */
-    public function setFlags($flags)
-    {
-        $this->flag = $flags;
-    }
-
-    /**
-     * Sets the iterator classname for the ArrayObject
-     *
-     * @param  string $class
-     * @return void
-     */
-    public function setIteratorClass($class)
-    {
-        if (class_exists($class)) {
-            $this->iteratorClass = $class;
-
-            return ;
-        }
-
-        if (mb_strpos($class, '\\') === 0) {
-            $class = '\\' . $class;
-            if (class_exists($class)) {
-                $this->iteratorClass = $class;
-
-                return ;
-            }
-        }
-
-        throw new InvalidArgumentException('The iterator class does not exist');
-    }
-
-    /**
-     * Sort the entries with a user-defined comparison function and maintain key association
-     *
-     * @param  callable $function
-     * @return void
-     */
-    public function uasort($function)
-    {
-        if (is_callable($function)) {
-            uasort($this->storage, $function);
-        }
-    }
-
-    /**
-     * Sort the entries by keys using a user-defined comparison function
-     *
-     * @param  callable $function
-     * @return void
-     */
-    public function uksort($function)
-    {
-        if (is_callable($function)) {
-            uksort($this->storage, $function);
-        }
-    }
-
-    /**
-     * Unserialize an ArrayObject
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        $ar = unserialize($data);
-        $this->setFlags($ar['flag']);
-        $this->exchangeArray($ar['storage']);
-        $this->setIteratorClass($ar['iteratorClass']);
-        foreach ($ar as $k => $v) {
-            switch ($k) {
-                case 'flag':
-                    $this->setFlags($v);
-                    break;
-                case 'storage':
-                    $this->exchangeArray($v);
-                    break;
-                case 'iteratorClass':
-                    $this->setIteratorClass($v);
-                    break;
-                case 'protectedProperties':
-                    break;
-                default:
-                    $this->__set($k, $v);
-            }
-        }
-    }
-
-    /**
-     * Validates whether the given key is a protected property.
-     *
-     * @param  string $key The key to validate
-     * @throws InvalidArgumentException when key is invalid
-     */
-    protected function validateKeyUsage($key)
-    {
-        if (in_array($key, $this->protectedProperties)) {
-            throw new InvalidArgumentException("{$key} is a protected property, use a different key");
-        }
-    }
-
-    /**
-     * Returns whether the given value is in the underlying array.
-     */
-    public function contains($value): bool
-    {
-        return in_array($value, $this->storage);
-    }
-}
diff --git a/lib/classes/StudipArrayObject.php b/lib/classes/StudipArrayObject.php
new file mode 100644
index 0000000..da7e66e
--- /dev/null
+++ b/lib/classes/StudipArrayObject.php
@@ -0,0 +1,471 @@
+<?php
+/**
+ * StudipArrayObject
+ *
+ * This ArrayObject is a rewrite of the implementation to fix
+ * issues with php's implementation of ArrayObject regarding cyclic references
+ * based on Zend\Stdlib\ArrayObject\PhpReferenceCompatibility
+ *
+ * @author      André Noack <noack@data-quest.de>
+ *
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+class StudipArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Countable
+{
+    /**
+     * Properties of the object have their normal functionality
+     * when accessed as list (var_dump, foreach, etc.).
+     */
+    const STD_PROP_LIST = 1;
+
+    /**
+     * Entries can be accessed as properties (read and write).
+     */
+    const ARRAY_AS_PROPS = 2;
+
+    /**
+     * @var array
+     */
+    protected $storage;
+
+    /**
+     * @var int
+     */
+    protected $flag;
+
+    /**
+     * @var string
+     */
+    protected $iteratorClass;
+
+    /**
+     * @var array
+     */
+    protected $protectedProperties;
+
+    /**
+     * Constructor
+     *
+     * @param array  $input
+     * @param int    $flags
+     * @param string $iteratorClass
+     */
+    public function __construct($input = [], $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
+    {
+        $this->setFlags($flags);
+        $this->storage = $input;
+        $this->setIteratorClass($iteratorClass);
+        $this->protectedProperties = array_keys(get_object_vars($this));
+    }
+
+    /**
+     * Returns whether the requested key exists
+     *
+     * @param  mixed $key
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        if ($this->flag == self::ARRAY_AS_PROPS) {
+            return $this->offsetExists($key);
+        }
+
+        $this->validateKeyUsage($key);
+
+        return isset($this->$key);
+    }
+
+    /**
+     * Sets the value at the specified key to value
+     *
+     * @param  mixed $key
+     * @param  mixed $value
+     * @return void
+     */
+    public function __set($key, $value)
+    {
+        if ($this->flag == self::ARRAY_AS_PROPS) {
+            $this->offsetSet($key, $value);
+            return;
+        }
+
+        $this->validateKeyUsage($key);
+
+        $this->$key = $value;
+    }
+
+    /**
+     * Unsets the value at the specified key
+     *
+     * @param  mixed $key
+     * @return void
+     */
+    public function __unset($key)
+    {
+        if ($this->flag == self::ARRAY_AS_PROPS) {
+            $this->offsetUnset($key);
+            return;
+        }
+
+        $this->validateKeyUsage($key);
+
+        unset($this->$key);
+    }
+
+    /**
+     * Returns the value at the specified key
+     *
+     * @param  mixed $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if ($this->flag == self::ARRAY_AS_PROPS) {
+            $ret = $this->offsetGet($key);
+            return $ret;
+        }
+
+        $this->validateKeyUsage($key);
+
+        return $this->$key;
+    }
+
+    /**
+     * Called when serializing an ArrayObject
+     */
+    public function __serialize(): array
+    {
+        return get_object_vars($this);
+    }
+
+    /**
+     * Called when unserializing an ArrayObject
+     */
+    public function __unserialize(array $data): void
+    {
+        foreach ($data as $k => $v) {
+            switch ($k) {
+                case 'flag':
+                    $this->setFlags($v);
+                    break;
+                case 'storage':
+                    $this->exchangeArray($v);
+                    break;
+                case 'iteratorClass':
+                    $this->setIteratorClass($v);
+                    break;
+                case 'protectedProperties':
+                    break;
+                default:
+                    $this->__set($k, $v);
+            }
+        }
+    }
+
+    /**
+     * Appends the value
+     *
+     * @param  mixed $value
+     * @return void
+     */
+    public function append($value)
+    {
+        $this->storage[] = $value;
+    }
+
+    /**
+     * Sort the entries by value
+     *
+     * @return void
+     */
+    public function asort()
+    {
+        asort($this->storage);
+    }
+
+    /**
+     * Get the number of public properties in the ArrayObject
+     */
+    public function count(): int
+    {
+        return count($this->storage);
+    }
+
+    /**
+     * Exchange the array for another one.
+     *
+     * @param  array|ArrayObject $data
+     * @return array
+     */
+    public function exchangeArray($data)
+    {
+        if (!is_array($data) && !is_object($data)) {
+            throw new InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
+        }
+
+        if (is_object($data) && ($data instanceof self || $data instanceof \ArrayObject)) {
+            $data = $data->getArrayCopy();
+        }
+        if (!is_array($data)) {
+            $data = (array) $data;
+        }
+
+        $storage = $this->storage;
+
+        $this->storage = $data;
+
+        return $storage;
+    }
+
+    /**
+     * Creates a copy of the ArrayObject.
+     *
+     * @return array
+     */
+    public function getArrayCopy()
+    {
+        return $this->storage;
+    }
+
+    /**
+     * Gets the behavior flags.
+     *
+     * @return int
+     */
+    public function getFlags()
+    {
+        return $this->flag;
+    }
+
+    /**
+     * Create a new iterator from an ArrayObject instance
+     */
+    public function getIterator(): Traversable
+    {
+        $class = $this->iteratorClass;
+
+        return new $class($this->storage);
+    }
+
+    /**
+     * Gets the iterator classname for the ArrayObject.
+     *
+     * @return string
+     */
+    public function getIteratorClass()
+    {
+        return $this->iteratorClass;
+    }
+
+    /**
+     * Sort the entries by key
+     *
+     * @return void
+     */
+    public function ksort()
+    {
+        ksort($this->storage);
+    }
+
+    /**
+     * Sort an array using a case insensitive "natural order" algorithm
+     *
+     * @return void
+     */
+    public function natcasesort()
+    {
+        natcasesort($this->storage);
+    }
+
+    /**
+     * Sort entries using a "natural order" algorithm
+     *
+     * @return void
+     */
+    public function natsort()
+    {
+        natsort($this->storage);
+    }
+
+    /**
+     * Returns whether the requested key exists
+     *
+     * @param  mixed $key
+     */
+    public function offsetExists($key): bool
+    {
+        return isset($this->storage[$key]);
+    }
+
+    /**
+     * Returns the value at the specified key
+     *
+     * @param  mixed $key
+     */
+    public function offsetGet($key): mixed
+    {
+        $ret = null;
+        if (!$this->offsetExists($key)) {
+            return $ret;
+        }
+        $ret = $this->storage[$key];
+
+        return $ret;
+    }
+
+    /**
+     * Sets the value at the specified key to value
+     *
+     * @param  mixed $key
+     * @param  mixed $value
+     */
+    public function offsetSet($key, $value): void
+    {
+        if (is_null($key)) {
+            $this->append($value);
+            return;
+        }
+        $this->storage[$key] = $value;
+    }
+
+    /**
+     * Unsets the value at the specified key
+     *
+     * @param  mixed $key
+     */
+    public function offsetUnset($key): void
+    {
+        if ($this->offsetExists($key)) {
+            unset($this->storage[$key]);
+        }
+    }
+
+    /**
+     * Serialize an ArrayObject
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        return serialize(get_object_vars($this));
+    }
+
+    /**
+     * Sets the behavior flags
+     *
+     * @param  int  $flags
+     * @return void
+     */
+    public function setFlags($flags)
+    {
+        $this->flag = $flags;
+    }
+
+    /**
+     * Sets the iterator classname for the ArrayObject
+     *
+     * @param  string $class
+     * @return void
+     */
+    public function setIteratorClass($class)
+    {
+        if (class_exists($class)) {
+            $this->iteratorClass = $class;
+
+            return ;
+        }
+
+        if (mb_strpos($class, '\\') === 0) {
+            $class = '\\' . $class;
+            if (class_exists($class)) {
+                $this->iteratorClass = $class;
+
+                return ;
+            }
+        }
+
+        throw new InvalidArgumentException('The iterator class does not exist');
+    }
+
+    /**
+     * Sort the entries with a user-defined comparison function and maintain key association
+     *
+     * @param  callable $function
+     * @return void
+     */
+    public function uasort($function)
+    {
+        if (is_callable($function)) {
+            uasort($this->storage, $function);
+        }
+    }
+
+    /**
+     * Sort the entries by keys using a user-defined comparison function
+     *
+     * @param  callable $function
+     * @return void
+     */
+    public function uksort($function)
+    {
+        if (is_callable($function)) {
+            uksort($this->storage, $function);
+        }
+    }
+
+    /**
+     * Unserialize an ArrayObject
+     *
+     * @param  string $data
+     * @return void
+     */
+    public function unserialize($data)
+    {
+        $ar = unserialize($data);
+        $this->setFlags($ar['flag']);
+        $this->exchangeArray($ar['storage']);
+        $this->setIteratorClass($ar['iteratorClass']);
+        foreach ($ar as $k => $v) {
+            switch ($k) {
+                case 'flag':
+                    $this->setFlags($v);
+                    break;
+                case 'storage':
+                    $this->exchangeArray($v);
+                    break;
+                case 'iteratorClass':
+                    $this->setIteratorClass($v);
+                    break;
+                case 'protectedProperties':
+                    break;
+                default:
+                    $this->__set($k, $v);
+            }
+        }
+    }
+
+    /**
+     * Validates whether the given key is a protected property.
+     *
+     * @param  string $key The key to validate
+     * @throws InvalidArgumentException when key is invalid
+     */
+    protected function validateKeyUsage($key)
+    {
+        if (in_array($key, $this->protectedProperties)) {
+            throw new InvalidArgumentException("{$key} is a protected property, use a different key");
+        }
+    }
+
+    /**
+     * Returns whether the given value is in the underlying array.
+     */
+    public function contains($value): bool
+    {
+        return in_array($value, $this->storage);
+    }
+}
diff --git a/lib/classes/StudipForm.class.php b/lib/classes/StudipForm.class.php
deleted file mode 100644
index 024e2e3..0000000
--- a/lib/classes/StudipForm.class.php
+++ /dev/null
@@ -1,590 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipForm.class.php
-// Class to build HTML formular and handle persistence using PhpLib
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-use Studip\Button, Studip\LinkButton;
-
-/**
-* Class to build Studip HTML forms
-*
-* @deprecated
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-**/
-class StudipForm {
-
-    var $form_name;
-
-    var $field_attributes_default = [];
-
-    var $form_fields = [];
-
-    var $form_buttons = [];
-
-    var $persistent_values = true;
-
-    var $form_values = [];
-
-    var $value_changed = [];
-
-
-    static function TimestampToSQLDate($tstamp){
-        return date("Y-m-d", $tstamp);
-    }
-
-    static function SQLDateToTimestamp($sqldate){
-        $date_values = explode("-", $sqldate); //YYYY-MM-DD
-        if (checkdate((int)$date_values[1],(int)$date_values[2],(int)$date_values[0])){
-            return mktime(12,0,0,$date_values[1],$date_values[2],$date_values[0]);
-        } else {
-            return false;
-        }
-    }
-
-    static function _GetRawFieldValue($field_name, $form_name) {
-        return Request::get($form_name. '_' . $field_name);
-    }
-
-    static function _IsSended($form_name){
-        return Request::get($form_name . "_" . md5("is_sended")) !== null;
-    }
-
-    static function _IsClicked($button, $form_name){
-        return Request::submitted($form_name . "_" . $button);
-    }
-
-    function __construct($form_fields, $form_buttons, $form_name = "studipform", $persistent_values = true) {
-        $this->form_name = $form_name;
-        $this->persistent_values = $persistent_values;
-        $this->form_fields = $form_fields;
-        $this->form_buttons = $form_buttons;
-        if ($this->persistent_values){
-            $this->form_values =& $_SESSION["_p_values"]["_" . $this->form_name . "_values"];
-        }
-        if ($this->isSended()){
-            foreach ($this->form_fields as $name => $foo){
-                if (empty($foo['disabled'])) {
-                    if ( ($field_value = Request::get($this->form_name . "_" . $name)) !== null) {
-                            $new_form_values[$name] = trim($field_value);
-                    } elseif ( is_array($field_value = Request::getArray($this->form_name . "_" . $name))) {
-                        foreach ($field_value as $key => $value){
-                            $new_form_values[$name][$key] = trim($value);
-                        }
-                    } else {
-                        $new_form_values[$name] = null;
-                    }
-                }
-            }
-            foreach ($this->form_fields as $name => $value){
-                if (empty($value['disabled'])) {
-                    if ($value['type'] == 'combo'){
-                        if ($this->form_values[$name] != $new_form_values[$value['text']]){ //textfeld wurde verändert
-                            $new_form_values[$name] = $new_form_values[$value['text']];
-                        } else if ($this->form_values[$name] != $new_form_values[$value['select']] && !$new_form_values[$value['text']]){ //textfeld nicht geändert, select geändert
-                            $new_form_values[$name] = $new_form_values[$value['select']];
-                        } else {
-                            $new_form_values[$name] = $this->form_values[$name];
-                        }
-                    }
-                    if ($value['type'] == 'date'){
-                        $new_form_values[$name] = Request::int($this->form_name . "_" . $name . "_year") . "-"
-                                                . sprintf('%02s', Request::int($this->form_name . "_" . $name . "_month")) . "-"
-                                                . sprintf('%02s', Request::int($this->form_name . "_" . $name . "_day"));
-                    }
-                    if($value['type'] == 'datepicker'){
-                        $date = explode('.',Request::get($this->form_name . "_" . $name));
-                        $new_form_values[$name] = $date[2] . "-"
-                                                . sprintf('%02s', $date[1]) . "-"
-                                                . sprintf('%02s', $date[0]);
-                    }
-                    if ($value['type'] == 'time'){
-                        $new_form_values[$name] = sprintf('%02s', Request::int($this->form_name . "_" . $name . "_hours")) . ":"
-                                                . sprintf('%02s', Request::int($this->form_name . "_" . $name . "_minutes"));
-                    }
-                    if ($value['type'] == 'checkbox'){
-                        $new_form_values[$name] = Request::int($this->form_name . "_" . $name, 0);
-                    }
-                    if ( (isset($this->form_values[$name]) && $this->form_values[$name] != $new_form_values[$name])
-                        || (!isset($this->form_values[$name]) && !empty($new_form_values[$name]) && !empty($this->form_fields[$name]['default_value'])
-                            && $new_form_values[$name] != $this->form_fields[$name]['default_value']) ){
-                        $this->value_changed[$name] = true;
-                    }
-                }
-            }
-            $this->form_values = array_merge((array)$this->form_values, (array)$new_form_values);
-        }
-    }
-
-    function getDefaultValues(){
-        foreach ($this->form_fields as $name => $value){
-            $this->form_values[$name] = $value['default_value'];
-        }
-    }
-
-    function checkDefaultValues(){
-        if (is_array($this->form_values)){
-            foreach ($this->form_fields as $name => $value){
-                if (!$value['ignore_check']){
-                    if((is_null($this->form_values[$name]) ? 0 : $this->form_values[$name])
-                        != (is_null($value['default_value']) ? 0 : $value['default_value']) ){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    function getFormField($name, $attributes = false, $default = false, $subtype = false){
-        if (!$attributes){
-            $attributes = $this->field_attributes_default;
-        }
-        if (empty($default)) {
-            if (isset($this->form_values[$name])) {
-                $default = $this->form_values[$name];
-            } else {
-                $default = $this->form_fields[$name]['default_value'] ?? '';
-            }
-        }
-        if (!empty($this->form_fields[$name]['attributes']) && is_array($this->form_fields[$name]['attributes'])) {
-            $attributes = array_merge((array)$attributes, (array)$this->form_fields[$name]['attributes']);
-        }
-
-        if (!empty($this->form_fields[$name]['disabled'])) {
-            $attributes['disabled'] = 'disabled';
-        }
-
-        if (!empty($this->form_fields[$name]['required'])) {
-            $attributes['required'] = 'required';
-        }
-
-        if (empty($attributes['id'])) {
-            $attributes['id'] = $this->form_name . '_' . $name;
-        }
-
-        if($this->form_fields[$name]['type']){
-            $method = "getFormField" . $this->form_fields[$name]['type'];
-            return $this->$method($name,$attributes,$default,$subtype);
-        }
-    }
-
-    function getFormFieldNoForm($name, $attributes, $default){
-        $ret = "\n<span ";
-        $ret .= $this->getAttributes($attributes);
-        $ret .= ">";
-        if(is_array($default)) $default = join('; ', $default);
-        $ret .= htmlReady($default,1,1);
-        $ret .= "</span>";
-        if (!$attributes['disabled']) $ret .= $this->getHiddenField($name, $default);
-        return $ret;
-    }
-
-    function getFormFieldText($name, $attributes, $default){
-        $ret = "\n<input type=\"text\" name=\"{$this->form_name}_{$name}\" " . (($default) ? "value=\"".htmlReady($default)."\" " : "");
-        $ret .= $this->getAttributes($attributes);
-        $ret .= ">";
-        return $ret;
-    }
-
-    function getFormFieldCheckbox($name, $attributes, $default){
-        $ret = "\n<input type=\"checkbox\" name=\"{$this->form_name}_{$name}\" value=\"1\"" . (($default) ? " checked " : "");
-        $ret .= $this->getAttributes($attributes);
-        $ret .= ">";
-        return $ret;
-    }
-
-    function getFormFieldRadio($name, $attributes, $default, $subtype){
-        if (is_array($this->form_fields[$name]['options'])){
-            $options = $this->form_fields[$name]['options'];
-        } else if ($this->form_fields[$name]['options_callback']){
-            $options = call_user_func($this->form_fields[$name]['options_callback'],$this,$name);
-        }
-        if($subtype !== false){
-            return $this->getOneRadio($name, $attributes, ($default == $options[$subtype]['value']), $subtype);
-        } else {
-            $ret = '<div id="' . $attributes['id'] .'"><section class="hgroup">';
-            for ($i = 0; $i < count($options); ++$i){
-                $ret .= $this->getOneRadio($name, $attributes, ($default == $options[$i]['value']), $i);
-                $ret .= "\n" . $this->form_fields[$name]['separator'];
-            }
-            $ret .= '</section></div>';
-        }
-        return $ret;
-    }
-
-    function getOneRadio($name, $attributes, $default, $subtype){
-        $attributes['id'] = $this->form_name . '_' . $name . '_' . $subtype;
-        $ret = "\n<input type=\"radio\" name=\"{$this->form_name}_{$name}\" value=\"{$this->form_fields[$name]['options'][$subtype]['value']}\"" . (($default) ? " checked " : "");
-        $ret .= $this->getAttributes($attributes);
-        $ret .= ">";
-        $attributes['for'] = $attributes['id'];
-        unset($attributes['id']);
-        $ret .= $this->getFormFieldCaption($this->form_fields[$name]['options'][$subtype]['name'], $attributes);
-        return $ret;
-    }
-
-    function getFormFieldTextarea($name, $attributes, $default){
-        $ret = "\n<textarea wrap=\"virtual\"  name=\"{$this->form_name}_{$name}\" ";
-        $ret .= $this->getAttributes($attributes);
-        $ret .= ">";
-        $ret .= htmlReady($default);
-        $ret .= "</textarea>";
-        return $ret;
-    }
-
-    function getFormFieldDatepicker($name, $attributes, $default)
-    {
-        $date_values = explode("-", $default); //YYYY-MM-DD
-        $value = '';
-        $ret = '';
-        if(count($date_values)==3){
-            $value = $date_values[2]. '.' . $date_values[1]. '.' .$date_values[0];
-        }
-        $ret .= $this->getFormFieldText($name, array_merge(['size'=>11,'maxlength'=>11], (array)$attributes), $value);
-        $ret .='<script>jQuery("#'.$this->form_name.'_'.$name.'").datepicker();</script>';
-        return $ret;
-    }
-
-    function getFormFieldTime($name, $attributes, $default) {
-        $date_values = explode(":", $default); //hh:mm
-        $ret = '<div id="' . $attributes['id'] .'"><section class="hgroup">';
-        unset($attributes['id']);
-        $ret .= $this->getFormFieldText($name . "_hours", array_merge(['size'=>2,'maxlength'=>2], (array)$attributes), $date_values[0]);
-        $ret .= "\n" . $this->form_fields[$name]['separator'];
-        $ret .= $this->getFormFieldText($name . "_minutes", array_merge(['size'=>2,'maxlength'=>2], (array)$attributes), $date_values[1]);
-        $ret .= '</section></div>';
-        return $ret;
-    }
-
-    function getFormFieldSelect($name, $attributes, $default){
-        $ret = "\n<select name=\"{$this->form_name}_{$name}";
-        if (!empty($this->form_fields[$name]['multiple'])) {
-            $ret .= "[]\" multiple ";
-        } else {
-            $ret .= "\" ";
-        }
-        $ret .= $this->getAttributes($attributes);
-        $ret .= ">";
-        if ($default === false){
-            $default = $this->form_fields[$name]['default_value'];
-        }
-        if (!empty($this->form_fields[$name]['options']) && is_array($this->form_fields[$name]['options'])) {
-            $options = $this->form_fields[$name]['options'];
-        } else if (!empty($this->form_fields[$name]['options_callback'])) {
-            $options = call_user_func($this->form_fields[$name]['options_callback'],$this,$name);
-        }
-        for ($i = 0; $i < count($options); ++$i){
-            $options_name = (is_array($options[$i])) ? $options[$i]['name'] : $options[$i];
-            $options_value = (is_array($options[$i])) ? $options[$i]['value'] : $options[$i];
-            $options_attributes = $options[$i]['attributes'] ?? [];
-            $selected = false;
-            if ((is_array($default) && in_array("" . $options_value, $default))
-            || (!is_array($default) && ($default == "" . $options_value))){
-                $selected = true;
-            }
-            if (!empty($this->form_fields[$name]['max_length'])) {
-                $options_name = my_substr($options_name,0, $this->form_fields[$name]['max_length']);
-            }
-            $ret .= "\n<option value=\"".htmlReady($options_value)."\" " . (($selected) ? " selected " : "");
-            $ret .= $this->getAttributes($options_attributes);
-            $ret .= ">".htmlReady($options_name)."</option>";
-        }
-        $ret .= "\n</select>";
-        return $ret;
-    }
-
-    function getFormFieldSelectBox($name, $attributes, $default){
-        $box_attributes = $this->form_fields[$name]['box_attributes'] ? $this->form_fields[$name]['box_attributes'] : [];
-        $ret = "\n<div class=\"selectbox\" ".$this->getAttributes($box_attributes)." >";
-        $ret .= "\n<fieldset id=\"{$attributes['id']}\">";
-        unset($attributes['id']);
-        if ($this->form_fields[$name]['multiple']) {
-            $element = 'checkbox';
-            $element_name = $this->form_name . '_' . $name . '[]';
-        } else {
-            $element = 'radio';
-            $element_name = $this->form_name . '_' . $name;
-        }
-        if ($default === false){
-            $default = $this->form_fields[$name]['default_value'];
-        }
-        if (is_array($this->form_fields[$name]['options'])){
-            $options = $this->form_fields[$name]['options'];
-        } else if ($this->form_fields[$name]['options_callback']){
-            $options = call_user_func($this->form_fields[$name]['options_callback'],$this,$name);
-        }
-        for ($i = 0; $i < count($options); ++$i) {
-            $options_name = (is_array($options[$i])) ? $options[$i]['name'] : $options[$i];
-            $options_value = (is_array($options[$i])) ? $options[$i]['value'] : $options[$i];
-            $options_attributes = (is_array($options[$i])) ? $options[$i]['attributes'] : [];
-            $selected = false;
-            if ((is_array($default) && in_array("" . $options_value, $default))
-            || (!is_array($default) && ($default == "" . $options_value))){
-                $selected = true;
-            }
-            if ($this->form_fields[$name]['max_length']){
-                $options_name = my_substr($options_name,0, $this->form_fields[$name]['max_length']);
-            }
-            $id = $this->form_name . '_' . $name . '_' . $i;
-            $ret .= "\n<div ";
-            $ret .= $this->getAttributes($attributes);
-            $ret .= ">";
-            $ret .= "\n<label for=\"$id\" ";
-            $ret .= $this->getAttributes($options_attributes);
-            $ret .= "><input style=\"vertical-align:middle;\" id=\"$id\" type=\"$element\" name=\"$element_name\" value=\"".htmlReady($options_value)."\" " . (($selected) ? " checked " : "");
-            $ret .= ">&nbsp;";
-            $ret .= htmlReady($options_name) . "</label>";
-            $ret .= "\n</div>";
-        }
-        $ret .= "\n</fieldset>\n</div>";
-        return $ret;
-    }
-
-    function getFormFieldCombo($name, $attributes, $default , $subtype = false){
-        $ret = '<div id="' . $attributes['id'] .'"><section class="hgroup">';
-        unset($attributes['id']);
-        $combo_text_name = $this->form_fields[$name]['text'];
-        $combo_select_name = $this->form_fields[$name]['select'];
-        $select_attributes = ['onChange' => "document.{$this->form_name}.{$this->form_name}_{$combo_text_name}.value="
-        ."document.{$this->form_name}.{$this->form_name}_{$combo_select_name}.options[document.{$this->form_name}.{$this->form_name}_{$combo_select_name}.selectedIndex].text; "];
-        if (is_array($attributes)){
-            $select_attributes = array_merge((array)$select_attributes, (array)$attributes);
-        }
-        if (!$subtype){
-            $ret .= "\n" . $this->getFormFieldSelect($combo_select_name, $select_attributes, $default);
-            $ret .= "\n" . $this->form_fields[$name]['separator'];
-            $ret .= $this->getFormFieldText($combo_text_name, $attributes, $default);
-        } else if ($subtype == "text"){
-            $ret .= "\n" . $this->getFormFieldText($combo_text_name, $attributes, $default);
-        } else {
-                $ret .= $this->getFormFieldSelect($combo_select_name, $select_attributes, $default);
-        }
-        $ret .= "</section></div>";
-        return $ret;
-    }
-
-    function getFormButton($name, $attributes = []){
-        if (!empty($this->form_buttons[$name]['attributes']) && is_array($this->form_buttons[$name]['attributes'])) {
-            $attributes = array_merge((array)$attributes, (array)$this->form_buttons[$name]['attributes']);
-        }
-        if (empty($this->form_buttons[$name]['is_picture'])) {
-            if (isset($this->form_buttons[$name]['info']) && !isset($attributes['title'])) {
-                $attributes['title'] = $this->form_buttons[$name]['info'];
-            }
-            $caption = $this->form_buttons[$name]['caption'] ? $this->form_buttons[$name]['caption'] : $this->form_buttons[$name]['type'];
-            if (!empty($this->form_buttons[$name]['type']) && in_array($this->form_buttons[$name]['type'], ['cancel', 'accept'])) {
-                $create = 'create' . $this->form_buttons[$name]['type'];
-            } else {
-                $create = 'create';
-            }
-            $ret = Button::$create($caption, $this->form_name . "_" . $name, $attributes);
-        } else {
-            // Yes, this is kinda ugly
-            $ret = Assets::input($this->form_buttons[$name]['type'],
-                                 tooltip2($this->form_buttons[$name]['info'])
-                                 + (array)$attributes
-                                 + ['name' => $this->form_name . '_' . $name]);
-        }
-        return $ret;
-    }
-
-    function getFormFieldCaption($name, $attributes = false){
-        $_name = $name;
-        if (!isset($attributes['for'])) {
-            $attributes['for'] = $this->form_name . '_' . $name;
-        }
-        if (isset($this->form_fields[$name]['caption'])) {
-            $name = $this->form_fields[$name]['caption'];
-        }
-        $res = '<label ' . $this->getAttributes($attributes) . '>'.htmlReady($name);
-
-        if(!empty($this->form_fields[$_name]['info']) && $attributes['info']) {
-            $res .= $this->getFormFieldInfo($_name);
-        }
-
-        $res .= '</label>';
-        return $res;
-    }
-
-    function getFormFieldInfo($name){
-        return tooltipIcon($this->form_fields[$name]['info']);
-    }
-
-    function getFormStart($action = false, $attributes = false){
-        if (!$action){
-            $action = URLHelper::getLink();
-        }
-        $ret = "\n<form action=\"$action\" method=\"post\" name=\"{$this->form_name}\" " . $this->getAttributes($attributes) . ">";
-        $ret .= CSRFProtection::tokenTag();
-        return $ret;
-    }
-
-    function getFormEnd(){
-        $ret = "";
-        foreach ($this->form_fields as $field_name => $field_content){
-            if ($field_content['type'] == 'hidden'){
-                $ret .= $this->getHiddenField($field_name);
-            }
-        }
-        $ret .= $this->getHiddenField(md5("is_sended"),1);
-        return $ret . "\n</form>";
-    }
-
-    function getFormFieldValue($name){
-        if (isset($this->form_values[$name])){
-            $value = $this->form_values[$name];
-        } else {
-            $value = $this->form_fields[$name]['default_value'] ?? '';
-        }
-        return $value;
-    }
-
-    function getFormFieldsByName($only_editable = false){
-        $ret = [];
-        foreach ($this->form_fields as $name => $detail){
-            if( !($only_editable && ($detail['type'] == 'noform' || !empty($detail['disabled']))) ){
-                $ret[] = $name;
-            }
-        }
-        return $ret;
-    }
-
-    function getHiddenField($name, $value = false){
-        if (!$value){
-            $value = $this->getFormFieldValue($name);
-        }
-        return "\n<input type=\"hidden\" name=\"{$this->form_name}_{$name}\" value=\"".htmlReady($value)."\">";
-    }
-
-    function doFormReset(){
-        $this->form_values = null;
-        return true;
-    }
-
-    function isChanged($name){
-        return isset($this->value_changed[$name]);
-    }
-
-    function getRawFieldValue($field_name) {
-        return self::_GetRawFieldValue($field_name, $this->form_name);
-    }
-
-    function isSended() {
-        return self::_IsSended($this->form_name);
-    }
-
-    function isClicked($button) {
-        return self::_IsClicked($button, $this->form_name);
-    }
-
-    function getClickedKillButton(){
-        foreach($this->form_buttons as $name => $value){
-            if ($value['is_kill_button']){
-                if ($this->isClicked($name)){
-                    return $name;
-                }
-            }
-        }
-        return false;
-    }
-
-    function getAttributes($attributes){
-        $ret = "";
-        if (is_array($attributes)) {
-            foreach($attributes as $key => $value){
-                $ret .= " ".$key."=\"".htmlReady($value)."\"";
-            }
-        }
-        return $ret;
-    }
-
-    function getFormFieldRequired($name){
-        if ($this->form_fields[$name]['required'])
-            return "\n" . '<span style="color: red; font-weight: bold">*</span>';
-        else return "";
-    }
-
-
-}
-
-// test & demo
-/*
-function getSomeOptions(&$caller, $name){
-    $options[] = md5($name);
-    foreach($caller->form_fields as $key => $value){
-        $options[]=$key;
-    }
-    return $options;
-}
-
-page_open(array("sess" => "Seminar_Session"));
-$_language = DEFAULT_LANGUAGE;
-$_language_path = $INSTALLED_LANGUAGES[$_language]["path"];
-
-$form_fields = array('text1'        =>  array('type' => 'text', 'caption' => 'Testtextfeld1', 'info' => 'Hier Schwachsinn eingeben'),
-                    'text2'         =>  array('type' => 'textarea','caption' => 'Testtextfeld2', 'info' => 'Hier Schwachsinn eingeben','default' => 'blablubb'),
-                    'select1'       =>  array('type' => 'select', 'options' => array(   array('name' =>_("UND"),'value' => 'AND'),
-                                                                                        array('name' =>_("ODER"),'value' => 'OR'))),
-                    'select2'       =>  array('type' => 'select','options_callback' => 'getSomeOptions'),
-                    'combo1_text'   =>  array('type' => 'text'),
-                    'combo1_select' =>  array('type' => 'select', 'options' => array("",_("Eins"),_("Zwei"), _("Drei"))),
-                    'combo1'        =>  array('type' => 'combo', 'text' => 'combo1_text', 'select' => 'combo1_select', 'separator' => '--'),
-                    'date1'         =>  array('type' => 'date',  'separator' => '.', 'default' => 'YYYY-MM-DD'),
-                    'checkbox'      => array('type' => 'checkbox', 'caption' => 'Tolle Checkbox ?', value => '1'),
-                    'radio_group'   => array('type' => 'radio', 'separator' => "&nbsp;", 'options' => array(    array('name' =>_("UND"),'value' => 'AND'),
-                                                                                        array('name' =>_("ODER"),'value' => 'OR'),
-                                                                                        array('name' =>_("NICHT"),'value' => 'NOT')))
-                    );
-
-$form_buttons = array('send' => array('type' => 'abschicken', 'info' => _("Dieses Formular abschicken")),
-                    'not_send' => array('type' => 'abbrechen', 'info' => _("Eingabe abbrechen")));
-
-$test = new StudipForm($form_fields, $form_buttons);
-echo "<table width='400'><tr><td>";
-echo $test->getFormStart();
-echo $test->getFormFieldCaption("text1");
-echo "&nbsp;" . $test->getFormFieldInfo("text1") . "&nbsp;";
-echo $test->getFormField("text1");
-echo $test->getFormField("text2");
-echo $test->getFormFieldCaption("select1");
-echo "&nbsp;" . $test->getFormFieldInfo("select1") . "&nbsp;";
-echo $test->getFormField("select1");
-echo $test->getFormFieldCaption("select2");
-echo "&nbsp;" . $test->getFormFieldInfo("select2") . "&nbsp;";
-echo $test->getFormField("select2");
-echo $test->getFormField("date1", array('style' => 'vertical-align:middle'));
-echo "<br>" . $test->getFormField("combo1",array('style' => 'vertical-align:middle'));
-echo $test->getFormFieldCaption("checkbox", array('style' => 'vertical-align:middle'));
-echo "&nbsp;" . $test->getFormField("checkbox",array('style' => 'vertical-align:middle'));
-echo "<br>" . $test->getFormField("radio_group",array('style' => 'vertical-align:middle;font-size:10pt;'));
-echo $test->getFormButton("send",array('style' => 'vertical-align:middle;'));
-echo $test->getFormEnd();
-echo "</td></tr></table>";
-echo "<pre>";
-page_close();
-*/
-?>
diff --git a/lib/classes/StudipForm.php b/lib/classes/StudipForm.php
new file mode 100644
index 0000000..024e2e3
--- /dev/null
+++ b/lib/classes/StudipForm.php
@@ -0,0 +1,590 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipForm.class.php
+// Class to build HTML formular and handle persistence using PhpLib
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+use Studip\Button, Studip\LinkButton;
+
+/**
+* Class to build Studip HTML forms
+*
+* @deprecated
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+**/
+class StudipForm {
+
+    var $form_name;
+
+    var $field_attributes_default = [];
+
+    var $form_fields = [];
+
+    var $form_buttons = [];
+
+    var $persistent_values = true;
+
+    var $form_values = [];
+
+    var $value_changed = [];
+
+
+    static function TimestampToSQLDate($tstamp){
+        return date("Y-m-d", $tstamp);
+    }
+
+    static function SQLDateToTimestamp($sqldate){
+        $date_values = explode("-", $sqldate); //YYYY-MM-DD
+        if (checkdate((int)$date_values[1],(int)$date_values[2],(int)$date_values[0])){
+            return mktime(12,0,0,$date_values[1],$date_values[2],$date_values[0]);
+        } else {
+            return false;
+        }
+    }
+
+    static function _GetRawFieldValue($field_name, $form_name) {
+        return Request::get($form_name. '_' . $field_name);
+    }
+
+    static function _IsSended($form_name){
+        return Request::get($form_name . "_" . md5("is_sended")) !== null;
+    }
+
+    static function _IsClicked($button, $form_name){
+        return Request::submitted($form_name . "_" . $button);
+    }
+
+    function __construct($form_fields, $form_buttons, $form_name = "studipform", $persistent_values = true) {
+        $this->form_name = $form_name;
+        $this->persistent_values = $persistent_values;
+        $this->form_fields = $form_fields;
+        $this->form_buttons = $form_buttons;
+        if ($this->persistent_values){
+            $this->form_values =& $_SESSION["_p_values"]["_" . $this->form_name . "_values"];
+        }
+        if ($this->isSended()){
+            foreach ($this->form_fields as $name => $foo){
+                if (empty($foo['disabled'])) {
+                    if ( ($field_value = Request::get($this->form_name . "_" . $name)) !== null) {
+                            $new_form_values[$name] = trim($field_value);
+                    } elseif ( is_array($field_value = Request::getArray($this->form_name . "_" . $name))) {
+                        foreach ($field_value as $key => $value){
+                            $new_form_values[$name][$key] = trim($value);
+                        }
+                    } else {
+                        $new_form_values[$name] = null;
+                    }
+                }
+            }
+            foreach ($this->form_fields as $name => $value){
+                if (empty($value['disabled'])) {
+                    if ($value['type'] == 'combo'){
+                        if ($this->form_values[$name] != $new_form_values[$value['text']]){ //textfeld wurde verändert
+                            $new_form_values[$name] = $new_form_values[$value['text']];
+                        } else if ($this->form_values[$name] != $new_form_values[$value['select']] && !$new_form_values[$value['text']]){ //textfeld nicht geändert, select geändert
+                            $new_form_values[$name] = $new_form_values[$value['select']];
+                        } else {
+                            $new_form_values[$name] = $this->form_values[$name];
+                        }
+                    }
+                    if ($value['type'] == 'date'){
+                        $new_form_values[$name] = Request::int($this->form_name . "_" . $name . "_year") . "-"
+                                                . sprintf('%02s', Request::int($this->form_name . "_" . $name . "_month")) . "-"
+                                                . sprintf('%02s', Request::int($this->form_name . "_" . $name . "_day"));
+                    }
+                    if($value['type'] == 'datepicker'){
+                        $date = explode('.',Request::get($this->form_name . "_" . $name));
+                        $new_form_values[$name] = $date[2] . "-"
+                                                . sprintf('%02s', $date[1]) . "-"
+                                                . sprintf('%02s', $date[0]);
+                    }
+                    if ($value['type'] == 'time'){
+                        $new_form_values[$name] = sprintf('%02s', Request::int($this->form_name . "_" . $name . "_hours")) . ":"
+                                                . sprintf('%02s', Request::int($this->form_name . "_" . $name . "_minutes"));
+                    }
+                    if ($value['type'] == 'checkbox'){
+                        $new_form_values[$name] = Request::int($this->form_name . "_" . $name, 0);
+                    }
+                    if ( (isset($this->form_values[$name]) && $this->form_values[$name] != $new_form_values[$name])
+                        || (!isset($this->form_values[$name]) && !empty($new_form_values[$name]) && !empty($this->form_fields[$name]['default_value'])
+                            && $new_form_values[$name] != $this->form_fields[$name]['default_value']) ){
+                        $this->value_changed[$name] = true;
+                    }
+                }
+            }
+            $this->form_values = array_merge((array)$this->form_values, (array)$new_form_values);
+        }
+    }
+
+    function getDefaultValues(){
+        foreach ($this->form_fields as $name => $value){
+            $this->form_values[$name] = $value['default_value'];
+        }
+    }
+
+    function checkDefaultValues(){
+        if (is_array($this->form_values)){
+            foreach ($this->form_fields as $name => $value){
+                if (!$value['ignore_check']){
+                    if((is_null($this->form_values[$name]) ? 0 : $this->form_values[$name])
+                        != (is_null($value['default_value']) ? 0 : $value['default_value']) ){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    function getFormField($name, $attributes = false, $default = false, $subtype = false){
+        if (!$attributes){
+            $attributes = $this->field_attributes_default;
+        }
+        if (empty($default)) {
+            if (isset($this->form_values[$name])) {
+                $default = $this->form_values[$name];
+            } else {
+                $default = $this->form_fields[$name]['default_value'] ?? '';
+            }
+        }
+        if (!empty($this->form_fields[$name]['attributes']) && is_array($this->form_fields[$name]['attributes'])) {
+            $attributes = array_merge((array)$attributes, (array)$this->form_fields[$name]['attributes']);
+        }
+
+        if (!empty($this->form_fields[$name]['disabled'])) {
+            $attributes['disabled'] = 'disabled';
+        }
+
+        if (!empty($this->form_fields[$name]['required'])) {
+            $attributes['required'] = 'required';
+        }
+
+        if (empty($attributes['id'])) {
+            $attributes['id'] = $this->form_name . '_' . $name;
+        }
+
+        if($this->form_fields[$name]['type']){
+            $method = "getFormField" . $this->form_fields[$name]['type'];
+            return $this->$method($name,$attributes,$default,$subtype);
+        }
+    }
+
+    function getFormFieldNoForm($name, $attributes, $default){
+        $ret = "\n<span ";
+        $ret .= $this->getAttributes($attributes);
+        $ret .= ">";
+        if(is_array($default)) $default = join('; ', $default);
+        $ret .= htmlReady($default,1,1);
+        $ret .= "</span>";
+        if (!$attributes['disabled']) $ret .= $this->getHiddenField($name, $default);
+        return $ret;
+    }
+
+    function getFormFieldText($name, $attributes, $default){
+        $ret = "\n<input type=\"text\" name=\"{$this->form_name}_{$name}\" " . (($default) ? "value=\"".htmlReady($default)."\" " : "");
+        $ret .= $this->getAttributes($attributes);
+        $ret .= ">";
+        return $ret;
+    }
+
+    function getFormFieldCheckbox($name, $attributes, $default){
+        $ret = "\n<input type=\"checkbox\" name=\"{$this->form_name}_{$name}\" value=\"1\"" . (($default) ? " checked " : "");
+        $ret .= $this->getAttributes($attributes);
+        $ret .= ">";
+        return $ret;
+    }
+
+    function getFormFieldRadio($name, $attributes, $default, $subtype){
+        if (is_array($this->form_fields[$name]['options'])){
+            $options = $this->form_fields[$name]['options'];
+        } else if ($this->form_fields[$name]['options_callback']){
+            $options = call_user_func($this->form_fields[$name]['options_callback'],$this,$name);
+        }
+        if($subtype !== false){
+            return $this->getOneRadio($name, $attributes, ($default == $options[$subtype]['value']), $subtype);
+        } else {
+            $ret = '<div id="' . $attributes['id'] .'"><section class="hgroup">';
+            for ($i = 0; $i < count($options); ++$i){
+                $ret .= $this->getOneRadio($name, $attributes, ($default == $options[$i]['value']), $i);
+                $ret .= "\n" . $this->form_fields[$name]['separator'];
+            }
+            $ret .= '</section></div>';
+        }
+        return $ret;
+    }
+
+    function getOneRadio($name, $attributes, $default, $subtype){
+        $attributes['id'] = $this->form_name . '_' . $name . '_' . $subtype;
+        $ret = "\n<input type=\"radio\" name=\"{$this->form_name}_{$name}\" value=\"{$this->form_fields[$name]['options'][$subtype]['value']}\"" . (($default) ? " checked " : "");
+        $ret .= $this->getAttributes($attributes);
+        $ret .= ">";
+        $attributes['for'] = $attributes['id'];
+        unset($attributes['id']);
+        $ret .= $this->getFormFieldCaption($this->form_fields[$name]['options'][$subtype]['name'], $attributes);
+        return $ret;
+    }
+
+    function getFormFieldTextarea($name, $attributes, $default){
+        $ret = "\n<textarea wrap=\"virtual\"  name=\"{$this->form_name}_{$name}\" ";
+        $ret .= $this->getAttributes($attributes);
+        $ret .= ">";
+        $ret .= htmlReady($default);
+        $ret .= "</textarea>";
+        return $ret;
+    }
+
+    function getFormFieldDatepicker($name, $attributes, $default)
+    {
+        $date_values = explode("-", $default); //YYYY-MM-DD
+        $value = '';
+        $ret = '';
+        if(count($date_values)==3){
+            $value = $date_values[2]. '.' . $date_values[1]. '.' .$date_values[0];
+        }
+        $ret .= $this->getFormFieldText($name, array_merge(['size'=>11,'maxlength'=>11], (array)$attributes), $value);
+        $ret .='<script>jQuery("#'.$this->form_name.'_'.$name.'").datepicker();</script>';
+        return $ret;
+    }
+
+    function getFormFieldTime($name, $attributes, $default) {
+        $date_values = explode(":", $default); //hh:mm
+        $ret = '<div id="' . $attributes['id'] .'"><section class="hgroup">';
+        unset($attributes['id']);
+        $ret .= $this->getFormFieldText($name . "_hours", array_merge(['size'=>2,'maxlength'=>2], (array)$attributes), $date_values[0]);
+        $ret .= "\n" . $this->form_fields[$name]['separator'];
+        $ret .= $this->getFormFieldText($name . "_minutes", array_merge(['size'=>2,'maxlength'=>2], (array)$attributes), $date_values[1]);
+        $ret .= '</section></div>';
+        return $ret;
+    }
+
+    function getFormFieldSelect($name, $attributes, $default){
+        $ret = "\n<select name=\"{$this->form_name}_{$name}";
+        if (!empty($this->form_fields[$name]['multiple'])) {
+            $ret .= "[]\" multiple ";
+        } else {
+            $ret .= "\" ";
+        }
+        $ret .= $this->getAttributes($attributes);
+        $ret .= ">";
+        if ($default === false){
+            $default = $this->form_fields[$name]['default_value'];
+        }
+        if (!empty($this->form_fields[$name]['options']) && is_array($this->form_fields[$name]['options'])) {
+            $options = $this->form_fields[$name]['options'];
+        } else if (!empty($this->form_fields[$name]['options_callback'])) {
+            $options = call_user_func($this->form_fields[$name]['options_callback'],$this,$name);
+        }
+        for ($i = 0; $i < count($options); ++$i){
+            $options_name = (is_array($options[$i])) ? $options[$i]['name'] : $options[$i];
+            $options_value = (is_array($options[$i])) ? $options[$i]['value'] : $options[$i];
+            $options_attributes = $options[$i]['attributes'] ?? [];
+            $selected = false;
+            if ((is_array($default) && in_array("" . $options_value, $default))
+            || (!is_array($default) && ($default == "" . $options_value))){
+                $selected = true;
+            }
+            if (!empty($this->form_fields[$name]['max_length'])) {
+                $options_name = my_substr($options_name,0, $this->form_fields[$name]['max_length']);
+            }
+            $ret .= "\n<option value=\"".htmlReady($options_value)."\" " . (($selected) ? " selected " : "");
+            $ret .= $this->getAttributes($options_attributes);
+            $ret .= ">".htmlReady($options_name)."</option>";
+        }
+        $ret .= "\n</select>";
+        return $ret;
+    }
+
+    function getFormFieldSelectBox($name, $attributes, $default){
+        $box_attributes = $this->form_fields[$name]['box_attributes'] ? $this->form_fields[$name]['box_attributes'] : [];
+        $ret = "\n<div class=\"selectbox\" ".$this->getAttributes($box_attributes)." >";
+        $ret .= "\n<fieldset id=\"{$attributes['id']}\">";
+        unset($attributes['id']);
+        if ($this->form_fields[$name]['multiple']) {
+            $element = 'checkbox';
+            $element_name = $this->form_name . '_' . $name . '[]';
+        } else {
+            $element = 'radio';
+            $element_name = $this->form_name . '_' . $name;
+        }
+        if ($default === false){
+            $default = $this->form_fields[$name]['default_value'];
+        }
+        if (is_array($this->form_fields[$name]['options'])){
+            $options = $this->form_fields[$name]['options'];
+        } else if ($this->form_fields[$name]['options_callback']){
+            $options = call_user_func($this->form_fields[$name]['options_callback'],$this,$name);
+        }
+        for ($i = 0; $i < count($options); ++$i) {
+            $options_name = (is_array($options[$i])) ? $options[$i]['name'] : $options[$i];
+            $options_value = (is_array($options[$i])) ? $options[$i]['value'] : $options[$i];
+            $options_attributes = (is_array($options[$i])) ? $options[$i]['attributes'] : [];
+            $selected = false;
+            if ((is_array($default) && in_array("" . $options_value, $default))
+            || (!is_array($default) && ($default == "" . $options_value))){
+                $selected = true;
+            }
+            if ($this->form_fields[$name]['max_length']){
+                $options_name = my_substr($options_name,0, $this->form_fields[$name]['max_length']);
+            }
+            $id = $this->form_name . '_' . $name . '_' . $i;
+            $ret .= "\n<div ";
+            $ret .= $this->getAttributes($attributes);
+            $ret .= ">";
+            $ret .= "\n<label for=\"$id\" ";
+            $ret .= $this->getAttributes($options_attributes);
+            $ret .= "><input style=\"vertical-align:middle;\" id=\"$id\" type=\"$element\" name=\"$element_name\" value=\"".htmlReady($options_value)."\" " . (($selected) ? " checked " : "");
+            $ret .= ">&nbsp;";
+            $ret .= htmlReady($options_name) . "</label>";
+            $ret .= "\n</div>";
+        }
+        $ret .= "\n</fieldset>\n</div>";
+        return $ret;
+    }
+
+    function getFormFieldCombo($name, $attributes, $default , $subtype = false){
+        $ret = '<div id="' . $attributes['id'] .'"><section class="hgroup">';
+        unset($attributes['id']);
+        $combo_text_name = $this->form_fields[$name]['text'];
+        $combo_select_name = $this->form_fields[$name]['select'];
+        $select_attributes = ['onChange' => "document.{$this->form_name}.{$this->form_name}_{$combo_text_name}.value="
+        ."document.{$this->form_name}.{$this->form_name}_{$combo_select_name}.options[document.{$this->form_name}.{$this->form_name}_{$combo_select_name}.selectedIndex].text; "];
+        if (is_array($attributes)){
+            $select_attributes = array_merge((array)$select_attributes, (array)$attributes);
+        }
+        if (!$subtype){
+            $ret .= "\n" . $this->getFormFieldSelect($combo_select_name, $select_attributes, $default);
+            $ret .= "\n" . $this->form_fields[$name]['separator'];
+            $ret .= $this->getFormFieldText($combo_text_name, $attributes, $default);
+        } else if ($subtype == "text"){
+            $ret .= "\n" . $this->getFormFieldText($combo_text_name, $attributes, $default);
+        } else {
+                $ret .= $this->getFormFieldSelect($combo_select_name, $select_attributes, $default);
+        }
+        $ret .= "</section></div>";
+        return $ret;
+    }
+
+    function getFormButton($name, $attributes = []){
+        if (!empty($this->form_buttons[$name]['attributes']) && is_array($this->form_buttons[$name]['attributes'])) {
+            $attributes = array_merge((array)$attributes, (array)$this->form_buttons[$name]['attributes']);
+        }
+        if (empty($this->form_buttons[$name]['is_picture'])) {
+            if (isset($this->form_buttons[$name]['info']) && !isset($attributes['title'])) {
+                $attributes['title'] = $this->form_buttons[$name]['info'];
+            }
+            $caption = $this->form_buttons[$name]['caption'] ? $this->form_buttons[$name]['caption'] : $this->form_buttons[$name]['type'];
+            if (!empty($this->form_buttons[$name]['type']) && in_array($this->form_buttons[$name]['type'], ['cancel', 'accept'])) {
+                $create = 'create' . $this->form_buttons[$name]['type'];
+            } else {
+                $create = 'create';
+            }
+            $ret = Button::$create($caption, $this->form_name . "_" . $name, $attributes);
+        } else {
+            // Yes, this is kinda ugly
+            $ret = Assets::input($this->form_buttons[$name]['type'],
+                                 tooltip2($this->form_buttons[$name]['info'])
+                                 + (array)$attributes
+                                 + ['name' => $this->form_name . '_' . $name]);
+        }
+        return $ret;
+    }
+
+    function getFormFieldCaption($name, $attributes = false){
+        $_name = $name;
+        if (!isset($attributes['for'])) {
+            $attributes['for'] = $this->form_name . '_' . $name;
+        }
+        if (isset($this->form_fields[$name]['caption'])) {
+            $name = $this->form_fields[$name]['caption'];
+        }
+        $res = '<label ' . $this->getAttributes($attributes) . '>'.htmlReady($name);
+
+        if(!empty($this->form_fields[$_name]['info']) && $attributes['info']) {
+            $res .= $this->getFormFieldInfo($_name);
+        }
+
+        $res .= '</label>';
+        return $res;
+    }
+
+    function getFormFieldInfo($name){
+        return tooltipIcon($this->form_fields[$name]['info']);
+    }
+
+    function getFormStart($action = false, $attributes = false){
+        if (!$action){
+            $action = URLHelper::getLink();
+        }
+        $ret = "\n<form action=\"$action\" method=\"post\" name=\"{$this->form_name}\" " . $this->getAttributes($attributes) . ">";
+        $ret .= CSRFProtection::tokenTag();
+        return $ret;
+    }
+
+    function getFormEnd(){
+        $ret = "";
+        foreach ($this->form_fields as $field_name => $field_content){
+            if ($field_content['type'] == 'hidden'){
+                $ret .= $this->getHiddenField($field_name);
+            }
+        }
+        $ret .= $this->getHiddenField(md5("is_sended"),1);
+        return $ret . "\n</form>";
+    }
+
+    function getFormFieldValue($name){
+        if (isset($this->form_values[$name])){
+            $value = $this->form_values[$name];
+        } else {
+            $value = $this->form_fields[$name]['default_value'] ?? '';
+        }
+        return $value;
+    }
+
+    function getFormFieldsByName($only_editable = false){
+        $ret = [];
+        foreach ($this->form_fields as $name => $detail){
+            if( !($only_editable && ($detail['type'] == 'noform' || !empty($detail['disabled']))) ){
+                $ret[] = $name;
+            }
+        }
+        return $ret;
+    }
+
+    function getHiddenField($name, $value = false){
+        if (!$value){
+            $value = $this->getFormFieldValue($name);
+        }
+        return "\n<input type=\"hidden\" name=\"{$this->form_name}_{$name}\" value=\"".htmlReady($value)."\">";
+    }
+
+    function doFormReset(){
+        $this->form_values = null;
+        return true;
+    }
+
+    function isChanged($name){
+        return isset($this->value_changed[$name]);
+    }
+
+    function getRawFieldValue($field_name) {
+        return self::_GetRawFieldValue($field_name, $this->form_name);
+    }
+
+    function isSended() {
+        return self::_IsSended($this->form_name);
+    }
+
+    function isClicked($button) {
+        return self::_IsClicked($button, $this->form_name);
+    }
+
+    function getClickedKillButton(){
+        foreach($this->form_buttons as $name => $value){
+            if ($value['is_kill_button']){
+                if ($this->isClicked($name)){
+                    return $name;
+                }
+            }
+        }
+        return false;
+    }
+
+    function getAttributes($attributes){
+        $ret = "";
+        if (is_array($attributes)) {
+            foreach($attributes as $key => $value){
+                $ret .= " ".$key."=\"".htmlReady($value)."\"";
+            }
+        }
+        return $ret;
+    }
+
+    function getFormFieldRequired($name){
+        if ($this->form_fields[$name]['required'])
+            return "\n" . '<span style="color: red; font-weight: bold">*</span>';
+        else return "";
+    }
+
+
+}
+
+// test & demo
+/*
+function getSomeOptions(&$caller, $name){
+    $options[] = md5($name);
+    foreach($caller->form_fields as $key => $value){
+        $options[]=$key;
+    }
+    return $options;
+}
+
+page_open(array("sess" => "Seminar_Session"));
+$_language = DEFAULT_LANGUAGE;
+$_language_path = $INSTALLED_LANGUAGES[$_language]["path"];
+
+$form_fields = array('text1'        =>  array('type' => 'text', 'caption' => 'Testtextfeld1', 'info' => 'Hier Schwachsinn eingeben'),
+                    'text2'         =>  array('type' => 'textarea','caption' => 'Testtextfeld2', 'info' => 'Hier Schwachsinn eingeben','default' => 'blablubb'),
+                    'select1'       =>  array('type' => 'select', 'options' => array(   array('name' =>_("UND"),'value' => 'AND'),
+                                                                                        array('name' =>_("ODER"),'value' => 'OR'))),
+                    'select2'       =>  array('type' => 'select','options_callback' => 'getSomeOptions'),
+                    'combo1_text'   =>  array('type' => 'text'),
+                    'combo1_select' =>  array('type' => 'select', 'options' => array("",_("Eins"),_("Zwei"), _("Drei"))),
+                    'combo1'        =>  array('type' => 'combo', 'text' => 'combo1_text', 'select' => 'combo1_select', 'separator' => '--'),
+                    'date1'         =>  array('type' => 'date',  'separator' => '.', 'default' => 'YYYY-MM-DD'),
+                    'checkbox'      => array('type' => 'checkbox', 'caption' => 'Tolle Checkbox ?', value => '1'),
+                    'radio_group'   => array('type' => 'radio', 'separator' => "&nbsp;", 'options' => array(    array('name' =>_("UND"),'value' => 'AND'),
+                                                                                        array('name' =>_("ODER"),'value' => 'OR'),
+                                                                                        array('name' =>_("NICHT"),'value' => 'NOT')))
+                    );
+
+$form_buttons = array('send' => array('type' => 'abschicken', 'info' => _("Dieses Formular abschicken")),
+                    'not_send' => array('type' => 'abbrechen', 'info' => _("Eingabe abbrechen")));
+
+$test = new StudipForm($form_fields, $form_buttons);
+echo "<table width='400'><tr><td>";
+echo $test->getFormStart();
+echo $test->getFormFieldCaption("text1");
+echo "&nbsp;" . $test->getFormFieldInfo("text1") . "&nbsp;";
+echo $test->getFormField("text1");
+echo $test->getFormField("text2");
+echo $test->getFormFieldCaption("select1");
+echo "&nbsp;" . $test->getFormFieldInfo("select1") . "&nbsp;";
+echo $test->getFormField("select1");
+echo $test->getFormFieldCaption("select2");
+echo "&nbsp;" . $test->getFormFieldInfo("select2") . "&nbsp;";
+echo $test->getFormField("select2");
+echo $test->getFormField("date1", array('style' => 'vertical-align:middle'));
+echo "<br>" . $test->getFormField("combo1",array('style' => 'vertical-align:middle'));
+echo $test->getFormFieldCaption("checkbox", array('style' => 'vertical-align:middle'));
+echo "&nbsp;" . $test->getFormField("checkbox",array('style' => 'vertical-align:middle'));
+echo "<br>" . $test->getFormField("radio_group",array('style' => 'vertical-align:middle;font-size:10pt;'));
+echo $test->getFormButton("send",array('style' => 'vertical-align:middle;'));
+echo $test->getFormEnd();
+echo "</td></tr></table>";
+echo "<pre>";
+page_close();
+*/
+?>
diff --git a/lib/classes/StudipItem.interface.php b/lib/classes/StudipItem.interface.php
deleted file mode 100644
index b575bdc..0000000
--- a/lib/classes/StudipItem.interface.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * StudipItem.interface.php - contains the StudipItem interface.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- */
-
-
-/**
- * This interface provides methods which allow an unified access
- * to basic properties of Stud.IP objects.
- * It is meant to be an extension for SimpleORMap objects.
- */
-interface StudipItem
-{
-    /**
-     * Returns a human-readable name of the object.
-     *
-     * @param bool $long_format If set to true, a long format
-     *     that has the object type as a prefix (course, room etc.)
-     *     is returned. Otherwise only the name is returned.
-     *
-     * @returns string A human-readable string of the object's name.
-     */
-    public function getItemName($long_format = true);
-
-    /**
-     * Returns an URL that points to a page describing or displaying
-     * the object.
-     *
-     * @returns string|null Either the URL to a descriptive page for
-     *     the object or null, if the object does not have such an URL.
-     */
-    public function getItemURL();
-
-    /**
-     * Returns the URL to the avatar image or icon of the object,
-     * if applicable.
-     *
-     * @returns string|null Either the URL to the object's avatar
-     *     or icon or null, if the object does not have an avatar.
-     */
-    public function getItemAvatarURL();
-
-
-    /**
-     * Creates a StudipLink object that links to a page with information
-     * about the StudipItem object.
-     *
-     * @returns StudipLink A StudipLink object for the information page
-     *     of the StudipItem object.
-     */
-    public function getLink() : StudipLink;
-
-
-    /**
-     * @return string A string representation of the item.
-     *     For backward compatibility with existing plugins that have classes
-     *     derived of StudipItem, the return type is not specified.
-     */
-    public function __toString();
-}
diff --git a/lib/classes/StudipItem.php b/lib/classes/StudipItem.php
new file mode 100644
index 0000000..b575bdc
--- /dev/null
+++ b/lib/classes/StudipItem.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * StudipItem.interface.php - contains the StudipItem interface.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ */
+
+
+/**
+ * This interface provides methods which allow an unified access
+ * to basic properties of Stud.IP objects.
+ * It is meant to be an extension for SimpleORMap objects.
+ */
+interface StudipItem
+{
+    /**
+     * Returns a human-readable name of the object.
+     *
+     * @param bool $long_format If set to true, a long format
+     *     that has the object type as a prefix (course, room etc.)
+     *     is returned. Otherwise only the name is returned.
+     *
+     * @returns string A human-readable string of the object's name.
+     */
+    public function getItemName($long_format = true);
+
+    /**
+     * Returns an URL that points to a page describing or displaying
+     * the object.
+     *
+     * @returns string|null Either the URL to a descriptive page for
+     *     the object or null, if the object does not have such an URL.
+     */
+    public function getItemURL();
+
+    /**
+     * Returns the URL to the avatar image or icon of the object,
+     * if applicable.
+     *
+     * @returns string|null Either the URL to the object's avatar
+     *     or icon or null, if the object does not have an avatar.
+     */
+    public function getItemAvatarURL();
+
+
+    /**
+     * Creates a StudipLink object that links to a page with information
+     * about the StudipItem object.
+     *
+     * @returns StudipLink A StudipLink object for the information page
+     *     of the StudipItem object.
+     */
+    public function getLink() : StudipLink;
+
+
+    /**
+     * @return string A string representation of the item.
+     *     For backward compatibility with existing plugins that have classes
+     *     derived of StudipItem, the return type is not specified.
+     */
+    public function __toString();
+}
diff --git a/lib/classes/StudipKing.class.php b/lib/classes/StudipKing.class.php
deleted file mode 100644
index ae5a14e..0000000
--- a/lib/classes/StudipKing.class.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-# Lifter010: TODO
-
-/*
- * Copyright (C) 2004 - Tobias Thelen <tthelen@uos.de>
- * Copyright (C) 2004 - Till Glöggler <tgloeggl@uos.de>
- * Copyright (C) 2009 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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 class awards honours (crowns) to users posting a lot in the bulletin
- * boards, writing a lot of wiki pages and so on.
- *
- * @author    mlunzena
- */
-
-class StudipKing {
-
-    /**
-     * How many of each type should be awarded?
-     */
-    const NUM_KINGS = 1;
-
-    /**
-     * key to use for caching
-     */
-    const CACHE_KEY = 'core/kings';
-
-    /**
-    * store kings also in memory
-    */
-    private static $kings;
-
-    /**
-     * Returns the awards of a user as an associative array consisting of
-     * "award type" => "amount of posts, wiki pages etc." pairs that belong to
-     * this user. If the 2nd parameter is set to true, the values are
-     * descriptional strings instead of the raw numbers.
-     *
-     * @param  string     a string containing the MD5ish ID of the user
-     * @param  bool       TRUE to return descriptional text, FALSE to return
-     *                    raw numbers, which is the default
-     *
-     * @return array      an associative array mapping the awards to an amount
-     */
-    static function is_king($user_id, $textual = FALSE)
-    {
-        $kings = self::get_kings();
-        $result = isset($kings[$user_id]) ? $kings[$user_id] : [];
-        if ($textual) {
-            foreach ($result as $type => $amount) {
-                $result[$type] = self::textual_representation($type, $amount);
-            }
-        }
-        return $result;
-    }
-
-    private static function get_kings()
-    {
-        if (self::$kings === null) {
-            $cache = \Studip\Cache\Factory::getCache();
-
-            # read cache (unserializing a cache miss - FALSE - does not matter)
-            $kings = unserialize($cache->read(self::CACHE_KEY));
-
-            # cache miss, retrieve from database
-            if ($kings === FALSE) {
-                $kings = self::get_kings_uncached();
-                # write to cache with an expiry time of 24 hours
-                $cache->write(self::CACHE_KEY, serialize($kings), 86400);
-            }
-            self::$kings = $kings;
-        }
-        return self::$kings;
-    }
-
-    private static function get_kings_uncached()
-    {
-        $types = words('files forum news voter votes wiki');
-        $kings = [];
-        foreach ($types as $type) {
-            $method = "{$type}_kings";
-            foreach (self::$method() as $user_id => $amount) {
-                if (!isset($kings[$user_id])) {
-                    $kings[$user_id] = [];
-                }
-                $kings[$user_id][$type] = $amount;
-            }
-        }
-        return $kings;
-    }
-
-    private static function select_kings($sql)
-    {
-        $result = [];
-        $stmt = DBManager::get()->query($sql . " ORDER BY num DESC LIMIT 0," . self::NUM_KINGS);
-        foreach ($stmt as $row) {
-            $result[$row["id"]] = $row["num"];
-        }
-        return $result;
-    }
-
-    private static function wiki_kings()
-    {
-        return self::select_kings("
-            SELECT user_id AS id, COUNT(*) AS num
-            FROM (SELECT user_id FROM wiki_pages UNION SELECT user_id FROM wiki_versions) AS `all_wiki_pages`
-            GROUP BY user_id");
-    }
-
-    private static function forum_kings()
-    {
-        $kings = [];
-
-        // sum up postings for all users from all ForumModules available
-        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
-            $table = $plugin->getEntryTableInfo();
-            $query = "SELECT user_id AS id, COUNT(*) AS num FROM ". $table['table'] ." GROUP BY user_id";
-            $new_kings = self::select_kings($query);
-            foreach ($new_kings as $user_id => $num) {
-                if (!isset($kings[$user_id])) {
-                    $kings[$user_id] = $num;
-                } else {
-                    $kings[$user_id] += $num;
-                }
-            }
-        }
-
-        return $kings;
-    }
-
-    private static function files_kings()
-    {
-        return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM file_refs GROUP BY user_id");
-    }
-
-    private static function votes_kings()
-    {
-        return self::select_kings("SELECT questionnaires.user_id AS id, COUNT(*) AS num
-            FROM questionnaires
-                LEFT JOIN questionnaire_questions ON (questionnaires.questionnaire_id = questionnaire_questions.questionnaire_id)
-                LEFT JOIN questionnaire_answers ON (questionnaire_questions.question_id = questionnaire_answers.question_id)
-            GROUP BY questionnaires.user_id");
-    }
-
-    private static function voter_kings()
-    {
-        return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM questionnaire_answers GROUP BY user_id");
-    }
-
-    private static function news_kings()
-    {
-        return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM news GROUP BY user_id");
-    }
-
-    private static function textual_representation($type, $amount)
-    {
-        $alt_text = [
-            'files'            => _('%d hochgeladene Dateien'),
-            'forum'            => _('%d Forums-Beiträge'),
-            'wiki'             => _('%d Wiki-Beiträge'),
-            'voter'            => _('%d abgegebene Stimmen'),
-            'votes'            => _('%d bekommene Stimmen'),
-            'news'             => _('%d eingestellte Ankündigungen')
-        ];
-        return sprintf($alt_text[$type], $amount);
-    }
-}
diff --git a/lib/classes/StudipKing.php b/lib/classes/StudipKing.php
new file mode 100644
index 0000000..ae5a14e
--- /dev/null
+++ b/lib/classes/StudipKing.php
@@ -0,0 +1,173 @@
+<?php
+# Lifter010: TODO
+
+/*
+ * Copyright (C) 2004 - Tobias Thelen <tthelen@uos.de>
+ * Copyright (C) 2004 - Till Glöggler <tgloeggl@uos.de>
+ * Copyright (C) 2009 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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 class awards honours (crowns) to users posting a lot in the bulletin
+ * boards, writing a lot of wiki pages and so on.
+ *
+ * @author    mlunzena
+ */
+
+class StudipKing {
+
+    /**
+     * How many of each type should be awarded?
+     */
+    const NUM_KINGS = 1;
+
+    /**
+     * key to use for caching
+     */
+    const CACHE_KEY = 'core/kings';
+
+    /**
+    * store kings also in memory
+    */
+    private static $kings;
+
+    /**
+     * Returns the awards of a user as an associative array consisting of
+     * "award type" => "amount of posts, wiki pages etc." pairs that belong to
+     * this user. If the 2nd parameter is set to true, the values are
+     * descriptional strings instead of the raw numbers.
+     *
+     * @param  string     a string containing the MD5ish ID of the user
+     * @param  bool       TRUE to return descriptional text, FALSE to return
+     *                    raw numbers, which is the default
+     *
+     * @return array      an associative array mapping the awards to an amount
+     */
+    static function is_king($user_id, $textual = FALSE)
+    {
+        $kings = self::get_kings();
+        $result = isset($kings[$user_id]) ? $kings[$user_id] : [];
+        if ($textual) {
+            foreach ($result as $type => $amount) {
+                $result[$type] = self::textual_representation($type, $amount);
+            }
+        }
+        return $result;
+    }
+
+    private static function get_kings()
+    {
+        if (self::$kings === null) {
+            $cache = \Studip\Cache\Factory::getCache();
+
+            # read cache (unserializing a cache miss - FALSE - does not matter)
+            $kings = unserialize($cache->read(self::CACHE_KEY));
+
+            # cache miss, retrieve from database
+            if ($kings === FALSE) {
+                $kings = self::get_kings_uncached();
+                # write to cache with an expiry time of 24 hours
+                $cache->write(self::CACHE_KEY, serialize($kings), 86400);
+            }
+            self::$kings = $kings;
+        }
+        return self::$kings;
+    }
+
+    private static function get_kings_uncached()
+    {
+        $types = words('files forum news voter votes wiki');
+        $kings = [];
+        foreach ($types as $type) {
+            $method = "{$type}_kings";
+            foreach (self::$method() as $user_id => $amount) {
+                if (!isset($kings[$user_id])) {
+                    $kings[$user_id] = [];
+                }
+                $kings[$user_id][$type] = $amount;
+            }
+        }
+        return $kings;
+    }
+
+    private static function select_kings($sql)
+    {
+        $result = [];
+        $stmt = DBManager::get()->query($sql . " ORDER BY num DESC LIMIT 0," . self::NUM_KINGS);
+        foreach ($stmt as $row) {
+            $result[$row["id"]] = $row["num"];
+        }
+        return $result;
+    }
+
+    private static function wiki_kings()
+    {
+        return self::select_kings("
+            SELECT user_id AS id, COUNT(*) AS num
+            FROM (SELECT user_id FROM wiki_pages UNION SELECT user_id FROM wiki_versions) AS `all_wiki_pages`
+            GROUP BY user_id");
+    }
+
+    private static function forum_kings()
+    {
+        $kings = [];
+
+        // sum up postings for all users from all ForumModules available
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
+            $table = $plugin->getEntryTableInfo();
+            $query = "SELECT user_id AS id, COUNT(*) AS num FROM ". $table['table'] ." GROUP BY user_id";
+            $new_kings = self::select_kings($query);
+            foreach ($new_kings as $user_id => $num) {
+                if (!isset($kings[$user_id])) {
+                    $kings[$user_id] = $num;
+                } else {
+                    $kings[$user_id] += $num;
+                }
+            }
+        }
+
+        return $kings;
+    }
+
+    private static function files_kings()
+    {
+        return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM file_refs GROUP BY user_id");
+    }
+
+    private static function votes_kings()
+    {
+        return self::select_kings("SELECT questionnaires.user_id AS id, COUNT(*) AS num
+            FROM questionnaires
+                LEFT JOIN questionnaire_questions ON (questionnaires.questionnaire_id = questionnaire_questions.questionnaire_id)
+                LEFT JOIN questionnaire_answers ON (questionnaire_questions.question_id = questionnaire_answers.question_id)
+            GROUP BY questionnaires.user_id");
+    }
+
+    private static function voter_kings()
+    {
+        return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM questionnaire_answers GROUP BY user_id");
+    }
+
+    private static function news_kings()
+    {
+        return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM news GROUP BY user_id");
+    }
+
+    private static function textual_representation($type, $amount)
+    {
+        $alt_text = [
+            'files'            => _('%d hochgeladene Dateien'),
+            'forum'            => _('%d Forums-Beiträge'),
+            'wiki'             => _('%d Wiki-Beiträge'),
+            'voter'            => _('%d abgegebene Stimmen'),
+            'votes'            => _('%d bekommene Stimmen'),
+            'news'             => _('%d eingestellte Ankündigungen')
+        ];
+        return sprintf($alt_text[$type], $amount);
+    }
+}
diff --git a/lib/classes/StudipLink.class.php b/lib/classes/StudipLink.class.php
deleted file mode 100644
index b4e80ba..0000000
--- a/lib/classes/StudipLink.class.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-
-/**
- * The StudipLink class abstracts Links so that they can be displayed in a
- * uniform manner more easily.
- */
-class StudipLink
-{
-    /**
-     * The title that shall be displayed.
-     */
-    public $title = "";
-
-
-    /**
-     * The icon for the link.
-     */
-    public $icon = null;
-
-
-    /**
-     * The link itself.
-     */
-    public $link = "";
-
-
-    /**
-     * Attributes for the link.
-     */
-    public $attributes = [];
-
-
-    public function __construct(string $link, string $title, Icon $icon)
-    {
-        $this->link = $link;
-        $this->title = $title;
-        $this->icon = $icon;
-    }
-
-
-    public function __toString()
-    {
-        $template = '<a href="%1$s">%2$s %3$s</a>';
-        return sprintf($template, $this->link, $this->title, $this->icon);
-    }
-}
diff --git a/lib/classes/StudipLink.php b/lib/classes/StudipLink.php
new file mode 100644
index 0000000..b4e80ba
--- /dev/null
+++ b/lib/classes/StudipLink.php
@@ -0,0 +1,47 @@
+<?php
+
+
+/**
+ * The StudipLink class abstracts Links so that they can be displayed in a
+ * uniform manner more easily.
+ */
+class StudipLink
+{
+    /**
+     * The title that shall be displayed.
+     */
+    public $title = "";
+
+
+    /**
+     * The icon for the link.
+     */
+    public $icon = null;
+
+
+    /**
+     * The link itself.
+     */
+    public $link = "";
+
+
+    /**
+     * Attributes for the link.
+     */
+    public $attributes = [];
+
+
+    public function __construct(string $link, string $title, Icon $icon)
+    {
+        $this->link = $link;
+        $this->title = $title;
+        $this->icon = $icon;
+    }
+
+
+    public function __toString()
+    {
+        $template = '<a href="%1$s">%2$s %3$s</a>';
+        return sprintf($template, $this->link, $this->title, $this->icon);
+    }
+}
diff --git a/lib/classes/StudipLock.class.php b/lib/classes/StudipLock.class.php
deleted file mode 100644
index 601db8b..0000000
--- a/lib/classes/StudipLock.class.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * StudipLock.class.php
- * class with methods to perform cooperative advisory locking
- * using the GET_LOCK feature from Mysql
- * https://dev.mysql.com/doc/refman/5.0/en/miscellaneous-functions.html#function_get-lock
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-class StudipLock
-{
-    /**
-     * name of active lock
-     * @var string
-     */
-    private static $current;
-
-    /**
-     * returns the name of the current active lock
-     * @return string name of active lock
-     */
-    public static function getCurrent()
-    {
-        return self::$current;
-    }
-
-    /**
-     * Tries to obtain a lock with a name given by the string $lockname,
-     * using a timeout of $timeout seconds. Returns 1 if the lock was obtained
-     * successfully, 0 if the attempt timed out
-     * (for example, because another client has previously locked the name),
-     * or NULL if an error occurred
-     * If a name has been locked by one client, any request by another client
-     * for a lock with the same name is blocked.
-     *
-     * @param string $lockname
-     * @param number $timeout in seconds
-     * @throws UnexpectedValueException if there is already an active lock
-     * @return integer 1 if the lock was obtained successfully, 0 if the attempt timed out
-     */
-    public static function get($lockname, $timeout = 10)
-    {
-        if (self::$current !== null) {
-            throw new UnexpectedValueException(sprintf(
-                'could not acquire new lock, %s still active',
-                self::$current
-            ));
-        }
-        $ok = DBManager::get()->fetchColumn("SELECT GET_LOCK(?,?)", [self::lockname($lockname), $timeout]);
-        if ($ok) {
-            self::$current = $lockname;
-        }
-        return $ok;
-    }
-
-    /**
-     * check if lock with given name is available
-     *
-     * @param string $lockname
-     * @return integer 1 if lock is available
-     */
-    public static function isFree($lockname)
-    {
-        return DBManager::get()->fetchColumn("SELECT IS_FREE_LOCK(?)", [self::lockname($lockname)]);
-    }
-
-    /**
-     * release the current lock
-     *
-     * @return integer 1 if the lock could be released
-     */
-    public static function release()
-    {
-        if (self::$current) {
-            return DBManager::get()->fetchColumn("SELECT RELEASE_LOCK(?)", [self::lockname(self::$current)]);
-        }
-        return 0;
-    }
-
-    /**
-     * prepends the name of current database to lockname
-     * because locks are server-wide
-     *
-     * @param string $lockname
-     * @return string
-     */
-    public static function lockname($lockname)
-    {
-        return $GLOBALS['DB_STUDIP_DATABASE'] . '_' . $lockname;
-    }
-}
diff --git a/lib/classes/StudipLock.php b/lib/classes/StudipLock.php
new file mode 100644
index 0000000..601db8b
--- /dev/null
+++ b/lib/classes/StudipLock.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * StudipLock.class.php
+ * class with methods to perform cooperative advisory locking
+ * using the GET_LOCK feature from Mysql
+ * https://dev.mysql.com/doc/refman/5.0/en/miscellaneous-functions.html#function_get-lock
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+class StudipLock
+{
+    /**
+     * name of active lock
+     * @var string
+     */
+    private static $current;
+
+    /**
+     * returns the name of the current active lock
+     * @return string name of active lock
+     */
+    public static function getCurrent()
+    {
+        return self::$current;
+    }
+
+    /**
+     * Tries to obtain a lock with a name given by the string $lockname,
+     * using a timeout of $timeout seconds. Returns 1 if the lock was obtained
+     * successfully, 0 if the attempt timed out
+     * (for example, because another client has previously locked the name),
+     * or NULL if an error occurred
+     * If a name has been locked by one client, any request by another client
+     * for a lock with the same name is blocked.
+     *
+     * @param string $lockname
+     * @param number $timeout in seconds
+     * @throws UnexpectedValueException if there is already an active lock
+     * @return integer 1 if the lock was obtained successfully, 0 if the attempt timed out
+     */
+    public static function get($lockname, $timeout = 10)
+    {
+        if (self::$current !== null) {
+            throw new UnexpectedValueException(sprintf(
+                'could not acquire new lock, %s still active',
+                self::$current
+            ));
+        }
+        $ok = DBManager::get()->fetchColumn("SELECT GET_LOCK(?,?)", [self::lockname($lockname), $timeout]);
+        if ($ok) {
+            self::$current = $lockname;
+        }
+        return $ok;
+    }
+
+    /**
+     * check if lock with given name is available
+     *
+     * @param string $lockname
+     * @return integer 1 if lock is available
+     */
+    public static function isFree($lockname)
+    {
+        return DBManager::get()->fetchColumn("SELECT IS_FREE_LOCK(?)", [self::lockname($lockname)]);
+    }
+
+    /**
+     * release the current lock
+     *
+     * @return integer 1 if the lock could be released
+     */
+    public static function release()
+    {
+        if (self::$current) {
+            return DBManager::get()->fetchColumn("SELECT RELEASE_LOCK(?)", [self::lockname(self::$current)]);
+        }
+        return 0;
+    }
+
+    /**
+     * prepends the name of current database to lockname
+     * because locks are server-wide
+     *
+     * @param string $lockname
+     * @return string
+     */
+    public static function lockname($lockname)
+    {
+        return $GLOBALS['DB_STUDIP_DATABASE'] . '_' . $lockname;
+    }
+}
diff --git a/lib/classes/StudipLog.class.php b/lib/classes/StudipLog.class.php
deleted file mode 100644
index 7a520c9..0000000
--- a/lib/classes/StudipLog.class.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- * StudipLog
- * Internal API for the Stud.IP logging functions.
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       3.0
- */
-
-class StudipLog
-{
-    /**
-     * Magic log, intercepts all undefined static method calls
-     * called method name must be the name of a log action
-     *
-     * @param string $name
-     * @param array $arguments
-     * @return boolean True if event was written or false if logging is disabled
-     */
-    public static function __callStatic($name, $arguments)
-    {
-        $log_action_name = mb_strtoupper($name);
-        $log_action = LogAction::findByName($log_action_name);
-        if ($log_action) {
-            return call_user_func_array('StudipLog::log', array_merge([$log_action_name], $arguments));
-        }
-        throw new BadMethodCallException('Unknown method called: '
-                . $log_action_name);
-    }
-
-    /**
-    * Logs an event to the database after a certain action took place along with
-    * the ids of the range object the action possibly affected. You can provide
-    * additional info as well as debug information.
-    *
-    * @param String $action_name     Name of the action that took place
-    * @param mixed  $affected   Range id that was affected by the action, if any
-    * @param mixed  $coaffected Range id that was possibly affected as well
-    * @param mixed  $info       Information to add to the event
-    * @param mixed  $dbg_info   Debug information to add to the event
-    * @param mixed  $user_id    Provide null for the current user id
-    **/
-    public static function log(
-        $action_name,
-        $affected = null,
-        $coaffected = null,
-        $info = null,
-        $dbg_info = null,
-        $user_id = null
-    ) {
-        if (!Config::get()->LOG_ENABLE) {
-            return false;
-        }
-
-        // automagically set current user as agent
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-
-        $log_action = LogAction::findOneByName($action_name);
-        if (!$log_action) {
-            // Action doesn't exist -> LOG_ERROR
-            $debug = sprintf(
-                'StudipLog::log(%s,%s,%s,%s,%s) for user %s',
-                $action_name,
-                $affected,
-                $coaffected,
-                $info,
-                $dbg_info,
-                $user_id
-            );
-            self::log('LOG_ERROR', null, null, null, $debug);
-            return false;
-        }
-
-        if (!$log_action->isActive()) {
-            return false;
-        }
-
-        $log_event = new LogEvent();
-        $log_event->user_id = $user_id;
-        $log_event->action_id = $log_action->getId();
-        $log_event->affected_range_id = $affected;
-        $log_event->coaffected_range_id = $coaffected;
-        $log_event->info = $info;
-        $log_event->dbg_info = $dbg_info;
-        $log_event->store();
-        return true;
-    }
-
-    /**
-     * Registers a new log action in database.
-     * Use this function to register log actions for Stud.IP core objects.
-     *
-     * @param string $name The name of the action.
-     * @param string $description The action's description.
-     * @param string $info_template The template
-     * @param string $class Name of the core class.
-     */
-    public static function registerAction($name, $description, $info_template,
-            $class)
-    {
-        $action = new LogAction();
-        $action->name = $name;
-        $action->description = $description;
-        $action->info_template = $info_template;
-        $action->class = $class;
-        $action->type = 'core';
-        $action->store();
-    }
-
-    /**
-     * Registers a new log action in database.
-     * Use this function to register log actions for plugin classes.
-     *
-     * @param string $name The name of the action.
-     * @param string $description The action's description.
-     * @param string $info_template The template
-     * @param string $plugin_class_name Name of the plugin class.
-     */
-    public static function registerActionPlugin($name, $description,
-            $info_template, $plugin_class_name)
-    {
-        $action = new LogAction();
-        $action->name = $name;
-        $action->description = $description;
-        $action->info_template = $info_template;
-        $action->class = $plugin_class_name;
-        $action->type = 'plugin';
-        $action->store();
-    }
-
-    /**
-     * Registers a new log action in database.
-     * Use this function to register log actions for arbitrary objects.
-     *
-     * @param string $name The name of the action.
-     * @param string $description The action's description.
-     * @param string $info_template The template
-     * @param string $filename Path to the file with the class (relative
-     * to Stud.IP root).
-     * @param string $class Name of class to be logged.
-     */
-    public static function registerActionFile($name, $description,
-            $info_template, $filename, $class)
-    {
-        $path_file = $GLOBALS['STUDIP_BASE_PATH'] . '/' . $filename;
-        if (!file_exists($path_file)) {
-            $message = sprintf('Task class file "%s" does not exist.',
-                    $path_file);
-            throw new InvalidArgumentException($message);
-        }
-        $action = new LogAction();
-        $action->name = $name;
-        $action->description = $description;
-        $action->info_template = $info_template;
-        $action->filename = $path_file;
-        $action->class = $class;
-        $action->type = 'file';
-        $action->store();
-    }
-
-    /**
-     * Removes the action from database.
-     * Deletes all related log events also.
-     *
-     * @param string $name The name of the log action.
-     * @return mixed Number of deleted objects or false if action is unknown.
-     */
-    public static function unregisterAction($name)
-    {
-        $action = LogAction::findOneByName($name);
-        if ($action) {
-            return $action->delete();
-        }
-        return false;
-    }
-
-    /**
-     * Finds all seminars by given search string. Searches for the name of
-     * existing or already deleted seminars.
-     *
-     * @param string $needle The needle to search for.
-     * @return array
-     */
-    public static function searchSeminar($needle)
-    {
-        $result = [];
-
-        // search for active seminars
-        $courses = Course::findBySQL("VeranstaltungsNummer LIKE CONCAT('%', :needle, '%')
-                     OR seminare.Name LIKE CONCAT('%', :needle, '%') ORDER BY start_time DESC",
-                [':needle' => $needle]);
-
-        foreach ($courses as $course) {
-            $title = sprintf('%s %s (%s)',
-                             $course->VeranstaltungsNummer,
-                             my_substr($course->name, 0, 40),
-                             $course->start_semester->name);
-                $result[] = [$course->getId(), $title];
-        }
-
-        // search deleted seminars
-        // SemName and Number is part of info field, old id (still in DB) is in affected column
-        $log_action_ids_archived_seminar = SimpleORMapCollection::createFromArray(
-                LogAction::findBySQL(
-                    "name IN ('SEM_ARCHIVE', 'SEM_DELETE_FROM_ARCHIVE')"))
-                ->pluck('action_id');
-        $log_events_archived_seminar = LogEvent::findBySQL("info LIKE CONCAT('%', ?, '%')
-                AND action_id IN (?) ",
-                [$needle, $log_action_ids_archived_seminar]);
-        foreach ($log_events_archived_seminar as $log_event) {
-            $title = sprintf('%s (%s)', my_substr($log_event->info, 0, 40), _('gelöscht'));
-            $result[] = [$log_event->affected_range_id, $title];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Finds all institutes by given search string. Searches for the name of
-     * existing or already deleted institutes.
-     *
-     * @param type $needle The needle to search for.
-     * @return array
-     */
-    public static function searchInstitute($needle)
-    {
-        $result = [];
-
-        $institutes = Institute::findBySQL(
-                "name LIKE CONCAT('%', ?, '%') ORDER BY name", [$needle]);
-        foreach ($institutes as $institute) {
-            $result[] = [$institute->getId(), my_substr($institute->name, 0, 28)];
-        }
-
-        // search for deleted institutes
-        // Name of deleted institute is part of info field,
-        // old id (still in DB) is in affected column
-        $log_action_delete_institute = LogAction::findOneByName('INST_DEL');
-        $log_events_delete_institute = LogEvent::findBySQL(
-                "action_id = ? AND info LIKE CONCAT('%', ?, '%')",
-                [$log_action_delete_institute->getId(), $needle]);
-        foreach ($log_events_delete_institute as $log_event) {
-            $title = sprintf('%s (%s)', $log_event->info, _('gelöscht'));
-            $result[] = [$log_event->affected_range_id, $title];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Finds all users by given search string. Searches for the users id,
-     * part of the name or the username.
-     *
-     * @param type $needle The needle to search for.
-     * @return array
-     */
-    public static function searchUser($needle)
-    {
-        $users = User::findBySQL(
-            "Nachname LIKE CONCAT('%', :needle, '%')
-             OR Vorname LIKE CONCAT('%', :needle, '%')
-             OR CONCAT(Nachname, ', ', Vorname) LIKE CONCAT('%', :needle, '%')
-             OR CONCAT(Vorname, ' ', Nachname) LIKE CONCAT('%', :needle, '%')
-             OR username LIKE CONCAT('%', :needle, '%')
-             ORDER BY Nachname DESC, Vorname DESC",
-            [':needle' => $needle]
-        );
-
-        $result = [];
-        foreach ($users as $user) {
-            $name = sprintf(
-                '%s (%s)',
-                my_substr($user->getFullName(), 0, 20),
-                $user->username
-            );
-            $result[] = [$user->getId(), $name];
-        }
-
-        // search for deleted users
-        //
-        // The name of the user is part of info field,
-        // old id (still in DB) is in affected column.
-        //
-        // The log action "USER_DEL" was removed from the list of initially
-        // registered log actions in the past.
-        // Search for the user if it is still in database. If not, the search
-        // for deleted users is not possible.
-        $log_action_deleted_user = LogAction::findOneByName('USER_DEL');
-        if ($log_action_deleted_user) {
-            $log_events_deleted_user = LogEvent::findBySQL(
-                "action_id = ? AND info LIKE CONCAT('%', ?, '%')",
-                [$log_action_deleted_user->getId(), $needle]
-            );
-            foreach ($log_events_deleted_user as $log_event) {
-                $name = sprintf('%s (%s)', $log_event->info, _('gelöscht'));
-                $result[] = [$log_event->affected_range_id, $name];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Finds all resources by given search string. The search string can be
-     * either a resource id or part of the name.
-     *
-     * @param string $needle The needle to search for.
-     * @return array
-     */
-    public static function searchResource($needle)
-    {
-        $result = [];
-
-        $query = "SELECT id, name FROM resources WHERE name LIKE CONCAT('%', ?, '%') ORDER by name";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$needle]);
-
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = [$row['id'], my_substr($row['name'], 0, 30)];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Finds all objects related to the given action by search string.
-     * The search string can be either a part of the name or the id
-     * of the object.
-     *
-     * Calls the method Loggable::logSearch() to retrieve the result.
-     *
-     * @param string $needle
-     * @param type $action_id
-     * @return type
-     */
-    public static function searchObjectByAction($needle, $action_id)
-    {
-        $action = LogAction::find($action_id);
-
-        if ($action) {
-            switch ($action->type) {
-                case 'plugin':
-                    $plugin_manager = PluginManager::getInstance();
-                    $plugin_info = $plugin_manager->getPluginInfo($action->class);
-                    $class_name = $plugin_info['class'];
-                    $plugin = $plugin_manager->getPlugin($class_name);
-                    if ($plugin instanceof Loggable) {
-                        return $class_name::logSearch($needle, $action->name);
-                    }
-                    break;
-                case 'file':
-                    if (!file_exists($action->filename)) {
-                        require_once($action->filename);
-                        $class_name = $action->class;
-                        if ($class_name instanceof Loggable) {
-                            return $class_name::logSearch($needle, $action->name);
-                        }
-                    }
-                    break;
-                case 'core':
-                    $class_name = $action->class;
-                    $interfaces = class_implements($class_name);
-                    if (isset($interfaces['Loggable'])) {
-                        return $class_name::logSearch($needle, $action->name);
-                    }
-            }
-        }
-        return [];
-    }
-}
diff --git a/lib/classes/StudipLog.php b/lib/classes/StudipLog.php
new file mode 100644
index 0000000..7a520c9
--- /dev/null
+++ b/lib/classes/StudipLog.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * StudipLog
+ * Internal API for the Stud.IP logging functions.
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       3.0
+ */
+
+class StudipLog
+{
+    /**
+     * Magic log, intercepts all undefined static method calls
+     * called method name must be the name of a log action
+     *
+     * @param string $name
+     * @param array $arguments
+     * @return boolean True if event was written or false if logging is disabled
+     */
+    public static function __callStatic($name, $arguments)
+    {
+        $log_action_name = mb_strtoupper($name);
+        $log_action = LogAction::findByName($log_action_name);
+        if ($log_action) {
+            return call_user_func_array('StudipLog::log', array_merge([$log_action_name], $arguments));
+        }
+        throw new BadMethodCallException('Unknown method called: '
+                . $log_action_name);
+    }
+
+    /**
+    * Logs an event to the database after a certain action took place along with
+    * the ids of the range object the action possibly affected. You can provide
+    * additional info as well as debug information.
+    *
+    * @param String $action_name     Name of the action that took place
+    * @param mixed  $affected   Range id that was affected by the action, if any
+    * @param mixed  $coaffected Range id that was possibly affected as well
+    * @param mixed  $info       Information to add to the event
+    * @param mixed  $dbg_info   Debug information to add to the event
+    * @param mixed  $user_id    Provide null for the current user id
+    **/
+    public static function log(
+        $action_name,
+        $affected = null,
+        $coaffected = null,
+        $info = null,
+        $dbg_info = null,
+        $user_id = null
+    ) {
+        if (!Config::get()->LOG_ENABLE) {
+            return false;
+        }
+
+        // automagically set current user as agent
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+
+        $log_action = LogAction::findOneByName($action_name);
+        if (!$log_action) {
+            // Action doesn't exist -> LOG_ERROR
+            $debug = sprintf(
+                'StudipLog::log(%s,%s,%s,%s,%s) for user %s',
+                $action_name,
+                $affected,
+                $coaffected,
+                $info,
+                $dbg_info,
+                $user_id
+            );
+            self::log('LOG_ERROR', null, null, null, $debug);
+            return false;
+        }
+
+        if (!$log_action->isActive()) {
+            return false;
+        }
+
+        $log_event = new LogEvent();
+        $log_event->user_id = $user_id;
+        $log_event->action_id = $log_action->getId();
+        $log_event->affected_range_id = $affected;
+        $log_event->coaffected_range_id = $coaffected;
+        $log_event->info = $info;
+        $log_event->dbg_info = $dbg_info;
+        $log_event->store();
+        return true;
+    }
+
+    /**
+     * Registers a new log action in database.
+     * Use this function to register log actions for Stud.IP core objects.
+     *
+     * @param string $name The name of the action.
+     * @param string $description The action's description.
+     * @param string $info_template The template
+     * @param string $class Name of the core class.
+     */
+    public static function registerAction($name, $description, $info_template,
+            $class)
+    {
+        $action = new LogAction();
+        $action->name = $name;
+        $action->description = $description;
+        $action->info_template = $info_template;
+        $action->class = $class;
+        $action->type = 'core';
+        $action->store();
+    }
+
+    /**
+     * Registers a new log action in database.
+     * Use this function to register log actions for plugin classes.
+     *
+     * @param string $name The name of the action.
+     * @param string $description The action's description.
+     * @param string $info_template The template
+     * @param string $plugin_class_name Name of the plugin class.
+     */
+    public static function registerActionPlugin($name, $description,
+            $info_template, $plugin_class_name)
+    {
+        $action = new LogAction();
+        $action->name = $name;
+        $action->description = $description;
+        $action->info_template = $info_template;
+        $action->class = $plugin_class_name;
+        $action->type = 'plugin';
+        $action->store();
+    }
+
+    /**
+     * Registers a new log action in database.
+     * Use this function to register log actions for arbitrary objects.
+     *
+     * @param string $name The name of the action.
+     * @param string $description The action's description.
+     * @param string $info_template The template
+     * @param string $filename Path to the file with the class (relative
+     * to Stud.IP root).
+     * @param string $class Name of class to be logged.
+     */
+    public static function registerActionFile($name, $description,
+            $info_template, $filename, $class)
+    {
+        $path_file = $GLOBALS['STUDIP_BASE_PATH'] . '/' . $filename;
+        if (!file_exists($path_file)) {
+            $message = sprintf('Task class file "%s" does not exist.',
+                    $path_file);
+            throw new InvalidArgumentException($message);
+        }
+        $action = new LogAction();
+        $action->name = $name;
+        $action->description = $description;
+        $action->info_template = $info_template;
+        $action->filename = $path_file;
+        $action->class = $class;
+        $action->type = 'file';
+        $action->store();
+    }
+
+    /**
+     * Removes the action from database.
+     * Deletes all related log events also.
+     *
+     * @param string $name The name of the log action.
+     * @return mixed Number of deleted objects or false if action is unknown.
+     */
+    public static function unregisterAction($name)
+    {
+        $action = LogAction::findOneByName($name);
+        if ($action) {
+            return $action->delete();
+        }
+        return false;
+    }
+
+    /**
+     * Finds all seminars by given search string. Searches for the name of
+     * existing or already deleted seminars.
+     *
+     * @param string $needle The needle to search for.
+     * @return array
+     */
+    public static function searchSeminar($needle)
+    {
+        $result = [];
+
+        // search for active seminars
+        $courses = Course::findBySQL("VeranstaltungsNummer LIKE CONCAT('%', :needle, '%')
+                     OR seminare.Name LIKE CONCAT('%', :needle, '%') ORDER BY start_time DESC",
+                [':needle' => $needle]);
+
+        foreach ($courses as $course) {
+            $title = sprintf('%s %s (%s)',
+                             $course->VeranstaltungsNummer,
+                             my_substr($course->name, 0, 40),
+                             $course->start_semester->name);
+                $result[] = [$course->getId(), $title];
+        }
+
+        // search deleted seminars
+        // SemName and Number is part of info field, old id (still in DB) is in affected column
+        $log_action_ids_archived_seminar = SimpleORMapCollection::createFromArray(
+                LogAction::findBySQL(
+                    "name IN ('SEM_ARCHIVE', 'SEM_DELETE_FROM_ARCHIVE')"))
+                ->pluck('action_id');
+        $log_events_archived_seminar = LogEvent::findBySQL("info LIKE CONCAT('%', ?, '%')
+                AND action_id IN (?) ",
+                [$needle, $log_action_ids_archived_seminar]);
+        foreach ($log_events_archived_seminar as $log_event) {
+            $title = sprintf('%s (%s)', my_substr($log_event->info, 0, 40), _('gelöscht'));
+            $result[] = [$log_event->affected_range_id, $title];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Finds all institutes by given search string. Searches for the name of
+     * existing or already deleted institutes.
+     *
+     * @param type $needle The needle to search for.
+     * @return array
+     */
+    public static function searchInstitute($needle)
+    {
+        $result = [];
+
+        $institutes = Institute::findBySQL(
+                "name LIKE CONCAT('%', ?, '%') ORDER BY name", [$needle]);
+        foreach ($institutes as $institute) {
+            $result[] = [$institute->getId(), my_substr($institute->name, 0, 28)];
+        }
+
+        // search for deleted institutes
+        // Name of deleted institute is part of info field,
+        // old id (still in DB) is in affected column
+        $log_action_delete_institute = LogAction::findOneByName('INST_DEL');
+        $log_events_delete_institute = LogEvent::findBySQL(
+                "action_id = ? AND info LIKE CONCAT('%', ?, '%')",
+                [$log_action_delete_institute->getId(), $needle]);
+        foreach ($log_events_delete_institute as $log_event) {
+            $title = sprintf('%s (%s)', $log_event->info, _('gelöscht'));
+            $result[] = [$log_event->affected_range_id, $title];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Finds all users by given search string. Searches for the users id,
+     * part of the name or the username.
+     *
+     * @param type $needle The needle to search for.
+     * @return array
+     */
+    public static function searchUser($needle)
+    {
+        $users = User::findBySQL(
+            "Nachname LIKE CONCAT('%', :needle, '%')
+             OR Vorname LIKE CONCAT('%', :needle, '%')
+             OR CONCAT(Nachname, ', ', Vorname) LIKE CONCAT('%', :needle, '%')
+             OR CONCAT(Vorname, ' ', Nachname) LIKE CONCAT('%', :needle, '%')
+             OR username LIKE CONCAT('%', :needle, '%')
+             ORDER BY Nachname DESC, Vorname DESC",
+            [':needle' => $needle]
+        );
+
+        $result = [];
+        foreach ($users as $user) {
+            $name = sprintf(
+                '%s (%s)',
+                my_substr($user->getFullName(), 0, 20),
+                $user->username
+            );
+            $result[] = [$user->getId(), $name];
+        }
+
+        // search for deleted users
+        //
+        // The name of the user is part of info field,
+        // old id (still in DB) is in affected column.
+        //
+        // The log action "USER_DEL" was removed from the list of initially
+        // registered log actions in the past.
+        // Search for the user if it is still in database. If not, the search
+        // for deleted users is not possible.
+        $log_action_deleted_user = LogAction::findOneByName('USER_DEL');
+        if ($log_action_deleted_user) {
+            $log_events_deleted_user = LogEvent::findBySQL(
+                "action_id = ? AND info LIKE CONCAT('%', ?, '%')",
+                [$log_action_deleted_user->getId(), $needle]
+            );
+            foreach ($log_events_deleted_user as $log_event) {
+                $name = sprintf('%s (%s)', $log_event->info, _('gelöscht'));
+                $result[] = [$log_event->affected_range_id, $name];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Finds all resources by given search string. The search string can be
+     * either a resource id or part of the name.
+     *
+     * @param string $needle The needle to search for.
+     * @return array
+     */
+    public static function searchResource($needle)
+    {
+        $result = [];
+
+        $query = "SELECT id, name FROM resources WHERE name LIKE CONCAT('%', ?, '%') ORDER by name";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$needle]);
+
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = [$row['id'], my_substr($row['name'], 0, 30)];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Finds all objects related to the given action by search string.
+     * The search string can be either a part of the name or the id
+     * of the object.
+     *
+     * Calls the method Loggable::logSearch() to retrieve the result.
+     *
+     * @param string $needle
+     * @param type $action_id
+     * @return type
+     */
+    public static function searchObjectByAction($needle, $action_id)
+    {
+        $action = LogAction::find($action_id);
+
+        if ($action) {
+            switch ($action->type) {
+                case 'plugin':
+                    $plugin_manager = PluginManager::getInstance();
+                    $plugin_info = $plugin_manager->getPluginInfo($action->class);
+                    $class_name = $plugin_info['class'];
+                    $plugin = $plugin_manager->getPlugin($class_name);
+                    if ($plugin instanceof Loggable) {
+                        return $class_name::logSearch($needle, $action->name);
+                    }
+                    break;
+                case 'file':
+                    if (!file_exists($action->filename)) {
+                        require_once($action->filename);
+                        $class_name = $action->class;
+                        if ($class_name instanceof Loggable) {
+                            return $class_name::logSearch($needle, $action->name);
+                        }
+                    }
+                    break;
+                case 'core':
+                    $class_name = $action->class;
+                    $interfaces = class_implements($class_name);
+                    if (isset($interfaces['Loggable'])) {
+                        return $class_name::logSearch($needle, $action->name);
+                    }
+            }
+        }
+        return [];
+    }
+}
diff --git a/lib/classes/StudipLvgruppeSelection.class.php b/lib/classes/StudipLvgruppeSelection.class.php
deleted file mode 100644
index a5da9cb..0000000
--- a/lib/classes/StudipLvgruppeSelection.class.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
- * Copyright (C) 2013 - Peter Thienel <thienel@data-quest.de>
- *
- * 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.
- */
-
-
-/**
- * Objects of this class represent the state of the LV-Gruppe selection form.
- */
-class StudipLvgruppeSelection {
-
-    private $selected;
-    private $showAll;
-    private $areas;
-    private $searchKey;
-    private $searchResult;
-
-    /**
-     * This constructor can be called with or without a course ID. If a course ID
-     * has been sent, the selected lvgruppen are populated by that course's already
-     * chosen lvgruppen. If no course ID is given, it is assumed that you are
-     * creating a new course at the moment.
-     *
-     * @param  string     optional; the ID of the course to prepopulate the form
-     *                    with
-     *
-     * @return void
-     */
-    public function __construct($course_id = null)
-    {
-        $this->selected = self::getRootItem();
-        $this->showAll = FALSE;
-
-        $this->areas = [];
-
-        $this->searchKey = '';
-        $this->clearSearchResult();
-
-        if (isset($course_id)) {
-            $this->populateAreasForCourse($course_id);
-        }
-    }
-
-    /**
-      * Returns the not really existing root of the tree.
-      *
-      * @return object     the root tree object
-      */
-     public static function getRootItem()
-     {
-        $root = new MvvTreeRoot();
-        return $root;
-     }
-
-    /**
-     * This method populates this instance with the already chosen LV-Gruppen.
-     *
-     * @param  string     the course's ID
-     *
-     * @return void
-     */
-    private function populateAreasForCourse($id)
-    {
-        $lvgruppen = Lvgruppe::findBySeminar($id);
-        $this->setLvgruppen($lvgruppen);
-        $this->sortAreas();
-    }
-
-
-    /**
-     * Sorts the internal representation of the areas by their paths according to
-     * the current locale.
-     *
-     * @return void
-     */
-    private function sortAreas()
-    {
-        // MVV: sort by name of LvGruppe
-        uasort($this->areas, function ($a, $b) {
-            return strcoll($a->getDisplayName(), $b->getDisplayName());
-        });
-    }
-
-
-    /**
-     * @return string     the current search term
-     */
-    public function getSearchKey()
-    {
-        return $this->searchKey;
-    }
-
-
-    /**
-     * @param  string     a search term
-     *
-     * @return object     this instance
-     */
-    public function setSearchKey($searchKey)
-    {
-        $this->searchKey = (string) $searchKey;
-
-        $this->clearSearchResult();
-        return $this;
-    }
-
-
-    /**
-     * @return bool       returns TRUE if the search key was set meaning that
-     *                    we are currently searching; returns FALSE otherwise
-     */
-    public function searched()
-    {
-        return $this->searchKey !== '';
-    }
-
-
-    /**
-     * Clears the current search result.
-     *
-     * @return object     this instance
-     */
-    public function clearSearchResult()
-    {
-        $this->searchResult = null;
-        return $this;
-    }
-
-
-    /**
-     * Returns an array of search results.
-     *
-     * @return array      an array of search results
-     */
-    public function getSearchResult()
-    {
-
-        # no search key -> return empty array
-        if ($this->searchKey === '') {
-            return [];
-        }
-
-        if (is_null($this->searchResult)) {
-            $lvgruppen = Lvgruppe::findBySearchTerm($this->searchKey);
-            foreach ($lvgruppen as $lvgruppe) {
-                $this->searchResult[$lvgruppe->id] = $lvgruppe;
-            }
-            usort($this->searchResult, [__CLASS__, 'sortSearchResult']);
-        }
-
-        return $this->searchResult;
-    }
-
-    public static function sortSearchResult($a, $b)
-    {
-        // sort by display name
-        return strcmp($a->getDisplayName(), $b->getDisplayName());
-    }
-
-
-    /**
-     * @return object     the currently selected lvgruppe
-     */
-    public function getSelected()
-    {
-        return $this->selected;
-    }
-
-
-    /**
-     * Sets the selected tree item.
-     *
-     * @param  mixed $selected Either the id of a tree item to select or the
-     * tree item object itself
-     * @return object this instance
-     */
-    public function setSelected($selected, $type = null)
-    {
-        if (!is_object($selected) && !is_null($type)) {
-            $reflection = new ReflectionClass($type);
-            if (!$reflection->implementsInterface('MvvTreeItem')) {
-                throw new InvalidArgumentException('Wrong type of tree element.');
-            }
-            if ($type != 'MvvTreeRoot') {
-                $this->selected = $type::find(explode('_', $selected));
-            }
-        } else {
-            $this->selected = $selected;
-        }
-        return $this;
-    }
-
-
-    /**
-     * @return bool       returns TRUE if the subtrees should be expanded
-     *                    completely or FALSE otherwise
-     */
-    public function getShowAll()
-    {
-        return $this->showAll;
-    }
-
-
-    /**
-     * @param  bool       the new state of the expansion of subtrees
-     *
-     * @return object     this instance
-     */
-    public function setShowAll($showAll)
-    {
-        $this->showAll = $showAll;
-     //   $this->selected = new MvvTreeRoot();
-        return $this;
-    }
-
-
-    /**
-     * Toggles the state of the expansion of subtrees.
-     *
-     * @return object     this instance
-     */
-    public function toggleShowAll()
-    {
-        $this->showAll = !$this->showAll;
-        return $this;
-    }
-
-
-    /**
-     * Returns all the IDs of the already selected LV-Gruppen.
-     *
-     * @return array      an array with IDs of the selected LV-Gruppen
-     */
-    public function getLvGruppenIDs()
-    {
-        return array_keys($this->areas);
-    }
-
-
-    /**
-     * Returns all the selected LV-Gruppen.
-     *
-     * @return array      an array of LV-Gruppen representing the selected
-     *                    LV-Gruppen
-     */
-    public function getAreas()
-    {
-        return $this->areas;
-    }
-
-
-    /**
-     * Sets the LV-Gruppen of this selection. One can provide either MD5ish ID
-     * strings or instances of Lvgruppe.
-     *
-     * @param  array      an array of either MD5ish ID strings or Lvgruppe
-     *
-     * @return object     the called instance itself
-     */
-    public function setLvgruppen($areas)
-    {
-        $this->areas = [];
-        foreach ($areas as $area) {
-            $this->add($area);
-        }
-        return $this;
-    }
-
-
-    /**
-     * Returns true if this LV-Gruppe is selected, false otherwise.
-     *
-     * @param  mixed      the id of a LV-Gruppe or the LV-Gruppe object itself
-     * @return bool       returns true if selected, false otherwise
-     */
-    public function includes($area)
-    {
-        $id = is_object($area) ? $area->getId() : $area;
-        return isset($this->areas[$id]);
-    }
-
-
-    /**
-     * @return integer    returns the number of the selected LV-Gruppen
-     */
-    public function size()
-    {
-        return count($this->areas);
-    }
-
-
-    /**
-     * This method adds an area to the selected LV-Gruppen.
-     *
-     * @param  mixed     the ID of the LV-Gruppe to add or a LV-Gruppe object
-     *
-     * @return object     this instance
-     */
-    public function add($area)
-    {
-        # convert to an object
-        if (!is_object($area)) {
-            $area = Lvgruppe::find($area);
-        }
-        $id = $area->getId();
-        if (!isset($this->areas[$id])) {
-            $this->areas[$id] = $area;
-        }
-        $this->sortAreas();
-        return $this;
-    }
-
-
-    /**
-     * This method removes given LV-Gruppe from the already selected LV-Gruppen.
-     *
-     * @param  mixed     the ID of the LV-Gruppe to add or a LV-Gruppe object
-     *
-     * @return object     this instance
-     */
-    public function remove($area)
-    {
-        if (is_object($area)) {
-            $area = $area->getId();
-        }
-        if (isset($this->areas[(string) $area])) {
-            unset($this->areas[$area]);
-        }
-        return $this;
-    }
-
-
-    /**
-     * Returns the trail -- the path from the root of the tree of MVV objects down
-     * to the currently selected LV-Gruppe.
-     *
-     * @return array an array of MVV objects
-     */
-    public function getTrail()
-    {
-        $area = $this->selected;
-        $trail = [implode('_', (array) $area->getId()) => $area];
-        while ($parent = $area->getTrailParent()) {
-            $trail[implode('_', (array) $parent->getId())] = $parent;
-            $area = $parent;
-        }
-        $trail['root'] = new MvvTreeRoot();
-        return array_reverse($trail, true);
-    }
-}
diff --git a/lib/classes/StudipLvgruppeSelection.php b/lib/classes/StudipLvgruppeSelection.php
new file mode 100644
index 0000000..a5da9cb
--- /dev/null
+++ b/lib/classes/StudipLvgruppeSelection.php
@@ -0,0 +1,359 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/*
+ * Copyright (C) 2013 - Peter Thienel <thienel@data-quest.de>
+ *
+ * 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.
+ */
+
+
+/**
+ * Objects of this class represent the state of the LV-Gruppe selection form.
+ */
+class StudipLvgruppeSelection {
+
+    private $selected;
+    private $showAll;
+    private $areas;
+    private $searchKey;
+    private $searchResult;
+
+    /**
+     * This constructor can be called with or without a course ID. If a course ID
+     * has been sent, the selected lvgruppen are populated by that course's already
+     * chosen lvgruppen. If no course ID is given, it is assumed that you are
+     * creating a new course at the moment.
+     *
+     * @param  string     optional; the ID of the course to prepopulate the form
+     *                    with
+     *
+     * @return void
+     */
+    public function __construct($course_id = null)
+    {
+        $this->selected = self::getRootItem();
+        $this->showAll = FALSE;
+
+        $this->areas = [];
+
+        $this->searchKey = '';
+        $this->clearSearchResult();
+
+        if (isset($course_id)) {
+            $this->populateAreasForCourse($course_id);
+        }
+    }
+
+    /**
+      * Returns the not really existing root of the tree.
+      *
+      * @return object     the root tree object
+      */
+     public static function getRootItem()
+     {
+        $root = new MvvTreeRoot();
+        return $root;
+     }
+
+    /**
+     * This method populates this instance with the already chosen LV-Gruppen.
+     *
+     * @param  string     the course's ID
+     *
+     * @return void
+     */
+    private function populateAreasForCourse($id)
+    {
+        $lvgruppen = Lvgruppe::findBySeminar($id);
+        $this->setLvgruppen($lvgruppen);
+        $this->sortAreas();
+    }
+
+
+    /**
+     * Sorts the internal representation of the areas by their paths according to
+     * the current locale.
+     *
+     * @return void
+     */
+    private function sortAreas()
+    {
+        // MVV: sort by name of LvGruppe
+        uasort($this->areas, function ($a, $b) {
+            return strcoll($a->getDisplayName(), $b->getDisplayName());
+        });
+    }
+
+
+    /**
+     * @return string     the current search term
+     */
+    public function getSearchKey()
+    {
+        return $this->searchKey;
+    }
+
+
+    /**
+     * @param  string     a search term
+     *
+     * @return object     this instance
+     */
+    public function setSearchKey($searchKey)
+    {
+        $this->searchKey = (string) $searchKey;
+
+        $this->clearSearchResult();
+        return $this;
+    }
+
+
+    /**
+     * @return bool       returns TRUE if the search key was set meaning that
+     *                    we are currently searching; returns FALSE otherwise
+     */
+    public function searched()
+    {
+        return $this->searchKey !== '';
+    }
+
+
+    /**
+     * Clears the current search result.
+     *
+     * @return object     this instance
+     */
+    public function clearSearchResult()
+    {
+        $this->searchResult = null;
+        return $this;
+    }
+
+
+    /**
+     * Returns an array of search results.
+     *
+     * @return array      an array of search results
+     */
+    public function getSearchResult()
+    {
+
+        # no search key -> return empty array
+        if ($this->searchKey === '') {
+            return [];
+        }
+
+        if (is_null($this->searchResult)) {
+            $lvgruppen = Lvgruppe::findBySearchTerm($this->searchKey);
+            foreach ($lvgruppen as $lvgruppe) {
+                $this->searchResult[$lvgruppe->id] = $lvgruppe;
+            }
+            usort($this->searchResult, [__CLASS__, 'sortSearchResult']);
+        }
+
+        return $this->searchResult;
+    }
+
+    public static function sortSearchResult($a, $b)
+    {
+        // sort by display name
+        return strcmp($a->getDisplayName(), $b->getDisplayName());
+    }
+
+
+    /**
+     * @return object     the currently selected lvgruppe
+     */
+    public function getSelected()
+    {
+        return $this->selected;
+    }
+
+
+    /**
+     * Sets the selected tree item.
+     *
+     * @param  mixed $selected Either the id of a tree item to select or the
+     * tree item object itself
+     * @return object this instance
+     */
+    public function setSelected($selected, $type = null)
+    {
+        if (!is_object($selected) && !is_null($type)) {
+            $reflection = new ReflectionClass($type);
+            if (!$reflection->implementsInterface('MvvTreeItem')) {
+                throw new InvalidArgumentException('Wrong type of tree element.');
+            }
+            if ($type != 'MvvTreeRoot') {
+                $this->selected = $type::find(explode('_', $selected));
+            }
+        } else {
+            $this->selected = $selected;
+        }
+        return $this;
+    }
+
+
+    /**
+     * @return bool       returns TRUE if the subtrees should be expanded
+     *                    completely or FALSE otherwise
+     */
+    public function getShowAll()
+    {
+        return $this->showAll;
+    }
+
+
+    /**
+     * @param  bool       the new state of the expansion of subtrees
+     *
+     * @return object     this instance
+     */
+    public function setShowAll($showAll)
+    {
+        $this->showAll = $showAll;
+     //   $this->selected = new MvvTreeRoot();
+        return $this;
+    }
+
+
+    /**
+     * Toggles the state of the expansion of subtrees.
+     *
+     * @return object     this instance
+     */
+    public function toggleShowAll()
+    {
+        $this->showAll = !$this->showAll;
+        return $this;
+    }
+
+
+    /**
+     * Returns all the IDs of the already selected LV-Gruppen.
+     *
+     * @return array      an array with IDs of the selected LV-Gruppen
+     */
+    public function getLvGruppenIDs()
+    {
+        return array_keys($this->areas);
+    }
+
+
+    /**
+     * Returns all the selected LV-Gruppen.
+     *
+     * @return array      an array of LV-Gruppen representing the selected
+     *                    LV-Gruppen
+     */
+    public function getAreas()
+    {
+        return $this->areas;
+    }
+
+
+    /**
+     * Sets the LV-Gruppen of this selection. One can provide either MD5ish ID
+     * strings or instances of Lvgruppe.
+     *
+     * @param  array      an array of either MD5ish ID strings or Lvgruppe
+     *
+     * @return object     the called instance itself
+     */
+    public function setLvgruppen($areas)
+    {
+        $this->areas = [];
+        foreach ($areas as $area) {
+            $this->add($area);
+        }
+        return $this;
+    }
+
+
+    /**
+     * Returns true if this LV-Gruppe is selected, false otherwise.
+     *
+     * @param  mixed      the id of a LV-Gruppe or the LV-Gruppe object itself
+     * @return bool       returns true if selected, false otherwise
+     */
+    public function includes($area)
+    {
+        $id = is_object($area) ? $area->getId() : $area;
+        return isset($this->areas[$id]);
+    }
+
+
+    /**
+     * @return integer    returns the number of the selected LV-Gruppen
+     */
+    public function size()
+    {
+        return count($this->areas);
+    }
+
+
+    /**
+     * This method adds an area to the selected LV-Gruppen.
+     *
+     * @param  mixed     the ID of the LV-Gruppe to add or a LV-Gruppe object
+     *
+     * @return object     this instance
+     */
+    public function add($area)
+    {
+        # convert to an object
+        if (!is_object($area)) {
+            $area = Lvgruppe::find($area);
+        }
+        $id = $area->getId();
+        if (!isset($this->areas[$id])) {
+            $this->areas[$id] = $area;
+        }
+        $this->sortAreas();
+        return $this;
+    }
+
+
+    /**
+     * This method removes given LV-Gruppe from the already selected LV-Gruppen.
+     *
+     * @param  mixed     the ID of the LV-Gruppe to add or a LV-Gruppe object
+     *
+     * @return object     this instance
+     */
+    public function remove($area)
+    {
+        if (is_object($area)) {
+            $area = $area->getId();
+        }
+        if (isset($this->areas[(string) $area])) {
+            unset($this->areas[$area]);
+        }
+        return $this;
+    }
+
+
+    /**
+     * Returns the trail -- the path from the root of the tree of MVV objects down
+     * to the currently selected LV-Gruppe.
+     *
+     * @return array an array of MVV objects
+     */
+    public function getTrail()
+    {
+        $area = $this->selected;
+        $trail = [implode('_', (array) $area->getId()) => $area];
+        while ($parent = $area->getTrailParent()) {
+            $trail[implode('_', (array) $parent->getId())] = $parent;
+            $area = $parent;
+        }
+        $trail['root'] = new MvvTreeRoot();
+        return array_reverse($trail, true);
+    }
+}
diff --git a/lib/classes/StudipMail.class.php b/lib/classes/StudipMail.class.php
deleted file mode 100644
index 4974f66..0000000
--- a/lib/classes/StudipMail.class.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
- * StudipMail.class.php
- *
- * class for constructing and sending emails in Stud.IP
- *
- *
- * @author  André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @version 1
- * @license GPL2 or any later version
- * @copyright 2009 authors
- */
-class StudipMail
-{
-    /**
-     * @var email_message_class
-     * @static
-     */
-    private static $transporter;
-
-    /**
-     * @var string
-     */
-    private $body_text;
-    /**
-     * @var string
-     */
-    private $body_html;
-    /**
-     * @var string
-     */
-    private $subject;
-    /**
-     * Array of all attachments, name ist key
-     * @var array
-     */
-    private $attachments = [];
-    /**
-     * Array of attachments that are related to the content
-     * @var array
-     */
-    private $related_attachments = [];
-    /**
-     * @var array
-     */
-    private $sender;
-    /**
-     * Array of all recipients, mail is key
-     * @var array
-     */
-    private $recipients = [];
-    /**
-     * @var array
-     */
-    private $reply_to;
-
-    /**
-     * Sets the default transporter used in StudipMail::send()
-     * @param email_message_class $transporter
-     * @return void
-     */
-    public static function setDefaultTransporter(email_message_class $transporter)
-    {
-        self::$transporter = $transporter;
-    }
-
-    /**
-     * gets the default transporter used in StudipMail::send()
-     *
-     * @return email_message_class
-     */
-    public static function getDefaultTransporter()
-    {
-        return self::$transporter;
-    }
-
-    /**
-     * Gets the configured abuse mail contact
-     *
-     * @return string
-     */
-    public static function getAbuseEmail()
-    {
-        return $GLOBALS['MAIL_ABUSE'] ?: "abuse@{$mail_localhost}";
-    }
-
-    /**
-     * convenience method for sending a qick, text based email message
-     *
-     * @param string $recipient
-     * @param string $subject
-     * @param string $text      Plain text version of the message (required).
-     * @param string $html      HTML version of the message (optional).
-     * @return bool
-     */
-    public static function sendMessage($recipient, $subject, $text, $html = null)
-    {
-        $mail = new StudipMail();
-        return $mail->setSubject($subject)
-                    ->addRecipient($recipient)
-                    ->setBodyText($text)
-                    ->setBodyHtml($html)
-                    ->send();
-    }
-
-    /**
-     * convenience method for sending a qick, text based email message
-     * to the configured abuse adress
-     *
-     * @param string $subject
-     * @param string $text
-     * @return bool
-     */
-    public static function sendAbuseMessage($subject, $text)
-    {
-        $mail = new StudipMail();
-        $abuse = self::getAbuseEmail();
-        return $mail->setSubject($subject)
-                    ->addRecipient($abuse)
-                    ->setBodyText($text)
-                    ->send();
-    }
-
-    /**
-     * sets some default values for sender and reply to from
-     * configuration settings.
-     *
-     */
-    public function __construct($data = null)
-    {
-        $mail_localhost = $GLOBALS['MAIL_LOCALHOST'] ?: $_SERVER['SERVER_NAME'];
-        $this->setSenderEmail($GLOBALS['MAIL_ENV_FROM'] ?: "wwwrun@{$mail_localhost}");
-        $this->setSenderName($GLOBALS['MAIL_FROM'] ?: 'Stud.IP - ' . Config::get()->UNI_NAME_CLEAN);
-
-        if ($data) {
-            $this->setData($data);
-        }
-    }
-
-    /**
-     * @param string $mail
-     * @return StudipMail provides fluent interface
-     */
-    public function setSenderEmail($mail)
-    {
-        $this->sender['mail'] = $mail;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSenderEmail()
-    {
-        return $this->sender['mail'];
-    }
-
-    /**
-     * @param string $name
-     * @return StudipMail provides fluent interface
-     */
-    public function setSenderName($name)
-    {
-        $this->sender['name'] = $name;
-        return $this;
-    }
-
-    /**
-     * @return unknown_type
-     */
-    public function getSenderName()
-    {
-        return $this->sender['name'];
-    }
-
-    /**
-     * @param $mail
-     * @return StudipMail provides fluent interface
-     */
-    public function setReplyToEmail($mail)
-    {
-        $this->reply_to['mail'] = $mail;
-        return $this;
-    }
-
-    /**
-     * @return unknown_type
-     */
-    public function getReplyToEmail()
-    {
-        return $this->reply_to['mail'] ?? '';
-    }
-
-    /**
-     * @param $name
-     * @return StudipMail provides fluent interface
-     */
-    public function setReplyToName($name)
-    {
-        $this->reply_to['name'] = $name;
-        return $this;
-    }
-
-    /**
-     * @return unknown_type
-     */
-    public function getReplyToName()
-    {
-        return $this->reply_to['name'] ?? '';
-    }
-
-    /**
-     * @param $subject
-     * @return StudipMail provides fluent interface
-     */
-    public function setSubject($subject)
-    {
-        $this->subject = $subject;
-        return $this;
-    }
-
-    /**
-     * @return unknown_type
-     */
-    public function getSubject()
-    {
-        return $this->subject;
-    }
-
-    /**
-     * @param $mail
-     * @param $name
-     * @param $type
-     * @return StudipMail provides fluent interface
-     */
-    public function addRecipient($mail, $name = '', $type = 'To')
-    {
-        $type = ucfirst($type);
-        $type = in_array($type, ['To', 'Cc', 'Bcc']) ? $type : 'To';
-        if (!isset($this->recipients[$mail]) || $this->recipients[$mail]['type'] !== 'To') {
-            $this->recipients[$mail] = compact('mail', 'name', 'type');
-        }
-        return $this;
-    }
-
-    /**
-     * @param $mail
-     * @return StudipMail provides fluent interface
-     */
-    public function removeRecipient($mail)
-    {
-        unset($this->recipients[$mail]);
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRecipients()
-    {
-        return $this->recipients;
-    }
-
-    /**
-     * @param $mail
-     * @return unknown_type
-     */
-    public function isRecipient($mail)
-    {
-        return isset($this->recipients[$mail]);
-    }
-
-    /**
-     * @param $file_name
-     * @param $name
-     * @param $type
-     * @param $disposition
-     * @return StudipMail provides fluent interface
-     */
-    public function addFileAttachment($file_name, $name = '', $type = 'automatic/name', $disposition = 'attachment')
-    {
-        $name = $name ?: basename($file_name);
-        $this->attachments[$name] = compact('file_name', 'name', 'type', 'disposition');
-        return $this;
-    }
-
-    /**
-     * @param $data
-     * @param $name
-     * @param $type
-     * @param $disposition
-     * @return StudipMail provides fluent interface
-     */
-    public function addDataAttachment($data, $name, $type = 'automatic/name', $disposition = 'attachment')
-    {
-        $this->attachments[$name] = compact('data', 'name', 'type', 'disposition');
-        return $this;
-    }
-
-    /**
-     * @param FileRef $file_ref The FileRef object of a file that shall be added to a mail
-     * @return StudipMail provides fluent interface
-     */
-    public function addStudipAttachment(FileRef $file_ref)
-    {
-        if (!$file_ref->isNew()) {
-            $this->addFileAttachment(
-                $file_ref->file->getPath(),
-                $file_ref->name
-            );
-        }
-        return $this;
-    }
-
-    public function addRelatedAttachment(string $file_name, string $name, string $type, string $content_id): void
-    {
-        $this->related_attachments[$name] = [
-            'FileName' => $file_name,
-            'Name' => $name,
-            'Content-Type' => $type,
-            'Disposition' => 'inline',
-            'Content-ID' => $content_id
-        ];
-    }
-
-    /**
-     * @param $name
-     * @return StudipMail provides fluent interface
-     */
-    public function removeAttachment($name)
-    {
-        unset($this->attachments[$name]);
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttachments()
-    {
-        return $this->attachments;
-    }
-
-    /**
-     * @param $name
-     * @return unknown_type
-     */
-    public function isAttachment($name)
-    {
-        return isset($this->attachments[$name]);
-    }
-
-    /**
-     * @param $body
-     * @return StudipMail provides fluent interface
-     */
-    public function setBodyText($body)
-    {
-        $this->body_text = $body;
-        return $this;
-    }
-
-    /**
-     * @return unknown_type
-     */
-    public function getBodyText()
-    {
-        return $this->body_text;
-    }
-
-    /**
-     * @param $body
-     * @return StudipMail provides fluent interface
-     */
-    public function setBodyHtml($body)
-    {
-        $this->body_html = $body;
-        return $this;
-    }
-
-    /**
-     * @return unknown_type
-     */
-    public function getBodyHtml()
-    {
-        return $this->body_html;
-    }
-
-    /**
-     * quotes the given string if it contains any characters
-     * reserved for special interpretation in RFC 2822.
-     */
-    protected static function quoteString($string)
-    {
-        // list of reserved characters in RFC 2822
-        if (strcspn($string, '()<>[]:;@\\,.') < mb_strlen($string)) {
-            $string = '"' . addcslashes($string, "\r\"\\") . '"';
-        }
-        return $string;
-    }
-
-    /**
-     * send the mail using the given transporter object, or the
-     * set default transporter
-     *
-     * @param email_message_class $transporter
-     * @return bool
-     */
-    public function send(email_message_class $transporter = null)
-    {
-        if ($transporter === null) {
-            $transporter = self::$transporter;
-        }
-        if ($transporter === null) {
-            throw new Exception('no mail transport defined');
-        }
-        $transporter->ResetMessage();
-        $transporter->SetHeader('Return-Path', $this->getSenderEmail());
-        $transporter->SetEncodedEmailHeader('From', $this->getSenderEmail(), self::quoteString($this->getSenderName()));
-        if($this->getReplyToEmail()){
-            $transporter->SetEncodedEmailHeader('Reply-To', $this->getReplyToEmail(), self::quoteString($this->getReplyToName()));
-        }
-        foreach($this->getRecipients() as $recipient) {
-            $recipients_by_type[$recipient['type']][$recipient['mail']] = self::quoteString($recipient['name']);
-        }
-        foreach($recipients_by_type as $type => $recipients){
-            $transporter->SetMultipleEncodedEmailHeader($type, $recipients);
-        }
-        $transporter->SetEncodedHeader('Subject', $this->getSubject());
-        if($this->getBodyHtml()) {
-            $html_part = 0;
-            $transporter->CreateQuotedPrintableHTMLPart($this->getBodyHtml(), "", $html_part);
-            $text_part = '';
-            $text_message = $this->getBodyText();
-
-            if(!$text_message){
-                $text_message = _('Diese Nachricht ist im HTML-Format verfasst. Sie benötigen eine E-Mail-Anwendung, die das HTML-Format anzeigen kann.');
-            }
-            $transporter->CreateQuotedPrintableTextPart($transporter->WrapText($text_message), "", $text_part);
-
-            $part = [$text_part, $html_part];
-            if (count($this->related_attachments) > 0) {
-                $relparts = [$html_part];
-                $i = 99;
-                $multipart = 0;
-                foreach ($this->related_attachments as $one) {
-                    $transporter->CreateFilePart($one, $i);
-                    $relparts[] = $i;
-                }
-                $transporter->CreateRelatedMultipart($relparts, $multipart);
-                $part = [$text_part, $multipart];
-            }
-            $transporter->AddAlternativeMultipart($part);
-        } else {
-            $transporter->AddQuotedPrintableTextPart($this->getBodyText());
-        }
-        foreach($this->getAttachments() as $attachment){
-            $part = [
-                'FileName'     => $attachment['file_name'],
-                'Data'         => $attachment['data'],
-                'Name'         => $attachment['name'],
-                'Content-Type' => $attachment['type'],
-                'Disposition'  => $attachment['disposition'],
-            ];
-            $transporter->addFilePart($part);
-        }
-        $error = $transporter->Send();
-        if (mb_strlen($error) === 0) {
-            return true;
-        } else {
-            Log::error(get_class($transporter) . '::Send() - ' . $error);
-            return false;
-        }
-    }
-
-    public function toArray()
-    {
-        return get_object_vars($this);
-    }
-
-    public function setData($data)
-    {
-        foreach ($data as $name => $value) {
-            $this->$name = $value;
-        }
-    }
-}
diff --git a/lib/classes/StudipMail.php b/lib/classes/StudipMail.php
new file mode 100644
index 0000000..4974f66
--- /dev/null
+++ b/lib/classes/StudipMail.php
@@ -0,0 +1,487 @@
+<?php
+/**
+ * StudipMail.class.php
+ *
+ * class for constructing and sending emails in Stud.IP
+ *
+ *
+ * @author  André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @version 1
+ * @license GPL2 or any later version
+ * @copyright 2009 authors
+ */
+class StudipMail
+{
+    /**
+     * @var email_message_class
+     * @static
+     */
+    private static $transporter;
+
+    /**
+     * @var string
+     */
+    private $body_text;
+    /**
+     * @var string
+     */
+    private $body_html;
+    /**
+     * @var string
+     */
+    private $subject;
+    /**
+     * Array of all attachments, name ist key
+     * @var array
+     */
+    private $attachments = [];
+    /**
+     * Array of attachments that are related to the content
+     * @var array
+     */
+    private $related_attachments = [];
+    /**
+     * @var array
+     */
+    private $sender;
+    /**
+     * Array of all recipients, mail is key
+     * @var array
+     */
+    private $recipients = [];
+    /**
+     * @var array
+     */
+    private $reply_to;
+
+    /**
+     * Sets the default transporter used in StudipMail::send()
+     * @param email_message_class $transporter
+     * @return void
+     */
+    public static function setDefaultTransporter(email_message_class $transporter)
+    {
+        self::$transporter = $transporter;
+    }
+
+    /**
+     * gets the default transporter used in StudipMail::send()
+     *
+     * @return email_message_class
+     */
+    public static function getDefaultTransporter()
+    {
+        return self::$transporter;
+    }
+
+    /**
+     * Gets the configured abuse mail contact
+     *
+     * @return string
+     */
+    public static function getAbuseEmail()
+    {
+        return $GLOBALS['MAIL_ABUSE'] ?: "abuse@{$mail_localhost}";
+    }
+
+    /**
+     * convenience method for sending a qick, text based email message
+     *
+     * @param string $recipient
+     * @param string $subject
+     * @param string $text      Plain text version of the message (required).
+     * @param string $html      HTML version of the message (optional).
+     * @return bool
+     */
+    public static function sendMessage($recipient, $subject, $text, $html = null)
+    {
+        $mail = new StudipMail();
+        return $mail->setSubject($subject)
+                    ->addRecipient($recipient)
+                    ->setBodyText($text)
+                    ->setBodyHtml($html)
+                    ->send();
+    }
+
+    /**
+     * convenience method for sending a qick, text based email message
+     * to the configured abuse adress
+     *
+     * @param string $subject
+     * @param string $text
+     * @return bool
+     */
+    public static function sendAbuseMessage($subject, $text)
+    {
+        $mail = new StudipMail();
+        $abuse = self::getAbuseEmail();
+        return $mail->setSubject($subject)
+                    ->addRecipient($abuse)
+                    ->setBodyText($text)
+                    ->send();
+    }
+
+    /**
+     * sets some default values for sender and reply to from
+     * configuration settings.
+     *
+     */
+    public function __construct($data = null)
+    {
+        $mail_localhost = $GLOBALS['MAIL_LOCALHOST'] ?: $_SERVER['SERVER_NAME'];
+        $this->setSenderEmail($GLOBALS['MAIL_ENV_FROM'] ?: "wwwrun@{$mail_localhost}");
+        $this->setSenderName($GLOBALS['MAIL_FROM'] ?: 'Stud.IP - ' . Config::get()->UNI_NAME_CLEAN);
+
+        if ($data) {
+            $this->setData($data);
+        }
+    }
+
+    /**
+     * @param string $mail
+     * @return StudipMail provides fluent interface
+     */
+    public function setSenderEmail($mail)
+    {
+        $this->sender['mail'] = $mail;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSenderEmail()
+    {
+        return $this->sender['mail'];
+    }
+
+    /**
+     * @param string $name
+     * @return StudipMail provides fluent interface
+     */
+    public function setSenderName($name)
+    {
+        $this->sender['name'] = $name;
+        return $this;
+    }
+
+    /**
+     * @return unknown_type
+     */
+    public function getSenderName()
+    {
+        return $this->sender['name'];
+    }
+
+    /**
+     * @param $mail
+     * @return StudipMail provides fluent interface
+     */
+    public function setReplyToEmail($mail)
+    {
+        $this->reply_to['mail'] = $mail;
+        return $this;
+    }
+
+    /**
+     * @return unknown_type
+     */
+    public function getReplyToEmail()
+    {
+        return $this->reply_to['mail'] ?? '';
+    }
+
+    /**
+     * @param $name
+     * @return StudipMail provides fluent interface
+     */
+    public function setReplyToName($name)
+    {
+        $this->reply_to['name'] = $name;
+        return $this;
+    }
+
+    /**
+     * @return unknown_type
+     */
+    public function getReplyToName()
+    {
+        return $this->reply_to['name'] ?? '';
+    }
+
+    /**
+     * @param $subject
+     * @return StudipMail provides fluent interface
+     */
+    public function setSubject($subject)
+    {
+        $this->subject = $subject;
+        return $this;
+    }
+
+    /**
+     * @return unknown_type
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
+    /**
+     * @param $mail
+     * @param $name
+     * @param $type
+     * @return StudipMail provides fluent interface
+     */
+    public function addRecipient($mail, $name = '', $type = 'To')
+    {
+        $type = ucfirst($type);
+        $type = in_array($type, ['To', 'Cc', 'Bcc']) ? $type : 'To';
+        if (!isset($this->recipients[$mail]) || $this->recipients[$mail]['type'] !== 'To') {
+            $this->recipients[$mail] = compact('mail', 'name', 'type');
+        }
+        return $this;
+    }
+
+    /**
+     * @param $mail
+     * @return StudipMail provides fluent interface
+     */
+    public function removeRecipient($mail)
+    {
+        unset($this->recipients[$mail]);
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRecipients()
+    {
+        return $this->recipients;
+    }
+
+    /**
+     * @param $mail
+     * @return unknown_type
+     */
+    public function isRecipient($mail)
+    {
+        return isset($this->recipients[$mail]);
+    }
+
+    /**
+     * @param $file_name
+     * @param $name
+     * @param $type
+     * @param $disposition
+     * @return StudipMail provides fluent interface
+     */
+    public function addFileAttachment($file_name, $name = '', $type = 'automatic/name', $disposition = 'attachment')
+    {
+        $name = $name ?: basename($file_name);
+        $this->attachments[$name] = compact('file_name', 'name', 'type', 'disposition');
+        return $this;
+    }
+
+    /**
+     * @param $data
+     * @param $name
+     * @param $type
+     * @param $disposition
+     * @return StudipMail provides fluent interface
+     */
+    public function addDataAttachment($data, $name, $type = 'automatic/name', $disposition = 'attachment')
+    {
+        $this->attachments[$name] = compact('data', 'name', 'type', 'disposition');
+        return $this;
+    }
+
+    /**
+     * @param FileRef $file_ref The FileRef object of a file that shall be added to a mail
+     * @return StudipMail provides fluent interface
+     */
+    public function addStudipAttachment(FileRef $file_ref)
+    {
+        if (!$file_ref->isNew()) {
+            $this->addFileAttachment(
+                $file_ref->file->getPath(),
+                $file_ref->name
+            );
+        }
+        return $this;
+    }
+
+    public function addRelatedAttachment(string $file_name, string $name, string $type, string $content_id): void
+    {
+        $this->related_attachments[$name] = [
+            'FileName' => $file_name,
+            'Name' => $name,
+            'Content-Type' => $type,
+            'Disposition' => 'inline',
+            'Content-ID' => $content_id
+        ];
+    }
+
+    /**
+     * @param $name
+     * @return StudipMail provides fluent interface
+     */
+    public function removeAttachment($name)
+    {
+        unset($this->attachments[$name]);
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachments;
+    }
+
+    /**
+     * @param $name
+     * @return unknown_type
+     */
+    public function isAttachment($name)
+    {
+        return isset($this->attachments[$name]);
+    }
+
+    /**
+     * @param $body
+     * @return StudipMail provides fluent interface
+     */
+    public function setBodyText($body)
+    {
+        $this->body_text = $body;
+        return $this;
+    }
+
+    /**
+     * @return unknown_type
+     */
+    public function getBodyText()
+    {
+        return $this->body_text;
+    }
+
+    /**
+     * @param $body
+     * @return StudipMail provides fluent interface
+     */
+    public function setBodyHtml($body)
+    {
+        $this->body_html = $body;
+        return $this;
+    }
+
+    /**
+     * @return unknown_type
+     */
+    public function getBodyHtml()
+    {
+        return $this->body_html;
+    }
+
+    /**
+     * quotes the given string if it contains any characters
+     * reserved for special interpretation in RFC 2822.
+     */
+    protected static function quoteString($string)
+    {
+        // list of reserved characters in RFC 2822
+        if (strcspn($string, '()<>[]:;@\\,.') < mb_strlen($string)) {
+            $string = '"' . addcslashes($string, "\r\"\\") . '"';
+        }
+        return $string;
+    }
+
+    /**
+     * send the mail using the given transporter object, or the
+     * set default transporter
+     *
+     * @param email_message_class $transporter
+     * @return bool
+     */
+    public function send(email_message_class $transporter = null)
+    {
+        if ($transporter === null) {
+            $transporter = self::$transporter;
+        }
+        if ($transporter === null) {
+            throw new Exception('no mail transport defined');
+        }
+        $transporter->ResetMessage();
+        $transporter->SetHeader('Return-Path', $this->getSenderEmail());
+        $transporter->SetEncodedEmailHeader('From', $this->getSenderEmail(), self::quoteString($this->getSenderName()));
+        if($this->getReplyToEmail()){
+            $transporter->SetEncodedEmailHeader('Reply-To', $this->getReplyToEmail(), self::quoteString($this->getReplyToName()));
+        }
+        foreach($this->getRecipients() as $recipient) {
+            $recipients_by_type[$recipient['type']][$recipient['mail']] = self::quoteString($recipient['name']);
+        }
+        foreach($recipients_by_type as $type => $recipients){
+            $transporter->SetMultipleEncodedEmailHeader($type, $recipients);
+        }
+        $transporter->SetEncodedHeader('Subject', $this->getSubject());
+        if($this->getBodyHtml()) {
+            $html_part = 0;
+            $transporter->CreateQuotedPrintableHTMLPart($this->getBodyHtml(), "", $html_part);
+            $text_part = '';
+            $text_message = $this->getBodyText();
+
+            if(!$text_message){
+                $text_message = _('Diese Nachricht ist im HTML-Format verfasst. Sie benötigen eine E-Mail-Anwendung, die das HTML-Format anzeigen kann.');
+            }
+            $transporter->CreateQuotedPrintableTextPart($transporter->WrapText($text_message), "", $text_part);
+
+            $part = [$text_part, $html_part];
+            if (count($this->related_attachments) > 0) {
+                $relparts = [$html_part];
+                $i = 99;
+                $multipart = 0;
+                foreach ($this->related_attachments as $one) {
+                    $transporter->CreateFilePart($one, $i);
+                    $relparts[] = $i;
+                }
+                $transporter->CreateRelatedMultipart($relparts, $multipart);
+                $part = [$text_part, $multipart];
+            }
+            $transporter->AddAlternativeMultipart($part);
+        } else {
+            $transporter->AddQuotedPrintableTextPart($this->getBodyText());
+        }
+        foreach($this->getAttachments() as $attachment){
+            $part = [
+                'FileName'     => $attachment['file_name'],
+                'Data'         => $attachment['data'],
+                'Name'         => $attachment['name'],
+                'Content-Type' => $attachment['type'],
+                'Disposition'  => $attachment['disposition'],
+            ];
+            $transporter->addFilePart($part);
+        }
+        $error = $transporter->Send();
+        if (mb_strlen($error) === 0) {
+            return true;
+        } else {
+            Log::error(get_class($transporter) . '::Send() - ' . $error);
+            return false;
+        }
+    }
+
+    public function toArray()
+    {
+        return get_object_vars($this);
+    }
+
+    public function setData($data)
+    {
+        foreach ($data as $name => $value) {
+            $this->$name = $value;
+        }
+    }
+}
diff --git a/lib/classes/StudipObject.class.php b/lib/classes/StudipObject.class.php
deleted file mode 100644
index 151fcdb..0000000
--- a/lib/classes/StudipObject.class.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-# Lifter002: TEST
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipObject.class.php
-//
-// Class to provide basic properties of an StudipObject in Stud.IP
-//
-// Copyright (c) 2003 Alexander Willner <mail@AlexanderWillner.de>
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-# Define all required constants ============================================= #
-/**
- * @const INSTANCEOF_STUDIPOBJECT Is instance of a studip object
- * @access public
- */
-define ("INSTANCEOF_STUDIPOBJECT", "StudipObject");
-# =========================================================================== #
-
-
-/**
- * StudipObject.class.php
- *
- * Class to provide basic properties of an StudipObject in Stud.IP
- *
- * @author      Alexander Willner <mail@alexanderwillner.de>
- * @copyright   2003 Stud.IP-Project
- * @access      public
- * @package     studip_core
- * @modulegroup core
- */
-class StudipObject extends AuthorObject {
-
-# Define all required variables ============================================= #
-  /**
-   * The unique ID
-   * @access   private
-   * @var      integer $id
-   */
-  var $objectID;
-
-  /**
-   * The unique ID of the author
-   * @access   private
-   * @var      string  $authorID
-   */
-  var $authorID;
-
-  /**
-   * The unique range ID
-   * @access   private
-   * @var      string  $rangeID
-   */
-  var $rangeID;
-# =========================================================================== #
-
-
-
-# Define constructor and destructor ========================================= #
-   /**
-    * Constructor
-    * @access   public
-    * @param    string   $objectID   The ID of an existing object
-    */
-   function __construct($objectID = "") {
-
-     /* For good OOP: Call constructor ------------------------------------- */
-     parent::__construct();
-     $this->instanceof = INSTANCEOF_STUDIPOBJECT;
-     /* -------------------------------------------------------------------- */
-
-     /* Set default values ------------------------------------------------- */
-     $this->objectID = $objectID;
-     $this->authorID = "";
-     $this->rangeID  = "";
-     /* -------------------------------------------------------------------- */
-   }
-# =========================================================================== #
-
-
-# Define public functions =================================================== #
-   /**
-    * Creates a new ID
-    * @access  public
-    * @return  string  The new ID
-    */
-   public static function createNewID () {
-     srand ((double) microtime () * 1000000);
-     return md5 (uniqid (rand ()));
-   }
-
-   /**
-    * Gets the objectID
-    * @access  public
-    * @return  string  The objectID
-    */
-   function getObjectID () {
-     return $this->objectID;
-   }
-
-   /**
-    * Sets the objectID
-    * @access  public
-    * @param   String  $objectID  The object ID
-    */
-   function setObjectID ($objectID) {
-     if (empty ($objectID))
-       $this->throwError (1, _("Die ObjectID darf nicht leer sein."));
-     else
-       $this->objectID = $objectID;
-   }
-
-   /**
-    * Gets the authorID
-    * @access  public
-    * @return  string  The authorID
-    */
-   function getAuthorID () {
-     return $this->authorID;
-   }
-
-   /**
-    * Gets the authorname
-    * @access  public
-    * @return  string  The authorID
-    */
-   function getAuthor () {
-     return get_username ($this->authorID);
-   }
-
-   /**
-    * Gets the full name of the author
-    * @access  public
-    * @return  string  The authorID
-    */
-   function getFullName () {
-     return get_fullname ($this->authorID);
-   }
-
-   /**
-    * Sets the authorID
-    * @access  public
-    * @param   String  $authorID  The author ID
-    */
-   function setAuthorID ($authorID) {
-     if (empty ($authorID))
-       $this->throwError (1, _("Die AuthorID darf nicht leer sein."));
-     else
-       $this->authorID = $authorID;
-   }
-
-   /**
-    * Gets the rangeID
-    * @access  public
-    * @return  string  The rangeID
-    */
-   function getRangeID () {
-     return $this->rangeID;
-   }
-
-   /**
-    * Sets the rangeID
-    * @access  public
-    * @param   String  $rangeID  The range ID
-    */
-   function setRangeID ($rangeID) {
-       $this->rangeID = $rangeID;
-   }
-# =========================================================================== #
-
-
-# Define static functions =================================================== #
-
-# =========================================================================== #
-
-
-# Define private functions ================================================== #
-
-# =========================================================================== #
-
-}
-?>
diff --git a/lib/classes/StudipObject.php b/lib/classes/StudipObject.php
new file mode 100644
index 0000000..151fcdb
--- /dev/null
+++ b/lib/classes/StudipObject.php
@@ -0,0 +1,199 @@
+<?php
+# Lifter002: TEST
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipObject.class.php
+//
+// Class to provide basic properties of an StudipObject in Stud.IP
+//
+// Copyright (c) 2003 Alexander Willner <mail@AlexanderWillner.de>
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+# Define all required constants ============================================= #
+/**
+ * @const INSTANCEOF_STUDIPOBJECT Is instance of a studip object
+ * @access public
+ */
+define ("INSTANCEOF_STUDIPOBJECT", "StudipObject");
+# =========================================================================== #
+
+
+/**
+ * StudipObject.class.php
+ *
+ * Class to provide basic properties of an StudipObject in Stud.IP
+ *
+ * @author      Alexander Willner <mail@alexanderwillner.de>
+ * @copyright   2003 Stud.IP-Project
+ * @access      public
+ * @package     studip_core
+ * @modulegroup core
+ */
+class StudipObject extends AuthorObject {
+
+# Define all required variables ============================================= #
+  /**
+   * The unique ID
+   * @access   private
+   * @var      integer $id
+   */
+  var $objectID;
+
+  /**
+   * The unique ID of the author
+   * @access   private
+   * @var      string  $authorID
+   */
+  var $authorID;
+
+  /**
+   * The unique range ID
+   * @access   private
+   * @var      string  $rangeID
+   */
+  var $rangeID;
+# =========================================================================== #
+
+
+
+# Define constructor and destructor ========================================= #
+   /**
+    * Constructor
+    * @access   public
+    * @param    string   $objectID   The ID of an existing object
+    */
+   function __construct($objectID = "") {
+
+     /* For good OOP: Call constructor ------------------------------------- */
+     parent::__construct();
+     $this->instanceof = INSTANCEOF_STUDIPOBJECT;
+     /* -------------------------------------------------------------------- */
+
+     /* Set default values ------------------------------------------------- */
+     $this->objectID = $objectID;
+     $this->authorID = "";
+     $this->rangeID  = "";
+     /* -------------------------------------------------------------------- */
+   }
+# =========================================================================== #
+
+
+# Define public functions =================================================== #
+   /**
+    * Creates a new ID
+    * @access  public
+    * @return  string  The new ID
+    */
+   public static function createNewID () {
+     srand ((double) microtime () * 1000000);
+     return md5 (uniqid (rand ()));
+   }
+
+   /**
+    * Gets the objectID
+    * @access  public
+    * @return  string  The objectID
+    */
+   function getObjectID () {
+     return $this->objectID;
+   }
+
+   /**
+    * Sets the objectID
+    * @access  public
+    * @param   String  $objectID  The object ID
+    */
+   function setObjectID ($objectID) {
+     if (empty ($objectID))
+       $this->throwError (1, _("Die ObjectID darf nicht leer sein."));
+     else
+       $this->objectID = $objectID;
+   }
+
+   /**
+    * Gets the authorID
+    * @access  public
+    * @return  string  The authorID
+    */
+   function getAuthorID () {
+     return $this->authorID;
+   }
+
+   /**
+    * Gets the authorname
+    * @access  public
+    * @return  string  The authorID
+    */
+   function getAuthor () {
+     return get_username ($this->authorID);
+   }
+
+   /**
+    * Gets the full name of the author
+    * @access  public
+    * @return  string  The authorID
+    */
+   function getFullName () {
+     return get_fullname ($this->authorID);
+   }
+
+   /**
+    * Sets the authorID
+    * @access  public
+    * @param   String  $authorID  The author ID
+    */
+   function setAuthorID ($authorID) {
+     if (empty ($authorID))
+       $this->throwError (1, _("Die AuthorID darf nicht leer sein."));
+     else
+       $this->authorID = $authorID;
+   }
+
+   /**
+    * Gets the rangeID
+    * @access  public
+    * @return  string  The rangeID
+    */
+   function getRangeID () {
+     return $this->rangeID;
+   }
+
+   /**
+    * Sets the rangeID
+    * @access  public
+    * @param   String  $rangeID  The range ID
+    */
+   function setRangeID ($rangeID) {
+       $this->rangeID = $rangeID;
+   }
+# =========================================================================== #
+
+
+# Define static functions =================================================== #
+
+# =========================================================================== #
+
+
+# Define private functions ================================================== #
+
+# =========================================================================== #
+
+}
+?>
diff --git a/lib/classes/StudipPDO.class.php b/lib/classes/StudipPDO.class.php
deleted file mode 100644
index 8a1422b..0000000
--- a/lib/classes/StudipPDO.class.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/**
- * StudipPDO.class.php - Stud.IP PDO class
- *
- * 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.
- *
- * @author      Elmar Ludwig
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This is a special variant of the standard PDO class that does
- * not allow multiple statement execution.
- */
-class StudipPDO extends PDO
-{
-    const PARAM_ARRAY  = 100;
-    const PARAM_COLUMN = 101;
-
-    // Counter for the queries sent to the database
-    public $query_count = 0;
-
-    /**
-     * Verifies that the given SQL query only contains a single statement.
-     *
-     * @param string    SQL statement to check
-     * @throws PDOException when the query contains multiple statements
-     */
-    protected function verify($statement)
-    {
-        if (mb_strpos($statement, ';') !== false) {
-            if (preg_match('/;\s*\S/', self::replaceStrings($statement))) {
-                throw new PDOException('multiple statement execution not allowed');
-            }
-        }
-
-        // Count executed queries (this is placed here since this is the only
-        // method that is executed on every call to the database)
-        $this->query_count += 1;
-    }
-
-    /**
-     * Replaces all string literals in the statement with placeholders.
-     *
-     * @param string    SQL statement
-     * @return string   modified SQL statement
-     */
-    protected static function replaceStrings($statement)
-    {
-        $count = mb_substr_count($statement, '"') + mb_substr_count($statement, "'") + mb_substr_count($statement, '\\');
-
-        // use fast preg_replace() variant if possible
-        if ($count < 1000) {
-            $result = preg_replace('/"(""|\\\\.|[^\\\\"]+)*"|\'(\'\'|\\\\.|[^\\\\\']+)*\'/s', '?', $statement);
-        }
-
-        if (!isset($result)) {
-            // split string into parts at quotes and backslash
-            $parts = preg_split('/([\\\\"\'])/', $statement, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-            $result = '';
-            $quote_chr = null;
-
-            for ($part = current($parts); $part !== false; $part = next($parts)) {
-                // inside quotes, "" is ", '' is ' and \x is x
-                if ($quote_chr !== NULL) {
-                    if ($part === $quote_chr) {
-                        $part = next($parts);
-
-                        if ($part !== $quote_chr) {
-                            // backtrack and terminate string
-                            prev($parts);
-                            $result .= '?';
-                            $quote_chr = NULL;
-                        }
-                    } else if ($part === '\\') {
-                        // skip next part
-                        next($parts);
-                    }
-                } else if ($part === "'" || $part === '"') {
-                    $quote_chr = $part;
-                    $saved_pos = key($parts);
-                } else {
-                    $result .= $part;
-                }
-            }
-
-            if ($quote_chr !== NULL) {
-                // unterminated quote: copy to end of string
-                $result .= implode(array_slice($parts, $saved_pos));
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Quotes the given value in a form appropriate for the type.
-     * If no explicit type is given, the value's PHP type is used.
-     *
-     * @param mixed $string PHP value to quote
-     * @param ?int $type parameter type (e.g. PDO::PARAM_STR)
-     * @return string|false quoted SQL string
-     */
-    public function quote($string, $type = null): false|string
-    {
-        if (!isset($type)) {
-            if (is_null($string)) {
-                $type = PDO::PARAM_NULL;
-            } else if (is_bool($string)) {
-                $type = PDO::PARAM_BOOL;
-            } else if (is_int($string)) {
-                $type = PDO::PARAM_INT;
-            } else if (is_array($string)) {
-                $type = StudipPDO::PARAM_ARRAY;
-            } else {
-                $type = PDO::PARAM_STR;
-            }
-        }
-
-        switch ($type) {
-            case PDO::PARAM_NULL:
-                return 'NULL';
-            case PDO::PARAM_BOOL:
-                return $string ? '1' : '0';
-            case PDO::PARAM_INT:
-                return (int) $string;
-            case StudipPDO::PARAM_ARRAY:
-                return is_array($string) && count($string) ? join(',', array_map([$this, 'quote'], $string)) : 'NULL';
-            case StudipPDO::PARAM_COLUMN:
-                return preg_replace('/\\W/', '', $string);
-            default:
-                return parent::quote($string);
-        }
-    }
-
-    /**
-     * Executes an SQL statement and returns the number of affected rows.
-     *
-     * @param string $statement SQL statement
-     */
-    public function exec(string $statement): false|int
-    {
-        $this->verify($statement);
-        return parent::exec($statement);
-    }
-
-    /**
-     * Executes an SQL statement, returning a result set as a statement object.
-     *
-     * @param string    $statement  SQL statement
-     * @param int       $fetch_mode fetch mode (optional)
-     * @param mixed  ...$fetch_args fetch mode parameters (see PDOStatement::setFetchMode)
-     * @return object   PDOStatement object
-     */
-    #[ReturnTypeWillChange]
-    public function query($statement, $fetch_mode = NULL, ...$fetch_args)
-    {
-        $this->verify($statement);
-
-        if (isset($fetch_mode)) {
-            $stmt = parent::query($statement, $fetch_mode, ...$fetch_args);
-        } else {
-            $stmt = parent::query($statement);
-        }
-
-        $studip_stmt = new StudipPDOStatement($this, $statement, []);
-        $studip_stmt->setStatement($stmt);
-        return $studip_stmt;
-    }
-
-    /**
-     * Prepares a statement for execution and returns a statement object.
-     *
-     * @param string $statement SQL statement
-     * @param array  $driver_options
-     *
-     * @return StudipPDOStatement
-     */
-    #[ReturnTypeWillChange]
-    public function prepare($statement, $driver_options = [])
-    {
-        $this->verify($statement);
-        return new StudipPDOStatement($this, $statement, $driver_options);
-    }
-
-    /**
-     * This method is intended only for use by the StudipPDOStatement class.
-     *
-     * @param string    SQL statement
-     * @return object   PDOStatement object
-     */
-    public function prepareStatement($statement, $driver_options = [])
-    {
-        return parent::prepare($statement, $driver_options);
-    }
-
-    /**
-     * Executes sql statement with given parameters,
-     * returns number of affected rows, use only for INSERT,UPDATE etc
-     *
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @return integer number of affected rows
-     */
-    public function execute($statement, $input_parameters = null)
-    {
-        $st = $this->prepare($statement);
-        $ok = $st->execute($input_parameters);
-        if ($ok === true) {
-            return $st->rowCount();
-        }
-        return 0;
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch results
-     * as sequential array, each row as associative array
-     * optionally apply given callable on each row, with current row and key as parameter
-     *
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @param callable $callable callable to be applied to each of the rows
-     * @return array result set as array of assoc arrays
-     */
-    public function fetchAll($statement, $input_parameters = null, $callable = null)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        if (is_callable($callable)) {
-            $data = [];
-            $st->setFetchMode(PDO::FETCH_ASSOC);
-            foreach ($st as $key => $row) {
-                $data[$key] = call_user_func($callable, $row, $key);
-            }
-        } else {
-            $data = $st->fetchAll(PDO::FETCH_ASSOC);
-        }
-        return $data;
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch only
-     * the values from first column as sequential array
-     * optionally apply given callable on each row, with current value and key as parameter
-     *
-     * @see StudipPDOStatement::fetchFirst()
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @param callable $callable callable to be applied to each of the rows
-     * @return array result set
-     */
-    public function fetchFirst($statement, $input_parameters = null, $callable = null)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        $data = $st->fetchFirst();
-        if (is_callable($callable)) {
-            foreach ($data as $key => $row) {
-                $data[$key] = call_user_func($callable, $row, $key);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch results
-     * as associative array, first columns value is used as a key, the others are grouped
-     * optionally apply given callable on each grouped row, with current row and key as parameter
-     * if no callable is given, 'current' is used, to return the first entry of the grouped row
-     *
-     * @see StudipPDOStatement::fetchGrouped()
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @param callable $callable callable to be applied to each of the rows
-     * @return array result set
-     */
-    public function fetchGrouped($statement, $input_parameters = null, $callable = null)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        $data = $st->fetchGrouped(PDO::FETCH_ASSOC, is_null($callable) ? 'current' : null);
-        if (is_callable($callable)) {
-            foreach ($data as $key => $row) {
-                $data[$key] = call_user_func($callable, $row, $key);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch results
-     * as associative array, first columns value is used as a key, the other one is grouped
-     * use only when selecting 2 columns
-     * optionally apply given callable on each grouped row, with current row and key as parameter
-     *
-     * @see StudipPDOStatement::fetchGroupedPairs()
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @param callable $callable callable to be applied to each of the rows
-     * @return array result set
-     */
-    public function fetchGroupedPairs($statement, $input_parameters = null, $callable = null)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        $data = $st->fetchGroupedPairs();
-        if (is_callable($callable)) {
-            foreach ($data as $key => $row) {
-                $data[$key] = call_user_func($callable, $row, $key);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch results
-     * as associative array, first columns value is used as a key, the other one as the value
-     * use only when selecting 2 columns
-     * optionally apply given callable on each grouped row, with current row and key as parameter
-     *
-     * @see StudipPDOStatement::fetchGroupedPairs()
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @param callable $callable callable to be applied to each of the rows
-     * @return array result set
-     */
-    public function fetchPairs($statement, $input_parameters = null, $callable = null)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        $data = $st->fetchPairs();
-        if (is_callable($callable)) {
-            foreach ($data as $key => $row) {
-                $data[$key] = call_user_func($callable, $row, $key);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch only the first row
-     * as associative array
-     *
-     * @see StudipPDOStatement::fetchOne()
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @return array first row of result set
-     */
-    public function fetchOne($statement, $input_parameters = null)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        return $st->fetchOne();
-    }
-
-    /**
-     * Executes sql statement with given parameters, and fetch only the value of one column
-     * third param denotes the column, zero indexed
-     *
-     * @param string $statement SQL statement to execute
-     * @param array $input_parameters parameters for statement
-     * @param integer $column number of column to fetch
-     * @return string value of chosen column
-     */
-    public function fetchColumn($statement, $input_parameters = null, $column = 0)
-    {
-        $st = $this->prepare($statement);
-        $st->execute($input_parameters);
-        return $st->fetchColumn($column);
-    }
-
-    /**
-     * Determine if the connected database is a MariaDB database.
-     *
-     * @return bool
-     */
-    public function isMariaDB(): bool
-    {
-        return stripos($this->getAttribute(\PDO::ATTR_SERVER_VERSION), 'MariaDB') !== false;
-    }
-}
diff --git a/lib/classes/StudipPDO.php b/lib/classes/StudipPDO.php
new file mode 100644
index 0000000..8a1422b
--- /dev/null
+++ b/lib/classes/StudipPDO.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * StudipPDO.class.php - Stud.IP PDO class
+ *
+ * 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.
+ *
+ * @author      Elmar Ludwig
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This is a special variant of the standard PDO class that does
+ * not allow multiple statement execution.
+ */
+class StudipPDO extends PDO
+{
+    const PARAM_ARRAY  = 100;
+    const PARAM_COLUMN = 101;
+
+    // Counter for the queries sent to the database
+    public $query_count = 0;
+
+    /**
+     * Verifies that the given SQL query only contains a single statement.
+     *
+     * @param string    SQL statement to check
+     * @throws PDOException when the query contains multiple statements
+     */
+    protected function verify($statement)
+    {
+        if (mb_strpos($statement, ';') !== false) {
+            if (preg_match('/;\s*\S/', self::replaceStrings($statement))) {
+                throw new PDOException('multiple statement execution not allowed');
+            }
+        }
+
+        // Count executed queries (this is placed here since this is the only
+        // method that is executed on every call to the database)
+        $this->query_count += 1;
+    }
+
+    /**
+     * Replaces all string literals in the statement with placeholders.
+     *
+     * @param string    SQL statement
+     * @return string   modified SQL statement
+     */
+    protected static function replaceStrings($statement)
+    {
+        $count = mb_substr_count($statement, '"') + mb_substr_count($statement, "'") + mb_substr_count($statement, '\\');
+
+        // use fast preg_replace() variant if possible
+        if ($count < 1000) {
+            $result = preg_replace('/"(""|\\\\.|[^\\\\"]+)*"|\'(\'\'|\\\\.|[^\\\\\']+)*\'/s', '?', $statement);
+        }
+
+        if (!isset($result)) {
+            // split string into parts at quotes and backslash
+            $parts = preg_split('/([\\\\"\'])/', $statement, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+            $result = '';
+            $quote_chr = null;
+
+            for ($part = current($parts); $part !== false; $part = next($parts)) {
+                // inside quotes, "" is ", '' is ' and \x is x
+                if ($quote_chr !== NULL) {
+                    if ($part === $quote_chr) {
+                        $part = next($parts);
+
+                        if ($part !== $quote_chr) {
+                            // backtrack and terminate string
+                            prev($parts);
+                            $result .= '?';
+                            $quote_chr = NULL;
+                        }
+                    } else if ($part === '\\') {
+                        // skip next part
+                        next($parts);
+                    }
+                } else if ($part === "'" || $part === '"') {
+                    $quote_chr = $part;
+                    $saved_pos = key($parts);
+                } else {
+                    $result .= $part;
+                }
+            }
+
+            if ($quote_chr !== NULL) {
+                // unterminated quote: copy to end of string
+                $result .= implode(array_slice($parts, $saved_pos));
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Quotes the given value in a form appropriate for the type.
+     * If no explicit type is given, the value's PHP type is used.
+     *
+     * @param mixed $string PHP value to quote
+     * @param ?int $type parameter type (e.g. PDO::PARAM_STR)
+     * @return string|false quoted SQL string
+     */
+    public function quote($string, $type = null): false|string
+    {
+        if (!isset($type)) {
+            if (is_null($string)) {
+                $type = PDO::PARAM_NULL;
+            } else if (is_bool($string)) {
+                $type = PDO::PARAM_BOOL;
+            } else if (is_int($string)) {
+                $type = PDO::PARAM_INT;
+            } else if (is_array($string)) {
+                $type = StudipPDO::PARAM_ARRAY;
+            } else {
+                $type = PDO::PARAM_STR;
+            }
+        }
+
+        switch ($type) {
+            case PDO::PARAM_NULL:
+                return 'NULL';
+            case PDO::PARAM_BOOL:
+                return $string ? '1' : '0';
+            case PDO::PARAM_INT:
+                return (int) $string;
+            case StudipPDO::PARAM_ARRAY:
+                return is_array($string) && count($string) ? join(',', array_map([$this, 'quote'], $string)) : 'NULL';
+            case StudipPDO::PARAM_COLUMN:
+                return preg_replace('/\\W/', '', $string);
+            default:
+                return parent::quote($string);
+        }
+    }
+
+    /**
+     * Executes an SQL statement and returns the number of affected rows.
+     *
+     * @param string $statement SQL statement
+     */
+    public function exec(string $statement): false|int
+    {
+        $this->verify($statement);
+        return parent::exec($statement);
+    }
+
+    /**
+     * Executes an SQL statement, returning a result set as a statement object.
+     *
+     * @param string    $statement  SQL statement
+     * @param int       $fetch_mode fetch mode (optional)
+     * @param mixed  ...$fetch_args fetch mode parameters (see PDOStatement::setFetchMode)
+     * @return object   PDOStatement object
+     */
+    #[ReturnTypeWillChange]
+    public function query($statement, $fetch_mode = NULL, ...$fetch_args)
+    {
+        $this->verify($statement);
+
+        if (isset($fetch_mode)) {
+            $stmt = parent::query($statement, $fetch_mode, ...$fetch_args);
+        } else {
+            $stmt = parent::query($statement);
+        }
+
+        $studip_stmt = new StudipPDOStatement($this, $statement, []);
+        $studip_stmt->setStatement($stmt);
+        return $studip_stmt;
+    }
+
+    /**
+     * Prepares a statement for execution and returns a statement object.
+     *
+     * @param string $statement SQL statement
+     * @param array  $driver_options
+     *
+     * @return StudipPDOStatement
+     */
+    #[ReturnTypeWillChange]
+    public function prepare($statement, $driver_options = [])
+    {
+        $this->verify($statement);
+        return new StudipPDOStatement($this, $statement, $driver_options);
+    }
+
+    /**
+     * This method is intended only for use by the StudipPDOStatement class.
+     *
+     * @param string    SQL statement
+     * @return object   PDOStatement object
+     */
+    public function prepareStatement($statement, $driver_options = [])
+    {
+        return parent::prepare($statement, $driver_options);
+    }
+
+    /**
+     * Executes sql statement with given parameters,
+     * returns number of affected rows, use only for INSERT,UPDATE etc
+     *
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @return integer number of affected rows
+     */
+    public function execute($statement, $input_parameters = null)
+    {
+        $st = $this->prepare($statement);
+        $ok = $st->execute($input_parameters);
+        if ($ok === true) {
+            return $st->rowCount();
+        }
+        return 0;
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch results
+     * as sequential array, each row as associative array
+     * optionally apply given callable on each row, with current row and key as parameter
+     *
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @param callable $callable callable to be applied to each of the rows
+     * @return array result set as array of assoc arrays
+     */
+    public function fetchAll($statement, $input_parameters = null, $callable = null)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        if (is_callable($callable)) {
+            $data = [];
+            $st->setFetchMode(PDO::FETCH_ASSOC);
+            foreach ($st as $key => $row) {
+                $data[$key] = call_user_func($callable, $row, $key);
+            }
+        } else {
+            $data = $st->fetchAll(PDO::FETCH_ASSOC);
+        }
+        return $data;
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch only
+     * the values from first column as sequential array
+     * optionally apply given callable on each row, with current value and key as parameter
+     *
+     * @see StudipPDOStatement::fetchFirst()
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @param callable $callable callable to be applied to each of the rows
+     * @return array result set
+     */
+    public function fetchFirst($statement, $input_parameters = null, $callable = null)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        $data = $st->fetchFirst();
+        if (is_callable($callable)) {
+            foreach ($data as $key => $row) {
+                $data[$key] = call_user_func($callable, $row, $key);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch results
+     * as associative array, first columns value is used as a key, the others are grouped
+     * optionally apply given callable on each grouped row, with current row and key as parameter
+     * if no callable is given, 'current' is used, to return the first entry of the grouped row
+     *
+     * @see StudipPDOStatement::fetchGrouped()
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @param callable $callable callable to be applied to each of the rows
+     * @return array result set
+     */
+    public function fetchGrouped($statement, $input_parameters = null, $callable = null)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        $data = $st->fetchGrouped(PDO::FETCH_ASSOC, is_null($callable) ? 'current' : null);
+        if (is_callable($callable)) {
+            foreach ($data as $key => $row) {
+                $data[$key] = call_user_func($callable, $row, $key);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch results
+     * as associative array, first columns value is used as a key, the other one is grouped
+     * use only when selecting 2 columns
+     * optionally apply given callable on each grouped row, with current row and key as parameter
+     *
+     * @see StudipPDOStatement::fetchGroupedPairs()
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @param callable $callable callable to be applied to each of the rows
+     * @return array result set
+     */
+    public function fetchGroupedPairs($statement, $input_parameters = null, $callable = null)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        $data = $st->fetchGroupedPairs();
+        if (is_callable($callable)) {
+            foreach ($data as $key => $row) {
+                $data[$key] = call_user_func($callable, $row, $key);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch results
+     * as associative array, first columns value is used as a key, the other one as the value
+     * use only when selecting 2 columns
+     * optionally apply given callable on each grouped row, with current row and key as parameter
+     *
+     * @see StudipPDOStatement::fetchGroupedPairs()
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @param callable $callable callable to be applied to each of the rows
+     * @return array result set
+     */
+    public function fetchPairs($statement, $input_parameters = null, $callable = null)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        $data = $st->fetchPairs();
+        if (is_callable($callable)) {
+            foreach ($data as $key => $row) {
+                $data[$key] = call_user_func($callable, $row, $key);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch only the first row
+     * as associative array
+     *
+     * @see StudipPDOStatement::fetchOne()
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @return array first row of result set
+     */
+    public function fetchOne($statement, $input_parameters = null)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        return $st->fetchOne();
+    }
+
+    /**
+     * Executes sql statement with given parameters, and fetch only the value of one column
+     * third param denotes the column, zero indexed
+     *
+     * @param string $statement SQL statement to execute
+     * @param array $input_parameters parameters for statement
+     * @param integer $column number of column to fetch
+     * @return string value of chosen column
+     */
+    public function fetchColumn($statement, $input_parameters = null, $column = 0)
+    {
+        $st = $this->prepare($statement);
+        $st->execute($input_parameters);
+        return $st->fetchColumn($column);
+    }
+
+    /**
+     * Determine if the connected database is a MariaDB database.
+     *
+     * @return bool
+     */
+    public function isMariaDB(): bool
+    {
+        return stripos($this->getAttribute(\PDO::ATTR_SERVER_VERSION), 'MariaDB') !== false;
+    }
+}
diff --git a/lib/classes/StudipRangeTree.class.php b/lib/classes/StudipRangeTree.class.php
deleted file mode 100644
index cf88d23..0000000
--- a/lib/classes/StudipRangeTree.class.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipRangeTree.class.php
-// Class to handle structure of the "range tree"
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* class to handle the "range tree"
-*
-* This class provides an interface to the structure of the "range tree"
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipRangeTree extends TreeAbstract
-{
-    var $sem_number;
-    var $sem_status;
-    var $sem_dates;
-    var $studip_objects = [];
-    var $visible_only;
-    var $entries_init_done = false;
-
-    /**
-    * constructor
-    *
-    * do not use directly, call TreeAbstract::GetInstance("StudipRangeTree")
-    * @access private
-    */
-    function __construct($args) {
-        DbView::addView('range_tree');
-
-        $this->root_name = Config::get()->UNI_NAME_CLEAN;
-        $this->studip_objects['inst'] = ['pk' => 'Institut_id', 'table' => 'Institute'];
-        $this->studip_objects['fak'] = ['pk' => 'Institut_id', 'table' => 'Institute'];
-        if (isset($args['sem_number']) ){
-            $this->sem_number = array_map('intval', $args['sem_number']);
-        }
-        if (isset($args['sem_status']) ){
-            $this->sem_status = array_map('intval', $args['sem_status']);
-        }
-        $this->visible_only = (int)($args['visible_only'] ?? 0);
-        parent::__construct(); //calling the baseclass constructor
-        $this->sem_dates = Semester::findAllVisible();
-    }
-
-    /**
-    * initializes the tree
-    *
-    * stores all rows from table range_tree in array $tree_data
-    * @access public
-    */
-    function init(){
-        parent::init();
-        $this->tree_data['root']['studip_object_id'] = 'root';
-        $db = $this->view->get_query("view:TREE_GET_DATA");
-        while ($db->next_record()){
-            $item_name = $db->f("name");
-            if ($db->f("studip_object")){
-                $item_name = $db->f("studip_object_name");
-            }
-            $this->tree_data[$db->f("item_id")] = ["studip_object" => $db->f("studip_object"),
-                                                    "studip_object_id" => $db->f("studip_object_id"),
-                                                    "fakultaets_id" => $db->f("fakultaets_id"),"entries" => 0];
-            $this->storeItem($db->f("item_id"), $db->f("parent_id"), $item_name, $db->f("priority"));
-        }
-    }
-
-    function initEntries(){
-        $this->view->params[0] = (isset($this->sem_status)) ? " AND d.status IN('" . join("','", $this->sem_status) . "')" : " ";
-        $this->view->params[0] .= $this->visible_only ? " AND visible=1 " : "";
-        $this->view->params[1] = (isset($this->sem_number)) ? " WHERE ((" . $this->view->sem_number_sql
-                                . ") IN (" . join(",",$this->sem_number) .") OR ((" . $this->view->sem_number_sql
-                                .") <= " . $this->sem_number[count($this->sem_number)-1]
-                                . "  AND ((" . $this->view->sem_number_end_sql . ") >= " . $this->sem_number[count($this->sem_number)-1]
-                                . " OR (" . $this->view->sem_number_end_sql  . ") = -1))) " : "";
-
-        $db = $this->view->get_query("view:TREE_GET_SEM_ENTRIES");
-        while ($db->next_record()){
-            $this->tree_data[$db->f("item_id")]['entries'] = $db->f('entries');
-        }
-        $this->entries_init_done = true;
-    }
-
-    /**
-    * Returns Stud.IP range_id of the next "real" object
-    *
-    * This function finds the next item wich is a real Stud.IP Object, either an "Einrichtung" or a "Fakultaet"<br>
-    * useful for the user rights management
-    * @access   public
-    * @param    string  $item_id
-    * @return  bool|array   of primary keys from table "institute"
-    */
-    function getAdminRange($item_id) {
-        if (empty($this->tree_data[$item_id])) {
-            return false;
-        }
-
-        $found = false;
-        $ret = false;
-        $next_link = $item_id;
-
-        while(($next_link = $this->getNextLink($next_link)) != 'root') {
-            if ($this->tree_data[$next_link]['studip_object'] == 'inst') {
-                $found[] = $next_link;
-            }
-
-            if ($this->tree_data[$next_link]['studip_object'] == 'fak') {
-                if (is_array($found) && count($found)) {
-                    foreach($found as $f) {
-                        if ($this->tree_data[$f]['fakultaets_id'] == $this->tree_data[$next_link]['studip_object_id']) {
-                            $ret[] = $this->tree_data[$f]['studip_object_id'];
-                        }
-                    }
-
-                    $ret[] = $this->tree_data[$next_link]['studip_object_id'];
-                } else {
-                    $ret[] = $this->tree_data[$next_link]['studip_object_id'];
-                }
-                break;
-            }
-            $next_link = $this->tree_data[$next_link]['parent_id'];
-        }
-
-        if (!$ret){
-            $ret[] = $next_link;
-        }
-
-        return $ret;
-    }
-    /**
-    * returns the next item_id upwards the tree which is a Stud.IP object
-    *
-    * help function for getAdminRange()
-    *
-    * @access   private
-    * @param    string  $item_id
-    * @return   string
-    */
-
-    function getNextLink($item_id){
-    if (!$this->tree_data[$item_id])
-            return false;
-        $ret_id = $item_id;
-        while (!$this->tree_data[$ret_id]['studip_object_id']){
-            $ret_id = $this->tree_data[$ret_id]['parent_id'];
-        }
-        return $ret_id;
-    }
-
-    function getSemIds($item_id,$ids_from_kids = false){
-        if (!$this->tree_data[$item_id])
-            return false;
-        if ($ids_from_kids){
-            $this->view->params[0] = $this->getKidsKids($item_id);
-        }
-        $this->view->params[0][] = $item_id;
-        $this->view->params[1] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : " ";
-        $ret = false;
-        $rs = $this->view->get_query("view:RANGE_TREE_GET_SEMIDS");
-        while($rs->next_record()){
-            $ret[] = $rs->f(0);
-        }
-        return $ret;
-    }
-
-    function getNumEntries($item_id, $num_entries_from_kids = false){
-        if (!$this->tree_data[$item_id])
-            return false;
-        if (!$this->entries_init_done) $this->initEntries();
-
-        return parent::getNumEntries($item_id, $num_entries_from_kids);
-    }
-
-    function InsertItem($item_id, $parent_id, $item_name, $priority,$studip_object,$studip_object_id){
-        $view = new DbView();
-        $view->params = [$item_id,$parent_id,$item_name,$priority,$studip_object,$studip_object_id];
-        $rs = $view->get_query("view:TREE_INS_ITEM");
-        return $rs->affected_rows();
-    }
-
-    function UpdateItem($item_name,$studip_object,$studip_object_id,$item_id){
-        $view = new DbView();
-        $view->params = [$item_name,$studip_object,$studip_object_id,$item_id];
-        $rs = $view->get_query("view:TREE_UPD_ITEM");
-        return $rs->affected_rows();
-    }
-
-    function DeleteItems($items_to_delete){
-        $view = new DbView();
-        $view->params[0] = (is_array($items_to_delete)) ? $items_to_delete : [$items_to_delete];
-        $view->auto_free_params = false;
-        $rs = $view->get_query("view:TREE_DEL_ITEM");
-        $deleted['items'] = $rs->affected_rows();
-        $rs = $view->get_query("view:CAT_DEL_RANGE");
-        $deleted['categories'] = $rs->affected_rows();
-        return $deleted;
-    }
-}
-?>
diff --git a/lib/classes/StudipRangeTree.php b/lib/classes/StudipRangeTree.php
new file mode 100644
index 0000000..cf88d23
--- /dev/null
+++ b/lib/classes/StudipRangeTree.php
@@ -0,0 +1,222 @@
+<?
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipRangeTree.class.php
+// Class to handle structure of the "range tree"
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* class to handle the "range tree"
+*
+* This class provides an interface to the structure of the "range tree"
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipRangeTree extends TreeAbstract
+{
+    var $sem_number;
+    var $sem_status;
+    var $sem_dates;
+    var $studip_objects = [];
+    var $visible_only;
+    var $entries_init_done = false;
+
+    /**
+    * constructor
+    *
+    * do not use directly, call TreeAbstract::GetInstance("StudipRangeTree")
+    * @access private
+    */
+    function __construct($args) {
+        DbView::addView('range_tree');
+
+        $this->root_name = Config::get()->UNI_NAME_CLEAN;
+        $this->studip_objects['inst'] = ['pk' => 'Institut_id', 'table' => 'Institute'];
+        $this->studip_objects['fak'] = ['pk' => 'Institut_id', 'table' => 'Institute'];
+        if (isset($args['sem_number']) ){
+            $this->sem_number = array_map('intval', $args['sem_number']);
+        }
+        if (isset($args['sem_status']) ){
+            $this->sem_status = array_map('intval', $args['sem_status']);
+        }
+        $this->visible_only = (int)($args['visible_only'] ?? 0);
+        parent::__construct(); //calling the baseclass constructor
+        $this->sem_dates = Semester::findAllVisible();
+    }
+
+    /**
+    * initializes the tree
+    *
+    * stores all rows from table range_tree in array $tree_data
+    * @access public
+    */
+    function init(){
+        parent::init();
+        $this->tree_data['root']['studip_object_id'] = 'root';
+        $db = $this->view->get_query("view:TREE_GET_DATA");
+        while ($db->next_record()){
+            $item_name = $db->f("name");
+            if ($db->f("studip_object")){
+                $item_name = $db->f("studip_object_name");
+            }
+            $this->tree_data[$db->f("item_id")] = ["studip_object" => $db->f("studip_object"),
+                                                    "studip_object_id" => $db->f("studip_object_id"),
+                                                    "fakultaets_id" => $db->f("fakultaets_id"),"entries" => 0];
+            $this->storeItem($db->f("item_id"), $db->f("parent_id"), $item_name, $db->f("priority"));
+        }
+    }
+
+    function initEntries(){
+        $this->view->params[0] = (isset($this->sem_status)) ? " AND d.status IN('" . join("','", $this->sem_status) . "')" : " ";
+        $this->view->params[0] .= $this->visible_only ? " AND visible=1 " : "";
+        $this->view->params[1] = (isset($this->sem_number)) ? " WHERE ((" . $this->view->sem_number_sql
+                                . ") IN (" . join(",",$this->sem_number) .") OR ((" . $this->view->sem_number_sql
+                                .") <= " . $this->sem_number[count($this->sem_number)-1]
+                                . "  AND ((" . $this->view->sem_number_end_sql . ") >= " . $this->sem_number[count($this->sem_number)-1]
+                                . " OR (" . $this->view->sem_number_end_sql  . ") = -1))) " : "";
+
+        $db = $this->view->get_query("view:TREE_GET_SEM_ENTRIES");
+        while ($db->next_record()){
+            $this->tree_data[$db->f("item_id")]['entries'] = $db->f('entries');
+        }
+        $this->entries_init_done = true;
+    }
+
+    /**
+    * Returns Stud.IP range_id of the next "real" object
+    *
+    * This function finds the next item wich is a real Stud.IP Object, either an "Einrichtung" or a "Fakultaet"<br>
+    * useful for the user rights management
+    * @access   public
+    * @param    string  $item_id
+    * @return  bool|array   of primary keys from table "institute"
+    */
+    function getAdminRange($item_id) {
+        if (empty($this->tree_data[$item_id])) {
+            return false;
+        }
+
+        $found = false;
+        $ret = false;
+        $next_link = $item_id;
+
+        while(($next_link = $this->getNextLink($next_link)) != 'root') {
+            if ($this->tree_data[$next_link]['studip_object'] == 'inst') {
+                $found[] = $next_link;
+            }
+
+            if ($this->tree_data[$next_link]['studip_object'] == 'fak') {
+                if (is_array($found) && count($found)) {
+                    foreach($found as $f) {
+                        if ($this->tree_data[$f]['fakultaets_id'] == $this->tree_data[$next_link]['studip_object_id']) {
+                            $ret[] = $this->tree_data[$f]['studip_object_id'];
+                        }
+                    }
+
+                    $ret[] = $this->tree_data[$next_link]['studip_object_id'];
+                } else {
+                    $ret[] = $this->tree_data[$next_link]['studip_object_id'];
+                }
+                break;
+            }
+            $next_link = $this->tree_data[$next_link]['parent_id'];
+        }
+
+        if (!$ret){
+            $ret[] = $next_link;
+        }
+
+        return $ret;
+    }
+    /**
+    * returns the next item_id upwards the tree which is a Stud.IP object
+    *
+    * help function for getAdminRange()
+    *
+    * @access   private
+    * @param    string  $item_id
+    * @return   string
+    */
+
+    function getNextLink($item_id){
+    if (!$this->tree_data[$item_id])
+            return false;
+        $ret_id = $item_id;
+        while (!$this->tree_data[$ret_id]['studip_object_id']){
+            $ret_id = $this->tree_data[$ret_id]['parent_id'];
+        }
+        return $ret_id;
+    }
+
+    function getSemIds($item_id,$ids_from_kids = false){
+        if (!$this->tree_data[$item_id])
+            return false;
+        if ($ids_from_kids){
+            $this->view->params[0] = $this->getKidsKids($item_id);
+        }
+        $this->view->params[0][] = $item_id;
+        $this->view->params[1] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : " ";
+        $ret = false;
+        $rs = $this->view->get_query("view:RANGE_TREE_GET_SEMIDS");
+        while($rs->next_record()){
+            $ret[] = $rs->f(0);
+        }
+        return $ret;
+    }
+
+    function getNumEntries($item_id, $num_entries_from_kids = false){
+        if (!$this->tree_data[$item_id])
+            return false;
+        if (!$this->entries_init_done) $this->initEntries();
+
+        return parent::getNumEntries($item_id, $num_entries_from_kids);
+    }
+
+    function InsertItem($item_id, $parent_id, $item_name, $priority,$studip_object,$studip_object_id){
+        $view = new DbView();
+        $view->params = [$item_id,$parent_id,$item_name,$priority,$studip_object,$studip_object_id];
+        $rs = $view->get_query("view:TREE_INS_ITEM");
+        return $rs->affected_rows();
+    }
+
+    function UpdateItem($item_name,$studip_object,$studip_object_id,$item_id){
+        $view = new DbView();
+        $view->params = [$item_name,$studip_object,$studip_object_id,$item_id];
+        $rs = $view->get_query("view:TREE_UPD_ITEM");
+        return $rs->affected_rows();
+    }
+
+    function DeleteItems($items_to_delete){
+        $view = new DbView();
+        $view->params[0] = (is_array($items_to_delete)) ? $items_to_delete : [$items_to_delete];
+        $view->auto_free_params = false;
+        $rs = $view->get_query("view:TREE_DEL_ITEM");
+        $deleted['items'] = $rs->affected_rows();
+        $rs = $view->get_query("view:CAT_DEL_RANGE");
+        $deleted['categories'] = $rs->affected_rows();
+        return $deleted;
+    }
+}
+?>
diff --git a/lib/classes/StudipRangeTreeView.class.php b/lib/classes/StudipRangeTreeView.class.php
deleted file mode 100644
index 2532e4b..0000000
--- a/lib/classes/StudipRangeTreeView.class.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipRangeTreeView.class.php
-// Class to print out the "range tree"
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* class to print out the "range tree"
-*
-* This class prints out a html representation of the whole or part of the tree
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipRangeTreeView extends TreeView{
-
-    /**
-    * constructor
-    *
-    * @access public
-    */
-    function __construct(){
-        $this->root_content = $GLOBALS['UNI_INFO'];
-        parent::__construct("StudipRangeTree"); //calling the baseclass constructor
-    }
-
-    function getItemContent($item_id){
-        $content = "\n<table width=\"100%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
-        if ($item_id == "root"){
-            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
-            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . htmlReady($this->root_content) ." </td></tr>";
-            $content .= "\n</table>";
-            return $content;
-        }
-        $range_object = RangeTreeObject::GetInstance($item_id);
-        $name = ($range_object->item_data['type']) ? $range_object->item_data['type'] . ": " : "";
-        $name .= $range_object->item_data['name'];
-        $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($name) ." </td></tr>";
-        if (is_array($range_object->item_data_mapping)){
-            $content .= "\n<tr><td class=\"blank\" align=\"left\">";
-            foreach ($range_object->item_data_mapping as $key => $value){
-                if ($range_object->item_data[$key]){
-                    $content .= "<b>" . htmlReady($value) . ":</b>&nbsp;";
-                    $content .= formatLinks($range_object->item_data[$key]) . "&nbsp; ";
-                }
-            }
-            $content .= "</td></tr><tr><td class=\"blank\" align=\"left\">" .
-                    "<a href=\"".URLHelper::getLink("dispatch.php/institute/overview?auswahl=".$range_object->item_data['studip_object_id'])."\"" .
-                    tooltip(_("Seite dieser Einrichtung in Stud.IP aufrufen")) . ">" .
-                    htmlReady($range_object->item_data['name']) . "</a>&nbsp;" ._("in Stud.IP") ."</td></tr>";
-
-        } elseif (!$range_object->item_data['studip_object']){
-            $content .= "\n<tr><td class=\"blank\" align=\"left\">" .
-                        _("Dieses Element ist keine Stud.IP-Einrichtung, es hat daher keine Grunddaten.") . "</td></tr>";
-        } else {
-            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . _("Keine Grunddaten vorhanden!") . "</td></tr>";
-        }
-        $content .= "\n<tr><td>&nbsp;</td></tr>";
-        $kategorien =& $range_object->getCategories();
-        if ($kategorien->numRows){
-            while($kategorien->nextRow()){
-                $content .= "\n<tr><td class=\"table_header_bold\">" . htmlReady($kategorien->getField("name")) . "</td></tr>";
-                $content .= "\n<tr><td class=\"blank\">" . formatReady($kategorien->getField("content")) . "</td></tr>";
-            }
-        } else {
-            $content .= "\n<tr><td class=\"blank\">" . _("Keine weiteren Daten vorhanden!") . "</td></tr>";
-        }
-        $content .= "</table>";
-        return $content;
-    }
-}
-//test
-//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
-//include 'lib/include/html_head.inc.php';
-//$test = new StudipRangeTreeView();
-//$test->showTree();
-//echo "</table>";
-//page_close();
diff --git a/lib/classes/StudipRangeTreeView.php b/lib/classes/StudipRangeTreeView.php
new file mode 100644
index 0000000..2532e4b
--- /dev/null
+++ b/lib/classes/StudipRangeTreeView.php
@@ -0,0 +1,101 @@
+<?php
+# Lifter001: TEST
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipRangeTreeView.class.php
+// Class to print out the "range tree"
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* class to print out the "range tree"
+*
+* This class prints out a html representation of the whole or part of the tree
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipRangeTreeView extends TreeView{
+
+    /**
+    * constructor
+    *
+    * @access public
+    */
+    function __construct(){
+        $this->root_content = $GLOBALS['UNI_INFO'];
+        parent::__construct("StudipRangeTree"); //calling the baseclass constructor
+    }
+
+    function getItemContent($item_id){
+        $content = "\n<table width=\"100%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
+        if ($item_id == "root"){
+            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
+            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . htmlReady($this->root_content) ." </td></tr>";
+            $content .= "\n</table>";
+            return $content;
+        }
+        $range_object = RangeTreeObject::GetInstance($item_id);
+        $name = ($range_object->item_data['type']) ? $range_object->item_data['type'] . ": " : "";
+        $name .= $range_object->item_data['name'];
+        $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($name) ." </td></tr>";
+        if (is_array($range_object->item_data_mapping)){
+            $content .= "\n<tr><td class=\"blank\" align=\"left\">";
+            foreach ($range_object->item_data_mapping as $key => $value){
+                if ($range_object->item_data[$key]){
+                    $content .= "<b>" . htmlReady($value) . ":</b>&nbsp;";
+                    $content .= formatLinks($range_object->item_data[$key]) . "&nbsp; ";
+                }
+            }
+            $content .= "</td></tr><tr><td class=\"blank\" align=\"left\">" .
+                    "<a href=\"".URLHelper::getLink("dispatch.php/institute/overview?auswahl=".$range_object->item_data['studip_object_id'])."\"" .
+                    tooltip(_("Seite dieser Einrichtung in Stud.IP aufrufen")) . ">" .
+                    htmlReady($range_object->item_data['name']) . "</a>&nbsp;" ._("in Stud.IP") ."</td></tr>";
+
+        } elseif (!$range_object->item_data['studip_object']){
+            $content .= "\n<tr><td class=\"blank\" align=\"left\">" .
+                        _("Dieses Element ist keine Stud.IP-Einrichtung, es hat daher keine Grunddaten.") . "</td></tr>";
+        } else {
+            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . _("Keine Grunddaten vorhanden!") . "</td></tr>";
+        }
+        $content .= "\n<tr><td>&nbsp;</td></tr>";
+        $kategorien =& $range_object->getCategories();
+        if ($kategorien->numRows){
+            while($kategorien->nextRow()){
+                $content .= "\n<tr><td class=\"table_header_bold\">" . htmlReady($kategorien->getField("name")) . "</td></tr>";
+                $content .= "\n<tr><td class=\"blank\">" . formatReady($kategorien->getField("content")) . "</td></tr>";
+            }
+        } else {
+            $content .= "\n<tr><td class=\"blank\">" . _("Keine weiteren Daten vorhanden!") . "</td></tr>";
+        }
+        $content .= "</table>";
+        return $content;
+    }
+}
+//test
+//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
+//include 'lib/include/html_head.inc.php';
+//$test = new StudipRangeTreeView();
+//$test->showTree();
+//echo "</table>";
+//page_close();
diff --git a/lib/classes/StudipRangeTreeViewAdmin.class.php b/lib/classes/StudipRangeTreeViewAdmin.class.php
deleted file mode 100644
index 0620957..0000000
--- a/lib/classes/StudipRangeTreeViewAdmin.class.php
+++ /dev/null
@@ -1,837 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipRangeTreeViewAdmin.class.php
-// Class to print out the "range tree"
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-use Studip\Button, Studip\LinkButton;
-
-/**
-* class to print out the admin view of the "range tree"
-*
-* This class prints out a html representation of the whole or part of the tree, <br>
-* it also contains all functions for administrative tasks on the tree
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipRangeTreeViewAdmin extends TreeView{
-
-
-    var $tree_status;
-
-    var $mode;
-
-    var $edit_item_id;
-
-    var $move_item_id;
-
-    var $search_result;
-
-    var $msg;
-
-    var $marked_item;
-
-    var $edit_cat_snap;
-
-    var $edit_cat_item_id;
-
-    /**
-    * constructor
-    *
-    * calls the base class constructor, registers a session variable, calls the init function and the command parser
-    * @access public
-    */
-    function __construct(){
-
-        $this->root_content = $GLOBALS['UNI_INFO'];
-        parent::__construct("StudipRangeTree"); //calling the baseclass constructor
-        $this->marked_item =& $_SESSION['_marked_item'];
-
-        $this->initTreeStatus();
-        $this->parseCommand();
-    }
-
-    function initTreeStatus()
-    {
-        $view = DbView::getView('range_tree');
-        $user_id = $GLOBALS['auth']->auth['uid'];
-        $user_perm = $GLOBALS['auth']->auth['perm'];
-        $studip_object_status = null;
-
-        if (is_array($this->open_items)){
-            foreach ($this->open_items as $key => $value) {
-                if ($key != 'root') {
-                    $tmp = $this->tree->getAdminRange($key);
-
-                    if(!empty($tmp)) {
-                        foreach($tmp as $i) {
-                            if($i) {
-                                $studip_object_status[$i] = ($user_perm == "root") ? 1 : -1;
-                            }
-                        }
-
-                    }
-                }
-            }
-        }
-
-        if (is_array($this->open_ranges)){
-            foreach ($this->open_ranges as $key => $value) {
-                if ($key != 'root'){
-                    $tmp = $this->tree->getAdminRange($key);
-
-                    if(!empty($tmp)) {
-                        foreach($tmp as $i) {
-                            if($i) {
-                                $studip_object_status[$i] = ($user_perm == "root") ? 1 : -1;
-                            }
-                        }
-                    }
-
-                    if (isset($this->tree->tree_data[$key])) {
-                        $tmp = $this->tree->getAdminRange($this->tree->tree_data[$key]['parent_id']);
-                    } else {
-                        $tmp = [];
-                    }
-
-                    if(!empty($tmp)) {
-                        foreach($tmp as $i) {
-                            if ($i) {
-                                $studip_object_status[$i] = ($user_perm == "root") ? 1 : -1;
-                            }
-                        }
-                    }
-
-                }
-            }
-        }
-        if (is_array($studip_object_status) && $user_perm != 'root'){
-            $view->params = [array_keys($studip_object_status), $user_id];
-            $rs = $view->get_query("view:TREE_INST_STATUS");
-            while ($rs->next_record()){
-                $studip_object_status[$rs->f("Institut_id")] = 1;
-            }
-            $view->params = [array_keys($studip_object_status), $user_id];
-            $rs = $view->get_query("view:TREE_FAK_STATUS");
-            while ($rs->next_record()){
-                $studip_object_status[$rs->f("Fakultaets_id")] = 1;
-                if ($rs->f("Institut_id") && isset($studip_object_status[$rs->f("Institut_id")])){
-                    $studip_object_status[$rs->f("Institut_id")] = 1;
-                }
-            }
-        }
-        $studip_object_status['root'] = ($user_perm == "root") ? 1 : -1;
-    $this->tree_status = $studip_object_status;
-    }
-
-    function parseCommand(){
-        if (Request::quoted('mode'))
-            $this->mode = Request::quoted('mode');
-        if (Request::option('cmd')){
-            $exec_func = "execCommand" . Request::option('cmd');
-            if (method_exists($this,$exec_func)){
-                if ($this->$exec_func()){
-                    $this->tree->init();
-                    $this->initTreeStatus();
-                }
-            }
-        }
-        if ($this->mode == "MoveItem")
-            $this->move_item_id = $this->marked_item;
-    }
-
-    function execCommandOrderItem(){
-        $direction = Request::quoted('direction');
-        $item_id = Request::option('item_id');
-        $items_to_order = $this->tree->getKids($this->tree->tree_data[$item_id]['parent_id']);
-        if (!$this->isParentAdmin($item_id) || !$items_to_order)
-            return false;
-        for ($i = 0; $i < count($items_to_order); ++$i){
-            if ($item_id == $items_to_order[$i])
-                break;
-        }
-        if ($direction == "up" && isset($items_to_order[$i-1])){
-            $items_to_order[$i] = $items_to_order[$i-1];
-            $items_to_order[$i-1] = $item_id;
-        } elseif (isset($items_to_order[$i+1])){
-            $items_to_order[$i] = $items_to_order[$i+1];
-            $items_to_order[$i+1] = $item_id;
-        }
-        $view = DbView::getView('range_tree');
-        for ($i = 0; $i < count($items_to_order); ++$i){
-            $view->params = [$i, $items_to_order[$i]];
-            $rs = $view->get_query("view:TREE_UPD_PRIO");
-        }
-        $this->mode = "";
-        $this->msg[$item_id] = "msg§" . (($direction == "up") ? _("Element wurde um eine Position nach oben verschoben.") : _("Element wurde um eine Position nach unten verschoben."));
-        return true;
-    }
-
-    function execCommandNewItem(){
-        $item_id = Request::option('item_id');
-        if ($this->isItemAdmin($item_id)){
-            $new_item_id = DbView::get_uniqid();
-            $this->tree->storeItem($new_item_id,$item_id,_("Neues Element"), $this->tree->getNumKids($item_id) +1);
-            $this->anchor = $new_item_id;
-            $this->edit_item_id = $new_item_id;
-            $this->open_ranges[$item_id] = true;
-            $this->open_items[$new_item_id] = true;
-            if ($this->mode != "NewItem")
-                $this->msg[$new_item_id] = "info§" . _("Wählen Sie einen Namen für dieses Element, oder verlinken Sie es mit einer Einrichtung in Stud.IP");
-            $this->mode = "NewItem";
-        }
-        return false;
-    }
-
-    function execCommandSearchStudip(){
-        $item_id = Request::option('item_id');
-        $parent_id = Request::quoted('parent_id');
-        $search_str = Request::quoted('edit_search');
-        $view = DbView::getView('range_tree');
-        if(mb_strlen($search_str) > 1){
-            $view->params[0] = $search_str;
-            $rs = $view->get_query("view:TREE_SEARCH_INST");
-            while ($rs->next_record()){
-                $this->search_result[$rs->f("Institut_id")]['name'] = $rs->f("Name");
-                $this->search_result[$rs->f("Institut_id")]['studip_object'] = "inst";
-            }
-            if ($parent_id == "root"){
-                $view->params[0] = $search_str;
-                $rs = $view->get_query("view:TREE_SEARCH_FAK");
-                while ($rs->next_record()){
-                    $this->search_result[$rs->f("Fakultaets_id")]['name'] = $rs->f("Name");
-                    $this->search_result[$rs->f("Fakultaets_id")]['studip_object'] = "fak";
-                }
-            }
-        $search_msg = "info§" . sprintf(_("Ihre Suche ergab %s Treffer."),count($this->search_result));
-        } else {
-            $search_msg = "error§" . _("Sie haben keinen Suchbegriff eingegeben.");
-        }
-        if ($this->mode == "NewItem"){
-            Request::set('item_id', $parent_id);
-            $this->execCommandNewItem();
-        } else {
-            $this->anchor = $item_id;
-            $this->edit_item_id = $item_id;
-        }
-        $this->msg[$this->edit_item_id] = $search_msg;
-        return false;
-    }
-
-    function execCommandEditItem(){
-        $item_id = Request::option('item_id');
-        if ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id)){
-            $this->mode = "EditItem";
-            $this->anchor = $item_id;
-            $this->edit_item_id = $item_id;
-            $this->msg[$item_id] = "info§" . _("Wählen Sie einen Namen für dieses Element, oder verlinken Sie es mit einer Einrichtung in Stud.IP");
-        }
-        return false;
-    }
-
-    function execCommandInsertItem(){
-        $item_id = Request::option('item_id');
-        $parent_id = Request::option('parent_id');
-        $item_name = Request::quoted('edit_name');
-        $tmp = explode(":",Request::quoted('edit_studip_object'));
-        if ($tmp[1] == "fak" || $tmp[1] == "inst"){
-            $studip_object = $tmp[1];
-            $studip_object_id = $tmp[0];
-        } else {
-            $studip_object = "";
-            $studip_object_id = "";
-        }
-        if ($this->mode == "NewItem" && $item_id){
-            if ($this->isItemAdmin($parent_id)){
-                $priority = count($this->tree->getKids($parent_id));
-                $affected_rows = $this->tree->InsertItem($item_id,$parent_id,$item_name,$priority,$studip_object,$studip_object_id);
-                if ($affected_rows){
-                    $this->mode = "";
-                    $this->anchor = $item_id;
-                    $this->open_items[$item_id] = true;
-                    $this->msg[$item_id] = "msg§" . _("Dieses Element wurde neu eingefügt.");
-                }
-            }
-        }
-        if ($this->mode == "EditItem"){
-            if ($this->isParentAdmin($item_id)){
-                $affected_rows = $this->tree->UpdateItem($item_name,$studip_object,$studip_object_id,$item_id);
-                if ($affected_rows){
-                    $this->msg[$item_id] = "msg§" . _("Element wurde geändert.");
-                } else {
-                    $this->msg[$item_id] = "info§" . _("Keine Veränderungen vorgenommen.");
-                }
-                $this->mode = "";
-                $this->anchor = $item_id;
-                $this->open_items[$item_id] = true;
-            }
-        }
-        return true;
-    }
-
-    function execCommandInsertFak(){
-        $studip_object_id = Request::quoted('insert_fak');
-        $parent_id = 'root';
-        if ($this->isItemAdmin($parent_id)){
-            $item_id = DbView::get_uniqid();
-            $priority = count($this->tree->getKids($parent_id));
-            $affected_rows = $this->tree->InsertItem($item_id,$parent_id,'',$priority,'fak',$studip_object_id);
-            if($affected_rows){
-                $view = DbView::getView('range_tree');
-                $priority = 0;
-                $rs = $view->get_query("SELECT * FROM Institute WHERE fakultaets_id <> Institut_id AND fakultaets_id = '$studip_object_id' ORDER BY Name");
-                while($rs->next_record()){
-                    $affected_rows += $this->tree->InsertItem(DbView::get_uniqid(),$item_id,addslashes($rs->f('name')),$priority++,'inst',$rs->f('Institut_id'));
-                }
-                $this->msg[$item_id] = "msg§" . sprintf(_("%s Elemente wurden eingefügt."), $affected_rows);
-                $this->mode = "";
-                $this->anchor = $item_id;
-                $this->open_items[$item_id] = true;
-                $this->open_ranges[$item_id] = true;
-            }
-        }
-        return true;
-    }
-
-    function execCommandAssertDeleteItem(){
-        $item_id = Request::option('item_id');
-        if ($this->isParentAdmin($item_id)){
-            $this->mode = "AssertDeleteItem";
-            $this->msg[$item_id] = "info§" ._("Sie beabsichtigen dieses Element, inklusive aller Unterelemente, zu löschen. ")
-                        . sprintf(_("Es werden insgesamt %s Elemente gelöscht!"),count($this->tree->getKidsKids($item_id))+1)
-                        . "<br>" . _("Wollen Sie diese Elemente wirklich löschen?") . "<br>"
-                        . '<div class="button-group">'
-                        . LinkButton::createAccept(_("JA"), URLHelper::getURL($this->getSelf("cmd=DeleteItem&item_id=$item_id")))
-                        . LinkButton::createCancel(_("NEIN"), URLHelper::getURL($this->getSelf("cmd=Cancel&item_id=$item_id")))
-                        . "</div>";
-        }
-        return false;
-    }
-
-    function execCommandDeleteItem(){
-        $item_id = Request::option('item_id');
-        $deleted = 0;
-        $item_name = $this->tree->tree_data[$item_id]['name'];
-        if ($this->isParentAdmin($item_id) && $this->mode == "AssertDeleteItem"){
-            $this->anchor = $this->tree->tree_data[$item_id]['parent_id'];
-            $items_to_delete = $this->tree->getKidsKids($item_id);
-            $items_to_delete[] = $item_id;
-            $deleted = $this->tree->DeleteItems($items_to_delete);
-            if ($deleted['items']){
-                $this->msg[$this->anchor] = "msg§" . sprintf(_("Das Element <b>%s</b> und alle Unterelemente (insgesamt %s) wurden gelöscht. "),htmlReady($item_name),$deleted['items']);
-            } else {
-                $this->msg[$this->anchor] = "error§" . _("Fehler, es konnten keine Elemente gelöscht werden!");
-            }
-            if ($deleted['categories']){
-                $this->msg[$this->anchor] .= sprintf(_("<br>Es wurden %s Datenfelder gelöscht. "),$deleted['categories']);
-            }
-            $this->mode = "";
-            $this->open_items[$this->anchor] = true;
-        }
-        return true;
-    }
-
-    function execCommandMoveItem(){
-        $item_id = Request::option('item_id');
-        $this->anchor = $item_id;
-        $this->marked_item = $item_id;
-        $this->mode = "MoveItem";
-        return false;
-    }
-
-    function execCommandDoMoveItem(){
-        $item_id = Request::option('item_id');
-        $item_to_move = $this->marked_item;
-        if ($this->mode == "MoveItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
-            && ($item_to_move != $item_id) && ($this->tree->tree_data[$item_to_move]['parent_id'] != $item_id)
-            && !$this->tree->isChildOf($item_to_move,$item_id)){
-            $view = DbView::getView('range_tree');
-            $view->params = [$item_id, count($this->tree->getKids($item_id)), $item_to_move];
-            $rs = $view->get_query("view:TREE_MOVE_ITEM");
-            if ($rs->affected_rows()){
-                    $this->msg[$item_to_move] = "msg§" . _("Element wurde verschoben.");
-                } else {
-                    $this->msg[$item_to_move] = "error§" . _("Keine Verschiebung durchgeführt.");
-                }
-            }
-        $this->anchor = $item_to_move;
-        $this->open_ranges[$item_id] = true;
-        $this->open_items[$item_to_move] = true;
-        $this->mode = "";
-        return true;
-    }
-
-    function execCommandOrderCat(){
-        $item_id = Request::option('item_id');
-        $direction = Request::quoted('direction');
-        $cat_id = Request::option('cat_id');
-        $items_to_order = [];
-        if ($this->isItemAdmin($item_id)){
-            $range_object = RangeTreeObject::GetInstance($item_id);
-            $categories =& $range_object->getCategories();
-            while($categories->nextRow()){
-                $items_to_order[] = $categories->getField("kategorie_id");
-            }
-            for ($i = 0; $i < count($items_to_order); ++$i){
-                if ($cat_id == $items_to_order[$i])
-                    break;
-            }
-            if ($direction == "up" && isset($items_to_order[$i-1])){
-                $items_to_order[$i] = $items_to_order[$i-1];
-                $items_to_order[$i-1] = $cat_id;
-            } elseif (isset($items_to_order[$i+1])){
-                $items_to_order[$i] = $items_to_order[$i+1];
-                $items_to_order[$i+1] = $cat_id;
-            }
-            $view = DbView::getView('range_tree');
-            for ($i = 0; $i < count($items_to_order); ++$i){
-                $view->params = [$i,$items_to_order[$i]];
-                $rs = $view->get_query("view:CAT_UPD_PRIO");
-            }
-            $this->msg[$item_id] = "msg§" . _("Datenfelder wurden neu geordnet");
-        }
-        $this->anchor = $item_id;
-        return false;
-    }
-
-    function execCommandNewCat(){
-        $item_id = Request::option('item_id');
-        if ($this->isItemAdmin($item_id)){
-            $range_object = RangeTreeObject::GetInstance($item_id);
-            $this->edit_cat_snap =& $range_object->getCategories();
-            $this->edit_cat_snap->result[$this->edit_cat_snap->numRows] =
-                ["kategorie_id" => "new_entry", "range_id" => $item_id, "name" => "Neues Datenfeld", "content" => "Neues Datenfeld",
-                        "priority" => $this->edit_cat_snap->numRows];
-            ++$this->edit_cat_snap->numRows;
-            $this->edit_cat_item_id = $item_id;
-            $this->mode = "NewCat";
-        }
-        $this->anchor = $item_id;
-        return false;
-    }
-
-    function execCommandUpdateCat(){
-        $item_id = Request::option('item_id');
-        $cat_name = Request::getArray('cat_name');
-        $cat_content = Request::getArray('cat_content');
-        $cat_prio = Request::getArray('cat_prio');
-        $inserted = false;
-        $updated = 0;
-        if ($this->isItemAdmin($item_id)){
-            $view = DbView::getView('range_tree');
-            if (isset($cat_name['new_entry'])){
-                $view->params = [DbView::get_uniqid(),$item_id,$cat_name['new_entry'],$cat_content['new_entry'],$cat_prio['new_entry']];
-                $rs = $view->get_query("view:CAT_INS_ALL");
-                if ($rs->affected_rows()){
-                    $inserted = true;
-                }
-                unset($cat_name['new_entry']);
-            }
-            foreach ($cat_name as $key => $value){
-                $view->params = [$value,$cat_content[$key],$key];
-                $rs = $view->get_query("view:CAT_UPD_CONTENT");
-                if ($rs->affected_rows()){
-                    ++$updated;
-                }
-            }
-            if ($updated){
-                $this->msg[$item_id] = "msg§" . sprintf(_("Es wurden %s Datenfelder aktualisiert."),$updated);
-                if ($inserted) {
-                    $this->msg[$item_id] .= _("Ein neues Datenfeld wurde eingefügt.");
-                }
-            } elseif ($inserted){
-                $this->msg[$item_id] = "msg§" . _("Ein neues Datenfeld wurde eingefügt.");
-            } else {
-                $this->msg[$item_id] = "info§" . _("Keine Veränderungen vorgenommen.");
-            }
-        }
-        $this->anchor = $item_id;
-        $this->mode = "";
-        return false;
-    }
-
-    function execCommandDeleteCat(){
-        $item_id = Request::option('item_id');
-        $cat_id = Request::option('cat_id');
-        if ($this->isItemAdmin($item_id)){
-            $view = DbView::getView('range_tree');
-            $view->params[0] = $cat_id;
-            $rs = $view->get_query("view:CAT_DEL");
-            if ($rs->affected_rows()){
-                $this->msg[$item_id] = "msg§" . _("Ein Datenfeld wurde gelöscht.");
-            }
-        }
-        $this->mode = "";
-        $this->anchor = $item_id;
-        return false;
-    }
-
-
-    function execCommandCancel(){
-        $item_id = Request::option('item_id');
-        $this->mode = "";
-        $this->anchor = $item_id;
-        return false;
-    }
-
-    function isItemAdmin($item_id){
-        $admin_ranges = $this->tree->getAdminRange($item_id);
-        for ($i = 0; $i < count($admin_ranges); ++$i){
-            if (
-                isset($this->tree_status[$admin_ranges[$i]])
-                && $this->tree_status[$admin_ranges[$i]] == 1
-            ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function isParentAdmin($item_id){
-        $admin_ranges = $this->tree->getAdminRange($this->tree->tree_data[$item_id]['parent_id']);
-        if (!empty($admin_ranges)) {
-            for ($i = 0; $i < count($admin_ranges); ++$i) {
-                if (
-                    isset($this->tree_status[$admin_ranges[$i]])
-                    && $this->tree_status[$admin_ranges[$i]] == 1
-                ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function getItemContent($item_id){
-
-        if ($item_id == $this->edit_item_id )
-            return $this->getEditItemContent();
-        if ($item_id == $this->move_item_id){
-            $this->msg[$item_id] = "info§" . sprintf(_("Dieses Element wurde zum Verschieben markiert. Bitte wählen Sie ein Einfügesymbol %s aus, um das Element zu verschieben."), Icon::create('arr_2right', 'sort', ['title' => "Einfügesymbol"])->asImg(16, ["alt" => "Einfügesymbol"]));
-            }
-        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
-        $content .= $this->getItemMessage($item_id);
-        $content .= "\n<tr><td>";
-
-        if ($this->isItemAdmin($item_id)){
-            $content .= LinkButton::create(_("Neues Objekt"),
-                URLHelper::getURL($this->getSelf("cmd=NewItem&item_id=$item_id")),
-                ['title' => _("Innerhalb dieser Ebene ein neues Element einfügen")]);
-        }
-
-        if ($this->isParentAdmin($item_id) && $item_id !=$this->start_item_id && $item_id != "root"){
-            $content .= LinkButton::create(_("Bearbeiten"),
-                URLHelper::getURL($this->getSelf("cmd=EditItem&item_id=$item_id")));
-
-            $content .= LinkButton::create(_("Löschen"),
-                URLHelper::getURL($this->getSelf("cmd=AssertDeleteItem&item_id=$item_id")));
-
-            if ($this->move_item_id == $item_id && $this->mode == "MoveItem"){
-                $content .= LinkButton::create(_("Abbrechen"),
-                    URLHelper::getURL($this->getSelf("cmd=Cancel&item_id=$item_id")));
-            } else {
-                $content .= LinkButton::create(_("Verschieben"),
-                    URLHelper::getURL($this->getSelf("cmd=MoveItem&item_id=$item_id")));
-            }
-        }
-
-        $content .= "</td></tr></table>";
-        $content .= "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
-        if ($item_id == "root"){
-            if ($this->isItemAdmin($item_id)){
-                $view = DbView::getView('range_tree');
-                $rs = $view->get_query("SELECT i1.Name,i1.Institut_id,COUNT(i2.Institut_id) as num FROM Institute i1 LEFT JOIN Institute i2 ON i1.Institut_id = i2.fakultaets_id AND i2.fakultaets_id<>i2.Institut_id WHERE i1.fakultaets_id=i1.Institut_id GROUP BY i1.Institut_id ORDER BY Name");
-                $content .= "\n<tr><td>";
-                $content .= "\n<form action=\"" . URLHelper::getLink($this->getSelf("cmd=InsertFak")) . "\" method=\"post\" class=\"default\">"
-                    .  CSRFProtection::tokenTag()
-                    . '<div class="col-1"><label>'
-                    . _("Stud.IP Fakultät einfügen:")
-                    . "\n<select style=\"width:300px;vertical-align:middle;\" name=\"insert_fak\">";
-                while($rs->next_record()){
-                    $content .= "\n<option value=\"" . $rs->f("Institut_id") . "\">" . htmlReady(my_substr($rs->f("Name") . '('.$rs->f('num').')',0,60)) . "</option>";
-                }
-                $content .= "</select>"
-                    . '</label></div><div class="col-1">'
-                    . Button::create(_("Fakultät einfügen"))
-                    ."</div></form>";
-                $content .= " </td></tr>";
-            }
-            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
-            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . htmlReady($this->root_content) ." </td></tr>";
-            $content .= "\n</table>";
-            return $content;
-        }
-        $range_object = RangeTreeObject::GetInstance($item_id);
-        $name = !empty($range_object->item_data['type']) ? $range_object->item_data['type'] . ": " : "";
-        $name .= $range_object->item_data['name'];
-        $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\" style=\"font-size:10pt\">" . htmlReady($name) ." </td></tr>";
-        if (is_array($range_object->item_data_mapping)){
-            $content .= "\n<tr><td class=\"blank\" align=\"left\" style=\"font-size:10pt\">";
-            foreach ($range_object->item_data_mapping as $key => $value){
-                if ($range_object->item_data[$key]){
-                    $content .= "<b>" . htmlReady($value) . ":</b>&nbsp;";
-                    $content .= formatLinks($range_object->item_data[$key]) . "&nbsp; ";
-                }
-            }
-            $content .= "&nbsp;";
-        } elseif (!$range_object->item_data['studip_object']){
-            $content .= "\n<tr><td class=\"blank\" align=\"left\" style=\"font-size:10pt\">" .
-                        _("Dieses Element ist keine Stud.IP-Einrichtung, es hat daher keine Grunddaten.");
-        } else {
-            $content .= "\n<tr><td class=\"blank\" align=\"left\" style=\"font-size:10pt\">" . _("Keine Grunddaten vorhanden!");
-        }
-        $content .= "\n<div class=\"blank\" align=\"left\" style=\"font-size:10pt\"><b>" . _("Mitarbeiter:") . "</b> " . $range_object->getNumStaff() . "</b></div>";
-        if ($this->isItemAdmin($item_id) && $range_object->item_data['studip_object']){
-            $content .= "\n<div class=\"blank\">";
-
-            $content .= LinkButton::create(_("Grunddaten in Stud.IP bearbeiten"), "dispatch.php/institute/basicdata/index?admin_inst_id=" . $range_object->item_data['studip_object_id']);
-            $content .= "</div>";
-        }
-
-        $content .= "</td></tr><tr><td>&nbsp;</td></tr>";
-
-        if ($this->mode == "NewCat" && ($this->edit_cat_item_id == $item_id)){
-            $categories =& $this->edit_cat_snap;
-        } else {
-            $categories =& $range_object->getCategories();
-        }
-        if (!$this->isItemAdmin($item_id)){
-            if ($categories->numRows){
-                while($categories->nextRow()){
-                    $content .= "\n<tr><td class=\"table_header_bold\" style=\"font-size:10pt\">" . formatReady($categories->getField("name")) . "</td></tr>";
-                    $content .= "\n<tr><td class=\"blank\" style=\"font-size:10pt\">" . formatReady($categories->getField("content")) . "</td></tr>";
-                }
-            } else {
-                $content .= "\n<tr><td class=\"blank\" style=\"font-size:10pt\">" . _("Keine weiteren Daten vorhanden!") . "</td></tr>";
-            }
-        } else {
-            $content .= "<tr><td class=\"blank\" style=\"font-size:10pt\">" . $this->getEditCatContent($item_id,$categories) . "</td></tr>";
-        }
-        $content .= "</table>";
-        return $content;
-    }
-
-    function getItemHead($item_id){
-        $head = "";
-        if ($this->mode == "MoveItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
-            && ($this->move_item_id != $item_id) && ($this->tree->tree_data[$this->move_item_id]['parent_id'] != $item_id)
-            && !$this->tree->isChildOf($this->move_item_id,$item_id)){
-            $head .= "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=DoMoveItem&item_id=$item_id")) . "\">"
-            .  Icon::create('arr_2right', 'sort', ['title' => "An dieser Stelle einfügen"])->asImg(16, ["alt" => "An dieser Stelle einfügen"])."</a>&nbsp;";
-        }
-        $head .= parent::getItemHead($item_id);
-        if ($item_id != $this->start_item_id && $this->isParentAdmin($item_id) && $item_id != $this->edit_item_id){
-            $head .= "</td><td nowrap align=\"right\" valign=\"bottom\" class=\"printhead\">";
-            if (!$this->tree->isFirstKid($item_id)){
-                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=up&item_id=$item_id")) .
-                "\">" . Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach oben verschieben")]) . " ".
-                "</a>";
-            }
-            if (!$this->tree->isLastKid($item_id)){
-                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=down&item_id=$item_id")) .
-                "\">" . Icon::create('arr_2down', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach unten verschieben")]) . " ".
-                "</a>";
-            }
-            $head .= "&nbsp;";
-        }
-        return $head;
-    }
-
-    function getEditItemContent(){
-        $content = '';
-        ob_start();
-        ?>
-        <div style="margin: 0px 5%">
-            <form name="item_form" method="post" class="default"
-                  action="<?= URLHelper::getLink($this->getSelf("cmd=InsertItem&item_id={$this->edit_item_id}")) ?>">
-                <?= CSRFProtection::tokenTag(); ?>
-
-                <input type="hidden" name="parent_id" value="<?= $this->tree->tree_data[$this->edit_item_id]['parent_id'] ?>">
-
-                <table>
-                    <?= $this->getItemMessage($this->edit_item_id, 2) ?>
-                </table>
-
-                <fieldset>
-                    <legend>
-                        <?= _("Element bearbeiten") ?>
-                    </legend>
-
-                    <label>
-                        <?= _("Name des Elements") ?>
-                        <input type="text" name="edit_name" size="50"
-                               value="<?= htmlReady($this->tree->tree_data[$this->edit_item_id]['name']) ?>">
-                    </label>
-                </fieldset>
-
-                <fieldset>
-                    <legend>
-                        <?= _("Element mit einer Stud.IP-Einrichtung verlinken") ?>
-                    </legend>
-
-                    <label>
-                        <?= _("Stud.IP-Einrichtung:") ?>
-
-                        <select name="edit_studip_object" onChange="document.item_form.edit_name.value=document.item_form.edit_studip_object.options[document.item_form.edit_studip_object.selectedIndex].text;">
-                            <option value="none"
-                                <?= ($this->tree->tree_data[$this->edit_item_id]['studip_object']) ? '' : 'selected' ?>
-                            >
-                                <?= _("Kein Link") ?>
-                            </option>
-                            <? if ($this->tree->tree_data[$this->edit_item_id]['studip_object']) : ?>
-                            <option selected value="<?= $this->tree->tree_data[$this->edit_item_id]['studip_object_id']
-                                .':'. $this->tree->tree_data[$this->edit_item_id]['studip_object'] ?>"
-                            >
-                                <?= htmlReady($this->tree->tree_data[$this->edit_item_id]['name']) ?>
-                            </option>
-                            <? endif ?>
-
-                            <? if (is_array($this->search_result) && count($this->search_result)) : ?>
-                                <? foreach ($this->search_result as $key => $value) : ?>
-                                <option value="<?= $key .':'. $value['studip_object'] ?>">
-                                    <?= $value['name'] ?>
-                                </option>
-                                <? endforeach ?>
-                            <? endif ?>
-                        </select>
-                    </label>
-
-                    <label>
-                        <?= _("Stud.IP-Einrichtung suchen:") ?>
-                        <input type="text" name="edit_search">
-                    </label>
-                </fieldset>
-
-                <footer>
-                    <?= Button::createAccept(_("Absenden")) ?>
-                    <?= Button::create(_("Suchen"), [
-                        'formaction' => URLHelper::getURL($this->getSelf("cmd=SearchStudIP&item_id={$this->edit_item_id}"))
-                    ]);  ?>
-
-                    <?= LinkButton::createCancel(_("Abbrechen"), URLHelper::getURL($this->getSelf("cmd=Cancel&item_id=" . ($this->mode == "NewItem" ? $this->tree->tree_data[$this->edit_item_id]['parent_id'] : $this->edit_item_id)))) ?>
-                </footer>
-            </form>
-        </div>
-
-        <?
-        $content = ob_get_clean();
-        return $content;
-    }
-
-    function getEditCatContent($item_id, $cat_snap)
-    {
-        $content = '';
-        ob_start();
-        ?>
-        <form name="cat_form_<?= $item_id ?>" method="post" class="default"
-              action="<?= URLHelper::getLink($this->getSelf("cmd=UpdateCat&item_id=$item_id"))  ?>">
-            <?= CSRFProtection::tokenTag(); ?>
-
-            <? if ($cat_snap->numRows) while ($cat_snap->nextRow()) :  ?>
-                <fieldset>
-                    <legend>
-                        <!-- change position icons -->
-                        <? if ($cat_snap->pos && $cat_snap->getField("kategorie_id") != "new_entry") : ?>
-                            <a href="<?= URLHelper::getLink($this->getSelf("cmd=OrderCat&direction=up&item_id=$item_id&cat_id=" . $cat_snap->getField("kategorie_id"))) ?>">
-                                <?= Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-top', 'title' => _("Datenfeld nach oben")]) ?>
-                            </a>
-                        <? endif ?>
-
-                        <? if ($cat_snap->pos != $cat_snap->numRows-1 && $cat_snap->getField("kategorie_id") != "new_entry") : ?>
-                            <a href="<?= URLHelper::getLink($this->getSelf("cmd=OrderCat&direction=down&item_id=$item_id&cat_id=" . $cat_snap->getField("kategorie_id"))) ?>">
-                                <?= Icon::create('arr_2down', 'sort')->asImg(['class' => 'text-top', 'title' => _("Datenfeld nach unten")]) ?>
-                            </a>
-                        <? endif ?>
-
-                        <?= _('Datenfeld bearbeiten') ?>
-
-                        <a href="<?= URLHelper::getURL($this->getSelf("cmd=DeleteCat&item_id=$item_id&cat_id=" . $cat_snap->getField("kategorie_id"))) ?>">
-                            <?= Icon::create('trash', 'clickable')->asImg(['class' => 'text-top', 'title' => _("Datenfeld löschen")]) ?>
-                        </a>
-                    </legend>
-
-                    <label>
-                        <?= _('Titel') ?>
-                        <input type="text" name="cat_name[<?= $cat_snap->getField("kategorie_id") ?>]"
-                               value="<?= htmlReady($cat_snap->getField("name")) ?>">
-                        <input type="hidden" name="cat_prio[<?= $cat_snap->getField("kategorie_id") ?>]"
-                               value="<?= htmlReady($cat_snap->getField("priority")) ?>">
-                    </label>
-
-                    <label>
-                        <?= _('Inhalt') ?>
-                        <textarea name="cat_content[<?= htmlReady($cat_snap->getField("kategorie_id")) ?>]"><?= htmlReady($cat_snap->getField("content")) ?></textarea>
-                    </label>
-                </fieldset>
-            <? endwhile ?>
-
-            <footer>
-                <? if ($cat_snap->numRows) : ?>
-                <?= Button::create(_("Datenfelder speichern"), 'übernehmen') ?>
-                <? endif ?>
-                <?= LinkButton::create(_("Neues Datenfeld anlegen"), URLHelper::getURL($this->getSelf("cmd=NewCat&item_id=$item_id"))) ?>
-            </footer>
-        </form>
-
-        <? $content = ob_get_clean() . '</td></tr>';
-
-        return $content;
-    }
-
-    function getItemMessage($item_id, $colspan = 1)
-    {
-        $content = "";
-        if (!empty($this->msg[$item_id])) {
-            $msg = explode("§", $this->msg[$item_id]);
-            $pics = [
-                'error' => Icon::create('decline', 'attention'),
-                'info'  => Icon::create('exclaim', 'inactive'),
-                'msg'   => Icon::create('accept', 'accept')];
-            $content = "\n<tr><td colspan=\"{$colspan}\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\" style=\"font-size:10pt\">
-                        <tr><td class=\"blank\" align=\"center\" width=\"25\">" .  $pics[$msg[0]]->asImg(['class' => 'text-top']) . "</td>
-                        <td class=\"blank\" align=\"left\">" . $msg[1] . "</td></tr>
-                        </table></td></tr><tr>";
-        }
-        return $content;
-    }
-
-    function getSelf($param = ''){
-        $url_params = "foo=" . DbView::get_uniqid();
-        if ($this->mode) $url_params .= "&mode=" . $this->mode;
-        if ($param) $url_params .= '&' . $param;
-        return parent::getSelf($url_params);
-    }
-}
-
-//test
-//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
-//include 'lib/include/html_head.inc.php';
-//$test = new StudipRangeTreeViewAdmin();
-//$test->showTree();
-//echo "</table>";
-//page_close();
-?>
diff --git a/lib/classes/StudipRangeTreeViewAdmin.php b/lib/classes/StudipRangeTreeViewAdmin.php
new file mode 100644
index 0000000..0620957
--- /dev/null
+++ b/lib/classes/StudipRangeTreeViewAdmin.php
@@ -0,0 +1,837 @@
+<?php
+# Lifter001: TEST
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipRangeTreeViewAdmin.class.php
+// Class to print out the "range tree"
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+use Studip\Button, Studip\LinkButton;
+
+/**
+* class to print out the admin view of the "range tree"
+*
+* This class prints out a html representation of the whole or part of the tree, <br>
+* it also contains all functions for administrative tasks on the tree
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipRangeTreeViewAdmin extends TreeView{
+
+
+    var $tree_status;
+
+    var $mode;
+
+    var $edit_item_id;
+
+    var $move_item_id;
+
+    var $search_result;
+
+    var $msg;
+
+    var $marked_item;
+
+    var $edit_cat_snap;
+
+    var $edit_cat_item_id;
+
+    /**
+    * constructor
+    *
+    * calls the base class constructor, registers a session variable, calls the init function and the command parser
+    * @access public
+    */
+    function __construct(){
+
+        $this->root_content = $GLOBALS['UNI_INFO'];
+        parent::__construct("StudipRangeTree"); //calling the baseclass constructor
+        $this->marked_item =& $_SESSION['_marked_item'];
+
+        $this->initTreeStatus();
+        $this->parseCommand();
+    }
+
+    function initTreeStatus()
+    {
+        $view = DbView::getView('range_tree');
+        $user_id = $GLOBALS['auth']->auth['uid'];
+        $user_perm = $GLOBALS['auth']->auth['perm'];
+        $studip_object_status = null;
+
+        if (is_array($this->open_items)){
+            foreach ($this->open_items as $key => $value) {
+                if ($key != 'root') {
+                    $tmp = $this->tree->getAdminRange($key);
+
+                    if(!empty($tmp)) {
+                        foreach($tmp as $i) {
+                            if($i) {
+                                $studip_object_status[$i] = ($user_perm == "root") ? 1 : -1;
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
+
+        if (is_array($this->open_ranges)){
+            foreach ($this->open_ranges as $key => $value) {
+                if ($key != 'root'){
+                    $tmp = $this->tree->getAdminRange($key);
+
+                    if(!empty($tmp)) {
+                        foreach($tmp as $i) {
+                            if($i) {
+                                $studip_object_status[$i] = ($user_perm == "root") ? 1 : -1;
+                            }
+                        }
+                    }
+
+                    if (isset($this->tree->tree_data[$key])) {
+                        $tmp = $this->tree->getAdminRange($this->tree->tree_data[$key]['parent_id']);
+                    } else {
+                        $tmp = [];
+                    }
+
+                    if(!empty($tmp)) {
+                        foreach($tmp as $i) {
+                            if ($i) {
+                                $studip_object_status[$i] = ($user_perm == "root") ? 1 : -1;
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+        if (is_array($studip_object_status) && $user_perm != 'root'){
+            $view->params = [array_keys($studip_object_status), $user_id];
+            $rs = $view->get_query("view:TREE_INST_STATUS");
+            while ($rs->next_record()){
+                $studip_object_status[$rs->f("Institut_id")] = 1;
+            }
+            $view->params = [array_keys($studip_object_status), $user_id];
+            $rs = $view->get_query("view:TREE_FAK_STATUS");
+            while ($rs->next_record()){
+                $studip_object_status[$rs->f("Fakultaets_id")] = 1;
+                if ($rs->f("Institut_id") && isset($studip_object_status[$rs->f("Institut_id")])){
+                    $studip_object_status[$rs->f("Institut_id")] = 1;
+                }
+            }
+        }
+        $studip_object_status['root'] = ($user_perm == "root") ? 1 : -1;
+    $this->tree_status = $studip_object_status;
+    }
+
+    function parseCommand(){
+        if (Request::quoted('mode'))
+            $this->mode = Request::quoted('mode');
+        if (Request::option('cmd')){
+            $exec_func = "execCommand" . Request::option('cmd');
+            if (method_exists($this,$exec_func)){
+                if ($this->$exec_func()){
+                    $this->tree->init();
+                    $this->initTreeStatus();
+                }
+            }
+        }
+        if ($this->mode == "MoveItem")
+            $this->move_item_id = $this->marked_item;
+    }
+
+    function execCommandOrderItem(){
+        $direction = Request::quoted('direction');
+        $item_id = Request::option('item_id');
+        $items_to_order = $this->tree->getKids($this->tree->tree_data[$item_id]['parent_id']);
+        if (!$this->isParentAdmin($item_id) || !$items_to_order)
+            return false;
+        for ($i = 0; $i < count($items_to_order); ++$i){
+            if ($item_id == $items_to_order[$i])
+                break;
+        }
+        if ($direction == "up" && isset($items_to_order[$i-1])){
+            $items_to_order[$i] = $items_to_order[$i-1];
+            $items_to_order[$i-1] = $item_id;
+        } elseif (isset($items_to_order[$i+1])){
+            $items_to_order[$i] = $items_to_order[$i+1];
+            $items_to_order[$i+1] = $item_id;
+        }
+        $view = DbView::getView('range_tree');
+        for ($i = 0; $i < count($items_to_order); ++$i){
+            $view->params = [$i, $items_to_order[$i]];
+            $rs = $view->get_query("view:TREE_UPD_PRIO");
+        }
+        $this->mode = "";
+        $this->msg[$item_id] = "msg§" . (($direction == "up") ? _("Element wurde um eine Position nach oben verschoben.") : _("Element wurde um eine Position nach unten verschoben."));
+        return true;
+    }
+
+    function execCommandNewItem(){
+        $item_id = Request::option('item_id');
+        if ($this->isItemAdmin($item_id)){
+            $new_item_id = DbView::get_uniqid();
+            $this->tree->storeItem($new_item_id,$item_id,_("Neues Element"), $this->tree->getNumKids($item_id) +1);
+            $this->anchor = $new_item_id;
+            $this->edit_item_id = $new_item_id;
+            $this->open_ranges[$item_id] = true;
+            $this->open_items[$new_item_id] = true;
+            if ($this->mode != "NewItem")
+                $this->msg[$new_item_id] = "info§" . _("Wählen Sie einen Namen für dieses Element, oder verlinken Sie es mit einer Einrichtung in Stud.IP");
+            $this->mode = "NewItem";
+        }
+        return false;
+    }
+
+    function execCommandSearchStudip(){
+        $item_id = Request::option('item_id');
+        $parent_id = Request::quoted('parent_id');
+        $search_str = Request::quoted('edit_search');
+        $view = DbView::getView('range_tree');
+        if(mb_strlen($search_str) > 1){
+            $view->params[0] = $search_str;
+            $rs = $view->get_query("view:TREE_SEARCH_INST");
+            while ($rs->next_record()){
+                $this->search_result[$rs->f("Institut_id")]['name'] = $rs->f("Name");
+                $this->search_result[$rs->f("Institut_id")]['studip_object'] = "inst";
+            }
+            if ($parent_id == "root"){
+                $view->params[0] = $search_str;
+                $rs = $view->get_query("view:TREE_SEARCH_FAK");
+                while ($rs->next_record()){
+                    $this->search_result[$rs->f("Fakultaets_id")]['name'] = $rs->f("Name");
+                    $this->search_result[$rs->f("Fakultaets_id")]['studip_object'] = "fak";
+                }
+            }
+        $search_msg = "info§" . sprintf(_("Ihre Suche ergab %s Treffer."),count($this->search_result));
+        } else {
+            $search_msg = "error§" . _("Sie haben keinen Suchbegriff eingegeben.");
+        }
+        if ($this->mode == "NewItem"){
+            Request::set('item_id', $parent_id);
+            $this->execCommandNewItem();
+        } else {
+            $this->anchor = $item_id;
+            $this->edit_item_id = $item_id;
+        }
+        $this->msg[$this->edit_item_id] = $search_msg;
+        return false;
+    }
+
+    function execCommandEditItem(){
+        $item_id = Request::option('item_id');
+        if ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id)){
+            $this->mode = "EditItem";
+            $this->anchor = $item_id;
+            $this->edit_item_id = $item_id;
+            $this->msg[$item_id] = "info§" . _("Wählen Sie einen Namen für dieses Element, oder verlinken Sie es mit einer Einrichtung in Stud.IP");
+        }
+        return false;
+    }
+
+    function execCommandInsertItem(){
+        $item_id = Request::option('item_id');
+        $parent_id = Request::option('parent_id');
+        $item_name = Request::quoted('edit_name');
+        $tmp = explode(":",Request::quoted('edit_studip_object'));
+        if ($tmp[1] == "fak" || $tmp[1] == "inst"){
+            $studip_object = $tmp[1];
+            $studip_object_id = $tmp[0];
+        } else {
+            $studip_object = "";
+            $studip_object_id = "";
+        }
+        if ($this->mode == "NewItem" && $item_id){
+            if ($this->isItemAdmin($parent_id)){
+                $priority = count($this->tree->getKids($parent_id));
+                $affected_rows = $this->tree->InsertItem($item_id,$parent_id,$item_name,$priority,$studip_object,$studip_object_id);
+                if ($affected_rows){
+                    $this->mode = "";
+                    $this->anchor = $item_id;
+                    $this->open_items[$item_id] = true;
+                    $this->msg[$item_id] = "msg§" . _("Dieses Element wurde neu eingefügt.");
+                }
+            }
+        }
+        if ($this->mode == "EditItem"){
+            if ($this->isParentAdmin($item_id)){
+                $affected_rows = $this->tree->UpdateItem($item_name,$studip_object,$studip_object_id,$item_id);
+                if ($affected_rows){
+                    $this->msg[$item_id] = "msg§" . _("Element wurde geändert.");
+                } else {
+                    $this->msg[$item_id] = "info§" . _("Keine Veränderungen vorgenommen.");
+                }
+                $this->mode = "";
+                $this->anchor = $item_id;
+                $this->open_items[$item_id] = true;
+            }
+        }
+        return true;
+    }
+
+    function execCommandInsertFak(){
+        $studip_object_id = Request::quoted('insert_fak');
+        $parent_id = 'root';
+        if ($this->isItemAdmin($parent_id)){
+            $item_id = DbView::get_uniqid();
+            $priority = count($this->tree->getKids($parent_id));
+            $affected_rows = $this->tree->InsertItem($item_id,$parent_id,'',$priority,'fak',$studip_object_id);
+            if($affected_rows){
+                $view = DbView::getView('range_tree');
+                $priority = 0;
+                $rs = $view->get_query("SELECT * FROM Institute WHERE fakultaets_id <> Institut_id AND fakultaets_id = '$studip_object_id' ORDER BY Name");
+                while($rs->next_record()){
+                    $affected_rows += $this->tree->InsertItem(DbView::get_uniqid(),$item_id,addslashes($rs->f('name')),$priority++,'inst',$rs->f('Institut_id'));
+                }
+                $this->msg[$item_id] = "msg§" . sprintf(_("%s Elemente wurden eingefügt."), $affected_rows);
+                $this->mode = "";
+                $this->anchor = $item_id;
+                $this->open_items[$item_id] = true;
+                $this->open_ranges[$item_id] = true;
+            }
+        }
+        return true;
+    }
+
+    function execCommandAssertDeleteItem(){
+        $item_id = Request::option('item_id');
+        if ($this->isParentAdmin($item_id)){
+            $this->mode = "AssertDeleteItem";
+            $this->msg[$item_id] = "info§" ._("Sie beabsichtigen dieses Element, inklusive aller Unterelemente, zu löschen. ")
+                        . sprintf(_("Es werden insgesamt %s Elemente gelöscht!"),count($this->tree->getKidsKids($item_id))+1)
+                        . "<br>" . _("Wollen Sie diese Elemente wirklich löschen?") . "<br>"
+                        . '<div class="button-group">'
+                        . LinkButton::createAccept(_("JA"), URLHelper::getURL($this->getSelf("cmd=DeleteItem&item_id=$item_id")))
+                        . LinkButton::createCancel(_("NEIN"), URLHelper::getURL($this->getSelf("cmd=Cancel&item_id=$item_id")))
+                        . "</div>";
+        }
+        return false;
+    }
+
+    function execCommandDeleteItem(){
+        $item_id = Request::option('item_id');
+        $deleted = 0;
+        $item_name = $this->tree->tree_data[$item_id]['name'];
+        if ($this->isParentAdmin($item_id) && $this->mode == "AssertDeleteItem"){
+            $this->anchor = $this->tree->tree_data[$item_id]['parent_id'];
+            $items_to_delete = $this->tree->getKidsKids($item_id);
+            $items_to_delete[] = $item_id;
+            $deleted = $this->tree->DeleteItems($items_to_delete);
+            if ($deleted['items']){
+                $this->msg[$this->anchor] = "msg§" . sprintf(_("Das Element <b>%s</b> und alle Unterelemente (insgesamt %s) wurden gelöscht. "),htmlReady($item_name),$deleted['items']);
+            } else {
+                $this->msg[$this->anchor] = "error§" . _("Fehler, es konnten keine Elemente gelöscht werden!");
+            }
+            if ($deleted['categories']){
+                $this->msg[$this->anchor] .= sprintf(_("<br>Es wurden %s Datenfelder gelöscht. "),$deleted['categories']);
+            }
+            $this->mode = "";
+            $this->open_items[$this->anchor] = true;
+        }
+        return true;
+    }
+
+    function execCommandMoveItem(){
+        $item_id = Request::option('item_id');
+        $this->anchor = $item_id;
+        $this->marked_item = $item_id;
+        $this->mode = "MoveItem";
+        return false;
+    }
+
+    function execCommandDoMoveItem(){
+        $item_id = Request::option('item_id');
+        $item_to_move = $this->marked_item;
+        if ($this->mode == "MoveItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
+            && ($item_to_move != $item_id) && ($this->tree->tree_data[$item_to_move]['parent_id'] != $item_id)
+            && !$this->tree->isChildOf($item_to_move,$item_id)){
+            $view = DbView::getView('range_tree');
+            $view->params = [$item_id, count($this->tree->getKids($item_id)), $item_to_move];
+            $rs = $view->get_query("view:TREE_MOVE_ITEM");
+            if ($rs->affected_rows()){
+                    $this->msg[$item_to_move] = "msg§" . _("Element wurde verschoben.");
+                } else {
+                    $this->msg[$item_to_move] = "error§" . _("Keine Verschiebung durchgeführt.");
+                }
+            }
+        $this->anchor = $item_to_move;
+        $this->open_ranges[$item_id] = true;
+        $this->open_items[$item_to_move] = true;
+        $this->mode = "";
+        return true;
+    }
+
+    function execCommandOrderCat(){
+        $item_id = Request::option('item_id');
+        $direction = Request::quoted('direction');
+        $cat_id = Request::option('cat_id');
+        $items_to_order = [];
+        if ($this->isItemAdmin($item_id)){
+            $range_object = RangeTreeObject::GetInstance($item_id);
+            $categories =& $range_object->getCategories();
+            while($categories->nextRow()){
+                $items_to_order[] = $categories->getField("kategorie_id");
+            }
+            for ($i = 0; $i < count($items_to_order); ++$i){
+                if ($cat_id == $items_to_order[$i])
+                    break;
+            }
+            if ($direction == "up" && isset($items_to_order[$i-1])){
+                $items_to_order[$i] = $items_to_order[$i-1];
+                $items_to_order[$i-1] = $cat_id;
+            } elseif (isset($items_to_order[$i+1])){
+                $items_to_order[$i] = $items_to_order[$i+1];
+                $items_to_order[$i+1] = $cat_id;
+            }
+            $view = DbView::getView('range_tree');
+            for ($i = 0; $i < count($items_to_order); ++$i){
+                $view->params = [$i,$items_to_order[$i]];
+                $rs = $view->get_query("view:CAT_UPD_PRIO");
+            }
+            $this->msg[$item_id] = "msg§" . _("Datenfelder wurden neu geordnet");
+        }
+        $this->anchor = $item_id;
+        return false;
+    }
+
+    function execCommandNewCat(){
+        $item_id = Request::option('item_id');
+        if ($this->isItemAdmin($item_id)){
+            $range_object = RangeTreeObject::GetInstance($item_id);
+            $this->edit_cat_snap =& $range_object->getCategories();
+            $this->edit_cat_snap->result[$this->edit_cat_snap->numRows] =
+                ["kategorie_id" => "new_entry", "range_id" => $item_id, "name" => "Neues Datenfeld", "content" => "Neues Datenfeld",
+                        "priority" => $this->edit_cat_snap->numRows];
+            ++$this->edit_cat_snap->numRows;
+            $this->edit_cat_item_id = $item_id;
+            $this->mode = "NewCat";
+        }
+        $this->anchor = $item_id;
+        return false;
+    }
+
+    function execCommandUpdateCat(){
+        $item_id = Request::option('item_id');
+        $cat_name = Request::getArray('cat_name');
+        $cat_content = Request::getArray('cat_content');
+        $cat_prio = Request::getArray('cat_prio');
+        $inserted = false;
+        $updated = 0;
+        if ($this->isItemAdmin($item_id)){
+            $view = DbView::getView('range_tree');
+            if (isset($cat_name['new_entry'])){
+                $view->params = [DbView::get_uniqid(),$item_id,$cat_name['new_entry'],$cat_content['new_entry'],$cat_prio['new_entry']];
+                $rs = $view->get_query("view:CAT_INS_ALL");
+                if ($rs->affected_rows()){
+                    $inserted = true;
+                }
+                unset($cat_name['new_entry']);
+            }
+            foreach ($cat_name as $key => $value){
+                $view->params = [$value,$cat_content[$key],$key];
+                $rs = $view->get_query("view:CAT_UPD_CONTENT");
+                if ($rs->affected_rows()){
+                    ++$updated;
+                }
+            }
+            if ($updated){
+                $this->msg[$item_id] = "msg§" . sprintf(_("Es wurden %s Datenfelder aktualisiert."),$updated);
+                if ($inserted) {
+                    $this->msg[$item_id] .= _("Ein neues Datenfeld wurde eingefügt.");
+                }
+            } elseif ($inserted){
+                $this->msg[$item_id] = "msg§" . _("Ein neues Datenfeld wurde eingefügt.");
+            } else {
+                $this->msg[$item_id] = "info§" . _("Keine Veränderungen vorgenommen.");
+            }
+        }
+        $this->anchor = $item_id;
+        $this->mode = "";
+        return false;
+    }
+
+    function execCommandDeleteCat(){
+        $item_id = Request::option('item_id');
+        $cat_id = Request::option('cat_id');
+        if ($this->isItemAdmin($item_id)){
+            $view = DbView::getView('range_tree');
+            $view->params[0] = $cat_id;
+            $rs = $view->get_query("view:CAT_DEL");
+            if ($rs->affected_rows()){
+                $this->msg[$item_id] = "msg§" . _("Ein Datenfeld wurde gelöscht.");
+            }
+        }
+        $this->mode = "";
+        $this->anchor = $item_id;
+        return false;
+    }
+
+
+    function execCommandCancel(){
+        $item_id = Request::option('item_id');
+        $this->mode = "";
+        $this->anchor = $item_id;
+        return false;
+    }
+
+    function isItemAdmin($item_id){
+        $admin_ranges = $this->tree->getAdminRange($item_id);
+        for ($i = 0; $i < count($admin_ranges); ++$i){
+            if (
+                isset($this->tree_status[$admin_ranges[$i]])
+                && $this->tree_status[$admin_ranges[$i]] == 1
+            ) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function isParentAdmin($item_id){
+        $admin_ranges = $this->tree->getAdminRange($this->tree->tree_data[$item_id]['parent_id']);
+        if (!empty($admin_ranges)) {
+            for ($i = 0; $i < count($admin_ranges); ++$i) {
+                if (
+                    isset($this->tree_status[$admin_ranges[$i]])
+                    && $this->tree_status[$admin_ranges[$i]] == 1
+                ) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    function getItemContent($item_id){
+
+        if ($item_id == $this->edit_item_id )
+            return $this->getEditItemContent();
+        if ($item_id == $this->move_item_id){
+            $this->msg[$item_id] = "info§" . sprintf(_("Dieses Element wurde zum Verschieben markiert. Bitte wählen Sie ein Einfügesymbol %s aus, um das Element zu verschieben."), Icon::create('arr_2right', 'sort', ['title' => "Einfügesymbol"])->asImg(16, ["alt" => "Einfügesymbol"]));
+            }
+        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
+        $content .= $this->getItemMessage($item_id);
+        $content .= "\n<tr><td>";
+
+        if ($this->isItemAdmin($item_id)){
+            $content .= LinkButton::create(_("Neues Objekt"),
+                URLHelper::getURL($this->getSelf("cmd=NewItem&item_id=$item_id")),
+                ['title' => _("Innerhalb dieser Ebene ein neues Element einfügen")]);
+        }
+
+        if ($this->isParentAdmin($item_id) && $item_id !=$this->start_item_id && $item_id != "root"){
+            $content .= LinkButton::create(_("Bearbeiten"),
+                URLHelper::getURL($this->getSelf("cmd=EditItem&item_id=$item_id")));
+
+            $content .= LinkButton::create(_("Löschen"),
+                URLHelper::getURL($this->getSelf("cmd=AssertDeleteItem&item_id=$item_id")));
+
+            if ($this->move_item_id == $item_id && $this->mode == "MoveItem"){
+                $content .= LinkButton::create(_("Abbrechen"),
+                    URLHelper::getURL($this->getSelf("cmd=Cancel&item_id=$item_id")));
+            } else {
+                $content .= LinkButton::create(_("Verschieben"),
+                    URLHelper::getURL($this->getSelf("cmd=MoveItem&item_id=$item_id")));
+            }
+        }
+
+        $content .= "</td></tr></table>";
+        $content .= "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
+        if ($item_id == "root"){
+            if ($this->isItemAdmin($item_id)){
+                $view = DbView::getView('range_tree');
+                $rs = $view->get_query("SELECT i1.Name,i1.Institut_id,COUNT(i2.Institut_id) as num FROM Institute i1 LEFT JOIN Institute i2 ON i1.Institut_id = i2.fakultaets_id AND i2.fakultaets_id<>i2.Institut_id WHERE i1.fakultaets_id=i1.Institut_id GROUP BY i1.Institut_id ORDER BY Name");
+                $content .= "\n<tr><td>";
+                $content .= "\n<form action=\"" . URLHelper::getLink($this->getSelf("cmd=InsertFak")) . "\" method=\"post\" class=\"default\">"
+                    .  CSRFProtection::tokenTag()
+                    . '<div class="col-1"><label>'
+                    . _("Stud.IP Fakultät einfügen:")
+                    . "\n<select style=\"width:300px;vertical-align:middle;\" name=\"insert_fak\">";
+                while($rs->next_record()){
+                    $content .= "\n<option value=\"" . $rs->f("Institut_id") . "\">" . htmlReady(my_substr($rs->f("Name") . '('.$rs->f('num').')',0,60)) . "</option>";
+                }
+                $content .= "</select>"
+                    . '</label></div><div class="col-1">'
+                    . Button::create(_("Fakultät einfügen"))
+                    ."</div></form>";
+                $content .= " </td></tr>";
+            }
+            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
+            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . htmlReady($this->root_content) ." </td></tr>";
+            $content .= "\n</table>";
+            return $content;
+        }
+        $range_object = RangeTreeObject::GetInstance($item_id);
+        $name = !empty($range_object->item_data['type']) ? $range_object->item_data['type'] . ": " : "";
+        $name .= $range_object->item_data['name'];
+        $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\" style=\"font-size:10pt\">" . htmlReady($name) ." </td></tr>";
+        if (is_array($range_object->item_data_mapping)){
+            $content .= "\n<tr><td class=\"blank\" align=\"left\" style=\"font-size:10pt\">";
+            foreach ($range_object->item_data_mapping as $key => $value){
+                if ($range_object->item_data[$key]){
+                    $content .= "<b>" . htmlReady($value) . ":</b>&nbsp;";
+                    $content .= formatLinks($range_object->item_data[$key]) . "&nbsp; ";
+                }
+            }
+            $content .= "&nbsp;";
+        } elseif (!$range_object->item_data['studip_object']){
+            $content .= "\n<tr><td class=\"blank\" align=\"left\" style=\"font-size:10pt\">" .
+                        _("Dieses Element ist keine Stud.IP-Einrichtung, es hat daher keine Grunddaten.");
+        } else {
+            $content .= "\n<tr><td class=\"blank\" align=\"left\" style=\"font-size:10pt\">" . _("Keine Grunddaten vorhanden!");
+        }
+        $content .= "\n<div class=\"blank\" align=\"left\" style=\"font-size:10pt\"><b>" . _("Mitarbeiter:") . "</b> " . $range_object->getNumStaff() . "</b></div>";
+        if ($this->isItemAdmin($item_id) && $range_object->item_data['studip_object']){
+            $content .= "\n<div class=\"blank\">";
+
+            $content .= LinkButton::create(_("Grunddaten in Stud.IP bearbeiten"), "dispatch.php/institute/basicdata/index?admin_inst_id=" . $range_object->item_data['studip_object_id']);
+            $content .= "</div>";
+        }
+
+        $content .= "</td></tr><tr><td>&nbsp;</td></tr>";
+
+        if ($this->mode == "NewCat" && ($this->edit_cat_item_id == $item_id)){
+            $categories =& $this->edit_cat_snap;
+        } else {
+            $categories =& $range_object->getCategories();
+        }
+        if (!$this->isItemAdmin($item_id)){
+            if ($categories->numRows){
+                while($categories->nextRow()){
+                    $content .= "\n<tr><td class=\"table_header_bold\" style=\"font-size:10pt\">" . formatReady($categories->getField("name")) . "</td></tr>";
+                    $content .= "\n<tr><td class=\"blank\" style=\"font-size:10pt\">" . formatReady($categories->getField("content")) . "</td></tr>";
+                }
+            } else {
+                $content .= "\n<tr><td class=\"blank\" style=\"font-size:10pt\">" . _("Keine weiteren Daten vorhanden!") . "</td></tr>";
+            }
+        } else {
+            $content .= "<tr><td class=\"blank\" style=\"font-size:10pt\">" . $this->getEditCatContent($item_id,$categories) . "</td></tr>";
+        }
+        $content .= "</table>";
+        return $content;
+    }
+
+    function getItemHead($item_id){
+        $head = "";
+        if ($this->mode == "MoveItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
+            && ($this->move_item_id != $item_id) && ($this->tree->tree_data[$this->move_item_id]['parent_id'] != $item_id)
+            && !$this->tree->isChildOf($this->move_item_id,$item_id)){
+            $head .= "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=DoMoveItem&item_id=$item_id")) . "\">"
+            .  Icon::create('arr_2right', 'sort', ['title' => "An dieser Stelle einfügen"])->asImg(16, ["alt" => "An dieser Stelle einfügen"])."</a>&nbsp;";
+        }
+        $head .= parent::getItemHead($item_id);
+        if ($item_id != $this->start_item_id && $this->isParentAdmin($item_id) && $item_id != $this->edit_item_id){
+            $head .= "</td><td nowrap align=\"right\" valign=\"bottom\" class=\"printhead\">";
+            if (!$this->tree->isFirstKid($item_id)){
+                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=up&item_id=$item_id")) .
+                "\">" . Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach oben verschieben")]) . " ".
+                "</a>";
+            }
+            if (!$this->tree->isLastKid($item_id)){
+                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=down&item_id=$item_id")) .
+                "\">" . Icon::create('arr_2down', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach unten verschieben")]) . " ".
+                "</a>";
+            }
+            $head .= "&nbsp;";
+        }
+        return $head;
+    }
+
+    function getEditItemContent(){
+        $content = '';
+        ob_start();
+        ?>
+        <div style="margin: 0px 5%">
+            <form name="item_form" method="post" class="default"
+                  action="<?= URLHelper::getLink($this->getSelf("cmd=InsertItem&item_id={$this->edit_item_id}")) ?>">
+                <?= CSRFProtection::tokenTag(); ?>
+
+                <input type="hidden" name="parent_id" value="<?= $this->tree->tree_data[$this->edit_item_id]['parent_id'] ?>">
+
+                <table>
+                    <?= $this->getItemMessage($this->edit_item_id, 2) ?>
+                </table>
+
+                <fieldset>
+                    <legend>
+                        <?= _("Element bearbeiten") ?>
+                    </legend>
+
+                    <label>
+                        <?= _("Name des Elements") ?>
+                        <input type="text" name="edit_name" size="50"
+                               value="<?= htmlReady($this->tree->tree_data[$this->edit_item_id]['name']) ?>">
+                    </label>
+                </fieldset>
+
+                <fieldset>
+                    <legend>
+                        <?= _("Element mit einer Stud.IP-Einrichtung verlinken") ?>
+                    </legend>
+
+                    <label>
+                        <?= _("Stud.IP-Einrichtung:") ?>
+
+                        <select name="edit_studip_object" onChange="document.item_form.edit_name.value=document.item_form.edit_studip_object.options[document.item_form.edit_studip_object.selectedIndex].text;">
+                            <option value="none"
+                                <?= ($this->tree->tree_data[$this->edit_item_id]['studip_object']) ? '' : 'selected' ?>
+                            >
+                                <?= _("Kein Link") ?>
+                            </option>
+                            <? if ($this->tree->tree_data[$this->edit_item_id]['studip_object']) : ?>
+                            <option selected value="<?= $this->tree->tree_data[$this->edit_item_id]['studip_object_id']
+                                .':'. $this->tree->tree_data[$this->edit_item_id]['studip_object'] ?>"
+                            >
+                                <?= htmlReady($this->tree->tree_data[$this->edit_item_id]['name']) ?>
+                            </option>
+                            <? endif ?>
+
+                            <? if (is_array($this->search_result) && count($this->search_result)) : ?>
+                                <? foreach ($this->search_result as $key => $value) : ?>
+                                <option value="<?= $key .':'. $value['studip_object'] ?>">
+                                    <?= $value['name'] ?>
+                                </option>
+                                <? endforeach ?>
+                            <? endif ?>
+                        </select>
+                    </label>
+
+                    <label>
+                        <?= _("Stud.IP-Einrichtung suchen:") ?>
+                        <input type="text" name="edit_search">
+                    </label>
+                </fieldset>
+
+                <footer>
+                    <?= Button::createAccept(_("Absenden")) ?>
+                    <?= Button::create(_("Suchen"), [
+                        'formaction' => URLHelper::getURL($this->getSelf("cmd=SearchStudIP&item_id={$this->edit_item_id}"))
+                    ]);  ?>
+
+                    <?= LinkButton::createCancel(_("Abbrechen"), URLHelper::getURL($this->getSelf("cmd=Cancel&item_id=" . ($this->mode == "NewItem" ? $this->tree->tree_data[$this->edit_item_id]['parent_id'] : $this->edit_item_id)))) ?>
+                </footer>
+            </form>
+        </div>
+
+        <?
+        $content = ob_get_clean();
+        return $content;
+    }
+
+    function getEditCatContent($item_id, $cat_snap)
+    {
+        $content = '';
+        ob_start();
+        ?>
+        <form name="cat_form_<?= $item_id ?>" method="post" class="default"
+              action="<?= URLHelper::getLink($this->getSelf("cmd=UpdateCat&item_id=$item_id"))  ?>">
+            <?= CSRFProtection::tokenTag(); ?>
+
+            <? if ($cat_snap->numRows) while ($cat_snap->nextRow()) :  ?>
+                <fieldset>
+                    <legend>
+                        <!-- change position icons -->
+                        <? if ($cat_snap->pos && $cat_snap->getField("kategorie_id") != "new_entry") : ?>
+                            <a href="<?= URLHelper::getLink($this->getSelf("cmd=OrderCat&direction=up&item_id=$item_id&cat_id=" . $cat_snap->getField("kategorie_id"))) ?>">
+                                <?= Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-top', 'title' => _("Datenfeld nach oben")]) ?>
+                            </a>
+                        <? endif ?>
+
+                        <? if ($cat_snap->pos != $cat_snap->numRows-1 && $cat_snap->getField("kategorie_id") != "new_entry") : ?>
+                            <a href="<?= URLHelper::getLink($this->getSelf("cmd=OrderCat&direction=down&item_id=$item_id&cat_id=" . $cat_snap->getField("kategorie_id"))) ?>">
+                                <?= Icon::create('arr_2down', 'sort')->asImg(['class' => 'text-top', 'title' => _("Datenfeld nach unten")]) ?>
+                            </a>
+                        <? endif ?>
+
+                        <?= _('Datenfeld bearbeiten') ?>
+
+                        <a href="<?= URLHelper::getURL($this->getSelf("cmd=DeleteCat&item_id=$item_id&cat_id=" . $cat_snap->getField("kategorie_id"))) ?>">
+                            <?= Icon::create('trash', 'clickable')->asImg(['class' => 'text-top', 'title' => _("Datenfeld löschen")]) ?>
+                        </a>
+                    </legend>
+
+                    <label>
+                        <?= _('Titel') ?>
+                        <input type="text" name="cat_name[<?= $cat_snap->getField("kategorie_id") ?>]"
+                               value="<?= htmlReady($cat_snap->getField("name")) ?>">
+                        <input type="hidden" name="cat_prio[<?= $cat_snap->getField("kategorie_id") ?>]"
+                               value="<?= htmlReady($cat_snap->getField("priority")) ?>">
+                    </label>
+
+                    <label>
+                        <?= _('Inhalt') ?>
+                        <textarea name="cat_content[<?= htmlReady($cat_snap->getField("kategorie_id")) ?>]"><?= htmlReady($cat_snap->getField("content")) ?></textarea>
+                    </label>
+                </fieldset>
+            <? endwhile ?>
+
+            <footer>
+                <? if ($cat_snap->numRows) : ?>
+                <?= Button::create(_("Datenfelder speichern"), 'übernehmen') ?>
+                <? endif ?>
+                <?= LinkButton::create(_("Neues Datenfeld anlegen"), URLHelper::getURL($this->getSelf("cmd=NewCat&item_id=$item_id"))) ?>
+            </footer>
+        </form>
+
+        <? $content = ob_get_clean() . '</td></tr>';
+
+        return $content;
+    }
+
+    function getItemMessage($item_id, $colspan = 1)
+    {
+        $content = "";
+        if (!empty($this->msg[$item_id])) {
+            $msg = explode("§", $this->msg[$item_id]);
+            $pics = [
+                'error' => Icon::create('decline', 'attention'),
+                'info'  => Icon::create('exclaim', 'inactive'),
+                'msg'   => Icon::create('accept', 'accept')];
+            $content = "\n<tr><td colspan=\"{$colspan}\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\" style=\"font-size:10pt\">
+                        <tr><td class=\"blank\" align=\"center\" width=\"25\">" .  $pics[$msg[0]]->asImg(['class' => 'text-top']) . "</td>
+                        <td class=\"blank\" align=\"left\">" . $msg[1] . "</td></tr>
+                        </table></td></tr><tr>";
+        }
+        return $content;
+    }
+
+    function getSelf($param = ''){
+        $url_params = "foo=" . DbView::get_uniqid();
+        if ($this->mode) $url_params .= "&mode=" . $this->mode;
+        if ($param) $url_params .= '&' . $param;
+        return parent::getSelf($url_params);
+    }
+}
+
+//test
+//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
+//include 'lib/include/html_head.inc.php';
+//$test = new StudipRangeTreeViewAdmin();
+//$test->showTree();
+//echo "</table>";
+//page_close();
+?>
diff --git a/lib/classes/StudipSemRangeTreeViewSimple.class.php b/lib/classes/StudipSemRangeTreeViewSimple.class.php
deleted file mode 100644
index eecdd70..0000000
--- a/lib/classes/StudipSemRangeTreeViewSimple.class.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemRangeTreeViewSimple.class.php
-// Class to print out the seminar tree
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-
-/**
-* class to print out the range tree
-*
-* This class prints out a html representation a part of the tree
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipSemRangeTreeViewSimple {
-
-
-    var $tree;
-    var $show_entries;
-    var $start_item_id;
-    var $root_content;
-
-    /**
-    * constructor
-    *
-    * @access public
-    */
-    function __construct($start_item_id = "root", $sem_number = false, $sem_status = false, $visible_only = false){
-        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
-        $this->root_content = $GLOBALS['UNI_INFO'];
-        $args = null;
-        if ($sem_number !== false){
-            $args['sem_number'] = $sem_number;
-        }
-        if ($sem_status !== false){
-            $args['sem_status'] =  $sem_status;
-        }
-        $args['visible_only'] = $visible_only;
-        $this->tree = TreeAbstract::GetInstance("StudipRangeTree",$args);
-        if (empty($this->tree->tree_data[$this->start_item_id])) {
-            $this->start_item_id = "root";
-        }
-    }
-
-    public function showSemRangeTree($start_id = null)
-    {
-        echo '
-            <table class="show-tree">
-                <tr>
-                    <td style="text-align:left; vertical-align:top; font-size:10pt; padding-bottom: 10px;">
-                        <div style="font-size:10pt; margin-left:0px;display: inline-flex;">
-                            <div class="sem-root-icon"><a href="' .URLHelper::getLink($this->getSelf('start_item_id=root', false)). "\">" .
-                            Icon::create('institute', 'clickable')->asImg(29,['role'=>'root-icon'])
-                            .'</a></div>
-                            <div class="sem-path">'.
-                                '<div class="sem-path-dir">'.
-                                    $this->getSemPath($start_id);
-                        echo '</div>
-                                <div class="sem_path_info">
-                                    <div class="sem_path_title">'.
-                                    formatReady($this->tree->getValue($this->start_item_id, 'name')).
-                                    '</div>
-                                    <div class="sem_path_text">' .
-
-                                    formatReady($this->getTooltip($this->start_item_id)) .
-                                    '</div>
-                                </div>';
-                    echo'</div>
-                        </div>
-                    </td>
-                    <td nowrap style="text-align:right; vertical-align:top; padding-top: 1em;">';
-        if ($this->start_item_id != 'root') {
-            echo '
-                <a href="' .
-                    URLHelper::getLink($this->getSelf('start_item_id=' . $this->tree->tree_data[$this->start_item_id]['parent_id'], false)) .
-                    '">' .
-                    Icon::create('arr_2left', 'clickable')->asImg(['class' => 'text-top', 'title' =>_('eine Ebene zurück')]) .
-                '</a>';
-        } else {
-            echo '&nbsp;';
-        }
-        echo '
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="text-align:center;" class="b-top-va-center">';
-        $this->showKids($this->start_item_id);
-        echo '
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="text-align:left;" class="b-top-va-center">';
-        $this->showContent($this->start_item_id);
-        echo '
-                    </td>
-                </tr>
-            </table>';
-    }
-
-    function showKids($item_id){
-        $num_kids = $this->tree->getNumKids($item_id);
-        $kids = $this->tree->getKids($item_id);
-        $kids_table = '
-          <table class="show-tree-kids">
-            <tr>
-                <td class="table_row_even kids-tree-row" align="left" valign="top">
-                    <ul class="semtree">';
-        for ($i = 0; $i < $num_kids; ++$i){
-            $num_entries = $this->tree->getNumEntries($kids[$i],true);
-            $kids_table .=  "<li><a " . tooltip(sprintf(_("%s Einträge in allen Unterebenen vorhanden"), $num_entries)) . " href=\"" .URLHelper::getLink($this->getSelf("start_item_id={$kids[$i]}", false)) . "\">";
-            $kids_table .=  htmlReady($this->tree->tree_data[$kids[$i]]['name']);
-            $kids_table .=  " ($num_entries)";
-            $kids_table .=  "</a></li>";
-            if ($i == ceil($num_kids / 2)-1){
-                $kids_table .= '
-                    </ul>
-                </td>
-                <td class="table_row_even kids-tree-row" align="left" valign="top">
-                    <ul class="semtree">';
-            }
-        }
-        if (!$num_kids){
-            $kids_table .=  "<li>";
-            $kids_table .=  _("Auf dieser Ebene existieren keine weiteren Unterebenen.");
-            $kids_table .=  "</li>";
-        }
-        $kids_table .=  "</ul></td></tr></table>";
-        echo $kids_table;
-    }
-
-    function getTooltip($item_id){
-        if ($item_id == "root"){
-            $ret = ($this->root_content) ? $this->root_content : _("Keine weitere Info vorhanden");
-        } else {
-            $info = '';
-            $range_object = RangeTreeObject::GetInstance($item_id);
-            if (is_array($range_object->item_data_mapping)){
-                foreach ($range_object->item_data_mapping as $key => $value){
-                    if ($range_object->item_data[$key]){
-                        $info .= $value . ": ";
-                        $info .= $range_object->item_data[$key].  " ";
-                    }
-                }
-            }
-            $ret = $info ?:  _("Keine weitere Info vorhanden");
-        }
-        return $ret;
-    }
-
-    public function getInfoIcon($item_id)
-    {
-        if ($item_id === 'root') {
-            $info = $this->root_content;
-        }
-        $ret = $info ? tooltipicon(kill_format($info)) : '';
-        return $ret;
-    }
-
-    function showContent($item_id){
-        echo "\n<div align=\"left\" style=\"margin-top:10px;margin-bottom:10px;font-size:10pt\">";
-        if ($item_id != "root"){
-
-            if ($num_entries = $this->tree->getNumEntries($item_id)){
-                if ($this->show_entries != "level"){
-                    echo "<a " . tooltip(_("alle Einträge auf dieser Ebene anzeigen")) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range_tree&item_id=$item_id")) ."\">";
-                }
-                printf(_("<b>%s</b> Einträge auf dieser Ebene.&nbsp;"),$num_entries);
-                if ($this->show_entries != "level"){
-                    echo "</a>";
-                }
-            } else {
-                    echo _("Keine Einträge auf dieser Ebene vorhanden!");
-            }
-            if ($this->tree->hasKids($item_id) && ($num_entries = $this->tree->getNumEntries($this->start_item_id,true))){
-                echo "&nbsp;&nbsp;&sol;&nbsp;&nbsp;";
-                if ($this->show_entries != "sublevels"){
-                    echo "<a " . tooltip(_("alle Einträge in allen Unterebenen anzeigen")) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range_tree&item_id={$this->start_item_id}_withkids")) ."\">";
-                }
-                printf(_("<b>%s</b> Einträge in allen Unterebenen vorhanden"), $num_entries);
-                if ($this->show_entries != "sublevels"){
-                    echo "</a>";
-                }
-            }
-        }
-        echo "\n</div>";
-    }
-
-    public function getSemPath($start_id = null)
-    {
-        $parents = $this->tree->getParents($this->start_item_id);
-        $ret = '';
-        if ($parents) {
-            $add_item = false;
-            $start_id = $start_id === null ? 'root' : $start_id;
-            for($i = count($parents) - 1; $i >= 0; --$i) {
-                if ($add_item || $start_id == $parents[$i]) {
-                    $ret .= ($add_item === TRUE ? '&nbsp;&sol;&nbsp;' : '')
-                            . '<a href="'
-                            . URLHelper::getLink($this->getSelf('start_item_id=' . $parents[$i], false))
-                            . '">'
-                            .  htmlReady($this->tree->tree_data[$parents[$i]]['name'])
-                            . '</a>';
-                    $add_item = true;
-                }
-            }
-        }
-        if ($this->start_item_id == 'root') {
-            $ret = '<a href="' . URLHelper::getLink($this->getSelf('start_item_id=root', false)) . '">' . $this->tree->root_name . '</a>';
-        } else {
-            $ret .= '&nbsp;&sol;&nbsp;<a href="' . URLHelper::getLink($this->getSelf('start_item_id=' . $this->start_item_id, false)). '">'. htmlReady($this->tree->tree_data[$this->start_item_id]['name']). '</a>';
-            $ret .= '&nbsp;&sol;&nbsp;&nbsp;';
-        }
-        return $ret;
-    }
-
-
-
-    function getSelf($param = '', $with_start_item = true){
-        $url_params = (($with_start_item) ? 'start_item_id=' . $this->start_item_id . '&' : '') . $param ;
-        return '?' . $url_params;
-    }
-}
-?>
diff --git a/lib/classes/StudipSemRangeTreeViewSimple.php b/lib/classes/StudipSemRangeTreeViewSimple.php
new file mode 100644
index 0000000..eecdd70
--- /dev/null
+++ b/lib/classes/StudipSemRangeTreeViewSimple.php
@@ -0,0 +1,247 @@
+<?php
+# Lifter001: TEST
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemRangeTreeViewSimple.class.php
+// Class to print out the seminar tree
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+
+/**
+* class to print out the range tree
+*
+* This class prints out a html representation a part of the tree
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipSemRangeTreeViewSimple {
+
+
+    var $tree;
+    var $show_entries;
+    var $start_item_id;
+    var $root_content;
+
+    /**
+    * constructor
+    *
+    * @access public
+    */
+    function __construct($start_item_id = "root", $sem_number = false, $sem_status = false, $visible_only = false){
+        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
+        $this->root_content = $GLOBALS['UNI_INFO'];
+        $args = null;
+        if ($sem_number !== false){
+            $args['sem_number'] = $sem_number;
+        }
+        if ($sem_status !== false){
+            $args['sem_status'] =  $sem_status;
+        }
+        $args['visible_only'] = $visible_only;
+        $this->tree = TreeAbstract::GetInstance("StudipRangeTree",$args);
+        if (empty($this->tree->tree_data[$this->start_item_id])) {
+            $this->start_item_id = "root";
+        }
+    }
+
+    public function showSemRangeTree($start_id = null)
+    {
+        echo '
+            <table class="show-tree">
+                <tr>
+                    <td style="text-align:left; vertical-align:top; font-size:10pt; padding-bottom: 10px;">
+                        <div style="font-size:10pt; margin-left:0px;display: inline-flex;">
+                            <div class="sem-root-icon"><a href="' .URLHelper::getLink($this->getSelf('start_item_id=root', false)). "\">" .
+                            Icon::create('institute', 'clickable')->asImg(29,['role'=>'root-icon'])
+                            .'</a></div>
+                            <div class="sem-path">'.
+                                '<div class="sem-path-dir">'.
+                                    $this->getSemPath($start_id);
+                        echo '</div>
+                                <div class="sem_path_info">
+                                    <div class="sem_path_title">'.
+                                    formatReady($this->tree->getValue($this->start_item_id, 'name')).
+                                    '</div>
+                                    <div class="sem_path_text">' .
+
+                                    formatReady($this->getTooltip($this->start_item_id)) .
+                                    '</div>
+                                </div>';
+                    echo'</div>
+                        </div>
+                    </td>
+                    <td nowrap style="text-align:right; vertical-align:top; padding-top: 1em;">';
+        if ($this->start_item_id != 'root') {
+            echo '
+                <a href="' .
+                    URLHelper::getLink($this->getSelf('start_item_id=' . $this->tree->tree_data[$this->start_item_id]['parent_id'], false)) .
+                    '">' .
+                    Icon::create('arr_2left', 'clickable')->asImg(['class' => 'text-top', 'title' =>_('eine Ebene zurück')]) .
+                '</a>';
+        } else {
+            echo '&nbsp;';
+        }
+        echo '
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" style="text-align:center;" class="b-top-va-center">';
+        $this->showKids($this->start_item_id);
+        echo '
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" style="text-align:left;" class="b-top-va-center">';
+        $this->showContent($this->start_item_id);
+        echo '
+                    </td>
+                </tr>
+            </table>';
+    }
+
+    function showKids($item_id){
+        $num_kids = $this->tree->getNumKids($item_id);
+        $kids = $this->tree->getKids($item_id);
+        $kids_table = '
+          <table class="show-tree-kids">
+            <tr>
+                <td class="table_row_even kids-tree-row" align="left" valign="top">
+                    <ul class="semtree">';
+        for ($i = 0; $i < $num_kids; ++$i){
+            $num_entries = $this->tree->getNumEntries($kids[$i],true);
+            $kids_table .=  "<li><a " . tooltip(sprintf(_("%s Einträge in allen Unterebenen vorhanden"), $num_entries)) . " href=\"" .URLHelper::getLink($this->getSelf("start_item_id={$kids[$i]}", false)) . "\">";
+            $kids_table .=  htmlReady($this->tree->tree_data[$kids[$i]]['name']);
+            $kids_table .=  " ($num_entries)";
+            $kids_table .=  "</a></li>";
+            if ($i == ceil($num_kids / 2)-1){
+                $kids_table .= '
+                    </ul>
+                </td>
+                <td class="table_row_even kids-tree-row" align="left" valign="top">
+                    <ul class="semtree">';
+            }
+        }
+        if (!$num_kids){
+            $kids_table .=  "<li>";
+            $kids_table .=  _("Auf dieser Ebene existieren keine weiteren Unterebenen.");
+            $kids_table .=  "</li>";
+        }
+        $kids_table .=  "</ul></td></tr></table>";
+        echo $kids_table;
+    }
+
+    function getTooltip($item_id){
+        if ($item_id == "root"){
+            $ret = ($this->root_content) ? $this->root_content : _("Keine weitere Info vorhanden");
+        } else {
+            $info = '';
+            $range_object = RangeTreeObject::GetInstance($item_id);
+            if (is_array($range_object->item_data_mapping)){
+                foreach ($range_object->item_data_mapping as $key => $value){
+                    if ($range_object->item_data[$key]){
+                        $info .= $value . ": ";
+                        $info .= $range_object->item_data[$key].  " ";
+                    }
+                }
+            }
+            $ret = $info ?:  _("Keine weitere Info vorhanden");
+        }
+        return $ret;
+    }
+
+    public function getInfoIcon($item_id)
+    {
+        if ($item_id === 'root') {
+            $info = $this->root_content;
+        }
+        $ret = $info ? tooltipicon(kill_format($info)) : '';
+        return $ret;
+    }
+
+    function showContent($item_id){
+        echo "\n<div align=\"left\" style=\"margin-top:10px;margin-bottom:10px;font-size:10pt\">";
+        if ($item_id != "root"){
+
+            if ($num_entries = $this->tree->getNumEntries($item_id)){
+                if ($this->show_entries != "level"){
+                    echo "<a " . tooltip(_("alle Einträge auf dieser Ebene anzeigen")) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range_tree&item_id=$item_id")) ."\">";
+                }
+                printf(_("<b>%s</b> Einträge auf dieser Ebene.&nbsp;"),$num_entries);
+                if ($this->show_entries != "level"){
+                    echo "</a>";
+                }
+            } else {
+                    echo _("Keine Einträge auf dieser Ebene vorhanden!");
+            }
+            if ($this->tree->hasKids($item_id) && ($num_entries = $this->tree->getNumEntries($this->start_item_id,true))){
+                echo "&nbsp;&nbsp;&sol;&nbsp;&nbsp;";
+                if ($this->show_entries != "sublevels"){
+                    echo "<a " . tooltip(_("alle Einträge in allen Unterebenen anzeigen")) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range_tree&item_id={$this->start_item_id}_withkids")) ."\">";
+                }
+                printf(_("<b>%s</b> Einträge in allen Unterebenen vorhanden"), $num_entries);
+                if ($this->show_entries != "sublevels"){
+                    echo "</a>";
+                }
+            }
+        }
+        echo "\n</div>";
+    }
+
+    public function getSemPath($start_id = null)
+    {
+        $parents = $this->tree->getParents($this->start_item_id);
+        $ret = '';
+        if ($parents) {
+            $add_item = false;
+            $start_id = $start_id === null ? 'root' : $start_id;
+            for($i = count($parents) - 1; $i >= 0; --$i) {
+                if ($add_item || $start_id == $parents[$i]) {
+                    $ret .= ($add_item === TRUE ? '&nbsp;&sol;&nbsp;' : '')
+                            . '<a href="'
+                            . URLHelper::getLink($this->getSelf('start_item_id=' . $parents[$i], false))
+                            . '">'
+                            .  htmlReady($this->tree->tree_data[$parents[$i]]['name'])
+                            . '</a>';
+                    $add_item = true;
+                }
+            }
+        }
+        if ($this->start_item_id == 'root') {
+            $ret = '<a href="' . URLHelper::getLink($this->getSelf('start_item_id=root', false)) . '">' . $this->tree->root_name . '</a>';
+        } else {
+            $ret .= '&nbsp;&sol;&nbsp;<a href="' . URLHelper::getLink($this->getSelf('start_item_id=' . $this->start_item_id, false)). '">'. htmlReady($this->tree->tree_data[$this->start_item_id]['name']). '</a>';
+            $ret .= '&nbsp;&sol;&nbsp;&nbsp;';
+        }
+        return $ret;
+    }
+
+
+
+    function getSelf($param = '', $with_start_item = true){
+        $url_params = (($with_start_item) ? 'start_item_id=' . $this->start_item_id . '&' : '') . $param ;
+        return '?' . $url_params;
+    }
+}
+?>
diff --git a/lib/classes/StudipSemSearch.class.php b/lib/classes/StudipSemSearch.class.php
deleted file mode 100644
index 8932dd1..0000000
--- a/lib/classes/StudipSemSearch.class.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemSearchForm.class.php
-// Class to build search formular and execute search
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* Class to build search formular and execute search
-*
-*
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package  DBTools
-**/
-class StudipSemSearch {
-
-    var $form;
-    var $search_result;
-    var $form_name;
-    var $sem_tree;
-    var $range_tree;
-    var $search_done = false;
-    var $found_rows = false;
-    var $search_button_clicked = false;
-    var $new_search_button_clicked = false;
-    var $sem_change_button_clicked = false;
-    var $override_sem = false;
-    var $attributes_default = ['style' => 'width:100%;'];
-    var $search_scopes = [];
-    var $search_ranges = [];
-    var $search_sem_class = 'all';
-    var $visible_only = false;
-    var $sem_dates;
-
-    function __construct($form_name = "search_sem", $auto_search = true, $visible_only = false, $sem_class = 'all'){
-
-        $search_fields = ['title' => ['type' => 'text'],
-                                'sub_title' => ['type' => 'text'],
-                                'number' => ['type' => 'text'],
-                                'comment' => ['type' => 'text'],
-                                'lecturer' => ['type' => 'text'],
-                                'scope' => ['type' => 'text'],
-                                'quick_search' => ['type' => 'text'],
-                                'type' => ['type' => 'select', 'default_value' => 'all', 'max_length' => 35,'options_callback' => [$this, 'getSelectOptions']],
-                                'sem' => ['type' => 'select', 'default_value' => 'all','options_callback' => [$this, 'getSelectOptions']],
-                                'category' => ['type' => 'select', 'default_value' => 'all', 'max_length' => 50,'options_callback' => [$this, 'getSelectOptions']],
-                                'combination' => ['type' => 'select', 'default_value' => 'AND','options_callback' => [$this, 'getSelectOptions']],
-                                'scope_choose' => ['type' => 'select', 'default_value' => 'root', 'max_length' => 45,'options_callback' => [$this, 'getSelectOptions']],
-                                'range_choose' => ['type' => 'select', 'default_value' => 'root', 'max_length' => 45,'options_callback' => [$this, 'getSelectOptions']],
-                                'qs_choose' => ['type' => 'select',
-                                                    'default_value' => 'title_lecturer_number',
-                                                    'options_callback' => [$this, 'getSelectOptions']
-                                                    ]
-                                ];
-        $search_buttons = ['do_search' => ['caption' => _("Suchen"), 'info' => _("Suche starten")],
-                                'sem_change' => ['caption' => _('Auswählen'), 'info' => _("anderes Semester auswählen")],
-                                'new_search' => ['caption' => _('Neue Suche'), 'info' =>_("Neue Suche starten")]];
-        //workaround: Qicksearch ändert den Namen des Eingabefeldes
-        if (Request::get("search_sem_quick_search_parameter")) {
-            Request::set('search_sem_quick_search', Request::get("search_sem_quick_search_parameter"));
-        }
-        $this->form = new StudipForm($search_fields, $search_buttons, $form_name , false);
-        $this->form_name = $form_name;
-        $this->sem_dates = Semester::findAllVisible();
-        $this->visible_only = $visible_only;
-        $this->search_sem_class = $sem_class;
-
-        if($this->form->isClicked('do_search') || ($this->form->isSended() && (!$this->form->isClicked('sem_change') || mb_strlen($this->form->getFormFieldValue('quick_search')) > 2))){
-            $this->search_button_clicked = true;
-            if ($auto_search){
-                $this->doSearch();
-                $this->search_done = true;
-            }
-        }
-
-        $this->new_search_button_clicked = $this->form->isClicked('new_search');
-        $this->sem_change_button_clicked = $this->form->isClicked('do_search');
-
-    }
-
-    function getSearchField($name,$attributes = false,$default = false){
-        if (!$attributes){
-            $attributes = $this->attributes_default;
-        }
-        return $this->form->getFormField($name,$attributes,$default);
-    }
-
-    function getSelectOptions($caller, $name){
-        $options = [];
-        if ($name == "combination"){
-            $options = [['name' =>_("UND"),'value' => 'AND'],['name' => _("ODER"), 'value' => 'OR']];
-        } elseif ($name == "sem"){
-            $options = [['name' =>_("alle"),'value' => 'all']];
-            for ($i = count($this->sem_dates) -1 ; $i >= 0; --$i){
-                $options[] = ['name' => $this->sem_dates[$i]['name'], 'value' => $i];
-            }
-        } elseif ($name == "type"){
-            $options = [['name' =>_("alle"),'value' => 'all']];
-            foreach($GLOBALS['SEM_TYPE'] as $type_key => $type_value){
-                if($this->search_sem_class == 'all' || $type_value['class'] == $this->search_sem_class){
-                    $options[] = ['name' => $type_value['name'] . " (". $GLOBALS['SEM_CLASS'][$type_value['class']]['name'] .")",
-                                        'value' => $type_key];
-                }
-            }
-        } elseif ($name == "category"){
-            $options = [['name' =>_("alle"),'value' => 'all']];
-            foreach($GLOBALS['SEM_CLASS'] as $class_key => $class_value){
-                $options[] = ['name' => $class_value['name'],
-                                        'value' => $class_key];
-                }
-        } elseif ($name == "scope_choose"){
-            if(!is_object($this->sem_tree)){
-                $this->sem_tree = TreeAbstract::GetInstance("StudipSemTree", false);
-            }
-            $options = [['name' => $this->sem_tree->root_name, 'value' => 'root']];
-            for($i = 0; $i < count($this->search_scopes); ++$i){
-                $options[] = ['name' => $this->sem_tree->tree_data[$this->search_scopes[$i]]['name'], 'value' => $this->search_scopes[$i]];
-            }
-        } elseif ($name == "range_choose"){
-            if(!is_object($this->range_tree)){
-                $this->range_tree = TreeAbstract::GetInstance("StudipRangeTree", false);
-            }
-            $options = [['name' => $this->range_tree->root_name, 'value' => 'root']];
-            for($i = 0; $i < count($this->search_ranges); ++$i){
-                $options[] = ['name' => $this->range_tree->tree_data[$this->search_ranges[$i]]['name'], 'value' => $this->search_ranges[$i]];
-            }
-        } elseif ($name == "qs_choose"){
-            foreach(StudipSemSearchHelper::GetQuickSearchFields() as $key => $value){
-                $options[] = ['name' => $value, 'value' => $key];
-            }
-        }
-        return $options;
-    }
-
-    function getFormStart($action = "", $attributes = [])
-    {
-        return $this->form->getFormStart($action, $attributes);
-    }
-
-    function getFormEnd()
-    {
-        $ret = '';
-        if ($this->search_sem_class != 'all'){
-            $ret = $this->form->getHiddenField('category',$this->search_sem_class);
-        }
-        return $ret . $this->form->getFormEnd();
-    }
-
-    function getHiddenField($name, $value = false){
-        return  $this->form->getHiddenField($name, $value);
-    }
-
-    function getSearchButton($attributes = false, $tooltip = false){
-        return $this->form->getFormButton('do_search', $attributes);
-    }
-    function getNewSearchButton($attributes = false, $tooltip = false){
-        return $this->form->getFormButton('new_search', $attributes);
-    }
-    function getSemChangeButton($attributes = false, $tooltip = false){
-        return $this->form->getFormButton('sem_change', $attributes);
-    }
-
-    function doSearch(){
-        $search_helper = new StudipSemSearchHelper($this->form, $this->visible_only);
-        $this->found_rows = $search_helper->doSearch();
-        $this->search_result = $search_helper->getSearchResultAsSnapshot();
-        return $this->found_rows;
-    }
-}
-?>
diff --git a/lib/classes/StudipSemSearch.php b/lib/classes/StudipSemSearch.php
new file mode 100644
index 0000000..8932dd1
--- /dev/null
+++ b/lib/classes/StudipSemSearch.php
@@ -0,0 +1,191 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemSearchForm.class.php
+// Class to build search formular and execute search
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* Class to build search formular and execute search
+*
+*
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package  DBTools
+**/
+class StudipSemSearch {
+
+    var $form;
+    var $search_result;
+    var $form_name;
+    var $sem_tree;
+    var $range_tree;
+    var $search_done = false;
+    var $found_rows = false;
+    var $search_button_clicked = false;
+    var $new_search_button_clicked = false;
+    var $sem_change_button_clicked = false;
+    var $override_sem = false;
+    var $attributes_default = ['style' => 'width:100%;'];
+    var $search_scopes = [];
+    var $search_ranges = [];
+    var $search_sem_class = 'all';
+    var $visible_only = false;
+    var $sem_dates;
+
+    function __construct($form_name = "search_sem", $auto_search = true, $visible_only = false, $sem_class = 'all'){
+
+        $search_fields = ['title' => ['type' => 'text'],
+                                'sub_title' => ['type' => 'text'],
+                                'number' => ['type' => 'text'],
+                                'comment' => ['type' => 'text'],
+                                'lecturer' => ['type' => 'text'],
+                                'scope' => ['type' => 'text'],
+                                'quick_search' => ['type' => 'text'],
+                                'type' => ['type' => 'select', 'default_value' => 'all', 'max_length' => 35,'options_callback' => [$this, 'getSelectOptions']],
+                                'sem' => ['type' => 'select', 'default_value' => 'all','options_callback' => [$this, 'getSelectOptions']],
+                                'category' => ['type' => 'select', 'default_value' => 'all', 'max_length' => 50,'options_callback' => [$this, 'getSelectOptions']],
+                                'combination' => ['type' => 'select', 'default_value' => 'AND','options_callback' => [$this, 'getSelectOptions']],
+                                'scope_choose' => ['type' => 'select', 'default_value' => 'root', 'max_length' => 45,'options_callback' => [$this, 'getSelectOptions']],
+                                'range_choose' => ['type' => 'select', 'default_value' => 'root', 'max_length' => 45,'options_callback' => [$this, 'getSelectOptions']],
+                                'qs_choose' => ['type' => 'select',
+                                                    'default_value' => 'title_lecturer_number',
+                                                    'options_callback' => [$this, 'getSelectOptions']
+                                                    ]
+                                ];
+        $search_buttons = ['do_search' => ['caption' => _("Suchen"), 'info' => _("Suche starten")],
+                                'sem_change' => ['caption' => _('Auswählen'), 'info' => _("anderes Semester auswählen")],
+                                'new_search' => ['caption' => _('Neue Suche'), 'info' =>_("Neue Suche starten")]];
+        //workaround: Qicksearch ändert den Namen des Eingabefeldes
+        if (Request::get("search_sem_quick_search_parameter")) {
+            Request::set('search_sem_quick_search', Request::get("search_sem_quick_search_parameter"));
+        }
+        $this->form = new StudipForm($search_fields, $search_buttons, $form_name , false);
+        $this->form_name = $form_name;
+        $this->sem_dates = Semester::findAllVisible();
+        $this->visible_only = $visible_only;
+        $this->search_sem_class = $sem_class;
+
+        if($this->form->isClicked('do_search') || ($this->form->isSended() && (!$this->form->isClicked('sem_change') || mb_strlen($this->form->getFormFieldValue('quick_search')) > 2))){
+            $this->search_button_clicked = true;
+            if ($auto_search){
+                $this->doSearch();
+                $this->search_done = true;
+            }
+        }
+
+        $this->new_search_button_clicked = $this->form->isClicked('new_search');
+        $this->sem_change_button_clicked = $this->form->isClicked('do_search');
+
+    }
+
+    function getSearchField($name,$attributes = false,$default = false){
+        if (!$attributes){
+            $attributes = $this->attributes_default;
+        }
+        return $this->form->getFormField($name,$attributes,$default);
+    }
+
+    function getSelectOptions($caller, $name){
+        $options = [];
+        if ($name == "combination"){
+            $options = [['name' =>_("UND"),'value' => 'AND'],['name' => _("ODER"), 'value' => 'OR']];
+        } elseif ($name == "sem"){
+            $options = [['name' =>_("alle"),'value' => 'all']];
+            for ($i = count($this->sem_dates) -1 ; $i >= 0; --$i){
+                $options[] = ['name' => $this->sem_dates[$i]['name'], 'value' => $i];
+            }
+        } elseif ($name == "type"){
+            $options = [['name' =>_("alle"),'value' => 'all']];
+            foreach($GLOBALS['SEM_TYPE'] as $type_key => $type_value){
+                if($this->search_sem_class == 'all' || $type_value['class'] == $this->search_sem_class){
+                    $options[] = ['name' => $type_value['name'] . " (". $GLOBALS['SEM_CLASS'][$type_value['class']]['name'] .")",
+                                        'value' => $type_key];
+                }
+            }
+        } elseif ($name == "category"){
+            $options = [['name' =>_("alle"),'value' => 'all']];
+            foreach($GLOBALS['SEM_CLASS'] as $class_key => $class_value){
+                $options[] = ['name' => $class_value['name'],
+                                        'value' => $class_key];
+                }
+        } elseif ($name == "scope_choose"){
+            if(!is_object($this->sem_tree)){
+                $this->sem_tree = TreeAbstract::GetInstance("StudipSemTree", false);
+            }
+            $options = [['name' => $this->sem_tree->root_name, 'value' => 'root']];
+            for($i = 0; $i < count($this->search_scopes); ++$i){
+                $options[] = ['name' => $this->sem_tree->tree_data[$this->search_scopes[$i]]['name'], 'value' => $this->search_scopes[$i]];
+            }
+        } elseif ($name == "range_choose"){
+            if(!is_object($this->range_tree)){
+                $this->range_tree = TreeAbstract::GetInstance("StudipRangeTree", false);
+            }
+            $options = [['name' => $this->range_tree->root_name, 'value' => 'root']];
+            for($i = 0; $i < count($this->search_ranges); ++$i){
+                $options[] = ['name' => $this->range_tree->tree_data[$this->search_ranges[$i]]['name'], 'value' => $this->search_ranges[$i]];
+            }
+        } elseif ($name == "qs_choose"){
+            foreach(StudipSemSearchHelper::GetQuickSearchFields() as $key => $value){
+                $options[] = ['name' => $value, 'value' => $key];
+            }
+        }
+        return $options;
+    }
+
+    function getFormStart($action = "", $attributes = [])
+    {
+        return $this->form->getFormStart($action, $attributes);
+    }
+
+    function getFormEnd()
+    {
+        $ret = '';
+        if ($this->search_sem_class != 'all'){
+            $ret = $this->form->getHiddenField('category',$this->search_sem_class);
+        }
+        return $ret . $this->form->getFormEnd();
+    }
+
+    function getHiddenField($name, $value = false){
+        return  $this->form->getHiddenField($name, $value);
+    }
+
+    function getSearchButton($attributes = false, $tooltip = false){
+        return $this->form->getFormButton('do_search', $attributes);
+    }
+    function getNewSearchButton($attributes = false, $tooltip = false){
+        return $this->form->getFormButton('new_search', $attributes);
+    }
+    function getSemChangeButton($attributes = false, $tooltip = false){
+        return $this->form->getFormButton('sem_change', $attributes);
+    }
+
+    function doSearch(){
+        $search_helper = new StudipSemSearchHelper($this->form, $this->visible_only);
+        $this->found_rows = $search_helper->doSearch();
+        $this->search_result = $search_helper->getSearchResultAsSnapshot();
+        return $this->found_rows;
+    }
+}
+?>
diff --git a/lib/classes/StudipSemSearchHelper.class.php b/lib/classes/StudipSemSearchHelper.class.php
deleted file mode 100644
index 29ee5d3..0000000
--- a/lib/classes/StudipSemSearchHelper.class.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemSearchHelper.class.php
-//
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-class StudipSemSearchHelper {
-
-    public static function GetQuickSearchFields(){
-        return [   'all' =>_("alles"),
-                        'title_lecturer_number' => _("Titel") . ', ' . _("Lehrende") . ', ' . _("Nummer"),
-                        'title' => _("Titel"),
-                        'sub_title' => _("Untertitel"),
-                        'lecturer' => _("Lehrende"),
-                        'number' => _("Nummer"),
-                        'comment' => _("Kommentar"),
-                        'scope' => _("Bereich")];
-    }
-
-    private $search_result;
-    private $found_rows = false;
-    private $params = [];
-    private $visible_only;
-
-    function __construct($form = null, $visible_only = null){
-        $params = [];
-        if($form instanceof StudipForm){
-            foreach($form->getFormFieldsByName(true) as $name){
-                $params[$name] = $form->getFormFieldValue($name);
-            }
-        }
-        $this->setParams($params, $visible_only);
-    }
-
-    public function setParams($params, $visible_only = null)
-    {
-        if(isset($params['quick_search']) && isset($params['qs_choose'])){
-            if($params['qs_choose'] == 'all'){
-                foreach (self::GetQuickSearchFields() as $key => $value){
-                    $params[$key] = $this->trim($params['quick_search']);
-                }
-                $params['combination'] = 'OR';
-            } elseif($params['qs_choose'] == 'title_lecturer_number') {
-                foreach (explode('_', 'title_lecturer_number') as $key){
-                    $params[$key] = $this->trim($params['quick_search']);
-                }
-                $params['combination'] = 'OR';
-            } else {
-                $params[$params['qs_choose']] = $this->trim($params['quick_search']);
-            }
-        }
-        if(!isset($params['combination'])) $params['combination'] = 'AND';
-        $this->params = $params;
-        $this->visible_only = $visible_only;
-    }
-
-    public function doSearch()
-    {
-        if (count($this->params) === 0) {
-            return false;
-        }
-        $this->params = array_map('addslashes', $this->params);
-        $clause = "";
-        $and_clause = "";
-        $this->search_result = new DbSnapshot();
-        $combination = $this->params['combination'];
-
-        $view = DbView::getView('sem_tree');
-
-        if (isset($this->params['sem']) && $this->params['sem'] !== 'all'){
-            $sem_number = (int)$this->params['sem'];
-            $clause = " HAVING (sem_number <= $sem_number AND (sem_number_end >= $sem_number OR sem_number_end = -1)) ";
-        }
-
-        $sem_types = [];
-        if (isset($this->params['category']) && $this->params['category'] !== 'all') {
-            foreach ($GLOBALS['SEM_TYPE'] as $type_key => $type_value) {
-                if ($type_value['class'] == $this->params['category']) {
-                    $sem_types[] = $type_key;
-                }
-            }
-        }
-
-        if (isset($this->params['type']) && $this->params['type'] != 'all'){
-            $sem_types = [$this->params['type']];
-        }
-        if ($sem_types) {
-            $clause = " AND c.status IN('" . join("','",$sem_types) . "') " . $clause;
-        }
-
-        $view->params = [];
-
-        if ($this->params['scope_choose'] && $this->params['scope_choose'] != 'root'){
-            $sem_tree = TreeAbstract::GetInstance("StudipSemTree", false);
-            $view->params[0] = $sem_types ?: $sem_tree->sem_status;
-            $view->params[1] = $this->visible_only ? "c.visible=1" : "1";
-
-            $view->params[2] = $sem_tree->getKidsKids($this->params['scope_choose']);
-            $view->params[2][] = $this->params['scope_choose'];
-            $view->params[3] = $clause;
-            $snap = new DbSnapshot($view->get_query("view:SEM_TREE_GET_SEMIDS"));
-            if ($snap->numRows){
-                $clause = " AND c.seminar_id IN('" . join("','",$snap->getRows("seminar_id")) ."')" . $clause;
-            } else {
-                return 0;
-            }
-            unset($snap);
-        }
-
-        if ($this->params['range_choose'] && $this->params['range_choose'] != 'root'){
-            $range_object = RangeTreeObject::GetInstance($this->params['range_choose']);
-            $view->params[0] = $range_object->getAllObjectKids();
-            $view->params[0][] = $range_object->item_data['studip_object_id'];
-            $view->params[1] = ($this->visible_only ? " AND c.visible=1 " : "");
-            $view->params[2] = $clause;
-            $snap = new DbSnapshot($view->get_query("view:SEM_INST_GET_SEM"));
-            if ($snap->numRows){
-                $clause = " AND c.seminar_id IN('" . join("','",$snap->getRows("Seminar_id")) ."')" . $clause;
-            } else {
-                return 0;
-            }
-            unset($snap);
-        }
-
-
-        if (isset($this->params['lecturer']) && mb_strlen($this->params['lecturer']) > 2){
-            $view->params[0] = "%" . $this->trim($this->params['lecturer']) . "%";
-            $view->params[1] = "%" . $this->trim($this->params['lecturer']) . "%";
-            $view->params[2] = "%" . $this->trim($this->params['lecturer']) . "%";
-            $view->params[3] = "%" . $this->trim($this->params['lecturer']) . "%";
-            $view->params[4] = "%" . $this->trim($this->params['lecturer']) . "%";
-            $result = $view->get_query("view:SEM_SEARCH_LECTURER");
-
-            $lecturers = [];
-            while ($result->next_record()) {
-                $lecturers[] = $result->f('user_id');
-            }
-
-            if (count($lecturers)) {
-                $view->params[0] = $this->visible_only ? "c.visible=1" : "1";
-                $view->params[1] = $lecturers;
-                $view->params[2] = $clause;
-                $snap = new DbSnapshot($view->get_query("view:SEM_SEARCH_LECTURER_ID"));
-                $this->search_result = $snap;
-                $this->found_rows = $this->search_result->numRows;
-            }
-        }
-
-
-        if ($combination == "AND" && $this->search_result->numRows){
-            $and_clause = " AND c.seminar_id IN('" . join("','",$this->search_result->getRows("seminar_id")) ."')";
-        }
-
-        if ((isset($this->params['title']) && mb_strlen($this->params['title']) > 2) ||
-            (isset($this->params['sub_title']) && mb_strlen($this->params['sub_title']) > 2) ||
-            (isset($this->params['number']) && mb_strlen($this->params['number']) > 2) ||
-            (isset($this->params['comment']) && mb_strlen($this->params['comment']) > 2)){
-
-            $toFilter = explode(" ", $this->params['title']);
-            $search_for = "(Name LIKE '%" . implode("%' AND Name LIKE '%", $toFilter) . "%')";
-            if (!array_key_exists(0, $view->params)) {
-                $view->params[0] = '';
-            }
-            $view->params[0] .= ($this->params['title']) ? $search_for . " " : " ";
-            $view->params[0] .= ($this->params['title'] && !empty($this->params['sub_title'])) ? $combination : " ";
-            $view->params[0] .= (!empty($this->params['sub_title'])) ? " Untertitel LIKE '%" . $this->trim($this->params['sub_title']) . "%' " : " ";
-            $view->params[0] .= (($this->params['title'] || !empty($this->params['sub_title'])) && !empty($this->params['comment'])) ? $combination : " ";
-            $view->params[0] .= (!empty($this->params['comment'])) ? " Beschreibung LIKE '%" . $this->trim($this->params['comment']) . "%' " : " ";
-            $view->params[0] .= (($this->params['title'] || !empty($this->params['sub_title']) || empty($this->params['comment'])) && $this->params['number']) ? $combination : " ";
-            $view->params[0] .= ($this->params['number']) ? " VeranstaltungsNummer LIKE '%" . $this->trim($this->params['number']) . "%' " : " ";
-            $view->params[0] = ($this->visible_only ? " c.visible=1 AND " : "") . "(" . $view->params[0] .")";
-            $view->params[1] =  $and_clause . $clause;
-            $snap = new DbSnapshot($view->get_query("view:SEM_SEARCH_SEM"));
-            if ($this->found_rows === false){
-                $this->search_result = $snap;
-            } else {
-                $this->search_result->mergeSnapshot($snap,"seminar_id",$combination);
-            }
-            $this->found_rows = $this->search_result->numRows;
-        }
-
-        if ($combination == "AND" && $this->search_result->numRows){
-            $and_clause = " AND c.seminar_id IN('" . join("','",$this->search_result->getRows("seminar_id")) ."')";
-        }
-
-        if (isset($this->params['scope']) && mb_strlen($this->params['scope']) > 2){
-            $view->params[0] = $this->visible_only ? "c.visible=1" : "1";
-            $view->params[1] = "%" . $this->trim($this->params['scope']) . "%";
-            $view->params[2] = $and_clause . $clause;
-            $snap = new DbSnapshot($view->get_query("view:SEM_TREE_SEARCH_SEM"));
-            if ($this->found_rows === false){
-                $this->search_result = $snap;
-            } else {
-                $this->search_result->mergeSnapshot($snap,"seminar_id",$combination);
-            }
-            $this->found_rows = $this->search_result->numRows;
-        }
-        return $this->found_rows;
-    }
-
-    public function getSearchResultAsSnapshot(){
-        return $this->search_result;
-    }
-
-    public function getSearchResultAsArray(){
-        if($this->search_result instanceof DBSnapshot && $this->search_result->numRows){
-            return array_unique($this->search_result->getRows('seminar_id'));
-        } else {
-            return [];
-        }
-    }
-
-    private function trim($what)
-    {
-        $what = trim($what);
-        $what = preg_replace("/^\x{00A0}+|\x{00A0}+$/Su", '', $what);
-        return $what;
-    }
-}
diff --git a/lib/classes/StudipSemSearchHelper.php b/lib/classes/StudipSemSearchHelper.php
new file mode 100644
index 0000000..29ee5d3
--- /dev/null
+++ b/lib/classes/StudipSemSearchHelper.php
@@ -0,0 +1,239 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemSearchHelper.class.php
+//
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+class StudipSemSearchHelper {
+
+    public static function GetQuickSearchFields(){
+        return [   'all' =>_("alles"),
+                        'title_lecturer_number' => _("Titel") . ', ' . _("Lehrende") . ', ' . _("Nummer"),
+                        'title' => _("Titel"),
+                        'sub_title' => _("Untertitel"),
+                        'lecturer' => _("Lehrende"),
+                        'number' => _("Nummer"),
+                        'comment' => _("Kommentar"),
+                        'scope' => _("Bereich")];
+    }
+
+    private $search_result;
+    private $found_rows = false;
+    private $params = [];
+    private $visible_only;
+
+    function __construct($form = null, $visible_only = null){
+        $params = [];
+        if($form instanceof StudipForm){
+            foreach($form->getFormFieldsByName(true) as $name){
+                $params[$name] = $form->getFormFieldValue($name);
+            }
+        }
+        $this->setParams($params, $visible_only);
+    }
+
+    public function setParams($params, $visible_only = null)
+    {
+        if(isset($params['quick_search']) && isset($params['qs_choose'])){
+            if($params['qs_choose'] == 'all'){
+                foreach (self::GetQuickSearchFields() as $key => $value){
+                    $params[$key] = $this->trim($params['quick_search']);
+                }
+                $params['combination'] = 'OR';
+            } elseif($params['qs_choose'] == 'title_lecturer_number') {
+                foreach (explode('_', 'title_lecturer_number') as $key){
+                    $params[$key] = $this->trim($params['quick_search']);
+                }
+                $params['combination'] = 'OR';
+            } else {
+                $params[$params['qs_choose']] = $this->trim($params['quick_search']);
+            }
+        }
+        if(!isset($params['combination'])) $params['combination'] = 'AND';
+        $this->params = $params;
+        $this->visible_only = $visible_only;
+    }
+
+    public function doSearch()
+    {
+        if (count($this->params) === 0) {
+            return false;
+        }
+        $this->params = array_map('addslashes', $this->params);
+        $clause = "";
+        $and_clause = "";
+        $this->search_result = new DbSnapshot();
+        $combination = $this->params['combination'];
+
+        $view = DbView::getView('sem_tree');
+
+        if (isset($this->params['sem']) && $this->params['sem'] !== 'all'){
+            $sem_number = (int)$this->params['sem'];
+            $clause = " HAVING (sem_number <= $sem_number AND (sem_number_end >= $sem_number OR sem_number_end = -1)) ";
+        }
+
+        $sem_types = [];
+        if (isset($this->params['category']) && $this->params['category'] !== 'all') {
+            foreach ($GLOBALS['SEM_TYPE'] as $type_key => $type_value) {
+                if ($type_value['class'] == $this->params['category']) {
+                    $sem_types[] = $type_key;
+                }
+            }
+        }
+
+        if (isset($this->params['type']) && $this->params['type'] != 'all'){
+            $sem_types = [$this->params['type']];
+        }
+        if ($sem_types) {
+            $clause = " AND c.status IN('" . join("','",$sem_types) . "') " . $clause;
+        }
+
+        $view->params = [];
+
+        if ($this->params['scope_choose'] && $this->params['scope_choose'] != 'root'){
+            $sem_tree = TreeAbstract::GetInstance("StudipSemTree", false);
+            $view->params[0] = $sem_types ?: $sem_tree->sem_status;
+            $view->params[1] = $this->visible_only ? "c.visible=1" : "1";
+
+            $view->params[2] = $sem_tree->getKidsKids($this->params['scope_choose']);
+            $view->params[2][] = $this->params['scope_choose'];
+            $view->params[3] = $clause;
+            $snap = new DbSnapshot($view->get_query("view:SEM_TREE_GET_SEMIDS"));
+            if ($snap->numRows){
+                $clause = " AND c.seminar_id IN('" . join("','",$snap->getRows("seminar_id")) ."')" . $clause;
+            } else {
+                return 0;
+            }
+            unset($snap);
+        }
+
+        if ($this->params['range_choose'] && $this->params['range_choose'] != 'root'){
+            $range_object = RangeTreeObject::GetInstance($this->params['range_choose']);
+            $view->params[0] = $range_object->getAllObjectKids();
+            $view->params[0][] = $range_object->item_data['studip_object_id'];
+            $view->params[1] = ($this->visible_only ? " AND c.visible=1 " : "");
+            $view->params[2] = $clause;
+            $snap = new DbSnapshot($view->get_query("view:SEM_INST_GET_SEM"));
+            if ($snap->numRows){
+                $clause = " AND c.seminar_id IN('" . join("','",$snap->getRows("Seminar_id")) ."')" . $clause;
+            } else {
+                return 0;
+            }
+            unset($snap);
+        }
+
+
+        if (isset($this->params['lecturer']) && mb_strlen($this->params['lecturer']) > 2){
+            $view->params[0] = "%" . $this->trim($this->params['lecturer']) . "%";
+            $view->params[1] = "%" . $this->trim($this->params['lecturer']) . "%";
+            $view->params[2] = "%" . $this->trim($this->params['lecturer']) . "%";
+            $view->params[3] = "%" . $this->trim($this->params['lecturer']) . "%";
+            $view->params[4] = "%" . $this->trim($this->params['lecturer']) . "%";
+            $result = $view->get_query("view:SEM_SEARCH_LECTURER");
+
+            $lecturers = [];
+            while ($result->next_record()) {
+                $lecturers[] = $result->f('user_id');
+            }
+
+            if (count($lecturers)) {
+                $view->params[0] = $this->visible_only ? "c.visible=1" : "1";
+                $view->params[1] = $lecturers;
+                $view->params[2] = $clause;
+                $snap = new DbSnapshot($view->get_query("view:SEM_SEARCH_LECTURER_ID"));
+                $this->search_result = $snap;
+                $this->found_rows = $this->search_result->numRows;
+            }
+        }
+
+
+        if ($combination == "AND" && $this->search_result->numRows){
+            $and_clause = " AND c.seminar_id IN('" . join("','",$this->search_result->getRows("seminar_id")) ."')";
+        }
+
+        if ((isset($this->params['title']) && mb_strlen($this->params['title']) > 2) ||
+            (isset($this->params['sub_title']) && mb_strlen($this->params['sub_title']) > 2) ||
+            (isset($this->params['number']) && mb_strlen($this->params['number']) > 2) ||
+            (isset($this->params['comment']) && mb_strlen($this->params['comment']) > 2)){
+
+            $toFilter = explode(" ", $this->params['title']);
+            $search_for = "(Name LIKE '%" . implode("%' AND Name LIKE '%", $toFilter) . "%')";
+            if (!array_key_exists(0, $view->params)) {
+                $view->params[0] = '';
+            }
+            $view->params[0] .= ($this->params['title']) ? $search_for . " " : " ";
+            $view->params[0] .= ($this->params['title'] && !empty($this->params['sub_title'])) ? $combination : " ";
+            $view->params[0] .= (!empty($this->params['sub_title'])) ? " Untertitel LIKE '%" . $this->trim($this->params['sub_title']) . "%' " : " ";
+            $view->params[0] .= (($this->params['title'] || !empty($this->params['sub_title'])) && !empty($this->params['comment'])) ? $combination : " ";
+            $view->params[0] .= (!empty($this->params['comment'])) ? " Beschreibung LIKE '%" . $this->trim($this->params['comment']) . "%' " : " ";
+            $view->params[0] .= (($this->params['title'] || !empty($this->params['sub_title']) || empty($this->params['comment'])) && $this->params['number']) ? $combination : " ";
+            $view->params[0] .= ($this->params['number']) ? " VeranstaltungsNummer LIKE '%" . $this->trim($this->params['number']) . "%' " : " ";
+            $view->params[0] = ($this->visible_only ? " c.visible=1 AND " : "") . "(" . $view->params[0] .")";
+            $view->params[1] =  $and_clause . $clause;
+            $snap = new DbSnapshot($view->get_query("view:SEM_SEARCH_SEM"));
+            if ($this->found_rows === false){
+                $this->search_result = $snap;
+            } else {
+                $this->search_result->mergeSnapshot($snap,"seminar_id",$combination);
+            }
+            $this->found_rows = $this->search_result->numRows;
+        }
+
+        if ($combination == "AND" && $this->search_result->numRows){
+            $and_clause = " AND c.seminar_id IN('" . join("','",$this->search_result->getRows("seminar_id")) ."')";
+        }
+
+        if (isset($this->params['scope']) && mb_strlen($this->params['scope']) > 2){
+            $view->params[0] = $this->visible_only ? "c.visible=1" : "1";
+            $view->params[1] = "%" . $this->trim($this->params['scope']) . "%";
+            $view->params[2] = $and_clause . $clause;
+            $snap = new DbSnapshot($view->get_query("view:SEM_TREE_SEARCH_SEM"));
+            if ($this->found_rows === false){
+                $this->search_result = $snap;
+            } else {
+                $this->search_result->mergeSnapshot($snap,"seminar_id",$combination);
+            }
+            $this->found_rows = $this->search_result->numRows;
+        }
+        return $this->found_rows;
+    }
+
+    public function getSearchResultAsSnapshot(){
+        return $this->search_result;
+    }
+
+    public function getSearchResultAsArray(){
+        if($this->search_result instanceof DBSnapshot && $this->search_result->numRows){
+            return array_unique($this->search_result->getRows('seminar_id'));
+        } else {
+            return [];
+        }
+    }
+
+    private function trim($what)
+    {
+        $what = trim($what);
+        $what = preg_replace("/^\x{00A0}+|\x{00A0}+$/Su", '', $what);
+        return $what;
+    }
+}
diff --git a/lib/classes/StudipSemTree.class.php b/lib/classes/StudipSemTree.class.php
deleted file mode 100644
index 70743ad..0000000
--- a/lib/classes/StudipSemTree.class.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-
-/**
- * class to handle the seminar tree
- *
- * This class provides an interface to the structure of the seminar tree
- *
- * @access    public
- * @author    André Noack <noack@data-quest.de>
- * @license   GPL2 or any later version
- * @copyright 2003 André Noack <noack@data-quest.de>,
- *                 Suchi & Berg GmbH <info@data-quest.de>
- */
-class StudipSemTree extends TreeAbstract
-{
-    public $sem_dates = [];
-    public $sem_number = null;
-    public $visible_only = false;
-    public $sem_status = [];
-    protected $entries_init_done = false;
-
-    /**
-    * constructor
-    *
-    * do not use directly, call TreeAbstract::GetInstance("StudipRangeTree")
-    * @access private
-    */
-    public function __construct($args)
-    {
-        DbView::addView('sem_tree');
-
-        $this->root_name = Config::get()->UNI_NAME_CLEAN;
-        if (isset($args['visible_only'])) {
-            $this->visible_only = (int) $args['visible_only'];
-        }
-        if (isset($args['sem_number']) ){
-            $this->sem_number = array_map('intval', $args['sem_number']);
-        }
-        if (!empty($args['sem_status'])) {
-            $this->sem_status = array_map('intval', $args['sem_status']);
-        } else {
-            foreach ($GLOBALS['SEM_CLASS'] as $key => $value){
-                if ($value['bereiche']){
-                    foreach ($GLOBALS['SEM_TYPE'] as $type_key => $type_value) {
-                        if($type_value['class'] == $key)
-                            $this->sem_status[] = $type_key;
-                    }
-                }
-            }
-        }
-
-        if (!count($this->sem_status)){
-            $this->sem_status[] = -1;
-        }
-
-        parent::__construct(); //calling the baseclass constructor
-        if (isset($args['build_index']) ){
-            $this->buildIndex();
-        }
-
-        $this->sem_dates = Semester::findAllVisible();
-    }
-
-    /**
-    * initializes the tree
-    *
-    * stores all rows from table sem_tree in array $tree_data
-    * @access public
-    */
-    public function init()
-    {
-        parent::init();
-
-        $db = $this->view->get_query("view:SEM_TREE_GET_DATA_NO_ENTRIES");
-
-        while ($db->next_record()){
-            $this->tree_data[$db->f("sem_tree_id")] = ['type' => $db->f('type'), "info" => $db->f("info"), "entries" => 0];
-            $name = $db->f("name");
-            $this->storeItem($db->f("sem_tree_id"), $db->f("parent_id"), $name, $db->f("priority"));
-        }
-    }
-
-    public function initEntries()
-    {
-        $this->view->params[0] = $this->sem_status;
-        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
-        $this->view->params[1] .= (isset($this->sem_number)) ? " AND ((" . $this->view->sem_number_sql
-                                . ") IN (" . join(",",$this->sem_number) .") OR ((" . $this->view->sem_number_sql
-                                .") <= " . $this->sem_number[count($this->sem_number)-1]
-                                . "  AND ((" . $this->view->sem_number_end_sql . ") >= " . $this->sem_number[count($this->sem_number)-1]
-                                . " OR (" . $this->view->sem_number_end_sql . ") = -1))) " : "";
-
-        $db = $this->view->get_query("view:SEM_TREE_GET_ENTRIES");
-        while ($db->next_record()){
-            $this->tree_data[$db->f("sem_tree_id")]['entries'] = $db->f('entries');
-        }
-        $this->entries_init_done = true;
-    }
-
-    public function isModuleItem($item_id)
-    {
-        return isset($GLOBALS['SEM_TREE_TYPES'][$this->getValue($item_id, 'type')]['is_module']);
-    }
-
-    public function isHiddenItem($item_id)
-    {
-        return !empty($GLOBALS['SEM_TREE_TYPES'][$this->getValue($item_id, 'type')]['hidden']);
-    }
-
-    public function getSemIds($item_id,$ids_from_kids = false)
-    {
-        if (empty($this->tree_data[$item_id])) {
-            return false;
-        }
-        $this->view->params[0] = $this->sem_status;
-        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
-        if ($ids_from_kids && $item_id != 'root'){
-            $this->view->params[2] = $this->getKidsKids($item_id);
-        }
-        $this->view->params[2][] = $item_id;
-        $this->view->params[3] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : "";
-        $ret = false;
-        if ($item_id == 'root' && $ids_from_kids) {
-            unset($this->view->params[2]);
-            $this->view->params = array_values($this->view->params);
-            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMIDS_ROOT");
-        } else {
-            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMIDS");
-        }
-        while($rs->next_record()){
-            $ret[] = $rs->f(0);
-        }
-        return $ret;
-    }
-
-    public function getSemData($item_id,$sem_data_from_kids = false)
-    {
-        if (!$this->tree_data[$item_id])
-            return false;
-        $this->view->params[0] = $this->sem_status;
-        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
-        if ($sem_data_from_kids && $item_id != 'root'){
-            $this->view->params[2] = $this->getKidsKids($item_id);
-        }
-        $this->view->params[2][] = $item_id;
-        $this->view->params[3] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : "";
-        if ($item_id == 'root' && $sem_data_from_kids) {
-            unset($this->view->params[2]);
-            $this->view->params = array_values($this->view->params);
-            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMDATA_ROOT");
-        } else {
-            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMDATA");
-        }
-        return new DbSnapshot($rs);
-    }
-
-    public function getLonelySemData($item_id)
-    {
-        if (!$institut_id = $this->tree_data[$item_id]['studip_object_id'])
-            return false;
-        $this->view->params[0] = $this->sem_status;
-        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
-        $this->view->params[2] = $institut_id;
-        $this->view->params[3] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : "";
-        return new DbSnapshot($this->view->get_query("view:SEM_TREE_GET_LONELY_SEM_DATA"));
-    }
-
-    public function getNumEntries($item_id, $num_entries_from_kids = false)
-    {
-        if (empty($this->tree_data[$item_id])) {
-            return false;
-        }
-
-        if (empty($this->entries_init_done)) {
-            $this->initEntries();
-        }
-
-        return parent::getNumEntries($item_id, $num_entries_from_kids);
-        /*
-        if (!$num_entries_from_kids){
-            return $this->tree_data[$item_id]["entries"];
-        } else {
-            $item_list = $this->getKidsKids($item_id);
-            $item_list[] = $item_id;
-            $ret = 0;
-            $num_items = count($item_list);
-            for ($i = 0; $i < $num_items; ++$i){
-                $ret += $this->tree_data[$item_list[$i]]["entries"];
-            }
-            return $ret;
-        }
-        */
-    }
-
-    public function getAdminRange($item_id)
-    {
-        if (!$this->tree_data[$item_id])
-            return false;
-        if ($item_id == "root")
-            return "root";
-        $ret_id = $item_id;
-        while ($ret_id != "root"){
-            $ret_id = $this->tree_data[$ret_id]['parent_id'];
-        }
-        return $ret_id;
-    }
-
-    public function InsertItem($item_id, $parent_id, $item_name, $item_info, $priority, $studip_object_id, $type)
-    {
-        $view = new DbView();
-        $view->params = [$item_id,$parent_id,$item_name,$priority,$item_info,$studip_object_id, $type];
-        $rs = $view->get_query("view:SEM_TREE_INS_ITEM");
-        // Logging
-        StudipLog::log("STUDYAREA_ADD",$item_id);
-        NotificationCenter::postNotification("StudyAreaDidCreate", $item_id, $GLOBALS['user']->id);
-
-        return $rs->affected_rows();
-    }
-
-    public function UpdateItem($item_id, $item_name, $item_info, $type)
-    {
-        $view = new DbView();
-        $view->params = [$item_name,$item_info,$type,$item_id];
-        $rs = $view->get_query("view:SEM_TREE_UPD_ITEM");
-        NotificationCenter::postNotification("StudyAreaDidUpdate", $item_id, $GLOBALS['user']->id);
-
-        return $rs->affected_rows();
-    }
-
-    public function DeleteItems($items_to_delete)
-    {
-        $view = new DbView();
-        $view->params[0] = (is_array($items_to_delete)) ? $items_to_delete : [$items_to_delete];
-        $view->auto_free_params = false;
-        $rs = $view->get_query("view:SEM_TREE_DEL_ITEM");
-        $deleted['items'] = $rs->affected_rows();
-        $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_RANGE");
-        $deleted['entries'] = $rs->affected_rows();
-        // Logging
-        foreach ($items_to_delete as $item_id) {
-            StudipLog::log("STUDYAREA_DELETE",$item_id);
-            NotificationCenter::postNotification("StudyAreaDidDelete", $item_id, $GLOBALS['user']->id);
-         }
-        return $deleted;
-    }
-
-    public function DeleteSemEntries($item_ids = null, $sem_entries = null)
-    {
-        $view = new DbView();
-        if ($item_ids && $sem_entries) {
-            $sem_tree_ids = $view->params[0] = (is_array($item_ids)) ? $item_ids : [$item_ids];
-            $seminar_ids = $view->params[1] = (is_array($sem_entries)) ? $sem_entries : [$sem_entries];
-            $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_SEM_RANGE");
-            $ret = $rs->affected_rows();
-            // Logging
-            foreach ($sem_tree_ids as $range) {
-                foreach ($seminar_ids as $sem) {
-                    StudipLog::log("SEM_DELETE_STUDYAREA",$sem,$range);
-                }
-            }
-            if($ret){
-                foreach ($sem_tree_ids as $sem_tree_id){
-                    $studyarea = StudipStudyArea::find($sem_tree_id);
-                    if($studyarea->isModule()) {
-                        foreach ($seminar_ids as $seminar_id) {
-                            NotificationCenter::postNotification('CourseRemovedFromModule', $studyarea, ['module_id' => $sem_tree_id, 'course_id' => $seminar_id]);
-                        }
-                    }
-                }
-            }
-        } elseif ($item_ids){
-            $view->params[0] = (is_array($item_ids)) ? $item_ids : [$item_ids];
-            // Logging
-            foreach ($view->params[0] as $range) {
-                StudipLog::log("SEM_DELETE_STUDYAREA","all",$range);
-            }
-            $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_RANGE");
-            $ret = $rs->affected_rows();
-        } elseif ($sem_entries){
-            $view->params[0] = (is_array($sem_entries)) ? $sem_entries : [$sem_entries];
-            // Logging
-            foreach ($view->params[0] as $sem) {
-                StudipLog::log("SEM_DELETE_STUDYAREA",$sem,"all");
-            }
-            $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_SEMID_RANGE");
-            $ret = $rs->affected_rows();
-        } else {
-            $ret = false;
-        }
-
-        return $ret;
-    }
-
-    public function InsertSemEntry($sem_tree_id, $seminar_id)
-    {
-        $view = new DbView();
-        $view->params[0] = $seminar_id;
-        $view->params[1] = $sem_tree_id;
-        $rs = $view->get_query("view:SEMINAR_SEM_TREE_INS_ITEM");
-        if($ret = $rs->affected_rows()){
-            // Logging
-            StudipLog::log("SEM_ADD_STUDYAREA",$seminar_id,$sem_tree_id);
-            $studyarea = StudipStudyArea::find($sem_tree_id);
-            if($studyarea->isModule()){
-                NotificationCenter::postNotification('CourseAddedToModule', $studyarea, ['module_id' => $sem_tree_id, 'course_id' => $seminar_id]);
-            }
-        }
-        return $ret;
-    }
-}
diff --git a/lib/classes/StudipSemTree.php b/lib/classes/StudipSemTree.php
new file mode 100644
index 0000000..70743ad
--- /dev/null
+++ b/lib/classes/StudipSemTree.php
@@ -0,0 +1,312 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+
+/**
+ * class to handle the seminar tree
+ *
+ * This class provides an interface to the structure of the seminar tree
+ *
+ * @access    public
+ * @author    André Noack <noack@data-quest.de>
+ * @license   GPL2 or any later version
+ * @copyright 2003 André Noack <noack@data-quest.de>,
+ *                 Suchi & Berg GmbH <info@data-quest.de>
+ */
+class StudipSemTree extends TreeAbstract
+{
+    public $sem_dates = [];
+    public $sem_number = null;
+    public $visible_only = false;
+    public $sem_status = [];
+    protected $entries_init_done = false;
+
+    /**
+    * constructor
+    *
+    * do not use directly, call TreeAbstract::GetInstance("StudipRangeTree")
+    * @access private
+    */
+    public function __construct($args)
+    {
+        DbView::addView('sem_tree');
+
+        $this->root_name = Config::get()->UNI_NAME_CLEAN;
+        if (isset($args['visible_only'])) {
+            $this->visible_only = (int) $args['visible_only'];
+        }
+        if (isset($args['sem_number']) ){
+            $this->sem_number = array_map('intval', $args['sem_number']);
+        }
+        if (!empty($args['sem_status'])) {
+            $this->sem_status = array_map('intval', $args['sem_status']);
+        } else {
+            foreach ($GLOBALS['SEM_CLASS'] as $key => $value){
+                if ($value['bereiche']){
+                    foreach ($GLOBALS['SEM_TYPE'] as $type_key => $type_value) {
+                        if($type_value['class'] == $key)
+                            $this->sem_status[] = $type_key;
+                    }
+                }
+            }
+        }
+
+        if (!count($this->sem_status)){
+            $this->sem_status[] = -1;
+        }
+
+        parent::__construct(); //calling the baseclass constructor
+        if (isset($args['build_index']) ){
+            $this->buildIndex();
+        }
+
+        $this->sem_dates = Semester::findAllVisible();
+    }
+
+    /**
+    * initializes the tree
+    *
+    * stores all rows from table sem_tree in array $tree_data
+    * @access public
+    */
+    public function init()
+    {
+        parent::init();
+
+        $db = $this->view->get_query("view:SEM_TREE_GET_DATA_NO_ENTRIES");
+
+        while ($db->next_record()){
+            $this->tree_data[$db->f("sem_tree_id")] = ['type' => $db->f('type'), "info" => $db->f("info"), "entries" => 0];
+            $name = $db->f("name");
+            $this->storeItem($db->f("sem_tree_id"), $db->f("parent_id"), $name, $db->f("priority"));
+        }
+    }
+
+    public function initEntries()
+    {
+        $this->view->params[0] = $this->sem_status;
+        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
+        $this->view->params[1] .= (isset($this->sem_number)) ? " AND ((" . $this->view->sem_number_sql
+                                . ") IN (" . join(",",$this->sem_number) .") OR ((" . $this->view->sem_number_sql
+                                .") <= " . $this->sem_number[count($this->sem_number)-1]
+                                . "  AND ((" . $this->view->sem_number_end_sql . ") >= " . $this->sem_number[count($this->sem_number)-1]
+                                . " OR (" . $this->view->sem_number_end_sql . ") = -1))) " : "";
+
+        $db = $this->view->get_query("view:SEM_TREE_GET_ENTRIES");
+        while ($db->next_record()){
+            $this->tree_data[$db->f("sem_tree_id")]['entries'] = $db->f('entries');
+        }
+        $this->entries_init_done = true;
+    }
+
+    public function isModuleItem($item_id)
+    {
+        return isset($GLOBALS['SEM_TREE_TYPES'][$this->getValue($item_id, 'type')]['is_module']);
+    }
+
+    public function isHiddenItem($item_id)
+    {
+        return !empty($GLOBALS['SEM_TREE_TYPES'][$this->getValue($item_id, 'type')]['hidden']);
+    }
+
+    public function getSemIds($item_id,$ids_from_kids = false)
+    {
+        if (empty($this->tree_data[$item_id])) {
+            return false;
+        }
+        $this->view->params[0] = $this->sem_status;
+        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
+        if ($ids_from_kids && $item_id != 'root'){
+            $this->view->params[2] = $this->getKidsKids($item_id);
+        }
+        $this->view->params[2][] = $item_id;
+        $this->view->params[3] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : "";
+        $ret = false;
+        if ($item_id == 'root' && $ids_from_kids) {
+            unset($this->view->params[2]);
+            $this->view->params = array_values($this->view->params);
+            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMIDS_ROOT");
+        } else {
+            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMIDS");
+        }
+        while($rs->next_record()){
+            $ret[] = $rs->f(0);
+        }
+        return $ret;
+    }
+
+    public function getSemData($item_id,$sem_data_from_kids = false)
+    {
+        if (!$this->tree_data[$item_id])
+            return false;
+        $this->view->params[0] = $this->sem_status;
+        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
+        if ($sem_data_from_kids && $item_id != 'root'){
+            $this->view->params[2] = $this->getKidsKids($item_id);
+        }
+        $this->view->params[2][] = $item_id;
+        $this->view->params[3] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : "";
+        if ($item_id == 'root' && $sem_data_from_kids) {
+            unset($this->view->params[2]);
+            $this->view->params = array_values($this->view->params);
+            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMDATA_ROOT");
+        } else {
+            $rs = $this->view->get_query("view:SEM_TREE_GET_SEMDATA");
+        }
+        return new DbSnapshot($rs);
+    }
+
+    public function getLonelySemData($item_id)
+    {
+        if (!$institut_id = $this->tree_data[$item_id]['studip_object_id'])
+            return false;
+        $this->view->params[0] = $this->sem_status;
+        $this->view->params[1] = $this->visible_only ? "visible=1" : "1";
+        $this->view->params[2] = $institut_id;
+        $this->view->params[3] = (isset($this->sem_number)) ? " HAVING sem_number IN (" . join(",",$this->sem_number) .") OR (sem_number <= " . $this->sem_number[count($this->sem_number)-1] . "  AND (sem_number_end >= " . $this->sem_number[count($this->sem_number)-1] . " OR sem_number_end = -1)) " : "";
+        return new DbSnapshot($this->view->get_query("view:SEM_TREE_GET_LONELY_SEM_DATA"));
+    }
+
+    public function getNumEntries($item_id, $num_entries_from_kids = false)
+    {
+        if (empty($this->tree_data[$item_id])) {
+            return false;
+        }
+
+        if (empty($this->entries_init_done)) {
+            $this->initEntries();
+        }
+
+        return parent::getNumEntries($item_id, $num_entries_from_kids);
+        /*
+        if (!$num_entries_from_kids){
+            return $this->tree_data[$item_id]["entries"];
+        } else {
+            $item_list = $this->getKidsKids($item_id);
+            $item_list[] = $item_id;
+            $ret = 0;
+            $num_items = count($item_list);
+            for ($i = 0; $i < $num_items; ++$i){
+                $ret += $this->tree_data[$item_list[$i]]["entries"];
+            }
+            return $ret;
+        }
+        */
+    }
+
+    public function getAdminRange($item_id)
+    {
+        if (!$this->tree_data[$item_id])
+            return false;
+        if ($item_id == "root")
+            return "root";
+        $ret_id = $item_id;
+        while ($ret_id != "root"){
+            $ret_id = $this->tree_data[$ret_id]['parent_id'];
+        }
+        return $ret_id;
+    }
+
+    public function InsertItem($item_id, $parent_id, $item_name, $item_info, $priority, $studip_object_id, $type)
+    {
+        $view = new DbView();
+        $view->params = [$item_id,$parent_id,$item_name,$priority,$item_info,$studip_object_id, $type];
+        $rs = $view->get_query("view:SEM_TREE_INS_ITEM");
+        // Logging
+        StudipLog::log("STUDYAREA_ADD",$item_id);
+        NotificationCenter::postNotification("StudyAreaDidCreate", $item_id, $GLOBALS['user']->id);
+
+        return $rs->affected_rows();
+    }
+
+    public function UpdateItem($item_id, $item_name, $item_info, $type)
+    {
+        $view = new DbView();
+        $view->params = [$item_name,$item_info,$type,$item_id];
+        $rs = $view->get_query("view:SEM_TREE_UPD_ITEM");
+        NotificationCenter::postNotification("StudyAreaDidUpdate", $item_id, $GLOBALS['user']->id);
+
+        return $rs->affected_rows();
+    }
+
+    public function DeleteItems($items_to_delete)
+    {
+        $view = new DbView();
+        $view->params[0] = (is_array($items_to_delete)) ? $items_to_delete : [$items_to_delete];
+        $view->auto_free_params = false;
+        $rs = $view->get_query("view:SEM_TREE_DEL_ITEM");
+        $deleted['items'] = $rs->affected_rows();
+        $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_RANGE");
+        $deleted['entries'] = $rs->affected_rows();
+        // Logging
+        foreach ($items_to_delete as $item_id) {
+            StudipLog::log("STUDYAREA_DELETE",$item_id);
+            NotificationCenter::postNotification("StudyAreaDidDelete", $item_id, $GLOBALS['user']->id);
+         }
+        return $deleted;
+    }
+
+    public function DeleteSemEntries($item_ids = null, $sem_entries = null)
+    {
+        $view = new DbView();
+        if ($item_ids && $sem_entries) {
+            $sem_tree_ids = $view->params[0] = (is_array($item_ids)) ? $item_ids : [$item_ids];
+            $seminar_ids = $view->params[1] = (is_array($sem_entries)) ? $sem_entries : [$sem_entries];
+            $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_SEM_RANGE");
+            $ret = $rs->affected_rows();
+            // Logging
+            foreach ($sem_tree_ids as $range) {
+                foreach ($seminar_ids as $sem) {
+                    StudipLog::log("SEM_DELETE_STUDYAREA",$sem,$range);
+                }
+            }
+            if($ret){
+                foreach ($sem_tree_ids as $sem_tree_id){
+                    $studyarea = StudipStudyArea::find($sem_tree_id);
+                    if($studyarea->isModule()) {
+                        foreach ($seminar_ids as $seminar_id) {
+                            NotificationCenter::postNotification('CourseRemovedFromModule', $studyarea, ['module_id' => $sem_tree_id, 'course_id' => $seminar_id]);
+                        }
+                    }
+                }
+            }
+        } elseif ($item_ids){
+            $view->params[0] = (is_array($item_ids)) ? $item_ids : [$item_ids];
+            // Logging
+            foreach ($view->params[0] as $range) {
+                StudipLog::log("SEM_DELETE_STUDYAREA","all",$range);
+            }
+            $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_RANGE");
+            $ret = $rs->affected_rows();
+        } elseif ($sem_entries){
+            $view->params[0] = (is_array($sem_entries)) ? $sem_entries : [$sem_entries];
+            // Logging
+            foreach ($view->params[0] as $sem) {
+                StudipLog::log("SEM_DELETE_STUDYAREA",$sem,"all");
+            }
+            $rs = $view->get_query("view:SEMINAR_SEM_TREE_DEL_SEMID_RANGE");
+            $ret = $rs->affected_rows();
+        } else {
+            $ret = false;
+        }
+
+        return $ret;
+    }
+
+    public function InsertSemEntry($sem_tree_id, $seminar_id)
+    {
+        $view = new DbView();
+        $view->params[0] = $seminar_id;
+        $view->params[1] = $sem_tree_id;
+        $rs = $view->get_query("view:SEMINAR_SEM_TREE_INS_ITEM");
+        if($ret = $rs->affected_rows()){
+            // Logging
+            StudipLog::log("SEM_ADD_STUDYAREA",$seminar_id,$sem_tree_id);
+            $studyarea = StudipStudyArea::find($sem_tree_id);
+            if($studyarea->isModule()){
+                NotificationCenter::postNotification('CourseAddedToModule', $studyarea, ['module_id' => $sem_tree_id, 'course_id' => $seminar_id]);
+            }
+        }
+        return $ret;
+    }
+}
diff --git a/lib/classes/StudipSemTreeSearch.class.php b/lib/classes/StudipSemTreeSearch.class.php
deleted file mode 100644
index e79a34f..0000000
--- a/lib/classes/StudipSemTreeSearch.class.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemTreeSearch.class.php
-// Class to build search formular and execute search
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* Class to build search formular and execute search
-*
-*
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package  DBTools
-**/
-class StudipSemTreeSearch {
-
-    var $view;
-    var $num_search_result = false;
-    var $num_inserted;
-    var $num_deleted;
-    var $form_name;
-    var $tree;
-    var $seminar_id;
-    var $institut_id = [];
-    var $sem_tree_ranges = [];
-    var $sem_tree_ids = [];
-    var $selected = [];
-    var $search_result = [];
-    var $search_done = false;
-
-    function __construct($seminar_id,$form_name = "search_sem_tree", $auto_search = true){
-        $this->view = DbView::getView('sem_tree');
-        $this->form_name = $form_name;
-        $this->tree = TreeAbstract::GetInstance("StudipSemTree", false);
-        $this->seminar_id = $seminar_id;
-        $this->view->params[0] = $seminar_id;
-        $rs = $this->view->get_query("view:SEM_GET_INST");
-        while($rs->next_record()){
-            $this->institut_id[] = $rs->f(0);
-        }
-        $this->init();
-        if($auto_search){
-            $this->doSearch();
-        }
-    }
-
-    function init(){
-        $this->sem_tree_ranges = [];
-        $this->sem_tree_ids = [];
-        $this->selected = [];
-        $this->view->params[0] = $this->seminar_id;
-        $rs = $this->view->get_query("view:SEMINAR_SEM_TREE_GET_IDS");
-        while($rs->next_record()){
-            if (!$this->tree->hasKids($rs->f("sem_tree_id"))){
-                $this->sem_tree_ranges[$rs->f("parent_id")][] = $rs->f("sem_tree_id");
-                $this->sem_tree_ids[] = $rs->f("sem_tree_id");
-                $this->selected[$rs->f("sem_tree_id")] = true;
-            }
-        }
-    }
-    /* fuzzy !!!
-    function getExpectedRanges(){
-        $this->view->params[0] = $this->institut_id;
-        $this->view->params[1] = $this->sem_tree_ids;
-        $rs = $this->view->get_query("view:SEMINAR_SEM_TREE_GET_EXP_IDS");
-        while ($rs->next_record()){
-            if (!$this->tree->hasKids($rs->f("sem_tree_id"))){
-                $this->sem_tree_ranges[$rs->f("parent_id")][] = $rs->f("sem_tree_id");
-                $this->sem_tree_ids[] = $rs->f("sem_tree_id");
-            }
-        }
-    }
-    */
-
-    //not fuzzy
-    function getExpectedRanges(){
-        $this->view->params[0] = $this->institut_id;
-        $rs = $this->view->get_query("view:SEM_TREE_GET_FAK");
-        while($rs->next_record()){
-            $the_kids = $this->tree->getKidsKids($rs->f("sem_tree_id"));
-            $the_kids[] = $rs->f("sem_tree_id");
-            for ($i = 0; $i < count($the_kids); ++$i){
-                if (!$this->tree->hasKids($the_kids[$i]) && !in_array($the_kids[$i],$this->sem_tree_ids)){
-                    $this->sem_tree_ranges[$this->tree->tree_data[$the_kids[$i]]['parent_id']][] = $the_kids[$i];
-                    $this->sem_tree_ids[] = $the_kids[$i];
-                }
-            }
-        }
-    }
-
-    function prepRangePath($path, $cols) {
-        $parts=explode(">",$path);
-        $paths=[];
-        $currpath="";
-        foreach ($parts as $part) {
-            if (mb_strlen($part)>$cols) {
-                $p=my_substr($part, 0, $cols);
-            } else {
-                $p = $part;
-            }
-            if (mb_strlen($currpath)+mb_strlen($p)+3 > $cols) {
-                $paths[]=htmlReady($currpath);
-                $currpath="   >> " . $p;
-            } else {
-                if (count($paths)==0 && mb_strlen($currpath)==0) {
-                    $currpath.=$p;
-                } else {
-                    $currpath.=" > ".$p;
-                }
-            }
-        }
-        $paths[]=htmlReady($currpath);
-        return $paths;
-    }
-
-    function getChooserField($attributes = [], $cols = 70, $field_name = 'chooser'){
-        if ($this->institut_id){
-            $this->getExpectedRanges();
-        }
-        $element_name = "{$this->form_name}_{$field_name}[]";
-        $ret = "\n<div class=\"selectbox\"";
-        foreach ($attributes as $key => $value){
-            $ret .= " " . $key . "=\"" . htmlReady($value) . "\"";
-        }
-        $ret .= ">";
-        foreach ($this->sem_tree_ranges as $range_id => $sem_tree_id){
-            $paths=$this->prepRangePath($this->getPath($range_id), $cols);
-            foreach ($paths as $p) {
-                $ret .= "\n<div style=\"margin-top:5px;font-weight:bold;color:red;\">" . $p ."</div>";
-            }
-            $ret .= "\n<div style=\"font-weight:bold;color:red;\">" . str_repeat("¯",$cols) . "</div>";
-            for ($i = 0; $i < count($sem_tree_id); ++$i){
-                $id = $this->form_name . '_' . $field_name . '_' . $sem_tree_id[$i];
-                $ret .= "\n<div>";
-                $ret .= "\n<label for=\"$id\"><input style=\"vertical-align:middle;\" id=\"$id\" type=\"checkbox\" name=\"$element_name\" value=\"".$sem_tree_id[$i]."\" " . (($this->selected[$sem_tree_id[$i]]) ? " checked " : "");
-                $ret .= ">&nbsp;";
-                $ret .= "<span ". (($this->search_result[$sem_tree_id[$i]]) ? " style=\"color:blue;\" " : "") . ">";
-                $ret .= htmlReady(my_substr($this->tree->tree_data[$sem_tree_id[$i]]['name'],0,$cols)) . "</span></label>";
-                $ret .= "\n</div>";
-            }
-        }
-        $ret .= "</div>";
-        return $ret;
-    }
-
-    function getPath($item_id,$delimeter = ">"){
-        return $this->tree->getShortPath($item_id);
-    }
-
-
-    function getSearchField($attributes = []){
-        $ret = "\n<input type=\"text\" name=\"{$this->form_name}_search_field\"";
-        foreach ($attributes as $key => $value){
-            $ret .= " " . $key . "=\"" . htmlReady($value) ."\"";
-        }
-        $ret .= ">";
-        return $ret;
-    }
-
-    function getSearchButton($attributes = [])
-    {
-        $ret = Icon::create('search', 'clickable', ['title' => _('Suche nach Studienbereichen starten')])
-                ->asInput(["type" => "image", "class" => "middle", "name" => $this->form_name . "_do_search"]);
-
-        return $ret;
-    }
-
-    function getFormStart($action = ""){
-        if (!$action){
-            $action = URLHelper::getLink();
-        }
-        $ret = "\n<form action=\"$action\" method=\"post\" name=\"{$this->form_name}\">";
-        $ret .= CSRFProtection::tokenTag();
-        return $ret;
-    }
-
-    function getFormEnd(){
-
-        return "\n<input type=\"hidden\" name=\"{$this->form_name}_send\" value=\"1\">\n</form>";
-    }
-
-    function doSearch(){
-        if (Request::submitted($this->form_name . "_do_search") || Request::submitted($this->form_name . "_send")){
-            if(mb_strlen($_REQUEST[$this->form_name . "_search_field"]) > 2){
-                $this->view->params[0] = "%" . Request::quoted($this->form_name . "_search_field") . "%";
-                $this->view->params[1] = $this->sem_tree_ids;
-                $rs = $this->view->get_query("view:SEM_TREE_SEARCH_ITEM");
-                while($rs->next_record()){
-                    $this->sem_tree_ranges[$rs->f("parent_id")][] = $rs->f("sem_tree_id");
-                    $this->sem_tree_ids[] = $rs->f("sem_tree_id");
-                    $this->search_result[$rs->f("sem_tree_id")] = true;
-                }
-                $this->num_search_result = $rs->num_rows();
-            }
-            $this->search_done = true;
-        }
-        return;
-    }
-
-    public function insertSelectedRanges($selected = null)
-    {
-        if (!$selected){
-            $selected = array_filter(Request::quotedArray("{$this->form_name}_chooser"));
-        }
-
-        if (is_array($selected)){
-            $count_intersect = count(array_intersect($selected,array_keys($this->selected)));
-            if (count($this->selected) != $count_intersect || count($selected) != $count_intersect){
-                $count_del = (count($this->selected)) ? $this->tree->DeleteSemEntries(array_keys($this->selected),$this->seminar_id) : 0;
-                for ($i = 0; $i < count($selected); ++$i){
-                    $new_selected[$selected[$i]] = true;
-                    $count_ins += $this->tree->InsertSemEntry($selected[$i], $this->seminar_id);
-                }
-                $this->num_inserted = $count_ins - $count_intersect;
-                $this->num_deleted = $count_del - $count_intersect;
-                $this->selected = $new_selected;
-            }
-        }
-    }
-}
diff --git a/lib/classes/StudipSemTreeSearch.php b/lib/classes/StudipSemTreeSearch.php
new file mode 100644
index 0000000..e79a34f
--- /dev/null
+++ b/lib/classes/StudipSemTreeSearch.php
@@ -0,0 +1,241 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemTreeSearch.class.php
+// Class to build search formular and execute search
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* Class to build search formular and execute search
+*
+*
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package  DBTools
+**/
+class StudipSemTreeSearch {
+
+    var $view;
+    var $num_search_result = false;
+    var $num_inserted;
+    var $num_deleted;
+    var $form_name;
+    var $tree;
+    var $seminar_id;
+    var $institut_id = [];
+    var $sem_tree_ranges = [];
+    var $sem_tree_ids = [];
+    var $selected = [];
+    var $search_result = [];
+    var $search_done = false;
+
+    function __construct($seminar_id,$form_name = "search_sem_tree", $auto_search = true){
+        $this->view = DbView::getView('sem_tree');
+        $this->form_name = $form_name;
+        $this->tree = TreeAbstract::GetInstance("StudipSemTree", false);
+        $this->seminar_id = $seminar_id;
+        $this->view->params[0] = $seminar_id;
+        $rs = $this->view->get_query("view:SEM_GET_INST");
+        while($rs->next_record()){
+            $this->institut_id[] = $rs->f(0);
+        }
+        $this->init();
+        if($auto_search){
+            $this->doSearch();
+        }
+    }
+
+    function init(){
+        $this->sem_tree_ranges = [];
+        $this->sem_tree_ids = [];
+        $this->selected = [];
+        $this->view->params[0] = $this->seminar_id;
+        $rs = $this->view->get_query("view:SEMINAR_SEM_TREE_GET_IDS");
+        while($rs->next_record()){
+            if (!$this->tree->hasKids($rs->f("sem_tree_id"))){
+                $this->sem_tree_ranges[$rs->f("parent_id")][] = $rs->f("sem_tree_id");
+                $this->sem_tree_ids[] = $rs->f("sem_tree_id");
+                $this->selected[$rs->f("sem_tree_id")] = true;
+            }
+        }
+    }
+    /* fuzzy !!!
+    function getExpectedRanges(){
+        $this->view->params[0] = $this->institut_id;
+        $this->view->params[1] = $this->sem_tree_ids;
+        $rs = $this->view->get_query("view:SEMINAR_SEM_TREE_GET_EXP_IDS");
+        while ($rs->next_record()){
+            if (!$this->tree->hasKids($rs->f("sem_tree_id"))){
+                $this->sem_tree_ranges[$rs->f("parent_id")][] = $rs->f("sem_tree_id");
+                $this->sem_tree_ids[] = $rs->f("sem_tree_id");
+            }
+        }
+    }
+    */
+
+    //not fuzzy
+    function getExpectedRanges(){
+        $this->view->params[0] = $this->institut_id;
+        $rs = $this->view->get_query("view:SEM_TREE_GET_FAK");
+        while($rs->next_record()){
+            $the_kids = $this->tree->getKidsKids($rs->f("sem_tree_id"));
+            $the_kids[] = $rs->f("sem_tree_id");
+            for ($i = 0; $i < count($the_kids); ++$i){
+                if (!$this->tree->hasKids($the_kids[$i]) && !in_array($the_kids[$i],$this->sem_tree_ids)){
+                    $this->sem_tree_ranges[$this->tree->tree_data[$the_kids[$i]]['parent_id']][] = $the_kids[$i];
+                    $this->sem_tree_ids[] = $the_kids[$i];
+                }
+            }
+        }
+    }
+
+    function prepRangePath($path, $cols) {
+        $parts=explode(">",$path);
+        $paths=[];
+        $currpath="";
+        foreach ($parts as $part) {
+            if (mb_strlen($part)>$cols) {
+                $p=my_substr($part, 0, $cols);
+            } else {
+                $p = $part;
+            }
+            if (mb_strlen($currpath)+mb_strlen($p)+3 > $cols) {
+                $paths[]=htmlReady($currpath);
+                $currpath="   >> " . $p;
+            } else {
+                if (count($paths)==0 && mb_strlen($currpath)==0) {
+                    $currpath.=$p;
+                } else {
+                    $currpath.=" > ".$p;
+                }
+            }
+        }
+        $paths[]=htmlReady($currpath);
+        return $paths;
+    }
+
+    function getChooserField($attributes = [], $cols = 70, $field_name = 'chooser'){
+        if ($this->institut_id){
+            $this->getExpectedRanges();
+        }
+        $element_name = "{$this->form_name}_{$field_name}[]";
+        $ret = "\n<div class=\"selectbox\"";
+        foreach ($attributes as $key => $value){
+            $ret .= " " . $key . "=\"" . htmlReady($value) . "\"";
+        }
+        $ret .= ">";
+        foreach ($this->sem_tree_ranges as $range_id => $sem_tree_id){
+            $paths=$this->prepRangePath($this->getPath($range_id), $cols);
+            foreach ($paths as $p) {
+                $ret .= "\n<div style=\"margin-top:5px;font-weight:bold;color:red;\">" . $p ."</div>";
+            }
+            $ret .= "\n<div style=\"font-weight:bold;color:red;\">" . str_repeat("¯",$cols) . "</div>";
+            for ($i = 0; $i < count($sem_tree_id); ++$i){
+                $id = $this->form_name . '_' . $field_name . '_' . $sem_tree_id[$i];
+                $ret .= "\n<div>";
+                $ret .= "\n<label for=\"$id\"><input style=\"vertical-align:middle;\" id=\"$id\" type=\"checkbox\" name=\"$element_name\" value=\"".$sem_tree_id[$i]."\" " . (($this->selected[$sem_tree_id[$i]]) ? " checked " : "");
+                $ret .= ">&nbsp;";
+                $ret .= "<span ". (($this->search_result[$sem_tree_id[$i]]) ? " style=\"color:blue;\" " : "") . ">";
+                $ret .= htmlReady(my_substr($this->tree->tree_data[$sem_tree_id[$i]]['name'],0,$cols)) . "</span></label>";
+                $ret .= "\n</div>";
+            }
+        }
+        $ret .= "</div>";
+        return $ret;
+    }
+
+    function getPath($item_id,$delimeter = ">"){
+        return $this->tree->getShortPath($item_id);
+    }
+
+
+    function getSearchField($attributes = []){
+        $ret = "\n<input type=\"text\" name=\"{$this->form_name}_search_field\"";
+        foreach ($attributes as $key => $value){
+            $ret .= " " . $key . "=\"" . htmlReady($value) ."\"";
+        }
+        $ret .= ">";
+        return $ret;
+    }
+
+    function getSearchButton($attributes = [])
+    {
+        $ret = Icon::create('search', 'clickable', ['title' => _('Suche nach Studienbereichen starten')])
+                ->asInput(["type" => "image", "class" => "middle", "name" => $this->form_name . "_do_search"]);
+
+        return $ret;
+    }
+
+    function getFormStart($action = ""){
+        if (!$action){
+            $action = URLHelper::getLink();
+        }
+        $ret = "\n<form action=\"$action\" method=\"post\" name=\"{$this->form_name}\">";
+        $ret .= CSRFProtection::tokenTag();
+        return $ret;
+    }
+
+    function getFormEnd(){
+
+        return "\n<input type=\"hidden\" name=\"{$this->form_name}_send\" value=\"1\">\n</form>";
+    }
+
+    function doSearch(){
+        if (Request::submitted($this->form_name . "_do_search") || Request::submitted($this->form_name . "_send")){
+            if(mb_strlen($_REQUEST[$this->form_name . "_search_field"]) > 2){
+                $this->view->params[0] = "%" . Request::quoted($this->form_name . "_search_field") . "%";
+                $this->view->params[1] = $this->sem_tree_ids;
+                $rs = $this->view->get_query("view:SEM_TREE_SEARCH_ITEM");
+                while($rs->next_record()){
+                    $this->sem_tree_ranges[$rs->f("parent_id")][] = $rs->f("sem_tree_id");
+                    $this->sem_tree_ids[] = $rs->f("sem_tree_id");
+                    $this->search_result[$rs->f("sem_tree_id")] = true;
+                }
+                $this->num_search_result = $rs->num_rows();
+            }
+            $this->search_done = true;
+        }
+        return;
+    }
+
+    public function insertSelectedRanges($selected = null)
+    {
+        if (!$selected){
+            $selected = array_filter(Request::quotedArray("{$this->form_name}_chooser"));
+        }
+
+        if (is_array($selected)){
+            $count_intersect = count(array_intersect($selected,array_keys($this->selected)));
+            if (count($this->selected) != $count_intersect || count($selected) != $count_intersect){
+                $count_del = (count($this->selected)) ? $this->tree->DeleteSemEntries(array_keys($this->selected),$this->seminar_id) : 0;
+                for ($i = 0; $i < count($selected); ++$i){
+                    $new_selected[$selected[$i]] = true;
+                    $count_ins += $this->tree->InsertSemEntry($selected[$i], $this->seminar_id);
+                }
+                $this->num_inserted = $count_ins - $count_intersect;
+                $this->num_deleted = $count_del - $count_intersect;
+                $this->selected = $new_selected;
+            }
+        }
+    }
+}
diff --git a/lib/classes/StudipSemTreeView.class.php b/lib/classes/StudipSemTreeView.class.php
deleted file mode 100644
index 3e984cc..0000000
--- a/lib/classes/StudipSemTreeView.class.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemTreeView.class.php
-// Class to print out the seminar tree
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-
-/**
-* class to print out the seminar tree
-*
-* This class prints out a html representation of the whole or part of the tree
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipSemTreeView extends TreeView {
-
-    /**
-    * constructor
-    *
-    * @access public
-    */
-    function __construct($start_item_id = "root", $sem_number = null){
-        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
-        $this->root_content = $GLOBALS['UNI_INFO'];
-        $args = null;
-        if ($sem_number){
-            $args = ['sem_number' => $sem_number];
-        }
-        parent::__construct("StudipSemTree", $args); //calling the baseclass constructor
-    }
-
-    /**
-    * manages the session variables used for the open/close thing
-    *
-    * @access   private
-    */
-    function handleOpenRanges(){
-        global $_REQUEST;
-
-        $this->open_ranges[$this->start_item_id] = true;
-        if (Request::option('close_item') || Request::option('open_item')){
-            $toggle_item = (Request::option('close_item')) ? Request::option('close_item') : Request::option('open_item');
-            if (!$this->open_items[$toggle_item]){
-                $this->open_items[$toggle_item] = true;
-            } else {
-                unset($this->open_items[$toggle_item]);
-            }
-
-            if($this->tree->hasKids(Request::option('open_item'))){
-                $this->start_item_id = Request::option('open_item');
-                $this->open_ranges = null;
-                $this->open_items = null;
-                $this->open_items[Request::option('open_item')] = true;
-                $this->open_ranges[Request::option('open_item')] = true;
-            }
-
-            $this->anchor = $toggle_item;
-        }
-
-        if ($this->start_item_id == "root"){
-            $this->open_ranges = null;
-            $this->open_ranges[$this->start_item_id] = true;
-        }
-    }
-
-    function showSemTree(){
-        echo "\n<table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">";
-        if ($this->start_item_id != 'root'){
-            echo "\n<tr><td class=\"printhead\" align=\"left\" valign=\"top\">" . $this->getSemPath()
-            . Assets::img('forumleer.gif', ['size' => '1@20']) . "</td></tr>";
-        }
-        echo "\n<tr><td class=\"blank\"  align=\"left\" valign=\"top\">";
-        $this->showTree($this->start_item_id);
-        echo "\n</td></tr></table>";
-    }
-
-    function getSemPath(){
-        //$ret = "<a href=\"" . parent::getSelf("start_item_id=root") . "\">" .htmlReady($this->tree->root_name) . "</a>";
-        if ($parents = $this->tree->getParents($this->start_item_id)){
-            for($i = count($parents)-1; $i >= 0; --$i){
-                $ret .= " &gt; <a class=\"tree\" href=\"" . URLHelper::getLink($this->getSelf("start_item_id={$parents[$i]}&open_item={$parents[$i]}",false))
-                    . "\">" .htmlReady($this->tree->tree_data[$parents[$i]]["name"]) . "</a>";
-            }
-        }
-        return $ret;
-    }
-
-    /**
-    * returns html for the icons in front of the name of the item
-    *
-    * @access   private
-    * @param    string  $item_id
-    * @return   string
-    */
-    function getItemHeadPics($item_id){
-        $head = "";
-        $head .= "<a href=\"";
-        $head .= ($this->open_items[$item_id])? URLHelper::getLink($this->getSelf("close_item={$item_id}")) . "\"" . tooltip(_("Dieses Element schließen"),true) . ">"
-                                            : URLHelper::getLink($this->getSelf("open_item={$item_id}")) . "\"" . tooltip(_("Dieses Element öffnen"),true) . ">";
-        $head .= Icon::create($this->open_items[$item_id] ? 'arr_1down' : 'arr_1right', 'clickable');
-        $head .= (!$this->open_items[$item_id]) ? Assets::img('forumleer.gif', ['size' => '5']) : "";
-        $head .= "</a>";
-        if ($this->tree->hasKids($item_id)){
-            $head .= Icon::create('folder-full', 'clickable', ['title' => $this->open_ranges[$item_id]?_('Alle Unterelemente schliessen'):_('Alle Unterelemente öffnen')])->asImg(16, ['class' => 'text-top']);
-        } else {
-            $head .= Icon::create('folder-empty', 'clickable', ['title' => _('Dieses Element hat keine Unterelemente')])->asImg();
-        }
-    return $head;
-    }
-
-    function getItemContent($item_id){
-        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"0\" align=\"center\" style=\"font-size:10pt\">";
-        if ($item_id == "root"){
-            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
-            $content .= "\n<tr><td class=\"table_row_even\" align=\"left\">" . htmlReady($this->root_content) ." </td></tr>";
-            $content .= "\n</table>";
-            return $content;
-        }
-        if ($this->tree->tree_data[$item_id]['info']){
-            $content .= "\n<tr><td class=\"table_row_even\" align=\"left\" colspan=\"2\">";
-            $content .= formatReady($this->tree->tree_data[$item_id]['info']) . "</td></tr>";
-        }
-        $content .= "<tr><td colspan=\"2\" class=\"table_row_even\">" . sprintf(_("Alle Veranstaltungen innerhalb dieses Bereiches in der %sÜbersicht%s"),
-                "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id=$item_id")) ."\">","</a>") . "</td></tr>";
-        $content .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-        if ($this->tree->getNumEntries($item_id)){
-            $content .= "<tr><td class=\"table_row_even\" align=\"left\" colspan=\"2\"><b>" . _("Einträge auf dieser Ebene:");
-            $content .= "</b>\n</td></tr>";
-            $entries = $this->tree->getSemData($item_id);
-            $content .= $this->getSemDetails($entries->getGroupedResult("seminar_id"));
-        } else {
-            $content .= "\n<tr><td class=\"table_row_even\" colspan=\"2\">" . _("Keine Einträge auf dieser Ebene vorhanden!") . "</td></tr>";
-        }
-        $content .= "</table>";
-        return $content;
-    }
-
-    function getSemDetails($sem_data){
-        $content = "";
-        $sem_number = -1;
-        foreach($sem_data as $seminar_id => $data){
-            if (key($data['sem_number']) != $sem_number){
-                $sem_number = key($data['sem_number']);
-                $content .= "\n<tr><td class=\"content_seperator\" colspan=\"2\">" . $this->tree->sem_dates[$sem_number]['name'] . "</td></tr>";
-            }
-            $sem_name = key($data["Name"]);
-            $sem_number_end = key($data["sem_number_end"]);
-            if ($sem_number != $sem_number_end){
-                $sem_name .= " (" . $this->tree->sem_dates[$sem_number]['name'] . " - ";
-                $sem_name .= (($sem_number_end == -1) ? _("unbegrenzt") : $this->tree->sem_dates[$sem_number_end]['name']) . ")";
-            }
-            $content .= "<tr><td class=\"table_row_even\"><a href=\"details.php?sem_id=". $seminar_id
-            ."&send_from_search=true&send_from_search_page=" . rawurlencode(URLHelper::getLink($this->getSelf())) . "\">" . htmlReady($sem_name) . "</a>
-            </td><td class=\"table_row_even\" align=\"right\">(";
-            for ($i = 0; $i < count($data["doz_name"]); ++$i){
-                $content .= "<a href=\"dispatch.php/profile?username=" . key($data["doz_uname"]) ."\">" . htmlReady(key($data["doz_name"])) . "</a>";
-                if($i != count($data["doz_name"])-1){
-                    $content .= ", ";
-                }
-                next($data["doz_name"]);
-                next($data["doz_uname"]);
-            }
-            $content .= ") </td></tr>";
-            }
-            return $content;
-    }
-
-    function getItemHead($item_id){
-        $head = "";
-        $head .= parent::getItemHead($item_id);
-        if ($item_id != "root"){
-            $head .= " (" . $this->tree->getNumEntries($item_id,true) . ") " ;
-        }
-        return $head;
-    }
-
-    function getSelf($param = "", $with_start_item = true){
-        if ($param)
-            $url = (($with_start_item) ? "?start_item_id=" . $this->start_item_id . "&" : "?") . $param . "#anchor";
-        else
-            $url = (($with_start_item) ? "?start_item_id=" . $this->start_item_id : "") . "#anchor";
-        return $url;
-    }
-}
-//test
-//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
-//include 'lib/include/html_head.inc.php';
-//include ('lib/seminar_open.php'); // initialise Stud.IP-Session
-//$test = new StudipSemTreeView();
-//$test->showTree("c2942084b6140fc2635dfecdf65bf20d");
-//page_close();
-?>
diff --git a/lib/classes/StudipSemTreeView.php b/lib/classes/StudipSemTreeView.php
new file mode 100644
index 0000000..3e984cc
--- /dev/null
+++ b/lib/classes/StudipSemTreeView.php
@@ -0,0 +1,215 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemTreeView.class.php
+// Class to print out the seminar tree
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+
+/**
+* class to print out the seminar tree
+*
+* This class prints out a html representation of the whole or part of the tree
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipSemTreeView extends TreeView {
+
+    /**
+    * constructor
+    *
+    * @access public
+    */
+    function __construct($start_item_id = "root", $sem_number = null){
+        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
+        $this->root_content = $GLOBALS['UNI_INFO'];
+        $args = null;
+        if ($sem_number){
+            $args = ['sem_number' => $sem_number];
+        }
+        parent::__construct("StudipSemTree", $args); //calling the baseclass constructor
+    }
+
+    /**
+    * manages the session variables used for the open/close thing
+    *
+    * @access   private
+    */
+    function handleOpenRanges(){
+        global $_REQUEST;
+
+        $this->open_ranges[$this->start_item_id] = true;
+        if (Request::option('close_item') || Request::option('open_item')){
+            $toggle_item = (Request::option('close_item')) ? Request::option('close_item') : Request::option('open_item');
+            if (!$this->open_items[$toggle_item]){
+                $this->open_items[$toggle_item] = true;
+            } else {
+                unset($this->open_items[$toggle_item]);
+            }
+
+            if($this->tree->hasKids(Request::option('open_item'))){
+                $this->start_item_id = Request::option('open_item');
+                $this->open_ranges = null;
+                $this->open_items = null;
+                $this->open_items[Request::option('open_item')] = true;
+                $this->open_ranges[Request::option('open_item')] = true;
+            }
+
+            $this->anchor = $toggle_item;
+        }
+
+        if ($this->start_item_id == "root"){
+            $this->open_ranges = null;
+            $this->open_ranges[$this->start_item_id] = true;
+        }
+    }
+
+    function showSemTree(){
+        echo "\n<table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">";
+        if ($this->start_item_id != 'root'){
+            echo "\n<tr><td class=\"printhead\" align=\"left\" valign=\"top\">" . $this->getSemPath()
+            . Assets::img('forumleer.gif', ['size' => '1@20']) . "</td></tr>";
+        }
+        echo "\n<tr><td class=\"blank\"  align=\"left\" valign=\"top\">";
+        $this->showTree($this->start_item_id);
+        echo "\n</td></tr></table>";
+    }
+
+    function getSemPath(){
+        //$ret = "<a href=\"" . parent::getSelf("start_item_id=root") . "\">" .htmlReady($this->tree->root_name) . "</a>";
+        if ($parents = $this->tree->getParents($this->start_item_id)){
+            for($i = count($parents)-1; $i >= 0; --$i){
+                $ret .= " &gt; <a class=\"tree\" href=\"" . URLHelper::getLink($this->getSelf("start_item_id={$parents[$i]}&open_item={$parents[$i]}",false))
+                    . "\">" .htmlReady($this->tree->tree_data[$parents[$i]]["name"]) . "</a>";
+            }
+        }
+        return $ret;
+    }
+
+    /**
+    * returns html for the icons in front of the name of the item
+    *
+    * @access   private
+    * @param    string  $item_id
+    * @return   string
+    */
+    function getItemHeadPics($item_id){
+        $head = "";
+        $head .= "<a href=\"";
+        $head .= ($this->open_items[$item_id])? URLHelper::getLink($this->getSelf("close_item={$item_id}")) . "\"" . tooltip(_("Dieses Element schließen"),true) . ">"
+                                            : URLHelper::getLink($this->getSelf("open_item={$item_id}")) . "\"" . tooltip(_("Dieses Element öffnen"),true) . ">";
+        $head .= Icon::create($this->open_items[$item_id] ? 'arr_1down' : 'arr_1right', 'clickable');
+        $head .= (!$this->open_items[$item_id]) ? Assets::img('forumleer.gif', ['size' => '5']) : "";
+        $head .= "</a>";
+        if ($this->tree->hasKids($item_id)){
+            $head .= Icon::create('folder-full', 'clickable', ['title' => $this->open_ranges[$item_id]?_('Alle Unterelemente schliessen'):_('Alle Unterelemente öffnen')])->asImg(16, ['class' => 'text-top']);
+        } else {
+            $head .= Icon::create('folder-empty', 'clickable', ['title' => _('Dieses Element hat keine Unterelemente')])->asImg();
+        }
+    return $head;
+    }
+
+    function getItemContent($item_id){
+        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"0\" align=\"center\" style=\"font-size:10pt\">";
+        if ($item_id == "root"){
+            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
+            $content .= "\n<tr><td class=\"table_row_even\" align=\"left\">" . htmlReady($this->root_content) ." </td></tr>";
+            $content .= "\n</table>";
+            return $content;
+        }
+        if ($this->tree->tree_data[$item_id]['info']){
+            $content .= "\n<tr><td class=\"table_row_even\" align=\"left\" colspan=\"2\">";
+            $content .= formatReady($this->tree->tree_data[$item_id]['info']) . "</td></tr>";
+        }
+        $content .= "<tr><td colspan=\"2\" class=\"table_row_even\">" . sprintf(_("Alle Veranstaltungen innerhalb dieses Bereiches in der %sÜbersicht%s"),
+                "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id=$item_id")) ."\">","</a>") . "</td></tr>";
+        $content .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+        if ($this->tree->getNumEntries($item_id)){
+            $content .= "<tr><td class=\"table_row_even\" align=\"left\" colspan=\"2\"><b>" . _("Einträge auf dieser Ebene:");
+            $content .= "</b>\n</td></tr>";
+            $entries = $this->tree->getSemData($item_id);
+            $content .= $this->getSemDetails($entries->getGroupedResult("seminar_id"));
+        } else {
+            $content .= "\n<tr><td class=\"table_row_even\" colspan=\"2\">" . _("Keine Einträge auf dieser Ebene vorhanden!") . "</td></tr>";
+        }
+        $content .= "</table>";
+        return $content;
+    }
+
+    function getSemDetails($sem_data){
+        $content = "";
+        $sem_number = -1;
+        foreach($sem_data as $seminar_id => $data){
+            if (key($data['sem_number']) != $sem_number){
+                $sem_number = key($data['sem_number']);
+                $content .= "\n<tr><td class=\"content_seperator\" colspan=\"2\">" . $this->tree->sem_dates[$sem_number]['name'] . "</td></tr>";
+            }
+            $sem_name = key($data["Name"]);
+            $sem_number_end = key($data["sem_number_end"]);
+            if ($sem_number != $sem_number_end){
+                $sem_name .= " (" . $this->tree->sem_dates[$sem_number]['name'] . " - ";
+                $sem_name .= (($sem_number_end == -1) ? _("unbegrenzt") : $this->tree->sem_dates[$sem_number_end]['name']) . ")";
+            }
+            $content .= "<tr><td class=\"table_row_even\"><a href=\"details.php?sem_id=". $seminar_id
+            ."&send_from_search=true&send_from_search_page=" . rawurlencode(URLHelper::getLink($this->getSelf())) . "\">" . htmlReady($sem_name) . "</a>
+            </td><td class=\"table_row_even\" align=\"right\">(";
+            for ($i = 0; $i < count($data["doz_name"]); ++$i){
+                $content .= "<a href=\"dispatch.php/profile?username=" . key($data["doz_uname"]) ."\">" . htmlReady(key($data["doz_name"])) . "</a>";
+                if($i != count($data["doz_name"])-1){
+                    $content .= ", ";
+                }
+                next($data["doz_name"]);
+                next($data["doz_uname"]);
+            }
+            $content .= ") </td></tr>";
+            }
+            return $content;
+    }
+
+    function getItemHead($item_id){
+        $head = "";
+        $head .= parent::getItemHead($item_id);
+        if ($item_id != "root"){
+            $head .= " (" . $this->tree->getNumEntries($item_id,true) . ") " ;
+        }
+        return $head;
+    }
+
+    function getSelf($param = "", $with_start_item = true){
+        if ($param)
+            $url = (($with_start_item) ? "?start_item_id=" . $this->start_item_id . "&" : "?") . $param . "#anchor";
+        else
+            $url = (($with_start_item) ? "?start_item_id=" . $this->start_item_id : "") . "#anchor";
+        return $url;
+    }
+}
+//test
+//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
+//include 'lib/include/html_head.inc.php';
+//include ('lib/seminar_open.php'); // initialise Stud.IP-Session
+//$test = new StudipSemTreeView();
+//$test->showTree("c2942084b6140fc2635dfecdf65bf20d");
+//page_close();
+?>
diff --git a/lib/classes/StudipSemTreeViewAdmin.class.php b/lib/classes/StudipSemTreeViewAdmin.class.php
deleted file mode 100644
index edc65c8..0000000
--- a/lib/classes/StudipSemTreeViewAdmin.class.php
+++ /dev/null
@@ -1,825 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter005: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemTreeViewAdmin.class.php
-// Class to print out the seminar tree in administration mode
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-use Studip\Button, Studip\LinkButton;
-
-
-/**
-* class to print out the seminar tree (admin mode)
-*
-* This class prints out a html representation of the whole or part of the tree
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipSemTreeViewAdmin extends TreeView
-{
-    var $admin_ranges = [];
-    var $msg = [];
-    var $marked_item;
-    var $marked_sem;
-    var $mode;
-    var $move_item_id = null;
-    var $edit_item_id = null;
-
-    /**
-    * constructor
-    *
-    * @access public
-    */
-    function __construct($start_item_id = "root"){
-        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
-        $this->root_content = $GLOBALS['UNI_INFO'];
-        parent::__construct("StudipSemTree"); //calling the baseclass constructor
-        URLHelper::bindLinkParam("_marked_item", $this->marked_item);
-        $this->marked_sem =& $_SESSION['_marked_sem'];
-        $this->parseCommand();
-    }
-
-    /**
-    * manages the session variables used for the open/close thing
-    *
-    * @access   private
-    */
-    function handleOpenRanges(){
-
-        $this->open_ranges[$this->start_item_id] = true;
-
-        if (Request::option('close_item') || Request::option('open_item')){
-            $toggle_item = (Request::option('close_item')) ? Request::option('close_item') : Request::option('open_item');
-            if (!$this->open_items[$toggle_item]){
-                $this->openItem($toggle_item);
-            } else {
-                unset($this->open_items[$toggle_item]);
-            }
-        }
-
-        if (Request::option('item_id')) $this->anchor = Request::option('item_id');
-
-    }
-
-    function openItem($item_id){
-        if ($this->tree->hasKids($item_id)){
-            $this->start_item_id = $item_id;
-            $this->open_ranges = null;
-            $this->open_items = null;
-            $this->open_items[$item_id] = true;
-            $this->open_ranges[$item_id] = true;
-        } else {
-            $this->open_ranges[$this->tree->tree_data[$item_id]['parent_id']] = true;
-            $this->open_items[$item_id] = true;
-            $this->start_item_id = $this->tree->tree_data[$item_id]['parent_id'];
-        }
-        if ($this->start_item_id == "root"){
-            $this->open_ranges = null;
-            $this->open_ranges[$this->start_item_id] = true;
-        }
-        $this->anchor = $item_id;
-    }
-
-    function parseCommand(){
-        $this->mode = '';
-        if (Request::quoted('mode'))
-        $this->mode = Request::quoted('mode');
-        if (Request::option('cmd')){
-            $exec_func = "execCommand" . Request::option('cmd');
-            if (method_exists($this,$exec_func)){
-                if ($this->$exec_func()){
-                    $this->tree->init();
-                }
-            }
-        }
-        if ($this->mode == "MoveItem" || $this->mode == "CopyItem")
-        $this->move_item_id = $this->marked_item;
-    }
-
-    public function execCommandOrderItemsAlphabetically()
-    {
-        $item_id = Request::option('sort_id');
-        $sorted_items_stmt = DBManager::get()->prepare(
-            'SELECT * FROM sem_tree LEFT JOIN Institute ON studip_object_id = Institut_id WHERE parent_id = :parent_id ORDER BY IF(studip_object_id, Institute.name, sem_tree.name)'
-        );
-        $sorted_items_stmt->execute([
-            'parent_id' => $item_id,
-        ]);
-        $sorted_items = $sorted_items_stmt->fetchAll(PDO::FETCH_ASSOC);
-        foreach ($sorted_items as $priority => $data) {
-            $update_priority_stmt = DBManager::get()->prepare('UPDATE sem_tree SET priority = :priority WHERE sem_tree_id = :sem_tree_id');
-            $update_priority_stmt->execute([
-                'priority' => $priority,
-                'sem_tree_id' => $data['sem_tree_id']
-            ]);
-        }
-        $this->msg[$item_id] = 'info§' . _('Die Einträge im Bereich wurden alphabetisch sortiert.');
-
-        return true;
-    }
-
-    function execCommandOrderItem(){
-        $direction = Request::quoted('direction');
-        $item_id = Request::option('item_id');
-        $items_to_order = $this->tree->getKids($this->tree->tree_data[$item_id]['parent_id']);
-        if (!$this->isParentAdmin($item_id) || !$items_to_order)
-        return false;
-        for ($i = 0; $i < count($items_to_order); ++$i){
-            if ($item_id == $items_to_order[$i])
-            break;
-        }
-        if ($direction == "up" && isset($items_to_order[$i-1])){
-            $items_to_order[$i] = $items_to_order[$i-1];
-            $items_to_order[$i-1] = $item_id;
-        } elseif (isset($items_to_order[$i+1])){
-            $items_to_order[$i] = $items_to_order[$i+1];
-            $items_to_order[$i+1] = $item_id;
-        }
-        $view = DbView::getView('sem_tree');
-        for ($i = 0; $i < count($items_to_order); ++$i){
-            $view->params = [$i, $items_to_order[$i]];
-            $rs = $view->get_query("view:SEM_TREE_UPD_PRIO");
-        }
-        $this->mode = "";
-        $this->msg[$item_id] = "msg§" . (($direction == "up") ? _("Element wurde eine Position nach oben verschoben.") : _("Element wurde eine Position nach unten verschoben."));
-        return true;
-    }
-
-    function execCommandNewItem(){
-        $item_id = Request::option('item_id');
-        if ($this->isItemAdmin($item_id)){
-            $new_item_id = DbView::get_uniqid();
-            $this->tree->storeItem($new_item_id,$item_id,_("Neuer Eintrag"), $this->tree->getNumKids($item_id) +1);
-            $this->openItem($new_item_id);
-            $this->edit_item_id = $new_item_id;
-            if ($this->mode != "NewItem") $this->msg[$new_item_id] = "info§" . _("Hier können Sie die Bezeichnung und die Kurzinformation zu diesem Bereich eingeben.");
-            $this->mode = "NewItem";
-        }
-        return false;
-    }
-
-    function execCommandEditItem(){
-        $item_id = Request::option('item_id');
-        if ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id)){
-            $this->mode = "EditItem";
-            $this->anchor = $item_id;
-            $this->edit_item_id = $item_id;
-            if($this->tree->tree_data[$this->edit_item_id]['studip_object_id']){
-                $this->msg[$item_id] = "info§" . _("Hier können Sie die Kurzinformation zu diesem Bereich eingeben. Der Name kann nicht geändert werden, da es sich um eine Stud.IP-Einrichtung handelt.");
-            } else {
-                $this->msg[$item_id] = "info§" . _("Hier können Sie die Bezeichnung und die Kurzinformation zu diesem Bereich eingeben");
-            }
-        }
-        return false;
-    }
-
-    function execCommandInsertItem(){
-        $item_id = Request::option('item_id');
-        $parent_id = Request::option('parent_id');
-        $item_name = Request::quoted('edit_name');
-        $item_info = Request::quoted('edit_info');
-        $item_type = Request::int('edit_type');
-        if ($this->mode == "NewItem" && $item_id){
-            if ($this->isItemAdmin($parent_id)){
-                $priority = count($this->tree->getKids($parent_id));
-                if ($this->tree->InsertItem($item_id,$parent_id,$item_name,$item_info,$priority,null,$item_type)){
-                    $this->mode = "";
-                    $this->tree->init();
-                    $this->openItem($item_id);
-                    $this->msg[$item_id] = "msg§" . _("Dieser Bereich wurde neu eingefügt.");
-                }
-            }
-        }
-        if ($this->mode == "EditItem"){
-            if ($this->isParentAdmin($item_id)){
-                if ($this->tree->UpdateItem($item_id, $item_name, $item_info, $item_type)){
-                    $this->msg[$item_id] = "msg§" . _("Bereich wurde geändert.");
-                } else {
-                    $this->msg[$item_id] = "info§" . _("Keine Veränderungen vorgenommen.");
-                }
-                $this->mode = "";
-                $this->tree->init();
-                $this->openItem($item_id);
-            }
-        }
-        return false;
-    }
-
-    function execCommandAssertDeleteItem(){
-        $item_id = Request::option('item_id');
-        if ($this->isParentAdmin($item_id)){
-            $this->mode = "AssertDeleteItem";
-            $this->open_items[$item_id] = true;
-            $this->msg[$item_id] = "info§" ._("Sie beabsichtigen diesen Bereich inklusive aller Unterbereiche zu löschen. ")
-            . sprintf(_("Es werden insgesamt %s Bereiche gelöscht!"),count($this->tree->getKidsKids($item_id))+1)
-            . "<br>" . _("Wollen Sie diese Bereiche wirklich löschen?") . "<br>"
-            . LinkButton::createAccept(_('Ja!'),
-                    URLHelper::getURL($this->getSelf('cmd=DeleteItem&item_id='.$item_id)),
-                    ['title' => _('löschen')])
-            . "&nbsp;"
-            . LinkButton::createCancel(_('Nein!'),
-                    URLHelper::getURL($this->getSelf('cmd=Cancel&item_id='. $item_id)));
-        }
-        return false;
-    }
-
-    function execCommandDeleteItem(){
-        $item_id = Request::option('item_id');
-        $item_name = $this->tree->tree_data[$item_id]['name'];
-        if ($this->isParentAdmin($item_id) && $this->mode == "AssertDeleteItem"){
-            $this->openItem($this->tree->tree_data[$item_id]['parent_id']);
-            $items_to_delete = $this->tree->getKidsKids($item_id);
-            $items_to_delete[] = $item_id;
-            $deleted = $this->tree->DeleteItems($items_to_delete);
-            if ($deleted['items']){
-                $this->msg[$this->anchor] = "msg§" . sprintf(_("Der Bereich <b>%s</b> und alle Unterbereiche (insgesamt %s) wurden gelöscht. "),htmlReady($item_name),$deleted['items']);
-            } else {
-                $this->msg[$this->anchor] = "error§" . _("Fehler, es konnten keine Bereiche gelöscht werden !");
-            }
-            if ($deleted['entries']){
-                $this->msg[$this->anchor] .= sprintf(_("<br>Es wurden %s Veranstaltungszuordnungen gelöscht. "),$deleted['entries']);
-            }
-            $this->mode = "";
-        }
-        return true;
-    }
-
-    function execCommandMoveItem(){
-        $item_id = Request::option('item_id');
-        $this->anchor = $item_id;
-        $this->marked_item = $item_id;
-        $this->mode = "MoveItem";
-        return false;
-    }
-
-    function execCommandCopyItem(){
-        $item_id = Request::option('item_id');
-        $this->anchor = $item_id;
-        $this->marked_item = $item_id;
-        $this->mode = "CopyItem";
-        return false;
-    }
-
-    function execCommandDoMoveItem(){
-        $item_id = Request::option('item_id');
-        $item_to_move = $this->marked_item;
-        if ($this->mode == "MoveItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
-        && ($item_to_move != $item_id) && ($this->tree->tree_data[$item_to_move]['parent_id'] != $item_id)
-        && !$this->tree->isChildOf($item_to_move,$item_id)){
-            $view = DbView::getView('sem_tree');
-            $view->params = [$item_id, count($this->tree->getKids($item_id)), $item_to_move];
-            $rs = $view->get_query("view:SEM_TREE_MOVE_ITEM");
-            if ($rs->affected_rows()){
-                $this->msg[$item_to_move] = "msg§" . _("Bereich wurde verschoben.");
-            } else {
-                $this->msg[$item_to_move] = "error§" . _("Keine Verschiebung durchgeführt.");
-            }
-        }
-        $this->tree->init();
-        $this->openItem($item_to_move);
-        $this->mode = "";
-        return false;
-    }
-
-    function execCommandDoCopyItem(){
-        $item_id = Request::option('item_id');
-        $item_to_copy = $this->marked_item;
-        if ($this->mode == "CopyItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
-        && ($item_to_copy != $item_id) && ($this->tree->tree_data[$item_to_copy]['parent_id'] != $item_id)
-        && !$this->tree->isChildOf($item_to_copy,$item_id)){
-            $items_to_copy = $this->tree->getKidsKids($item_to_copy);
-            $seed = DbView::get_uniqid();
-            $new_item_id = md5($item_to_copy . $seed);
-            $parent_id = $item_id;
-            $num_copy = $this->tree->InsertItem($new_item_id,$parent_id,
-            addslashes($this->tree->tree_data[$item_to_copy]['name']),
-            addslashes($this->tree->tree_data[$item_to_copy]['info']),
-            $this->tree->getMaxPriority($parent_id)+1,
-            ($this->tree->tree_data[$item_to_copy]['studip_object_id'] ? $this->tree->tree_data[$item_to_copy]['studip_object_id'] : null),
-            $this->tree->tree_data[$item_to_copy]['type']);
-            if($num_copy){
-                if ($items_to_copy){
-                    for ($i = 0; $i < count($items_to_copy); ++$i){
-                        $num_copy += $this->tree->InsertItem(md5($items_to_copy[$i] . $seed),
-                        md5($this->tree->tree_data[$items_to_copy[$i]]['parent_id'] . $seed),
-                        addslashes($this->tree->tree_data[$items_to_copy[$i]]['name']),
-                        addslashes($this->tree->tree_data[$items_to_copy[$i]]['info']),
-                        $this->tree->tree_data[$items_to_copy[$i]]['priority'],
-                        ($this->tree->tree_data[$items_to_copy[$i]]['studip_object_id'] ? $this->tree->tree_data[$items_to_copy[$i]]['studip_object_id'] : null),
-                        $this->tree->tree_data[$item_to_copy]['type']);
-                    }
-                }
-                $items_to_copy[] = $item_to_copy;
-                for ($i = 0; $i < count($items_to_copy); ++$i){
-                    $sem_entries = $this->tree->getSemIds($items_to_copy[$i], false);
-                    if ($sem_entries){
-                        for ($j = 0; $j < count($sem_entries); ++$j){
-                            $num_entries += $this->tree->InsertSemEntry(md5($items_to_copy[$i] . $seed), $sem_entries[$j]);
-                        }
-                    }
-                }
-            }
-
-            if ($num_copy){
-                $this->msg[$new_item_id] = "msg§" . sprintf(_("%s Bereich(e) wurde(n) kopiert."), $num_copy) . "<br>"
-                . sprintf(_("%s Veranstaltungszuordnungen wurden kopiert"), $num_entries);
-            } else {
-                $this->msg[$new_item_id] = "error§" . _("Keine Kopie durchgeführt.");
-            }
-            $this->tree->init();
-            $this->openItem($new_item_id);
-        }
-        $this->mode = "";
-        return false;
-    }
-
-    function execCommandInsertFak(){
-        if($this->isItemAdmin("root") && Request::quoted('insert_fak')){
-            $view = DbView::getView('sem_tree');
-            $item_id = $view->get_uniqid();
-            $view->params = [$item_id,'root','',$this->tree->getNumKids('root')+1,'',Request::quoted('insert_fak'),0];
-            $rs = $view->get_query("view:SEM_TREE_INS_ITEM");
-            if ($rs->affected_rows()){
-                $this->tree->init();
-                $this->openItem($item_id);
-                $this->msg[$item_id] = "msg§" . _("Dieser Bereich wurde neu eingefügt.");
-                return false;
-            }
-        }
-        return false;
-    }
-
-    function execCommandMarkSem(){
-        $item_id = Request::option('item_id');
-        $marked_sem_array =  Request::quotedArray('marked_sem');
-        $marked_sem = array_values(array_unique($marked_sem_array));
-        $sem_aktion = explode("_",Request::quoted('sem_aktion'));
-        if (($sem_aktion[0] == 'mark' || $sem_aktion[1] == 'mark') && count($marked_sem)){
-            $count_mark = 0;
-            for ($i = 0; $i < count($marked_sem); ++$i){
-                if (!isset($this->marked_sem[$marked_sem[$i]])){
-                    ++$count_mark;
-                    $this->marked_sem[$marked_sem[$i]] = true;
-                }
-            }
-            if ($count_mark){
-                $this->msg[$item_id] = "msg§" . sprintf(_("Es wurde(n) %s Veranstaltung(en) der Merkliste hinzugefügt."),$count_mark);
-            }
-        }
-        if ($this->isItemAdmin($item_id)){
-            if (($sem_aktion[0] == 'del' || $sem_aktion[1] == 'del') && count($marked_sem)){
-                $not_deleted = [];
-                foreach($marked_sem as $key => $seminar_id){
-                    $seminar = new Seminar($seminar_id);
-                    if(count($seminar->getStudyAreas()) == 1){
-                        $not_deleted[] = $seminar->getName();
-                        unset($marked_sem[$key]);
-                    }
-                }
-                if ($this->msg[$item_id]){
-                    $this->msg[$item_id] .= "<br>";
-                } else {
-                    $this->msg[$item_id] = "msg§";
-                }
-                if(count($marked_sem)){
-                    $count_del = $this->tree->DeleteSemEntries($item_id, $marked_sem);
-                    $this->msg[$item_id] .= sprintf(_("%s Veranstaltungszuordnung(en) wurde(n) aufgehoben."),$count_del);
-                }
-                if(count($not_deleted)){
-                    $this->msg[$item_id] .= '<br>'
-                                         . sprintf(_("Für folgende Veranstaltungen wurde die Zuordnung nicht aufgehoben, da es die einzige Zuordnung ist: %s")
-, '<br>'.htmlready(join(', ', $not_deleted)));
-                }
-            }
-            $this->anchor = $item_id;
-            $this->open_items[$item_id] = true;
-            return true;
-        }
-        return false;
-    }
-
-    function execCommandCancel(){
-        $item_id = Request::option('item_id');
-        $this->mode = "";
-        $this->anchor = $item_id;
-        return false;
-    }
-
-    function showSemTree(){
-        ?>
-        <script type="text/javascript">
-        function invert_selection(the_form){
-            my_elements = document.forms[the_form].elements['marked_sem[]'];
-            if(!my_elements.length){
-                if(my_elements.checked)
-                my_elements.checked = false;
-                else
-                my_elements.checked = true;
-            } else {
-                for(i = 0; i < my_elements.length; ++i){
-                    if(my_elements[i].checked)
-                    my_elements[i].checked = false;
-                    else
-                    my_elements[i].checked = true;
-                }
-            }
-        }
-        </script>
-        <?
-        echo "\n<table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">";
-        if ($this->start_item_id != 'root'){
-            echo "\n<tr><td class=\"table_row_odd\" align=\"left\" valign=\"top\"><div style=\"font-size:10pt;margin-left:10px\"><b>"
-            . _("Studienbereiche") . ":</b><br>" .  $this->getSemPath()
-            . "</div></td></tr>";
-        }
-        echo "\n<tr><td class=\"blank\"  align=\"left\" valign=\"top\">";
-        $this->showTree($this->start_item_id);
-        echo "\n</td></tr></table>";
-    }
-
-    function getSemPath(){
-        $ret = "";
-        //$ret = "<a href=\"" . parent::getSelf("start_item_id=root") . "\">" .htmlReady($this->tree->root_name) . "</a>";
-        if ($parents = $this->tree->getParents($this->start_item_id)){
-            for($i = count($parents)-1; $i >= 0; --$i){
-                $ret .= " &gt; <a class=\"tree\" href=\"" . URLHelper::getLink($this->getSelf("start_item_id={$parents[$i]}&open_item={$parents[$i]}",false))
-                . "\">" .htmlReady($this->tree->tree_data[$parents[$i]]["name"]) . "</a>";
-            }
-        }
-        return $ret;
-    }
-
-    /**
-    * returns html for the icons in front of the name of the item
-    *
-    * @access   private
-    * @param    string  $item_id
-    * @return   string
-    */
-    function getItemHeadPics($item_id){
-        $head = $this->getItemHeadFrontPic($item_id);
-        $head .= "\n<td  class=\"printhead\" nowrap  align=\"left\" valign=\"bottom\">";
-        if ($this->tree->hasKids($item_id)){
-            $head .= Icon::create('folder-full', Icon::ROLE_CLICKABLE, ['title' => !empty($this->open_ranges[$item_id]) ? _('Alle Unterelemente schliessen') : _('Alle Unterelemente öffnen')])->asImg(['class' => 'text-top']);
-        } else {
-            $head .= Icon::create('folder-empty', 'clickable', ['title' => _('Dieses Element hat keine Unterelemente')])->asImg();
-        }
-        return $head . "</td>";
-    }
-
-    function getItemContent($item_id){
-        if ($item_id == $this->edit_item_id) {
-            return $this->getEditItemContent();
-        }
-        if (empty($GLOBALS['SEM_TREE_TYPES'][$this->tree->getValue($item_id, 'type')]['editable'])){
-            $is_not_editable = true;
-            $this->msg[$item_id] = "info§" . sprintf(_("Der Typ dieses Elementes verbietet eine Bearbeitung."));
-        }
-        if ($item_id == $this->move_item_id) {
-            $this->msg[$item_id] = "info§" . sprintf(_("Dieses Element wurde zum Verschieben / Kopieren markiert. Bitte wählen Sie ein Einfügesymbol %s aus, um das Element zu verschieben / kopieren."), Icon::create('arr_2right', 'sort', ['title' => "Einfügesymbol"])->asImg(16, ["alt" => "Einfügesymbol"]));
-        }
-        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt;\">";
-        $content .= $this->getItemMessage($item_id);
-        $content .= "\n<tr><td style=\"font-size:10pt;\">";
-        if (empty($is_not_editable)) {
-            if ($this->isItemAdmin($item_id) ){
-                $content .= LinkButton::create(_('Neues Objekt'),
-                        URLHelper::getURL($this->getSelf('cmd=NewItem&item_id='.$item_id)),
-                        ['title' => _('Innerhalb dieser Ebene ein neues Element einfügen')]) . '&nbsp;';
-                $content .= LinkButton::create(_('Sortieren'),
-                        URLHelper::getURL($this->getSelf('cmd=OrderItemsAlphabetically&sort_id='.$item_id)),
-                        ['title' => _('Sortiert die untergeordneten Elemente alphabetisch')]) . '&nbsp;';
-            }
-            if ($this->isParentAdmin($item_id) && $item_id != "root"){
-                $content .= LinkButton::create(_('Bearbeiten'),
-                        URLHelper::getURL($this->getSelf('cmd=EditItem&item_id=' . $item_id)),
-                        ['title' => 'Dieses Element bearbeiten']) . '&nbsp;';
-
-                $content .= LinkButton::create(_('Löschen'),
-                        URLHelper::getURL($this->getSelf('cmd=AssertDeleteItem&item_id=' . $item_id)),
-                        ['title' => _('Dieses Element löschen')]) . '&nbsp;';
-
-                if ($this->move_item_id == $item_id && ($this->mode == "MoveItem" || $this->mode == "CopyItem")){
-                    $content .= LinkButton::create(_('Abbrechen'),
-                            URLHelper::getURL($this->getSelf('cmd=Cancel&item_id=' . $item_id)),
-                            ['title' => _('Verschieben / Kopieren abbrechen')]) . '&nbsp;';
-                } else {
-                    $content .= LinkButton::create(_('Verschieben'),
-                            URLHelper::getURL($this->getSelf('cmd=MoveItem&item_id='.$item_id)),
-                            ['title' => _('Dieses Element in eine andere Ebene verschieben')]) . '&nbsp;';
-                    $content .= LinkButton::create(_('Kopieren'),
-                            URLHelper::getURL($this->getSelf('cmd=CopyItem&item_id='.$item_id)),
-                            ['title' => _('Dieses Element in eine andere Ebene kopieren')]);
-                }
-            }
-        }
-        if ($item_id == 'root' && $this->isItemAdmin($item_id)){
-            $view = DbView::getView('sem_tree');
-            $rs = $view->get_query("view:SEM_TREE_GET_LONELY_FAK");
-            $content .= "\n<p><form action=\"" . URLHelper::getLink($this->getSelf("cmd=InsertFak")) . "\" method=\"post\" class=\"default\">"
-                . CSRFProtection::tokenTag()
-                . '<div><label>'
-                . _("Stud.IP-Fakultät einfügen")
-                . "\n<select style=\"width:200px;\" name=\"insert_fak\">";
-            while($rs->next_record()){
-                $content .= "\n<option value=\"" . $rs->f("Institut_id") . "\">" . htmlReady(my_substr($rs->f("Name"),0,50)) . "</option>";
-            }
-            $content .= "</select></label></div><div class=\"col-1\"> " . Button::create(_('Eintragen'), ['title' => _("Fakultät einfügen")]) . "</div></form></p>";
-        }
-        $content .= "</td></tr></table>";
-
-        $content .= "\n<table border=\"0\" width=\"90%\" cellpadding=\"2\" cellspacing=\"0\" align=\"center\" style=\"font-size:10pt\">";
-        if ($item_id == "root"){
-            $content .= "\n<tr><td  class=\"table_header_bold\" align=\"left\" style=\"font-size:10pt;\">" . htmlReady($this->tree->root_name) ." </td></tr>";
-            $content .= "\n<tr><td  class=\"table_row_even\" align=\"left\" style=\"font-size:10pt;\">" . htmlReady($this->root_content) ." </td></tr>";
-            $content .= "\n</table>";
-            return $content;
-        }
-        if ($this->tree->tree_data[$item_id]['info']){
-            $content .= "\n<tr><td style=\"font-size:10pt;\" class=\"table_row_even\" align=\"left\" colspan=\"3\">";
-            $content .= formatReady($this->tree->tree_data[$item_id]['info']) . "</td></tr>";
-        }
-        $content .= "<tr><td style=\"font-size:10pt;\"colspan=\"3\">&nbsp;</td></tr>";
-        if ($this->tree->getNumEntries($item_id)) {
-            $content .= "<tr><td class=\"table_row_even\" style=\"font-size:10pt;\" align=\"left\" colspan=\"3\"><b>" . _("Einträge auf dieser Ebene:");
-            $content .= "</b>\n</td></tr>";
-            $entries = $this->tree->getSemData($item_id);
-            $content .= $this->getSemDetails($entries,$item_id);
-        } else {
-            $content .= "\n<tr><td class=\"table_row_even\" style=\"font-size:10pt;\" colspan=\"3\">" . _("Keine Einträge auf dieser Ebene vorhanden!") . "</td></tr>";
-        }
-        $content .= "</table>";
-        return $content;
-    }
-
-    function getSemDetails($snap, $item_id, $lonely_sem = false){
-        $form_name = DbView::get_uniqid();
-        $content = "<form class=\"default\" name=\"$form_name\" action=\"" . URLHelper::getLink($this->getSelf("cmd=MarkSem")) ."\" method=\"post\">
-        <input type=\"hidden\" name=\"item_id\" value=\"$item_id\">";
-        $content .= CSRFProtection::tokenTag();
-        $group_by_data = $snap->getGroupedResult("sem_number", "seminar_id");
-        $sem_data = $snap->getGroupedResult("seminar_id");
-        $group_by_duration = $snap->getGroupedResult("sem_number_end", ["sem_number","seminar_id"]);
-        foreach ($group_by_duration as $sem_number_end => $detail){
-            if ($sem_number_end != -1 && ($detail['sem_number'][$sem_number_end] && count($detail['sem_number']) == 1)){
-                continue;
-            } else {
-                foreach ($detail['seminar_id'] as $seminar_id => $foo){
-                    $start_sem = key($sem_data[$seminar_id]["sem_number"]);
-                    if ($sem_number_end == -1){
-                        $sem_number_end = count($this->tree->sem_dates)-1;
-                    }
-                    for ($i = $start_sem; $i <= $sem_number_end; ++$i){
-                        if ($group_by_data[$i] && !$tmp_group_by_data[$i]){
-                            foreach($group_by_data[$i]['seminar_id'] as $id => $bar){
-                                $tmp_group_by_data[$i]['seminar_id'][$id] = key($sem_data[$id]["Name"]);
-                            }
-                        }
-                        $tmp_group_by_data[$i]['seminar_id'][$seminar_id] = key($sem_data[$seminar_id]["Name"]);
-                    }
-                }
-            }
-        }
-        if (is_array($tmp_group_by_data)){
-            foreach ($tmp_group_by_data as $start_sem => $detail){
-                $group_by_data[$start_sem] = $detail;
-            }
-        }
-
-        foreach ($group_by_data as $group_field => $sem_ids){
-            foreach ($sem_ids['seminar_id'] as $seminar_id => $foo){
-                $name = mb_strtolower(key($sem_data[$seminar_id]["Name"]));
-                $name = str_replace("ä","ae",$name);
-                $name = str_replace("ö","oe",$name);
-                $name = str_replace("ü","ue",$name);
-                $group_by_data[$group_field]['seminar_id'][$seminar_id] = $name;
-            }
-            uasort($group_by_data[$group_field]['seminar_id'], 'strnatcmp');
-        }
-
-        krsort($group_by_data, SORT_NUMERIC);
-
-        foreach ($group_by_data as $sem_number => $sem_ids){
-            $content .= "\n<tr><td class=\"content_seperator\" colspan=\"3\" style=\"font-size:10pt;\" >" . $this->tree->sem_dates[$sem_number]['name'] . "</td></tr>";
-            if (is_array($sem_ids['seminar_id'])){
-                foreach(array_keys($sem_ids['seminar_id']) as $seminar_id) {
-                    $sem_name = key($sem_data[$seminar_id]["Name"]);
-                    $sem_number_start = key($sem_data[$seminar_id]["sem_number"]);
-                    $sem_number_end = key($sem_data[$seminar_id]["sem_number_end"]);
-                    if ($sem_number_start != $sem_number_end){
-                        $sem_name .= " (" . $this->tree->sem_dates[$sem_number_start]['name'] . " - ";
-                        $sem_name .= (($sem_number_end == -1) ? _("unbegrenzt") : $this->tree->sem_dates[$sem_number_end]['name']) . ")";
-                    }
-                    $content .= "<tr><td class=\"table_row_even\" width=\"1%\"><input type=\"checkbox\" name=\"marked_sem[]\" value=\"$seminar_id\" style=\"vertical-align:middle\">
-                    </td><td class=\"table_row_even\" style=\"font-size:10pt;\"><a href=\"dispatch.php/course/details/?sem_id=". $seminar_id
-                    ."&send_from_search=true&send_from_search_page=" . rawurlencode(URLHelper::getLink($this->getSelf())) . "\">" . htmlReady($sem_name) . "</a>
-                    </td><td class=\"table_row_even\" align=\"right\" style=\"font-size:10pt;\">(";
-                    $doz_name = array_keys($sem_data[$seminar_id]['doz_name']);
-                    $doz_uname = array_keys($sem_data[$seminar_id]['doz_uname']);
-                    if (is_array($doz_name)){
-                        uasort($doz_name, 'strnatcasecmp');
-                        $i = 0;
-                        foreach ($doz_name as $index => $value){
-                            if ($i == 4){
-                                $content .= "... <a href=\"dispatch.php/course/details/?sem_id=". $seminar_id
-                                ."&send_from_search=true&send_from_search_page=" . rawurlencode(URLHelper::getLink($this->getSelf())) . "\">("._("mehr").")</a>";
-                                break;
-                            }
-                            $content .= "<a href=\"dispatch.php/profile?username=" . $doz_uname[$index] ."\">" . htmlReady($value) . "</a>";
-                            if($i != count($doz_name)-1){
-                                $content .= ", ";
-                            }
-                            ++$i;
-                        }
-                    }
-                    $content .= ") </td></tr>";
-                }
-            }
-        }
-        $content .= "<tr><td class=\"table_row_even\" colspan=\"2\">"
-            . LinkButton::create(_('Auswählen'), ['title' => _('Auswahl umkehren'), 'onClick' => 'invert_selection(\''. $form_name .'\');return false;'])
-            . "</td><td class=\"table_row_even\" align=\"right\"><div class=\"hgroup\">
-        <select name=\"sem_aktion\" style=\"margin-right: 1em;\" " . tooltip(_("Aktion auswählen"),true) . ">
-        <option value=\"mark\">" . _("in Merkliste übernehmen") . "</option>";
-        if (!$lonely_sem && $this->isItemAdmin($item_id)){
-            $content .= "<option value=\"del_mark\">" . _("löschen und in Merkliste übernehmen") . "</option>
-            <option value=\"del\">" . _("löschen") . "</option>";
-        }
-        $content .= "</select>" . Button::createAccept(_('OK'), ['title' => _("Gewählte Aktion starten")])
-                 . "</div></td></tr> </form>";
-        return $content;
-    }
-
-    function getEditItemContent(){
-        ob_start();
-        ?>
-        <form name="item_form" action="<?= URLHelper::getLink($this->getSelf("cmd=InsertItem&item_id={$this->edit_item_id}")) ?>" method="POST" class="default" style="width: 90%; margin: auto;">
-            <?= CSRFProtection::tokenTag(); ?>
-            <input type="hidden" name="parent_id" value="<?= $this->tree->tree_data[$this->edit_item_id]['parent_id'] ?>">
-
-            <table style="width: 100%"><?= $this->getItemMessage($this->edit_item_id,2) ?></table>
-
-            <fieldset>
-                <legend><?= _("Bereich editieren") ?></legend>
-
-                <label>
-                    <?= _("Name des Elements") ?>
-                    <input type="text" name="edit_name"
-                        <?= ($this->tree->tree_data[$this->edit_item_id]['studip_object_id']) ? 'disabled="disabled"' : '' ?>
-                           value="<?= htmlReady($this->tree->tree_data[$this->edit_item_id]['name']) ?>">
-                </label>
-
-               <? if (count($GLOBALS['SEM_TREE_TYPES']) > 1) : ?>
-               <label>
-                   <?= _("Typ des Elements") ?>
-                    <select name="edit_type">
-                    <? foreach ($GLOBALS['SEM_TREE_TYPES'] as $sem_tree_type_key => $sem_tree_type) :
-                        if ($sem_tree_type['editable']) :
-                            $selected = $sem_tree_type_key == $this->tree->getValue($this->edit_item_id, 'type') ? 'selected' : '';
-                            echo '<option value="'.htmlReady($sem_tree_type_key).'"'.$selected.'>';
-                            echo htmlReady($sem_tree_type['name'] ? $sem_tree_type['name'] : $sem_tree_type_key);
-                            echo '</option>';
-                        endif;
-                    endforeach;
-                    ?>
-                    </select>
-                </label>
-                <? else : # Auswahl ausblenden, wenn nur ein Typ vorhanden ?>
-                <input type='hidden' name='edit_type' value='0'>
-                <? endif ?>
-
-                <? $buttonlink_id = ($this->mode == "NewItem") ? $this->tree->tree_data[$this->edit_item_id]['parent_id'] : $this->edit_item_id; ?>
-
-                <label>
-                    <?= _("Infotext:") ?>
-                    <textarea rows="5" name="edit_info" wrap="virtual"><?= htmlReady($this->tree->tree_data[$this->edit_item_id]['info']) ?></textarea>
-                </label>
-            </fieldset>
-
-            <footer>
-                <?= Button::createAccept(_('Absenden'), ['title' => _('Einstellungen übernehmen')]) ?>
-                <?= LinkButton::createCancel(_('Abbrechen'),
-                    URLHelper::getURL($this->getSelf('cmd=Cancel&item_id='.$buttonlink_id)),
-                    ['title' => _('Aktion abbrechen')])
-                ?>
-            </footer>
-        </form>
-
-        <?
-        return ob_get_clean();
-    }
-
-
-    function isItemAdmin($item_id){
-        global $auth;
-        if ($auth->auth['perm'] == "root"){
-            return true;
-        }
-        if (!($admin_id = $this->tree->tree_data[$this->tree->getAdminRange($item_id)]['studip_object_id'])){
-            return false;
-        }
-        if(!isset($this->admin_ranges[$admin_id])){
-            $view = DbView::getView('sem_tree');
-            $view->params[0] = $auth->auth['uid'];
-            $view->params[1] = $admin_id;
-            $rs = $view->get_query("view:SEM_TREE_CHECK_PERM");
-            $this->admin_ranges[$admin_id] = ($rs->next_record()) ? true : false;
-        }
-        if ($this->admin_ranges[$admin_id]){
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function isParentAdmin($item_id){
-        return $this->isItemAdmin($this->tree->tree_data[$item_id]['parent_id']);
-    }
-
-    function getItemHead($item_id){
-        $head = "";
-        if (($this->mode == "MoveItem" || $this->mode == "CopyItem") && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
-        && ($this->move_item_id != $item_id) && ($this->tree->tree_data[$this->move_item_id]['parent_id'] != $item_id)
-        && !$this->tree->isChildOf($this->move_item_id,$item_id)){
-            $head .= "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=Do" . $this->mode . "&item_id=$item_id")) . "\">"
-            . Icon::create('arr_2right', 'sort', ['title' => _("An dieser Stelle einfügen")])->asImg(16, ["alt" => _("An dieser Stelle einfügen")])."</a>&nbsp;";
-        }
-        $head .= parent::getItemHead($item_id);
-        if ($item_id != "root"){
-            $head .= " (" . $this->tree->getNumEntries($item_id,true) . ") " ;
-        }
-        if ($item_id != $this->start_item_id && $this->isParentAdmin($item_id) && $item_id != $this->edit_item_id){
-            $head .= "</td><td nowrap align=\"right\" valign=\"bottom\" class=\"printhead\">";
-            if (!$this->tree->isFirstKid($item_id)){
-                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=up&item_id=$item_id")) .
-                "\">" .  Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach oben")]) .
-                "</a>";
-            }
-            if (!$this->tree->isLastKid($item_id)){
-                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=down&item_id=$item_id")) .
-                "\">" . Icon::create('arr_2down', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach unten")]) .
-                "</a>";
-            }
-            $head .= "&nbsp;";
-        }
-        return $head;
-    }
-
-    function getItemMessage($item_id,$colspan = 1){
-        $content = "";
-        if (!empty($this->msg[$item_id])) {
-            $msg = explode("§",$this->msg[$item_id]);
-            $pics = [
-                'error' => Icon::create('decline', 'attention'),
-                'info'  => Icon::create('exclaim', 'inactive'),
-                'msg'   => Icon::create('accept', 'accept')];
-            $content = "\n<tr><td colspan=\"{$colspan}\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\" style=\"font-size:10pt\">
-                        <tr><td class=\"blank\" align=\"center\" width=\"25\">" .  $pics[$msg[0]]->asImg(['class' => 'text-top']) . "</td>
-            <td class=\"blank\" align=\"left\">" . $msg[1] . "</td></tr>
-            </table></td></tr><tr>";
-        }
-        return $content;
-    }
-
-    function getSelf($param = "", $with_start_item = true){
-        $url_params = "foo=" . DbView::get_uniqid();
-        if ($this->mode) $url_params .= "&mode=" . $this->mode;
-        if ($with_start_item) $url_params .= "&start_item_id=" . $this->start_item_id;
-        if ($param) $url_params .= '&' . $param;
-        return parent::getSelf($url_params);
-    }
-}
-//test
-//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
-//include 'lib/include/html_head.inc.php';
-//include ('lib/seminar_open.php'); // initialise Stud.IP-Session
-//$test = new StudipSemTreeViewAdmin(Request::quoted('start_item_id'));
-//$test->showSemTree();
-//echo "<hr><pre>";
-//print_r($_open_items);
-//page_close();
-?>
diff --git a/lib/classes/StudipSemTreeViewAdmin.php b/lib/classes/StudipSemTreeViewAdmin.php
new file mode 100644
index 0000000..edc65c8
--- /dev/null
+++ b/lib/classes/StudipSemTreeViewAdmin.php
@@ -0,0 +1,825 @@
+<?php
+# Lifter001: TEST
+# Lifter002: TODO
+# Lifter005: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemTreeViewAdmin.class.php
+// Class to print out the seminar tree in administration mode
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+use Studip\Button, Studip\LinkButton;
+
+
+/**
+* class to print out the seminar tree (admin mode)
+*
+* This class prints out a html representation of the whole or part of the tree
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipSemTreeViewAdmin extends TreeView
+{
+    var $admin_ranges = [];
+    var $msg = [];
+    var $marked_item;
+    var $marked_sem;
+    var $mode;
+    var $move_item_id = null;
+    var $edit_item_id = null;
+
+    /**
+    * constructor
+    *
+    * @access public
+    */
+    function __construct($start_item_id = "root"){
+        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
+        $this->root_content = $GLOBALS['UNI_INFO'];
+        parent::__construct("StudipSemTree"); //calling the baseclass constructor
+        URLHelper::bindLinkParam("_marked_item", $this->marked_item);
+        $this->marked_sem =& $_SESSION['_marked_sem'];
+        $this->parseCommand();
+    }
+
+    /**
+    * manages the session variables used for the open/close thing
+    *
+    * @access   private
+    */
+    function handleOpenRanges(){
+
+        $this->open_ranges[$this->start_item_id] = true;
+
+        if (Request::option('close_item') || Request::option('open_item')){
+            $toggle_item = (Request::option('close_item')) ? Request::option('close_item') : Request::option('open_item');
+            if (!$this->open_items[$toggle_item]){
+                $this->openItem($toggle_item);
+            } else {
+                unset($this->open_items[$toggle_item]);
+            }
+        }
+
+        if (Request::option('item_id')) $this->anchor = Request::option('item_id');
+
+    }
+
+    function openItem($item_id){
+        if ($this->tree->hasKids($item_id)){
+            $this->start_item_id = $item_id;
+            $this->open_ranges = null;
+            $this->open_items = null;
+            $this->open_items[$item_id] = true;
+            $this->open_ranges[$item_id] = true;
+        } else {
+            $this->open_ranges[$this->tree->tree_data[$item_id]['parent_id']] = true;
+            $this->open_items[$item_id] = true;
+            $this->start_item_id = $this->tree->tree_data[$item_id]['parent_id'];
+        }
+        if ($this->start_item_id == "root"){
+            $this->open_ranges = null;
+            $this->open_ranges[$this->start_item_id] = true;
+        }
+        $this->anchor = $item_id;
+    }
+
+    function parseCommand(){
+        $this->mode = '';
+        if (Request::quoted('mode'))
+        $this->mode = Request::quoted('mode');
+        if (Request::option('cmd')){
+            $exec_func = "execCommand" . Request::option('cmd');
+            if (method_exists($this,$exec_func)){
+                if ($this->$exec_func()){
+                    $this->tree->init();
+                }
+            }
+        }
+        if ($this->mode == "MoveItem" || $this->mode == "CopyItem")
+        $this->move_item_id = $this->marked_item;
+    }
+
+    public function execCommandOrderItemsAlphabetically()
+    {
+        $item_id = Request::option('sort_id');
+        $sorted_items_stmt = DBManager::get()->prepare(
+            'SELECT * FROM sem_tree LEFT JOIN Institute ON studip_object_id = Institut_id WHERE parent_id = :parent_id ORDER BY IF(studip_object_id, Institute.name, sem_tree.name)'
+        );
+        $sorted_items_stmt->execute([
+            'parent_id' => $item_id,
+        ]);
+        $sorted_items = $sorted_items_stmt->fetchAll(PDO::FETCH_ASSOC);
+        foreach ($sorted_items as $priority => $data) {
+            $update_priority_stmt = DBManager::get()->prepare('UPDATE sem_tree SET priority = :priority WHERE sem_tree_id = :sem_tree_id');
+            $update_priority_stmt->execute([
+                'priority' => $priority,
+                'sem_tree_id' => $data['sem_tree_id']
+            ]);
+        }
+        $this->msg[$item_id] = 'info§' . _('Die Einträge im Bereich wurden alphabetisch sortiert.');
+
+        return true;
+    }
+
+    function execCommandOrderItem(){
+        $direction = Request::quoted('direction');
+        $item_id = Request::option('item_id');
+        $items_to_order = $this->tree->getKids($this->tree->tree_data[$item_id]['parent_id']);
+        if (!$this->isParentAdmin($item_id) || !$items_to_order)
+        return false;
+        for ($i = 0; $i < count($items_to_order); ++$i){
+            if ($item_id == $items_to_order[$i])
+            break;
+        }
+        if ($direction == "up" && isset($items_to_order[$i-1])){
+            $items_to_order[$i] = $items_to_order[$i-1];
+            $items_to_order[$i-1] = $item_id;
+        } elseif (isset($items_to_order[$i+1])){
+            $items_to_order[$i] = $items_to_order[$i+1];
+            $items_to_order[$i+1] = $item_id;
+        }
+        $view = DbView::getView('sem_tree');
+        for ($i = 0; $i < count($items_to_order); ++$i){
+            $view->params = [$i, $items_to_order[$i]];
+            $rs = $view->get_query("view:SEM_TREE_UPD_PRIO");
+        }
+        $this->mode = "";
+        $this->msg[$item_id] = "msg§" . (($direction == "up") ? _("Element wurde eine Position nach oben verschoben.") : _("Element wurde eine Position nach unten verschoben."));
+        return true;
+    }
+
+    function execCommandNewItem(){
+        $item_id = Request::option('item_id');
+        if ($this->isItemAdmin($item_id)){
+            $new_item_id = DbView::get_uniqid();
+            $this->tree->storeItem($new_item_id,$item_id,_("Neuer Eintrag"), $this->tree->getNumKids($item_id) +1);
+            $this->openItem($new_item_id);
+            $this->edit_item_id = $new_item_id;
+            if ($this->mode != "NewItem") $this->msg[$new_item_id] = "info§" . _("Hier können Sie die Bezeichnung und die Kurzinformation zu diesem Bereich eingeben.");
+            $this->mode = "NewItem";
+        }
+        return false;
+    }
+
+    function execCommandEditItem(){
+        $item_id = Request::option('item_id');
+        if ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id)){
+            $this->mode = "EditItem";
+            $this->anchor = $item_id;
+            $this->edit_item_id = $item_id;
+            if($this->tree->tree_data[$this->edit_item_id]['studip_object_id']){
+                $this->msg[$item_id] = "info§" . _("Hier können Sie die Kurzinformation zu diesem Bereich eingeben. Der Name kann nicht geändert werden, da es sich um eine Stud.IP-Einrichtung handelt.");
+            } else {
+                $this->msg[$item_id] = "info§" . _("Hier können Sie die Bezeichnung und die Kurzinformation zu diesem Bereich eingeben");
+            }
+        }
+        return false;
+    }
+
+    function execCommandInsertItem(){
+        $item_id = Request::option('item_id');
+        $parent_id = Request::option('parent_id');
+        $item_name = Request::quoted('edit_name');
+        $item_info = Request::quoted('edit_info');
+        $item_type = Request::int('edit_type');
+        if ($this->mode == "NewItem" && $item_id){
+            if ($this->isItemAdmin($parent_id)){
+                $priority = count($this->tree->getKids($parent_id));
+                if ($this->tree->InsertItem($item_id,$parent_id,$item_name,$item_info,$priority,null,$item_type)){
+                    $this->mode = "";
+                    $this->tree->init();
+                    $this->openItem($item_id);
+                    $this->msg[$item_id] = "msg§" . _("Dieser Bereich wurde neu eingefügt.");
+                }
+            }
+        }
+        if ($this->mode == "EditItem"){
+            if ($this->isParentAdmin($item_id)){
+                if ($this->tree->UpdateItem($item_id, $item_name, $item_info, $item_type)){
+                    $this->msg[$item_id] = "msg§" . _("Bereich wurde geändert.");
+                } else {
+                    $this->msg[$item_id] = "info§" . _("Keine Veränderungen vorgenommen.");
+                }
+                $this->mode = "";
+                $this->tree->init();
+                $this->openItem($item_id);
+            }
+        }
+        return false;
+    }
+
+    function execCommandAssertDeleteItem(){
+        $item_id = Request::option('item_id');
+        if ($this->isParentAdmin($item_id)){
+            $this->mode = "AssertDeleteItem";
+            $this->open_items[$item_id] = true;
+            $this->msg[$item_id] = "info§" ._("Sie beabsichtigen diesen Bereich inklusive aller Unterbereiche zu löschen. ")
+            . sprintf(_("Es werden insgesamt %s Bereiche gelöscht!"),count($this->tree->getKidsKids($item_id))+1)
+            . "<br>" . _("Wollen Sie diese Bereiche wirklich löschen?") . "<br>"
+            . LinkButton::createAccept(_('Ja!'),
+                    URLHelper::getURL($this->getSelf('cmd=DeleteItem&item_id='.$item_id)),
+                    ['title' => _('löschen')])
+            . "&nbsp;"
+            . LinkButton::createCancel(_('Nein!'),
+                    URLHelper::getURL($this->getSelf('cmd=Cancel&item_id='. $item_id)));
+        }
+        return false;
+    }
+
+    function execCommandDeleteItem(){
+        $item_id = Request::option('item_id');
+        $item_name = $this->tree->tree_data[$item_id]['name'];
+        if ($this->isParentAdmin($item_id) && $this->mode == "AssertDeleteItem"){
+            $this->openItem($this->tree->tree_data[$item_id]['parent_id']);
+            $items_to_delete = $this->tree->getKidsKids($item_id);
+            $items_to_delete[] = $item_id;
+            $deleted = $this->tree->DeleteItems($items_to_delete);
+            if ($deleted['items']){
+                $this->msg[$this->anchor] = "msg§" . sprintf(_("Der Bereich <b>%s</b> und alle Unterbereiche (insgesamt %s) wurden gelöscht. "),htmlReady($item_name),$deleted['items']);
+            } else {
+                $this->msg[$this->anchor] = "error§" . _("Fehler, es konnten keine Bereiche gelöscht werden !");
+            }
+            if ($deleted['entries']){
+                $this->msg[$this->anchor] .= sprintf(_("<br>Es wurden %s Veranstaltungszuordnungen gelöscht. "),$deleted['entries']);
+            }
+            $this->mode = "";
+        }
+        return true;
+    }
+
+    function execCommandMoveItem(){
+        $item_id = Request::option('item_id');
+        $this->anchor = $item_id;
+        $this->marked_item = $item_id;
+        $this->mode = "MoveItem";
+        return false;
+    }
+
+    function execCommandCopyItem(){
+        $item_id = Request::option('item_id');
+        $this->anchor = $item_id;
+        $this->marked_item = $item_id;
+        $this->mode = "CopyItem";
+        return false;
+    }
+
+    function execCommandDoMoveItem(){
+        $item_id = Request::option('item_id');
+        $item_to_move = $this->marked_item;
+        if ($this->mode == "MoveItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
+        && ($item_to_move != $item_id) && ($this->tree->tree_data[$item_to_move]['parent_id'] != $item_id)
+        && !$this->tree->isChildOf($item_to_move,$item_id)){
+            $view = DbView::getView('sem_tree');
+            $view->params = [$item_id, count($this->tree->getKids($item_id)), $item_to_move];
+            $rs = $view->get_query("view:SEM_TREE_MOVE_ITEM");
+            if ($rs->affected_rows()){
+                $this->msg[$item_to_move] = "msg§" . _("Bereich wurde verschoben.");
+            } else {
+                $this->msg[$item_to_move] = "error§" . _("Keine Verschiebung durchgeführt.");
+            }
+        }
+        $this->tree->init();
+        $this->openItem($item_to_move);
+        $this->mode = "";
+        return false;
+    }
+
+    function execCommandDoCopyItem(){
+        $item_id = Request::option('item_id');
+        $item_to_copy = $this->marked_item;
+        if ($this->mode == "CopyItem" && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
+        && ($item_to_copy != $item_id) && ($this->tree->tree_data[$item_to_copy]['parent_id'] != $item_id)
+        && !$this->tree->isChildOf($item_to_copy,$item_id)){
+            $items_to_copy = $this->tree->getKidsKids($item_to_copy);
+            $seed = DbView::get_uniqid();
+            $new_item_id = md5($item_to_copy . $seed);
+            $parent_id = $item_id;
+            $num_copy = $this->tree->InsertItem($new_item_id,$parent_id,
+            addslashes($this->tree->tree_data[$item_to_copy]['name']),
+            addslashes($this->tree->tree_data[$item_to_copy]['info']),
+            $this->tree->getMaxPriority($parent_id)+1,
+            ($this->tree->tree_data[$item_to_copy]['studip_object_id'] ? $this->tree->tree_data[$item_to_copy]['studip_object_id'] : null),
+            $this->tree->tree_data[$item_to_copy]['type']);
+            if($num_copy){
+                if ($items_to_copy){
+                    for ($i = 0; $i < count($items_to_copy); ++$i){
+                        $num_copy += $this->tree->InsertItem(md5($items_to_copy[$i] . $seed),
+                        md5($this->tree->tree_data[$items_to_copy[$i]]['parent_id'] . $seed),
+                        addslashes($this->tree->tree_data[$items_to_copy[$i]]['name']),
+                        addslashes($this->tree->tree_data[$items_to_copy[$i]]['info']),
+                        $this->tree->tree_data[$items_to_copy[$i]]['priority'],
+                        ($this->tree->tree_data[$items_to_copy[$i]]['studip_object_id'] ? $this->tree->tree_data[$items_to_copy[$i]]['studip_object_id'] : null),
+                        $this->tree->tree_data[$item_to_copy]['type']);
+                    }
+                }
+                $items_to_copy[] = $item_to_copy;
+                for ($i = 0; $i < count($items_to_copy); ++$i){
+                    $sem_entries = $this->tree->getSemIds($items_to_copy[$i], false);
+                    if ($sem_entries){
+                        for ($j = 0; $j < count($sem_entries); ++$j){
+                            $num_entries += $this->tree->InsertSemEntry(md5($items_to_copy[$i] . $seed), $sem_entries[$j]);
+                        }
+                    }
+                }
+            }
+
+            if ($num_copy){
+                $this->msg[$new_item_id] = "msg§" . sprintf(_("%s Bereich(e) wurde(n) kopiert."), $num_copy) . "<br>"
+                . sprintf(_("%s Veranstaltungszuordnungen wurden kopiert"), $num_entries);
+            } else {
+                $this->msg[$new_item_id] = "error§" . _("Keine Kopie durchgeführt.");
+            }
+            $this->tree->init();
+            $this->openItem($new_item_id);
+        }
+        $this->mode = "";
+        return false;
+    }
+
+    function execCommandInsertFak(){
+        if($this->isItemAdmin("root") && Request::quoted('insert_fak')){
+            $view = DbView::getView('sem_tree');
+            $item_id = $view->get_uniqid();
+            $view->params = [$item_id,'root','',$this->tree->getNumKids('root')+1,'',Request::quoted('insert_fak'),0];
+            $rs = $view->get_query("view:SEM_TREE_INS_ITEM");
+            if ($rs->affected_rows()){
+                $this->tree->init();
+                $this->openItem($item_id);
+                $this->msg[$item_id] = "msg§" . _("Dieser Bereich wurde neu eingefügt.");
+                return false;
+            }
+        }
+        return false;
+    }
+
+    function execCommandMarkSem(){
+        $item_id = Request::option('item_id');
+        $marked_sem_array =  Request::quotedArray('marked_sem');
+        $marked_sem = array_values(array_unique($marked_sem_array));
+        $sem_aktion = explode("_",Request::quoted('sem_aktion'));
+        if (($sem_aktion[0] == 'mark' || $sem_aktion[1] == 'mark') && count($marked_sem)){
+            $count_mark = 0;
+            for ($i = 0; $i < count($marked_sem); ++$i){
+                if (!isset($this->marked_sem[$marked_sem[$i]])){
+                    ++$count_mark;
+                    $this->marked_sem[$marked_sem[$i]] = true;
+                }
+            }
+            if ($count_mark){
+                $this->msg[$item_id] = "msg§" . sprintf(_("Es wurde(n) %s Veranstaltung(en) der Merkliste hinzugefügt."),$count_mark);
+            }
+        }
+        if ($this->isItemAdmin($item_id)){
+            if (($sem_aktion[0] == 'del' || $sem_aktion[1] == 'del') && count($marked_sem)){
+                $not_deleted = [];
+                foreach($marked_sem as $key => $seminar_id){
+                    $seminar = new Seminar($seminar_id);
+                    if(count($seminar->getStudyAreas()) == 1){
+                        $not_deleted[] = $seminar->getName();
+                        unset($marked_sem[$key]);
+                    }
+                }
+                if ($this->msg[$item_id]){
+                    $this->msg[$item_id] .= "<br>";
+                } else {
+                    $this->msg[$item_id] = "msg§";
+                }
+                if(count($marked_sem)){
+                    $count_del = $this->tree->DeleteSemEntries($item_id, $marked_sem);
+                    $this->msg[$item_id] .= sprintf(_("%s Veranstaltungszuordnung(en) wurde(n) aufgehoben."),$count_del);
+                }
+                if(count($not_deleted)){
+                    $this->msg[$item_id] .= '<br>'
+                                         . sprintf(_("Für folgende Veranstaltungen wurde die Zuordnung nicht aufgehoben, da es die einzige Zuordnung ist: %s")
+, '<br>'.htmlready(join(', ', $not_deleted)));
+                }
+            }
+            $this->anchor = $item_id;
+            $this->open_items[$item_id] = true;
+            return true;
+        }
+        return false;
+    }
+
+    function execCommandCancel(){
+        $item_id = Request::option('item_id');
+        $this->mode = "";
+        $this->anchor = $item_id;
+        return false;
+    }
+
+    function showSemTree(){
+        ?>
+        <script type="text/javascript">
+        function invert_selection(the_form){
+            my_elements = document.forms[the_form].elements['marked_sem[]'];
+            if(!my_elements.length){
+                if(my_elements.checked)
+                my_elements.checked = false;
+                else
+                my_elements.checked = true;
+            } else {
+                for(i = 0; i < my_elements.length; ++i){
+                    if(my_elements[i].checked)
+                    my_elements[i].checked = false;
+                    else
+                    my_elements[i].checked = true;
+                }
+            }
+        }
+        </script>
+        <?
+        echo "\n<table width=\"99%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">";
+        if ($this->start_item_id != 'root'){
+            echo "\n<tr><td class=\"table_row_odd\" align=\"left\" valign=\"top\"><div style=\"font-size:10pt;margin-left:10px\"><b>"
+            . _("Studienbereiche") . ":</b><br>" .  $this->getSemPath()
+            . "</div></td></tr>";
+        }
+        echo "\n<tr><td class=\"blank\"  align=\"left\" valign=\"top\">";
+        $this->showTree($this->start_item_id);
+        echo "\n</td></tr></table>";
+    }
+
+    function getSemPath(){
+        $ret = "";
+        //$ret = "<a href=\"" . parent::getSelf("start_item_id=root") . "\">" .htmlReady($this->tree->root_name) . "</a>";
+        if ($parents = $this->tree->getParents($this->start_item_id)){
+            for($i = count($parents)-1; $i >= 0; --$i){
+                $ret .= " &gt; <a class=\"tree\" href=\"" . URLHelper::getLink($this->getSelf("start_item_id={$parents[$i]}&open_item={$parents[$i]}",false))
+                . "\">" .htmlReady($this->tree->tree_data[$parents[$i]]["name"]) . "</a>";
+            }
+        }
+        return $ret;
+    }
+
+    /**
+    * returns html for the icons in front of the name of the item
+    *
+    * @access   private
+    * @param    string  $item_id
+    * @return   string
+    */
+    function getItemHeadPics($item_id){
+        $head = $this->getItemHeadFrontPic($item_id);
+        $head .= "\n<td  class=\"printhead\" nowrap  align=\"left\" valign=\"bottom\">";
+        if ($this->tree->hasKids($item_id)){
+            $head .= Icon::create('folder-full', Icon::ROLE_CLICKABLE, ['title' => !empty($this->open_ranges[$item_id]) ? _('Alle Unterelemente schliessen') : _('Alle Unterelemente öffnen')])->asImg(['class' => 'text-top']);
+        } else {
+            $head .= Icon::create('folder-empty', 'clickable', ['title' => _('Dieses Element hat keine Unterelemente')])->asImg();
+        }
+        return $head . "</td>";
+    }
+
+    function getItemContent($item_id){
+        if ($item_id == $this->edit_item_id) {
+            return $this->getEditItemContent();
+        }
+        if (empty($GLOBALS['SEM_TREE_TYPES'][$this->tree->getValue($item_id, 'type')]['editable'])){
+            $is_not_editable = true;
+            $this->msg[$item_id] = "info§" . sprintf(_("Der Typ dieses Elementes verbietet eine Bearbeitung."));
+        }
+        if ($item_id == $this->move_item_id) {
+            $this->msg[$item_id] = "info§" . sprintf(_("Dieses Element wurde zum Verschieben / Kopieren markiert. Bitte wählen Sie ein Einfügesymbol %s aus, um das Element zu verschieben / kopieren."), Icon::create('arr_2right', 'sort', ['title' => "Einfügesymbol"])->asImg(16, ["alt" => "Einfügesymbol"]));
+        }
+        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt;\">";
+        $content .= $this->getItemMessage($item_id);
+        $content .= "\n<tr><td style=\"font-size:10pt;\">";
+        if (empty($is_not_editable)) {
+            if ($this->isItemAdmin($item_id) ){
+                $content .= LinkButton::create(_('Neues Objekt'),
+                        URLHelper::getURL($this->getSelf('cmd=NewItem&item_id='.$item_id)),
+                        ['title' => _('Innerhalb dieser Ebene ein neues Element einfügen')]) . '&nbsp;';
+                $content .= LinkButton::create(_('Sortieren'),
+                        URLHelper::getURL($this->getSelf('cmd=OrderItemsAlphabetically&sort_id='.$item_id)),
+                        ['title' => _('Sortiert die untergeordneten Elemente alphabetisch')]) . '&nbsp;';
+            }
+            if ($this->isParentAdmin($item_id) && $item_id != "root"){
+                $content .= LinkButton::create(_('Bearbeiten'),
+                        URLHelper::getURL($this->getSelf('cmd=EditItem&item_id=' . $item_id)),
+                        ['title' => 'Dieses Element bearbeiten']) . '&nbsp;';
+
+                $content .= LinkButton::create(_('Löschen'),
+                        URLHelper::getURL($this->getSelf('cmd=AssertDeleteItem&item_id=' . $item_id)),
+                        ['title' => _('Dieses Element löschen')]) . '&nbsp;';
+
+                if ($this->move_item_id == $item_id && ($this->mode == "MoveItem" || $this->mode == "CopyItem")){
+                    $content .= LinkButton::create(_('Abbrechen'),
+                            URLHelper::getURL($this->getSelf('cmd=Cancel&item_id=' . $item_id)),
+                            ['title' => _('Verschieben / Kopieren abbrechen')]) . '&nbsp;';
+                } else {
+                    $content .= LinkButton::create(_('Verschieben'),
+                            URLHelper::getURL($this->getSelf('cmd=MoveItem&item_id='.$item_id)),
+                            ['title' => _('Dieses Element in eine andere Ebene verschieben')]) . '&nbsp;';
+                    $content .= LinkButton::create(_('Kopieren'),
+                            URLHelper::getURL($this->getSelf('cmd=CopyItem&item_id='.$item_id)),
+                            ['title' => _('Dieses Element in eine andere Ebene kopieren')]);
+                }
+            }
+        }
+        if ($item_id == 'root' && $this->isItemAdmin($item_id)){
+            $view = DbView::getView('sem_tree');
+            $rs = $view->get_query("view:SEM_TREE_GET_LONELY_FAK");
+            $content .= "\n<p><form action=\"" . URLHelper::getLink($this->getSelf("cmd=InsertFak")) . "\" method=\"post\" class=\"default\">"
+                . CSRFProtection::tokenTag()
+                . '<div><label>'
+                . _("Stud.IP-Fakultät einfügen")
+                . "\n<select style=\"width:200px;\" name=\"insert_fak\">";
+            while($rs->next_record()){
+                $content .= "\n<option value=\"" . $rs->f("Institut_id") . "\">" . htmlReady(my_substr($rs->f("Name"),0,50)) . "</option>";
+            }
+            $content .= "</select></label></div><div class=\"col-1\"> " . Button::create(_('Eintragen'), ['title' => _("Fakultät einfügen")]) . "</div></form></p>";
+        }
+        $content .= "</td></tr></table>";
+
+        $content .= "\n<table border=\"0\" width=\"90%\" cellpadding=\"2\" cellspacing=\"0\" align=\"center\" style=\"font-size:10pt\">";
+        if ($item_id == "root"){
+            $content .= "\n<tr><td  class=\"table_header_bold\" align=\"left\" style=\"font-size:10pt;\">" . htmlReady($this->tree->root_name) ." </td></tr>";
+            $content .= "\n<tr><td  class=\"table_row_even\" align=\"left\" style=\"font-size:10pt;\">" . htmlReady($this->root_content) ." </td></tr>";
+            $content .= "\n</table>";
+            return $content;
+        }
+        if ($this->tree->tree_data[$item_id]['info']){
+            $content .= "\n<tr><td style=\"font-size:10pt;\" class=\"table_row_even\" align=\"left\" colspan=\"3\">";
+            $content .= formatReady($this->tree->tree_data[$item_id]['info']) . "</td></tr>";
+        }
+        $content .= "<tr><td style=\"font-size:10pt;\"colspan=\"3\">&nbsp;</td></tr>";
+        if ($this->tree->getNumEntries($item_id)) {
+            $content .= "<tr><td class=\"table_row_even\" style=\"font-size:10pt;\" align=\"left\" colspan=\"3\"><b>" . _("Einträge auf dieser Ebene:");
+            $content .= "</b>\n</td></tr>";
+            $entries = $this->tree->getSemData($item_id);
+            $content .= $this->getSemDetails($entries,$item_id);
+        } else {
+            $content .= "\n<tr><td class=\"table_row_even\" style=\"font-size:10pt;\" colspan=\"3\">" . _("Keine Einträge auf dieser Ebene vorhanden!") . "</td></tr>";
+        }
+        $content .= "</table>";
+        return $content;
+    }
+
+    function getSemDetails($snap, $item_id, $lonely_sem = false){
+        $form_name = DbView::get_uniqid();
+        $content = "<form class=\"default\" name=\"$form_name\" action=\"" . URLHelper::getLink($this->getSelf("cmd=MarkSem")) ."\" method=\"post\">
+        <input type=\"hidden\" name=\"item_id\" value=\"$item_id\">";
+        $content .= CSRFProtection::tokenTag();
+        $group_by_data = $snap->getGroupedResult("sem_number", "seminar_id");
+        $sem_data = $snap->getGroupedResult("seminar_id");
+        $group_by_duration = $snap->getGroupedResult("sem_number_end", ["sem_number","seminar_id"]);
+        foreach ($group_by_duration as $sem_number_end => $detail){
+            if ($sem_number_end != -1 && ($detail['sem_number'][$sem_number_end] && count($detail['sem_number']) == 1)){
+                continue;
+            } else {
+                foreach ($detail['seminar_id'] as $seminar_id => $foo){
+                    $start_sem = key($sem_data[$seminar_id]["sem_number"]);
+                    if ($sem_number_end == -1){
+                        $sem_number_end = count($this->tree->sem_dates)-1;
+                    }
+                    for ($i = $start_sem; $i <= $sem_number_end; ++$i){
+                        if ($group_by_data[$i] && !$tmp_group_by_data[$i]){
+                            foreach($group_by_data[$i]['seminar_id'] as $id => $bar){
+                                $tmp_group_by_data[$i]['seminar_id'][$id] = key($sem_data[$id]["Name"]);
+                            }
+                        }
+                        $tmp_group_by_data[$i]['seminar_id'][$seminar_id] = key($sem_data[$seminar_id]["Name"]);
+                    }
+                }
+            }
+        }
+        if (is_array($tmp_group_by_data)){
+            foreach ($tmp_group_by_data as $start_sem => $detail){
+                $group_by_data[$start_sem] = $detail;
+            }
+        }
+
+        foreach ($group_by_data as $group_field => $sem_ids){
+            foreach ($sem_ids['seminar_id'] as $seminar_id => $foo){
+                $name = mb_strtolower(key($sem_data[$seminar_id]["Name"]));
+                $name = str_replace("ä","ae",$name);
+                $name = str_replace("ö","oe",$name);
+                $name = str_replace("ü","ue",$name);
+                $group_by_data[$group_field]['seminar_id'][$seminar_id] = $name;
+            }
+            uasort($group_by_data[$group_field]['seminar_id'], 'strnatcmp');
+        }
+
+        krsort($group_by_data, SORT_NUMERIC);
+
+        foreach ($group_by_data as $sem_number => $sem_ids){
+            $content .= "\n<tr><td class=\"content_seperator\" colspan=\"3\" style=\"font-size:10pt;\" >" . $this->tree->sem_dates[$sem_number]['name'] . "</td></tr>";
+            if (is_array($sem_ids['seminar_id'])){
+                foreach(array_keys($sem_ids['seminar_id']) as $seminar_id) {
+                    $sem_name = key($sem_data[$seminar_id]["Name"]);
+                    $sem_number_start = key($sem_data[$seminar_id]["sem_number"]);
+                    $sem_number_end = key($sem_data[$seminar_id]["sem_number_end"]);
+                    if ($sem_number_start != $sem_number_end){
+                        $sem_name .= " (" . $this->tree->sem_dates[$sem_number_start]['name'] . " - ";
+                        $sem_name .= (($sem_number_end == -1) ? _("unbegrenzt") : $this->tree->sem_dates[$sem_number_end]['name']) . ")";
+                    }
+                    $content .= "<tr><td class=\"table_row_even\" width=\"1%\"><input type=\"checkbox\" name=\"marked_sem[]\" value=\"$seminar_id\" style=\"vertical-align:middle\">
+                    </td><td class=\"table_row_even\" style=\"font-size:10pt;\"><a href=\"dispatch.php/course/details/?sem_id=". $seminar_id
+                    ."&send_from_search=true&send_from_search_page=" . rawurlencode(URLHelper::getLink($this->getSelf())) . "\">" . htmlReady($sem_name) . "</a>
+                    </td><td class=\"table_row_even\" align=\"right\" style=\"font-size:10pt;\">(";
+                    $doz_name = array_keys($sem_data[$seminar_id]['doz_name']);
+                    $doz_uname = array_keys($sem_data[$seminar_id]['doz_uname']);
+                    if (is_array($doz_name)){
+                        uasort($doz_name, 'strnatcasecmp');
+                        $i = 0;
+                        foreach ($doz_name as $index => $value){
+                            if ($i == 4){
+                                $content .= "... <a href=\"dispatch.php/course/details/?sem_id=". $seminar_id
+                                ."&send_from_search=true&send_from_search_page=" . rawurlencode(URLHelper::getLink($this->getSelf())) . "\">("._("mehr").")</a>";
+                                break;
+                            }
+                            $content .= "<a href=\"dispatch.php/profile?username=" . $doz_uname[$index] ."\">" . htmlReady($value) . "</a>";
+                            if($i != count($doz_name)-1){
+                                $content .= ", ";
+                            }
+                            ++$i;
+                        }
+                    }
+                    $content .= ") </td></tr>";
+                }
+            }
+        }
+        $content .= "<tr><td class=\"table_row_even\" colspan=\"2\">"
+            . LinkButton::create(_('Auswählen'), ['title' => _('Auswahl umkehren'), 'onClick' => 'invert_selection(\''. $form_name .'\');return false;'])
+            . "</td><td class=\"table_row_even\" align=\"right\"><div class=\"hgroup\">
+        <select name=\"sem_aktion\" style=\"margin-right: 1em;\" " . tooltip(_("Aktion auswählen"),true) . ">
+        <option value=\"mark\">" . _("in Merkliste übernehmen") . "</option>";
+        if (!$lonely_sem && $this->isItemAdmin($item_id)){
+            $content .= "<option value=\"del_mark\">" . _("löschen und in Merkliste übernehmen") . "</option>
+            <option value=\"del\">" . _("löschen") . "</option>";
+        }
+        $content .= "</select>" . Button::createAccept(_('OK'), ['title' => _("Gewählte Aktion starten")])
+                 . "</div></td></tr> </form>";
+        return $content;
+    }
+
+    function getEditItemContent(){
+        ob_start();
+        ?>
+        <form name="item_form" action="<?= URLHelper::getLink($this->getSelf("cmd=InsertItem&item_id={$this->edit_item_id}")) ?>" method="POST" class="default" style="width: 90%; margin: auto;">
+            <?= CSRFProtection::tokenTag(); ?>
+            <input type="hidden" name="parent_id" value="<?= $this->tree->tree_data[$this->edit_item_id]['parent_id'] ?>">
+
+            <table style="width: 100%"><?= $this->getItemMessage($this->edit_item_id,2) ?></table>
+
+            <fieldset>
+                <legend><?= _("Bereich editieren") ?></legend>
+
+                <label>
+                    <?= _("Name des Elements") ?>
+                    <input type="text" name="edit_name"
+                        <?= ($this->tree->tree_data[$this->edit_item_id]['studip_object_id']) ? 'disabled="disabled"' : '' ?>
+                           value="<?= htmlReady($this->tree->tree_data[$this->edit_item_id]['name']) ?>">
+                </label>
+
+               <? if (count($GLOBALS['SEM_TREE_TYPES']) > 1) : ?>
+               <label>
+                   <?= _("Typ des Elements") ?>
+                    <select name="edit_type">
+                    <? foreach ($GLOBALS['SEM_TREE_TYPES'] as $sem_tree_type_key => $sem_tree_type) :
+                        if ($sem_tree_type['editable']) :
+                            $selected = $sem_tree_type_key == $this->tree->getValue($this->edit_item_id, 'type') ? 'selected' : '';
+                            echo '<option value="'.htmlReady($sem_tree_type_key).'"'.$selected.'>';
+                            echo htmlReady($sem_tree_type['name'] ? $sem_tree_type['name'] : $sem_tree_type_key);
+                            echo '</option>';
+                        endif;
+                    endforeach;
+                    ?>
+                    </select>
+                </label>
+                <? else : # Auswahl ausblenden, wenn nur ein Typ vorhanden ?>
+                <input type='hidden' name='edit_type' value='0'>
+                <? endif ?>
+
+                <? $buttonlink_id = ($this->mode == "NewItem") ? $this->tree->tree_data[$this->edit_item_id]['parent_id'] : $this->edit_item_id; ?>
+
+                <label>
+                    <?= _("Infotext:") ?>
+                    <textarea rows="5" name="edit_info" wrap="virtual"><?= htmlReady($this->tree->tree_data[$this->edit_item_id]['info']) ?></textarea>
+                </label>
+            </fieldset>
+
+            <footer>
+                <?= Button::createAccept(_('Absenden'), ['title' => _('Einstellungen übernehmen')]) ?>
+                <?= LinkButton::createCancel(_('Abbrechen'),
+                    URLHelper::getURL($this->getSelf('cmd=Cancel&item_id='.$buttonlink_id)),
+                    ['title' => _('Aktion abbrechen')])
+                ?>
+            </footer>
+        </form>
+
+        <?
+        return ob_get_clean();
+    }
+
+
+    function isItemAdmin($item_id){
+        global $auth;
+        if ($auth->auth['perm'] == "root"){
+            return true;
+        }
+        if (!($admin_id = $this->tree->tree_data[$this->tree->getAdminRange($item_id)]['studip_object_id'])){
+            return false;
+        }
+        if(!isset($this->admin_ranges[$admin_id])){
+            $view = DbView::getView('sem_tree');
+            $view->params[0] = $auth->auth['uid'];
+            $view->params[1] = $admin_id;
+            $rs = $view->get_query("view:SEM_TREE_CHECK_PERM");
+            $this->admin_ranges[$admin_id] = ($rs->next_record()) ? true : false;
+        }
+        if ($this->admin_ranges[$admin_id]){
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function isParentAdmin($item_id){
+        return $this->isItemAdmin($this->tree->tree_data[$item_id]['parent_id']);
+    }
+
+    function getItemHead($item_id){
+        $head = "";
+        if (($this->mode == "MoveItem" || $this->mode == "CopyItem") && ($this->isItemAdmin($item_id) || $this->isParentAdmin($item_id))
+        && ($this->move_item_id != $item_id) && ($this->tree->tree_data[$this->move_item_id]['parent_id'] != $item_id)
+        && !$this->tree->isChildOf($this->move_item_id,$item_id)){
+            $head .= "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=Do" . $this->mode . "&item_id=$item_id")) . "\">"
+            . Icon::create('arr_2right', 'sort', ['title' => _("An dieser Stelle einfügen")])->asImg(16, ["alt" => _("An dieser Stelle einfügen")])."</a>&nbsp;";
+        }
+        $head .= parent::getItemHead($item_id);
+        if ($item_id != "root"){
+            $head .= " (" . $this->tree->getNumEntries($item_id,true) . ") " ;
+        }
+        if ($item_id != $this->start_item_id && $this->isParentAdmin($item_id) && $item_id != $this->edit_item_id){
+            $head .= "</td><td nowrap align=\"right\" valign=\"bottom\" class=\"printhead\">";
+            if (!$this->tree->isFirstKid($item_id)){
+                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=up&item_id=$item_id")) .
+                "\">" .  Icon::create('arr_2up', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach oben")]) .
+                "</a>";
+            }
+            if (!$this->tree->isLastKid($item_id)){
+                $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=down&item_id=$item_id")) .
+                "\">" . Icon::create('arr_2down', 'sort')->asImg(['class' => 'text-top', 'title' => _("Element nach unten")]) .
+                "</a>";
+            }
+            $head .= "&nbsp;";
+        }
+        return $head;
+    }
+
+    function getItemMessage($item_id,$colspan = 1){
+        $content = "";
+        if (!empty($this->msg[$item_id])) {
+            $msg = explode("§",$this->msg[$item_id]);
+            $pics = [
+                'error' => Icon::create('decline', 'attention'),
+                'info'  => Icon::create('exclaim', 'inactive'),
+                'msg'   => Icon::create('accept', 'accept')];
+            $content = "\n<tr><td colspan=\"{$colspan}\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\" style=\"font-size:10pt\">
+                        <tr><td class=\"blank\" align=\"center\" width=\"25\">" .  $pics[$msg[0]]->asImg(['class' => 'text-top']) . "</td>
+            <td class=\"blank\" align=\"left\">" . $msg[1] . "</td></tr>
+            </table></td></tr><tr>";
+        }
+        return $content;
+    }
+
+    function getSelf($param = "", $with_start_item = true){
+        $url_params = "foo=" . DbView::get_uniqid();
+        if ($this->mode) $url_params .= "&mode=" . $this->mode;
+        if ($with_start_item) $url_params .= "&start_item_id=" . $this->start_item_id;
+        if ($param) $url_params .= '&' . $param;
+        return parent::getSelf($url_params);
+    }
+}
+//test
+//page_open(array("sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"));
+//include 'lib/include/html_head.inc.php';
+//include ('lib/seminar_open.php'); // initialise Stud.IP-Session
+//$test = new StudipSemTreeViewAdmin(Request::quoted('start_item_id'));
+//$test->showSemTree();
+//echo "<hr><pre>";
+//print_r($_open_items);
+//page_close();
+?>
diff --git a/lib/classes/StudipSemTreeViewSimple.class.php b/lib/classes/StudipSemTreeViewSimple.class.php
deleted file mode 100644
index e2dba76..0000000
--- a/lib/classes/StudipSemTreeViewSimple.class.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipSemTreeViewSimple.class.php
-// Class to print out the seminar tree
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* class to print out the seminar tree
-*
-* This class prints out a html representation a part of the tree
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipSemTreeViewSimple
-{
-    var $tree;
-    var $show_entries;
-    var $start_item_id;
-    var $root_content;
-
-    /**
-    * constructor
-    *
-    */
-    public function __construct($start_item_id = 'root', $sem_number = false, $sem_status = false, $visible_only = false)
-    {
-        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
-        $this->root_content = $GLOBALS['UNI_INFO'];
-        $args = null;
-        if ($sem_number !== false){
-            $args['sem_number'] = $sem_number;
-        }
-        if ($sem_status !== false){
-            $args['sem_status'] =  $sem_status;
-        }
-        $args['visible_only'] = $visible_only;
-        $this->tree = TreeAbstract::GetInstance("StudipSemTree",$args);
-        $this->tree->enable_lonely_sem = false;
-        if (empty($this->tree->tree_data[$this->start_item_id])) {
-            $this->start_item_id = "root";
-        }
-    }
-
-    public function showSemTree($start_id = null)
-    {
-        echo '
-            <table class="show-tree">
-                <tr>
-                    <td style="text-align:left; vertical-align:top; font-size:10pt; padding-bottom: 10px; ">
-                        <div style="font-size:10pt; margin-left:0px;display: inline-flex;">
-                        <div class="sem-root-icon"><a href="'. URLHelper::getLink($this->getSelf("start_item_id=root",false)) . "\">" .Icon::create('literature', 'clickable')->asImg(29,['role'=>'root-icon'])
-                        .'</a></div>
-                        <div class="sem-path">'.
-                            '<div class="sem-path-dir">'.
-                                $this->getSemPath($start_id);
-                    echo
-                        '</div>
-                        <div class="sem_path_info">
-                            <div class="sem_path_title">'.
-                            formatReady($this->tree->getValue($this->start_item_id, 'name')).
-                            '</div>
-                            <div class="sem_path_text">';
-                            if ($this->tree->getValue($this->start_item_id, 'info')) {
-                                echo formatReady($this->tree->getValue($this->start_item_id, 'info'));
-                            }else{
-                                echo _("Keine weitere Info vorhanden");
-                            }
-                        echo'</div>
-                            </div>
-                        </div>';
-        echo '
-                        </div>
-                    </td>
-                    <td nowrap style="text-align:right; vertical-align:top; padding-top: 1em;">';
-        if ($this->start_item_id != 'root') {
-            echo '
-                        <a href="' .
-                        URLHelper::getLink($this->getSelf('start_item_id=' .
-                                $this->tree->tree_data[$this->start_item_id]['parent_id'], false)) .
-                        '">' .
-                        Icon::create('arr_2left', 'clickable')->asImg(['class' => 'text-top', 'title' =>_('eine Ebene zurück')]) .
-                        '</a>';
-        } else {
-            echo '&nbsp;';
-        }
-        echo '
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="text-align:center;" class="b-top-va-center">';
-        $num_all_entries = $this->showKids($this->start_item_id);
-        echo '
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" style="text-align:left;" class="b-top-va-center">';
-        $this->showContent($this->start_item_id, $num_all_entries);
-        echo '
-                    </td>
-                </tr>
-            </table>';
-    }
-
-    public function showKids($item_id)
-    {
-        $num_kids = $this->tree->getNumKids($item_id);
-        $all_kids = $this->tree->getKids($item_id);
-        $kids = [];
-        if(!$GLOBALS['perm']->have_perm(Config::GetInstance()->getValue('SEM_TREE_SHOW_EMPTY_AREAS_PERM')) && $num_kids){
-            foreach($all_kids as $kid){
-                if($this->tree->getNumKids($kid) || $this->tree->getNumEntries($kid,true)) $kids[] = $kid;
-            }
-            $num_kids = count($kids);
-        } else {
-            $kids = $all_kids;
-        }
-        $num_all_entries = 0;
-       $kids_table = '
-          <table class="show-tree-kids">
-            <tr>
-                <td class="table_row_even kids-tree-row" align="left" valign="top">
-                    <ul class="semtree">';
-        for ($i = 0; $i < $num_kids; ++$i){
-            $num_entries = 0;
-            if ($this->start_item_id != 'root') {
-                $num_entries = $this->tree->getNumEntries($kids[$i],true);
-                $num_all_entries += $num_entries;
-            }
-            $kids_table .= "<li><a " . ($num_entries ? tooltip(sprintf(_("%s Einträge in allen Unterebenen vorhanden"), $num_entries), false) : '') . " href=\"" .URLHelper::getLink($this->getSelf("start_item_id={$kids[$i]}", false)) . "\">";
-            $kids_table .= htmlReady($this->tree->getValue($kids[$i], 'name'));
-            if ($num_entries) $kids_table .= " ($num_entries)";
-            $kids_table .= "</a></li>";
-            if ($i == ceil($num_kids / 2)-1){
-                $kids_table .= '
-                    </ul>
-                </td>
-                <td class="table_row_even kids-tree-row" align="left" valign="top">
-                    <ul class="semtree">';
-            }
-        }
-        if (!$num_kids){
-            $kids_table .= "<li>";
-            $kids_table .= _("Auf dieser Ebene existieren keine weiteren Unterebenen.");
-            $kids_table .= "</li>";
-        }
-
-        $kids_table .= "</ul></td></tr></table>";
-        echo $kids_table;
-        return $num_all_entries;
-    }
-
-    public function getInfoIcon($item_id)
-    {
-        $info = $item_id === 'root' ? $this->root_content : '';
-        return $info ? tooltipicon(kill_format($info)) : '';
-    }
-
-    public function showContent($item_id, $num_all_entries = 0)
-    {
-        echo "\n<div align=\"left\" style=\"margin-top:10px;margin-bottom:10px;font-size:10pt\">";
-        if ($item_id != "root"){
-            if ($num_entries = $this->tree->getNumEntries($item_id)){
-                if ($this->show_entries != "level"){
-                    echo "<a " . tooltip(_("alle Einträge auf dieser Ebene anzeigen"), false) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id=$item_id")) ."\">";
-                }
-                printf(_("<b>%s</b> Einträge auf dieser Ebene.&nbsp;"),$num_entries);
-                if ($this->show_entries != "level"){
-                    echo "</a>";
-                }
-            } else {
-                    echo _("Keine Einträge auf dieser Ebene vorhanden!");
-            }
-            if ($this->tree->hasKids($item_id) && $num_all_entries){
-                echo "&nbsp;&nbsp;&sol;&nbsp;&nbsp;";
-                if ($this->show_entries != "sublevels"){
-                    if ($num_all_entries <= 100) echo "<a " . tooltip(_("alle Einträge in allen Unterebenen anzeigen"), false) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id={$this->start_item_id}_withkids")) ."\">";
-                }
-                printf(_("<b>%s</b> Einträge in allen Unterebenen vorhanden"), $num_all_entries);
-                if ($this->show_entries != "sublevels"){
-                    echo "</a>";
-                }
-            }
-        }
-        echo "\n</div>";
-    }
-
-    public function getSemPath($start_id = null)
-    {
-        $ret = '';
-        $parents = $this->tree->getParents($this->start_item_id);
-        if ($parents) {
-            $add_item = false;
-            $start_id = $start_id === null ? 'root' : $start_id;
-            for($i = count($parents) - 1; $i >= 0; --$i){
-                if ($add_item || $start_id == $parents[$i]) {
-                    $ret .= ($add_item === TRUE ? '&nbsp;&sol;&nbsp;' : '')
-                            . "<a href=\"". URLHelper::getLink($this->getSelf("start_item_id={$parents[$i]}", false)). "\">". htmlReady($this->tree->getValue($parents[$i], "name"))."</a>";
-                    $add_item = true;
-                }
-            }
-        }
-        if ($this->start_item_id == "root") {
-            $ret = "<a href=\"" . URLHelper::getLink($this->getSelf("start_item_id=root",false)) . "\">" . $this->tree->root_name  . "</a>";
-        } else {
-            $ret .= "&nbsp;&sol;&nbsp;<a href=\"" . URLHelper::getLink($this->getSelf("start_item_id={$this->start_item_id}",false)) . "\">" . htmlReady($this->tree->getValue($this->start_item_id, "name")) . "</a>";
-            $ret .= "&nbsp;&sol;&nbsp;&nbsp;";
-        }
-        return $ret;
-    }
-
-    /**
-     * @return string url NOT escaped
-     */
-    public function getSelf($param = "", $with_start_item = true)
-    {
-        $url_params = (($with_start_item) ? "start_item_id=" . $this->start_item_id . "&" : "") . $param ;
-        return URLHelper::getURL('?' . $url_params);
-    }
-}
-?>
diff --git a/lib/classes/StudipSemTreeViewSimple.php b/lib/classes/StudipSemTreeViewSimple.php
new file mode 100644
index 0000000..e2dba76
--- /dev/null
+++ b/lib/classes/StudipSemTreeViewSimple.php
@@ -0,0 +1,244 @@
+<?php
+# Lifter001: TEST
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipSemTreeViewSimple.class.php
+// Class to print out the seminar tree
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* class to print out the seminar tree
+*
+* This class prints out a html representation a part of the tree
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipSemTreeViewSimple
+{
+    var $tree;
+    var $show_entries;
+    var $start_item_id;
+    var $root_content;
+
+    /**
+    * constructor
+    *
+    */
+    public function __construct($start_item_id = 'root', $sem_number = false, $sem_status = false, $visible_only = false)
+    {
+        $this->start_item_id = ($start_item_id) ? $start_item_id : "root";
+        $this->root_content = $GLOBALS['UNI_INFO'];
+        $args = null;
+        if ($sem_number !== false){
+            $args['sem_number'] = $sem_number;
+        }
+        if ($sem_status !== false){
+            $args['sem_status'] =  $sem_status;
+        }
+        $args['visible_only'] = $visible_only;
+        $this->tree = TreeAbstract::GetInstance("StudipSemTree",$args);
+        $this->tree->enable_lonely_sem = false;
+        if (empty($this->tree->tree_data[$this->start_item_id])) {
+            $this->start_item_id = "root";
+        }
+    }
+
+    public function showSemTree($start_id = null)
+    {
+        echo '
+            <table class="show-tree">
+                <tr>
+                    <td style="text-align:left; vertical-align:top; font-size:10pt; padding-bottom: 10px; ">
+                        <div style="font-size:10pt; margin-left:0px;display: inline-flex;">
+                        <div class="sem-root-icon"><a href="'. URLHelper::getLink($this->getSelf("start_item_id=root",false)) . "\">" .Icon::create('literature', 'clickable')->asImg(29,['role'=>'root-icon'])
+                        .'</a></div>
+                        <div class="sem-path">'.
+                            '<div class="sem-path-dir">'.
+                                $this->getSemPath($start_id);
+                    echo
+                        '</div>
+                        <div class="sem_path_info">
+                            <div class="sem_path_title">'.
+                            formatReady($this->tree->getValue($this->start_item_id, 'name')).
+                            '</div>
+                            <div class="sem_path_text">';
+                            if ($this->tree->getValue($this->start_item_id, 'info')) {
+                                echo formatReady($this->tree->getValue($this->start_item_id, 'info'));
+                            }else{
+                                echo _("Keine weitere Info vorhanden");
+                            }
+                        echo'</div>
+                            </div>
+                        </div>';
+        echo '
+                        </div>
+                    </td>
+                    <td nowrap style="text-align:right; vertical-align:top; padding-top: 1em;">';
+        if ($this->start_item_id != 'root') {
+            echo '
+                        <a href="' .
+                        URLHelper::getLink($this->getSelf('start_item_id=' .
+                                $this->tree->tree_data[$this->start_item_id]['parent_id'], false)) .
+                        '">' .
+                        Icon::create('arr_2left', 'clickable')->asImg(['class' => 'text-top', 'title' =>_('eine Ebene zurück')]) .
+                        '</a>';
+        } else {
+            echo '&nbsp;';
+        }
+        echo '
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" style="text-align:center;" class="b-top-va-center">';
+        $num_all_entries = $this->showKids($this->start_item_id);
+        echo '
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" style="text-align:left;" class="b-top-va-center">';
+        $this->showContent($this->start_item_id, $num_all_entries);
+        echo '
+                    </td>
+                </tr>
+            </table>';
+    }
+
+    public function showKids($item_id)
+    {
+        $num_kids = $this->tree->getNumKids($item_id);
+        $all_kids = $this->tree->getKids($item_id);
+        $kids = [];
+        if(!$GLOBALS['perm']->have_perm(Config::GetInstance()->getValue('SEM_TREE_SHOW_EMPTY_AREAS_PERM')) && $num_kids){
+            foreach($all_kids as $kid){
+                if($this->tree->getNumKids($kid) || $this->tree->getNumEntries($kid,true)) $kids[] = $kid;
+            }
+            $num_kids = count($kids);
+        } else {
+            $kids = $all_kids;
+        }
+        $num_all_entries = 0;
+       $kids_table = '
+          <table class="show-tree-kids">
+            <tr>
+                <td class="table_row_even kids-tree-row" align="left" valign="top">
+                    <ul class="semtree">';
+        for ($i = 0; $i < $num_kids; ++$i){
+            $num_entries = 0;
+            if ($this->start_item_id != 'root') {
+                $num_entries = $this->tree->getNumEntries($kids[$i],true);
+                $num_all_entries += $num_entries;
+            }
+            $kids_table .= "<li><a " . ($num_entries ? tooltip(sprintf(_("%s Einträge in allen Unterebenen vorhanden"), $num_entries), false) : '') . " href=\"" .URLHelper::getLink($this->getSelf("start_item_id={$kids[$i]}", false)) . "\">";
+            $kids_table .= htmlReady($this->tree->getValue($kids[$i], 'name'));
+            if ($num_entries) $kids_table .= " ($num_entries)";
+            $kids_table .= "</a></li>";
+            if ($i == ceil($num_kids / 2)-1){
+                $kids_table .= '
+                    </ul>
+                </td>
+                <td class="table_row_even kids-tree-row" align="left" valign="top">
+                    <ul class="semtree">';
+            }
+        }
+        if (!$num_kids){
+            $kids_table .= "<li>";
+            $kids_table .= _("Auf dieser Ebene existieren keine weiteren Unterebenen.");
+            $kids_table .= "</li>";
+        }
+
+        $kids_table .= "</ul></td></tr></table>";
+        echo $kids_table;
+        return $num_all_entries;
+    }
+
+    public function getInfoIcon($item_id)
+    {
+        $info = $item_id === 'root' ? $this->root_content : '';
+        return $info ? tooltipicon(kill_format($info)) : '';
+    }
+
+    public function showContent($item_id, $num_all_entries = 0)
+    {
+        echo "\n<div align=\"left\" style=\"margin-top:10px;margin-bottom:10px;font-size:10pt\">";
+        if ($item_id != "root"){
+            if ($num_entries = $this->tree->getNumEntries($item_id)){
+                if ($this->show_entries != "level"){
+                    echo "<a " . tooltip(_("alle Einträge auf dieser Ebene anzeigen"), false) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id=$item_id")) ."\">";
+                }
+                printf(_("<b>%s</b> Einträge auf dieser Ebene.&nbsp;"),$num_entries);
+                if ($this->show_entries != "level"){
+                    echo "</a>";
+                }
+            } else {
+                    echo _("Keine Einträge auf dieser Ebene vorhanden!");
+            }
+            if ($this->tree->hasKids($item_id) && $num_all_entries){
+                echo "&nbsp;&nbsp;&sol;&nbsp;&nbsp;";
+                if ($this->show_entries != "sublevels"){
+                    if ($num_all_entries <= 100) echo "<a " . tooltip(_("alle Einträge in allen Unterebenen anzeigen"), false) ." href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id={$this->start_item_id}_withkids")) ."\">";
+                }
+                printf(_("<b>%s</b> Einträge in allen Unterebenen vorhanden"), $num_all_entries);
+                if ($this->show_entries != "sublevels"){
+                    echo "</a>";
+                }
+            }
+        }
+        echo "\n</div>";
+    }
+
+    public function getSemPath($start_id = null)
+    {
+        $ret = '';
+        $parents = $this->tree->getParents($this->start_item_id);
+        if ($parents) {
+            $add_item = false;
+            $start_id = $start_id === null ? 'root' : $start_id;
+            for($i = count($parents) - 1; $i >= 0; --$i){
+                if ($add_item || $start_id == $parents[$i]) {
+                    $ret .= ($add_item === TRUE ? '&nbsp;&sol;&nbsp;' : '')
+                            . "<a href=\"". URLHelper::getLink($this->getSelf("start_item_id={$parents[$i]}", false)). "\">". htmlReady($this->tree->getValue($parents[$i], "name"))."</a>";
+                    $add_item = true;
+                }
+            }
+        }
+        if ($this->start_item_id == "root") {
+            $ret = "<a href=\"" . URLHelper::getLink($this->getSelf("start_item_id=root",false)) . "\">" . $this->tree->root_name  . "</a>";
+        } else {
+            $ret .= "&nbsp;&sol;&nbsp;<a href=\"" . URLHelper::getLink($this->getSelf("start_item_id={$this->start_item_id}",false)) . "\">" . htmlReady($this->tree->getValue($this->start_item_id, "name")) . "</a>";
+            $ret .= "&nbsp;&sol;&nbsp;&nbsp;";
+        }
+        return $ret;
+    }
+
+    /**
+     * @return string url NOT escaped
+     */
+    public function getSelf($param = "", $with_start_item = true)
+    {
+        $url_params = (($with_start_item) ? "start_item_id=" . $this->start_item_id . "&" : "") . $param ;
+        return URLHelper::getURL('?' . $url_params);
+    }
+}
+?>
diff --git a/lib/classes/StudipStudyAreaSelection.class.php b/lib/classes/StudipStudyAreaSelection.class.php
deleted file mode 100644
index ea2ea6f..0000000
--- a/lib/classes/StudipStudyAreaSelection.class.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
- * Copyright (C) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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.
- */
-
-/**
- * Objects of this class represent the state of the study area selection form.
- *
- * Note: Many of the methods return "$this" to let you easily cascade method
- * calls: $selection->toggleShowAll()->setSelected("012345etc.");
- *
- * @package   studip
- *
- * @author    mlunzena
- * @copyright (c) Authors
- */
-
-class StudipStudyAreaSelection {
-
-    private $selected;
-    private $showAll;
-
-    private $areas;
-
-    private $searchKey;
-    private $searchResult;
-
-    /**
-     * This constructor can be called with or without a course ID. If a course ID
-     * has been sent, the selected areas are populated by that course's already
-     * chosen study areas. If no course ID is given, it is assumed that you are
-     * creating a new course at the moment.
-     *
-     * @param  string     optional; the ID of the course to prepopulate the form
-     *                    with
-     *
-     * @return void
-     */
-    function __construct($course_id = NULL) {
-        $this->selected = StudipStudyArea::getRootArea();
-        $this->showAll = FALSE;
-
-        $this->areas = [];
-
-        $this->searchKey = '';
-        $this->clearSearchResult();
-
-        if (isset($course_id)) {
-            $this->populateAreasForCourse($course_id);
-        }
-    }
-
-
-    /**
-     * This method populates this instance with the already chosen study areas.
-     *
-     * @param  string     the course's ID
-     *
-     * @return void
-     */
-    private function populateAreasForCourse($id) {
-        $areas = StudipStudyArea::getStudyAreasForCourse($id);
-        $this->setAreas($areas);
-        $this->sortAreas();
-    }
-
-
-    /**
-     * Sorts the internal representation of the areas by their paths according to
-     * the current locale.
-     *
-     * @return void
-     */
-    private function sortAreas()
-    {
-        uasort($this->areas, function ($a, $b) {
-            return strcoll($a->getPath(' · '), $b->getPath(' · '));
-        });
-    }
-
-
-    /**
-     * @return string     the current search term
-     */
-    function getSearchKey() {
-        return $this->searchKey;
-    }
-
-
-    /**
-     * @param  string     a search term
-     *
-     * @return object     this instance
-     */
-    function setSearchKey($searchKey) {
-        $this->searchKey = (string) $searchKey;
-
-        $this->clearSearchResult();
-        return $this;
-    }
-
-
-    /**
-     * @return bool       returns TRUE if the search key was set meaning that
-     *                    we are currently searching; returns FALSE otherwise
-     */
-    function searched() {
-        return $this->searchKey !== '';
-    }
-
-
-    /**
-     * Clears the current search result.
-     *
-     * @return object     this instance
-     */
-    function clearSearchResult() {
-        $this->searchResult = NULL;
-        return $this;
-    }
-
-
-    /**
-     * Returns an array of search results. This result is memoized for
-     * performance though setting the search key anew clears the memo again.
-     *
-     * @return array      an array of search results
-     */
-    function getSearchResult() {
-
-        # no search key -> return empty array
-        if ($this->searchKey === '') {
-            return [];
-        }
-
-        # not memoized yet, do so now
-        if (is_null($this->searchResult)) {
-            $this->searchResult = StudipStudyArea::search($this->searchKey);
-            usort($this->searchResult, [__CLASS__, 'sortSearchResult']);
-        }
-
-        return $this->searchResult;
-    }
-
-    static function sortSearchResult($a, $b) {
-        return strcmp($a->getPath('·'), $b->getPath('·'));
-    }
-
-
-    /**
-     * @return object     the currently selected study area
-     */
-    function getSelected() {
-        return $this->selected;
-    }
-
-
-    /**
-     * @param  mixed      either an MD5ish ID of the study area to select or the
-     *                    area object itself
-     *
-     * @return object     this instance
-     */
-    function setSelected($selected) {
-      if (!is_object($selected)) {
-        $this->selected = StudipStudyArea::find($selected);
-      }
-      else {
-            $this->selected = $selected;
-        }
-        return $this;
-    }
-
-
-    /**
-     * @return bool       returns TRUE if the subtrees should be expanded
-     *                    completely or FALSE otherwise
-     */
-    function getShowAll() {
-        return $this->showAll;
-    }
-
-
-    /**
-     * @param  bool       the new state of the expansion of subtrees
-     *
-     * @return object     this instance
-     */
-    function setShowAll($showAll) {
-        $this->showAll = $showAll;
-        return $this;
-    }
-
-
-    /**
-     * Toggles the state of the expansion of subtrees.
-     *
-     * @return object     this instance
-     */
-    function toggleShowAll() {
-        $this->showAll = !$this->showAll;
-        return $this;
-    }
-
-
-    /**
-     * Returns all the IDs of the selected study areas.
-     *
-     * @return array      an array of MD5ish strings representing the IDs of the
-     *                    selected study areas
-     */
-    function getAreaIDs() {
-        return array_keys($this->areas);
-    }
-
-
-    /**
-     * Returns all the selected study areas.
-     *
-     * @return array      an array of StudipStudyArea representing the selected
-     *                    study areas
-     */
-    function getAreas() {
-        return $this->areas;
-    }
-
-
-    /**
-     * Sets the study areas of this selection. One can provide either MD5ish ID
-     * strings or instances of StudipStudyArea.
-     *
-     * @param  array      an array of either MD5ish ID strings or StudipStudyAreas
-     *
-     * @return object     the called instance itself
-     */
-    function setAreas($areas) {
-        $this->areas = [];
-        foreach ($areas as $area) {
-            $this->add($area);
-        }
-        return $this;
-    }
-
-
-    /**
-     * @param  mixed      the MD5ish ID of a study area or the area object itself
-     *
-     * @return bool       returns TRUE if this area is selected, FALSE otherwise
-     */
-    function includes($area) {
-        $id = is_object($area) ? $area->getID() : $area;
-        return isset($this->areas[$id]);
-    }
-
-
-    /**
-     * @return integer    returns the number of the selected study areas
-     */
-    function size() {
-        return sizeof($this->areas);
-    }
-
-
-    /**
-     * This method adds an area to the selected study areas.
-     *
-     * @param  string     the MD5ish ID of the study area to add
-     *
-     * @return object     this instance
-     */
-    function add($area) {
-        # convert to an object
-        if (!is_object($area)) {
-            $area = StudipStudyArea::find($area);
-        }
-        $id = $area->getID();
-        if (!isset($this->areas[$id])) {
-            $this->areas[$id] = $area;
-        }
-        $this->sortAreas();
-        return $this;
-    }
-
-
-    /**
-     * This method removes an area from the selected study areas.
-     *
-     * @param  string     the MD5ish ID of the study area to add
-     *
-     * @return object     this instance
-     */
-    function remove($area) {
-        if (is_object($area)) {
-            $area = $area->getID();
-        }
-        if (isset($this->areas[(string) $area])) {
-            unset($this->areas[$area]);
-        }
-        return $this;
-    }
-
-
-    /**
-     * Returns the trail -- the path from the root of the tree of study areas down
-     * to the currently selected area.
-     *
-     * # TODO (mlunzena) this has to be refactored as well
-     *
-     * @return array      an array of study areas; currently each item is an
-     *                    hashmap containing the ID of each area using the key
-     *                    'id' and the name of the study area using the key 'name'
-     */
-    function getTrail() {
-        $area = $this->selected;
-        $trail = [$area->getID() => $area];
-        while ($parent = $area->getParent()) {
-            $trail[$parent->getID()] = $parent;
-            $area = $parent;
-        }
-        $trail[StudipStudyArea::ROOT] = StudipStudyArea::getRootArea();
-        return array_reverse($trail, TRUE);
-    }
-}
diff --git a/lib/classes/StudipStudyAreaSelection.php b/lib/classes/StudipStudyAreaSelection.php
new file mode 100644
index 0000000..ea2ea6f
--- /dev/null
+++ b/lib/classes/StudipStudyAreaSelection.php
@@ -0,0 +1,332 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/*
+ * Copyright (C) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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.
+ */
+
+/**
+ * Objects of this class represent the state of the study area selection form.
+ *
+ * Note: Many of the methods return "$this" to let you easily cascade method
+ * calls: $selection->toggleShowAll()->setSelected("012345etc.");
+ *
+ * @package   studip
+ *
+ * @author    mlunzena
+ * @copyright (c) Authors
+ */
+
+class StudipStudyAreaSelection {
+
+    private $selected;
+    private $showAll;
+
+    private $areas;
+
+    private $searchKey;
+    private $searchResult;
+
+    /**
+     * This constructor can be called with or without a course ID. If a course ID
+     * has been sent, the selected areas are populated by that course's already
+     * chosen study areas. If no course ID is given, it is assumed that you are
+     * creating a new course at the moment.
+     *
+     * @param  string     optional; the ID of the course to prepopulate the form
+     *                    with
+     *
+     * @return void
+     */
+    function __construct($course_id = NULL) {
+        $this->selected = StudipStudyArea::getRootArea();
+        $this->showAll = FALSE;
+
+        $this->areas = [];
+
+        $this->searchKey = '';
+        $this->clearSearchResult();
+
+        if (isset($course_id)) {
+            $this->populateAreasForCourse($course_id);
+        }
+    }
+
+
+    /**
+     * This method populates this instance with the already chosen study areas.
+     *
+     * @param  string     the course's ID
+     *
+     * @return void
+     */
+    private function populateAreasForCourse($id) {
+        $areas = StudipStudyArea::getStudyAreasForCourse($id);
+        $this->setAreas($areas);
+        $this->sortAreas();
+    }
+
+
+    /**
+     * Sorts the internal representation of the areas by their paths according to
+     * the current locale.
+     *
+     * @return void
+     */
+    private function sortAreas()
+    {
+        uasort($this->areas, function ($a, $b) {
+            return strcoll($a->getPath(' · '), $b->getPath(' · '));
+        });
+    }
+
+
+    /**
+     * @return string     the current search term
+     */
+    function getSearchKey() {
+        return $this->searchKey;
+    }
+
+
+    /**
+     * @param  string     a search term
+     *
+     * @return object     this instance
+     */
+    function setSearchKey($searchKey) {
+        $this->searchKey = (string) $searchKey;
+
+        $this->clearSearchResult();
+        return $this;
+    }
+
+
+    /**
+     * @return bool       returns TRUE if the search key was set meaning that
+     *                    we are currently searching; returns FALSE otherwise
+     */
+    function searched() {
+        return $this->searchKey !== '';
+    }
+
+
+    /**
+     * Clears the current search result.
+     *
+     * @return object     this instance
+     */
+    function clearSearchResult() {
+        $this->searchResult = NULL;
+        return $this;
+    }
+
+
+    /**
+     * Returns an array of search results. This result is memoized for
+     * performance though setting the search key anew clears the memo again.
+     *
+     * @return array      an array of search results
+     */
+    function getSearchResult() {
+
+        # no search key -> return empty array
+        if ($this->searchKey === '') {
+            return [];
+        }
+
+        # not memoized yet, do so now
+        if (is_null($this->searchResult)) {
+            $this->searchResult = StudipStudyArea::search($this->searchKey);
+            usort($this->searchResult, [__CLASS__, 'sortSearchResult']);
+        }
+
+        return $this->searchResult;
+    }
+
+    static function sortSearchResult($a, $b) {
+        return strcmp($a->getPath('·'), $b->getPath('·'));
+    }
+
+
+    /**
+     * @return object     the currently selected study area
+     */
+    function getSelected() {
+        return $this->selected;
+    }
+
+
+    /**
+     * @param  mixed      either an MD5ish ID of the study area to select or the
+     *                    area object itself
+     *
+     * @return object     this instance
+     */
+    function setSelected($selected) {
+      if (!is_object($selected)) {
+        $this->selected = StudipStudyArea::find($selected);
+      }
+      else {
+            $this->selected = $selected;
+        }
+        return $this;
+    }
+
+
+    /**
+     * @return bool       returns TRUE if the subtrees should be expanded
+     *                    completely or FALSE otherwise
+     */
+    function getShowAll() {
+        return $this->showAll;
+    }
+
+
+    /**
+     * @param  bool       the new state of the expansion of subtrees
+     *
+     * @return object     this instance
+     */
+    function setShowAll($showAll) {
+        $this->showAll = $showAll;
+        return $this;
+    }
+
+
+    /**
+     * Toggles the state of the expansion of subtrees.
+     *
+     * @return object     this instance
+     */
+    function toggleShowAll() {
+        $this->showAll = !$this->showAll;
+        return $this;
+    }
+
+
+    /**
+     * Returns all the IDs of the selected study areas.
+     *
+     * @return array      an array of MD5ish strings representing the IDs of the
+     *                    selected study areas
+     */
+    function getAreaIDs() {
+        return array_keys($this->areas);
+    }
+
+
+    /**
+     * Returns all the selected study areas.
+     *
+     * @return array      an array of StudipStudyArea representing the selected
+     *                    study areas
+     */
+    function getAreas() {
+        return $this->areas;
+    }
+
+
+    /**
+     * Sets the study areas of this selection. One can provide either MD5ish ID
+     * strings or instances of StudipStudyArea.
+     *
+     * @param  array      an array of either MD5ish ID strings or StudipStudyAreas
+     *
+     * @return object     the called instance itself
+     */
+    function setAreas($areas) {
+        $this->areas = [];
+        foreach ($areas as $area) {
+            $this->add($area);
+        }
+        return $this;
+    }
+
+
+    /**
+     * @param  mixed      the MD5ish ID of a study area or the area object itself
+     *
+     * @return bool       returns TRUE if this area is selected, FALSE otherwise
+     */
+    function includes($area) {
+        $id = is_object($area) ? $area->getID() : $area;
+        return isset($this->areas[$id]);
+    }
+
+
+    /**
+     * @return integer    returns the number of the selected study areas
+     */
+    function size() {
+        return sizeof($this->areas);
+    }
+
+
+    /**
+     * This method adds an area to the selected study areas.
+     *
+     * @param  string     the MD5ish ID of the study area to add
+     *
+     * @return object     this instance
+     */
+    function add($area) {
+        # convert to an object
+        if (!is_object($area)) {
+            $area = StudipStudyArea::find($area);
+        }
+        $id = $area->getID();
+        if (!isset($this->areas[$id])) {
+            $this->areas[$id] = $area;
+        }
+        $this->sortAreas();
+        return $this;
+    }
+
+
+    /**
+     * This method removes an area from the selected study areas.
+     *
+     * @param  string     the MD5ish ID of the study area to add
+     *
+     * @return object     this instance
+     */
+    function remove($area) {
+        if (is_object($area)) {
+            $area = $area->getID();
+        }
+        if (isset($this->areas[(string) $area])) {
+            unset($this->areas[$area]);
+        }
+        return $this;
+    }
+
+
+    /**
+     * Returns the trail -- the path from the root of the tree of study areas down
+     * to the currently selected area.
+     *
+     * # TODO (mlunzena) this has to be refactored as well
+     *
+     * @return array      an array of study areas; currently each item is an
+     *                    hashmap containing the ID of each area using the key
+     *                    'id' and the name of the study area using the key 'name'
+     */
+    function getTrail() {
+        $area = $this->selected;
+        $trail = [$area->getID() => $area];
+        while ($parent = $area->getParent()) {
+            $trail[$parent->getID()] = $parent;
+            $area = $parent;
+        }
+        $trail[StudipStudyArea::ROOT] = StudipStudyArea::getRootArea();
+        return array_reverse($trail, TRUE);
+    }
+}
diff --git a/lib/classes/StudygroupAvatar.class.php b/lib/classes/StudygroupAvatar.class.php
deleted file mode 100644
index 8e27f8e..0000000
--- a/lib/classes/StudygroupAvatar.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * This class represents the avatar of a course.
- *
- * @author    Marcus Lunzenauer (mlunzena@uos), Till Glöggler (tgloeggl@uos)
- * @license GPL2 or any later version
- * @copyright (c) Authors
- * @since     1.10
- */
-class StudygroupAvatar extends CourseAvatar
-{
-    /**
-     * This constant holds the username and ID of the "studygroup" avatar.
-     */
-    protected const NOBODY = 'studygroup';
-}
diff --git a/lib/classes/StudygroupAvatar.php b/lib/classes/StudygroupAvatar.php
new file mode 100644
index 0000000..8e27f8e
--- /dev/null
+++ b/lib/classes/StudygroupAvatar.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This class represents the avatar of a course.
+ *
+ * @author    Marcus Lunzenauer (mlunzena@uos), Till Glöggler (tgloeggl@uos)
+ * @license GPL2 or any later version
+ * @copyright (c) Authors
+ * @since     1.10
+ */
+class StudygroupAvatar extends CourseAvatar
+{
+    /**
+     * This constant holds the username and ID of the "studygroup" avatar.
+     */
+    protected const NOBODY = 'studygroup';
+}
diff --git a/lib/classes/TreeAbstract.class.php b/lib/classes/TreeAbstract.class.php
deleted file mode 100644
index ccdb6e1..0000000
--- a/lib/classes/TreeAbstract.class.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// TreeAbstract.class.php
-// Abstract Base Class to handle in-memory tree structures
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-
-/**
-* Abstract Base Class to handle in-memory tree structures
-*
-* This class provides an interface to basic handling of structure of tree structures
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class TreeAbstract {
-
-    /**
-    * the name of the root element
-    *
-    * @access private
-    * @var string $root_name
-    */
-    var $root_name;
-    /**
-    * object to handle database queries
-    *
-    * @access private
-    * @var object DbView $view
-    */
-    var $view;
-    /**
-    * array containing all tree items
-    *
-    * associative array, key is an unique identifier (eg primary key from DB table)
-    * value is another assoc. array containing the other fieldname/fieldvalue pairs
-    * these fieldnames must be used :
-    * parent_id, name, priority
-    * @access public
-    * @var array    $tree_data
-    */
-    var $tree_data = [];
-    /**
-    * array containing the direct childs of all items
-    *
-    * assoc. array, key is one from $tree_data, value is numeric array with keys from childs
-    * @access private
-    * @var array    $tree_childs
-    */
-    var $tree_childs = [];
-
-    /**
-    * array containing the number of direct childs of all items
-    *
-    * assoc. array, key is one from $tree_data
-    * @access private
-    * @var array    $tree_num_childs
-    */
-    var $tree_num_childs = [];
-
-    var $index_offset = 0;
-
-    /**
-    * static method used to ensure that only one instance exists
-    *
-    * use this method if you need a reference to the tree object <br>
-    * usage: <pre>$my_tree = StudipRangeTree::GetInstance("name_of_tree_class")</pre>
-    *
-    * @param    string  $class_name     the name of the used tree_class
-    * @param    mixed   $args           argumentlist passed to the constructor in the tree_class (if needed)
-    * @return   mixed   always an object, type is one of AbstractTree s childclasses
-    */
-    public static function GetInstance($class_name, $args = null, $invalidate_cache = false)
-    {
-        static $tree_instance;
-        $class_hash = '';
-        if ($args){
-            $class_hash = $class_name . "_" . md5(serialize($args));
-        } elseif ($args === false && is_array($tree_instance)){
-            foreach ($tree_instance as $key => $value){
-                $tmp_name = explode("_",$key);
-                if ($tmp_name[0] == $class_name){
-                    $class_hash = $key;
-                    break;
-                }
-            }
-            if (!$class_hash){
-                $class_hash = $class_name;
-            }
-        } else {
-            $class_hash = $class_name;
-        }
-        if (empty($tree_instance[$class_hash]) || $invalidate_cache){
-            $tree_instance[$class_hash] = new $class_name($args);
-        }
-
-        return $tree_instance[$class_hash];
-    }
-
-    /**
-    * constructor
-    *
-    * do not use directly, call &GetInstance()
-    */
-    protected function __construct()
-    {
-        $this->view = new DbView();
-        $this->init();
-    }
-
-    /**
-    * initializes the tree
-    *
-    * stores all tree items in array $tree_data
-    * must be overriden
-    */
-    public function init()
-    {
-        $this->tree_childs = [];
-        $this->tree_num_childs = [];
-        $this->tree_data = [];
-        $this->index_offset = 0;
-        $this->tree_data['root'] = ['parent_id' => null, 'name' => &$this->root_name, 'index' => 0];
-    }
-
-    /**
-    * store one item in tree_data array
-    *
-    * store one item in tree_data array
-    *
-    * @param    string  $item_id
-    * @param    string  $parent_id
-    * @param    string  $name
-    * @param    integer $priority
-    *
-    */
-    public function storeItem($item_id,$parent_id,$name,$priority)
-    {
-        $this->tree_data[$item_id]["parent_id"] = $parent_id;
-        $this->tree_data[$item_id]["priority"] = $priority;
-        $this->tree_data[$item_id]["name"] = $name;
-        $this->tree_childs[$parent_id][] = $item_id;
-        if (empty($this->tree_num_childs[$parent_id])) {
-            $this->tree_num_childs[$parent_id] = 0;
-        }
-        $this->tree_num_childs[$parent_id]++;
-        return;
-    }
-
-    /**
-    * build an index for sorting purpose
-    *
-    * build an index for sorting purpose
-    *
-    * @param    string  $item_id
-    *
-    */
-    public function buildIndex($item_id = false)
-    {
-        if ($item_id === false && $this->index_offset > 0) {
-            return;
-        }
-        if (!$item_id) {
-            $item_id = "root";
-        }
-        $this->tree_data[$item_id]['index'] = $this->index_offset;
-        ++$this->index_offset;
-        if (($num_kids = $this->getNumKids($item_id))) {
-            for($i = 0; $i < $num_kids; ++$i){
-                $this->buildIndex($this->tree_childs[$item_id][$i]);
-            }
-        }
-        return;
-    }
-
-    /**
-    * returns all direct kids
-    *
-    * @param    string  $item_id
-    * @return   array
-    */
-    public function getKids($item_id)
-    {
-        return (isset($this->tree_childs[$item_id]) && is_array($this->tree_childs[$item_id])) ? $this->tree_childs[$item_id] : [];
-    }
-
-    /**
-    * returns the number of all direct kids
-    *
-    * @param    string  $item_id
-    * @param    bool    $in_recursion
-    * @return   int
-    */
-    public function getNumKids($item_id)
-    {
-        if(!isset($this->tree_num_childs[$item_id])){
-            $this->tree_num_childs[$item_id] = (!empty($this->tree_childs[$item_id]) && is_array($this->tree_childs[$item_id])) ? count($this->tree_childs[$item_id]) : 0;
-        }
-        return $this->tree_num_childs[$item_id];
-    }
-
-    /**
-    * returns all direct kids and kids of kids and so on...
-    *
-    * @param    string  $item_id
-    * @param    bool    $in_recursion   only used in recursion
-    * @return   array
-    */
-    public function getKidsKids($item_id, $in_recursion = false)
-    {
-        static $kidskids;
-        if (!$kidskids || !$in_recursion){
-            $kidskids = [];
-        }
-        $num_kids = $this->getNumKids($item_id);
-        if ($num_kids){
-            $kids = $this->getKids($item_id);
-            $kidskids = array_merge((array)$kidskids, (array)$kids);
-            for ($i = 0; $i < $num_kids; ++$i){
-                $this->getKidsKids($kids[$i],true);
-            }
-        }
-        return (!$in_recursion) ? $kidskids : [];
-    }
-
-    /**
-    * returns the number of all kids and kidskids...
-    *
-    * @param    string  $item_id
-    * @param    bool    $in_recursion
-    * @return   int
-    */
-    public function getNumKidsKids($item_id, $in_recursion = false)
-    {
-        static $num_kidskids;
-        if (!$num_kidskids || !$in_recursion){
-            $num_kidskids = 0;
-        }
-        $num_kids = $this->getNumKids($item_id);
-        if ($num_kids){
-            $kids = $this->getKids($item_id);
-            $num_kidskids += $num_kids;
-            for ($i = 0; $i < $num_kids; ++$i){
-                $this->getNumKidsKids($kids[$i],true);
-            }
-        }
-        return (!$in_recursion) ? $num_kidskids : 0;
-    }
-
-    /**
-    * checks if item is the last kid
-    *
-    * @param    string  $item_id
-    * @return   boolean
-    */
-    public function isLastKid($item_id)
-    {
-        $parent_id = $this->tree_data[$item_id]['parent_id'];
-        $num_kids = $this->getNumKids($parent_id);
-        if (!$parent_id || !$num_kids) {
-            return false;
-        }
-        return $this->tree_childs[$parent_id][$num_kids-1] == $item_id;
-    }
-
-    /**
-    * checks if item is the first kid
-    *
-    * @param    string  $item_id
-    * @return   boolean
-    */
-    public function isFirstKid($item_id)
-    {
-        $parent_id = $this->tree_data[$item_id]['parent_id'];
-        $num_kids = $this->getNumKids($parent_id);
-        if (!$parent_id || !$num_kids) {
-            return false;
-        }
-        return $this->tree_childs[$parent_id][0] == $item_id;
-    }
-
-    /**
-    * checks if given item is a kid or kidkid...of given ancestor
-    *
-    * checks if given item is a kid or kidkid...of given ancestor
-    *
-    * @param    string  $ancestor_id
-    * @param    string  $item_id
-    * @return   boolean
-    */
-    public function isChildOf($ancestor_id,$item_id)
-    {
-        return in_array($item_id,$this->getKidsKids($ancestor_id));
-    }
-
-    /**
-    * checks if item has one or more kids
-    *
-    * @param    string  $item_id
-    * @return   boolean
-    */
-    public function hasKids($item_id)
-    {
-        return $this->getNumKids($item_id) > 0;
-    }
-
-    /**
-    * Returns tree path
-    *
-    * returns a string with the item and all parents separated with a slash
-    *
-    * @param    string  $item_id
-    * @return   string
-    */
-    public function getItemPath($item_id)
-    {
-        if (!$this->tree_data[$item_id]) {
-            return false;
-        }
-
-        $path = $this->tree_data[$item_id]['name'];
-        while($item_id && $item_id !== 'root') {
-            $item_id = $this->tree_data[$item_id]['parent_id'];
-            $path = $this->tree_data[$item_id]['name'] . " / " . $path;
-        }
-        return $path;
-    }
-
-    /**
-    * Returns tree path as array of item_id s
-    *
-    * returns an array containing all parents of given item
-    *
-    * @param    string  $item_id
-    * @return   array
-    */
-    public function getParents($item_id)
-    {
-        if (empty($this->tree_data[$item_id])) {
-            return [];
-        }
-
-        $result = [];
-        while ($item_id && $item_id !== 'root') {
-            $item_id   = $this->tree_data[$item_id]['parent_id'];
-            $result[] = $item_id;
-        }
-        return $result;
-    }
-
-    public function getShortPath($item_id, $length = null, $delimeter = ">", $offset = 0)
-    {
-        if (!$this->tree_data[$item_id] || $item_id === 'root') {
-            return false;
-        }
-        $parents = array_reverse($this->getParents($item_id));
-        array_shift($parents);
-        array_push($parents, $item_id);
-        $that = $this;
-        $parents_names = array_map(function($i) use ($that) {return $that->tree_data[$i]['name'];}, array_slice($parents, $offset, $length ? $length : null));
-        return join(" $delimeter ", $parents_names);
-    }
-
-    /**
-    * Returns the maximum priority value from a parents child
-    *
-    * @param    string  $parent_id
-    * @return   int
-    */
-    public function getMaxPriority($parent_id)
-    {
-        $children = $this->getKids($parent_id);
-        $last = $this->getNumKids($parent_id) - 1;
-        return (int) $this->tree_data[$children[$last]]['priority'];
-    }
-
-    public function getNumEntries($item_id, $num_entries_from_kids = false)
-    {
-        if (!$num_entries_from_kids || !$this->hasKids($item_id)){
-                return $this->tree_data[$item_id]["entries"];
-        } else {
-            return $this->getNumEntriesKids($item_id);
-        }
-    }
-
-    public function getNumEntriesKids($item_id, $in_recursion = false)
-    {
-        static $num_entries;
-        if (!$in_recursion){
-            $num_entries = 0;
-        }
-        $num_entries += $this->tree_data[$item_id]["entries"];
-        $num_kids = $this->getNumKids($item_id);
-        if ($num_kids){
-            $kids = $this->getKids($item_id);
-            for ($i = 0; $i < $num_kids; ++$i){
-                $this->getNumEntriesKids($kids[$i],true);
-            }
-        }
-        return (!$in_recursion) ? $num_entries : null;
-    }
-
-    public function getValue($item_id, $field)
-    {
-        return isset($this->tree_data[$item_id][$field])
-             ? $this->tree_data[$item_id][$field]
-             : null;
-    }
-}
diff --git a/lib/classes/TreeAbstract.php b/lib/classes/TreeAbstract.php
new file mode 100644
index 0000000..ccdb6e1
--- /dev/null
+++ b/lib/classes/TreeAbstract.php
@@ -0,0 +1,431 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// TreeAbstract.class.php
+// Abstract Base Class to handle in-memory tree structures
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+
+/**
+* Abstract Base Class to handle in-memory tree structures
+*
+* This class provides an interface to basic handling of structure of tree structures
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class TreeAbstract {
+
+    /**
+    * the name of the root element
+    *
+    * @access private
+    * @var string $root_name
+    */
+    var $root_name;
+    /**
+    * object to handle database queries
+    *
+    * @access private
+    * @var object DbView $view
+    */
+    var $view;
+    /**
+    * array containing all tree items
+    *
+    * associative array, key is an unique identifier (eg primary key from DB table)
+    * value is another assoc. array containing the other fieldname/fieldvalue pairs
+    * these fieldnames must be used :
+    * parent_id, name, priority
+    * @access public
+    * @var array    $tree_data
+    */
+    var $tree_data = [];
+    /**
+    * array containing the direct childs of all items
+    *
+    * assoc. array, key is one from $tree_data, value is numeric array with keys from childs
+    * @access private
+    * @var array    $tree_childs
+    */
+    var $tree_childs = [];
+
+    /**
+    * array containing the number of direct childs of all items
+    *
+    * assoc. array, key is one from $tree_data
+    * @access private
+    * @var array    $tree_num_childs
+    */
+    var $tree_num_childs = [];
+
+    var $index_offset = 0;
+
+    /**
+    * static method used to ensure that only one instance exists
+    *
+    * use this method if you need a reference to the tree object <br>
+    * usage: <pre>$my_tree = StudipRangeTree::GetInstance("name_of_tree_class")</pre>
+    *
+    * @param    string  $class_name     the name of the used tree_class
+    * @param    mixed   $args           argumentlist passed to the constructor in the tree_class (if needed)
+    * @return   mixed   always an object, type is one of AbstractTree s childclasses
+    */
+    public static function GetInstance($class_name, $args = null, $invalidate_cache = false)
+    {
+        static $tree_instance;
+        $class_hash = '';
+        if ($args){
+            $class_hash = $class_name . "_" . md5(serialize($args));
+        } elseif ($args === false && is_array($tree_instance)){
+            foreach ($tree_instance as $key => $value){
+                $tmp_name = explode("_",$key);
+                if ($tmp_name[0] == $class_name){
+                    $class_hash = $key;
+                    break;
+                }
+            }
+            if (!$class_hash){
+                $class_hash = $class_name;
+            }
+        } else {
+            $class_hash = $class_name;
+        }
+        if (empty($tree_instance[$class_hash]) || $invalidate_cache){
+            $tree_instance[$class_hash] = new $class_name($args);
+        }
+
+        return $tree_instance[$class_hash];
+    }
+
+    /**
+    * constructor
+    *
+    * do not use directly, call &GetInstance()
+    */
+    protected function __construct()
+    {
+        $this->view = new DbView();
+        $this->init();
+    }
+
+    /**
+    * initializes the tree
+    *
+    * stores all tree items in array $tree_data
+    * must be overriden
+    */
+    public function init()
+    {
+        $this->tree_childs = [];
+        $this->tree_num_childs = [];
+        $this->tree_data = [];
+        $this->index_offset = 0;
+        $this->tree_data['root'] = ['parent_id' => null, 'name' => &$this->root_name, 'index' => 0];
+    }
+
+    /**
+    * store one item in tree_data array
+    *
+    * store one item in tree_data array
+    *
+    * @param    string  $item_id
+    * @param    string  $parent_id
+    * @param    string  $name
+    * @param    integer $priority
+    *
+    */
+    public function storeItem($item_id,$parent_id,$name,$priority)
+    {
+        $this->tree_data[$item_id]["parent_id"] = $parent_id;
+        $this->tree_data[$item_id]["priority"] = $priority;
+        $this->tree_data[$item_id]["name"] = $name;
+        $this->tree_childs[$parent_id][] = $item_id;
+        if (empty($this->tree_num_childs[$parent_id])) {
+            $this->tree_num_childs[$parent_id] = 0;
+        }
+        $this->tree_num_childs[$parent_id]++;
+        return;
+    }
+
+    /**
+    * build an index for sorting purpose
+    *
+    * build an index for sorting purpose
+    *
+    * @param    string  $item_id
+    *
+    */
+    public function buildIndex($item_id = false)
+    {
+        if ($item_id === false && $this->index_offset > 0) {
+            return;
+        }
+        if (!$item_id) {
+            $item_id = "root";
+        }
+        $this->tree_data[$item_id]['index'] = $this->index_offset;
+        ++$this->index_offset;
+        if (($num_kids = $this->getNumKids($item_id))) {
+            for($i = 0; $i < $num_kids; ++$i){
+                $this->buildIndex($this->tree_childs[$item_id][$i]);
+            }
+        }
+        return;
+    }
+
+    /**
+    * returns all direct kids
+    *
+    * @param    string  $item_id
+    * @return   array
+    */
+    public function getKids($item_id)
+    {
+        return (isset($this->tree_childs[$item_id]) && is_array($this->tree_childs[$item_id])) ? $this->tree_childs[$item_id] : [];
+    }
+
+    /**
+    * returns the number of all direct kids
+    *
+    * @param    string  $item_id
+    * @param    bool    $in_recursion
+    * @return   int
+    */
+    public function getNumKids($item_id)
+    {
+        if(!isset($this->tree_num_childs[$item_id])){
+            $this->tree_num_childs[$item_id] = (!empty($this->tree_childs[$item_id]) && is_array($this->tree_childs[$item_id])) ? count($this->tree_childs[$item_id]) : 0;
+        }
+        return $this->tree_num_childs[$item_id];
+    }
+
+    /**
+    * returns all direct kids and kids of kids and so on...
+    *
+    * @param    string  $item_id
+    * @param    bool    $in_recursion   only used in recursion
+    * @return   array
+    */
+    public function getKidsKids($item_id, $in_recursion = false)
+    {
+        static $kidskids;
+        if (!$kidskids || !$in_recursion){
+            $kidskids = [];
+        }
+        $num_kids = $this->getNumKids($item_id);
+        if ($num_kids){
+            $kids = $this->getKids($item_id);
+            $kidskids = array_merge((array)$kidskids, (array)$kids);
+            for ($i = 0; $i < $num_kids; ++$i){
+                $this->getKidsKids($kids[$i],true);
+            }
+        }
+        return (!$in_recursion) ? $kidskids : [];
+    }
+
+    /**
+    * returns the number of all kids and kidskids...
+    *
+    * @param    string  $item_id
+    * @param    bool    $in_recursion
+    * @return   int
+    */
+    public function getNumKidsKids($item_id, $in_recursion = false)
+    {
+        static $num_kidskids;
+        if (!$num_kidskids || !$in_recursion){
+            $num_kidskids = 0;
+        }
+        $num_kids = $this->getNumKids($item_id);
+        if ($num_kids){
+            $kids = $this->getKids($item_id);
+            $num_kidskids += $num_kids;
+            for ($i = 0; $i < $num_kids; ++$i){
+                $this->getNumKidsKids($kids[$i],true);
+            }
+        }
+        return (!$in_recursion) ? $num_kidskids : 0;
+    }
+
+    /**
+    * checks if item is the last kid
+    *
+    * @param    string  $item_id
+    * @return   boolean
+    */
+    public function isLastKid($item_id)
+    {
+        $parent_id = $this->tree_data[$item_id]['parent_id'];
+        $num_kids = $this->getNumKids($parent_id);
+        if (!$parent_id || !$num_kids) {
+            return false;
+        }
+        return $this->tree_childs[$parent_id][$num_kids-1] == $item_id;
+    }
+
+    /**
+    * checks if item is the first kid
+    *
+    * @param    string  $item_id
+    * @return   boolean
+    */
+    public function isFirstKid($item_id)
+    {
+        $parent_id = $this->tree_data[$item_id]['parent_id'];
+        $num_kids = $this->getNumKids($parent_id);
+        if (!$parent_id || !$num_kids) {
+            return false;
+        }
+        return $this->tree_childs[$parent_id][0] == $item_id;
+    }
+
+    /**
+    * checks if given item is a kid or kidkid...of given ancestor
+    *
+    * checks if given item is a kid or kidkid...of given ancestor
+    *
+    * @param    string  $ancestor_id
+    * @param    string  $item_id
+    * @return   boolean
+    */
+    public function isChildOf($ancestor_id,$item_id)
+    {
+        return in_array($item_id,$this->getKidsKids($ancestor_id));
+    }
+
+    /**
+    * checks if item has one or more kids
+    *
+    * @param    string  $item_id
+    * @return   boolean
+    */
+    public function hasKids($item_id)
+    {
+        return $this->getNumKids($item_id) > 0;
+    }
+
+    /**
+    * Returns tree path
+    *
+    * returns a string with the item and all parents separated with a slash
+    *
+    * @param    string  $item_id
+    * @return   string
+    */
+    public function getItemPath($item_id)
+    {
+        if (!$this->tree_data[$item_id]) {
+            return false;
+        }
+
+        $path = $this->tree_data[$item_id]['name'];
+        while($item_id && $item_id !== 'root') {
+            $item_id = $this->tree_data[$item_id]['parent_id'];
+            $path = $this->tree_data[$item_id]['name'] . " / " . $path;
+        }
+        return $path;
+    }
+
+    /**
+    * Returns tree path as array of item_id s
+    *
+    * returns an array containing all parents of given item
+    *
+    * @param    string  $item_id
+    * @return   array
+    */
+    public function getParents($item_id)
+    {
+        if (empty($this->tree_data[$item_id])) {
+            return [];
+        }
+
+        $result = [];
+        while ($item_id && $item_id !== 'root') {
+            $item_id   = $this->tree_data[$item_id]['parent_id'];
+            $result[] = $item_id;
+        }
+        return $result;
+    }
+
+    public function getShortPath($item_id, $length = null, $delimeter = ">", $offset = 0)
+    {
+        if (!$this->tree_data[$item_id] || $item_id === 'root') {
+            return false;
+        }
+        $parents = array_reverse($this->getParents($item_id));
+        array_shift($parents);
+        array_push($parents, $item_id);
+        $that = $this;
+        $parents_names = array_map(function($i) use ($that) {return $that->tree_data[$i]['name'];}, array_slice($parents, $offset, $length ? $length : null));
+        return join(" $delimeter ", $parents_names);
+    }
+
+    /**
+    * Returns the maximum priority value from a parents child
+    *
+    * @param    string  $parent_id
+    * @return   int
+    */
+    public function getMaxPriority($parent_id)
+    {
+        $children = $this->getKids($parent_id);
+        $last = $this->getNumKids($parent_id) - 1;
+        return (int) $this->tree_data[$children[$last]]['priority'];
+    }
+
+    public function getNumEntries($item_id, $num_entries_from_kids = false)
+    {
+        if (!$num_entries_from_kids || !$this->hasKids($item_id)){
+                return $this->tree_data[$item_id]["entries"];
+        } else {
+            return $this->getNumEntriesKids($item_id);
+        }
+    }
+
+    public function getNumEntriesKids($item_id, $in_recursion = false)
+    {
+        static $num_entries;
+        if (!$in_recursion){
+            $num_entries = 0;
+        }
+        $num_entries += $this->tree_data[$item_id]["entries"];
+        $num_kids = $this->getNumKids($item_id);
+        if ($num_kids){
+            $kids = $this->getKids($item_id);
+            for ($i = 0; $i < $num_kids; ++$i){
+                $this->getNumEntriesKids($kids[$i],true);
+            }
+        }
+        return (!$in_recursion) ? $num_entries : null;
+    }
+
+    public function getValue($item_id, $field)
+    {
+        return isset($this->tree_data[$item_id][$field])
+             ? $this->tree_data[$item_id][$field]
+             : null;
+    }
+}
diff --git a/lib/classes/TreeView.class.php b/lib/classes/TreeView.class.php
deleted file mode 100644
index 243a9b9..0000000
--- a/lib/classes/TreeView.class.php
+++ /dev/null
@@ -1,446 +0,0 @@
-<?php
-# Lifter001: TEST
-# Lifter002: TODO
-# Lifter007: TODO
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// TreeView.class.php
-// Class to print out html represantation of a tree object based on TreeAbstract.class.php
-//
-// Copyright (c) 2002 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* Class to print out html represantation of a tree object based on TreeAbstract.class.php
-*
-* Class to print out html represantation of a tree object based on TreeAbstract.class.php
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class TreeView {
-
-    /**
-    * Reference to the tree structure
-    *
-    * @access   private
-    * @var  object StudipRangeTree $tree
-    */
-    var $tree;
-    /**
-    * name of used tree class
-    *
-    * @access   private
-    * @var  string $tree_class_name
-    */
-    var $tree_class_name;
-    /**
-    * contains the item with the current html anchor
-    *
-    * @access   public
-    * @var  string  $anchor
-    */
-    var $anchor;
-    /**
-    * array containing all open items
-    *
-    * this is a reference to a global session variable, managed by PHPLib
-    * @access   public
-    * @var  array   $open_items
-    */
-    var $open_items;
-    /**
-    * array containing all open item nodes
-    *
-    * this is a reference to a global session variable, managed by PHPLib
-    * @access   public
-    * @var  array   $open_ranges
-    */
-    var $open_ranges;
-    /**
-    * the item to start with
-    *
-    * @access   private
-    * @var  string  $start_item_id
-    */
-    var $start_item_id;
-    /**
-    * the content of the root element
-    *
-    * @access   public
-    * @var  string  $root_content
-    */
-    var $root_content;
-
-    /**
-    * the maximum amount of columns in a title
-    *
-    * @access   public
-    * @var  string  $max_cols
-    */
-    var $max_cols = 80;
-
-    /**
-    * draw red icons
-    *
-    * @access   public
-    * @var  boolean $use_aging
-    */
-    var $use_aging = false;
-    var $pic_open;
-    var $pic_close;
-
-    /**
-    * constructor
-    *
-    * @access public
-    * @param    string  $tree_class_name    name of used tree class
-    * @param    mixed   $args               argument passed to the tree class
-    */
-    public function __construct($tree_class_name,$args = null)
-    {
-        $this->tree_class_name = $tree_class_name;
-        $this->tree            = TreeAbstract::GetInstance($tree_class_name, $args);
-        // TODO Die Logik hinter forumgrau2 und forumgraurunt2 muss
-        // komplett erneuert werden; dann können auch Instanzen der
-        // Klasse "Icon" verwendet werden.
-        $this->pic_open        = $this->use_aging
-                               ? 'forumgraurunt2.png'
-                               : 'icons/blue/arr_1down.svg';
-        $this->pic_close       = $this->use_aging
-                               ? 'forumgrau2.png'
-                               : 'icons/blue/arr_1right.svg';
-
-        URLHelper::bindLinkParam('open_ranges', $this->open_ranges);
-        URLHelper::bindLinkParam('open_items', $this->open_items);
-
-        $this->handleOpenRanges();
-    }
-
-    /**
-    * manages the link parameters used for the open/close thing
-    *
-    * @access   private
-    */
-    private function handleOpenRanges()
-    {
-        $close_range = Request::option('close_range');
-        if ($close_range) {
-            if ($close_range === 'root'){
-                $this->open_ranges = null;
-                $this->open_items  = null;
-            } else {
-                $kidskids   = $this->tree->getKidsKids($close_range);
-                $kidskids[] = $close_range;
-                foreach ($kidskids as $kid) {
-                    unset($this->open_ranges[$kid]);
-                    unset($this->open_items[$kid]);
-                }
-            }
-            $this->anchor = $close_range;
-        }
-
-        $open_range = Request::option('open_range');
-        if ($open_range) {
-            $kidskids   = $this->tree->getKidsKids($open_range);
-            $kidskids[] = $open_range;
-            foreach ($kidskids as $kid) {
-                $this->open_ranges[$kid] = true;
-            }
-            $this->anchor = $open_range;
-        }
-
-        $toggle_item = Request::option('close_item') ?: Request::option('open_item');
-        if ($toggle_item){
-            if (!empty($this->open_items[$toggle_item])) {
-                unset($this->open_items[$toggle_item]);
-            } else {
-                $this->openItem($toggle_item);
-                $this->openRange($toggle_item);
-            }
-            $this->anchor = $toggle_item;
-        }
-
-        if (Request::option('item_id')) {
-            $this->anchor = Request::option('item_id');
-        }
-    }
-
-    function openItem($item_id)
-    {
-        $this->open_items[$item_id] = true;
-        $this->openRange($this->tree->tree_data[$item_id]['parent_id']);
-    }
-
-    function openRange($item_id)
-    {
-        $this->open_ranges[$item_id] = true;
-
-        $parents = $this->tree->getParents($item_id);
-        foreach ($parents as $parent) {
-            $this->open_ranges[$parent] = true;
-        }
-    }
-
-    /**
-    * prints out the tree beginning with a given item
-    *
-    * @access   public
-    * @param    string  $item_id
-    */
-    function showTree($item_id = "root"){
-    $items = [];
-    if (!is_array($item_id)){
-        $items[0] = $item_id;
-        $this->start_item_id = $item_id;
-    } else {
-        $items = $item_id;
-    }
-    $num_items = count($items);
-    for ($j = 0; $j < $num_items; ++$j){
-        $this->printLevelOutput($items[$j]);
-        $this->printItemOutput($items[$j]);
-        if ($this->tree->hasKids($items[$j]) && !empty($this->open_ranges[$items[$j]])) {
-            $this->showTree($this->tree->tree_childs[$items[$j]]);
-        }
-    }
-    return;
-}
-
-    /**
-    * prints out the lines before an item ("Strichlogik" (c) rstockm)
-    *
-    * @access   private
-    * @param    string  $item_id
-    */
-    function printLevelOutput($item_id)
-    {
-        $level_output = "";
-        if ($item_id != $this->start_item_id){
-            if ($this->tree->isLastKid($item_id))
-                $level_output = "<td class=\"blank tree-indent\" valign=\"top\" nowrap>"
-                              . Assets::img('forumstrich2.gif')
-                              . "</td>"; //last
-            else
-                $level_output = "<td class=\"blank tree-indent\" valign=\"top\" nowrap>"
-                              . Assets::img('forumstrich3.gif')
-                              . "</td>"; //crossing
-            $parent_id = $item_id;
-            while($this->tree->tree_data[$parent_id]['parent_id'] != $this->start_item_id){
-                $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
-                if ($this->tree->isLastKid($parent_id))
-                    $level_output = "<td class=\"blank tree-indent\" valign=\"top\" width=\"10\" nowrap>"
-                                  . Assets::img('forumleer.gif', ['size' => '10@20'])
-                                  . "</td>" . $level_output; //nothing
-                else
-                    $level_output = "<td class=\"blank tree-indent\" valign=\"top\" nowrap>"
-                                  . Assets::img('forumstrich.gif')
-                                  . "</td>" . $level_output; //vertical line
-            }
-        }
-        echo "\n<table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>$level_output";
-        return;
-    }
-
-    /**
-    * prints out one item
-    *
-    * @access   private
-    * @param    string  $item_id
-    */
-    function printItemOutput($item_id)
-    {
-        echo $this->getItemHeadPics($item_id);
-        echo "\n<td class=\"printhead\" nowrap width=\"1\" valign=\"middle\">";
-        if ($this->anchor == $item_id)
-            echo "<a name=\"anchor\">";
-        echo Assets::img('forumleer.gif', ['size' => '1@20']);
-        if ($this->anchor == $item_id)
-            echo "</a>";
-        echo "\n</td><td class=\"printhead\" align=\"left\" width=\"99%\" nowrap valign=\"bottom\">";
-        echo $this->getItemHead($item_id);
-        echo "</td></tr></table>";
-        if (!empty($this->open_items[$item_id])) {
-            $this->printItemDetails($item_id);
-        }
-        return;
-    }
-
-    /**
-    * prints out the details for an item, if item is open
-    *
-    * @access   private
-    * @param    string  $item_id
-    */
-    function printItemDetails($item_id){
-        $level_output = '';
-        if (!$this->tree->hasKids($item_id) || !$this->open_ranges[$item_id] || $item_id == $this->start_item_id)
-            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">"
-                          . Assets::img('forumleer.gif', ['size' => '10@20'])
-                          . "</td>" . $level_output;
-        else
-            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumstrich.gif') . "\">"
-                          . Assets::img('forumleer.gif', ['size' => '10@20'])
-                          . "</td>" . $level_output;
-
-        if (($this->tree->isLastKid($item_id) && !($item_id == $this->start_item_id)) || (!$this->open_ranges[$item_id] && $item_id == $this->start_item_id) || ($item_id == $this->start_item_id && !$this->tree->hasKids($item_id)))
-            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">"
-                          . Assets::img('forumleer.gif', ['size' => '10@20'])
-                          . "</td>" . $level_output;
-        else
-            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumstrich.gif') ."\">"
-                          . Assets::img('forumleer.gif', ['size' => '10@20'])
-                          . "</td>" . $level_output;
-        if ($item_id != $this->start_item_id){
-            $parent_id = $item_id;
-            while($this->tree->tree_data[$parent_id]['parent_id'] != $this->start_item_id){
-                $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
-                if ($this->tree->isLastKid($parent_id))
-                    $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">"
-                                  . Assets::img('forumleer.gif', ['size' => '10@20'])
-                                  . "</td>" . $level_output; //nothing
-                else
-                    $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumstrich.gif') . "\">"
-                                  . Assets::img('forumleer.gif', ['size' => '10@20'])
-                                  . "</td>" . ($level_output ?? ''); //vertical line
-            }
-        }
-        //$level_output = "<td class=\"blank\" background=\"".$GLOBALS['ASSETS_URL']."images/forumleer.gif\" ><img src=\"".$GLOBALS['ASSETS_URL']."images/forumleer.gif\" width=\"20\" height=\"20\" border=\"0\" ></td>" . $level_output;
-
-        echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr>$level_output";
-        echo "<td class=\"printcontent\" width=\"100%\"><br>";
-        echo $this->getItemContent($item_id);
-        echo "<br></td></tr></table>";
-    }
-
-    /**
-    * returns html for the icons in front of the name of the item
-    *
-    * @access   private
-    * @param    string  $item_id
-    * @return   string
-    */
-    function getItemHeadPics($item_id)
-    {
-        $head = $this->getItemHeadFrontPic($item_id);
-        $head .= "\n<td  class=\"printhead\" nowrap align=\"left\" valign=\"bottom\">";
-        if ($this->tree->hasKids($item_id)){
-            $head .= "<a href=\"";
-            $head .= !empty($this->open_ranges[$item_id])
-                ? URLHelper::getLink($this->getSelf("close_range={$item_id}"))
-                : URLHelper::getLink($this->getSelf("open_range={$item_id}"));
-            $head .= "\">";
-            $head .= Icon::create('folder-full', 'clickable', ['title' => !empty($this->open_ranges[$item_id]) ? _('Alle Unterelemente schließen') : _('Alle Unterelemente öffnen')])->asImg(16, ['class' => 'text-top']);
-            $head .= "</a>";
-        } else {
-            $head .= Icon::create('folder-empty', 'clickable', ['title' => _('Dieses Element hat keine Unterelemente')])->asImg();
-        }
-    return $head . "</td>";
-    }
-
-    function getItemHeadFrontPic($item_id)
-    {
-        if ($this->use_aging){
-            $head = "<td bgcolor=\"" . $this->getAgingColor($item_id) . "\" class=\""
-            . (($this->open_items[$item_id]) ? 'printhead3' : 'printhead2')
-            . "\" nowrap width=\"1%\"  align=\"left\" valign=\"top\">";
-        } else {
-            $head = "<td class=\"printhead\" nowrap align=\"left\" valign=\"bottom\">";
-        }
-        $head .= "<a href=\"";
-        $head .= !empty($this->open_items[$item_id])
-            ? URLHelper::getLink($this->getSelf("close_item={$item_id}")) . "\"" . tooltip(_("Dieses Element schließen"),true) . ">"
-            : URLHelper::getLink($this->getSelf("open_item={$item_id}")) . "\"" . tooltip(_("Dieses Element öffnen"),true) . ">";
-        $head .= Assets::img(!empty($this->open_items[$item_id]) ? $this->pic_open : $this->pic_close);
-        #$head .= (!$this->open_items[$item_id]) ? "<img  src=\"".$GLOBALS['ASSETS_URL']."images/forumleer.gif\" width=\"5\" border=\"0\">" : "";
-        $head .= "</a>";
-        $head .= '</td>';
-        return $head;
-    }
-
-    /**
-    * returns html for the name of the item
-    *
-    * @access   private
-    * @param    string  $item_id
-    * @return   string
-    */
-    function getItemHead($item_id){
-        $head = "";
-        $head .= "&nbsp;<a class=\"tree\" href=\"";
-        $head .= !empty($this->open_items[$item_id])
-            ? URLHelper::getLink($this->getSelf("close_item={$item_id}")) . "\"" . tooltip(_("Dieses Element schließen"),true) . "><b>"
-            : URLHelper::getLink($this->getSelf("open_item={$item_id}")) . "\"" . tooltip(_("Dieses Element öffnen"),true) . ">";
-        $head .= htmlReady(my_substr($this->tree->tree_data[$item_id]['name'],0,$this->max_cols));
-        $head .= (!empty($this->open_items[$item_id])) ? "</b></a>" : "</a>";
-        return $head;
-    }
-
-    /**
-    * returns html for the content body of the item
-    *
-    * @access   private
-    * @param    string  $item_id
-    * @return   string
-    */
-    function getItemContent($item_id){
-        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
-        if ($item_id == "root"){
-            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
-            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . $this->root_content ." </td></tr>";
-            $content .= "\n</table>";
-            return $content;
-        }
-        $content .= "\n<tr><td class=\"blank\" align=\"left\">Inhalt für Element <b>{$this->tree->tree_data[$item_id]['name']} ($item_id)</b><br>".formatReady($this->tree->tree_data[$item_id]['description'])."</td></tr>";
-        $content .= "</table>";
-        return $content;
-    }
-
-    function getAgingColor($item_id){
-        $the_time = time();
-        $chdate = $this->tree->tree_data[$item_id]['chdate'];
-        if ($chdate == 0){
-            $timecolor = "#BBBBBB";
-        } else {
-            if (($the_time - $chdate) < 86400){
-                $timecolor = "#FF0000";
-            } else {
-                $timediff = (int) log(($the_time - $chdate) / 86400 + 1) * 15;
-                if ($timediff >= 68){
-                    $timediff = 68;
-                }
-                $red = dechex(255 - $timediff);
-                $other = dechex(119 + $timediff);
-                $timecolor = "#" . $red . $other . $other;
-            }
-        }
-        return $timecolor;
-    }
-
-    /**
-    * returns script name
-    *
-    * @access   private
-    * @param    string  $param
-    * @return   string
-    */
-    function getSelf($param = ""){
-        return "?" . $param . "#anchor";
-    }
-}
diff --git a/lib/classes/TreeView.php b/lib/classes/TreeView.php
new file mode 100644
index 0000000..243a9b9
--- /dev/null
+++ b/lib/classes/TreeView.php
@@ -0,0 +1,446 @@
+<?php
+# Lifter001: TEST
+# Lifter002: TODO
+# Lifter007: TODO
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// TreeView.class.php
+// Class to print out html represantation of a tree object based on TreeAbstract.class.php
+//
+// Copyright (c) 2002 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* Class to print out html represantation of a tree object based on TreeAbstract.class.php
+*
+* Class to print out html represantation of a tree object based on TreeAbstract.class.php
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class TreeView {
+
+    /**
+    * Reference to the tree structure
+    *
+    * @access   private
+    * @var  object StudipRangeTree $tree
+    */
+    var $tree;
+    /**
+    * name of used tree class
+    *
+    * @access   private
+    * @var  string $tree_class_name
+    */
+    var $tree_class_name;
+    /**
+    * contains the item with the current html anchor
+    *
+    * @access   public
+    * @var  string  $anchor
+    */
+    var $anchor;
+    /**
+    * array containing all open items
+    *
+    * this is a reference to a global session variable, managed by PHPLib
+    * @access   public
+    * @var  array   $open_items
+    */
+    var $open_items;
+    /**
+    * array containing all open item nodes
+    *
+    * this is a reference to a global session variable, managed by PHPLib
+    * @access   public
+    * @var  array   $open_ranges
+    */
+    var $open_ranges;
+    /**
+    * the item to start with
+    *
+    * @access   private
+    * @var  string  $start_item_id
+    */
+    var $start_item_id;
+    /**
+    * the content of the root element
+    *
+    * @access   public
+    * @var  string  $root_content
+    */
+    var $root_content;
+
+    /**
+    * the maximum amount of columns in a title
+    *
+    * @access   public
+    * @var  string  $max_cols
+    */
+    var $max_cols = 80;
+
+    /**
+    * draw red icons
+    *
+    * @access   public
+    * @var  boolean $use_aging
+    */
+    var $use_aging = false;
+    var $pic_open;
+    var $pic_close;
+
+    /**
+    * constructor
+    *
+    * @access public
+    * @param    string  $tree_class_name    name of used tree class
+    * @param    mixed   $args               argument passed to the tree class
+    */
+    public function __construct($tree_class_name,$args = null)
+    {
+        $this->tree_class_name = $tree_class_name;
+        $this->tree            = TreeAbstract::GetInstance($tree_class_name, $args);
+        // TODO Die Logik hinter forumgrau2 und forumgraurunt2 muss
+        // komplett erneuert werden; dann können auch Instanzen der
+        // Klasse "Icon" verwendet werden.
+        $this->pic_open        = $this->use_aging
+                               ? 'forumgraurunt2.png'
+                               : 'icons/blue/arr_1down.svg';
+        $this->pic_close       = $this->use_aging
+                               ? 'forumgrau2.png'
+                               : 'icons/blue/arr_1right.svg';
+
+        URLHelper::bindLinkParam('open_ranges', $this->open_ranges);
+        URLHelper::bindLinkParam('open_items', $this->open_items);
+
+        $this->handleOpenRanges();
+    }
+
+    /**
+    * manages the link parameters used for the open/close thing
+    *
+    * @access   private
+    */
+    private function handleOpenRanges()
+    {
+        $close_range = Request::option('close_range');
+        if ($close_range) {
+            if ($close_range === 'root'){
+                $this->open_ranges = null;
+                $this->open_items  = null;
+            } else {
+                $kidskids   = $this->tree->getKidsKids($close_range);
+                $kidskids[] = $close_range;
+                foreach ($kidskids as $kid) {
+                    unset($this->open_ranges[$kid]);
+                    unset($this->open_items[$kid]);
+                }
+            }
+            $this->anchor = $close_range;
+        }
+
+        $open_range = Request::option('open_range');
+        if ($open_range) {
+            $kidskids   = $this->tree->getKidsKids($open_range);
+            $kidskids[] = $open_range;
+            foreach ($kidskids as $kid) {
+                $this->open_ranges[$kid] = true;
+            }
+            $this->anchor = $open_range;
+        }
+
+        $toggle_item = Request::option('close_item') ?: Request::option('open_item');
+        if ($toggle_item){
+            if (!empty($this->open_items[$toggle_item])) {
+                unset($this->open_items[$toggle_item]);
+            } else {
+                $this->openItem($toggle_item);
+                $this->openRange($toggle_item);
+            }
+            $this->anchor = $toggle_item;
+        }
+
+        if (Request::option('item_id')) {
+            $this->anchor = Request::option('item_id');
+        }
+    }
+
+    function openItem($item_id)
+    {
+        $this->open_items[$item_id] = true;
+        $this->openRange($this->tree->tree_data[$item_id]['parent_id']);
+    }
+
+    function openRange($item_id)
+    {
+        $this->open_ranges[$item_id] = true;
+
+        $parents = $this->tree->getParents($item_id);
+        foreach ($parents as $parent) {
+            $this->open_ranges[$parent] = true;
+        }
+    }
+
+    /**
+    * prints out the tree beginning with a given item
+    *
+    * @access   public
+    * @param    string  $item_id
+    */
+    function showTree($item_id = "root"){
+    $items = [];
+    if (!is_array($item_id)){
+        $items[0] = $item_id;
+        $this->start_item_id = $item_id;
+    } else {
+        $items = $item_id;
+    }
+    $num_items = count($items);
+    for ($j = 0; $j < $num_items; ++$j){
+        $this->printLevelOutput($items[$j]);
+        $this->printItemOutput($items[$j]);
+        if ($this->tree->hasKids($items[$j]) && !empty($this->open_ranges[$items[$j]])) {
+            $this->showTree($this->tree->tree_childs[$items[$j]]);
+        }
+    }
+    return;
+}
+
+    /**
+    * prints out the lines before an item ("Strichlogik" (c) rstockm)
+    *
+    * @access   private
+    * @param    string  $item_id
+    */
+    function printLevelOutput($item_id)
+    {
+        $level_output = "";
+        if ($item_id != $this->start_item_id){
+            if ($this->tree->isLastKid($item_id))
+                $level_output = "<td class=\"blank tree-indent\" valign=\"top\" nowrap>"
+                              . Assets::img('forumstrich2.gif')
+                              . "</td>"; //last
+            else
+                $level_output = "<td class=\"blank tree-indent\" valign=\"top\" nowrap>"
+                              . Assets::img('forumstrich3.gif')
+                              . "</td>"; //crossing
+            $parent_id = $item_id;
+            while($this->tree->tree_data[$parent_id]['parent_id'] != $this->start_item_id){
+                $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
+                if ($this->tree->isLastKid($parent_id))
+                    $level_output = "<td class=\"blank tree-indent\" valign=\"top\" width=\"10\" nowrap>"
+                                  . Assets::img('forumleer.gif', ['size' => '10@20'])
+                                  . "</td>" . $level_output; //nothing
+                else
+                    $level_output = "<td class=\"blank tree-indent\" valign=\"top\" nowrap>"
+                                  . Assets::img('forumstrich.gif')
+                                  . "</td>" . $level_output; //vertical line
+            }
+        }
+        echo "\n<table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>$level_output";
+        return;
+    }
+
+    /**
+    * prints out one item
+    *
+    * @access   private
+    * @param    string  $item_id
+    */
+    function printItemOutput($item_id)
+    {
+        echo $this->getItemHeadPics($item_id);
+        echo "\n<td class=\"printhead\" nowrap width=\"1\" valign=\"middle\">";
+        if ($this->anchor == $item_id)
+            echo "<a name=\"anchor\">";
+        echo Assets::img('forumleer.gif', ['size' => '1@20']);
+        if ($this->anchor == $item_id)
+            echo "</a>";
+        echo "\n</td><td class=\"printhead\" align=\"left\" width=\"99%\" nowrap valign=\"bottom\">";
+        echo $this->getItemHead($item_id);
+        echo "</td></tr></table>";
+        if (!empty($this->open_items[$item_id])) {
+            $this->printItemDetails($item_id);
+        }
+        return;
+    }
+
+    /**
+    * prints out the details for an item, if item is open
+    *
+    * @access   private
+    * @param    string  $item_id
+    */
+    function printItemDetails($item_id){
+        $level_output = '';
+        if (!$this->tree->hasKids($item_id) || !$this->open_ranges[$item_id] || $item_id == $this->start_item_id)
+            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">"
+                          . Assets::img('forumleer.gif', ['size' => '10@20'])
+                          . "</td>" . $level_output;
+        else
+            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumstrich.gif') . "\">"
+                          . Assets::img('forumleer.gif', ['size' => '10@20'])
+                          . "</td>" . $level_output;
+
+        if (($this->tree->isLastKid($item_id) && !($item_id == $this->start_item_id)) || (!$this->open_ranges[$item_id] && $item_id == $this->start_item_id) || ($item_id == $this->start_item_id && !$this->tree->hasKids($item_id)))
+            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">"
+                          . Assets::img('forumleer.gif', ['size' => '10@20'])
+                          . "</td>" . $level_output;
+        else
+            $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumstrich.gif') ."\">"
+                          . Assets::img('forumleer.gif', ['size' => '10@20'])
+                          . "</td>" . $level_output;
+        if ($item_id != $this->start_item_id){
+            $parent_id = $item_id;
+            while($this->tree->tree_data[$parent_id]['parent_id'] != $this->start_item_id){
+                $parent_id = $this->tree->tree_data[$parent_id]['parent_id'];
+                if ($this->tree->isLastKid($parent_id))
+                    $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumleer.gif') . "\">"
+                                  . Assets::img('forumleer.gif', ['size' => '10@20'])
+                                  . "</td>" . $level_output; //nothing
+                else
+                    $level_output = "<td class=\"blank\" background=\"" . Assets::image_path('forumstrich.gif') . "\">"
+                                  . Assets::img('forumleer.gif', ['size' => '10@20'])
+                                  . "</td>" . ($level_output ?? ''); //vertical line
+            }
+        }
+        //$level_output = "<td class=\"blank\" background=\"".$GLOBALS['ASSETS_URL']."images/forumleer.gif\" ><img src=\"".$GLOBALS['ASSETS_URL']."images/forumleer.gif\" width=\"20\" height=\"20\" border=\"0\" ></td>" . $level_output;
+
+        echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr>$level_output";
+        echo "<td class=\"printcontent\" width=\"100%\"><br>";
+        echo $this->getItemContent($item_id);
+        echo "<br></td></tr></table>";
+    }
+
+    /**
+    * returns html for the icons in front of the name of the item
+    *
+    * @access   private
+    * @param    string  $item_id
+    * @return   string
+    */
+    function getItemHeadPics($item_id)
+    {
+        $head = $this->getItemHeadFrontPic($item_id);
+        $head .= "\n<td  class=\"printhead\" nowrap align=\"left\" valign=\"bottom\">";
+        if ($this->tree->hasKids($item_id)){
+            $head .= "<a href=\"";
+            $head .= !empty($this->open_ranges[$item_id])
+                ? URLHelper::getLink($this->getSelf("close_range={$item_id}"))
+                : URLHelper::getLink($this->getSelf("open_range={$item_id}"));
+            $head .= "\">";
+            $head .= Icon::create('folder-full', 'clickable', ['title' => !empty($this->open_ranges[$item_id]) ? _('Alle Unterelemente schließen') : _('Alle Unterelemente öffnen')])->asImg(16, ['class' => 'text-top']);
+            $head .= "</a>";
+        } else {
+            $head .= Icon::create('folder-empty', 'clickable', ['title' => _('Dieses Element hat keine Unterelemente')])->asImg();
+        }
+    return $head . "</td>";
+    }
+
+    function getItemHeadFrontPic($item_id)
+    {
+        if ($this->use_aging){
+            $head = "<td bgcolor=\"" . $this->getAgingColor($item_id) . "\" class=\""
+            . (($this->open_items[$item_id]) ? 'printhead3' : 'printhead2')
+            . "\" nowrap width=\"1%\"  align=\"left\" valign=\"top\">";
+        } else {
+            $head = "<td class=\"printhead\" nowrap align=\"left\" valign=\"bottom\">";
+        }
+        $head .= "<a href=\"";
+        $head .= !empty($this->open_items[$item_id])
+            ? URLHelper::getLink($this->getSelf("close_item={$item_id}")) . "\"" . tooltip(_("Dieses Element schließen"),true) . ">"
+            : URLHelper::getLink($this->getSelf("open_item={$item_id}")) . "\"" . tooltip(_("Dieses Element öffnen"),true) . ">";
+        $head .= Assets::img(!empty($this->open_items[$item_id]) ? $this->pic_open : $this->pic_close);
+        #$head .= (!$this->open_items[$item_id]) ? "<img  src=\"".$GLOBALS['ASSETS_URL']."images/forumleer.gif\" width=\"5\" border=\"0\">" : "";
+        $head .= "</a>";
+        $head .= '</td>';
+        return $head;
+    }
+
+    /**
+    * returns html for the name of the item
+    *
+    * @access   private
+    * @param    string  $item_id
+    * @return   string
+    */
+    function getItemHead($item_id){
+        $head = "";
+        $head .= "&nbsp;<a class=\"tree\" href=\"";
+        $head .= !empty($this->open_items[$item_id])
+            ? URLHelper::getLink($this->getSelf("close_item={$item_id}")) . "\"" . tooltip(_("Dieses Element schließen"),true) . "><b>"
+            : URLHelper::getLink($this->getSelf("open_item={$item_id}")) . "\"" . tooltip(_("Dieses Element öffnen"),true) . ">";
+        $head .= htmlReady(my_substr($this->tree->tree_data[$item_id]['name'],0,$this->max_cols));
+        $head .= (!empty($this->open_items[$item_id])) ? "</b></a>" : "</a>";
+        return $head;
+    }
+
+    /**
+    * returns html for the content body of the item
+    *
+    * @access   private
+    * @param    string  $item_id
+    * @return   string
+    */
+    function getItemContent($item_id){
+        $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt\">";
+        if ($item_id == "root"){
+            $content .= "\n<tr><td class=\"table_header_bold\" align=\"left\">" . htmlReady($this->tree->root_name) ." </td></tr>";
+            $content .= "\n<tr><td class=\"blank\" align=\"left\">" . $this->root_content ." </td></tr>";
+            $content .= "\n</table>";
+            return $content;
+        }
+        $content .= "\n<tr><td class=\"blank\" align=\"left\">Inhalt für Element <b>{$this->tree->tree_data[$item_id]['name']} ($item_id)</b><br>".formatReady($this->tree->tree_data[$item_id]['description'])."</td></tr>";
+        $content .= "</table>";
+        return $content;
+    }
+
+    function getAgingColor($item_id){
+        $the_time = time();
+        $chdate = $this->tree->tree_data[$item_id]['chdate'];
+        if ($chdate == 0){
+            $timecolor = "#BBBBBB";
+        } else {
+            if (($the_time - $chdate) < 86400){
+                $timecolor = "#FF0000";
+            } else {
+                $timediff = (int) log(($the_time - $chdate) / 86400 + 1) * 15;
+                if ($timediff >= 68){
+                    $timediff = 68;
+                }
+                $red = dechex(255 - $timediff);
+                $other = dechex(119 + $timediff);
+                $timecolor = "#" . $red . $other . $other;
+            }
+        }
+        return $timecolor;
+    }
+
+    /**
+    * returns script name
+    *
+    * @access   private
+    * @param    string  $param
+    * @return   string
+    */
+    function getSelf($param = ""){
+        return "?" . $param . "#anchor";
+    }
+}
diff --git a/lib/classes/UpdateInformation.class.php b/lib/classes/UpdateInformation.class.php
deleted file mode 100644
index 959ef72..0000000
--- a/lib/classes/UpdateInformation.class.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- * Copyright (c) 2011  Rasmus Fuhse
- *
- * 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.
- */
-
-/**
- * Class to set information that should be given to javascript.
- *
- * For a plugin to hand the information "test" to the javascript-function
- * STUDIP.myplugin.myfunction just put the line:
- *  if (UpdateInformation::isCollecting()) {
- *      UpdateInformation::setInformation("myplugin.myfunction", "test");
- *  }
- *
- * @author Rasmus Fuhse
- */
-class UpdateInformation
-{
-    protected static $infos = [];
-    protected static $collecting = null;
-    protected static $request = null;
-
-    /**
-     * Returns the timestamp of the beginning of the run before.
-     * Use this to only partially update new stuff.
-     *
-     * @return int Timestamp of the last run
-     */
-    public static function getTimestamp()
-    {
-        return Request::get('server_timestamp');
-    }
-
-    /**
-     * Extracts updater data from request
-     *
-     * @return Array Request data (may be empty if no data is present)
-     */
-    protected static function getRequest()
-    {
-        if (self::$request === null) {
-            self::$request = Request::getArray('page_info');
-        }
-        return self::$request ?: [];
-    }
-
-    /**
-     * Checks whether the request has data for the given index.
-     *
-     * @return bool indicating whether there is data present for the given index
-     */
-    public static function hasData($index)
-    {
-        $request = self::getRequest();
-        return isset($request[$index]);
-    }
-
-    /**
-     * Returns request data for the given index.
-     *
-     * @param String $index Index to get the request data for
-     * @return mixed Array with request data or null if index is invalid
-     */
-    public static function getData($index)
-    {
-        $request = self::getRequest();
-        return $request[$index] ?: null;
-    }
-
-    /**
-     * Gives information to the buffer for the javascript. The first parameter is
-     * the name of the corresponding javascript-function minus the "STUDIP"
-     * and the second parameter is the value handed to that function.
-     * @param string $js_function : "test.testfunction" to get the JS-function "STUDIP.test.testfunction(information);"
-     * @param mixed $information : anything that could be translated into a json-object
-     */
-    public static function setInformation($js_function, $information)
-    {
-        self::$infos[$js_function] = $information;
-    }
-
-    /**
-     * returns the information to give it to javascript
-     * @return array
-     */
-    public static function getInformation()
-    {
-        return self::$infos;
-    }
-
-    /**
-     * returns if this request is a request, that wants to collect information
-     * to hand it to javascript. Ask for this in your SystemPlugin-constructor.
-     * @return: boolean
-     */
-    public static function isCollecting()
-    {
-        if (self::$collecting === null) {
-            $page = $_SERVER['REQUEST_URI'];
-            if (mb_strpos($page, "?") !== false) {
-                $page = mb_substr($page, 0, mb_strpos($page, "?"));
-            }
-            self::$collecting = (mb_stripos($page, "dispatch.php/jsupdater/get") !== false);
-
-            // If we are collecting, store the current timestamp
-            if (self::$collecting) {
-                self::$infos['server_timestamp'] = time();
-            }
-        }
-        return self::$collecting;
-    }
-}
-
diff --git a/lib/classes/UpdateInformation.php b/lib/classes/UpdateInformation.php
new file mode 100644
index 0000000..959ef72
--- /dev/null
+++ b/lib/classes/UpdateInformation.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ * Copyright (c) 2011  Rasmus Fuhse
+ *
+ * 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.
+ */
+
+/**
+ * Class to set information that should be given to javascript.
+ *
+ * For a plugin to hand the information "test" to the javascript-function
+ * STUDIP.myplugin.myfunction just put the line:
+ *  if (UpdateInformation::isCollecting()) {
+ *      UpdateInformation::setInformation("myplugin.myfunction", "test");
+ *  }
+ *
+ * @author Rasmus Fuhse
+ */
+class UpdateInformation
+{
+    protected static $infos = [];
+    protected static $collecting = null;
+    protected static $request = null;
+
+    /**
+     * Returns the timestamp of the beginning of the run before.
+     * Use this to only partially update new stuff.
+     *
+     * @return int Timestamp of the last run
+     */
+    public static function getTimestamp()
+    {
+        return Request::get('server_timestamp');
+    }
+
+    /**
+     * Extracts updater data from request
+     *
+     * @return Array Request data (may be empty if no data is present)
+     */
+    protected static function getRequest()
+    {
+        if (self::$request === null) {
+            self::$request = Request::getArray('page_info');
+        }
+        return self::$request ?: [];
+    }
+
+    /**
+     * Checks whether the request has data for the given index.
+     *
+     * @return bool indicating whether there is data present for the given index
+     */
+    public static function hasData($index)
+    {
+        $request = self::getRequest();
+        return isset($request[$index]);
+    }
+
+    /**
+     * Returns request data for the given index.
+     *
+     * @param String $index Index to get the request data for
+     * @return mixed Array with request data or null if index is invalid
+     */
+    public static function getData($index)
+    {
+        $request = self::getRequest();
+        return $request[$index] ?: null;
+    }
+
+    /**
+     * Gives information to the buffer for the javascript. The first parameter is
+     * the name of the corresponding javascript-function minus the "STUDIP"
+     * and the second parameter is the value handed to that function.
+     * @param string $js_function : "test.testfunction" to get the JS-function "STUDIP.test.testfunction(information);"
+     * @param mixed $information : anything that could be translated into a json-object
+     */
+    public static function setInformation($js_function, $information)
+    {
+        self::$infos[$js_function] = $information;
+    }
+
+    /**
+     * returns the information to give it to javascript
+     * @return array
+     */
+    public static function getInformation()
+    {
+        return self::$infos;
+    }
+
+    /**
+     * returns if this request is a request, that wants to collect information
+     * to hand it to javascript. Ask for this in your SystemPlugin-constructor.
+     * @return: boolean
+     */
+    public static function isCollecting()
+    {
+        if (self::$collecting === null) {
+            $page = $_SERVER['REQUEST_URI'];
+            if (mb_strpos($page, "?") !== false) {
+                $page = mb_substr($page, 0, mb_strpos($page, "?"));
+            }
+            self::$collecting = (mb_stripos($page, "dispatch.php/jsupdater/get") !== false);
+
+            // If we are collecting, store the current timestamp
+            if (self::$collecting) {
+                self::$infos['server_timestamp'] = time();
+            }
+        }
+        return self::$collecting;
+    }
+}
+
diff --git a/lib/classes/UserConfig.class.php b/lib/classes/UserConfig.class.php
deleted file mode 100644
index 4cb1ff6..0000000
--- a/lib/classes/UserConfig.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * UserConfig.class.php
- * provides access to user preferences
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class UserConfig extends RangeConfig implements PrivacyObject
-{
-    /**
-     * range type
-     */
-    const RANGE_TYPE = 'user';
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $usr_conf = [[]];
-        foreach (new UserConfig($storage->user_id) as $key => $val) {
-            $usr_conf[0][$key] = is_array($val) ? print_r($val, true) : $val;
-        }
-        if ($usr_conf) {
-            $storage->addTabularData(_('Benutzer Konfigurationen'), 'user_config', $usr_conf);
-        }
-    }
-}
diff --git a/lib/classes/UserConfig.php b/lib/classes/UserConfig.php
new file mode 100644
index 0000000..4cb1ff6
--- /dev/null
+++ b/lib/classes/UserConfig.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * UserConfig.class.php
+ * provides access to user preferences
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class UserConfig extends RangeConfig implements PrivacyObject
+{
+    /**
+     * range type
+     */
+    const RANGE_TYPE = 'user';
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $usr_conf = [[]];
+        foreach (new UserConfig($storage->user_id) as $key => $val) {
+            $usr_conf[0][$key] = is_array($val) ? print_r($val, true) : $val;
+        }
+        if ($usr_conf) {
+            $storage->addTabularData(_('Benutzer Konfigurationen'), 'user_config', $usr_conf);
+        }
+    }
+}
diff --git a/lib/classes/UserLookup.class.php b/lib/classes/UserLookup.class.php
deleted file mode 100644
index bdd9fc3..0000000
--- a/lib/classes/UserLookup.class.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-/**
- * UserLookup.class.php
- *
- * provides an easy way to look up user ids by certain filter criteria
- *
- * Example of use:
- * @code
- *   # Create a new UserLookup object
- *    $user_lookup = new UserLookup;
- *
- *   # Filter all users in their first to sixth fachsemester
- *   $user_lookup->setFilter('fachsemester', range(1, 6));
- *
- *   # Filter all users that have an 'autor' or 'tutor' permission
- *   $user_lookup->setFilter('status', ['autor', 'tutor']);
- *
- *   # Get a list of all matching user ids (sorted by the user's names)
- *   $user_ids = $user_lookup->execute(UserLookup::FLAG_SORT_NAME);
- *
- *   # Get another list of all matching user ids but this time we want
- *   # the complete unordered dataset
- *   $user_ids = $user_lookup->execute(UserLookup::FLAG_RETURN_FULL_INFO);
- * @endcode
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.1
- */
-class UserLookup
-{
-    // At the moment, the cache is only used for the GetValuesForType method
-    const USE_CACHE = false;
-    const CACHE_DURATION = 3600; // 1 hour
-
-    const FLAG_SORT_NAME = 1;
-    const FLAG_RETURN_FULL_INFO = 2;
-
-    // Special constant to use for a combined study group filter
-    const USE_COMBINED_STUDYGROUP_FILTER = 'use-combined-studygroup-filter';
-
-    /**
-     * Predefined array of filter criteria
-     *
-     * @var array
-     */
-    protected static $types = [
-        'abschluss' => [
-            'filter' => self::USE_COMBINED_STUDYGROUP_FILTER,
-            'values' => 'UserLookup::abschlussValues',
-        ],
-        'fach' => [
-            'filter' => self::USE_COMBINED_STUDYGROUP_FILTER,
-            'values' => 'UserLookup::fachValues',
-        ],
-        'fachsemester' => [
-            'filter' => self::USE_COMBINED_STUDYGROUP_FILTER,
-            'values' => 'UserLookup::fachsemesterValues',
-        ],
-        'institut' => [
-            'filter' => 'UserLookup::institutFilter',
-            'values' => 'UserLookup::institutValues',
-        ],
-        'status' => [
-            'filter' => 'UserLookup::statusFilter',
-            'values' => 'UserLookup::statusValues',
-        ],
-        'domain' => [
-            'filter' => 'UserLookup::domainFilter',
-            'values' => 'UserLookup::domainValues',
-        ],
-        'role' => [
-            'filter' => 'UserLookup::roleFilter',
-            'values' => 'UserLookup::roleValues',
-        ],
-    ];
-
-    /**
-     * Contains the resulting filter set
-     * @var array
-     */
-    private $filters = [];
-
-    /**
-     * Adds another type filter to the set of current filters.
-     *
-     * Multiple filters for the same filter type result in an AND filter
-     * within this type while multiple filters across filter types result
-     * in an OR filter across these types.
-     *
-     * @param  string $type   Type of filter to add
-     * @param  string $value  Value to filter against
-     * @return UserLookup     Returns itself to allow chaining
-     */
-    public function setFilter($type, $value)
-    {
-        if (!array_key_exists($type, self::$types)) {
-            throw new Exception('[UserLookup] Cannot set filter for unknown type "' . $type . '"');
-        }
-
-        if (!isset($this->filters[$type])) {
-            $this->filters[$type] = [];
-        }
-
-        $this->filters[$type] = array_merge($this->filters[$type], (array) $value);
-
-        return $this;
-    }
-
-    /**
-     * Executes the actual lookup by executing all individual filter types
-     * and returning the intersection of all according result sets.
-     *
-     * Possible flags:
-     *  - FLAG_SORT_NAME         Sorts the user ids in the result by the
-     *                           actual user names
-     *  - FLAG_RETURN_FULL_INFO  Returns rudimental user info instead of just
-     *                           the ids (as an array with the user id as key
-     *                           and an array containting the info as value)
-     *
-     * @param  int $flags Optional set of flags as seen above
-     * @return array      Either a simple list of user ids or an associative
-     *                    array of user ids and user info if FLAG_RETURN_FULL_INFO
-     *                    is set
-     */
-    public function execute($flags = null)
-    {
-        if (count($this->filters) === 0) {
-            throw new Exception('[UserLookup] Cannot execute empty filter set');
-        }
-
-        $result = null;
-        foreach ($this->getFilters() as $filter) {
-            $temp_result = call_user_func($filter['callable'], $filter['needles']);
-
-            if ($result === null) {
-                $result = $temp_result;
-            } else {
-                $result = array_intersect($result, $temp_result);
-            }
-        }
-
-        if (($flags & self::FLAG_SORT_NAME) && !($flags & self::FLAG_RETURN_FULL_INFO)) {
-            $query = "SELECT user_id
-                      FROM auth_user_md5
-                      WHERE user_id IN (?)
-                      ORDER BY Nachname ASC, Vorname ASC";
-            $result = DBManager::get()->fetchFirst($query, [$result ?: '']);
-        }
-
-        if (!empty($result) && ($flags & self::FLAG_RETURN_FULL_INFO)) {
-            $query = "SELECT `user_id`, `username`, `Vorname`, `Nachname`, `Email`, `perms`
-                      FROM `auth_user_md5`
-                      WHERE `user_id` IN (?)";
-            if ($flags & self::FLAG_SORT_NAME) {
-                $query .= " ORDER BY Nachname ASC, Vorname ASC";
-            }
-
-            $result = DBManager::get()->fetchGrouped($query, [$result ?: '']);
-        }
-
-        return $result;
-    }
-
-    protected function getFilters()
-    {
-        $filters = [];
-        $study_course_filter = [];
-        foreach ($this->filters as $type => $values) {
-            if (self::$types[$type]['filter'] === self::USE_COMBINED_STUDYGROUP_FILTER) {
-                $study_course_filter[$type] = $values;
-            } else {
-                $filters[] = [
-                    'callable' => self::$types[$type]['filter'],
-                    'needles'  => $values,
-                ];
-            }
-        }
-
-        if ($study_course_filter) {
-            $filters[] = [
-                'callable' => [$this, 'combinedStudyCourseFilter'],
-                'needles'  => $study_course_filter,
-            ];
-        }
-
-        return $filters;
-    }
-
-    /**
-     * Clears all defined filters.
-     *
-     * @return UserLookup Returns itself to allow chaining
-     */
-    public function clearFilters()
-    {
-        $this->filters = [];
-        return $this;
-    }
-
-    /**
-     * Adds or updates a filter criterion the global set of criteria.
-     *
-     * @param string   $name            Name of the criterion type
-     * @param callback $values_callback Callback for the type's values
-     * @param callback $filter_callback Actual filter callback for a defined
-     *                                  set of needles
-     */
-    public static function addType($name, $values_callback, $filter_callback)
-    {
-        if (!is_callable($values_callback)) {
-            throw new Exception('[UserLookup] Values callback for type "' . $name . '" is not callable');
-        }
-        if (!is_callable($filter_callback)) {
-            throw new Exception('[UserLookup] Filter callback for type "' . $name . '" is not callable');
-        }
-
-        self::$types[$name] = [
-            'filter' => $filter_callback,
-            'values' => $values_callback,
-        ];
-    }
-
-    /**
-     * Returns all valid values for a certain criterion type.
-     *
-     * @param  string $type Name of the criterion type
-     * @return array  Associative array containing the values as keys and
-     *                descriptive names as values
-     */
-    public static function getValuesForType($type)
-    {
-        if (!array_key_exists($type, self::$types)) {
-            throw new Exception('[UserLookup] Unknown type "' . $type . '"');
-        }
-
-        if (!self::USE_CACHE) {
-            return call_user_func(self::$types[$type]['values']);
-        }
-
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache_key = "UserLookup/{$type}/values";
-        $cached_values = $cache->read($cache_key);
-        if ($cached_values) {
-            return unserialize($cached_values);
-        }
-
-        $values = call_user_func(self::$types[$type]['values']);
-
-        $cache->write($cache_key, serialize($values), self::CACHE_DURATION);
-
-        return $values;
-    }
-
-    /**
-     * Return all user with matching studiengang_id in $needles
-     * @param  array $needles List of studiengang ids to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function fachFilter($needles)
-    {
-        $query = "SELECT user_id FROM user_studiengang WHERE fach_id IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles ?: '']);
-    }
-
-    /**
-     * Return all studycourses
-     * @return array Associative array of studiengang ids and studiengang names
-     */
-    protected static function fachValues()
-    {
-        $query = "SELECT `fach_id`, `name`
-                  FROM `fach`
-                  ORDER BY `name` ASC";
-        return DBManager::get()->fetchPairs($query);
-    }
-
-    /**
-     * Return all user with matching abschluss_id in $needles
-     * @param  array $needles List of abschluss ids to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function abschlussFilter($needles)
-    {
-        $query = "SELECT user_id FROM user_studiengang WHERE abschluss_id IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles ?: '']);
-    }
-
-    /**
-     * Return all studydegrees
-     * @return array Associative array of abschluss ids and abschluss names
-     */
-    protected static function abschlussValues()
-    {
-        $query = "SELECT `abschluss_id`, `name`
-                  FROM `abschluss`
-                  ORDER BY `name` ASC";
-        return DBManager::get()->fetchPairs($query);
-    }
-
-    /**
-     * Return all users with a matching fachsemester given in $needles
-     * @param  array $needles List of fachsemesters to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function fachsemesterFilter($needles)
-    {
-        $query = "SELECT user_id FROM user_studiengang WHERE semester IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles ?: '']);
-    }
-
-    /**
-     * Create a array with all possible values for studysemesters
-     * @return array Associative array of fachsemesters and fachsemesters
-     *               (pretty dull, i know)
-     */
-    protected static function fachsemesterValues()
-    {
-        $query = "SELECT MAX(`semester`) FROM `user_studiengang`";
-        $max = DBManager::get()->fetchColumn($query);
-        $values = range(1, $max);
-        return array_combine($values, $values);
-    }
-
-    /**
-     * Returns all user with a matching set of values in user study course
-     * table.
-     * @return array List of user ids matching the given filter
-     */
-    private static function combinedStudyCourseFilter(array $needles)
-    {
-        $type_column_mapping = [
-            'abschluss'    => 'abschluss_id',
-            'fach'         => 'fach_id',
-            'fachsemester' => 'semester',
-        ];
-
-        $conditions = [];
-        $parameters = [];
-        foreach ($needles as $type => $needles) {
-            $column = $type_column_mapping[$type];
-
-            $conditions[] = "`{$column}` IN (:{$column})";
-            $parameters[":{$column}"] = $needles;
-        }
-
-        $query = "SELECT `user_id`
-                  FROM `user_studiengang`
-                  WHERE " . implode(' AND ', $conditions);
-
-        return DBManager::get()->fetchFirst($query, $parameters);
-    }
-
-    /**
-     * Return all users with a matching institut_id given in $needles
-     * @param  array $needles List of institut ids to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function institutFilter($needles)
-    {
-        if (!$needles) {
-            return [];
-        }
-
-        $query = "SELECT `user_id`
-                  FROM `user_inst`
-                  WHERE `Institut_id` IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles]);
-    }
-
-    /**
-     * Return all faculty's and instituts
-     * @return array Associative array of institut ids and institut data
-     *               (Be aware that this array is multidimensional)
-     */
-    protected static function institutValues()
-    {
-        $query = "SELECT `fakultaets_id`, `Institut_id`, `Name`,
-                         `fakultaets_id` = `Institut_id` AS is_fakultaet
-                  FROM `Institute`
-                  ORDER BY `Institut_id` = `fakultaets_id` DESC, `Name` ASC";
-        $db_result = DBManager::get()->query($query)->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_ASSOC);
-
-        $result = [];
-        foreach ($db_result as $fakultaets_id => $items) {
-            foreach ($items as $item) {
-                if (!isset($result[$fakultaets_id])) {
-                    $result[$fakultaets_id] = [
-                        'name'   => $item['Name'],
-                        'values' => [],
-                    ];
-                } else {
-                    $result[$fakultaets_id]['values'][$item['Institut_id']] = $item['Name'];
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Return all users with a matching status given in $needles
-     * @param  array $needles List of statusses to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function statusFilter($needles)
-    {
-        if (!$needles) {
-            return [];
-        }
-
-        $query = "SELECT `user_id`
-                  FROM `auth_user_md5`
-                  WHERE `perms` IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles]);
-    }
-
-    /**
-     * Return all valid statusses
-     * @return array Associative array of status name and description
-     */
-    protected static function statusValues()
-    {
-        return [
-            'autor'  => _('Autor'),
-            'tutor'  => _('Tutor'),
-            'dozent' => _('Dozent'),
-            'admin'  => _('Admin'),
-            'root'   => _('Root'),
-        ];
-    }
-
-    /**
-     * Return all users with a matching domain given in $needles
-     * @param  array $needles List of domain ids to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function domainFilter($needles)
-    {
-        if (!$needles) {
-            return [];
-        }
-
-        $query = "SELECT `user_id`
-                 FROM `user_userdomains`
-                 WHERE `userdomain_id` IN (?)";
-        return DBManager::get()->fetchFirst($query, [$needles]);
-    }
-
-    /**
-     * Return all valid domains
-     * @return array Associative array of domain id and name
-     */
-    protected static function domainValues()
-    {
-        $domains = [];
-        $domains['keine'] = _('Ohne Domain');
-        foreach (UserDomain::getUserDomains() as $domain) {
-            $domains[$domain->getId()] = $domain->name;
-        }
-
-        return $domains;
-    }
-
-    /**
-     * Return all users with a matching assigned role given in $needles
-     *
-     * @param  array $needles List of domain ids to filter against
-     * @return array List of user ids matching the given filter
-     */
-    protected static function roleFilter($needles): array
-    {
-        if (!$needles) {
-            return [];
-        }
-
-        $user_ids = [];
-        foreach ($needles as $role_id) {
-            $users = RolePersistence::getUsersWithRoleById($role_id, false);
-            foreach ($users as $user) {
-                $user_ids[$user->id] = $user->id;
-            }
-        }
-
-        return array_values($user_ids);
-    }
-
-    /**
-     * Return all valid roles
-     *
-     * @return array Associative array of domain id and name
-     */
-    protected static function roleValues(): array
-    {
-        $roles = [];
-        $roles['keine'] = _('Ohne Rollenzuweisung');
-        foreach (RolePersistence::getAllRoles() as $role) {
-            $roles[$role->getRoleid()] = $role->getRolename();
-        }
-
-        return $roles;
-    }
-}
diff --git a/lib/classes/UserLookup.php b/lib/classes/UserLookup.php
new file mode 100644
index 0000000..bdd9fc3
--- /dev/null
+++ b/lib/classes/UserLookup.php
@@ -0,0 +1,503 @@
+<?php
+/**
+ * UserLookup.class.php
+ *
+ * provides an easy way to look up user ids by certain filter criteria
+ *
+ * Example of use:
+ * @code
+ *   # Create a new UserLookup object
+ *    $user_lookup = new UserLookup;
+ *
+ *   # Filter all users in their first to sixth fachsemester
+ *   $user_lookup->setFilter('fachsemester', range(1, 6));
+ *
+ *   # Filter all users that have an 'autor' or 'tutor' permission
+ *   $user_lookup->setFilter('status', ['autor', 'tutor']);
+ *
+ *   # Get a list of all matching user ids (sorted by the user's names)
+ *   $user_ids = $user_lookup->execute(UserLookup::FLAG_SORT_NAME);
+ *
+ *   # Get another list of all matching user ids but this time we want
+ *   # the complete unordered dataset
+ *   $user_ids = $user_lookup->execute(UserLookup::FLAG_RETURN_FULL_INFO);
+ * @endcode
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.1
+ */
+class UserLookup
+{
+    // At the moment, the cache is only used for the GetValuesForType method
+    const USE_CACHE = false;
+    const CACHE_DURATION = 3600; // 1 hour
+
+    const FLAG_SORT_NAME = 1;
+    const FLAG_RETURN_FULL_INFO = 2;
+
+    // Special constant to use for a combined study group filter
+    const USE_COMBINED_STUDYGROUP_FILTER = 'use-combined-studygroup-filter';
+
+    /**
+     * Predefined array of filter criteria
+     *
+     * @var array
+     */
+    protected static $types = [
+        'abschluss' => [
+            'filter' => self::USE_COMBINED_STUDYGROUP_FILTER,
+            'values' => 'UserLookup::abschlussValues',
+        ],
+        'fach' => [
+            'filter' => self::USE_COMBINED_STUDYGROUP_FILTER,
+            'values' => 'UserLookup::fachValues',
+        ],
+        'fachsemester' => [
+            'filter' => self::USE_COMBINED_STUDYGROUP_FILTER,
+            'values' => 'UserLookup::fachsemesterValues',
+        ],
+        'institut' => [
+            'filter' => 'UserLookup::institutFilter',
+            'values' => 'UserLookup::institutValues',
+        ],
+        'status' => [
+            'filter' => 'UserLookup::statusFilter',
+            'values' => 'UserLookup::statusValues',
+        ],
+        'domain' => [
+            'filter' => 'UserLookup::domainFilter',
+            'values' => 'UserLookup::domainValues',
+        ],
+        'role' => [
+            'filter' => 'UserLookup::roleFilter',
+            'values' => 'UserLookup::roleValues',
+        ],
+    ];
+
+    /**
+     * Contains the resulting filter set
+     * @var array
+     */
+    private $filters = [];
+
+    /**
+     * Adds another type filter to the set of current filters.
+     *
+     * Multiple filters for the same filter type result in an AND filter
+     * within this type while multiple filters across filter types result
+     * in an OR filter across these types.
+     *
+     * @param  string $type   Type of filter to add
+     * @param  string $value  Value to filter against
+     * @return UserLookup     Returns itself to allow chaining
+     */
+    public function setFilter($type, $value)
+    {
+        if (!array_key_exists($type, self::$types)) {
+            throw new Exception('[UserLookup] Cannot set filter for unknown type "' . $type . '"');
+        }
+
+        if (!isset($this->filters[$type])) {
+            $this->filters[$type] = [];
+        }
+
+        $this->filters[$type] = array_merge($this->filters[$type], (array) $value);
+
+        return $this;
+    }
+
+    /**
+     * Executes the actual lookup by executing all individual filter types
+     * and returning the intersection of all according result sets.
+     *
+     * Possible flags:
+     *  - FLAG_SORT_NAME         Sorts the user ids in the result by the
+     *                           actual user names
+     *  - FLAG_RETURN_FULL_INFO  Returns rudimental user info instead of just
+     *                           the ids (as an array with the user id as key
+     *                           and an array containting the info as value)
+     *
+     * @param  int $flags Optional set of flags as seen above
+     * @return array      Either a simple list of user ids or an associative
+     *                    array of user ids and user info if FLAG_RETURN_FULL_INFO
+     *                    is set
+     */
+    public function execute($flags = null)
+    {
+        if (count($this->filters) === 0) {
+            throw new Exception('[UserLookup] Cannot execute empty filter set');
+        }
+
+        $result = null;
+        foreach ($this->getFilters() as $filter) {
+            $temp_result = call_user_func($filter['callable'], $filter['needles']);
+
+            if ($result === null) {
+                $result = $temp_result;
+            } else {
+                $result = array_intersect($result, $temp_result);
+            }
+        }
+
+        if (($flags & self::FLAG_SORT_NAME) && !($flags & self::FLAG_RETURN_FULL_INFO)) {
+            $query = "SELECT user_id
+                      FROM auth_user_md5
+                      WHERE user_id IN (?)
+                      ORDER BY Nachname ASC, Vorname ASC";
+            $result = DBManager::get()->fetchFirst($query, [$result ?: '']);
+        }
+
+        if (!empty($result) && ($flags & self::FLAG_RETURN_FULL_INFO)) {
+            $query = "SELECT `user_id`, `username`, `Vorname`, `Nachname`, `Email`, `perms`
+                      FROM `auth_user_md5`
+                      WHERE `user_id` IN (?)";
+            if ($flags & self::FLAG_SORT_NAME) {
+                $query .= " ORDER BY Nachname ASC, Vorname ASC";
+            }
+
+            $result = DBManager::get()->fetchGrouped($query, [$result ?: '']);
+        }
+
+        return $result;
+    }
+
+    protected function getFilters()
+    {
+        $filters = [];
+        $study_course_filter = [];
+        foreach ($this->filters as $type => $values) {
+            if (self::$types[$type]['filter'] === self::USE_COMBINED_STUDYGROUP_FILTER) {
+                $study_course_filter[$type] = $values;
+            } else {
+                $filters[] = [
+                    'callable' => self::$types[$type]['filter'],
+                    'needles'  => $values,
+                ];
+            }
+        }
+
+        if ($study_course_filter) {
+            $filters[] = [
+                'callable' => [$this, 'combinedStudyCourseFilter'],
+                'needles'  => $study_course_filter,
+            ];
+        }
+
+        return $filters;
+    }
+
+    /**
+     * Clears all defined filters.
+     *
+     * @return UserLookup Returns itself to allow chaining
+     */
+    public function clearFilters()
+    {
+        $this->filters = [];
+        return $this;
+    }
+
+    /**
+     * Adds or updates a filter criterion the global set of criteria.
+     *
+     * @param string   $name            Name of the criterion type
+     * @param callback $values_callback Callback for the type's values
+     * @param callback $filter_callback Actual filter callback for a defined
+     *                                  set of needles
+     */
+    public static function addType($name, $values_callback, $filter_callback)
+    {
+        if (!is_callable($values_callback)) {
+            throw new Exception('[UserLookup] Values callback for type "' . $name . '" is not callable');
+        }
+        if (!is_callable($filter_callback)) {
+            throw new Exception('[UserLookup] Filter callback for type "' . $name . '" is not callable');
+        }
+
+        self::$types[$name] = [
+            'filter' => $filter_callback,
+            'values' => $values_callback,
+        ];
+    }
+
+    /**
+     * Returns all valid values for a certain criterion type.
+     *
+     * @param  string $type Name of the criterion type
+     * @return array  Associative array containing the values as keys and
+     *                descriptive names as values
+     */
+    public static function getValuesForType($type)
+    {
+        if (!array_key_exists($type, self::$types)) {
+            throw new Exception('[UserLookup] Unknown type "' . $type . '"');
+        }
+
+        if (!self::USE_CACHE) {
+            return call_user_func(self::$types[$type]['values']);
+        }
+
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache_key = "UserLookup/{$type}/values";
+        $cached_values = $cache->read($cache_key);
+        if ($cached_values) {
+            return unserialize($cached_values);
+        }
+
+        $values = call_user_func(self::$types[$type]['values']);
+
+        $cache->write($cache_key, serialize($values), self::CACHE_DURATION);
+
+        return $values;
+    }
+
+    /**
+     * Return all user with matching studiengang_id in $needles
+     * @param  array $needles List of studiengang ids to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function fachFilter($needles)
+    {
+        $query = "SELECT user_id FROM user_studiengang WHERE fach_id IN (?)";
+        return DBManager::get()->fetchFirst($query, [$needles ?: '']);
+    }
+
+    /**
+     * Return all studycourses
+     * @return array Associative array of studiengang ids and studiengang names
+     */
+    protected static function fachValues()
+    {
+        $query = "SELECT `fach_id`, `name`
+                  FROM `fach`
+                  ORDER BY `name` ASC";
+        return DBManager::get()->fetchPairs($query);
+    }
+
+    /**
+     * Return all user with matching abschluss_id in $needles
+     * @param  array $needles List of abschluss ids to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function abschlussFilter($needles)
+    {
+        $query = "SELECT user_id FROM user_studiengang WHERE abschluss_id IN (?)";
+        return DBManager::get()->fetchFirst($query, [$needles ?: '']);
+    }
+
+    /**
+     * Return all studydegrees
+     * @return array Associative array of abschluss ids and abschluss names
+     */
+    protected static function abschlussValues()
+    {
+        $query = "SELECT `abschluss_id`, `name`
+                  FROM `abschluss`
+                  ORDER BY `name` ASC";
+        return DBManager::get()->fetchPairs($query);
+    }
+
+    /**
+     * Return all users with a matching fachsemester given in $needles
+     * @param  array $needles List of fachsemesters to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function fachsemesterFilter($needles)
+    {
+        $query = "SELECT user_id FROM user_studiengang WHERE semester IN (?)";
+        return DBManager::get()->fetchFirst($query, [$needles ?: '']);
+    }
+
+    /**
+     * Create a array with all possible values for studysemesters
+     * @return array Associative array of fachsemesters and fachsemesters
+     *               (pretty dull, i know)
+     */
+    protected static function fachsemesterValues()
+    {
+        $query = "SELECT MAX(`semester`) FROM `user_studiengang`";
+        $max = DBManager::get()->fetchColumn($query);
+        $values = range(1, $max);
+        return array_combine($values, $values);
+    }
+
+    /**
+     * Returns all user with a matching set of values in user study course
+     * table.
+     * @return array List of user ids matching the given filter
+     */
+    private static function combinedStudyCourseFilter(array $needles)
+    {
+        $type_column_mapping = [
+            'abschluss'    => 'abschluss_id',
+            'fach'         => 'fach_id',
+            'fachsemester' => 'semester',
+        ];
+
+        $conditions = [];
+        $parameters = [];
+        foreach ($needles as $type => $needles) {
+            $column = $type_column_mapping[$type];
+
+            $conditions[] = "`{$column}` IN (:{$column})";
+            $parameters[":{$column}"] = $needles;
+        }
+
+        $query = "SELECT `user_id`
+                  FROM `user_studiengang`
+                  WHERE " . implode(' AND ', $conditions);
+
+        return DBManager::get()->fetchFirst($query, $parameters);
+    }
+
+    /**
+     * Return all users with a matching institut_id given in $needles
+     * @param  array $needles List of institut ids to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function institutFilter($needles)
+    {
+        if (!$needles) {
+            return [];
+        }
+
+        $query = "SELECT `user_id`
+                  FROM `user_inst`
+                  WHERE `Institut_id` IN (?)";
+        return DBManager::get()->fetchFirst($query, [$needles]);
+    }
+
+    /**
+     * Return all faculty's and instituts
+     * @return array Associative array of institut ids and institut data
+     *               (Be aware that this array is multidimensional)
+     */
+    protected static function institutValues()
+    {
+        $query = "SELECT `fakultaets_id`, `Institut_id`, `Name`,
+                         `fakultaets_id` = `Institut_id` AS is_fakultaet
+                  FROM `Institute`
+                  ORDER BY `Institut_id` = `fakultaets_id` DESC, `Name` ASC";
+        $db_result = DBManager::get()->query($query)->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_ASSOC);
+
+        $result = [];
+        foreach ($db_result as $fakultaets_id => $items) {
+            foreach ($items as $item) {
+                if (!isset($result[$fakultaets_id])) {
+                    $result[$fakultaets_id] = [
+                        'name'   => $item['Name'],
+                        'values' => [],
+                    ];
+                } else {
+                    $result[$fakultaets_id]['values'][$item['Institut_id']] = $item['Name'];
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Return all users with a matching status given in $needles
+     * @param  array $needles List of statusses to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function statusFilter($needles)
+    {
+        if (!$needles) {
+            return [];
+        }
+
+        $query = "SELECT `user_id`
+                  FROM `auth_user_md5`
+                  WHERE `perms` IN (?)";
+        return DBManager::get()->fetchFirst($query, [$needles]);
+    }
+
+    /**
+     * Return all valid statusses
+     * @return array Associative array of status name and description
+     */
+    protected static function statusValues()
+    {
+        return [
+            'autor'  => _('Autor'),
+            'tutor'  => _('Tutor'),
+            'dozent' => _('Dozent'),
+            'admin'  => _('Admin'),
+            'root'   => _('Root'),
+        ];
+    }
+
+    /**
+     * Return all users with a matching domain given in $needles
+     * @param  array $needles List of domain ids to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function domainFilter($needles)
+    {
+        if (!$needles) {
+            return [];
+        }
+
+        $query = "SELECT `user_id`
+                 FROM `user_userdomains`
+                 WHERE `userdomain_id` IN (?)";
+        return DBManager::get()->fetchFirst($query, [$needles]);
+    }
+
+    /**
+     * Return all valid domains
+     * @return array Associative array of domain id and name
+     */
+    protected static function domainValues()
+    {
+        $domains = [];
+        $domains['keine'] = _('Ohne Domain');
+        foreach (UserDomain::getUserDomains() as $domain) {
+            $domains[$domain->getId()] = $domain->name;
+        }
+
+        return $domains;
+    }
+
+    /**
+     * Return all users with a matching assigned role given in $needles
+     *
+     * @param  array $needles List of domain ids to filter against
+     * @return array List of user ids matching the given filter
+     */
+    protected static function roleFilter($needles): array
+    {
+        if (!$needles) {
+            return [];
+        }
+
+        $user_ids = [];
+        foreach ($needles as $role_id) {
+            $users = RolePersistence::getUsersWithRoleById($role_id, false);
+            foreach ($users as $user) {
+                $user_ids[$user->id] = $user->id;
+            }
+        }
+
+        return array_values($user_ids);
+    }
+
+    /**
+     * Return all valid roles
+     *
+     * @return array Associative array of domain id and name
+     */
+    protected static function roleValues(): array
+    {
+        $roles = [];
+        $roles['keine'] = _('Ohne Rollenzuweisung');
+        foreach (RolePersistence::getAllRoles() as $role) {
+            $roles[$role->getRoleid()] = $role->getRolename();
+        }
+
+        return $roles;
+    }
+}
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php
deleted file mode 100644
index 015e6cd..0000000
--- a/lib/classes/UserManagement.class.php
+++ /dev/null
@@ -1,1353 +0,0 @@
-<?php
-# Lifter007: TODO
-/**
- * UserManagement.class.php
- *
- * Management for the Stud.IP global users
- *
- * LICENSE
- *
- * 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.
- *
- * @author      Stefan Suchi <suchi@data-quest>
- * @author      Suchi & Berg GmbH <info@data-quest.de>
- * @copyright   2009 Stud.IP
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL Licence 2
- * @category    Stud.IP
- */
-
-// Imports
-require_once 'lib/statusgruppe.inc.php';    // remove user from statusgroups
-require_once 'lib/messaging.inc.php';   // remove messages send or recieved by user
-require_once 'lib/object.inc.php';
-
-/**
- * UserManagement.class.php
- *
- * Management for the Stud.IP global users
- *
- */
-class UserManagement
-{
-    private $user;
-    private $validator;
-    private $user_data;
-
-    public $msg;
-
-    private static $pwd_hasher;
-
-    public static function getPwdHasher()
-    {
-        if (self::$pwd_hasher === null) {
-            self::$pwd_hasher = new PasswordHash(8, Config::get()->PHPASS_USE_PORTABLE_HASH);
-        }
-        return self::$pwd_hasher;
-    }
-
-    /**
-    * Constructor
-    *
-    * Pass nothing to create a new user, or the user_id from an existing user to change or delete
-    * @param    string  $user_id    the user which should be retrieved
-    */
-    public function __construct($user_id = false)
-    {
-        $this->validator = new email_validation_class();
-        $this->validator->timeout = 10;                 // How long do we wait for response of mailservers?
-        $this->getFromDatabase($user_id);
-    }
-
-    public function __get($attr)
-    {
-        if ($attr === 'user_data') {
-            return $this->user_data;
-        }
-    }
-
-    public function __set($attr, $value)
-    {
-        if ($attr === 'user_data') {
-            if (!is_array($value)) {
-                throw new InvalidArgumentException('user_data only accepts array');
-            }
-            return $this->user_data->setData($value, true);
-        }
-    }
-
-    /**
-    * load user data from database into internal array
-    *
-    * @param    string  $user_id    the user which should be retrieved
-    */
-    public function getFromDatabase($user_id)
-    {
-        $this->user = User::toObject($user_id);
-        if (!$this->user) {
-            $this->user = new User();
-        }
-        $this->user_data = new UserDataAdapter($this->user);
-    }
-
-    /**
-    * store user data from internal array into database
-    *
-    * @access   private
-    * @return   bool all data stored?
-    */
-    private function storeToDatabase()
-    {
-        if ($this->user->isNew()) {
-            if ($this->user->store()) {
-                StudipLog::log('USER_CREATE', $this->user->id, null, implode(';', $this->user->toArray('username vorname nachname perms email')));
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        $nperms = [
-            'user' => 0,
-            'autor' => 1,
-            'tutor' => 2,
-            'dozent' => 3
-        ];
-
-        if ($this->user->isDirty('perms')) {
-            if ($this->user->perms === 'dozent' && in_array($this->user->getPristineValue('perms'), ['user','autor','tutor'])) {
-                $this->logInstUserDel($this->user->id, "inst_perms = 'user'");
-                $this->user->institute_memberships->unsetBy('inst_perms', 'user');
-                // make user visible globally if dozent may not be invisible (StEP 00158)
-                if (Config::get()->DOZENT_ALWAYS_VISIBLE && $this->user->visible !== 'never') {
-                    $this->user->visible = 'yes';
-                }
-                if ($nperms[$this->user->perms] < $nperms[$this->user->getPristineValue('perms')]) {
-                    $old_status = [];
-                    foreach ($nperms as $status => $n) {
-                        if ($n > $nperms[$this->user->perms] && $n <= $nperms[$this->user->getPristineValue('perms')]) {
-                            $old_status[] = $status;
-                        }
-                    }
-                    $new_status =  $this->user->perms;
-                    CourseMember::findEachBySQL(
-                        function (CourseMember $cm) use ($new_status) {
-                            $cm->status = $new_status;
-                            $cm->store();
-                        },
-                        'INNER JOIN seminare ON (seminare.Seminar_id = seminar_user.Seminar_id)
-                        WHERE seminar_user.user_id = ?
-                                AND seminar_user.status IN (?)
-                                AND seminare.status NOT IN (?)
-                        ',
-                        [
-                            $this->user->id,
-                            $old_status,
-                            studygroup_sem_types()
-                        ]
-                    );
-                }
-            }
-        }
-        foreach (words('username vorname nachname perms email title_front title_rear password') as $field) {
-            // logging
-            if ($this->user->isFieldDirty($field)) {
-                $old_value = $this->user->getPristineValue($field);
-                $value = $this->user->getValue($field);
-                switch ($field) {
-                    case 'username':
-                        StudipLog::log('USER_CHANGE_USERNAME', $this->user->id, null, "{$old_value} -> {$value}");
-                        break;
-                    case 'vorname':
-                        StudipLog::log('USER_CHANGE_NAME', $this->user->id, null, "Vorname: {$old_value} -> {$value}");
-                        break;
-                    case 'nachname':
-                        StudipLog::log('USER_CHANGE_NAME', $this->user->id, null, "Nachname: {$old_value} -> {$value}");
-                        break;
-                    case 'perms':
-                        StudipLog::log('USER_CHANGE_PERMS', $this->user->id, null, "{$old_value} -> {$value}");
-                        break;
-                    case 'email':
-                        StudipLog::log('USER_CHANGE_EMAIL', $this->user->id, null, "{$old_value} -> {$value}");
-                        break;
-                    case 'title_front':
-                        StudipLog::log('USER_CHANGE_TITLE', $this->user->id, null, "title_front: {$old_value} -> {$value}");
-                        break;
-                    case 'title_rear':
-                        StudipLog::log('USER_CHANGE_TITLE', $this->user->id, null, "title_rear: {$old_value} -> {$value}");
-                    case 'password':
-                        StudipLog::log('USER_CHANGE_PASSWORD', $this->user->id, null, "password: {$old_value} -> {$value}");
-                        break;
-                }
-            }
-        }
-
-        $changed = $this->user->store();
-        return (bool) $changed;
-    }
-
-
-    /**
-    * generate a secure password of $length characters [a-z0-9]
-    *
-    * @param    integer $length number of characters
-    * @return   string password
-    */
-    public function generate_password($length)
-    {
-        $pass = "";
-        mt_srand((double) microtime() * 1000000);
-        for ($i = 1; $i <= $length; $i++) {
-            $temp = mt_rand() % 36;
-            if ($temp < 10) {
-                $temp += 48;     // 0 = chr(48), 9 = chr(57)
-            } else {
-                $temp += 87;     // a = chr(97), z = chr(122)
-            }
-            $pass .= chr($temp);
-        }
-        return $pass;
-    }
-
-
-    /**
-    * Check if Email-Adress is valid and reachable
-    *
-    * @param    string  Email-Adress to check
-    * @return   bool Email-Adress valid and reachable?
-    */
-    private function checkMail($Email)
-    {
-        // Adress correct?
-        if (!$this->validator->ValidateEmailAddress($Email)) {
-            $this->msg .= 'error§' . _('E-Mail-Adresse syntaktisch falsch!') . '§';
-            return false;
-        }
-
-        // E-Mail reachable?
-        if (!$this->validator->ValidateEmailHost($Email)) {
-            // Mailserver nicht erreichbar, ablehnen
-            $this->msg .= 'error§' . _('Mailserver ist nicht erreichbar!') . '§';
-            return false;
-        }
-
-        if (!$this->validator->ValidateEmailBox($Email)) {
-            // Nutzer unbekannt, ablehnen
-            $this->msg .= 'error§' . sprintf(_('E-Mail an <em>%s</em> ist nicht zustellbar!'), $Email) . '§';
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-    * Create a new studip user with the given parameters
-    *
-    * @param    array   structure: array('string table_name.field_name'=>'string value')
-    * @return   bool Creation successful?
-    */
-    public function createNewUser($newuser)
-    {
-        global $perm;
-
-        // Do we have permission to do so?
-        if (!$perm->have_perm('admin')) {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts anzulegen.') . '§';
-            return false;
-        }
-
-        if (!$perm->is_fak_admin() && $newuser['auth_user_md5.perms'] === 'admin') {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Admin-Accounts</em> anzulegen.') . '§';
-            return false;
-        }
-
-        if (!$perm->have_perm('root') && $newuser['auth_user_md5.perms'] === 'root') {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Root-Accounts</em> anzulegen.') . '§';
-            return false;
-        }
-
-        // Do we have all necessary data?
-        if (empty($newuser['auth_user_md5.username']) || empty($newuser['auth_user_md5.perms']) || empty($newuser['auth_user_md5.Email'])) {
-            $this->msg .= 'error§' . _('Bitte geben Sie <em>Username</em>, <em>Status</em> und <em>E-Mail</em> an!') . '§';
-            return false;
-        }
-
-        // Is the username correct?
-        if (!$this->validator->ValidateUsername($newuser['auth_user_md5.username'])) {
-            $this->msg .= 'error§' .  _('Der gewählte Benutzername ist zu kurz oder enthält unzulässige Zeichen!') . '§';
-            return false;
-        }
-
-        // Can we reach the email?
-        if (!$this->checkMail($newuser['auth_user_md5.Email'])) {
-            return false;
-        }
-
-        if (!$newuser['auth_user_md5.auth_plugin']) {
-            $newuser['auth_user_md5.auth_plugin'] = 'standard';
-        }
-
-        // Store new values in internal array
-        $this->getFromDatabase(null);
-        $this->user_data->setData($newuser);
-
-        if ($this->user_data['auth_user_md5.auth_plugin'] === 'standard') {
-            $password = $this->generate_password(8);
-            $this->user_data['auth_user_md5.password'] = self::getPwdHasher()->HashPassword($password);
-        }
-
-        // Does the user already exist?
-        // NOTE: This should be a transaction, but it is not...
-        $temp = User::findByUsername($newuser['auth_user_md5.username']);
-        if ($temp) {
-            $this->msg .= 'error§' . sprintf(_('BenutzerIn <em>%s</em> ist schon vorhanden!'), $newuser['auth_user_md5.username']) . '§';
-            return false;
-        }
-
-        if (!$this->storeToDatabase()) {
-            $this->msg .= 'error§' . sprintf(_('BenutzerIn "%s" konnte nicht angelegt werden.'), $newuser['auth_user_md5.username']) . '§';
-            return false;
-        }
-
-        $this->msg .= 'msg§' . sprintf(_('BenutzerIn "%s" angelegt.'), $newuser['auth_user_md5.username']) . '§';
-
-        // Automated entering new users, based on their status (perms)
-        $result = AutoInsert::instance()->saveUser($this->user_data['auth_user_md5.user_id'], $this->user_data['auth_user_md5.perms']);
-
-        foreach ($result['added'] as $item) {
-            $this->msg .= 'msg§' . sprintf(_('Das automatische Eintragen in die Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
-        }
-        foreach ($result['removed'] as $item) {
-            $this->msg .= 'msg§' . sprintf(_('Das automatische Austragen aus der Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
-        }
-
-        // include language-specific subject and mailbody
-        $user_language = $this->user_data['user_info.preferred_language'] ?: Config::get()->DEFAULT_LANGUAGE;
-
-        // send mail with password generation link
-        self::sendPasswordMail($this->user, true);
-        $this->msg .= 'msg§' . _('Es wurde eine Mail mit Anweisungen zum Setzen des Passworts durch die/den Nutzer/in verschickt.') . '§';
-
-        // add default visibility settings
-        Visibility::createDefaultCategories($this->user_data['auth_user_md5.user_id']);
-
-        return true;
-    }
-
-    /**
-     * Create a new preliminary studip user with the given parameters
-     *
-     * @param    array   structure: array('string table_name.field_name'=>'string value')
-     * @return   bool Creation successful?
-     */
-    public function createPreliminaryUser($newuser)
-    {
-        global $perm;
-
-        $this->getFromDatabase(null);
-        $this->user_data->setData($newuser);
-        // Do we have permission to do so?
-        if (!$perm->have_perm('admin')) {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts anzulegen.') . '§';
-            return false;
-        }
-        if (in_array($this->user->perms, words('root admin'))) {
-            $this->msg .= 'error§' . _('Es können keine vorläufigen Administrationsaccounts angelegt werden.') . '§';
-            return false;
-        }
-        if (!$this->user->id) {
-            $this->user->setId($this->user->getNewId());
-        }
-        if (!$this->user->username) {
-            $this->user->username = $this->user->id;
-        }
-        $this->user->auth_plugin = null;
-        $this->user->visible = 'never';
-
-        // Do we have all necessary data?
-        if (empty ($this->user->perms) || empty ($this->user->vorname) || empty ($this->user->nachname)) {
-            $this->msg .= 'error§' . _('Bitte geben Sie <em>Status</em>, <em>Vorname</em> und <em>Nachname</em> an!') . '§';
-            return false;
-        }
-
-        // Is the username correct?
-        if (!$this->validator->ValidateUsername($this->user->username)) {
-            $this->msg .= 'error§' .  _('Der gewählte Benutzername ist zu kurz oder enthält unzulässige Zeichen!') . '§';
-            return false;
-        }
-
-        // Does the user already exist?
-        // NOTE: This should be a transaction, but it is not...
-        $temp = User::findByUsername($this->user->username);
-        if ($temp) {
-            $this->msg .= 'error§' . sprintf(_('BenutzerIn <em>%s</em> ist schon vorhanden!'), $this->user->username) . '§';
-            return false;
-        }
-
-        if (!$this->storeToDatabase()) {
-            $this->msg .= 'error§' . sprintf(_('BenutzerIn "%s" konnte nicht angelegt werden.'), $this->user->username) . '§';
-            return false;
-        }
-
-        $this->msg .= 'msg§' . sprintf(_('BenutzerIn "%s" (vorläufig) angelegt.'), $this->user->username) . '§';
-
-        // add default visibility settings
-        Visibility::createDefaultCategories($this->user->id);
-
-        return true;
-    }
-
-    /**
-    * Change an existing studip user according to the given parameters
-    *
-    * @param    array   structure: array('string table_name.field_name'=>'string value')
-    * @return   bool Change successful?
-    */
-    public function changeUser($newuser)
-    {
-        global $perm;
-
-        // Do we have permission to do so?
-        if (!$perm->have_perm('admin')) {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts zu verändern.') . '§';
-            return false;
-        }
-
-        if (!$perm->is_fak_admin() && $newuser['auth_user_md5.perms'] === 'admin') {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Admin-Accounts</em> anzulegen.') . '§';
-            return false;
-        }
-
-        if (!$perm->have_perm('root') && $newuser['auth_user_md5.perms'] === 'root') {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Root-Accounts</em> anzulegen.') . '§';
-            return false;
-        }
-
-        if (!$perm->have_perm('root')) {
-            if (!$perm->is_fak_admin() && $this->user_data['auth_user_md5.perms'] === 'admin') {
-                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Admin-Accounts</em> zu verändern.') . '§';
-                return false;
-            }
-
-            if ($this->user_data['auth_user_md5.perms'] === 'root') {
-                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> zu verändern.') . '§';
-                return false;
-            }
-
-            if ($perm->is_fak_admin() && $this->user_data['auth_user_md5.perms'] === 'admin') {
-                if (!$this->adminOK()) {
-                    $this->msg .= 'error§' . _('Sie haben keine Berechtigung diesen Admin-Account zu verändern.') . '§';
-                    return false;
-                }
-            }
-        }
-
-        // active dozent? (ignore the studygroup guys)
-        $status = studygroup_sem_types();
-
-        if (empty($status)) {
-            $count = 0;
-        } else {
-            $query = "SELECT COUNT(*)
-                      FROM seminar_user AS su
-                      LEFT JOIN seminare AS s USING (Seminar_id)
-                      WHERE su.user_id = ?
-                        AND s.status NOT IN (?)
-                        AND su.status = 'dozent'
-                        AND (SELECT COUNT(*) FROM seminar_user su2 WHERE Seminar_id = su.Seminar_id AND su2.status = 'dozent') = 1
-                      GROUP BY user_id";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $this->user_data['auth_user_md5.user_id'],
-                $status,
-            ]);
-            $count = $statement->fetchColumn();
-        }
-        if ($count && isset($newuser['auth_user_md5.perms']) && $newuser['auth_user_md5.perms'] !== 'dozent') {
-            $this->msg .= 'error§' . sprintf(_('Der Benutzer <em>%s</em> ist alleiniger Lehrperson in %s aktiven Veranstaltungen und kann daher nicht in einen anderen Status versetzt werden!'), $this->user_data['auth_user_md5.username'], $count) . '§';
-            return false;
-        }
-
-        // active admin?
-        if ($this->user_data['auth_user_md5.perms'] === 'admin' && $newuser['auth_user_md5.perms'] !== 'admin') {
-            // count number of institutes where the user is admin
-            $query = "SELECT COUNT(*)
-                      FROM user_inst
-                      WHERE user_id = ? AND inst_perms = 'admin'
-                      GROUP BY Institut_id";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-
-            // if there are institutes with admin-perms, add error-message and deny change
-            if ($count = $statement->fetchColumn()) {
-                $this->msg .= 'error§'. sprintf(_('Der Benutzer <em>%s</em> ist Admin in %s Einrichtungen und kann daher nicht in einen anderen Status versetzt werden!'), $this->user_data['auth_user_md5.username'], $count) . '§';
-                return false;
-            }
-        }
-
-        // Is the username correct?
-        if (isset($newuser['auth_user_md5.username'])) {
-            if ($this->user_data['auth_user_md5.username'] != $newuser['auth_user_md5.username']) {
-                if (!$this->validator->ValidateUsername($newuser['auth_user_md5.username'])) {
-                    $this->msg .= 'error§' . _('Der gewählte Benutzername ist zu kurz oder enthält unzulässige Zeichen!') . '§';
-                    return false;
-                }
-                $check_uname = StudipAuthAbstract::CheckUsername($newuser['auth_user_md5.username']);
-                if ($check_uname['found']) {
-                    $this->msg .= 'error§' . _('Der Benutzername wird bereits von einem anderen Benutzer verwendet. Bitte wählen Sie einen anderen Benutzernamen!') . '§';
-                    return false;
-                } else {
-                    //$this->msg .= "info§" . $check_uname['error'] ."§";
-                }
-            } else
-            unset($newuser['auth_user_md5.username']);
-        }
-
-        // Can we reach the email?
-        if (isset($newuser['auth_user_md5.Email'])) {
-            if (!$this->checkMail($newuser['auth_user_md5.Email'])) {
-                return false;
-            }
-        }
-
-        // Store changed values in internal array if allowed
-        $old_perms = $this->user_data['auth_user_md5.perms'];
-        $auth_plugin = $this->user_data['auth_user_md5.auth_plugin'];
-        foreach ($newuser as $key => $value) {
-            if (!StudipAuthAbstract::CheckField($key, $auth_plugin)) {
-                $this->user_data[$key] = $value;
-            } else if ($this->user_data[$key] !== $value) {
-                $this->msg .= 'error§' .  sprintf(_('Das Feld <em>%s</em> können Sie nicht ändern!'), $key) . '§';
-                return false;
-            }
-        }
-
-        if (!$this->storeToDatabase()) {
-            $this->msg .= 'info§' . _('Es wurden keine Veränderungen der Grunddaten vorgenommen.') . '§';
-            return true;
-        }
-
-        $this->msg .= 'msg§' . sprintf(_('Benutzer "%s" verändert.'), $this->user_data['auth_user_md5.username']) . '§';
-        if ($auth_plugin !== null) {
-            // Automated entering new users, based on their status (perms)
-            $result = AutoInsert::instance()->saveUser($this->user_data['auth_user_md5.user_id'], $newuser['auth_user_md5.perms']);
-            foreach ($result['added'] as $item) {
-                $this->msg .= 'msg§' . sprintf(_('Das automatische Eintragen in die Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
-            }
-            foreach ($result['removed'] as $item) {
-                $this->msg .= 'msg§' . sprintf(_('Das automatische Austragen aus der Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
-            }
-            // include language-specific subject and mailbody
-            $user_language = getUserLanguagePath($this->user_data['auth_user_md5.user_id']);
-            $Zeit = strftime('%x, %X');
-
-            // TODO: This should be refactored so that the included file returns an array
-            include "locale/{$user_language}/LC_MAILS/change_mail.inc.php"; // Defines $subject and $mailbody
-
-            // send mail
-            StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject ?? '', $mailbody ?? '');
-        }
-        // Upgrade to admin or root?
-        if (in_array($newuser['auth_user_md5.perms'], ['admin', 'root'])) {
-            $this->re_sort_position_in_seminar_user();
-
-            // delete all seminar entries
-            $course_member = SimpleCollection::createFromArray(
-                CourseMember::findByUser($this->user_data['auth_user_md5.user_id'])
-            );
-            $seminar_ids = $course_member->pluck('seminar_id');
-            $count = 0;
-            foreach($course_member as $member) {
-                $member->delete();
-                $count++;
-            }
-            if ($count) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Veranstaltungen gelöscht.'), $count) . '§';
-                array_map('AdmissionApplication::addMembers', $seminar_ids);
-            }
-            // delete all entries from waiting lists
-            $admission_members = SimpleCollection::createFromArray(
-                AdmissionApplication::findByUser($this->user_data['auth_user_md5.user_id'])
-            );
-            $seminar_ids = $admission_members->pluck('seminar_id');
-            $count = 0;
-            foreach ($admission_members as $admission_member) {
-                $admission_member->delete();
-                $count++;
-            }
-            if ($count) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Wartelisten gelöscht.'), $count) . '§';
-                array_map('AdmissionApplication::addMembers', $seminar_ids);
-            }
-            // delete 'Studiengaenge'
-            if ($count = UserStudyCourse::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']])) {
-                $this->msg .= 'info§' . sprintf(_('%s Zuordnungen zu Studiengängen gelöscht.'), $count) . '§';
-            }
-        }
-
-        if ($newuser['auth_user_md5.perms'] === 'admin') {
-
-            $this->logInstUserDel($this->user_data['auth_user_md5.user_id'], "inst_perms != 'admin'");
-            $query = "DELETE FROM user_inst WHERE user_id = ? AND inst_perms != 'admin'";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus MitarbeiterInnenlisten gelöscht.'), $count) . '§';
-            }
-        }
-        if ($newuser['auth_user_md5.perms'] === 'root') {
-            $this->logInstUserDel($this->user_data['auth_user_md5.user_id']);
-
-            $query = "DELETE FROM user_inst WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus MitarbeiterInnenlisten gelöscht.'), $count) . '§';
-            }
-        }
-
-        return true;
-    }
-
-    private function logInstUserDel($user_id, $condition = null)
-    {
-        $query = "SELECT Institut_id FROM user_inst WHERE user_id = ?";
-        if (isset($condition)) {
-            $query .= ' AND ' . $condition;
-        }
-
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_id]);
-        while ($institute_id = $statement->fetchColumn()) {
-            StudipLog::log('INST_USER_DEL', $institute_id, $user_id);
-        }
-    }
-
-    /**
-    * Mail a password generation link to the user
-    *
-    * @return   bool Password change successful?
-    */
-    public function setPassword()
-    {
-        global $perm;
-
-        // Do we have permission to do so?
-        if (!$perm->have_perm('admin')) {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts zu verändern.') . '§';
-            return false;
-        }
-
-        if (!$perm->have_perm('root')) {
-            if ($this->user_data['auth_user_md5.perms'] === "root") {
-                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> zu verändern.') . '§';
-                return false;
-            }
-            if ($perm->is_fak_admin() && $this->user_data['auth_user_md5.perms'] === 'admin') {
-                if (!$this->adminOK()) {
-                    $this->msg .= 'error§' . _('Sie haben keine Berechtigung diesen Admin-Account zu verändern.') . '§';
-                    return false;
-                }
-            }
-        }
-
-        // Can we reach the email?
-        if (!$this->checkMail($this->user_data['auth_user_md5.Email'])) {
-            return false;
-        }
-
-        self::sendPasswordMail($this->user);
-
-        return true;
-    }
-
-    /**
-     * Send a mail to the user denoted by the passed user-object with a link
-     * to reset the password. For admin, root and non-standard-auth a notification
-     * is sent instead.
-     *
-     * @param  User $user
-     *
-     * @return void
-     */
-    public static function sendPasswordMail($user, $new = false)
-    {
-        setTempLanguage($user->user_id);
-
-        // always generate a token, so root, admin and all other users profit from the abuse protection
-        if ($new) {
-            $expiration_in_hours = 24;
-            $spoken_expiration = _('24 Stunden');
-        } else {
-            $expiration_in_hours = 7 * 24;
-            $spoken_expiration = _('eine Woche');
-        }
-        $token = Token::create($expiration_in_hours * 60 * 60, $user->id, true);
-
-        // new users alawys receive a link to generate a password
-        if ($new) {
-            $subject = sprintf(
-                _("[Stud.IP - %s] Es wurde ein Zugang für sie erstellt - Setzen sie ein Passwort"),
-                Config::get()->UNI_NAME_CLEAN
-            );
-
-            $mailbody = sprintf(
-                _("Dies ist eine Bestätigungsmail des Stud.IP-Systems\n"
-                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %1\$s -\n\n"
-                    ."Es wurde für sie ein Zugang zum System erstellt, Ihr Nutzername lautet:\n\n"
-                    ."%2\$s\n\n"
-                    ."Um den Zugang nutzen zu können, müssen sie ein Passwort setzen.\n"
-                    ."Öffnen Sie dafür bitte folgenden Link\n\n"
-                    ."%3\$s\n\n"
-                    ."in Ihrem Browser.\n\n"
-                    ."Der Link ist %4\$s (bis %5\$s) gültig.\n\n"
-                    ."Wahrscheinlich unterstützt Ihr E-Mail-Programm ein einfaches Anklicken des Links.\n"
-                    ."Ansonsten müssen Sie Ihren Browser öffnen und den Link komplett in die Zeile\n"
-                    ."\"Location\" oder \"URL\" kopieren.\n\n"
-                ),
-                Config::get()->UNI_NAME_CLEAN,
-                $user->username,
-                $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/new_password/set/'. $token->token .'?cancel_login=1',
-                $spoken_expiration,
-                strftime('%x %X', $token->expiration)
-            );
-        } else
-
-        // only users with auth-type standard cann reset their password
-        if ($user->auth_plugin !== 'standard') {
-
-            // inform user, that their password cannot be reset via mail
-            $subject = sprintf(
-                _("[Stud.IP - %s] Passwortänderung angefordert"),
-                Config::get()->UNI_NAME_CLEAN
-            );
-
-            $mailbody = sprintf(
-                _("Dies ist eine Informationsmail des Stud.IP-Systems\n"
-                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
-                    . "Sie haben einen Link angefordert\n"
-                    . "um das Passwort zurückzusetzen.\n"
-                    . "Dies ist aber für den mit dieser Mail \n"
-                    . "verknüpften Account so nicht möglich.\n\n"
-                    . "Wenden sie sich bitte stattdessen an\n%s"
-                ),
-                Config::get()->UNI_NAME_CLEAN,
-                $GLOBALS['UNI_CONTACT']
-            );
-
-        } else {
-
-            $subject = sprintf(
-                _("[Stud.IP - %s] Neues Passwort setzen"),
-                Config::get()->UNI_NAME_CLEAN
-            );
-
-            $mailbody = sprintf(
-                _("Dies ist eine Bestätigungsmail des Stud.IP-Systems\n"
-                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %1\$s -\n\n"
-                    ."Sie haben um die Zurücksetzung des Passwortes zu Ihrem Benutzernamen %5\$s gebeten.\n\n"
-                    ."Diese E-Mail wurde Ihnen zugesandt um sicherzustellen,\n"
-                    ."dass die angegebene E-Mail-Adresse tatsächlich Ihnen gehört.\n\n"
-                    ."Wenn Sie um die Zurücksetzung Ihres Passwortes gebeten haben,\n"
-                    ."dann öffnen Sie bitte folgenden Link\n\n"
-                    ."%2\$s\n\n"
-                    ."in Ihrem Browser. Auf der Seite können Sie ein neues Passwort setzen.\n\n"
-                    ."Der Link ist %3\$s (bis %4\$s) gültig.\n\n"
-                    ."Wahrscheinlich unterstützt Ihr E-Mail-Programm ein einfaches Anklicken des Links.\n"
-                    ."Ansonsten müssen Sie Ihren Browser öffnen und den Link komplett in die Zeile\n"
-                    ."\"Location\" oder \"URL\" kopieren.\n\n"
-                    ."Falls Sie nicht diese Mail nicht angefordert haben\n"
-                    ."oder überhaupt nicht wissen, wovon hier die Rede ist,\n"
-                    ."dann hat jemand Ihre E-Mail-Adresse fälschlicherweise verwendet!\n"
-                    ."Ignorieren Sie in diesem Fall diese E-Mail. Es werden dann keine\n"
-                    ."Änderungen an Ihren Zugangsdaten vorgenommen.\n\n"
-                ),
-                Config::get()->UNI_NAME_CLEAN,
-                $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/new_password/set/'. $token->token .'?cancel_login=1',
-                $spoken_expiration,
-                strftime('%x %X', $token->expiration),
-                $user->username
-            );
-        }
-
-        StudipMail::sendMessage($user->email, $subject, $mailbody);
-
-        restoreLanguage();
-    }
-
-    /**
-    * Delete an existing user from the database and tidy up
-    *
-    * @param $delete_documents bool delete all documents in course context belonging to the user
-    * @param $delete_content_from_course bool delete all course content belonging to the user
-    * @param $delete_personal_documents bool delete all personal documents belonging to the user
-    * @param $delete_personal_content bool delete all personal content belonging to the user
-    * @param $delete_names bool delete all names identifying the user
-    * @param $delete_memberships bool delete all memberships of the user
-    * @param bool $send_email_notification bool send an email that the account has been deleted
-    * @return   bool Removal successful?
-    */
-    public function deleteUser(
-        bool $delete_documents = true,
-        bool $delete_content_from_course = true,
-        bool $delete_personal_documents = true,
-        bool $delete_personal_content = true,
-        bool $delete_names = true,
-        bool $delete_memberships = true,
-        bool $send_email_notification = true,
-        bool $delete_courseware = true
-    ): bool {
-        global $perm;
-
-        // Do we have permission to do so?
-        if (!$perm->have_perm('admin')) {
-            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts zu löschen.') . '§';
-            return FALSE;
-        }
-
-        if (!$perm->have_perm('root')) {
-            if ($this->user_data['auth_user_md5.perms'] === 'root') {
-                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> zu löschen.') . '§';
-                return false;
-            }
-            if ($this->user_data['auth_user_md5.perms'] === 'admin' && !$this->adminOK()) {
-                $this->msg .= 'error§' . _('Sie haben keine Berechtigung diesen Admin-Account zu löschen.') . '§';
-                return false;
-            }
-        }
-
-        // active dozent?
-        $query = "SELECT COUNT(*)
-                  FROM (
-                      SELECT 1
-                      FROM `seminar_user` AS `su1`
-                      -- JOIN seminar_user to check for other teachers
-                      INNER JOIN `seminar_user` AS `su2`
-                        ON (`su1`.`seminar_id` = `su2`.`seminar_id` AND `su2`.`status` = 'dozent')
-                      -- JOIN seminare to check the status for studygroup mode
-                      INNER JOIN `seminare`
-                        ON (`su1`.`seminar_id` = `seminare`.`seminar_id`)
-                      WHERE `su1`.`user_id` = :user_id
-                        AND `su1`.`status` = 'dozent'
-                        AND `seminare`.`status` NOT IN (
-                            -- Select all status ids for studygroups
-                            SELECT `id`
-                            FROM `sem_classes`
-                            WHERE `studygroup_mode` = 1
-                        )
-                      GROUP BY `su1`.`seminar_id`
-                      HAVING COUNT(*) = 1
-                      ORDER BY NULL
-                  ) AS `sub`";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $this->user_data['auth_user_md5.user_id']);
-        $statement->execute();
-        $active_count = $statement->fetchColumn() ?: 0;
-
-        if ($active_count && $delete_memberships) {
-            $this->msg .= 'error§' . sprintf(_('<em>%s</em> ist Lehrkraft in %s aktiven Veranstaltungen und kann daher nicht gelöscht werden.'), $this->user_data['auth_user_md5.username'], $active_count) . '§';
-            return false;
-        //founder of studygroup?
-        } elseif (Config::get()->STUDYGROUPS_ENABLE) {
-            $status = studygroup_sem_types();
-
-            if (empty($status)) {
-                $group_ids = [];
-            } else {
-                $query = "SELECT Seminar_id
-                          FROM seminare AS s
-                          LEFT JOIN seminar_user AS su USING (Seminar_id)
-                          WHERE su.status = 'dozent' AND su.user_id = ? AND s.status IN (?)";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([
-                    $this->user_data['auth_user_md5.user_id'],
-                    $status,
-                ]);
-                $group_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-            }
-
-            foreach ($group_ids as $group_id) {
-                $sem = Seminar::GetInstance($group_id);
-                if (StudygroupModel::countMembers($group_id) > 1) {
-                    // check whether there are tutors or even autors that can be promoted
-                    $tutors = $sem->getMembers('tutor');
-                    $autors = $sem->getMembers('autor');
-                    if (count($tutors) > 0) {
-                        $new_founder = current($tutors);
-                        StudygroupModel::promote_user($new_founder['username'], $sem->getId(), 'dozent');
-                        continue;
-                    }
-                    // if not promote an autor
-                    elseif (count($autors) > 0) {
-                        $new_founder = current($autors);
-                        StudygroupModel::promote_user($new_founder['username'], $sem->getId(), 'dozent');
-                        continue;
-                    }
-                // since no suitable successor was found, we are allowed to remove the studygroup
-                } else {
-                    $sem->delete();
-                }
-                unset($sem);
-            }
-        }
-
-        // store user preferred language for sending mail
-        $user_language = getUserLanguagePath($this->user_data['auth_user_md5.user_id']);
-
-        // Load privacy plugins to ensure all event handlers can react to the
-        // UserDataDidRemove event
-        PluginEngine::getPlugins(PrivacyPlugin::class);
-
-        // delete user from instituts
-        $this->logInstUserDel($this->user_data['auth_user_md5.user_id']);
-
-        if ($delete_memberships) {
-            $query = "DELETE FROM user_inst WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus MitarbeiterInnenlisten gelöscht.'), $count) . '§';
-            }
-
-            // delete user from Statusgruppen
-            if ($count = StatusgruppeUser::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']])) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Funktionen / Gruppen gelöscht.'), $count) . '§';
-            }
-
-            // delete user from archiv
-            $query = "DELETE FROM archiv_user WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus den Zugriffsberechtigungen für das Archiv gelöscht.'), $count) . '§';
-            }
-
-            // delete 'Studiengaenge'
-            $query = "DELETE FROM user_studiengang WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%s Zuordnungen zu Studiengängen gelöscht.'), $count) . '§';
-            }
-
-            $this->re_sort_position_in_seminar_user();
-
-            // delete user from seminars (postings will be preserved)
-            $query = "DELETE FROM seminar_user WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Veranstaltungen gelöscht.'), $count) . '§';
-            }
-
-            $query = "DELETE FROM `termin_related_persons` WHERE `user_id` = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if ($count = $statement->rowCount()) {
-                $this->msg .= 'info§' . sprintf(_('%u Terminzuordnungen gelöscht.'), $count) . '§';
-            }
-
-            // delete visibility settings
-            Visibility::removeUserPrivacySettings($this->user_data['auth_user_md5.user_id']);
-
-            // delete deputy entries if necessary
-            $query = "DELETE FROM deputies WHERE ? IN (user_id, range_id)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            $deputyEntries = $statement->rowCount();
-            if ($deputyEntries) {
-                $this->msg .= 'info§' . sprintf(_('%s Einträge in den Vertretungseinstellungen gelöscht.'), $deputyEntries) . '§';
-            }
-
-            // delete all remaining user data
-            $queries = [
-                "DELETE FROM user_userdomains WHERE user_id = ?",
-            ];
-            foreach ($queries as $query) {
-                DBManager::get()->execute($query, [$this->user_data['auth_user_md5.user_id']]);
-            }
-            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'memberships');
-        }
-
-        // delete documents of this user
-        if ($delete_documents) {
-            $db_filecount = FileRef::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            if ($db_filecount > 0) {
-                $this->msg .= 'info§' . sprintf(_('%s Dateien aus Veranstaltungen und Einrichtungen gelöscht.'), $db_filecount) . '§';
-            }
-            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'course_documents');
-        }
-
-        // always delete personal courseware elements of this user
-        \Courseware\Unit::deleteBySQL('range_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-        \Courseware\UserDataField::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-        \Courseware\UserProgress::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-        \Courseware\Bookmark::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-        \Courseware\Task::deleteBySQL(
-            '`solver_id` = ? AND `solver_type`= "autor"',
-            [$this->user_data['auth_user_md5.user_id']]
-        );
-        // delete courseware elements in courses of this user
-        if ($delete_courseware) {
-            \Courseware\Unit::deleteBySQL('creator_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\StructuralElement::deleteBySQL('owner_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\StructuralElementFeedback::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\StructuralElementComment::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\Container::deleteBySQL('owner_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\Block::deleteBySQL('owner_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\BlockFeedback::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-            \Courseware\BlockComment::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
-        }
-
-        // delete all remaining user data in course context if option selected
-        if ($delete_content_from_course) {
-            $queries = [
-                "DELETE FROM questionnaires WHERE user_id = ?",
-                "DELETE FROM questionnaire_answers WHERE user_id = ?",
-                "DELETE FROM questionnaire_assignments WHERE user_id = ?",
-                "DELETE FROM questionnaire_anonymous_answers WHERE user_id = ?",
-                "DELETE FROM etask_assignment_attempts WHERE user_id = ?",
-                "DELETE FROM etask_responses WHERE user_id = ?",
-                "DELETE FROM etask_tasks WHERE user_id = ?",
-                "DELETE FROM etask_tests WHERE user_id = ?",
-            ];
-            foreach ($queries as $query) {
-                DBManager::get()->execute($query, [$this->user_data['auth_user_md5.user_id']]);
-            }
-            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'course_contents');
-        }
-
-        if ($delete_personal_documents) {
-            $user_folder = Folder::findTopFolder($this->user->id);
-            if ($user_folder) {
-                $this->msg .= 'info§' . _('Persönlicher Dateibereich gelöscht.') . '§';
-                $user_folder->delete();
-            }
-            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'personal_documents');
-        }
-
-        if ($delete_personal_content) {
-            $this->msg .= $this->deletePersonalData($this->user_data['auth_user_md5.user_id']);
-            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'personal_contents');
-        }
-
-        if ($delete_names) {
-            $query = "UPDATE auth_user_md5
-                      SET username = ?, Vorname = '', Nachname = '', Email = ''
-                      WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                md5($this->user_data['auth_user_md5.username'].uniqid('delete_user')),
-                $this->user_data['auth_user_md5.user_id']
-            ]);
-            if ($statement->rowCount() > 0) {
-                $this->msg .= 'info§' . _('Benutzername anonymisiert.') . '§';
-            }
-            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'names');
-        }
-
-        if ($delete_personal_documents && $delete_personal_content && $delete_names && $delete_memberships) {
-            // Delete the user from resource property entries of type "user":
-            ResourceProperty::deleteBySQL(
-                "`property_id` IN (
-                    SELECT `property_id`
-                    FROM `resource_property_definitions`
-                    WHERE `type` = 'user'
-                )
-                AND `state` = :user_id",
-                ['user_id' => $this->user_data['auth_user_md5.user_id']]
-            );
-
-            // delete Stud.IP account
-            $query = "DELETE FROM user_info WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-
-            $query = "DELETE FROM auth_user_md5 WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-            if (!$statement->rowCount()) {
-                $this->msg .= 'error§<em>' . _('Fehler:') . '</em> ' . $query . '§';
-                return false;
-            } else {
-                $this->msg .= 'msg§' . sprintf(_('Benutzer "%s" gelöscht.'), $this->user_data['auth_user_md5.username']) . '§';
-            }
-            StudipLog::log('USER_DEL', $this->user_data['auth_user_md5.user_id'], null, sprintf('%s %s (%s)', $this->user_data['auth_user_md5.Vorname'], $this->user_data['auth_user_md5.Nachname'], $this->user_data['auth_user_md5.username'])); //log with Vorname Nachname (username) as info string
-
-            // Can we reach the email?
-            if (
-                $send_email_notification
-                && $this->checkMail($this->user_data['auth_user_md5.Email'])
-            ) {
-                // include language-specific subject and mailbody
-                $Zeit = strftime('%x, %X');
-
-                // TODO: This should be refactored so that the included file returns an array
-                include "locale/$user_language/LC_MAILS/delete_mail.inc.php"; // Defines $subject and $mailbody
-
-                // send mail
-                StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject ?? '', $mailbody ?? '');
-            }
-
-            // Remove plugin associations/activations
-            PluginManager::getInstance()->deactivateAllPluginsForRange(
-                'user',
-                $this->user_data['auth_user_md5.user_id']
-            );
-
-            // Trigger delete on sorm object which will fire notifications
-            //
-            // TODO: Remove everything from this method that would also be
-            //       deleted in User::delete() (TODO!!!)
-            $this->user->delete();
-
-            unset($this->user_data);
-        }
-
-        return true;
-    }
-
-    /**
-    * Delete personal userdata
-    *
-    * @param    string $user_id    the user which should be retrieved
-    * @return   string Removal messages
-    */
-    private function deletePersonalData($user_id)
-    {
-        $msg = '';
-
-        // delete the datafields
-        $localEntries = DataFieldEntry::removeAll($user_id);
-
-        // delete user from waiting lists
-        $query = "SELECT seminar_id FROM admission_seminar_user WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_id]);
-        $seminar_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-        $query = "DELETE FROM admission_seminar_user WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_id]);
-        if ($count = $statement->rowCount()) {
-            $msg .= 'info§' . sprintf(_('%s Einträge aus Wartelisten gelöscht.'), $count) . '§';
-            array_map('AdmissionApplication::addMembers', $seminar_ids);
-        }
-
-        // delete all personal news from this user
-        if ($count = StudipNews::DeleteNewsByAuthor($user_id)) {
-            $msg .= 'info§' . sprintf(_('%s Einträge aus den Ankündigungen gelöscht.'), $count) . '§';
-        }
-        if ($count = StudipNews::DeleteNewsRanges($user_id)) {
-            $msg .= 'info§' . sprintf(_('%s Verweise auf Ankündigungen gelöscht.'), $count) . '§';
-        }
-
-        //delete entry in news_rss_range
-        StudipNews::UnsetRssId($user_id);
-
-        // delete all private appointments of this user
-        if (Config::get()->CALENDAR_ENABLE) {
-            // delete private appointments (omit group appointments)
-            $count = CalendarDate::deleteBySQL(
-                '`id` IN (
-                    SELECT `id`
-                    FROM (
-                        SELECT `id`, COUNT(*)
-                        FROM `calendar_dates`
-                        JOIN `calendar_date_assignments`
-                          ON `calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`
-                        WHERE `calendar_dates`.`author_id` = :user_id
-                        GROUP BY `id`
-                        HAVING COUNT(*) = 1
-                        ORDER BY NULL
-                    ) AS `cal_date_delete`
-                )',
-                [':user_id' => $user_id]
-            );
-            // delete assignments to group appointments
-            $count += CalendarDateAssignment::deleteBySQL('`range_id` = ?', [$user_id]);
-            if ($count) {
-                $msg .= 'info§' . sprintf(_('%s Einträge aus den Terminen gelöscht.'), $count) . '§';
-            }
-        }
-
-        // delete all messages send or received by this user
-        $messaging = new messaging();
-        $messaging->delete_all_messages($user_id);
-
-        // delete user from all foreign adressbooks and empty own adressbook
-        $count = Contact::deleteBySQL('user_id = ?', [$user_id]);
-        if ($count > 0) {
-            $msg .= 'info§' . sprintf(_('%s Einträge aus Adressbüchern gelöscht.'), $count) . '§';
-        }
-        $count = Contact::deleteBySQL('owner_id = ?', [$user_id]);
-        if ($count) {
-            $msg .= 'info§' . sprintf(_('Adressbuch mit %d Einträgen gelöscht.'), $count) . '§';
-        }
-
-        // delete users groups
-        Statusgruppen::deleteBySQL('range_id = ?', [$user_id]);
-
-        // remove user from any groups
-        StatusgruppeUser::deleteBySQL('user_id = ?', [$user_id]);
-
-        // delete user config values
-        ConfigValue::deleteBySQL('range_id = ?', [$user_id]);
-
-        // delete all remaining user data
-        $queries = [
-            "DELETE FROM kategorien WHERE range_id = ?",
-            "DELETE FROM user_visibility WHERE user_id = ?",
-            "DELETE FROM user_online WHERE user_id = ?",
-            "DELETE FROM auto_insert_user WHERE user_id = ?",
-            "DELETE FROM roles_user WHERE userid = ?",
-            "DELETE FROM schedule WHERE user_id = ?",
-            "DELETE FROM schedule_seminare WHERE user_id = ?",
-            "DELETE FROM termin_related_persons WHERE user_id = ?",
-            "DELETE FROM priorities WHERE user_id = ?",
-            "DELETE FROM api_oauth_user_mapping WHERE user_id = ?",
-            "DELETE FROM api_user_permissions WHERE user_id = ?",
-            "DELETE FROM help_tour_user WHERE user_id = ?",
-            "DELETE FROM personal_notifications_user WHERE user_id = ?",
-            "DELETE FROM forum_abo_users WHERE user_id = ?",
-            "DELETE FROM forum_favorites WHERE user_id = ?",
-
-            "DELETE FROM comments WHERE user_id = ?",
-            "DELETE questionnaires FROM questionnaires LEFT JOIN questionnaire_assignments qa USING (`questionnaire_id`) WHERE qa.range_id = ?",
-            "DELETE questionnaire_answers FROM questionnaire_answers LEFT JOIN questionnaire_questions USING (`question_id`) LEFT JOIN questionnaire_assignments qa USING (`questionnaire_id`) WHERE qa.range_id = ?",
-            "DELETE questionnaire_anonymous_answers FROM questionnaire_anonymous_answers LEFT JOIN questionnaire_assignments qa USING (`questionnaire_id`) WHERE qa.range_id = ?",
-            "DELETE FROM questionnaire_assignments WHERE user_id = ?",
-            "DELETE etask_assignment_attempts FROM etask_assignment_attempts LEFT JOIN etask_assignments ea ON (`assignment_id` = ea.id) WHERE ea.range_type = 'user' AND user_id = ?",
-            "DELETE etask_responses FROM etask_responses LEFT JOIN etask_assignments ea ON (`assignment_id` = ea.id) WHERE ea.range_type = 'user' AND user_id = ?",
-            "DELETE etask_tasks FROM etask_tasks LEFT JOIN etask_test_tasks tt ON (etask_tasks.id = tt.task_id) LEFT JOIN etask_assignments ea ON (tt.`test_id` = ea.test_id) WHERE ea.range_type = 'user' AND  user_id = ?",
-            "DELETE etask_tests FROM etask_tests LEFT JOIN etask_assignments ea ON (`test_id` = ea.test_id) WHERE ea.range_type = 'user' AND user_id = ?",
-
-            "UPDATE forum_entries SET author = '' WHERE user_id = ?",
-            "UPDATE auth_user_md5 SET visible = 'never' WHERE user_id = ?",
-
-            "REPLACE INTO `user_info` (`user_id`, `hobby`, `lebenslauf`, `publi`, `schwerp`, `Home`, `privatnr`, `privatcell`, `privadr`, `score`, `geschlecht`, `mkdate`, `chdate`, `title_front`, `title_rear`, `preferred_language`, `smsforward_copy`, `smsforward_rec`, `email_forward`, `motto`, `lock_rule`) VALUES(?, '', '', '', '', '', '', '', '', 0, 0, 0, 0, '', '', NULL, 1, '', 0, '', '');"
-        ];
-        foreach ($queries as $query) {
-            DBManager::get()->execute($query, [$user_id]);
-        }
-
-        // Clean up orphaned items
-        $queries = [
-            "DELETE FROM personal_notifications WHERE personal_notification_id NOT IN (
-                SELECT personal_notification_id FROM personal_notifications_user
-            )",
-        ];
-        foreach ($queries as $query) {
-            DBManager::get()->exec($query);
-        }
-
-        object_kill_visits($user_id);
-        object_kill_views($user_id);
-
-        // delete picture
-        $avatar = Avatar::getAvatar($user_id);
-        if ($avatar->is_customized()) {
-            $avatar->reset();
-            $msg .= 'info§' . _('Bild gelöscht.') . '§';
-        }
-
-        //delete connected users
-        if (Config::get()->ELEARNING_INTERFACE_ENABLE) {
-            if (ELearningUtils::initElearningInterfaces()) {
-                foreach ($GLOBALS['connected_cms'] as $cms){
-                    if ($cms->auth_necessary && $cms->user instanceOf ConnectedUser) {
-                        $user_auto_create = $cms->USER_AUTO_CREATE;
-                        $cms->USER_AUTO_CREATE = false;
-                        $userclass = mb_strtolower(get_class($cms->user));
-                        $connected_user = new $userclass($cms->cms_type, $user_id);
-                        if ($connected_user->deleteUser() && $connected_user->is_connected) {
-                            $msg .= 'info§' . sprintf(_('Der verknüpfte Nutzer %s wurde im System %s gelöscht.'), $connected_user->login, $connected_user->cms_type) . '§';
-                        }
-                        $cms->USER_AUTO_CREATE = $user_auto_create;
-                    }
-                }
-            }
-        }
-
-        return $msg;
-    }
-
-    private function adminOK()
-    {
-        static $ok = null;
-
-        if ($ok === null) {
-            $query = "SELECT COUNT(a.Institut_id) = COUNT(c.inst_perms)
-                      FROM user_inst AS a
-                      LEFT JOIN Institute b ON (a.Institut_id = b.Institut_id AND b.Institut_id != b.fakultaets_id)
-                      LEFT JOIN user_inst AS c ON (b.fakultaets_id = c.Institut_id AND c.user_id = ?
-                                                  AND c.inst_perms = 'admin')
-                      WHERE a.user_id = ? AND a.inst_perms = 'admin'";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $GLOBALS['auth']->auth['uid'],
-                $this->user_data['auth_user_md5.user_id'],
-            ]);
-            $ok = $statement->fetchColumn();
-        }
-
-        return $ok;
-    }
-
-    private function re_sort_position_in_seminar_user()
-    {
-        $query = "SELECT Seminar_id, position, status
-                  FROM seminar_user
-                  WHERE user_id = ? AND status IN ('tutor', 'dozent')";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->user_data['auth_user_md5.user_id']]);
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            if ($row['status'] === 'tutor') {
-                CourseMember::resortMembership($row['Seminar_id'], (int)$row['position']);
-            } else if ($row['status'] === 'dozent') {
-                CourseMember::resortMembership($row['Seminar_id'], (int)$row['position'], 'dozent');
-            }
-        }
-    }
-
-    /**
-    * Change an existing user password
-    *
-    * @param string $password
-    * @return bool change successful?
-    */
-    public function changePassword($password)
-    {
-        $this->user_data['auth_user_md5.password'] = self::getPwdHasher()->HashPassword($password);
-        $this->storeToDatabase();
-
-        $this->msg .= 'msg§' . _('Das Passwort wurde neu gesetzt.') . '§';
-
-        // include language-specific subject and mailbody
-        setTempLanguage($this->user_data['auth_user_md5.user_id']);
-
-        $subject = sprintf(
-            _("[Stud.IP - %s] Passwortänderung"),
-            Config::get()->UNI_NAME_CLEAN
-        );
-
-        $mailbody = sprintf(
-            _("Dies ist eine Informationsmail des Stud.IP-Systems\n"
-                ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
-                ."Ihr Passwort wurde soeben von Ihnen oder einem/einer Administrator/in geändert.\n"
-            ),
-            Config::get()->UNI_NAME_CLEAN
-        );
-
-        // send mail
-        StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject, $mailbody);
-
-        restoreLanguage();
-
-        StudipLog::log('USER_NEWPWD', $this->user_data['auth_user_md5.user_id']);
-
-        return true;
-    }
-}
diff --git a/lib/classes/UserManagement.php b/lib/classes/UserManagement.php
new file mode 100644
index 0000000..015e6cd
--- /dev/null
+++ b/lib/classes/UserManagement.php
@@ -0,0 +1,1353 @@
+<?php
+# Lifter007: TODO
+/**
+ * UserManagement.class.php
+ *
+ * Management for the Stud.IP global users
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @author      Stefan Suchi <suchi@data-quest>
+ * @author      Suchi & Berg GmbH <info@data-quest.de>
+ * @copyright   2009 Stud.IP
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL Licence 2
+ * @category    Stud.IP
+ */
+
+// Imports
+require_once 'lib/statusgruppe.inc.php';    // remove user from statusgroups
+require_once 'lib/messaging.inc.php';   // remove messages send or recieved by user
+require_once 'lib/object.inc.php';
+
+/**
+ * UserManagement.class.php
+ *
+ * Management for the Stud.IP global users
+ *
+ */
+class UserManagement
+{
+    private $user;
+    private $validator;
+    private $user_data;
+
+    public $msg;
+
+    private static $pwd_hasher;
+
+    public static function getPwdHasher()
+    {
+        if (self::$pwd_hasher === null) {
+            self::$pwd_hasher = new PasswordHash(8, Config::get()->PHPASS_USE_PORTABLE_HASH);
+        }
+        return self::$pwd_hasher;
+    }
+
+    /**
+    * Constructor
+    *
+    * Pass nothing to create a new user, or the user_id from an existing user to change or delete
+    * @param    string  $user_id    the user which should be retrieved
+    */
+    public function __construct($user_id = false)
+    {
+        $this->validator = new email_validation_class();
+        $this->validator->timeout = 10;                 // How long do we wait for response of mailservers?
+        $this->getFromDatabase($user_id);
+    }
+
+    public function __get($attr)
+    {
+        if ($attr === 'user_data') {
+            return $this->user_data;
+        }
+    }
+
+    public function __set($attr, $value)
+    {
+        if ($attr === 'user_data') {
+            if (!is_array($value)) {
+                throw new InvalidArgumentException('user_data only accepts array');
+            }
+            return $this->user_data->setData($value, true);
+        }
+    }
+
+    /**
+    * load user data from database into internal array
+    *
+    * @param    string  $user_id    the user which should be retrieved
+    */
+    public function getFromDatabase($user_id)
+    {
+        $this->user = User::toObject($user_id);
+        if (!$this->user) {
+            $this->user = new User();
+        }
+        $this->user_data = new UserDataAdapter($this->user);
+    }
+
+    /**
+    * store user data from internal array into database
+    *
+    * @access   private
+    * @return   bool all data stored?
+    */
+    private function storeToDatabase()
+    {
+        if ($this->user->isNew()) {
+            if ($this->user->store()) {
+                StudipLog::log('USER_CREATE', $this->user->id, null, implode(';', $this->user->toArray('username vorname nachname perms email')));
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        $nperms = [
+            'user' => 0,
+            'autor' => 1,
+            'tutor' => 2,
+            'dozent' => 3
+        ];
+
+        if ($this->user->isDirty('perms')) {
+            if ($this->user->perms === 'dozent' && in_array($this->user->getPristineValue('perms'), ['user','autor','tutor'])) {
+                $this->logInstUserDel($this->user->id, "inst_perms = 'user'");
+                $this->user->institute_memberships->unsetBy('inst_perms', 'user');
+                // make user visible globally if dozent may not be invisible (StEP 00158)
+                if (Config::get()->DOZENT_ALWAYS_VISIBLE && $this->user->visible !== 'never') {
+                    $this->user->visible = 'yes';
+                }
+                if ($nperms[$this->user->perms] < $nperms[$this->user->getPristineValue('perms')]) {
+                    $old_status = [];
+                    foreach ($nperms as $status => $n) {
+                        if ($n > $nperms[$this->user->perms] && $n <= $nperms[$this->user->getPristineValue('perms')]) {
+                            $old_status[] = $status;
+                        }
+                    }
+                    $new_status =  $this->user->perms;
+                    CourseMember::findEachBySQL(
+                        function (CourseMember $cm) use ($new_status) {
+                            $cm->status = $new_status;
+                            $cm->store();
+                        },
+                        'INNER JOIN seminare ON (seminare.Seminar_id = seminar_user.Seminar_id)
+                        WHERE seminar_user.user_id = ?
+                                AND seminar_user.status IN (?)
+                                AND seminare.status NOT IN (?)
+                        ',
+                        [
+                            $this->user->id,
+                            $old_status,
+                            studygroup_sem_types()
+                        ]
+                    );
+                }
+            }
+        }
+        foreach (words('username vorname nachname perms email title_front title_rear password') as $field) {
+            // logging
+            if ($this->user->isFieldDirty($field)) {
+                $old_value = $this->user->getPristineValue($field);
+                $value = $this->user->getValue($field);
+                switch ($field) {
+                    case 'username':
+                        StudipLog::log('USER_CHANGE_USERNAME', $this->user->id, null, "{$old_value} -> {$value}");
+                        break;
+                    case 'vorname':
+                        StudipLog::log('USER_CHANGE_NAME', $this->user->id, null, "Vorname: {$old_value} -> {$value}");
+                        break;
+                    case 'nachname':
+                        StudipLog::log('USER_CHANGE_NAME', $this->user->id, null, "Nachname: {$old_value} -> {$value}");
+                        break;
+                    case 'perms':
+                        StudipLog::log('USER_CHANGE_PERMS', $this->user->id, null, "{$old_value} -> {$value}");
+                        break;
+                    case 'email':
+                        StudipLog::log('USER_CHANGE_EMAIL', $this->user->id, null, "{$old_value} -> {$value}");
+                        break;
+                    case 'title_front':
+                        StudipLog::log('USER_CHANGE_TITLE', $this->user->id, null, "title_front: {$old_value} -> {$value}");
+                        break;
+                    case 'title_rear':
+                        StudipLog::log('USER_CHANGE_TITLE', $this->user->id, null, "title_rear: {$old_value} -> {$value}");
+                    case 'password':
+                        StudipLog::log('USER_CHANGE_PASSWORD', $this->user->id, null, "password: {$old_value} -> {$value}");
+                        break;
+                }
+            }
+        }
+
+        $changed = $this->user->store();
+        return (bool) $changed;
+    }
+
+
+    /**
+    * generate a secure password of $length characters [a-z0-9]
+    *
+    * @param    integer $length number of characters
+    * @return   string password
+    */
+    public function generate_password($length)
+    {
+        $pass = "";
+        mt_srand((double) microtime() * 1000000);
+        for ($i = 1; $i <= $length; $i++) {
+            $temp = mt_rand() % 36;
+            if ($temp < 10) {
+                $temp += 48;     // 0 = chr(48), 9 = chr(57)
+            } else {
+                $temp += 87;     // a = chr(97), z = chr(122)
+            }
+            $pass .= chr($temp);
+        }
+        return $pass;
+    }
+
+
+    /**
+    * Check if Email-Adress is valid and reachable
+    *
+    * @param    string  Email-Adress to check
+    * @return   bool Email-Adress valid and reachable?
+    */
+    private function checkMail($Email)
+    {
+        // Adress correct?
+        if (!$this->validator->ValidateEmailAddress($Email)) {
+            $this->msg .= 'error§' . _('E-Mail-Adresse syntaktisch falsch!') . '§';
+            return false;
+        }
+
+        // E-Mail reachable?
+        if (!$this->validator->ValidateEmailHost($Email)) {
+            // Mailserver nicht erreichbar, ablehnen
+            $this->msg .= 'error§' . _('Mailserver ist nicht erreichbar!') . '§';
+            return false;
+        }
+
+        if (!$this->validator->ValidateEmailBox($Email)) {
+            // Nutzer unbekannt, ablehnen
+            $this->msg .= 'error§' . sprintf(_('E-Mail an <em>%s</em> ist nicht zustellbar!'), $Email) . '§';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+    * Create a new studip user with the given parameters
+    *
+    * @param    array   structure: array('string table_name.field_name'=>'string value')
+    * @return   bool Creation successful?
+    */
+    public function createNewUser($newuser)
+    {
+        global $perm;
+
+        // Do we have permission to do so?
+        if (!$perm->have_perm('admin')) {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts anzulegen.') . '§';
+            return false;
+        }
+
+        if (!$perm->is_fak_admin() && $newuser['auth_user_md5.perms'] === 'admin') {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Admin-Accounts</em> anzulegen.') . '§';
+            return false;
+        }
+
+        if (!$perm->have_perm('root') && $newuser['auth_user_md5.perms'] === 'root') {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Root-Accounts</em> anzulegen.') . '§';
+            return false;
+        }
+
+        // Do we have all necessary data?
+        if (empty($newuser['auth_user_md5.username']) || empty($newuser['auth_user_md5.perms']) || empty($newuser['auth_user_md5.Email'])) {
+            $this->msg .= 'error§' . _('Bitte geben Sie <em>Username</em>, <em>Status</em> und <em>E-Mail</em> an!') . '§';
+            return false;
+        }
+
+        // Is the username correct?
+        if (!$this->validator->ValidateUsername($newuser['auth_user_md5.username'])) {
+            $this->msg .= 'error§' .  _('Der gewählte Benutzername ist zu kurz oder enthält unzulässige Zeichen!') . '§';
+            return false;
+        }
+
+        // Can we reach the email?
+        if (!$this->checkMail($newuser['auth_user_md5.Email'])) {
+            return false;
+        }
+
+        if (!$newuser['auth_user_md5.auth_plugin']) {
+            $newuser['auth_user_md5.auth_plugin'] = 'standard';
+        }
+
+        // Store new values in internal array
+        $this->getFromDatabase(null);
+        $this->user_data->setData($newuser);
+
+        if ($this->user_data['auth_user_md5.auth_plugin'] === 'standard') {
+            $password = $this->generate_password(8);
+            $this->user_data['auth_user_md5.password'] = self::getPwdHasher()->HashPassword($password);
+        }
+
+        // Does the user already exist?
+        // NOTE: This should be a transaction, but it is not...
+        $temp = User::findByUsername($newuser['auth_user_md5.username']);
+        if ($temp) {
+            $this->msg .= 'error§' . sprintf(_('BenutzerIn <em>%s</em> ist schon vorhanden!'), $newuser['auth_user_md5.username']) . '§';
+            return false;
+        }
+
+        if (!$this->storeToDatabase()) {
+            $this->msg .= 'error§' . sprintf(_('BenutzerIn "%s" konnte nicht angelegt werden.'), $newuser['auth_user_md5.username']) . '§';
+            return false;
+        }
+
+        $this->msg .= 'msg§' . sprintf(_('BenutzerIn "%s" angelegt.'), $newuser['auth_user_md5.username']) . '§';
+
+        // Automated entering new users, based on their status (perms)
+        $result = AutoInsert::instance()->saveUser($this->user_data['auth_user_md5.user_id'], $this->user_data['auth_user_md5.perms']);
+
+        foreach ($result['added'] as $item) {
+            $this->msg .= 'msg§' . sprintf(_('Das automatische Eintragen in die Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
+        }
+        foreach ($result['removed'] as $item) {
+            $this->msg .= 'msg§' . sprintf(_('Das automatische Austragen aus der Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
+        }
+
+        // include language-specific subject and mailbody
+        $user_language = $this->user_data['user_info.preferred_language'] ?: Config::get()->DEFAULT_LANGUAGE;
+
+        // send mail with password generation link
+        self::sendPasswordMail($this->user, true);
+        $this->msg .= 'msg§' . _('Es wurde eine Mail mit Anweisungen zum Setzen des Passworts durch die/den Nutzer/in verschickt.') . '§';
+
+        // add default visibility settings
+        Visibility::createDefaultCategories($this->user_data['auth_user_md5.user_id']);
+
+        return true;
+    }
+
+    /**
+     * Create a new preliminary studip user with the given parameters
+     *
+     * @param    array   structure: array('string table_name.field_name'=>'string value')
+     * @return   bool Creation successful?
+     */
+    public function createPreliminaryUser($newuser)
+    {
+        global $perm;
+
+        $this->getFromDatabase(null);
+        $this->user_data->setData($newuser);
+        // Do we have permission to do so?
+        if (!$perm->have_perm('admin')) {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts anzulegen.') . '§';
+            return false;
+        }
+        if (in_array($this->user->perms, words('root admin'))) {
+            $this->msg .= 'error§' . _('Es können keine vorläufigen Administrationsaccounts angelegt werden.') . '§';
+            return false;
+        }
+        if (!$this->user->id) {
+            $this->user->setId($this->user->getNewId());
+        }
+        if (!$this->user->username) {
+            $this->user->username = $this->user->id;
+        }
+        $this->user->auth_plugin = null;
+        $this->user->visible = 'never';
+
+        // Do we have all necessary data?
+        if (empty ($this->user->perms) || empty ($this->user->vorname) || empty ($this->user->nachname)) {
+            $this->msg .= 'error§' . _('Bitte geben Sie <em>Status</em>, <em>Vorname</em> und <em>Nachname</em> an!') . '§';
+            return false;
+        }
+
+        // Is the username correct?
+        if (!$this->validator->ValidateUsername($this->user->username)) {
+            $this->msg .= 'error§' .  _('Der gewählte Benutzername ist zu kurz oder enthält unzulässige Zeichen!') . '§';
+            return false;
+        }
+
+        // Does the user already exist?
+        // NOTE: This should be a transaction, but it is not...
+        $temp = User::findByUsername($this->user->username);
+        if ($temp) {
+            $this->msg .= 'error§' . sprintf(_('BenutzerIn <em>%s</em> ist schon vorhanden!'), $this->user->username) . '§';
+            return false;
+        }
+
+        if (!$this->storeToDatabase()) {
+            $this->msg .= 'error§' . sprintf(_('BenutzerIn "%s" konnte nicht angelegt werden.'), $this->user->username) . '§';
+            return false;
+        }
+
+        $this->msg .= 'msg§' . sprintf(_('BenutzerIn "%s" (vorläufig) angelegt.'), $this->user->username) . '§';
+
+        // add default visibility settings
+        Visibility::createDefaultCategories($this->user->id);
+
+        return true;
+    }
+
+    /**
+    * Change an existing studip user according to the given parameters
+    *
+    * @param    array   structure: array('string table_name.field_name'=>'string value')
+    * @return   bool Change successful?
+    */
+    public function changeUser($newuser)
+    {
+        global $perm;
+
+        // Do we have permission to do so?
+        if (!$perm->have_perm('admin')) {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts zu verändern.') . '§';
+            return false;
+        }
+
+        if (!$perm->is_fak_admin() && $newuser['auth_user_md5.perms'] === 'admin') {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Admin-Accounts</em> anzulegen.') . '§';
+            return false;
+        }
+
+        if (!$perm->have_perm('root') && $newuser['auth_user_md5.perms'] === 'root') {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Root-Accounts</em> anzulegen.') . '§';
+            return false;
+        }
+
+        if (!$perm->have_perm('root')) {
+            if (!$perm->is_fak_admin() && $this->user_data['auth_user_md5.perms'] === 'admin') {
+                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Admin-Accounts</em> zu verändern.') . '§';
+                return false;
+            }
+
+            if ($this->user_data['auth_user_md5.perms'] === 'root') {
+                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> zu verändern.') . '§';
+                return false;
+            }
+
+            if ($perm->is_fak_admin() && $this->user_data['auth_user_md5.perms'] === 'admin') {
+                if (!$this->adminOK()) {
+                    $this->msg .= 'error§' . _('Sie haben keine Berechtigung diesen Admin-Account zu verändern.') . '§';
+                    return false;
+                }
+            }
+        }
+
+        // active dozent? (ignore the studygroup guys)
+        $status = studygroup_sem_types();
+
+        if (empty($status)) {
+            $count = 0;
+        } else {
+            $query = "SELECT COUNT(*)
+                      FROM seminar_user AS su
+                      LEFT JOIN seminare AS s USING (Seminar_id)
+                      WHERE su.user_id = ?
+                        AND s.status NOT IN (?)
+                        AND su.status = 'dozent'
+                        AND (SELECT COUNT(*) FROM seminar_user su2 WHERE Seminar_id = su.Seminar_id AND su2.status = 'dozent') = 1
+                      GROUP BY user_id";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $this->user_data['auth_user_md5.user_id'],
+                $status,
+            ]);
+            $count = $statement->fetchColumn();
+        }
+        if ($count && isset($newuser['auth_user_md5.perms']) && $newuser['auth_user_md5.perms'] !== 'dozent') {
+            $this->msg .= 'error§' . sprintf(_('Der Benutzer <em>%s</em> ist alleiniger Lehrperson in %s aktiven Veranstaltungen und kann daher nicht in einen anderen Status versetzt werden!'), $this->user_data['auth_user_md5.username'], $count) . '§';
+            return false;
+        }
+
+        // active admin?
+        if ($this->user_data['auth_user_md5.perms'] === 'admin' && $newuser['auth_user_md5.perms'] !== 'admin') {
+            // count number of institutes where the user is admin
+            $query = "SELECT COUNT(*)
+                      FROM user_inst
+                      WHERE user_id = ? AND inst_perms = 'admin'
+                      GROUP BY Institut_id";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+
+            // if there are institutes with admin-perms, add error-message and deny change
+            if ($count = $statement->fetchColumn()) {
+                $this->msg .= 'error§'. sprintf(_('Der Benutzer <em>%s</em> ist Admin in %s Einrichtungen und kann daher nicht in einen anderen Status versetzt werden!'), $this->user_data['auth_user_md5.username'], $count) . '§';
+                return false;
+            }
+        }
+
+        // Is the username correct?
+        if (isset($newuser['auth_user_md5.username'])) {
+            if ($this->user_data['auth_user_md5.username'] != $newuser['auth_user_md5.username']) {
+                if (!$this->validator->ValidateUsername($newuser['auth_user_md5.username'])) {
+                    $this->msg .= 'error§' . _('Der gewählte Benutzername ist zu kurz oder enthält unzulässige Zeichen!') . '§';
+                    return false;
+                }
+                $check_uname = StudipAuthAbstract::CheckUsername($newuser['auth_user_md5.username']);
+                if ($check_uname['found']) {
+                    $this->msg .= 'error§' . _('Der Benutzername wird bereits von einem anderen Benutzer verwendet. Bitte wählen Sie einen anderen Benutzernamen!') . '§';
+                    return false;
+                } else {
+                    //$this->msg .= "info§" . $check_uname['error'] ."§";
+                }
+            } else
+            unset($newuser['auth_user_md5.username']);
+        }
+
+        // Can we reach the email?
+        if (isset($newuser['auth_user_md5.Email'])) {
+            if (!$this->checkMail($newuser['auth_user_md5.Email'])) {
+                return false;
+            }
+        }
+
+        // Store changed values in internal array if allowed
+        $old_perms = $this->user_data['auth_user_md5.perms'];
+        $auth_plugin = $this->user_data['auth_user_md5.auth_plugin'];
+        foreach ($newuser as $key => $value) {
+            if (!StudipAuthAbstract::CheckField($key, $auth_plugin)) {
+                $this->user_data[$key] = $value;
+            } else if ($this->user_data[$key] !== $value) {
+                $this->msg .= 'error§' .  sprintf(_('Das Feld <em>%s</em> können Sie nicht ändern!'), $key) . '§';
+                return false;
+            }
+        }
+
+        if (!$this->storeToDatabase()) {
+            $this->msg .= 'info§' . _('Es wurden keine Veränderungen der Grunddaten vorgenommen.') . '§';
+            return true;
+        }
+
+        $this->msg .= 'msg§' . sprintf(_('Benutzer "%s" verändert.'), $this->user_data['auth_user_md5.username']) . '§';
+        if ($auth_plugin !== null) {
+            // Automated entering new users, based on their status (perms)
+            $result = AutoInsert::instance()->saveUser($this->user_data['auth_user_md5.user_id'], $newuser['auth_user_md5.perms']);
+            foreach ($result['added'] as $item) {
+                $this->msg .= 'msg§' . sprintf(_('Das automatische Eintragen in die Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
+            }
+            foreach ($result['removed'] as $item) {
+                $this->msg .= 'msg§' . sprintf(_('Das automatische Austragen aus der Veranstaltung <em>%s</em> wurde durchgeführt.'), $item) . '§';
+            }
+            // include language-specific subject and mailbody
+            $user_language = getUserLanguagePath($this->user_data['auth_user_md5.user_id']);
+            $Zeit = strftime('%x, %X');
+
+            // TODO: This should be refactored so that the included file returns an array
+            include "locale/{$user_language}/LC_MAILS/change_mail.inc.php"; // Defines $subject and $mailbody
+
+            // send mail
+            StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject ?? '', $mailbody ?? '');
+        }
+        // Upgrade to admin or root?
+        if (in_array($newuser['auth_user_md5.perms'], ['admin', 'root'])) {
+            $this->re_sort_position_in_seminar_user();
+
+            // delete all seminar entries
+            $course_member = SimpleCollection::createFromArray(
+                CourseMember::findByUser($this->user_data['auth_user_md5.user_id'])
+            );
+            $seminar_ids = $course_member->pluck('seminar_id');
+            $count = 0;
+            foreach($course_member as $member) {
+                $member->delete();
+                $count++;
+            }
+            if ($count) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Veranstaltungen gelöscht.'), $count) . '§';
+                array_map('AdmissionApplication::addMembers', $seminar_ids);
+            }
+            // delete all entries from waiting lists
+            $admission_members = SimpleCollection::createFromArray(
+                AdmissionApplication::findByUser($this->user_data['auth_user_md5.user_id'])
+            );
+            $seminar_ids = $admission_members->pluck('seminar_id');
+            $count = 0;
+            foreach ($admission_members as $admission_member) {
+                $admission_member->delete();
+                $count++;
+            }
+            if ($count) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Wartelisten gelöscht.'), $count) . '§';
+                array_map('AdmissionApplication::addMembers', $seminar_ids);
+            }
+            // delete 'Studiengaenge'
+            if ($count = UserStudyCourse::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']])) {
+                $this->msg .= 'info§' . sprintf(_('%s Zuordnungen zu Studiengängen gelöscht.'), $count) . '§';
+            }
+        }
+
+        if ($newuser['auth_user_md5.perms'] === 'admin') {
+
+            $this->logInstUserDel($this->user_data['auth_user_md5.user_id'], "inst_perms != 'admin'");
+            $query = "DELETE FROM user_inst WHERE user_id = ? AND inst_perms != 'admin'";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus MitarbeiterInnenlisten gelöscht.'), $count) . '§';
+            }
+        }
+        if ($newuser['auth_user_md5.perms'] === 'root') {
+            $this->logInstUserDel($this->user_data['auth_user_md5.user_id']);
+
+            $query = "DELETE FROM user_inst WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus MitarbeiterInnenlisten gelöscht.'), $count) . '§';
+            }
+        }
+
+        return true;
+    }
+
+    private function logInstUserDel($user_id, $condition = null)
+    {
+        $query = "SELECT Institut_id FROM user_inst WHERE user_id = ?";
+        if (isset($condition)) {
+            $query .= ' AND ' . $condition;
+        }
+
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_id]);
+        while ($institute_id = $statement->fetchColumn()) {
+            StudipLog::log('INST_USER_DEL', $institute_id, $user_id);
+        }
+    }
+
+    /**
+    * Mail a password generation link to the user
+    *
+    * @return   bool Password change successful?
+    */
+    public function setPassword()
+    {
+        global $perm;
+
+        // Do we have permission to do so?
+        if (!$perm->have_perm('admin')) {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts zu verändern.') . '§';
+            return false;
+        }
+
+        if (!$perm->have_perm('root')) {
+            if ($this->user_data['auth_user_md5.perms'] === "root") {
+                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> zu verändern.') . '§';
+                return false;
+            }
+            if ($perm->is_fak_admin() && $this->user_data['auth_user_md5.perms'] === 'admin') {
+                if (!$this->adminOK()) {
+                    $this->msg .= 'error§' . _('Sie haben keine Berechtigung diesen Admin-Account zu verändern.') . '§';
+                    return false;
+                }
+            }
+        }
+
+        // Can we reach the email?
+        if (!$this->checkMail($this->user_data['auth_user_md5.Email'])) {
+            return false;
+        }
+
+        self::sendPasswordMail($this->user);
+
+        return true;
+    }
+
+    /**
+     * Send a mail to the user denoted by the passed user-object with a link
+     * to reset the password. For admin, root and non-standard-auth a notification
+     * is sent instead.
+     *
+     * @param  User $user
+     *
+     * @return void
+     */
+    public static function sendPasswordMail($user, $new = false)
+    {
+        setTempLanguage($user->user_id);
+
+        // always generate a token, so root, admin and all other users profit from the abuse protection
+        if ($new) {
+            $expiration_in_hours = 24;
+            $spoken_expiration = _('24 Stunden');
+        } else {
+            $expiration_in_hours = 7 * 24;
+            $spoken_expiration = _('eine Woche');
+        }
+        $token = Token::create($expiration_in_hours * 60 * 60, $user->id, true);
+
+        // new users alawys receive a link to generate a password
+        if ($new) {
+            $subject = sprintf(
+                _("[Stud.IP - %s] Es wurde ein Zugang für sie erstellt - Setzen sie ein Passwort"),
+                Config::get()->UNI_NAME_CLEAN
+            );
+
+            $mailbody = sprintf(
+                _("Dies ist eine Bestätigungsmail des Stud.IP-Systems\n"
+                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %1\$s -\n\n"
+                    ."Es wurde für sie ein Zugang zum System erstellt, Ihr Nutzername lautet:\n\n"
+                    ."%2\$s\n\n"
+                    ."Um den Zugang nutzen zu können, müssen sie ein Passwort setzen.\n"
+                    ."Öffnen Sie dafür bitte folgenden Link\n\n"
+                    ."%3\$s\n\n"
+                    ."in Ihrem Browser.\n\n"
+                    ."Der Link ist %4\$s (bis %5\$s) gültig.\n\n"
+                    ."Wahrscheinlich unterstützt Ihr E-Mail-Programm ein einfaches Anklicken des Links.\n"
+                    ."Ansonsten müssen Sie Ihren Browser öffnen und den Link komplett in die Zeile\n"
+                    ."\"Location\" oder \"URL\" kopieren.\n\n"
+                ),
+                Config::get()->UNI_NAME_CLEAN,
+                $user->username,
+                $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/new_password/set/'. $token->token .'?cancel_login=1',
+                $spoken_expiration,
+                strftime('%x %X', $token->expiration)
+            );
+        } else
+
+        // only users with auth-type standard cann reset their password
+        if ($user->auth_plugin !== 'standard') {
+
+            // inform user, that their password cannot be reset via mail
+            $subject = sprintf(
+                _("[Stud.IP - %s] Passwortänderung angefordert"),
+                Config::get()->UNI_NAME_CLEAN
+            );
+
+            $mailbody = sprintf(
+                _("Dies ist eine Informationsmail des Stud.IP-Systems\n"
+                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
+                    . "Sie haben einen Link angefordert\n"
+                    . "um das Passwort zurückzusetzen.\n"
+                    . "Dies ist aber für den mit dieser Mail \n"
+                    . "verknüpften Account so nicht möglich.\n\n"
+                    . "Wenden sie sich bitte stattdessen an\n%s"
+                ),
+                Config::get()->UNI_NAME_CLEAN,
+                $GLOBALS['UNI_CONTACT']
+            );
+
+        } else {
+
+            $subject = sprintf(
+                _("[Stud.IP - %s] Neues Passwort setzen"),
+                Config::get()->UNI_NAME_CLEAN
+            );
+
+            $mailbody = sprintf(
+                _("Dies ist eine Bestätigungsmail des Stud.IP-Systems\n"
+                    ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %1\$s -\n\n"
+                    ."Sie haben um die Zurücksetzung des Passwortes zu Ihrem Benutzernamen %5\$s gebeten.\n\n"
+                    ."Diese E-Mail wurde Ihnen zugesandt um sicherzustellen,\n"
+                    ."dass die angegebene E-Mail-Adresse tatsächlich Ihnen gehört.\n\n"
+                    ."Wenn Sie um die Zurücksetzung Ihres Passwortes gebeten haben,\n"
+                    ."dann öffnen Sie bitte folgenden Link\n\n"
+                    ."%2\$s\n\n"
+                    ."in Ihrem Browser. Auf der Seite können Sie ein neues Passwort setzen.\n\n"
+                    ."Der Link ist %3\$s (bis %4\$s) gültig.\n\n"
+                    ."Wahrscheinlich unterstützt Ihr E-Mail-Programm ein einfaches Anklicken des Links.\n"
+                    ."Ansonsten müssen Sie Ihren Browser öffnen und den Link komplett in die Zeile\n"
+                    ."\"Location\" oder \"URL\" kopieren.\n\n"
+                    ."Falls Sie nicht diese Mail nicht angefordert haben\n"
+                    ."oder überhaupt nicht wissen, wovon hier die Rede ist,\n"
+                    ."dann hat jemand Ihre E-Mail-Adresse fälschlicherweise verwendet!\n"
+                    ."Ignorieren Sie in diesem Fall diese E-Mail. Es werden dann keine\n"
+                    ."Änderungen an Ihren Zugangsdaten vorgenommen.\n\n"
+                ),
+                Config::get()->UNI_NAME_CLEAN,
+                $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'dispatch.php/new_password/set/'. $token->token .'?cancel_login=1',
+                $spoken_expiration,
+                strftime('%x %X', $token->expiration),
+                $user->username
+            );
+        }
+
+        StudipMail::sendMessage($user->email, $subject, $mailbody);
+
+        restoreLanguage();
+    }
+
+    /**
+    * Delete an existing user from the database and tidy up
+    *
+    * @param $delete_documents bool delete all documents in course context belonging to the user
+    * @param $delete_content_from_course bool delete all course content belonging to the user
+    * @param $delete_personal_documents bool delete all personal documents belonging to the user
+    * @param $delete_personal_content bool delete all personal content belonging to the user
+    * @param $delete_names bool delete all names identifying the user
+    * @param $delete_memberships bool delete all memberships of the user
+    * @param bool $send_email_notification bool send an email that the account has been deleted
+    * @return   bool Removal successful?
+    */
+    public function deleteUser(
+        bool $delete_documents = true,
+        bool $delete_content_from_course = true,
+        bool $delete_personal_documents = true,
+        bool $delete_personal_content = true,
+        bool $delete_names = true,
+        bool $delete_memberships = true,
+        bool $send_email_notification = true,
+        bool $delete_courseware = true
+    ): bool {
+        global $perm;
+
+        // Do we have permission to do so?
+        if (!$perm->have_perm('admin')) {
+            $this->msg .= 'error§' . _('Sie haben keine Berechtigung Accounts zu löschen.') . '§';
+            return FALSE;
+        }
+
+        if (!$perm->have_perm('root')) {
+            if ($this->user_data['auth_user_md5.perms'] === 'root') {
+                $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> zu löschen.') . '§';
+                return false;
+            }
+            if ($this->user_data['auth_user_md5.perms'] === 'admin' && !$this->adminOK()) {
+                $this->msg .= 'error§' . _('Sie haben keine Berechtigung diesen Admin-Account zu löschen.') . '§';
+                return false;
+            }
+        }
+
+        // active dozent?
+        $query = "SELECT COUNT(*)
+                  FROM (
+                      SELECT 1
+                      FROM `seminar_user` AS `su1`
+                      -- JOIN seminar_user to check for other teachers
+                      INNER JOIN `seminar_user` AS `su2`
+                        ON (`su1`.`seminar_id` = `su2`.`seminar_id` AND `su2`.`status` = 'dozent')
+                      -- JOIN seminare to check the status for studygroup mode
+                      INNER JOIN `seminare`
+                        ON (`su1`.`seminar_id` = `seminare`.`seminar_id`)
+                      WHERE `su1`.`user_id` = :user_id
+                        AND `su1`.`status` = 'dozent'
+                        AND `seminare`.`status` NOT IN (
+                            -- Select all status ids for studygroups
+                            SELECT `id`
+                            FROM `sem_classes`
+                            WHERE `studygroup_mode` = 1
+                        )
+                      GROUP BY `su1`.`seminar_id`
+                      HAVING COUNT(*) = 1
+                      ORDER BY NULL
+                  ) AS `sub`";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':user_id', $this->user_data['auth_user_md5.user_id']);
+        $statement->execute();
+        $active_count = $statement->fetchColumn() ?: 0;
+
+        if ($active_count && $delete_memberships) {
+            $this->msg .= 'error§' . sprintf(_('<em>%s</em> ist Lehrkraft in %s aktiven Veranstaltungen und kann daher nicht gelöscht werden.'), $this->user_data['auth_user_md5.username'], $active_count) . '§';
+            return false;
+        //founder of studygroup?
+        } elseif (Config::get()->STUDYGROUPS_ENABLE) {
+            $status = studygroup_sem_types();
+
+            if (empty($status)) {
+                $group_ids = [];
+            } else {
+                $query = "SELECT Seminar_id
+                          FROM seminare AS s
+                          LEFT JOIN seminar_user AS su USING (Seminar_id)
+                          WHERE su.status = 'dozent' AND su.user_id = ? AND s.status IN (?)";
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute([
+                    $this->user_data['auth_user_md5.user_id'],
+                    $status,
+                ]);
+                $group_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+            }
+
+            foreach ($group_ids as $group_id) {
+                $sem = Seminar::GetInstance($group_id);
+                if (StudygroupModel::countMembers($group_id) > 1) {
+                    // check whether there are tutors or even autors that can be promoted
+                    $tutors = $sem->getMembers('tutor');
+                    $autors = $sem->getMembers('autor');
+                    if (count($tutors) > 0) {
+                        $new_founder = current($tutors);
+                        StudygroupModel::promote_user($new_founder['username'], $sem->getId(), 'dozent');
+                        continue;
+                    }
+                    // if not promote an autor
+                    elseif (count($autors) > 0) {
+                        $new_founder = current($autors);
+                        StudygroupModel::promote_user($new_founder['username'], $sem->getId(), 'dozent');
+                        continue;
+                    }
+                // since no suitable successor was found, we are allowed to remove the studygroup
+                } else {
+                    $sem->delete();
+                }
+                unset($sem);
+            }
+        }
+
+        // store user preferred language for sending mail
+        $user_language = getUserLanguagePath($this->user_data['auth_user_md5.user_id']);
+
+        // Load privacy plugins to ensure all event handlers can react to the
+        // UserDataDidRemove event
+        PluginEngine::getPlugins(PrivacyPlugin::class);
+
+        // delete user from instituts
+        $this->logInstUserDel($this->user_data['auth_user_md5.user_id']);
+
+        if ($delete_memberships) {
+            $query = "DELETE FROM user_inst WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus MitarbeiterInnenlisten gelöscht.'), $count) . '§';
+            }
+
+            // delete user from Statusgruppen
+            if ($count = StatusgruppeUser::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']])) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Funktionen / Gruppen gelöscht.'), $count) . '§';
+            }
+
+            // delete user from archiv
+            $query = "DELETE FROM archiv_user WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus den Zugriffsberechtigungen für das Archiv gelöscht.'), $count) . '§';
+            }
+
+            // delete 'Studiengaenge'
+            $query = "DELETE FROM user_studiengang WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%s Zuordnungen zu Studiengängen gelöscht.'), $count) . '§';
+            }
+
+            $this->re_sort_position_in_seminar_user();
+
+            // delete user from seminars (postings will be preserved)
+            $query = "DELETE FROM seminar_user WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge aus Veranstaltungen gelöscht.'), $count) . '§';
+            }
+
+            $query = "DELETE FROM `termin_related_persons` WHERE `user_id` = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if ($count = $statement->rowCount()) {
+                $this->msg .= 'info§' . sprintf(_('%u Terminzuordnungen gelöscht.'), $count) . '§';
+            }
+
+            // delete visibility settings
+            Visibility::removeUserPrivacySettings($this->user_data['auth_user_md5.user_id']);
+
+            // delete deputy entries if necessary
+            $query = "DELETE FROM deputies WHERE ? IN (user_id, range_id)";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            $deputyEntries = $statement->rowCount();
+            if ($deputyEntries) {
+                $this->msg .= 'info§' . sprintf(_('%s Einträge in den Vertretungseinstellungen gelöscht.'), $deputyEntries) . '§';
+            }
+
+            // delete all remaining user data
+            $queries = [
+                "DELETE FROM user_userdomains WHERE user_id = ?",
+            ];
+            foreach ($queries as $query) {
+                DBManager::get()->execute($query, [$this->user_data['auth_user_md5.user_id']]);
+            }
+            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'memberships');
+        }
+
+        // delete documents of this user
+        if ($delete_documents) {
+            $db_filecount = FileRef::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            if ($db_filecount > 0) {
+                $this->msg .= 'info§' . sprintf(_('%s Dateien aus Veranstaltungen und Einrichtungen gelöscht.'), $db_filecount) . '§';
+            }
+            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'course_documents');
+        }
+
+        // always delete personal courseware elements of this user
+        \Courseware\Unit::deleteBySQL('range_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+        \Courseware\UserDataField::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+        \Courseware\UserProgress::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+        \Courseware\Bookmark::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+        \Courseware\Task::deleteBySQL(
+            '`solver_id` = ? AND `solver_type`= "autor"',
+            [$this->user_data['auth_user_md5.user_id']]
+        );
+        // delete courseware elements in courses of this user
+        if ($delete_courseware) {
+            \Courseware\Unit::deleteBySQL('creator_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\StructuralElement::deleteBySQL('owner_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\StructuralElementFeedback::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\StructuralElementComment::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\Container::deleteBySQL('owner_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\Block::deleteBySQL('owner_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\BlockFeedback::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+            \Courseware\BlockComment::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']]);
+        }
+
+        // delete all remaining user data in course context if option selected
+        if ($delete_content_from_course) {
+            $queries = [
+                "DELETE FROM questionnaires WHERE user_id = ?",
+                "DELETE FROM questionnaire_answers WHERE user_id = ?",
+                "DELETE FROM questionnaire_assignments WHERE user_id = ?",
+                "DELETE FROM questionnaire_anonymous_answers WHERE user_id = ?",
+                "DELETE FROM etask_assignment_attempts WHERE user_id = ?",
+                "DELETE FROM etask_responses WHERE user_id = ?",
+                "DELETE FROM etask_tasks WHERE user_id = ?",
+                "DELETE FROM etask_tests WHERE user_id = ?",
+            ];
+            foreach ($queries as $query) {
+                DBManager::get()->execute($query, [$this->user_data['auth_user_md5.user_id']]);
+            }
+            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'course_contents');
+        }
+
+        if ($delete_personal_documents) {
+            $user_folder = Folder::findTopFolder($this->user->id);
+            if ($user_folder) {
+                $this->msg .= 'info§' . _('Persönlicher Dateibereich gelöscht.') . '§';
+                $user_folder->delete();
+            }
+            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'personal_documents');
+        }
+
+        if ($delete_personal_content) {
+            $this->msg .= $this->deletePersonalData($this->user_data['auth_user_md5.user_id']);
+            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'personal_contents');
+        }
+
+        if ($delete_names) {
+            $query = "UPDATE auth_user_md5
+                      SET username = ?, Vorname = '', Nachname = '', Email = ''
+                      WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                md5($this->user_data['auth_user_md5.username'].uniqid('delete_user')),
+                $this->user_data['auth_user_md5.user_id']
+            ]);
+            if ($statement->rowCount() > 0) {
+                $this->msg .= 'info§' . _('Benutzername anonymisiert.') . '§';
+            }
+            NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'names');
+        }
+
+        if ($delete_personal_documents && $delete_personal_content && $delete_names && $delete_memberships) {
+            // Delete the user from resource property entries of type "user":
+            ResourceProperty::deleteBySQL(
+                "`property_id` IN (
+                    SELECT `property_id`
+                    FROM `resource_property_definitions`
+                    WHERE `type` = 'user'
+                )
+                AND `state` = :user_id",
+                ['user_id' => $this->user_data['auth_user_md5.user_id']]
+            );
+
+            // delete Stud.IP account
+            $query = "DELETE FROM user_info WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+
+            $query = "DELETE FROM auth_user_md5 WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+            if (!$statement->rowCount()) {
+                $this->msg .= 'error§<em>' . _('Fehler:') . '</em> ' . $query . '§';
+                return false;
+            } else {
+                $this->msg .= 'msg§' . sprintf(_('Benutzer "%s" gelöscht.'), $this->user_data['auth_user_md5.username']) . '§';
+            }
+            StudipLog::log('USER_DEL', $this->user_data['auth_user_md5.user_id'], null, sprintf('%s %s (%s)', $this->user_data['auth_user_md5.Vorname'], $this->user_data['auth_user_md5.Nachname'], $this->user_data['auth_user_md5.username'])); //log with Vorname Nachname (username) as info string
+
+            // Can we reach the email?
+            if (
+                $send_email_notification
+                && $this->checkMail($this->user_data['auth_user_md5.Email'])
+            ) {
+                // include language-specific subject and mailbody
+                $Zeit = strftime('%x, %X');
+
+                // TODO: This should be refactored so that the included file returns an array
+                include "locale/$user_language/LC_MAILS/delete_mail.inc.php"; // Defines $subject and $mailbody
+
+                // send mail
+                StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject ?? '', $mailbody ?? '');
+            }
+
+            // Remove plugin associations/activations
+            PluginManager::getInstance()->deactivateAllPluginsForRange(
+                'user',
+                $this->user_data['auth_user_md5.user_id']
+            );
+
+            // Trigger delete on sorm object which will fire notifications
+            //
+            // TODO: Remove everything from this method that would also be
+            //       deleted in User::delete() (TODO!!!)
+            $this->user->delete();
+
+            unset($this->user_data);
+        }
+
+        return true;
+    }
+
+    /**
+    * Delete personal userdata
+    *
+    * @param    string $user_id    the user which should be retrieved
+    * @return   string Removal messages
+    */
+    private function deletePersonalData($user_id)
+    {
+        $msg = '';
+
+        // delete the datafields
+        $localEntries = DataFieldEntry::removeAll($user_id);
+
+        // delete user from waiting lists
+        $query = "SELECT seminar_id FROM admission_seminar_user WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_id]);
+        $seminar_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+        $query = "DELETE FROM admission_seminar_user WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_id]);
+        if ($count = $statement->rowCount()) {
+            $msg .= 'info§' . sprintf(_('%s Einträge aus Wartelisten gelöscht.'), $count) . '§';
+            array_map('AdmissionApplication::addMembers', $seminar_ids);
+        }
+
+        // delete all personal news from this user
+        if ($count = StudipNews::DeleteNewsByAuthor($user_id)) {
+            $msg .= 'info§' . sprintf(_('%s Einträge aus den Ankündigungen gelöscht.'), $count) . '§';
+        }
+        if ($count = StudipNews::DeleteNewsRanges($user_id)) {
+            $msg .= 'info§' . sprintf(_('%s Verweise auf Ankündigungen gelöscht.'), $count) . '§';
+        }
+
+        //delete entry in news_rss_range
+        StudipNews::UnsetRssId($user_id);
+
+        // delete all private appointments of this user
+        if (Config::get()->CALENDAR_ENABLE) {
+            // delete private appointments (omit group appointments)
+            $count = CalendarDate::deleteBySQL(
+                '`id` IN (
+                    SELECT `id`
+                    FROM (
+                        SELECT `id`, COUNT(*)
+                        FROM `calendar_dates`
+                        JOIN `calendar_date_assignments`
+                          ON `calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`
+                        WHERE `calendar_dates`.`author_id` = :user_id
+                        GROUP BY `id`
+                        HAVING COUNT(*) = 1
+                        ORDER BY NULL
+                    ) AS `cal_date_delete`
+                )',
+                [':user_id' => $user_id]
+            );
+            // delete assignments to group appointments
+            $count += CalendarDateAssignment::deleteBySQL('`range_id` = ?', [$user_id]);
+            if ($count) {
+                $msg .= 'info§' . sprintf(_('%s Einträge aus den Terminen gelöscht.'), $count) . '§';
+            }
+        }
+
+        // delete all messages send or received by this user
+        $messaging = new messaging();
+        $messaging->delete_all_messages($user_id);
+
+        // delete user from all foreign adressbooks and empty own adressbook
+        $count = Contact::deleteBySQL('user_id = ?', [$user_id]);
+        if ($count > 0) {
+            $msg .= 'info§' . sprintf(_('%s Einträge aus Adressbüchern gelöscht.'), $count) . '§';
+        }
+        $count = Contact::deleteBySQL('owner_id = ?', [$user_id]);
+        if ($count) {
+            $msg .= 'info§' . sprintf(_('Adressbuch mit %d Einträgen gelöscht.'), $count) . '§';
+        }
+
+        // delete users groups
+        Statusgruppen::deleteBySQL('range_id = ?', [$user_id]);
+
+        // remove user from any groups
+        StatusgruppeUser::deleteBySQL('user_id = ?', [$user_id]);
+
+        // delete user config values
+        ConfigValue::deleteBySQL('range_id = ?', [$user_id]);
+
+        // delete all remaining user data
+        $queries = [
+            "DELETE FROM kategorien WHERE range_id = ?",
+            "DELETE FROM user_visibility WHERE user_id = ?",
+            "DELETE FROM user_online WHERE user_id = ?",
+            "DELETE FROM auto_insert_user WHERE user_id = ?",
+            "DELETE FROM roles_user WHERE userid = ?",
+            "DELETE FROM schedule WHERE user_id = ?",
+            "DELETE FROM schedule_seminare WHERE user_id = ?",
+            "DELETE FROM termin_related_persons WHERE user_id = ?",
+            "DELETE FROM priorities WHERE user_id = ?",
+            "DELETE FROM api_oauth_user_mapping WHERE user_id = ?",
+            "DELETE FROM api_user_permissions WHERE user_id = ?",
+            "DELETE FROM help_tour_user WHERE user_id = ?",
+            "DELETE FROM personal_notifications_user WHERE user_id = ?",
+            "DELETE FROM forum_abo_users WHERE user_id = ?",
+            "DELETE FROM forum_favorites WHERE user_id = ?",
+
+            "DELETE FROM comments WHERE user_id = ?",
+            "DELETE questionnaires FROM questionnaires LEFT JOIN questionnaire_assignments qa USING (`questionnaire_id`) WHERE qa.range_id = ?",
+            "DELETE questionnaire_answers FROM questionnaire_answers LEFT JOIN questionnaire_questions USING (`question_id`) LEFT JOIN questionnaire_assignments qa USING (`questionnaire_id`) WHERE qa.range_id = ?",
+            "DELETE questionnaire_anonymous_answers FROM questionnaire_anonymous_answers LEFT JOIN questionnaire_assignments qa USING (`questionnaire_id`) WHERE qa.range_id = ?",
+            "DELETE FROM questionnaire_assignments WHERE user_id = ?",
+            "DELETE etask_assignment_attempts FROM etask_assignment_attempts LEFT JOIN etask_assignments ea ON (`assignment_id` = ea.id) WHERE ea.range_type = 'user' AND user_id = ?",
+            "DELETE etask_responses FROM etask_responses LEFT JOIN etask_assignments ea ON (`assignment_id` = ea.id) WHERE ea.range_type = 'user' AND user_id = ?",
+            "DELETE etask_tasks FROM etask_tasks LEFT JOIN etask_test_tasks tt ON (etask_tasks.id = tt.task_id) LEFT JOIN etask_assignments ea ON (tt.`test_id` = ea.test_id) WHERE ea.range_type = 'user' AND  user_id = ?",
+            "DELETE etask_tests FROM etask_tests LEFT JOIN etask_assignments ea ON (`test_id` = ea.test_id) WHERE ea.range_type = 'user' AND user_id = ?",
+
+            "UPDATE forum_entries SET author = '' WHERE user_id = ?",
+            "UPDATE auth_user_md5 SET visible = 'never' WHERE user_id = ?",
+
+            "REPLACE INTO `user_info` (`user_id`, `hobby`, `lebenslauf`, `publi`, `schwerp`, `Home`, `privatnr`, `privatcell`, `privadr`, `score`, `geschlecht`, `mkdate`, `chdate`, `title_front`, `title_rear`, `preferred_language`, `smsforward_copy`, `smsforward_rec`, `email_forward`, `motto`, `lock_rule`) VALUES(?, '', '', '', '', '', '', '', '', 0, 0, 0, 0, '', '', NULL, 1, '', 0, '', '');"
+        ];
+        foreach ($queries as $query) {
+            DBManager::get()->execute($query, [$user_id]);
+        }
+
+        // Clean up orphaned items
+        $queries = [
+            "DELETE FROM personal_notifications WHERE personal_notification_id NOT IN (
+                SELECT personal_notification_id FROM personal_notifications_user
+            )",
+        ];
+        foreach ($queries as $query) {
+            DBManager::get()->exec($query);
+        }
+
+        object_kill_visits($user_id);
+        object_kill_views($user_id);
+
+        // delete picture
+        $avatar = Avatar::getAvatar($user_id);
+        if ($avatar->is_customized()) {
+            $avatar->reset();
+            $msg .= 'info§' . _('Bild gelöscht.') . '§';
+        }
+
+        //delete connected users
+        if (Config::get()->ELEARNING_INTERFACE_ENABLE) {
+            if (ELearningUtils::initElearningInterfaces()) {
+                foreach ($GLOBALS['connected_cms'] as $cms){
+                    if ($cms->auth_necessary && $cms->user instanceOf ConnectedUser) {
+                        $user_auto_create = $cms->USER_AUTO_CREATE;
+                        $cms->USER_AUTO_CREATE = false;
+                        $userclass = mb_strtolower(get_class($cms->user));
+                        $connected_user = new $userclass($cms->cms_type, $user_id);
+                        if ($connected_user->deleteUser() && $connected_user->is_connected) {
+                            $msg .= 'info§' . sprintf(_('Der verknüpfte Nutzer %s wurde im System %s gelöscht.'), $connected_user->login, $connected_user->cms_type) . '§';
+                        }
+                        $cms->USER_AUTO_CREATE = $user_auto_create;
+                    }
+                }
+            }
+        }
+
+        return $msg;
+    }
+
+    private function adminOK()
+    {
+        static $ok = null;
+
+        if ($ok === null) {
+            $query = "SELECT COUNT(a.Institut_id) = COUNT(c.inst_perms)
+                      FROM user_inst AS a
+                      LEFT JOIN Institute b ON (a.Institut_id = b.Institut_id AND b.Institut_id != b.fakultaets_id)
+                      LEFT JOIN user_inst AS c ON (b.fakultaets_id = c.Institut_id AND c.user_id = ?
+                                                  AND c.inst_perms = 'admin')
+                      WHERE a.user_id = ? AND a.inst_perms = 'admin'";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $GLOBALS['auth']->auth['uid'],
+                $this->user_data['auth_user_md5.user_id'],
+            ]);
+            $ok = $statement->fetchColumn();
+        }
+
+        return $ok;
+    }
+
+    private function re_sort_position_in_seminar_user()
+    {
+        $query = "SELECT Seminar_id, position, status
+                  FROM seminar_user
+                  WHERE user_id = ? AND status IN ('tutor', 'dozent')";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->user_data['auth_user_md5.user_id']]);
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            if ($row['status'] === 'tutor') {
+                CourseMember::resortMembership($row['Seminar_id'], (int)$row['position']);
+            } else if ($row['status'] === 'dozent') {
+                CourseMember::resortMembership($row['Seminar_id'], (int)$row['position'], 'dozent');
+            }
+        }
+    }
+
+    /**
+    * Change an existing user password
+    *
+    * @param string $password
+    * @return bool change successful?
+    */
+    public function changePassword($password)
+    {
+        $this->user_data['auth_user_md5.password'] = self::getPwdHasher()->HashPassword($password);
+        $this->storeToDatabase();
+
+        $this->msg .= 'msg§' . _('Das Passwort wurde neu gesetzt.') . '§';
+
+        // include language-specific subject and mailbody
+        setTempLanguage($this->user_data['auth_user_md5.user_id']);
+
+        $subject = sprintf(
+            _("[Stud.IP - %s] Passwortänderung"),
+            Config::get()->UNI_NAME_CLEAN
+        );
+
+        $mailbody = sprintf(
+            _("Dies ist eine Informationsmail des Stud.IP-Systems\n"
+                ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
+                ."Ihr Passwort wurde soeben von Ihnen oder einem/einer Administrator/in geändert.\n"
+            ),
+            Config::get()->UNI_NAME_CLEAN
+        );
+
+        // send mail
+        StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject, $mailbody);
+
+        restoreLanguage();
+
+        StudipLog::log('USER_NEWPWD', $this->user_data['auth_user_md5.user_id']);
+
+        return true;
+    }
+}
diff --git a/lib/classes/admission/AdmissionAlgorithm.class.php b/lib/classes/admission/AdmissionAlgorithm.class.php
deleted file mode 100644
index 7e9df92..0000000
--- a/lib/classes/admission/AdmissionAlgorithm.class.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * AdmissionAlgorithm.class.php
- * 
- * Abstract class for seminar seat distribution. A concrete algorithm 
- * needs to be implemented.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-abstract class AdmissionAlgorithm
-{
-
-    /**
-     * Runs an algorithm that distributes all seats in the given CourseSet.
-     *
-     * @param  CourseSet course set object
-     * @return boolean Did the algorithm run successfully?
-     */
-    public function run($courseSet)
-    {
-        return true;
-    }
-
-} /* end of class AdmissionAlgorithm */
-
-?>
\ No newline at end of file
diff --git a/lib/classes/admission/AdmissionAlgorithm.php b/lib/classes/admission/AdmissionAlgorithm.php
new file mode 100644
index 0000000..7e9df92
--- /dev/null
+++ b/lib/classes/admission/AdmissionAlgorithm.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * AdmissionAlgorithm.class.php
+ * 
+ * Abstract class for seminar seat distribution. A concrete algorithm 
+ * needs to be implemented.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+abstract class AdmissionAlgorithm
+{
+
+    /**
+     * Runs an algorithm that distributes all seats in the given CourseSet.
+     *
+     * @param  CourseSet course set object
+     * @return boolean Did the algorithm run successfully?
+     */
+    public function run($courseSet)
+    {
+        return true;
+    }
+
+} /* end of class AdmissionAlgorithm */
+
+?>
\ No newline at end of file
diff --git a/lib/classes/admission/AdmissionPriority.class.php b/lib/classes/admission/AdmissionPriority.class.php
deleted file mode 100644
index 47e1564..0000000
--- a/lib/classes/admission/AdmissionPriority.class.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * AdmissionPriority.class.php
- *
- * This class represents priorities a user has given to a set of courses.
- * No instance is needed, all methods are designed to be called statically.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class AdmissionPriority
-{
-    /**
-     * Get all priorities for the given course set.
-     * The priorities are stored in a 2-dimensional array in the form
-     * priority[user_id][course_id] = x.
-     *
-     * @param  String $courseSetId
-     * @return A 2-dimensional array containing all priorities.
-     */
-    public static function getPriorities($courseSetId)
-    {
-        $query = "SELECT p.`user_id`, p.`seminar_id`, p.`priority`
-                  FROM `priorities` AS p
-                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
-                  WHERE p.`set_id` = ?";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([$courseSetId]);
-
-        $priorities = [];
-        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $priorities[$current['user_id']][$current['seminar_id']] = $current['priority'];
-        }
-        return $priorities;
-    }
-
-    /**
-     * Get all priorities for the given course in the given course set.
-     * The priorities are stored in an array in the form
-     * priority[user_id] = x.
-     *
-     * @param  String $courseSetId
-     * @param  String $courseId
-     * @return An array containing all priorities.
-     */
-    public static function getPrioritiesByCourse($courseSetId, $courseId)
-    {
-        $query = "SELECT p.`user_id`, p.`priority`
-                  FROM `priorities` AS p
-                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
-                  WHERE p.`set_id` = ? AND p.`seminar_id` = ?";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([$courseSetId, $courseId]);
-
-        $priorities = [];
-        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $priorities[$current['user_id']] = $current['priority'];
-        }
-        return $priorities;
-    }
-
-    /**
-     * Get all priorities the given user has set in the given course set.
-     * The priorities are stored in an array in the form
-     * priority[course_id] = x.
-     *
-     * @param  String $courseSetId
-     * @param  String $userId
-     * @return An array containing all priorities.
-     */
-    public static function getPrioritiesByUser($courseSetId, $userId)
-    {
-        $query = "SELECT p.`seminar_id`, p.`priority`
-                  FROM `priorities` AS p
-                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
-                  WHERE p.`set_id` = ? AND p.`user_id` = ?
-                  ORDER BY p.`priority`";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([$courseSetId, $userId]);
-
-        $priorities = [];
-        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $priorities[$current['seminar_id']] = $current['priority'];
-        }
-        return $priorities;
-    }
-
-    /**
-     * The given user sets a course in the given course set to priority x.
-     *
-     * @param  String $courseSetId
-     * @param  String $userId
-     * @param  String $courseId
-     * @param  int    $priority
-     * @return int Number of affected rows, if any.
-     */
-    public static function setPriority($courseSetId, $userId, $courseId, $priority)
-    {
-        $query = "INSERT INTO `priorities` (
-                    `user_id`, `set_id`, `seminar_id`, `priority`, `mkdate`, `chdate`
-                  )
-                  SELECT ?, ?, `seminare`.`seminar_id`, ?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
-                  FROM `seminare` INNER JOIN `seminar_courseset` USING(`seminar_id`)
-                  WHERE `seminare`.`seminar_id` = ? AND `set_id` = ?
-                    ON DUPLICATE KEY
-                      UPDATE `priority` = VALUES(`priority`),
-                             `chdate` = VALUES(`chdate`)";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([(string)$userId, (string)$courseSetId, (int)$priority, (string)$courseId, (string)$courseSetId]);
-
-        $ok = $stmt->rowCount();
-        if ($ok) {
-            StudipLog::log(
-                'SEM_USER_ADD', $courseId, $userId,
-                'Anmeldung zur Platzvergabe',
-                sprintf('Prio: %s Anmeldeset: %s', $priority, $courseSetId)
-            );
-            NotificationCenter::postNotification(
-                'UserAdmissionPriorityDidCreate', $courseId, $userId
-            );
-        }
-        return $ok;
-    }
-
-    /**
-     * unset priority for given user,set and course
-     * reorder remaining priorities
-     *
-     * @param  String $courseSetId
-     * @param  String $userId
-     * @param  String $courseId
-     * @return int Number of affected rows, if any.
-     */
-    public static function unsetPriority($courseSetId, $userId, $courseId)
-    {
-        $query = "DELETE FROM `priorities`
-                  WHERE `user_id` = ? AND `seminar_id` = ? AND `set_id` = ?
-                  LIMIT 1";
-        $deleted = DBManager::get()->execute($query, [$userId, $courseId, $courseSetId]);
-        if (!$deleted) {
-            return 0;
-        }
-
-        $priovar = md5($courseSetId . $userId);
-        DBManager::get()->exec("SET @{$priovar} := 0");
-
-        $query = "UPDATE `priorities`
-                  SET `priority` = (@{$priovar} := @{$priovar} + 1)
-                  WHERE `user_id` = ? AND `set_id` = ?
-                  ORDER BY `priority`";
-        DBManager::get()->execute($query, [$userId, $courseSetId]);
-
-        StudipLog::log(
-            'SEM_USER_DEL', $courseId, $userId,
-            'Anmeldung zur Platzvergabe zurückgezogen',
-            sprintf('Anmeldeset: %s', $courseSetId)
-        );
-        NotificationCenter::postNotification(
-            'UserAdmissionPriorityDidDelete', $courseId, $userId
-        );
-
-        return $deleted;
-    }
-
-    /**
-     * delete all priorities for one set
-     *
-     * @param  String $courseSetId
-     * @return int Number of affected rows, if any.
-     */
-    public static function unsetAllPriorities($courseSetId)
-    {
-        $query = "DELETE FROM `priorities` WHERE `set_id` = ?";
-        return DBManager::get()->execute($query, [$courseSetId]);
-    }
-
-    /**
-     * delete all priorities for one set and one user
-     *
-     * @param  String $courseSetId
-     * @param  String $userId
-     * @return int Number of affected rows, if any.
-     */
-    public static function unsetAllPrioritiesForUser($courseSetId, $userId)
-    {
-        $query = "DELETE FROM `priorities`
-                  WHERE `user_id` = ? AND `set_id` = ?";
-        return DBManager::get()->execute($query, [$userId, $courseSetId]);
-    }
-
-    /**
-     * returns statistics of priority selection for a set
-     *
-     * @param  String $courseSetId
-     * @return array stats grouped by course id
-     */
-    public static function getPrioritiesStats($courseSetId)
-    {
-        $query = "SELECT p.`seminar_id`,
-                         COUNT(*) AS c,
-                         AVG(p.`priority`) AS a,
-                         COUNT(IF(p.`priority` = 1, 1, NULL)) AS h
-                  FROM `priorities` AS p
-                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
-                  WHERE p.`set_id` = ?
-                  GROUP BY p.`seminar_id`";
-        return DBManager::get()->fetchGrouped($query, [$courseSetId]);
-    }
-
-    /**
-     * returns number of users with priorities for a set
-     *
-     * @param  String $courseSetId
-     * @return integer
-     */
-    public static function getPrioritiesCount($courseSetId)
-    {
-        $query = "SELECT COUNT(DISTINCT `user_id`)
-                  FROM `priorities`
-                  WHERE `set_id` = ?";
-        return (int) DBManager::get()->fetchColumn($query, [$courseSetId]);
-    }
-
-    /**
-     * return max chosen priority in set
-     *
-     * @param  String $courseSetId
-     * @return integer
-     */
-    public static function getPrioritiesMax($courseSetId)
-    {
-        $query = "SELECT MAX(`priority`) FROM `priorities` WHERE `set_id` = ?";
-        return (int) DBManager::get()->fetchColumn($query, [$courseSetId]);
-    }
-
-    /**
-     * delete all priorities for one course
-     *
-     * @param  String $course_id
-     * @return int Number of affected rows, if any.
-     */
-    public static function unsetAllPrioritiesForCourse($course_id)
-    {
-        $query = "DELETE FROM `priorities` WHERE `seminar_id` = ?";
-        return DBManager::get()->execute($query, [$course_id]);
-    }
-}
diff --git a/lib/classes/admission/AdmissionPriority.php b/lib/classes/admission/AdmissionPriority.php
new file mode 100644
index 0000000..47e1564
--- /dev/null
+++ b/lib/classes/admission/AdmissionPriority.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * AdmissionPriority.class.php
+ *
+ * This class represents priorities a user has given to a set of courses.
+ * No instance is needed, all methods are designed to be called statically.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class AdmissionPriority
+{
+    /**
+     * Get all priorities for the given course set.
+     * The priorities are stored in a 2-dimensional array in the form
+     * priority[user_id][course_id] = x.
+     *
+     * @param  String $courseSetId
+     * @return A 2-dimensional array containing all priorities.
+     */
+    public static function getPriorities($courseSetId)
+    {
+        $query = "SELECT p.`user_id`, p.`seminar_id`, p.`priority`
+                  FROM `priorities` AS p
+                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
+                  WHERE p.`set_id` = ?";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([$courseSetId]);
+
+        $priorities = [];
+        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $priorities[$current['user_id']][$current['seminar_id']] = $current['priority'];
+        }
+        return $priorities;
+    }
+
+    /**
+     * Get all priorities for the given course in the given course set.
+     * The priorities are stored in an array in the form
+     * priority[user_id] = x.
+     *
+     * @param  String $courseSetId
+     * @param  String $courseId
+     * @return An array containing all priorities.
+     */
+    public static function getPrioritiesByCourse($courseSetId, $courseId)
+    {
+        $query = "SELECT p.`user_id`, p.`priority`
+                  FROM `priorities` AS p
+                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
+                  WHERE p.`set_id` = ? AND p.`seminar_id` = ?";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([$courseSetId, $courseId]);
+
+        $priorities = [];
+        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $priorities[$current['user_id']] = $current['priority'];
+        }
+        return $priorities;
+    }
+
+    /**
+     * Get all priorities the given user has set in the given course set.
+     * The priorities are stored in an array in the form
+     * priority[course_id] = x.
+     *
+     * @param  String $courseSetId
+     * @param  String $userId
+     * @return An array containing all priorities.
+     */
+    public static function getPrioritiesByUser($courseSetId, $userId)
+    {
+        $query = "SELECT p.`seminar_id`, p.`priority`
+                  FROM `priorities` AS p
+                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
+                  WHERE p.`set_id` = ? AND p.`user_id` = ?
+                  ORDER BY p.`priority`";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([$courseSetId, $userId]);
+
+        $priorities = [];
+        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $priorities[$current['seminar_id']] = $current['priority'];
+        }
+        return $priorities;
+    }
+
+    /**
+     * The given user sets a course in the given course set to priority x.
+     *
+     * @param  String $courseSetId
+     * @param  String $userId
+     * @param  String $courseId
+     * @param  int    $priority
+     * @return int Number of affected rows, if any.
+     */
+    public static function setPriority($courseSetId, $userId, $courseId, $priority)
+    {
+        $query = "INSERT INTO `priorities` (
+                    `user_id`, `set_id`, `seminar_id`, `priority`, `mkdate`, `chdate`
+                  )
+                  SELECT ?, ?, `seminare`.`seminar_id`, ?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
+                  FROM `seminare` INNER JOIN `seminar_courseset` USING(`seminar_id`)
+                  WHERE `seminare`.`seminar_id` = ? AND `set_id` = ?
+                    ON DUPLICATE KEY
+                      UPDATE `priority` = VALUES(`priority`),
+                             `chdate` = VALUES(`chdate`)";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([(string)$userId, (string)$courseSetId, (int)$priority, (string)$courseId, (string)$courseSetId]);
+
+        $ok = $stmt->rowCount();
+        if ($ok) {
+            StudipLog::log(
+                'SEM_USER_ADD', $courseId, $userId,
+                'Anmeldung zur Platzvergabe',
+                sprintf('Prio: %s Anmeldeset: %s', $priority, $courseSetId)
+            );
+            NotificationCenter::postNotification(
+                'UserAdmissionPriorityDidCreate', $courseId, $userId
+            );
+        }
+        return $ok;
+    }
+
+    /**
+     * unset priority for given user,set and course
+     * reorder remaining priorities
+     *
+     * @param  String $courseSetId
+     * @param  String $userId
+     * @param  String $courseId
+     * @return int Number of affected rows, if any.
+     */
+    public static function unsetPriority($courseSetId, $userId, $courseId)
+    {
+        $query = "DELETE FROM `priorities`
+                  WHERE `user_id` = ? AND `seminar_id` = ? AND `set_id` = ?
+                  LIMIT 1";
+        $deleted = DBManager::get()->execute($query, [$userId, $courseId, $courseSetId]);
+        if (!$deleted) {
+            return 0;
+        }
+
+        $priovar = md5($courseSetId . $userId);
+        DBManager::get()->exec("SET @{$priovar} := 0");
+
+        $query = "UPDATE `priorities`
+                  SET `priority` = (@{$priovar} := @{$priovar} + 1)
+                  WHERE `user_id` = ? AND `set_id` = ?
+                  ORDER BY `priority`";
+        DBManager::get()->execute($query, [$userId, $courseSetId]);
+
+        StudipLog::log(
+            'SEM_USER_DEL', $courseId, $userId,
+            'Anmeldung zur Platzvergabe zurückgezogen',
+            sprintf('Anmeldeset: %s', $courseSetId)
+        );
+        NotificationCenter::postNotification(
+            'UserAdmissionPriorityDidDelete', $courseId, $userId
+        );
+
+        return $deleted;
+    }
+
+    /**
+     * delete all priorities for one set
+     *
+     * @param  String $courseSetId
+     * @return int Number of affected rows, if any.
+     */
+    public static function unsetAllPriorities($courseSetId)
+    {
+        $query = "DELETE FROM `priorities` WHERE `set_id` = ?";
+        return DBManager::get()->execute($query, [$courseSetId]);
+    }
+
+    /**
+     * delete all priorities for one set and one user
+     *
+     * @param  String $courseSetId
+     * @param  String $userId
+     * @return int Number of affected rows, if any.
+     */
+    public static function unsetAllPrioritiesForUser($courseSetId, $userId)
+    {
+        $query = "DELETE FROM `priorities`
+                  WHERE `user_id` = ? AND `set_id` = ?";
+        return DBManager::get()->execute($query, [$userId, $courseSetId]);
+    }
+
+    /**
+     * returns statistics of priority selection for a set
+     *
+     * @param  String $courseSetId
+     * @return array stats grouped by course id
+     */
+    public static function getPrioritiesStats($courseSetId)
+    {
+        $query = "SELECT p.`seminar_id`,
+                         COUNT(*) AS c,
+                         AVG(p.`priority`) AS a,
+                         COUNT(IF(p.`priority` = 1, 1, NULL)) AS h
+                  FROM `priorities` AS p
+                  JOIN `seminare` AS s ON (p.`seminar_id` = s.`Seminar_id`)
+                  WHERE p.`set_id` = ?
+                  GROUP BY p.`seminar_id`";
+        return DBManager::get()->fetchGrouped($query, [$courseSetId]);
+    }
+
+    /**
+     * returns number of users with priorities for a set
+     *
+     * @param  String $courseSetId
+     * @return integer
+     */
+    public static function getPrioritiesCount($courseSetId)
+    {
+        $query = "SELECT COUNT(DISTINCT `user_id`)
+                  FROM `priorities`
+                  WHERE `set_id` = ?";
+        return (int) DBManager::get()->fetchColumn($query, [$courseSetId]);
+    }
+
+    /**
+     * return max chosen priority in set
+     *
+     * @param  String $courseSetId
+     * @return integer
+     */
+    public static function getPrioritiesMax($courseSetId)
+    {
+        $query = "SELECT MAX(`priority`) FROM `priorities` WHERE `set_id` = ?";
+        return (int) DBManager::get()->fetchColumn($query, [$courseSetId]);
+    }
+
+    /**
+     * delete all priorities for one course
+     *
+     * @param  String $course_id
+     * @return int Number of affected rows, if any.
+     */
+    public static function unsetAllPrioritiesForCourse($course_id)
+    {
+        $query = "DELETE FROM `priorities` WHERE `seminar_id` = ?";
+        return DBManager::get()->execute($query, [$course_id]);
+    }
+}
diff --git a/lib/classes/admission/AdmissionRule.class.php b/lib/classes/admission/AdmissionRule.class.php
deleted file mode 100644
index fe5e5bb..0000000
--- a/lib/classes/admission/AdmissionRule.class.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-
-/**
- * AdmissionRule.class.php
- *
- * An abstract representation of rules for course admission.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-abstract class AdmissionRule
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * When does the validity end?
-     */
-    public $endTime = 0;
-
-    /**
-     * A unique identifier for this rule.
-     */
-    public $id = '';
-
-    /**
-     * A customizable message that is shown to users that are rejected for admission
-     * because of the current rule.
-     */
-    public $message = '';
-
-    /**
-     * default message that is shown to users that are rejected for admission
-     * because of the current rule.
-     */
-    public $default_message = '';
-
-    /**
-     * When does the validity start?
-     */
-    public $startTime = 0;
-
-    /**
-     * ID of the CourseSet this admission rule belongs to (is stored here for
-     * performance reasons).
-     */
-    public $courseSetId = '';
-
-    /**
-     * courseset siblings of this rule
-     */
-    public $siblings = [];
-
-    /**
-     * Are siblings set manually?
-     */
-    public $siblings_override = false;
-
-    // --- OPERATIONS ---
-
-    public function __construct($ruleId = '', $courseSetId = '')
-    {
-        $this->id = $ruleId;
-        $this->courseSetId = $courseSetId;
-    }
-
-    /**
-     * Hook that can be called after the seat distribution on the courseset
-     * has completed.
-     *
-     * @param CourseSet $courseset Current courseset.
-     */
-    public function afterSeatDistribution($courseset)
-    {
-        return true;
-    }
-
-    /**
-     * Checks if we are in the rule validity time frame.
-     *
-     * @return bool True if the rule is valid because the time frame applies,
-     *         otherwise false.
-     */
-    public function checkTimeFrame()
-    {
-        $valid = true;
-        // Start time given, but still in the future.
-        if ($this->startTime && $this->startTime > time()) {
-            $valid = false;
-        }
-        // End time given, but already past.
-        if ($this->endTime && $this->endTime < time()) {
-            $valid = false;
-        }
-        return $valid;
-    }
-
-    /**
-     * Deletes the admission rule and all associated data.
-     */
-    public function delete()
-    {
-        // Delete rule assignment to coursesets.
-        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_rule`
-            WHERE `rule_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Generate a new unique ID.
-     *
-     * @param  String $tableName
-     */
-    public function generateId($tableName)
-    {
-        do {
-            $newid = md5(uniqid(get_class($this).microtime(), true));
-            $db = DBManager::get()->query("SELECT `rule_id`
-                FROM `".$tableName."` WHERE `rule_id`=" . DBManager::get()->quote($newid));
-        } while ($db->fetch());
-        return $newid;
-    }
-
-    /**
-     * Gets all users that are matched by thís rule.
-     *
-     * @return Array An array containing IDs of users who are matched by
-     *      this rule.
-     */
-    public function getAffectedUsers()
-    {
-        return [];
-    }
-
-    /**
-     * Reads all available AdmissionRule subclasses and loads their definitions.
-     *
-     * @param  bool $activeOnly Show only active rules.
-     * @return Array
-     */
-    public static function getAvailableAdmissionRules($activeOnly = true)
-    {
-        $rules = [];
-        $where = ($activeOnly ? " WHERE `active`=1" : "");
-        $data = DBManager::get()->query("SELECT * FROM `admissionrules`".$where.
-            " ORDER BY `id` ASC");
-        while ($current = $data->fetch(PDO::FETCH_ASSOC)) {
-            $className = $current['ruletype'];
-            if (is_dir($GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . $current['path'])) {
-                StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . $current['path']);
-                try {
-                    $rule = new $className();
-                    $rules[$className] = [
-                            'id' => $current['id'],
-                            'name' => $className::getName(),
-                            'description' => $className::getDescription(),
-                            'active' => $current['active']
-                        ];
-                } catch (Exception $e) {
-                }
-            }
-        }
-        return $rules;
-    }
-
-    /**
-     * Get end of validity.
-     *
-     * @return Integer
-     */
-    public function getEndTime()
-    {
-        return $this->endTime;
-    }
-
-    /**
-     * Subclasses of AdmissionRule can require additional data to be entered on
-     * admission (like PasswordAdmission which needs a password for course
-     * access). Their corresponding method getInput only returns a HTML form
-     * fragment as the output can be concatenated with output from other
-     * rules.
-     * This static method provides the frame for rendering a full HTML form
-     * around the fragments from subclasses.
-     *
-     * @return Array Start and end templates which wrap input form fragments
-     *               from subclasses.
-     */
-    public static final function getInputFrame()
-    {
-        return [
-            $GLOBALS['template_factory']->open('admission/rules/input_start')->render(),
-            $GLOBALS['template_factory']->open('admission/rules/input_end')->render()
-        ];
-    }
-
-    /**
-     * Gets some text that describes what this AdmissionRule (or respective
-     * subclass) does.
-     */
-    public static function getDescription()
-    {
-        return _("Legt eine Regel fest, die erfüllt sein muss, um sich ".
-            "erfolgreich zu einer Menge von Veranstaltungen anmelden zu ".
-            "können.");
-    }
-
-    public function getInput()
-    {
-        return '';
-    }
-    /**
-     * Gets the rule ID.
-     *
-     * @return String This rule's ID.
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Gets the message that is shown to users rejected by this rule.
-     *
-     * @return String The message.
-     */
-    public function getMessage()
-    {
-        return $this->message ?: $this->default_message;
-    }
-
-    /**
-     * Return this rule's name.
-     */
-    public static function getName()
-    {
-        return _("Anmelderegel");
-    }
-
-    /**
-     * Gets start of validity.
-     *
-     * @return Integer
-     */
-    public function getStartTime()
-    {
-       return $this->startTime;
-    }
-
-    /**
-     * Gets the template that provides a configuration GUI for this rule.
-     *
-     * @return String
-     */
-    public function getTemplate()
-    {
-        return '';
-    }
-
-    /**
-     * Internal helper function for loading rule definition from database.
-     */
-    public function load()
-    {
-    }
-
-    /**
-     * Hook that can be called when the seat distribution on the courseset
-     * starts.
-     *
-     * @param CourseSet $courseset The courseset this rule belongs to.
-     */
-    public function beforeSeatDistribution($courseset)
-    {
-        return true;
-    }
-
-    /**
-     * Does the current rule allow the given user to register as participant
-     * in the given course?
-     *
-     * @param  String $userId
-     * @param  String $courseId
-     * @return Array
-     */
-    public function ruleApplies($userId, $courseId)
-    {
-        return [];
-    }
-
-    /**
-     * Uses the given data to fill the object values. This can be used
-     * as a generic function for storing data if the concrete rule type
-     * isn't known in advance.
-     *
-     * @param Array $data
-     * @return AdmissionRule This object.
-     */
-    public function setAllData($data)
-    {
-        if (!empty($data['start_date']) && empty($data['start_time'])) {
-            $data['start_time'] = strtotime($data['start_date']);
-        }
-        if (!empty($data['end_date']) && empty($data['end_time'])) {
-            $data['end_time'] = strtotime($data['end_date'] . ' 23:59:59');
-        }
-        $this->message = $data['message'] ?? '';
-        $this->startTime = $data['start_time'] ?? null;
-        $this->endTime = $data['end_time'] ?? null;
-        return $this;
-    }
-
-    /**
-     * Sets a new end time for condition validity.
-     *
-     * @param  Integer $newEndTime
-     * @return AdmissionRule
-     */
-    public function setEndTime($newEndTime)
-    {
-        $this->endTime = $newEndTime;
-        return $this;
-    }
-
-    /**
-     * Sets a new message to show to users.
-     *
-     * @param  String $newMessage A new message text.
-     * @return AdmissionRule This object
-     */
-    public function setMessage($newMessage)
-    {
-        $this->message = $newMessage;
-        return $this;
-    }
-
-    /**
-     * Sets a new start time for condition validity.
-     *
-     * @param  Integer $newStartTime
-     * @return AdmissionRule
-     */
-    public function setStartTime($newStartTime)
-    {
-        $this->startTime = $newStartTime;
-        return $this;
-    }
-
-    /**
-     * Helper function for storing rule definition to database.
-     */
-    public function store()
-    {
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @return String
-     */
-    public function toString()
-    {
-        return '';
-    }
-
-    /**
-     * Validates if the given request data is sufficient to configure this rule
-     * (e.g. if required values are present).
-     *
-     * @param  Array $data Request data
-     * @return Array Error messages.
-     */
-    public function validate($data)
-    {
-        $errors = [];
-        if (!empty($data['start_date']) && !empty($data['end_date']) && strtotime($data['end_date']) < strtotime($data['start_date'])) {
-            $errors[] = _('Das Enddatum darf nicht vor dem Startdatum liegen.');
-        }
-        return $errors;
-    }
-
-    /**
-     * Standard string representation of this object.
-     *
-     * @return String
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * load sibling rules
-     *
-     */
-    public function loadSiblings()
-    {
-        if ($this->siblings_override) {
-            return false;
-        }
-        $this->siblings = [];
-        if ($this->courseSetId != '') {
-            $cs = new CourseSet($this->courseSetId);
-            foreach ($cs->getAdmissionRules() as $rule_id => $rule) {
-                if ($rule->getId() != $this->id) {
-                    $this->siblings[$rule_id] = $rule;
-                }
-            }
-        }
-    }
-
-    /**
-     * get sibling rules
-     *
-     */
-    public function getSiblings()
-    {
-        $this->loadSiblings();
-        return $this->siblings;
-    }
-
-    /**
-     * set sibling rules
-     *
-     */
-    public function setSiblings($siblings = [])
-    {
-        $this->siblings_override = true;
-        $this->siblings = $siblings;
-    }
-
-    /**
-     * checks if given admission rule is allowed to be combined with this rule
-     *
-     * @param AdmissionRule|string $admission_rule
-     * @return boolean
-     */
-    public function isCombinationAllowed($admission_rule)
-    {
-        if (is_object($admission_rule)) {
-            $admission_rule = get_class($admission_rule);
-        }
-        return AdmissionRuleCompatibility::exists([get_class($this), $admission_rule]);
-    }
-
-    public function __clone()
-    {
-        $this->id = md5(uniqid(get_class($this)));
-        $this->courseSetId = null;
-    }
-}
diff --git a/lib/classes/admission/AdmissionRule.php b/lib/classes/admission/AdmissionRule.php
new file mode 100644
index 0000000..fe5e5bb
--- /dev/null
+++ b/lib/classes/admission/AdmissionRule.php
@@ -0,0 +1,456 @@
+<?php
+
+/**
+ * AdmissionRule.class.php
+ *
+ * An abstract representation of rules for course admission.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+abstract class AdmissionRule
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * When does the validity end?
+     */
+    public $endTime = 0;
+
+    /**
+     * A unique identifier for this rule.
+     */
+    public $id = '';
+
+    /**
+     * A customizable message that is shown to users that are rejected for admission
+     * because of the current rule.
+     */
+    public $message = '';
+
+    /**
+     * default message that is shown to users that are rejected for admission
+     * because of the current rule.
+     */
+    public $default_message = '';
+
+    /**
+     * When does the validity start?
+     */
+    public $startTime = 0;
+
+    /**
+     * ID of the CourseSet this admission rule belongs to (is stored here for
+     * performance reasons).
+     */
+    public $courseSetId = '';
+
+    /**
+     * courseset siblings of this rule
+     */
+    public $siblings = [];
+
+    /**
+     * Are siblings set manually?
+     */
+    public $siblings_override = false;
+
+    // --- OPERATIONS ---
+
+    public function __construct($ruleId = '', $courseSetId = '')
+    {
+        $this->id = $ruleId;
+        $this->courseSetId = $courseSetId;
+    }
+
+    /**
+     * Hook that can be called after the seat distribution on the courseset
+     * has completed.
+     *
+     * @param CourseSet $courseset Current courseset.
+     */
+    public function afterSeatDistribution($courseset)
+    {
+        return true;
+    }
+
+    /**
+     * Checks if we are in the rule validity time frame.
+     *
+     * @return bool True if the rule is valid because the time frame applies,
+     *         otherwise false.
+     */
+    public function checkTimeFrame()
+    {
+        $valid = true;
+        // Start time given, but still in the future.
+        if ($this->startTime && $this->startTime > time()) {
+            $valid = false;
+        }
+        // End time given, but already past.
+        if ($this->endTime && $this->endTime < time()) {
+            $valid = false;
+        }
+        return $valid;
+    }
+
+    /**
+     * Deletes the admission rule and all associated data.
+     */
+    public function delete()
+    {
+        // Delete rule assignment to coursesets.
+        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_rule`
+            WHERE `rule_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Generate a new unique ID.
+     *
+     * @param  String $tableName
+     */
+    public function generateId($tableName)
+    {
+        do {
+            $newid = md5(uniqid(get_class($this).microtime(), true));
+            $db = DBManager::get()->query("SELECT `rule_id`
+                FROM `".$tableName."` WHERE `rule_id`=" . DBManager::get()->quote($newid));
+        } while ($db->fetch());
+        return $newid;
+    }
+
+    /**
+     * Gets all users that are matched by thís rule.
+     *
+     * @return Array An array containing IDs of users who are matched by
+     *      this rule.
+     */
+    public function getAffectedUsers()
+    {
+        return [];
+    }
+
+    /**
+     * Reads all available AdmissionRule subclasses and loads their definitions.
+     *
+     * @param  bool $activeOnly Show only active rules.
+     * @return Array
+     */
+    public static function getAvailableAdmissionRules($activeOnly = true)
+    {
+        $rules = [];
+        $where = ($activeOnly ? " WHERE `active`=1" : "");
+        $data = DBManager::get()->query("SELECT * FROM `admissionrules`".$where.
+            " ORDER BY `id` ASC");
+        while ($current = $data->fetch(PDO::FETCH_ASSOC)) {
+            $className = $current['ruletype'];
+            if (is_dir($GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . $current['path'])) {
+                StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . $current['path']);
+                try {
+                    $rule = new $className();
+                    $rules[$className] = [
+                            'id' => $current['id'],
+                            'name' => $className::getName(),
+                            'description' => $className::getDescription(),
+                            'active' => $current['active']
+                        ];
+                } catch (Exception $e) {
+                }
+            }
+        }
+        return $rules;
+    }
+
+    /**
+     * Get end of validity.
+     *
+     * @return Integer
+     */
+    public function getEndTime()
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * Subclasses of AdmissionRule can require additional data to be entered on
+     * admission (like PasswordAdmission which needs a password for course
+     * access). Their corresponding method getInput only returns a HTML form
+     * fragment as the output can be concatenated with output from other
+     * rules.
+     * This static method provides the frame for rendering a full HTML form
+     * around the fragments from subclasses.
+     *
+     * @return Array Start and end templates which wrap input form fragments
+     *               from subclasses.
+     */
+    public static final function getInputFrame()
+    {
+        return [
+            $GLOBALS['template_factory']->open('admission/rules/input_start')->render(),
+            $GLOBALS['template_factory']->open('admission/rules/input_end')->render()
+        ];
+    }
+
+    /**
+     * Gets some text that describes what this AdmissionRule (or respective
+     * subclass) does.
+     */
+    public static function getDescription()
+    {
+        return _("Legt eine Regel fest, die erfüllt sein muss, um sich ".
+            "erfolgreich zu einer Menge von Veranstaltungen anmelden zu ".
+            "können.");
+    }
+
+    public function getInput()
+    {
+        return '';
+    }
+    /**
+     * Gets the rule ID.
+     *
+     * @return String This rule's ID.
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Gets the message that is shown to users rejected by this rule.
+     *
+     * @return String The message.
+     */
+    public function getMessage()
+    {
+        return $this->message ?: $this->default_message;
+    }
+
+    /**
+     * Return this rule's name.
+     */
+    public static function getName()
+    {
+        return _("Anmelderegel");
+    }
+
+    /**
+     * Gets start of validity.
+     *
+     * @return Integer
+     */
+    public function getStartTime()
+    {
+       return $this->startTime;
+    }
+
+    /**
+     * Gets the template that provides a configuration GUI for this rule.
+     *
+     * @return String
+     */
+    public function getTemplate()
+    {
+        return '';
+    }
+
+    /**
+     * Internal helper function for loading rule definition from database.
+     */
+    public function load()
+    {
+    }
+
+    /**
+     * Hook that can be called when the seat distribution on the courseset
+     * starts.
+     *
+     * @param CourseSet $courseset The courseset this rule belongs to.
+     */
+    public function beforeSeatDistribution($courseset)
+    {
+        return true;
+    }
+
+    /**
+     * Does the current rule allow the given user to register as participant
+     * in the given course?
+     *
+     * @param  String $userId
+     * @param  String $courseId
+     * @return Array
+     */
+    public function ruleApplies($userId, $courseId)
+    {
+        return [];
+    }
+
+    /**
+     * Uses the given data to fill the object values. This can be used
+     * as a generic function for storing data if the concrete rule type
+     * isn't known in advance.
+     *
+     * @param Array $data
+     * @return AdmissionRule This object.
+     */
+    public function setAllData($data)
+    {
+        if (!empty($data['start_date']) && empty($data['start_time'])) {
+            $data['start_time'] = strtotime($data['start_date']);
+        }
+        if (!empty($data['end_date']) && empty($data['end_time'])) {
+            $data['end_time'] = strtotime($data['end_date'] . ' 23:59:59');
+        }
+        $this->message = $data['message'] ?? '';
+        $this->startTime = $data['start_time'] ?? null;
+        $this->endTime = $data['end_time'] ?? null;
+        return $this;
+    }
+
+    /**
+     * Sets a new end time for condition validity.
+     *
+     * @param  Integer $newEndTime
+     * @return AdmissionRule
+     */
+    public function setEndTime($newEndTime)
+    {
+        $this->endTime = $newEndTime;
+        return $this;
+    }
+
+    /**
+     * Sets a new message to show to users.
+     *
+     * @param  String $newMessage A new message text.
+     * @return AdmissionRule This object
+     */
+    public function setMessage($newMessage)
+    {
+        $this->message = $newMessage;
+        return $this;
+    }
+
+    /**
+     * Sets a new start time for condition validity.
+     *
+     * @param  Integer $newStartTime
+     * @return AdmissionRule
+     */
+    public function setStartTime($newStartTime)
+    {
+        $this->startTime = $newStartTime;
+        return $this;
+    }
+
+    /**
+     * Helper function for storing rule definition to database.
+     */
+    public function store()
+    {
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @return String
+     */
+    public function toString()
+    {
+        return '';
+    }
+
+    /**
+     * Validates if the given request data is sufficient to configure this rule
+     * (e.g. if required values are present).
+     *
+     * @param  Array $data Request data
+     * @return Array Error messages.
+     */
+    public function validate($data)
+    {
+        $errors = [];
+        if (!empty($data['start_date']) && !empty($data['end_date']) && strtotime($data['end_date']) < strtotime($data['start_date'])) {
+            $errors[] = _('Das Enddatum darf nicht vor dem Startdatum liegen.');
+        }
+        return $errors;
+    }
+
+    /**
+     * Standard string representation of this object.
+     *
+     * @return String
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * load sibling rules
+     *
+     */
+    public function loadSiblings()
+    {
+        if ($this->siblings_override) {
+            return false;
+        }
+        $this->siblings = [];
+        if ($this->courseSetId != '') {
+            $cs = new CourseSet($this->courseSetId);
+            foreach ($cs->getAdmissionRules() as $rule_id => $rule) {
+                if ($rule->getId() != $this->id) {
+                    $this->siblings[$rule_id] = $rule;
+                }
+            }
+        }
+    }
+
+    /**
+     * get sibling rules
+     *
+     */
+    public function getSiblings()
+    {
+        $this->loadSiblings();
+        return $this->siblings;
+    }
+
+    /**
+     * set sibling rules
+     *
+     */
+    public function setSiblings($siblings = [])
+    {
+        $this->siblings_override = true;
+        $this->siblings = $siblings;
+    }
+
+    /**
+     * checks if given admission rule is allowed to be combined with this rule
+     *
+     * @param AdmissionRule|string $admission_rule
+     * @return boolean
+     */
+    public function isCombinationAllowed($admission_rule)
+    {
+        if (is_object($admission_rule)) {
+            $admission_rule = get_class($admission_rule);
+        }
+        return AdmissionRuleCompatibility::exists([get_class($this), $admission_rule]);
+    }
+
+    public function __clone()
+    {
+        $this->id = md5(uniqid(get_class($this)));
+        $this->courseSetId = null;
+    }
+}
diff --git a/lib/classes/admission/AdmissionUserList.class.php b/lib/classes/admission/AdmissionUserList.class.php
deleted file mode 100644
index 570bc62..0000000
--- a/lib/classes/admission/AdmissionUserList.class.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-
-/**
- * AdmissionUserList.class.php
- *
- * Contains users that get different probabilities than others in seat
- * distribution algorithm.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class AdmissionUserList
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * Unique identifier of this list.
-     */
-    public $id = '';
-
-    /**
-     * Conditions for automatic user selection.
-     */
-    public $conditions = [];
-
-    /**
-     * A factor for seat distribution algorithm ("1" means normal algorithm,
-     * everything between 0 and 1 decreases the chance to get a seat,
-     * everything above 1 increases it.)
-     */
-    public $factor = 1;
-
-    /**
-     * Some name to display for this list.
-     */
-    public $name = '';
-
-    /**
-     * ID of the user who created this list.
-     */
-    public $ownerId = '';
-
-    /**
-     * All user IDs that are on this list.
-     */
-    public $users = [];
-
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor.
-     *
-     * @param String id If this is an existing list, here is its ID.
-     * @return This object.
-     */
-    public function __construct($id='') {
-        if ($id) {
-            $this->id = $id;
-            $this->load();
-        }
-        return $this;
-    }
-
-    /**
-     * Adds the given condition to the list.
-     *
-     * @param  UserFilter condition
-     * @return AdmissionUserList
-     */
-    public function addCondition($condition)
-    {
-        $this->conditions[$condition->getId()] = $condition;
-        return $this;
-    }
-
-    /**
-     * Adds the given user to the list.
-     *
-     * @param  String userId
-     * @return AdmissionUserList
-     */
-    public function addUser($userId)
-    {
-        $this->users[$userId] = true;
-        return $this;
-    }
-
-    /**
-     * Deletes this list.
-     */
-    public function delete() {
-        // Remove user assignments to this list.
-        DBManager::get()->exec("DELETE FROM `user_factorlist` WHERE `list_id`='".
-            $this->id."'");
-        // Remove assigned conditions.
-        foreach ($this->conditions as $condition) {
-            $condition->delete();
-        }
-        DBManager::get()->exec("DELETE FROM `user_factorlist` WHERE `list_id`='".
-            $this->id."'");
-        // Delete list data.
-        DBManager::get()->exec("DELETE FROM `admissionfactor` WHERE `list_id`='".
-            $this->id."'");
-    }
-
-    /**
-     * Gets the currently set conditions for automatic user selection.
-     *
-     * @return Integer
-     */
-    public function getConditions()
-    {
-        return $this->conditions;
-    }
-
-    /**
-     * Gets the currently set manipulation factor for this list.
-     *
-     * @return Float
-     */
-    public function getFactor()
-    {
-        return $this->factor;
-    }
-
-    /**
-     * Gets the list ID.
-     *
-     * @return String
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Gets the list name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the owner ID.
-     *
-     * @return String
-     */
-    public function getOwnerId()
-    {
-        return $this->ownerId;
-    }
-
-    /**
-     * Gets all user lists the given user has created.
-     *
-     * @param  String userId
-     * @return array
-     */
-    public static function getUserLists($userId) {
-        $result = [];
-        $stmt = DBManager::get()->prepare("SELECT `list_id` FROM `admissionfactor` WHERE ".
-            "`owner_id`=? ORDER BY `name` ASC");
-        $stmt->execute([$userId]);
-        $lists = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        foreach ($lists as $list) {
-            $result[$list['list_id']] = new AdmissionUserList($list['list_id']);
-        }
-        return $result;
-    }
-
-    /**
-     * Gets all assigned user IDs.
-     *
-     * @param bool $as_objects Whether the users should be returned as objects
-     * @return array|User[]
-     */
-    public function getUsers(bool $as_objects = false)
-    {
-        if (!$as_objects) {
-            return $this->users;
-        }
-
-        $result = $this->users;
-        User::findEachMany(
-            function (User $user) use (&$result) {
-                $result[$user->id] = $user;
-            },
-            array_keys($this->users)
-        );
-        return array_values($result);
-    }
-
-    /**
-     * Helper function for loading data from DB.
-     */
-    public function load()
-    {
-        // Load basic data.
-        $stmt = DBManager::get()->prepare("SELECT `list_id`, `name`,
-                CAST(`factor` AS UNSIGNED) AS factor, `owner_id`, `mkdate`, `chdate` 
-            FROM `admissionfactor` WHERE `list_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->factor = $current['factor'];
-            $this->name = $current['name'];
-            $this->ownerId = $current['owner_id'];
-            // Load user IDs.
-            $stmt2 = DBManager::get()->prepare("SELECT uf.*
-                FROM `user_factorlist` AS uf
-                JOIN `auth_user_md5` AS a ON (uf.`user_id`=a.`user_id`)
-                WHERE uf.`list_id`=?
-                ORDER BY a.`Nachname` ASC, a.`Vorname` ASC, a.`username` ASC");
-            $stmt2->execute([$this->id]);
-            while ($user = $stmt2->fetch(PDO::FETCH_ASSOC)) {
-                $this->users[$user['user_id']] = true;
-            }
-
-            // Load selection conditions, if applicable.
-            // $stmt2 = DBManager::get()->prepare("SELECT `condition_id` FROM ".
-            //     "`condition_factorlist` WHERE `list_id`=? ORDER BY `mkdate` ASC");
-            //$stmt2->execute(array($this->id));
-            //while ($current = $stmt2->fetch(PDO::FETCH_ASSOC)) {
-            //    $this->conditions[$current['condition_id']] =
-            //        new UserFilter($current['condition_id']);
-            //}
-        }
-    }
-
-    /**
-     * Removes the given condition from the list.
-     *
-     * @param  String conditionId
-     * @return AdmissionUserList
-     */
-    public function removeCondition($conditionId)
-    {
-        unset($this->conditions[$conditionId]);
-        return $this;
-    }
-
-    /**
-     * Removes the given user from the list.
-     *
-     * @param  String userId
-     * @return AdmissionUserList
-     */
-    public function removeUser($userId)
-    {
-        unset($this->users[$userId]);
-        return $this;
-    }
-
-    /**
-     * Set the conditions to the given set.
-     *
-     * @param  Array conditions
-     * @return AdmissionUserList
-     */
-    public function setConditions($conditions) {
-        $this->conditions = [];
-        foreach ($conditions as $condition) {
-            $this->addCondition($condition);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets a factor.
-     *
-     * @param float $newFactor The new factor to be set.
-     * @return AdmissionUserList
-     */
-    public function setFactor($newFactor)
-    {
-        $this->factor = $newFactor;
-        return $this;
-    }
-
-    /**
-     * Sets a name.
-     *
-     * @param  String $newName New list name.
-     * @return AdmissionUserList
-     */
-    public function setName($newName)
-    {
-        $this->name = $newName;
-        return $this;
-    }
-
-    /**
-     * Sets a new owner.
-     *
-     * @param  String $newOwnerId New owner Id.
-     * @return AdmissionUserList
-     */
-    public function setOwnerId($newOwnerId)
-    {
-        $this->ownerId = $newOwnerId;
-        return $this;
-    }
-
-    /**
-     * Sets a set of new list members, replacing previous entries.
-     *
-     * @param  Array $newUsers New member list.
-     * @return AdmissionUserList
-     */
-    public function setUsers($newUsers)
-    {
-        $this->users = [];
-        foreach ($newUsers as $userId) {
-            $this->addUser($userId);
-        }
-        return $this;
-    }
-
-    public function describe(array $wrapper = ['', '']): string
-    {
-        if ($this->getFactor() == 0) {
-            return _('Bei der Platzverteilung zu Veranstaltungen werden die '
-                   . 'betreffenden Personen nur nachrangig berücksichtigt.');
-        }
-
-        if ($this->getFactor() == PHP_INT_MAX) {
-            return _('Bei der Platzverteilung zu Veranstaltungen werden die '
-                   . 'betreffenden Personen vor allen anderen einen Platz erhalten.');
-        }
-
-        return sprintf(
-            _('Bei der Platzverteilung zu Veranstaltungen haben die betreffenden '
-            . 'Personen gegenüber Anderen eine %s-fache Chance darauf, einen Platz zu '
-            . 'erhalten.'),
-            $wrapper[0] . $this->getFactor() . $wrapper[1]
-        );
-    }
-
-    /**
-     * Function for storing the data to DB. Is not called automatically on
-     * changing object values.
-     */
-    public function store() {
-        // Generate new ID if list doesn't exist in DB yet.
-        if (!$this->id) {
-            do {
-                $newid = md5(uniqid('AdmissionUserList', true));
-                $db = DBManager::get()->query("SELECT `list_id`
-                    FROM `admissionfactor` WHERE `list_id`='.$newid.'");
-            } while ($db->fetch());
-            $this->id = $newid;
-        }
-        // Store basic list data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `admissionfactor`
-            (`list_id`, `name`, `factor`, `owner_id`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `name`=VALUES(`name`), `factor`=VALUES(`factor`),
-            `owner_id`=VALUES(`owner_id`), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->name, $this->factor,
-            $this->ownerId, time(), time()]);
-        // Clear all old user assignments to this list.
-        DBManager::get()->exec("DELETE FROM `user_factorlist` WHERE `list_id`='".
-            $this->id."' AND `user_id` NOT IN ('".
-            implode("', '", array_keys($this->users))."')");
-        // Store assigned users.
-        foreach ($this->users as $userId => $assigned) {
-            $stmt = DBManager::get()->prepare("INSERT INTO `user_factorlist`
-                (`list_id`, `user_id`, `mkdate`)
-                VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE
-                `user_id`=VALUES(`user_id`)");
-            $stmt->execute([$this->id, $userId, time()]);
-        }
-        return $this;
-    }
-
-    /**
-     * String representation of this object.
-     */
-    public function toString()
-    {
-        $tpl = $GLOBALS['template_factory']->open('admission/userlist');
-        $tpl->set_attribute('userlist', $this);
-        return $tpl->render();
-    }
-
-    /**
-     * Standard string representation of this object.
-     *
-     * @return String
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-}
diff --git a/lib/classes/admission/AdmissionUserList.php b/lib/classes/admission/AdmissionUserList.php
new file mode 100644
index 0000000..570bc62
--- /dev/null
+++ b/lib/classes/admission/AdmissionUserList.php
@@ -0,0 +1,405 @@
+<?php
+
+/**
+ * AdmissionUserList.class.php
+ *
+ * Contains users that get different probabilities than others in seat
+ * distribution algorithm.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class AdmissionUserList
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * Unique identifier of this list.
+     */
+    public $id = '';
+
+    /**
+     * Conditions for automatic user selection.
+     */
+    public $conditions = [];
+
+    /**
+     * A factor for seat distribution algorithm ("1" means normal algorithm,
+     * everything between 0 and 1 decreases the chance to get a seat,
+     * everything above 1 increases it.)
+     */
+    public $factor = 1;
+
+    /**
+     * Some name to display for this list.
+     */
+    public $name = '';
+
+    /**
+     * ID of the user who created this list.
+     */
+    public $ownerId = '';
+
+    /**
+     * All user IDs that are on this list.
+     */
+    public $users = [];
+
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor.
+     *
+     * @param String id If this is an existing list, here is its ID.
+     * @return This object.
+     */
+    public function __construct($id='') {
+        if ($id) {
+            $this->id = $id;
+            $this->load();
+        }
+        return $this;
+    }
+
+    /**
+     * Adds the given condition to the list.
+     *
+     * @param  UserFilter condition
+     * @return AdmissionUserList
+     */
+    public function addCondition($condition)
+    {
+        $this->conditions[$condition->getId()] = $condition;
+        return $this;
+    }
+
+    /**
+     * Adds the given user to the list.
+     *
+     * @param  String userId
+     * @return AdmissionUserList
+     */
+    public function addUser($userId)
+    {
+        $this->users[$userId] = true;
+        return $this;
+    }
+
+    /**
+     * Deletes this list.
+     */
+    public function delete() {
+        // Remove user assignments to this list.
+        DBManager::get()->exec("DELETE FROM `user_factorlist` WHERE `list_id`='".
+            $this->id."'");
+        // Remove assigned conditions.
+        foreach ($this->conditions as $condition) {
+            $condition->delete();
+        }
+        DBManager::get()->exec("DELETE FROM `user_factorlist` WHERE `list_id`='".
+            $this->id."'");
+        // Delete list data.
+        DBManager::get()->exec("DELETE FROM `admissionfactor` WHERE `list_id`='".
+            $this->id."'");
+    }
+
+    /**
+     * Gets the currently set conditions for automatic user selection.
+     *
+     * @return Integer
+     */
+    public function getConditions()
+    {
+        return $this->conditions;
+    }
+
+    /**
+     * Gets the currently set manipulation factor for this list.
+     *
+     * @return Float
+     */
+    public function getFactor()
+    {
+        return $this->factor;
+    }
+
+    /**
+     * Gets the list ID.
+     *
+     * @return String
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Gets the list name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Gets the owner ID.
+     *
+     * @return String
+     */
+    public function getOwnerId()
+    {
+        return $this->ownerId;
+    }
+
+    /**
+     * Gets all user lists the given user has created.
+     *
+     * @param  String userId
+     * @return array
+     */
+    public static function getUserLists($userId) {
+        $result = [];
+        $stmt = DBManager::get()->prepare("SELECT `list_id` FROM `admissionfactor` WHERE ".
+            "`owner_id`=? ORDER BY `name` ASC");
+        $stmt->execute([$userId]);
+        $lists = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        foreach ($lists as $list) {
+            $result[$list['list_id']] = new AdmissionUserList($list['list_id']);
+        }
+        return $result;
+    }
+
+    /**
+     * Gets all assigned user IDs.
+     *
+     * @param bool $as_objects Whether the users should be returned as objects
+     * @return array|User[]
+     */
+    public function getUsers(bool $as_objects = false)
+    {
+        if (!$as_objects) {
+            return $this->users;
+        }
+
+        $result = $this->users;
+        User::findEachMany(
+            function (User $user) use (&$result) {
+                $result[$user->id] = $user;
+            },
+            array_keys($this->users)
+        );
+        return array_values($result);
+    }
+
+    /**
+     * Helper function for loading data from DB.
+     */
+    public function load()
+    {
+        // Load basic data.
+        $stmt = DBManager::get()->prepare("SELECT `list_id`, `name`,
+                CAST(`factor` AS UNSIGNED) AS factor, `owner_id`, `mkdate`, `chdate` 
+            FROM `admissionfactor` WHERE `list_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->factor = $current['factor'];
+            $this->name = $current['name'];
+            $this->ownerId = $current['owner_id'];
+            // Load user IDs.
+            $stmt2 = DBManager::get()->prepare("SELECT uf.*
+                FROM `user_factorlist` AS uf
+                JOIN `auth_user_md5` AS a ON (uf.`user_id`=a.`user_id`)
+                WHERE uf.`list_id`=?
+                ORDER BY a.`Nachname` ASC, a.`Vorname` ASC, a.`username` ASC");
+            $stmt2->execute([$this->id]);
+            while ($user = $stmt2->fetch(PDO::FETCH_ASSOC)) {
+                $this->users[$user['user_id']] = true;
+            }
+
+            // Load selection conditions, if applicable.
+            // $stmt2 = DBManager::get()->prepare("SELECT `condition_id` FROM ".
+            //     "`condition_factorlist` WHERE `list_id`=? ORDER BY `mkdate` ASC");
+            //$stmt2->execute(array($this->id));
+            //while ($current = $stmt2->fetch(PDO::FETCH_ASSOC)) {
+            //    $this->conditions[$current['condition_id']] =
+            //        new UserFilter($current['condition_id']);
+            //}
+        }
+    }
+
+    /**
+     * Removes the given condition from the list.
+     *
+     * @param  String conditionId
+     * @return AdmissionUserList
+     */
+    public function removeCondition($conditionId)
+    {
+        unset($this->conditions[$conditionId]);
+        return $this;
+    }
+
+    /**
+     * Removes the given user from the list.
+     *
+     * @param  String userId
+     * @return AdmissionUserList
+     */
+    public function removeUser($userId)
+    {
+        unset($this->users[$userId]);
+        return $this;
+    }
+
+    /**
+     * Set the conditions to the given set.
+     *
+     * @param  Array conditions
+     * @return AdmissionUserList
+     */
+    public function setConditions($conditions) {
+        $this->conditions = [];
+        foreach ($conditions as $condition) {
+            $this->addCondition($condition);
+        }
+        return $this;
+    }
+
+    /**
+     * Sets a factor.
+     *
+     * @param float $newFactor The new factor to be set.
+     * @return AdmissionUserList
+     */
+    public function setFactor($newFactor)
+    {
+        $this->factor = $newFactor;
+        return $this;
+    }
+
+    /**
+     * Sets a name.
+     *
+     * @param  String $newName New list name.
+     * @return AdmissionUserList
+     */
+    public function setName($newName)
+    {
+        $this->name = $newName;
+        return $this;
+    }
+
+    /**
+     * Sets a new owner.
+     *
+     * @param  String $newOwnerId New owner Id.
+     * @return AdmissionUserList
+     */
+    public function setOwnerId($newOwnerId)
+    {
+        $this->ownerId = $newOwnerId;
+        return $this;
+    }
+
+    /**
+     * Sets a set of new list members, replacing previous entries.
+     *
+     * @param  Array $newUsers New member list.
+     * @return AdmissionUserList
+     */
+    public function setUsers($newUsers)
+    {
+        $this->users = [];
+        foreach ($newUsers as $userId) {
+            $this->addUser($userId);
+        }
+        return $this;
+    }
+
+    public function describe(array $wrapper = ['', '']): string
+    {
+        if ($this->getFactor() == 0) {
+            return _('Bei der Platzverteilung zu Veranstaltungen werden die '
+                   . 'betreffenden Personen nur nachrangig berücksichtigt.');
+        }
+
+        if ($this->getFactor() == PHP_INT_MAX) {
+            return _('Bei der Platzverteilung zu Veranstaltungen werden die '
+                   . 'betreffenden Personen vor allen anderen einen Platz erhalten.');
+        }
+
+        return sprintf(
+            _('Bei der Platzverteilung zu Veranstaltungen haben die betreffenden '
+            . 'Personen gegenüber Anderen eine %s-fache Chance darauf, einen Platz zu '
+            . 'erhalten.'),
+            $wrapper[0] . $this->getFactor() . $wrapper[1]
+        );
+    }
+
+    /**
+     * Function for storing the data to DB. Is not called automatically on
+     * changing object values.
+     */
+    public function store() {
+        // Generate new ID if list doesn't exist in DB yet.
+        if (!$this->id) {
+            do {
+                $newid = md5(uniqid('AdmissionUserList', true));
+                $db = DBManager::get()->query("SELECT `list_id`
+                    FROM `admissionfactor` WHERE `list_id`='.$newid.'");
+            } while ($db->fetch());
+            $this->id = $newid;
+        }
+        // Store basic list data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `admissionfactor`
+            (`list_id`, `name`, `factor`, `owner_id`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `name`=VALUES(`name`), `factor`=VALUES(`factor`),
+            `owner_id`=VALUES(`owner_id`), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->name, $this->factor,
+            $this->ownerId, time(), time()]);
+        // Clear all old user assignments to this list.
+        DBManager::get()->exec("DELETE FROM `user_factorlist` WHERE `list_id`='".
+            $this->id."' AND `user_id` NOT IN ('".
+            implode("', '", array_keys($this->users))."')");
+        // Store assigned users.
+        foreach ($this->users as $userId => $assigned) {
+            $stmt = DBManager::get()->prepare("INSERT INTO `user_factorlist`
+                (`list_id`, `user_id`, `mkdate`)
+                VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE
+                `user_id`=VALUES(`user_id`)");
+            $stmt->execute([$this->id, $userId, time()]);
+        }
+        return $this;
+    }
+
+    /**
+     * String representation of this object.
+     */
+    public function toString()
+    {
+        $tpl = $GLOBALS['template_factory']->open('admission/userlist');
+        $tpl->set_attribute('userlist', $this);
+        return $tpl->render();
+    }
+
+    /**
+     * Standard string representation of this object.
+     *
+     * @return String
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+}
diff --git a/lib/classes/admission/CourseSet.class.php b/lib/classes/admission/CourseSet.class.php
deleted file mode 100644
index d94bc05..0000000
--- a/lib/classes/admission/CourseSet.class.php
+++ /dev/null
@@ -1,1185 +0,0 @@
-<?php
-
-/**
- * CourseSet.class.php
- *
- * Represents groups of Stud.IP courses that have common rules for admission.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class CourseSet
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * Admission rules that are applied to the courses belonging to this set.
-     */
-    protected $admissionRules = [];
-
-    /**
-     * Seat distribution algorithm.
-     */
-    protected $algorithm = null;
-
-    /**
-     * IDs of courses that are aggregated into this set. The array is in the
-     * form ($courseId1 => true, $courseId2 => true).
-     */
-    protected $courses = [];
-
-    /**
-     * Has the seat distribution algorithm already been executed?
-     */
-    protected $hasAlgorithmRun = false;
-
-    /**
-     * Unique identifier for this set.
-     */
-    protected $id = '';
-
-    /**
-     * Some extensive descriptional text for informing confused students.
-     */
-    protected $infoText = '';
-
-    /**
-     * Which Stud.IP institute does the course set belong to?
-     */
-    protected $institutes = [];
-
-    /**
-     * Some display name for this course set.
-     */
-    protected $name = '';
-
-    /**
-     * Is the course set only visible for the creator?
-     */
-    protected $private = false;
-
-    /**
-     * Who owns this course set?
-     */
-    protected $user_id = false;
-
-    /**
-     * When was the course set changed?
-     */
-    protected $chdate = null;
-
-    /*
-     * Lists of users who are treated differently on seat distribution
-     */
-    protected $userlists = [];
-
-    // --- OPERATIONS ---
-
-    public function __construct($setId='') {
-        $this->id = $setId;
-        $this->name = _("Anmeldeset");
-        $this->algorithm = new RandomAlgorithm();
-        // Autoload admission rules.
-        AdmissionRule::getAvailableAdmissionRules();
-        // Define autoload function for admission rules.
-        spl_autoload_register(['UserFilterField', 'getAvailableFilterFields']);
-        if ($setId) {
-            $this->load();
-        }
-    }
-
-    /**
-     * Adds the given admission rule to the list of rules for the course set.
-     *
-     * @param  AdmissionRule rule
-     * @return CourseSet
-     */
-    public function addAdmissionRule($rule)
-    {
-        $this->admissionRules[$rule->getId()] = $rule;
-        return $this;
-    }
-
-    /**
-     * Adds the course with the given ID to the course set.
-     *
-     * @param  String courseId
-     * @return CourseSet
-     */
-    public function addCourse($courseId)
-    {
-        $this->courses[$courseId] = true;
-        return $this;
-    }
-
-    /**
-     * Adds a new institute ID.
-     *
-     * @param  String newId
-     * @return CourseSet
-     */
-    public function addInstitute($newId) {
-        $this->institutes[$newId] = true;
-    return $this;
-    }
-
-    /**
-     * Adds several institute IDs to the existing institute assignments.
-     *
-     * @param  Array newIds
-     * @return CourseSet
-     */
-    public function addInstitutes($newIds) {
-        foreach ($newIds as $newId) {
-            $this->addInstitute($newId);
-        }
-        return $this;
-    }
-
-    /**
-     * Adds a UserList to the course set. The list contains several users and a
-     * factor that changes seat distribution chances for these users;
-     *
-     * @param  String listId
-     * @return CourseSet
-     */
-    public function addUserList($listId)
-    {
-        $this->userlists[$listId] = true;
-        return $this;
-    }
-
-    /**
-     * Is the given user allowed to register as participant in the given
-     * course according to the rules of this course set?
-     *
-     * @param  String userId
-     * @param  String courseId
-     * @return Array Optional error messages from rules if something went wrong.
-     */
-    public function checkAdmission($userId, $courseId) {
-        $errors = [];
-        foreach ($this->admissionRules as $rule) {
-            // All rules must be fulfilled.
-            $ruleCheck = $rule->ruleApplies($userId, $courseId);
-            if ($ruleCheck) {
-                $errors = array_merge($errors, $ruleCheck);
-            }
-        }
-        return $errors;
-    }
-
-    /**
-     * Removes all admission rules at once.
-     *
-     * @return CourseSet
-     */
-    public function clearAdmissionRules() {
-        $this->admissionRules = [];
-        return $this;
-    }
-
-    /**
-     * Deletes the course set and all associated data.
-     */
-    public function delete() {
-        NotificationCenter::postNotification('CourseSetWillDelete', $this->id, $GLOBALS['user']->id);
-        // Delete institute associations.
-        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_institute`
-            WHERE `set_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete course associations.
-        $stmt = DBManager::get()->prepare("DELETE FROM `seminar_courseset`
-            WHERE `set_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete all rules...
-        foreach ($this->admissionRules as $rule) {
-            $rule->delete();
-        }
-        // ... and their association to the current course set.
-        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_rule`
-            WHERE `set_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete associations to user lists.
-        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_factorlist`
-            WHERE `set_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete course set data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `coursesets`
-            WHERE `set_id`=?");
-        $stmt->execute([$this->id]);
-        /*
-         * Delete waiting lists
-         */
-        foreach ($this->courses as $id => $assigned) {
-            AdmissionApplication::deleteBySQL("status='awaiting' AND seminar_id=?", [$id]);
-        }
-        //Delete priorities
-        AdmissionPriority::unsetAllPriorities($this->getId());
-        NotificationCenter::postNotification('CourseSetDidDelete', $this->id, $GLOBALS['user']->id);
-    }
-
-    /**
-     * Starts the seat distribution algorithm.
-     */
-    public function distributeSeats() {
-        if ($this->algorithm) {
-            // Call pre-distribution hooks on all assigned rules.
-            foreach ($this->admissionRules as &$rule) {
-                $rule->beforeSeatDistribution($this);
-            }
-            $this->algorithm->run($this);
-            // Mark as "seats distributed".
-            $this->setAlgorithmRun(true);
-            // Call post-distribution hooks on all assigned rules.
-            foreach ($this->admissionRules as &$rule) {
-                $rule->afterSeatDistribution($this);
-            }
-            AdmissionPriority::unsetAllPriorities($this->getId());
-        }
-    }
-
-    public function setAlgorithmRun($state)
-    {
-        NotificationCenter::postNotification('CourseSetAlgorithmWillStart', $state, $this->getId());
-        $this->hasAlgorithmRun = (bool)$state;
-        $db = DBManager::get();
-        $ok = $db->execute("UPDATE coursesets SET algorithm_run = ? WHERE set_id = ?", [$this->hasAlgorithmRun, $this->getId()]);
-        if ($ok) {
-            NotificationCenter::postNotification('CourseSetAlgorithmDidStart', $state, $this->getId());
-        }
-        return $ok;
-    }
-
-    /**
-     * returns true if the set allows only a limited number of places
-     *
-     * @return boolean
-     */
-    public function isSeatDistributionEnabled()
-    {
-        return $this->getSeatDistributionTime() !== null;
-    }
-
-    /**
-     * returns timestamp of distribution time or null if no distribution time available
-     * may return 0 if first-come-first-serve is enabled
-     *
-     * @return integer|null timestamp of distribution
-     */
-    public function getSeatDistributionTime()
-    {
-        $pr_admission = $this->getAdmissionRule('ParticipantRestrictedAdmission');
-        if ($pr_admission) {
-            return $pr_admission->getDistributionTime();
-        }
-    }
-
-    /**
-     * Get all admission rules belonging to the course set.
-     *
-     * @return AdmissionRule[]
-     */
-    public function getAdmissionRules()
-    {
-        return $this->admissionRules;
-    }
-
-    public function getAdmissionRule($class_name)
-    {
-        $result = array_filter($this->getAdmissionRules(), function($r) use ($class_name) {
-            return $r instanceof $class_name;}
-        );
-        return array_pop($result);
-    }
-    /**
-     * check if course set has given admission rule
-     *
-     * @param string $rule name of AdmissionRule class
-     * @return boolean
-     */
-    public function hasAdmissionRule($rule)
-    {
-        return is_object($this->getAdmissionRule($rule));
-    }
-
-    /**
-     * Get the currently used distribution algorithm.
-     *
-     * @return AdmissionAlgorithm
-     */
-    public function getAlgorithm()
-    {
-        return $this->algorithm;
-    }
-
-    /**
-     * How many users will be allowed to register according to the defined
-     * rules? This can help in estimating whether the combination of the
-     * defined rules makes sense.
-     *
-     * @return int
-     */
-    public function getAllowedUserCount()
-    {
-        $users = [];
-        foreach ($this->admissionRules as $rule) {
-            $users = array_merge($users, $rule->getAffectedUsers());
-        }
-        return sizeof($users);
-    }
-
-    /**
-     * Gets the course IDs belonging to the course set.
-     *
-     * @return Array
-     */
-    public function getCourses()
-    {
-        return array_keys($this->courses);
-    }
-
-    /**
-     * Gets all courses belonging to the given course set ID.
-     *
-     * @param String $courseSetId
-     * @return Array
-     */
-    public static function getCoursesByCourseSetId($courseSetId)
-    {
-        $query = "SELECT `seminar_id`
-                  FROM `seminar_courseset`
-                  WHERE `set_id` = ?";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([$courseSetId]);
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * Gets all course sets belonging to the given institute ID.
-     *
-     * @param String $instituteId
-     * @return Array
-     */
-    public static function getCoursesetsByInstituteId($instituteId, $filter = []) {
-        $query = "SELECT DISTINCT ci.*
-            FROM `courseset_institute` ci
-            JOIN `coursesets` c ON (ci.`set_id`=c.`set_id`)
-            LEFT JOIN courseset_rule cr ON cr.set_id=ci.set_id
-            LEFT JOIN seminar_courseset sc ON c.set_id = sc.set_id
-            LEFT JOIN seminare s ON s.seminar_id = sc.seminar_id
-            WHERE ci.`institute_id`=?";
-        $parameters = [$instituteId];
-        if (!$GLOBALS['perm']->have_perm('admin')) {
-            $query .= " AND (c.`private`=0 OR c.`user_id`=?)";
-            $parameters[] = $GLOBALS['user']->id;
-        }
-        if (!empty($filter['course_set_name'])) {
-            $query .= " AND c.name LIKE ?";
-            $parameters[] = $filter['course_set_name'] . '%';
-        }
-        if (!empty($filter['rule_types']) && is_array($filter['rule_types']) && count($filter['rule_types'])) {
-            $query .= " AND cr.type IN (?)";
-            $parameters[] = $filter['rule_types'];
-        }
-        if (!empty($filter['semester_id'])) {
-            $query .= " AND s.start_time = ?";
-            $parameters[] = Semester::find($filter['semester_id'])->beginn;
-        }
-        if (!empty($filter['course_set_chdate'])) {
-            $query .= " AND c.chdate > ?";
-            $parameters[] = $filter['course_set_chdate'];
-        }
-        $query .= " ORDER BY c.name";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute($parameters);
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * Gets all global course sets
-     *
-     * @param array $filter
-     * @return Array
-     */
-    public static function getGlobalCoursesets($filter = []) {
-        $query = "SELECT DISTINCT c.set_id
-            FROM coursesets c
-            LEFT JOIN courseset_institute ci ON ci.`set_id`=c.`set_id`
-            LEFT JOIN courseset_rule cr ON cr.set_id=ci.set_id
-            LEFT JOIN seminar_courseset sc ON c.set_id = sc.set_id
-            LEFT JOIN seminare s ON s.seminar_id = sc.seminar_id
-            WHERE ci.institute_id IS NULL";
-        $parameters = [];
-        $query .= " AND (c.`private`=0 OR c.`user_id`=?)";
-        $parameters[] = $GLOBALS['user']->id;
-        if (!empty($filter['course_set_name'])) {
-            $query .= " AND c.name LIKE ?";
-            $parameters[] = $filter['course_set_name'] . '%';
-        }
-        if (!empty($filter['rule_types']) && is_array($filter['rule_types']) && count($filter['rule_types'])) {
-            $query .= " AND cr.type IN (?)";
-            $parameters[] = $filter['rule_types'];
-        }
-        if (!empty($filter['semester_id'])) {
-            $query .= " AND s.start_time = ?";
-            $parameters[] = Semester::find($filter['semester_id'])->beginn;
-        }
-        if (!empty($filter['course_set_chdate'])) {
-            $query .= " AND c.chdate > ?";
-            $parameters[] = $filter['course_set_chdate'];
-        }
-        $query .= " ORDER BY c.name";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute($parameters);
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
-    }
-
-    /**
-     * Get the identifier of the course set.
-     *
-     * @return String
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get the course set's info text.
-     *
-     * @return String
-     */
-    public function getInfoText()
-    {
-        return $this->infoText;
-    }
-
-    /**
-     * Which institutes does the rule belong to?
-     *
-     * @return Array
-     */
-    public function getInstituteIds() {
-        return $this->institutes;
-    }
-
-    public function isGlobal()
-    {
-        return count($this->institutes) == 0;
-    }
-    /**
-     * Gets this course set's display name.
-     */
-    public function getName() {
-        return $this->name;
-    }
-
-    /**
-     * Returns the date of the last change.
-     * @return int
-     */
-    public function getChdate()
-    {
-        return $this->chdate;
-    }
-
-    /**
-     * Retrieves the priorities given to the courses in this set.
-     *
-     * @return Array
-     */
-    public function getPriorities()
-    {
-        return AdmissionPriority::getPriorities($this->id);
-    }
-
-    public function getNumApplicants()
-    {
-        return AdmissionPriority::getPrioritiesCount($this->id);
-    }
-
-    /**
-     * Is the current courseset private?
-     *
-     * @return bool
-     */
-    public function getPrivate() {
-        return $this->private;
-    }
-
-
-    /**
-     * returns latest semester id from assigned courses
-     * if no courses are assigned current semester
-     *
-     * @return string id of semester
-     */
-    public function getSemester() {
-        $db = DBManager::get();
-        $data = $db->fetchOne("
-            SELECT semester_data.*
-            FROM semester_data
-                INNER JOIN semester_courses ON (semester_data.semester_id = semester_courses.semester_id)
-            WHERE semester_courses.course_id IN (?)
-            ORDER BY semester_data.ende DESC
-            LIMIT 1
-        ", [$this->getCourses()]);
-        if ($data) {
-            $semester = Semester::buildExisting($data);
-        } else {
-            $semester = $_SESSION['_default_sem'] ? Semester::find($_SESSION['_default_sem']) : Semester::findCurrent();
-        }
-        return $semester->id;
-    }
-
-    /**
-     * Gets the owner of this course set.
-     */
-    public function getUserId() {
-        return $this->user_id;
-    }
-
-    public function setUserId($user_id) {
-        $this->user_id = $user_id;
-        return $this;
-    }
-
-    /**
-     * Gets the course sets the given course belongs to.
-     *
-     * @param  String courseId
-     * @return CourseSet
-     */
-    public static function getSetForCourse($courseId)
-    {
-        $stmt = DBManager::get()->prepare("SELECT `set_id`
-            FROM `seminar_courseset` WHERE `seminar_id`=?");
-        $stmt->execute([$courseId]);
-        $set_id = $stmt->fetchColumn();
-        if ($set_id) {
-            return new CourseSet($set_id);
-        }
-        return null;
-    }
-
-    /**
-     * Gets the course sets the given rule belongs to.
-     *
-     * @param  String $rule_id
-     * @return CourseSet
-     */
-    public static function getSetForRule($rule_id)
-    {
-        $set_id = DBManager::get()->fetchColumn("SELECT `set_id`
-            FROM `courseset_rule` WHERE `rule_id`=?", [$rule_id]);
-        if ($set_id) {
-            return new CourseSet($set_id);
-        }
-        return null;
-    }
-
-    /**
-     * Retrieves the lists of users that are considered specially in
-     * seat distribution.
-     *
-     * @return Array
-     */
-    public function getUserLists()
-    {
-        return array_keys($this->userlists);
-    }
-
-    public function getUserFactorList()
-    {
-        $factored_users = [];
-
-        foreach ($this->getUserLists() as $ul_id) {
-            $user_list = new AdmissionUserList($ul_id);
-
-            // Iterate through user list.
-            foreach ($user_list->getUsers() as $user => $assigned) {
-                switch ($user_list->getFactor()) {
-                    // Maximum factor, just set it and stop further processing of user lists.
-                    case PHP_INT_MAX:
-                        $factored_users[$user] = PHP_INT_MAX;
-                        break;
-                    // Backlist, set malus and stop further processing of user lists.
-                    case 0:
-                        $factored_users[$user] = 0;
-                        break;
-                    default:
-                        // Add up current bonus if it isn't already at 0 or PHP_INT_MAX.
-                        if ($factored_users[$user] !== 0 && $factored_users[$user] != PHP_INT_MAX) {
-                            $factored_users[$user] = isset($factored_users[$user]) ?
-                                $factored_users[$user] + $user_list->getFactor() :
-                                $user_list->getFactor();
-                        }
-                }
-            }
-        }
-
-        return $factored_users;
-    }
-
-    /**
-     * Evaluates whether the seat distribution algorithm has already been
-     * executed on this course set.
-     *
-     * @return boolean True if algorithm has already run, otherwise false.
-     */
-    public function hasAlgorithmRun() {
-        return $this->hasAlgorithmRun;
-    }
-
-    /**
-     * Helper function for loading data from DB.
-     */
-    public function load() {
-        // Load basic data.
-        $stmt = DBManager::get()->prepare(
-            "SELECT * FROM `coursesets` WHERE set_id=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->name = $data['name'];
-            $this->infoText = $data['infotext'];
-            $this->hasAlgorithmRun = (bool)$data['algorithm_run'];
-            if ($data['algorithm']) {
-                if (class_exists($data['algorithm'])) {
-                    $this->algorithm = new $data['algorithm']();
-                }
-            }
-            $this->private = (bool) $data['private'];
-            $this->user_id = $data['user_id'];
-            $this->chdate = $data['chdate'];
-        }
-        // Load institute assigments.
-        $stmt = DBManager::get()->prepare("
-            SELECT courseset_institute.institute_id
-            FROM `courseset_institute`
-                INNER JOIN Institute ON (courseset_institute.institute_id = Institute.Institut_id)
-            WHERE courseset_institute.set_id = ?
-            ORDER BY Institute.Name ASC
-        ");
-        $stmt->execute([$this->id]);
-        $this->institutes = [];
-        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->institutes[$data['institute_id']] = true;
-        }
-        // Load courses.
-        $stmt = DBManager::get()->prepare(
-            "SELECT seminar_id FROM `seminar_courseset` WHERE set_id=?");
-        $stmt->execute([$this->id]);
-        $this->courses = [];
-        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->courses[$data['seminar_id']] = true;
-        }
-        // Load admission rules.
-        $stmt = DBManager::get()->prepare(
-            "SELECT * FROM `courseset_rule` WHERE set_id=?");
-        $stmt->execute([$this->id]);
-        $this->admissionRules = [];
-        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            if (class_exists($data['type'])) {
-                $this->admissionRules[$data['rule_id']] =
-                    new $data['type']($data['rule_id'], $this->id);
-            }
-        }
-        // Load assigned user lists.
-        $stmt = DBManager::get()->prepare("SELECT `factorlist_id`
-            FROM `courseset_factorlist` WHERE `set_id`=?");
-        $stmt->execute([$this->id]);
-        $this->userlists = [];
-        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->userlists[$current['factorlist_id']] = true;
-        }
-        return $this;
-    }
-
-    /**
-     * Removes the course with the given ID from the set.
-     *
-     * @param  String courseId
-     * @return CourseSet
-     */
-    public function removeCourse($courseId)
-    {
-        unset($this->courses[$courseId]);
-        return $this;
-    }
-
-    /**
-     * Removes the rule with the given ID from the set.
-     *
-     * @param  String ruleId
-     * @return CourseSet
-     */
-    public function removeAdmissionRule($ruleId)
-    {
-        unset($this->admissionRules[$ruleId]);
-        return $this;
-    }
-
-    /**
-     * Removes the institute with the given ID from the set.
-     *
-     * @param  String instituteId
-     * @return CourseSet
-     */
-    public function removeInstitute($instituteId)
-    {
-        unset($this->institutes[$instituteId]);
-        return $this;
-    }
-
-    /**
-     * Removes the user list with the given ID from the set.
-     *
-     * @param  String listId
-     * @return CourseSet
-     */
-    public function removeUserlist($listId)
-    {
-        unset($this->userlists[$listId]);
-        return $this;
-    }
-
-    /**
-     * Adds several admission rules after clearing the existing rule
-     * assignments.
-     *
-     * @param  Array newIds
-     * @return CourseSet
-     */
-    public function setAdmissionRules($newRules) {
-        $this->admissionRules = [];
-        foreach ($newRules as $newRule) {
-            $rule = ObjectBuilder::build($newRule, 'AdmissionRule');
-            $this->addAdmissionRule($rule);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets a seat distribution algorithm for this course set. This will only
-     * have an effect in conjunction with a TimedAdmission, as the algorithm
-     * needs a defined point in time where it will start.
-     *
-     * @param  String newAlgorithm
-     * @return CourseSet
-     */
-    public function setAlgorithm($newAlgorithm)
-    {
-        try {
-            $this->algorithm = new $newAlgorithm();
-        } catch (Exception $e) {
-        }
-        return $this;
-    }
-
-    /**
-     * Adds several course IDs after clearing the existing course
-     * assignments.
-     *
-     * @param  Array newIds
-     * @return CourseSet
-     */
-    public function setCourses($newIds) {
-        $this->courses = array_fill_keys($newIds, true);
-        return $this;
-    }
-
-    /**
-     * Adds several institute IDs after clearing the existing institute
-     * assignments.
-     *
-     * @param  Array newIds
-     * @return CourseSet
-     */
-    public function setInstitutes($newIds) {
-        $this->institutes = [];
-        $this->addInstitutes($newIds);
-        return $this;
-    }
-
-    /**
-     * Set the course set's info text.
-     *
-     * @return CourseSet
-     */
-    public function setInfoText($newText)
-    {
-        $this->infoText = $newText;
-        return $this;
-    }
-
-    /* Sets a new name for this course set.
-     *
-     * @param  String newName
-     * @return CourseSet
-     */
-    public function setName($newName) {
-        $this->name = $newName;
-        return $this;
-    }
-
-    /**
-     * Set a new value for courseset privacy.
-     *
-     * @param  bool $newPrivate
-     * @return CourseSet
-     */
-    public function setPrivate($newPrivate) {
-        $this->private = $newPrivate;
-        return $this;
-    }
-
-    /**
-     * Adds several user list IDs after clearing the existing user list
-     * assignments.
-     *
-     * @param  Array newIds
-     * @return CourseSet
-     */
-    public function setUserlists($newIds) {
-        $this->userlists = [];
-        foreach ($newIds as $newId) {
-            $this->addUserlist($newId);
-        }
-        return $this;
-    }
-
-    public function store() {
-        // Generate new ID if course set doesn't exist in DB yet.
-        if (!$this->id) {
-            do {
-                $newid = md5(uniqid(get_class($this), true));
-                $db = DBManager::get()->query("SELECT `set_id`
-                    FROM `coursesets` WHERE `set_id`='$newid'");
-            } while ($db->fetch());
-            $this->id = $newid;
-        }
-        if (!$this->user_id) {
-            $this->user_id = $GLOBALS['user']->id;
-        }
-        if ($this->isSeatDistributionEnabled()) {
-            if (!$this->getAlgorithm()) {
-                $algorithm = new RandomAlgorithm();
-                $this->setAlgorithm($algorithm);
-            }
-            if (!$this->getSeatDistributionTime()) {
-                $this->setAlgorithmRun(true);
-                //Delete priorities
-                AdmissionPriority::unsetAllPriorities($this->getId());
-            }
-            if ($this->getSeatDistributionTime() > time()) {
-                $this->setAlgorithmRun(false);
-            }
-        }
-        // Store basic data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `coursesets`
-            (`set_id`, `user_id`, `name`, `infotext`, `algorithm`, `algorithm_run`,
-            `private`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-            `name`=VALUES(`name`), `infotext`=VALUES(`infotext`),
-            `algorithm`=VALUES(`algorithm`), `algorithm_run`=VALUES(`algorithm_run`), `private`=VALUES(`private`),
-            `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->user_id, $this->name, $this->infoText,
-            get_class($this->algorithm), $this->hasAlgorithmRun(), intval($this->private), time(), time()]);
-        // Delete removed institute assignments from database.
-        DBManager::get()->exec("DELETE FROM `courseset_institute`
-            WHERE `set_id`='".$this->id."' AND `institute_id` NOT IN ('".
-            implode("', '", array_keys($this->institutes))."')");
-        // Store associated institute IDs.
-        foreach ($this->institutes as $institute => $associated) {
-            $stmt = DBManager::get()->prepare("INSERT IGNORE INTO `courseset_institute`
-                (`set_id`, `institute_id`, `mkdate`)
-                VALUES (?, ?, ?)");
-            $stmt->execute([$this->id, $institute, time()]);
-        }
-        // log removed course assignments.
-        DBManager::get()->fetchAll("SELECT seminar_id,set_id FROM `seminar_courseset`
-            WHERE `set_id` = ? AND `seminar_id` NOT IN (?)", [$this->id, count($this->courses) ? array_keys($this->courses) : ''],
-            function ($row) {
-                StudipLog::log('SEM_CHANGED_ACCESS', $row['seminar_id'],
-                null, 'Entfernung von Anmeldeset', sprintf('Anmeldeset: %s', $row['set_id']));
-                //Delete priorities
-                AdmissionPriority::unsetAllPrioritiesForCourse($row['seminar_id']);
-                Course::buildExisting(['seminar_id' => $row['seminar_id']])->triggerChdate();
-            });
-        //removed course assignments
-        DBManager::get()->execute("DELETE FROM `seminar_courseset`
-            WHERE `set_id` = ? AND `seminar_id` NOT IN (?)", [$this->id, count($this->courses) ? array_keys($this->courses) : '']);
-        //log removing other associations
-        DBManager::get()->execute("SELECT seminar_id,set_id FROM `seminar_courseset`
-            WHERE `set_id` <> ? AND `seminar_id` IN (?)", [$this->id, array_keys($this->courses)],
-            function ($row) {
-                StudipLog::log('SEM_CHANGED_ACCESS', $row['seminar_id'],
-                null, 'Entfernung von Anmeldeset', sprintf('Anmeldeset: %s', $row['set_id']));
-                //Delete priorities
-                AdmissionPriority::unsetAllPrioritiesForCourse($row['seminar_id']);
-                Course::buildExisting(['seminar_id' => $row['seminar_id']])->triggerChdate();
-            });
-        //Delete other associations, only one set possible
-        DBManager::get()->execute("DELETE FROM `seminar_courseset`
-            WHERE `set_id` <> ? AND `seminar_id` IN (?)", [$this->id, array_keys($this->courses)]);
-        // Store associated course IDs.
-        foreach ($this->courses as $course => $associated) {
-            $stmt = DBManager::get()->prepare("INSERT IGNORE INTO `seminar_courseset`
-                (`set_id`, `seminar_id`, `mkdate`)
-                VALUES (?, ?, ?)");
-            $stmt->execute([$this->id, $course, time()]);
-            if ($stmt->rowCount()) {
-                StudipLog::log('SEM_CHANGED_ACCESS', $course,
-                null, 'Zuordnung zu Anmeldeset', sprintf('Anmeldeset: %s', $this->id));
-                Course::buildExisting(['seminar_id' => $course])->triggerChdate();
-            }
-        }
-
-        // Delete removed user list assignments from database.
-        DBManager::get()->exec("DELETE FROM `courseset_factorlist`
-            WHERE `set_id`='".$this->id."' AND `factorlist_id` NOT IN ('".
-            implode("', '", array_keys($this->userlists))."')");
-        // Store associated user list IDs.
-        foreach ($this->userlists as $list => $associated) {
-            $stmt = DBManager::get()->prepare("INSERT IGNORE INTO `courseset_factorlist`
-                (`set_id`, `factorlist_id`, `mkdate`)
-                VALUES (?, ?, ?)");
-            $stmt->execute([$this->id, $list, time()]);
-        }
-        // Delete removed admission rules from database.
-        $stmt = DBManager::get()->query("SELECT `rule_id`, `type` FROM `courseset_rule`
-            WHERE `set_id`='".$this->id."' AND `rule_id` NOT IN ('".
-            implode("', '", array_keys($this->admissionRules))."')");
-        $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        foreach ($data as $ruleData) {
-            $rule = new $ruleData['type']($ruleData['rule_id']);
-            $rule->delete();
-        }
-        // Store all rules.
-        foreach ($this->admissionRules as $rule) {
-            // Store each rule...
-            $rule->store();
-            // ... and its connection to the current course set.
-            $stmt = DBManager::get()->prepare("INSERT INTO `courseset_rule`
-                (`set_id`, `rule_id`, `type`, `mkdate`)
-                VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE
-                `type`=VALUES(`type`)");
-            $stmt->execute([$this->id, $rule->getId(), get_class($rule), time()]);
-        }
-        //fix free access courses
-        if (count($this->courses)) {
-            DBManager::get()->execute("UPDATE seminare SET Lesezugriff=1,Schreibzugriff=1 WHERE seminar_id IN(?)", [array_keys($this->courses)]);
-        }
-        //create general log
-        $this->log_store();
-
-    }
-
-    /**
-     * Generates a general log entry if the CourseSet rules were changed.
-     */
-    private function log_store()
-    {
-        $text = '';
-        $rule_counter = 1;
-        foreach ($this->getAdmissionRules() as $rule) {
-            $rule_text = strip_tags(kill_format($rule->toString()));
-            $semicolon = ($rule_counter < count($this->getAdmissionRules()) ? '; ' : '');
-            $text .= '#' . $rule_counter . ' => ' . $rule_text . $semicolon;
-            $rule_counter++;
-        }
-
-        $courses = $this->getCourses();
-        foreach ($courses as $course_id) {
-            StudipLog::log(
-                'SEM_CHANGED_ACCESS',
-                $course_id,
-                NULL,
-                $text,
-                sprintf('Anmeldeset: %s (%s)', strip_tags(kill_format(($this->name))), $this->id)
-            );
-        }
-    }
-
-    /**
-     * A textual description of the current rule.
-     *
-     * @param bool short Show only short info without overview of assigned
-     *                   courses and institutes.
-     * @return String
-     */
-    public function toString($short=false) {
-        $tpl = $GLOBALS['template_factory']->open('admission/courseset/info');
-        $tpl->set_attribute('courseset', $this);
-        $tpl->set_attribute('is_limited', false);
-        $institutes = [];
-        if (!$short) {
-            $institutes = Institute::findAndMapMany(function($i) {return $i->name;}, array_keys($this->institutes), 'ORDER BY Name');
-            $tpl->set_attribute('institutes', $institutes);
-        }
-        if (!$short || $this->hasAdmissionRule('LimitedAdmission')) {
-            $courses = Course::findAndMapMany(function($c) {
-                return [
-                    'id' => $c->id,
-                    'name' => $c->getFullName('number-name-semester'),
-                    'visible' => $c->visible
-                ];
-            },
-                array_keys($this->courses),
-                'ORDER BY start_time,VeranstaltungsNummer,Name');
-            if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
-                $courses = array_filter($courses,
-                    function ($c) {
-                        return $c['visible'];
-                    }
-                );
-            }
-            $tpl->set_attribute('is_limited', $this->hasAdmissionRule('LimitedAdmission'));
-            $tpl->set_attribute('courses', $courses);
-        }
-        $tpl->set_attribute('short', $short);
-        return $tpl->render();
-    }
-
-    public function __toString() {
-        return $this->toString();
-    }
-
-    /**
-     * is user with given user id allowed to assign/unassign given course to courseset
-     *
-     * @param string $user_id
-     * @param string $course_id
-     * @return boolean
-     */
-    public function isUserAllowedToAssignCourse($user_id, $course_id)
-    {
-        global $perm;
-        $is_dozent = $perm->have_studip_perm('tutor', $course_id, $user_id);
-        $is_admin = $perm->have_perm('admin', $user_id) || ($perm->have_perm('dozent', $user_id) && Config::get()->ALLOW_DOZENT_COURSESET_ADMIN);
-        $is_private = $this->getPrivate();
-        $is_my_own = $this->getUserId() == $user_id;
-        $is_correct_institute = $this->isGlobal() || isset($this->institutes[Course::find($course_id)->institut_id]);
-        return $is_dozent && $is_correct_institute && ($is_my_own || $is_admin || !$is_private || $this->isGlobal()) || $perm->have_perm('root', $user_id);
-    }
-
-    /**
-     * is user with given user id allowed to edit or delete the courseset
-     *
-     * @param string $user_id
-     * @return boolean
-     */
-    public function isUserAllowedToEdit($user_id)
-    {
-        global $perm;
-
-        if ($this->getUserId() == '') {
-            return false;
-        }
-        if ($perm->have_perm('root', $user_id) || $this->getUserId() == $user_id) {
-            return true;
-        }
-        if (count($this->institutes) == 0 && count($this->courses) == 1 && $perm->have_studip_perm('tutor', current($this->getCourses()), $user_id)) {
-            return true;
-        }
-        if ($perm->have_perm('admin', $user_id) || ($perm->have_perm('dozent', $user_id) && Config::get()->ALLOW_DOZENT_COURSESET_ADMIN)) {
-            foreach (array_keys($this->getInstituteIds()) as $one) {
-                if ($perm->have_studip_perm('dozent', $one, $user_id)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * checks if given rule is allowed to be added to current set of rules
-     *
-     * @param AdmissionRule|string $admission_rule
-     * @return boolean
-     */
-    public function isAdmissionRuleAllowed($admission_rule)
-    {
-        foreach ($this->getAdmissionRules() as $one) {
-            if (!$one->isCombinationAllowed($admission_rule)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static function getGlobalLockedAdmissionSetId()
-    {
-        $db = DBManager::get();
-        $locked_set_id = $db->fetchColumn("SELECT cr.set_id FROM courseset_rule cr
-                                    INNER JOIN coursesets USING(set_id)
-                                    WHERE type='LockedAdmission' and private=1 and user_id='' LIMIT 1");
-        if (!$locked_set_id) {
-            $cs_insert = $db->prepare("INSERT INTO coursesets (set_id,user_id,name,infotext,algorithm,private,mkdate,chdate)
-                                   VALUES (?,?,?,?,'',?,?,?)");
-            $cs_r_insert = $db->prepare("INSERT INTO courseset_rule (set_id,rule_id,type,mkdate) VALUES (?,?,?,UNIX_TIMESTAMP())");
-            $locked_insert = $db->prepare("INSERT INTO lockedadmissions (rule_id,message,mkdate,chdate) VALUES (?,'Die Anmeldung ist gesperrt',UNIX_TIMESTAMP(),UNIX_TIMESTAMP())");
-            $locked_set_id = md5(uniqid('coursesets',1));
-            $name = 'Anmeldung gesperrt (global)';
-            $cs_insert->execute([$locked_set_id,'',$name,'',1,time(),time()]);
-            $locked_rule_id = md5(uniqid('lockedadmissions',1));
-            $locked_insert->execute([$locked_rule_id]);
-            $cs_r_insert->execute([$locked_set_id,$locked_rule_id,'LockedAdmission']);
-        }
-        return $locked_set_id;
-    }
-
-    public static function addCourseToSet($set_id, $course_id)
-    {
-        $db = DBManager::get();
-        $ok = $db->execute("INSERT IGNORE INTO seminar_courseset (set_id,seminar_id,mkdate) VALUES (?,?,UNIX_TIMESTAMP())", [$set_id, $course_id]);
-        if ($ok) {
-            StudipLog::log('SEM_CHANGED_ACCESS', $course_id,
-                null, 'Zuordnung zu Anmeldeset', sprintf('Anmeldeset: %s', $set_id));
-            $course = Course::find($course_id);
-            if ($course) {
-                $course->chdate = time();
-                $course->lesezugriff = 1;
-                $course->schreibzugriff = 1;
-                $course->store();
-            }
-        }
-        return $ok;
-    }
-
-    public static function removeCourseFromSet($set_id, $course_id)
-    {
-        $db = DBManager::get();
-        $ok =  $db->execute("DELETE FROM seminar_courseset WHERE set_id=? AND seminar_id=? LIMIT 1", [$set_id, $course_id]);
-        if ($ok) {
-            StudipLog::log('SEM_CHANGED_ACCESS', $course_id,
-                null, 'Entfernung von Anmeldeset', sprintf('Anmeldeset: %s', $set_id));
-            //Delete priorities
-            AdmissionPriority::unsetAllPrioritiesForCourse($course_id);
-            Course::buildExisting(['seminar_id' => $course_id])->triggerChdate();
-        }
-        return $ok;
-    }
-
-    public function __clone()
-    {
-        $this->courses = [];
-        $this->id = null;
-        $this->user_id = null;
-        $cloned_rules = [];
-        foreach ($this->admissionRules as $key => $rule) {
-            $dolly = clone $rule;
-            $cloned_rules[$dolly->id] = $dolly;
-        }
-        $this->admissionRules = $cloned_rules;
-    }
-
-} /* end of class CourseSet */
diff --git a/lib/classes/admission/CourseSet.php b/lib/classes/admission/CourseSet.php
new file mode 100644
index 0000000..d94bc05
--- /dev/null
+++ b/lib/classes/admission/CourseSet.php
@@ -0,0 +1,1185 @@
+<?php
+
+/**
+ * CourseSet.class.php
+ *
+ * Represents groups of Stud.IP courses that have common rules for admission.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class CourseSet
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * Admission rules that are applied to the courses belonging to this set.
+     */
+    protected $admissionRules = [];
+
+    /**
+     * Seat distribution algorithm.
+     */
+    protected $algorithm = null;
+
+    /**
+     * IDs of courses that are aggregated into this set. The array is in the
+     * form ($courseId1 => true, $courseId2 => true).
+     */
+    protected $courses = [];
+
+    /**
+     * Has the seat distribution algorithm already been executed?
+     */
+    protected $hasAlgorithmRun = false;
+
+    /**
+     * Unique identifier for this set.
+     */
+    protected $id = '';
+
+    /**
+     * Some extensive descriptional text for informing confused students.
+     */
+    protected $infoText = '';
+
+    /**
+     * Which Stud.IP institute does the course set belong to?
+     */
+    protected $institutes = [];
+
+    /**
+     * Some display name for this course set.
+     */
+    protected $name = '';
+
+    /**
+     * Is the course set only visible for the creator?
+     */
+    protected $private = false;
+
+    /**
+     * Who owns this course set?
+     */
+    protected $user_id = false;
+
+    /**
+     * When was the course set changed?
+     */
+    protected $chdate = null;
+
+    /*
+     * Lists of users who are treated differently on seat distribution
+     */
+    protected $userlists = [];
+
+    // --- OPERATIONS ---
+
+    public function __construct($setId='') {
+        $this->id = $setId;
+        $this->name = _("Anmeldeset");
+        $this->algorithm = new RandomAlgorithm();
+        // Autoload admission rules.
+        AdmissionRule::getAvailableAdmissionRules();
+        // Define autoload function for admission rules.
+        spl_autoload_register(['UserFilterField', 'getAvailableFilterFields']);
+        if ($setId) {
+            $this->load();
+        }
+    }
+
+    /**
+     * Adds the given admission rule to the list of rules for the course set.
+     *
+     * @param  AdmissionRule rule
+     * @return CourseSet
+     */
+    public function addAdmissionRule($rule)
+    {
+        $this->admissionRules[$rule->getId()] = $rule;
+        return $this;
+    }
+
+    /**
+     * Adds the course with the given ID to the course set.
+     *
+     * @param  String courseId
+     * @return CourseSet
+     */
+    public function addCourse($courseId)
+    {
+        $this->courses[$courseId] = true;
+        return $this;
+    }
+
+    /**
+     * Adds a new institute ID.
+     *
+     * @param  String newId
+     * @return CourseSet
+     */
+    public function addInstitute($newId) {
+        $this->institutes[$newId] = true;
+    return $this;
+    }
+
+    /**
+     * Adds several institute IDs to the existing institute assignments.
+     *
+     * @param  Array newIds
+     * @return CourseSet
+     */
+    public function addInstitutes($newIds) {
+        foreach ($newIds as $newId) {
+            $this->addInstitute($newId);
+        }
+        return $this;
+    }
+
+    /**
+     * Adds a UserList to the course set. The list contains several users and a
+     * factor that changes seat distribution chances for these users;
+     *
+     * @param  String listId
+     * @return CourseSet
+     */
+    public function addUserList($listId)
+    {
+        $this->userlists[$listId] = true;
+        return $this;
+    }
+
+    /**
+     * Is the given user allowed to register as participant in the given
+     * course according to the rules of this course set?
+     *
+     * @param  String userId
+     * @param  String courseId
+     * @return Array Optional error messages from rules if something went wrong.
+     */
+    public function checkAdmission($userId, $courseId) {
+        $errors = [];
+        foreach ($this->admissionRules as $rule) {
+            // All rules must be fulfilled.
+            $ruleCheck = $rule->ruleApplies($userId, $courseId);
+            if ($ruleCheck) {
+                $errors = array_merge($errors, $ruleCheck);
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Removes all admission rules at once.
+     *
+     * @return CourseSet
+     */
+    public function clearAdmissionRules() {
+        $this->admissionRules = [];
+        return $this;
+    }
+
+    /**
+     * Deletes the course set and all associated data.
+     */
+    public function delete() {
+        NotificationCenter::postNotification('CourseSetWillDelete', $this->id, $GLOBALS['user']->id);
+        // Delete institute associations.
+        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_institute`
+            WHERE `set_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete course associations.
+        $stmt = DBManager::get()->prepare("DELETE FROM `seminar_courseset`
+            WHERE `set_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete all rules...
+        foreach ($this->admissionRules as $rule) {
+            $rule->delete();
+        }
+        // ... and their association to the current course set.
+        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_rule`
+            WHERE `set_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete associations to user lists.
+        $stmt = DBManager::get()->prepare("DELETE FROM `courseset_factorlist`
+            WHERE `set_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete course set data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `coursesets`
+            WHERE `set_id`=?");
+        $stmt->execute([$this->id]);
+        /*
+         * Delete waiting lists
+         */
+        foreach ($this->courses as $id => $assigned) {
+            AdmissionApplication::deleteBySQL("status='awaiting' AND seminar_id=?", [$id]);
+        }
+        //Delete priorities
+        AdmissionPriority::unsetAllPriorities($this->getId());
+        NotificationCenter::postNotification('CourseSetDidDelete', $this->id, $GLOBALS['user']->id);
+    }
+
+    /**
+     * Starts the seat distribution algorithm.
+     */
+    public function distributeSeats() {
+        if ($this->algorithm) {
+            // Call pre-distribution hooks on all assigned rules.
+            foreach ($this->admissionRules as &$rule) {
+                $rule->beforeSeatDistribution($this);
+            }
+            $this->algorithm->run($this);
+            // Mark as "seats distributed".
+            $this->setAlgorithmRun(true);
+            // Call post-distribution hooks on all assigned rules.
+            foreach ($this->admissionRules as &$rule) {
+                $rule->afterSeatDistribution($this);
+            }
+            AdmissionPriority::unsetAllPriorities($this->getId());
+        }
+    }
+
+    public function setAlgorithmRun($state)
+    {
+        NotificationCenter::postNotification('CourseSetAlgorithmWillStart', $state, $this->getId());
+        $this->hasAlgorithmRun = (bool)$state;
+        $db = DBManager::get();
+        $ok = $db->execute("UPDATE coursesets SET algorithm_run = ? WHERE set_id = ?", [$this->hasAlgorithmRun, $this->getId()]);
+        if ($ok) {
+            NotificationCenter::postNotification('CourseSetAlgorithmDidStart', $state, $this->getId());
+        }
+        return $ok;
+    }
+
+    /**
+     * returns true if the set allows only a limited number of places
+     *
+     * @return boolean
+     */
+    public function isSeatDistributionEnabled()
+    {
+        return $this->getSeatDistributionTime() !== null;
+    }
+
+    /**
+     * returns timestamp of distribution time or null if no distribution time available
+     * may return 0 if first-come-first-serve is enabled
+     *
+     * @return integer|null timestamp of distribution
+     */
+    public function getSeatDistributionTime()
+    {
+        $pr_admission = $this->getAdmissionRule('ParticipantRestrictedAdmission');
+        if ($pr_admission) {
+            return $pr_admission->getDistributionTime();
+        }
+    }
+
+    /**
+     * Get all admission rules belonging to the course set.
+     *
+     * @return AdmissionRule[]
+     */
+    public function getAdmissionRules()
+    {
+        return $this->admissionRules;
+    }
+
+    public function getAdmissionRule($class_name)
+    {
+        $result = array_filter($this->getAdmissionRules(), function($r) use ($class_name) {
+            return $r instanceof $class_name;}
+        );
+        return array_pop($result);
+    }
+    /**
+     * check if course set has given admission rule
+     *
+     * @param string $rule name of AdmissionRule class
+     * @return boolean
+     */
+    public function hasAdmissionRule($rule)
+    {
+        return is_object($this->getAdmissionRule($rule));
+    }
+
+    /**
+     * Get the currently used distribution algorithm.
+     *
+     * @return AdmissionAlgorithm
+     */
+    public function getAlgorithm()
+    {
+        return $this->algorithm;
+    }
+
+    /**
+     * How many users will be allowed to register according to the defined
+     * rules? This can help in estimating whether the combination of the
+     * defined rules makes sense.
+     *
+     * @return int
+     */
+    public function getAllowedUserCount()
+    {
+        $users = [];
+        foreach ($this->admissionRules as $rule) {
+            $users = array_merge($users, $rule->getAffectedUsers());
+        }
+        return sizeof($users);
+    }
+
+    /**
+     * Gets the course IDs belonging to the course set.
+     *
+     * @return Array
+     */
+    public function getCourses()
+    {
+        return array_keys($this->courses);
+    }
+
+    /**
+     * Gets all courses belonging to the given course set ID.
+     *
+     * @param String $courseSetId
+     * @return Array
+     */
+    public static function getCoursesByCourseSetId($courseSetId)
+    {
+        $query = "SELECT `seminar_id`
+                  FROM `seminar_courseset`
+                  WHERE `set_id` = ?";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([$courseSetId]);
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * Gets all course sets belonging to the given institute ID.
+     *
+     * @param String $instituteId
+     * @return Array
+     */
+    public static function getCoursesetsByInstituteId($instituteId, $filter = []) {
+        $query = "SELECT DISTINCT ci.*
+            FROM `courseset_institute` ci
+            JOIN `coursesets` c ON (ci.`set_id`=c.`set_id`)
+            LEFT JOIN courseset_rule cr ON cr.set_id=ci.set_id
+            LEFT JOIN seminar_courseset sc ON c.set_id = sc.set_id
+            LEFT JOIN seminare s ON s.seminar_id = sc.seminar_id
+            WHERE ci.`institute_id`=?";
+        $parameters = [$instituteId];
+        if (!$GLOBALS['perm']->have_perm('admin')) {
+            $query .= " AND (c.`private`=0 OR c.`user_id`=?)";
+            $parameters[] = $GLOBALS['user']->id;
+        }
+        if (!empty($filter['course_set_name'])) {
+            $query .= " AND c.name LIKE ?";
+            $parameters[] = $filter['course_set_name'] . '%';
+        }
+        if (!empty($filter['rule_types']) && is_array($filter['rule_types']) && count($filter['rule_types'])) {
+            $query .= " AND cr.type IN (?)";
+            $parameters[] = $filter['rule_types'];
+        }
+        if (!empty($filter['semester_id'])) {
+            $query .= " AND s.start_time = ?";
+            $parameters[] = Semester::find($filter['semester_id'])->beginn;
+        }
+        if (!empty($filter['course_set_chdate'])) {
+            $query .= " AND c.chdate > ?";
+            $parameters[] = $filter['course_set_chdate'];
+        }
+        $query .= " ORDER BY c.name";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute($parameters);
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * Gets all global course sets
+     *
+     * @param array $filter
+     * @return Array
+     */
+    public static function getGlobalCoursesets($filter = []) {
+        $query = "SELECT DISTINCT c.set_id
+            FROM coursesets c
+            LEFT JOIN courseset_institute ci ON ci.`set_id`=c.`set_id`
+            LEFT JOIN courseset_rule cr ON cr.set_id=ci.set_id
+            LEFT JOIN seminar_courseset sc ON c.set_id = sc.set_id
+            LEFT JOIN seminare s ON s.seminar_id = sc.seminar_id
+            WHERE ci.institute_id IS NULL";
+        $parameters = [];
+        $query .= " AND (c.`private`=0 OR c.`user_id`=?)";
+        $parameters[] = $GLOBALS['user']->id;
+        if (!empty($filter['course_set_name'])) {
+            $query .= " AND c.name LIKE ?";
+            $parameters[] = $filter['course_set_name'] . '%';
+        }
+        if (!empty($filter['rule_types']) && is_array($filter['rule_types']) && count($filter['rule_types'])) {
+            $query .= " AND cr.type IN (?)";
+            $parameters[] = $filter['rule_types'];
+        }
+        if (!empty($filter['semester_id'])) {
+            $query .= " AND s.start_time = ?";
+            $parameters[] = Semester::find($filter['semester_id'])->beginn;
+        }
+        if (!empty($filter['course_set_chdate'])) {
+            $query .= " AND c.chdate > ?";
+            $parameters[] = $filter['course_set_chdate'];
+        }
+        $query .= " ORDER BY c.name";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute($parameters);
+        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * Get the identifier of the course set.
+     *
+     * @return String
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get the course set's info text.
+     *
+     * @return String
+     */
+    public function getInfoText()
+    {
+        return $this->infoText;
+    }
+
+    /**
+     * Which institutes does the rule belong to?
+     *
+     * @return Array
+     */
+    public function getInstituteIds() {
+        return $this->institutes;
+    }
+
+    public function isGlobal()
+    {
+        return count($this->institutes) == 0;
+    }
+    /**
+     * Gets this course set's display name.
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * Returns the date of the last change.
+     * @return int
+     */
+    public function getChdate()
+    {
+        return $this->chdate;
+    }
+
+    /**
+     * Retrieves the priorities given to the courses in this set.
+     *
+     * @return Array
+     */
+    public function getPriorities()
+    {
+        return AdmissionPriority::getPriorities($this->id);
+    }
+
+    public function getNumApplicants()
+    {
+        return AdmissionPriority::getPrioritiesCount($this->id);
+    }
+
+    /**
+     * Is the current courseset private?
+     *
+     * @return bool
+     */
+    public function getPrivate() {
+        return $this->private;
+    }
+
+
+    /**
+     * returns latest semester id from assigned courses
+     * if no courses are assigned current semester
+     *
+     * @return string id of semester
+     */
+    public function getSemester() {
+        $db = DBManager::get();
+        $data = $db->fetchOne("
+            SELECT semester_data.*
+            FROM semester_data
+                INNER JOIN semester_courses ON (semester_data.semester_id = semester_courses.semester_id)
+            WHERE semester_courses.course_id IN (?)
+            ORDER BY semester_data.ende DESC
+            LIMIT 1
+        ", [$this->getCourses()]);
+        if ($data) {
+            $semester = Semester::buildExisting($data);
+        } else {
+            $semester = $_SESSION['_default_sem'] ? Semester::find($_SESSION['_default_sem']) : Semester::findCurrent();
+        }
+        return $semester->id;
+    }
+
+    /**
+     * Gets the owner of this course set.
+     */
+    public function getUserId() {
+        return $this->user_id;
+    }
+
+    public function setUserId($user_id) {
+        $this->user_id = $user_id;
+        return $this;
+    }
+
+    /**
+     * Gets the course sets the given course belongs to.
+     *
+     * @param  String courseId
+     * @return CourseSet
+     */
+    public static function getSetForCourse($courseId)
+    {
+        $stmt = DBManager::get()->prepare("SELECT `set_id`
+            FROM `seminar_courseset` WHERE `seminar_id`=?");
+        $stmt->execute([$courseId]);
+        $set_id = $stmt->fetchColumn();
+        if ($set_id) {
+            return new CourseSet($set_id);
+        }
+        return null;
+    }
+
+    /**
+     * Gets the course sets the given rule belongs to.
+     *
+     * @param  String $rule_id
+     * @return CourseSet
+     */
+    public static function getSetForRule($rule_id)
+    {
+        $set_id = DBManager::get()->fetchColumn("SELECT `set_id`
+            FROM `courseset_rule` WHERE `rule_id`=?", [$rule_id]);
+        if ($set_id) {
+            return new CourseSet($set_id);
+        }
+        return null;
+    }
+
+    /**
+     * Retrieves the lists of users that are considered specially in
+     * seat distribution.
+     *
+     * @return Array
+     */
+    public function getUserLists()
+    {
+        return array_keys($this->userlists);
+    }
+
+    public function getUserFactorList()
+    {
+        $factored_users = [];
+
+        foreach ($this->getUserLists() as $ul_id) {
+            $user_list = new AdmissionUserList($ul_id);
+
+            // Iterate through user list.
+            foreach ($user_list->getUsers() as $user => $assigned) {
+                switch ($user_list->getFactor()) {
+                    // Maximum factor, just set it and stop further processing of user lists.
+                    case PHP_INT_MAX:
+                        $factored_users[$user] = PHP_INT_MAX;
+                        break;
+                    // Backlist, set malus and stop further processing of user lists.
+                    case 0:
+                        $factored_users[$user] = 0;
+                        break;
+                    default:
+                        // Add up current bonus if it isn't already at 0 or PHP_INT_MAX.
+                        if ($factored_users[$user] !== 0 && $factored_users[$user] != PHP_INT_MAX) {
+                            $factored_users[$user] = isset($factored_users[$user]) ?
+                                $factored_users[$user] + $user_list->getFactor() :
+                                $user_list->getFactor();
+                        }
+                }
+            }
+        }
+
+        return $factored_users;
+    }
+
+    /**
+     * Evaluates whether the seat distribution algorithm has already been
+     * executed on this course set.
+     *
+     * @return boolean True if algorithm has already run, otherwise false.
+     */
+    public function hasAlgorithmRun() {
+        return $this->hasAlgorithmRun;
+    }
+
+    /**
+     * Helper function for loading data from DB.
+     */
+    public function load() {
+        // Load basic data.
+        $stmt = DBManager::get()->prepare(
+            "SELECT * FROM `coursesets` WHERE set_id=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->name = $data['name'];
+            $this->infoText = $data['infotext'];
+            $this->hasAlgorithmRun = (bool)$data['algorithm_run'];
+            if ($data['algorithm']) {
+                if (class_exists($data['algorithm'])) {
+                    $this->algorithm = new $data['algorithm']();
+                }
+            }
+            $this->private = (bool) $data['private'];
+            $this->user_id = $data['user_id'];
+            $this->chdate = $data['chdate'];
+        }
+        // Load institute assigments.
+        $stmt = DBManager::get()->prepare("
+            SELECT courseset_institute.institute_id
+            FROM `courseset_institute`
+                INNER JOIN Institute ON (courseset_institute.institute_id = Institute.Institut_id)
+            WHERE courseset_institute.set_id = ?
+            ORDER BY Institute.Name ASC
+        ");
+        $stmt->execute([$this->id]);
+        $this->institutes = [];
+        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->institutes[$data['institute_id']] = true;
+        }
+        // Load courses.
+        $stmt = DBManager::get()->prepare(
+            "SELECT seminar_id FROM `seminar_courseset` WHERE set_id=?");
+        $stmt->execute([$this->id]);
+        $this->courses = [];
+        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->courses[$data['seminar_id']] = true;
+        }
+        // Load admission rules.
+        $stmt = DBManager::get()->prepare(
+            "SELECT * FROM `courseset_rule` WHERE set_id=?");
+        $stmt->execute([$this->id]);
+        $this->admissionRules = [];
+        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            if (class_exists($data['type'])) {
+                $this->admissionRules[$data['rule_id']] =
+                    new $data['type']($data['rule_id'], $this->id);
+            }
+        }
+        // Load assigned user lists.
+        $stmt = DBManager::get()->prepare("SELECT `factorlist_id`
+            FROM `courseset_factorlist` WHERE `set_id`=?");
+        $stmt->execute([$this->id]);
+        $this->userlists = [];
+        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->userlists[$current['factorlist_id']] = true;
+        }
+        return $this;
+    }
+
+    /**
+     * Removes the course with the given ID from the set.
+     *
+     * @param  String courseId
+     * @return CourseSet
+     */
+    public function removeCourse($courseId)
+    {
+        unset($this->courses[$courseId]);
+        return $this;
+    }
+
+    /**
+     * Removes the rule with the given ID from the set.
+     *
+     * @param  String ruleId
+     * @return CourseSet
+     */
+    public function removeAdmissionRule($ruleId)
+    {
+        unset($this->admissionRules[$ruleId]);
+        return $this;
+    }
+
+    /**
+     * Removes the institute with the given ID from the set.
+     *
+     * @param  String instituteId
+     * @return CourseSet
+     */
+    public function removeInstitute($instituteId)
+    {
+        unset($this->institutes[$instituteId]);
+        return $this;
+    }
+
+    /**
+     * Removes the user list with the given ID from the set.
+     *
+     * @param  String listId
+     * @return CourseSet
+     */
+    public function removeUserlist($listId)
+    {
+        unset($this->userlists[$listId]);
+        return $this;
+    }
+
+    /**
+     * Adds several admission rules after clearing the existing rule
+     * assignments.
+     *
+     * @param  Array newIds
+     * @return CourseSet
+     */
+    public function setAdmissionRules($newRules) {
+        $this->admissionRules = [];
+        foreach ($newRules as $newRule) {
+            $rule = ObjectBuilder::build($newRule, 'AdmissionRule');
+            $this->addAdmissionRule($rule);
+        }
+        return $this;
+    }
+
+    /**
+     * Sets a seat distribution algorithm for this course set. This will only
+     * have an effect in conjunction with a TimedAdmission, as the algorithm
+     * needs a defined point in time where it will start.
+     *
+     * @param  String newAlgorithm
+     * @return CourseSet
+     */
+    public function setAlgorithm($newAlgorithm)
+    {
+        try {
+            $this->algorithm = new $newAlgorithm();
+        } catch (Exception $e) {
+        }
+        return $this;
+    }
+
+    /**
+     * Adds several course IDs after clearing the existing course
+     * assignments.
+     *
+     * @param  Array newIds
+     * @return CourseSet
+     */
+    public function setCourses($newIds) {
+        $this->courses = array_fill_keys($newIds, true);
+        return $this;
+    }
+
+    /**
+     * Adds several institute IDs after clearing the existing institute
+     * assignments.
+     *
+     * @param  Array newIds
+     * @return CourseSet
+     */
+    public function setInstitutes($newIds) {
+        $this->institutes = [];
+        $this->addInstitutes($newIds);
+        return $this;
+    }
+
+    /**
+     * Set the course set's info text.
+     *
+     * @return CourseSet
+     */
+    public function setInfoText($newText)
+    {
+        $this->infoText = $newText;
+        return $this;
+    }
+
+    /* Sets a new name for this course set.
+     *
+     * @param  String newName
+     * @return CourseSet
+     */
+    public function setName($newName) {
+        $this->name = $newName;
+        return $this;
+    }
+
+    /**
+     * Set a new value for courseset privacy.
+     *
+     * @param  bool $newPrivate
+     * @return CourseSet
+     */
+    public function setPrivate($newPrivate) {
+        $this->private = $newPrivate;
+        return $this;
+    }
+
+    /**
+     * Adds several user list IDs after clearing the existing user list
+     * assignments.
+     *
+     * @param  Array newIds
+     * @return CourseSet
+     */
+    public function setUserlists($newIds) {
+        $this->userlists = [];
+        foreach ($newIds as $newId) {
+            $this->addUserlist($newId);
+        }
+        return $this;
+    }
+
+    public function store() {
+        // Generate new ID if course set doesn't exist in DB yet.
+        if (!$this->id) {
+            do {
+                $newid = md5(uniqid(get_class($this), true));
+                $db = DBManager::get()->query("SELECT `set_id`
+                    FROM `coursesets` WHERE `set_id`='$newid'");
+            } while ($db->fetch());
+            $this->id = $newid;
+        }
+        if (!$this->user_id) {
+            $this->user_id = $GLOBALS['user']->id;
+        }
+        if ($this->isSeatDistributionEnabled()) {
+            if (!$this->getAlgorithm()) {
+                $algorithm = new RandomAlgorithm();
+                $this->setAlgorithm($algorithm);
+            }
+            if (!$this->getSeatDistributionTime()) {
+                $this->setAlgorithmRun(true);
+                //Delete priorities
+                AdmissionPriority::unsetAllPriorities($this->getId());
+            }
+            if ($this->getSeatDistributionTime() > time()) {
+                $this->setAlgorithmRun(false);
+            }
+        }
+        // Store basic data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `coursesets`
+            (`set_id`, `user_id`, `name`, `infotext`, `algorithm`, `algorithm_run`,
+            `private`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+            `name`=VALUES(`name`), `infotext`=VALUES(`infotext`),
+            `algorithm`=VALUES(`algorithm`), `algorithm_run`=VALUES(`algorithm_run`), `private`=VALUES(`private`),
+            `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->user_id, $this->name, $this->infoText,
+            get_class($this->algorithm), $this->hasAlgorithmRun(), intval($this->private), time(), time()]);
+        // Delete removed institute assignments from database.
+        DBManager::get()->exec("DELETE FROM `courseset_institute`
+            WHERE `set_id`='".$this->id."' AND `institute_id` NOT IN ('".
+            implode("', '", array_keys($this->institutes))."')");
+        // Store associated institute IDs.
+        foreach ($this->institutes as $institute => $associated) {
+            $stmt = DBManager::get()->prepare("INSERT IGNORE INTO `courseset_institute`
+                (`set_id`, `institute_id`, `mkdate`)
+                VALUES (?, ?, ?)");
+            $stmt->execute([$this->id, $institute, time()]);
+        }
+        // log removed course assignments.
+        DBManager::get()->fetchAll("SELECT seminar_id,set_id FROM `seminar_courseset`
+            WHERE `set_id` = ? AND `seminar_id` NOT IN (?)", [$this->id, count($this->courses) ? array_keys($this->courses) : ''],
+            function ($row) {
+                StudipLog::log('SEM_CHANGED_ACCESS', $row['seminar_id'],
+                null, 'Entfernung von Anmeldeset', sprintf('Anmeldeset: %s', $row['set_id']));
+                //Delete priorities
+                AdmissionPriority::unsetAllPrioritiesForCourse($row['seminar_id']);
+                Course::buildExisting(['seminar_id' => $row['seminar_id']])->triggerChdate();
+            });
+        //removed course assignments
+        DBManager::get()->execute("DELETE FROM `seminar_courseset`
+            WHERE `set_id` = ? AND `seminar_id` NOT IN (?)", [$this->id, count($this->courses) ? array_keys($this->courses) : '']);
+        //log removing other associations
+        DBManager::get()->execute("SELECT seminar_id,set_id FROM `seminar_courseset`
+            WHERE `set_id` <> ? AND `seminar_id` IN (?)", [$this->id, array_keys($this->courses)],
+            function ($row) {
+                StudipLog::log('SEM_CHANGED_ACCESS', $row['seminar_id'],
+                null, 'Entfernung von Anmeldeset', sprintf('Anmeldeset: %s', $row['set_id']));
+                //Delete priorities
+                AdmissionPriority::unsetAllPrioritiesForCourse($row['seminar_id']);
+                Course::buildExisting(['seminar_id' => $row['seminar_id']])->triggerChdate();
+            });
+        //Delete other associations, only one set possible
+        DBManager::get()->execute("DELETE FROM `seminar_courseset`
+            WHERE `set_id` <> ? AND `seminar_id` IN (?)", [$this->id, array_keys($this->courses)]);
+        // Store associated course IDs.
+        foreach ($this->courses as $course => $associated) {
+            $stmt = DBManager::get()->prepare("INSERT IGNORE INTO `seminar_courseset`
+                (`set_id`, `seminar_id`, `mkdate`)
+                VALUES (?, ?, ?)");
+            $stmt->execute([$this->id, $course, time()]);
+            if ($stmt->rowCount()) {
+                StudipLog::log('SEM_CHANGED_ACCESS', $course,
+                null, 'Zuordnung zu Anmeldeset', sprintf('Anmeldeset: %s', $this->id));
+                Course::buildExisting(['seminar_id' => $course])->triggerChdate();
+            }
+        }
+
+        // Delete removed user list assignments from database.
+        DBManager::get()->exec("DELETE FROM `courseset_factorlist`
+            WHERE `set_id`='".$this->id."' AND `factorlist_id` NOT IN ('".
+            implode("', '", array_keys($this->userlists))."')");
+        // Store associated user list IDs.
+        foreach ($this->userlists as $list => $associated) {
+            $stmt = DBManager::get()->prepare("INSERT IGNORE INTO `courseset_factorlist`
+                (`set_id`, `factorlist_id`, `mkdate`)
+                VALUES (?, ?, ?)");
+            $stmt->execute([$this->id, $list, time()]);
+        }
+        // Delete removed admission rules from database.
+        $stmt = DBManager::get()->query("SELECT `rule_id`, `type` FROM `courseset_rule`
+            WHERE `set_id`='".$this->id."' AND `rule_id` NOT IN ('".
+            implode("', '", array_keys($this->admissionRules))."')");
+        $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        foreach ($data as $ruleData) {
+            $rule = new $ruleData['type']($ruleData['rule_id']);
+            $rule->delete();
+        }
+        // Store all rules.
+        foreach ($this->admissionRules as $rule) {
+            // Store each rule...
+            $rule->store();
+            // ... and its connection to the current course set.
+            $stmt = DBManager::get()->prepare("INSERT INTO `courseset_rule`
+                (`set_id`, `rule_id`, `type`, `mkdate`)
+                VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE
+                `type`=VALUES(`type`)");
+            $stmt->execute([$this->id, $rule->getId(), get_class($rule), time()]);
+        }
+        //fix free access courses
+        if (count($this->courses)) {
+            DBManager::get()->execute("UPDATE seminare SET Lesezugriff=1,Schreibzugriff=1 WHERE seminar_id IN(?)", [array_keys($this->courses)]);
+        }
+        //create general log
+        $this->log_store();
+
+    }
+
+    /**
+     * Generates a general log entry if the CourseSet rules were changed.
+     */
+    private function log_store()
+    {
+        $text = '';
+        $rule_counter = 1;
+        foreach ($this->getAdmissionRules() as $rule) {
+            $rule_text = strip_tags(kill_format($rule->toString()));
+            $semicolon = ($rule_counter < count($this->getAdmissionRules()) ? '; ' : '');
+            $text .= '#' . $rule_counter . ' => ' . $rule_text . $semicolon;
+            $rule_counter++;
+        }
+
+        $courses = $this->getCourses();
+        foreach ($courses as $course_id) {
+            StudipLog::log(
+                'SEM_CHANGED_ACCESS',
+                $course_id,
+                NULL,
+                $text,
+                sprintf('Anmeldeset: %s (%s)', strip_tags(kill_format(($this->name))), $this->id)
+            );
+        }
+    }
+
+    /**
+     * A textual description of the current rule.
+     *
+     * @param bool short Show only short info without overview of assigned
+     *                   courses and institutes.
+     * @return String
+     */
+    public function toString($short=false) {
+        $tpl = $GLOBALS['template_factory']->open('admission/courseset/info');
+        $tpl->set_attribute('courseset', $this);
+        $tpl->set_attribute('is_limited', false);
+        $institutes = [];
+        if (!$short) {
+            $institutes = Institute::findAndMapMany(function($i) {return $i->name;}, array_keys($this->institutes), 'ORDER BY Name');
+            $tpl->set_attribute('institutes', $institutes);
+        }
+        if (!$short || $this->hasAdmissionRule('LimitedAdmission')) {
+            $courses = Course::findAndMapMany(function($c) {
+                return [
+                    'id' => $c->id,
+                    'name' => $c->getFullName('number-name-semester'),
+                    'visible' => $c->visible
+                ];
+            },
+                array_keys($this->courses),
+                'ORDER BY start_time,VeranstaltungsNummer,Name');
+            if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
+                $courses = array_filter($courses,
+                    function ($c) {
+                        return $c['visible'];
+                    }
+                );
+            }
+            $tpl->set_attribute('is_limited', $this->hasAdmissionRule('LimitedAdmission'));
+            $tpl->set_attribute('courses', $courses);
+        }
+        $tpl->set_attribute('short', $short);
+        return $tpl->render();
+    }
+
+    public function __toString() {
+        return $this->toString();
+    }
+
+    /**
+     * is user with given user id allowed to assign/unassign given course to courseset
+     *
+     * @param string $user_id
+     * @param string $course_id
+     * @return boolean
+     */
+    public function isUserAllowedToAssignCourse($user_id, $course_id)
+    {
+        global $perm;
+        $is_dozent = $perm->have_studip_perm('tutor', $course_id, $user_id);
+        $is_admin = $perm->have_perm('admin', $user_id) || ($perm->have_perm('dozent', $user_id) && Config::get()->ALLOW_DOZENT_COURSESET_ADMIN);
+        $is_private = $this->getPrivate();
+        $is_my_own = $this->getUserId() == $user_id;
+        $is_correct_institute = $this->isGlobal() || isset($this->institutes[Course::find($course_id)->institut_id]);
+        return $is_dozent && $is_correct_institute && ($is_my_own || $is_admin || !$is_private || $this->isGlobal()) || $perm->have_perm('root', $user_id);
+    }
+
+    /**
+     * is user with given user id allowed to edit or delete the courseset
+     *
+     * @param string $user_id
+     * @return boolean
+     */
+    public function isUserAllowedToEdit($user_id)
+    {
+        global $perm;
+
+        if ($this->getUserId() == '') {
+            return false;
+        }
+        if ($perm->have_perm('root', $user_id) || $this->getUserId() == $user_id) {
+            return true;
+        }
+        if (count($this->institutes) == 0 && count($this->courses) == 1 && $perm->have_studip_perm('tutor', current($this->getCourses()), $user_id)) {
+            return true;
+        }
+        if ($perm->have_perm('admin', $user_id) || ($perm->have_perm('dozent', $user_id) && Config::get()->ALLOW_DOZENT_COURSESET_ADMIN)) {
+            foreach (array_keys($this->getInstituteIds()) as $one) {
+                if ($perm->have_studip_perm('dozent', $one, $user_id)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * checks if given rule is allowed to be added to current set of rules
+     *
+     * @param AdmissionRule|string $admission_rule
+     * @return boolean
+     */
+    public function isAdmissionRuleAllowed($admission_rule)
+    {
+        foreach ($this->getAdmissionRules() as $one) {
+            if (!$one->isCombinationAllowed($admission_rule)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static function getGlobalLockedAdmissionSetId()
+    {
+        $db = DBManager::get();
+        $locked_set_id = $db->fetchColumn("SELECT cr.set_id FROM courseset_rule cr
+                                    INNER JOIN coursesets USING(set_id)
+                                    WHERE type='LockedAdmission' and private=1 and user_id='' LIMIT 1");
+        if (!$locked_set_id) {
+            $cs_insert = $db->prepare("INSERT INTO coursesets (set_id,user_id,name,infotext,algorithm,private,mkdate,chdate)
+                                   VALUES (?,?,?,?,'',?,?,?)");
+            $cs_r_insert = $db->prepare("INSERT INTO courseset_rule (set_id,rule_id,type,mkdate) VALUES (?,?,?,UNIX_TIMESTAMP())");
+            $locked_insert = $db->prepare("INSERT INTO lockedadmissions (rule_id,message,mkdate,chdate) VALUES (?,'Die Anmeldung ist gesperrt',UNIX_TIMESTAMP(),UNIX_TIMESTAMP())");
+            $locked_set_id = md5(uniqid('coursesets',1));
+            $name = 'Anmeldung gesperrt (global)';
+            $cs_insert->execute([$locked_set_id,'',$name,'',1,time(),time()]);
+            $locked_rule_id = md5(uniqid('lockedadmissions',1));
+            $locked_insert->execute([$locked_rule_id]);
+            $cs_r_insert->execute([$locked_set_id,$locked_rule_id,'LockedAdmission']);
+        }
+        return $locked_set_id;
+    }
+
+    public static function addCourseToSet($set_id, $course_id)
+    {
+        $db = DBManager::get();
+        $ok = $db->execute("INSERT IGNORE INTO seminar_courseset (set_id,seminar_id,mkdate) VALUES (?,?,UNIX_TIMESTAMP())", [$set_id, $course_id]);
+        if ($ok) {
+            StudipLog::log('SEM_CHANGED_ACCESS', $course_id,
+                null, 'Zuordnung zu Anmeldeset', sprintf('Anmeldeset: %s', $set_id));
+            $course = Course::find($course_id);
+            if ($course) {
+                $course->chdate = time();
+                $course->lesezugriff = 1;
+                $course->schreibzugriff = 1;
+                $course->store();
+            }
+        }
+        return $ok;
+    }
+
+    public static function removeCourseFromSet($set_id, $course_id)
+    {
+        $db = DBManager::get();
+        $ok =  $db->execute("DELETE FROM seminar_courseset WHERE set_id=? AND seminar_id=? LIMIT 1", [$set_id, $course_id]);
+        if ($ok) {
+            StudipLog::log('SEM_CHANGED_ACCESS', $course_id,
+                null, 'Entfernung von Anmeldeset', sprintf('Anmeldeset: %s', $set_id));
+            //Delete priorities
+            AdmissionPriority::unsetAllPrioritiesForCourse($course_id);
+            Course::buildExisting(['seminar_id' => $course_id])->triggerChdate();
+        }
+        return $ok;
+    }
+
+    public function __clone()
+    {
+        $this->courses = [];
+        $this->id = null;
+        $this->user_id = null;
+        $cloned_rules = [];
+        foreach ($this->admissionRules as $key => $rule) {
+            $dolly = clone $rule;
+            $cloned_rules[$dolly->id] = $dolly;
+        }
+        $this->admissionRules = $cloned_rules;
+    }
+
+} /* end of class CourseSet */
diff --git a/lib/classes/admission/RandomAlgorithm.class.php b/lib/classes/admission/RandomAlgorithm.class.php
deleted file mode 100644
index 54d44d7..0000000
--- a/lib/classes/admission/RandomAlgorithm.class.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-
-/**
- * RandomAlgorithm.class.php - Standard seat distribution algorithm
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       3.0
- */
-
-class RandomAlgorithm extends AdmissionAlgorithm
-{
-
-    /**
-     * Runs the algorithm, thus distributing course seats.
-     *
-     * @param CourseSet $courseSet The course set containing the courses
-     * that seats shall be distributed for.
-     * @see CourseSet
-     */
-    public function run($courseSet)
-    {
-        if ($courseSet->hasAdmissionRule('LimitedAdmission')) {
-            return $this->distributeByPriorities($courseSet);
-        } else {
-            return $this->distributeByCourses($courseSet);
-        }
-    }
-
-    /**
-     * Distribute seats for several courses in a course set.
-     * No priorities are given.
-     *
-     * @param CourseSet $courseSet The course set containing the courses
-     * that seats shall be distributed for.
-     * @see CourseSet
-     */
-    private function distributeByCourses($courseSet)
-    {
-        Log::debug('start seat distribution for course set: ' . $courseSet->getId());
-        $groups_quota = [];
-        $conditional_rule_filter = array_filter($courseSet->getAdmissionRules(), function ($r) {
-            return $r instanceof ConditionalAdmission
-                && count($r->getConditionGroups());
-        });
-        $conditional_rule = array_pop($conditional_rule_filter);
-        $conditiongroups = $conditional_rule ? $conditional_rule->getConditionGroups() : [];
-        if (count($conditiongroups)) {
-            foreach (array_keys($conditiongroups) as $group_id) {
-                $groups_quota[$group_id] = $conditional_rule->getQuota($group_id);
-            }
-        } else {
-            $groups_quota[] = 100;
-        }
-        foreach ($courseSet->getCourses() as $course_id) {
-            $waiting_users = [];
-            $course = Course::find($course_id);
-            if (!$course) {
-                Log::debug(sprintf('course %s not found, continue', $course_id));
-                continue;
-            }
-            $free_seats_course = $course->getFreeSeats();
-            foreach ($groups_quota as $group_id => $quota) {
-                $claiming_users = AdmissionPriority::getPrioritiesByCourse($courseSet->getId(), $course->id);
-                if (isset($conditiongroups[$group_id])) {
-                    Log::debug(sprintf('found conditiongroup %s with quota %s', $group_id, $quota));
-                    foreach(array_keys($claiming_users) as $user_id) {
-                        $condition_ok = true;
-                        foreach ($conditiongroups[$group_id] as $condition) {
-                            if ($condition->isFulfilled($user_id)) {
-                                $condition_ok = true;
-                                break;
-                            }
-                            $condition_ok = false;
-                        }
-                        if (!$condition_ok) {
-                            unset($claiming_users[$user_id]);
-                        }
-                    }
-                }
-                $factored_users = $courseSet->getUserFactorList();
-                //apply bonus/malus to users, exclude participants
-                foreach(array_keys($claiming_users) as $user_id) {
-                    if (!$course->getParticipantStatus($user_id)) {
-                        $claiming_users[$user_id] = 1;
-                        if (isset($factored_users[$user_id])) {
-                            $claiming_users[$user_id] =
-                                $factored_users[$user_id] == PHP_INT_MAX ?
-                                    PHP_INT_MAX :
-                                    $claiming_users[$user_id] * $factored_users[$user_id];
-                        }
-                        Log::debug(sprintf('user %s gets factor %s', $user_id, $claiming_users[$user_id]));
-                    } else {
-                        unset($claiming_users[$user_id]);
-                        Log::debug(sprintf('user %s is already %s, ignoring', $user_id, $course->getParticipantStatus($user_id)));
-                    }
-                }
-                $free_seats = round($free_seats_course * $quota / 100, 0, PHP_ROUND_HALF_DOWN);
-                Log::debug(sprintf('distribute %s seats on %s claiming in course %s %s', $free_seats, count($claiming_users), $course->id, ($group_id ? 'conditiongroup ' . $group_id . ' quota ' . $quota : '')));
-                $claiming_users = $this->rollTheDice($claiming_users);
-                Log::debug('the die is cast: ' . print_r($claiming_users,1));
-                $chosen_ones = array_slice(array_keys($claiming_users),0 , $free_seats);
-                Log::debug('chosen ones: ' . print_r($chosen_ones,1));
-                $this->addUsersToCourse($chosen_ones, $course);
-                foreach ($chosen_ones as $one) unset($waiting_users[$one]);
-                if ($free_seats < count($claiming_users)) {
-                    $remaining_ones = array_slice(array_keys($claiming_users), $free_seats);
-                    foreach ($remaining_ones as $one) {
-                        $waiting_users[$one] = $claiming_users[$one];
-                    }
-                }
-            }
-            if (count($waiting_users)) {
-                $waiting_users = $this->rollTheDice($waiting_users);
-                if (!$course->admission_disable_waitlist) {
-                    $free_seats_waitlist = $course->admission_waitlist_max ?: count($waiting_users);
-                    $waiting_list_ones = array_slice(array_keys($waiting_users), 0, $free_seats_waitlist);
-                    Log::debug('waiting list ones: ' . print_r($waiting_list_ones, 1));
-                    $this->addUsersToWaitlist($waiting_list_ones, $course);
-                } else {
-                    $free_seats_waitlist = 0;
-                }
-                if ($free_seats_waitlist < count($waiting_users)) {
-                    $remaining_ones = array_slice(array_keys($waiting_users),$free_seats_waitlist);
-                    Log::debug('remaining ones: ' . print_r($remaining_ones, 1));
-                    $this->notifyRemainingUsers($remaining_ones, $course);
-                }
-            }
-        }
-    }
-
-    /**
-     * Distribute seats for several courses in a course set using the given
-     * user priorities.
-     *
-     * @param CourseSet $courseSet The course set containing the courses
-     * that seats shall be distributed for.
-     * @see CourseSet
-     */
-    private function distributeByPriorities($courseSet)
-    {
-        Log::debug('start seat distribution for course set: ' . $courseSet->getId());
-        $limited_admission = $courseSet->getAdmissionRule('LimitedAdmission');
-        //all users with their priorities
-        $claiming_users = AdmissionPriority::getPriorities($courseSet->getId());
-
-        //all users which have bonus/malus
-        $factored_users = $courseSet->getUserFactorList();
-
-        //all users with their max number of courses
-        $max_seats_users = array_combine(array_keys($claiming_users),
-                                         array_map(function($u) use ($limited_admission) {return $limited_admission->getMaxNumberForUser($u);},
-                                                   array_keys($claiming_users)
-                                                   )
-                                         );
-        //unlucky users get a bonus for the next round
-        $bonus_users = [];
-
-        //users / courses für later waitlist distribution
-        $waiting_users = [];
-
-        //number of already distributed seats for users
-        $distributed_users = [];
-
-        $prio_mapper = function ($users, $course_id) use ($claiming_users) {
-            $mapper = function ($u) use ($course_id) {
-                return isset($u[$course_id]) ? $u[$course_id] : null;
-            };
-            return array_filter(array_map($mapper, array_intersect_key($claiming_users, array_flip($users))));
-        };
-
-        $groups_quota = [];
-        $conditional_rule_filter = array_filter($courseSet->getAdmissionRules(), function ($r) {
-            return $r instanceof ConditionalAdmission
-                && count($r->getConditionGroups());
-        });
-        $conditional_rule = array_pop($conditional_rule_filter);
-        $conditiongroups = $conditional_rule ? $conditional_rule->getConditionGroups() : [];
-        if (count($conditiongroups)) {
-            foreach (array_keys($conditiongroups) as $group_id) {
-                $groups_quota[$group_id] = $conditional_rule->getQuota($group_id);
-            }
-        } else {
-            $groups_quota[] = 100;
-        }
-
-        //sort courses by highest count of prio 1 applicants
-        $stats = AdmissionPriority::getPrioritiesStats($courseSet->getId());
-        $courses = array_map(function ($a) {return $a['h'];},$stats);
-        arsort($courses, SORT_NUMERIC);
-        $id_courses = array_filter(array_keys($courses));
-        $max_prio = AdmissionPriority::getPrioritiesMax($courseSet->getId());
-        //count already manually distributed places
-        $distributed_users = $this->countParticipatingUsers($id_courses, array_keys($claiming_users));
-        Log::debug('already distributed users: ' . print_r($distributed_users,1));
-        //walk through all prios with all courses
-        foreach(range(1, $max_prio) as $current_prio) {
-            foreach ($id_courses as $course_id) {
-                $course = Course::find($course_id);
-                if (!$course) {
-                    Log::debug(sprintf('course %s not found, continue', $course_id));
-                    continue;
-                }
-                $free_seats_course = $course->getFreeSeats();
-                foreach ($groups_quota as $group_id => $quota) {
-                    $current_claiming = [];
-                    //find users with current prio for this course, if they still need a place
-                    foreach ($claiming_users as $user_id => $prio_courses) {
-                        $condition_ok = true;
-                        if (isset($conditiongroups[$group_id])) {
-                            Log::debug(sprintf('found conditiongroup %s with quota %s', $group_id, $quota));
-                            foreach ($conditiongroups[$group_id] as $condition) {
-                                if ($condition->isFulfilled($user_id)) {
-                                    $condition_ok = true;
-                                    break;
-                                }
-                                $condition_ok = false;
-                            }
-                        }
-
-                        if ($condition_ok && $prio_courses[$course_id] == $current_prio
-                            && $distributed_users[$user_id] < $max_seats_users[$user_id]) {
-                            //exclude participants
-                            if (!$course->getParticipantStatus($user_id)) {
-                                $current_claiming[$user_id] = 1;
-                                if (isset($factored_users[$user_id])) {
-                                    $current_claiming[$user_id] =
-                                        $factored_users[$user_id] == PHP_INT_MAX ?
-                                            PHP_INT_MAX :
-                                            $current_claiming[$user_id] * $factored_users[$user_id];
-                                }
-                            } else {
-                                Log::debug(sprintf('user %s is already %s in course %s, ignoring', $user_id, $course->getParticipantStatus($user_id), $course->id));
-                            }
-                        }
-                    }
-                    //give maximum bonus to users which were unlucky before
-                    foreach (array_keys($current_claiming) as $user_id) {
-                        if ($bonus_users[$user_id] > 0) {
-                            $current_claiming[$user_id] *= $bonus_users[$user_id] * count($current_claiming) + 1;
-                        }
-                    }
-                    $free_seats = round($free_seats_course * $quota / 100, 0, PHP_ROUND_HALF_DOWN);
-                    Log::debug(sprintf('distribute %s seats on %s claiming with prio %s in course %s %s', $free_seats, count($current_claiming),$current_prio, $course->id, ($group_id ? 'conditiongroup ' . $group_id . ' quota ' . $quota : '')));
-                    Log::debug('users to distribute: ' . print_r($current_claiming,1));
-                    $current_claiming = $this->rollTheDice($current_claiming);
-                    Log::debug('the die is cast: ' . print_r($current_claiming,1));
-                    $chosen_ones = array_slice(array_keys($current_claiming),0 , $free_seats);
-                    Log::debug('chosen ones: ' . print_r($chosen_ones,1));
-                    $this->addUsersToCourse($chosen_ones, $course, $prio_mapper($chosen_ones, $course->id));
-                    foreach ($chosen_ones as $one) {
-                        $distributed_users[$one]++;
-                        $bonus_users[$one]--;
-                    }
-                    if ($free_seats < count($current_claiming)) {
-                        $remaining_ones = array_slice(array_keys($current_claiming), $free_seats);
-                        foreach ($remaining_ones as $one) {
-                            $bonus_users[$one]++;
-                            $waiting_users[$current_prio][$course_id][] = $one;
-                        }
-                    }
-                }
-            }
-        }
-        //distribute to waitlists if applicable
-        Log::debug('waiting list: ' . print_r($waiting_users, 1));
-        foreach ($waiting_users as $current_prio => $current_prio_waiting_courses) {
-            foreach ($current_prio_waiting_courses as $course_id => $users) {
-                $users = array_filter(array_unique($users), function($user_id) use ($distributed_users, $max_seats_users) {
-                    return $distributed_users[$user_id] < $max_seats_users[$user_id];});
-                    $course = Course::find($course_id);
-                    Log::debug(sprintf('distribute waitlist of %s with prio %s in course %s', count($users), $current_prio, $course->id));
-                    if (!$course->admission_disable_waitlist) {
-                        if ($course->admission_waitlist_max) {
-                            $free_seats_waitlist = $course->admission_waitlist_max - $course->getNumWaiting();
-                            $free_seats_waitlist = $free_seats_waitlist < 0 ? 0 : $free_seats_waitlist;
-                        } else {
-                            $free_seats_waitlist = count($users);
-                        }
-                        $waiting_list_ones = array_slice($users, 0, $free_seats_waitlist);
-                        Log::debug('waiting list ones: ' . print_r($waiting_list_ones, 1));
-                        $this->addUsersToWaitlist($waiting_list_ones, $course, $prio_mapper($waiting_list_ones, $course->id));
-                        foreach ($waiting_list_ones as $one) {
-                            $distributed_users[$one]++;
-                        }
-                    } else {
-                        $free_seats_waitlist = 0;
-                    }
-                    if ($free_seats_waitlist < count($users)) {
-                        $remaining_ones = array_slice($users, $free_seats_waitlist);
-                        Log::debug('remaining ones: ' . print_r($remaining_ones, 1));
-                        $this->notifyRemainingUsers($remaining_ones, $course, $prio_mapper($remaining_ones, $course->id));
-                    }
-            }
-        }
-    }
-
-    /**
-     * Notify users about the fact that they couldn't get a seat and the
-     * waiting list is disabled in a course.
-     *
-     * @param Array  $user_list Users to be notified
-     * @param Course $course    The course without waiting list
-     * @param int    $prio      User's priority for the given course.
-     */
-    public function notifyRemainingUsers($user_list, $course, $prio = null)
-    {
-        foreach ($user_list as $chosen_one) {
-            setTempLanguage($chosen_one);
-            $message_title = sprintf(_('Teilnahme an der Veranstaltung %s'), $course->name);
-            $message_body = sprintf(_('Sie haben leider bei der Platzverteilung der Veranstaltung **%s** __keinen__ Platz erhalten.'),
-                                       $course->name);
-            if ($prio) {
-                $message_body .= "\n" . sprintf(_("Sie hatten für diese Veranstaltung die Priorität %s gewählt."), $prio[$chosen_one]);
-            }
-            messaging::sendSystemMessage($chosen_one, $message_title, $message_body);
-            restoreLanguage();
-        }
-    }
-
-    /**
-     * Notify users that they couldn't get a seat but are now on the waiting
-     * list for a given course.
-     *
-     * @param Array  $user_list Users to be notified
-     * @param Course $course    The course without waiting list
-     * @param int    $prio      User's priority for the given course.
-     */
-    private function addUsersToWaitlist($user_list, $course, $prio = null)
-    {
-        $maxpos = $course->admission_applicants->findBy('status', 'awaiting')->orderBy('position desc')->val('position');
-        foreach ($user_list as $chosen_one) {
-            if ($course->getParticipantStatus($chosen_one)) {
-                continue;
-            }
-            $maxpos++;
-            $new_admission_member = new AdmissionApplication();
-            $new_admission_member->user_id = $chosen_one;
-            $new_admission_member->position = $maxpos;
-            $new_admission_member->status = 'awaiting';
-            try {
-                $course->admission_applicants[] = $new_admission_member;
-            } catch (InvalidArgumentException $e) {
-                Log::debug($e->getMessage());
-                continue;
-            }
-            if ($new_admission_member->store()) {
-                setTempLanguage($chosen_one);
-                $message_title = sprintf(_('Teilnahme an der Veranstaltung %s'), $course->name);
-                $message_body = sprintf(_('Sie haben leider bei der Platzverteilung der Veranstaltung **%s** __keinen__ Platz erhalten. Sie wurden jedoch auf Position %s auf die Warteliste gesetzt. Das System wird Sie automatisch eintragen und benachrichtigen, sobald ein Platz für Sie frei wird.'),
-                                           $course->name,
-                                           $maxpos);
-                if ($prio) {
-                    $message_body .= "\n" . sprintf(_("Sie hatten für diese Veranstaltung die Priorität %s gewählt."), $prio[$chosen_one]);
-                }
-                messaging::sendSystemMessage($chosen_one, $message_title, $message_body);
-                restoreLanguage();
-                StudipLog::log('SEM_USER_ADD', $course->id, $chosen_one, 'awaiting', 'Auf Warteliste gelost, Position: ' . $maxpos);
-            }
-        }
-    }
-
-    /**
-     * Add the lucky ones who got a seat to the given course.
-     *
-     * @param Array  $user_list users to add as members
-     * @param Course $course    course to add users to
-     * @param int    $prio      user's priority for the given course
-     */
-    private function addUsersToCourse($user_list, $course, $prio = null)
-    {
-        $seminar = new Seminar($course);
-        foreach ($user_list as $chosen_one) {
-            setTempLanguage($chosen_one);
-            $message_title = sprintf(_('Teilnahme an der Veranstaltung %s'), $seminar->getName());
-            if ($seminar->admission_prelim) {
-                if ($seminar->addPreliminaryMember($chosen_one)) {
-                    $message_body = sprintf (_('Sie haben bei der Platzvergabe der Veranstaltung **%s** einen vorläufigen Platz erhalten. Die endgültige Zulassung zu der Veranstaltung ist noch von weiteren Bedingungen abhängig, die Sie bitte der Veranstaltungsbeschreibung entnehmen.'),
-                            $seminar->getName());
-                }
-            } else {
-                if ($seminar->addMember($chosen_one, 'autor')) {
-                    $message_body = sprintf (_("Sie haben bei der Platzvergabe der Veranstaltung **%s** einen Platz erhalten. Damit sind Sie für die Teilnahme an der Veranstaltung zugelassen. Ab sofort finden Sie die Veranstaltung in der Übersicht Ihrer Veranstaltungen."),
-                            $seminar->getName());
-                }
-            }
-            if ($prio) {
-                $message_body .= "\n" . sprintf(_("Sie hatten für diese Veranstaltung die Priorität %s gewählt."), $prio[$chosen_one]);
-            }
-            messaging::sendSystemMessage($chosen_one, $message_title, $message_body);
-            restoreLanguage();
-        }
-    }
-
-    /**
-     * Caedite eos. Novit enim Dominus qui sunt eius.
-     *
-     * @param array $user_list
-     */
-    private function rollTheDice($user_list)
-    {
-        $max = count($user_list);
-        foreach($user_list as $user_id => $factor) {
-            $user_list[$user_id] = $factor * mt_rand(1, $max);
-        }
-        arsort($user_list, SORT_NUMERIC);
-        return $user_list;
-    }
-
-    /**
-     * How many users have gotten a seat in distribution?
-     *
-     * @return Number of users who where lucky enough to be course members now.
-     */
-    public function countParticipatingUsers($course_ids, $user_ids)
-    {
-        $distributed_users = [];
-        $sum = function($r) use (&$distributed_users) {
-            $distributed_users[$r['user_id']] += $r['c'];
-        };
-        $db = DBManager::get();
-        $db->fetchAll("SELECT user_id, COUNT(*) as c FROM seminar_user
-            WHERE seminar_id IN(?) AND user_id IN(?) AND status IN (?) GROUP BY user_id",
-            [$course_ids, $user_ids, ['user', 'autor']], $sum);
-        $db->fetchAll("SELECT user_id, COUNT(*) as c FROM admission_seminar_user
-            WHERE seminar_id IN(?) AND user_id IN(?) GROUP BY user_id", [$course_ids, $user_ids], $sum);
-        return $distributed_users;
-    }
-
-}
diff --git a/lib/classes/admission/RandomAlgorithm.php b/lib/classes/admission/RandomAlgorithm.php
new file mode 100644
index 0000000..54d44d7
--- /dev/null
+++ b/lib/classes/admission/RandomAlgorithm.php
@@ -0,0 +1,437 @@
+<?php
+
+/**
+ * RandomAlgorithm.class.php - Standard seat distribution algorithm
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       3.0
+ */
+
+class RandomAlgorithm extends AdmissionAlgorithm
+{
+
+    /**
+     * Runs the algorithm, thus distributing course seats.
+     *
+     * @param CourseSet $courseSet The course set containing the courses
+     * that seats shall be distributed for.
+     * @see CourseSet
+     */
+    public function run($courseSet)
+    {
+        if ($courseSet->hasAdmissionRule('LimitedAdmission')) {
+            return $this->distributeByPriorities($courseSet);
+        } else {
+            return $this->distributeByCourses($courseSet);
+        }
+    }
+
+    /**
+     * Distribute seats for several courses in a course set.
+     * No priorities are given.
+     *
+     * @param CourseSet $courseSet The course set containing the courses
+     * that seats shall be distributed for.
+     * @see CourseSet
+     */
+    private function distributeByCourses($courseSet)
+    {
+        Log::debug('start seat distribution for course set: ' . $courseSet->getId());
+        $groups_quota = [];
+        $conditional_rule_filter = array_filter($courseSet->getAdmissionRules(), function ($r) {
+            return $r instanceof ConditionalAdmission
+                && count($r->getConditionGroups());
+        });
+        $conditional_rule = array_pop($conditional_rule_filter);
+        $conditiongroups = $conditional_rule ? $conditional_rule->getConditionGroups() : [];
+        if (count($conditiongroups)) {
+            foreach (array_keys($conditiongroups) as $group_id) {
+                $groups_quota[$group_id] = $conditional_rule->getQuota($group_id);
+            }
+        } else {
+            $groups_quota[] = 100;
+        }
+        foreach ($courseSet->getCourses() as $course_id) {
+            $waiting_users = [];
+            $course = Course::find($course_id);
+            if (!$course) {
+                Log::debug(sprintf('course %s not found, continue', $course_id));
+                continue;
+            }
+            $free_seats_course = $course->getFreeSeats();
+            foreach ($groups_quota as $group_id => $quota) {
+                $claiming_users = AdmissionPriority::getPrioritiesByCourse($courseSet->getId(), $course->id);
+                if (isset($conditiongroups[$group_id])) {
+                    Log::debug(sprintf('found conditiongroup %s with quota %s', $group_id, $quota));
+                    foreach(array_keys($claiming_users) as $user_id) {
+                        $condition_ok = true;
+                        foreach ($conditiongroups[$group_id] as $condition) {
+                            if ($condition->isFulfilled($user_id)) {
+                                $condition_ok = true;
+                                break;
+                            }
+                            $condition_ok = false;
+                        }
+                        if (!$condition_ok) {
+                            unset($claiming_users[$user_id]);
+                        }
+                    }
+                }
+                $factored_users = $courseSet->getUserFactorList();
+                //apply bonus/malus to users, exclude participants
+                foreach(array_keys($claiming_users) as $user_id) {
+                    if (!$course->getParticipantStatus($user_id)) {
+                        $claiming_users[$user_id] = 1;
+                        if (isset($factored_users[$user_id])) {
+                            $claiming_users[$user_id] =
+                                $factored_users[$user_id] == PHP_INT_MAX ?
+                                    PHP_INT_MAX :
+                                    $claiming_users[$user_id] * $factored_users[$user_id];
+                        }
+                        Log::debug(sprintf('user %s gets factor %s', $user_id, $claiming_users[$user_id]));
+                    } else {
+                        unset($claiming_users[$user_id]);
+                        Log::debug(sprintf('user %s is already %s, ignoring', $user_id, $course->getParticipantStatus($user_id)));
+                    }
+                }
+                $free_seats = round($free_seats_course * $quota / 100, 0, PHP_ROUND_HALF_DOWN);
+                Log::debug(sprintf('distribute %s seats on %s claiming in course %s %s', $free_seats, count($claiming_users), $course->id, ($group_id ? 'conditiongroup ' . $group_id . ' quota ' . $quota : '')));
+                $claiming_users = $this->rollTheDice($claiming_users);
+                Log::debug('the die is cast: ' . print_r($claiming_users,1));
+                $chosen_ones = array_slice(array_keys($claiming_users),0 , $free_seats);
+                Log::debug('chosen ones: ' . print_r($chosen_ones,1));
+                $this->addUsersToCourse($chosen_ones, $course);
+                foreach ($chosen_ones as $one) unset($waiting_users[$one]);
+                if ($free_seats < count($claiming_users)) {
+                    $remaining_ones = array_slice(array_keys($claiming_users), $free_seats);
+                    foreach ($remaining_ones as $one) {
+                        $waiting_users[$one] = $claiming_users[$one];
+                    }
+                }
+            }
+            if (count($waiting_users)) {
+                $waiting_users = $this->rollTheDice($waiting_users);
+                if (!$course->admission_disable_waitlist) {
+                    $free_seats_waitlist = $course->admission_waitlist_max ?: count($waiting_users);
+                    $waiting_list_ones = array_slice(array_keys($waiting_users), 0, $free_seats_waitlist);
+                    Log::debug('waiting list ones: ' . print_r($waiting_list_ones, 1));
+                    $this->addUsersToWaitlist($waiting_list_ones, $course);
+                } else {
+                    $free_seats_waitlist = 0;
+                }
+                if ($free_seats_waitlist < count($waiting_users)) {
+                    $remaining_ones = array_slice(array_keys($waiting_users),$free_seats_waitlist);
+                    Log::debug('remaining ones: ' . print_r($remaining_ones, 1));
+                    $this->notifyRemainingUsers($remaining_ones, $course);
+                }
+            }
+        }
+    }
+
+    /**
+     * Distribute seats for several courses in a course set using the given
+     * user priorities.
+     *
+     * @param CourseSet $courseSet The course set containing the courses
+     * that seats shall be distributed for.
+     * @see CourseSet
+     */
+    private function distributeByPriorities($courseSet)
+    {
+        Log::debug('start seat distribution for course set: ' . $courseSet->getId());
+        $limited_admission = $courseSet->getAdmissionRule('LimitedAdmission');
+        //all users with their priorities
+        $claiming_users = AdmissionPriority::getPriorities($courseSet->getId());
+
+        //all users which have bonus/malus
+        $factored_users = $courseSet->getUserFactorList();
+
+        //all users with their max number of courses
+        $max_seats_users = array_combine(array_keys($claiming_users),
+                                         array_map(function($u) use ($limited_admission) {return $limited_admission->getMaxNumberForUser($u);},
+                                                   array_keys($claiming_users)
+                                                   )
+                                         );
+        //unlucky users get a bonus for the next round
+        $bonus_users = [];
+
+        //users / courses für later waitlist distribution
+        $waiting_users = [];
+
+        //number of already distributed seats for users
+        $distributed_users = [];
+
+        $prio_mapper = function ($users, $course_id) use ($claiming_users) {
+            $mapper = function ($u) use ($course_id) {
+                return isset($u[$course_id]) ? $u[$course_id] : null;
+            };
+            return array_filter(array_map($mapper, array_intersect_key($claiming_users, array_flip($users))));
+        };
+
+        $groups_quota = [];
+        $conditional_rule_filter = array_filter($courseSet->getAdmissionRules(), function ($r) {
+            return $r instanceof ConditionalAdmission
+                && count($r->getConditionGroups());
+        });
+        $conditional_rule = array_pop($conditional_rule_filter);
+        $conditiongroups = $conditional_rule ? $conditional_rule->getConditionGroups() : [];
+        if (count($conditiongroups)) {
+            foreach (array_keys($conditiongroups) as $group_id) {
+                $groups_quota[$group_id] = $conditional_rule->getQuota($group_id);
+            }
+        } else {
+            $groups_quota[] = 100;
+        }
+
+        //sort courses by highest count of prio 1 applicants
+        $stats = AdmissionPriority::getPrioritiesStats($courseSet->getId());
+        $courses = array_map(function ($a) {return $a['h'];},$stats);
+        arsort($courses, SORT_NUMERIC);
+        $id_courses = array_filter(array_keys($courses));
+        $max_prio = AdmissionPriority::getPrioritiesMax($courseSet->getId());
+        //count already manually distributed places
+        $distributed_users = $this->countParticipatingUsers($id_courses, array_keys($claiming_users));
+        Log::debug('already distributed users: ' . print_r($distributed_users,1));
+        //walk through all prios with all courses
+        foreach(range(1, $max_prio) as $current_prio) {
+            foreach ($id_courses as $course_id) {
+                $course = Course::find($course_id);
+                if (!$course) {
+                    Log::debug(sprintf('course %s not found, continue', $course_id));
+                    continue;
+                }
+                $free_seats_course = $course->getFreeSeats();
+                foreach ($groups_quota as $group_id => $quota) {
+                    $current_claiming = [];
+                    //find users with current prio for this course, if they still need a place
+                    foreach ($claiming_users as $user_id => $prio_courses) {
+                        $condition_ok = true;
+                        if (isset($conditiongroups[$group_id])) {
+                            Log::debug(sprintf('found conditiongroup %s with quota %s', $group_id, $quota));
+                            foreach ($conditiongroups[$group_id] as $condition) {
+                                if ($condition->isFulfilled($user_id)) {
+                                    $condition_ok = true;
+                                    break;
+                                }
+                                $condition_ok = false;
+                            }
+                        }
+
+                        if ($condition_ok && $prio_courses[$course_id] == $current_prio
+                            && $distributed_users[$user_id] < $max_seats_users[$user_id]) {
+                            //exclude participants
+                            if (!$course->getParticipantStatus($user_id)) {
+                                $current_claiming[$user_id] = 1;
+                                if (isset($factored_users[$user_id])) {
+                                    $current_claiming[$user_id] =
+                                        $factored_users[$user_id] == PHP_INT_MAX ?
+                                            PHP_INT_MAX :
+                                            $current_claiming[$user_id] * $factored_users[$user_id];
+                                }
+                            } else {
+                                Log::debug(sprintf('user %s is already %s in course %s, ignoring', $user_id, $course->getParticipantStatus($user_id), $course->id));
+                            }
+                        }
+                    }
+                    //give maximum bonus to users which were unlucky before
+                    foreach (array_keys($current_claiming) as $user_id) {
+                        if ($bonus_users[$user_id] > 0) {
+                            $current_claiming[$user_id] *= $bonus_users[$user_id] * count($current_claiming) + 1;
+                        }
+                    }
+                    $free_seats = round($free_seats_course * $quota / 100, 0, PHP_ROUND_HALF_DOWN);
+                    Log::debug(sprintf('distribute %s seats on %s claiming with prio %s in course %s %s', $free_seats, count($current_claiming),$current_prio, $course->id, ($group_id ? 'conditiongroup ' . $group_id . ' quota ' . $quota : '')));
+                    Log::debug('users to distribute: ' . print_r($current_claiming,1));
+                    $current_claiming = $this->rollTheDice($current_claiming);
+                    Log::debug('the die is cast: ' . print_r($current_claiming,1));
+                    $chosen_ones = array_slice(array_keys($current_claiming),0 , $free_seats);
+                    Log::debug('chosen ones: ' . print_r($chosen_ones,1));
+                    $this->addUsersToCourse($chosen_ones, $course, $prio_mapper($chosen_ones, $course->id));
+                    foreach ($chosen_ones as $one) {
+                        $distributed_users[$one]++;
+                        $bonus_users[$one]--;
+                    }
+                    if ($free_seats < count($current_claiming)) {
+                        $remaining_ones = array_slice(array_keys($current_claiming), $free_seats);
+                        foreach ($remaining_ones as $one) {
+                            $bonus_users[$one]++;
+                            $waiting_users[$current_prio][$course_id][] = $one;
+                        }
+                    }
+                }
+            }
+        }
+        //distribute to waitlists if applicable
+        Log::debug('waiting list: ' . print_r($waiting_users, 1));
+        foreach ($waiting_users as $current_prio => $current_prio_waiting_courses) {
+            foreach ($current_prio_waiting_courses as $course_id => $users) {
+                $users = array_filter(array_unique($users), function($user_id) use ($distributed_users, $max_seats_users) {
+                    return $distributed_users[$user_id] < $max_seats_users[$user_id];});
+                    $course = Course::find($course_id);
+                    Log::debug(sprintf('distribute waitlist of %s with prio %s in course %s', count($users), $current_prio, $course->id));
+                    if (!$course->admission_disable_waitlist) {
+                        if ($course->admission_waitlist_max) {
+                            $free_seats_waitlist = $course->admission_waitlist_max - $course->getNumWaiting();
+                            $free_seats_waitlist = $free_seats_waitlist < 0 ? 0 : $free_seats_waitlist;
+                        } else {
+                            $free_seats_waitlist = count($users);
+                        }
+                        $waiting_list_ones = array_slice($users, 0, $free_seats_waitlist);
+                        Log::debug('waiting list ones: ' . print_r($waiting_list_ones, 1));
+                        $this->addUsersToWaitlist($waiting_list_ones, $course, $prio_mapper($waiting_list_ones, $course->id));
+                        foreach ($waiting_list_ones as $one) {
+                            $distributed_users[$one]++;
+                        }
+                    } else {
+                        $free_seats_waitlist = 0;
+                    }
+                    if ($free_seats_waitlist < count($users)) {
+                        $remaining_ones = array_slice($users, $free_seats_waitlist);
+                        Log::debug('remaining ones: ' . print_r($remaining_ones, 1));
+                        $this->notifyRemainingUsers($remaining_ones, $course, $prio_mapper($remaining_ones, $course->id));
+                    }
+            }
+        }
+    }
+
+    /**
+     * Notify users about the fact that they couldn't get a seat and the
+     * waiting list is disabled in a course.
+     *
+     * @param Array  $user_list Users to be notified
+     * @param Course $course    The course without waiting list
+     * @param int    $prio      User's priority for the given course.
+     */
+    public function notifyRemainingUsers($user_list, $course, $prio = null)
+    {
+        foreach ($user_list as $chosen_one) {
+            setTempLanguage($chosen_one);
+            $message_title = sprintf(_('Teilnahme an der Veranstaltung %s'), $course->name);
+            $message_body = sprintf(_('Sie haben leider bei der Platzverteilung der Veranstaltung **%s** __keinen__ Platz erhalten.'),
+                                       $course->name);
+            if ($prio) {
+                $message_body .= "\n" . sprintf(_("Sie hatten für diese Veranstaltung die Priorität %s gewählt."), $prio[$chosen_one]);
+            }
+            messaging::sendSystemMessage($chosen_one, $message_title, $message_body);
+            restoreLanguage();
+        }
+    }
+
+    /**
+     * Notify users that they couldn't get a seat but are now on the waiting
+     * list for a given course.
+     *
+     * @param Array  $user_list Users to be notified
+     * @param Course $course    The course without waiting list
+     * @param int    $prio      User's priority for the given course.
+     */
+    private function addUsersToWaitlist($user_list, $course, $prio = null)
+    {
+        $maxpos = $course->admission_applicants->findBy('status', 'awaiting')->orderBy('position desc')->val('position');
+        foreach ($user_list as $chosen_one) {
+            if ($course->getParticipantStatus($chosen_one)) {
+                continue;
+            }
+            $maxpos++;
+            $new_admission_member = new AdmissionApplication();
+            $new_admission_member->user_id = $chosen_one;
+            $new_admission_member->position = $maxpos;
+            $new_admission_member->status = 'awaiting';
+            try {
+                $course->admission_applicants[] = $new_admission_member;
+            } catch (InvalidArgumentException $e) {
+                Log::debug($e->getMessage());
+                continue;
+            }
+            if ($new_admission_member->store()) {
+                setTempLanguage($chosen_one);
+                $message_title = sprintf(_('Teilnahme an der Veranstaltung %s'), $course->name);
+                $message_body = sprintf(_('Sie haben leider bei der Platzverteilung der Veranstaltung **%s** __keinen__ Platz erhalten. Sie wurden jedoch auf Position %s auf die Warteliste gesetzt. Das System wird Sie automatisch eintragen und benachrichtigen, sobald ein Platz für Sie frei wird.'),
+                                           $course->name,
+                                           $maxpos);
+                if ($prio) {
+                    $message_body .= "\n" . sprintf(_("Sie hatten für diese Veranstaltung die Priorität %s gewählt."), $prio[$chosen_one]);
+                }
+                messaging::sendSystemMessage($chosen_one, $message_title, $message_body);
+                restoreLanguage();
+                StudipLog::log('SEM_USER_ADD', $course->id, $chosen_one, 'awaiting', 'Auf Warteliste gelost, Position: ' . $maxpos);
+            }
+        }
+    }
+
+    /**
+     * Add the lucky ones who got a seat to the given course.
+     *
+     * @param Array  $user_list users to add as members
+     * @param Course $course    course to add users to
+     * @param int    $prio      user's priority for the given course
+     */
+    private function addUsersToCourse($user_list, $course, $prio = null)
+    {
+        $seminar = new Seminar($course);
+        foreach ($user_list as $chosen_one) {
+            setTempLanguage($chosen_one);
+            $message_title = sprintf(_('Teilnahme an der Veranstaltung %s'), $seminar->getName());
+            if ($seminar->admission_prelim) {
+                if ($seminar->addPreliminaryMember($chosen_one)) {
+                    $message_body = sprintf (_('Sie haben bei der Platzvergabe der Veranstaltung **%s** einen vorläufigen Platz erhalten. Die endgültige Zulassung zu der Veranstaltung ist noch von weiteren Bedingungen abhängig, die Sie bitte der Veranstaltungsbeschreibung entnehmen.'),
+                            $seminar->getName());
+                }
+            } else {
+                if ($seminar->addMember($chosen_one, 'autor')) {
+                    $message_body = sprintf (_("Sie haben bei der Platzvergabe der Veranstaltung **%s** einen Platz erhalten. Damit sind Sie für die Teilnahme an der Veranstaltung zugelassen. Ab sofort finden Sie die Veranstaltung in der Übersicht Ihrer Veranstaltungen."),
+                            $seminar->getName());
+                }
+            }
+            if ($prio) {
+                $message_body .= "\n" . sprintf(_("Sie hatten für diese Veranstaltung die Priorität %s gewählt."), $prio[$chosen_one]);
+            }
+            messaging::sendSystemMessage($chosen_one, $message_title, $message_body);
+            restoreLanguage();
+        }
+    }
+
+    /**
+     * Caedite eos. Novit enim Dominus qui sunt eius.
+     *
+     * @param array $user_list
+     */
+    private function rollTheDice($user_list)
+    {
+        $max = count($user_list);
+        foreach($user_list as $user_id => $factor) {
+            $user_list[$user_id] = $factor * mt_rand(1, $max);
+        }
+        arsort($user_list, SORT_NUMERIC);
+        return $user_list;
+    }
+
+    /**
+     * How many users have gotten a seat in distribution?
+     *
+     * @return Number of users who where lucky enough to be course members now.
+     */
+    public function countParticipatingUsers($course_ids, $user_ids)
+    {
+        $distributed_users = [];
+        $sum = function($r) use (&$distributed_users) {
+            $distributed_users[$r['user_id']] += $r['c'];
+        };
+        $db = DBManager::get();
+        $db->fetchAll("SELECT user_id, COUNT(*) as c FROM seminar_user
+            WHERE seminar_id IN(?) AND user_id IN(?) AND status IN (?) GROUP BY user_id",
+            [$course_ids, $user_ids, ['user', 'autor']], $sum);
+        $db->fetchAll("SELECT user_id, COUNT(*) as c FROM admission_seminar_user
+            WHERE seminar_id IN(?) AND user_id IN(?) GROUP BY user_id", [$course_ids, $user_ids], $sum);
+        return $distributed_users;
+    }
+
+}
diff --git a/lib/classes/admission/UserFilter.class.php b/lib/classes/admission/UserFilter.class.php
deleted file mode 100644
index d380ef0..0000000
--- a/lib/classes/admission/UserFilter.class.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * UserFilter.class.php
- *
- * Conditions for user selection in Stud.IP. A condition is a collection of
- * condition fields, e.g. degree, course of study or semester. Each
- * condition can have a validity period.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class UserFilter
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * All condition fields that form this condition.
-     */
-    public $fields = [];
-
-    /**
-     * Unique identifier for this condition.
-     */
-    public $id = '';
-
-    public $show_user_count = false;
-    // --- OPERATIONS ---
-
-    /**
-     * Standard constructor.
-     *
-     * @param  String conditionId
-     * @return UserFilter
-     */
-    public function __construct($conditionId='')
-    {
-        UserFilterField::getAvailableFilterFields();
-        $this->id = $conditionId;
-        if ($conditionId) {
-            $this->load();
-        } else {
-            $this->id = $this->generateId();
-        }
-        return $this;
-    }
-
-    /**
-     * Add a new condition field.
-     *
-     * @param  ConditionField fieldId
-     * @return UserFilter
-     */
-    public function addField($field)
-    {
-        $this->fields[$field->getId()] = $field;
-        $field->setConditionId($this->id);
-        return $this;
-    }
-
-    /**
-     * Deletes the condition and all associated fields.
-     */
-    public function delete() {
-        // Delete condition data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `userfilter`
-            WHERE `filter_id`=?");
-        $stmt->execute([$this->id]);
-        // Delete all defined condition fields.
-        foreach ($this->fields as $field) {
-            $field->delete();
-        }
-    }
-
-    /**
-     * Generate a new unique ID.
-     *
-     * @param  String tableName
-     */
-    public function generateId() {
-        do {
-            $newid = md5(uniqid(get_class($this).microtime(), true));
-            $id = DBManager::get()->fetchColumn("SELECT `filter_id`
-                FROM `userfilter` WHERE `filter_id`=?", [$newid]);
-        } while ($id);
-        return $newid;
-    }
-
-    /**
-     * Get all fields (without checking for validity according
-     * to the current time).
-     *
-     * @return Array
-     */
-    public function getFields()
-    {
-        uasort($this->fields, function($a, $b) {
-            return $a->sortOrder -  $b->sortOrder;
-        });
-        return $this->fields;
-    }
-
-    /**
-     * Get ID.
-     *
-     * @return String
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Gets all users that fulfill the current condition.
-     *
-     * @return Array
-     */
-    public function getUsers() {
-        $users = null;
-        foreach ($this->fields as $field) {
-            // Check if restrictions for the field value must be taken into consideration.
-            $restrictions = [];
-            foreach ($field->relations as $className => $related) {
-                if ($other = $this->hasField($className)) {
-                    if ($other->getValue()) {
-                        $restrictions[$className] = [
-                            'table' => $other->userDataDbTable,
-                            'field' => $other->userDataDbField,
-                            'compare' => $other->getCompareOperator(),
-                            'value' => $other->getValue()
-                        ];
-                    }
-                }
-            }
-            $users = isset($users) ? array_intersect($users, $field->getUsers($restrictions)) : $field->getUsers($restrictions);
-        }
-        return (array) $users;
-    }
-
-    /**
-     * Checks whether the current filter object contains a field
-     * of the given type.
-     *
-     * @param String $className the type to check for
-     * @return UserFilterField Return the found field or null if not applicable.
-     */
-    public function hasField($className) {
-        foreach ($this->fields as $field) {
-            if ($field instanceof $className) {
-                return $field;
-                break;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Is the current condition fulfilled (that means, are all
-     * required field values matched)?
-     *
-     * @return boolean
-     */
-    public function isFulfilled($userId)
-    {
-        // Check all fields.
-        foreach ($this->fields as $field) {
-            if (!$field->checkValue($field->getUserValues($userId, $this->fields))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Helper function for loading data from DB.
-     */
-    public function load() {
-        // Load basic condition data.
-        $stmt = DBManager::get()->prepare(
-            "SELECT * FROM `userfilter` WHERE `filter_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->id = $data['filter_id'];
-            // Load the associated condition fields.
-            $stmt = DBManager::get()->prepare(
-                "SELECT `field_id`, `type` FROM `userfilter_fields`
-                WHERE `filter_id`=?");
-            $stmt->execute([$this->id]);
-            while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-                /*
-                 * Create instance of appropriate UserFilterField subclass.
-                 * We just "try" here because the class definition could have
-                 * been removed since saving data to DB.
-                 */
-                //try {
-                    $chunks = explode('_', $data['type']);
-                    $type = $chunks[0];
-                    $param = $chunks[1] ?? null;
-                    if ($param) {
-                        $field = new $type($param, $data['field_id']);
-                    } else {
-                        $field = new $type($data['field_id']);
-                    }
-
-                    $this->fields[$field->getId()] = $field;
-                //} catch (Exception $e) {}
-            }
-        }
-    }
-
-    /**
-     * Removes the field with the given ID from the condition fields.
-     *
-     * @param  String fieldId
-     * @return UserFilter
-     */
-    public function removeField($fieldId)
-    {
-        unset($this->fields[$fieldId]);
-        return $this;
-    }
-
-    /**
-     * Stores data to DB.
-     */
-    public function store() {
-        // Generate new ID if condition entry doesn't exist in DB yet.
-        if (!$this->id) {
-            $this->id = $this->generateId();
-        }
-
-        // Store condition data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `userfilter`
-            (`filter_id`, `mkdate`, `chdate`)
-            VALUES (?, ?, ?)
-            ON DUPLICATE KEY UPDATE `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, time(), time()]);
-        // Delete removed condition fields from DB.
-        DBManager::get()->exec("DELETE FROM `userfilter_fields`
-            WHERE `filter_id`='".$this->id."' AND `field_id` NOT IN ('".
-            implode("', '", array_keys($this->fields))."')");
-        // Store all fields.
-        foreach ($this->fields as $field) {
-            $field->store($this->id);
-        }
-    }
-
-    public function toString() {
-        $tpl = $GLOBALS['template_factory']->open('userfilter/display');
-        $tpl->set_attribute('filter', $this);
-        return $tpl->render();
-    }
-
-    public function __toString() {
-        return $this->toString();
-    }
-
-    public function __clone()
-    {
-        $this->id = md5(uniqid(get_class($this)));
-        $cloned_fields= [];
-        foreach ($this->fields as $field) {
-            $dolly = clone $field;
-            $dolly->conditionId = $this->id;
-            $cloned_fields[$dolly->id] = $dolly;
-        }
-        $this->fields = $cloned_fields;
-    }
-
-} /* end of class UserFilter */
-
-?>
diff --git a/lib/classes/admission/UserFilter.php b/lib/classes/admission/UserFilter.php
new file mode 100644
index 0000000..d380ef0
--- /dev/null
+++ b/lib/classes/admission/UserFilter.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * UserFilter.class.php
+ *
+ * Conditions for user selection in Stud.IP. A condition is a collection of
+ * condition fields, e.g. degree, course of study or semester. Each
+ * condition can have a validity period.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class UserFilter
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * All condition fields that form this condition.
+     */
+    public $fields = [];
+
+    /**
+     * Unique identifier for this condition.
+     */
+    public $id = '';
+
+    public $show_user_count = false;
+    // --- OPERATIONS ---
+
+    /**
+     * Standard constructor.
+     *
+     * @param  String conditionId
+     * @return UserFilter
+     */
+    public function __construct($conditionId='')
+    {
+        UserFilterField::getAvailableFilterFields();
+        $this->id = $conditionId;
+        if ($conditionId) {
+            $this->load();
+        } else {
+            $this->id = $this->generateId();
+        }
+        return $this;
+    }
+
+    /**
+     * Add a new condition field.
+     *
+     * @param  ConditionField fieldId
+     * @return UserFilter
+     */
+    public function addField($field)
+    {
+        $this->fields[$field->getId()] = $field;
+        $field->setConditionId($this->id);
+        return $this;
+    }
+
+    /**
+     * Deletes the condition and all associated fields.
+     */
+    public function delete() {
+        // Delete condition data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `userfilter`
+            WHERE `filter_id`=?");
+        $stmt->execute([$this->id]);
+        // Delete all defined condition fields.
+        foreach ($this->fields as $field) {
+            $field->delete();
+        }
+    }
+
+    /**
+     * Generate a new unique ID.
+     *
+     * @param  String tableName
+     */
+    public function generateId() {
+        do {
+            $newid = md5(uniqid(get_class($this).microtime(), true));
+            $id = DBManager::get()->fetchColumn("SELECT `filter_id`
+                FROM `userfilter` WHERE `filter_id`=?", [$newid]);
+        } while ($id);
+        return $newid;
+    }
+
+    /**
+     * Get all fields (without checking for validity according
+     * to the current time).
+     *
+     * @return Array
+     */
+    public function getFields()
+    {
+        uasort($this->fields, function($a, $b) {
+            return $a->sortOrder -  $b->sortOrder;
+        });
+        return $this->fields;
+    }
+
+    /**
+     * Get ID.
+     *
+     * @return String
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Gets all users that fulfill the current condition.
+     *
+     * @return Array
+     */
+    public function getUsers() {
+        $users = null;
+        foreach ($this->fields as $field) {
+            // Check if restrictions for the field value must be taken into consideration.
+            $restrictions = [];
+            foreach ($field->relations as $className => $related) {
+                if ($other = $this->hasField($className)) {
+                    if ($other->getValue()) {
+                        $restrictions[$className] = [
+                            'table' => $other->userDataDbTable,
+                            'field' => $other->userDataDbField,
+                            'compare' => $other->getCompareOperator(),
+                            'value' => $other->getValue()
+                        ];
+                    }
+                }
+            }
+            $users = isset($users) ? array_intersect($users, $field->getUsers($restrictions)) : $field->getUsers($restrictions);
+        }
+        return (array) $users;
+    }
+
+    /**
+     * Checks whether the current filter object contains a field
+     * of the given type.
+     *
+     * @param String $className the type to check for
+     * @return UserFilterField Return the found field or null if not applicable.
+     */
+    public function hasField($className) {
+        foreach ($this->fields as $field) {
+            if ($field instanceof $className) {
+                return $field;
+                break;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Is the current condition fulfilled (that means, are all
+     * required field values matched)?
+     *
+     * @return boolean
+     */
+    public function isFulfilled($userId)
+    {
+        // Check all fields.
+        foreach ($this->fields as $field) {
+            if (!$field->checkValue($field->getUserValues($userId, $this->fields))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Helper function for loading data from DB.
+     */
+    public function load() {
+        // Load basic condition data.
+        $stmt = DBManager::get()->prepare(
+            "SELECT * FROM `userfilter` WHERE `filter_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->id = $data['filter_id'];
+            // Load the associated condition fields.
+            $stmt = DBManager::get()->prepare(
+                "SELECT `field_id`, `type` FROM `userfilter_fields`
+                WHERE `filter_id`=?");
+            $stmt->execute([$this->id]);
+            while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                /*
+                 * Create instance of appropriate UserFilterField subclass.
+                 * We just "try" here because the class definition could have
+                 * been removed since saving data to DB.
+                 */
+                //try {
+                    $chunks = explode('_', $data['type']);
+                    $type = $chunks[0];
+                    $param = $chunks[1] ?? null;
+                    if ($param) {
+                        $field = new $type($param, $data['field_id']);
+                    } else {
+                        $field = new $type($data['field_id']);
+                    }
+
+                    $this->fields[$field->getId()] = $field;
+                //} catch (Exception $e) {}
+            }
+        }
+    }
+
+    /**
+     * Removes the field with the given ID from the condition fields.
+     *
+     * @param  String fieldId
+     * @return UserFilter
+     */
+    public function removeField($fieldId)
+    {
+        unset($this->fields[$fieldId]);
+        return $this;
+    }
+
+    /**
+     * Stores data to DB.
+     */
+    public function store() {
+        // Generate new ID if condition entry doesn't exist in DB yet.
+        if (!$this->id) {
+            $this->id = $this->generateId();
+        }
+
+        // Store condition data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `userfilter`
+            (`filter_id`, `mkdate`, `chdate`)
+            VALUES (?, ?, ?)
+            ON DUPLICATE KEY UPDATE `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, time(), time()]);
+        // Delete removed condition fields from DB.
+        DBManager::get()->exec("DELETE FROM `userfilter_fields`
+            WHERE `filter_id`='".$this->id."' AND `field_id` NOT IN ('".
+            implode("', '", array_keys($this->fields))."')");
+        // Store all fields.
+        foreach ($this->fields as $field) {
+            $field->store($this->id);
+        }
+    }
+
+    public function toString() {
+        $tpl = $GLOBALS['template_factory']->open('userfilter/display');
+        $tpl->set_attribute('filter', $this);
+        return $tpl->render();
+    }
+
+    public function __toString() {
+        return $this->toString();
+    }
+
+    public function __clone()
+    {
+        $this->id = md5(uniqid(get_class($this)));
+        $cloned_fields= [];
+        foreach ($this->fields as $field) {
+            $dolly = clone $field;
+            $dolly->conditionId = $this->id;
+            $cloned_fields[$dolly->id] = $dolly;
+        }
+        $this->fields = $cloned_fields;
+    }
+
+} /* end of class UserFilter */
+
+?>
diff --git a/lib/classes/admission/UserFilterField.class.php b/lib/classes/admission/UserFilterField.class.php
deleted file mode 100644
index 9081e90..0000000
--- a/lib/classes/admission/UserFilterField.class.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-
-/**
- * UserFilterField.class.php
- *
- * A specification of a Stud.IP condition that must be fulfilled. One
- * or more instances of the UserFilterField subclasses make up a
- * UserFilter.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class UserFilterField
-{
-    // --- ATTRIBUTES ---
-
-    /**
-     * Which of the valid compare operators is currently chosen?
-     */
-    public $compareOperator = '';
-
-    /**
-     * ID of the UserFilter this field belongs to.
-     */
-    public $conditionId = '';
-
-    /**
-     * Unique ID for this condition field.
-     */
-    public $id = '';
-
-    /**
-     * The set of valid compare operators.
-     */
-    public $validCompareOperators = [];
-
-    /**
-     * All valid values for this field.
-     */
-    public $validValues = [];
-
-    /**
-     * Which of the valid values is currently chosen?
-     */
-    public $value = null;
-
-    /*
-     * Provide some kind of sort order for filter fields. By default,
-     * all subclasses without an explicitly given order will be sorted at the end.
-     */
-    public $sortOrder = 99;
-
-    public static $isParameterized = false;
-
-    protected static $cached_valid_values;
-    protected static $available_filter_fields;
-
-    /**
-     * Database tables and fields to get valid values and concrete user values
-     * from.
-     */
-    public $valuesDbTable = '';
-    public $valuesDbIdField = '';
-    public $valuesDbNameField = '';
-    public $userDataDbTable = '';
-    public $userDataDbField = '';
-    public $relations = [];
-
-    // --- OPERATIONS ---
-
-    public static function getParameterizedTypes()
-    {
-
-    }
-
-
-    /**
-     * Standard constructor.
-     *
-     * @param String $fieldId If a fieldId is given, the corresponding data is
-     *                        loaded from database.
-     *
-     */
-    public function __construct($fieldId = '')
-    {
-        $this->validCompareOperators = [
-            '=' => _('ist'),
-            '!=' => _('ist nicht')
-        ];
-        if ($this->valuesDbNameField) {
-            if (isset(self::$cached_valid_values[static::class])) {
-                $this->validValues = self::$cached_valid_values[static::class];
-            } else {
-                // Get all available values from database.
-                $stmt = DBManager::get()->query(
-                        "SELECT DISTINCT `" . $this->valuesDbIdField . "`, `" . $this->valuesDbNameField . "` " .
-                        "FROM `" . $this->valuesDbTable . "` ORDER BY `" . $this->valuesDbNameField . "` ASC");
-                while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-                    $this->validValues[$current[$this->valuesDbIdField]] = $current[$this->valuesDbNameField];
-                }
-                self::$cached_valid_values[static::class] = $this->validValues;
-            }
-        }
-        if ($fieldId) {
-            $this->id = $fieldId;
-            $this->load();
-        } else {
-            $this->id = $this->generateId();
-        }
-    }
-
-    /**
-     * Checks whether the given value fits the configured condition. The
-     * value is compared to the currently selected value by using the
-     * currently selected compare operator.
-     *
-     * @param  Array values
-     * @return Boolean
-     */
-    public function checkValue($values)
-    {
-        // Validate compare operator
-        if (!isset($this->validCompareOperators[$this->compareOperator])) {
-            throw new Exception('Invalid compare operator');
-        }
-
-        $result = false;
-        foreach ($values as $value) {
-            switch ($this->compareOperator) {
-                case '=':
-                    $result = $value == $this->value;
-                    break;
-                case '!=':
-                    $result = $value != $this->value;
-                    break;
-                case '<':
-                    $result = $value < $this->value;
-                    break;
-                case '<=':
-                    $result = $value <= $this->value;
-                    break;
-                case '>=':
-                    $result = $value >= $this->value;
-                    break;
-                case '>':
-                    $result = $value > $this->value;
-                    break;
-                default:
-                    throw new Exception('Unknown compare operator.');
-            }
-
-            if ($result) {
-                break;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Deletes the stored data for this condition field from DB.
-     */
-    public function delete()
-    {
-        // Delete condition data.
-        $stmt = DBManager::get()->prepare("DELETE FROM `userfilter_fields`
-            WHERE `field_id`=?");
-        $stmt->execute([$this->id]);
-    }
-
-    /**
-     * Generate a new unique ID.
-     *
-     * @param  String tableName
-     */
-    public function generateId()
-    {
-        do {
-            $newid = md5(uniqid(get_class($this).microtime(), true));
-            $id = DBManager::get()->fetchColumn("SELECT `field_id`
-                FROM `userfilter_fields` WHERE `field_id`=?", [$newid]);
-        } while ($id);
-        return $newid;
-    }
-
-    /**
-     * Reads all available UserFilterField subclasses and loads their definitions.
-     */
-    public static function getAvailableFilterFields()
-    {
-        if (self::$available_filter_fields === null) {
-        $fields = [];
-        // Load all PHP class files found in the condition field folder.
-        foreach (glob(realpath(dirname(__FILE__).'/userfilter').'/*.class.php') as $file) {
-            require_once($file);
-            // Try to auto-calculate class name from file name.
-            $className = mb_substr(basename($file), 0,
-                mb_strpos(basename($file), '.class.php'));
-            // Check if class is right.
-            if (is_subclass_of($className, 'UserFilterField')) {
-                if ($className::$isParameterized) {
-                    $fields = array_merge($fields, $className::getParameterizedTypes());
-                } else {
-                    $filter = new $className();
-                    $fields[$className] = $filter->getName();
-                }
-            }
-        }
-        asort($fields);
-            self::$available_filter_fields = $fields;
-        }
-        return self::$available_filter_fields;
-    }
-
-
-    /**
-     * Which compare operator is set?
-     *
-     * @return String
-     */
-    public function getCompareOperator()
-    {
-        return $this->compareOperator;
-    }
-
-    /**
-     * Which compare operator is set?
-     *
-     * @return String
-     */
-    public function getCompareOperatorAsText()
-    {
-        return $this->getValidCompareOperators()[$this->compareOperator];
-    }
-
-    /**
-     * Field ID.
-     *
-     * @return String
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _("Nutzerfilterfeld");
-    }
-
-    /**
-     * Compares all the users' values by using the specified compare operator
-     * and returns all users that fulfill the condition. This can be
-     * an important information when checking on validity of a combination
-     * of conditions.
-     *
-     * @param Array $restrictions values from other fields that restrict the valid
-     *                            values for a user (e.g. a semester of study in
-     *                            a given subject)
-     * @return Array All users that are affected by the current condition
-     *               field.
-     */
-    public function getUsers($restrictions = [])
-    {
-        $db = DBManager::get();
-        $users = [];
-        // Standard query getting the values without respecting other values.
-        $select = "SELECT DISTINCT `".$this->userDataDbTable."`.`user_id` ";
-        $from = "FROM `".$this->userDataDbTable."` ";
-        $where = "WHERE `".$this->userDataDbTable."`.`".$this->userDataDbField.
-            "`".$this->compareOperator."?";
-        $parameters = [$this->value];
-        $joinedTables = [
-            $this->userDataDbTable => true
-        ];
-        // Check if there are restrictions given.
-        foreach ($restrictions as $otherField => $restriction) {
-            // We only take the value into consideration if it represents a valid restriction.
-            if ($this->relations[$otherField]) {
-                // Do we need to join in another table?
-                if (!$joinedTables[$restriction['table']]) {
-                    $joinedTables[$restriction['table']] = true;
-                    $from .= " INNER JOIN `".$restriction['table']."` ON (`".
-                        $this->userDataDbTable."`.`".
-                        $this->relations[$otherField]['local_field']."`=`".
-                        $restriction['table']."`.`".
-                        $this->relations[$otherField]['foreign_field']."`)";
-                }
-                // Expand WHERE statement with the value from restriction.
-                $where .= " AND `".$restriction['table']."`.`".
-                    $restriction['field']."`".$restriction['compare']."?";
-                $parameters[] = $restriction['value'];
-            }
-        }
-        // Get all the users that fulfill the condition.
-        $stmt = $db->prepare($select.$from.$where);
-        $stmt->execute($parameters);
-        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $users[] = $current['user_id'];
-        }
-        return $users;
-    }
-
-    /**
-     * Gets the value for the given user that is relevant for this
-     * condition field. Here, this method looks up the study degree(s)
-     * for the user. These can then be compared with the required degrees
-     * whether they fit.
-     *
-     * @param  String $userId User to check.
-     * @param  array $additional conditions that are required for check.
-     * @return array The value(s) for this user.
-     */
-    public function getUserValues($userId, $additional = null)
-    {
-        $result = [];
-        $query = "SELECT DISTINCT `".$this->userDataDbField."` ".
-            "FROM `".$this->userDataDbTable."` ".
-            "WHERE `user_id`=?";
-        $parameters = [$userId];
-        // Additional requirements given...
-        if (is_array($additional)) {
-
-            // Don't use the same database field twice as this can only get ugly.
-            $usedFields = [$this->userDataDbField];
-
-            foreach ($additional as $a_condition) {
-                if ($a_condition->id != $this->id && $this->userDataDbTable == $a_condition->userDataDbTable &&
-                        !in_array($a_condition->userDataDbField, $usedFields)) {
-                    $query .= " AND `" . $a_condition->userDataDbField . "` " . $a_condition->compareOperator . "?";
-                    $parameters[] = $a_condition->value;
-                }
-            }
-        }
-        // Get semester of study for user.
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute($parameters);
-        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $result[] = $current[$this->userDataDbField];
-        }
-        return $result;
-    }
-
-    /**
-     * Returns all valid compare operators.
-     *
-     * @return Array Array of valid compare operators.
-     */
-    public function getValidCompareOperators()
-    {
-        return $this->validCompareOperators;
-    }
-
-    /**
-     * Returns all valid values. Values can be loaded dynamically from
-     * database or be returned as static array.
-     *
-     * @return Array Valid values in the form $value => $displayname.
-     */
-    public function getValidValues()
-    {
-        return $this->validValues;
-    }
-
-    /**
-     * Which value is set?
-     *
-     * @return String
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Helper function for loading data from DB.
-     */
-    public function load()
-    {
-        $stmt = DBManager::get()->prepare(
-            "SELECT * FROM `userfilter_fields` WHERE `field_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->conditionId = $data['filter_id'];
-            $this->value = $data['value'];
-            $this->compareOperator = $data['compare_op'];
-        }
-    }
-
-    /**
-     * Sets a new selected compare operator
-     *
-     * @param  String newOperator
-     * @return UserFilterField
-     */
-    public function setCompareOperator($newOperator)
-    {
-        if (in_array($newOperator, array_keys($this->validCompareOperators))) {
-            $this->compareOperator = $newOperator;
-            return $this;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Connects the current field to a UserFilter.
-     *
-     * @param  String $id ID of a UserFilter object.
-     * @return UserFilterField
-     */
-    public function setConditionId($id)
-    {
-        $this->conditionId = $id;
-        return $this;
-    }
-
-    /**
-     * Sets a new selected value.
-     *
-     * @param  String newValue
-     * @return UserFilterField
-     */
-    public function setValue($newValue)
-    {
-        if ($this->validValues[$newValue]) {
-            $this->value = $newValue;
-            return $this;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Stores data to DB.
-     *
-     * @param  String conditionId The condition this field belongs to.
-     */
-    public function store()
-    {
-        // Generate new ID if field entry doesn't exist in DB yet.
-        if (!$this->id) {
-            $this->id = $this->generateId();
-        }
-        // Store field data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `userfilter_fields`
-            (`field_id`, `filter_id`, `type`, `value`, `compare_op`,
-            `mkdate`, `chdate`)  VALUES (?, ?, ?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE `filter_id`=VALUES(`filter_id`),
-            `type`=VALUES(`type`),`value`=VALUES(`value`),
-            `compare_op`=VALUES(`compare_op`), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->conditionId, get_class($this),
-            $this->value, $this->compareOperator, time(), time()]);
-    }
-
-    public function __clone()
-    {
-        $this->id = md5(uniqid(get_class($this)));
-        $this->conditionId = null;
-    }
-
-} /* end of class UserFilterField */
diff --git a/lib/classes/admission/UserFilterField.php b/lib/classes/admission/UserFilterField.php
new file mode 100644
index 0000000..9081e90
--- /dev/null
+++ b/lib/classes/admission/UserFilterField.php
@@ -0,0 +1,473 @@
+<?php
+
+/**
+ * UserFilterField.class.php
+ *
+ * A specification of a Stud.IP condition that must be fulfilled. One
+ * or more instances of the UserFilterField subclasses make up a
+ * UserFilter.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class UserFilterField
+{
+    // --- ATTRIBUTES ---
+
+    /**
+     * Which of the valid compare operators is currently chosen?
+     */
+    public $compareOperator = '';
+
+    /**
+     * ID of the UserFilter this field belongs to.
+     */
+    public $conditionId = '';
+
+    /**
+     * Unique ID for this condition field.
+     */
+    public $id = '';
+
+    /**
+     * The set of valid compare operators.
+     */
+    public $validCompareOperators = [];
+
+    /**
+     * All valid values for this field.
+     */
+    public $validValues = [];
+
+    /**
+     * Which of the valid values is currently chosen?
+     */
+    public $value = null;
+
+    /*
+     * Provide some kind of sort order for filter fields. By default,
+     * all subclasses without an explicitly given order will be sorted at the end.
+     */
+    public $sortOrder = 99;
+
+    public static $isParameterized = false;
+
+    protected static $cached_valid_values;
+    protected static $available_filter_fields;
+
+    /**
+     * Database tables and fields to get valid values and concrete user values
+     * from.
+     */
+    public $valuesDbTable = '';
+    public $valuesDbIdField = '';
+    public $valuesDbNameField = '';
+    public $userDataDbTable = '';
+    public $userDataDbField = '';
+    public $relations = [];
+
+    // --- OPERATIONS ---
+
+    public static function getParameterizedTypes()
+    {
+
+    }
+
+
+    /**
+     * Standard constructor.
+     *
+     * @param String $fieldId If a fieldId is given, the corresponding data is
+     *                        loaded from database.
+     *
+     */
+    public function __construct($fieldId = '')
+    {
+        $this->validCompareOperators = [
+            '=' => _('ist'),
+            '!=' => _('ist nicht')
+        ];
+        if ($this->valuesDbNameField) {
+            if (isset(self::$cached_valid_values[static::class])) {
+                $this->validValues = self::$cached_valid_values[static::class];
+            } else {
+                // Get all available values from database.
+                $stmt = DBManager::get()->query(
+                        "SELECT DISTINCT `" . $this->valuesDbIdField . "`, `" . $this->valuesDbNameField . "` " .
+                        "FROM `" . $this->valuesDbTable . "` ORDER BY `" . $this->valuesDbNameField . "` ASC");
+                while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                    $this->validValues[$current[$this->valuesDbIdField]] = $current[$this->valuesDbNameField];
+                }
+                self::$cached_valid_values[static::class] = $this->validValues;
+            }
+        }
+        if ($fieldId) {
+            $this->id = $fieldId;
+            $this->load();
+        } else {
+            $this->id = $this->generateId();
+        }
+    }
+
+    /**
+     * Checks whether the given value fits the configured condition. The
+     * value is compared to the currently selected value by using the
+     * currently selected compare operator.
+     *
+     * @param  Array values
+     * @return Boolean
+     */
+    public function checkValue($values)
+    {
+        // Validate compare operator
+        if (!isset($this->validCompareOperators[$this->compareOperator])) {
+            throw new Exception('Invalid compare operator');
+        }
+
+        $result = false;
+        foreach ($values as $value) {
+            switch ($this->compareOperator) {
+                case '=':
+                    $result = $value == $this->value;
+                    break;
+                case '!=':
+                    $result = $value != $this->value;
+                    break;
+                case '<':
+                    $result = $value < $this->value;
+                    break;
+                case '<=':
+                    $result = $value <= $this->value;
+                    break;
+                case '>=':
+                    $result = $value >= $this->value;
+                    break;
+                case '>':
+                    $result = $value > $this->value;
+                    break;
+                default:
+                    throw new Exception('Unknown compare operator.');
+            }
+
+            if ($result) {
+                break;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Deletes the stored data for this condition field from DB.
+     */
+    public function delete()
+    {
+        // Delete condition data.
+        $stmt = DBManager::get()->prepare("DELETE FROM `userfilter_fields`
+            WHERE `field_id`=?");
+        $stmt->execute([$this->id]);
+    }
+
+    /**
+     * Generate a new unique ID.
+     *
+     * @param  String tableName
+     */
+    public function generateId()
+    {
+        do {
+            $newid = md5(uniqid(get_class($this).microtime(), true));
+            $id = DBManager::get()->fetchColumn("SELECT `field_id`
+                FROM `userfilter_fields` WHERE `field_id`=?", [$newid]);
+        } while ($id);
+        return $newid;
+    }
+
+    /**
+     * Reads all available UserFilterField subclasses and loads their definitions.
+     */
+    public static function getAvailableFilterFields()
+    {
+        if (self::$available_filter_fields === null) {
+        $fields = [];
+        // Load all PHP class files found in the condition field folder.
+        foreach (glob(realpath(dirname(__FILE__).'/userfilter').'/*.class.php') as $file) {
+            require_once($file);
+            // Try to auto-calculate class name from file name.
+            $className = mb_substr(basename($file), 0,
+                mb_strpos(basename($file), '.class.php'));
+            // Check if class is right.
+            if (is_subclass_of($className, 'UserFilterField')) {
+                if ($className::$isParameterized) {
+                    $fields = array_merge($fields, $className::getParameterizedTypes());
+                } else {
+                    $filter = new $className();
+                    $fields[$className] = $filter->getName();
+                }
+            }
+        }
+        asort($fields);
+            self::$available_filter_fields = $fields;
+        }
+        return self::$available_filter_fields;
+    }
+
+
+    /**
+     * Which compare operator is set?
+     *
+     * @return String
+     */
+    public function getCompareOperator()
+    {
+        return $this->compareOperator;
+    }
+
+    /**
+     * Which compare operator is set?
+     *
+     * @return String
+     */
+    public function getCompareOperatorAsText()
+    {
+        return $this->getValidCompareOperators()[$this->compareOperator];
+    }
+
+    /**
+     * Field ID.
+     *
+     * @return String
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _("Nutzerfilterfeld");
+    }
+
+    /**
+     * Compares all the users' values by using the specified compare operator
+     * and returns all users that fulfill the condition. This can be
+     * an important information when checking on validity of a combination
+     * of conditions.
+     *
+     * @param Array $restrictions values from other fields that restrict the valid
+     *                            values for a user (e.g. a semester of study in
+     *                            a given subject)
+     * @return Array All users that are affected by the current condition
+     *               field.
+     */
+    public function getUsers($restrictions = [])
+    {
+        $db = DBManager::get();
+        $users = [];
+        // Standard query getting the values without respecting other values.
+        $select = "SELECT DISTINCT `".$this->userDataDbTable."`.`user_id` ";
+        $from = "FROM `".$this->userDataDbTable."` ";
+        $where = "WHERE `".$this->userDataDbTable."`.`".$this->userDataDbField.
+            "`".$this->compareOperator."?";
+        $parameters = [$this->value];
+        $joinedTables = [
+            $this->userDataDbTable => true
+        ];
+        // Check if there are restrictions given.
+        foreach ($restrictions as $otherField => $restriction) {
+            // We only take the value into consideration if it represents a valid restriction.
+            if ($this->relations[$otherField]) {
+                // Do we need to join in another table?
+                if (!$joinedTables[$restriction['table']]) {
+                    $joinedTables[$restriction['table']] = true;
+                    $from .= " INNER JOIN `".$restriction['table']."` ON (`".
+                        $this->userDataDbTable."`.`".
+                        $this->relations[$otherField]['local_field']."`=`".
+                        $restriction['table']."`.`".
+                        $this->relations[$otherField]['foreign_field']."`)";
+                }
+                // Expand WHERE statement with the value from restriction.
+                $where .= " AND `".$restriction['table']."`.`".
+                    $restriction['field']."`".$restriction['compare']."?";
+                $parameters[] = $restriction['value'];
+            }
+        }
+        // Get all the users that fulfill the condition.
+        $stmt = $db->prepare($select.$from.$where);
+        $stmt->execute($parameters);
+        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $users[] = $current['user_id'];
+        }
+        return $users;
+    }
+
+    /**
+     * Gets the value for the given user that is relevant for this
+     * condition field. Here, this method looks up the study degree(s)
+     * for the user. These can then be compared with the required degrees
+     * whether they fit.
+     *
+     * @param  String $userId User to check.
+     * @param  array $additional conditions that are required for check.
+     * @return array The value(s) for this user.
+     */
+    public function getUserValues($userId, $additional = null)
+    {
+        $result = [];
+        $query = "SELECT DISTINCT `".$this->userDataDbField."` ".
+            "FROM `".$this->userDataDbTable."` ".
+            "WHERE `user_id`=?";
+        $parameters = [$userId];
+        // Additional requirements given...
+        if (is_array($additional)) {
+
+            // Don't use the same database field twice as this can only get ugly.
+            $usedFields = [$this->userDataDbField];
+
+            foreach ($additional as $a_condition) {
+                if ($a_condition->id != $this->id && $this->userDataDbTable == $a_condition->userDataDbTable &&
+                        !in_array($a_condition->userDataDbField, $usedFields)) {
+                    $query .= " AND `" . $a_condition->userDataDbField . "` " . $a_condition->compareOperator . "?";
+                    $parameters[] = $a_condition->value;
+                }
+            }
+        }
+        // Get semester of study for user.
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute($parameters);
+        while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $result[] = $current[$this->userDataDbField];
+        }
+        return $result;
+    }
+
+    /**
+     * Returns all valid compare operators.
+     *
+     * @return Array Array of valid compare operators.
+     */
+    public function getValidCompareOperators()
+    {
+        return $this->validCompareOperators;
+    }
+
+    /**
+     * Returns all valid values. Values can be loaded dynamically from
+     * database or be returned as static array.
+     *
+     * @return Array Valid values in the form $value => $displayname.
+     */
+    public function getValidValues()
+    {
+        return $this->validValues;
+    }
+
+    /**
+     * Which value is set?
+     *
+     * @return String
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Helper function for loading data from DB.
+     */
+    public function load()
+    {
+        $stmt = DBManager::get()->prepare(
+            "SELECT * FROM `userfilter_fields` WHERE `field_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->conditionId = $data['filter_id'];
+            $this->value = $data['value'];
+            $this->compareOperator = $data['compare_op'];
+        }
+    }
+
+    /**
+     * Sets a new selected compare operator
+     *
+     * @param  String newOperator
+     * @return UserFilterField
+     */
+    public function setCompareOperator($newOperator)
+    {
+        if (in_array($newOperator, array_keys($this->validCompareOperators))) {
+            $this->compareOperator = $newOperator;
+            return $this;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Connects the current field to a UserFilter.
+     *
+     * @param  String $id ID of a UserFilter object.
+     * @return UserFilterField
+     */
+    public function setConditionId($id)
+    {
+        $this->conditionId = $id;
+        return $this;
+    }
+
+    /**
+     * Sets a new selected value.
+     *
+     * @param  String newValue
+     * @return UserFilterField
+     */
+    public function setValue($newValue)
+    {
+        if ($this->validValues[$newValue]) {
+            $this->value = $newValue;
+            return $this;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Stores data to DB.
+     *
+     * @param  String conditionId The condition this field belongs to.
+     */
+    public function store()
+    {
+        // Generate new ID if field entry doesn't exist in DB yet.
+        if (!$this->id) {
+            $this->id = $this->generateId();
+        }
+        // Store field data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `userfilter_fields`
+            (`field_id`, `filter_id`, `type`, `value`, `compare_op`,
+            `mkdate`, `chdate`)  VALUES (?, ?, ?, ?, ?, ?, ?)
+            ON DUPLICATE KEY UPDATE `filter_id`=VALUES(`filter_id`),
+            `type`=VALUES(`type`),`value`=VALUES(`value`),
+            `compare_op`=VALUES(`compare_op`), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->conditionId, get_class($this),
+            $this->value, $this->compareOperator, time(), time()]);
+    }
+
+    public function __clone()
+    {
+        $this->id = md5(uniqid(get_class($this)));
+        $this->conditionId = null;
+    }
+
+} /* end of class UserFilterField */
diff --git a/lib/classes/admission/userfilter/DatafieldCondition.class.php b/lib/classes/admission/userfilter/DatafieldCondition.class.php
deleted file mode 100644
index 966fe8e..0000000
--- a/lib/classes/admission/userfilter/DatafieldCondition.class.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * DatafieldCondition.class.php
- *
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class DatafieldCondition extends UserFilterField
-{
-    public static $isParameterized = true;
-
-    public $datafield_id, $null_yields, $datafield_name;
-
-    public $sortOrder = 6;
-
-    public static function getParameterizedTypes()
-    {
-        $ret = [];
-        try {
-            foreach (DataField::findBySQL("object_type='user' AND (object_class & (1|2|4|8) OR object_class IS NULL) AND is_userfilter = 1 ORDER BY priority") as $df) {
-                $ret[__CLASS__ . '_' . $df->id] = utf8_encode(chr(160)) . _("Datenfeld") . ': ' . $df->name;
-            }
-        } catch (PDOException $e) {} //migration 128 chokes on this...
-        return $ret;
-    }
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($typeparam, $fieldId = '')
-    {
-        $this->validCompareOperators = [
-            '>=' => _('mindestens'),
-            '<=' => _('höchstens'),
-            '=' => _('ist'),
-            '!=' => _('ist nicht')
-        ];
-        if ($fieldId) {
-            $this->id = $fieldId;
-            $this->load();
-        } else {
-            $this->id = $this->generateId();
-            $this->datafield_id = $typeparam;
-        }
-
-        $df = DataField::find($this->datafield_id);
-        if ($df) {
-            $this->datafield_name = $df->name;
-        } else {
-            throw new UnexpectedValueException('datafield not found, id: ' . $typeparam);
-        }
-        $typed_df = DataFieldEntry::createDataFieldEntry($df);
-        if ($typed_df instanceof DataFieldBoolEntry) {
-            $this->validValues = [1 => _('Ja'), 0 => _('Nein')];
-            unset($this->validCompareOperators['>=']);
-            unset($this->validCompareOperators['<=']);
-            unset($this->validCompareOperators['!=']);
-            $this->null_yields = 0;
-        } else if ($typed_df instanceof DataFieldSelectboxEntry) {
-            list($valid_values, $is_assoc) = $typed_df->getParameters();
-            if (!$is_assoc) {
-                $valid_values = array_combine($valid_values, $valid_values);
-            }
-            $this->validValues = $valid_values;
-            $this->null_yields = $typed_df instanceof DataFieldSelectboxMultipleEntry ? '' : key($valid_values);
-        } else {
-            $this->null_yields = '';
-        }
-
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return $this->datafield_name;
-    }
-
-    public function getUsers($restrictions = [])
-    {
-        $db = DBManager::get();
-        // Standard query getting the values without respecting other values.
-        $select = "SELECT user_id FROM
-                    auth_user_md5 LEFT JOIN
-                  datafields_entries ON range_id = user_id AND datafield_id = ?
-                  WHERE perms IN ('user','autor','tutor','dozent') AND IFNULL(content, ?)
-                  " . $this->compareOperator . " ?";
-        $users = $db->fetchFirst($select, [$this->datafield_id, $this->null_yields,$this->value]);
-        return $users;
-    }
-
-    /**
-     * Gets the value for the given user that is relevant for this
-     *
-     * @param  String $userId User to check.
-     * @param  Array $additional additional conditions that are required for check.
-     * @return array The value(s) for this user.
-     */
-    public function getUserValues($userId, $additional = null)
-    {
-        $result = DBManager::get()->fetchColumn(
-            "SELECT content FROM datafields_entries
-            WHERE datafield_id = ? AND range_id = ?", [$this->datafield_id, $userId]);
-        return [$result === null || $result === false ? $this->null_yields : $result];
-    }
-
-    /**
-     * Helper function for loading data from DB.
-     */
-    public function load()
-    {
-        $stmt = DBManager::get()->prepare(
-            "SELECT * FROM `userfilter_fields` WHERE `field_id`=? LIMIT 1");
-        $stmt->execute([$this->id]);
-        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $this->conditionId = $data['filter_id'];
-            $this->value = $data['value'];
-            $this->compareOperator = $data['compare_op'];
-            list(,$this->datafield_id) = explode('_', $data['type']);
-        }
-    }
-
-    /**
-     * Sets a new selected value.
-     *
-     * @param  String newValue
-     * @return UserFilterField
-     */
-    public function setValue($newValue)
-    {
-        $this->value = $newValue;
-        return $this;
-    }
-
-    /**
-     * Stores data to DB.
-     *
-     */
-    public function store()
-    {
-        // Generate new ID if field entry doesn't exist in DB yet.
-        if (!$this->id) {
-            $this->id = $this->generateId();
-        }
-        // Store field data.
-        $stmt = DBManager::get()->prepare("INSERT INTO `userfilter_fields`
-            (`field_id`, `filter_id`, `type`, `value`, `compare_op`,
-            `mkdate`, `chdate`)  VALUES (?, ?, ?, ?, ?, ?, ?)
-            ON DUPLICATE KEY UPDATE `filter_id`=VALUES(`filter_id`),
-            `type`=VALUES(`type`),`value`=VALUES(`value`),
-            `compare_op`=VALUES(`compare_op`), `chdate`=VALUES(`chdate`)");
-        $stmt->execute([$this->id, $this->conditionId, get_class($this).'_'.$this->datafield_id,
-            $this->value, $this->compareOperator, time(), time()]);
-    }
-}
diff --git a/lib/classes/admission/userfilter/DatafieldCondition.php b/lib/classes/admission/userfilter/DatafieldCondition.php
new file mode 100644
index 0000000..966fe8e
--- /dev/null
+++ b/lib/classes/admission/userfilter/DatafieldCondition.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * DatafieldCondition.class.php
+ *
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class DatafieldCondition extends UserFilterField
+{
+    public static $isParameterized = true;
+
+    public $datafield_id, $null_yields, $datafield_name;
+
+    public $sortOrder = 6;
+
+    public static function getParameterizedTypes()
+    {
+        $ret = [];
+        try {
+            foreach (DataField::findBySQL("object_type='user' AND (object_class & (1|2|4|8) OR object_class IS NULL) AND is_userfilter = 1 ORDER BY priority") as $df) {
+                $ret[__CLASS__ . '_' . $df->id] = utf8_encode(chr(160)) . _("Datenfeld") . ': ' . $df->name;
+            }
+        } catch (PDOException $e) {} //migration 128 chokes on this...
+        return $ret;
+    }
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($typeparam, $fieldId = '')
+    {
+        $this->validCompareOperators = [
+            '>=' => _('mindestens'),
+            '<=' => _('höchstens'),
+            '=' => _('ist'),
+            '!=' => _('ist nicht')
+        ];
+        if ($fieldId) {
+            $this->id = $fieldId;
+            $this->load();
+        } else {
+            $this->id = $this->generateId();
+            $this->datafield_id = $typeparam;
+        }
+
+        $df = DataField::find($this->datafield_id);
+        if ($df) {
+            $this->datafield_name = $df->name;
+        } else {
+            throw new UnexpectedValueException('datafield not found, id: ' . $typeparam);
+        }
+        $typed_df = DataFieldEntry::createDataFieldEntry($df);
+        if ($typed_df instanceof DataFieldBoolEntry) {
+            $this->validValues = [1 => _('Ja'), 0 => _('Nein')];
+            unset($this->validCompareOperators['>=']);
+            unset($this->validCompareOperators['<=']);
+            unset($this->validCompareOperators['!=']);
+            $this->null_yields = 0;
+        } else if ($typed_df instanceof DataFieldSelectboxEntry) {
+            list($valid_values, $is_assoc) = $typed_df->getParameters();
+            if (!$is_assoc) {
+                $valid_values = array_combine($valid_values, $valid_values);
+            }
+            $this->validValues = $valid_values;
+            $this->null_yields = $typed_df instanceof DataFieldSelectboxMultipleEntry ? '' : key($valid_values);
+        } else {
+            $this->null_yields = '';
+        }
+
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return $this->datafield_name;
+    }
+
+    public function getUsers($restrictions = [])
+    {
+        $db = DBManager::get();
+        // Standard query getting the values without respecting other values.
+        $select = "SELECT user_id FROM
+                    auth_user_md5 LEFT JOIN
+                  datafields_entries ON range_id = user_id AND datafield_id = ?
+                  WHERE perms IN ('user','autor','tutor','dozent') AND IFNULL(content, ?)
+                  " . $this->compareOperator . " ?";
+        $users = $db->fetchFirst($select, [$this->datafield_id, $this->null_yields,$this->value]);
+        return $users;
+    }
+
+    /**
+     * Gets the value for the given user that is relevant for this
+     *
+     * @param  String $userId User to check.
+     * @param  Array $additional additional conditions that are required for check.
+     * @return array The value(s) for this user.
+     */
+    public function getUserValues($userId, $additional = null)
+    {
+        $result = DBManager::get()->fetchColumn(
+            "SELECT content FROM datafields_entries
+            WHERE datafield_id = ? AND range_id = ?", [$this->datafield_id, $userId]);
+        return [$result === null || $result === false ? $this->null_yields : $result];
+    }
+
+    /**
+     * Helper function for loading data from DB.
+     */
+    public function load()
+    {
+        $stmt = DBManager::get()->prepare(
+            "SELECT * FROM `userfilter_fields` WHERE `field_id`=? LIMIT 1");
+        $stmt->execute([$this->id]);
+        if ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->conditionId = $data['filter_id'];
+            $this->value = $data['value'];
+            $this->compareOperator = $data['compare_op'];
+            list(,$this->datafield_id) = explode('_', $data['type']);
+        }
+    }
+
+    /**
+     * Sets a new selected value.
+     *
+     * @param  String newValue
+     * @return UserFilterField
+     */
+    public function setValue($newValue)
+    {
+        $this->value = $newValue;
+        return $this;
+    }
+
+    /**
+     * Stores data to DB.
+     *
+     */
+    public function store()
+    {
+        // Generate new ID if field entry doesn't exist in DB yet.
+        if (!$this->id) {
+            $this->id = $this->generateId();
+        }
+        // Store field data.
+        $stmt = DBManager::get()->prepare("INSERT INTO `userfilter_fields`
+            (`field_id`, `filter_id`, `type`, `value`, `compare_op`,
+            `mkdate`, `chdate`)  VALUES (?, ?, ?, ?, ?, ?, ?)
+            ON DUPLICATE KEY UPDATE `filter_id`=VALUES(`filter_id`),
+            `type`=VALUES(`type`),`value`=VALUES(`value`),
+            `compare_op`=VALUES(`compare_op`), `chdate`=VALUES(`chdate`)");
+        $stmt->execute([$this->id, $this->conditionId, get_class($this).'_'.$this->datafield_id,
+            $this->value, $this->compareOperator, time(), time()]);
+    }
+}
diff --git a/lib/classes/admission/userfilter/DegreeCondition.class.php b/lib/classes/admission/userfilter/DegreeCondition.class.php
deleted file mode 100644
index 9180e2d..0000000
--- a/lib/classes/admission/userfilter/DegreeCondition.class.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * DegreeCondition.class.php
- *
- * All conditions concerning the study degree in Stud.IP can be specified here.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class DegreeCondition extends UserFilterField
-{
-    // --- ATTRIBUTES ---
-    public $valuesDbTable = 'abschluss';
-    public $valuesDbIdField = 'abschluss_id';
-    public $valuesDbNameField = 'name';
-    public $userDataDbTable = 'user_studiengang';
-    public $userDataDbField = 'abschluss_id';
-
-    public $sortOrder = 1;
-
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($fieldId = '')
-    {
-        parent::__construct($fieldId);
-        $this->relations = [
-            'SubjectCondition' => [
-                'local_field' => 'fach_id',
-                'foreign_field' => 'fach_id'
-            ]
-        ];
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _('Abschluss');
-    }
-
-}
diff --git a/lib/classes/admission/userfilter/DegreeCondition.php b/lib/classes/admission/userfilter/DegreeCondition.php
new file mode 100644
index 0000000..9180e2d
--- /dev/null
+++ b/lib/classes/admission/userfilter/DegreeCondition.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * DegreeCondition.class.php
+ *
+ * All conditions concerning the study degree in Stud.IP can be specified here.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class DegreeCondition extends UserFilterField
+{
+    // --- ATTRIBUTES ---
+    public $valuesDbTable = 'abschluss';
+    public $valuesDbIdField = 'abschluss_id';
+    public $valuesDbNameField = 'name';
+    public $userDataDbTable = 'user_studiengang';
+    public $userDataDbField = 'abschluss_id';
+
+    public $sortOrder = 1;
+
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($fieldId = '')
+    {
+        parent::__construct($fieldId);
+        $this->relations = [
+            'SubjectCondition' => [
+                'local_field' => 'fach_id',
+                'foreign_field' => 'fach_id'
+            ]
+        ];
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _('Abschluss');
+    }
+
+}
diff --git a/lib/classes/admission/userfilter/PermissionCondition.class.php b/lib/classes/admission/userfilter/PermissionCondition.class.php
deleted file mode 100644
index 4adfdbf..0000000
--- a/lib/classes/admission/userfilter/PermissionCondition.class.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * PermissionCondition.class.php
- *
- * All conditions concerning the semester of study in Stud.IP can be specified here.
- *
- * 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.
- *
- * @author      Elmar Ludwig <elmar.ludwig@uos.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class PermissionCondition extends UserFilterField
-{
-    public $sortOrder = 7;
-
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($fieldId = '')
-    {
-        $this->userDataDbTable = 'auth_user_md5';
-        $this->userDataDbField = 'perms';
-
-        parent::__construct($fieldId);
-
-        $this->validValues = [
-            'autor' => _('Student/in'),
-            'tutor' => _('Tutor/in'),
-            'dozent' => _('Lehrende/r')
-        ];
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _('Globaler Status');
-    }
-}
diff --git a/lib/classes/admission/userfilter/PermissionCondition.php b/lib/classes/admission/userfilter/PermissionCondition.php
new file mode 100644
index 0000000..4adfdbf
--- /dev/null
+++ b/lib/classes/admission/userfilter/PermissionCondition.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * PermissionCondition.class.php
+ *
+ * All conditions concerning the semester of study in Stud.IP can be specified here.
+ *
+ * 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.
+ *
+ * @author      Elmar Ludwig <elmar.ludwig@uos.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class PermissionCondition extends UserFilterField
+{
+    public $sortOrder = 7;
+
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($fieldId = '')
+    {
+        $this->userDataDbTable = 'auth_user_md5';
+        $this->userDataDbField = 'perms';
+
+        parent::__construct($fieldId);
+
+        $this->validValues = [
+            'autor' => _('Student/in'),
+            'tutor' => _('Tutor/in'),
+            'dozent' => _('Lehrende/r')
+        ];
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _('Globaler Status');
+    }
+}
diff --git a/lib/classes/admission/userfilter/SemesterOfStudyCondition.class.php b/lib/classes/admission/userfilter/SemesterOfStudyCondition.class.php
deleted file mode 100644
index 2c1233a..0000000
--- a/lib/classes/admission/userfilter/SemesterOfStudyCondition.class.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * SemesterOfStudyCondition.class.php
- *
- * All conditions concerning the semester of study in Stud.IP can be specified here.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class SemesterOfStudyCondition extends UserFilterField
-{
-    // --- ATTRIBUTES ---
-    public $valuesDbTable = 'user_studiengang';
-    public $valuesDbIdField = 'semester';
-    public $userDataDbTable = 'user_studiengang';
-    public $userDataDbField = 'semester';
-
-    public $sortOrder = 4;
-
-    // --- OPERATIONS ---
-
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($fieldId='')
-    {
-        parent::__construct($fieldId);
-        $this->validValues = [];
-        $this->relations = [
-            'DegreeCondition' => [
-                'local_field' => 'abschluss_id',
-                'foreign_field' => 'abschluss_id'
-            ],
-            'SubjectCondition' => [
-                'local_field' => 'fach_id',
-                'foreign_field' => 'fach_id'
-            ]
-        ];
-        $this->validCompareOperators = [
-            '>=' => _('mindestens'),
-            '<=' => _('höchstens'),
-            '=' => _('ist'),
-            '!=' => _('ist nicht')
-        ];
-        if (isset(self::$cached_valid_values[static::class])) {
-            $this->validValues = self::$cached_valid_values[static::class];
-        } else {
-            // Initialize to some value in case there are no semester numbers.
-            $maxsem = 15;
-            // Calculate the maximal available semester.
-                $stmt = DBManager::get()->query("SELECT MAX(" . $this->valuesDbIdField . ") AS maxsem " .
-                    "FROM `" . $this->valuesDbTable . "`");
-            if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-                if ($current['maxsem']) {
-                    $maxsem = $current['maxsem'];
-                }
-            }
-            for ($i = 1; $i <= $maxsem; $i++) {
-                $this->validValues[$i] = $i;
-            }
-            self::$cached_valid_values[static::class] = $this->validValues;
-        }
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _('Fachsemester');
-    }
-
-}
diff --git a/lib/classes/admission/userfilter/SemesterOfStudyCondition.php b/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
new file mode 100644
index 0000000..2c1233a
--- /dev/null
+++ b/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * SemesterOfStudyCondition.class.php
+ *
+ * All conditions concerning the semester of study in Stud.IP can be specified here.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class SemesterOfStudyCondition extends UserFilterField
+{
+    // --- ATTRIBUTES ---
+    public $valuesDbTable = 'user_studiengang';
+    public $valuesDbIdField = 'semester';
+    public $userDataDbTable = 'user_studiengang';
+    public $userDataDbField = 'semester';
+
+    public $sortOrder = 4;
+
+    // --- OPERATIONS ---
+
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($fieldId='')
+    {
+        parent::__construct($fieldId);
+        $this->validValues = [];
+        $this->relations = [
+            'DegreeCondition' => [
+                'local_field' => 'abschluss_id',
+                'foreign_field' => 'abschluss_id'
+            ],
+            'SubjectCondition' => [
+                'local_field' => 'fach_id',
+                'foreign_field' => 'fach_id'
+            ]
+        ];
+        $this->validCompareOperators = [
+            '>=' => _('mindestens'),
+            '<=' => _('höchstens'),
+            '=' => _('ist'),
+            '!=' => _('ist nicht')
+        ];
+        if (isset(self::$cached_valid_values[static::class])) {
+            $this->validValues = self::$cached_valid_values[static::class];
+        } else {
+            // Initialize to some value in case there are no semester numbers.
+            $maxsem = 15;
+            // Calculate the maximal available semester.
+                $stmt = DBManager::get()->query("SELECT MAX(" . $this->valuesDbIdField . ") AS maxsem " .
+                    "FROM `" . $this->valuesDbTable . "`");
+            if ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                if ($current['maxsem']) {
+                    $maxsem = $current['maxsem'];
+                }
+            }
+            for ($i = 1; $i <= $maxsem; $i++) {
+                $this->validValues[$i] = $i;
+            }
+            self::$cached_valid_values[static::class] = $this->validValues;
+        }
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _('Fachsemester');
+    }
+
+}
diff --git a/lib/classes/admission/userfilter/StgteilVersionCondition.class.php b/lib/classes/admission/userfilter/StgteilVersionCondition.class.php
deleted file mode 100644
index f6348e5..0000000
--- a/lib/classes/admission/userfilter/StgteilVersionCondition.class.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * StgteilVersionCondition.class.php
- *
- * All conditions concerning the Studiengangteil-Versionen in Stud.IP can be specified here.
- *
- * 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.
- *
- * @author      Timo Hartge <hartge@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class StgteilVersionCondition extends UserFilterField
-{
-    // --- ATTRIBUTES ---
-    public $valuesDbTable = 'mvv_stgteilversion';
-    public $valuesDbIdField = 'version_id';
-    public $valuesDbNameField = 'code';
-    public $userDataDbTable = 'user_studiengang';
-    public $userDataDbField = 'version_id';
-
-    public $sortOrder = 5;
-
-    public static $isParameterized = true;
-
-    public static function getParameterizedTypes()
-    {
-        if (Config::get()->DISPLAY_STGTEILVERSION_USERFILTER) {
-            $filter = new StgteilVersionCondition;
-            $fields['StgteilVersionCondition'] = $filter->getName();
-            return $fields;
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($fieldId = '')
-    {
-        $this->validCompareOperators = [
-            '=' => _('ist'),
-            '!=' => _('ist nicht')
-        ];
-        if ($this->valuesDbNameField) {
-            // Get all available values from database.
-            $stmt = DBManager::get()->query(
-                "SELECT DISTINCT `version_id`, `fach`.`name` ".
-                 "FROM `mvv_stgteilversion` LEFT JOIN mvv_stgteil USING (stgteil_id)".
-                 "LEFT JOIN fach USING (fach_id)".
-                 "WHERE `mvv_stgteilversion`.`stat` = 'genehmigt' ORDER BY `fach`.`name` ASC");
-
-            while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
-                $this->validValues[$current[$this->valuesDbIdField]] = $current[$this->valuesDbNameField];
-            }
-        }
-        if ($fieldId) {
-            $this->id = $fieldId;
-            $this->load();
-        } else {
-            $this->id = $this->generateId();
-        }
-
-        foreach ($this->validValues as $version_id => $name) {
-            $stgteilversion = StgteilVersion::find($version_id);
-            $this->validValues[$version_id] = $stgteilversion->getDisplayName();
-        }
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _('Studiengangteil-Version');
-    }
-}
diff --git a/lib/classes/admission/userfilter/StgteilVersionCondition.php b/lib/classes/admission/userfilter/StgteilVersionCondition.php
new file mode 100644
index 0000000..f6348e5
--- /dev/null
+++ b/lib/classes/admission/userfilter/StgteilVersionCondition.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * StgteilVersionCondition.class.php
+ *
+ * All conditions concerning the Studiengangteil-Versionen in Stud.IP can be specified here.
+ *
+ * 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.
+ *
+ * @author      Timo Hartge <hartge@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class StgteilVersionCondition extends UserFilterField
+{
+    // --- ATTRIBUTES ---
+    public $valuesDbTable = 'mvv_stgteilversion';
+    public $valuesDbIdField = 'version_id';
+    public $valuesDbNameField = 'code';
+    public $userDataDbTable = 'user_studiengang';
+    public $userDataDbField = 'version_id';
+
+    public $sortOrder = 5;
+
+    public static $isParameterized = true;
+
+    public static function getParameterizedTypes()
+    {
+        if (Config::get()->DISPLAY_STGTEILVERSION_USERFILTER) {
+            $filter = new StgteilVersionCondition;
+            $fields['StgteilVersionCondition'] = $filter->getName();
+            return $fields;
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($fieldId = '')
+    {
+        $this->validCompareOperators = [
+            '=' => _('ist'),
+            '!=' => _('ist nicht')
+        ];
+        if ($this->valuesDbNameField) {
+            // Get all available values from database.
+            $stmt = DBManager::get()->query(
+                "SELECT DISTINCT `version_id`, `fach`.`name` ".
+                 "FROM `mvv_stgteilversion` LEFT JOIN mvv_stgteil USING (stgteil_id)".
+                 "LEFT JOIN fach USING (fach_id)".
+                 "WHERE `mvv_stgteilversion`.`stat` = 'genehmigt' ORDER BY `fach`.`name` ASC");
+
+            while ($current = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                $this->validValues[$current[$this->valuesDbIdField]] = $current[$this->valuesDbNameField];
+            }
+        }
+        if ($fieldId) {
+            $this->id = $fieldId;
+            $this->load();
+        } else {
+            $this->id = $this->generateId();
+        }
+
+        foreach ($this->validValues as $version_id => $name) {
+            $stgteilversion = StgteilVersion::find($version_id);
+            $this->validValues[$version_id] = $stgteilversion->getDisplayName();
+        }
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _('Studiengangteil-Version');
+    }
+}
diff --git a/lib/classes/admission/userfilter/SubjectCondition.class.php b/lib/classes/admission/userfilter/SubjectCondition.class.php
deleted file mode 100644
index ab44d49..0000000
--- a/lib/classes/admission/userfilter/SubjectCondition.class.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * SubjectCondition.class.php
- *
- * All conditions concerning the study subject in Stud.IP can be specified here.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class SubjectCondition extends UserFilterField
-{
-    // --- ATTRIBUTES ---
-    public $valuesDbTable = 'fach';
-    public $valuesDbIdField = 'fach_id';
-    public $valuesDbNameField = 'name';
-    public $userDataDbTable = 'user_studiengang';
-    public $userDataDbField = 'fach_id';
-
-    public $sortOrder = 2;
-
-    // --- OPERATIONS ---
-
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($fieldId = '')
-    {
-        parent::__construct($fieldId);
-        $this->relations = [
-            'DegreeCondition' => [
-                'local_field' => 'abschluss_id',
-                'foreign_field' => 'abschluss_id'
-                ]
-        ];
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _('Studienfach');
-    }
-}
diff --git a/lib/classes/admission/userfilter/SubjectCondition.php b/lib/classes/admission/userfilter/SubjectCondition.php
new file mode 100644
index 0000000..ab44d49
--- /dev/null
+++ b/lib/classes/admission/userfilter/SubjectCondition.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * SubjectCondition.class.php
+ *
+ * All conditions concerning the study subject in Stud.IP can be specified here.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class SubjectCondition extends UserFilterField
+{
+    // --- ATTRIBUTES ---
+    public $valuesDbTable = 'fach';
+    public $valuesDbIdField = 'fach_id';
+    public $valuesDbNameField = 'name';
+    public $userDataDbTable = 'user_studiengang';
+    public $userDataDbField = 'fach_id';
+
+    public $sortOrder = 2;
+
+    // --- OPERATIONS ---
+
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($fieldId = '')
+    {
+        parent::__construct($fieldId);
+        $this->relations = [
+            'DegreeCondition' => [
+                'local_field' => 'abschluss_id',
+                'foreign_field' => 'abschluss_id'
+                ]
+        ];
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _('Studienfach');
+    }
+}
diff --git a/lib/classes/admission/userfilter/SubjectConditionAny.class.php b/lib/classes/admission/userfilter/SubjectConditionAny.class.php
deleted file mode 100644
index 107c86c..0000000
--- a/lib/classes/admission/userfilter/SubjectConditionAny.class.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * SubjectConditionAny.class.php
- *
- * All conditions concerning the study subject in Stud.IP can be specified here.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-require_once realpath(__DIR__ . '/..') . '/UserFilterField.class.php';
-
-class SubjectConditionAny extends UserFilterField
-{
-    // --- ATTRIBUTES ---
-    public $userDataDbTable = 'user_studiengang';
-    public $userDataDbField = 'fach_id';
-
-    public $sortOrder = 3;
-
-    // --- OPERATIONS ---
-
-    /**
-     * @see UserFilterField::__construct
-     */
-    public function __construct($fieldId = '')
-    {
-        parent::__construct($fieldId);
-        $this->validCompareOperators = [
-            '!=' => ' '
-        ];
-        $this->validValues = ['' => ' '];
-    }
-
-    /**
-     * Get this field's display name.
-     *
-     * @return String
-     */
-    public function getName()
-    {
-        return _('Alle Studienfächer');
-    }
-}
diff --git a/lib/classes/admission/userfilter/SubjectConditionAny.php b/lib/classes/admission/userfilter/SubjectConditionAny.php
new file mode 100644
index 0000000..107c86c
--- /dev/null
+++ b/lib/classes/admission/userfilter/SubjectConditionAny.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * SubjectConditionAny.class.php
+ *
+ * All conditions concerning the study subject in Stud.IP can be specified here.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+require_once realpath(__DIR__ . '/..') . '/UserFilterField.class.php';
+
+class SubjectConditionAny extends UserFilterField
+{
+    // --- ATTRIBUTES ---
+    public $userDataDbTable = 'user_studiengang';
+    public $userDataDbField = 'fach_id';
+
+    public $sortOrder = 3;
+
+    // --- OPERATIONS ---
+
+    /**
+     * @see UserFilterField::__construct
+     */
+    public function __construct($fieldId = '')
+    {
+        parent::__construct($fieldId);
+        $this->validCompareOperators = [
+            '!=' => ' '
+        ];
+        $this->validValues = ['' => ' '];
+    }
+
+    /**
+     * Get this field's display name.
+     *
+     * @return String
+     */
+    public function getName()
+    {
+        return _('Alle Studienfächer');
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthAbstract.class.php b/lib/classes/auth_plugins/StudipAuthAbstract.class.php
deleted file mode 100644
index 36c75df..0000000
--- a/lib/classes/auth_plugins/StudipAuthAbstract.class.php
+++ /dev/null
@@ -1,578 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipAuthAbstract.class.php
-// Abstract class, used as a template for authentication plugins
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * abstract base class for authentication plugins
- *
- * abstract base class for authentication plugins
- * to write your own authentication plugin, derive it from this class and
- * implement the following abstract methods: isUsedUsername($username) and
- * isAuthenticated($username, $password, $jscript)
- * don't forget to call the parents constructor if you implement your own, php
- * won't do that for you !
- *
- * @abstract
- * @author   André Noack <noack@data-quest.de>
- * @package
- */
-class StudipAuthAbstract
-{
-
-    /**
-     * contains error message, if authentication fails
-     *
-     *
-     * @var      string $error_msg
-     */
-    public $error_msg;
-
-    /**
-     * indicates whether the authenticated user logs in for the first time
-     *
-     *
-     * @var      bool $is_new_user
-     */
-    public $is_new_user = false;
-
-    /**
-     * array of user domains to assign to each user, can be set in local.inc
-     *
-     * @access  public
-     * @var     array $user_domains
-     */
-    public $user_domains;
-
-    /**
-     * associative array with mapping for database fields
-     *
-     * associative array with mapping for database fields,
-     * should be set in local.inc
-     * structure :
-     * array('<table name>.<field name>' => array(   'callback' => '<name of callback method used for data retrieval>',
-     *                                               'map_args' => '<arguments passed to callback method>'))
-     * @var      array $user_data_mapping
-     */
-    public $user_data_mapping = null;
-
-    /**
-     * name of the plugin
-     *
-     * name of the plugin (last part of class name) is set in the constructor
-     * @var      string $plugin_name
-     */
-    public $plugin_name;
-
-    /**
-     * text, which precedes error message for the plugin
-     *
-     *
-     * @var      string $error_head
-     */
-    public $error_head;
-
-    /**
-     * toggles display of standard login
-     *
-     *
-     * @var      bool $show_login
-     */
-    public $show_login;
-
-    /**
-     * @var $plugin_instances
-     */
-    private static $plugin_instances;
-
-    private $config_data = [];
-
-    /**
-     * static method to instantiate and retrieve a reference to an object (singleton)
-     *
-     * always use this method to instantiate a plugin object, it will ensure that only one object of each
-     * plugin will exist
-     * @param string $plugin_name name of plugin, if omitted an array with all plugin objects will be returned
-     * @return   mixed   either a reference to the plugin with the passed name, or an array with references to all plugins
-     */
-    public static function getInstance($plugin_name = false)
-    {
-        if (!is_array(self::$plugin_instances)) {
-            foreach ($GLOBALS['STUDIP_AUTH_PLUGIN'] as $plugin) {
-                $config = $GLOBALS['STUDIP_AUTH_CONFIG_' . strtoupper($plugin)];
-                $plugin_class = $config['plugin_class'] ?? 'StudipAuth' . $plugin;
-                if (empty($config['plugin_name'])) {
-                    $config['plugin_name'] = strtolower($plugin);
-                }
-                self::$plugin_instances[strtoupper($plugin)] = new $plugin_class($config);
-            }
-        }
-        return ($plugin_name) ? self::$plugin_instances[strtoupper($plugin_name)]??null : self::$plugin_instances;
-    }
-
-    /**
-     * static method to check if SSO login is enabled
-     *
-     * @return bool
-     */
-    public static function isSSOEnabled(): bool
-    {
-        self::getInstance();
-        foreach (self::$plugin_instances as $auth_plugin) {
-            if ($auth_plugin instanceof StudipAuthSSO) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * static method to check if standard login is enabled
-     *
-     * @return bool
-     */
-    public static function isLoginEnabled(): bool
-    {
-        self::getInstance();
-        foreach (self::$plugin_instances as $auth_plugin) {
-            if ($auth_plugin->show_login === true) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * static method to check authentication in all plugins
-     *
-     * if authentication fails in one plugin, the error message is stored and the next plugin is used
-     * if authentication succeeds, the uid element in the returned array will contain the Stud.IP user id
-     *
-     * @param string $username the username to check
-     * @param string $password the password to check
-     * @return   array   structure: array('uid'=>'string <Stud.IP user id>','error'=>'string <error message>','is_new_user'=>'bool')
-     */
-    public static function CheckAuthentication($username, $password)
-    {
-
-        $plugins = StudipAuthAbstract::GetInstance();
-        $error = false;
-        $uid = false;
-        foreach ($plugins as $object) {
-            // SSO plugins can't be used
-            if ($object instanceof StudipAuthSSO) {
-                continue;
-            }
-            if ($user = $object->authenticateUser($username, $password)) {
-                if ($user) {
-                    $uid = $user->id;
-                    $locked = $user['locked'];
-                    $key = $user['validation_key'];
-                    $checkIPRange = ($GLOBALS['ENABLE_ADMIN_IP_CHECK'] && $user['perms'] === 'admin')
-                        || ($GLOBALS['ENABLE_ROOT_IP_CHECK'] && $user['perms'] === 'root');
-
-                    if ($user->isExpired()) {
-                        $error .= _('Dieses Benutzerkonto ist abgelaufen.<br> Wenden Sie sich bitte an die Administration.') . '<BR>';
-                        return ['uid' => false, 'error' => $error];
-                    } else if ($locked) {
-                        $error .= _('Dieser Benutzer ist gesperrt! Wenden Sie sich bitte an die Administration.') . '<BR>';
-                        return ['uid' => false, 'error' => $error];
-                    } else if ($key != '') {
-                        return ['uid' => $uid, 'user' => $user, 'error' => $error, 'need_email_activation' => $uid];
-                    } else if ($checkIPRange && !self::CheckIPRange()) {
-                        $error .= _('Der Login in Ihren Account ist aus diesem Netzwerk nicht erlaubt.') . '<BR>';
-                        return ['uid' => false, 'error' => $error];
-                    }
-                }
-                return ['uid' => $uid, 'user' => $user, 'error' => $error, 'is_new_user' => $object->is_new_user];
-            } else {
-                $error .= (($object->error_head) ? ('<b>' . $object->error_head . ':</b> ') : '') . $object->error_msg . '<br>';
-            }
-        }
-        return ['uid' => $uid, 'error' => $error];
-    }
-
-    /**
-     * static method to check if passed username is used in external data sources
-     *
-     * all plugins are checked, the error messages are stored and returned
-     *
-     * @param string $username the username
-     * @return   array
-     */
-    public static function CheckUsername($username)
-    {
-        $plugins = StudipAuthAbstract::GetInstance();
-        $error = false;
-        $found = false;
-        foreach ($plugins as $object) {
-            if ($found = $object->isUsedUsername($username)) {
-                return ['found' => $found, 'error' => $error];
-            } else {
-                $error .= (($object->error_head) ? ('<b>' . $object->error_head . ':</b> ') : '') . $object->error_msg . '<br>';
-            }
-        }
-        return ['found' => $found, 'error' => $error];
-    }
-
-    /**
-     * static method to check for a mapped field
-     *
-     * this method checks in the plugin with the passed name, if the passed
-     * Stud.IP DB field is mapped to an external data source
-     *
-     * @param string  the name of the db field must be in form '<table name>.<field name>'
-     * @param string  the name of the plugin to check
-     * @return   bool    true if the field is mapped, else false
-     */
-    public static function CheckField($field_name, $plugin_name)
-    {
-        if (!$plugin_name) {
-            return false;
-        }
-        $plugin = StudipAuthAbstract::GetInstance($plugin_name);
-        return (is_object($plugin) ? $plugin->isMappedField($field_name) : false);
-    }
-
-    /**
-     * static method to check if ip address belongs to allowed range
-     *
-     * @return   bool    true if the client ip address is within the valid range
-     */
-    public static function CheckIPRange()
-    {
-        $ip = $_SERVER['REMOTE_ADDR'];
-        $version = substr_count($ip, ':') > 1 ? 'V6' : 'V4'; // valid ip v6 addresses have atleast two colons
-        $method = 'CheckIPRange' . $version;
-        if (is_array($GLOBALS['LOGIN_IP_RANGES'][$version])) {
-            foreach ($GLOBALS['LOGIN_IP_RANGES'][$version] as $range) {
-                if (self::$method($ip, $range)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param $ip string IPv4 adress
-     * @param $range array assoc array with [start] & [end]
-     * @return bool
-     */
-    public static function CheckIPRangeV4($ip, $range)
-    {
-        $ipv4 = ip2long($ip);
-        if ($ipv4 === false) {
-            return false; // invalid ip address
-        }
-
-        $start = ip2long($range['start']);
-        $end = ip2long($range['end']);
-
-        return $ipv4 >= $start && $ipv4 <= $end;
-    }
-
-    /**
-     * @param $ip string IPv6 address
-     * @param $range array assoc array with [start] & [end]
-     * @return bool
-     */
-    public static function CheckIPRangeV6($ip, $range)
-    {
-        $ipv6 = inet_pton($ip);
-        if ($ipv6 === false) {
-            return false; // invalid ip address
-        }
-
-        $start = inet_pton($range['start']);
-        $end = inet_pton($range['end']);
-
-        return strlen($ipv6) === strlen($start)
-            && $ipv6 >= $start && $ipv6 <= $end;
-    }
-
-    /**
-     * Constructor
-     *
-     * you should use StudipAuthAbstract::GetInstance($plugin_name)
-     * to get a reference to a plugin object. Make sure the constructor in the base class is called
-     * when deriving your own plugin class, it assigns the settings from local.inc as members of the plugin
-     * each key of the $STUDIP_AUTH_CONFIG_<plugin name> array will become a member of the object
-     *
-     * @param array $config
-     */
-    public function __construct($config = [])
-    {
-        //get configuration array set in local inc
-        if (empty($config)) {
-            $this->plugin_name = strtolower(substr(get_class($this), 10));
-            $config = $GLOBALS['STUDIP_AUTH_CONFIG_' . strtoupper($this->plugin_name)];
-        }
-        //assign each key in the config array as a member of the plugin object
-        foreach ($config as $key => $value) {
-            $this->$key = $value;
-        }
-    }
-
-    /**
-     * authentication method
-     *
-     * this method authenticates the passed username, it is used by StudipAuthAbstract::CheckAuthentication()
-     * if authentication succeeds it calls StudipAuthAbstract::doDataMapping() to map data fields
-     * if the authenticated user logs in for the first time it calls StudipAuthAbstract::doNewUserInit() to
-     * initialize the new user
-     * @param string $username the username to check
-     * @param string $password the password to check
-     * @return   string  if authentication succeeds the Stud.IP user , else false
-     */
-    public function authenticateUser($username, $password)
-    {
-        $username = $this->verifyUsername($username);
-        if ($this->isAuthenticated($username, $password)) {
-            if ($user = $this->getStudipUser($username)) {
-                $this->doDataMapping($user);
-                if ($this->is_new_user) {
-                    $this->doNewUserInit($user);
-                }
-                $this->setUserDomains($user);
-            }
-            return $user;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * method to retrieve the Stud.IP user id to a given username
-     *
-     *
-     * @access   private
-     * @param string  the username
-     * @return   User  the Stud.IP or false if an error occurs
-     */
-    function getStudipUser($username)
-    {
-        $user = User::findByUsername($username);
-        if ($user) {
-            $auth_plugin = $user->auth_plugin;
-            if ($auth_plugin === null) {
-                $this->error_msg = _('Dies ist ein vorläufiger Benutzer.') . '<br>';
-                return false;
-            }
-            if ($auth_plugin != $this->plugin_name) {
-                $this->error_msg = sprintf(_('Dieser Benutzername wird bereits über %s authentifiziert!'), $auth_plugin) . '<br>';
-                return false;
-            }
-            return $user;
-        }
-        $new_user = new User();
-        $new_user->username = $username;
-        $new_user->perms = 'autor';
-        $new_user->auth_plugin = $this->plugin_name;
-        $new_user->preferred_language = $_SESSION['_language'];
-        if ($new_user->store()) {
-            $this->is_new_user = true;
-            return $new_user;
-        }
-    }
-
-    /**
-     * initialize a new user
-     *
-     * this method is invoked for one time, if a new user logs in ($this->is_new_user is true)
-     * place special treatment of new users here
-     *
-     * @access private
-     * @param User $user the user object
-     */
-    function doNewUserInit($user)
-    {
-        // auto insertion of new users, according to $AUTO_INSERT_SEM[] (defined in local.inc)
-        AutoInsert::instance()->saveUser($user->id, $user->perms);
-    }
-
-    /**
-     * This method sets the user domains for the current user.
-     *
-     * @access  private
-     * @param User  the user object
-     */
-    function setUserDomains($user)
-    {
-        $user_domains = $this->getUserDomains();
-        $uid = $user->id;
-        if (isset($user_domains)) {
-            $old_domains = UserDomain::getUserDomainsForUser($uid);
-
-            foreach ($old_domains as $domain) {
-                if (!in_array($domain->id, $user_domains)) {
-                    $domain->removeUser($uid);
-                }
-            }
-
-            foreach ($user_domains as $user_domain) {
-                $domain = new UserDomain($user_domain);
-
-                if ($domain->isNew()) {
-                    $domain->name = $user_domain;
-                    $domain->store();
-                }
-
-                if (!in_array($domain, $old_domains)) {
-                    $domain->addUser($uid);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the user domains to assign to the current user.
-     */
-    function getUserDomains()
-    {
-        return $this->user_domains;
-    }
-
-    /**
-     * this method handles the data mapping
-     *
-     * for each entry in $this->user_data_mapping the according callback will be invoked
-     * the return value of the callback method is then written to the db field, which is specified
-     * in the key of the array
-     *
-     * @access   private
-     * @param User  the user object
-     * @return   bool
-     */
-    function doDataMapping($user)
-    {
-        if ($user && is_array($this->user_data_mapping)) {
-            foreach ($this->user_data_mapping as $key => $value) {
-                $callback = null;
-                if (method_exists($this, $value['callback'])) {
-                    $callback = [$this, $value['callback']];
-                } else if (is_callable($value['callback'])) {
-                    $callback = $value['callback'];
-                }
-                if ($callback) {
-                    $split = explode('.', $key);
-                    $table = $split[0];
-                    $field = $split[1];
-                    if ($table === 'auth_user_md5' || $table === 'user_info') {
-                        $mapped_value = call_user_func($callback, $value['map_args']);
-                        if (isset($mapped_value)) {
-                            $user->setValue($field, $mapped_value);
-                        }
-                    } else {
-                        call_user_func($callback, [$table, $field, $user, $value['map_args']]);
-                    }
-                }
-            }
-            return $user->store();
-        }
-        return false;
-    }
-
-    /**
-     * method to check, if a given db field is mapped by the plugin
-     *
-     *
-     * @access   private
-     * @param string  the name of the db field (<table_name>.<field_name>)
-     * @return   bool    true if the field is mapped
-     */
-    function isMappedField($name)
-    {
-        return isset($this->user_data_mapping[$name]);
-    }
-
-    /**
-     * method to eliminate bad characters in the given username
-     *
-     *
-     * @access   private
-     * @param string  the username
-     * @return   string  the username
-     */
-    function verifyUsername($username)
-    {
-        if ($this->username_case_insensitiv) {
-            $username = mb_strtolower($username);
-        }
-        if ($this->bad_char_regex) {
-            return preg_replace($this->bad_char_regex, '', $username);
-        } else {
-            return trim($username);
-        }
-    }
-
-    /**
-     * method to check, if username is used
-     *
-     * abstract MUST be realized
-     *
-     * @access   private
-     * @param string  the username
-     * @return   bool    true if the username exists
-     */
-    function isUsedUsername($username)
-    {
-        $this->error_msg = sprintf(_('Methode %s nicht implementiert!'), get_class($this) . '::isUsedUsername()');
-        return false;
-    }
-
-    /**
-     * method to check the authentication of a given username and a given password
-     *
-     * abstract, MUST be realized
-     *
-     * @access private
-     * @param string  the username
-     * @param string  the password
-     * @return   bool    true if authentication succeeds
-     */
-    function isAuthenticated($username, $password)
-    {
-        $this->error = sprintf(_('Methode %s nicht implementiert!'), get_class($this) . '::isAuthenticated()');
-        return false;
-    }
-
-    // Store dynamically set dynamically created properties in $config_data
-    public function __isset($offset)
-    {
-        return isset($this->config_data[$offset]);
-    }
-
-    public function __set($offset, $value)
-    {
-        $this->config_data[$offset] = $value;
-    }
-
-    public function __get($offset)
-    {
-        return $this->config_data[$offset] ?? null;
-    }
-
-    public function __unset($offset)
-    {
-        unset($this->config_data[$offset]);
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthAbstract.php b/lib/classes/auth_plugins/StudipAuthAbstract.php
new file mode 100644
index 0000000..36c75df
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthAbstract.php
@@ -0,0 +1,578 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipAuthAbstract.class.php
+// Abstract class, used as a template for authentication plugins
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * abstract base class for authentication plugins
+ *
+ * abstract base class for authentication plugins
+ * to write your own authentication plugin, derive it from this class and
+ * implement the following abstract methods: isUsedUsername($username) and
+ * isAuthenticated($username, $password, $jscript)
+ * don't forget to call the parents constructor if you implement your own, php
+ * won't do that for you !
+ *
+ * @abstract
+ * @author   André Noack <noack@data-quest.de>
+ * @package
+ */
+class StudipAuthAbstract
+{
+
+    /**
+     * contains error message, if authentication fails
+     *
+     *
+     * @var      string $error_msg
+     */
+    public $error_msg;
+
+    /**
+     * indicates whether the authenticated user logs in for the first time
+     *
+     *
+     * @var      bool $is_new_user
+     */
+    public $is_new_user = false;
+
+    /**
+     * array of user domains to assign to each user, can be set in local.inc
+     *
+     * @access  public
+     * @var     array $user_domains
+     */
+    public $user_domains;
+
+    /**
+     * associative array with mapping for database fields
+     *
+     * associative array with mapping for database fields,
+     * should be set in local.inc
+     * structure :
+     * array('<table name>.<field name>' => array(   'callback' => '<name of callback method used for data retrieval>',
+     *                                               'map_args' => '<arguments passed to callback method>'))
+     * @var      array $user_data_mapping
+     */
+    public $user_data_mapping = null;
+
+    /**
+     * name of the plugin
+     *
+     * name of the plugin (last part of class name) is set in the constructor
+     * @var      string $plugin_name
+     */
+    public $plugin_name;
+
+    /**
+     * text, which precedes error message for the plugin
+     *
+     *
+     * @var      string $error_head
+     */
+    public $error_head;
+
+    /**
+     * toggles display of standard login
+     *
+     *
+     * @var      bool $show_login
+     */
+    public $show_login;
+
+    /**
+     * @var $plugin_instances
+     */
+    private static $plugin_instances;
+
+    private $config_data = [];
+
+    /**
+     * static method to instantiate and retrieve a reference to an object (singleton)
+     *
+     * always use this method to instantiate a plugin object, it will ensure that only one object of each
+     * plugin will exist
+     * @param string $plugin_name name of plugin, if omitted an array with all plugin objects will be returned
+     * @return   mixed   either a reference to the plugin with the passed name, or an array with references to all plugins
+     */
+    public static function getInstance($plugin_name = false)
+    {
+        if (!is_array(self::$plugin_instances)) {
+            foreach ($GLOBALS['STUDIP_AUTH_PLUGIN'] as $plugin) {
+                $config = $GLOBALS['STUDIP_AUTH_CONFIG_' . strtoupper($plugin)];
+                $plugin_class = $config['plugin_class'] ?? 'StudipAuth' . $plugin;
+                if (empty($config['plugin_name'])) {
+                    $config['plugin_name'] = strtolower($plugin);
+                }
+                self::$plugin_instances[strtoupper($plugin)] = new $plugin_class($config);
+            }
+        }
+        return ($plugin_name) ? self::$plugin_instances[strtoupper($plugin_name)]??null : self::$plugin_instances;
+    }
+
+    /**
+     * static method to check if SSO login is enabled
+     *
+     * @return bool
+     */
+    public static function isSSOEnabled(): bool
+    {
+        self::getInstance();
+        foreach (self::$plugin_instances as $auth_plugin) {
+            if ($auth_plugin instanceof StudipAuthSSO) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * static method to check if standard login is enabled
+     *
+     * @return bool
+     */
+    public static function isLoginEnabled(): bool
+    {
+        self::getInstance();
+        foreach (self::$plugin_instances as $auth_plugin) {
+            if ($auth_plugin->show_login === true) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * static method to check authentication in all plugins
+     *
+     * if authentication fails in one plugin, the error message is stored and the next plugin is used
+     * if authentication succeeds, the uid element in the returned array will contain the Stud.IP user id
+     *
+     * @param string $username the username to check
+     * @param string $password the password to check
+     * @return   array   structure: array('uid'=>'string <Stud.IP user id>','error'=>'string <error message>','is_new_user'=>'bool')
+     */
+    public static function CheckAuthentication($username, $password)
+    {
+
+        $plugins = StudipAuthAbstract::GetInstance();
+        $error = false;
+        $uid = false;
+        foreach ($plugins as $object) {
+            // SSO plugins can't be used
+            if ($object instanceof StudipAuthSSO) {
+                continue;
+            }
+            if ($user = $object->authenticateUser($username, $password)) {
+                if ($user) {
+                    $uid = $user->id;
+                    $locked = $user['locked'];
+                    $key = $user['validation_key'];
+                    $checkIPRange = ($GLOBALS['ENABLE_ADMIN_IP_CHECK'] && $user['perms'] === 'admin')
+                        || ($GLOBALS['ENABLE_ROOT_IP_CHECK'] && $user['perms'] === 'root');
+
+                    if ($user->isExpired()) {
+                        $error .= _('Dieses Benutzerkonto ist abgelaufen.<br> Wenden Sie sich bitte an die Administration.') . '<BR>';
+                        return ['uid' => false, 'error' => $error];
+                    } else if ($locked) {
+                        $error .= _('Dieser Benutzer ist gesperrt! Wenden Sie sich bitte an die Administration.') . '<BR>';
+                        return ['uid' => false, 'error' => $error];
+                    } else if ($key != '') {
+                        return ['uid' => $uid, 'user' => $user, 'error' => $error, 'need_email_activation' => $uid];
+                    } else if ($checkIPRange && !self::CheckIPRange()) {
+                        $error .= _('Der Login in Ihren Account ist aus diesem Netzwerk nicht erlaubt.') . '<BR>';
+                        return ['uid' => false, 'error' => $error];
+                    }
+                }
+                return ['uid' => $uid, 'user' => $user, 'error' => $error, 'is_new_user' => $object->is_new_user];
+            } else {
+                $error .= (($object->error_head) ? ('<b>' . $object->error_head . ':</b> ') : '') . $object->error_msg . '<br>';
+            }
+        }
+        return ['uid' => $uid, 'error' => $error];
+    }
+
+    /**
+     * static method to check if passed username is used in external data sources
+     *
+     * all plugins are checked, the error messages are stored and returned
+     *
+     * @param string $username the username
+     * @return   array
+     */
+    public static function CheckUsername($username)
+    {
+        $plugins = StudipAuthAbstract::GetInstance();
+        $error = false;
+        $found = false;
+        foreach ($plugins as $object) {
+            if ($found = $object->isUsedUsername($username)) {
+                return ['found' => $found, 'error' => $error];
+            } else {
+                $error .= (($object->error_head) ? ('<b>' . $object->error_head . ':</b> ') : '') . $object->error_msg . '<br>';
+            }
+        }
+        return ['found' => $found, 'error' => $error];
+    }
+
+    /**
+     * static method to check for a mapped field
+     *
+     * this method checks in the plugin with the passed name, if the passed
+     * Stud.IP DB field is mapped to an external data source
+     *
+     * @param string  the name of the db field must be in form '<table name>.<field name>'
+     * @param string  the name of the plugin to check
+     * @return   bool    true if the field is mapped, else false
+     */
+    public static function CheckField($field_name, $plugin_name)
+    {
+        if (!$plugin_name) {
+            return false;
+        }
+        $plugin = StudipAuthAbstract::GetInstance($plugin_name);
+        return (is_object($plugin) ? $plugin->isMappedField($field_name) : false);
+    }
+
+    /**
+     * static method to check if ip address belongs to allowed range
+     *
+     * @return   bool    true if the client ip address is within the valid range
+     */
+    public static function CheckIPRange()
+    {
+        $ip = $_SERVER['REMOTE_ADDR'];
+        $version = substr_count($ip, ':') > 1 ? 'V6' : 'V4'; // valid ip v6 addresses have atleast two colons
+        $method = 'CheckIPRange' . $version;
+        if (is_array($GLOBALS['LOGIN_IP_RANGES'][$version])) {
+            foreach ($GLOBALS['LOGIN_IP_RANGES'][$version] as $range) {
+                if (self::$method($ip, $range)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param $ip string IPv4 adress
+     * @param $range array assoc array with [start] & [end]
+     * @return bool
+     */
+    public static function CheckIPRangeV4($ip, $range)
+    {
+        $ipv4 = ip2long($ip);
+        if ($ipv4 === false) {
+            return false; // invalid ip address
+        }
+
+        $start = ip2long($range['start']);
+        $end = ip2long($range['end']);
+
+        return $ipv4 >= $start && $ipv4 <= $end;
+    }
+
+    /**
+     * @param $ip string IPv6 address
+     * @param $range array assoc array with [start] & [end]
+     * @return bool
+     */
+    public static function CheckIPRangeV6($ip, $range)
+    {
+        $ipv6 = inet_pton($ip);
+        if ($ipv6 === false) {
+            return false; // invalid ip address
+        }
+
+        $start = inet_pton($range['start']);
+        $end = inet_pton($range['end']);
+
+        return strlen($ipv6) === strlen($start)
+            && $ipv6 >= $start && $ipv6 <= $end;
+    }
+
+    /**
+     * Constructor
+     *
+     * you should use StudipAuthAbstract::GetInstance($plugin_name)
+     * to get a reference to a plugin object. Make sure the constructor in the base class is called
+     * when deriving your own plugin class, it assigns the settings from local.inc as members of the plugin
+     * each key of the $STUDIP_AUTH_CONFIG_<plugin name> array will become a member of the object
+     *
+     * @param array $config
+     */
+    public function __construct($config = [])
+    {
+        //get configuration array set in local inc
+        if (empty($config)) {
+            $this->plugin_name = strtolower(substr(get_class($this), 10));
+            $config = $GLOBALS['STUDIP_AUTH_CONFIG_' . strtoupper($this->plugin_name)];
+        }
+        //assign each key in the config array as a member of the plugin object
+        foreach ($config as $key => $value) {
+            $this->$key = $value;
+        }
+    }
+
+    /**
+     * authentication method
+     *
+     * this method authenticates the passed username, it is used by StudipAuthAbstract::CheckAuthentication()
+     * if authentication succeeds it calls StudipAuthAbstract::doDataMapping() to map data fields
+     * if the authenticated user logs in for the first time it calls StudipAuthAbstract::doNewUserInit() to
+     * initialize the new user
+     * @param string $username the username to check
+     * @param string $password the password to check
+     * @return   string  if authentication succeeds the Stud.IP user , else false
+     */
+    public function authenticateUser($username, $password)
+    {
+        $username = $this->verifyUsername($username);
+        if ($this->isAuthenticated($username, $password)) {
+            if ($user = $this->getStudipUser($username)) {
+                $this->doDataMapping($user);
+                if ($this->is_new_user) {
+                    $this->doNewUserInit($user);
+                }
+                $this->setUserDomains($user);
+            }
+            return $user;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * method to retrieve the Stud.IP user id to a given username
+     *
+     *
+     * @access   private
+     * @param string  the username
+     * @return   User  the Stud.IP or false if an error occurs
+     */
+    function getStudipUser($username)
+    {
+        $user = User::findByUsername($username);
+        if ($user) {
+            $auth_plugin = $user->auth_plugin;
+            if ($auth_plugin === null) {
+                $this->error_msg = _('Dies ist ein vorläufiger Benutzer.') . '<br>';
+                return false;
+            }
+            if ($auth_plugin != $this->plugin_name) {
+                $this->error_msg = sprintf(_('Dieser Benutzername wird bereits über %s authentifiziert!'), $auth_plugin) . '<br>';
+                return false;
+            }
+            return $user;
+        }
+        $new_user = new User();
+        $new_user->username = $username;
+        $new_user->perms = 'autor';
+        $new_user->auth_plugin = $this->plugin_name;
+        $new_user->preferred_language = $_SESSION['_language'];
+        if ($new_user->store()) {
+            $this->is_new_user = true;
+            return $new_user;
+        }
+    }
+
+    /**
+     * initialize a new user
+     *
+     * this method is invoked for one time, if a new user logs in ($this->is_new_user is true)
+     * place special treatment of new users here
+     *
+     * @access private
+     * @param User $user the user object
+     */
+    function doNewUserInit($user)
+    {
+        // auto insertion of new users, according to $AUTO_INSERT_SEM[] (defined in local.inc)
+        AutoInsert::instance()->saveUser($user->id, $user->perms);
+    }
+
+    /**
+     * This method sets the user domains for the current user.
+     *
+     * @access  private
+     * @param User  the user object
+     */
+    function setUserDomains($user)
+    {
+        $user_domains = $this->getUserDomains();
+        $uid = $user->id;
+        if (isset($user_domains)) {
+            $old_domains = UserDomain::getUserDomainsForUser($uid);
+
+            foreach ($old_domains as $domain) {
+                if (!in_array($domain->id, $user_domains)) {
+                    $domain->removeUser($uid);
+                }
+            }
+
+            foreach ($user_domains as $user_domain) {
+                $domain = new UserDomain($user_domain);
+
+                if ($domain->isNew()) {
+                    $domain->name = $user_domain;
+                    $domain->store();
+                }
+
+                if (!in_array($domain, $old_domains)) {
+                    $domain->addUser($uid);
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the user domains to assign to the current user.
+     */
+    function getUserDomains()
+    {
+        return $this->user_domains;
+    }
+
+    /**
+     * this method handles the data mapping
+     *
+     * for each entry in $this->user_data_mapping the according callback will be invoked
+     * the return value of the callback method is then written to the db field, which is specified
+     * in the key of the array
+     *
+     * @access   private
+     * @param User  the user object
+     * @return   bool
+     */
+    function doDataMapping($user)
+    {
+        if ($user && is_array($this->user_data_mapping)) {
+            foreach ($this->user_data_mapping as $key => $value) {
+                $callback = null;
+                if (method_exists($this, $value['callback'])) {
+                    $callback = [$this, $value['callback']];
+                } else if (is_callable($value['callback'])) {
+                    $callback = $value['callback'];
+                }
+                if ($callback) {
+                    $split = explode('.', $key);
+                    $table = $split[0];
+                    $field = $split[1];
+                    if ($table === 'auth_user_md5' || $table === 'user_info') {
+                        $mapped_value = call_user_func($callback, $value['map_args']);
+                        if (isset($mapped_value)) {
+                            $user->setValue($field, $mapped_value);
+                        }
+                    } else {
+                        call_user_func($callback, [$table, $field, $user, $value['map_args']]);
+                    }
+                }
+            }
+            return $user->store();
+        }
+        return false;
+    }
+
+    /**
+     * method to check, if a given db field is mapped by the plugin
+     *
+     *
+     * @access   private
+     * @param string  the name of the db field (<table_name>.<field_name>)
+     * @return   bool    true if the field is mapped
+     */
+    function isMappedField($name)
+    {
+        return isset($this->user_data_mapping[$name]);
+    }
+
+    /**
+     * method to eliminate bad characters in the given username
+     *
+     *
+     * @access   private
+     * @param string  the username
+     * @return   string  the username
+     */
+    function verifyUsername($username)
+    {
+        if ($this->username_case_insensitiv) {
+            $username = mb_strtolower($username);
+        }
+        if ($this->bad_char_regex) {
+            return preg_replace($this->bad_char_regex, '', $username);
+        } else {
+            return trim($username);
+        }
+    }
+
+    /**
+     * method to check, if username is used
+     *
+     * abstract MUST be realized
+     *
+     * @access   private
+     * @param string  the username
+     * @return   bool    true if the username exists
+     */
+    function isUsedUsername($username)
+    {
+        $this->error_msg = sprintf(_('Methode %s nicht implementiert!'), get_class($this) . '::isUsedUsername()');
+        return false;
+    }
+
+    /**
+     * method to check the authentication of a given username and a given password
+     *
+     * abstract, MUST be realized
+     *
+     * @access private
+     * @param string  the username
+     * @param string  the password
+     * @return   bool    true if authentication succeeds
+     */
+    function isAuthenticated($username, $password)
+    {
+        $this->error = sprintf(_('Methode %s nicht implementiert!'), get_class($this) . '::isAuthenticated()');
+        return false;
+    }
+
+    // Store dynamically set dynamically created properties in $config_data
+    public function __isset($offset)
+    {
+        return isset($this->config_data[$offset]);
+    }
+
+    public function __set($offset, $value)
+    {
+        $this->config_data[$offset] = $value;
+    }
+
+    public function __get($offset)
+    {
+        return $this->config_data[$offset] ?? null;
+    }
+
+    public function __unset($offset)
+    {
+        unset($this->config_data[$offset]);
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthCAS.class.php b/lib/classes/auth_plugins/StudipAuthCAS.class.php
deleted file mode 100644
index 29deb75..0000000
--- a/lib/classes/auth_plugins/StudipAuthCAS.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Stud.IP authentication against CAS Server
- *
- * @access   public
- * @author   Dennis Reil <dennis.reil@offis.de>
- * @package
- */
-
-require_once 'lib/classes/cas/CAS_PGTStorage_Cache.php';
-
-class StudipAuthCAS extends StudipAuthSSO
-{
-    public $host;
-    public $port;
-    public $uri;
-    public $cacert;
-
-    public $userdata;
-
-    /**
-     * Constructor
-     */
-    public function __construct($config = [])
-    {
-        parent::__construct($config);
-        if (!isset($this->plugin_fullname)) {
-            $this->plugin_fullname = _('CAS');
-        }
-        if (!isset($this->login_description)) {
-            $this->login_description = _('für Single Sign On mit CAS');
-        }
-        if (Request::get('sso') === $this->plugin_name) {
-            if ($this->proxy) {
-                URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
-                phpCAS::proxy(CAS_VERSION_2_0, $this->host, $this->port, $this->uri, false);
-                phpCAS::setPGTStorage(new CAS_PGTStorage_Cache(phpCAS::getCasClient()));
-                phpCAS::setFixedCallbackURL(URLHelper::getURL('dispatch.php/cas/proxy'));
-            } else {
-                phpCAS::client(CAS_VERSION_2_0, $this->host, $this->port, $this->uri, false);
-            }
-
-            if (isset($this->cacert)) {
-                phpCAS::setCasServerCACert($this->cacert);
-            } else {
-                phpCAS::setNoCasServerValidation();
-            }
-        }
-    }
-
-    /**
-     * Return the current username.
-     */
-    function getUser()
-    {
-        return phpCAS::getUser();
-    }
-
-    /**
-     * Validate the username passed to the auth plugin.
-     * Note: This triggers authentication if needed.
-     */
-    function verifyUsername($username)
-    {
-        phpCAS::forceAuthentication();
-        return $this->getUser();
-    }
-
-    function getUserData($key)
-    {
-        $userdataclassname = $this->user_data_mapping_class;
-        if (!class_exists($userdataclassname)) {
-            Log::error($this->plugin_name . ': no userdataclassname specified or found.');
-            return;
-        }
-        // get the userdata
-        if (empty($this->userdata)) {
-            $this->userdata = new $userdataclassname();
-        }
-        return $this->userdata->getUserData($key, phpCAS::getUser());
-    }
-
-    function logout()
-    {
-        // do a global cas logout
-        phpCAS::client(CAS_VERSION_2_0, $this->host, $this->port, $this->uri, false);
-        phpCAS::logout();
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthCAS.php b/lib/classes/auth_plugins/StudipAuthCAS.php
new file mode 100644
index 0000000..29deb75
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthCAS.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Stud.IP authentication against CAS Server
+ *
+ * @access   public
+ * @author   Dennis Reil <dennis.reil@offis.de>
+ * @package
+ */
+
+require_once 'lib/classes/cas/CAS_PGTStorage_Cache.php';
+
+class StudipAuthCAS extends StudipAuthSSO
+{
+    public $host;
+    public $port;
+    public $uri;
+    public $cacert;
+
+    public $userdata;
+
+    /**
+     * Constructor
+     */
+    public function __construct($config = [])
+    {
+        parent::__construct($config);
+        if (!isset($this->plugin_fullname)) {
+            $this->plugin_fullname = _('CAS');
+        }
+        if (!isset($this->login_description)) {
+            $this->login_description = _('für Single Sign On mit CAS');
+        }
+        if (Request::get('sso') === $this->plugin_name) {
+            if ($this->proxy) {
+                URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
+                phpCAS::proxy(CAS_VERSION_2_0, $this->host, $this->port, $this->uri, false);
+                phpCAS::setPGTStorage(new CAS_PGTStorage_Cache(phpCAS::getCasClient()));
+                phpCAS::setFixedCallbackURL(URLHelper::getURL('dispatch.php/cas/proxy'));
+            } else {
+                phpCAS::client(CAS_VERSION_2_0, $this->host, $this->port, $this->uri, false);
+            }
+
+            if (isset($this->cacert)) {
+                phpCAS::setCasServerCACert($this->cacert);
+            } else {
+                phpCAS::setNoCasServerValidation();
+            }
+        }
+    }
+
+    /**
+     * Return the current username.
+     */
+    function getUser()
+    {
+        return phpCAS::getUser();
+    }
+
+    /**
+     * Validate the username passed to the auth plugin.
+     * Note: This triggers authentication if needed.
+     */
+    function verifyUsername($username)
+    {
+        phpCAS::forceAuthentication();
+        return $this->getUser();
+    }
+
+    function getUserData($key)
+    {
+        $userdataclassname = $this->user_data_mapping_class;
+        if (!class_exists($userdataclassname)) {
+            Log::error($this->plugin_name . ': no userdataclassname specified or found.');
+            return;
+        }
+        // get the userdata
+        if (empty($this->userdata)) {
+            $this->userdata = new $userdataclassname();
+        }
+        return $this->userdata->getUserData($key, phpCAS::getUser());
+    }
+
+    function logout()
+    {
+        // do a global cas logout
+        phpCAS::client(CAS_VERSION_2_0, $this->host, $this->port, $this->uri, false);
+        phpCAS::logout();
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthIP.class.php b/lib/classes/auth_plugins/StudipAuthIP.class.php
deleted file mode 100644
index e0d6afa..0000000
--- a/lib/classes/auth_plugins/StudipAuthIP.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/*
- * StudipAuthIP.class.php - Stud.IP authentication with user ip
- * Copyright (c) 2014  Florian Bieringer, Uni Passau
- *
- * 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.
- */
-class StudipAuthIP extends StudipAuthAbstract
-{
-    /**
-     * {@inheritdoc}
-     */
-    function isAuthenticated($username, $password)
-    {
-        return $this->allowed_users[$username] && in_array($_SERVER['REMOTE_ADDR'], $this->allowed_users[$username]);
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthIP.php b/lib/classes/auth_plugins/StudipAuthIP.php
new file mode 100644
index 0000000..e0d6afa
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthIP.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * StudipAuthIP.class.php - Stud.IP authentication with user ip
+ * Copyright (c) 2014  Florian Bieringer, Uni Passau
+ *
+ * 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.
+ */
+class StudipAuthIP extends StudipAuthAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    function isAuthenticated($username, $password)
+    {
+        return $this->allowed_users[$username] && in_array($_SERVER['REMOTE_ADDR'], $this->allowed_users[$username]);
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthLTI.class.php b/lib/classes/auth_plugins/StudipAuthLTI.class.php
deleted file mode 100644
index 07ab8c3..0000000
--- a/lib/classes/auth_plugins/StudipAuthLTI.class.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*
- * StudipAuthLTI.class.php - Stud.IP authentication against LTI 1.1 consumer
- * Copyright (c) 2018  Elmar Ludwig
- *
- * 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.
- */
-
-use Studip\OAuth2\NegotiatesWithPsr7;
-
-class StudipAuthLTI extends StudipAuthSSO
-{
-    use NegotiatesWithPsr7;
-
-    public $consumer_keys;
-    public $username;
-    public $domain;
-
-    /**
-     * Validate the username passed to the auth plugin. Note: This implementation
-     * ignores the username parameter and always uses the data passed via the LTI
-     * parameters "lis_person_sourcedid" or "user_id".
-     *
-     * @param   string $username (ignored)
-     *
-     * @return  string  username derived from LTI parameters
-     *
-     * @throws InvalidArgumentException  if no username can be determined
-     */
-    public function verifyUsername($username)
-    {
-        $consumer_key = Request::get('oauth_consumer_key');
-        $username = Request::get('lis_person_sourcedid', Request::get('user_id'));
-        $override = $this->consumer_keys[$consumer_key]['allow_domain_override'];
-        $domain = $this->consumer_keys[$consumer_key]['domain'];
-
-        if (!$username) {
-            throw new InvalidArgumentException('user_id must not be empty');
-        }
-
-        if ($domain === null) {
-            $domain = $consumer_key;
-        }
-
-        if ($override && strpos($username, '@') !== false) {
-            list($username, $domain) = explode('@', $username);
-        }
-
-        if ($domain !== '') {
-            $username .= '@' . $domain;
-            $this->domain = $domain;
-        }
-
-        return $this->username = parent::verifyUsername($username);
-    }
-
-    /**
-     * Check whether this user can be authenticated. Since we trust the user
-     * information sent by the LTI consumer, only the OAuth signature is checked.
-     *
-     * @param   string $username account name
-     * @param   string $password (ignored)
-     *
-     * @return  bool    true if authentication succeeds
-     *
-     */
-    public function isAuthenticated($username, $password)
-    {
-        $consumer_key = Request::get('oauth_consumer_key');
-        $consumer_secret = $this->consumer_keys[$consumer_key]['consumer_secret'];
-
-        if (!Studip\OAuth1::verifyRequest($this->getPsrRequest(), $consumer_secret, '')) {
-            return false;
-        }
-
-        return parent::isAuthenticated($username, $password);
-    }
-
-    /**
-     * Authenticate this user and handle auto enrollment. If the URL parameter
-     * "sem_id" is set, the user is automatically redircted to the enrollment
-     * action for this course.
-     *
-     * @param   string $username the username to check
-     * @param   string $password the password (ignored)
-     *
-     * @return  mixed   if authentication succeeds: the Stud.IP user, else false
-     */
-    public function authenticateUser($username, $password)
-    {
-        $user = parent::authenticateUser($username, $password);
-        $course_id = Request::option('sem_id');
-
-        if ($user && $course_id) {
-            header('Location: ' . URLHelper::getURL('dispatch.php/lti/index/' . $course_id));
-        }
-
-        return $user;
-    }
-
-    /**
-     * Return the current username of the pending authentication request.
-     */
-    public function getUser()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Get the user domains to assign to the current user (if any).
-     *
-     * @return array    array of user domain names
-     */
-    public function getUserDomains()
-    {
-        return $this->domain ? [$this->domain] : null;
-    }
-
-    /**
-     * Callback that can be used in user_data_mapping array. For LTI, this is
-     * equivalent to Request::get(), since all launch data is POST parameters.
-     * @see http://www.imsglobal.org/specs/ltiv1p1/implementation-guide
-     *
-     * @param   string  key (e.g. "lis_person_contact_email_primary")
-     *
-     * @return  string  parameter value (null if not set)
-     */
-    public function getUserData($key)
-    {
-        return Request::get($key);
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthLTI.php b/lib/classes/auth_plugins/StudipAuthLTI.php
new file mode 100644
index 0000000..07ab8c3
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthLTI.php
@@ -0,0 +1,135 @@
+<?php
+/*
+ * StudipAuthLTI.class.php - Stud.IP authentication against LTI 1.1 consumer
+ * Copyright (c) 2018  Elmar Ludwig
+ *
+ * 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.
+ */
+
+use Studip\OAuth2\NegotiatesWithPsr7;
+
+class StudipAuthLTI extends StudipAuthSSO
+{
+    use NegotiatesWithPsr7;
+
+    public $consumer_keys;
+    public $username;
+    public $domain;
+
+    /**
+     * Validate the username passed to the auth plugin. Note: This implementation
+     * ignores the username parameter and always uses the data passed via the LTI
+     * parameters "lis_person_sourcedid" or "user_id".
+     *
+     * @param   string $username (ignored)
+     *
+     * @return  string  username derived from LTI parameters
+     *
+     * @throws InvalidArgumentException  if no username can be determined
+     */
+    public function verifyUsername($username)
+    {
+        $consumer_key = Request::get('oauth_consumer_key');
+        $username = Request::get('lis_person_sourcedid', Request::get('user_id'));
+        $override = $this->consumer_keys[$consumer_key]['allow_domain_override'];
+        $domain = $this->consumer_keys[$consumer_key]['domain'];
+
+        if (!$username) {
+            throw new InvalidArgumentException('user_id must not be empty');
+        }
+
+        if ($domain === null) {
+            $domain = $consumer_key;
+        }
+
+        if ($override && strpos($username, '@') !== false) {
+            list($username, $domain) = explode('@', $username);
+        }
+
+        if ($domain !== '') {
+            $username .= '@' . $domain;
+            $this->domain = $domain;
+        }
+
+        return $this->username = parent::verifyUsername($username);
+    }
+
+    /**
+     * Check whether this user can be authenticated. Since we trust the user
+     * information sent by the LTI consumer, only the OAuth signature is checked.
+     *
+     * @param   string $username account name
+     * @param   string $password (ignored)
+     *
+     * @return  bool    true if authentication succeeds
+     *
+     */
+    public function isAuthenticated($username, $password)
+    {
+        $consumer_key = Request::get('oauth_consumer_key');
+        $consumer_secret = $this->consumer_keys[$consumer_key]['consumer_secret'];
+
+        if (!Studip\OAuth1::verifyRequest($this->getPsrRequest(), $consumer_secret, '')) {
+            return false;
+        }
+
+        return parent::isAuthenticated($username, $password);
+    }
+
+    /**
+     * Authenticate this user and handle auto enrollment. If the URL parameter
+     * "sem_id" is set, the user is automatically redircted to the enrollment
+     * action for this course.
+     *
+     * @param   string $username the username to check
+     * @param   string $password the password (ignored)
+     *
+     * @return  mixed   if authentication succeeds: the Stud.IP user, else false
+     */
+    public function authenticateUser($username, $password)
+    {
+        $user = parent::authenticateUser($username, $password);
+        $course_id = Request::option('sem_id');
+
+        if ($user && $course_id) {
+            header('Location: ' . URLHelper::getURL('dispatch.php/lti/index/' . $course_id));
+        }
+
+        return $user;
+    }
+
+    /**
+     * Return the current username of the pending authentication request.
+     */
+    public function getUser()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Get the user domains to assign to the current user (if any).
+     *
+     * @return array    array of user domain names
+     */
+    public function getUserDomains()
+    {
+        return $this->domain ? [$this->domain] : null;
+    }
+
+    /**
+     * Callback that can be used in user_data_mapping array. For LTI, this is
+     * equivalent to Request::get(), since all launch data is POST parameters.
+     * @see http://www.imsglobal.org/specs/ltiv1p1/implementation-guide
+     *
+     * @param   string  key (e.g. "lis_person_contact_email_primary")
+     *
+     * @return  string  parameter value (null if not set)
+     */
+    public function getUserData($key)
+    {
+        return Request::get($key);
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthLdap.class.php b/lib/classes/auth_plugins/StudipAuthLdap.class.php
deleted file mode 100644
index 7cb8686..0000000
--- a/lib/classes/auth_plugins/StudipAuthLdap.class.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipAuthLdap.class.php
-// Stud.IP authentication against LDAP Server
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * Stud.IP authentication against LDAP Server
- *
- * Stud.IP authentication against LDAP Server
- *
- * @access   public
- * @author   André Noack <noack@data-quest.de>
- * @package
- */
-class StudipAuthLdap extends StudipAuthAbstract
-{
-
-    public $anonymous_bind = true;
-
-    public $host;
-    public $base_dn;
-    public $username_attribute = 'uid';
-    public $ldap_filter;
-    public $bad_char_regex = '/[^0-9_a-zA-Z]/';
-    public $show_login = true;
-
-    public $conn = null;
-    public $user_data = null;
-
-
-    function getLdapFilter($username)
-    {
-        if (isset($this->ldap_filter)) {
-            list($user, $domain) = explode('@', $username);
-            $search = ['%u', '%U', '%d', '%%'];
-            $replace = [$username, $user, $domain, '%'];
-
-            return str_replace($search, $replace, $this->ldap_filter);
-        }
-
-        return $this->username_attribute . '=' . $username;
-    }
-
-    function doLdapConnect()
-    {
-        if (!($this->conn = ldap_connect($this->host))) {
-            $this->error_msg = _('Keine Verbindung zum LDAP Server möglich.');
-            return false;
-        }
-        if (!($r = ldap_set_option($this->conn, LDAP_OPT_PROTOCOL_VERSION, 3))) {
-            $this->error_msg = _('Setzen der LDAP Protokolversion fehlgeschlagen.');
-            return false;
-        }
-        if ($this->start_tls) {
-            if (!ldap_start_tls($this->conn)) {
-                $this->error_msg = _('"Start TLS" fehlgeschlagen.');
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function getUserDn($username)
-    {
-        $user_dn = '';
-
-        if ($this->anonymous_bind) {
-            if (!($r = @ldap_bind($this->conn))) {
-                $this->error_msg = _('Anonymer Bind fehlgeschlagen.') . $this->getLdapError();
-                return false;
-            }
-            if (!($result = @ldap_search($this->conn, $this->base_dn, $this->getLdapFilter($username), ['dn']))) {
-                $this->error_msg = _('Anonymes Durchsuchen des LDAP Baumes fehlgeschlagen.') . $this->getLdapError();
-                return false;
-            }
-            if (!ldap_count_entries($this->conn, $result)) {
-                $this->error_msg = sprintf(_('%s wurde nicht unterhalb von %s gefunden.'), $username, $this->base_dn);
-                return false;
-            }
-            if (!($entry = @ldap_first_entry($this->conn, $result))) {
-                $this->error_msg = $this->getLdapError();
-                return false;
-            }
-            if (!($user_dn = @ldap_get_dn($this->conn, $entry))) {
-                $this->error_msg = $this->getLdapError();
-                return false;
-            }
-        } else {
-            $user_dn = $this->username_attribute . '=' . $username . ',' . $this->base_dn;
-        }
-        return $user_dn;
-    }
-
-    function doLdapBind($username, $password)
-    {
-        if (!$this->doLdapConnect()) {
-            return false;
-        }
-        if (!($user_dn = $this->getUserDn($username))) {
-            return false;
-        }
-        if (!$password) {
-            $this->error_msg = _('Kein Passwort eingegeben.'); //some ldap servers seem to allow binding with a user dn and  without a password, if anonymous bind is enabled
-            return false;
-        }
-        if (!($r = @ldap_bind($this->conn, $user_dn, $password))) {
-            if (ldap_errno($this->conn) == 49) {
-                $this->error_msg = _('Bitte überprüfen Sie ihre Zugangsdaten.');
-            }
-            $this->error_msg = _('Anmeldung fehlgeschlagen.') . $this->getLdapError();
-            return false;
-        }
-        if (!($result = @ldap_search($this->conn, $user_dn, 'objectclass=*'))) {
-            $this->error_msg = _('Abholen der Benutzer Attribute fehlgeschlagen.') . $this->getLdapError();
-            return false;
-        }
-        if (@ldap_count_entries($this->conn, $result)) {
-            if (!($info = @ldap_get_entries($this->conn, $result))) {
-                $this->error_msg = $this->getLdapError();
-                return false;
-            }
-        }
-        $this->user_data = $info[0];
-        return true;
-    }
-
-    /**
-     *
-     *
-     *
-     * @access private
-     *
-     */
-    function isAuthenticated($username, $password)
-    {
-        if (!$this->doLdapBind($username, $password)) {
-            ldap_unbind($this->conn);
-            return false;
-        }
-        ldap_unbind($this->conn);
-        return true;
-    }
-
-
-    function doLdapMap($map_params)
-    {
-        if (isset($this->user_data[$map_params][0])) {
-            $ret = $this->user_data[$map_params][0];
-            if ($ret[0] === ':') {
-                $ret = base64_decode($ret);
-            }
-        }
-        return $ret;
-    }
-
-    function doLdapMapDatafield($params)
-    {
-        $datafield_id = $params[1];
-        $user = $params[2];
-        $ldap_field = $this->doLdapMap($params[3]);
-        if (isset($ldap_field)) {
-            $df = $user->datafields->findOneBy('datafield_id', $datafield_id);
-            if ($df) {
-                $df->content = $ldap_field;
-                return true;
-            }
-        }
-    }
-
-    function isUsedUsername($username)
-    {
-        if (!$this->anonymous_bind) {
-            $this->error = _('Kann den Benutzernamen nicht überprüfen, anonymous_bind ist ausgeschaltet!');
-            return false;
-        }
-        if (!$this->doLdapConnect()) {
-            return false;
-        }
-        if (!($r = @ldap_bind($this->conn))) {
-            $this->error = _('Anonymer Bind fehlgeschlagen.') . $this->getLdapError();
-            return false;
-        }
-        if (!($result = @ldap_search($this->conn, $this->base_dn, $this->getLdapFilter($username), ['dn']))) {
-            $this->error = _('Anonymes Durchsuchen des LDAP Baumes fehlgeschlagen.') . $this->getLdapError();
-            return false;
-        }
-        if (!ldap_count_entries($this->conn, $result)) {
-            $this->error_msg = _('Der Benutzername wurde nicht gefunden.');
-            return false;
-        }
-        return true;
-    }
-
-    function getLdapError()
-    {
-        return _('<br>LDAP Fehler: ') . ldap_error($this->conn) . ' (#' . ldap_errno($this->conn) . ')';
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthLdap.php b/lib/classes/auth_plugins/StudipAuthLdap.php
new file mode 100644
index 0000000..7cb8686
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthLdap.php
@@ -0,0 +1,216 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipAuthLdap.class.php
+// Stud.IP authentication against LDAP Server
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * Stud.IP authentication against LDAP Server
+ *
+ * Stud.IP authentication against LDAP Server
+ *
+ * @access   public
+ * @author   André Noack <noack@data-quest.de>
+ * @package
+ */
+class StudipAuthLdap extends StudipAuthAbstract
+{
+
+    public $anonymous_bind = true;
+
+    public $host;
+    public $base_dn;
+    public $username_attribute = 'uid';
+    public $ldap_filter;
+    public $bad_char_regex = '/[^0-9_a-zA-Z]/';
+    public $show_login = true;
+
+    public $conn = null;
+    public $user_data = null;
+
+
+    function getLdapFilter($username)
+    {
+        if (isset($this->ldap_filter)) {
+            list($user, $domain) = explode('@', $username);
+            $search = ['%u', '%U', '%d', '%%'];
+            $replace = [$username, $user, $domain, '%'];
+
+            return str_replace($search, $replace, $this->ldap_filter);
+        }
+
+        return $this->username_attribute . '=' . $username;
+    }
+
+    function doLdapConnect()
+    {
+        if (!($this->conn = ldap_connect($this->host))) {
+            $this->error_msg = _('Keine Verbindung zum LDAP Server möglich.');
+            return false;
+        }
+        if (!($r = ldap_set_option($this->conn, LDAP_OPT_PROTOCOL_VERSION, 3))) {
+            $this->error_msg = _('Setzen der LDAP Protokolversion fehlgeschlagen.');
+            return false;
+        }
+        if ($this->start_tls) {
+            if (!ldap_start_tls($this->conn)) {
+                $this->error_msg = _('"Start TLS" fehlgeschlagen.');
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function getUserDn($username)
+    {
+        $user_dn = '';
+
+        if ($this->anonymous_bind) {
+            if (!($r = @ldap_bind($this->conn))) {
+                $this->error_msg = _('Anonymer Bind fehlgeschlagen.') . $this->getLdapError();
+                return false;
+            }
+            if (!($result = @ldap_search($this->conn, $this->base_dn, $this->getLdapFilter($username), ['dn']))) {
+                $this->error_msg = _('Anonymes Durchsuchen des LDAP Baumes fehlgeschlagen.') . $this->getLdapError();
+                return false;
+            }
+            if (!ldap_count_entries($this->conn, $result)) {
+                $this->error_msg = sprintf(_('%s wurde nicht unterhalb von %s gefunden.'), $username, $this->base_dn);
+                return false;
+            }
+            if (!($entry = @ldap_first_entry($this->conn, $result))) {
+                $this->error_msg = $this->getLdapError();
+                return false;
+            }
+            if (!($user_dn = @ldap_get_dn($this->conn, $entry))) {
+                $this->error_msg = $this->getLdapError();
+                return false;
+            }
+        } else {
+            $user_dn = $this->username_attribute . '=' . $username . ',' . $this->base_dn;
+        }
+        return $user_dn;
+    }
+
+    function doLdapBind($username, $password)
+    {
+        if (!$this->doLdapConnect()) {
+            return false;
+        }
+        if (!($user_dn = $this->getUserDn($username))) {
+            return false;
+        }
+        if (!$password) {
+            $this->error_msg = _('Kein Passwort eingegeben.'); //some ldap servers seem to allow binding with a user dn and  without a password, if anonymous bind is enabled
+            return false;
+        }
+        if (!($r = @ldap_bind($this->conn, $user_dn, $password))) {
+            if (ldap_errno($this->conn) == 49) {
+                $this->error_msg = _('Bitte überprüfen Sie ihre Zugangsdaten.');
+            }
+            $this->error_msg = _('Anmeldung fehlgeschlagen.') . $this->getLdapError();
+            return false;
+        }
+        if (!($result = @ldap_search($this->conn, $user_dn, 'objectclass=*'))) {
+            $this->error_msg = _('Abholen der Benutzer Attribute fehlgeschlagen.') . $this->getLdapError();
+            return false;
+        }
+        if (@ldap_count_entries($this->conn, $result)) {
+            if (!($info = @ldap_get_entries($this->conn, $result))) {
+                $this->error_msg = $this->getLdapError();
+                return false;
+            }
+        }
+        $this->user_data = $info[0];
+        return true;
+    }
+
+    /**
+     *
+     *
+     *
+     * @access private
+     *
+     */
+    function isAuthenticated($username, $password)
+    {
+        if (!$this->doLdapBind($username, $password)) {
+            ldap_unbind($this->conn);
+            return false;
+        }
+        ldap_unbind($this->conn);
+        return true;
+    }
+
+
+    function doLdapMap($map_params)
+    {
+        if (isset($this->user_data[$map_params][0])) {
+            $ret = $this->user_data[$map_params][0];
+            if ($ret[0] === ':') {
+                $ret = base64_decode($ret);
+            }
+        }
+        return $ret;
+    }
+
+    function doLdapMapDatafield($params)
+    {
+        $datafield_id = $params[1];
+        $user = $params[2];
+        $ldap_field = $this->doLdapMap($params[3]);
+        if (isset($ldap_field)) {
+            $df = $user->datafields->findOneBy('datafield_id', $datafield_id);
+            if ($df) {
+                $df->content = $ldap_field;
+                return true;
+            }
+        }
+    }
+
+    function isUsedUsername($username)
+    {
+        if (!$this->anonymous_bind) {
+            $this->error = _('Kann den Benutzernamen nicht überprüfen, anonymous_bind ist ausgeschaltet!');
+            return false;
+        }
+        if (!$this->doLdapConnect()) {
+            return false;
+        }
+        if (!($r = @ldap_bind($this->conn))) {
+            $this->error = _('Anonymer Bind fehlgeschlagen.') . $this->getLdapError();
+            return false;
+        }
+        if (!($result = @ldap_search($this->conn, $this->base_dn, $this->getLdapFilter($username), ['dn']))) {
+            $this->error = _('Anonymes Durchsuchen des LDAP Baumes fehlgeschlagen.') . $this->getLdapError();
+            return false;
+        }
+        if (!ldap_count_entries($this->conn, $result)) {
+            $this->error_msg = _('Der Benutzername wurde nicht gefunden.');
+            return false;
+        }
+        return true;
+    }
+
+    function getLdapError()
+    {
+        return _('<br>LDAP Fehler: ') . ldap_error($this->conn) . ' (#' . ldap_errno($this->conn) . ')';
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.class.php b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.class.php
deleted file mode 100644
index 742f0cb..0000000
--- a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.class.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipAuthLdapReadAndBind.class.php
-// Stud.IP authentication against LDAP Server using read-only account and
-// user bind
-//
-// Copyright (c) 2006 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * Stud.IP authentication against LDAP Server
- *
- * Stud.IP authentication against LDAP Server using read-only account and
- * following user bind
- *
- * @access   public
- * @author   André Noack <noack@data-quest.de>
- * @package
- */
-class StudipAuthLdapReadAndBind extends StudipAuthLdap
-{
-
-    public $anonymous_bind = false;
-
-    public $reader_dn;
-    public $reader_password;
-
-    function getUserDn($username)
-    {
-        $user_dn = '';
-        if (!($r = @ldap_bind($this->conn, $this->reader_dn, $this->reader_password))) {
-            $this->error_msg = sprintf(_('Anmeldung von %s fehlgeschlagen.'), $this->reader_dn) . $this->getLdapError();
-            return false;
-        }
-        if (!($result = @ldap_search($this->conn, $this->base_dn, $this->getLdapFilter($username), ['dn']))) {
-            $this->error_msg = _('Durchsuchen des LDAP Baumes fehlgeschlagen.') . $this->getLdapError();
-            return false;
-        }
-        if (!ldap_count_entries($this->conn, $result)) {
-            $this->error_msg = sprintf(_('%s wurde nicht unterhalb von %s gefunden.'), $username, $this->base_dn);
-            return false;
-        }
-        if (!($entry = @ldap_first_entry($this->conn, $result))) {
-            $this->error_msg = $this->getLdapError();
-            return false;
-        }
-        if (!($user_dn = @ldap_get_dn($this->conn, $entry))) {
-            $this->error_msg = $this->getLdapError();
-            return false;
-        }
-        return $user_dn;
-    }
-
-    function isUsedUsername($username)
-    {
-        if (!$this->doLdapConnect()) {
-            return false;
-        }
-        $ret = (bool)$this->getUserDn($username);
-        ldap_unbind($this->conn);
-        return $ret;
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
new file mode 100644
index 0000000..742f0cb
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
@@ -0,0 +1,81 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipAuthLdapReadAndBind.class.php
+// Stud.IP authentication against LDAP Server using read-only account and
+// user bind
+//
+// Copyright (c) 2006 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * Stud.IP authentication against LDAP Server
+ *
+ * Stud.IP authentication against LDAP Server using read-only account and
+ * following user bind
+ *
+ * @access   public
+ * @author   André Noack <noack@data-quest.de>
+ * @package
+ */
+class StudipAuthLdapReadAndBind extends StudipAuthLdap
+{
+
+    public $anonymous_bind = false;
+
+    public $reader_dn;
+    public $reader_password;
+
+    function getUserDn($username)
+    {
+        $user_dn = '';
+        if (!($r = @ldap_bind($this->conn, $this->reader_dn, $this->reader_password))) {
+            $this->error_msg = sprintf(_('Anmeldung von %s fehlgeschlagen.'), $this->reader_dn) . $this->getLdapError();
+            return false;
+        }
+        if (!($result = @ldap_search($this->conn, $this->base_dn, $this->getLdapFilter($username), ['dn']))) {
+            $this->error_msg = _('Durchsuchen des LDAP Baumes fehlgeschlagen.') . $this->getLdapError();
+            return false;
+        }
+        if (!ldap_count_entries($this->conn, $result)) {
+            $this->error_msg = sprintf(_('%s wurde nicht unterhalb von %s gefunden.'), $username, $this->base_dn);
+            return false;
+        }
+        if (!($entry = @ldap_first_entry($this->conn, $result))) {
+            $this->error_msg = $this->getLdapError();
+            return false;
+        }
+        if (!($user_dn = @ldap_get_dn($this->conn, $entry))) {
+            $this->error_msg = $this->getLdapError();
+            return false;
+        }
+        return $user_dn;
+    }
+
+    function isUsedUsername($username)
+    {
+        if (!$this->doLdapConnect()) {
+            return false;
+        }
+        $ret = (bool)$this->getUserDn($username);
+        ldap_unbind($this->conn);
+        return $ret;
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthOIDC.class.php b/lib/classes/auth_plugins/StudipAuthOIDC.class.php
deleted file mode 100644
index adfe9c9..0000000
--- a/lib/classes/auth_plugins/StudipAuthOIDC.class.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- * StudipAuthOpenID.class.php - Stud.IP authentication using OpenID Connect
- * Copyright (c) 2021  André Noack <noack@data-quest.de>
- *
- * 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.
- */
-
-use Jumbojett\OpenIDConnectClient;
-use Jumbojett\OpenIDConnectClientException;
-
-class StudipAuthOIDC extends StudipAuthSSO
-{
-    /**
-     * @var OpenIDConnectClient
-     */
-    private $oidc;
-
-    /**
-     * @var string
-     */
-    public $provider_url;
-    /**
-     * @var string
-     */
-    public $client_id;
-    /**
-     * @var string
-     */
-    public $client_secret;
-
-
-    /**
-     * @param array $config
-     */
-    public function __construct($config = [])
-    {
-        parent::__construct($config);
-        if (Request::get('sso') === $this->plugin_name) {
-            $this->oidc = new OpenIDConnectClient($this->provider_url, $this->client_id, $this->client_secret);
-            if (isset($this->ssl_options)) {
-                foreach ($this->ssl_options as $option_key => $option_value) {
-                    if (isset($option_value)) {
-                        $this->oidc->{'set' . $option_key}($option_value);
-                    }
-                }
-                if (Config::get()->HTTP_PROXY) {
-                    $this->oidc->setHttpProxy(Config::get()->HTTP_PROXY);
-                }
-                $return_url = URLHelper::getScriptURL($GLOBALS['ABSOLUTE_URI_STUDIP'] . 'index.php', ['sso' => $this->plugin_name, 'again' => 'yes']);
-                $this->oidc->setRedirectURL($return_url);
-                $this->oidc->addScope(['openid', 'email', 'profile']);
-            }
-        }
-    }
-
-    /**
-     * Validate the username passed to the auth plugin.
-     *
-     * @param string $username
-     *
-     * @return  string  username openid attribute user_id@domain
-     *
-     * @throws OpenIDConnectClientException
-     */
-    public function verifyUsername($username)
-    {
-
-        $this->oidc->authenticate();
-        $this->userdata = (array)$this->oidc->requestUserInfo();
-        if (isset($this->userdata['sub'])) {
-            return $this->userdata['username'] = $this->userdata['sub'] . '@' . $this->domain;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return the current username of the pending authentication request.
-     */
-    public function getUser()
-    {
-        return $this->userdata['username'];
-    }
-
-    /**
-     * Get the user domains to assign to the current user (if any).
-     *
-     * @return array    array of user domain names
-     */
-    public function getUserDomains()
-    {
-        return $this->domain ? [$this->domain] : null;
-    }
-
-    /**
-     * Callback that can be used in user_data_mapping array.
-     *
-     * @see https://openid.net/specs/openid-connect-basic-1_0.html#StandardClaims
-     *
-     * @param string  key
-     *
-     * @return  string  parameter value (null if not set)
-     */
-    public function getUserData($key)
-    {
-        return $this->userdata[$key];
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthOIDC.php b/lib/classes/auth_plugins/StudipAuthOIDC.php
new file mode 100644
index 0000000..adfe9c9
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthOIDC.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ * StudipAuthOpenID.class.php - Stud.IP authentication using OpenID Connect
+ * Copyright (c) 2021  André Noack <noack@data-quest.de>
+ *
+ * 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.
+ */
+
+use Jumbojett\OpenIDConnectClient;
+use Jumbojett\OpenIDConnectClientException;
+
+class StudipAuthOIDC extends StudipAuthSSO
+{
+    /**
+     * @var OpenIDConnectClient
+     */
+    private $oidc;
+
+    /**
+     * @var string
+     */
+    public $provider_url;
+    /**
+     * @var string
+     */
+    public $client_id;
+    /**
+     * @var string
+     */
+    public $client_secret;
+
+
+    /**
+     * @param array $config
+     */
+    public function __construct($config = [])
+    {
+        parent::__construct($config);
+        if (Request::get('sso') === $this->plugin_name) {
+            $this->oidc = new OpenIDConnectClient($this->provider_url, $this->client_id, $this->client_secret);
+            if (isset($this->ssl_options)) {
+                foreach ($this->ssl_options as $option_key => $option_value) {
+                    if (isset($option_value)) {
+                        $this->oidc->{'set' . $option_key}($option_value);
+                    }
+                }
+                if (Config::get()->HTTP_PROXY) {
+                    $this->oidc->setHttpProxy(Config::get()->HTTP_PROXY);
+                }
+                $return_url = URLHelper::getScriptURL($GLOBALS['ABSOLUTE_URI_STUDIP'] . 'index.php', ['sso' => $this->plugin_name, 'again' => 'yes']);
+                $this->oidc->setRedirectURL($return_url);
+                $this->oidc->addScope(['openid', 'email', 'profile']);
+            }
+        }
+    }
+
+    /**
+     * Validate the username passed to the auth plugin.
+     *
+     * @param string $username
+     *
+     * @return  string  username openid attribute user_id@domain
+     *
+     * @throws OpenIDConnectClientException
+     */
+    public function verifyUsername($username)
+    {
+
+        $this->oidc->authenticate();
+        $this->userdata = (array)$this->oidc->requestUserInfo();
+        if (isset($this->userdata['sub'])) {
+            return $this->userdata['username'] = $this->userdata['sub'] . '@' . $this->domain;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Return the current username of the pending authentication request.
+     */
+    public function getUser()
+    {
+        return $this->userdata['username'];
+    }
+
+    /**
+     * Get the user domains to assign to the current user (if any).
+     *
+     * @return array    array of user domain names
+     */
+    public function getUserDomains()
+    {
+        return $this->domain ? [$this->domain] : null;
+    }
+
+    /**
+     * Callback that can be used in user_data_mapping array.
+     *
+     * @see https://openid.net/specs/openid-connect-basic-1_0.html#StandardClaims
+     *
+     * @param string  key
+     *
+     * @return  string  parameter value (null if not set)
+     */
+    public function getUserData($key)
+    {
+        return $this->userdata[$key];
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthSSO.class.php b/lib/classes/auth_plugins/StudipAuthSSO.class.php
deleted file mode 100644
index 752fa59..0000000
--- a/lib/classes/auth_plugins/StudipAuthSSO.class.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/*
- * StudipAuthSSO.class.php - abstract base class for SSO auth plugins
- * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
- *
- * 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.
- */
-
-/*
- * Abstract base class for SSO authentication plugins.
- */
-abstract class StudipAuthSSO extends StudipAuthAbstract
-{
-    /**
-     * @var string the descriptive name of the authentication plugin
-     */
-    public $plugin_fullname;
-
-    /**
-     * @var string a short description, when present it is shown on the login page
-     */
-    public $login_description;
-
-    /**
-     * Return the current username.
-     */
-    abstract function getUser ();
-
-    /**
-     * Check whether this user can be authenticated. The default
-     * implementation just checks whether $username is not empty.
-     */
-    function isAuthenticated ($username, $password)
-    {
-        return !empty($username);
-    }
-
-    /**
-     * SSO auth plugins cannot determine if a username is used.
-     */
-    function isUsedUsername ($username)
-    {
-        return false;
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthSSO.php b/lib/classes/auth_plugins/StudipAuthSSO.php
new file mode 100644
index 0000000..752fa59
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthSSO.php
@@ -0,0 +1,51 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/*
+ * StudipAuthSSO.class.php - abstract base class for SSO auth plugins
+ * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
+ *
+ * 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.
+ */
+
+/*
+ * Abstract base class for SSO authentication plugins.
+ */
+abstract class StudipAuthSSO extends StudipAuthAbstract
+{
+    /**
+     * @var string the descriptive name of the authentication plugin
+     */
+    public $plugin_fullname;
+
+    /**
+     * @var string a short description, when present it is shown on the login page
+     */
+    public $login_description;
+
+    /**
+     * Return the current username.
+     */
+    abstract function getUser ();
+
+    /**
+     * Check whether this user can be authenticated. The default
+     * implementation just checks whether $username is not empty.
+     */
+    function isAuthenticated ($username, $password)
+    {
+        return !empty($username);
+    }
+
+    /**
+     * SSO auth plugins cannot determine if a username is used.
+     */
+    function isUsedUsername ($username)
+    {
+        return false;
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthShib.class.php b/lib/classes/auth_plugins/StudipAuthShib.class.php
deleted file mode 100644
index 3eedc65..0000000
--- a/lib/classes/auth_plugins/StudipAuthShib.class.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/*
- * StudipAuthShib.class.php - Stud.IP authentication against Shibboleth server
- * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
- *
- * 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.
- */
-
-class StudipAuthShib extends StudipAuthSSO
-{
-    public $env_remote_user = 'REMOTE_USER';
-    public $local_domain;
-    public $session_initiator;
-    public $validate_url;
-    public $userdata;
-    public $username_attribute = 'username';
-
-    /**
-     * Constructor: read auth information from remote SP.
-     */
-    public function __construct($config = [])
-    {
-        parent::__construct($config);
-
-        if (!isset($this->plugin_fullname)) {
-            $this->plugin_fullname = _('Shibboleth');
-        }
-        if (!isset($this->login_description)) {
-            $this->login_description = _('für Single Sign On mit Shibboleth');
-        }
-
-        if (Request::get('sso') === $this->plugin_name && isset($this->validate_url) && isset($_REQUEST['token'])) {
-            $context = get_default_http_stream_context($this->validate_url);
-            $auth = file_get_contents($this->validate_url . '/' . $_REQUEST['token'], false, $context);
-
-            $this->userdata = json_decode($auth, true);
-
-            if ($this->username_attribute !== 'username') {
-                $this->userdata['username'] = $this->userdata[$this->username_attribute];
-            }
-            if (isset($this->local_domain)) {
-                $this->userdata['username'] =
-                    str_replace('@' . $this->local_domain, '', $this->userdata['username']);
-            }
-        }
-    }
-
-    /**
-     * Return the current username.
-     */
-    function getUser()
-    {
-        return $this->userdata['username'];
-    }
-
-    /**
-     * Validate the username passed to the auth plugin.
-     * Note: This triggers authentication if needed.
-     */
-    function verifyUsername($username)
-    {
-        if (isset($this->userdata)) {
-            // use cached user information
-            return $this->getUser();
-        }
-
-        $remote_user = $_SERVER[$this->env_remote_user] ?? null;
-
-        if (empty($remote_user) || isset($this->validate_url)) {
-            if (Request::get('sso') === $this->plugin_name) {
-                // force Shibboleth authentication (lazy session)
-                $shib_url = URLHelper::getURL(
-                    $this->session_initiator,
-                    ['target' => Request::url()],
-                    true
-                );
-
-                // break redirection loop in case of misconfiguration
-                if (strpos($_SERVER['HTTP_REFERER'] ?? '', 'target=') === false) {
-                    header('Location: ' . $shib_url);
-                    exit();
-                }
-            }
-
-            // not authenticated
-            return NULL;
-        }
-
-        // import authentication information
-        $this->userdata['username'] = $remote_user;
-
-        foreach ($_SERVER as $key => $value) {
-            if (mb_substr($key, 0, 10) == 'HTTP_SHIB_') {
-                $key = mb_strtolower(mb_substr($key, 10));
-                $this->userdata[$key] = $value;
-            }
-        }
-
-        if ($this->username_attribute !== 'username') {
-            $this->userdata['username'] = $this->userdata[$this->username_attribute];
-        }
-        if (isset($this->local_domain)) {
-            $this->userdata['username'] =
-                str_replace('@' . $this->local_domain, '', $this->userdata['username']);
-        }
-        return $this->getUser();
-    }
-
-    /**
-     * Get the user domains to assign to the current user.
-     */
-    function getUserDomains()
-    {
-        $user = $this->getUser();
-        $pos = mb_strpos($user, '@');
-
-        if ($pos !== false) {
-            return [mb_substr($user, $pos + 1)];
-        }
-
-        return NULL;
-    }
-
-    /**
-     * Callback that can be used in user_data_mapping array.
-     */
-    function getUserData($key)
-    {
-        $data = explode(';', $this->userdata[$key]);
-
-        return $data[0];
-    }
-}
diff --git a/lib/classes/auth_plugins/StudipAuthShib.php b/lib/classes/auth_plugins/StudipAuthShib.php
new file mode 100644
index 0000000..3eedc65
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthShib.php
@@ -0,0 +1,139 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/*
+ * StudipAuthShib.class.php - Stud.IP authentication against Shibboleth server
+ * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
+ *
+ * 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.
+ */
+
+class StudipAuthShib extends StudipAuthSSO
+{
+    public $env_remote_user = 'REMOTE_USER';
+    public $local_domain;
+    public $session_initiator;
+    public $validate_url;
+    public $userdata;
+    public $username_attribute = 'username';
+
+    /**
+     * Constructor: read auth information from remote SP.
+     */
+    public function __construct($config = [])
+    {
+        parent::__construct($config);
+
+        if (!isset($this->plugin_fullname)) {
+            $this->plugin_fullname = _('Shibboleth');
+        }
+        if (!isset($this->login_description)) {
+            $this->login_description = _('für Single Sign On mit Shibboleth');
+        }
+
+        if (Request::get('sso') === $this->plugin_name && isset($this->validate_url) && isset($_REQUEST['token'])) {
+            $context = get_default_http_stream_context($this->validate_url);
+            $auth = file_get_contents($this->validate_url . '/' . $_REQUEST['token'], false, $context);
+
+            $this->userdata = json_decode($auth, true);
+
+            if ($this->username_attribute !== 'username') {
+                $this->userdata['username'] = $this->userdata[$this->username_attribute];
+            }
+            if (isset($this->local_domain)) {
+                $this->userdata['username'] =
+                    str_replace('@' . $this->local_domain, '', $this->userdata['username']);
+            }
+        }
+    }
+
+    /**
+     * Return the current username.
+     */
+    function getUser()
+    {
+        return $this->userdata['username'];
+    }
+
+    /**
+     * Validate the username passed to the auth plugin.
+     * Note: This triggers authentication if needed.
+     */
+    function verifyUsername($username)
+    {
+        if (isset($this->userdata)) {
+            // use cached user information
+            return $this->getUser();
+        }
+
+        $remote_user = $_SERVER[$this->env_remote_user] ?? null;
+
+        if (empty($remote_user) || isset($this->validate_url)) {
+            if (Request::get('sso') === $this->plugin_name) {
+                // force Shibboleth authentication (lazy session)
+                $shib_url = URLHelper::getURL(
+                    $this->session_initiator,
+                    ['target' => Request::url()],
+                    true
+                );
+
+                // break redirection loop in case of misconfiguration
+                if (strpos($_SERVER['HTTP_REFERER'] ?? '', 'target=') === false) {
+                    header('Location: ' . $shib_url);
+                    exit();
+                }
+            }
+
+            // not authenticated
+            return NULL;
+        }
+
+        // import authentication information
+        $this->userdata['username'] = $remote_user;
+
+        foreach ($_SERVER as $key => $value) {
+            if (mb_substr($key, 0, 10) == 'HTTP_SHIB_') {
+                $key = mb_strtolower(mb_substr($key, 10));
+                $this->userdata[$key] = $value;
+            }
+        }
+
+        if ($this->username_attribute !== 'username') {
+            $this->userdata['username'] = $this->userdata[$this->username_attribute];
+        }
+        if (isset($this->local_domain)) {
+            $this->userdata['username'] =
+                str_replace('@' . $this->local_domain, '', $this->userdata['username']);
+        }
+        return $this->getUser();
+    }
+
+    /**
+     * Get the user domains to assign to the current user.
+     */
+    function getUserDomains()
+    {
+        $user = $this->getUser();
+        $pos = mb_strpos($user, '@');
+
+        if ($pos !== false) {
+            return [mb_substr($user, $pos + 1)];
+        }
+
+        return NULL;
+    }
+
+    /**
+     * Callback that can be used in user_data_mapping array.
+     */
+    function getUserData($key)
+    {
+        $data = explode(';', $this->userdata[$key]);
+
+        return $data[0];
+    }
+}
diff --git a/lib/classes/auth_plugins/StudipAuthStandard.class.php b/lib/classes/auth_plugins/StudipAuthStandard.class.php
deleted file mode 100644
index 5bb3e65..0000000
--- a/lib/classes/auth_plugins/StudipAuthStandard.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// StudipAuthStandard.class.php
-// Basic Stud.IP authentication, using the Stud.IP database
-//
-// Copyright (c) 2003 André Noack <noack@data-quest.de>
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
-* Basic Stud.IP authentication, using the Stud.IP database
-*
-* Basic Stud.IP authentication, using the Stud.IP database
-*
-* @access   public
-* @author   André Noack <noack@data-quest.de>
-* @package
-*/
-class StudipAuthStandard extends StudipAuthAbstract
-{
-
-    var $bad_char_regex =  false;
-    public $show_login = true;
-
-    /**
-    *
-    *
-    *
-    * @access public
-    *
-    */
-    function isAuthenticated($username, $password)
-    {
-        $user = User::findByUsername($username);
-        if (!$user || !$password || mb_strlen($password) > 72) {
-            $this->error_msg= _('Ungültige Benutzername/Passwort-Kombination!') ;
-            return false;
-        } elseif ($user->username !== $username) {
-            $this->error_msg = _('Bitte achten Sie auf korrekte Groß-Kleinschreibung beim Username!');
-            return false;
-        } elseif (!is_null($user->auth_plugin) && $user->auth_plugin !== 'standard') {
-            $this->error_msg = sprintf(_('Dieser Benutzername wird bereits über %s authentifiziert!'),$user->auth_plugin) ;
-            return false;
-        } else {
-            $pass = $user->password;   // Password is stored as a md5 hash
-        }
-        $hasher = UserManagement::getPwdHasher();
-        $old_style_check = (strlen($pass) === 32 && md5($password) === $pass);
-        $migrated_check = $hasher->CheckPassword(md5($password), $pass);
-        $check = $hasher->CheckPassword($password, $pass);
-        $old_encoding_check = $hasher->CheckPassword(legacy_studip_utf8decode($password), $pass);
-
-        if (($migrated_check || $old_style_check || $old_encoding_check) && !$check) {
-            // time to convert the password
-            $user->password = $hasher->HashPassword($password);
-            $user->store();
-        }
-
-        if (!($check || $migrated_check || $old_style_check || $old_encoding_check)) {
-            $this->error_msg= _('Das Passwort ist falsch!');
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    function isUsedUsername($username)
-    {
-        return User::findByUsername($username) ? true : false;
-    }
-
-}
diff --git a/lib/classes/auth_plugins/StudipAuthStandard.php b/lib/classes/auth_plugins/StudipAuthStandard.php
new file mode 100644
index 0000000..5bb3e65
--- /dev/null
+++ b/lib/classes/auth_plugins/StudipAuthStandard.php
@@ -0,0 +1,89 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// StudipAuthStandard.class.php
+// Basic Stud.IP authentication, using the Stud.IP database
+//
+// Copyright (c) 2003 André Noack <noack@data-quest.de>
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+* Basic Stud.IP authentication, using the Stud.IP database
+*
+* Basic Stud.IP authentication, using the Stud.IP database
+*
+* @access   public
+* @author   André Noack <noack@data-quest.de>
+* @package
+*/
+class StudipAuthStandard extends StudipAuthAbstract
+{
+
+    var $bad_char_regex =  false;
+    public $show_login = true;
+
+    /**
+    *
+    *
+    *
+    * @access public
+    *
+    */
+    function isAuthenticated($username, $password)
+    {
+        $user = User::findByUsername($username);
+        if (!$user || !$password || mb_strlen($password) > 72) {
+            $this->error_msg= _('Ungültige Benutzername/Passwort-Kombination!') ;
+            return false;
+        } elseif ($user->username !== $username) {
+            $this->error_msg = _('Bitte achten Sie auf korrekte Groß-Kleinschreibung beim Username!');
+            return false;
+        } elseif (!is_null($user->auth_plugin) && $user->auth_plugin !== 'standard') {
+            $this->error_msg = sprintf(_('Dieser Benutzername wird bereits über %s authentifiziert!'),$user->auth_plugin) ;
+            return false;
+        } else {
+            $pass = $user->password;   // Password is stored as a md5 hash
+        }
+        $hasher = UserManagement::getPwdHasher();
+        $old_style_check = (strlen($pass) === 32 && md5($password) === $pass);
+        $migrated_check = $hasher->CheckPassword(md5($password), $pass);
+        $check = $hasher->CheckPassword($password, $pass);
+        $old_encoding_check = $hasher->CheckPassword(legacy_studip_utf8decode($password), $pass);
+
+        if (($migrated_check || $old_style_check || $old_encoding_check) && !$check) {
+            // time to convert the password
+            $user->password = $hasher->HashPassword($password);
+            $user->store();
+        }
+
+        if (!($check || $migrated_check || $old_style_check || $old_encoding_check)) {
+            $this->error_msg= _('Das Passwort ist falsch!');
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function isUsedUsername($username)
+    {
+        return User::findByUsername($username) ? true : false;
+    }
+
+}
diff --git a/lib/classes/cache/Cache.class.php b/lib/classes/cache/Cache.class.php
deleted file mode 100644
index be703cf..0000000
--- a/lib/classes/cache/Cache.class.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use Psr\Cache\CacheItemInterface;
-use Psr\Cache\CacheItemPoolInterface;
-
-/**
- * An abstract class which has to be extended by instances returned from
- * \Studip\Cache\Factory#getCache
- *
- * @author     Marco Diedrich (mdiedric@uos)
- * @author     Marcus Lunzenauer (mlunzena@uos.de)
- * @author     Moritz Strohm <strohm@data-quest.de>
- * @copyright  (c) Authors
- * @since      1.6
- * @license    GPL2 or any later version
- */
-abstract class Cache implements CacheItemPoolInterface
-{
-    const DEFAULT_EXPIRATION = 12 * 60 * 60; // 12 hours
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    abstract public static function getDisplayName(): string;
-
-    /**
-     * Get some statistics from cache, like number of entries, hit rate or
-     * whatever the underlying cache provides.
-     * Results are returned in form of an array like
-     *      "[
-     *          [
-     *              'name' => <displayable name>
-     *              'value' => <value of the current stat>
-     *          ]
-     *      ]"
-     *
-     * @return array
-     */
-    abstract public function getStats(): array;
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     * The associative array is of the form
-     *  [
-     *      'component' => <Vue component name>,
-     *      'props' => <Properties for component>
-     *  ]
-     *
-     * @return array
-     */
-    abstract public static function getConfig(): array;
-
-    /**
-     * Expire item from the cache.
-     *
-     * Example:
-     *
-     *   # expires foo
-     *   $cache->expire('foo');
-     *
-     * @param string $arg a single key
-     */
-    abstract public function expire($arg);
-
-    /**
-     * Expire all items from the cache.
-     */
-    abstract public function flush();
-
-    /**
-     * @see CacheItemPoolInterface::getItem
-     */
-    abstract public function getItem(string $key): CacheItemInterface;
-
-    /**
-     * @see CacheItemPoolInterface::hasItem
-     */
-    abstract public function hasItem(string $key): bool;
-
-    /**
-     * @var array An array of deferred items that shall be saved only
-     * when commit() is called. This is only used in PSR-6 cache methods.
-     */
-    protected array $deferred_items = [];
-
-    /**
-     * Retrieve item from the server.
-     *
-     * Example:
-     *
-     *   # reads foo
-     *   $foo = $cache->reads('foo');
-     *
-     * @param string $arg a single key
-     *
-     * @return mixed    the previously stored data if an item with such a key
-     *                  exists on the server or FALSE on failure.
-     *
-     * @deprecated To be removed with Stud.IP 7.0.
-     */
-    public function read($arg)
-    {
-        $item = $this->getItem($arg);
-        if ($item->isHit()) {
-            return $item->get();
-        }
-        return false;
-    }
-
-    /**
-     * Store data at the server.
-     *
-     * @param string $name     the item's key.
-     * @param mixed  $content  the item's content (will be serialized if necessary).
-     * @param int    $expires  the item's expiry time in seconds. Optional, defaults to 12h.
-     *
-     * @return bool     returns TRUE on success or FALSE on failure.
-
-     * @deprecated To be removed with Stud.IP 7.0.
-     */
-    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION)
-    {
-        $item = new Item($name, $content, $expires);
-
-        return $this->save($item);
-    }
-
-    /**
-     * Calculates the expiration by a cache item. If that cannot be determined,
-     * the default expiration period is returned.
-     *
-     * @param Item $item The item from which to get the expiration time.
-     *
-     * @return int The time from now until the expiration in seconds.
-     */
-    public function getExpiration(CacheItemInterface $item) : int
-    {
-        $expiration = self::DEFAULT_EXPIRATION;
-        if ($item instanceof Item) {
-            $expiration = $item->getExpirationInSeconds();
-        }
-        return $expiration;
-    }
-
-    // PSR-6 CacheItemPoolInterface:
-
-    /**
-     * @see CacheItemPoolInterface::getItems
-     */
-    public function getItems(array $keys = []): iterable
-    {
-        $items = [];
-        foreach ($keys as $key) {
-            $item = $this->getItem($key);
-            if ($item instanceof Item) {
-                $items[] = $item;
-            }
-        }
-        return $items;
-    }
-
-    /**
-     * @see CacheItemPoolInterface::clear
-     */
-    public function clear(): bool
-    {
-        $this->deferred_items = [];
-        $this->flush();
-        return true;
-    }
-
-    /**
-     * @see CacheItemPoolInterface::deleteItem
-     */
-    public function deleteItem($key): bool
-    {
-        $this->expire($key);
-        return true;
-    }
-
-    /**
-     * @see CacheItemPoolInterface::deleteItems
-     */
-    public function deleteItems(array $keys): bool
-    {
-        foreach ($keys as $key) {
-            $this->expire($key);
-        }
-        return true;
-    }
-
-    /**
-     * @see CacheItemPoolInterface::saveDeferred
-     */
-    public function saveDeferred(CacheItemInterface $item): bool
-    {
-        $this->deferred_items[] = $item;
-        return true;
-    }
-
-    /**
-     * @see CacheItemPoolInterface::commit
-     */
-    public function commit(): bool
-    {
-        foreach ($this->deferred_items as $item) {
-            $this->save($item);
-        }
-        return true;
-    }
-}
diff --git a/lib/classes/cache/Cache.php b/lib/classes/cache/Cache.php
new file mode 100644
index 0000000..be703cf
--- /dev/null
+++ b/lib/classes/cache/Cache.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace Studip\Cache;
+
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+
+/**
+ * An abstract class which has to be extended by instances returned from
+ * \Studip\Cache\Factory#getCache
+ *
+ * @author     Marco Diedrich (mdiedric@uos)
+ * @author     Marcus Lunzenauer (mlunzena@uos.de)
+ * @author     Moritz Strohm <strohm@data-quest.de>
+ * @copyright  (c) Authors
+ * @since      1.6
+ * @license    GPL2 or any later version
+ */
+abstract class Cache implements CacheItemPoolInterface
+{
+    const DEFAULT_EXPIRATION = 12 * 60 * 60; // 12 hours
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    abstract public static function getDisplayName(): string;
+
+    /**
+     * Get some statistics from cache, like number of entries, hit rate or
+     * whatever the underlying cache provides.
+     * Results are returned in form of an array like
+     *      "[
+     *          [
+     *              'name' => <displayable name>
+     *              'value' => <value of the current stat>
+     *          ]
+     *      ]"
+     *
+     * @return array
+     */
+    abstract public function getStats(): array;
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     * The associative array is of the form
+     *  [
+     *      'component' => <Vue component name>,
+     *      'props' => <Properties for component>
+     *  ]
+     *
+     * @return array
+     */
+    abstract public static function getConfig(): array;
+
+    /**
+     * Expire item from the cache.
+     *
+     * Example:
+     *
+     *   # expires foo
+     *   $cache->expire('foo');
+     *
+     * @param string $arg a single key
+     */
+    abstract public function expire($arg);
+
+    /**
+     * Expire all items from the cache.
+     */
+    abstract public function flush();
+
+    /**
+     * @see CacheItemPoolInterface::getItem
+     */
+    abstract public function getItem(string $key): CacheItemInterface;
+
+    /**
+     * @see CacheItemPoolInterface::hasItem
+     */
+    abstract public function hasItem(string $key): bool;
+
+    /**
+     * @var array An array of deferred items that shall be saved only
+     * when commit() is called. This is only used in PSR-6 cache methods.
+     */
+    protected array $deferred_items = [];
+
+    /**
+     * Retrieve item from the server.
+     *
+     * Example:
+     *
+     *   # reads foo
+     *   $foo = $cache->reads('foo');
+     *
+     * @param string $arg a single key
+     *
+     * @return mixed    the previously stored data if an item with such a key
+     *                  exists on the server or FALSE on failure.
+     *
+     * @deprecated To be removed with Stud.IP 7.0.
+     */
+    public function read($arg)
+    {
+        $item = $this->getItem($arg);
+        if ($item->isHit()) {
+            return $item->get();
+        }
+        return false;
+    }
+
+    /**
+     * Store data at the server.
+     *
+     * @param string $name     the item's key.
+     * @param mixed  $content  the item's content (will be serialized if necessary).
+     * @param int    $expires  the item's expiry time in seconds. Optional, defaults to 12h.
+     *
+     * @return bool     returns TRUE on success or FALSE on failure.
+
+     * @deprecated To be removed with Stud.IP 7.0.
+     */
+    public function write($name, $content, $expires = self::DEFAULT_EXPIRATION)
+    {
+        $item = new Item($name, $content, $expires);
+
+        return $this->save($item);
+    }
+
+    /**
+     * Calculates the expiration by a cache item. If that cannot be determined,
+     * the default expiration period is returned.
+     *
+     * @param Item $item The item from which to get the expiration time.
+     *
+     * @return int The time from now until the expiration in seconds.
+     */
+    public function getExpiration(CacheItemInterface $item) : int
+    {
+        $expiration = self::DEFAULT_EXPIRATION;
+        if ($item instanceof Item) {
+            $expiration = $item->getExpirationInSeconds();
+        }
+        return $expiration;
+    }
+
+    // PSR-6 CacheItemPoolInterface:
+
+    /**
+     * @see CacheItemPoolInterface::getItems
+     */
+    public function getItems(array $keys = []): iterable
+    {
+        $items = [];
+        foreach ($keys as $key) {
+            $item = $this->getItem($key);
+            if ($item instanceof Item) {
+                $items[] = $item;
+            }
+        }
+        return $items;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::clear
+     */
+    public function clear(): bool
+    {
+        $this->deferred_items = [];
+        $this->flush();
+        return true;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::deleteItem
+     */
+    public function deleteItem($key): bool
+    {
+        $this->expire($key);
+        return true;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::deleteItems
+     */
+    public function deleteItems(array $keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->expire($key);
+        }
+        return true;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::saveDeferred
+     */
+    public function saveDeferred(CacheItemInterface $item): bool
+    {
+        $this->deferred_items[] = $item;
+        return true;
+    }
+
+    /**
+     * @see CacheItemPoolInterface::commit
+     */
+    public function commit(): bool
+    {
+        foreach ($this->deferred_items as $item) {
+            $this->save($item);
+        }
+        return true;
+    }
+}
diff --git a/lib/classes/cache/DbCache.class.php b/lib/classes/cache/DbCache.class.php
deleted file mode 100644
index c7abef2..0000000
--- a/lib/classes/cache/DbCache.class.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use DBManager;
-use Psr\Cache\CacheItemInterface;
-
-/**
- * StudipCache implementation using database table
- *
- * @author    Elmar Ludwig <elmar.ludwig@uos.de>
- */
-class DbCache extends Cache
-{
-    /**
-     * @return string A display name (that can be translated) for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Datenbank');
-    }
-
-    /**
-     * Expire item from the cache.
-     *
-     * @param string $arg a single key
-     */
-    public function expire($arg)
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare('DELETE FROM cache WHERE cache_key = ?');
-        $stmt->execute([$arg]);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $db = DBManager::get();
-
-        $db->exec('TRUNCATE TABLE cache');
-    }
-
-    /**
-     * Delete all expired items from the cache.
-     */
-    public function purge()
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare('DELETE FROM cache WHERE expires < ?');
-        $stmt->execute([time()]);
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @return array|array[]
-     *@see Cache::getStats()
-     *
-     */
-    public function getStats(): array
-    {
-        return [
-            __CLASS__ => [
-                'name' => _('Anzahl Einträge'),
-                'value' => DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
-            ]
-        ];
-    }
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @return array
-     *@see Cache::getConfig()
-     *
-     */
-    public static function getConfig(): array
-    {
-        return [
-            'component' => null,
-            'props' => []
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        $query = "SELECT `content`, `expires`
-                  FROM `cache`
-                  WHERE `cache_key` = :key
-                    AND `expires` > UNIX_TIMESTAMP()";
-        $result = DBManager::get()->fetchOne($query, [':key' => $key]);
-
-        $item = new Item($key);
-        if (!empty($result)) {
-            $item->setHit();
-            if ($result['content']) {
-                $item->set(unserialize($result['content']));
-            }
-            if ($result['expires']) {
-                $expiration = new \DateTime();
-                $expiration->setTimestamp($result['expires']);
-                $item->expiresAt($expiration);
-            }
-        }
-        return $item;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        $query = "SELECT 1
-                  FROM `cache`
-                  WHERE `cache_key` = :key
-                    AND `expires` > UNIX_TIMESTAMP()";
-        return (bool) DBManager::get()->fetchColumn($query, [':key' => $key]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        $expiration = $this->getExpiration($item);
-        if ($expiration < 1) {
-            // The item would expire immediately.
-            return false;
-        }
-
-        return DBManager::get()->execute(
-            'REPLACE INTO `cache` VALUES (?, ?, ?)',
-            [$item->getKey(), serialize($item->get()), $expiration]
-        );
-    }
-}
diff --git a/lib/classes/cache/DbCache.php b/lib/classes/cache/DbCache.php
new file mode 100644
index 0000000..c7abef2
--- /dev/null
+++ b/lib/classes/cache/DbCache.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Studip\Cache;
+
+use DBManager;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * StudipCache implementation using database table
+ *
+ * @author    Elmar Ludwig <elmar.ludwig@uos.de>
+ */
+class DbCache extends Cache
+{
+    /**
+     * @return string A display name (that can be translated) for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Datenbank');
+    }
+
+    /**
+     * Expire item from the cache.
+     *
+     * @param string $arg a single key
+     */
+    public function expire($arg)
+    {
+        $db = DBManager::get();
+
+        $stmt = $db->prepare('DELETE FROM cache WHERE cache_key = ?');
+        $stmt->execute([$arg]);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $db = DBManager::get();
+
+        $db->exec('TRUNCATE TABLE cache');
+    }
+
+    /**
+     * Delete all expired items from the cache.
+     */
+    public function purge()
+    {
+        $db = DBManager::get();
+
+        $stmt = $db->prepare('DELETE FROM cache WHERE expires < ?');
+        $stmt->execute([time()]);
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @return array|array[]
+     *@see Cache::getStats()
+     *
+     */
+    public function getStats(): array
+    {
+        return [
+            __CLASS__ => [
+                'name' => _('Anzahl Einträge'),
+                'value' => DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
+            ]
+        ];
+    }
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @return array
+     *@see Cache::getConfig()
+     *
+     */
+    public static function getConfig(): array
+    {
+        return [
+            'component' => null,
+            'props' => []
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        $query = "SELECT `content`, `expires`
+                  FROM `cache`
+                  WHERE `cache_key` = :key
+                    AND `expires` > UNIX_TIMESTAMP()";
+        $result = DBManager::get()->fetchOne($query, [':key' => $key]);
+
+        $item = new Item($key);
+        if (!empty($result)) {
+            $item->setHit();
+            if ($result['content']) {
+                $item->set(unserialize($result['content']));
+            }
+            if ($result['expires']) {
+                $expiration = new \DateTime();
+                $expiration->setTimestamp($result['expires']);
+                $item->expiresAt($expiration);
+            }
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        $query = "SELECT 1
+                  FROM `cache`
+                  WHERE `cache_key` = :key
+                    AND `expires` > UNIX_TIMESTAMP()";
+        return (bool) DBManager::get()->fetchColumn($query, [':key' => $key]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            // The item would expire immediately.
+            return false;
+        }
+
+        return DBManager::get()->execute(
+            'REPLACE INTO `cache` VALUES (?, ?, ?)',
+            [$item->getKey(), serialize($item->get()), $expiration]
+        );
+    }
+}
diff --git a/lib/classes/cache/Factory.class.php b/lib/classes/cache/Factory.class.php
deleted file mode 100644
index b5c8359..0000000
--- a/lib/classes/cache/Factory.class.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use Config;
-use DBSchemaVersion;
-use MessageBox;
-use PageLayout;
-use ReflectionClass;
-use StudipCacheOperation;
-use UnexpectedValueException;
-
-/**
- * This factory retrieves the instance of StudipCache configured for use in
- * this Stud.IP installation.
- *
- * @package    studip
- * @subpackage lib
- *
- * @author    Marco Diedrich (mdiedric@uos)
- * @author    Marcus Lunzenauer (mlunzena@uos.de)
- * @copyright 2007 (c) Authors
- * @since     1.6
- * @license   GPL2 or any later version
- */
-class Factory
-{
-    /**
-     * the default cache class
-     *
-     * @var string
-     */
-    const DEFAULT_CACHE_CLASS = DbCache::class;
-
-    /**
-     * singleton instance
-     *
-     * @var Cache|null
-     */
-    private static ?Cache $cache = null;
-
-
-    /**
-     * config instance
-     *
-     * @var Config|null
-     */
-    private static ?Config $config = null;
-
-
-    /**
-     * Returns the currently used config instance
-     *
-     * @return Config        an instance of class Config used by this factory to
-     *                       determine the class of the actual implementation of
-     *                       the StudipCache interface; if no config was set, it
-     *                       returns the instance returned by Config#getInstance
-     * @see Config
-     */
-    public static function getConfig()
-    {
-        return self::$config ?? Config::getInstance();
-    }
-
-
-    /**
-     * @param Config $config an instance of class Config which will be used to
-     *                       determine the class of the implementation of interface
-     *                       StudipCache
-     */
-    public static function setConfig(Config $config)
-    {
-        self::$config = $config;
-        self::$cache = NULL;
-    }
-
-    /**
-     * Resets the configuration and voids the cache instance.
-     */
-    public static function unconfigure()
-    {
-        self::$cache = NULL;
-    }
-
-    /**
-     * Returns a cache instance.
-     *
-     * @param bool $apply_proxied_operations Whether or not to apply any
-     *                                       proxied (disable this in tests!)
-     * @return Cache the cache instance
-     */
-    public static function getCache(bool $apply_proxied_operations = true): Cache
-    {
-        if (self::$cache === null) {
-            $proxied = false;
-
-            if (!$GLOBALS['CACHING_ENABLE']) {
-                self::$cache = new MemoryCache();
-
-                // Proxy cache operations if CACHING_ENABLE is different from the globally set
-                // caching value. This should only be the case in cli mode.
-                if (isset($GLOBALS['GLOBAL_CACHING_ENABLE']) && $GLOBALS['GLOBAL_CACHING_ENABLE']) {
-                    $proxied = true;
-                }
-            } else {
-                try {
-                    $class = self::loadCacheClass();
-                    $args = self::retrieveConstructorArguments();
-
-                    self::$cache = self::instantiateCache($class, $args);
-                } catch (\Exception $e) {
-                    error_log(__METHOD__ . ': ' . $e->getMessage());
-                    PageLayout::addBodyElements(MessageBox::error(__METHOD__ . ': ' . $e->getMessage()));
-                    $class = self::DEFAULT_CACHE_CLASS;
-                    self::$cache = new $class();
-                }
-            }
-
-            // If proxy should be used, inject it. Otherwise apply pending
-            // operations, if any.
-            if ($proxied) {
-                self::$cache = new Proxy(self::$cache);
-            } elseif ($GLOBALS['CACHING_ENABLE'] && $apply_proxied_operations) {
-                // Even if the above condition will try to eliminate most
-                // failures, the following operation still needs to be wrapped
-                // in a try/catch block. Otherwise there are no means to
-                // execute migration 166 which creates the neccessary tables
-                // for said operation.
-                try {
-                    StudipCacheOperation::apply(self::$cache);
-                } catch (\Exception $e) {
-                }
-            }
-        }
-
-        return self::$cache;
-    }
-
-
-    /**
-     * Load configured cache class and return its name.
-     *
-     * @return string  the name of the configured cache class
-     */
-    public static function loadCacheClass()
-    {
-        $cacheConfig = self::getConfig()->SYSTEMCACHE;
-
-        $cache_class = $cacheConfig['type'] ?: null;
-
-        # default class
-        if ($cache_class === null) {
-            $version = new DBSchemaVersion();
-            if ($version->get(1) < 224) {
-                // db cache is not yet available, use StudipMemoryCache
-                return 'StudipMemoryCache';
-            }
-
-            return self::DEFAULT_CACHE_CLASS;
-        }
-
-        if (!class_exists($cache_class)) {
-            throw new UnexpectedValueException("Could not find class: '$cache_class'");
-        }
-
-        return $cache_class;
-    }
-
-    /**
-     * Return an array of arguments required for instantiation of the cache
-     * class.
-     *
-     * @return array  the array of arguments
-     */
-    public static function retrieveConstructorArguments()
-    {
-        $cacheConfig = self::getConfig()->SYSTEMCACHE;
-
-        return $cacheConfig ?: [];
-    }
-
-    /**
-     * Return an instance of a given class using some arguments. Unless the
-     * memory cache is instantiated, the cache will be wrapped in a wrapper
-     * class that uses a memory cache to reduce accesses to the cache.
-     *
-     * @param string $class     the name of the class
-     * @param array  $arguments an array of arguments to be used by the constructor
-     *
-     * @return Cache  an instance of the specified class
-     * @throws \ReflectionException
-     */
-    public static function instantiateCache($class, $arguments)
-    {
-        $reflection_class = new ReflectionClass($class);
-        $cache = (is_array($arguments['config']) && count($arguments['config']) > 0)
-               ? $reflection_class->newInstanceArgs($arguments['config'])
-               : $reflection_class->newInstance();
-
-        if ($class !== MemoryCache::class) {
-            return new Wrapper($cache);
-        }
-
-        return $cache;
-    }
-}
diff --git a/lib/classes/cache/Factory.php b/lib/classes/cache/Factory.php
new file mode 100644
index 0000000..b5c8359
--- /dev/null
+++ b/lib/classes/cache/Factory.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace Studip\Cache;
+
+use Config;
+use DBSchemaVersion;
+use MessageBox;
+use PageLayout;
+use ReflectionClass;
+use StudipCacheOperation;
+use UnexpectedValueException;
+
+/**
+ * This factory retrieves the instance of StudipCache configured for use in
+ * this Stud.IP installation.
+ *
+ * @package    studip
+ * @subpackage lib
+ *
+ * @author    Marco Diedrich (mdiedric@uos)
+ * @author    Marcus Lunzenauer (mlunzena@uos.de)
+ * @copyright 2007 (c) Authors
+ * @since     1.6
+ * @license   GPL2 or any later version
+ */
+class Factory
+{
+    /**
+     * the default cache class
+     *
+     * @var string
+     */
+    const DEFAULT_CACHE_CLASS = DbCache::class;
+
+    /**
+     * singleton instance
+     *
+     * @var Cache|null
+     */
+    private static ?Cache $cache = null;
+
+
+    /**
+     * config instance
+     *
+     * @var Config|null
+     */
+    private static ?Config $config = null;
+
+
+    /**
+     * Returns the currently used config instance
+     *
+     * @return Config        an instance of class Config used by this factory to
+     *                       determine the class of the actual implementation of
+     *                       the StudipCache interface; if no config was set, it
+     *                       returns the instance returned by Config#getInstance
+     * @see Config
+     */
+    public static function getConfig()
+    {
+        return self::$config ?? Config::getInstance();
+    }
+
+
+    /**
+     * @param Config $config an instance of class Config which will be used to
+     *                       determine the class of the implementation of interface
+     *                       StudipCache
+     */
+    public static function setConfig(Config $config)
+    {
+        self::$config = $config;
+        self::$cache = NULL;
+    }
+
+    /**
+     * Resets the configuration and voids the cache instance.
+     */
+    public static function unconfigure()
+    {
+        self::$cache = NULL;
+    }
+
+    /**
+     * Returns a cache instance.
+     *
+     * @param bool $apply_proxied_operations Whether or not to apply any
+     *                                       proxied (disable this in tests!)
+     * @return Cache the cache instance
+     */
+    public static function getCache(bool $apply_proxied_operations = true): Cache
+    {
+        if (self::$cache === null) {
+            $proxied = false;
+
+            if (!$GLOBALS['CACHING_ENABLE']) {
+                self::$cache = new MemoryCache();
+
+                // Proxy cache operations if CACHING_ENABLE is different from the globally set
+                // caching value. This should only be the case in cli mode.
+                if (isset($GLOBALS['GLOBAL_CACHING_ENABLE']) && $GLOBALS['GLOBAL_CACHING_ENABLE']) {
+                    $proxied = true;
+                }
+            } else {
+                try {
+                    $class = self::loadCacheClass();
+                    $args = self::retrieveConstructorArguments();
+
+                    self::$cache = self::instantiateCache($class, $args);
+                } catch (\Exception $e) {
+                    error_log(__METHOD__ . ': ' . $e->getMessage());
+                    PageLayout::addBodyElements(MessageBox::error(__METHOD__ . ': ' . $e->getMessage()));
+                    $class = self::DEFAULT_CACHE_CLASS;
+                    self::$cache = new $class();
+                }
+            }
+
+            // If proxy should be used, inject it. Otherwise apply pending
+            // operations, if any.
+            if ($proxied) {
+                self::$cache = new Proxy(self::$cache);
+            } elseif ($GLOBALS['CACHING_ENABLE'] && $apply_proxied_operations) {
+                // Even if the above condition will try to eliminate most
+                // failures, the following operation still needs to be wrapped
+                // in a try/catch block. Otherwise there are no means to
+                // execute migration 166 which creates the neccessary tables
+                // for said operation.
+                try {
+                    StudipCacheOperation::apply(self::$cache);
+                } catch (\Exception $e) {
+                }
+            }
+        }
+
+        return self::$cache;
+    }
+
+
+    /**
+     * Load configured cache class and return its name.
+     *
+     * @return string  the name of the configured cache class
+     */
+    public static function loadCacheClass()
+    {
+        $cacheConfig = self::getConfig()->SYSTEMCACHE;
+
+        $cache_class = $cacheConfig['type'] ?: null;
+
+        # default class
+        if ($cache_class === null) {
+            $version = new DBSchemaVersion();
+            if ($version->get(1) < 224) {
+                // db cache is not yet available, use StudipMemoryCache
+                return 'StudipMemoryCache';
+            }
+
+            return self::DEFAULT_CACHE_CLASS;
+        }
+
+        if (!class_exists($cache_class)) {
+            throw new UnexpectedValueException("Could not find class: '$cache_class'");
+        }
+
+        return $cache_class;
+    }
+
+    /**
+     * Return an array of arguments required for instantiation of the cache
+     * class.
+     *
+     * @return array  the array of arguments
+     */
+    public static function retrieveConstructorArguments()
+    {
+        $cacheConfig = self::getConfig()->SYSTEMCACHE;
+
+        return $cacheConfig ?: [];
+    }
+
+    /**
+     * Return an instance of a given class using some arguments. Unless the
+     * memory cache is instantiated, the cache will be wrapped in a wrapper
+     * class that uses a memory cache to reduce accesses to the cache.
+     *
+     * @param string $class     the name of the class
+     * @param array  $arguments an array of arguments to be used by the constructor
+     *
+     * @return Cache  an instance of the specified class
+     * @throws \ReflectionException
+     */
+    public static function instantiateCache($class, $arguments)
+    {
+        $reflection_class = new ReflectionClass($class);
+        $cache = (is_array($arguments['config']) && count($arguments['config']) > 0)
+               ? $reflection_class->newInstanceArgs($arguments['config'])
+               : $reflection_class->newInstance();
+
+        if ($class !== MemoryCache::class) {
+            return new Wrapper($cache);
+        }
+
+        return $cache;
+    }
+}
diff --git a/lib/classes/cache/FileCache.class.php b/lib/classes/cache/FileCache.class.php
deleted file mode 100644
index d760f08..0000000
--- a/lib/classes/cache/FileCache.class.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use Config;
-use Exception;
-use Psr\Cache\CacheItemInterface;
-
-/**
- * Cache implementation using files
- *
- * @author    André Noack <noack@data-quest.de>
- * @copyright 2007 André Noack <noack@data-quest.de>
- * @license GPL2 or any later version
- */
-class FileCache extends Cache
-{
-    use KeyTrait;
-
-    /**
-     * full path to cache directory
-     *
-     * @var string
-     */
-    private string $dir;
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Dateisystem');
-    }
-
-    /**
-     * without the 'dir' argument the cache path is taken from
-     * $CACHING_FILECACHE_PATH or is set to
-     * $TMP_PATH/studip_cache
-     *
-     * @param string $path the path to use
-     * @throws Exception if the directory does not exist or could not be
-     *         created
-     */
-    public function __construct(string $path = '')
-    {
-        $this->dir = $path
-                  ?: (
-                      Config::get()->SYSTEMCACHE['type'] === self::class
-                          ? Config::get()->SYSTEMCACHE['config']['path']
-                          : ''
-                  )
-                  ?: $GLOBALS['CACHING_FILECACHE_PATH']
-                  ?: ($GLOBALS['TMP_PATH'] . '/' . 'studip_cache');
-        $this->dir = rtrim($this->dir, '\\/') . '/';
-
-        if (!is_dir($this->dir) && !@mkdir($this->dir, 0700)) {
-            throw new \Exception('Could not create directory: ' . $this->dir);
-        }
-
-        if (!is_writable($this->dir)) {
-            throw new \Exception('Can not write to directory: ' . $this->dir);
-        }
-    }
-
-    /**
-     * get path to cache directory
-     *
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return $this->dir;
-    }
-
-    /**
-     * expire cache item
-     *
-     * @param string $arg
-     *
-     * @return void
-     * @throws Exception
-     * @see Cache::expire()
-     */
-    public function expire($arg)
-    {
-        $key = $this->getCacheKey($arg);
-
-        if ($file = $this->getPathAndFile($key)){
-            @unlink($file);
-        }
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        rmdirr($this->dir);
-    }
-
-    /**
-     * checks if specified cache item is expired
-     * if expired the cache file is deleted
-     *
-     * @param string $key a cache key to check
-     *
-     * @return array|bool the path to the cache file or false if expired
-     * @throws Exception
-     */
-    private function check($key)
-    {
-        if ($file = $this->getPathAndFile($key)){
-            [$id, $expire] = explode('-', basename($file));
-            if (time() < $expire) {
-                return [$file, $expire];
-            } else {
-                @unlink($file);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * get the full path to a cache file
-     *
-     * the cache files are organized in sub-folders named by
-     * the first two characters of the hashed cache key.
-     * the filename is constructed from the hashed cache key
-     * and the timestamp of expiration
-     *
-     * @param string   $key    a cache key
-     * @param int|null $expire expiry time in seconds
-     *
-     * @return string|bool full path to cache item or false on failure
-     * @throws Exception
-     */
-    private function getPathAndFile(string $key, ?int $expire = null): bool|string
-    {
-        $id = hash('md5', $key);
-        $path = $this->dir . mb_substr($id, 0, 2);
-        if (!is_dir($path) && !@mkdir($path, 0700)) {
-            throw new \Exception('Could not create directory: ' . $path);
-        }
-        if (!is_null($expire)){
-            return $path . '/' . $id . '-' . (time() + $expire);
-        } else {
-            $files = @glob("{$path}/{$id}*");
-            if (count($files) > 0) {
-                return $files[0];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * purges expired entries from the cache directory
-     *
-     * @param bool $be_quiet echo messages if set to false
-     *
-     * @return int the number of deleted files
-     */
-    public function purge(bool $be_quiet = true): int
-    {
-        $now = time();
-        $deleted = 0;
-        foreach (@glob($this->dir . '*', GLOB_ONLYDIR) as $current_dir){
-            foreach (@glob("{$current_dir}/*") as $file){
-                [$id, $expire] = explode('-', basename($file));
-                if ($expire < $now) {
-                    if (@unlink($file)) {
-                        ++$deleted;
-                        if (!$be_quiet) {
-                            echo "File: {$file} deleted.\n";
-                        }
-                    }
-                } else if (!$be_quiet) {
-                    echo "File: {$file} expires on " . date('Y-m-d H:i:s', $expire) . "\n";
-                }
-            }
-        }
-        return $deleted;
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        return [
-            __CLASS__ => [
-                'name' => _('Anzahl Einträge'),
-                'value' => \DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
-            ]
-        ];
-    }
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        $currentCache = Config::get()->SYSTEMCACHE;
-
-        // Set default config for this cache
-        $currentConfig = [
-            'path' => $GLOBALS['TMP_PATH'] . '/studip_cache'
-        ];
-
-        // If this cache is set as system cache, use config from global settings.
-        if ($currentCache['type'] == __CLASS__) {
-            $currentConfig = $currentCache['config'];
-        }
-
-        return [
-            'component' => 'FileCacheConfig',
-            'props' => $currentConfig
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        $real_key = $this->getCacheKey($key);
-
-        $item = new \Studip\Cache\Item($key);
-
-        $file_data = $this->check($real_key);
-        if ($file_data) {
-            $file = $file_data[0];
-            $expire = $file_data[1];
-            $f = @fopen($file, 'rb');
-            if ($f) {
-                @flock($f, LOCK_SH);
-                $result = stream_get_contents($f);
-                @fclose($f);
-            }
-            $item->setHit();
-            $item->set(unserialize($result));
-            $expiration = new \DateTime();
-            $expiration->setTimestamp($expire);
-            $item->expiresAt($expiration);
-        }
-        return $item;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        $real_key = $this->getCacheKey($key);
-        $file_data = $this->check($real_key);
-        return $file_data !== false;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        $expiration = $this->getExpiration($item);
-        if ($expiration < 1) {
-            //The item would expire immediately.
-            return false;
-        }
-
-        $real_key = $this->getCacheKey($item->getKey());
-        $this->expire($real_key);
-        $file = $this->getPathAndFile($real_key, $expiration);
-        return @file_put_contents($file, serialize($item->get()), LOCK_EX);
-    }
-}
diff --git a/lib/classes/cache/FileCache.php b/lib/classes/cache/FileCache.php
new file mode 100644
index 0000000..d760f08
--- /dev/null
+++ b/lib/classes/cache/FileCache.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace Studip\Cache;
+
+use Config;
+use Exception;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * Cache implementation using files
+ *
+ * @author    André Noack <noack@data-quest.de>
+ * @copyright 2007 André Noack <noack@data-quest.de>
+ * @license GPL2 or any later version
+ */
+class FileCache extends Cache
+{
+    use KeyTrait;
+
+    /**
+     * full path to cache directory
+     *
+     * @var string
+     */
+    private string $dir;
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Dateisystem');
+    }
+
+    /**
+     * without the 'dir' argument the cache path is taken from
+     * $CACHING_FILECACHE_PATH or is set to
+     * $TMP_PATH/studip_cache
+     *
+     * @param string $path the path to use
+     * @throws Exception if the directory does not exist or could not be
+     *         created
+     */
+    public function __construct(string $path = '')
+    {
+        $this->dir = $path
+                  ?: (
+                      Config::get()->SYSTEMCACHE['type'] === self::class
+                          ? Config::get()->SYSTEMCACHE['config']['path']
+                          : ''
+                  )
+                  ?: $GLOBALS['CACHING_FILECACHE_PATH']
+                  ?: ($GLOBALS['TMP_PATH'] . '/' . 'studip_cache');
+        $this->dir = rtrim($this->dir, '\\/') . '/';
+
+        if (!is_dir($this->dir) && !@mkdir($this->dir, 0700)) {
+            throw new \Exception('Could not create directory: ' . $this->dir);
+        }
+
+        if (!is_writable($this->dir)) {
+            throw new \Exception('Can not write to directory: ' . $this->dir);
+        }
+    }
+
+    /**
+     * get path to cache directory
+     *
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return $this->dir;
+    }
+
+    /**
+     * expire cache item
+     *
+     * @param string $arg
+     *
+     * @return void
+     * @throws Exception
+     * @see Cache::expire()
+     */
+    public function expire($arg)
+    {
+        $key = $this->getCacheKey($arg);
+
+        if ($file = $this->getPathAndFile($key)){
+            @unlink($file);
+        }
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        rmdirr($this->dir);
+    }
+
+    /**
+     * checks if specified cache item is expired
+     * if expired the cache file is deleted
+     *
+     * @param string $key a cache key to check
+     *
+     * @return array|bool the path to the cache file or false if expired
+     * @throws Exception
+     */
+    private function check($key)
+    {
+        if ($file = $this->getPathAndFile($key)){
+            [$id, $expire] = explode('-', basename($file));
+            if (time() < $expire) {
+                return [$file, $expire];
+            } else {
+                @unlink($file);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * get the full path to a cache file
+     *
+     * the cache files are organized in sub-folders named by
+     * the first two characters of the hashed cache key.
+     * the filename is constructed from the hashed cache key
+     * and the timestamp of expiration
+     *
+     * @param string   $key    a cache key
+     * @param int|null $expire expiry time in seconds
+     *
+     * @return string|bool full path to cache item or false on failure
+     * @throws Exception
+     */
+    private function getPathAndFile(string $key, ?int $expire = null): bool|string
+    {
+        $id = hash('md5', $key);
+        $path = $this->dir . mb_substr($id, 0, 2);
+        if (!is_dir($path) && !@mkdir($path, 0700)) {
+            throw new \Exception('Could not create directory: ' . $path);
+        }
+        if (!is_null($expire)){
+            return $path . '/' . $id . '-' . (time() + $expire);
+        } else {
+            $files = @glob("{$path}/{$id}*");
+            if (count($files) > 0) {
+                return $files[0];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * purges expired entries from the cache directory
+     *
+     * @param bool $be_quiet echo messages if set to false
+     *
+     * @return int the number of deleted files
+     */
+    public function purge(bool $be_quiet = true): int
+    {
+        $now = time();
+        $deleted = 0;
+        foreach (@glob($this->dir . '*', GLOB_ONLYDIR) as $current_dir){
+            foreach (@glob("{$current_dir}/*") as $file){
+                [$id, $expire] = explode('-', basename($file));
+                if ($expire < $now) {
+                    if (@unlink($file)) {
+                        ++$deleted;
+                        if (!$be_quiet) {
+                            echo "File: {$file} deleted.\n";
+                        }
+                    }
+                } else if (!$be_quiet) {
+                    echo "File: {$file} expires on " . date('Y-m-d H:i:s', $expire) . "\n";
+                }
+            }
+        }
+        return $deleted;
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @return array|array[]
+     */
+    public function getStats(): array
+    {
+        return [
+            __CLASS__ => [
+                'name' => _('Anzahl Einträge'),
+                'value' => \DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `cache`")
+            ]
+        ];
+    }
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @return array
+     */
+    public static function getConfig(): array
+    {
+        $currentCache = Config::get()->SYSTEMCACHE;
+
+        // Set default config for this cache
+        $currentConfig = [
+            'path' => $GLOBALS['TMP_PATH'] . '/studip_cache'
+        ];
+
+        // If this cache is set as system cache, use config from global settings.
+        if ($currentCache['type'] == __CLASS__) {
+            $currentConfig = $currentCache['config'];
+        }
+
+        return [
+            'component' => 'FileCacheConfig',
+            'props' => $currentConfig
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        $real_key = $this->getCacheKey($key);
+
+        $item = new \Studip\Cache\Item($key);
+
+        $file_data = $this->check($real_key);
+        if ($file_data) {
+            $file = $file_data[0];
+            $expire = $file_data[1];
+            $f = @fopen($file, 'rb');
+            if ($f) {
+                @flock($f, LOCK_SH);
+                $result = stream_get_contents($f);
+                @fclose($f);
+            }
+            $item->setHit();
+            $item->set(unserialize($result));
+            $expiration = new \DateTime();
+            $expiration->setTimestamp($expire);
+            $item->expiresAt($expiration);
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        $real_key = $this->getCacheKey($key);
+        $file_data = $this->check($real_key);
+        return $file_data !== false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            //The item would expire immediately.
+            return false;
+        }
+
+        $real_key = $this->getCacheKey($item->getKey());
+        $this->expire($real_key);
+        $file = $this->getPathAndFile($real_key, $expiration);
+        return @file_put_contents($file, serialize($item->get()), LOCK_EX);
+    }
+}
diff --git a/lib/classes/cache/Item.class.php b/lib/classes/cache/Item.class.php
deleted file mode 100644
index 4e83d4d..0000000
--- a/lib/classes/cache/Item.class.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Item.class.php
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2024
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       6.0
- */
-
-namespace Studip\Cache;
-
-use DateInterval;
-use DateTime;
-use Psr\Cache\CacheItemInterface;
-
-/**
- * \Studip\Cache\CacheItem implements the CacheItemInterface of PSR-6. It holds the value and the
- * key of a cache item and also provides additional methods to get the expiration of the item.
- */
-class Item implements CacheItemInterface
-{
-    /**
-     * @var string The key of the item in the cache.
-     */
-    protected string $key;
-
-    /**
-     * @var mixed The value of the item.
-     */
-    protected mixed $value;
-
-    /**
-     * @var DateTime|null The expiration as DateTime object or null if the expiration is not defined.
-     */
-    protected ?DateTime $expiration = null;
-
-    /**
-     * @var bool An indicator whether the item has been found in the cache (true) or not (false).
-     */
-    protected bool $cache_hit = false;
-
-    /**
-     * The constructor of \Studip\Cache\CacheItem.
-     *
-     * @param string $key The key of the item in the cache.
-     * @param mixed $value The value of the item.
-     * @param int|null $expiration The expiration of the item in seconds, if applicable.
-     * @param bool $cache_hit Whether the item shall be constructed as cache hit (true) or not (false).
-     *
-     */
-    public function __construct(
-        string $key,
-        mixed $value = null,
-        ?int $expiration = null,
-        bool $cache_hit = false
-    ) {
-        $this->key         = $key;
-        $this->value       = $value;
-        $this->cache_hit   = $cache_hit;
-        $this->expiresAfter($expiration);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getKey(): string
-    {
-        return $this->key;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function get(): mixed
-    {
-        return $this->value;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isHit(): bool
-    {
-        return $this->cache_hit;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function set($value): static
-    {
-        $this->value = $value;
-        return $this;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function expiresAt($expiration): static
-    {
-        $this->expiration = $expiration;
-        return $this;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function expiresAfter($time): static
-    {
-        $this->expiration = new DateTime();
-        if ($time instanceof DateInterval) {
-            $this->expiration = $this->expiration->add($time);
-        } elseif (is_integer($time)) {
-            $this->expiration->setTimestamp(time() + $time);
-        } else {
-            $this->expiration->setTimestamp(time() + Cache::DEFAULT_EXPIRATION);
-        }
-        return $this;
-    }
-
-    // \Studip\Cache\CacheItem specific methods:
-
-    /**
-     * Sets the item to be a cache hit.
-     *
-     * @return void
-     */
-    public function setHit() : void
-    {
-        $this->cache_hit = true;
-    }
-
-    /**
-     * Returns the expiration, if set.
-     *
-     * @return DateTime|null A DateTime object with the expiration date and time
-     *     or null if the expiration is not defined.
-     */
-    public function getExpiration() : ?DateTime
-    {
-        return $this->expiration;
-    }
-
-    /**
-     * Returns the seconds from the current timestamp until the expiration of the item.
-     *
-     * @return int The seconds until the item expires
-     */
-    public function getExpirationInSeconds() : int
-    {
-        if ($this->expiration) {
-            return $this->expiration->getTimestamp() - time();
-        }
-        return 0;
-    }
-}
diff --git a/lib/classes/cache/Item.php b/lib/classes/cache/Item.php
new file mode 100644
index 0000000..4e83d4d
--- /dev/null
+++ b/lib/classes/cache/Item.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Item.class.php
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2024
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       6.0
+ */
+
+namespace Studip\Cache;
+
+use DateInterval;
+use DateTime;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * \Studip\Cache\CacheItem implements the CacheItemInterface of PSR-6. It holds the value and the
+ * key of a cache item and also provides additional methods to get the expiration of the item.
+ */
+class Item implements CacheItemInterface
+{
+    /**
+     * @var string The key of the item in the cache.
+     */
+    protected string $key;
+
+    /**
+     * @var mixed The value of the item.
+     */
+    protected mixed $value;
+
+    /**
+     * @var DateTime|null The expiration as DateTime object or null if the expiration is not defined.
+     */
+    protected ?DateTime $expiration = null;
+
+    /**
+     * @var bool An indicator whether the item has been found in the cache (true) or not (false).
+     */
+    protected bool $cache_hit = false;
+
+    /**
+     * The constructor of \Studip\Cache\CacheItem.
+     *
+     * @param string $key The key of the item in the cache.
+     * @param mixed $value The value of the item.
+     * @param int|null $expiration The expiration of the item in seconds, if applicable.
+     * @param bool $cache_hit Whether the item shall be constructed as cache hit (true) or not (false).
+     *
+     */
+    public function __construct(
+        string $key,
+        mixed $value = null,
+        ?int $expiration = null,
+        bool $cache_hit = false
+    ) {
+        $this->key         = $key;
+        $this->value       = $value;
+        $this->cache_hit   = $cache_hit;
+        $this->expiresAfter($expiration);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getKey(): string
+    {
+        return $this->key;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get(): mixed
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isHit(): bool
+    {
+        return $this->cache_hit;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function set($value): static
+    {
+        $this->value = $value;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function expiresAt($expiration): static
+    {
+        $this->expiration = $expiration;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function expiresAfter($time): static
+    {
+        $this->expiration = new DateTime();
+        if ($time instanceof DateInterval) {
+            $this->expiration = $this->expiration->add($time);
+        } elseif (is_integer($time)) {
+            $this->expiration->setTimestamp(time() + $time);
+        } else {
+            $this->expiration->setTimestamp(time() + Cache::DEFAULT_EXPIRATION);
+        }
+        return $this;
+    }
+
+    // \Studip\Cache\CacheItem specific methods:
+
+    /**
+     * Sets the item to be a cache hit.
+     *
+     * @return void
+     */
+    public function setHit() : void
+    {
+        $this->cache_hit = true;
+    }
+
+    /**
+     * Returns the expiration, if set.
+     *
+     * @return DateTime|null A DateTime object with the expiration date and time
+     *     or null if the expiration is not defined.
+     */
+    public function getExpiration() : ?DateTime
+    {
+        return $this->expiration;
+    }
+
+    /**
+     * Returns the seconds from the current timestamp until the expiration of the item.
+     *
+     * @return int The seconds until the item expires
+     */
+    public function getExpirationInSeconds() : int
+    {
+        if ($this->expiration) {
+            return $this->expiration->getTimestamp() - time();
+        }
+        return 0;
+    }
+}
diff --git a/lib/classes/cache/MemcachedCache.class.php b/lib/classes/cache/MemcachedCache.class.php
deleted file mode 100644
index 1c4b685..0000000
--- a/lib/classes/cache/MemcachedCache.class.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use Memcached;
-use Psr\Cache\CacheItemInterface;
-
-/**
- * Cache implementation using memcached.
- *
- * @author    Marcus Lunzenauer <mlunzena@uos.de>
- * @copyright (c) Authors
- * @license GPL2 or any later version
- * @since   5.0
- */
-class MemcachedCache extends Cache
-{
-    use KeyTrait;
-
-    private Memcached $memcache;
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Memcached');
-    }
-
-    public function __construct($servers)
-    {
-        if (!extension_loaded('memcached')) {
-            throw new \Exception('Memcache extension missing.');
-        }
-
-        $prefix = \Config::get()->STUDIP_INSTALLATION_ID;
-        $this->memcache = new Memcached('studip' . ($prefix ? '-' . $prefix : ''));
-
-        if (count($this->memcache->getServerList()) === 0) {
-            foreach ($servers as $server) {
-                $status = $this->memcache->addServer($server['hostname'], (int) $server['port']);
-
-                if (!$status) {
-                    throw new \Exception("Could not add server: {$server['hostname']} @ port {$server['port']}");
-                }
-            }
-        }
-    }
-
-    /**
-     * Expire item from the cache.
-     *
-     * Example:
-     *
-     *   # expires foo
-     *   $cache->expire('foo');
-     *
-     * @param   string $arg a single key.
-     * @returns void
-     */
-    public function expire($arg)
-    {
-        $key = $this->getCacheKey($arg);
-        $this->memcache->delete($key);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $this->memcache->flush();
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @StudipCache::getStats()
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        return $this->memcache->getStats();
-    }
-
-    /**
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @see Cache::getConfig()
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        $currentCache = \Config::get()->SYSTEMCACHE;
-
-        // Set default config for this cache
-        $currentConfig = [
-            'servers' => []
-        ];
-
-        // If this cache is set as system cache, use config from global settings.
-        if ($currentCache['type'] == __CLASS__) {
-            $currentConfig = $currentCache['config'];
-        }
-
-        return [
-            'component' => 'MemcachedCacheConfig',
-            'props' => $currentConfig
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        $item = new Item($key);
-        $value = $this->memcache->get($this->getCacheKey($key));
-        if ($this->memcache->getResultCode() !== Memcached::RES_NOTFOUND) {
-            // Set the value, even if it is the boolean value false:
-            $item->setHit();
-            $item->set($value);
-        }
-        return $item;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        return $this->memcache->checkKey($this->getCacheKey($key));
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        $expiration = $this->getExpiration($item);
-        if ($expiration < 1) {
-            // The item would expire immediately.
-            return false;
-        }
-
-        $real_key = $this->getCacheKey($item->getKey());
-        return $this->memcache->set($real_key, $item->get(), $expiration);
-    }
-}
diff --git a/lib/classes/cache/MemcachedCache.php b/lib/classes/cache/MemcachedCache.php
new file mode 100644
index 0000000..1c4b685
--- /dev/null
+++ b/lib/classes/cache/MemcachedCache.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Studip\Cache;
+
+use Memcached;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * Cache implementation using memcached.
+ *
+ * @author    Marcus Lunzenauer <mlunzena@uos.de>
+ * @copyright (c) Authors
+ * @license GPL2 or any later version
+ * @since   5.0
+ */
+class MemcachedCache extends Cache
+{
+    use KeyTrait;
+
+    private Memcached $memcache;
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Memcached');
+    }
+
+    public function __construct($servers)
+    {
+        if (!extension_loaded('memcached')) {
+            throw new \Exception('Memcache extension missing.');
+        }
+
+        $prefix = \Config::get()->STUDIP_INSTALLATION_ID;
+        $this->memcache = new Memcached('studip' . ($prefix ? '-' . $prefix : ''));
+
+        if (count($this->memcache->getServerList()) === 0) {
+            foreach ($servers as $server) {
+                $status = $this->memcache->addServer($server['hostname'], (int) $server['port']);
+
+                if (!$status) {
+                    throw new \Exception("Could not add server: {$server['hostname']} @ port {$server['port']}");
+                }
+            }
+        }
+    }
+
+    /**
+     * Expire item from the cache.
+     *
+     * Example:
+     *
+     *   # expires foo
+     *   $cache->expire('foo');
+     *
+     * @param   string $arg a single key.
+     * @returns void
+     */
+    public function expire($arg)
+    {
+        $key = $this->getCacheKey($arg);
+        $this->memcache->delete($key);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $this->memcache->flush();
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @StudipCache::getStats()
+     *
+     * @return array|array[]
+     */
+    public function getStats(): array
+    {
+        return $this->memcache->getStats();
+    }
+
+    /**
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @see Cache::getConfig()
+     *
+     * @return array
+     */
+    public static function getConfig(): array
+    {
+        $currentCache = \Config::get()->SYSTEMCACHE;
+
+        // Set default config for this cache
+        $currentConfig = [
+            'servers' => []
+        ];
+
+        // If this cache is set as system cache, use config from global settings.
+        if ($currentCache['type'] == __CLASS__) {
+            $currentConfig = $currentCache['config'];
+        }
+
+        return [
+            'component' => 'MemcachedCacheConfig',
+            'props' => $currentConfig
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        $item = new Item($key);
+        $value = $this->memcache->get($this->getCacheKey($key));
+        if ($this->memcache->getResultCode() !== Memcached::RES_NOTFOUND) {
+            // Set the value, even if it is the boolean value false:
+            $item->setHit();
+            $item->set($value);
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        return $this->memcache->checkKey($this->getCacheKey($key));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            // The item would expire immediately.
+            return false;
+        }
+
+        $real_key = $this->getCacheKey($item->getKey());
+        return $this->memcache->set($real_key, $item->get(), $expiration);
+    }
+}
diff --git a/lib/classes/cache/MemoryCache.class.php b/lib/classes/cache/MemoryCache.class.php
deleted file mode 100644
index 7c00753..0000000
--- a/lib/classes/cache/MemoryCache.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use DateTime;
-use Psr\Cache\CacheItemInterface;
-
-/**
- * The php memory implementation of the StudipCache interface.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since   Stud.IP 5.0
- */
-class MemoryCache extends Cache
-{
-    protected array $memory_cache = [];
-
-    /**
-     * Expires just a single key.
-     *
-     * @param  string $arg the key
-     */
-    public function expire($arg)
-    {
-        unset($this->memory_cache[$arg]);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $this->memory_cache = [];
-    }
-
-    public static function getDisplayName(): string
-    {
-        return 'Memory cache';
-    }
-
-    public function getStats(): array
-    {
-        return [];
-    }
-
-    public static function getConfig(): array
-    {
-        return [];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        $item = new Item($key);
-        if (!isset($this->memory_cache[$key])) {
-            return $item;
-        }
-        if ($this->memory_cache[$key]['expires'] < time()) {
-            $this->expire($key);
-            return $item;
-        }
-        $item->setHit();
-        $item->set($this->memory_cache[$key]['data']);
-        if (!empty($this->memory_cache[$key]['expires'])) {
-            $expiration = new DateTime();
-            $expiration->setTimestamp($this->memory_cache[$key]['expires']);
-            $item->expiresAt($expiration);
-        }
-        return $item;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        return isset($this->memory_cache[$key])
-            && $this->memory_cache[$key]['expires'] < time();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        $expiration = $this->getExpiration($item);
-
-        $this->memory_cache[$item->getKey()] = [
-            'expires' => $expiration + time(),
-            'data'    => $item->get(),
-        ];
-
-        return true;
-    }
-}
diff --git a/lib/classes/cache/MemoryCache.php b/lib/classes/cache/MemoryCache.php
new file mode 100644
index 0000000..7c00753
--- /dev/null
+++ b/lib/classes/cache/MemoryCache.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Studip\Cache;
+
+use DateTime;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * The php memory implementation of the StudipCache interface.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since   Stud.IP 5.0
+ */
+class MemoryCache extends Cache
+{
+    protected array $memory_cache = [];
+
+    /**
+     * Expires just a single key.
+     *
+     * @param  string $arg the key
+     */
+    public function expire($arg)
+    {
+        unset($this->memory_cache[$arg]);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $this->memory_cache = [];
+    }
+
+    public static function getDisplayName(): string
+    {
+        return 'Memory cache';
+    }
+
+    public function getStats(): array
+    {
+        return [];
+    }
+
+    public static function getConfig(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        $item = new Item($key);
+        if (!isset($this->memory_cache[$key])) {
+            return $item;
+        }
+        if ($this->memory_cache[$key]['expires'] < time()) {
+            $this->expire($key);
+            return $item;
+        }
+        $item->setHit();
+        $item->set($this->memory_cache[$key]['data']);
+        if (!empty($this->memory_cache[$key]['expires'])) {
+            $expiration = new DateTime();
+            $expiration->setTimestamp($this->memory_cache[$key]['expires']);
+            $item->expiresAt($expiration);
+        }
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        return isset($this->memory_cache[$key])
+            && $this->memory_cache[$key]['expires'] < time();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        $expiration = $this->getExpiration($item);
+
+        $this->memory_cache[$item->getKey()] = [
+            'expires' => $expiration + time(),
+            'data'    => $item->get(),
+        ];
+
+        return true;
+    }
+}
diff --git a/lib/classes/cache/Proxy.class.php b/lib/classes/cache/Proxy.class.php
deleted file mode 100644
index fef034d..0000000
--- a/lib/classes/cache/Proxy.class.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use Psr\Cache\CacheItemInterface;
-use StudipCacheOperation;
-
-/**
- * Proxies a StudipCache and stores the expire operation in the database.
- * These operations are lateron applied to the cache they should have
- * been applied to in the beginning.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since   Stud.IP 3.3
- */
-class Proxy extends Cache
-{
-    protected Cache $actual_cache;
-    protected array $proxy_these;
-
-    /**
-     * @param Cache $cache       The actual cache object
-     * @param mixed $proxy_these List of operations to proxy (should be an
-     *                           array but a space seperated string is also
-     *                           valid)
-     */
-    public function __construct(Cache $cache, $proxy_these = ['expire'])
-    {
-        if (!is_array($proxy_these)) {
-            $proxy_these = words($proxy_these);
-        }
-
-        $this->actual_cache = $cache;
-        $this->proxy_these  = is_array($proxy_these)
-                            ? $proxy_these
-                            : words($proxy_these);
-    }
-
-    /**
-     * Expires just a single key.
-     *
-     * @param string $arg The item's key
-     */
-    public function expire($arg)
-    {
-        if (in_array('expire', $this->proxy_these)) {
-            try {
-                $operation = new StudipCacheOperation([$arg, 'expire']);
-                $operation->parameters = serialize([]);
-                $operation->store();
-            } catch (\Exception) {
-            }
-        }
-
-        return $this->actual_cache->expire($arg);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        if (in_array('flush', $this->proxy_these)) {
-            try {
-                $operation = new StudipCacheOperation(['', 'flush']);
-                $operation->parameters = serialize([]);
-                $operation->store();
-            } catch (\Exception) {
-            }
-        }
-
-        return $this->actual_cache->flush();
-    }
-
-    public static function getDisplayName(): string
-    {
-        return static::class;
-    }
-
-    public function getStats(): array
-    {
-        return $this->actual_cache->getStats();
-    }
-
-    public static function getConfig(): array
-    {
-        return [];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        return $this->actual_cache->getItem($key);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        return $this->actual_cache->hasItem($key);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        if (in_array('save', $this->proxy_these)) {
-            try {
-                $operation = new StudipCacheOperation([$item->getKey(), 'save']);
-                $operation->parameters = serialize([$item]);
-                $operation->store();
-            } catch (\Exception) {
-            }
-        }
-
-        return $this->actual_cache->save($item);
-    }
-}
diff --git a/lib/classes/cache/Proxy.php b/lib/classes/cache/Proxy.php
new file mode 100644
index 0000000..fef034d
--- /dev/null
+++ b/lib/classes/cache/Proxy.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Studip\Cache;
+
+use Psr\Cache\CacheItemInterface;
+use StudipCacheOperation;
+
+/**
+ * Proxies a StudipCache and stores the expire operation in the database.
+ * These operations are lateron applied to the cache they should have
+ * been applied to in the beginning.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since   Stud.IP 3.3
+ */
+class Proxy extends Cache
+{
+    protected Cache $actual_cache;
+    protected array $proxy_these;
+
+    /**
+     * @param Cache $cache       The actual cache object
+     * @param mixed $proxy_these List of operations to proxy (should be an
+     *                           array but a space seperated string is also
+     *                           valid)
+     */
+    public function __construct(Cache $cache, $proxy_these = ['expire'])
+    {
+        if (!is_array($proxy_these)) {
+            $proxy_these = words($proxy_these);
+        }
+
+        $this->actual_cache = $cache;
+        $this->proxy_these  = is_array($proxy_these)
+                            ? $proxy_these
+                            : words($proxy_these);
+    }
+
+    /**
+     * Expires just a single key.
+     *
+     * @param string $arg The item's key
+     */
+    public function expire($arg)
+    {
+        if (in_array('expire', $this->proxy_these)) {
+            try {
+                $operation = new StudipCacheOperation([$arg, 'expire']);
+                $operation->parameters = serialize([]);
+                $operation->store();
+            } catch (\Exception) {
+            }
+        }
+
+        return $this->actual_cache->expire($arg);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        if (in_array('flush', $this->proxy_these)) {
+            try {
+                $operation = new StudipCacheOperation(['', 'flush']);
+                $operation->parameters = serialize([]);
+                $operation->store();
+            } catch (\Exception) {
+            }
+        }
+
+        return $this->actual_cache->flush();
+    }
+
+    public static function getDisplayName(): string
+    {
+        return static::class;
+    }
+
+    public function getStats(): array
+    {
+        return $this->actual_cache->getStats();
+    }
+
+    public static function getConfig(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        return $this->actual_cache->getItem($key);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        return $this->actual_cache->hasItem($key);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        if (in_array('save', $this->proxy_these)) {
+            try {
+                $operation = new StudipCacheOperation([$item->getKey(), 'save']);
+                $operation->parameters = serialize([$item]);
+                $operation->store();
+            } catch (\Exception) {
+            }
+        }
+
+        return $this->actual_cache->save($item);
+    }
+}
diff --git a/lib/classes/cache/RedisCache.class.php b/lib/classes/cache/RedisCache.class.php
deleted file mode 100644
index a78f751..0000000
--- a/lib/classes/cache/RedisCache.class.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use BadMethodCallException;
-use Config;
-use DateTime;
-use Exception;
-use Psr\Cache\CacheItemInterface;
-use Redis;
-use RedisException;
-
-/**
- * Cache implementation using redis.
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     GPL2 or any later version
- * @package     studip
- * @subpackage  cache
- * @since       Stud.IP 5.0
- */
-class RedisCache extends Cache
-{
-    use KeyTrait;
-
-    private $redis;
-
-    /**
-     * @return string A translateable display name for this cache class.
-     */
-    public static function getDisplayName(): string
-    {
-        return _('Redis');
-    }
-
-    /**
-     * Construct a cache instance.
-     *
-     * @param string $hostname Hostname of redis server
-     * @param int    $port     Port of redis server
-     * @param string $auth     Optional auth token/password
-     *
-     * @throws RedisException
-     */
-    public function __construct($hostname, $port, string $auth = '')
-    {
-        if (!extension_loaded('redis')) {
-            throw new Exception('Redis extension missing.');
-        }
-
-        $this->redis = new Redis();
-        $status = $this->redis->connect($hostname, $port, 1);
-
-        if (!$status) {
-            throw new Exception('Could not add cache.');
-        }
-
-        if ($auth !== '') {
-            $this->redis->auth($auth);
-        }
-    }
-
-    /**
-     * Returns the instance of the redis server connection.
-     *
-     * @return Redis instance
-     */
-    public function getRedis()
-    {
-        return $this->redis;
-    }
-
-    /**
-     * Expire item from the cache.
-     *
-     * Example:
-     *
-     *   # expires foo
-     *   $cache->expire('foo');
-     *
-     * @param   string $arg a single key.
-     */
-    public function expire($arg)
-    {
-        $key = $this->getCacheKey($arg);
-        $this->redis->unlink($key);
-    }
-
-    /**
-     * Expire all items from the cache.
-     */
-    public function flush()
-    {
-        $pattern = $this->getCacheKey('*');
-        foreach ($this->redis->keys($pattern) as $key) {
-            $this->redis->unlink($key);
-        }
-    }
-
-    /**
-     * @param string $method Method to call
-     * @param array $args Arguments to pass
-     * @return false|mixed
-     */
-    public function __call($method, $args)
-    {
-        if (is_callable([$this->redis, $method])) {
-            return call_user_func_array([$this->redis, $method], $args);
-        }
-        throw new BadMethodCallException("Method {$method} does not exist");
-    }
-
-    /**
-     * Return statistics.
-     *
-     * @StudipCache::getStats()
-     *
-     * @return array|array[]
-     */
-    public function getStats(): array
-    {
-        $stats = $this->redis->info();
-        $stats['size'] = count($this->redis->keys($this->getCacheKey('*')));
-        return ["{$this->redis->getHost()}:{$this->redis->getPort()}" => $stats];
-    }
-
-    /*
-     * Return the Vue component name and props that handle configuration.
-     *
-     * @see StudipCache::getConfig()
-     *
-     * @return array
-     */
-    public static function getConfig(): array
-    {
-        $currentCache = Config::get()->SYSTEMCACHE;
-
-        // Set default config for this cache
-        $currentConfig = [
-            'hostname' => '',
-            'port' => null
-        ];
-
-        // If this cache is set as system cache, use config from global settings.
-        if ($currentCache['type'] == __CLASS__) {
-            $currentConfig = $currentCache['config'];
-            $currentConfig['port'] = $currentConfig['port'] ? (int) $currentConfig['port'] : null;
-        }
-
-        return [
-            'component' => 'RedisCacheConfig',
-            'props' => $currentConfig
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        $item = new Item($key);
-        $real_key = $this->getCacheKey($key);
-        $result = $this->redis->get($real_key);
-        if ($result === null) {
-            return $item;
-        }
-        $item->setHit();
-        $item->set(unserialize($result));
-        $expiration = new DateTime();
-        $expiration->setTimestamp($this->redis->expiretime($real_key));
-        $item->expiresAt($expiration);
-        return $item;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        $real_key = $this->getCacheKey($key);
-        return $this->redis->get($real_key) !== null;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        $expiration = $this->getExpiration($item);
-        if ($expiration < 1) {
-            // The item would expire immediately.
-            return false;
-        }
-
-        $real_key = $this->getCacheKey($item->getKey());
-        return $this->redis->setEx($real_key, $expiration, serialize($item->get()));
-    }
-}
diff --git a/lib/classes/cache/RedisCache.php b/lib/classes/cache/RedisCache.php
new file mode 100644
index 0000000..a78f751
--- /dev/null
+++ b/lib/classes/cache/RedisCache.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace Studip\Cache;
+
+use BadMethodCallException;
+use Config;
+use DateTime;
+use Exception;
+use Psr\Cache\CacheItemInterface;
+use Redis;
+use RedisException;
+
+/**
+ * Cache implementation using redis.
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     GPL2 or any later version
+ * @package     studip
+ * @subpackage  cache
+ * @since       Stud.IP 5.0
+ */
+class RedisCache extends Cache
+{
+    use KeyTrait;
+
+    private $redis;
+
+    /**
+     * @return string A translateable display name for this cache class.
+     */
+    public static function getDisplayName(): string
+    {
+        return _('Redis');
+    }
+
+    /**
+     * Construct a cache instance.
+     *
+     * @param string $hostname Hostname of redis server
+     * @param int    $port     Port of redis server
+     * @param string $auth     Optional auth token/password
+     *
+     * @throws RedisException
+     */
+    public function __construct($hostname, $port, string $auth = '')
+    {
+        if (!extension_loaded('redis')) {
+            throw new Exception('Redis extension missing.');
+        }
+
+        $this->redis = new Redis();
+        $status = $this->redis->connect($hostname, $port, 1);
+
+        if (!$status) {
+            throw new Exception('Could not add cache.');
+        }
+
+        if ($auth !== '') {
+            $this->redis->auth($auth);
+        }
+    }
+
+    /**
+     * Returns the instance of the redis server connection.
+     *
+     * @return Redis instance
+     */
+    public function getRedis()
+    {
+        return $this->redis;
+    }
+
+    /**
+     * Expire item from the cache.
+     *
+     * Example:
+     *
+     *   # expires foo
+     *   $cache->expire('foo');
+     *
+     * @param   string $arg a single key.
+     */
+    public function expire($arg)
+    {
+        $key = $this->getCacheKey($arg);
+        $this->redis->unlink($key);
+    }
+
+    /**
+     * Expire all items from the cache.
+     */
+    public function flush()
+    {
+        $pattern = $this->getCacheKey('*');
+        foreach ($this->redis->keys($pattern) as $key) {
+            $this->redis->unlink($key);
+        }
+    }
+
+    /**
+     * @param string $method Method to call
+     * @param array $args Arguments to pass
+     * @return false|mixed
+     */
+    public function __call($method, $args)
+    {
+        if (is_callable([$this->redis, $method])) {
+            return call_user_func_array([$this->redis, $method], $args);
+        }
+        throw new BadMethodCallException("Method {$method} does not exist");
+    }
+
+    /**
+     * Return statistics.
+     *
+     * @StudipCache::getStats()
+     *
+     * @return array|array[]
+     */
+    public function getStats(): array
+    {
+        $stats = $this->redis->info();
+        $stats['size'] = count($this->redis->keys($this->getCacheKey('*')));
+        return ["{$this->redis->getHost()}:{$this->redis->getPort()}" => $stats];
+    }
+
+    /*
+     * Return the Vue component name and props that handle configuration.
+     *
+     * @see StudipCache::getConfig()
+     *
+     * @return array
+     */
+    public static function getConfig(): array
+    {
+        $currentCache = Config::get()->SYSTEMCACHE;
+
+        // Set default config for this cache
+        $currentConfig = [
+            'hostname' => '',
+            'port' => null
+        ];
+
+        // If this cache is set as system cache, use config from global settings.
+        if ($currentCache['type'] == __CLASS__) {
+            $currentConfig = $currentCache['config'];
+            $currentConfig['port'] = $currentConfig['port'] ? (int) $currentConfig['port'] : null;
+        }
+
+        return [
+            'component' => 'RedisCacheConfig',
+            'props' => $currentConfig
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        $item = new Item($key);
+        $real_key = $this->getCacheKey($key);
+        $result = $this->redis->get($real_key);
+        if ($result === null) {
+            return $item;
+        }
+        $item->setHit();
+        $item->set(unserialize($result));
+        $expiration = new DateTime();
+        $expiration->setTimestamp($this->redis->expiretime($real_key));
+        $item->expiresAt($expiration);
+        return $item;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        $real_key = $this->getCacheKey($key);
+        return $this->redis->get($real_key) !== null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        $expiration = $this->getExpiration($item);
+        if ($expiration < 1) {
+            // The item would expire immediately.
+            return false;
+        }
+
+        $real_key = $this->getCacheKey($item->getKey());
+        return $this->redis->setEx($real_key, $expiration, serialize($item->get()));
+    }
+}
diff --git a/lib/classes/cache/Wrapper.class.php b/lib/classes/cache/Wrapper.class.php
deleted file mode 100644
index 4e6342c..0000000
--- a/lib/classes/cache/Wrapper.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Studip\Cache;
-
-use Psr\Cache\CacheItemInterface;
-
-/**
- * The cache wrapper wraps a memory cache around another cache. This should
- * reduce the accesses to the actual cache.
- *
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since Stud.IP 5.4
- */
-class Wrapper extends Cache
-{
-    protected Cache $actual_cache;
-    protected MemoryCache $memory_cache;
-
-    public function __construct(Cache $actual_cache)
-    {
-        $this->actual_cache = $actual_cache;
-        $this->memory_cache = new MemoryCache();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function expire($arg)
-    {
-        $this->memory_cache->expire($arg);
-        $this->actual_cache->expire($arg);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function flush()
-    {
-        $this->memory_cache->flush();
-        $this->actual_cache->flush();
-    }
-
-    public static function getDisplayName(): string
-    {
-        return static::class;
-    }
-
-    public function getStats(): array
-    {
-        return $this->actual_cache->getStats();
-    }
-
-    public static function getConfig(): array
-    {
-        return [];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem(string $key): CacheItemInterface
-    {
-        $cached = $this->memory_cache->getItem($key);
-        if ($cached->isHit()) {
-            return $cached;
-        }
-
-        $cached = $this->actual_cache->getItem($key);
-        if ($cached->isHit()) {
-            $this->memory_cache->save($cached);
-        }
-        return $cached;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem(string $key): bool
-    {
-        return $this->actual_cache->hasItem($key);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item): bool
-    {
-        if ($this->actual_cache->save($item)) {
-            return $this->memory_cache->save($item);
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/lib/classes/cache/Wrapper.php b/lib/classes/cache/Wrapper.php
new file mode 100644
index 0000000..4e6342c
--- /dev/null
+++ b/lib/classes/cache/Wrapper.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Studip\Cache;
+
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * The cache wrapper wraps a memory cache around another cache. This should
+ * reduce the accesses to the actual cache.
+ *
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ * @since Stud.IP 5.4
+ */
+class Wrapper extends Cache
+{
+    protected Cache $actual_cache;
+    protected MemoryCache $memory_cache;
+
+    public function __construct(Cache $actual_cache)
+    {
+        $this->actual_cache = $actual_cache;
+        $this->memory_cache = new MemoryCache();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function expire($arg)
+    {
+        $this->memory_cache->expire($arg);
+        $this->actual_cache->expire($arg);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function flush()
+    {
+        $this->memory_cache->flush();
+        $this->actual_cache->flush();
+    }
+
+    public static function getDisplayName(): string
+    {
+        return static::class;
+    }
+
+    public function getStats(): array
+    {
+        return $this->actual_cache->getStats();
+    }
+
+    public static function getConfig(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getItem(string $key): CacheItemInterface
+    {
+        $cached = $this->memory_cache->getItem($key);
+        if ($cached->isHit()) {
+            return $cached;
+        }
+
+        $cached = $this->actual_cache->getItem($key);
+        if ($cached->isHit()) {
+            $this->memory_cache->save($cached);
+        }
+        return $cached;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function hasItem(string $key): bool
+    {
+        return $this->actual_cache->hasItem($key);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CacheItemInterface $item): bool
+    {
+        if ($this->actual_cache->save($item)) {
+            return $this->memory_cache->save($item);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/lib/classes/calendar/EventData.class.php b/lib/classes/calendar/EventData.class.php
deleted file mode 100644
index 95e89b0..0000000
--- a/lib/classes/calendar/EventData.class.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-
-namespace Studip\Calendar;
-
-
-class EventData
-{
-    public $begin;
-    public $end;
-    public $title;
-    public $event_classes;
-    public $text_colour;
-    public $background_colour;
-    public $editable;
-    public $object_class;
-    public $object_id;
-    public $parent_object_class;
-    public $parent_object_id;
-    public $range_type;
-    public $range_id;
-    public $view_urls;
-    public $api_urls;
-    public $icon;
-    public $border_colour;
-    public $all_day;
-
-    public function __construct(
-        \DateTime $begin,
-        \DateTime $end,
-        string $title,
-        Array $event_classes,
-        string $text_colour,
-        string $background_colour,
-        bool $editable,
-        string $object_class,
-        string $object_id,
-        string $parent_object_class,
-        string $parent_object_id,
-        string $range_type,
-        string $range_id,
-        Array $view_urls = [],
-        Array $api_urls = [],
-        string $icon = '',
-        string $border_colour = '',
-        bool $all_day = false
-    )
-    {
-        $this->begin = $begin;
-        $this->end = $end;
-        $this->title = $title;
-        $this->event_classes = $event_classes;
-        $this->text_colour = $text_colour;
-        $this->background_colour = $background_colour;
-        $this->editable = $editable;
-        $this->object_class = $object_class;
-        $this->object_id = $object_id;
-        $this->parent_object_class = $parent_object_class;
-        $this->parent_object_id = $parent_object_id;
-        $this->range_type = $range_type;
-        $this->range_id = $range_id;
-        $this->view_urls = $view_urls;
-        $this->api_urls = $api_urls;
-        $this->icon = $icon;
-        $this->border_colour = $border_colour ?: $background_colour;
-        $this->all_day = $all_day;
-    }
-
-
-    public function toFullcalendarEvent()
-    {
-        // Note: The timezone must not be transmitted or
-        // the events may be shifted when there is a timezone
-        // or daylight saving time difference between the server
-        // and the client!
-        // To display all-day events correctly in fullcalendar
-        // reduce the start and end to date without time and add one day
-        // to the end date...
-        if ($this->all_day) {
-            $fc_date = [
-                'allDay' => true,
-                'start'  => $this->begin->format('Y-m-d'),
-                'end'    => $this->end->modify('+1 day')->format('Y-m-d')
-            ];
-        } else {
-            $fc_date = [
-                'allDay' => false,
-                'start'  => $this->begin->format('Y-m-d\TH:i:s'),
-                'end'    => $this->end->format('Y-m-d\TH:i:s')
-            ];
-        }
-
-        return $fc_date + [
-            'resourceId' => $this->range_id,
-            'title' => $this->title,
-            'classNames' => $this->event_classes,
-            'textColor' => $this->text_colour,
-            'color' => $this->background_colour,
-            'borderColor' => $this->border_colour,
-            'editable' => $this->editable,
-            'studip_weekday_begin' => $this->begin->format('N'),
-            'studip_weekday_end' => $this->end->format('N'),
-            'studip_object_class' => $this->object_class,
-            'studip_object_id' => $this->object_id,
-            'studip_parent_object_class' => $this->parent_object_class,
-            'studip_parent_object_id' => $this->parent_object_id,
-            'studip_range_type' => $this->range_type,
-            'studip_range_id' => $this->range_id,
-            'studip_view_urls' => $this->view_urls,
-            'studip_api_urls' => $this->api_urls,
-            'icon' => $this->icon
-        ];
-    }
-}
diff --git a/lib/classes/calendar/EventData.php b/lib/classes/calendar/EventData.php
new file mode 100644
index 0000000..95e89b0
--- /dev/null
+++ b/lib/classes/calendar/EventData.php
@@ -0,0 +1,114 @@
+<?php
+
+
+namespace Studip\Calendar;
+
+
+class EventData
+{
+    public $begin;
+    public $end;
+    public $title;
+    public $event_classes;
+    public $text_colour;
+    public $background_colour;
+    public $editable;
+    public $object_class;
+    public $object_id;
+    public $parent_object_class;
+    public $parent_object_id;
+    public $range_type;
+    public $range_id;
+    public $view_urls;
+    public $api_urls;
+    public $icon;
+    public $border_colour;
+    public $all_day;
+
+    public function __construct(
+        \DateTime $begin,
+        \DateTime $end,
+        string $title,
+        Array $event_classes,
+        string $text_colour,
+        string $background_colour,
+        bool $editable,
+        string $object_class,
+        string $object_id,
+        string $parent_object_class,
+        string $parent_object_id,
+        string $range_type,
+        string $range_id,
+        Array $view_urls = [],
+        Array $api_urls = [],
+        string $icon = '',
+        string $border_colour = '',
+        bool $all_day = false
+    )
+    {
+        $this->begin = $begin;
+        $this->end = $end;
+        $this->title = $title;
+        $this->event_classes = $event_classes;
+        $this->text_colour = $text_colour;
+        $this->background_colour = $background_colour;
+        $this->editable = $editable;
+        $this->object_class = $object_class;
+        $this->object_id = $object_id;
+        $this->parent_object_class = $parent_object_class;
+        $this->parent_object_id = $parent_object_id;
+        $this->range_type = $range_type;
+        $this->range_id = $range_id;
+        $this->view_urls = $view_urls;
+        $this->api_urls = $api_urls;
+        $this->icon = $icon;
+        $this->border_colour = $border_colour ?: $background_colour;
+        $this->all_day = $all_day;
+    }
+
+
+    public function toFullcalendarEvent()
+    {
+        // Note: The timezone must not be transmitted or
+        // the events may be shifted when there is a timezone
+        // or daylight saving time difference between the server
+        // and the client!
+        // To display all-day events correctly in fullcalendar
+        // reduce the start and end to date without time and add one day
+        // to the end date...
+        if ($this->all_day) {
+            $fc_date = [
+                'allDay' => true,
+                'start'  => $this->begin->format('Y-m-d'),
+                'end'    => $this->end->modify('+1 day')->format('Y-m-d')
+            ];
+        } else {
+            $fc_date = [
+                'allDay' => false,
+                'start'  => $this->begin->format('Y-m-d\TH:i:s'),
+                'end'    => $this->end->format('Y-m-d\TH:i:s')
+            ];
+        }
+
+        return $fc_date + [
+            'resourceId' => $this->range_id,
+            'title' => $this->title,
+            'classNames' => $this->event_classes,
+            'textColor' => $this->text_colour,
+            'color' => $this->background_colour,
+            'borderColor' => $this->border_colour,
+            'editable' => $this->editable,
+            'studip_weekday_begin' => $this->begin->format('N'),
+            'studip_weekday_end' => $this->end->format('N'),
+            'studip_object_class' => $this->object_class,
+            'studip_object_id' => $this->object_id,
+            'studip_parent_object_class' => $this->parent_object_class,
+            'studip_parent_object_id' => $this->parent_object_id,
+            'studip_range_type' => $this->range_type,
+            'studip_range_id' => $this->range_id,
+            'studip_view_urls' => $this->view_urls,
+            'studip_api_urls' => $this->api_urls,
+            'icon' => $this->icon
+        ];
+    }
+}
diff --git a/lib/classes/calendar/EventSource.interface.php b/lib/classes/calendar/EventSource.interface.php
deleted file mode 100644
index 48506d7..0000000
--- a/lib/classes/calendar/EventSource.interface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-
-namespace Studip\Calendar;
-
-
-/**
- * This interface defines methods that can be implemented by classes
- * that can provide calendar event data in a standardised format.
- * The methods are meant to be called on a "per-object base",
- * meaning that filtering of the event sources has to be done
- * before calling methods of this interface.
- */
-interface EventSource
-{
-    /**
-     * Returns all event data this event source can provide.
-     *
-     * @returns EventData[] An array of Studip\Calendar\EventData objects.
-     */
-    public function getAllEventData();
-
-
-    /**
-     * Returns event data that fall in the specified time range.
-     *
-     * @returns EventData[] An array of Studip\Calendar\EventData objects.
-     */
-    public function getEventDataForTimeRange(\DateTime $begin, \DateTime $end);
-
-
-    /**
-     * Allows a filtered output of event data based on a specified user,
-     * a specified range-ID and range type (must be supported by the
-     * Context class) or a specified time range.
-     * If no filters are applied the result should be the same as if
-     * the getAllEventData method from this interface is called.
-     *
-     * @param string $user_id The user for whom the event data shall be
-     *     retrieved. Depending on the implementation, this parameter
-     *     might be necessary to check permissions for event objects.
-     *
-     * @param string $range_id An optional range-ID that may be necessary
-     *     for an implementation to check for permissions.
-     *
-     * @param string $range_type An optional range type that may be
-     *     necessary for an implementation to check for permissions.
-     *
-     * @param DateTime|int|string $begin The begin date as DateTime object
-     *     or unix timestamp.
-     *
-     * @param DateTime|int|string $end The end date as DateTime object
-     *     or unix timestamp.
-     *
-     * @returns EventData[] An array of Studip\Calendar\EventData objects.
-     */
-    public function getFilteredEventData(
-        $user_id = null,
-        $range_id = null,
-        $range_type = null,
-        $begin = null,
-        $end = null
-    );
-}
diff --git a/lib/classes/calendar/EventSource.php b/lib/classes/calendar/EventSource.php
new file mode 100644
index 0000000..48506d7
--- /dev/null
+++ b/lib/classes/calendar/EventSource.php
@@ -0,0 +1,64 @@
+<?php
+
+
+namespace Studip\Calendar;
+
+
+/**
+ * This interface defines methods that can be implemented by classes
+ * that can provide calendar event data in a standardised format.
+ * The methods are meant to be called on a "per-object base",
+ * meaning that filtering of the event sources has to be done
+ * before calling methods of this interface.
+ */
+interface EventSource
+{
+    /**
+     * Returns all event data this event source can provide.
+     *
+     * @returns EventData[] An array of Studip\Calendar\EventData objects.
+     */
+    public function getAllEventData();
+
+
+    /**
+     * Returns event data that fall in the specified time range.
+     *
+     * @returns EventData[] An array of Studip\Calendar\EventData objects.
+     */
+    public function getEventDataForTimeRange(\DateTime $begin, \DateTime $end);
+
+
+    /**
+     * Allows a filtered output of event data based on a specified user,
+     * a specified range-ID and range type (must be supported by the
+     * Context class) or a specified time range.
+     * If no filters are applied the result should be the same as if
+     * the getAllEventData method from this interface is called.
+     *
+     * @param string $user_id The user for whom the event data shall be
+     *     retrieved. Depending on the implementation, this parameter
+     *     might be necessary to check permissions for event objects.
+     *
+     * @param string $range_id An optional range-ID that may be necessary
+     *     for an implementation to check for permissions.
+     *
+     * @param string $range_type An optional range type that may be
+     *     necessary for an implementation to check for permissions.
+     *
+     * @param DateTime|int|string $begin The begin date as DateTime object
+     *     or unix timestamp.
+     *
+     * @param DateTime|int|string $end The end date as DateTime object
+     *     or unix timestamp.
+     *
+     * @returns EventData[] An array of Studip\Calendar\EventData objects.
+     */
+    public function getFilteredEventData(
+        $user_id = null,
+        $range_id = null,
+        $range_type = null,
+        $begin = null,
+        $end = null
+    );
+}
diff --git a/lib/classes/calendar/ICalendarExport.class.php b/lib/classes/calendar/ICalendarExport.class.php
deleted file mode 100644
index 00147ef..0000000
--- a/lib/classes/calendar/ICalendarExport.class.php
+++ /dev/null
@@ -1,628 +0,0 @@
-<?php
-/**
- * ICalendarExport.class.php
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       5.5
- */
-
-
-class ICalendarExport
-{
-     /**
-     * Line break used in iCalendar
-     */
-    const NEWLINE = "\r\n";
-
-    /**
-     * Default start of the week
-     */
-    const WEEKSTART = 'MO';
-
-    /**
-     * Holds the time (as unix timestamp) used for
-     * the timestamp in every exported iCalendar object.
-     *
-     * @var int $time
-     */
-    private $time = 0;
-
-    public function __construct()
-    {
-        $this->default_filename_suffix = "ics";
-        $this->format = "iCalendar";
-    }
-
-    public function exportCalendarDates(string $range_id, DateTimeInterface $start, DateTimeInterface $end): string
-    {
-        if ($this->time === 0) {
-            $this->time = time();
-        }
-        $dates = CalendarDate::findBySQL(
-            "LEFT JOIN `calendar_date_assignments`
-                ON `calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`
-            WHERE
-                `calendar_date_assignments`.`range_id` = :range_id
-                AND (
-                    (`calendar_dates`.`begin` <= :end
-                        AND `calendar_dates`.`end` >= :begin)
-                    OR (`calendar_dates`.`repetition_type` != 'SINGLE'
-                        AND (`calendar_dates`.`repetition_end` >= :begin
-                            OR `calendar_dates`.`repetition_end` = 0)
-                    AND `calendar_dates`.`begin` < :end))",
-            [
-                ':range_id' => $range_id,
-                ':begin'    => $start->getTimestamp(),
-                ':end'      => $end->getTimestamp(),
-            ]
-        );
-        $ical = '';
-        foreach ($dates as $date) {
-            $ical .= $this->writeICalEvent($this->prepareCalendarDate($date));
-        }
-        return $ical;
-    }
-
-    public function exportCourseDates(string $user_id, DateTimeInterface $start, DateTimeInterface $end)
-    {
-        if ($this->time === 0) {
-            $this->time = time();
-        }
-        $dates = CalendarCourseDate::getEvents($start, $end, $user_id);
-        $ical = '';
-        foreach ($dates as $date) {
-            $ical .= $this->writeICalEvent($this->prepareCourseDate($date));
-        }
-        return $ical;
-    }
-
-    public function exportCourseExDates(string $user_id, DateTimeInterface $start, DateTimeInterface $end)
-    {
-        if ($this->time === 0) {
-            $this->time = time();
-        }
-        $dates = CalendarCourseExDate::getEvents($start, $end, $user_id);
-        $ical = '';
-        foreach ($dates as $date) {
-            $ical .= $this->writeICalEvent($this->prepareCourseDate($date));
-        }
-        return $ical;
-    }
-
-    /**
-     * @param CalendarDate $date The calendar date to export.
-     * @return array Calendar date data prepared for export.
-     */
-    public function prepareCalendarDate(CalendarDate $date): array
-    {
-        return [
-            'SUMMARY'       => $date->title,
-            'DESCRIPTION'   => $date->description,
-            'LOCATION'      => $date->location,
-            'CATEGORIES'    => $date->getCategoryAsString(),
-            'LAST-MODIFIED' => $date->chdate,
-            'CREATED'       => $date->mkdate,
-            'DTSTAMP'       => $this->time,
-            'DTSTART'       => $date->begin,
-            'DTEND'         => $date->end,
-            'EXDATE'        => implode(',', $date->exceptions->pluck('date')),
-            'PRIORITY'      => 5,
-            'RRULE'         => [
-                'type'      => $date->repetition_type,
-                'offset'    => $date->offset,
-                'interval'  => $date->interval,
-                'days'      => $date->days,
-                'count'     => $date->number_of_dates,
-                'expire'    => $date->repetition_end,
-                'month'     => $date->month
-            ],
-            'UID'           => $date->unique_id
-        ];
-    }
-
-    /**
-     * @param CourseDate | CourseExDate $date The course date to export.
-     * @return array Course date data prepared for export.
-     */
-    public function prepareCourseDate($date): array
-    {
-        $summary = $date->course->getFullName();
-        $categories = $date->getTypeName();
-        if ($date instanceof CourseExDate) {
-            $summary .= ' ' . _('(fällt aus)');
-            $categories = '';
-            $description = $date->content;
-        } else {
-            $description = implode("\n", $date->topics->pluck('title'));
-        }
-        return [
-            'SUMMARY'       => $summary,
-            'DESCRIPTION'   => $description,
-            'LOCATION'      => $date->getRoomName(),
-            'CATEGORIES'    => $categories,
-            'LAST-MODIFIED' => $date->chdate,
-            'CREATED'       => $date->mkdate,
-            'DTSTAMP'       => $this->time,
-            'DTSTART'       => $date->date,
-            'DTEND'         => $date->end_time,
-            'PRIORITY'      => '',
-            'UID'           => 'Stud.IP-SEM-' . $date->id . '@' . ($_SERVER['SERVER_NAME'] ?? '')
-        ];
-    }
-
-    /**
-     * Returns an iCalendar header with a rudimentary time zone definition.
-     *
-     * @return string The iCalendar header.
-     */
-    public function writeHeader()
-    {
-        // Default values
-        $header = "BEGIN:VCALENDAR" . self::NEWLINE;
-        $header .= "VERSION:2.0" . self::NEWLINE;
-        if (isset($this->client_identifier)) {
-            $header .= "PRODID:" . $this->client_identifier . self::NEWLINE;
-        } else {
-            $server_name = $_SERVER['SERVER_NAME'] ?? 'unknown';
-
-            $header .= "PRODID:-//Stud.IP@{$server_name}//Stud.IP_iCalendar Library";
-            $header .= " //EN" . self::NEWLINE;
-        }
-        $header .= "METHOD:PUBLISH" . self::NEWLINE;
-
-        // time zone definition CET/CEST
-        $header .= 'CALSCALE:GREGORIAN' . self::NEWLINE
-            . 'BEGIN:VTIMEZONE' . self::NEWLINE
-            . 'TZID:Europe/Berlin' . self::NEWLINE
-            . 'BEGIN:DAYLIGHT' . self::NEWLINE
-            . 'TZOFFSETFROM:+0100' . self::NEWLINE
-            . 'TZOFFSETTO:+0200' . self::NEWLINE
-            . 'TZNAME:CEST' . self::NEWLINE
-            . 'DTSTART:19700329T020000' . self::NEWLINE
-            . 'RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3' . self::NEWLINE
-            . 'END:DAYLIGHT' . self::NEWLINE
-            . 'BEGIN:STANDARD' . self::NEWLINE
-            . 'TZOFFSETFROM:+0200' . self::NEWLINE
-            . 'TZOFFSETTO:+0100' . self::NEWLINE
-            . 'TZNAME:CET' . self::NEWLINE
-            . 'DTSTART:19701025T030000' . self::NEWLINE
-            . 'RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10' . self::NEWLINE
-            . 'END:STANDARD' . self::NEWLINE
-            . 'END:VTIMEZONE' .self::NEWLINE;
-
-        return $header;
-    }
-
-    /**
-     * Returns the footer.
-     *
-     * @return string
-     */
-    public function writeFooter()
-    {
-        return "END:VCALENDAR" . self::NEWLINE;
-    }
-
-    /**
-     * Export prepared calendar data as iCalendar.
-     *
-     * @param array $properties The event to export.
-     * @return string iCalendar formatted data
-     */
-    public function writeICalEvent(array $properties): string
-    {
-        $result = "BEGIN:VEVENT" . self::NEWLINE;
-
-        foreach ($properties as $name => $value) {
-            $params = [];
-            $params_str = '';
-            if ($value === '' || is_null($value)) {
-                continue;
-            }
-            switch ($name) {
-                // not supported event properties
-                case 'SEMNAME':
-                    continue 2;
-
-                // Text fields
-                case 'SUMMARY':
-                    $value = $this->quoteText($value);
-                    break;
-                case 'DESCRIPTION':
-                    $value = $this->quoteText($value);
-                    break;
-                case 'LOCATION':
-                    $value = $this->quoteText($value);
-                    break;
-                case 'CATEGORIES':
-                    $value = $this->quoteText($value);
-                    break;
-
-                // Date fields
-                case 'LAST-MODIFIED':
-                case 'CREATED':
-                case 'COMPLETED':
-                    $value = $this->_exportDateTime($value, true);
-                    break;
-
-                case 'DTSTAMP':
-                    $value = $this->_exportDateTime(time(), true);
-                    break;
-
-                case 'DTSTART':
-                    $exdate_time = $value;
-                case 'DTEND':
-                case 'DUE':
-                case 'RECURRENCE-ID':
-                    if (array_key_exists('VALUE', $params)) {
-                        if ($params['VALUE'] === 'DATE') {
-                            $value = $this->_exportDate($value);
-                        } else {
-                            $value = $this->_exportDateTime($value);
-                            $params_str = ';TZID=Europe/Berlin';
-                        }
-                    } else {
-                        $value = $this->_exportDateTime($value);
-                        $params_str = ';TZID=Europe/Berlin';
-                    }
-                    break;
-
-                case 'EXDATE':
-                    if (array_key_exists('VALUE', $params) && $params['VALUE'] === 'DATE') {
-                        $value = $this->exportExDate($value);
-                    } else {
-                        $value = $this->exportExDateTime($value, $exdate_time);
-                        $params_str = ';TZID=Europe/Berlin';
-                    }
-                    break;
-
-                // Integer fields
-                case 'PERCENT-COMPLETE':
-                case 'REPEAT':
-                case 'SEQUENCE':
-                    $value = "$value";
-                    break;
-
-                case 'PRIORITY':
-                    switch ($value) {
-                        case 1:
-                            $value = '1';
-                            break;
-                        case 2:
-                            $value = '5';
-                            break;
-                        case 3:
-                            $value = '9';
-                            break;
-                        default:
-                            $value = '0';
-                    }
-                    break;
-
-                // Geo fields
-                case 'GEO':
-                        $value = $value['latitude'] . ',' . $value['longitude'];
-                    break;
-
-                // Recursion fields
-                case 'EXRULE':
-                case 'RRULE':
-                    if ($value['type'] !== 'SINGLE' && $value['type'] !== '') {
-                        $value = $this->_exportRecurrence($value);
-                    }
-                    break;
-
-                case "UID":
-                    $value = "$value";
-            }
-            if ($name && !is_array($value)) {
-                $attr_string = $name . $params_str . ':' . $value;
-                $result .= $this->foldLine($attr_string) . self::NEWLINE;
-            }
-        }
-        if (isset($properties['GROUP_EVENT'])) {
-            $result .= $this->exportGroupEventProperties($properties['GROUP_EVENT']);
-        }
-        $result .= "END:VEVENT" . self::NEWLINE;
-
-        return $result;
-    }
-
-    /**
-     * Quotes some characters accordingly to iCalendar format.
-     *
-     * @param string $text The text to quote.
-     * @return string The quoted text.
-     */
-    public function quoteText(string $text): string
-    {
-        $match = ['\\', '\n', ';', ','];
-        $replace = ['\\\\', '\\n', '\;', '\,'];
-        return str_replace($match, $replace, $text);
-    }
-
-    /**
-     * Export a DateTime field
-     *
-     * @param int $value Unix timestamp
-     * @return String Date and time (UTC) iCalendar formatted
-     */
-    public function _exportDateTime($value, $utc = false)
-    {
-        $date_time = new DateTime();
-        $date_time->setTimestamp(intval($value));
-        //transform local time to UTC
-        if ($utc) {
-            $tz_utc = new DateTimeZone('UTC');
-            $date_time->setTimezone($tz_utc);
-            return $date_time->format('Ymd\THis\Z');
-        }
-        return $date_time->format('Ymd\THis');
-    }
-
-    /**
-     * Export a Time field
-     *
-     * @param int $value Unix timestamp
-     * @return String Time (UTC) iCalendar formatted
-     */
-    public function _exportTime($value, $utc = false)
-    {
-        $time = date("His", $value);
-        if ($utc) {
-            $time .= 'Z';
-        }
-
-        return $time;
-    }
-
-    /**
-     * Export a Date field
-     */
-    public function _exportDate($value)
-    {
-        return date("Ymd", $value);
-    }
-
-    /**
-     * Export a recurrence rule
-     */
-    public function _exportRecurrence($value)
-    {
-        $rrule = [];
-        // the last day of week in a MONTHLY or YEARLY recurrence in the
-        // Stud.IP calendar is 5, in iCalendar it is -1
-        if ($value['offset'] == '5') {
-            $value['offset'] = '-1';
-        }
-
-        if ($value['count'] > 1) {
-            unset($value['expire']);
-        }
-
-        foreach ($value as $r_param => $r_value) {
-            if ($r_value) {
-                switch ($r_param) {
-                    case 'type':
-                        $rrule[] = 'FREQ=' . $r_value;
-                        break;
-                    case 'expire':
-                        if ($r_value)
-                            $rrule[] = 'UNTIL=' . $this->_exportDateTime($r_value, true);
-                        break;
-                    case 'interval':
-                        $rrule[] = 'INTERVAL=' . $r_value;
-                        break;
-                    case 'days':
-                        switch ($value['type']) {
-                            case 'WEEKLY':
-                                $rrule[] = 'BYDAY=' . $this->_exportWdays($r_value);
-                                break;
-                            // Some CUAs (e.g. Outlook) don't understand the nWDAY syntax
-                            // (where n is the nth ocurrence of the day in a given period of
-                            // time and WDAY is the day of week) the RRULE uses the BYSETPOS
-                            // rule.
-                            case 'MONTHLY':
-                            case 'YEARLY':
-                                $rrule[] = 'BYDAY=' . $value['offset'] . $this->_exportWdays($r_value);
-                                $rrule[] = 'BYDAY=' . $this->_exportWdays($r_value);
-                                if ($value['offset']) {
-                                    $rrule[] = 'BYSETPOS=' . $value['offset'];
-                                }
-                                break;
-                        }
-                        break;
-                    case 'day':
-                        $rrule[] = 'BYMONTHDAY=' . $r_value;
-                        break;
-                    case 'month':
-                        $rrule[] = 'BYMONTH=' . $r_value;
-                        break;
-                    case 'count':
-                        if ($r_value > 1) {
-                            $rrule[] = 'COUNT=' . $r_value;
-                        }
-                        break;
-                }
-            }
-        }
-
-        if ($value['type'] === 'WEEKLY' && self::WEEKSTART != 'MO') {
-            $rrule[] = 'WKST=' . self::WEEKSTART;
-        }
-
-        return implode(';', $rrule);
-    }
-
-    /**
-     * Return the days from CalendarDate::days as attribute of a event recurrence.
-     *
-     * @param string $value
-     * @return string
-     */
-    public function _exportWdays(string $value): string
-    {
-        $wdays_map = ['1' => 'MO', '2' => 'TU', '3' => 'WE', '4' => 'TH', '5' => 'FR',
-            '6' => 'SA', '7' => 'SU'];
-        $wdays = [];
-        preg_match_all('/(\d)/', $value, $matches);
-        foreach ($matches[1] as $match) {
-            $wdays[] = $wdays_map[$match];
-        }
-        return implode(',', $wdays);
-    }
-
-
-    /**
-     * Formats dates of exception.
-     *
-     * @param string $value Date values (Y-m-d) as csv list.
-     * @return string The formatted Exceptions.
-     */
-    public function exportExDate(string $value): string
-    {
-        $ex_dates = [];
-        $dates = explode(',', $value);
-        foreach ($dates as $date) {
-            $ex_datetime = $date . ' 12:00:00';
-            $ex_date = DateTime::createFromFormat('Y-m-d H:i:s', $ex_datetime);
-            $ex_dates[] = $this->_exportDate($ex_date->getTimestamp());
-        }
-
-        return implode(',', $ex_dates);
-    }
-
-    /**
-     * Formats date times of exception.
-     *
-     * @param string $value Date values (Y-m-d) as csv list.
-     * @param int $begin Start date of event as unix timestamp.
-     * @return string The formatted Exceptions.
-     */
-    public function exportExDateTime(string $value, int $begin): string
-    {
-        $ex_dates = [];
-        $dates = explode(',', $value);
-        foreach ($dates as $date) {
-            $ex_datetime = $date . date(' H:i:s', $begin);
-            $date_time = DateTime::createFromFormat('Y-m-d H:i:s', $ex_datetime);
-            $ex_dates[] = $date_time->format('Ymd\THis');
-        }
-        return implode(',', $ex_dates);
-    }
-
-    /**
-     * Returns iCalendar group event properties if the date has mor than one attendee.
-     *
-     * @param CalendarDate $date The date object to extract the group data from.
-     * @return string The formatted group event properties.
-     */
-    private function exportGroupEventProperties(CalendarDate $date): string
-    {
-        if (!count($date->calendars)) {
-            return '';
-        }
-        $organizer = $date->author;
-        if ($organizer) {
-            $properties = $this->foldLine('ORGANIZER;CN="'
-                    . $organizer->getFullName()
-                    . '":mailto:' . $organizer->Email)
-                . self::NEWLINE;
-        } else {
-            $properties = $this->foldLine('ORGANIZER;CN="'
-                    . _('unbekannt')
-                    . '":mailto:' . $GLOBALS['user']->email)
-                . self::NEWLINE;
-        }
-        foreach ($date->calendars as $calendar) {
-            if ($date->author_id === $calendar->range_id) {
-                if ($calendar->user) {
-                    $properties .= $this->foldLine('ATTENDEE;'
-                            . 'ROLE=REQ-PARTICIPANT;'
-                            . 'CN="' . $calendar->user->getFullName()
-                            . '":mailto:' . $calendar->user->Email)
-                        . self::NEWLINE;
-                } else {
-                    $properties = '';
-                }
-            } else {
-                if ($calendar->user) {
-                    switch ($calendar->participation) {
-                        case 'ACCEPTED' :
-                            $attendee = 'ATTENDEE;ROLE=REQ-PARTICIPANT'
-                                . ';PARTSTAT=ACCEPTED';
-                            break;
-                        case 'ACKNOWLEDGED' :
-                            $attendee = 'ATTENDEE;ROLE=NON-PARTICIPANT'
-                                . ';PARTSTAT=ACCEPTED'
-                                . ';DELEGATED-TO="mailto:'
-                                . $this->getFacultyEmail($organizer->id)
-                                . '"';
-                            break;
-                        case 'DECLINED' :
-                            $attendee = 'ATTENDEE;ROLE=REQ-PARTICIPANT'
-                                . ';PARTSTAT=DECLINED';
-                            break;
-                        default :
-                            $attendee = 'ATTENDEE;ROLE=REQ-PARTICIPANT';
-                            $attendee .= ';PARTSTAT=TENTATIVE';
-                            $attendee .= ';RSVP=TRUE';
-
-                    }
-                    $attendee .= ';CN="' . $calendar->user->getFullName()
-                        . '":mailto:' . $calendar->user->Email;
-                    $properties .= $this->foldLine($attendee) . self::NEWLINE;
-                }
-            }
-        }
-        return $properties;
-    }
-
-    /**
-     * @param string $user_id
-     * @return string
-     */
-    private function getFacultyEmail(string $user_id): string
-    {
-        return DBManager::get()->fetchColumn('
-            SELECT `email`
-            FROM `Institute`
-            LEFT JOIN `user_inst` USING(`institut_id`)
-            WHERE `Institute`.`Institut_id` = `fakultaets_id`
-              AND `user_id` = ?', [$user_id]);
-    }
-
-    /**
-     * Returns the folded version of a text line.
-     *
-     * @param string $line
-     * @return string
-     */
-    private function foldLine(string $line): string
-    {
-        $line = preg_replace('/(\r\n|\n|\r)/', '\n', $line);
-        if (mb_strlen($line) > 75) {
-            $foldedline = '';
-            while ($line !== '') {
-                $maxLine = mb_substr($line, 0, 75);
-                $cutPoint = max(60, max(mb_strrpos($maxLine, ';'), mb_strrpos($maxLine, ':')) + 1);
-
-                $foldedline .= ( empty($foldedline)) ?
-                    mb_substr($line, 0, $cutPoint) :
-                    self::NEWLINE . ' ' . mb_substr($line, 0, $cutPoint);
-
-                $line = (mb_strlen($line) <= $cutPoint) ? '' : mb_substr($line, $cutPoint);
-            }
-            return $foldedline;
-        }
-        return $line;
-    }
-}
diff --git a/lib/classes/calendar/ICalendarExport.php b/lib/classes/calendar/ICalendarExport.php
new file mode 100644
index 0000000..00147ef
--- /dev/null
+++ b/lib/classes/calendar/ICalendarExport.php
@@ -0,0 +1,628 @@
+<?php
+/**
+ * ICalendarExport.class.php
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       5.5
+ */
+
+
+class ICalendarExport
+{
+     /**
+     * Line break used in iCalendar
+     */
+    const NEWLINE = "\r\n";
+
+    /**
+     * Default start of the week
+     */
+    const WEEKSTART = 'MO';
+
+    /**
+     * Holds the time (as unix timestamp) used for
+     * the timestamp in every exported iCalendar object.
+     *
+     * @var int $time
+     */
+    private $time = 0;
+
+    public function __construct()
+    {
+        $this->default_filename_suffix = "ics";
+        $this->format = "iCalendar";
+    }
+
+    public function exportCalendarDates(string $range_id, DateTimeInterface $start, DateTimeInterface $end): string
+    {
+        if ($this->time === 0) {
+            $this->time = time();
+        }
+        $dates = CalendarDate::findBySQL(
+            "LEFT JOIN `calendar_date_assignments`
+                ON `calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`
+            WHERE
+                `calendar_date_assignments`.`range_id` = :range_id
+                AND (
+                    (`calendar_dates`.`begin` <= :end
+                        AND `calendar_dates`.`end` >= :begin)
+                    OR (`calendar_dates`.`repetition_type` != 'SINGLE'
+                        AND (`calendar_dates`.`repetition_end` >= :begin
+                            OR `calendar_dates`.`repetition_end` = 0)
+                    AND `calendar_dates`.`begin` < :end))",
+            [
+                ':range_id' => $range_id,
+                ':begin'    => $start->getTimestamp(),
+                ':end'      => $end->getTimestamp(),
+            ]
+        );
+        $ical = '';
+        foreach ($dates as $date) {
+            $ical .= $this->writeICalEvent($this->prepareCalendarDate($date));
+        }
+        return $ical;
+    }
+
+    public function exportCourseDates(string $user_id, DateTimeInterface $start, DateTimeInterface $end)
+    {
+        if ($this->time === 0) {
+            $this->time = time();
+        }
+        $dates = CalendarCourseDate::getEvents($start, $end, $user_id);
+        $ical = '';
+        foreach ($dates as $date) {
+            $ical .= $this->writeICalEvent($this->prepareCourseDate($date));
+        }
+        return $ical;
+    }
+
+    public function exportCourseExDates(string $user_id, DateTimeInterface $start, DateTimeInterface $end)
+    {
+        if ($this->time === 0) {
+            $this->time = time();
+        }
+        $dates = CalendarCourseExDate::getEvents($start, $end, $user_id);
+        $ical = '';
+        foreach ($dates as $date) {
+            $ical .= $this->writeICalEvent($this->prepareCourseDate($date));
+        }
+        return $ical;
+    }
+
+    /**
+     * @param CalendarDate $date The calendar date to export.
+     * @return array Calendar date data prepared for export.
+     */
+    public function prepareCalendarDate(CalendarDate $date): array
+    {
+        return [
+            'SUMMARY'       => $date->title,
+            'DESCRIPTION'   => $date->description,
+            'LOCATION'      => $date->location,
+            'CATEGORIES'    => $date->getCategoryAsString(),
+            'LAST-MODIFIED' => $date->chdate,
+            'CREATED'       => $date->mkdate,
+            'DTSTAMP'       => $this->time,
+            'DTSTART'       => $date->begin,
+            'DTEND'         => $date->end,
+            'EXDATE'        => implode(',', $date->exceptions->pluck('date')),
+            'PRIORITY'      => 5,
+            'RRULE'         => [
+                'type'      => $date->repetition_type,
+                'offset'    => $date->offset,
+                'interval'  => $date->interval,
+                'days'      => $date->days,
+                'count'     => $date->number_of_dates,
+                'expire'    => $date->repetition_end,
+                'month'     => $date->month
+            ],
+            'UID'           => $date->unique_id
+        ];
+    }
+
+    /**
+     * @param CourseDate | CourseExDate $date The course date to export.
+     * @return array Course date data prepared for export.
+     */
+    public function prepareCourseDate($date): array
+    {
+        $summary = $date->course->getFullName();
+        $categories = $date->getTypeName();
+        if ($date instanceof CourseExDate) {
+            $summary .= ' ' . _('(fällt aus)');
+            $categories = '';
+            $description = $date->content;
+        } else {
+            $description = implode("\n", $date->topics->pluck('title'));
+        }
+        return [
+            'SUMMARY'       => $summary,
+            'DESCRIPTION'   => $description,
+            'LOCATION'      => $date->getRoomName(),
+            'CATEGORIES'    => $categories,
+            'LAST-MODIFIED' => $date->chdate,
+            'CREATED'       => $date->mkdate,
+            'DTSTAMP'       => $this->time,
+            'DTSTART'       => $date->date,
+            'DTEND'         => $date->end_time,
+            'PRIORITY'      => '',
+            'UID'           => 'Stud.IP-SEM-' . $date->id . '@' . ($_SERVER['SERVER_NAME'] ?? '')
+        ];
+    }
+
+    /**
+     * Returns an iCalendar header with a rudimentary time zone definition.
+     *
+     * @return string The iCalendar header.
+     */
+    public function writeHeader()
+    {
+        // Default values
+        $header = "BEGIN:VCALENDAR" . self::NEWLINE;
+        $header .= "VERSION:2.0" . self::NEWLINE;
+        if (isset($this->client_identifier)) {
+            $header .= "PRODID:" . $this->client_identifier . self::NEWLINE;
+        } else {
+            $server_name = $_SERVER['SERVER_NAME'] ?? 'unknown';
+
+            $header .= "PRODID:-//Stud.IP@{$server_name}//Stud.IP_iCalendar Library";
+            $header .= " //EN" . self::NEWLINE;
+        }
+        $header .= "METHOD:PUBLISH" . self::NEWLINE;
+
+        // time zone definition CET/CEST
+        $header .= 'CALSCALE:GREGORIAN' . self::NEWLINE
+            . 'BEGIN:VTIMEZONE' . self::NEWLINE
+            . 'TZID:Europe/Berlin' . self::NEWLINE
+            . 'BEGIN:DAYLIGHT' . self::NEWLINE
+            . 'TZOFFSETFROM:+0100' . self::NEWLINE
+            . 'TZOFFSETTO:+0200' . self::NEWLINE
+            . 'TZNAME:CEST' . self::NEWLINE
+            . 'DTSTART:19700329T020000' . self::NEWLINE
+            . 'RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3' . self::NEWLINE
+            . 'END:DAYLIGHT' . self::NEWLINE
+            . 'BEGIN:STANDARD' . self::NEWLINE
+            . 'TZOFFSETFROM:+0200' . self::NEWLINE
+            . 'TZOFFSETTO:+0100' . self::NEWLINE
+            . 'TZNAME:CET' . self::NEWLINE
+            . 'DTSTART:19701025T030000' . self::NEWLINE
+            . 'RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10' . self::NEWLINE
+            . 'END:STANDARD' . self::NEWLINE
+            . 'END:VTIMEZONE' .self::NEWLINE;
+
+        return $header;
+    }
+
+    /**
+     * Returns the footer.
+     *
+     * @return string
+     */
+    public function writeFooter()
+    {
+        return "END:VCALENDAR" . self::NEWLINE;
+    }
+
+    /**
+     * Export prepared calendar data as iCalendar.
+     *
+     * @param array $properties The event to export.
+     * @return string iCalendar formatted data
+     */
+    public function writeICalEvent(array $properties): string
+    {
+        $result = "BEGIN:VEVENT" . self::NEWLINE;
+
+        foreach ($properties as $name => $value) {
+            $params = [];
+            $params_str = '';
+            if ($value === '' || is_null($value)) {
+                continue;
+            }
+            switch ($name) {
+                // not supported event properties
+                case 'SEMNAME':
+                    continue 2;
+
+                // Text fields
+                case 'SUMMARY':
+                    $value = $this->quoteText($value);
+                    break;
+                case 'DESCRIPTION':
+                    $value = $this->quoteText($value);
+                    break;
+                case 'LOCATION':
+                    $value = $this->quoteText($value);
+                    break;
+                case 'CATEGORIES':
+                    $value = $this->quoteText($value);
+                    break;
+
+                // Date fields
+                case 'LAST-MODIFIED':
+                case 'CREATED':
+                case 'COMPLETED':
+                    $value = $this->_exportDateTime($value, true);
+                    break;
+
+                case 'DTSTAMP':
+                    $value = $this->_exportDateTime(time(), true);
+                    break;
+
+                case 'DTSTART':
+                    $exdate_time = $value;
+                case 'DTEND':
+                case 'DUE':
+                case 'RECURRENCE-ID':
+                    if (array_key_exists('VALUE', $params)) {
+                        if ($params['VALUE'] === 'DATE') {
+                            $value = $this->_exportDate($value);
+                        } else {
+                            $value = $this->_exportDateTime($value);
+                            $params_str = ';TZID=Europe/Berlin';
+                        }
+                    } else {
+                        $value = $this->_exportDateTime($value);
+                        $params_str = ';TZID=Europe/Berlin';
+                    }
+                    break;
+
+                case 'EXDATE':
+                    if (array_key_exists('VALUE', $params) && $params['VALUE'] === 'DATE') {
+                        $value = $this->exportExDate($value);
+                    } else {
+                        $value = $this->exportExDateTime($value, $exdate_time);
+                        $params_str = ';TZID=Europe/Berlin';
+                    }
+                    break;
+
+                // Integer fields
+                case 'PERCENT-COMPLETE':
+                case 'REPEAT':
+                case 'SEQUENCE':
+                    $value = "$value";
+                    break;
+
+                case 'PRIORITY':
+                    switch ($value) {
+                        case 1:
+                            $value = '1';
+                            break;
+                        case 2:
+                            $value = '5';
+                            break;
+                        case 3:
+                            $value = '9';
+                            break;
+                        default:
+                            $value = '0';
+                    }
+                    break;
+
+                // Geo fields
+                case 'GEO':
+                        $value = $value['latitude'] . ',' . $value['longitude'];
+                    break;
+
+                // Recursion fields
+                case 'EXRULE':
+                case 'RRULE':
+                    if ($value['type'] !== 'SINGLE' && $value['type'] !== '') {
+                        $value = $this->_exportRecurrence($value);
+                    }
+                    break;
+
+                case "UID":
+                    $value = "$value";
+            }
+            if ($name && !is_array($value)) {
+                $attr_string = $name . $params_str . ':' . $value;
+                $result .= $this->foldLine($attr_string) . self::NEWLINE;
+            }
+        }
+        if (isset($properties['GROUP_EVENT'])) {
+            $result .= $this->exportGroupEventProperties($properties['GROUP_EVENT']);
+        }
+        $result .= "END:VEVENT" . self::NEWLINE;
+
+        return $result;
+    }
+
+    /**
+     * Quotes some characters accordingly to iCalendar format.
+     *
+     * @param string $text The text to quote.
+     * @return string The quoted text.
+     */
+    public function quoteText(string $text): string
+    {
+        $match = ['\\', '\n', ';', ','];
+        $replace = ['\\\\', '\\n', '\;', '\,'];
+        return str_replace($match, $replace, $text);
+    }
+
+    /**
+     * Export a DateTime field
+     *
+     * @param int $value Unix timestamp
+     * @return String Date and time (UTC) iCalendar formatted
+     */
+    public function _exportDateTime($value, $utc = false)
+    {
+        $date_time = new DateTime();
+        $date_time->setTimestamp(intval($value));
+        //transform local time to UTC
+        if ($utc) {
+            $tz_utc = new DateTimeZone('UTC');
+            $date_time->setTimezone($tz_utc);
+            return $date_time->format('Ymd\THis\Z');
+        }
+        return $date_time->format('Ymd\THis');
+    }
+
+    /**
+     * Export a Time field
+     *
+     * @param int $value Unix timestamp
+     * @return String Time (UTC) iCalendar formatted
+     */
+    public function _exportTime($value, $utc = false)
+    {
+        $time = date("His", $value);
+        if ($utc) {
+            $time .= 'Z';
+        }
+
+        return $time;
+    }
+
+    /**
+     * Export a Date field
+     */
+    public function _exportDate($value)
+    {
+        return date("Ymd", $value);
+    }
+
+    /**
+     * Export a recurrence rule
+     */
+    public function _exportRecurrence($value)
+    {
+        $rrule = [];
+        // the last day of week in a MONTHLY or YEARLY recurrence in the
+        // Stud.IP calendar is 5, in iCalendar it is -1
+        if ($value['offset'] == '5') {
+            $value['offset'] = '-1';
+        }
+
+        if ($value['count'] > 1) {
+            unset($value['expire']);
+        }
+
+        foreach ($value as $r_param => $r_value) {
+            if ($r_value) {
+                switch ($r_param) {
+                    case 'type':
+                        $rrule[] = 'FREQ=' . $r_value;
+                        break;
+                    case 'expire':
+                        if ($r_value)
+                            $rrule[] = 'UNTIL=' . $this->_exportDateTime($r_value, true);
+                        break;
+                    case 'interval':
+                        $rrule[] = 'INTERVAL=' . $r_value;
+                        break;
+                    case 'days':
+                        switch ($value['type']) {
+                            case 'WEEKLY':
+                                $rrule[] = 'BYDAY=' . $this->_exportWdays($r_value);
+                                break;
+                            // Some CUAs (e.g. Outlook) don't understand the nWDAY syntax
+                            // (where n is the nth ocurrence of the day in a given period of
+                            // time and WDAY is the day of week) the RRULE uses the BYSETPOS
+                            // rule.
+                            case 'MONTHLY':
+                            case 'YEARLY':
+                                $rrule[] = 'BYDAY=' . $value['offset'] . $this->_exportWdays($r_value);
+                                $rrule[] = 'BYDAY=' . $this->_exportWdays($r_value);
+                                if ($value['offset']) {
+                                    $rrule[] = 'BYSETPOS=' . $value['offset'];
+                                }
+                                break;
+                        }
+                        break;
+                    case 'day':
+                        $rrule[] = 'BYMONTHDAY=' . $r_value;
+                        break;
+                    case 'month':
+                        $rrule[] = 'BYMONTH=' . $r_value;
+                        break;
+                    case 'count':
+                        if ($r_value > 1) {
+                            $rrule[] = 'COUNT=' . $r_value;
+                        }
+                        break;
+                }
+            }
+        }
+
+        if ($value['type'] === 'WEEKLY' && self::WEEKSTART != 'MO') {
+            $rrule[] = 'WKST=' . self::WEEKSTART;
+        }
+
+        return implode(';', $rrule);
+    }
+
+    /**
+     * Return the days from CalendarDate::days as attribute of a event recurrence.
+     *
+     * @param string $value
+     * @return string
+     */
+    public function _exportWdays(string $value): string
+    {
+        $wdays_map = ['1' => 'MO', '2' => 'TU', '3' => 'WE', '4' => 'TH', '5' => 'FR',
+            '6' => 'SA', '7' => 'SU'];
+        $wdays = [];
+        preg_match_all('/(\d)/', $value, $matches);
+        foreach ($matches[1] as $match) {
+            $wdays[] = $wdays_map[$match];
+        }
+        return implode(',', $wdays);
+    }
+
+
+    /**
+     * Formats dates of exception.
+     *
+     * @param string $value Date values (Y-m-d) as csv list.
+     * @return string The formatted Exceptions.
+     */
+    public function exportExDate(string $value): string
+    {
+        $ex_dates = [];
+        $dates = explode(',', $value);
+        foreach ($dates as $date) {
+            $ex_datetime = $date . ' 12:00:00';
+            $ex_date = DateTime::createFromFormat('Y-m-d H:i:s', $ex_datetime);
+            $ex_dates[] = $this->_exportDate($ex_date->getTimestamp());
+        }
+
+        return implode(',', $ex_dates);
+    }
+
+    /**
+     * Formats date times of exception.
+     *
+     * @param string $value Date values (Y-m-d) as csv list.
+     * @param int $begin Start date of event as unix timestamp.
+     * @return string The formatted Exceptions.
+     */
+    public function exportExDateTime(string $value, int $begin): string
+    {
+        $ex_dates = [];
+        $dates = explode(',', $value);
+        foreach ($dates as $date) {
+            $ex_datetime = $date . date(' H:i:s', $begin);
+            $date_time = DateTime::createFromFormat('Y-m-d H:i:s', $ex_datetime);
+            $ex_dates[] = $date_time->format('Ymd\THis');
+        }
+        return implode(',', $ex_dates);
+    }
+
+    /**
+     * Returns iCalendar group event properties if the date has mor than one attendee.
+     *
+     * @param CalendarDate $date The date object to extract the group data from.
+     * @return string The formatted group event properties.
+     */
+    private function exportGroupEventProperties(CalendarDate $date): string
+    {
+        if (!count($date->calendars)) {
+            return '';
+        }
+        $organizer = $date->author;
+        if ($organizer) {
+            $properties = $this->foldLine('ORGANIZER;CN="'
+                    . $organizer->getFullName()
+                    . '":mailto:' . $organizer->Email)
+                . self::NEWLINE;
+        } else {
+            $properties = $this->foldLine('ORGANIZER;CN="'
+                    . _('unbekannt')
+                    . '":mailto:' . $GLOBALS['user']->email)
+                . self::NEWLINE;
+        }
+        foreach ($date->calendars as $calendar) {
+            if ($date->author_id === $calendar->range_id) {
+                if ($calendar->user) {
+                    $properties .= $this->foldLine('ATTENDEE;'
+                            . 'ROLE=REQ-PARTICIPANT;'
+                            . 'CN="' . $calendar->user->getFullName()
+                            . '":mailto:' . $calendar->user->Email)
+                        . self::NEWLINE;
+                } else {
+                    $properties = '';
+                }
+            } else {
+                if ($calendar->user) {
+                    switch ($calendar->participation) {
+                        case 'ACCEPTED' :
+                            $attendee = 'ATTENDEE;ROLE=REQ-PARTICIPANT'
+                                . ';PARTSTAT=ACCEPTED';
+                            break;
+                        case 'ACKNOWLEDGED' :
+                            $attendee = 'ATTENDEE;ROLE=NON-PARTICIPANT'
+                                . ';PARTSTAT=ACCEPTED'
+                                . ';DELEGATED-TO="mailto:'
+                                . $this->getFacultyEmail($organizer->id)
+                                . '"';
+                            break;
+                        case 'DECLINED' :
+                            $attendee = 'ATTENDEE;ROLE=REQ-PARTICIPANT'
+                                . ';PARTSTAT=DECLINED';
+                            break;
+                        default :
+                            $attendee = 'ATTENDEE;ROLE=REQ-PARTICIPANT';
+                            $attendee .= ';PARTSTAT=TENTATIVE';
+                            $attendee .= ';RSVP=TRUE';
+
+                    }
+                    $attendee .= ';CN="' . $calendar->user->getFullName()
+                        . '":mailto:' . $calendar->user->Email;
+                    $properties .= $this->foldLine($attendee) . self::NEWLINE;
+                }
+            }
+        }
+        return $properties;
+    }
+
+    /**
+     * @param string $user_id
+     * @return string
+     */
+    private function getFacultyEmail(string $user_id): string
+    {
+        return DBManager::get()->fetchColumn('
+            SELECT `email`
+            FROM `Institute`
+            LEFT JOIN `user_inst` USING(`institut_id`)
+            WHERE `Institute`.`Institut_id` = `fakultaets_id`
+              AND `user_id` = ?', [$user_id]);
+    }
+
+    /**
+     * Returns the folded version of a text line.
+     *
+     * @param string $line
+     * @return string
+     */
+    private function foldLine(string $line): string
+    {
+        $line = preg_replace('/(\r\n|\n|\r)/', '\n', $line);
+        if (mb_strlen($line) > 75) {
+            $foldedline = '';
+            while ($line !== '') {
+                $maxLine = mb_substr($line, 0, 75);
+                $cutPoint = max(60, max(mb_strrpos($maxLine, ';'), mb_strrpos($maxLine, ':')) + 1);
+
+                $foldedline .= ( empty($foldedline)) ?
+                    mb_substr($line, 0, $cutPoint) :
+                    self::NEWLINE . ' ' . mb_substr($line, 0, $cutPoint);
+
+                $line = (mb_strlen($line) <= $cutPoint) ? '' : mb_substr($line, $cutPoint);
+            }
+            return $foldedline;
+        }
+        return $line;
+    }
+}
diff --git a/lib/classes/calendar/ICalendarImport.class.php b/lib/classes/calendar/ICalendarImport.class.php
deleted file mode 100644
index e78696d..0000000
--- a/lib/classes/calendar/ICalendarImport.class.php
+++ /dev/null
@@ -1,678 +0,0 @@
-<?php
-class ICalendarImport
-{
-    private $range_id;
-
-    private $count = 0;
-
-    private $dates = [];
-
-    private $import_time;
-
-    private $convert_to_private = false;
-
-    public function __construct($range_id)
-    {
-        $this->range_id = $range_id;
-        $this->import_time = time();
-    }
-
-    public function import($ical_data)
-    {
-        $this->parse($ical_data);
-    }
-
-    public function countEvents($ical_data)
-    {
-        $matches = [];
-        if (is_null($this->count)) {
-            // Unfold any folded lines
-            $data = preg_replace('/\x0D?\x0A[\x20\x09]/', '', $ical_data);
-            preg_match_all('/(BEGIN:VEVENT(\r\n|\r|\n)[\W\w]*?END:VEVENT\r?\n?)/', $ical_data, $matches);
-            $this->count = sizeof($matches[1]);
-        }
-
-        return $this->count;
-    }
-
-    public function getCountEvents() : int
-    {
-        return (int) $this->count;
-    }
-
-    public function convertPublicToPrivate(bool $to_private = true) : void
-    {
-        $this->convert_to_private = $to_private;
-    }
-
-    /**
-     * Parse a string containing vCalendar data.
-     *
-     * @access private
-     * @param string $data  The data to parse
-     */
-    public function parse(string $data)
-    {
-        // match categories
-        $studip_categories = [];
-        $i = 1;
-        foreach ($GLOBALS['PERS_TERMIN_KAT'] as $cat) {
-            $studip_categories[mb_strtolower($cat['name'])] = $i++;
-        }
-
-        // Unfold any folded lines
-        // the CR is optional for files imported from Korganizer (non-standard)
-        $data = $this->unfoldLine($data);
-
-        if (!preg_match('/BEGIN:VCALENDAR(\r\n|\r|\n)([\W\w]*)END:VCALENDAR\r?\n?/', $data, $matches)) {
-            throw new UnexpectedValueException();
-        }
-
-        // client identifier
-        if (!$this->parseClientIdentifier($matches[2])) {
-            throw new UnexpectedValueException();
-        }
-
-        // All sub components
-        if (!preg_match_all('/BEGIN:VEVENT(\r\n|\r|\n)([\w\W]*?)END:VEVENT(\r\n|\r|\n)/', $matches[2], $v_events)) {
-            // _("Die importierte Datei enthält keine Termine.")
-            throw new UnexpectedValueException();
-        }
-
-        if ($this->count) {
-            $this->count = 0;
-        }
-        foreach ($v_events[2] as $v_event) {
-
-            if (preg_match_all('/(.*):(.*)(\r|\n)+/', $v_event, $matches)) {
-                $properties = [];
-                $check = [];
-                foreach ($matches[0] as $property) {
-                    preg_match('/([^;^:]*)((;[^:]*)?):(.*)/', $property, $parts);
-                    $tag = $parts[1];
-                    $value = $parts[4];
-                    $params = [];
-
-                    // skip seminar events
-                    if ((!$this->import_sem) && $tag == 'UID') {
-                        if (mb_strpos($value, 'Stud.IP-SEM') === 0) {
-                            continue 2;
-                        }
-                    }
-
-                    if (!empty($parts[2])) {
-                        preg_match_all('/;(([^;=]*)(=([^;]*))?)/', $parts[2], $param_parts);
-                        foreach ($param_parts[2] as $key => $param_name)
-                            $params[mb_strtoupper($param_name)] = mb_strtoupper($param_parts[4][$key]);
-
-                        if ($params['ENCODING']) {
-                            switch ($params['ENCODING']) {
-                                case 'QUOTED-PRINTABLE':
-                                    $value = $this->qp_decode($value);
-                                    break;
-
-                                case 'BASE64':
-                                    $value = base64_decode($value);
-                                    break;
-                            }
-                        }
-                    }
-
-                    switch ($tag) {
-                        // text fields
-                        case 'DESCRIPTION':
-                        case 'SUMMARY':
-                        case 'LOCATION':
-                            $value = preg_replace('/\\\\,/', ',', $value);
-                            $value = preg_replace('/\\\\n/', "\n", $value);
-                            $properties[$tag] = trim($value);
-                            break;
-
-                        case 'CATEGORIES':
-                            $categories = [];
-                            $properties['STUDIP_CATEGORY'] = null;
-                            foreach (explode(',', $value) as $category) {
-                                if (!$studip_categories[mb_strtolower($category)]) {
-                                    $categories[] = $category;
-                                } else if (!$properties['STUDIP_CATEGORY']) {
-                                    $properties['STUDIP_CATEGORY']
-                                        = $studip_categories[mb_strtolower($category)];
-                                }
-                            }
-                            $properties[$tag] = implode(',', $categories);
-                            break;
-
-                        // Date fields
-                        case 'DCREATED': // vCalendar property name for "CREATED"
-                        case 'DTSTAMP':
-                        case 'COMPLETED':
-                        case 'CREATED':
-                        case 'LAST-MODIFIED':
-                            $properties[$tag] = $this->parseDateTime($value);
-                            break;
-
-                        case 'DTSTART':
-                        case 'DTEND':
-                            // checking for day events
-                            if ($params['VALUE'] == 'DATE')
-                                $check['DAY_EVENT'] = true;
-                        case 'DUE':
-                        case 'RECURRENCE-ID':
-                            $properties[$tag] = $this->parseDateTime($value);
-                            break;
-
-                        case 'RDATE':
-                            if (array_key_exists('VALUE', $params)) {
-                                if ($params['VALUE'] == 'PERIOD') {
-                                    $properties[$tag] = $this->parsePeriod($value);
-                                } else {
-                                    $properties[$tag] = $this->parseDateTime($value);
-                                }
-                            } else {
-                                $properties[$tag] = $this->parseDateTime($value);
-                            }
-                            break;
-
-                        case 'TRIGGER':
-                            if (array_key_exists('VALUE', $params)) {
-                                if ($params['VALUE'] == 'DATE-TIME') {
-                                    $properties[$tag] = $this->parseDateTime($value);
-                                } else {
-                                    $properties[$tag] = $this->parseDuration($value);
-                                }
-                            } else {
-                                $properties[$tag] = $this->parseDuration($value);
-                            }
-                            break;
-
-                        case 'EXDATE':
-                            $properties[$tag] = [];
-                            // comma seperated dates
-                            $values = [];
-                            $dates = [];
-                            preg_match_all('/,([^,]*)/', ',' . $value, $values);
-                            foreach ($values[1] as $value) {
-                                if (array_key_exists('VALUE', $params)) {
-                                    if ($params['VALUE'] == 'DATE-TIME') {
-                                        $dates[] = $this->parseDateTime($value);
-                                    } else if ($params['VALUE'] == 'DATE') {
-                                        $dates[] = $this->parseDate($value);
-                                    }
-                                } else {
-                                    $dates[] = $this->parseDateTime($value);
-                                }
-                            }
-                            // some iCalendar exports (e.g. KOrganizer) use an EXDATE-entry for every
-                            // exception, so we have to merge them
-                            array_merge($properties[$tag], $dates);
-                            break;
-
-                        // Duration fields
-                        case 'DURATION':
-                            $attibutes[$tag] = $this->parseDuration($value);
-                            break;
-
-                        // Period of time fields
-                        case 'FREEBUSY':
-                            $values = [];
-                            $periods = [];
-                            preg_match_all('/,([^,]*)/', ',' . $value, $values);
-                            foreach ($values[1] as $value) {
-                                $periods[] = $this->parsePeriod($value);
-                            }
-
-                            $properties[$tag] = $periods;
-                            break;
-
-                        // UTC offset fields
-                        case 'TZOFFSETFROM':
-                        case 'TZOFFSETTO':
-                            $properties[$tag] = $this->parseUtcOffset($value);
-                            break;
-
-                        case 'PRIORITY':
-                            $properties[$tag] = $this->parsePriority($value);
-                            break;
-
-                        case 'CLASS':
-                            switch (trim($value)) {
-                                case 'PUBLIC':
-                                    $properties[$tag] = 'PUBLIC';
-                                    break;
-                                case 'CONFIDENTIAL':
-                                    $properties[$tag] = 'CONFIDENTIAL';
-                                    break;
-                                default:
-                                    $properties[$tag] = 'PRIVATE';
-                            }
-                            break;
-
-                        // Integer fields
-                        case 'PERCENT-COMPLETE':
-                        case 'REPEAT':
-                        case 'SEQUENCE':
-                            $properties[$tag] = intval($value);
-                            break;
-
-                        // Geo fields
-                        case 'GEO':
-                            $floats = explode(';', $value);
-                            $value['latitude'] = floatval($floats[0]);
-                            $value['longitude'] = floatval($floats[1]);
-                            $properties[$tag] = $value;
-                            break;
-
-                        // Recursion fields
-                        case 'EXRULE':
-                        case 'RRULE':
-                            $properties[$tag] = $this->parseRecurrence($value);
-                            break;
-
-                        default:
-                            // string fields
-                            $properties[$tag] = trim($value);
-                            break;
-                    }
-                }
-
-                if (!$properties['RRULE']['rtype']) {
-                    $properties['RRULE'] = ['rtype' => 'SINGLE'];
-                }
-
-                if (!$properties['LAST-MODIFIED']) {
-                    $properties['LAST-MODIFIED'] = $properties['DTSTAMP'] ?: $properties['CREATED'] ?? time();
-                }
-
-                if (!$properties['DTSTART'] || ($properties['EXDATE'] && !$properties['RRULE'])) {
-                    // _("Die Datei ist keine gültige iCalendar-Datei!")
-                    throw new UnexpectedValueException();
-                }
-
-                if (!$properties['DTEND']) {
-                    $properties['DTEND'] = $properties['DTSTART'];
-                }
-
-                // day events starts at 00:00:00 and ends at 23:59:59
-                if ($check['DAY_EVENT'])
-                    $properties['DTEND']--;
-
-                // default: all imported events are set to private
-                if (!$properties['CLASS']
-                    || ($this->convert_to_private && $properties['CLASS'] == 'PUBLIC')) {
-                    $properties['CLASS'] = 'PRIVATE';
-                }
-
-                /*
-                if (isset($studip_categories[$properties['CATEGORIES']])) {
-                    $properties['STUDIP_CATEGORY'] = $studip_categories[$properties['CATEGORIES']];
-                    $properties['CATEGORIES'] = '';
-                }
-                 *
-                 */
-
-                $this->createDateFromProperties($properties);
-            } else {
-                // _("Die Datei ist keine gültige iCalendar-Datei!")
-                throw new InvalidValuesException();
-            }
-            $this->count++;
-        }
-
-        return true;
-    }
-
-    private function createDateFromProperties($properties)
-    {
-        $date = CalendarDate::findOneBySQL(
-            'LEFT JOIN `calendar_date_assignments`
-              ON `calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`
-            WHERE `calendar_dates`.`unique_id` = :uid
-              AND `calendar_date_assignments`.`range_id` = :range_id',
-            [
-                ':uid'      => $properties['UID'],
-                ':range_id' => $this->range_id
-            ]
-        );
-
-        if (!$date) {
-            $date = new CalendarDate();
-            $date->id = $date->getNewId();
-            $date->author_id = $this->range_id;
-            $date->editor_id = $this->range_id;
-            $range_date = new CalendarDateAssignment();
-            $range_date->range_id = $this->range_id;
-            $range_date->participation = '';
-            $date->calendars[] = $range_date;
-        }
-
-        $date->begin = $properties['DTSTART']->getTimestamp();
-        $date->end = $properties['DTEND']->getTimestamp();
-        $date->title = $properties['SUMMARY'];
-        $date->description = $properties['DESCRIPTION'];
-        $date->access = $properties['CLASS'] ?? 'PRIVATE';
-        $date->user_category = $properties['CATEGORIES'];
-        $date->category = $properties['STUDIP_CATEGORY'] ?: 1;
-        $date->priority = $properties['PRIORITY'] ?? '';
-        $date->location = $properties['LOCATION'];
-        if (is_array($properties['EXDATE'])) {
-            foreach ($properties['EXDATE'] as $exdate) {
-                $exception = new CalendarDateException();
-                $exception->date = $exdate->format('Y-m-d');
-                $date->exceptions[] = $exception;
-            }
-        }
-        $date->mkdate = $properties['CREATED'] ? $properties['CREATED']->getTimestamp() : time();
-        if (isset($properties['LAST-MODIFIED'])) {
-            $date->chdate = $properties['LAST-MODIFIED']->getTimestamp();
-        } else {
-            $date->chdate = $date->mkdate;
-        }
-        $date->import_date = $this->import_time;
-        $date->unique_id = $properties['UID'];
-
-        $this->setRecurrenceRule($date, $properties['RRULE']);
-        $date->store();
-    }
-
-    private function setRecurrenceRule(CalendarDate $date, $rrule)
-    {
-        $date->interval = $rrule['linterval'] ?? 1;
-        if (strlen($rrule['wdays'] ?? '')) {
-            $date->offset = $rrule['sinterval'] ?? 0;
-            $date->days = $rrule['wdays'] ?? null;
-        } else {
-            $date->offset = $rrule['day'] ?? 0;
-            $date->days = $rrule['sinterval'] ?? null;
-        }
-        $date->month = $rrule['month'] ?? null;
-        $date->repetition_type = $rrule['rtype'] ?? 'SINGLE';
-        $date->number_of_dates = $rrule['count'] ?? 1;
-        $date->repetition_end = $rrule['expire'] ?? 0;
-    }
-
-    private function unfoldLine($data)
-    {
-        return preg_replace('/\x0D?\x0A[\x20\x09]/', '', $data);
-    }
-
-    /**
-     * Parse a UTC Offset field
-     */
-    private function parseUtcOffset($offset_text)
-    {
-        $offset = 0;
-        if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $offset_text, $matches)) {
-            $offset += 3600 * intval($matches[2]);
-            $offset += 60 * intval($matches[3]);
-            $offset *= ( $matches[1] == '+' ? 1 : -1);
-            if (array_key_exists(4, $matches)) {
-                $offset += intval($matches[4]);
-            }
-        }
-        return $offset;
-    }
-
-    /**
-     * Parse a Time Period field
-     */
-    private function parsePeriod($period_text): array
-    {
-        $matches = explode('/', $period_text);
-
-        $start = $this->parseDateTime($matches[0]);
-
-        if ($duration = $this->parseDuration($matches[1])) {
-            return ['start' => $start, 'duration' => $duration];
-        } else if ($end = $this->parseDateTime($matches[1])) {
-            return ['start' => $start, 'end' => $end];
-        }
-        return [];
-    }
-
-    /**
-     * Parse a DateTime field
-     */
-    private function parseDateTime(String $date_time)
-    {
-        $parts = explode('T', $date_time);
-        if (count($parts) != 2) {
-            // not a date time string but may be just a date string
-            $date = $this->parseDate($date_time);
-            return DateTimeImmutable::createFromFormat('YmdHis', implode('', $date) . '000000');
-        }
-
-        $date = $this->parseDate($parts[0]);
-        $time = $this->parseTime($parts[1]);
-
-        if ($time['zone'] == 'UTC') {
-            $time_zone = new DateTimeZone('UTC');
-        } else {
-            $time_zone = new DateTimeZone('Europe/Berlin');
-        }
-        return DateTimeImmutable::createFromFormat(
-            'YmdHis',
-            implode('', $date) . $time['hour'] . $time['minute'] . $time['second'],
-            $time_zone
-        );
-    }
-
-    /**
-     * Parse a Time field
-     */
-    private function parseTime($time_text): array
-    {
-        $matches = [];
-        if (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})(Z)?/', $time_text, $matches)) {
-            $time['hour'] = $matches[1];
-            $time['minute'] = $matches[2];
-            $time['second'] = $matches[3];
-            if (array_key_exists(4, $matches)) {
-                $time['zone'] = 'UTC';
-            } else {
-                $time['zone'] = 'LOCAL';
-            }
-            return $time;
-        }
-        throw new InvalidValuesException();
-    }
-
-    /**
-     * Parse a Date field
-     */
-    private function parseDate($date_text): array
-    {
-        $matches = [];
-        if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $date_text, $matches)) {
-            $date['year'] = $matches[1];
-            $date['month'] = $matches[2];
-            $date['mday'] = $matches[3];
-            return $date;
-        }
-        throw new InvalidValuesException();
-    }
-
-    /**
-     * Parse a Duration Value field
-     */
-    private function parseDuration($interval_text): DateInterval
-    {
-        return new DateInterval($interval_text);
-    }
-
-    private function parsePriority($value)
-    {
-        $value = intval($value);
-        if ($value > 0 && $value < 5) {
-            return 'HIGH';
-        }
-
-        if ($value == 5) {
-            return 'MEDIUM';
-        }
-
-        if ($value > 5 && $value < 10) {
-            return 'LOW';
-        }
-
-        return '';
-    }
-
-    /**
-     * Parse a recurrence rule.
-     *
-     * @param $text string The text of the recurrence rule.
-     * @return array The translated recurrence rule as array.
-     * @throws InvalidValuesException
-     */
-    private function parseRecurrence($text): array
-    {
-        global $_calendar_error;
-
-        if (preg_match_all('/([A-Za-z]*?)=([^;]*);?/', $text, $matches, PREG_SET_ORDER)) {
-            $r_rule = [];
-
-            foreach ($matches as $match) {
-                switch ($match[1]) {
-                    case 'FREQ' :
-                        switch (trim($match[2])) {
-                            case 'DAILY' :
-                            case 'WEEKLY' :
-                            case 'MONTHLY' :
-                            case 'YEARLY' :
-                                $r_rule['rtype'] = trim($match[2]);
-                                break;
-                            default:
-                                throw new InvalidValuesException(
-                                    _("Der Import enthält Kalenderdaten, die Stud.IP nicht korrekt darstellen kann.")
-                                );
-                        }
-                        break;
-
-                    case 'UNTIL' :
-                        $r_rule['expire'] = $this->parseDateTime($match[2]);
-                        break;
-
-                    case 'COUNT' :
-                        $r_rule['count'] = intval($match[2]);
-                        break;
-
-                    case 'INTERVAL' :
-                        $r_rule['linterval'] = intval($match[2]);
-                        break;
-
-                    case 'BYSECOND' :
-                    case 'BYMINUTE' :
-                    case 'BYHOUR' :
-                    case 'BYWEEKNO' :
-                    case 'BYYEARDAY' :
-                        throw new InvalidValuesException(
-                            _("Der Import enthält Kalenderdaten, die Stud.IP nicht korrekt darstellen kann.")
-                        );
-                    case 'BYDAY' :
-                        $byday = $this->parseByDay($match[2]);
-                        $r_rule['wdays'] = $byday['wdays'];
-                        if ($byday['sinterval'])
-                            $r_rule['sinterval'] = $byday['sinterval'];
-                        break;
-
-                    case 'BYMONTH' :
-                        $r_rule['month'] = $this->parseByMonth($match[2]);
-                        break;
-
-                    case 'BYMONTHDAY' :
-                        $r_rule['day'] = $this->parseByMonthDay($match[2]);
-                        break;
-
-                    case 'BYSETPOS':
-                        $r_rule['sinterval'] = intval($match[2]);
-                        break;
-
-                    case 'WKST' :
-                        break;
-                }
-            }
-        }
-
-        return $r_rule;
-    }
-
-    private function parseByDay($text)
-    {
-        global $_calendar_error;
-
-        preg_match_all('/(-?\d{1,2})?(MO|TU|WE|TH|FR|SA|SU),?/', $text, $matches, PREG_SET_ORDER);
-        $wdays_map = ['MO' => '1', 'TU' => '2', 'WE' => '3', 'TH' => '4', 'FR' => '5',
-            'SA' => '6', 'SU' => '7'];
-        $wdays = "";
-        $sinterval = null;
-        foreach ($matches as $match) {
-            $wdays .= $wdays_map[$match[2]];
-            if ($match[1]) {
-                if (!$sinterval && ((int) $match[1]) > 0 || $match[1] == '-1') {
-                    if ($match[1] == '-1') {
-                        $sinterval = '5';
-                    } else {
-                        $sinterval = $match[1];
-                    }
-                } else {
-                    throw new InvalidValuesException(
-                        _("Der Import enthält Kalenderdaten, die Stud.IP nicht korrekt darstellen kann.")
-                    );
-                }
-            }
-        }
-
-        return $wdays ? ['wdays' => $wdays, 'sinterval' => $sinterval] : false;
-    }
-
-    private function parseByMonthDay($text)
-    {
-        $days = explode(',', $text);
-        if (count($days) > 1 || ((int) $days[0]) < 0) {
-            return false;
-        }
-
-        return $days[0];
-    }
-
-    private function parseByMonth($text)
-    {
-        $months = explode(',', $text);
-        if (count($months) > 1) {
-            return false;
-        }
-
-        return $months[0];
-    }
-
-    private function qp_decode($value)
-    {
-        return preg_replace_callback("/=([0-9A-F]{2})/", function ($m) {return chr(hexdec($m[1]));}, $value);
-    }
-
-    private function parseClientIdentifier(&$data)
-    {
-        global $_calendar_error;
-
-        if ($this->client_identifier == '') {
-            if (!preg_match('/PRODID((;[\W\w]*)*):([\W\w]+?)(\r\n|\r|\n)/', $data, $matches)
-                || !trim($matches[3])) {
-                // _("Die Datei ist keine gültige iCalendar-Datei!")
-                throw new InvalidValuesException();
-            } else {
-                $this->client_identifier = trim($matches[3]);
-            }
-        }
-        return true;
-    }
-
-    public function getClientIdentifier($data = null)
-    {
-        if (!is_null($data)) {
-            $this->parseClientIdentifier($data);
-        }
-
-        return $this->client_identifier;
-    }
-
-}
diff --git a/lib/classes/calendar/ICalendarImport.php b/lib/classes/calendar/ICalendarImport.php
new file mode 100644
index 0000000..e78696d
--- /dev/null
+++ b/lib/classes/calendar/ICalendarImport.php
@@ -0,0 +1,678 @@
+<?php
+class ICalendarImport
+{
+    private $range_id;
+
+    private $count = 0;
+
+    private $dates = [];
+
+    private $import_time;
+
+    private $convert_to_private = false;
+
+    public function __construct($range_id)
+    {
+        $this->range_id = $range_id;
+        $this->import_time = time();
+    }
+
+    public function import($ical_data)
+    {
+        $this->parse($ical_data);
+    }
+
+    public function countEvents($ical_data)
+    {
+        $matches = [];
+        if (is_null($this->count)) {
+            // Unfold any folded lines
+            $data = preg_replace('/\x0D?\x0A[\x20\x09]/', '', $ical_data);
+            preg_match_all('/(BEGIN:VEVENT(\r\n|\r|\n)[\W\w]*?END:VEVENT\r?\n?)/', $ical_data, $matches);
+            $this->count = sizeof($matches[1]);
+        }
+
+        return $this->count;
+    }
+
+    public function getCountEvents() : int
+    {
+        return (int) $this->count;
+    }
+
+    public function convertPublicToPrivate(bool $to_private = true) : void
+    {
+        $this->convert_to_private = $to_private;
+    }
+
+    /**
+     * Parse a string containing vCalendar data.
+     *
+     * @access private
+     * @param string $data  The data to parse
+     */
+    public function parse(string $data)
+    {
+        // match categories
+        $studip_categories = [];
+        $i = 1;
+        foreach ($GLOBALS['PERS_TERMIN_KAT'] as $cat) {
+            $studip_categories[mb_strtolower($cat['name'])] = $i++;
+        }
+
+        // Unfold any folded lines
+        // the CR is optional for files imported from Korganizer (non-standard)
+        $data = $this->unfoldLine($data);
+
+        if (!preg_match('/BEGIN:VCALENDAR(\r\n|\r|\n)([\W\w]*)END:VCALENDAR\r?\n?/', $data, $matches)) {
+            throw new UnexpectedValueException();
+        }
+
+        // client identifier
+        if (!$this->parseClientIdentifier($matches[2])) {
+            throw new UnexpectedValueException();
+        }
+
+        // All sub components
+        if (!preg_match_all('/BEGIN:VEVENT(\r\n|\r|\n)([\w\W]*?)END:VEVENT(\r\n|\r|\n)/', $matches[2], $v_events)) {
+            // _("Die importierte Datei enthält keine Termine.")
+            throw new UnexpectedValueException();
+        }
+
+        if ($this->count) {
+            $this->count = 0;
+        }
+        foreach ($v_events[2] as $v_event) {
+
+            if (preg_match_all('/(.*):(.*)(\r|\n)+/', $v_event, $matches)) {
+                $properties = [];
+                $check = [];
+                foreach ($matches[0] as $property) {
+                    preg_match('/([^;^:]*)((;[^:]*)?):(.*)/', $property, $parts);
+                    $tag = $parts[1];
+                    $value = $parts[4];
+                    $params = [];
+
+                    // skip seminar events
+                    if ((!$this->import_sem) && $tag == 'UID') {
+                        if (mb_strpos($value, 'Stud.IP-SEM') === 0) {
+                            continue 2;
+                        }
+                    }
+
+                    if (!empty($parts[2])) {
+                        preg_match_all('/;(([^;=]*)(=([^;]*))?)/', $parts[2], $param_parts);
+                        foreach ($param_parts[2] as $key => $param_name)
+                            $params[mb_strtoupper($param_name)] = mb_strtoupper($param_parts[4][$key]);
+
+                        if ($params['ENCODING']) {
+                            switch ($params['ENCODING']) {
+                                case 'QUOTED-PRINTABLE':
+                                    $value = $this->qp_decode($value);
+                                    break;
+
+                                case 'BASE64':
+                                    $value = base64_decode($value);
+                                    break;
+                            }
+                        }
+                    }
+
+                    switch ($tag) {
+                        // text fields
+                        case 'DESCRIPTION':
+                        case 'SUMMARY':
+                        case 'LOCATION':
+                            $value = preg_replace('/\\\\,/', ',', $value);
+                            $value = preg_replace('/\\\\n/', "\n", $value);
+                            $properties[$tag] = trim($value);
+                            break;
+
+                        case 'CATEGORIES':
+                            $categories = [];
+                            $properties['STUDIP_CATEGORY'] = null;
+                            foreach (explode(',', $value) as $category) {
+                                if (!$studip_categories[mb_strtolower($category)]) {
+                                    $categories[] = $category;
+                                } else if (!$properties['STUDIP_CATEGORY']) {
+                                    $properties['STUDIP_CATEGORY']
+                                        = $studip_categories[mb_strtolower($category)];
+                                }
+                            }
+                            $properties[$tag] = implode(',', $categories);
+                            break;
+
+                        // Date fields
+                        case 'DCREATED': // vCalendar property name for "CREATED"
+                        case 'DTSTAMP':
+                        case 'COMPLETED':
+                        case 'CREATED':
+                        case 'LAST-MODIFIED':
+                            $properties[$tag] = $this->parseDateTime($value);
+                            break;
+
+                        case 'DTSTART':
+                        case 'DTEND':
+                            // checking for day events
+                            if ($params['VALUE'] == 'DATE')
+                                $check['DAY_EVENT'] = true;
+                        case 'DUE':
+                        case 'RECURRENCE-ID':
+                            $properties[$tag] = $this->parseDateTime($value);
+                            break;
+
+                        case 'RDATE':
+                            if (array_key_exists('VALUE', $params)) {
+                                if ($params['VALUE'] == 'PERIOD') {
+                                    $properties[$tag] = $this->parsePeriod($value);
+                                } else {
+                                    $properties[$tag] = $this->parseDateTime($value);
+                                }
+                            } else {
+                                $properties[$tag] = $this->parseDateTime($value);
+                            }
+                            break;
+
+                        case 'TRIGGER':
+                            if (array_key_exists('VALUE', $params)) {
+                                if ($params['VALUE'] == 'DATE-TIME') {
+                                    $properties[$tag] = $this->parseDateTime($value);
+                                } else {
+                                    $properties[$tag] = $this->parseDuration($value);
+                                }
+                            } else {
+                                $properties[$tag] = $this->parseDuration($value);
+                            }
+                            break;
+
+                        case 'EXDATE':
+                            $properties[$tag] = [];
+                            // comma seperated dates
+                            $values = [];
+                            $dates = [];
+                            preg_match_all('/,([^,]*)/', ',' . $value, $values);
+                            foreach ($values[1] as $value) {
+                                if (array_key_exists('VALUE', $params)) {
+                                    if ($params['VALUE'] == 'DATE-TIME') {
+                                        $dates[] = $this->parseDateTime($value);
+                                    } else if ($params['VALUE'] == 'DATE') {
+                                        $dates[] = $this->parseDate($value);
+                                    }
+                                } else {
+                                    $dates[] = $this->parseDateTime($value);
+                                }
+                            }
+                            // some iCalendar exports (e.g. KOrganizer) use an EXDATE-entry for every
+                            // exception, so we have to merge them
+                            array_merge($properties[$tag], $dates);
+                            break;
+
+                        // Duration fields
+                        case 'DURATION':
+                            $attibutes[$tag] = $this->parseDuration($value);
+                            break;
+
+                        // Period of time fields
+                        case 'FREEBUSY':
+                            $values = [];
+                            $periods = [];
+                            preg_match_all('/,([^,]*)/', ',' . $value, $values);
+                            foreach ($values[1] as $value) {
+                                $periods[] = $this->parsePeriod($value);
+                            }
+
+                            $properties[$tag] = $periods;
+                            break;
+
+                        // UTC offset fields
+                        case 'TZOFFSETFROM':
+                        case 'TZOFFSETTO':
+                            $properties[$tag] = $this->parseUtcOffset($value);
+                            break;
+
+                        case 'PRIORITY':
+                            $properties[$tag] = $this->parsePriority($value);
+                            break;
+
+                        case 'CLASS':
+                            switch (trim($value)) {
+                                case 'PUBLIC':
+                                    $properties[$tag] = 'PUBLIC';
+                                    break;
+                                case 'CONFIDENTIAL':
+                                    $properties[$tag] = 'CONFIDENTIAL';
+                                    break;
+                                default:
+                                    $properties[$tag] = 'PRIVATE';
+                            }
+                            break;
+
+                        // Integer fields
+                        case 'PERCENT-COMPLETE':
+                        case 'REPEAT':
+                        case 'SEQUENCE':
+                            $properties[$tag] = intval($value);
+                            break;
+
+                        // Geo fields
+                        case 'GEO':
+                            $floats = explode(';', $value);
+                            $value['latitude'] = floatval($floats[0]);
+                            $value['longitude'] = floatval($floats[1]);
+                            $properties[$tag] = $value;
+                            break;
+
+                        // Recursion fields
+                        case 'EXRULE':
+                        case 'RRULE':
+                            $properties[$tag] = $this->parseRecurrence($value);
+                            break;
+
+                        default:
+                            // string fields
+                            $properties[$tag] = trim($value);
+                            break;
+                    }
+                }
+
+                if (!$properties['RRULE']['rtype']) {
+                    $properties['RRULE'] = ['rtype' => 'SINGLE'];
+                }
+
+                if (!$properties['LAST-MODIFIED']) {
+                    $properties['LAST-MODIFIED'] = $properties['DTSTAMP'] ?: $properties['CREATED'] ?? time();
+                }
+
+                if (!$properties['DTSTART'] || ($properties['EXDATE'] && !$properties['RRULE'])) {
+                    // _("Die Datei ist keine gültige iCalendar-Datei!")
+                    throw new UnexpectedValueException();
+                }
+
+                if (!$properties['DTEND']) {
+                    $properties['DTEND'] = $properties['DTSTART'];
+                }
+
+                // day events starts at 00:00:00 and ends at 23:59:59
+                if ($check['DAY_EVENT'])
+                    $properties['DTEND']--;
+
+                // default: all imported events are set to private
+                if (!$properties['CLASS']
+                    || ($this->convert_to_private && $properties['CLASS'] == 'PUBLIC')) {
+                    $properties['CLASS'] = 'PRIVATE';
+                }
+
+                /*
+                if (isset($studip_categories[$properties['CATEGORIES']])) {
+                    $properties['STUDIP_CATEGORY'] = $studip_categories[$properties['CATEGORIES']];
+                    $properties['CATEGORIES'] = '';
+                }
+                 *
+                 */
+
+                $this->createDateFromProperties($properties);
+            } else {
+                // _("Die Datei ist keine gültige iCalendar-Datei!")
+                throw new InvalidValuesException();
+            }
+            $this->count++;
+        }
+
+        return true;
+    }
+
+    private function createDateFromProperties($properties)
+    {
+        $date = CalendarDate::findOneBySQL(
+            'LEFT JOIN `calendar_date_assignments`
+              ON `calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`
+            WHERE `calendar_dates`.`unique_id` = :uid
+              AND `calendar_date_assignments`.`range_id` = :range_id',
+            [
+                ':uid'      => $properties['UID'],
+                ':range_id' => $this->range_id
+            ]
+        );
+
+        if (!$date) {
+            $date = new CalendarDate();
+            $date->id = $date->getNewId();
+            $date->author_id = $this->range_id;
+            $date->editor_id = $this->range_id;
+            $range_date = new CalendarDateAssignment();
+            $range_date->range_id = $this->range_id;
+            $range_date->participation = '';
+            $date->calendars[] = $range_date;
+        }
+
+        $date->begin = $properties['DTSTART']->getTimestamp();
+        $date->end = $properties['DTEND']->getTimestamp();
+        $date->title = $properties['SUMMARY'];
+        $date->description = $properties['DESCRIPTION'];
+        $date->access = $properties['CLASS'] ?? 'PRIVATE';
+        $date->user_category = $properties['CATEGORIES'];
+        $date->category = $properties['STUDIP_CATEGORY'] ?: 1;
+        $date->priority = $properties['PRIORITY'] ?? '';
+        $date->location = $properties['LOCATION'];
+        if (is_array($properties['EXDATE'])) {
+            foreach ($properties['EXDATE'] as $exdate) {
+                $exception = new CalendarDateException();
+                $exception->date = $exdate->format('Y-m-d');
+                $date->exceptions[] = $exception;
+            }
+        }
+        $date->mkdate = $properties['CREATED'] ? $properties['CREATED']->getTimestamp() : time();
+        if (isset($properties['LAST-MODIFIED'])) {
+            $date->chdate = $properties['LAST-MODIFIED']->getTimestamp();
+        } else {
+            $date->chdate = $date->mkdate;
+        }
+        $date->import_date = $this->import_time;
+        $date->unique_id = $properties['UID'];
+
+        $this->setRecurrenceRule($date, $properties['RRULE']);
+        $date->store();
+    }
+
+    private function setRecurrenceRule(CalendarDate $date, $rrule)
+    {
+        $date->interval = $rrule['linterval'] ?? 1;
+        if (strlen($rrule['wdays'] ?? '')) {
+            $date->offset = $rrule['sinterval'] ?? 0;
+            $date->days = $rrule['wdays'] ?? null;
+        } else {
+            $date->offset = $rrule['day'] ?? 0;
+            $date->days = $rrule['sinterval'] ?? null;
+        }
+        $date->month = $rrule['month'] ?? null;
+        $date->repetition_type = $rrule['rtype'] ?? 'SINGLE';
+        $date->number_of_dates = $rrule['count'] ?? 1;
+        $date->repetition_end = $rrule['expire'] ?? 0;
+    }
+
+    private function unfoldLine($data)
+    {
+        return preg_replace('/\x0D?\x0A[\x20\x09]/', '', $data);
+    }
+
+    /**
+     * Parse a UTC Offset field
+     */
+    private function parseUtcOffset($offset_text)
+    {
+        $offset = 0;
+        if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $offset_text, $matches)) {
+            $offset += 3600 * intval($matches[2]);
+            $offset += 60 * intval($matches[3]);
+            $offset *= ( $matches[1] == '+' ? 1 : -1);
+            if (array_key_exists(4, $matches)) {
+                $offset += intval($matches[4]);
+            }
+        }
+        return $offset;
+    }
+
+    /**
+     * Parse a Time Period field
+     */
+    private function parsePeriod($period_text): array
+    {
+        $matches = explode('/', $period_text);
+
+        $start = $this->parseDateTime($matches[0]);
+
+        if ($duration = $this->parseDuration($matches[1])) {
+            return ['start' => $start, 'duration' => $duration];
+        } else if ($end = $this->parseDateTime($matches[1])) {
+            return ['start' => $start, 'end' => $end];
+        }
+        return [];
+    }
+
+    /**
+     * Parse a DateTime field
+     */
+    private function parseDateTime(String $date_time)
+    {
+        $parts = explode('T', $date_time);
+        if (count($parts) != 2) {
+            // not a date time string but may be just a date string
+            $date = $this->parseDate($date_time);
+            return DateTimeImmutable::createFromFormat('YmdHis', implode('', $date) . '000000');
+        }
+
+        $date = $this->parseDate($parts[0]);
+        $time = $this->parseTime($parts[1]);
+
+        if ($time['zone'] == 'UTC') {
+            $time_zone = new DateTimeZone('UTC');
+        } else {
+            $time_zone = new DateTimeZone('Europe/Berlin');
+        }
+        return DateTimeImmutable::createFromFormat(
+            'YmdHis',
+            implode('', $date) . $time['hour'] . $time['minute'] . $time['second'],
+            $time_zone
+        );
+    }
+
+    /**
+     * Parse a Time field
+     */
+    private function parseTime($time_text): array
+    {
+        $matches = [];
+        if (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})(Z)?/', $time_text, $matches)) {
+            $time['hour'] = $matches[1];
+            $time['minute'] = $matches[2];
+            $time['second'] = $matches[3];
+            if (array_key_exists(4, $matches)) {
+                $time['zone'] = 'UTC';
+            } else {
+                $time['zone'] = 'LOCAL';
+            }
+            return $time;
+        }
+        throw new InvalidValuesException();
+    }
+
+    /**
+     * Parse a Date field
+     */
+    private function parseDate($date_text): array
+    {
+        $matches = [];
+        if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $date_text, $matches)) {
+            $date['year'] = $matches[1];
+            $date['month'] = $matches[2];
+            $date['mday'] = $matches[3];
+            return $date;
+        }
+        throw new InvalidValuesException();
+    }
+
+    /**
+     * Parse a Duration Value field
+     */
+    private function parseDuration($interval_text): DateInterval
+    {
+        return new DateInterval($interval_text);
+    }
+
+    private function parsePriority($value)
+    {
+        $value = intval($value);
+        if ($value > 0 && $value < 5) {
+            return 'HIGH';
+        }
+
+        if ($value == 5) {
+            return 'MEDIUM';
+        }
+
+        if ($value > 5 && $value < 10) {
+            return 'LOW';
+        }
+
+        return '';
+    }
+
+    /**
+     * Parse a recurrence rule.
+     *
+     * @param $text string The text of the recurrence rule.
+     * @return array The translated recurrence rule as array.
+     * @throws InvalidValuesException
+     */
+    private function parseRecurrence($text): array
+    {
+        global $_calendar_error;
+
+        if (preg_match_all('/([A-Za-z]*?)=([^;]*);?/', $text, $matches, PREG_SET_ORDER)) {
+            $r_rule = [];
+
+            foreach ($matches as $match) {
+                switch ($match[1]) {
+                    case 'FREQ' :
+                        switch (trim($match[2])) {
+                            case 'DAILY' :
+                            case 'WEEKLY' :
+                            case 'MONTHLY' :
+                            case 'YEARLY' :
+                                $r_rule['rtype'] = trim($match[2]);
+                                break;
+                            default:
+                                throw new InvalidValuesException(
+                                    _("Der Import enthält Kalenderdaten, die Stud.IP nicht korrekt darstellen kann.")
+                                );
+                        }
+                        break;
+
+                    case 'UNTIL' :
+                        $r_rule['expire'] = $this->parseDateTime($match[2]);
+                        break;
+
+                    case 'COUNT' :
+                        $r_rule['count'] = intval($match[2]);
+                        break;
+
+                    case 'INTERVAL' :
+                        $r_rule['linterval'] = intval($match[2]);
+                        break;
+
+                    case 'BYSECOND' :
+                    case 'BYMINUTE' :
+                    case 'BYHOUR' :
+                    case 'BYWEEKNO' :
+                    case 'BYYEARDAY' :
+                        throw new InvalidValuesException(
+                            _("Der Import enthält Kalenderdaten, die Stud.IP nicht korrekt darstellen kann.")
+                        );
+                    case 'BYDAY' :
+                        $byday = $this->parseByDay($match[2]);
+                        $r_rule['wdays'] = $byday['wdays'];
+                        if ($byday['sinterval'])
+                            $r_rule['sinterval'] = $byday['sinterval'];
+                        break;
+
+                    case 'BYMONTH' :
+                        $r_rule['month'] = $this->parseByMonth($match[2]);
+                        break;
+
+                    case 'BYMONTHDAY' :
+                        $r_rule['day'] = $this->parseByMonthDay($match[2]);
+                        break;
+
+                    case 'BYSETPOS':
+                        $r_rule['sinterval'] = intval($match[2]);
+                        break;
+
+                    case 'WKST' :
+                        break;
+                }
+            }
+        }
+
+        return $r_rule;
+    }
+
+    private function parseByDay($text)
+    {
+        global $_calendar_error;
+
+        preg_match_all('/(-?\d{1,2})?(MO|TU|WE|TH|FR|SA|SU),?/', $text, $matches, PREG_SET_ORDER);
+        $wdays_map = ['MO' => '1', 'TU' => '2', 'WE' => '3', 'TH' => '4', 'FR' => '5',
+            'SA' => '6', 'SU' => '7'];
+        $wdays = "";
+        $sinterval = null;
+        foreach ($matches as $match) {
+            $wdays .= $wdays_map[$match[2]];
+            if ($match[1]) {
+                if (!$sinterval && ((int) $match[1]) > 0 || $match[1] == '-1') {
+                    if ($match[1] == '-1') {
+                        $sinterval = '5';
+                    } else {
+                        $sinterval = $match[1];
+                    }
+                } else {
+                    throw new InvalidValuesException(
+                        _("Der Import enthält Kalenderdaten, die Stud.IP nicht korrekt darstellen kann.")
+                    );
+                }
+            }
+        }
+
+        return $wdays ? ['wdays' => $wdays, 'sinterval' => $sinterval] : false;
+    }
+
+    private function parseByMonthDay($text)
+    {
+        $days = explode(',', $text);
+        if (count($days) > 1 || ((int) $days[0]) < 0) {
+            return false;
+        }
+
+        return $days[0];
+    }
+
+    private function parseByMonth($text)
+    {
+        $months = explode(',', $text);
+        if (count($months) > 1) {
+            return false;
+        }
+
+        return $months[0];
+    }
+
+    private function qp_decode($value)
+    {
+        return preg_replace_callback("/=([0-9A-F]{2})/", function ($m) {return chr(hexdec($m[1]));}, $value);
+    }
+
+    private function parseClientIdentifier(&$data)
+    {
+        global $_calendar_error;
+
+        if ($this->client_identifier == '') {
+            if (!preg_match('/PRODID((;[\W\w]*)*):([\W\w]+?)(\r\n|\r|\n)/', $data, $matches)
+                || !trim($matches[3])) {
+                // _("Die Datei ist keine gültige iCalendar-Datei!")
+                throw new InvalidValuesException();
+            } else {
+                $this->client_identifier = trim($matches[3]);
+            }
+        }
+        return true;
+    }
+
+    public function getClientIdentifier($data = null)
+    {
+        if (!is_null($data)) {
+            $this->parseClientIdentifier($data);
+        }
+
+        return $this->client_identifier;
+    }
+
+}
diff --git a/lib/classes/calendar/Owner.interface.php b/lib/classes/calendar/Owner.interface.php
deleted file mode 100644
index a7c2519..0000000
--- a/lib/classes/calendar/Owner.interface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Studip\Calendar;
-
-/**
- * The Studip\Calendar\Owner interface defines methods that classes whose instances own calendars
- * shall implement to faciliate permission checks for that calendars.
- */
-interface Owner
-{
-    /**
-     * Retrieves the Owner object for a specified owner-ID.
-     *
-     * @param string $owner_id The ID of the owner.
-     *
-     * @return Owner|null Either the Owner object if it can be found or null in case
-     *     it cannot be found.
-     */
-    public static function getCalendarOwner(string $owner_id) : ?Owner;
-
-    /**
-     * Determines whether the specified user has read permissions to the calendar.
-     *
-     * @param string|null $user_id The ID of the user for which to determine write permissions.
-     *                             Defaults to the current user if no user-ID is provided.
-     *
-     * @return bool True, if the user has read permissions, false otherwise.
-     */
-    public function isCalendarReadable(?string $user_id = null) : bool;
-
-    /**
-     * Determines whether the specified user has write permissions to the calendar.
-     *
-     * @param string|null $user_id The ID of the user for which to determine write permissions.
-     *                             Defaults to the current user if no user-ID is provided.
-     *
-     * @return bool True, if the user has write permissions, false otherwise.
-     */
-    public function isCalendarWritable(?string $user_id = null) : bool;
-}
diff --git a/lib/classes/calendar/Owner.php b/lib/classes/calendar/Owner.php
new file mode 100644
index 0000000..a7c2519
--- /dev/null
+++ b/lib/classes/calendar/Owner.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Studip\Calendar;
+
+/**
+ * The Studip\Calendar\Owner interface defines methods that classes whose instances own calendars
+ * shall implement to faciliate permission checks for that calendars.
+ */
+interface Owner
+{
+    /**
+     * Retrieves the Owner object for a specified owner-ID.
+     *
+     * @param string $owner_id The ID of the owner.
+     *
+     * @return Owner|null Either the Owner object if it can be found or null in case
+     *     it cannot be found.
+     */
+    public static function getCalendarOwner(string $owner_id) : ?Owner;
+
+    /**
+     * Determines whether the specified user has read permissions to the calendar.
+     *
+     * @param string|null $user_id The ID of the user for which to determine write permissions.
+     *                             Defaults to the current user if no user-ID is provided.
+     *
+     * @return bool True, if the user has read permissions, false otherwise.
+     */
+    public function isCalendarReadable(?string $user_id = null) : bool;
+
+    /**
+     * Determines whether the specified user has write permissions to the calendar.
+     *
+     * @param string|null $user_id The ID of the user for which to determine write permissions.
+     *                             Defaults to the current user if no user-ID is provided.
+     *
+     * @return bool True, if the user has write permissions, false otherwise.
+     */
+    public function isCalendarWritable(?string $user_id = null) : bool;
+}
diff --git a/lib/classes/exportdocument/ExportDocument.interface.php b/lib/classes/exportdocument/ExportDocument.interface.php
deleted file mode 100644
index 27aaee2..0000000
--- a/lib/classes/exportdocument/ExportDocument.interface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-# Lifter010: TODO
-
-/**
- * ExportDocument.interface.php - create and export or save a pdf with simple HTML-Data
- *
- * 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.
- *
- * @author      Rasmus Fuhse & Peter Thienel
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This interface describes a basic structure for a class that exports content
- * or many contents within a document. It is used in ExportPDF, but could be
- * used for classes that export Excel or OpenDocument files as well. The main
- * operation to get a document by stud.ip-formatted text is quite simple:
- *
- *  $doc = new ExportPDF();
- *  $doc->addPage();
- *  $doc->addContent('Hallo, %%wir%% benutzen :studip: -Formatierung.');
- *  $doc->dispatch("test_pdf");
- *  //lines following dispatch won't be accessed anymor, because dispatch 
- *  //cancels all other output.
- *
- */
-interface ExportDocument {
-
-    /**
-     * Adding a new page to write new content on it. Must be called at least once
-     * before any call of addContent($text).
-     */
-    public function addPage();
-
-    /**
-     * Adding an area of Stud.IP formatted content.
-     */
-    public function addContent($content);
-
-    /**
-     * Outputs the content as a file with MIME-type and aborts any other output.
-     * @param string $filename name of the future file without the extension.
-     */
-    public function dispatch($filename);
-
-    /**
-     * Saves the content as a file in the filesystem and returns a Stud.IP-document object.
-     * @param string $filename name of the future file without the extension.
-     * @param mixed $folder_id md5-id of a given folder in database or null for nothing
-     * @return StudipDocument of the exported file or false if creation of StudipDocument failed.
-     */
-    public function save($filename, $folder_id = null);
-
-}
-
diff --git a/lib/classes/exportdocument/ExportDocument.php b/lib/classes/exportdocument/ExportDocument.php
new file mode 100644
index 0000000..27aaee2
--- /dev/null
+++ b/lib/classes/exportdocument/ExportDocument.php
@@ -0,0 +1,59 @@
+<?php
+# Lifter010: TODO
+
+/**
+ * ExportDocument.interface.php - create and export or save a pdf with simple HTML-Data
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse & Peter Thienel
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This interface describes a basic structure for a class that exports content
+ * or many contents within a document. It is used in ExportPDF, but could be
+ * used for classes that export Excel or OpenDocument files as well. The main
+ * operation to get a document by stud.ip-formatted text is quite simple:
+ *
+ *  $doc = new ExportPDF();
+ *  $doc->addPage();
+ *  $doc->addContent('Hallo, %%wir%% benutzen :studip: -Formatierung.');
+ *  $doc->dispatch("test_pdf");
+ *  //lines following dispatch won't be accessed anymor, because dispatch 
+ *  //cancels all other output.
+ *
+ */
+interface ExportDocument {
+
+    /**
+     * Adding a new page to write new content on it. Must be called at least once
+     * before any call of addContent($text).
+     */
+    public function addPage();
+
+    /**
+     * Adding an area of Stud.IP formatted content.
+     */
+    public function addContent($content);
+
+    /**
+     * Outputs the content as a file with MIME-type and aborts any other output.
+     * @param string $filename name of the future file without the extension.
+     */
+    public function dispatch($filename);
+
+    /**
+     * Saves the content as a file in the filesystem and returns a Stud.IP-document object.
+     * @param string $filename name of the future file without the extension.
+     * @param mixed $folder_id md5-id of a given folder in database or null for nothing
+     * @return StudipDocument of the exported file or false if creation of StudipDocument failed.
+     */
+    public function save($filename, $folder_id = null);
+
+}
+
diff --git a/lib/classes/exportdocument/ExportPDF.class.php b/lib/classes/exportdocument/ExportPDF.class.php
deleted file mode 100644
index 915cfde..0000000
--- a/lib/classes/exportdocument/ExportPDF.class.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * ExportPDF.class.php - create and export or save a pdf with simple HTML-Data
- *
- * 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.
- *
- * @author      Rasmus Fuhse & Peter Thienel
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-define('K_PATH_IMAGES', $GLOBALS['STUDIP_BASE_PATH'] . '/public/assets/images/');
-
-/**
- * Class to create an PDF by putting in Stud.IP-formatted code.
- * Usage:
- *
- *  $doc = new ExportPDF();
- *  $doc->addPage();
- *  $doc->addContent('Hallo, %%wir%% benutzen :studip:-Formatierung.');
- *  $doc->dispatch("test_pdf");
- *  //lines following dispatch won't be accessed anymor, because dispatch
- *  //cancels all other output.
- *
- */
-class ExportPDF extends TCPDF implements ExportDocument
-{
-    private $media_proxy = NULL;
-    private $config;
-    private $defaults = false;
-    private $page_added = false;
-    private $h_title = '';
-    private $h_string = '';
-    private $domains;
-    static protected $countEndnote = 0;
-
-    /**
-     * Create a basic document (without any content so far).
-     * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-     * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-     * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-     * @param boolean $unicode TRUE means that the input text is unicode (default = true)
-     * @param String $encoding charset encoding; default is UTF-8
-     */
-    public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8')
-    {
-        $this->config = Config::GetInstance();
-        if ($this->config->getValue('LOAD_EXTERNAL_MEDIA') == 'proxy') {
-            $this->media_proxy = new MediaProxy();
-        }
-        parent::__construct($orientation, $unit, $format, $unicode, $encoding, false);
-        $this->getDomains();
-        $this->setDefaults();
-    }
-
-    /**
-     * Adding a new page to the document. This page can contain even more content
-     * than for just one page. The pagebreak will be managed by tcpdf. But this function
-     * will create a new pagebreak. Needs to be called at least once to addContent.
-     * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-     * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-     * @param boolean $keepmargins if true overwrites the default page margins with the current margins
-     * @param boolean $tocpage if true set the tocpage state to true (the added page will be used to display Table Of Content).
-     */
-    public function addPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false)
-    {
-        $this->page_added = true;
-        parent::AddPage($orientation, $format, $keepmargins, $tocpage);
-    }
-
-    /**
-     * Adding Stud.IP formatted code to the current page of the pdf.
-     * Remember to call addPage first.
-     * @param string $content Stud.IP formatted code
-     */
-    public function addContent($content)
-    {
-        $endnote = "";
-        preg_match_all("#\[comment(=.*)?\](.*)\[/comment\]#msU", $content, $matches);
-        if (count($matches[0])) {
-            $endnote .= "<br><br>"._("Kommentare")."<hr>";
-            for ($i=0; $i < count($matches[0]); $i++) {
-                $endnote .= ($i+1).") ".htmlReady(mb_substr($matches[1][$i], 1)).": ".htmlReady($matches[2][$i])."<br>";
-            }
-        }
-        $content = preg_replace_callback("#\[comment(=.*)?\](.*)\[/comment\]#msU", function ($m) {return $this->addEndnote($m[1], $m[2]);}, $content);
-        $content = formatReady($content, true, true, true, null);
-        $content = str_replace("<table", "<table border=\"1\"", $content);
-
-        // Since TCPDF cannot handle missing images at all, the content needs
-        // to be cleaned from those (see tickets #2957, #3329 and #3688)
-        $content = preg_replace_callback('/<img[^>]+src="(.*?)"[^>]*>/', function ($match) {
-            $url = $match[1];
-
-            // Detect possible html entities in url and remove them
-            if (mb_strpos($url, '&amp;') !== false) {
-                $url = html_entity_decode($url);
-            }
-
-            // Handle optional media proxy
-            if (Config::GetInstance()->LOAD_EXTERNAL_MEDIA) {
-                $parsed = parse_url($url);
-                // Detect media proxy
-                if (mb_strpos($parsed['path'], 'media_proxy') !== false && mb_strpos($parsed['query'], 'url=') !== false) {
-                    // Remove media proxy
-                    parse_str($parsed['query'], $parameters);
-                    $url = $parameters['url'];
-                }
-            }
-
-            // Fetch headers from url, handle possible redirects
-            do {
-                $headers = get_headers($url, true, get_default_http_stream_context($url));
-                if (!$headers) {
-                    break;
-                }
-                list(, $status) = explode(' ', $headers[0]);
-
-                $url = $headers['Location'] ?? $headers['location'] ?? $url;
-            } while (in_array($status, [300, 301, 302, 303, 305, 307]));
-
-            $status = $status ?? 404;
-
-            // Replace image with link on error (and not internal), otherwise return sainitized
-            // url
-            return ((!is_internal_url($url) || $status == 404) && $status >= 400)
-                 ? sprintf('[<a href="%s">%s</a>]', $url, basename($url))
-                 : str_replace($match[1], $url, $match[0]);
-        }, $content);
-
-        $this->writeHTML($content.$endnote);
-    }
-
-    /**
-     *
-     * @param <type> $commented_by
-     * @param <type> $text
-     * @return <type>
-     */
-    public function addEndnote($commented_by, $text)
-    {
-        self::$countEndnote++;
-        return ">>"._("Kommentar")." ".self::$countEndnote.">>";
-    }
-
-    /**
-     * Dispatches the PDF to the user and cancels all other output of Stud.IP.
-     * @param string $filename name of the future file without the extension.
-     */
-    public function dispatch($filename)
-    {
-        $this->Output($filename.".pdf", 'I');
-    }
-
-    /**
-     * Saves the content as a file in the filesystem and returns a FileRef object.
-     *
-     * @param string $filename name of the future file without the extension.
-     * @param mixed $folder_id md5-id of a given folder in database or null for nothing
-     * @return FileRef of the exported file or false if creation of the FileRef or its associated File object failed.
-     */
-    public function save($filename, $folder_id = null)
-    {
-        global $user;
-
-        //get folder:
-        $folder = Folder::find($folder_id);
-        if(!$folder) {
-            return false;
-        }
-        $folder = $folder->getTypedFolder();
-
-        //Create a File:
-        $file = new File();
-        $file->user_id = $user->id;
-        $file->mime_type = 'application/pdf';
-        $file->name = FileManager::cleanFileName($filename);
-        $file->storage = 'disk';
-        if(!$file->store()) {
-            return false;
-        }
-
-        //...and a FileRef:
-        $file_ref = new FileRef();
-        $file_ref->file_id = $file->id;
-        $file_ref->folder_id = $folder->getId();
-        $file_ref->user_id = $user->id;
-        $file_ref->name = $file->name;
-        if(!$file_ref->store()) {
-            return false;
-        }
-
-        //Now we can create the PDF file and store it in the file's path:
-        $path = $file->getPath();
-        $this->Output($path, 'F');
-        $file->size = filesize($path);
-        if($file->store()) {
-            return $file_ref;
-        }
-
-        return false;
-    }
-
-    /**
-     * Sets some default-values for the document, that tcpdf needs.
-     */
-    private function setDefaults ()
-    {
-        $this->defaults = true;
-
-        // setting defaults
-        $this->SetCreator('Stud.IP - ' . $this->config->getValue('UNI_NAME_CLEAN'));
-        // set header and footer fonts
-        $this->setHeaderFont([PDF_FONT_NAME_MAIN, '', 8]);
-        $this->setFooterFont([PDF_FONT_NAME_DATA, '', 8]);
-        // set default monospaced font
-        $this->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-        //set margins
-        $this->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-        $this->SetHeaderMargin(PDF_MARGIN_HEADER);
-        $this->SetFooterMargin(PDF_MARGIN_FOOTER);
-        //set auto page breaks
-        $this->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-        //set image scale factor
-        $this->setImageScale(PDF_IMAGE_SCALE_RATIO);
-        // set default font subsetting mode
-        $this->setFontSubsetting(true);
-        // Set font
-        //$this->SetFont('helvetica', '', 10, '', true);
-
-        // set default page header
-        $this->setHeaderData();
-
-    }
-
-    /**
-     * Sets the title of the header of each page.
-     * @param string $title title of the head
-     */
-    public function setHeaderTitle ($title)
-    {
-        $this->h_title = $title;
-        $this->setHeaderData();
-    }
-
-    /**
-     * Sets the subtitle of the header of each page.
-     * @param string $subtitle subtitle of the head
-     */
-    public function setHeaderSubtitle ($subtitle)
-    {
-        $this->h_string = $subtitle;
-        $this->setHeaderData();
-    }
-
-    /**
-     * Creates a header for each page with a custom logo defined
-     * @param string $ln header image logo
-     * @param int $lw header image logo width in mm
-     * @param string $ht string to print as title on document header
-     * @param string $hs string to print on document header
-     */
-    public function setHeaderData($ln = '', $lw = 0, $ht = '', $hs = '', $tc = [], $lc = []) {
-        if (!$ln) {
-            $ln = Config::get()->PDF_LOGO ?: 'logos/logoklein.png';
-        }
-        $lw = 30;
-        $ht = ($ht == '' ? $this->h_title : $ht);
-        $hs = ($hs == '' ? $this->h_string : $hs);
-
-        parent::resetHeaderTemplate();
-
-        parent::setHeaderData($ln, $lw, $ht, $hs);
-    }
-
-    /**
-     * Overrides writeHTML-method of tcpdf to convert image-urls, so that they
-     * aren't accessed via proxy but directly.
-     * @param string $html text to display
-     * @param boolean $ln if true add a new line after text (default = true)
-     * @param boolean $fill Indicates if the background must be painted (true) or transparent (false).
-     * @param boolean $reseth if true reset the last cell height (default false).
-     * @param boolean $cell if true add the current left (or right for RTL) padding to each Write (default false).
-     * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-     */
-    public function writeHTML ($html, $ln = true, $fill = false, $reseth = false, $cell = false, $align = '')
-    {
-        $html = preg_replace_callback('/src="([^@].*)"/U', function ($m) {return $this->convertURL($m[1]);}, $html);
-        parent::writeHTML($html, $ln, $fill, $reseth, $cell, $align);
-    }
-
-    /**
-     * Converts URLs in images so that the webserver can access them without proxy.
-     * @param string $url of an image
-     * @return string " src=\"".$converted_url."\""
-     */
-    protected function convertURL($url)
-    {
-        $convurl = $url;
-        $url_elements = @parse_url($url);
-        $url = $url_elements['path'];
-        if (isset($url_elements['query'])) {
-            $url .= "?{$url_elements['query']}";
-        }
-        if (mb_strpos(implode('#', $this->domains), $url_elements['host']) !== false) {
-            if (mb_strpos($url, 'dispatch.php/media_proxy?url=') !== false) {
-                $targeturl = urldecode(mb_substr($url, 4));
-                try {
-                    // is file in cache?
-                    if (!$metadata = $this->media_proxy->getMetaData($targeturl)) {
-                        $convurl = $targeturl;
-                    } else {
-                        $convurl = $this->config->getValue('MEDIA_CACHE_PATH') . '/' . md5($targeturl);
-                    }
-                } catch (Exception $e) {
-                    $convurl = '';
-                }
-            } else if (mb_stripos($url, 'dispatch.php/document/download') !== false) {
-                if (preg_match('#([a-f0-9]{32})#', $url, $matches)) {
-                    $file_ref = FileRef::find($matches[1]);
-                    $folder = $file_ref->folder->getTypedFolder();
-                    if($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
-                        $convurl = $file_ref->file->getPath();
-                    }
-                }
-            } else if (mb_stripos($url, 'download') !== false
-                    || mb_stripos($url, 'sendfile.php') !== false) {
-                //// get file id
-                if (preg_match('#([a-f0-9]{32})#', $url, $matches)) {
-                    $file_ref = FileRef::find($matches[1]);
-                    $folder = $file_ref->folder->getTypedFolder();
-                    if($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
-                        $convurl = $file_ref->file->getPath();
-                    } else {
-                        $convurl = Assets::image_path('messagebox/exception.png');
-                    }
-                }
-            }
-        }
-
-        $src = 'src=""';
-        $file_content = @file_get_contents($convurl, false, get_default_http_stream_context($convurl));
-        if ($file_content) {
-            $img_size = @getimagesizefromstring($file_content);
-            if (is_array($img_size) && $img_size[0] > 0) {
-                $src = 'src="@' . base64_encode($file_content) . '"';
-            }
-        }
-        return $src;
-    }
-
-    /**
-     * finds an array with all domains of this Stud.IP and stores it in $this->domains
-     */
-    protected function getDomains()
-    {
-        $this->domains = [];
-        $host_url_parsed = @parse_url($GLOBALS['ABSOLUTE_URI_STUDIP']);
-        if (isset($GLOBALS['STUDIP_DOMAINS'])) {
-            $this->domains = $GLOBALS['STUDIP_DOMAINS'];
-        }
-        $this->domains[] = $host_url_parsed['host'];
-    }
-
-}
diff --git a/lib/classes/exportdocument/ExportPDF.php b/lib/classes/exportdocument/ExportPDF.php
new file mode 100644
index 0000000..915cfde
--- /dev/null
+++ b/lib/classes/exportdocument/ExportPDF.php
@@ -0,0 +1,369 @@
+<?php
+# Lifter010: TODO
+/**
+ * ExportPDF.class.php - create and export or save a pdf with simple HTML-Data
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse & Peter Thienel
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+define('K_PATH_IMAGES', $GLOBALS['STUDIP_BASE_PATH'] . '/public/assets/images/');
+
+/**
+ * Class to create an PDF by putting in Stud.IP-formatted code.
+ * Usage:
+ *
+ *  $doc = new ExportPDF();
+ *  $doc->addPage();
+ *  $doc->addContent('Hallo, %%wir%% benutzen :studip:-Formatierung.');
+ *  $doc->dispatch("test_pdf");
+ *  //lines following dispatch won't be accessed anymor, because dispatch
+ *  //cancels all other output.
+ *
+ */
+class ExportPDF extends TCPDF implements ExportDocument
+{
+    private $media_proxy = NULL;
+    private $config;
+    private $defaults = false;
+    private $page_added = false;
+    private $h_title = '';
+    private $h_string = '';
+    private $domains;
+    static protected $countEndnote = 0;
+
+    /**
+     * Create a basic document (without any content so far).
+     * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
+     * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
+     * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+     * @param boolean $unicode TRUE means that the input text is unicode (default = true)
+     * @param String $encoding charset encoding; default is UTF-8
+     */
+    public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8')
+    {
+        $this->config = Config::GetInstance();
+        if ($this->config->getValue('LOAD_EXTERNAL_MEDIA') == 'proxy') {
+            $this->media_proxy = new MediaProxy();
+        }
+        parent::__construct($orientation, $unit, $format, $unicode, $encoding, false);
+        $this->getDomains();
+        $this->setDefaults();
+    }
+
+    /**
+     * Adding a new page to the document. This page can contain even more content
+     * than for just one page. The pagebreak will be managed by tcpdf. But this function
+     * will create a new pagebreak. Needs to be called at least once to addContent.
+     * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
+     * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+     * @param boolean $keepmargins if true overwrites the default page margins with the current margins
+     * @param boolean $tocpage if true set the tocpage state to true (the added page will be used to display Table Of Content).
+     */
+    public function addPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false)
+    {
+        $this->page_added = true;
+        parent::AddPage($orientation, $format, $keepmargins, $tocpage);
+    }
+
+    /**
+     * Adding Stud.IP formatted code to the current page of the pdf.
+     * Remember to call addPage first.
+     * @param string $content Stud.IP formatted code
+     */
+    public function addContent($content)
+    {
+        $endnote = "";
+        preg_match_all("#\[comment(=.*)?\](.*)\[/comment\]#msU", $content, $matches);
+        if (count($matches[0])) {
+            $endnote .= "<br><br>"._("Kommentare")."<hr>";
+            for ($i=0; $i < count($matches[0]); $i++) {
+                $endnote .= ($i+1).") ".htmlReady(mb_substr($matches[1][$i], 1)).": ".htmlReady($matches[2][$i])."<br>";
+            }
+        }
+        $content = preg_replace_callback("#\[comment(=.*)?\](.*)\[/comment\]#msU", function ($m) {return $this->addEndnote($m[1], $m[2]);}, $content);
+        $content = formatReady($content, true, true, true, null);
+        $content = str_replace("<table", "<table border=\"1\"", $content);
+
+        // Since TCPDF cannot handle missing images at all, the content needs
+        // to be cleaned from those (see tickets #2957, #3329 and #3688)
+        $content = preg_replace_callback('/<img[^>]+src="(.*?)"[^>]*>/', function ($match) {
+            $url = $match[1];
+
+            // Detect possible html entities in url and remove them
+            if (mb_strpos($url, '&amp;') !== false) {
+                $url = html_entity_decode($url);
+            }
+
+            // Handle optional media proxy
+            if (Config::GetInstance()->LOAD_EXTERNAL_MEDIA) {
+                $parsed = parse_url($url);
+                // Detect media proxy
+                if (mb_strpos($parsed['path'], 'media_proxy') !== false && mb_strpos($parsed['query'], 'url=') !== false) {
+                    // Remove media proxy
+                    parse_str($parsed['query'], $parameters);
+                    $url = $parameters['url'];
+                }
+            }
+
+            // Fetch headers from url, handle possible redirects
+            do {
+                $headers = get_headers($url, true, get_default_http_stream_context($url));
+                if (!$headers) {
+                    break;
+                }
+                list(, $status) = explode(' ', $headers[0]);
+
+                $url = $headers['Location'] ?? $headers['location'] ?? $url;
+            } while (in_array($status, [300, 301, 302, 303, 305, 307]));
+
+            $status = $status ?? 404;
+
+            // Replace image with link on error (and not internal), otherwise return sainitized
+            // url
+            return ((!is_internal_url($url) || $status == 404) && $status >= 400)
+                 ? sprintf('[<a href="%s">%s</a>]', $url, basename($url))
+                 : str_replace($match[1], $url, $match[0]);
+        }, $content);
+
+        $this->writeHTML($content.$endnote);
+    }
+
+    /**
+     *
+     * @param <type> $commented_by
+     * @param <type> $text
+     * @return <type>
+     */
+    public function addEndnote($commented_by, $text)
+    {
+        self::$countEndnote++;
+        return ">>"._("Kommentar")." ".self::$countEndnote.">>";
+    }
+
+    /**
+     * Dispatches the PDF to the user and cancels all other output of Stud.IP.
+     * @param string $filename name of the future file without the extension.
+     */
+    public function dispatch($filename)
+    {
+        $this->Output($filename.".pdf", 'I');
+    }
+
+    /**
+     * Saves the content as a file in the filesystem and returns a FileRef object.
+     *
+     * @param string $filename name of the future file without the extension.
+     * @param mixed $folder_id md5-id of a given folder in database or null for nothing
+     * @return FileRef of the exported file or false if creation of the FileRef or its associated File object failed.
+     */
+    public function save($filename, $folder_id = null)
+    {
+        global $user;
+
+        //get folder:
+        $folder = Folder::find($folder_id);
+        if(!$folder) {
+            return false;
+        }
+        $folder = $folder->getTypedFolder();
+
+        //Create a File:
+        $file = new File();
+        $file->user_id = $user->id;
+        $file->mime_type = 'application/pdf';
+        $file->name = FileManager::cleanFileName($filename);
+        $file->storage = 'disk';
+        if(!$file->store()) {
+            return false;
+        }
+
+        //...and a FileRef:
+        $file_ref = new FileRef();
+        $file_ref->file_id = $file->id;
+        $file_ref->folder_id = $folder->getId();
+        $file_ref->user_id = $user->id;
+        $file_ref->name = $file->name;
+        if(!$file_ref->store()) {
+            return false;
+        }
+
+        //Now we can create the PDF file and store it in the file's path:
+        $path = $file->getPath();
+        $this->Output($path, 'F');
+        $file->size = filesize($path);
+        if($file->store()) {
+            return $file_ref;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets some default-values for the document, that tcpdf needs.
+     */
+    private function setDefaults ()
+    {
+        $this->defaults = true;
+
+        // setting defaults
+        $this->SetCreator('Stud.IP - ' . $this->config->getValue('UNI_NAME_CLEAN'));
+        // set header and footer fonts
+        $this->setHeaderFont([PDF_FONT_NAME_MAIN, '', 8]);
+        $this->setFooterFont([PDF_FONT_NAME_DATA, '', 8]);
+        // set default monospaced font
+        $this->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
+        //set margins
+        $this->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
+        $this->SetHeaderMargin(PDF_MARGIN_HEADER);
+        $this->SetFooterMargin(PDF_MARGIN_FOOTER);
+        //set auto page breaks
+        $this->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
+        //set image scale factor
+        $this->setImageScale(PDF_IMAGE_SCALE_RATIO);
+        // set default font subsetting mode
+        $this->setFontSubsetting(true);
+        // Set font
+        //$this->SetFont('helvetica', '', 10, '', true);
+
+        // set default page header
+        $this->setHeaderData();
+
+    }
+
+    /**
+     * Sets the title of the header of each page.
+     * @param string $title title of the head
+     */
+    public function setHeaderTitle ($title)
+    {
+        $this->h_title = $title;
+        $this->setHeaderData();
+    }
+
+    /**
+     * Sets the subtitle of the header of each page.
+     * @param string $subtitle subtitle of the head
+     */
+    public function setHeaderSubtitle ($subtitle)
+    {
+        $this->h_string = $subtitle;
+        $this->setHeaderData();
+    }
+
+    /**
+     * Creates a header for each page with a custom logo defined
+     * @param string $ln header image logo
+     * @param int $lw header image logo width in mm
+     * @param string $ht string to print as title on document header
+     * @param string $hs string to print on document header
+     */
+    public function setHeaderData($ln = '', $lw = 0, $ht = '', $hs = '', $tc = [], $lc = []) {
+        if (!$ln) {
+            $ln = Config::get()->PDF_LOGO ?: 'logos/logoklein.png';
+        }
+        $lw = 30;
+        $ht = ($ht == '' ? $this->h_title : $ht);
+        $hs = ($hs == '' ? $this->h_string : $hs);
+
+        parent::resetHeaderTemplate();
+
+        parent::setHeaderData($ln, $lw, $ht, $hs);
+    }
+
+    /**
+     * Overrides writeHTML-method of tcpdf to convert image-urls, so that they
+     * aren't accessed via proxy but directly.
+     * @param string $html text to display
+     * @param boolean $ln if true add a new line after text (default = true)
+     * @param boolean $fill Indicates if the background must be painted (true) or transparent (false).
+     * @param boolean $reseth if true reset the last cell height (default false).
+     * @param boolean $cell if true add the current left (or right for RTL) padding to each Write (default false).
+     * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+     */
+    public function writeHTML ($html, $ln = true, $fill = false, $reseth = false, $cell = false, $align = '')
+    {
+        $html = preg_replace_callback('/src="([^@].*)"/U', function ($m) {return $this->convertURL($m[1]);}, $html);
+        parent::writeHTML($html, $ln, $fill, $reseth, $cell, $align);
+    }
+
+    /**
+     * Converts URLs in images so that the webserver can access them without proxy.
+     * @param string $url of an image
+     * @return string " src=\"".$converted_url."\""
+     */
+    protected function convertURL($url)
+    {
+        $convurl = $url;
+        $url_elements = @parse_url($url);
+        $url = $url_elements['path'];
+        if (isset($url_elements['query'])) {
+            $url .= "?{$url_elements['query']}";
+        }
+        if (mb_strpos(implode('#', $this->domains), $url_elements['host']) !== false) {
+            if (mb_strpos($url, 'dispatch.php/media_proxy?url=') !== false) {
+                $targeturl = urldecode(mb_substr($url, 4));
+                try {
+                    // is file in cache?
+                    if (!$metadata = $this->media_proxy->getMetaData($targeturl)) {
+                        $convurl = $targeturl;
+                    } else {
+                        $convurl = $this->config->getValue('MEDIA_CACHE_PATH') . '/' . md5($targeturl);
+                    }
+                } catch (Exception $e) {
+                    $convurl = '';
+                }
+            } else if (mb_stripos($url, 'dispatch.php/document/download') !== false) {
+                if (preg_match('#([a-f0-9]{32})#', $url, $matches)) {
+                    $file_ref = FileRef::find($matches[1]);
+                    $folder = $file_ref->folder->getTypedFolder();
+                    if($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
+                        $convurl = $file_ref->file->getPath();
+                    }
+                }
+            } else if (mb_stripos($url, 'download') !== false
+                    || mb_stripos($url, 'sendfile.php') !== false) {
+                //// get file id
+                if (preg_match('#([a-f0-9]{32})#', $url, $matches)) {
+                    $file_ref = FileRef::find($matches[1]);
+                    $folder = $file_ref->folder->getTypedFolder();
+                    if($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
+                        $convurl = $file_ref->file->getPath();
+                    } else {
+                        $convurl = Assets::image_path('messagebox/exception.png');
+                    }
+                }
+            }
+        }
+
+        $src = 'src=""';
+        $file_content = @file_get_contents($convurl, false, get_default_http_stream_context($convurl));
+        if ($file_content) {
+            $img_size = @getimagesizefromstring($file_content);
+            if (is_array($img_size) && $img_size[0] > 0) {
+                $src = 'src="@' . base64_encode($file_content) . '"';
+            }
+        }
+        return $src;
+    }
+
+    /**
+     * finds an array with all domains of this Stud.IP and stores it in $this->domains
+     */
+    protected function getDomains()
+    {
+        $this->domains = [];
+        $host_url_parsed = @parse_url($GLOBALS['ABSOLUTE_URI_STUDIP']);
+        if (isset($GLOBALS['STUDIP_DOMAINS'])) {
+            $this->domains = $GLOBALS['STUDIP_DOMAINS'];
+        }
+        $this->domains[] = $host_url_parsed['host'];
+    }
+
+}
diff --git a/lib/classes/librarysearch/LibraryDocument.class.php b/lib/classes/librarysearch/LibraryDocument.class.php
deleted file mode 100644
index c1d297e..0000000
--- a/lib/classes/librarysearch/LibraryDocument.class.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-/**
- * This class represents a document from a library.
- */
-class LibraryDocument
-{
-    /**
-     * An unique ID of the document.
-     */
-    public $id = '';
-
-
-    /**
-     * The OPAC ID of the document.
-     */
-    public $opac_document_id = '';
-
-
-    /**
-     * The link to the document page in the OPAC system.
-     */
-    public $opac_link = '';
-
-
-    /**
-     * The CSL document type.
-     */
-    public $type = '';
-
-
-    /**
-     * The CSL datafields.
-     */
-    public $csl_data = [];
-
-
-    /**
-     * The name of the catalog from which the document has been retrieved.
-     */
-    public $catalog = '';
-
-
-    /**
-     * Other data that cannot be stored in the $csl_data array.
-     */
-    public $datafields;
-
-
-    /**
-     * The search parameter that have been used to retrieve this item.
-     */
-    public $search_params = [];
-
-
-    /**
-     * Generates an ID for the document.
-     */
-    public function getId()
-    {
-        if (!$this->id) {
-            $this->id = md5(uniqid('LibraryDocument' . $this->getTitle()));
-        }
-        return $this->id;
-    }
-
-
-    /**
-     * Returns the type of the document as string.
-     *
-     * @returns string The type of the document.
-     */
-    public function getType($format = 'name'): string
-    {
-        global $LIBRARY_DOCUMENT_TYPES;
-
-        if ($format === 'name') {
-            return $this->type;
-        }
-        if ($format === 'display_name') {
-            $ldt = SimpleCollection::createFromArray($LIBRARY_DOCUMENT_TYPES);
-            $found = $ldt->findOneBy('name', $this->type);
-            $lang = in_array($_SESSION['_language'], ['de_DE', 'en_GB']) ? $_SESSION['_language'] : 'de_DE';
-            if ($found) {
-                return $found['display_name'][$lang];
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Returns the title of the document as string.
-     *
-     * @param string $format The format of the title.
-     *     'short' means that only the title is returned.
-     *     'long' means that the author, the year and the title are
-     *     concatenated into one string.
-     *     'long-comma' means that the author, the title and the year
-     *     are concatenated in that order, only separated by a comma.
-     *
-     * @returns string The title of the document.
-     */
-    public function getTitle($format = 'short'): string
-    {
-        if ($format == 'long') {
-            $long_title = '';
-            if (isset($this->csl_data['issued'], $this->csl_data['author'])) {
-                $first_author_last_name = $this->csl_data['author'][0]['family'];
-                $year = $this->getIssueDate(true);
-                if ($year) {
-                    $long_title = sprintf('%1$s (%2$s) - ', $first_author_last_name, $year);
-                } else {
-                    $long_title = sprintf('%s - ', $first_author_last_name);
-                }
-            } elseif (isset($this->csl_data['author'])) {
-                $first_author_last_name = $this->csl_data['author'][0]['family'];
-                $long_title = sprintf('%s - ', $first_author_last_name);
-            }
-            $long_title .= $this->csl_data['title'] ?? '';
-            return $long_title;
-        } elseif ($format == 'long-comma') {
-            $data = [];
-            $first_author_last_name = trim($this->csl_data['author'][0]['family']);
-            $year = trim($this->getIssueDate(true));
-            if ($first_author_last_name) {
-                $data[] = $first_author_last_name;
-            }
-            $data[] = $this->csl_data['title'] ?? '';
-            if ($year) {
-                $data[] = $year;
-            }
-            return implode(', ', $data);
-        } else {
-            return $this->csl_data['title'] ?? '';
-        }
-    }
-
-
-    /**
-     * @returns string A list with all author names.
-     */
-    public function getAuthorNames(): string
-    {
-        if (empty($this->csl_data['author'])) {
-            return '';
-        }
-
-        $names = [];
-        foreach ($this->csl_data['author'] as $author) {
-            $names[] = sprintf('%1$s, %2$s', $author['family'], $author['given']);
-        }
-        return implode('; ', $names);
-    }
-
-
-    /**
-     * Returns a string with the issue date.
-     *
-     * @param bool $year_only Whether to return only the year of the date (true)
-     *     or the whole date (false). Defaults to false.
-     *
-     * @returns string A string representing the issue date.
-     */
-    public function getIssueDate($year_only = false): string
-    {
-        if (!$this->csl_data['issued']) {
-            return '';
-        }
-        if ($year_only) {
-            $year = @$this->csl_data['issued']['date-parts'][0][0];
-            return $year ?: '';
-        }
-        return implode('-', $this->csl_data['issued']['date-parts'][0]) ?: '';
-    }
-
-
-    /**
-     * @returns string A string with identifiers of the document (ISBN, URL, ...).
-     */
-    public function getIdentifiers(): string
-    {
-        $identifiers = [];
-        if ($this->csl_data['ISBN']) {
-            $identifiers[] = sprintf(_('ISBN: %s'), $this->csl_data['ISBN']);
-        }
-        if ($this->csl_data['ISSN']) {
-            $identifiers[] = sprintf(_('ISSN: %s'), $this->csl_data['ISSN']);
-        }
-        return implode('; ', $identifiers);
-    }
-
-
-    /**
-     * Filters the CSL data fields by the document type.
-     * Only those CSL fields that are specified in library_config.inc.php for
-     * the document type are kept.
-     */
-    public function filterCslFieldsByType()
-    {
-        if (!$this->type) {
-            return;
-        }
-
-        $doc_type_config = null;
-        foreach ($GLOBALS['LIBRARY_DOCUMENT_TYPES'] as $doc_config) {
-            if ($doc_config['name'] == $this->type) {
-                $doc_type_config = $doc_config;
-                break;
-            }
-        }
-        if ($doc_type_config == null) {
-            return;
-        }
-        $this->csl_data = array_filter(
-            $this->csl_data,
-            function ($field) use ($doc_type_config) {
-                return in_array($field, $doc_type_config['properties']);
-            },
-            ARRAY_FILTER_USE_KEY
-        );
-    }
-
-
-    /**
-     * Converts this LibraryDocument to an associative array.
-     *
-     * @returns array An associative array containing the data of this
-     *     LibraryDocument instance.
-     */
-    public function toArray(): array
-    {
-        $data = [
-            'id'            => $this->getId(),
-            'type'          => $this->getType(),
-            'csl_data'      => $this->csl_data,
-            'datafields'    => $this->datafields,
-            'search_params' => $this->search_params,
-            'catalog'       => $this->catalog,
-            'opac_link'     => $this->opac_link
-        ];
-        return $data;
-    }
-
-
-    /**
-     * Converts this LibraryDocument to JSON data.
-     *
-     * @returns string A string containing the JSON encoded version of this
-     *     LibraryDocument instance.
-     */
-    public function toJson(): string
-    {
-        return json_encode($this->toArray());
-    }
-
-
-    /**
-     * Fills or creates empty or missing CSL data fields that may be required
-     * when rendering the CSL data.
-     *
-     * @returns array The "enriched" CSL data from this document.
-     */
-    public function fillEmptyCslFields(): array
-    {
-        $enriched_data = [];
-        foreach ($this->csl_data as $key => $field) {
-            if ($key == 'author') {
-                if (!$field[0]['family']) {
-                    $field[0]['family'] = ' ';
-                }
-            }
-            $enriched_data[$key] = $field;
-        }
-        //Make sure all "mandatory" fields are there:
-        if (!array_key_exists('author', $enriched_data)) {
-            $enriched_data['author'] = [
-                [
-                    'given'  => '',
-                    'family' => ' ',
-                    'suffix' => ''
-                ]
-            ];
-        }
-        return $enriched_data;
-    }
-
-
-    /**
-     * Creates a LibraryDocument instance from an associative array.
-     *
-     * @param array $data An associative array containing data for
-     *     a LibraryDocument instance.
-     *
-     * @returns LibraryDocument|null A LibraryDocument instance on success
-     *     or null on failure.
-     */
-    public static function createFromArray(array $data = [])
-    {
-        if (!$data) {
-            return null;
-        }
-        $doc = new LibraryDocument();
-        $doc->id = $data['id'];
-        $doc->type = $data['type'];
-        $doc->csl_data = $data['csl_data'];
-        $doc->datafields = $data['datafields'];
-        $doc->search_params = $data['search_params'];
-        $doc->catalog = $data['catalog'] ?? null;
-        $doc->opac_link = $data['opac_link'] ?? null;
-        return $doc;
-    }
-
-
-    /**
-     * Creates a LibraryDocument instance from JSON data.
-     *
-     * @param string $json_string A JSON string containing data for
-     *     a LibraryDocument instance.
-     *
-     * @returns LibraryDocument|null A LibraryDocument instance on success
-     *     or null on failure.
-     */
-    public static function createFromJson(string $json_string = "")
-    {
-        if (!$json_string) {
-            return null;
-        }
-        $data = json_decode($json_string);
-        if (!$data) {
-            return null;
-        }
-        return self::createFromArray($data);
-    }
-
-
-    /**
-     * Determines if this document is equal to another document.
-     * Equality is determined by comparing various ID fields
-     * and as a last resort, the title, author and year are compared.
-     *
-     * @param LibraryDocument $other Another library document that shall be
-     *     compared to this document.
-     *
-     * @returns bool True, if this document is equal to the other document,
-     *     false otherwise.
-     */
-    public function isEqualTo(LibraryDocument $other): bool
-    {
-        if ($this->type != $other->type) {
-            //No need to do any further checks.
-            return false;
-        }
-        if ($this->id && ($this->id == $other->id)) {
-            return true;
-        } elseif ($this->csl_data['ISSN'] && ($this->csl_data['ISSN'] == $other->csl_data['ISSN'])) {
-            return true;
-        } elseif ($this->csl_data['ISBN'] && ($this->csl_data['ISBN'] == $other->csl_data['ISBN'])) {
-            return true;
-        } elseif ($this->csl_data['DOI'] && ($this->csl_data['DOI'] == $other->csl_data['DOI'])) {
-            return true;
-        } elseif ($this->csl_data['title'] && $this->csl_data['author'] && $this->csl_data['issued']
-            && ($this->csl_data['title'] == $other->csl_data['title'])
-            && ($this->csl_data['author'] == $other->csl_data['author'])
-            && ($this->csl_data['issued'] == $other->csl_data['issued'])) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * @returns Flexi\Template A template containing information about the
-     *     the document.
-     */
-    public function getInfoTemplate($format = 'short')
-    {
-        $factory = new Flexi\Factory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/templates/library/'
-        );
-        $template = $factory->open('library_document_info');
-        $template->set_attribute('document', $this);
-        $template->set_attribute('format', $format);
-        return $template;
-    }
-
-
-    /**
-     * Creates a descriptive text of the search parameters that lead to the
-     * retrieval of this document.
-     *
-     * @returns string[] An array with a textual representation of all
-     *     used search parameters.
-     */
-    public function getSearchDescription()
-    {
-        $description = [];
-        if (isset($this->search_params[LibrarySearch::AUTHOR])) {
-            $description[] = sprintf(_('Autor: „%s“'), $this->search_params[LibrarySearch::AUTHOR]);
-        }
-        if (isset($this->search_params[LibrarySearch::YEAR])) {
-            $description[] = sprintf(_('Jahr: „%s“'), $this->search_params[LibrarySearch::YEAR]);
-        }
-        if (isset($this->search_params[LibrarySearch::TITLE])) {
-            $description[] = sprintf(_('Titel: „%s“'), $this->search_params[LibrarySearch::TITLE]);
-        }
-        if (isset($this->search_params[LibrarySearch::NUMBER])) {
-            $description[] = sprintf(_('Nummer: „%s“'), $this->search_params[LibrarySearch::NUMBER]);
-        }
-        if (isset($this->search_params[LibrarySearch::PUBLICATION])) {
-            $description[] = sprintf(_('Zeitschrift: „%s“'), $this->search_params[LibrarySearch::PUBLICATION]);
-        }
-        if (isset($this->search_params[LibrarySearch::SIGNATURE])) {
-            $description[] = sprintf(_('Signatur: „%s“'), $this->search_params[LibrarySearch::SIGNATURE]);
-        }
-        return $description;
-    }
-
-    public function getIcon()
-    {
-        global $LIBRARY_DOCUMENT_TYPES;
-        $ldt = SimpleCollection::createFromArray($LIBRARY_DOCUMENT_TYPES);
-        $found = $ldt->findOneBy('name', $this->type);
-        $shape = $found['icon'] ?? 'literature-request';
-        return Icon::create($shape);
-    }
-}
diff --git a/lib/classes/librarysearch/LibraryDocument.php b/lib/classes/librarysearch/LibraryDocument.php
new file mode 100644
index 0000000..c1d297e
--- /dev/null
+++ b/lib/classes/librarysearch/LibraryDocument.php
@@ -0,0 +1,442 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+/**
+ * This class represents a document from a library.
+ */
+class LibraryDocument
+{
+    /**
+     * An unique ID of the document.
+     */
+    public $id = '';
+
+
+    /**
+     * The OPAC ID of the document.
+     */
+    public $opac_document_id = '';
+
+
+    /**
+     * The link to the document page in the OPAC system.
+     */
+    public $opac_link = '';
+
+
+    /**
+     * The CSL document type.
+     */
+    public $type = '';
+
+
+    /**
+     * The CSL datafields.
+     */
+    public $csl_data = [];
+
+
+    /**
+     * The name of the catalog from which the document has been retrieved.
+     */
+    public $catalog = '';
+
+
+    /**
+     * Other data that cannot be stored in the $csl_data array.
+     */
+    public $datafields;
+
+
+    /**
+     * The search parameter that have been used to retrieve this item.
+     */
+    public $search_params = [];
+
+
+    /**
+     * Generates an ID for the document.
+     */
+    public function getId()
+    {
+        if (!$this->id) {
+            $this->id = md5(uniqid('LibraryDocument' . $this->getTitle()));
+        }
+        return $this->id;
+    }
+
+
+    /**
+     * Returns the type of the document as string.
+     *
+     * @returns string The type of the document.
+     */
+    public function getType($format = 'name'): string
+    {
+        global $LIBRARY_DOCUMENT_TYPES;
+
+        if ($format === 'name') {
+            return $this->type;
+        }
+        if ($format === 'display_name') {
+            $ldt = SimpleCollection::createFromArray($LIBRARY_DOCUMENT_TYPES);
+            $found = $ldt->findOneBy('name', $this->type);
+            $lang = in_array($_SESSION['_language'], ['de_DE', 'en_GB']) ? $_SESSION['_language'] : 'de_DE';
+            if ($found) {
+                return $found['display_name'][$lang];
+            }
+        }
+
+        return '';
+    }
+
+
+    /**
+     * Returns the title of the document as string.
+     *
+     * @param string $format The format of the title.
+     *     'short' means that only the title is returned.
+     *     'long' means that the author, the year and the title are
+     *     concatenated into one string.
+     *     'long-comma' means that the author, the title and the year
+     *     are concatenated in that order, only separated by a comma.
+     *
+     * @returns string The title of the document.
+     */
+    public function getTitle($format = 'short'): string
+    {
+        if ($format == 'long') {
+            $long_title = '';
+            if (isset($this->csl_data['issued'], $this->csl_data['author'])) {
+                $first_author_last_name = $this->csl_data['author'][0]['family'];
+                $year = $this->getIssueDate(true);
+                if ($year) {
+                    $long_title = sprintf('%1$s (%2$s) - ', $first_author_last_name, $year);
+                } else {
+                    $long_title = sprintf('%s - ', $first_author_last_name);
+                }
+            } elseif (isset($this->csl_data['author'])) {
+                $first_author_last_name = $this->csl_data['author'][0]['family'];
+                $long_title = sprintf('%s - ', $first_author_last_name);
+            }
+            $long_title .= $this->csl_data['title'] ?? '';
+            return $long_title;
+        } elseif ($format == 'long-comma') {
+            $data = [];
+            $first_author_last_name = trim($this->csl_data['author'][0]['family']);
+            $year = trim($this->getIssueDate(true));
+            if ($first_author_last_name) {
+                $data[] = $first_author_last_name;
+            }
+            $data[] = $this->csl_data['title'] ?? '';
+            if ($year) {
+                $data[] = $year;
+            }
+            return implode(', ', $data);
+        } else {
+            return $this->csl_data['title'] ?? '';
+        }
+    }
+
+
+    /**
+     * @returns string A list with all author names.
+     */
+    public function getAuthorNames(): string
+    {
+        if (empty($this->csl_data['author'])) {
+            return '';
+        }
+
+        $names = [];
+        foreach ($this->csl_data['author'] as $author) {
+            $names[] = sprintf('%1$s, %2$s', $author['family'], $author['given']);
+        }
+        return implode('; ', $names);
+    }
+
+
+    /**
+     * Returns a string with the issue date.
+     *
+     * @param bool $year_only Whether to return only the year of the date (true)
+     *     or the whole date (false). Defaults to false.
+     *
+     * @returns string A string representing the issue date.
+     */
+    public function getIssueDate($year_only = false): string
+    {
+        if (!$this->csl_data['issued']) {
+            return '';
+        }
+        if ($year_only) {
+            $year = @$this->csl_data['issued']['date-parts'][0][0];
+            return $year ?: '';
+        }
+        return implode('-', $this->csl_data['issued']['date-parts'][0]) ?: '';
+    }
+
+
+    /**
+     * @returns string A string with identifiers of the document (ISBN, URL, ...).
+     */
+    public function getIdentifiers(): string
+    {
+        $identifiers = [];
+        if ($this->csl_data['ISBN']) {
+            $identifiers[] = sprintf(_('ISBN: %s'), $this->csl_data['ISBN']);
+        }
+        if ($this->csl_data['ISSN']) {
+            $identifiers[] = sprintf(_('ISSN: %s'), $this->csl_data['ISSN']);
+        }
+        return implode('; ', $identifiers);
+    }
+
+
+    /**
+     * Filters the CSL data fields by the document type.
+     * Only those CSL fields that are specified in library_config.inc.php for
+     * the document type are kept.
+     */
+    public function filterCslFieldsByType()
+    {
+        if (!$this->type) {
+            return;
+        }
+
+        $doc_type_config = null;
+        foreach ($GLOBALS['LIBRARY_DOCUMENT_TYPES'] as $doc_config) {
+            if ($doc_config['name'] == $this->type) {
+                $doc_type_config = $doc_config;
+                break;
+            }
+        }
+        if ($doc_type_config == null) {
+            return;
+        }
+        $this->csl_data = array_filter(
+            $this->csl_data,
+            function ($field) use ($doc_type_config) {
+                return in_array($field, $doc_type_config['properties']);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+
+    /**
+     * Converts this LibraryDocument to an associative array.
+     *
+     * @returns array An associative array containing the data of this
+     *     LibraryDocument instance.
+     */
+    public function toArray(): array
+    {
+        $data = [
+            'id'            => $this->getId(),
+            'type'          => $this->getType(),
+            'csl_data'      => $this->csl_data,
+            'datafields'    => $this->datafields,
+            'search_params' => $this->search_params,
+            'catalog'       => $this->catalog,
+            'opac_link'     => $this->opac_link
+        ];
+        return $data;
+    }
+
+
+    /**
+     * Converts this LibraryDocument to JSON data.
+     *
+     * @returns string A string containing the JSON encoded version of this
+     *     LibraryDocument instance.
+     */
+    public function toJson(): string
+    {
+        return json_encode($this->toArray());
+    }
+
+
+    /**
+     * Fills or creates empty or missing CSL data fields that may be required
+     * when rendering the CSL data.
+     *
+     * @returns array The "enriched" CSL data from this document.
+     */
+    public function fillEmptyCslFields(): array
+    {
+        $enriched_data = [];
+        foreach ($this->csl_data as $key => $field) {
+            if ($key == 'author') {
+                if (!$field[0]['family']) {
+                    $field[0]['family'] = ' ';
+                }
+            }
+            $enriched_data[$key] = $field;
+        }
+        //Make sure all "mandatory" fields are there:
+        if (!array_key_exists('author', $enriched_data)) {
+            $enriched_data['author'] = [
+                [
+                    'given'  => '',
+                    'family' => ' ',
+                    'suffix' => ''
+                ]
+            ];
+        }
+        return $enriched_data;
+    }
+
+
+    /**
+     * Creates a LibraryDocument instance from an associative array.
+     *
+     * @param array $data An associative array containing data for
+     *     a LibraryDocument instance.
+     *
+     * @returns LibraryDocument|null A LibraryDocument instance on success
+     *     or null on failure.
+     */
+    public static function createFromArray(array $data = [])
+    {
+        if (!$data) {
+            return null;
+        }
+        $doc = new LibraryDocument();
+        $doc->id = $data['id'];
+        $doc->type = $data['type'];
+        $doc->csl_data = $data['csl_data'];
+        $doc->datafields = $data['datafields'];
+        $doc->search_params = $data['search_params'];
+        $doc->catalog = $data['catalog'] ?? null;
+        $doc->opac_link = $data['opac_link'] ?? null;
+        return $doc;
+    }
+
+
+    /**
+     * Creates a LibraryDocument instance from JSON data.
+     *
+     * @param string $json_string A JSON string containing data for
+     *     a LibraryDocument instance.
+     *
+     * @returns LibraryDocument|null A LibraryDocument instance on success
+     *     or null on failure.
+     */
+    public static function createFromJson(string $json_string = "")
+    {
+        if (!$json_string) {
+            return null;
+        }
+        $data = json_decode($json_string);
+        if (!$data) {
+            return null;
+        }
+        return self::createFromArray($data);
+    }
+
+
+    /**
+     * Determines if this document is equal to another document.
+     * Equality is determined by comparing various ID fields
+     * and as a last resort, the title, author and year are compared.
+     *
+     * @param LibraryDocument $other Another library document that shall be
+     *     compared to this document.
+     *
+     * @returns bool True, if this document is equal to the other document,
+     *     false otherwise.
+     */
+    public function isEqualTo(LibraryDocument $other): bool
+    {
+        if ($this->type != $other->type) {
+            //No need to do any further checks.
+            return false;
+        }
+        if ($this->id && ($this->id == $other->id)) {
+            return true;
+        } elseif ($this->csl_data['ISSN'] && ($this->csl_data['ISSN'] == $other->csl_data['ISSN'])) {
+            return true;
+        } elseif ($this->csl_data['ISBN'] && ($this->csl_data['ISBN'] == $other->csl_data['ISBN'])) {
+            return true;
+        } elseif ($this->csl_data['DOI'] && ($this->csl_data['DOI'] == $other->csl_data['DOI'])) {
+            return true;
+        } elseif ($this->csl_data['title'] && $this->csl_data['author'] && $this->csl_data['issued']
+            && ($this->csl_data['title'] == $other->csl_data['title'])
+            && ($this->csl_data['author'] == $other->csl_data['author'])
+            && ($this->csl_data['issued'] == $other->csl_data['issued'])) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * @returns Flexi\Template A template containing information about the
+     *     the document.
+     */
+    public function getInfoTemplate($format = 'short')
+    {
+        $factory = new Flexi\Factory(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/templates/library/'
+        );
+        $template = $factory->open('library_document_info');
+        $template->set_attribute('document', $this);
+        $template->set_attribute('format', $format);
+        return $template;
+    }
+
+
+    /**
+     * Creates a descriptive text of the search parameters that lead to the
+     * retrieval of this document.
+     *
+     * @returns string[] An array with a textual representation of all
+     *     used search parameters.
+     */
+    public function getSearchDescription()
+    {
+        $description = [];
+        if (isset($this->search_params[LibrarySearch::AUTHOR])) {
+            $description[] = sprintf(_('Autor: „%s“'), $this->search_params[LibrarySearch::AUTHOR]);
+        }
+        if (isset($this->search_params[LibrarySearch::YEAR])) {
+            $description[] = sprintf(_('Jahr: „%s“'), $this->search_params[LibrarySearch::YEAR]);
+        }
+        if (isset($this->search_params[LibrarySearch::TITLE])) {
+            $description[] = sprintf(_('Titel: „%s“'), $this->search_params[LibrarySearch::TITLE]);
+        }
+        if (isset($this->search_params[LibrarySearch::NUMBER])) {
+            $description[] = sprintf(_('Nummer: „%s“'), $this->search_params[LibrarySearch::NUMBER]);
+        }
+        if (isset($this->search_params[LibrarySearch::PUBLICATION])) {
+            $description[] = sprintf(_('Zeitschrift: „%s“'), $this->search_params[LibrarySearch::PUBLICATION]);
+        }
+        if (isset($this->search_params[LibrarySearch::SIGNATURE])) {
+            $description[] = sprintf(_('Signatur: „%s“'), $this->search_params[LibrarySearch::SIGNATURE]);
+        }
+        return $description;
+    }
+
+    public function getIcon()
+    {
+        global $LIBRARY_DOCUMENT_TYPES;
+        $ldt = SimpleCollection::createFromArray($LIBRARY_DOCUMENT_TYPES);
+        $found = $ldt->findOneBy('name', $this->type);
+        $shape = $found['icon'] ?? 'literature-request';
+        return Icon::create($shape);
+    }
+}
diff --git a/lib/classes/librarysearch/LibraryResultParser.interface.php b/lib/classes/librarysearch/LibraryResultParser.interface.php
deleted file mode 100644
index eae45a4..0000000
--- a/lib/classes/librarysearch/LibraryResultParser.interface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This interface defines methods for reading search results from a
- * library catalog.
- */
-interface LibraryResultParser
-{
-    /**
-     * Read a set of search results from raw data.
-     *
-     * @returns LibraryDocument[] An array with all LibraryDocument
-     *     instances that could be read from the raw data.
-     */
-    public function readResultSet($data = '') : array;
-
-
-    /**
-     * Reads one search result record from raw data.
-     *
-     * @returns LibraryDocument|null The read data as LibraryDocument.
-     *     null is returned if no document could be read.
-     */
-    public function readRecord($data = '') : LibraryDocument;
-}
diff --git a/lib/classes/librarysearch/LibraryResultParser.php b/lib/classes/librarysearch/LibraryResultParser.php
new file mode 100644
index 0000000..eae45a4
--- /dev/null
+++ b/lib/classes/librarysearch/LibraryResultParser.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This interface defines methods for reading search results from a
+ * library catalog.
+ */
+interface LibraryResultParser
+{
+    /**
+     * Read a set of search results from raw data.
+     *
+     * @returns LibraryDocument[] An array with all LibraryDocument
+     *     instances that could be read from the raw data.
+     */
+    public function readResultSet($data = '') : array;
+
+
+    /**
+     * Reads one search result record from raw data.
+     *
+     * @returns LibraryDocument|null The read data as LibraryDocument.
+     *     null is returned if no document could be read.
+     */
+    public function readRecord($data = '') : LibraryDocument;
+}
diff --git a/lib/classes/librarysearch/LibrarySearch.class.php b/lib/classes/librarysearch/LibrarySearch.class.php
deleted file mode 100644
index 473eacf..0000000
--- a/lib/classes/librarysearch/LibrarySearch.class.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This class contains basic methods for querying a library catalog
- * using standardised search parameters.
- */
-abstract class LibrarySearch
-{
-    //The following constants define the strings for the
-    //standardised field names for the query method. These can be
-    //converted to library-specific field names.
-    const TITLE       = 'title';
-    const AUTHOR      = 'author';
-    const YEAR        = 'year';
-    const NUMBER      = 'number';
-    const ISSN        = 'issn';
-    const ISBN        = 'isbn';
-    const PUBLICATION = 'publication';
-    const SIGNATURE   = 'signature';
-
-    //Constants for the ordering of results.
-    const ORDER_BY_RELEVANCE = 'relevance';
-    const ORDER_BY_YEAR = 'year';
-
-
-    /**
-     * The base URL for the HTTP request to retrieve data.
-     */
-    protected $request_base_url = '';
-
-
-    /**
-     * Additional URL parameters for the HTTP request to retrieve data.
-     */
-    protected $request_url_parameters = [];
-
-
-    /**
-     * Implementation-specific configuration that can define the behavior
-     * of the LibrarySearch implementation.
-     */
-    protected $settings = [];
-
-
-    /**
-     * A basic constructor.
-     *
-     * @param array $configuration The configuration for the LibrarySearch
-     *     implementation. It should be an associative array with the following
-     *     keys:
-     *     - base_url: The base URL for retrieving data.
-     *     - additional_url_parameters: Additional URL parameters for the base URL.
-     *     - settings: Implementation-specific configuration. This should also
-     *         be an associative array.
-     */
-    public function __construct(array $configuration = [])
-    {
-        if ($configuration['base_url']) {
-            $this->request_base_url = $configuration['base_url'];
-        }
-        if (is_array($configuration['additional_url_parameters'])) {
-            $this->request_url_parameters = $configuration['additional_url_parameters'];
-        }
-        if (is_array($configuration['settings'])) {
-            $this->settings = $configuration['settings'];
-        }
-    }
-
-
-    /**
-     * This method shall replace the generalised search query fields with the
-     * implementation specific query fields.
-     *
-     * @param array $query_fields An array with query parameters using the
-     *     generalised query fields.
-     *
-     * @returns array The translated version of the $query_fields array.
-     */
-    abstract protected function translateQueryFields(array $query_fields = []) : array;
-
-
-    /**
-     * A common method for the libcurl code to request data from an URL so that
-     * LibrarySearch implementations don't have to include their own libcurl
-     * code to get data.
-     *
-     * @param string $base_url The base URL to request data from.
-     *
-     * @param array $url_parameters URL parameters for the request. The array
-     *     should consist of an associative array with keys representing
-     *     the parameter name and the values representing the parameter values.
-     *
-     * @returns string|bool The result of the request. If the base URL is empty
-     *     or no data could be retrieved due to an error, false is returned.
-     *     In case of success, a string with the retrieved data is returned.
-     */
-    protected function requestData(string $base_url = '', array $url_parameters = [])
-    {
-        if (!$base_url) {
-            return false;
-        }
-        $full_url = $base_url;
-        if ($url_parameters) {
-            $full_url .= '?' . http_build_query($url_parameters);
-        }
-
-        $data = file_get_contents($full_url, false, get_default_http_stream_context($base_url));
-        return $data;
-    }
-
-
-    /**
-     * Starts a query to a library catalogue using the specified
-     * parameters. If standardised parameters as defined in the FIELD_
-     * constants of this class are used as keys in the $search_parameters array,
-     * their keys may be converted to library-specific search keys.
-     *
-     * @param array $search_parameters The search parameters to be used.
-     *     The array must be an associative array where the keys represent
-     *     the fields.
-     *
-     * @param string $order_by
-     *
-     * @param int $limit The maximum amount of items that shall be retrieved
-     *     from the catalog.
-     *
-     * @returns LibrarySearchResult[] An array of LibrarySearchResult items
-     *     if entries matching the search could be found in the library.
-     */
-    abstract public function query(
-        array $search_parameters = [],
-        string $order_by = self::ORDER_BY_RELEVANCE,
-        int $limit = 200
-    ) : array;
-}
diff --git a/lib/classes/librarysearch/LibrarySearch.php b/lib/classes/librarysearch/LibrarySearch.php
new file mode 100644
index 0000000..473eacf
--- /dev/null
+++ b/lib/classes/librarysearch/LibrarySearch.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This class contains basic methods for querying a library catalog
+ * using standardised search parameters.
+ */
+abstract class LibrarySearch
+{
+    //The following constants define the strings for the
+    //standardised field names for the query method. These can be
+    //converted to library-specific field names.
+    const TITLE       = 'title';
+    const AUTHOR      = 'author';
+    const YEAR        = 'year';
+    const NUMBER      = 'number';
+    const ISSN        = 'issn';
+    const ISBN        = 'isbn';
+    const PUBLICATION = 'publication';
+    const SIGNATURE   = 'signature';
+
+    //Constants for the ordering of results.
+    const ORDER_BY_RELEVANCE = 'relevance';
+    const ORDER_BY_YEAR = 'year';
+
+
+    /**
+     * The base URL for the HTTP request to retrieve data.
+     */
+    protected $request_base_url = '';
+
+
+    /**
+     * Additional URL parameters for the HTTP request to retrieve data.
+     */
+    protected $request_url_parameters = [];
+
+
+    /**
+     * Implementation-specific configuration that can define the behavior
+     * of the LibrarySearch implementation.
+     */
+    protected $settings = [];
+
+
+    /**
+     * A basic constructor.
+     *
+     * @param array $configuration The configuration for the LibrarySearch
+     *     implementation. It should be an associative array with the following
+     *     keys:
+     *     - base_url: The base URL for retrieving data.
+     *     - additional_url_parameters: Additional URL parameters for the base URL.
+     *     - settings: Implementation-specific configuration. This should also
+     *         be an associative array.
+     */
+    public function __construct(array $configuration = [])
+    {
+        if ($configuration['base_url']) {
+            $this->request_base_url = $configuration['base_url'];
+        }
+        if (is_array($configuration['additional_url_parameters'])) {
+            $this->request_url_parameters = $configuration['additional_url_parameters'];
+        }
+        if (is_array($configuration['settings'])) {
+            $this->settings = $configuration['settings'];
+        }
+    }
+
+
+    /**
+     * This method shall replace the generalised search query fields with the
+     * implementation specific query fields.
+     *
+     * @param array $query_fields An array with query parameters using the
+     *     generalised query fields.
+     *
+     * @returns array The translated version of the $query_fields array.
+     */
+    abstract protected function translateQueryFields(array $query_fields = []) : array;
+
+
+    /**
+     * A common method for the libcurl code to request data from an URL so that
+     * LibrarySearch implementations don't have to include their own libcurl
+     * code to get data.
+     *
+     * @param string $base_url The base URL to request data from.
+     *
+     * @param array $url_parameters URL parameters for the request. The array
+     *     should consist of an associative array with keys representing
+     *     the parameter name and the values representing the parameter values.
+     *
+     * @returns string|bool The result of the request. If the base URL is empty
+     *     or no data could be retrieved due to an error, false is returned.
+     *     In case of success, a string with the retrieved data is returned.
+     */
+    protected function requestData(string $base_url = '', array $url_parameters = [])
+    {
+        if (!$base_url) {
+            return false;
+        }
+        $full_url = $base_url;
+        if ($url_parameters) {
+            $full_url .= '?' . http_build_query($url_parameters);
+        }
+
+        $data = file_get_contents($full_url, false, get_default_http_stream_context($base_url));
+        return $data;
+    }
+
+
+    /**
+     * Starts a query to a library catalogue using the specified
+     * parameters. If standardised parameters as defined in the FIELD_
+     * constants of this class are used as keys in the $search_parameters array,
+     * their keys may be converted to library-specific search keys.
+     *
+     * @param array $search_parameters The search parameters to be used.
+     *     The array must be an associative array where the keys represent
+     *     the fields.
+     *
+     * @param string $order_by
+     *
+     * @param int $limit The maximum amount of items that shall be retrieved
+     *     from the catalog.
+     *
+     * @returns LibrarySearchResult[] An array of LibrarySearchResult items
+     *     if entries matching the search could be found in the library.
+     */
+    abstract public function query(
+        array $search_parameters = [],
+        string $order_by = self::ORDER_BY_RELEVANCE,
+        int $limit = 200
+    ) : array;
+}
diff --git a/lib/classes/librarysearch/LibrarySearchManager.class.php b/lib/classes/librarysearch/LibrarySearchManager.class.php
deleted file mode 100644
index ee9dc75..0000000
--- a/lib/classes/librarysearch/LibrarySearchManager.class.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-
-/**
- * This is a helper class for the library search functionality.
- */
-class LibrarySearchManager
-{
-    /**
-     * Checks whether catalogs are configured or not.
-     *
-     * @param bool Whether to exclude local catalogs from the list of
-     *     configured catalogs (true) or not (false). Defaults to false.
-     *
-     * @returns bool True, if at least one catalog is configured,
-     *     false otherwise.
-     */
-    public static function catalogsConfigured(bool $exclude_local = false) : bool
-    {
-        $activated_catalogs = $GLOBALS['LIBRARY_CATALOGS'];
-        if (!$activated_catalogs) {
-            return false;
-        }
-
-        if (!$exclude_local) {
-            //At least one catalog is configured.
-            return true;
-        }
-
-        //Check if there are other catalogs than the local one:
-        $other_catalogs = 0;
-        foreach ($activated_catalogs as $catalog) {
-            if (!$catalog['local_catalog']) {
-                $other_catalogs++;
-            }
-        }
-
-        return $other_catalogs > 0;
-    }
-
-
-    /**
-     * Starts a search in the configured library catalogs.
-     * If a local catalog is configured, its results are compared to
-     * the other catalogs results to identify matches that are available
-     * in the local catalog.
-     *
-     * @param array $search_parameters The search parameters to be used.
-     *     @see The LibrarySearch class for standardised field names.
-     *
-     * @param string $order_by The ordering of the search results.
-     *     @see The LibrarySearch class for allowed order names.
-     *
-     * @param int $limit The maximum amount of results for each catalog.
-     *
-     * @returns LibraryDocument[][] A two-dimensional array of
-     *     LibraryDocument instances where the first dimension represents
-     *     a catalog and the second dimension represents the search results.
-     *
-     * @throws Exception If no library catalogs are configured.
-     */
-    public static function search(
-        array $search_parameters = [],
-        string $order_by = LibrarySearch::ORDER_BY_RELEVANCE,
-        int $limit = 100
-    ) : array
-    {
-        //Get the set of activated library catalogs:
-        $activated_catalogs = $GLOBALS['LIBRARY_CATALOGS'];
-        if (!$activated_catalogs) {
-            throw new Exception(
-                _('In dieser Stud.IP-Installation sind keine Bibliothekskataloge aktiviert!')
-            );
-        }
-
-        $result_sets = [];
-        $local_catalog_result_set = [];
-        foreach ($activated_catalogs as $catalog_data) {
-            if (is_a($catalog_data['class_name'], 'LibrarySearch', true)) {
-                $catalog_class = $catalog_data['class_name'];
-                $catalog_config = [
-                    'base_url' => $catalog_data['base_url'],
-                    'additional_url_parameters' => $catalog_data['additional_url_parameters'],
-                    'settings' => $catalog_data['settings']
-                ];
-                $search = new $catalog_class($catalog_config);
-                if ($catalog_data['local_catalog']) {
-                    $local_catalog_result_set = $search->query(
-                        $search_parameters,
-                        $order_by,
-                        $limit
-                    );
-                    foreach ($local_catalog_result_set as $result) {
-                        $result->catalog = $catalog_data['name'];
-                        if ($result->csl_data['id']) {
-                            $result->opac_document_id = $result->csl_data['id'];
-                            if (isset($catalog_data['opac_link_template'])) {
-                                $result->opac_link = str_replace(
-                                    '{opac_document_id}',
-                                    htmlReady($result->opac_document_id),
-                                    $catalog_data['opac_link_template']
-                                );
-                            }
-                        }
-                    }
-                } else {
-                    $result_sets[$catalog_class] = $search->query(
-                        $search_parameters,
-                        $order_by,
-                        $limit
-                    );
-                    foreach ($result_sets[$catalog_class] as $result) {
-                        $result->catalog = $catalog_data['name'];
-                    }
-                }
-            }
-        }
-
-        //Build the sorted result set by rotating over each unsorted
-        //result set until the end of each result set is reached.
-        //This way, we get the top results for each catalog as first
-        //entries in the result set.
-        //Furthermore, filter out all entries that are already present
-        //in the local catalog.
-        $all_empty = false;
-        $result_c = 0;
-        $merged_results = [];
-        $iterators = [];
-        foreach ($result_sets as $set) {
-            $iterators[] = new ArrayIterator($set);
-        }
-        if (count($local_catalog_result_set)) {
-            foreach ($local_catalog_result_set as $result) {
-                $result->search_params = $search_parameters;
-                $merged_results[$result->getId()] = $result;
-            }
-        }
-        while (!$all_empty) {
-            $all_empty = true;
-            foreach ($iterators as $iterator) {
-                $result = $iterator->current();
-                if ($result instanceof LibraryDocument) {
-                    $result_c++;
-                    $all_empty = false;
-                    $found_in_local_catalog = false;
-                    foreach ($local_catalog_result_set as $key => $local_result) {
-                        if ($local_result->isEqualTo($result)) {
-                            //The result is in the local catalog.
-                            unset($local_catalog_result_set[$key]);
-                            $found_in_local_catalog = true;
-                            break;
-                        }
-                    }
-                    if (!$found_in_local_catalog) {
-                        //Store the result in the cache.
-                        //We need it in the create_library action.
-                        //Put the search parameters into the result before adding it
-                        //to the cache:
-                        $result->search_params = $search_parameters;
-                        $merged_results[$result->getId()] = $result;
-                    }
-                }
-                if ($iterator->valid()) {
-                    $all_empty = false;
-                    $iterator->next();
-                }
-            }
-        }
-
-
-        //At this point, the search results are sorted.
-        return $merged_results;
-    }
-}
diff --git a/lib/classes/librarysearch/LibrarySearchManager.php b/lib/classes/librarysearch/LibrarySearchManager.php
new file mode 100644
index 0000000..ee9dc75
--- /dev/null
+++ b/lib/classes/librarysearch/LibrarySearchManager.php
@@ -0,0 +1,174 @@
+<?php
+
+
+/**
+ * This is a helper class for the library search functionality.
+ */
+class LibrarySearchManager
+{
+    /**
+     * Checks whether catalogs are configured or not.
+     *
+     * @param bool Whether to exclude local catalogs from the list of
+     *     configured catalogs (true) or not (false). Defaults to false.
+     *
+     * @returns bool True, if at least one catalog is configured,
+     *     false otherwise.
+     */
+    public static function catalogsConfigured(bool $exclude_local = false) : bool
+    {
+        $activated_catalogs = $GLOBALS['LIBRARY_CATALOGS'];
+        if (!$activated_catalogs) {
+            return false;
+        }
+
+        if (!$exclude_local) {
+            //At least one catalog is configured.
+            return true;
+        }
+
+        //Check if there are other catalogs than the local one:
+        $other_catalogs = 0;
+        foreach ($activated_catalogs as $catalog) {
+            if (!$catalog['local_catalog']) {
+                $other_catalogs++;
+            }
+        }
+
+        return $other_catalogs > 0;
+    }
+
+
+    /**
+     * Starts a search in the configured library catalogs.
+     * If a local catalog is configured, its results are compared to
+     * the other catalogs results to identify matches that are available
+     * in the local catalog.
+     *
+     * @param array $search_parameters The search parameters to be used.
+     *     @see The LibrarySearch class for standardised field names.
+     *
+     * @param string $order_by The ordering of the search results.
+     *     @see The LibrarySearch class for allowed order names.
+     *
+     * @param int $limit The maximum amount of results for each catalog.
+     *
+     * @returns LibraryDocument[][] A two-dimensional array of
+     *     LibraryDocument instances where the first dimension represents
+     *     a catalog and the second dimension represents the search results.
+     *
+     * @throws Exception If no library catalogs are configured.
+     */
+    public static function search(
+        array $search_parameters = [],
+        string $order_by = LibrarySearch::ORDER_BY_RELEVANCE,
+        int $limit = 100
+    ) : array
+    {
+        //Get the set of activated library catalogs:
+        $activated_catalogs = $GLOBALS['LIBRARY_CATALOGS'];
+        if (!$activated_catalogs) {
+            throw new Exception(
+                _('In dieser Stud.IP-Installation sind keine Bibliothekskataloge aktiviert!')
+            );
+        }
+
+        $result_sets = [];
+        $local_catalog_result_set = [];
+        foreach ($activated_catalogs as $catalog_data) {
+            if (is_a($catalog_data['class_name'], 'LibrarySearch', true)) {
+                $catalog_class = $catalog_data['class_name'];
+                $catalog_config = [
+                    'base_url' => $catalog_data['base_url'],
+                    'additional_url_parameters' => $catalog_data['additional_url_parameters'],
+                    'settings' => $catalog_data['settings']
+                ];
+                $search = new $catalog_class($catalog_config);
+                if ($catalog_data['local_catalog']) {
+                    $local_catalog_result_set = $search->query(
+                        $search_parameters,
+                        $order_by,
+                        $limit
+                    );
+                    foreach ($local_catalog_result_set as $result) {
+                        $result->catalog = $catalog_data['name'];
+                        if ($result->csl_data['id']) {
+                            $result->opac_document_id = $result->csl_data['id'];
+                            if (isset($catalog_data['opac_link_template'])) {
+                                $result->opac_link = str_replace(
+                                    '{opac_document_id}',
+                                    htmlReady($result->opac_document_id),
+                                    $catalog_data['opac_link_template']
+                                );
+                            }
+                        }
+                    }
+                } else {
+                    $result_sets[$catalog_class] = $search->query(
+                        $search_parameters,
+                        $order_by,
+                        $limit
+                    );
+                    foreach ($result_sets[$catalog_class] as $result) {
+                        $result->catalog = $catalog_data['name'];
+                    }
+                }
+            }
+        }
+
+        //Build the sorted result set by rotating over each unsorted
+        //result set until the end of each result set is reached.
+        //This way, we get the top results for each catalog as first
+        //entries in the result set.
+        //Furthermore, filter out all entries that are already present
+        //in the local catalog.
+        $all_empty = false;
+        $result_c = 0;
+        $merged_results = [];
+        $iterators = [];
+        foreach ($result_sets as $set) {
+            $iterators[] = new ArrayIterator($set);
+        }
+        if (count($local_catalog_result_set)) {
+            foreach ($local_catalog_result_set as $result) {
+                $result->search_params = $search_parameters;
+                $merged_results[$result->getId()] = $result;
+            }
+        }
+        while (!$all_empty) {
+            $all_empty = true;
+            foreach ($iterators as $iterator) {
+                $result = $iterator->current();
+                if ($result instanceof LibraryDocument) {
+                    $result_c++;
+                    $all_empty = false;
+                    $found_in_local_catalog = false;
+                    foreach ($local_catalog_result_set as $key => $local_result) {
+                        if ($local_result->isEqualTo($result)) {
+                            //The result is in the local catalog.
+                            unset($local_catalog_result_set[$key]);
+                            $found_in_local_catalog = true;
+                            break;
+                        }
+                    }
+                    if (!$found_in_local_catalog) {
+                        //Store the result in the cache.
+                        //We need it in the create_library action.
+                        //Put the search parameters into the result before adding it
+                        //to the cache:
+                        $result->search_params = $search_parameters;
+                        $merged_results[$result->getId()] = $result;
+                    }
+                }
+                if ($iterator->valid()) {
+                    $all_empty = false;
+                    $iterator->next();
+                }
+            }
+        }
+
+
+        //At this point, the search results are sorted.
+        return $merged_results;
+    }
+}
diff --git a/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.class.php
deleted file mode 100644
index b92628f..0000000
--- a/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.class.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibraryResultParser implementation for the BASE catalog.
- *
- * @see LibraryResultParser
- */
-class BASELibraryResultParser implements LibraryResultParser
-{
-    /**
-     * This is a helper method to index the child nodes of a node which makes
-     * accessing them easier. The index is like the "name" attribute
-     * of the DOM child node.
-     *
-     * @param DOMElement $node The node whose child nodes shall be indexed.
-     *
-     * @returns DOMElement[] An array of DOMElement nodes reperesenting
-     * the indexed child nodes of the supplied node.
-     */
-    protected function indexChildren(\DOMElement $node)
-    {
-        $indexed_children = [];
-        $children = $node->childNodes;
-        foreach ($children as $child) {
-            $index = $child->getAttribute('name');
-            $indexed_children[$index] = $child;
-        }
-        return $indexed_children;
-    }
-
-
-    /**
-     * Reads the XML nodes of one record and creates a LibraryDocument
-     * out of it.
-     *
-     * @param DOMElement $node The XML node of one record.
-     *
-     * @returns LibraryDocument The LibraryDocument instance that could be read
-     *     from the data.
-     */
-    protected function readXMLRecord(\DOMElement $node) : LibraryDocument
-    {
-        $result = new LibraryDocument();
-
-        $children = $this->indexChildren($node);
-
-        foreach ($children as $name => $child) {
-            if ($child instanceof \DOMElement) {
-                if ($name == 'dctypenorm') {
-                    //Set the document type by the value of this field.
-                    $base_typeid = trim($child->textContent);
-                    if ($base_typeid == '11' || $base_typeid == '111') {
-                        $result->type = 'book';
-                    } elseif ($base_typeid == '12' || $base_typeid == '121' || $base_typeid == '122') {
-                        $result->type = 'article';
-                    } elseif ($base_typeid == '13') {
-                        $result->type = 'paper-conference';
-                    } elseif ($base_typeid == '14') {
-                        $result->type = 'report';
-                    } else {
-                        $result->type = $base_typeid;
-                    }
-                } elseif ($name == 'dctitle') {
-                    $result->csl_data['title'] = $child->textContent;
-                } elseif ($name == 'dccreator') {
-                    $authors = $child->getElementsByTagName('str');
-                    $csl_authors = [];
-                    foreach ($authors as $author) {
-                        $author_names = explode(', ', $author->textContent);
-                        $csl_authors[] = [
-                            'family' => $author_names[0],
-                            'given' => $author_names[1],
-                            'suffix' => ''
-                        ];
-                    }
-                    $result->csl_data['author'] = $csl_authors;
-                } elseif ($name == 'dcdate') {
-                    $date_and_time = explode('T', $child->textContent);
-                    $date_parts = explode('-', $date_and_time[0]);
-                    $result->csl_data['issued'] = ['date-parts' => [$date_parts]];
-                } elseif (($name == 'dcyear') && !($result->csl_data['issued'])) {
-                    $result->csl_data['issued'] = ['date-parts' => [$child->textContent]];
-                } elseif ($name == 'dcdescription') {
-                    $result->csl_data['abstract'] = $child->textContent;
-                } elseif ($name == 'dcpublisher') {
-                    $str = $child->childNodes[0];
-                    if ($str instanceof \DOMElement) {
-                        $result->csl_data['publisher'] = $str->textContent;
-                    }
-                } elseif ($name == 'dclink') {
-                    $result->csl_data['URL'] = $child->textContent;
-                } elseif ($name == 'dcdocid') {
-                    $result->csl_data['DOI'] = $child->textContent;
-                } else {
-                    //All other field values are stored in the datafields array.
-                    $result->datafields[$name] = $child->textContent;
-                }
-            }
-        }
-        return $result;
-    }
-
-
-    /**
-     * @see LibraryResultParser::readResultSet
-     */
-    public function readResultSet($data = '') : array
-    {
-        if (!$data) {
-            return [];
-        }
-        $dom = new \DOMDocument();
-        @$dom->loadXML($data);
-        $result = $dom->getElementsByTagName('response')[0];
-        if (!$result) {
-            //Wrong document type.
-            return [];
-        }
-
-        $documents = $result->getElementsByTagName('doc');
-        $result_set = [];
-        foreach ($documents as $document) {
-            $result_set[] = $this->readXMLRecord($document);
-        }
-        return $result_set;
-    }
-
-
-    /**
-     * @see LibraryResultParser::readRecord
-     */
-    public function readRecord($data = ''): LibraryDocument
-    {
-        $dom = new DOMDocument();
-        @$dom->loadXML($data);
-        $record = $dom->getElementsByTagName('doc')[0];
-        if ($record) {
-           return $this->readXMLRecord($record);
-        }
-
-        throw new Exception('Could not read record');
-    }
-}
diff --git a/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.php b/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.php
new file mode 100644
index 0000000..b92628f
--- /dev/null
+++ b/lib/classes/librarysearch/resultparsers/BASELibraryResultParser.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibraryResultParser implementation for the BASE catalog.
+ *
+ * @see LibraryResultParser
+ */
+class BASELibraryResultParser implements LibraryResultParser
+{
+    /**
+     * This is a helper method to index the child nodes of a node which makes
+     * accessing them easier. The index is like the "name" attribute
+     * of the DOM child node.
+     *
+     * @param DOMElement $node The node whose child nodes shall be indexed.
+     *
+     * @returns DOMElement[] An array of DOMElement nodes reperesenting
+     * the indexed child nodes of the supplied node.
+     */
+    protected function indexChildren(\DOMElement $node)
+    {
+        $indexed_children = [];
+        $children = $node->childNodes;
+        foreach ($children as $child) {
+            $index = $child->getAttribute('name');
+            $indexed_children[$index] = $child;
+        }
+        return $indexed_children;
+    }
+
+
+    /**
+     * Reads the XML nodes of one record and creates a LibraryDocument
+     * out of it.
+     *
+     * @param DOMElement $node The XML node of one record.
+     *
+     * @returns LibraryDocument The LibraryDocument instance that could be read
+     *     from the data.
+     */
+    protected function readXMLRecord(\DOMElement $node) : LibraryDocument
+    {
+        $result = new LibraryDocument();
+
+        $children = $this->indexChildren($node);
+
+        foreach ($children as $name => $child) {
+            if ($child instanceof \DOMElement) {
+                if ($name == 'dctypenorm') {
+                    //Set the document type by the value of this field.
+                    $base_typeid = trim($child->textContent);
+                    if ($base_typeid == '11' || $base_typeid == '111') {
+                        $result->type = 'book';
+                    } elseif ($base_typeid == '12' || $base_typeid == '121' || $base_typeid == '122') {
+                        $result->type = 'article';
+                    } elseif ($base_typeid == '13') {
+                        $result->type = 'paper-conference';
+                    } elseif ($base_typeid == '14') {
+                        $result->type = 'report';
+                    } else {
+                        $result->type = $base_typeid;
+                    }
+                } elseif ($name == 'dctitle') {
+                    $result->csl_data['title'] = $child->textContent;
+                } elseif ($name == 'dccreator') {
+                    $authors = $child->getElementsByTagName('str');
+                    $csl_authors = [];
+                    foreach ($authors as $author) {
+                        $author_names = explode(', ', $author->textContent);
+                        $csl_authors[] = [
+                            'family' => $author_names[0],
+                            'given' => $author_names[1],
+                            'suffix' => ''
+                        ];
+                    }
+                    $result->csl_data['author'] = $csl_authors;
+                } elseif ($name == 'dcdate') {
+                    $date_and_time = explode('T', $child->textContent);
+                    $date_parts = explode('-', $date_and_time[0]);
+                    $result->csl_data['issued'] = ['date-parts' => [$date_parts]];
+                } elseif (($name == 'dcyear') && !($result->csl_data['issued'])) {
+                    $result->csl_data['issued'] = ['date-parts' => [$child->textContent]];
+                } elseif ($name == 'dcdescription') {
+                    $result->csl_data['abstract'] = $child->textContent;
+                } elseif ($name == 'dcpublisher') {
+                    $str = $child->childNodes[0];
+                    if ($str instanceof \DOMElement) {
+                        $result->csl_data['publisher'] = $str->textContent;
+                    }
+                } elseif ($name == 'dclink') {
+                    $result->csl_data['URL'] = $child->textContent;
+                } elseif ($name == 'dcdocid') {
+                    $result->csl_data['DOI'] = $child->textContent;
+                } else {
+                    //All other field values are stored in the datafields array.
+                    $result->datafields[$name] = $child->textContent;
+                }
+            }
+        }
+        return $result;
+    }
+
+
+    /**
+     * @see LibraryResultParser::readResultSet
+     */
+    public function readResultSet($data = '') : array
+    {
+        if (!$data) {
+            return [];
+        }
+        $dom = new \DOMDocument();
+        @$dom->loadXML($data);
+        $result = $dom->getElementsByTagName('response')[0];
+        if (!$result) {
+            //Wrong document type.
+            return [];
+        }
+
+        $documents = $result->getElementsByTagName('doc');
+        $result_set = [];
+        foreach ($documents as $document) {
+            $result_set[] = $this->readXMLRecord($document);
+        }
+        return $result_set;
+    }
+
+
+    /**
+     * @see LibraryResultParser::readRecord
+     */
+    public function readRecord($data = ''): LibraryDocument
+    {
+        $dom = new DOMDocument();
+        @$dom->loadXML($data);
+        $record = $dom->getElementsByTagName('doc')[0];
+        if ($record) {
+           return $this->readXMLRecord($record);
+        }
+
+        throw new Exception('Could not read record');
+    }
+}
diff --git a/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.class.php
deleted file mode 100644
index b4b3a20..0000000
--- a/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.class.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibraryResultParser implementation for the K10PlusZentral catalog.
- *
- * @see LibraryResultParser
- */
-class K10PlusLibraryResultParser implements LibraryResultParser
-{
-    /**
-     * @see LibraryResultParser::readResultSet
-     */
-    public function readResultSet($data = '') : array
-    {
-        //Convert the data to JSON:
-        $json_data = json_decode($data, true);
-
-        $header = $json_data['responseHeader'];
-
-        if ($header['status'] != 0) {
-            //Probably an error!
-            return [];
-        }
-
-        if (!$json_data['response']) {
-            //JSON structure error!
-            return [];
-        }
-
-        if (!$json_data['response']['docs'] || ($json_data['response']['numFound'] == 0)) {
-            //No data found.
-            return [];
-        }
-
-        $result_set = [];
-        foreach ($json_data['response']['docs'] as $doc_data) {
-            $result = $this->readRecord($doc_data);
-            if ($result instanceof LibraryDocument) {
-                $result_set[] = $result;
-            }
-        }
-        return $result_set;
-    }
-
-
-    /**
-     * @see LibraryResultParser::readRecord
-     */
-    public function readRecord($data = '') : LibraryDocument
-    {
-        $parser = new MarcxmlLibraryResultParser();
-        //The result is one marcxml record in a collection:
-        $result = $parser->readResultSet($data['fullrecord_marcxml'])[0];
-        //Now we have to set the type using the data from the JSON fields:
-        $doc_type = $data['format'][0];
-        if (($doc_type == 'Article') || ($doc_type == 'electronic Article')) {
-            $result->type = 'article';
-        } elseif (($doc_type == 'Book') || ($doc_type == 'eBook')) {
-            $result->type = 'book';
-        } elseif ($doc_type == 'journal') {
-            $result->type = 'article-journal';
-        }
-        if (!isset($result->csl_data['URL'])) {
-            $result->csl_data['URL'] = $data['url'];
-        }
-        $result->filterCslFieldsByType();
-        return $result;
-    }
-}
diff --git a/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.php b/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.php
new file mode 100644
index 0000000..b4b3a20
--- /dev/null
+++ b/lib/classes/librarysearch/resultparsers/K10PlusLibraryResultParser.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibraryResultParser implementation for the K10PlusZentral catalog.
+ *
+ * @see LibraryResultParser
+ */
+class K10PlusLibraryResultParser implements LibraryResultParser
+{
+    /**
+     * @see LibraryResultParser::readResultSet
+     */
+    public function readResultSet($data = '') : array
+    {
+        //Convert the data to JSON:
+        $json_data = json_decode($data, true);
+
+        $header = $json_data['responseHeader'];
+
+        if ($header['status'] != 0) {
+            //Probably an error!
+            return [];
+        }
+
+        if (!$json_data['response']) {
+            //JSON structure error!
+            return [];
+        }
+
+        if (!$json_data['response']['docs'] || ($json_data['response']['numFound'] == 0)) {
+            //No data found.
+            return [];
+        }
+
+        $result_set = [];
+        foreach ($json_data['response']['docs'] as $doc_data) {
+            $result = $this->readRecord($doc_data);
+            if ($result instanceof LibraryDocument) {
+                $result_set[] = $result;
+            }
+        }
+        return $result_set;
+    }
+
+
+    /**
+     * @see LibraryResultParser::readRecord
+     */
+    public function readRecord($data = '') : LibraryDocument
+    {
+        $parser = new MarcxmlLibraryResultParser();
+        //The result is one marcxml record in a collection:
+        $result = $parser->readResultSet($data['fullrecord_marcxml'])[0];
+        //Now we have to set the type using the data from the JSON fields:
+        $doc_type = $data['format'][0];
+        if (($doc_type == 'Article') || ($doc_type == 'electronic Article')) {
+            $result->type = 'article';
+        } elseif (($doc_type == 'Book') || ($doc_type == 'eBook')) {
+            $result->type = 'book';
+        } elseif ($doc_type == 'journal') {
+            $result->type = 'article-journal';
+        }
+        if (!isset($result->csl_data['URL'])) {
+            $result->csl_data['URL'] = $data['url'];
+        }
+        $result->filterCslFieldsByType();
+        return $result;
+    }
+}
diff --git a/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.class.php
deleted file mode 100644
index 8017f3d..0000000
--- a/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.class.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibraryResultParser implementation for the BASE catalog.
- *
- * @see LibraryResultParser
- */
-class MarcxmlLibraryResultParser implements LibraryResultParser
-{
-    private $mapping = [
-        '001' => ['field' => 'id', 'callback' => 'simpleMap', 'cb_args' => ''],
-        '008' => [
-            ['field' => 'language', 'callback' => 'simpleFixFieldMap', 'cb_args' => ['start' => 35, 'length' => 3]],
-            ['field' => 'issued', 'callback' => 'simpleFixFieldMap', 'cb_args' => ['start' => 7, 'length' => 4], 'format' => 'date']
-        ],
-        '020' => ['field' => 'ISBN', 'callback' => 'simpleMap', 'cb_args' => '$a'],
-        '245' => ['field' => 'title', 'callback' => 'simpleMap', 'cb_args' => '$a $b $h'],
-        '264' => ['field' => 'publisher', 'callback' => 'simpleMap', 'cb_args' => '$a $b'],
-        '256' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
-        '300' => ['field' => 'medium', 'callback' => 'simpleMap', 'cb_args' => '$a $b $c $e'],
-        '440' => ['field' => 'container-title', 'callback' => 'simpleMap', 'cb_args' => '$a $v'],
-        '500' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
-        '502' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
-        '518' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
-        '520' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
-        '533' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$n' . "\n"],
-        '600' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '610' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '611' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '630' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '650' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => '$a'],
-        '651' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '652' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '653' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
-        '773' => [
-            ['field' => 'publisher', 'callback' => 'simpleMap', 'cb_args' => '$t, $g, $d'],
-            ['field' => 'ISSN', 'callback' => 'simpleMap', 'cb_args' => '$x'],
-        ],
-        '100' => ['field' => 'author', 'callback' => 'simpleMap', 'cb_args' => '$a', 'format' => 'name'],
-        '700' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a', 'contributor', '$a;'], 'format' => 'name'],
-        '110' => ['field' => 'author', 'callback' => 'simpleMap', 'cb_args' => '$a, $b', 'format' => 'name'],
-        '111' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a, $b', 'contributor', '$a, $b;'], 'format' => 'name'],
-        '710' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a, $b', 'contributor', '$a, $b;'], 'format' => 'name'],
-        '711' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a, $b', 'contributor', '$a, $b;'], 'format' => 'name'],
-        '856' => ['field' => 'URL', 'callback' => 'notEmptyMap', 'cb_args' => ['$u', 'URL2', '$u']],
-    ];
-
-    function simpleListMap($doc, $data, $field, $args = [], $format = '')
-    {
-        if (is_array($data)) {
-            $result = join('; ', $data);
-        } else {
-            $result = $data;
-        }
-        $result = (($doc->csl_data[$field])) ? $doc->csl_data[$field] . '; ' . $result : $result;
-        $doc->csl_data[$field] = trim($result);
-    }
-
-    function simpleFixFieldMap($doc, $data, $field, $args = [], $format = '')
-    {
-        if (is_array($args) && $data != "") {
-            if ($result = trim(mb_substr($data, $args['start'], $args['length']))) {
-                if ($format === 'date') {
-                    $result = ['date-parts' => [[$result, 1, 1]]];
-                    $doc->csl_data[$field] = $result;
-                } else {
-                    $doc->csl_data[$field] = trim($doc->csl_data[$field] . " " . $result);
-                }
-            }
-        }
-    }
-
-    function notEmptyMap($doc, $data, $field, $args, $format = '')
-    {
-        if (empty($doc->csl_data[$field])) {
-            $this->simpleMap($doc, $data, $field, $args[0], $format);
-        } else {
-            $this->simpleMap($doc, $data, $args[1], $args[2], $format);
-        }
-        return;
-    }
-
-    function simpleMap($doc, $data, $field, $args, $format = '')
-    {
-        $trim_chars = " \t\n\r\0/,:.";
-        if ($args != "" && is_array($data)) {
-            foreach ($data as $key => $value) {
-                $search[] = '$' . $key;
-                $replace[] = $value;
-            }
-            $result = str_replace($search, $replace, $args);
-            $result = preg_replace('/\$[0-9a-z]\s*/', "", $result);
-
-        } else {
-            $result = $data;
-        }
-        $result = trim($result, $trim_chars);
-        if ($format == 'name') {
-            $author_data = explode(', ', $result);
-            $result =
-                [
-                    'family' => $author_data[0],
-                    'given'  => $author_data[1],
-                    'suffix' => ''
-                ];
-
-            $doc->csl_data[$field][] = $result;
-        } else {
-            $doc->csl_data[$field] = trim($doc->csl_data[$field] . " " . $result);
-        }
-    }
-
-    /**
-     * @see LibraryResultParser::readResultSet
-     */
-    public function readResultSet($data = ''): array
-    {
-        //echo '<pre>'. htmlready(print_r($data,1)) . '</pre>';
-        $dom = new \DOMDocument();
-        $dom->loadXML($data);
-        $collection = $dom->getElementsByTagName('collection')[0];
-        if (!$collection) {
-            //Wrong document type.
-            return [];
-        }
-
-        $records = $collection->getElementsByTagName('record');
-
-        $result_set = [];
-        foreach ($records as $record) {
-            $result_set[] = $this->readResultNode($record);
-        }
-        return $result_set;
-    }
-
-    /**
-     * Reads the XML nodes of one record and creates a LibraryDocument
-     * out of it.
-     *
-     * @param DOMElement $node The XML node of one record.
-     *
-     * @returns LibraryDocument The LibraryDocument instance that could be read
-     *     from the data.
-     */
-    public function readResultNode(\DOMElement $node): LibraryDocument
-    {
-        $result = new LibraryDocument();
-
-
-
-        $xmlrecord = simplexml_import_dom($node);
-        $plugin_mapping = $this->mapping;
-        foreach ($xmlrecord->controlfield as $field) {
-            $code = (string)$field['tag'];
-            $data = (string)$field;
-            if (isset($plugin_mapping[$code])) {
-                $mapping = (is_array($plugin_mapping[$code][0])) ? $plugin_mapping[$code] : [$plugin_mapping[$code]];
-                for ($j = 0; $j < count($mapping); ++$j) {
-                    $map_method = $mapping[$j]['callback'];
-                    $this->$map_method($result, $data, $mapping[$j]['field'], $mapping[$j]['cb_args'], $mapping[$j]['format']);
-                }
-            }
-        }
-        foreach ($xmlrecord->datafield as $field) {
-            $code = (string)$field['tag'];
-            $data = [];
-            foreach ($field->subfield as $subfield) {
-                $subcode = (string)$subfield['code'];
-                if ($subcode && !isset($data[$subcode])) {
-                    $data[$subcode] = (string)$subfield;
-                }
-            }
-            if (isset($plugin_mapping[$code])) {
-                $mapping = (is_array($plugin_mapping[$code][0])) ? $plugin_mapping[$code] : [$plugin_mapping[$code]];
-                for ($j = 0; $j < count($mapping); ++$j) {
-                    $map_method = $mapping[$j]['callback'];
-                    $this->$map_method($result, $data, $mapping[$j]['field'], $mapping[$j]['cb_args'], $mapping[$j]['format']);
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @see LibraryResultParser::readRecord
-     */
-    public function readRecord($data = ''): LibraryDocument
-    {
-        $dom = new DOMDocument();
-        $dom->loadXML($data);
-        $record = $dom->getElementsByTagName('record')[0];
-        if ($record instanceof \DOMElement) {
-            return $this->readResultNode($record);
-        }
-
-        throw new Exception('Could not read record');
-    }
-
-    /**
-     * This is a helper method to index the child nodes of a node which
-     * represent the Marc21 subfields. The index is the subfield code
-     * of the DOM child node.
-     *
-     * @param DOMElement $datafield The node whose child nodes shall be indexed.
-     *
-     * @returns DOMElement[] An array of DOMElement nodes reperesenting
-     * the indexed child nodes of the supplied node.
-     */
-    protected function indexSubfields(\DOMElement $datafield): array
-    {
-        $indexed_subfields = [];
-        $subfields = $datafield->getElementsByTagName('subfield');
-        foreach ($subfields as $subfield) {
-            $code = $subfield->getAttribute('code');
-            $indexed_subfields[$code] = $subfield;
-        }
-        return $indexed_subfields;
-    }
-}
diff --git a/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.php b/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.php
new file mode 100644
index 0000000..8017f3d
--- /dev/null
+++ b/lib/classes/librarysearch/resultparsers/MarcxmlLibraryResultParser.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibraryResultParser implementation for the BASE catalog.
+ *
+ * @see LibraryResultParser
+ */
+class MarcxmlLibraryResultParser implements LibraryResultParser
+{
+    private $mapping = [
+        '001' => ['field' => 'id', 'callback' => 'simpleMap', 'cb_args' => ''],
+        '008' => [
+            ['field' => 'language', 'callback' => 'simpleFixFieldMap', 'cb_args' => ['start' => 35, 'length' => 3]],
+            ['field' => 'issued', 'callback' => 'simpleFixFieldMap', 'cb_args' => ['start' => 7, 'length' => 4], 'format' => 'date']
+        ],
+        '020' => ['field' => 'ISBN', 'callback' => 'simpleMap', 'cb_args' => '$a'],
+        '245' => ['field' => 'title', 'callback' => 'simpleMap', 'cb_args' => '$a $b $h'],
+        '264' => ['field' => 'publisher', 'callback' => 'simpleMap', 'cb_args' => '$a $b'],
+        '256' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
+        '300' => ['field' => 'medium', 'callback' => 'simpleMap', 'cb_args' => '$a $b $c $e'],
+        '440' => ['field' => 'container-title', 'callback' => 'simpleMap', 'cb_args' => '$a $v'],
+        '500' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
+        '502' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
+        '518' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
+        '520' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$a' . "\n"],
+        '533' => ['field' => 'note', 'callback' => 'simpleMap', 'cb_args' => '$n' . "\n"],
+        '600' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '610' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '611' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '630' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '650' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => '$a'],
+        '651' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '652' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '653' => ['field' => 'note', 'callback' => 'simpleListMap', 'cb_args' => false],
+        '773' => [
+            ['field' => 'publisher', 'callback' => 'simpleMap', 'cb_args' => '$t, $g, $d'],
+            ['field' => 'ISSN', 'callback' => 'simpleMap', 'cb_args' => '$x'],
+        ],
+        '100' => ['field' => 'author', 'callback' => 'simpleMap', 'cb_args' => '$a', 'format' => 'name'],
+        '700' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a', 'contributor', '$a;'], 'format' => 'name'],
+        '110' => ['field' => 'author', 'callback' => 'simpleMap', 'cb_args' => '$a, $b', 'format' => 'name'],
+        '111' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a, $b', 'contributor', '$a, $b;'], 'format' => 'name'],
+        '710' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a, $b', 'contributor', '$a, $b;'], 'format' => 'name'],
+        '711' => ['field' => 'author', 'callback' => 'notEmptyMap', 'cb_args' => ['$a, $b', 'contributor', '$a, $b;'], 'format' => 'name'],
+        '856' => ['field' => 'URL', 'callback' => 'notEmptyMap', 'cb_args' => ['$u', 'URL2', '$u']],
+    ];
+
+    function simpleListMap($doc, $data, $field, $args = [], $format = '')
+    {
+        if (is_array($data)) {
+            $result = join('; ', $data);
+        } else {
+            $result = $data;
+        }
+        $result = (($doc->csl_data[$field])) ? $doc->csl_data[$field] . '; ' . $result : $result;
+        $doc->csl_data[$field] = trim($result);
+    }
+
+    function simpleFixFieldMap($doc, $data, $field, $args = [], $format = '')
+    {
+        if (is_array($args) && $data != "") {
+            if ($result = trim(mb_substr($data, $args['start'], $args['length']))) {
+                if ($format === 'date') {
+                    $result = ['date-parts' => [[$result, 1, 1]]];
+                    $doc->csl_data[$field] = $result;
+                } else {
+                    $doc->csl_data[$field] = trim($doc->csl_data[$field] . " " . $result);
+                }
+            }
+        }
+    }
+
+    function notEmptyMap($doc, $data, $field, $args, $format = '')
+    {
+        if (empty($doc->csl_data[$field])) {
+            $this->simpleMap($doc, $data, $field, $args[0], $format);
+        } else {
+            $this->simpleMap($doc, $data, $args[1], $args[2], $format);
+        }
+        return;
+    }
+
+    function simpleMap($doc, $data, $field, $args, $format = '')
+    {
+        $trim_chars = " \t\n\r\0/,:.";
+        if ($args != "" && is_array($data)) {
+            foreach ($data as $key => $value) {
+                $search[] = '$' . $key;
+                $replace[] = $value;
+            }
+            $result = str_replace($search, $replace, $args);
+            $result = preg_replace('/\$[0-9a-z]\s*/', "", $result);
+
+        } else {
+            $result = $data;
+        }
+        $result = trim($result, $trim_chars);
+        if ($format == 'name') {
+            $author_data = explode(', ', $result);
+            $result =
+                [
+                    'family' => $author_data[0],
+                    'given'  => $author_data[1],
+                    'suffix' => ''
+                ];
+
+            $doc->csl_data[$field][] = $result;
+        } else {
+            $doc->csl_data[$field] = trim($doc->csl_data[$field] . " " . $result);
+        }
+    }
+
+    /**
+     * @see LibraryResultParser::readResultSet
+     */
+    public function readResultSet($data = ''): array
+    {
+        //echo '<pre>'. htmlready(print_r($data,1)) . '</pre>';
+        $dom = new \DOMDocument();
+        $dom->loadXML($data);
+        $collection = $dom->getElementsByTagName('collection')[0];
+        if (!$collection) {
+            //Wrong document type.
+            return [];
+        }
+
+        $records = $collection->getElementsByTagName('record');
+
+        $result_set = [];
+        foreach ($records as $record) {
+            $result_set[] = $this->readResultNode($record);
+        }
+        return $result_set;
+    }
+
+    /**
+     * Reads the XML nodes of one record and creates a LibraryDocument
+     * out of it.
+     *
+     * @param DOMElement $node The XML node of one record.
+     *
+     * @returns LibraryDocument The LibraryDocument instance that could be read
+     *     from the data.
+     */
+    public function readResultNode(\DOMElement $node): LibraryDocument
+    {
+        $result = new LibraryDocument();
+
+
+
+        $xmlrecord = simplexml_import_dom($node);
+        $plugin_mapping = $this->mapping;
+        foreach ($xmlrecord->controlfield as $field) {
+            $code = (string)$field['tag'];
+            $data = (string)$field;
+            if (isset($plugin_mapping[$code])) {
+                $mapping = (is_array($plugin_mapping[$code][0])) ? $plugin_mapping[$code] : [$plugin_mapping[$code]];
+                for ($j = 0; $j < count($mapping); ++$j) {
+                    $map_method = $mapping[$j]['callback'];
+                    $this->$map_method($result, $data, $mapping[$j]['field'], $mapping[$j]['cb_args'], $mapping[$j]['format']);
+                }
+            }
+        }
+        foreach ($xmlrecord->datafield as $field) {
+            $code = (string)$field['tag'];
+            $data = [];
+            foreach ($field->subfield as $subfield) {
+                $subcode = (string)$subfield['code'];
+                if ($subcode && !isset($data[$subcode])) {
+                    $data[$subcode] = (string)$subfield;
+                }
+            }
+            if (isset($plugin_mapping[$code])) {
+                $mapping = (is_array($plugin_mapping[$code][0])) ? $plugin_mapping[$code] : [$plugin_mapping[$code]];
+                for ($j = 0; $j < count($mapping); ++$j) {
+                    $map_method = $mapping[$j]['callback'];
+                    $this->$map_method($result, $data, $mapping[$j]['field'], $mapping[$j]['cb_args'], $mapping[$j]['format']);
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @see LibraryResultParser::readRecord
+     */
+    public function readRecord($data = ''): LibraryDocument
+    {
+        $dom = new DOMDocument();
+        $dom->loadXML($data);
+        $record = $dom->getElementsByTagName('record')[0];
+        if ($record instanceof \DOMElement) {
+            return $this->readResultNode($record);
+        }
+
+        throw new Exception('Could not read record');
+    }
+
+    /**
+     * This is a helper method to index the child nodes of a node which
+     * represent the Marc21 subfields. The index is the subfield code
+     * of the DOM child node.
+     *
+     * @param DOMElement $datafield The node whose child nodes shall be indexed.
+     *
+     * @returns DOMElement[] An array of DOMElement nodes reperesenting
+     * the indexed child nodes of the supplied node.
+     */
+    protected function indexSubfields(\DOMElement $datafield): array
+    {
+        $indexed_subfields = [];
+        $subfields = $datafield->getElementsByTagName('subfield');
+        foreach ($subfields as $subfield) {
+            $code = $subfield->getAttribute('code');
+            $indexed_subfields[$code] = $subfield;
+        }
+        return $indexed_subfields;
+    }
+}
diff --git a/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.class.php b/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.class.php
deleted file mode 100644
index fed92f3..0000000
--- a/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.class.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibraryResultParser implementation for catalogs that
- * use SRU.
- *
- * @see LibraryResultParser
- */
-class SRULibraryResultParser implements LibraryResultParser
-{
-    /**
-     * @see LibraryResultParser::readResultSet
-     */
-    public function readResultSet($data = '') : array
-    {
-
-        $dom = new \DOMDocument();
-        $dom->loadXML($data);
-
-        $record_schema = $dom->getElementsByTagName('recordSchema')[0];
-        if (!$record_schema) {
-            //The recordSchema element is missing.
-            //We cannot continue.
-            return [];
-        }
-        if (strpos($record_schema->textContent, 'marcxml') !== false) {
-            $parser = new MarcxmlLibraryResultParser();
-            $result_set = [];
-            $collection_nodes = $dom->getElementsByTagName('collection');
-            if ($collection_nodes->length < 1) {
-                $collection_nodes = $dom->getElementsByTagName('records');
-            }
-            if ($collection_nodes->length > 0) {
-                foreach ($collection_nodes as $collection) {
-                    if ($collection instanceof \DOMText) {
-                        //Nothing we can do with text nodes.
-                        continue;
-                    }
-                    foreach ($collection->getElementsByTagName('record') as $record) {
-                        $document = $parser->readResultNode($record);
-                        if ($document->getTitle()) {
-                            $result_set[] = $document;
-                        }
-                    }
-                }
-            }
-            return $result_set;
-        }
-        throw new RuntimeException('only recordSchema marcxml implemented');
-    }
-
-
-    /**
-     * @see LibraryResultParser::readRecord
-     */
-    public function readRecord($data = ''): LibraryDocument
-    {
-        $dom = new \DOMDocument();
-        @$dom->loadXML($data);
-        $record = $dom->getElementsByTagName('zs:record')[0];
-        if (!$record) {
-            //Wrong document type.
-            throw new Exception('Wrong document type!');
-        }
-
-        $record_schema = $record->getElementsByTagName('zs:recordSchema')[0];
-        if ($record_schema->textContent == 'marcxml') {
-            $record_node = $record->getElementsByTagName('record')[0];
-            if (!$record_node) {
-                throw new Exception('Invalid data!');
-            }
-            $parser = new MarcxmlLibraryResultParser();
-            $document = $parser->readResultNode($record);
-            if ($document->getTitle()) {
-                return $document;
-            }
-        }
-
-        throw new Exception('Could not read record');
-    }
-}
diff --git a/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.php b/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.php
new file mode 100644
index 0000000..fed92f3
--- /dev/null
+++ b/lib/classes/librarysearch/resultparsers/SRULibraryResultParser.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibraryResultParser implementation for catalogs that
+ * use SRU.
+ *
+ * @see LibraryResultParser
+ */
+class SRULibraryResultParser implements LibraryResultParser
+{
+    /**
+     * @see LibraryResultParser::readResultSet
+     */
+    public function readResultSet($data = '') : array
+    {
+
+        $dom = new \DOMDocument();
+        $dom->loadXML($data);
+
+        $record_schema = $dom->getElementsByTagName('recordSchema')[0];
+        if (!$record_schema) {
+            //The recordSchema element is missing.
+            //We cannot continue.
+            return [];
+        }
+        if (strpos($record_schema->textContent, 'marcxml') !== false) {
+            $parser = new MarcxmlLibraryResultParser();
+            $result_set = [];
+            $collection_nodes = $dom->getElementsByTagName('collection');
+            if ($collection_nodes->length < 1) {
+                $collection_nodes = $dom->getElementsByTagName('records');
+            }
+            if ($collection_nodes->length > 0) {
+                foreach ($collection_nodes as $collection) {
+                    if ($collection instanceof \DOMText) {
+                        //Nothing we can do with text nodes.
+                        continue;
+                    }
+                    foreach ($collection->getElementsByTagName('record') as $record) {
+                        $document = $parser->readResultNode($record);
+                        if ($document->getTitle()) {
+                            $result_set[] = $document;
+                        }
+                    }
+                }
+            }
+            return $result_set;
+        }
+        throw new RuntimeException('only recordSchema marcxml implemented');
+    }
+
+
+    /**
+     * @see LibraryResultParser::readRecord
+     */
+    public function readRecord($data = ''): LibraryDocument
+    {
+        $dom = new \DOMDocument();
+        @$dom->loadXML($data);
+        $record = $dom->getElementsByTagName('zs:record')[0];
+        if (!$record) {
+            //Wrong document type.
+            throw new Exception('Wrong document type!');
+        }
+
+        $record_schema = $record->getElementsByTagName('zs:recordSchema')[0];
+        if ($record_schema->textContent == 'marcxml') {
+            $record_node = $record->getElementsByTagName('record')[0];
+            if (!$record_node) {
+                throw new Exception('Invalid data!');
+            }
+            $parser = new MarcxmlLibraryResultParser();
+            $document = $parser->readResultNode($record);
+            if ($document->getTitle()) {
+                return $document;
+            }
+        }
+
+        throw new Exception('Could not read record');
+    }
+}
diff --git a/lib/classes/librarysearch/searchmodules/BASELibrarySearch.class.php b/lib/classes/librarysearch/searchmodules/BASELibrarySearch.class.php
deleted file mode 100644
index e0408e7..0000000
--- a/lib/classes/librarysearch/searchmodules/BASELibrarySearch.class.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibrarySearch implementation for the BASE catalog.
- *
- * @see LibrarySearch
- */
-class BASELibrarySearch extends LibrarySearch
-{
-    /**
-     * This array is used to map the general search field names to
-     * the real field names.
-     */
-    protected static $field_replacements = [
-        LibrarySearch::TITLE       => 'dctitle',
-        LibrarySearch::AUTHOR      => 'dccreator',
-        LibrarySearch::YEAR        => 'dcyear',
-        LibrarySearch::NUMBER      => 'dcrelation',
-        LibrarySearch::ISSN        => 'dcrelation', //No special ISSN field available.
-        LibrarySearch::ISBN        => 'dcrelation', //No special ISBN field available.
-        LibrarySearch::PUBLICATION => 'dcpublisher',
-        LibrarySearch::SIGNATURE   => 'dcdocid'
-    ];
-
-
-    /**
-     * @see LibrarySearch::translateQueryFields
-     */
-    protected function translateQueryFields(array $query_fields = []) : array
-    {
-        if (!$query_fields) {
-            return [];
-        }
-
-        $translated_fields = [];
-        foreach ($query_fields as $key => $value) {
-            if (in_array($key, array_keys(self::$field_replacements))) {
-                $new_key = self::$field_replacements[$key];
-                $translated_fields[$new_key] = $value;
-            } else {
-                $translated_fields[$key] = $value;
-            }
-        }
-        return $translated_fields;
-    }
-
-
-    /**
-     * @see LibrarySearch::query
-     */
-    public function query(
-        array $search_parameters = [],
-        string $order_by = self::ORDER_BY_RELEVANCE,
-        int $limit = 125
-    ) : array
-    {
-        if (!$search_parameters) {
-            return [];
-        }
-
-        //The standardised parameter names must be converted to module-specific
-        //search parameter names before being added to the query string.
-        $search_parameters = $this->translateQueryFields($search_parameters);
-        $query_string = '';
-        foreach ($search_parameters as $key => $value) {
-            if (!empty($query_string)) {
-                $query_string .= ' AND ';
-            }
-            //TODO: escape colon in data!
-            $query_string .= sprintf('%1$s:(%2$s)', $key, $value);
-        }
-
-        $query_parameters = [];
-        $query_parameters['func'] = 'PerformSearch';
-        $query_parameters['coll'] = $this->settings['collection']
-                                  ? $this->settings['collection']
-                                  : 'de';
-        $query_parameters['query'] = $query_string;
-        //Order by relevance is the default in BASE.
-        //No URL parameter needed in that case.
-        if ($order_by == self::ORDER_BY_YEAR) {
-            $query_parameters['sortby'] = 'dcyear desc';
-        }
-        if ($limit > 0) {
-            //BASE has a limit of 125 items per response.
-            if ($limit > 125) {
-                $limit = 125;
-            }
-            $query_parameters['hits'] = $limit;
-        }
-        $data = $this->requestData($this->request_base_url, $query_parameters);
-        if ($data === null) {
-            //There are no data we can retrieve.
-            return [];
-        }
-        $parser = new BASELibraryResultParser();
-        return $parser->readResultSet($data);
-    }
-}
diff --git a/lib/classes/librarysearch/searchmodules/BASELibrarySearch.php b/lib/classes/librarysearch/searchmodules/BASELibrarySearch.php
new file mode 100644
index 0000000..e0408e7
--- /dev/null
+++ b/lib/classes/librarysearch/searchmodules/BASELibrarySearch.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibrarySearch implementation for the BASE catalog.
+ *
+ * @see LibrarySearch
+ */
+class BASELibrarySearch extends LibrarySearch
+{
+    /**
+     * This array is used to map the general search field names to
+     * the real field names.
+     */
+    protected static $field_replacements = [
+        LibrarySearch::TITLE       => 'dctitle',
+        LibrarySearch::AUTHOR      => 'dccreator',
+        LibrarySearch::YEAR        => 'dcyear',
+        LibrarySearch::NUMBER      => 'dcrelation',
+        LibrarySearch::ISSN        => 'dcrelation', //No special ISSN field available.
+        LibrarySearch::ISBN        => 'dcrelation', //No special ISBN field available.
+        LibrarySearch::PUBLICATION => 'dcpublisher',
+        LibrarySearch::SIGNATURE   => 'dcdocid'
+    ];
+
+
+    /**
+     * @see LibrarySearch::translateQueryFields
+     */
+    protected function translateQueryFields(array $query_fields = []) : array
+    {
+        if (!$query_fields) {
+            return [];
+        }
+
+        $translated_fields = [];
+        foreach ($query_fields as $key => $value) {
+            if (in_array($key, array_keys(self::$field_replacements))) {
+                $new_key = self::$field_replacements[$key];
+                $translated_fields[$new_key] = $value;
+            } else {
+                $translated_fields[$key] = $value;
+            }
+        }
+        return $translated_fields;
+    }
+
+
+    /**
+     * @see LibrarySearch::query
+     */
+    public function query(
+        array $search_parameters = [],
+        string $order_by = self::ORDER_BY_RELEVANCE,
+        int $limit = 125
+    ) : array
+    {
+        if (!$search_parameters) {
+            return [];
+        }
+
+        //The standardised parameter names must be converted to module-specific
+        //search parameter names before being added to the query string.
+        $search_parameters = $this->translateQueryFields($search_parameters);
+        $query_string = '';
+        foreach ($search_parameters as $key => $value) {
+            if (!empty($query_string)) {
+                $query_string .= ' AND ';
+            }
+            //TODO: escape colon in data!
+            $query_string .= sprintf('%1$s:(%2$s)', $key, $value);
+        }
+
+        $query_parameters = [];
+        $query_parameters['func'] = 'PerformSearch';
+        $query_parameters['coll'] = $this->settings['collection']
+                                  ? $this->settings['collection']
+                                  : 'de';
+        $query_parameters['query'] = $query_string;
+        //Order by relevance is the default in BASE.
+        //No URL parameter needed in that case.
+        if ($order_by == self::ORDER_BY_YEAR) {
+            $query_parameters['sortby'] = 'dcyear desc';
+        }
+        if ($limit > 0) {
+            //BASE has a limit of 125 items per response.
+            if ($limit > 125) {
+                $limit = 125;
+            }
+            $query_parameters['hits'] = $limit;
+        }
+        $data = $this->requestData($this->request_base_url, $query_parameters);
+        if ($data === null) {
+            //There are no data we can retrieve.
+            return [];
+        }
+        $parser = new BASELibraryResultParser();
+        return $parser->readResultSet($data);
+    }
+}
diff --git a/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.class.php b/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.class.php
deleted file mode 100644
index 9660cb4..0000000
--- a/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.class.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibrarySearch implementation for the K10PlusZentral catalog.
- *
- * @see LibrarySearch
- */
-class K10PlusZentralLibrarySearch extends LibrarySearch
-{
-    /**
-     * This array is used to map the general search field names to
-     * the real field names.
-     */
-    protected static $field_replacements = [
-        LibrarySearch::TITLE       => 'title',
-        LibrarySearch::AUTHOR      => 'author',
-        LibrarySearch::YEAR        => 'publishDate',
-        LibrarySearch::NUMBER      => 'number',
-        LibrarySearch::ISSN        => 'issn',
-        LibrarySearch::ISBN        => 'isbn',
-        LibrarySearch::PUBLICATION => 'journal',
-        LibrarySearch::SIGNATURE   => 'signature'
-    ];
-
-
-    /**
-     * This is a helper method to get LibrarySearch instances from the
-     * raw result data of the query.
-     *
-     * @param string $data Raw query response data.
-     *
-     * @returns LibraryDocument[] An array of LibraryDocument instaces that
-     *     could be read.
-     */
-    protected function extractResponseData($data)
-    {
-        $parser = new K10PlusLibraryResultParser();
-        $result_set = $parser->readResultSet($data);
-        return $result_set;
-    }
-
-
-    /**
-     * @see LibrarySearch::translateQueryFields
-     */
-    protected function translateQueryFields(array $query_fields = []) : array
-    {
-        if (!$query_fields) {
-            return [];
-        }
-
-        $translated_fields = [];
-        foreach ($query_fields as $key => $value) {
-            if (in_array($key, array_keys(self::$field_replacements))) {
-                $new_key = self::$field_replacements[$key];
-                $translated_fields[$new_key] = $value;
-            } else {
-                $translated_fields[$key] = $value;
-            }
-        }
-        return $translated_fields;
-    }
-
-
-    /**
-     * @see LibrarySearch::query
-     */
-    public function query(
-        array $search_parameters = [],
-        string $order_by = self::ORDER_BY_RELEVANCE,
-        int $limit = 200
-    ) : array
-    {
-        if (!$search_parameters) {
-            return [];
-        }
-
-        //The standardised parameter names must be converted to module-specific
-        //search parameter names before being added to the query string.
-        $search_parameters = $this->translateQueryFields($search_parameters);
-        $query_string = '';
-
-        foreach ($search_parameters as $key => $value) {
-            if (!empty($query_string)) {
-                $query_string .= ' AND ';
-            }
-            if ($key == self::$field_replacements[LibrarySearch::NUMBER]) {
-                $query_string .= sprintf(
-                    '(%1$s:"%2$s" OR %3$s:"%2$s")',
-                    self::$field_replacements[LibrarySearch::ISSN],
-                    $this->escapeQueryChars($value),
-                    self::$field_replacements[LibrarySearch::ISBN]
-                );
-            } else {
-                //TODO: escape colon in data!
-                $value = '(' . $this->escapeQueryChars($value) . ')';
-                $query_string .= sprintf('%1$s:%2$s', $key, $value);
-            }
-        }
-
-        $query_parameters = [];
-        //Special handling for the query parameter:
-        $query_parameters['q'] = $query_string;
-        if ($order_by = self::ORDER_BY_YEAR) {
-            $query_parameters['sort'] = 'publishDate desc';
-        } else {
-            $query_parameters['sort'] = 'score desc';
-        }
-        if ($limit > 0) {
-            $query_parameters['rows'] = $limit;
-        }
-        //$query_parameters['debug'] = 'query';
-        $query_parameters['df'] = self::$field_replacements[LibrarySearch::TITLE];
-        $data = $this->requestData($this->request_base_url, $query_parameters);
-        if ($data === null) {
-            //There are no data we can retrieve.
-            return [];
-        }
-        $result_objects = $this->extractResponseData($data);
-        return $result_objects;
-    }
-
-    public function escapeQueryChars($str)
-    {
-        $reserved = preg_quote('+-&|!(){}[]^"~*?:\\');
-        return preg_replace_callback(
-            '/([' . $reserved . '])/',
-            function ($matches) {
-                return '\\' . $matches[0];
-            },
-            $str
-        );
-    }
-}
diff --git a/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.php b/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.php
new file mode 100644
index 0000000..9660cb4
--- /dev/null
+++ b/lib/classes/librarysearch/searchmodules/K10PlusZentralLibrarySearch.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibrarySearch implementation for the K10PlusZentral catalog.
+ *
+ * @see LibrarySearch
+ */
+class K10PlusZentralLibrarySearch extends LibrarySearch
+{
+    /**
+     * This array is used to map the general search field names to
+     * the real field names.
+     */
+    protected static $field_replacements = [
+        LibrarySearch::TITLE       => 'title',
+        LibrarySearch::AUTHOR      => 'author',
+        LibrarySearch::YEAR        => 'publishDate',
+        LibrarySearch::NUMBER      => 'number',
+        LibrarySearch::ISSN        => 'issn',
+        LibrarySearch::ISBN        => 'isbn',
+        LibrarySearch::PUBLICATION => 'journal',
+        LibrarySearch::SIGNATURE   => 'signature'
+    ];
+
+
+    /**
+     * This is a helper method to get LibrarySearch instances from the
+     * raw result data of the query.
+     *
+     * @param string $data Raw query response data.
+     *
+     * @returns LibraryDocument[] An array of LibraryDocument instaces that
+     *     could be read.
+     */
+    protected function extractResponseData($data)
+    {
+        $parser = new K10PlusLibraryResultParser();
+        $result_set = $parser->readResultSet($data);
+        return $result_set;
+    }
+
+
+    /**
+     * @see LibrarySearch::translateQueryFields
+     */
+    protected function translateQueryFields(array $query_fields = []) : array
+    {
+        if (!$query_fields) {
+            return [];
+        }
+
+        $translated_fields = [];
+        foreach ($query_fields as $key => $value) {
+            if (in_array($key, array_keys(self::$field_replacements))) {
+                $new_key = self::$field_replacements[$key];
+                $translated_fields[$new_key] = $value;
+            } else {
+                $translated_fields[$key] = $value;
+            }
+        }
+        return $translated_fields;
+    }
+
+
+    /**
+     * @see LibrarySearch::query
+     */
+    public function query(
+        array $search_parameters = [],
+        string $order_by = self::ORDER_BY_RELEVANCE,
+        int $limit = 200
+    ) : array
+    {
+        if (!$search_parameters) {
+            return [];
+        }
+
+        //The standardised parameter names must be converted to module-specific
+        //search parameter names before being added to the query string.
+        $search_parameters = $this->translateQueryFields($search_parameters);
+        $query_string = '';
+
+        foreach ($search_parameters as $key => $value) {
+            if (!empty($query_string)) {
+                $query_string .= ' AND ';
+            }
+            if ($key == self::$field_replacements[LibrarySearch::NUMBER]) {
+                $query_string .= sprintf(
+                    '(%1$s:"%2$s" OR %3$s:"%2$s")',
+                    self::$field_replacements[LibrarySearch::ISSN],
+                    $this->escapeQueryChars($value),
+                    self::$field_replacements[LibrarySearch::ISBN]
+                );
+            } else {
+                //TODO: escape colon in data!
+                $value = '(' . $this->escapeQueryChars($value) . ')';
+                $query_string .= sprintf('%1$s:%2$s', $key, $value);
+            }
+        }
+
+        $query_parameters = [];
+        //Special handling for the query parameter:
+        $query_parameters['q'] = $query_string;
+        if ($order_by = self::ORDER_BY_YEAR) {
+            $query_parameters['sort'] = 'publishDate desc';
+        } else {
+            $query_parameters['sort'] = 'score desc';
+        }
+        if ($limit > 0) {
+            $query_parameters['rows'] = $limit;
+        }
+        //$query_parameters['debug'] = 'query';
+        $query_parameters['df'] = self::$field_replacements[LibrarySearch::TITLE];
+        $data = $this->requestData($this->request_base_url, $query_parameters);
+        if ($data === null) {
+            //There are no data we can retrieve.
+            return [];
+        }
+        $result_objects = $this->extractResponseData($data);
+        return $result_objects;
+    }
+
+    public function escapeQueryChars($str)
+    {
+        $reserved = preg_quote('+-&|!(){}[]^"~*?:\\');
+        return preg_replace_callback(
+            '/([' . $reserved . '])/',
+            function ($matches) {
+                return '\\' . $matches[0];
+            },
+            $str
+        );
+    }
+}
diff --git a/lib/classes/librarysearch/searchmodules/SRULibrarySearch.class.php b/lib/classes/librarysearch/searchmodules/SRULibrarySearch.class.php
deleted file mode 100644
index b94869a..0000000
--- a/lib/classes/librarysearch/searchmodules/SRULibrarySearch.class.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-/**
- * This is a LibrarySearch implementation for catalogs that use SRU.
- *
- * @see LibrarySearch
- */
-class SRULibrarySearch extends LibrarySearch
-{
-    /**
-     * This array is used to map the general search field names to
-     * the real field names.
-     */
-    protected static $field_replacements = [
-        'pica' => [
-            LibrarySearch::TITLE       => 'pica.tit',
-            LibrarySearch::AUTHOR      => 'pica.per',
-            LibrarySearch::YEAR        => 'pica.jhr',
-            LibrarySearch::NUMBER      => 'pica.num',
-            LibrarySearch::ISBN        => 'pica.isb',
-            LibrarySearch::ISSN        => 'pica.iss',
-            LibrarySearch::PUBLICATION => 'pica.gti',
-            LibrarySearch::SIGNATURE   => 'pica.sga'
-        ],
-        'cql' => [
-            LibrarySearch::TITLE       => 'dc.title',
-            LibrarySearch::AUTHOR      => 'dc.creator',
-            LibrarySearch::YEAR        => 'dc.date',
-            LibrarySearch::NUMBER      => 'dc.identifier',
-            LibrarySearch::ISBN        => 'dc.identifier',
-            LibrarySearch::ISSN        => 'dc.identifier'
-        ]
-    ];
-
-
-    /**
-     * @see LibrarySearch::translateQueryFields
-     */
-    protected function translateQueryFields(array $query_fields = []) : array
-    {
-        if (!$query_fields) {
-            return [];
-        }
-
-        $query_format = 'pica';
-        if ($this->settings['query_format'] == 'cql') {
-            $query_format = 'cql';
-        }
-
-        $translated_fields = [];
-        foreach ($query_fields as $key => $value) {
-            if (in_array($key, array_keys(self::$field_replacements[$query_format]))) {
-                $new_key = self::$field_replacements[$query_format][$key];
-                $translated_fields[$new_key] = $value;
-            } else {
-                $translated_fields[$key] = $value;
-            }
-        }
-        return $translated_fields;
-    }
-
-
-    /**
-     * @see LibrarySearch::query
-     */
-    public function query(
-        array $search_parameters = [],
-        string $order_by = self::ORDER_BY_RELEVANCE,
-        int $limit = 200
-    ) : array
-    {
-        if (!$search_parameters) {
-            return [];
-        }
-
-        //The standardised parameter names must be converted to module-specific
-        //search parameter names before being added to the query string.
-        $search_parameters = $this->translateQueryFields($search_parameters);
-        $query_string = '';
-        $query_format = 'pica';
-        if ($this->settings['query_format'] == 'cql') {
-            $query_format = 'cql';
-        }
-        foreach ($search_parameters as $key => $value) {
-            if (!empty($query_string)) {
-                $query_string .= ' and ';
-            }
-            if ($key == self::$field_replacements[$query_format][LibrarySearch::NUMBER]) {
-                $query_string .= sprintf(
-                    '(%1$s="%2$s" or %3$s="%2$s" or %4$s="%2$s")',
-                    self::$field_replacements[$query_format][LibrarySearch::ISBN],
-                    addslashes($value),
-                    self::$field_replacements[$query_format][LibrarySearch::ISSN],
-                    self::$field_replacements[$query_format][LibrarySearch::NUMBER]
-                );
-            } else {
-                //TODO: escape colon in data!
-                $query_string .= sprintf('%1$s="%2$s"', $key, addslashes($value));
-            }
-        }
-
-        $query_parameters = [];
-        $query_parameters['version'] = '1.1'; //TODO: is version 2.0 supported?
-        $query_parameters['operation'] = 'searchRetrieve';
-        $query_parameters['recordSchema'] = 'marcxml';
-        if ($this->settings['sru_version'] == '1.2') {
-            $query_parameters['version'] = '1.2';
-            //Use SRU/SRW 1.2
-            if ($order_by == self::ORDER_BY_RELEVANCE) {
-                if ($query_format != 'cql') {
-                    $query_string .= ' sortby relevance/descending';
-                }
-            } elseif ($order_by == self::ORDER_BY_YEAR) {
-                if ($query_format == 'cql') {
-                    $query_string .= ' sortBy dc.date/sort.descending';
-                } else {
-                    $query_string .= ' sortby year/descending';
-                }
-            }
-        } else {
-            //Use SRU/SRW 1.1
-            if ($order_by == self::ORDER_BY_RELEVANCE) {
-                $query_parameters['sortKeys'] = 'relevance,,0';
-            } elseif ($order_by == self::ORDER_BY_YEAR) {
-                $query_parameters['sortKeys'] = 'year,,0';
-            }
-        }
-        $query_parameters['maximumRecords'] = $limit;
-        $query_parameters['query'] = $query_string;
-        $data = $this->requestData($this->request_base_url, $query_parameters);
-        if (!$data) {
-            //There are no data we can retrieve.
-            return [];
-        }
-        $parser = new SRULibraryResultParser();
-        return $parser->readResultSet($data);
-    }
-}
diff --git a/lib/classes/librarysearch/searchmodules/SRULibrarySearch.php b/lib/classes/librarysearch/searchmodules/SRULibrarySearch.php
new file mode 100644
index 0000000..b94869a
--- /dev/null
+++ b/lib/classes/librarysearch/searchmodules/SRULibrarySearch.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+/**
+ * This is a LibrarySearch implementation for catalogs that use SRU.
+ *
+ * @see LibrarySearch
+ */
+class SRULibrarySearch extends LibrarySearch
+{
+    /**
+     * This array is used to map the general search field names to
+     * the real field names.
+     */
+    protected static $field_replacements = [
+        'pica' => [
+            LibrarySearch::TITLE       => 'pica.tit',
+            LibrarySearch::AUTHOR      => 'pica.per',
+            LibrarySearch::YEAR        => 'pica.jhr',
+            LibrarySearch::NUMBER      => 'pica.num',
+            LibrarySearch::ISBN        => 'pica.isb',
+            LibrarySearch::ISSN        => 'pica.iss',
+            LibrarySearch::PUBLICATION => 'pica.gti',
+            LibrarySearch::SIGNATURE   => 'pica.sga'
+        ],
+        'cql' => [
+            LibrarySearch::TITLE       => 'dc.title',
+            LibrarySearch::AUTHOR      => 'dc.creator',
+            LibrarySearch::YEAR        => 'dc.date',
+            LibrarySearch::NUMBER      => 'dc.identifier',
+            LibrarySearch::ISBN        => 'dc.identifier',
+            LibrarySearch::ISSN        => 'dc.identifier'
+        ]
+    ];
+
+
+    /**
+     * @see LibrarySearch::translateQueryFields
+     */
+    protected function translateQueryFields(array $query_fields = []) : array
+    {
+        if (!$query_fields) {
+            return [];
+        }
+
+        $query_format = 'pica';
+        if ($this->settings['query_format'] == 'cql') {
+            $query_format = 'cql';
+        }
+
+        $translated_fields = [];
+        foreach ($query_fields as $key => $value) {
+            if (in_array($key, array_keys(self::$field_replacements[$query_format]))) {
+                $new_key = self::$field_replacements[$query_format][$key];
+                $translated_fields[$new_key] = $value;
+            } else {
+                $translated_fields[$key] = $value;
+            }
+        }
+        return $translated_fields;
+    }
+
+
+    /**
+     * @see LibrarySearch::query
+     */
+    public function query(
+        array $search_parameters = [],
+        string $order_by = self::ORDER_BY_RELEVANCE,
+        int $limit = 200
+    ) : array
+    {
+        if (!$search_parameters) {
+            return [];
+        }
+
+        //The standardised parameter names must be converted to module-specific
+        //search parameter names before being added to the query string.
+        $search_parameters = $this->translateQueryFields($search_parameters);
+        $query_string = '';
+        $query_format = 'pica';
+        if ($this->settings['query_format'] == 'cql') {
+            $query_format = 'cql';
+        }
+        foreach ($search_parameters as $key => $value) {
+            if (!empty($query_string)) {
+                $query_string .= ' and ';
+            }
+            if ($key == self::$field_replacements[$query_format][LibrarySearch::NUMBER]) {
+                $query_string .= sprintf(
+                    '(%1$s="%2$s" or %3$s="%2$s" or %4$s="%2$s")',
+                    self::$field_replacements[$query_format][LibrarySearch::ISBN],
+                    addslashes($value),
+                    self::$field_replacements[$query_format][LibrarySearch::ISSN],
+                    self::$field_replacements[$query_format][LibrarySearch::NUMBER]
+                );
+            } else {
+                //TODO: escape colon in data!
+                $query_string .= sprintf('%1$s="%2$s"', $key, addslashes($value));
+            }
+        }
+
+        $query_parameters = [];
+        $query_parameters['version'] = '1.1'; //TODO: is version 2.0 supported?
+        $query_parameters['operation'] = 'searchRetrieve';
+        $query_parameters['recordSchema'] = 'marcxml';
+        if ($this->settings['sru_version'] == '1.2') {
+            $query_parameters['version'] = '1.2';
+            //Use SRU/SRW 1.2
+            if ($order_by == self::ORDER_BY_RELEVANCE) {
+                if ($query_format != 'cql') {
+                    $query_string .= ' sortby relevance/descending';
+                }
+            } elseif ($order_by == self::ORDER_BY_YEAR) {
+                if ($query_format == 'cql') {
+                    $query_string .= ' sortBy dc.date/sort.descending';
+                } else {
+                    $query_string .= ' sortby year/descending';
+                }
+            }
+        } else {
+            //Use SRU/SRW 1.1
+            if ($order_by == self::ORDER_BY_RELEVANCE) {
+                $query_parameters['sortKeys'] = 'relevance,,0';
+            } elseif ($order_by == self::ORDER_BY_YEAR) {
+                $query_parameters['sortKeys'] = 'year,,0';
+            }
+        }
+        $query_parameters['maximumRecords'] = $limit;
+        $query_parameters['query'] = $query_string;
+        $data = $this->requestData($this->request_base_url, $query_parameters);
+        if (!$data) {
+            //There are no data we can retrieve.
+            return [];
+        }
+        $parser = new SRULibraryResultParser();
+        return $parser->readResultSet($data);
+    }
+}
diff --git a/lib/classes/searchtypes/MyCoursesSearch.class.php b/lib/classes/searchtypes/MyCoursesSearch.class.php
deleted file mode 100644
index 64bee64..0000000
--- a/lib/classes/searchtypes/MyCoursesSearch.class.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * MyCoursesSearch.class.php
- * Search only in own courses.
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @copyright   2015 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class MyCoursesSearch extends StandardSearch
-{
-    private $perm_level;
-    private $parameters;
-    protected $additional_sql_conditions;
-
-    /**
-     *
-     * @param string $search
-     *
-     * @param string $perm_level
-     *
-     * @param string $additional_sql_conditions An additional SQL snippet
-     *      consisting of conditions. This snippet is appended to the
-     *      default conditions.
-     *
-     * @return void
-     */
-    public function __construct($search, $perm_level = 'dozent', $parameters = [], $additional_sql_conditions = '')
-    {
-        parent::__construct($search);
-
-        $this->perm_level = $perm_level;
-        $this->parameters = $parameters;
-        $this->additional_sql_conditions = trim($additional_sql_conditions);
-    }
-
-
-    /**
-     * returns the title/description of the searchfield
-     *
-     * @return string title/description
-     */
-    public function getTitle()
-    {
-        return _('Veranstaltung suchen');
-    }
-
-    /**
-     * returns the results of a search
-     * Use the contextual_data variable to send more variables than just the input
-     * to the SQL. QuickSearch for example sends all other variables of the same
-     * <form>-tag here.
-     * @param string $input the search-word(s)
-     * @param array $contextual_data an associative array with more variables
-     * @param int $limit maximum number of results (default: all)
-     * @param int $offset return results starting from this row (default: 0)
-     * @return array: array(array(), ...)
-     */
-    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
-    {
-        $sql = $this->getSQL();
-        if (!$sql) {
-            return [];
-        }
-        if ($offset || $limit != PHP_INT_MAX) {
-            $sql .= sprintf(' LIMIT %d, %d', $offset, $limit);
-        }
-
-        $statement = DBManager::get()->prepare($sql, [PDO::FETCH_NUM]);
-        $statement->execute(array_merge(
-            $this->parameters,
-            $contextual_data,
-            [':input' => "%{$input}%"]
-        ));
-        $results = $statement->fetchAll();
-        return $results;
-    }
-
-    /**
-     * returns a sql-string appropriate for the searchtype of the current class
-     *
-     * @return string
-     */
-    private function getSQL()
-    {
-        $semnumber = Config::get()->IMPORTANT_SEMNUMBER;
-        $semester_text = "CONCAT(
-            '(',
-            IF(semester_data.semester_id IS NULL, '" . _('unbegrenzt') . "',
-                GROUP_CONCAT(semester_data.`name` SEPARATOR ', ')),
-            ')'
-        )";
-
-        $conditions = implode(' AND ', $this->getConditions());
-
-        switch ($this->perm_level) {
-            // Roots see everything, everywhere.
-            case 'root':
-                $query = "SELECT DISTINCT
-                            s.`Seminar_id`,
-                            CONCAT_WS(' ', s.`VeranstaltungsNummer`, s.`Name`, {$semester_text})
-                          FROM `seminare` s
-                          LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
-                          LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
-                          WHERE {$conditions}
-                          GROUP BY s.Seminar_id ";
-                if ($semnumber) {
-                    $query .= " ORDER BY MAX(semester_data.`beginn`) DESC, s.`VeranstaltungsNummer`, s.`Name`";
-                } else {
-                    $query .= " ORDER BY MAX(semester_data.beginn) DESC, s.`Name`";
-                }
-                return $query;
-            // Admins see everything at their assigned institutes.
-            case 'admin':
-                $sem_inst = Config::get()->ALLOW_ADMIN_RELATED_INST ? 'si' : 's';
-                $query = "SELECT DISTINCT
-                            s.`Seminar_id`,
-                            CONCAT_WS(' ', s.`VeranstaltungsNummer`, s.`Name`, {$semester_text})
-                          FROM `seminare` s
-                          JOIN `seminar_inst` si USING (Seminar_id)
-                          LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
-                          LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
-                          WHERE {$conditions}
-                            AND {$sem_inst}.`institut_id` IN (:institutes)
-                          GROUP BY s.Seminar_id ";
-                if ($semnumber) {
-                    $query .= " ORDER BY MAX(semester_data.`beginn`) DESC, s.`VeranstaltungsNummer`, s.`Name`";
-                } else {
-                    $query .= " ORDER BY MAX(semester_data.`beginn`) DESC, s.`Name`";
-                }
-                return $query;
-            // non-admins search all their administrable courses.
-            default:
-                $query = "SELECT DISTINCT
-                            s.`Seminar_id`,
-                            CONCAT_WS(' ', s.`VeranstaltungsNummer`, s.`Name`, {$semester_text}),
-                            s.`VeranstaltungsNummer` AS num,
-                            s.`Name`,
-                            MAX(semester_data.beginn) AS beginn
-                          FROM `seminare` s
-                          JOIN `seminar_user` su ON (s.`Seminar_id` = su.`Seminar_id`)
-                          LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
-                          LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
-                          WHERE {$conditions}
-                            AND su.`user_id` = :userid
-                            AND su.`status` IN ('dozent','tutor')
-                          GROUP BY s.Seminar_id ";
-
-                if (Config::get()->DEPUTIES_ENABLE) {
-                    $query .= " UNION ";
-                    $query .= "SELECT DISTINCT
-                                 s.`Seminar_id`,
-                                 CONCAT_WS(' ', s.`VeranstaltungsNummer`, ' ', s.`Name`, {$semester_text}),
-                                 s.`VeranstaltungsNummer` AS num,
-                                 s.`Name`,
-                                 MAX(semester_data.beginn) AS beginn
-                               FROM `seminare` s
-                               JOIN `deputies` d ON (s.`Seminar_id` = d.`range_id`)
-                               LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
-                               LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
-                               WHERE {$conditions}
-                                 AND d.`user_id` = :userid
-                               GROUP BY s.Seminar_id";
-                }
-
-                if ($semnumber) {
-                    $query .= " ORDER BY beginn DESC, num, `Name`";
-                } else {
-                    $query .= " ORDER BY beginn DESC, `Name`";
-                }
-
-                return $query;
-        }
-    }
-
-    /**
-     * Returns the default conditions use by all searches as a list.
-     *
-     * @return array
-     */
-    private function getConditions(): array
-    {
-        $conditions = [
-            '(s.`VeranstaltungsNummer` LIKE :input OR s.`Name` LIKE :input)',
-            's.`Seminar_id` NOT IN (:exclude)',
-        ];
-
-        if (isset($this->parameters['semtypes'])) {
-            $conditions[] = 's.`status` NOT IN (:semtypes)';
-        }
-
-        if (isset($this->parameters['semesters'])) {
-            $conditions[] = 'semester_data.`semester_id` IN (:semesters)';
-        }
-
-        if ($this->additional_sql_conditions) {
-            $conditions[] = $this->additional_sql_conditions;
-        }
-
-        return $conditions;
-    }
-
-    /**
-     * A very simple overwrite of the same method from SearchType class.
-     * returns the absolute path to this class for autoincluding this class.
-     *
-     * @return: path to this class
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/MyCoursesSearch.php b/lib/classes/searchtypes/MyCoursesSearch.php
new file mode 100644
index 0000000..64bee64
--- /dev/null
+++ b/lib/classes/searchtypes/MyCoursesSearch.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * MyCoursesSearch.class.php
+ * Search only in own courses.
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @copyright   2015 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class MyCoursesSearch extends StandardSearch
+{
+    private $perm_level;
+    private $parameters;
+    protected $additional_sql_conditions;
+
+    /**
+     *
+     * @param string $search
+     *
+     * @param string $perm_level
+     *
+     * @param string $additional_sql_conditions An additional SQL snippet
+     *      consisting of conditions. This snippet is appended to the
+     *      default conditions.
+     *
+     * @return void
+     */
+    public function __construct($search, $perm_level = 'dozent', $parameters = [], $additional_sql_conditions = '')
+    {
+        parent::__construct($search);
+
+        $this->perm_level = $perm_level;
+        $this->parameters = $parameters;
+        $this->additional_sql_conditions = trim($additional_sql_conditions);
+    }
+
+
+    /**
+     * returns the title/description of the searchfield
+     *
+     * @return string title/description
+     */
+    public function getTitle()
+    {
+        return _('Veranstaltung suchen');
+    }
+
+    /**
+     * returns the results of a search
+     * Use the contextual_data variable to send more variables than just the input
+     * to the SQL. QuickSearch for example sends all other variables of the same
+     * <form>-tag here.
+     * @param string $input the search-word(s)
+     * @param array $contextual_data an associative array with more variables
+     * @param int $limit maximum number of results (default: all)
+     * @param int $offset return results starting from this row (default: 0)
+     * @return array: array(array(), ...)
+     */
+    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
+    {
+        $sql = $this->getSQL();
+        if (!$sql) {
+            return [];
+        }
+        if ($offset || $limit != PHP_INT_MAX) {
+            $sql .= sprintf(' LIMIT %d, %d', $offset, $limit);
+        }
+
+        $statement = DBManager::get()->prepare($sql, [PDO::FETCH_NUM]);
+        $statement->execute(array_merge(
+            $this->parameters,
+            $contextual_data,
+            [':input' => "%{$input}%"]
+        ));
+        $results = $statement->fetchAll();
+        return $results;
+    }
+
+    /**
+     * returns a sql-string appropriate for the searchtype of the current class
+     *
+     * @return string
+     */
+    private function getSQL()
+    {
+        $semnumber = Config::get()->IMPORTANT_SEMNUMBER;
+        $semester_text = "CONCAT(
+            '(',
+            IF(semester_data.semester_id IS NULL, '" . _('unbegrenzt') . "',
+                GROUP_CONCAT(semester_data.`name` SEPARATOR ', ')),
+            ')'
+        )";
+
+        $conditions = implode(' AND ', $this->getConditions());
+
+        switch ($this->perm_level) {
+            // Roots see everything, everywhere.
+            case 'root':
+                $query = "SELECT DISTINCT
+                            s.`Seminar_id`,
+                            CONCAT_WS(' ', s.`VeranstaltungsNummer`, s.`Name`, {$semester_text})
+                          FROM `seminare` s
+                          LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
+                          LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
+                          WHERE {$conditions}
+                          GROUP BY s.Seminar_id ";
+                if ($semnumber) {
+                    $query .= " ORDER BY MAX(semester_data.`beginn`) DESC, s.`VeranstaltungsNummer`, s.`Name`";
+                } else {
+                    $query .= " ORDER BY MAX(semester_data.beginn) DESC, s.`Name`";
+                }
+                return $query;
+            // Admins see everything at their assigned institutes.
+            case 'admin':
+                $sem_inst = Config::get()->ALLOW_ADMIN_RELATED_INST ? 'si' : 's';
+                $query = "SELECT DISTINCT
+                            s.`Seminar_id`,
+                            CONCAT_WS(' ', s.`VeranstaltungsNummer`, s.`Name`, {$semester_text})
+                          FROM `seminare` s
+                          JOIN `seminar_inst` si USING (Seminar_id)
+                          LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
+                          LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
+                          WHERE {$conditions}
+                            AND {$sem_inst}.`institut_id` IN (:institutes)
+                          GROUP BY s.Seminar_id ";
+                if ($semnumber) {
+                    $query .= " ORDER BY MAX(semester_data.`beginn`) DESC, s.`VeranstaltungsNummer`, s.`Name`";
+                } else {
+                    $query .= " ORDER BY MAX(semester_data.`beginn`) DESC, s.`Name`";
+                }
+                return $query;
+            // non-admins search all their administrable courses.
+            default:
+                $query = "SELECT DISTINCT
+                            s.`Seminar_id`,
+                            CONCAT_WS(' ', s.`VeranstaltungsNummer`, s.`Name`, {$semester_text}),
+                            s.`VeranstaltungsNummer` AS num,
+                            s.`Name`,
+                            MAX(semester_data.beginn) AS beginn
+                          FROM `seminare` s
+                          JOIN `seminar_user` su ON (s.`Seminar_id` = su.`Seminar_id`)
+                          LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
+                          LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
+                          WHERE {$conditions}
+                            AND su.`user_id` = :userid
+                            AND su.`status` IN ('dozent','tutor')
+                          GROUP BY s.Seminar_id ";
+
+                if (Config::get()->DEPUTIES_ENABLE) {
+                    $query .= " UNION ";
+                    $query .= "SELECT DISTINCT
+                                 s.`Seminar_id`,
+                                 CONCAT_WS(' ', s.`VeranstaltungsNummer`, ' ', s.`Name`, {$semester_text}),
+                                 s.`VeranstaltungsNummer` AS num,
+                                 s.`Name`,
+                                 MAX(semester_data.beginn) AS beginn
+                               FROM `seminare` s
+                               JOIN `deputies` d ON (s.`Seminar_id` = d.`range_id`)
+                               LEFT JOIN semester_courses ON (s.Seminar_id = semester_courses.course_id)
+                               LEFT JOIN `semester_data` ON (semester_data.semester_id = semester_courses.semester_id)
+                               WHERE {$conditions}
+                                 AND d.`user_id` = :userid
+                               GROUP BY s.Seminar_id";
+                }
+
+                if ($semnumber) {
+                    $query .= " ORDER BY beginn DESC, num, `Name`";
+                } else {
+                    $query .= " ORDER BY beginn DESC, `Name`";
+                }
+
+                return $query;
+        }
+    }
+
+    /**
+     * Returns the default conditions use by all searches as a list.
+     *
+     * @return array
+     */
+    private function getConditions(): array
+    {
+        $conditions = [
+            '(s.`VeranstaltungsNummer` LIKE :input OR s.`Name` LIKE :input)',
+            's.`Seminar_id` NOT IN (:exclude)',
+        ];
+
+        if (isset($this->parameters['semtypes'])) {
+            $conditions[] = 's.`status` NOT IN (:semtypes)';
+        }
+
+        if (isset($this->parameters['semesters'])) {
+            $conditions[] = 'semester_data.`semester_id` IN (:semesters)';
+        }
+
+        if ($this->additional_sql_conditions) {
+            $conditions[] = $this->additional_sql_conditions;
+        }
+
+        return $conditions;
+    }
+
+    /**
+     * A very simple overwrite of the same method from SearchType class.
+     * returns the absolute path to this class for autoincluding this class.
+     *
+     * @return: path to this class
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/searchtypes/PermissionSearch.class.php b/lib/classes/searchtypes/PermissionSearch.class.php
deleted file mode 100644
index cc4ce3e..0000000
--- a/lib/classes/searchtypes/PermissionSearch.class.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-# Lifter010: TODO
-
-/*
- * Copyright (C) 2010 - Thomas Hackl <thomas.hackl@uni-passau.de>
- *
- * 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.
- */
-
-/**
- * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search for people with a given
- * Stud.IP permission level, either globally or at an institute.
- *
- * @author Thomas Hackl
- *
- */
-
-class PermissionSearch extends SQLSearch {
-
-    private $search;
-    private $presets;
-
-    /**
-     *
-     * @param string $query: SQL with at least ":input" as parameter
-     * @param array $presets: variables from the same form that should be used
-     * in this search. array("input_name" => "placeholder_in_sql_query")
-     * @return void
-     */
-    public function __construct($search, $title = "", $avatarLike = "user_id", $presets = []) {
-        $this->search = $search;
-        $this->presets = $presets;
-        $this->title = $title;
-        $this->avatarLike = in_array($avatarLike, words('user_id, username')) ? $avatarLike : 'user_id';
-    }
-
-
-    /**
-     * returns the results of a search
-     * Use the contextual_data variable to send more variables than just the input
-     * to the SQL. QuickSearch for example sends all other variables of the same
-     * <form>-tag here.
-     * @param input string: the search-word(s)
-     * @param contextual_data array: an associative array with more variables
-     * @param limit int: maximum number of results (default: all)
-     * @param offset int: return results starting from this row (default: 0)
-     * @return array: array(array(), ...)
-     */
-    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
-    {
-        $db = DBManager::get();
-        $sql = $this->getSQL();
-        if ($offset || $limit != PHP_INT_MAX) {
-            $sql .= sprintf(' LIMIT %d, %d', $offset, $limit);
-        }
-        if (is_callable($this->presets, true)) {
-            $presets = call_user_func($this->presets, $this, $contextual_data);
-        } else {
-            $presets = $this->presets + $contextual_data;
-        }
-
-        $data = $this->getDefaultData();
-        $data[':input'] = "%{$input}%";
-
-        foreach ($presets as $name => $value) {
-            if (is_array($value) && !$value) {
-                $value = '';
-            }
-
-            if ($name !== 'input' && mb_strpos($sql, ":{$name}") !== false) {
-                $data[":{$name}"] = $value;
-            }
-        }
-
-        $statement = $db->prepare($sql);
-        $statement->execute($data);
-        $results = $statement->fetchAll();
-        return $results;
-    }
-
-    private function getSQL()
-    {
-        $first_column = "auth_user_md5.{$this->avatarLike}";
-
-        // Respect user visibility setting
-        if ($GLOBALS['user']->perms === 'root') {
-            // Root may find everyone
-            $visibility_condition = '1';
-        } else {
-            $visibility_condition = "auth_user_md5.visible NOT IN ('never')";
-            if (Config::get()->DOZENT_ALWAYS_VISIBLE) {
-                $visibility_condition .= " OR auth_user_md5.perms = 'dozent'";
-            }
-            $visibility_condition = "({$visibility_condition})";
-        }
-
-        switch ($this->search) {
-            case 'user':
-                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
-                        FROM auth_user_md5
-                        LEFT JOIN user_info USING (user_id)
-                        WHERE (
-                            CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
-                            OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
-                            OR auth_user_md5.username LIKE :input
-                          )
-                          AND auth_user_md5.perms IN (:permission)
-                          AND auth_user_md5.user_id NOT IN (:exclude_user)
-                          AND {$visibility_condition}
-                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
-            case 'user_not_already_in_sem':
-                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
-                        FROM auth_user_md5
-                        LEFT JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id AND status IN (:sem_perm)
-                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
-                        WHERE su.user_id IS NULL
-                          AND (
-                              CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
-                              OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
-                              OR auth_user_md5.username LIKE :input
-                          )
-                          AND auth_user_md5.perms IN (:permission)
-                          AND {$visibility_condition}
-                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
-            case 'user_in_sem':
-                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
-                        FROM auth_user_md5
-                        JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id AND status IN (:sem_perm)
-                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
-                        WHERE (
-                            CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
-                            OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
-                            OR auth_user_md5.username LIKE :input
-                          )
-                          AND auth_user_md5.user_id NOT IN (:exclude_user)
-                          AND {$visibility_condition}
-                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
-            case 'user_inst':
-                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
-                        FROM auth_user_md5
-                        LEFT JOIN user_inst ON user_inst.user_id = auth_user_md5.user_id
-                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
-                        WHERE (
-                            CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
-                            OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
-                            OR auth_user_md5.username LIKE :input
-                          )
-                          AND user_inst.Institut_id IN (:institute)
-                          AND user_inst.inst_perms IN (:permission)
-                          AND auth_user_md5.user_id NOT IN (:exclude_user)
-                          AND {$visibility_condition}
-                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
-           case 'user_inst_not_already_in_sem':
-                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
-                        FROM auth_user_md5
-                        LEFT JOIN user_inst ON user_inst.user_id = auth_user_md5.user_id
-                        LEFT JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id AND status IN (:sem_perm)
-                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
-                        WHERE su.user_id IS NULL
-                          AND (
-                              CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
-                              OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
-                              OR auth_user_md5.username LIKE :input
-                          )
-                          AND user_inst.Institut_id IN (:institute)
-                          AND user_inst.inst_perms IN (:permission)
-                          AND {$visibility_condition}
-                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
-           case 'user_not_already_in_sem_or_deputy':
-                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
-                        FROM auth_user_md5
-                        LEFT JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id
-                        LEFT JOIN deputies d ON d.user_id = auth_user_md5.user_id AND range_id=:seminar_id
-                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
-                        WHERE su.user_id IS NULL
-                          AND d.user_id IS NULL
-                          AND (
-                              CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
-                              OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
-                              OR auth_user_md5.username LIKE :input
-                          )
-                          AND auth_user_md5.perms IN (:permission)
-                          AND {$visibility_condition}
-                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
-        }
-
-        // No search type matched?
-        throw new InvalidArgumentException('search parameter not valid');
-    }
-
-    private function getDefaultData()
-    {
-        $data = [];
-        if (in_array($this->search, ['user', 'user_in_sem', 'user_inst'])) {
-            $data[':exclude_user'] = '';
-        }
-        if (in_array($this->search, ['user_not_already_in_sem', 'user_inst_not_already_in_sem'])) {
-            $data[':sem_perm'] = ['autor', 'tutor', 'dozent'];
-        }
-        if (in_array($this->search, ['user', 'user_inst'])) {
-            $data[':permission'] = ['autor', 'tutor', 'dozent', 'admin'];
-        }
-        return $data;
-    }
-
-    /**
-     * A very simple overwrite of the same method from SearchType class.
-     * returns the absolute path to this class for autoincluding this class.
-     * @return: path to this class
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/PermissionSearch.php b/lib/classes/searchtypes/PermissionSearch.php
new file mode 100644
index 0000000..cc4ce3e
--- /dev/null
+++ b/lib/classes/searchtypes/PermissionSearch.php
@@ -0,0 +1,219 @@
+<?php
+# Lifter010: TODO
+
+/*
+ * Copyright (C) 2010 - Thomas Hackl <thomas.hackl@uni-passau.de>
+ *
+ * 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.
+ */
+
+/**
+ * Class of type SearchType used for searches with QuickSearch
+ * (lib/classes/QuickSearch.class.php). You can search for people with a given
+ * Stud.IP permission level, either globally or at an institute.
+ *
+ * @author Thomas Hackl
+ *
+ */
+
+class PermissionSearch extends SQLSearch {
+
+    private $search;
+    private $presets;
+
+    /**
+     *
+     * @param string $query: SQL with at least ":input" as parameter
+     * @param array $presets: variables from the same form that should be used
+     * in this search. array("input_name" => "placeholder_in_sql_query")
+     * @return void
+     */
+    public function __construct($search, $title = "", $avatarLike = "user_id", $presets = []) {
+        $this->search = $search;
+        $this->presets = $presets;
+        $this->title = $title;
+        $this->avatarLike = in_array($avatarLike, words('user_id, username')) ? $avatarLike : 'user_id';
+    }
+
+
+    /**
+     * returns the results of a search
+     * Use the contextual_data variable to send more variables than just the input
+     * to the SQL. QuickSearch for example sends all other variables of the same
+     * <form>-tag here.
+     * @param input string: the search-word(s)
+     * @param contextual_data array: an associative array with more variables
+     * @param limit int: maximum number of results (default: all)
+     * @param offset int: return results starting from this row (default: 0)
+     * @return array: array(array(), ...)
+     */
+    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
+    {
+        $db = DBManager::get();
+        $sql = $this->getSQL();
+        if ($offset || $limit != PHP_INT_MAX) {
+            $sql .= sprintf(' LIMIT %d, %d', $offset, $limit);
+        }
+        if (is_callable($this->presets, true)) {
+            $presets = call_user_func($this->presets, $this, $contextual_data);
+        } else {
+            $presets = $this->presets + $contextual_data;
+        }
+
+        $data = $this->getDefaultData();
+        $data[':input'] = "%{$input}%";
+
+        foreach ($presets as $name => $value) {
+            if (is_array($value) && !$value) {
+                $value = '';
+            }
+
+            if ($name !== 'input' && mb_strpos($sql, ":{$name}") !== false) {
+                $data[":{$name}"] = $value;
+            }
+        }
+
+        $statement = $db->prepare($sql);
+        $statement->execute($data);
+        $results = $statement->fetchAll();
+        return $results;
+    }
+
+    private function getSQL()
+    {
+        $first_column = "auth_user_md5.{$this->avatarLike}";
+
+        // Respect user visibility setting
+        if ($GLOBALS['user']->perms === 'root') {
+            // Root may find everyone
+            $visibility_condition = '1';
+        } else {
+            $visibility_condition = "auth_user_md5.visible NOT IN ('never')";
+            if (Config::get()->DOZENT_ALWAYS_VISIBLE) {
+                $visibility_condition .= " OR auth_user_md5.perms = 'dozent'";
+            }
+            $visibility_condition = "({$visibility_condition})";
+        }
+
+        switch ($this->search) {
+            case 'user':
+                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
+                        FROM auth_user_md5
+                        LEFT JOIN user_info USING (user_id)
+                        WHERE (
+                            CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
+                            OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
+                            OR auth_user_md5.username LIKE :input
+                          )
+                          AND auth_user_md5.perms IN (:permission)
+                          AND auth_user_md5.user_id NOT IN (:exclude_user)
+                          AND {$visibility_condition}
+                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
+            case 'user_not_already_in_sem':
+                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
+                        FROM auth_user_md5
+                        LEFT JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id AND status IN (:sem_perm)
+                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
+                        WHERE su.user_id IS NULL
+                          AND (
+                              CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
+                              OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
+                              OR auth_user_md5.username LIKE :input
+                          )
+                          AND auth_user_md5.perms IN (:permission)
+                          AND {$visibility_condition}
+                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
+            case 'user_in_sem':
+                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
+                        FROM auth_user_md5
+                        JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id AND status IN (:sem_perm)
+                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
+                        WHERE (
+                            CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
+                            OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
+                            OR auth_user_md5.username LIKE :input
+                          )
+                          AND auth_user_md5.user_id NOT IN (:exclude_user)
+                          AND {$visibility_condition}
+                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
+            case 'user_inst':
+                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
+                        FROM auth_user_md5
+                        LEFT JOIN user_inst ON user_inst.user_id = auth_user_md5.user_id
+                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
+                        WHERE (
+                            CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
+                            OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
+                            OR auth_user_md5.username LIKE :input
+                          )
+                          AND user_inst.Institut_id IN (:institute)
+                          AND user_inst.inst_perms IN (:permission)
+                          AND auth_user_md5.user_id NOT IN (:exclude_user)
+                          AND {$visibility_condition}
+                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
+           case 'user_inst_not_already_in_sem':
+                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
+                        FROM auth_user_md5
+                        LEFT JOIN user_inst ON user_inst.user_id = auth_user_md5.user_id
+                        LEFT JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id AND status IN (:sem_perm)
+                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
+                        WHERE su.user_id IS NULL
+                          AND (
+                              CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
+                              OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
+                              OR auth_user_md5.username LIKE :input
+                          )
+                          AND user_inst.Institut_id IN (:institute)
+                          AND user_inst.inst_perms IN (:permission)
+                          AND {$visibility_condition}
+                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
+           case 'user_not_already_in_sem_or_deputy':
+                return "SELECT DISTINCT $first_column, CONCAT(Nachname, ', ', Vorname, ' (', username, ')')
+                        FROM auth_user_md5
+                        LEFT JOIN seminar_user su ON su.user_id = auth_user_md5.user_id AND seminar_id=:seminar_id
+                        LEFT JOIN deputies d ON d.user_id = auth_user_md5.user_id AND range_id=:seminar_id
+                        LEFT JOIN user_info ON auth_user_md5.user_id = user_info.user_id
+                        WHERE su.user_id IS NULL
+                          AND d.user_id IS NULL
+                          AND (
+                              CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ')
+                              OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input
+                              OR auth_user_md5.username LIKE :input
+                          )
+                          AND auth_user_md5.perms IN (:permission)
+                          AND {$visibility_condition}
+                        ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname, auth_user_md5.username";
+        }
+
+        // No search type matched?
+        throw new InvalidArgumentException('search parameter not valid');
+    }
+
+    private function getDefaultData()
+    {
+        $data = [];
+        if (in_array($this->search, ['user', 'user_in_sem', 'user_inst'])) {
+            $data[':exclude_user'] = '';
+        }
+        if (in_array($this->search, ['user_not_already_in_sem', 'user_inst_not_already_in_sem'])) {
+            $data[':sem_perm'] = ['autor', 'tutor', 'dozent'];
+        }
+        if (in_array($this->search, ['user', 'user_inst'])) {
+            $data[':permission'] = ['autor', 'tutor', 'dozent', 'admin'];
+        }
+        return $data;
+    }
+
+    /**
+     * A very simple overwrite of the same method from SearchType class.
+     * returns the absolute path to this class for autoincluding this class.
+     * @return: path to this class
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/searchtypes/RangeSearch.class.php b/lib/classes/searchtypes/RangeSearch.class.php
deleted file mode 100644
index caefae0..0000000
--- a/lib/classes/searchtypes/RangeSearch.class.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * @author      Jan-Hendrik Willms <tleilx+studip@gail.com>
- * @license     GPL2 or any later version
- * @category    Stud.IP
- */
-class RangeSearch extends SearchType
-{
-    /**
-     * returns the title/description of the searchfield
-     *
-     * @return string title/description
-     */
-    public function getTitle()
-    {
-        return _('Person, Veranstaltung oder Einrichtung suchen');
-    }
-
-    /**
-     * returns a sql-string appropriate for the searchtype of the current class
-     *
-     * @return string
-     */
-    private function getSQL()
-    {
-        $this->extendedLayout = true;
-
-        $queries = [];
-        $queries[] = "SELECT user_id AS id,
-                             TRIM(CONCAT(Nachname, ', ', Vorname, ' (', username, ')')) AS name,
-                             'user' AS type
-                      FROM auth_user_md5
-                      LEFT JOIN user_info USING (user_id)
-                      WHERE (
-                          CONCAT(Nachname, ', ', Vorname, ' ', Nachname) LIKE REPLACE(:input, ' ', '% ')
-                          OR username LIKE :input
-                        )
-                        AND " . get_vis_query();
-        $queries[] = "SELECT Seminar_id AS id,
-                             TRIM(CONCAT(VeranstaltungsNummer, ' ', Name)) AS name,
-                             'course' AS type
-                      FROM seminare
-                      WHERE CONCAT(VeranstaltungsNummer, ' ', Name, ' ', Untertitel) LIKE REPLACE(:input, ' ', '% ')";
-        $queries[] = "SELECT Institut_id AS id,
-                             Name AS name,
-                             'institute' AS type
-                      FROM Institute
-                      WHERE Name LIKE REPLACE(:input, ' ', '% ')";
-        $queries = implode(" UNION ALL ", $queries);
-
-        return "SELECT *
-                FROM ({$queries}) AS tmp
-                ORDER BY name ASC";
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
-    {
-        $query = $this->getSQL();
-
-        if ($offset || $limit != PHP_INT_MAX) {
-            $query .= sprintf(' LIMIT %u, %u', $offset, $limit);
-        }
-
-        return DBManager::get()->fetchAll($query, [':input' => "%{$input}%"], function ($row) {
-            $range = RangeFactory::createRange($row['type'], null);
-            return [
-                $row['id'],
-                $range->describeRange() . ': ' . $row['name'],
-            ];
-        });
-
-    }
-
-    /**
-     * A very simple overwrite of the same method from SearchType class.
-     * returns the absolute path to this class for autoincluding this class.
-     *
-     * @return: path to this class
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/RangeSearch.php b/lib/classes/searchtypes/RangeSearch.php
new file mode 100644
index 0000000..caefae0
--- /dev/null
+++ b/lib/classes/searchtypes/RangeSearch.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @author      Jan-Hendrik Willms <tleilx+studip@gail.com>
+ * @license     GPL2 or any later version
+ * @category    Stud.IP
+ */
+class RangeSearch extends SearchType
+{
+    /**
+     * returns the title/description of the searchfield
+     *
+     * @return string title/description
+     */
+    public function getTitle()
+    {
+        return _('Person, Veranstaltung oder Einrichtung suchen');
+    }
+
+    /**
+     * returns a sql-string appropriate for the searchtype of the current class
+     *
+     * @return string
+     */
+    private function getSQL()
+    {
+        $this->extendedLayout = true;
+
+        $queries = [];
+        $queries[] = "SELECT user_id AS id,
+                             TRIM(CONCAT(Nachname, ', ', Vorname, ' (', username, ')')) AS name,
+                             'user' AS type
+                      FROM auth_user_md5
+                      LEFT JOIN user_info USING (user_id)
+                      WHERE (
+                          CONCAT(Nachname, ', ', Vorname, ' ', Nachname) LIKE REPLACE(:input, ' ', '% ')
+                          OR username LIKE :input
+                        )
+                        AND " . get_vis_query();
+        $queries[] = "SELECT Seminar_id AS id,
+                             TRIM(CONCAT(VeranstaltungsNummer, ' ', Name)) AS name,
+                             'course' AS type
+                      FROM seminare
+                      WHERE CONCAT(VeranstaltungsNummer, ' ', Name, ' ', Untertitel) LIKE REPLACE(:input, ' ', '% ')";
+        $queries[] = "SELECT Institut_id AS id,
+                             Name AS name,
+                             'institute' AS type
+                      FROM Institute
+                      WHERE Name LIKE REPLACE(:input, ' ', '% ')";
+        $queries = implode(" UNION ALL ", $queries);
+
+        return "SELECT *
+                FROM ({$queries}) AS tmp
+                ORDER BY name ASC";
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
+    {
+        $query = $this->getSQL();
+
+        if ($offset || $limit != PHP_INT_MAX) {
+            $query .= sprintf(' LIMIT %u, %u', $offset, $limit);
+        }
+
+        return DBManager::get()->fetchAll($query, [':input' => "%{$input}%"], function ($row) {
+            $range = RangeFactory::createRange($row['type'], null);
+            return [
+                $row['id'],
+                $range->describeRange() . ': ' . $row['name'],
+            ];
+        });
+
+    }
+
+    /**
+     * A very simple overwrite of the same method from SearchType class.
+     * returns the absolute path to this class for autoincluding this class.
+     *
+     * @return: path to this class
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/searchtypes/ResourceSearch.class.php b/lib/classes/searchtypes/ResourceSearch.class.php
deleted file mode 100644
index 24038a8..0000000
--- a/lib/classes/searchtypes/ResourceSearch.class.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-
-/**
- * ResourceSearch.class.php - A search type for resources.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @author      Timo Hartge <hartge@data-quest.de>
- * @copyright   2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-
-class ResourceSearch extends SearchType
-{
-    //Attributes:
-
-
-    /**
-     * string[]
-     * Limits the search results to resources where a person has at least
-     * the permission levels specified in this attribute.
-     * Defaults to ['user', 'autor', 'tutor', 'admin'].
-     */
-    protected $accepted_permission_levels = ['user', 'autor', 'tutor', 'admin'];
-
-    /**
-     * bool
-     * Whether to use global permissions when searching for resources
-     * where a person has permissions on (true) or not. Defaults to true.
-     */
-    protected $use_global_permissions = true;
-
-
-    /**
-     * string[]
-     * Additional properties that shall be appended to the name of the resource.
-     * The array must be one-dimensional.
-     */
-    protected $additional_display_properties = [];
-
-
-    /**
-     * string
-     * A format specification for additional properties in the "sprintf syntax".
-     * This format specification must have only one placeholder named '%s'
-     * in which the additional properties will be inserted, separated by
-     * the string ", ".
-     * This attribute defaults to '[%s]'.
-     */
-    protected $additional_property_format = '[%s]';
-
-
-    /**
-     * array
-     * Array of class_names of Resource classes that will be included in the search.
-     * An empty array will include all resource classes.
-     */
-    protected $searchable_resource_classes = [];
-
-
-    /**
-     * The setter method for the $accepted_permission_levels attribute.
-     *
-     * @param string[] $accepted_permission_levels The new value for the attribute.
-     */
-    public function setAcceptedPermissionLevels($levels = [])
-    {
-        //Check the array:
-        if (!$levels) {
-            throw new InvalidArgumentException(
-                _('Es wurde keine gültige Berechtigungsstufe übergeben!')
-            );
-        }
-
-        if (!is_array($levels)) {
-            $levels = [$levels];
-        }
-
-        foreach ($levels as $level) {
-            if (!in_array($level, ['user', 'autor', 'tutor', 'admin'])) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        _('Die Berechtigungsstufe %s ist ungültig!'),
-                        $level
-                    )
-                );
-            }
-        }
-
-        //The checks are finished: set the new levels:
-        $this->accepted_permission_levels = array_unique($levels);
-    }
-
-
-    /**
-     * The getter method for the $accepted_permission_levels attribute.
-     *
-     * @returns string[]
-     */
-    public function getAcceptedPermissionLevels()
-    {
-        return $this->accepted_permission_levels;
-    }
-
-
-    /**
-     * The setter method for the $use_global_permission attribute.
-     *
-     * @param bool $use_global_permissions The new value for the attribute.
-     */
-    public function setUseOfGlobalPermissions($use_global_permissions = true)
-    {
-        $this->use_global_permissions = (bool)$use_global_permissions;
-    }
-
-
-    /**
-     * The getter method for the $use_global_permission attribute.
-     *
-     * @returns bool
-     */
-    public function getUseOfGlobalPermissions()
-    {
-        return $this->use_global_permissions;
-    }
-
-
-    /**
-     * The setter method for the $additional_display_properties attribute.
-     *
-     * @param array $properties The new value for the attribute.
-     */
-    public function setAdditionalDisplayProperties($properties = [])
-    {
-        $this->additional_display_properties = $properties;
-    }
-
-
-    /**
-     * The getter method for the $additional_display_properties attribute.
-     *
-     * @returns array @see $additional_display_properties for the array format.
-     */
-    public function getAdditionalDisplayProperties()
-    {
-        return $this->additional_display_properties;
-    }
-
-
-    /**
-     * The setter method for the $additional_property_format attribute.
-     *
-     * @param string $format The new value for the attribute.
-     */
-    public function setAdditionalPropertyFormat($format = '[%s]')
-    {
-        $this->additional_property_format = $format;
-    }
-
-
-    /**
-     * The getter method for the $additional_property_format attribute.
-     *
-     * @returns string
-     */
-    public function getAdditionalPropertyFormat()
-    {
-        return $this->additional_property_format;
-    }
-
-    /**
-     * The setter method for the $searchable_resource_classes attribute.
-     *
-     * @param array $categories The new value for the attribute.
-     */
-    public function setSearchableResourceClasses($classes = [])
-    {
-        $this->searchable_resource_classes = $classes;
-    }
-
-
-    /**
-     * The getter method for the $searchable_resource_classes attribute.
-     *
-     * @returns array
-     */
-    public function getSearchableResourceClasses()
-    {
-        return $this->searchable_resource_classes;
-    }
-
-
-    //SearchType interface implementations:
-
-
-    public function getTitle()
-    {
-        return _('Ressourcensuche');
-    }
-
-    /**
-     * @param string $keyword The name of the resource or a part of it.
-     * @param array $contextual_data This parameter is not used at the moment.
-     */
-    public function getResults(
-        $keyword,
-        $contextual_data = [],
-        $limit = PHP_INT_MAX,
-        $offset = 0
-    )
-    {
-        $user = User::findCurrent();
-        if (!$user) {
-            return [];
-        }
-
-        $sql = "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE
-            resources.name LIKE CONCAT('%', :keyword, '%') ";
-        $sql_params = [
-            'keyword' => $keyword
-        ];
-
-        //Root users can access everything so that we don't need
-        //to check for permissions in case the current user is root.
-        if (!$GLOBALS['perm']->have_perm('root')) {
-            $global_permission = null;
-            if ($this->use_global_permissions) {
-                //Get the global permission level:
-                $global_permission = ResourceManager::getGlobalResourcePermission(
-                    $user
-                );
-            }
-
-            if (in_array($global_permission, $this->accepted_permission_levels)) {
-                //Retrieve all resources where the user has sufficient permissions.
-                //There may be resources where the user has explicitly lower
-                //permissions and we must therefore exclude these resources.
-                $lower_permission_levels = ResourceManager::getLowerPermissionLevels(
-                    $global_permission
-                );
-                $sql .= "AND resources.id NOT IN (
-                    SELECT resource_id
-                    FROM
-                    resource_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :lower_perms )
-                    UNION
-                    SELECT resource_id
-                    FROM
-                    resource_temporary_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :lower_perms )
-                    AND
-                    begin <= :now
-                    AND
-                    end >= :now
-                    )";
-                $sql_params = array_merge(
-                    $sql_params,
-                    [
-                        'user_id' => $user->id,
-                        'lower_perms' => $lower_permission_levels,
-                        'now' => time()
-                    ]
-                );
-            } else {
-                //Only retrieve those resources where the user has direct
-                //sufficient permissions.
-                $sql .= "AND resources.id IN (
-                    SELECT resource_id
-                    FROM
-                    resource_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :perms )
-                    UNION
-                    SELECT resource_id
-                    FROM
-                    resource_temporary_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :perms )
-                    AND
-                    begin <= :now
-                    AND
-                    end >= :now
-                    )";
-                $sql_params = array_merge(
-                    $sql_params,
-                    [
-                    'user_id' => $user->id,
-                    'perms' => $this->accepted_permission_levels,
-                    'now' => time()
-                    ]
-                );
-            }
-        }
-
-        $sql .= " ORDER BY resources.name ASC
-                LIMIT :limit OFFSET :offset ";
-        $sql_params['limit'] = $limit;
-        $sql_params['offset'] = $offset;
-
-        $resources = Resource::findBySql(
-            $sql,
-            $sql_params
-        );
-
-        $results = [];
-        foreach ($resources as $resource) {
-
-            if (!empty($this->searchable_resource_classes)) {
-                if(!in_array($resource->class_name, $this->searchable_resource_classes)) {
-                    continue;
-                }
-            }
-
-            $additional_text = '';
-            if (count($this->additional_display_properties)) {
-                $additional_values = [];
-                foreach ($this->additional_display_properties as $ap) {
-                    $additional_values[] = $resource->getProperty($ap);
-                }
-                $additional_text = implode(', ', $additional_values);
-            }
-
-            $complete_text = $resource->name;
-            if ($additional_text) {
-                $complete_text .= ' ' . sprintf(
-                    $this->additional_property_format,
-                    $additional_text
-                );
-            }
-            $results[] = [
-                $resource->id,
-                $complete_text
-            ];
-        }
-
-        return $results;
-    }
-
-
-    public function includePath()
-    {
-        return __FILE__;
-    }
-}
diff --git a/lib/classes/searchtypes/ResourceSearch.php b/lib/classes/searchtypes/ResourceSearch.php
new file mode 100644
index 0000000..24038a8
--- /dev/null
+++ b/lib/classes/searchtypes/ResourceSearch.php
@@ -0,0 +1,362 @@
+<?php
+
+/**
+ * ResourceSearch.class.php - A search type for resources.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @author      Timo Hartge <hartge@data-quest.de>
+ * @copyright   2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+
+class ResourceSearch extends SearchType
+{
+    //Attributes:
+
+
+    /**
+     * string[]
+     * Limits the search results to resources where a person has at least
+     * the permission levels specified in this attribute.
+     * Defaults to ['user', 'autor', 'tutor', 'admin'].
+     */
+    protected $accepted_permission_levels = ['user', 'autor', 'tutor', 'admin'];
+
+    /**
+     * bool
+     * Whether to use global permissions when searching for resources
+     * where a person has permissions on (true) or not. Defaults to true.
+     */
+    protected $use_global_permissions = true;
+
+
+    /**
+     * string[]
+     * Additional properties that shall be appended to the name of the resource.
+     * The array must be one-dimensional.
+     */
+    protected $additional_display_properties = [];
+
+
+    /**
+     * string
+     * A format specification for additional properties in the "sprintf syntax".
+     * This format specification must have only one placeholder named '%s'
+     * in which the additional properties will be inserted, separated by
+     * the string ", ".
+     * This attribute defaults to '[%s]'.
+     */
+    protected $additional_property_format = '[%s]';
+
+
+    /**
+     * array
+     * Array of class_names of Resource classes that will be included in the search.
+     * An empty array will include all resource classes.
+     */
+    protected $searchable_resource_classes = [];
+
+
+    /**
+     * The setter method for the $accepted_permission_levels attribute.
+     *
+     * @param string[] $accepted_permission_levels The new value for the attribute.
+     */
+    public function setAcceptedPermissionLevels($levels = [])
+    {
+        //Check the array:
+        if (!$levels) {
+            throw new InvalidArgumentException(
+                _('Es wurde keine gültige Berechtigungsstufe übergeben!')
+            );
+        }
+
+        if (!is_array($levels)) {
+            $levels = [$levels];
+        }
+
+        foreach ($levels as $level) {
+            if (!in_array($level, ['user', 'autor', 'tutor', 'admin'])) {
+                throw new InvalidArgumentException(
+                    sprintf(
+                        _('Die Berechtigungsstufe %s ist ungültig!'),
+                        $level
+                    )
+                );
+            }
+        }
+
+        //The checks are finished: set the new levels:
+        $this->accepted_permission_levels = array_unique($levels);
+    }
+
+
+    /**
+     * The getter method for the $accepted_permission_levels attribute.
+     *
+     * @returns string[]
+     */
+    public function getAcceptedPermissionLevels()
+    {
+        return $this->accepted_permission_levels;
+    }
+
+
+    /**
+     * The setter method for the $use_global_permission attribute.
+     *
+     * @param bool $use_global_permissions The new value for the attribute.
+     */
+    public function setUseOfGlobalPermissions($use_global_permissions = true)
+    {
+        $this->use_global_permissions = (bool)$use_global_permissions;
+    }
+
+
+    /**
+     * The getter method for the $use_global_permission attribute.
+     *
+     * @returns bool
+     */
+    public function getUseOfGlobalPermissions()
+    {
+        return $this->use_global_permissions;
+    }
+
+
+    /**
+     * The setter method for the $additional_display_properties attribute.
+     *
+     * @param array $properties The new value for the attribute.
+     */
+    public function setAdditionalDisplayProperties($properties = [])
+    {
+        $this->additional_display_properties = $properties;
+    }
+
+
+    /**
+     * The getter method for the $additional_display_properties attribute.
+     *
+     * @returns array @see $additional_display_properties for the array format.
+     */
+    public function getAdditionalDisplayProperties()
+    {
+        return $this->additional_display_properties;
+    }
+
+
+    /**
+     * The setter method for the $additional_property_format attribute.
+     *
+     * @param string $format The new value for the attribute.
+     */
+    public function setAdditionalPropertyFormat($format = '[%s]')
+    {
+        $this->additional_property_format = $format;
+    }
+
+
+    /**
+     * The getter method for the $additional_property_format attribute.
+     *
+     * @returns string
+     */
+    public function getAdditionalPropertyFormat()
+    {
+        return $this->additional_property_format;
+    }
+
+    /**
+     * The setter method for the $searchable_resource_classes attribute.
+     *
+     * @param array $categories The new value for the attribute.
+     */
+    public function setSearchableResourceClasses($classes = [])
+    {
+        $this->searchable_resource_classes = $classes;
+    }
+
+
+    /**
+     * The getter method for the $searchable_resource_classes attribute.
+     *
+     * @returns array
+     */
+    public function getSearchableResourceClasses()
+    {
+        return $this->searchable_resource_classes;
+    }
+
+
+    //SearchType interface implementations:
+
+
+    public function getTitle()
+    {
+        return _('Ressourcensuche');
+    }
+
+    /**
+     * @param string $keyword The name of the resource or a part of it.
+     * @param array $contextual_data This parameter is not used at the moment.
+     */
+    public function getResults(
+        $keyword,
+        $contextual_data = [],
+        $limit = PHP_INT_MAX,
+        $offset = 0
+    )
+    {
+        $user = User::findCurrent();
+        if (!$user) {
+            return [];
+        }
+
+        $sql = "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE
+            resources.name LIKE CONCAT('%', :keyword, '%') ";
+        $sql_params = [
+            'keyword' => $keyword
+        ];
+
+        //Root users can access everything so that we don't need
+        //to check for permissions in case the current user is root.
+        if (!$GLOBALS['perm']->have_perm('root')) {
+            $global_permission = null;
+            if ($this->use_global_permissions) {
+                //Get the global permission level:
+                $global_permission = ResourceManager::getGlobalResourcePermission(
+                    $user
+                );
+            }
+
+            if (in_array($global_permission, $this->accepted_permission_levels)) {
+                //Retrieve all resources where the user has sufficient permissions.
+                //There may be resources where the user has explicitly lower
+                //permissions and we must therefore exclude these resources.
+                $lower_permission_levels = ResourceManager::getLowerPermissionLevels(
+                    $global_permission
+                );
+                $sql .= "AND resources.id NOT IN (
+                    SELECT resource_id
+                    FROM
+                    resource_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :lower_perms )
+                    UNION
+                    SELECT resource_id
+                    FROM
+                    resource_temporary_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :lower_perms )
+                    AND
+                    begin <= :now
+                    AND
+                    end >= :now
+                    )";
+                $sql_params = array_merge(
+                    $sql_params,
+                    [
+                        'user_id' => $user->id,
+                        'lower_perms' => $lower_permission_levels,
+                        'now' => time()
+                    ]
+                );
+            } else {
+                //Only retrieve those resources where the user has direct
+                //sufficient permissions.
+                $sql .= "AND resources.id IN (
+                    SELECT resource_id
+                    FROM
+                    resource_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :perms )
+                    UNION
+                    SELECT resource_id
+                    FROM
+                    resource_temporary_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :perms )
+                    AND
+                    begin <= :now
+                    AND
+                    end >= :now
+                    )";
+                $sql_params = array_merge(
+                    $sql_params,
+                    [
+                    'user_id' => $user->id,
+                    'perms' => $this->accepted_permission_levels,
+                    'now' => time()
+                    ]
+                );
+            }
+        }
+
+        $sql .= " ORDER BY resources.name ASC
+                LIMIT :limit OFFSET :offset ";
+        $sql_params['limit'] = $limit;
+        $sql_params['offset'] = $offset;
+
+        $resources = Resource::findBySql(
+            $sql,
+            $sql_params
+        );
+
+        $results = [];
+        foreach ($resources as $resource) {
+
+            if (!empty($this->searchable_resource_classes)) {
+                if(!in_array($resource->class_name, $this->searchable_resource_classes)) {
+                    continue;
+                }
+            }
+
+            $additional_text = '';
+            if (count($this->additional_display_properties)) {
+                $additional_values = [];
+                foreach ($this->additional_display_properties as $ap) {
+                    $additional_values[] = $resource->getProperty($ap);
+                }
+                $additional_text = implode(', ', $additional_values);
+            }
+
+            $complete_text = $resource->name;
+            if ($additional_text) {
+                $complete_text .= ' ' . sprintf(
+                    $this->additional_property_format,
+                    $additional_text
+                );
+            }
+            $results[] = [
+                $resource->id,
+                $complete_text
+            ];
+        }
+
+        return $results;
+    }
+
+
+    public function includePath()
+    {
+        return __FILE__;
+    }
+}
diff --git a/lib/classes/searchtypes/RoomSearch.class.php b/lib/classes/searchtypes/RoomSearch.class.php
deleted file mode 100644
index 002712e..0000000
--- a/lib/classes/searchtypes/RoomSearch.class.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-/**
- * RoomSearch.class.php - A search type for rooms.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-
-class RoomSearch extends ResourceSearch
-{
-     //Setup and search configuration methods:
-    public $with_seats = 0;
-
-    //SearchType interface implementations:
-
-    public function getTitle()
-    {
-        return _('Raumsuche');
-    }
-
-    /**
-     * @param string $keyword The name of the room or a part of it.
-     * @param array $contextual_data This parameter is not used at the moment.
-     */
-    public function getResults(
-        $keyword,
-        $contextual_data = [],
-        $limit = PHP_INT_MAX,
-        $offset = 0
-    )
-    {
-        $user = User::findCurrent();
-        if (!$user) {
-            return [];
-        }
-        if ($this->with_seats) {
-            $prop_id_seats = ResourcePropertyDefinition::findOneByName('seats')->id;
-            $sql = "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            INNER JOIN resource_properties rp ON rp.resource_id = resources.id
-            WHERE
-            rc.class_name IN ( :room_class_names )
-            AND
-            rp.property_id = :prop_id_seats
-            AND
-            rp.state > :seats
-            AND
-            resources.name LIKE CONCAT('%', :keyword, '%') ";
-            $sql_params = [
-                'keyword' => $keyword,
-                'seats'   => $this->with_seats,
-                'prop_id_seats' => $prop_id_seats
-            ];
-        } else {
-            $sql = "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE
-            rc.class_name IN ( :room_class_names )
-            AND
-            resources.name LIKE CONCAT('%', :keyword, '%') ";
-            $sql_params = [
-                'keyword' => $keyword
-            ];
-        }
-        $sql_params['room_class_names'] = RoomManager::getAllRoomClassNames();
-
-        //Root users can access everything so that we don't need
-        //to check for permissions in case the current user is root.
-        if (!$GLOBALS['perm']->have_perm('root')) {
-            $global_permission = null;
-            if ($this->use_global_permissions) {
-                //Get the global permission level:
-                $global_permission = ResourceManager::getGlobalResourcePermission(
-                    $user
-                );
-            }
-
-            if (in_array($global_permission, $this->accepted_permission_levels)) {
-                //Retrieve all resources where the user has sufficient permissions.
-                //There may be resources where the user has explicitly lower
-                //permissions and we must therefore exclude these resources.
-                $lower_permission_levels = ResourceManager::getLowerPermissionLevels(
-                    $global_permission
-                );
-                $sql .= "AND resources.id NOT IN (
-                    SELECT resource_id
-                    FROM
-                    resource_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :lower_perms )
-                    UNION
-                    SELECT resource_id
-                    FROM
-                    resource_temporary_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :lower_perms )
-                    AND
-                    begin <= :now
-                    AND
-                    end >= :now
-                    )";
-                $sql_params = array_merge(
-                    $sql_params,
-                    [
-                        'user_id' => $user->id,
-                        'lower_perms' => $lower_permission_levels,
-                        'now' => time()
-                    ]
-                );
-            } else {
-                //Only retrieve those resources where the user has direct
-                //sufficient permissions.
-                $sql .= "AND resources.id IN (
-                    SELECT resource_id
-                    FROM
-                    resource_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :perms )
-                    UNION
-                    SELECT resource_id
-                    FROM
-                    resource_temporary_permissions
-                    WHERE
-                    user_id = :user_id
-                    AND
-                    perms IN ( :perms )
-                    AND
-                    begin <= :now
-                    AND
-                    end >= :now
-                    )";
-                $sql_params = array_merge(
-                    $sql_params,
-                    [
-                    'user_id' => $user->id,
-                    'perms' => $this->accepted_permission_levels,
-                    'now' => time()
-                    ]
-                );
-            }
-        }
-
-        $sql .= " ORDER BY resources.name ASC
-                LIMIT :limit OFFSET :offset ";
-        $sql_params['limit'] = $limit;
-        $sql_params['offset'] = $offset;
-
-        $rooms = Room::findBySql(
-            $sql,
-            $sql_params
-        );
-
-        $results = [];
-        foreach ($rooms as $room) {
-            $additional_text = '';
-            if (count($this->additional_display_properties)) {
-                $additional_values = [];
-                foreach ($this->additional_display_properties as $ap) {
-                    $additional_values[] = $room->getProperty($ap);
-                }
-                $additional_text = implode(', ', $additional_values);
-            }
-            $name = $room->name;
-            if($additional_text) {
-                $name .=  sprintf(
-                    $this->additional_property_format,
-                    $additional_text
-                );
-            }
-            $results[] = [
-                $room->id,
-                $name
-            ];
-        }
-        return $results;
-    }
-}
diff --git a/lib/classes/searchtypes/RoomSearch.php b/lib/classes/searchtypes/RoomSearch.php
new file mode 100644
index 0000000..002712e
--- /dev/null
+++ b/lib/classes/searchtypes/RoomSearch.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * RoomSearch.class.php - A search type for rooms.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+
+class RoomSearch extends ResourceSearch
+{
+     //Setup and search configuration methods:
+    public $with_seats = 0;
+
+    //SearchType interface implementations:
+
+    public function getTitle()
+    {
+        return _('Raumsuche');
+    }
+
+    /**
+     * @param string $keyword The name of the room or a part of it.
+     * @param array $contextual_data This parameter is not used at the moment.
+     */
+    public function getResults(
+        $keyword,
+        $contextual_data = [],
+        $limit = PHP_INT_MAX,
+        $offset = 0
+    )
+    {
+        $user = User::findCurrent();
+        if (!$user) {
+            return [];
+        }
+        if ($this->with_seats) {
+            $prop_id_seats = ResourcePropertyDefinition::findOneByName('seats')->id;
+            $sql = "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            INNER JOIN resource_properties rp ON rp.resource_id = resources.id
+            WHERE
+            rc.class_name IN ( :room_class_names )
+            AND
+            rp.property_id = :prop_id_seats
+            AND
+            rp.state > :seats
+            AND
+            resources.name LIKE CONCAT('%', :keyword, '%') ";
+            $sql_params = [
+                'keyword' => $keyword,
+                'seats'   => $this->with_seats,
+                'prop_id_seats' => $prop_id_seats
+            ];
+        } else {
+            $sql = "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE
+            rc.class_name IN ( :room_class_names )
+            AND
+            resources.name LIKE CONCAT('%', :keyword, '%') ";
+            $sql_params = [
+                'keyword' => $keyword
+            ];
+        }
+        $sql_params['room_class_names'] = RoomManager::getAllRoomClassNames();
+
+        //Root users can access everything so that we don't need
+        //to check for permissions in case the current user is root.
+        if (!$GLOBALS['perm']->have_perm('root')) {
+            $global_permission = null;
+            if ($this->use_global_permissions) {
+                //Get the global permission level:
+                $global_permission = ResourceManager::getGlobalResourcePermission(
+                    $user
+                );
+            }
+
+            if (in_array($global_permission, $this->accepted_permission_levels)) {
+                //Retrieve all resources where the user has sufficient permissions.
+                //There may be resources where the user has explicitly lower
+                //permissions and we must therefore exclude these resources.
+                $lower_permission_levels = ResourceManager::getLowerPermissionLevels(
+                    $global_permission
+                );
+                $sql .= "AND resources.id NOT IN (
+                    SELECT resource_id
+                    FROM
+                    resource_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :lower_perms )
+                    UNION
+                    SELECT resource_id
+                    FROM
+                    resource_temporary_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :lower_perms )
+                    AND
+                    begin <= :now
+                    AND
+                    end >= :now
+                    )";
+                $sql_params = array_merge(
+                    $sql_params,
+                    [
+                        'user_id' => $user->id,
+                        'lower_perms' => $lower_permission_levels,
+                        'now' => time()
+                    ]
+                );
+            } else {
+                //Only retrieve those resources where the user has direct
+                //sufficient permissions.
+                $sql .= "AND resources.id IN (
+                    SELECT resource_id
+                    FROM
+                    resource_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :perms )
+                    UNION
+                    SELECT resource_id
+                    FROM
+                    resource_temporary_permissions
+                    WHERE
+                    user_id = :user_id
+                    AND
+                    perms IN ( :perms )
+                    AND
+                    begin <= :now
+                    AND
+                    end >= :now
+                    )";
+                $sql_params = array_merge(
+                    $sql_params,
+                    [
+                    'user_id' => $user->id,
+                    'perms' => $this->accepted_permission_levels,
+                    'now' => time()
+                    ]
+                );
+            }
+        }
+
+        $sql .= " ORDER BY resources.name ASC
+                LIMIT :limit OFFSET :offset ";
+        $sql_params['limit'] = $limit;
+        $sql_params['offset'] = $offset;
+
+        $rooms = Room::findBySql(
+            $sql,
+            $sql_params
+        );
+
+        $results = [];
+        foreach ($rooms as $room) {
+            $additional_text = '';
+            if (count($this->additional_display_properties)) {
+                $additional_values = [];
+                foreach ($this->additional_display_properties as $ap) {
+                    $additional_values[] = $room->getProperty($ap);
+                }
+                $additional_text = implode(', ', $additional_values);
+            }
+            $name = $room->name;
+            if($additional_text) {
+                $name .=  sprintf(
+                    $this->additional_property_format,
+                    $additional_text
+                );
+            }
+            $results[] = [
+                $room->id,
+                $name
+            ];
+        }
+        return $results;
+    }
+}
diff --git a/lib/classes/searchtypes/SQLSearch.class.php b/lib/classes/searchtypes/SQLSearch.class.php
deleted file mode 100644
index 86aff6d..0000000
--- a/lib/classes/searchtypes/SQLSearch.class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * SQLSearch.class.php - Class of type SearchType used for searches with QuickSearch
- *
- * Long description for file (if any)...
- *
- * 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.
- *
- * @author      Rasmus <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
- * database. You just need to give in a query like for a PDB-prepare statement
- * and at least the variable ":input" in the query (the :input will be replaced
- * with the input of the QuickSearch userinput.
- *  [code]
- *  $search = new SQLSearch("SELECT username, Nachname "
- *      "FROM auth_user_md5 " .
- *      "WHERE Nachname LIKE :input ", _("Nachname suchen"), "username");
- *  [/code]
- *
- * @author Rasmus Fuhse
- *
- */
-
-class SQLSearch extends SearchType
-{
-
-    protected $sql;
-    protected $avatarLike;
-    protected $title;
-
-    /**
-     *
-     * @param string $query SQL with at least ":input" as parameter
-     * @param string $title
-     * @param string $avatarLike
-     * in this search. array("input_name" => "placeholder_in_sql_query")
-     *
-     * @return void
-     */
-    public function __construct($query, $title = "", $avatarLike = "")
-    {
-        $this->sql = $query;
-        $this->title = $title;
-        $this->avatarLike = $avatarLike;
-    }
-
-    /**
-     * returns an object of type SQLSearch with parameters to constructor
-     *
-     * @param string $query SQL with at least ":input" as parameter
-     * @param string $title
-     * @param string $avatarLike
-     * in this search. array("input_name" => "placeholder_in_sql_query")
-     *
-     * @return SQLSearch
-     */
-    static public function get()
-    {
-        $class = get_called_class();
-        $ref = new ReflectionClass($class);
-        return $ref->newInstanceArgs(func_get_args());
-    }
-
-    /**
-     * returns the title/description of the searchfield
-     *
-     * @return string title/description
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * returns an adress of the avatar of the searched item (if avatar enabled)
-     *
-     * @param string $id id of the item which can be username, user_id, Seminar_id or Institut_id
-     *
-     * @return string adress of an image
-     */
-    public function getAvatar($id)
-    {
-        switch ($this->avatarLike) {
-            case "username":
-                return Avatar::getAvatar(get_userid($id), $id)->getURL(Avatar::MEDIUM);
-            case "user_id":
-                return Avatar::getAvatar($id)->getURL(Avatar::MEDIUM);
-            case "Seminar_id":
-            case "Arbeitsgruppe_id":
-                return CourseAvatar::getAvatar($id)->getURL(Avatar::SMALL);
-            case "Institut_id":
-                return InstituteAvatar::getAvatar($id)->getURL(Avatar::SMALL);
-            default:
-                return '';
-        }
-    }
-
-    /**
-     * returns an html tag of the image of the searched item (if avatar enabled)
-     *
-     * @param string $id id of the item which can be username, user_id, Seminar_id or Institut_id
-     * @param string $size enum(NORMAL, SMALL, MEDIUM): size of the avatar
-     * @param array $options
-     *
-     * @return string like "<img src="...avatar.jpg" ... >"
-     */
-    public function getAvatarImageTag($id, $size = Avatar::SMALL, $options = [])
-    {
-        switch ($this->avatarLike) {
-            case "username":
-                return Avatar::getAvatar(get_userid($id), $id)->getImageTag($size, $options);
-            case "user_id":
-                return Avatar::getAvatar($id)->getImageTag($size, $options);
-            case "Seminar_id":
-            case "Arbeitsgruppe_id":
-                return CourseAvatar::getAvatar($id)->getImageTag($size, $options);
-            case "Institut_id":
-                return InstituteAvatar::getAvatar($id)->getImageTag($size, $options);
-            default:
-                return '';
-        }
-    }
-
-    /**
-     * returns the results of a search
-     * Use the contextual_data variable to send more variables than just the input
-     * to the SQL. QuickSearch for example sends all other variables of the same
-     * <form>-tag here.
-     *
-     * @param string $input the search-word(s)
-     * @param array $contextual_data an associative array with more variables
-     * @param int $limit maximum number of results (default: all)
-     * @param int $offset return results starting from this row (default: 0)
-     *
-     * @return array  array(array(), ...)
-     */
-    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
-    {
-        $db = DBManager::get();
-        $sql = $this->sql;
-        if ($offset || $limit != PHP_INT_MAX) {
-            $sql .= sprintf(' LIMIT %d, %d', $offset, $limit);
-        }
-        $statement = $db->prepare($sql, [PDO::FETCH_NUM]);
-        $data = [];
-        if (is_array($contextual_data)) {
-            foreach ($contextual_data as $name => $value) {
-                if ($name !== "input" && mb_strpos($sql, ":".$name) !== false) {
-                    $data[":".$name] = $value;
-                }
-            }
-        }
-        $data[":input"] = "%".$input."%";
-        $statement->execute($data);
-        $results = $statement->fetchAll();
-        return $results;
-    }
-
-    /**
-     * A very simple overwrite of the same method from SearchType class.
-     * returns the absolute path to this class for autoincluding this class.
-     *
-     * @return string path to this class
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/SQLSearch.php b/lib/classes/searchtypes/SQLSearch.php
new file mode 100644
index 0000000..86aff6d
--- /dev/null
+++ b/lib/classes/searchtypes/SQLSearch.php
@@ -0,0 +1,179 @@
+<?php
+# Lifter010: TODO
+/**
+ * SQLSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ *
+ * Long description for file (if any)...
+ *
+ * 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.
+ *
+ * @author      Rasmus <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * Class of type SearchType used for searches with QuickSearch
+ * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
+ * database. You just need to give in a query like for a PDB-prepare statement
+ * and at least the variable ":input" in the query (the :input will be replaced
+ * with the input of the QuickSearch userinput.
+ *  [code]
+ *  $search = new SQLSearch("SELECT username, Nachname "
+ *      "FROM auth_user_md5 " .
+ *      "WHERE Nachname LIKE :input ", _("Nachname suchen"), "username");
+ *  [/code]
+ *
+ * @author Rasmus Fuhse
+ *
+ */
+
+class SQLSearch extends SearchType
+{
+
+    protected $sql;
+    protected $avatarLike;
+    protected $title;
+
+    /**
+     *
+     * @param string $query SQL with at least ":input" as parameter
+     * @param string $title
+     * @param string $avatarLike
+     * in this search. array("input_name" => "placeholder_in_sql_query")
+     *
+     * @return void
+     */
+    public function __construct($query, $title = "", $avatarLike = "")
+    {
+        $this->sql = $query;
+        $this->title = $title;
+        $this->avatarLike = $avatarLike;
+    }
+
+    /**
+     * returns an object of type SQLSearch with parameters to constructor
+     *
+     * @param string $query SQL with at least ":input" as parameter
+     * @param string $title
+     * @param string $avatarLike
+     * in this search. array("input_name" => "placeholder_in_sql_query")
+     *
+     * @return SQLSearch
+     */
+    static public function get()
+    {
+        $class = get_called_class();
+        $ref = new ReflectionClass($class);
+        return $ref->newInstanceArgs(func_get_args());
+    }
+
+    /**
+     * returns the title/description of the searchfield
+     *
+     * @return string title/description
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * returns an adress of the avatar of the searched item (if avatar enabled)
+     *
+     * @param string $id id of the item which can be username, user_id, Seminar_id or Institut_id
+     *
+     * @return string adress of an image
+     */
+    public function getAvatar($id)
+    {
+        switch ($this->avatarLike) {
+            case "username":
+                return Avatar::getAvatar(get_userid($id), $id)->getURL(Avatar::MEDIUM);
+            case "user_id":
+                return Avatar::getAvatar($id)->getURL(Avatar::MEDIUM);
+            case "Seminar_id":
+            case "Arbeitsgruppe_id":
+                return CourseAvatar::getAvatar($id)->getURL(Avatar::SMALL);
+            case "Institut_id":
+                return InstituteAvatar::getAvatar($id)->getURL(Avatar::SMALL);
+            default:
+                return '';
+        }
+    }
+
+    /**
+     * returns an html tag of the image of the searched item (if avatar enabled)
+     *
+     * @param string $id id of the item which can be username, user_id, Seminar_id or Institut_id
+     * @param string $size enum(NORMAL, SMALL, MEDIUM): size of the avatar
+     * @param array $options
+     *
+     * @return string like "<img src="...avatar.jpg" ... >"
+     */
+    public function getAvatarImageTag($id, $size = Avatar::SMALL, $options = [])
+    {
+        switch ($this->avatarLike) {
+            case "username":
+                return Avatar::getAvatar(get_userid($id), $id)->getImageTag($size, $options);
+            case "user_id":
+                return Avatar::getAvatar($id)->getImageTag($size, $options);
+            case "Seminar_id":
+            case "Arbeitsgruppe_id":
+                return CourseAvatar::getAvatar($id)->getImageTag($size, $options);
+            case "Institut_id":
+                return InstituteAvatar::getAvatar($id)->getImageTag($size, $options);
+            default:
+                return '';
+        }
+    }
+
+    /**
+     * returns the results of a search
+     * Use the contextual_data variable to send more variables than just the input
+     * to the SQL. QuickSearch for example sends all other variables of the same
+     * <form>-tag here.
+     *
+     * @param string $input the search-word(s)
+     * @param array $contextual_data an associative array with more variables
+     * @param int $limit maximum number of results (default: all)
+     * @param int $offset return results starting from this row (default: 0)
+     *
+     * @return array  array(array(), ...)
+     */
+    public function getResults($input, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
+    {
+        $db = DBManager::get();
+        $sql = $this->sql;
+        if ($offset || $limit != PHP_INT_MAX) {
+            $sql .= sprintf(' LIMIT %d, %d', $offset, $limit);
+        }
+        $statement = $db->prepare($sql, [PDO::FETCH_NUM]);
+        $data = [];
+        if (is_array($contextual_data)) {
+            foreach ($contextual_data as $name => $value) {
+                if ($name !== "input" && mb_strpos($sql, ":".$name) !== false) {
+                    $data[":".$name] = $value;
+                }
+            }
+        }
+        $data[":input"] = "%".$input."%";
+        $statement->execute($data);
+        $results = $statement->fetchAll();
+        return $results;
+    }
+
+    /**
+     * A very simple overwrite of the same method from SearchType class.
+     * returns the absolute path to this class for autoincluding this class.
+     *
+     * @return string path to this class
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/searchtypes/SearchType.class.php b/lib/classes/searchtypes/SearchType.class.php
deleted file mode 100644
index d46d57e..0000000
--- a/lib/classes/searchtypes/SearchType.class.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * SQLSearch.class.php - A class-structure for alle search-objects in Stud.IP.
- *
- * 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.
- *
- * @author      Rasmus <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * A class-structure for alle search-objects in Stud.IP.
- * It is (mainly?) used in QuickSearch to display searchresults and the
- * layout of them.
- *
- * @author Rasmus Fuhse
- *
- */
-abstract class SearchType
-{
-    public $extendedLayout = false;
-
-
-    /**
-     * title of the search like "search for courses" or just "courses"
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return "";
-    }
-
-    /**
-     * Returns an URL to a picture of that type. Return "" for nothing found.
-     * For example: "return CourseAvatar::getAvatar($id)->getURL(Avatar::SMALL)".
-     *
-     * @param string $id
-     *
-     * @return: string URL to a picture
-     */
-    public function getAvatar($id)
-    {
-        return "";
-    }
-
-    /**
-     * Returns an HTML-Tag of a picture of that type. Return "" for nothing found.
-     * For example: "return CourseAvatar::getAvatar($id)->getImageTag(Avatar::SMALL)".
-     *
-     * @param string $id
-     *
-     * @return string HTML of a picture
-     */
-    public function getAvatarImageTag($id)
-    {
-        return "";
-    }
-
-    /**
-     * Returns the results to a given keyword. To get the results is the
-     * job of this routine and it does not even need to come from a database.
-     * The results should be an array in the form
-     * array (
-     *   array($key, $name),
-     *   array($key, $name),
-     *   ...
-     * )
-     * where $key is an identifier like user_id and $name is a displayed text
-     * that should appear to represent that ID.
-     *
-     * @param string $keyword
-     * @param string $contextual_data
-     * @param int $limit maximum number of results (default: all)
-     * @param int $offset return results starting from this row (default: 0)
-     *
-     * @return array
-     */
-    public function getResults($keyword, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
-    {
-        return [["", _("Die Suchklasse, die Sie verwenden, enthält keine Methode getResults.")]];
-    }
-
-    public function __toString()
-    {
-        $query_id = md5(serialize($this));
-        $_SESSION['QuickSearches'][$query_id]['object'] = serialize($this);
-        $_SESSION['QuickSearches'][$query_id]['includePath'] = $this->includePath();
-        $_SESSION['QuickSearches'][$query_id]['time'] = time();
-        return $query_id;
-    }
-
-    /**
-     * Returns the path to this file, so that this class can be autoloaded and is
-     * always available when necessary.
-     * Should be: "return __file__;"
-     *
-     * @return string path to this file
-     */
-    abstract public function includePath();
-}
-
diff --git a/lib/classes/searchtypes/SearchType.php b/lib/classes/searchtypes/SearchType.php
new file mode 100644
index 0000000..d46d57e
--- /dev/null
+++ b/lib/classes/searchtypes/SearchType.php
@@ -0,0 +1,107 @@
+<?php
+# Lifter010: TODO
+/**
+ * SQLSearch.class.php - A class-structure for alle search-objects in Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Rasmus <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * A class-structure for alle search-objects in Stud.IP.
+ * It is (mainly?) used in QuickSearch to display searchresults and the
+ * layout of them.
+ *
+ * @author Rasmus Fuhse
+ *
+ */
+abstract class SearchType
+{
+    public $extendedLayout = false;
+
+
+    /**
+     * title of the search like "search for courses" or just "courses"
+     *
+     * @return string
+     */
+    public function getTitle()
+    {
+        return "";
+    }
+
+    /**
+     * Returns an URL to a picture of that type. Return "" for nothing found.
+     * For example: "return CourseAvatar::getAvatar($id)->getURL(Avatar::SMALL)".
+     *
+     * @param string $id
+     *
+     * @return: string URL to a picture
+     */
+    public function getAvatar($id)
+    {
+        return "";
+    }
+
+    /**
+     * Returns an HTML-Tag of a picture of that type. Return "" for nothing found.
+     * For example: "return CourseAvatar::getAvatar($id)->getImageTag(Avatar::SMALL)".
+     *
+     * @param string $id
+     *
+     * @return string HTML of a picture
+     */
+    public function getAvatarImageTag($id)
+    {
+        return "";
+    }
+
+    /**
+     * Returns the results to a given keyword. To get the results is the
+     * job of this routine and it does not even need to come from a database.
+     * The results should be an array in the form
+     * array (
+     *   array($key, $name),
+     *   array($key, $name),
+     *   ...
+     * )
+     * where $key is an identifier like user_id and $name is a displayed text
+     * that should appear to represent that ID.
+     *
+     * @param string $keyword
+     * @param string $contextual_data
+     * @param int $limit maximum number of results (default: all)
+     * @param int $offset return results starting from this row (default: 0)
+     *
+     * @return array
+     */
+    public function getResults($keyword, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0)
+    {
+        return [["", _("Die Suchklasse, die Sie verwenden, enthält keine Methode getResults.")]];
+    }
+
+    public function __toString()
+    {
+        $query_id = md5(serialize($this));
+        $_SESSION['QuickSearches'][$query_id]['object'] = serialize($this);
+        $_SESSION['QuickSearches'][$query_id]['includePath'] = $this->includePath();
+        $_SESSION['QuickSearches'][$query_id]['time'] = time();
+        return $query_id;
+    }
+
+    /**
+     * Returns the path to this file, so that this class can be autoloaded and is
+     * always available when necessary.
+     * Should be: "return __file__;"
+     *
+     * @return string path to this file
+     */
+    abstract public function includePath();
+}
+
diff --git a/lib/classes/searchtypes/SeminarSearch.class.php b/lib/classes/searchtypes/SeminarSearch.class.php
deleted file mode 100644
index e490228..0000000
--- a/lib/classes/searchtypes/SeminarSearch.class.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * SeminarSearch.class.php
- * class to adapt StudipSemSearch to Quicksearch
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
-*/
-
-class SeminarSearch extends SearchType
-{
-
-    /**
-     * title of the search like "search for courses" or just "courses"
-     * @return string
-     */
-    public function getTitle() {
-        return _("Veranstaltungen suchen");
-    }
-
-    /**
-     * Returns the results to a given keyword. To get the results is the
-     * job of this routine and it does not even need to come from a database.
-     * The results should be an array in the form
-     * array (
-     *   array($key, $name),
-     *   array($key, $name),
-     *   ...
-     * )
-     * where $key is an identifier like user_id and $name is a displayed text
-     * that should appear to represent that ID.
-     * @param keyword: string
-     * @param array $contextual_data an associative array with more variables
-     * @param int $limit maximum number of results (default: all)
-     * @param int $offset return results starting from this row (default: 0)
-     * @return array
-     */
-     public function getResults($keyword, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0) {
-         $search_helper = new StudipSemSearchHelper();
-         $search_helper->setParams(
-             [
-                 'quick_search' => $keyword,
-                 'qs_choose' => $contextual_data['search_sem_qs_choose'] ?? 'all',
-                 'sem' => $contextual_data['search_sem_sem'] ?? 'all',
-                 'category' => $contextual_data['search_sem_category'] ?? null,
-                 'scope_choose' => $contextual_data['search_sem_scope_choose'] ?? null,
-                 'range_choose' => $contextual_data['search_sem_range_choose'] ?? null,
-             ],
-             !(is_object($GLOBALS['perm'])
-                 && $GLOBALS['perm']->have_perm(
-                     Config::Get()->SEM_VISIBILITY_PERM)));
-         $search_helper->doSearch();
-         $result = $search_helper->getSearchResultAsArray();
-
-         if (empty($result)) {
-             return [];
-         }
-
-         $query = "SELECT s.Seminar_id, CONCAT_WS(' ', s.VeranstaltungsNummer, s.name, CONCAT(' (',
-            IF(semester_courses.semester_id IS NULL,  '" . _('unbegrenzt') . "',
-                IF(COUNT(DISTINCT semester_courses.semester_id) > 1, CONCAT_WS(' - ', (SELECT start_semester.name FROM `semester_data` AS start_semester WHERE start_semester.semester_id = semester_courses.semester_id ORDER BY `beginn` ASC LIMIT 1), (SELECT end_semester.name FROM `semester_data` AS end_semester WHERE end_semester.semester_id = semester_courses.semester_id ORDER BY `beginn` DESC LIMIT 1)), sem1.name)), ')')) AS Name
-                   FROM seminare AS s
-                   LEFT JOIN semester_courses ON (semester_courses.course_id = s.Seminar_id)
-                   LEFT JOIN `semester_data` sem1 ON (semester_courses.semester_id = sem1.semester_id)
-                   LEFT JOIN seminar_user AS su ON (su.Seminar_id = s.Seminar_id AND su.status='dozent')
-                   LEFT JOIN auth_user_md5 USING (user_id)
-                   WHERE s.Seminar_id IN (?)
-                   GROUP BY s.Seminar_id";
-         if (Config::get()->IMPORTANT_SEMNUMBER) {
-             $query .= " ORDER BY IFNULL(MAX(sem1.beginn), s.start_time) DESC, s.VeranstaltungsNummer, s.Name";
-         } else {
-             $query .= " ORDER BY IFNULL(MAX(sem1.beginn), s.start_time) DESC, s.Name";
-         }
-         $statement = DBManager::get()->prepare($query);
-         $statement->execute([
-            array_slice($result, $offset, $limit) ?: ''
-         ]);
-         return $statement->fetchAll(PDO::FETCH_NUM);
-     }
-
-
-    /**
-     * Returns the path to this file, so that this class can be autoloaded and is
-     * always available when necessary.
-     * Should be: "return __file__;"
-     *
-     * @return string   path to this file
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/SeminarSearch.php b/lib/classes/searchtypes/SeminarSearch.php
new file mode 100644
index 0000000..e490228
--- /dev/null
+++ b/lib/classes/searchtypes/SeminarSearch.php
@@ -0,0 +1,101 @@
+<?php
+# Lifter010: TODO
+/**
+ * SeminarSearch.class.php
+ * class to adapt StudipSemSearch to Quicksearch
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+*/
+
+class SeminarSearch extends SearchType
+{
+
+    /**
+     * title of the search like "search for courses" or just "courses"
+     * @return string
+     */
+    public function getTitle() {
+        return _("Veranstaltungen suchen");
+    }
+
+    /**
+     * Returns the results to a given keyword. To get the results is the
+     * job of this routine and it does not even need to come from a database.
+     * The results should be an array in the form
+     * array (
+     *   array($key, $name),
+     *   array($key, $name),
+     *   ...
+     * )
+     * where $key is an identifier like user_id and $name is a displayed text
+     * that should appear to represent that ID.
+     * @param keyword: string
+     * @param array $contextual_data an associative array with more variables
+     * @param int $limit maximum number of results (default: all)
+     * @param int $offset return results starting from this row (default: 0)
+     * @return array
+     */
+     public function getResults($keyword, $contextual_data = [], $limit = PHP_INT_MAX, $offset = 0) {
+         $search_helper = new StudipSemSearchHelper();
+         $search_helper->setParams(
+             [
+                 'quick_search' => $keyword,
+                 'qs_choose' => $contextual_data['search_sem_qs_choose'] ?? 'all',
+                 'sem' => $contextual_data['search_sem_sem'] ?? 'all',
+                 'category' => $contextual_data['search_sem_category'] ?? null,
+                 'scope_choose' => $contextual_data['search_sem_scope_choose'] ?? null,
+                 'range_choose' => $contextual_data['search_sem_range_choose'] ?? null,
+             ],
+             !(is_object($GLOBALS['perm'])
+                 && $GLOBALS['perm']->have_perm(
+                     Config::Get()->SEM_VISIBILITY_PERM)));
+         $search_helper->doSearch();
+         $result = $search_helper->getSearchResultAsArray();
+
+         if (empty($result)) {
+             return [];
+         }
+
+         $query = "SELECT s.Seminar_id, CONCAT_WS(' ', s.VeranstaltungsNummer, s.name, CONCAT(' (',
+            IF(semester_courses.semester_id IS NULL,  '" . _('unbegrenzt') . "',
+                IF(COUNT(DISTINCT semester_courses.semester_id) > 1, CONCAT_WS(' - ', (SELECT start_semester.name FROM `semester_data` AS start_semester WHERE start_semester.semester_id = semester_courses.semester_id ORDER BY `beginn` ASC LIMIT 1), (SELECT end_semester.name FROM `semester_data` AS end_semester WHERE end_semester.semester_id = semester_courses.semester_id ORDER BY `beginn` DESC LIMIT 1)), sem1.name)), ')')) AS Name
+                   FROM seminare AS s
+                   LEFT JOIN semester_courses ON (semester_courses.course_id = s.Seminar_id)
+                   LEFT JOIN `semester_data` sem1 ON (semester_courses.semester_id = sem1.semester_id)
+                   LEFT JOIN seminar_user AS su ON (su.Seminar_id = s.Seminar_id AND su.status='dozent')
+                   LEFT JOIN auth_user_md5 USING (user_id)
+                   WHERE s.Seminar_id IN (?)
+                   GROUP BY s.Seminar_id";
+         if (Config::get()->IMPORTANT_SEMNUMBER) {
+             $query .= " ORDER BY IFNULL(MAX(sem1.beginn), s.start_time) DESC, s.VeranstaltungsNummer, s.Name";
+         } else {
+             $query .= " ORDER BY IFNULL(MAX(sem1.beginn), s.start_time) DESC, s.Name";
+         }
+         $statement = DBManager::get()->prepare($query);
+         $statement->execute([
+            array_slice($result, $offset, $limit) ?: ''
+         ]);
+         return $statement->fetchAll(PDO::FETCH_NUM);
+     }
+
+
+    /**
+     * Returns the path to this file, so that this class can be autoloaded and is
+     * always available when necessary.
+     * Should be: "return __file__;"
+     *
+     * @return string   path to this file
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/searchtypes/StandardSearch.class.php b/lib/classes/searchtypes/StandardSearch.class.php
deleted file mode 100644
index 837a849..0000000
--- a/lib/classes/searchtypes/StandardSearch.class.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-# Lifter010: TODO
-/**
- * StandardSearch.class.php - Class of type SearchType used for searches with QuickSearch
- *
- * 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.
- *
- * @author      Rasmus <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
- * database. You just need to give in a query like for a PDB-prepare statement
- * and at least the variable ":input" in the query (the :input will be replaced
- * with the input of the QuickSearch userinput.
- *  [code]
- *  $search = new SQLSearch("username");
- *  [/code]
- *
- * @author Rasmus Fuhse
- *
- */
-
-class StandardSearch extends SQLSearch
-{
-
-    public $search;
-    public $search_settings;
-
-    /**
-     *
-     * @param string $search The search type.
-     *
-     * @param Array $search_settings Settings for the selected seach type.
-     *     Depending on the search type different settings are possible
-     *     which can change the output or the display of the output
-     *     of the search. The array must be an associative array
-     *     with the setting as array key.
-     *     The following settings are implemented:
-     *     Search type 'room':
-     *     - display_seats: If set to true, the seats will be displayed
-     *       after the name of the room.
-     *
-     * @return void
-     */
-    public function __construct($search, $search_settings = [])
-    {
-        if (is_array($search_settings)) {
-            $this->search_settings = $search_settings;
-        }
-
-        $this->avatarLike = $this->search = $search;
-        $this->sql = $this->getSQL();
-    }
-
-
-    /**
-     * returns the title/description of the searchfield
-     *
-     * @return string title/description
-     */
-    public function getTitle()
-    {
-        switch ($this->search) {
-            case "username":
-            case "user_id":
-                return _("Person suchen");
-            case "Seminar_id":
-            case "AnySeminar_id":
-                return _("Veranstaltung suchen");
-            case "Arbeitsgruppe_id":
-                return _("Arbeitsgruppe suchen");
-            case "Institut_id":
-                return _("Einrichtung suchen");
-            default:
-                throw new UnexpectedValueException("Invalid search type {$this->search}");
-        }
-    }
-
-    /**
-     * returns a sql-string appropriate for the searchtype of the current class
-     *
-     * @return string
-     */
-    private function getSQL()
-    {
-        $semester = " CONCAT('(',IFNULL(GROUP_CONCAT(DISTINCT sem1.name ORDER BY sem1.beginn SEPARATOR '-'),'" . _('unbegrenzt') . "'),')')";
-        switch ($this->search) {
-            case "username":
-                $this->extendedLayout = true;
-                $sql = "SELECT DISTINCT auth_user_md5.username";
-                if (empty($this->search_settings['simple_name'])) {
-                    $sql .= ", CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname, ' (', auth_user_md5.username, ')'), auth_user_md5.perms ";
-                } else {
-                    $sql .= ", CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) ";
-                }
-                $sql .= "FROM auth_user_md5 LEFT JOIN user_info ON (user_info.user_id = auth_user_md5.user_id) " .
-                        "LEFT JOIN user_visibility ON (user_visibility.user_id = auth_user_md5.user_id) " .
-                        "WHERE (CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
-                            "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
-                            "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
-                            "OR auth_user_md5.username LIKE :input) AND " . get_vis_query('auth_user_md5', 'search') .
-                        " ORDER BY Nachname ASC, Vorname ASC";
-                return $sql;
-            case "user_id":
-                $this->extendedLayout = true;
-                $sql = "SELECT DISTINCT auth_user_md5.user_id";
-                if (empty($this->search_settings['simple_name'])) {
-                    $sql .= ", CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname, ' (', auth_user_md5.username, ')'), auth_user_md5.perms ";
-                } else {
-                    $sql .= ", CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) ";
-                }
-                $sql .= "FROM auth_user_md5 LEFT JOIN user_info ON (user_info.user_id = auth_user_md5.user_id) " .
-                    "LEFT JOIN user_visibility ON (user_visibility.user_id = auth_user_md5.user_id) " .
-                    "WHERE (CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
-                            "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
-                            "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
-                            "OR auth_user_md5.username LIKE :input) AND " . get_vis_query('auth_user_md5', 'search') .
-                        " ORDER BY Nachname ASC, Vorname ASC";
-                return $sql;
-            case "Seminar_id":
-                return "SELECT seminare.Seminar_id, CONCAT_WS(' ', seminare.VeranstaltungsNummer, seminare.Name,  ".$semester.") " .
-                    "FROM seminare " .
-                    "LEFT JOIN semester_courses ON (semester_courses.course_id = seminare.Seminar_id) " .
-                    "LEFT JOIN `semester_data` sem1 ON (semester_courses.semester_id = sem1.semester_id) " .
-                    "LEFT JOIN seminar_user ON (seminar_user.Seminar_id = seminare.Seminar_id AND seminar_user.status = 'dozent') " .
-                    "LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = seminar_user.user_id) " .
-                    "WHERE (seminare.Name LIKE :input " .
-                    "OR CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE :input " .
-                    "OR seminare.VeranstaltungsNummer LIKE :input " .
-                    "OR seminare.Untertitel LIKE :input " .
-                    "OR seminare.Beschreibung LIKE :input " .
-                    "OR seminare.Ort LIKE :input " .
-                    "OR seminare.Sonstiges LIKE :input) " .
-                    "AND seminare.visible = 1 " .
-                    "AND seminare.status NOT IN ('".implode("', '", studygroup_sem_types())."') " .
-                    " GROUP BY seminare.seminar_id ORDER BY sem1.`beginn` DESC, " .
-                    (Config::get()->IMPORTANT_SEMNUMBER ? "seminare.`VeranstaltungsNummer`, " : "") .
-                    "seminare.`Name`";
-            case "AnySeminar_id":
-                  return "SELECT seminare.Seminar_id, CONCAT_WS(' ', seminare.VeranstaltungsNummer, seminare.Name,  ".$semester.") " .
-                    "FROM seminare " .
-                    "LEFT JOIN semester_courses ON (semester_courses.course_id = seminare.Seminar_id) " .
-                    "LEFT JOIN `semester_data` sem1 ON (semester_courses.semester_id = sem1.semester_id) " .
-                    "LEFT JOIN seminar_user ON (seminar_user.Seminar_id = seminare.Seminar_id AND seminar_user.status = 'dozent') " .
-                    "LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = seminar_user.user_id) " .
-                    "WHERE (seminare.Name LIKE :input " .
-                    "OR CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
-                    "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
-                    "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
-                    "OR seminare.VeranstaltungsNummer LIKE :input " .
-                    "OR seminare.Untertitel LIKE :input " .
-                    "OR seminare.Beschreibung LIKE :input " .
-                    "OR seminare.Ort LIKE :input " .
-                    "OR seminare.Sonstiges LIKE :input) " .
-                    " GROUP BY seminare.seminar_id ORDER BY sem1.`beginn` DESC, " .
-                    (Config::get()->IMPORTANT_SEMNUMBER ? "seminare.`VeranstaltungsNummer`, " : "") .
-                    "seminare.`Name`";
-            case "Arbeitsgruppe_id":
-                return "SELECT DISTINCT seminare.Seminar_id, seminare.Name " .
-                        "FROM seminare " .
-                            "LEFT JOIN seminar_user ON (seminar_user.Seminar_id = seminare.Seminar_id AND seminar_user.status = 'dozent') " .
-                            "LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = seminar_user.user_id) " .
-                        "WHERE (seminare.Name LIKE :input " .
-                            "OR CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
-                            "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
-                            "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
-                            "OR seminare.VeranstaltungsNummer LIKE :input " .
-                            "OR seminare.Untertitel LIKE :input " .
-                            "OR seminare.Beschreibung LIKE :input " .
-                            "OR seminare.Ort LIKE :input " .
-                            "OR seminare.Sonstiges LIKE :input) " .
-                            "AND seminare.visible = 1 " .
-                            "AND seminare.status IN ('".implode("', '", studygroup_sem_types())."') " .
-                        "ORDER BY seminare.Name";
-            case "Institut_id":
-                return "SELECT DISTINCT Institute.Institut_id, Institute.Name " .
-                        "FROM Institute " .
-                            "LEFT JOIN range_tree ON (range_tree.item_id = Institute.Institut_id) " .
-                        "WHERE Institute.Name LIKE :input " .
-                            "OR Institute.Strasse LIKE :input " .
-                            "OR Institute.email LIKE :input " .
-                            "OR range_tree.name LIKE :input " .
-                        "ORDER BY Institute.Name";
-            default:
-                throw new UnexpectedValueException("Invalid search type {$this->search}");
-        }
-    }
-
-    /**
-     * A very simple overwrite of the same method from SearchType class.
-     * returns the absolute path to this class for autoincluding this class.
-     *
-     * @return: path to this class
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/StandardSearch.php b/lib/classes/searchtypes/StandardSearch.php
new file mode 100644
index 0000000..837a849
--- /dev/null
+++ b/lib/classes/searchtypes/StandardSearch.php
@@ -0,0 +1,206 @@
+<?php
+# Lifter010: TODO
+/**
+ * StandardSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ *
+ * 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.
+ *
+ * @author      Rasmus <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * Class of type SearchType used for searches with QuickSearch
+ * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
+ * database. You just need to give in a query like for a PDB-prepare statement
+ * and at least the variable ":input" in the query (the :input will be replaced
+ * with the input of the QuickSearch userinput.
+ *  [code]
+ *  $search = new SQLSearch("username");
+ *  [/code]
+ *
+ * @author Rasmus Fuhse
+ *
+ */
+
+class StandardSearch extends SQLSearch
+{
+
+    public $search;
+    public $search_settings;
+
+    /**
+     *
+     * @param string $search The search type.
+     *
+     * @param Array $search_settings Settings for the selected seach type.
+     *     Depending on the search type different settings are possible
+     *     which can change the output or the display of the output
+     *     of the search. The array must be an associative array
+     *     with the setting as array key.
+     *     The following settings are implemented:
+     *     Search type 'room':
+     *     - display_seats: If set to true, the seats will be displayed
+     *       after the name of the room.
+     *
+     * @return void
+     */
+    public function __construct($search, $search_settings = [])
+    {
+        if (is_array($search_settings)) {
+            $this->search_settings = $search_settings;
+        }
+
+        $this->avatarLike = $this->search = $search;
+        $this->sql = $this->getSQL();
+    }
+
+
+    /**
+     * returns the title/description of the searchfield
+     *
+     * @return string title/description
+     */
+    public function getTitle()
+    {
+        switch ($this->search) {
+            case "username":
+            case "user_id":
+                return _("Person suchen");
+            case "Seminar_id":
+            case "AnySeminar_id":
+                return _("Veranstaltung suchen");
+            case "Arbeitsgruppe_id":
+                return _("Arbeitsgruppe suchen");
+            case "Institut_id":
+                return _("Einrichtung suchen");
+            default:
+                throw new UnexpectedValueException("Invalid search type {$this->search}");
+        }
+    }
+
+    /**
+     * returns a sql-string appropriate for the searchtype of the current class
+     *
+     * @return string
+     */
+    private function getSQL()
+    {
+        $semester = " CONCAT('(',IFNULL(GROUP_CONCAT(DISTINCT sem1.name ORDER BY sem1.beginn SEPARATOR '-'),'" . _('unbegrenzt') . "'),')')";
+        switch ($this->search) {
+            case "username":
+                $this->extendedLayout = true;
+                $sql = "SELECT DISTINCT auth_user_md5.username";
+                if (empty($this->search_settings['simple_name'])) {
+                    $sql .= ", CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname, ' (', auth_user_md5.username, ')'), auth_user_md5.perms ";
+                } else {
+                    $sql .= ", CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) ";
+                }
+                $sql .= "FROM auth_user_md5 LEFT JOIN user_info ON (user_info.user_id = auth_user_md5.user_id) " .
+                        "LEFT JOIN user_visibility ON (user_visibility.user_id = auth_user_md5.user_id) " .
+                        "WHERE (CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
+                            "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
+                            "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
+                            "OR auth_user_md5.username LIKE :input) AND " . get_vis_query('auth_user_md5', 'search') .
+                        " ORDER BY Nachname ASC, Vorname ASC";
+                return $sql;
+            case "user_id":
+                $this->extendedLayout = true;
+                $sql = "SELECT DISTINCT auth_user_md5.user_id";
+                if (empty($this->search_settings['simple_name'])) {
+                    $sql .= ", CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname, ' (', auth_user_md5.username, ')'), auth_user_md5.perms ";
+                } else {
+                    $sql .= ", CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) ";
+                }
+                $sql .= "FROM auth_user_md5 LEFT JOIN user_info ON (user_info.user_id = auth_user_md5.user_id) " .
+                    "LEFT JOIN user_visibility ON (user_visibility.user_id = auth_user_md5.user_id) " .
+                    "WHERE (CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
+                            "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
+                            "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
+                            "OR auth_user_md5.username LIKE :input) AND " . get_vis_query('auth_user_md5', 'search') .
+                        " ORDER BY Nachname ASC, Vorname ASC";
+                return $sql;
+            case "Seminar_id":
+                return "SELECT seminare.Seminar_id, CONCAT_WS(' ', seminare.VeranstaltungsNummer, seminare.Name,  ".$semester.") " .
+                    "FROM seminare " .
+                    "LEFT JOIN semester_courses ON (semester_courses.course_id = seminare.Seminar_id) " .
+                    "LEFT JOIN `semester_data` sem1 ON (semester_courses.semester_id = sem1.semester_id) " .
+                    "LEFT JOIN seminar_user ON (seminar_user.Seminar_id = seminare.Seminar_id AND seminar_user.status = 'dozent') " .
+                    "LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = seminar_user.user_id) " .
+                    "WHERE (seminare.Name LIKE :input " .
+                    "OR CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE :input " .
+                    "OR seminare.VeranstaltungsNummer LIKE :input " .
+                    "OR seminare.Untertitel LIKE :input " .
+                    "OR seminare.Beschreibung LIKE :input " .
+                    "OR seminare.Ort LIKE :input " .
+                    "OR seminare.Sonstiges LIKE :input) " .
+                    "AND seminare.visible = 1 " .
+                    "AND seminare.status NOT IN ('".implode("', '", studygroup_sem_types())."') " .
+                    " GROUP BY seminare.seminar_id ORDER BY sem1.`beginn` DESC, " .
+                    (Config::get()->IMPORTANT_SEMNUMBER ? "seminare.`VeranstaltungsNummer`, " : "") .
+                    "seminare.`Name`";
+            case "AnySeminar_id":
+                  return "SELECT seminare.Seminar_id, CONCAT_WS(' ', seminare.VeranstaltungsNummer, seminare.Name,  ".$semester.") " .
+                    "FROM seminare " .
+                    "LEFT JOIN semester_courses ON (semester_courses.course_id = seminare.Seminar_id) " .
+                    "LEFT JOIN `semester_data` sem1 ON (semester_courses.semester_id = sem1.semester_id) " .
+                    "LEFT JOIN seminar_user ON (seminar_user.Seminar_id = seminare.Seminar_id AND seminar_user.status = 'dozent') " .
+                    "LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = seminar_user.user_id) " .
+                    "WHERE (seminare.Name LIKE :input " .
+                    "OR CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
+                    "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
+                    "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
+                    "OR seminare.VeranstaltungsNummer LIKE :input " .
+                    "OR seminare.Untertitel LIKE :input " .
+                    "OR seminare.Beschreibung LIKE :input " .
+                    "OR seminare.Ort LIKE :input " .
+                    "OR seminare.Sonstiges LIKE :input) " .
+                    " GROUP BY seminare.seminar_id ORDER BY sem1.`beginn` DESC, " .
+                    (Config::get()->IMPORTANT_SEMNUMBER ? "seminare.`VeranstaltungsNummer`, " : "") .
+                    "seminare.`Name`";
+            case "Arbeitsgruppe_id":
+                return "SELECT DISTINCT seminare.Seminar_id, seminare.Name " .
+                        "FROM seminare " .
+                            "LEFT JOIN seminar_user ON (seminar_user.Seminar_id = seminare.Seminar_id AND seminar_user.status = 'dozent') " .
+                            "LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = seminar_user.user_id) " .
+                        "WHERE (seminare.Name LIKE :input " .
+                            "OR CONCAT(auth_user_md5.Vorname, ' ', auth_user_md5.Nachname) LIKE REPLACE(:input, ' ', '% ') " .
+                            "OR CONCAT(auth_user_md5.Nachname, ' ', auth_user_md5.Vorname) LIKE REPLACE(:input, ' ', '% ') " .
+                            "OR CONCAT(auth_user_md5.Nachname, ', ', auth_user_md5.Vorname) LIKE :input " .
+                            "OR seminare.VeranstaltungsNummer LIKE :input " .
+                            "OR seminare.Untertitel LIKE :input " .
+                            "OR seminare.Beschreibung LIKE :input " .
+                            "OR seminare.Ort LIKE :input " .
+                            "OR seminare.Sonstiges LIKE :input) " .
+                            "AND seminare.visible = 1 " .
+                            "AND seminare.status IN ('".implode("', '", studygroup_sem_types())."') " .
+                        "ORDER BY seminare.Name";
+            case "Institut_id":
+                return "SELECT DISTINCT Institute.Institut_id, Institute.Name " .
+                        "FROM Institute " .
+                            "LEFT JOIN range_tree ON (range_tree.item_id = Institute.Institut_id) " .
+                        "WHERE Institute.Name LIKE :input " .
+                            "OR Institute.Strasse LIKE :input " .
+                            "OR Institute.email LIKE :input " .
+                            "OR range_tree.name LIKE :input " .
+                        "ORDER BY Institute.Name";
+            default:
+                throw new UnexpectedValueException("Invalid search type {$this->search}");
+        }
+    }
+
+    /**
+     * A very simple overwrite of the same method from SearchType class.
+     * returns the absolute path to this class for autoincluding this class.
+     *
+     * @return: path to this class
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/searchtypes/TreeSearch.class.php b/lib/classes/searchtypes/TreeSearch.class.php
deleted file mode 100644
index 2fecf60..0000000
--- a/lib/classes/searchtypes/TreeSearch.class.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * TreeSearch.class.php - Class of type SearchType used for searches with QuickSearch
- *
- * 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.
- *
- * @author      Thomas Hackl <hackl@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-class TreeSearch extends StandardSearch
-{
-    /**
-     *
-     * @param string $search The search type.
-     *
-     * @param Array $search_settings Settings for the selected seach type.
-     *     Depending on the search type different settings are possible
-     *     which can change the output or the display of the output
-     *     of the search. The array must be an associative array
-     *     with the setting as array key.
-     *     The following settings are implemented:
-     *     Search type 'room':
-     *     - display_seats: If set to true, the seats will be displayed
-     *       after the name of the room.
-     *
-     * @return void
-     */
-    public function __construct($search, $search_settings = [])
-    {
-        if (is_array($search_settings)) {
-            $this->search_settings = $search_settings;
-        }
-
-        $this->avatarLike = $this->search = $search;
-        $this->sql = $this->getSQL();
-    }
-
-    /**
-     * returns the title/description of the searchfield
-     *
-     * @return string title/description
-     */
-    public function getTitle()
-    {
-        switch ($this->search) {
-            case 'sem_tree_id':
-                return _('Studienbereich suchen');
-            case 'range_tree_id':
-                return _('Eintrag in der Einrichtungshierarchie suchen');
-            default:
-                throw new UnexpectedValueException('Invalid search type {$this->search}');
-        }
-    }
-
-    /**
-     * returns a sql-string appropriate for the searchtype of the current class
-     *
-     * @return string
-     */
-    private function getSQL()
-    {
-        switch ($this->search) {
-            case 'sem_tree_id':
-                return "SELECT `sem_tree_id`, `name`
-                        FROM `sem_tree`
-                        WHERE `name` LIKE :input
-                           OR `info` LIKE :input
-                       ORDER BY `name`";
-            case 'range_tree_id':
-                return "SELECT t.`item_id`, IF(t.`studip_object_id` IS NULL, t.`name`, i.`name`)
-                        FROM `range_tree` t
-                        LEFT JOIN `Institute` i ON (i.`Institut_id` = t.`studip_object_id`)
-                        WHERE t.`name` LIKE :input
-                           OR i.`Name` LIKE :input
-                        ORDER BY t.`name`, i.`Name`";
-            default:
-                throw new UnexpectedValueException("Invalid search type {$this->search}");
-        }
-    }
-
-    /**
-     * A very simple overwrite of the same method from SearchType class.
-     * returns the absolute path to this class for autoincluding this class.
-     *
-     * @return: path to this class
-     */
-    public function includePath()
-    {
-        return studip_relative_path(__FILE__);
-    }
-}
diff --git a/lib/classes/searchtypes/TreeSearch.php b/lib/classes/searchtypes/TreeSearch.php
new file mode 100644
index 0000000..2fecf60
--- /dev/null
+++ b/lib/classes/searchtypes/TreeSearch.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * TreeSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <hackl@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+class TreeSearch extends StandardSearch
+{
+    /**
+     *
+     * @param string $search The search type.
+     *
+     * @param Array $search_settings Settings for the selected seach type.
+     *     Depending on the search type different settings are possible
+     *     which can change the output or the display of the output
+     *     of the search. The array must be an associative array
+     *     with the setting as array key.
+     *     The following settings are implemented:
+     *     Search type 'room':
+     *     - display_seats: If set to true, the seats will be displayed
+     *       after the name of the room.
+     *
+     * @return void
+     */
+    public function __construct($search, $search_settings = [])
+    {
+        if (is_array($search_settings)) {
+            $this->search_settings = $search_settings;
+        }
+
+        $this->avatarLike = $this->search = $search;
+        $this->sql = $this->getSQL();
+    }
+
+    /**
+     * returns the title/description of the searchfield
+     *
+     * @return string title/description
+     */
+    public function getTitle()
+    {
+        switch ($this->search) {
+            case 'sem_tree_id':
+                return _('Studienbereich suchen');
+            case 'range_tree_id':
+                return _('Eintrag in der Einrichtungshierarchie suchen');
+            default:
+                throw new UnexpectedValueException('Invalid search type {$this->search}');
+        }
+    }
+
+    /**
+     * returns a sql-string appropriate for the searchtype of the current class
+     *
+     * @return string
+     */
+    private function getSQL()
+    {
+        switch ($this->search) {
+            case 'sem_tree_id':
+                return "SELECT `sem_tree_id`, `name`
+                        FROM `sem_tree`
+                        WHERE `name` LIKE :input
+                           OR `info` LIKE :input
+                       ORDER BY `name`";
+            case 'range_tree_id':
+                return "SELECT t.`item_id`, IF(t.`studip_object_id` IS NULL, t.`name`, i.`name`)
+                        FROM `range_tree` t
+                        LEFT JOIN `Institute` i ON (i.`Institut_id` = t.`studip_object_id`)
+                        WHERE t.`name` LIKE :input
+                           OR i.`Name` LIKE :input
+                        ORDER BY t.`name`, i.`Name`";
+            default:
+                throw new UnexpectedValueException("Invalid search type {$this->search}");
+        }
+    }
+
+    /**
+     * A very simple overwrite of the same method from SearchType class.
+     * returns the absolute path to this class for autoincluding this class.
+     *
+     * @return: path to this class
+     */
+    public function includePath()
+    {
+        return studip_relative_path(__FILE__);
+    }
+}
diff --git a/lib/classes/sidebar/ClipboardWidget.class.php b/lib/classes/sidebar/ClipboardWidget.class.php
deleted file mode 100644
index abc0d6c..0000000
--- a/lib/classes/sidebar/ClipboardWidget.class.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * This class is responsible for displaying new clipboards
- * (the ones that use the Clipboard SORM class) in the sidebar.
- *
- * @author  Moritz Strohm <strohm@data-quest.de>
- * @license GNU General Public License v2 or later.
- * @since   4.5
- */
-class ClipboardWidget extends SidebarWidget
-{
-    protected $draggable_items;
-
-    /**
-     * clipboard_widget_id is required in the case that multiple
-     * clipboard widgets exist on one page. The JavaScript code
-     * can then distinguish each clipboard widget by its unique ID.
-     */
-    protected $clipboard_widget_id;
-
-
-    /**
-     * This attribute holds the ID of the clipboard which is stored in the
-     * session as currently selected clipboard.
-     */
-    protected $current_clipboard_id;
-
-
-    /**
-     * This attribute contains a string that shall be the title of the button
-     * for applying the selected clipbard to the main area
-     * the widget is showing when in read only mode.
-     */
-    protected $apply_button_title;
-
-    /**
-     * This widget can be initialised with the class names of allowed classes
-     * to limit the displayed items in a clipboard to items of specific
-     * classes.
-     */
-    public function __construct($allowed_item_classes = [])
-    {
-        parent::__construct();
-
-        if ($allowed_item_classes) {
-            //Check if all allowed item classes are SimpleORMap objects
-            //and if the classes implement the StudipItem interface:
-            foreach ($allowed_item_classes as $class) {
-                if (!is_subclass_of($class, 'StudipItem')) {
-                    throw new InvalidArgumentException(
-                        sprintf(
-                            'The class %s does not implement the StudipItem interface which is required for clipboard items!',
-                            htmlReady($class)
-                        )
-                    );
-                }
-            }
-        } else {
-            //Allow all StudipItem implementations:
-            $allowed_item_classes = ['StudipItem'];
-        }
-
-        $this->allowed_item_classes = $allowed_item_classes;
-        $this->template = 'sidebar/clipboard-widget';
-        $this->title = _('Eigene Merkzettel');
-        $this->apply_button_title = _('Hauptbereich aktualisieren');
-
-        $this->clipboard_widget_id = md5(uniqid('clipboard_widget_id'));
-
-        $this->updateSessionVariables();
-        $this->current_clipboard_id = $_SESSION['selected_clipboard_id'] ?? '';
-
-        $this->setId("ClipboardWidget_{$this->clipboard_widget_id}");
-        $this->setAdditionalAttribute('data-widget_id', $this->clipboard_widget_id);
-        $this->addLayoutCSSClass('clipboard-widget');
-    }
-
-    /**
-     * Updates session variables if a special POST request is made.
-     */
-    public function updateSessionVariables()
-    {
-        if (Request::submitted('clipboard_update_session_special_action')) {
-            CSRFProtection::verifyUnsafeRequest();
-
-            $_SESSION['selected_clipboard_id'] = Request::get('selected_clipboard_id');
-        }
-    }
-
-    public function setApplyButtonTitle($title = '')
-    {
-        if ($title) {
-            $this->apply_button_title = $title;
-        }
-    }
-
-    public function getClipboardWidgetId()
-    {
-        return $this->clipboard_widget_id;
-    }
-
-    public function render($variables = [])
-    {
-        $clipboards = Clipboard::getClipboardsForUser(
-            $GLOBALS['user']->id
-        );
-
-        if (!$this->current_clipboard_id && $clipboards) {
-            $_SESSION['selected_clipboard_id'] = $clipboards[0]->id;
-            $this->current_clipboard_id = $clipboards[0]->id;
-        }
-
-        return parent::render($variables + [
-            'clipboards'               => $clipboards,
-            'allowed_item_classes'     => $this->allowed_item_classes,
-            'clipboard_widget_id'      => $this->clipboard_widget_id,
-            'draggable_items'          => $this->draggable_items,
-            'apply_button_title'       => $this->apply_button_title,
-            'elements'                 => $this->elements,
-            'selected_clipboard_id'    => $this->current_clipboard_id,
-        ]);
-    }
-
-    /**
-     * Adds a link to the widget
-     *
-     * @param String $label  Label/content of the link
-     * @param String $url    URL/Location of the link
-     * @param Icon   $icon   instance of class Icon for the link
-     * @param bool   $active Pass true if the link is currently active,
-     *                       defaults to false
-     */
-    public function &addLink($label, $url, $icon = null, $attributes = array(), $index = null)
-    {
-        if ($index === null) {
-            $index = 'link-' . md5($url);
-        }
-        $element = new LinkElement($label, $url, $icon, $attributes);
-        $this->addElement($element, $index);
-        return $element;
-    }
-}
diff --git a/lib/classes/sidebar/ClipboardWidget.php b/lib/classes/sidebar/ClipboardWidget.php
new file mode 100644
index 0000000..abc0d6c
--- /dev/null
+++ b/lib/classes/sidebar/ClipboardWidget.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * This class is responsible for displaying new clipboards
+ * (the ones that use the Clipboard SORM class) in the sidebar.
+ *
+ * @author  Moritz Strohm <strohm@data-quest.de>
+ * @license GNU General Public License v2 or later.
+ * @since   4.5
+ */
+class ClipboardWidget extends SidebarWidget
+{
+    protected $draggable_items;
+
+    /**
+     * clipboard_widget_id is required in the case that multiple
+     * clipboard widgets exist on one page. The JavaScript code
+     * can then distinguish each clipboard widget by its unique ID.
+     */
+    protected $clipboard_widget_id;
+
+
+    /**
+     * This attribute holds the ID of the clipboard which is stored in the
+     * session as currently selected clipboard.
+     */
+    protected $current_clipboard_id;
+
+
+    /**
+     * This attribute contains a string that shall be the title of the button
+     * for applying the selected clipbard to the main area
+     * the widget is showing when in read only mode.
+     */
+    protected $apply_button_title;
+
+    /**
+     * This widget can be initialised with the class names of allowed classes
+     * to limit the displayed items in a clipboard to items of specific
+     * classes.
+     */
+    public function __construct($allowed_item_classes = [])
+    {
+        parent::__construct();
+
+        if ($allowed_item_classes) {
+            //Check if all allowed item classes are SimpleORMap objects
+            //and if the classes implement the StudipItem interface:
+            foreach ($allowed_item_classes as $class) {
+                if (!is_subclass_of($class, 'StudipItem')) {
+                    throw new InvalidArgumentException(
+                        sprintf(
+                            'The class %s does not implement the StudipItem interface which is required for clipboard items!',
+                            htmlReady($class)
+                        )
+                    );
+                }
+            }
+        } else {
+            //Allow all StudipItem implementations:
+            $allowed_item_classes = ['StudipItem'];
+        }
+
+        $this->allowed_item_classes = $allowed_item_classes;
+        $this->template = 'sidebar/clipboard-widget';
+        $this->title = _('Eigene Merkzettel');
+        $this->apply_button_title = _('Hauptbereich aktualisieren');
+
+        $this->clipboard_widget_id = md5(uniqid('clipboard_widget_id'));
+
+        $this->updateSessionVariables();
+        $this->current_clipboard_id = $_SESSION['selected_clipboard_id'] ?? '';
+
+        $this->setId("ClipboardWidget_{$this->clipboard_widget_id}");
+        $this->setAdditionalAttribute('data-widget_id', $this->clipboard_widget_id);
+        $this->addLayoutCSSClass('clipboard-widget');
+    }
+
+    /**
+     * Updates session variables if a special POST request is made.
+     */
+    public function updateSessionVariables()
+    {
+        if (Request::submitted('clipboard_update_session_special_action')) {
+            CSRFProtection::verifyUnsafeRequest();
+
+            $_SESSION['selected_clipboard_id'] = Request::get('selected_clipboard_id');
+        }
+    }
+
+    public function setApplyButtonTitle($title = '')
+    {
+        if ($title) {
+            $this->apply_button_title = $title;
+        }
+    }
+
+    public function getClipboardWidgetId()
+    {
+        return $this->clipboard_widget_id;
+    }
+
+    public function render($variables = [])
+    {
+        $clipboards = Clipboard::getClipboardsForUser(
+            $GLOBALS['user']->id
+        );
+
+        if (!$this->current_clipboard_id && $clipboards) {
+            $_SESSION['selected_clipboard_id'] = $clipboards[0]->id;
+            $this->current_clipboard_id = $clipboards[0]->id;
+        }
+
+        return parent::render($variables + [
+            'clipboards'               => $clipboards,
+            'allowed_item_classes'     => $this->allowed_item_classes,
+            'clipboard_widget_id'      => $this->clipboard_widget_id,
+            'draggable_items'          => $this->draggable_items,
+            'apply_button_title'       => $this->apply_button_title,
+            'elements'                 => $this->elements,
+            'selected_clipboard_id'    => $this->current_clipboard_id,
+        ]);
+    }
+
+    /**
+     * Adds a link to the widget
+     *
+     * @param String $label  Label/content of the link
+     * @param String $url    URL/Location of the link
+     * @param Icon   $icon   instance of class Icon for the link
+     * @param bool   $active Pass true if the link is currently active,
+     *                       defaults to false
+     */
+    public function &addLink($label, $url, $icon = null, $attributes = array(), $index = null)
+    {
+        if ($index === null) {
+            $index = 'link-' . md5($url);
+        }
+        $element = new LinkElement($label, $url, $icon, $attributes);
+        $this->addElement($element, $index);
+        return $element;
+    }
+}
diff --git a/lib/classes/sidebar/InstituteSelectWidget.class.php b/lib/classes/sidebar/InstituteSelectWidget.class.php
deleted file mode 100644
index ec05311..0000000
--- a/lib/classes/sidebar/InstituteSelectWidget.class.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * InstituteSelectWidget
- *
- * This is a specialisation of the select widget for institutes
- * and their faculties.
- *
- * @author    Moritz Strohm <strohm@data-quest.de>
- * @see       SelectWidget
- * @since     4.5
- * @license   GPL2 or any later version
- * @copyright Stud.IP Core Group
- */
-class InstituteSelectWidget extends SelectWidget
-{
-    protected $include_all_option;
-
-    /**
-     * The IDs of the selected institutes.
-     */
-    protected $selected_element_ids;
-
-    public function __construct($url, $name, $method = 'get', $multiple = false)
-    {
-        parent::__construct(_('Einrichtung'), $url, $name, $method, $multiple);
-
-        $this->include_all_option = false;
-        $this->selected_element_ids = [];
-    }
-
-
-    /**
-     * Sets the $include_all_option attribute that specifies whether an option
-     * for selecting all institutes shall be provided (true) or not (false).
-     * This defaults to true.
-     */
-    public function includeAllOption($include_all_option = true)
-    {
-        $this->include_all_option = $include_all_option;
-    }
-
-
-    /**
-     * This method allows setting the selected elements from other sources
-     * than the select's name from a request.
-     *
-     * @param Array|string $element_ids The ID of one element (as string)
-     *     or the IDs of more than one element (as array)
-     *     which have been selected.
-     */
-    public function setSelectedElementIds($element_ids = [])
-    {
-        if ($element_ids && !is_array($element_ids)) {
-            $element_ids = [$element_ids];
-        }
-        $this->selected_element_ids = $element_ids;
-    }
-
-
-    public function render($variables = [])
-    {
-        if (!$this->selected_element_ids) {
-            if ($this->multiple) {
-                $this->selected_element_ids = Request::getArray($this->template_variables['name']);
-            } else {
-                $this->selected_element_ids = [Request::get($this->template_variables['name'])];
-            }
-        }
-
-        $institutes = Institute::getMyInstitutes($GLOBALS['user']->id);
-
-        if ($this->include_all_option) {
-            $element = new SelectElement(
-                'all',
-                _('Alle'),
-                in_array('all', $this->selected_element_ids)
-            );
-            $element->setAsHeader(true);
-            $this->addElement($element);
-        }
-
-        foreach ($institutes as $institute) {
-            $element = new SelectElement(
-                $institute['Institut_id'],
-                $institute['Name'],
-                in_array($institute['Institut_id'], $this->selected_element_ids)
-            );
-            if ($institute['is_fak']) {
-                $element->setAsHeader(true);
-            } else {
-                $element->setIndentLevel(1);
-            }
-            $this->addElement($element);
-
-            if ($institute['is_fak']) {
-                $sub_element_id = $institute['Institut_id'] . '_withinst';
-                $sub_element = new SelectElement(
-                    $sub_element_id,
-                    sprintf(
-                        _('%s + Institute'),
-                        $institute['Name']
-                    ),
-                    in_array($sub_element_id, $this->selected_element_ids)
-                );
-                $this->addElement($sub_element);
-            }
-        }
-
-        return parent::render($variables);
-    }
-}
diff --git a/lib/classes/sidebar/InstituteSelectWidget.php b/lib/classes/sidebar/InstituteSelectWidget.php
new file mode 100644
index 0000000..ec05311
--- /dev/null
+++ b/lib/classes/sidebar/InstituteSelectWidget.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * InstituteSelectWidget
+ *
+ * This is a specialisation of the select widget for institutes
+ * and their faculties.
+ *
+ * @author    Moritz Strohm <strohm@data-quest.de>
+ * @see       SelectWidget
+ * @since     4.5
+ * @license   GPL2 or any later version
+ * @copyright Stud.IP Core Group
+ */
+class InstituteSelectWidget extends SelectWidget
+{
+    protected $include_all_option;
+
+    /**
+     * The IDs of the selected institutes.
+     */
+    protected $selected_element_ids;
+
+    public function __construct($url, $name, $method = 'get', $multiple = false)
+    {
+        parent::__construct(_('Einrichtung'), $url, $name, $method, $multiple);
+
+        $this->include_all_option = false;
+        $this->selected_element_ids = [];
+    }
+
+
+    /**
+     * Sets the $include_all_option attribute that specifies whether an option
+     * for selecting all institutes shall be provided (true) or not (false).
+     * This defaults to true.
+     */
+    public function includeAllOption($include_all_option = true)
+    {
+        $this->include_all_option = $include_all_option;
+    }
+
+
+    /**
+     * This method allows setting the selected elements from other sources
+     * than the select's name from a request.
+     *
+     * @param Array|string $element_ids The ID of one element (as string)
+     *     or the IDs of more than one element (as array)
+     *     which have been selected.
+     */
+    public function setSelectedElementIds($element_ids = [])
+    {
+        if ($element_ids && !is_array($element_ids)) {
+            $element_ids = [$element_ids];
+        }
+        $this->selected_element_ids = $element_ids;
+    }
+
+
+    public function render($variables = [])
+    {
+        if (!$this->selected_element_ids) {
+            if ($this->multiple) {
+                $this->selected_element_ids = Request::getArray($this->template_variables['name']);
+            } else {
+                $this->selected_element_ids = [Request::get($this->template_variables['name'])];
+            }
+        }
+
+        $institutes = Institute::getMyInstitutes($GLOBALS['user']->id);
+
+        if ($this->include_all_option) {
+            $element = new SelectElement(
+                'all',
+                _('Alle'),
+                in_array('all', $this->selected_element_ids)
+            );
+            $element->setAsHeader(true);
+            $this->addElement($element);
+        }
+
+        foreach ($institutes as $institute) {
+            $element = new SelectElement(
+                $institute['Institut_id'],
+                $institute['Name'],
+                in_array($institute['Institut_id'], $this->selected_element_ids)
+            );
+            if ($institute['is_fak']) {
+                $element->setAsHeader(true);
+            } else {
+                $element->setIndentLevel(1);
+            }
+            $this->addElement($element);
+
+            if ($institute['is_fak']) {
+                $sub_element_id = $institute['Institut_id'] . '_withinst';
+                $sub_element = new SelectElement(
+                    $sub_element_id,
+                    sprintf(
+                        _('%s + Institute'),
+                        $institute['Name']
+                    ),
+                    in_array($sub_element_id, $this->selected_element_ids)
+                );
+                $this->addElement($sub_element);
+            }
+        }
+
+        return parent::render($variables);
+    }
+}
diff --git a/lib/classes/sidebar/ResourceTreeWidget.class.php b/lib/classes/sidebar/ResourceTreeWidget.class.php
deleted file mode 100644
index 60d4b29..0000000
--- a/lib/classes/sidebar/ResourceTreeWidget.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/**
- * This class provides a resource tree view for the sidebar.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- */
-class ResourceTreeWidget extends SidebarWidget
-{
-    /**
-     * $root_resource is the resource whose resource tree
-     * shall be displayed by this widget.
-     * The resource itself and all its children are displayed.
-     */
-    protected $root_resources = [];
-    protected $parameter_name = '';
-    protected $foldable = false;
-    protected $current_resource_id = null;
-
-    /**
-     * This widget must be initialised by providing at least one
-     * Resource object in an array.
-     *
-     * @param array $root_resources The root resource objects which will be
-     *     displayed by this tree view.
-     * @param string $title The title of this widget.
-     * @param string|null $parameter_name The name of the URL parameter which
-     *     will be set when one of the resources in the tree is selected.
-     *     If parameter_name is set to null the items in the resource tree
-     *     widget will link to the resource's details page.
-     */
-    public function __construct(
-        array $root_resources = [],
-        $title = '',
-        $parameter_name = 'tree_selected_resource'
-    )
-    {
-        parent::__construct();
-
-        if (!$root_resources) {
-            throw new InvalidArgumentException(
-                'ResourceTreeWidget instances must be initalised with at least one resource object!'
-            );
-        }
-
-        //Extra check to make sure the root_resources attribute of this instance
-        //is an array containing only Resource objects or objects derived
-        //from the Resource class:
-        foreach ($root_resources as $root_resource) {
-            if ($root_resource instanceof Resource) {
-                $this->root_resources[] = $root_resource;
-            }
-        }
-
-        if (!$this->root_resources) {
-            throw new InvalidArgumentException(
-                'No Resource object has been provided to the constructor of the ResourceTreeWidget class!'
-            );
-        }
-
-        $this->root_resources = SimpleORMapCollection::createFromArray(
-            $this->root_resources
-        );
-        $this->root_resources->orderBy('sort_position DESC, name ASC, mkdate ASC');
-
-        $this->template = 'sidebar/resource-tree-widget';
-
-        if ($title) {
-            $this->title = $title;
-        } else {
-            $this->title = _('Ressourcenbaum');
-        }
-
-        $this->parameter_name = $parameter_name;
-        $this->forced_rendering = true;
-    }
-
-    /**
-     * The render method will attach the root resource
-     * of this object to the set of variables which is
-     * passed to the template.
-     */
-    public function render($variables = [])
-    {
-        if (!is_array($variables)) {
-            $variables = [];
-        }
-
-        $variables['resources'] = $this->root_resources;
-        $variables['title'] = $this->title;
-        $variables['parameter_name'] = $this->parameter_name;
-        if ($this->parameter_name) {
-            $variables['selected_resource'] = Request::get($this->parameter_name);
-        } else {
-            $variables['selected_resource'] = $this->current_resource_id;
-        }
-
-        $resource_path = [];
-        //If a resource is selected we get the IDs of all parent resources
-        //so that we know in the template which tree items shall be visible.
-        if ($variables['selected_resource']) {
-            $resource = Resource::find($variables['selected_resource']);
-            if ($resource) {
-                $resource_path[] = $resource->id;
-                $current_parent = $resource->parent;
-                while ($current_parent) {
-                    $resource_path[] = $current_parent->id;
-                    $current_parent = $current_parent->parent;
-                }
-            }
-        }
-        $variables['resource_path'] = $resource_path;
-        $variables['max_open_depth'] = 0;
-        $variables['layout_css_classes'] = $this->layout_css_classes;
-        $variables['hide'] = false;
-
-        return parent::render($variables);
-    }
-
-    public function setCurrentResource(Resource $resource)
-    {
-        $this->current_resource_id = $resource->id;
-    }
-
-    public function setCurrentResourceId($resource_id = null)
-    {
-        if ($resource_id) {
-            $this->current_resource_id = $resource_id;
-        }
-    }
-
-    public function setFoldable($foldable = false)
-    {
-        $this->foldable = (bool)$foldable;
-    }
-
-    public function isFoldable()
-    {
-        return $this->foldable;
-    }
-}
diff --git a/lib/classes/sidebar/ResourceTreeWidget.php b/lib/classes/sidebar/ResourceTreeWidget.php
new file mode 100644
index 0000000..60d4b29
--- /dev/null
+++ b/lib/classes/sidebar/ResourceTreeWidget.php
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * This class provides a resource tree view for the sidebar.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ */
+class ResourceTreeWidget extends SidebarWidget
+{
+    /**
+     * $root_resource is the resource whose resource tree
+     * shall be displayed by this widget.
+     * The resource itself and all its children are displayed.
+     */
+    protected $root_resources = [];
+    protected $parameter_name = '';
+    protected $foldable = false;
+    protected $current_resource_id = null;
+
+    /**
+     * This widget must be initialised by providing at least one
+     * Resource object in an array.
+     *
+     * @param array $root_resources The root resource objects which will be
+     *     displayed by this tree view.
+     * @param string $title The title of this widget.
+     * @param string|null $parameter_name The name of the URL parameter which
+     *     will be set when one of the resources in the tree is selected.
+     *     If parameter_name is set to null the items in the resource tree
+     *     widget will link to the resource's details page.
+     */
+    public function __construct(
+        array $root_resources = [],
+        $title = '',
+        $parameter_name = 'tree_selected_resource'
+    )
+    {
+        parent::__construct();
+
+        if (!$root_resources) {
+            throw new InvalidArgumentException(
+                'ResourceTreeWidget instances must be initalised with at least one resource object!'
+            );
+        }
+
+        //Extra check to make sure the root_resources attribute of this instance
+        //is an array containing only Resource objects or objects derived
+        //from the Resource class:
+        foreach ($root_resources as $root_resource) {
+            if ($root_resource instanceof Resource) {
+                $this->root_resources[] = $root_resource;
+            }
+        }
+
+        if (!$this->root_resources) {
+            throw new InvalidArgumentException(
+                'No Resource object has been provided to the constructor of the ResourceTreeWidget class!'
+            );
+        }
+
+        $this->root_resources = SimpleORMapCollection::createFromArray(
+            $this->root_resources
+        );
+        $this->root_resources->orderBy('sort_position DESC, name ASC, mkdate ASC');
+
+        $this->template = 'sidebar/resource-tree-widget';
+
+        if ($title) {
+            $this->title = $title;
+        } else {
+            $this->title = _('Ressourcenbaum');
+        }
+
+        $this->parameter_name = $parameter_name;
+        $this->forced_rendering = true;
+    }
+
+    /**
+     * The render method will attach the root resource
+     * of this object to the set of variables which is
+     * passed to the template.
+     */
+    public function render($variables = [])
+    {
+        if (!is_array($variables)) {
+            $variables = [];
+        }
+
+        $variables['resources'] = $this->root_resources;
+        $variables['title'] = $this->title;
+        $variables['parameter_name'] = $this->parameter_name;
+        if ($this->parameter_name) {
+            $variables['selected_resource'] = Request::get($this->parameter_name);
+        } else {
+            $variables['selected_resource'] = $this->current_resource_id;
+        }
+
+        $resource_path = [];
+        //If a resource is selected we get the IDs of all parent resources
+        //so that we know in the template which tree items shall be visible.
+        if ($variables['selected_resource']) {
+            $resource = Resource::find($variables['selected_resource']);
+            if ($resource) {
+                $resource_path[] = $resource->id;
+                $current_parent = $resource->parent;
+                while ($current_parent) {
+                    $resource_path[] = $current_parent->id;
+                    $current_parent = $current_parent->parent;
+                }
+            }
+        }
+        $variables['resource_path'] = $resource_path;
+        $variables['max_open_depth'] = 0;
+        $variables['layout_css_classes'] = $this->layout_css_classes;
+        $variables['hide'] = false;
+
+        return parent::render($variables);
+    }
+
+    public function setCurrentResource(Resource $resource)
+    {
+        $this->current_resource_id = $resource->id;
+    }
+
+    public function setCurrentResourceId($resource_id = null)
+    {
+        if ($resource_id) {
+            $this->current_resource_id = $resource_id;
+        }
+    }
+
+    public function setFoldable($foldable = false)
+    {
+        $this->foldable = (bool)$foldable;
+    }
+
+    public function isFoldable()
+    {
+        return $this->foldable;
+    }
+}
diff --git a/lib/classes/sidebar/RoomClipboardWidget.class.php b/lib/classes/sidebar/RoomClipboardWidget.class.php
deleted file mode 100644
index 3d90c36..0000000
--- a/lib/classes/sidebar/RoomClipboardWidget.class.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * This class is a specialisation of the ClipboardWidget class.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- */
-class RoomClipboardWidget extends ClipboardWidget
-{
-    public function __construct()
-    {
-        parent::__construct(['Room']);
-        $this->allowed_item_class = '';
-        $this->setTitle(_('Individuelle Raumgruppen'));
-        $this->template = 'sidebar/room-clipboard-widget';
-
-        $current_user = User::findCurrent();
-
-        $this->addLink(
-            _('Gruppenbelegungsplan anzeigen'),
-            URLHelper::getURL('dispatch.php/room_management/planning/index/CLIPBOARD_ID'),
-            Icon::create('link-intern'),
-            [
-                'class' => 'room-clipboard-group-action',
-                'target' => '_blank'
-            ]
-        );
-
-        if (ResourceManager::userHasGlobalPermission($current_user, 'autor')) {
-            $this->addLink(
-                _('Raumgruppe buchen'),
-                URLHelper::getURL('dispatch.php/resources/booking/add/clipboard_CLIPBOARD_ID'),
-                Icon::create('link-intern'),
-                [
-                    'class' => 'room-clipboard-group-action',
-                    'data-show_in_dialog' => 'size=auto',
-                    'data-needs_items '=> '1'
-                ]
-            );
-        }
-        if (ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
-            $this->addLink(
-                _('Berechtigungen für die gesamte Raumgruppe setzen'),
-                URLHelper::getURL('dispatch.php/resources/room_group/permissions/CLIPBOARD_ID'),
-                Icon::create('link-intern'),
-                [
-                    'class' => 'room-clipboard-group-action',
-                    'data-show_in_dialog' => '1'
-                ]
-            );
-        }
-    }
-}
diff --git a/lib/classes/sidebar/RoomClipboardWidget.php b/lib/classes/sidebar/RoomClipboardWidget.php
new file mode 100644
index 0000000..3d90c36
--- /dev/null
+++ b/lib/classes/sidebar/RoomClipboardWidget.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This class is a specialisation of the ClipboardWidget class.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ */
+class RoomClipboardWidget extends ClipboardWidget
+{
+    public function __construct()
+    {
+        parent::__construct(['Room']);
+        $this->allowed_item_class = '';
+        $this->setTitle(_('Individuelle Raumgruppen'));
+        $this->template = 'sidebar/room-clipboard-widget';
+
+        $current_user = User::findCurrent();
+
+        $this->addLink(
+            _('Gruppenbelegungsplan anzeigen'),
+            URLHelper::getURL('dispatch.php/room_management/planning/index/CLIPBOARD_ID'),
+            Icon::create('link-intern'),
+            [
+                'class' => 'room-clipboard-group-action',
+                'target' => '_blank'
+            ]
+        );
+
+        if (ResourceManager::userHasGlobalPermission($current_user, 'autor')) {
+            $this->addLink(
+                _('Raumgruppe buchen'),
+                URLHelper::getURL('dispatch.php/resources/booking/add/clipboard_CLIPBOARD_ID'),
+                Icon::create('link-intern'),
+                [
+                    'class' => 'room-clipboard-group-action',
+                    'data-show_in_dialog' => 'size=auto',
+                    'data-needs_items '=> '1'
+                ]
+            );
+        }
+        if (ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
+            $this->addLink(
+                _('Berechtigungen für die gesamte Raumgruppe setzen'),
+                URLHelper::getURL('dispatch.php/resources/room_group/permissions/CLIPBOARD_ID'),
+                Icon::create('link-intern'),
+                [
+                    'class' => 'room-clipboard-group-action',
+                    'data-show_in_dialog' => '1'
+                ]
+            );
+        }
+    }
+}
diff --git a/lib/classes/sidebar/RoomSearchTreeWidget.class.php b/lib/classes/sidebar/RoomSearchTreeWidget.class.php
deleted file mode 100644
index c3aaa07..0000000
--- a/lib/classes/sidebar/RoomSearchTreeWidget.class.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * This class provides a resource tree view for the room search sidebar.
- *
- * @author  Timo Hartge <hartge@data-quest.de>
- * @license GNU General Public License v2 or later.
- * @since   4.5
- */
-class RoomSearchTreeWidget extends ResourceTreeWidget
-{
-    /**
-     * This widget must be initialised by providing at least one
-     * Resource object in an array.
-     *
-     * @param array $root_resources The root resource objects which will be
-     *     displayed by this tree view.
-     * @param string $title The title of this widget.
-     * @param string|null $parameter_name The name of the URL parameter which
-     *     will be set when one of the resources in the tree is selected.
-     *     If parameter_name is set to null the items in the resource tree
-     *     widget will link to the resource's details page.
-     */
-    public function __construct(
-        array $root_resources = [],
-        $title = '',
-        $parameter_name = null
-    )
-    {
-        parent::__construct($root_resources, $title, $parameter_name);
-        $this->addLayoutCSSClass('room-search-tree-widget');
-        $this->template = 'sidebar/room-search-tree-widget';
-
-        if ($title) {
-            $this->title = $title;
-        } else {
-            $this->title = _('Ressourcenbaum');
-        }
-    }
-
-}
diff --git a/lib/classes/sidebar/RoomSearchTreeWidget.php b/lib/classes/sidebar/RoomSearchTreeWidget.php
new file mode 100644
index 0000000..c3aaa07
--- /dev/null
+++ b/lib/classes/sidebar/RoomSearchTreeWidget.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * This class provides a resource tree view for the room search sidebar.
+ *
+ * @author  Timo Hartge <hartge@data-quest.de>
+ * @license GNU General Public License v2 or later.
+ * @since   4.5
+ */
+class RoomSearchTreeWidget extends ResourceTreeWidget
+{
+    /**
+     * This widget must be initialised by providing at least one
+     * Resource object in an array.
+     *
+     * @param array $root_resources The root resource objects which will be
+     *     displayed by this tree view.
+     * @param string $title The title of this widget.
+     * @param string|null $parameter_name The name of the URL parameter which
+     *     will be set when one of the resources in the tree is selected.
+     *     If parameter_name is set to null the items in the resource tree
+     *     widget will link to the resource's details page.
+     */
+    public function __construct(
+        array $root_resources = [],
+        $title = '',
+        $parameter_name = null
+    )
+    {
+        parent::__construct($root_resources, $title, $parameter_name);
+        $this->addLayoutCSSClass('room-search-tree-widget');
+        $this->template = 'sidebar/room-search-tree-widget';
+
+        if ($title) {
+            $this->title = $title;
+        } else {
+            $this->title = _('Ressourcenbaum');
+        }
+    }
+
+}
diff --git a/lib/classes/sidebar/RoomSearchWidget.class.php b/lib/classes/sidebar/RoomSearchWidget.class.php
deleted file mode 100644
index 1fa465f..0000000
--- a/lib/classes/sidebar/RoomSearchWidget.class.php
+++ /dev/null
@@ -1,595 +0,0 @@
-<?php
-
-
-/**
- * A special search widget that provides a room search.
- */
-class RoomSearchWidget extends SidebarWidget
-{
-    protected $action_link;
-    protected $criteria;
-    protected $selected_criteria;
-    protected $defined_properties;
-    protected $semesters;
-
-    protected function setupSearchParameters()
-    {
-        $this->semesters = array_reverse(Semester::getAll());
-        $this->defined_properties = RoomManager::getAllRoomPropertyDefinitions(
-            true,
-            [
-                'seats', 'room_type','room_category_id'
-            ]
-        );
-
-        $resource_categories = ResourceCategory::findBySQL("class_name = 'Room' ORDER by name");
-        $categories = [
-            '' => _('Alle Kategorien')
-        ];
-        if($resource_categories) {
-            foreach($resource_categories as $resource_category) {
-                $categories[$resource_category->id] = $resource_category->name;
-            }
-        }
-
-        $room_types = Room::getAllRoomTypes();
-        if (!empty($room_types)) {
-            $filtered_room_types = [];
-            foreach ($room_types as $type) {
-                $filtered_room_types[$type] = $type;
-            }
-            $room_types = array_merge(
-                ['' => _('Alle Raumtypen')],
-                $filtered_room_types
-            );
-        }
-
-        $this->criteria = [];
-
-        if ($this->defined_properties) {
-            foreach ($this->defined_properties as $property) {
-                $this->criteria[$property->name] = [
-                    'name' => $property->id,
-                    'title' => (
-                        $property->display_name != ''
-                        ? $property->display_name
-                        : $property->name
-                    ),
-                    'type' => $property->type,
-                    'range_search' => $property->range_search,
-                    'optional' => true
-                ];
-                if ($property->type === 'select') {
-                    $this->criteria[$property->name]['options'] = $property->getOptionsArray();
-                }
-            }
-        }
-
-        //Add special criteria:
-        $this->criteria['special__room_name'] = [
-            'name' => 'special__room_name',
-            'title' => _('Raumname'),
-            'type' => 'text',
-            'range_search' => false,
-            'switch' => false,
-            'value' => '',
-            'optional' => false
-        ];
-        $this->criteria['room_category_id'] = [
-            'name' => 'room_category_id',
-            'title' => _('Kategorie'),
-            'type' => 'select',
-            'range_search' => false,
-            'options' => $categories,
-            'switch' => false,
-            'value' => '',
-            'optional' => false
-        ];
-        if (!empty($room_types)) {
-            $this->criteria['room_type'] = [
-                'name'         => 'room_type',
-                'title'        => _('Raumtyp'),
-                'type'         => 'select',
-                'range_search' => false,
-                'options'      => $room_types,
-                'switch'       => false,
-                'value'        => '',
-                'optional'     => false
-            ];
-        }
-        $this->criteria['special__building_location'] = [
-            'name' => 'special__building_location',
-            'title' => _('Standort / Gebäude'),
-            'type' => 'hidden',
-            'range_search' => false,
-            'switch' => false,
-            'value' => '',
-            'optional' => false
-        ];
-
-        if (Request::get('special__building_location') && !Request::submitted('room_search_reset')) {
-            $res_id = explode('_', Request::get('special__building_location'));
-            $selected_res =Resource::find($res_id[1]);
-            if ($selected_res) {
-                $this->criteria['special__building_location_label'] = [
-                    'name' => 'special__building_location_label',
-                    'title' => _('Standort / Gebäude'),
-                    'type' => 'disabled_text',
-                    'range_search' => false,
-                    'switch' => false,
-                    'value' => $selected_res->name,
-                    'optional' => false
-                ];
-            }
-        }
-
-        $current_semester = Semester::findCurrent();
-        $begin = new DateTime();
-        $begin = $begin->setTimestamp($current_semester->beginn);
-        $begin->setTime(intval(date('H')), 0, 0);
-        $end = clone $begin;
-        $end = $end->setTimestamp($current_semester->ende);
-
-        $this->criteria['special__time_range'] = [
-            'name' => 'special__time_range',
-            'title' => _('Frei in einem Zeitbereich'),
-            'optional' => false,
-            'enabled' => false,
-            'semester' => [
-                'value' => $current_semester->id
-            ],
-            'range' => [
-                'begin' => $begin,
-                'end' => $end
-            ],
-            'day_of_week' => [
-                'options' => [
-                    '1' => _('Montag'),
-                    '2' => _('Dienstag'),
-                    '3' => _('Mittwoch'),
-                    '4' => _('Donnerstag'),
-                    '5' => _('Freitag'),
-                    '6' => _('Samstag'),
-                    '7' => _('Sonntag')
-                ],
-                'value' => ''
-            ]
-        ];
-
-        $this->criteria['special__seats'] = [
-            'name' => 'special__seats',
-            'title' => _('Sitzplätze'),
-            'type' => 'num',
-            'range_search' => true,
-            'switch' => true,
-            'value' => [10, 100],
-            'optional' => false
-        ];
-
-    }
-
-
-    protected function handleSearchRequest()
-    {
-        $this->selected_criteria = [];
-
-        //If the reset button has been pressed, reset the search
-        //and do nothing else.
-        if ($this->searchResetRequested() || !$this->searchRequested()) {
-            //If no room search is requested we can stop here.
-            return;
-        }
-
-        $default_begin = new DateTime();
-        $default_begin = $default_begin->add(new DateInterval('P1D'));
-        $default_begin->setTime(intval(date('H')), 0, 0);
-        $default_end = clone $default_begin;
-        $default_end = $default_end->add(new DateInterval('PT30M'));
-
-        foreach ($this->criteria as $name => $data) {
-            if ($name == 'special__time_range') {
-                if (Request::get($data['name'] . '_enabled')) {
-                    $data['enabled'] = true;
-                    $this->selected_criteria[$name] = $data;
-                    if (Request::submittedSome(
-                        $data['name'] . '_begin_date',
-                        $data['name'] . '_begin_time',
-                        $data['name'] . '_end_date',
-                        $data['name'] . '_end_time'
-                    )) {
-                            $submitted_begin = Request::getDateTime(
-                                $data['name'] . '_begin_date',
-                                'd.m.Y',
-                                $data['name'] . '_begin_time',
-                                'H:i'
-                            );
-                            $submitted_end = Request::getDateTime(
-                                $data['name'] . '_end_date',
-                                'd.m.Y',
-                                $data['name'] . '_end_time',
-                                'H:i'
-                            );
-                            if(!$submitted_begin || !$submitted_end) {
-                                $submitted_begin = $default_begin;
-                                $submitted_end = $default_end;
-                            }
-                        $this->selected_criteria[$name]['range'] = [
-                            'begin' => $submitted_begin,
-                            'end' => $submitted_end
-                        ];
-                    }
-                    $this->selected_criteria[$name]['day_of_week']['value'] =
-                        Request::get($data['name'] . '_day_of_week');
-                    $this->selected_criteria[$name]['semester']['value'] =
-                        Request::get($data['name'] . '_semester_id');
-                }
-            } else {
-                if (!empty($data['switch'])) {
-                    if (Request::get($data['name'] . '_enabled')) {
-                        $data['enabled'] = true;
-                    } else {
-                        //The criteria isn't enabled. We can move on to the
-                        //next criteria.
-                        continue;
-                    }
-                }
-                if ($data['type'] == 'date') {
-                    if ($data['range_search']) {
-                        if (Request::submittedSome(
-                            $data['name'] . '_begin_date',
-                            $data['name'] . '_begin_time',
-                            $data['name'] . '_end_date',
-                            $data['name'] . '_end_time'
-                        )) {
-                            $this->selected_criteria[$name] = $data;
-                            $submitted_begin = Request::getDateTime(
-                                $data['name'] . '_begin_date',
-                                'd.m.Y',
-                                $data['name'] . '_begin_time',
-                                'H:i'
-                            );
-                            $submitted_end = Request::getDateTime(
-                                $data['name'] . '_end_date',
-                                'd.m.Y',
-                                $data['name'] . '_end_time',
-                                'H:i'
-                            );
-                            if(!$submitted_begin || !$submitted_end) {
-                                $submitted_begin = $default_begin;
-                                $submitted_end = $default_end;
-                            }
-                            $this->selected_criteria[$name]['value'] = [
-                                'begin' => $submitted_begin,
-                                'end' => $submitted_end
-                            ];
-                        }
-                    } else {
-                        if (Request::submittedSome(
-                            $data['name'] . '_date',
-                            $data['name'] . '_time'
-                        )) {
-                            $this->selected_criteria[$name] = $data;
-                            $this->selected_criteria[$name]['value'] =
-                                Request::getDateTime(
-                                    $data['name'] . '_date',
-                                    'd.m.Y',
-                                    $data['name'] . '_time',
-                                    'H:i'
-                                );
-                        }
-                    }
-                } elseif ($data['type'] === 'num' && $data['range_search']) {
-                    if (Request::submittedSome(
-                        $data['name'] . '_min',
-                        $data['name'] . '_max'
-                    )) {
-                        $this->selected_criteria[$name]          = $data;
-                        $this->selected_criteria[$name]['value'] = [
-                            Request::get($data['name'] . '_min'),
-                            Request::get($data['name'] . '_max')
-                        ];
-                    }
-                } elseif ($data['type'] === 'bool') {
-                    if (Request::submitted('options_' . $data['name'])) {
-                        $this->selected_criteria[$name]          = $data;
-                        $this->selected_criteria[$name]['value'] = Request::get($data['name']);
-                    }
-                } else {
-                    if (Request::submitted($data['name'])) {
-                        $this->selected_criteria[$name] = $data;
-                        $this->selected_criteria[$name]['value'] = Request::get($data['name']);
-                    }
-                }
-            }
-        }
-
-        $_SESSION['room_search_criteria']['room_search'] =
-            $this->selected_criteria;
-    }
-
-    protected function restoreSearchFromSession()
-    {
-        if (!empty($_SESSION['room_search_criteria']['room_search']) && is_array($_SESSION['room_search_criteria']['room_search'])) {
-            $this->selected_criteria =
-                $_SESSION['room_search_criteria']['room_search'];
-        } else {
-            $this->selected_criteria = [];
-        }
-    }
-
-    protected function search()
-    {
-        //The properties array is a "simplified" version of the
-        //$selected_criteria array, stripped from all special search criteria,
-        //except the "seats" search criteria.
-
-        $properties = [];
-        if ($this->selected_criteria) {
-            foreach ($this->selected_criteria as $name => $criteria) {
-
-                //Do not add the special properties
-                //into the $properties array:
-                if (preg_match('/special__/', $name) && ($name != 'special__seats')) {
-                    continue;
-                }
-                if ($name == 'room_type' && empty($criteria['value'])) {
-                    continue;
-                }
-                if ($name == 'room_category_id' && empty($criteria['value'])) {
-                    continue;
-                }
-                if ($name == 'special__seats') {
-                    if ($criteria['value'][0] || $criteria['value'][1]) {
-                        $properties['seats'] = $criteria['value'];
-                    }
-                    $name = 'seats';
-                } else {
-                    $properties[$name] = $criteria['value'];
-                }
-
-                if (
-                    isset($properties[$name][0], $properties[$name][1])
-                    && $properties[$name][0] && $properties[$name][1]
-                    && $properties[$name][0] > $properties[$name][1]
-                    && $name !== 'room_category_id'
-                ) {
-                    //A range is selected, but the range start is bigger
-                    //then the range end. That's an error!
-
-                    //Resolve the property name for a "beautiful" property name:
-                    $property = ResourcePropertyDefinition::findOneBySql(
-                        'name = :name',
-                        ['name' => $name]
-                    );
-                    $property_name = $name;
-                    if ($property) {
-                        $property_name = $property->display_name;
-                    }
-
-                    PageLayout::postError(
-                        sprintf(
-                            _('Für die Eigenschaft %1$s wurde ein ungültiger Bereich angegeben (von %2$s bis %3$s)!'),
-                            htmlReady($property_name),
-                            htmlReady($properties[$name][0]),
-                            htmlReady($properties[$name][1])
-                        )
-                    );
-                    return;
-                }
-            }
-        }
-
-        $building_or_location_id = explode(
-            '_',
-            $this->selected_criteria['special__building_location']['value']
-        );
-
-        $this->location_id = null;
-        $this->building_id = null;
-
-        if ($building_or_location_id[0] == 'building') {
-            $this->building_id = $building_or_location_id[1];
-        } elseif ($building_or_location_id[0] == 'location') {
-            $this->location_id = $building_or_location_id[1];
-        } elseif($building_or_location_id[0] == 'resourcelabel') {
-            $resourcelabel = ResourceLabel::find($building_or_location_id[1]);
-            if ($resourcelabel) {
-                $sub_buildings = [];
-                foreach($resourcelabel->findChildrenByClassName('Building') as $sub_building) {
-                    $sub_buildings[] = $sub_building->id;
-                }
-                $this->building_id = $sub_buildings;
-            }
-        } elseif($building_or_location_id[0] == 'room') {
-            $this->rooms = [Room::find($building_or_location_id[1])];
-            return;
-        }
-
-        //The time intervals have to be calculated by the selected time range
-        //and the selected day of week.
-        //The selected semester is represented by the selected time range
-        //since its begin and end date are set on the client side in
-        //the special__available_range property when a semester is selected.
-        $time_intervals = [];
-        if (!empty($this->selected_criteria['special__time_range'])) {
-            $time_range_criteria = $this->selected_criteria['special__time_range'];
-
-            //Get and check day of week:
-            if ($time_range_criteria['day_of_week']['value']) {
-                $selected_dow = $time_range_criteria['day_of_week']['value'];
-                if (($selected_dow >= 1) && ($selected_dow <= 7)) {
-
-                    //Get and check the time range:
-                    if (($time_range_criteria['range']['begin'] instanceof DateTime)
-                        && ($time_range_criteria['range']['end'] instanceof DateTime)) {
-                        //Start from the begin date and make time intervals
-                        //for the specified time on the specified day of week.
-                        $begin = clone $time_range_criteria['range']['begin'];
-                        $begin_dow = $begin->format('N');
-                        if ($begin_dow < $selected_dow) {
-                            $diff = $selected_dow - $begin_dow;
-                            $begin = $begin->add(
-                                new DateInterval(
-                                    'P' . $diff . 'D'
-                                )
-                            );
-                        } elseif ($begin_dow > $selected_dow) {
-                            $diff = $begin_dow - $selected_dow;
-                            $begin = $begin->sub(
-                                new DateInterval(
-                                    'P' . $diff . 'D'
-                                )
-                            );
-                        }
-                        $end = clone $time_range_criteria['range']['end'];
-                        $current_begin = clone $begin;
-                        do {
-                            $current_end = clone $current_begin;
-                            $current_end->setTime(
-                                intval($end->format('H')),
-                                intval($end->format('i')),
-                                intval($end->format('s'))
-                            );
-                            $time_intervals[] = [
-                                'begin' => clone $current_begin,
-                                'end' => clone $current_end
-                            ];
-                            $current_begin = $current_begin->add(
-                                new DateInterval('P1W')
-                            );
-                        } while ($current_begin < $end);
-                    } else {
-                        //Get the next occurrence of the specified day of week.
-                        $begin = new DateTime();
-                        $begin_dow = $begin->format('N');
-                        if ($begin_dow < $selected_dow) {
-                            $diff = $selected_dow - $begin_dow;
-                            $begin = $begin->add(
-                                new DateInterval(
-                                    'P' . $diff . 'D'
-                                )
-                            );
-                        } elseif ($begin_dow > $selected_dow) {
-                            $diff = $begin_dow - $selected_dow;
-                            $begin = $begin->sub(
-                                new DateInterval(
-                                    'P' . $diff . 'D'
-                                )
-                            );
-                        }
-                        $begin->setTime(0,0);
-                        $end = clone $begin;
-                        $end = $end->add(
-                            new DateInterval('P1D')
-                        )->sub(
-                            new DateInterval('PT1S')
-                        );
-
-                        $time_intervals[] = [
-                            'begin' => $begin,
-                            'end' => $end
-                        ];
-                    }
-                }
-            } elseif ($time_range_criteria['range']) {
-                //A time range without a day of week is specified.
-                $time_intervals[] = $time_range_criteria['range'];
-            }
-        }
-
-        try {
-            $this->rooms = RoomManager::findRooms(
-                $this->selected_criteria['special__room_name']['value'],
-                $this->location_id,
-                $this->building_id,
-                $properties,
-                $time_intervals,
-                'name ASC, mkdate ASC',
-                false
-            );
-        } catch (\InvalidArgumentException $e) {
-            PageLayout::postError($e->getMessage());
-        }
-    }
-
-    public function resetSearch()
-    {
-        $this->selected_criteria = [];
-        $_SESSION['room_search_criteria']['room_search'] = [];
-    }
-
-    public function __construct($action_link = '')
-    {
-        parent::__construct();
-
-        $this->template = 'sidebar/room-search-widget';
-
-        if ($action_link) {
-            $this->action_link = $action_link;
-        }
-
-        $this->setupSearchParameters();
-        if ($this->searchRequested()) {
-            $this->handleSearchRequest();
-        } elseif ($this->searchResetRequested()) {
-            $this->resetSearch();
-        } else {
-            $this->restoreSearchFromSession();
-        }
-
-        if ($this->selected_criteria) {
-            $this->search();
-        }
-    }
-
-    public function searchRequested()
-    {
-        return Request::submitted('room_search');
-    }
-
-    public function searchResetRequested()
-    {
-        return Request::submitted('room_search_reset');
-    }
-
-    public function getResults()
-    {
-        return $this->rooms;
-    }
-
-    public function setActionLink($action_link = '')
-    {
-        if (!$action_link) {
-            return;
-        }
-
-        $this->action_link = $action_link;
-    }
-
-    public function getActionLink()
-    {
-        return $this->action_link;
-    }
-
-    public function getSelectedCriteria()
-    {
-        return $this->selected_criteria;
-    }
-
-    public function render($variables = [])
-    {
-        $variables = array_merge($variables, [
-            'title'             => _('Suchkriterien für Räume'),
-            'criteria'          => $this->criteria,
-            'selected_criteria' => $this->selected_criteria,
-            'action_link'       => $this->action_link,
-            'semesters'         => $this->semesters
-        ]);
-
-        return $GLOBALS['template_factory']->render(
-            $this->template,
-            $variables,
-            'widgets/widget-layout'
-        );
-    }
-}
diff --git a/lib/classes/sidebar/RoomSearchWidget.php b/lib/classes/sidebar/RoomSearchWidget.php
new file mode 100644
index 0000000..1fa465f
--- /dev/null
+++ b/lib/classes/sidebar/RoomSearchWidget.php
@@ -0,0 +1,595 @@
+<?php
+
+
+/**
+ * A special search widget that provides a room search.
+ */
+class RoomSearchWidget extends SidebarWidget
+{
+    protected $action_link;
+    protected $criteria;
+    protected $selected_criteria;
+    protected $defined_properties;
+    protected $semesters;
+
+    protected function setupSearchParameters()
+    {
+        $this->semesters = array_reverse(Semester::getAll());
+        $this->defined_properties = RoomManager::getAllRoomPropertyDefinitions(
+            true,
+            [
+                'seats', 'room_type','room_category_id'
+            ]
+        );
+
+        $resource_categories = ResourceCategory::findBySQL("class_name = 'Room' ORDER by name");
+        $categories = [
+            '' => _('Alle Kategorien')
+        ];
+        if($resource_categories) {
+            foreach($resource_categories as $resource_category) {
+                $categories[$resource_category->id] = $resource_category->name;
+            }
+        }
+
+        $room_types = Room::getAllRoomTypes();
+        if (!empty($room_types)) {
+            $filtered_room_types = [];
+            foreach ($room_types as $type) {
+                $filtered_room_types[$type] = $type;
+            }
+            $room_types = array_merge(
+                ['' => _('Alle Raumtypen')],
+                $filtered_room_types
+            );
+        }
+
+        $this->criteria = [];
+
+        if ($this->defined_properties) {
+            foreach ($this->defined_properties as $property) {
+                $this->criteria[$property->name] = [
+                    'name' => $property->id,
+                    'title' => (
+                        $property->display_name != ''
+                        ? $property->display_name
+                        : $property->name
+                    ),
+                    'type' => $property->type,
+                    'range_search' => $property->range_search,
+                    'optional' => true
+                ];
+                if ($property->type === 'select') {
+                    $this->criteria[$property->name]['options'] = $property->getOptionsArray();
+                }
+            }
+        }
+
+        //Add special criteria:
+        $this->criteria['special__room_name'] = [
+            'name' => 'special__room_name',
+            'title' => _('Raumname'),
+            'type' => 'text',
+            'range_search' => false,
+            'switch' => false,
+            'value' => '',
+            'optional' => false
+        ];
+        $this->criteria['room_category_id'] = [
+            'name' => 'room_category_id',
+            'title' => _('Kategorie'),
+            'type' => 'select',
+            'range_search' => false,
+            'options' => $categories,
+            'switch' => false,
+            'value' => '',
+            'optional' => false
+        ];
+        if (!empty($room_types)) {
+            $this->criteria['room_type'] = [
+                'name'         => 'room_type',
+                'title'        => _('Raumtyp'),
+                'type'         => 'select',
+                'range_search' => false,
+                'options'      => $room_types,
+                'switch'       => false,
+                'value'        => '',
+                'optional'     => false
+            ];
+        }
+        $this->criteria['special__building_location'] = [
+            'name' => 'special__building_location',
+            'title' => _('Standort / Gebäude'),
+            'type' => 'hidden',
+            'range_search' => false,
+            'switch' => false,
+            'value' => '',
+            'optional' => false
+        ];
+
+        if (Request::get('special__building_location') && !Request::submitted('room_search_reset')) {
+            $res_id = explode('_', Request::get('special__building_location'));
+            $selected_res =Resource::find($res_id[1]);
+            if ($selected_res) {
+                $this->criteria['special__building_location_label'] = [
+                    'name' => 'special__building_location_label',
+                    'title' => _('Standort / Gebäude'),
+                    'type' => 'disabled_text',
+                    'range_search' => false,
+                    'switch' => false,
+                    'value' => $selected_res->name,
+                    'optional' => false
+                ];
+            }
+        }
+
+        $current_semester = Semester::findCurrent();
+        $begin = new DateTime();
+        $begin = $begin->setTimestamp($current_semester->beginn);
+        $begin->setTime(intval(date('H')), 0, 0);
+        $end = clone $begin;
+        $end = $end->setTimestamp($current_semester->ende);
+
+        $this->criteria['special__time_range'] = [
+            'name' => 'special__time_range',
+            'title' => _('Frei in einem Zeitbereich'),
+            'optional' => false,
+            'enabled' => false,
+            'semester' => [
+                'value' => $current_semester->id
+            ],
+            'range' => [
+                'begin' => $begin,
+                'end' => $end
+            ],
+            'day_of_week' => [
+                'options' => [
+                    '1' => _('Montag'),
+                    '2' => _('Dienstag'),
+                    '3' => _('Mittwoch'),
+                    '4' => _('Donnerstag'),
+                    '5' => _('Freitag'),
+                    '6' => _('Samstag'),
+                    '7' => _('Sonntag')
+                ],
+                'value' => ''
+            ]
+        ];
+
+        $this->criteria['special__seats'] = [
+            'name' => 'special__seats',
+            'title' => _('Sitzplätze'),
+            'type' => 'num',
+            'range_search' => true,
+            'switch' => true,
+            'value' => [10, 100],
+            'optional' => false
+        ];
+
+    }
+
+
+    protected function handleSearchRequest()
+    {
+        $this->selected_criteria = [];
+
+        //If the reset button has been pressed, reset the search
+        //and do nothing else.
+        if ($this->searchResetRequested() || !$this->searchRequested()) {
+            //If no room search is requested we can stop here.
+            return;
+        }
+
+        $default_begin = new DateTime();
+        $default_begin = $default_begin->add(new DateInterval('P1D'));
+        $default_begin->setTime(intval(date('H')), 0, 0);
+        $default_end = clone $default_begin;
+        $default_end = $default_end->add(new DateInterval('PT30M'));
+
+        foreach ($this->criteria as $name => $data) {
+            if ($name == 'special__time_range') {
+                if (Request::get($data['name'] . '_enabled')) {
+                    $data['enabled'] = true;
+                    $this->selected_criteria[$name] = $data;
+                    if (Request::submittedSome(
+                        $data['name'] . '_begin_date',
+                        $data['name'] . '_begin_time',
+                        $data['name'] . '_end_date',
+                        $data['name'] . '_end_time'
+                    )) {
+                            $submitted_begin = Request::getDateTime(
+                                $data['name'] . '_begin_date',
+                                'd.m.Y',
+                                $data['name'] . '_begin_time',
+                                'H:i'
+                            );
+                            $submitted_end = Request::getDateTime(
+                                $data['name'] . '_end_date',
+                                'd.m.Y',
+                                $data['name'] . '_end_time',
+                                'H:i'
+                            );
+                            if(!$submitted_begin || !$submitted_end) {
+                                $submitted_begin = $default_begin;
+                                $submitted_end = $default_end;
+                            }
+                        $this->selected_criteria[$name]['range'] = [
+                            'begin' => $submitted_begin,
+                            'end' => $submitted_end
+                        ];
+                    }
+                    $this->selected_criteria[$name]['day_of_week']['value'] =
+                        Request::get($data['name'] . '_day_of_week');
+                    $this->selected_criteria[$name]['semester']['value'] =
+                        Request::get($data['name'] . '_semester_id');
+                }
+            } else {
+                if (!empty($data['switch'])) {
+                    if (Request::get($data['name'] . '_enabled')) {
+                        $data['enabled'] = true;
+                    } else {
+                        //The criteria isn't enabled. We can move on to the
+                        //next criteria.
+                        continue;
+                    }
+                }
+                if ($data['type'] == 'date') {
+                    if ($data['range_search']) {
+                        if (Request::submittedSome(
+                            $data['name'] . '_begin_date',
+                            $data['name'] . '_begin_time',
+                            $data['name'] . '_end_date',
+                            $data['name'] . '_end_time'
+                        )) {
+                            $this->selected_criteria[$name] = $data;
+                            $submitted_begin = Request::getDateTime(
+                                $data['name'] . '_begin_date',
+                                'd.m.Y',
+                                $data['name'] . '_begin_time',
+                                'H:i'
+                            );
+                            $submitted_end = Request::getDateTime(
+                                $data['name'] . '_end_date',
+                                'd.m.Y',
+                                $data['name'] . '_end_time',
+                                'H:i'
+                            );
+                            if(!$submitted_begin || !$submitted_end) {
+                                $submitted_begin = $default_begin;
+                                $submitted_end = $default_end;
+                            }
+                            $this->selected_criteria[$name]['value'] = [
+                                'begin' => $submitted_begin,
+                                'end' => $submitted_end
+                            ];
+                        }
+                    } else {
+                        if (Request::submittedSome(
+                            $data['name'] . '_date',
+                            $data['name'] . '_time'
+                        )) {
+                            $this->selected_criteria[$name] = $data;
+                            $this->selected_criteria[$name]['value'] =
+                                Request::getDateTime(
+                                    $data['name'] . '_date',
+                                    'd.m.Y',
+                                    $data['name'] . '_time',
+                                    'H:i'
+                                );
+                        }
+                    }
+                } elseif ($data['type'] === 'num' && $data['range_search']) {
+                    if (Request::submittedSome(
+                        $data['name'] . '_min',
+                        $data['name'] . '_max'
+                    )) {
+                        $this->selected_criteria[$name]          = $data;
+                        $this->selected_criteria[$name]['value'] = [
+                            Request::get($data['name'] . '_min'),
+                            Request::get($data['name'] . '_max')
+                        ];
+                    }
+                } elseif ($data['type'] === 'bool') {
+                    if (Request::submitted('options_' . $data['name'])) {
+                        $this->selected_criteria[$name]          = $data;
+                        $this->selected_criteria[$name]['value'] = Request::get($data['name']);
+                    }
+                } else {
+                    if (Request::submitted($data['name'])) {
+                        $this->selected_criteria[$name] = $data;
+                        $this->selected_criteria[$name]['value'] = Request::get($data['name']);
+                    }
+                }
+            }
+        }
+
+        $_SESSION['room_search_criteria']['room_search'] =
+            $this->selected_criteria;
+    }
+
+    protected function restoreSearchFromSession()
+    {
+        if (!empty($_SESSION['room_search_criteria']['room_search']) && is_array($_SESSION['room_search_criteria']['room_search'])) {
+            $this->selected_criteria =
+                $_SESSION['room_search_criteria']['room_search'];
+        } else {
+            $this->selected_criteria = [];
+        }
+    }
+
+    protected function search()
+    {
+        //The properties array is a "simplified" version of the
+        //$selected_criteria array, stripped from all special search criteria,
+        //except the "seats" search criteria.
+
+        $properties = [];
+        if ($this->selected_criteria) {
+            foreach ($this->selected_criteria as $name => $criteria) {
+
+                //Do not add the special properties
+                //into the $properties array:
+                if (preg_match('/special__/', $name) && ($name != 'special__seats')) {
+                    continue;
+                }
+                if ($name == 'room_type' && empty($criteria['value'])) {
+                    continue;
+                }
+                if ($name == 'room_category_id' && empty($criteria['value'])) {
+                    continue;
+                }
+                if ($name == 'special__seats') {
+                    if ($criteria['value'][0] || $criteria['value'][1]) {
+                        $properties['seats'] = $criteria['value'];
+                    }
+                    $name = 'seats';
+                } else {
+                    $properties[$name] = $criteria['value'];
+                }
+
+                if (
+                    isset($properties[$name][0], $properties[$name][1])
+                    && $properties[$name][0] && $properties[$name][1]
+                    && $properties[$name][0] > $properties[$name][1]
+                    && $name !== 'room_category_id'
+                ) {
+                    //A range is selected, but the range start is bigger
+                    //then the range end. That's an error!
+
+                    //Resolve the property name for a "beautiful" property name:
+                    $property = ResourcePropertyDefinition::findOneBySql(
+                        'name = :name',
+                        ['name' => $name]
+                    );
+                    $property_name = $name;
+                    if ($property) {
+                        $property_name = $property->display_name;
+                    }
+
+                    PageLayout::postError(
+                        sprintf(
+                            _('Für die Eigenschaft %1$s wurde ein ungültiger Bereich angegeben (von %2$s bis %3$s)!'),
+                            htmlReady($property_name),
+                            htmlReady($properties[$name][0]),
+                            htmlReady($properties[$name][1])
+                        )
+                    );
+                    return;
+                }
+            }
+        }
+
+        $building_or_location_id = explode(
+            '_',
+            $this->selected_criteria['special__building_location']['value']
+        );
+
+        $this->location_id = null;
+        $this->building_id = null;
+
+        if ($building_or_location_id[0] == 'building') {
+            $this->building_id = $building_or_location_id[1];
+        } elseif ($building_or_location_id[0] == 'location') {
+            $this->location_id = $building_or_location_id[1];
+        } elseif($building_or_location_id[0] == 'resourcelabel') {
+            $resourcelabel = ResourceLabel::find($building_or_location_id[1]);
+            if ($resourcelabel) {
+                $sub_buildings = [];
+                foreach($resourcelabel->findChildrenByClassName('Building') as $sub_building) {
+                    $sub_buildings[] = $sub_building->id;
+                }
+                $this->building_id = $sub_buildings;
+            }
+        } elseif($building_or_location_id[0] == 'room') {
+            $this->rooms = [Room::find($building_or_location_id[1])];
+            return;
+        }
+
+        //The time intervals have to be calculated by the selected time range
+        //and the selected day of week.
+        //The selected semester is represented by the selected time range
+        //since its begin and end date are set on the client side in
+        //the special__available_range property when a semester is selected.
+        $time_intervals = [];
+        if (!empty($this->selected_criteria['special__time_range'])) {
+            $time_range_criteria = $this->selected_criteria['special__time_range'];
+
+            //Get and check day of week:
+            if ($time_range_criteria['day_of_week']['value']) {
+                $selected_dow = $time_range_criteria['day_of_week']['value'];
+                if (($selected_dow >= 1) && ($selected_dow <= 7)) {
+
+                    //Get and check the time range:
+                    if (($time_range_criteria['range']['begin'] instanceof DateTime)
+                        && ($time_range_criteria['range']['end'] instanceof DateTime)) {
+                        //Start from the begin date and make time intervals
+                        //for the specified time on the specified day of week.
+                        $begin = clone $time_range_criteria['range']['begin'];
+                        $begin_dow = $begin->format('N');
+                        if ($begin_dow < $selected_dow) {
+                            $diff = $selected_dow - $begin_dow;
+                            $begin = $begin->add(
+                                new DateInterval(
+                                    'P' . $diff . 'D'
+                                )
+                            );
+                        } elseif ($begin_dow > $selected_dow) {
+                            $diff = $begin_dow - $selected_dow;
+                            $begin = $begin->sub(
+                                new DateInterval(
+                                    'P' . $diff . 'D'
+                                )
+                            );
+                        }
+                        $end = clone $time_range_criteria['range']['end'];
+                        $current_begin = clone $begin;
+                        do {
+                            $current_end = clone $current_begin;
+                            $current_end->setTime(
+                                intval($end->format('H')),
+                                intval($end->format('i')),
+                                intval($end->format('s'))
+                            );
+                            $time_intervals[] = [
+                                'begin' => clone $current_begin,
+                                'end' => clone $current_end
+                            ];
+                            $current_begin = $current_begin->add(
+                                new DateInterval('P1W')
+                            );
+                        } while ($current_begin < $end);
+                    } else {
+                        //Get the next occurrence of the specified day of week.
+                        $begin = new DateTime();
+                        $begin_dow = $begin->format('N');
+                        if ($begin_dow < $selected_dow) {
+                            $diff = $selected_dow - $begin_dow;
+                            $begin = $begin->add(
+                                new DateInterval(
+                                    'P' . $diff . 'D'
+                                )
+                            );
+                        } elseif ($begin_dow > $selected_dow) {
+                            $diff = $begin_dow - $selected_dow;
+                            $begin = $begin->sub(
+                                new DateInterval(
+                                    'P' . $diff . 'D'
+                                )
+                            );
+                        }
+                        $begin->setTime(0,0);
+                        $end = clone $begin;
+                        $end = $end->add(
+                            new DateInterval('P1D')
+                        )->sub(
+                            new DateInterval('PT1S')
+                        );
+
+                        $time_intervals[] = [
+                            'begin' => $begin,
+                            'end' => $end
+                        ];
+                    }
+                }
+            } elseif ($time_range_criteria['range']) {
+                //A time range without a day of week is specified.
+                $time_intervals[] = $time_range_criteria['range'];
+            }
+        }
+
+        try {
+            $this->rooms = RoomManager::findRooms(
+                $this->selected_criteria['special__room_name']['value'],
+                $this->location_id,
+                $this->building_id,
+                $properties,
+                $time_intervals,
+                'name ASC, mkdate ASC',
+                false
+            );
+        } catch (\InvalidArgumentException $e) {
+            PageLayout::postError($e->getMessage());
+        }
+    }
+
+    public function resetSearch()
+    {
+        $this->selected_criteria = [];
+        $_SESSION['room_search_criteria']['room_search'] = [];
+    }
+
+    public function __construct($action_link = '')
+    {
+        parent::__construct();
+
+        $this->template = 'sidebar/room-search-widget';
+
+        if ($action_link) {
+            $this->action_link = $action_link;
+        }
+
+        $this->setupSearchParameters();
+        if ($this->searchRequested()) {
+            $this->handleSearchRequest();
+        } elseif ($this->searchResetRequested()) {
+            $this->resetSearch();
+        } else {
+            $this->restoreSearchFromSession();
+        }
+
+        if ($this->selected_criteria) {
+            $this->search();
+        }
+    }
+
+    public function searchRequested()
+    {
+        return Request::submitted('room_search');
+    }
+
+    public function searchResetRequested()
+    {
+        return Request::submitted('room_search_reset');
+    }
+
+    public function getResults()
+    {
+        return $this->rooms;
+    }
+
+    public function setActionLink($action_link = '')
+    {
+        if (!$action_link) {
+            return;
+        }
+
+        $this->action_link = $action_link;
+    }
+
+    public function getActionLink()
+    {
+        return $this->action_link;
+    }
+
+    public function getSelectedCriteria()
+    {
+        return $this->selected_criteria;
+    }
+
+    public function render($variables = [])
+    {
+        $variables = array_merge($variables, [
+            'title'             => _('Suchkriterien für Räume'),
+            'criteria'          => $this->criteria,
+            'selected_criteria' => $this->selected_criteria,
+            'action_link'       => $this->action_link,
+            'semesters'         => $this->semesters
+        ]);
+
+        return $GLOBALS['template_factory']->render(
+            $this->template,
+            $variables,
+            'widgets/widget-layout'
+        );
+    }
+}
diff --git a/lib/cronjobs/check_admission.class.php b/lib/cronjobs/check_admission.class.php
deleted file mode 100644
index dfd493c..0000000
--- a/lib/cronjobs/check_admission.class.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
-
-/**
-* check_admission.class.php
-*
-* @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
-* @access public
-* @since  2.4
-*/
-
-class CheckAdmissionJob extends CronJob
-{
-    public static function getName()
-    {
-        return _('Losverfahren überprüfen');
-    }
-
-    public static function getDescription()
-    {
-        return _('Überprüft, ob Losverfahren anstehen und führt diese aus');
-    }
-
-    public static function getParameters()
-    {
-        return [
-            'verbose' => [
-                'type'        => 'boolean',
-                'default'     => false,
-                'status'      => 'optional',
-                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
-            ],
-            'send_messages' => [
-                'type'        => 'boolean',
-                'default'     => true,
-                'status'      => 'optional',
-                'description' => _('Sollen interne Nachrichten an alle betroffenen Nutzer gesendet werden)'),
-            ],
-            'send_applications_to_owner' => [
-                'type'        => 'boolean',
-                'default'     => false,
-                'status'      => 'optional',
-                'description' => _('Die Liste mit Anmeldungen an die Person senden, der das Anmeldeset gehört.')
-            ]
-        ];
-    }
-
-    public function setUp()
-    {
-        require_once 'lib/classes/admission/CourseSet.class.php';
-        if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
-            throw new Exception('To use check_admission job you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
-        }
-    }
-
-    public function execute($last_result, $parameters = [])
-    {
-        $verbose = $parameters['verbose'];
-
-        $query = "SELECT DISTINCT cr.set_id
-                  FROM courseset_rule AS cr
-                  INNER JOIN coursesets USING(set_id)
-                  WHERE type = 'ParticipantRestrictedAdmission'
-                    AND algorithm_run = 0";
-        $sets = DBManager::get()->fetchFirst($query);
-        if (count($sets) > 0) {
-            if ($verbose) {
-                echo date('r') . ' - Starting seat distribution ' . chr(10);
-
-                $oldLogger = Log::getInstance();
-                $logdir = $GLOBALS['TMP_PATH'] . '/seat_distribution_logs';
-                @mkdir($logdir);
-                $logfile = $logdir . '/' .  date('Y-m-d-H-i') . '_seat_distribution.log';
-
-                if (is_dir($logdir)) {
-                    Log::setInstance(
-                        new Logger('seat-distributions', [new StreamHandler($logfile, Logger::DEBUG)])
-                    );
-                    echo 'logging to ' . $logfile . chr(10);
-                } else {
-                    echo 'could not create directory ' . $logdir . chr(10);
-                }
-            }
-            $i = 0;
-            foreach ($sets as $set_id) {
-                $courseset = new CourseSet($set_id);
-                if ($courseset->isSeatDistributionEnabled() && !$courseset->hasAlgorithmRun() && $courseset->getSeatDistributionTime() < time()) {
-                    if ($verbose) {
-                        echo ++$i . ' ' . $courseset->getId() . ' : ' . $courseset->getName() . chr(10);
-                        $applicants = AdmissionPriority::getPriorities($set_id);
-                        $courses = SimpleCollection::createFromArray(Course::findMany($courseset->getCourses()))->toGroupedArray('seminar_id', words('name veranstaltungsnummer'));
-                        $captions = [_("Nachname"), _("Vorname"), _("Nutzername"),_('Nutzer-ID'), _('Veranstaltung-ID'), _("Veranstaltung"), _("Nummer"), _("Priorität")];
-                        $data = [];
-                        $users = User::findEachMany(function($user) use ($courses,$applicants,&$data) {
-                            $app_courses = $applicants[$user->id];
-                            asort($app_courses);
-                            foreach ($app_courses as $course_id => $prio) {
-                                $row = [];
-                                $row[] = $user->nachname;
-                                $row[] = $user->vorname;
-                                $row[] = $user->username;
-                                $row[] = $user->id;
-                                $row[] = $course_id;
-                                $row[] = $courses[$course_id]['name'];
-                                $row[] = $courses[$course_id]['veranstaltungsnummer'];
-                                $row[] = $prio;
-                                $data[] = $row;
-                            }
-                        }, array_keys($applicants), 'ORDER BY Nachname,Vorname');
-                        $applicants_file = $GLOBALS['TMP_PATH'] . '/seat_distribution_logs/applicants_' . $set_id . '.csv';
-                        if (array_to_csv($data, $applicants_file, $captions)) {
-                            echo 'applicants written to ' . $applicants_file . chr(10);
-                            if ($parameters['send_applications_to_owner']) {
-                                //Send a mail to the owner of the course set:
-                                $owner = User::find($courseset->getUserId());
-                                if ($owner) {
-                                    setTempLanguage($owner->id);
-                                    $mail = new StudipMail();
-                                    $mail->addRecipient($owner->email)
-                                        ->setSubject(
-                                            sprintf(_('Das Stud.IP Anmeldeset %s wird gelost'), $courseset->getName()))
-                                        ->setBodyText(sprintf(
-                                            _('Ihr Anmeldeset %s wird jetzt gelost. Im Anhang finden Sie die Liste der Anmeldungen.'),
-                                            $courseset->getName()
-                                        ))
-                                        ->addFileAttachment($applicants_file)
-                                        ->send();
-                                    restoreLanguage();
-                                }
-                            }
-                        }
-                    }
-                    $courseset->distributeSeats();
-                }
-            }
-            if ($verbose) {
-                Log::setInstance($oldLogger);
-            }
-        } else {
-            if ($verbose) {
-                echo date('r') . ' - Nothing to do' . chr(10);
-            }
-        }
-    }
-}
diff --git a/lib/cronjobs/check_admission.php b/lib/cronjobs/check_admission.php
new file mode 100644
index 0000000..dfd493c
--- /dev/null
+++ b/lib/cronjobs/check_admission.php
@@ -0,0 +1,147 @@
+<?php
+
+use Monolog\Logger;
+use Monolog\Handler\StreamHandler;
+
+/**
+* check_admission.class.php
+*
+* @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+* @access public
+* @since  2.4
+*/
+
+class CheckAdmissionJob extends CronJob
+{
+    public static function getName()
+    {
+        return _('Losverfahren überprüfen');
+    }
+
+    public static function getDescription()
+    {
+        return _('Überprüft, ob Losverfahren anstehen und führt diese aus');
+    }
+
+    public static function getParameters()
+    {
+        return [
+            'verbose' => [
+                'type'        => 'boolean',
+                'default'     => false,
+                'status'      => 'optional',
+                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
+            ],
+            'send_messages' => [
+                'type'        => 'boolean',
+                'default'     => true,
+                'status'      => 'optional',
+                'description' => _('Sollen interne Nachrichten an alle betroffenen Nutzer gesendet werden)'),
+            ],
+            'send_applications_to_owner' => [
+                'type'        => 'boolean',
+                'default'     => false,
+                'status'      => 'optional',
+                'description' => _('Die Liste mit Anmeldungen an die Person senden, der das Anmeldeset gehört.')
+            ]
+        ];
+    }
+
+    public function setUp()
+    {
+        require_once 'lib/classes/admission/CourseSet.class.php';
+        if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
+            throw new Exception('To use check_admission job you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
+        }
+    }
+
+    public function execute($last_result, $parameters = [])
+    {
+        $verbose = $parameters['verbose'];
+
+        $query = "SELECT DISTINCT cr.set_id
+                  FROM courseset_rule AS cr
+                  INNER JOIN coursesets USING(set_id)
+                  WHERE type = 'ParticipantRestrictedAdmission'
+                    AND algorithm_run = 0";
+        $sets = DBManager::get()->fetchFirst($query);
+        if (count($sets) > 0) {
+            if ($verbose) {
+                echo date('r') . ' - Starting seat distribution ' . chr(10);
+
+                $oldLogger = Log::getInstance();
+                $logdir = $GLOBALS['TMP_PATH'] . '/seat_distribution_logs';
+                @mkdir($logdir);
+                $logfile = $logdir . '/' .  date('Y-m-d-H-i') . '_seat_distribution.log';
+
+                if (is_dir($logdir)) {
+                    Log::setInstance(
+                        new Logger('seat-distributions', [new StreamHandler($logfile, Logger::DEBUG)])
+                    );
+                    echo 'logging to ' . $logfile . chr(10);
+                } else {
+                    echo 'could not create directory ' . $logdir . chr(10);
+                }
+            }
+            $i = 0;
+            foreach ($sets as $set_id) {
+                $courseset = new CourseSet($set_id);
+                if ($courseset->isSeatDistributionEnabled() && !$courseset->hasAlgorithmRun() && $courseset->getSeatDistributionTime() < time()) {
+                    if ($verbose) {
+                        echo ++$i . ' ' . $courseset->getId() . ' : ' . $courseset->getName() . chr(10);
+                        $applicants = AdmissionPriority::getPriorities($set_id);
+                        $courses = SimpleCollection::createFromArray(Course::findMany($courseset->getCourses()))->toGroupedArray('seminar_id', words('name veranstaltungsnummer'));
+                        $captions = [_("Nachname"), _("Vorname"), _("Nutzername"),_('Nutzer-ID'), _('Veranstaltung-ID'), _("Veranstaltung"), _("Nummer"), _("Priorität")];
+                        $data = [];
+                        $users = User::findEachMany(function($user) use ($courses,$applicants,&$data) {
+                            $app_courses = $applicants[$user->id];
+                            asort($app_courses);
+                            foreach ($app_courses as $course_id => $prio) {
+                                $row = [];
+                                $row[] = $user->nachname;
+                                $row[] = $user->vorname;
+                                $row[] = $user->username;
+                                $row[] = $user->id;
+                                $row[] = $course_id;
+                                $row[] = $courses[$course_id]['name'];
+                                $row[] = $courses[$course_id]['veranstaltungsnummer'];
+                                $row[] = $prio;
+                                $data[] = $row;
+                            }
+                        }, array_keys($applicants), 'ORDER BY Nachname,Vorname');
+                        $applicants_file = $GLOBALS['TMP_PATH'] . '/seat_distribution_logs/applicants_' . $set_id . '.csv';
+                        if (array_to_csv($data, $applicants_file, $captions)) {
+                            echo 'applicants written to ' . $applicants_file . chr(10);
+                            if ($parameters['send_applications_to_owner']) {
+                                //Send a mail to the owner of the course set:
+                                $owner = User::find($courseset->getUserId());
+                                if ($owner) {
+                                    setTempLanguage($owner->id);
+                                    $mail = new StudipMail();
+                                    $mail->addRecipient($owner->email)
+                                        ->setSubject(
+                                            sprintf(_('Das Stud.IP Anmeldeset %s wird gelost'), $courseset->getName()))
+                                        ->setBodyText(sprintf(
+                                            _('Ihr Anmeldeset %s wird jetzt gelost. Im Anhang finden Sie die Liste der Anmeldungen.'),
+                                            $courseset->getName()
+                                        ))
+                                        ->addFileAttachment($applicants_file)
+                                        ->send();
+                                    restoreLanguage();
+                                }
+                            }
+                        }
+                    }
+                    $courseset->distributeSeats();
+                }
+            }
+            if ($verbose) {
+                Log::setInstance($oldLogger);
+            }
+        } else {
+            if ($verbose) {
+                echo date('r') . ' - Nothing to do' . chr(10);
+            }
+        }
+    }
+}
diff --git a/lib/cronjobs/cleanup_log.class.php b/lib/cronjobs/cleanup_log.class.php
deleted file mode 100644
index 378a6ec..0000000
--- a/lib/cronjobs/cleanup_log.class.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * cleanup_log.php - Clean up event and cronjob logs
- *
- * @author Tobias Thelen <tobias.thelen@uni-osnabrueck.de>
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @access public
- * @since  2.4
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// cleanup_log.class.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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 'lib/classes/CronJob.class.php';
-
-class CleanupLogJob extends CronJob
-{
-    /**
-     * Returns the name of the cronjob.
-     */
-    public static function getName()
-    {
-        return _('Logs aufräumen');
-    }
-
-    /**
-     * Returns the description of the cronjob.
-     */
-    public static function getDescription()
-    {
-        return _('Entfernt abgelaufene Log-Einträge sowohl für das '
-                .'Eventsystem als auch für die Cronjobs');
-    }
-
-    /**
-     * Return the paremeters for this cronjob.
-     *
-     * @return Array Parameters.
-     */
-    public static function getParameters()
-    {
-        return [
-            'cronjobs' => [
-                'type'        => 'boolean',
-                'default'     => true,
-                'status'      => 'optional',
-                'description' => _('Sollen die Logeinträge für Cronjobs auch gelöscht werden'),
-            ],
-            'cronjobs-success' => [
-                'type'        => 'integer',
-                'default'     => 7,
-                'status'      => 'optional',
-                'description' => _('Nach wievielen Tagen sollen Logeinträge für '
-                                  .'erfolgreiche Cronjobs gelöscht werden (0 für nie)'),
-            ],
-            'cronjobs-error' => [
-                'type'        => 'integer',
-                'default'     => 28,
-                'status'      => 'optional',
-                'description' => _('Nach wievielen Tagen sollen Logeinträge für '
-                                  .'fehlgeschlagene Cronjobs gelöscht werden (0 für nie)'),
-            ],
-        ];
-    }
-
-    /**
-     * Executes the cronjob.
-     *
-     * @param mixed $last_result What the last execution of this cronjob
-     *                           returned.
-     * @param Array $parameters Parameters for this cronjob instance which
-     *                          were defined during scheduling.
-     */
-    public function execute($last_result, $parameters = [])
-    {
-        $event_log = new EventLog();
-        $event_log->cleanup_log_events();
-
-        if (!empty($parameters['cronjobs'])) {
-            $delete = function($l) {$l->delete();};
-            if ($parameters['cronjobs-error'] > 0) {
-                CronjobLog::findEachBySql(
-                    $delete,
-                    "exception IS NOT NULL AND executed + ? < UNIX_TIMESTAMP()",
-                    [$parameters['cronjobs-error'] * 24 * 60 * 60]
-                );
-            }
-            if ($parameters['cronjobs-success'] > 0) {
-                CronjobLog::findEachBySql(
-                    $delete,
-                    "exception IS NULL AND executed + ? < UNIX_TIMESTAMP()",
-                    [$parameters['cronjobs-success'] * 24 * 60 * 60]
-                );
-            }
-        }
-    }
-}
diff --git a/lib/cronjobs/cleanup_log.php b/lib/cronjobs/cleanup_log.php
new file mode 100644
index 0000000..378a6ec
--- /dev/null
+++ b/lib/cronjobs/cleanup_log.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * cleanup_log.php - Clean up event and cronjob logs
+ *
+ * @author Tobias Thelen <tobias.thelen@uni-osnabrueck.de>
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @access public
+ * @since  2.4
+ */
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// cleanup_log.class.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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 'lib/classes/CronJob.class.php';
+
+class CleanupLogJob extends CronJob
+{
+    /**
+     * Returns the name of the cronjob.
+     */
+    public static function getName()
+    {
+        return _('Logs aufräumen');
+    }
+
+    /**
+     * Returns the description of the cronjob.
+     */
+    public static function getDescription()
+    {
+        return _('Entfernt abgelaufene Log-Einträge sowohl für das '
+                .'Eventsystem als auch für die Cronjobs');
+    }
+
+    /**
+     * Return the paremeters for this cronjob.
+     *
+     * @return Array Parameters.
+     */
+    public static function getParameters()
+    {
+        return [
+            'cronjobs' => [
+                'type'        => 'boolean',
+                'default'     => true,
+                'status'      => 'optional',
+                'description' => _('Sollen die Logeinträge für Cronjobs auch gelöscht werden'),
+            ],
+            'cronjobs-success' => [
+                'type'        => 'integer',
+                'default'     => 7,
+                'status'      => 'optional',
+                'description' => _('Nach wievielen Tagen sollen Logeinträge für '
+                                  .'erfolgreiche Cronjobs gelöscht werden (0 für nie)'),
+            ],
+            'cronjobs-error' => [
+                'type'        => 'integer',
+                'default'     => 28,
+                'status'      => 'optional',
+                'description' => _('Nach wievielen Tagen sollen Logeinträge für '
+                                  .'fehlgeschlagene Cronjobs gelöscht werden (0 für nie)'),
+            ],
+        ];
+    }
+
+    /**
+     * Executes the cronjob.
+     *
+     * @param mixed $last_result What the last execution of this cronjob
+     *                           returned.
+     * @param Array $parameters Parameters for this cronjob instance which
+     *                          were defined during scheduling.
+     */
+    public function execute($last_result, $parameters = [])
+    {
+        $event_log = new EventLog();
+        $event_log->cleanup_log_events();
+
+        if (!empty($parameters['cronjobs'])) {
+            $delete = function($l) {$l->delete();};
+            if ($parameters['cronjobs-error'] > 0) {
+                CronjobLog::findEachBySql(
+                    $delete,
+                    "exception IS NOT NULL AND executed + ? < UNIX_TIMESTAMP()",
+                    [$parameters['cronjobs-error'] * 24 * 60 * 60]
+                );
+            }
+            if ($parameters['cronjobs-success'] > 0) {
+                CronjobLog::findEachBySql(
+                    $delete,
+                    "exception IS NULL AND executed + ? < UNIX_TIMESTAMP()",
+                    [$parameters['cronjobs-success'] * 24 * 60 * 60]
+                );
+            }
+        }
+    }
+}
diff --git a/lib/cronjobs/garbage_collector.class.php b/lib/cronjobs/garbage_collector.class.php
deleted file mode 100644
index bab44b2..0000000
--- a/lib/cronjobs/garbage_collector.class.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
-* garbage_collector.class.php
-*
-* @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
-* @access public
-* @since  2.4
-*/
-require_once 'lib/classes/CronJob.class.php';
-
-class GarbageCollectorJob extends CronJob
-{
-
-    public static function getName()
-    {
-        return _('Datenbank bereinigen');
-    }
-
-    public static function getDescription()
-    {
-        return _('Entfernt endgültig gelöschte Nachrichten, nicht zugehörige Dateianhänge, abgelaufene Ankündigungen, '
-               . 'alte Aktivitäten, veraltete Plugin-Assets sowie veraltete OAuth-Servernonces und abgelaufene '
-               . 'Terminblöcke');
-    }
-
-    public static function getParameters()
-    {
-        return [
-            'verbose' => [
-                'type'        => 'boolean',
-                'default'     => false,
-                'status'      => 'optional',
-                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
-            ],
-            'news_deletion_days' => [
-                'type'        => 'integer',
-                'default'     => 365,
-                'status'      => 'optional',
-                'description' => _('(Ankündigungen): Nach wie vielen Tagen sollen die abgelaufenen '
-                                 .'Ankündigungen gelöscht werden (0 für Zeitpunkt des Ablaufdatums, Default: 365 Tage)?'),
-            ],
-            'message_deletion_days' => [
-                'type'        => 'integer',
-                'default'     => 30,
-                'status'      => 'optional',
-                'description' => _('(Systemnachrichten): Nach wie vielen Tagen sollen die '
-                                 .'Systemnachrichten gelöscht werden (0 für sofort, Default: 30 Tage)?'),
-            ],
-        ];
-    }
-
-    public function execute($last_result, $parameters = [])
-    {
-        $db = DBManager::get();
-
-        if ($parameters['verbose']) {
-            $message_count_before = DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `message`");
-        }
-
-        // delete outdated news
-        if (Config::get()->NEWS_DISABLE_GARBAGE_COLLECT) {
-            $news_deletion_days = false;
-        } else {
-            $news_deletion_days = $parameters['news_deletion_days'] * 86400;
-        }
-        $deleted_news = StudipNews::DoGarbageCollect($news_deletion_days);
-
-        // delete messages
-        $query = "DELETE `message`, `message_user`, `message_tags`
-                  FROM `message`
-                  RIGHT JOIN (
-                      SELECT `message_id`
-                      FROM `message_user`
-                      GROUP BY `message_id`
-                      HAVING COUNT(`message_id`) = SUM(`deleted`)
-                  ) AS tmp USING (`message_id`)
-                  LEFT JOIN `message_user` USING (`message_id`)
-                  LEFT JOIN `message_tags` USING (`message_id`)";
-        DBManager::get()->execute($query);
-
-        // delete system messages
-        $query = "DELETE `message`, `message_user`, `message_tags`
-                  FROM `message`
-                  LEFT JOIN `message_user` USING (`message_id`)
-                  LEFT JOIN `message_tags` USING (`message_id`)
-                  WHERE `autor_id` = '____%system%____'
-                    AND DATE(FROM_UNIXTIME(`message`.`mkdate`)) + INTERVAL :days DAY < DATE(NOW())";
-        DBManager::get()->execute($query, [
-            ':days' => $parameters['message_deletion_days'],
-        ]);
-
-        // Remove outdated opengraph urls
-        $query = "DELETE FROM `opengraphdata`
-                  WHERE `last_update` < UNIX_TIMESTAMP(NOW() - INTERVAL 1 WEEK)";
-        DBManager::get()->exec($query);
-
-        //delete old attachments of non-sent and deleted messages:
-        //A folder is old and not attached to a message when it has the
-        //range type 'message', belongs to the folder type 'MessageFolder',
-        //is older than 2 hours and has a range-ID that doesn't exist
-        //in the "message" table.
-        $unsent_attachment_folders = Folder::deleteBySql(
-            "folder_type = 'MessageFolder'
-            AND
-            range_type = 'message'
-            AND
-            chdate < UNIX_TIMESTAMP(DATE_ADD(NOW(),INTERVAL -2 HOUR))
-            AND
-            range_id NOT IN (
-                SELECT message_id FROM message
-            )"
-        );
-
-        //delete old attachments of non-stored and deleted mvv objects:
-        //A folder is old and not attached to a mvv object when it has a mvv
-        //range type, belongs to the folder type 'MVVFolder',
-        //is older than 2 hours and has a range-ID that doesn't exist.
-        $unsent_mvv_folders = Folder::deleteBySql(
-            "LEFT JOIN `file_refs` ON (`file_refs`.`folder_id` = `folders`.`id`)
-            LEFT JOIN `mvv_files_filerefs` ON (`file_refs`.`id` = `mvv_files_filerefs`.`fileref_id`)
-            LEFT JOIN `mvv_files_ranges` USING (`mvvfile_id`)
-            WHERE `folders`.`folder_type` = 'MVVFolder'
-            AND `folders`.`chdate` < UNIX_TIMESTAMP(DATE_ADD(NOW(),INTERVAL -2 HOUR))
-            AND ((`mvv_files_ranges`.`range_type` = 'Studiengang' AND `mvv_files_ranges`.`range_id` NOT IN ( SELECT `studiengang_id` FROM `mvv_studiengang`))
-            OR (`mvv_files_ranges`.`range_type` = 'AbschlussKategorie' AND `mvv_files_ranges`.`range_id` NOT IN ( SELECT `kategorie_id` FROM `mvv_abschl_kategorie`))
-            OR (`mvv_files_ranges`.`range_type` = 'StgteilVersion' AND `mvv_files_ranges`.`range_id` NOT IN ( SELECT `version_id` FROM `mvv_stgteilversion`)))"
-        );
-        if ($unsent_mvv_folders) {
-            $db->exec("DELETE FROM mvv_files_filerefs WHERE fileref_id NOT IN (SELECT id FROM file_refs)");
-            $db->exec("DELETE FROM mvv_files WHERE mvvfile_id NOT IN (SELECT mvvfile_id FROM mvv_files_filerefs)");
-            $db->exec("DELETE FROM mvv_files_ranges WHERE mvvfile_id NOT IN (SELECT mvvfile_id FROM mvv_files)");
-        }
-
-        if ($parameters['verbose']) {
-            $message_count_after = DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `message`");
-
-            printf(_("Gelöschte Ankündigungen: %u") . "\n", (int)$deleted_news);
-            printf(_("Gelöschte Nachrichten: %u") . "\n", $message_count_before - $message_count_after);
-            printf(_("Gelöschte Dateianhänge: %u") . "\n", $unsent_attachment_folders);
-            printf(_("Gelöschte MVV-Dateien: %u") . "\n", $unsent_mvv_folders);
-        }
-
-        Token::deleteBySQL('expiration < UNIX_TIMESTAMP()');
-        PersonalNotifications::doGarbageCollect();
-
-        Studip\Activity\Activity::doGarbageCollect();
-
-        // remove old entries from the table "object_user_visits".
-        if (Config::get()->NEW_INDICATOR_THRESHOLD) {
-            $query = "DELETE FROM `object_user_visits`
-                      WHERE GREATEST(`visitdate`, `last_visitdate`) < UNIX_TIMESTAMP(NOW() - INTERVAL :expires DAY)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':expires', (int) Config::get()->NEW_INDICATOR_THRESHOLD, PDO::PARAM_INT);
-            $statement->execute();
-        }
-
-        // Remove outdated entries from forum_visits
-        $query = "DELETE FROM `forum_visits`
-                  WHERE GREATEST(`visitdate`, `last_visitdate`) < UNIX_TIMESTAMP() - :threshold";
-        DBManager::get()->execute($query, [
-            ':threshold' => ForumVisit::LAST_VISIT_MAX,
-        ]);
-
-        // clean db cache
-        $cache = new Studip\Cache\DbCache();
-        $cache->purge();
-
-        // Remove old plugin assets
-        PluginAsset::deleteBySQL('chdate < ?', [time() - PluginAsset::CACHE_DURATION]);
-
-        // Remove expired oauth server nonces
-        $query = "DELETE FROM `oauth_server_nonce`
-                  WHERE `osn_timestamp` < UNIX_TIMESTAMP(NOW() - INTERVAL 6 HOUR)";
-        $removed = DBManager::get()->exec($query);
-
-        if ($removed > 0 && $parameters['verbose']) {
-            printf(_('Gelöschte Server-Nonces: %u') . "\n", (int)$removed);
-        }
-
-        // Remove expired consultation slots
-        $condition = "LEFT JOIN `consultation_slots` USING (`block_id`)
-                      JOIN `config_values`
-                        ON `config_values`.`range_id` = `consultation_blocks`.`range_id`
-                           AND `field` = 'CONSULTATION_GARBAGE_COLLECT'
-                           AND `value` = '1'
-                      GROUP BY `block_id`
-                      HAVING COUNT(`slot_id`) = SUM(`end_time` < UNIX_TIMESTAMP())";
-        $removed = ConsultationBlock::deleteBySQL($condition);
-        if ($removed > 0 && $parameters['verbose']) {
-            printf(_('Gelöschte Terminblöcke: %u') . "\n", $removed);
-        }
-
-        // Remove expired tfa tokens
-        TFAToken::deleteBySQL(
-            'mkdate < UNIX_TIMESTAMP() - ?',
-            [TFASecret::getGreatestValidityDuration()]
-        );
-
-        // Remove expired solved captcha challenges
-        CaptchaChallenge::gc();
-    }
-}
diff --git a/lib/cronjobs/garbage_collector.php b/lib/cronjobs/garbage_collector.php
new file mode 100644
index 0000000..bab44b2
--- /dev/null
+++ b/lib/cronjobs/garbage_collector.php
@@ -0,0 +1,202 @@
+<?php
+/**
+* garbage_collector.class.php
+*
+* @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+* @access public
+* @since  2.4
+*/
+require_once 'lib/classes/CronJob.class.php';
+
+class GarbageCollectorJob extends CronJob
+{
+
+    public static function getName()
+    {
+        return _('Datenbank bereinigen');
+    }
+
+    public static function getDescription()
+    {
+        return _('Entfernt endgültig gelöschte Nachrichten, nicht zugehörige Dateianhänge, abgelaufene Ankündigungen, '
+               . 'alte Aktivitäten, veraltete Plugin-Assets sowie veraltete OAuth-Servernonces und abgelaufene '
+               . 'Terminblöcke');
+    }
+
+    public static function getParameters()
+    {
+        return [
+            'verbose' => [
+                'type'        => 'boolean',
+                'default'     => false,
+                'status'      => 'optional',
+                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
+            ],
+            'news_deletion_days' => [
+                'type'        => 'integer',
+                'default'     => 365,
+                'status'      => 'optional',
+                'description' => _('(Ankündigungen): Nach wie vielen Tagen sollen die abgelaufenen '
+                                 .'Ankündigungen gelöscht werden (0 für Zeitpunkt des Ablaufdatums, Default: 365 Tage)?'),
+            ],
+            'message_deletion_days' => [
+                'type'        => 'integer',
+                'default'     => 30,
+                'status'      => 'optional',
+                'description' => _('(Systemnachrichten): Nach wie vielen Tagen sollen die '
+                                 .'Systemnachrichten gelöscht werden (0 für sofort, Default: 30 Tage)?'),
+            ],
+        ];
+    }
+
+    public function execute($last_result, $parameters = [])
+    {
+        $db = DBManager::get();
+
+        if ($parameters['verbose']) {
+            $message_count_before = DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `message`");
+        }
+
+        // delete outdated news
+        if (Config::get()->NEWS_DISABLE_GARBAGE_COLLECT) {
+            $news_deletion_days = false;
+        } else {
+            $news_deletion_days = $parameters['news_deletion_days'] * 86400;
+        }
+        $deleted_news = StudipNews::DoGarbageCollect($news_deletion_days);
+
+        // delete messages
+        $query = "DELETE `message`, `message_user`, `message_tags`
+                  FROM `message`
+                  RIGHT JOIN (
+                      SELECT `message_id`
+                      FROM `message_user`
+                      GROUP BY `message_id`
+                      HAVING COUNT(`message_id`) = SUM(`deleted`)
+                  ) AS tmp USING (`message_id`)
+                  LEFT JOIN `message_user` USING (`message_id`)
+                  LEFT JOIN `message_tags` USING (`message_id`)";
+        DBManager::get()->execute($query);
+
+        // delete system messages
+        $query = "DELETE `message`, `message_user`, `message_tags`
+                  FROM `message`
+                  LEFT JOIN `message_user` USING (`message_id`)
+                  LEFT JOIN `message_tags` USING (`message_id`)
+                  WHERE `autor_id` = '____%system%____'
+                    AND DATE(FROM_UNIXTIME(`message`.`mkdate`)) + INTERVAL :days DAY < DATE(NOW())";
+        DBManager::get()->execute($query, [
+            ':days' => $parameters['message_deletion_days'],
+        ]);
+
+        // Remove outdated opengraph urls
+        $query = "DELETE FROM `opengraphdata`
+                  WHERE `last_update` < UNIX_TIMESTAMP(NOW() - INTERVAL 1 WEEK)";
+        DBManager::get()->exec($query);
+
+        //delete old attachments of non-sent and deleted messages:
+        //A folder is old and not attached to a message when it has the
+        //range type 'message', belongs to the folder type 'MessageFolder',
+        //is older than 2 hours and has a range-ID that doesn't exist
+        //in the "message" table.
+        $unsent_attachment_folders = Folder::deleteBySql(
+            "folder_type = 'MessageFolder'
+            AND
+            range_type = 'message'
+            AND
+            chdate < UNIX_TIMESTAMP(DATE_ADD(NOW(),INTERVAL -2 HOUR))
+            AND
+            range_id NOT IN (
+                SELECT message_id FROM message
+            )"
+        );
+
+        //delete old attachments of non-stored and deleted mvv objects:
+        //A folder is old and not attached to a mvv object when it has a mvv
+        //range type, belongs to the folder type 'MVVFolder',
+        //is older than 2 hours and has a range-ID that doesn't exist.
+        $unsent_mvv_folders = Folder::deleteBySql(
+            "LEFT JOIN `file_refs` ON (`file_refs`.`folder_id` = `folders`.`id`)
+            LEFT JOIN `mvv_files_filerefs` ON (`file_refs`.`id` = `mvv_files_filerefs`.`fileref_id`)
+            LEFT JOIN `mvv_files_ranges` USING (`mvvfile_id`)
+            WHERE `folders`.`folder_type` = 'MVVFolder'
+            AND `folders`.`chdate` < UNIX_TIMESTAMP(DATE_ADD(NOW(),INTERVAL -2 HOUR))
+            AND ((`mvv_files_ranges`.`range_type` = 'Studiengang' AND `mvv_files_ranges`.`range_id` NOT IN ( SELECT `studiengang_id` FROM `mvv_studiengang`))
+            OR (`mvv_files_ranges`.`range_type` = 'AbschlussKategorie' AND `mvv_files_ranges`.`range_id` NOT IN ( SELECT `kategorie_id` FROM `mvv_abschl_kategorie`))
+            OR (`mvv_files_ranges`.`range_type` = 'StgteilVersion' AND `mvv_files_ranges`.`range_id` NOT IN ( SELECT `version_id` FROM `mvv_stgteilversion`)))"
+        );
+        if ($unsent_mvv_folders) {
+            $db->exec("DELETE FROM mvv_files_filerefs WHERE fileref_id NOT IN (SELECT id FROM file_refs)");
+            $db->exec("DELETE FROM mvv_files WHERE mvvfile_id NOT IN (SELECT mvvfile_id FROM mvv_files_filerefs)");
+            $db->exec("DELETE FROM mvv_files_ranges WHERE mvvfile_id NOT IN (SELECT mvvfile_id FROM mvv_files)");
+        }
+
+        if ($parameters['verbose']) {
+            $message_count_after = DBManager::get()->fetchColumn("SELECT COUNT(*) FROM `message`");
+
+            printf(_("Gelöschte Ankündigungen: %u") . "\n", (int)$deleted_news);
+            printf(_("Gelöschte Nachrichten: %u") . "\n", $message_count_before - $message_count_after);
+            printf(_("Gelöschte Dateianhänge: %u") . "\n", $unsent_attachment_folders);
+            printf(_("Gelöschte MVV-Dateien: %u") . "\n", $unsent_mvv_folders);
+        }
+
+        Token::deleteBySQL('expiration < UNIX_TIMESTAMP()');
+        PersonalNotifications::doGarbageCollect();
+
+        Studip\Activity\Activity::doGarbageCollect();
+
+        // remove old entries from the table "object_user_visits".
+        if (Config::get()->NEW_INDICATOR_THRESHOLD) {
+            $query = "DELETE FROM `object_user_visits`
+                      WHERE GREATEST(`visitdate`, `last_visitdate`) < UNIX_TIMESTAMP(NOW() - INTERVAL :expires DAY)";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':expires', (int) Config::get()->NEW_INDICATOR_THRESHOLD, PDO::PARAM_INT);
+            $statement->execute();
+        }
+
+        // Remove outdated entries from forum_visits
+        $query = "DELETE FROM `forum_visits`
+                  WHERE GREATEST(`visitdate`, `last_visitdate`) < UNIX_TIMESTAMP() - :threshold";
+        DBManager::get()->execute($query, [
+            ':threshold' => ForumVisit::LAST_VISIT_MAX,
+        ]);
+
+        // clean db cache
+        $cache = new Studip\Cache\DbCache();
+        $cache->purge();
+
+        // Remove old plugin assets
+        PluginAsset::deleteBySQL('chdate < ?', [time() - PluginAsset::CACHE_DURATION]);
+
+        // Remove expired oauth server nonces
+        $query = "DELETE FROM `oauth_server_nonce`
+                  WHERE `osn_timestamp` < UNIX_TIMESTAMP(NOW() - INTERVAL 6 HOUR)";
+        $removed = DBManager::get()->exec($query);
+
+        if ($removed > 0 && $parameters['verbose']) {
+            printf(_('Gelöschte Server-Nonces: %u') . "\n", (int)$removed);
+        }
+
+        // Remove expired consultation slots
+        $condition = "LEFT JOIN `consultation_slots` USING (`block_id`)
+                      JOIN `config_values`
+                        ON `config_values`.`range_id` = `consultation_blocks`.`range_id`
+                           AND `field` = 'CONSULTATION_GARBAGE_COLLECT'
+                           AND `value` = '1'
+                      GROUP BY `block_id`
+                      HAVING COUNT(`slot_id`) = SUM(`end_time` < UNIX_TIMESTAMP())";
+        $removed = ConsultationBlock::deleteBySQL($condition);
+        if ($removed > 0 && $parameters['verbose']) {
+            printf(_('Gelöschte Terminblöcke: %u') . "\n", $removed);
+        }
+
+        // Remove expired tfa tokens
+        TFAToken::deleteBySQL(
+            'mkdate < UNIX_TIMESTAMP() - ?',
+            [TFASecret::getGreatestValidityDuration()]
+        );
+
+        // Remove expired solved captcha challenges
+        CaptchaChallenge::gc();
+    }
+}
diff --git a/lib/cronjobs/purge_cache.class.php b/lib/cronjobs/purge_cache.class.php
deleted file mode 100644
index d2e3697..0000000
--- a/lib/cronjobs/purge_cache.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * purge_cache.class.php - Purges the file cache.
- * 
- * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @access public
- * @since  2.4
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// purge_cache.class.php
-// 
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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 'lib/classes/CronJob.class.php';
-
-class PurgeCacheJob extends CronJob
-{
-    /**
-     * Returns the name of the cronjob.
-     */
-    public static function getName()
-    {
-        return _('Dateicache leeren');
-    }
-
-    /**
-     * Returns the description of the cronjob.
-     */
-    public static function getDescription()
-    {
-        return _('Leert den dateibasierten Cache');
-    }
-
-    /**
-     * Return the paremeters for this cronjob.
-     *
-     * @return Array Parameters.
-     */
-    public static function getParameters()
-    {
-        return [
-            'verbose' => [
-                'type'        => 'boolean',
-                'default'     => false,
-                'status'      => 'optional',
-                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
-            ],
-        ];
-    }
-
-    /**
-     * Setup method. Loads the neccessary classes.
-     */
-    public function setUp()
-    {
-        require_once 'lib/classes/cache/FileCache.class.php';
-    }
-
-    /**
-     * Execute the cronjob.
-     *
-     * @param mixed $last_result What the last execution of this cronjob
-     *                           returned.
-     * @param Array $parameters Parameters for this cronjob instance which
-     *                          were defined during scheduling.
-     *                          Only valid parameter at the moment is
-     *                          "verbose" which toggles verbose output while
-     *                          purging the cache.
-     */
-    public function execute($last_result, $parameters = [])
-    {
-        $cache = new \Studip\Cache\FileCache();
-        $cache->purge(empty($parameters['verbose']));
-    }
-}
diff --git a/lib/cronjobs/purge_cache.php b/lib/cronjobs/purge_cache.php
new file mode 100644
index 0000000..d2e3697
--- /dev/null
+++ b/lib/cronjobs/purge_cache.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * purge_cache.class.php - Purges the file cache.
+ * 
+ * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @access public
+ * @since  2.4
+ */
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// purge_cache.class.php
+// 
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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 'lib/classes/CronJob.class.php';
+
+class PurgeCacheJob extends CronJob
+{
+    /**
+     * Returns the name of the cronjob.
+     */
+    public static function getName()
+    {
+        return _('Dateicache leeren');
+    }
+
+    /**
+     * Returns the description of the cronjob.
+     */
+    public static function getDescription()
+    {
+        return _('Leert den dateibasierten Cache');
+    }
+
+    /**
+     * Return the paremeters for this cronjob.
+     *
+     * @return Array Parameters.
+     */
+    public static function getParameters()
+    {
+        return [
+            'verbose' => [
+                'type'        => 'boolean',
+                'default'     => false,
+                'status'      => 'optional',
+                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
+            ],
+        ];
+    }
+
+    /**
+     * Setup method. Loads the neccessary classes.
+     */
+    public function setUp()
+    {
+        require_once 'lib/classes/cache/FileCache.class.php';
+    }
+
+    /**
+     * Execute the cronjob.
+     *
+     * @param mixed $last_result What the last execution of this cronjob
+     *                           returned.
+     * @param Array $parameters Parameters for this cronjob instance which
+     *                          were defined during scheduling.
+     *                          Only valid parameter at the moment is
+     *                          "verbose" which toggles verbose output while
+     *                          purging the cache.
+     */
+    public function execute($last_result, $parameters = [])
+    {
+        $cache = new \Studip\Cache\FileCache();
+        $cache->purge(empty($parameters['verbose']));
+    }
+}
diff --git a/lib/cronjobs/remind_oer_upload.class.php b/lib/cronjobs/remind_oer_upload.class.php
deleted file mode 100644
index a1a8ee1..0000000
--- a/lib/cronjobs/remind_oer_upload.class.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * remind_oer_upload.class.php - Sends reminder emails for uploading files to OER Campus.
- *
- * @author Michaela Brückner <brueckner@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
- * @access public
- * @since  5.2
- */
-
-require_once 'lib/classes/CronJob.class.php';
-
-class RemindOerUpload extends CronJob
-{
-
-    public static function getName()
-    {
-        return _('An OER-Campus Upload erinnern');
-    }
-
-    public static function getDescription()
-    {
-        return _('Erinnert den Autor am Ende des Semesters an eine Datei, die in den OER-Campus hochgeladen werden soll.');
-    }
-
-    public function execute($last_result, $parameters = [])
-    {
-        // check the reminder date, which now is in past
-        $query = "SELECT `file_ref_id` FROM `oer_post_upload`
-                    WHERE `reminder_date` < UNIX_TIMESTAMP()";
-        $results = DBManager::get()->fetchAll($query);
-
-        // get file information from file_ref_id
-        foreach ($results as $result) {
-            $file_ref = FileRef::find($result['file_ref_id']);
-
-            if (!FileRef::countBySql('id = ?', [$result['file_ref_id']])) {
-                // file might be deleted meanwhile, so do not try to send a reminder for it
-            } else {
-                $filetype = $file_ref->getFileType();
-                $file_to_suggest = $filetype->convertToStandardFile();
-
-                $author = $file_ref->owner->username;
-                $link_to_share = URLHelper::getURL('dispatch.php/file/share_oer/' . $result['file_ref_id']);
-                $linktext = _('Klicken Sie hier, um das Material im OER-Campus zu veröffentlichen.');
-                $formatted_link = '['. $linktext .']' . $link_to_share;
-
-                $oer_reminder_message = sprintf(_("Sie wollten daran erinnert werden, die folgende Datei im OER-Campus zu veröffentlichen:\n\n"
-                    . "Dateiname: %s \n"
-                    . "Beschreibung: %s \n"
-                    . "%s \n\n"),
-                    $file_to_suggest->getFilename(),
-                    $file_to_suggest->getDescription(),
-                    $formatted_link
-                );
-
-                $messaging = new messaging();
-
-                $messaging->insert_message(
-                    $oer_reminder_message,
-                    $author,
-                    '____%system%____',
-                    '',
-                    Request::option('message_id'),
-                    '',
-                    null,
-                    _('Erinnerung zur Veröffentlichung einer Datei im OER-Campus')
-                );
-
-                OERPostUpload::deleteBySQL("file_ref_id = ?", [$result['file_ref_id']]);
-            }
-        }
-    }
-}
diff --git a/lib/cronjobs/remind_oer_upload.php b/lib/cronjobs/remind_oer_upload.php
new file mode 100644
index 0000000..a1a8ee1
--- /dev/null
+++ b/lib/cronjobs/remind_oer_upload.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * remind_oer_upload.class.php - Sends reminder emails for uploading files to OER Campus.
+ *
+ * @author Michaela Brückner <brueckner@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+ * @access public
+ * @since  5.2
+ */
+
+require_once 'lib/classes/CronJob.class.php';
+
+class RemindOerUpload extends CronJob
+{
+
+    public static function getName()
+    {
+        return _('An OER-Campus Upload erinnern');
+    }
+
+    public static function getDescription()
+    {
+        return _('Erinnert den Autor am Ende des Semesters an eine Datei, die in den OER-Campus hochgeladen werden soll.');
+    }
+
+    public function execute($last_result, $parameters = [])
+    {
+        // check the reminder date, which now is in past
+        $query = "SELECT `file_ref_id` FROM `oer_post_upload`
+                    WHERE `reminder_date` < UNIX_TIMESTAMP()";
+        $results = DBManager::get()->fetchAll($query);
+
+        // get file information from file_ref_id
+        foreach ($results as $result) {
+            $file_ref = FileRef::find($result['file_ref_id']);
+
+            if (!FileRef::countBySql('id = ?', [$result['file_ref_id']])) {
+                // file might be deleted meanwhile, so do not try to send a reminder for it
+            } else {
+                $filetype = $file_ref->getFileType();
+                $file_to_suggest = $filetype->convertToStandardFile();
+
+                $author = $file_ref->owner->username;
+                $link_to_share = URLHelper::getURL('dispatch.php/file/share_oer/' . $result['file_ref_id']);
+                $linktext = _('Klicken Sie hier, um das Material im OER-Campus zu veröffentlichen.');
+                $formatted_link = '['. $linktext .']' . $link_to_share;
+
+                $oer_reminder_message = sprintf(_("Sie wollten daran erinnert werden, die folgende Datei im OER-Campus zu veröffentlichen:\n\n"
+                    . "Dateiname: %s \n"
+                    . "Beschreibung: %s \n"
+                    . "%s \n\n"),
+                    $file_to_suggest->getFilename(),
+                    $file_to_suggest->getDescription(),
+                    $formatted_link
+                );
+
+                $messaging = new messaging();
+
+                $messaging->insert_message(
+                    $oer_reminder_message,
+                    $author,
+                    '____%system%____',
+                    '',
+                    Request::option('message_id'),
+                    '',
+                    null,
+                    _('Erinnerung zur Veröffentlichung einer Datei im OER-Campus')
+                );
+
+                OERPostUpload::deleteBySQL("file_ref_id = ?", [$result['file_ref_id']]);
+            }
+        }
+    }
+}
diff --git a/lib/cronjobs/send_mail_notifications.class.php b/lib/cronjobs/send_mail_notifications.class.php
deleted file mode 100644
index 5565218..0000000
--- a/lib/cronjobs/send_mail_notifications.class.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * send_mail_notifications.php - Sends daily email notifications.
- *
- * @author  André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @access  public
- */
-
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// send_mail_notifications.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-
-// TODO: notifications for plugins not implemented
-
-class SendMailNotificationsJob extends CronJob
-{
-    /**
-     * Returns the name of the cronjob.
-     */
-    public static function getName()
-    {
-        return _('Versendet tägliche E-Mailbenachrichtigungen');
-    }
-
-    /**
-     * Returns the description of the cronjob.
-     */
-    public static function getDescription()
-    {
-        return _('Versendet die täglichen E-Mailbenachrichtigungen an alle Nutzer, die diese aktiviert haben');
-    }
-
-    /**
-     * Setup method. Loads neccessary classes and checks environment. Will
-     * bail out with an exception if environment does not match requirements.
-     */
-    public function setUp()
-    {
-        require_once 'lib/dates.inc.php';
-
-        if (!Config::get()->MAIL_NOTIFICATION_ENABLE) {
-            throw new Exception('Mail notifications are disabled in this Stud.IP installation.');
-        }
-        if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
-            throw new Exception('To use mail notifications you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
-        }
-    }
-
-    /**
-     * Return the paremeters for this cronjob.
-     *
-     * @return Array Parameters.
-     */
-    public static function getParameters()
-    {
-        return [
-            'verbose' => [
-                'type'        => 'boolean',
-                'default'     => false,
-                'status'      => 'optional',
-                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
-            ],
-        ];
-    }
-
-    /**
-     * Executes the cronjob.
-     *
-     * @param mixed $last_result What the last execution of this cronjob
-     *                           returned.
-     * @param Array $parameters Parameters for this cronjob instance which
-     *                          were defined during scheduling.
-     *                          Only valid parameter at the moment is
-     *                          "verbose" which toggles verbose output while
-     *                          purging the cache.
-     */
-    public function execute($last_result, $parameters = [])
-    {
-        $cli_user = $GLOBALS['user'];
-
-        $notification = new ModulesNotification();
-
-        $query = "SELECT DISTINCT user_id
-                  FROM seminar_user_notifications
-                  JOIN seminar_user USING (user_id, seminar_id)";
-        DBManager::get()->fetchFirst(
-            $query,
-            [],
-            function ($user_id) use ($parameters, $notification) {
-                $user = User::find($user_id);
-                if (!$user || $user->isBlocked()) {
-                    return;
-                }
-
-                $GLOBALS['user'] = new Seminar_User($user);
-
-                $ok = false;
-                $mailmessage = $notification->getAllNotifications($user->id);
-
-                if ($mailmessage) {
-                    setTempLanguage('', $user->preferred_language);
-
-                    $ok = StudipMail::sendMessage(
-                        $user->email,
-                        "[" . Config::get()->UNI_NAME_CLEAN . "] " . _('Tägliche Benachrichtigung'),
-                        $mailmessage['text'],
-                        $user->config->MAIL_AS_HTML ? $mailmessage['html'] : null
-                    );
-                }
-
-                // Unset user configuration cache to preserve memory
-                UserConfig::set($user->id, null);
-
-                // Log results
-                if ($ok !== false && $parameters['verbose']) {
-                    echo $user->username . ':' . $ok . "\n";
-                }
-            }
-        );
-
-        $GLOBALS['user'] = $cli_user;
-    }
-}
diff --git a/lib/cronjobs/send_mail_notifications.php b/lib/cronjobs/send_mail_notifications.php
new file mode 100644
index 0000000..5565218
--- /dev/null
+++ b/lib/cronjobs/send_mail_notifications.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * send_mail_notifications.php - Sends daily email notifications.
+ *
+ * @author  André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @access  public
+ */
+
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// send_mail_notifications.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+
+// TODO: notifications for plugins not implemented
+
+class SendMailNotificationsJob extends CronJob
+{
+    /**
+     * Returns the name of the cronjob.
+     */
+    public static function getName()
+    {
+        return _('Versendet tägliche E-Mailbenachrichtigungen');
+    }
+
+    /**
+     * Returns the description of the cronjob.
+     */
+    public static function getDescription()
+    {
+        return _('Versendet die täglichen E-Mailbenachrichtigungen an alle Nutzer, die diese aktiviert haben');
+    }
+
+    /**
+     * Setup method. Loads neccessary classes and checks environment. Will
+     * bail out with an exception if environment does not match requirements.
+     */
+    public function setUp()
+    {
+        require_once 'lib/dates.inc.php';
+
+        if (!Config::get()->MAIL_NOTIFICATION_ENABLE) {
+            throw new Exception('Mail notifications are disabled in this Stud.IP installation.');
+        }
+        if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
+            throw new Exception('To use mail notifications you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
+        }
+    }
+
+    /**
+     * Return the paremeters for this cronjob.
+     *
+     * @return Array Parameters.
+     */
+    public static function getParameters()
+    {
+        return [
+            'verbose' => [
+                'type'        => 'boolean',
+                'default'     => false,
+                'status'      => 'optional',
+                'description' => _('Sollen Ausgaben erzeugt werden (sind später im Log des Cronjobs sichtbar)'),
+            ],
+        ];
+    }
+
+    /**
+     * Executes the cronjob.
+     *
+     * @param mixed $last_result What the last execution of this cronjob
+     *                           returned.
+     * @param Array $parameters Parameters for this cronjob instance which
+     *                          were defined during scheduling.
+     *                          Only valid parameter at the moment is
+     *                          "verbose" which toggles verbose output while
+     *                          purging the cache.
+     */
+    public function execute($last_result, $parameters = [])
+    {
+        $cli_user = $GLOBALS['user'];
+
+        $notification = new ModulesNotification();
+
+        $query = "SELECT DISTINCT user_id
+                  FROM seminar_user_notifications
+                  JOIN seminar_user USING (user_id, seminar_id)";
+        DBManager::get()->fetchFirst(
+            $query,
+            [],
+            function ($user_id) use ($parameters, $notification) {
+                $user = User::find($user_id);
+                if (!$user || $user->isBlocked()) {
+                    return;
+                }
+
+                $GLOBALS['user'] = new Seminar_User($user);
+
+                $ok = false;
+                $mailmessage = $notification->getAllNotifications($user->id);
+
+                if ($mailmessage) {
+                    setTempLanguage('', $user->preferred_language);
+
+                    $ok = StudipMail::sendMessage(
+                        $user->email,
+                        "[" . Config::get()->UNI_NAME_CLEAN . "] " . _('Tägliche Benachrichtigung'),
+                        $mailmessage['text'],
+                        $user->config->MAIL_AS_HTML ? $mailmessage['html'] : null
+                    );
+                }
+
+                // Unset user configuration cache to preserve memory
+                UserConfig::set($user->id, null);
+
+                // Log results
+                if ($ok !== false && $parameters['verbose']) {
+                    echo $user->username . ':' . $ok . "\n";
+                }
+            }
+        );
+
+        $GLOBALS['user'] = $cli_user;
+    }
+}
diff --git a/lib/cronjobs/send_mail_queue.class.php b/lib/cronjobs/send_mail_queue.class.php
deleted file mode 100644
index 8f72918..0000000
--- a/lib/cronjobs/send_mail_queue.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
-* send_mail_queue.class.php
-*
-* @author Rasmus Fuhse <fuhse@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
-* @access public
-* @since  3.0
-*/
-
-/**
- * Cronjob class to send the mailqueue each interval.
- */
-class SendMailQueueJob extends CronJob
-{
-
-    /**
-     * Returns the name of the cronjob.
-     * @return string : name of the cronjob
-     */
-    public static function getName()
-    {
-        return _('Mailqueue senden');
-    }
-
-    /**
-     * Returns the description of the cronjob.
-     * @return string : description of the cronjob.
-     */
-    public static function getDescription()
-    {
-        return _('Sendet alle Einträge in der Mailqueue bis zu 24 Stunden, nachdem sie hinzugefügt wurden.');
-    }
-
-    /**
-     * Sends all mails in the queue.
-     * @param integer $last_result : not evaluated for execution, so any integer
-     * will do. Usually it would be a unix-timestamp of last execution. But in
-     * this case we don't care at all.
-     * @param array $parameters : not needed here
-     */
-    public function execute($last_result, $parameters = [])
-    {
-        $status_messages = MailQueueEntry::sendAll(
-            Config::get()->MAILQUEUE_SEND_LIMIT,
-            (bool)$parameters['verbose']
-        );
-
-        //We output one status message per line:
-        echo implode("\n", $status_messages);
-    }
-
-    /**
-     * Returns a list of available parameters for this cronjob.
-     * See the description in the CronJob class for a specification
-     * for the returned array.
-     *
-     * @return array A list of available parameters for this cronjob.
-     */
-    public static function getParameters()
-    {
-        return [
-            'verbose' => [
-                'type'        => 'boolean',
-                'default'     => false,
-                'status'      => 'optional',
-                'description' => _('Sollen Ausgaben erzeugt werden? Diese sind später im Log des Cronjobs sichtbar.'),
-            ],
-        ];
-    }
-}
diff --git a/lib/cronjobs/send_mail_queue.php b/lib/cronjobs/send_mail_queue.php
new file mode 100644
index 0000000..8f72918
--- /dev/null
+++ b/lib/cronjobs/send_mail_queue.php
@@ -0,0 +1,70 @@
+<?php
+/**
+* send_mail_queue.class.php
+*
+* @author Rasmus Fuhse <fuhse@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+* @access public
+* @since  3.0
+*/
+
+/**
+ * Cronjob class to send the mailqueue each interval.
+ */
+class SendMailQueueJob extends CronJob
+{
+
+    /**
+     * Returns the name of the cronjob.
+     * @return string : name of the cronjob
+     */
+    public static function getName()
+    {
+        return _('Mailqueue senden');
+    }
+
+    /**
+     * Returns the description of the cronjob.
+     * @return string : description of the cronjob.
+     */
+    public static function getDescription()
+    {
+        return _('Sendet alle Einträge in der Mailqueue bis zu 24 Stunden, nachdem sie hinzugefügt wurden.');
+    }
+
+    /**
+     * Sends all mails in the queue.
+     * @param integer $last_result : not evaluated for execution, so any integer
+     * will do. Usually it would be a unix-timestamp of last execution. But in
+     * this case we don't care at all.
+     * @param array $parameters : not needed here
+     */
+    public function execute($last_result, $parameters = [])
+    {
+        $status_messages = MailQueueEntry::sendAll(
+            Config::get()->MAILQUEUE_SEND_LIMIT,
+            (bool)$parameters['verbose']
+        );
+
+        //We output one status message per line:
+        echo implode("\n", $status_messages);
+    }
+
+    /**
+     * Returns a list of available parameters for this cronjob.
+     * See the description in the CronJob class for a specification
+     * for the returned array.
+     *
+     * @return array A list of available parameters for this cronjob.
+     */
+    public static function getParameters()
+    {
+        return [
+            'verbose' => [
+                'type'        => 'boolean',
+                'default'     => false,
+                'status'      => 'optional',
+                'description' => _('Sollen Ausgaben erzeugt werden? Diese sind später im Log des Cronjobs sichtbar.'),
+            ],
+        ];
+    }
+}
diff --git a/lib/cronjobs/session_gc.class.php b/lib/cronjobs/session_gc.class.php
deleted file mode 100644
index 4289a29..0000000
--- a/lib/cronjobs/session_gc.class.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
-* session_gc.class.php
-*
-* @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
-* @access public
-* @since  2.4
-*/
-
-class SessionGcJob extends CronJob
-{
-
-    public static function getName()
-    {
-        return _('Sessions bereinigen');
-    }
-
-    public static function getDescription()
-    {
-        return _('Entfernt abgelaufene session Daten');
-    }
-
-    public function execute($last_result, $parameters = [])
-    {
-        $sess = new Seminar_Session();
-        $sess->set_container();
-        return $sess->gc();
-    }
-}
diff --git a/lib/cronjobs/session_gc.php b/lib/cronjobs/session_gc.php
new file mode 100644
index 0000000..4289a29
--- /dev/null
+++ b/lib/cronjobs/session_gc.php
@@ -0,0 +1,29 @@
+<?php
+/**
+* session_gc.class.php
+*
+* @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
+* @access public
+* @since  2.4
+*/
+
+class SessionGcJob extends CronJob
+{
+
+    public static function getName()
+    {
+        return _('Sessions bereinigen');
+    }
+
+    public static function getDescription()
+    {
+        return _('Entfernt abgelaufene session Daten');
+    }
+
+    public function execute($last_result, $parameters = [])
+    {
+        $sess = new Seminar_Session();
+        $sess->set_container();
+        return $sess->gc();
+    }
+}
diff --git a/lib/elearning/ConnectedCMS.class.php b/lib/elearning/ConnectedCMS.class.php
deleted file mode 100644
index 3dd3bfb..0000000
--- a/lib/elearning/ConnectedCMS.class.php
+++ /dev/null
@@ -1,466 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
-* main-class for connected systems
-*
-* This class contains the main methods of the elearning-interface to connect content-management-systems.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ConnectedCMS
-* @package  ELearning-Interface
-*/
-class ConnectedCMS
-{
-    public $title;
-
-    public $is_active;
-    public $cms_type;
-    public $name = null;
-    public $ABSOLUTE_PATH_ELEARNINGMODULES = null;
-    public $ABSOLUTE_PATH_SOAP = null;
-    public $RELATIVE_PATH_DB_CLASSES = false;
-    public $CLASS_PREFIX = null;
-    public $auth_necessary = null;
-    public $USER_AUTO_CREATE = null;
-    public $USER_PREFIX = null;
-    public $target_file = null;
-    public $logo_file = null;
-    public $db_classes;
-    public $soap_data = null;
-    public $soap_client;
-    public $types = null;
-    public $roles = null;
-
-    public $db;
-    public $db_class;
-    public $link;
-    public $user;
-    public $permissions;
-    public $content_module;
-
-    /**
-    * constructor
-    *
-    * init class. don't call directly but by extending class ("new Ilias3ConnectedCMS($cms)" for example), except for basic administration
-    * @access
-    * @param string $cms system-type
-    */
-    public function __construct($cms = "")
-    {
-        $this->cms_type = $cms;
-        $this->is_active = (bool) Config::get()->getValue("ELEARNING_INTERFACE_{$cms}_ACTIVE");
-
-        if ($cms) {
-            $this->init($cms);
-        }
-    }
-
-    /**
-    * init settings
-    *
-    * gets settings from config-array and initializes db
-    * @access private
-    * @param string $cms system-type
-    */
-    public function init($cms)
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-
-        $this->name = $ELEARNING_INTERFACE_MODULES[$cms]['name'] ?? null;
-        $this->ABSOLUTE_PATH_ELEARNINGMODULES = $ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_ELEARNINGMODULES"];
-        $this->ABSOLUTE_PATH_SOAP = $ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_SOAP"];
-        if (isset($ELEARNING_INTERFACE_MODULES[$cms]["RELATIVE_PATH_DB_CLASSES"])) {
-            $this->RELATIVE_PATH_DB_CLASSES = $ELEARNING_INTERFACE_MODULES[$cms]["RELATIVE_PATH_DB_CLASSES"];
-            $this->db_classes = $ELEARNING_INTERFACE_MODULES[$cms]["db_classes"];
-        } else {
-            $this->RELATIVE_PATH_DB_CLASSES = false;
-        }
-        $this->CLASS_PREFIX = $ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX'];
-        $this->auth_necessary = $ELEARNING_INTERFACE_MODULES[$cms]['auth_necessary'];
-        $this->USER_AUTO_CREATE = $ELEARNING_INTERFACE_MODULES[$cms]['USER_AUTO_CREATE'] ?? null;
-        $this->USER_PREFIX = $ELEARNING_INTERFACE_MODULES[$cms]['USER_PREFIX'] ?? null;
-        $this->target_file = $ELEARNING_INTERFACE_MODULES[$cms]['target_file'] ?? null;
-        $this->logo_file = $ELEARNING_INTERFACE_MODULES[$cms]['logo_file'] ?? null;
-        $this->soap_data = $ELEARNING_INTERFACE_MODULES[$cms]['soap_data'] ?? null;
-        $this->types = $ELEARNING_INTERFACE_MODULES[$cms]['types'] ?? null;
-        $this->roles = $ELEARNING_INTERFACE_MODULES[$cms]['roles'] ?? null;
-    }
-
-    /**
-    * init subclasses
-    *
-    * loads classes for user-functions
-    * @access public
-    */
-    public function initSubclasses()
-    {
-        if ($this->auth_necessary) {
-            require_once $this->CLASS_PREFIX . "ConnectedUser.class.php";
-            $classname = $this->CLASS_PREFIX . "ConnectedUser";
-            $this->user = new $classname($this->cms_type);
-
-            require_once $this->CLASS_PREFIX  . "ConnectedPermissions.class.php";
-            $classname = $this->CLASS_PREFIX  . "ConnectedPermissions";
-            $this->permissions = new $classname($this->cms_type);
-        }
-        require_once $this->CLASS_PREFIX . "ConnectedLink.class.php";
-        $classname = $this->CLASS_PREFIX . "ConnectedLink";
-        $this->link = new $classname($this->cms_type);
-    }
-
-    /**
-    * get connection status
-    *
-    * checks settings
-    * @access public
-    * @param string $cms system-type
-    * @return array messages
-    */
-    public function getConnectionStatus($cms = "")
-    {
-        $msg = [
-            'path' => [],
-        ];
-
-        if ($this->cms_type == "") {
-            $this->init($cms);
-        }
-
-        // check connection to CMS
-        if (!$this->auth_necessary) {
-            $msg['auth'] = [
-                'info' => _('Eine Authentifizierung ist für dieses System nicht vorgesehen.')
-            ];
-        }
-
-        // check for SOAP-Interface
-        if (in_array($this->CLASS_PREFIX, ['Ilias3','Ilias4','Ilias5'])) {
-            $ch = curl_init($this->ABSOLUTE_PATH_ELEARNINGMODULES . 'login.php');
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_exec($ch);
-
-            if (curl_getinfo($ch, CURLINFO_RESPONSE_CODE) !== 200) {
-                $msg['path']['error'] = sprintf(
-                    _('Die Verbindung zum System "%s" konnte nicht hergestellt werden. Der Pfad "%s" ist ungültig.'),
-                    $this->name,
-                    $this->ABSOLUTE_PATH_ELEARNINGMODULES
-                );
-
-            } else {
-                $msg['path']['info'] = sprintf(
-                    _('Die %s-Installation wurde gefunden.'),
-                    $this->name
-                );
-            }
-
-            $msg['soap'] = [];
-            if (!Config::get()->SOAP_ENABLE) {
-                $msg['soap']['error'] = _('Das Stud.IP-Modul für die SOAP-Schnittstelle ist nicht aktiviert. Ändern Sie den entsprechenden Eintrag in der Konfigurationsdatei "local.inc".');
-            } elseif (!is_array($this->soap_data)) {
-                $msg['soap']['error'] = _('Die SOAP-Verbindungsdaten sind für dieses System nicht gesetzt. Ergänzen Sie die Einstellungen für dieses Systems um den Eintrag "soap_data" in der Konfigurationsdatei "local.inc".');
-            } else {
-                $this->soap_client = new StudipSoapClient($this->ABSOLUTE_PATH_SOAP);
-                $msg['soap']['info'] = _('Das SOAP-Modul ist aktiv.');
-            }
-        } else {
-            $file = fopen($this->ABSOLUTE_PATH_ELEARNINGMODULES, 'r');
-            if ($file === false) {
-                $msg['path']['error'] = sprintf(
-                    _('Die Verbindung zum System "%s" konnte nicht hergestellt werden. Der Pfad "%s" ist ungültig.'),
-                    $this->name,
-                    $this->ABSOLUTE_PATH_ELEARNINGMODULES
-                );
-            } else {
-                fclose($file);
-                $msg['path']['info'] = sprintf(
-                    _("Die %s-Installation wurde gefunden."),
-                    $this->name
-                );
-
-                // check if target-file exists
-                $msg['auth'] = [];
-
-                $file = fopen($this->ABSOLUTE_PATH_ELEARNINGMODULES . $this->target_file, 'r');
-                if ($file === false) {
-                    $msg['auth']['error'] = sprintf(
-                        _('Die Zieldatei "%s" liegt nicht im Hauptverzeichnis der %s-Installation.'),
-                        $this->target_file,
-                        $this->name
-                    );
-                } else {
-                    fclose($file);
-                    $msg['auth']['info'] = _('Die Zieldatei ist vorhanden.');
-                }
-            }
-        }
-
-        $el_path = $GLOBALS['STUDIP_BASE_PATH'] . '/lib/elearning';
-        // check if needed classes exist
-        $files = [
-            'class_link'    => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.class.php",
-            'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.class.php",
-            'class_cms'     => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.class.php",
-        ];
-
-        if ($this->auth_necessary) {
-            $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.class.php";
-            $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.class.php";
-        }
-
-        $errors = 0;
-        foreach ($files as $index => $file) {
-            if (!file_exists($file)) {
-                $msg[$index] = [
-                    'error' => sprintf(_('Die Datei "%s" existiert nicht.'), $file),
-                ];
-                $errors += 1;
-            }
-        }
-
-        $msg['classes'] = [];
-        if ($errors === 0) {
-            require_once $files['class_cms'];
-            $msg['classes']['info'] = sprintf(
-                _('Die Klassen der Schnittstelle zum System "%s" wurden geladen.'),
-                $this->name
-            );
-        } else {
-            $msg['classes']['error'] = sprintf(
-                _('Die Klassen der Schnittstelle zum System "%s" wurden nicht geladen.'),
-                $this->name
-            );
-        }
-
-        return $msg;
-    }
-
-    /**
-    * get preferences
-    *
-    * shows additional settings. can be overwritten by subclass.
-    * @access public
-    */
-    public function getPreferences()
-    {
-        if ($this->types != "")
-        {
-            echo "<b>" . _("Angebundene Lernmodul-Typen: ") . "</b>";
-            echo "<br>\n";
-            foreach($this->types as $key => $type)
-                echo Icon::create($type["icon"], Icon::ROLE_INACTIVE)->asImg() . $type["name"] . " ($key)<br>\n";
-            echo "<br>\n";
-        }
-
-        if ($this->db_classes != "")
-        {
-            echo "<b>" . _("Verwendete DB-Zugriffs-Klassen: ") . "</b>";
-            echo "<br>\n";
-            foreach($this->db_classes as $key => $type) {
-                echo $type["file"] . " ($key)<br>\n";
-            }
-            echo "<br>\n";
-        }
-    }
-
-    /**
-    * create new instance of subclass content-module with given values
-    *
-    * creates new instance of subclass content-module with given values
-    * @access public
-    * @param array $data module-data
-    * @param boolean $is_connected is module connected to seminar?
-    */
-    public function setContentModule($data, $is_connected = false)
-    {
-        global $current_module;
-        $current_module = $data["ref_id"];
-
-        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
-        $classname = $this->CLASS_PREFIX  . "ContentModule";
-
-        $this->content_module[$current_module] = new  $classname("", $data["type"], $this->cms_type);
-        $this->content_module[$current_module]->setId($data["ref_id"]);
-        $this->content_module[$current_module]->setTitle($data["title"]);
-        $this->content_module[$current_module]->setDescription($data["description"]);
-        $this->content_module[$current_module]->setConnectionType($is_connected);
-    }
-
-    /**
-    * create new instance of subclass content-module
-    *
-    * creates new instance of subclass content-module
-    * @access public
-    * @param string $module_id module-id
-    * @param string $module_type module-type
-    * @param boolean $is_connected is module connected to seminar?
-    */
-    public function newContentModule($module_id, $module_type, $is_connected = false)
-    {
-        global $current_module;
-        $current_module = $module_id;
-
-        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
-        $classname = $this->CLASS_PREFIX  . "ContentModule";
-
-        if ($is_connected == false)
-        {
-            $this->content_module[$module_id] = new  $classname("", $module_type, $this->cms_type);
-            $this->content_module[$module_id]->setId($module_id);
-        }
-        else
-        {
-            $this->content_module[$module_id] = new  $classname($module_id, $module_type, $this->cms_type);
-        }
-
-        $this->content_module[$module_id]->setConnectionType($is_connected);
-    }
-
-    /**
-    * get name of cms
-    *
-    * returns name of cms
-    * @access public
-    * @return string name
-    */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-    * get type of cms
-    *
-    * returns type of cms
-    * @access public
-    * @return string type
-    */
-    public function getCMSType()
-    {
-        return $this->cms_type;
-    }
-
-    /**
-    * get path of cms
-    *
-    * returns path of cms
-    * @access public
-    * @return string path
-    */
-    public function getAbsolutePath()
-    {
-        return $this->ABSOLUTE_PATH_ELEARNINGMODULES;
-    }
-
-    /**
-    * get target file of cms
-    *
-    * returns target file of cms
-    * @access public
-    * @return string target file
-    */
-    public function getTargetFile()
-    {
-        return $this->target_file;
-    }
-
-    /**
-    * get class prefix
-    *
-    * returns class prefix
-    * @access public
-    * @return string class prefix
-    */
-    public function getClassPrefix()
-    {
-        return $this->CLASS_PREFIX;
-    }
-
-    /**
-    * get authentification-setting
-    *
-    * returns true, if authentification is necessary
-    * @access public
-    * @return boolean authentification-setting
-    */
-    public function isAuthNecessary()
-    {
-        return $this->auth_necessary;
-    }
-
-    /**
-    * get active-setting
-    *
-    * returns true, if cms is active
-    * @access public
-    * @return boolean active-setting
-    function isActive($cms = "")
-    {
-        return $this->is_active;
-    }
-    */
-
-    /**
-    * get user prefix
-    *
-    * returns user prefix
-    * @access public
-    * @return string user prefix
-    */
-    public function getUserPrefix()
-    {
-        return $this->USER_PREFIX;
-    }
-
-    /**
-    * get logo-image
-    *
-    * returns logo-image
-    * @access public
-    * @return string logo-image
-    */
-    public function getLogo()
-    {
-        return "<img src=\"" . $this->logo_file . "\">";
-    }
-
-    /**
-    * get user modules
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    public function getUserContentModules()
-    {
-        return false;
-    }
-
-    /**
-    * search modules
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    public function searchContentModules($key)
-    {
-        return false;
-    }
-
-    /**
-    * dummy-method. can be overwritten by subclass.
-    */
-    public function terminate()
-    {
-    }
-
-    public function deleteConnectedModules($object_id){
-        return ObjectConnections::DeleteAllConnections($object_id, $this->cms_type);
-    }
-}
diff --git a/lib/elearning/ConnectedCMS.php b/lib/elearning/ConnectedCMS.php
new file mode 100644
index 0000000..3dd3bfb
--- /dev/null
+++ b/lib/elearning/ConnectedCMS.php
@@ -0,0 +1,466 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+* main-class for connected systems
+*
+* This class contains the main methods of the elearning-interface to connect content-management-systems.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ConnectedCMS
+* @package  ELearning-Interface
+*/
+class ConnectedCMS
+{
+    public $title;
+
+    public $is_active;
+    public $cms_type;
+    public $name = null;
+    public $ABSOLUTE_PATH_ELEARNINGMODULES = null;
+    public $ABSOLUTE_PATH_SOAP = null;
+    public $RELATIVE_PATH_DB_CLASSES = false;
+    public $CLASS_PREFIX = null;
+    public $auth_necessary = null;
+    public $USER_AUTO_CREATE = null;
+    public $USER_PREFIX = null;
+    public $target_file = null;
+    public $logo_file = null;
+    public $db_classes;
+    public $soap_data = null;
+    public $soap_client;
+    public $types = null;
+    public $roles = null;
+
+    public $db;
+    public $db_class;
+    public $link;
+    public $user;
+    public $permissions;
+    public $content_module;
+
+    /**
+    * constructor
+    *
+    * init class. don't call directly but by extending class ("new Ilias3ConnectedCMS($cms)" for example), except for basic administration
+    * @access
+    * @param string $cms system-type
+    */
+    public function __construct($cms = "")
+    {
+        $this->cms_type = $cms;
+        $this->is_active = (bool) Config::get()->getValue("ELEARNING_INTERFACE_{$cms}_ACTIVE");
+
+        if ($cms) {
+            $this->init($cms);
+        }
+    }
+
+    /**
+    * init settings
+    *
+    * gets settings from config-array and initializes db
+    * @access private
+    * @param string $cms system-type
+    */
+    public function init($cms)
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+
+        $this->name = $ELEARNING_INTERFACE_MODULES[$cms]['name'] ?? null;
+        $this->ABSOLUTE_PATH_ELEARNINGMODULES = $ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_ELEARNINGMODULES"];
+        $this->ABSOLUTE_PATH_SOAP = $ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_SOAP"];
+        if (isset($ELEARNING_INTERFACE_MODULES[$cms]["RELATIVE_PATH_DB_CLASSES"])) {
+            $this->RELATIVE_PATH_DB_CLASSES = $ELEARNING_INTERFACE_MODULES[$cms]["RELATIVE_PATH_DB_CLASSES"];
+            $this->db_classes = $ELEARNING_INTERFACE_MODULES[$cms]["db_classes"];
+        } else {
+            $this->RELATIVE_PATH_DB_CLASSES = false;
+        }
+        $this->CLASS_PREFIX = $ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX'];
+        $this->auth_necessary = $ELEARNING_INTERFACE_MODULES[$cms]['auth_necessary'];
+        $this->USER_AUTO_CREATE = $ELEARNING_INTERFACE_MODULES[$cms]['USER_AUTO_CREATE'] ?? null;
+        $this->USER_PREFIX = $ELEARNING_INTERFACE_MODULES[$cms]['USER_PREFIX'] ?? null;
+        $this->target_file = $ELEARNING_INTERFACE_MODULES[$cms]['target_file'] ?? null;
+        $this->logo_file = $ELEARNING_INTERFACE_MODULES[$cms]['logo_file'] ?? null;
+        $this->soap_data = $ELEARNING_INTERFACE_MODULES[$cms]['soap_data'] ?? null;
+        $this->types = $ELEARNING_INTERFACE_MODULES[$cms]['types'] ?? null;
+        $this->roles = $ELEARNING_INTERFACE_MODULES[$cms]['roles'] ?? null;
+    }
+
+    /**
+    * init subclasses
+    *
+    * loads classes for user-functions
+    * @access public
+    */
+    public function initSubclasses()
+    {
+        if ($this->auth_necessary) {
+            require_once $this->CLASS_PREFIX . "ConnectedUser.class.php";
+            $classname = $this->CLASS_PREFIX . "ConnectedUser";
+            $this->user = new $classname($this->cms_type);
+
+            require_once $this->CLASS_PREFIX  . "ConnectedPermissions.class.php";
+            $classname = $this->CLASS_PREFIX  . "ConnectedPermissions";
+            $this->permissions = new $classname($this->cms_type);
+        }
+        require_once $this->CLASS_PREFIX . "ConnectedLink.class.php";
+        $classname = $this->CLASS_PREFIX . "ConnectedLink";
+        $this->link = new $classname($this->cms_type);
+    }
+
+    /**
+    * get connection status
+    *
+    * checks settings
+    * @access public
+    * @param string $cms system-type
+    * @return array messages
+    */
+    public function getConnectionStatus($cms = "")
+    {
+        $msg = [
+            'path' => [],
+        ];
+
+        if ($this->cms_type == "") {
+            $this->init($cms);
+        }
+
+        // check connection to CMS
+        if (!$this->auth_necessary) {
+            $msg['auth'] = [
+                'info' => _('Eine Authentifizierung ist für dieses System nicht vorgesehen.')
+            ];
+        }
+
+        // check for SOAP-Interface
+        if (in_array($this->CLASS_PREFIX, ['Ilias3','Ilias4','Ilias5'])) {
+            $ch = curl_init($this->ABSOLUTE_PATH_ELEARNINGMODULES . 'login.php');
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_exec($ch);
+
+            if (curl_getinfo($ch, CURLINFO_RESPONSE_CODE) !== 200) {
+                $msg['path']['error'] = sprintf(
+                    _('Die Verbindung zum System "%s" konnte nicht hergestellt werden. Der Pfad "%s" ist ungültig.'),
+                    $this->name,
+                    $this->ABSOLUTE_PATH_ELEARNINGMODULES
+                );
+
+            } else {
+                $msg['path']['info'] = sprintf(
+                    _('Die %s-Installation wurde gefunden.'),
+                    $this->name
+                );
+            }
+
+            $msg['soap'] = [];
+            if (!Config::get()->SOAP_ENABLE) {
+                $msg['soap']['error'] = _('Das Stud.IP-Modul für die SOAP-Schnittstelle ist nicht aktiviert. Ändern Sie den entsprechenden Eintrag in der Konfigurationsdatei "local.inc".');
+            } elseif (!is_array($this->soap_data)) {
+                $msg['soap']['error'] = _('Die SOAP-Verbindungsdaten sind für dieses System nicht gesetzt. Ergänzen Sie die Einstellungen für dieses Systems um den Eintrag "soap_data" in der Konfigurationsdatei "local.inc".');
+            } else {
+                $this->soap_client = new StudipSoapClient($this->ABSOLUTE_PATH_SOAP);
+                $msg['soap']['info'] = _('Das SOAP-Modul ist aktiv.');
+            }
+        } else {
+            $file = fopen($this->ABSOLUTE_PATH_ELEARNINGMODULES, 'r');
+            if ($file === false) {
+                $msg['path']['error'] = sprintf(
+                    _('Die Verbindung zum System "%s" konnte nicht hergestellt werden. Der Pfad "%s" ist ungültig.'),
+                    $this->name,
+                    $this->ABSOLUTE_PATH_ELEARNINGMODULES
+                );
+            } else {
+                fclose($file);
+                $msg['path']['info'] = sprintf(
+                    _("Die %s-Installation wurde gefunden."),
+                    $this->name
+                );
+
+                // check if target-file exists
+                $msg['auth'] = [];
+
+                $file = fopen($this->ABSOLUTE_PATH_ELEARNINGMODULES . $this->target_file, 'r');
+                if ($file === false) {
+                    $msg['auth']['error'] = sprintf(
+                        _('Die Zieldatei "%s" liegt nicht im Hauptverzeichnis der %s-Installation.'),
+                        $this->target_file,
+                        $this->name
+                    );
+                } else {
+                    fclose($file);
+                    $msg['auth']['info'] = _('Die Zieldatei ist vorhanden.');
+                }
+            }
+        }
+
+        $el_path = $GLOBALS['STUDIP_BASE_PATH'] . '/lib/elearning';
+        // check if needed classes exist
+        $files = [
+            'class_link'    => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.class.php",
+            'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.class.php",
+            'class_cms'     => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.class.php",
+        ];
+
+        if ($this->auth_necessary) {
+            $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.class.php";
+            $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.class.php";
+        }
+
+        $errors = 0;
+        foreach ($files as $index => $file) {
+            if (!file_exists($file)) {
+                $msg[$index] = [
+                    'error' => sprintf(_('Die Datei "%s" existiert nicht.'), $file),
+                ];
+                $errors += 1;
+            }
+        }
+
+        $msg['classes'] = [];
+        if ($errors === 0) {
+            require_once $files['class_cms'];
+            $msg['classes']['info'] = sprintf(
+                _('Die Klassen der Schnittstelle zum System "%s" wurden geladen.'),
+                $this->name
+            );
+        } else {
+            $msg['classes']['error'] = sprintf(
+                _('Die Klassen der Schnittstelle zum System "%s" wurden nicht geladen.'),
+                $this->name
+            );
+        }
+
+        return $msg;
+    }
+
+    /**
+    * get preferences
+    *
+    * shows additional settings. can be overwritten by subclass.
+    * @access public
+    */
+    public function getPreferences()
+    {
+        if ($this->types != "")
+        {
+            echo "<b>" . _("Angebundene Lernmodul-Typen: ") . "</b>";
+            echo "<br>\n";
+            foreach($this->types as $key => $type)
+                echo Icon::create($type["icon"], Icon::ROLE_INACTIVE)->asImg() . $type["name"] . " ($key)<br>\n";
+            echo "<br>\n";
+        }
+
+        if ($this->db_classes != "")
+        {
+            echo "<b>" . _("Verwendete DB-Zugriffs-Klassen: ") . "</b>";
+            echo "<br>\n";
+            foreach($this->db_classes as $key => $type) {
+                echo $type["file"] . " ($key)<br>\n";
+            }
+            echo "<br>\n";
+        }
+    }
+
+    /**
+    * create new instance of subclass content-module with given values
+    *
+    * creates new instance of subclass content-module with given values
+    * @access public
+    * @param array $data module-data
+    * @param boolean $is_connected is module connected to seminar?
+    */
+    public function setContentModule($data, $is_connected = false)
+    {
+        global $current_module;
+        $current_module = $data["ref_id"];
+
+        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
+        $classname = $this->CLASS_PREFIX  . "ContentModule";
+
+        $this->content_module[$current_module] = new  $classname("", $data["type"], $this->cms_type);
+        $this->content_module[$current_module]->setId($data["ref_id"]);
+        $this->content_module[$current_module]->setTitle($data["title"]);
+        $this->content_module[$current_module]->setDescription($data["description"]);
+        $this->content_module[$current_module]->setConnectionType($is_connected);
+    }
+
+    /**
+    * create new instance of subclass content-module
+    *
+    * creates new instance of subclass content-module
+    * @access public
+    * @param string $module_id module-id
+    * @param string $module_type module-type
+    * @param boolean $is_connected is module connected to seminar?
+    */
+    public function newContentModule($module_id, $module_type, $is_connected = false)
+    {
+        global $current_module;
+        $current_module = $module_id;
+
+        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
+        $classname = $this->CLASS_PREFIX  . "ContentModule";
+
+        if ($is_connected == false)
+        {
+            $this->content_module[$module_id] = new  $classname("", $module_type, $this->cms_type);
+            $this->content_module[$module_id]->setId($module_id);
+        }
+        else
+        {
+            $this->content_module[$module_id] = new  $classname($module_id, $module_type, $this->cms_type);
+        }
+
+        $this->content_module[$module_id]->setConnectionType($is_connected);
+    }
+
+    /**
+    * get name of cms
+    *
+    * returns name of cms
+    * @access public
+    * @return string name
+    */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+    * get type of cms
+    *
+    * returns type of cms
+    * @access public
+    * @return string type
+    */
+    public function getCMSType()
+    {
+        return $this->cms_type;
+    }
+
+    /**
+    * get path of cms
+    *
+    * returns path of cms
+    * @access public
+    * @return string path
+    */
+    public function getAbsolutePath()
+    {
+        return $this->ABSOLUTE_PATH_ELEARNINGMODULES;
+    }
+
+    /**
+    * get target file of cms
+    *
+    * returns target file of cms
+    * @access public
+    * @return string target file
+    */
+    public function getTargetFile()
+    {
+        return $this->target_file;
+    }
+
+    /**
+    * get class prefix
+    *
+    * returns class prefix
+    * @access public
+    * @return string class prefix
+    */
+    public function getClassPrefix()
+    {
+        return $this->CLASS_PREFIX;
+    }
+
+    /**
+    * get authentification-setting
+    *
+    * returns true, if authentification is necessary
+    * @access public
+    * @return boolean authentification-setting
+    */
+    public function isAuthNecessary()
+    {
+        return $this->auth_necessary;
+    }
+
+    /**
+    * get active-setting
+    *
+    * returns true, if cms is active
+    * @access public
+    * @return boolean active-setting
+    function isActive($cms = "")
+    {
+        return $this->is_active;
+    }
+    */
+
+    /**
+    * get user prefix
+    *
+    * returns user prefix
+    * @access public
+    * @return string user prefix
+    */
+    public function getUserPrefix()
+    {
+        return $this->USER_PREFIX;
+    }
+
+    /**
+    * get logo-image
+    *
+    * returns logo-image
+    * @access public
+    * @return string logo-image
+    */
+    public function getLogo()
+    {
+        return "<img src=\"" . $this->logo_file . "\">";
+    }
+
+    /**
+    * get user modules
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    public function getUserContentModules()
+    {
+        return false;
+    }
+
+    /**
+    * search modules
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    public function searchContentModules($key)
+    {
+        return false;
+    }
+
+    /**
+    * dummy-method. can be overwritten by subclass.
+    */
+    public function terminate()
+    {
+    }
+
+    public function deleteConnectedModules($object_id){
+        return ObjectConnections::DeleteAllConnections($object_id, $this->cms_type);
+    }
+}
diff --git a/lib/elearning/ConnectedLink.class.php b/lib/elearning/ConnectedLink.class.php
deleted file mode 100644
index 6fa1de5..0000000
--- a/lib/elearning/ConnectedLink.class.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
-* class to generate links to connected systems
-*
-* This class contains methods to generate links to connected content-management-systems.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ConnectedLink
-* @package  ELearning-Interface
-*/
-
-use Studip\Button, Studip\LinkButton;
-
-class ConnectedLink
-{
-    var $cms_type;
-    var $cms_link;
-    /**
-    * constructor
-    *
-    * init class. don't call directly, class is loaded by ConnectedCMS.
-    * @access public
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-
-        $this->cms_type = $cms;
-        $this->cms_link = $ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_ELEARNINGMODULES"] . ($ELEARNING_INTERFACE_MODULES[$cms]["target_file"] ?? null);
-    }
-
-    /**
-    * get link to create new account
-    *
-    * returns link to create new user-account
-    * @access public
-    * @return string html-code
-    */
-    function getNewAccountLink()
-    {
-        global $connected_cms, $cms_select, $current_module;
-
-        $output =  "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
-        $output .= CSRFProtection::tokenTag();
-        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . Request::option('view') . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"ref_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady(Request::get('search_key')) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"new_account_cms\" value=\"" . htmlReady($this->cms_type) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"new_account_step\" value=\"0\">\n";
-        $output .= Button::createAccept(_('Starten'), 'start');
-        $output .= "</form>";
-        return $output;
-    }
-
-    /**
-    * get module-links for user
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function getUserModuleLinks()
-    {
-        return false;
-    }
-
-    /**
-    * get module-links for admin
-    *
-    * returns links to remove or add module to object
-    * @access public
-    * @return string html-code
-    */
-    function getAdminModuleLinks()
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        $output = "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
-        $output .= CSRFProtection::tokenTag();
-        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . htmlReady($view) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady($search_key) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_system_type\" value=\"" . htmlReady($this->cms_type) . "\">\n";
-
-        if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected())
-            $output .= "&nbsp;" . Button::create(_('Entfernen'), 'remove');
-        else
-            $output .= "&nbsp;" . Button::create(_('Hinzufügen'), 'add');
-        $output .= "</form>";
-
-        return $output;
-    }
-
-    /**
-    * get new module link
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function getNewModuleLink()
-    {
-        return false;
-    }
-
-    /**
-    * get start page link
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function getStartpageLink()
-    {
-        return false;
-    }
-}
-?>
diff --git a/lib/elearning/ConnectedLink.php b/lib/elearning/ConnectedLink.php
new file mode 100644
index 0000000..6fa1de5
--- /dev/null
+++ b/lib/elearning/ConnectedLink.php
@@ -0,0 +1,129 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+* class to generate links to connected systems
+*
+* This class contains methods to generate links to connected content-management-systems.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ConnectedLink
+* @package  ELearning-Interface
+*/
+
+use Studip\Button, Studip\LinkButton;
+
+class ConnectedLink
+{
+    var $cms_type;
+    var $cms_link;
+    /**
+    * constructor
+    *
+    * init class. don't call directly, class is loaded by ConnectedCMS.
+    * @access public
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+
+        $this->cms_type = $cms;
+        $this->cms_link = $ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_ELEARNINGMODULES"] . ($ELEARNING_INTERFACE_MODULES[$cms]["target_file"] ?? null);
+    }
+
+    /**
+    * get link to create new account
+    *
+    * returns link to create new user-account
+    * @access public
+    * @return string html-code
+    */
+    function getNewAccountLink()
+    {
+        global $connected_cms, $cms_select, $current_module;
+
+        $output =  "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
+        $output .= CSRFProtection::tokenTag();
+        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . Request::option('view') . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"ref_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady(Request::get('search_key')) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"new_account_cms\" value=\"" . htmlReady($this->cms_type) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"new_account_step\" value=\"0\">\n";
+        $output .= Button::createAccept(_('Starten'), 'start');
+        $output .= "</form>";
+        return $output;
+    }
+
+    /**
+    * get module-links for user
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function getUserModuleLinks()
+    {
+        return false;
+    }
+
+    /**
+    * get module-links for admin
+    *
+    * returns links to remove or add module to object
+    * @access public
+    * @return string html-code
+    */
+    function getAdminModuleLinks()
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        $output = "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
+        $output .= CSRFProtection::tokenTag();
+        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . htmlReady($view) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady($search_key) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_system_type\" value=\"" . htmlReady($this->cms_type) . "\">\n";
+
+        if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected())
+            $output .= "&nbsp;" . Button::create(_('Entfernen'), 'remove');
+        else
+            $output .= "&nbsp;" . Button::create(_('Hinzufügen'), 'add');
+        $output .= "</form>";
+
+        return $output;
+    }
+
+    /**
+    * get new module link
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function getNewModuleLink()
+    {
+        return false;
+    }
+
+    /**
+    * get start page link
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function getStartpageLink()
+    {
+        return false;
+    }
+}
+?>
diff --git a/lib/elearning/ConnectedPermissions.class.php b/lib/elearning/ConnectedPermissions.class.php
deleted file mode 100644
index a2216b7..0000000
--- a/lib/elearning/ConnectedPermissions.class.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
-* class to handle access controls
-*
-* This class contains methods to handle permissions on connected objects.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ConnectedPermission
-* @package  ELearning-Interface
-*/
-class ConnectedPermissions
-{
-    var $cms_type;
-
-    var $db_class;
-    /**
-    * constructor
-    *
-    * init class. don't call directly, class is loaded by ConnectedCMS.
-    * @access public
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        global $connected_cms, $ELEARNING_INTERFACE_MODULES;
-
-        $this->cms_type = $cms;
-        if ($ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"] != false)
-        {
-            require_once('lib/elearning/' . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"]
-                . "/" . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["permissions"]["file"] );
-            $classname = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["permissions"]["classname"];
-            $this->db_class = new $classname();
-        }
-
-    }
-
-    /**
-    * get module-permissions
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @param string $module_id module-id
-    * @return boolean returns false
-    */
-    function getContentModulePerms($module_id)
-    {
-        return false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/elearning/ConnectedPermissions.php b/lib/elearning/ConnectedPermissions.php
new file mode 100644
index 0000000..a2216b7
--- /dev/null
+++ b/lib/elearning/ConnectedPermissions.php
@@ -0,0 +1,57 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+* class to handle access controls
+*
+* This class contains methods to handle permissions on connected objects.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ConnectedPermission
+* @package  ELearning-Interface
+*/
+class ConnectedPermissions
+{
+    var $cms_type;
+
+    var $db_class;
+    /**
+    * constructor
+    *
+    * init class. don't call directly, class is loaded by ConnectedCMS.
+    * @access public
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        global $connected_cms, $ELEARNING_INTERFACE_MODULES;
+
+        $this->cms_type = $cms;
+        if ($ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"] != false)
+        {
+            require_once('lib/elearning/' . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"]
+                . "/" . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["permissions"]["file"] );
+            $classname = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["permissions"]["classname"];
+            $this->db_class = new $classname();
+        }
+
+    }
+
+    /**
+    * get module-permissions
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @param string $module_id module-id
+    * @return boolean returns false
+    */
+    function getContentModulePerms($module_id)
+    {
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/lib/elearning/ConnectedUser.class.php b/lib/elearning/ConnectedUser.class.php
deleted file mode 100644
index 3c74a14..0000000
--- a/lib/elearning/ConnectedUser.class.php
+++ /dev/null
@@ -1,512 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-DEFINE ("USER_TYPE_ORIGINAL" , "1");
-DEFINE ("USER_TYPE_CREATED", "0");
-
-/**
-* class to handle user-accounts
-*
-* This class contains methods to handle connected user-accounts.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ConnectedUser
-* @package  ELearning-Interface
-*/
-class ConnectedUser
-{
-    var $cms_type;
-    var $id;
-    var $studip_id;
-    var $studip_login;
-    var $studip_password;
-    var $login;
-    var $external_password;
-    var $category;
-    var $gender;
-    var $title_front;
-    var $title_rear;
-    var $title;
-    var $firstname;
-    var $lastname;
-    var $institution;
-    var $department;
-    var $street;
-    var $city;
-    var $zipcode;
-    var $country;
-    var $phone_home;
-    var $fax;
-    var $matriculation;
-    var $email;
-    var $type;
-    var $is_connected;
-
-    var $db_class;
-    /**
-    * constructor
-    *
-    * init class. don't call directly, class is loaded by ConnectedCMS.
-    * @access public
-    * @param string $cms system-type
-    */
-    function __construct($cms, $user_id = false)
-    {
-        global $auth, $ELEARNING_INTERFACE_MODULES;
-
-        $this->studip_id = $user_id ? $user_id : $auth->auth["uid"];
-        $this->cms_type = $cms;
-
-        if ($ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"] != false)
-        {
-            require_once("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"] . "/" . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["user"]["file"] );
-            $classname = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["user"]["classname"];
-            $this->db_class = new $classname();
-        }
-        $this->readData();
-        $this->getStudipUserData();
-    }
-
-    /**
-    * get data
-    *
-    * gets data from database
-    * @access public
-    * @return boolean returns false, if no data was found
-    */
-    function readData()
-    {
-        $query = "SELECT external_user_id, external_user_name, external_user_password, external_user_category, external_user_type
-                  FROM auth_extern
-                  WHERE studip_user_id = ? AND external_user_system_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->studip_id, $this->cms_type]);
-        $data = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$data) {
-            $this->id = '';
-            $this->is_connected = false;
-            return false;
-        }
-
-        $this->id                = $data['external_user_id'];
-        $this->login             = $data['external_user_name'];
-        $this->external_password = $data['external_user_password'];
-        $this->category          = $data['external_user_category'];
-        $this->type              = $data['external_user_type'];
-        $this->is_connected      = true;
-
-        return true;
-    }
-
-    /**
-    * get stud.ip-user-data
-    *
-    * gets stud.ip-user-data from database
-    * @access public
-    * @return boolean returns false, if no data was found
-    */
-    function getStudipUserData()
-    {
-        global $connected_cms;
-
-        $query = "SELECT username, password, title_front, title_rear, Vorname, 
-                         Nachname, Email, privatnr, privadr, geschlecht
-                  FROM auth_user_md5
-                  LEFT JOIN  user_info USING (user_id)
-                  WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->studip_id]);
-        $data = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$data) {
-            return false;
-        }
-
-        $this->studip_login = $data['username'];
-        if ($this->is_connected == false) {
-            $this->login = $connected_cms[$this->cms_type]->getUserPrefix() . $this->studip_login;
-        }
-
-        $this->studip_password = $data['password'];
-        $this->title_front     = $data['title_front'];
-        $this->title_rear      = $data['title_rear'];
-        $this->firstname       = $data['Vorname'];
-        $this->lastname        = $data['Nachname'];
-        $this->email           = $data['Email'];
-        $this->phone_home      = $data['privatnr'];
-        $this->street          = $data['privadr'];
-        $this->gender          = ($data['geschlecht'] == 2 ? 'f' : 'm');
-
-        if ($this->title_front != '') {
-            $this->title = $this->title_front;
-        }
-        if ($this->title_front != '' && $this->title_rear != '') {
-            $this->title .= ' ';
-        }
-        if ($this->title_rear != '') {
-            $this->title .= $this->title_rear;
-        }
-        return true;
-    }
-
-    /**
-    * create new user-account
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function newUser()
-    {
-        return false;
-    }
-
-    /**
-    * update user-account
-    *
-    * dummy-method. must be overwritten by subclass.
-    */
-    public function updateUser()
-    {
-    }
-
-    /**
-    * delete user-account
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function deleteUser()
-    {
-        return false;
-    }
-
-    /**
-    * get login-data of user-account
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function getLoginData($username)
-    {
-        return false;
-    }
-
-    /**
-    * get id
-    *
-    * returns id
-    * @access public
-    * @return string id
-    */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-    * get stud.ip user-id
-    *
-    * returns id
-    * @access public
-    * @return string stud.ip user-id
-    */
-    function getStudipId()
-    {
-        return $this->studip_id;
-    }
-
-    /**
-    * get username
-    *
-    * returns username
-    * @access public
-    * @return string username
-    */
-    function getUsername()
-    {
-        return $this->login;
-    }
-
-    /**
-    * set username
-    *
-    * sets username
-    * @access public
-    * @param string $user_login username
-    */
-    function setUsername($user_login)
-    {
-        $this->login = $user_login;
-    }
-
-    /**
-    * get password
-    *
-    * returns password
-    * @access public
-    * @return string password
-    */
-    function getPassword()
-    {
-        return $this->external_password;
-    }
-
-    /**
-    * set password
-    *
-    * sets password
-    * @access public
-    * @param string $user_password password
-    */
-    function setPassword($user_password)
-    {
-        $this->external_password = $user_password;
-    }
-
-    /**
-    * get user category
-    *
-    * returns id
-    * @access public
-    * @return string id
-    */
-    function getCategory()
-    {
-        return $this->category;
-    }
-
-    /**
-    * set user category
-    *
-    * sets user category
-    * @access public
-    * @param string $user_category category
-    */
-    function setCategory($user_category)
-    {
-        $this->category = $user_category;
-    }
-
-    /**
-    * get crypted password
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @return boolean returns false
-    */
-    function getCryptedPassword($password)
-    {
-        return false;
-    }
-
-    /**
-    * verify login data
-    *
-    * returns true, if login-data is valid
-    * @access public
-    * @param string $username username
-    * @param string $password password
-    * @return boolean login-validation
-    */
-    function verifyLogin($username, $password)
-    {
-        $this->getLoginData($username);
-        if (($username == "") OR ($password == ""))
-            return false;
-        if ( ($this->login == $username) AND  ($this->external_password == $this->getCryptedPassword($password) ) )
-            return true;
-        return false;
-    }
-
-    /**
-    * get gender
-    *
-    * returns gender-setting
-    * @access public
-    * @return string gender-setting
-    */
-    function getGender()
-    {
-        return $this->gender;
-    }
-
-    /**
-    * set gender
-    *
-    * sets gender
-    * @access public
-    * @param string $user_gender gender-setting
-    */
-    function setGender($user_gender)
-    {
-        $this->gender = $user_gender;
-    }
-
-    /**
-    * get full name
-    *
-    * returns full name
-    * @access public
-    * @return string name
-    */
-    function getName()
-    {
-        if ($this->title != "")
-            return $this->title . ' ' . $this->firstname . ' ' . $this->lastname;
-        else
-            return $this->firstname . ' ' . $this->lastname;
-    }
-
-    /**
-    * get firstname
-    *
-    * returns firstname
-    * @access public
-    * @return string firstname
-    */
-    function getFirstname()
-    {
-        return $this->firstname;
-    }
-
-    /**
-    * set firstname
-    *
-    * sets firstname
-    * @access public
-    * @param string $user_firstname firstname
-    */
-    function setFirstname($user_firstname)
-    {
-        $this->firstname = $user_firstname;
-    }
-
-    /**
-    * get lastname
-    *
-    * returns lastname
-    * @access public
-    * @return string lastname
-    */
-    function getLastname()
-    {
-        return $this->lastname;
-    }
-
-    /**
-    * set lastname
-    *
-    * sets lastname
-    * @access public
-    * @param string $user_lastname lastname
-    */
-    function setLastname($user_lastname)
-    {
-        $this->lastname = $user_lastname;
-    }
-
-    /**
-    * get email-adress
-    *
-    * returns email-adress
-    * @access public
-    * @return string email-adress
-    */
-    function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-    * set email-adress
-    *
-    * sets email-adress
-    * @access public
-    * @param string $user_email email-adress
-    */
-    function setEmail($user_email)
-    {
-        $this->email = $user_email;
-    }
-
-    /**
-    * get user-type
-    *
-    * returns user-type
-    * @access public
-    * @return string user-type
-    */
-    function getUserType()
-    {
-        return $this->type;
-    }
-
-    /**
-    * set user-type
-    *
-    * sets user-type
-    * @access public
-    * @param string $user_type user-type
-    */
-    function setUserType($user_type)
-    {
-        $this->type = $user_type;
-    }
-
-    /**
-     * save connection for user-account
-     *
-     * saves user-connection to database and sets type for actual user
-     * @param string $user_type user-type
-     */
-    public function setConnection($user_type)
-    {
-        $this->setUserType($user_type);
-
-        $query = "INSERT INTO auth_extern (studip_user_id, external_user_id, external_user_name, 
-                                           external_user_password, external_user_category,
-                                           external_user_system_type, external_user_type)
-                  VALUES (?, ?, ?, ?, ?, ?, ?)
-                  ON DUPLICATE KEY
-                    UPDATE external_user_name = VALUES(external_user_name),
-                           external_user_password = VALUES(external_user_password),
-                           external_user_category = VALUES(external_user_category),
-                           external_user_id = VALUES(external_user_id),
-                           external_user_type = VALUES(external_user_type)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            (string)$this->studip_id,
-            (string)$this->id,
-            (string)$this->login,
-            (string)$this->external_password,
-            (string)$this->category,
-            (string)$this->cms_type,
-            (int)$this->type,
-        ]);
-
-        $this->is_connected = true;
-        $this->readData();
-    }
-
-    /**
-    * get connection-status
-    *
-    * returns true, if there is a connected user
-    * @access public
-    * @return boolean connection-status
-    */
-    function isConnected()
-    {
-        return $this->is_connected;
-    }
-}
-?>
diff --git a/lib/elearning/ConnectedUser.php b/lib/elearning/ConnectedUser.php
new file mode 100644
index 0000000..3c74a14
--- /dev/null
+++ b/lib/elearning/ConnectedUser.php
@@ -0,0 +1,512 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+DEFINE ("USER_TYPE_ORIGINAL" , "1");
+DEFINE ("USER_TYPE_CREATED", "0");
+
+/**
+* class to handle user-accounts
+*
+* This class contains methods to handle connected user-accounts.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ConnectedUser
+* @package  ELearning-Interface
+*/
+class ConnectedUser
+{
+    var $cms_type;
+    var $id;
+    var $studip_id;
+    var $studip_login;
+    var $studip_password;
+    var $login;
+    var $external_password;
+    var $category;
+    var $gender;
+    var $title_front;
+    var $title_rear;
+    var $title;
+    var $firstname;
+    var $lastname;
+    var $institution;
+    var $department;
+    var $street;
+    var $city;
+    var $zipcode;
+    var $country;
+    var $phone_home;
+    var $fax;
+    var $matriculation;
+    var $email;
+    var $type;
+    var $is_connected;
+
+    var $db_class;
+    /**
+    * constructor
+    *
+    * init class. don't call directly, class is loaded by ConnectedCMS.
+    * @access public
+    * @param string $cms system-type
+    */
+    function __construct($cms, $user_id = false)
+    {
+        global $auth, $ELEARNING_INTERFACE_MODULES;
+
+        $this->studip_id = $user_id ? $user_id : $auth->auth["uid"];
+        $this->cms_type = $cms;
+
+        if ($ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"] != false)
+        {
+            require_once("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["RELATIVE_PATH_DB_CLASSES"] . "/" . $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["user"]["file"] );
+            $classname = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["db_classes"]["user"]["classname"];
+            $this->db_class = new $classname();
+        }
+        $this->readData();
+        $this->getStudipUserData();
+    }
+
+    /**
+    * get data
+    *
+    * gets data from database
+    * @access public
+    * @return boolean returns false, if no data was found
+    */
+    function readData()
+    {
+        $query = "SELECT external_user_id, external_user_name, external_user_password, external_user_category, external_user_type
+                  FROM auth_extern
+                  WHERE studip_user_id = ? AND external_user_system_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->studip_id, $this->cms_type]);
+        $data = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$data) {
+            $this->id = '';
+            $this->is_connected = false;
+            return false;
+        }
+
+        $this->id                = $data['external_user_id'];
+        $this->login             = $data['external_user_name'];
+        $this->external_password = $data['external_user_password'];
+        $this->category          = $data['external_user_category'];
+        $this->type              = $data['external_user_type'];
+        $this->is_connected      = true;
+
+        return true;
+    }
+
+    /**
+    * get stud.ip-user-data
+    *
+    * gets stud.ip-user-data from database
+    * @access public
+    * @return boolean returns false, if no data was found
+    */
+    function getStudipUserData()
+    {
+        global $connected_cms;
+
+        $query = "SELECT username, password, title_front, title_rear, Vorname, 
+                         Nachname, Email, privatnr, privadr, geschlecht
+                  FROM auth_user_md5
+                  LEFT JOIN  user_info USING (user_id)
+                  WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->studip_id]);
+        $data = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$data) {
+            return false;
+        }
+
+        $this->studip_login = $data['username'];
+        if ($this->is_connected == false) {
+            $this->login = $connected_cms[$this->cms_type]->getUserPrefix() . $this->studip_login;
+        }
+
+        $this->studip_password = $data['password'];
+        $this->title_front     = $data['title_front'];
+        $this->title_rear      = $data['title_rear'];
+        $this->firstname       = $data['Vorname'];
+        $this->lastname        = $data['Nachname'];
+        $this->email           = $data['Email'];
+        $this->phone_home      = $data['privatnr'];
+        $this->street          = $data['privadr'];
+        $this->gender          = ($data['geschlecht'] == 2 ? 'f' : 'm');
+
+        if ($this->title_front != '') {
+            $this->title = $this->title_front;
+        }
+        if ($this->title_front != '' && $this->title_rear != '') {
+            $this->title .= ' ';
+        }
+        if ($this->title_rear != '') {
+            $this->title .= $this->title_rear;
+        }
+        return true;
+    }
+
+    /**
+    * create new user-account
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function newUser()
+    {
+        return false;
+    }
+
+    /**
+    * update user-account
+    *
+    * dummy-method. must be overwritten by subclass.
+    */
+    public function updateUser()
+    {
+    }
+
+    /**
+    * delete user-account
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function deleteUser()
+    {
+        return false;
+    }
+
+    /**
+    * get login-data of user-account
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function getLoginData($username)
+    {
+        return false;
+    }
+
+    /**
+    * get id
+    *
+    * returns id
+    * @access public
+    * @return string id
+    */
+    function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+    * get stud.ip user-id
+    *
+    * returns id
+    * @access public
+    * @return string stud.ip user-id
+    */
+    function getStudipId()
+    {
+        return $this->studip_id;
+    }
+
+    /**
+    * get username
+    *
+    * returns username
+    * @access public
+    * @return string username
+    */
+    function getUsername()
+    {
+        return $this->login;
+    }
+
+    /**
+    * set username
+    *
+    * sets username
+    * @access public
+    * @param string $user_login username
+    */
+    function setUsername($user_login)
+    {
+        $this->login = $user_login;
+    }
+
+    /**
+    * get password
+    *
+    * returns password
+    * @access public
+    * @return string password
+    */
+    function getPassword()
+    {
+        return $this->external_password;
+    }
+
+    /**
+    * set password
+    *
+    * sets password
+    * @access public
+    * @param string $user_password password
+    */
+    function setPassword($user_password)
+    {
+        $this->external_password = $user_password;
+    }
+
+    /**
+    * get user category
+    *
+    * returns id
+    * @access public
+    * @return string id
+    */
+    function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+    * set user category
+    *
+    * sets user category
+    * @access public
+    * @param string $user_category category
+    */
+    function setCategory($user_category)
+    {
+        $this->category = $user_category;
+    }
+
+    /**
+    * get crypted password
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @return boolean returns false
+    */
+    function getCryptedPassword($password)
+    {
+        return false;
+    }
+
+    /**
+    * verify login data
+    *
+    * returns true, if login-data is valid
+    * @access public
+    * @param string $username username
+    * @param string $password password
+    * @return boolean login-validation
+    */
+    function verifyLogin($username, $password)
+    {
+        $this->getLoginData($username);
+        if (($username == "") OR ($password == ""))
+            return false;
+        if ( ($this->login == $username) AND  ($this->external_password == $this->getCryptedPassword($password) ) )
+            return true;
+        return false;
+    }
+
+    /**
+    * get gender
+    *
+    * returns gender-setting
+    * @access public
+    * @return string gender-setting
+    */
+    function getGender()
+    {
+        return $this->gender;
+    }
+
+    /**
+    * set gender
+    *
+    * sets gender
+    * @access public
+    * @param string $user_gender gender-setting
+    */
+    function setGender($user_gender)
+    {
+        $this->gender = $user_gender;
+    }
+
+    /**
+    * get full name
+    *
+    * returns full name
+    * @access public
+    * @return string name
+    */
+    function getName()
+    {
+        if ($this->title != "")
+            return $this->title . ' ' . $this->firstname . ' ' . $this->lastname;
+        else
+            return $this->firstname . ' ' . $this->lastname;
+    }
+
+    /**
+    * get firstname
+    *
+    * returns firstname
+    * @access public
+    * @return string firstname
+    */
+    function getFirstname()
+    {
+        return $this->firstname;
+    }
+
+    /**
+    * set firstname
+    *
+    * sets firstname
+    * @access public
+    * @param string $user_firstname firstname
+    */
+    function setFirstname($user_firstname)
+    {
+        $this->firstname = $user_firstname;
+    }
+
+    /**
+    * get lastname
+    *
+    * returns lastname
+    * @access public
+    * @return string lastname
+    */
+    function getLastname()
+    {
+        return $this->lastname;
+    }
+
+    /**
+    * set lastname
+    *
+    * sets lastname
+    * @access public
+    * @param string $user_lastname lastname
+    */
+    function setLastname($user_lastname)
+    {
+        $this->lastname = $user_lastname;
+    }
+
+    /**
+    * get email-adress
+    *
+    * returns email-adress
+    * @access public
+    * @return string email-adress
+    */
+    function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+    * set email-adress
+    *
+    * sets email-adress
+    * @access public
+    * @param string $user_email email-adress
+    */
+    function setEmail($user_email)
+    {
+        $this->email = $user_email;
+    }
+
+    /**
+    * get user-type
+    *
+    * returns user-type
+    * @access public
+    * @return string user-type
+    */
+    function getUserType()
+    {
+        return $this->type;
+    }
+
+    /**
+    * set user-type
+    *
+    * sets user-type
+    * @access public
+    * @param string $user_type user-type
+    */
+    function setUserType($user_type)
+    {
+        $this->type = $user_type;
+    }
+
+    /**
+     * save connection for user-account
+     *
+     * saves user-connection to database and sets type for actual user
+     * @param string $user_type user-type
+     */
+    public function setConnection($user_type)
+    {
+        $this->setUserType($user_type);
+
+        $query = "INSERT INTO auth_extern (studip_user_id, external_user_id, external_user_name, 
+                                           external_user_password, external_user_category,
+                                           external_user_system_type, external_user_type)
+                  VALUES (?, ?, ?, ?, ?, ?, ?)
+                  ON DUPLICATE KEY
+                    UPDATE external_user_name = VALUES(external_user_name),
+                           external_user_password = VALUES(external_user_password),
+                           external_user_category = VALUES(external_user_category),
+                           external_user_id = VALUES(external_user_id),
+                           external_user_type = VALUES(external_user_type)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            (string)$this->studip_id,
+            (string)$this->id,
+            (string)$this->login,
+            (string)$this->external_password,
+            (string)$this->category,
+            (string)$this->cms_type,
+            (int)$this->type,
+        ]);
+
+        $this->is_connected = true;
+        $this->readData();
+    }
+
+    /**
+    * get connection-status
+    *
+    * returns true, if there is a connected user
+    * @access public
+    * @return boolean connection-status
+    */
+    function isConnected()
+    {
+        return $this->is_connected;
+    }
+}
+?>
diff --git a/lib/elearning/ContentModule.class.php b/lib/elearning/ContentModule.class.php
deleted file mode 100644
index 1b2921b..0000000
--- a/lib/elearning/ContentModule.class.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* class to handle content module data
-*
-* This class contains methods to handle connected content module data.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ContentModule
-* @package  ELearning-Interface
-*/
-abstract class ContentModule
-{
-    /**
-     * Fetches data from conencted cms.
-     */
-    abstract function readData();
-
-    var $id;
-    var $title;
-    var $module_type;
-    var $module_type_name;
-    var $icon_file;
-    var $cms_type;
-    var $cms_name;
-    var $description;
-    var $authors;
-    var $is_connected;
-    var $is_dummy;
-    var $allowed_operations;
-
-    var $db_class;
-    var $view;
-    /**
-    * constructor
-    *
-    * init class. don't call directly, class is loaded by ConnectedCMS.
-    * @access public
-    * @param string $module_id module-id
-    * @param string $module_type module-type
-    * @param string $cms_type system-type
-    */
-    function __construct($module_id, $module_type, $cms_type)
-    {
-        global $connected_cms;
-
-        $this->is_dummy = false;
-        $this->setCMSType($cms_type);
-        $this->setModuleType($module_type);
-        if ($module_id != "")
-        {
-            $this->setId($module_id);
-
-            $this->readData();
-        }
-        $this->view = new ContentModuleView($this->cms_type);
-
-/**/    }
-
-/*  // Dummy-method. Must be overwritten by subclass.
-    function readData()
-    {
-        return false;
-    }
-*/
-
-    /**
-    * set id
-    *
-    * sets id
-    * @access public
-    * @param string $module_id id
-    */
-    function setId($module_id)
-    {
-        $this->id = $module_id;
-    }
-
-    /**
-    * get id
-    *
-    * returns id
-    * @access public
-    * @return string id
-    */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-    * set cms-type
-    *
-    * sets cms-type
-    * @access public
-    * @param string $module_cms_type cms-type
-    */
-    function setCMSType($module_cms_type)
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-        $this->cms_type = $module_cms_type;
-        $this->cms_name = $ELEARNING_INTERFACE_MODULES[$module_cms_type]["name"];
-    }
-
-    /**
-    * get cms-type
-    *
-    * returns cms-type
-    * @access public
-    * @return string cms-type
-    */
-    function getCMSType()
-    {
-        return $this->cms_type;
-    }
-
-    /**
-    * get cms name
-    *
-    * returns cms name
-    * @access public
-    * @return string cms name
-    */
-    function getCMSName()
-    {
-        return $this->cms_name;
-    }
-
-    /**
-    * set module-type
-    *
-    * sets module-type
-    * @access public
-    * @param string $module_type module-type
-    */
-    function setModuleType($module_type)
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-        $this->module_type = $module_type;
-        $this->module_type_name = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["types"][$module_type]["name"];
-        $this->icon_file = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["types"][$module_type]["icon"];
-    }
-
-    /**
-    * get module-type
-    *
-    * returns module-type
-    * @access public
-    * @return string module-type
-    */
-    function getModuleType()
-    {
-        return $this->module_type;
-    }
-
-    /**
-    * get module-type name
-    *
-    * returns module-type name
-    * @access public
-    * @return string module-type name
-    */
-    function getModuleTypeName()
-    {
-        return $this->module_type_name;
-    }
-
-    /**
-    * set title
-    *
-    * sets title
-    * @access public
-    * @param string $module_title title
-    */
-    function setTitle($module_title)
-    {
-        $this->title = $module_title;
-    }
-
-    /**
-    * get title
-    *
-    * returns title
-    * @access public
-    * @return string title
-    */
-    function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-    * set description
-    *
-    * sets description
-    * @access public
-    * @param string $module_description description
-    */
-    function setDescription($module_description)
-    {
-        $this->description = $module_description;
-    }
-
-    /**
-    * get description
-    *
-    * returns description
-    * @access public
-    * @return string description
-    */
-    function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-    * set authors
-    *
-    * sets authors
-    * @access public
-    * @param array $module_authors authors
-    */
-    function setAuthors($module_authors)
-    {
-        $this->authors = $module_authors;
-    }
-
-    /**
-    * get authors
-    *
-    * returns authors
-    * @access public
-    * @return array authors
-    */
-    function getAuthors()
-    {
-        return $this->authors;
-    }
-
-    /**
-    * set connection
-    *
-    * sets connection with seminar
-    * @access public
-    * @param string $seminar_id seminar-id
-    * @return boolean successful
-    */
-    function setConnection($seminar_id)
-    {
-        $this->is_connected = true;
-//      echo "$this->id, $this->module_type, $this->cms_type";
-        return ObjectConnections::setConnection($seminar_id, $this->id, $this->module_type, $this->cms_type);
-    }
-
-    /**
-    * unset connection
-    *
-    * unsets connection with seminar
-    * @access public
-    * @param string $seminar_id seminar-id
-    * @return boolean successful
-    */
-    function unsetConnection($seminar_id)
-    {
-        $this->is_connected = false;
-        return ObjectConnections::unsetConnection($seminar_id, $this->id, $this->module_type, $this->cms_type);
-    }
-
-    /**
-    * set connection-status
-    *
-    * sets connection-status
-    * @access public
-    * @param boolean $is_connected connection-status
-    */
-    function setConnectionType($is_connected)
-    {
-        $this->is_connected = $is_connected;
-    }
-
-    /**
-    * get connection-status
-    *
-    * returns true, if module is connected to seminar
-    * @access public
-    * @return boolean connection-status
-    */
-    function isConnected()
-    {
-        return $this->is_connected;
-    }
-
-    /**
-    * get reference string
-    *
-    * returns reference string for content-module
-    * @access public
-    * @return string reference string
-    */
-    function getReferenceString()
-    {
-        return $this->cms_type."_".$this->module_type."_".$this->id;
-    }
-
-    /**
-    * get icon-image
-    *
-    * returns icon-image
-    * @access public
-    * @return string icon-image
-    */
-    function getIcon()
-    {
-        if (!$this->icon_file) {
-            $this->icon_file = 'learnmodule';
-        }
-        if (mb_strpos('http', $this->icon_file) === 0) {
-            return "<img src=\"" . $this->icon_file . "\">";
-        } else {
-            return Icon::create($this->icon_file, 'inactive')->asImg();
-        }
-    }
-
-    /**
-    * get module-status
-    *
-    * returns true, if module is a dummy
-    * @access public
-    * @return boolean module-status
-    */
-    function isDummy()
-    {
-        return $this->is_dummy;
-    }
-
-    /**
-    * create module-dummy
-    *
-    * sets title and description of module to display error-message
-    * @access public
-    * @param string $error error-type
-    */
-    function createDummyForErrormessage($error = "unknown")
-    {
-        global $connected_cms;
-
-        switch($error)
-        {
-            case "no permission":
-                $this->setTitle(_("--- Keine Lese-Berechtigung! ---"));
-                $this->setDescription(sprintf(_("Sie haben im System \"%s\" keine Lese-Berechtigung für das Lernmodul, das dieser Veranstaltung / Einrichtung an dieser Stelle zugeordnet ist."), $this->getCMSName()));
-                break;
-            case "not found":
-                $this->setTitle(_("--- Dieses Content-Modul existiert nicht mehr im angebundenen System! ---"));
-                $this->setDescription(sprintf(_("Das Lernmodul, das dieser Veranstaltung / Einrichtung an dieser Stelle zugeordnet war, existiert nicht mehr. Dieser Fehler tritt auf, wenn das angebundene LCMS \"%s\" nicht erreichbar ist oder wenn das Lernmodul innerhalb des angebundenen Systems gelöscht wurde."), $this->getCMSName()));
-                break;
-            case "deleted":
-                $this->setTitle(_("--- Dieses Content-Modul wurde im angebundenen System gelöscht! ---"));
-                $this->setDescription(sprintf(_("Das Lernmodul, das dieser Veranstaltung / Einrichtung an dieser Stelle zugeordnet war, wurde gelöscht."), $this->getCMSName()));
-                break;
-            default:
-                $this->setTitle(_("--- Es ist ein unbekannter Fehler aufgetreten! ---"));
-                $this->setDescription(sprintf(_("Unbekannter Fehler beim Lernmodul mit der Referenz-ID \"%s\" im LCMS \"%s\""), $this->getId(), $this->getCMSName()));
-        }
-
-        $this->is_dummy = true;
-    }
-
-    /**
-    * ask for permission for given operation
-    *
-    * dummy-method. returns false. must be overwritten by subclass.
-    * @access public
-    * @param string $operation operation
-    * @return boolean returns false
-    */
-    function isAllowed($operation)
-    {
-        return false;
-    }
-}
-?>
diff --git a/lib/elearning/ContentModule.php b/lib/elearning/ContentModule.php
new file mode 100644
index 0000000..1b2921b
--- /dev/null
+++ b/lib/elearning/ContentModule.php
@@ -0,0 +1,388 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* class to handle content module data
+*
+* This class contains methods to handle connected content module data.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ContentModule
+* @package  ELearning-Interface
+*/
+abstract class ContentModule
+{
+    /**
+     * Fetches data from conencted cms.
+     */
+    abstract function readData();
+
+    var $id;
+    var $title;
+    var $module_type;
+    var $module_type_name;
+    var $icon_file;
+    var $cms_type;
+    var $cms_name;
+    var $description;
+    var $authors;
+    var $is_connected;
+    var $is_dummy;
+    var $allowed_operations;
+
+    var $db_class;
+    var $view;
+    /**
+    * constructor
+    *
+    * init class. don't call directly, class is loaded by ConnectedCMS.
+    * @access public
+    * @param string $module_id module-id
+    * @param string $module_type module-type
+    * @param string $cms_type system-type
+    */
+    function __construct($module_id, $module_type, $cms_type)
+    {
+        global $connected_cms;
+
+        $this->is_dummy = false;
+        $this->setCMSType($cms_type);
+        $this->setModuleType($module_type);
+        if ($module_id != "")
+        {
+            $this->setId($module_id);
+
+            $this->readData();
+        }
+        $this->view = new ContentModuleView($this->cms_type);
+
+/**/    }
+
+/*  // Dummy-method. Must be overwritten by subclass.
+    function readData()
+    {
+        return false;
+    }
+*/
+
+    /**
+    * set id
+    *
+    * sets id
+    * @access public
+    * @param string $module_id id
+    */
+    function setId($module_id)
+    {
+        $this->id = $module_id;
+    }
+
+    /**
+    * get id
+    *
+    * returns id
+    * @access public
+    * @return string id
+    */
+    function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+    * set cms-type
+    *
+    * sets cms-type
+    * @access public
+    * @param string $module_cms_type cms-type
+    */
+    function setCMSType($module_cms_type)
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+        $this->cms_type = $module_cms_type;
+        $this->cms_name = $ELEARNING_INTERFACE_MODULES[$module_cms_type]["name"];
+    }
+
+    /**
+    * get cms-type
+    *
+    * returns cms-type
+    * @access public
+    * @return string cms-type
+    */
+    function getCMSType()
+    {
+        return $this->cms_type;
+    }
+
+    /**
+    * get cms name
+    *
+    * returns cms name
+    * @access public
+    * @return string cms name
+    */
+    function getCMSName()
+    {
+        return $this->cms_name;
+    }
+
+    /**
+    * set module-type
+    *
+    * sets module-type
+    * @access public
+    * @param string $module_type module-type
+    */
+    function setModuleType($module_type)
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+        $this->module_type = $module_type;
+        $this->module_type_name = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["types"][$module_type]["name"];
+        $this->icon_file = $ELEARNING_INTERFACE_MODULES[$this->cms_type]["types"][$module_type]["icon"];
+    }
+
+    /**
+    * get module-type
+    *
+    * returns module-type
+    * @access public
+    * @return string module-type
+    */
+    function getModuleType()
+    {
+        return $this->module_type;
+    }
+
+    /**
+    * get module-type name
+    *
+    * returns module-type name
+    * @access public
+    * @return string module-type name
+    */
+    function getModuleTypeName()
+    {
+        return $this->module_type_name;
+    }
+
+    /**
+    * set title
+    *
+    * sets title
+    * @access public
+    * @param string $module_title title
+    */
+    function setTitle($module_title)
+    {
+        $this->title = $module_title;
+    }
+
+    /**
+    * get title
+    *
+    * returns title
+    * @access public
+    * @return string title
+    */
+    function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+    * set description
+    *
+    * sets description
+    * @access public
+    * @param string $module_description description
+    */
+    function setDescription($module_description)
+    {
+        $this->description = $module_description;
+    }
+
+    /**
+    * get description
+    *
+    * returns description
+    * @access public
+    * @return string description
+    */
+    function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+    * set authors
+    *
+    * sets authors
+    * @access public
+    * @param array $module_authors authors
+    */
+    function setAuthors($module_authors)
+    {
+        $this->authors = $module_authors;
+    }
+
+    /**
+    * get authors
+    *
+    * returns authors
+    * @access public
+    * @return array authors
+    */
+    function getAuthors()
+    {
+        return $this->authors;
+    }
+
+    /**
+    * set connection
+    *
+    * sets connection with seminar
+    * @access public
+    * @param string $seminar_id seminar-id
+    * @return boolean successful
+    */
+    function setConnection($seminar_id)
+    {
+        $this->is_connected = true;
+//      echo "$this->id, $this->module_type, $this->cms_type";
+        return ObjectConnections::setConnection($seminar_id, $this->id, $this->module_type, $this->cms_type);
+    }
+
+    /**
+    * unset connection
+    *
+    * unsets connection with seminar
+    * @access public
+    * @param string $seminar_id seminar-id
+    * @return boolean successful
+    */
+    function unsetConnection($seminar_id)
+    {
+        $this->is_connected = false;
+        return ObjectConnections::unsetConnection($seminar_id, $this->id, $this->module_type, $this->cms_type);
+    }
+
+    /**
+    * set connection-status
+    *
+    * sets connection-status
+    * @access public
+    * @param boolean $is_connected connection-status
+    */
+    function setConnectionType($is_connected)
+    {
+        $this->is_connected = $is_connected;
+    }
+
+    /**
+    * get connection-status
+    *
+    * returns true, if module is connected to seminar
+    * @access public
+    * @return boolean connection-status
+    */
+    function isConnected()
+    {
+        return $this->is_connected;
+    }
+
+    /**
+    * get reference string
+    *
+    * returns reference string for content-module
+    * @access public
+    * @return string reference string
+    */
+    function getReferenceString()
+    {
+        return $this->cms_type."_".$this->module_type."_".$this->id;
+    }
+
+    /**
+    * get icon-image
+    *
+    * returns icon-image
+    * @access public
+    * @return string icon-image
+    */
+    function getIcon()
+    {
+        if (!$this->icon_file) {
+            $this->icon_file = 'learnmodule';
+        }
+        if (mb_strpos('http', $this->icon_file) === 0) {
+            return "<img src=\"" . $this->icon_file . "\">";
+        } else {
+            return Icon::create($this->icon_file, 'inactive')->asImg();
+        }
+    }
+
+    /**
+    * get module-status
+    *
+    * returns true, if module is a dummy
+    * @access public
+    * @return boolean module-status
+    */
+    function isDummy()
+    {
+        return $this->is_dummy;
+    }
+
+    /**
+    * create module-dummy
+    *
+    * sets title and description of module to display error-message
+    * @access public
+    * @param string $error error-type
+    */
+    function createDummyForErrormessage($error = "unknown")
+    {
+        global $connected_cms;
+
+        switch($error)
+        {
+            case "no permission":
+                $this->setTitle(_("--- Keine Lese-Berechtigung! ---"));
+                $this->setDescription(sprintf(_("Sie haben im System \"%s\" keine Lese-Berechtigung für das Lernmodul, das dieser Veranstaltung / Einrichtung an dieser Stelle zugeordnet ist."), $this->getCMSName()));
+                break;
+            case "not found":
+                $this->setTitle(_("--- Dieses Content-Modul existiert nicht mehr im angebundenen System! ---"));
+                $this->setDescription(sprintf(_("Das Lernmodul, das dieser Veranstaltung / Einrichtung an dieser Stelle zugeordnet war, existiert nicht mehr. Dieser Fehler tritt auf, wenn das angebundene LCMS \"%s\" nicht erreichbar ist oder wenn das Lernmodul innerhalb des angebundenen Systems gelöscht wurde."), $this->getCMSName()));
+                break;
+            case "deleted":
+                $this->setTitle(_("--- Dieses Content-Modul wurde im angebundenen System gelöscht! ---"));
+                $this->setDescription(sprintf(_("Das Lernmodul, das dieser Veranstaltung / Einrichtung an dieser Stelle zugeordnet war, wurde gelöscht."), $this->getCMSName()));
+                break;
+            default:
+                $this->setTitle(_("--- Es ist ein unbekannter Fehler aufgetreten! ---"));
+                $this->setDescription(sprintf(_("Unbekannter Fehler beim Lernmodul mit der Referenz-ID \"%s\" im LCMS \"%s\""), $this->getId(), $this->getCMSName()));
+        }
+
+        $this->is_dummy = true;
+    }
+
+    /**
+    * ask for permission for given operation
+    *
+    * dummy-method. returns false. must be overwritten by subclass.
+    * @access public
+    * @param string $operation operation
+    * @return boolean returns false
+    */
+    function isAllowed($operation)
+    {
+        return false;
+    }
+}
+?>
diff --git a/lib/elearning/ContentModuleView.class.php b/lib/elearning/ContentModuleView.class.php
deleted file mode 100644
index c351c1c..0000000
--- a/lib/elearning/ContentModuleView.class.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
-* class to show content-module data
-*
-* This class contains methods for output of connected module data.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ContentModuleView
-* @package  ELearning-Interface
-*/
-class ContentModuleView
-{
-    var $view_mode;
-    var $change_date;
-    var $module_new;
-    var $cms_type;
-    /**
-    * constructor
-    *
-    * init class. don't call directly, class is loaded by ContentModule.
-    * @access public
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        global $connected_cms;
-
-        $this->change_date = 0;
-        $this->module_new = false;
-        $this->cms_type = $cms;
-        $this->setViewMode("closed");
-    }
-
-    /**
-    * show module-data
-    *
-    * show module-data in printhead/printcontent-style. user-mode
-    * @access public
-    */
-    function show($mode = "")
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module, $anker_target;
-
-        $content_module = $connected_cms[$this->cms_type]->content_module[$current_module];
-
-        if ( (! $content_module->isDummy()) AND ($connected_cms[$this->cms_type]->isAuthNecessary() == true) AND ($connected_cms[$this->cms_type]->user->isConnected() == true)) {
-            if (! $content_module->isAllowed(OPERATION_VISIBLE)) {
-                return false;
-            }
-        }
-
-        if ($_SESSION['elearning_open_close'][$content_module->getReferenceString()] == true)
-            $this->setViewMode("open");
-        $module_title = $content_module->getTitle();
-/*/
-        if ($mode == "searchresult") {
-            $module_title = $module_title . " (ID " . $content_module->getId() . ", ";
-            if ($content_module->isAllowed(OPERATION_WRITE))
-                $module_title = $module_title . " " . _("Schreibzugriff") . ")";
-            else
-                $module_title = $module_title . " " . _("Lesezugriff") . ")";
-        }/**/
-        if ($this->isOpen() == true)
-            $module_link = URLHelper::getLink('?do_close='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
-        else
-            $module_link = URLHelper::getLink('?do_open='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
-        if (! $content_module->isDummy())
-            $module_buttons = $connected_cms[$this->cms_type]->link->getUserModuleLinks();
-        $template = $GLOBALS['template_factory']->open('elearning/_content_module.php');
-        $template->set_attribute('module_anker_target', ($anker_target == $content_module->getReferenceString()));
-        $template->set_attribute('module_link', $module_link);
-        $template->set_attribute('module_buttons', $module_buttons);
-        $template->set_attribute('module_authors', $content_module->getAuthors());
-        $template->set_attribute('module_title', $module_title);
-        $template->set_attribute('module_description', $content_module->getDescription());
-        $template->set_attribute('module_is_new', $this->module_new);
-        $template->set_attribute('module_chdate', $this->change_date);
-        $template->set_attribute('module_reference', $content_module->getReferenceString());
-        $template->set_attribute('module_source', $content_module->getCMSName() . " / " . $content_module->getModuleTypeName());
-        $template->set_attribute('module_icon', $content_module->getIcon());
-        $template->set_attribute('module_is_open', $this->isOpen());
-        return $template->render();
-    }
-
-    /**
-    * show module-data to admin
-    *
-    * show module-data in printhead/printcontent-style. admin-mode
-    * @access public
-    */
-    function showAdmin($mode = "")
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module, $anker_target;
-
-        $content_module = $connected_cms[$this->cms_type]->content_module[$current_module];
-
-        if ( (! $content_module->isDummy()) AND ($connected_cms[$this->cms_type]->isAuthNecessary() == true) AND ($connected_cms[$this->cms_type]->user->isConnected() == true)) {
-            if (! $content_module->isAllowed(OPERATION_VISIBLE)) {
-                return false;
-            }
-        }
-
-        if ($_SESSION['elearning_open_close'][$content_module->getReferenceString()] == true)
-            $this->setViewMode("open");
-
-        $module_title = $content_module->getTitle();
-        $module_title = $module_title . " (ID " . $content_module->getId();
-        if ($content_module->isAllowed(OPERATION_WRITE))
-            $module_title = $module_title . ", " . _("Schreibzugriff");
-        elseif ($content_module->isAllowed(OPERATION_READ))
-            $module_title = $module_title . ", " . _("Lesezugriff");
-        else
-            $module_title = $module_title . ", " . _("kein Lesezugriff");
-        $module_title = $module_title . ")";
-
-        if ($this->isOpen() == true)
-            $module_link = URLHelper::getLink('?do_close='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
-        else
-            $module_link = URLHelper::getLink('?do_open='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
-
-        $template = $GLOBALS['template_factory']->open('elearning/_content_module.php');
-        $template->set_attribute('module_anker_target', ($anker_target == $content_module->getReferenceString()));
-        $template->set_attribute('module_link', $module_link);
-        if ($content_module->isAllowed(OPERATION_READ))
-            $module_buttons = $connected_cms[$this->cms_type]->link->getAdminModuleLinks();
-        $template->set_attribute('module_buttons', $module_buttons);
-        $template->set_attribute('module_authors', $content_module->getAuthors());
-        $template->set_attribute('module_title', $module_title);
-        $template->set_attribute('module_description', $content_module->getDescription());
-        $template->set_attribute('module_is_new', $this->module_new);
-        $template->set_attribute('module_chdate', $this->change_date);
-        $template->set_attribute('module_reference', $content_module->getReferenceString());
-        $template->set_attribute('module_source', $content_module->getCMSName() . " / " . $content_module->getModuleTypeName());
-        $template->set_attribute('module_icon', $content_module->getIcon());
-        $template->set_attribute('module_is_open', $this->isOpen());
-        return $template->render();
-    }
-
-    /**
-    * get open-status
-    *
-    * returns true, if module is opened
-    * @access public
-    * @return boolean open-status
-    */
-    function isOpen()
-    {
-        if ($this->view_mode == "open")
-            return true;
-        else
-            return false;
-    }
-
-    /**
-    * set view-mode
-    *
-    * sets view-mode
-    * @access public
-    * @param boolean $module_mode view-mode
-    */
-    function setViewMode($module_mode)
-    {
-        $this->view_mode = $module_mode;
-    }
-
-    /**
-    * set changedate
-    *
-    * sets changedate for view
-    * @access public
-    * @param string $module_chdate changedate
-    */
-    function setChangeDate($module_chdate)
-    {
-        $this->change_date = $module_chdate;
-
-        if (object_get_visit(Context::getId(), "elearning_interface") < $this->change_date)
-            $this->module_new = true;
-        else
-            $this->module_new = false;
-    }
-}
-?>
diff --git a/lib/elearning/ContentModuleView.php b/lib/elearning/ContentModuleView.php
new file mode 100644
index 0000000..c351c1c
--- /dev/null
+++ b/lib/elearning/ContentModuleView.php
@@ -0,0 +1,189 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+* class to show content-module data
+*
+* This class contains methods for output of connected module data.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ContentModuleView
+* @package  ELearning-Interface
+*/
+class ContentModuleView
+{
+    var $view_mode;
+    var $change_date;
+    var $module_new;
+    var $cms_type;
+    /**
+    * constructor
+    *
+    * init class. don't call directly, class is loaded by ContentModule.
+    * @access public
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        global $connected_cms;
+
+        $this->change_date = 0;
+        $this->module_new = false;
+        $this->cms_type = $cms;
+        $this->setViewMode("closed");
+    }
+
+    /**
+    * show module-data
+    *
+    * show module-data in printhead/printcontent-style. user-mode
+    * @access public
+    */
+    function show($mode = "")
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module, $anker_target;
+
+        $content_module = $connected_cms[$this->cms_type]->content_module[$current_module];
+
+        if ( (! $content_module->isDummy()) AND ($connected_cms[$this->cms_type]->isAuthNecessary() == true) AND ($connected_cms[$this->cms_type]->user->isConnected() == true)) {
+            if (! $content_module->isAllowed(OPERATION_VISIBLE)) {
+                return false;
+            }
+        }
+
+        if ($_SESSION['elearning_open_close'][$content_module->getReferenceString()] == true)
+            $this->setViewMode("open");
+        $module_title = $content_module->getTitle();
+/*/
+        if ($mode == "searchresult") {
+            $module_title = $module_title . " (ID " . $content_module->getId() . ", ";
+            if ($content_module->isAllowed(OPERATION_WRITE))
+                $module_title = $module_title . " " . _("Schreibzugriff") . ")";
+            else
+                $module_title = $module_title . " " . _("Lesezugriff") . ")";
+        }/**/
+        if ($this->isOpen() == true)
+            $module_link = URLHelper::getLink('?do_close='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
+        else
+            $module_link = URLHelper::getLink('?do_open='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
+        if (! $content_module->isDummy())
+            $module_buttons = $connected_cms[$this->cms_type]->link->getUserModuleLinks();
+        $template = $GLOBALS['template_factory']->open('elearning/_content_module.php');
+        $template->set_attribute('module_anker_target', ($anker_target == $content_module->getReferenceString()));
+        $template->set_attribute('module_link', $module_link);
+        $template->set_attribute('module_buttons', $module_buttons);
+        $template->set_attribute('module_authors', $content_module->getAuthors());
+        $template->set_attribute('module_title', $module_title);
+        $template->set_attribute('module_description', $content_module->getDescription());
+        $template->set_attribute('module_is_new', $this->module_new);
+        $template->set_attribute('module_chdate', $this->change_date);
+        $template->set_attribute('module_reference', $content_module->getReferenceString());
+        $template->set_attribute('module_source', $content_module->getCMSName() . " / " . $content_module->getModuleTypeName());
+        $template->set_attribute('module_icon', $content_module->getIcon());
+        $template->set_attribute('module_is_open', $this->isOpen());
+        return $template->render();
+    }
+
+    /**
+    * show module-data to admin
+    *
+    * show module-data in printhead/printcontent-style. admin-mode
+    * @access public
+    */
+    function showAdmin($mode = "")
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module, $anker_target;
+
+        $content_module = $connected_cms[$this->cms_type]->content_module[$current_module];
+
+        if ( (! $content_module->isDummy()) AND ($connected_cms[$this->cms_type]->isAuthNecessary() == true) AND ($connected_cms[$this->cms_type]->user->isConnected() == true)) {
+            if (! $content_module->isAllowed(OPERATION_VISIBLE)) {
+                return false;
+            }
+        }
+
+        if ($_SESSION['elearning_open_close'][$content_module->getReferenceString()] == true)
+            $this->setViewMode("open");
+
+        $module_title = $content_module->getTitle();
+        $module_title = $module_title . " (ID " . $content_module->getId();
+        if ($content_module->isAllowed(OPERATION_WRITE))
+            $module_title = $module_title . ", " . _("Schreibzugriff");
+        elseif ($content_module->isAllowed(OPERATION_READ))
+            $module_title = $module_title . ", " . _("Lesezugriff");
+        else
+            $module_title = $module_title . ", " . _("kein Lesezugriff");
+        $module_title = $module_title . ")";
+
+        if ($this->isOpen() == true)
+            $module_link = URLHelper::getLink('?do_close='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
+        else
+            $module_link = URLHelper::getLink('?do_open='. $content_module->getReferenceString() . '&view='.$view.'&search_key='.$search_key.'&cms_select='.$cms_select.'#anker');
+
+        $template = $GLOBALS['template_factory']->open('elearning/_content_module.php');
+        $template->set_attribute('module_anker_target', ($anker_target == $content_module->getReferenceString()));
+        $template->set_attribute('module_link', $module_link);
+        if ($content_module->isAllowed(OPERATION_READ))
+            $module_buttons = $connected_cms[$this->cms_type]->link->getAdminModuleLinks();
+        $template->set_attribute('module_buttons', $module_buttons);
+        $template->set_attribute('module_authors', $content_module->getAuthors());
+        $template->set_attribute('module_title', $module_title);
+        $template->set_attribute('module_description', $content_module->getDescription());
+        $template->set_attribute('module_is_new', $this->module_new);
+        $template->set_attribute('module_chdate', $this->change_date);
+        $template->set_attribute('module_reference', $content_module->getReferenceString());
+        $template->set_attribute('module_source', $content_module->getCMSName() . " / " . $content_module->getModuleTypeName());
+        $template->set_attribute('module_icon', $content_module->getIcon());
+        $template->set_attribute('module_is_open', $this->isOpen());
+        return $template->render();
+    }
+
+    /**
+    * get open-status
+    *
+    * returns true, if module is opened
+    * @access public
+    * @return boolean open-status
+    */
+    function isOpen()
+    {
+        if ($this->view_mode == "open")
+            return true;
+        else
+            return false;
+    }
+
+    /**
+    * set view-mode
+    *
+    * sets view-mode
+    * @access public
+    * @param boolean $module_mode view-mode
+    */
+    function setViewMode($module_mode)
+    {
+        $this->view_mode = $module_mode;
+    }
+
+    /**
+    * set changedate
+    *
+    * sets changedate for view
+    * @access public
+    * @param string $module_chdate changedate
+    */
+    function setChangeDate($module_chdate)
+    {
+        $this->change_date = $module_chdate;
+
+        if (object_get_visit(Context::getId(), "elearning_interface") < $this->change_date)
+            $this->module_new = true;
+        else
+            $this->module_new = false;
+    }
+}
+?>
diff --git a/lib/elearning/ELearningUtils.class.php b/lib/elearning/ELearningUtils.class.php
deleted file mode 100644
index 33fb4a2..0000000
--- a/lib/elearning/ELearningUtils.class.php
+++ /dev/null
@@ -1,612 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
-* class with several forms and tools for the elearning interface
-*
-* This class contains Utilities for the elearning-interface.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @package  ELearning-Interface
-*/
-
-use Studip\Button, Studip\LinkButton;
-
-class ELearningUtils
-{
-    /**
-     * loads class ConnectedCMS for given system-type and creates an instance
-     *
-     * @param string $cms system-type
-     */
-    public static function loadClass($cms)
-    {
-        global $connected_cms, $ELEARNING_INTERFACE_MODULES;
-
-        if (!isset($connected_cms[$cms]) || !is_object($connected_cms[$cms])) {
-            require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.class.php";
-            $classname = "{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS";
-            $connected_cms[$cms] = new $classname($cms);
-            $connected_cms[$cms]->initSubclasses();
-        }
-    }
-
-    public static function initElearningInterfaces()
-    {
-        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
-        if (is_array($ELEARNING_INTERFACE_MODULES)) {
-            foreach (array_keys($ELEARNING_INTERFACE_MODULES) as $cms) {
-                if (self::isCMSActive($cms)) {
-                    self::loadClass($cms);
-                }
-            }
-        }
-        return is_array($connected_cms) ? count($connected_cms) : false;
-    }
-
-    /**
-     * gets config-value with given name from globals
-     *
-     * @param string $name entry-name
-     * @param string $cms system-type
-     * @return boolean returns false if no cms is given
-     */
-    public static function getConfigValue($name, $cms)
-    {
-        if (!$cms) {
-            return false;
-        }
-        return Config::get()->getValue("ELEARNING_INTERFACE_{$cms}_{$name}");
-    }
-
-    /**
-     * set config-value
-     *
-     * writes config-value with given name and value to database
-     *
-     * @param string $name entry-name
-     * @param string $value value
-     * @param string $cms system-type
-     */
-    public static function setConfigValue($name, $value, $cms)
-    {
-        if (!$cms) {
-            return;
-        }
-
-        try {
-            Config::get()->store("ELEARNING_INTERFACE_{$cms}_{$name}", $value);
-        } catch (InvalidArgumentException $e) {
-            Config::get()->create("ELEARNING_INTERFACE_{$cms}_{$name}", [
-                'value' => $value,
-                'type'  => 'string',
-            ]);
-        }
-    }
-
-    /**
-     * check cms-status
-     *
-     * checks if connected content-management-system is activated
-     *
-     * @param string $cms system-type
-     */
-    public static function isCMSActive($cms)
-    {
-        return self::getConfigValue('ACTIVE', $cms);
-    }
-
-    /**
-     * get cms-selectbox
-     *
-     * returns a form to select a cms
-     *
-     * @param string $message description-text
-     * @param boolean $check_active show only activated systems
-     * @return string returns html-code
-     */
-    public static function getCMSSelectbox($message, $check_active = true)
-    {
-        global $ELEARNING_INTERFACE_MODULES, $cms_select, $search_key, $view;
-        if (!is_array($ELEARNING_INTERFACE_MODULES)) {
-            $msg = sprintf(_("Die ELearning-Schnittstelle ist nicht korrekt konfiguriert. Die Variable \"%s\" "
-                            ."muss in der Konfigurationsdatei von Stud.IP erst mit den Verbindungsdaten angebundener "
-                            ."Learning-Content-Management-Systeme aufgefüllt werden. Solange dies nicht geschehen "
-                            ."ist, setzen Sie die Variable \"%s\" auf FALSE!"), "\$ELEARNING_INTERFACE_MODULES", "\$ELEARNING_INTERFACE_ENABLE");
-            PageLayout::postError($msg);
-            return false;
-        }
-        $options = [];
-        foreach ($ELEARNING_INTERFACE_MODULES as $cms => $cms_preferences) {
-            if (!$check_active || self::isCMSActive($cms)) {
-                $options[$cms] = $cms_preferences['name'];
-            }
-        }
-        $template = $GLOBALS['template_factory']->open('elearning/_cms_selectbox.php');
-        $template->cms_select = $cms_select;
-        $template->options    = $options;
-        $template->search_key = $search_key;
-        $template->view       = $view;
-        $template->message    = $message;
-        return $template->render();
-    }
-
-     /**
-     * get moduletype-selectbox
-     *
-     * returns a form to select type for new contentmodule
-     *
-     * @param string $cms system-type
-     * @return string returns html-code
-     */
-    public static function getTypeSelectbox($cms)
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-        $options = [];
-        foreach ($ELEARNING_INTERFACE_MODULES[$cms]['types'] as $type => $info) {
-            $options[$type] = $info['name'];
-            if (Request::get("module_type_{$cms}") === $type) {
-                $selected = $type;
-            }
-        }
-        $template = $GLOBALS['template_factory']->open('elearning/_type_selectbox.php');
-        $template->options  = $options;
-        $template->selected = $selected;
-        $template->cms      = $cms;
-        return $template->render();
-    }
-
-    /**
-    * get searchfield
-    *
-    * returns a form to search for modules
-    *
-    * @param string $message description-text
-    * @return string returns html-code
-    */
-    public static function getSearchfield($message)
-    {
-        global $cms_select, $search_key, $view;
-        $template = $GLOBALS['template_factory']->open('elearning/_searchfield.php');
-        $template->cms_select = $cms_select;
-        $template->search_key = $search_key;
-        $template->view       = $view;
-        $template->message    = $message;
-        return $template->render();
-    }
-
-    /**
-    * get form for new content-module
-    *
-    * returns a form to choose module-type and to create a new content-module
-    *
-    * @param string $cms system-type
-    * @return string returns html-code
-    */
-    public static function getNewModuleForm($cms)
-    {
-        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
-        if (sizeof($ELEARNING_INTERFACE_MODULES[$cms]["types"]) == 1)
-            foreach($ELEARNING_INTERFACE_MODULES[$cms]["types"] as $type => $info)
-                Request::set("module_type_" . $cms, $type);
-        $link = $connected_cms[$cms]->link->getNewModuleLink();
-
-        if ($link == false)
-            return false;
-        $types = [];
-        $cms_types = [];
-        foreach ($ELEARNING_INTERFACE_MODULES as $cms_type => $cms_data)
-            $cms_types["module_type_" . $cms_type] = Request::option("module_type_" . $cms_type);
-        $template = $GLOBALS['template_factory']->open('elearning/_new_module_form.php');
-        $template->set_attribute('link', $link);
-        $template->set_attribute('cms', $cms);
-        $template->set_attribute('cms_types', $cms_types);
-        $template->set_attribute('types', $ELEARNING_INTERFACE_MODULES[$cms]["types"]);
-        return $template->render();
-    }
-
-    /**
-    * get form for external user-account
-    *
-    * returns a form for administration of external user-account
-    *
-    * @param string message message-string
-    * @param string my_account_cms cms-type
-    * @return string returns html-code
-    */
-    public static function getMyAccountForm($message, $my_account_cms)
-    {
-        global $connected_cms;
-        $template = $GLOBALS['template_factory']->open('elearning/_my_account_form.php');
-        if ($connected_cms[$my_account_cms]->user->isConnected()) {
-            $template->set_attribute('login', $connected_cms[$my_account_cms]->user->getUsername());
-            $template->set_attribute('is_connected', 1);
-        }
-        $template->set_attribute('my_account_cms', $my_account_cms);
-        $template->set_attribute('message', $message);
-        return $template->render();
-    }
-
-    /**
-    * get form for new user
-    *
-    * returns a form to add a user-account to connected cms
-    *
-    * @param string $new_account_cms system-type
-    * @return string returns html-code
-    */
-    public static function getNewAccountForm(&$new_account_cms)
-    {
-        global $connected_cms, $cms_select, $view, $current_module, $messages,
-             $ELEARNING_INTERFACE_MODULES;
-
-        $new_account_step = Request::int('new_account_step');
-        $ext_password = Request::get('ext_password');
-        $ext_password_2 = Request::get('ext_password_2');
-        $ext_username = Request::get('ext_username');
-        $ref_id = Request::get('ref_id');
-        $module_type = Request::get('module_type');
-
-        self::loadClass($new_account_cms);
-
-        //Password was sent, but is to short
-        if (isset($ext_password_2) && !Request::submitted('go_back') && Request::submitted('next') && mb_strlen($ext_password_2) < 6) {
-            PageLayout::postError(_('Das Passwort muss mindestens 6 Zeichen lang sein!'));
-            $new_account_step--;
-        } elseif (isset($ext_password_2) && ! Request::submitted('go_back') && Request::submitted('next') && $ext_password != $ext_password_2) {
-            //Passwords doesn't match password repeat
-            PageLayout::postError(_('Das Passwort entspricht nicht der Passwort-Wiederholung!'));
-            $new_account_step--;
-        }
-
-        // Benutzername was sent
-        if ($ext_username && !Request::submitted('go_back') && Request::submitted('assign')) {
-            $caching_status = $connected_cms[$new_account_cms]->soap_client->getCachingStatus();
-            $connected_cms[$new_account_cms]->soap_client->setCachingStatus(false);
-            if ($connected_cms[$new_account_cms]->user->verifyLogin($ext_username, $ext_password)) {
-                $is_verified = true;
-                PageLayout::postInfo(_('Der Account wurde zugeordnet.'));
-                $connected_cms[$new_account_cms]->user->setCategory("");
-                $connected_cms[$new_account_cms]->user->setUsername($ext_username);
-                $connected_cms[$new_account_cms]->user->setPassword($ext_password);
-                $connected_cms[$new_account_cms]->user->setConnection(USER_TYPE_ORIGINAL);
-                if ($ref_id) {
-                    $connected_cms[$new_account_cms]->newContentModule($ref_id, $module_type, true);
-                    $module_title = $connected_cms[$new_account_cms]->content_module[$current_module]->getTitle();
-                    $module_links = $connected_cms[$new_account_cms]->link->getUserModuleLinks();
-                }
-            } else {
-                $new_account_step = 1;
-                PageLayout::postError(_('Die eingegebenen Login-Daten sind nicht korrekt.'));
-            }
-            $connected_cms[$new_account_cms]->soap_client->setCachingStatus($caching_status);
-        }
-
-        if (Request::submitted('start')) {
-            $new_account_step = 1;
-        }
-        if (Request::submitted('go_back')) {
-            $new_account_step--;
-            if ($new_account_step < 1) {
-                $new_account_cms = '';
-                return false;
-            }
-        } elseif (Request::submitted('next') || Request::submitted('assign')) {
-            $new_account_step++;
-        }
-
-        if ($new_account_step == 2 && Request::submitted('assign')) {
-            // Assign existing Account
-            $step = 'assign';
-        } elseif ($new_account_step == 2 && Request::submitted('next')) {
-            // Create new Account: ask for new password
-            $step = 'new_account';
-        } elseif ($new_account_step == 3 && Request::submitted('next')) {
-            // Create new Account
-            $connected_cms[$new_account_cms]->user->setPassword($ext_password);
-            if ($connected_cms[$new_account_cms]->user->newUser()) {
-                $is_verified = true;
-                PageLayout::postInfo(sprintf(_("Der Account wurde erzeugt und zugeordnet. Ihr Loginname ist %s."), "<b>" . htmlReady($connected_cms[$new_account_cms]->user->getUsername()) . "</b>"));
-                if ($ref_id) {
-                    $connected_cms[$new_account_cms]->newContentModule($ref_id, $module_type, true);
-                    $module_title = $connected_cms[$new_account_cms]->content_module[$current_module]->getTitle();
-                    $module_links = $connected_cms[$new_account_cms]->link->getUserModuleLinks();
-                }
-            }
-        } elseif (!$is_verified) {
-            if (Request::submitted('start')) {
-                $messages["info"] = sprintf(_("Sie versuchen zum erstem Mal ein Lernmodul des angebundenen Systems %s zu starten. Bevor Sie das Modul nutzen können, muss Ihrem Stud.IP-Benutzeraccount ein Account im angebundenen System zugeordnet werden."), htmlReady($connected_cms[$new_account_cms]->getName())) . "<br><br>\n\n";
-            }
-        }
-        $template = $GLOBALS['template_factory']->open('elearning/_new_account_form.php');
-        $template->cms_title        = htmlReady($connected_cms[$new_account_cms]->getName());
-        $template->cms_select       = $cms_select;
-        $template->module_title     = $module_title;
-        $template->module_links     = $module_links;
-        $template->module_type      = $module_type;
-        $template->ref_id           = $ref_id;
-        $template->ext_username     = $ext_username;
-        $template->new_account_cms  = $new_account_cms;
-        $template->new_account_step = $new_account_step;
-        $template->is_connected     = $connected_cms[$new_account_cms]->user->isConnected();
-        $template->is_verified      = $is_verified;
-        $template->step             = $step;
-
-        // TODO: Should this really be below the assignment?
-        if ($is_verified) {
-            $new_account_cms = "";
-        }
-
-        return $template->render();
-    }
-
-    /**
-     * get table-header for connected cms
-     *
-     * returns a table-header for connected cms
-     *
-     * @param string $title table-title
-     * @return string returns html-code
-     */
-    public static function getCMSHeader($title)
-    {
-        $template = $GLOBALS['template_factory']->open('elearning/_cms_header.php');
-        $template->title = $title;
-        return $template->render();
-    }
-
-    /**
-     * get table-footer for connected cms
-     *
-     * returns a table-footer for connected cms
-     *
-     * @param string $logo system-logo
-     * @return string returns html-code
-     */
-    public static function getCMSFooter($logo)
-    {
-        $template = $GLOBALS['template_factory']->open('elearning/_cms_footer.php');
-        $template->logo = $logo;
-        return $template->render();
-    }
-
-    /**
-     * get headline for modules
-     *
-     * returns a table with a headline
-     *
-     * @param string $title headline
-     * @return string returns html-code
-     */
-    public static function getModuleHeader($title)
-    {
-        global $view, $cms_select, $search_key;
-        $template = $GLOBALS['template_factory']->open('elearning/_module_header.php');
-        $template->title      = $title;
-        $template->view       = $view;
-        $template->cms_select = $cms_select;
-        $template->search_key = $search_key;
-        $template->all_open   = $_SESSION['elearning_open_close']['all open'];
-        return $template->render();
-    }
-
-    /**
-    * get Headline
-    *
-    * returns a table with a headline
-    *
-    * @param string $title headline
-    * @return string returns html-code
-    */
-    public static function getHeader($title)
-    {
-        $template = $GLOBALS['template_factory']->open('elearning/_header.php');
-        $template->title = $title;
-        return $template->render();
-    }
-
-    /**
-     * save timestamp
-     *
-     * saves a timestamp for debugging and performance-check
-     *
-     * @param string $stri description
-     */
-    public static function bench($stri)
-    {
-        $GLOBALS['timearray'][] = [
-            'zeit' => microtime(true),
-            'name' => $stri,
-        ];
-    }
-
-    /**
-     * show benchmark
-     *
-     * shows saved timestamps with descriptions
-     *
-     * @param string $stri description
-     */
-    public static function showbench()
-    {
-        global $timearray;
-        echo "<table><tr><td>Zeit (".$timearray[0]["name"].")</td><td align=\"right\"></td></tr>";
-        for ($i = 0; $i < count($timearray); $i++) {
-            echo "<tr><td>".$timearray[$i]["name"].": </td><td align=\"right\">" . number_format(($timearray[$i]["zeit"]-$timearray[$i-1]["zeit"])*1000,2) . " msek</td></tr>";
-        }
-        echo "<tr><td>Gesamtzeit: </td><td align=\"right\">" . number_format(($timearray[$i-1]["zeit"]-$timearray[0]["zeit"])*1000,2)." msek</td></tr></table>";
-    }
-
-    /**
-     * delete cms-data
-     *
-     * deletes all data belonging to the specified cms from stud.ip database
-     */
-    public static function deleteCMSData($cms_type)
-    {
-        $db = DBManager::get();
-        $db->execute("DELETE FROM auth_extern WHERE external_user_system_type = ?", [$cms_type]);
-        $db->execute("DELETE FROM object_contentmodules WHERE system_type = ?", [$cms_type]);
-
-        $config = Config::get();
-        foreach ($config->getFields('global' ,null , "ELEARNING_INTERFACE_{$cms_type}") as $key) {
-            $config->delete($key);
-        }
-    }
-
-    /**
-     * get ilias courses
-     *
-     * creates output of ilias courses linked to the chosen seminar. also updates object-connections.
-     *
-     * @return array
-     */
-    public static function getIliasCourses($sem_id)
-    {
-        global  $connected_cms, $messages, $view, $cms_select;
-        $db = DBManager::get();
-
-        $rs = $db->query("SELECT DISTINCT system_type, module_id
-                          FROM object_contentmodules
-                          WHERE module_type = 'crs' AND object_id = " . $db->quote($sem_id))
-                        ->fetchAll(PDO::FETCH_ASSOC);
-        $courses = [];
-        foreach ($rs as $row) {
-            $courses[$row['system_type']] = $row['module_id'];
-        }
-
-        $connected_courses = [
-            'courses' => [],
-        ];
-        if (is_array($courses)) {
-            foreach ($courses as $system_type => $crs_id) {
-                if (self::isCMSActive($system_type)) {
-                    self::loadClass($system_type);
-                    $connected_courses['courses'][$system_type] = [
-                        'url'      => URLHelper::getLink($connected_cms[$system_type]->link->cms_link . '?client_id=' . $connected_cms[$system_type]->getClientId() . '&cms_select=' . $system_type . '&ref_id=' . $crs_id . '&type=crs&target=start'),
-                        'cms_name' => $connected_cms[$system_type]->getName()
-                    ];
-                    // gegebenenfalls zugeordnete Module aktualisieren
-                    if (Request::option('update')) {
-                        if ((method_exists($connected_cms[$system_type], "updateConnections"))) {
-                            $connected_cms[$system_type]->updateConnections($crs_id);
-                        }
-                    }
-                    if (method_exists($connected_cms[$system_type]->permissions, 'CheckUserPermissions')) {
-                        $connected_cms[$system_type]->permissions->CheckUserPermissions($crs_id);
-                    }
-                }
-            }
-        }
-
-        if ($connected_courses['courses']) {
-            if (count($connected_courses['courses']) > 1) {
-                $connected_courses['text'] = _("Diese Veranstaltung ist mit folgenden Ilias-Kursen verknüpft. Hier gelangen Sie direkt in den jeweiligen Kurs: ");
-            } else {
-                $connected_courses['text'] = _("Diese Veranstaltung ist mit einem Ilias-Kurs verknüpft. Hier gelangen Sie direkt in den Kurs: ");
-            }
-        }
-
-        return $connected_courses;
-    }
-
-    /**
-    * check db-integrity
-    *
-    * checks if there are broken links in the database
-    *
-    * @return boolean successful
-    */
-    public static function checkIntegrity()
-    {
-        global $ELEARNING_INTERFACE_MODULES, $messages;
-        $db = DBManager::get();
-
-        foreach ($ELEARNING_INTERFACE_MODULES as $cms_type =>$data) $cmsystems[$cms_type] = [];
-
-        $config = Config::get();
-        foreach ($config->getFields('global' ,null , 'ELEARNING_INTERFACE_') as $key) {
-            $parts = explode("_", $key);
-            $cmsystems[$parts[2]]["config"]++;
-        }
-
-        $rs = $db->query("SELECT external_user_system_type, COUNT(*) as c FROM auth_extern GROUP BY external_user_system_type");
-        while ($row = $rs->fetch())
-            $cmsystems[$row["external_user_system_type"]]["accounts"] = $row['c'];
-        $rs = $db->query("SELECT system_type, COUNT(*) FROM object_contentmodules GROUP BY system_type");
-        while ($row = $rs->fetch())
-            $cmsystems[$row["system_type"]]["modules"] = $row['c'];
-
-        if (Request::submitted('delete')) {
-            $messages["info"] .= "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">";
-            $messages["info"] .= CSRFProtection::tokenTag();
-            $messages["info"] .= "<table>";
-            $messages["info"] .= "<tr><td>&nbsp;</td></tr>";
-            $messages["info"] .= "<tr><td>" . sprintf(_("Durch das Löschen der Daten zum System mit dem Index \"%s\" werden %s Konfigurationseinträge und Verknüpfungen von Stud.IP-Veranstaltungen und -User-Accounts unwiederbringlich aus der Stud.IP-Datenbank entfernt. Wollen Sie diese Daten jetzt löschen?"), Request::quoted('delete_cms'), $cmsystems[Request::quoted('delete_cms')]["accounts"]+$cmsystems[Request::quoted('delete_cms')]["modules"]+$cmsystems[Request::quoted('delete_cms')]["config"] ) . "</td></tr>";
-            $messages["info"] .= "<tr><td align=\"center\"><input type=\"hidden\" name=\"delete_cms\" value=\"".Request::quoted('delete_cms')."\">";
-            $messages["info"] .= '<div class="button-group">' . Button::create(_('Alle löschen'), 'confirm_delete') . Button::createCancel(_('Abbrechen'), 'abbruch') . '<div></td></tr>';
-            $messages["info"] .= "<tr><td align=\"center\"></td></tr>";
-            $messages["info"] .= "</table>";
-            $messages["info"] .= "</form>";
-        }
-
-        if (Request::submitted('confirm_delete')) {
-            unset($cmsystems[Request::quoted('delete_cms')]);
-//          deleteCMSData(Request::quoted('delete_cms'));
-            $messages["info"] .= _("Daten wurden gelöscht.");
-        }
-
-        foreach ($cmsystems as $cms_type =>$data) {
-            if ($ELEARNING_INTERFACE_MODULES[$cms_type]) {
-                $output .= self::getCMSHeader($ELEARNING_INTERFACE_MODULES[$cms_type]["name"]);
-                $output .= "<table>";
-                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                if (self::isCMSActive($cms_type)) {
-                    $output .= "<tr><td>" .  Icon::create('checkbox-checked', 'clickable')->asImg(['class' => 'text-top']) . "</td><td><b>". sprintf(_("Die Schnittstelle zum System %s ist aktiv."), $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</b></td></tr>";
-                    $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                }
-                elseif ($data["config"] < 1)
-                    $output .= "<tr><td>" .  Icon::create('checkbox-unchecked', 'clickable')->asImg(['class' => 'text-top']) . "</td><td><i>". sprintf(_("Die Schnittstelle für das System %s wurde noch nicht eingerichtet."), $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</i></td></tr>";
-                elseif ($data["config"] < 1)
-                    $output .= "<tr><td>" .  Icon::create('checkbox-unchecked', 'clickable')->asImg(['class' => 'text-top']) . "</td><td><i>". sprintf(_("Die Schnittstelle wurde noch nicht aktiviert."), $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</i></td></tr>";
-
-                if ($data["accounts"])
-                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Stud.IP-User-Accounts sind mit Accounts im System %s verknüpft."), $data["accounts"], $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</td></tr>";
-                if ($data["modules"])
-                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Objekte sind Stud.IP-Veranstaltungen oder -Einrichtungen zugeordnet."), $data["modules"]) . "</td></tr>";
-                if ($data["config"])
-                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Einträge in der config-Tabelle der Stud.IP-Datenbank."), $data["config"]) . "</td></tr>";
-                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                $output .= "</table>";
-                $output .= self::getCMSFooter(($ELEARNING_INTERFACE_MODULES[$cms_type]["logo_file"] ? "<img src=\"".$ELEARNING_INTERFACE_MODULES[$cms_type]["logo_file"]."\" border=\"0\">" : $cms_type));
-            }
-            else {
-                $output .= self::getCMSHeader("<font color=FF0000> Unbekanntes System: " . $cms_type . "</font>");
-                $output .= "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">";
-                $output .= CSRFProtection::tokenTag();
-                $output .= "<table>";
-                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                $output .= "<tr><td>" . Icon::create('decline', 'attention')->asImg(['class' => 'text-top']) . "</td><td><i>".sprintf(_("Für das System mit dem Index \"%s\" existieren keine Voreinstellungen in den Konfigurationsdateien mehr."), $cms_type) . "</i></td></tr>";
-                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                $output .= "<tr><td colspan=\"2\"><b>". _("In der Stud.IP-Datenbank sind noch folgende Informationen zu diesem System gespeichert:") . "</b></td></tr>";
-                if ($data["accounts"])
-                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Stud.IP-User-Accounts sind mit externen Accounts mit dem Index \"%s\" verknüpft."), $data["accounts"], $cms_type) . "</td></tr>";
-                if ($data["modules"])
-                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Objekte sind Stud.IP-Veranstaltungen oder -Einrichtungen zugeordnet."), $data["modules"]) . "</td></tr>";
-                if ($data["config"])
-                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Einträge in der config-Tabelle der Stud.IP-Datenbank."), $data["config"]) . "</td></tr>";
-                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                $output .= "<tr><td align=\"center\" colspan=\"2\"><input type=\"hidden\" name=\"delete_cms\" value=\"".$cms_type."\">" . Button::create(_('Löschen'), 'delete') . "</td></tr>";
-                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-                $output .= "</table>";
-                $output .= "</form>";
-                $output .= self::getCMSFooter('');
-            }
-            $output .= "<br>";
-        }
-
-        return $output;
-    }
-}
diff --git a/lib/elearning/ELearningUtils.php b/lib/elearning/ELearningUtils.php
new file mode 100644
index 0000000..33fb4a2
--- /dev/null
+++ b/lib/elearning/ELearningUtils.php
@@ -0,0 +1,612 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+* class with several forms and tools for the elearning interface
+*
+* This class contains Utilities for the elearning-interface.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @package  ELearning-Interface
+*/
+
+use Studip\Button, Studip\LinkButton;
+
+class ELearningUtils
+{
+    /**
+     * loads class ConnectedCMS for given system-type and creates an instance
+     *
+     * @param string $cms system-type
+     */
+    public static function loadClass($cms)
+    {
+        global $connected_cms, $ELEARNING_INTERFACE_MODULES;
+
+        if (!isset($connected_cms[$cms]) || !is_object($connected_cms[$cms])) {
+            require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.class.php";
+            $classname = "{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS";
+            $connected_cms[$cms] = new $classname($cms);
+            $connected_cms[$cms]->initSubclasses();
+        }
+    }
+
+    public static function initElearningInterfaces()
+    {
+        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
+        if (is_array($ELEARNING_INTERFACE_MODULES)) {
+            foreach (array_keys($ELEARNING_INTERFACE_MODULES) as $cms) {
+                if (self::isCMSActive($cms)) {
+                    self::loadClass($cms);
+                }
+            }
+        }
+        return is_array($connected_cms) ? count($connected_cms) : false;
+    }
+
+    /**
+     * gets config-value with given name from globals
+     *
+     * @param string $name entry-name
+     * @param string $cms system-type
+     * @return boolean returns false if no cms is given
+     */
+    public static function getConfigValue($name, $cms)
+    {
+        if (!$cms) {
+            return false;
+        }
+        return Config::get()->getValue("ELEARNING_INTERFACE_{$cms}_{$name}");
+    }
+
+    /**
+     * set config-value
+     *
+     * writes config-value with given name and value to database
+     *
+     * @param string $name entry-name
+     * @param string $value value
+     * @param string $cms system-type
+     */
+    public static function setConfigValue($name, $value, $cms)
+    {
+        if (!$cms) {
+            return;
+        }
+
+        try {
+            Config::get()->store("ELEARNING_INTERFACE_{$cms}_{$name}", $value);
+        } catch (InvalidArgumentException $e) {
+            Config::get()->create("ELEARNING_INTERFACE_{$cms}_{$name}", [
+                'value' => $value,
+                'type'  => 'string',
+            ]);
+        }
+    }
+
+    /**
+     * check cms-status
+     *
+     * checks if connected content-management-system is activated
+     *
+     * @param string $cms system-type
+     */
+    public static function isCMSActive($cms)
+    {
+        return self::getConfigValue('ACTIVE', $cms);
+    }
+
+    /**
+     * get cms-selectbox
+     *
+     * returns a form to select a cms
+     *
+     * @param string $message description-text
+     * @param boolean $check_active show only activated systems
+     * @return string returns html-code
+     */
+    public static function getCMSSelectbox($message, $check_active = true)
+    {
+        global $ELEARNING_INTERFACE_MODULES, $cms_select, $search_key, $view;
+        if (!is_array($ELEARNING_INTERFACE_MODULES)) {
+            $msg = sprintf(_("Die ELearning-Schnittstelle ist nicht korrekt konfiguriert. Die Variable \"%s\" "
+                            ."muss in der Konfigurationsdatei von Stud.IP erst mit den Verbindungsdaten angebundener "
+                            ."Learning-Content-Management-Systeme aufgefüllt werden. Solange dies nicht geschehen "
+                            ."ist, setzen Sie die Variable \"%s\" auf FALSE!"), "\$ELEARNING_INTERFACE_MODULES", "\$ELEARNING_INTERFACE_ENABLE");
+            PageLayout::postError($msg);
+            return false;
+        }
+        $options = [];
+        foreach ($ELEARNING_INTERFACE_MODULES as $cms => $cms_preferences) {
+            if (!$check_active || self::isCMSActive($cms)) {
+                $options[$cms] = $cms_preferences['name'];
+            }
+        }
+        $template = $GLOBALS['template_factory']->open('elearning/_cms_selectbox.php');
+        $template->cms_select = $cms_select;
+        $template->options    = $options;
+        $template->search_key = $search_key;
+        $template->view       = $view;
+        $template->message    = $message;
+        return $template->render();
+    }
+
+     /**
+     * get moduletype-selectbox
+     *
+     * returns a form to select type for new contentmodule
+     *
+     * @param string $cms system-type
+     * @return string returns html-code
+     */
+    public static function getTypeSelectbox($cms)
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+        $options = [];
+        foreach ($ELEARNING_INTERFACE_MODULES[$cms]['types'] as $type => $info) {
+            $options[$type] = $info['name'];
+            if (Request::get("module_type_{$cms}") === $type) {
+                $selected = $type;
+            }
+        }
+        $template = $GLOBALS['template_factory']->open('elearning/_type_selectbox.php');
+        $template->options  = $options;
+        $template->selected = $selected;
+        $template->cms      = $cms;
+        return $template->render();
+    }
+
+    /**
+    * get searchfield
+    *
+    * returns a form to search for modules
+    *
+    * @param string $message description-text
+    * @return string returns html-code
+    */
+    public static function getSearchfield($message)
+    {
+        global $cms_select, $search_key, $view;
+        $template = $GLOBALS['template_factory']->open('elearning/_searchfield.php');
+        $template->cms_select = $cms_select;
+        $template->search_key = $search_key;
+        $template->view       = $view;
+        $template->message    = $message;
+        return $template->render();
+    }
+
+    /**
+    * get form for new content-module
+    *
+    * returns a form to choose module-type and to create a new content-module
+    *
+    * @param string $cms system-type
+    * @return string returns html-code
+    */
+    public static function getNewModuleForm($cms)
+    {
+        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
+        if (sizeof($ELEARNING_INTERFACE_MODULES[$cms]["types"]) == 1)
+            foreach($ELEARNING_INTERFACE_MODULES[$cms]["types"] as $type => $info)
+                Request::set("module_type_" . $cms, $type);
+        $link = $connected_cms[$cms]->link->getNewModuleLink();
+
+        if ($link == false)
+            return false;
+        $types = [];
+        $cms_types = [];
+        foreach ($ELEARNING_INTERFACE_MODULES as $cms_type => $cms_data)
+            $cms_types["module_type_" . $cms_type] = Request::option("module_type_" . $cms_type);
+        $template = $GLOBALS['template_factory']->open('elearning/_new_module_form.php');
+        $template->set_attribute('link', $link);
+        $template->set_attribute('cms', $cms);
+        $template->set_attribute('cms_types', $cms_types);
+        $template->set_attribute('types', $ELEARNING_INTERFACE_MODULES[$cms]["types"]);
+        return $template->render();
+    }
+
+    /**
+    * get form for external user-account
+    *
+    * returns a form for administration of external user-account
+    *
+    * @param string message message-string
+    * @param string my_account_cms cms-type
+    * @return string returns html-code
+    */
+    public static function getMyAccountForm($message, $my_account_cms)
+    {
+        global $connected_cms;
+        $template = $GLOBALS['template_factory']->open('elearning/_my_account_form.php');
+        if ($connected_cms[$my_account_cms]->user->isConnected()) {
+            $template->set_attribute('login', $connected_cms[$my_account_cms]->user->getUsername());
+            $template->set_attribute('is_connected', 1);
+        }
+        $template->set_attribute('my_account_cms', $my_account_cms);
+        $template->set_attribute('message', $message);
+        return $template->render();
+    }
+
+    /**
+    * get form for new user
+    *
+    * returns a form to add a user-account to connected cms
+    *
+    * @param string $new_account_cms system-type
+    * @return string returns html-code
+    */
+    public static function getNewAccountForm(&$new_account_cms)
+    {
+        global $connected_cms, $cms_select, $view, $current_module, $messages,
+             $ELEARNING_INTERFACE_MODULES;
+
+        $new_account_step = Request::int('new_account_step');
+        $ext_password = Request::get('ext_password');
+        $ext_password_2 = Request::get('ext_password_2');
+        $ext_username = Request::get('ext_username');
+        $ref_id = Request::get('ref_id');
+        $module_type = Request::get('module_type');
+
+        self::loadClass($new_account_cms);
+
+        //Password was sent, but is to short
+        if (isset($ext_password_2) && !Request::submitted('go_back') && Request::submitted('next') && mb_strlen($ext_password_2) < 6) {
+            PageLayout::postError(_('Das Passwort muss mindestens 6 Zeichen lang sein!'));
+            $new_account_step--;
+        } elseif (isset($ext_password_2) && ! Request::submitted('go_back') && Request::submitted('next') && $ext_password != $ext_password_2) {
+            //Passwords doesn't match password repeat
+            PageLayout::postError(_('Das Passwort entspricht nicht der Passwort-Wiederholung!'));
+            $new_account_step--;
+        }
+
+        // Benutzername was sent
+        if ($ext_username && !Request::submitted('go_back') && Request::submitted('assign')) {
+            $caching_status = $connected_cms[$new_account_cms]->soap_client->getCachingStatus();
+            $connected_cms[$new_account_cms]->soap_client->setCachingStatus(false);
+            if ($connected_cms[$new_account_cms]->user->verifyLogin($ext_username, $ext_password)) {
+                $is_verified = true;
+                PageLayout::postInfo(_('Der Account wurde zugeordnet.'));
+                $connected_cms[$new_account_cms]->user->setCategory("");
+                $connected_cms[$new_account_cms]->user->setUsername($ext_username);
+                $connected_cms[$new_account_cms]->user->setPassword($ext_password);
+                $connected_cms[$new_account_cms]->user->setConnection(USER_TYPE_ORIGINAL);
+                if ($ref_id) {
+                    $connected_cms[$new_account_cms]->newContentModule($ref_id, $module_type, true);
+                    $module_title = $connected_cms[$new_account_cms]->content_module[$current_module]->getTitle();
+                    $module_links = $connected_cms[$new_account_cms]->link->getUserModuleLinks();
+                }
+            } else {
+                $new_account_step = 1;
+                PageLayout::postError(_('Die eingegebenen Login-Daten sind nicht korrekt.'));
+            }
+            $connected_cms[$new_account_cms]->soap_client->setCachingStatus($caching_status);
+        }
+
+        if (Request::submitted('start')) {
+            $new_account_step = 1;
+        }
+        if (Request::submitted('go_back')) {
+            $new_account_step--;
+            if ($new_account_step < 1) {
+                $new_account_cms = '';
+                return false;
+            }
+        } elseif (Request::submitted('next') || Request::submitted('assign')) {
+            $new_account_step++;
+        }
+
+        if ($new_account_step == 2 && Request::submitted('assign')) {
+            // Assign existing Account
+            $step = 'assign';
+        } elseif ($new_account_step == 2 && Request::submitted('next')) {
+            // Create new Account: ask for new password
+            $step = 'new_account';
+        } elseif ($new_account_step == 3 && Request::submitted('next')) {
+            // Create new Account
+            $connected_cms[$new_account_cms]->user->setPassword($ext_password);
+            if ($connected_cms[$new_account_cms]->user->newUser()) {
+                $is_verified = true;
+                PageLayout::postInfo(sprintf(_("Der Account wurde erzeugt und zugeordnet. Ihr Loginname ist %s."), "<b>" . htmlReady($connected_cms[$new_account_cms]->user->getUsername()) . "</b>"));
+                if ($ref_id) {
+                    $connected_cms[$new_account_cms]->newContentModule($ref_id, $module_type, true);
+                    $module_title = $connected_cms[$new_account_cms]->content_module[$current_module]->getTitle();
+                    $module_links = $connected_cms[$new_account_cms]->link->getUserModuleLinks();
+                }
+            }
+        } elseif (!$is_verified) {
+            if (Request::submitted('start')) {
+                $messages["info"] = sprintf(_("Sie versuchen zum erstem Mal ein Lernmodul des angebundenen Systems %s zu starten. Bevor Sie das Modul nutzen können, muss Ihrem Stud.IP-Benutzeraccount ein Account im angebundenen System zugeordnet werden."), htmlReady($connected_cms[$new_account_cms]->getName())) . "<br><br>\n\n";
+            }
+        }
+        $template = $GLOBALS['template_factory']->open('elearning/_new_account_form.php');
+        $template->cms_title        = htmlReady($connected_cms[$new_account_cms]->getName());
+        $template->cms_select       = $cms_select;
+        $template->module_title     = $module_title;
+        $template->module_links     = $module_links;
+        $template->module_type      = $module_type;
+        $template->ref_id           = $ref_id;
+        $template->ext_username     = $ext_username;
+        $template->new_account_cms  = $new_account_cms;
+        $template->new_account_step = $new_account_step;
+        $template->is_connected     = $connected_cms[$new_account_cms]->user->isConnected();
+        $template->is_verified      = $is_verified;
+        $template->step             = $step;
+
+        // TODO: Should this really be below the assignment?
+        if ($is_verified) {
+            $new_account_cms = "";
+        }
+
+        return $template->render();
+    }
+
+    /**
+     * get table-header for connected cms
+     *
+     * returns a table-header for connected cms
+     *
+     * @param string $title table-title
+     * @return string returns html-code
+     */
+    public static function getCMSHeader($title)
+    {
+        $template = $GLOBALS['template_factory']->open('elearning/_cms_header.php');
+        $template->title = $title;
+        return $template->render();
+    }
+
+    /**
+     * get table-footer for connected cms
+     *
+     * returns a table-footer for connected cms
+     *
+     * @param string $logo system-logo
+     * @return string returns html-code
+     */
+    public static function getCMSFooter($logo)
+    {
+        $template = $GLOBALS['template_factory']->open('elearning/_cms_footer.php');
+        $template->logo = $logo;
+        return $template->render();
+    }
+
+    /**
+     * get headline for modules
+     *
+     * returns a table with a headline
+     *
+     * @param string $title headline
+     * @return string returns html-code
+     */
+    public static function getModuleHeader($title)
+    {
+        global $view, $cms_select, $search_key;
+        $template = $GLOBALS['template_factory']->open('elearning/_module_header.php');
+        $template->title      = $title;
+        $template->view       = $view;
+        $template->cms_select = $cms_select;
+        $template->search_key = $search_key;
+        $template->all_open   = $_SESSION['elearning_open_close']['all open'];
+        return $template->render();
+    }
+
+    /**
+    * get Headline
+    *
+    * returns a table with a headline
+    *
+    * @param string $title headline
+    * @return string returns html-code
+    */
+    public static function getHeader($title)
+    {
+        $template = $GLOBALS['template_factory']->open('elearning/_header.php');
+        $template->title = $title;
+        return $template->render();
+    }
+
+    /**
+     * save timestamp
+     *
+     * saves a timestamp for debugging and performance-check
+     *
+     * @param string $stri description
+     */
+    public static function bench($stri)
+    {
+        $GLOBALS['timearray'][] = [
+            'zeit' => microtime(true),
+            'name' => $stri,
+        ];
+    }
+
+    /**
+     * show benchmark
+     *
+     * shows saved timestamps with descriptions
+     *
+     * @param string $stri description
+     */
+    public static function showbench()
+    {
+        global $timearray;
+        echo "<table><tr><td>Zeit (".$timearray[0]["name"].")</td><td align=\"right\"></td></tr>";
+        for ($i = 0; $i < count($timearray); $i++) {
+            echo "<tr><td>".$timearray[$i]["name"].": </td><td align=\"right\">" . number_format(($timearray[$i]["zeit"]-$timearray[$i-1]["zeit"])*1000,2) . " msek</td></tr>";
+        }
+        echo "<tr><td>Gesamtzeit: </td><td align=\"right\">" . number_format(($timearray[$i-1]["zeit"]-$timearray[0]["zeit"])*1000,2)." msek</td></tr></table>";
+    }
+
+    /**
+     * delete cms-data
+     *
+     * deletes all data belonging to the specified cms from stud.ip database
+     */
+    public static function deleteCMSData($cms_type)
+    {
+        $db = DBManager::get();
+        $db->execute("DELETE FROM auth_extern WHERE external_user_system_type = ?", [$cms_type]);
+        $db->execute("DELETE FROM object_contentmodules WHERE system_type = ?", [$cms_type]);
+
+        $config = Config::get();
+        foreach ($config->getFields('global' ,null , "ELEARNING_INTERFACE_{$cms_type}") as $key) {
+            $config->delete($key);
+        }
+    }
+
+    /**
+     * get ilias courses
+     *
+     * creates output of ilias courses linked to the chosen seminar. also updates object-connections.
+     *
+     * @return array
+     */
+    public static function getIliasCourses($sem_id)
+    {
+        global  $connected_cms, $messages, $view, $cms_select;
+        $db = DBManager::get();
+
+        $rs = $db->query("SELECT DISTINCT system_type, module_id
+                          FROM object_contentmodules
+                          WHERE module_type = 'crs' AND object_id = " . $db->quote($sem_id))
+                        ->fetchAll(PDO::FETCH_ASSOC);
+        $courses = [];
+        foreach ($rs as $row) {
+            $courses[$row['system_type']] = $row['module_id'];
+        }
+
+        $connected_courses = [
+            'courses' => [],
+        ];
+        if (is_array($courses)) {
+            foreach ($courses as $system_type => $crs_id) {
+                if (self::isCMSActive($system_type)) {
+                    self::loadClass($system_type);
+                    $connected_courses['courses'][$system_type] = [
+                        'url'      => URLHelper::getLink($connected_cms[$system_type]->link->cms_link . '?client_id=' . $connected_cms[$system_type]->getClientId() . '&cms_select=' . $system_type . '&ref_id=' . $crs_id . '&type=crs&target=start'),
+                        'cms_name' => $connected_cms[$system_type]->getName()
+                    ];
+                    // gegebenenfalls zugeordnete Module aktualisieren
+                    if (Request::option('update')) {
+                        if ((method_exists($connected_cms[$system_type], "updateConnections"))) {
+                            $connected_cms[$system_type]->updateConnections($crs_id);
+                        }
+                    }
+                    if (method_exists($connected_cms[$system_type]->permissions, 'CheckUserPermissions')) {
+                        $connected_cms[$system_type]->permissions->CheckUserPermissions($crs_id);
+                    }
+                }
+            }
+        }
+
+        if ($connected_courses['courses']) {
+            if (count($connected_courses['courses']) > 1) {
+                $connected_courses['text'] = _("Diese Veranstaltung ist mit folgenden Ilias-Kursen verknüpft. Hier gelangen Sie direkt in den jeweiligen Kurs: ");
+            } else {
+                $connected_courses['text'] = _("Diese Veranstaltung ist mit einem Ilias-Kurs verknüpft. Hier gelangen Sie direkt in den Kurs: ");
+            }
+        }
+
+        return $connected_courses;
+    }
+
+    /**
+    * check db-integrity
+    *
+    * checks if there are broken links in the database
+    *
+    * @return boolean successful
+    */
+    public static function checkIntegrity()
+    {
+        global $ELEARNING_INTERFACE_MODULES, $messages;
+        $db = DBManager::get();
+
+        foreach ($ELEARNING_INTERFACE_MODULES as $cms_type =>$data) $cmsystems[$cms_type] = [];
+
+        $config = Config::get();
+        foreach ($config->getFields('global' ,null , 'ELEARNING_INTERFACE_') as $key) {
+            $parts = explode("_", $key);
+            $cmsystems[$parts[2]]["config"]++;
+        }
+
+        $rs = $db->query("SELECT external_user_system_type, COUNT(*) as c FROM auth_extern GROUP BY external_user_system_type");
+        while ($row = $rs->fetch())
+            $cmsystems[$row["external_user_system_type"]]["accounts"] = $row['c'];
+        $rs = $db->query("SELECT system_type, COUNT(*) FROM object_contentmodules GROUP BY system_type");
+        while ($row = $rs->fetch())
+            $cmsystems[$row["system_type"]]["modules"] = $row['c'];
+
+        if (Request::submitted('delete')) {
+            $messages["info"] .= "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">";
+            $messages["info"] .= CSRFProtection::tokenTag();
+            $messages["info"] .= "<table>";
+            $messages["info"] .= "<tr><td>&nbsp;</td></tr>";
+            $messages["info"] .= "<tr><td>" . sprintf(_("Durch das Löschen der Daten zum System mit dem Index \"%s\" werden %s Konfigurationseinträge und Verknüpfungen von Stud.IP-Veranstaltungen und -User-Accounts unwiederbringlich aus der Stud.IP-Datenbank entfernt. Wollen Sie diese Daten jetzt löschen?"), Request::quoted('delete_cms'), $cmsystems[Request::quoted('delete_cms')]["accounts"]+$cmsystems[Request::quoted('delete_cms')]["modules"]+$cmsystems[Request::quoted('delete_cms')]["config"] ) . "</td></tr>";
+            $messages["info"] .= "<tr><td align=\"center\"><input type=\"hidden\" name=\"delete_cms\" value=\"".Request::quoted('delete_cms')."\">";
+            $messages["info"] .= '<div class="button-group">' . Button::create(_('Alle löschen'), 'confirm_delete') . Button::createCancel(_('Abbrechen'), 'abbruch') . '<div></td></tr>';
+            $messages["info"] .= "<tr><td align=\"center\"></td></tr>";
+            $messages["info"] .= "</table>";
+            $messages["info"] .= "</form>";
+        }
+
+        if (Request::submitted('confirm_delete')) {
+            unset($cmsystems[Request::quoted('delete_cms')]);
+//          deleteCMSData(Request::quoted('delete_cms'));
+            $messages["info"] .= _("Daten wurden gelöscht.");
+        }
+
+        foreach ($cmsystems as $cms_type =>$data) {
+            if ($ELEARNING_INTERFACE_MODULES[$cms_type]) {
+                $output .= self::getCMSHeader($ELEARNING_INTERFACE_MODULES[$cms_type]["name"]);
+                $output .= "<table>";
+                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                if (self::isCMSActive($cms_type)) {
+                    $output .= "<tr><td>" .  Icon::create('checkbox-checked', 'clickable')->asImg(['class' => 'text-top']) . "</td><td><b>". sprintf(_("Die Schnittstelle zum System %s ist aktiv."), $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</b></td></tr>";
+                    $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                }
+                elseif ($data["config"] < 1)
+                    $output .= "<tr><td>" .  Icon::create('checkbox-unchecked', 'clickable')->asImg(['class' => 'text-top']) . "</td><td><i>". sprintf(_("Die Schnittstelle für das System %s wurde noch nicht eingerichtet."), $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</i></td></tr>";
+                elseif ($data["config"] < 1)
+                    $output .= "<tr><td>" .  Icon::create('checkbox-unchecked', 'clickable')->asImg(['class' => 'text-top']) . "</td><td><i>". sprintf(_("Die Schnittstelle wurde noch nicht aktiviert."), $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</i></td></tr>";
+
+                if ($data["accounts"])
+                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Stud.IP-User-Accounts sind mit Accounts im System %s verknüpft."), $data["accounts"], $ELEARNING_INTERFACE_MODULES[$cms_type]["name"]) . "</td></tr>";
+                if ($data["modules"])
+                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Objekte sind Stud.IP-Veranstaltungen oder -Einrichtungen zugeordnet."), $data["modules"]) . "</td></tr>";
+                if ($data["config"])
+                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Einträge in der config-Tabelle der Stud.IP-Datenbank."), $data["config"]) . "</td></tr>";
+                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                $output .= "</table>";
+                $output .= self::getCMSFooter(($ELEARNING_INTERFACE_MODULES[$cms_type]["logo_file"] ? "<img src=\"".$ELEARNING_INTERFACE_MODULES[$cms_type]["logo_file"]."\" border=\"0\">" : $cms_type));
+            }
+            else {
+                $output .= self::getCMSHeader("<font color=FF0000> Unbekanntes System: " . $cms_type . "</font>");
+                $output .= "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">";
+                $output .= CSRFProtection::tokenTag();
+                $output .= "<table>";
+                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                $output .= "<tr><td>" . Icon::create('decline', 'attention')->asImg(['class' => 'text-top']) . "</td><td><i>".sprintf(_("Für das System mit dem Index \"%s\" existieren keine Voreinstellungen in den Konfigurationsdateien mehr."), $cms_type) . "</i></td></tr>";
+                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                $output .= "<tr><td colspan=\"2\"><b>". _("In der Stud.IP-Datenbank sind noch folgende Informationen zu diesem System gespeichert:") . "</b></td></tr>";
+                if ($data["accounts"])
+                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Stud.IP-User-Accounts sind mit externen Accounts mit dem Index \"%s\" verknüpft."), $data["accounts"], $cms_type) . "</td></tr>";
+                if ($data["modules"])
+                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Objekte sind Stud.IP-Veranstaltungen oder -Einrichtungen zugeordnet."), $data["modules"]) . "</td></tr>";
+                if ($data["config"])
+                    $output .= "<tr><td colspan=\"2\">". sprintf(_("%s Einträge in der config-Tabelle der Stud.IP-Datenbank."), $data["config"]) . "</td></tr>";
+                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                $output .= "<tr><td align=\"center\" colspan=\"2\"><input type=\"hidden\" name=\"delete_cms\" value=\"".$cms_type."\">" . Button::create(_('Löschen'), 'delete') . "</td></tr>";
+                $output .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
+                $output .= "</table>";
+                $output .= "</form>";
+                $output .= self::getCMSFooter('');
+            }
+            $output .= "<br>";
+        }
+
+        return $output;
+    }
+}
diff --git a/lib/elearning/Ilias3ConnectedCMS.class.php b/lib/elearning/Ilias3ConnectedCMS.class.php
deleted file mode 100644
index 3e428ff..0000000
--- a/lib/elearning/Ilias3ConnectedCMS.class.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-use Studip\Button, Studip\LinkButton;
-
-/**
-* main-class for connection to ILIAS 3
-*
-* This class contains the main methods of the elearning-interface to connect to ILIAS 3. Extends ConnectedCMS.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       Ilias3ConnectedCMS
-* @package  ELearning-Interface
-*/
-class Ilias3ConnectedCMS extends ConnectedCMS
-{
-    var $client_id;
-    var $root_user_sid;
-    var $main_category_node_id;
-    var $user_role_template_id;
-    var $user_skin;
-    var $user_style;
-    var $crs_roles;
-    var $global_roles;
-    var $soap_client;
-    var $encrypt_passwords;
-    var $is_first_call = true;
-
-    /**
-    * constructor
-    *
-    * init class.
-    * @access public
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-
-        parent::__construct($cms);
-
-        require_once($this->CLASS_PREFIX . "Soap.class.php");
-        $classname = $this->CLASS_PREFIX . "Soap";
-        $this->soap_client = new $classname($this->cms_type);
-        $this->soap_client->setCachingStatus(true);
-
-        $this->main_category_node_id = ELearningUtils::getConfigValue("category_id", $cms);
-
-        if ((ELearningUtils::getConfigValue("user_role_template_id", $cms) == "") AND ($GLOBALS["role_template_name"] == ""))
-            $GLOBALS["role_template_name"] = "Author";
-        $this->user_role_template_id = ELearningUtils::getConfigValue("user_role_template_id", $cms);
-        $this->user_skin = ELearningUtils::getConfigValue("user_skin", $cms);
-        $this->user_style = ELearningUtils::getConfigValue("user_style", $cms);
-        $this->encrypt_passwords = ELearningUtils::getConfigValue("encrypt_passwords", $cms);
-
-        $this->crs_roles = $ELEARNING_INTERFACE_MODULES[$cms]["crs_roles"];
-        $this->client_id = $ELEARNING_INTERFACE_MODULES[$cms]["soap_data"]["client"];
-        $this->global_roles = $ELEARNING_INTERFACE_MODULES[$cms]["global_roles"];
-    }
-
-    /**
-    * get preferences
-    *
-    * shows additional settings.
-    */
-    public function getPreferences()
-    {
-        $role_template_name = Request::get('role_template_name');
-        $cat_name = Request::get('cat_name');
-        $style_setting = Request::option('style_setting');
-        $encrypt_passwords = Request::option('encrypt_passwords');
-
-        $this->soap_client->setCachingStatus(false);
-
-        $messages = ['error' => ''];
-
-        if ($cat_name) {
-            $cat = $this->soap_client->getReferenceByTitle( trim( $cat_name ), "cat");
-            if (!$cat) {
-                $messages["error"] .= sprintf(_("Das Objekt mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($cat_name), htmlReady($this->getName())) . "<br>\n";
-            } else {
-                ELearningUtils::setConfigValue("category_id", $cat, $this->cms_type);
-                $this->main_category_node_id = $cat;
-            }
-        }
-
-        if ($role_template_name) {
-            $role_template = $this->soap_client->getObjectByTitle( trim( $role_template_name ), "rolt" );
-            if (!$role_template) {
-                $messages["error"] .= sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($role_template_name), htmlReady($this->getName())) . "<br>\n";
-            } elseif (is_array($role_template)) {
-                ELearningUtils::setConfigValue("user_role_template_id", $role_template["obj_id"], $this->cms_type);
-                ELearningUtils::setConfigValue("user_role_template_name", $role_template["title"], $this->cms_type);
-                $this->user_role_template_id = $role_template["obj_id"];
-            }
-        }
-
-        if (Request::submitted('submit')) {
-            ELearningUtils::setConfigValue("user_style", $style_setting, $this->cms_type);
-            ELearningUtils::setConfigValue("user_skin", $style_setting, $this->cms_type);
-            ELearningUtils::setConfigValue("encrypt_passwords", $encrypt_passwords, $this->cms_type);
-        } else {
-            if (ELearningUtils::getConfigValue("user_style", $this->cms_type)) {
-                $style_setting = ELearningUtils::getConfigValue("user_style", $this->cms_type);
-            }
-            if (ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type)) {
-                $encrypt_passwords = ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type);
-            }
-        }
-
-
-        if ($messages['error']) {
-            echo "<b>" . Icon::create('decline', 'attention')->asImg(['class' => 'text-top', 'title' => _('Fehler')]) . " " . $messages["error"] . "</b><br><br>";
-        }
-
-        echo "<table>";
-        echo "<tr valign=\"top\"><td width=30% align=\"left\"><font size=\"-1\">";
-        echo "<b>" . _("SOAP-Verbindung: ") . "</b>";
-        echo "</td><td><font size=\"-1\">";
-        $error = $this->soap_client->getError();
-        if ($error != false)
-            echo sprintf(_("Beim Herstellen der SOAP-Verbindung trat folgender Fehler auf:")) . "<br><br>" . $error;
-        else
-            echo sprintf(_("Die SOAP-Verbindung zum Klienten \"%s\" wurde hergestellt, der Name des Administrator-Accounts ist \"%s\"."), htmlReady($this->soap_data["client"]), htmlReady($this->soap_data["username"]));
-        echo "<br>\n";
-        echo "<br>\n";
-        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
-
-        $cat = $this->soap_client->getObjectByReference( $this->main_category_node_id );
-        echo '<b>' . _('Kategorie') . ':</b>';
-        echo "</td><td>";
-        echo "<input type=\"text\" size=\"20\" border=0 value=\"" . $cat["title"] . "\" name=\"cat_name\">&nbsp;";
-        echo Icon::create('info-circle', 'inactive', ['title' => _('Geben Sie hier den Namen einer bestehenden ILIAS 3 - Kategorie ein, in der die Lernmodule und User-Kategorien abgelegt werden sollen.')])->asImg();
-        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
-        echo " (ID " . $this->main_category_node_id;
-        if ($cat["description"] != "")
-            echo ", " . _("Beschreibung: ") . htmlReady($cat["description"]);
-        echo ")";
-        echo "<br>\n";
-        echo "<br>\n";
-        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
-
-
-        echo "<b>" . _("Rollen-Template für die persönliche Kategorie: ") . "</b>";
-        echo "</td><td>";
-        echo "<input type=\"text\" size=\"20\" border=0 value=\"" . ELearningUtils::getConfigValue("user_role_template_name", $this->cms_type) . "\" name=\"role_template_name\">&nbsp;";
-        echo Icon::create('info-circle', 'inactive', ['title' => _('Geben Sie den Namen des Rollen-Templates ein, das für die persönliche Kategorie von Lehrenden verwendet werden soll (z.B. \"Author\").')])->asImg();
-        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
-        echo " (ID " . $this->user_role_template_id;
-        echo ")";
-        echo "<br>\n";
-        echo "<br>\n";
-        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
-
-        echo "<b>" . _("Passwörter: ") . "</b>";
-        echo "</td><td><font size=\"-1\">";
-        echo "<input type=\"checkbox\" border=0 value=\"md5\" name=\"encrypt_passwords\"";
-        if ($encrypt_passwords == "md5")
-            echo " checked";
-        echo ">&nbsp;" . _("ILIAS-Passwörter verschlüsselt speichern.");
-        echo Icon::create('info-circle', 'inactive', ['title' => _('Wählen Sie diese Option, wenn die ILIAS-Passwörter der zugeordneten Accounts verschlüsselt in der Stud.IP-Datenbank abgelegt werden sollen.')])->asImg();
-        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
-        echo "<br>\n";
-        echo "<br>\n";
-        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
-
-        echo "<b>" . _("Style / Skin: ") . "</b>";
-        echo "</td><td><font size=\"-1\">";
-        echo "<input type=\"checkbox\" border=0 value=\"studip\" name=\"style_setting\"";
-        if ($style_setting == "studip")
-            echo " checked";
-        echo ">&nbsp;" . _("Stud.IP-Style für neue Nutzer-Accounts voreinstellen.");
-        echo Icon::create('info-circle', 'inactive', ['title' => _('Wählen Sie diese Option, wenn für alle von Stud.IP angelegten ILIAS-Accounts das Stud.IP-Layout als System-Style eingetragen werden soll. ILIAS-seitig angelegte Accounts erhalten weiterhin den Standard-Style.')])->asImg();
-        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
-        echo "<br>\n";
-        echo "<br>\n";
-
-
-
-
-        echo "</td></tr>";
-        echo "</table>";
-        echo "<center>" . Button::create(_('übernehmen'), 'submit') . "</center><br>";
-        echo "<br>\n";
-
-        parent::getPreferences();
-
-        echo "<br>\n";
-    }
-
-    function setContentModule($data, $is_connected = false)
-    {
-        parent::setContentModule($data, $is_connected);
-
-        if ($data["owner"] != "")
-        {
-            $user_data = $this->soap_client->getUser($data["owner"]);
-            $user_name = trim($user_data["title"] . " " . $user_data["firstname"] . " " . $user_data["lastname"]);
-            $this->content_module[$data["ref_id"]]->setAuthors($user_name);
-        }
-        $this->content_module[$data["ref_id"]]->setPermissions($data["accessInfo"], $data["operations"]);
-    }
-
-    /**
-    * create new instance of subclass content-module
-    *
-    * creates new instance of subclass content-module and gets permissions
-    * @access public
-    * @param string $module_id module-id
-    * @param string $module_type module-type
-    * @param string $is_connected is module connected to seminar?
-    */
-    function newContentModule($module_id, $module_type, $is_connected = false)
-    {
-        global $seminar_id, $current_module, $caching_active;
-
-        $current_module = $module_id;
-//      echo "call module $module_id";
-
-        if ($this->is_first_call  AND ($seminar_id != "") AND ($is_connected == true))
-        {
-            $id = ObjectConnections::getConnectionModuleId( $seminar_id, "crs", $this->cms_type );
-            if ($id != false)
-            {
-                if ($this->user->isConnected())
-                    $this->permissions->checkUserPermissions($id);
-                $this->is_first_call = false;
-            }
-//          echo "first call, ref_id $id";
-        }
-
-        parent::newContentModule($module_id, $module_type, $is_connected);
-    }
-
-    /**
-    * get user modules
-    *
-    * returns user content modules
-    * @access public
-    * @return array list of content modules
-    */
-    function getUserContentModules()
-    {
-        global $connected_cms;
-
-        $types = [];
-        foreach ($this->types as $type => $name)
-        {
-            $types[] = $type;
-        }
-        if ($this->user->getCategory() == false)
-            return false;
-        $result = $this->soap_client->getTreeChilds($this->user->getCategory(), $types, $connected_cms[$this->cms_type]->user->getId());
-        $obj_ids = [];
-        if (is_array($result))
-            foreach($result as $key => $object_data){
-                if (is_array($object_data["operations"])){
-                    if ((!in_array($object_data["obj_id"], $obj_ids) && in_array(OPERATION_READ, $object_data["operations"]))
-                    || in_array(OPERATION_WRITE, $object_data["operations"]))
-                    {
-                        if (is_array($user_modules[$object_data["obj_id"]]["operations"])){
-                            if (in_array(OPERATION_WRITE, $user_modules[$object_data["obj_id"]]["operations"])){
-                                continue;
-                            }
-                        }
-                        $user_modules[$object_data["obj_id"]] = $object_data;
-                        $obj_ids[] = $result[$key]["obj_id"];
-                    }
-                }
-            }
-        return $user_modules;
-    }
-
-    /**
-    * search for content modules
-    *
-    * returns found content modules
-    * @access public
-    * @param string $key keyword
-    * @return array list of content modules
-    */
-    function searchContentModules($key)
-    {
-        global $connected_cms;
-
-        $types = [];
-        foreach ($this->types as $type => $name)
-        {
-            $types[] = $type;
-        }
-
-        $result = $this->soap_client->searchObjects($types, $key,"and", $connected_cms[$this->cms_type]->user->getId());
-        return $result;
-    }
-
-
-    /**
-    * get client-id
-    *
-    * returns client-id
-    * @access public
-    * @return string client-id
-    */
-    function getClientId()
-    {
-        return $this->client_id;
-    }
-
-    /**
-    * get session-id
-    *
-    * returns soap-session-id
-    * @access public
-    * @return string session-id
-    */
-    function getSID()
-    {
-        return $this->root_user_sid;
-    }
-
-    /**
-    * terminate
-    *
-    * terminates connection.
-    */
-    public function terminate()
-    {
-//      $this->soap_client->logout();
-        $this->soap_client->saveCacheData();
-    }
-
-    //we have to delete the course only
-    function deleteConnectedModules($object_id){
-        global $connected_cms;
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-        $connected_cms[$this->cms_type]->soap_client->clearCache();
-        $connected_cms[$this->cms_type]->soap_client->user_type == "admin";
-        $crs_id = ObjectConnections::getConnectionModuleId($object_id, "crs", $this->cms_type);
-        if($crs_id && $connected_cms[$this->cms_type]->soap_client->checkReferenceById($crs_id)){
-            $connected_cms[$this->cms_type]->soap_client->deleteObject($crs_id);
-        }
-        return parent::deleteConnectedModules($object_id);
-    }
-}
-?>
diff --git a/lib/elearning/Ilias3ConnectedCMS.php b/lib/elearning/Ilias3ConnectedCMS.php
new file mode 100644
index 0000000..3e428ff
--- /dev/null
+++ b/lib/elearning/Ilias3ConnectedCMS.php
@@ -0,0 +1,350 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+use Studip\Button, Studip\LinkButton;
+
+/**
+* main-class for connection to ILIAS 3
+*
+* This class contains the main methods of the elearning-interface to connect to ILIAS 3. Extends ConnectedCMS.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       Ilias3ConnectedCMS
+* @package  ELearning-Interface
+*/
+class Ilias3ConnectedCMS extends ConnectedCMS
+{
+    var $client_id;
+    var $root_user_sid;
+    var $main_category_node_id;
+    var $user_role_template_id;
+    var $user_skin;
+    var $user_style;
+    var $crs_roles;
+    var $global_roles;
+    var $soap_client;
+    var $encrypt_passwords;
+    var $is_first_call = true;
+
+    /**
+    * constructor
+    *
+    * init class.
+    * @access public
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+
+        parent::__construct($cms);
+
+        require_once($this->CLASS_PREFIX . "Soap.class.php");
+        $classname = $this->CLASS_PREFIX . "Soap";
+        $this->soap_client = new $classname($this->cms_type);
+        $this->soap_client->setCachingStatus(true);
+
+        $this->main_category_node_id = ELearningUtils::getConfigValue("category_id", $cms);
+
+        if ((ELearningUtils::getConfigValue("user_role_template_id", $cms) == "") AND ($GLOBALS["role_template_name"] == ""))
+            $GLOBALS["role_template_name"] = "Author";
+        $this->user_role_template_id = ELearningUtils::getConfigValue("user_role_template_id", $cms);
+        $this->user_skin = ELearningUtils::getConfigValue("user_skin", $cms);
+        $this->user_style = ELearningUtils::getConfigValue("user_style", $cms);
+        $this->encrypt_passwords = ELearningUtils::getConfigValue("encrypt_passwords", $cms);
+
+        $this->crs_roles = $ELEARNING_INTERFACE_MODULES[$cms]["crs_roles"];
+        $this->client_id = $ELEARNING_INTERFACE_MODULES[$cms]["soap_data"]["client"];
+        $this->global_roles = $ELEARNING_INTERFACE_MODULES[$cms]["global_roles"];
+    }
+
+    /**
+    * get preferences
+    *
+    * shows additional settings.
+    */
+    public function getPreferences()
+    {
+        $role_template_name = Request::get('role_template_name');
+        $cat_name = Request::get('cat_name');
+        $style_setting = Request::option('style_setting');
+        $encrypt_passwords = Request::option('encrypt_passwords');
+
+        $this->soap_client->setCachingStatus(false);
+
+        $messages = ['error' => ''];
+
+        if ($cat_name) {
+            $cat = $this->soap_client->getReferenceByTitle( trim( $cat_name ), "cat");
+            if (!$cat) {
+                $messages["error"] .= sprintf(_("Das Objekt mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($cat_name), htmlReady($this->getName())) . "<br>\n";
+            } else {
+                ELearningUtils::setConfigValue("category_id", $cat, $this->cms_type);
+                $this->main_category_node_id = $cat;
+            }
+        }
+
+        if ($role_template_name) {
+            $role_template = $this->soap_client->getObjectByTitle( trim( $role_template_name ), "rolt" );
+            if (!$role_template) {
+                $messages["error"] .= sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($role_template_name), htmlReady($this->getName())) . "<br>\n";
+            } elseif (is_array($role_template)) {
+                ELearningUtils::setConfigValue("user_role_template_id", $role_template["obj_id"], $this->cms_type);
+                ELearningUtils::setConfigValue("user_role_template_name", $role_template["title"], $this->cms_type);
+                $this->user_role_template_id = $role_template["obj_id"];
+            }
+        }
+
+        if (Request::submitted('submit')) {
+            ELearningUtils::setConfigValue("user_style", $style_setting, $this->cms_type);
+            ELearningUtils::setConfigValue("user_skin", $style_setting, $this->cms_type);
+            ELearningUtils::setConfigValue("encrypt_passwords", $encrypt_passwords, $this->cms_type);
+        } else {
+            if (ELearningUtils::getConfigValue("user_style", $this->cms_type)) {
+                $style_setting = ELearningUtils::getConfigValue("user_style", $this->cms_type);
+            }
+            if (ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type)) {
+                $encrypt_passwords = ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type);
+            }
+        }
+
+
+        if ($messages['error']) {
+            echo "<b>" . Icon::create('decline', 'attention')->asImg(['class' => 'text-top', 'title' => _('Fehler')]) . " " . $messages["error"] . "</b><br><br>";
+        }
+
+        echo "<table>";
+        echo "<tr valign=\"top\"><td width=30% align=\"left\"><font size=\"-1\">";
+        echo "<b>" . _("SOAP-Verbindung: ") . "</b>";
+        echo "</td><td><font size=\"-1\">";
+        $error = $this->soap_client->getError();
+        if ($error != false)
+            echo sprintf(_("Beim Herstellen der SOAP-Verbindung trat folgender Fehler auf:")) . "<br><br>" . $error;
+        else
+            echo sprintf(_("Die SOAP-Verbindung zum Klienten \"%s\" wurde hergestellt, der Name des Administrator-Accounts ist \"%s\"."), htmlReady($this->soap_data["client"]), htmlReady($this->soap_data["username"]));
+        echo "<br>\n";
+        echo "<br>\n";
+        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
+
+        $cat = $this->soap_client->getObjectByReference( $this->main_category_node_id );
+        echo '<b>' . _('Kategorie') . ':</b>';
+        echo "</td><td>";
+        echo "<input type=\"text\" size=\"20\" border=0 value=\"" . $cat["title"] . "\" name=\"cat_name\">&nbsp;";
+        echo Icon::create('info-circle', 'inactive', ['title' => _('Geben Sie hier den Namen einer bestehenden ILIAS 3 - Kategorie ein, in der die Lernmodule und User-Kategorien abgelegt werden sollen.')])->asImg();
+        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
+        echo " (ID " . $this->main_category_node_id;
+        if ($cat["description"] != "")
+            echo ", " . _("Beschreibung: ") . htmlReady($cat["description"]);
+        echo ")";
+        echo "<br>\n";
+        echo "<br>\n";
+        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
+
+
+        echo "<b>" . _("Rollen-Template für die persönliche Kategorie: ") . "</b>";
+        echo "</td><td>";
+        echo "<input type=\"text\" size=\"20\" border=0 value=\"" . ELearningUtils::getConfigValue("user_role_template_name", $this->cms_type) . "\" name=\"role_template_name\">&nbsp;";
+        echo Icon::create('info-circle', 'inactive', ['title' => _('Geben Sie den Namen des Rollen-Templates ein, das für die persönliche Kategorie von Lehrenden verwendet werden soll (z.B. \"Author\").')])->asImg();
+        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
+        echo " (ID " . $this->user_role_template_id;
+        echo ")";
+        echo "<br>\n";
+        echo "<br>\n";
+        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
+
+        echo "<b>" . _("Passwörter: ") . "</b>";
+        echo "</td><td><font size=\"-1\">";
+        echo "<input type=\"checkbox\" border=0 value=\"md5\" name=\"encrypt_passwords\"";
+        if ($encrypt_passwords == "md5")
+            echo " checked";
+        echo ">&nbsp;" . _("ILIAS-Passwörter verschlüsselt speichern.");
+        echo Icon::create('info-circle', 'inactive', ['title' => _('Wählen Sie diese Option, wenn die ILIAS-Passwörter der zugeordneten Accounts verschlüsselt in der Stud.IP-Datenbank abgelegt werden sollen.')])->asImg();
+        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
+        echo "<br>\n";
+        echo "<br>\n";
+        echo "</td></tr><tr><td  width=30% align=\"left\"><font size=\"-1\">";
+
+        echo "<b>" . _("Style / Skin: ") . "</b>";
+        echo "</td><td><font size=\"-1\">";
+        echo "<input type=\"checkbox\" border=0 value=\"studip\" name=\"style_setting\"";
+        if ($style_setting == "studip")
+            echo " checked";
+        echo ">&nbsp;" . _("Stud.IP-Style für neue Nutzer-Accounts voreinstellen.");
+        echo Icon::create('info-circle', 'inactive', ['title' => _('Wählen Sie diese Option, wenn für alle von Stud.IP angelegten ILIAS-Accounts das Stud.IP-Layout als System-Style eingetragen werden soll. ILIAS-seitig angelegte Accounts erhalten weiterhin den Standard-Style.')])->asImg();
+        echo "</td></tr><tr><td></td><td><font size=\"-1\">";
+        echo "<br>\n";
+        echo "<br>\n";
+
+
+
+
+        echo "</td></tr>";
+        echo "</table>";
+        echo "<center>" . Button::create(_('übernehmen'), 'submit') . "</center><br>";
+        echo "<br>\n";
+
+        parent::getPreferences();
+
+        echo "<br>\n";
+    }
+
+    function setContentModule($data, $is_connected = false)
+    {
+        parent::setContentModule($data, $is_connected);
+
+        if ($data["owner"] != "")
+        {
+            $user_data = $this->soap_client->getUser($data["owner"]);
+            $user_name = trim($user_data["title"] . " " . $user_data["firstname"] . " " . $user_data["lastname"]);
+            $this->content_module[$data["ref_id"]]->setAuthors($user_name);
+        }
+        $this->content_module[$data["ref_id"]]->setPermissions($data["accessInfo"], $data["operations"]);
+    }
+
+    /**
+    * create new instance of subclass content-module
+    *
+    * creates new instance of subclass content-module and gets permissions
+    * @access public
+    * @param string $module_id module-id
+    * @param string $module_type module-type
+    * @param string $is_connected is module connected to seminar?
+    */
+    function newContentModule($module_id, $module_type, $is_connected = false)
+    {
+        global $seminar_id, $current_module, $caching_active;
+
+        $current_module = $module_id;
+//      echo "call module $module_id";
+
+        if ($this->is_first_call  AND ($seminar_id != "") AND ($is_connected == true))
+        {
+            $id = ObjectConnections::getConnectionModuleId( $seminar_id, "crs", $this->cms_type );
+            if ($id != false)
+            {
+                if ($this->user->isConnected())
+                    $this->permissions->checkUserPermissions($id);
+                $this->is_first_call = false;
+            }
+//          echo "first call, ref_id $id";
+        }
+
+        parent::newContentModule($module_id, $module_type, $is_connected);
+    }
+
+    /**
+    * get user modules
+    *
+    * returns user content modules
+    * @access public
+    * @return array list of content modules
+    */
+    function getUserContentModules()
+    {
+        global $connected_cms;
+
+        $types = [];
+        foreach ($this->types as $type => $name)
+        {
+            $types[] = $type;
+        }
+        if ($this->user->getCategory() == false)
+            return false;
+        $result = $this->soap_client->getTreeChilds($this->user->getCategory(), $types, $connected_cms[$this->cms_type]->user->getId());
+        $obj_ids = [];
+        if (is_array($result))
+            foreach($result as $key => $object_data){
+                if (is_array($object_data["operations"])){
+                    if ((!in_array($object_data["obj_id"], $obj_ids) && in_array(OPERATION_READ, $object_data["operations"]))
+                    || in_array(OPERATION_WRITE, $object_data["operations"]))
+                    {
+                        if (is_array($user_modules[$object_data["obj_id"]]["operations"])){
+                            if (in_array(OPERATION_WRITE, $user_modules[$object_data["obj_id"]]["operations"])){
+                                continue;
+                            }
+                        }
+                        $user_modules[$object_data["obj_id"]] = $object_data;
+                        $obj_ids[] = $result[$key]["obj_id"];
+                    }
+                }
+            }
+        return $user_modules;
+    }
+
+    /**
+    * search for content modules
+    *
+    * returns found content modules
+    * @access public
+    * @param string $key keyword
+    * @return array list of content modules
+    */
+    function searchContentModules($key)
+    {
+        global $connected_cms;
+
+        $types = [];
+        foreach ($this->types as $type => $name)
+        {
+            $types[] = $type;
+        }
+
+        $result = $this->soap_client->searchObjects($types, $key,"and", $connected_cms[$this->cms_type]->user->getId());
+        return $result;
+    }
+
+
+    /**
+    * get client-id
+    *
+    * returns client-id
+    * @access public
+    * @return string client-id
+    */
+    function getClientId()
+    {
+        return $this->client_id;
+    }
+
+    /**
+    * get session-id
+    *
+    * returns soap-session-id
+    * @access public
+    * @return string session-id
+    */
+    function getSID()
+    {
+        return $this->root_user_sid;
+    }
+
+    /**
+    * terminate
+    *
+    * terminates connection.
+    */
+    public function terminate()
+    {
+//      $this->soap_client->logout();
+        $this->soap_client->saveCacheData();
+    }
+
+    //we have to delete the course only
+    function deleteConnectedModules($object_id){
+        global $connected_cms;
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+        $connected_cms[$this->cms_type]->soap_client->clearCache();
+        $connected_cms[$this->cms_type]->soap_client->user_type == "admin";
+        $crs_id = ObjectConnections::getConnectionModuleId($object_id, "crs", $this->cms_type);
+        if($crs_id && $connected_cms[$this->cms_type]->soap_client->checkReferenceById($crs_id)){
+            $connected_cms[$this->cms_type]->soap_client->deleteObject($crs_id);
+        }
+        return parent::deleteConnectedModules($object_id);
+    }
+}
+?>
diff --git a/lib/elearning/Ilias3ConnectedLink.class.php b/lib/elearning/Ilias3ConnectedLink.class.php
deleted file mode 100644
index f50fd53..0000000
--- a/lib/elearning/Ilias3ConnectedLink.class.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-use Studip\Button, Studip\LinkButton;
-
-/**
-* class to generate links to ILIAS 3
-*
-* This class contains methods to generate links to ILIAS 3.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       Ilias3ConnectedLink
-* @package  ELearning-Interface
-*/
-class Ilias3ConnectedLink extends ConnectedLink
-{
-    /**
-    * constructor
-    *
-    * init class.
-    * @access
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        parent::__construct($cms);
-        $this->cms_link = "ilias3_referrer.php";
-    }
-
-    /**
-    * get user module links
-    *
-    * returns content module links for user
-    * @return string html-code
-    */
-    public function getUserModuleLinks()
-    {
-        global $connected_cms, $current_module;
-
-        $output = '';
-
-        if ($connected_cms[$this->cms_type]->isAuthNecessary() && !$connected_cms[$this->cms_type]->user->isConnected()) {
-            $output .= $this->getNewAccountLink();
-        } elseif (!$connected_cms[$this->cms_type]->content_module[$current_module]->isDummy()) {
-            if ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_READ)) {
-                $output .= LinkButton::create(
-                    _('Starten'),
-                    URLHelper::getURL($this->cms_link, [
-                        'client_id'  => $connected_cms[$this->cms_type]->getClientId(),
-                        'cms_select' => $this->cms_type,
-                        // 'sess_id'    => $connected_cms[$this->cms_type]->user->getSessionId(),
-                        'ref_id'     => $connected_cms[$this->cms_type]->content_module[$current_module]->getId(),
-                        'type'       => $connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType(),
-                        'target'     => 'start',
-                    ]),
-                    [
-                        'target' => '_blank',
-                        'rel'    => 'noopener noreferrer',
-                    ]
-                );
-                $output .= "&nbsp;";
-            }
-            if ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_WRITE)) {
-                $output .= LinkButton::create(
-                    _('Bearbeiten'),
-                    URLHelper::getURL($this->cms_link, [
-                        'client_id'  => $connected_cms[$this->cms_type]->getClientId(),
-                        'cms_select' => $this->cms_type,
-                        // 'sess_id'    => $connected_cms[$this->cms_type]->user->getSessionId(),
-                        'ref_id'     => $connected_cms[$this->cms_type]->content_module[$current_module]->getId(),
-                        'type'       => $connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType(),
-                        'target'     => 'edit',
-                    ]),
-                    [
-                        'target' => '_blank',
-                        'rel'    => 'noopener noreferrer',
-                    ]
-                );
-                $output .= "&nbsp;";
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-    * get admin module links
-    *
-    * returns links add or remove a module from course
-    * @return string returns html-code
-    */
-    public function getAdminModuleLinks()
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        $output = "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
-        $output .= CSRFProtection::tokenTag();
-        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . htmlReady($view) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady($search_key) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_system_type\" value=\"" . htmlReady($this->cms_type) . "\">\n";
-
-        if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected()) {
-            $output .= "&nbsp;" . Button::create(_('Entfernen'), 'remove');
-        } elseif ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_WRITE)) {
-            $output .= "<div align=\"left\"><input type=\"CHECKBOX\" value=\"1\" name=\"write_permission\" style=\"vertical-align:middle\">";
-            $output .= _("Mit Schreibrechten für alle Lehrenden/Tutoren und Tutorinnen dieser Veranstaltung") . "<br>";
-            $output .= "<input type=\"CHECKBOX\" value=\"1\" style=\"vertical-align:middle\" name=\"write_permission_autor\">";
-            $output .= _("Mit Schreibrechten für alle Teilnehmenden dieser Veranstaltung") . "</div>";
-            $output .=  Button::create(_('Hinzufügen'), 'add') . "<br>";
-        } else {
-            $output .= "&nbsp;" . Button::create(_('Hinzufügen'), 'add');
-        }
-        $output .= "</form>";
-
-        return $output;
-    }
-
-    /**
-    * get new module link
-    *
-    * returns link to create a new module if allowed
-    * @return string|false returns html-code or false
-    */
-    public function getNewModuleLink()
-    {
-        global $connected_cms, $auth;
-        $output = "\n";
-        if (Request::get("module_type_" . $this->cms_type)) {
-            if (!$connected_cms[$this->cms_type]->user->category) {
-                $connected_cms[$this->cms_type]->user->newUserCategory();
-                if ($connected_cms[$this->cms_type]->user->category == false) {
-                    return $output;
-                }
-            }
-            $output  = "&nbsp;";
-            $output .= LinkButton::create(
-                _('Neu anlegen'),
-                URLHelper::getURL($this->cms_link, [
-                    'client_id'  => $connected_cms[$this->cms_type]->getClientId(),
-                    'cms_select' => $this->cms_type,
-//                    'sess_id'    => $connected_cms[$this->cms_type]->user->getSessionId(),
-                    'ref_id'     => $connected_cms[$this->cms_type]->user->category,
-                    'type'       => Request::option("module_type_" . $this->cms_type),
-                    'target'     => 'new',
-                ]),
-                [
-                    'target' => '_blank',
-                    'rel'    => 'noopener noreferrer',
-                ]
-            );
-        }
-        $user_crs_role = $connected_cms[$this->cms_type]->crs_roles[$auth->auth['perm']];
-        if ($user_crs_role === 'admin') {
-            return $output;
-        }
-
-        return false;
-    }
-
-    /**
-    * get start page link
-    *
-    * returns link to ilias start-page
-    * @access public
-    * @return string returns url or false
-    */
-    function getStartpageLink()
-    {
-        global $connected_cms;
-
-        if ($connected_cms[$this->cms_type]->user->isConnected()) {
-            $output = $this->cms_link . "?"
-                . "client_id=" . $connected_cms[$this->cms_type]->getClientId()
-                . "&cms_select=" . $this->cms_type
-                . "&target=login";
-        }
-        return $output;
-    }
-}
-?>
diff --git a/lib/elearning/Ilias3ConnectedLink.php b/lib/elearning/Ilias3ConnectedLink.php
new file mode 100644
index 0000000..f50fd53
--- /dev/null
+++ b/lib/elearning/Ilias3ConnectedLink.php
@@ -0,0 +1,188 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+use Studip\Button, Studip\LinkButton;
+
+/**
+* class to generate links to ILIAS 3
+*
+* This class contains methods to generate links to ILIAS 3.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       Ilias3ConnectedLink
+* @package  ELearning-Interface
+*/
+class Ilias3ConnectedLink extends ConnectedLink
+{
+    /**
+    * constructor
+    *
+    * init class.
+    * @access
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        parent::__construct($cms);
+        $this->cms_link = "ilias3_referrer.php";
+    }
+
+    /**
+    * get user module links
+    *
+    * returns content module links for user
+    * @return string html-code
+    */
+    public function getUserModuleLinks()
+    {
+        global $connected_cms, $current_module;
+
+        $output = '';
+
+        if ($connected_cms[$this->cms_type]->isAuthNecessary() && !$connected_cms[$this->cms_type]->user->isConnected()) {
+            $output .= $this->getNewAccountLink();
+        } elseif (!$connected_cms[$this->cms_type]->content_module[$current_module]->isDummy()) {
+            if ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_READ)) {
+                $output .= LinkButton::create(
+                    _('Starten'),
+                    URLHelper::getURL($this->cms_link, [
+                        'client_id'  => $connected_cms[$this->cms_type]->getClientId(),
+                        'cms_select' => $this->cms_type,
+                        // 'sess_id'    => $connected_cms[$this->cms_type]->user->getSessionId(),
+                        'ref_id'     => $connected_cms[$this->cms_type]->content_module[$current_module]->getId(),
+                        'type'       => $connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType(),
+                        'target'     => 'start',
+                    ]),
+                    [
+                        'target' => '_blank',
+                        'rel'    => 'noopener noreferrer',
+                    ]
+                );
+                $output .= "&nbsp;";
+            }
+            if ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_WRITE)) {
+                $output .= LinkButton::create(
+                    _('Bearbeiten'),
+                    URLHelper::getURL($this->cms_link, [
+                        'client_id'  => $connected_cms[$this->cms_type]->getClientId(),
+                        'cms_select' => $this->cms_type,
+                        // 'sess_id'    => $connected_cms[$this->cms_type]->user->getSessionId(),
+                        'ref_id'     => $connected_cms[$this->cms_type]->content_module[$current_module]->getId(),
+                        'type'       => $connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType(),
+                        'target'     => 'edit',
+                    ]),
+                    [
+                        'target' => '_blank',
+                        'rel'    => 'noopener noreferrer',
+                    ]
+                );
+                $output .= "&nbsp;";
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+    * get admin module links
+    *
+    * returns links add or remove a module from course
+    * @return string returns html-code
+    */
+    public function getAdminModuleLinks()
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        $output = "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
+        $output .= CSRFProtection::tokenTag();
+        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . htmlReady($view) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady($search_key) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_system_type\" value=\"" . htmlReady($this->cms_type) . "\">\n";
+
+        if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected()) {
+            $output .= "&nbsp;" . Button::create(_('Entfernen'), 'remove');
+        } elseif ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_WRITE)) {
+            $output .= "<div align=\"left\"><input type=\"CHECKBOX\" value=\"1\" name=\"write_permission\" style=\"vertical-align:middle\">";
+            $output .= _("Mit Schreibrechten für alle Lehrenden/Tutoren und Tutorinnen dieser Veranstaltung") . "<br>";
+            $output .= "<input type=\"CHECKBOX\" value=\"1\" style=\"vertical-align:middle\" name=\"write_permission_autor\">";
+            $output .= _("Mit Schreibrechten für alle Teilnehmenden dieser Veranstaltung") . "</div>";
+            $output .=  Button::create(_('Hinzufügen'), 'add') . "<br>";
+        } else {
+            $output .= "&nbsp;" . Button::create(_('Hinzufügen'), 'add');
+        }
+        $output .= "</form>";
+
+        return $output;
+    }
+
+    /**
+    * get new module link
+    *
+    * returns link to create a new module if allowed
+    * @return string|false returns html-code or false
+    */
+    public function getNewModuleLink()
+    {
+        global $connected_cms, $auth;
+        $output = "\n";
+        if (Request::get("module_type_" . $this->cms_type)) {
+            if (!$connected_cms[$this->cms_type]->user->category) {
+                $connected_cms[$this->cms_type]->user->newUserCategory();
+                if ($connected_cms[$this->cms_type]->user->category == false) {
+                    return $output;
+                }
+            }
+            $output  = "&nbsp;";
+            $output .= LinkButton::create(
+                _('Neu anlegen'),
+                URLHelper::getURL($this->cms_link, [
+                    'client_id'  => $connected_cms[$this->cms_type]->getClientId(),
+                    'cms_select' => $this->cms_type,
+//                    'sess_id'    => $connected_cms[$this->cms_type]->user->getSessionId(),
+                    'ref_id'     => $connected_cms[$this->cms_type]->user->category,
+                    'type'       => Request::option("module_type_" . $this->cms_type),
+                    'target'     => 'new',
+                ]),
+                [
+                    'target' => '_blank',
+                    'rel'    => 'noopener noreferrer',
+                ]
+            );
+        }
+        $user_crs_role = $connected_cms[$this->cms_type]->crs_roles[$auth->auth['perm']];
+        if ($user_crs_role === 'admin') {
+            return $output;
+        }
+
+        return false;
+    }
+
+    /**
+    * get start page link
+    *
+    * returns link to ilias start-page
+    * @access public
+    * @return string returns url or false
+    */
+    function getStartpageLink()
+    {
+        global $connected_cms;
+
+        if ($connected_cms[$this->cms_type]->user->isConnected()) {
+            $output = $this->cms_link . "?"
+                . "client_id=" . $connected_cms[$this->cms_type]->getClientId()
+                . "&cms_select=" . $this->cms_type
+                . "&target=login";
+        }
+        return $output;
+    }
+}
+?>
diff --git a/lib/elearning/Ilias3ConnectedPermissions.class.php b/lib/elearning/Ilias3ConnectedPermissions.class.php
deleted file mode 100644
index 5ac5f59..0000000
--- a/lib/elearning/Ilias3ConnectedPermissions.class.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-DEFINE ("CRS_NOTIFICATION", "1");
-DEFINE ("CRS_NO_NOTIFICATION", "2");
-DEFINE ("CRS_ADMIN_ROLE", "1");
-DEFINE ("CRS_MEMBER_ROLE", "2");
-DEFINE ("CRS_TUTOR_ROLE", "3");
-DEFINE ("CRS_PASSED_VALUE", "0");
-
-DEFINE ("OPERATION_VISIBLE", "visible");
-DEFINE ("OPERATION_READ", "read");
-DEFINE ("OPERATION_WRITE", "write");
-DEFINE ("OPERATION_DELETE", "delete");
-DEFINE ("OPERATION_CREATE_LM", "create_lm");
-DEFINE ("OPERATION_CREATE_TEST", "create_tst");
-DEFINE ("OPERATION_CREATE_QUESTIONS", "create_qps");
-DEFINE ("OPERATION_CREATE_FILE", "create_file");
-
-/**
-* class to handle ILIAS 3 access controls
-*
-* This class contains methods to handle permissions on connected objects.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       Ilias3ConnectedPermission
-* @package  ELearning-Interface
-*/
-class Ilias3ConnectedPermissions extends ConnectedPermissions
-{
-    var $operations;
-    var $allowed_operations;
-    var $tree_allowed_operations;
-
-    var $USER_OPERATIONS;
-    var $AUTHOR_OPERATIONS;
-
-    /**
-    * constructor
-    *
-    * init class.
-    * @access
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        global $connected_cms;
-
-        parent::__construct($cms);
-        $this->readData();
-
-        if ($connected_cms[$this->cms_type]->user->isConnected())
-        {
-            $roles = $this->getUserRoles();
-            $connected_cms[$this->cms_type]->user->setRoles( $roles );
-        }
-        $this->USER_OPERATIONS = [OPERATION_VISIBLE, OPERATION_READ];
-//      $this->AUTHOR_OPERATIONS = array(OPERATION_VISIBLE, OPERATION_READ, OPERATION_CREATE_LM, OPERATION_CREATE_TEST, OPERATION_CREATE_QUESTIONS, OPERATION_CREATE_FILE);
-    }
-
-    /**
-    * read data
-    *
-    * reads acces control data from database
-    * @access public
-    */
-    function readData()
-    {
-        global $connected_cms;
-
-        $this->operations = $connected_cms[$this->cms_type]->soap_client->getOperations();
-    }
-
-    /**
-    * check user permissions
-    *
-    * checks user permissions for connected course and changes setting if necessary
-    * @access public
-    * @param string $course_id course-id
-    * @return boolean returns false on error
-    */
-    function checkUserPermissions($course_id)
-    {
-        global $connected_cms, $messages;
-
-        if (!$course_id) {
-            return false;
-        }
-        if (!$connected_cms[$this->cms_type]->user->getId()) {
-            return false;
-        }
-
-        // get course role folder and local roles
-        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($course_id);
-        $active_role = "";
-        $proper_role = "";
-        $user_crs_role = $connected_cms[$this->cms_type]->crs_roles[$GLOBALS['perm']->get_studip_perm(Context::getId())];
-        if (is_array($local_roles)) {
-            foreach ($local_roles as $key => $role_data) { // check only if local role is il_crs_member, -tutor or -admin
-                if (mb_strpos($role_data["title"], "_crs_") !== false) {
-                    if (in_array($role_data["obj_id"], $connected_cms[$this->cms_type]->user->getRoles())) {
-                        $active_role = $role_data["obj_id"];
-                    }
-                    if (mb_strpos($role_data["title"], $user_crs_role) > 0) {
-                        $proper_role = $role_data["obj_id"];
-                    }
-                }
-            }
-        }
-
-        // is user already course-member? otherwise add member with proper role
-        $is_member = $connected_cms[$this->cms_type]->soap_client->isMember( $connected_cms[$this->cms_type]->user->getId(), $course_id);
-        if (!$is_member) {
-            $member_data["usr_id"] = $connected_cms[$this->cms_type]->user->getId();
-            $member_data["ref_id"] = $course_id;
-            $member_data["status"] = CRS_NO_NOTIFICATION;
-            $type = "";
-            switch ($user_crs_role) {
-                case "admin":
-                    $member_data["role"] = CRS_ADMIN_ROLE;
-                    $type = "Admin";
-                    break;
-                case "tutor":
-                    $member_data["role"] = CRS_TUTOR_ROLE;
-                    $type = "Tutor";
-                    break;
-                case "member":
-                    $member_data["role"] = CRS_MEMBER_ROLE;
-                    $type = "Member";
-                    break;
-                default:
-            }
-            $member_data["passed"] = CRS_PASSED_VALUE;
-            if ($type != "")
-            {
-                $connected_cms[$this->cms_type]->soap_client->addMember( $connected_cms[$this->cms_type]->user->getId(), $type, $course_id );
-                if ($GLOBALS["debug"] == true)
-                    echo "addMember";
-            }
-        }
-
-        // check if user has proper local role
-        // if not, change it
-        if ($active_role != $proper_role)
-        {
-            if ($active_role != "")
-            {
-                $connected_cms[$this->cms_type]->soap_client->deleteUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $active_role);
-                if ($GLOBALS["debug"] == true)
-                    echo "Role $active_role deleted.";
-            }
-
-            if ($proper_role != "")
-            {
-                $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $proper_role);
-                if ($GLOBALS["debug"] == true)
-                    echo "Role $proper_role added.";
-            }
-
-        }
-        if (!$this->getContentModulePerms($course_id)) {
-            $messages["info"] .= _("Für den zugeordneten ILIAS-Kurs konnten keine Berechtigungen ermittelt werden.") . "<br>";
-        }
-
-        return true;
-    }
-
-    /**
-    * get user roles
-    *
-    * returns roles for current user
-    * @access public
-    * @return array role-ids
-    */
-    function getUserRoles()
-    {
-        global $connected_cms;
-
-        return $connected_cms[$this->cms_type]->soap_client->getUserRoles($connected_cms[$this->cms_type]->user->getId());
-    }
-
-    /**
-    * get permissions for content module
-    *
-    * returns allowed operations for given user and module
-    * @access public
-    * @param string $module_id module-id
-    * @return boolean returns false on error
-    */
-    function getContentModulePerms($module_id)
-    {
-        global $connected_cms, $current_module;
-
-        if (is_array($connected_cms[$this->cms_type]->content_module[$current_module]->allowed_operations))
-            return true;
-        $this->allowed_operations = [];
-        $this->tree_allowed_operations = $connected_cms[$this->cms_type]->soap_client->getObjectTreeOperations(
-                    $module_id,
-                    $connected_cms[$this->cms_type]->user->getId()
-                    );
-        if (!is_array($this->tree_allowed_operations)) {
-            return false;
-        }
-
-        $no_permission = false;
-        if (isset($current_module)) { //TODO: fixes Warning:Creating default object from empty value - possible side effects
-            if ((! in_array($this->operations[OPERATION_READ], $this->tree_allowed_operations)) OR (! in_array($this->operations[OPERATION_VISIBLE], $this->tree_allowed_operations)))
-                $no_permission = true;
-
-            if ($no_permission == false)
-                $connected_cms[$this->cms_type]->content_module[$current_module]->allowed_operations = $this->tree_allowed_operations;
-            else
-                $connected_cms[$this->cms_type]->content_module[$current_module]->allowed_operations = false;
-        }
-        return true;
-    }
-
-    /**
-    * get operation
-    *
-    * returns id for given operation-string
-    * @access public
-    * @param string $operation operation
-    * @return integer operation-id
-    */
-    function getOperation($operation)
-    {
-        return $this->operations[$operation];
-    }
-
-    /**
-    * get operation-ids
-    *
-    * returns an array of operation-ids
-    * @param array $operation operation
-    * @return array|false operation-ids
-    */
-    public function getOperationArray($operation)
-    {
-        if (!is_array($operation)) {
-            return false;
-        }
-
-        return array_map(
-            function ($operation_name) {
-                return $this->operations[$operation_name];
-            },
-            $operation
-        );
-    }
-}
diff --git a/lib/elearning/Ilias3ConnectedPermissions.php b/lib/elearning/Ilias3ConnectedPermissions.php
new file mode 100644
index 0000000..5ac5f59
--- /dev/null
+++ b/lib/elearning/Ilias3ConnectedPermissions.php
@@ -0,0 +1,256 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+DEFINE ("CRS_NOTIFICATION", "1");
+DEFINE ("CRS_NO_NOTIFICATION", "2");
+DEFINE ("CRS_ADMIN_ROLE", "1");
+DEFINE ("CRS_MEMBER_ROLE", "2");
+DEFINE ("CRS_TUTOR_ROLE", "3");
+DEFINE ("CRS_PASSED_VALUE", "0");
+
+DEFINE ("OPERATION_VISIBLE", "visible");
+DEFINE ("OPERATION_READ", "read");
+DEFINE ("OPERATION_WRITE", "write");
+DEFINE ("OPERATION_DELETE", "delete");
+DEFINE ("OPERATION_CREATE_LM", "create_lm");
+DEFINE ("OPERATION_CREATE_TEST", "create_tst");
+DEFINE ("OPERATION_CREATE_QUESTIONS", "create_qps");
+DEFINE ("OPERATION_CREATE_FILE", "create_file");
+
+/**
+* class to handle ILIAS 3 access controls
+*
+* This class contains methods to handle permissions on connected objects.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       Ilias3ConnectedPermission
+* @package  ELearning-Interface
+*/
+class Ilias3ConnectedPermissions extends ConnectedPermissions
+{
+    var $operations;
+    var $allowed_operations;
+    var $tree_allowed_operations;
+
+    var $USER_OPERATIONS;
+    var $AUTHOR_OPERATIONS;
+
+    /**
+    * constructor
+    *
+    * init class.
+    * @access
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        global $connected_cms;
+
+        parent::__construct($cms);
+        $this->readData();
+
+        if ($connected_cms[$this->cms_type]->user->isConnected())
+        {
+            $roles = $this->getUserRoles();
+            $connected_cms[$this->cms_type]->user->setRoles( $roles );
+        }
+        $this->USER_OPERATIONS = [OPERATION_VISIBLE, OPERATION_READ];
+//      $this->AUTHOR_OPERATIONS = array(OPERATION_VISIBLE, OPERATION_READ, OPERATION_CREATE_LM, OPERATION_CREATE_TEST, OPERATION_CREATE_QUESTIONS, OPERATION_CREATE_FILE);
+    }
+
+    /**
+    * read data
+    *
+    * reads acces control data from database
+    * @access public
+    */
+    function readData()
+    {
+        global $connected_cms;
+
+        $this->operations = $connected_cms[$this->cms_type]->soap_client->getOperations();
+    }
+
+    /**
+    * check user permissions
+    *
+    * checks user permissions for connected course and changes setting if necessary
+    * @access public
+    * @param string $course_id course-id
+    * @return boolean returns false on error
+    */
+    function checkUserPermissions($course_id)
+    {
+        global $connected_cms, $messages;
+
+        if (!$course_id) {
+            return false;
+        }
+        if (!$connected_cms[$this->cms_type]->user->getId()) {
+            return false;
+        }
+
+        // get course role folder and local roles
+        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($course_id);
+        $active_role = "";
+        $proper_role = "";
+        $user_crs_role = $connected_cms[$this->cms_type]->crs_roles[$GLOBALS['perm']->get_studip_perm(Context::getId())];
+        if (is_array($local_roles)) {
+            foreach ($local_roles as $key => $role_data) { // check only if local role is il_crs_member, -tutor or -admin
+                if (mb_strpos($role_data["title"], "_crs_") !== false) {
+                    if (in_array($role_data["obj_id"], $connected_cms[$this->cms_type]->user->getRoles())) {
+                        $active_role = $role_data["obj_id"];
+                    }
+                    if (mb_strpos($role_data["title"], $user_crs_role) > 0) {
+                        $proper_role = $role_data["obj_id"];
+                    }
+                }
+            }
+        }
+
+        // is user already course-member? otherwise add member with proper role
+        $is_member = $connected_cms[$this->cms_type]->soap_client->isMember( $connected_cms[$this->cms_type]->user->getId(), $course_id);
+        if (!$is_member) {
+            $member_data["usr_id"] = $connected_cms[$this->cms_type]->user->getId();
+            $member_data["ref_id"] = $course_id;
+            $member_data["status"] = CRS_NO_NOTIFICATION;
+            $type = "";
+            switch ($user_crs_role) {
+                case "admin":
+                    $member_data["role"] = CRS_ADMIN_ROLE;
+                    $type = "Admin";
+                    break;
+                case "tutor":
+                    $member_data["role"] = CRS_TUTOR_ROLE;
+                    $type = "Tutor";
+                    break;
+                case "member":
+                    $member_data["role"] = CRS_MEMBER_ROLE;
+                    $type = "Member";
+                    break;
+                default:
+            }
+            $member_data["passed"] = CRS_PASSED_VALUE;
+            if ($type != "")
+            {
+                $connected_cms[$this->cms_type]->soap_client->addMember( $connected_cms[$this->cms_type]->user->getId(), $type, $course_id );
+                if ($GLOBALS["debug"] == true)
+                    echo "addMember";
+            }
+        }
+
+        // check if user has proper local role
+        // if not, change it
+        if ($active_role != $proper_role)
+        {
+            if ($active_role != "")
+            {
+                $connected_cms[$this->cms_type]->soap_client->deleteUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $active_role);
+                if ($GLOBALS["debug"] == true)
+                    echo "Role $active_role deleted.";
+            }
+
+            if ($proper_role != "")
+            {
+                $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $proper_role);
+                if ($GLOBALS["debug"] == true)
+                    echo "Role $proper_role added.";
+            }
+
+        }
+        if (!$this->getContentModulePerms($course_id)) {
+            $messages["info"] .= _("Für den zugeordneten ILIAS-Kurs konnten keine Berechtigungen ermittelt werden.") . "<br>";
+        }
+
+        return true;
+    }
+
+    /**
+    * get user roles
+    *
+    * returns roles for current user
+    * @access public
+    * @return array role-ids
+    */
+    function getUserRoles()
+    {
+        global $connected_cms;
+
+        return $connected_cms[$this->cms_type]->soap_client->getUserRoles($connected_cms[$this->cms_type]->user->getId());
+    }
+
+    /**
+    * get permissions for content module
+    *
+    * returns allowed operations for given user and module
+    * @access public
+    * @param string $module_id module-id
+    * @return boolean returns false on error
+    */
+    function getContentModulePerms($module_id)
+    {
+        global $connected_cms, $current_module;
+
+        if (is_array($connected_cms[$this->cms_type]->content_module[$current_module]->allowed_operations))
+            return true;
+        $this->allowed_operations = [];
+        $this->tree_allowed_operations = $connected_cms[$this->cms_type]->soap_client->getObjectTreeOperations(
+                    $module_id,
+                    $connected_cms[$this->cms_type]->user->getId()
+                    );
+        if (!is_array($this->tree_allowed_operations)) {
+            return false;
+        }
+
+        $no_permission = false;
+        if (isset($current_module)) { //TODO: fixes Warning:Creating default object from empty value - possible side effects
+            if ((! in_array($this->operations[OPERATION_READ], $this->tree_allowed_operations)) OR (! in_array($this->operations[OPERATION_VISIBLE], $this->tree_allowed_operations)))
+                $no_permission = true;
+
+            if ($no_permission == false)
+                $connected_cms[$this->cms_type]->content_module[$current_module]->allowed_operations = $this->tree_allowed_operations;
+            else
+                $connected_cms[$this->cms_type]->content_module[$current_module]->allowed_operations = false;
+        }
+        return true;
+    }
+
+    /**
+    * get operation
+    *
+    * returns id for given operation-string
+    * @access public
+    * @param string $operation operation
+    * @return integer operation-id
+    */
+    function getOperation($operation)
+    {
+        return $this->operations[$operation];
+    }
+
+    /**
+    * get operation-ids
+    *
+    * returns an array of operation-ids
+    * @param array $operation operation
+    * @return array|false operation-ids
+    */
+    public function getOperationArray($operation)
+    {
+        if (!is_array($operation)) {
+            return false;
+        }
+
+        return array_map(
+            function ($operation_name) {
+                return $this->operations[$operation_name];
+            },
+            $operation
+        );
+    }
+}
diff --git a/lib/elearning/Ilias3ConnectedUser.class.php b/lib/elearning/Ilias3ConnectedUser.class.php
deleted file mode 100644
index ef98529..0000000
--- a/lib/elearning/Ilias3ConnectedUser.class.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* class to handle ILIAS 3 user-accounts
-*
-* This class contains methods to handle connected ILIAS 3 user-accounts.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       Ilias3ConnectedUser
-* @package  ELearning-Interface
-*/
-class Ilias3ConnectedUser extends ConnectedUser
-{
-    var $roles;
-    var $user_sid;
-    /**
-    * constructor
-    *
-    * init class.
-    * @access
-    * @param string $cms system-type
-    */
-    function __construct($cms, $user_id = false)
-    {
-        global $connected_cms, $perm;
-
-        parent::__construct($cms, $user_id);
-        // create account automatically if it doesn't exist
-        if (! $this->isConnected() AND ($connected_cms[$this->cms_type]->USER_AUTO_CREATE == true))
-        {
-            $this->setPassword(md5(uniqid("4dfmjsnll")));
-            $this->newUser(true);
-            $this->readData();
-        }
-        $this->roles = [$connected_cms[$cms]->roles[$perm->get_perm($this->studip_id)]];
-    }
-
-    function readData()
-    {
-        global $connected_cms;
-        parent::readData();
-        if($this->is_connected){
-            $user_id = $connected_cms[$this->cms_type]->soap_client->lookupUser($this->login);
-            if (!$user_id) {
-                //do not delete in case of error
-                if($user_id !== false) {
-                    $query = "DELETE FROM auth_extern WHERE studip_user_id = ? LIMIT 1";
-                    $statement = DBManager::get()->prepare($query);
-                    $statement->execute([$this->studip_id]);
-                }
-                $this->id = '';
-                $this->login = '';
-                $this->external_password = '';
-                $this->category = '';
-                $this->type = '';
-                $this->is_connected = false;
-            } elseif($this->category != ''){
-                $cat = $connected_cms[$this->cms_type]->soap_client->checkReferenceById($this->category);
-                if(!$cat){
-                    $query = "UPDATE auth_extern SET external_user_category = '' WHERE studip_user_id = ? LIMIT 1";
-                    $statement = DBManager::get()->prepare($query);
-                    $statement->execute([$this->studip_id]);
-
-                    $this->category = '';
-                }
-            }
-        }
-        return $this->is_connected;
-    }
-
-    /**
-    * get login-data
-    *
-    * gets login-data from database
-    * @access public
-    * @param string $username username
-    * @return boolean returns false, if no data was found
-    */
-    function getLoginData($username)
-    {
-        global $connected_cms;
-
-        if (!$username) {
-            return false;
-        }
-        $user_id = $connected_cms[$this->cms_type]->soap_client->lookupUser($username);
-
-        if ($user_id == false)
-            return false;
-
-        $user_data = $connected_cms[$this->cms_type]->soap_client->getUser($user_id);
-
-        if ($user_data == false)
-            return false;
-
-        $this->id = $user_data["usr_id"];
-        $this->login = $user_data["login"];
-        $this->external_password = $user_data["passwd"];
-        return true;
-    }
-
-    /**
-    * get crypted password
-    *
-    * returns ILIAS 3 password
-    * @access public
-    * @param string $password password
-    * @return string password
-    */
-    function getCryptedPassword($password)
-    {
-        return md5($password);
-    }
-
-    /**
-    * set roles
-    *
-    * sets roles
-    * @access public
-    * @param array $role_array role-array
-    */
-    function setRoles($role_array)
-    {
-        $this->roles = $role_array;
-    }
-
-    /**
-    * get roles
-    *
-    * returns roles
-    * @access public
-    * @return array roles
-    */
-    function getRoles()
-    {
-        return $this->roles;
-    }
-
-    /**
-    * create new user category
-    *
-    * create new user category
-    * @access public
-    * @return boolean returns false on error
-    */
-    function newUserCategory()
-    {
-        global $connected_cms, $messages;
-
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-
-        // data for user-category in ILIAS 3
-        $object_data["title"] = sprintf(_("Eigene Daten von %s (%s)."), $this->getName(), $this->getId());
-        $object_data["description"] = sprintf(_("Hier befinden sich die persönlichen Lernmodule des Benutzers %s."), $this->getName());
-        $object_data["type"] = "cat";
-        $object_data["owner"] = $this->getId();
-
-        $cat = $connected_cms[$this->cms_type]->soap_client->getReferenceByTitle($object_data["title"]);
-        if ($cat != false && $connected_cms[$this->cms_type]->soap_client->checkReferenceById($cat) )
-        {
-            $messages["info"] .= sprintf(_("Ihre persönliche Kategorie wurde bereits angelegt."), $this->login) . "<br>\n";
-            $this->category = $cat;
-        }
-        else
-        {
-            $this->category = $connected_cms[$this->cms_type]->soap_client->addObject($object_data, $connected_cms[$this->cms_type]->main_category_node_id);
-        }
-        if ($this->category != false)
-            parent::setConnection( $this->getUserType() );
-        else
-        {
-            echo "CATEGORY_ERROR".$connected_cms[$this->cms_type]->main_category_node_id ."-";
-            return false;
-        }
-        // data for personal user-role in ILIAS 3
-        $role_data["title"] = "studip_usr" . $this->getId() . "_cat" . $this->category;
-        $role_data["description"] = sprintf(_("User-Rolle von %s. Diese Rolle wurde von Stud.IP generiert."), $this->getName());
-        $role_id = $connected_cms[$this->cms_type]->soap_client->getObjectByTitle($role_data["title"], "role");
-        if ($role_id != false)
-            $messages["info"] .= sprintf(_("Ihre persönliche Userrolle wurde bereits angelegt."), $this->login) . "<br>\n";
-        else
-            $role_id = $connected_cms[$this->cms_type]->soap_client->addRoleFromTemplate($role_data, $this->category, $connected_cms[$this->cms_type]->user_role_template_id);
-        $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry($this->getId(), $role_id);
-        // delete permissions for all global roles for this category
-        foreach ($connected_cms[$this->cms_type]->global_roles as $key => $role)
-            $connected_cms[$this->cms_type]->soap_client->revokePermissions($role, $this->category);
-        return true;
-    }
-
-    /**
-    * new user
-    *
-    * save new user
-    * @access public
-    * @return boolean returns false on error
-    */
-    function newUser($ignore_encrypt_passwords = false)
-    {
-        global $connected_cms, $auth, $messages;
-
-        if ($this->getLoginData($this->login))
-        {
-            $messages["error"] .= sprintf(_("Es existiert bereits ein Account mit dem Benutzernamen \"%s\"."), $this->login) . "<br>\n";
-            return false;
-        }
-
-        // data for user-account in ILIAS 3
-        $user_data["login"] = $this->login;
-        $user_data["passwd"] = $this->external_password;
-        $user_data["firstname"] = $this->firstname;
-        $user_data["lastname"] = $this->lastname;
-        $user_data["title"] = $this->title;
-        $user_data["gender"] = $this->gender;
-        $user_data["email"] = $this->email;
-        $user_data["street"] = $this->street;
-        $user_data["phone_home"] = $this->phone_home;
-        $user_data["time_limit_unlimited"] = 1;
-        $user_data["active"] = 1;
-        $user_data["approve_date"] = date('Y-m-d H:i:s');
-        $user_data["accepted_agreement"] = true;
-
-        if ($connected_cms[$this->cms_type]->user_style != "")
-            $user_data["user_style"] = $connected_cms[$this->cms_type]->user_style;
-        if ($connected_cms[$this->cms_type]->user_skin != "")
-            $user_data["user_skin"] = $connected_cms[$this->cms_type]->user_skin;
-
-        $role_id = $connected_cms[$this->cms_type]->roles[$auth->auth["perm"]];
-
-        $user_id = $connected_cms[$this->cms_type]->soap_client->addUser($user_data, $role_id);
-
-        if ($user_id != false)
-        {
-            $this->id = $user_id;
-
-//          $connected_cms[$this->cms_type]->soap_client->updatePassword($user_id, $user_data["passwd"]);
-
-//          $this->newUserCategory();
-
-            $this->setConnection(USER_TYPE_CREATED, $ignore_encrypt_passwords);
-            return true;
-        }
-        echo $connected_cms[$this->cms_type]->soap_client->getError();
-        return false;
-    }
-
-    /**
-     * update user-account
-     */
-    public function updateUser()
-    {
-    }
-
-    /**
-    * delete user
-    *
-    * delete user-account
-    * @access public
-    * @return boolean returns false on error
-    */
-    function deleteUser()
-    {
-        global $connected_cms;
-        $ret = null;
-        $connected_cms[$this->cms_type]->soap_client->user_type == "admin";
-        $connected_cms[$this->cms_type]->soap_client->caching_active = false;
-        if($this->category){
-            $ret['cat_deleted'] = $connected_cms[$this->cms_type]->soap_client->deleteObject($this->category);
-        }
-        if($this->type == 0 && $this->id){
-            $ret['iliasuser_deleted'] = $connected_cms[$this->cms_type]->soap_client->deleteUser($this->id);
-        }
-        $query = "DELETE FROM auth_extern WHERE studip_user_id = ? LIMIT 1";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->studip_id]);
-
-        $ret['auth_extern_deleted'] = $statement->rowCount();
-        return $ret;
-    }
-
-    /**
-     * set connection
-     *
-     * set user connection
-     * @access public
-     * @param string user_type user-type
-     */
-    public function setConnection($user_type, $ignore_encrypt_passwords = false)
-    {
-        global $connected_cms;
-
-        if (!$ignore_encrypt_passwords && $connected_cms[$this->cms_type]->encrypt_passwords === "md5")
-        {
-//          echo "PASSWORD-ENCRYPTION";
-            $this->external_password = $this->getCryptedPassword( $this->external_password );
-        }
-
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-        parent::setConnection($user_type);
-    }
-
-    /**
-    * get sid
-    *
-    * returns soap-sid
-    * @access public
-    * @return string soap-sid
-    */
-    function getSID()
-    {
-        global $connected_cms;
-
-        $caching_status = $connected_cms[$this->cms_type]->soap_client->getCachingStatus();
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-
-        $connected_cms[$this->cms_type]->soap_client->setUserType("user");
-        $this->user_sid = $connected_cms[$this->cms_type]->soap_client->login();
-
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus($caching_status);
-        $connected_cms[$this->cms_type]->soap_client->setUserType("admin");
-        return $this->user_sid;
-    }
-
-    /**
-    * get session-id
-    *
-    * returns soap-session-id
-    * @access public
-    * @return string soap-session-id
-    */
-    function getSessionId()
-    {
-        $sid = $this->getSID();
-        if ($sid == false)
-            return false;
-        $arr = explode("::", $sid);
-        return $arr[0];
-    }
-}
-?>
diff --git a/lib/elearning/Ilias3ConnectedUser.php b/lib/elearning/Ilias3ConnectedUser.php
new file mode 100644
index 0000000..ef98529
--- /dev/null
+++ b/lib/elearning/Ilias3ConnectedUser.php
@@ -0,0 +1,345 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* class to handle ILIAS 3 user-accounts
+*
+* This class contains methods to handle connected ILIAS 3 user-accounts.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       Ilias3ConnectedUser
+* @package  ELearning-Interface
+*/
+class Ilias3ConnectedUser extends ConnectedUser
+{
+    var $roles;
+    var $user_sid;
+    /**
+    * constructor
+    *
+    * init class.
+    * @access
+    * @param string $cms system-type
+    */
+    function __construct($cms, $user_id = false)
+    {
+        global $connected_cms, $perm;
+
+        parent::__construct($cms, $user_id);
+        // create account automatically if it doesn't exist
+        if (! $this->isConnected() AND ($connected_cms[$this->cms_type]->USER_AUTO_CREATE == true))
+        {
+            $this->setPassword(md5(uniqid("4dfmjsnll")));
+            $this->newUser(true);
+            $this->readData();
+        }
+        $this->roles = [$connected_cms[$cms]->roles[$perm->get_perm($this->studip_id)]];
+    }
+
+    function readData()
+    {
+        global $connected_cms;
+        parent::readData();
+        if($this->is_connected){
+            $user_id = $connected_cms[$this->cms_type]->soap_client->lookupUser($this->login);
+            if (!$user_id) {
+                //do not delete in case of error
+                if($user_id !== false) {
+                    $query = "DELETE FROM auth_extern WHERE studip_user_id = ? LIMIT 1";
+                    $statement = DBManager::get()->prepare($query);
+                    $statement->execute([$this->studip_id]);
+                }
+                $this->id = '';
+                $this->login = '';
+                $this->external_password = '';
+                $this->category = '';
+                $this->type = '';
+                $this->is_connected = false;
+            } elseif($this->category != ''){
+                $cat = $connected_cms[$this->cms_type]->soap_client->checkReferenceById($this->category);
+                if(!$cat){
+                    $query = "UPDATE auth_extern SET external_user_category = '' WHERE studip_user_id = ? LIMIT 1";
+                    $statement = DBManager::get()->prepare($query);
+                    $statement->execute([$this->studip_id]);
+
+                    $this->category = '';
+                }
+            }
+        }
+        return $this->is_connected;
+    }
+
+    /**
+    * get login-data
+    *
+    * gets login-data from database
+    * @access public
+    * @param string $username username
+    * @return boolean returns false, if no data was found
+    */
+    function getLoginData($username)
+    {
+        global $connected_cms;
+
+        if (!$username) {
+            return false;
+        }
+        $user_id = $connected_cms[$this->cms_type]->soap_client->lookupUser($username);
+
+        if ($user_id == false)
+            return false;
+
+        $user_data = $connected_cms[$this->cms_type]->soap_client->getUser($user_id);
+
+        if ($user_data == false)
+            return false;
+
+        $this->id = $user_data["usr_id"];
+        $this->login = $user_data["login"];
+        $this->external_password = $user_data["passwd"];
+        return true;
+    }
+
+    /**
+    * get crypted password
+    *
+    * returns ILIAS 3 password
+    * @access public
+    * @param string $password password
+    * @return string password
+    */
+    function getCryptedPassword($password)
+    {
+        return md5($password);
+    }
+
+    /**
+    * set roles
+    *
+    * sets roles
+    * @access public
+    * @param array $role_array role-array
+    */
+    function setRoles($role_array)
+    {
+        $this->roles = $role_array;
+    }
+
+    /**
+    * get roles
+    *
+    * returns roles
+    * @access public
+    * @return array roles
+    */
+    function getRoles()
+    {
+        return $this->roles;
+    }
+
+    /**
+    * create new user category
+    *
+    * create new user category
+    * @access public
+    * @return boolean returns false on error
+    */
+    function newUserCategory()
+    {
+        global $connected_cms, $messages;
+
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+
+        // data for user-category in ILIAS 3
+        $object_data["title"] = sprintf(_("Eigene Daten von %s (%s)."), $this->getName(), $this->getId());
+        $object_data["description"] = sprintf(_("Hier befinden sich die persönlichen Lernmodule des Benutzers %s."), $this->getName());
+        $object_data["type"] = "cat";
+        $object_data["owner"] = $this->getId();
+
+        $cat = $connected_cms[$this->cms_type]->soap_client->getReferenceByTitle($object_data["title"]);
+        if ($cat != false && $connected_cms[$this->cms_type]->soap_client->checkReferenceById($cat) )
+        {
+            $messages["info"] .= sprintf(_("Ihre persönliche Kategorie wurde bereits angelegt."), $this->login) . "<br>\n";
+            $this->category = $cat;
+        }
+        else
+        {
+            $this->category = $connected_cms[$this->cms_type]->soap_client->addObject($object_data, $connected_cms[$this->cms_type]->main_category_node_id);
+        }
+        if ($this->category != false)
+            parent::setConnection( $this->getUserType() );
+        else
+        {
+            echo "CATEGORY_ERROR".$connected_cms[$this->cms_type]->main_category_node_id ."-";
+            return false;
+        }
+        // data for personal user-role in ILIAS 3
+        $role_data["title"] = "studip_usr" . $this->getId() . "_cat" . $this->category;
+        $role_data["description"] = sprintf(_("User-Rolle von %s. Diese Rolle wurde von Stud.IP generiert."), $this->getName());
+        $role_id = $connected_cms[$this->cms_type]->soap_client->getObjectByTitle($role_data["title"], "role");
+        if ($role_id != false)
+            $messages["info"] .= sprintf(_("Ihre persönliche Userrolle wurde bereits angelegt."), $this->login) . "<br>\n";
+        else
+            $role_id = $connected_cms[$this->cms_type]->soap_client->addRoleFromTemplate($role_data, $this->category, $connected_cms[$this->cms_type]->user_role_template_id);
+        $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry($this->getId(), $role_id);
+        // delete permissions for all global roles for this category
+        foreach ($connected_cms[$this->cms_type]->global_roles as $key => $role)
+            $connected_cms[$this->cms_type]->soap_client->revokePermissions($role, $this->category);
+        return true;
+    }
+
+    /**
+    * new user
+    *
+    * save new user
+    * @access public
+    * @return boolean returns false on error
+    */
+    function newUser($ignore_encrypt_passwords = false)
+    {
+        global $connected_cms, $auth, $messages;
+
+        if ($this->getLoginData($this->login))
+        {
+            $messages["error"] .= sprintf(_("Es existiert bereits ein Account mit dem Benutzernamen \"%s\"."), $this->login) . "<br>\n";
+            return false;
+        }
+
+        // data for user-account in ILIAS 3
+        $user_data["login"] = $this->login;
+        $user_data["passwd"] = $this->external_password;
+        $user_data["firstname"] = $this->firstname;
+        $user_data["lastname"] = $this->lastname;
+        $user_data["title"] = $this->title;
+        $user_data["gender"] = $this->gender;
+        $user_data["email"] = $this->email;
+        $user_data["street"] = $this->street;
+        $user_data["phone_home"] = $this->phone_home;
+        $user_data["time_limit_unlimited"] = 1;
+        $user_data["active"] = 1;
+        $user_data["approve_date"] = date('Y-m-d H:i:s');
+        $user_data["accepted_agreement"] = true;
+
+        if ($connected_cms[$this->cms_type]->user_style != "")
+            $user_data["user_style"] = $connected_cms[$this->cms_type]->user_style;
+        if ($connected_cms[$this->cms_type]->user_skin != "")
+            $user_data["user_skin"] = $connected_cms[$this->cms_type]->user_skin;
+
+        $role_id = $connected_cms[$this->cms_type]->roles[$auth->auth["perm"]];
+
+        $user_id = $connected_cms[$this->cms_type]->soap_client->addUser($user_data, $role_id);
+
+        if ($user_id != false)
+        {
+            $this->id = $user_id;
+
+//          $connected_cms[$this->cms_type]->soap_client->updatePassword($user_id, $user_data["passwd"]);
+
+//          $this->newUserCategory();
+
+            $this->setConnection(USER_TYPE_CREATED, $ignore_encrypt_passwords);
+            return true;
+        }
+        echo $connected_cms[$this->cms_type]->soap_client->getError();
+        return false;
+    }
+
+    /**
+     * update user-account
+     */
+    public function updateUser()
+    {
+    }
+
+    /**
+    * delete user
+    *
+    * delete user-account
+    * @access public
+    * @return boolean returns false on error
+    */
+    function deleteUser()
+    {
+        global $connected_cms;
+        $ret = null;
+        $connected_cms[$this->cms_type]->soap_client->user_type == "admin";
+        $connected_cms[$this->cms_type]->soap_client->caching_active = false;
+        if($this->category){
+            $ret['cat_deleted'] = $connected_cms[$this->cms_type]->soap_client->deleteObject($this->category);
+        }
+        if($this->type == 0 && $this->id){
+            $ret['iliasuser_deleted'] = $connected_cms[$this->cms_type]->soap_client->deleteUser($this->id);
+        }
+        $query = "DELETE FROM auth_extern WHERE studip_user_id = ? LIMIT 1";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->studip_id]);
+
+        $ret['auth_extern_deleted'] = $statement->rowCount();
+        return $ret;
+    }
+
+    /**
+     * set connection
+     *
+     * set user connection
+     * @access public
+     * @param string user_type user-type
+     */
+    public function setConnection($user_type, $ignore_encrypt_passwords = false)
+    {
+        global $connected_cms;
+
+        if (!$ignore_encrypt_passwords && $connected_cms[$this->cms_type]->encrypt_passwords === "md5")
+        {
+//          echo "PASSWORD-ENCRYPTION";
+            $this->external_password = $this->getCryptedPassword( $this->external_password );
+        }
+
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+        parent::setConnection($user_type);
+    }
+
+    /**
+    * get sid
+    *
+    * returns soap-sid
+    * @access public
+    * @return string soap-sid
+    */
+    function getSID()
+    {
+        global $connected_cms;
+
+        $caching_status = $connected_cms[$this->cms_type]->soap_client->getCachingStatus();
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+
+        $connected_cms[$this->cms_type]->soap_client->setUserType("user");
+        $this->user_sid = $connected_cms[$this->cms_type]->soap_client->login();
+
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus($caching_status);
+        $connected_cms[$this->cms_type]->soap_client->setUserType("admin");
+        return $this->user_sid;
+    }
+
+    /**
+    * get session-id
+    *
+    * returns soap-session-id
+    * @access public
+    * @return string soap-session-id
+    */
+    function getSessionId()
+    {
+        $sid = $this->getSID();
+        if ($sid == false)
+            return false;
+        $arr = explode("::", $sid);
+        return $arr[0];
+    }
+}
+?>
diff --git a/lib/elearning/Ilias3ContentModule.class.php b/lib/elearning/Ilias3ContentModule.class.php
deleted file mode 100644
index 3067575..0000000
--- a/lib/elearning/Ilias3ContentModule.class.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* class to handle ILIAS 3 learning modules and tests
-*
-* This class contains methods to handle ILIAS 3 learning modules and tests.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       Ilias3ContentModule
-* @package  ELearning-Interface
-*/
-class Ilias3ContentModule extends ContentModule
-{
-    var $object_id;
-
-    /**
-    * constructor
-    *
-    * init class.
-    * @access public
-    * @param string $module_id module-id
-    * @param string $module_type module-type
-    * @param string $cms_type system-type
-    */
-    function __construct($module_id, $module_type, $cms_type)
-    {
-        parent::__construct($module_id, $module_type, $cms_type);
-        if ($module_id != "")
-            $this->readData();
-    }
-
-    /**
-    * read data
-    *
-    * get module data from database.
-    * @access public
-    */
-    function readData()
-    {
-        global $connected_cms;
-
-        $object_data = $connected_cms[$this->cms_type]->soap_client->getObjectByReference($this->id, $connected_cms[$this->cms_type]->user->getId());
-        if ( (! ($object_data == false)) AND ($connected_cms[$this->cms_type]->types[$object_data["type"]] != "") )
-        {
-            // If User has no external Account, show module and link to user-assignment
-            if (! $connected_cms[$this->cms_type]->user->isConnected())
-                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ] );
-
-            //set module data
-            $this->setObjectId($object_data["obj_id"]);
-            $this->setTitle($object_data["title"]);
-            $this->setDescription($object_data["description"]);
-            if ($object_data["owner"] != "")
-            {
-                $user_data = $connected_cms[$this->cms_type]->soap_client->getUser($object_data["owner"]);
-                $user_name = trim($user_data["title"] . " " . $user_data["firstname"] . " " . $user_data["lastname"]);
-                $this->setAuthors($user_name);
-            }
-            $this->setPermissions($object_data["accessInfo"], $object_data["operations"]);
-        }
-        else
-        {
-            // If module doesn't exist, show errormessage
-            $this->createDummyForErrormessage("not found");
-            $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_DELETE] );
-        }
-    }
-
-    /**
-    * set permissions
-    *
-    * sets permissions for content-module
-    * @access public
-    * @param string $acces_info access-status
-    * @param array $operations array of operations
-    * @return boolean successful
-    */
-    function setPermissions($access_info, $operations)
-    {
-        global $connected_cms;
-
-        switch ($access_info) {
-            case "granted":
-                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations);
-                break;
-            case "no_permission":
-                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations);
-                $this->setDescription("<i>" . _("Sie haben keine Leseberechtigung für dieses Modul.") . "</i>");
-                return false;
-            case "missing_precondition":
-                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations );
-                $this->setDescription("<i>" . _("Sie haben zur Zeit noch keinen Zugriff auf deses Modul (fehlende Vorbedingungen).") . "</i>");
-                break;
-            case "no_object_access":
-                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations );
-                $this->setDescription("<i>" . _("Dieses Modul ist momentan offline oder durch Payment-Regeln gesperrt.") . "</i>");
-                break;
-            case "no_parent_access":
-                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations );
-                $this->setDescription("<i>" . _("Sie haben keinen Zugriff auf die übergeordneten Objekte dieses Moduls.") . "</i>");
-                return false;
-            case "object_deleted":
-                $this->createDummyForErrormessage("deleted");
-                return false;
-        }
-        if ($connected_cms[$this->cms_type]->isAuthNecessary() && $connected_cms[$this->cms_type]->user->isConnected()) {
-            // If User has no permission, don't show module data
-            if (!$this->isAllowed(OPERATION_VISIBLE) && !$this->isDummy() && $connected_cms[$this->cms_type]->user->isConnected()) {
-                $this->createDummyForErrormessage("no permission");
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * set connection
-    *
-    * sets connection with seminar
-    * @access public
-    * @param string $seminar_id seminar-id
-    * @return boolean successful
-    */
-    function setConnection($seminar_id)
-    {
-        global $connected_cms, $messages;
-
-        $write_permission = Request::option("write_permission");
-        $write_permission_autor = Request::option("write_permission_autor");
-
-        $crs_id = ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
-//      echo "SET?".$this->cms_type;
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-        $connected_cms[$this->cms_type]->soap_client->clearCache();
-
-        // Check, ob Kurs in ILIAS gelöscht wurde
-        if (($crs_id != false) AND ($connected_cms[$this->cms_type]->soap_client->getObjectByReference($crs_id) == false))
-        {
-            ObjectConnections::unsetConnection($seminar_id, $crs_id, "crs", $this->cms_type);
-//          echo "deleted: ".ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
-//          echo "Der zugeordnete ILIAS-Kurs (ID $crs_id) existiert nicht mehr. Ein neuer Kurs wird angelegt.";
-            $messages["info"] .= _("Der zugeordnete ILIAS-Kurs (ID $crs_id) existiert nicht mehr. Ein neuer Kurs wird angelegt.") . "<br>";
-            $crs_id = false;
-        }
-
-        if ($crs_id == false)
-        {
-
-            $lang_array = explode("_",Config::get()->DEFAULT_LANGUAGE);
-            $course_data["language"] = $lang_array[0];
-            $course_data["title"] = "Stud.IP-Kurs " . Context::get()->Name;
-            $course_data["description"] = "";
-            $ref_id = $connected_cms[$this->cms_type]->main_category_node_id;
-            $crs_id = $connected_cms[$this->cms_type]->soap_client->addCourse($course_data, $ref_id);
-
-            if ($crs_id == false)
-            {
-                $messages["error"] .= _("Zuordnungs-Fehler: Kurs konnte nicht angelegt werden.");
-                return false;
-             }
-            ObjectConnections::setConnection($seminar_id, $crs_id, "crs", $this->cms_type);
-
-            // Rollen zuordnen
-            $connected_cms[$this->cms_type]->permissions->CheckUserPermissions($crs_id);
-//          $messages["info"] .= "Neue Kurs-ID: $crs_id. <br>";
-        }
-
-
-        $ref_id = $this->getId();
-        $ref_id = $connected_cms[$this->cms_type]->soap_client->addReference($this->id, $crs_id);
-        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($crs_id);
-        $member_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ]);
-        $admin_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_WRITE]);
-        foreach ($local_roles as $key => $role_data){
-            // check only if local role is il_crs_member, -tutor or -admin
-            if (mb_strpos($role_data["title"], "il_crs_") === 0) {
-                if(mb_strpos($role_data["title"], 'il_crs_member') === 0){
-                    $operations = $write_permission_autor ? $admin_operations : $member_operations;
-                } else if(mb_strpos($role_data["title"], 'il_crs_tutor') === 0){
-                    $operations = $write_permission_autor || $write_permission ? $admin_operations : $member_operations;
-                } else {
-                    continue;
-                }
-                $connected_cms[$this->cms_type]->soap_client->revokePermissions($role_data["obj_id"], $ref_id);
-                $connected_cms[$this->cms_type]->soap_client->grantPermissions($operations, $role_data["obj_id"], $ref_id);
-            }
-        }
-        if ($ref_id)
-        {
-            $this->setId($ref_id);
-            return parent::setConnection($seminar_id);
-        }
-        else
-            $messages["error"] .= _("Die Zuordnung konnte nicht gespeichert werden.");
-        return false;
-    }
-
-    /**
-    * unset connection
-    *
-    * unsets connection with seminar
-    * @access public
-    * @param string $seminar_id seminar-id
-    * @return boolean successful
-    */
-    function unsetConnection($seminar_id)
-    {
-        global $connected_cms, $messages;
-
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-        {
-            if ( $this->getObjectId() != false)
-                $connected_cms[$this->cms_type]->soap_client->deleteObject($this->getId());
-            return parent::unsetConnection($seminar_id);
-        }
-        $messages["error"] .= _("Die Zuordnung konnte nicht entfernt werden.");
-        return false;
-    }
-
-    /**
-    * set object id
-    *
-    * sets object id
-    * @access public
-    * @param string $module_object_id object id
-    */
-    function setObjectId($module_object_id)
-    {
-        $this->object_id = $module_object_id;
-    }
-
-    /**
-    * get object id
-    *
-    * returns object id
-    * @access public
-    * @return string object id
-    */
-    function getObjectId()
-    {
-        return $this->object_id;
-    }
-
-    /**
-    * set allowed operations
-    *
-    * sets allowed operations
-    * @access public
-    * @param array $operation_array operation-ids
-    */
-    function setAllowedOperations( $operation_array )
-    {
-        global $connected_cms;
-
-        $this->allowed_operations = [];
-        foreach($operation_array as $key => $operation)
-        {
-//          echo "O$operation = I".$connected_cms[$this->cms_type]->permissions->getOperation[$operation]."<br>";
-            $this->allowed_operations[] = $connected_cms[$this->cms_type]->permissions->getOperation[$operation];
-        }
-    }
-
-    /**
-    * get permission-status
-    *
-    * returns true, if operation is allowed
-    * @access public
-    * @param string $operation operation
-    * @return boolean allowed
-    */
-    function isAllowed($operation)
-    {
-        global $connected_cms;
-
-        if (is_array($this->allowed_operations))
-        {
-            if (in_array($connected_cms[$this->cms_type]->permissions->getOperation($operation), $this->allowed_operations))
-                return true;
-            else
-                return false;
-        }
-        else
-            return false;
-    }
-}
-?>
diff --git a/lib/elearning/Ilias3ContentModule.php b/lib/elearning/Ilias3ContentModule.php
new file mode 100644
index 0000000..3067575
--- /dev/null
+++ b/lib/elearning/Ilias3ContentModule.php
@@ -0,0 +1,292 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* class to handle ILIAS 3 learning modules and tests
+*
+* This class contains methods to handle ILIAS 3 learning modules and tests.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       Ilias3ContentModule
+* @package  ELearning-Interface
+*/
+class Ilias3ContentModule extends ContentModule
+{
+    var $object_id;
+
+    /**
+    * constructor
+    *
+    * init class.
+    * @access public
+    * @param string $module_id module-id
+    * @param string $module_type module-type
+    * @param string $cms_type system-type
+    */
+    function __construct($module_id, $module_type, $cms_type)
+    {
+        parent::__construct($module_id, $module_type, $cms_type);
+        if ($module_id != "")
+            $this->readData();
+    }
+
+    /**
+    * read data
+    *
+    * get module data from database.
+    * @access public
+    */
+    function readData()
+    {
+        global $connected_cms;
+
+        $object_data = $connected_cms[$this->cms_type]->soap_client->getObjectByReference($this->id, $connected_cms[$this->cms_type]->user->getId());
+        if ( (! ($object_data == false)) AND ($connected_cms[$this->cms_type]->types[$object_data["type"]] != "") )
+        {
+            // If User has no external Account, show module and link to user-assignment
+            if (! $connected_cms[$this->cms_type]->user->isConnected())
+                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ] );
+
+            //set module data
+            $this->setObjectId($object_data["obj_id"]);
+            $this->setTitle($object_data["title"]);
+            $this->setDescription($object_data["description"]);
+            if ($object_data["owner"] != "")
+            {
+                $user_data = $connected_cms[$this->cms_type]->soap_client->getUser($object_data["owner"]);
+                $user_name = trim($user_data["title"] . " " . $user_data["firstname"] . " " . $user_data["lastname"]);
+                $this->setAuthors($user_name);
+            }
+            $this->setPermissions($object_data["accessInfo"], $object_data["operations"]);
+        }
+        else
+        {
+            // If module doesn't exist, show errormessage
+            $this->createDummyForErrormessage("not found");
+            $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_DELETE] );
+        }
+    }
+
+    /**
+    * set permissions
+    *
+    * sets permissions for content-module
+    * @access public
+    * @param string $acces_info access-status
+    * @param array $operations array of operations
+    * @return boolean successful
+    */
+    function setPermissions($access_info, $operations)
+    {
+        global $connected_cms;
+
+        switch ($access_info) {
+            case "granted":
+                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations);
+                break;
+            case "no_permission":
+                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations);
+                $this->setDescription("<i>" . _("Sie haben keine Leseberechtigung für dieses Modul.") . "</i>");
+                return false;
+            case "missing_precondition":
+                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations );
+                $this->setDescription("<i>" . _("Sie haben zur Zeit noch keinen Zugriff auf deses Modul (fehlende Vorbedingungen).") . "</i>");
+                break;
+            case "no_object_access":
+                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations );
+                $this->setDescription("<i>" . _("Dieses Modul ist momentan offline oder durch Payment-Regeln gesperrt.") . "</i>");
+                break;
+            case "no_parent_access":
+                $this->allowed_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray($operations );
+                $this->setDescription("<i>" . _("Sie haben keinen Zugriff auf die übergeordneten Objekte dieses Moduls.") . "</i>");
+                return false;
+            case "object_deleted":
+                $this->createDummyForErrormessage("deleted");
+                return false;
+        }
+        if ($connected_cms[$this->cms_type]->isAuthNecessary() && $connected_cms[$this->cms_type]->user->isConnected()) {
+            // If User has no permission, don't show module data
+            if (!$this->isAllowed(OPERATION_VISIBLE) && !$this->isDummy() && $connected_cms[$this->cms_type]->user->isConnected()) {
+                $this->createDummyForErrormessage("no permission");
+            }
+        }
+
+        return true;
+    }
+
+    /**
+    * set connection
+    *
+    * sets connection with seminar
+    * @access public
+    * @param string $seminar_id seminar-id
+    * @return boolean successful
+    */
+    function setConnection($seminar_id)
+    {
+        global $connected_cms, $messages;
+
+        $write_permission = Request::option("write_permission");
+        $write_permission_autor = Request::option("write_permission_autor");
+
+        $crs_id = ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
+//      echo "SET?".$this->cms_type;
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+        $connected_cms[$this->cms_type]->soap_client->clearCache();
+
+        // Check, ob Kurs in ILIAS gelöscht wurde
+        if (($crs_id != false) AND ($connected_cms[$this->cms_type]->soap_client->getObjectByReference($crs_id) == false))
+        {
+            ObjectConnections::unsetConnection($seminar_id, $crs_id, "crs", $this->cms_type);
+//          echo "deleted: ".ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
+//          echo "Der zugeordnete ILIAS-Kurs (ID $crs_id) existiert nicht mehr. Ein neuer Kurs wird angelegt.";
+            $messages["info"] .= _("Der zugeordnete ILIAS-Kurs (ID $crs_id) existiert nicht mehr. Ein neuer Kurs wird angelegt.") . "<br>";
+            $crs_id = false;
+        }
+
+        if ($crs_id == false)
+        {
+
+            $lang_array = explode("_",Config::get()->DEFAULT_LANGUAGE);
+            $course_data["language"] = $lang_array[0];
+            $course_data["title"] = "Stud.IP-Kurs " . Context::get()->Name;
+            $course_data["description"] = "";
+            $ref_id = $connected_cms[$this->cms_type]->main_category_node_id;
+            $crs_id = $connected_cms[$this->cms_type]->soap_client->addCourse($course_data, $ref_id);
+
+            if ($crs_id == false)
+            {
+                $messages["error"] .= _("Zuordnungs-Fehler: Kurs konnte nicht angelegt werden.");
+                return false;
+             }
+            ObjectConnections::setConnection($seminar_id, $crs_id, "crs", $this->cms_type);
+
+            // Rollen zuordnen
+            $connected_cms[$this->cms_type]->permissions->CheckUserPermissions($crs_id);
+//          $messages["info"] .= "Neue Kurs-ID: $crs_id. <br>";
+        }
+
+
+        $ref_id = $this->getId();
+        $ref_id = $connected_cms[$this->cms_type]->soap_client->addReference($this->id, $crs_id);
+        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($crs_id);
+        $member_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ]);
+        $admin_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_WRITE]);
+        foreach ($local_roles as $key => $role_data){
+            // check only if local role is il_crs_member, -tutor or -admin
+            if (mb_strpos($role_data["title"], "il_crs_") === 0) {
+                if(mb_strpos($role_data["title"], 'il_crs_member') === 0){
+                    $operations = $write_permission_autor ? $admin_operations : $member_operations;
+                } else if(mb_strpos($role_data["title"], 'il_crs_tutor') === 0){
+                    $operations = $write_permission_autor || $write_permission ? $admin_operations : $member_operations;
+                } else {
+                    continue;
+                }
+                $connected_cms[$this->cms_type]->soap_client->revokePermissions($role_data["obj_id"], $ref_id);
+                $connected_cms[$this->cms_type]->soap_client->grantPermissions($operations, $role_data["obj_id"], $ref_id);
+            }
+        }
+        if ($ref_id)
+        {
+            $this->setId($ref_id);
+            return parent::setConnection($seminar_id);
+        }
+        else
+            $messages["error"] .= _("Die Zuordnung konnte nicht gespeichert werden.");
+        return false;
+    }
+
+    /**
+    * unset connection
+    *
+    * unsets connection with seminar
+    * @access public
+    * @param string $seminar_id seminar-id
+    * @return boolean successful
+    */
+    function unsetConnection($seminar_id)
+    {
+        global $connected_cms, $messages;
+
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+        {
+            if ( $this->getObjectId() != false)
+                $connected_cms[$this->cms_type]->soap_client->deleteObject($this->getId());
+            return parent::unsetConnection($seminar_id);
+        }
+        $messages["error"] .= _("Die Zuordnung konnte nicht entfernt werden.");
+        return false;
+    }
+
+    /**
+    * set object id
+    *
+    * sets object id
+    * @access public
+    * @param string $module_object_id object id
+    */
+    function setObjectId($module_object_id)
+    {
+        $this->object_id = $module_object_id;
+    }
+
+    /**
+    * get object id
+    *
+    * returns object id
+    * @access public
+    * @return string object id
+    */
+    function getObjectId()
+    {
+        return $this->object_id;
+    }
+
+    /**
+    * set allowed operations
+    *
+    * sets allowed operations
+    * @access public
+    * @param array $operation_array operation-ids
+    */
+    function setAllowedOperations( $operation_array )
+    {
+        global $connected_cms;
+
+        $this->allowed_operations = [];
+        foreach($operation_array as $key => $operation)
+        {
+//          echo "O$operation = I".$connected_cms[$this->cms_type]->permissions->getOperation[$operation]."<br>";
+            $this->allowed_operations[] = $connected_cms[$this->cms_type]->permissions->getOperation[$operation];
+        }
+    }
+
+    /**
+    * get permission-status
+    *
+    * returns true, if operation is allowed
+    * @access public
+    * @param string $operation operation
+    * @return boolean allowed
+    */
+    function isAllowed($operation)
+    {
+        global $connected_cms;
+
+        if (is_array($this->allowed_operations))
+        {
+            if (in_array($connected_cms[$this->cms_type]->permissions->getOperation($operation), $this->allowed_operations))
+                return true;
+            else
+                return false;
+        }
+        else
+            return false;
+    }
+}
+?>
diff --git a/lib/elearning/Ilias3ObjectXMLParser.class.php b/lib/elearning/Ilias3ObjectXMLParser.class.php
deleted file mode 100644
index 172ca2a..0000000
--- a/lib/elearning/Ilias3ObjectXMLParser.class.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/*
-    +-----------------------------------------------------------------------------+
-    | ILIAS open source                                                           |
-    +-----------------------------------------------------------------------------+
-    | Copyright (c) 1998-2001 ILIAS open source, University of Cologne            |
-    |                                                                             |
-    | 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. |
-    +-----------------------------------------------------------------------------+
-*/
-
-
-/**
-* Object XML Parser
-*
-* @author Stefan Meyer <smeyer@databay.de>
-*
-* @extends ilSaxParser
-* @package common
-*/
-
-class Ilias3ObjectXMLParser extends Ilias3SaxParser
-{
-    var $object_data = [];
-    var $curr_obj;
-    var $reference_count;
-    var $cdata = '';
-
-    /**
-     * Constructor
-     *
-     * @param object $a_content_object           must be of type ilObjContentObject
-     *                                           ilObjTest or ilObjQuestionPool
-     * @param string $a_xml_file                 xml data
-     * @param string $a_subdir                   subdirectory in import directory
-     *
-     * @access   public
-     */
-    function __construct($a_xml_data = '')
-    {
-        parent::__construct();
-        $this->setXMLContent($a_xml_data);
-    }
-
-    function getObjectData()
-    {
-        return $this->object_data ? $this->object_data : [];
-    }
-
-    /**
-     * set event handlers
-     *
-     * @param resource    reference to the xml parser
-     *
-     * @access   private
-     */
-    function setHandlers($a_xml_parser)
-    {
-        xml_set_object($a_xml_parser, $this);
-        xml_set_element_handler($a_xml_parser, 'handlerBeginTag', 'handlerEndTag');
-        xml_set_character_data_handler($a_xml_parser, 'handlerCharacterData');
-    }
-
-
-    /**
-     * handler for begin of element
-     *
-     * @param resource $a_xml_parser xml parser
-     * @param string   $a_name       element name
-     * @param array    $a_attribs    element attributes array
-     */
-    function handlerBeginTag($a_xml_parser, $a_name, $a_attribs)
-    {
-
-        switch ($a_name) {
-            case 'Objects':
-                $this->curr_obj = -1;
-                break;
-
-            case 'Object':
-                ++$this->curr_obj;
-                $this->reference_count = -1;
-
-                $this->addProperty__('type', $a_attribs['type']);
-                $this->addProperty__('obj_id', $a_attribs['obj_id']);
-                break;
-
-            case 'Title':
-                break;
-
-            case 'Description':
-                break;
-
-            case 'Owner':
-                break;
-
-            case 'CreateDate':
-                break;
-
-            case 'LastUpdate':
-                break;
-
-            case 'ImportId':
-                break;
-
-            case 'References':
-                ++$this->reference_count;
-                $this->addReference__($a_attribs['ref_id'], $a_attribs['accessInfo']);
-                break;
-
-            case 'Operation':
-                break;
-        }
-    }
-
-
-    /**
-     * handler for end of element
-     *
-     * @param resource $a_xml_parser xml parser
-     * @param string   $a_name       element name
-     */
-    function handlerEndTag($a_xml_parser, $a_name)
-    {
-        switch ($a_name) {
-            case 'Objects':
-                break;
-
-            case 'Object':
-                break;
-
-            case 'Title':
-                $this->addProperty__('title', trim($this->cdata));
-                break;
-
-            case 'Description':
-                $this->addProperty__('description', trim($this->cdata));
-                break;
-
-            case 'Owner':
-                $this->addProperty__('owner', trim($this->cdata));
-                break;
-
-            case 'CreateDate':
-                $this->addProperty__('create_date', trim($this->cdata));
-                break;
-
-            case 'LastUpdate':
-                $this->addProperty__('last_update', trim($this->cdata));
-                break;
-
-            case 'ImportId':
-                $this->addProperty__('import_id', trim($this->cdata));
-                break;
-
-            case 'References':
-                $this->addReference__(trim($this->cdata));
-                break;
-
-            case 'Operation':
-                $this->addOperation__(trim($this->cdata));
-                break;
-        }
-
-        $this->cdata = '';
-
-        return;
-    }
-
-    /**
-     * handler for character data
-     *
-     * @param resource $a_xml_parser xml parser
-     * @param string   $a_data       character data
-     */
-    function handlerCharacterData($a_xml_parser, $a_data)
-    {
-        if ($a_data != "\n") {
-            // Replace multiple tabs with one space
-            $a_data = preg_replace("/\t+/", " ", $a_data);
-
-            $this->cdata .= $a_data;
-        }
-
-
-    }
-
-    // PRIVATE
-    function addProperty__($a_name, $a_value)
-    {
-        $this->object_data[$this->curr_obj][$a_name] = $a_value;
-        /*/
-            if (is_array($this->object_data[$this->curr_obj][$a_name]))
-                $this->object_data[$this->curr_obj][$a_name][] = $a_value;
-            elseif ($this->object_data[$this->curr_obj][$a_name] != "")
-            {
-                $old_value = $this->object_data[$this->curr_obj][$a_name];
-                $this->object_data[$this->curr_obj][$a_name] = array($old_value);
-                $this->object_data[$this->curr_obj][$a_name][] = $a_value;
-            }
-            else
-                $this->object_data[$this->curr_obj][$a_name] = $a_value;
-            /**/
-    }
-
-    function addReference__($a_value, $a_accessinfo = "")
-    {
-        if ($a_value) {
-            $this->object_data[$this->curr_obj]['references'][$this->reference_count]["ref_id"] = $a_value;
-            $this->object_data[$this->curr_obj]['references'][$this->reference_count]["accessInfo"] = $a_accessinfo;
-        }
-    }
-
-    function addOperation__($a_value)
-    {
-        if ($a_value) {
-            $this->object_data[$this->curr_obj]['references'][$this->reference_count]["operations"][] = $a_value;
-        }
-    }
-}
diff --git a/lib/elearning/Ilias3ObjectXMLParser.php b/lib/elearning/Ilias3ObjectXMLParser.php
new file mode 100644
index 0000000..172ca2a
--- /dev/null
+++ b/lib/elearning/Ilias3ObjectXMLParser.php
@@ -0,0 +1,236 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/*
+    +-----------------------------------------------------------------------------+
+    | ILIAS open source                                                           |
+    +-----------------------------------------------------------------------------+
+    | Copyright (c) 1998-2001 ILIAS open source, University of Cologne            |
+    |                                                                             |
+    | 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. |
+    +-----------------------------------------------------------------------------+
+*/
+
+
+/**
+* Object XML Parser
+*
+* @author Stefan Meyer <smeyer@databay.de>
+*
+* @extends ilSaxParser
+* @package common
+*/
+
+class Ilias3ObjectXMLParser extends Ilias3SaxParser
+{
+    var $object_data = [];
+    var $curr_obj;
+    var $reference_count;
+    var $cdata = '';
+
+    /**
+     * Constructor
+     *
+     * @param object $a_content_object           must be of type ilObjContentObject
+     *                                           ilObjTest or ilObjQuestionPool
+     * @param string $a_xml_file                 xml data
+     * @param string $a_subdir                   subdirectory in import directory
+     *
+     * @access   public
+     */
+    function __construct($a_xml_data = '')
+    {
+        parent::__construct();
+        $this->setXMLContent($a_xml_data);
+    }
+
+    function getObjectData()
+    {
+        return $this->object_data ? $this->object_data : [];
+    }
+
+    /**
+     * set event handlers
+     *
+     * @param resource    reference to the xml parser
+     *
+     * @access   private
+     */
+    function setHandlers($a_xml_parser)
+    {
+        xml_set_object($a_xml_parser, $this);
+        xml_set_element_handler($a_xml_parser, 'handlerBeginTag', 'handlerEndTag');
+        xml_set_character_data_handler($a_xml_parser, 'handlerCharacterData');
+    }
+
+
+    /**
+     * handler for begin of element
+     *
+     * @param resource $a_xml_parser xml parser
+     * @param string   $a_name       element name
+     * @param array    $a_attribs    element attributes array
+     */
+    function handlerBeginTag($a_xml_parser, $a_name, $a_attribs)
+    {
+
+        switch ($a_name) {
+            case 'Objects':
+                $this->curr_obj = -1;
+                break;
+
+            case 'Object':
+                ++$this->curr_obj;
+                $this->reference_count = -1;
+
+                $this->addProperty__('type', $a_attribs['type']);
+                $this->addProperty__('obj_id', $a_attribs['obj_id']);
+                break;
+
+            case 'Title':
+                break;
+
+            case 'Description':
+                break;
+
+            case 'Owner':
+                break;
+
+            case 'CreateDate':
+                break;
+
+            case 'LastUpdate':
+                break;
+
+            case 'ImportId':
+                break;
+
+            case 'References':
+                ++$this->reference_count;
+                $this->addReference__($a_attribs['ref_id'], $a_attribs['accessInfo']);
+                break;
+
+            case 'Operation':
+                break;
+        }
+    }
+
+
+    /**
+     * handler for end of element
+     *
+     * @param resource $a_xml_parser xml parser
+     * @param string   $a_name       element name
+     */
+    function handlerEndTag($a_xml_parser, $a_name)
+    {
+        switch ($a_name) {
+            case 'Objects':
+                break;
+
+            case 'Object':
+                break;
+
+            case 'Title':
+                $this->addProperty__('title', trim($this->cdata));
+                break;
+
+            case 'Description':
+                $this->addProperty__('description', trim($this->cdata));
+                break;
+
+            case 'Owner':
+                $this->addProperty__('owner', trim($this->cdata));
+                break;
+
+            case 'CreateDate':
+                $this->addProperty__('create_date', trim($this->cdata));
+                break;
+
+            case 'LastUpdate':
+                $this->addProperty__('last_update', trim($this->cdata));
+                break;
+
+            case 'ImportId':
+                $this->addProperty__('import_id', trim($this->cdata));
+                break;
+
+            case 'References':
+                $this->addReference__(trim($this->cdata));
+                break;
+
+            case 'Operation':
+                $this->addOperation__(trim($this->cdata));
+                break;
+        }
+
+        $this->cdata = '';
+
+        return;
+    }
+
+    /**
+     * handler for character data
+     *
+     * @param resource $a_xml_parser xml parser
+     * @param string   $a_data       character data
+     */
+    function handlerCharacterData($a_xml_parser, $a_data)
+    {
+        if ($a_data != "\n") {
+            // Replace multiple tabs with one space
+            $a_data = preg_replace("/\t+/", " ", $a_data);
+
+            $this->cdata .= $a_data;
+        }
+
+
+    }
+
+    // PRIVATE
+    function addProperty__($a_name, $a_value)
+    {
+        $this->object_data[$this->curr_obj][$a_name] = $a_value;
+        /*/
+            if (is_array($this->object_data[$this->curr_obj][$a_name]))
+                $this->object_data[$this->curr_obj][$a_name][] = $a_value;
+            elseif ($this->object_data[$this->curr_obj][$a_name] != "")
+            {
+                $old_value = $this->object_data[$this->curr_obj][$a_name];
+                $this->object_data[$this->curr_obj][$a_name] = array($old_value);
+                $this->object_data[$this->curr_obj][$a_name][] = $a_value;
+            }
+            else
+                $this->object_data[$this->curr_obj][$a_name] = $a_value;
+            /**/
+    }
+
+    function addReference__($a_value, $a_accessinfo = "")
+    {
+        if ($a_value) {
+            $this->object_data[$this->curr_obj]['references'][$this->reference_count]["ref_id"] = $a_value;
+            $this->object_data[$this->curr_obj]['references'][$this->reference_count]["accessInfo"] = $a_accessinfo;
+        }
+    }
+
+    function addOperation__($a_value)
+    {
+        if ($a_value) {
+            $this->object_data[$this->curr_obj]['references'][$this->reference_count]["operations"][] = $a_value;
+        }
+    }
+}
diff --git a/lib/elearning/Ilias3SaxParser.class.php b/lib/elearning/Ilias3SaxParser.class.php
deleted file mode 100644
index 92d247d..0000000
--- a/lib/elearning/Ilias3SaxParser.class.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/*
-    +-----------------------------------------------------------------------------+
-    | ILIAS open source                                                           |
-    +-----------------------------------------------------------------------------+
-    | Copyright (c) 1998-2001 ILIAS open source, University of Cologne            |
-    |                                                                             |
-    | 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. |
-    +-----------------------------------------------------------------------------+
-*/
-
-
-/**
-* Base class for sax-based expat parsing
-* extended classes need to overwrite the method setHandlers and implement their own handler methods
-* 
-*
-* @author Stefan Meyer <smeyer@databay>
-*
-* @package ilias-core
-*/
-class Ilias3SaxParser
-{
-    /**
-     * XML-Content type 'file' or 'string'
-     * If you choose file set the filename in constructor
-     * If you choose 'String' call the constructor with no argument and use setXMLContent()
-     * @var string
-     * @access private
-     */
-    var $input_type = null;
-
-    /**
-     * XML-Content in case of content type 'string'
-
-     * @var string 
-     * @access private
-     */
-    var $xml_content = '';
-
-    /**
-     * ilias object
-     * @var object ilias
-     * @access private
-     */
-    var $ilias;
-
-    /**
-     * language object
-     * @var object language
-     * @access private
-     */
-    var $lng;
-
-    /**
-     * xml filename
-     * @var filename
-     * @access private
-     */
-    var $xml_file;
-
-    /**
-    * Constructor
-    * setup ILIAS global object
-    * @access   public
-    */
-    function __construct($a_xml_file = '')
-    {
-        global $ilias, $lng;
-
-        if($a_xml_file)
-        {
-            $this->xml_file = $a_xml_file;
-            $this->input_type = 'file';
-        }
-        
-        $this->ilias = &$ilias;
-        $this->lng = &$lng;
-    }
-
-    function setXMLContent($a_xml_content)
-    {
-        $this->xml_content = $a_xml_content;
-        $this->input_type = 'string';
-    }
-    
-    function getXMLContent()
-    {
-        return $this->xml_content;
-    }
-
-    function getInputType()
-    {
-        return $this->input_type;
-    }
-
-    /**
-    * stores xml data in array
-    * 
-    * @access   private
-    */
-    function startParsing()
-    {
-        $xml_parser = $this->createParser();
-        $this->setOptions($xml_parser);
-        $this->setHandlers($xml_parser);
-
-        switch($this->getInputType())
-        {
-            case 'file':
-                $fp = $this->openXMLFile();
-                $this->parse($xml_parser,$fp);
-                break;
-
-            case 'string':
-                $this->parse($xml_parser);
-                break;
-
-            default:
-                echo "No input type given. Set filename in constructor or choose setXMLContent()";
-                break;
-        }
-        $this->freeParser($xml_parser);
-    }
-    /**
-    * create parser
-    * 
-    * @access   private
-    */
-    function createParser()
-    {
-        $xml_parser = xml_parser_create("UTF-8");
-
-        if($xml_parser == false)
-        {
-            echo "Cannot create an XML parser handle";
-        }
-        return $xml_parser;
-    }
-    /**
-    * set parser options
-    * 
-    * @access   private
-    */
-    function setOptions($a_xml_parser)
-    {
-        xml_parser_set_option($a_xml_parser,XML_OPTION_CASE_FOLDING,false);
-    }
-    /**
-    * set event handler
-    * should be overwritten by inherited class
-    * @access   private
-    */
-    function setHandlers($a_xml_parser)
-    {
-        echo 'ilSaxParser::setHandlers() must be overwritten';
-    }
-    /**
-    * open xml file
-    * 
-    * @access   private
-    */
-    function openXMLFile()
-    {
-        if(!($fp = fopen($this->xml_file,'r')))
-        {
-            echo "Cannot open xml file";
-        }
-        return $fp;
-    }
-    /**
-    * parse xml file
-    * 
-    * @access   private
-    */
-    function parse($a_xml_parser,$a_fp = null)
-    {
-        switch($this->getInputType())
-        {
-            case 'file':
-
-                while($data = fread($a_fp,4096))
-                {
-                    $parseOk = xml_parse($a_xml_parser,$data,feof($a_fp));
-                }
-                break;
-                
-            case 'string':
-                $parseOk = xml_parse($a_xml_parser,$this->getXMLContent());
-                break;
-        }
-        if(!$parseOk
-           && (xml_get_error_code($a_xml_parser) != XML_ERROR_NONE))
-        {
-            echo $this->getXMLContent();
-            echo "XML Parse Error: ".xml_get_error_code($a_xml_parser);
-        }
-        return true;
-                
-    }
-    /**
-    * free xml parser handle
-    * 
-    * @access   private
-    */
-    function freeParser($a_xml_parser)
-    {
-        if(!xml_parser_free($a_xml_parser))
-        {
-            echo "Error freeing xml parser handle ";
-        }
-    }
-}
-?>
diff --git a/lib/elearning/Ilias3SaxParser.php b/lib/elearning/Ilias3SaxParser.php
new file mode 100644
index 0000000..92d247d
--- /dev/null
+++ b/lib/elearning/Ilias3SaxParser.php
@@ -0,0 +1,230 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/*
+    +-----------------------------------------------------------------------------+
+    | ILIAS open source                                                           |
+    +-----------------------------------------------------------------------------+
+    | Copyright (c) 1998-2001 ILIAS open source, University of Cologne            |
+    |                                                                             |
+    | 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. |
+    +-----------------------------------------------------------------------------+
+*/
+
+
+/**
+* Base class for sax-based expat parsing
+* extended classes need to overwrite the method setHandlers and implement their own handler methods
+* 
+*
+* @author Stefan Meyer <smeyer@databay>
+*
+* @package ilias-core
+*/
+class Ilias3SaxParser
+{
+    /**
+     * XML-Content type 'file' or 'string'
+     * If you choose file set the filename in constructor
+     * If you choose 'String' call the constructor with no argument and use setXMLContent()
+     * @var string
+     * @access private
+     */
+    var $input_type = null;
+
+    /**
+     * XML-Content in case of content type 'string'
+
+     * @var string 
+     * @access private
+     */
+    var $xml_content = '';
+
+    /**
+     * ilias object
+     * @var object ilias
+     * @access private
+     */
+    var $ilias;
+
+    /**
+     * language object
+     * @var object language
+     * @access private
+     */
+    var $lng;
+
+    /**
+     * xml filename
+     * @var filename
+     * @access private
+     */
+    var $xml_file;
+
+    /**
+    * Constructor
+    * setup ILIAS global object
+    * @access   public
+    */
+    function __construct($a_xml_file = '')
+    {
+        global $ilias, $lng;
+
+        if($a_xml_file)
+        {
+            $this->xml_file = $a_xml_file;
+            $this->input_type = 'file';
+        }
+        
+        $this->ilias = &$ilias;
+        $this->lng = &$lng;
+    }
+
+    function setXMLContent($a_xml_content)
+    {
+        $this->xml_content = $a_xml_content;
+        $this->input_type = 'string';
+    }
+    
+    function getXMLContent()
+    {
+        return $this->xml_content;
+    }
+
+    function getInputType()
+    {
+        return $this->input_type;
+    }
+
+    /**
+    * stores xml data in array
+    * 
+    * @access   private
+    */
+    function startParsing()
+    {
+        $xml_parser = $this->createParser();
+        $this->setOptions($xml_parser);
+        $this->setHandlers($xml_parser);
+
+        switch($this->getInputType())
+        {
+            case 'file':
+                $fp = $this->openXMLFile();
+                $this->parse($xml_parser,$fp);
+                break;
+
+            case 'string':
+                $this->parse($xml_parser);
+                break;
+
+            default:
+                echo "No input type given. Set filename in constructor or choose setXMLContent()";
+                break;
+        }
+        $this->freeParser($xml_parser);
+    }
+    /**
+    * create parser
+    * 
+    * @access   private
+    */
+    function createParser()
+    {
+        $xml_parser = xml_parser_create("UTF-8");
+
+        if($xml_parser == false)
+        {
+            echo "Cannot create an XML parser handle";
+        }
+        return $xml_parser;
+    }
+    /**
+    * set parser options
+    * 
+    * @access   private
+    */
+    function setOptions($a_xml_parser)
+    {
+        xml_parser_set_option($a_xml_parser,XML_OPTION_CASE_FOLDING,false);
+    }
+    /**
+    * set event handler
+    * should be overwritten by inherited class
+    * @access   private
+    */
+    function setHandlers($a_xml_parser)
+    {
+        echo 'ilSaxParser::setHandlers() must be overwritten';
+    }
+    /**
+    * open xml file
+    * 
+    * @access   private
+    */
+    function openXMLFile()
+    {
+        if(!($fp = fopen($this->xml_file,'r')))
+        {
+            echo "Cannot open xml file";
+        }
+        return $fp;
+    }
+    /**
+    * parse xml file
+    * 
+    * @access   private
+    */
+    function parse($a_xml_parser,$a_fp = null)
+    {
+        switch($this->getInputType())
+        {
+            case 'file':
+
+                while($data = fread($a_fp,4096))
+                {
+                    $parseOk = xml_parse($a_xml_parser,$data,feof($a_fp));
+                }
+                break;
+                
+            case 'string':
+                $parseOk = xml_parse($a_xml_parser,$this->getXMLContent());
+                break;
+        }
+        if(!$parseOk
+           && (xml_get_error_code($a_xml_parser) != XML_ERROR_NONE))
+        {
+            echo $this->getXMLContent();
+            echo "XML Parse Error: ".xml_get_error_code($a_xml_parser);
+        }
+        return true;
+                
+    }
+    /**
+    * free xml parser handle
+    * 
+    * @access   private
+    */
+    function freeParser($a_xml_parser)
+    {
+        if(!xml_parser_free($a_xml_parser))
+        {
+            echo "Error freeing xml parser handle ";
+        }
+    }
+}
+?>
diff --git a/lib/elearning/Ilias3Soap.class.php b/lib/elearning/Ilias3Soap.class.php
deleted file mode 100644
index 4fc5a65..0000000
--- a/lib/elearning/Ilias3Soap.class.php
+++ /dev/null
@@ -1,1069 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* class to use ILIAS-3-Webservices
-*
-* This class contains methods to connect to the ILIAS-3-Soap-Server.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       Ilias3Soap
-* @package  ELearning-Interface
-*/
-class Ilias3Soap extends StudipSoapClient
-{
-    var $cms_type;
-    var $admin_sid;
-    var $user_sid;
-    var $user_type;
-    var $soap_cache;
-    var $caching_active = false;
-
-    /**
-    * constructor
-    *
-    * init class.
-    * @access
-    * @param string $cms system-type
-    */
-    function __construct($cms)
-    {
-        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
-        $this->cms_type = $cms;
-
-        parent::__construct($ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_SOAP"]);
-        $this->user_type = "admin";
-
-        $this->loadCacheData($cms);
-    }
-
-
-
-    /**
-    * set usertype
-    *
-    * sets usertype fpr soap-calls
-    * @access public
-    * @param string user_type usertype (admin or user)
-    */
-    function setUserType($user_type)
-    {
-        $this->user_type = $user_type;
-    }
-
-    /**
-    * get sid
-    *
-    * returns soap-session-id
-    * @access public
-    * @return string session-id
-    */
-    function getSID()
-    {
-        if ($this->user_type == "admin")
-        {
-            if ($this->admin_sid == false)
-                $this->login();
-//          echo "a";
-            return $this->admin_sid;
-        }
-        if ($this->user_type == "user")
-        {
-            if ($this->user_sid == false)
-                $this->login();
-//            echo "u";
-            return $this->user_sid;
-        }
-        return false;
-    }
-
-    /**
-    * call soap-function
-    *
-    * calls soap-function with given parameters
-    * @access public
-    * @param string method method-name
-    * @param string params parameters
-    * @return mixed result
-    */
-    function call($method, $params)
-    {
-        $index = md5($method . ":" . implode('-', $params));
-        // return false if no session_id is given
-        if (($method != "login") AND ($params["sid"] == ""))
-            return false;
-//      echo $this->caching_active;
-        if (($this->caching_active == true) AND (isset($this->soap_cache[$index])))
-        {
-//          echo $index;
-//          echo " from Cache<br>";
-            $result = $this->soap_cache[$index];
-        }
-        else
-        {
-            $result = $this->_call($method, $params);
-            // if Session is expired, re-login and try again
-            if (($method != "login") AND $this->soap_client->fault AND in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"]) )
-            {
-//              echo "LOGIN AGAIN.";
-                $caching_status = $this->caching_active;
-                $this->caching_active = false;
-                $params["sid"] = $this->login();
-                $result = $this->_call($method, $params);
-                $this->caching_active = $caching_status;
-            }
-            elseif (! $this->soap_client->fault)
-                $this->soap_cache[$index] = $result;
-        }
-        return $result;
-    }
-
-    /**
-    * load cache
-    *
-    * load soap-cache
-    * @access public
-    * @param string cms cms-type
-    */
-    function loadCacheData($cms)
-    {
-        $this->soap_cache = (array)$_SESSION["cache_data"][$cms];
-    }
-
-    /**
-    * get caching status
-    *
-    * gets caching-status
-    * @access public
-    * @return boolean status
-    */
-    function getCachingStatus()
-    {
-        return $this->caching_active;
-    }
-
-    /**
-    * set caching status
-    *
-    * sets caching-status
-    * @access public
-    * @param boolean bool_value status
-    */
-    function setCachingStatus($bool_value)
-    {
-        $this->caching_active = $bool_value;
-//      echo "SET:".$this->caching_active."<br>";
-    }
-
-    /**
-    * clear cache
-    *
-    * clears cache
-    * @access public
-    */
-    function clearCache()
-    {
-        $this->soap_cache = [];
-        $_SESSION["cache_data"][$this->cms_type] = [];
-
-    }
-
-    /**
-    * save cache
-    *
-    * saves soap-cache in session-variable
-    * @access public
-    */
-    function saveCacheData()
-    {
-       $_SESSION["cache_data"][$this->cms_type] = $this->soap_cache;
-
-    }
-
-    /**
-    * parse xml
-    *
-    * use xml-parser
-    * @access public
-    * @param string data xml-data
-    * @return array object
-    */
-    function ParseXML($data)
-    {
-        $xml_parser = new Ilias3ObjectXMLParser($data);
-        $xml_parser->startParsing();
-        return $xml_parser->getObjectData();
-    }
-
-    /**
-    * login
-    *
-    * login to soap-webservice
-    * @access public
-    * @return string result
-    */
-    function login()
-    {
-        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
-        if ($this->user_type == "admin")
-            $param = [
-                'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
-                'username' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["username"],
-                'password' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["password"]
-                ];
-        elseif ($this->user_type == "user")
-            $param = [
-                'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
-                'username' => $connected_cms[$this->cms_type]->user->getUsername(),
-                'password' => $connected_cms[$this->cms_type]->user->getPassword()
-                ];
-        $result = $this->call('login', $param);
-        if ($this->user_type == "admin")
-            $this->admin_sid = $result;
-        if ($this->user_type == "user")
-            $this->user_sid = $result;
-//      if ($this->user_type == "user") echo "SID".$this->call('login', $param).$param["username"];
-        return $result;
-    }
-
-    /**
-    * logout
-    *
-    * logout from soap-webservice
-    * @access public
-    * @return boolean result
-    */
-    function logout()
-    {
-        $param = [
-            'sid' => $this->getSID()
-            ];
-        return $this->call('logout', $param);
-    }
-
-
-///////////////////////////
-// OBJECT-FUNCTIONS //
-//////////////////////////
-
-    /**
-    * search objects
-    *
-    * search for ilias-objects
-    * @access public
-    * @param array types types
-    * @param string key keyword
-    * @param string combination search-combination
-    * @param string user_id ilias-user-id
-    * @return array objects
-    */
-    function searchObjects($types, $key, $combination, $user_id = "")
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'types' => $types,
-            'key' => $key,
-            'combination' => $combination
-            ];
-         if ($user_id != "")
-            $param["user_id"] = $user_id;
-        $result = $this->call('searchObjects', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseXML($result);
-            $all_objects = [];
-            foreach($objects as $count => $object_data){
-                if (is_array($object_data["references"]))
-                {
-                    foreach($object_data["references"] as $ref_data)
-                        if ($ref_data["accessInfo"] == "granted"
-                        && (count($all_objects[$object_data["obj_id"]]["operations"]) < count($ref_data["operations"])))
-                        {
-                            $all_objects[$object_data["obj_id"]] = $object_data;
-                            unset($all_objects[$object_data["obj_id"]]["references"]);
-                            $all_objects[$object_data["obj_id"]]["ref_id"] = $ref_data["ref_id"];
-                            $all_objects[$object_data["obj_id"]]["accessInfo"] = $ref_data["accessInfo"];
-                            $all_objects[$object_data["obj_id"]]["operations"] = $ref_data["operations"];
-                        }
-                }
-            }
-            if (count($all_objects)){
-                foreach($all_objects as $one_object){
-                    $ret[$one_object['ref_id']] = $one_object;
-                }
-                return $ret;
-            }
-        }
-        return false;
-
-    }
-
-    /**
-    * get object by reference
-    *
-    * gets object by reference-id
-    * @access public
-    * @param ref reference_id
-    * @param string user_id ilias-user-id
-    * @return array object
-    */
-    function getObjectByReference($ref, $user_id = "")
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'reference_id' => $ref
-            ];
-         if ($user_id != "")
-            $param["user_id"] = $user_id;
-        $result = $this->call('getObjectByReference', $param);
-        if ($result != false)
-        {
-
-            $objects = $this->parseXML($result);
-            foreach($objects as $count => $object_data)
-                if (is_array($object_data["references"]))
-                {
-                    foreach($object_data["references"] as $ref_data)
-                        if ($ref_data["accessInfo"] != "object_deleted" && $ref == $ref_data["ref_id"])
-                        {
-                            $all_objects[$ref_data["ref_id"]] = $object_data;
-                            unset($all_objects[$ref_data["ref_id"]]["references"]);
-                            $all_objects[$ref_data["ref_id"]]["ref_id"] = $ref_data["ref_id"];
-                            $all_objects[$ref_data["ref_id"]]["accessInfo"] = $ref_data["accessInfo"];
-                            $all_objects[$ref_data["ref_id"]]["operations"] = $ref_data["operations"];
-                        }
-                }
-            return $all_objects[$ref];
-        }
-        return false;
-    }
-
-    /**
-    * get object by title
-    *
-    * gets object by title
-    * @access public
-    * @param string key keyword
-    * @param string type object-type
-    * @return array object
-    */
-    function getObjectByTitle($key, $type = "")
-    {
-        $param = [
-            'sid'   => $this->getSID(),
-            'title' => $key
-        ];
-        $result = $this->call('getObjectsByTitle', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseXML($result);
-            foreach($objects as $index => $object_data)
-            {
-                if (($type != "") AND ($object_data["type"] != $type))
-                    unset($objects[$index]);
-                elseif (! (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === 0))
-                    unset($objects[$index]);
-            }
-            reset($objects);
-            if (sizeof($objects) > 0)
-                return current($objects);
-        }
-        return false;
-    }
-
-    /**
-    * get reference by title
-    *
-    * gets reference-id by object-title
-    * @access public
-    * @param string key keyword
-    * @param string type object-type
-    * @return string reference-id
-    */
-    function getReferenceByTitle($key, $type = "")
-    {
-        $param = [
-            'sid'   => $this->getSID(),
-            'title' => $key
-        ];
-        $result = $this->call('getObjectsByTitle', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseXML($result);
-            foreach($objects as $index => $object_data)
-            {
-                if (($type != "") AND ($object_data["type"] != $type))
-                    unset($objects[$index]);
-                elseif (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === false)
-                    unset($objects[$index]);
-            }
-            if (sizeof($objects) > 0)
-                foreach($objects as $object_data)
-                    if (sizeof($object_data["references"]) > 0)
-                    {
-                        return $object_data["references"][0]["ref_id"];
-                    }
-        }
-        return false;
-    }
-
-    /**
-    * add object
-    *
-    * adds new ilias-object
-    * @access public
-    * @param array object_data object-data
-    * @param string ref_id reference-id
-    * @return string result
-    */
-    function addObject($object_data, $ref_id)
-    {
-    $type = $object_data["type"];
-    $title = htmlReady($object_data["title"]);
-    $description = htmlReady($object_data["description"]);
-
-    $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
-<Objects>
-  <Object type=\"$type\">
-    <Title>
-    $title
-    </Title>
-    <Description>
-    $description
-    </Description>
-  </Object>
-</Objects>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id' => $ref_id,
-            'object_xml' => $xml
-            ];
-        return $this->call('addObject', $param);
-    }
-
-    /**
-    * delete object
-    *
-    * deletes ilias-object
-    * @access public
-    * @param string ref_id reference-id
-    * @return boolean result
-    */
-    function deleteObject($reference_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'reference_id' => $reference_id
-            ];
-        return $this->call('deleteObject', $param);
-    }
-
-    /**
-    * add reference
-    *
-    * add a new reference to an existing ilias-object
-    * @access public
-    * @param string object_id source-object-id
-    * @param string ref_id target-id
-    * @return string created reference-id
-    */
-    function addReference($object_id, $ref_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'source_id' => $object_id,
-            'target_id' => $ref_id
-            ];
-        return $this->call('addReference', $param);
-    }
-
-    /**
-    * get tree childs
-    *
-    * gets child-objects of the given tree node
-    * @access public
-    * @param string ref_id reference-id
-    * @param array types show only childs with these types
-    * @param string user_id user-id for permissions
-    * @return array objects
-    */
-    function getTreeChilds($ref_id, $types = "", $user_id = "")
-    {
-        if ($types == "")
-            $types = [];
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'types' => $types
-            ];
-         if ($user_id != "")
-            $param["user_id"] = $user_id;
-        $result = $this->call('getTreeChilds', $param);
-        if ($result != false)
-        {
-
-            $objects = $this->parseXML($result);
-            foreach($objects as $count => $object_data)
-                if (is_array($object_data["references"]))
-                    foreach($object_data["references"] as $ref_data)
-                        if ($ref_data["accessInfo"] != "object_deleted")
-                        {
-                            $all_objects[$ref_data["ref_id"]] = $object_data;
-//                          unset($all_objects[$ref_id]["references"]);
-                            $all_objects[$ref_data["ref_id"]]["ref_id"] = $ref_data["ref_id"];
-                            $all_objects[$ref_data["ref_id"]]["accessInfo"] = $ref_data["accessInfo"];
-                            $all_objects[$ref_data["ref_id"]]["operations"] = $ref_data["operations"];
-                        }
-            if (sizeof($all_objects) > 0) {
-                return $all_objects;
-            } else {
-                return [];
-            }
-        }
-        return false;
-    }
-
-/////////////////////////
-// RBAC-FUNCTIONS //
-///////////////////////
-    /**
-    * get operation
-    *
-    * gets all ilias operations
-    * @access public
-    * @return array operations
-    */
-    function getOperations()
-    {
-        $param = [
-            'sid' => $this->getSID()
-            ];
-        $result = $this->call('getOperations', $param);
-        if (is_array($result))
-            foreach ($result as $operation_set)
-                $operations[$operation_set["operation"]] = $operation_set["ops_id"];
-        return $operations;
-    }
-
-    /**
-    * get object tree operations
-    *
-    * gets permissions for object at given tree-node
-    * @access public
-    * @param string ref_id reference-id
-    * @param string user_id user-id for permissions
-    * @return array operation-ids
-    */
-    function getObjectTreeOperations($ref_id, $user_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'user_id' => $user_id
-            ];
-        $result = $this->call('getObjectTreeOperations', $param);
-        if ($result != false)
-        {
-            $ops_ids = [];
-            foreach ($result as $operation_set)
-                $ops_ids[] = $operation_set["ops_id"];
-            return $ops_ids;
-        }
-        return false;
-    }
-
-    /**
-    * get user roles
-    *
-    * gets user roles
-    * @access public
-    * @param string user_id user-id
-    * @return array role-ids
-    */
-    function getUserRoles($user_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id' => $user_id
-           ];
-        $result = $this->call('getUserRoles', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseXML($result);
-            $roles = [];
-            foreach ($objects as $count => $role) {
-                $roles[$count] = $role["obj_id"];
-            }
-            return $roles;
-        }
-        return false;
-    }
-
-    /**
-    * get local roles
-    *
-    * gets local roles for given object
-    * @access public
-    * @param string course_id object-id
-    * @return array role-objects
-    */
-    function getLocalRoles($course_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $course_id
-           ];
-        $result = $this->call('getLocalRoles', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseXML($result);
-            return $objects;
-        }
-        return false;
-    }
-
-    /**
-    * add role
-    *
-    * adds a new role
-    * @access public
-    * @param array role_data data for role-object
-    * @param string ref_id reference-id
-    * @return string role-id
-    */
-    function addRole($role_data, $ref_id)
-    {
-    $type = "role";
-    $title = htmlReady($role_data["title"]);
-    $description = htmlReady($role_data["description"]);
-
-    $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
-<Objects>
-  <Object type=\"$type\">
-    <Title>
-    $title
-    </Title>
-    <Description>
-    $description
-    </Description>
-  </Object>
-</Objects>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id' => $ref_id,
-            'obj_xml' => $xml
-            ];
-        $result = $this->call('addRole', $param);
-        if (is_array($result))
-            return current($result);
-        else
-            return false;
-    }
-
-    /**
-    * add role from tremplate
-    *
-    * adds a new role and adopts properties of the given role template
-    * @access public
-    * @param array role_data data for role-object
-    * @param string ref_id reference-id
-    * @param string role_id role-template-id
-    * @return string role-id
-    */
-    function addRoleFromTemplate($role_data, $ref_id, $role_id)
-    {
-    $type = "role";
-    $title = htmlReady($role_data["title"]);
-    $description = htmlReady($role_data["description"]);
-
-    $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
-<Objects>
-  <Object type=\"$type\">
-    <Title>
-    $title
-    </Title>
-    <Description>
-    $description
-    </Description>
-  </Object>
-</Objects>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id' => $ref_id,
-            'obj_xml' => $xml,
-            'role_template_id' => $role_id
-            ];
-        $result = $this->call('addRoleFromTemplate', $param);
-        if (is_array($result))
-            return current($result);
-        else
-            return false;
-    }
-
-    /**
-    * delete user role entry
-    *
-    * deletes a role entry from the given user
-    * @access public
-    * @param string user_id user-id
-    * @param string role_id role-id
-    * @return boolean result
-    */
-    function deleteUserRoleEntry($user_id, $role_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id' => $user_id,
-            'role_id' => $role_id
-           ];
-        return $this->call('deleteUserRoleEntry', $param);
-    }
-
-    /**
-    * add user role entry
-    *
-    * adds a role entry for the given user
-    * @access public
-    * @param string user_id user-id
-    * @param string role_id role-id
-    * @return boolean result
-    */
-    function addUserRoleEntry($user_id, $role_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id' => $user_id,
-            'role_id' => $role_id
-           ];
-        return $this->call('addUserRoleEntry', $param);
-    }
-
-    /**
-    * grant permissions
-    *
-    * grants permissions for given operations at role-id and ref-id
-    * @access public
-    * @param array operations operation-array
-    * @param string role_id role-id
-    * @param string ref_id reference-id
-    * @return boolean result
-    */
-    function grantPermissions($operations, $role_id, $ref_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'role_id' => $role_id,
-            'operations' => $operations,
-           ];
-        return $this->call('grantPermissions', $param);
-    }
-
-    /**
-    * revoke permissions
-    *
-    * revokes all permissions role-id and ref-id
-    * @access public
-    * @param string role_id role-id
-    * @param string ref_id reference-id
-    * @return boolean result
-    */
-    function revokePermissions($role_id, $ref_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'role_id' => $role_id,
-           ];
-        return $this->call('revokePermissions', $param);
-    }
-
-/////////////////////////
-// USER-FUNCTIONS //
-///////////////////////
-
-    /**
-    * lookup user
-    *
-    * gets user-id for given username
-    * @access public
-    * @param string username username
-    * @return string user-id
-    */
-    function lookupUser($username)
-    {
-        $param = [
-            'sid'       => $this->getSID(),
-            'user_name' => $username,
-        ];
-        return $this->call('lookupUser', $param); // returns user_id
-    }
-
-    /**
-    * get user
-    *
-    * gets user-data for given user-id
-    * @access public
-    * @param string user_id user-id
-    * @return array user-data
-    */
-    function getUser($user_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id'         => $user_id,
-            ];
-        $result = $this->call('getUser', $param); // returns user-data-array
-        return $result;
-    }
-
-    /**
-    * add user
-    *
-    * adds new user and sets role-id
-    * @access public
-    * @param array user_data user-data
-    * @param string role_id global role-id for new user
-    * @return string user-id
-    */
-    function addUser($user_data, $role_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_data' => $user_data,
-            'global_role_id' => $role_id
-            ];
-        return $this->call('addUser', $param); // returns user_id
-    }
-
-    /**
-    * update user
-    *
-    * update user-data
-    * @access public
-    * @param array user_data user-data
-    * @return string result
-    */
-    function updateUser($user_data)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_data' => $user_data
-        ];
-        return $this->call('updateUser', $param); // returns boolean
-    }
-
-    /**
-    * update password
-    *
-    * update password with given string and write it uncrypted to the ilias-database
-    * @access public
-    * @param string user_id user-id
-    * @param string password password
-    * @return string result
-    */
-    function updatePassword($user_id, $password)
-    {
-        $param = [
-            'sid'          => $this->getSID(),
-            'user_id'      => $user_id,
-            'new_password' => $password
-        ];
-        return $this->call('updatePassword', $param); // returns boolean
-    }
-
-    /**
-    * delete user
-    *
-    * deletes user-account
-    * @access public
-    * @param string user_id user-id
-    * @return string result
-    */
-    function deleteUser($user_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id'         => $user_id
-            ];
-        return $this->call('deleteUser', $param);   // returns boolean
-    }
-
-////////////////////////////
-// COURSE-FUNCTIONS //
-//////////////////////////
-
-    /**
-    * is course member
-    *
-    * checks if user is course-member
-    * @access public
-    * @param string user_id user-id
-    * @param string course_id course-id
-    * @return boolean result
-    */
-    function isMember($user_id, $course_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'course_id'         => $course_id,
-            'user_id'         => $user_id
-            ];
-        $status = $this->call('isAssignedToCourse', $param);    // returns 0 if not assigned, 1 => course admin, 2 => course member or 3 => course tutor
-        if ($status == 0)
-            return false;
-        else
-            return true;
-    }
-
-    /**
-    * add course member
-    *
-    * adds user to course
-    * @access public
-    * @param string user_id user-id
-    * @param string type member-type (Admin, Tutor or Member)
-    * @param string course_id course-id
-    * @return boolean result
-    */
-    function addMember($user_id, $type, $course_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'course_id'         => $course_id,
-            'user_id'         => $user_id,
-            'type'         => $type
-            ];
-        return $this->call('assignCourseMember', $param);
-    }
-
-    /**
-    * add course
-    *
-    * adds course
-    * @access public
-    * @param array course_data course-data
-    * @param string ref_id target-id
-    * @return string course-id
-    */
-    function addCourse($course_data, $ref_id)
-    {
-        foreach($course_data as $key => $value) {
-            $course_data[$key] = htmlReady($course_data[$key]);
-        }
-
-        $xml = $this->getCourseXML($course_data);
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id'         => $ref_id,
-            'crs_xml' => $xml
-            ];
-        $crs_id = $this->call('addCourse', $param);
-        return $crs_id;
-    }
-
-    /**
-    * get course-xml
-    *
-    * gets course xml-object for given course-data
-    * @access public
-    * @param array course_data course-data
-    * @return string course-xml
-    */
-    function getCourseXML($course_data)
-    {
-    $crs_language = $course_data["language"];
-    $crs_admin_id = $course_data["admin_id"];
-    $crs_title = $course_data["title"];
-    $crs_desc = $course_data["description"];
-
-    $xml = "<!DOCTYPE Course SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_course_0_1.dtd\">
-<Course>
-  <MetaData>
-    <General Structure=\"Hierarchical\">
-      <Identifier Catalog=\"ILIAS\"/>
-      <Title Language=\"$crs_language\">
-      $crs_title
-      </Title>
-      <Language Language=\"$crs_language\"/>
-      <Description Language=\"$crs_language\">
-      $crs_desc
-      </Description>
-      <Keyword Language=\"$crs_language\">
-      </Keyword>
-    </General>
-  </MetaData>
-  <Admin id=\"$crs_admin_id\" notification=\"Yes\" passed=\"No\">
-  </Admin>
-  <Settings>
-    <Availability>
-      <Unlimited/>
-    </Availability>
-    <Syllabus>
-    </Syllabus>
-    <Contact>
-      <Name>
-      </Name>
-      <Responsibility>
-      </Responsibility>
-      <Phone>
-      </Phone>
-      <Email>
-      </Email>
-      <Consultation>
-      </Consultation>
-    </Contact>
-    <Registration registrationType=\"Password\" maxMembers=\"0\" notification=\"No\">
-      <Disabled/>
-    </Registration>
-    <Sort type=\"Manual\"/>
-    <Archive Access=\"Disabled\">
-    </Archive>
-  </Settings>
-</Course>";
-    return $xml;
-    }
-
-    /**
-    * check reference by title
-    *
-    * gets reference-id by object-title
-    * @access public
-    * @param string key keyword
-    * @param string type object-type
-    * @return string reference-id
-    */
-    function checkReferenceById($id)
-    {
-        $param = [
-            'sid'          => $this->getSID(),
-            'reference_id' => $id
-        ];
-
-        $result = $this->call('getObjectByReference', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseXML($result);
-            //echo "<pre><hr>".print_r($objects,1);
-            //echo "\n</pre><hr>";
-            if(is_array($objects)){
-                foreach($objects as $index => $object_data){
-                    if(is_array($object_data['references'])){
-                        foreach($object_data['references'] as $reference){
-                            if($reference['ref_id'] == $id && $reference['accessInfo'] != 'object_deleted') return $object_data['obj_id'];
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/lib/elearning/Ilias3Soap.php b/lib/elearning/Ilias3Soap.php
new file mode 100644
index 0000000..4fc5a65
--- /dev/null
+++ b/lib/elearning/Ilias3Soap.php
@@ -0,0 +1,1069 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* class to use ILIAS-3-Webservices
+*
+* This class contains methods to connect to the ILIAS-3-Soap-Server.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       Ilias3Soap
+* @package  ELearning-Interface
+*/
+class Ilias3Soap extends StudipSoapClient
+{
+    var $cms_type;
+    var $admin_sid;
+    var $user_sid;
+    var $user_type;
+    var $soap_cache;
+    var $caching_active = false;
+
+    /**
+    * constructor
+    *
+    * init class.
+    * @access
+    * @param string $cms system-type
+    */
+    function __construct($cms)
+    {
+        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
+        $this->cms_type = $cms;
+
+        parent::__construct($ELEARNING_INTERFACE_MODULES[$cms]["ABSOLUTE_PATH_SOAP"]);
+        $this->user_type = "admin";
+
+        $this->loadCacheData($cms);
+    }
+
+
+
+    /**
+    * set usertype
+    *
+    * sets usertype fpr soap-calls
+    * @access public
+    * @param string user_type usertype (admin or user)
+    */
+    function setUserType($user_type)
+    {
+        $this->user_type = $user_type;
+    }
+
+    /**
+    * get sid
+    *
+    * returns soap-session-id
+    * @access public
+    * @return string session-id
+    */
+    function getSID()
+    {
+        if ($this->user_type == "admin")
+        {
+            if ($this->admin_sid == false)
+                $this->login();
+//          echo "a";
+            return $this->admin_sid;
+        }
+        if ($this->user_type == "user")
+        {
+            if ($this->user_sid == false)
+                $this->login();
+//            echo "u";
+            return $this->user_sid;
+        }
+        return false;
+    }
+
+    /**
+    * call soap-function
+    *
+    * calls soap-function with given parameters
+    * @access public
+    * @param string method method-name
+    * @param string params parameters
+    * @return mixed result
+    */
+    function call($method, $params)
+    {
+        $index = md5($method . ":" . implode('-', $params));
+        // return false if no session_id is given
+        if (($method != "login") AND ($params["sid"] == ""))
+            return false;
+//      echo $this->caching_active;
+        if (($this->caching_active == true) AND (isset($this->soap_cache[$index])))
+        {
+//          echo $index;
+//          echo " from Cache<br>";
+            $result = $this->soap_cache[$index];
+        }
+        else
+        {
+            $result = $this->_call($method, $params);
+            // if Session is expired, re-login and try again
+            if (($method != "login") AND $this->soap_client->fault AND in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"]) )
+            {
+//              echo "LOGIN AGAIN.";
+                $caching_status = $this->caching_active;
+                $this->caching_active = false;
+                $params["sid"] = $this->login();
+                $result = $this->_call($method, $params);
+                $this->caching_active = $caching_status;
+            }
+            elseif (! $this->soap_client->fault)
+                $this->soap_cache[$index] = $result;
+        }
+        return $result;
+    }
+
+    /**
+    * load cache
+    *
+    * load soap-cache
+    * @access public
+    * @param string cms cms-type
+    */
+    function loadCacheData($cms)
+    {
+        $this->soap_cache = (array)$_SESSION["cache_data"][$cms];
+    }
+
+    /**
+    * get caching status
+    *
+    * gets caching-status
+    * @access public
+    * @return boolean status
+    */
+    function getCachingStatus()
+    {
+        return $this->caching_active;
+    }
+
+    /**
+    * set caching status
+    *
+    * sets caching-status
+    * @access public
+    * @param boolean bool_value status
+    */
+    function setCachingStatus($bool_value)
+    {
+        $this->caching_active = $bool_value;
+//      echo "SET:".$this->caching_active."<br>";
+    }
+
+    /**
+    * clear cache
+    *
+    * clears cache
+    * @access public
+    */
+    function clearCache()
+    {
+        $this->soap_cache = [];
+        $_SESSION["cache_data"][$this->cms_type] = [];
+
+    }
+
+    /**
+    * save cache
+    *
+    * saves soap-cache in session-variable
+    * @access public
+    */
+    function saveCacheData()
+    {
+       $_SESSION["cache_data"][$this->cms_type] = $this->soap_cache;
+
+    }
+
+    /**
+    * parse xml
+    *
+    * use xml-parser
+    * @access public
+    * @param string data xml-data
+    * @return array object
+    */
+    function ParseXML($data)
+    {
+        $xml_parser = new Ilias3ObjectXMLParser($data);
+        $xml_parser->startParsing();
+        return $xml_parser->getObjectData();
+    }
+
+    /**
+    * login
+    *
+    * login to soap-webservice
+    * @access public
+    * @return string result
+    */
+    function login()
+    {
+        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
+        if ($this->user_type == "admin")
+            $param = [
+                'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
+                'username' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["username"],
+                'password' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["password"]
+                ];
+        elseif ($this->user_type == "user")
+            $param = [
+                'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
+                'username' => $connected_cms[$this->cms_type]->user->getUsername(),
+                'password' => $connected_cms[$this->cms_type]->user->getPassword()
+                ];
+        $result = $this->call('login', $param);
+        if ($this->user_type == "admin")
+            $this->admin_sid = $result;
+        if ($this->user_type == "user")
+            $this->user_sid = $result;
+//      if ($this->user_type == "user") echo "SID".$this->call('login', $param).$param["username"];
+        return $result;
+    }
+
+    /**
+    * logout
+    *
+    * logout from soap-webservice
+    * @access public
+    * @return boolean result
+    */
+    function logout()
+    {
+        $param = [
+            'sid' => $this->getSID()
+            ];
+        return $this->call('logout', $param);
+    }
+
+
+///////////////////////////
+// OBJECT-FUNCTIONS //
+//////////////////////////
+
+    /**
+    * search objects
+    *
+    * search for ilias-objects
+    * @access public
+    * @param array types types
+    * @param string key keyword
+    * @param string combination search-combination
+    * @param string user_id ilias-user-id
+    * @return array objects
+    */
+    function searchObjects($types, $key, $combination, $user_id = "")
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'types' => $types,
+            'key' => $key,
+            'combination' => $combination
+            ];
+         if ($user_id != "")
+            $param["user_id"] = $user_id;
+        $result = $this->call('searchObjects', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseXML($result);
+            $all_objects = [];
+            foreach($objects as $count => $object_data){
+                if (is_array($object_data["references"]))
+                {
+                    foreach($object_data["references"] as $ref_data)
+                        if ($ref_data["accessInfo"] == "granted"
+                        && (count($all_objects[$object_data["obj_id"]]["operations"]) < count($ref_data["operations"])))
+                        {
+                            $all_objects[$object_data["obj_id"]] = $object_data;
+                            unset($all_objects[$object_data["obj_id"]]["references"]);
+                            $all_objects[$object_data["obj_id"]]["ref_id"] = $ref_data["ref_id"];
+                            $all_objects[$object_data["obj_id"]]["accessInfo"] = $ref_data["accessInfo"];
+                            $all_objects[$object_data["obj_id"]]["operations"] = $ref_data["operations"];
+                        }
+                }
+            }
+            if (count($all_objects)){
+                foreach($all_objects as $one_object){
+                    $ret[$one_object['ref_id']] = $one_object;
+                }
+                return $ret;
+            }
+        }
+        return false;
+
+    }
+
+    /**
+    * get object by reference
+    *
+    * gets object by reference-id
+    * @access public
+    * @param ref reference_id
+    * @param string user_id ilias-user-id
+    * @return array object
+    */
+    function getObjectByReference($ref, $user_id = "")
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'reference_id' => $ref
+            ];
+         if ($user_id != "")
+            $param["user_id"] = $user_id;
+        $result = $this->call('getObjectByReference', $param);
+        if ($result != false)
+        {
+
+            $objects = $this->parseXML($result);
+            foreach($objects as $count => $object_data)
+                if (is_array($object_data["references"]))
+                {
+                    foreach($object_data["references"] as $ref_data)
+                        if ($ref_data["accessInfo"] != "object_deleted" && $ref == $ref_data["ref_id"])
+                        {
+                            $all_objects[$ref_data["ref_id"]] = $object_data;
+                            unset($all_objects[$ref_data["ref_id"]]["references"]);
+                            $all_objects[$ref_data["ref_id"]]["ref_id"] = $ref_data["ref_id"];
+                            $all_objects[$ref_data["ref_id"]]["accessInfo"] = $ref_data["accessInfo"];
+                            $all_objects[$ref_data["ref_id"]]["operations"] = $ref_data["operations"];
+                        }
+                }
+            return $all_objects[$ref];
+        }
+        return false;
+    }
+
+    /**
+    * get object by title
+    *
+    * gets object by title
+    * @access public
+    * @param string key keyword
+    * @param string type object-type
+    * @return array object
+    */
+    function getObjectByTitle($key, $type = "")
+    {
+        $param = [
+            'sid'   => $this->getSID(),
+            'title' => $key
+        ];
+        $result = $this->call('getObjectsByTitle', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseXML($result);
+            foreach($objects as $index => $object_data)
+            {
+                if (($type != "") AND ($object_data["type"] != $type))
+                    unset($objects[$index]);
+                elseif (! (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === 0))
+                    unset($objects[$index]);
+            }
+            reset($objects);
+            if (sizeof($objects) > 0)
+                return current($objects);
+        }
+        return false;
+    }
+
+    /**
+    * get reference by title
+    *
+    * gets reference-id by object-title
+    * @access public
+    * @param string key keyword
+    * @param string type object-type
+    * @return string reference-id
+    */
+    function getReferenceByTitle($key, $type = "")
+    {
+        $param = [
+            'sid'   => $this->getSID(),
+            'title' => $key
+        ];
+        $result = $this->call('getObjectsByTitle', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseXML($result);
+            foreach($objects as $index => $object_data)
+            {
+                if (($type != "") AND ($object_data["type"] != $type))
+                    unset($objects[$index]);
+                elseif (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === false)
+                    unset($objects[$index]);
+            }
+            if (sizeof($objects) > 0)
+                foreach($objects as $object_data)
+                    if (sizeof($object_data["references"]) > 0)
+                    {
+                        return $object_data["references"][0]["ref_id"];
+                    }
+        }
+        return false;
+    }
+
+    /**
+    * add object
+    *
+    * adds new ilias-object
+    * @access public
+    * @param array object_data object-data
+    * @param string ref_id reference-id
+    * @return string result
+    */
+    function addObject($object_data, $ref_id)
+    {
+    $type = $object_data["type"];
+    $title = htmlReady($object_data["title"]);
+    $description = htmlReady($object_data["description"]);
+
+    $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
+<Objects>
+  <Object type=\"$type\">
+    <Title>
+    $title
+    </Title>
+    <Description>
+    $description
+    </Description>
+  </Object>
+</Objects>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id' => $ref_id,
+            'object_xml' => $xml
+            ];
+        return $this->call('addObject', $param);
+    }
+
+    /**
+    * delete object
+    *
+    * deletes ilias-object
+    * @access public
+    * @param string ref_id reference-id
+    * @return boolean result
+    */
+    function deleteObject($reference_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'reference_id' => $reference_id
+            ];
+        return $this->call('deleteObject', $param);
+    }
+
+    /**
+    * add reference
+    *
+    * add a new reference to an existing ilias-object
+    * @access public
+    * @param string object_id source-object-id
+    * @param string ref_id target-id
+    * @return string created reference-id
+    */
+    function addReference($object_id, $ref_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'source_id' => $object_id,
+            'target_id' => $ref_id
+            ];
+        return $this->call('addReference', $param);
+    }
+
+    /**
+    * get tree childs
+    *
+    * gets child-objects of the given tree node
+    * @access public
+    * @param string ref_id reference-id
+    * @param array types show only childs with these types
+    * @param string user_id user-id for permissions
+    * @return array objects
+    */
+    function getTreeChilds($ref_id, $types = "", $user_id = "")
+    {
+        if ($types == "")
+            $types = [];
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'types' => $types
+            ];
+         if ($user_id != "")
+            $param["user_id"] = $user_id;
+        $result = $this->call('getTreeChilds', $param);
+        if ($result != false)
+        {
+
+            $objects = $this->parseXML($result);
+            foreach($objects as $count => $object_data)
+                if (is_array($object_data["references"]))
+                    foreach($object_data["references"] as $ref_data)
+                        if ($ref_data["accessInfo"] != "object_deleted")
+                        {
+                            $all_objects[$ref_data["ref_id"]] = $object_data;
+//                          unset($all_objects[$ref_id]["references"]);
+                            $all_objects[$ref_data["ref_id"]]["ref_id"] = $ref_data["ref_id"];
+                            $all_objects[$ref_data["ref_id"]]["accessInfo"] = $ref_data["accessInfo"];
+                            $all_objects[$ref_data["ref_id"]]["operations"] = $ref_data["operations"];
+                        }
+            if (sizeof($all_objects) > 0) {
+                return $all_objects;
+            } else {
+                return [];
+            }
+        }
+        return false;
+    }
+
+/////////////////////////
+// RBAC-FUNCTIONS //
+///////////////////////
+    /**
+    * get operation
+    *
+    * gets all ilias operations
+    * @access public
+    * @return array operations
+    */
+    function getOperations()
+    {
+        $param = [
+            'sid' => $this->getSID()
+            ];
+        $result = $this->call('getOperations', $param);
+        if (is_array($result))
+            foreach ($result as $operation_set)
+                $operations[$operation_set["operation"]] = $operation_set["ops_id"];
+        return $operations;
+    }
+
+    /**
+    * get object tree operations
+    *
+    * gets permissions for object at given tree-node
+    * @access public
+    * @param string ref_id reference-id
+    * @param string user_id user-id for permissions
+    * @return array operation-ids
+    */
+    function getObjectTreeOperations($ref_id, $user_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'user_id' => $user_id
+            ];
+        $result = $this->call('getObjectTreeOperations', $param);
+        if ($result != false)
+        {
+            $ops_ids = [];
+            foreach ($result as $operation_set)
+                $ops_ids[] = $operation_set["ops_id"];
+            return $ops_ids;
+        }
+        return false;
+    }
+
+    /**
+    * get user roles
+    *
+    * gets user roles
+    * @access public
+    * @param string user_id user-id
+    * @return array role-ids
+    */
+    function getUserRoles($user_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id' => $user_id
+           ];
+        $result = $this->call('getUserRoles', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseXML($result);
+            $roles = [];
+            foreach ($objects as $count => $role) {
+                $roles[$count] = $role["obj_id"];
+            }
+            return $roles;
+        }
+        return false;
+    }
+
+    /**
+    * get local roles
+    *
+    * gets local roles for given object
+    * @access public
+    * @param string course_id object-id
+    * @return array role-objects
+    */
+    function getLocalRoles($course_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $course_id
+           ];
+        $result = $this->call('getLocalRoles', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseXML($result);
+            return $objects;
+        }
+        return false;
+    }
+
+    /**
+    * add role
+    *
+    * adds a new role
+    * @access public
+    * @param array role_data data for role-object
+    * @param string ref_id reference-id
+    * @return string role-id
+    */
+    function addRole($role_data, $ref_id)
+    {
+    $type = "role";
+    $title = htmlReady($role_data["title"]);
+    $description = htmlReady($role_data["description"]);
+
+    $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
+<Objects>
+  <Object type=\"$type\">
+    <Title>
+    $title
+    </Title>
+    <Description>
+    $description
+    </Description>
+  </Object>
+</Objects>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id' => $ref_id,
+            'obj_xml' => $xml
+            ];
+        $result = $this->call('addRole', $param);
+        if (is_array($result))
+            return current($result);
+        else
+            return false;
+    }
+
+    /**
+    * add role from tremplate
+    *
+    * adds a new role and adopts properties of the given role template
+    * @access public
+    * @param array role_data data for role-object
+    * @param string ref_id reference-id
+    * @param string role_id role-template-id
+    * @return string role-id
+    */
+    function addRoleFromTemplate($role_data, $ref_id, $role_id)
+    {
+    $type = "role";
+    $title = htmlReady($role_data["title"]);
+    $description = htmlReady($role_data["description"]);
+
+    $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
+<Objects>
+  <Object type=\"$type\">
+    <Title>
+    $title
+    </Title>
+    <Description>
+    $description
+    </Description>
+  </Object>
+</Objects>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id' => $ref_id,
+            'obj_xml' => $xml,
+            'role_template_id' => $role_id
+            ];
+        $result = $this->call('addRoleFromTemplate', $param);
+        if (is_array($result))
+            return current($result);
+        else
+            return false;
+    }
+
+    /**
+    * delete user role entry
+    *
+    * deletes a role entry from the given user
+    * @access public
+    * @param string user_id user-id
+    * @param string role_id role-id
+    * @return boolean result
+    */
+    function deleteUserRoleEntry($user_id, $role_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id' => $user_id,
+            'role_id' => $role_id
+           ];
+        return $this->call('deleteUserRoleEntry', $param);
+    }
+
+    /**
+    * add user role entry
+    *
+    * adds a role entry for the given user
+    * @access public
+    * @param string user_id user-id
+    * @param string role_id role-id
+    * @return boolean result
+    */
+    function addUserRoleEntry($user_id, $role_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id' => $user_id,
+            'role_id' => $role_id
+           ];
+        return $this->call('addUserRoleEntry', $param);
+    }
+
+    /**
+    * grant permissions
+    *
+    * grants permissions for given operations at role-id and ref-id
+    * @access public
+    * @param array operations operation-array
+    * @param string role_id role-id
+    * @param string ref_id reference-id
+    * @return boolean result
+    */
+    function grantPermissions($operations, $role_id, $ref_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'role_id' => $role_id,
+            'operations' => $operations,
+           ];
+        return $this->call('grantPermissions', $param);
+    }
+
+    /**
+    * revoke permissions
+    *
+    * revokes all permissions role-id and ref-id
+    * @access public
+    * @param string role_id role-id
+    * @param string ref_id reference-id
+    * @return boolean result
+    */
+    function revokePermissions($role_id, $ref_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'role_id' => $role_id,
+           ];
+        return $this->call('revokePermissions', $param);
+    }
+
+/////////////////////////
+// USER-FUNCTIONS //
+///////////////////////
+
+    /**
+    * lookup user
+    *
+    * gets user-id for given username
+    * @access public
+    * @param string username username
+    * @return string user-id
+    */
+    function lookupUser($username)
+    {
+        $param = [
+            'sid'       => $this->getSID(),
+            'user_name' => $username,
+        ];
+        return $this->call('lookupUser', $param); // returns user_id
+    }
+
+    /**
+    * get user
+    *
+    * gets user-data for given user-id
+    * @access public
+    * @param string user_id user-id
+    * @return array user-data
+    */
+    function getUser($user_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id'         => $user_id,
+            ];
+        $result = $this->call('getUser', $param); // returns user-data-array
+        return $result;
+    }
+
+    /**
+    * add user
+    *
+    * adds new user and sets role-id
+    * @access public
+    * @param array user_data user-data
+    * @param string role_id global role-id for new user
+    * @return string user-id
+    */
+    function addUser($user_data, $role_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_data' => $user_data,
+            'global_role_id' => $role_id
+            ];
+        return $this->call('addUser', $param); // returns user_id
+    }
+
+    /**
+    * update user
+    *
+    * update user-data
+    * @access public
+    * @param array user_data user-data
+    * @return string result
+    */
+    function updateUser($user_data)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_data' => $user_data
+        ];
+        return $this->call('updateUser', $param); // returns boolean
+    }
+
+    /**
+    * update password
+    *
+    * update password with given string and write it uncrypted to the ilias-database
+    * @access public
+    * @param string user_id user-id
+    * @param string password password
+    * @return string result
+    */
+    function updatePassword($user_id, $password)
+    {
+        $param = [
+            'sid'          => $this->getSID(),
+            'user_id'      => $user_id,
+            'new_password' => $password
+        ];
+        return $this->call('updatePassword', $param); // returns boolean
+    }
+
+    /**
+    * delete user
+    *
+    * deletes user-account
+    * @access public
+    * @param string user_id user-id
+    * @return string result
+    */
+    function deleteUser($user_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id'         => $user_id
+            ];
+        return $this->call('deleteUser', $param);   // returns boolean
+    }
+
+////////////////////////////
+// COURSE-FUNCTIONS //
+//////////////////////////
+
+    /**
+    * is course member
+    *
+    * checks if user is course-member
+    * @access public
+    * @param string user_id user-id
+    * @param string course_id course-id
+    * @return boolean result
+    */
+    function isMember($user_id, $course_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'course_id'         => $course_id,
+            'user_id'         => $user_id
+            ];
+        $status = $this->call('isAssignedToCourse', $param);    // returns 0 if not assigned, 1 => course admin, 2 => course member or 3 => course tutor
+        if ($status == 0)
+            return false;
+        else
+            return true;
+    }
+
+    /**
+    * add course member
+    *
+    * adds user to course
+    * @access public
+    * @param string user_id user-id
+    * @param string type member-type (Admin, Tutor or Member)
+    * @param string course_id course-id
+    * @return boolean result
+    */
+    function addMember($user_id, $type, $course_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'course_id'         => $course_id,
+            'user_id'         => $user_id,
+            'type'         => $type
+            ];
+        return $this->call('assignCourseMember', $param);
+    }
+
+    /**
+    * add course
+    *
+    * adds course
+    * @access public
+    * @param array course_data course-data
+    * @param string ref_id target-id
+    * @return string course-id
+    */
+    function addCourse($course_data, $ref_id)
+    {
+        foreach($course_data as $key => $value) {
+            $course_data[$key] = htmlReady($course_data[$key]);
+        }
+
+        $xml = $this->getCourseXML($course_data);
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id'         => $ref_id,
+            'crs_xml' => $xml
+            ];
+        $crs_id = $this->call('addCourse', $param);
+        return $crs_id;
+    }
+
+    /**
+    * get course-xml
+    *
+    * gets course xml-object for given course-data
+    * @access public
+    * @param array course_data course-data
+    * @return string course-xml
+    */
+    function getCourseXML($course_data)
+    {
+    $crs_language = $course_data["language"];
+    $crs_admin_id = $course_data["admin_id"];
+    $crs_title = $course_data["title"];
+    $crs_desc = $course_data["description"];
+
+    $xml = "<!DOCTYPE Course SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_course_0_1.dtd\">
+<Course>
+  <MetaData>
+    <General Structure=\"Hierarchical\">
+      <Identifier Catalog=\"ILIAS\"/>
+      <Title Language=\"$crs_language\">
+      $crs_title
+      </Title>
+      <Language Language=\"$crs_language\"/>
+      <Description Language=\"$crs_language\">
+      $crs_desc
+      </Description>
+      <Keyword Language=\"$crs_language\">
+      </Keyword>
+    </General>
+  </MetaData>
+  <Admin id=\"$crs_admin_id\" notification=\"Yes\" passed=\"No\">
+  </Admin>
+  <Settings>
+    <Availability>
+      <Unlimited/>
+    </Availability>
+    <Syllabus>
+    </Syllabus>
+    <Contact>
+      <Name>
+      </Name>
+      <Responsibility>
+      </Responsibility>
+      <Phone>
+      </Phone>
+      <Email>
+      </Email>
+      <Consultation>
+      </Consultation>
+    </Contact>
+    <Registration registrationType=\"Password\" maxMembers=\"0\" notification=\"No\">
+      <Disabled/>
+    </Registration>
+    <Sort type=\"Manual\"/>
+    <Archive Access=\"Disabled\">
+    </Archive>
+  </Settings>
+</Course>";
+    return $xml;
+    }
+
+    /**
+    * check reference by title
+    *
+    * gets reference-id by object-title
+    * @access public
+    * @param string key keyword
+    * @param string type object-type
+    * @return string reference-id
+    */
+    function checkReferenceById($id)
+    {
+        $param = [
+            'sid'          => $this->getSID(),
+            'reference_id' => $id
+        ];
+
+        $result = $this->call('getObjectByReference', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseXML($result);
+            //echo "<pre><hr>".print_r($objects,1);
+            //echo "\n</pre><hr>";
+            if(is_array($objects)){
+                foreach($objects as $index => $object_data){
+                    if(is_array($object_data['references'])){
+                        foreach($object_data['references'] as $reference){
+                            if($reference['ref_id'] == $id && $reference['accessInfo'] != 'object_deleted') return $object_data['obj_id'];
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/lib/elearning/Ilias4ConnectedCMS.class.php b/lib/elearning/Ilias4ConnectedCMS.class.php
deleted file mode 100644
index d45168f..0000000
--- a/lib/elearning/Ilias4ConnectedCMS.class.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
- * main-class for connection to ILIAS 4
- *
- * This class contains the main methods of the elearning-interface to connect to ILIAS 4. Extends Ilias3ConnectedCMS.
- *
- * @author   Arne Schröder <schroeder@data-quest.de>
- * @access   public
- * @modulegroup  elearning_interface_modules
- * @module       Ilias4ConnectedCMS
- * @package  ELearning-Interface
- */
-class Ilias4ConnectedCMS extends Ilias3ConnectedCMS
-{
-    var $user_category_node_id;
-    var $ldap_enable;
-    /**
-     * constructor
-     *
-     * init class.
-     * @access public
-     * @param string $cms system-type
-     */
-    function __construct($cms)
-    {
-        global $messages;
-        parent::__construct($cms);
-        if (ELearningUtils::getConfigValue("user_category_id", $cms)) {
-            $this->user_category_node_id = ELearningUtils::getConfigValue("user_category_id", $cms);
-        } else {
-            $this->user_category_node_id = $this->main_category_node_id;
-        }
-        if (ELearningUtils::getConfigValue("ldap_enable", $cms)) {
-            $this->ldap_enable = ELearningUtils::getConfigValue("ldap_enable", $cms);
-        }
-    }
-
-    /**
-     * Helper function to fetch children including objects in folders
-     * The typo in the function name, 'childs', is intentional to reflect the name of the ILIAS-SOAP call.
-     *
-     * @access public
-     * @param string $parent_id
-     * @return array result
-     */
-    function getChilds($parent_id) {
-        $types[] = 'fold';
-        foreach ($this->types as $type => $name) {
-            $types[] = $type;
-        }
-
-        $result = $this->soap_client->getTreeChilds($parent_id, $types, $this->user->getId());
-        if ($result) {
-            $parent_path = $this->soap_client->getRawPath($parent_id) . '_' . $parent_id;
-            foreach($result as $ref_id => $data) {
-                // Workaround: getTreeChilds() liefert ALLE Referenzen der beteiligten Objekte, hier sollen aber nur die aus dem Kurs geprüft werden. Deshalb Abgleich der Pfade aller gefundenen Objekt-Referenzen.
-                if (($data["accessInfo"] != "granted") OR ($this->soap_client->getRawPath($ref_id) != $parent_path))
-                    unset($result[$ref_id]);
-                elseif ($data['type'] == 'fold') {
-                    unset($result[$ref_id]);
-                    $result = $result + $this->getChilds($ref_id);
-                }
-            }
-        }
-
-        if (is_array($result))
-            return $result;
-        else
-            return [];
-    }
-
-    /**
-     * check connected modules and update connections
-     *
-     * checks if there are modules in the course that are not connected to the seminar
-     * @access public
-     * @param string $course_id course-id
-     */
-    function updateConnections($course_id)
-    {
-        global $connected_cms, $messages, $object_connections;
-
-        $db = DBManager::get();
-
-        $result = $this->soap_client->getObjectByReference($course_id);
-        if ($result) {
-            $course_path = $this->soap_client->getRawPath($course_id) . '_' . $result["ref_id"];
-        }
-        $this->soap_client->setCachingStatus(false);
-        // fetch childs
-        $result = $this->getChilds($course_id);
-
-        if (is_array($result)) {
-            $check = $db->prepare("SELECT 1 FROM object_contentmodules WHERE object_id = ? AND module_id = ? AND system_type = ? AND module_type = ?");
-            $found = [];
-            $added = 0;
-            $deleted = 0;
-            $messages["info"] .= "<b>".sprintf(_("Aktualisierung der Zuordnungen zum System \"%s\":"), $this->getName()) . "</b><br>";
-            foreach($result as $ref_id => $data) {
-                $check->execute([Context::getId(), $ref_id, $this->cms_type, $data["type"]]);
-                if (!$check->fetch()) {
-                    $messages["info"] .= sprintf(_("Zuordnung zur Lerneinheit \"%s\" wurde hinzugefügt."), ($data["title"])) . "<br>";
-                    ObjectConnections::setConnection(Context::getId(), $ref_id, $data["type"], $this->cms_type);
-                    $added++;
-                }
-                $found[] = $ref_id . '_' . $data["type"];
-            }
-            $to_delete = $db->prepare("SELECT module_id,module_type FROM object_contentmodules WHERE module_type <> 'crs' AND object_id = ? AND system_type = ? AND CONCAT_WS('_', module_id,module_type) NOT IN (?)");
-            $to_delete->execute([Context::getId(), $this->cms_type, count($found) ? $found : ['']]);
-            while ($row = $to_delete->fetch(PDO::FETCH_ASSOC)) {
-                ObjectConnections::unsetConnection(Context::getId(), $row["module_id"], $row["module_type"], $this->cms_type);
-                $deleted++;
-                $messages["info"] .= sprintf(_("Zuordnung zu \"%s\" wurde entfernt."), $row["module_id"]  . '_' . $row["module_type"]) . "<br>";
-            }
-            if (($added + $deleted) < 1) {
-                $messages["info"] .= _("Die Zuordnungen sind bereits auf dem aktuellen Stand.") . "<br>";
-            }
-        }
-        ELearningUtils::bench("update connections");
-    }
-
-    /**
-     * create course
-     *
-     * creates new ilias course
-     * @access public
-     * @param string $seminar_id seminar-id
-     * @return boolean successful
-     */
-    function createCourse($seminar_id)
-    {
-        global $messages, $ELEARNING_INTERFACE_MODULES;
-
-        $crs_id = ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-
-        if ($crs_id == false) {
-            $seminar = Seminar::getInstance($seminar_id);
-            $home_institute = Institute::find($seminar->getInstitutId());
-            if ($home_institute) {
-                $ref_id = ObjectConnections::getConnectionModuleId($home_institute->getId(), "cat", $this->cms_type);
-            }
-            if ($ref_id < 1) {
-                // Kategorie für Heimateinrichtung anlegen
-                $object_data["title"] = sprintf("%s", $home_institute->name);
-                $object_data["description"] = sprintf(_("Hier befinden sich die Veranstaltungsdaten zur Stud.IP-Einrichtung \"%s\"."), $home_institute->name);
-                $object_data["type"] = "cat";
-                $object_data["owner"] =  $this->soap_client->LookupUser($ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["username"]);
-                $ref_id = $this->soap_client->addObject($object_data, $this->main_category_node_id);
-                ObjectConnections::setConnection($home_institute->getId(), $ref_id, "cat", $this->cms_type);
-            }
-            if ($ref_id < 1) {
-                $ref_id = $this->main_category_node_id;
-            }
-
-            // Kurs anlegen
-            $lang_array = explode("_", Config::get()->DEFAULT_LANGUAGE);
-            $course_data["language"] = $lang_array[0];
-            $course_data["title"] = "Stud.IP-Kurs " . $seminar->getName();
-            $course_data["description"] = "";
-            $crs_id = $this->soap_client->addCourse($course_data, $ref_id);
-            if ($crs_id == false) {
-                $messages["error"] .= _("Zuordnungs-Fehler: Kurs konnte nicht angelegt werden.");
-                return false;
-            }
-            ObjectConnections::setConnection($seminar_id, $crs_id, "crs", $this->cms_type);
-
-            // Rollen zuordnen
-            $this->permissions->CheckUserPermissions($crs_id);
-        }
-        return $crs_id;
-    }
-
-    /**
-     * get preferences
-     *
-     * shows additional settings.
-     * @access public
-     */
-    function getPreferences()
-    {
-        global $connected_cms;
-
-        $role_template_name = Request::get('role_template_name');
-        $cat_name = Request::get('cat_name');
-
-        $this->soap_client->setCachingStatus(false);
-
-        $messages = ['error' => ''];
-
-        if ($cat_name) {
-            $cat = $this->soap_client->getReferenceByTitle( trim( $cat_name ), "cat");
-            if (!$cat) {
-                $messages["error"] .= sprintf(_('Das Objekt mit dem Namen "%s" wurde im System %s nicht gefunden.'), htmlReady($cat_name), htmlReady($this->getName())) . "<br>\n";
-            } else {
-                ELearningUtils::setConfigValue("category_id", $cat, $this->cms_type);
-                $this->main_category_node_id = $cat;
-            }
-        }
-
-        if (($this->main_category_node_id != false) AND (ELearningUtils::getConfigValue("user_category_id", $this->cms_type) == "")) {
-            $object_data["title"] = _("User-Daten");
-            $object_data["description"] = _("Hier befinden sich die persönlichen Ordner der Stud.IP-User.");
-            $object_data["type"] = "cat";
-            $object_data["owner"] = $this->user->getId();
-            $user_cat = $connected_cms[$this->cms_type]->soap_client->addObject($object_data, $connected_cms[$this->cms_type]->main_category_node_id);
-            if ($user_cat) {
-                $this->user_category_node_id = $user_cat;
-                ELearningUtils::setConfigValue("user_category_id", $user_cat, $this->cms_type);
-            } else {
-                $messages["error"] .= _("Die Kategorie für User-Daten konnte nicht angelegt werden.") . "<br>\n";
-            }
-        }
-
-        if ($role_template_name != "") {
-            $role_template = $this->soap_client->getObjectByTitle( trim( $role_template_name ), "rolt" );
-            if ($role_template == false) {
-                $messages["error"] .= sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($role_template_name), htmlReady($this->getName())) . "<br>\n";
-            }
-            if (is_array($role_template)) {
-                ELearningUtils::setConfigValue("user_role_template_id", $role_template["obj_id"], $this->cms_type);
-                ELearningUtils::setConfigValue("user_role_template_name", $role_template["title"], $this->cms_type);
-                $this->user_role_template_id = $role_template["obj_id"];
-            }
-        }
-
-        if (Request::submitted('submit')) {
-            ELearningUtils::setConfigValue("encrypt_passwords", Request::option("encrypt_passwords"), $this->cms_type);
-            $encrypt_passwords = Request::option("encrypt_passwords");
-            ELearningUtils::setConfigValue("ldap_enable", Request::option("ldap_enable"), $this->cms_type);
-            $this->ldap_enable = Request::option("ldap_enable");
-        } else {
-            if (ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type) != "")
-            $encrypt_passwords = ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type);
-        }
-
-        $cat = $this->soap_client->getObjectByReference( $this->main_category_node_id );
-        $user_cat = $this->soap_client->getObjectByReference( $this->user_category_node_id );
-        $title = $this->link->getModuleLink($user_cat["title"], $this->user_category_node_id, "cat");
-        $ldap_options = [];
-        foreach (StudipAuthAbstract::GetInstance() as $plugin) {
-            if ($plugin instanceof StudipAuthLdap) {
-                $ldap_options[] = '<option '.($plugin->plugin_name == $this->ldap_enable ? 'selected' : '').'>' . $plugin->plugin_name . '</option>';
-            }
-        }
-        ob_start();
-        ConnectedCMS::getPreferences();
-        $module_types = ob_get_clean();
-
-        $template = $GLOBALS['template_factory']->open('elearning/ilias4_connected_cms_preferences.php');
-        $template->set_attribute('messages', $messages);
-        $template->set_attribute('soap_error', $this->soap_client->getError());
-        $template->set_attribute('soap_data', $this->soap_data);
-        $template->set_attribute('main_category_node_id',  $this->main_category_node_id);
-        $template->set_attribute('main_category_node_id_title', $cat['title']);
-        $template->set_attribute('user_category_node_id',  $this->user_category_node_id);
-        $template->set_attribute('user_category_node_id_title', $title);
-        $template->set_attribute('user_role_template_name', ELearningUtils::getConfigValue("user_role_template_name", $this->cms_type));
-        $template->set_attribute('user_role_template_id', $this->user_role_template_id);
-        $template->set_attribute('encrypt_passwords', $encrypt_passwords);
-        $template->set_attribute('ldap_options', count($ldap_options) ? join("\n", array_merge(['<option></option>'], $ldap_options)) : '');
-        $template->set_attribute('module_types', $module_types);
-        echo $template->render();
-    }
-
-}
diff --git a/lib/elearning/Ilias4ConnectedCMS.php b/lib/elearning/Ilias4ConnectedCMS.php
new file mode 100644
index 0000000..d45168f
--- /dev/null
+++ b/lib/elearning/Ilias4ConnectedCMS.php
@@ -0,0 +1,272 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+ * main-class for connection to ILIAS 4
+ *
+ * This class contains the main methods of the elearning-interface to connect to ILIAS 4. Extends Ilias3ConnectedCMS.
+ *
+ * @author   Arne Schröder <schroeder@data-quest.de>
+ * @access   public
+ * @modulegroup  elearning_interface_modules
+ * @module       Ilias4ConnectedCMS
+ * @package  ELearning-Interface
+ */
+class Ilias4ConnectedCMS extends Ilias3ConnectedCMS
+{
+    var $user_category_node_id;
+    var $ldap_enable;
+    /**
+     * constructor
+     *
+     * init class.
+     * @access public
+     * @param string $cms system-type
+     */
+    function __construct($cms)
+    {
+        global $messages;
+        parent::__construct($cms);
+        if (ELearningUtils::getConfigValue("user_category_id", $cms)) {
+            $this->user_category_node_id = ELearningUtils::getConfigValue("user_category_id", $cms);
+        } else {
+            $this->user_category_node_id = $this->main_category_node_id;
+        }
+        if (ELearningUtils::getConfigValue("ldap_enable", $cms)) {
+            $this->ldap_enable = ELearningUtils::getConfigValue("ldap_enable", $cms);
+        }
+    }
+
+    /**
+     * Helper function to fetch children including objects in folders
+     * The typo in the function name, 'childs', is intentional to reflect the name of the ILIAS-SOAP call.
+     *
+     * @access public
+     * @param string $parent_id
+     * @return array result
+     */
+    function getChilds($parent_id) {
+        $types[] = 'fold';
+        foreach ($this->types as $type => $name) {
+            $types[] = $type;
+        }
+
+        $result = $this->soap_client->getTreeChilds($parent_id, $types, $this->user->getId());
+        if ($result) {
+            $parent_path = $this->soap_client->getRawPath($parent_id) . '_' . $parent_id;
+            foreach($result as $ref_id => $data) {
+                // Workaround: getTreeChilds() liefert ALLE Referenzen der beteiligten Objekte, hier sollen aber nur die aus dem Kurs geprüft werden. Deshalb Abgleich der Pfade aller gefundenen Objekt-Referenzen.
+                if (($data["accessInfo"] != "granted") OR ($this->soap_client->getRawPath($ref_id) != $parent_path))
+                    unset($result[$ref_id]);
+                elseif ($data['type'] == 'fold') {
+                    unset($result[$ref_id]);
+                    $result = $result + $this->getChilds($ref_id);
+                }
+            }
+        }
+
+        if (is_array($result))
+            return $result;
+        else
+            return [];
+    }
+
+    /**
+     * check connected modules and update connections
+     *
+     * checks if there are modules in the course that are not connected to the seminar
+     * @access public
+     * @param string $course_id course-id
+     */
+    function updateConnections($course_id)
+    {
+        global $connected_cms, $messages, $object_connections;
+
+        $db = DBManager::get();
+
+        $result = $this->soap_client->getObjectByReference($course_id);
+        if ($result) {
+            $course_path = $this->soap_client->getRawPath($course_id) . '_' . $result["ref_id"];
+        }
+        $this->soap_client->setCachingStatus(false);
+        // fetch childs
+        $result = $this->getChilds($course_id);
+
+        if (is_array($result)) {
+            $check = $db->prepare("SELECT 1 FROM object_contentmodules WHERE object_id = ? AND module_id = ? AND system_type = ? AND module_type = ?");
+            $found = [];
+            $added = 0;
+            $deleted = 0;
+            $messages["info"] .= "<b>".sprintf(_("Aktualisierung der Zuordnungen zum System \"%s\":"), $this->getName()) . "</b><br>";
+            foreach($result as $ref_id => $data) {
+                $check->execute([Context::getId(), $ref_id, $this->cms_type, $data["type"]]);
+                if (!$check->fetch()) {
+                    $messages["info"] .= sprintf(_("Zuordnung zur Lerneinheit \"%s\" wurde hinzugefügt."), ($data["title"])) . "<br>";
+                    ObjectConnections::setConnection(Context::getId(), $ref_id, $data["type"], $this->cms_type);
+                    $added++;
+                }
+                $found[] = $ref_id . '_' . $data["type"];
+            }
+            $to_delete = $db->prepare("SELECT module_id,module_type FROM object_contentmodules WHERE module_type <> 'crs' AND object_id = ? AND system_type = ? AND CONCAT_WS('_', module_id,module_type) NOT IN (?)");
+            $to_delete->execute([Context::getId(), $this->cms_type, count($found) ? $found : ['']]);
+            while ($row = $to_delete->fetch(PDO::FETCH_ASSOC)) {
+                ObjectConnections::unsetConnection(Context::getId(), $row["module_id"], $row["module_type"], $this->cms_type);
+                $deleted++;
+                $messages["info"] .= sprintf(_("Zuordnung zu \"%s\" wurde entfernt."), $row["module_id"]  . '_' . $row["module_type"]) . "<br>";
+            }
+            if (($added + $deleted) < 1) {
+                $messages["info"] .= _("Die Zuordnungen sind bereits auf dem aktuellen Stand.") . "<br>";
+            }
+        }
+        ELearningUtils::bench("update connections");
+    }
+
+    /**
+     * create course
+     *
+     * creates new ilias course
+     * @access public
+     * @param string $seminar_id seminar-id
+     * @return boolean successful
+     */
+    function createCourse($seminar_id)
+    {
+        global $messages, $ELEARNING_INTERFACE_MODULES;
+
+        $crs_id = ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+
+        if ($crs_id == false) {
+            $seminar = Seminar::getInstance($seminar_id);
+            $home_institute = Institute::find($seminar->getInstitutId());
+            if ($home_institute) {
+                $ref_id = ObjectConnections::getConnectionModuleId($home_institute->getId(), "cat", $this->cms_type);
+            }
+            if ($ref_id < 1) {
+                // Kategorie für Heimateinrichtung anlegen
+                $object_data["title"] = sprintf("%s", $home_institute->name);
+                $object_data["description"] = sprintf(_("Hier befinden sich die Veranstaltungsdaten zur Stud.IP-Einrichtung \"%s\"."), $home_institute->name);
+                $object_data["type"] = "cat";
+                $object_data["owner"] =  $this->soap_client->LookupUser($ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["username"]);
+                $ref_id = $this->soap_client->addObject($object_data, $this->main_category_node_id);
+                ObjectConnections::setConnection($home_institute->getId(), $ref_id, "cat", $this->cms_type);
+            }
+            if ($ref_id < 1) {
+                $ref_id = $this->main_category_node_id;
+            }
+
+            // Kurs anlegen
+            $lang_array = explode("_", Config::get()->DEFAULT_LANGUAGE);
+            $course_data["language"] = $lang_array[0];
+            $course_data["title"] = "Stud.IP-Kurs " . $seminar->getName();
+            $course_data["description"] = "";
+            $crs_id = $this->soap_client->addCourse($course_data, $ref_id);
+            if ($crs_id == false) {
+                $messages["error"] .= _("Zuordnungs-Fehler: Kurs konnte nicht angelegt werden.");
+                return false;
+            }
+            ObjectConnections::setConnection($seminar_id, $crs_id, "crs", $this->cms_type);
+
+            // Rollen zuordnen
+            $this->permissions->CheckUserPermissions($crs_id);
+        }
+        return $crs_id;
+    }
+
+    /**
+     * get preferences
+     *
+     * shows additional settings.
+     * @access public
+     */
+    function getPreferences()
+    {
+        global $connected_cms;
+
+        $role_template_name = Request::get('role_template_name');
+        $cat_name = Request::get('cat_name');
+
+        $this->soap_client->setCachingStatus(false);
+
+        $messages = ['error' => ''];
+
+        if ($cat_name) {
+            $cat = $this->soap_client->getReferenceByTitle( trim( $cat_name ), "cat");
+            if (!$cat) {
+                $messages["error"] .= sprintf(_('Das Objekt mit dem Namen "%s" wurde im System %s nicht gefunden.'), htmlReady($cat_name), htmlReady($this->getName())) . "<br>\n";
+            } else {
+                ELearningUtils::setConfigValue("category_id", $cat, $this->cms_type);
+                $this->main_category_node_id = $cat;
+            }
+        }
+
+        if (($this->main_category_node_id != false) AND (ELearningUtils::getConfigValue("user_category_id", $this->cms_type) == "")) {
+            $object_data["title"] = _("User-Daten");
+            $object_data["description"] = _("Hier befinden sich die persönlichen Ordner der Stud.IP-User.");
+            $object_data["type"] = "cat";
+            $object_data["owner"] = $this->user->getId();
+            $user_cat = $connected_cms[$this->cms_type]->soap_client->addObject($object_data, $connected_cms[$this->cms_type]->main_category_node_id);
+            if ($user_cat) {
+                $this->user_category_node_id = $user_cat;
+                ELearningUtils::setConfigValue("user_category_id", $user_cat, $this->cms_type);
+            } else {
+                $messages["error"] .= _("Die Kategorie für User-Daten konnte nicht angelegt werden.") . "<br>\n";
+            }
+        }
+
+        if ($role_template_name != "") {
+            $role_template = $this->soap_client->getObjectByTitle( trim( $role_template_name ), "rolt" );
+            if ($role_template == false) {
+                $messages["error"] .= sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($role_template_name), htmlReady($this->getName())) . "<br>\n";
+            }
+            if (is_array($role_template)) {
+                ELearningUtils::setConfigValue("user_role_template_id", $role_template["obj_id"], $this->cms_type);
+                ELearningUtils::setConfigValue("user_role_template_name", $role_template["title"], $this->cms_type);
+                $this->user_role_template_id = $role_template["obj_id"];
+            }
+        }
+
+        if (Request::submitted('submit')) {
+            ELearningUtils::setConfigValue("encrypt_passwords", Request::option("encrypt_passwords"), $this->cms_type);
+            $encrypt_passwords = Request::option("encrypt_passwords");
+            ELearningUtils::setConfigValue("ldap_enable", Request::option("ldap_enable"), $this->cms_type);
+            $this->ldap_enable = Request::option("ldap_enable");
+        } else {
+            if (ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type) != "")
+            $encrypt_passwords = ELearningUtils::getConfigValue("encrypt_passwords", $this->cms_type);
+        }
+
+        $cat = $this->soap_client->getObjectByReference( $this->main_category_node_id );
+        $user_cat = $this->soap_client->getObjectByReference( $this->user_category_node_id );
+        $title = $this->link->getModuleLink($user_cat["title"], $this->user_category_node_id, "cat");
+        $ldap_options = [];
+        foreach (StudipAuthAbstract::GetInstance() as $plugin) {
+            if ($plugin instanceof StudipAuthLdap) {
+                $ldap_options[] = '<option '.($plugin->plugin_name == $this->ldap_enable ? 'selected' : '').'>' . $plugin->plugin_name . '</option>';
+            }
+        }
+        ob_start();
+        ConnectedCMS::getPreferences();
+        $module_types = ob_get_clean();
+
+        $template = $GLOBALS['template_factory']->open('elearning/ilias4_connected_cms_preferences.php');
+        $template->set_attribute('messages', $messages);
+        $template->set_attribute('soap_error', $this->soap_client->getError());
+        $template->set_attribute('soap_data', $this->soap_data);
+        $template->set_attribute('main_category_node_id',  $this->main_category_node_id);
+        $template->set_attribute('main_category_node_id_title', $cat['title']);
+        $template->set_attribute('user_category_node_id',  $this->user_category_node_id);
+        $template->set_attribute('user_category_node_id_title', $title);
+        $template->set_attribute('user_role_template_name', ELearningUtils::getConfigValue("user_role_template_name", $this->cms_type));
+        $template->set_attribute('user_role_template_id', $this->user_role_template_id);
+        $template->set_attribute('encrypt_passwords', $encrypt_passwords);
+        $template->set_attribute('ldap_options', count($ldap_options) ? join("\n", array_merge(['<option></option>'], $ldap_options)) : '');
+        $template->set_attribute('module_types', $module_types);
+        echo $template->render();
+    }
+
+}
diff --git a/lib/elearning/Ilias4ConnectedLink.class.php b/lib/elearning/Ilias4ConnectedLink.class.php
deleted file mode 100644
index a2bdb14..0000000
--- a/lib/elearning/Ilias4ConnectedLink.class.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-use Studip\Button, Studip\LinkButton;
-
-/**
- * class to generate links to ILIAS 4
- *
- * This class contains methods to generate links to ILIAS 4.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias4ConnectedLink
- * @package    ELearning-Interface
- */
-class Ilias4ConnectedLink extends Ilias3ConnectedLink
-{
-    /**
-     * constructor
-     *
-     * init class.
-     * @access
-     * @param string $cms system-type
-     */
-    function __construct($cms)
-    {
-        parent::__construct($cms);
-        $this->cms_link = "ilias3_referrer.php";
-    }
-
-    /**
-     * get module link
-     *
-     * returns link to the specified ilias object. works without initializing module-class.
-     * @access public
-     * @return string html-code
-     */
-    function getModuleLink($title, $module_id, $module_type)
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        if ($connected_cms[$this->cms_type]->isAuthNecessary() AND (! $connected_cms[$this->cms_type]->user->isConnected())) {
-            return false;
-        }
-        $output = "<a href=\"" . URLHelper::getLink($this->cms_link . "?"
-        . "client_id=" . $connected_cms[$this->cms_type]->getClientId()
-        . "&cms_select=" . $this->cms_type
-        . "&ref_id=" . $module_id
-        . "&type=" . $module_type
-        . "&target=start"). "\" target=\"_blank\" rel=\"noopener noreferrer\">";
-        $output .= $title;
-        $output .= "</a>&nbsp;";
-
-        return $output;
-    }
-
-    /**
-     * get admin module links
-     *
-     * returns links add or remove a module from course
-     * @access public
-     * @return string returns html-code
-     */
-    function getAdminModuleLinks()
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        $output = '';
-
-        $result = false;
-        if (!$connected_cms[$this->cms_type]->content_module[$current_module]->isDummy()) {
-            $result = $connected_cms[$this->cms_type]->soap_client->getPath($connected_cms[$this->cms_type]->content_module[$current_module]->getId());
-        }
-        if ($result) {
-            $output .= "<i>Pfad: ". htmlReady($result) . "</i><br><br>";
-        }
-        $output .= "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
-        $output .= CSRFProtection::tokenTag();
-        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . htmlReady($view) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady($search_key) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
-        $output .= "<input type=\"HIDDEN\" name=\"module_system_type\" value=\"" . htmlReady($this->cms_type) . "\">\n";
-
-        if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected()) {
-            $output .= "&nbsp;" . Button::create(_('Entfernen'), 'remove');
-        } elseif ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_WRITE)) {
-            $output .= "<div align=\"left\">";
-            if ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_COPY) AND (! in_array($connected_cms[$this->cms_type]->content_module[$current_module]->module_type, ["lm", "htlm", "sahs", "cat", "crs", "dbk"]))) {
-                $output .= "<input type=\"CHECKBOX\" name=\"copy_object\" value=\"1\">";
-                $output .= _("Als Kopie anlegen") . "&nbsp;";
-                $output .= Icon::create('info-circle', 'inactive', ['title' => _('Wenn Sie diese Option wählen, wird eine identische Kopie als eigenständige Instanz des Lernmoduls erstellt. Anderenfalls wird ein Link zum Lernmodul gesetzt.')])->asImg();
-                $output .= "<br>";
-            }
-            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"none\" checked>";
-            $output .= _("Keine Schreibrechte") . "&nbsp;";
-            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Nur der/die BesitzerIn des Lernmoduls hat Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
-            $output .= "<br>";
-            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"dozent\">";
-            $output .= _("Mit Schreibrechten für alle Lehrenden dieser Veranstaltung") . "&nbsp;";
-            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Lehrende haben Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
-            $output .= "<br>";
-            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"tutor\">";
-            $output .= _("Mit Schreibrechten für alle Lehrenden und Tutor/-innen dieser Veranstaltung") . "&nbsp;";
-            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Lehrende und Tutor/-innen haben Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
-            $output .= "<br>";
-            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"autor\">";
-            $output .= _("Mit Schreibrechten für alle Personen dieser Veranstaltung") . "&nbsp;";
-            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Lehrende, Tutor/-innen und Teilnehmende haben Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
-            $output .= "</div>";
-            $output .= "</div><br>" . Button::create(_('Hinzufügen'), 'add') . "<br>";
-        } else {
-            $output .= "&nbsp;" . Button::create(_('Hinzufügen'), 'add');
-        }
-        $output .= "</form>";
-
-        return $output;
-    }
-}
diff --git a/lib/elearning/Ilias4ConnectedLink.php b/lib/elearning/Ilias4ConnectedLink.php
new file mode 100644
index 0000000..a2bdb14
--- /dev/null
+++ b/lib/elearning/Ilias4ConnectedLink.php
@@ -0,0 +1,124 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+use Studip\Button, Studip\LinkButton;
+
+/**
+ * class to generate links to ILIAS 4
+ *
+ * This class contains methods to generate links to ILIAS 4.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias4ConnectedLink
+ * @package    ELearning-Interface
+ */
+class Ilias4ConnectedLink extends Ilias3ConnectedLink
+{
+    /**
+     * constructor
+     *
+     * init class.
+     * @access
+     * @param string $cms system-type
+     */
+    function __construct($cms)
+    {
+        parent::__construct($cms);
+        $this->cms_link = "ilias3_referrer.php";
+    }
+
+    /**
+     * get module link
+     *
+     * returns link to the specified ilias object. works without initializing module-class.
+     * @access public
+     * @return string html-code
+     */
+    function getModuleLink($title, $module_id, $module_type)
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        if ($connected_cms[$this->cms_type]->isAuthNecessary() AND (! $connected_cms[$this->cms_type]->user->isConnected())) {
+            return false;
+        }
+        $output = "<a href=\"" . URLHelper::getLink($this->cms_link . "?"
+        . "client_id=" . $connected_cms[$this->cms_type]->getClientId()
+        . "&cms_select=" . $this->cms_type
+        . "&ref_id=" . $module_id
+        . "&type=" . $module_type
+        . "&target=start"). "\" target=\"_blank\" rel=\"noopener noreferrer\">";
+        $output .= $title;
+        $output .= "</a>&nbsp;";
+
+        return $output;
+    }
+
+    /**
+     * get admin module links
+     *
+     * returns links add or remove a module from course
+     * @access public
+     * @return string returns html-code
+     */
+    function getAdminModuleLinks()
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        $output = '';
+
+        $result = false;
+        if (!$connected_cms[$this->cms_type]->content_module[$current_module]->isDummy()) {
+            $result = $connected_cms[$this->cms_type]->soap_client->getPath($connected_cms[$this->cms_type]->content_module[$current_module]->getId());
+        }
+        if ($result) {
+            $output .= "<i>Pfad: ". htmlReady($result) . "</i><br><br>";
+        }
+        $output .= "<form method=\"POST\" action=\"" . URLHelper::getLink() . "\">\n";
+        $output .= CSRFProtection::tokenTag();
+        $output .= "<input type=\"HIDDEN\" name=\"view\" value=\"" . htmlReady($view) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"search_key\" value=\"" . htmlReady($search_key) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"cms_select\" value=\"" . htmlReady($cms_select) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_type\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getModuleType()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_id\" value=\"" . htmlReady($connected_cms[$this->cms_type]->content_module[$current_module]->getId()) . "\">\n";
+        $output .= "<input type=\"HIDDEN\" name=\"module_system_type\" value=\"" . htmlReady($this->cms_type) . "\">\n";
+
+        if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected()) {
+            $output .= "&nbsp;" . Button::create(_('Entfernen'), 'remove');
+        } elseif ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_WRITE)) {
+            $output .= "<div align=\"left\">";
+            if ($connected_cms[$this->cms_type]->content_module[$current_module]->isAllowed(OPERATION_COPY) AND (! in_array($connected_cms[$this->cms_type]->content_module[$current_module]->module_type, ["lm", "htlm", "sahs", "cat", "crs", "dbk"]))) {
+                $output .= "<input type=\"CHECKBOX\" name=\"copy_object\" value=\"1\">";
+                $output .= _("Als Kopie anlegen") . "&nbsp;";
+                $output .= Icon::create('info-circle', 'inactive', ['title' => _('Wenn Sie diese Option wählen, wird eine identische Kopie als eigenständige Instanz des Lernmoduls erstellt. Anderenfalls wird ein Link zum Lernmodul gesetzt.')])->asImg();
+                $output .= "<br>";
+            }
+            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"none\" checked>";
+            $output .= _("Keine Schreibrechte") . "&nbsp;";
+            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Nur der/die BesitzerIn des Lernmoduls hat Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
+            $output .= "<br>";
+            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"dozent\">";
+            $output .= _("Mit Schreibrechten für alle Lehrenden dieser Veranstaltung") . "&nbsp;";
+            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Lehrende haben Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
+            $output .= "<br>";
+            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"tutor\">";
+            $output .= _("Mit Schreibrechten für alle Lehrenden und Tutor/-innen dieser Veranstaltung") . "&nbsp;";
+            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Lehrende und Tutor/-innen haben Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
+            $output .= "<br>";
+            $output .= "<input type=\"RADIO\" name=\"write_permission\" value=\"autor\">";
+            $output .= _("Mit Schreibrechten für alle Personen dieser Veranstaltung") . "&nbsp;";
+            $output .= Icon::create('info-circle', 'inactive', ['title' => _('Lehrende, Tutor/-innen und Teilnehmende haben Schreibzugriff für Inhalte und Struktur des Lernmoduls. Tutor/-innen und Lehrende können die Verknüpfung zur Veranstaltung wieder löschen.')])->asImg();
+            $output .= "</div>";
+            $output .= "</div><br>" . Button::create(_('Hinzufügen'), 'add') . "<br>";
+        } else {
+            $output .= "&nbsp;" . Button::create(_('Hinzufügen'), 'add');
+        }
+        $output .= "</form>";
+
+        return $output;
+    }
+}
diff --git a/lib/elearning/Ilias4ConnectedPermissions.class.php b/lib/elearning/Ilias4ConnectedPermissions.class.php
deleted file mode 100644
index af70ba7..0000000
--- a/lib/elearning/Ilias4ConnectedPermissions.class.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-DEFINE ("OPERATION_COPY", "copy");
-
-/**
- * class to handle ILIAS 4 access controls
- *
- * This class contains methods to handle permissions on connected objects.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias4ConnectedPermission
- * @package    ELearning-Interface
- */
-class Ilias4ConnectedPermissions extends Ilias3ConnectedPermissions
-{
-    var $operations;
-    var $allowed_operations;
-    var $tree_allowed_operations;
-
-    var $USER_OPERATIONS;
-    var $AUTHOR_OPERATIONS;
-    /**
-     * constructor
-     *
-     * init class.
-     * @access
-     * @param string $cms system-type
-     */
-    function __construct($cms)
-    {
-        parent::__construct($cms);
-    }
-
-    /**
-     * check user permissions
-     *
-     * checks user permissions for connected course and changes setting if necessary
-     * @access public
-     * @param string $course_id course-id
-     * @return boolean returns false on error
-     */
-    function checkUserPermissions($course_id = "")
-    {
-        global $connected_cms, $messages;
-
-        if ($course_id == "") return false;
-        if ($connected_cms[$this->cms_type]->user->getId() == "") return false;
-
-        // get course role folder and local roles
-        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($course_id);
-        $active_role = "";
-        $proper_role = "";
-        $user_crs_role = $connected_cms[$this->cms_type]->crs_roles[$GLOBALS["perm"]->get_studip_perm(Context::getId())];
-        if (is_array($local_roles)) {
-            foreach ($local_roles as $key => $role_data) {
-                // check only if local role is il_crs_member, -tutor or -admin
-                if (! (mb_strpos($role_data["title"], "_crs_") === false)) {
-                    if ( in_array( $role_data["obj_id"], $connected_cms[$this->cms_type]->user->getRoles() ) ) {
-                        $active_role = $role_data["obj_id"];
-                    }
-                    if ( mb_strpos( $role_data["title"], $user_crs_role) > 0 ) {
-                        $proper_role = $role_data["obj_id"];
-                    }
-                }
-            }
-        }
-
-        // is user already course-member? otherwise add member with proper role
-        $is_member = $connected_cms[$this->cms_type]->soap_client->isMember( $connected_cms[$this->cms_type]->user->getId(), $course_id);
-        if (!$is_member) {
-            $member_data["usr_id"] = $connected_cms[$this->cms_type]->user->getId();
-            $member_data["ref_id"] = $course_id;
-            $member_data["status"] = CRS_NO_NOTIFICATION;
-            $type = "";
-            switch ($user_crs_role)
-            {
-                case "admin":
-                    $member_data["role"] = CRS_ADMIN_ROLE;
-                    $type = "Admin";
-                    break;
-                case "tutor":
-                    $member_data["role"] = CRS_TUTOR_ROLE;
-                    $type = "Tutor";
-                    break;
-                case "member":
-                    $member_data["role"] = CRS_MEMBER_ROLE;
-                    $type = "Member";
-                    break;
-                default:
-            }
-            $member_data["passed"] = CRS_PASSED_VALUE;
-            if ($type != "") {
-                $connected_cms[$this->cms_type]->soap_client->addMember( $connected_cms[$this->cms_type]->user->getId(), $type, $course_id );
-                if ($GLOBALS["debug"] == true) echo "addMember";
-            }
-        }
-
-        // check if user has proper local role
-        // if not, change it
-        if ($active_role != $proper_role) {
-            if ($active_role != "") {
-                $connected_cms[$this->cms_type]->soap_client->deleteUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $active_role);
-                if ($GLOBALS["debug"] == true) echo "Role $active_role deleted.";
-            }
-
-            if ($proper_role != "") {
-                $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $proper_role);
-                if ($GLOBALS["debug"] == true) echo "Role $proper_role added.";
-            }
-
-        }
-
-        if (! $this->getContentModulePerms( $course_id )) {
-            $messages["info"] .= _("Für den zugeordneten ILIAS-Kurs konnten keine Berechtigungen ermittelt werden.") . "<br>";
-        }
-
-        return true;
-    }
-}
-?>
diff --git a/lib/elearning/Ilias4ConnectedPermissions.php b/lib/elearning/Ilias4ConnectedPermissions.php
new file mode 100644
index 0000000..af70ba7
--- /dev/null
+++ b/lib/elearning/Ilias4ConnectedPermissions.php
@@ -0,0 +1,126 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+DEFINE ("OPERATION_COPY", "copy");
+
+/**
+ * class to handle ILIAS 4 access controls
+ *
+ * This class contains methods to handle permissions on connected objects.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias4ConnectedPermission
+ * @package    ELearning-Interface
+ */
+class Ilias4ConnectedPermissions extends Ilias3ConnectedPermissions
+{
+    var $operations;
+    var $allowed_operations;
+    var $tree_allowed_operations;
+
+    var $USER_OPERATIONS;
+    var $AUTHOR_OPERATIONS;
+    /**
+     * constructor
+     *
+     * init class.
+     * @access
+     * @param string $cms system-type
+     */
+    function __construct($cms)
+    {
+        parent::__construct($cms);
+    }
+
+    /**
+     * check user permissions
+     *
+     * checks user permissions for connected course and changes setting if necessary
+     * @access public
+     * @param string $course_id course-id
+     * @return boolean returns false on error
+     */
+    function checkUserPermissions($course_id = "")
+    {
+        global $connected_cms, $messages;
+
+        if ($course_id == "") return false;
+        if ($connected_cms[$this->cms_type]->user->getId() == "") return false;
+
+        // get course role folder and local roles
+        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($course_id);
+        $active_role = "";
+        $proper_role = "";
+        $user_crs_role = $connected_cms[$this->cms_type]->crs_roles[$GLOBALS["perm"]->get_studip_perm(Context::getId())];
+        if (is_array($local_roles)) {
+            foreach ($local_roles as $key => $role_data) {
+                // check only if local role is il_crs_member, -tutor or -admin
+                if (! (mb_strpos($role_data["title"], "_crs_") === false)) {
+                    if ( in_array( $role_data["obj_id"], $connected_cms[$this->cms_type]->user->getRoles() ) ) {
+                        $active_role = $role_data["obj_id"];
+                    }
+                    if ( mb_strpos( $role_data["title"], $user_crs_role) > 0 ) {
+                        $proper_role = $role_data["obj_id"];
+                    }
+                }
+            }
+        }
+
+        // is user already course-member? otherwise add member with proper role
+        $is_member = $connected_cms[$this->cms_type]->soap_client->isMember( $connected_cms[$this->cms_type]->user->getId(), $course_id);
+        if (!$is_member) {
+            $member_data["usr_id"] = $connected_cms[$this->cms_type]->user->getId();
+            $member_data["ref_id"] = $course_id;
+            $member_data["status"] = CRS_NO_NOTIFICATION;
+            $type = "";
+            switch ($user_crs_role)
+            {
+                case "admin":
+                    $member_data["role"] = CRS_ADMIN_ROLE;
+                    $type = "Admin";
+                    break;
+                case "tutor":
+                    $member_data["role"] = CRS_TUTOR_ROLE;
+                    $type = "Tutor";
+                    break;
+                case "member":
+                    $member_data["role"] = CRS_MEMBER_ROLE;
+                    $type = "Member";
+                    break;
+                default:
+            }
+            $member_data["passed"] = CRS_PASSED_VALUE;
+            if ($type != "") {
+                $connected_cms[$this->cms_type]->soap_client->addMember( $connected_cms[$this->cms_type]->user->getId(), $type, $course_id );
+                if ($GLOBALS["debug"] == true) echo "addMember";
+            }
+        }
+
+        // check if user has proper local role
+        // if not, change it
+        if ($active_role != $proper_role) {
+            if ($active_role != "") {
+                $connected_cms[$this->cms_type]->soap_client->deleteUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $active_role);
+                if ($GLOBALS["debug"] == true) echo "Role $active_role deleted.";
+            }
+
+            if ($proper_role != "") {
+                $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry( $connected_cms[$this->cms_type]->user->getId(), $proper_role);
+                if ($GLOBALS["debug"] == true) echo "Role $proper_role added.";
+            }
+
+        }
+
+        if (! $this->getContentModulePerms( $course_id )) {
+            $messages["info"] .= _("Für den zugeordneten ILIAS-Kurs konnten keine Berechtigungen ermittelt werden.") . "<br>";
+        }
+
+        return true;
+    }
+}
+?>
diff --git a/lib/elearning/Ilias4ConnectedUser.class.php b/lib/elearning/Ilias4ConnectedUser.class.php
deleted file mode 100644
index be8b88c..0000000
--- a/lib/elearning/Ilias4ConnectedUser.class.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
- * class to handle ILIAS 4 user-accounts
- *
- * This class contains methods to handle connected ILIAS 4 user-accounts.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias4ConnectedUser
- * @package    ELearning-Interface
- */
-class Ilias4ConnectedUser extends Ilias3ConnectedUser
-{
-    var $roles;
-    var $user_sid;
-    var $auth_plugin;
-
-    /**
-     * constructor
-     *
-     * init class.
-     * @access
-     * @param string $cms system-type
-     */
-    function __construct($cms, $user_id = false)
-    {
-        // get auth_plugin
-        $user_id = $user_id ? $user_id : $GLOBALS['user']->id;
-        $this->auth_plugin = DBManager::get()->query("SELECT IFNULL(auth_plugin, 'standard') FROM auth_user_md5 WHERE user_id = '" . $user_id . "'")->fetchColumn();
-        parent::__construct($cms, $user_id);
-    }
-
-    /**
-     * new user
-     *
-     * save new user
-     * @access public
-     * @return boolean returns false on error
-     */
-    function newUser($ignore_encrypt_passwords = false)
-    {
-        global $connected_cms, $auth, $messages;
-
-        if ($this->getLoginData($this->login)) {
-            //automatische Zuordnung von bestehenden Ilias Accounts
-            //nur wenn ldap Modus benutzt wird und Stud.IP Nutzer passendes ldap plugin hat
-            if (
-                $connected_cms[$this->cms_type]->USER_AUTO_CREATE
-                && !$connected_cms[$this->cms_type]->USER_PREFIX
-                && $this->auth_plugin
-                && $this->auth_plugin !== 'standard'
-                && $this->auth_plugin === $connected_cms[$this->cms_type]->ldap_enable
-            ) {
-                if (!$this->external_password) {
-                    $this->setPassword(md5(uniqid("4dfmjsnll")));
-                }
-                $ok = $connected_cms[$this->cms_type]->soap_client->updatePassword($this->id, $this->external_password);
-                $this->setConnection($this->getUserType(), true);
-                if ($ok) {
-                    $messages["info"] .= sprintf(_("Verbindung mit Nutzer ID %s wiederhergestellt."), $this->id);
-                }
-                return true;
-            }
-            $messages["error"] .= sprintf(_("Es existiert bereits ein Account mit dem Benutzernamen \"%s\" (Account ID %s)."), $this->login, $this->id) . "<br>\n";
-            return false;
-        }
-
-        // data for user-account in ILIAS 4
-        $user_data["login"] = $this->login;
-        $user_data["passwd"] = $this->external_password;
-        $user_data["firstname"] = $this->firstname;
-        $user_data["lastname"] = $this->lastname;
-        $user_data["title"] = $this->title;
-        $user_data["gender"] = $this->gender;
-        $user_data["email"] = $this->email;
-        $user_data["street"] = $this->street;
-        $user_data["phone_home"] = $this->phone_home;
-        $user_data["time_limit_unlimited"] = 1;
-        $user_data["active"] = 1;
-        $user_data["approve_date"] = date('Y-m-d H:i:s');
-        $user_data["accepted_agreement"] = true;
-        // new values for ILIAS 4
-        $user_data["agree_date"] = date('Y-m-d H:i:s');
-        $user_data["external_account"] = $this->login;
-        if ($this->auth_plugin && $this->auth_plugin != "standard" &&  ($this->auth_plugin  == $connected_cms[$this->cms_type]->ldap_enable)) {
-            $user_data["auth_mode"] = "ldap";
-        } else {
-            $user_data["auth_mode"] = "default";
-        }
-        if ($connected_cms[$this->cms_type]->user_style != "") {
-            $user_data["user_style"] = $connected_cms[$this->cms_type]->user_style;
-        }
-        if ($connected_cms[$this->cms_type]->user_skin != "") {
-            $user_data["user_skin"] = $connected_cms[$this->cms_type]->user_skin;
-        }
-
-        $role_id = $connected_cms[$this->cms_type]->roles[$auth->auth["perm"]];
-
-        $user_id = $connected_cms[$this->cms_type]->soap_client->addUser($user_data, $role_id);
-
-        if ($user_id != false) {
-            $this->id = $user_id;
-
-            //            $connected_cms[$this->cms_type]->soap_client->updatePassword($user_id, $user_data["passwd"]);
-
-            //            $this->newUserCategory();
-
-            $this->setConnection(USER_TYPE_CREATED);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * create new user category
-     *
-     * create new user category
-     * @access public
-     * @return boolean returns false on error
-     */
-    function newUserCategory()
-    {
-        global $connected_cms, $messages;
-
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-
-        // data for user-category in ILIAS 4
-        $object_data["title"] = sprintf(_("Eigene Daten von %s (%s)."), $this->getName(), $this->getId());
-        $object_data["description"] = sprintf(_("Hier befinden sich die persönlichen Lernmodule des Benutzers %s."), $this->getName());
-        $object_data["type"] = "cat";
-        $object_data["owner"] = $this->getId();
-
-        $cat = $connected_cms[$this->cms_type]->soap_client->getReferenceByTitle($object_data["title"]);
-        if ($cat != false && $connected_cms[$this->cms_type]->soap_client->checkReferenceById($cat) ) {
-            $messages["info"] .= sprintf(_("Ihre persönliche Kategorie wurde bereits angelegt."), $this->login) . "<br>\n";
-            $this->category = $cat;
-        } else {
-            $this->category = $connected_cms[$this->cms_type]->soap_client->addObject($object_data, $connected_cms[$this->cms_type]->user_category_node_id);
-        }
-        if ($this->category != false) {
-            parent::setConnection($this->getUserType(), true);
-        } else {
-            echo "CATEGORY_ERROR".$connected_cms[$this->cms_type]->user_category_node_id ."-";
-            return false;
-        }
-        // data for personal user-role in ILIAS 4
-        $role_data["title"] = "studip_usr" . $this->getId() . "_cat" . $this->category;
-        $role_data["description"] = sprintf(_("User-Rolle von %s. Diese Rolle wurde von Stud.IP generiert."), $this->getName());
-        $role_id = $connected_cms[$this->cms_type]->soap_client->getObjectByTitle($role_data["title"], "role");
-        if ($role_id != false) {
-            $messages["info"] .= sprintf(_("Ihre persönliche Userrolle wurde bereits angelegt."), $this->login) . "<br>\n";
-        } else {
-            $role_id = $connected_cms[$this->cms_type]->soap_client->addRoleFromTemplate($role_data, $this->category, $connected_cms[$this->cms_type]->user_role_template_id);
-        }
-        $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry($this->getId(), $role_id);
-        // delete permissions for all global roles for this category
-        foreach ($connected_cms[$this->cms_type]->global_roles as $key => $role) {
-            $connected_cms[$this->cms_type]->soap_client->revokePermissions($role, $this->category);
-        }
-        return true;
-    }
-}
diff --git a/lib/elearning/Ilias4ConnectedUser.php b/lib/elearning/Ilias4ConnectedUser.php
new file mode 100644
index 0000000..be8b88c
--- /dev/null
+++ b/lib/elearning/Ilias4ConnectedUser.php
@@ -0,0 +1,168 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+ * class to handle ILIAS 4 user-accounts
+ *
+ * This class contains methods to handle connected ILIAS 4 user-accounts.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias4ConnectedUser
+ * @package    ELearning-Interface
+ */
+class Ilias4ConnectedUser extends Ilias3ConnectedUser
+{
+    var $roles;
+    var $user_sid;
+    var $auth_plugin;
+
+    /**
+     * constructor
+     *
+     * init class.
+     * @access
+     * @param string $cms system-type
+     */
+    function __construct($cms, $user_id = false)
+    {
+        // get auth_plugin
+        $user_id = $user_id ? $user_id : $GLOBALS['user']->id;
+        $this->auth_plugin = DBManager::get()->query("SELECT IFNULL(auth_plugin, 'standard') FROM auth_user_md5 WHERE user_id = '" . $user_id . "'")->fetchColumn();
+        parent::__construct($cms, $user_id);
+    }
+
+    /**
+     * new user
+     *
+     * save new user
+     * @access public
+     * @return boolean returns false on error
+     */
+    function newUser($ignore_encrypt_passwords = false)
+    {
+        global $connected_cms, $auth, $messages;
+
+        if ($this->getLoginData($this->login)) {
+            //automatische Zuordnung von bestehenden Ilias Accounts
+            //nur wenn ldap Modus benutzt wird und Stud.IP Nutzer passendes ldap plugin hat
+            if (
+                $connected_cms[$this->cms_type]->USER_AUTO_CREATE
+                && !$connected_cms[$this->cms_type]->USER_PREFIX
+                && $this->auth_plugin
+                && $this->auth_plugin !== 'standard'
+                && $this->auth_plugin === $connected_cms[$this->cms_type]->ldap_enable
+            ) {
+                if (!$this->external_password) {
+                    $this->setPassword(md5(uniqid("4dfmjsnll")));
+                }
+                $ok = $connected_cms[$this->cms_type]->soap_client->updatePassword($this->id, $this->external_password);
+                $this->setConnection($this->getUserType(), true);
+                if ($ok) {
+                    $messages["info"] .= sprintf(_("Verbindung mit Nutzer ID %s wiederhergestellt."), $this->id);
+                }
+                return true;
+            }
+            $messages["error"] .= sprintf(_("Es existiert bereits ein Account mit dem Benutzernamen \"%s\" (Account ID %s)."), $this->login, $this->id) . "<br>\n";
+            return false;
+        }
+
+        // data for user-account in ILIAS 4
+        $user_data["login"] = $this->login;
+        $user_data["passwd"] = $this->external_password;
+        $user_data["firstname"] = $this->firstname;
+        $user_data["lastname"] = $this->lastname;
+        $user_data["title"] = $this->title;
+        $user_data["gender"] = $this->gender;
+        $user_data["email"] = $this->email;
+        $user_data["street"] = $this->street;
+        $user_data["phone_home"] = $this->phone_home;
+        $user_data["time_limit_unlimited"] = 1;
+        $user_data["active"] = 1;
+        $user_data["approve_date"] = date('Y-m-d H:i:s');
+        $user_data["accepted_agreement"] = true;
+        // new values for ILIAS 4
+        $user_data["agree_date"] = date('Y-m-d H:i:s');
+        $user_data["external_account"] = $this->login;
+        if ($this->auth_plugin && $this->auth_plugin != "standard" &&  ($this->auth_plugin  == $connected_cms[$this->cms_type]->ldap_enable)) {
+            $user_data["auth_mode"] = "ldap";
+        } else {
+            $user_data["auth_mode"] = "default";
+        }
+        if ($connected_cms[$this->cms_type]->user_style != "") {
+            $user_data["user_style"] = $connected_cms[$this->cms_type]->user_style;
+        }
+        if ($connected_cms[$this->cms_type]->user_skin != "") {
+            $user_data["user_skin"] = $connected_cms[$this->cms_type]->user_skin;
+        }
+
+        $role_id = $connected_cms[$this->cms_type]->roles[$auth->auth["perm"]];
+
+        $user_id = $connected_cms[$this->cms_type]->soap_client->addUser($user_data, $role_id);
+
+        if ($user_id != false) {
+            $this->id = $user_id;
+
+            //            $connected_cms[$this->cms_type]->soap_client->updatePassword($user_id, $user_data["passwd"]);
+
+            //            $this->newUserCategory();
+
+            $this->setConnection(USER_TYPE_CREATED);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * create new user category
+     *
+     * create new user category
+     * @access public
+     * @return boolean returns false on error
+     */
+    function newUserCategory()
+    {
+        global $connected_cms, $messages;
+
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+
+        // data for user-category in ILIAS 4
+        $object_data["title"] = sprintf(_("Eigene Daten von %s (%s)."), $this->getName(), $this->getId());
+        $object_data["description"] = sprintf(_("Hier befinden sich die persönlichen Lernmodule des Benutzers %s."), $this->getName());
+        $object_data["type"] = "cat";
+        $object_data["owner"] = $this->getId();
+
+        $cat = $connected_cms[$this->cms_type]->soap_client->getReferenceByTitle($object_data["title"]);
+        if ($cat != false && $connected_cms[$this->cms_type]->soap_client->checkReferenceById($cat) ) {
+            $messages["info"] .= sprintf(_("Ihre persönliche Kategorie wurde bereits angelegt."), $this->login) . "<br>\n";
+            $this->category = $cat;
+        } else {
+            $this->category = $connected_cms[$this->cms_type]->soap_client->addObject($object_data, $connected_cms[$this->cms_type]->user_category_node_id);
+        }
+        if ($this->category != false) {
+            parent::setConnection($this->getUserType(), true);
+        } else {
+            echo "CATEGORY_ERROR".$connected_cms[$this->cms_type]->user_category_node_id ."-";
+            return false;
+        }
+        // data for personal user-role in ILIAS 4
+        $role_data["title"] = "studip_usr" . $this->getId() . "_cat" . $this->category;
+        $role_data["description"] = sprintf(_("User-Rolle von %s. Diese Rolle wurde von Stud.IP generiert."), $this->getName());
+        $role_id = $connected_cms[$this->cms_type]->soap_client->getObjectByTitle($role_data["title"], "role");
+        if ($role_id != false) {
+            $messages["info"] .= sprintf(_("Ihre persönliche Userrolle wurde bereits angelegt."), $this->login) . "<br>\n";
+        } else {
+            $role_id = $connected_cms[$this->cms_type]->soap_client->addRoleFromTemplate($role_data, $this->category, $connected_cms[$this->cms_type]->user_role_template_id);
+        }
+        $connected_cms[$this->cms_type]->soap_client->addUserRoleEntry($this->getId(), $role_id);
+        // delete permissions for all global roles for this category
+        foreach ($connected_cms[$this->cms_type]->global_roles as $key => $role) {
+            $connected_cms[$this->cms_type]->soap_client->revokePermissions($role, $this->category);
+        }
+        return true;
+    }
+}
diff --git a/lib/elearning/Ilias4ContentModule.class.php b/lib/elearning/Ilias4ContentModule.class.php
deleted file mode 100644
index f8552c3..0000000
--- a/lib/elearning/Ilias4ContentModule.class.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
- * class to handle ILIAS 4 learning modules and tests
- *
- * This class contains methods to handle ILIAS 4 learning modules and tests.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias4ContentModule
- * @package    ELearning-Interface
- */
-class Ilias4ContentModule extends Ilias3ContentModule
-{
-    var $object_id;
-
-    /**
-     * constructor
-     *
-     * init class.
-     * @access public
-     * @param string $module_id module-id
-     * @param string $module_type module-type
-     * @param string $cms_type system-type
-     */
-    function __construct($module_id, $module_type, $cms_type)
-    {
-        parent::__construct($module_id, $module_type, $cms_type);
-    }
-
-    /**
-     * set connection
-     *
-     * sets connection with seminar
-     * @access public
-     * @param string $seminar_id seminar-id
-     * @return boolean successful
-     */
-    function setConnection($seminar_id)
-    {
-        global $connected_cms, $messages;
-
-        $write_permission = Request::option("write_permission");
-
-        $crs_id = ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
-        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
-        $connected_cms[$this->cms_type]->soap_client->clearCache();
-
-        // Check, ob Kurs in ILIAS gelöscht wurde
-        if (($crs_id != false) AND ($connected_cms[$this->cms_type]->soap_client->getObjectByReference($crs_id) == false)) {
-            ObjectConnections::unsetConnection($seminar_id, $crs_id, "crs", $this->cms_type);
-            $messages["info"] .= _("Der zugeordnete ILIAS-Kurs (ID $crs_id) existiert nicht mehr. Ein neuer Kurs wird angelegt.") . "<br>";
-            $crs_id = false;
-        }
-
-        $crs_id == $connected_cms[$this->cms_type]->createCourse($seminar_id);
-
-        if ($crs_id == false) return false;
-
-        $ref_id = $this->getId();
-        if (Request::get("copy_object") == "1") {
-            $connected_cms[$this->cms_type]->soap_client->user_type = 'user';
-            $ref_id = $connected_cms[$this->cms_type]->soap_client->copyObject($this->id, $crs_id);
-            $connected_cms[$this->cms_type]->soap_client->user_type = 'admin';
-        } else {
-            $ref_id = $connected_cms[$this->cms_type]->soap_client->addReference($this->id, $crs_id);
-        }
-        if (!$ref_id) {
-            $messages["error"] .= _("Zuordnungs-Fehler: Objekt konnte nicht angelegt werden.");
-            return false;
-        }
-        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($crs_id);
-        $member_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ]);
-        $admin_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_WRITE, OPERATION_DELETE]);
-        $admin_operations_no_delete = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_WRITE]);
-        $admin_operations_readonly = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_DELETE]);
-        foreach ($local_roles as $key => $role_data) {
-            // check only if local role is il_crs_member, -tutor or -admin
-            if (mb_strpos($role_data["title"], "il_crs_") === 0) {
-                if(mb_strpos($role_data["title"], 'il_crs_member') === 0){
-                    $operations = ($write_permission == "autor") ? $admin_operations_no_delete : $member_operations;
-                } elseif(mb_strpos($role_data["title"], 'il_crs_tutor') === 0){
-                    $operations = (($write_permission == "tutor") || ($write_permission == "autor")) ? $admin_operations : $admin_operations_readonly;
-                } elseif(mb_strpos($role_data["title"], 'il_crs_admin') === 0){
-                    $operations = (($write_permission == "dozent") || ($write_permission == "tutor") || ($write_permission == "autor")) ? $admin_operations : $admin_operations_readonly;
-                } else {
-                    continue;
-                }
-                $connected_cms[$this->cms_type]->soap_client->revokePermissions($role_data["obj_id"], $ref_id);
-                $connected_cms[$this->cms_type]->soap_client->grantPermissions($operations, $role_data["obj_id"], $ref_id);
-            }
-        }
-        if ($ref_id) {
-            $this->setId($ref_id);
-            return ContentModule::setConnection($seminar_id);
-        } else {
-            $messages["error"] .= _("Die Zuordnung konnte nicht gespeichert werden.");
-        }
-        return false;
-    }
-}
diff --git a/lib/elearning/Ilias4ContentModule.php b/lib/elearning/Ilias4ContentModule.php
new file mode 100644
index 0000000..f8552c3
--- /dev/null
+++ b/lib/elearning/Ilias4ContentModule.php
@@ -0,0 +1,106 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+ * class to handle ILIAS 4 learning modules and tests
+ *
+ * This class contains methods to handle ILIAS 4 learning modules and tests.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias4ContentModule
+ * @package    ELearning-Interface
+ */
+class Ilias4ContentModule extends Ilias3ContentModule
+{
+    var $object_id;
+
+    /**
+     * constructor
+     *
+     * init class.
+     * @access public
+     * @param string $module_id module-id
+     * @param string $module_type module-type
+     * @param string $cms_type system-type
+     */
+    function __construct($module_id, $module_type, $cms_type)
+    {
+        parent::__construct($module_id, $module_type, $cms_type);
+    }
+
+    /**
+     * set connection
+     *
+     * sets connection with seminar
+     * @access public
+     * @param string $seminar_id seminar-id
+     * @return boolean successful
+     */
+    function setConnection($seminar_id)
+    {
+        global $connected_cms, $messages;
+
+        $write_permission = Request::option("write_permission");
+
+        $crs_id = ObjectConnections::getConnectionModuleId($seminar_id, "crs", $this->cms_type);
+        $connected_cms[$this->cms_type]->soap_client->setCachingStatus(false);
+        $connected_cms[$this->cms_type]->soap_client->clearCache();
+
+        // Check, ob Kurs in ILIAS gelöscht wurde
+        if (($crs_id != false) AND ($connected_cms[$this->cms_type]->soap_client->getObjectByReference($crs_id) == false)) {
+            ObjectConnections::unsetConnection($seminar_id, $crs_id, "crs", $this->cms_type);
+            $messages["info"] .= _("Der zugeordnete ILIAS-Kurs (ID $crs_id) existiert nicht mehr. Ein neuer Kurs wird angelegt.") . "<br>";
+            $crs_id = false;
+        }
+
+        $crs_id == $connected_cms[$this->cms_type]->createCourse($seminar_id);
+
+        if ($crs_id == false) return false;
+
+        $ref_id = $this->getId();
+        if (Request::get("copy_object") == "1") {
+            $connected_cms[$this->cms_type]->soap_client->user_type = 'user';
+            $ref_id = $connected_cms[$this->cms_type]->soap_client->copyObject($this->id, $crs_id);
+            $connected_cms[$this->cms_type]->soap_client->user_type = 'admin';
+        } else {
+            $ref_id = $connected_cms[$this->cms_type]->soap_client->addReference($this->id, $crs_id);
+        }
+        if (!$ref_id) {
+            $messages["error"] .= _("Zuordnungs-Fehler: Objekt konnte nicht angelegt werden.");
+            return false;
+        }
+        $local_roles = $connected_cms[$this->cms_type]->soap_client->getLocalRoles($crs_id);
+        $member_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ]);
+        $admin_operations = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_WRITE, OPERATION_DELETE]);
+        $admin_operations_no_delete = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_WRITE]);
+        $admin_operations_readonly = $connected_cms[$this->cms_type]->permissions->getOperationArray([OPERATION_VISIBLE, OPERATION_READ, OPERATION_DELETE]);
+        foreach ($local_roles as $key => $role_data) {
+            // check only if local role is il_crs_member, -tutor or -admin
+            if (mb_strpos($role_data["title"], "il_crs_") === 0) {
+                if(mb_strpos($role_data["title"], 'il_crs_member') === 0){
+                    $operations = ($write_permission == "autor") ? $admin_operations_no_delete : $member_operations;
+                } elseif(mb_strpos($role_data["title"], 'il_crs_tutor') === 0){
+                    $operations = (($write_permission == "tutor") || ($write_permission == "autor")) ? $admin_operations : $admin_operations_readonly;
+                } elseif(mb_strpos($role_data["title"], 'il_crs_admin') === 0){
+                    $operations = (($write_permission == "dozent") || ($write_permission == "tutor") || ($write_permission == "autor")) ? $admin_operations : $admin_operations_readonly;
+                } else {
+                    continue;
+                }
+                $connected_cms[$this->cms_type]->soap_client->revokePermissions($role_data["obj_id"], $ref_id);
+                $connected_cms[$this->cms_type]->soap_client->grantPermissions($operations, $role_data["obj_id"], $ref_id);
+            }
+        }
+        if ($ref_id) {
+            $this->setId($ref_id);
+            return ContentModule::setConnection($seminar_id);
+        } else {
+            $messages["error"] .= _("Die Zuordnung konnte nicht gespeichert werden.");
+        }
+        return false;
+    }
+}
diff --git a/lib/elearning/Ilias4Soap.class.php b/lib/elearning/Ilias4Soap.class.php
deleted file mode 100644
index 27c28fb..0000000
--- a/lib/elearning/Ilias4Soap.class.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
- * class to use ILIAS-4-Webservices
- *
- * This class contains methods to connect to the ILIAS-4-Soap-Server.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias4Soap
- * @package    ELearning-Interface
- */
-class Ilias4Soap extends Ilias3Soap
-{
-    var $cms_type;
-    var $admin_sid;
-    var $user_sid;
-    var $user_type;
-    var $soap_cache;
-    var $separator_string;
-
-    /**
-     * constructor
-     *
-     * init class.
-     * @access
-     * @param string $cms system-type
-     */
-    function __construct($cms)
-    {
-        parent::__construct($cms);
-        $this->separator_string = " / ";
-    }
-
-    /**
-     * add user by importUsers
-     *
-     * adds new user and sets role-id
-     * @access public
-     * @param array user_data user-data
-     * @param string role_id global role-id for new user
-     * @return string user-id
-     */
-    function addUser($user_data, $role_id)
-    {
-        foreach($user_data as $key => $value) {
-            $user_data[$key] = htmlReady($user_data[$key]);
-        }
-
-        $usr_xml = "<Users>
-<User>
-<UDFDefinitions></UDFDefinitions>
-<Login>".$user_data["login"]."</Login>
-<Password Type=\"PLAIN\">".$user_data["passwd"]."</Password>
-<Firstname>".$user_data["firstname"]."</Firstname>
-<Lastname>".$user_data["lastname"]."</Lastname>
-<Title>".$user_data["title"]."</Title>
-<Gender>".$user_data["gender"]."</Gender>
-<Email>".$user_data["email"]."</Email>
-<Street>".$user_data["street"]."</Street>
-<PhoneHome>".$user_data["phone_home"]."</PhoneHome>
-<Role Id=\"".$role_id."\" Type=\"Global\"/>
-<Active>true</Active>
-<TimeLimitUnlimited>".$user_data["time_limit_unlimited"]."</TimeLimitUnlimited>
-<TimeLimitMessage>0</TimeLimitMessage>
-<ApproveDate>".$user_data["approve_date"]."</ApproveDate>
-<AgreeDate>".$user_data["agree_date"]."</AgreeDate>";
-        if (($user_data["user_skin"] != "") OR ($user_data["user_style"] != "")) {
-            $usr_xml .= "<Look Skin=\"".$user_data["user_skin"]."\" Style=\"".$user_data["user_style"]."\"/>";
-        }
-        $usr_xml .= "<AuthMode type=\"".$user_data["auth_mode"]."\"/>
-<ExternalAccount>".$user_data["external_account"]."</ExternalAccount>
-</User>
-</Users>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'folder_id' => -1,
-            'usr_xml' => $usr_xml,
-            'conflict_role' => 1,
-            'send_account_mail' => 0
-        ];
-        $result = $this->call('importUsers', $param);
-
-        $s = simplexml_load_string($result);
-
-        if ((string)$s->rows->row->column[3] == "successful")
-        return (string)$s->rows->row->column[0];
-        else
-        return false;
-    }
-
-    /**
-     * copy object
-     *
-     * copy ilias-object
-     * @access public
-     * @param string source_id reference-id
-     * @param string target_id reference-id
-     * @return string result
-     */
-    function copyObject($source_id, $target_id)
-    {
-        $xml = "<Settings source_id=\"$source_id\" target_id=\"$target_id\" default_action=\"COPY\"/>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'xml' => $xml
-        ];
-        return $this->call('copyObject', $param);
-    }
-
-    /**
-     * get path
-     *
-     * returns repository-path to ilias-object
-     * @access public
-     * @param string source_id reference-id
-     * @param string target_id reference-id
-     * @return string result
-     */
-    function getPath($ref_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id
-        ];
-        $result = $this->call('getPathForRefId', $param);
-
-        if ($result) {
-            $s = simplexml_load_string($result);
-
-            foreach ($s->rows->row as $row) {
-                $path[] = (string)$row->column[2];
-            }
-        }
-
-        if (is_array($path)) {
-            return implode($this->separator_string, $path);
-        } else {
-            return false;
-        }
-    }
-
-     /**
-     *
-     * returns repository-path to ilias-object
-     *
-     * @access public
-     * @param string source_id reference-id
-     * @param string target_id reference-id
-     * @return string result
-     */
-    function getRawPath($ref_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id
-        ];
-        $result = $this->call('getPathForRefId', $param);
-
-        if ($result) {
-            $s = simplexml_load_string($result);
-
-            foreach ($s->rows->row as $row) {
-                $path[] = (string)$row->column[0];
-            }
-        }
-
-        if (is_array($path)) {
-            return implode('_', $path);
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/lib/elearning/Ilias4Soap.php b/lib/elearning/Ilias4Soap.php
new file mode 100644
index 0000000..27c28fb
--- /dev/null
+++ b/lib/elearning/Ilias4Soap.php
@@ -0,0 +1,181 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+ * class to use ILIAS-4-Webservices
+ *
+ * This class contains methods to connect to the ILIAS-4-Soap-Server.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias4Soap
+ * @package    ELearning-Interface
+ */
+class Ilias4Soap extends Ilias3Soap
+{
+    var $cms_type;
+    var $admin_sid;
+    var $user_sid;
+    var $user_type;
+    var $soap_cache;
+    var $separator_string;
+
+    /**
+     * constructor
+     *
+     * init class.
+     * @access
+     * @param string $cms system-type
+     */
+    function __construct($cms)
+    {
+        parent::__construct($cms);
+        $this->separator_string = " / ";
+    }
+
+    /**
+     * add user by importUsers
+     *
+     * adds new user and sets role-id
+     * @access public
+     * @param array user_data user-data
+     * @param string role_id global role-id for new user
+     * @return string user-id
+     */
+    function addUser($user_data, $role_id)
+    {
+        foreach($user_data as $key => $value) {
+            $user_data[$key] = htmlReady($user_data[$key]);
+        }
+
+        $usr_xml = "<Users>
+<User>
+<UDFDefinitions></UDFDefinitions>
+<Login>".$user_data["login"]."</Login>
+<Password Type=\"PLAIN\">".$user_data["passwd"]."</Password>
+<Firstname>".$user_data["firstname"]."</Firstname>
+<Lastname>".$user_data["lastname"]."</Lastname>
+<Title>".$user_data["title"]."</Title>
+<Gender>".$user_data["gender"]."</Gender>
+<Email>".$user_data["email"]."</Email>
+<Street>".$user_data["street"]."</Street>
+<PhoneHome>".$user_data["phone_home"]."</PhoneHome>
+<Role Id=\"".$role_id."\" Type=\"Global\"/>
+<Active>true</Active>
+<TimeLimitUnlimited>".$user_data["time_limit_unlimited"]."</TimeLimitUnlimited>
+<TimeLimitMessage>0</TimeLimitMessage>
+<ApproveDate>".$user_data["approve_date"]."</ApproveDate>
+<AgreeDate>".$user_data["agree_date"]."</AgreeDate>";
+        if (($user_data["user_skin"] != "") OR ($user_data["user_style"] != "")) {
+            $usr_xml .= "<Look Skin=\"".$user_data["user_skin"]."\" Style=\"".$user_data["user_style"]."\"/>";
+        }
+        $usr_xml .= "<AuthMode type=\"".$user_data["auth_mode"]."\"/>
+<ExternalAccount>".$user_data["external_account"]."</ExternalAccount>
+</User>
+</Users>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'folder_id' => -1,
+            'usr_xml' => $usr_xml,
+            'conflict_role' => 1,
+            'send_account_mail' => 0
+        ];
+        $result = $this->call('importUsers', $param);
+
+        $s = simplexml_load_string($result);
+
+        if ((string)$s->rows->row->column[3] == "successful")
+        return (string)$s->rows->row->column[0];
+        else
+        return false;
+    }
+
+    /**
+     * copy object
+     *
+     * copy ilias-object
+     * @access public
+     * @param string source_id reference-id
+     * @param string target_id reference-id
+     * @return string result
+     */
+    function copyObject($source_id, $target_id)
+    {
+        $xml = "<Settings source_id=\"$source_id\" target_id=\"$target_id\" default_action=\"COPY\"/>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'xml' => $xml
+        ];
+        return $this->call('copyObject', $param);
+    }
+
+    /**
+     * get path
+     *
+     * returns repository-path to ilias-object
+     * @access public
+     * @param string source_id reference-id
+     * @param string target_id reference-id
+     * @return string result
+     */
+    function getPath($ref_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id
+        ];
+        $result = $this->call('getPathForRefId', $param);
+
+        if ($result) {
+            $s = simplexml_load_string($result);
+
+            foreach ($s->rows->row as $row) {
+                $path[] = (string)$row->column[2];
+            }
+        }
+
+        if (is_array($path)) {
+            return implode($this->separator_string, $path);
+        } else {
+            return false;
+        }
+    }
+
+     /**
+     *
+     * returns repository-path to ilias-object
+     *
+     * @access public
+     * @param string source_id reference-id
+     * @param string target_id reference-id
+     * @return string result
+     */
+    function getRawPath($ref_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id
+        ];
+        $result = $this->call('getPathForRefId', $param);
+
+        if ($result) {
+            $s = simplexml_load_string($result);
+
+            foreach ($s->rows->row as $row) {
+                $path[] = (string)$row->column[0];
+            }
+        }
+
+        if (is_array($path)) {
+            return implode('_', $path);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/lib/elearning/Ilias5ConnectedCMS.class.php b/lib/elearning/Ilias5ConnectedCMS.class.php
deleted file mode 100644
index 011d046..0000000
--- a/lib/elearning/Ilias5ConnectedCMS.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
- * main-class for connection to ILIAS 5.2
- *
- * This class contains the main methods of the elearning-interface to connect to ILIAS 5. Extends Ilias3ConnectedCMS.
- *
- * @author   Arne Schröder <schroeder@data-quest.de>
- * @access   public
- * @modulegroup  elearning_interface_modules
- * @module       Ilias5ConnectedCMS
- * @package  ELearning-Interface
- */
-class Ilias5ConnectedCMS extends Ilias4ConnectedCMS
-{
-
-}
diff --git a/lib/elearning/Ilias5ConnectedCMS.php b/lib/elearning/Ilias5ConnectedCMS.php
new file mode 100644
index 0000000..011d046
--- /dev/null
+++ b/lib/elearning/Ilias5ConnectedCMS.php
@@ -0,0 +1,21 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+ * main-class for connection to ILIAS 5.2
+ *
+ * This class contains the main methods of the elearning-interface to connect to ILIAS 5. Extends Ilias3ConnectedCMS.
+ *
+ * @author   Arne Schröder <schroeder@data-quest.de>
+ * @access   public
+ * @modulegroup  elearning_interface_modules
+ * @module       Ilias5ConnectedCMS
+ * @package  ELearning-Interface
+ */
+class Ilias5ConnectedCMS extends Ilias4ConnectedCMS
+{
+
+}
diff --git a/lib/elearning/Ilias5ConnectedLink.class.php b/lib/elearning/Ilias5ConnectedLink.class.php
deleted file mode 100644
index 0ce4a0f..0000000
--- a/lib/elearning/Ilias5ConnectedLink.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * class to generate links to ILIAS 5.2
- *
- * This class contains methods to generate links to ILIAS 5.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias5ConnectedLink
- * @package    ELearning-Interface
- */
-class Ilias5ConnectedLink extends Ilias4ConnectedLink
-{
-}
-?>
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ConnectedLink.php b/lib/elearning/Ilias5ConnectedLink.php
new file mode 100644
index 0000000..0ce4a0f
--- /dev/null
+++ b/lib/elearning/Ilias5ConnectedLink.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * class to generate links to ILIAS 5.2
+ *
+ * This class contains methods to generate links to ILIAS 5.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias5ConnectedLink
+ * @package    ELearning-Interface
+ */
+class Ilias5ConnectedLink extends Ilias4ConnectedLink
+{
+}
+?>
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ConnectedPermissions.class.php b/lib/elearning/Ilias5ConnectedPermissions.class.php
deleted file mode 100644
index 17d6f0d..0000000
--- a/lib/elearning/Ilias5ConnectedPermissions.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * class to handle ILIAS 5.2 access controls
- *
- * This class contains methods to handle permissions on connected objects.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias4ConnectedPermission
- * @package    ELearning-Interface
- */
-class Ilias5ConnectedPermissions extends Ilias4ConnectedPermissions
-{
-
-}
-?>
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ConnectedPermissions.php b/lib/elearning/Ilias5ConnectedPermissions.php
new file mode 100644
index 0000000..17d6f0d
--- /dev/null
+++ b/lib/elearning/Ilias5ConnectedPermissions.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * class to handle ILIAS 5.2 access controls
+ *
+ * This class contains methods to handle permissions on connected objects.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias4ConnectedPermission
+ * @package    ELearning-Interface
+ */
+class Ilias5ConnectedPermissions extends Ilias4ConnectedPermissions
+{
+
+}
+?>
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ConnectedUser.class.php b/lib/elearning/Ilias5ConnectedUser.class.php
deleted file mode 100644
index 6172976..0000000
--- a/lib/elearning/Ilias5ConnectedUser.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * class to handle ILIAS 5.2 user-accounts
- *
- * This class contains methods to handle connected ILIAS 5 user-accounts.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias5ConnectedUser
- * @package    ELearning-Interface
- */
-class Ilias5ConnectedUser extends Ilias4ConnectedUser
-{
-
-    /**
-    * verify login data
-    *
-    * returns true, if login-data is valid
-    * @access public
-    * @param string $username username
-    * @param string $password password
-    * @return boolean login-validation
-    */
-    function verifyLogin($username, $password)
-    {
-        global $connected_cms, $messages;
-        $result = $connected_cms[$this->cms_type]->soap_client->checkPassword($username, $password);
-        if (strpos($result, '::') > 0) {
-            return $this->getLoginData($username);
-        }
-        return false;
-    }
-
-    function setConnection($user_type, $ignore_encrypted_passwords = false)
-    {
-        $this->external_password = '';
-        parent::setConnection($user_type, true);
-    }
-}
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ConnectedUser.php b/lib/elearning/Ilias5ConnectedUser.php
new file mode 100644
index 0000000..6172976
--- /dev/null
+++ b/lib/elearning/Ilias5ConnectedUser.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * class to handle ILIAS 5.2 user-accounts
+ *
+ * This class contains methods to handle connected ILIAS 5 user-accounts.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias5ConnectedUser
+ * @package    ELearning-Interface
+ */
+class Ilias5ConnectedUser extends Ilias4ConnectedUser
+{
+
+    /**
+    * verify login data
+    *
+    * returns true, if login-data is valid
+    * @access public
+    * @param string $username username
+    * @param string $password password
+    * @return boolean login-validation
+    */
+    function verifyLogin($username, $password)
+    {
+        global $connected_cms, $messages;
+        $result = $connected_cms[$this->cms_type]->soap_client->checkPassword($username, $password);
+        if (strpos($result, '::') > 0) {
+            return $this->getLoginData($username);
+        }
+        return false;
+    }
+
+    function setConnection($user_type, $ignore_encrypted_passwords = false)
+    {
+        $this->external_password = '';
+        parent::setConnection($user_type, true);
+    }
+}
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ContentModule.class.php b/lib/elearning/Ilias5ContentModule.class.php
deleted file mode 100644
index 3f50c02..0000000
--- a/lib/elearning/Ilias5ContentModule.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * class to handle ILIAS 5.2 learning modules and tests
- *
- * This class contains methods to handle ILIAS 5 learning modules and tests.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias5ContentModule
- * @package    ELearning-Interface
- */
-class Ilias5ContentModule extends Ilias4ContentModule
-{
-
-}
\ No newline at end of file
diff --git a/lib/elearning/Ilias5ContentModule.php b/lib/elearning/Ilias5ContentModule.php
new file mode 100644
index 0000000..3f50c02
--- /dev/null
+++ b/lib/elearning/Ilias5ContentModule.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * class to handle ILIAS 5.2 learning modules and tests
+ *
+ * This class contains methods to handle ILIAS 5 learning modules and tests.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias5ContentModule
+ * @package    ELearning-Interface
+ */
+class Ilias5ContentModule extends Ilias4ContentModule
+{
+
+}
\ No newline at end of file
diff --git a/lib/elearning/Ilias5Soap.class.php b/lib/elearning/Ilias5Soap.class.php
deleted file mode 100644
index cf8bd4c..0000000
--- a/lib/elearning/Ilias5Soap.class.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * class to use ILIAS-5-Webservices
- *
- * This class contains methods to connect to the ILIAS-5-Soap-Server.
- *
- * @author    Arne Schröder <schroeder@data-quest.de>
- * @access    public
- * @modulegroup    elearning_interface_modules
- * @module        Ilias5Soap
- * @package    ELearning-Interface
- */
-class Ilias5Soap extends Ilias4Soap
-{
-    var $cms_type;
-    var $admin_sid;
-    var $user_sid;
-    var $user_type;
-    var $soap_cache;
-    var $separator_string;
-
-    /**
-     * call soap-function
-     *
-     * calls soap-function with given parameters
-     * @access public
-     * @param string method method-name
-     * @param string params parameters
-     * @return mixed result
-     */
-    function call($method, $params)
-    {
-        $index = md5($method . ":" . implode('-', $params));
-        // return false if no session_id is given
-        if (($method != "login") AND ($params["sid"] == ""))
-            return false;
-//      echo $this->caching_active;
-        if (($this->caching_active == true) AND (isset($this->soap_cache[$index])))
-        {
-//          echo $index;
-//          echo " from Cache<br>";
-            $result = $this->soap_cache[$index];
-        }
-        else
-        {
-            $result = $this->_call($method, $params);
-            // if Session is expired, re-login and try again
-            if (($method != "login") AND $this->soap_client->fault AND in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"]) )
-            {
-                $caching_status = $this->caching_active;
-                $this->caching_active = false;
-                $user_type = $this->user_type;
-                $this->user_type = 'admin';
-                $params["sid"] = $this->login();
-                $result = $this->_call($method, $params);
-                $this->caching_active = $caching_status;
-                $this->user_type = $user_type;
-            }
-            elseif (! $this->soap_client->fault)
-                $this->soap_cache[$index] = $result;
-        }
-        return $result;
-    }
-
-    /**
-    * login
-    *
-    * login to soap-webservice
-    * @access public
-    * @return string result
-    */
-    function login()
-    {
-        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
-        if ($this->user_type == "admin") {
-            $param = [
-                'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
-                'username' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["username"],
-                'password' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["password"]
-                ];
-            $result = $this->call('login', $param);
-        } elseif ($this->user_type == "user") {
-            $param = [
-                'sid' => $this->admin_sid,
-                'user_id' => $connected_cms[$this->cms_type]->user->getId()
-                ];
-            $result = $this->call('loginStudipUser', $param);
-        }
-        if ($this->user_type == "admin")
-            $this->admin_sid = $result;
-        if ($this->user_type == "user")
-            $this->user_sid = $result;
-        return $result;
-    }
-
-    /**
-    * Check Auth
-    *
-    * login to soap-webservice
-    * @access public
-    * @return string result
-    */
-    function checkPassword($username, $password)
-    {
-        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
-        $param = [
-            'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
-            'username' => $username,
-            'password' => $password
-        ];
-        $result = $this->call('login', $param);
-        return $result;
-    }
-}
diff --git a/lib/elearning/Ilias5Soap.php b/lib/elearning/Ilias5Soap.php
new file mode 100644
index 0000000..cf8bd4c
--- /dev/null
+++ b/lib/elearning/Ilias5Soap.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * class to use ILIAS-5-Webservices
+ *
+ * This class contains methods to connect to the ILIAS-5-Soap-Server.
+ *
+ * @author    Arne Schröder <schroeder@data-quest.de>
+ * @access    public
+ * @modulegroup    elearning_interface_modules
+ * @module        Ilias5Soap
+ * @package    ELearning-Interface
+ */
+class Ilias5Soap extends Ilias4Soap
+{
+    var $cms_type;
+    var $admin_sid;
+    var $user_sid;
+    var $user_type;
+    var $soap_cache;
+    var $separator_string;
+
+    /**
+     * call soap-function
+     *
+     * calls soap-function with given parameters
+     * @access public
+     * @param string method method-name
+     * @param string params parameters
+     * @return mixed result
+     */
+    function call($method, $params)
+    {
+        $index = md5($method . ":" . implode('-', $params));
+        // return false if no session_id is given
+        if (($method != "login") AND ($params["sid"] == ""))
+            return false;
+//      echo $this->caching_active;
+        if (($this->caching_active == true) AND (isset($this->soap_cache[$index])))
+        {
+//          echo $index;
+//          echo " from Cache<br>";
+            $result = $this->soap_cache[$index];
+        }
+        else
+        {
+            $result = $this->_call($method, $params);
+            // if Session is expired, re-login and try again
+            if (($method != "login") AND $this->soap_client->fault AND in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"]) )
+            {
+                $caching_status = $this->caching_active;
+                $this->caching_active = false;
+                $user_type = $this->user_type;
+                $this->user_type = 'admin';
+                $params["sid"] = $this->login();
+                $result = $this->_call($method, $params);
+                $this->caching_active = $caching_status;
+                $this->user_type = $user_type;
+            }
+            elseif (! $this->soap_client->fault)
+                $this->soap_cache[$index] = $result;
+        }
+        return $result;
+    }
+
+    /**
+    * login
+    *
+    * login to soap-webservice
+    * @access public
+    * @return string result
+    */
+    function login()
+    {
+        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
+        if ($this->user_type == "admin") {
+            $param = [
+                'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
+                'username' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["username"],
+                'password' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["password"]
+                ];
+            $result = $this->call('login', $param);
+        } elseif ($this->user_type == "user") {
+            $param = [
+                'sid' => $this->admin_sid,
+                'user_id' => $connected_cms[$this->cms_type]->user->getId()
+                ];
+            $result = $this->call('loginStudipUser', $param);
+        }
+        if ($this->user_type == "admin")
+            $this->admin_sid = $result;
+        if ($this->user_type == "user")
+            $this->user_sid = $result;
+        return $result;
+    }
+
+    /**
+    * Check Auth
+    *
+    * login to soap-webservice
+    * @access public
+    * @return string result
+    */
+    function checkPassword($username, $password)
+    {
+        global $ELEARNING_INTERFACE_MODULES, $connected_cms;
+        $param = [
+            'client' => $ELEARNING_INTERFACE_MODULES[$this->cms_type]["soap_data"]["client"],
+            'username' => $username,
+            'password' => $password
+        ];
+        $result = $this->call('login', $param);
+        return $result;
+    }
+}
diff --git a/lib/elearning/LonCapaConnectedCMS.class.php b/lib/elearning/LonCapaConnectedCMS.class.php
deleted file mode 100644
index 2f86aa8..0000000
--- a/lib/elearning/LonCapaConnectedCMS.class.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * main-class for connection to LonCapa
- *
- * This class contains the main methods of the elearning-interface to connect to
- * LonCapa. Extends ConnectedCMS.
- *
- * @access   public
- * @modulegroup  elearning_interface_modules
- * @module       LonCapaConnectedCMS
- * @package  ELearning-Interface
- */
-class LonCapaConnectedCMS extends ConnectedCMS
-{
-    public $user;
-    protected $seminarId;
-    protected $lcRequest;
-    protected $cmsUrl;
-
-    public function __construct($cms = '')
-    {
-        parent::__construct($cms);
-
-        $this->seminarId = Context::getId();
-        $this->user = User::findCurrent();
-        $this->lcRequest = new LonCapaRequest();
-        $this->cmsUrl = $this->ABSOLUTE_PATH_ELEARNINGMODULES;
-    }
-
-
-    /**
-     * search for content modules
-     *
-     * returns found content modules
-     * @throws AccessDeniedException
-     * @param string $key keyword
-     * @return array list of content modules
-     */
-    public function searchContentModules($key)
-    {
-
-        if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->seminarId)) {
-            throw new AccessDeniedException();
-        }
-
-        $url = $this->cmsUrl . '/courses?search=' . urlencode($key) . '&owner=' . urlencode($this->user->username);
-        $response = $this->lcRequest->request($url);
-
-        if ($response) {
-            $courses = new SimpleXMLElement($response);
-
-            $result = [];
-            foreach ($courses->course as $course) {
-                $temp = explode(':', (string)$course->owner);
-
-                $result[] = [
-                    'ref_id'  => (string)$course->id,
-                    'title'   => (string)$course->description,
-                    'authors' => $temp[0],
-                    'type'    => $this->cms_type
-                ];
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/elearning/LonCapaConnectedCMS.php b/lib/elearning/LonCapaConnectedCMS.php
new file mode 100644
index 0000000..2f86aa8
--- /dev/null
+++ b/lib/elearning/LonCapaConnectedCMS.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * main-class for connection to LonCapa
+ *
+ * This class contains the main methods of the elearning-interface to connect to
+ * LonCapa. Extends ConnectedCMS.
+ *
+ * @access   public
+ * @modulegroup  elearning_interface_modules
+ * @module       LonCapaConnectedCMS
+ * @package  ELearning-Interface
+ */
+class LonCapaConnectedCMS extends ConnectedCMS
+{
+    public $user;
+    protected $seminarId;
+    protected $lcRequest;
+    protected $cmsUrl;
+
+    public function __construct($cms = '')
+    {
+        parent::__construct($cms);
+
+        $this->seminarId = Context::getId();
+        $this->user = User::findCurrent();
+        $this->lcRequest = new LonCapaRequest();
+        $this->cmsUrl = $this->ABSOLUTE_PATH_ELEARNINGMODULES;
+    }
+
+
+    /**
+     * search for content modules
+     *
+     * returns found content modules
+     * @throws AccessDeniedException
+     * @param string $key keyword
+     * @return array list of content modules
+     */
+    public function searchContentModules($key)
+    {
+
+        if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->seminarId)) {
+            throw new AccessDeniedException();
+        }
+
+        $url = $this->cmsUrl . '/courses?search=' . urlencode($key) . '&owner=' . urlencode($this->user->username);
+        $response = $this->lcRequest->request($url);
+
+        if ($response) {
+            $courses = new SimpleXMLElement($response);
+
+            $result = [];
+            foreach ($courses->course as $course) {
+                $temp = explode(':', (string)$course->owner);
+
+                $result[] = [
+                    'ref_id'  => (string)$course->id,
+                    'title'   => (string)$course->description,
+                    'authors' => $temp[0],
+                    'type'    => $this->cms_type
+                ];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/elearning/LonCapaConnectedLink.class.php b/lib/elearning/LonCapaConnectedLink.class.php
deleted file mode 100644
index c00958b..0000000
--- a/lib/elearning/LonCapaConnectedLink.class.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- *
- * This class contains methods to generate links to LonCapa
- *
- * @modulegroup  elearning_interface_modules
- * @module       LonCapaConnectedLink
- * @package  ELearning-Interface
- */
-class LonCapaConnectedLink extends ConnectedLink
-{
-    /**
-     * get user module links
-     *
-     * returns content module links for user
-     * @return string html-code
-     */
-    public function getUserModuleLinks()
-    {
-        global $connected_cms, $current_module;
-
-        $url = URLHelper::getURL('dispatch.php/loncapa/enter', ['cms_type' => $this->cms_type, 'module' => $current_module]);
-
-        return Studip\LinkButton::create(_('Starten'), $url, [
-            'target' => '_blank',
-            'rel'    => 'noopener noreferrer',
-        ]);
-    }
-
-    /**
-     * get admin module links
-     *
-     * returns links add or remove a module from course
-     * @return string returns html-code
-     */
-    public function getAdminModuleLinks()
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-        global $template_factory;
-
-        $template = $template_factory->open('elearning/loncapa_connected_link_edit');
-        $template->current_module = $connected_cms[$this->cms_type]->content_module[$current_module]->getId();
-        $template->connected = $connected_cms[$this->cms_type]->content_module[$current_module]->isConnected();
-        $template->cms_type = $this->cms_type;
-        $template->search_key = $search_key;
-        return $template->render(compact('view', 'search_key', 'cms_select', 'current_module'));
-    }
-
-    /**
-     * returns url for connected LonCapa course
-     *
-     * @param string $module_id LonCapa ID
-     * @param string $course_id Stud.IP course ID
-     * @return string url for LonCapa
-     */
-    public function getRedirectUrl($module_id, $course_id)
-    {
-        return sprintf(
-            '%s/enter/%s?token=%s&courseid=%s&systemid=%s',
-            $this->cms_link,
-            $module_id,
-            Token::create(60),
-            $course_id,
-            $this->cms_type
-        );
-    }
-}
diff --git a/lib/elearning/LonCapaConnectedLink.php b/lib/elearning/LonCapaConnectedLink.php
new file mode 100644
index 0000000..c00958b
--- /dev/null
+++ b/lib/elearning/LonCapaConnectedLink.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ *
+ * This class contains methods to generate links to LonCapa
+ *
+ * @modulegroup  elearning_interface_modules
+ * @module       LonCapaConnectedLink
+ * @package  ELearning-Interface
+ */
+class LonCapaConnectedLink extends ConnectedLink
+{
+    /**
+     * get user module links
+     *
+     * returns content module links for user
+     * @return string html-code
+     */
+    public function getUserModuleLinks()
+    {
+        global $connected_cms, $current_module;
+
+        $url = URLHelper::getURL('dispatch.php/loncapa/enter', ['cms_type' => $this->cms_type, 'module' => $current_module]);
+
+        return Studip\LinkButton::create(_('Starten'), $url, [
+            'target' => '_blank',
+            'rel'    => 'noopener noreferrer',
+        ]);
+    }
+
+    /**
+     * get admin module links
+     *
+     * returns links add or remove a module from course
+     * @return string returns html-code
+     */
+    public function getAdminModuleLinks()
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+        global $template_factory;
+
+        $template = $template_factory->open('elearning/loncapa_connected_link_edit');
+        $template->current_module = $connected_cms[$this->cms_type]->content_module[$current_module]->getId();
+        $template->connected = $connected_cms[$this->cms_type]->content_module[$current_module]->isConnected();
+        $template->cms_type = $this->cms_type;
+        $template->search_key = $search_key;
+        return $template->render(compact('view', 'search_key', 'cms_select', 'current_module'));
+    }
+
+    /**
+     * returns url for connected LonCapa course
+     *
+     * @param string $module_id LonCapa ID
+     * @param string $course_id Stud.IP course ID
+     * @return string url for LonCapa
+     */
+    public function getRedirectUrl($module_id, $course_id)
+    {
+        return sprintf(
+            '%s/enter/%s?token=%s&courseid=%s&systemid=%s',
+            $this->cms_link,
+            $module_id,
+            Token::create(60),
+            $course_id,
+            $this->cms_type
+        );
+    }
+}
diff --git a/lib/elearning/LonCapaContentModule.class.php b/lib/elearning/LonCapaContentModule.class.php
deleted file mode 100644
index 0f16cd0..0000000
--- a/lib/elearning/LonCapaContentModule.class.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- *
- * This class contains methods to handle LonCapa learning modules
- *
- * @modulegroup  elearning_interface_modules
- * @module       LonCapaContentModule
- * @package  ELearning-Interface
- */
-
-class LonCapaContentModule extends ContentModule
-{
-    /**
-     * @var LonCapaRequest
-     */
-    public $lcRequest;
-    /**
-     * @var string
-     */
-    public $cmsUrl;
-
-    /**
-     * LonCapaContentModule constructor.
-     * @param string $module_id
-     * @param string $module_type
-     * @param string $cms_type
-     */
-    public function __construct($module_id, $module_type, $cms_type)
-    {
-        $this->lcRequest = new LonCapaRequest();
-        $this->cmsUrl = $GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms_type]['ABSOLUTE_PATH_ELEARNINGMODULES'];
-
-        parent::__construct($module_id, $module_type, $cms_type);
-    }
-
-    /**
-     *fetch data from LonCapa
-     *
-     */
-    public function readData()
-    {
-        $url = $this->cmsUrl . '/course/' . urlencode($this->id);
-        $response = $this->lcRequest->request($url);
-
-        if ($response) {
-            $courses = new SimpleXMLElement($response);
-            $course = $courses->course[0];
-
-            list($author, $dummy) = explode(':', (string)$course->owner);
-
-            $this->id = (string)$course->id;
-            $this->title = (string)$course->description;
-            $this->authors = $author;
-        }
-
-    }
-
-    /**
-     * get permission-status
-     *
-     *
-     * @param string $operation operation
-     * @return boolean allowed
-     */
-    public function isAllowed($operation)
-    {
-        return true;
-    }
-
-    /**
-     * store connection between Stud.IP course and LonCapa course
-     *
-     * @param string $seminar_id
-     * @return bool
-     */
-    public function setConnection($seminar_id)
-    {
-        $this->is_connected = true;
-        return ObjectConnections::setConnection(
-            $seminar_id,
-            $this->id,
-            $this->module_type,
-            $this->cms_type
-        );
-    }
-}
diff --git a/lib/elearning/LonCapaContentModule.php b/lib/elearning/LonCapaContentModule.php
new file mode 100644
index 0000000..0f16cd0
--- /dev/null
+++ b/lib/elearning/LonCapaContentModule.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ *
+ * This class contains methods to handle LonCapa learning modules
+ *
+ * @modulegroup  elearning_interface_modules
+ * @module       LonCapaContentModule
+ * @package  ELearning-Interface
+ */
+
+class LonCapaContentModule extends ContentModule
+{
+    /**
+     * @var LonCapaRequest
+     */
+    public $lcRequest;
+    /**
+     * @var string
+     */
+    public $cmsUrl;
+
+    /**
+     * LonCapaContentModule constructor.
+     * @param string $module_id
+     * @param string $module_type
+     * @param string $cms_type
+     */
+    public function __construct($module_id, $module_type, $cms_type)
+    {
+        $this->lcRequest = new LonCapaRequest();
+        $this->cmsUrl = $GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms_type]['ABSOLUTE_PATH_ELEARNINGMODULES'];
+
+        parent::__construct($module_id, $module_type, $cms_type);
+    }
+
+    /**
+     *fetch data from LonCapa
+     *
+     */
+    public function readData()
+    {
+        $url = $this->cmsUrl . '/course/' . urlencode($this->id);
+        $response = $this->lcRequest->request($url);
+
+        if ($response) {
+            $courses = new SimpleXMLElement($response);
+            $course = $courses->course[0];
+
+            list($author, $dummy) = explode(':', (string)$course->owner);
+
+            $this->id = (string)$course->id;
+            $this->title = (string)$course->description;
+            $this->authors = $author;
+        }
+
+    }
+
+    /**
+     * get permission-status
+     *
+     *
+     * @param string $operation operation
+     * @return boolean allowed
+     */
+    public function isAllowed($operation)
+    {
+        return true;
+    }
+
+    /**
+     * store connection between Stud.IP course and LonCapa course
+     *
+     * @param string $seminar_id
+     * @return bool
+     */
+    public function setConnection($seminar_id)
+    {
+        $this->is_connected = true;
+        return ObjectConnections::setConnection(
+            $seminar_id,
+            $this->id,
+            $this->module_type,
+            $this->cms_type
+        );
+    }
+}
diff --git a/lib/elearning/LonCapaRequest.class.php b/lib/elearning/LonCapaRequest.class.php
deleted file mode 100644
index ecf3075..0000000
--- a/lib/elearning/LonCapaRequest.class.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- *
- * This class is used to communicate with LonCapa
- *
- * @depends curl
- * @modulegroup  elearning_interface_modules
- * @module       LonCapaContentModule
- * @package  ELearning-Interface
- */
-class LonCapaRequest
-{
-    /**
-     * options for curl
-     * @var array
-     */
-    protected $options;
-    /**
-     * curl resource
-     * @var resource
-     */
-    protected $ch;
-
-    /**
-     * LonCapaRequest constructor.
-     */
-    public function __construct()
-    {
-        $this->ch = curl_init();
-        $this->initOptions();
-    }
-
-    /**
-     * initializes curl options
-     */
-    public function initOptions()
-    {
-        $this->options = [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FOLLOWLOCATION => true,
-            //CURLOPT_CAINFO => '',
-            CURLOPT_SSL_VERIFYPEER => false,
-            CURLOPT_SSL_VERIFYHOST => false
-        ];
-    }
-
-    /**
-     * close connection
-     */
-    public function __destruct()
-    {
-        curl_close($this->ch);
-    }
-
-    /**
-     * set curl options
-     * @param $key
-     * @param $value
-     */
-    public function setOption($key, $value)
-    {
-        $this->options[$key] = $value;
-    }
-
-    /**
-     * do a curl request on the given url and return the result if successfull
-     *
-     * @param $url string
-     * @param array $postfields
-     * @return string
-     */
-    public function request($url, $postfields = null)
-    {
-        $result = $this->sendRequest($url, $postfields);
-        if ($result['statusCode'] == 200) {
-            return $result['response'];
-        } else {
-            // TODO: fehlermeldung wäre schöner
-            return null;
-        }
-    }
-
-    /**
-     * do a curl request on the given url and return the result if successfull
-     * @param $url string
-     * @param array $postfields
-     * @return array
-     */
-    protected function sendRequest($url, $postfields = null)
-    {
-        $options = $this->options;
-        $options[CURLOPT_URL] = $url;
-
-        if ($postfields) {
-            $options[CURLOPT_POST] = true;
-            $options[CURLOPT_POSTFIELDS] = $postfields;
-        }
-
-        curl_setopt_array($this->ch, $options);
-        $response = curl_exec($this->ch);
-
-        $statusCode = curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
-
-        if ($response === false) {
-            $last_error = curl_error($this->ch);
-            Log::error(__CLASS__ . ' curl_exec failed: ' . $last_error);
-        }
-        return compact('statusCode', 'response');
-    }
-}
diff --git a/lib/elearning/LonCapaRequest.php b/lib/elearning/LonCapaRequest.php
new file mode 100644
index 0000000..ecf3075
--- /dev/null
+++ b/lib/elearning/LonCapaRequest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ *
+ * This class is used to communicate with LonCapa
+ *
+ * @depends curl
+ * @modulegroup  elearning_interface_modules
+ * @module       LonCapaContentModule
+ * @package  ELearning-Interface
+ */
+class LonCapaRequest
+{
+    /**
+     * options for curl
+     * @var array
+     */
+    protected $options;
+    /**
+     * curl resource
+     * @var resource
+     */
+    protected $ch;
+
+    /**
+     * LonCapaRequest constructor.
+     */
+    public function __construct()
+    {
+        $this->ch = curl_init();
+        $this->initOptions();
+    }
+
+    /**
+     * initializes curl options
+     */
+    public function initOptions()
+    {
+        $this->options = [
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_FOLLOWLOCATION => true,
+            //CURLOPT_CAINFO => '',
+            CURLOPT_SSL_VERIFYPEER => false,
+            CURLOPT_SSL_VERIFYHOST => false
+        ];
+    }
+
+    /**
+     * close connection
+     */
+    public function __destruct()
+    {
+        curl_close($this->ch);
+    }
+
+    /**
+     * set curl options
+     * @param $key
+     * @param $value
+     */
+    public function setOption($key, $value)
+    {
+        $this->options[$key] = $value;
+    }
+
+    /**
+     * do a curl request on the given url and return the result if successfull
+     *
+     * @param $url string
+     * @param array $postfields
+     * @return string
+     */
+    public function request($url, $postfields = null)
+    {
+        $result = $this->sendRequest($url, $postfields);
+        if ($result['statusCode'] == 200) {
+            return $result['response'];
+        } else {
+            // TODO: fehlermeldung wäre schöner
+            return null;
+        }
+    }
+
+    /**
+     * do a curl request on the given url and return the result if successfull
+     * @param $url string
+     * @param array $postfields
+     * @return array
+     */
+    protected function sendRequest($url, $postfields = null)
+    {
+        $options = $this->options;
+        $options[CURLOPT_URL] = $url;
+
+        if ($postfields) {
+            $options[CURLOPT_POST] = true;
+            $options[CURLOPT_POSTFIELDS] = $postfields;
+        }
+
+        curl_setopt_array($this->ch, $options);
+        $response = curl_exec($this->ch);
+
+        $statusCode = curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
+
+        if ($response === false) {
+            $last_error = curl_error($this->ch);
+            Log::error(__CLASS__ . ' curl_exec failed: ' . $last_error);
+        }
+        return compact('statusCode', 'response');
+    }
+}
diff --git a/lib/elearning/ObjectConnections.class.php b/lib/elearning/ObjectConnections.class.php
deleted file mode 100644
index e360f71..0000000
--- a/lib/elearning/ObjectConnections.class.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: TODO
-/**
-* class to handle object connections
-*
-* This class contains methods to handle connections between stud.ip-objects and external content.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ObjectConnections
-* @package  ELearning-Interface
-*/
-class ObjectConnections
-{
-    var $id;
-    var $object_connections;
-    /**
-    * constructor
-    *
-    * init class.
-    * @access public
-    * @param string $object_id object-id
-    */
-    function __construct($object_id = "")
-    {
-        $this->id = $object_id;
-        if ($object_id != "")
-            $this->readData();
-    }
-
-    /**
-    * read object connections
-    *
-    * gets object connections from database
-    * @access public
-    */
-    function readData()
-    {
-        global $ELEARNING_INTERFACE_MODULES;
-
-        $this->object_connections = [];
-
-        $query = "SELECT system_type, module_type, module_id, chdate
-                  FROM object_contentmodules
-                  WHERE object_id = ?
-                  ORDER BY chdate DESC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->id]);
-
-        $module_count = 0;
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            // show only connected modules with valid module-type
-            if ($ELEARNING_INTERFACE_MODULES[$row['system_type']]['types'][$row['module_type']] == '') {
-                continue;
-            }
-            $module_count += 1;
-            $d_system_type = $row['system_type'];
-            $d_module_type = $row['module_type'];
-            $d_module_id   = $row['module_id'];
-
-            $reference = $d_system_type . '_' . $d_module_type . '_' . $d_module_id;
-            $this->object_connections[$reference]['cms']    = $d_system_type;
-            $this->object_connections[$reference]['type']   = $d_module_type;
-            $this->object_connections[$reference]['id']     = $d_module_id;
-            $this->object_connections[$reference]['chdate'] = $row['chdate'];
-        }
-
-        if ($module_count == 0) {
-            $this->object_connections = false;
-        }
-    }
-
-    /**
-    * get object connections
-    *
-    * returns object connections
-    * @access public
-    * @return array object connections
-    */
-    function getConnections()
-    {
-        return $this->object_connections;
-    }
-
-    /**
-    * get connection-status
-    *
-    * returns true, if object has connections
-    * @access public
-    * @return boolean connection-status
-    */
-    function isConnected()
-    {
-        return (boolean) $this->object_connections;
-    }
-
-    /**
-     * get connection-status
-     *
-     * returns true, if object has connections
-     * @access public
-     * @param string $object_id object-id (optional)
-     * @return boolean connection-status
-     */
-    public static function isObjectConnected($object_id)
-    {
-        $query = "SELECT 1 FROM object_contentmodules WHERE object_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$object_id]);
-        return (bool)$statement->fetchColumn();
-    }
-
-    /**
-    * get module-id
-    *
-    * returns module-id of given connection
-    * @access public
-    * @param string $connection_object_id object-id
-    * @param string $connection_module_type module-type
-    * @param string $connection_cms system-type
-    * @return string module-id
-    */
-    public static function getConnectionModuleId($connection_object_id, $connection_module_type, $connection_cms)
-    {
-        $query = "SELECT module_id
-                  FROM object_contentmodules
-                  WHERE object_id = ? AND system_type = ? AND module_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $connection_object_id,
-            $connection_cms,
-            $connection_module_type
-        ]);
-        return $statement->fetchColumn() ?: false;
-    }
-
-    /**
-    * set connection
-    *
-    * sets connection with object
-    * @access public
-    * @param string $connection_object_id object-id
-    * @param string $connection_module_id module-id
-    * @param string $connection_module_type module-type
-    * @param string $connection_cms system-type
-    * @return boolean successful
-    */
-    public static function setConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
-    {
-        $query = "SELECT 1
-                  FROM object_contentmodules
-                  WHERE object_id = ? AND module_id = ? AND system_type = ?
-                    AND module_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $connection_object_id,
-            $connection_module_id,
-            $connection_cms,
-            $connection_module_type
-        ]);
-        $check = $statement->fetchColumn();
-
-        if ($check) {
-            $query = "UPDATE object_contentmodules
-                      SET module_type = ?, chdate = UNIX_TIMESTAMP()
-                      WHERE object_id = ? AND module_id = ? AND system_type = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $connection_module_type,
-                $connection_object_id,
-                $connection_module_id,
-                $connection_cms
-            ]);
-        } else {
-            $query = "INSERT INTO object_contentmodules
-                        (object_id, module_id, system_type, module_type, mkdate, chdate)
-                      VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $connection_object_id,
-                $connection_module_id,
-                $connection_cms,
-                $connection_module_type
-            ]);
-        }
-        return true;
-    }
-
-    /**
-    * unset connection
-    *
-    * deletes connection with object
-    * @access public
-    * @param string $connection_object_id object-id
-    * @param string $connection_module_id module-id
-    * @param string $connection_module_type module-type
-    * @param string $connection_cms system-type
-    * @return boolean successful
-    */
-    public static function unsetConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
-    {
-        $query = "SELECT 1
-                  FROM object_contentmodules
-                  WHERE object_id = ? AND module_id = ? AND system_type = ?
-                    AND module_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $connection_object_id,
-            $connection_module_id,
-            $connection_cms,
-            $connection_module_type
-        ]);
-        $check = $statement->fetchColumn();
-
-
-        if ($check) {
-            $query = "DELETE FROM object_contentmodules
-                      WHERE object_id = ? AND module_id = ? AND system_type = ?
-                        AND module_type = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $connection_object_id,
-                $connection_module_id,
-                $connection_cms,
-                $connection_module_type
-            ]);
-            return true;
-        }
-        return false;
-    }
-
-    public static function GetConnectedSystems($object_id)
-    {
-        $query = "SELECT DISTINCT system_type
-                  FROM object_contentmodules
-                  WHERE object_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$object_id]);
-        return $statement->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    public static function DeleteAllConnections($object_id, $cms_type)
-    {
-        $query = "DELETE FROM object_contentmodules
-                  WHERE object_id = ? AND system_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$object_id, $cms_type]);
-        return $statement->rowCount();
-    }
-}
diff --git a/lib/elearning/ObjectConnections.php b/lib/elearning/ObjectConnections.php
new file mode 100644
index 0000000..e360f71
--- /dev/null
+++ b/lib/elearning/ObjectConnections.php
@@ -0,0 +1,254 @@
+<?php
+# Lifter002: DONE
+# Lifter003: TEST
+# Lifter007: TODO
+# Lifter010: TODO
+/**
+* class to handle object connections
+*
+* This class contains methods to handle connections between stud.ip-objects and external content.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ObjectConnections
+* @package  ELearning-Interface
+*/
+class ObjectConnections
+{
+    var $id;
+    var $object_connections;
+    /**
+    * constructor
+    *
+    * init class.
+    * @access public
+    * @param string $object_id object-id
+    */
+    function __construct($object_id = "")
+    {
+        $this->id = $object_id;
+        if ($object_id != "")
+            $this->readData();
+    }
+
+    /**
+    * read object connections
+    *
+    * gets object connections from database
+    * @access public
+    */
+    function readData()
+    {
+        global $ELEARNING_INTERFACE_MODULES;
+
+        $this->object_connections = [];
+
+        $query = "SELECT system_type, module_type, module_id, chdate
+                  FROM object_contentmodules
+                  WHERE object_id = ?
+                  ORDER BY chdate DESC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->id]);
+
+        $module_count = 0;
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            // show only connected modules with valid module-type
+            if ($ELEARNING_INTERFACE_MODULES[$row['system_type']]['types'][$row['module_type']] == '') {
+                continue;
+            }
+            $module_count += 1;
+            $d_system_type = $row['system_type'];
+            $d_module_type = $row['module_type'];
+            $d_module_id   = $row['module_id'];
+
+            $reference = $d_system_type . '_' . $d_module_type . '_' . $d_module_id;
+            $this->object_connections[$reference]['cms']    = $d_system_type;
+            $this->object_connections[$reference]['type']   = $d_module_type;
+            $this->object_connections[$reference]['id']     = $d_module_id;
+            $this->object_connections[$reference]['chdate'] = $row['chdate'];
+        }
+
+        if ($module_count == 0) {
+            $this->object_connections = false;
+        }
+    }
+
+    /**
+    * get object connections
+    *
+    * returns object connections
+    * @access public
+    * @return array object connections
+    */
+    function getConnections()
+    {
+        return $this->object_connections;
+    }
+
+    /**
+    * get connection-status
+    *
+    * returns true, if object has connections
+    * @access public
+    * @return boolean connection-status
+    */
+    function isConnected()
+    {
+        return (boolean) $this->object_connections;
+    }
+
+    /**
+     * get connection-status
+     *
+     * returns true, if object has connections
+     * @access public
+     * @param string $object_id object-id (optional)
+     * @return boolean connection-status
+     */
+    public static function isObjectConnected($object_id)
+    {
+        $query = "SELECT 1 FROM object_contentmodules WHERE object_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$object_id]);
+        return (bool)$statement->fetchColumn();
+    }
+
+    /**
+    * get module-id
+    *
+    * returns module-id of given connection
+    * @access public
+    * @param string $connection_object_id object-id
+    * @param string $connection_module_type module-type
+    * @param string $connection_cms system-type
+    * @return string module-id
+    */
+    public static function getConnectionModuleId($connection_object_id, $connection_module_type, $connection_cms)
+    {
+        $query = "SELECT module_id
+                  FROM object_contentmodules
+                  WHERE object_id = ? AND system_type = ? AND module_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $connection_object_id,
+            $connection_cms,
+            $connection_module_type
+        ]);
+        return $statement->fetchColumn() ?: false;
+    }
+
+    /**
+    * set connection
+    *
+    * sets connection with object
+    * @access public
+    * @param string $connection_object_id object-id
+    * @param string $connection_module_id module-id
+    * @param string $connection_module_type module-type
+    * @param string $connection_cms system-type
+    * @return boolean successful
+    */
+    public static function setConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
+    {
+        $query = "SELECT 1
+                  FROM object_contentmodules
+                  WHERE object_id = ? AND module_id = ? AND system_type = ?
+                    AND module_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $connection_object_id,
+            $connection_module_id,
+            $connection_cms,
+            $connection_module_type
+        ]);
+        $check = $statement->fetchColumn();
+
+        if ($check) {
+            $query = "UPDATE object_contentmodules
+                      SET module_type = ?, chdate = UNIX_TIMESTAMP()
+                      WHERE object_id = ? AND module_id = ? AND system_type = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $connection_module_type,
+                $connection_object_id,
+                $connection_module_id,
+                $connection_cms
+            ]);
+        } else {
+            $query = "INSERT INTO object_contentmodules
+                        (object_id, module_id, system_type, module_type, mkdate, chdate)
+                      VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $connection_object_id,
+                $connection_module_id,
+                $connection_cms,
+                $connection_module_type
+            ]);
+        }
+        return true;
+    }
+
+    /**
+    * unset connection
+    *
+    * deletes connection with object
+    * @access public
+    * @param string $connection_object_id object-id
+    * @param string $connection_module_id module-id
+    * @param string $connection_module_type module-type
+    * @param string $connection_cms system-type
+    * @return boolean successful
+    */
+    public static function unsetConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
+    {
+        $query = "SELECT 1
+                  FROM object_contentmodules
+                  WHERE object_id = ? AND module_id = ? AND system_type = ?
+                    AND module_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $connection_object_id,
+            $connection_module_id,
+            $connection_cms,
+            $connection_module_type
+        ]);
+        $check = $statement->fetchColumn();
+
+
+        if ($check) {
+            $query = "DELETE FROM object_contentmodules
+                      WHERE object_id = ? AND module_id = ? AND system_type = ?
+                        AND module_type = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $connection_object_id,
+                $connection_module_id,
+                $connection_cms,
+                $connection_module_type
+            ]);
+            return true;
+        }
+        return false;
+    }
+
+    public static function GetConnectedSystems($object_id)
+    {
+        $query = "SELECT DISTINCT system_type
+                  FROM object_contentmodules
+                  WHERE object_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$object_id]);
+        return $statement->fetchAll(PDO::FETCH_COLUMN);
+    }
+
+    public static function DeleteAllConnections($object_id, $cms_type)
+    {
+        $query = "DELETE FROM object_contentmodules
+                  WHERE object_id = ? AND system_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$object_id, $cms_type]);
+        return $statement->rowCount();
+    }
+}
diff --git a/lib/elearning/PmWikiConnectedCMS.class.php b/lib/elearning/PmWikiConnectedCMS.class.php
deleted file mode 100644
index 7de0a78..0000000
--- a/lib/elearning/PmWikiConnectedCMS.class.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
- * PmWikiConnectedCMS.class.php - Provides search capabilities
- * to search WikiFarm
- *
- * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
- *
- * 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.
- */
-
-require_once 'clients/xml_rpc_webservice_client.php';
-require_once 'clients/soap_webservice_client.php';
-require_once 'clients/webservice_client.php';
-
-/**
-* main-class for connection to PmWiki
-*
-* This class contains the main methods of the elearning-interface to connect to PmWiki. Extends ConnectedCMS.
-*
-* @author   Marco Diedrich <mdiedric@uos.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       PmWikiConnectedCMS
-* @package  ELearning-Interface
-*/
-
-class PmWikiConnectedCMS extends ConnectedCMS
-{
-    public $client;
-    public $api_key;
-    public $field_script;
-
-    function __construct($cms)
-    {
-        parent::__construct($cms);
-        $this->client = WebserviceClient::instance( $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['ABSOLUTE_PATH_SOAP'] .
-                                                                                                '?' . $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['URL_PARAMS'],
-                                                                                                $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['WEBSERVICE_CLASS']);
-
-        $this->api_key = $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'];
-    }
-
-    function init($cms)
-    {
-        parent::init($cms);
-        $this->field_script = $GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms]["field_script"];
-    }
-
-    /**
-    * search for content modules
-    *
-    * returns found content modules
-    * @param string $key keyword
-    * @return array list of content modules
-    */
-    public function searchContentModules($key)
-    {
-        $fields_found = $this->client->call("search_content_modules", [
-            $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'],
-            $key
-        ]);
-
-        $result = [];
-        foreach ($fields_found as $field) {
-            $result[$field['field_id']] = [
-                'ref_id'      => $field['field_id'],
-                'type'        => $field['field_type'],
-                'obj_id'      => null,
-                'create_date' => $field['create_date'],
-                'last_update' => $field['change_date'],
-                'title'       => $field['field_title'],
-                'description' => $field['field_description'],
-            ];
-        }
-        return $result;
-    }
-
-}
diff --git a/lib/elearning/PmWikiConnectedCMS.php b/lib/elearning/PmWikiConnectedCMS.php
new file mode 100644
index 0000000..7de0a78
--- /dev/null
+++ b/lib/elearning/PmWikiConnectedCMS.php
@@ -0,0 +1,86 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/*
+ * PmWikiConnectedCMS.class.php - Provides search capabilities
+ * to search WikiFarm
+ *
+ * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
+ *
+ * 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.
+ */
+
+require_once 'clients/xml_rpc_webservice_client.php';
+require_once 'clients/soap_webservice_client.php';
+require_once 'clients/webservice_client.php';
+
+/**
+* main-class for connection to PmWiki
+*
+* This class contains the main methods of the elearning-interface to connect to PmWiki. Extends ConnectedCMS.
+*
+* @author   Marco Diedrich <mdiedric@uos.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       PmWikiConnectedCMS
+* @package  ELearning-Interface
+*/
+
+class PmWikiConnectedCMS extends ConnectedCMS
+{
+    public $client;
+    public $api_key;
+    public $field_script;
+
+    function __construct($cms)
+    {
+        parent::__construct($cms);
+        $this->client = WebserviceClient::instance( $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['ABSOLUTE_PATH_SOAP'] .
+                                                                                                '?' . $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['URL_PARAMS'],
+                                                                                                $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['WEBSERVICE_CLASS']);
+
+        $this->api_key = $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'];
+    }
+
+    function init($cms)
+    {
+        parent::init($cms);
+        $this->field_script = $GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms]["field_script"];
+    }
+
+    /**
+    * search for content modules
+    *
+    * returns found content modules
+    * @param string $key keyword
+    * @return array list of content modules
+    */
+    public function searchContentModules($key)
+    {
+        $fields_found = $this->client->call("search_content_modules", [
+            $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'],
+            $key
+        ]);
+
+        $result = [];
+        foreach ($fields_found as $field) {
+            $result[$field['field_id']] = [
+                'ref_id'      => $field['field_id'],
+                'type'        => $field['field_type'],
+                'obj_id'      => null,
+                'create_date' => $field['create_date'],
+                'last_update' => $field['change_date'],
+                'title'       => $field['field_title'],
+                'description' => $field['field_description'],
+            ];
+        }
+        return $result;
+    }
+
+}
diff --git a/lib/elearning/PmWikiConnectedLink.class.php b/lib/elearning/PmWikiConnectedLink.class.php
deleted file mode 100644
index 8ed7416..0000000
--- a/lib/elearning/PmWikiConnectedLink.class.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
- * PmWikiConnectedLink.class.php - Provides links to PmWiki Modules
- *
- * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
- *
- * 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.
- */
-
-use Studip\Button, Studip\LinkButton;
-
-require_once 'lib/webservices/api/studip_seminar.php';
-
-/**
-*
-* This class contains methods to generate links to PmWiki-Farm
-*
-* @author   Marco Diedrich <mdiedric@uos.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       PmWikiConnectedLink
-* @package  ELearning-Interface
-*/
-
-class PmWikiConnectedLink extends ConnectedLink
-{
-    function __construct($cms)
-    {
-        parent::__construct($cms);
-        $this->cms_link = "pmwiki_referrer.php";
-    }
-
-    /**
-    * get user module links
-    *
-    * returns content module links for user
-    * @access public
-    * @return string html-code
-    */
-
-    function getUserModuleLinks()
-    {
-        $range_id = Context::getId();
-        $username = get_username($GLOBALS['auth']->auth['uid']);
-
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        // hier muss die Authentifizierung mit übergeben werden...
-        //
-        if (Context::isCourse()) {
-            $context = 'seminar';
-
-            $status = StudipSeminarHelper::get_user_status($username, $range_id);
-
-        } else if (Context::isInstitute()) {
-            $context = 'institute';
-
-            $status = StudipInstituteHelper::get_user_status($username, $range_id);
-        }
-
-        ob_start(); ?>
-        <form method="post" target="_blank" rel="noopener noreferrer"
-              action="<?= $connected_cms[$this->cms_type]->content_module[$current_module]->link ?>">
-
-            <?= CSRFProtection::tokenTag() ?>
-            <input type='hidden'    name='authid'           value='<?= htmlReady($GLOBALS['auth']->auth['uname']) ?>'>
-            <input type='hidden'    name='authpw'           value='<?= htmlReady(Token::create()) ?>'>
-            <input type='hidden'    name='_permission'  value='<?= htmlReady($status) ?>'>
-            <input type='hidden'    name='_range_id'        value='<?= htmlReady($range_id) ?>'>
-            <input type='hidden'    name='_server'          value='<?= htmlReady(Config::get()->STUDIP_INSTALLATION_ID) ?>'>
-            <input type='hidden'    name='_context'         value='<?= htmlReady($context) ?>'>
-            <?= Button::createAccept(_('Starten')) ?>
-
-        </form>
-
-        <?php
-
-        $output = ob_get_contents();
-        ob_end_clean();
-        return $output;
-    }
-
-    /**
-    * get admin module links
-    *
-    * returns links add or remove a module from course
-    * @access public
-    * @return string returns html-code
-    */
-
-    function getAdminModuleLinks()
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        ob_start(); ?>
-
-        <form method="post" action="<?= URLHelper::getLink() ?>">
-            <?= CSRFProtection::tokenTag() ?>
-            <input type="hidden"    name="view"                             value="<?= htmlReady($view) ?>">
-            <input type="hidden"    name="search_key"               value="<?= htmlReady($search_key) ?>">
-            <input type="hidden"    name="cms_select"               value="<?= htmlReady($cms_select) ?>">
-            <input type="hidden"    name="module_type"              value="wiki">
-            <input type="hidden"    name="module_id"                    value="<?= htmlReady($current_module) ?>">
-            <input type="hidden"    name="module_system_type" value="<?= htmlReady($this->cms_type) ?>">
-
-            <?php if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected()) : ?>
-
-                &nbsp;<?= Button::create(_('Entfernen'), 'remove') ?>
-
-            <?php else :?>
-
-                &nbsp;<?= Button::create(_('Hinzufügen'), 'add') ?>
-
-            <?php endif ; ?>
-
-        </form>
-        <?php
-
-        $output = ob_get_contents();
-
-        ob_end_clean();
-
-        return $output;
-    }
-
-}
diff --git a/lib/elearning/PmWikiConnectedLink.php b/lib/elearning/PmWikiConnectedLink.php
new file mode 100644
index 0000000..8ed7416
--- /dev/null
+++ b/lib/elearning/PmWikiConnectedLink.php
@@ -0,0 +1,134 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/*
+ * PmWikiConnectedLink.class.php - Provides links to PmWiki Modules
+ *
+ * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
+ *
+ * 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.
+ */
+
+use Studip\Button, Studip\LinkButton;
+
+require_once 'lib/webservices/api/studip_seminar.php';
+
+/**
+*
+* This class contains methods to generate links to PmWiki-Farm
+*
+* @author   Marco Diedrich <mdiedric@uos.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       PmWikiConnectedLink
+* @package  ELearning-Interface
+*/
+
+class PmWikiConnectedLink extends ConnectedLink
+{
+    function __construct($cms)
+    {
+        parent::__construct($cms);
+        $this->cms_link = "pmwiki_referrer.php";
+    }
+
+    /**
+    * get user module links
+    *
+    * returns content module links for user
+    * @access public
+    * @return string html-code
+    */
+
+    function getUserModuleLinks()
+    {
+        $range_id = Context::getId();
+        $username = get_username($GLOBALS['auth']->auth['uid']);
+
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        // hier muss die Authentifizierung mit übergeben werden...
+        //
+        if (Context::isCourse()) {
+            $context = 'seminar';
+
+            $status = StudipSeminarHelper::get_user_status($username, $range_id);
+
+        } else if (Context::isInstitute()) {
+            $context = 'institute';
+
+            $status = StudipInstituteHelper::get_user_status($username, $range_id);
+        }
+
+        ob_start(); ?>
+        <form method="post" target="_blank" rel="noopener noreferrer"
+              action="<?= $connected_cms[$this->cms_type]->content_module[$current_module]->link ?>">
+
+            <?= CSRFProtection::tokenTag() ?>
+            <input type='hidden'    name='authid'           value='<?= htmlReady($GLOBALS['auth']->auth['uname']) ?>'>
+            <input type='hidden'    name='authpw'           value='<?= htmlReady(Token::create()) ?>'>
+            <input type='hidden'    name='_permission'  value='<?= htmlReady($status) ?>'>
+            <input type='hidden'    name='_range_id'        value='<?= htmlReady($range_id) ?>'>
+            <input type='hidden'    name='_server'          value='<?= htmlReady(Config::get()->STUDIP_INSTALLATION_ID) ?>'>
+            <input type='hidden'    name='_context'         value='<?= htmlReady($context) ?>'>
+            <?= Button::createAccept(_('Starten')) ?>
+
+        </form>
+
+        <?php
+
+        $output = ob_get_contents();
+        ob_end_clean();
+        return $output;
+    }
+
+    /**
+    * get admin module links
+    *
+    * returns links add or remove a module from course
+    * @access public
+    * @return string returns html-code
+    */
+
+    function getAdminModuleLinks()
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        ob_start(); ?>
+
+        <form method="post" action="<?= URLHelper::getLink() ?>">
+            <?= CSRFProtection::tokenTag() ?>
+            <input type="hidden"    name="view"                             value="<?= htmlReady($view) ?>">
+            <input type="hidden"    name="search_key"               value="<?= htmlReady($search_key) ?>">
+            <input type="hidden"    name="cms_select"               value="<?= htmlReady($cms_select) ?>">
+            <input type="hidden"    name="module_type"              value="wiki">
+            <input type="hidden"    name="module_id"                    value="<?= htmlReady($current_module) ?>">
+            <input type="hidden"    name="module_system_type" value="<?= htmlReady($this->cms_type) ?>">
+
+            <?php if ($connected_cms[$this->cms_type]->content_module[$current_module]->isConnected()) : ?>
+
+                &nbsp;<?= Button::create(_('Entfernen'), 'remove') ?>
+
+            <?php else :?>
+
+                &nbsp;<?= Button::create(_('Hinzufügen'), 'add') ?>
+
+            <?php endif ; ?>
+
+        </form>
+        <?php
+
+        $output = ob_get_contents();
+
+        ob_end_clean();
+
+        return $output;
+    }
+
+}
diff --git a/lib/elearning/PmWikiContentModule.class.php b/lib/elearning/PmWikiContentModule.class.php
deleted file mode 100644
index 06533dd..0000000
--- a/lib/elearning/PmWikiContentModule.class.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
- * PmWikiContentModule.class.php - Provides access PmWiki Modules
- *
- * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
- *
- * 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 class contains methods to handle PmWiki learning modules
-*
-* @author   Marco Diedrich <mdiedric@uos.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       PmWikiContentModule
-* @package  ELearning-Interface
-*/
-
-class PmWikiContentModule extends ContentModule
-{
-    public $link;
-    public $client;
-    public $chdate;
-    public $accepted_users;
-
-    /**
-    * constructor
-    *
-    * init class.
-    * @access public
-    * @param string $module_id module-id
-    * @param string $module_type module-type
-    * @param string $cms_type system-type
-    */
-
-    function __construct($module_id, $module_type, $cms_type)
-    {
-        parent::__construct($module_id, $module_type, $cms_type);
-        $this->link = $GLOBALS['connected_cms'][$this->cms_type]->ABSOLUTE_PATH_ELEARNINGMODULES.$this->id."/";
-        $this->client = WebserviceClient::instance( $this->link. '?' .
-                                                    $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['URL_PARAMS'],
-                                                    $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['WEBSERVICE_CLASS']);
-    }
-
-    /**
-    * reads data for content module
-    *
-    */
-
-    function readData()
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        $args = [$GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'], $this->id];
-
-        $field_data = $connected_cms[$this->cms_type]->client->call('get_field_info', $args);
-
-        $this->title = $field_data['field_title'];
-        $this->authors = $field_data['field_author'];
-        $this->chdate = $field_data['change_date'];
-
-        $this->accepted_users = $field_data['field_accepted_users'];
-
-        return false;
-    }
-
-    /**
-    * get permission-status
-    *
-    * returns true, if operation is allowed
-    * @access public
-    * @param string $operation operation
-    * @return boolean allowed
-    */
-
-    function isAllowed($operation)
-    {
-        global $connected_cms, $view, $search_key, $cms_select, $current_module;
-
-        if (Config::get()->STUDIP_INSTALLATION_ID)
-        {
-            $username = Config::get()->STUDIP_INSTALLATION_ID."#".$GLOBALS['auth']->auth['uname'];
-        } else
-        {
-            $username = $GLOBALS['auth']->auth['uname'];
-        }
-
-        $args = [$GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'],$this->id, $username];
-
-        $authorized = $connected_cms[$this->cms_type]->client->call('field_accessable_by_user', $args);
-
-        if ($authorized)
-        {
-            return true;
-        } else
-        {
-            # old authorization
-            if (is_array($this->accepted_users) && in_array($username, $this->accepted_users))
-                return true;
-            else
-                return false;
-        }
-
-    }
-}
diff --git a/lib/elearning/PmWikiContentModule.php b/lib/elearning/PmWikiContentModule.php
new file mode 100644
index 0000000..06533dd
--- /dev/null
+++ b/lib/elearning/PmWikiContentModule.php
@@ -0,0 +1,115 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/*
+ * PmWikiContentModule.class.php - Provides access PmWiki Modules
+ *
+ * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
+ *
+ * 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 class contains methods to handle PmWiki learning modules
+*
+* @author   Marco Diedrich <mdiedric@uos.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       PmWikiContentModule
+* @package  ELearning-Interface
+*/
+
+class PmWikiContentModule extends ContentModule
+{
+    public $link;
+    public $client;
+    public $chdate;
+    public $accepted_users;
+
+    /**
+    * constructor
+    *
+    * init class.
+    * @access public
+    * @param string $module_id module-id
+    * @param string $module_type module-type
+    * @param string $cms_type system-type
+    */
+
+    function __construct($module_id, $module_type, $cms_type)
+    {
+        parent::__construct($module_id, $module_type, $cms_type);
+        $this->link = $GLOBALS['connected_cms'][$this->cms_type]->ABSOLUTE_PATH_ELEARNINGMODULES.$this->id."/";
+        $this->client = WebserviceClient::instance( $this->link. '?' .
+                                                    $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['URL_PARAMS'],
+                                                    $GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['WEBSERVICE_CLASS']);
+    }
+
+    /**
+    * reads data for content module
+    *
+    */
+
+    function readData()
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        $args = [$GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'], $this->id];
+
+        $field_data = $connected_cms[$this->cms_type]->client->call('get_field_info', $args);
+
+        $this->title = $field_data['field_title'];
+        $this->authors = $field_data['field_author'];
+        $this->chdate = $field_data['change_date'];
+
+        $this->accepted_users = $field_data['field_accepted_users'];
+
+        return false;
+    }
+
+    /**
+    * get permission-status
+    *
+    * returns true, if operation is allowed
+    * @access public
+    * @param string $operation operation
+    * @return boolean allowed
+    */
+
+    function isAllowed($operation)
+    {
+        global $connected_cms, $view, $search_key, $cms_select, $current_module;
+
+        if (Config::get()->STUDIP_INSTALLATION_ID)
+        {
+            $username = Config::get()->STUDIP_INSTALLATION_ID."#".$GLOBALS['auth']->auth['uname'];
+        } else
+        {
+            $username = $GLOBALS['auth']->auth['uname'];
+        }
+
+        $args = [$GLOBALS['ELEARNING_INTERFACE_MODULES'][$this->cms_type]['soap_data']['api-key'],$this->id, $username];
+
+        $authorized = $connected_cms[$this->cms_type]->client->call('field_accessable_by_user', $args);
+
+        if ($authorized)
+        {
+            return true;
+        } else
+        {
+            # old authorization
+            if (is_array($this->accepted_users) && in_array($username, $this->accepted_users))
+                return true;
+            else
+                return false;
+        }
+
+    }
+}
diff --git a/lib/exceptions/ClipboardException.class.php b/lib/exceptions/ClipboardException.class.php
deleted file mode 100644
index 676da93..0000000
--- a/lib/exceptions/ClipboardException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * ClipboardException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2019
- * @since       4.5
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a clipboard functionality cannot work
- * as expected.
- */
-class ClipboardException extends Exception
-{
-
-}
diff --git a/lib/exceptions/ClipboardException.php b/lib/exceptions/ClipboardException.php
new file mode 100644
index 0000000..676da93
--- /dev/null
+++ b/lib/exceptions/ClipboardException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * ClipboardException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2019
+ * @since       4.5
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a clipboard functionality cannot work
+ * as expected.
+ */
+class ClipboardException extends Exception
+{
+
+}
diff --git a/lib/exceptions/resources/GlobalResourceLockException.class.php b/lib/exceptions/resources/GlobalResourceLockException.class.php
deleted file mode 100644
index 165843f..0000000
--- a/lib/exceptions/resources/GlobalResourceLockException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * GlobalResourceLockException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- */
-
-/**
- * This exception is thrown when a general error occurs when dealing with
- * GlobalResourceLock objects.
- */
-class GlobalResourceLockException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/GlobalResourceLockException.php b/lib/exceptions/resources/GlobalResourceLockException.php
new file mode 100644
index 0000000..165843f
--- /dev/null
+++ b/lib/exceptions/resources/GlobalResourceLockException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * GlobalResourceLockException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ */
+
+/**
+ * This exception is thrown when a general error occurs when dealing with
+ * GlobalResourceLock objects.
+ */
+class GlobalResourceLockException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/GlobalResourceLockOverlapException.class.php b/lib/exceptions/resources/GlobalResourceLockOverlapException.class.php
deleted file mode 100644
index 6b05cf5..0000000
--- a/lib/exceptions/resources/GlobalResourceLockOverlapException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * GlobalResourceLockOverlapException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- */
-
-/**
- * This exception is thrown when a global resource lock overlaps
- * with another global resource lock.
- */
-class GlobalResourceLockOverlapException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/GlobalResourceLockOverlapException.php b/lib/exceptions/resources/GlobalResourceLockOverlapException.php
new file mode 100644
index 0000000..6b05cf5
--- /dev/null
+++ b/lib/exceptions/resources/GlobalResourceLockOverlapException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * GlobalResourceLockOverlapException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ */
+
+/**
+ * This exception is thrown when a global resource lock overlaps
+ * with another global resource lock.
+ */
+class GlobalResourceLockOverlapException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/InvalidResourceCategoryException.class.php b/lib/exceptions/resources/InvalidResourceCategoryException.class.php
deleted file mode 100644
index df4d36c..0000000
--- a/lib/exceptions/resources/InvalidResourceCategoryException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * InvalidResourceCategoryException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource category does not exist
- * or a resource is used with a resource category that does not match
- * or when a resource category cannot be created due to invalid data.
- */
-class InvalidResourceCategoryException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/InvalidResourceCategoryException.php b/lib/exceptions/resources/InvalidResourceCategoryException.php
new file mode 100644
index 0000000..df4d36c
--- /dev/null
+++ b/lib/exceptions/resources/InvalidResourceCategoryException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * InvalidResourceCategoryException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource category does not exist
+ * or a resource is used with a resource category that does not match
+ * or when a resource category cannot be created due to invalid data.
+ */
+class InvalidResourceCategoryException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/InvalidResourceClassException.class.php b/lib/exceptions/resources/InvalidResourceClassException.class.php
deleted file mode 100644
index 8420a83..0000000
--- a/lib/exceptions/resources/InvalidResourceClassException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * InvalidResourceClassException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a Resource object has an
- * invalid class_name property.
- */
-class InvalidResourceClassException extends Exception
-{
-
-}
diff --git a/lib/exceptions/resources/InvalidResourceClassException.php b/lib/exceptions/resources/InvalidResourceClassException.php
new file mode 100644
index 0000000..8420a83
--- /dev/null
+++ b/lib/exceptions/resources/InvalidResourceClassException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * InvalidResourceClassException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a Resource object has an
+ * invalid class_name property.
+ */
+class InvalidResourceClassException extends Exception
+{
+
+}
diff --git a/lib/exceptions/resources/InvalidResourceException.class.php b/lib/exceptions/resources/InvalidResourceException.class.php
deleted file mode 100644
index e9850b8..0000000
--- a/lib/exceptions/resources/InvalidResourceException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * InvalidResourceException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource is invalid,
- * either because of its place in the resource hierarchy
- * or because it has been initialised with the wrong Resource class.
- */
-class InvalidResourceException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/InvalidResourceException.php b/lib/exceptions/resources/InvalidResourceException.php
new file mode 100644
index 0000000..e9850b8
--- /dev/null
+++ b/lib/exceptions/resources/InvalidResourceException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * InvalidResourceException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource is invalid,
+ * either because of its place in the resource hierarchy
+ * or because it has been initialised with the wrong Resource class.
+ */
+class InvalidResourceException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/InvalidResourceRequestException.class.php b/lib/exceptions/resources/InvalidResourceRequestException.class.php
deleted file mode 100644
index 8ec9dab..0000000
--- a/lib/exceptions/resources/InvalidResourceRequestException.class.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * InvalidResourceRequestException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource request is invalid.
- */
-class InvalidResourceRequestException extends InvalidArgumentException
-{
-}
diff --git a/lib/exceptions/resources/InvalidResourceRequestException.php b/lib/exceptions/resources/InvalidResourceRequestException.php
new file mode 100644
index 0000000..8ec9dab
--- /dev/null
+++ b/lib/exceptions/resources/InvalidResourceRequestException.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * InvalidResourceRequestException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource request is invalid.
+ */
+class InvalidResourceRequestException extends InvalidArgumentException
+{
+}
diff --git a/lib/exceptions/resources/NoResourceClassException.class.php b/lib/exceptions/resources/NoResourceClassException.class.php
deleted file mode 100644
index 74e68fd..0000000
--- a/lib/exceptions/resources/NoResourceClassException.class.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-
-/**
- * This exception is thrown in cases where a class name of a
- * class which is derived from the base Resource class
- * is expected but not available.
- */
-class NoResourceClassException extends Exception
-{
-}
diff --git a/lib/exceptions/resources/NoResourceClassException.php b/lib/exceptions/resources/NoResourceClassException.php
new file mode 100644
index 0000000..74e68fd
--- /dev/null
+++ b/lib/exceptions/resources/NoResourceClassException.php
@@ -0,0 +1,11 @@
+<?php
+
+
+/**
+ * This exception is thrown in cases where a class name of a
+ * class which is derived from the base Resource class
+ * is expected but not available.
+ */
+class NoResourceClassException extends Exception
+{
+}
diff --git a/lib/exceptions/resources/ResourceBookingException.class.php b/lib/exceptions/resources/ResourceBookingException.class.php
deleted file mode 100644
index c1db11c..0000000
--- a/lib/exceptions/resources/ResourceBookingException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceBookingException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a general error occurs when dealing with
- * ResourceBooking objects.
- */
-class ResourceBookingException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceBookingException.php b/lib/exceptions/resources/ResourceBookingException.php
new file mode 100644
index 0000000..c1db11c
--- /dev/null
+++ b/lib/exceptions/resources/ResourceBookingException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceBookingException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a general error occurs when dealing with
+ * ResourceBooking objects.
+ */
+class ResourceBookingException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceBookingOverlapException.class.php b/lib/exceptions/resources/ResourceBookingOverlapException.class.php
deleted file mode 100644
index f59cc39..0000000
--- a/lib/exceptions/resources/ResourceBookingOverlapException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceBookingOverlapException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource booking overlaps with
- * other resource bookings or with a resource lock.
- */
-class ResourceBookingOverlapException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceBookingOverlapException.php b/lib/exceptions/resources/ResourceBookingOverlapException.php
new file mode 100644
index 0000000..f59cc39
--- /dev/null
+++ b/lib/exceptions/resources/ResourceBookingOverlapException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceBookingOverlapException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource booking overlaps with
+ * other resource bookings or with a resource lock.
+ */
+class ResourceBookingOverlapException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceBookingRangeException.class.php b/lib/exceptions/resources/ResourceBookingRangeException.class.php
deleted file mode 100644
index 50e7144..0000000
--- a/lib/exceptions/resources/ResourceBookingRangeException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceBookingRangeException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource booking has an invalid range-ID
- * or if a resource booking shall be created and no range-ID is given.
- */
-class ResourceBookingRangeException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceBookingRangeException.php b/lib/exceptions/resources/ResourceBookingRangeException.php
new file mode 100644
index 0000000..50e7144
--- /dev/null
+++ b/lib/exceptions/resources/ResourceBookingRangeException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceBookingRangeException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource booking has an invalid range-ID
+ * or if a resource booking shall be created and no range-ID is given.
+ */
+class ResourceBookingRangeException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceException.class.php b/lib/exceptions/resources/ResourceException.class.php
deleted file mode 100644
index 686cc33..0000000
--- a/lib/exceptions/resources/ResourceException.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * ResourceException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is a general exception in the resource management.
- */
-class ResourceException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceException.php b/lib/exceptions/resources/ResourceException.php
new file mode 100644
index 0000000..686cc33
--- /dev/null
+++ b/lib/exceptions/resources/ResourceException.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * ResourceException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is a general exception in the resource management.
+ */
+class ResourceException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceNoTimeRangeException.class.php b/lib/exceptions/resources/ResourceNoTimeRangeException.class.php
deleted file mode 100644
index 891b583..0000000
--- a/lib/exceptions/resources/ResourceNoTimeRangeException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceNoTimeRangeException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when at least one time range is required
- * in a method but no time range is provided.
- */
-class ResourceNoTimeRangeException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceNoTimeRangeException.php b/lib/exceptions/resources/ResourceNoTimeRangeException.php
new file mode 100644
index 0000000..891b583
--- /dev/null
+++ b/lib/exceptions/resources/ResourceNoTimeRangeException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceNoTimeRangeException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when at least one time range is required
+ * in a method but no time range is provided.
+ */
+class ResourceNoTimeRangeException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourcePermissionException.class.php b/lib/exceptions/resources/ResourcePermissionException.class.php
deleted file mode 100644
index 3a0c919..0000000
--- a/lib/exceptions/resources/ResourcePermissionException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourcePermissionException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when resource permissions are invalid
- * or insufficient to perform an action on a resource.
- */
-class ResourcePermissionException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourcePermissionException.php b/lib/exceptions/resources/ResourcePermissionException.php
new file mode 100644
index 0000000..3a0c919
--- /dev/null
+++ b/lib/exceptions/resources/ResourcePermissionException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourcePermissionException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when resource permissions are invalid
+ * or insufficient to perform an action on a resource.
+ */
+class ResourcePermissionException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourcePropertyDefinitionException.class.php b/lib/exceptions/resources/ResourcePropertyDefinitionException.class.php
deleted file mode 100644
index 963ca64..0000000
--- a/lib/exceptions/resources/ResourcePropertyDefinitionException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * ResourcePropertyDefinitionException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource property definition is requested
- * but not defined for the resource property or if it is defined
- * but cannot be stored.
- */
-class ResourcePropertyDefinitionException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourcePropertyDefinitionException.php b/lib/exceptions/resources/ResourcePropertyDefinitionException.php
new file mode 100644
index 0000000..963ca64
--- /dev/null
+++ b/lib/exceptions/resources/ResourcePropertyDefinitionException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * ResourcePropertyDefinitionException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource property definition is requested
+ * but not defined for the resource property or if it is defined
+ * but cannot be stored.
+ */
+class ResourcePropertyDefinitionException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourcePropertyException.class.php b/lib/exceptions/resources/ResourcePropertyException.class.php
deleted file mode 100644
index 83f871f..0000000
--- a/lib/exceptions/resources/ResourcePropertyException.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * ResourcePropertyException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource property is requested
- * but not defined for the resource type or if it is defined
- * but cannot be stored.
- */
-class ResourcePropertyException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourcePropertyException.php b/lib/exceptions/resources/ResourcePropertyException.php
new file mode 100644
index 0000000..83f871f
--- /dev/null
+++ b/lib/exceptions/resources/ResourcePropertyException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * ResourcePropertyException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource property is requested
+ * but not defined for the resource type or if it is defined
+ * but cannot be stored.
+ */
+class ResourcePropertyException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourcePropertyStateException.class.php b/lib/exceptions/resources/ResourcePropertyStateException.class.php
deleted file mode 100644
index 1880265..0000000
--- a/lib/exceptions/resources/ResourcePropertyStateException.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * ResourcePropertyStateException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource property state is invalid.
- */
-class ResourcePropertyStateException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourcePropertyStateException.php b/lib/exceptions/resources/ResourcePropertyStateException.php
new file mode 100644
index 0000000..1880265
--- /dev/null
+++ b/lib/exceptions/resources/ResourcePropertyStateException.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * ResourcePropertyStateException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource property state is invalid.
+ */
+class ResourcePropertyStateException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceRequestException.class.php b/lib/exceptions/resources/ResourceRequestException.class.php
deleted file mode 100644
index 1e8d071..0000000
--- a/lib/exceptions/resources/ResourceRequestException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceRequestException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource request cannot be stored
- * or another fatal error occurs when hanlding a ResourceRequest object.
- */
-class ResourceRequestException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceRequestException.php b/lib/exceptions/resources/ResourceRequestException.php
new file mode 100644
index 0000000..1e8d071
--- /dev/null
+++ b/lib/exceptions/resources/ResourceRequestException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceRequestException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource request cannot be stored
+ * or another fatal error occurs when hanlding a ResourceRequest object.
+ */
+class ResourceRequestException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceUnavailableException.class.php b/lib/exceptions/resources/ResourceUnavailableException.class.php
deleted file mode 100644
index b335d14..0000000
--- a/lib/exceptions/resources/ResourceUnavailableException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceUnavailableException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource is requested
- * but no resource request can be created for it.
- */
-class ResourceUnavailableException extends Exception
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceUnavailableException.php b/lib/exceptions/resources/ResourceUnavailableException.php
new file mode 100644
index 0000000..b335d14
--- /dev/null
+++ b/lib/exceptions/resources/ResourceUnavailableException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceUnavailableException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource is requested
+ * but no resource request can be created for it.
+ */
+class ResourceUnavailableException extends Exception
+{
+
+}
diff --git a/lib/exceptions/resources/ResourceUnlockableException.class.php b/lib/exceptions/resources/ResourceUnlockableException.class.php
deleted file mode 100644
index 11bc92b..0000000
--- a/lib/exceptions/resources/ResourceUnlockableException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * ResourceUnlockableException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is thrown when a resource shall be locked
- * but no resource lock can be created for it.
- */
-class ResourceUnlockableException extends Exception
-{
-
-}
diff --git a/lib/exceptions/resources/ResourceUnlockableException.php b/lib/exceptions/resources/ResourceUnlockableException.php
new file mode 100644
index 0000000..11bc92b
--- /dev/null
+++ b/lib/exceptions/resources/ResourceUnlockableException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * ResourceUnlockableException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is thrown when a resource shall be locked
+ * but no resource lock can be created for it.
+ */
+class ResourceUnlockableException extends Exception
+{
+
+}
diff --git a/lib/exceptions/resources/SeparableRoomException.class.php b/lib/exceptions/resources/SeparableRoomException.class.php
deleted file mode 100644
index 78c9912..0000000
--- a/lib/exceptions/resources/SeparableRoomException.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * SeparableRoomException.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * This exception is intended to be used in case of errors that are
- * related to separable rooms.
- */
-class SeparableRoomException extends InvalidArgumentException
-{
-
-}
diff --git a/lib/exceptions/resources/SeparableRoomException.php b/lib/exceptions/resources/SeparableRoomException.php
new file mode 100644
index 0000000..78c9912
--- /dev/null
+++ b/lib/exceptions/resources/SeparableRoomException.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * SeparableRoomException.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * This exception is intended to be used in case of errors that are
+ * related to separable rooms.
+ */
+class SeparableRoomException extends InvalidArgumentException
+{
+
+}
diff --git a/lib/filesystem/FileArchiveManager.class.php b/lib/filesystem/FileArchiveManager.class.php
deleted file mode 100644
index 704bb44..0000000
--- a/lib/filesystem/FileArchiveManager.class.php
+++ /dev/null
@@ -1,998 +0,0 @@
-<?php
-/**
- * FileArchiveManager.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2016 data-quest
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-
-/**
- * The FileArchiveManager class gives programmers a simple way to handle
- * file archives by providing different methods for packing and unpacking
- * file archives in a simple manner.
- */
-class FileArchiveManager
-{
-
-    //ARCHIVE HELPER METHODS
-
-
-    /**
-     * Adds a file to an archive using its FileType object.
-     *
-     * @param ZipArchive $archive The Zip archive where the FileRef shall be added to.
-     * @param FileType $file_type The FileType which shall be added to the zip archive.
-     * @param string $user_id The user who wishes to add the FileRef to the archive.
-     * @param string $archive_fs_path The path of the file inside the archive's file system.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
-     *     shall be checked. False otherwise. Default is true.
-     * @param bool $ignore_user Set to true, if a file
-     *     which has no download restrictions shall be included
-     *     and the user-specific download condition check shall be ignored.
-     *     If this parameter is set to true, the user_id parameter is irrelevant.
-     *     The default for this parameter is false.
-     * @return bool True on success, false on failure.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs a general exception or a more
-     *     special exception is thrown.
-     */
-    public static function addFileTypeToArchive(
-        ZipArchive $archive,
-        FileType $file_type,
-        $user_id = null,
-        $archive_fs_path = '',
-        $do_user_permission_checks = true,
-        $ignore_user = false,
-        &$file_list = null
-    )
-    {
-        $archive_max_size =  Config::get()->ZIP_DOWNLOAD_MAX_SIZE * 1024 * 1024;
-        //For FileRef objects we first have to do permission checks
-        //using the FileRef's folder object.
-        $adding_allowed = false;
-
-        if ($do_user_permission_checks) {
-            $folder = $file_type->getFolderType();
-            if (!$folder) {
-                return false;
-            }
-
-            if ($folder->isReadable($user_id) && $file_type->isDownloadable($user_id)) {
-                //FileRef is readable and downloadable for the user (identified by $user_id).
-                $adding_allowed = true;
-            }
-        } elseif ($ignore_user) {
-            //we have to check the download condition by looking at the
-            //terms of use object of the FileType:
-            $terms_of_use = $file_type->getTermsOfUse();
-            if ($terms_of_use && $terms_of_use->download_condition == 0) {
-                $adding_allowed = true;
-            }
-        } else {
-            //Totally skip permission checks:
-            $adding_allowed = true;
-        }
-
-        if ($adding_allowed) {
-            //Adding the FileType is allowed:
-            $file_contains_link = false;
-            if ($file_type instanceof LibraryFile) {
-                $file_contains_link = !$file_type->hasFileAttached();
-            } else {
-                $file_contains_link = $file_type instanceof URLFile;
-            }
-
-            // Increase download counter
-            if ($file_type instanceof StandardFile) {
-                $file_ref = $file_type->getFileRef();
-                $file_ref->incrementDownloadCounter();
-            }
-
-            if ($file_contains_link) {
-                //The FileType references a link:
-                //Put the URL into a file ending with .url:
-                $url = $file_type->getDownloadURL();
-                if ($url) {
-                    //The URL has been fetched and we can put it
-                    //in a file in the archive:
-                    $archive->addFromString(
-                        $archive_fs_path . FileManager::cleanFileName($file_type->getFilename()) . '.url',
-                        "[InternetShortcut]\nURL={$url}\n"
-                    );
-                    //Check the file size of the archive:
-                    if (file_exists($archive->filename) && filesize($archive->filename) > $archive_max_size) {
-                        throw new FileArchiveManagerException(
-                            sprintf(
-                                _('Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!'),
-                                relsize($archive_max_size)
-                            )
-                        );
-                    }
-                    if (is_array($file_list)) {
-                        $user = $file_type->getUser();
-                        $file_list[] = [
-                            'name' => FileManager::cleanFileName($file_type->getFilename()),
-                            'size' => $file_type->getSize(),
-                            'first_name' => ($user instanceof User) ? $user->vorname : '',
-                            'last_name' => ($user instanceof User) ? $user->nachname : '',
-                            'downloads' => $file_type->getDownloads(),
-                            'mkdate' => date('d.m.Y H:i', $file_type->getMakeDate()),
-                            'path' => ($archive_fs_path . $file_type->getFilename())
-                        ];
-                    }
-                    return true;
-                }
-            } else {
-                if (!($file_type instanceof StandardFile)) {
-                    $file_type = $file_type->convertToStandardFile();
-                }
-                if (!($file_type instanceof StandardFile)) {
-                    //The file type could not be converted to a standard file.
-                    //We cannot continue.
-                    return false;
-                }
-                //Get the file's path (if the file exists) and add the file to the archive:
-                $path = $file_type->getPath();
-                if ($path) {
-                    //It is a file in the file system:
-                    if (file_exists($path)) {
-                        $archive->addFile($path, $archive_fs_path . FileManager::cleanFileName($file_type->getFilename()));
-                        //Check the file size of the archive:
-                        if (file_exists($archive->filename) && filesize($archive->filename) > $archive_max_size) {
-                            throw new FileArchiveManagerException(
-                                sprintf(
-                                    _('Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!'),
-                                    relsize($archive_max_size)
-                                )
-                            );
-                        }
-                        //Add the file to the file list (if available):
-                        if (is_array($file_list)) {
-                            $archive_max_num_files = Config::get()->ZIP_DOWNLOAD_MAX_FILES;
-                            $archive_max_size =  Config::get()->ZIP_DOWNLOAD_MAX_SIZE * 1024 * 1024; //1048576 bytes = 1 Mebibyte
-                            $user = $file_type->getUser();
-                            $file_list[] = [
-                                'name' => FileManager::cleanFileName($file_type->getFilename()),
-                                'size' => $file_type->getSize(),
-                                'first_name' => ($user instanceof User) ? $user->vorname : '',
-                                'last_name' => ($user instanceof User) ? $user->nachname : '',
-                                'downloads' => $file_type->getDownloads(),
-                                'mkdate' => date('d.m.Y H:i', $file_type->getMakeDate()),
-                                'path' => ($archive_fs_path . FileManager::cleanFileName($file_type->getFilename()))
-                            ];
-                            if (count($file_list) > $archive_max_num_files) {
-                                $archive->unchangeAll();
-                                unlink($archive->filename);
-                                throw new FileArchiveManagerException(
-                                    sprintf(
-                                        _('Das Archiv beinhaltet zu viele Dateibereich-Objekte! Die Obergrenze liegt bei %d Objekten!'),
-                                        $archive_max_num_files
-                                    )
-                                );
-                            }
-                            if (array_sum(array_column($file_list, 'size')) > $archive_max_size) {
-                                $archive->unchangeAll();
-                                unlink($archive->filename);
-                                throw new FileArchiveManagerException(
-                                    sprintf(
-                                        _('Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!'),
-                                        relsize($archive_max_size)
-                                    )
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //Something must have gone wrong:
-        return false;
-    }
-
-
-    /**
-     * Adds a FileRef to a Zip archive.
-     * This is only a wrapper to addFileTypeToArchive that exists only
-     * for compatibility reasons.
-     *
-     * @see addFileTypeToArchive
-     */
-    public static function addFileRefToArchive(
-        ZipArchive $archive,
-        FileRef $file_ref,
-        $user_id = null,
-        $archive_fs_path = '',
-        $do_user_permission_checks = true,
-        $ignore_user = false,
-        &$file_list = null
-    )
-    {
-        $file_type = $file_ref->getFileType();
-        if ($file_type instanceof FileType) {
-            return self::addFileTypeToArchive(
-                $archive,
-                $file_type,
-                $user_id,
-                $archive_fs_path,
-                $do_user_permission_checks,
-                $ignore_user,
-                $file_list
-            );
-        }
-        //The file type variable does not contain a FileType object.
-        return false;
-    }
-
-
-    /**
-     * Adds a FolderType instance to a Zip archive.
-     *
-     * @param ZipArchive $archive The Zip archive where the FileRef shall be added to.
-     * @param FileRef $file_ref The FileRef which shall be added to the zip archive.
-     * @param string $user_id The user who wishes to add the FileRef to the archive.
-     * @param string $archive_fs_path The path of the folder inside the archive's file system.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
-     *     shall be checked. False otherwise. Default is true.
-     * @param bool $keep_hierarchy True, if the folder hierarchy shall be kept.
-     *     False, if the folder hierarchy shall be flattened.
-     * @param bool $ignore_user Set to true, if a folder
-     *     of type StandardFolder shall be included without checking
-     *     if the user (identified by user_id) can read it.
-     * @return bool True on success, false on failure.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs a general exception or a more
-     *     special exception is thrown.
-     */
-    public static function addFolderToArchive(
-        ZipArchive $archive,
-        FolderType $folder,
-        $user_id = null,
-        $archive_fs_path = '',
-        $do_user_permission_checks = true,
-        $keep_hierarchy = true,
-        $ignore_user = false,
-        &$file_list = null
-    ) {
-
-        if ($do_user_permission_checks) {
-            //Check if the folder is readable for the user (identified by $user_id):
-            if (!$folder->isReadable($user_id)) {
-                //Folder is not readable:
-                return false;
-            }
-        } elseif ($ignore_user
-                  && !($folder instanceof StandardFolder)
-                  && in_array($folder->range_type, ['course', 'institute']))
-        {
-            //If user permissions shall be skipped the folder must be
-            //an instance of StandardFolder and the folder's range type
-            //must be course or institute since we can only be sure
-            //that StandardFolder instances in courses or institutes
-            //are readable by everyone.
-            return false;
-        }
-
-        $folder_zip_path = $archive_fs_path;
-        if ($keep_hierarchy) {
-            $folder_zip_path .= FileManager::cleanFileName($folder->name);
-            $archive->addEmptyDir($folder_zip_path);
-        }
-        foreach ($folder->getFiles() as $file) {
-
-            /*if (!$file_ref instanceof FileRef) { TODO: OwnCloudPlugin is this ready?
-                $plugin = PluginManager::getInstance()->getPlugin($folder->range_id);
-                if (!$plugin) {
-                    $plugin = PluginManager::getInstance()->getPlugin($folder->range_type);;
-                }
-                if ($plugin) {
-                    $file_ref = $plugin->getPreparedFile($file_ref->id, true);
-                }
-            }*/
-
-            self::addFileTypeToArchive(
-                $archive,
-                $file,
-                $user_id,
-                //keep hierarchy in zip file (files and subdirectories)
-                $keep_hierarchy ? $folder_zip_path . '/' : '',
-                $do_user_permission_checks,
-                $ignore_user,
-                $file_list
-            );
-        }
-
-        foreach ($folder->getSubfolders() as $subfolder) {
-            self::addFolderToArchive(
-                $archive,
-                $subfolder,
-                $user_id,
-                //keep hierarchy in zip file (files and subdirectories)
-                $keep_hierarchy ? $folder_zip_path . '/' : '',
-                $do_user_permission_checks,
-                $keep_hierarchy,
-                $ignore_user,
-                $file_list
-            );
-        }
-
-        return true;
-    }
-
-
-    //ARCHIVE CREATION METHODS
-
-
-    /**
-     * General method for creating file archives.
-     *
-     * This method is a generalisation for all archive creation methods.
-     * For easier archive creation you may use the other archive creation
-     * methods which work with less arguments.
-     *
-     * @param Array $file_area_objects Array of FileRef, FileURL, Folder or FolderType objects.
-     *     $file_area_objects may contain a mix between those object types.
-     * @param string $user_id The user who wishes to pack files.
-     * @param string $archive_file_path The path for the archive file.
-     * @param bool $do_user_permission_checks Set to true if individual
-     *     reading/downloading permissions shall be checked. False otherwise.
-     *     Default is true.
-     * @param bool $keep_hierarchy True, if the folder hierarchy shall be kept.
-     *     False, if the folder hierarchy shall be flattened. Default is true.
-     * @param bool $ignore_user Set to true, if all files
-     *     which have no download restrictions and all folders which are of type
-     *     StandardFolder shall be included and the user-specific
-     *     download condition check shall be ignored.
-     *     If this parameter is set to true, the user_id parameter is irrelevant.
-     *     The default for this parameter is false.
-     * @param string $zip_encoding encoding for filenames in zip
-     * @param bool $add_filelist_to_archive If this is set to true a file list
-     *     in the CSV format will be added to the archive. Its name is hardcoded
-     *     to archive_filelist.csv. The default value of $add_filelist_to_archive
-     *     is false which means no file list is added.
-     *
-     * @return bool True, if the archive file was created and saved successfully
-     *     at $archive_file_path, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs a general exception or a more
-     *     special exception is thrown.
-     */
-    public static function createArchive(
-        $file_area_objects = [],
-        $user_id = null,
-        $archive_file_path = '',
-        $do_user_permission_checks = true,
-        $keep_hierarchy = true,
-        $ignore_user = false,
-        $zip_encoding = 'UTF-8',
-        $add_filelist_to_archive = false
-    )
-    {
-
-        // check if archive path is set:
-        if (!$archive_file_path) {
-            throw new FileArchiveManagerException(
-                _('Der Zielpfad für das Archiv wurde nicht angegeben!')
-            );
-        }
-
-        // $file_area_objects must be a non-empty array!
-        // Otherwise we would return an empty Zip archive.
-        if (!is_array($file_area_objects) || empty($file_area_objects)) {
-            throw new FileArchiveManagerException(
-                _('Es wurden keine Dateien ausgewählt!')
-            );
-        }
-
-        // We can create the Zip archive now since its path exists in the file system
-        // and furthermore there are file area objects available.
-        $archive = new Studip\ZipArchive();
-        if (!$archive->open($archive_file_path, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
-            throw new FileArchiveManagerException('Error opening new ZIP archive!');
-        }
-        $archive->setOutputEncoding($zip_encoding);
-
-        //If $file_list is not an array
-        //then no files are added to the file list.
-        $file_list = null;
-        if ($add_filelist_to_archive) {
-            $file_list = [];
-        }
-
-        foreach ($file_area_objects as $file_area_object) {
-            if ($file_area_object instanceof FileRef) {
-                self::addFileRefToArchive(
-                    $archive,
-                    $file_area_object,
-                    $user_id,
-                    '',
-                    $do_user_permission_checks,
-                    $ignore_user,
-                    $file_list
-                );
-            } elseif ($file_area_object instanceof FileType) {
-                self::addFileTypeToArchive(
-                    $archive,
-                    $file_area_object,
-                    $user_id,
-                    '',
-                    $do_user_permission_checks,
-                    $ignore_user,
-                    $file_list
-                );
-            } elseif ($file_area_object instanceof Folder || $file_area_object instanceof FolderType) {
-                $folder = $file_area_object;
-                if ($folder instanceof Folder) {
-                    //We use FolderType instances here.
-                    $folder = $folder->getTypedFolder();
-                }
-
-                self::addFolderToArchive(
-                    $archive,
-                    $folder,
-                    $user_id,
-                    '',
-                    $do_user_permission_checks,
-                    $keep_hierarchy,
-                    $ignore_user,
-                    $file_list
-                );
-            }
-        }
-
-        if ($archive->numFiles > 0) {
-            //At least one file is in the archive.
-
-            if ($add_filelist_to_archive) {
-                //If a file list shall be included in the ZIP archive
-                //we must now make a CSV file out of file_list:
-
-                $csv_data = array_merge(
-                    [
-                        [
-                            _('Name'),
-                            _('Größe'),
-                            _('Vorname'),
-                            _('Nachname'),
-                            _('Downloads'),
-                            _('Datum'),
-                            _('Pfad')
-                        ]
-                    ],
-                    $file_list
-                );
-
-                //The CSV file has been generated.
-                //Now we must add it to the archive:
-                $archive->addFromString('archive_filelist.csv', array_to_csv($csv_data));
-            }
-
-            //Now the ZIP file is really finished:
-            return $archive->close();
-        }
-
-        //empty archive
-        throw new FileArchiveManagerException(
-            _('Das ZIP Archiv enthält keine Dateien!')
-        );
-    }
-
-    /**
-     * Puts files (identified by their file refs) into one file archive.
-     *
-     * @param FileRef[] $file_refs Array of FileRef objects.
-     * @param User $user The user who wishes to pack files.
-     * @param string $archive_file_path The path for the archive file.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading
-     *     permissions shall be checked. False otherwise. Default is true.
-     *
-     * @return bool True, if the archive file was created and saved successfully
-     *     at $archive_file_path, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs
-     *     a general exception or a more special exception is thrown.
-     */
-    public static function createArchiveFromFileRefs(
-        $file_refs,
-        User $user,
-        $archive_file_path = '',
-        $do_user_permission_checks = true
-    )
-    {
-        if (!$archive_file_path) {
-            throw new FileArchiveManagerException(
-                _('Der Zielpfad für das Archiv wurde nicht angegeben!')
-            );
-        }
-
-        //We must now collect all the files from these FileRefs and copy them
-        //into the new archive file.
-
-        return self::createArchive(
-            $file_refs,
-            $user->id,
-            $archive_file_path,
-            $do_user_permission_checks,
-            false //do not keep the file hierarchy
-        );
-    }
-
-    /**
-     * Returns all children of a folder type.
-     *
-     * @param FolderType $folder
-     * @return array
-     */
-    private static function getFolderChildren(FolderType $folder)
-    {
-        $children = [];
-        foreach ($folder->subfolders as $folder) {
-            $children[] = $folder;
-        }
-        foreach ($folder->file_refs as $ref) {
-            $children[] = $ref;
-        }
-        return $children;
-    }
-
-    /**
-     * Creates an archive that contains all files of a course the given user
-     * is allowed to download.
-     *
-     * @param FolderType $folder The folder whose files shall be put inside an archive.
-     * @param string $user_id The ID of the user who wishes to put the course's files into an archive
-     * @param string $archive_file_path The path for the archive file.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
-     *     shall be checked. False otherwise. Default is true.
-     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
-     *     If $keep_hierarchy is set to false you will get an archive that contains only files
-     *     and no subdirectories.
-     *
-     * @return bool True, if the archive file was created and saved successfully
-     *     at $archive_file_path, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs
-     *     a general exception or a more special exception is thrown.
-     */
-    public static function createArchiveFromFolder(
-        FolderType $folder,
-        $user_id = null,
-        $archive_file_path = '',
-        $do_user_permission_checks = true,
-        $keep_hierarchy = true
-    )
-    {
-        return self::createArchive(
-            self::getFolderChildren($folder),
-            $user_id,
-            $archive_file_path,
-            $do_user_permission_checks,
-            $keep_hierarchy
-        );
-    }
-
-    /**
-     * Creates an archive that contains all files of a course the given user
-     * is allowed to download.
-     *
-     * @param string $course_id The ID of the course whose files shall be put inside an archive.
-     * @param string $user_id The ID of the user who wishes to put the course's files into an archive
-     * @param string $archive_file_path The path for the archive file.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
-     *     shall be checked. False otherwise. Default is true.
-     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
-     *     If $keep_hierarchy is set to false you will get an archive that contains only files
-     *     and no subdirectories.
-     *
-     * @return bool True, if the archive file was created and saved successfully
-     *     at $archive_file_path, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs
-     *     a general exception or a more special exception is thrown.
-     */
-    public static function createArchiveFromCourse(
-        $course_id,
-        $user_id = null,
-        $archive_file_path = '',
-        $do_user_permission_checks = true,
-        $keep_hierarchy = true
-    )
-    {
-        $folder = Folder::findTopFolder($course_id);
-        if (!$folder) {
-            return null;
-        }
-
-        $folder = $folder->getTypedFolder();
-        if (!$folder) {
-            return null;
-        }
-
-        return self::createArchive(
-            self::getFolderChildren($folder),
-            $user_id,
-            $archive_file_path,
-            $do_user_permission_checks,
-            $keep_hierarchy
-        );
-    }
-
-
-    /**
-     * Creates an archive that contains all files of an institute the given user
-     * is allowed to download.
-     *
-     * @param string $institute_id The ID of the institute whose files shall be put inside an archive.
-     * @param string $user_id The ID of the user who wishes to put the institute's files into an archive
-     * @param string $archive_file_path The path for the archive file.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
-     *     shall be checked. False otherwise. Default is true.
-     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
-     *     If $keep_hierarchy is set to false you will get an archive that contains only files
-     *     and no subdirectories.
-     *
-     * @return bool True, if the archive file was created and saved successfully
-     *     at $archive_file_path, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs
-     *     a general exception or a more special exception is thrown.
-     */
-    public static function createArchiveFromInstitute(
-        $institute_id,
-        $user_id = null,
-        $archive_file_path = '',
-        $do_user_permission_checks = true,
-        $keep_hierarchy = true)
-    {
-        $folder = Folder::findTopFolder($institute_id);
-        if(!$folder) {
-            return null;
-        }
-
-        $folder = $folder->getTypedFolder();
-        if(!$folder) {
-            return null;
-        }
-
-        return self::createArchive(
-            self::getFolderChildren($folder),
-            $archive_file_path,
-            $do_user_permission_checks,
-            $keep_hierarchy
-        );
-    }
-
-    /**
-     * Creates an archive that contains all files of a user, if the current
-     * user has root permissions to do this.
-     *
-     * @param string $user_id The ID of the user whose files shall be put inside an archive.
-     * @param string $archive_file_path The path for the archive file.
-     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
-     *     shall be checked. False otherwise. Default is true.
-     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
-     *     If $keep_hierarchy is set to false you will get an archive that contains only files
-     *     and no subdirectories.
-     *
-     * @return bool True, if the archive file was created and saved successfully
-     *     at $archive_file_path, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs
-     *     a general exception or a more special exception is thrown.
-     */
-    public static function createArchiveFromUser(
-        $user_id,
-        $archive_file_path = '',
-        $do_user_permission_checks = true,
-        $keep_hierarchy = true
-    )
-    {
-        $folder = Folder::findTopFolder($user_id);
-        if (!$folder) {
-            return null;
-        }
-
-        $folder = $folder->getTypedFolder();
-        if (!$folder) {
-            return null;
-        }
-
-        return self::createArchive(
-            self::getFolderChildren($folder),
-            $archive_file_path,
-            $do_user_permission_checks,
-            $keep_hierarchy
-        );
-    }
-
-
-    /**
-     * This method creates an archive with the content of a physical folder
-     * (A folder inside the operating system's file system).
-     *
-     * @param string $folder_path The path to the physical folder
-     *     which content shall be added to a file archive.
-     * @param string $archive_file_path The path to the archive file which
-     *     shall be created.
-     *
-     * @return True, if all files were added successfully, false otherwise.
-     *
-     * @throws Exception|FileArchiveManagerException If an error occurs
-     *     a general exception or a more special exception is thrown.
-     */
-    public static function createArchiveFromPhysicalFolder($folder_path, $archive_file_path)
-    {
-        if (!$folder_path || !$archive_file_path) {
-            //we can't work with empty paths!
-            return false;
-        }
-
-        if (!file_exists($folder_path)) {
-            //path to physical folder does not exist!
-            throw new FileArchiveManagerException(
-                _('Der Ordner wurde im Dateisystem des Servers nicht gefunden!')
-            );
-        }
-
-        //Put all the content of the folder inside an archive:
-        $archive = Studip\ZipArchive::create($archive_file_path, true);
-        $result = $archive->addFromPath($folder_path);
-        $archive->close();
-        return $result;
-    }
-
-    //ARCHIVE EXTRACTION METHODS
-
-    /**
-     * This is a helper method that builds a subfolder hierarchy inside
-     * a folder by looking at a string representing a file system path.
-     *
-     * The variable $path contains a hierarchy of subfolders that shall be created
-     * inside the given folder. If $path contains "folder1/folder2/folder3" then
-     * the given folder will get a subfolder named "folder1". The folder
-     * "folder1" itself will get a subfolder named "folder2" and so on.
-     *
-     * @param FolderType $folder The folder where a subfolder path shall be created.
-     * @param User $user The user who wishes to create the path.
-     * @param string $path The path which shall be created inside $folder.
-     *
-     * @return FolderType[] An array with FolderType objects representing
-     *     each element of $path.
-     */
-    public static function createFolderPath(FolderType $folder, User $user, $path = '')
-    {
-        if (!$path) {
-            return [];
-        }
-
-        // now we strip leading and trailing slashes, whitespaces and other characters:
-        // then we convert path into an array of strings:
-        $path = trim($path, ' /');
-        $path = explode('/', $path);
-
-        //now we loop through path and build subfolders:
-        $folder_path = [];
-
-        $current_folder = $folder;
-        foreach ($path as $new_folder_name) {
-            //first we check if the folder already exists:
-            foreach ($current_folder->getSubfolders() as $subfolder) {
-                if ($subfolder->name === $new_folder_name) {
-                    //We have found a folder that has the name $new_folder_name:
-                    //No need to create a new folder, we can use that folder
-                    //and continue with it:
-                    $current_folder = $subfolder;
-                    $folder_path[] = $subfolder;
-
-                    //start next iteration of the outer foreach loop:
-                    continue 2;
-                }
-            }
-
-            //If code execution has reached this point we have looped
-            //throug all subfolders of the current folder and couldn't find
-            //any subfolder that matches the name given in $new_folder_name.
-            //Therefore we must create a new folder here, if possible:
-
-            //Check the user's permissions first:
-            if ($current_folder->isSubfolderAllowed($user->id)) {
-                //Create a subfolder:
-                $result = FileManager::createSubFolder(
-                    $current_folder,
-                    $user,
-                    get_class($current_folder) === RootFolder::class ? StandardFolder::class : get_class($current_folder),
-                    $new_folder_name
-                );
-
-                if ($result instanceof FolderType) {
-                    $folder_path[] = $result;
-                }
-            }
-        }
-        return $folder_path;
-    }
-
-    /**
-     * Extracts one file from an opened archive and stores it in a folder.
-     *
-     * @param ZipArchive $archive The archive from which a file shall be extracted.
-     * @param string $archive_path The path of the file in the archive.
-     * @param FolderType $target_folder The folder where the file shall be stored.
-     * @param User $user The user who wishes to extract the file from the archive.
-     *
-     * @return FileType|null FileType instance on success, null otherwise.
-     */
-    public static function extractFileFromArchive(
-        Studip\ZipArchive $archive,
-        $archive_path,
-        FolderType $target_folder,
-        User $user
-    )
-    {
-        $file_resource = $archive->getStream($archive_path);
-        $file_info     = $archive->statName($archive_path);
-
-        if (!$file_resource) {
-            return null;
-        }
-
-        $studip_file = new File();
-        $studip_file->user_id   = $user->id;
-        $studip_file->name      = $archive->convertArchiveFilename(basename($archive_path));
-        $studip_file->mime_type = get_mime_type($studip_file->name);
-        $studip_file->size      = $file_info['size'];
-        $studip_file->id = $studip_file->getNewId();
-        //$file->store();
-
-        // Ok, we have a file object in the database. Now we must connect
-        // it with the data file by extracting the data file into
-        // the place, where the file's content has to be placed.
-        $file_dir = pathinfo($studip_file->getPath(), PATHINFO_DIRNAME);
-        $file_path = $file_dir . '/' . $studip_file->id;
-
-        // Create the directory for the file, if necessary:
-        if (!is_dir($file_dir)) {
-            mkdir($file_dir);
-        }
-
-        // Ok, now we read all data from $file_resource and put it into
-        // the file's path:
-        if (file_put_contents($file_path, $file_resource) === false) {
-            //Something went wrong: abort and clean up!
-            //$file->delete();
-            return null;
-        }
-
-        // Ok, we now must create a File:
-        $file_ref = new FileRef();
-        $file_ref->file_id   = $studip_file->id;
-        $file_ref->folder_id = $target_folder->getId();
-        $file_ref->user_id   = $user->id;
-        $file_ref->name      = $studip_file->name;
-        $file_ref->file      = $studip_file;
-        $file = new StandardFile($file_ref);
-        if ($saved_file = $target_folder->addFile($file, $user->id)) {
-            return $saved_file;
-        }
-
-        //Something went wrong:
-        return null;
-    }
-
-    /**
-     * Extracts an archive into a folder inside the Stud.IP file area.
-     *
-     * @param FileType $archive_file The archive file which shall be extracted.
-     * @param FolderType $folder The folder where the archive shall be extracted.
-     * @param string $user_id The ID of the user who wants to extract the archive.
-     *
-     * @return FileType[] Array with extracted files, represented as FileRef objects.
-     */
-    public static function extractArchiveFileToFolder(
-        FileType   $archive_file,
-        FolderType $folder,
-                   $user_id = null
-    )
-    {
-        $user = $user_id ? User::find($user_id) : User::findCurrent();
-        if (!$user) {
-            return [];
-        }
-
-        // Determine, if the folder is writable for the user identified by $user_id:
-        if (!$folder->isWritable($user->id)) {
-            return [];
-        }
-
-        // Determine if we can keep the zip archive's folder hierarchy:
-        $keep_hierarchy = $folder->isSubfolderAllowed($user->id);
-
-        $archive = new Studip\ZipArchive();
-        $standard_archive_file = $archive_file->convertToStandardFile();
-        if (!($standard_archive_file instanceof StandardFile)) {
-            //Error converting the archive file.
-            return [];
-        }
-        $archive->open($standard_archive_file->getPath());
-
-        // loop over all entries in the zip archive and put each entry
-        // in the current folder or one of its subfolders:
-        $files = [];
-
-        for ($i = 0; $i < $archive->numFiles; $i++) {
-            $entry_info = $archive->statIndex($i);
-            $entry_info_name = $archive->convertArchiveFilename($entry_info['name']);
-            // split the entry's path into its path and its name component:
-            $entry_path = ltrim(pathinfo($entry_info_name, PATHINFO_DIRNAME), '.');
-            $entry_name = pathinfo($entry_info_name, PATHINFO_BASENAME);
-
-            // check if $entry_info['name'] ends with a slash:
-            // In that case it is a directory entry:
-            $entry_is_directory = preg_match('/\/$/', $entry_info_name);
-
-            //The folder where the extracted file/folder shall be inserted:
-            $extracted_entry_destination_folder = $folder;
-
-            if ($keep_hierarchy) {
-                //Keep the archive's folder hierarchy:
-                //We may have to create subfolders.
-                if (basename($entry_path)) {
-                    //The file/folder doesn't lie in the "top folder" of the archive:
-                    //Pass the path to createFolderPath and let it generate
-                    //a folder path before extracting the file:
-                    $folder_path = self::createFolderPath(
-                        $folder,
-                        $user,
-                        $entry_path
-                    );
-
-                    //Get the last element of $folder_path:
-                    $last_folder_path_element = array_pop($folder_path);
-
-                    //Compare $extracted_entry_destination_folder's name with the name of the
-                    //last path item in $file_archive_path. Only if they are equal
-                    //we can use that folder to store the file. Otherwise
-                    //we must continue with the next file entry in the archive:
-                    if ($last_folder_path_element
-                        && $last_folder_path_element->name === basename($entry_path))
-                    {
-                        $extracted_entry_destination_folder = $last_folder_path_element;
-                    }
-                }
-            }
-
-            if ($entry_is_directory) {
-                //We have to create a subfolder if it doesn't exist yet:
-                self::createFolderPath(
-                    $extracted_entry_destination_folder,
-                    $user,
-                    $entry_name
-                );
-            } else {
-                //we extract one file:
-                //$entry_info['name'] is necessary because we need the full path
-                //to the entry inside the archive.
-                $file = self::extractFileFromArchive(
-                    $archive,
-                    $entry_info['name'],
-                    $extracted_entry_destination_folder,
-                    $user
-                );
-
-                if ($file instanceof FileType) {
-                    $files[] = $file;
-                }
-            }
-        }
-
-        return $files;
-    }
-}
diff --git a/lib/filesystem/FileArchiveManager.php b/lib/filesystem/FileArchiveManager.php
new file mode 100644
index 0000000..704bb44
--- /dev/null
+++ b/lib/filesystem/FileArchiveManager.php
@@ -0,0 +1,998 @@
+<?php
+/**
+ * FileArchiveManager.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2016 data-quest
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+
+/**
+ * The FileArchiveManager class gives programmers a simple way to handle
+ * file archives by providing different methods for packing and unpacking
+ * file archives in a simple manner.
+ */
+class FileArchiveManager
+{
+
+    //ARCHIVE HELPER METHODS
+
+
+    /**
+     * Adds a file to an archive using its FileType object.
+     *
+     * @param ZipArchive $archive The Zip archive where the FileRef shall be added to.
+     * @param FileType $file_type The FileType which shall be added to the zip archive.
+     * @param string $user_id The user who wishes to add the FileRef to the archive.
+     * @param string $archive_fs_path The path of the file inside the archive's file system.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
+     *     shall be checked. False otherwise. Default is true.
+     * @param bool $ignore_user Set to true, if a file
+     *     which has no download restrictions shall be included
+     *     and the user-specific download condition check shall be ignored.
+     *     If this parameter is set to true, the user_id parameter is irrelevant.
+     *     The default for this parameter is false.
+     * @return bool True on success, false on failure.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs a general exception or a more
+     *     special exception is thrown.
+     */
+    public static function addFileTypeToArchive(
+        ZipArchive $archive,
+        FileType $file_type,
+        $user_id = null,
+        $archive_fs_path = '',
+        $do_user_permission_checks = true,
+        $ignore_user = false,
+        &$file_list = null
+    )
+    {
+        $archive_max_size =  Config::get()->ZIP_DOWNLOAD_MAX_SIZE * 1024 * 1024;
+        //For FileRef objects we first have to do permission checks
+        //using the FileRef's folder object.
+        $adding_allowed = false;
+
+        if ($do_user_permission_checks) {
+            $folder = $file_type->getFolderType();
+            if (!$folder) {
+                return false;
+            }
+
+            if ($folder->isReadable($user_id) && $file_type->isDownloadable($user_id)) {
+                //FileRef is readable and downloadable for the user (identified by $user_id).
+                $adding_allowed = true;
+            }
+        } elseif ($ignore_user) {
+            //we have to check the download condition by looking at the
+            //terms of use object of the FileType:
+            $terms_of_use = $file_type->getTermsOfUse();
+            if ($terms_of_use && $terms_of_use->download_condition == 0) {
+                $adding_allowed = true;
+            }
+        } else {
+            //Totally skip permission checks:
+            $adding_allowed = true;
+        }
+
+        if ($adding_allowed) {
+            //Adding the FileType is allowed:
+            $file_contains_link = false;
+            if ($file_type instanceof LibraryFile) {
+                $file_contains_link = !$file_type->hasFileAttached();
+            } else {
+                $file_contains_link = $file_type instanceof URLFile;
+            }
+
+            // Increase download counter
+            if ($file_type instanceof StandardFile) {
+                $file_ref = $file_type->getFileRef();
+                $file_ref->incrementDownloadCounter();
+            }
+
+            if ($file_contains_link) {
+                //The FileType references a link:
+                //Put the URL into a file ending with .url:
+                $url = $file_type->getDownloadURL();
+                if ($url) {
+                    //The URL has been fetched and we can put it
+                    //in a file in the archive:
+                    $archive->addFromString(
+                        $archive_fs_path . FileManager::cleanFileName($file_type->getFilename()) . '.url',
+                        "[InternetShortcut]\nURL={$url}\n"
+                    );
+                    //Check the file size of the archive:
+                    if (file_exists($archive->filename) && filesize($archive->filename) > $archive_max_size) {
+                        throw new FileArchiveManagerException(
+                            sprintf(
+                                _('Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!'),
+                                relsize($archive_max_size)
+                            )
+                        );
+                    }
+                    if (is_array($file_list)) {
+                        $user = $file_type->getUser();
+                        $file_list[] = [
+                            'name' => FileManager::cleanFileName($file_type->getFilename()),
+                            'size' => $file_type->getSize(),
+                            'first_name' => ($user instanceof User) ? $user->vorname : '',
+                            'last_name' => ($user instanceof User) ? $user->nachname : '',
+                            'downloads' => $file_type->getDownloads(),
+                            'mkdate' => date('d.m.Y H:i', $file_type->getMakeDate()),
+                            'path' => ($archive_fs_path . $file_type->getFilename())
+                        ];
+                    }
+                    return true;
+                }
+            } else {
+                if (!($file_type instanceof StandardFile)) {
+                    $file_type = $file_type->convertToStandardFile();
+                }
+                if (!($file_type instanceof StandardFile)) {
+                    //The file type could not be converted to a standard file.
+                    //We cannot continue.
+                    return false;
+                }
+                //Get the file's path (if the file exists) and add the file to the archive:
+                $path = $file_type->getPath();
+                if ($path) {
+                    //It is a file in the file system:
+                    if (file_exists($path)) {
+                        $archive->addFile($path, $archive_fs_path . FileManager::cleanFileName($file_type->getFilename()));
+                        //Check the file size of the archive:
+                        if (file_exists($archive->filename) && filesize($archive->filename) > $archive_max_size) {
+                            throw new FileArchiveManagerException(
+                                sprintf(
+                                    _('Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!'),
+                                    relsize($archive_max_size)
+                                )
+                            );
+                        }
+                        //Add the file to the file list (if available):
+                        if (is_array($file_list)) {
+                            $archive_max_num_files = Config::get()->ZIP_DOWNLOAD_MAX_FILES;
+                            $archive_max_size =  Config::get()->ZIP_DOWNLOAD_MAX_SIZE * 1024 * 1024; //1048576 bytes = 1 Mebibyte
+                            $user = $file_type->getUser();
+                            $file_list[] = [
+                                'name' => FileManager::cleanFileName($file_type->getFilename()),
+                                'size' => $file_type->getSize(),
+                                'first_name' => ($user instanceof User) ? $user->vorname : '',
+                                'last_name' => ($user instanceof User) ? $user->nachname : '',
+                                'downloads' => $file_type->getDownloads(),
+                                'mkdate' => date('d.m.Y H:i', $file_type->getMakeDate()),
+                                'path' => ($archive_fs_path . FileManager::cleanFileName($file_type->getFilename()))
+                            ];
+                            if (count($file_list) > $archive_max_num_files) {
+                                $archive->unchangeAll();
+                                unlink($archive->filename);
+                                throw new FileArchiveManagerException(
+                                    sprintf(
+                                        _('Das Archiv beinhaltet zu viele Dateibereich-Objekte! Die Obergrenze liegt bei %d Objekten!'),
+                                        $archive_max_num_files
+                                    )
+                                );
+                            }
+                            if (array_sum(array_column($file_list, 'size')) > $archive_max_size) {
+                                $archive->unchangeAll();
+                                unlink($archive->filename);
+                                throw new FileArchiveManagerException(
+                                    sprintf(
+                                        _('Das ZIP-Archiv ist zu groß! Die maximal erlaubte Größe ist %s!'),
+                                        relsize($archive_max_size)
+                                    )
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        //Something must have gone wrong:
+        return false;
+    }
+
+
+    /**
+     * Adds a FileRef to a Zip archive.
+     * This is only a wrapper to addFileTypeToArchive that exists only
+     * for compatibility reasons.
+     *
+     * @see addFileTypeToArchive
+     */
+    public static function addFileRefToArchive(
+        ZipArchive $archive,
+        FileRef $file_ref,
+        $user_id = null,
+        $archive_fs_path = '',
+        $do_user_permission_checks = true,
+        $ignore_user = false,
+        &$file_list = null
+    )
+    {
+        $file_type = $file_ref->getFileType();
+        if ($file_type instanceof FileType) {
+            return self::addFileTypeToArchive(
+                $archive,
+                $file_type,
+                $user_id,
+                $archive_fs_path,
+                $do_user_permission_checks,
+                $ignore_user,
+                $file_list
+            );
+        }
+        //The file type variable does not contain a FileType object.
+        return false;
+    }
+
+
+    /**
+     * Adds a FolderType instance to a Zip archive.
+     *
+     * @param ZipArchive $archive The Zip archive where the FileRef shall be added to.
+     * @param FileRef $file_ref The FileRef which shall be added to the zip archive.
+     * @param string $user_id The user who wishes to add the FileRef to the archive.
+     * @param string $archive_fs_path The path of the folder inside the archive's file system.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
+     *     shall be checked. False otherwise. Default is true.
+     * @param bool $keep_hierarchy True, if the folder hierarchy shall be kept.
+     *     False, if the folder hierarchy shall be flattened.
+     * @param bool $ignore_user Set to true, if a folder
+     *     of type StandardFolder shall be included without checking
+     *     if the user (identified by user_id) can read it.
+     * @return bool True on success, false on failure.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs a general exception or a more
+     *     special exception is thrown.
+     */
+    public static function addFolderToArchive(
+        ZipArchive $archive,
+        FolderType $folder,
+        $user_id = null,
+        $archive_fs_path = '',
+        $do_user_permission_checks = true,
+        $keep_hierarchy = true,
+        $ignore_user = false,
+        &$file_list = null
+    ) {
+
+        if ($do_user_permission_checks) {
+            //Check if the folder is readable for the user (identified by $user_id):
+            if (!$folder->isReadable($user_id)) {
+                //Folder is not readable:
+                return false;
+            }
+        } elseif ($ignore_user
+                  && !($folder instanceof StandardFolder)
+                  && in_array($folder->range_type, ['course', 'institute']))
+        {
+            //If user permissions shall be skipped the folder must be
+            //an instance of StandardFolder and the folder's range type
+            //must be course or institute since we can only be sure
+            //that StandardFolder instances in courses or institutes
+            //are readable by everyone.
+            return false;
+        }
+
+        $folder_zip_path = $archive_fs_path;
+        if ($keep_hierarchy) {
+            $folder_zip_path .= FileManager::cleanFileName($folder->name);
+            $archive->addEmptyDir($folder_zip_path);
+        }
+        foreach ($folder->getFiles() as $file) {
+
+            /*if (!$file_ref instanceof FileRef) { TODO: OwnCloudPlugin is this ready?
+                $plugin = PluginManager::getInstance()->getPlugin($folder->range_id);
+                if (!$plugin) {
+                    $plugin = PluginManager::getInstance()->getPlugin($folder->range_type);;
+                }
+                if ($plugin) {
+                    $file_ref = $plugin->getPreparedFile($file_ref->id, true);
+                }
+            }*/
+
+            self::addFileTypeToArchive(
+                $archive,
+                $file,
+                $user_id,
+                //keep hierarchy in zip file (files and subdirectories)
+                $keep_hierarchy ? $folder_zip_path . '/' : '',
+                $do_user_permission_checks,
+                $ignore_user,
+                $file_list
+            );
+        }
+
+        foreach ($folder->getSubfolders() as $subfolder) {
+            self::addFolderToArchive(
+                $archive,
+                $subfolder,
+                $user_id,
+                //keep hierarchy in zip file (files and subdirectories)
+                $keep_hierarchy ? $folder_zip_path . '/' : '',
+                $do_user_permission_checks,
+                $keep_hierarchy,
+                $ignore_user,
+                $file_list
+            );
+        }
+
+        return true;
+    }
+
+
+    //ARCHIVE CREATION METHODS
+
+
+    /**
+     * General method for creating file archives.
+     *
+     * This method is a generalisation for all archive creation methods.
+     * For easier archive creation you may use the other archive creation
+     * methods which work with less arguments.
+     *
+     * @param Array $file_area_objects Array of FileRef, FileURL, Folder or FolderType objects.
+     *     $file_area_objects may contain a mix between those object types.
+     * @param string $user_id The user who wishes to pack files.
+     * @param string $archive_file_path The path for the archive file.
+     * @param bool $do_user_permission_checks Set to true if individual
+     *     reading/downloading permissions shall be checked. False otherwise.
+     *     Default is true.
+     * @param bool $keep_hierarchy True, if the folder hierarchy shall be kept.
+     *     False, if the folder hierarchy shall be flattened. Default is true.
+     * @param bool $ignore_user Set to true, if all files
+     *     which have no download restrictions and all folders which are of type
+     *     StandardFolder shall be included and the user-specific
+     *     download condition check shall be ignored.
+     *     If this parameter is set to true, the user_id parameter is irrelevant.
+     *     The default for this parameter is false.
+     * @param string $zip_encoding encoding for filenames in zip
+     * @param bool $add_filelist_to_archive If this is set to true a file list
+     *     in the CSV format will be added to the archive. Its name is hardcoded
+     *     to archive_filelist.csv. The default value of $add_filelist_to_archive
+     *     is false which means no file list is added.
+     *
+     * @return bool True, if the archive file was created and saved successfully
+     *     at $archive_file_path, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs a general exception or a more
+     *     special exception is thrown.
+     */
+    public static function createArchive(
+        $file_area_objects = [],
+        $user_id = null,
+        $archive_file_path = '',
+        $do_user_permission_checks = true,
+        $keep_hierarchy = true,
+        $ignore_user = false,
+        $zip_encoding = 'UTF-8',
+        $add_filelist_to_archive = false
+    )
+    {
+
+        // check if archive path is set:
+        if (!$archive_file_path) {
+            throw new FileArchiveManagerException(
+                _('Der Zielpfad für das Archiv wurde nicht angegeben!')
+            );
+        }
+
+        // $file_area_objects must be a non-empty array!
+        // Otherwise we would return an empty Zip archive.
+        if (!is_array($file_area_objects) || empty($file_area_objects)) {
+            throw new FileArchiveManagerException(
+                _('Es wurden keine Dateien ausgewählt!')
+            );
+        }
+
+        // We can create the Zip archive now since its path exists in the file system
+        // and furthermore there are file area objects available.
+        $archive = new Studip\ZipArchive();
+        if (!$archive->open($archive_file_path, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
+            throw new FileArchiveManagerException('Error opening new ZIP archive!');
+        }
+        $archive->setOutputEncoding($zip_encoding);
+
+        //If $file_list is not an array
+        //then no files are added to the file list.
+        $file_list = null;
+        if ($add_filelist_to_archive) {
+            $file_list = [];
+        }
+
+        foreach ($file_area_objects as $file_area_object) {
+            if ($file_area_object instanceof FileRef) {
+                self::addFileRefToArchive(
+                    $archive,
+                    $file_area_object,
+                    $user_id,
+                    '',
+                    $do_user_permission_checks,
+                    $ignore_user,
+                    $file_list
+                );
+            } elseif ($file_area_object instanceof FileType) {
+                self::addFileTypeToArchive(
+                    $archive,
+                    $file_area_object,
+                    $user_id,
+                    '',
+                    $do_user_permission_checks,
+                    $ignore_user,
+                    $file_list
+                );
+            } elseif ($file_area_object instanceof Folder || $file_area_object instanceof FolderType) {
+                $folder = $file_area_object;
+                if ($folder instanceof Folder) {
+                    //We use FolderType instances here.
+                    $folder = $folder->getTypedFolder();
+                }
+
+                self::addFolderToArchive(
+                    $archive,
+                    $folder,
+                    $user_id,
+                    '',
+                    $do_user_permission_checks,
+                    $keep_hierarchy,
+                    $ignore_user,
+                    $file_list
+                );
+            }
+        }
+
+        if ($archive->numFiles > 0) {
+            //At least one file is in the archive.
+
+            if ($add_filelist_to_archive) {
+                //If a file list shall be included in the ZIP archive
+                //we must now make a CSV file out of file_list:
+
+                $csv_data = array_merge(
+                    [
+                        [
+                            _('Name'),
+                            _('Größe'),
+                            _('Vorname'),
+                            _('Nachname'),
+                            _('Downloads'),
+                            _('Datum'),
+                            _('Pfad')
+                        ]
+                    ],
+                    $file_list
+                );
+
+                //The CSV file has been generated.
+                //Now we must add it to the archive:
+                $archive->addFromString('archive_filelist.csv', array_to_csv($csv_data));
+            }
+
+            //Now the ZIP file is really finished:
+            return $archive->close();
+        }
+
+        //empty archive
+        throw new FileArchiveManagerException(
+            _('Das ZIP Archiv enthält keine Dateien!')
+        );
+    }
+
+    /**
+     * Puts files (identified by their file refs) into one file archive.
+     *
+     * @param FileRef[] $file_refs Array of FileRef objects.
+     * @param User $user The user who wishes to pack files.
+     * @param string $archive_file_path The path for the archive file.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading
+     *     permissions shall be checked. False otherwise. Default is true.
+     *
+     * @return bool True, if the archive file was created and saved successfully
+     *     at $archive_file_path, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs
+     *     a general exception or a more special exception is thrown.
+     */
+    public static function createArchiveFromFileRefs(
+        $file_refs,
+        User $user,
+        $archive_file_path = '',
+        $do_user_permission_checks = true
+    )
+    {
+        if (!$archive_file_path) {
+            throw new FileArchiveManagerException(
+                _('Der Zielpfad für das Archiv wurde nicht angegeben!')
+            );
+        }
+
+        //We must now collect all the files from these FileRefs and copy them
+        //into the new archive file.
+
+        return self::createArchive(
+            $file_refs,
+            $user->id,
+            $archive_file_path,
+            $do_user_permission_checks,
+            false //do not keep the file hierarchy
+        );
+    }
+
+    /**
+     * Returns all children of a folder type.
+     *
+     * @param FolderType $folder
+     * @return array
+     */
+    private static function getFolderChildren(FolderType $folder)
+    {
+        $children = [];
+        foreach ($folder->subfolders as $folder) {
+            $children[] = $folder;
+        }
+        foreach ($folder->file_refs as $ref) {
+            $children[] = $ref;
+        }
+        return $children;
+    }
+
+    /**
+     * Creates an archive that contains all files of a course the given user
+     * is allowed to download.
+     *
+     * @param FolderType $folder The folder whose files shall be put inside an archive.
+     * @param string $user_id The ID of the user who wishes to put the course's files into an archive
+     * @param string $archive_file_path The path for the archive file.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
+     *     shall be checked. False otherwise. Default is true.
+     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
+     *     If $keep_hierarchy is set to false you will get an archive that contains only files
+     *     and no subdirectories.
+     *
+     * @return bool True, if the archive file was created and saved successfully
+     *     at $archive_file_path, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs
+     *     a general exception or a more special exception is thrown.
+     */
+    public static function createArchiveFromFolder(
+        FolderType $folder,
+        $user_id = null,
+        $archive_file_path = '',
+        $do_user_permission_checks = true,
+        $keep_hierarchy = true
+    )
+    {
+        return self::createArchive(
+            self::getFolderChildren($folder),
+            $user_id,
+            $archive_file_path,
+            $do_user_permission_checks,
+            $keep_hierarchy
+        );
+    }
+
+    /**
+     * Creates an archive that contains all files of a course the given user
+     * is allowed to download.
+     *
+     * @param string $course_id The ID of the course whose files shall be put inside an archive.
+     * @param string $user_id The ID of the user who wishes to put the course's files into an archive
+     * @param string $archive_file_path The path for the archive file.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
+     *     shall be checked. False otherwise. Default is true.
+     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
+     *     If $keep_hierarchy is set to false you will get an archive that contains only files
+     *     and no subdirectories.
+     *
+     * @return bool True, if the archive file was created and saved successfully
+     *     at $archive_file_path, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs
+     *     a general exception or a more special exception is thrown.
+     */
+    public static function createArchiveFromCourse(
+        $course_id,
+        $user_id = null,
+        $archive_file_path = '',
+        $do_user_permission_checks = true,
+        $keep_hierarchy = true
+    )
+    {
+        $folder = Folder::findTopFolder($course_id);
+        if (!$folder) {
+            return null;
+        }
+
+        $folder = $folder->getTypedFolder();
+        if (!$folder) {
+            return null;
+        }
+
+        return self::createArchive(
+            self::getFolderChildren($folder),
+            $user_id,
+            $archive_file_path,
+            $do_user_permission_checks,
+            $keep_hierarchy
+        );
+    }
+
+
+    /**
+     * Creates an archive that contains all files of an institute the given user
+     * is allowed to download.
+     *
+     * @param string $institute_id The ID of the institute whose files shall be put inside an archive.
+     * @param string $user_id The ID of the user who wishes to put the institute's files into an archive
+     * @param string $archive_file_path The path for the archive file.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
+     *     shall be checked. False otherwise. Default is true.
+     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
+     *     If $keep_hierarchy is set to false you will get an archive that contains only files
+     *     and no subdirectories.
+     *
+     * @return bool True, if the archive file was created and saved successfully
+     *     at $archive_file_path, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs
+     *     a general exception or a more special exception is thrown.
+     */
+    public static function createArchiveFromInstitute(
+        $institute_id,
+        $user_id = null,
+        $archive_file_path = '',
+        $do_user_permission_checks = true,
+        $keep_hierarchy = true)
+    {
+        $folder = Folder::findTopFolder($institute_id);
+        if(!$folder) {
+            return null;
+        }
+
+        $folder = $folder->getTypedFolder();
+        if(!$folder) {
+            return null;
+        }
+
+        return self::createArchive(
+            self::getFolderChildren($folder),
+            $archive_file_path,
+            $do_user_permission_checks,
+            $keep_hierarchy
+        );
+    }
+
+    /**
+     * Creates an archive that contains all files of a user, if the current
+     * user has root permissions to do this.
+     *
+     * @param string $user_id The ID of the user whose files shall be put inside an archive.
+     * @param string $archive_file_path The path for the archive file.
+     * @param bool $do_user_permission_checks Set to true if reading/downloading permissions
+     *     shall be checked. False otherwise. Default is true.
+     * @param bool $keep_hierarchy True, if the file hierarchy shall be kept inside the archive.
+     *     If $keep_hierarchy is set to false you will get an archive that contains only files
+     *     and no subdirectories.
+     *
+     * @return bool True, if the archive file was created and saved successfully
+     *     at $archive_file_path, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs
+     *     a general exception or a more special exception is thrown.
+     */
+    public static function createArchiveFromUser(
+        $user_id,
+        $archive_file_path = '',
+        $do_user_permission_checks = true,
+        $keep_hierarchy = true
+    )
+    {
+        $folder = Folder::findTopFolder($user_id);
+        if (!$folder) {
+            return null;
+        }
+
+        $folder = $folder->getTypedFolder();
+        if (!$folder) {
+            return null;
+        }
+
+        return self::createArchive(
+            self::getFolderChildren($folder),
+            $archive_file_path,
+            $do_user_permission_checks,
+            $keep_hierarchy
+        );
+    }
+
+
+    /**
+     * This method creates an archive with the content of a physical folder
+     * (A folder inside the operating system's file system).
+     *
+     * @param string $folder_path The path to the physical folder
+     *     which content shall be added to a file archive.
+     * @param string $archive_file_path The path to the archive file which
+     *     shall be created.
+     *
+     * @return True, if all files were added successfully, false otherwise.
+     *
+     * @throws Exception|FileArchiveManagerException If an error occurs
+     *     a general exception or a more special exception is thrown.
+     */
+    public static function createArchiveFromPhysicalFolder($folder_path, $archive_file_path)
+    {
+        if (!$folder_path || !$archive_file_path) {
+            //we can't work with empty paths!
+            return false;
+        }
+
+        if (!file_exists($folder_path)) {
+            //path to physical folder does not exist!
+            throw new FileArchiveManagerException(
+                _('Der Ordner wurde im Dateisystem des Servers nicht gefunden!')
+            );
+        }
+
+        //Put all the content of the folder inside an archive:
+        $archive = Studip\ZipArchive::create($archive_file_path, true);
+        $result = $archive->addFromPath($folder_path);
+        $archive->close();
+        return $result;
+    }
+
+    //ARCHIVE EXTRACTION METHODS
+
+    /**
+     * This is a helper method that builds a subfolder hierarchy inside
+     * a folder by looking at a string representing a file system path.
+     *
+     * The variable $path contains a hierarchy of subfolders that shall be created
+     * inside the given folder. If $path contains "folder1/folder2/folder3" then
+     * the given folder will get a subfolder named "folder1". The folder
+     * "folder1" itself will get a subfolder named "folder2" and so on.
+     *
+     * @param FolderType $folder The folder where a subfolder path shall be created.
+     * @param User $user The user who wishes to create the path.
+     * @param string $path The path which shall be created inside $folder.
+     *
+     * @return FolderType[] An array with FolderType objects representing
+     *     each element of $path.
+     */
+    public static function createFolderPath(FolderType $folder, User $user, $path = '')
+    {
+        if (!$path) {
+            return [];
+        }
+
+        // now we strip leading and trailing slashes, whitespaces and other characters:
+        // then we convert path into an array of strings:
+        $path = trim($path, ' /');
+        $path = explode('/', $path);
+
+        //now we loop through path and build subfolders:
+        $folder_path = [];
+
+        $current_folder = $folder;
+        foreach ($path as $new_folder_name) {
+            //first we check if the folder already exists:
+            foreach ($current_folder->getSubfolders() as $subfolder) {
+                if ($subfolder->name === $new_folder_name) {
+                    //We have found a folder that has the name $new_folder_name:
+                    //No need to create a new folder, we can use that folder
+                    //and continue with it:
+                    $current_folder = $subfolder;
+                    $folder_path[] = $subfolder;
+
+                    //start next iteration of the outer foreach loop:
+                    continue 2;
+                }
+            }
+
+            //If code execution has reached this point we have looped
+            //throug all subfolders of the current folder and couldn't find
+            //any subfolder that matches the name given in $new_folder_name.
+            //Therefore we must create a new folder here, if possible:
+
+            //Check the user's permissions first:
+            if ($current_folder->isSubfolderAllowed($user->id)) {
+                //Create a subfolder:
+                $result = FileManager::createSubFolder(
+                    $current_folder,
+                    $user,
+                    get_class($current_folder) === RootFolder::class ? StandardFolder::class : get_class($current_folder),
+                    $new_folder_name
+                );
+
+                if ($result instanceof FolderType) {
+                    $folder_path[] = $result;
+                }
+            }
+        }
+        return $folder_path;
+    }
+
+    /**
+     * Extracts one file from an opened archive and stores it in a folder.
+     *
+     * @param ZipArchive $archive The archive from which a file shall be extracted.
+     * @param string $archive_path The path of the file in the archive.
+     * @param FolderType $target_folder The folder where the file shall be stored.
+     * @param User $user The user who wishes to extract the file from the archive.
+     *
+     * @return FileType|null FileType instance on success, null otherwise.
+     */
+    public static function extractFileFromArchive(
+        Studip\ZipArchive $archive,
+        $archive_path,
+        FolderType $target_folder,
+        User $user
+    )
+    {
+        $file_resource = $archive->getStream($archive_path);
+        $file_info     = $archive->statName($archive_path);
+
+        if (!$file_resource) {
+            return null;
+        }
+
+        $studip_file = new File();
+        $studip_file->user_id   = $user->id;
+        $studip_file->name      = $archive->convertArchiveFilename(basename($archive_path));
+        $studip_file->mime_type = get_mime_type($studip_file->name);
+        $studip_file->size      = $file_info['size'];
+        $studip_file->id = $studip_file->getNewId();
+        //$file->store();
+
+        // Ok, we have a file object in the database. Now we must connect
+        // it with the data file by extracting the data file into
+        // the place, where the file's content has to be placed.
+        $file_dir = pathinfo($studip_file->getPath(), PATHINFO_DIRNAME);
+        $file_path = $file_dir . '/' . $studip_file->id;
+
+        // Create the directory for the file, if necessary:
+        if (!is_dir($file_dir)) {
+            mkdir($file_dir);
+        }
+
+        // Ok, now we read all data from $file_resource and put it into
+        // the file's path:
+        if (file_put_contents($file_path, $file_resource) === false) {
+            //Something went wrong: abort and clean up!
+            //$file->delete();
+            return null;
+        }
+
+        // Ok, we now must create a File:
+        $file_ref = new FileRef();
+        $file_ref->file_id   = $studip_file->id;
+        $file_ref->folder_id = $target_folder->getId();
+        $file_ref->user_id   = $user->id;
+        $file_ref->name      = $studip_file->name;
+        $file_ref->file      = $studip_file;
+        $file = new StandardFile($file_ref);
+        if ($saved_file = $target_folder->addFile($file, $user->id)) {
+            return $saved_file;
+        }
+
+        //Something went wrong:
+        return null;
+    }
+
+    /**
+     * Extracts an archive into a folder inside the Stud.IP file area.
+     *
+     * @param FileType $archive_file The archive file which shall be extracted.
+     * @param FolderType $folder The folder where the archive shall be extracted.
+     * @param string $user_id The ID of the user who wants to extract the archive.
+     *
+     * @return FileType[] Array with extracted files, represented as FileRef objects.
+     */
+    public static function extractArchiveFileToFolder(
+        FileType   $archive_file,
+        FolderType $folder,
+                   $user_id = null
+    )
+    {
+        $user = $user_id ? User::find($user_id) : User::findCurrent();
+        if (!$user) {
+            return [];
+        }
+
+        // Determine, if the folder is writable for the user identified by $user_id:
+        if (!$folder->isWritable($user->id)) {
+            return [];
+        }
+
+        // Determine if we can keep the zip archive's folder hierarchy:
+        $keep_hierarchy = $folder->isSubfolderAllowed($user->id);
+
+        $archive = new Studip\ZipArchive();
+        $standard_archive_file = $archive_file->convertToStandardFile();
+        if (!($standard_archive_file instanceof StandardFile)) {
+            //Error converting the archive file.
+            return [];
+        }
+        $archive->open($standard_archive_file->getPath());
+
+        // loop over all entries in the zip archive and put each entry
+        // in the current folder or one of its subfolders:
+        $files = [];
+
+        for ($i = 0; $i < $archive->numFiles; $i++) {
+            $entry_info = $archive->statIndex($i);
+            $entry_info_name = $archive->convertArchiveFilename($entry_info['name']);
+            // split the entry's path into its path and its name component:
+            $entry_path = ltrim(pathinfo($entry_info_name, PATHINFO_DIRNAME), '.');
+            $entry_name = pathinfo($entry_info_name, PATHINFO_BASENAME);
+
+            // check if $entry_info['name'] ends with a slash:
+            // In that case it is a directory entry:
+            $entry_is_directory = preg_match('/\/$/', $entry_info_name);
+
+            //The folder where the extracted file/folder shall be inserted:
+            $extracted_entry_destination_folder = $folder;
+
+            if ($keep_hierarchy) {
+                //Keep the archive's folder hierarchy:
+                //We may have to create subfolders.
+                if (basename($entry_path)) {
+                    //The file/folder doesn't lie in the "top folder" of the archive:
+                    //Pass the path to createFolderPath and let it generate
+                    //a folder path before extracting the file:
+                    $folder_path = self::createFolderPath(
+                        $folder,
+                        $user,
+                        $entry_path
+                    );
+
+                    //Get the last element of $folder_path:
+                    $last_folder_path_element = array_pop($folder_path);
+
+                    //Compare $extracted_entry_destination_folder's name with the name of the
+                    //last path item in $file_archive_path. Only if they are equal
+                    //we can use that folder to store the file. Otherwise
+                    //we must continue with the next file entry in the archive:
+                    if ($last_folder_path_element
+                        && $last_folder_path_element->name === basename($entry_path))
+                    {
+                        $extracted_entry_destination_folder = $last_folder_path_element;
+                    }
+                }
+            }
+
+            if ($entry_is_directory) {
+                //We have to create a subfolder if it doesn't exist yet:
+                self::createFolderPath(
+                    $extracted_entry_destination_folder,
+                    $user,
+                    $entry_name
+                );
+            } else {
+                //we extract one file:
+                //$entry_info['name'] is necessary because we need the full path
+                //to the entry inside the archive.
+                $file = self::extractFileFromArchive(
+                    $archive,
+                    $entry_info['name'],
+                    $extracted_entry_destination_folder,
+                    $user
+                );
+
+                if ($file instanceof FileType) {
+                    $files[] = $file;
+                }
+            }
+        }
+
+        return $files;
+    }
+}
diff --git a/lib/filesystem/FileArchiveManagerException.class.php b/lib/filesystem/FileArchiveManagerException.class.php
deleted file mode 100644
index 17b5306..0000000
--- a/lib/filesystem/FileArchiveManagerException.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * FileArchiveManager.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2016 data-quest
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-class FileArchiveManagerException extends Exception
-{
-}
diff --git a/lib/filesystem/FileArchiveManagerException.php b/lib/filesystem/FileArchiveManagerException.php
new file mode 100644
index 0000000..17b5306
--- /dev/null
+++ b/lib/filesystem/FileArchiveManagerException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * FileArchiveManager.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2016 data-quest
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+class FileArchiveManagerException extends Exception
+{
+}
diff --git a/lib/filesystem/LibraryFile.class.php b/lib/filesystem/LibraryFile.class.php
deleted file mode 100644
index c9524e3..0000000
--- a/lib/filesystem/LibraryFile.class.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * This file is part of Stud.IP.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2020
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.6
- */
-
-
-class LibraryFile extends StandardFile
-{
-    public $library_document = null;
-
-
-    public function __construct($fileref, $file = null)
-    {
-        parent::__construct($fileref, $file);
-
-        if (is_object($this->file->metadata)) {
-            $this->library_document = LibraryDocument::createFromArray($this->file->metadata->getArrayCopy());
-        }
-    }
-
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    public function getFileRef()
-    {
-        return $this->fileref;
-    }
-
-    public static function createFromLibraryDocument(LibraryDocument $document, $folder_id = null, $user_id = null)
-    {
-        $file = new File();
-        $file->name = '';
-        $file->size = '0';
-        $file->mime_type = '';
-        $file->metadata = $document->toJson();
-        $file->user_id = $user_id ? $user_id : $GLOBALS['user']->id;
-        $file->filetype = get_called_class();
-        if ($document->csl_data['URL'] || $document->opac_link) {
-            $file->metadata['url'] = $document->opac_link ?: $document->csl_data['URL'];
-            $file->metadata['access_type'] = 'redirect';
-        }
-        $file->store();
-
-        $file_ref = new FileRef();
-        $file_ref->file_id = $file->id;
-        $file_ref->folder_id = $folder_id ? $folder_id : '';
-        $file_ref->name = $file->name;
-        $file_ref->downloads = 0;
-        $file_ref->description = $document->csl_data['description'] ? $document->csl_data['description'] : '';
-        $file_ref->content_terms_of_use_id = ContentTermsOfUse::findDefault()->id;
-        $file_ref->user_id = $file->user_id;
-        $file_ref->store();
-
-        return new LibraryFile($file_ref);
-    }
-
-
-    /**
-     * Updates the LibraryFile by using a LibraryDocument instance.
-     *
-     * @param LibraryDocument $document The document containing the new data.
-     *
-     * @returns bool True, if the update was successful, false otherwise.
-     */
-    public function updateFromLibraryDocument(LibraryDocument $document) : bool
-    {
-        if ($this->file instanceof File) {
-            $file_name = self::getFileNameFromDocument($document);
-            $this->file->name = $file_name;
-            $this->file->metadata = $document->toJson();
-            if ($this->file->isDirty()) {
-                if (!$this->file->store()) {
-                    return false;
-                }
-            }
-            $this->fileref->name = $this->file->name;
-            if ($this->fileref->isDirty()) {
-                return $this->fileref->store();
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * Extracts a file name from a LibraryDocument instance.
-     * This is an internal helper method.
-     *
-     * @param LibraryDocument $document The document from which a file name
-     *     shall be extracted.
-     *
-     * @returns string The extracted file name.
-     */
-    protected static function getFileNameFromDocument(LibraryDocument $document) : string
-    {
-        $file_name = $document->getTitle();
-        if (!$file_name) {
-            //The document hasn't got a title. We can still generate a file name
-            //using the search parameters of the document.
-            if ($document->search_params[LibrarySearch::TITLE]) {
-                $file_name = $document->search_params[LibrarySearch::TITLE];
-            } elseif ($document->search_params[LibrarySearch::AUTHOR]) {
-                if ($document->search_params[LibrarySearch::YEAR]) {
-                    $file_name = sprintf(
-                        '%1$s (%2$s)',
-                        $document->search_params[LibrarySearch::AUTHOR],
-                        $document->search_params[LibrarySearch::YEAR]
-                    );
-                } else {
-                    $file_name = $document->search_params[LibrarySearch::AUTHOR];
-                }
-            } elseif ($document->search_params[LibrarySearch::NUMBER]) {
-                $file_name = $document->search_params[LibrarySearch::NUMBER];
-            } elseif ($document->search_params[LibrarySearch::SIGNATURE]) {
-                $file_name = $document->search_params[LibrarySearch::SIGNATURE];
-            } else {
-                $file_name = _('unbekannt');
-            }
-        }
-        return $file_name;
-    }
-
-
-    public function getIcon($role)
-    {
-        if ($this->library_document instanceof LibraryDocument) {
-            $icon = $this->library_document->getIcon();
-        }
-        return $icon && $icon->getShape() !== 'literature-request' ? $icon : Icon::create('literature', $role);
-    }
-
-
-    public function getFilename()
-    {
-        $file_name = '';
-        if ($this->library_document instanceof LibraryDocument) {
-            $file_name = $this->library_document->getTitle('long');
-        }
-        if (!$file_name && $this->library_document->search_params) {
-            $formatted_params = $this->library_document->getSearchDescription();
-            $file_name = _('Suche in der Bibliothek');
-            if ($formatted_params) {
-                $file_name .= ': ' . implode(', ', $formatted_params);
-            }
-        }
-        if (!$file_name && ($this->fileref instanceof FileRef)) {
-            $file_name = $this->fileref->name;
-        }
-        return $file_name;
-    }
-
-
-    public function getSize()
-    {
-        if ($this->fileref instanceof FileRef) {
-            return $this->fileref['size'];
-        }
-        return null;
-    }
-
-
-    public function getDownloadURL()
-    {
-        if ($this->hasFileAttached() || $this->hasURL()) {
-            if ($this->fileref instanceof FileRef) {
-                return $this->fileref->getDownloadURL();
-            }
-        }
-        return '';
-    }
-
-
-    public function getPath() : string
-    {
-        return $this->file instanceof File ? $this->file->getPath() : '';
-    }
-
-
-    public function getDownloads()
-    {
-        if ($this->fileref instanceof FileRef) {
-            return $this->fileref['downloads'];
-        }
-        return 0;
-    }
-
-
-    public function getActionmenu()
-    {
-        $action_menu = ActionMenu::get();
-        $action_menu->addLink(
-            URLHelper::getURL(sprintf('dispatch.php/file/details/%s/1', $this->fileref->id)),
-            _('Info'),
-            Icon::create('info-circle', Icon::ROLE_CLICKABLE, ['size' => 20]),
-            ['data-dialog' => ''],
-            'file-display-info'
-        );
-        if (Config::get()->LITERATURE_ENABLE && Context::get() && $GLOBALS['perm']->have_studip_perm('tutor', Context::getId())) {
-            $plugin_manager = PluginManager::getInstance();
-            $library_plugins = $plugin_manager->getPlugins(LibraryPlugin::class);
-            if (count($library_plugins)) {
-                $plugin = $library_plugins[0];
-                $action_menu->addLink(
-                    $plugin->getRequestURL($this->getId()),
-                    $plugin->getRequestTitle(),
-                    $plugin->getRequestIcon(),
-                    ['data-dialog' => 'size=auto;reload-on-close;id=' . $plugin->getPluginId()]
-                );
-            }
-        }
-        if (parent::isWritable($GLOBALS['user']->id)) {
-            //Before the edit action can be displayed, we must make sure
-            //the library document is one that is defined.
-            $known_document_type = false;
-            foreach ($GLOBALS['LIBRARY_DOCUMENT_TYPES'] as $defined_type) {
-                if ($defined_type['name'] == $this->library_document->type) {
-                    $known_document_type = true;
-                    break;
-                }
-            }
-            if ($known_document_type) {
-                $action_menu->addLink(
-                    URLHelper::getURL('dispatch.php/library_file/edit/' . $this->fileref->id),
-                    _('Bearbeiten'),
-                    Icon::create('edit', Icon::ROLE_CLICKABLE, ['size' => 20]),
-                    ['data-dialog' => 'size=auto']
-                );
-            }
-            $action_menu->addButton(
-                'delete',
-                _('Datei löschen'),
-                Icon::create('trash', Icon::ROLE_CLICKABLE, ['size' => 20]),
-                [
-                    'formaction'   => URLHelper::getURL("dispatch.php/file/delete/{$this->fileref->id}"),
-                    'data-confirm' => sprintf(_('Soll die Datei "%s" wirklich gelöscht werden?'), $this->fileref->name),
-                ]
-            );
-        }
-        return $action_menu;
-    }
-
-
-    public function getInfoDialogButtons(array $extra_link_params = []) : array
-    {
-        $buttons = [];
-        if ($this->isEditable($GLOBALS['user']->id)) {
-            $known_document_type = false;
-            foreach ($GLOBALS['LIBRARY_DOCUMENT_TYPES'] as $defined_type) {
-                if ($defined_type['name'] == $this->library_document->type) {
-                    $known_document_type = true;
-                    break;
-                }
-            }
-            if ($known_document_type) {
-                $buttons[] = Studip\LinkButton::create(
-                    _('Bearbeiten'),
-                    URLHelper::getURL('dispatch.php/library_file/edit/' . $this->fileref->id),
-                    ['data-dialog' => 'size=auto']
-                );
-            }
-        }
-
-        if ($this->isDownloadable($GLOBALS['user']->id) && $this->getDownloadURL()) {
-            $buttons[] = Studip\LinkButton::create(
-                $this->hasFileAttached() ? _('Herunterladen') : _('Öffnen'),
-                $this->getDownloadURL(),
-                ['target' => '_blank']
-            );
-        }
-
-        return $buttons;
-    }
-
-
-    public function isEditable($user_id = null)
-    {
-        if ($this->fileref instanceof FileRef) {
-            return parent::isEditable($user_id);
-        }
-        return false;
-    }
-
-
-    public function getInfoTemplate(bool $include_downloadable_infos = false)
-    {
-        if (!$this->library_document) {
-            return null;
-        }
-        return $this->library_document->getInfoTemplate('full');
-    }
-
-
-    /**
-     * This is a method special to the LibraryFile class.
-     * It handles the attachment of a (real) File object to this LibraryFile.
-     * In that case, the library metadata must be transferred from the (virtual)
-     * file that is attached to the LibraryFile to the specified file that
-     * shall be attached.
-     *
-     * @param File $file The file to attach to this LibraryFile.
-     *
-     * @throws Exception In case of an error, an exception with an error message
-     *     is thrown.
-     */
-    public function attachFile(File $file) : bool
-    {
-        if ($file->isNew()) {
-            //The file must be stored in the database.
-            if (!$file->store()) {
-                throw new Exception(_('Fehler beim Speichern der Datei!'));
-            }
-        }
-        if ($this->fileref instanceof FileRef) {
-            $old_file = $this->fileref->file;
-            if (!($old_file instanceof File)) {
-                throw new Exception(_('Es gibt kein Dateiobjekt zum Bibliothekseintrag!'));
-            }
-            if ($old_file->id == $file->id) {
-                //The file is already attached.
-                return true;
-            }
-            $metadata = $old_file->metadata;
-            if (!$metadata) {
-                //Something went wrong.
-                throw new Exception(_('Das Dateiobjekt zum Bibliothekseintrag hat keine Metadaten!'));
-            }
-            $file->metadata = $metadata;
-            $file->filetype = get_class($this);
-            if ($file->isDirty()) {
-                if (!$file->store()) {
-                    throw new Exception(_('Die neue Datei konnte nicht gespeichert werden!'));
-                }
-            }
-            $this->fileref->file_id = $file->id;
-            $this->fileref->name = $file->name;
-            if ($this->fileref->isDirty()) {
-                if ($this->fileref->store()) {
-                    $old_file->delete();
-                } else {
-                    throw new Exception(_('Die Verknüfpung der Datei mit dem Bibliothekseintrag konnte nicht gespeichert werden!'));
-                }
-            }
-            $this->file = $file;
-        } else {
-            throw new Exception(_('Der Bibliothekseintrag ist nicht mit einer virtuellen Datei verknüpft!'));
-        }
-
-        return true;
-    }
-
-
-    /**
-     * This method checks if a real file is attached to this library file.
-     *
-     * @returns bool True, if a real file is attached, false otherwise.
-     */
-    public function hasFileAttached() : bool
-    {
-        return file_exists($this->file->path);
-    }
-
-    public function hasURL()
-    {
-        if (isset($this->file->metadata['csl_data']['URL']) && !isset($this->file->metadata['url'])) {
-            $this->file->metadata['url'] = $this->file->metadata['csl_data']['URL'];
-            $this->file->metadata['access_type'] = 'redirect';
-            $this->file->store();
-        }
-        return isset($this->file->metadata['url']);
-    }
-
-    public function removeDataFile()
-    {
-        if ($this->hasFileAttached()) {
-            $this->file->deleteDataFile();
-            $this->file->mime_type = '';
-            $this->file->name = '';
-            $this->file->size = 0;
-            $this->file->metadata['url'] = null;
-            $this->file->metadata['access_type'] = null;
-            $this->fileref->name = '';
-            $this->fileref->store();
-            return $this->file->store();
-        }
-    }
-}
diff --git a/lib/filesystem/LibraryFile.php b/lib/filesystem/LibraryFile.php
new file mode 100644
index 0000000..c9524e3
--- /dev/null
+++ b/lib/filesystem/LibraryFile.php
@@ -0,0 +1,401 @@
+<?php
+/**
+ * This file is part of Stud.IP.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2020
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.6
+ */
+
+
+class LibraryFile extends StandardFile
+{
+    public $library_document = null;
+
+
+    public function __construct($fileref, $file = null)
+    {
+        parent::__construct($fileref, $file);
+
+        if (is_object($this->file->metadata)) {
+            $this->library_document = LibraryDocument::createFromArray($this->file->metadata->getArrayCopy());
+        }
+    }
+
+    public function getFile()
+    {
+        return $this->file;
+    }
+
+    public function getFileRef()
+    {
+        return $this->fileref;
+    }
+
+    public static function createFromLibraryDocument(LibraryDocument $document, $folder_id = null, $user_id = null)
+    {
+        $file = new File();
+        $file->name = '';
+        $file->size = '0';
+        $file->mime_type = '';
+        $file->metadata = $document->toJson();
+        $file->user_id = $user_id ? $user_id : $GLOBALS['user']->id;
+        $file->filetype = get_called_class();
+        if ($document->csl_data['URL'] || $document->opac_link) {
+            $file->metadata['url'] = $document->opac_link ?: $document->csl_data['URL'];
+            $file->metadata['access_type'] = 'redirect';
+        }
+        $file->store();
+
+        $file_ref = new FileRef();
+        $file_ref->file_id = $file->id;
+        $file_ref->folder_id = $folder_id ? $folder_id : '';
+        $file_ref->name = $file->name;
+        $file_ref->downloads = 0;
+        $file_ref->description = $document->csl_data['description'] ? $document->csl_data['description'] : '';
+        $file_ref->content_terms_of_use_id = ContentTermsOfUse::findDefault()->id;
+        $file_ref->user_id = $file->user_id;
+        $file_ref->store();
+
+        return new LibraryFile($file_ref);
+    }
+
+
+    /**
+     * Updates the LibraryFile by using a LibraryDocument instance.
+     *
+     * @param LibraryDocument $document The document containing the new data.
+     *
+     * @returns bool True, if the update was successful, false otherwise.
+     */
+    public function updateFromLibraryDocument(LibraryDocument $document) : bool
+    {
+        if ($this->file instanceof File) {
+            $file_name = self::getFileNameFromDocument($document);
+            $this->file->name = $file_name;
+            $this->file->metadata = $document->toJson();
+            if ($this->file->isDirty()) {
+                if (!$this->file->store()) {
+                    return false;
+                }
+            }
+            $this->fileref->name = $this->file->name;
+            if ($this->fileref->isDirty()) {
+                return $this->fileref->store();
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Extracts a file name from a LibraryDocument instance.
+     * This is an internal helper method.
+     *
+     * @param LibraryDocument $document The document from which a file name
+     *     shall be extracted.
+     *
+     * @returns string The extracted file name.
+     */
+    protected static function getFileNameFromDocument(LibraryDocument $document) : string
+    {
+        $file_name = $document->getTitle();
+        if (!$file_name) {
+            //The document hasn't got a title. We can still generate a file name
+            //using the search parameters of the document.
+            if ($document->search_params[LibrarySearch::TITLE]) {
+                $file_name = $document->search_params[LibrarySearch::TITLE];
+            } elseif ($document->search_params[LibrarySearch::AUTHOR]) {
+                if ($document->search_params[LibrarySearch::YEAR]) {
+                    $file_name = sprintf(
+                        '%1$s (%2$s)',
+                        $document->search_params[LibrarySearch::AUTHOR],
+                        $document->search_params[LibrarySearch::YEAR]
+                    );
+                } else {
+                    $file_name = $document->search_params[LibrarySearch::AUTHOR];
+                }
+            } elseif ($document->search_params[LibrarySearch::NUMBER]) {
+                $file_name = $document->search_params[LibrarySearch::NUMBER];
+            } elseif ($document->search_params[LibrarySearch::SIGNATURE]) {
+                $file_name = $document->search_params[LibrarySearch::SIGNATURE];
+            } else {
+                $file_name = _('unbekannt');
+            }
+        }
+        return $file_name;
+    }
+
+
+    public function getIcon($role)
+    {
+        if ($this->library_document instanceof LibraryDocument) {
+            $icon = $this->library_document->getIcon();
+        }
+        return $icon && $icon->getShape() !== 'literature-request' ? $icon : Icon::create('literature', $role);
+    }
+
+
+    public function getFilename()
+    {
+        $file_name = '';
+        if ($this->library_document instanceof LibraryDocument) {
+            $file_name = $this->library_document->getTitle('long');
+        }
+        if (!$file_name && $this->library_document->search_params) {
+            $formatted_params = $this->library_document->getSearchDescription();
+            $file_name = _('Suche in der Bibliothek');
+            if ($formatted_params) {
+                $file_name .= ': ' . implode(', ', $formatted_params);
+            }
+        }
+        if (!$file_name && ($this->fileref instanceof FileRef)) {
+            $file_name = $this->fileref->name;
+        }
+        return $file_name;
+    }
+
+
+    public function getSize()
+    {
+        if ($this->fileref instanceof FileRef) {
+            return $this->fileref['size'];
+        }
+        return null;
+    }
+
+
+    public function getDownloadURL()
+    {
+        if ($this->hasFileAttached() || $this->hasURL()) {
+            if ($this->fileref instanceof FileRef) {
+                return $this->fileref->getDownloadURL();
+            }
+        }
+        return '';
+    }
+
+
+    public function getPath() : string
+    {
+        return $this->file instanceof File ? $this->file->getPath() : '';
+    }
+
+
+    public function getDownloads()
+    {
+        if ($this->fileref instanceof FileRef) {
+            return $this->fileref['downloads'];
+        }
+        return 0;
+    }
+
+
+    public function getActionmenu()
+    {
+        $action_menu = ActionMenu::get();
+        $action_menu->addLink(
+            URLHelper::getURL(sprintf('dispatch.php/file/details/%s/1', $this->fileref->id)),
+            _('Info'),
+            Icon::create('info-circle', Icon::ROLE_CLICKABLE, ['size' => 20]),
+            ['data-dialog' => ''],
+            'file-display-info'
+        );
+        if (Config::get()->LITERATURE_ENABLE && Context::get() && $GLOBALS['perm']->have_studip_perm('tutor', Context::getId())) {
+            $plugin_manager = PluginManager::getInstance();
+            $library_plugins = $plugin_manager->getPlugins(LibraryPlugin::class);
+            if (count($library_plugins)) {
+                $plugin = $library_plugins[0];
+                $action_menu->addLink(
+                    $plugin->getRequestURL($this->getId()),
+                    $plugin->getRequestTitle(),
+                    $plugin->getRequestIcon(),
+                    ['data-dialog' => 'size=auto;reload-on-close;id=' . $plugin->getPluginId()]
+                );
+            }
+        }
+        if (parent::isWritable($GLOBALS['user']->id)) {
+            //Before the edit action can be displayed, we must make sure
+            //the library document is one that is defined.
+            $known_document_type = false;
+            foreach ($GLOBALS['LIBRARY_DOCUMENT_TYPES'] as $defined_type) {
+                if ($defined_type['name'] == $this->library_document->type) {
+                    $known_document_type = true;
+                    break;
+                }
+            }
+            if ($known_document_type) {
+                $action_menu->addLink(
+                    URLHelper::getURL('dispatch.php/library_file/edit/' . $this->fileref->id),
+                    _('Bearbeiten'),
+                    Icon::create('edit', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                    ['data-dialog' => 'size=auto']
+                );
+            }
+            $action_menu->addButton(
+                'delete',
+                _('Datei löschen'),
+                Icon::create('trash', Icon::ROLE_CLICKABLE, ['size' => 20]),
+                [
+                    'formaction'   => URLHelper::getURL("dispatch.php/file/delete/{$this->fileref->id}"),
+                    'data-confirm' => sprintf(_('Soll die Datei "%s" wirklich gelöscht werden?'), $this->fileref->name),
+                ]
+            );
+        }
+        return $action_menu;
+    }
+
+
+    public function getInfoDialogButtons(array $extra_link_params = []) : array
+    {
+        $buttons = [];
+        if ($this->isEditable($GLOBALS['user']->id)) {
+            $known_document_type = false;
+            foreach ($GLOBALS['LIBRARY_DOCUMENT_TYPES'] as $defined_type) {
+                if ($defined_type['name'] == $this->library_document->type) {
+                    $known_document_type = true;
+                    break;
+                }
+            }
+            if ($known_document_type) {
+                $buttons[] = Studip\LinkButton::create(
+                    _('Bearbeiten'),
+                    URLHelper::getURL('dispatch.php/library_file/edit/' . $this->fileref->id),
+                    ['data-dialog' => 'size=auto']
+                );
+            }
+        }
+
+        if ($this->isDownloadable($GLOBALS['user']->id) && $this->getDownloadURL()) {
+            $buttons[] = Studip\LinkButton::create(
+                $this->hasFileAttached() ? _('Herunterladen') : _('Öffnen'),
+                $this->getDownloadURL(),
+                ['target' => '_blank']
+            );
+        }
+
+        return $buttons;
+    }
+
+
+    public function isEditable($user_id = null)
+    {
+        if ($this->fileref instanceof FileRef) {
+            return parent::isEditable($user_id);
+        }
+        return false;
+    }
+
+
+    public function getInfoTemplate(bool $include_downloadable_infos = false)
+    {
+        if (!$this->library_document) {
+            return null;
+        }
+        return $this->library_document->getInfoTemplate('full');
+    }
+
+
+    /**
+     * This is a method special to the LibraryFile class.
+     * It handles the attachment of a (real) File object to this LibraryFile.
+     * In that case, the library metadata must be transferred from the (virtual)
+     * file that is attached to the LibraryFile to the specified file that
+     * shall be attached.
+     *
+     * @param File $file The file to attach to this LibraryFile.
+     *
+     * @throws Exception In case of an error, an exception with an error message
+     *     is thrown.
+     */
+    public function attachFile(File $file) : bool
+    {
+        if ($file->isNew()) {
+            //The file must be stored in the database.
+            if (!$file->store()) {
+                throw new Exception(_('Fehler beim Speichern der Datei!'));
+            }
+        }
+        if ($this->fileref instanceof FileRef) {
+            $old_file = $this->fileref->file;
+            if (!($old_file instanceof File)) {
+                throw new Exception(_('Es gibt kein Dateiobjekt zum Bibliothekseintrag!'));
+            }
+            if ($old_file->id == $file->id) {
+                //The file is already attached.
+                return true;
+            }
+            $metadata = $old_file->metadata;
+            if (!$metadata) {
+                //Something went wrong.
+                throw new Exception(_('Das Dateiobjekt zum Bibliothekseintrag hat keine Metadaten!'));
+            }
+            $file->metadata = $metadata;
+            $file->filetype = get_class($this);
+            if ($file->isDirty()) {
+                if (!$file->store()) {
+                    throw new Exception(_('Die neue Datei konnte nicht gespeichert werden!'));
+                }
+            }
+            $this->fileref->file_id = $file->id;
+            $this->fileref->name = $file->name;
+            if ($this->fileref->isDirty()) {
+                if ($this->fileref->store()) {
+                    $old_file->delete();
+                } else {
+                    throw new Exception(_('Die Verknüfpung der Datei mit dem Bibliothekseintrag konnte nicht gespeichert werden!'));
+                }
+            }
+            $this->file = $file;
+        } else {
+            throw new Exception(_('Der Bibliothekseintrag ist nicht mit einer virtuellen Datei verknüpft!'));
+        }
+
+        return true;
+    }
+
+
+    /**
+     * This method checks if a real file is attached to this library file.
+     *
+     * @returns bool True, if a real file is attached, false otherwise.
+     */
+    public function hasFileAttached() : bool
+    {
+        return file_exists($this->file->path);
+    }
+
+    public function hasURL()
+    {
+        if (isset($this->file->metadata['csl_data']['URL']) && !isset($this->file->metadata['url'])) {
+            $this->file->metadata['url'] = $this->file->metadata['csl_data']['URL'];
+            $this->file->metadata['access_type'] = 'redirect';
+            $this->file->store();
+        }
+        return isset($this->file->metadata['url']);
+    }
+
+    public function removeDataFile()
+    {
+        if ($this->hasFileAttached()) {
+            $this->file->deleteDataFile();
+            $this->file->mime_type = '';
+            $this->file->name = '';
+            $this->file->size = 0;
+            $this->file->metadata['url'] = null;
+            $this->file->metadata['access_type'] = null;
+            $this->fileref->name = '';
+            $this->fileref->store();
+            return $this->file->store();
+        }
+    }
+}
diff --git a/lib/filesystem/ResourceFolder.class.php b/lib/filesystem/ResourceFolder.class.php
deleted file mode 100644
index ce7b216..0000000
--- a/lib/filesystem/ResourceFolder.class.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-
-/**
- * This is a folder type for files associated with Resource objects.
- * Its purpose is to allow users to link or add relevant files
- * to a Resource.
- * An an example, one could attach a fire escape plan to a Building resource.
- */
-class ResourceFolder extends StandardFolder
-{
-    public static function getTypeName()
-    {
-        return _('Ressourcen-Dateiordner');
-    }
-
-    public static function availableInRange($range_id_or_object, $user_id)
-    {
-        //A resource folder is not available for course, user, institute
-        //or message objects. Only when a range_id of a resource is given
-        //or a resource object we may return true.
-
-        if ($range_id_or_object instanceof Resource) {
-            //$range_id_or_object contains a Resource object.
-            return true;
-        } else {
-            //$range_id_or_object contains an ID.
-            //If we find a resource object for that ID
-            //we can return true, otherwise we return false.
-            return Resource::exists($range_id_or_object);
-        }
-    }
-
-    public function getIcon($role = Icon::DEFAULT_ROLE)
-    {
-        return Icon::create('resource', $role);
-    }
-
-    public function isVisible($user_id)
-    {
-        if ($user_id == 'nobody') {
-            return false;
-        }
-        //Get the resource object:
-        $resource = Resource::find($this->range_id);
-        $user = User::find($user_id);
-
-        if (($resource instanceof Resource) && ($user instanceof User)) {
-            return true;
-        } elseif ($user instanceof User) {
-            //Check global permissions:
-            return ResourceManager::userHasGlobalPermission(
-                $user,
-                'admin'
-            );
-        }
-        return false;
-    }
-
-    public function isReadable($user_id)
-    {
-        if ($user_id == 'nobody') {
-            return false;
-        }
-        //Get the resource object:
-        $resource = Resource::find($this->range_id);
-        $user = User::find($user_id);
-
-        if (($resource instanceof Resource) && ($user instanceof User)) {
-            return true;
-        } elseif ($user instanceof User) {
-            //Check global permissions:
-            return ResourceManager::userHasGlobalPermission(
-                $user,
-                'admin'
-            );
-        }
-        return false;
-    }
-
-    public function isWritable($user_id)
-    {
-        $user = User::find($user_id);
-
-        //Check global permissions: The user has to be
-        //a global resource admin or a root user.
-        return ResourceManager::userHasGlobalPermission(
-            $user,
-            'admin'
-        );
-    }
-
-    public function isEditable($user_id)
-    {
-        //Thou shalt not edit ResourceFolder folder types!
-        return false;
-    }
-
-    public function isSubfolderAllowed($user_id)
-    {
-        //Furthermore, thou shalt not create subfolders in a Resource folder!
-        return false;
-    }
-
-    public function getSubfolder()
-    {
-        //No subfolders allowed, resulting in:
-        return [];
-    }
-
-    public function getEditTemplate()
-    {
-        return '';
-    }
-
-    public function setDataFromEditTemplate($folderdata)
-    {
-        return MessageBox::error(
-            _('Ressourcenordner dürfen nicht geändert werden!')
-        );
-    }
-
-    public function createSubfolder(FolderType $foldertype)
-    {
-        //No subfolders allowed, resulting in:
-        return null;
-    }
-
-    public function deleteSubfolder($subfolder_id)
-    {
-        //No subfolders allowed, resulting in:
-        return false;
-    }
-
-    public function isFileDownloadable($file_ref_id, $user_id)
-    {
-        return $this->isReadable($user_id);
-    }
-
-    public function isFileEditable($file_ref_id, $user_id)
-    {
-        return $this->isWritable($user_id);
-    }
-
-    public function isFileWritable($file_ref_id, $user_id)
-    {
-        return $this->isWritable($user_id);
-    }
-}
diff --git a/lib/filesystem/ResourceFolder.php b/lib/filesystem/ResourceFolder.php
new file mode 100644
index 0000000..ce7b216
--- /dev/null
+++ b/lib/filesystem/ResourceFolder.php
@@ -0,0 +1,149 @@
+<?php
+
+
+/**
+ * This is a folder type for files associated with Resource objects.
+ * Its purpose is to allow users to link or add relevant files
+ * to a Resource.
+ * An an example, one could attach a fire escape plan to a Building resource.
+ */
+class ResourceFolder extends StandardFolder
+{
+    public static function getTypeName()
+    {
+        return _('Ressourcen-Dateiordner');
+    }
+
+    public static function availableInRange($range_id_or_object, $user_id)
+    {
+        //A resource folder is not available for course, user, institute
+        //or message objects. Only when a range_id of a resource is given
+        //or a resource object we may return true.
+
+        if ($range_id_or_object instanceof Resource) {
+            //$range_id_or_object contains a Resource object.
+            return true;
+        } else {
+            //$range_id_or_object contains an ID.
+            //If we find a resource object for that ID
+            //we can return true, otherwise we return false.
+            return Resource::exists($range_id_or_object);
+        }
+    }
+
+    public function getIcon($role = Icon::DEFAULT_ROLE)
+    {
+        return Icon::create('resource', $role);
+    }
+
+    public function isVisible($user_id)
+    {
+        if ($user_id == 'nobody') {
+            return false;
+        }
+        //Get the resource object:
+        $resource = Resource::find($this->range_id);
+        $user = User::find($user_id);
+
+        if (($resource instanceof Resource) && ($user instanceof User)) {
+            return true;
+        } elseif ($user instanceof User) {
+            //Check global permissions:
+            return ResourceManager::userHasGlobalPermission(
+                $user,
+                'admin'
+            );
+        }
+        return false;
+    }
+
+    public function isReadable($user_id)
+    {
+        if ($user_id == 'nobody') {
+            return false;
+        }
+        //Get the resource object:
+        $resource = Resource::find($this->range_id);
+        $user = User::find($user_id);
+
+        if (($resource instanceof Resource) && ($user instanceof User)) {
+            return true;
+        } elseif ($user instanceof User) {
+            //Check global permissions:
+            return ResourceManager::userHasGlobalPermission(
+                $user,
+                'admin'
+            );
+        }
+        return false;
+    }
+
+    public function isWritable($user_id)
+    {
+        $user = User::find($user_id);
+
+        //Check global permissions: The user has to be
+        //a global resource admin or a root user.
+        return ResourceManager::userHasGlobalPermission(
+            $user,
+            'admin'
+        );
+    }
+
+    public function isEditable($user_id)
+    {
+        //Thou shalt not edit ResourceFolder folder types!
+        return false;
+    }
+
+    public function isSubfolderAllowed($user_id)
+    {
+        //Furthermore, thou shalt not create subfolders in a Resource folder!
+        return false;
+    }
+
+    public function getSubfolder()
+    {
+        //No subfolders allowed, resulting in:
+        return [];
+    }
+
+    public function getEditTemplate()
+    {
+        return '';
+    }
+
+    public function setDataFromEditTemplate($folderdata)
+    {
+        return MessageBox::error(
+            _('Ressourcenordner dürfen nicht geändert werden!')
+        );
+    }
+
+    public function createSubfolder(FolderType $foldertype)
+    {
+        //No subfolders allowed, resulting in:
+        return null;
+    }
+
+    public function deleteSubfolder($subfolder_id)
+    {
+        //No subfolders allowed, resulting in:
+        return false;
+    }
+
+    public function isFileDownloadable($file_ref_id, $user_id)
+    {
+        return $this->isReadable($user_id);
+    }
+
+    public function isFileEditable($file_ref_id, $user_id)
+    {
+        return $this->isWritable($user_id);
+    }
+
+    public function isFileWritable($file_ref_id, $user_id)
+    {
+        return $this->isWritable($user_id);
+    }
+}
diff --git a/lib/ilias_interface/ConnectedIlias.class.php b/lib/ilias_interface/ConnectedIlias.class.php
deleted file mode 100644
index 5b9c1bf..0000000
--- a/lib/ilias_interface/ConnectedIlias.class.php
+++ /dev/null
@@ -1,1370 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* main-class for connected systems
-*
-* This class contains the main methods of the ilias-interface to connect ILIAS installations.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  ilias_interface_modules
-* @module       ConnectedIlias
-* @package  ILIAS-Interface
-*/
-class ConnectedIlias
-{
-    const CRS_NOTIFICATION= '1';
-    const CRS_NO_NOTIFICATION= '2';
-    const CRS_ADMIN_ROLE= '1';
-    const CRS_MEMBER_ROLE= '2';
-    const CRS_TUTOR_ROLE= '3';
-    const CRS_PASSED_VALUE= '0';
-
-    const OPERATION_VISIBLE= 'visible';
-    const OPERATION_READ= 'read';
-    const OPERATION_WRITE= 'write';
-    const OPERATION_COPY= 'copy';
-    const OPERATION_DELETE= 'delete';
-    const OPERATION_EDIT_LEARNING_PROGRESS = 'edit_learning_progress';
-    const OPERATION_VIEW_TEST_STATISTICS = 'tst_statistics';
-    const OPERATION_READ_LEARNING_PROGRESS = 'read_learning_progress';
-    const OPERATION_EDIT_SUBMISSION_GRADES = 'edit_submissions_grades';
-    const OPERATION_VIEW_TEST_RESULTS = 'tst_results';
-
-    public $index;
-    public $ilias_config;
-    public $ilias_interface_config;
-    public $ilias_int_version;
-    public $global_roles;
-    public $crs_roles;
-    public $error;
-
-    public $soap_client;
-    public $course_modules;
-    public $user;
-    public $user_modules;
-
-    public $operations;
-    public $user_operations;
-    public $allowed_operations;
-    public $tree_allowed_operations;
-
-    /**
-    * constructor
-    *
-    * ILIAS connection main class
-    * @access
-    * @param string $index ilias installation index
-    */
-    public function __construct($index)
-    {
-        // load settings
-        $this->index = $index;
-        $this->error = [];
-        $this->global_roles = [4,5,14];
-        $this->loadSettings();
-        $this->crs_roles = [
-                        "autor" => "member",
-                        "tutor" => "tutor",
-                        "dozent" => "admin",
-                        "admin" => "admin",
-                        "root" => "admin"
-        ];
-        $this->user_operations = [self::OPERATION_VISIBLE, self::OPERATION_READ];
-        $this->operations = [];
-        $this->course_modules = [];
-        $this->user_modules = [];
-
-        // set ILIAS version as integer value
-        $this->ilias_int_version = $this->getIntVersion($this->ilias_config['version']);
-
-        // init soap client
-        $this->soap_client = new IliasSoap($this->index, $this->ilias_config['url'].'/webservice/soap/server.php?wsdl', $this->ilias_config['client'], $this->ilias_int_version, $this->ilias_config['admin'], $this->ilias_config['admin_pw']);
-        $this->soap_client->setCachingStatus($this->ilias_interface_config['cache']);
-
-        // init current user (only if ILIAS installation is active)
-        if ($this->ilias_config['is_active']) {
-            $this->user = new IliasUser($this->index, $this->ilias_config['version']);
-            // create account automatically if it doesn't exist
-            if (! $this->user->isConnected()) {
-                $this->soap_client->setCachingStatus(false);
-                $this->soap_client->clearCache();
-                $this->newUser();
-            } else {
-                NotificationCenter::addObserver($this, "updateUser", "UserDidUpdate");
-            }
-            // create user category if user has ILIAS author permission
-            if ($GLOBALS['perm']->have_perm($this->ilias_config['author_perm']) && ! $this->ilias_config['category_create_on_add_module'] && ! $this->user->getCategory()) {
-                $this->soap_client->setCachingStatus(false);
-                $this->soap_client->clearCache();
-                $this->newUserCategory();
-            }
-        }
-    }
-
-    /**
-     * get ILIAS version as int
-     *
-     * converts ILIAS version to int value
-     * @access public
-     * @return string messages
-     */
-    public static function getIntVersion($version)
-    {
-        $version_array = explode('.', $version);
-        return ((int)$version_array[0]*10000) + ((int)$version_array[1]*100) + ((int)$version_array[2]);
-    }
-
-    /**
-     * load ILIAS settings from config table
-     */
-    public function loadSettings()
-    {
-        $this->ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS;
-
-        $ilias_configs = Config::get()->ILIAS_INTERFACE_SETTINGS;
-        $this->ilias_config = $ilias_configs[$this->index];
-    }
-
-    /**
-     * store settings
-     *
-     * stores current ILIAS settings to config table.
-     * @access public
-     */
-    public function storeSettings()
-    {
-        $ilias_configs = Config::get()->ILIAS_INTERFACE_SETTINGS;
-        $ilias_configs[$this->index] = $this->ilias_config;
-        Config::get()->store('ILIAS_INTERFACE_SETTINGS', $ilias_configs);
-    }
-
-
-    /**
-     * get ILIAS info
-     *
-     * checks ILIAS base settings
-     * @access public
-     * @param string $url
-     * @return array info
-     */
-    public static function getIliasInfo($url)
-    {
-        $info = [];
-        // check if url exists
-        $check = @get_headers($url . 'login.php');
-        if (strpos($check[0], '200') === false) {
-            return $info;
-        } else {
-            $info['url'] = $url;
-        }
-        $soap_client = new IliasSoap('new', $url.'/webservice/soap/server.php?wsdl');
-        $soap_client->setCachingStatus(false);
-        if ($client_info = $soap_client->getInstallationInfoXML()) {
-            $info = array_merge($info, $client_info);
-        }
-        return $info;
-    }
-
-    /**
-     * get soap methods
-     *
-     * returns array of available soap methods
-     * @access public
-     * @return array soap method names
-     */
-    public function getSoapMethods()
-    {
-        // fetch all available SOAP methods
-        $soap_methods = [];
-        if (is_callable([$this->soap_client->soap_client, '__getfunctions'])) {
-            $soap_methods_raw = $this->soap_client->soap_client->__getfunctions();
-            foreach ($soap_methods_raw as $method) {
-                $method_array = explode(' ', $method);
-                preg_match_all('/\${1}[^, )]*/', $method, $param_array);
-                preg_match('/[^(]*/', $method_array[1], $method_name);
-                $soap_methods[$method_name[0]] = [];
-                foreach ($param_array[0] as $par) {
-                    $soap_methods[$method_name[0]][] = substr($par, 1);
-                }
-            }
-        } else {
-            $proxy = $this->soap_client->soap_client->getProxyClassCode();
-            preg_match_all('/function{1}[^{]*/', $proxy, $soap_methods_raw);
-            foreach ($soap_methods_raw[0] as $method) {
-                $method_array = explode(' ', $method);
-                preg_match_all('/\${1}[^, )]*/', $method, $param_array);
-                preg_match('/[^(]*/', $method_array[1], $method_name);
-                $soap_methods[$method_name[0]] = [];
-                foreach ($param_array[0] as $par) {
-                    $soap_methods[$method_name[0]][] = substr($par, 1);;
-                }
-            }
-        }
-        return $soap_methods;
-    }
-
-    /**
-     * get connection status
-     *
-     * checks connection settings
-     * @access public
-     * @return string messages
-     */
-    public function getConnectionSettingsStatus()
-    {
-        // check ILIAS version
-        if (($this->ilias_int_version < 30000)) {
-            $this->error[] = _('Die ILIAS-Version ist ungültig.');
-            return false;
-        }
-
-        // check if url exists
-        $check = @get_headers($this->ilias_config['url'] . 'webservice/soap/server.php');
-        if (strpos($check[0], '200') === false) {
-            $this->error[] = sprintf(_('Die URL "%s" ist nicht erreichbar.'), $this->ilias_config['url']);
-            return false;
-        }
-
-        // check soap connection
-        $res = $this->soap_client->loginAdmin();
-        if (!$res) {
-            $this->error[] = sprintf(_('Anmelden mit dem Account "%s" in der %s-Installation ist fehlgeschlagen.'), $this->ilias_config['admin'], $this->ilias_config['name']);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * get content status
-     *
-     * checks content settings
-     * @access public
-     * @return string messages
-     */
-    public function getContentSettingsStatus()
-    {
-        if (!$this->ilias_config['root_category']) {
-            // check category
-            if (!$this->ilias_config['root_category_name']) {
-                $this->error[] = _("Die ILIAS-Kategorie für Stud.IP-Inhalte wurde noch nicht festgelegt.");
-                return false;
-            }
-            $category = $this->soap_client->getReferenceByTitle($this->ilias_config['root_category_name'], 'cat');
-            if (!$category) {
-                $this->error[] = sprintf(_("Die Kategorie \"%s\" wurde nicht gefunden."), $this->ilias_config['root_category_name']);
-                return false;
-            }
-            if ($category) {
-                $this->ilias_config['root_category'] = $category;
-
-                // check user data category
-                if (! $this->ilias_config['user_data_category']) {
-                    $object_data["title"] = sprintf(_("User-Daten"));
-                    $object_data["description"] = _("Hier befinden sich die persönlichen Ordner der Stud.IP-User.");
-                    $object_data["type"] = "cat";
-                    $object_data["owner"] = $this->soap_client->lookupUser($this->ilias_config['admin']);
-                    $user_cat = $this->soap_client->addObject($object_data, $this->ilias_config['root_category']);
-                    if ($user_cat != false) {
-                        $this->ilias_config['user_data_category'] = $user_cat;
-                    } else {
-                        $this->error[] = sprintf(_("Die Kategorie \"%s\" konnte nicht angelegt werden."), $object_data["title"]);
-                        return false;
-                    }
-                }
-                $this->storeSettings();
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * get permissions status
-     *
-     * checks permissions settings
-     * @access public
-     * @return string messages
-     */
-    public function getPermissionsSettingsStatus()
-    {
-        // check role template
-        if (!$this->ilias_config['author_role_name']) {
-            $this->error[] = _("Das Rollen-Template für die persönliche Kategorie wurde noch nicht festgelegt.");
-            return false;
-        }
-        $role_template = $this->soap_client->getObjectByTitle( $this->ilias_config['author_role_name'], "rolt" );
-        if ($role_template == false) {
-            $this->error[] = sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($this->ilias_config['author_role_name']), htmlReady($this->getName()));
-            return false;
-        }
-        if (is_array($role_template))
-        {
-            $this->ilias_config['author_role'] = $role_template["obj_id"];
-            $this->ilias_config['author_role_name'] = $role_template["title"];
-            $this->storeSettings();
-        }
-        return true;
-    }
-
-    /**
-     * create new user-account
-     *
-     * creates new ILIAS user account
-     * @access public
-     * @return boolean returns false
-     */
-    public function newUser()
-    {
-        if (!$this->user->studip_login) {
-            return false;
-        }
-        $user_data = $this->user->getUserArray();
-        $user_data["login"] = $this->ilias_config['user_prefix'].$user_data["login"];
-
-        $user_exists = $this->soap_client->lookupUser($user_data["login"]);
-        //automatische Zuordnung von bestehenden Ilias Accounts
-        //nur wenn ldap Modus benutzt wird und Stud.IP Nutzer passendes ldap plugin hat
-        if ($user_exists &&
-                ! $this->ilias_config['user_prefix'] &&
-                $this->ilias_config['ldap_enable'] &&
-                ($this->user->auth_plugin != 'standard') &&
-                ($this->user->auth_plugin == $this->ilias_config['ldap_enable'])) {
-            $this->user->id = $user_exists;
-            $this->user->login = $user_data["login"];
-            $this->user->setConnection($this->user->getUserType(), true);
-            PageLayout::postSuccess(sprintf(_("Verbindung mit Nutzer ID %s wiederhergestellt."), $this->user->id));
-            return true;
-        } elseif ($user_exists) {
-            $this->error[] = sprintf(_('Externer Account konnte nicht angelegt werden. Es existiert bereits ein User mit dem Login %s in %s'), $user_data["login"], $this->ilias_config['name']);
-            return false;
-        } elseif ($this->ilias_config['no_account_updates']) {
-            $this->error[] = sprintf(_('Sie haben noch keinen ILIAS-Account. Loggen Sie sich zuerst in %s ein, um ILIAS-Lernobjekte in Stud.IP nutzen zu können.'), "<a href=\"".$this->ilias_config['url']."\">".$this->ilias_config['name']."</a>");
-            return false;
-        } elseif (! $this->ilias_config['user_prefix'] &&
-            $this->ilias_config['ldap_enable'] &&
-            ($this->user->auth_plugin != 'standard') &&
-            ($this->user->auth_plugin == $this->ilias_config['ldap_enable'])) {
-            $user_data['external_account'] = $this->user->studip_login;
-            $auth_plugin = StudipAuthAbstract::getInstance($this->user->auth_plugin);
-            if ($auth_plugin instanceof StudipAuthLdap) {
-                $user_data['auth_mode'] = 'ldap';
-            } elseif ($auth_plugin instanceof StudipAuthCAS) {
-                $user_data['auth_mode'] = 'cas';
-            } elseif ($auth_plugin instanceof StudipAuthShib) {
-                $user_data['auth_mode'] = 'shibboleth';
-            }
-        }
-
-        // set role according to Stud.IP perm
-        if (User::findCurrent()->perms === 'root') {
-            $role_id = 2;
-        } else {
-            $role_id = 4;
-        }
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-        $user_id = $this->soap_client->addUser($user_data, $role_id);
-        if ($user_id != false)
-        {
-            $this->user->id = $user_id;
-            $this->user->login = $this->ilias_config['user_prefix'].$this->user->studip_login;
-
-            $this->user->setConnection(IliasUser::USER_TYPE_CREATED);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * update given user account
-     *
-     * updates ILIAS user data
-     * @access public
-     * @param $user Stud.IP user object
-     * @return boolean returns false
-     */
-    public function updateUser($user)
-    {
-        if (! is_object($user)) {
-            return false;
-        }
-        $update_user = new IliasUser($this->index, $this->ilias_config['version'], $user->id);
-      // don't update ldap user
-        if (! $this->ilias_config['user_prefix'] &&
-            $this->ilias_config['ldap_enable'] &&
-            ($update_user->auth_plugin != 'standard') &&
-            ($update_user->auth_plugin == $this->ilias_config['ldap_enable'])) {
-            return true;
-        } elseif ($this->ilias_config['no_account_updates']) {
-            return true;
-        }
-        // if user is manually connected don't update user data
-        if ($update_user->getUserType() == IliasUser::USER_TYPE_ORIGINAL) {
-            return true;
-        }
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-        if ($update_user->isConnected() && $update_user->id && $this->soap_client->lookupUser($update_user->login)) {
-            $user_data = $update_user->getUserArray();
-            $user_data["login"] = $this->ilias_config['user_prefix'].$user_data["login"];
-
-            // set role according to Stud.IP perm
-            if ($user->perms == "root") {
-                $role_id = 2;
-            } else {
-                $role_id = 4;
-            }
-
-            $user_id = $this->soap_client->addUser($user_data, $role_id);
-            if ($user_id != false) {
-                $update_user->login = $user_data["login"];
-                $update_user->setConnection(IliasUser::USER_TYPE_CREATED);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * delete given user account
-     *
-     * deletes ILIAS user data
-     * @access public
-     * @param $user Stud.IP user object
-     * @return boolean returns false
-     */
-    public function deleteUser($user)
-    {
-        if (! is_object($user)) {
-            return false;
-        }
-        $delete_user = new IliasUser($this->index, $this->ilias_config['version'], $user->id);
-        // if user is manually connected don't remove user
-        if ($delete_user->getUserType() == IliasUser::USER_TYPE_ORIGINAL) {
-            return true;
-        }
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-        if ($delete_user->isConnected() && $delete_user->id && $this->soap_client->lookupUser($delete_user->login)) {
-            $deleted = $this->soap_client->deleteUser($delete_user->id);
-            if ($deleted) {
-                $query = "DELETE FROM auth_extern WHERE studip_user_id = ? AND external_user_system_type = ?";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([
-                                (string)$user->id,
-                                (string)$this->index
-                ]);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * delete given course
-     *
-     * deletes ILIAS course data
-     * @access public
-     * @param $course Stud.IP course object
-     * @return boolean returns false
-     */
-    public function deleteCourse($course)
-    {
-        if (! is_object($course)) {
-            return false;
-        }
-
-        $crs_id = IliasObjectConnections::getConnectionModuleId($course->id, 'crs', $this->index);
-        if (! $crs_id) {
-            return false;
-        }
-
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-        $deleted = $this->soap_client->deleteObject($crs_id);
-        if ($deleted) {
-            IliasObjectConnections::DeleteAllConnections($course->id, $this->index);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * create new user category
-     *
-     * creates new ILIAS user account
-     * @access public
-     * @return boolean returns false
-     */
-    public function newUserCategory()
-    {
-        if (!$this->user->isConnected()) {
-            return false;
-        }
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-
-        // data for user category in ILIAS
-        $object_data["title"] = sprintf(_("Eigene Daten von %s (%s)."), $this->user->getName(), $this->user->getId());
-        $object_data["description"] = sprintf(_("Hier befinden sich die persönlichen Lernmodule des Benutzers %s."), $this->user->getName());
-        $object_data["type"] = "cat";
-        $object_data["owner"] = $this->user->getId();
-
-        // check if category already exists
-        $cat = $this->soap_client->getReferenceByTitle($object_data["title"]);
-        if (($cat != false) && $this->soap_client->checkReferenceById($cat) ) {
-            $this->user->category = $cat;
-        } else {
-            // add new user category at main user data category in ILIAS
-            $this->user->category = $this->soap_client->addObject($object_data, $this->ilias_config['user_data_category']);
-        }
-        if ($this->ilias_config['category_to_desktop'] && $this->user->category) {
-            $this->soap_client->addDesktopItems($this->user->getId(), [$this->user->category]);
-        }
-
-        // store data
-        if ($this->user->category != false) {
-            $this->user->setConnection($this->user->getUserType());
-        } else {
-            $this->error[] = _('ILIAS-User-Kategorie konnte nicht angelegt werden.');
-            return false;
-        }
-
-        // personal user role in ILIAS
-        $role_data["title"] = "studip_usr" . $this->user->getId() . "_cat" . $this->user->category;
-        $role_data["description"] = sprintf(_("User-Rolle von %s. Diese Rolle wurde von Stud.IP generiert."), $this->user->getName());
-        $role_id = $this->soap_client->getObjectByTitle($role_data["title"], "role");
-        if ($role_id == false) {
-            $role_id = $this->soap_client->addRoleFromTemplate($role_data, $this->user->getCategory(), $this->ilias_config['author_role']);
-        }
-        $this->soap_client->addUserRoleEntry($this->user->getId(), $role_id);
-
-        // delete permissions for all global roles (User, Guest, Anonymous) for this category
-        foreach ($this->global_roles as $key => $role) {
-            $this->soap_client->revokePermissions($role, $this->user->category);
-        }
-        return true;
-    }
-
-    /**
-     * get ILIAS user full name
-     *
-     * returns full name of given ILIAS user ID
-     * @access public
-     * @param $user_id ILIAS user id
-     * @return string full name
-     */
-    public function getUserFullname($user_id)
-    {
-        return $this->soap_client->getUserFullname($user_id);
-    }
-
-    /**
-     * get ILIAS path
-     *
-     * returns full path for given ILIAS ref ID
-     * @access public
-     * @param $ref_id ILIAS reference id
-     * @return string path
-     */
-    public function getPath($ref_id)
-    {
-        return $this->soap_client->getPath($ref_id);
-    }
-
-    /**
-     * get structure
-     *
-     * returns structure for given ILIAS lm ID
-     * @access public
-     * @param $ref_id ILIAS reference id
-     * @return string path
-     */
-    public function getStructure($ref_id)
-    {
-        return $this->soap_client->getStructure($ref_id);
-    }
-
-    /**
-     * get supported module types
-     *
-     * returns all active module types for current ILIAS installation
-     * @access public
-     */
-    public static function getsupportedModuleTypes()
-    {
-        return [
-//                        'cat'  => _('Kategorie'),
-//                        'crs'  => _('Kurs'),
-                        'webr' => _('Weblink'),
-                        'htlm' => _('HTML-Lernmodul'),
-                        'sahs' => _('SCORM/AICC-Lernmodul'),
-                        'lm'   => _('ILIAS-Lernmodul'),
-                        'glo'  => _('Glossar'),
-                        'tst'  => _('Test'),
-                        'svy'  => _('Umfrage'),
-                        'exc'  => _('Übung')
-        ];
-    }
-
-    /**
-     * get active module types
-     *
-     * returns all active module types for current ILIAS installation
-     * @access public
-     */
-    public function getAllowedModuleTypes()
-    {
-        return $this->ilias_config['modules'];
-    }
-
-    /**
-     * check is module type is allowed
-     *
-     * returns true if module type is allowed for current ILIAS installation
-     * @access public
-     */
-    public function isAllowedModuleType($module_type)
-    {
-        return (boolean)$this->ilias_config['modules'][$module_type];
-    }
-
-    /**
-     * get existing ilias indices
-     *
-     * loads existing indices of all ilias installations from database
-     * @access public
-     */
-    public static function getExistingIndices()
-    {
-        $query = "SELECT DISTINCT external_user_system_type FROM auth_extern ORDER BY external_user_system_type ASC";
-        return DBManager::get()->fetchGrouped($query);
-    }
-
-    /**
-     * get user modules
-     *
-     * returns content modules from current users private category
-     * @access public
-     * @return array list of content modules
-     */
-    public function getUserModules()
-    {
-        if (count($this->user_modules)) {
-            return $this->user_modules;
-        }
-        $types = [];
-        foreach ($this->getAllowedModuleTypes() as $type => $name) {
-            $types[] = $type;
-        }
-        if ($this->user->getCategory() == false) {
-            return [];
-        }
-        $result = $this->soap_client->getTreeChilds($this->user->getCategory(), $types, $this->user->getId());
-        $obj_ids = [];
-        if (is_array($result)) {
-            foreach($result as $key => $object_data) {
-                $this->user_modules[$key] = new IliasModule($key, $object_data, $this->index, $this->ilias_int_version);
-            }
-        }
-        return $this->user_modules;
-    }
-
-
-    /**
-     * get module
-     *
-     * returns module instance by ID
-     * @access public
-     * @param string $module_id ILIAS ref id
-     * @return instance of IliasModule
-     */
-    public function getModule($module_id)
-    {
-        $object_data = $this->soap_client->getObjectByReference($module_id, $this->user->getId());
-        $module = new IliasModule($module_id, $object_data, $this->index, $this->ilias_int_version);
-        return $module;
-    }
-
-    /**
-     * Helper function to fetch children including objects in folders
-     * The typo in the function name, 'childs', is intentional to reflect the name of the ILIAS-SOAP call.
-     *
-     * @access public
-     * @param string $parent_id
-     * @return array result
-     */
-    public function getChilds($parent_id) {
-        $types[] = 'fold';
-        if (isset($this->ilias_config['modules']) && $this->ilias_config['modules']) {
-            foreach ($this->ilias_config['modules'] as $type => $name) {
-                $types[] = $type;
-            }
-            $result = $this->soap_client->getTreeChilds($parent_id, $types);
-            $user_result = $this->soap_client->getTreeChilds($parent_id, $types, $this->user->getId());
-
-            if ($result) {
-                foreach($result as $ref_id => $data) {
-                    if ($data['type'] == 'fold') {
-                        unset($result[$ref_id]);
-                        $result = $result + $this->getChilds($ref_id);
-                    } else {
-                        $result[$ref_id]['accessInfo'] = $user_result[$ref_id]['accessInfo'];
-                        $result[$ref_id]['references'][$ref_id] = $user_result[$ref_id]['references'][$ref_id];
-                    }
-                }
-            }
-        }
-
-        if (isset($result) && is_array($result)) {
-            return $result;
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * check connected modules and update connections
-     *
-     * checks if there are modules in the course that are not connected to the seminar
-     * @access public
-     * @param string $course_id course-id
-     * @return boolean successful
-     */
-    public function updateCourseConnections($course_id)
-    {
-        $this->soap_client->setCachingStatus(false);
-        // fetch childs
-        $result = $this->getChilds($course_id);
-
-        if (is_array($result)) {
-            $check = DBManager::get()->prepare("SELECT 1 FROM object_contentmodules WHERE object_id = ? AND module_id = ? AND system_type = ? AND module_type = ?");
-            $found = [];
-            $added = 0;
-            $deleted = 0;
-            foreach($result as $ref_id => $data) {
-                if (($data['accessInfo'] == 'granted') || ($this->ilias_interface_config['show_offline'] && $data['offline'])) {
-                    $this->course_modules[$ref_id] = new IliasModule($ref_id, $data, $this->index, $this->ilias_int_version);
-                }
-                $check->execute([Context::getId(), $ref_id, $this->index, $data["type"]]);
-                if (!$check->fetch()) {
-                    IliasObjectConnections::setConnection(Context::getId(), $ref_id, $data["type"], $this->index);
-                    $added++;
-                }
-                $found[] = $ref_id . '_' . $data["type"];
-            }
-            $to_delete = DBManager::get()->prepare("SELECT module_id,module_type FROM object_contentmodules WHERE module_type <> 'crs' AND object_id = ? AND system_type = ? AND CONCAT_WS('_', module_id,module_type) NOT IN (?)");
-            $to_delete->execute([Context::getId(), $this->index, count($found) ? $found : ['']]);
-            while ($row = $to_delete->fetch(PDO::FETCH_ASSOC)) {
-                IliasObjectConnections::unsetConnection(Context::getId(), $row["module_id"], $row["module_type"], $this->index);
-                $deleted++;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * set module connection
-     *
-     * sets module connection to course
-     * @access public
-     * @param string $studip_course_id studip range id
-     * @param string $module_id ILIAS ref id
-     * @param string $module_type type of ILIAS module
-     * @param string $connection_mode copy or reference
-     * @param string $write_permission_level write permission for new module requires this perm (autor, tutor, dozent, never)
-     * @return boolean successful
-     */
-    public function setCourseModuleConnection($studip_course_id, $module_id, $module_type, $connection_mode, $write_permission_level)
-    {
-        $object_data = $this->soap_client->getObjectByReference($module_id, $this->user->getId());
-        $module = new IliasModule($module_id, $object_data, $this->index, $this->ilias_int_version);
-        if (!$module->isAllowed('start')) {
-            return false;
-        }
-        if (!$module->isAllowed('copy') && !$module->isAllowed('edit')) {
-            $this->error[] = _("Keine Berechtigung zum Kopieren des Lernobjekts!");
-            return false;
-        }
-
-        $crs_id = IliasObjectConnections::getConnectionModuleId($studip_course_id, "crs", $this->index);
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-
-        if (! $crs_id) {
-            // if no course entry create new course
-            $crs_id = $this->addCourse($studip_course_id);
-        } elseif ($crs_id AND ($this->soap_client->getObjectByReference($crs_id) == false)) {
-            // if course entry is invalid create new course
-            IliasObjectConnections::unsetConnection($studip_course_id, $crs_id, "crs", $this->index);
-            $this->error[] = sprintf(_('Der zugeordnete ILIAS-Kurs (ID %s) existiert nicht mehr. Ein neuer Kurs wurde angelegt.'), $crs_id);
-            $crs_id = $this->addCourse($studip_course_id);
-        }
-
-        if ($crs_id == false) {
-            return false;
-        }
-
-        if ($connection_mode == 'copy') {
-            $ref_id = $this->soap_client->copyObject($module_id, $crs_id);
-        } elseif ($connection_mode == 'reference') {
-            $ref_id = $this->soap_client->addReference($module_id, $crs_id);
-        }
-        if (! $ref_id) {
-            $this->error[] = _("Zuordnungs-Fehler: Lernobjekt konnte nicht angelegt werden.");
-            return false;
-        }
-        // set permissions for course roles
-        $local_roles = $this->soap_client->getLocalRoles($crs_id);
-        $member_operations = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ]);
-        $admin_operations = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ, self::OPERATION_WRITE, self::OPERATION_COPY, self::OPERATION_DELETE]);
-        $admin_operations_no_delete = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ, self::OPERATION_WRITE, self::OPERATION_COPY]);
-        $admin_operations_readonly = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ, self::OPERATION_DELETE]);
-        switch ($module_type) {
-            case 'tst':
-                $admin_operations = array_merge($admin_operations, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_STATISTICS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_RESULTS]));
-                $admin_operations_no_delete = array_merge($admin_operations_no_delete, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_STATISTICS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_RESULTS]));
-                $admin_operations_readonly = array_merge($admin_operations_readonly, $this->getOperationArray([self::OPERATION_VIEW_TEST_STATISTICS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_RESULTS]));
-                break;
-            case 'lm':
-            case 'sahs':
-            case 'htlm':
-                $admin_operations = array_merge($admin_operations, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS]));
-                $admin_operations_no_delete = array_merge($admin_operations_no_delete, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS]));
-                $admin_operations_readonly = array_merge($admin_operations_readonly, $this->getOperationArray([self::OPERATION_READ_LEARNING_PROGRESS]));
-                break;
-            case 'exc':
-                $admin_operations = array_merge($admin_operations, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_EDIT_SUBMISSION_GRADES]));
-                $admin_operations_no_delete = array_merge($admin_operations_no_delete, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_EDIT_SUBMISSION_GRADES]));
-                $admin_operations_readonly = array_merge($admin_operations_readonly, $this->getOperationArray([self::OPERATION_READ_LEARNING_PROGRESS]));
-                break;
-        }
-        foreach ($local_roles as $key => $role_data) {
-            // check only if local role is il_crs_member, -tutor or -admin
-            if (mb_strpos($role_data["title"], "il_crs_") === 0) {
-                if(mb_strpos($role_data["title"], 'il_crs_member') === 0){
-                    $operations = ($write_permission_level == "autor") ? $admin_operations_no_delete : $member_operations;
-                } elseif(mb_strpos($role_data["title"], 'il_crs_tutor') === 0){
-                    $operations = (($write_permission_level == "tutor") || ($write_permission_level == "autor")) ? $admin_operations : $admin_operations_readonly;
-                } elseif(mb_strpos($role_data["title"], 'il_crs_admin') === 0){
-                    $operations = (($write_permission_level == "dozent") || ($write_permission_level == "tutor") || ($write_permission_level == "autor")) ? $admin_operations : $admin_operations_readonly;
-                } else {
-                    continue;
-                }
-                $this->soap_client->revokePermissions($role_data["obj_id"], $ref_id);
-                $this->soap_client->grantPermissions($operations, $role_data["obj_id"], $ref_id);
-            }
-        }
-        // store object connection
-        if ($ref_id) {
-            IliasObjectConnections::setConnection($studip_course_id, $ref_id, $module_type, $this->index);
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * unset module connection
-     *
-     * unsets ILIAS module connection with course
-     * @access public
-     * @param string $studip_course_id studip range id
-     * @param string $module_id ILIAS ref id
-     * @param string $module_type type of ILIAS module
-     */
-    public function unsetCourseModuleConnection($studip_course_id, $module_id, $module_type)
-    {
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->deleteObject($module_id);
-        IliasObjectConnections::unsetConnection($studip_course_id, $module_id, $module_type, $this->index);
-    }
-
-    /**
-     * add course module
-     *
-     * adds module instance to list of course modules
-     * @access public
-     */
-    public function addCourseModule($module_id, $module_data)
-    {
-        $object_data = $this->soap_client->getObjectByReference($module_id, $this->user->getId());
-        $this->course_modules[$module_id] = new IliasModule($module_id, $object_data, $this->index, $this->ilias_int_version);
-        $this->course_modules[$module_id]->setConnectionType(true);
-    }
-
-    /**
-     * get course modules
-     *
-     * returns all added course module instances
-     * @access public
-     */
-    public function getCourseModules()
-    {
-        return $this->course_modules;
-    }
-
-    /**
-     * create course
-     *
-     * creates new ilias course
-     * @access public
-     * @param string $studip_course_id seminar-id
-     * @return string|false|null
-     */
-    public function addCourse($studip_course_id)
-    {
-        $crs_id = IliasObjectConnections::getConnectionModuleId($studip_course_id, "crs", $this->index);
-        $this->soap_client->setCachingStatus(false);
-        $this->soap_client->clearCache();
-
-        if (!$crs_id) {
-            $seminar = Seminar::getInstance($studip_course_id);
-            // on error use root category
-            $ref_id = $this->ilias_config['root_category'];
-            if ($this->ilias_config['cat_semester'] == 'outer') {
-                // category for semester above institute
-                $semester_ref_id = IliasObjectConnections::getConnectionModuleId($seminar->start_semester->getId(), 'cat', $this->index);
-                if (!$semester_ref_id) {
-                    $object_data['title'] = $seminar->getStartSemesterName();
-                    $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zum Semester "%s".'), $seminar->getStartSemesterName());
-                    $object_data['type'] = 'cat';
-                    $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
-                    $semester_ref_id = $this->soap_client->addObject($object_data, $ref_id);
-                    if ($semester_ref_id) {
-                        // store institute category
-                        IliasObjectConnections::setConnection($seminar->start_semester->getId(), $semester_ref_id, 'cat', $this->index);
-                    } else {
-                        $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data['title']);
-                    }
-                }
-                if ($semester_ref_id) {
-                    $ref_id = $semester_ref_id;
-                    // category for home institute below semester
-                    $home_institute = Institute::find($seminar->getInstitutId());
-                    if ($home_institute) {
-                        $institute_ref_id = IliasObjectConnections::getConnectionModuleId(md5($seminar->start_semester->getId().$home_institute->getId()), "cat", $this->index);
-                    }
-                    if (!$institute_ref_id) {
-                        $object_data['title'] = $home_institute->name;
-                        $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zur Stud.IP-Einrichtung "%s".'), $home_institute->name);
-                        $object_data['type'] = 'cat';
-                        $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
-                        $institute_ref_id = $this->soap_client->addObject($object_data, $ref_id);
-                        if ($institute_ref_id) {
-                            // store institute category
-                            IliasObjectConnections::setConnection(md5($seminar->start_semester->getId().$home_institute->getId()), $institute_ref_id, "cat", $this->index);
-                        }
-                    }
-                    if ($institute_ref_id) {
-                        $ref_id = $institute_ref_id;
-                    } else {
-                        $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data['title']);
-                    }
-                }
-            } elseif ($this->ilias_config['cat_semester'] === 'inner' || $this->ilias_config['cat_semester'] === 'none') {
-                // category for home institute
-                $home_institute = Institute::find($seminar->getInstitutId());
-                if ($home_institute) {
-                    $institute_ref_id = IliasObjectConnections::getConnectionModuleId($home_institute->getId(), "cat", $this->index);
-                }
-                if (!$institute_ref_id) {
-                    $object_data['title'] = $home_institute->name;
-                    $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zur Stud.IP-Einrichtung "%s".'), $home_institute->name);
-                    $object_data['type'] = 'cat';
-                    $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
-                    $institute_ref_id = $this->soap_client->addObject($object_data, $ref_id);
-                    if ($institute_ref_id) {
-                        // store institute category
-                        IliasObjectConnections::setConnection($home_institute->getId(), $institute_ref_id, "cat", $this->index);
-                    } else {
-                        $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data["title"]);
-                    }
-                }
-                if ($institute_ref_id) {
-                    $ref_id = $institute_ref_id;
-                    if ($this->ilias_config['cat_semester'] === 'inner') {
-                        // category for semester below institute
-                        $institute_semester_ref_id = IliasObjectConnections::getConnectionModuleId(md5($home_institute->getId().$seminar->start_semester->getId()), 'cat', $this->index);
-                        if (!$institute_semester_ref_id) {
-                            $object_data['title'] = $seminar->getStartSemesterName();
-                            $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zum Semester "%s".'), $seminar->getStartSemesterName());
-                            $object_data['type'] = 'cat';
-                            $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
-                            $institute_semester_ref_id= $this->soap_client->addObject($object_data, $ref_id);
-                            if ($institute_semester_ref_id) {
-                                // store institute category
-                                IliasObjectConnections::setConnection(md5($home_institute->getId().$seminar->start_semester->getId()), $institute_semester_ref_id, 'cat', $this->index);
-                            }
-                        }
-                        if ($institute_semester_ref_id) {
-                            $ref_id = $institute_semester_ref_id;
-                        } else {
-                            $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data["title"]);
-                        }
-                    }
-                }
-            }
-
-            // create course
-            $lang_array = explode('_', Config::get()->DEFAULT_LANGUAGE);
-            $course_data['language'] = $lang_array[0];
-            if ($this->ilias_config['course_semester'] === 'old' || $this->ilias_config['course_semester'] === 'old_bracket') {
-                $course_data['title'] = sprintf(_('Stud.IP-Veranstaltung "%s"'), $seminar->getName());
-            } else {
-                $course_data['title'] = sprintf(_('%s'), $seminar->getName());
-            }
-            if ($this->ilias_config['course_semester'] === 'old_bracket' || $this->ilias_config['course_semester'] === 'bracket') {
-                $course_data['title'] .= ' ('.$seminar->getStartSemesterName().')';
-            }
-            if ($this->ilias_config['course_veranstaltungsnummer']) {
-                $course_data['title'] .= ' '.$seminar->VeranstaltungsNummer;
-            }
-            $course_data['description'] = sprintf(_('Dieser Kurs enthält die Lernobjekte der Stud.IP-Veranstaltung "%s".'), $seminar->getName());
-            $crs_id = $this->soap_client->addCourse($course_data, $ref_id);
-            if (!$crs_id) {
-                $this->error[] = _('ILIAS-Kurs konnte nicht angelegt werden.');
-                return false;
-            }
-            IliasObjectConnections::setConnection($studip_course_id, $crs_id, 'crs', $this->index);
-
-            // Rollen zuordnen
-            $this->CheckUserCoursePermissions($crs_id);
-            return $crs_id;
-        }
-
-        return null;
-    }
-
-    /**
-     * check user
-     *
-     * checks if ILIAS user exists, creates new user if not
-     * @access public
-     * @return boolean returns user status
-     */
-    public function checkUser()
-    {
-        if ($this->user->getId()) {
-            $user_exists = $this->soap_client->getUser($this->user->getId());
-            if (!is_array($user_exists)) {
-                $admin_user_id = $this->soap_client->lookupUser($this->ilias_config['admin']);
-                $admin_user_exists = $this->soap_client->getUser($admin_user_id);
-                if (is_array($admin_user_exists)) {
-                    $this->user->unsetConnection(true);
-                    if ($this->newUser()) {
-                        PageLayout::postSuccess(_("Neue Verknüpfung zu ILIAS-User angelegt."));
-                    }
-                }
-            } else return true;
-        }
-        return false;
-    }
-
-    /**
-     * check user permissions
-     *
-     * checks user permissions for connected course and changes setting if necessary
-     * @access public
-     * @param string $ilias_course_id course-id
-     * @return boolean returns false on error
-     */
-    public function checkUserCoursePermissions($ilias_course_id = "")
-    {
-        if (($ilias_course_id == "") || ($this->user->getId() == "")) {
-            return false;
-        }
-
-        if ($GLOBALS['user']->perms == 'root') {
-            return true;
-        }
-
-        // check if user still exists
-        $this->checkUser();
-
-        // get course role folder and local roles
-        $user_roles = $this->soap_client->getUserRoles($this->user->getId());
-        $local_roles = $this->soap_client->getLocalRoles($ilias_course_id);
-        $active_role = "";
-        $proper_role = "";
-        $user_crs_role = $this->crs_roles[$GLOBALS["perm"]->get_studip_perm(Context::getId())];
-        if (is_array($local_roles)) {
-            foreach ($local_roles as $key => $role_data) {
-                // check only if local role is il_crs_member, -tutor or -admin
-                if (! (mb_strpos($role_data["title"], "_crs_") === false)) {
-                    if ( in_array( $role_data["obj_id"], $user_roles ) ) {
-                        $active_role = $role_data["obj_id"];
-                    }
-                    if ( mb_strpos( $role_data["title"], $user_crs_role) > 0 ) {
-                        $proper_role = $role_data["obj_id"];
-                    }
-                }
-            }
-        }
-
-        // is user already course-member? otherwise add member with proper role
-        $is_member = $this->soap_client->isMember( $this->user->getId(), $ilias_course_id);
-        if (!$is_member) {
-            $member_data["usr_id"] = $this->user->getId();
-            $member_data["ref_id"] = $ilias_course_id;
-            $member_data["status"] = self::CRS_NO_NOTIFICATION;
-            $type = "";
-            switch ($user_crs_role)
-            {
-                case "admin":
-                    $member_data["role"] = self::CRS_ADMIN_ROLE;
-                    $type = "Admin";
-                    break;
-                case "tutor":
-                    $member_data["role"] = self::CRS_TUTOR_ROLE;
-                    $type = "Tutor";
-                    break;
-                case "member":
-                    $member_data["role"] = self::CRS_MEMBER_ROLE;
-                    $type = "Member";
-                    break;
-                default:
-            }
-            $member_data["passed"] = self::CRS_PASSED_VALUE;
-            if ($type != "") {
-                $this->soap_client->addMember( $this->user->getId(), $type, $ilias_course_id);
-            }
-        }
-
-        // check if user has proper local role
-        // if not, change it
-        if ($active_role != $proper_role) {
-            if ($active_role) {
-                $this->soap_client->deleteUserRoleEntry( $this->user->getId(), $active_role);
-            }
-
-            if ($proper_role) {
-                $this->soap_client->addUserRoleEntry( $this->user->getId(), $proper_role);
-            }
-        }
-
-        if (! $this->getUserModuleViewPermission($ilias_course_id)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * get user permissions for ILIAS module
-     *
-     * returns allowed operations for current user and given module
-     * @access public
-     * @param string $module_id module-id
-     * @return boolean returns false on error
-     */
-    public function getUserModuleViewPermission($module_id)
-    {
-        $this->allowed_operations = [];
-        $this->tree_allowed_operations = $this->soap_client->getObjectTreeOperations(
-                    $module_id,
-                    $this->user->getId()
-                    );
-        if (! is_array($this->tree_allowed_operations)) {
-            return false;
-        }
-
-        $view_permission = false;
-        if ((in_array($this->operations[self::OPERATION_READ], $this->tree_allowed_operations)) && (in_array($this->operations[self::OPERATION_VISIBLE], $this->tree_allowed_operations))) {
-            $view_permission = true;
-        }
-        return $view_permission;
-    }
-
-    /**
-     * get operation
-     *
-     * returns id for given operation-string
-     * @access public
-     * @param string $operation operation
-     * @return integer operation-id
-     */
-    public function getOperation($operation)
-    {
-        // get operation IDs
-        if (!count($this->operations)) {
-            $this->operations = $this->soap_client->getOperations();
-        }
-
-        return $this->operations[$operation];
-    }
-
-    /**
-     * get operation-ids
-     *
-     * returns an array of operation-ids
-     * @access public
-     * @param string $operation operation
-     * @return array operation-ids
-     */
-    public function getOperationArray($operation)
-    {
-        // get operation IDs
-        if (!count($this->operations)) {
-            $this->operations = $this->soap_client->getOperations();
-        }
-
-        $ops_array = [];
-        if (is_array($operation)) {
-            foreach ($operation as $key => $operation_name) {
-                if (array_key_exists($operation_name, $this->operations)) {
-                    $ops_array[] = $this->operations[$operation_name];
-                }
-            }
-        }
-        return $ops_array;
-    }
-
-    /**
-    * get name of ILIAS installation
-    *
-    * returns name of cms
-    * @access public
-    * @return string name
-    */
-    public function getName()
-    {
-        return $this->ilias_config['name'];
-    }
-
-    /**
-    * get index of ILIAS installation
-    *
-    * returns index of ILIAS installation
-    * @access public
-    * @return string type
-    */
-    public function getIndex()
-    {
-        return $this->index;
-    }
-
-    /**
-    * get url of ILIAS installation
-    *
-    * returns url of ILIAS installation
-    * @access public
-    * @return string path
-    */
-    public function getAbsolutePath()
-    {
-        return $this->ilias_config['url'];
-    }
-
-    /**
-    * get target file of ILIAS installation
-    *
-    * returns target file of ILIAS installation
-    * @access public
-    * @return string target file
-    */
-    public function getTargetFile()
-    {
-        return $this->ilias_config['url'].'studip_referrer.php';
-    }
-
-    /**
-    * get active-setting
-    *
-    * returns true, if ILIAS installation is active
-    * @access public
-    * @return boolean active-setting
-    */
-    public function isActive()
-    {
-        return $this->ilias_config['is_active'];
-    }
-
-    /**
-     * get client-id
-     *
-     * returns client-id
-     * @access public
-     * @return string client-id
-     */
-    public function getClientId()
-    {
-        return $this->ilias_config['client'];
-    }
-
-    /**
-    * get user prefix
-    *
-    * returns user prefix
-    * @access public
-    * @return string user prefix
-    */
-    public function getUserPrefix()
-    {
-        return $this->ilias_config['user_prefix'];
-    }
-
-    /**
-     * get errors
-     *
-     * returns array of error strings.
-     * @access public
-     * @return array of error strings
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-    * search ILIAS modules
-    *
-    * performs search for ILIAS modules
-    * @access public
-    * @return boolean returns false
-    */
-    public function searchModules($search_key)
-    {
-        $types = [];
-        foreach ($this->getAllowedModuleTypes() as $type => $name) {
-            $types[] = $type;
-        }
-        $search_modules = [];
-
-        $result = $this->soap_client->searchObjects($types, $search_key, "and", $this->user->getId());
-        if ($result) {
-            foreach($result as $key => $object_data) {
-                // set every single reference as part of the result
-                foreach ($object_data['references'] as $ref_id => $reference) {
-                    $search_modules[$ref_id] = new IliasModule($ref_id, $object_data, $this->index, $this->ilias_int_version);
-                }
-            }
-        }
-        return $search_modules;
-    }
-
-    public function deleteConnectedModules($object_id){
-        return IliasObjectConnections::DeleteAllConnections($object_id, $this->index);
-    }
-
-    /**
-     * @param string $ilias_user_id
-     * @return IliasUser|void
-     */
-    public function getConnectedUser(string $ilias_user_id)
-    {
-        $user_id = DBManager::get()->fetchColumn(
-            "SELECT studip_user_id FROM auth_extern WHERE external_user_id = ? AND external_user_system_type = ?",
-            [$ilias_user_id, $this->index]
-        );
-        if ($user_id) {
-            return new IliasUser($this->index, $this->ilias_config['version'], $user_id);
-        }
-    }
-}
diff --git a/lib/ilias_interface/ConnectedIlias.php b/lib/ilias_interface/ConnectedIlias.php
new file mode 100644
index 0000000..5b9c1bf
--- /dev/null
+++ b/lib/ilias_interface/ConnectedIlias.php
@@ -0,0 +1,1370 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* main-class for connected systems
+*
+* This class contains the main methods of the ilias-interface to connect ILIAS installations.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  ilias_interface_modules
+* @module       ConnectedIlias
+* @package  ILIAS-Interface
+*/
+class ConnectedIlias
+{
+    const CRS_NOTIFICATION= '1';
+    const CRS_NO_NOTIFICATION= '2';
+    const CRS_ADMIN_ROLE= '1';
+    const CRS_MEMBER_ROLE= '2';
+    const CRS_TUTOR_ROLE= '3';
+    const CRS_PASSED_VALUE= '0';
+
+    const OPERATION_VISIBLE= 'visible';
+    const OPERATION_READ= 'read';
+    const OPERATION_WRITE= 'write';
+    const OPERATION_COPY= 'copy';
+    const OPERATION_DELETE= 'delete';
+    const OPERATION_EDIT_LEARNING_PROGRESS = 'edit_learning_progress';
+    const OPERATION_VIEW_TEST_STATISTICS = 'tst_statistics';
+    const OPERATION_READ_LEARNING_PROGRESS = 'read_learning_progress';
+    const OPERATION_EDIT_SUBMISSION_GRADES = 'edit_submissions_grades';
+    const OPERATION_VIEW_TEST_RESULTS = 'tst_results';
+
+    public $index;
+    public $ilias_config;
+    public $ilias_interface_config;
+    public $ilias_int_version;
+    public $global_roles;
+    public $crs_roles;
+    public $error;
+
+    public $soap_client;
+    public $course_modules;
+    public $user;
+    public $user_modules;
+
+    public $operations;
+    public $user_operations;
+    public $allowed_operations;
+    public $tree_allowed_operations;
+
+    /**
+    * constructor
+    *
+    * ILIAS connection main class
+    * @access
+    * @param string $index ilias installation index
+    */
+    public function __construct($index)
+    {
+        // load settings
+        $this->index = $index;
+        $this->error = [];
+        $this->global_roles = [4,5,14];
+        $this->loadSettings();
+        $this->crs_roles = [
+                        "autor" => "member",
+                        "tutor" => "tutor",
+                        "dozent" => "admin",
+                        "admin" => "admin",
+                        "root" => "admin"
+        ];
+        $this->user_operations = [self::OPERATION_VISIBLE, self::OPERATION_READ];
+        $this->operations = [];
+        $this->course_modules = [];
+        $this->user_modules = [];
+
+        // set ILIAS version as integer value
+        $this->ilias_int_version = $this->getIntVersion($this->ilias_config['version']);
+
+        // init soap client
+        $this->soap_client = new IliasSoap($this->index, $this->ilias_config['url'].'/webservice/soap/server.php?wsdl', $this->ilias_config['client'], $this->ilias_int_version, $this->ilias_config['admin'], $this->ilias_config['admin_pw']);
+        $this->soap_client->setCachingStatus($this->ilias_interface_config['cache']);
+
+        // init current user (only if ILIAS installation is active)
+        if ($this->ilias_config['is_active']) {
+            $this->user = new IliasUser($this->index, $this->ilias_config['version']);
+            // create account automatically if it doesn't exist
+            if (! $this->user->isConnected()) {
+                $this->soap_client->setCachingStatus(false);
+                $this->soap_client->clearCache();
+                $this->newUser();
+            } else {
+                NotificationCenter::addObserver($this, "updateUser", "UserDidUpdate");
+            }
+            // create user category if user has ILIAS author permission
+            if ($GLOBALS['perm']->have_perm($this->ilias_config['author_perm']) && ! $this->ilias_config['category_create_on_add_module'] && ! $this->user->getCategory()) {
+                $this->soap_client->setCachingStatus(false);
+                $this->soap_client->clearCache();
+                $this->newUserCategory();
+            }
+        }
+    }
+
+    /**
+     * get ILIAS version as int
+     *
+     * converts ILIAS version to int value
+     * @access public
+     * @return string messages
+     */
+    public static function getIntVersion($version)
+    {
+        $version_array = explode('.', $version);
+        return ((int)$version_array[0]*10000) + ((int)$version_array[1]*100) + ((int)$version_array[2]);
+    }
+
+    /**
+     * load ILIAS settings from config table
+     */
+    public function loadSettings()
+    {
+        $this->ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS;
+
+        $ilias_configs = Config::get()->ILIAS_INTERFACE_SETTINGS;
+        $this->ilias_config = $ilias_configs[$this->index];
+    }
+
+    /**
+     * store settings
+     *
+     * stores current ILIAS settings to config table.
+     * @access public
+     */
+    public function storeSettings()
+    {
+        $ilias_configs = Config::get()->ILIAS_INTERFACE_SETTINGS;
+        $ilias_configs[$this->index] = $this->ilias_config;
+        Config::get()->store('ILIAS_INTERFACE_SETTINGS', $ilias_configs);
+    }
+
+
+    /**
+     * get ILIAS info
+     *
+     * checks ILIAS base settings
+     * @access public
+     * @param string $url
+     * @return array info
+     */
+    public static function getIliasInfo($url)
+    {
+        $info = [];
+        // check if url exists
+        $check = @get_headers($url . 'login.php');
+        if (strpos($check[0], '200') === false) {
+            return $info;
+        } else {
+            $info['url'] = $url;
+        }
+        $soap_client = new IliasSoap('new', $url.'/webservice/soap/server.php?wsdl');
+        $soap_client->setCachingStatus(false);
+        if ($client_info = $soap_client->getInstallationInfoXML()) {
+            $info = array_merge($info, $client_info);
+        }
+        return $info;
+    }
+
+    /**
+     * get soap methods
+     *
+     * returns array of available soap methods
+     * @access public
+     * @return array soap method names
+     */
+    public function getSoapMethods()
+    {
+        // fetch all available SOAP methods
+        $soap_methods = [];
+        if (is_callable([$this->soap_client->soap_client, '__getfunctions'])) {
+            $soap_methods_raw = $this->soap_client->soap_client->__getfunctions();
+            foreach ($soap_methods_raw as $method) {
+                $method_array = explode(' ', $method);
+                preg_match_all('/\${1}[^, )]*/', $method, $param_array);
+                preg_match('/[^(]*/', $method_array[1], $method_name);
+                $soap_methods[$method_name[0]] = [];
+                foreach ($param_array[0] as $par) {
+                    $soap_methods[$method_name[0]][] = substr($par, 1);
+                }
+            }
+        } else {
+            $proxy = $this->soap_client->soap_client->getProxyClassCode();
+            preg_match_all('/function{1}[^{]*/', $proxy, $soap_methods_raw);
+            foreach ($soap_methods_raw[0] as $method) {
+                $method_array = explode(' ', $method);
+                preg_match_all('/\${1}[^, )]*/', $method, $param_array);
+                preg_match('/[^(]*/', $method_array[1], $method_name);
+                $soap_methods[$method_name[0]] = [];
+                foreach ($param_array[0] as $par) {
+                    $soap_methods[$method_name[0]][] = substr($par, 1);;
+                }
+            }
+        }
+        return $soap_methods;
+    }
+
+    /**
+     * get connection status
+     *
+     * checks connection settings
+     * @access public
+     * @return string messages
+     */
+    public function getConnectionSettingsStatus()
+    {
+        // check ILIAS version
+        if (($this->ilias_int_version < 30000)) {
+            $this->error[] = _('Die ILIAS-Version ist ungültig.');
+            return false;
+        }
+
+        // check if url exists
+        $check = @get_headers($this->ilias_config['url'] . 'webservice/soap/server.php');
+        if (strpos($check[0], '200') === false) {
+            $this->error[] = sprintf(_('Die URL "%s" ist nicht erreichbar.'), $this->ilias_config['url']);
+            return false;
+        }
+
+        // check soap connection
+        $res = $this->soap_client->loginAdmin();
+        if (!$res) {
+            $this->error[] = sprintf(_('Anmelden mit dem Account "%s" in der %s-Installation ist fehlgeschlagen.'), $this->ilias_config['admin'], $this->ilias_config['name']);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * get content status
+     *
+     * checks content settings
+     * @access public
+     * @return string messages
+     */
+    public function getContentSettingsStatus()
+    {
+        if (!$this->ilias_config['root_category']) {
+            // check category
+            if (!$this->ilias_config['root_category_name']) {
+                $this->error[] = _("Die ILIAS-Kategorie für Stud.IP-Inhalte wurde noch nicht festgelegt.");
+                return false;
+            }
+            $category = $this->soap_client->getReferenceByTitle($this->ilias_config['root_category_name'], 'cat');
+            if (!$category) {
+                $this->error[] = sprintf(_("Die Kategorie \"%s\" wurde nicht gefunden."), $this->ilias_config['root_category_name']);
+                return false;
+            }
+            if ($category) {
+                $this->ilias_config['root_category'] = $category;
+
+                // check user data category
+                if (! $this->ilias_config['user_data_category']) {
+                    $object_data["title"] = sprintf(_("User-Daten"));
+                    $object_data["description"] = _("Hier befinden sich die persönlichen Ordner der Stud.IP-User.");
+                    $object_data["type"] = "cat";
+                    $object_data["owner"] = $this->soap_client->lookupUser($this->ilias_config['admin']);
+                    $user_cat = $this->soap_client->addObject($object_data, $this->ilias_config['root_category']);
+                    if ($user_cat != false) {
+                        $this->ilias_config['user_data_category'] = $user_cat;
+                    } else {
+                        $this->error[] = sprintf(_("Die Kategorie \"%s\" konnte nicht angelegt werden."), $object_data["title"]);
+                        return false;
+                    }
+                }
+                $this->storeSettings();
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * get permissions status
+     *
+     * checks permissions settings
+     * @access public
+     * @return string messages
+     */
+    public function getPermissionsSettingsStatus()
+    {
+        // check role template
+        if (!$this->ilias_config['author_role_name']) {
+            $this->error[] = _("Das Rollen-Template für die persönliche Kategorie wurde noch nicht festgelegt.");
+            return false;
+        }
+        $role_template = $this->soap_client->getObjectByTitle( $this->ilias_config['author_role_name'], "rolt" );
+        if ($role_template == false) {
+            $this->error[] = sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($this->ilias_config['author_role_name']), htmlReady($this->getName()));
+            return false;
+        }
+        if (is_array($role_template))
+        {
+            $this->ilias_config['author_role'] = $role_template["obj_id"];
+            $this->ilias_config['author_role_name'] = $role_template["title"];
+            $this->storeSettings();
+        }
+        return true;
+    }
+
+    /**
+     * create new user-account
+     *
+     * creates new ILIAS user account
+     * @access public
+     * @return boolean returns false
+     */
+    public function newUser()
+    {
+        if (!$this->user->studip_login) {
+            return false;
+        }
+        $user_data = $this->user->getUserArray();
+        $user_data["login"] = $this->ilias_config['user_prefix'].$user_data["login"];
+
+        $user_exists = $this->soap_client->lookupUser($user_data["login"]);
+        //automatische Zuordnung von bestehenden Ilias Accounts
+        //nur wenn ldap Modus benutzt wird und Stud.IP Nutzer passendes ldap plugin hat
+        if ($user_exists &&
+                ! $this->ilias_config['user_prefix'] &&
+                $this->ilias_config['ldap_enable'] &&
+                ($this->user->auth_plugin != 'standard') &&
+                ($this->user->auth_plugin == $this->ilias_config['ldap_enable'])) {
+            $this->user->id = $user_exists;
+            $this->user->login = $user_data["login"];
+            $this->user->setConnection($this->user->getUserType(), true);
+            PageLayout::postSuccess(sprintf(_("Verbindung mit Nutzer ID %s wiederhergestellt."), $this->user->id));
+            return true;
+        } elseif ($user_exists) {
+            $this->error[] = sprintf(_('Externer Account konnte nicht angelegt werden. Es existiert bereits ein User mit dem Login %s in %s'), $user_data["login"], $this->ilias_config['name']);
+            return false;
+        } elseif ($this->ilias_config['no_account_updates']) {
+            $this->error[] = sprintf(_('Sie haben noch keinen ILIAS-Account. Loggen Sie sich zuerst in %s ein, um ILIAS-Lernobjekte in Stud.IP nutzen zu können.'), "<a href=\"".$this->ilias_config['url']."\">".$this->ilias_config['name']."</a>");
+            return false;
+        } elseif (! $this->ilias_config['user_prefix'] &&
+            $this->ilias_config['ldap_enable'] &&
+            ($this->user->auth_plugin != 'standard') &&
+            ($this->user->auth_plugin == $this->ilias_config['ldap_enable'])) {
+            $user_data['external_account'] = $this->user->studip_login;
+            $auth_plugin = StudipAuthAbstract::getInstance($this->user->auth_plugin);
+            if ($auth_plugin instanceof StudipAuthLdap) {
+                $user_data['auth_mode'] = 'ldap';
+            } elseif ($auth_plugin instanceof StudipAuthCAS) {
+                $user_data['auth_mode'] = 'cas';
+            } elseif ($auth_plugin instanceof StudipAuthShib) {
+                $user_data['auth_mode'] = 'shibboleth';
+            }
+        }
+
+        // set role according to Stud.IP perm
+        if (User::findCurrent()->perms === 'root') {
+            $role_id = 2;
+        } else {
+            $role_id = 4;
+        }
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+        $user_id = $this->soap_client->addUser($user_data, $role_id);
+        if ($user_id != false)
+        {
+            $this->user->id = $user_id;
+            $this->user->login = $this->ilias_config['user_prefix'].$this->user->studip_login;
+
+            $this->user->setConnection(IliasUser::USER_TYPE_CREATED);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * update given user account
+     *
+     * updates ILIAS user data
+     * @access public
+     * @param $user Stud.IP user object
+     * @return boolean returns false
+     */
+    public function updateUser($user)
+    {
+        if (! is_object($user)) {
+            return false;
+        }
+        $update_user = new IliasUser($this->index, $this->ilias_config['version'], $user->id);
+      // don't update ldap user
+        if (! $this->ilias_config['user_prefix'] &&
+            $this->ilias_config['ldap_enable'] &&
+            ($update_user->auth_plugin != 'standard') &&
+            ($update_user->auth_plugin == $this->ilias_config['ldap_enable'])) {
+            return true;
+        } elseif ($this->ilias_config['no_account_updates']) {
+            return true;
+        }
+        // if user is manually connected don't update user data
+        if ($update_user->getUserType() == IliasUser::USER_TYPE_ORIGINAL) {
+            return true;
+        }
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+        if ($update_user->isConnected() && $update_user->id && $this->soap_client->lookupUser($update_user->login)) {
+            $user_data = $update_user->getUserArray();
+            $user_data["login"] = $this->ilias_config['user_prefix'].$user_data["login"];
+
+            // set role according to Stud.IP perm
+            if ($user->perms == "root") {
+                $role_id = 2;
+            } else {
+                $role_id = 4;
+            }
+
+            $user_id = $this->soap_client->addUser($user_data, $role_id);
+            if ($user_id != false) {
+                $update_user->login = $user_data["login"];
+                $update_user->setConnection(IliasUser::USER_TYPE_CREATED);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * delete given user account
+     *
+     * deletes ILIAS user data
+     * @access public
+     * @param $user Stud.IP user object
+     * @return boolean returns false
+     */
+    public function deleteUser($user)
+    {
+        if (! is_object($user)) {
+            return false;
+        }
+        $delete_user = new IliasUser($this->index, $this->ilias_config['version'], $user->id);
+        // if user is manually connected don't remove user
+        if ($delete_user->getUserType() == IliasUser::USER_TYPE_ORIGINAL) {
+            return true;
+        }
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+        if ($delete_user->isConnected() && $delete_user->id && $this->soap_client->lookupUser($delete_user->login)) {
+            $deleted = $this->soap_client->deleteUser($delete_user->id);
+            if ($deleted) {
+                $query = "DELETE FROM auth_extern WHERE studip_user_id = ? AND external_user_system_type = ?";
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute([
+                                (string)$user->id,
+                                (string)$this->index
+                ]);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * delete given course
+     *
+     * deletes ILIAS course data
+     * @access public
+     * @param $course Stud.IP course object
+     * @return boolean returns false
+     */
+    public function deleteCourse($course)
+    {
+        if (! is_object($course)) {
+            return false;
+        }
+
+        $crs_id = IliasObjectConnections::getConnectionModuleId($course->id, 'crs', $this->index);
+        if (! $crs_id) {
+            return false;
+        }
+
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+        $deleted = $this->soap_client->deleteObject($crs_id);
+        if ($deleted) {
+            IliasObjectConnections::DeleteAllConnections($course->id, $this->index);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * create new user category
+     *
+     * creates new ILIAS user account
+     * @access public
+     * @return boolean returns false
+     */
+    public function newUserCategory()
+    {
+        if (!$this->user->isConnected()) {
+            return false;
+        }
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+
+        // data for user category in ILIAS
+        $object_data["title"] = sprintf(_("Eigene Daten von %s (%s)."), $this->user->getName(), $this->user->getId());
+        $object_data["description"] = sprintf(_("Hier befinden sich die persönlichen Lernmodule des Benutzers %s."), $this->user->getName());
+        $object_data["type"] = "cat";
+        $object_data["owner"] = $this->user->getId();
+
+        // check if category already exists
+        $cat = $this->soap_client->getReferenceByTitle($object_data["title"]);
+        if (($cat != false) && $this->soap_client->checkReferenceById($cat) ) {
+            $this->user->category = $cat;
+        } else {
+            // add new user category at main user data category in ILIAS
+            $this->user->category = $this->soap_client->addObject($object_data, $this->ilias_config['user_data_category']);
+        }
+        if ($this->ilias_config['category_to_desktop'] && $this->user->category) {
+            $this->soap_client->addDesktopItems($this->user->getId(), [$this->user->category]);
+        }
+
+        // store data
+        if ($this->user->category != false) {
+            $this->user->setConnection($this->user->getUserType());
+        } else {
+            $this->error[] = _('ILIAS-User-Kategorie konnte nicht angelegt werden.');
+            return false;
+        }
+
+        // personal user role in ILIAS
+        $role_data["title"] = "studip_usr" . $this->user->getId() . "_cat" . $this->user->category;
+        $role_data["description"] = sprintf(_("User-Rolle von %s. Diese Rolle wurde von Stud.IP generiert."), $this->user->getName());
+        $role_id = $this->soap_client->getObjectByTitle($role_data["title"], "role");
+        if ($role_id == false) {
+            $role_id = $this->soap_client->addRoleFromTemplate($role_data, $this->user->getCategory(), $this->ilias_config['author_role']);
+        }
+        $this->soap_client->addUserRoleEntry($this->user->getId(), $role_id);
+
+        // delete permissions for all global roles (User, Guest, Anonymous) for this category
+        foreach ($this->global_roles as $key => $role) {
+            $this->soap_client->revokePermissions($role, $this->user->category);
+        }
+        return true;
+    }
+
+    /**
+     * get ILIAS user full name
+     *
+     * returns full name of given ILIAS user ID
+     * @access public
+     * @param $user_id ILIAS user id
+     * @return string full name
+     */
+    public function getUserFullname($user_id)
+    {
+        return $this->soap_client->getUserFullname($user_id);
+    }
+
+    /**
+     * get ILIAS path
+     *
+     * returns full path for given ILIAS ref ID
+     * @access public
+     * @param $ref_id ILIAS reference id
+     * @return string path
+     */
+    public function getPath($ref_id)
+    {
+        return $this->soap_client->getPath($ref_id);
+    }
+
+    /**
+     * get structure
+     *
+     * returns structure for given ILIAS lm ID
+     * @access public
+     * @param $ref_id ILIAS reference id
+     * @return string path
+     */
+    public function getStructure($ref_id)
+    {
+        return $this->soap_client->getStructure($ref_id);
+    }
+
+    /**
+     * get supported module types
+     *
+     * returns all active module types for current ILIAS installation
+     * @access public
+     */
+    public static function getsupportedModuleTypes()
+    {
+        return [
+//                        'cat'  => _('Kategorie'),
+//                        'crs'  => _('Kurs'),
+                        'webr' => _('Weblink'),
+                        'htlm' => _('HTML-Lernmodul'),
+                        'sahs' => _('SCORM/AICC-Lernmodul'),
+                        'lm'   => _('ILIAS-Lernmodul'),
+                        'glo'  => _('Glossar'),
+                        'tst'  => _('Test'),
+                        'svy'  => _('Umfrage'),
+                        'exc'  => _('Übung')
+        ];
+    }
+
+    /**
+     * get active module types
+     *
+     * returns all active module types for current ILIAS installation
+     * @access public
+     */
+    public function getAllowedModuleTypes()
+    {
+        return $this->ilias_config['modules'];
+    }
+
+    /**
+     * check is module type is allowed
+     *
+     * returns true if module type is allowed for current ILIAS installation
+     * @access public
+     */
+    public function isAllowedModuleType($module_type)
+    {
+        return (boolean)$this->ilias_config['modules'][$module_type];
+    }
+
+    /**
+     * get existing ilias indices
+     *
+     * loads existing indices of all ilias installations from database
+     * @access public
+     */
+    public static function getExistingIndices()
+    {
+        $query = "SELECT DISTINCT external_user_system_type FROM auth_extern ORDER BY external_user_system_type ASC";
+        return DBManager::get()->fetchGrouped($query);
+    }
+
+    /**
+     * get user modules
+     *
+     * returns content modules from current users private category
+     * @access public
+     * @return array list of content modules
+     */
+    public function getUserModules()
+    {
+        if (count($this->user_modules)) {
+            return $this->user_modules;
+        }
+        $types = [];
+        foreach ($this->getAllowedModuleTypes() as $type => $name) {
+            $types[] = $type;
+        }
+        if ($this->user->getCategory() == false) {
+            return [];
+        }
+        $result = $this->soap_client->getTreeChilds($this->user->getCategory(), $types, $this->user->getId());
+        $obj_ids = [];
+        if (is_array($result)) {
+            foreach($result as $key => $object_data) {
+                $this->user_modules[$key] = new IliasModule($key, $object_data, $this->index, $this->ilias_int_version);
+            }
+        }
+        return $this->user_modules;
+    }
+
+
+    /**
+     * get module
+     *
+     * returns module instance by ID
+     * @access public
+     * @param string $module_id ILIAS ref id
+     * @return instance of IliasModule
+     */
+    public function getModule($module_id)
+    {
+        $object_data = $this->soap_client->getObjectByReference($module_id, $this->user->getId());
+        $module = new IliasModule($module_id, $object_data, $this->index, $this->ilias_int_version);
+        return $module;
+    }
+
+    /**
+     * Helper function to fetch children including objects in folders
+     * The typo in the function name, 'childs', is intentional to reflect the name of the ILIAS-SOAP call.
+     *
+     * @access public
+     * @param string $parent_id
+     * @return array result
+     */
+    public function getChilds($parent_id) {
+        $types[] = 'fold';
+        if (isset($this->ilias_config['modules']) && $this->ilias_config['modules']) {
+            foreach ($this->ilias_config['modules'] as $type => $name) {
+                $types[] = $type;
+            }
+            $result = $this->soap_client->getTreeChilds($parent_id, $types);
+            $user_result = $this->soap_client->getTreeChilds($parent_id, $types, $this->user->getId());
+
+            if ($result) {
+                foreach($result as $ref_id => $data) {
+                    if ($data['type'] == 'fold') {
+                        unset($result[$ref_id]);
+                        $result = $result + $this->getChilds($ref_id);
+                    } else {
+                        $result[$ref_id]['accessInfo'] = $user_result[$ref_id]['accessInfo'];
+                        $result[$ref_id]['references'][$ref_id] = $user_result[$ref_id]['references'][$ref_id];
+                    }
+                }
+            }
+        }
+
+        if (isset($result) && is_array($result)) {
+            return $result;
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * check connected modules and update connections
+     *
+     * checks if there are modules in the course that are not connected to the seminar
+     * @access public
+     * @param string $course_id course-id
+     * @return boolean successful
+     */
+    public function updateCourseConnections($course_id)
+    {
+        $this->soap_client->setCachingStatus(false);
+        // fetch childs
+        $result = $this->getChilds($course_id);
+
+        if (is_array($result)) {
+            $check = DBManager::get()->prepare("SELECT 1 FROM object_contentmodules WHERE object_id = ? AND module_id = ? AND system_type = ? AND module_type = ?");
+            $found = [];
+            $added = 0;
+            $deleted = 0;
+            foreach($result as $ref_id => $data) {
+                if (($data['accessInfo'] == 'granted') || ($this->ilias_interface_config['show_offline'] && $data['offline'])) {
+                    $this->course_modules[$ref_id] = new IliasModule($ref_id, $data, $this->index, $this->ilias_int_version);
+                }
+                $check->execute([Context::getId(), $ref_id, $this->index, $data["type"]]);
+                if (!$check->fetch()) {
+                    IliasObjectConnections::setConnection(Context::getId(), $ref_id, $data["type"], $this->index);
+                    $added++;
+                }
+                $found[] = $ref_id . '_' . $data["type"];
+            }
+            $to_delete = DBManager::get()->prepare("SELECT module_id,module_type FROM object_contentmodules WHERE module_type <> 'crs' AND object_id = ? AND system_type = ? AND CONCAT_WS('_', module_id,module_type) NOT IN (?)");
+            $to_delete->execute([Context::getId(), $this->index, count($found) ? $found : ['']]);
+            while ($row = $to_delete->fetch(PDO::FETCH_ASSOC)) {
+                IliasObjectConnections::unsetConnection(Context::getId(), $row["module_id"], $row["module_type"], $this->index);
+                $deleted++;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * set module connection
+     *
+     * sets module connection to course
+     * @access public
+     * @param string $studip_course_id studip range id
+     * @param string $module_id ILIAS ref id
+     * @param string $module_type type of ILIAS module
+     * @param string $connection_mode copy or reference
+     * @param string $write_permission_level write permission for new module requires this perm (autor, tutor, dozent, never)
+     * @return boolean successful
+     */
+    public function setCourseModuleConnection($studip_course_id, $module_id, $module_type, $connection_mode, $write_permission_level)
+    {
+        $object_data = $this->soap_client->getObjectByReference($module_id, $this->user->getId());
+        $module = new IliasModule($module_id, $object_data, $this->index, $this->ilias_int_version);
+        if (!$module->isAllowed('start')) {
+            return false;
+        }
+        if (!$module->isAllowed('copy') && !$module->isAllowed('edit')) {
+            $this->error[] = _("Keine Berechtigung zum Kopieren des Lernobjekts!");
+            return false;
+        }
+
+        $crs_id = IliasObjectConnections::getConnectionModuleId($studip_course_id, "crs", $this->index);
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+
+        if (! $crs_id) {
+            // if no course entry create new course
+            $crs_id = $this->addCourse($studip_course_id);
+        } elseif ($crs_id AND ($this->soap_client->getObjectByReference($crs_id) == false)) {
+            // if course entry is invalid create new course
+            IliasObjectConnections::unsetConnection($studip_course_id, $crs_id, "crs", $this->index);
+            $this->error[] = sprintf(_('Der zugeordnete ILIAS-Kurs (ID %s) existiert nicht mehr. Ein neuer Kurs wurde angelegt.'), $crs_id);
+            $crs_id = $this->addCourse($studip_course_id);
+        }
+
+        if ($crs_id == false) {
+            return false;
+        }
+
+        if ($connection_mode == 'copy') {
+            $ref_id = $this->soap_client->copyObject($module_id, $crs_id);
+        } elseif ($connection_mode == 'reference') {
+            $ref_id = $this->soap_client->addReference($module_id, $crs_id);
+        }
+        if (! $ref_id) {
+            $this->error[] = _("Zuordnungs-Fehler: Lernobjekt konnte nicht angelegt werden.");
+            return false;
+        }
+        // set permissions for course roles
+        $local_roles = $this->soap_client->getLocalRoles($crs_id);
+        $member_operations = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ]);
+        $admin_operations = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ, self::OPERATION_WRITE, self::OPERATION_COPY, self::OPERATION_DELETE]);
+        $admin_operations_no_delete = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ, self::OPERATION_WRITE, self::OPERATION_COPY]);
+        $admin_operations_readonly = $this->getOperationArray([self::OPERATION_VISIBLE, self::OPERATION_READ, self::OPERATION_DELETE]);
+        switch ($module_type) {
+            case 'tst':
+                $admin_operations = array_merge($admin_operations, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_STATISTICS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_RESULTS]));
+                $admin_operations_no_delete = array_merge($admin_operations_no_delete, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_STATISTICS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_RESULTS]));
+                $admin_operations_readonly = array_merge($admin_operations_readonly, $this->getOperationArray([self::OPERATION_VIEW_TEST_STATISTICS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_VIEW_TEST_RESULTS]));
+                break;
+            case 'lm':
+            case 'sahs':
+            case 'htlm':
+                $admin_operations = array_merge($admin_operations, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS]));
+                $admin_operations_no_delete = array_merge($admin_operations_no_delete, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS]));
+                $admin_operations_readonly = array_merge($admin_operations_readonly, $this->getOperationArray([self::OPERATION_READ_LEARNING_PROGRESS]));
+                break;
+            case 'exc':
+                $admin_operations = array_merge($admin_operations, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_EDIT_SUBMISSION_GRADES]));
+                $admin_operations_no_delete = array_merge($admin_operations_no_delete, $this->getOperationArray([self::OPERATION_EDIT_LEARNING_PROGRESS, self::OPERATION_READ_LEARNING_PROGRESS, self::OPERATION_EDIT_SUBMISSION_GRADES]));
+                $admin_operations_readonly = array_merge($admin_operations_readonly, $this->getOperationArray([self::OPERATION_READ_LEARNING_PROGRESS]));
+                break;
+        }
+        foreach ($local_roles as $key => $role_data) {
+            // check only if local role is il_crs_member, -tutor or -admin
+            if (mb_strpos($role_data["title"], "il_crs_") === 0) {
+                if(mb_strpos($role_data["title"], 'il_crs_member') === 0){
+                    $operations = ($write_permission_level == "autor") ? $admin_operations_no_delete : $member_operations;
+                } elseif(mb_strpos($role_data["title"], 'il_crs_tutor') === 0){
+                    $operations = (($write_permission_level == "tutor") || ($write_permission_level == "autor")) ? $admin_operations : $admin_operations_readonly;
+                } elseif(mb_strpos($role_data["title"], 'il_crs_admin') === 0){
+                    $operations = (($write_permission_level == "dozent") || ($write_permission_level == "tutor") || ($write_permission_level == "autor")) ? $admin_operations : $admin_operations_readonly;
+                } else {
+                    continue;
+                }
+                $this->soap_client->revokePermissions($role_data["obj_id"], $ref_id);
+                $this->soap_client->grantPermissions($operations, $role_data["obj_id"], $ref_id);
+            }
+        }
+        // store object connection
+        if ($ref_id) {
+            IliasObjectConnections::setConnection($studip_course_id, $ref_id, $module_type, $this->index);
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * unset module connection
+     *
+     * unsets ILIAS module connection with course
+     * @access public
+     * @param string $studip_course_id studip range id
+     * @param string $module_id ILIAS ref id
+     * @param string $module_type type of ILIAS module
+     */
+    public function unsetCourseModuleConnection($studip_course_id, $module_id, $module_type)
+    {
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->deleteObject($module_id);
+        IliasObjectConnections::unsetConnection($studip_course_id, $module_id, $module_type, $this->index);
+    }
+
+    /**
+     * add course module
+     *
+     * adds module instance to list of course modules
+     * @access public
+     */
+    public function addCourseModule($module_id, $module_data)
+    {
+        $object_data = $this->soap_client->getObjectByReference($module_id, $this->user->getId());
+        $this->course_modules[$module_id] = new IliasModule($module_id, $object_data, $this->index, $this->ilias_int_version);
+        $this->course_modules[$module_id]->setConnectionType(true);
+    }
+
+    /**
+     * get course modules
+     *
+     * returns all added course module instances
+     * @access public
+     */
+    public function getCourseModules()
+    {
+        return $this->course_modules;
+    }
+
+    /**
+     * create course
+     *
+     * creates new ilias course
+     * @access public
+     * @param string $studip_course_id seminar-id
+     * @return string|false|null
+     */
+    public function addCourse($studip_course_id)
+    {
+        $crs_id = IliasObjectConnections::getConnectionModuleId($studip_course_id, "crs", $this->index);
+        $this->soap_client->setCachingStatus(false);
+        $this->soap_client->clearCache();
+
+        if (!$crs_id) {
+            $seminar = Seminar::getInstance($studip_course_id);
+            // on error use root category
+            $ref_id = $this->ilias_config['root_category'];
+            if ($this->ilias_config['cat_semester'] == 'outer') {
+                // category for semester above institute
+                $semester_ref_id = IliasObjectConnections::getConnectionModuleId($seminar->start_semester->getId(), 'cat', $this->index);
+                if (!$semester_ref_id) {
+                    $object_data['title'] = $seminar->getStartSemesterName();
+                    $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zum Semester "%s".'), $seminar->getStartSemesterName());
+                    $object_data['type'] = 'cat';
+                    $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
+                    $semester_ref_id = $this->soap_client->addObject($object_data, $ref_id);
+                    if ($semester_ref_id) {
+                        // store institute category
+                        IliasObjectConnections::setConnection($seminar->start_semester->getId(), $semester_ref_id, 'cat', $this->index);
+                    } else {
+                        $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data['title']);
+                    }
+                }
+                if ($semester_ref_id) {
+                    $ref_id = $semester_ref_id;
+                    // category for home institute below semester
+                    $home_institute = Institute::find($seminar->getInstitutId());
+                    if ($home_institute) {
+                        $institute_ref_id = IliasObjectConnections::getConnectionModuleId(md5($seminar->start_semester->getId().$home_institute->getId()), "cat", $this->index);
+                    }
+                    if (!$institute_ref_id) {
+                        $object_data['title'] = $home_institute->name;
+                        $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zur Stud.IP-Einrichtung "%s".'), $home_institute->name);
+                        $object_data['type'] = 'cat';
+                        $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
+                        $institute_ref_id = $this->soap_client->addObject($object_data, $ref_id);
+                        if ($institute_ref_id) {
+                            // store institute category
+                            IliasObjectConnections::setConnection(md5($seminar->start_semester->getId().$home_institute->getId()), $institute_ref_id, "cat", $this->index);
+                        }
+                    }
+                    if ($institute_ref_id) {
+                        $ref_id = $institute_ref_id;
+                    } else {
+                        $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data['title']);
+                    }
+                }
+            } elseif ($this->ilias_config['cat_semester'] === 'inner' || $this->ilias_config['cat_semester'] === 'none') {
+                // category for home institute
+                $home_institute = Institute::find($seminar->getInstitutId());
+                if ($home_institute) {
+                    $institute_ref_id = IliasObjectConnections::getConnectionModuleId($home_institute->getId(), "cat", $this->index);
+                }
+                if (!$institute_ref_id) {
+                    $object_data['title'] = $home_institute->name;
+                    $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zur Stud.IP-Einrichtung "%s".'), $home_institute->name);
+                    $object_data['type'] = 'cat';
+                    $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
+                    $institute_ref_id = $this->soap_client->addObject($object_data, $ref_id);
+                    if ($institute_ref_id) {
+                        // store institute category
+                        IliasObjectConnections::setConnection($home_institute->getId(), $institute_ref_id, "cat", $this->index);
+                    } else {
+                        $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data["title"]);
+                    }
+                }
+                if ($institute_ref_id) {
+                    $ref_id = $institute_ref_id;
+                    if ($this->ilias_config['cat_semester'] === 'inner') {
+                        // category for semester below institute
+                        $institute_semester_ref_id = IliasObjectConnections::getConnectionModuleId(md5($home_institute->getId().$seminar->start_semester->getId()), 'cat', $this->index);
+                        if (!$institute_semester_ref_id) {
+                            $object_data['title'] = $seminar->getStartSemesterName();
+                            $object_data['description'] = sprintf(_('Hier befinden sich die Veranstaltungsdaten zum Semester "%s".'), $seminar->getStartSemesterName());
+                            $object_data['type'] = 'cat';
+                            $object_data['owner'] =  $this->soap_client->LookupUser($this->ilias_config['admin']);
+                            $institute_semester_ref_id= $this->soap_client->addObject($object_data, $ref_id);
+                            if ($institute_semester_ref_id) {
+                                // store institute category
+                                IliasObjectConnections::setConnection(md5($home_institute->getId().$seminar->start_semester->getId()), $institute_semester_ref_id, 'cat', $this->index);
+                            }
+                        }
+                        if ($institute_semester_ref_id) {
+                            $ref_id = $institute_semester_ref_id;
+                        } else {
+                            $this->error[] = sprintf(_('ILIAS-Kategorie %s konnte nicht angelegt werden.'), $object_data["title"]);
+                        }
+                    }
+                }
+            }
+
+            // create course
+            $lang_array = explode('_', Config::get()->DEFAULT_LANGUAGE);
+            $course_data['language'] = $lang_array[0];
+            if ($this->ilias_config['course_semester'] === 'old' || $this->ilias_config['course_semester'] === 'old_bracket') {
+                $course_data['title'] = sprintf(_('Stud.IP-Veranstaltung "%s"'), $seminar->getName());
+            } else {
+                $course_data['title'] = sprintf(_('%s'), $seminar->getName());
+            }
+            if ($this->ilias_config['course_semester'] === 'old_bracket' || $this->ilias_config['course_semester'] === 'bracket') {
+                $course_data['title'] .= ' ('.$seminar->getStartSemesterName().')';
+            }
+            if ($this->ilias_config['course_veranstaltungsnummer']) {
+                $course_data['title'] .= ' '.$seminar->VeranstaltungsNummer;
+            }
+            $course_data['description'] = sprintf(_('Dieser Kurs enthält die Lernobjekte der Stud.IP-Veranstaltung "%s".'), $seminar->getName());
+            $crs_id = $this->soap_client->addCourse($course_data, $ref_id);
+            if (!$crs_id) {
+                $this->error[] = _('ILIAS-Kurs konnte nicht angelegt werden.');
+                return false;
+            }
+            IliasObjectConnections::setConnection($studip_course_id, $crs_id, 'crs', $this->index);
+
+            // Rollen zuordnen
+            $this->CheckUserCoursePermissions($crs_id);
+            return $crs_id;
+        }
+
+        return null;
+    }
+
+    /**
+     * check user
+     *
+     * checks if ILIAS user exists, creates new user if not
+     * @access public
+     * @return boolean returns user status
+     */
+    public function checkUser()
+    {
+        if ($this->user->getId()) {
+            $user_exists = $this->soap_client->getUser($this->user->getId());
+            if (!is_array($user_exists)) {
+                $admin_user_id = $this->soap_client->lookupUser($this->ilias_config['admin']);
+                $admin_user_exists = $this->soap_client->getUser($admin_user_id);
+                if (is_array($admin_user_exists)) {
+                    $this->user->unsetConnection(true);
+                    if ($this->newUser()) {
+                        PageLayout::postSuccess(_("Neue Verknüpfung zu ILIAS-User angelegt."));
+                    }
+                }
+            } else return true;
+        }
+        return false;
+    }
+
+    /**
+     * check user permissions
+     *
+     * checks user permissions for connected course and changes setting if necessary
+     * @access public
+     * @param string $ilias_course_id course-id
+     * @return boolean returns false on error
+     */
+    public function checkUserCoursePermissions($ilias_course_id = "")
+    {
+        if (($ilias_course_id == "") || ($this->user->getId() == "")) {
+            return false;
+        }
+
+        if ($GLOBALS['user']->perms == 'root') {
+            return true;
+        }
+
+        // check if user still exists
+        $this->checkUser();
+
+        // get course role folder and local roles
+        $user_roles = $this->soap_client->getUserRoles($this->user->getId());
+        $local_roles = $this->soap_client->getLocalRoles($ilias_course_id);
+        $active_role = "";
+        $proper_role = "";
+        $user_crs_role = $this->crs_roles[$GLOBALS["perm"]->get_studip_perm(Context::getId())];
+        if (is_array($local_roles)) {
+            foreach ($local_roles as $key => $role_data) {
+                // check only if local role is il_crs_member, -tutor or -admin
+                if (! (mb_strpos($role_data["title"], "_crs_") === false)) {
+                    if ( in_array( $role_data["obj_id"], $user_roles ) ) {
+                        $active_role = $role_data["obj_id"];
+                    }
+                    if ( mb_strpos( $role_data["title"], $user_crs_role) > 0 ) {
+                        $proper_role = $role_data["obj_id"];
+                    }
+                }
+            }
+        }
+
+        // is user already course-member? otherwise add member with proper role
+        $is_member = $this->soap_client->isMember( $this->user->getId(), $ilias_course_id);
+        if (!$is_member) {
+            $member_data["usr_id"] = $this->user->getId();
+            $member_data["ref_id"] = $ilias_course_id;
+            $member_data["status"] = self::CRS_NO_NOTIFICATION;
+            $type = "";
+            switch ($user_crs_role)
+            {
+                case "admin":
+                    $member_data["role"] = self::CRS_ADMIN_ROLE;
+                    $type = "Admin";
+                    break;
+                case "tutor":
+                    $member_data["role"] = self::CRS_TUTOR_ROLE;
+                    $type = "Tutor";
+                    break;
+                case "member":
+                    $member_data["role"] = self::CRS_MEMBER_ROLE;
+                    $type = "Member";
+                    break;
+                default:
+            }
+            $member_data["passed"] = self::CRS_PASSED_VALUE;
+            if ($type != "") {
+                $this->soap_client->addMember( $this->user->getId(), $type, $ilias_course_id);
+            }
+        }
+
+        // check if user has proper local role
+        // if not, change it
+        if ($active_role != $proper_role) {
+            if ($active_role) {
+                $this->soap_client->deleteUserRoleEntry( $this->user->getId(), $active_role);
+            }
+
+            if ($proper_role) {
+                $this->soap_client->addUserRoleEntry( $this->user->getId(), $proper_role);
+            }
+        }
+
+        if (! $this->getUserModuleViewPermission($ilias_course_id)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * get user permissions for ILIAS module
+     *
+     * returns allowed operations for current user and given module
+     * @access public
+     * @param string $module_id module-id
+     * @return boolean returns false on error
+     */
+    public function getUserModuleViewPermission($module_id)
+    {
+        $this->allowed_operations = [];
+        $this->tree_allowed_operations = $this->soap_client->getObjectTreeOperations(
+                    $module_id,
+                    $this->user->getId()
+                    );
+        if (! is_array($this->tree_allowed_operations)) {
+            return false;
+        }
+
+        $view_permission = false;
+        if ((in_array($this->operations[self::OPERATION_READ], $this->tree_allowed_operations)) && (in_array($this->operations[self::OPERATION_VISIBLE], $this->tree_allowed_operations))) {
+            $view_permission = true;
+        }
+        return $view_permission;
+    }
+
+    /**
+     * get operation
+     *
+     * returns id for given operation-string
+     * @access public
+     * @param string $operation operation
+     * @return integer operation-id
+     */
+    public function getOperation($operation)
+    {
+        // get operation IDs
+        if (!count($this->operations)) {
+            $this->operations = $this->soap_client->getOperations();
+        }
+
+        return $this->operations[$operation];
+    }
+
+    /**
+     * get operation-ids
+     *
+     * returns an array of operation-ids
+     * @access public
+     * @param string $operation operation
+     * @return array operation-ids
+     */
+    public function getOperationArray($operation)
+    {
+        // get operation IDs
+        if (!count($this->operations)) {
+            $this->operations = $this->soap_client->getOperations();
+        }
+
+        $ops_array = [];
+        if (is_array($operation)) {
+            foreach ($operation as $key => $operation_name) {
+                if (array_key_exists($operation_name, $this->operations)) {
+                    $ops_array[] = $this->operations[$operation_name];
+                }
+            }
+        }
+        return $ops_array;
+    }
+
+    /**
+    * get name of ILIAS installation
+    *
+    * returns name of cms
+    * @access public
+    * @return string name
+    */
+    public function getName()
+    {
+        return $this->ilias_config['name'];
+    }
+
+    /**
+    * get index of ILIAS installation
+    *
+    * returns index of ILIAS installation
+    * @access public
+    * @return string type
+    */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    /**
+    * get url of ILIAS installation
+    *
+    * returns url of ILIAS installation
+    * @access public
+    * @return string path
+    */
+    public function getAbsolutePath()
+    {
+        return $this->ilias_config['url'];
+    }
+
+    /**
+    * get target file of ILIAS installation
+    *
+    * returns target file of ILIAS installation
+    * @access public
+    * @return string target file
+    */
+    public function getTargetFile()
+    {
+        return $this->ilias_config['url'].'studip_referrer.php';
+    }
+
+    /**
+    * get active-setting
+    *
+    * returns true, if ILIAS installation is active
+    * @access public
+    * @return boolean active-setting
+    */
+    public function isActive()
+    {
+        return $this->ilias_config['is_active'];
+    }
+
+    /**
+     * get client-id
+     *
+     * returns client-id
+     * @access public
+     * @return string client-id
+     */
+    public function getClientId()
+    {
+        return $this->ilias_config['client'];
+    }
+
+    /**
+    * get user prefix
+    *
+    * returns user prefix
+    * @access public
+    * @return string user prefix
+    */
+    public function getUserPrefix()
+    {
+        return $this->ilias_config['user_prefix'];
+    }
+
+    /**
+     * get errors
+     *
+     * returns array of error strings.
+     * @access public
+     * @return array of error strings
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+    * search ILIAS modules
+    *
+    * performs search for ILIAS modules
+    * @access public
+    * @return boolean returns false
+    */
+    public function searchModules($search_key)
+    {
+        $types = [];
+        foreach ($this->getAllowedModuleTypes() as $type => $name) {
+            $types[] = $type;
+        }
+        $search_modules = [];
+
+        $result = $this->soap_client->searchObjects($types, $search_key, "and", $this->user->getId());
+        if ($result) {
+            foreach($result as $key => $object_data) {
+                // set every single reference as part of the result
+                foreach ($object_data['references'] as $ref_id => $reference) {
+                    $search_modules[$ref_id] = new IliasModule($ref_id, $object_data, $this->index, $this->ilias_int_version);
+                }
+            }
+        }
+        return $search_modules;
+    }
+
+    public function deleteConnectedModules($object_id){
+        return IliasObjectConnections::DeleteAllConnections($object_id, $this->index);
+    }
+
+    /**
+     * @param string $ilias_user_id
+     * @return IliasUser|void
+     */
+    public function getConnectedUser(string $ilias_user_id)
+    {
+        $user_id = DBManager::get()->fetchColumn(
+            "SELECT studip_user_id FROM auth_extern WHERE external_user_id = ? AND external_user_system_type = ?",
+            [$ilias_user_id, $this->index]
+        );
+        if ($user_id) {
+            return new IliasUser($this->index, $this->ilias_config['version'], $user_id);
+        }
+    }
+}
diff --git a/lib/ilias_interface/IliasModule.class.php b/lib/ilias_interface/IliasModule.class.php
deleted file mode 100644
index f9bf958..0000000
--- a/lib/ilias_interface/IliasModule.class.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* class to handle content module data
-*
-* This class handles all data from a single ILIAS content module
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  ilias_interface_modules
-* @module       IliasModule
-* @package  ILIAS-Interface
-*/
-
-class IliasModule
-{
-    public $id;
-    public $title;
-    public $description;
-    public $module_type;
-    public $module_type_name;
-    public $author;
-    public $make_date;
-    public $change_date;
-    public $path;
-    public $ilias_index;
-    public $allowed_operations;
-    public $is_offline;
-    public $is_connected;
-    public $owner;
-    public $author_studip;
-    public $siblings_count;
-    public $icon_file;
-
-    /**
-    * constructor
-    *
-    * init class
-    * @access public
-    * @param string $module_id module-id
-    * @param string $module_type module-type
-    * @param string $ilias_index ilias installation index
-    */
-    function __construct($module_id, $module_data, $ilias_index, $ilias_version)
-    {
-        $this->id = $module_id;
-        $this->title = $module_data['title'];
-        $this->description = $module_data['description'];
-        $this->ilias_index = $ilias_index;
-        $this->module_type = $module_data['type'];
-        $this->make_date = $module_data['create_date'];
-        $this->change_date = $module_data['last_update'];
-        $supported_modules = ConnectedIlias::getSupportedModuleTypes();
-        $this->module_type_name = $supported_modules[$this->module_type];
-        $this->owner = $module_data['owner'];
-        $this->author_studip = false;
-        if (is_array($module_data['references'][$module_id]['operations'])) {
-            $this->allowed_operations = $module_data['references'][$module_id]['operations'];
-        } else {
-            $this->allowed_operations = [];
-        }
-        $this->is_offline = $module_data['offline'];
-        $this->siblings_count = $module_data['ref_count'];
-    }
-
-    /**
-    * get id
-    *
-    * returns id
-    * @access public
-    * @return string id
-    */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-    * get ILIAS installation index
-    *
-    * returns ILIAS installation index
-    * @access public
-    * @return string cms-type
-    */
-    function getIndex()
-    {
-        return $this->ilias_index;
-    }
-
-    /**
-    * get module-type
-    *
-    * returns module-type
-    * @access public
-    * @return string module-type
-    */
-    function getModuleType()
-    {
-        return $this->module_type;
-    }
-
-    /**
-    * get module-type name
-    *
-    * returns module-type name
-    * @access public
-    * @return string module-type name
-    */
-    function getModuleTypeName()
-    {
-        return $this->module_type_name;
-    }
-
-    /**
-    * set title
-    *
-    * sets title
-    * @access public
-    * @param string $module_title title
-    */
-    function setTitle($module_title)
-    {
-        $this->title = $module_title;
-    }
-
-    /**
-    * get title
-    *
-    * returns title
-    * @access public
-    * @return string title
-    */
-    function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-    * set description
-    *
-    * sets description
-    * @access public
-    * @param string $module_description description
-    */
-    function setDescription($module_description)
-    {
-        $this->description = $module_description;
-    }
-
-    /**
-    * get description
-    *
-    * returns description
-    * @access public
-    * @return string description
-    */
-    function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * get make date
-     *
-     * returns make date
-     * @access public
-     * @return string make date
-     */
-    function getMakeDate()
-    {
-        return $this->make_date;
-    }
-
-    /**
-     * get change date
-     *
-     * returns change date
-     * @access public
-     * @return string change date
-     */
-    function getChangeDate()
-    {
-        return $this->change_date;
-    }
-
-    /**
-     * get ILIAS path
-     *
-     * returns ILIAS path
-     * @access public
-     * @return string ILIAS path
-     */
-    function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * get route
-     *
-     * returns route for given action
-     * @access public
-     * @param string action start, edit, view_tools, view_course, add, remove
-     * @return string url
-     */
-    function getRoute($action = '')
-    {
-        switch ($action) {
-            case 'start'       : return 'my_ilias_accounts/redirect/'.$this->ilias_index.'/start/'.$this->id.'/'.$this->module_type;
-            case 'edit'        : return 'my_ilias_accounts/redirect/'.$this->ilias_index.'/edit/'.$this->id.'/'.$this->module_type;
-            case 'view_tools'  : return 'my_ilias_accounts/view_object/'.$this->ilias_index.'/'.$this->id;
-            case 'view_course' : return 'course/ilias_interface/view_object/'.$this->ilias_index.'/'.$this->id;
-            case 'add'         : return 'course/ilias_interface/edit_object_assignment/'.$this->ilias_index.'?add_module=1&ilias_module_id='.$this->id;
-            case 'remove'      : return 'course/ilias_interface/edit_object_assignment/'.$this->ilias_index.'?remove_module&ilias_module_id='.$this->id;
-        }
-
-        throw new InvalidArgumentException("Unknown action {$action}");
-    }
-
-
-    /**
-     * get permission status
-     *
-     * returns true if given action is allowed
-     * @access public
-     * @param string action start, edit
-     * @return boolean permission status
-     */
-    function isAllowed($action = '')
-    {
-        switch ($action) {
-            case 'start' : return in_array('read', $this->allowed_operations);
-            case 'edit' : return in_array('write', $this->allowed_operations);
-            case 'delete' : return in_array('delete', $this->allowed_operations);
-            case 'copy' : return in_array('copy', $this->allowed_operations);
-        }
-        return true;
-    }
-
-    /**
-    * set ILIAS author ID
-    *
-    * sets author
-    * @access public
-    * @param array $module_authors authors
-    */
-    function setAuthorIlias($module_author)
-    {
-        $this->owner = $module_author;
-    }
-
-    /**
-     * get ILIAS author ID
-     *
-     * returns author
-     * @access public
-     * @return string author id
-     */
-    function getAuthorIlias()
-    {
-        return $this->owner;
-    }
-
-    /**
-     * get author Stud.IP-User
-     *
-     * returns author User object
-     * @access public
-     * @return object User
-     */
-    function getAuthorStudip()
-    {
-        if (is_object($this->author_studip)) {
-            return $this->author_studip;
-        }
-
-        $query = "SELECT studip_user_id
-                  FROM auth_extern
-                  WHERE external_user_id = ? AND external_user_system_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->owner, $this->ilias_index]);
-        $data = $statement->fetch(PDO::FETCH_ASSOC);
-        if ($data) {
-            $this->author_studip = User::find($data['studip_user_id']);
-        }
-
-        return $this->author_studip;
-    }
-
-    /**
-    * set connection
-    *
-    * sets connection with seminar
-    * @access public
-    * @param string $seminar_id seminar-id
-    * @return boolean successful
-    */
-    function setConnection($seminar_id)
-    {
-        $this->is_connected = true;
-        return IliasObjectConnections::setConnection($seminar_id, $this->id, $this->module_type, $this->ilias_index);
-    }
-
-    /**
-    * unset connection
-    *
-    * unsets connection with seminar
-    * @access public
-    * @param string $seminar_id seminar-id
-    * @return boolean successful
-    */
-    function unsetConnection($seminar_id)
-    {
-        $this->is_connected = false;
-        return IliasObjectConnections::unsetConnection($seminar_id, $this->id, $this->module_type, $this->ilias_index);
-    }
-
-    /**
-    * set connection-status
-    *
-    * sets connection-status
-    * @access public
-    * @param boolean $is_connected connection-status
-    */
-    function setConnectionType($is_connected)
-    {
-        $this->is_connected = $is_connected;
-    }
-
-    /**
-    * get connection-status
-    *
-    * returns true, if module is connected to seminar
-    * @access public
-    * @return boolean connection-status
-    */
-    function isConnected()
-    {
-        return $this->is_connected;
-    }
-
-    /**
-    * get reference string
-    *
-    * returns reference string for content-module
-    * @access public
-    * @return string reference string
-    */
-    function getReferenceString()
-    {
-        return $this->ilias_index."_".$this->module_type."_".$this->id;
-    }
-
-    /**
-    * get icon-image
-    *
-    * returns icon-image
-    * @access public
-    * @return string icon-image
-    */
-    function getIcon($mode = 'inactive')
-    {
-        if (!$this->icon_file) {
-            $this->icon_file = 'learnmodule';
-        }
-        return Icon::create($this->icon_file, 'inactive', [])->asImg();
-    }
-}
diff --git a/lib/ilias_interface/IliasModule.php b/lib/ilias_interface/IliasModule.php
new file mode 100644
index 0000000..f9bf958
--- /dev/null
+++ b/lib/ilias_interface/IliasModule.php
@@ -0,0 +1,371 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* class to handle content module data
+*
+* This class handles all data from a single ILIAS content module
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  ilias_interface_modules
+* @module       IliasModule
+* @package  ILIAS-Interface
+*/
+
+class IliasModule
+{
+    public $id;
+    public $title;
+    public $description;
+    public $module_type;
+    public $module_type_name;
+    public $author;
+    public $make_date;
+    public $change_date;
+    public $path;
+    public $ilias_index;
+    public $allowed_operations;
+    public $is_offline;
+    public $is_connected;
+    public $owner;
+    public $author_studip;
+    public $siblings_count;
+    public $icon_file;
+
+    /**
+    * constructor
+    *
+    * init class
+    * @access public
+    * @param string $module_id module-id
+    * @param string $module_type module-type
+    * @param string $ilias_index ilias installation index
+    */
+    function __construct($module_id, $module_data, $ilias_index, $ilias_version)
+    {
+        $this->id = $module_id;
+        $this->title = $module_data['title'];
+        $this->description = $module_data['description'];
+        $this->ilias_index = $ilias_index;
+        $this->module_type = $module_data['type'];
+        $this->make_date = $module_data['create_date'];
+        $this->change_date = $module_data['last_update'];
+        $supported_modules = ConnectedIlias::getSupportedModuleTypes();
+        $this->module_type_name = $supported_modules[$this->module_type];
+        $this->owner = $module_data['owner'];
+        $this->author_studip = false;
+        if (is_array($module_data['references'][$module_id]['operations'])) {
+            $this->allowed_operations = $module_data['references'][$module_id]['operations'];
+        } else {
+            $this->allowed_operations = [];
+        }
+        $this->is_offline = $module_data['offline'];
+        $this->siblings_count = $module_data['ref_count'];
+    }
+
+    /**
+    * get id
+    *
+    * returns id
+    * @access public
+    * @return string id
+    */
+    function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+    * get ILIAS installation index
+    *
+    * returns ILIAS installation index
+    * @access public
+    * @return string cms-type
+    */
+    function getIndex()
+    {
+        return $this->ilias_index;
+    }
+
+    /**
+    * get module-type
+    *
+    * returns module-type
+    * @access public
+    * @return string module-type
+    */
+    function getModuleType()
+    {
+        return $this->module_type;
+    }
+
+    /**
+    * get module-type name
+    *
+    * returns module-type name
+    * @access public
+    * @return string module-type name
+    */
+    function getModuleTypeName()
+    {
+        return $this->module_type_name;
+    }
+
+    /**
+    * set title
+    *
+    * sets title
+    * @access public
+    * @param string $module_title title
+    */
+    function setTitle($module_title)
+    {
+        $this->title = $module_title;
+    }
+
+    /**
+    * get title
+    *
+    * returns title
+    * @access public
+    * @return string title
+    */
+    function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+    * set description
+    *
+    * sets description
+    * @access public
+    * @param string $module_description description
+    */
+    function setDescription($module_description)
+    {
+        $this->description = $module_description;
+    }
+
+    /**
+    * get description
+    *
+    * returns description
+    * @access public
+    * @return string description
+    */
+    function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * get make date
+     *
+     * returns make date
+     * @access public
+     * @return string make date
+     */
+    function getMakeDate()
+    {
+        return $this->make_date;
+    }
+
+    /**
+     * get change date
+     *
+     * returns change date
+     * @access public
+     * @return string change date
+     */
+    function getChangeDate()
+    {
+        return $this->change_date;
+    }
+
+    /**
+     * get ILIAS path
+     *
+     * returns ILIAS path
+     * @access public
+     * @return string ILIAS path
+     */
+    function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * get route
+     *
+     * returns route for given action
+     * @access public
+     * @param string action start, edit, view_tools, view_course, add, remove
+     * @return string url
+     */
+    function getRoute($action = '')
+    {
+        switch ($action) {
+            case 'start'       : return 'my_ilias_accounts/redirect/'.$this->ilias_index.'/start/'.$this->id.'/'.$this->module_type;
+            case 'edit'        : return 'my_ilias_accounts/redirect/'.$this->ilias_index.'/edit/'.$this->id.'/'.$this->module_type;
+            case 'view_tools'  : return 'my_ilias_accounts/view_object/'.$this->ilias_index.'/'.$this->id;
+            case 'view_course' : return 'course/ilias_interface/view_object/'.$this->ilias_index.'/'.$this->id;
+            case 'add'         : return 'course/ilias_interface/edit_object_assignment/'.$this->ilias_index.'?add_module=1&ilias_module_id='.$this->id;
+            case 'remove'      : return 'course/ilias_interface/edit_object_assignment/'.$this->ilias_index.'?remove_module&ilias_module_id='.$this->id;
+        }
+
+        throw new InvalidArgumentException("Unknown action {$action}");
+    }
+
+
+    /**
+     * get permission status
+     *
+     * returns true if given action is allowed
+     * @access public
+     * @param string action start, edit
+     * @return boolean permission status
+     */
+    function isAllowed($action = '')
+    {
+        switch ($action) {
+            case 'start' : return in_array('read', $this->allowed_operations);
+            case 'edit' : return in_array('write', $this->allowed_operations);
+            case 'delete' : return in_array('delete', $this->allowed_operations);
+            case 'copy' : return in_array('copy', $this->allowed_operations);
+        }
+        return true;
+    }
+
+    /**
+    * set ILIAS author ID
+    *
+    * sets author
+    * @access public
+    * @param array $module_authors authors
+    */
+    function setAuthorIlias($module_author)
+    {
+        $this->owner = $module_author;
+    }
+
+    /**
+     * get ILIAS author ID
+     *
+     * returns author
+     * @access public
+     * @return string author id
+     */
+    function getAuthorIlias()
+    {
+        return $this->owner;
+    }
+
+    /**
+     * get author Stud.IP-User
+     *
+     * returns author User object
+     * @access public
+     * @return object User
+     */
+    function getAuthorStudip()
+    {
+        if (is_object($this->author_studip)) {
+            return $this->author_studip;
+        }
+
+        $query = "SELECT studip_user_id
+                  FROM auth_extern
+                  WHERE external_user_id = ? AND external_user_system_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->owner, $this->ilias_index]);
+        $data = $statement->fetch(PDO::FETCH_ASSOC);
+        if ($data) {
+            $this->author_studip = User::find($data['studip_user_id']);
+        }
+
+        return $this->author_studip;
+    }
+
+    /**
+    * set connection
+    *
+    * sets connection with seminar
+    * @access public
+    * @param string $seminar_id seminar-id
+    * @return boolean successful
+    */
+    function setConnection($seminar_id)
+    {
+        $this->is_connected = true;
+        return IliasObjectConnections::setConnection($seminar_id, $this->id, $this->module_type, $this->ilias_index);
+    }
+
+    /**
+    * unset connection
+    *
+    * unsets connection with seminar
+    * @access public
+    * @param string $seminar_id seminar-id
+    * @return boolean successful
+    */
+    function unsetConnection($seminar_id)
+    {
+        $this->is_connected = false;
+        return IliasObjectConnections::unsetConnection($seminar_id, $this->id, $this->module_type, $this->ilias_index);
+    }
+
+    /**
+    * set connection-status
+    *
+    * sets connection-status
+    * @access public
+    * @param boolean $is_connected connection-status
+    */
+    function setConnectionType($is_connected)
+    {
+        $this->is_connected = $is_connected;
+    }
+
+    /**
+    * get connection-status
+    *
+    * returns true, if module is connected to seminar
+    * @access public
+    * @return boolean connection-status
+    */
+    function isConnected()
+    {
+        return $this->is_connected;
+    }
+
+    /**
+    * get reference string
+    *
+    * returns reference string for content-module
+    * @access public
+    * @return string reference string
+    */
+    function getReferenceString()
+    {
+        return $this->ilias_index."_".$this->module_type."_".$this->id;
+    }
+
+    /**
+    * get icon-image
+    *
+    * returns icon-image
+    * @access public
+    * @return string icon-image
+    */
+    function getIcon($mode = 'inactive')
+    {
+        if (!$this->icon_file) {
+            $this->icon_file = 'learnmodule';
+        }
+        return Icon::create($this->icon_file, 'inactive', [])->asImg();
+    }
+}
diff --git a/lib/ilias_interface/IliasObjectConnections.class.php b/lib/ilias_interface/IliasObjectConnections.class.php
deleted file mode 100644
index 0c6a8a9..0000000
--- a/lib/ilias_interface/IliasObjectConnections.class.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: TODO
-/**
-* class to handle object connections
-*
-* This class contains methods to handle connections between stud.ip-objects and external content.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  ilias_interface_modules
-* @module       IliasObjectConnections
-* @package  Ilias-Interface
-*/
-class IliasObjectConnections
-{
-    public $id;
-    public $object_connections;
-    /**
-    * constructor
-    *
-    * init class.
-    * @access public
-    * @param string $object_id object-id
-    */
-    function __construct($object_id = "")
-    {
-        $this->id = $object_id;
-        if ($object_id != "")
-            $this->readData();
-    }
-
-    /**
-    * read object connections
-    *
-    * gets object connections from database
-    * @access public
-    */
-    function readData()
-    {
-        $this->object_connections = [];
-
-        $query = "SELECT system_type, module_type, module_id, chdate
-                  FROM object_contentmodules
-                  WHERE object_id = ?
-                  ORDER BY chdate DESC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->id]);
-
-        $module_count = 0;
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $module_count += 1;
-            $d_system_type = $row['system_type'];
-            $d_module_type = $row['module_type'];
-            $d_module_id   = $row['module_id'];
-
-            $reference = $d_system_type . '_' . $d_module_type . '_' . $d_module_id;
-            $reference = $d_module_id;
-            $this->object_connections[$d_system_type][$reference]['index']    = $d_system_type;
-            $this->object_connections[$d_system_type][$reference]['type']   = $d_module_type;
-            $this->object_connections[$d_system_type][$reference]['id']     = $d_module_id;
-            $this->object_connections[$d_system_type][$reference]['chdate'] = $row['chdate'];
-        }
-
-        if ($module_count == 0) {
-            $this->object_connections = false;
-        }
-    }
-
-    /**
-    * get object connections
-    *
-    * returns object connections
-    * @access public
-    * @return array object connections
-    */
-    function getConnections()
-    {
-        return $this->object_connections;
-    }
-
-    /**
-    * get connection-status
-    *
-    * returns true, if object has connections
-    * @access public
-    * @return boolean connection-status
-    */
-    function isConnected($ilias_index = '')
-    {
-        if ($ilias_index) {
-            return (boolean) $this->object_connections[$ilias_index];
-        } else {
-            return (boolean) $this->object_connections;
-        }
-    }
-
-    /**
-     * get connection-status
-     *
-     * returns true, if object has connections
-     * @access public
-     * @param string $object_id object-id (optional)
-     * @return boolean connection-status
-     */
-    public static function isObjectConnected($index, $object_id)
-    {
-        if ($object_id && $index) {
-            $query = "SELECT 1 FROM object_contentmodules WHERE object_id = ? AND system_type = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$object_id, $index]);
-            return (bool) $statement->fetchColumn();
-        }
-
-        return false;
-    }
-
-    /**
-     * get connection-status
-     *
-     * returns true, if course has connections to ILIAS courses
-     * @access public
-     * @param string $object_id object-id (optional)
-     * @return boolean connection-status
-     */
-    public static function isCourseConnected($object_id)
-    {
-        if ($object_id) {
-            $query = "SELECT 1 FROM object_contentmodules WHERE object_id = ? AND module_type = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$object_id, 'crs']);
-            return (bool)$statement->fetchColumn();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-    * get module-id
-    *
-    * returns module-id of given connection
-    * @access public
-    * @param string $connection_object_id object-id
-    * @param string $connection_module_type module-type
-    * @param string $connection_cms system-type
-    * @return string module-id
-    */
-    public static function getConnectionModuleId($connection_object_id, $connection_module_type, $connection_cms)
-    {
-        $query = "SELECT module_id
-                  FROM object_contentmodules
-                  WHERE object_id = ? AND system_type = ? AND module_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $connection_object_id,
-            $connection_cms,
-            $connection_module_type
-        ]);
-        return $statement->fetchColumn() ?: false;
-    }
-
-    /**
-    * set connection
-    *
-    * sets connection with object
-    * @access public
-    * @param string $connection_object_id object-id
-    * @param string $connection_module_id module-id
-    * @param string $connection_module_type module-type
-    * @param string $connection_cms system-type
-    * @return boolean successful
-    */
-    public static function setConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
-    {
-        $query = "SELECT 1
-                  FROM object_contentmodules
-                  WHERE object_id = ? AND module_id = ? AND system_type = ?
-                    AND module_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $connection_object_id,
-            $connection_module_id,
-            $connection_cms,
-            $connection_module_type
-        ]);
-        $check = $statement->fetchColumn();
-
-        if ($check) {
-            $query = "UPDATE object_contentmodules
-                      SET module_type = ?, chdate = UNIX_TIMESTAMP()
-                      WHERE object_id = ? AND module_id = ? AND system_type = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $connection_module_type,
-                $connection_object_id,
-                $connection_module_id,
-                $connection_cms
-            ]);
-        } else {
-            $query = "INSERT INTO object_contentmodules
-                        (object_id, module_id, system_type, module_type, mkdate, chdate)
-                      VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $connection_object_id,
-                $connection_module_id,
-                $connection_cms,
-                $connection_module_type
-            ]);
-        }
-        return true;
-    }
-
-    /**
-    * unset connection
-    *
-    * deletes connection with object
-    * @access public
-    * @param string $connection_object_id object-id
-    * @param string $connection_module_id module-id
-    * @param string $connection_module_type module-type
-    * @param string $connection_cms system-type
-    * @return boolean successful
-    */
-    public static function unsetConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
-    {
-        $query = "SELECT 1
-                  FROM object_contentmodules
-                  WHERE object_id = ? AND module_id = ? AND system_type = ?
-                    AND module_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $connection_object_id,
-            $connection_module_id,
-            $connection_cms,
-            $connection_module_type
-        ]);
-        $check = $statement->fetchColumn();
-
-
-        if ($check) {
-            $query = "DELETE FROM object_contentmodules
-                      WHERE object_id = ? AND module_id = ? AND system_type = ?
-                        AND module_type = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $connection_object_id,
-                $connection_module_id,
-                $connection_cms,
-                $connection_module_type
-            ]);
-            return true;
-        }
-        return false;
-    }
-
-    public static function GetConnectedSystems($object_id)
-    {
-        $query = "SELECT DISTINCT system_type
-                  FROM object_contentmodules
-                  WHERE object_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$object_id]);
-        return $statement->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    public static function DeleteAllConnections($object_id, $cms_type)
-    {
-        $query = "DELETE FROM object_contentmodules
-                  WHERE object_id = ? AND system_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$object_id, $cms_type]);
-        return $statement->rowCount();
-    }
-
-    /**
-     * @param Course $course
-     * @return int
-     */
-    public static function importIliasResultsForCourse(Course $course): int
-    {
-        $connected_ilias = [];
-        $students = new SimpleCollection($course->getMembersWithStatus('autor'));
-        $num = 0;
-        foreach (Grading\Definition::findBySQL("course_id = ? AND tool='ILIAS'", [$course->id]) as $definition) {
-            [$index, $module_id, $import_type] = explode('-', $definition->item);
-            if (!isset($connected_ilias[$index])) {
-                $connected_ilias[$index] = new ConnectedIlias($index);
-            }
-            $test_result = $connected_ilias[$index]->soap_client->getTestResults($module_id);
-            foreach ($test_result as $result) {
-                $ilias_user = $connected_ilias[$index]->getConnectedUser($result['user_id']);
-                if ($ilias_user) {
-                    $member = $students->findOneBy('user_id', $ilias_user->getStudipId());
-                    if ($member) {
-                        $grade = Grading\Instance::import([
-                                'definition_id' => $definition->id,
-                                'user_id'       => $member->user_id,
-                                'rawgrade'      => $import_type & 1 && $result['maximum_points'] ? $result['received_points'] / $result['maximum_points'] : 0,
-                                'passed'        => $import_type & 2 ? $result['passed'] : 0
-                            ]
-                        );
-                        $num += $grade->store();
-                    }
-                }
-            }
-        }
-        return $num;
-    }
-}
diff --git a/lib/ilias_interface/IliasObjectConnections.php b/lib/ilias_interface/IliasObjectConnections.php
new file mode 100644
index 0000000..0c6a8a9
--- /dev/null
+++ b/lib/ilias_interface/IliasObjectConnections.php
@@ -0,0 +1,311 @@
+<?php
+# Lifter003: TEST
+# Lifter007: TODO
+# Lifter010: TODO
+/**
+* class to handle object connections
+*
+* This class contains methods to handle connections between stud.ip-objects and external content.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  ilias_interface_modules
+* @module       IliasObjectConnections
+* @package  Ilias-Interface
+*/
+class IliasObjectConnections
+{
+    public $id;
+    public $object_connections;
+    /**
+    * constructor
+    *
+    * init class.
+    * @access public
+    * @param string $object_id object-id
+    */
+    function __construct($object_id = "")
+    {
+        $this->id = $object_id;
+        if ($object_id != "")
+            $this->readData();
+    }
+
+    /**
+    * read object connections
+    *
+    * gets object connections from database
+    * @access public
+    */
+    function readData()
+    {
+        $this->object_connections = [];
+
+        $query = "SELECT system_type, module_type, module_id, chdate
+                  FROM object_contentmodules
+                  WHERE object_id = ?
+                  ORDER BY chdate DESC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->id]);
+
+        $module_count = 0;
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $module_count += 1;
+            $d_system_type = $row['system_type'];
+            $d_module_type = $row['module_type'];
+            $d_module_id   = $row['module_id'];
+
+            $reference = $d_system_type . '_' . $d_module_type . '_' . $d_module_id;
+            $reference = $d_module_id;
+            $this->object_connections[$d_system_type][$reference]['index']    = $d_system_type;
+            $this->object_connections[$d_system_type][$reference]['type']   = $d_module_type;
+            $this->object_connections[$d_system_type][$reference]['id']     = $d_module_id;
+            $this->object_connections[$d_system_type][$reference]['chdate'] = $row['chdate'];
+        }
+
+        if ($module_count == 0) {
+            $this->object_connections = false;
+        }
+    }
+
+    /**
+    * get object connections
+    *
+    * returns object connections
+    * @access public
+    * @return array object connections
+    */
+    function getConnections()
+    {
+        return $this->object_connections;
+    }
+
+    /**
+    * get connection-status
+    *
+    * returns true, if object has connections
+    * @access public
+    * @return boolean connection-status
+    */
+    function isConnected($ilias_index = '')
+    {
+        if ($ilias_index) {
+            return (boolean) $this->object_connections[$ilias_index];
+        } else {
+            return (boolean) $this->object_connections;
+        }
+    }
+
+    /**
+     * get connection-status
+     *
+     * returns true, if object has connections
+     * @access public
+     * @param string $object_id object-id (optional)
+     * @return boolean connection-status
+     */
+    public static function isObjectConnected($index, $object_id)
+    {
+        if ($object_id && $index) {
+            $query = "SELECT 1 FROM object_contentmodules WHERE object_id = ? AND system_type = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$object_id, $index]);
+            return (bool) $statement->fetchColumn();
+        }
+
+        return false;
+    }
+
+    /**
+     * get connection-status
+     *
+     * returns true, if course has connections to ILIAS courses
+     * @access public
+     * @param string $object_id object-id (optional)
+     * @return boolean connection-status
+     */
+    public static function isCourseConnected($object_id)
+    {
+        if ($object_id) {
+            $query = "SELECT 1 FROM object_contentmodules WHERE object_id = ? AND module_type = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$object_id, 'crs']);
+            return (bool)$statement->fetchColumn();
+        } else {
+            return false;
+        }
+    }
+
+    /**
+    * get module-id
+    *
+    * returns module-id of given connection
+    * @access public
+    * @param string $connection_object_id object-id
+    * @param string $connection_module_type module-type
+    * @param string $connection_cms system-type
+    * @return string module-id
+    */
+    public static function getConnectionModuleId($connection_object_id, $connection_module_type, $connection_cms)
+    {
+        $query = "SELECT module_id
+                  FROM object_contentmodules
+                  WHERE object_id = ? AND system_type = ? AND module_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $connection_object_id,
+            $connection_cms,
+            $connection_module_type
+        ]);
+        return $statement->fetchColumn() ?: false;
+    }
+
+    /**
+    * set connection
+    *
+    * sets connection with object
+    * @access public
+    * @param string $connection_object_id object-id
+    * @param string $connection_module_id module-id
+    * @param string $connection_module_type module-type
+    * @param string $connection_cms system-type
+    * @return boolean successful
+    */
+    public static function setConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
+    {
+        $query = "SELECT 1
+                  FROM object_contentmodules
+                  WHERE object_id = ? AND module_id = ? AND system_type = ?
+                    AND module_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $connection_object_id,
+            $connection_module_id,
+            $connection_cms,
+            $connection_module_type
+        ]);
+        $check = $statement->fetchColumn();
+
+        if ($check) {
+            $query = "UPDATE object_contentmodules
+                      SET module_type = ?, chdate = UNIX_TIMESTAMP()
+                      WHERE object_id = ? AND module_id = ? AND system_type = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $connection_module_type,
+                $connection_object_id,
+                $connection_module_id,
+                $connection_cms
+            ]);
+        } else {
+            $query = "INSERT INTO object_contentmodules
+                        (object_id, module_id, system_type, module_type, mkdate, chdate)
+                      VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $connection_object_id,
+                $connection_module_id,
+                $connection_cms,
+                $connection_module_type
+            ]);
+        }
+        return true;
+    }
+
+    /**
+    * unset connection
+    *
+    * deletes connection with object
+    * @access public
+    * @param string $connection_object_id object-id
+    * @param string $connection_module_id module-id
+    * @param string $connection_module_type module-type
+    * @param string $connection_cms system-type
+    * @return boolean successful
+    */
+    public static function unsetConnection($connection_object_id, $connection_module_id, $connection_module_type, $connection_cms)
+    {
+        $query = "SELECT 1
+                  FROM object_contentmodules
+                  WHERE object_id = ? AND module_id = ? AND system_type = ?
+                    AND module_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $connection_object_id,
+            $connection_module_id,
+            $connection_cms,
+            $connection_module_type
+        ]);
+        $check = $statement->fetchColumn();
+
+
+        if ($check) {
+            $query = "DELETE FROM object_contentmodules
+                      WHERE object_id = ? AND module_id = ? AND system_type = ?
+                        AND module_type = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $connection_object_id,
+                $connection_module_id,
+                $connection_cms,
+                $connection_module_type
+            ]);
+            return true;
+        }
+        return false;
+    }
+
+    public static function GetConnectedSystems($object_id)
+    {
+        $query = "SELECT DISTINCT system_type
+                  FROM object_contentmodules
+                  WHERE object_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$object_id]);
+        return $statement->fetchAll(PDO::FETCH_COLUMN);
+    }
+
+    public static function DeleteAllConnections($object_id, $cms_type)
+    {
+        $query = "DELETE FROM object_contentmodules
+                  WHERE object_id = ? AND system_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$object_id, $cms_type]);
+        return $statement->rowCount();
+    }
+
+    /**
+     * @param Course $course
+     * @return int
+     */
+    public static function importIliasResultsForCourse(Course $course): int
+    {
+        $connected_ilias = [];
+        $students = new SimpleCollection($course->getMembersWithStatus('autor'));
+        $num = 0;
+        foreach (Grading\Definition::findBySQL("course_id = ? AND tool='ILIAS'", [$course->id]) as $definition) {
+            [$index, $module_id, $import_type] = explode('-', $definition->item);
+            if (!isset($connected_ilias[$index])) {
+                $connected_ilias[$index] = new ConnectedIlias($index);
+            }
+            $test_result = $connected_ilias[$index]->soap_client->getTestResults($module_id);
+            foreach ($test_result as $result) {
+                $ilias_user = $connected_ilias[$index]->getConnectedUser($result['user_id']);
+                if ($ilias_user) {
+                    $member = $students->findOneBy('user_id', $ilias_user->getStudipId());
+                    if ($member) {
+                        $grade = Grading\Instance::import([
+                                'definition_id' => $definition->id,
+                                'user_id'       => $member->user_id,
+                                'rawgrade'      => $import_type & 1 && $result['maximum_points'] ? $result['received_points'] / $result['maximum_points'] : 0,
+                                'passed'        => $import_type & 2 ? $result['passed'] : 0
+                            ]
+                        );
+                        $num += $grade->store();
+                    }
+                }
+            }
+        }
+        return $num;
+    }
+}
diff --git a/lib/ilias_interface/IliasSoap.class.php b/lib/ilias_interface/IliasSoap.class.php
deleted file mode 100644
index 7911e9e..0000000
--- a/lib/ilias_interface/IliasSoap.class.php
+++ /dev/null
@@ -1,1709 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-require_once 'vendor/ilias/class.ilSaxParser.php';
-require_once 'vendor/ilias/class.ilObjectXMLParser.php';
-
-/**
-* class for ILIAS-SOAP-Webservice
-*
-* This class contains methods to connect to the ILIAS SOAP Server.
-*
-* @author       Arne Schröder <schroeder@data-quest.de>
-* @access       public
-* @modulegroup  ilias_interface_modules
-* @module       IliasSoap
-* @package      ILIAS-Interface
-*/
-class IliasSoap extends StudipSoapClient
-{
-    private $index;
-    private $ilias_client;
-    private $ilias_version;
-    private $admin_login;
-    private $admin_password;
-    private $admin_sid;
-    private $user_sid;
-    private $user_type;
-    private $soap_cache;
-    private $separator_string;
-    private $caching_active = false;
-
-
-    /**
-     * constructor
-     *
-     * init class.
-     * @access public
-     * @param string $index ILIAS installation index
-     * @param string $soap_path SOAP url
-     * @param string $ilias_client ILIAS client
-     * @param string $ilias_version ILIAS int client
-     * @param string $admin_login ILIAS admin account login
-     * @param string $admin_password ILIAS admin account password
-     */
-    public function __construct($index, $soap_path, $ilias_client = '', $ilias_version = '', $admin_login = '', $admin_password = '')
-    {
-        $this->index = $index;
-        $this->ilias_client = $ilias_client;
-        $this->ilias_version= $ilias_version;
-        $this->admin_login = $admin_login;
-        $this->admin_password = $admin_password;
-        $this->separator_string = " / ";
-
-        parent::__construct($soap_path);
-
-        $this->user_type = "admin";
-
-        $this->loadCacheData();
-    }
-
-    /**
-    * set usertype
-    *
-    * sets usertype for soap-calls
-    * @access public
-    * @param string user_type usertype (admin or user)
-    */
-    function setUserType($user_type)
-    {
-        $this->user_type = $user_type;
-    }
-
-    /**
-    * get sid
-    *
-    * returns soap-session-id
-    * @access public
-    * @return string session-id
-    */
-    function getSID()
-    {
-        if ($this->user_type == "admin") {
-            if ($this->admin_sid == false)
-                $this->loginAdmin();
-            return $this->admin_sid;
-        }
-        if ($this->user_type == "user") {
-            if ($this->user_sid == false) {
-                throw new Exception('Not implemented');
-            }
-            return $this->user_sid;
-        }
-        return false;
-    }
-
-    /**
-    * call soap-function
-    *
-    * calls soap-function with given parameters
-    * @access public
-    * @param string method method-name
-    * @param string params parameters
-    * @return mixed result
-    */
-    function call($method, $params)
-    {
-        // return false if no session_id is given
-        if ($method !== 'login' && $method !== 'getInstallationInfoXML' && $method !== 'getClientInfoXML' && $params['sid'] == '') {
-            return false;
-        }
-
-        $cache_index = md5($method . ':' . implode('-', $params));
-        if ($this->caching_active && isset($this->soap_cache[$cache_index]) && $method !== 'login') {
-            $result = $this->soap_cache[$cache_index];
-        } else {
-            $result = $this->_call($method, $params);
-            // if Session is expired, re-login and try again
-            if ($method !== 'login' && $this->soap_client->fault && in_array(mb_strtolower($this->faultstring), ['session not valid', 'session invalid', 'session idled'])) {
-                $caching_status = $this->caching_active;
-                $this->caching_active = false;
-                $params["sid"] = $this->getSID();
-                $result = $this->_call($method, $params);
-                $this->caching_active = $caching_status;
-            } elseif (! $this->soap_client->fault) {
-                $this->soap_cache[$cache_index] = $result;
-                if ($this->caching_active == true) {
-                    $this->saveCacheData();
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-    * load cache
-    *
-    * load soap-cache
-    * @access public
-    * @param string cms cms-type
-    */
-    function loadCacheData()
-    {
-        $this->soap_cache = (array)$_SESSION["cache_data"][$this->index];
-    }
-
-    /**
-    * get caching status
-    *
-    * gets caching-status
-    * @access public
-    * @return boolean status
-    */
-    function getCachingStatus()
-    {
-        return $this->caching_active;
-    }
-
-    /**
-    * set caching status
-    *
-    * sets caching-status
-    * @access public
-    * @param boolean bool_value status
-    */
-    function setCachingStatus($bool_value)
-    {
-        $this->caching_active = $bool_value;
-    }
-
-    /**
-    * clear cache
-    *
-    * clears cache
-    * @access public
-    */
-    function clearCache()
-    {
-        $this->soap_cache = [];
-        $_SESSION["cache_data"][$this->index] = [];
-
-    }
-
-    /**
-    * save cache
-    *
-    * saves soap-cache in session-variable
-    * @access public
-    */
-    function saveCacheData()
-    {
-       $_SESSION["cache_data"][$this->index] = $this->soap_cache;
-    }
-
-    /**
-    * parse xml
-    *
-    * use xml-parser
-    * @access public
-    * @param string data xml-data
-    * @return array object
-    */
-    function ParseXML($data)
-    {
-        //$xml_parser = new Ilias3ObjectXMLParser($data);
-        $xml_parser = new ilObjectXMLParser($data);
-        $xml_parser->startParsing();
-        return $xml_parser->getObjectData();
-    }
-
-    /**
-    * login with admin account
-    *
-    * login to ILIAS soap webservice with admin account
-    * @access public
-    * @return string result
-    */
-    function loginAdmin()
-    {
-        $param = [
-                'client' => $this->ilias_client,
-                'username' => $this->admin_login,
-                'password' => $this->admin_password
-                ];
-        $result = $this->call('login', $param);
-        $this->admin_sid = $result;
-        return $result;
-    }
-
-    /**
-     * login with admin account
-     *
-     * login to ILIAS soap webservice with current user
-     * @access public
-     * @return string result
-     */
-    function loginUser($username, $password)
-    {
-        if ($this->ilias_version < 50305) {
-            // ILIAS-Versions below 5.3.5 (use LoginStudipUser)
-            $param = [
-                            'client' => $this->ilias_client,
-                            'username' => $username,
-                            'password' => $password
-            ];
-            $result = $this->call('loginStudipUser', $param);
-            $this->user_sid = $result;
-            return $result;
-        } else {
-            // ILIAS-Versions 5.3.5 and above (use StudipAuthPlugin)
-            $param = [
-                            'client' => $this->ilias_client,
-                            'username' => $username,
-                            'password' => $password
-            ];
-            $result = $this->call('login', $param);
-            $this->user_sid = $result;
-            return $result;
-        }
-    }
-
-    /**
-    * logout
-    *
-    * logout from soap-webservice
-    * @access public
-    * @return boolean result
-    */
-    function logout()
-    {
-        $param = [
-            'sid' => $this->getSID()
-            ];
-        return $this->call('logout', $param);
-    }
-
-    /**
-     * Check Auth
-     *
-     * login to soap-webservice
-     * @access public
-     * @return string result
-     */
-    function checkPassword($username, $password)
-    {
-        $param = [
-                        'client' => $this->ilias_client,
-                        'username' => $username,
-                        'password' => $password
-        ];
-        $result = $this->call('login', $param);
-        return $result;
-    }
-
-///////////////////////////
-// OBJECT-FUNCTIONS //
-//////////////////////////
-
-    /**
-     * parse ILIAS object
-     *
-     * parse XML and return ilias object(s)
-     * @access public
-     * @param string xml xml data
-     * @param string parent_id get data for child references of parent_id
-     * @return array objects
-     */
-    function parseIliasObject($xml, $condition_field = '', $condition_value = '')
-    {
-        $s = simplexml_load_string($xml);
-
-        $objects = [];
-        if (is_object($s->Object)) {
-            foreach ($s->Object as $object) {
-                $single_object = [];
-                $single_object['type'] = (string)$object[0]['type'];
-                $single_object['offline'] = (string)$object[0]['offline'];
-                $single_object['obj_id'] = (string)$object[0]['obj_id'];
-                $single_object['title'] = (string)$object->Title;
-                $single_object['description'] = (string)$object->Description;
-                $single_object['owner'] = (string)$object->Owner;
-                $single_object['create_date'] = (string)$object->CreateDate;
-                $single_object['last_update'] = (string)$object->LastUpdate;
-                $single_object['ref_count'] = count($object->References);
-                foreach ($object->References as $reference) {
-                    //$single_object['references'][(string)$reference[0]['ref_id']]['ref_id'] = (string)$reference[0]['ref_id'];
-                    if ($condition_field && ($reference[0][$condition_field] == $condition_value)) {
-                        $single_object['ref_id'] = (string)$reference[0]['ref_id'];
-                        $single_object['parent_id'] = (string)$reference[0]['parent_id'];
-                        $single_object['accessInfo'] = (string)$reference[0]['accessInfo'];
-                        foreach ($reference->Operation as $operation) {
-                            $single_object['operations'][] = (string)$operation;
-                        }
-                    }
-                    $single_object['references'][(string)$reference[0]['ref_id']]['parent_id'] = (string)$reference[0]['parent_id'];
-                    $single_object['references'][(string)$reference[0]['ref_id']]['accessInfo'] = (string)$reference[0]['accessInfo'];
-                    foreach ($reference->Operation as $operation) {
-                        $single_object['references'][(string)$reference[0]['ref_id']]['operations'][] = (string)$operation;
-                    }
-                    foreach ($reference->Path->Element as $element) {
-                        $single_object['references'][(string)$reference[0]['ref_id']]['path_names'][] = (string)$element;
-                        $single_object['references'][(string)$reference[0]['ref_id']]['path_ids'][] = (string)$element[0]['ref_id'];
-                        $single_object['references'][(string)$reference[0]['ref_id']]['path_types'][] = (string)$element[0]['type'];
-                    }
-                }
-                if ($single_object['ref_id']) {
-                    $objects[$single_object['ref_id']] = $single_object;
-                } elseif (!$condition_field) {
-                    $objects[] = $single_object;
-                }
-            }
-        }
-        return $objects;
-    }
-
-
-    /**
-    * search objects
-    *
-    * search for ilias-objects
-    * @access public
-    * @param array types types
-    * @param string key keyword
-    * @param string combination search-combination
-    * @param string user_id ilias-user-id
-    * @return array objects
-    */
-    function searchObjects($types, $key, $combination, $user_id = "")
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'types' => $types,
-            'key' => $key,
-            'combination' => $combination,
-            'user_id' => (int)$user_id
-            ];
-
-        $result = $this->call('searchObjects', $param);
-        if ($result)
-        {
-            return $this->parseIliasObject($result);
-        }
-        return false;
-
-    }
-
-    /**
-    * get object by reference
-    *
-    * gets object by reference-id
-    * @access public
-    * @param ref reference_id
-    * @param string user_id ilias-user-id
-    * @return array object
-    */
-    function getObjectByReference($ref, $user_id = "")
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'reference_id' => $ref,
-            'user_id' => (int)$user_id
-            ];
-
-        $result = $this->call('getObjectByReference', $param);
-        if ($result != false)
-        {
-
-            $objects = $this->parseIliasObject($result, 'ref_id', $ref);
-            return $objects[$ref];
-        }
-        return false;
-    }
-
-    /**
-    * get object by title
-    *
-    * gets object by title
-    * @access public
-    * @param string key keyword
-    * @param string type object-type
-    * @return array object
-    */
-    function getObjectByTitle($key, $type = "")
-    {
-        $param = [
-            'sid'   => $this->getSID(),
-            'title' => $key,
-            'user_id' => 0
-        ];
-        $result = $this->call('getObjectsByTitle', $param);
-        if ($result != false)
-        {
-            $objects = $this->parseIliasObject($result);
-            //$objects = $this->parseXML($result);
-            foreach($objects as $index => $object_data)
-            {
-                if (($type != "") AND ($object_data["type"] != $type))
-                    unset($objects[$index]);
-                elseif (! (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === 0))
-                    unset($objects[$index]);
-            }
-            reset($objects);
-            if (sizeof($objects) > 0)
-                return current($objects);
-        }
-        return false;
-    }
-
-    /**
-    * get reference by title
-    *
-    * gets reference-id by object-title
-    * @access public
-    * @param string key keyword
-    * @param string type object-type
-    * @return string reference-id
-    */
-    function getReferenceByTitle($key, $type = "")
-    {
-        $param = [
-            'sid'   => $this->getSID(),
-            'title' => $key,
-            'user_id' => 0
-        ];
-        $result = $this->call('getObjectsByTitle', $param);
-
-        if ($result != false)
-        {
-            $objects = $this->parseIliasObject($result);
-            foreach($objects as $index => $object_data)
-            {
-                if (($type != "") AND ($object_data["type"] != $type))
-                    unset($objects[$index]);
-                elseif (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === false)
-                    unset($objects[$index]);
-            }
-            if (sizeof($objects) > 0)
-                foreach($objects as $object_data)
-                    if (sizeof($object_data["references"]) > 0)
-                    {
-                        return key($object_data["references"]);
-                        //return $object_data["references"][0]["ref_id"];
-                    }
-        }
-        return false;
-    }
-
-    /**
-    * add object
-    *
-    * adds new ilias-object
-    * @access public
-    * @param array object_data object-data
-    * @param string ref_id reference-id
-    * @return string result
-    */
-    function addObject($object_data, $ref_id)
-    {
-        $this->clearCache();
-        $type = $object_data["type"];
-        $title = htmlReady($object_data["title"]);
-        $description = htmlReady($object_data["description"]);
-
-        $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
-<Objects>
-  <Object type=\"$type\" obj_id=\"\" >
-    <Title>
-    $title
-    </Title>
-    <Description>
-    $description
-    </Description>
-  </Object>
-</Objects>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id' => $ref_id,
-            'object_xml' => $xml
-            ];
-        return $this->call('addObject', $param);
-    }
-
-    /**
-    * delete object
-    *
-    * deletes ilias-object
-    * @access public
-    * @param string ref_id reference-id
-    * @return boolean result
-    */
-    function deleteObject($reference_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'reference_id' => $reference_id
-            ];
-        return $this->call('deleteObject', $param);
-    }
-
-    /**
-    * add reference
-    *
-    * add a new reference to an existing ilias-object
-    * @access public
-    * @param string object_id source-object-id
-    * @param string ref_id target-id
-    * @return string created reference-id
-    */
-    function addReference($object_id, $ref_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'source_id' => $object_id,
-            'target_id' => $ref_id
-            ];
-        return $this->call('addReference', $param);
-    }
-
-    /**
-     * add references to desktop
-     *
-     * adds references to personal desktop
-     * @access public
-     * @param string object_id source-object-id
-     * @param string ref_id target-id
-     * @return string created reference-id
-     */
-    function addDesktopItems($user_id, $ref_ids)
-    {
-        $this->clearCache();
-        $param = [
-                        'sid' => $this->getSID(),
-                        'user_id' => $user_id,
-                        'reference_ids' => $ref_ids
-        ];
-        return $this->call('addDesktopItems', $param);
-    }
-
-    /**
-    * get tree childs
-    *
-    * gets child-objects of the given tree node
-    * @access public
-    * @param string ref_id reference-id
-    * @param array types show only childs with these types
-    * @param string user_id user-id for permissions
-    * @return array objects
-    */
-    function getTreeChilds($ref_id, $types = "", $user_id = "")
-    {
-        if ($types == "")
-            $types = [];
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'types' => $types,
-            'user_id' => (int)$user_id
-            ];
-
-        $result = $this->call('getTreeChilds', $param);
-        $tree_childs = [];
-        if ($result != false) {
-            $tree_childs = $this->parseIliasObject($result, 'parent_id', $ref_id);
-        }
-        return $tree_childs;
-    }
-
-/////////////////////////
-// RBAC-FUNCTIONS //
-///////////////////////
-    /**
-    * get operation
-    *
-    * gets all ilias operations
-    * @access public
-    * @return array operations
-    */
-    function getOperations()
-    {
-        $param = [
-            'sid' => $this->getSID()
-            ];
-        $result = $this->call('getOperations', $param);
-        if (is_array($result))
-            foreach ($result as $operation_set)
-                $operations[$operation_set["operation"]] = $operation_set["ops_id"];
-        return $operations;
-    }
-
-    /**
-    * get object tree operations
-    *
-    * gets permissions for object at given tree-node
-    * @access public
-    * @param string ref_id reference-id
-    * @param string user_id user-id for permissions
-    * @return array operation-ids
-    */
-    function getObjectTreeOperations($ref_id, $user_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'user_id' => $user_id
-            ];
-        $result = $this->call('getObjectTreeOperations', $param);
-        if ($result != false)
-        {
-            $ops_ids = [];
-            foreach ($result as $operation_set)
-                $ops_ids[] = $operation_set["ops_id"];
-            return $ops_ids;
-        }
-        return false;
-    }
-
-    /**
-    * get user roles
-    *
-    * gets user roles
-    * @access public
-    * @param string user_id user-id
-    * @return array role-ids
-    */
-    function getUserRoles($user_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id' => $user_id
-           ];
-        $result = $this->call('getUserRoles', $param);
-        if ($result != false)
-        {
-            // TODO: change to simple xml
-            $objects = $this->parseXML($result);
-            $roles = [];
-            foreach ($objects as $count => $role)
-                $roles[$count] = $role["obj_id"];
-            return $roles;
-        }
-        return false;
-    }
-
-    /**
-    * get local roles
-    *
-    * gets local roles for given object
-    * @access public
-    * @param string course_id object-id
-    * @return array role-objects
-    */
-    function getLocalRoles($course_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $course_id
-           ];
-        $result = $this->call('getLocalRoles', $param);
-        if ($result != false)
-        {
-            // TODO: change to simple xml
-            $objects = $this->parseXML($result);
-            return $objects;
-        }
-        return false;
-    }
-
-    /**
-    * add role
-    *
-    * adds a new role
-    * @access public
-    * @param array role_data data for role-object
-    * @param string ref_id reference-id
-    * @return string role-id
-    */
-    function addRole($role_data, $ref_id)
-    {
-        $this->clearCache();
-        $type = "role";
-        $title = htmlReady($role_data["title"]);
-        $description = htmlReady($role_data["description"]);
-
-        $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
-<Objects>
-  <Object type=\"$type\" obj_id=\"\">
-    <Title>
-    $title
-    </Title>
-    <Description>
-    $description
-    </Description>
-  </Object>
-</Objects>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id' => $ref_id,
-            'obj_xml' => $xml
-            ];
-        $result = $this->call('addRole', $param);
-        if (is_array($result))
-            return current($result);
-        else
-            return false;
-    }
-
-    /**
-    * add role from tremplate
-    *
-    * adds a new role and adopts properties of the given role template
-    * @access public
-    * @param array role_data data for role-object
-    * @param string ref_id reference-id
-    * @param string role_id role-template-id
-    * @return string role-id
-    */
-    function addRoleFromTemplate($role_data, $ref_id, $role_id)
-    {
-        $this->clearCache();
-        $type = "role";
-        $title = htmlReady($role_data["title"]);
-        $description = htmlReady($role_data["description"]);
-
-        $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
-<Objects>
-  <Object type=\"$type\" obj_id=\"\">
-    <Title>
-    $title
-    </Title>
-    <Description>
-    $description
-    </Description>
-  </Object>
-</Objects>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'target_id' => $ref_id,
-            'obj_xml' => $xml,
-            'role_template_id' => $role_id
-            ];
-        $result = $this->call('addRoleFromTemplate', $param);
-        if (is_array($result))
-            return current($result);
-        else
-            return false;
-    }
-
-    /**
-    * delete user role entry
-    *
-    * deletes a role entry from the given user
-    * @access public
-    * @param string user_id user-id
-    * @param string role_id role-id
-    * @return boolean result
-    */
-    function deleteUserRoleEntry($user_id, $role_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id' => $user_id,
-            'role_id' => $role_id
-           ];
-        return $this->call('deleteUserRoleEntry', $param);
-    }
-
-    /**
-    * add user role entry
-    *
-    * adds a role entry for the given user
-    * @access public
-    * @param string user_id user-id
-    * @param string role_id role-id
-    * @return boolean result
-    */
-    function addUserRoleEntry($user_id, $role_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'user_id' => $user_id,
-            'role_id' => $role_id
-           ];
-        return $this->call('addUserRoleEntry', $param);
-    }
-
-    /**
-    * grant permissions
-    *
-    * grants permissions for given operations at role-id and ref-id
-    * @access public
-    * @param array operations operation-array
-    * @param string role_id role-id
-    * @param string ref_id reference-id
-    * @return boolean result
-    */
-    function grantPermissions($operations, $role_id, $ref_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'role_id' => $role_id,
-            'operations' => $operations,
-           ];
-        return $this->call('grantPermissions', $param);
-    }
-
-    /**
-    * revoke permissions
-    *
-    * revokes all permissions role-id and ref-id
-    * @access public
-    * @param string role_id role-id
-    * @param string ref_id reference-id
-    * @return boolean result
-    */
-    function revokePermissions($role_id, $ref_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'ref_id' => $ref_id,
-            'role_id' => $role_id,
-           ];
-        return $this->call('revokePermissions', $param);
-    }
-
-/////////////////////////
-// USER-FUNCTIONS //
-///////////////////////
-
-    /**
-    * lookup user
-    *
-    * gets user-id for given username
-    * @access public
-    * @param string username username
-    * @return string user-id
-    */
-    function lookupUser($username)
-    {
-        $param = [
-            'sid'       => $this->getSID(),
-            'user_name' => $username,
-        ];
-        return $this->call('lookupUser', $param); // returns user_id
-    }
-
-    /**
-    * get user
-    *
-    * gets user-data for given user-id
-    * @access public
-    * @param string $user_id user-id
-    * @return array user-data
-    */
-    function getUser($user_id)
-    {
-        if ($this->ilias_version < 80000) {
-            $param = [
-                'sid'     => $this->getSID(),
-                'user_id' => $user_id
-            ];
-            $result = $this->call('getUser', $param); // returns user data array
-            return $result;
-        } else {
-            $param = [
-                'sid'          => $this->getSID(),
-                'user_ids'     => [$user_id],
-                'attach_roles' => 0,
-            ];
-            $result = $this->call('getUserXML', $param); // returns user xml data
-            if ($result) {
-                $s = simplexml_load_string($result);
-                $user_array = [];
-
-                foreach ($s->User as $user) {
-                    $id_parts = explode('usr_', $user->attributes()->Id);
-                    if ($id_parts[1] == $user_id) {
-                        $user_array['usr_id'] = $user_id;
-                        $user_array['user_language'] = (string)$user->attributes()->Language;
-                        $user_array['login'] = (string)$user->Login;
-                        $user_array['firstname'] = (string)$user->Firstname;
-                        $user_array['lastname'] = (string)$user->Lastname;
-                        $user_array['title'] = (string)$user->Title;
-                        $user_array['email'] = (string)$user->Email;
-                        $user_array['active'] = (string)$user->Active;
-                        $user_array['authmode'] = (string)$user->AuthMode->attributes()->type;
-                        return $user_array;
-                    }
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * get user fullname
-     *
-     * gets user-data for given user-id
-     * @access public
-     * @param string user_id user-id
-     * @return string full name
-     */
-    function getUserFullname($user_id)
-    {
-        $result = $this->getUser($user_id);
-
-        return !empty($result) ? trim(sprintf('%s %s %s', $result['title'], $result['firstname'], $result['lastname'])) : '';
-    }
-
-    /**
-     * search users
-     *
-     * search for ilias users
-     * @access public
-     * @param array types types
-     * @param string key keyword
-     * @param string combination search-combination
-     * @param string user_id ilias-user-id
-     * @return array objects
-     */
-    function searchUser($user_id)
-    {
-        if ($user_id != "") {
-            $param = [
-                            'sid' => $this->getSID(),
-                            'user_ids' => [$user_id],
-                            'attach_roles' => 0
-            ];
-            $result = $this->call('getUserXML', $param);
-            if ($result != false)
-            {
-                // TODO: change to simple xml
-                $objects = $this->parseXML($result);
-                $all_objects = [];
-                foreach($objects as $count => $object_data){
-                    if (is_array($object_data["references"]))
-                    {
-                        foreach($object_data["references"] as $ref_data)
-                            if ($ref_data["accessInfo"] == "granted"
-                                    && (count($all_objects[$object_data["obj_id"]]["operations"]) < count($ref_data["operations"])))
-                            {
-                                $all_objects[$object_data["obj_id"]] = $object_data;
-                                unset($all_objects[$object_data["obj_id"]]["references"]);
-                                $all_objects[$object_data["obj_id"]]["ref_id"] = $ref_data["ref_id"];
-                                $all_objects[$object_data["obj_id"]]["accessInfo"] = $ref_data["accessInfo"];
-                                $all_objects[$object_data["obj_id"]]["operations"] = $ref_data["operations"];
-                            }
-                    }
-                }
-                if (count($all_objects)){
-                    foreach($all_objects as $one_object){
-                        $ret[$one_object['ref_id']] = $one_object;
-                    }
-                    return $ret;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * add user by importUsers
-     *
-     * adds new user and sets role-id
-     * @access public
-     * @param array user_data user-data
-     * @param string role_id global role-id for new user
-     * @return string user-id
-     */
-    function addUser($user_data, $role_id)
-    {
-        $this->clearCache();
-        foreach($user_data as $key => $value) {
-            $user_data[$key] = htmlReady($user_data[$key]);
-        }
-        $update = $user_data["id"];
-
-        $usr_xml = "<Users>
-<User ".($update ? 'Id="'.$user_data["id"].'"' : 'Id=""')." Action=".($update ? '"Update"' : '"Insert"').">
-<UDFDefinitions></UDFDefinitions>
-<Login>".$user_data["login"]."</Login>
-<Password Type=\"PLAIN\">".$user_data["passwd"]."</Password>
-<Firstname>".$user_data["firstname"]."</Firstname>
-<Lastname>".$user_data["lastname"]."</Lastname>
-<Title>".$user_data["title"]."</Title>
-<Gender>".$user_data["gender"]."</Gender>
-<Email>".$user_data["email"]."</Email>
-<Street>".$user_data["street"]."</Street>
-<PhoneHome>".$user_data["phone_home"]."</PhoneHome>";
-        if ($user_data["matriculation"] !== '') {
-            $usr_xml .= "<Matriculation>".(int)$user_data["matriculation"]."</Matriculation>";
-        }
-        $usr_xml .= "<Role Id=\"".$role_id."\" Type=\"Global\"/>
-<Active>true</Active>
-<TimeLimitUnlimited>".$user_data["time_limit_unlimited"]."</TimeLimitUnlimited>
-<TimeLimitMessage>0</TimeLimitMessage>
-<ApproveDate>".$user_data["approve_date"]."</ApproveDate>
-<AgreeDate>".$user_data["agree_date"]."</AgreeDate>";
-        if (($user_data["user_skin"] != "") OR ($user_data["user_style"] != "")) {
-            $usr_xml .= "<Look Skin=\"".$user_data["user_skin"]."\" Style=\"".$user_data["user_style"]."\"/>";
-        }
-        $usr_xml .= "<AuthMode type=\"".$user_data["auth_mode"]."\"/>
-<ExternalAccount>".$user_data["external_account"]."</ExternalAccount>
-</User>
-</Users>";
-
-        $param = [
-                        'sid' => $this->getSID(),
-                        'folder_id' => -1,
-                        'usr_xml' => $usr_xml,
-                        'conflict_rule' => 1,
-                        'send_account_mail' => 0
-        ];
-        $result = $this->call('importUsers', $param);
-
-        $s = simplexml_load_string($result);
-
-        if ((string)$s->rows->row->column[3] == "successful")
-            return (string)$s->rows->row->column[0];
-            else
-                return false;
-    }
-
- ///////////////////////////////////////////////////
-    /**
-     * copy object
-     *
-     * copy ilias-object
-     * @access public
-     * @param string source_id reference-id
-     * @param string target_id reference-id
-     * @return string result
-     */
-    function copyObject($source_id, $target_id)
-    {
-        $this->clearCache();
-
-        $xml = "<Settings source_id=\"$source_id\" target_id=\"$target_id\" default_action=\"COPY\"/>";
-
-        $param = [
-            'sid' => $this->getSID(),
-            'xml' => $xml
-        ];
-        return $this->call('copyObject', $param);
-    }
-
-    /**
-     * get structure
-     *
-     * returns structure for ilias content object
-     * @access public
-     * @param string ref_id reference id
-     * @return array result
-     */
-    function getStructure($ref_id)
-    {
-        $param = [
-                        'sid' => $this->getSID(),
-                        'ref_id' => $ref_id
-        ];
-        $result = $this->call('getStructureObjects', $param);
-
-        $structure = [];
-        if ($result) {
-            $s = simplexml_load_string($result);
-
-            foreach ($s->StructureObjects->StructureObject as $object) {
-                $structure[] = (string)$object->Title;
-            }
-        }
-        return $structure;
-    }
-
-    /**
-     * get path
-     *
-     * returns repository-path to ilias-object
-     * @access public
-     * @param string source_id reference-id
-     * @param string target_id reference-id
-     * @return string result
-     */
-    function getPath($ref_id)
-    {
-        $param = [
-                        'sid' => $this->getSID(),
-                        'ref_id' => $ref_id
-        ];
-        $result = $this->call('getPathForRefId', $param);
-
-        if ($result) {
-            $s = simplexml_load_string($result);
-
-            foreach ($s->rows->row as $row) {
-                $path[] = (string)$row->column[2];
-            }
-        }
-
-        if (is_array($path)) {
-            return implode($this->separator_string, $path);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     *
-     * returns repository-path to ilias-object
-     *
-     * @access public
-     * @param string source_id reference-id
-     * @param string target_id reference-id
-     * @return string result
-     */
-    function getRawPath($ref_id)
-    {
-        $param = [
-                        'sid' => $this->getSID(),
-                        'ref_id' => $ref_id
-        ];
-        $result = $this->call('getPathForRefId', $param);
-
-        if ($result) {
-            $s = simplexml_load_string($result);
-
-            foreach ($s->rows->row as $row) {
-                $path[] = (string)$row->column[0];
-            }
-        }
-
-        if (is_array($path)) {
-            return implode('_', $path);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     *
-     * returns ILIAS-Server-Info
-     *
-     * @access public
-     * @return string result
-     */
-    function getInstallationInfoXML()
-    {
-        $this->clearCache();
-        $param = [
-        ];
-        $result = $this->call('getInstallationInfoXML', $param);
-        if ($result) {
-            $s = simplexml_load_string($result);
-            $version_info = (string)$s[0]['version'];
-            $version_parts = explode(' ', $version_info);
-            $data['version'] = $version_parts[0];
-            $data['version_date'] = $version_parts[1];
-            foreach($s->Clients->Client as $client) {
-                $data['clients'][] = (string)$client[0]['id'];
-            }
-        }
-        return $data;
-    }
-    //////////////////////////////////////////
-
-    /**
-    * update user
-    *
-    * update user-data
-    * @access public
-    * @param array user_data user-data
-    * @return string result
-    */
-/*    function updateUser($user_data)
-    {
-        $this->clearCache();
-        $param = array(
-            'sid' => $this->getSID(),
-            'user_data' => $user_data
-        );
-        return $this->call('updateUser', $param); // returns boolean
-    }
-/**/
-    /**
-    * update password
-    *
-    * update password with given string and write it uncrypted to the ilias-database
-    * @access public
-    * @param string user_id user-id
-    * @param string password password
-    * @return string result
-    */
-/*    function updatePassword($user_id, $password)
-    {
-        $this->clearCache();
-        $param = array(
-            'sid'          => $this->getSID(),
-            'user_id'      => $user_id,
-            'new_password' => $password
-        );
-        return $this->call('updatePassword', $param); // returns boolean
-    }
-/**/
-    /**
-    * delete user
-    *
-    * deletes user-account
-    * @access public
-    * @param string $user_id user-id
-    * @return string result
-    */
-    function deleteUser($user_id)
-    {
-        $this->clearCache();
-        if ($this->ilias_version < 80000) {
-            $param = [
-                'sid'     => $this->getSID(),
-                'user_id' => $user_id
-            ];
-            return $this->call('deleteUser', $param);   // returns boolean
-        } else {
-            $user_data = $this->getUser($user_id);
-            if (!$user_data['login']) {
-                return false;
-            }
-            $usr_xml = '<Users>
-    <User Id="il_0_usr_' . $user_id . '" Action="Delete">
-    <UDFDefinitions></UDFDefinitions><Login>' . $user_data['login'] . '</Login>
-    </User>
-    </Users>';
-
-            $param = [
-                'sid'               => $this->getSID(),
-                'folder_id'         => -1,
-                'usr_xml'           => $usr_xml,
-                'conflict_rule'     => 1,
-                'send_account_mail' => 0
-            ];
-            $result = $this->call('importUsers', $param);
-
-            $s = simplexml_load_string($result);
-
-            if ((string)$s->rows->row->column[3] == "successful") {
-                return (string)$s->rows->row->column[0];
-            }
-            return false;
-        }
-    }
-
-////////////////////////////
-// COURSE-FUNCTIONS //
-//////////////////////////
-
-    /**
-    * is course member
-    *
-    * checks if user is course-member
-    * @access public
-    * @param string user_id user-id
-    * @param string course_id course-id
-    * @return boolean result
-    */
-    function isMember($user_id, $course_id)
-    {
-        $param = [
-            'sid' => $this->getSID(),
-            'course_id'         => $course_id,
-            'user_id'         => $user_id
-            ];
-        $status = $this->call('isAssignedToCourse', $param);    // returns 0 if not assigned, 1 => course admin, 2 => course member or 3 => course tutor
-        if ($status == 0)
-            return false;
-        else
-            return true;
-    }
-
-    /**
-    * add course member
-    *
-    * adds user to course
-    * @access public
-    * @param string user_id user-id
-    * @param string type member-type (Admin, Tutor or Member)
-    * @param string course_id course-id
-    * @return boolean result
-    */
-    function addMember($user_id, $type, $course_id)
-    {
-        $this->clearCache();
-        $param = [
-            'sid' => $this->getSID(),
-            'course_id'         => $course_id,
-            'user_id'         => $user_id,
-            'type'         => $type
-            ];
-        return $this->call('assignCourseMember', $param);
-    }
-
-    /**
-     * add course
-     *
-     * adds course
-     * @access public
-     * @param array course_data course-data
-     * @param string ref_id target-id
-     * @return string course-id
-     */
-    function addCourse($course_data, $ref_id)
-    {
-        $this->clearCache();
-        foreach($course_data as $key => $value) {
-            $course_data[$key] = htmlReady($course_data[$key]);
-        }
-
-        $xml = $this->getCourseXML($course_data);
-        $param = [
-                        'sid' => $this->getSID(),
-                        'target_id'         => $ref_id,
-                        'crs_xml' => $xml
-        ];
-        $crs_id = $this->call('addCourse', $param);
-        return $crs_id;
-    }
-
-    /**
-     * add group
-     *
-     * adds group
-     * @access public
-     * @param array group_data group data
-     * @param string ref_id target id
-     * @return string group id
-     */
-    function addGroup($group_data, $ref_id)
-    {
-        $this->clearCache();
-        foreach($group_data as $key => $value) {
-            $group_data[$key] = htmlReady($group_data[$key]);
-        }
-
-        $xml = $this->getGroupXML($group_data);
-        $param = [
-                        'sid' => $this->getSID(),
-                        'target_id' => $ref_id,
-                        'group_xml' => $xml
-        ];
-        $group_id = $this->call('addGroup', $param);
-        return $group_id;
-    }
-
-    /**
-     * update group
-     *
-     * updates group
-     * @access public
-     * @param array group_data group data
-     * @param string ref_id group id
-     * @return string result
-     */
-    function updateGroup($group_data, $ref_id)
-    {
-        $this->clearCache();
-        foreach($group_data as $key => $value) {
-            $group_data[$key] = htmlReady($group_data[$key]);
-        }
-
-        $xml = $this->getGroupXML($group_data);
-        $param = [
-                        'sid' => $this->getSID(),
-                        'ref_id' => $ref_id,
-                        'xml' => $xml
-        ];
-        $result = $this->call('updateGroup', $param);
-        return $result;
-    }
-
-    /**
-     * assign group member
-     *
-     * assigns user to group
-     * @access public
-     * @param string group_id group id
-     * @param string user_id user id
-     * @param string type type
-     */
-    function assignGroupMember($group_id, $user_id, $type = "Member")
-    {
-        $this->clearCache();
-        $param = [
-                        'sid' => $this->getSID(),
-                        'group_id' => $group_id,
-                        'user_id' => $user_id,
-                        'type' => $type
-        ];
-        return $this->call('assignGroupMember', $param);
-    }
-
-    /**
-     * exclude group member
-     *
-     * removes user from group
-     * @access public
-     * @param string group_id group id
-     * @param string user_id user id
-     */
-    function excludeGroupMember($group_id, $user_id)
-    {
-        $this->clearCache();
-        $param = [
-                        'sid' => $this->getSID(),
-                        'group_id' => $group_id,
-                        'user_id' => $user_id
-        ];
-        return $this->call('excludeGroupMember', $param);
-    }
-
-    /**
-     * get group
-     *
-     * returns group xml
-     * @access public
-     * @param string group_id group id
-     * @return string group xml
-     */
-    function getGroup($group_id)
-    {
-        $param = [
-                        'sid' => $this->getSID(),
-                        'ref_id' => $group_id
-        ];
-        $result = $this->call('getGroup', $param);
-        if ($result) {
-            $s = simplexml_load_string($result);
-            $data['title'] = (string)$s->title;
-            $data['members'] = [];
-            foreach($s->member as $member) {
-                $member_parts = explode('_usr_', (string)$member[0]['id']);
-                $data['members'][] = $member_parts[1];
-            }
-        }
-        return $data;
-    }
-
-    /**
-    * get course-xml
-    *
-    * gets course xml-object for given course-data
-    * @access public
-    * @param array course_data course-data
-    * @return string course-xml
-    */
-    function getCourseXML($course_data)
-    {
-    $crs_language = $course_data["language"];
-    $crs_admin_id = $course_data["admin_id"];
-    $crs_title = $course_data["title"];
-    $crs_desc = $course_data["description"];
-
-    $xml = "<!DOCTYPE Course SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_course_0_1.dtd\">
-<Course>
-  <MetaData>
-    <General Structure=\"Hierarchical\">
-      <Identifier Catalog=\"ILIAS\" Entry=\"\"/>
-      <Title Language=\"$crs_language\">
-      $crs_title
-      </Title>
-      <Language Language=\"$crs_language\"/>
-      <Description Language=\"$crs_language\">
-      $crs_desc
-      </Description>
-      <Keyword Language=\"$crs_language\">
-      </Keyword>
-    </General>
-  </MetaData>
-  <Admin id=\"$crs_admin_id\" notification=\"Yes\" passed=\"No\">
-  </Admin>
-  <Settings>
-    <Availability>
-      <Unlimited/>
-    </Availability>
-    <Syllabus>
-    </Syllabus>
-    <Contact>
-      <Name>
-      </Name>
-      <Responsibility>
-      </Responsibility>
-      <Phone>
-      </Phone>
-      <Email>
-      </Email>
-      <Consultation>
-      </Consultation>
-    </Contact>
-    <Registration registrationType=\"Password\" maxMembers=\"0\" notification=\"No\">
-      <Disabled/>
-    </Registration>
-    <Sort type=\"Manual\"/>
-    <Archive Access=\"Disabled\">
-    </Archive>
-  </Settings>
-</Course>";
-    return $xml;
-    }
-
-
-    /**
-    * get group xml
-    *
-    * gets group xml object for given group data
-    * @access public
-    * @param array group_data group data
-    * @return string group xml
-    */
-    function getGroupXML($group_data)
-    {
-        $xml = '<group '.($group_data['id'] ? 'id="'.$group_data['id'].'" ': '').'type="open">
-    <title>'.$group_data['title'].'</title>
-    <owner id="'.$group_data['owner'].'"/>
-    <information/>
-    <registration type="disabled" waitingList="No">
-    <maxMembers enabled="No">0</maxMembers>
-    <minMembers>0</minMembers>
-    <WaitingListAutoFill>0</WaitingListAutoFill>
-    <CancellationEnd/><mailMembersType>1</mailMembersType>
-    </registration><Sort type="Inherit"/>
-    <ContainerSettings>
-    <ContainerSetting id="cont_auto_rate_new_obj">0</ContainerSetting>
-    <ContainerSetting id="cont_badges">0</ContainerSetting>
-    <ContainerSetting id="cont_show_calendar">1</ContainerSetting>
-    <ContainerSetting id="cont_show_news">0</ContainerSetting>
-    <ContainerSetting id="cont_skills">0</ContainerSetting>
-    <ContainerSetting id="cont_tag_cloud">0</ContainerSetting>
-    <ContainerSetting id="cont_use_news">0</ContainerSetting>
-    <ContainerSetting id="news_timeline">0</ContainerSetting>
-    <ContainerSetting id="news_timeline_incl_auto">0</ContainerSetting>
-    <ContainerSetting id="news_timeline_landing_page">0</ContainerSetting>
-    </ContainerSettings>
-    </group>';
-        return $xml;
-    }
- /**/
-
-    /**
-    * get courses for given user
-    *
-    * gets course xml-object for given course-data
-    * @access public
-    * @param array course_data course-data
-    * @return string course-xml
-    */
-    function getCoursesForUser($user_id, $status = 1)
-    {
-        $xmlrs = '<?xml version="1.0" encoding="utf-8"?>
-        <result>
-            <colspecs>
-                <colspec idx="0" name="user_id"/>
-                <colspec idx="1" name="status"/>
-            </colspecs>
-            <rows>
-                <row>
-                    <column>'.$user_id.'</column>
-                    <column>'.$status.'</column>
-                </row>
-            </rows>
-        </result>';
-        $param = array(
-            'sid' => $this->getSID(),
-            'parameters' => $xmlrs
-        );
-        $result = $this->call('getCoursesForUser', $param);
-
-        if ($result) {
-            $s = simplexml_load_string($result);
-            foreach ($s->rows->row as $row) {
-                $ref_id = (string)$row->column[0];
-                $xml = $this->parseXML((string)$row->column[1]);
-                $course = array_pop($xml);
-                $ret[$ref_id] = $course['title'];
-            }
-        }
-        if (is_array($ret)) {
-            return $ret;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-    * check reference by title
-    *
-    * gets reference id by object id
-    * @access public
-    * @param string key keyword
-    * @param string type object-type
-    * @return string reference-id
-    */
-    function checkReferenceById($id)
-    {
-        $param = [
-            'sid'          => $this->getSID(),
-            'reference_id' => $id,
-            'user_id'      => 0
-        ];
-
-        $result = $this->call('getObjectByReference', $param);
-        if ($result != false)
-        {
-            // TODO: change to simple xml
-            $objects = $this->parseXML($result);
-            if(is_array($objects)){
-                foreach($objects as $index => $object_data){
-                    if(is_array($object_data['references'])){
-                        foreach($object_data['references'] as $reference){
-                            if($reference['ref_id'] == $id && $reference['accessInfo'] != 'object_deleted') return $object_data['obj_id'];
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string $ref_id
-     * @param bool $sum_only
-     * @return array|false
-     * @throws Exception
-     */
-    public function getTestResults($ref_id, $sum_only = true)
-    {
-        $param = [
-            'sid'    => $this->getSID(),
-            'ref_id' => $ref_id,
-            'sum_only' => $sum_only
-        ];
-        $result = $this->call('getTestResults', $param);
-        if ($result !== false) {
-            $columns = [];
-            $data = [];
-            $xml = simplexml_load_string($result);
-            foreach ($xml->colspecs->colspec as $colspec) {
-                $columns[] = (string)$colspec['name'];
-            }
-            foreach ($xml->rows->row as $row) {
-                $data_row = [];
-                $i = 0;
-                foreach ($row->column as $column) {
-                    $data_row[$columns[$i++]] = (string)$column;
-                }
-                if (isset($data_row['user_id'])) {
-
-                }
-                $data[] = $data_row;
-            }
-            return $data;
-        }
-        return false;
-    }
-}
diff --git a/lib/ilias_interface/IliasSoap.php b/lib/ilias_interface/IliasSoap.php
new file mode 100644
index 0000000..7911e9e
--- /dev/null
+++ b/lib/ilias_interface/IliasSoap.php
@@ -0,0 +1,1709 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+require_once 'vendor/ilias/class.ilSaxParser.php';
+require_once 'vendor/ilias/class.ilObjectXMLParser.php';
+
+/**
+* class for ILIAS-SOAP-Webservice
+*
+* This class contains methods to connect to the ILIAS SOAP Server.
+*
+* @author       Arne Schröder <schroeder@data-quest.de>
+* @access       public
+* @modulegroup  ilias_interface_modules
+* @module       IliasSoap
+* @package      ILIAS-Interface
+*/
+class IliasSoap extends StudipSoapClient
+{
+    private $index;
+    private $ilias_client;
+    private $ilias_version;
+    private $admin_login;
+    private $admin_password;
+    private $admin_sid;
+    private $user_sid;
+    private $user_type;
+    private $soap_cache;
+    private $separator_string;
+    private $caching_active = false;
+
+
+    /**
+     * constructor
+     *
+     * init class.
+     * @access public
+     * @param string $index ILIAS installation index
+     * @param string $soap_path SOAP url
+     * @param string $ilias_client ILIAS client
+     * @param string $ilias_version ILIAS int client
+     * @param string $admin_login ILIAS admin account login
+     * @param string $admin_password ILIAS admin account password
+     */
+    public function __construct($index, $soap_path, $ilias_client = '', $ilias_version = '', $admin_login = '', $admin_password = '')
+    {
+        $this->index = $index;
+        $this->ilias_client = $ilias_client;
+        $this->ilias_version= $ilias_version;
+        $this->admin_login = $admin_login;
+        $this->admin_password = $admin_password;
+        $this->separator_string = " / ";
+
+        parent::__construct($soap_path);
+
+        $this->user_type = "admin";
+
+        $this->loadCacheData();
+    }
+
+    /**
+    * set usertype
+    *
+    * sets usertype for soap-calls
+    * @access public
+    * @param string user_type usertype (admin or user)
+    */
+    function setUserType($user_type)
+    {
+        $this->user_type = $user_type;
+    }
+
+    /**
+    * get sid
+    *
+    * returns soap-session-id
+    * @access public
+    * @return string session-id
+    */
+    function getSID()
+    {
+        if ($this->user_type == "admin") {
+            if ($this->admin_sid == false)
+                $this->loginAdmin();
+            return $this->admin_sid;
+        }
+        if ($this->user_type == "user") {
+            if ($this->user_sid == false) {
+                throw new Exception('Not implemented');
+            }
+            return $this->user_sid;
+        }
+        return false;
+    }
+
+    /**
+    * call soap-function
+    *
+    * calls soap-function with given parameters
+    * @access public
+    * @param string method method-name
+    * @param string params parameters
+    * @return mixed result
+    */
+    function call($method, $params)
+    {
+        // return false if no session_id is given
+        if ($method !== 'login' && $method !== 'getInstallationInfoXML' && $method !== 'getClientInfoXML' && $params['sid'] == '') {
+            return false;
+        }
+
+        $cache_index = md5($method . ':' . implode('-', $params));
+        if ($this->caching_active && isset($this->soap_cache[$cache_index]) && $method !== 'login') {
+            $result = $this->soap_cache[$cache_index];
+        } else {
+            $result = $this->_call($method, $params);
+            // if Session is expired, re-login and try again
+            if ($method !== 'login' && $this->soap_client->fault && in_array(mb_strtolower($this->faultstring), ['session not valid', 'session invalid', 'session idled'])) {
+                $caching_status = $this->caching_active;
+                $this->caching_active = false;
+                $params["sid"] = $this->getSID();
+                $result = $this->_call($method, $params);
+                $this->caching_active = $caching_status;
+            } elseif (! $this->soap_client->fault) {
+                $this->soap_cache[$cache_index] = $result;
+                if ($this->caching_active == true) {
+                    $this->saveCacheData();
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+    * load cache
+    *
+    * load soap-cache
+    * @access public
+    * @param string cms cms-type
+    */
+    function loadCacheData()
+    {
+        $this->soap_cache = (array)$_SESSION["cache_data"][$this->index];
+    }
+
+    /**
+    * get caching status
+    *
+    * gets caching-status
+    * @access public
+    * @return boolean status
+    */
+    function getCachingStatus()
+    {
+        return $this->caching_active;
+    }
+
+    /**
+    * set caching status
+    *
+    * sets caching-status
+    * @access public
+    * @param boolean bool_value status
+    */
+    function setCachingStatus($bool_value)
+    {
+        $this->caching_active = $bool_value;
+    }
+
+    /**
+    * clear cache
+    *
+    * clears cache
+    * @access public
+    */
+    function clearCache()
+    {
+        $this->soap_cache = [];
+        $_SESSION["cache_data"][$this->index] = [];
+
+    }
+
+    /**
+    * save cache
+    *
+    * saves soap-cache in session-variable
+    * @access public
+    */
+    function saveCacheData()
+    {
+       $_SESSION["cache_data"][$this->index] = $this->soap_cache;
+    }
+
+    /**
+    * parse xml
+    *
+    * use xml-parser
+    * @access public
+    * @param string data xml-data
+    * @return array object
+    */
+    function ParseXML($data)
+    {
+        //$xml_parser = new Ilias3ObjectXMLParser($data);
+        $xml_parser = new ilObjectXMLParser($data);
+        $xml_parser->startParsing();
+        return $xml_parser->getObjectData();
+    }
+
+    /**
+    * login with admin account
+    *
+    * login to ILIAS soap webservice with admin account
+    * @access public
+    * @return string result
+    */
+    function loginAdmin()
+    {
+        $param = [
+                'client' => $this->ilias_client,
+                'username' => $this->admin_login,
+                'password' => $this->admin_password
+                ];
+        $result = $this->call('login', $param);
+        $this->admin_sid = $result;
+        return $result;
+    }
+
+    /**
+     * login with admin account
+     *
+     * login to ILIAS soap webservice with current user
+     * @access public
+     * @return string result
+     */
+    function loginUser($username, $password)
+    {
+        if ($this->ilias_version < 50305) {
+            // ILIAS-Versions below 5.3.5 (use LoginStudipUser)
+            $param = [
+                            'client' => $this->ilias_client,
+                            'username' => $username,
+                            'password' => $password
+            ];
+            $result = $this->call('loginStudipUser', $param);
+            $this->user_sid = $result;
+            return $result;
+        } else {
+            // ILIAS-Versions 5.3.5 and above (use StudipAuthPlugin)
+            $param = [
+                            'client' => $this->ilias_client,
+                            'username' => $username,
+                            'password' => $password
+            ];
+            $result = $this->call('login', $param);
+            $this->user_sid = $result;
+            return $result;
+        }
+    }
+
+    /**
+    * logout
+    *
+    * logout from soap-webservice
+    * @access public
+    * @return boolean result
+    */
+    function logout()
+    {
+        $param = [
+            'sid' => $this->getSID()
+            ];
+        return $this->call('logout', $param);
+    }
+
+    /**
+     * Check Auth
+     *
+     * login to soap-webservice
+     * @access public
+     * @return string result
+     */
+    function checkPassword($username, $password)
+    {
+        $param = [
+                        'client' => $this->ilias_client,
+                        'username' => $username,
+                        'password' => $password
+        ];
+        $result = $this->call('login', $param);
+        return $result;
+    }
+
+///////////////////////////
+// OBJECT-FUNCTIONS //
+//////////////////////////
+
+    /**
+     * parse ILIAS object
+     *
+     * parse XML and return ilias object(s)
+     * @access public
+     * @param string xml xml data
+     * @param string parent_id get data for child references of parent_id
+     * @return array objects
+     */
+    function parseIliasObject($xml, $condition_field = '', $condition_value = '')
+    {
+        $s = simplexml_load_string($xml);
+
+        $objects = [];
+        if (is_object($s->Object)) {
+            foreach ($s->Object as $object) {
+                $single_object = [];
+                $single_object['type'] = (string)$object[0]['type'];
+                $single_object['offline'] = (string)$object[0]['offline'];
+                $single_object['obj_id'] = (string)$object[0]['obj_id'];
+                $single_object['title'] = (string)$object->Title;
+                $single_object['description'] = (string)$object->Description;
+                $single_object['owner'] = (string)$object->Owner;
+                $single_object['create_date'] = (string)$object->CreateDate;
+                $single_object['last_update'] = (string)$object->LastUpdate;
+                $single_object['ref_count'] = count($object->References);
+                foreach ($object->References as $reference) {
+                    //$single_object['references'][(string)$reference[0]['ref_id']]['ref_id'] = (string)$reference[0]['ref_id'];
+                    if ($condition_field && ($reference[0][$condition_field] == $condition_value)) {
+                        $single_object['ref_id'] = (string)$reference[0]['ref_id'];
+                        $single_object['parent_id'] = (string)$reference[0]['parent_id'];
+                        $single_object['accessInfo'] = (string)$reference[0]['accessInfo'];
+                        foreach ($reference->Operation as $operation) {
+                            $single_object['operations'][] = (string)$operation;
+                        }
+                    }
+                    $single_object['references'][(string)$reference[0]['ref_id']]['parent_id'] = (string)$reference[0]['parent_id'];
+                    $single_object['references'][(string)$reference[0]['ref_id']]['accessInfo'] = (string)$reference[0]['accessInfo'];
+                    foreach ($reference->Operation as $operation) {
+                        $single_object['references'][(string)$reference[0]['ref_id']]['operations'][] = (string)$operation;
+                    }
+                    foreach ($reference->Path->Element as $element) {
+                        $single_object['references'][(string)$reference[0]['ref_id']]['path_names'][] = (string)$element;
+                        $single_object['references'][(string)$reference[0]['ref_id']]['path_ids'][] = (string)$element[0]['ref_id'];
+                        $single_object['references'][(string)$reference[0]['ref_id']]['path_types'][] = (string)$element[0]['type'];
+                    }
+                }
+                if ($single_object['ref_id']) {
+                    $objects[$single_object['ref_id']] = $single_object;
+                } elseif (!$condition_field) {
+                    $objects[] = $single_object;
+                }
+            }
+        }
+        return $objects;
+    }
+
+
+    /**
+    * search objects
+    *
+    * search for ilias-objects
+    * @access public
+    * @param array types types
+    * @param string key keyword
+    * @param string combination search-combination
+    * @param string user_id ilias-user-id
+    * @return array objects
+    */
+    function searchObjects($types, $key, $combination, $user_id = "")
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'types' => $types,
+            'key' => $key,
+            'combination' => $combination,
+            'user_id' => (int)$user_id
+            ];
+
+        $result = $this->call('searchObjects', $param);
+        if ($result)
+        {
+            return $this->parseIliasObject($result);
+        }
+        return false;
+
+    }
+
+    /**
+    * get object by reference
+    *
+    * gets object by reference-id
+    * @access public
+    * @param ref reference_id
+    * @param string user_id ilias-user-id
+    * @return array object
+    */
+    function getObjectByReference($ref, $user_id = "")
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'reference_id' => $ref,
+            'user_id' => (int)$user_id
+            ];
+
+        $result = $this->call('getObjectByReference', $param);
+        if ($result != false)
+        {
+
+            $objects = $this->parseIliasObject($result, 'ref_id', $ref);
+            return $objects[$ref];
+        }
+        return false;
+    }
+
+    /**
+    * get object by title
+    *
+    * gets object by title
+    * @access public
+    * @param string key keyword
+    * @param string type object-type
+    * @return array object
+    */
+    function getObjectByTitle($key, $type = "")
+    {
+        $param = [
+            'sid'   => $this->getSID(),
+            'title' => $key,
+            'user_id' => 0
+        ];
+        $result = $this->call('getObjectsByTitle', $param);
+        if ($result != false)
+        {
+            $objects = $this->parseIliasObject($result);
+            //$objects = $this->parseXML($result);
+            foreach($objects as $index => $object_data)
+            {
+                if (($type != "") AND ($object_data["type"] != $type))
+                    unset($objects[$index]);
+                elseif (! (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === 0))
+                    unset($objects[$index]);
+            }
+            reset($objects);
+            if (sizeof($objects) > 0)
+                return current($objects);
+        }
+        return false;
+    }
+
+    /**
+    * get reference by title
+    *
+    * gets reference-id by object-title
+    * @access public
+    * @param string key keyword
+    * @param string type object-type
+    * @return string reference-id
+    */
+    function getReferenceByTitle($key, $type = "")
+    {
+        $param = [
+            'sid'   => $this->getSID(),
+            'title' => $key,
+            'user_id' => 0
+        ];
+        $result = $this->call('getObjectsByTitle', $param);
+
+        if ($result != false)
+        {
+            $objects = $this->parseIliasObject($result);
+            foreach($objects as $index => $object_data)
+            {
+                if (($type != "") AND ($object_data["type"] != $type))
+                    unset($objects[$index]);
+                elseif (mb_strpos(mb_strtolower($object_data["title"]), mb_strtolower(trim($key)) ) === false)
+                    unset($objects[$index]);
+            }
+            if (sizeof($objects) > 0)
+                foreach($objects as $object_data)
+                    if (sizeof($object_data["references"]) > 0)
+                    {
+                        return key($object_data["references"]);
+                        //return $object_data["references"][0]["ref_id"];
+                    }
+        }
+        return false;
+    }
+
+    /**
+    * add object
+    *
+    * adds new ilias-object
+    * @access public
+    * @param array object_data object-data
+    * @param string ref_id reference-id
+    * @return string result
+    */
+    function addObject($object_data, $ref_id)
+    {
+        $this->clearCache();
+        $type = $object_data["type"];
+        $title = htmlReady($object_data["title"]);
+        $description = htmlReady($object_data["description"]);
+
+        $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
+<Objects>
+  <Object type=\"$type\" obj_id=\"\" >
+    <Title>
+    $title
+    </Title>
+    <Description>
+    $description
+    </Description>
+  </Object>
+</Objects>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id' => $ref_id,
+            'object_xml' => $xml
+            ];
+        return $this->call('addObject', $param);
+    }
+
+    /**
+    * delete object
+    *
+    * deletes ilias-object
+    * @access public
+    * @param string ref_id reference-id
+    * @return boolean result
+    */
+    function deleteObject($reference_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'reference_id' => $reference_id
+            ];
+        return $this->call('deleteObject', $param);
+    }
+
+    /**
+    * add reference
+    *
+    * add a new reference to an existing ilias-object
+    * @access public
+    * @param string object_id source-object-id
+    * @param string ref_id target-id
+    * @return string created reference-id
+    */
+    function addReference($object_id, $ref_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'source_id' => $object_id,
+            'target_id' => $ref_id
+            ];
+        return $this->call('addReference', $param);
+    }
+
+    /**
+     * add references to desktop
+     *
+     * adds references to personal desktop
+     * @access public
+     * @param string object_id source-object-id
+     * @param string ref_id target-id
+     * @return string created reference-id
+     */
+    function addDesktopItems($user_id, $ref_ids)
+    {
+        $this->clearCache();
+        $param = [
+                        'sid' => $this->getSID(),
+                        'user_id' => $user_id,
+                        'reference_ids' => $ref_ids
+        ];
+        return $this->call('addDesktopItems', $param);
+    }
+
+    /**
+    * get tree childs
+    *
+    * gets child-objects of the given tree node
+    * @access public
+    * @param string ref_id reference-id
+    * @param array types show only childs with these types
+    * @param string user_id user-id for permissions
+    * @return array objects
+    */
+    function getTreeChilds($ref_id, $types = "", $user_id = "")
+    {
+        if ($types == "")
+            $types = [];
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'types' => $types,
+            'user_id' => (int)$user_id
+            ];
+
+        $result = $this->call('getTreeChilds', $param);
+        $tree_childs = [];
+        if ($result != false) {
+            $tree_childs = $this->parseIliasObject($result, 'parent_id', $ref_id);
+        }
+        return $tree_childs;
+    }
+
+/////////////////////////
+// RBAC-FUNCTIONS //
+///////////////////////
+    /**
+    * get operation
+    *
+    * gets all ilias operations
+    * @access public
+    * @return array operations
+    */
+    function getOperations()
+    {
+        $param = [
+            'sid' => $this->getSID()
+            ];
+        $result = $this->call('getOperations', $param);
+        if (is_array($result))
+            foreach ($result as $operation_set)
+                $operations[$operation_set["operation"]] = $operation_set["ops_id"];
+        return $operations;
+    }
+
+    /**
+    * get object tree operations
+    *
+    * gets permissions for object at given tree-node
+    * @access public
+    * @param string ref_id reference-id
+    * @param string user_id user-id for permissions
+    * @return array operation-ids
+    */
+    function getObjectTreeOperations($ref_id, $user_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'user_id' => $user_id
+            ];
+        $result = $this->call('getObjectTreeOperations', $param);
+        if ($result != false)
+        {
+            $ops_ids = [];
+            foreach ($result as $operation_set)
+                $ops_ids[] = $operation_set["ops_id"];
+            return $ops_ids;
+        }
+        return false;
+    }
+
+    /**
+    * get user roles
+    *
+    * gets user roles
+    * @access public
+    * @param string user_id user-id
+    * @return array role-ids
+    */
+    function getUserRoles($user_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id' => $user_id
+           ];
+        $result = $this->call('getUserRoles', $param);
+        if ($result != false)
+        {
+            // TODO: change to simple xml
+            $objects = $this->parseXML($result);
+            $roles = [];
+            foreach ($objects as $count => $role)
+                $roles[$count] = $role["obj_id"];
+            return $roles;
+        }
+        return false;
+    }
+
+    /**
+    * get local roles
+    *
+    * gets local roles for given object
+    * @access public
+    * @param string course_id object-id
+    * @return array role-objects
+    */
+    function getLocalRoles($course_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $course_id
+           ];
+        $result = $this->call('getLocalRoles', $param);
+        if ($result != false)
+        {
+            // TODO: change to simple xml
+            $objects = $this->parseXML($result);
+            return $objects;
+        }
+        return false;
+    }
+
+    /**
+    * add role
+    *
+    * adds a new role
+    * @access public
+    * @param array role_data data for role-object
+    * @param string ref_id reference-id
+    * @return string role-id
+    */
+    function addRole($role_data, $ref_id)
+    {
+        $this->clearCache();
+        $type = "role";
+        $title = htmlReady($role_data["title"]);
+        $description = htmlReady($role_data["description"]);
+
+        $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
+<Objects>
+  <Object type=\"$type\" obj_id=\"\">
+    <Title>
+    $title
+    </Title>
+    <Description>
+    $description
+    </Description>
+  </Object>
+</Objects>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id' => $ref_id,
+            'obj_xml' => $xml
+            ];
+        $result = $this->call('addRole', $param);
+        if (is_array($result))
+            return current($result);
+        else
+            return false;
+    }
+
+    /**
+    * add role from tremplate
+    *
+    * adds a new role and adopts properties of the given role template
+    * @access public
+    * @param array role_data data for role-object
+    * @param string ref_id reference-id
+    * @param string role_id role-template-id
+    * @return string role-id
+    */
+    function addRoleFromTemplate($role_data, $ref_id, $role_id)
+    {
+        $this->clearCache();
+        $type = "role";
+        $title = htmlReady($role_data["title"]);
+        $description = htmlReady($role_data["description"]);
+
+        $xml = "<!DOCTYPE Objects SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_object_0_1.dtd\">
+<Objects>
+  <Object type=\"$type\" obj_id=\"\">
+    <Title>
+    $title
+    </Title>
+    <Description>
+    $description
+    </Description>
+  </Object>
+</Objects>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'target_id' => $ref_id,
+            'obj_xml' => $xml,
+            'role_template_id' => $role_id
+            ];
+        $result = $this->call('addRoleFromTemplate', $param);
+        if (is_array($result))
+            return current($result);
+        else
+            return false;
+    }
+
+    /**
+    * delete user role entry
+    *
+    * deletes a role entry from the given user
+    * @access public
+    * @param string user_id user-id
+    * @param string role_id role-id
+    * @return boolean result
+    */
+    function deleteUserRoleEntry($user_id, $role_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id' => $user_id,
+            'role_id' => $role_id
+           ];
+        return $this->call('deleteUserRoleEntry', $param);
+    }
+
+    /**
+    * add user role entry
+    *
+    * adds a role entry for the given user
+    * @access public
+    * @param string user_id user-id
+    * @param string role_id role-id
+    * @return boolean result
+    */
+    function addUserRoleEntry($user_id, $role_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'user_id' => $user_id,
+            'role_id' => $role_id
+           ];
+        return $this->call('addUserRoleEntry', $param);
+    }
+
+    /**
+    * grant permissions
+    *
+    * grants permissions for given operations at role-id and ref-id
+    * @access public
+    * @param array operations operation-array
+    * @param string role_id role-id
+    * @param string ref_id reference-id
+    * @return boolean result
+    */
+    function grantPermissions($operations, $role_id, $ref_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'role_id' => $role_id,
+            'operations' => $operations,
+           ];
+        return $this->call('grantPermissions', $param);
+    }
+
+    /**
+    * revoke permissions
+    *
+    * revokes all permissions role-id and ref-id
+    * @access public
+    * @param string role_id role-id
+    * @param string ref_id reference-id
+    * @return boolean result
+    */
+    function revokePermissions($role_id, $ref_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'ref_id' => $ref_id,
+            'role_id' => $role_id,
+           ];
+        return $this->call('revokePermissions', $param);
+    }
+
+/////////////////////////
+// USER-FUNCTIONS //
+///////////////////////
+
+    /**
+    * lookup user
+    *
+    * gets user-id for given username
+    * @access public
+    * @param string username username
+    * @return string user-id
+    */
+    function lookupUser($username)
+    {
+        $param = [
+            'sid'       => $this->getSID(),
+            'user_name' => $username,
+        ];
+        return $this->call('lookupUser', $param); // returns user_id
+    }
+
+    /**
+    * get user
+    *
+    * gets user-data for given user-id
+    * @access public
+    * @param string $user_id user-id
+    * @return array user-data
+    */
+    function getUser($user_id)
+    {
+        if ($this->ilias_version < 80000) {
+            $param = [
+                'sid'     => $this->getSID(),
+                'user_id' => $user_id
+            ];
+            $result = $this->call('getUser', $param); // returns user data array
+            return $result;
+        } else {
+            $param = [
+                'sid'          => $this->getSID(),
+                'user_ids'     => [$user_id],
+                'attach_roles' => 0,
+            ];
+            $result = $this->call('getUserXML', $param); // returns user xml data
+            if ($result) {
+                $s = simplexml_load_string($result);
+                $user_array = [];
+
+                foreach ($s->User as $user) {
+                    $id_parts = explode('usr_', $user->attributes()->Id);
+                    if ($id_parts[1] == $user_id) {
+                        $user_array['usr_id'] = $user_id;
+                        $user_array['user_language'] = (string)$user->attributes()->Language;
+                        $user_array['login'] = (string)$user->Login;
+                        $user_array['firstname'] = (string)$user->Firstname;
+                        $user_array['lastname'] = (string)$user->Lastname;
+                        $user_array['title'] = (string)$user->Title;
+                        $user_array['email'] = (string)$user->Email;
+                        $user_array['active'] = (string)$user->Active;
+                        $user_array['authmode'] = (string)$user->AuthMode->attributes()->type;
+                        return $user_array;
+                    }
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * get user fullname
+     *
+     * gets user-data for given user-id
+     * @access public
+     * @param string user_id user-id
+     * @return string full name
+     */
+    function getUserFullname($user_id)
+    {
+        $result = $this->getUser($user_id);
+
+        return !empty($result) ? trim(sprintf('%s %s %s', $result['title'], $result['firstname'], $result['lastname'])) : '';
+    }
+
+    /**
+     * search users
+     *
+     * search for ilias users
+     * @access public
+     * @param array types types
+     * @param string key keyword
+     * @param string combination search-combination
+     * @param string user_id ilias-user-id
+     * @return array objects
+     */
+    function searchUser($user_id)
+    {
+        if ($user_id != "") {
+            $param = [
+                            'sid' => $this->getSID(),
+                            'user_ids' => [$user_id],
+                            'attach_roles' => 0
+            ];
+            $result = $this->call('getUserXML', $param);
+            if ($result != false)
+            {
+                // TODO: change to simple xml
+                $objects = $this->parseXML($result);
+                $all_objects = [];
+                foreach($objects as $count => $object_data){
+                    if (is_array($object_data["references"]))
+                    {
+                        foreach($object_data["references"] as $ref_data)
+                            if ($ref_data["accessInfo"] == "granted"
+                                    && (count($all_objects[$object_data["obj_id"]]["operations"]) < count($ref_data["operations"])))
+                            {
+                                $all_objects[$object_data["obj_id"]] = $object_data;
+                                unset($all_objects[$object_data["obj_id"]]["references"]);
+                                $all_objects[$object_data["obj_id"]]["ref_id"] = $ref_data["ref_id"];
+                                $all_objects[$object_data["obj_id"]]["accessInfo"] = $ref_data["accessInfo"];
+                                $all_objects[$object_data["obj_id"]]["operations"] = $ref_data["operations"];
+                            }
+                    }
+                }
+                if (count($all_objects)){
+                    foreach($all_objects as $one_object){
+                        $ret[$one_object['ref_id']] = $one_object;
+                    }
+                    return $ret;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * add user by importUsers
+     *
+     * adds new user and sets role-id
+     * @access public
+     * @param array user_data user-data
+     * @param string role_id global role-id for new user
+     * @return string user-id
+     */
+    function addUser($user_data, $role_id)
+    {
+        $this->clearCache();
+        foreach($user_data as $key => $value) {
+            $user_data[$key] = htmlReady($user_data[$key]);
+        }
+        $update = $user_data["id"];
+
+        $usr_xml = "<Users>
+<User ".($update ? 'Id="'.$user_data["id"].'"' : 'Id=""')." Action=".($update ? '"Update"' : '"Insert"').">
+<UDFDefinitions></UDFDefinitions>
+<Login>".$user_data["login"]."</Login>
+<Password Type=\"PLAIN\">".$user_data["passwd"]."</Password>
+<Firstname>".$user_data["firstname"]."</Firstname>
+<Lastname>".$user_data["lastname"]."</Lastname>
+<Title>".$user_data["title"]."</Title>
+<Gender>".$user_data["gender"]."</Gender>
+<Email>".$user_data["email"]."</Email>
+<Street>".$user_data["street"]."</Street>
+<PhoneHome>".$user_data["phone_home"]."</PhoneHome>";
+        if ($user_data["matriculation"] !== '') {
+            $usr_xml .= "<Matriculation>".(int)$user_data["matriculation"]."</Matriculation>";
+        }
+        $usr_xml .= "<Role Id=\"".$role_id."\" Type=\"Global\"/>
+<Active>true</Active>
+<TimeLimitUnlimited>".$user_data["time_limit_unlimited"]."</TimeLimitUnlimited>
+<TimeLimitMessage>0</TimeLimitMessage>
+<ApproveDate>".$user_data["approve_date"]."</ApproveDate>
+<AgreeDate>".$user_data["agree_date"]."</AgreeDate>";
+        if (($user_data["user_skin"] != "") OR ($user_data["user_style"] != "")) {
+            $usr_xml .= "<Look Skin=\"".$user_data["user_skin"]."\" Style=\"".$user_data["user_style"]."\"/>";
+        }
+        $usr_xml .= "<AuthMode type=\"".$user_data["auth_mode"]."\"/>
+<ExternalAccount>".$user_data["external_account"]."</ExternalAccount>
+</User>
+</Users>";
+
+        $param = [
+                        'sid' => $this->getSID(),
+                        'folder_id' => -1,
+                        'usr_xml' => $usr_xml,
+                        'conflict_rule' => 1,
+                        'send_account_mail' => 0
+        ];
+        $result = $this->call('importUsers', $param);
+
+        $s = simplexml_load_string($result);
+
+        if ((string)$s->rows->row->column[3] == "successful")
+            return (string)$s->rows->row->column[0];
+            else
+                return false;
+    }
+
+ ///////////////////////////////////////////////////
+    /**
+     * copy object
+     *
+     * copy ilias-object
+     * @access public
+     * @param string source_id reference-id
+     * @param string target_id reference-id
+     * @return string result
+     */
+    function copyObject($source_id, $target_id)
+    {
+        $this->clearCache();
+
+        $xml = "<Settings source_id=\"$source_id\" target_id=\"$target_id\" default_action=\"COPY\"/>";
+
+        $param = [
+            'sid' => $this->getSID(),
+            'xml' => $xml
+        ];
+        return $this->call('copyObject', $param);
+    }
+
+    /**
+     * get structure
+     *
+     * returns structure for ilias content object
+     * @access public
+     * @param string ref_id reference id
+     * @return array result
+     */
+    function getStructure($ref_id)
+    {
+        $param = [
+                        'sid' => $this->getSID(),
+                        'ref_id' => $ref_id
+        ];
+        $result = $this->call('getStructureObjects', $param);
+
+        $structure = [];
+        if ($result) {
+            $s = simplexml_load_string($result);
+
+            foreach ($s->StructureObjects->StructureObject as $object) {
+                $structure[] = (string)$object->Title;
+            }
+        }
+        return $structure;
+    }
+
+    /**
+     * get path
+     *
+     * returns repository-path to ilias-object
+     * @access public
+     * @param string source_id reference-id
+     * @param string target_id reference-id
+     * @return string result
+     */
+    function getPath($ref_id)
+    {
+        $param = [
+                        'sid' => $this->getSID(),
+                        'ref_id' => $ref_id
+        ];
+        $result = $this->call('getPathForRefId', $param);
+
+        if ($result) {
+            $s = simplexml_load_string($result);
+
+            foreach ($s->rows->row as $row) {
+                $path[] = (string)$row->column[2];
+            }
+        }
+
+        if (is_array($path)) {
+            return implode($this->separator_string, $path);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     *
+     * returns repository-path to ilias-object
+     *
+     * @access public
+     * @param string source_id reference-id
+     * @param string target_id reference-id
+     * @return string result
+     */
+    function getRawPath($ref_id)
+    {
+        $param = [
+                        'sid' => $this->getSID(),
+                        'ref_id' => $ref_id
+        ];
+        $result = $this->call('getPathForRefId', $param);
+
+        if ($result) {
+            $s = simplexml_load_string($result);
+
+            foreach ($s->rows->row as $row) {
+                $path[] = (string)$row->column[0];
+            }
+        }
+
+        if (is_array($path)) {
+            return implode('_', $path);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     *
+     * returns ILIAS-Server-Info
+     *
+     * @access public
+     * @return string result
+     */
+    function getInstallationInfoXML()
+    {
+        $this->clearCache();
+        $param = [
+        ];
+        $result = $this->call('getInstallationInfoXML', $param);
+        if ($result) {
+            $s = simplexml_load_string($result);
+            $version_info = (string)$s[0]['version'];
+            $version_parts = explode(' ', $version_info);
+            $data['version'] = $version_parts[0];
+            $data['version_date'] = $version_parts[1];
+            foreach($s->Clients->Client as $client) {
+                $data['clients'][] = (string)$client[0]['id'];
+            }
+        }
+        return $data;
+    }
+    //////////////////////////////////////////
+
+    /**
+    * update user
+    *
+    * update user-data
+    * @access public
+    * @param array user_data user-data
+    * @return string result
+    */
+/*    function updateUser($user_data)
+    {
+        $this->clearCache();
+        $param = array(
+            'sid' => $this->getSID(),
+            'user_data' => $user_data
+        );
+        return $this->call('updateUser', $param); // returns boolean
+    }
+/**/
+    /**
+    * update password
+    *
+    * update password with given string and write it uncrypted to the ilias-database
+    * @access public
+    * @param string user_id user-id
+    * @param string password password
+    * @return string result
+    */
+/*    function updatePassword($user_id, $password)
+    {
+        $this->clearCache();
+        $param = array(
+            'sid'          => $this->getSID(),
+            'user_id'      => $user_id,
+            'new_password' => $password
+        );
+        return $this->call('updatePassword', $param); // returns boolean
+    }
+/**/
+    /**
+    * delete user
+    *
+    * deletes user-account
+    * @access public
+    * @param string $user_id user-id
+    * @return string result
+    */
+    function deleteUser($user_id)
+    {
+        $this->clearCache();
+        if ($this->ilias_version < 80000) {
+            $param = [
+                'sid'     => $this->getSID(),
+                'user_id' => $user_id
+            ];
+            return $this->call('deleteUser', $param);   // returns boolean
+        } else {
+            $user_data = $this->getUser($user_id);
+            if (!$user_data['login']) {
+                return false;
+            }
+            $usr_xml = '<Users>
+    <User Id="il_0_usr_' . $user_id . '" Action="Delete">
+    <UDFDefinitions></UDFDefinitions><Login>' . $user_data['login'] . '</Login>
+    </User>
+    </Users>';
+
+            $param = [
+                'sid'               => $this->getSID(),
+                'folder_id'         => -1,
+                'usr_xml'           => $usr_xml,
+                'conflict_rule'     => 1,
+                'send_account_mail' => 0
+            ];
+            $result = $this->call('importUsers', $param);
+
+            $s = simplexml_load_string($result);
+
+            if ((string)$s->rows->row->column[3] == "successful") {
+                return (string)$s->rows->row->column[0];
+            }
+            return false;
+        }
+    }
+
+////////////////////////////
+// COURSE-FUNCTIONS //
+//////////////////////////
+
+    /**
+    * is course member
+    *
+    * checks if user is course-member
+    * @access public
+    * @param string user_id user-id
+    * @param string course_id course-id
+    * @return boolean result
+    */
+    function isMember($user_id, $course_id)
+    {
+        $param = [
+            'sid' => $this->getSID(),
+            'course_id'         => $course_id,
+            'user_id'         => $user_id
+            ];
+        $status = $this->call('isAssignedToCourse', $param);    // returns 0 if not assigned, 1 => course admin, 2 => course member or 3 => course tutor
+        if ($status == 0)
+            return false;
+        else
+            return true;
+    }
+
+    /**
+    * add course member
+    *
+    * adds user to course
+    * @access public
+    * @param string user_id user-id
+    * @param string type member-type (Admin, Tutor or Member)
+    * @param string course_id course-id
+    * @return boolean result
+    */
+    function addMember($user_id, $type, $course_id)
+    {
+        $this->clearCache();
+        $param = [
+            'sid' => $this->getSID(),
+            'course_id'         => $course_id,
+            'user_id'         => $user_id,
+            'type'         => $type
+            ];
+        return $this->call('assignCourseMember', $param);
+    }
+
+    /**
+     * add course
+     *
+     * adds course
+     * @access public
+     * @param array course_data course-data
+     * @param string ref_id target-id
+     * @return string course-id
+     */
+    function addCourse($course_data, $ref_id)
+    {
+        $this->clearCache();
+        foreach($course_data as $key => $value) {
+            $course_data[$key] = htmlReady($course_data[$key]);
+        }
+
+        $xml = $this->getCourseXML($course_data);
+        $param = [
+                        'sid' => $this->getSID(),
+                        'target_id'         => $ref_id,
+                        'crs_xml' => $xml
+        ];
+        $crs_id = $this->call('addCourse', $param);
+        return $crs_id;
+    }
+
+    /**
+     * add group
+     *
+     * adds group
+     * @access public
+     * @param array group_data group data
+     * @param string ref_id target id
+     * @return string group id
+     */
+    function addGroup($group_data, $ref_id)
+    {
+        $this->clearCache();
+        foreach($group_data as $key => $value) {
+            $group_data[$key] = htmlReady($group_data[$key]);
+        }
+
+        $xml = $this->getGroupXML($group_data);
+        $param = [
+                        'sid' => $this->getSID(),
+                        'target_id' => $ref_id,
+                        'group_xml' => $xml
+        ];
+        $group_id = $this->call('addGroup', $param);
+        return $group_id;
+    }
+
+    /**
+     * update group
+     *
+     * updates group
+     * @access public
+     * @param array group_data group data
+     * @param string ref_id group id
+     * @return string result
+     */
+    function updateGroup($group_data, $ref_id)
+    {
+        $this->clearCache();
+        foreach($group_data as $key => $value) {
+            $group_data[$key] = htmlReady($group_data[$key]);
+        }
+
+        $xml = $this->getGroupXML($group_data);
+        $param = [
+                        'sid' => $this->getSID(),
+                        'ref_id' => $ref_id,
+                        'xml' => $xml
+        ];
+        $result = $this->call('updateGroup', $param);
+        return $result;
+    }
+
+    /**
+     * assign group member
+     *
+     * assigns user to group
+     * @access public
+     * @param string group_id group id
+     * @param string user_id user id
+     * @param string type type
+     */
+    function assignGroupMember($group_id, $user_id, $type = "Member")
+    {
+        $this->clearCache();
+        $param = [
+                        'sid' => $this->getSID(),
+                        'group_id' => $group_id,
+                        'user_id' => $user_id,
+                        'type' => $type
+        ];
+        return $this->call('assignGroupMember', $param);
+    }
+
+    /**
+     * exclude group member
+     *
+     * removes user from group
+     * @access public
+     * @param string group_id group id
+     * @param string user_id user id
+     */
+    function excludeGroupMember($group_id, $user_id)
+    {
+        $this->clearCache();
+        $param = [
+                        'sid' => $this->getSID(),
+                        'group_id' => $group_id,
+                        'user_id' => $user_id
+        ];
+        return $this->call('excludeGroupMember', $param);
+    }
+
+    /**
+     * get group
+     *
+     * returns group xml
+     * @access public
+     * @param string group_id group id
+     * @return string group xml
+     */
+    function getGroup($group_id)
+    {
+        $param = [
+                        'sid' => $this->getSID(),
+                        'ref_id' => $group_id
+        ];
+        $result = $this->call('getGroup', $param);
+        if ($result) {
+            $s = simplexml_load_string($result);
+            $data['title'] = (string)$s->title;
+            $data['members'] = [];
+            foreach($s->member as $member) {
+                $member_parts = explode('_usr_', (string)$member[0]['id']);
+                $data['members'][] = $member_parts[1];
+            }
+        }
+        return $data;
+    }
+
+    /**
+    * get course-xml
+    *
+    * gets course xml-object for given course-data
+    * @access public
+    * @param array course_data course-data
+    * @return string course-xml
+    */
+    function getCourseXML($course_data)
+    {
+    $crs_language = $course_data["language"];
+    $crs_admin_id = $course_data["admin_id"];
+    $crs_title = $course_data["title"];
+    $crs_desc = $course_data["description"];
+
+    $xml = "<!DOCTYPE Course SYSTEM \"http://www.ilias.uni-koeln.de/download/dtd/ilias_course_0_1.dtd\">
+<Course>
+  <MetaData>
+    <General Structure=\"Hierarchical\">
+      <Identifier Catalog=\"ILIAS\" Entry=\"\"/>
+      <Title Language=\"$crs_language\">
+      $crs_title
+      </Title>
+      <Language Language=\"$crs_language\"/>
+      <Description Language=\"$crs_language\">
+      $crs_desc
+      </Description>
+      <Keyword Language=\"$crs_language\">
+      </Keyword>
+    </General>
+  </MetaData>
+  <Admin id=\"$crs_admin_id\" notification=\"Yes\" passed=\"No\">
+  </Admin>
+  <Settings>
+    <Availability>
+      <Unlimited/>
+    </Availability>
+    <Syllabus>
+    </Syllabus>
+    <Contact>
+      <Name>
+      </Name>
+      <Responsibility>
+      </Responsibility>
+      <Phone>
+      </Phone>
+      <Email>
+      </Email>
+      <Consultation>
+      </Consultation>
+    </Contact>
+    <Registration registrationType=\"Password\" maxMembers=\"0\" notification=\"No\">
+      <Disabled/>
+    </Registration>
+    <Sort type=\"Manual\"/>
+    <Archive Access=\"Disabled\">
+    </Archive>
+  </Settings>
+</Course>";
+    return $xml;
+    }
+
+
+    /**
+    * get group xml
+    *
+    * gets group xml object for given group data
+    * @access public
+    * @param array group_data group data
+    * @return string group xml
+    */
+    function getGroupXML($group_data)
+    {
+        $xml = '<group '.($group_data['id'] ? 'id="'.$group_data['id'].'" ': '').'type="open">
+    <title>'.$group_data['title'].'</title>
+    <owner id="'.$group_data['owner'].'"/>
+    <information/>
+    <registration type="disabled" waitingList="No">
+    <maxMembers enabled="No">0</maxMembers>
+    <minMembers>0</minMembers>
+    <WaitingListAutoFill>0</WaitingListAutoFill>
+    <CancellationEnd/><mailMembersType>1</mailMembersType>
+    </registration><Sort type="Inherit"/>
+    <ContainerSettings>
+    <ContainerSetting id="cont_auto_rate_new_obj">0</ContainerSetting>
+    <ContainerSetting id="cont_badges">0</ContainerSetting>
+    <ContainerSetting id="cont_show_calendar">1</ContainerSetting>
+    <ContainerSetting id="cont_show_news">0</ContainerSetting>
+    <ContainerSetting id="cont_skills">0</ContainerSetting>
+    <ContainerSetting id="cont_tag_cloud">0</ContainerSetting>
+    <ContainerSetting id="cont_use_news">0</ContainerSetting>
+    <ContainerSetting id="news_timeline">0</ContainerSetting>
+    <ContainerSetting id="news_timeline_incl_auto">0</ContainerSetting>
+    <ContainerSetting id="news_timeline_landing_page">0</ContainerSetting>
+    </ContainerSettings>
+    </group>';
+        return $xml;
+    }
+ /**/
+
+    /**
+    * get courses for given user
+    *
+    * gets course xml-object for given course-data
+    * @access public
+    * @param array course_data course-data
+    * @return string course-xml
+    */
+    function getCoursesForUser($user_id, $status = 1)
+    {
+        $xmlrs = '<?xml version="1.0" encoding="utf-8"?>
+        <result>
+            <colspecs>
+                <colspec idx="0" name="user_id"/>
+                <colspec idx="1" name="status"/>
+            </colspecs>
+            <rows>
+                <row>
+                    <column>'.$user_id.'</column>
+                    <column>'.$status.'</column>
+                </row>
+            </rows>
+        </result>';
+        $param = array(
+            'sid' => $this->getSID(),
+            'parameters' => $xmlrs
+        );
+        $result = $this->call('getCoursesForUser', $param);
+
+        if ($result) {
+            $s = simplexml_load_string($result);
+            foreach ($s->rows->row as $row) {
+                $ref_id = (string)$row->column[0];
+                $xml = $this->parseXML((string)$row->column[1]);
+                $course = array_pop($xml);
+                $ret[$ref_id] = $course['title'];
+            }
+        }
+        if (is_array($ret)) {
+            return $ret;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+    * check reference by title
+    *
+    * gets reference id by object id
+    * @access public
+    * @param string key keyword
+    * @param string type object-type
+    * @return string reference-id
+    */
+    function checkReferenceById($id)
+    {
+        $param = [
+            'sid'          => $this->getSID(),
+            'reference_id' => $id,
+            'user_id'      => 0
+        ];
+
+        $result = $this->call('getObjectByReference', $param);
+        if ($result != false)
+        {
+            // TODO: change to simple xml
+            $objects = $this->parseXML($result);
+            if(is_array($objects)){
+                foreach($objects as $index => $object_data){
+                    if(is_array($object_data['references'])){
+                        foreach($object_data['references'] as $reference){
+                            if($reference['ref_id'] == $id && $reference['accessInfo'] != 'object_deleted') return $object_data['obj_id'];
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param string $ref_id
+     * @param bool $sum_only
+     * @return array|false
+     * @throws Exception
+     */
+    public function getTestResults($ref_id, $sum_only = true)
+    {
+        $param = [
+            'sid'    => $this->getSID(),
+            'ref_id' => $ref_id,
+            'sum_only' => $sum_only
+        ];
+        $result = $this->call('getTestResults', $param);
+        if ($result !== false) {
+            $columns = [];
+            $data = [];
+            $xml = simplexml_load_string($result);
+            foreach ($xml->colspecs->colspec as $colspec) {
+                $columns[] = (string)$colspec['name'];
+            }
+            foreach ($xml->rows->row as $row) {
+                $data_row = [];
+                $i = 0;
+                foreach ($row->column as $column) {
+                    $data_row[$columns[$i++]] = (string)$column;
+                }
+                if (isset($data_row['user_id'])) {
+
+                }
+                $data[] = $data_row;
+            }
+            return $data;
+        }
+        return false;
+    }
+}
diff --git a/lib/ilias_interface/IliasUser.class.php b/lib/ilias_interface/IliasUser.class.php
deleted file mode 100644
index 426de80..0000000
--- a/lib/ilias_interface/IliasUser.class.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/**
-* class to handle user-accounts
-*
-* This class contains methods to handle connected user-accounts.
-*
-* @author   Arne Schröder <schroeder@data-quest.de>
-* @access   public
-* @modulegroup  elearning_interface_modules
-* @module       ConnectedUser
-* @package  ELearning-Interface
-*/
-class IliasUser
-{
-    const USER_TYPE_ORIGINAL= '1';
-    const USER_TYPE_CREATED= '0';
-
-    public $index;
-    private $ilias_config;
-    public $version;
-    public $id;
-    public $studip_id;
-    public $studip_login;
-    public $studip_password;
-    public $login;
-    public $external_password;
-    public $category;
-    public $gender;
-    public $title_front;
-    public $title_rear;
-    public $title;
-    public $firstname;
-    public $lastname;
-    public $institution;
-    public $street;
-    public $country;
-    public $phone_home;
-    public $fax;
-    public $matriculation;
-    public $email;
-    public $type;
-    public $is_connected;
-    public $auth_plugin;
-
-    /**
-    * constructor
-    *
-    * init class. don't call directly, class is loaded by ConnectedIlias.
-    * @access public
-    * @param string $index ILIAS installation index
-    */
-    function __construct($index, $version, $user_id = false)
-    {
-        global $auth;
-
-        $this->studip_id = $user_id ? $user_id : $GLOBALS['user']->id;
-        $this->auth_plugin = DBManager::get()->query("SELECT IFNULL(auth_plugin, 'standard') FROM auth_user_md5 WHERE user_id = '" . $this->studip_id. "'")->fetchColumn();
-        $this->index = $index;
-        $this->version = $version;
-        $ilias_configs = Config::get()->ILIAS_INTERFACE_SETTINGS;
-        $this->ilias_config = $ilias_configs[$this->index];
-
-        $this->readData();
-        $this->getStudipUserData();
-    }
-
-    /**
-    * get data
-    *
-    * gets data from database
-    * @access public
-    * @return boolean returns false, if no data was found
-    */
-    function readData()
-    {
-        $query = "SELECT external_user_id, external_user_name, external_user_password, external_user_category, external_user_type
-                  FROM auth_extern
-                  WHERE studip_user_id = ? AND external_user_system_type = ? ORDER BY external_user_type DESC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->studip_id, $this->index]);
-        $data = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$data) {
-            $this->id = '';
-            $this->is_connected = false;
-            return false;
-        }
-
-        $this->id                = $data['external_user_id'];
-        $this->login             = $data['external_user_name'];
-        $this->external_password = $data['external_user_password'];
-        $this->category          = $data['external_user_category'];
-        $this->type              = $data['external_user_type'];
-        $this->is_connected      = true;
-
-        return true;
-    }
-
-    /**
-    * get stud.ip-user-data
-    *
-    * gets stud.ip-user-data from database
-    * @access public
-    * @return boolean returns false, if no data was found
-    */
-    function getStudipUserData()
-    {
-        $query = "SELECT username, password, title_front, title_rear, Vorname,
-                         Nachname, Email, privatnr, privadr, geschlecht
-                  FROM auth_user_md5
-                  LEFT JOIN  user_info USING (user_id)
-                  WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->studip_id]);
-        $data = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$data) {
-            return false;
-        }
-
-        $this->studip_login    = $data['username'];
-        $this->studip_password = $data['password'];
-        $this->title_front     = $data['title_front'];
-        $this->title_rear      = $data['title_rear'];
-        $this->firstname       = $data['Vorname'];
-        $this->lastname        = $data['Nachname'];
-        $this->email           = $data['Email'];
-        $this->phone_home      = $data['privatnr'];
-        $this->street          = $data['privadr'];
-        switch($data['geschlecht']) {
-            case 1: $this->gender   = 'm'; break;
-            case 2: $this->gender   = 'f'; break;
-            default: $this->gender  = 'f';
-        }
-
-        $this->matriculation = '';
-        if (array_key_exists('matriculation', $this->ilias_config) && $this->ilias_config['matriculation']) {
-            $this->matriculation = 0;
-            foreach (DataFieldEntry::getDataFieldEntries($this->studip_id, 'user') as $entry) {
-                if ($entry->getName() == $this->ilias_config['matriculation']) {
-                    $this->matriculation = $entry->getDisplayValue();
-                }
-            }
-        }
-
-        if ($this->title_front != '') {
-            $this->title = $this->title_front;
-        }
-        if ($this->title_front != '' && $this->title_rear != '') {
-            $this->title .= ' ';
-        }
-        if ($this->title_rear != '') {
-            $this->title .= $this->title_rear;
-        }
-        return true;
-    }
-
-    /**
-    * get array of user account data
-    *
-    * returns array of user account data
-    * @access public
-    * @return array user account data
-    */
-    function getUserArray()
-    {
-        // data for user-account in ILIAS
-        $user_data['id'] = $this->id;
-        $user_data['login'] = $this->studip_login;
-        $user_data['passwd'] = md5(uniqid()); //never gets used, only to ensure correct entry in ilias db
-        $user_data['firstname'] = $this->firstname;
-        $user_data['lastname'] = $this->lastname;
-        $user_data['title'] = $this->title;
-        $user_data['gender'] = $this->gender;
-        $user_data['email'] = $this->email;
-        $user_data['street'] = $this->street;
-        $user_data['phone_home'] = $this->phone_home;
-        $user_data['matriculation'] = $this->matriculation;
-        $user_data['time_limit_unlimited'] = 1;
-        $user_data['active'] = 1;
-        $user_data['approve_date'] = date('Y-m-d H:i:s');
-        $user_data['accepted_agreement'] = true;
-        $user_data['agree_date'] = date('Y-m-d H:i:s');
-        $user_data['auth_mode'] = 'default';
-        $user_data['external_account'] = '';
-        return $user_data;
-    }
-
-    /**
-    * get id
-    *
-    * returns id
-    * @access public
-    * @return string id
-    */
-    function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * set id
-     *
-     * returns id
-     * @return string id
-     */
-    public function setId($ilias_user_id)
-    {
-        return $this->id = $ilias_user_id;
-    }
-
-    /**
-    * get stud.ip user-id
-    *
-    * returns id
-    * @access public
-    * @return string stud.ip user-id
-    */
-    function getStudipId()
-    {
-        return $this->studip_id;
-    }
-
-    /**
-    * get username
-    *
-    * returns username
-    * @access public
-    * @return string username
-    */
-    function getUsername()
-    {
-        return $this->login;
-    }
-
-    /**
-    * set username
-    *
-    * sets username
-    * @access public
-    * @param string $user_login username
-    */
-    function setUsername($user_login)
-    {
-        $this->login = $user_login;
-    }
-
-    /**
-    * get password
-    *
-    * returns password
-    * @access public
-    * @return string password
-    */
-    function getPassword()
-    {
-        return $this->external_password;
-    }
-
-    /**
-    * set password
-    *
-    * sets password
-    * @access public
-    * @param string $user_password password
-    */
-    function setPassword($user_password)
-    {
-        $this->external_password = $user_password;
-    }
-
-    /**
-    * get user category
-    *
-    * returns id
-    * @access public
-    * @return string id
-    */
-    function getCategory()
-    {
-        return $this->category;
-    }
-
-    /**
-    * set user category
-    *
-    * sets user category
-    * @access public
-    * @param string $user_category category
-    */
-    function setCategory($user_category)
-    {
-        $this->category = $user_category;
-    }
-
-    /**
-    * get gender
-    *
-    * returns gender-setting
-    * @access public
-    * @return string gender-setting
-    */
-    function getGender()
-    {
-        return $this->gender;
-    }
-
-    /**
-    * set gender
-    *
-    * sets gender
-    * @access public
-    * @param string $user_gender gender-setting
-    */
-    function setGender($user_gender)
-    {
-        $this->gender = $user_gender;
-    }
-
-    /**
-    * get full name
-    *
-    * returns full name
-    * @access public
-    * @return string name
-    */
-    function getName()
-    {
-        if ($this->title != "")
-            return $this->title . ' ' . $this->firstname . ' ' . $this->lastname;
-        else
-            return $this->firstname . ' ' . $this->lastname;
-    }
-
-    /**
-    * get firstname
-    *
-    * returns firstname
-    * @access public
-    * @return string firstname
-    */
-    function getFirstname()
-    {
-        return $this->firstname;
-    }
-
-    /**
-    * set firstname
-    *
-    * sets firstname
-    * @access public
-    * @param string $user_firstname firstname
-    */
-    function setFirstname($user_firstname)
-    {
-        $this->firstname = $user_firstname;
-    }
-
-    /**
-    * get lastname
-    *
-    * returns lastname
-    * @access public
-    * @return string lastname
-    */
-    function getLastname()
-    {
-        return $this->lastname;
-    }
-
-    /**
-    * set lastname
-    *
-    * sets lastname
-    * @access public
-    * @param string $user_lastname lastname
-    */
-    function setLastname($user_lastname)
-    {
-        $this->lastname = $user_lastname;
-    }
-
-    /**
-    * get email-adress
-    *
-    * returns email-adress
-    * @access public
-    * @return string email-adress
-    */
-    function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-    * set email-adress
-    *
-    * sets email-adress
-    * @access public
-    * @param string $user_email email-adress
-    */
-    function setEmail($user_email)
-    {
-        $this->email = $user_email;
-    }
-
-    /**
-    * get user-type
-    *
-    * returns user-type
-    * @access public
-    * @return string user-type
-    */
-    function getUserType()
-    {
-        return $this->type;
-    }
-
-    /**
-    * set user-type
-    *
-    * sets user-type
-    * @access public
-    * @param string $user_type user-type
-    */
-    function setUserType($user_type)
-    {
-        $this->type = $user_type;
-    }
-
-    /**
-    * save connection for user-account
-    *
-    * saves user-connection to database and sets type for actual user
-    * @access public
-    * @param string $user_type user-type
-    */
-    function setConnection($user_type)
-    {
-        $this->setUserType($user_type);
-
-        $query = "INSERT INTO auth_extern (studip_user_id, external_user_id, external_user_name,
-                                           external_user_password, external_user_category,
-                                           external_user_system_type, external_user_type)
-                  VALUES (?, ?, ?, ?, ?, ?, ?)
-                  ON DUPLICATE KEY
-                    UPDATE external_user_name = VALUES(external_user_name),
-                           external_user_password = VALUES(external_user_password),
-                           external_user_category = VALUES(external_user_category),
-                           external_user_id = VALUES(external_user_id)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            (string)$this->studip_id,
-            (string)$this->id,
-            (string)$this->login,
-            (string)$this->external_password,
-            (string)$this->category,
-            (string)$this->index,
-            (int)$this->type,
-        ]);
-
-        $this->is_connected = true;
-        $this->readData();
-    }
-
-    /**
-     * remove connection for user-account
-     *
-     * deletes user-connection from database (only for manually connected user)
-     * @access public
-     */
-    function unsetConnection($ignore_usertype = false)
-    {
-        if (!$ignore_usertype && ($this->getUserType() != self::USER_TYPE_ORIGINAL)) {
-            return;
-        }
-
-        $query = "DELETE FROM auth_extern WHERE studip_user_id = ? AND external_user_system_type = ? AND external_user_type = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-                        (string)$this->studip_id,
-                        (string)$this->index,
-                        (int)$this->type
-        ]);
-
-        $this->is_connected = false;
-        $this->readData();
-    }
-
-    /**
-    * get connection-status
-    *
-    * returns true, if there is a connected user
-    * @access public
-    * @return boolean connection-status
-    */
-    function isConnected()
-    {
-        return $this->is_connected;
-    }
-
-    /**
-     * get authentication token
-     *
-     * generates authentication token and updates auth_extern
-     * @access public
-     */
-    function getToken()
-    {
-        $token = md5(uniqid("iliastoken538"));
-        $query = "UPDATE `auth_extern` SET `external_user_token` = ?, `external_user_token_valid_until` = ?
-                            WHERE `auth_extern`.`studip_user_id` = ? AND `auth_extern`.`external_user_system_type` = ? AND `auth_extern`.`external_user_type` = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-                        $token,
-                        time() + 600,
-                        (string)$this->studip_id,
-                        (string)$this->index,
-                        (int)$this->type
-        ]);
-        return $token;
-    }
-}
-?>
diff --git a/lib/ilias_interface/IliasUser.php b/lib/ilias_interface/IliasUser.php
new file mode 100644
index 0000000..426de80
--- /dev/null
+++ b/lib/ilias_interface/IliasUser.php
@@ -0,0 +1,528 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+
+/**
+* class to handle user-accounts
+*
+* This class contains methods to handle connected user-accounts.
+*
+* @author   Arne Schröder <schroeder@data-quest.de>
+* @access   public
+* @modulegroup  elearning_interface_modules
+* @module       ConnectedUser
+* @package  ELearning-Interface
+*/
+class IliasUser
+{
+    const USER_TYPE_ORIGINAL= '1';
+    const USER_TYPE_CREATED= '0';
+
+    public $index;
+    private $ilias_config;
+    public $version;
+    public $id;
+    public $studip_id;
+    public $studip_login;
+    public $studip_password;
+    public $login;
+    public $external_password;
+    public $category;
+    public $gender;
+    public $title_front;
+    public $title_rear;
+    public $title;
+    public $firstname;
+    public $lastname;
+    public $institution;
+    public $street;
+    public $country;
+    public $phone_home;
+    public $fax;
+    public $matriculation;
+    public $email;
+    public $type;
+    public $is_connected;
+    public $auth_plugin;
+
+    /**
+    * constructor
+    *
+    * init class. don't call directly, class is loaded by ConnectedIlias.
+    * @access public
+    * @param string $index ILIAS installation index
+    */
+    function __construct($index, $version, $user_id = false)
+    {
+        global $auth;
+
+        $this->studip_id = $user_id ? $user_id : $GLOBALS['user']->id;
+        $this->auth_plugin = DBManager::get()->query("SELECT IFNULL(auth_plugin, 'standard') FROM auth_user_md5 WHERE user_id = '" . $this->studip_id. "'")->fetchColumn();
+        $this->index = $index;
+        $this->version = $version;
+        $ilias_configs = Config::get()->ILIAS_INTERFACE_SETTINGS;
+        $this->ilias_config = $ilias_configs[$this->index];
+
+        $this->readData();
+        $this->getStudipUserData();
+    }
+
+    /**
+    * get data
+    *
+    * gets data from database
+    * @access public
+    * @return boolean returns false, if no data was found
+    */
+    function readData()
+    {
+        $query = "SELECT external_user_id, external_user_name, external_user_password, external_user_category, external_user_type
+                  FROM auth_extern
+                  WHERE studip_user_id = ? AND external_user_system_type = ? ORDER BY external_user_type DESC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->studip_id, $this->index]);
+        $data = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$data) {
+            $this->id = '';
+            $this->is_connected = false;
+            return false;
+        }
+
+        $this->id                = $data['external_user_id'];
+        $this->login             = $data['external_user_name'];
+        $this->external_password = $data['external_user_password'];
+        $this->category          = $data['external_user_category'];
+        $this->type              = $data['external_user_type'];
+        $this->is_connected      = true;
+
+        return true;
+    }
+
+    /**
+    * get stud.ip-user-data
+    *
+    * gets stud.ip-user-data from database
+    * @access public
+    * @return boolean returns false, if no data was found
+    */
+    function getStudipUserData()
+    {
+        $query = "SELECT username, password, title_front, title_rear, Vorname,
+                         Nachname, Email, privatnr, privadr, geschlecht
+                  FROM auth_user_md5
+                  LEFT JOIN  user_info USING (user_id)
+                  WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->studip_id]);
+        $data = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$data) {
+            return false;
+        }
+
+        $this->studip_login    = $data['username'];
+        $this->studip_password = $data['password'];
+        $this->title_front     = $data['title_front'];
+        $this->title_rear      = $data['title_rear'];
+        $this->firstname       = $data['Vorname'];
+        $this->lastname        = $data['Nachname'];
+        $this->email           = $data['Email'];
+        $this->phone_home      = $data['privatnr'];
+        $this->street          = $data['privadr'];
+        switch($data['geschlecht']) {
+            case 1: $this->gender   = 'm'; break;
+            case 2: $this->gender   = 'f'; break;
+            default: $this->gender  = 'f';
+        }
+
+        $this->matriculation = '';
+        if (array_key_exists('matriculation', $this->ilias_config) && $this->ilias_config['matriculation']) {
+            $this->matriculation = 0;
+            foreach (DataFieldEntry::getDataFieldEntries($this->studip_id, 'user') as $entry) {
+                if ($entry->getName() == $this->ilias_config['matriculation']) {
+                    $this->matriculation = $entry->getDisplayValue();
+                }
+            }
+        }
+
+        if ($this->title_front != '') {
+            $this->title = $this->title_front;
+        }
+        if ($this->title_front != '' && $this->title_rear != '') {
+            $this->title .= ' ';
+        }
+        if ($this->title_rear != '') {
+            $this->title .= $this->title_rear;
+        }
+        return true;
+    }
+
+    /**
+    * get array of user account data
+    *
+    * returns array of user account data
+    * @access public
+    * @return array user account data
+    */
+    function getUserArray()
+    {
+        // data for user-account in ILIAS
+        $user_data['id'] = $this->id;
+        $user_data['login'] = $this->studip_login;
+        $user_data['passwd'] = md5(uniqid()); //never gets used, only to ensure correct entry in ilias db
+        $user_data['firstname'] = $this->firstname;
+        $user_data['lastname'] = $this->lastname;
+        $user_data['title'] = $this->title;
+        $user_data['gender'] = $this->gender;
+        $user_data['email'] = $this->email;
+        $user_data['street'] = $this->street;
+        $user_data['phone_home'] = $this->phone_home;
+        $user_data['matriculation'] = $this->matriculation;
+        $user_data['time_limit_unlimited'] = 1;
+        $user_data['active'] = 1;
+        $user_data['approve_date'] = date('Y-m-d H:i:s');
+        $user_data['accepted_agreement'] = true;
+        $user_data['agree_date'] = date('Y-m-d H:i:s');
+        $user_data['auth_mode'] = 'default';
+        $user_data['external_account'] = '';
+        return $user_data;
+    }
+
+    /**
+    * get id
+    *
+    * returns id
+    * @access public
+    * @return string id
+    */
+    function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * set id
+     *
+     * returns id
+     * @return string id
+     */
+    public function setId($ilias_user_id)
+    {
+        return $this->id = $ilias_user_id;
+    }
+
+    /**
+    * get stud.ip user-id
+    *
+    * returns id
+    * @access public
+    * @return string stud.ip user-id
+    */
+    function getStudipId()
+    {
+        return $this->studip_id;
+    }
+
+    /**
+    * get username
+    *
+    * returns username
+    * @access public
+    * @return string username
+    */
+    function getUsername()
+    {
+        return $this->login;
+    }
+
+    /**
+    * set username
+    *
+    * sets username
+    * @access public
+    * @param string $user_login username
+    */
+    function setUsername($user_login)
+    {
+        $this->login = $user_login;
+    }
+
+    /**
+    * get password
+    *
+    * returns password
+    * @access public
+    * @return string password
+    */
+    function getPassword()
+    {
+        return $this->external_password;
+    }
+
+    /**
+    * set password
+    *
+    * sets password
+    * @access public
+    * @param string $user_password password
+    */
+    function setPassword($user_password)
+    {
+        $this->external_password = $user_password;
+    }
+
+    /**
+    * get user category
+    *
+    * returns id
+    * @access public
+    * @return string id
+    */
+    function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+    * set user category
+    *
+    * sets user category
+    * @access public
+    * @param string $user_category category
+    */
+    function setCategory($user_category)
+    {
+        $this->category = $user_category;
+    }
+
+    /**
+    * get gender
+    *
+    * returns gender-setting
+    * @access public
+    * @return string gender-setting
+    */
+    function getGender()
+    {
+        return $this->gender;
+    }
+
+    /**
+    * set gender
+    *
+    * sets gender
+    * @access public
+    * @param string $user_gender gender-setting
+    */
+    function setGender($user_gender)
+    {
+        $this->gender = $user_gender;
+    }
+
+    /**
+    * get full name
+    *
+    * returns full name
+    * @access public
+    * @return string name
+    */
+    function getName()
+    {
+        if ($this->title != "")
+            return $this->title . ' ' . $this->firstname . ' ' . $this->lastname;
+        else
+            return $this->firstname . ' ' . $this->lastname;
+    }
+
+    /**
+    * get firstname
+    *
+    * returns firstname
+    * @access public
+    * @return string firstname
+    */
+    function getFirstname()
+    {
+        return $this->firstname;
+    }
+
+    /**
+    * set firstname
+    *
+    * sets firstname
+    * @access public
+    * @param string $user_firstname firstname
+    */
+    function setFirstname($user_firstname)
+    {
+        $this->firstname = $user_firstname;
+    }
+
+    /**
+    * get lastname
+    *
+    * returns lastname
+    * @access public
+    * @return string lastname
+    */
+    function getLastname()
+    {
+        return $this->lastname;
+    }
+
+    /**
+    * set lastname
+    *
+    * sets lastname
+    * @access public
+    * @param string $user_lastname lastname
+    */
+    function setLastname($user_lastname)
+    {
+        $this->lastname = $user_lastname;
+    }
+
+    /**
+    * get email-adress
+    *
+    * returns email-adress
+    * @access public
+    * @return string email-adress
+    */
+    function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+    * set email-adress
+    *
+    * sets email-adress
+    * @access public
+    * @param string $user_email email-adress
+    */
+    function setEmail($user_email)
+    {
+        $this->email = $user_email;
+    }
+
+    /**
+    * get user-type
+    *
+    * returns user-type
+    * @access public
+    * @return string user-type
+    */
+    function getUserType()
+    {
+        return $this->type;
+    }
+
+    /**
+    * set user-type
+    *
+    * sets user-type
+    * @access public
+    * @param string $user_type user-type
+    */
+    function setUserType($user_type)
+    {
+        $this->type = $user_type;
+    }
+
+    /**
+    * save connection for user-account
+    *
+    * saves user-connection to database and sets type for actual user
+    * @access public
+    * @param string $user_type user-type
+    */
+    function setConnection($user_type)
+    {
+        $this->setUserType($user_type);
+
+        $query = "INSERT INTO auth_extern (studip_user_id, external_user_id, external_user_name,
+                                           external_user_password, external_user_category,
+                                           external_user_system_type, external_user_type)
+                  VALUES (?, ?, ?, ?, ?, ?, ?)
+                  ON DUPLICATE KEY
+                    UPDATE external_user_name = VALUES(external_user_name),
+                           external_user_password = VALUES(external_user_password),
+                           external_user_category = VALUES(external_user_category),
+                           external_user_id = VALUES(external_user_id)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            (string)$this->studip_id,
+            (string)$this->id,
+            (string)$this->login,
+            (string)$this->external_password,
+            (string)$this->category,
+            (string)$this->index,
+            (int)$this->type,
+        ]);
+
+        $this->is_connected = true;
+        $this->readData();
+    }
+
+    /**
+     * remove connection for user-account
+     *
+     * deletes user-connection from database (only for manually connected user)
+     * @access public
+     */
+    function unsetConnection($ignore_usertype = false)
+    {
+        if (!$ignore_usertype && ($this->getUserType() != self::USER_TYPE_ORIGINAL)) {
+            return;
+        }
+
+        $query = "DELETE FROM auth_extern WHERE studip_user_id = ? AND external_user_system_type = ? AND external_user_type = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+                        (string)$this->studip_id,
+                        (string)$this->index,
+                        (int)$this->type
+        ]);
+
+        $this->is_connected = false;
+        $this->readData();
+    }
+
+    /**
+    * get connection-status
+    *
+    * returns true, if there is a connected user
+    * @access public
+    * @return boolean connection-status
+    */
+    function isConnected()
+    {
+        return $this->is_connected;
+    }
+
+    /**
+     * get authentication token
+     *
+     * generates authentication token and updates auth_extern
+     * @access public
+     */
+    function getToken()
+    {
+        $token = md5(uniqid("iliastoken538"));
+        $query = "UPDATE `auth_extern` SET `external_user_token` = ?, `external_user_token_valid_until` = ?
+                            WHERE `auth_extern`.`studip_user_id` = ? AND `auth_extern`.`external_user_system_type` = ? AND `auth_extern`.`external_user_type` = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+                        $token,
+                        time() + 600,
+                        (string)$this->studip_id,
+                        (string)$this->index,
+                        (int)$this->type
+        ]);
+        return $token;
+    }
+}
+?>
diff --git a/lib/models/AdmissionApplication.class.php b/lib/models/AdmissionApplication.class.php
deleted file mode 100644
index 02514ec..0000000
--- a/lib/models/AdmissionApplication.class.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/**
- * AdmissionApplication.class.php
- * model class for table admission_seminar_user
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $user_id database column
- * @property string $seminar_id database column
- * @property string $status database column
- * @property int $mkdate database column
- * @property int|null $chdate database column
- * @property int|null $position database column
- * @property string $comment database column
- * @property string $visible database column
- * @property User $user belongs_to User
- * @property Course $course belongs_to Course
- * @property mixed $vorname additional field
- * @property mixed $nachname additional field
- * @property mixed $username additional field
- * @property mixed $email additional field
- * @property mixed $title_front additional field
- * @property mixed $title_rear additional field
- * @property mixed $course_name additional field
- */
-class AdmissionApplication extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'admission_seminar_user';
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name' => Course::class,
-            'foreign_key' => 'seminar_id',
-        ];
-        $config['additional_fields']['vorname'] = ['user', 'vorname'];
-        $config['additional_fields']['nachname'] = ['user', 'nachname'];
-        $config['additional_fields']['username'] = ['user', 'username'];
-        $config['additional_fields']['email'] = ['user', 'email'];
-        $config['additional_fields']['title_front'] = ['user', 'title_front'];
-        $config['additional_fields']['title_rear'] = ['user', 'title_rear'];
-        $config['additional_fields']['course_name'] = [];
-        parent::configure($config);
-    }
-
-    public static function findByCourse($course_id)
-    {
-        $db = DBManager::get();
-        return $db->fetchAll("SELECT admission_seminar_user.*, aum.vorname,aum.nachname,aum.email,
-                             aum.username,ui.title_front,ui.title_rear
-                             FROM admission_seminar_user
-                             LEFT JOIN auth_user_md5 aum USING (user_id)
-                             LEFT JOIN user_info ui USING (user_id)
-                             WHERE seminar_id = ? ORDER BY position",
-                             [$course_id],
-                             __CLASS__ . '::buildExisting');
-    }
-
-    public static function findByUser($user_id)
-    {
-        $db = DBManager::get();
-        return $db->fetchAll("SELECT admission_seminar_user.*, seminare.Name as course_name
-                             FROM admission_seminar_user
-                             LEFT JOIN seminare USING (seminar_id)
-                             WHERE user_id = ? ORDER BY seminare.Name",
-                             [$user_id],
-                             __CLASS__ . '::buildExisting');
-    }
-
-    public function getUserFullname($format = 'full')
-    {
-        return User::build(array_merge(['motto' => ''], $this->toArray('vorname nachname username title_front title_rear')))->getFullName($format);
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findByUser($storage->user_id);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Wartelisten'), 'admission_seminar_user', $field_data);
-            }
-        }
-    }
-
-    /**
-     * @param string $course_id
-     * @param string $sort_status
-     * @param string $order_by
-     * @return array
-     */
-    public static function getAdmissionMembers(string $course_id, string $sort_status = 'autor', string $order_by = 'nachname asc'): array
-    {
-        [$order, $asc] = explode(' ', $order_by);
-        if ($order === 'nachname') {
-            $order_by = "nachname {$asc},vorname {$asc}";
-        }
-
-        $cs = CourseSet::getSetForCourse($course_id);
-        $claiming = [];
-        if (is_object($cs) && !$cs->hasAlgorithmRun()) {
-            foreach (AdmissionPriority::getPrioritiesByCourse($cs->getId(), $course_id) as $user_id => $p) {
-                $user = User::find($user_id);
-                $data = $user->toArray('user_id username vorname nachname email');
-                $data['fullname'] = $user->getFullName('full_rev');
-                $data['position'] = $cs->hasAdmissionRule('LimitedAdmission') ? $p : '-';
-                $data['visible'] = 'unknown';
-                $data['status'] = 'claiming';
-                $claiming[] = $data;
-            }
-        }
-
-        $query = "SELECT asu.user_id, username, Vorname, Nachname, Email, status,
-                         position, asu.mkdate, asu.visible, asu.comment,
-                         {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
-                  FROM admission_seminar_user AS asu
-                  JOIN auth_user_md5 USING (user_id)
-                  JOIN user_info USING (user_id)
-                  WHERE seminar_id = ?
-                  ORDER BY position, Nachname";
-        $st = DBManager::get()->prepare($query);
-        $st->execute([$course_id]);
-        $application_members = SimpleCollection::createFromArray(array_merge($claiming, $st->fetchAll(PDO::FETCH_ASSOC)));
-        $filtered_members = [];
-        foreach (['awaiting', 'accepted', 'claiming'] as $status) {
-            $filtered_members[$status] = $application_members->findBy('status', $status);
-            if ($status === $sort_status) {
-                $filtered_members[$status]->orderBy($order_by, $order !== 'nachname' ? SORT_NUMERIC : SORT_LOCALE_STRING);
-            }
-        }
-        return $filtered_members;
-    }
-
-    /**
-     * returns the position for a user on a waiting list
-     *
-     * if the user is not found false is returned, return true if the user is found but
-     * no position is available
-     *
-     * @param        string $user_id user_id
-     * @param        string $seminar_id seminar_id
-     * @return       bool position in waiting list or false if not found
-     *
-     */
-    public static function checkMemberPosition(string $user_id, string $seminar_id): bool
-    {
-        $position = DBManager::get()->fetchColumn("SELECT IFNULL(position, 'na')
-              FROM admission_seminar_user
-              WHERE user_id = ? AND seminar_id = ? AND status = 'awaiting'",
-            [$user_id, $seminar_id]
-        );
-
-        return $position === 'na';
-    }
-
-    /**
-     * @param string $seminar_id
-     * @param string $send_message
-     * @return void
-     * @throws NotificationVetoException
-     */
-    public static function addMembers(string $seminar_id, bool $send_message = true): void
-    {
-        $messaging = new messaging;
-
-        //Daten holen / Abfrage ob ueberhaupt begrenzt
-        $seminar = Seminar::GetInstance($seminar_id, true);
-
-        if($seminar->isAdmissionEnabled()){
-            $sem_preliminary = ($seminar->admission_prelim == 1);
-            $cs = $seminar->getCourseSet();
-            //Veranstaltung einfach auffuellen (nach Lostermin und Ende der Kontingentierung)
-            if (!$seminar->admission_disable_waitlist_move && $cs->hasAlgorithmRun()) {
-                $count = (int)$seminar->getFreeAdmissionSeats();
-                $memberships = self::findBySQL(
-                    "seminar_id = ? AND status = 'awaiting' ORDER BY position LIMIT {$count}",
-                    [$seminar_id]
-                );
-                $log_message = 'Wurde automatisch aus der Warteliste in die Veranstaltung eingetragen.';
-                foreach ($memberships as $membership) {
-                    if (!$sem_preliminary) {
-                        $affected = CourseMember::insertCourseMember($seminar_id, $membership->user_id, 'autor', false, false, $log_message);
-                    } else {
-                        $membership->status = 'accepted';
-                        $affected = $membership->store();
-                        StudipLog::log('SEM_USER_ADD', $seminar->getId(), $membership->user_id,'accepted', $log_message);
-                    }
-                    if ($affected) {
-                        //User benachrichtigen
-                        if ($send_message) {
-                            setTempLanguage($membership->user_id);
-                            if (!$sem_preliminary) {
-                                $message = sprintf (_('Sie sind in die Veranstaltung **%s (%s)** eingetragen worden, da für Sie ein Platz frei geworden ist. Damit sind Sie für die Teilnahme an der Veranstaltung zugelassen. Ab sofort finden Sie die Veranstaltung in der Übersicht Ihrer Veranstaltungen.'), $seminar->getName(), $seminar->getFormattedTurnus(true));
-                            } else {
-                                $message = sprintf (_('Sie haben den Status vorläufig akzeptiert in der Veranstaltung **%s (%s)** erhalten, da für Sie ein Platz frei geworden ist.'), $seminar->getName(), $seminar->getFormattedTurnus(true));
-                            }
-                            $subject = sprintf(_("Teilnahme an der Veranstaltung %s"), $seminar->getName());
-                            restoreLanguage();
-
-                            $messaging->insert_message($message, $membership->username, '____%system%____', false, false, '1', false, $subject, true);
-                        }
-                    }
-                }
-                //Warteposition der restlichen User neu eintragen
-                AdmissionApplication::renumberAdmission($seminar_id, FALSE);
-            }
-            $seminar->restore();
-        }
-    }
-
-    /**
-     * Renumber admissions
-     * @param string $seminar_id
-     * @param bool $send_message
-     * @return void
-     */
-    public static function renumberAdmission (string $seminar_id, bool $send_message = true): void
-    {
-        $messaging = new messaging;
-        $seminar = Seminar::GetInstance($seminar_id);
-        if ($seminar->isAdmissionEnabled()) {
-            $admission_users = self::findBySQL(
-                "seminar_id = ? AND status = 'awaiting' ORDER BY position",
-                [$seminar->id]
-            );
-            $position = 1;
-            foreach ($admission_users as $admission) {
-                $admission->position = $position;
-                if ($admission->store() && Config::get()->NOTIFY_ON_WAITLIST_ADVANCE && $send_message) {
-                    $username = $admission->user->username;
-                    setTempLanguage($admission->user_id);
-                    $message = sprintf(_('Sie sind auf der Warteliste der Veranstaltung **%s (%s)** hochgestuft worden. Sie stehen zur Zeit auf Position %s.'),
-                        $seminar->name,
-                        $seminar->getFormattedTurnus(),
-                        $position);
-                    $subject = sprintf(_('Ihre Position auf der Warteliste der Veranstaltung %s wurde verändert'), $seminar->name);
-                    restoreLanguage();
-
-                    $messaging->insert_message($message, $username, '____%system%____', FALSE, FALSE, '1', FALSE, $subject);
-                }
-                $position += 1;
-            }
-        }
-    }
-
-
-    /**
-     * Prepare data for member export
-     * @return array
-     */
-    public function getExportData(): array
-    {
-        $user = $this->user;
-        $studycourse = [];
-        $user->studycourses->map(function($sc) use (&$studycourse) {
-            $studycourse[]= $sc->studycourse->name .  ',' . $sc->degree->name . ',' . $sc->semester;
-        });
-        return [
-            'status' => $this->status,
-            'salutation' => $user->salutation,
-            'Titel' => $user->title_front,
-            'Vorname' => $this->vorname,
-            'Nachname' => $this->nachname,
-            'Titel2' => $user->title_rear,
-            'username' => $this->username,
-            'privadr' => $user->privadr,
-            'privatnr' => $user->privatnr,
-            'Email' => $this->email,
-            'Anmeldedatum' => date('d.m.Y H:i:s', $this->mkdate),
-            'Matrikelnummer' => $user->matriculation_number,
-            'studiengaenge' => implode(';', $studycourse),
-            'position' => $this->position,
-        ];
-    }
-}
diff --git a/lib/models/AdmissionApplication.php b/lib/models/AdmissionApplication.php
new file mode 100644
index 0000000..02514ec
--- /dev/null
+++ b/lib/models/AdmissionApplication.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * AdmissionApplication.class.php
+ * model class for table admission_seminar_user
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $user_id database column
+ * @property string $seminar_id database column
+ * @property string $status database column
+ * @property int $mkdate database column
+ * @property int|null $chdate database column
+ * @property int|null $position database column
+ * @property string $comment database column
+ * @property string $visible database column
+ * @property User $user belongs_to User
+ * @property Course $course belongs_to Course
+ * @property mixed $vorname additional field
+ * @property mixed $nachname additional field
+ * @property mixed $username additional field
+ * @property mixed $email additional field
+ * @property mixed $title_front additional field
+ * @property mixed $title_rear additional field
+ * @property mixed $course_name additional field
+ */
+class AdmissionApplication extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'admission_seminar_user';
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name' => Course::class,
+            'foreign_key' => 'seminar_id',
+        ];
+        $config['additional_fields']['vorname'] = ['user', 'vorname'];
+        $config['additional_fields']['nachname'] = ['user', 'nachname'];
+        $config['additional_fields']['username'] = ['user', 'username'];
+        $config['additional_fields']['email'] = ['user', 'email'];
+        $config['additional_fields']['title_front'] = ['user', 'title_front'];
+        $config['additional_fields']['title_rear'] = ['user', 'title_rear'];
+        $config['additional_fields']['course_name'] = [];
+        parent::configure($config);
+    }
+
+    public static function findByCourse($course_id)
+    {
+        $db = DBManager::get();
+        return $db->fetchAll("SELECT admission_seminar_user.*, aum.vorname,aum.nachname,aum.email,
+                             aum.username,ui.title_front,ui.title_rear
+                             FROM admission_seminar_user
+                             LEFT JOIN auth_user_md5 aum USING (user_id)
+                             LEFT JOIN user_info ui USING (user_id)
+                             WHERE seminar_id = ? ORDER BY position",
+                             [$course_id],
+                             __CLASS__ . '::buildExisting');
+    }
+
+    public static function findByUser($user_id)
+    {
+        $db = DBManager::get();
+        return $db->fetchAll("SELECT admission_seminar_user.*, seminare.Name as course_name
+                             FROM admission_seminar_user
+                             LEFT JOIN seminare USING (seminar_id)
+                             WHERE user_id = ? ORDER BY seminare.Name",
+                             [$user_id],
+                             __CLASS__ . '::buildExisting');
+    }
+
+    public function getUserFullname($format = 'full')
+    {
+        return User::build(array_merge(['motto' => ''], $this->toArray('vorname nachname username title_front title_rear')))->getFullName($format);
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findByUser($storage->user_id);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Wartelisten'), 'admission_seminar_user', $field_data);
+            }
+        }
+    }
+
+    /**
+     * @param string $course_id
+     * @param string $sort_status
+     * @param string $order_by
+     * @return array
+     */
+    public static function getAdmissionMembers(string $course_id, string $sort_status = 'autor', string $order_by = 'nachname asc'): array
+    {
+        [$order, $asc] = explode(' ', $order_by);
+        if ($order === 'nachname') {
+            $order_by = "nachname {$asc},vorname {$asc}";
+        }
+
+        $cs = CourseSet::getSetForCourse($course_id);
+        $claiming = [];
+        if (is_object($cs) && !$cs->hasAlgorithmRun()) {
+            foreach (AdmissionPriority::getPrioritiesByCourse($cs->getId(), $course_id) as $user_id => $p) {
+                $user = User::find($user_id);
+                $data = $user->toArray('user_id username vorname nachname email');
+                $data['fullname'] = $user->getFullName('full_rev');
+                $data['position'] = $cs->hasAdmissionRule('LimitedAdmission') ? $p : '-';
+                $data['visible'] = 'unknown';
+                $data['status'] = 'claiming';
+                $claiming[] = $data;
+            }
+        }
+
+        $query = "SELECT asu.user_id, username, Vorname, Nachname, Email, status,
+                         position, asu.mkdate, asu.visible, asu.comment,
+                         {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
+                  FROM admission_seminar_user AS asu
+                  JOIN auth_user_md5 USING (user_id)
+                  JOIN user_info USING (user_id)
+                  WHERE seminar_id = ?
+                  ORDER BY position, Nachname";
+        $st = DBManager::get()->prepare($query);
+        $st->execute([$course_id]);
+        $application_members = SimpleCollection::createFromArray(array_merge($claiming, $st->fetchAll(PDO::FETCH_ASSOC)));
+        $filtered_members = [];
+        foreach (['awaiting', 'accepted', 'claiming'] as $status) {
+            $filtered_members[$status] = $application_members->findBy('status', $status);
+            if ($status === $sort_status) {
+                $filtered_members[$status]->orderBy($order_by, $order !== 'nachname' ? SORT_NUMERIC : SORT_LOCALE_STRING);
+            }
+        }
+        return $filtered_members;
+    }
+
+    /**
+     * returns the position for a user on a waiting list
+     *
+     * if the user is not found false is returned, return true if the user is found but
+     * no position is available
+     *
+     * @param        string $user_id user_id
+     * @param        string $seminar_id seminar_id
+     * @return       bool position in waiting list or false if not found
+     *
+     */
+    public static function checkMemberPosition(string $user_id, string $seminar_id): bool
+    {
+        $position = DBManager::get()->fetchColumn("SELECT IFNULL(position, 'na')
+              FROM admission_seminar_user
+              WHERE user_id = ? AND seminar_id = ? AND status = 'awaiting'",
+            [$user_id, $seminar_id]
+        );
+
+        return $position === 'na';
+    }
+
+    /**
+     * @param string $seminar_id
+     * @param string $send_message
+     * @return void
+     * @throws NotificationVetoException
+     */
+    public static function addMembers(string $seminar_id, bool $send_message = true): void
+    {
+        $messaging = new messaging;
+
+        //Daten holen / Abfrage ob ueberhaupt begrenzt
+        $seminar = Seminar::GetInstance($seminar_id, true);
+
+        if($seminar->isAdmissionEnabled()){
+            $sem_preliminary = ($seminar->admission_prelim == 1);
+            $cs = $seminar->getCourseSet();
+            //Veranstaltung einfach auffuellen (nach Lostermin und Ende der Kontingentierung)
+            if (!$seminar->admission_disable_waitlist_move && $cs->hasAlgorithmRun()) {
+                $count = (int)$seminar->getFreeAdmissionSeats();
+                $memberships = self::findBySQL(
+                    "seminar_id = ? AND status = 'awaiting' ORDER BY position LIMIT {$count}",
+                    [$seminar_id]
+                );
+                $log_message = 'Wurde automatisch aus der Warteliste in die Veranstaltung eingetragen.';
+                foreach ($memberships as $membership) {
+                    if (!$sem_preliminary) {
+                        $affected = CourseMember::insertCourseMember($seminar_id, $membership->user_id, 'autor', false, false, $log_message);
+                    } else {
+                        $membership->status = 'accepted';
+                        $affected = $membership->store();
+                        StudipLog::log('SEM_USER_ADD', $seminar->getId(), $membership->user_id,'accepted', $log_message);
+                    }
+                    if ($affected) {
+                        //User benachrichtigen
+                        if ($send_message) {
+                            setTempLanguage($membership->user_id);
+                            if (!$sem_preliminary) {
+                                $message = sprintf (_('Sie sind in die Veranstaltung **%s (%s)** eingetragen worden, da für Sie ein Platz frei geworden ist. Damit sind Sie für die Teilnahme an der Veranstaltung zugelassen. Ab sofort finden Sie die Veranstaltung in der Übersicht Ihrer Veranstaltungen.'), $seminar->getName(), $seminar->getFormattedTurnus(true));
+                            } else {
+                                $message = sprintf (_('Sie haben den Status vorläufig akzeptiert in der Veranstaltung **%s (%s)** erhalten, da für Sie ein Platz frei geworden ist.'), $seminar->getName(), $seminar->getFormattedTurnus(true));
+                            }
+                            $subject = sprintf(_("Teilnahme an der Veranstaltung %s"), $seminar->getName());
+                            restoreLanguage();
+
+                            $messaging->insert_message($message, $membership->username, '____%system%____', false, false, '1', false, $subject, true);
+                        }
+                    }
+                }
+                //Warteposition der restlichen User neu eintragen
+                AdmissionApplication::renumberAdmission($seminar_id, FALSE);
+            }
+            $seminar->restore();
+        }
+    }
+
+    /**
+     * Renumber admissions
+     * @param string $seminar_id
+     * @param bool $send_message
+     * @return void
+     */
+    public static function renumberAdmission (string $seminar_id, bool $send_message = true): void
+    {
+        $messaging = new messaging;
+        $seminar = Seminar::GetInstance($seminar_id);
+        if ($seminar->isAdmissionEnabled()) {
+            $admission_users = self::findBySQL(
+                "seminar_id = ? AND status = 'awaiting' ORDER BY position",
+                [$seminar->id]
+            );
+            $position = 1;
+            foreach ($admission_users as $admission) {
+                $admission->position = $position;
+                if ($admission->store() && Config::get()->NOTIFY_ON_WAITLIST_ADVANCE && $send_message) {
+                    $username = $admission->user->username;
+                    setTempLanguage($admission->user_id);
+                    $message = sprintf(_('Sie sind auf der Warteliste der Veranstaltung **%s (%s)** hochgestuft worden. Sie stehen zur Zeit auf Position %s.'),
+                        $seminar->name,
+                        $seminar->getFormattedTurnus(),
+                        $position);
+                    $subject = sprintf(_('Ihre Position auf der Warteliste der Veranstaltung %s wurde verändert'), $seminar->name);
+                    restoreLanguage();
+
+                    $messaging->insert_message($message, $username, '____%system%____', FALSE, FALSE, '1', FALSE, $subject);
+                }
+                $position += 1;
+            }
+        }
+    }
+
+
+    /**
+     * Prepare data for member export
+     * @return array
+     */
+    public function getExportData(): array
+    {
+        $user = $this->user;
+        $studycourse = [];
+        $user->studycourses->map(function($sc) use (&$studycourse) {
+            $studycourse[]= $sc->studycourse->name .  ',' . $sc->degree->name . ',' . $sc->semester;
+        });
+        return [
+            'status' => $this->status,
+            'salutation' => $user->salutation,
+            'Titel' => $user->title_front,
+            'Vorname' => $this->vorname,
+            'Nachname' => $this->nachname,
+            'Titel2' => $user->title_rear,
+            'username' => $this->username,
+            'privadr' => $user->privadr,
+            'privatnr' => $user->privatnr,
+            'Email' => $this->email,
+            'Anmeldedatum' => date('d.m.Y H:i:s', $this->mkdate),
+            'Matrikelnummer' => $user->matriculation_number,
+            'studiengaenge' => implode(';', $studycourse),
+            'position' => $this->position,
+        ];
+    }
+}
diff --git a/lib/models/ArchivedCourse.class.php b/lib/models/ArchivedCourse.class.php
deleted file mode 100644
index 81879af..0000000
--- a/lib/models/ArchivedCourse.class.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * ArchivedCourse.class.php
- * model class for table archiv
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for seminar_id
- * @property string $seminar_id database column
- * @property string $name database column
- * @property string $untertitel database column
- * @property string $beschreibung database column
- * @property int $start_time database column
- * @property string $semester database column
- * @property string $heimat_inst_id database column
- * @property string $institute database column
- * @property string $dozenten database column
- * @property string $fakultaet database column
- * @property string $dump database column
- * @property string $archiv_file_id database column
- * @property string $archiv_protected_file_id database column
- * @property int $mkdate database column
- * @property string $forumdump database column
- * @property string|null $wikidump database column
- * @property string $studienbereiche database column
- * @property string $veranstaltungsnummer database column
- * @property SimpleORMapCollection|ArchivedCourseMember[] $members has_many ArchivedCourseMember
- * @property Institute $home_institut belongs_to Institute
- */
-
-class ArchivedCourse extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'archiv';
-
-        $config['has_many']['members'] = [
-            'class_name' => ArchivedCourseMember::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['belongs_to']['home_institut'] = [
-            'class_name'  => Institute::class,
-            'foreign_key' => 'heimat_inst_id',
-        ];
-
-        $config['registered_callbacks']['after_delete'][] = 'deleteFiles';
-
-        parent::configure($config);
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findThru($storage->user_id, [
-            'thru_table'        => 'archiv_user',
-            'thru_key'          => 'user_id',
-            'thru_assoc_key'    => 'Seminar_id',
-            'assoc_foreign_key' => 'Seminar_id',
-        ]);
-        if ($sorm) {
-            $limit = 'seminar_id name untertitel beschreibung start_time '
-                   . 'semester heimat_inst_id institute dozenten fakultaet '
-                   . 'archiv_file_id archiv_protected_file_id mkdate '
-                   . 'studienbereiche VeranstaltungsNummer';
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray($limit);
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('archivierte Seminare'), 'archiv', $field_data);
-            }
-        }
-    }
-
-    /**
-     * delete data files belonging to this archived course
-     *
-     * @return int number of deleted files
-     */
-    public function deleteFiles()
-    {
-        $ok = 0;
-        if ($this->archiv_file_id) {
-            $ok += unlink($GLOBALS['ARCHIV_PATH'] . '/' . basename($this->archiv_file_id));
-        }
-        if ($this->archiv_protected_file_id) {
-            $ok += unlink($GLOBALS['ARCHIV_PATH'] . '/' . basename($this->archiv_protected_file_id));
-        }
-        return $ok;
-    }
-}
diff --git a/lib/models/ArchivedCourse.php b/lib/models/ArchivedCourse.php
new file mode 100644
index 0000000..81879af
--- /dev/null
+++ b/lib/models/ArchivedCourse.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * ArchivedCourse.class.php
+ * model class for table archiv
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for seminar_id
+ * @property string $seminar_id database column
+ * @property string $name database column
+ * @property string $untertitel database column
+ * @property string $beschreibung database column
+ * @property int $start_time database column
+ * @property string $semester database column
+ * @property string $heimat_inst_id database column
+ * @property string $institute database column
+ * @property string $dozenten database column
+ * @property string $fakultaet database column
+ * @property string $dump database column
+ * @property string $archiv_file_id database column
+ * @property string $archiv_protected_file_id database column
+ * @property int $mkdate database column
+ * @property string $forumdump database column
+ * @property string|null $wikidump database column
+ * @property string $studienbereiche database column
+ * @property string $veranstaltungsnummer database column
+ * @property SimpleORMapCollection|ArchivedCourseMember[] $members has_many ArchivedCourseMember
+ * @property Institute $home_institut belongs_to Institute
+ */
+
+class ArchivedCourse extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'archiv';
+
+        $config['has_many']['members'] = [
+            'class_name' => ArchivedCourseMember::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['belongs_to']['home_institut'] = [
+            'class_name'  => Institute::class,
+            'foreign_key' => 'heimat_inst_id',
+        ];
+
+        $config['registered_callbacks']['after_delete'][] = 'deleteFiles';
+
+        parent::configure($config);
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findThru($storage->user_id, [
+            'thru_table'        => 'archiv_user',
+            'thru_key'          => 'user_id',
+            'thru_assoc_key'    => 'Seminar_id',
+            'assoc_foreign_key' => 'Seminar_id',
+        ]);
+        if ($sorm) {
+            $limit = 'seminar_id name untertitel beschreibung start_time '
+                   . 'semester heimat_inst_id institute dozenten fakultaet '
+                   . 'archiv_file_id archiv_protected_file_id mkdate '
+                   . 'studienbereiche VeranstaltungsNummer';
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray($limit);
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('archivierte Seminare'), 'archiv', $field_data);
+            }
+        }
+    }
+
+    /**
+     * delete data files belonging to this archived course
+     *
+     * @return int number of deleted files
+     */
+    public function deleteFiles()
+    {
+        $ok = 0;
+        if ($this->archiv_file_id) {
+            $ok += unlink($GLOBALS['ARCHIV_PATH'] . '/' . basename($this->archiv_file_id));
+        }
+        if ($this->archiv_protected_file_id) {
+            $ok += unlink($GLOBALS['ARCHIV_PATH'] . '/' . basename($this->archiv_protected_file_id));
+        }
+        return $ok;
+    }
+}
diff --git a/lib/models/ArchivedCourseMember.class.php b/lib/models/ArchivedCourseMember.class.php
deleted file mode 100644
index 1febd35..0000000
--- a/lib/models/ArchivedCourseMember.class.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * ArchivedCourseMember.class.php
- * model class for table seminar_user
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $seminar_id database column
- * @property string $user_id database column
- * @property string $status database column
- * @property User $user belongs_to User
- * @property ArchivedCourse $course belongs_to ArchivedCourse
- */
-class ArchivedCourseMember extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'archiv_user';
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name' => ArchivedCourse::class,
-            'foreign_key' => 'seminar_id',
-        ];
-        parent::configure($config);
-    }
-
-    public static function findByCourse($course_id)
-    {
-        return self::findBySeminar_id($course_id);
-    }
-
-    public static function findByUser($user_id)
-    {
-        return self::findByUser_id($user_id);
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('archivierte SeminareUser'), 'archiv_user', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/ArchivedCourseMember.php b/lib/models/ArchivedCourseMember.php
new file mode 100644
index 0000000..1febd35
--- /dev/null
+++ b/lib/models/ArchivedCourseMember.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * ArchivedCourseMember.class.php
+ * model class for table seminar_user
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $seminar_id database column
+ * @property string $user_id database column
+ * @property string $status database column
+ * @property User $user belongs_to User
+ * @property ArchivedCourse $course belongs_to ArchivedCourse
+ */
+class ArchivedCourseMember extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'archiv_user';
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name' => ArchivedCourse::class,
+            'foreign_key' => 'seminar_id',
+        ];
+        parent::configure($config);
+    }
+
+    public static function findByCourse($course_id)
+    {
+        return self::findBySeminar_id($course_id);
+    }
+
+    public static function findByUser($user_id)
+    {
+        return self::findByUser_id($user_id);
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('archivierte SeminareUser'), 'archiv_user', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/AuthUserMd5.class.php b/lib/models/AuthUserMd5.class.php
deleted file mode 100644
index 48e27f8..0000000
--- a/lib/models/AuthUserMd5.class.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * AuthUserMd5.class.php
- * model class for table auth_user_md5
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for user_id
- * @property string $user_id database column
- * @property string $username database column
- * @property string $password database column
- * @property string $perms database column
- * @property string $vorname database column
- * @property string $nachname database column
- * @property string $email database column
- * @property string $validation_key database column
- * @property string|null $auth_plugin database column
- * @property int $locked database column
- * @property string|null $lock_comment database column
- * @property string|null $locked_by database column
- * @property string $visible database column
- */
-
-class AuthUserMd5 extends SimpleORMap
-{
-    /**
-     * @param array $config
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'auth_user_md5';
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/AuthUserMd5.php b/lib/models/AuthUserMd5.php
new file mode 100644
index 0000000..48e27f8
--- /dev/null
+++ b/lib/models/AuthUserMd5.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * AuthUserMd5.class.php
+ * model class for table auth_user_md5
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for user_id
+ * @property string $user_id database column
+ * @property string $username database column
+ * @property string $password database column
+ * @property string $perms database column
+ * @property string $vorname database column
+ * @property string $nachname database column
+ * @property string $email database column
+ * @property string $validation_key database column
+ * @property string|null $auth_plugin database column
+ * @property int $locked database column
+ * @property string|null $lock_comment database column
+ * @property string|null $locked_by database column
+ * @property string $visible database column
+ */
+
+class AuthUserMd5 extends SimpleORMap
+{
+    /**
+     * @param array $config
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'auth_user_md5';
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/Banner.class.php b/lib/models/Banner.class.php
deleted file mode 100644
index a418760..0000000
--- a/lib/models/Banner.class.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/**
- * banner.php - model class for the banner administration
- *
- * 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.
- *
- * @author      Nico Müller <nico.mueller@uni-oldenburg.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     admin
- * @since       2.4
- *
- * @property string $id alias column for ad_id
- * @property string $ad_id database column
- * @property string $banner_path database column
- * @property string|null $description database column
- * @property string|null $alttext database column
- * @property string $target_type database column
- * @property string $target database column
- * @property int $startdate database column
- * @property int $enddate database column
- * @property int $priority database column
- * @property int $views database column
- * @property int $clicks database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|BannerRoles[] $banner_roles has_many BannerRoles
- */
-
-class Banner extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'banner_ads';
-
-        $config['has_many']['banner_roles'] = [
-            'class_name' => BannerRoles::class,
-            'assoc_foreign_key' => 'ad_id',
-            'on_delete' => 'delete'
-        ];
-
-        parent::configure($config);
-    }
-
-    /**
-     * Returns a random banner
-     */
-    public static function getRandomBanner()
-    {
-        $query = "SELECT ad_id, priority, startdate, enddate
-                  FROM banner_ads
-                  WHERE priority > 0
-                    AND (startdate = 0 OR startdate < UNIX_TIMESTAMP())
-                    AND (enddate = 0 OR enddate > UNIX_TIMESTAMP())";
-        $statement = DBManager::get()->query($query);
-
-        // array that contains banner ids and an offset
-        // offsets start with 0 and increase by pow(2, priority)
-        // a random number between 0 and sum(pow(2,priorities)) is
-        // drawn and the banner with the highest offset smaller than
-        // this number is chosen
-
-        $banners = [];
-        $sum = 0;
-        // collect banners to consider, build banners array
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            if (BannerRoles::checkUserAccess($row['ad_id'])) {
-                $sum += pow(2, $row['priority']);
-                $banners[] = [
-                    'ad_id'  => $row['ad_id'],
-                    'offset' => $sum
-                ];
-            }
-        }
-
-        // draw random number and select banner
-        $x = mt_rand(0, $sum);
-        $ad_id = false;
-        foreach ($banners as $i) {
-            if ($i['offset'] >= $x) {
-                $ad_id = $i['ad_id'];
-                break;
-            }
-        }
-
-        return new Banner($ad_id);
-    }
-
-    /**
-     * Get all banners
-     *
-     * @return  array() list of banners
-     */
-    public static function getAllBanners()
-    {
-        $query = "SELECT ad_id FROM banner_ads ORDER BY priority DESC";
-        $statement = DBManager::get()->query($query);
-        $ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-        $banners = [];
-        foreach ($ids as $id) {
-            $banners[$id] = new Banner($id);
-        }
-        return $banners;
-    }
-
-    /**
-     * delete entry from database
-     * the object is cleared and turned to new state
-     * @return boolean
-     */
-    public function delete()
-    {
-        if (!$this->isNew()) {
-            // Remove banner file
-            unlink($GLOBALS['DYNAMIC_CONTENT_PATH'] . '/banner/' . $this->banner_path);
-        }
-        return parent::delete();
-    }
-
-    /*
-     * Check the priority for a banner
-     * @param Int $prio priority (1-10)
-     * @return
-     */
-    public function getViewProbability()
-    {
-        static $computed = false, $sum = null;
-
-        if ($this->priority == 0) {
-            return '--';
-        }
-
-        if ($computed === false) {
-            $sum = DBManager::get()->query("SELECT SUM(POW(2, priority)) FROM banner_ads WHERE priority > 0")
-                                   ->fetchColumn();
-            $computed = true;
-        }
-//        return '1/' . (1 / (pow(2, $prio) / $sum));
-        return number_format(100 / (1 / (pow(2, $this->priority) / $sum)), 2, ',', '.') . '%';
-    }
-
-
-    /**
-     * Returns the appropriate link for this banner.
-     *
-     * @return string
-     */
-    public function getLink($internal = false)
-    {
-        if ($this->isNew()) {
-            return '';
-        }
-
-        if ($internal) {
-            return URLHelper::getLink('dispatch.php/banner/click/' . $this->ad_id);
-        }
-
-        if ($this->target_type === 'url') {
-            return $this->target;
-        }
-        if ($this->target_type === 'seminar') {
-            return URLHelper::getLink('dispatch.php/course/details/', ['sem_id' => $this->target]);
-        }
-        if ($this->target_type === 'user') {
-            return URLHelper::getLink('dispatch.php/profile', ['username' => $this->target]);
-        }
-        if ($this->target_type === 'inst') {
-            return URLHelper::getLink(
-                'dispatch.php/institute/overview',
-                ['auswahl' => $this->target]
-            );
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns the img-tag for this banner
-     *
-     * @return string
-     */
-    public function toImg($attributes = [])
-    {
-        $attr = [
-            'src'    => $GLOBALS['DYNAMIC_CONTENT_URL'] . '/banner/' . $this->banner_path,
-            'border' => '0',
-        ];
-        if ($this->alttext) {
-            $attr['title'] = $attr['alt'] = $this->alttext;
-        }
-        $attr = array_merge($attr, $attributes);
-
-        $attr_string = '';
-        foreach ($attr as $key => $value) {
-            $attr_string .= sprintf(' %s="%s"', $key, htmlReady($value));
-        }
-
-        return '<img' . $attr_string . '>';
-    }
-
-    /**
-     * Returns the complete html (link + img) for this banner
-     *
-     * @return string
-     */
-    public function toHTML($internal = true)
-    {
-        if ($this->isNew()) {
-            return '';
-        }
-
-        if ($this->target_type === 'url') {
-            $template = '<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>';
-        } elseif ($this->target_type === 'none') {
-            $template = '%2$s';
-        } else {
-            $template = '<a href="%s">%s</a>';
-        }
-
-        $link = sprintf($template, $this->getLink($internal), $this->toImg());
-
-        $this->views += 1;
-        $this->store();
-
-        return sprintf('<div class="studip-banner">%s</div>', $link);
-   }
-}
diff --git a/lib/models/Banner.php b/lib/models/Banner.php
new file mode 100644
index 0000000..a418760
--- /dev/null
+++ b/lib/models/Banner.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * banner.php - model class for the banner administration
+ *
+ * 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.
+ *
+ * @author      Nico Müller <nico.mueller@uni-oldenburg.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     admin
+ * @since       2.4
+ *
+ * @property string $id alias column for ad_id
+ * @property string $ad_id database column
+ * @property string $banner_path database column
+ * @property string|null $description database column
+ * @property string|null $alttext database column
+ * @property string $target_type database column
+ * @property string $target database column
+ * @property int $startdate database column
+ * @property int $enddate database column
+ * @property int $priority database column
+ * @property int $views database column
+ * @property int $clicks database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|BannerRoles[] $banner_roles has_many BannerRoles
+ */
+
+class Banner extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'banner_ads';
+
+        $config['has_many']['banner_roles'] = [
+            'class_name' => BannerRoles::class,
+            'assoc_foreign_key' => 'ad_id',
+            'on_delete' => 'delete'
+        ];
+
+        parent::configure($config);
+    }
+
+    /**
+     * Returns a random banner
+     */
+    public static function getRandomBanner()
+    {
+        $query = "SELECT ad_id, priority, startdate, enddate
+                  FROM banner_ads
+                  WHERE priority > 0
+                    AND (startdate = 0 OR startdate < UNIX_TIMESTAMP())
+                    AND (enddate = 0 OR enddate > UNIX_TIMESTAMP())";
+        $statement = DBManager::get()->query($query);
+
+        // array that contains banner ids and an offset
+        // offsets start with 0 and increase by pow(2, priority)
+        // a random number between 0 and sum(pow(2,priorities)) is
+        // drawn and the banner with the highest offset smaller than
+        // this number is chosen
+
+        $banners = [];
+        $sum = 0;
+        // collect banners to consider, build banners array
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            if (BannerRoles::checkUserAccess($row['ad_id'])) {
+                $sum += pow(2, $row['priority']);
+                $banners[] = [
+                    'ad_id'  => $row['ad_id'],
+                    'offset' => $sum
+                ];
+            }
+        }
+
+        // draw random number and select banner
+        $x = mt_rand(0, $sum);
+        $ad_id = false;
+        foreach ($banners as $i) {
+            if ($i['offset'] >= $x) {
+                $ad_id = $i['ad_id'];
+                break;
+            }
+        }
+
+        return new Banner($ad_id);
+    }
+
+    /**
+     * Get all banners
+     *
+     * @return  array() list of banners
+     */
+    public static function getAllBanners()
+    {
+        $query = "SELECT ad_id FROM banner_ads ORDER BY priority DESC";
+        $statement = DBManager::get()->query($query);
+        $ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+        $banners = [];
+        foreach ($ids as $id) {
+            $banners[$id] = new Banner($id);
+        }
+        return $banners;
+    }
+
+    /**
+     * delete entry from database
+     * the object is cleared and turned to new state
+     * @return boolean
+     */
+    public function delete()
+    {
+        if (!$this->isNew()) {
+            // Remove banner file
+            unlink($GLOBALS['DYNAMIC_CONTENT_PATH'] . '/banner/' . $this->banner_path);
+        }
+        return parent::delete();
+    }
+
+    /*
+     * Check the priority for a banner
+     * @param Int $prio priority (1-10)
+     * @return
+     */
+    public function getViewProbability()
+    {
+        static $computed = false, $sum = null;
+
+        if ($this->priority == 0) {
+            return '--';
+        }
+
+        if ($computed === false) {
+            $sum = DBManager::get()->query("SELECT SUM(POW(2, priority)) FROM banner_ads WHERE priority > 0")
+                                   ->fetchColumn();
+            $computed = true;
+        }
+//        return '1/' . (1 / (pow(2, $prio) / $sum));
+        return number_format(100 / (1 / (pow(2, $this->priority) / $sum)), 2, ',', '.') . '%';
+    }
+
+
+    /**
+     * Returns the appropriate link for this banner.
+     *
+     * @return string
+     */
+    public function getLink($internal = false)
+    {
+        if ($this->isNew()) {
+            return '';
+        }
+
+        if ($internal) {
+            return URLHelper::getLink('dispatch.php/banner/click/' . $this->ad_id);
+        }
+
+        if ($this->target_type === 'url') {
+            return $this->target;
+        }
+        if ($this->target_type === 'seminar') {
+            return URLHelper::getLink('dispatch.php/course/details/', ['sem_id' => $this->target]);
+        }
+        if ($this->target_type === 'user') {
+            return URLHelper::getLink('dispatch.php/profile', ['username' => $this->target]);
+        }
+        if ($this->target_type === 'inst') {
+            return URLHelper::getLink(
+                'dispatch.php/institute/overview',
+                ['auswahl' => $this->target]
+            );
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns the img-tag for this banner
+     *
+     * @return string
+     */
+    public function toImg($attributes = [])
+    {
+        $attr = [
+            'src'    => $GLOBALS['DYNAMIC_CONTENT_URL'] . '/banner/' . $this->banner_path,
+            'border' => '0',
+        ];
+        if ($this->alttext) {
+            $attr['title'] = $attr['alt'] = $this->alttext;
+        }
+        $attr = array_merge($attr, $attributes);
+
+        $attr_string = '';
+        foreach ($attr as $key => $value) {
+            $attr_string .= sprintf(' %s="%s"', $key, htmlReady($value));
+        }
+
+        return '<img' . $attr_string . '>';
+    }
+
+    /**
+     * Returns the complete html (link + img) for this banner
+     *
+     * @return string
+     */
+    public function toHTML($internal = true)
+    {
+        if ($this->isNew()) {
+            return '';
+        }
+
+        if ($this->target_type === 'url') {
+            $template = '<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>';
+        } elseif ($this->target_type === 'none') {
+            $template = '%2$s';
+        } else {
+            $template = '<a href="%s">%s</a>';
+        }
+
+        $link = sprintf($template, $this->getLink($internal), $this->toImg());
+
+        $this->views += 1;
+        $this->store();
+
+        return sprintf('<div class="studip-banner">%s</div>', $link);
+   }
+}
diff --git a/lib/models/BannerRoles.class.php b/lib/models/BannerRoles.class.php
deleted file mode 100644
index d1c2986..0000000
--- a/lib/models/BannerRoles.class.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * BannerRoles.class.php - model class for the banner roles
- *
- * 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.
- *
- * @author      Sebastian Biller <s.biller@tu-braunschweig.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     admin
- * @since       5.1
- *
- * @property array $id alias for pk
- * @property string $ad_id database column
- * @property int $roleid database column
- * @property Banner $banner_ads belongs_to Banner
- */
-
-class BannerRoles extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'banner_roles';
-
-        $config['belongs_to']['banner_ads'] = [
-            'class_name'  => Banner::class,
-            'foreign_key' => 'ad_id',
-        ];
-
-        parent::configure($config);
-    }
-
-    public static function checkUserAccess($ad_id, $user_id = null)
-    {
-        $user_id = $user_id ?: $GLOBALS['user']->id;
-        $banner_roles = self::getRoles($ad_id);
-        $user_roles = RolePersistence::getAssignedRoles($user_id, true);
-
-        if (!$banner_roles) {
-            return true;
-        }
-
-        foreach ($banner_roles as $banner_role) {
-            foreach ($user_roles as $user_role) {
-                if ($banner_role->getRoleid() === $user_role->getRoleid()) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public static function getRoles($ad_id)
-    {
-        $banner_roles = self::findByad_id($ad_id);
-        $banner_role_ids = [];
-        foreach ($banner_roles as $banner_role) {
-            $banner_role_ids[] = $banner_role['roleid'];
-        }
-
-        $only_system_roles = Config::get()->BANNER_ONLY_SYSTEM_ROLES;
-        $roles = RolePersistence::getAllRoles();
-        $re = [];
-        foreach ($banner_role_ids as $role_id) {
-            if (isset($roles[$role_id])) {
-                if ($only_system_roles && !$roles[$role_id]->getSystemtype()) {
-                    continue;
-                }
-                $re[$role_id] = $roles[$role_id];
-            }
-        }
-        return $re;
-    }
-
-    public static function getAvailableRoles($ad_id = null)
-    {
-        $banner_role_ids = [];
-        if ($ad_id) {
-            $banner_roles = self::findByad_id($ad_id);
-            foreach ($banner_roles as $banner_role) {
-                $banner_role_ids[] = $banner_role['roleid'];
-            }
-        }
-
-        $only_system_roles = Config::get()->BANNER_ONLY_SYSTEM_ROLES;
-        $roles = RolePersistence::getAllRoles();
-        $rolesStats = RolePersistence::getStatistics();
-        $re = [];
-        foreach ($roles as $key => $role) {
-            if (!in_array($key, $banner_role_ids)) {
-                if ($only_system_roles && !$role->getSystemtype()) {
-                    continue;
-                }
-                if ($rolesStats[$role->getRoleid()]['explicit'] + $rolesStats[$role->getRoleid()]['implicit'] == 0) {
-                    continue;
-                }
-                $re[$key] = $role;
-            }
-        }
-
-        return $re;
-    }
-
-    public static function update($ad_id, $new_roles)
-    {
-        self::deleteByAd_id($ad_id);
-
-        if ($new_roles) {
-            foreach ($new_roles as $new_role) {
-                $BannerRoles = new self();
-                $BannerRoles->ad_id = $ad_id;
-                $BannerRoles->roleid = $new_role;
-                $BannerRoles->store();
-            }
-        }
-    }
-}
diff --git a/lib/models/BannerRoles.php b/lib/models/BannerRoles.php
new file mode 100644
index 0000000..d1c2986
--- /dev/null
+++ b/lib/models/BannerRoles.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * BannerRoles.class.php - model class for the banner roles
+ *
+ * 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.
+ *
+ * @author      Sebastian Biller <s.biller@tu-braunschweig.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     admin
+ * @since       5.1
+ *
+ * @property array $id alias for pk
+ * @property string $ad_id database column
+ * @property int $roleid database column
+ * @property Banner $banner_ads belongs_to Banner
+ */
+
+class BannerRoles extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'banner_roles';
+
+        $config['belongs_to']['banner_ads'] = [
+            'class_name'  => Banner::class,
+            'foreign_key' => 'ad_id',
+        ];
+
+        parent::configure($config);
+    }
+
+    public static function checkUserAccess($ad_id, $user_id = null)
+    {
+        $user_id = $user_id ?: $GLOBALS['user']->id;
+        $banner_roles = self::getRoles($ad_id);
+        $user_roles = RolePersistence::getAssignedRoles($user_id, true);
+
+        if (!$banner_roles) {
+            return true;
+        }
+
+        foreach ($banner_roles as $banner_role) {
+            foreach ($user_roles as $user_role) {
+                if ($banner_role->getRoleid() === $user_role->getRoleid()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public static function getRoles($ad_id)
+    {
+        $banner_roles = self::findByad_id($ad_id);
+        $banner_role_ids = [];
+        foreach ($banner_roles as $banner_role) {
+            $banner_role_ids[] = $banner_role['roleid'];
+        }
+
+        $only_system_roles = Config::get()->BANNER_ONLY_SYSTEM_ROLES;
+        $roles = RolePersistence::getAllRoles();
+        $re = [];
+        foreach ($banner_role_ids as $role_id) {
+            if (isset($roles[$role_id])) {
+                if ($only_system_roles && !$roles[$role_id]->getSystemtype()) {
+                    continue;
+                }
+                $re[$role_id] = $roles[$role_id];
+            }
+        }
+        return $re;
+    }
+
+    public static function getAvailableRoles($ad_id = null)
+    {
+        $banner_role_ids = [];
+        if ($ad_id) {
+            $banner_roles = self::findByad_id($ad_id);
+            foreach ($banner_roles as $banner_role) {
+                $banner_role_ids[] = $banner_role['roleid'];
+            }
+        }
+
+        $only_system_roles = Config::get()->BANNER_ONLY_SYSTEM_ROLES;
+        $roles = RolePersistence::getAllRoles();
+        $rolesStats = RolePersistence::getStatistics();
+        $re = [];
+        foreach ($roles as $key => $role) {
+            if (!in_array($key, $banner_role_ids)) {
+                if ($only_system_roles && !$role->getSystemtype()) {
+                    continue;
+                }
+                if ($rolesStats[$role->getRoleid()]['explicit'] + $rolesStats[$role->getRoleid()]['implicit'] == 0) {
+                    continue;
+                }
+                $re[$key] = $role;
+            }
+        }
+
+        return $re;
+    }
+
+    public static function update($ad_id, $new_roles)
+    {
+        self::deleteByAd_id($ad_id);
+
+        if ($new_roles) {
+            foreach ($new_roles as $new_role) {
+                $BannerRoles = new self();
+                $BannerRoles->ad_id = $ad_id;
+                $BannerRoles->roleid = $new_role;
+                $BannerRoles->store();
+            }
+        }
+    }
+}
diff --git a/lib/models/Clipboard.class.php b/lib/models/Clipboard.class.php
deleted file mode 100644
index cd8fe89..0000000
--- a/lib/models/Clipboard.class.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-
-
-/**
- * Clipboard.class.php - model class for a clipboard (Merkzettel)
- *
- * The Clipboard class extends the wish list functionality of the clipboard
- * in the old literature management to allow it to be used in other areas of the
- * Stud.IP system. Furthermore, clipboards managed by this class
- * are stored permanently in the database until they are deleted.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- *
- * The "allowed_item_class" column containts the StudipItem class
- * name where items have to be children of in order to be used
- * with the clipboard.
- * This attribute defaults to 'StudipItem' which means that by default
- * all implementations of StudipItem can be inserted into a clipboard.
- * If only items of a special implementation of StudipItem shall be
- * able to be inserted into the clipboard this attribute has to be set
- * to the class name of that implementation.
- *
- * @property int $id database column
- * @property string $user_id database column
- * @property string $name database column
- * @property string $handler database column
- * @property string $allowed_item_class database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|ClipboardItem[] $items has_many ClipboardItem
- * @property User $user belongs_to User
- */
-class Clipboard extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'clipboards';
-
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['has_many']['items'] = [
-            'class_name' => ClipboardItem::class,
-            'assoc_foreign_key' => 'clipboard_id',
-            'on_delete' => 'delete',
-            'on_store' => 'store'
-        ];
-
-        parent::configure($config);
-    }
-
-
-    /**
-     * This class returns all clipboards for a specified user,
-     * optionally filtered by required item range types.
-     *
-     * @param string $user_id: The ID of the user whose clipboards
-     *     shall be returned.
-     * @param array $item_range_types: The range types which at least one item
-     *     of the clipboard must have to be included in the result set.
-     *
-     * @returns Clipboard[] An array of clipboard objects which are
-     *     associated with the user specified by $user_id.
-     */
-    public static function getClipboardsForUser($user_id = '', $item_range_types = [])
-    {
-        if (!$user_id) {
-            return [];
-        }
-
-        if (is_array($item_range_types) and count($item_range_types) > 0) {
-            return self::findBySql(
-                "INNER JOIN clipboard_items
-                ON clipboards.id = clipboard_items.clipboard_id
-                WHERE
-                clipboards.user_id = :user_id
-                AND
-                clipboard_items.range_type IN ( :range_types )
-                GROUP BY clipboards.id ORDER BY name ASC, mkdate ASC",
-                [
-                    'user_id' => $user_id,
-                    'range_types' => $item_range_types
-                ]
-            );
-        } else {
-            return self::findBySql(
-                'user_id = :user_id ORDER BY name ASC, mkdate ASC',
-                [
-                    'user_id' => $user_id
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * Adds an item to the clipboard by specifying the
-     * ID of the object that shall be added to it.
-     *
-     * @param string $range_id The ID of the object that shall be added.
-     *
-     * @throws ClipboardException If an error occurs.
-     *
-     * @returns ClipboardItem A ClipboardItem instance on success,
-     *     false on failure.
-     */
-    public function addItem($range_id = null, $range_type = 'StudipItem')
-    {
-        if (($range_id === null) or !is_a($range_type, 'StudipItem', true)) {
-            //Either the range_id is not set or the range_type does not
-            //name a StudipItem class.
-            throw new ClipboardException(
-                _('Die Daten zum Hinzufügen eines Eintrags sind ungültig!')
-            );
-        }
-
-        //Check if the item already exists:
-
-        $item = ClipboardItem::findOneBySql(
-            'clipboard_id = :clipboard_id
-            AND range_id = :range_id
-            AND range_type = :range_type',
-            [
-                'clipboard_id' => $this->id,
-                'range_id' => $range_id,
-                'range_type' => $range_type
-            ]
-        );
-        if ($item) {
-            //Item already exists and nothing has to be modified.
-            return $item;
-        }
-
-        //Item does not exist: create it.
-        $item = new ClipboardItem();
-        $item->clipboard_id = $this->id;
-        $item->range_id = $range_id;
-        $item->range_type = $range_type;
-        if (!$item->store()) {
-            throw new ClipboardException(
-                _('Fehler beim Speichern des Eintrags!')
-            );
-        }
-        return $item;
-    }
-
-
-    /**
-     * Removes an item from the clipboard by specifying the ID of the
-     * object that shall be removed from the pad.
-     *
-     * @param string $range_id The ID of the object that shall be removed.
-     *
-     * @returns bool True on success, false on failure.
-     */
-    public function removeItem($range_id = null)
-    {
-        if ($range_id === null) {
-            //The range_id is not set.
-            return false;
-        }
-
-        return ClipboardItem::deleteBySql(
-            'clipboard_id = :clipboard_id AND range_id = :range_id',
-            [
-                'clipboard_id' => $this->id,
-                'range_id' => $range_id
-            ]
-        ) > 0;
-    }
-
-
-    /**
-     * Formats the content of the clipboard for display.
-     * This method should be overloaded by derived classes
-     * to output the data of the clipboard with appropriate names
-     * and other attributes which may be needed.
-     *
-     * @param string $order_by sort column and direction
-     *
-     * @returns string[][] A two-dimensional array with strings.
-     *     The first dimension represents the list of clipboard items.
-     *     The second dimension represents an item and holds at least
-     *     the following attributes of the item: id, name.
-     *     These attributes are the keys of the second array dimension.
-     *     The array has the following structure:
-     *     [
-     *         [
-     *             'id' => (id of the item)
-     *             'name' => (name of the item)
-     *         ],
-     *         [
-     *             …
-     *         ]
-     *     ]
-     *
-     *     Derived classes may add further attributes to the array,
-     *     if necessary.
-     */
-    public function getContent($order_by = 'name asc')
-    {
-        if (!$this->items) {
-            return [];
-        }
-
-        $content = new SimpleCollection();
-        foreach ($this->items as $item) {
-            //Only those elements which store the IDs of objects
-            //from the allowed content class or its descendants
-            //are added to the $content array.
-            if (is_a($item->range_type, $this->allowed_item_class, true)) {
-                $content[] = [
-                    'id' => $item->id,
-                    'range_type' => $item->range_type,
-                    'range_id' => $item->range_id,
-                    'name' => $item->__toString()
-                ];
-            }
-        }
-
-        return $content->orderBy($order_by)->getArrayCopy();
-    }
-
-
-    /**
-     * Retrieves all range-IDs of objects that are associated
-     * with this clipboard. The objects can be filtered by their
-     * range type.
-     *
-     * @param string|string[] $range_types The class name(s) of the objects
-     *     which shall be included in the result set.
-     *     This parameter can be a string or an array of strings.
-     *
-     * @returns string[] An array with all range-IDs that match
-     *     the specified range type.
-     */
-    public function getAllRangeIds($range_types = 'StudipItem')
-    {
-        if (!$range_types) {
-            //If no range types are specified we cannot retrieve range-IDs:
-            return [];
-        }
-
-        if (!is_array($range_types)) {
-            //Make $range_types an array:
-            $range_types = [$range_types];
-        }
-
-        $db = DBManager::get();
-
-        $stmt = $db->prepare(
-            "SELECT range_id FROM clipboard_items
-             WHERE range_type IN ( :range_types )
-             AND clipboard_id = :clipboard_id;"
-        );
-
-        $stmt->execute(
-            [
-                'range_types' => $range_types,
-                'clipboard_id' => $this->id
-            ]
-        );
-
-        return $stmt->fetchAll(
-            PDO::FETCH_COLUMN,
-            0
-        );
-    }
-
-
-    /**
-     * Retrieves specific range-IDs of objects that are associated
-     * with this clipboard and referenced by the specified clipboard item-IDs.
-     * The objects can be filtered by their range type, too.
-     *
-     * @param string|string[] $range_types The class name(s) of the objects
-     *     which shall be included in the result set. This parameter
-     *     can be an array or a string.
-     *
-     * @param string[] $item_ids The item-IDs of the clipboard items
-     *     whose range-IDs shall be included in the result set.
-     *     Note that the clipboard items must be associated with this clipboard.
-     *
-     * @returns string[] An array with all range-IDs that match
-     *     the specified range type.
-     */
-    public function getSomeRangeIds($range_types = 'StudipItem', $item_ids = [])
-    {
-        if ((!is_array($item_ids) and !$item_ids) or !$range_types) {
-            //Item-IDs is either an array or empty or it isn't even an array
-            //or $range_types is not set.
-            //We cannot use it to retrieve range-IDs.
-            return [];
-        }
-
-        $db = DBManager::get();
-
-        if (!is_array($range_types)) {
-            //Make $range_types an array:
-            $range_types = [$range_types];
-        }
-
-        $stmt = $db->prepare(
-            "SELECT range_id FROM clipboard_items
-            WHERE range_type IN ( :range_types )
-            AND clipboard_id = :clipboard_id
-            AND id IN ( :item_ids );"
-        );
-
-        $stmt->execute(
-            [
-                'range_types' => $range_types,
-                'clipboard_id' => $this->id,
-                'item_ids' => $item_ids
-            ]
-        );
-
-        return $stmt->fetchAll(
-            PDO::FETCH_COLUMN,
-            0
-        );
-    }
-}
diff --git a/lib/models/Clipboard.php b/lib/models/Clipboard.php
new file mode 100644
index 0000000..cd8fe89
--- /dev/null
+++ b/lib/models/Clipboard.php
@@ -0,0 +1,335 @@
+<?php
+
+
+/**
+ * Clipboard.class.php - model class for a clipboard (Merkzettel)
+ *
+ * The Clipboard class extends the wish list functionality of the clipboard
+ * in the old literature management to allow it to be used in other areas of the
+ * Stud.IP system. Furthermore, clipboards managed by this class
+ * are stored permanently in the database until they are deleted.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ *
+ * The "allowed_item_class" column containts the StudipItem class
+ * name where items have to be children of in order to be used
+ * with the clipboard.
+ * This attribute defaults to 'StudipItem' which means that by default
+ * all implementations of StudipItem can be inserted into a clipboard.
+ * If only items of a special implementation of StudipItem shall be
+ * able to be inserted into the clipboard this attribute has to be set
+ * to the class name of that implementation.
+ *
+ * @property int $id database column
+ * @property string $user_id database column
+ * @property string $name database column
+ * @property string $handler database column
+ * @property string $allowed_item_class database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|ClipboardItem[] $items has_many ClipboardItem
+ * @property User $user belongs_to User
+ */
+class Clipboard extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'clipboards';
+
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['has_many']['items'] = [
+            'class_name' => ClipboardItem::class,
+            'assoc_foreign_key' => 'clipboard_id',
+            'on_delete' => 'delete',
+            'on_store' => 'store'
+        ];
+
+        parent::configure($config);
+    }
+
+
+    /**
+     * This class returns all clipboards for a specified user,
+     * optionally filtered by required item range types.
+     *
+     * @param string $user_id: The ID of the user whose clipboards
+     *     shall be returned.
+     * @param array $item_range_types: The range types which at least one item
+     *     of the clipboard must have to be included in the result set.
+     *
+     * @returns Clipboard[] An array of clipboard objects which are
+     *     associated with the user specified by $user_id.
+     */
+    public static function getClipboardsForUser($user_id = '', $item_range_types = [])
+    {
+        if (!$user_id) {
+            return [];
+        }
+
+        if (is_array($item_range_types) and count($item_range_types) > 0) {
+            return self::findBySql(
+                "INNER JOIN clipboard_items
+                ON clipboards.id = clipboard_items.clipboard_id
+                WHERE
+                clipboards.user_id = :user_id
+                AND
+                clipboard_items.range_type IN ( :range_types )
+                GROUP BY clipboards.id ORDER BY name ASC, mkdate ASC",
+                [
+                    'user_id' => $user_id,
+                    'range_types' => $item_range_types
+                ]
+            );
+        } else {
+            return self::findBySql(
+                'user_id = :user_id ORDER BY name ASC, mkdate ASC',
+                [
+                    'user_id' => $user_id
+                ]
+            );
+        }
+    }
+
+
+    /**
+     * Adds an item to the clipboard by specifying the
+     * ID of the object that shall be added to it.
+     *
+     * @param string $range_id The ID of the object that shall be added.
+     *
+     * @throws ClipboardException If an error occurs.
+     *
+     * @returns ClipboardItem A ClipboardItem instance on success,
+     *     false on failure.
+     */
+    public function addItem($range_id = null, $range_type = 'StudipItem')
+    {
+        if (($range_id === null) or !is_a($range_type, 'StudipItem', true)) {
+            //Either the range_id is not set or the range_type does not
+            //name a StudipItem class.
+            throw new ClipboardException(
+                _('Die Daten zum Hinzufügen eines Eintrags sind ungültig!')
+            );
+        }
+
+        //Check if the item already exists:
+
+        $item = ClipboardItem::findOneBySql(
+            'clipboard_id = :clipboard_id
+            AND range_id = :range_id
+            AND range_type = :range_type',
+            [
+                'clipboard_id' => $this->id,
+                'range_id' => $range_id,
+                'range_type' => $range_type
+            ]
+        );
+        if ($item) {
+            //Item already exists and nothing has to be modified.
+            return $item;
+        }
+
+        //Item does not exist: create it.
+        $item = new ClipboardItem();
+        $item->clipboard_id = $this->id;
+        $item->range_id = $range_id;
+        $item->range_type = $range_type;
+        if (!$item->store()) {
+            throw new ClipboardException(
+                _('Fehler beim Speichern des Eintrags!')
+            );
+        }
+        return $item;
+    }
+
+
+    /**
+     * Removes an item from the clipboard by specifying the ID of the
+     * object that shall be removed from the pad.
+     *
+     * @param string $range_id The ID of the object that shall be removed.
+     *
+     * @returns bool True on success, false on failure.
+     */
+    public function removeItem($range_id = null)
+    {
+        if ($range_id === null) {
+            //The range_id is not set.
+            return false;
+        }
+
+        return ClipboardItem::deleteBySql(
+            'clipboard_id = :clipboard_id AND range_id = :range_id',
+            [
+                'clipboard_id' => $this->id,
+                'range_id' => $range_id
+            ]
+        ) > 0;
+    }
+
+
+    /**
+     * Formats the content of the clipboard for display.
+     * This method should be overloaded by derived classes
+     * to output the data of the clipboard with appropriate names
+     * and other attributes which may be needed.
+     *
+     * @param string $order_by sort column and direction
+     *
+     * @returns string[][] A two-dimensional array with strings.
+     *     The first dimension represents the list of clipboard items.
+     *     The second dimension represents an item and holds at least
+     *     the following attributes of the item: id, name.
+     *     These attributes are the keys of the second array dimension.
+     *     The array has the following structure:
+     *     [
+     *         [
+     *             'id' => (id of the item)
+     *             'name' => (name of the item)
+     *         ],
+     *         [
+     *             …
+     *         ]
+     *     ]
+     *
+     *     Derived classes may add further attributes to the array,
+     *     if necessary.
+     */
+    public function getContent($order_by = 'name asc')
+    {
+        if (!$this->items) {
+            return [];
+        }
+
+        $content = new SimpleCollection();
+        foreach ($this->items as $item) {
+            //Only those elements which store the IDs of objects
+            //from the allowed content class or its descendants
+            //are added to the $content array.
+            if (is_a($item->range_type, $this->allowed_item_class, true)) {
+                $content[] = [
+                    'id' => $item->id,
+                    'range_type' => $item->range_type,
+                    'range_id' => $item->range_id,
+                    'name' => $item->__toString()
+                ];
+            }
+        }
+
+        return $content->orderBy($order_by)->getArrayCopy();
+    }
+
+
+    /**
+     * Retrieves all range-IDs of objects that are associated
+     * with this clipboard. The objects can be filtered by their
+     * range type.
+     *
+     * @param string|string[] $range_types The class name(s) of the objects
+     *     which shall be included in the result set.
+     *     This parameter can be a string or an array of strings.
+     *
+     * @returns string[] An array with all range-IDs that match
+     *     the specified range type.
+     */
+    public function getAllRangeIds($range_types = 'StudipItem')
+    {
+        if (!$range_types) {
+            //If no range types are specified we cannot retrieve range-IDs:
+            return [];
+        }
+
+        if (!is_array($range_types)) {
+            //Make $range_types an array:
+            $range_types = [$range_types];
+        }
+
+        $db = DBManager::get();
+
+        $stmt = $db->prepare(
+            "SELECT range_id FROM clipboard_items
+             WHERE range_type IN ( :range_types )
+             AND clipboard_id = :clipboard_id;"
+        );
+
+        $stmt->execute(
+            [
+                'range_types' => $range_types,
+                'clipboard_id' => $this->id
+            ]
+        );
+
+        return $stmt->fetchAll(
+            PDO::FETCH_COLUMN,
+            0
+        );
+    }
+
+
+    /**
+     * Retrieves specific range-IDs of objects that are associated
+     * with this clipboard and referenced by the specified clipboard item-IDs.
+     * The objects can be filtered by their range type, too.
+     *
+     * @param string|string[] $range_types The class name(s) of the objects
+     *     which shall be included in the result set. This parameter
+     *     can be an array or a string.
+     *
+     * @param string[] $item_ids The item-IDs of the clipboard items
+     *     whose range-IDs shall be included in the result set.
+     *     Note that the clipboard items must be associated with this clipboard.
+     *
+     * @returns string[] An array with all range-IDs that match
+     *     the specified range type.
+     */
+    public function getSomeRangeIds($range_types = 'StudipItem', $item_ids = [])
+    {
+        if ((!is_array($item_ids) and !$item_ids) or !$range_types) {
+            //Item-IDs is either an array or empty or it isn't even an array
+            //or $range_types is not set.
+            //We cannot use it to retrieve range-IDs.
+            return [];
+        }
+
+        $db = DBManager::get();
+
+        if (!is_array($range_types)) {
+            //Make $range_types an array:
+            $range_types = [$range_types];
+        }
+
+        $stmt = $db->prepare(
+            "SELECT range_id FROM clipboard_items
+            WHERE range_type IN ( :range_types )
+            AND clipboard_id = :clipboard_id
+            AND id IN ( :item_ids );"
+        );
+
+        $stmt->execute(
+            [
+                'range_types' => $range_types,
+                'clipboard_id' => $this->id,
+                'item_ids' => $item_ids
+            ]
+        );
+
+        return $stmt->fetchAll(
+            PDO::FETCH_COLUMN,
+            0
+        );
+    }
+}
diff --git a/lib/models/ClipboardItem.class.php b/lib/models/ClipboardItem.class.php
deleted file mode 100644
index 888250f..0000000
--- a/lib/models/ClipboardItem.class.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * ClipboardItem.class.php - model class for clipboard items
- * (Merkzettel-Einträge)
- *
- * The ClipboardItem class holds single items of a clipboard.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.5
- *
- * @property int $id database column
- * @property int $clipboard_id database column
- * @property string $range_id database column
- * @property string $range_type database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property Clipboard $clipboard belongs_to Clipboard
- *
- * @property-read string $name
- */
-class ClipboardItem extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'clipboard_items';
-
-        $config['belongs_to']['clipboard'] = [
-            'class_name' => Clipboard::class,
-            'foreign_key' => 'clipboard_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['additional_fields']['name'] = [
-            'get' => fn(ClipboardItem $item) => $item->__toString(),
-        ];
-
-        parent::configure($config);
-    }
-
-    /**
-     * @returns string representation of this clipboard item.
-     */
-    public function __toString()
-    {
-        // Get the class $range_type and the object with ID $range_id,
-        // if $range_type is a StudipItem:
-        if (is_subclass_of($this->range_type, StudipItem::class)) {
-            $range_class_name = $this->range_type;
-            $object = $range_class_name::find($this->range_id);
-            if ($object) {
-                return $object->getItemName(false);
-            }
-        }
-
-        // $range_type is not a class name of a StudipItem class
-        // or no object of a StudipItem class could be found:
-        // We cannot determine the name and must therefore use
-        // a generic name:
-        return $this->range_type . '_' . $this->range_id;
-    }
-}
diff --git a/lib/models/ClipboardItem.php b/lib/models/ClipboardItem.php
new file mode 100644
index 0000000..888250f
--- /dev/null
+++ b/lib/models/ClipboardItem.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * ClipboardItem.class.php - model class for clipboard items
+ * (Merkzettel-Einträge)
+ *
+ * The ClipboardItem class holds single items of a clipboard.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.5
+ *
+ * @property int $id database column
+ * @property int $clipboard_id database column
+ * @property string $range_id database column
+ * @property string $range_type database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property Clipboard $clipboard belongs_to Clipboard
+ *
+ * @property-read string $name
+ */
+class ClipboardItem extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'clipboard_items';
+
+        $config['belongs_to']['clipboard'] = [
+            'class_name' => Clipboard::class,
+            'foreign_key' => 'clipboard_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['additional_fields']['name'] = [
+            'get' => fn(ClipboardItem $item) => $item->__toString(),
+        ];
+
+        parent::configure($config);
+    }
+
+    /**
+     * @returns string representation of this clipboard item.
+     */
+    public function __toString()
+    {
+        // Get the class $range_type and the object with ID $range_id,
+        // if $range_type is a StudipItem:
+        if (is_subclass_of($this->range_type, StudipItem::class)) {
+            $range_class_name = $this->range_type;
+            $object = $range_class_name::find($this->range_id);
+            if ($object) {
+                return $object->getItemName(false);
+            }
+        }
+
+        // $range_type is not a class name of a StudipItem class
+        // or no object of a StudipItem class could be found:
+        // We cannot determine the name and must therefore use
+        // a generic name:
+        return $this->range_type . '_' . $this->range_id;
+    }
+}
diff --git a/lib/models/ColourValue.class.php b/lib/models/ColourValue.class.php
deleted file mode 100644
index 6ae05ad..0000000
--- a/lib/models/ColourValue.class.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * ColorValue.class.php
- * model class for table color_values
- *
- * Objects of this class holds a colour's name (its purpose)
- * and the value for the colour.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @since       4.5
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for colour_id
- * @property string $colour_id database column
- * @property I18NString $description database column
- * @property string $value database column
- * @property int $mkdate database column
- * @property int $chdate database column
- */
-class ColourValue extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'colour_values';
-
-        $config['i18n_fields']['description'] = true;
-
-        parent::configure($config);
-    }
-
-    /**
-     * $colours is an array with all colour values that is filled
-     * when a colour is requested.
-     */
-    protected static $colours;
-
-    /**
-     * The find method is overloaded here since the table is usually very
-     * small and the colour values are requested often. They are stored
-     * in an array and served from there to save database requests.
-     */
-    public static function find($id)
-    {
-        if (!is_array(self::$colours)) {
-            self::$colours = [];
-            //Load all colours:
-            $colours = self::findBySql('TRUE');
-            foreach ($colours as $colour) {
-                self::$colours[$colour->id] = $colour;
-            }
-        }
-
-        return self::$colours[$id];
-    }
-
-
-    /**
-     * DEVELOPER WARNING: Do not rename this method to setValue since setValue
-     * is a SimpleORMap reserved method for setting attribute values
-     * of a SORM object!
-     */
-    public function setColourValue($r = 0xff, $g = 0xff, $b = 0xff, $a = 0xff)
-    {
-        $value = dechex($r) . dechex($g) . dechex($b) . dechex($a);
-        $this->value = $value;
-    }
-
-
-    public function __toString()
-    {
-        $r = $this->value[0] . $this->value[1];
-        $g = $this->value[2] . $this->value[3];
-        $b = $this->value[4] . $this->value[5];
-
-        //The color values are output as '#RRGGBB'.
-        //This way it is compatible with the input type color.
-        return mb_strtolower('#' . $r . $g . $b);
-    }
-
-
-    public function toRGBAFunction()
-    {
-        $r = $this->value[0] . $this->value[1];
-        $g = $this->value[2] . $this->value[3];
-        $b = $this->value[4] . $this->value[5];
-        $a = $this->value[6] . $this->value[7];
-
-        return sprintf(
-            'rgba(%s %s %s %s)',
-            hexdec($r),
-            hexdec($g),
-            hexdec($b),
-            hexdec($a)
-        );
-    }
-}
diff --git a/lib/models/ColourValue.php b/lib/models/ColourValue.php
new file mode 100644
index 0000000..6ae05ad
--- /dev/null
+++ b/lib/models/ColourValue.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * ColorValue.class.php
+ * model class for table color_values
+ *
+ * Objects of this class holds a colour's name (its purpose)
+ * and the value for the colour.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @since       4.5
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for colour_id
+ * @property string $colour_id database column
+ * @property I18NString $description database column
+ * @property string $value database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ */
+class ColourValue extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'colour_values';
+
+        $config['i18n_fields']['description'] = true;
+
+        parent::configure($config);
+    }
+
+    /**
+     * $colours is an array with all colour values that is filled
+     * when a colour is requested.
+     */
+    protected static $colours;
+
+    /**
+     * The find method is overloaded here since the table is usually very
+     * small and the colour values are requested often. They are stored
+     * in an array and served from there to save database requests.
+     */
+    public static function find($id)
+    {
+        if (!is_array(self::$colours)) {
+            self::$colours = [];
+            //Load all colours:
+            $colours = self::findBySql('TRUE');
+            foreach ($colours as $colour) {
+                self::$colours[$colour->id] = $colour;
+            }
+        }
+
+        return self::$colours[$id];
+    }
+
+
+    /**
+     * DEVELOPER WARNING: Do not rename this method to setValue since setValue
+     * is a SimpleORMap reserved method for setting attribute values
+     * of a SORM object!
+     */
+    public function setColourValue($r = 0xff, $g = 0xff, $b = 0xff, $a = 0xff)
+    {
+        $value = dechex($r) . dechex($g) . dechex($b) . dechex($a);
+        $this->value = $value;
+    }
+
+
+    public function __toString()
+    {
+        $r = $this->value[0] . $this->value[1];
+        $g = $this->value[2] . $this->value[3];
+        $b = $this->value[4] . $this->value[5];
+
+        //The color values are output as '#RRGGBB'.
+        //This way it is compatible with the input type color.
+        return mb_strtolower('#' . $r . $g . $b);
+    }
+
+
+    public function toRGBAFunction()
+    {
+        $r = $this->value[0] . $this->value[1];
+        $g = $this->value[2] . $this->value[3];
+        $b = $this->value[4] . $this->value[5];
+        $a = $this->value[6] . $this->value[7];
+
+        return sprintf(
+            'rgba(%s %s %s %s)',
+            hexdec($r),
+            hexdec($g),
+            hexdec($b),
+            hexdec($a)
+        );
+    }
+}
diff --git a/lib/models/ConfigEntry.class.php b/lib/models/ConfigEntry.class.php
deleted file mode 100644
index 5e06da8..0000000
--- a/lib/models/ConfigEntry.class.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * ConfigEntry.class.php
- * model class for table user_config
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for field
- * @property string $field database column
- * @property string $value database column
- * @property string $type database column
- * @property string $range database column
- * @property string $section database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property string $description database column
- */
-
-class ConfigEntry extends SimpleORMap
-{
-    /**
-     * Configures this model.
-     *
-     * @param array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'config';
-        parent::configure($config);
-    }
-
-    /**
-     * Returns whether a config value does not differ from the default entry.
-     *
-     * @param  ConfigValue $value Value to check
-     * @return boolean
-     */
-    public function isDefault(ConfigValue $value)
-    {
-        return $value->value == $this->value
-            && !$value->comment;
-    }
-}
diff --git a/lib/models/ConfigEntry.php b/lib/models/ConfigEntry.php
new file mode 100644
index 0000000..5e06da8
--- /dev/null
+++ b/lib/models/ConfigEntry.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * ConfigEntry.class.php
+ * model class for table user_config
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for field
+ * @property string $field database column
+ * @property string $value database column
+ * @property string $type database column
+ * @property string $range database column
+ * @property string $section database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property string $description database column
+ */
+
+class ConfigEntry extends SimpleORMap
+{
+    /**
+     * Configures this model.
+     *
+     * @param array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'config';
+        parent::configure($config);
+    }
+
+    /**
+     * Returns whether a config value does not differ from the default entry.
+     *
+     * @param  ConfigValue $value Value to check
+     * @return boolean
+     */
+    public function isDefault(ConfigValue $value)
+    {
+        return $value->value == $this->value
+            && !$value->comment;
+    }
+}
diff --git a/lib/models/Contact.class.php b/lib/models/Contact.class.php
deleted file mode 100644
index 16bff26..0000000
--- a/lib/models/Contact.class.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Contact.class.php - model class for table contact
- *
- * @author      <mlunzena@uos.de>
- * @license GPL 2 or later
- *
- * @property array $id alias for pk
- * @property string $owner_id database column
- * @property string $user_id database column
- * @property string $calendar_permissions database column
- *     An enum with the possible values "", "READ" and "WRITE".
- *     The empty string specifies that no calendar permissions are granted.
- * @property User $owner belongs_to User
- * @property User $friend belongs_to User
- * @property string $mkdate database column
- * @property string $chdate database column
- */
-class Contact extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'contact';
-
-        $config['belongs_to']['owner'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'owner_id'
-        ];
-        $config['belongs_to']['friend'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id'
-        ];
-
-        $config['has_many']['groups'] = [
-            'class_name'        => ContactGroupItem::class,
-            'assoc_func'        => 'findByContact',
-            'foreign_key'       => function ($me) {
-                return [$me];
-            },
-            'assoc_foreign_key' => function ($item, $params) {
-                //Nothing else here. But this has to be present
-                //so that storing a new contact works.
-             },
-            'on_store'          => 'store',
-            'on_delete'         => 'delete'
-        ];
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/Contact.php b/lib/models/Contact.php
new file mode 100644
index 0000000..16bff26
--- /dev/null
+++ b/lib/models/Contact.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Contact.class.php - model class for table contact
+ *
+ * @author      <mlunzena@uos.de>
+ * @license GPL 2 or later
+ *
+ * @property array $id alias for pk
+ * @property string $owner_id database column
+ * @property string $user_id database column
+ * @property string $calendar_permissions database column
+ *     An enum with the possible values "", "READ" and "WRITE".
+ *     The empty string specifies that no calendar permissions are granted.
+ * @property User $owner belongs_to User
+ * @property User $friend belongs_to User
+ * @property string $mkdate database column
+ * @property string $chdate database column
+ */
+class Contact extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'contact';
+
+        $config['belongs_to']['owner'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'owner_id'
+        ];
+        $config['belongs_to']['friend'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id'
+        ];
+
+        $config['has_many']['groups'] = [
+            'class_name'        => ContactGroupItem::class,
+            'assoc_func'        => 'findByContact',
+            'foreign_key'       => function ($me) {
+                return [$me];
+            },
+            'assoc_foreign_key' => function ($item, $params) {
+                //Nothing else here. But this has to be present
+                //so that storing a new contact works.
+             },
+            'on_store'          => 'store',
+            'on_delete'         => 'delete'
+        ];
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/ContactGroup.class.php b/lib/models/ContactGroup.class.php
deleted file mode 100644
index 0e60d3b..0000000
--- a/lib/models/ContactGroup.class.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * The ContactGroup class represents a contact group of a user.
- * 
- * This file is part of Stud.IP
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2023
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       5.5
- *
- * @property string $id The ID of the group.
- * @property string $name Name of the group.
- * @property string $owner_id The ID of the owner to whom the group belongs to.
- * @property string $mkdate The creation date of the group.
- * @property string $chdate The modification date of the group.
- * @property User $owner The owner of the group.
- * @property ContactGroupItem[]|SimpleORMapCollection $items The items (users) that belong to the group.
- */
-class ContactGroup extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'contact_groups';
-        $config['belongs_to']['owner'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'owner_id'
-        ];
-        $config['has_many']['items'] = [
-            'class_name'        => ContactGroupItem::class,
-            'assoc_foreign_key' => 'group_id',
-            'on_store'          => 'store',
-            'on_delete'         => 'delete'
-        ];
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/ContactGroup.php b/lib/models/ContactGroup.php
new file mode 100644
index 0000000..0e60d3b
--- /dev/null
+++ b/lib/models/ContactGroup.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * The ContactGroup class represents a contact group of a user.
+ * 
+ * This file is part of Stud.IP
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2023
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       5.5
+ *
+ * @property string $id The ID of the group.
+ * @property string $name Name of the group.
+ * @property string $owner_id The ID of the owner to whom the group belongs to.
+ * @property string $mkdate The creation date of the group.
+ * @property string $chdate The modification date of the group.
+ * @property User $owner The owner of the group.
+ * @property ContactGroupItem[]|SimpleORMapCollection $items The items (users) that belong to the group.
+ */
+class ContactGroup extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'contact_groups';
+        $config['belongs_to']['owner'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'owner_id'
+        ];
+        $config['has_many']['items'] = [
+            'class_name'        => ContactGroupItem::class,
+            'assoc_foreign_key' => 'group_id',
+            'on_store'          => 'store',
+            'on_delete'         => 'delete'
+        ];
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/ContactGroupItem.class.php b/lib/models/ContactGroupItem.class.php
deleted file mode 100644
index 0204d0a..0000000
--- a/lib/models/ContactGroupItem.class.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * The ContactGroupItem class represents an item in a contact group.
- * 
- * This file is part of Stud.IP
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2023
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       5.5
- *
- * @property string $group_id The ID of the group.
- * @property string $user_id The ID of the user that is inside the group.
- * @property string $mkdate The creation date of the group.
- * @property string $chdate The modification date of the group.
- * @property ContactGroup $contact_group The group instance for the item.
- * @property User $user The user instance for the item.
- */
-class ContactGroupItem extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'contact_group_items';
-        $config['belongs_to']['contact_group'] = [
-            'class_name'  => ContactGroup::class,
-            'foreign_key' => 'group_id'
-        ];
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id'
-        ];
-        parent::configure($config);
-    }
-
-    /**
-     * Finds and returns all group items for a contact.
-     *
-     * @param Contact $contact The contact for which to find all contact group items.
-     * @return ContactGroupItem[] All memberships of the contact.
-     */
-    public static function findByContact(Contact $contact): array
-    {
-        return self::findBySQL(
-            'JOIN `contact_groups`
-              ON (`contact_group_items`.`group_id` = `contact_groups`.`id`)
-             WHERE `contact_groups`.`owner_id` = :owner_id
-               AND `contact_group_items`.`user_id` = :user_id',
-            [
-                'owner_id' => $contact->owner_id,
-                'user_id' => $contact->user_id
-            ]
-        );
-    }
-}
diff --git a/lib/models/ContactGroupItem.php b/lib/models/ContactGroupItem.php
new file mode 100644
index 0000000..0204d0a
--- /dev/null
+++ b/lib/models/ContactGroupItem.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * The ContactGroupItem class represents an item in a contact group.
+ * 
+ * This file is part of Stud.IP
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2023
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       5.5
+ *
+ * @property string $group_id The ID of the group.
+ * @property string $user_id The ID of the user that is inside the group.
+ * @property string $mkdate The creation date of the group.
+ * @property string $chdate The modification date of the group.
+ * @property ContactGroup $contact_group The group instance for the item.
+ * @property User $user The user instance for the item.
+ */
+class ContactGroupItem extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'contact_group_items';
+        $config['belongs_to']['contact_group'] = [
+            'class_name'  => ContactGroup::class,
+            'foreign_key' => 'group_id'
+        ];
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id'
+        ];
+        parent::configure($config);
+    }
+
+    /**
+     * Finds and returns all group items for a contact.
+     *
+     * @param Contact $contact The contact for which to find all contact group items.
+     * @return ContactGroupItem[] All memberships of the contact.
+     */
+    public static function findByContact(Contact $contact): array
+    {
+        return self::findBySQL(
+            'JOIN `contact_groups`
+              ON (`contact_group_items`.`group_id` = `contact_groups`.`id`)
+             WHERE `contact_groups`.`owner_id` = :owner_id
+               AND `contact_group_items`.`user_id` = :user_id',
+            [
+                'owner_id' => $contact->owner_id,
+                'user_id' => $contact->user_id
+            ]
+        );
+    }
+}
diff --git a/lib/models/ContentTermsOfUse.class.php b/lib/models/ContentTermsOfUse.class.php
deleted file mode 100644
index fb2e592..0000000
--- a/lib/models/ContentTermsOfUse.class.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * ContentTermsOfUse.class.php
- * model class for table licenses
- *
- * The ContentTermsOfUse class provides information about the terms under which
- * a content object in Stud.IP can be used. Each entry in the database table
- * content_terms_of_use_entries corresponds to one terms of use variant.
- *
- * Content can be a file or another Stud.IP object that is capable
- * of storing copyrighted material.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2016 data-quest
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id database column
- * @property I18NString $name database column
- * @property int $position database column
- * @property I18NString $description database column
- * @property I18NString $student_description database column
- * @property int $download_condition database column
- * @property string $icon database column
- * @property int $is_default database column
- * @property int $mkdate database column
- * @property int $chdate database column
- */
-
-class ContentTermsOfUse extends SimpleORMap
-{
-    const DOWNLOAD_CONDITION_NONE = 0; // no conditions (downloadable by anyone)
-    const DOWNLOAD_CONDITION_CLOSED_GROUPS = 1; // closed groups (e.g. courses with signup rules)
-    const DOWNLOAD_CONDITION_OWNER_ONLY = 2; // only for owner
-
-    /**
-     * @var
-     */
-    private static $cache = null;
-
-    /**
-     * @param array $config
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'content_terms_of_use_entries';
-
-        $config['i18n_fields']['name'] = true;
-        $config['i18n_fields']['description'] = true;
-        $config['i18n_fields']['student_description'] = true;
-
-        $config['default_values']['download_condition'] = self::DOWNLOAD_CONDITION_NONE;
-        $config['default_values']['icon'] = 'license';
-        $config['default_values']['position'] = 0;
-        $config['default_values']['is_default'] = false;
-
-        $config['registered_callbacks']['after_store'][] = 'cbCheckDefault';
-
-        parent::configure($config);
-    }
-
-    /**
-     * @return ContentTermsOfUse[]
-     */
-    public static function findAll()
-    {
-        if (self::$cache === null) {
-            self::$cache = new SimpleCollection(self::findBySQL('1 ORDER by position, id'));
-        }
-        return self::$cache;
-    }
-
-    /**
-     * @param $id string
-     * @return ContentTermsOfUse
-     */
-    public static function find($id)
-    {
-        return self::findAll()->findOneBy('id', $id);
-    }
-
-    /**
-     * @param $id string
-     * @return ContentTermsOfUse
-     */
-    public static function findOrBuild($id)
-    {
-        return self::find($id) ?: self::build(['id' => 'UNDEFINED', 'name' => 'unbekannt']);
-    }
-
-    /**
-     * @return ContentTermsOfUse
-     */
-    public static function findDefault()
-    {
-        return self::findAll()->findOneBy('is_default', 1);
-    }
-
-    /**
-     * Returns a list of all valid conditions.
-     *
-     * @return array
-     */
-    public static function getConditions()
-    {
-        return [
-            self::DOWNLOAD_CONDITION_NONE => _('Ohne Bedingung'),
-            self::DOWNLOAD_CONDITION_CLOSED_GROUPS => _('Nur innerhalb geschlossener Veranstaltungen erlaubt'),
-            self::DOWNLOAD_CONDITION_OWNER_ONLY => _('Nur für EigentümerIn erlaubt'),
-        ];
-    }
-
-    /**
-     * Returns the textual representation of a condition.
-     *
-     * @param int $condition
-     * @return string
-     */
-    public static function describeCondition($condition)
-    {
-        $conditions = self::getConditions();
-        return $conditions[$condition] ?? _('Nicht definiert');
-    }
-
-    /**
-     *
-     */
-    public function cbCheckDefault()
-    {
-        if ($this->is_default) {
-            $query = "UPDATE `content_terms_of_use_entries`
-                      SET `is_default` = 0
-                      WHERE id != :id";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':id', $this->id);
-            $statement->execute();
-        }
-        self::$cache = null;
-    }
-
-    /**
-     * Validates this entry
-     *
-     * @return array with error messages, if it's empty everyhting is fine
-     */
-    public function validate()
-    {
-        $errors = [];
-        if ($this->isNew() && self::exists($this->id)) {
-            $errors[] = sprintf(
-                _('Es existiert bereits ein Eintrag mit der ID %s!'),
-                $this->id
-            );
-        }
-        if (!$this->name) {
-            $errors[] = _('Es wurde kein Name für den Eintrag gesetzt!');
-        }
-        return $errors;
-    }
-
-    /**
-     * Determines if a user is permitted to download a file.
-     *
-     * Depening on the value of the download_condition attribute a decision
-     * is made regarding the permission of the given user to download
-     * a file, given by one of its associated FileRef objects.
-     *
-     * The folder condition can have the values 0, 1 and 2.
-     * - 0 means that there are no conditions for downloading, therefore the
-     *   file is downloadable by anyone.
-     * - 1 means that the file is only downloadable inside a closed group.
-     *   Such a group can be a course or study group with closed admission.
-     *   In this case this method checks if the user is a member of the
-     *   course or study group.
-     * - 2 means that the file is only downloadable for the owner.
-     *   The user's ID must therefore match the user_id attribute
-     *   of the FileRef object.
-     */
-    public function isDownloadable($context_id, $context_type, $allow_owner = true, $user_id = null)
-    {
-        $user_id = $user_id ?: $GLOBALS['user']->id;
-        if ($allow_owner) {
-            if (in_array($context_type, ['course', 'institute'])
-                && Seminar_Perm::get()->have_studip_perm(
-                    'tutor', $context_id, $user_id
-                )
-            ) {
-                return true;
-            } elseif ($context_type === "profile" && $context_id === $user_id) {
-                return true;
-            }
-        }
-        if ($this->download_condition == self::DOWNLOAD_CONDITION_CLOSED_GROUPS) {
-
-            //the content is only downloadable when the user is inside a closed group
-            //(referenced by range_id). If download_condition is set to 2
-            //the group must also have a terminated signup deadline.
-            if ($context_type === "course") {
-                //check where this range_id comes from:
-                $seminar = Seminar::GetInstance($context_id);
-                $timed_admission = $seminar->getAdmissionTimeFrame();
-
-                if ($seminar->admission_prelim
-                    || $seminar->isPasswordProtected()
-                    || $seminar->isAdmissionLocked()
-                    || (is_array($timed_admission) && $timed_admission['end_time'] > 0 && $timed_admission['end_time'] < time())
-                ) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        if ($this->download_condition == self::DOWNLOAD_CONDITION_OWNER_ONLY) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/lib/models/ContentTermsOfUse.php b/lib/models/ContentTermsOfUse.php
new file mode 100644
index 0000000..fb2e592
--- /dev/null
+++ b/lib/models/ContentTermsOfUse.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * ContentTermsOfUse.class.php
+ * model class for table licenses
+ *
+ * The ContentTermsOfUse class provides information about the terms under which
+ * a content object in Stud.IP can be used. Each entry in the database table
+ * content_terms_of_use_entries corresponds to one terms of use variant.
+ *
+ * Content can be a file or another Stud.IP object that is capable
+ * of storing copyrighted material.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2016 data-quest
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id database column
+ * @property I18NString $name database column
+ * @property int $position database column
+ * @property I18NString $description database column
+ * @property I18NString $student_description database column
+ * @property int $download_condition database column
+ * @property string $icon database column
+ * @property int $is_default database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ */
+
+class ContentTermsOfUse extends SimpleORMap
+{
+    const DOWNLOAD_CONDITION_NONE = 0; // no conditions (downloadable by anyone)
+    const DOWNLOAD_CONDITION_CLOSED_GROUPS = 1; // closed groups (e.g. courses with signup rules)
+    const DOWNLOAD_CONDITION_OWNER_ONLY = 2; // only for owner
+
+    /**
+     * @var
+     */
+    private static $cache = null;
+
+    /**
+     * @param array $config
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'content_terms_of_use_entries';
+
+        $config['i18n_fields']['name'] = true;
+        $config['i18n_fields']['description'] = true;
+        $config['i18n_fields']['student_description'] = true;
+
+        $config['default_values']['download_condition'] = self::DOWNLOAD_CONDITION_NONE;
+        $config['default_values']['icon'] = 'license';
+        $config['default_values']['position'] = 0;
+        $config['default_values']['is_default'] = false;
+
+        $config['registered_callbacks']['after_store'][] = 'cbCheckDefault';
+
+        parent::configure($config);
+    }
+
+    /**
+     * @return ContentTermsOfUse[]
+     */
+    public static function findAll()
+    {
+        if (self::$cache === null) {
+            self::$cache = new SimpleCollection(self::findBySQL('1 ORDER by position, id'));
+        }
+        return self::$cache;
+    }
+
+    /**
+     * @param $id string
+     * @return ContentTermsOfUse
+     */
+    public static function find($id)
+    {
+        return self::findAll()->findOneBy('id', $id);
+    }
+
+    /**
+     * @param $id string
+     * @return ContentTermsOfUse
+     */
+    public static function findOrBuild($id)
+    {
+        return self::find($id) ?: self::build(['id' => 'UNDEFINED', 'name' => 'unbekannt']);
+    }
+
+    /**
+     * @return ContentTermsOfUse
+     */
+    public static function findDefault()
+    {
+        return self::findAll()->findOneBy('is_default', 1);
+    }
+
+    /**
+     * Returns a list of all valid conditions.
+     *
+     * @return array
+     */
+    public static function getConditions()
+    {
+        return [
+            self::DOWNLOAD_CONDITION_NONE => _('Ohne Bedingung'),
+            self::DOWNLOAD_CONDITION_CLOSED_GROUPS => _('Nur innerhalb geschlossener Veranstaltungen erlaubt'),
+            self::DOWNLOAD_CONDITION_OWNER_ONLY => _('Nur für EigentümerIn erlaubt'),
+        ];
+    }
+
+    /**
+     * Returns the textual representation of a condition.
+     *
+     * @param int $condition
+     * @return string
+     */
+    public static function describeCondition($condition)
+    {
+        $conditions = self::getConditions();
+        return $conditions[$condition] ?? _('Nicht definiert');
+    }
+
+    /**
+     *
+     */
+    public function cbCheckDefault()
+    {
+        if ($this->is_default) {
+            $query = "UPDATE `content_terms_of_use_entries`
+                      SET `is_default` = 0
+                      WHERE id != :id";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':id', $this->id);
+            $statement->execute();
+        }
+        self::$cache = null;
+    }
+
+    /**
+     * Validates this entry
+     *
+     * @return array with error messages, if it's empty everyhting is fine
+     */
+    public function validate()
+    {
+        $errors = [];
+        if ($this->isNew() && self::exists($this->id)) {
+            $errors[] = sprintf(
+                _('Es existiert bereits ein Eintrag mit der ID %s!'),
+                $this->id
+            );
+        }
+        if (!$this->name) {
+            $errors[] = _('Es wurde kein Name für den Eintrag gesetzt!');
+        }
+        return $errors;
+    }
+
+    /**
+     * Determines if a user is permitted to download a file.
+     *
+     * Depening on the value of the download_condition attribute a decision
+     * is made regarding the permission of the given user to download
+     * a file, given by one of its associated FileRef objects.
+     *
+     * The folder condition can have the values 0, 1 and 2.
+     * - 0 means that there are no conditions for downloading, therefore the
+     *   file is downloadable by anyone.
+     * - 1 means that the file is only downloadable inside a closed group.
+     *   Such a group can be a course or study group with closed admission.
+     *   In this case this method checks if the user is a member of the
+     *   course or study group.
+     * - 2 means that the file is only downloadable for the owner.
+     *   The user's ID must therefore match the user_id attribute
+     *   of the FileRef object.
+     */
+    public function isDownloadable($context_id, $context_type, $allow_owner = true, $user_id = null)
+    {
+        $user_id = $user_id ?: $GLOBALS['user']->id;
+        if ($allow_owner) {
+            if (in_array($context_type, ['course', 'institute'])
+                && Seminar_Perm::get()->have_studip_perm(
+                    'tutor', $context_id, $user_id
+                )
+            ) {
+                return true;
+            } elseif ($context_type === "profile" && $context_id === $user_id) {
+                return true;
+            }
+        }
+        if ($this->download_condition == self::DOWNLOAD_CONDITION_CLOSED_GROUPS) {
+
+            //the content is only downloadable when the user is inside a closed group
+            //(referenced by range_id). If download_condition is set to 2
+            //the group must also have a terminated signup deadline.
+            if ($context_type === "course") {
+                //check where this range_id comes from:
+                $seminar = Seminar::GetInstance($context_id);
+                $timed_admission = $seminar->getAdmissionTimeFrame();
+
+                if ($seminar->admission_prelim
+                    || $seminar->isPasswordProtected()
+                    || $seminar->isAdmissionLocked()
+                    || (is_array($timed_admission) && $timed_admission['end_time'] > 0 && $timed_admission['end_time'] < time())
+                ) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        if ($this->download_condition == self::DOWNLOAD_CONDITION_OWNER_ONLY) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/lib/models/Course.class.php b/lib/models/Course.class.php
deleted file mode 100644
index bfea7a0..0000000
--- a/lib/models/Course.class.php
+++ /dev/null
@@ -1,1181 +0,0 @@
-<?php
-/**
- * Course.class.php
- * model class for table seminare
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for seminar_id
- * @property string $seminar_id database column
- * @property string|null $veranstaltungsnummer database column
- * @property string $institut_id database column
- * @property I18NString $name database column
- * @property I18NString|null $untertitel database column
- * @property int $status database column
- * @property I18NString $beschreibung database column
- * @property I18NString|null $ort database column
- * @property string|null $sonstiges database column
- * @property int $lesezugriff database column
- * @property int $schreibzugriff database column
- * @property int|null $start_time database column
- * @property int|null $duration_time database column
- * @property I18NString|null $art database column
- * @property I18NString|null $teilnehmer database column
- * @property I18NString|null $vorrausetzungen database column
- * @property I18NString|null $lernorga database column
- * @property I18NString|null $leistungsnachweis database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property string|null $ects database column
- * @property int|null $admission_turnout database column
- * @property int|null $admission_binding database column
- * @property int $admission_prelim database column
- * @property string|null $admission_prelim_txt database column
- * @property int $admission_disable_waitlist database column
- * @property int $visible database column
- * @property int|null $showscore database column
- * @property string|null $aux_lock_rule database column
- * @property int $aux_lock_rule_forced database column
- * @property string|null $lock_rule database column
- * @property int $admission_waitlist_max database column
- * @property int $admission_disable_waitlist_move database column
- * @property int $completion database column
- * @property string|null $parent_course database column
- * @property SimpleORMapCollection|CourseTopic[] $topics has_many CourseTopic
- * @property SimpleORMapCollection|CourseDate[] $dates has_many CourseDate
- * @property SimpleORMapCollection|CourseExDate[] $ex_dates has_many CourseExDate
- * @property SimpleORMapCollection|CourseMember[] $members has_many CourseMember
- * @property SimpleORMapCollection|Deputy[] $deputies has_many Deputy
- * @property SimpleORMapCollection|Statusgruppen[] $statusgruppen has_many Statusgruppen
- * @property SimpleORMapCollection|AdmissionApplication[] $admission_applicants has_many AdmissionApplication
- * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
- * @property SimpleORMapCollection|SeminarCycleDate[] $cycles has_many SeminarCycleDate
- * @property SimpleORMapCollection|BlubberThread[] $blubberthreads has_many BlubberThread
- * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock
- * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest
- * @property SimpleORMapCollection|Course[] $children has_many Course
- * @property SimpleORMapCollection|ToolActivation[] $tools has_many ToolActivation
- * @property SimpleORMapCollection|CourseMemberNotification[] $member_notifications has_many CourseMemberNotification
- * @property SimpleORMapCollection|Courseware\Unit[] $courseware_units has_many Courseware\Unit
- * @property Institute $home_institut belongs_to Institute
- * @property AuxLockRule|null $aux belongs_to AuxLockRule
- * @property Course|null $parent belongs_to Course
- * @property SimpleORMapCollection|Semester[] $semesters has_and_belongs_to_many Semester
- * @property SimpleORMapCollection|StudipStudyArea[] $study_areas has_and_belongs_to_many StudipStudyArea
- * @property SimpleORMapCollection|Institute[] $institutes has_and_belongs_to_many Institute
- * @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain
- * @property-read mixed $teachers additional field
- * @property mixed $end_time additional field
- * @property mixed $start_semester additional field
- * @property mixed $end_semester additional field
- * @property-read mixed $semester_text additional field
- * @property-read mixed $config additional field
- */
-
-class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, FeedbackRange, Studip\Calendar\Owner
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'seminare';
-        $config['has_many']['topics'] = [
-            'class_name' => CourseTopic::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['dates'] = [
-            'class_name'        => CourseDate::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-            'order_by'          => 'ORDER BY date'
-        ];
-        $config['has_many']['ex_dates'] = [
-            'class_name'        => CourseExDate::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_many']['members'] = [
-            'class_name' => CourseMember::class,
-            'assoc_func' => 'findByCourse',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['deputies'] = [
-            'class_name' => Deputy::class,
-            'assoc_func' => 'findByRange_id',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['statusgruppen'] = [
-            'class_name' => Statusgruppen::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['admission_applicants'] = [
-            'class_name' => AdmissionApplication::class,
-            'assoc_func' => 'findByCourse',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['datafields'] = [
-            'class_name' => DatafieldEntryModel::class,
-            'assoc_func' => 'findByModel',
-            'assoc_foreign_key' => function ($model, $params) {
-                $model->setValue('range_id', $params[0]->id);
-            },
-            'foreign_key' => function ($course) {
-                return [$course];
-            },
-            'on_delete' => 'delete',
-            'on_store'  => 'store',
-        ];
-        $config['has_many']['cycles'] = [
-            'class_name' => SeminarCycleDate::class,
-            'assoc_func' => 'findBySeminar',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['blubberthreads'] = [
-            'class_name' => BlubberThread::class,
-            'assoc_func' => 'findBySeminar',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['consultation_blocks'] = [
-            'class_name'        => ConsultationBlock::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-        ];
-
-        $config['has_and_belongs_to_many']['semesters'] = [
-            'class_name'     => Semester::class,
-            'thru_table'     => 'semester_courses',
-            'thru_key'       => 'course_id',
-            'thru_assoc_key' => 'semester_id',
-            'order_by'       => 'ORDER BY beginn ASC',
-            'on_delete'      => 'delete',
-            'on_store'       => 'store',
-        ];
-
-        $config['belongs_to']['home_institut'] = [
-            'class_name' => Institute::class,
-            'foreign_key' => 'institut_id',
-            'assoc_func'  => 'find',
-        ];
-        $config['belongs_to']['aux'] = [
-            'class_name' => AuxLockRule::class,
-            'foreign_key' => 'aux_lock_rule',
-        ];
-        $config['has_and_belongs_to_many']['study_areas'] = [
-            'class_name' => StudipStudyArea::class,
-            'thru_table' => 'seminar_sem_tree',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_and_belongs_to_many']['institutes'] = [
-            'class_name' => Institute::class,
-            'thru_table' => 'seminar_inst',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-
-        $config['has_and_belongs_to_many']['domains'] = [
-            'class_name'        => UserDomain::class,
-            'thru_table'        => 'seminar_userdomains',
-            'on_delete'          => 'delete',
-            'on_store'           => 'store',
-            'order_by'          => 'ORDER BY name',
-        ];
-
-        $config['has_many']['room_requests'] = [
-            'class_name'        => RoomRequest::class,
-            'assoc_foreign_key' => 'course_id',
-            'on_delete'         => 'delete',
-        ];
-        $config['belongs_to']['parent'] = [
-            'class_name' => Course::class,
-            'foreign_key' => 'parent_course'
-        ];
-        $config['has_many']['children'] = [
-            'class_name'        => Course::class,
-            'assoc_foreign_key' => 'parent_course',
-            'order_by'          => 'GROUP BY seminar_id ORDER BY VeranstaltungsNummer, Name'
-        ];
-        $config['has_many']['tools'] = [
-            'class_name'        => ToolActivation::class,
-            'assoc_foreign_key' => 'range_id',
-            'order_by'          => 'ORDER BY position',
-            'on_delete'         => 'delete',
-        ];
-        $config['has_many']['member_notifications'] = [
-            'class_name'        => CourseMemberNotification::class,
-            'on_delete'         => 'delete',
-        ];
-
-        $config['has_many']['courseware_units'] = [
-            'class_name' => \Courseware\Unit::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'  => 'delete',
-        ];
-
-        $config['default_values']['lesezugriff'] = 1;
-        $config['default_values']['schreibzugriff'] = 1;
-        $config['default_values']['duration_time'] = 0;
-
-        $config['additional_fields']['teachers'] = [
-            'get' => 'getTeachers'
-        ];
-        $config['additional_fields']['end_time'] = true;
-
-        $config['additional_fields']['start_semester'] = [
-            'get' => 'getStartSemester',
-            'set' => '_set_semester'
-        ];
-        $config['additional_fields']['end_semester'] = [
-            'get' => 'getEndSemester',
-            'set' => '_set_semester'
-        ];
-        $config['additional_fields']['semester_text'] = [
-            'get' => 'getTextualSemester'
-        ];
-
-        $config['additional_fields']['config'] = [
-            'get' => function (Course $course) {
-                return $course->getConfiguration();
-            }
-        ];
-
-        $config['notification_map']['after_create'] = 'CourseDidCreateOrUpdate';
-        $config['notification_map']['after_store'] = 'CourseDidCreateOrUpdate';
-
-        $config['i18n_fields']['name'] = true;
-        $config['i18n_fields']['untertitel'] = true;
-        $config['i18n_fields']['beschreibung'] = true;
-        $config['i18n_fields']['art'] = true;
-        $config['i18n_fields']['teilnehmer'] = true;
-        $config['i18n_fields']['vorrausetzungen'] = true;
-        $config['i18n_fields']['lernorga'] = true;
-        $config['i18n_fields']['leistungsnachweis'] = true;
-        $config['i18n_fields']['ort'] = true;
-
-        $config['registered_callbacks']['before_update'][] = 'logStore';
-        $config['registered_callbacks']['before_store'][] = 'cbSetStartAndDurationTime';
-        $config['registered_callbacks']['after_create'][] = 'setDefaultTools';
-        $config['registered_callbacks']['after_delete'][] = function ($course) {
-            CourseAvatar::getAvatar($course->id)->reset();
-            FeedbackElement::deleteBySQL('course_id = ?', [$course->id]);
-            // Remove subcourse relations, leaving subcourses intact.
-            DBManager::get()->execute(
-                "UPDATE `seminare` SET `parent_course` = NULL WHERE `parent_course` = :course",
-                ['course' => $course->id]
-            );
-            DBManager::get()->execute(
-                "DELETE FROM `forum_visits` WHERE `seminar_id` = ?",
-                [$course->id]
-            );
-        };
-
-        parent::configure($config);
-    }
-
-
-    /**
-     * Returns the currently active course or false if none is active.
-     *
-     * @return Course object of currently active course, null otherwise
-     * @since 3.0
-     */
-    public static function findCurrent()
-    {
-        if (Context::isCourse()) {
-            return Context::get();
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the associated mvv modules for a given course id.
-     *
-     * @param string     $course_id
-     * @param array|null $statusses Limit the results by a given module status
-     * @return Modul[]
-     */
-    public static function getMVVModulesForCourseId(string $course_id, ?array $statusses = null): array
-    {
-        $query = "SELECT mvv_modul.*
-                  FROM mvv_lvgruppe_seminar
-                  JOIN `mvv_lvgruppe` ON (`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe`.`lvgruppe_id`)
-                  JOIN `mvv_lvgruppe_modulteil` ON (`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe_modulteil`.`lvgruppe_id`)
-                  JOIN `mvv_modulteil` ON (`mvv_lvgruppe_modulteil`.`modulteil_id` = `mvv_modulteil`.`modulteil_id`)
-                  JOIN `mvv_modul` ON (`mvv_modulteil`.`modul_id` = `mvv_modul`.`modul_id`)
-                  WHERE seminar_id = ?";
-        $parameters = [$course_id];
-
-        if ($statusses !== null) {
-            $query .= ' AND `mvv_modul`.`stat` IN (?)';
-            $parameters[] = $statusses;
-        }
-
-        return DBManager::get()->fetchAll($query, $parameters, function ($row) {
-            return Modul::buildExisting($row);
-        });
-    }
-
-    public function getEnd_Time()
-    {
-        return $this->duration_time == -1 ? -1 : $this->start_time + $this->duration_time;
-    }
-
-    public function setEnd_Time($value)
-    {
-        if ($value == -1) {
-            $this->duration_time = -1;
-        } elseif ($this->start_time > 0 && $value > $this->start_time) {
-            $this->duration_time = $value - $this->start_time;
-        } else {
-            $this->duration_time = 0;
-        }
-    }
-
-    public function _set_semester($field, $value)
-    {
-        $method = 'set' . ($field === 'start_semester' ? 'StartSemester' : 'EndSemester');
-        $this->$method($value);
-    }
-
-    /**
-     * @param Semester $semester
-     */
-    public function setStartSemester(Semester $semester)
-    {
-        $end_semester = $this->semesters->last();
-        $start_semester = $this->semesters->first();
-        if ($start_semester && $start_semester->id === $semester->id) {
-            return;
-        }
-        if ($end_semester) {
-            if (count($this->semesters) > 1 && $end_semester->beginn < $semester->beginn) {
-                throw new InvalidArgumentException('start-semester must start before end-semester');
-            }
-            foreach ($this->semesters as $key => $one_semester) {
-                if ($one_semester->beginn < $semester->beginn) {
-                    $this->semesters->offsetUnset($key);
-                }
-            }
-        }
-        $this->semesters[] = $semester;
-        $this->semesters->orderBy('beginn asc');
-        //add possibly missing semesters between start_semester and end_semester
-        if (count($this->semesters) > 1 && $semester->beginn < $start_semester->beginn) {
-            $this->setEndSemester($end_semester);
-        }
-    }
-
-    /**
-     * @param Semester|null $semester
-     */
-    public function setEndSemester(?Semester $semester)
-    {
-        $end_semester = $this->semesters->last();
-        $start_semester = $this->semesters->first();
-        if (
-            (is_null($end_semester) && is_null($semester))
-            || ($end_semester && $semester && $end_semester->id === $semester->id)) {
-            return;
-        }
-        if ($start_semester) {
-            if ($semester && $start_semester->beginn > $semester->beginn) {
-                throw new InvalidArgumentException('end-semester must start after start-semester');
-            }
-            $this->semesters = [];
-            if ($semester) {
-                $all_semester = SimpleCollection::createFromArray(Semester::getAll());
-                $this->semesters = $all_semester->findBy('beginn', [$start_semester->beginn, $semester->beginn], '>=<=');
-            }
-        } else {
-            if ($semester) {
-                $this->semesters[] = $semester;
-            }
-        }
-    }
-
-    /**
-     * Retrieves the first semester of a course, if applicable.
-     *
-     * @returns Semester|null Either the first semester of the course
-     *     or null, if no semester could be found.
-     */
-    public function getStartSemester()
-    {
-        if (count($this->semesters) > 0) {
-            return $this->semesters->first();
-        } else {
-            return Semester::findCurrent();
-        }
-    }
-
-    /**
-     * Retrieves the last semester of a course, if applicable.
-     *
-     * @returns Semester|null Either the last semester of the course
-     *     or null, if no semester could be found.
-     */
-    public function getEndSemester()
-    {
-        if (count($this->semesters) > 0) {
-            return $this->semesters->last();
-        }
-    }
-
-    /**
-     * Returns the readable semester duration as as string
-     * @return string : readable semester
-     */
-    public function getTextualSemester()
-    {
-        if (count($this->semesters) > 1) {
-            return $this->start_semester->short_name . ' - ' . $this->end_semester->short_name;
-        } elseif (count($this->semesters) === 1) {
-            return $this->start_semester->short_name;
-        } else {
-            return _('unbegrenzt');
-        }
-    }
-
-    /**
-     * Returns true if this course has no end-semester. Else false.
-     * @return bool : true if there is no end-semester
-     */
-    public function isOpenEnded()
-    {
-        return count($this->semesters) === 0;
-    }
-
-    /**
-     * Returns if this course is in the given semester
-     * @param Semester $semester : instance of the given semester
-     * @return bool : true if this course is part of this semester
-     */
-    public function isInSemester(Semester $semester)
-    {
-        if (count($this->semesters) > 0) {
-            foreach ($this->semesters as $s) {
-                if ($s->id === $semester->id) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public function getTeachers()
-    {
-        return $this->members->filter(function ($m) {
-            return $m['status'] === 'dozent';
-        });
-    }
-
-    public function getFreeSeats()
-    {
-        $free_seats = $this->admission_turnout - $this->getNumParticipants();
-        return max($free_seats, 0);
-    }
-
-    public function isWaitlistAvailable()
-    {
-        if ($this->admission_disable_waitlist) {
-            return false;
-        }
-
-        if ($this->admission_waitlist_max) {
-            return $this->admission_waitlist_max - $this->getNumWaiting() > 0;
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieves all members of a status
-     *
-     * @param String|Array $status        the status to filter with
-     * @param bool         $as_collection return collection instead of array?
-     * @return Array|SimpleCollection an array of all those members.
-     */
-    public function getMembersWithStatus($status, $as_collection = false)
-    {
-        $result = CourseMember::findByCourseAndStatus($this->id, $status);
-        return $as_collection
-             ? SimpleCollection::createFromArray($result)
-             : $result;
-    }
-
-    /**
-     * Retrieves the number of all members of a status
-     *
-     * @param String|Array $status  the status to filter with
-     *
-     * @return int the number of all those members.
-     */
-    public function countMembersWithStatus($status)
-    {
-        return CourseMember::countByCourseAndStatus($this->id, $status);
-    }
-
-    public function getNumParticipants()
-    {
-        return $this->countMembersWithStatus('user autor') + $this->getNumPrelimParticipants();
-    }
-
-    public function getNumPrelimParticipants()
-    {
-        return AdmissionApplication::countBySql(
-            "seminar_id = ? AND status = 'accepted'",
-            [$this->id]
-        );
-    }
-
-    public function getNumWaiting()
-    {
-        return AdmissionApplication::countBySql(
-            "seminar_id = ? AND status = 'awaiting'",
-            [$this->id]
-        );
-    }
-
-    public function getParticipantStatus($user_id)
-    {
-        $p_status = $this->members->findBy('user_id', $user_id)->val('status');
-        if (!$p_status) {
-            $p_status = $this->admission_applicants->findBy('user_id', $user_id)->val('status');
-        }
-        return $p_status;
-    }
-
-    /**
-    * Returns the semType object that is defined for the course
-    *
-    * @return SemType The semTypeObject for the course
-    */
-    public function getSemType()
-    {
-        $semTypes = SemType::getTypes();
-        if (isset($semTypes[$this->status])) {
-            return $semTypes[$this->status];
-        }
-
-        Log::error(sprintf('SemType not found id:%s status:%s', $this->id, $this->status));
-        return new SemType(['name' => 'Fehlerhafter Veranstaltungstyp']);
-    }
-
-    /**
-     * Returns the SemClass object that is defined for the course
-     *
-     * @return SemClass The SemClassObject for the course
-     */
-     public function getSemClass()
-     {
-         return $this->getSemType()->getClass();
-     }
-
-    /**
-     * Returns the full name of a course. If the important course numbers
-     * (IMPORTANT_SEMNUMBER) is set in global configs it will also display
-     * the coursenumber
-     *
-     * @param string formatting template name
-     * @return string Fullname
-     */
-    public function getFullName($format = 'default')
-    {
-        $template = [
-            'name'                 => '%1$s',
-            'name-semester'        => '%1$s (%4$s)',
-            'number-name'          => '%3$s %1$s',
-            'number-name-semester' => '%3$s %1$s (%4$s)',
-            'number-type-name'     => '%3$s %2$s: %1$s',
-            'sem-duration-name'    => '%4$s',
-            'type-name'            => '%2$s: %1$s',
-            'type-number-name'     => '%2$s: %3$s %1$s',
-        ];
-
-        if ($format === 'default' || !isset($template[$format])) {
-           $format = Config::get()->IMPORTANT_SEMNUMBER ? 'type-number-name' : 'type-name';
-        }
-        $sem_type = $this->getSemType();
-        $data[0] = $this->name;
-        $data[1] = $sem_type['name'];
-        $data[2] = $this->veranstaltungsnummer;
-        $data[3] = $this->getTextualSemester();
-        return trim(vsprintf($template[$format], array_map('trim', $data)));
-    }
-
-
-    /**
-     * Retrieves the course dates including cancelled dates ("ex-dates").
-     * The dates can be filtered by an optional time range. By default,
-     * all dates are retrieved.
-     *
-     * @param int $range_begin The begin timestamp of the time range.
-     *
-     * @param int $range_end The end timestamp of the time range.
-     *
-     * @returns SimpleCollection A collection of all retrieved dates and
-     *     cancelled dates.
-     */
-    public function getDatesWithExdates($range_begin = 0, $range_end = 0)
-    {
-        $dates = [];
-        if (($range_begin > 0) && ($range_end > 0) && ($range_end > $range_begin)) {
-            $ex_dates = $this->ex_dates->findBy('content', '', '<>')
-                          ->findBy('date', $range_begin, '>=')
-                          ->findBy('end_time', $range_end, '<=');
-            $dates = $this->dates->findBy('date', $range_begin, '>=')
-                          ->findBy('end_time', $range_end, '<=');
-            $dates->merge($ex_dates);
-        } else {
-            $dates = $this->ex_dates->findBy('content', '', '<>');
-            $dates->merge($this->dates);
-        }
-        $dates->uasort(function($a, $b) {
-            return $a->date - $b->date
-                ?: strnatcasecmp($a->getRoomName(), $b->getRoomName());
-        });
-        return $dates;
-    }
-
-    /**
-     * Sets this courses study areas to the given values.
-     *
-     * @param array $ids the new study areas
-     * @return bool Changes successfully saved?
-     */
-    public function setStudyAreas($ids)
-    {
-        $old = $this->study_areas->pluck('sem_tree_id');
-        $added = array_diff($ids, $old);
-        $removed = array_diff($old, $ids);
-        $success = false;
-        if ($added || $removed) {
-
-            $this->study_areas = SimpleCollection::createFromArray(StudipStudyArea::findMany($ids));
-
-            if ($this->store()) {
-                NotificationCenter::postNotification('CourseDidChangeStudyArea', $this);
-                $success = true;
-
-                foreach ($added as $one) {
-                    StudipLog::log('SEM_ADD_STUDYAREA', $this->id, $one);
-
-                    $area = $this->study_areas->find($one);
-                    if ($area->isModule()) {
-                        NotificationCenter::postNotification(
-                            'CourseAddedToModule',
-                            $area,
-                            ['module_id' => $one, 'course_id' => $this->id]
-                        );
-                    }
-                }
-
-                foreach ($removed as $one) {
-                    StudipLog::log('SEM_DELETE_STUDYAREA', $this->id, $one);
-
-                    $area = StudipStudyArea::find($one);
-                    if ($area->isModule()) {
-                        NotificationCenter::postNotification(
-                            'CourseRemovedFromModule',
-                            $area,
-                            ['module_id' => $one, 'course_id' => $this->id]
-                        );
-                    }
-                }
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Is the current course visible for the current user?
-     * @param string $user_id
-     * @return bool Visible?
-     */
-    public function isVisibleForUser($user_id = null)
-    {
-        return $this->visible
-            || $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM, $user_id)
-            || $GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id);
-    }
-
-    /**
-     * Returns a descriptive text for the range type.
-     *
-     * @return string
-     */
-    public function describeRange()
-    {
-        return _('Veranstaltung');
-    }
-
-    /**
-     * Returns a unique identificator for the range type.
-     *
-     * @return string
-     */
-    public function getRangeType()
-    {
-        return 'course';
-    }
-
-    /**
-     * Returns the id of the current range
-     *
-     * @return string
-     */
-    public function getRangeId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfiguration()
-    {
-        return CourseConfig::get($this);
-    }
-
-    /**
-     * Decides whether the user may access the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     * @todo Check permissions
-     */
-    public function isAccessibleToUser($user_id = null)
-    {
-        if ($user_id === null) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        return $GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id);
-    }
-
-    /**
-     * Decides whether the user may edit/alter the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     * @todo Check permissions
-     */
-    public function isEditableByUser($user_id = null)
-    {
-        if ($user_id === null) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        return $GLOBALS['perm']->have_studip_perm('tutor', $this->id, $user_id);
-    }
-
-    /**
-     * Returns the appropriate icon for the completion status.
-     *
-     * Mapping (completion -> icon role):
-     * - 0 => status-red
-     * - 1 => status-yellow
-     * - 2 => status-green
-     *
-     * @return Icon class
-     */
-    public function getCompletionIcon()
-    {
-        $role = Icon::ROLE_STATUS_RED;
-        if ($this->completion == 1) {
-            $role = Icon::ROLE_STATUS_YELLOW;
-        } elseif ($this->completion == 2) {
-            $role = Icon::ROLE_STATUS_GREEN;
-        }
-        return Icon::create('radiobutton-checked', $role);
-    }
-
-    /**
-     * Returns the appropriate label for the completion status.
-     *
-     * @return string
-     */
-    public function getCompetionLabel(): string
-    {
-        return [
-            0 => _('unvollständig'),
-            1 => _('in Bearbeitung'),
-            2 => _('fertig'),
-        ][$this->completion] ?? _('undefiniert');
-    }
-
-    /**
-     * Generates a general log entry if the course were changed.
-     * Furthermore, this method emits notifications when the
-     * start and/or the end semester has/have changed.
-     */
-    protected function logStore()
-    {
-        if ($this->isFieldDirty('start_time')) {
-            //Log change of start semester:
-            StudipLog::log('SEM_SET_STARTSEMESTER', $this->id, isset($this->start_semester) ? $this->start_semester->name : _('unbegrenzt'));
-            NotificationCenter::postNotification('CourseDidChangeSchedule', $this);
-        }
-        if ($this->isFieldDirty('duration_time')) {
-            StudipLog::log('SEM_SET_ENDSEMESTER', $this->id, $this->getTextualSemester());
-            NotificationCenter::postNotification('CourseDidChangeSchedule', $this);
-        }
-
-        $log = [];
-        if ($this->isFieldDirty('admission_prelim')) {
-            $log[] = $this->admission_prelim ?  _('Neuer Anmeldemodus: Vorläufiger Eintrag') : _('Neuer Anmeldemodus: Direkter Eintrag');
-        }
-
-        if ($this->isFieldDirty('admission_binding')) {
-            $log[] = $this->admission_binding? _('Anmeldung verbindlich') : _('Anmeldung unverbindlich');
-        }
-
-        if ($this->isFieldDirty('admission_turnout')) {
-            $log[] = sprintf(_('Neue Teilnehmerzahl: %s'), (int)$this->admission_turnout);
-        }
-
-        if ($this->isFieldDirty('admission_disable_waitlist')) {
-            $log[] = $this->admission_disable_waitlist ? _('Warteliste aktiviert') : _('Warteliste deaktiviert');
-        }
-
-        if ($this->isFieldDirty('admission_waitlist_max')) {
-            $log[] = sprintf(_('Plätze auf der Warteliste geändert: %u'), (int)$this->admission_waitlist_max);
-        }
-
-        if ($this->isFieldDirty('admission_disable_waitlist_move')) {
-            $log[] = $this->admission_disable_waitlist ? _('Nachrücken aktiviert') : _('Nachrücken deaktiviert');
-        }
-
-        if ($this->isFieldDirty('admission_prelim_txt')) {
-            if ($this->admission_prelim_txt) {
-                $log[] = sprintf(_('Neuer Hinweistext bei vorläufigen Eintragungen: %s'), strip_tags(kill_format($this->admission_prelim_txt)));
-            } else {
-                $log[] = _('Hinweistext bei vorläufigen Eintragungen wurde entfert');
-            }
-        }
-
-        if (!empty($log)) {
-            StudipLog::log(
-                'SEM_CHANGED_ACCESS',
-                $this->id,
-                null,
-                '',
-                implode(' - ', $log)
-            );
-        }
-
-        if ($this->isFieldDirty('visible')) {
-            StudipLog::log($this->visible ? 'SEM_VISIBLE' : 'SEM_INVISIBLE', $this->id);
-        }
-    }
-
-    /**
-     * Called directly before storing the object to edit the columns start_time and duration_time
-     * which are both deprecated but are still in use for older plugins.
-     */
-    public function cbSetStartAndDurationTime()
-    {
-        if ($this->isFieldDirty('start_time')) {
-            $this->setStartSemester(Semester::findByTimestamp($this->start_time));
-        }
-        if ($this->isFieldDirty('duration_time')) {
-            $this->setEndSemester($this->duration_time == -1 ? null : Semester::findByTimestamp($this->start_time + $this->duration_time));
-        }
-        if ($this->isOpenEnded()) {
-            $this->start_time = $this->start_time ?: Semester::findCurrent()->beginn ?? time();
-            $this->duration_time = -1;
-        } else {
-            $this->start_time = $this->getStartSemester()->beginn;
-            $this->duration_time = $this->getEndSemester()->beginn - $this->start_time;
-        }
-    }
-
-
-    //StudipItem interface implementation:
-
-    public function getItemName($long_format = true)
-    {
-        if ($long_format) {
-            return $this->getFullName();
-        } else {
-            return $this->name;
-        }
-    }
-
-    public function getItemURL()
-    {
-        return URLHelper::getURL(
-            'dispatch.php/course/details/index',
-            [
-                'cid' => $this->id
-            ]
-        );
-    }
-
-    public function getItemAvatarURL()
-    {
-        $avatar = CourseAvatar::getAvatar($this->id);
-        if ($avatar) {
-            return $avatar->getURL(Avatar::NORMAL);
-        }
-        return '';
-    }
-
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findThru($storage->user_id, [
-            'thru_table'        => 'seminar_user',
-            'thru_key'          => 'user_id',
-            'thru_assoc_key'    => 'Seminar_id',
-            'assoc_foreign_key' => 'Seminar_id',
-        ]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Seminare'), 'seminare', $field_data);
-            }
-        }
-    }
-    public function getRangeName()
-    {
-        return $this->name;
-    }
-
-    public function getRangeIcon($role)
-    {
-        return Icon::create('seminar', $role);
-    }
-
-    public function getRangeUrl()
-    {
-        return 'course/overview';
-    }
-
-    public function getRangeCourseId()
-    {
-        return $this->Seminar_id;
-    }
-
-    public function isRangeAccessible(string $user_id = null): bool
-    {
-        $user_id = $user_id ?? $GLOBALS['user']->id;
-        return $GLOBALS['perm']->have_studip_perm('autor', $this->Seminar_id, $user_id);
-    }
-
-
-    public function getLink() : StudipLink
-    {
-        return new StudipLink($this->getItemURL(), $this->name, Icon::create('seminar'));
-    }
-
-
-    /**
-     * Returns a list of courses for the specified user.
-     * Permission levels may be supplied to limit the course list.
-     *
-     * @param string $user_id The ID of the user whose courses shall be retrieved.
-     *
-     * @param string[] $perms The permission levels of the user that shall be
-     *     regarded when retrieving courses.
-     *
-     * @param bool $with_deputies Whether to include courses where the user is
-     *     a deputy (true) or not (false). Defaults to true.
-     *
-     * @return Course[] A list of courses.
-     */
-    public static function findByUser($user_id, $perms = [], $with_deputies = true)
-    {
-        if (!$user_id) {
-            return [];
-        }
-
-        $db = DBManager::get();
-        $sql = "SELECT `seminar_id`
-                FROM `seminar_user`
-                WHERE `user_id` = :user_id";
-        $sql_params = ['user_id' => $user_id];
-        if (is_array($perms) && count($perms)) {
-            $sql .= ' AND `status` IN (:perms)';
-            $sql_params['perms'] = $perms;
-        }
-        $seminar_ids = $db->fetchFirst($sql, $sql_params);
-        if (Config::get()->DEPUTIES_ENABLE && $with_deputies) {
-            $sql = 'SELECT range_id FROM `deputies` WHERE `deputies`.`user_id` = :user_id';
-            $seminar_ids = array_merge($seminar_ids, $db->fetchFirst($sql, $sql_params));
-        }
-
-        $name_sort = Config::get()->IMPORTANT_SEMNUMBER ? 'VeranstaltungsNummer, Name' : 'Name';
-
-        return Course::findBySQL(
-            "LEFT JOIN semester_courses ON (semester_courses.course_id = seminare.Seminar_id)
-             WHERE Seminar_id IN (?)
-             GROUP BY seminare.Seminar_id
-             ORDER BY semester_courses.semester_id IS NULL DESC, start_time DESC, {$name_sort}",
-            [$seminar_ids]
-        );
-    }
-
-    /**
-     * Returns whether this course is a studygroup
-     * @return bool
-     */
-    public function isStudygroup()
-    {
-        return in_array($this->status, studygroup_sem_types());
-    }
-
-    /**
-     *
-     */
-    public function setDefaultTools()
-    {
-        $this->tools = [];
-        foreach (array_values($this->getSemClass()->getActivatedModuleObjects()) as $module) {
-            PluginManager::getInstance()->setPluginActivated($module->getPluginId(), $this->id, true);
-            $this->tools[] = ToolActivation::find([$this->id, $module->getPluginId()]);
-        }
-    }
-
-    /**
-     * @param $name string name of tool / plugin
-     * @return bool
-     */
-    public function isToolActive($name)
-    {
-        $plugin = PluginEngine::getPlugin($name);
-        return $plugin && $this->tools->findOneby('plugin_id', $plugin->getPluginId());
-    }
-
-    /**
-     * returns all activated plugins/modules for this course
-     * @return StudipModule[]
-     */
-    public function getActivatedTools()
-    {
-        return array_filter($this->tools->getStudipModule());
-    }
-
-    /**
-     * @see Range::__toString()
-     */
-    public function __toString() : string
-    {
-        return $this->getFullName();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public static function getCalendarOwner(string $owner_id): ?\Studip\Calendar\Owner
-    {
-        return self::find($owner_id);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isCalendarReadable(?string $user_id = null): bool
-    {
-        if ($user_id === null) {
-            $user_id = User::findCurrent()->id;
-        }
-
-        //Calendar read permissions are granted for all participants
-        //that have at least user permissions.
-        return $GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isCalendarWritable(string $user_id = null): bool
-    {
-        if ($user_id === null) {
-            $user_id = User::findCurrent()->id;
-        }
-
-        //Calendar write permissions are granted for all participants
-        //that have autor permissions or higher.
-        return $GLOBALS['perm']->have_studip_perm('autor', $this->id, $user_id);
-    }
-
-    /**
-     * Get user information for all users in this course
-     *
-     */
-    public function getMembersData(?string $status = ''): array
-    {
-        $result = [];
-
-        if (!$status) {
-            foreach ($this->members->orderBy('position, nachname') as $member) {
-                $result[$member->user_id] = $member->getExportData();
-            }
-            foreach ($this->admission_applicants->findBy('status', 'accepted')->orderBy('position') as $member) {
-                $result[$member->user_id] = $member->getExportData();
-            }
-        } elseif ($status === 'awaiting') {
-            foreach ($this->admission_applicants->findBy('status', $status)->orderBy('position') as $member) {
-                $result[$member->user_id] = $member->getExportData();
-            }
-        } elseif ($status === 'claiming') {
-            $cs = CourseSet::getSetForCourse($this->id);
-            if (is_object($cs) && !$cs->hasAlgorithmRun()) {
-                $claiming_users = User::findFullMany(array_keys(AdmissionPriority::getPrioritiesByCourse($cs->getId(), $this->id)), 'ORDER BY nachname');
-                foreach ($claiming_users as $claiming_user) {
-                        $studycourse = [];
-                        $claiming_user->studycourses->map(function($sc) use (&$studycourse) {
-                            $studycourse[]= $sc->studycourse->name .  ',' . $sc->degree->name . ',' . $sc->semester;
-                        });
-                        $export_data = [
-                            'status' => $status,
-                            'salutation' => $claiming_user->salutation,
-                            'Titel' => $claiming_user->title_front,
-                            'Vorname' => $claiming_user->vorname,
-                            'Nachname' => $claiming_user->nachname,
-                            'Titel2' => $claiming_user->title_rear,
-                            'username' => $claiming_user->username,
-                            'privadr' => $claiming_user->privadr,
-                            'privatnr' => $claiming_user->privatnr,
-                            'Email' => $claiming_user->email,
-                            'Anmeldedatum' => '',
-                            'Matrikelnummer' => $claiming_user->matriculation_number,
-                            'studiengaenge' => implode(';', $studycourse),
-                            'position' => 0,
-                        ];
-                    $result[$claiming_user->user_id] = $export_data;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-}
diff --git a/lib/models/Course.php b/lib/models/Course.php
new file mode 100644
index 0000000..bfea7a0
--- /dev/null
+++ b/lib/models/Course.php
@@ -0,0 +1,1181 @@
+<?php
+/**
+ * Course.class.php
+ * model class for table seminare
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for seminar_id
+ * @property string $seminar_id database column
+ * @property string|null $veranstaltungsnummer database column
+ * @property string $institut_id database column
+ * @property I18NString $name database column
+ * @property I18NString|null $untertitel database column
+ * @property int $status database column
+ * @property I18NString $beschreibung database column
+ * @property I18NString|null $ort database column
+ * @property string|null $sonstiges database column
+ * @property int $lesezugriff database column
+ * @property int $schreibzugriff database column
+ * @property int|null $start_time database column
+ * @property int|null $duration_time database column
+ * @property I18NString|null $art database column
+ * @property I18NString|null $teilnehmer database column
+ * @property I18NString|null $vorrausetzungen database column
+ * @property I18NString|null $lernorga database column
+ * @property I18NString|null $leistungsnachweis database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property string|null $ects database column
+ * @property int|null $admission_turnout database column
+ * @property int|null $admission_binding database column
+ * @property int $admission_prelim database column
+ * @property string|null $admission_prelim_txt database column
+ * @property int $admission_disable_waitlist database column
+ * @property int $visible database column
+ * @property int|null $showscore database column
+ * @property string|null $aux_lock_rule database column
+ * @property int $aux_lock_rule_forced database column
+ * @property string|null $lock_rule database column
+ * @property int $admission_waitlist_max database column
+ * @property int $admission_disable_waitlist_move database column
+ * @property int $completion database column
+ * @property string|null $parent_course database column
+ * @property SimpleORMapCollection|CourseTopic[] $topics has_many CourseTopic
+ * @property SimpleORMapCollection|CourseDate[] $dates has_many CourseDate
+ * @property SimpleORMapCollection|CourseExDate[] $ex_dates has_many CourseExDate
+ * @property SimpleORMapCollection|CourseMember[] $members has_many CourseMember
+ * @property SimpleORMapCollection|Deputy[] $deputies has_many Deputy
+ * @property SimpleORMapCollection|Statusgruppen[] $statusgruppen has_many Statusgruppen
+ * @property SimpleORMapCollection|AdmissionApplication[] $admission_applicants has_many AdmissionApplication
+ * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
+ * @property SimpleORMapCollection|SeminarCycleDate[] $cycles has_many SeminarCycleDate
+ * @property SimpleORMapCollection|BlubberThread[] $blubberthreads has_many BlubberThread
+ * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock
+ * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest
+ * @property SimpleORMapCollection|Course[] $children has_many Course
+ * @property SimpleORMapCollection|ToolActivation[] $tools has_many ToolActivation
+ * @property SimpleORMapCollection|CourseMemberNotification[] $member_notifications has_many CourseMemberNotification
+ * @property SimpleORMapCollection|Courseware\Unit[] $courseware_units has_many Courseware\Unit
+ * @property Institute $home_institut belongs_to Institute
+ * @property AuxLockRule|null $aux belongs_to AuxLockRule
+ * @property Course|null $parent belongs_to Course
+ * @property SimpleORMapCollection|Semester[] $semesters has_and_belongs_to_many Semester
+ * @property SimpleORMapCollection|StudipStudyArea[] $study_areas has_and_belongs_to_many StudipStudyArea
+ * @property SimpleORMapCollection|Institute[] $institutes has_and_belongs_to_many Institute
+ * @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain
+ * @property-read mixed $teachers additional field
+ * @property mixed $end_time additional field
+ * @property mixed $start_semester additional field
+ * @property mixed $end_semester additional field
+ * @property-read mixed $semester_text additional field
+ * @property-read mixed $config additional field
+ */
+
+class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, FeedbackRange, Studip\Calendar\Owner
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'seminare';
+        $config['has_many']['topics'] = [
+            'class_name' => CourseTopic::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['dates'] = [
+            'class_name'        => CourseDate::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+            'order_by'          => 'ORDER BY date'
+        ];
+        $config['has_many']['ex_dates'] = [
+            'class_name'        => CourseExDate::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_many']['members'] = [
+            'class_name' => CourseMember::class,
+            'assoc_func' => 'findByCourse',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['deputies'] = [
+            'class_name' => Deputy::class,
+            'assoc_func' => 'findByRange_id',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['statusgruppen'] = [
+            'class_name' => Statusgruppen::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['admission_applicants'] = [
+            'class_name' => AdmissionApplication::class,
+            'assoc_func' => 'findByCourse',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['datafields'] = [
+            'class_name' => DatafieldEntryModel::class,
+            'assoc_func' => 'findByModel',
+            'assoc_foreign_key' => function ($model, $params) {
+                $model->setValue('range_id', $params[0]->id);
+            },
+            'foreign_key' => function ($course) {
+                return [$course];
+            },
+            'on_delete' => 'delete',
+            'on_store'  => 'store',
+        ];
+        $config['has_many']['cycles'] = [
+            'class_name' => SeminarCycleDate::class,
+            'assoc_func' => 'findBySeminar',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['blubberthreads'] = [
+            'class_name' => BlubberThread::class,
+            'assoc_func' => 'findBySeminar',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['consultation_blocks'] = [
+            'class_name'        => ConsultationBlock::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+        ];
+
+        $config['has_and_belongs_to_many']['semesters'] = [
+            'class_name'     => Semester::class,
+            'thru_table'     => 'semester_courses',
+            'thru_key'       => 'course_id',
+            'thru_assoc_key' => 'semester_id',
+            'order_by'       => 'ORDER BY beginn ASC',
+            'on_delete'      => 'delete',
+            'on_store'       => 'store',
+        ];
+
+        $config['belongs_to']['home_institut'] = [
+            'class_name' => Institute::class,
+            'foreign_key' => 'institut_id',
+            'assoc_func'  => 'find',
+        ];
+        $config['belongs_to']['aux'] = [
+            'class_name' => AuxLockRule::class,
+            'foreign_key' => 'aux_lock_rule',
+        ];
+        $config['has_and_belongs_to_many']['study_areas'] = [
+            'class_name' => StudipStudyArea::class,
+            'thru_table' => 'seminar_sem_tree',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_and_belongs_to_many']['institutes'] = [
+            'class_name' => Institute::class,
+            'thru_table' => 'seminar_inst',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+
+        $config['has_and_belongs_to_many']['domains'] = [
+            'class_name'        => UserDomain::class,
+            'thru_table'        => 'seminar_userdomains',
+            'on_delete'          => 'delete',
+            'on_store'           => 'store',
+            'order_by'          => 'ORDER BY name',
+        ];
+
+        $config['has_many']['room_requests'] = [
+            'class_name'        => RoomRequest::class,
+            'assoc_foreign_key' => 'course_id',
+            'on_delete'         => 'delete',
+        ];
+        $config['belongs_to']['parent'] = [
+            'class_name' => Course::class,
+            'foreign_key' => 'parent_course'
+        ];
+        $config['has_many']['children'] = [
+            'class_name'        => Course::class,
+            'assoc_foreign_key' => 'parent_course',
+            'order_by'          => 'GROUP BY seminar_id ORDER BY VeranstaltungsNummer, Name'
+        ];
+        $config['has_many']['tools'] = [
+            'class_name'        => ToolActivation::class,
+            'assoc_foreign_key' => 'range_id',
+            'order_by'          => 'ORDER BY position',
+            'on_delete'         => 'delete',
+        ];
+        $config['has_many']['member_notifications'] = [
+            'class_name'        => CourseMemberNotification::class,
+            'on_delete'         => 'delete',
+        ];
+
+        $config['has_many']['courseware_units'] = [
+            'class_name' => \Courseware\Unit::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'  => 'delete',
+        ];
+
+        $config['default_values']['lesezugriff'] = 1;
+        $config['default_values']['schreibzugriff'] = 1;
+        $config['default_values']['duration_time'] = 0;
+
+        $config['additional_fields']['teachers'] = [
+            'get' => 'getTeachers'
+        ];
+        $config['additional_fields']['end_time'] = true;
+
+        $config['additional_fields']['start_semester'] = [
+            'get' => 'getStartSemester',
+            'set' => '_set_semester'
+        ];
+        $config['additional_fields']['end_semester'] = [
+            'get' => 'getEndSemester',
+            'set' => '_set_semester'
+        ];
+        $config['additional_fields']['semester_text'] = [
+            'get' => 'getTextualSemester'
+        ];
+
+        $config['additional_fields']['config'] = [
+            'get' => function (Course $course) {
+                return $course->getConfiguration();
+            }
+        ];
+
+        $config['notification_map']['after_create'] = 'CourseDidCreateOrUpdate';
+        $config['notification_map']['after_store'] = 'CourseDidCreateOrUpdate';
+
+        $config['i18n_fields']['name'] = true;
+        $config['i18n_fields']['untertitel'] = true;
+        $config['i18n_fields']['beschreibung'] = true;
+        $config['i18n_fields']['art'] = true;
+        $config['i18n_fields']['teilnehmer'] = true;
+        $config['i18n_fields']['vorrausetzungen'] = true;
+        $config['i18n_fields']['lernorga'] = true;
+        $config['i18n_fields']['leistungsnachweis'] = true;
+        $config['i18n_fields']['ort'] = true;
+
+        $config['registered_callbacks']['before_update'][] = 'logStore';
+        $config['registered_callbacks']['before_store'][] = 'cbSetStartAndDurationTime';
+        $config['registered_callbacks']['after_create'][] = 'setDefaultTools';
+        $config['registered_callbacks']['after_delete'][] = function ($course) {
+            CourseAvatar::getAvatar($course->id)->reset();
+            FeedbackElement::deleteBySQL('course_id = ?', [$course->id]);
+            // Remove subcourse relations, leaving subcourses intact.
+            DBManager::get()->execute(
+                "UPDATE `seminare` SET `parent_course` = NULL WHERE `parent_course` = :course",
+                ['course' => $course->id]
+            );
+            DBManager::get()->execute(
+                "DELETE FROM `forum_visits` WHERE `seminar_id` = ?",
+                [$course->id]
+            );
+        };
+
+        parent::configure($config);
+    }
+
+
+    /**
+     * Returns the currently active course or false if none is active.
+     *
+     * @return Course object of currently active course, null otherwise
+     * @since 3.0
+     */
+    public static function findCurrent()
+    {
+        if (Context::isCourse()) {
+            return Context::get();
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the associated mvv modules for a given course id.
+     *
+     * @param string     $course_id
+     * @param array|null $statusses Limit the results by a given module status
+     * @return Modul[]
+     */
+    public static function getMVVModulesForCourseId(string $course_id, ?array $statusses = null): array
+    {
+        $query = "SELECT mvv_modul.*
+                  FROM mvv_lvgruppe_seminar
+                  JOIN `mvv_lvgruppe` ON (`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe`.`lvgruppe_id`)
+                  JOIN `mvv_lvgruppe_modulteil` ON (`mvv_lvgruppe_seminar`.`lvgruppe_id` = `mvv_lvgruppe_modulteil`.`lvgruppe_id`)
+                  JOIN `mvv_modulteil` ON (`mvv_lvgruppe_modulteil`.`modulteil_id` = `mvv_modulteil`.`modulteil_id`)
+                  JOIN `mvv_modul` ON (`mvv_modulteil`.`modul_id` = `mvv_modul`.`modul_id`)
+                  WHERE seminar_id = ?";
+        $parameters = [$course_id];
+
+        if ($statusses !== null) {
+            $query .= ' AND `mvv_modul`.`stat` IN (?)';
+            $parameters[] = $statusses;
+        }
+
+        return DBManager::get()->fetchAll($query, $parameters, function ($row) {
+            return Modul::buildExisting($row);
+        });
+    }
+
+    public function getEnd_Time()
+    {
+        return $this->duration_time == -1 ? -1 : $this->start_time + $this->duration_time;
+    }
+
+    public function setEnd_Time($value)
+    {
+        if ($value == -1) {
+            $this->duration_time = -1;
+        } elseif ($this->start_time > 0 && $value > $this->start_time) {
+            $this->duration_time = $value - $this->start_time;
+        } else {
+            $this->duration_time = 0;
+        }
+    }
+
+    public function _set_semester($field, $value)
+    {
+        $method = 'set' . ($field === 'start_semester' ? 'StartSemester' : 'EndSemester');
+        $this->$method($value);
+    }
+
+    /**
+     * @param Semester $semester
+     */
+    public function setStartSemester(Semester $semester)
+    {
+        $end_semester = $this->semesters->last();
+        $start_semester = $this->semesters->first();
+        if ($start_semester && $start_semester->id === $semester->id) {
+            return;
+        }
+        if ($end_semester) {
+            if (count($this->semesters) > 1 && $end_semester->beginn < $semester->beginn) {
+                throw new InvalidArgumentException('start-semester must start before end-semester');
+            }
+            foreach ($this->semesters as $key => $one_semester) {
+                if ($one_semester->beginn < $semester->beginn) {
+                    $this->semesters->offsetUnset($key);
+                }
+            }
+        }
+        $this->semesters[] = $semester;
+        $this->semesters->orderBy('beginn asc');
+        //add possibly missing semesters between start_semester and end_semester
+        if (count($this->semesters) > 1 && $semester->beginn < $start_semester->beginn) {
+            $this->setEndSemester($end_semester);
+        }
+    }
+
+    /**
+     * @param Semester|null $semester
+     */
+    public function setEndSemester(?Semester $semester)
+    {
+        $end_semester = $this->semesters->last();
+        $start_semester = $this->semesters->first();
+        if (
+            (is_null($end_semester) && is_null($semester))
+            || ($end_semester && $semester && $end_semester->id === $semester->id)) {
+            return;
+        }
+        if ($start_semester) {
+            if ($semester && $start_semester->beginn > $semester->beginn) {
+                throw new InvalidArgumentException('end-semester must start after start-semester');
+            }
+            $this->semesters = [];
+            if ($semester) {
+                $all_semester = SimpleCollection::createFromArray(Semester::getAll());
+                $this->semesters = $all_semester->findBy('beginn', [$start_semester->beginn, $semester->beginn], '>=<=');
+            }
+        } else {
+            if ($semester) {
+                $this->semesters[] = $semester;
+            }
+        }
+    }
+
+    /**
+     * Retrieves the first semester of a course, if applicable.
+     *
+     * @returns Semester|null Either the first semester of the course
+     *     or null, if no semester could be found.
+     */
+    public function getStartSemester()
+    {
+        if (count($this->semesters) > 0) {
+            return $this->semesters->first();
+        } else {
+            return Semester::findCurrent();
+        }
+    }
+
+    /**
+     * Retrieves the last semester of a course, if applicable.
+     *
+     * @returns Semester|null Either the last semester of the course
+     *     or null, if no semester could be found.
+     */
+    public function getEndSemester()
+    {
+        if (count($this->semesters) > 0) {
+            return $this->semesters->last();
+        }
+    }
+
+    /**
+     * Returns the readable semester duration as as string
+     * @return string : readable semester
+     */
+    public function getTextualSemester()
+    {
+        if (count($this->semesters) > 1) {
+            return $this->start_semester->short_name . ' - ' . $this->end_semester->short_name;
+        } elseif (count($this->semesters) === 1) {
+            return $this->start_semester->short_name;
+        } else {
+            return _('unbegrenzt');
+        }
+    }
+
+    /**
+     * Returns true if this course has no end-semester. Else false.
+     * @return bool : true if there is no end-semester
+     */
+    public function isOpenEnded()
+    {
+        return count($this->semesters) === 0;
+    }
+
+    /**
+     * Returns if this course is in the given semester
+     * @param Semester $semester : instance of the given semester
+     * @return bool : true if this course is part of this semester
+     */
+    public function isInSemester(Semester $semester)
+    {
+        if (count($this->semesters) > 0) {
+            foreach ($this->semesters as $s) {
+                if ($s->id === $semester->id) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public function getTeachers()
+    {
+        return $this->members->filter(function ($m) {
+            return $m['status'] === 'dozent';
+        });
+    }
+
+    public function getFreeSeats()
+    {
+        $free_seats = $this->admission_turnout - $this->getNumParticipants();
+        return max($free_seats, 0);
+    }
+
+    public function isWaitlistAvailable()
+    {
+        if ($this->admission_disable_waitlist) {
+            return false;
+        }
+
+        if ($this->admission_waitlist_max) {
+            return $this->admission_waitlist_max - $this->getNumWaiting() > 0;
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieves all members of a status
+     *
+     * @param String|Array $status        the status to filter with
+     * @param bool         $as_collection return collection instead of array?
+     * @return Array|SimpleCollection an array of all those members.
+     */
+    public function getMembersWithStatus($status, $as_collection = false)
+    {
+        $result = CourseMember::findByCourseAndStatus($this->id, $status);
+        return $as_collection
+             ? SimpleCollection::createFromArray($result)
+             : $result;
+    }
+
+    /**
+     * Retrieves the number of all members of a status
+     *
+     * @param String|Array $status  the status to filter with
+     *
+     * @return int the number of all those members.
+     */
+    public function countMembersWithStatus($status)
+    {
+        return CourseMember::countByCourseAndStatus($this->id, $status);
+    }
+
+    public function getNumParticipants()
+    {
+        return $this->countMembersWithStatus('user autor') + $this->getNumPrelimParticipants();
+    }
+
+    public function getNumPrelimParticipants()
+    {
+        return AdmissionApplication::countBySql(
+            "seminar_id = ? AND status = 'accepted'",
+            [$this->id]
+        );
+    }
+
+    public function getNumWaiting()
+    {
+        return AdmissionApplication::countBySql(
+            "seminar_id = ? AND status = 'awaiting'",
+            [$this->id]
+        );
+    }
+
+    public function getParticipantStatus($user_id)
+    {
+        $p_status = $this->members->findBy('user_id', $user_id)->val('status');
+        if (!$p_status) {
+            $p_status = $this->admission_applicants->findBy('user_id', $user_id)->val('status');
+        }
+        return $p_status;
+    }
+
+    /**
+    * Returns the semType object that is defined for the course
+    *
+    * @return SemType The semTypeObject for the course
+    */
+    public function getSemType()
+    {
+        $semTypes = SemType::getTypes();
+        if (isset($semTypes[$this->status])) {
+            return $semTypes[$this->status];
+        }
+
+        Log::error(sprintf('SemType not found id:%s status:%s', $this->id, $this->status));
+        return new SemType(['name' => 'Fehlerhafter Veranstaltungstyp']);
+    }
+
+    /**
+     * Returns the SemClass object that is defined for the course
+     *
+     * @return SemClass The SemClassObject for the course
+     */
+     public function getSemClass()
+     {
+         return $this->getSemType()->getClass();
+     }
+
+    /**
+     * Returns the full name of a course. If the important course numbers
+     * (IMPORTANT_SEMNUMBER) is set in global configs it will also display
+     * the coursenumber
+     *
+     * @param string formatting template name
+     * @return string Fullname
+     */
+    public function getFullName($format = 'default')
+    {
+        $template = [
+            'name'                 => '%1$s',
+            'name-semester'        => '%1$s (%4$s)',
+            'number-name'          => '%3$s %1$s',
+            'number-name-semester' => '%3$s %1$s (%4$s)',
+            'number-type-name'     => '%3$s %2$s: %1$s',
+            'sem-duration-name'    => '%4$s',
+            'type-name'            => '%2$s: %1$s',
+            'type-number-name'     => '%2$s: %3$s %1$s',
+        ];
+
+        if ($format === 'default' || !isset($template[$format])) {
+           $format = Config::get()->IMPORTANT_SEMNUMBER ? 'type-number-name' : 'type-name';
+        }
+        $sem_type = $this->getSemType();
+        $data[0] = $this->name;
+        $data[1] = $sem_type['name'];
+        $data[2] = $this->veranstaltungsnummer;
+        $data[3] = $this->getTextualSemester();
+        return trim(vsprintf($template[$format], array_map('trim', $data)));
+    }
+
+
+    /**
+     * Retrieves the course dates including cancelled dates ("ex-dates").
+     * The dates can be filtered by an optional time range. By default,
+     * all dates are retrieved.
+     *
+     * @param int $range_begin The begin timestamp of the time range.
+     *
+     * @param int $range_end The end timestamp of the time range.
+     *
+     * @returns SimpleCollection A collection of all retrieved dates and
+     *     cancelled dates.
+     */
+    public function getDatesWithExdates($range_begin = 0, $range_end = 0)
+    {
+        $dates = [];
+        if (($range_begin > 0) && ($range_end > 0) && ($range_end > $range_begin)) {
+            $ex_dates = $this->ex_dates->findBy('content', '', '<>')
+                          ->findBy('date', $range_begin, '>=')
+                          ->findBy('end_time', $range_end, '<=');
+            $dates = $this->dates->findBy('date', $range_begin, '>=')
+                          ->findBy('end_time', $range_end, '<=');
+            $dates->merge($ex_dates);
+        } else {
+            $dates = $this->ex_dates->findBy('content', '', '<>');
+            $dates->merge($this->dates);
+        }
+        $dates->uasort(function($a, $b) {
+            return $a->date - $b->date
+                ?: strnatcasecmp($a->getRoomName(), $b->getRoomName());
+        });
+        return $dates;
+    }
+
+    /**
+     * Sets this courses study areas to the given values.
+     *
+     * @param array $ids the new study areas
+     * @return bool Changes successfully saved?
+     */
+    public function setStudyAreas($ids)
+    {
+        $old = $this->study_areas->pluck('sem_tree_id');
+        $added = array_diff($ids, $old);
+        $removed = array_diff($old, $ids);
+        $success = false;
+        if ($added || $removed) {
+
+            $this->study_areas = SimpleCollection::createFromArray(StudipStudyArea::findMany($ids));
+
+            if ($this->store()) {
+                NotificationCenter::postNotification('CourseDidChangeStudyArea', $this);
+                $success = true;
+
+                foreach ($added as $one) {
+                    StudipLog::log('SEM_ADD_STUDYAREA', $this->id, $one);
+
+                    $area = $this->study_areas->find($one);
+                    if ($area->isModule()) {
+                        NotificationCenter::postNotification(
+                            'CourseAddedToModule',
+                            $area,
+                            ['module_id' => $one, 'course_id' => $this->id]
+                        );
+                    }
+                }
+
+                foreach ($removed as $one) {
+                    StudipLog::log('SEM_DELETE_STUDYAREA', $this->id, $one);
+
+                    $area = StudipStudyArea::find($one);
+                    if ($area->isModule()) {
+                        NotificationCenter::postNotification(
+                            'CourseRemovedFromModule',
+                            $area,
+                            ['module_id' => $one, 'course_id' => $this->id]
+                        );
+                    }
+                }
+            }
+        }
+
+        return $success;
+    }
+
+    /**
+     * Is the current course visible for the current user?
+     * @param string $user_id
+     * @return bool Visible?
+     */
+    public function isVisibleForUser($user_id = null)
+    {
+        return $this->visible
+            || $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM, $user_id)
+            || $GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id);
+    }
+
+    /**
+     * Returns a descriptive text for the range type.
+     *
+     * @return string
+     */
+    public function describeRange()
+    {
+        return _('Veranstaltung');
+    }
+
+    /**
+     * Returns a unique identificator for the range type.
+     *
+     * @return string
+     */
+    public function getRangeType()
+    {
+        return 'course';
+    }
+
+    /**
+     * Returns the id of the current range
+     *
+     * @return string
+     */
+    public function getRangeId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfiguration()
+    {
+        return CourseConfig::get($this);
+    }
+
+    /**
+     * Decides whether the user may access the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     * @todo Check permissions
+     */
+    public function isAccessibleToUser($user_id = null)
+    {
+        if ($user_id === null) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        return $GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id);
+    }
+
+    /**
+     * Decides whether the user may edit/alter the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     * @todo Check permissions
+     */
+    public function isEditableByUser($user_id = null)
+    {
+        if ($user_id === null) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        return $GLOBALS['perm']->have_studip_perm('tutor', $this->id, $user_id);
+    }
+
+    /**
+     * Returns the appropriate icon for the completion status.
+     *
+     * Mapping (completion -> icon role):
+     * - 0 => status-red
+     * - 1 => status-yellow
+     * - 2 => status-green
+     *
+     * @return Icon class
+     */
+    public function getCompletionIcon()
+    {
+        $role = Icon::ROLE_STATUS_RED;
+        if ($this->completion == 1) {
+            $role = Icon::ROLE_STATUS_YELLOW;
+        } elseif ($this->completion == 2) {
+            $role = Icon::ROLE_STATUS_GREEN;
+        }
+        return Icon::create('radiobutton-checked', $role);
+    }
+
+    /**
+     * Returns the appropriate label for the completion status.
+     *
+     * @return string
+     */
+    public function getCompetionLabel(): string
+    {
+        return [
+            0 => _('unvollständig'),
+            1 => _('in Bearbeitung'),
+            2 => _('fertig'),
+        ][$this->completion] ?? _('undefiniert');
+    }
+
+    /**
+     * Generates a general log entry if the course were changed.
+     * Furthermore, this method emits notifications when the
+     * start and/or the end semester has/have changed.
+     */
+    protected function logStore()
+    {
+        if ($this->isFieldDirty('start_time')) {
+            //Log change of start semester:
+            StudipLog::log('SEM_SET_STARTSEMESTER', $this->id, isset($this->start_semester) ? $this->start_semester->name : _('unbegrenzt'));
+            NotificationCenter::postNotification('CourseDidChangeSchedule', $this);
+        }
+        if ($this->isFieldDirty('duration_time')) {
+            StudipLog::log('SEM_SET_ENDSEMESTER', $this->id, $this->getTextualSemester());
+            NotificationCenter::postNotification('CourseDidChangeSchedule', $this);
+        }
+
+        $log = [];
+        if ($this->isFieldDirty('admission_prelim')) {
+            $log[] = $this->admission_prelim ?  _('Neuer Anmeldemodus: Vorläufiger Eintrag') : _('Neuer Anmeldemodus: Direkter Eintrag');
+        }
+
+        if ($this->isFieldDirty('admission_binding')) {
+            $log[] = $this->admission_binding? _('Anmeldung verbindlich') : _('Anmeldung unverbindlich');
+        }
+
+        if ($this->isFieldDirty('admission_turnout')) {
+            $log[] = sprintf(_('Neue Teilnehmerzahl: %s'), (int)$this->admission_turnout);
+        }
+
+        if ($this->isFieldDirty('admission_disable_waitlist')) {
+            $log[] = $this->admission_disable_waitlist ? _('Warteliste aktiviert') : _('Warteliste deaktiviert');
+        }
+
+        if ($this->isFieldDirty('admission_waitlist_max')) {
+            $log[] = sprintf(_('Plätze auf der Warteliste geändert: %u'), (int)$this->admission_waitlist_max);
+        }
+
+        if ($this->isFieldDirty('admission_disable_waitlist_move')) {
+            $log[] = $this->admission_disable_waitlist ? _('Nachrücken aktiviert') : _('Nachrücken deaktiviert');
+        }
+
+        if ($this->isFieldDirty('admission_prelim_txt')) {
+            if ($this->admission_prelim_txt) {
+                $log[] = sprintf(_('Neuer Hinweistext bei vorläufigen Eintragungen: %s'), strip_tags(kill_format($this->admission_prelim_txt)));
+            } else {
+                $log[] = _('Hinweistext bei vorläufigen Eintragungen wurde entfert');
+            }
+        }
+
+        if (!empty($log)) {
+            StudipLog::log(
+                'SEM_CHANGED_ACCESS',
+                $this->id,
+                null,
+                '',
+                implode(' - ', $log)
+            );
+        }
+
+        if ($this->isFieldDirty('visible')) {
+            StudipLog::log($this->visible ? 'SEM_VISIBLE' : 'SEM_INVISIBLE', $this->id);
+        }
+    }
+
+    /**
+     * Called directly before storing the object to edit the columns start_time and duration_time
+     * which are both deprecated but are still in use for older plugins.
+     */
+    public function cbSetStartAndDurationTime()
+    {
+        if ($this->isFieldDirty('start_time')) {
+            $this->setStartSemester(Semester::findByTimestamp($this->start_time));
+        }
+        if ($this->isFieldDirty('duration_time')) {
+            $this->setEndSemester($this->duration_time == -1 ? null : Semester::findByTimestamp($this->start_time + $this->duration_time));
+        }
+        if ($this->isOpenEnded()) {
+            $this->start_time = $this->start_time ?: Semester::findCurrent()->beginn ?? time();
+            $this->duration_time = -1;
+        } else {
+            $this->start_time = $this->getStartSemester()->beginn;
+            $this->duration_time = $this->getEndSemester()->beginn - $this->start_time;
+        }
+    }
+
+
+    //StudipItem interface implementation:
+
+    public function getItemName($long_format = true)
+    {
+        if ($long_format) {
+            return $this->getFullName();
+        } else {
+            return $this->name;
+        }
+    }
+
+    public function getItemURL()
+    {
+        return URLHelper::getURL(
+            'dispatch.php/course/details/index',
+            [
+                'cid' => $this->id
+            ]
+        );
+    }
+
+    public function getItemAvatarURL()
+    {
+        $avatar = CourseAvatar::getAvatar($this->id);
+        if ($avatar) {
+            return $avatar->getURL(Avatar::NORMAL);
+        }
+        return '';
+    }
+
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findThru($storage->user_id, [
+            'thru_table'        => 'seminar_user',
+            'thru_key'          => 'user_id',
+            'thru_assoc_key'    => 'Seminar_id',
+            'assoc_foreign_key' => 'Seminar_id',
+        ]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Seminare'), 'seminare', $field_data);
+            }
+        }
+    }
+    public function getRangeName()
+    {
+        return $this->name;
+    }
+
+    public function getRangeIcon($role)
+    {
+        return Icon::create('seminar', $role);
+    }
+
+    public function getRangeUrl()
+    {
+        return 'course/overview';
+    }
+
+    public function getRangeCourseId()
+    {
+        return $this->Seminar_id;
+    }
+
+    public function isRangeAccessible(string $user_id = null): bool
+    {
+        $user_id = $user_id ?? $GLOBALS['user']->id;
+        return $GLOBALS['perm']->have_studip_perm('autor', $this->Seminar_id, $user_id);
+    }
+
+
+    public function getLink() : StudipLink
+    {
+        return new StudipLink($this->getItemURL(), $this->name, Icon::create('seminar'));
+    }
+
+
+    /**
+     * Returns a list of courses for the specified user.
+     * Permission levels may be supplied to limit the course list.
+     *
+     * @param string $user_id The ID of the user whose courses shall be retrieved.
+     *
+     * @param string[] $perms The permission levels of the user that shall be
+     *     regarded when retrieving courses.
+     *
+     * @param bool $with_deputies Whether to include courses where the user is
+     *     a deputy (true) or not (false). Defaults to true.
+     *
+     * @return Course[] A list of courses.
+     */
+    public static function findByUser($user_id, $perms = [], $with_deputies = true)
+    {
+        if (!$user_id) {
+            return [];
+        }
+
+        $db = DBManager::get();
+        $sql = "SELECT `seminar_id`
+                FROM `seminar_user`
+                WHERE `user_id` = :user_id";
+        $sql_params = ['user_id' => $user_id];
+        if (is_array($perms) && count($perms)) {
+            $sql .= ' AND `status` IN (:perms)';
+            $sql_params['perms'] = $perms;
+        }
+        $seminar_ids = $db->fetchFirst($sql, $sql_params);
+        if (Config::get()->DEPUTIES_ENABLE && $with_deputies) {
+            $sql = 'SELECT range_id FROM `deputies` WHERE `deputies`.`user_id` = :user_id';
+            $seminar_ids = array_merge($seminar_ids, $db->fetchFirst($sql, $sql_params));
+        }
+
+        $name_sort = Config::get()->IMPORTANT_SEMNUMBER ? 'VeranstaltungsNummer, Name' : 'Name';
+
+        return Course::findBySQL(
+            "LEFT JOIN semester_courses ON (semester_courses.course_id = seminare.Seminar_id)
+             WHERE Seminar_id IN (?)
+             GROUP BY seminare.Seminar_id
+             ORDER BY semester_courses.semester_id IS NULL DESC, start_time DESC, {$name_sort}",
+            [$seminar_ids]
+        );
+    }
+
+    /**
+     * Returns whether this course is a studygroup
+     * @return bool
+     */
+    public function isStudygroup()
+    {
+        return in_array($this->status, studygroup_sem_types());
+    }
+
+    /**
+     *
+     */
+    public function setDefaultTools()
+    {
+        $this->tools = [];
+        foreach (array_values($this->getSemClass()->getActivatedModuleObjects()) as $module) {
+            PluginManager::getInstance()->setPluginActivated($module->getPluginId(), $this->id, true);
+            $this->tools[] = ToolActivation::find([$this->id, $module->getPluginId()]);
+        }
+    }
+
+    /**
+     * @param $name string name of tool / plugin
+     * @return bool
+     */
+    public function isToolActive($name)
+    {
+        $plugin = PluginEngine::getPlugin($name);
+        return $plugin && $this->tools->findOneby('plugin_id', $plugin->getPluginId());
+    }
+
+    /**
+     * returns all activated plugins/modules for this course
+     * @return StudipModule[]
+     */
+    public function getActivatedTools()
+    {
+        return array_filter($this->tools->getStudipModule());
+    }
+
+    /**
+     * @see Range::__toString()
+     */
+    public function __toString() : string
+    {
+        return $this->getFullName();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getCalendarOwner(string $owner_id): ?\Studip\Calendar\Owner
+    {
+        return self::find($owner_id);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isCalendarReadable(?string $user_id = null): bool
+    {
+        if ($user_id === null) {
+            $user_id = User::findCurrent()->id;
+        }
+
+        //Calendar read permissions are granted for all participants
+        //that have at least user permissions.
+        return $GLOBALS['perm']->have_studip_perm('user', $this->id, $user_id);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isCalendarWritable(string $user_id = null): bool
+    {
+        if ($user_id === null) {
+            $user_id = User::findCurrent()->id;
+        }
+
+        //Calendar write permissions are granted for all participants
+        //that have autor permissions or higher.
+        return $GLOBALS['perm']->have_studip_perm('autor', $this->id, $user_id);
+    }
+
+    /**
+     * Get user information for all users in this course
+     *
+     */
+    public function getMembersData(?string $status = ''): array
+    {
+        $result = [];
+
+        if (!$status) {
+            foreach ($this->members->orderBy('position, nachname') as $member) {
+                $result[$member->user_id] = $member->getExportData();
+            }
+            foreach ($this->admission_applicants->findBy('status', 'accepted')->orderBy('position') as $member) {
+                $result[$member->user_id] = $member->getExportData();
+            }
+        } elseif ($status === 'awaiting') {
+            foreach ($this->admission_applicants->findBy('status', $status)->orderBy('position') as $member) {
+                $result[$member->user_id] = $member->getExportData();
+            }
+        } elseif ($status === 'claiming') {
+            $cs = CourseSet::getSetForCourse($this->id);
+            if (is_object($cs) && !$cs->hasAlgorithmRun()) {
+                $claiming_users = User::findFullMany(array_keys(AdmissionPriority::getPrioritiesByCourse($cs->getId(), $this->id)), 'ORDER BY nachname');
+                foreach ($claiming_users as $claiming_user) {
+                        $studycourse = [];
+                        $claiming_user->studycourses->map(function($sc) use (&$studycourse) {
+                            $studycourse[]= $sc->studycourse->name .  ',' . $sc->degree->name . ',' . $sc->semester;
+                        });
+                        $export_data = [
+                            'status' => $status,
+                            'salutation' => $claiming_user->salutation,
+                            'Titel' => $claiming_user->title_front,
+                            'Vorname' => $claiming_user->vorname,
+                            'Nachname' => $claiming_user->nachname,
+                            'Titel2' => $claiming_user->title_rear,
+                            'username' => $claiming_user->username,
+                            'privadr' => $claiming_user->privadr,
+                            'privatnr' => $claiming_user->privatnr,
+                            'Email' => $claiming_user->email,
+                            'Anmeldedatum' => '',
+                            'Matrikelnummer' => $claiming_user->matriculation_number,
+                            'studiengaenge' => implode(';', $studycourse),
+                            'position' => 0,
+                        ];
+                    $result[$claiming_user->user_id] = $export_data;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+}
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php
deleted file mode 100644
index eadeb0a..0000000
--- a/lib/models/CourseDate.class.php
+++ /dev/null
@@ -1,665 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @author     Rasmus Fuhse <fuhse@data-quest.de>
- * @copyright   2014 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for termin_id
- * @property string $termin_id database column
- * @property string $range_id database column
- * @property string $autor_id database column
- * @property string $content database column
- * @property int $date database column
- * @property int $end_time database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $date_typ database column
- * @property string|null $raum database column
- * @property string|null $metadate_id database column
- * @property SimpleORMapCollection|Folder[] $folders has_many Folder
- * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest
- * @property SimpleORMapCollection|ResourceRequestAppointment[] $resource_request_appointments has_many ResourceRequestAppointment
- * @property User $author belongs_to User
- * @property Course $course belongs_to Course
- * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate
- * @property ResourceBooking $room_booking has_one ResourceBooking
- * @property SimpleORMapCollection|CourseTopic[] $topics has_and_belongs_to_many CourseTopic
- * @property SimpleORMapCollection|Statusgruppen[] $statusgruppen has_and_belongs_to_many Statusgruppen
- * @property SimpleORMapCollection|User[] $dozenten has_and_belongs_to_many User
- */
-
-class CourseDate extends SimpleORMap implements PrivacyObject, Event
-{
-    const FORMAT_DEFAULT = 'default';
-    const FORMAT_VERBOSE = 'verbose';
-
-    private static $numbered_dates = null;
-
-    /**
-     * Configures this model.
-     *
-     * @param Array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'termine';
-        $config['has_and_belongs_to_many']['topics'] = [
-            'class_name' => CourseTopic::class,
-            'thru_table' => 'themen_termine',
-            'order_by'   => 'ORDER BY priority',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-        $config['has_and_belongs_to_many']['statusgruppen'] = [
-            'class_name' => Statusgruppen::class,
-            'thru_table' => 'termin_related_groups',
-            'order_by'   => 'ORDER BY position',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-        $config['has_and_belongs_to_many']['dozenten'] = [
-            'class_name'  => User::class,
-            'thru_table'  => 'termin_related_persons',
-            'foreign_key' => 'termin_id',
-            'thru_key'    => 'range_id',
-            'order_by'    => 'ORDER BY Nachname, Vorname',
-            'on_delete'   => 'delete',
-            'on_store'    => 'store'
-        ];
-        $config['has_many']['folders'] = [
-            'class_name' => Folder::class,
-            'assoc_func' => 'findByTermin_id'
-        ];
-        $config['belongs_to']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'autor_id'
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'range_id'
-        ];
-        $config['belongs_to']['cycle'] = [
-            'class_name'  => SeminarCycleDate::class,
-            'foreign_key' => 'metadate_id'
-        ];
-        $config['has_one']['room_booking'] = [
-            'class_name'        => ResourceBooking::class,
-            'foreign_key'       => 'termin_id',
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-            //'on_store'          => 'store'
-        ];
-        $config['has_many']['room_requests'] = [
-            'class_name'        => RoomRequest::class,
-            'assoc_foreign_key' => 'termin_id',
-            'on_delete'         => 'delete',
-        ];
-        $config['has_many']['resource_request_appointments'] = [
-            'class_name'        => ResourceRequestAppointment::class,
-            'assoc_foreign_key' => 'appointment_id',
-            'on_delete'         => 'delete',
-        ];
-        $config['default_values']['date_typ'] = 1;
-        $config['registered_callbacks']['before_store'][] = 'cbStudipLog';
-        $config['registered_callbacks']['after_create'][] = 'cbStudipLog';
-        parent::configure($config);
-    }
-
-    /**
-     * return consecutive number for a date in its course, if semester is given
-     * only within that time range
-     *
-     * @param CourseDate $date
-     * @param null|Semester $semester
-     * @return int|null
-     */
-    public static function getConsecutiveNumber($date, $semester = null)
-    {
-        $semester_id = $semester ? $semester->id : 'all';
-
-        if (!isset(self::$numbered_dates[$semester_id])) {
-            $db = DBManager::get();
-            $numbered = array_flip($db->fetchFirst("SELECT termin_id FROM termine WHERE range_id = ?" .
-                ($semester ? " AND date BETWEEN ? AND ?" : "") .
-                " ORDER BY date",
-                $semester ? [$date->range_id, $semester->beginn, $semester->ende] : [$date->range_id]));
-            self::$numbered_dates[$semester_id] = $numbered;
-        }
-        return isset(self::$numbered_dates[$semester_id][$date->termin_id])
-             ? self::$numbered_dates[$semester_id][$date->termin_id] + 1
-             : null;
-    }
-
-    /**
-     * Returns course dates by issue id.
-     *
-     * @param String $issue_id Id of the issue
-     * @return array with the associated dates
-     */
-    public static function findByIssue_id($issue_id)
-    {
-        return self::findBySQL("INNER JOIN themen_termine USING (termin_id)
-            WHERE themen_termine.issue_id = ?
-            ORDER BY date ASC",
-            [$issue_id]
-        );
-    }
-
-    /**
-     * Returns course dates by course id
-     *
-     * @param String $seminar_id Id of the course
-     * @return array with the associated dates
-     */
-    public static function findBySeminar_id($seminar_id)
-    {
-        return self::findByRange_id($seminar_id);
-    }
-
-    /**
-     * Return course dates by range id (which is in many cases the course id)
-     *
-     * @param String $seminar_id Id of the course
-     * @param String $order_by   Optional order definition
-     * @return array with the associated dates
-     */
-    public static function findByRange_id($seminar_id, $order_by = 'ORDER BY date')
-    {
-        return parent::findByRange_id($seminar_id, $order_by);
-    }
-
-    /**
-     * Returns course dates by issue id.
-     *
-     * @param String $issue_id Id of the issue
-     * @return array with the associated dates
-     */
-    public static function findByStatusgruppe_id($group_id)
-    {
-        return self::findBySQL("INNER JOIN `termin_related_groups` USING (`termin_id`)
-            WHERE `termin_related_groups`.`statusgruppe_id` = ?
-            ORDER BY `date` ASC",
-            [$group_id]
-        );
-    }
-
-    /**
-     * Adds a topic to this date.
-     *
-     * @param mixed $topic Topic definition (might be an id, an array or an
-     *                     object)
-     * @return int|false number addition of all return values, false if none was called
-     */
-    public function addTopic($topic)
-    {
-        $topic = CourseTopic::toObject($topic);
-        if (!$this->topics->find($topic->id)) {
-            $this->topics[] = $topic;
-            return $this->storeRelations('topics');
-        }
-        return false;
-    }
-
-    /**
-     * Removes a topic from this date.
-     *
-     * @param mixed $topic Topic definition (might be an id, an array or an
-     *                     object)
-     * @return number addition of all return values, false if none was called
-     */
-    public function removeTopic($topic)
-    {
-        $this->topics->unsetByPk(is_string($topic) ? $topic : $topic->id);
-        return $this->storeRelations('topics');
-    }
-
-    /**
-     * Returns the name of the assigned room for this date.
-     *
-     * @return String containing the room name
-     */
-    public function getRoomName()
-    {
-        if (Config::get()->RESOURCES_ENABLE && !empty($this->room_booking->resource)) {
-            return $this->room_booking->resource->name;
-        }
-        return $this['raum'];
-    }
-
-    /**
-     * Returns the assigned room for this date as an object.
-     *
-     * @return Room Either the object or null if no room is assigned
-     */
-    public function getRoom()
-    {
-        if (Config::get()->RESOURCES_ENABLE && !empty($this->room_booking->resource)) {
-           return $this->room_booking->resource->getDerivedClassInstance();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the name of the type of this date.
-     *
-     * @param String containing the type name
-     */
-    public function getTypeName()
-    {
-        return $GLOBALS['TERMIN_TYP'][$this->date_typ]['name'] ?? '';
-    }
-
-    /**
-     * Returns the full qualified name of this date.
-     *
-     * @param String $format Optional format type (only 'default', 'include-room' and
-     *                       'verbose' are supported by now)
-     * @return String containing the full name of this date.
-     */
-    public function getFullName($format = 'default')
-    {
-        if (!$this->date || !in_array($format, ['default', 'verbose', 'include-room'])) {
-            return '';
-        }
-
-        $latter_template = $format === 'verbose' ? _('%R Uhr') : '%R';
-
-        if (($this->end_time - $this->date) / 60 / 60 > 23) {
-            $string = strftime('%a., %x (' . _('ganztägig') . ')' , $this->date);
-        } else {
-            $string =  strftime('%a., %x, %R', $this->date) . ' - '
-                . strftime($latter_template, $this->end_time);
-        }
-
-        if($format === 'include-room') {
-            $room = $this->getRoom();
-            if($room) {
-                $string = sprintf('%s <a href="%s" target="_blank">%s</a>',
-                    $string,
-                    $room->getActionURL('booking_plan'),
-                    htmlReady($room->name)
-                );
-            }
-        }
-        return $string;
-    }
-
-    /**
-     * Converts a CourseDate Entry to a CourseExDate Entry
-     * returns instance of the new CourseExDate or NULL
-     *
-     * @return Object CourseExDate
-     */
-    public function cancelDate()
-    {
-        //NOTE: If you modify this method make sure the changes
-        //are also inserted in SingleDateDB::storeSingleDate
-        //and CourseExDate::unCancelDate to keep the behavior consistent
-        //across Stud.IP!
-
-        //These statements are used below to update the relations
-        //of this date.
-        $db = DBManager::get();
-
-        $groups_stmt = $db->prepare(
-            "UPDATE termin_related_groups
-            SET termin_id = :ex_termin_id
-            WHERE termin_id = :termin_id;"
-        );
-
-        $persons_stmt = $db->prepare(
-            "UPDATE termin_related_persons
-            SET range_id = :ex_termin_id
-            WHERE range_id = :termin_id;"
-        );
-
-        $date = $this->toArray();
-
-        $ex_date = new CourseExDate();
-        $ex_date->setData($date);
-        if ($room = $this->getRoom()) {
-            $ex_date['resource_id'] = $room->getId();
-        }
-        $ex_date->setId($ex_date->getNewId());
-
-        if ($ex_date->store()) {
-            //Update some (but not all) relations to the date so that they
-            //use the ID of the new ex-date.
-
-            $groups_stmt->execute(
-                [
-                    'ex_termin_id' => $ex_date->id,
-                    'termin_id' => $this->id
-                ]
-            );
-
-            $persons_stmt->execute(
-                [
-                    'ex_termin_id' => $ex_date->id,
-                    'termin_id' => $this->id
-                ]
-            );
-
-            //After we updated the relations so that they refer to the
-            //new ex-date we can delete this date and return the ex-date:
-            $this->delete();
-            return $ex_date;
-        }
-        return null;
-    }
-
-    /**
-     * saves this object and expires the cache
-     *
-     * @see SimpleORMap::store()
-     */
-    public function store()
-    {
-        // load room-booking, if any
-        $this->room_booking;
-
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache->expire('course/undecorated_data/'. $this->range_id);
-        return parent::store();
-    }
-
-    /**
-     * deletes this object and expires the cache
-     *
-     * @see SimpleORMap::delete()
-     */
-    public function delete()
-    {
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache->expire('course/undecorated_data/'. $this->range_id);
-        return parent::delete();
-    }
-
-    /**
-     * @param $type string type of callback
-     */
-    protected function cbStudipLog($type)
-    {
-        if (!$this->metadate_id) {
-            if ($type === 'after_create') {
-                StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->id, $this->getFullName());
-            }
-            if ($type === 'before_store' && !$this->isNew() && ($this->isFieldDirty('date') || $this->isFieldDirty('end_time'))) {
-                $old_entry = self::build($this->content_db);
-                StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->id, $old_entry->getFullName() . ' -> ' . $this->getFullName());
-            }
-        }
-    }
-
-    /**
-     * Returns a list of all possible warnings that should be considered when
-     * this date is deleted.
-     *
-     * @return array of warnings
-     */
-    public function getDeletionWarnings()
-    {
-        $warnings = [];
-        if (count($this->topics) > 0) {
-            $warnings[] = _('Diesem Termin ist ein Thema zugeordnet.');
-        }
-
-        if (Config::get()->RESOURCES_ENABLE && $this->getRoom()) {
-            $warnings[] = _('Dieser Termin hat eine Raumbuchung, welche mit dem Termin gelöscht wird.');
-        }
-
-        return $warnings;
-    }
-
-    /**
-     * return all filerefs belonging to this date, permissions fpr given user are checked
-     *
-     * @param string|User $user_or_id
-     * @return mixed[] A mixed array with FolderType and FileRef objects.
-     */
-    public function getAccessibleFolderFiles($user_or_id)
-    {
-        $user_id = $user_or_id instanceof User ? $user_or_id->id : $user_or_id;
-        $all_files = [];
-        $all_folders = [];
-        $folders = $this->folders->getArrayCopy();
-        foreach ($this->topics as $topic) {
-            $folders = array_merge($folders, $topic->folders->getArrayCopy());
-        }
-        foreach ($folders as $folder) {
-            [$files, $typed_folders] = array_values(FileManager::getFolderFilesRecursive($folder->getTypedFolder(), $user_id));
-            foreach ($files as $file) {
-                $all_files[$file->id] = $file;
-            }
-            $all_folders = array_merge($all_folders, $typed_folders);
-        }
-        return ['files' => $all_files, 'folders' => $all_folders];
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("autor_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Termine'), 'termine', $field_data);
-            }
-        }
-    }
-
-
-    /**
-     * @return string A string representation of the course date.
-     */
-    public function __toString() : string
-    {
-        return sprintf(
-            _('Termin am %1$s, %2$s von %3$s bis %4$s Uhr'),
-            strftime('%A', $this->date),
-            strftime('%x', $this->date),
-            date('H:i', $this->date),
-            date('H:i', $this->end_time)
-        );
-    }
-
-    //Start of Event interface implementation.
-
-    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
-    {
-        return self::findBySQL(
-            "JOIN `seminar_user`
-               ON `seminar_user`.`seminar_id` = `termine`.`range_id`
-             WHERE `seminar_user`.`user_id` = :user_id
-               AND `termine`.`date` BETWEEN :begin AND :end
-               AND (
-                   IFNULL(`termine`.`metadate_id`, '') = ''
-                   OR `termine`.`metadate_id` NOT IN (
-                       SELECT `metadate_id`
-                       FROM `schedule_seminare`
-                       WHERE `user_id` = :user_id
-                         AND `visible` = 0
-                 )
-             )
-             ORDER BY date",
-            [
-                'begin'   => $begin->getTimestamp(),
-                'end'     => $end->getTimestamp(),
-                'user_id' => $range_id
-            ]
-        );
-    }
-
-    //Event interface implementation:
-
-    public function getObjectId() : string
-    {
-        return (string) $this->id;
-    }
-
-    public function getPrimaryObjectID(): string
-    {
-        return $this->range_id;
-    }
-
-    public function getObjectClass(): string
-    {
-        return static::class;
-    }
-
-    public function getTitle(): string
-    {
-        return $this->course->name ?? '';
-    }
-
-    public function getBegin(): DateTime
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->date);
-        return $begin;
-    }
-
-    public function getEnd(): DateTime
-    {
-        $end = new DateTime();
-        $end->setTimestamp($this->end_time);
-        return $end;
-    }
-
-    public function getDuration(): DateInterval
-    {
-        $begin = $this->getBegin();
-        $end = $this->getEnd();
-        return $end->diff($begin);
-    }
-
-    public function getLocation(): string
-    {
-        return $this->raum ?? '';
-    }
-
-    public function getUniqueId(): string
-    {
-        return sprintf('Stud.IP-SEM-%1$s@%2$s', $this->id, $_SERVER['SERVER_NAME']);
-    }
-
-    public function getDescription(): string
-    {
-        $descriptions = $this->topics->map(function ($topic) {
-            $desc = $topic->title . "\n";
-            $desc .= $topic->description;
-
-            return $desc;
-        });
-        return implode("\n\n", $descriptions);
-    }
-
-    public function getAdditionalDescriptions(): array
-    {
-        $descriptions = [];
-        if (count($this->dozenten) > 0) {
-            $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullName());
-        }
-        if (count($this->statusgruppen) > 0) {
-            $descriptions[_('Beteiligte Gruppen')] = implode(', ', $this->statusgruppen->getValue('name'));
-        }
-        return $descriptions;
-    }
-
-    public function isAllDayEvent(): bool
-    {
-        //Course dates are never all day events.
-        return false;
-    }
-
-    public function isWritable(string $user_id): bool
-    {
-        return $GLOBALS['perm']->have_studip_perm('dozent', $this->range_id, $user_id);
-    }
-
-    public function getCreationDate(): DateTime
-    {
-        $mkdate = new DateTime();
-        $mkdate->setTimestamp($this->mkdate);
-        return $mkdate;
-    }
-
-    public function getModificationDate(): DateTime
-    {
-        $chdate = new DateTime();
-        $chdate->setTimestamp($this->chdate);
-        return $chdate;
-    }
-
-    public function getImportDate(): DateTime
-    {
-        return $this->getCreationDate();
-    }
-
-    public function getAuthor(): ?User
-    {
-        return $this->author;
-    }
-
-    public function getEditor(): ?User
-    {
-        return null;
-    }
-
-    public function toEventData(string $user_id): \Studip\Calendar\EventData
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->date);
-        $end = new DateTime();
-        $end->setTimestamp($this->end_time);
-
-        $membership = CourseMember::findOneBySQL(
-            'seminar_id = :course_id AND user_id = :user_id',
-            ['course_id' => $this->range_id, 'user_id' => $user_id]
-        );
-        $class_names = [];
-        if ($membership) {
-            $class_names[] = 'course-color-' . $membership->gruppe;
-        }
-        $studip_view_urls = [];
-        if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
-            $studip_view_urls['show'] = URLHelper::getURL('dispatch.php/course/dates/details/' . $this->id, ['cid' => $this->range_id, 'extra_buttons' => '1']);
-        }
-
-        return new \Studip\Calendar\EventData(
-            $begin,
-            $end,
-            $this->getTitle(),
-            $class_names,
-            '#000000',
-            '#aaaaaa',
-            $this->isWritable($user_id),
-            CourseDate::class,
-            $this->id,
-            Course::class,
-            $this->range_id,
-            'course',
-            $this->range_id,
-            $studip_view_urls,
-            [],
-            'seminar',
-            'rgba(0,0,0,0)'
-        );
-    }
-
-    //End of Event interface implementation.
-}
diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php
new file mode 100644
index 0000000..eadeb0a
--- /dev/null
+++ b/lib/models/CourseDate.php
@@ -0,0 +1,665 @@
+<?php
+/**
+ * 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.
+ *
+ * @author     Rasmus Fuhse <fuhse@data-quest.de>
+ * @copyright   2014 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for termin_id
+ * @property string $termin_id database column
+ * @property string $range_id database column
+ * @property string $autor_id database column
+ * @property string $content database column
+ * @property int $date database column
+ * @property int $end_time database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $date_typ database column
+ * @property string|null $raum database column
+ * @property string|null $metadate_id database column
+ * @property SimpleORMapCollection|Folder[] $folders has_many Folder
+ * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest
+ * @property SimpleORMapCollection|ResourceRequestAppointment[] $resource_request_appointments has_many ResourceRequestAppointment
+ * @property User $author belongs_to User
+ * @property Course $course belongs_to Course
+ * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate
+ * @property ResourceBooking $room_booking has_one ResourceBooking
+ * @property SimpleORMapCollection|CourseTopic[] $topics has_and_belongs_to_many CourseTopic
+ * @property SimpleORMapCollection|Statusgruppen[] $statusgruppen has_and_belongs_to_many Statusgruppen
+ * @property SimpleORMapCollection|User[] $dozenten has_and_belongs_to_many User
+ */
+
+class CourseDate extends SimpleORMap implements PrivacyObject, Event
+{
+    const FORMAT_DEFAULT = 'default';
+    const FORMAT_VERBOSE = 'verbose';
+
+    private static $numbered_dates = null;
+
+    /**
+     * Configures this model.
+     *
+     * @param Array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'termine';
+        $config['has_and_belongs_to_many']['topics'] = [
+            'class_name' => CourseTopic::class,
+            'thru_table' => 'themen_termine',
+            'order_by'   => 'ORDER BY priority',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+        $config['has_and_belongs_to_many']['statusgruppen'] = [
+            'class_name' => Statusgruppen::class,
+            'thru_table' => 'termin_related_groups',
+            'order_by'   => 'ORDER BY position',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+        $config['has_and_belongs_to_many']['dozenten'] = [
+            'class_name'  => User::class,
+            'thru_table'  => 'termin_related_persons',
+            'foreign_key' => 'termin_id',
+            'thru_key'    => 'range_id',
+            'order_by'    => 'ORDER BY Nachname, Vorname',
+            'on_delete'   => 'delete',
+            'on_store'    => 'store'
+        ];
+        $config['has_many']['folders'] = [
+            'class_name' => Folder::class,
+            'assoc_func' => 'findByTermin_id'
+        ];
+        $config['belongs_to']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'autor_id'
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'range_id'
+        ];
+        $config['belongs_to']['cycle'] = [
+            'class_name'  => SeminarCycleDate::class,
+            'foreign_key' => 'metadate_id'
+        ];
+        $config['has_one']['room_booking'] = [
+            'class_name'        => ResourceBooking::class,
+            'foreign_key'       => 'termin_id',
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+            //'on_store'          => 'store'
+        ];
+        $config['has_many']['room_requests'] = [
+            'class_name'        => RoomRequest::class,
+            'assoc_foreign_key' => 'termin_id',
+            'on_delete'         => 'delete',
+        ];
+        $config['has_many']['resource_request_appointments'] = [
+            'class_name'        => ResourceRequestAppointment::class,
+            'assoc_foreign_key' => 'appointment_id',
+            'on_delete'         => 'delete',
+        ];
+        $config['default_values']['date_typ'] = 1;
+        $config['registered_callbacks']['before_store'][] = 'cbStudipLog';
+        $config['registered_callbacks']['after_create'][] = 'cbStudipLog';
+        parent::configure($config);
+    }
+
+    /**
+     * return consecutive number for a date in its course, if semester is given
+     * only within that time range
+     *
+     * @param CourseDate $date
+     * @param null|Semester $semester
+     * @return int|null
+     */
+    public static function getConsecutiveNumber($date, $semester = null)
+    {
+        $semester_id = $semester ? $semester->id : 'all';
+
+        if (!isset(self::$numbered_dates[$semester_id])) {
+            $db = DBManager::get();
+            $numbered = array_flip($db->fetchFirst("SELECT termin_id FROM termine WHERE range_id = ?" .
+                ($semester ? " AND date BETWEEN ? AND ?" : "") .
+                " ORDER BY date",
+                $semester ? [$date->range_id, $semester->beginn, $semester->ende] : [$date->range_id]));
+            self::$numbered_dates[$semester_id] = $numbered;
+        }
+        return isset(self::$numbered_dates[$semester_id][$date->termin_id])
+             ? self::$numbered_dates[$semester_id][$date->termin_id] + 1
+             : null;
+    }
+
+    /**
+     * Returns course dates by issue id.
+     *
+     * @param String $issue_id Id of the issue
+     * @return array with the associated dates
+     */
+    public static function findByIssue_id($issue_id)
+    {
+        return self::findBySQL("INNER JOIN themen_termine USING (termin_id)
+            WHERE themen_termine.issue_id = ?
+            ORDER BY date ASC",
+            [$issue_id]
+        );
+    }
+
+    /**
+     * Returns course dates by course id
+     *
+     * @param String $seminar_id Id of the course
+     * @return array with the associated dates
+     */
+    public static function findBySeminar_id($seminar_id)
+    {
+        return self::findByRange_id($seminar_id);
+    }
+
+    /**
+     * Return course dates by range id (which is in many cases the course id)
+     *
+     * @param String $seminar_id Id of the course
+     * @param String $order_by   Optional order definition
+     * @return array with the associated dates
+     */
+    public static function findByRange_id($seminar_id, $order_by = 'ORDER BY date')
+    {
+        return parent::findByRange_id($seminar_id, $order_by);
+    }
+
+    /**
+     * Returns course dates by issue id.
+     *
+     * @param String $issue_id Id of the issue
+     * @return array with the associated dates
+     */
+    public static function findByStatusgruppe_id($group_id)
+    {
+        return self::findBySQL("INNER JOIN `termin_related_groups` USING (`termin_id`)
+            WHERE `termin_related_groups`.`statusgruppe_id` = ?
+            ORDER BY `date` ASC",
+            [$group_id]
+        );
+    }
+
+    /**
+     * Adds a topic to this date.
+     *
+     * @param mixed $topic Topic definition (might be an id, an array or an
+     *                     object)
+     * @return int|false number addition of all return values, false if none was called
+     */
+    public function addTopic($topic)
+    {
+        $topic = CourseTopic::toObject($topic);
+        if (!$this->topics->find($topic->id)) {
+            $this->topics[] = $topic;
+            return $this->storeRelations('topics');
+        }
+        return false;
+    }
+
+    /**
+     * Removes a topic from this date.
+     *
+     * @param mixed $topic Topic definition (might be an id, an array or an
+     *                     object)
+     * @return number addition of all return values, false if none was called
+     */
+    public function removeTopic($topic)
+    {
+        $this->topics->unsetByPk(is_string($topic) ? $topic : $topic->id);
+        return $this->storeRelations('topics');
+    }
+
+    /**
+     * Returns the name of the assigned room for this date.
+     *
+     * @return String containing the room name
+     */
+    public function getRoomName()
+    {
+        if (Config::get()->RESOURCES_ENABLE && !empty($this->room_booking->resource)) {
+            return $this->room_booking->resource->name;
+        }
+        return $this['raum'];
+    }
+
+    /**
+     * Returns the assigned room for this date as an object.
+     *
+     * @return Room Either the object or null if no room is assigned
+     */
+    public function getRoom()
+    {
+        if (Config::get()->RESOURCES_ENABLE && !empty($this->room_booking->resource)) {
+           return $this->room_booking->resource->getDerivedClassInstance();
+        }
+        return null;
+    }
+
+    /**
+     * Returns the name of the type of this date.
+     *
+     * @param String containing the type name
+     */
+    public function getTypeName()
+    {
+        return $GLOBALS['TERMIN_TYP'][$this->date_typ]['name'] ?? '';
+    }
+
+    /**
+     * Returns the full qualified name of this date.
+     *
+     * @param String $format Optional format type (only 'default', 'include-room' and
+     *                       'verbose' are supported by now)
+     * @return String containing the full name of this date.
+     */
+    public function getFullName($format = 'default')
+    {
+        if (!$this->date || !in_array($format, ['default', 'verbose', 'include-room'])) {
+            return '';
+        }
+
+        $latter_template = $format === 'verbose' ? _('%R Uhr') : '%R';
+
+        if (($this->end_time - $this->date) / 60 / 60 > 23) {
+            $string = strftime('%a., %x (' . _('ganztägig') . ')' , $this->date);
+        } else {
+            $string =  strftime('%a., %x, %R', $this->date) . ' - '
+                . strftime($latter_template, $this->end_time);
+        }
+
+        if($format === 'include-room') {
+            $room = $this->getRoom();
+            if($room) {
+                $string = sprintf('%s <a href="%s" target="_blank">%s</a>',
+                    $string,
+                    $room->getActionURL('booking_plan'),
+                    htmlReady($room->name)
+                );
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Converts a CourseDate Entry to a CourseExDate Entry
+     * returns instance of the new CourseExDate or NULL
+     *
+     * @return Object CourseExDate
+     */
+    public function cancelDate()
+    {
+        //NOTE: If you modify this method make sure the changes
+        //are also inserted in SingleDateDB::storeSingleDate
+        //and CourseExDate::unCancelDate to keep the behavior consistent
+        //across Stud.IP!
+
+        //These statements are used below to update the relations
+        //of this date.
+        $db = DBManager::get();
+
+        $groups_stmt = $db->prepare(
+            "UPDATE termin_related_groups
+            SET termin_id = :ex_termin_id
+            WHERE termin_id = :termin_id;"
+        );
+
+        $persons_stmt = $db->prepare(
+            "UPDATE termin_related_persons
+            SET range_id = :ex_termin_id
+            WHERE range_id = :termin_id;"
+        );
+
+        $date = $this->toArray();
+
+        $ex_date = new CourseExDate();
+        $ex_date->setData($date);
+        if ($room = $this->getRoom()) {
+            $ex_date['resource_id'] = $room->getId();
+        }
+        $ex_date->setId($ex_date->getNewId());
+
+        if ($ex_date->store()) {
+            //Update some (but not all) relations to the date so that they
+            //use the ID of the new ex-date.
+
+            $groups_stmt->execute(
+                [
+                    'ex_termin_id' => $ex_date->id,
+                    'termin_id' => $this->id
+                ]
+            );
+
+            $persons_stmt->execute(
+                [
+                    'ex_termin_id' => $ex_date->id,
+                    'termin_id' => $this->id
+                ]
+            );
+
+            //After we updated the relations so that they refer to the
+            //new ex-date we can delete this date and return the ex-date:
+            $this->delete();
+            return $ex_date;
+        }
+        return null;
+    }
+
+    /**
+     * saves this object and expires the cache
+     *
+     * @see SimpleORMap::store()
+     */
+    public function store()
+    {
+        // load room-booking, if any
+        $this->room_booking;
+
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache->expire('course/undecorated_data/'. $this->range_id);
+        return parent::store();
+    }
+
+    /**
+     * deletes this object and expires the cache
+     *
+     * @see SimpleORMap::delete()
+     */
+    public function delete()
+    {
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache->expire('course/undecorated_data/'. $this->range_id);
+        return parent::delete();
+    }
+
+    /**
+     * @param $type string type of callback
+     */
+    protected function cbStudipLog($type)
+    {
+        if (!$this->metadate_id) {
+            if ($type === 'after_create') {
+                StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->id, $this->getFullName());
+            }
+            if ($type === 'before_store' && !$this->isNew() && ($this->isFieldDirty('date') || $this->isFieldDirty('end_time'))) {
+                $old_entry = self::build($this->content_db);
+                StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->id, $old_entry->getFullName() . ' -> ' . $this->getFullName());
+            }
+        }
+    }
+
+    /**
+     * Returns a list of all possible warnings that should be considered when
+     * this date is deleted.
+     *
+     * @return array of warnings
+     */
+    public function getDeletionWarnings()
+    {
+        $warnings = [];
+        if (count($this->topics) > 0) {
+            $warnings[] = _('Diesem Termin ist ein Thema zugeordnet.');
+        }
+
+        if (Config::get()->RESOURCES_ENABLE && $this->getRoom()) {
+            $warnings[] = _('Dieser Termin hat eine Raumbuchung, welche mit dem Termin gelöscht wird.');
+        }
+
+        return $warnings;
+    }
+
+    /**
+     * return all filerefs belonging to this date, permissions fpr given user are checked
+     *
+     * @param string|User $user_or_id
+     * @return mixed[] A mixed array with FolderType and FileRef objects.
+     */
+    public function getAccessibleFolderFiles($user_or_id)
+    {
+        $user_id = $user_or_id instanceof User ? $user_or_id->id : $user_or_id;
+        $all_files = [];
+        $all_folders = [];
+        $folders = $this->folders->getArrayCopy();
+        foreach ($this->topics as $topic) {
+            $folders = array_merge($folders, $topic->folders->getArrayCopy());
+        }
+        foreach ($folders as $folder) {
+            [$files, $typed_folders] = array_values(FileManager::getFolderFilesRecursive($folder->getTypedFolder(), $user_id));
+            foreach ($files as $file) {
+                $all_files[$file->id] = $file;
+            }
+            $all_folders = array_merge($all_folders, $typed_folders);
+        }
+        return ['files' => $all_files, 'folders' => $all_folders];
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("autor_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Termine'), 'termine', $field_data);
+            }
+        }
+    }
+
+
+    /**
+     * @return string A string representation of the course date.
+     */
+    public function __toString() : string
+    {
+        return sprintf(
+            _('Termin am %1$s, %2$s von %3$s bis %4$s Uhr'),
+            strftime('%A', $this->date),
+            strftime('%x', $this->date),
+            date('H:i', $this->date),
+            date('H:i', $this->end_time)
+        );
+    }
+
+    //Start of Event interface implementation.
+
+    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
+    {
+        return self::findBySQL(
+            "JOIN `seminar_user`
+               ON `seminar_user`.`seminar_id` = `termine`.`range_id`
+             WHERE `seminar_user`.`user_id` = :user_id
+               AND `termine`.`date` BETWEEN :begin AND :end
+               AND (
+                   IFNULL(`termine`.`metadate_id`, '') = ''
+                   OR `termine`.`metadate_id` NOT IN (
+                       SELECT `metadate_id`
+                       FROM `schedule_seminare`
+                       WHERE `user_id` = :user_id
+                         AND `visible` = 0
+                 )
+             )
+             ORDER BY date",
+            [
+                'begin'   => $begin->getTimestamp(),
+                'end'     => $end->getTimestamp(),
+                'user_id' => $range_id
+            ]
+        );
+    }
+
+    //Event interface implementation:
+
+    public function getObjectId() : string
+    {
+        return (string) $this->id;
+    }
+
+    public function getPrimaryObjectID(): string
+    {
+        return $this->range_id;
+    }
+
+    public function getObjectClass(): string
+    {
+        return static::class;
+    }
+
+    public function getTitle(): string
+    {
+        return $this->course->name ?? '';
+    }
+
+    public function getBegin(): DateTime
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->date);
+        return $begin;
+    }
+
+    public function getEnd(): DateTime
+    {
+        $end = new DateTime();
+        $end->setTimestamp($this->end_time);
+        return $end;
+    }
+
+    public function getDuration(): DateInterval
+    {
+        $begin = $this->getBegin();
+        $end = $this->getEnd();
+        return $end->diff($begin);
+    }
+
+    public function getLocation(): string
+    {
+        return $this->raum ?? '';
+    }
+
+    public function getUniqueId(): string
+    {
+        return sprintf('Stud.IP-SEM-%1$s@%2$s', $this->id, $_SERVER['SERVER_NAME']);
+    }
+
+    public function getDescription(): string
+    {
+        $descriptions = $this->topics->map(function ($topic) {
+            $desc = $topic->title . "\n";
+            $desc .= $topic->description;
+
+            return $desc;
+        });
+        return implode("\n\n", $descriptions);
+    }
+
+    public function getAdditionalDescriptions(): array
+    {
+        $descriptions = [];
+        if (count($this->dozenten) > 0) {
+            $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullName());
+        }
+        if (count($this->statusgruppen) > 0) {
+            $descriptions[_('Beteiligte Gruppen')] = implode(', ', $this->statusgruppen->getValue('name'));
+        }
+        return $descriptions;
+    }
+
+    public function isAllDayEvent(): bool
+    {
+        //Course dates are never all day events.
+        return false;
+    }
+
+    public function isWritable(string $user_id): bool
+    {
+        return $GLOBALS['perm']->have_studip_perm('dozent', $this->range_id, $user_id);
+    }
+
+    public function getCreationDate(): DateTime
+    {
+        $mkdate = new DateTime();
+        $mkdate->setTimestamp($this->mkdate);
+        return $mkdate;
+    }
+
+    public function getModificationDate(): DateTime
+    {
+        $chdate = new DateTime();
+        $chdate->setTimestamp($this->chdate);
+        return $chdate;
+    }
+
+    public function getImportDate(): DateTime
+    {
+        return $this->getCreationDate();
+    }
+
+    public function getAuthor(): ?User
+    {
+        return $this->author;
+    }
+
+    public function getEditor(): ?User
+    {
+        return null;
+    }
+
+    public function toEventData(string $user_id): \Studip\Calendar\EventData
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->date);
+        $end = new DateTime();
+        $end->setTimestamp($this->end_time);
+
+        $membership = CourseMember::findOneBySQL(
+            'seminar_id = :course_id AND user_id = :user_id',
+            ['course_id' => $this->range_id, 'user_id' => $user_id]
+        );
+        $class_names = [];
+        if ($membership) {
+            $class_names[] = 'course-color-' . $membership->gruppe;
+        }
+        $studip_view_urls = [];
+        if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
+            $studip_view_urls['show'] = URLHelper::getURL('dispatch.php/course/dates/details/' . $this->id, ['cid' => $this->range_id, 'extra_buttons' => '1']);
+        }
+
+        return new \Studip\Calendar\EventData(
+            $begin,
+            $end,
+            $this->getTitle(),
+            $class_names,
+            '#000000',
+            '#aaaaaa',
+            $this->isWritable($user_id),
+            CourseDate::class,
+            $this->id,
+            Course::class,
+            $this->range_id,
+            'course',
+            $this->range_id,
+            $studip_view_urls,
+            [],
+            'seminar',
+            'rgba(0,0,0,0)'
+        );
+    }
+
+    //End of Event interface implementation.
+}
diff --git a/lib/models/CourseExDate.class.php b/lib/models/CourseExDate.class.php
deleted file mode 100644
index 2d3afea..0000000
--- a/lib/models/CourseExDate.class.php
+++ /dev/null
@@ -1,422 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @author     Rasmus Fuhse <fuhse@data-quest.de>
- * @copyright   2014 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for termin_id
- * @property string $termin_id database column
- * @property string $range_id database column
- * @property string $autor_id database column
- * @property string $content database column
- * @property int $date database column
- * @property int $end_time database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $date_typ database column
- * @property string|null $raum database column
- * @property string|null $metadate_id database column
- * @property string $resource_id database column
- * @property User $author belongs_to User
- * @property Course $course belongs_to Course
- * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate
- * @property-read mixed $topics additional field
- * @property-read mixed $statusgruppen additional field
- * @property-read mixed $dozenten additional field
- * @property-read mixed $room_booking additional field
- * @property-read mixed $room_request additional field
- */
-
-class CourseExDate extends SimpleORMap implements PrivacyObject, Event
-{
-    /**
-     * Configures this model.
-     *
-     * @param Array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'ex_termine';
-        $config['belongs_to']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'autor_id'
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'range_id'
-        ];
-        $config['belongs_to']['cycle'] = [
-            'class_name'  => SeminarCycleDate::class,
-            'foreign_key' => 'metadate_id'
-        ];
-
-        $dummy_relation = function () { return new SimpleCollection(); };
-        $dummy_null = function () { return null; };
-        $config['additional_fields']['topics']['get'] = $dummy_relation;
-        $config['additional_fields']['statusgruppen']['get'] = $dummy_relation;
-        $config['additional_fields']['dozenten']['get'] = $dummy_relation;
-        $config['additional_fields']['room_booking']['get'] = $dummy_null;
-        $config['additional_fields']['room_request']['get'] = $dummy_null;
-        $config['default_values']['date_typ'] = 1;
-        parent::configure($config);
-    }
-
-    const FORMAT_DEFAULT = 'default';
-    const FORMAT_VERBOSE = 'verbose';
-
-    /**
-     * Returns course dates by course id
-     *
-     * @param String $seminar_id Id of the course
-     * @return array with the associated dates
-     */
-    public static function findBySeminar_id($seminar_id)
-    {
-        return self::findByRange_id($seminar_id);
-    }
-
-    /**
-     * Return course dates by range id (which is in many cases the course id)
-     *
-     * @param String $seminar_id Id of the course
-     * @param String $order_by   Optional order definition
-     * @return array with the associated dates
-     */
-    public static function findByRange_id($seminar_id, $order_by = 'ORDER BY date')
-    {
-        return parent::findByRange_id($seminar_id, $order_by);
-    }
-    /**
-     * Returns the name of the assigned room for this date.
-     *
-     * @return String that is always empty
-     */
-    public function getRoomName()
-    {
-        return '';
-    }
-
-    /**
-     * Returns the assigned room for this date as an object.
-     *
-     * @return null. always. canceled dates need no room.
-     */
-    public function getRoom()
-    {
-        return null;
-    }
-
-    /**
-     * Returns the name of the type of this date.
-     *
-     * @param String containing the type name
-     */
-    public function getTypeName()
-    {
-        return $GLOBALS['TERMIN_TYP'][$this->date_typ]['name'];
-    }
-
-    /**
-     * Returns the full qualified name of this date.
-     *
-     * @param String $format Optional format type (only 'default' and
-     *                       'verbose' are supported by now)
-     * @return String containing the full name of this date.
-     */
-    public function getFullName($format = 'default')
-    {
-        if (!$this->date || !in_array($format, ['default', 'verbose'])) {
-            return '';
-        }
-
-        $latter_template = $format === 'verbose'
-                         ? _('%R Uhr')
-                         : '%R';
-
-        if (($this->end_time - $this->date) / 60 / 60 > 23) {
-            return strftime('%a., %x' . ' (' . _('ganztägig') . ')' , $this->date) . " (" . _("fällt aus") . ")";
-        }
-
-        return strftime('%a., %x, %R', $this->date) . ' - '
-             . strftime($latter_template, $this->end_time)
-             . ' (' . _('fällt aus') . ')';
-    }
-
-    /**
-     * Converts a CourseExDate Entry to a CourseDate Entry
-     * returns instance of the new CourseDate or NULL
-     * @return Object CourseDate
-     */
-    public function unCancelDate()
-    {
-        //NOTE: If you modify this method make sure the changes
-        //are also inserted in SingleDateDB::storeSingleDate
-        //and CourseDate::cancelDate to keep the behavior consistent
-        //across Stud.IP!
-
-        //These statements are used below to update the relations
-        //of this ex-date.
-        $db = DBManager::get();
-
-        $groups_stmt = $db->prepare(
-            "UPDATE termin_related_groups
-            SET termin_id = :termin_id
-            WHERE termin_id = :ex_termin_id;"
-        );
-
-        $persons_stmt = $db->prepare(
-            "UPDATE termin_related_persons
-            SET range_id = :termin_id
-            WHERE range_id = :ex_termin_id;"
-        );
-
-        $ex_date = $this->toArray();
-
-        //REMOVE content
-        unset($ex_date['content']);
-
-        $date = new CourseDate();
-        $date->setData($ex_date);
-        $date->setId($date->getNewId());
-
-        if ($date->store()) {
-            //Update the relations to the ex-date so that they
-            //use the ID of the new date.
-
-            $groups_stmt->execute(
-                [
-                    'termin_id' => $date->id,
-                    'ex_termin_id' => $this->id
-                ]
-            );
-
-            $persons_stmt->execute(
-                [
-                    'termin_id' => $date->id,
-                    'ex_termin_id' => $this->id
-                ]
-            );
-
-            //After we updated the relations so that they refer to the
-            //new date we can delete this ex-date and return the date:
-
-            StudipLog::log('SEM_UNDELETE_SINGLEDATE', $this->termin_id, $this->range_id, 'Cycle_id: ' . $this->metadate_id);
-            $this->delete();
-            return $date;
-        }
-        return null;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("autor_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('ausgefallende Termine'), 'ex_termine', $field_data);
-            }
-        }
-    }
-
-
-    /**
-     * @return string A string representation of the course date.
-     */
-    public function __toString() : string
-    {
-        return sprintf(
-            _('Ausgefallener Termin am %1$s, %2$s von %3$s bis %4$s Uhr'),
-            strftime('%A', $this->date),
-            strftime('%x', $this->date),
-            date('H:i', $this->date),
-            date('H:i', $this->end_time)
-        );
-    }
-
-    //Start of Event interface implementation.
-
-    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
-    {
-        return self::findBySQL(
-            "JOIN `seminar_user`
-               ON `seminar_user`.`seminar_id` = `ex_termine`.`range_id`
-             WHERE `seminar_user`.`user_id` = :user_id
-               AND `ex_termine`.`date` BETWEEN :begin AND :end
-               AND (
-                   IFNULL(`ex_termine`.`metadate_id`, '') = ''
-                   OR `ex_termine`.`metadate_id` NOT IN (
-                       SELECT `metadate_id`
-                       FROM `schedule_seminare`
-                       WHERE `user_id` = :user_id
-                         AND `visible` = 0
-                   )
-               )
-             ORDER BY date",
-            [
-                'begin'   => $begin->getTimestamp(),
-                'end'     => $end->getTimestamp(),
-                'user_id' => $range_id
-            ]
-        );
-    }
-
-    //Event interface implementation:
-
-    public function getObjectId() : string
-    {
-        return (string) $this->id;
-    }
-
-    public function getPrimaryObjectID(): string
-    {
-        return $this->range_id;
-    }
-
-    public function getObjectClass(): string
-    {
-        return static::class;
-    }
-
-    public function getTitle(): string
-    {
-        return sprintf('%s (fällt aus)', $this->course->name ?? '');
-    }
-
-    public function getBegin(): DateTime
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->date);
-        return $begin;
-    }
-
-    public function getEnd(): DateTime
-    {
-        $end = new DateTime();
-        $end->setTimestamp($this->end_time);
-        return $end;
-    }
-
-    public function getDuration(): DateInterval
-    {
-        $begin = $this->getBegin();
-        $end = $this->getEnd();
-        return $end->diff($begin);
-    }
-
-    public function getLocation(): string
-    {
-        return '';
-    }
-
-    public function getUniqueId(): string
-    {
-        return sprintf('Stud.IP-SEM-%1$s@%2$s', $this->id, $_SERVER['SERVER_NAME']);
-    }
-
-    public function getDescription(): string
-    {
-        return trim($this->getValue('content'));
-    }
-
-    public function getAdditionalDescriptions(): array
-    {
-        $descriptions = [];
-        if (count($this->dozenten) > 0) {
-            $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullName());
-        }
-        if (count($this->statusgruppen) > 0) {
-            $descriptions[_('Beteiligte Gruppen')] = implode(', ', $this->statusgruppen->getValue('name'));
-        }
-        return $descriptions;
-    }
-
-    public function isAllDayEvent(): bool
-    {
-        //Course dates are never all day events.
-        return false;
-    }
-
-    public function isWritable(string $user_id): bool
-    {
-        return $GLOBALS['perm']->have_studip_perm('dozent', $this->range_id, $user_id);
-    }
-
-    public function getCreationDate(): DateTime
-    {
-        $mkdate = new DateTime();
-        $mkdate->setTimestamp($this->mkdate);
-        return $mkdate;
-    }
-
-    public function getModificationDate(): DateTime
-    {
-        $chdate = new DateTime();
-        $chdate->setTimestamp($this->chdate);
-        return $chdate;
-    }
-
-    public function getImportDate(): DateTime
-    {
-        return $this->getCreationDate();
-    }
-
-    public function getAuthor(): ?User
-    {
-        return $this->author;
-    }
-
-    public function getEditor(): ?User
-    {
-        return null;
-    }
-
-    public function toEventData(string $user_id): \Studip\Calendar\EventData
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->date);
-        $end = new DateTime();
-        $end->setTimestamp($this->end_time);
-
-        $studip_view_urls = [];
-        if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
-            $studip_view_urls['show'] = URLHelper::getURL('dispatch.php/course/details', ['cid' => $this->range_id, 'link_to_course' => '1']);
-        }
-
-        return new \Studip\Calendar\EventData(
-            $begin,
-            $end,
-            $this->getTitle(),
-            [],
-            '#000000',
-            '#aaaaaa',
-            $this->isWritable($user_id),
-            CourseExDate::class,
-            $this->id,
-            Course::class,
-            $this->range_id,
-            'course',
-            $this->range_id,
-            $studip_view_urls,
-            [],
-            'seminar',
-            'rgba(0,0,0,0)'
-        );
-    }
-
-    //End of Event interface implementation.
-}
diff --git a/lib/models/CourseExDate.php b/lib/models/CourseExDate.php
new file mode 100644
index 0000000..2d3afea
--- /dev/null
+++ b/lib/models/CourseExDate.php
@@ -0,0 +1,422 @@
+<?php
+/**
+ * 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.
+ *
+ * @author     Rasmus Fuhse <fuhse@data-quest.de>
+ * @copyright   2014 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for termin_id
+ * @property string $termin_id database column
+ * @property string $range_id database column
+ * @property string $autor_id database column
+ * @property string $content database column
+ * @property int $date database column
+ * @property int $end_time database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $date_typ database column
+ * @property string|null $raum database column
+ * @property string|null $metadate_id database column
+ * @property string $resource_id database column
+ * @property User $author belongs_to User
+ * @property Course $course belongs_to Course
+ * @property SeminarCycleDate|null $cycle belongs_to SeminarCycleDate
+ * @property-read mixed $topics additional field
+ * @property-read mixed $statusgruppen additional field
+ * @property-read mixed $dozenten additional field
+ * @property-read mixed $room_booking additional field
+ * @property-read mixed $room_request additional field
+ */
+
+class CourseExDate extends SimpleORMap implements PrivacyObject, Event
+{
+    /**
+     * Configures this model.
+     *
+     * @param Array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'ex_termine';
+        $config['belongs_to']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'autor_id'
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'range_id'
+        ];
+        $config['belongs_to']['cycle'] = [
+            'class_name'  => SeminarCycleDate::class,
+            'foreign_key' => 'metadate_id'
+        ];
+
+        $dummy_relation = function () { return new SimpleCollection(); };
+        $dummy_null = function () { return null; };
+        $config['additional_fields']['topics']['get'] = $dummy_relation;
+        $config['additional_fields']['statusgruppen']['get'] = $dummy_relation;
+        $config['additional_fields']['dozenten']['get'] = $dummy_relation;
+        $config['additional_fields']['room_booking']['get'] = $dummy_null;
+        $config['additional_fields']['room_request']['get'] = $dummy_null;
+        $config['default_values']['date_typ'] = 1;
+        parent::configure($config);
+    }
+
+    const FORMAT_DEFAULT = 'default';
+    const FORMAT_VERBOSE = 'verbose';
+
+    /**
+     * Returns course dates by course id
+     *
+     * @param String $seminar_id Id of the course
+     * @return array with the associated dates
+     */
+    public static function findBySeminar_id($seminar_id)
+    {
+        return self::findByRange_id($seminar_id);
+    }
+
+    /**
+     * Return course dates by range id (which is in many cases the course id)
+     *
+     * @param String $seminar_id Id of the course
+     * @param String $order_by   Optional order definition
+     * @return array with the associated dates
+     */
+    public static function findByRange_id($seminar_id, $order_by = 'ORDER BY date')
+    {
+        return parent::findByRange_id($seminar_id, $order_by);
+    }
+    /**
+     * Returns the name of the assigned room for this date.
+     *
+     * @return String that is always empty
+     */
+    public function getRoomName()
+    {
+        return '';
+    }
+
+    /**
+     * Returns the assigned room for this date as an object.
+     *
+     * @return null. always. canceled dates need no room.
+     */
+    public function getRoom()
+    {
+        return null;
+    }
+
+    /**
+     * Returns the name of the type of this date.
+     *
+     * @param String containing the type name
+     */
+    public function getTypeName()
+    {
+        return $GLOBALS['TERMIN_TYP'][$this->date_typ]['name'];
+    }
+
+    /**
+     * Returns the full qualified name of this date.
+     *
+     * @param String $format Optional format type (only 'default' and
+     *                       'verbose' are supported by now)
+     * @return String containing the full name of this date.
+     */
+    public function getFullName($format = 'default')
+    {
+        if (!$this->date || !in_array($format, ['default', 'verbose'])) {
+            return '';
+        }
+
+        $latter_template = $format === 'verbose'
+                         ? _('%R Uhr')
+                         : '%R';
+
+        if (($this->end_time - $this->date) / 60 / 60 > 23) {
+            return strftime('%a., %x' . ' (' . _('ganztägig') . ')' , $this->date) . " (" . _("fällt aus") . ")";
+        }
+
+        return strftime('%a., %x, %R', $this->date) . ' - '
+             . strftime($latter_template, $this->end_time)
+             . ' (' . _('fällt aus') . ')';
+    }
+
+    /**
+     * Converts a CourseExDate Entry to a CourseDate Entry
+     * returns instance of the new CourseDate or NULL
+     * @return Object CourseDate
+     */
+    public function unCancelDate()
+    {
+        //NOTE: If you modify this method make sure the changes
+        //are also inserted in SingleDateDB::storeSingleDate
+        //and CourseDate::cancelDate to keep the behavior consistent
+        //across Stud.IP!
+
+        //These statements are used below to update the relations
+        //of this ex-date.
+        $db = DBManager::get();
+
+        $groups_stmt = $db->prepare(
+            "UPDATE termin_related_groups
+            SET termin_id = :termin_id
+            WHERE termin_id = :ex_termin_id;"
+        );
+
+        $persons_stmt = $db->prepare(
+            "UPDATE termin_related_persons
+            SET range_id = :termin_id
+            WHERE range_id = :ex_termin_id;"
+        );
+
+        $ex_date = $this->toArray();
+
+        //REMOVE content
+        unset($ex_date['content']);
+
+        $date = new CourseDate();
+        $date->setData($ex_date);
+        $date->setId($date->getNewId());
+
+        if ($date->store()) {
+            //Update the relations to the ex-date so that they
+            //use the ID of the new date.
+
+            $groups_stmt->execute(
+                [
+                    'termin_id' => $date->id,
+                    'ex_termin_id' => $this->id
+                ]
+            );
+
+            $persons_stmt->execute(
+                [
+                    'termin_id' => $date->id,
+                    'ex_termin_id' => $this->id
+                ]
+            );
+
+            //After we updated the relations so that they refer to the
+            //new date we can delete this ex-date and return the date:
+
+            StudipLog::log('SEM_UNDELETE_SINGLEDATE', $this->termin_id, $this->range_id, 'Cycle_id: ' . $this->metadate_id);
+            $this->delete();
+            return $date;
+        }
+        return null;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("autor_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('ausgefallende Termine'), 'ex_termine', $field_data);
+            }
+        }
+    }
+
+
+    /**
+     * @return string A string representation of the course date.
+     */
+    public function __toString() : string
+    {
+        return sprintf(
+            _('Ausgefallener Termin am %1$s, %2$s von %3$s bis %4$s Uhr'),
+            strftime('%A', $this->date),
+            strftime('%x', $this->date),
+            date('H:i', $this->date),
+            date('H:i', $this->end_time)
+        );
+    }
+
+    //Start of Event interface implementation.
+
+    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
+    {
+        return self::findBySQL(
+            "JOIN `seminar_user`
+               ON `seminar_user`.`seminar_id` = `ex_termine`.`range_id`
+             WHERE `seminar_user`.`user_id` = :user_id
+               AND `ex_termine`.`date` BETWEEN :begin AND :end
+               AND (
+                   IFNULL(`ex_termine`.`metadate_id`, '') = ''
+                   OR `ex_termine`.`metadate_id` NOT IN (
+                       SELECT `metadate_id`
+                       FROM `schedule_seminare`
+                       WHERE `user_id` = :user_id
+                         AND `visible` = 0
+                   )
+               )
+             ORDER BY date",
+            [
+                'begin'   => $begin->getTimestamp(),
+                'end'     => $end->getTimestamp(),
+                'user_id' => $range_id
+            ]
+        );
+    }
+
+    //Event interface implementation:
+
+    public function getObjectId() : string
+    {
+        return (string) $this->id;
+    }
+
+    public function getPrimaryObjectID(): string
+    {
+        return $this->range_id;
+    }
+
+    public function getObjectClass(): string
+    {
+        return static::class;
+    }
+
+    public function getTitle(): string
+    {
+        return sprintf('%s (fällt aus)', $this->course->name ?? '');
+    }
+
+    public function getBegin(): DateTime
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->date);
+        return $begin;
+    }
+
+    public function getEnd(): DateTime
+    {
+        $end = new DateTime();
+        $end->setTimestamp($this->end_time);
+        return $end;
+    }
+
+    public function getDuration(): DateInterval
+    {
+        $begin = $this->getBegin();
+        $end = $this->getEnd();
+        return $end->diff($begin);
+    }
+
+    public function getLocation(): string
+    {
+        return '';
+    }
+
+    public function getUniqueId(): string
+    {
+        return sprintf('Stud.IP-SEM-%1$s@%2$s', $this->id, $_SERVER['SERVER_NAME']);
+    }
+
+    public function getDescription(): string
+    {
+        return trim($this->getValue('content'));
+    }
+
+    public function getAdditionalDescriptions(): array
+    {
+        $descriptions = [];
+        if (count($this->dozenten) > 0) {
+            $descriptions[_('Durchführende Lehrende')] = implode(', ', $this->dozenten->getFullName());
+        }
+        if (count($this->statusgruppen) > 0) {
+            $descriptions[_('Beteiligte Gruppen')] = implode(', ', $this->statusgruppen->getValue('name'));
+        }
+        return $descriptions;
+    }
+
+    public function isAllDayEvent(): bool
+    {
+        //Course dates are never all day events.
+        return false;
+    }
+
+    public function isWritable(string $user_id): bool
+    {
+        return $GLOBALS['perm']->have_studip_perm('dozent', $this->range_id, $user_id);
+    }
+
+    public function getCreationDate(): DateTime
+    {
+        $mkdate = new DateTime();
+        $mkdate->setTimestamp($this->mkdate);
+        return $mkdate;
+    }
+
+    public function getModificationDate(): DateTime
+    {
+        $chdate = new DateTime();
+        $chdate->setTimestamp($this->chdate);
+        return $chdate;
+    }
+
+    public function getImportDate(): DateTime
+    {
+        return $this->getCreationDate();
+    }
+
+    public function getAuthor(): ?User
+    {
+        return $this->author;
+    }
+
+    public function getEditor(): ?User
+    {
+        return null;
+    }
+
+    public function toEventData(string $user_id): \Studip\Calendar\EventData
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->date);
+        $end = new DateTime();
+        $end->setTimestamp($this->end_time);
+
+        $studip_view_urls = [];
+        if ($GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)) {
+            $studip_view_urls['show'] = URLHelper::getURL('dispatch.php/course/details', ['cid' => $this->range_id, 'link_to_course' => '1']);
+        }
+
+        return new \Studip\Calendar\EventData(
+            $begin,
+            $end,
+            $this->getTitle(),
+            [],
+            '#000000',
+            '#aaaaaa',
+            $this->isWritable($user_id),
+            CourseExDate::class,
+            $this->id,
+            Course::class,
+            $this->range_id,
+            'course',
+            $this->range_id,
+            $studip_view_urls,
+            [],
+            'seminar',
+            'rgba(0,0,0,0)'
+        );
+    }
+
+    //End of Event interface implementation.
+}
diff --git a/lib/models/CourseMember.class.php b/lib/models/CourseMember.class.php
deleted file mode 100644
index cd7555f..0000000
--- a/lib/models/CourseMember.class.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * CourseMember.class.php
- * model class for table seminar_user
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $seminar_id database column
- * @property string $user_id database column
- * @property string $status database column
- * @property int $position database column
- * @property int $gruppe database column
- * @property int $mkdate database column
- * @property string $comment database column
- * @property string $visible database column
- * @property string $label database column
- * @property int $bind_calendar database column
- * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
- * @property User $user belongs_to User
- * @property Course $course belongs_to Course
- * @property mixed $vorname additional field
- * @property mixed $nachname additional field
- * @property mixed $username additional field
- * @property mixed $email additional field
- * @property mixed $title_front additional field
- * @property mixed $title_rear additional field
- * @property mixed $course_name additional field
- */
-class CourseMember extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'seminar_user';
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'seminar_id',
-        ];
-        $config['has_many']['datafields'] = [
-            'class_name' => DatafieldEntryModel::class,
-            'assoc_foreign_key' =>
-                function($model, $params) {
-                    list($sec_range_id, $range_id) = (array)$params[0]->getId();
-                    $model->setValue('range_id', $range_id);
-                    $model->setValue('sec_range_id', $sec_range_id);
-                },
-            'assoc_func' => 'findByModel',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-            'foreign_key' =>
-                function($course_member) {
-                    return [$course_member];
-                }
-        ];
-
-        $config['additional_fields']['vorname']     = ['user', 'vorname'];
-        $config['additional_fields']['nachname']    = ['user', 'nachname'];
-        $config['additional_fields']['username']    = ['user', 'username'];
-        $config['additional_fields']['email']       = ['user', 'email'];
-        $config['additional_fields']['title_front'] = ['user', 'title_front'];
-        $config['additional_fields']['title_rear']  = ['user', 'title_rear'];
-
-        $config['additional_fields']['course_name'] = [];
-
-        $config['registered_callbacks']['after_delete'][] = 'cbRemoveNotifications';
-
-        parent::configure($config);
-    }
-
-    public static function findByCourse($course_id)
-    {
-        $query = "SELECT seminar_user.*, aum.Vorname, aum.Nachname, aum.Email,
-                         aum.username, ui.title_front, ui.title_rear
-                         FROM seminar_user
-                         LEFT JOIN auth_user_md5 aum USING (user_id)
-                         LEFT JOIN user_info ui USING (user_id)
-                         WHERE seminar_id = ?
-                         ORDER BY position, Nachname, Vorname";
-        return DBManager::get()->fetchAll(
-            $query,
-            [$course_id],
-            __CLASS__ . '::buildExisting'
-        );
-    }
-
-    public static function findByCourseAndStatus($course_id, $status)
-    {
-        $query = "SELECT seminar_user.*, aum.Vorname, aum.Nachname, aum.Email,
-                         aum.username, ui.title_front, ui.title_rear
-                  FROM seminar_user
-                  LEFT JOIN auth_user_md5 aum USING (user_id)
-                  LEFT JOIN user_info ui USING (user_id)
-                  WHERE seminar_id = ?
-                    AND seminar_user.status IN (?)
-                  ORDER BY status, position, Nachname, Vorname";
-        return DBManager::get()->fetchAll(
-            $query,
-            [$course_id, is_array($status) ? $status : words($status)],
-            __CLASS__ . '::buildExisting'
-        );
-    }
-
-    public static function findByUser($user_id)
-    {
-        $query = "SELECT seminar_user.*, seminare.Name AS course_name
-                  FROM seminar_user
-                  LEFT JOIN seminare USING (seminar_id)
-                  WHERE user_id = ?
-                  ORDER BY seminare.Name";
-        return DBManager::get()->fetchAll(
-            $query,
-            [$user_id],
-            __CLASS__ . '::buildExisting'
-        );
-    }
-
-    /**
-     * Retrieves the number of all members of a status
-     *
-     * @param String|Array $status  the status to filter with
-     *
-     * @return int the number of all those members.
-     */
-    public static function countByCourseAndStatus($course_id, $status)
-    {
-        return self::countBySql(
-            'seminar_id = ? AND status IN(?)',
-            [$course_id, is_array($status) ? $status : words($status)]
-        );
-    }
-
-    public function getUserFullname($format = 'full')
-    {
-        return User::build(array_merge(
-            ['motto' => ''],
-            $this->toArray('vorname nachname username title_front title_rear')
-        ))->getFullName($format);
-    }
-
-    public function cbRemoveNotifications()
-    {
-        CourseMemberNotification::deleteBySQL(
-            'user_id = ? AND seminar_id = ?',
-            [$this->user_id, $this->seminar_id]
-        );
-    }
-
-    /**
-     * Get members of a course
-     *
-     * @param string $course_id
-     * @param string $sort_status
-     * @param string $order_by
-     * @return array
-     */
-    public static function getMembers(string $course_id, string $sort_status = 'autor', string $order_by = 'nachname asc'): array
-    {
-        list($order, $asc) = explode(' ', $order_by);
-        if ($order === 'nachname') {
-            $order_by = "Nachname {$asc},Vorname {$asc}";
-        }
-
-        $query = "SELECT su.user_id, username, Vorname, Nachname, Email, status,
-                         position, su.mkdate, su.visible, su.comment,
-                         {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
-                  FROM seminar_user AS su
-                  INNER JOIN auth_user_md5 USING (user_id)
-                  INNER JOIN user_info USING (user_id)
-                  WHERE seminar_id = ?
-                  ORDER BY position, Nachname ASC";
-        $st = DBManager::get()->prepare($query);
-        $st->execute([$course_id]);
-        $members = SimpleCollection::createFromArray($st->fetchAll(PDO::FETCH_ASSOC));
-        $filtered_members = [];
-
-        foreach (['user', 'autor', 'tutor', 'dozent'] as $status) {
-            $filtered_members[$status] = $members->findBy('status', $status);
-            if ($status === $sort_status) {
-                $filtered_members[$status]->orderBy($order_by, $order !== 'nachname' ? SORT_NUMERIC : SORT_LOCALE_STRING);
-            } else {
-                $filtered_members[$status]->orderBy(in_array($status, ['tutor', 'dozent']) ? 'position,Nachname,Vorname' : 'Nachname,Vorname');
-            }
-        }
-        return $filtered_members;
-    }
-
-    /**
-     * Get user informations by first and last name for csv-import
-     * @param string $course_id
-     * @param string $nachname
-     * @param string $vorname
-     * @return array
-     */
-    public static function getMemberByIdentification(string $course_id, string $nachname, string $vorname = null): array
-    {
-        return DBManager::get()->fetchAll("SELECT
-                    auth_user_md5.user_id,
-                    auth_user_md5.username,
-                    auth_user_md5.perms,
-                    seminar_user.Seminar_id AS is_present,
-                    {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
-                 FROM auth_user_md5
-                 LEFT JOIN user_info USING (user_id)
-                 LEFT JOIN seminar_user ON (seminar_user.user_id = auth_user_md5.user_id AND seminar_user.Seminar_id = ?)
-                 WHERE auth_user_md5.perms IN ('autor', 'tutor', 'dozent')
-                 AND auth_user_md5.visible <> 'never'
-                 AND auth_user_md5.Nachname LIKE ? AND (? IS NULL OR auth_user_md5.Vorname LIKE ?)
-                 ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname",
-            [$course_id, $nachname, $vorname, $vorname]);
-    }
-
-    /**
-     * Get user informations by username for csv-import
-     * @param string $course_id
-     * @param string $username
-     * @return Array
-     */
-    public static function getMemberByUsername(string $course_id, string $username): array
-    {
-        return DBManager::get()->fetchAll(
-            "SELECT auth_user_md5.user_id,
-                    auth_user_md5.username,
-                    auth_user_md5.perms,
-                    seminar_user.Seminar_id AS is_present,
-                    {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
-             FROM auth_user_md5
-             LEFT JOIN user_info USING (user_id)
-             LEFT JOIN seminar_user ON (seminar_user.user_id = auth_user_md5.user_id AND seminar_user.Seminar_id = ?)
-             WHERE auth_user_md5.perms IN ('autor', 'tutor', 'dozent')
-             AND auth_user_md5.visible <> 'never'
-               AND auth_user_md5.username LIKE ?
-             ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname",
-            [$course_id, $username]
-        );
-    }
-
-    /**
-     * Get user informations by email for csv-import
-     * @param String $course_id
-     * @param String $email
-     * @return Array
-     */
-    public static function getMemberByEmail($course_id, $email): array
-    {
-        return DBManager::get()->fetchAll(
-            "SELECT a.user_id, username,
-                    perms, b.Seminar_id AS is_present
-             FROM auth_user_md5 AS a
-             LEFT JOIN user_info USING (user_id)
-             LEFT JOIN seminar_user AS b ON (b.user_id = a.user_id AND b.Seminar_id = ?)
-             WHERE a.perms IN ('autor', 'tutor', 'dozent')
-             AND a.visible <> 'never'
-               AND email LIKE ?
-             ORDER BY Nachname, Vorname",
-            [$course_id, $email]
-        );
-    }
-
-    /**
-     * Get user informations by generic datafields for csv-import
-     * @param string $course_id
-     * @param string $nachname
-     * @param string $datafield_id
-     * @return Array
-     */
-    public static function getMemberByDatafield(string $course_id, string $nachname,  string $datafield_id): array
-    {
-        // TODO Fullname
-        return DBManager::get()->fetchAll(
-            "SELECT
-                auth_user_md5.user_id,
-                auth_user_md5.username,
-                seminar_user.Seminar_id AS is_present,
-                {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
-             FROM datafields_entries
-             LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = datafields_entries.range_id)
-             LEFT JOIN user_info USING (user_id)
-             LEFT JOIN seminar_user ON (seminar_user.user_id = auth_user_md5.user_id AND seminar_user.Seminar_id = ?)
-             WHERE auth_user_md5.perms IN ('autor', 'tutor', 'dozent')
-             AND auth_user_md5.visible <> 'never'
-               AND datafields_entries.datafield_id = ? AND datafields_entries.content = ?
-             ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname",
-            [$course_id, $datafield_id, $nachname]
-        );
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL('user_id = ?', [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('SeminareUser'), 'seminar_user', $field_data);
-            }
-        }
-    }
-
-    /**
-     * return the highest position-number increased by one for the
-     * passed user-group in the passed seminar
-     *
-     * @param string $status     can be on of 'tutor', 'dozent', ...
-     * @param string $seminar_id the seminar to work on
-     *
-     * @return int  the next available position
-     */
-    public static function getNextPosition(string $status, string $seminar_id): int
-    {
-        return (int) DBManager::get()->fetchColumn(
-            "SELECT MAX(position) + 1
-              FROM seminar_user
-              WHERE Seminar_id = ? AND status = ?",
-            [$seminar_id, $status]
-        );
-    }
-
-    /**
-     * reset the order-positions for the given status in the passed seminar,
-     * starting at the passed position
-     *
-     * @param string $course_id     the seminar to work on
-     * @param int    $position the position to start with
-     *
-     * @return void
-     */
-    public static function resortMembership(string $course_id, int $position, string $status = 'tutor')
-    {
-        self::findEachBySQL(
-            function (CourseMember $membership) {
-                $membership->position = $membership->position - 1;
-                $membership->store();
-            },
-            "Seminar_id = ? AND position > ? AND status = ? ",
-            [$course_id, $position, $status]
-        );
-    }
-    /**
-     * Insert a user into a seminar with optional log-message and contingent
-     *
-     * @param string   $seminar_id
-     * @param string   $user_id
-     * @param string   $status       status of user in the seminar (user, autor, tutor, dozent)
-     * @param boolean  $copy_studycourse  if true, the studycourse is copied from admission_seminar_user
-     *                                    to seminar_user. Overrides the $contingent-parameter
-     * @param string   $contingent   optional studiengang_id, if no id is given, no contingent is considered
-     * @param string   $log_message  optional log-message. if no log-message is given a default one is used
-     * @return bool
-     */
-    public static function insertCourseMember($seminar_id, $user_id, $status, $copy_studycourse = false, $contingent = false, $log_message = false): bool
-    {
-        if (!$user_id) {
-            return false;
-        }
-        // get the seminar-object
-        $sem = Seminar::GetInstance($seminar_id);
-
-        $admission_status = '';
-        $admission_comment = '';
-        $mkdate = time();
-
-        $admission_user = AdmissionApplication::find([$user_id, $seminar_id]);
-        if ($admission_user) {
-            $admission_status = $admission_user->status;
-            $admission_comment = $admission_user->comment ?? '';
-            $mkdate = $admission_user->mkdate;
-        }
-
-        // check if there are places left in the submitted contingent (if any)
-        //ignore if preliminary
-        if ($admission_status !== 'accepted' && $contingent && $sem->isAdmissionEnabled() && !$sem->getFreeAdmissionSeats()) {
-            return false;
-        }
-
-        // get coloured group as used on meine_seminare
-        $colour_group = $sem->getDefaultGroup();
-
-        // LOGGING
-        // if no log message is submitted use a default one
-        if (!$log_message) {
-            $log_message = 'Wurde in die Veranstaltung eingetragen, admission_status: '. $admission_status . ' Kontingent: ' . $contingent;
-        }
-        StudipLog::log('SEM_USER_ADD', $seminar_id, $user_id, $status, $log_message);
-        $membership = new self([$seminar_id, $user_id]);
-        $membership->setData([
-            'Seminar_id' => $seminar_id,
-            'user_id'    => $user_id,
-            'status'     => $status,
-            'comment'    => $admission_comment,
-            'gruppe'     => $colour_group,
-            'mkdate'     => $mkdate,
-        ]);
-        $membership->store();
-
-        NotificationCenter::postNotification('UserDidEnterCourse', $seminar_id, $user_id);
-
-        if ($admission_status) {
-            $admission_user->delete();
-
-            //renumber the waiting/accepted/lot list, a user was deleted from it
-            AdmissionApplication::renumberAdmission($seminar_id);
-        }
-        $cs = $sem->getCourseSet();
-        if ($cs) {
-            AdmissionPriority::unsetPriority($cs->getId(), $user_id, $sem->getId());
-        }
-
-        CalendarScheduleModel::deleteSeminarEntries($user_id, $seminar_id);
-
-        // reload the seminar, the contingents have changed
-        $sem->restore();
-
-        // Check if a parent course exists and insert user there.
-        if ($sem->parent_course) {
-            self::insertCourseMember($sem->parent_course, $user_id, $status, $copy_studycourse, $contingent, $log_message);
-        }
-
-        return true;
-    }
-
-    public function getExportData(): array
-    {
-        $user = $this->user;
-        $studycourse = [];
-        $user->studycourses->map(function($sc) use (&$studycourse) {
-            $studycourse[]= $sc->studycourse->name .  ',' . $sc->degree->name . ',' . $sc->semester;
-        });
-        return [
-            'status' => $this->status,
-            'salutation' => $user->salutation,
-            'Titel' => $user->title_front,
-            'Vorname' => $this->vorname,
-            'Nachname' => $this->nachname,
-            'Titel2' => $user->title_rear,
-            'username' => $this->username,
-            'privadr' => $user->privadr,
-            'privatnr' => $user->privatnr,
-            'Email' => $this->email,
-            'Anmeldedatum' => date('d.m.Y H:i:s', $this->mkdate),
-            'Matrikelnummer' => $this->user->matriculation_number,
-            'studiengaenge' => implode(';', $studycourse),
-            'position' => $this->position,
-        ];
-    }
-}
diff --git a/lib/models/CourseMember.php b/lib/models/CourseMember.php
new file mode 100644
index 0000000..cd7555f
--- /dev/null
+++ b/lib/models/CourseMember.php
@@ -0,0 +1,465 @@
+<?php
+/**
+ * CourseMember.class.php
+ * model class for table seminar_user
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $seminar_id database column
+ * @property string $user_id database column
+ * @property string $status database column
+ * @property int $position database column
+ * @property int $gruppe database column
+ * @property int $mkdate database column
+ * @property string $comment database column
+ * @property string $visible database column
+ * @property string $label database column
+ * @property int $bind_calendar database column
+ * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
+ * @property User $user belongs_to User
+ * @property Course $course belongs_to Course
+ * @property mixed $vorname additional field
+ * @property mixed $nachname additional field
+ * @property mixed $username additional field
+ * @property mixed $email additional field
+ * @property mixed $title_front additional field
+ * @property mixed $title_rear additional field
+ * @property mixed $course_name additional field
+ */
+class CourseMember extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'seminar_user';
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'seminar_id',
+        ];
+        $config['has_many']['datafields'] = [
+            'class_name' => DatafieldEntryModel::class,
+            'assoc_foreign_key' =>
+                function($model, $params) {
+                    list($sec_range_id, $range_id) = (array)$params[0]->getId();
+                    $model->setValue('range_id', $range_id);
+                    $model->setValue('sec_range_id', $sec_range_id);
+                },
+            'assoc_func' => 'findByModel',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+            'foreign_key' =>
+                function($course_member) {
+                    return [$course_member];
+                }
+        ];
+
+        $config['additional_fields']['vorname']     = ['user', 'vorname'];
+        $config['additional_fields']['nachname']    = ['user', 'nachname'];
+        $config['additional_fields']['username']    = ['user', 'username'];
+        $config['additional_fields']['email']       = ['user', 'email'];
+        $config['additional_fields']['title_front'] = ['user', 'title_front'];
+        $config['additional_fields']['title_rear']  = ['user', 'title_rear'];
+
+        $config['additional_fields']['course_name'] = [];
+
+        $config['registered_callbacks']['after_delete'][] = 'cbRemoveNotifications';
+
+        parent::configure($config);
+    }
+
+    public static function findByCourse($course_id)
+    {
+        $query = "SELECT seminar_user.*, aum.Vorname, aum.Nachname, aum.Email,
+                         aum.username, ui.title_front, ui.title_rear
+                         FROM seminar_user
+                         LEFT JOIN auth_user_md5 aum USING (user_id)
+                         LEFT JOIN user_info ui USING (user_id)
+                         WHERE seminar_id = ?
+                         ORDER BY position, Nachname, Vorname";
+        return DBManager::get()->fetchAll(
+            $query,
+            [$course_id],
+            __CLASS__ . '::buildExisting'
+        );
+    }
+
+    public static function findByCourseAndStatus($course_id, $status)
+    {
+        $query = "SELECT seminar_user.*, aum.Vorname, aum.Nachname, aum.Email,
+                         aum.username, ui.title_front, ui.title_rear
+                  FROM seminar_user
+                  LEFT JOIN auth_user_md5 aum USING (user_id)
+                  LEFT JOIN user_info ui USING (user_id)
+                  WHERE seminar_id = ?
+                    AND seminar_user.status IN (?)
+                  ORDER BY status, position, Nachname, Vorname";
+        return DBManager::get()->fetchAll(
+            $query,
+            [$course_id, is_array($status) ? $status : words($status)],
+            __CLASS__ . '::buildExisting'
+        );
+    }
+
+    public static function findByUser($user_id)
+    {
+        $query = "SELECT seminar_user.*, seminare.Name AS course_name
+                  FROM seminar_user
+                  LEFT JOIN seminare USING (seminar_id)
+                  WHERE user_id = ?
+                  ORDER BY seminare.Name";
+        return DBManager::get()->fetchAll(
+            $query,
+            [$user_id],
+            __CLASS__ . '::buildExisting'
+        );
+    }
+
+    /**
+     * Retrieves the number of all members of a status
+     *
+     * @param String|Array $status  the status to filter with
+     *
+     * @return int the number of all those members.
+     */
+    public static function countByCourseAndStatus($course_id, $status)
+    {
+        return self::countBySql(
+            'seminar_id = ? AND status IN(?)',
+            [$course_id, is_array($status) ? $status : words($status)]
+        );
+    }
+
+    public function getUserFullname($format = 'full')
+    {
+        return User::build(array_merge(
+            ['motto' => ''],
+            $this->toArray('vorname nachname username title_front title_rear')
+        ))->getFullName($format);
+    }
+
+    public function cbRemoveNotifications()
+    {
+        CourseMemberNotification::deleteBySQL(
+            'user_id = ? AND seminar_id = ?',
+            [$this->user_id, $this->seminar_id]
+        );
+    }
+
+    /**
+     * Get members of a course
+     *
+     * @param string $course_id
+     * @param string $sort_status
+     * @param string $order_by
+     * @return array
+     */
+    public static function getMembers(string $course_id, string $sort_status = 'autor', string $order_by = 'nachname asc'): array
+    {
+        list($order, $asc) = explode(' ', $order_by);
+        if ($order === 'nachname') {
+            $order_by = "Nachname {$asc},Vorname {$asc}";
+        }
+
+        $query = "SELECT su.user_id, username, Vorname, Nachname, Email, status,
+                         position, su.mkdate, su.visible, su.comment,
+                         {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
+                  FROM seminar_user AS su
+                  INNER JOIN auth_user_md5 USING (user_id)
+                  INNER JOIN user_info USING (user_id)
+                  WHERE seminar_id = ?
+                  ORDER BY position, Nachname ASC";
+        $st = DBManager::get()->prepare($query);
+        $st->execute([$course_id]);
+        $members = SimpleCollection::createFromArray($st->fetchAll(PDO::FETCH_ASSOC));
+        $filtered_members = [];
+
+        foreach (['user', 'autor', 'tutor', 'dozent'] as $status) {
+            $filtered_members[$status] = $members->findBy('status', $status);
+            if ($status === $sort_status) {
+                $filtered_members[$status]->orderBy($order_by, $order !== 'nachname' ? SORT_NUMERIC : SORT_LOCALE_STRING);
+            } else {
+                $filtered_members[$status]->orderBy(in_array($status, ['tutor', 'dozent']) ? 'position,Nachname,Vorname' : 'Nachname,Vorname');
+            }
+        }
+        return $filtered_members;
+    }
+
+    /**
+     * Get user informations by first and last name for csv-import
+     * @param string $course_id
+     * @param string $nachname
+     * @param string $vorname
+     * @return array
+     */
+    public static function getMemberByIdentification(string $course_id, string $nachname, string $vorname = null): array
+    {
+        return DBManager::get()->fetchAll("SELECT
+                    auth_user_md5.user_id,
+                    auth_user_md5.username,
+                    auth_user_md5.perms,
+                    seminar_user.Seminar_id AS is_present,
+                    {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
+                 FROM auth_user_md5
+                 LEFT JOIN user_info USING (user_id)
+                 LEFT JOIN seminar_user ON (seminar_user.user_id = auth_user_md5.user_id AND seminar_user.Seminar_id = ?)
+                 WHERE auth_user_md5.perms IN ('autor', 'tutor', 'dozent')
+                 AND auth_user_md5.visible <> 'never'
+                 AND auth_user_md5.Nachname LIKE ? AND (? IS NULL OR auth_user_md5.Vorname LIKE ?)
+                 ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname",
+            [$course_id, $nachname, $vorname, $vorname]);
+    }
+
+    /**
+     * Get user informations by username for csv-import
+     * @param string $course_id
+     * @param string $username
+     * @return Array
+     */
+    public static function getMemberByUsername(string $course_id, string $username): array
+    {
+        return DBManager::get()->fetchAll(
+            "SELECT auth_user_md5.user_id,
+                    auth_user_md5.username,
+                    auth_user_md5.perms,
+                    seminar_user.Seminar_id AS is_present,
+                    {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
+             FROM auth_user_md5
+             LEFT JOIN user_info USING (user_id)
+             LEFT JOIN seminar_user ON (seminar_user.user_id = auth_user_md5.user_id AND seminar_user.Seminar_id = ?)
+             WHERE auth_user_md5.perms IN ('autor', 'tutor', 'dozent')
+             AND auth_user_md5.visible <> 'never'
+               AND auth_user_md5.username LIKE ?
+             ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname",
+            [$course_id, $username]
+        );
+    }
+
+    /**
+     * Get user informations by email for csv-import
+     * @param String $course_id
+     * @param String $email
+     * @return Array
+     */
+    public static function getMemberByEmail($course_id, $email): array
+    {
+        return DBManager::get()->fetchAll(
+            "SELECT a.user_id, username,
+                    perms, b.Seminar_id AS is_present
+             FROM auth_user_md5 AS a
+             LEFT JOIN user_info USING (user_id)
+             LEFT JOIN seminar_user AS b ON (b.user_id = a.user_id AND b.Seminar_id = ?)
+             WHERE a.perms IN ('autor', 'tutor', 'dozent')
+             AND a.visible <> 'never'
+               AND email LIKE ?
+             ORDER BY Nachname, Vorname",
+            [$course_id, $email]
+        );
+    }
+
+    /**
+     * Get user informations by generic datafields for csv-import
+     * @param string $course_id
+     * @param string $nachname
+     * @param string $datafield_id
+     * @return Array
+     */
+    public static function getMemberByDatafield(string $course_id, string $nachname,  string $datafield_id): array
+    {
+        // TODO Fullname
+        return DBManager::get()->fetchAll(
+            "SELECT
+                auth_user_md5.user_id,
+                auth_user_md5.username,
+                seminar_user.Seminar_id AS is_present,
+                {$GLOBALS['_fullname_sql']['full_rev']} AS fullname
+             FROM datafields_entries
+             LEFT JOIN auth_user_md5 ON (auth_user_md5.user_id = datafields_entries.range_id)
+             LEFT JOIN user_info USING (user_id)
+             LEFT JOIN seminar_user ON (seminar_user.user_id = auth_user_md5.user_id AND seminar_user.Seminar_id = ?)
+             WHERE auth_user_md5.perms IN ('autor', 'tutor', 'dozent')
+             AND auth_user_md5.visible <> 'never'
+               AND datafields_entries.datafield_id = ? AND datafields_entries.content = ?
+             ORDER BY auth_user_md5.Nachname, auth_user_md5.Vorname",
+            [$course_id, $datafield_id, $nachname]
+        );
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL('user_id = ?', [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('SeminareUser'), 'seminar_user', $field_data);
+            }
+        }
+    }
+
+    /**
+     * return the highest position-number increased by one for the
+     * passed user-group in the passed seminar
+     *
+     * @param string $status     can be on of 'tutor', 'dozent', ...
+     * @param string $seminar_id the seminar to work on
+     *
+     * @return int  the next available position
+     */
+    public static function getNextPosition(string $status, string $seminar_id): int
+    {
+        return (int) DBManager::get()->fetchColumn(
+            "SELECT MAX(position) + 1
+              FROM seminar_user
+              WHERE Seminar_id = ? AND status = ?",
+            [$seminar_id, $status]
+        );
+    }
+
+    /**
+     * reset the order-positions for the given status in the passed seminar,
+     * starting at the passed position
+     *
+     * @param string $course_id     the seminar to work on
+     * @param int    $position the position to start with
+     *
+     * @return void
+     */
+    public static function resortMembership(string $course_id, int $position, string $status = 'tutor')
+    {
+        self::findEachBySQL(
+            function (CourseMember $membership) {
+                $membership->position = $membership->position - 1;
+                $membership->store();
+            },
+            "Seminar_id = ? AND position > ? AND status = ? ",
+            [$course_id, $position, $status]
+        );
+    }
+    /**
+     * Insert a user into a seminar with optional log-message and contingent
+     *
+     * @param string   $seminar_id
+     * @param string   $user_id
+     * @param string   $status       status of user in the seminar (user, autor, tutor, dozent)
+     * @param boolean  $copy_studycourse  if true, the studycourse is copied from admission_seminar_user
+     *                                    to seminar_user. Overrides the $contingent-parameter
+     * @param string   $contingent   optional studiengang_id, if no id is given, no contingent is considered
+     * @param string   $log_message  optional log-message. if no log-message is given a default one is used
+     * @return bool
+     */
+    public static function insertCourseMember($seminar_id, $user_id, $status, $copy_studycourse = false, $contingent = false, $log_message = false): bool
+    {
+        if (!$user_id) {
+            return false;
+        }
+        // get the seminar-object
+        $sem = Seminar::GetInstance($seminar_id);
+
+        $admission_status = '';
+        $admission_comment = '';
+        $mkdate = time();
+
+        $admission_user = AdmissionApplication::find([$user_id, $seminar_id]);
+        if ($admission_user) {
+            $admission_status = $admission_user->status;
+            $admission_comment = $admission_user->comment ?? '';
+            $mkdate = $admission_user->mkdate;
+        }
+
+        // check if there are places left in the submitted contingent (if any)
+        //ignore if preliminary
+        if ($admission_status !== 'accepted' && $contingent && $sem->isAdmissionEnabled() && !$sem->getFreeAdmissionSeats()) {
+            return false;
+        }
+
+        // get coloured group as used on meine_seminare
+        $colour_group = $sem->getDefaultGroup();
+
+        // LOGGING
+        // if no log message is submitted use a default one
+        if (!$log_message) {
+            $log_message = 'Wurde in die Veranstaltung eingetragen, admission_status: '. $admission_status . ' Kontingent: ' . $contingent;
+        }
+        StudipLog::log('SEM_USER_ADD', $seminar_id, $user_id, $status, $log_message);
+        $membership = new self([$seminar_id, $user_id]);
+        $membership->setData([
+            'Seminar_id' => $seminar_id,
+            'user_id'    => $user_id,
+            'status'     => $status,
+            'comment'    => $admission_comment,
+            'gruppe'     => $colour_group,
+            'mkdate'     => $mkdate,
+        ]);
+        $membership->store();
+
+        NotificationCenter::postNotification('UserDidEnterCourse', $seminar_id, $user_id);
+
+        if ($admission_status) {
+            $admission_user->delete();
+
+            //renumber the waiting/accepted/lot list, a user was deleted from it
+            AdmissionApplication::renumberAdmission($seminar_id);
+        }
+        $cs = $sem->getCourseSet();
+        if ($cs) {
+            AdmissionPriority::unsetPriority($cs->getId(), $user_id, $sem->getId());
+        }
+
+        CalendarScheduleModel::deleteSeminarEntries($user_id, $seminar_id);
+
+        // reload the seminar, the contingents have changed
+        $sem->restore();
+
+        // Check if a parent course exists and insert user there.
+        if ($sem->parent_course) {
+            self::insertCourseMember($sem->parent_course, $user_id, $status, $copy_studycourse, $contingent, $log_message);
+        }
+
+        return true;
+    }
+
+    public function getExportData(): array
+    {
+        $user = $this->user;
+        $studycourse = [];
+        $user->studycourses->map(function($sc) use (&$studycourse) {
+            $studycourse[]= $sc->studycourse->name .  ',' . $sc->degree->name . ',' . $sc->semester;
+        });
+        return [
+            'status' => $this->status,
+            'salutation' => $user->salutation,
+            'Titel' => $user->title_front,
+            'Vorname' => $this->vorname,
+            'Nachname' => $this->nachname,
+            'Titel2' => $user->title_rear,
+            'username' => $this->username,
+            'privadr' => $user->privadr,
+            'privatnr' => $user->privatnr,
+            'Email' => $this->email,
+            'Anmeldedatum' => date('d.m.Y H:i:s', $this->mkdate),
+            'Matrikelnummer' => $this->user->matriculation_number,
+            'studiengaenge' => implode(';', $studycourse),
+            'position' => $this->position,
+        ];
+    }
+}
diff --git a/lib/models/CourseTopic.class.php b/lib/models/CourseTopic.class.php
deleted file mode 100644
index eb26efa..0000000
--- a/lib/models/CourseTopic.class.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @author     Rasmus Fuhse <fuhse@data-quest.de>
- * @copyright   2014 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for issue_id
- * @property string $issue_id database column
- * @property string $seminar_id database column
- * @property string $author_id database column
- * @property I18NString $title database column
- * @property I18NString $description database column
- * @property int $priority database column
- * @property int $paper_related database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|Folder[] $folders has_many Folder
- * @property Course $course belongs_to Course
- * @property User $author belongs_to User
- * @property SimpleORMapCollection|CourseDate[] $dates has_and_belongs_to_many CourseDate
- * @property-read mixed $forum_thread_url additional field
- */
-class CourseTopic extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'themen';
-        $config['has_and_belongs_to_many']['dates'] = [
-            'class_name' => CourseDate::class,
-            'thru_table' => 'themen_termine',
-            'order_by'   => 'ORDER BY date',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-        $config['has_many']['folders'] = [
-            'class_name'  => Folder::class,
-            'assoc_func' => 'findByTopic_id'
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'seminar_id'
-        ];
-        $config['belongs_to']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'author_id'
-        ];
-
-        $config['additional_fields']['forum_thread_url']['get'] = 'getForumThreadURL';
-
-        $config['registered_callbacks']['before_create'][] = 'cbDefaultValues';
-        $config['registered_callbacks']['after_store'][] = 'cbUpdateConnectedContentModules';
-        $config['registered_callbacks']['before_delete'][] = 'cbUnlinkConnectedContentModules';
-
-        $config['i18n_fields']['title'] = true;
-        $config['i18n_fields']['description'] = true;
-
-        parent::configure($config);
-    }
-
-    public static function findByTermin_id($termin_id)
-    {
-        return self::findBySQL("INNER JOIN themen_termine USING (issue_id)
-            WHERE themen_termine.termin_id = ?
-            ORDER BY priority ASC",
-            [$termin_id]
-        );
-    }
-
-    public static function findBySeminar_id($seminar_id, $order_by = 'ORDER BY priority')
-    {
-        return parent::findBySeminar_id($seminar_id, $order_by);
-    }
-
-    public static function findByTitle($seminar_id, $name)
-    {
-        return self::findOneBySQL("seminar_id = ? AND title = ?", [$seminar_id, $name]);
-    }
-
-    public static function getMaxPriority($seminar_id)
-    {
-        return DBManager::get()->fetchColumn("SELECT MAX(priority) FROM themen WHERE seminar_id=?", [$seminar_id]);
-    }
-
-    /**
-    * set or update connection with document folder
-    */
-    public function connectWithDocumentFolder()
-    {
-        if ($this->seminar_id) {
-            $document_module = Seminar::getInstance($this->seminar_id)->getSlotModule('documents');
-            if ($document_module) {
-                if (!$this->folders->count()) {
-                    $folder = new Folder();
-                    $folder['range_id'] = $this['seminar_id'];
-                    $folder['parent_id'] = Folder::findTopFolder($this['seminar_id'])->getId();
-                    $folder['range_type'] = "course";
-                    $folder['folder_type'] = "CourseTopicFolder";
-                    $folder['data_content']['topic_id'] = $this->getId();
-                    $folder['user_id'] = $GLOBALS['user']->id;
-                    $folder['name'] = $this['title'];
-                    $folder['description'] = $this['description'];
-                    return $folder->store();
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-    * set or update connection with forum thread
-    */
-    public function connectWithForumThread()
-    {
-        if ($this->seminar_id) {
-            $forum_module = Seminar::getInstance($this->seminar_id)->getSlotModule('forum');
-            if ($forum_module instanceOf ForumModule) {
-                $forum_module->setThreadForIssue($this->id, $this->title, $this->description);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public function getForumThreadURL()
-    {
-        if ($this->seminar_id) {
-            $forum_module = Seminar::getInstance($this->seminar_id)->getSlotModule('forum');
-            if ($forum_module instanceOf ForumModule) {
-                return html_entity_decode($forum_module->getLinkToThread($this->id));
-            }
-        }
-        return '';
-    }
-
-    protected function cbUpdateConnectedContentModules()
-    {
-        if ($this->isFieldDirty('title') || $this->isFieldDirty('description')) {
-            if ($this->forum_thread_url) {
-                $this->connectWithForumThread();
-            }
-        }
-    }
-
-    /**
-     * Removes link information for forum topic and remove forum topic as well
-     * if it is empty.
-     */
-    protected function cbUnlinkConnectedContentModules()
-    {
-        $query = "DELETE fei, fe
-                  FROM `forum_entries_issues` AS fei
-                  LEFT JOIN `forum_entries` AS fe
-                    ON fei.`topic_id` = fe.`topic_id` AND fe.`rgt` = fe.`lft` + 1
-                  WHERE `issue_id` = ?";
-        DBManager::get()->execute($query, [$this->id]);
-    }
-
-    protected function cbDefaultValues()
-    {
-        if (empty($this->content['priority'])) {
-            $this->content['priority'] = self::getMaxPriority($this->seminar_id) + 1;
-        }
-    }
-
-    /**
-     * return all filerefs belonging to this topic, permissions fpr given user are checked
-     *
-     * @param string|User $user_or_id
-     * @return mixed[] A mixed array with FolderType and FileRef objects.
-     */
-    public function getAccessibleFolderFiles($user_or_id)
-    {
-        $user_id = $user_or_id instanceof User ? $user_or_id->id : $user_or_id;
-        $all_files = [];
-        $all_folders = [];
-        $folders = $this->folders->getArrayCopy();
-        foreach ($this->dates as $date) {
-            $folders = array_merge($folders, $date->folders->getArrayCopy());
-        }
-        foreach ($folders as $folder) {
-            [$files, $typed_folders] = array_values(FileManager::getFolderFilesRecursive($folder->getTypedFolder(), $user_id));
-            foreach ($files as $file) {
-                $all_files[$file->id] = $file;
-            }
-            $all_folders = array_merge($all_folders, $typed_folders);
-        }
-        return ['files' => $all_files, 'folders' => $all_folders];
-    }
-
-    /**
-     * Increases the priority of this topic. Meaning the topic will be sorted further up.
-     * Be aware that this actually decreases the priority property since lower numbers
-     * mean higher priority.
-     *
-     * @return boolean
-     * @todo Deprecated, remove for Stud.IP 6.0
-     */
-    public function increasePriority()
-    {
-        // Update all the course's topics with a lower priority than this one
-        $query = "UPDATE `themen`
-                  SET `priority` = `priority` + 1
-                  WHERE `seminar_id` = :course_id
-                    AND `priority` < :current_priority
-                  ORDER BY `priority` DESC
-                  LIMIT 1";
-        $changed = DBManager::get()->execute($query, [
-            ':course_id'        => $this->seminar_id,
-            ':current_priority' => $this->priority,
-        ]);
-
-        // If anything has changed, decrease priority. Otherwise the current
-        // topic is already at top.
-        if ($changed) {
-            $this->priority -= 1;
-            $this->store();
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Decreases the priority of this topic. Meaning the topic will be sorted further down.
-     * Be aware that this actually increases the priority property since higher numbers
-     * mean lower priority.
-     *
-     * @todo Deprecated, remove for Stud.IP 6.0
-     */
-    public function decreasePriority()
-    {
-        // Update all the course's topics with a higher priority than this one
-        $query = "UPDATE `themen`
-                 SET `priority` = `priority` - 1
-                  WHERE `seminar_id` = :course_id
-                    AND `priority` > :current_priority
-                 ORDER BY `priority` ASC
-                 LIMIT 1";
-        $changed = DBManager::get()->execute($query, [
-            ':course_id'        => $this->seminar_id,
-            ':current_priority' => $this->priority,
-        ]);
-
-        // If anything has changed, increase priority. Otherwise the current
-        // topic is already at bottom.
-        if ($changed) {
-            $this->priority += 1;
-            $this->store();
-            return true;
-        }
-
-        return false;
-
-    }
-}
diff --git a/lib/models/CourseTopic.php b/lib/models/CourseTopic.php
new file mode 100644
index 0000000..eb26efa
--- /dev/null
+++ b/lib/models/CourseTopic.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * 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.
+ *
+ * @author     Rasmus Fuhse <fuhse@data-quest.de>
+ * @copyright   2014 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for issue_id
+ * @property string $issue_id database column
+ * @property string $seminar_id database column
+ * @property string $author_id database column
+ * @property I18NString $title database column
+ * @property I18NString $description database column
+ * @property int $priority database column
+ * @property int $paper_related database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|Folder[] $folders has_many Folder
+ * @property Course $course belongs_to Course
+ * @property User $author belongs_to User
+ * @property SimpleORMapCollection|CourseDate[] $dates has_and_belongs_to_many CourseDate
+ * @property-read mixed $forum_thread_url additional field
+ */
+class CourseTopic extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'themen';
+        $config['has_and_belongs_to_many']['dates'] = [
+            'class_name' => CourseDate::class,
+            'thru_table' => 'themen_termine',
+            'order_by'   => 'ORDER BY date',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+        $config['has_many']['folders'] = [
+            'class_name'  => Folder::class,
+            'assoc_func' => 'findByTopic_id'
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'seminar_id'
+        ];
+        $config['belongs_to']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'author_id'
+        ];
+
+        $config['additional_fields']['forum_thread_url']['get'] = 'getForumThreadURL';
+
+        $config['registered_callbacks']['before_create'][] = 'cbDefaultValues';
+        $config['registered_callbacks']['after_store'][] = 'cbUpdateConnectedContentModules';
+        $config['registered_callbacks']['before_delete'][] = 'cbUnlinkConnectedContentModules';
+
+        $config['i18n_fields']['title'] = true;
+        $config['i18n_fields']['description'] = true;
+
+        parent::configure($config);
+    }
+
+    public static function findByTermin_id($termin_id)
+    {
+        return self::findBySQL("INNER JOIN themen_termine USING (issue_id)
+            WHERE themen_termine.termin_id = ?
+            ORDER BY priority ASC",
+            [$termin_id]
+        );
+    }
+
+    public static function findBySeminar_id($seminar_id, $order_by = 'ORDER BY priority')
+    {
+        return parent::findBySeminar_id($seminar_id, $order_by);
+    }
+
+    public static function findByTitle($seminar_id, $name)
+    {
+        return self::findOneBySQL("seminar_id = ? AND title = ?", [$seminar_id, $name]);
+    }
+
+    public static function getMaxPriority($seminar_id)
+    {
+        return DBManager::get()->fetchColumn("SELECT MAX(priority) FROM themen WHERE seminar_id=?", [$seminar_id]);
+    }
+
+    /**
+    * set or update connection with document folder
+    */
+    public function connectWithDocumentFolder()
+    {
+        if ($this->seminar_id) {
+            $document_module = Seminar::getInstance($this->seminar_id)->getSlotModule('documents');
+            if ($document_module) {
+                if (!$this->folders->count()) {
+                    $folder = new Folder();
+                    $folder['range_id'] = $this['seminar_id'];
+                    $folder['parent_id'] = Folder::findTopFolder($this['seminar_id'])->getId();
+                    $folder['range_type'] = "course";
+                    $folder['folder_type'] = "CourseTopicFolder";
+                    $folder['data_content']['topic_id'] = $this->getId();
+                    $folder['user_id'] = $GLOBALS['user']->id;
+                    $folder['name'] = $this['title'];
+                    $folder['description'] = $this['description'];
+                    return $folder->store();
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+    * set or update connection with forum thread
+    */
+    public function connectWithForumThread()
+    {
+        if ($this->seminar_id) {
+            $forum_module = Seminar::getInstance($this->seminar_id)->getSlotModule('forum');
+            if ($forum_module instanceOf ForumModule) {
+                $forum_module->setThreadForIssue($this->id, $this->title, $this->description);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function getForumThreadURL()
+    {
+        if ($this->seminar_id) {
+            $forum_module = Seminar::getInstance($this->seminar_id)->getSlotModule('forum');
+            if ($forum_module instanceOf ForumModule) {
+                return html_entity_decode($forum_module->getLinkToThread($this->id));
+            }
+        }
+        return '';
+    }
+
+    protected function cbUpdateConnectedContentModules()
+    {
+        if ($this->isFieldDirty('title') || $this->isFieldDirty('description')) {
+            if ($this->forum_thread_url) {
+                $this->connectWithForumThread();
+            }
+        }
+    }
+
+    /**
+     * Removes link information for forum topic and remove forum topic as well
+     * if it is empty.
+     */
+    protected function cbUnlinkConnectedContentModules()
+    {
+        $query = "DELETE fei, fe
+                  FROM `forum_entries_issues` AS fei
+                  LEFT JOIN `forum_entries` AS fe
+                    ON fei.`topic_id` = fe.`topic_id` AND fe.`rgt` = fe.`lft` + 1
+                  WHERE `issue_id` = ?";
+        DBManager::get()->execute($query, [$this->id]);
+    }
+
+    protected function cbDefaultValues()
+    {
+        if (empty($this->content['priority'])) {
+            $this->content['priority'] = self::getMaxPriority($this->seminar_id) + 1;
+        }
+    }
+
+    /**
+     * return all filerefs belonging to this topic, permissions fpr given user are checked
+     *
+     * @param string|User $user_or_id
+     * @return mixed[] A mixed array with FolderType and FileRef objects.
+     */
+    public function getAccessibleFolderFiles($user_or_id)
+    {
+        $user_id = $user_or_id instanceof User ? $user_or_id->id : $user_or_id;
+        $all_files = [];
+        $all_folders = [];
+        $folders = $this->folders->getArrayCopy();
+        foreach ($this->dates as $date) {
+            $folders = array_merge($folders, $date->folders->getArrayCopy());
+        }
+        foreach ($folders as $folder) {
+            [$files, $typed_folders] = array_values(FileManager::getFolderFilesRecursive($folder->getTypedFolder(), $user_id));
+            foreach ($files as $file) {
+                $all_files[$file->id] = $file;
+            }
+            $all_folders = array_merge($all_folders, $typed_folders);
+        }
+        return ['files' => $all_files, 'folders' => $all_folders];
+    }
+
+    /**
+     * Increases the priority of this topic. Meaning the topic will be sorted further up.
+     * Be aware that this actually decreases the priority property since lower numbers
+     * mean higher priority.
+     *
+     * @return boolean
+     * @todo Deprecated, remove for Stud.IP 6.0
+     */
+    public function increasePriority()
+    {
+        // Update all the course's topics with a lower priority than this one
+        $query = "UPDATE `themen`
+                  SET `priority` = `priority` + 1
+                  WHERE `seminar_id` = :course_id
+                    AND `priority` < :current_priority
+                  ORDER BY `priority` DESC
+                  LIMIT 1";
+        $changed = DBManager::get()->execute($query, [
+            ':course_id'        => $this->seminar_id,
+            ':current_priority' => $this->priority,
+        ]);
+
+        // If anything has changed, decrease priority. Otherwise the current
+        // topic is already at top.
+        if ($changed) {
+            $this->priority -= 1;
+            $this->store();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Decreases the priority of this topic. Meaning the topic will be sorted further down.
+     * Be aware that this actually increases the priority property since higher numbers
+     * mean lower priority.
+     *
+     * @todo Deprecated, remove for Stud.IP 6.0
+     */
+    public function decreasePriority()
+    {
+        // Update all the course's topics with a higher priority than this one
+        $query = "UPDATE `themen`
+                 SET `priority` = `priority` - 1
+                  WHERE `seminar_id` = :course_id
+                    AND `priority` > :current_priority
+                 ORDER BY `priority` ASC
+                 LIMIT 1";
+        $changed = DBManager::get()->execute($query, [
+            ':course_id'        => $this->seminar_id,
+            ':current_priority' => $this->priority,
+        ]);
+
+        // If anything has changed, increase priority. Otherwise the current
+        // topic is already at bottom.
+        if ($changed) {
+            $this->priority += 1;
+            $this->store();
+            return true;
+        }
+
+        return false;
+
+    }
+}
diff --git a/lib/models/CronjobLog.class.php b/lib/models/CronjobLog.class.php
deleted file mode 100644
index c9e92f7..0000000
--- a/lib/models/CronjobLog.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// CronjobLog.class.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * CronjobLog - Model for the database table "cronjobs_logs"
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- *
- * @property string $id alias column for log_id
- * @property string $log_id database column
- * @property string $schedule_id database column
- * @property int $scheduled database column
- * @property int $executed database column
- * @property string|null $exception database column
- * @property string|null $output database column
- * @property float $duration database column
- * @property CronjobSchedule $schedule belongs_to CronjobSchedule
- */
-
-class CronjobLog extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'cronjobs_logs';
-
-        $config['belongs_to']['schedule'] = [
-            'class_name'  => CronjobSchedule::class,
-            'foreign_key' => 'schedule_id',
-        ];
-
-
-        parent::configure($config);
-    }
-
-    public function setException($exception_or_string)
-    {
-        if ($exception_or_string instanceof Exception) {
-            $exception_as_string = display_exception($exception_or_string, false, true);
-            return $this->content['exception'] = $exception_as_string;
-        }
-
-        if (is_string($exception_or_string)) {
-            return $this->content['exception'] = $exception_or_string;
-        }
-
-        return $this->content['exception'] = null;
-    }
-
-}
diff --git a/lib/models/CronjobLog.php b/lib/models/CronjobLog.php
new file mode 100644
index 0000000..c9e92f7
--- /dev/null
+++ b/lib/models/CronjobLog.php
@@ -0,0 +1,70 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// CronjobLog.class.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * CronjobLog - Model for the database table "cronjobs_logs"
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ *
+ * @property string $id alias column for log_id
+ * @property string $log_id database column
+ * @property string $schedule_id database column
+ * @property int $scheduled database column
+ * @property int $executed database column
+ * @property string|null $exception database column
+ * @property string|null $output database column
+ * @property float $duration database column
+ * @property CronjobSchedule $schedule belongs_to CronjobSchedule
+ */
+
+class CronjobLog extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'cronjobs_logs';
+
+        $config['belongs_to']['schedule'] = [
+            'class_name'  => CronjobSchedule::class,
+            'foreign_key' => 'schedule_id',
+        ];
+
+
+        parent::configure($config);
+    }
+
+    public function setException($exception_or_string)
+    {
+        if ($exception_or_string instanceof Exception) {
+            $exception_as_string = display_exception($exception_or_string, false, true);
+            return $this->content['exception'] = $exception_as_string;
+        }
+
+        if (is_string($exception_or_string)) {
+            return $this->content['exception'] = $exception_or_string;
+        }
+
+        return $this->content['exception'] = null;
+    }
+
+}
diff --git a/lib/models/CronjobSchedule.class.php b/lib/models/CronjobSchedule.class.php
deleted file mode 100644
index 0eb19ba..0000000
--- a/lib/models/CronjobSchedule.class.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// CronjobSchedule.class.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * CronjobSchedule - Model for the database table "cronjobs_schedules"
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- *
- * @property string $id alias column for schedule_id
- * @property string $schedule_id database column
- * @property string $task_id database column
- * @property int $active database column
- * @property string|null $title database column
- * @property string|null $description database column
- * @property string|null $parameters database column
- * @property int|null $minute database column
- * @property int|null $hour database column
- * @property int|null $day database column
- * @property int|null $month database column
- * @property int|null $day_of_week database column
- * @property int $next_execution database column
- * @property int|null $last_execution database column
- * @property string|null $last_result database column
- * @property int $execution_count database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|CronjobLog[] $logs has_many CronjobLog
- * @property CronjobTask $task belongs_to CronjobTask
- */
-
-class CronjobSchedule extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'cronjobs_schedules';
-
-        $config['belongs_to']['task'] = [
-            'class_name'  => CronjobTask::class,
-            'foreign_key' => 'task_id',
-        ];
-        $config['has_many']['logs'] = [
-            'class_name' => CronjobLog::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-
-        $config['registered_callbacks']['before_store'][]     = 'cbJsonifyParameters';
-        $config['registered_callbacks']['after_store'][]      = 'cbJsonifyParameters';
-        $config['registered_callbacks']['after_initialize'][] = 'cbJsonifyParameters';
-
-        parent::configure($config);
-    }
-
-    /**
-     * replaces title with task name if title is empty.
-     *
-     * @return string the title or the task name
-     */
-    public function getTitle()
-    {
-        return $this->content['title'] ?: $this->task->name ?? '';
-    }
-
-    protected function cbJsonifyParameters($type)
-    {
-        if ($type === 'before_store' && !is_string($this->parameters)) {
-            $this->parameters = json_encode($this->parameters ?: null);
-        }
-        if (in_array($type, ['after_initialize', 'after_store']) && is_string($this->parameters)) {
-            $parameters = json_decode($this->parameters, true) ?: [];
-            if ($this->task && $this->task->valid) {
-                $default_parameters = $this->task->extractDefaultParameters();
-                foreach ($default_parameters as $key => $value) {
-                    if (!isset($parameters[$key])) {
-                        $parameters[$key] = $value;
-                    }
-                }
-            }
-            $this->parameters = $parameters;
-        }
-    }
-
-    /**
-     * Stores the schedule in database. Will bail out with an exception if
-     * the provided task does not exists. Will also nullify the title if it
-     * matches the task name (see CronjobSchedule::getTitle()).
-     *
-     * @return CronjobSchedule Returns itself to allow chaining
-     */
-    public function store()
-    {
-        if ($this->task === null) {
-            $message = sprintf('A task with the id "%s" does not exist.', $this->task_id);
-            throw new InvalidArgumentException($message);
-        }
-
-        // Remove title if it is the default (task's name)
-        if ($this->title === $this->task->name) {
-            $this->title = null;
-        }
-
-        parent::store();
-
-        return $this;
-    }
-
-    /**
-     * Activates this schedule.
-     *
-     * @return CronjobSchedule Returns itself to allow chaining
-     */
-    public function activate(bool $run_immediately = false)
-    {
-        $next_execution = $run_immediately ? strtotime('-1 minute') : $this->calculateNextExecution();
-
-        $this->active = true;
-        $this->next_execution = $next_execution;
-        $this->store();
-
-        return $this;
-    }
-
-    /**
-     * Deactivates this schedule.
-     *
-     * @return CronjobSchedule Returns itself to allow chaining
-     */
-    public function deactivate()
-    {
-        $this->active = false;
-        $this->store();
-
-        return $this;
-    }
-
-    /**
-     * Executes this schedule.
-     *
-     * @param bool $force Pass true to force execution of  the schedule even
-     *                    if it's not activated
-     * @return mixed The result of the execution
-     * @throws RuntimeException When either the schedule or the according is
-     *                          not activated
-     */
-    public function execute($force = false)
-    {
-        if (!$force && !$this->active) {
-            throw new RuntimeException('Execution aborted. Schedule is not active');
-        }
-        if (!$this->task->active) {
-            throw new RuntimeException('Execution aborted. Associated task is not active');
-        }
-
-        $this->last_execution   = time();
-        $this->execution_count += 1;
-        $this->next_execution   = $this->calculateNextExecution();
-        $this->store();
-
-        $this->task->execution_count += 1;
-        $this->task->store();
-
-        $result = $this->task->engage($this->last_result, $this->parameters);
-
-        $this->last_result = $result;
-        $this->store();
-
-        return $result;
-    }
-
-    /**
-     * Determines whether the schedule should execute given the provided
-     * timestamp.
-     *
-     * @param mixed $now Defines the temporal fix point
-     * @return bool Whether the schedule should execute or not.
-     */
-    public function shouldExecute($now = null)
-    {
-        return ($now ?: time()) >= $this->next_execution;
-    }
-
-    /**
-     * Calculates the next execution for this schedule.
-     *
-     * The next execution is calculated by increasing the current timestamp
-     * and testing whether all conditions match. This is not the best method
-     * to test and should be optimized sooner or later.
-     *
-     * @param mixed $now Defines the temporal fix point
-     *
-     * @return int Timestamp of calculated next execution
-     * @throws RuntimeException When calculation takes too long (you should
-     *                          check the conditions for validity in that case)
-     */
-    public function calculateNextExecution($now = null)
-    {
-        $now = $now ?: time();
-
-        $result  = $now;
-        $result -= $result % 60;
-
-        $i = 366 * 24 * 60; // Maximum: A year
-        $offset = 60;
-
-        do {
-            $result += $offset;
-
-            // TODO: Performance - Adjust result according to conditions
-            // See http://coderzone.org/library/PHP-PHP-Cron-Parser-Class_1084.htm
-            $valid  = $this->testTimestamp($result, $this->minute, 'i')
-                   && $this->testTimestamp($result, $this->hour, 'H')
-                   && $this->testTimestamp($result, $this->day, 'd')
-                   && $this->testTimestamp($result, $this->month, 'm')
-                   && $this->testTimestamp($result, $this->day_of_week, 'N');
-
-        } while (!$valid && $i-- > 0);
-
-        if ($i <= 0) {
-            throw new RuntimeException('No result, current: ' . date('d.m.Y H:i', $result));
-        }
-
-        $this->next_execution = $result;
-        return $result;
-    }
-
-    /**
-     * Tests a timestamp against the passed condition.
-     *
-     * @param int $timestamp The timestamp to test
-     * @param mixed $condition Can be either null for "don't care", a positive
-     *                         number for an exact moment or a negative number
-     *                         for a repeating moment
-     * @param String $format Format for date() to extract a portion of the
-     *                       timestamp
-     */
-    protected function testTimestamp($timestamp, $condition, $format)
-    {
-        if ($condition === null) {
-            return true;
-        }
-
-        $probe     = (int) date($format, $timestamp);
-        $condition = (int) $condition;
-
-        if ($condition < 0) {
-            return ($probe % abs($condition)) === 0;
-        }
-
-        return $probe === $condition;
-    }
-}
diff --git a/lib/models/CronjobSchedule.php b/lib/models/CronjobSchedule.php
new file mode 100644
index 0000000..0eb19ba
--- /dev/null
+++ b/lib/models/CronjobSchedule.php
@@ -0,0 +1,272 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// CronjobSchedule.class.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * CronjobSchedule - Model for the database table "cronjobs_schedules"
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ *
+ * @property string $id alias column for schedule_id
+ * @property string $schedule_id database column
+ * @property string $task_id database column
+ * @property int $active database column
+ * @property string|null $title database column
+ * @property string|null $description database column
+ * @property string|null $parameters database column
+ * @property int|null $minute database column
+ * @property int|null $hour database column
+ * @property int|null $day database column
+ * @property int|null $month database column
+ * @property int|null $day_of_week database column
+ * @property int $next_execution database column
+ * @property int|null $last_execution database column
+ * @property string|null $last_result database column
+ * @property int $execution_count database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|CronjobLog[] $logs has_many CronjobLog
+ * @property CronjobTask $task belongs_to CronjobTask
+ */
+
+class CronjobSchedule extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'cronjobs_schedules';
+
+        $config['belongs_to']['task'] = [
+            'class_name'  => CronjobTask::class,
+            'foreign_key' => 'task_id',
+        ];
+        $config['has_many']['logs'] = [
+            'class_name' => CronjobLog::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+
+        $config['registered_callbacks']['before_store'][]     = 'cbJsonifyParameters';
+        $config['registered_callbacks']['after_store'][]      = 'cbJsonifyParameters';
+        $config['registered_callbacks']['after_initialize'][] = 'cbJsonifyParameters';
+
+        parent::configure($config);
+    }
+
+    /**
+     * replaces title with task name if title is empty.
+     *
+     * @return string the title or the task name
+     */
+    public function getTitle()
+    {
+        return $this->content['title'] ?: $this->task->name ?? '';
+    }
+
+    protected function cbJsonifyParameters($type)
+    {
+        if ($type === 'before_store' && !is_string($this->parameters)) {
+            $this->parameters = json_encode($this->parameters ?: null);
+        }
+        if (in_array($type, ['after_initialize', 'after_store']) && is_string($this->parameters)) {
+            $parameters = json_decode($this->parameters, true) ?: [];
+            if ($this->task && $this->task->valid) {
+                $default_parameters = $this->task->extractDefaultParameters();
+                foreach ($default_parameters as $key => $value) {
+                    if (!isset($parameters[$key])) {
+                        $parameters[$key] = $value;
+                    }
+                }
+            }
+            $this->parameters = $parameters;
+        }
+    }
+
+    /**
+     * Stores the schedule in database. Will bail out with an exception if
+     * the provided task does not exists. Will also nullify the title if it
+     * matches the task name (see CronjobSchedule::getTitle()).
+     *
+     * @return CronjobSchedule Returns itself to allow chaining
+     */
+    public function store()
+    {
+        if ($this->task === null) {
+            $message = sprintf('A task with the id "%s" does not exist.', $this->task_id);
+            throw new InvalidArgumentException($message);
+        }
+
+        // Remove title if it is the default (task's name)
+        if ($this->title === $this->task->name) {
+            $this->title = null;
+        }
+
+        parent::store();
+
+        return $this;
+    }
+
+    /**
+     * Activates this schedule.
+     *
+     * @return CronjobSchedule Returns itself to allow chaining
+     */
+    public function activate(bool $run_immediately = false)
+    {
+        $next_execution = $run_immediately ? strtotime('-1 minute') : $this->calculateNextExecution();
+
+        $this->active = true;
+        $this->next_execution = $next_execution;
+        $this->store();
+
+        return $this;
+    }
+
+    /**
+     * Deactivates this schedule.
+     *
+     * @return CronjobSchedule Returns itself to allow chaining
+     */
+    public function deactivate()
+    {
+        $this->active = false;
+        $this->store();
+
+        return $this;
+    }
+
+    /**
+     * Executes this schedule.
+     *
+     * @param bool $force Pass true to force execution of  the schedule even
+     *                    if it's not activated
+     * @return mixed The result of the execution
+     * @throws RuntimeException When either the schedule or the according is
+     *                          not activated
+     */
+    public function execute($force = false)
+    {
+        if (!$force && !$this->active) {
+            throw new RuntimeException('Execution aborted. Schedule is not active');
+        }
+        if (!$this->task->active) {
+            throw new RuntimeException('Execution aborted. Associated task is not active');
+        }
+
+        $this->last_execution   = time();
+        $this->execution_count += 1;
+        $this->next_execution   = $this->calculateNextExecution();
+        $this->store();
+
+        $this->task->execution_count += 1;
+        $this->task->store();
+
+        $result = $this->task->engage($this->last_result, $this->parameters);
+
+        $this->last_result = $result;
+        $this->store();
+
+        return $result;
+    }
+
+    /**
+     * Determines whether the schedule should execute given the provided
+     * timestamp.
+     *
+     * @param mixed $now Defines the temporal fix point
+     * @return bool Whether the schedule should execute or not.
+     */
+    public function shouldExecute($now = null)
+    {
+        return ($now ?: time()) >= $this->next_execution;
+    }
+
+    /**
+     * Calculates the next execution for this schedule.
+     *
+     * The next execution is calculated by increasing the current timestamp
+     * and testing whether all conditions match. This is not the best method
+     * to test and should be optimized sooner or later.
+     *
+     * @param mixed $now Defines the temporal fix point
+     *
+     * @return int Timestamp of calculated next execution
+     * @throws RuntimeException When calculation takes too long (you should
+     *                          check the conditions for validity in that case)
+     */
+    public function calculateNextExecution($now = null)
+    {
+        $now = $now ?: time();
+
+        $result  = $now;
+        $result -= $result % 60;
+
+        $i = 366 * 24 * 60; // Maximum: A year
+        $offset = 60;
+
+        do {
+            $result += $offset;
+
+            // TODO: Performance - Adjust result according to conditions
+            // See http://coderzone.org/library/PHP-PHP-Cron-Parser-Class_1084.htm
+            $valid  = $this->testTimestamp($result, $this->minute, 'i')
+                   && $this->testTimestamp($result, $this->hour, 'H')
+                   && $this->testTimestamp($result, $this->day, 'd')
+                   && $this->testTimestamp($result, $this->month, 'm')
+                   && $this->testTimestamp($result, $this->day_of_week, 'N');
+
+        } while (!$valid && $i-- > 0);
+
+        if ($i <= 0) {
+            throw new RuntimeException('No result, current: ' . date('d.m.Y H:i', $result));
+        }
+
+        $this->next_execution = $result;
+        return $result;
+    }
+
+    /**
+     * Tests a timestamp against the passed condition.
+     *
+     * @param int $timestamp The timestamp to test
+     * @param mixed $condition Can be either null for "don't care", a positive
+     *                         number for an exact moment or a negative number
+     *                         for a repeating moment
+     * @param String $format Format for date() to extract a portion of the
+     *                       timestamp
+     */
+    protected function testTimestamp($timestamp, $condition, $format)
+    {
+        if ($condition === null) {
+            return true;
+        }
+
+        $probe     = (int) date($format, $timestamp);
+        $condition = (int) $condition;
+
+        if ($condition < 0) {
+            return ($probe % abs($condition)) === 0;
+        }
+
+        return $probe === $condition;
+    }
+}
diff --git a/lib/models/CronjobTask.class.php b/lib/models/CronjobTask.class.php
deleted file mode 100644
index 8a56ca0..0000000
--- a/lib/models/CronjobTask.class.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// CronjobSchedule.class.php
-//
-// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * CronjobTask - Model for the database table "cronjobs_tasks"
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- *
- * @property string $id alias column for task_id
- * @property string $task_id database column
- * @property string $filename database column
- * @property string $class database column
- * @property int $active database column
- * @property int $execution_count database column
- * @property int $assigned_count database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property SimpleORMapCollection|CronjobSchedule[] $schedules has_many CronjobSchedule
- * @property-read mixed $description additional field
- * @property-read mixed $name additional field
- * @property-read mixed $parameters additional field
- */
-class CronjobTask extends SimpleORMap
-{
-    /**
-     * Configures the model.
-     *
-     * @param Array $config Optional configuration passed from derived class
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'cronjobs_tasks';
-        $config['has_many']['schedules'] = [
-            'class_name' => CronjobSchedule::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-
-        $config['additional_fields'] = [
-            'description' => [
-                'get' => function (CronjobTask $task): string {
-                    if ($task->valid) {
-                        return $task->class::getDescription();
-                    }
-                    return _('Unbekannt');
-                },
-            ],
-            'name' => [
-                'get' => function (CronjobTask $task): string {
-                    if ($task->valid) {
-                        return $task->class::getName();
-                    }
-                    $result = $task->filename;
-                    if (strpos($result, 'public/plugins_packages') !== false) {
-                        $result = preg_replace('/.*public\/plugins_packages\/(.+)(_Cronjob)?(\.class)?\.php$/', '$1', $result);
-                    } else {
-                        $result = preg_replace('/(_Cronjob)?(\.class)?\.php$/', '', basename($result));
-                    }
-                    $result .= ' (' . _('fehlerhaft') . ')';
-                    return $result;
-                },
-            ],
-            'parameters' => [
-                'get' => function (CronjobTask $task): array {
-                    if ($task->valid) {
-                        return $task->class::getParameters();
-                    }
-                    return [];
-                },
-            ],
-        ];
-
-        $config['registered_callbacks']['after_initialize'][] = 'loadClass';
-
-        parent::configure($config);
-    }
-
-    public $valid = false;
-
-    /**
-     * Tries to load the underlying php class. This also determines the valid
-     * state of the task. If the class does not exists, the task is marked
-     * as not valid.
-     */
-    protected function loadClass()
-    {
-        $this->valid = false;
-
-        if (empty($this->class)) {
-            return;
-        }
-
-        $filename = $GLOBALS['STUDIP_BASE_PATH'] . '/' . $this->filename;
-        if (!file_exists($filename)) {
-            return;
-        }
-
-        require_once $filename;
-
-        $this->valid = class_exists($this->class);
-    }
-
-    /**
-     * Returns whether the task is defined in the core system or via a plugin.
-     *
-     * @return bool True if task is defined in core system
-     */
-    public function isCore()
-    {
-        return mb_strpos($this->filename, 'plugins_packages') === false;
-    }
-
-    /**
-     * Executes the task.
-     *
-     * @param String $last_result Result of last executions
-     * @param Array  $parameters  Parameters to pass to the task
-     */
-    public function engage($last_result, $parameters = [])
-    {
-        if ($this->valid) {
-            $parameters = array_merge(
-                $this->extractDefaultParameters(),
-                $parameters
-            );
-
-            $task = new $this->class;
-
-            $task->setUp();
-            $result = $task->execute($last_result, $parameters);
-            $task->tearDown();
-        } else {
-            $result = $last_result;
-        }
-
-        return $result;
-    }
-
-// Convenience methods to ease the usage
-
-    /**
-     * Schedules this task for periodic execution with the provided schedule.
-     *
-     * @param int|null  $minute      Minute part of the schedule:
-     *                            - null for "every minute" a.k.a. "don't care"
-     *                            - x < 0 for "every x minutes"
-     *                            - x >= 0 for "only at minute x"
-     * @param int|null  $hour        Hour part of the schedule:
-     *                            - null for "every hour" a.k.a. "don't care"
-     *                            - x < 0 for "every x hours"
-     *                            - x >= 0 for "only at hour x"
-     * @param int|null  $day         Day part of the schedule:
-     *                            - null for "every day" a.k.a. "don't care"
-     *                            - x < 0 for "every x days"
-     *                            - x > 0 for "only at day x"
-     * @param int|null  $month       Month part of the schedule:
-     *                            - null for "every month" a.k.a. "don't care"
-     *                            - x < 0 for "every x months"
-     *                            - x > 0 for "only at month x"
-     * @param int|null  $day_of_week Day of week part of the schedule:
-     *                            - null for "every day" a.k.a. "don't care"
-     *                            - 1 >= x >= 7 for "exactly at day of week x"
-     *                              (x starts with monday at 1 and ends with
-     *                               sunday at 7)
-     * @param array  $parameters Optional parameters passed to the task
-     * @return CronjobSchedule The generated schedule object.
-     */
-    public function schedule(
-        ?int $minute = null,
-        ?int $hour = null,
-        ?int $day = null,
-        ?int $month = null,
-        ?int $day_of_week = null,
-        array $parameters = []
-    ): CronjobSchedule {
-        return CronjobScheduler::getInstance()->schedule(
-            $this->id,
-            $minute,
-            $hour,
-            $day,
-            $month,
-            $day_of_week,
-            $parameters
-        );
-    }
-
-    /**
-     * An alias for schedule for backwards compatibility.
-     *
-     * @see CronjobTask::schedule()
-     * @return CronjobSchedule
-     */
-    public function schedulePeriodic(
-        $minute = null,
-        $hour = null,
-        $day = null,
-        $month = null,
-        $day_of_week = null,
-        $priority = '',
-        $parameters = []
-    ) {
-        return $this->schedule($minute, $hour, $day, $month, $day_of_week, $parameters);
-    }
-
-    /**
-     * Extracts the default parameter values from the associated task.
-     *
-     * @return array
-     */
-    public function extractDefaultParameters()
-    {
-        $parameters = call_user_func("{$this->class}::getParameters");
-        return array_map(function ($parameter) {
-            // return $parameter['default'] ?? null;
-            return isset($parameter['default']) ? $parameter['default'] : null;
-        }, $parameters);
-    }
-}
diff --git a/lib/models/CronjobTask.php b/lib/models/CronjobTask.php
new file mode 100644
index 0000000..8a56ca0
--- /dev/null
+++ b/lib/models/CronjobTask.php
@@ -0,0 +1,239 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// CronjobSchedule.class.php
+//
+// Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * CronjobTask - Model for the database table "cronjobs_tasks"
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ *
+ * @property string $id alias column for task_id
+ * @property string $task_id database column
+ * @property string $filename database column
+ * @property string $class database column
+ * @property int $active database column
+ * @property int $execution_count database column
+ * @property int $assigned_count database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property SimpleORMapCollection|CronjobSchedule[] $schedules has_many CronjobSchedule
+ * @property-read mixed $description additional field
+ * @property-read mixed $name additional field
+ * @property-read mixed $parameters additional field
+ */
+class CronjobTask extends SimpleORMap
+{
+    /**
+     * Configures the model.
+     *
+     * @param Array $config Optional configuration passed from derived class
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'cronjobs_tasks';
+        $config['has_many']['schedules'] = [
+            'class_name' => CronjobSchedule::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+
+        $config['additional_fields'] = [
+            'description' => [
+                'get' => function (CronjobTask $task): string {
+                    if ($task->valid) {
+                        return $task->class::getDescription();
+                    }
+                    return _('Unbekannt');
+                },
+            ],
+            'name' => [
+                'get' => function (CronjobTask $task): string {
+                    if ($task->valid) {
+                        return $task->class::getName();
+                    }
+                    $result = $task->filename;
+                    if (strpos($result, 'public/plugins_packages') !== false) {
+                        $result = preg_replace('/.*public\/plugins_packages\/(.+)(_Cronjob)?(\.class)?\.php$/', '$1', $result);
+                    } else {
+                        $result = preg_replace('/(_Cronjob)?(\.class)?\.php$/', '', basename($result));
+                    }
+                    $result .= ' (' . _('fehlerhaft') . ')';
+                    return $result;
+                },
+            ],
+            'parameters' => [
+                'get' => function (CronjobTask $task): array {
+                    if ($task->valid) {
+                        return $task->class::getParameters();
+                    }
+                    return [];
+                },
+            ],
+        ];
+
+        $config['registered_callbacks']['after_initialize'][] = 'loadClass';
+
+        parent::configure($config);
+    }
+
+    public $valid = false;
+
+    /**
+     * Tries to load the underlying php class. This also determines the valid
+     * state of the task. If the class does not exists, the task is marked
+     * as not valid.
+     */
+    protected function loadClass()
+    {
+        $this->valid = false;
+
+        if (empty($this->class)) {
+            return;
+        }
+
+        $filename = $GLOBALS['STUDIP_BASE_PATH'] . '/' . $this->filename;
+        if (!file_exists($filename)) {
+            return;
+        }
+
+        require_once $filename;
+
+        $this->valid = class_exists($this->class);
+    }
+
+    /**
+     * Returns whether the task is defined in the core system or via a plugin.
+     *
+     * @return bool True if task is defined in core system
+     */
+    public function isCore()
+    {
+        return mb_strpos($this->filename, 'plugins_packages') === false;
+    }
+
+    /**
+     * Executes the task.
+     *
+     * @param String $last_result Result of last executions
+     * @param Array  $parameters  Parameters to pass to the task
+     */
+    public function engage($last_result, $parameters = [])
+    {
+        if ($this->valid) {
+            $parameters = array_merge(
+                $this->extractDefaultParameters(),
+                $parameters
+            );
+
+            $task = new $this->class;
+
+            $task->setUp();
+            $result = $task->execute($last_result, $parameters);
+            $task->tearDown();
+        } else {
+            $result = $last_result;
+        }
+
+        return $result;
+    }
+
+// Convenience methods to ease the usage
+
+    /**
+     * Schedules this task for periodic execution with the provided schedule.
+     *
+     * @param int|null  $minute      Minute part of the schedule:
+     *                            - null for "every minute" a.k.a. "don't care"
+     *                            - x < 0 for "every x minutes"
+     *                            - x >= 0 for "only at minute x"
+     * @param int|null  $hour        Hour part of the schedule:
+     *                            - null for "every hour" a.k.a. "don't care"
+     *                            - x < 0 for "every x hours"
+     *                            - x >= 0 for "only at hour x"
+     * @param int|null  $day         Day part of the schedule:
+     *                            - null for "every day" a.k.a. "don't care"
+     *                            - x < 0 for "every x days"
+     *                            - x > 0 for "only at day x"
+     * @param int|null  $month       Month part of the schedule:
+     *                            - null for "every month" a.k.a. "don't care"
+     *                            - x < 0 for "every x months"
+     *                            - x > 0 for "only at month x"
+     * @param int|null  $day_of_week Day of week part of the schedule:
+     *                            - null for "every day" a.k.a. "don't care"
+     *                            - 1 >= x >= 7 for "exactly at day of week x"
+     *                              (x starts with monday at 1 and ends with
+     *                               sunday at 7)
+     * @param array  $parameters Optional parameters passed to the task
+     * @return CronjobSchedule The generated schedule object.
+     */
+    public function schedule(
+        ?int $minute = null,
+        ?int $hour = null,
+        ?int $day = null,
+        ?int $month = null,
+        ?int $day_of_week = null,
+        array $parameters = []
+    ): CronjobSchedule {
+        return CronjobScheduler::getInstance()->schedule(
+            $this->id,
+            $minute,
+            $hour,
+            $day,
+            $month,
+            $day_of_week,
+            $parameters
+        );
+    }
+
+    /**
+     * An alias for schedule for backwards compatibility.
+     *
+     * @see CronjobTask::schedule()
+     * @return CronjobSchedule
+     */
+    public function schedulePeriodic(
+        $minute = null,
+        $hour = null,
+        $day = null,
+        $month = null,
+        $day_of_week = null,
+        $priority = '',
+        $parameters = []
+    ) {
+        return $this->schedule($minute, $hour, $day, $month, $day_of_week, $parameters);
+    }
+
+    /**
+     * Extracts the default parameter values from the associated task.
+     *
+     * @return array
+     */
+    public function extractDefaultParameters()
+    {
+        $parameters = call_user_func("{$this->class}::getParameters");
+        return array_map(function ($parameter) {
+            // return $parameter['default'] ?? null;
+            return isset($parameter['default']) ? $parameter['default'] : null;
+        }, $parameters);
+    }
+}
diff --git a/lib/models/DataField.class.php b/lib/models/DataField.class.php
deleted file mode 100644
index 8a0bdb6..0000000
--- a/lib/models/DataField.class.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Datafield
- * model class for table datafields
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for datafield_id
- * @property string $datafield_id database column
- * @property I18NString|null $name database column
- * @property string|null $object_type database column
- * @property string|null $object_class database column
- * @property string|null $edit_perms database column
- * @property string|null $view_perms database column
- * @property string|null $institut_id database column
- * @property int $priority database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property string $type database column
- * @property string $typeparam database column
- * @property int $is_required database column
- * @property string|null $default_value database column
- * @property int $is_userfilter database column
- * @property string $description database column
- * @property int $system database column
- * @property SimpleORMapCollection|DatafieldEntryModel[] $entries has_many DatafieldEntryModel
- * @property SimpleORMapCollection|User_Visibility_Settings[] $visibility_settings has_many User_Visibility_Settings
- * @property mixed $institution additional field
- */
-class DataField extends SimpleORMap implements PrivacyObject
-{
-    /**
-     * Configures this model.
-     *
-     * @param Array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'datafields';
-        $config['has_many']['entries'] = [
-            'class_name' => DatafieldEntryModel::class,
-            'on_delete'  => 'delete',
-        ];
-        $config['has_many']['visibility_settings'] = [
-            'class_name'        => User_Visibility_Settings::class,
-            'assoc_foreign_key' => 'identifier',
-            'on_delete'         => 'delete',
-        ];
-        $config['additional_fields']['institution'] = array(
-            'get' => function ($object, $field) {
-                $institution = Institute::find($object->institut_id);
-                if (!$institution) {
-                    return false;
-                }
-                return $institution;
-            },
-            'set' => false,
-        );
-
-        $config['i18n_fields']['name'] = true;
-
-        parent::configure($config);
-    }
-
-    protected static $permission_masks = [
-        'user'   => 1,
-        'autor'  => 2,
-        'tutor'  => 4,
-        'dozent' => 8,
-        'admin'  => 16,
-        'root'   => 32,
-        'self'   => 64,
-    ];
-    /**
-     * Returns a collection of datafields filtered by objectType,
-     * objectClass and/or unassigned objectClasses.
-     *
-     * @param mixed  $objectType       Object type
-     * @param String $objectClass      Object class
-     * @param bool   $includeNullClass Should the object class "null" be
-     *                                 included
-     * @return array of DataField instances
-     */
-    public static function getDataFields($objectType = null, $objectClass = '', $includeNullClass = false)
-    {
-        $conditions = [];
-        $parameters = [];
-
-        if ($objectType !== null) {
-            $conditions[] = 'object_type = ?';
-            $parameters[] = $objectType;
-        }
-
-        if ($objectClass) {
-            if (in_array($objectType, ['user', 'userinstrole', 'usersemdata', 'roleinstdata'])) {
-                $condition = ['object_class & ?'];
-            } else {
-                $condition = ['object_class = ?'];
-            }
-            if ($includeNullClass) {
-                $condition[] = 'object_class IS NULL';
-            }
-
-            $conditions[] = '(' . implode(' OR ', $condition) . ')';
-            $parameters[] = $objectClass;
-        }
-
-        $where = implode(' AND ', $conditions) ?: '1';
-
-        return self::findBySQL($where . " ORDER BY priority ASC, name ASC", $parameters);
-    }
-
-    /**
-     * Returns a list of all datatype classes with an id as key and a name as
-     * value.
-     *
-     * @return array list of all datatype classes
-     */
-    public static function getDataClass()
-    {
-        return [
-            'sem'                 => _('Veranstaltungen'),
-            'inst'                => _('Einrichtungen'),
-            'user'                => _('Benutzer'),
-            'userinstrole'        => _('Benutzerrollen in Einrichtungen'),
-            'usersemdata'         => _('Benutzer-Zusatzangaben in VA'),
-            'roleinstdata'        => _('Rollen in Einrichtungen'),
-            'moduldeskriptor'     => _('Moduldeskriptoren'),
-            'modulteildeskriptor' => _('Modulteildeskriptoren'),
-            'studycourse'         => _('Studiengänge')
-        ];
-    }
-
-    /**
-     * Return the mask for the given permission
-     *
-     * @param  string $perm the name of the permission
-     * @return integer the mask for the permission
-     * @static
-     */
-    public static function permMask($perm)
-    {
-        return self::$permission_masks[$perm] ?? 0;
-    }
-
-    /**
-     * liefert String zu gegebener user_class-Maske
-     *
-     * @param integer $class the user class mask
-     * @return string       a string consisting of a comma separated list of
-     *                      permissions
-     */
-    public static function getReadableUserClass($class)
-    {
-        $result = [];
-        foreach (self::$permission_masks as $perm => $mask) {
-            if ($class & $mask) {
-                $result[] = $perm;
-            }
-        }
-        return implode(', ', $result);
-    }
-
-    /**
-     * Legacy handler for access via [get|set]VariableName().
-     *
-     * @param String $method    Called method
-     * @param Array  $arguments Given arguments
-     * @return mixed Return value of the getter/setter
-     * @throws BadMethodCallException when the method does not match a
-     *                                valid pattern
-     */
-    public function __call($method, array $arguments)
-    {
-        if (mb_substr($method, 0, 3) === 'get') {
-            return $this->getValue(mb_substr($method, 3));
-        }
-        if (mb_substr($method, 0, 3) === 'set') {
-            return $this->setValue(mb_substr($method, 3), $arguments[0]);
-        }
-        throw new BadMethodCallException('Call to undefined method ' . __CLASS__ . '::' . $method);
-    }
-
-    /**
-     * Sets the type and adjusts type param as well.
-     *
-     * @param String $type Type of this datafield
-     */
-    public function setType($type)
-    {
-        $this->content['type'] = $type;
-
-        if (!in_array($type, words('selectbox selectboxmultiple radio combo'))) {
-            $this->typeparam = '';
-        }
-    }
-
-    /**
-     * Returns whether a user may access this datafield.
-     *
-     * @param String $perm    Permission of the user, optional defaults to
-     *                        current user
-     * @param String $watcher Current user
-     * @param String $user    Associated user of the datafield
-     * @return bool indicating whether the datafield may be accessed.
-     */
-    public function accessAllowed($perm = null, $watcher = '', $user = '')
-    {
-        if ($perm === null) {
-            $perm = $GLOBALS['user']->perms;
-        }
-
-        $user_perms = self::permMask($perm);
-        $required_perms = self::permMask($this->view_perms);
-
-        # permission is sufficient
-        if ($user_perms >= $required_perms) {
-            return true;
-        }
-
-        // user may see his own data if this either no system field
-        // or the user may edit the field
-        if ($watcher && $user && $user === $watcher &&
-            (!$this->system || $this->editAllowed($perm)))
-        {
-            return true;
-        }
-
-        # nothing matched...
-        return false;
-    }
-
-    /**
-     * Returns whether a user may edit this datafield.
-     *
-     * @param String $userPerms Permissions of the user
-     * @return bool indicating whether the datafield may be edited
-     */
-    public function editAllowed($userPerms)
-    {
-        $user_perms     = self::permMask($userPerms);
-        $required_perms = self::permMask($this->edit_perms);
-
-        return $user_perms >= $required_perms;
-    }
-
-    /**
-     * Specialized count method that returns the number of concrete entries.
-     *
-     * @return int number of entries
-     */
-    public function count(): int
-    {
-        return DatafieldEntryModel::countBySQL('datafield_id = ?', [$this->id]);
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = DataField::findThru($storage->user_id, [
-            'thru_table'        => 'datafields_entries',
-            'thru_key'          => 'range_id',
-            'thru_assoc_key'    => 'datafield_id',
-            'assoc_foreign_key' => 'datafield_id',
-        ]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Datenfelder'), 'datafields', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/DataField.php b/lib/models/DataField.php
new file mode 100644
index 0000000..8a0bdb6
--- /dev/null
+++ b/lib/models/DataField.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * Datafield
+ * model class for table datafields
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for datafield_id
+ * @property string $datafield_id database column
+ * @property I18NString|null $name database column
+ * @property string|null $object_type database column
+ * @property string|null $object_class database column
+ * @property string|null $edit_perms database column
+ * @property string|null $view_perms database column
+ * @property string|null $institut_id database column
+ * @property int $priority database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property string $type database column
+ * @property string $typeparam database column
+ * @property int $is_required database column
+ * @property string|null $default_value database column
+ * @property int $is_userfilter database column
+ * @property string $description database column
+ * @property int $system database column
+ * @property SimpleORMapCollection|DatafieldEntryModel[] $entries has_many DatafieldEntryModel
+ * @property SimpleORMapCollection|User_Visibility_Settings[] $visibility_settings has_many User_Visibility_Settings
+ * @property mixed $institution additional field
+ */
+class DataField extends SimpleORMap implements PrivacyObject
+{
+    /**
+     * Configures this model.
+     *
+     * @param Array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'datafields';
+        $config['has_many']['entries'] = [
+            'class_name' => DatafieldEntryModel::class,
+            'on_delete'  => 'delete',
+        ];
+        $config['has_many']['visibility_settings'] = [
+            'class_name'        => User_Visibility_Settings::class,
+            'assoc_foreign_key' => 'identifier',
+            'on_delete'         => 'delete',
+        ];
+        $config['additional_fields']['institution'] = array(
+            'get' => function ($object, $field) {
+                $institution = Institute::find($object->institut_id);
+                if (!$institution) {
+                    return false;
+                }
+                return $institution;
+            },
+            'set' => false,
+        );
+
+        $config['i18n_fields']['name'] = true;
+
+        parent::configure($config);
+    }
+
+    protected static $permission_masks = [
+        'user'   => 1,
+        'autor'  => 2,
+        'tutor'  => 4,
+        'dozent' => 8,
+        'admin'  => 16,
+        'root'   => 32,
+        'self'   => 64,
+    ];
+    /**
+     * Returns a collection of datafields filtered by objectType,
+     * objectClass and/or unassigned objectClasses.
+     *
+     * @param mixed  $objectType       Object type
+     * @param String $objectClass      Object class
+     * @param bool   $includeNullClass Should the object class "null" be
+     *                                 included
+     * @return array of DataField instances
+     */
+    public static function getDataFields($objectType = null, $objectClass = '', $includeNullClass = false)
+    {
+        $conditions = [];
+        $parameters = [];
+
+        if ($objectType !== null) {
+            $conditions[] = 'object_type = ?';
+            $parameters[] = $objectType;
+        }
+
+        if ($objectClass) {
+            if (in_array($objectType, ['user', 'userinstrole', 'usersemdata', 'roleinstdata'])) {
+                $condition = ['object_class & ?'];
+            } else {
+                $condition = ['object_class = ?'];
+            }
+            if ($includeNullClass) {
+                $condition[] = 'object_class IS NULL';
+            }
+
+            $conditions[] = '(' . implode(' OR ', $condition) . ')';
+            $parameters[] = $objectClass;
+        }
+
+        $where = implode(' AND ', $conditions) ?: '1';
+
+        return self::findBySQL($where . " ORDER BY priority ASC, name ASC", $parameters);
+    }
+
+    /**
+     * Returns a list of all datatype classes with an id as key and a name as
+     * value.
+     *
+     * @return array list of all datatype classes
+     */
+    public static function getDataClass()
+    {
+        return [
+            'sem'                 => _('Veranstaltungen'),
+            'inst'                => _('Einrichtungen'),
+            'user'                => _('Benutzer'),
+            'userinstrole'        => _('Benutzerrollen in Einrichtungen'),
+            'usersemdata'         => _('Benutzer-Zusatzangaben in VA'),
+            'roleinstdata'        => _('Rollen in Einrichtungen'),
+            'moduldeskriptor'     => _('Moduldeskriptoren'),
+            'modulteildeskriptor' => _('Modulteildeskriptoren'),
+            'studycourse'         => _('Studiengänge')
+        ];
+    }
+
+    /**
+     * Return the mask for the given permission
+     *
+     * @param  string $perm the name of the permission
+     * @return integer the mask for the permission
+     * @static
+     */
+    public static function permMask($perm)
+    {
+        return self::$permission_masks[$perm] ?? 0;
+    }
+
+    /**
+     * liefert String zu gegebener user_class-Maske
+     *
+     * @param integer $class the user class mask
+     * @return string       a string consisting of a comma separated list of
+     *                      permissions
+     */
+    public static function getReadableUserClass($class)
+    {
+        $result = [];
+        foreach (self::$permission_masks as $perm => $mask) {
+            if ($class & $mask) {
+                $result[] = $perm;
+            }
+        }
+        return implode(', ', $result);
+    }
+
+    /**
+     * Legacy handler for access via [get|set]VariableName().
+     *
+     * @param String $method    Called method
+     * @param Array  $arguments Given arguments
+     * @return mixed Return value of the getter/setter
+     * @throws BadMethodCallException when the method does not match a
+     *                                valid pattern
+     */
+    public function __call($method, array $arguments)
+    {
+        if (mb_substr($method, 0, 3) === 'get') {
+            return $this->getValue(mb_substr($method, 3));
+        }
+        if (mb_substr($method, 0, 3) === 'set') {
+            return $this->setValue(mb_substr($method, 3), $arguments[0]);
+        }
+        throw new BadMethodCallException('Call to undefined method ' . __CLASS__ . '::' . $method);
+    }
+
+    /**
+     * Sets the type and adjusts type param as well.
+     *
+     * @param String $type Type of this datafield
+     */
+    public function setType($type)
+    {
+        $this->content['type'] = $type;
+
+        if (!in_array($type, words('selectbox selectboxmultiple radio combo'))) {
+            $this->typeparam = '';
+        }
+    }
+
+    /**
+     * Returns whether a user may access this datafield.
+     *
+     * @param String $perm    Permission of the user, optional defaults to
+     *                        current user
+     * @param String $watcher Current user
+     * @param String $user    Associated user of the datafield
+     * @return bool indicating whether the datafield may be accessed.
+     */
+    public function accessAllowed($perm = null, $watcher = '', $user = '')
+    {
+        if ($perm === null) {
+            $perm = $GLOBALS['user']->perms;
+        }
+
+        $user_perms = self::permMask($perm);
+        $required_perms = self::permMask($this->view_perms);
+
+        # permission is sufficient
+        if ($user_perms >= $required_perms) {
+            return true;
+        }
+
+        // user may see his own data if this either no system field
+        // or the user may edit the field
+        if ($watcher && $user && $user === $watcher &&
+            (!$this->system || $this->editAllowed($perm)))
+        {
+            return true;
+        }
+
+        # nothing matched...
+        return false;
+    }
+
+    /**
+     * Returns whether a user may edit this datafield.
+     *
+     * @param String $userPerms Permissions of the user
+     * @return bool indicating whether the datafield may be edited
+     */
+    public function editAllowed($userPerms)
+    {
+        $user_perms     = self::permMask($userPerms);
+        $required_perms = self::permMask($this->edit_perms);
+
+        return $user_perms >= $required_perms;
+    }
+
+    /**
+     * Specialized count method that returns the number of concrete entries.
+     *
+     * @return int number of entries
+     */
+    public function count(): int
+    {
+        return DatafieldEntryModel::countBySQL('datafield_id = ?', [$this->id]);
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = DataField::findThru($storage->user_id, [
+            'thru_table'        => 'datafields_entries',
+            'thru_key'          => 'range_id',
+            'thru_assoc_key'    => 'datafield_id',
+            'assoc_foreign_key' => 'datafield_id',
+        ]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Datenfelder'), 'datafields', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/DatafieldEntryModel.class.php b/lib/models/DatafieldEntryModel.class.php
deleted file mode 100644
index 33503e3..0000000
--- a/lib/models/DatafieldEntryModel.class.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * DatafieldEntryModel
- * model class for table datafields_entries
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $datafield_id database column
- * @property string $range_id database column
- * @property string|null $content database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property string $sec_range_id database column
- * @property string $lang database column
- * @property DataField $datafield belongs_to DataField
- * @property mixed $name additional field
- */
-
-class DatafieldEntryModel extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'datafields_entries';
-        $config['belongs_to']['datafield'] = [
-            'class_name' => DataField::class,
-            'foreign_key' => 'datafield_id'
-        ];
-        $config['additional_fields']['name'] = ['datafield', 'name'];
-        parent::configure($config);
-    }
-
-    /**
-     * returns datafields belonging to given model
-     * if a datafield entry not exists yet, a new DatafieldEntryModel is returned
-     * second param filters for a given datafield id
-     *
-     * @param SimpleORMap $model Course,Institute,User,CourseMember or InstituteMember
-     * @param string $datafield_id
-     * @return array of DatafieldEntryModel
-     */
-    public static function findByModel(SimpleORMap $model, $datafield_id = null)
-    {
-        $mask = [
-            'user'   => 1,
-            'autor'  => 2,
-            'tutor'  => 4,
-            'dozent' => 8,
-            'admin'  => 16,
-            'root'   => 32,
-        ];
-
-        $sec_range_id = null;
-        if ($model instanceof Course) {
-            $params[':institution_ids'] = $model->institutes->pluck('institut_id');
-            $object_class = SeminarCategories::GetByTypeId($model->status)->id;
-            $object_type = 'sem';
-            $range_id = $model->id;
-        } elseif ($model instanceof Institute) {
-            $params[':institution_ids'] = [$model->id];
-            $object_class = $model->type;
-            $object_type = 'inst';
-            $range_id = $model->id;
-        } elseif ($model instanceof User) {
-            $params[':institution_ids'] = $model->institute_memberships->pluck('institut_id');
-            $object_class = $mask[$model->perms];
-            $object_type = 'user';
-            $range_id = $model->id;
-        } elseif($model instanceof CourseMember) {
-            $params[':institution_ids'] = $model->course->institutes->pluck('institut_id');
-            $object_class = $mask[$model->status];
-            $object_type = 'usersemdata';
-            $range_id = $model->user_id;
-            $sec_range_id = $model->seminar_id;
-        } elseif($model instanceof InstituteMember) {
-            $params[':institution_ids'] = [$model->institut_id];
-            $object_class = $mask[$model->inst_perms];
-            $object_type = 'userinstrole';
-            $range_id = $model->user_id;
-            $sec_range_id = $model->institut_id;
-        } elseif ($model instanceof ModulDeskriptor) {
-            $params[':institution_ids'] = '';
-            if (!empty($model->modul->responsible_institute->institut_id)) {
-                $params[':institution_ids'] = [$model->modul->responsible_institute->institut_id];
-            }
-            $object_class = $model->getVariant();
-            $object_type = 'moduldeskriptor';
-            $range_id = $model->deskriptor_id;
-        } elseif ($model instanceof ModulteilDeskriptor) {
-            $params[':institution_ids'] = [$model->modulteil->modul->responsible_institute->institut_id];
-            $object_class = $model->getVariant();
-            $object_type = 'modulteildeskriptor';
-            $range_id = $model->deskriptor_id;
-        } elseif ($model instanceof StatusgruppeUser) {
-            if (isset($model->group->institute)) {
-                $params[':institution_ids'] = [$model->group->institute->id];
-            } else {
-                $params[':institution_ids'] = [];
-            }
-            $object_class = 255;
-            $object_type = 'userinstrole';
-            $range_id = $model->user_id;
-            $sec_range_id = $model->statusgruppe_id;
-        } elseif ($model instanceof Studiengang) {
-            $params[':institution_ids'] = [$model->institut_id];
-            $object_class = $model->getVariant();
-            $object_type = 'studycourse';
-            $range_id = $model->studiengang_id;
-        } else {
-            throw new InvalidArgumentException('Wrong type of model: ' . get_class($model));
-        }
-
-        $query = "SELECT a.*, b.*, a.datafield_id, b.datafield_id AS isset_content
-                  FROM datafields a
-                  LEFT JOIN datafields_entries b
-                    ON (a.datafield_id=b.datafield_id AND range_id = :range_id AND sec_range_id = :sec_range_id)
-                  WHERE object_type = :object_type
-                    AND (lang IS NULL OR lang = '')
-                    AND (a.institut_id IS NULL OR a.institut_id IN (:institution_ids))";
-
-        if ($datafield_id !== null) {
-            $query .= ' AND a.datafield_id = :one_datafield_id';
-            $params[':one_datafield_id'] = $datafield_id;
-        }
-
-        if ($object_type === 'sem' || $object_type === 'inst') {
-            // find datafields by status (int)
-            $query .= " AND (object_class = :object_class OR object_class IS NULL) ORDER BY priority";
-            $params = array_merge($params, [
-                ':range_id'     => (string) $range_id,
-                ':sec_range_id' => (string) $sec_range_id,
-                ':object_type'  => $object_type,
-                ':object_class' => (int) $object_class
-            ]);
-        } else if ($object_type === 'studycourse') {
-            $query .= " AND (LOCATE(:object_class, object_class) OR LOCATE('all', object_class)) ORDER BY priority";
-            $params = array_merge($params,[
-                ':range_id'     => (string) $range_id,
-                ':sec_range_id' => (string) $sec_range_id,
-                ':object_type'  => $object_type,
-                ':object_class' => (string) $object_class,
-            ]);
-        } elseif ($object_type === 'moduldeskriptor'
-                || $object_type === 'modulteildeskriptor') {
-            // find datafields by language (string)
-            $query .= " AND (LOCATE(:object_class, object_class) OR object_class IS NULL) ORDER BY priority";
-            $params = array_merge($params,[
-                ':range_id'     => (string) $range_id,
-                ':sec_range_id' => (string) $sec_range_id,
-                ':object_type'  => $object_type,
-                ':object_class' => (string) $object_class,
-            ]);
-        } else {
-            // find datafields by perms or status (int)
-            $query .= " AND ((object_class & :object_class) OR object_class IS NULL) ORDER BY priority";
-            $params = array_merge($params, [
-                ':range_id'     => (string) $range_id,
-                ':sec_range_id' => (string) $sec_range_id,
-                ':object_type'  => $object_type,
-                ':object_class' => (int) $object_class,
-            ]);
-        }
-
-        $st = DBManager::get()->prepare($query);
-        $st->execute($params);
-        $ret = [];
-        $c = 0;
-        $df_entry = new DatafieldEntryModel();
-        $df_entry_i18n = new DatafieldEntryModelI18N();
-        $df = new DataField();
-        while ($row = $st->fetch(PDO::FETCH_ASSOC)) {
-            if (mb_strpos($row['type'], 'i18n') === false) {
-                $ret[$c] = clone $df_entry;
-            } else {
-                $ret[$c] = clone $df_entry_i18n;
-                $row['content'] = I18NStringDatafield::load([
-                    $row['datafield_id'],
-                    $range_id,
-                    (string) $sec_range_id
-                ]);
-            }
-            $ret[$c]->setData($row, true);
-            if (!$row['isset_content']) {
-                $ret[$c]->setValue('range_id', (string) $range_id);
-                $ret[$c]->setValue('sec_range_id', (string) $sec_range_id);
-                $ret[$c]->setValue('lang', '');
-            }
-            $ret[$c]->setNew(!$row['isset_content']);
-            $cloned_df = clone $df;
-            $cloned_df->setData($row, true);
-            $cloned_df->setNew(false);
-            $ret[$c]->setValue('datafield', $cloned_df);
-            $c++;
-        }
-        return $ret;
-    }
-
-    public function setContentLanguage($language)
-    {
-        if (!Config::get()->CONTENT_LANGUAGES[$language]) {
-            throw new InvalidArgumentException('Language not configured.');
-        }
-
-        $content_languages = array_keys(Config::get()->CONTENT_LANGUAGES);
-        if ($language == reset($content_languages)) {
-            $language = '';
-        }
-
-        $this->lang = $language;
-    }
-
-    /**
-     * returns matching "old-style" DataFieldEntry object
-     *
-     * @return DataFieldEntry
-     */
-    public function getTypedDatafield()
-    {
-        $range_id = $this->sec_range_id
-                  ? [$this->range_id, $this->sec_range_id, $this->lang]
-                  : [$this->range_id, '', $this->lang];
-
-        $df = DataFieldEntry::createDataFieldEntry($this->datafield, $range_id, $this->getValue('content'));
-        $observer = function ($event, $object, $user_data) {
-            if ($user_data['changed']) {
-                $this->restore();
-            }
-        };
-        NotificationCenter::addObserver($observer, '__invoke', 'DatafieldDidUpdate', $df);
-
-        return $df;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("range_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Datenfeld Einträge'), 'datafields_entries', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/DatafieldEntryModel.php b/lib/models/DatafieldEntryModel.php
new file mode 100644
index 0000000..33503e3
--- /dev/null
+++ b/lib/models/DatafieldEntryModel.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * DatafieldEntryModel
+ * model class for table datafields_entries
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $datafield_id database column
+ * @property string $range_id database column
+ * @property string|null $content database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property string $sec_range_id database column
+ * @property string $lang database column
+ * @property DataField $datafield belongs_to DataField
+ * @property mixed $name additional field
+ */
+
+class DatafieldEntryModel extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'datafields_entries';
+        $config['belongs_to']['datafield'] = [
+            'class_name' => DataField::class,
+            'foreign_key' => 'datafield_id'
+        ];
+        $config['additional_fields']['name'] = ['datafield', 'name'];
+        parent::configure($config);
+    }
+
+    /**
+     * returns datafields belonging to given model
+     * if a datafield entry not exists yet, a new DatafieldEntryModel is returned
+     * second param filters for a given datafield id
+     *
+     * @param SimpleORMap $model Course,Institute,User,CourseMember or InstituteMember
+     * @param string $datafield_id
+     * @return array of DatafieldEntryModel
+     */
+    public static function findByModel(SimpleORMap $model, $datafield_id = null)
+    {
+        $mask = [
+            'user'   => 1,
+            'autor'  => 2,
+            'tutor'  => 4,
+            'dozent' => 8,
+            'admin'  => 16,
+            'root'   => 32,
+        ];
+
+        $sec_range_id = null;
+        if ($model instanceof Course) {
+            $params[':institution_ids'] = $model->institutes->pluck('institut_id');
+            $object_class = SeminarCategories::GetByTypeId($model->status)->id;
+            $object_type = 'sem';
+            $range_id = $model->id;
+        } elseif ($model instanceof Institute) {
+            $params[':institution_ids'] = [$model->id];
+            $object_class = $model->type;
+            $object_type = 'inst';
+            $range_id = $model->id;
+        } elseif ($model instanceof User) {
+            $params[':institution_ids'] = $model->institute_memberships->pluck('institut_id');
+            $object_class = $mask[$model->perms];
+            $object_type = 'user';
+            $range_id = $model->id;
+        } elseif($model instanceof CourseMember) {
+            $params[':institution_ids'] = $model->course->institutes->pluck('institut_id');
+            $object_class = $mask[$model->status];
+            $object_type = 'usersemdata';
+            $range_id = $model->user_id;
+            $sec_range_id = $model->seminar_id;
+        } elseif($model instanceof InstituteMember) {
+            $params[':institution_ids'] = [$model->institut_id];
+            $object_class = $mask[$model->inst_perms];
+            $object_type = 'userinstrole';
+            $range_id = $model->user_id;
+            $sec_range_id = $model->institut_id;
+        } elseif ($model instanceof ModulDeskriptor) {
+            $params[':institution_ids'] = '';
+            if (!empty($model->modul->responsible_institute->institut_id)) {
+                $params[':institution_ids'] = [$model->modul->responsible_institute->institut_id];
+            }
+            $object_class = $model->getVariant();
+            $object_type = 'moduldeskriptor';
+            $range_id = $model->deskriptor_id;
+        } elseif ($model instanceof ModulteilDeskriptor) {
+            $params[':institution_ids'] = [$model->modulteil->modul->responsible_institute->institut_id];
+            $object_class = $model->getVariant();
+            $object_type = 'modulteildeskriptor';
+            $range_id = $model->deskriptor_id;
+        } elseif ($model instanceof StatusgruppeUser) {
+            if (isset($model->group->institute)) {
+                $params[':institution_ids'] = [$model->group->institute->id];
+            } else {
+                $params[':institution_ids'] = [];
+            }
+            $object_class = 255;
+            $object_type = 'userinstrole';
+            $range_id = $model->user_id;
+            $sec_range_id = $model->statusgruppe_id;
+        } elseif ($model instanceof Studiengang) {
+            $params[':institution_ids'] = [$model->institut_id];
+            $object_class = $model->getVariant();
+            $object_type = 'studycourse';
+            $range_id = $model->studiengang_id;
+        } else {
+            throw new InvalidArgumentException('Wrong type of model: ' . get_class($model));
+        }
+
+        $query = "SELECT a.*, b.*, a.datafield_id, b.datafield_id AS isset_content
+                  FROM datafields a
+                  LEFT JOIN datafields_entries b
+                    ON (a.datafield_id=b.datafield_id AND range_id = :range_id AND sec_range_id = :sec_range_id)
+                  WHERE object_type = :object_type
+                    AND (lang IS NULL OR lang = '')
+                    AND (a.institut_id IS NULL OR a.institut_id IN (:institution_ids))";
+
+        if ($datafield_id !== null) {
+            $query .= ' AND a.datafield_id = :one_datafield_id';
+            $params[':one_datafield_id'] = $datafield_id;
+        }
+
+        if ($object_type === 'sem' || $object_type === 'inst') {
+            // find datafields by status (int)
+            $query .= " AND (object_class = :object_class OR object_class IS NULL) ORDER BY priority";
+            $params = array_merge($params, [
+                ':range_id'     => (string) $range_id,
+                ':sec_range_id' => (string) $sec_range_id,
+                ':object_type'  => $object_type,
+                ':object_class' => (int) $object_class
+            ]);
+        } else if ($object_type === 'studycourse') {
+            $query .= " AND (LOCATE(:object_class, object_class) OR LOCATE('all', object_class)) ORDER BY priority";
+            $params = array_merge($params,[
+                ':range_id'     => (string) $range_id,
+                ':sec_range_id' => (string) $sec_range_id,
+                ':object_type'  => $object_type,
+                ':object_class' => (string) $object_class,
+            ]);
+        } elseif ($object_type === 'moduldeskriptor'
+                || $object_type === 'modulteildeskriptor') {
+            // find datafields by language (string)
+            $query .= " AND (LOCATE(:object_class, object_class) OR object_class IS NULL) ORDER BY priority";
+            $params = array_merge($params,[
+                ':range_id'     => (string) $range_id,
+                ':sec_range_id' => (string) $sec_range_id,
+                ':object_type'  => $object_type,
+                ':object_class' => (string) $object_class,
+            ]);
+        } else {
+            // find datafields by perms or status (int)
+            $query .= " AND ((object_class & :object_class) OR object_class IS NULL) ORDER BY priority";
+            $params = array_merge($params, [
+                ':range_id'     => (string) $range_id,
+                ':sec_range_id' => (string) $sec_range_id,
+                ':object_type'  => $object_type,
+                ':object_class' => (int) $object_class,
+            ]);
+        }
+
+        $st = DBManager::get()->prepare($query);
+        $st->execute($params);
+        $ret = [];
+        $c = 0;
+        $df_entry = new DatafieldEntryModel();
+        $df_entry_i18n = new DatafieldEntryModelI18N();
+        $df = new DataField();
+        while ($row = $st->fetch(PDO::FETCH_ASSOC)) {
+            if (mb_strpos($row['type'], 'i18n') === false) {
+                $ret[$c] = clone $df_entry;
+            } else {
+                $ret[$c] = clone $df_entry_i18n;
+                $row['content'] = I18NStringDatafield::load([
+                    $row['datafield_id'],
+                    $range_id,
+                    (string) $sec_range_id
+                ]);
+            }
+            $ret[$c]->setData($row, true);
+            if (!$row['isset_content']) {
+                $ret[$c]->setValue('range_id', (string) $range_id);
+                $ret[$c]->setValue('sec_range_id', (string) $sec_range_id);
+                $ret[$c]->setValue('lang', '');
+            }
+            $ret[$c]->setNew(!$row['isset_content']);
+            $cloned_df = clone $df;
+            $cloned_df->setData($row, true);
+            $cloned_df->setNew(false);
+            $ret[$c]->setValue('datafield', $cloned_df);
+            $c++;
+        }
+        return $ret;
+    }
+
+    public function setContentLanguage($language)
+    {
+        if (!Config::get()->CONTENT_LANGUAGES[$language]) {
+            throw new InvalidArgumentException('Language not configured.');
+        }
+
+        $content_languages = array_keys(Config::get()->CONTENT_LANGUAGES);
+        if ($language == reset($content_languages)) {
+            $language = '';
+        }
+
+        $this->lang = $language;
+    }
+
+    /**
+     * returns matching "old-style" DataFieldEntry object
+     *
+     * @return DataFieldEntry
+     */
+    public function getTypedDatafield()
+    {
+        $range_id = $this->sec_range_id
+                  ? [$this->range_id, $this->sec_range_id, $this->lang]
+                  : [$this->range_id, '', $this->lang];
+
+        $df = DataFieldEntry::createDataFieldEntry($this->datafield, $range_id, $this->getValue('content'));
+        $observer = function ($event, $object, $user_data) {
+            if ($user_data['changed']) {
+                $this->restore();
+            }
+        };
+        NotificationCenter::addObserver($observer, '__invoke', 'DatafieldDidUpdate', $df);
+
+        return $df;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("range_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Datenfeld Einträge'), 'datafields_entries', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/DatafieldEntryModelI18N.class.php b/lib/models/DatafieldEntryModelI18N.class.php
deleted file mode 100644
index aa93a63..0000000
--- a/lib/models/DatafieldEntryModelI18N.class.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * DatafieldEntryModelI18N
- * model class for table datafields_entries
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @copyright   2017 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.1
- *
- * @property array $id alias for pk
- * @property string $datafield_id database column
- * @property string $range_id database column
- * @property I18NString|null $content database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property string $sec_range_id database column
- * @property string $lang database column
- * @property DataField $datafield belongs_to DataField
- * @property mixed $name additional field
- */
-
-class DatafieldEntryModelI18N extends DatafieldEntryModel
-{
-    protected static function configure($config = [])
-    {
-        $config['i18n_fields']['content'] = true;
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/DatafieldEntryModelI18N.php b/lib/models/DatafieldEntryModelI18N.php
new file mode 100644
index 0000000..aa93a63
--- /dev/null
+++ b/lib/models/DatafieldEntryModelI18N.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * DatafieldEntryModelI18N
+ * model class for table datafields_entries
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @copyright   2017 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.1
+ *
+ * @property array $id alias for pk
+ * @property string $datafield_id database column
+ * @property string $range_id database column
+ * @property I18NString|null $content database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property string $sec_range_id database column
+ * @property string $lang database column
+ * @property DataField $datafield belongs_to DataField
+ * @property mixed $name additional field
+ */
+
+class DatafieldEntryModelI18N extends DatafieldEntryModel
+{
+    protected static function configure($config = [])
+    {
+        $config['i18n_fields']['content'] = true;
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/Degree.class.php b/lib/models/Degree.class.php
deleted file mode 100644
index 6fef834..0000000
--- a/lib/models/Degree.class.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Degree.class.php
- * model class for table studiengang
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for abschluss_id
- * @property string $abschluss_id database column
- * @property string $name database column
- * @property string|null $name_kurz database column
- * @property string|null $beschreibung database column
- * @property string $author_id database column
- * @property string $editor_id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property SimpleORMapCollection|StudyCourse[] $professions has_and_belongs_to_many StudyCourse
- * @property-read mixed $count_user additional field
- */
-class Degree extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'abschluss';
-
-        $config['has_and_belongs_to_many']['professions'] = [
-            'class_name' => StudyCourse::class,
-            'thru_table' => 'user_studiengang',
-            'thru_key' => 'abschluss_id',
-            'thru_assoc_key' => 'fach_id',
-            'order_by' => 'GROUP BY fach_id ORDER BY name'
-        ];
-
-        $config['additional_fields']['count_user']['get'] = 'countUser';
-        $config['registered_callbacks']['before_store'][] = "cbUpdateAuthorId";
-        parent::configure($config);
-    }
-
-    public function countUser()
-    {
-        $sql = 'SELECT COUNT(DISTINCT `user_id`) FROM `user_studiengang`';
-        $parameters = [':degree_id' => $this->id];
-        if (!$GLOBALS['perm']->have_perm('root')) {
-            $inst_ids = SimpleCollection::createFromArray(Institute::findBySQL('Institut_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id)
-                OR fakultaets_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id)',
-                [':user_id' => $GLOBALS['user']->user_id]))->pluck('institut_id');
-
-            $sql .=  'JOIN `mvv_fach_inst` as `fach_inst` ON (`user_studiengang`.`fach_id` = `fach_inst`.`fach_id`)
-                WHERE `user_studiengang`.`abschluss_id` = :degree_id AND `fach_inst`.`institut_id` IN (:inst_ids)';
-            $parameters[':inst_ids'] = $inst_ids;
-        } else {
-            $sql .= ' WHERE `user_studiengang`.`abschluss_id` = :degree_id';
-        }
-
-        return DBManager::get()->fetchColumn($sql, $parameters);
-    }
-
-    public function countUserByStudycourse($studycourse_id)
-    {
-        $stmt = DBManager::get()->prepare('SELECT COUNT(DISTINCT user_id) '
-                . 'FROM user_studiengang '
-                . 'WHERE fach_id = ? AND abschluss_id = ?');
-        $stmt->execute([$studycourse_id, $this->id]);
-        return $stmt->fetchColumn();
-    }
-
-    public function cbUpdateAuthorId()
-    {
-        if ($this->isNew() || $this->isDirty()) {
-            $this->editor_id = $GLOBALS['user']->id;
-            if (!$this->getPristineValue('author_id')) {
-                $this->author_id = $GLOBALS['user']->id;
-            }
-        }
-    }
-}
diff --git a/lib/models/Degree.php b/lib/models/Degree.php
new file mode 100644
index 0000000..6fef834
--- /dev/null
+++ b/lib/models/Degree.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Degree.class.php
+ * model class for table studiengang
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for abschluss_id
+ * @property string $abschluss_id database column
+ * @property string $name database column
+ * @property string|null $name_kurz database column
+ * @property string|null $beschreibung database column
+ * @property string $author_id database column
+ * @property string $editor_id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property SimpleORMapCollection|StudyCourse[] $professions has_and_belongs_to_many StudyCourse
+ * @property-read mixed $count_user additional field
+ */
+class Degree extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'abschluss';
+
+        $config['has_and_belongs_to_many']['professions'] = [
+            'class_name' => StudyCourse::class,
+            'thru_table' => 'user_studiengang',
+            'thru_key' => 'abschluss_id',
+            'thru_assoc_key' => 'fach_id',
+            'order_by' => 'GROUP BY fach_id ORDER BY name'
+        ];
+
+        $config['additional_fields']['count_user']['get'] = 'countUser';
+        $config['registered_callbacks']['before_store'][] = "cbUpdateAuthorId";
+        parent::configure($config);
+    }
+
+    public function countUser()
+    {
+        $sql = 'SELECT COUNT(DISTINCT `user_id`) FROM `user_studiengang`';
+        $parameters = [':degree_id' => $this->id];
+        if (!$GLOBALS['perm']->have_perm('root')) {
+            $inst_ids = SimpleCollection::createFromArray(Institute::findBySQL('Institut_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id)
+                OR fakultaets_id IN (SELECT institut_id FROM roles_user WHERE userid = :user_id)',
+                [':user_id' => $GLOBALS['user']->user_id]))->pluck('institut_id');
+
+            $sql .=  'JOIN `mvv_fach_inst` as `fach_inst` ON (`user_studiengang`.`fach_id` = `fach_inst`.`fach_id`)
+                WHERE `user_studiengang`.`abschluss_id` = :degree_id AND `fach_inst`.`institut_id` IN (:inst_ids)';
+            $parameters[':inst_ids'] = $inst_ids;
+        } else {
+            $sql .= ' WHERE `user_studiengang`.`abschluss_id` = :degree_id';
+        }
+
+        return DBManager::get()->fetchColumn($sql, $parameters);
+    }
+
+    public function countUserByStudycourse($studycourse_id)
+    {
+        $stmt = DBManager::get()->prepare('SELECT COUNT(DISTINCT user_id) '
+                . 'FROM user_studiengang '
+                . 'WHERE fach_id = ? AND abschluss_id = ?');
+        $stmt->execute([$studycourse_id, $this->id]);
+        return $stmt->fetchColumn();
+    }
+
+    public function cbUpdateAuthorId()
+    {
+        if ($this->isNew() || $this->isDirty()) {
+            $this->editor_id = $GLOBALS['user']->id;
+            if (!$this->getPristineValue('author_id')) {
+                $this->author_id = $GLOBALS['user']->id;
+            }
+        }
+    }
+}
diff --git a/lib/models/Freetext.php b/lib/models/Freetext.php
index 66b93c5..f241b5a 100644
--- a/lib/models/Freetext.php
+++ b/lib/models/Freetext.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'lib/classes/QuestionType.interface.php';
+require_once 'lib/classes/QuestionType.php';
 
 /**
  * @license GPL2 or any later version
diff --git a/lib/models/HelpContent.class.php b/lib/models/HelpContent.class.php
deleted file mode 100644
index f1e61b1..0000000
--- a/lib/models/HelpContent.class.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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 'lib/object.inc.php';
-
-/**
- * HelpContent.class.php - model class for Stud.IP help content
- *
- * @author   Arne Schröder <schroeder@data-quest>
- * @access   public
- *
- * @property string $id alias column for content_id
- * @property string $global_content_id database column
- * @property string $content_id database column
- * @property string $language database column
- * @property string $content database column
- * @property string $route database column
- * @property string $studip_version database column
- * @property int $position database column
- * @property int $custom database column
- * @property int $visible database column
- * @property string $author_email database column
- * @property string $installation_id database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property string|null $comment database column
- * @property User $author has_one User
- */
-class HelpContent extends SimpleORMap
-{
-    /**
-     * configure SORM
-     *
-     * @param array $config           configuration
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'help_content';
-
-        $config['has_one']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'author_email',
-            'assoc_func'  => 'findOneByEmail',
-        ];
-
-        $config['registered_callbacks']['before_store'][] = 'cbUpdateStudipVersion';
-
-        parent::configure($config);
-    }
-
-    /**
-     * fetches set of content from database for given route
-     *
-     * @param string $route           route for help content
-     * @param string $language        language
-     * @return array                  set of help content
-     */
-    public static function GetContentByRoute($route = '', $language = '')
-    {
-        $language = $language ?: mb_substr($GLOBALS['user']->preferred_language, 0, 2);
-        if (!$language) {
-            $language = mb_substr(Config::get()->DEFAULT_LANGUAGE, 0, 2);
-        }
-        $route = get_route($route);
-        $query = "SELECT *
-                  FROM help_content
-                  WHERE route LIKE CONCAT(?, '%') AND language = ? AND visible = 1";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$route, $language]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        foreach ($ret as $index => $data)
-            if (! match_route($data['route'], $route))
-                unset($ret[$index]);
-        return $ret;
-    }
-
-    /**
-     * fetches content for given content_id
-     *
-     * @param string $id              id of help content
-     * @return array                  help content object
-     */
-    public static function GetContentByID($id = '')
-    {
-        $query = "SELECT content_id AS idx, help_content.*
-                  FROM help_content
-                  WHERE content_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$id]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        return current(HelpContent::GetContentObjects($ret));
-    }
-
-    /**
-     * fetches set of help content from database filtered by parameters
-     *
-     * @param string $term            search term for content
-     * @param boolean $as_objects     include HelpContent objects in result array
-     * @return array                  set of help content
-     */
-    public static function GetContentByFilter($term = '')
-    {
-        $params = [];
-        $condition = '';
-        if (mb_strlen(trim($term)) >= 3) {
-            $condition =  "WHERE content LIKE CONCAT('%', ?, '%')";
-            $params[] = $term;
-        }
-        $query = "SELECT content_id AS idx, help_content.*
-                  FROM help_content
-                  $condition
-                  ORDER BY route ASC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($params);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        return HelpContent::GetContentObjects($ret);
-    }
-
-    /**
-     * fetches help content conflicts
-     *
-     * @return array                  set of help content
-     */
-    public static function GetConflicts()
-    {
-        $conflicts = [];
-        $query = "SELECT content_id AS idx, help_content.*
-                  FROM help_content
-                  WHERE installation_id = ?
-                  ORDER BY route";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([Config::get()->STUDIP_INSTALLATION_ID]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        foreach ($ret as $index => $data) {
-            $query = "SELECT content_id AS idx, help_content.*
-                      FROM help_content
-                      WHERE global_content_id = ? AND language = ? AND studip_version >= ? AND installation_id <> ?
-                      ORDER BY studip_version DESC LIMIT 1";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$data['global_content_id'], $data['language'], $data['studip_version'], Config::get()->STUDIP_INSTALLATION_ID]);
-            $ret2 = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-            if (count($ret2)) {
-                $conflicts[] = HelpContent::GetContentObjects(array_merge([$index => $data], $ret2));
-            }
-        }
-        return $conflicts;
-    }
-
-    /**
-     * builds help content objects for given set of content data
-     *
-     * @param array $content_result   content set
-     * @return array                  set of content objects
-     */
-    public static function GetContentObjects($content_result)
-    {
-        $objects = [];
-        if (is_array($content_result)){
-            foreach($content_result as $id => $result){
-                $objects[$id] = new HelpContent();
-                $objects[$id]->setData($result, true);
-                $objects[$id]->setNew(false);
-            }
-        }
-        return $objects;
-    }
-
-    public function cbUpdateStudipVersion()
-    {
-        $this->studip_version = StudipVersion::getStudipVersion();
-    }
-}
diff --git a/lib/models/HelpContent.php b/lib/models/HelpContent.php
new file mode 100644
index 0000000..f1e61b1
--- /dev/null
+++ b/lib/models/HelpContent.php
@@ -0,0 +1,189 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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 'lib/object.inc.php';
+
+/**
+ * HelpContent.class.php - model class for Stud.IP help content
+ *
+ * @author   Arne Schröder <schroeder@data-quest>
+ * @access   public
+ *
+ * @property string $id alias column for content_id
+ * @property string $global_content_id database column
+ * @property string $content_id database column
+ * @property string $language database column
+ * @property string $content database column
+ * @property string $route database column
+ * @property string $studip_version database column
+ * @property int $position database column
+ * @property int $custom database column
+ * @property int $visible database column
+ * @property string $author_email database column
+ * @property string $installation_id database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property string|null $comment database column
+ * @property User $author has_one User
+ */
+class HelpContent extends SimpleORMap
+{
+    /**
+     * configure SORM
+     *
+     * @param array $config           configuration
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'help_content';
+
+        $config['has_one']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'author_email',
+            'assoc_func'  => 'findOneByEmail',
+        ];
+
+        $config['registered_callbacks']['before_store'][] = 'cbUpdateStudipVersion';
+
+        parent::configure($config);
+    }
+
+    /**
+     * fetches set of content from database for given route
+     *
+     * @param string $route           route for help content
+     * @param string $language        language
+     * @return array                  set of help content
+     */
+    public static function GetContentByRoute($route = '', $language = '')
+    {
+        $language = $language ?: mb_substr($GLOBALS['user']->preferred_language, 0, 2);
+        if (!$language) {
+            $language = mb_substr(Config::get()->DEFAULT_LANGUAGE, 0, 2);
+        }
+        $route = get_route($route);
+        $query = "SELECT *
+                  FROM help_content
+                  WHERE route LIKE CONCAT(?, '%') AND language = ? AND visible = 1";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$route, $language]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        foreach ($ret as $index => $data)
+            if (! match_route($data['route'], $route))
+                unset($ret[$index]);
+        return $ret;
+    }
+
+    /**
+     * fetches content for given content_id
+     *
+     * @param string $id              id of help content
+     * @return array                  help content object
+     */
+    public static function GetContentByID($id = '')
+    {
+        $query = "SELECT content_id AS idx, help_content.*
+                  FROM help_content
+                  WHERE content_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$id]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        return current(HelpContent::GetContentObjects($ret));
+    }
+
+    /**
+     * fetches set of help content from database filtered by parameters
+     *
+     * @param string $term            search term for content
+     * @param boolean $as_objects     include HelpContent objects in result array
+     * @return array                  set of help content
+     */
+    public static function GetContentByFilter($term = '')
+    {
+        $params = [];
+        $condition = '';
+        if (mb_strlen(trim($term)) >= 3) {
+            $condition =  "WHERE content LIKE CONCAT('%', ?, '%')";
+            $params[] = $term;
+        }
+        $query = "SELECT content_id AS idx, help_content.*
+                  FROM help_content
+                  $condition
+                  ORDER BY route ASC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($params);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        return HelpContent::GetContentObjects($ret);
+    }
+
+    /**
+     * fetches help content conflicts
+     *
+     * @return array                  set of help content
+     */
+    public static function GetConflicts()
+    {
+        $conflicts = [];
+        $query = "SELECT content_id AS idx, help_content.*
+                  FROM help_content
+                  WHERE installation_id = ?
+                  ORDER BY route";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([Config::get()->STUDIP_INSTALLATION_ID]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        foreach ($ret as $index => $data) {
+            $query = "SELECT content_id AS idx, help_content.*
+                      FROM help_content
+                      WHERE global_content_id = ? AND language = ? AND studip_version >= ? AND installation_id <> ?
+                      ORDER BY studip_version DESC LIMIT 1";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$data['global_content_id'], $data['language'], $data['studip_version'], Config::get()->STUDIP_INSTALLATION_ID]);
+            $ret2 = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+            if (count($ret2)) {
+                $conflicts[] = HelpContent::GetContentObjects(array_merge([$index => $data], $ret2));
+            }
+        }
+        return $conflicts;
+    }
+
+    /**
+     * builds help content objects for given set of content data
+     *
+     * @param array $content_result   content set
+     * @return array                  set of content objects
+     */
+    public static function GetContentObjects($content_result)
+    {
+        $objects = [];
+        if (is_array($content_result)){
+            foreach($content_result as $id => $result){
+                $objects[$id] = new HelpContent();
+                $objects[$id]->setData($result, true);
+                $objects[$id]->setNew(false);
+            }
+        }
+        return $objects;
+    }
+
+    public function cbUpdateStudipVersion()
+    {
+        $this->studip_version = StudipVersion::getStudipVersion();
+    }
+}
diff --git a/lib/models/HelpTour.class.php b/lib/models/HelpTour.class.php
deleted file mode 100644
index 68bd830..0000000
--- a/lib/models/HelpTour.class.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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 'lib/object.inc.php';
-
-/**
- * HelpTour.class.php - model class for Stud.IP tours
- *
- *
- *
- *
- * @author   Arne Schröder <schroeder@data-quest>
- * @access   public
- *
- * @property string $id alias column for tour_id
- * @property string $global_tour_id database column
- * @property string $tour_id database column
- * @property string $name database column
- * @property string $description database column
- * @property string $type database column
- * @property string $roles database column
- * @property int $version database column
- * @property string $language database column
- * @property string $studip_version database column
- * @property string $installation_id database column
- * @property string $author_email database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|HelpTourStep[] $steps has_many HelpTourStep
- * @property SimpleORMapCollection|HelpTourAudience[] $audiences has_many HelpTourAudience
- * @property HelpTourSettings $settings has_one HelpTourSettings
- * @property User $author has_one User
- */
-class HelpTour extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'help_tours';
-
-        $config['has_one']['settings'] = [
-            'class_name'        => HelpTourSettings::class,
-            'assoc_foreign_key' => 'tour_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_many']['steps'] = [
-            'class_name'        => HelpTourStep::class,
-            'assoc_foreign_key' => 'tour_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_many']['audiences'] = [
-            'class_name'        => HelpTourAudience::class,
-            'assoc_foreign_key' => 'tour_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_one']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'author_email',
-            'assoc_func'  => 'findOneByEmail',
-        ];
-
-        $config['registered_callbacks']['before_store'][] = 'cbUpdateStudipVersion';
-
-        parent::configure($config);
-    }
-
-
-    public function cbUpdateStudipVersion()
-    {
-        $this->studip_version = StudipVersion::getStudipVersion();
-    }
-
-
-    /**
-     * get visible tours for helpbar
-     *
-     * @return array                  set of tours
-     */
-    public static function GetHelpbarTourData()
-    {
-        $visible_tours = [];
-        $active_tour_id = null;
-        $active_tour_step_nr = 0;
-        $route = get_route();
-        $tours = HelpTour::getToursByRoute($route);
-        foreach($tours as $index => $tour) {
-            if ($tour->isVisible() && ($tour->settings->access !== 'link')) {
-                $visible_tours[$index] = $tour;
-                if (in_array($tour->settings->access, ['autostart', 'autostart_once']) && !$GLOBALS['user']->cfg->TOUR_AUTOSTART_DISABLE) {
-                    $user_visit = new HelpTourUser([$tour->tour_id, $GLOBALS['user']->user_id]);
-                    if ($tour->settings->access === 'autostart_once' && $user_visit->isNew()) {
-                        $active_tour_id = $tour->tour_id;
-                        $active_tour_step_nr = 1;
-                    } elseif ($tour->settings->access === 'autostart' && !$user_visit->completed) {
-                        $active_tour_id = $tour->tour_id;
-                        $active_tour_step_nr = 1;
-                    }
-                }
-            }
-        }
-
-        //if there is an active tour, initialize it
-        if (isset($_SESSION['active_tour']['tour_id'])
-            && ($_SESSION['active_tour']['last_route'] === $route
-                || $_SESSION['active_tour']['next_route'] === $route))
-        {
-            $active_tour = new HelpTour($_SESSION['active_tour']['tour_id']);
-            $step_nr = $_SESSION['active_tour']['step_nr'];
-            if ($_SESSION['active_tour']['last_route'] !== $route && $_SESSION['active_tour']['next_route'] === $route) {
-                while ($_SESSION['active_tour']['last_route'] === $active_tour->steps[$step_nr - 1]->route) {
-                    $step_nr += 1;
-                }
-            }
-            if ($route === $active_tour->steps[$step_nr - 1]->route) {
-                $_SESSION['active_tour']['step_nr'] = $step_nr;
-                $active_tour_id = $_SESSION['active_tour']['tour_id'];
-                $active_tour_step_nr = $step_nr;
-            }
-        }
-        return [
-            'tours'               => $visible_tours,
-            'active_tour_id'      => $active_tour_id,
-            'active_tour_step_nr' => $active_tour_step_nr,
-        ];
-    }
-
-    /**
-     * fetches set of tours from database for given route
-     *
-     * @param string $route           route for tours to begin
-     * @param boolean $as_objects     include HelpTour objects in result array
-     * @return array                  set of tours
-     */
-    public static function GetToursByRoute($route = '')
-    {
-        if (!$route) {
-            $route = get_route();
-        }
-        $query = "SELECT tour_id AS idx, help_tours.*
-                  FROM help_tour_steps
-                  INNER JOIN help_tours USING (tour_id)
-                  WHERE route = ? AND step = 1
-                  ORDER BY name ASC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$route]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-
-        return HelpTour::GetTourObjects($ret);
-    }
-
-    /**
-     * fetches set of tours from database filtered by parameters
-     *
-     * @param string $term            search term for tour name
-     * @param boolean $as_objects     include HelpTour objects in result array
-     * @return array                  set of tours
-     */
-    public static function GetToursByFilter($term = '')
-    {
-        $params = [];
-        $condition = '';
-        if (mb_strlen(trim($term)) >= 3) {
-            $condition = "WHERE name LIKE CONCAT('%', ?, '%')";
-            $params[] = $term;
-        }
-        $query = "SELECT tour_id AS idx, help_tours.*
-                  FROM help_tours
-                  {$condition}
-                  ORDER BY name ASC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($params);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-
-        return HelpTour::GetTourObjects($ret);
-    }
-
-    /**
-     * fetches tour conflicts
-     *
-     * @return array                  set of tour objects
-     */
-    public static function GetConflicts()
-    {
-        $conflicts = [];
-        $query = "SELECT tour_id AS idx, help_tours.*
-                  FROM help_tours
-                  WHERE installation_id = ?
-                  ORDER BY name ASC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([Config::get()->STUDIP_INSTALLATION_ID]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        foreach ($ret as $index => $data) {
-            $query = "SELECT tour_id AS idx, help_tours.*
-                      FROM help_tours
-                      WHERE global_tour_id = ?
-                        AND language = ?
-                        AND studip_version >= ?
-                        AND installation_id <> ?
-                      ORDER BY studip_version DESC
-                      LIMIT 1";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $data['global_tour_id'],
-                $data['language'],
-                $data['studip_version'],
-                Config::get()->STUDIP_INSTALLATION_ID,
-            ]);
-            $ret2 = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-            if (count($ret2) > 0) {
-                $conflicts[] = HelpTour::GetTourObjects(array_merge([$index => $data], $ret2));
-            }
-        }
-        return $conflicts;
-    }
-
-    /**
-     * builds tour objects for given set of tour data
-     *
-     * @param array $tour_result      tour set
-     * @return array                  set of tour objects
-     */
-    public static function GetTourObjects($tour_result)
-    {
-        $objects = [];
-        if (is_array($tour_result)){
-            foreach($tour_result as $id => $result){
-                $objects[$id] = new HelpTour();
-                $objects[$id]->setData($result, true);
-                $objects[$id]->setNew(false);
-            }
-        }
-        return $objects;
-    }
-
-    /**
-     * checks if tour is visible for current user
-     */
-    public function isVisible()
-    {
-        if (!$this->settings->active) {
-            return false;
-        }
-
-        if (!$GLOBALS['user']->preferred_language) {
-            $language = mb_substr(Config::get()->DEFAULT_LANGUAGE, 0, 2);
-        } else {
-            $language = mb_substr($GLOBALS['user']->preferred_language, 0, 2);
-        }
-        if ($language !== $this->language) {
-            return false;
-        }
-
-        $current_role = User::findCurrent() ? User::findCurrent()->perms : 'nobody';
-        if (mb_strpos($this->roles, $current_role) === false) {
-            return false;
-        }
-        foreach ($this->audiences as $audience) {
-            switch ($audience->type) {
-                case 'inst':
-                    $table_name = 'user_inst';
-                    $field_name = 'Institut_id';
-                break;
-                case 'sem':
-                    $table_name = 'seminar_user';
-                    $field_name = 'Seminar_id';
-                break;
-                case 'studiengang':
-                    $table_name = 'user_studiengang';
-                    $field_name = 'fach_id';
-                break;
-                case 'abschluss':
-                    $table_name = 'user_studiengang';
-                    $field_name = 'abschluss_id';
-                break;
-                case 'userdomain':
-                    $table_name = 'user_userdomains';
-                    $field_name = 'userdomain_id';
-                break;
-            }
-            if ($audience->range_id && $table_name) {
-                $query = "SELECT *
-                          FROM {$table_name}
-                          WHERE user_id = ?
-                            AND {$field_name} = ?";
-                $items = [$GLOBALS['user']->user_id, $audience->range_id];
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute($items);
-                $ret = $statement->fetchOne(PDO::FETCH_ASSOC);
-                if (!count($ret)) {
-                    return false;
-                }
-            } elseif ($table_name) {
-                $query = "SELECT * FROM {$table_name} WHERE user_id = ?";
-                $items = [$GLOBALS['user']->user_id];
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute($items);
-                $ret = $statement->fetchOne(PDO::FETCH_ASSOC);
-                if (count($ret)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * adds step to the tour and rearranges existing steps
-     */
-    public function addStep($data, $position = 0)
-    {
-        $step = new HelpTourStep();
-        $step->setData($data, true);
-        if ($position) {
-            $step->step = $position;
-        } else {
-            $step->step = count($this->steps) + 1;
-        }
-        $step->tour_id = $this->tour_id;
-        if ($step->validate()) {
-            if ($position && $position <= count($this->steps)) {
-                $query = "UPDATE help_tour_steps
-                          SET step = step + 1
-                          WHERE tour_id = ? AND step >= ?
-                          ORDER BY step DESC";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([$this->tour_id, $position]);
-            }
-            $step->store();
-            $this->restore();
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * deletes step and rearranges existing steps
-     */
-    public function deleteStep($position = 0)
-    {
-        if (!$position || count($this->steps) < 2) {
-            PageLayout::postError(_('Löschen nicht möglich. Die Tour muss mindestens einen Schritt enthalten.'));
-            return false;
-        }
-        $query = "DELETE FROM help_tour_steps
-                  WHERE tour_id = ? AND step = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->tour_id, $position]);
-
-        $query = "UPDATE help_tour_steps
-                  SET step = step - 1
-                  WHERE tour_id = ? AND step > ?
-                  ORDER BY step ASC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->tour_id, $position]);
-        $this->restore();
-        return true;
-    }
-
-    /**
-     * checks, if basic tour data is complete
-     *
-     * @return boolean true or false
-     */
-    public function validate()
-    {
-        if (!$this->name || !$this->description) {
-            PageLayout::postError(_('Die Tour muss einen Namen und eine Beschreibung haben.'));
-            return false;
-        }
-        if (!$this->type) {
-            PageLayout::postError(_('Ungültige oder fehlende Angabe zur Art der Tour.'));
-            return false;
-        }
-        if (!$this->roles) {
-            PageLayout::postError(_('Angabe des Nutzendenstatus fehlt.'));
-            return false;
-        }
-        if (!$this->version) {
-            $this->version = 1;
-        }
-        if (!$this->isNew() && count($this->steps) === 0) {
-            PageLayout::postError(_('Die Tour muss mindestens einen Schritt enthalten.'));
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/lib/models/HelpTour.php b/lib/models/HelpTour.php
new file mode 100644
index 0000000..68bd830
--- /dev/null
+++ b/lib/models/HelpTour.php
@@ -0,0 +1,407 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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 'lib/object.inc.php';
+
+/**
+ * HelpTour.class.php - model class for Stud.IP tours
+ *
+ *
+ *
+ *
+ * @author   Arne Schröder <schroeder@data-quest>
+ * @access   public
+ *
+ * @property string $id alias column for tour_id
+ * @property string $global_tour_id database column
+ * @property string $tour_id database column
+ * @property string $name database column
+ * @property string $description database column
+ * @property string $type database column
+ * @property string $roles database column
+ * @property int $version database column
+ * @property string $language database column
+ * @property string $studip_version database column
+ * @property string $installation_id database column
+ * @property string $author_email database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|HelpTourStep[] $steps has_many HelpTourStep
+ * @property SimpleORMapCollection|HelpTourAudience[] $audiences has_many HelpTourAudience
+ * @property HelpTourSettings $settings has_one HelpTourSettings
+ * @property User $author has_one User
+ */
+class HelpTour extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'help_tours';
+
+        $config['has_one']['settings'] = [
+            'class_name'        => HelpTourSettings::class,
+            'assoc_foreign_key' => 'tour_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_many']['steps'] = [
+            'class_name'        => HelpTourStep::class,
+            'assoc_foreign_key' => 'tour_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_many']['audiences'] = [
+            'class_name'        => HelpTourAudience::class,
+            'assoc_foreign_key' => 'tour_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_one']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'author_email',
+            'assoc_func'  => 'findOneByEmail',
+        ];
+
+        $config['registered_callbacks']['before_store'][] = 'cbUpdateStudipVersion';
+
+        parent::configure($config);
+    }
+
+
+    public function cbUpdateStudipVersion()
+    {
+        $this->studip_version = StudipVersion::getStudipVersion();
+    }
+
+
+    /**
+     * get visible tours for helpbar
+     *
+     * @return array                  set of tours
+     */
+    public static function GetHelpbarTourData()
+    {
+        $visible_tours = [];
+        $active_tour_id = null;
+        $active_tour_step_nr = 0;
+        $route = get_route();
+        $tours = HelpTour::getToursByRoute($route);
+        foreach($tours as $index => $tour) {
+            if ($tour->isVisible() && ($tour->settings->access !== 'link')) {
+                $visible_tours[$index] = $tour;
+                if (in_array($tour->settings->access, ['autostart', 'autostart_once']) && !$GLOBALS['user']->cfg->TOUR_AUTOSTART_DISABLE) {
+                    $user_visit = new HelpTourUser([$tour->tour_id, $GLOBALS['user']->user_id]);
+                    if ($tour->settings->access === 'autostart_once' && $user_visit->isNew()) {
+                        $active_tour_id = $tour->tour_id;
+                        $active_tour_step_nr = 1;
+                    } elseif ($tour->settings->access === 'autostart' && !$user_visit->completed) {
+                        $active_tour_id = $tour->tour_id;
+                        $active_tour_step_nr = 1;
+                    }
+                }
+            }
+        }
+
+        //if there is an active tour, initialize it
+        if (isset($_SESSION['active_tour']['tour_id'])
+            && ($_SESSION['active_tour']['last_route'] === $route
+                || $_SESSION['active_tour']['next_route'] === $route))
+        {
+            $active_tour = new HelpTour($_SESSION['active_tour']['tour_id']);
+            $step_nr = $_SESSION['active_tour']['step_nr'];
+            if ($_SESSION['active_tour']['last_route'] !== $route && $_SESSION['active_tour']['next_route'] === $route) {
+                while ($_SESSION['active_tour']['last_route'] === $active_tour->steps[$step_nr - 1]->route) {
+                    $step_nr += 1;
+                }
+            }
+            if ($route === $active_tour->steps[$step_nr - 1]->route) {
+                $_SESSION['active_tour']['step_nr'] = $step_nr;
+                $active_tour_id = $_SESSION['active_tour']['tour_id'];
+                $active_tour_step_nr = $step_nr;
+            }
+        }
+        return [
+            'tours'               => $visible_tours,
+            'active_tour_id'      => $active_tour_id,
+            'active_tour_step_nr' => $active_tour_step_nr,
+        ];
+    }
+
+    /**
+     * fetches set of tours from database for given route
+     *
+     * @param string $route           route for tours to begin
+     * @param boolean $as_objects     include HelpTour objects in result array
+     * @return array                  set of tours
+     */
+    public static function GetToursByRoute($route = '')
+    {
+        if (!$route) {
+            $route = get_route();
+        }
+        $query = "SELECT tour_id AS idx, help_tours.*
+                  FROM help_tour_steps
+                  INNER JOIN help_tours USING (tour_id)
+                  WHERE route = ? AND step = 1
+                  ORDER BY name ASC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$route]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+
+        return HelpTour::GetTourObjects($ret);
+    }
+
+    /**
+     * fetches set of tours from database filtered by parameters
+     *
+     * @param string $term            search term for tour name
+     * @param boolean $as_objects     include HelpTour objects in result array
+     * @return array                  set of tours
+     */
+    public static function GetToursByFilter($term = '')
+    {
+        $params = [];
+        $condition = '';
+        if (mb_strlen(trim($term)) >= 3) {
+            $condition = "WHERE name LIKE CONCAT('%', ?, '%')";
+            $params[] = $term;
+        }
+        $query = "SELECT tour_id AS idx, help_tours.*
+                  FROM help_tours
+                  {$condition}
+                  ORDER BY name ASC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($params);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+
+        return HelpTour::GetTourObjects($ret);
+    }
+
+    /**
+     * fetches tour conflicts
+     *
+     * @return array                  set of tour objects
+     */
+    public static function GetConflicts()
+    {
+        $conflicts = [];
+        $query = "SELECT tour_id AS idx, help_tours.*
+                  FROM help_tours
+                  WHERE installation_id = ?
+                  ORDER BY name ASC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([Config::get()->STUDIP_INSTALLATION_ID]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        foreach ($ret as $index => $data) {
+            $query = "SELECT tour_id AS idx, help_tours.*
+                      FROM help_tours
+                      WHERE global_tour_id = ?
+                        AND language = ?
+                        AND studip_version >= ?
+                        AND installation_id <> ?
+                      ORDER BY studip_version DESC
+                      LIMIT 1";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $data['global_tour_id'],
+                $data['language'],
+                $data['studip_version'],
+                Config::get()->STUDIP_INSTALLATION_ID,
+            ]);
+            $ret2 = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+            if (count($ret2) > 0) {
+                $conflicts[] = HelpTour::GetTourObjects(array_merge([$index => $data], $ret2));
+            }
+        }
+        return $conflicts;
+    }
+
+    /**
+     * builds tour objects for given set of tour data
+     *
+     * @param array $tour_result      tour set
+     * @return array                  set of tour objects
+     */
+    public static function GetTourObjects($tour_result)
+    {
+        $objects = [];
+        if (is_array($tour_result)){
+            foreach($tour_result as $id => $result){
+                $objects[$id] = new HelpTour();
+                $objects[$id]->setData($result, true);
+                $objects[$id]->setNew(false);
+            }
+        }
+        return $objects;
+    }
+
+    /**
+     * checks if tour is visible for current user
+     */
+    public function isVisible()
+    {
+        if (!$this->settings->active) {
+            return false;
+        }
+
+        if (!$GLOBALS['user']->preferred_language) {
+            $language = mb_substr(Config::get()->DEFAULT_LANGUAGE, 0, 2);
+        } else {
+            $language = mb_substr($GLOBALS['user']->preferred_language, 0, 2);
+        }
+        if ($language !== $this->language) {
+            return false;
+        }
+
+        $current_role = User::findCurrent() ? User::findCurrent()->perms : 'nobody';
+        if (mb_strpos($this->roles, $current_role) === false) {
+            return false;
+        }
+        foreach ($this->audiences as $audience) {
+            switch ($audience->type) {
+                case 'inst':
+                    $table_name = 'user_inst';
+                    $field_name = 'Institut_id';
+                break;
+                case 'sem':
+                    $table_name = 'seminar_user';
+                    $field_name = 'Seminar_id';
+                break;
+                case 'studiengang':
+                    $table_name = 'user_studiengang';
+                    $field_name = 'fach_id';
+                break;
+                case 'abschluss':
+                    $table_name = 'user_studiengang';
+                    $field_name = 'abschluss_id';
+                break;
+                case 'userdomain':
+                    $table_name = 'user_userdomains';
+                    $field_name = 'userdomain_id';
+                break;
+            }
+            if ($audience->range_id && $table_name) {
+                $query = "SELECT *
+                          FROM {$table_name}
+                          WHERE user_id = ?
+                            AND {$field_name} = ?";
+                $items = [$GLOBALS['user']->user_id, $audience->range_id];
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute($items);
+                $ret = $statement->fetchOne(PDO::FETCH_ASSOC);
+                if (!count($ret)) {
+                    return false;
+                }
+            } elseif ($table_name) {
+                $query = "SELECT * FROM {$table_name} WHERE user_id = ?";
+                $items = [$GLOBALS['user']->user_id];
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute($items);
+                $ret = $statement->fetchOne(PDO::FETCH_ASSOC);
+                if (count($ret)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * adds step to the tour and rearranges existing steps
+     */
+    public function addStep($data, $position = 0)
+    {
+        $step = new HelpTourStep();
+        $step->setData($data, true);
+        if ($position) {
+            $step->step = $position;
+        } else {
+            $step->step = count($this->steps) + 1;
+        }
+        $step->tour_id = $this->tour_id;
+        if ($step->validate()) {
+            if ($position && $position <= count($this->steps)) {
+                $query = "UPDATE help_tour_steps
+                          SET step = step + 1
+                          WHERE tour_id = ? AND step >= ?
+                          ORDER BY step DESC";
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute([$this->tour_id, $position]);
+            }
+            $step->store();
+            $this->restore();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * deletes step and rearranges existing steps
+     */
+    public function deleteStep($position = 0)
+    {
+        if (!$position || count($this->steps) < 2) {
+            PageLayout::postError(_('Löschen nicht möglich. Die Tour muss mindestens einen Schritt enthalten.'));
+            return false;
+        }
+        $query = "DELETE FROM help_tour_steps
+                  WHERE tour_id = ? AND step = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->tour_id, $position]);
+
+        $query = "UPDATE help_tour_steps
+                  SET step = step - 1
+                  WHERE tour_id = ? AND step > ?
+                  ORDER BY step ASC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->tour_id, $position]);
+        $this->restore();
+        return true;
+    }
+
+    /**
+     * checks, if basic tour data is complete
+     *
+     * @return boolean true or false
+     */
+    public function validate()
+    {
+        if (!$this->name || !$this->description) {
+            PageLayout::postError(_('Die Tour muss einen Namen und eine Beschreibung haben.'));
+            return false;
+        }
+        if (!$this->type) {
+            PageLayout::postError(_('Ungültige oder fehlende Angabe zur Art der Tour.'));
+            return false;
+        }
+        if (!$this->roles) {
+            PageLayout::postError(_('Angabe des Nutzendenstatus fehlt.'));
+            return false;
+        }
+        if (!$this->version) {
+            $this->version = 1;
+        }
+        if (!$this->isNew() && count($this->steps) === 0) {
+            PageLayout::postError(_('Die Tour muss mindestens einen Schritt enthalten.'));
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/lib/models/HelpTourAudience.class.php b/lib/models/HelpTourAudience.class.php
deleted file mode 100644
index 6255a46..0000000
--- a/lib/models/HelpTourAudience.class.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-/**
- * HelpTourSteps.class.php - model class for tour audiences
- *
- * 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.
- *
- * @author      Arne Schröder <schroeder@data-quest>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $tour_id database column
- * @property string $range_id database column
- * @property string $type database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-class HelpTourAudience extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'help_tour_audiences';
-        
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/HelpTourAudience.php b/lib/models/HelpTourAudience.php
new file mode 100644
index 0000000..6255a46
--- /dev/null
+++ b/lib/models/HelpTourAudience.php
@@ -0,0 +1,48 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+/**
+ * HelpTourSteps.class.php - model class for tour audiences
+ *
+ * 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.
+ *
+ * @author      Arne Schröder <schroeder@data-quest>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $tour_id database column
+ * @property string $range_id database column
+ * @property string $type database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ */
+class HelpTourAudience extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'help_tour_audiences';
+        
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/HelpTourSettings.class.php b/lib/models/HelpTourSettings.class.php
deleted file mode 100644
index f24c86b..0000000
--- a/lib/models/HelpTourSettings.class.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-/**
- * HelpTourSteps.class.php - model class for tour steps
- *
- * 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.
- *
- * @author      Arne Schröder <schroeder@data-quest>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for tour_id
- * @property string $tour_id database column
- * @property int $active database column
- * @property string|null $access database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-class HelpTourSettings extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'help_tour_settings';
-        
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/HelpTourSettings.php b/lib/models/HelpTourSettings.php
new file mode 100644
index 0000000..f24c86b
--- /dev/null
+++ b/lib/models/HelpTourSettings.php
@@ -0,0 +1,48 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+/**
+ * HelpTourSteps.class.php - model class for tour steps
+ *
+ * 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.
+ *
+ * @author      Arne Schröder <schroeder@data-quest>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for tour_id
+ * @property string $tour_id database column
+ * @property int $active database column
+ * @property string|null $access database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ */
+class HelpTourSettings extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'help_tour_settings';
+        
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/HelpTourStep.class.php b/lib/models/HelpTourStep.class.php
deleted file mode 100644
index 6f31326..0000000
--- a/lib/models/HelpTourStep.class.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-/**
- * HelpTourSteps.class.php - model class for tour steps
- *
- * 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.
- *
- * @author      Arne Schröder <schroeder@data-quest>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $tour_id database column
- * @property int $step database column
- * @property string $title database column
- * @property string $tip database column
- * @property string $orientation database column
- * @property int $interactive database column
- * @property string $css_selector database column
- * @property string $route database column
- * @property string $action_prev database column
- * @property string $action_next database column
- * @property string $author_email database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property HelpTour $help_tour belongs_to HelpTour
- * @property User $author has_one User
- */
-class HelpTourStep extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'help_tour_steps';
-
-        $config['belongs_to']['help_tour'] = [
-            'class_name'  => HelpTour::class,
-            'foreign_key' => 'tour_id',
-        ];
-
-        $config['has_one']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'author_email',
-            'assoc_func'  => 'findOneByEmail',
-        ];
-
-        $config['registered_callbacks']['after_store'][] = 'cbUpdateTour';
-
-        parent::configure($config);
-    }
-
-
-    public function cbUpdateTour()
-    {
-        if (!$this->help_tour) {
-            return;
-        }
-
-        $this->help_tour->author_email = $this->author_email;
-        $this->help_tour->chdate = $this->chdate;
-        if ($this->help_tour->isDirty()) {
-            $this->help_tour->store();
-        }
-    }
-
-
-    /**
-     * checks, if tour step data is complete
-     *
-     * @todo Das Model sollte nix über PageLayout wissen, das sollte anders raus transportiert werden
-     * @return boolean true or false
-     */
-    public function validate() {
-        if (!$this->orientation)
-            $this->orientation = 'B';
-        if (!$this->title && !$this->tip) {
-            PageLayout::postMessage(MessageBox::error(_('Der Schritt muss einen Titel oder Inhalt besitzen.')));
-            return false;
-        }
-        if (!$this->route) {
-            PageLayout::postMessage(MessageBox::error(_('Ungültige oder fehlende Angabe zur Seite, für die der Schritt angezeigt werden soll.')));
-            return false;
-        }
-        return true;
-    }
-}
-
diff --git a/lib/models/HelpTourStep.php b/lib/models/HelpTourStep.php
new file mode 100644
index 0000000..6f31326
--- /dev/null
+++ b/lib/models/HelpTourStep.php
@@ -0,0 +1,107 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+/**
+ * HelpTourSteps.class.php - model class for tour steps
+ *
+ * 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.
+ *
+ * @author      Arne Schröder <schroeder@data-quest>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $tour_id database column
+ * @property int $step database column
+ * @property string $title database column
+ * @property string $tip database column
+ * @property string $orientation database column
+ * @property int $interactive database column
+ * @property string $css_selector database column
+ * @property string $route database column
+ * @property string $action_prev database column
+ * @property string $action_next database column
+ * @property string $author_email database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property HelpTour $help_tour belongs_to HelpTour
+ * @property User $author has_one User
+ */
+class HelpTourStep extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'help_tour_steps';
+
+        $config['belongs_to']['help_tour'] = [
+            'class_name'  => HelpTour::class,
+            'foreign_key' => 'tour_id',
+        ];
+
+        $config['has_one']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'author_email',
+            'assoc_func'  => 'findOneByEmail',
+        ];
+
+        $config['registered_callbacks']['after_store'][] = 'cbUpdateTour';
+
+        parent::configure($config);
+    }
+
+
+    public function cbUpdateTour()
+    {
+        if (!$this->help_tour) {
+            return;
+        }
+
+        $this->help_tour->author_email = $this->author_email;
+        $this->help_tour->chdate = $this->chdate;
+        if ($this->help_tour->isDirty()) {
+            $this->help_tour->store();
+        }
+    }
+
+
+    /**
+     * checks, if tour step data is complete
+     *
+     * @todo Das Model sollte nix über PageLayout wissen, das sollte anders raus transportiert werden
+     * @return boolean true or false
+     */
+    public function validate() {
+        if (!$this->orientation)
+            $this->orientation = 'B';
+        if (!$this->title && !$this->tip) {
+            PageLayout::postMessage(MessageBox::error(_('Der Schritt muss einen Titel oder Inhalt besitzen.')));
+            return false;
+        }
+        if (!$this->route) {
+            PageLayout::postMessage(MessageBox::error(_('Ungültige oder fehlende Angabe zur Seite, für die der Schritt angezeigt werden soll.')));
+            return false;
+        }
+        return true;
+    }
+}
+
diff --git a/lib/models/HelpTourUser.class.php b/lib/models/HelpTourUser.class.php
deleted file mode 100644
index aa2869d..0000000
--- a/lib/models/HelpTourUser.class.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-/**
- * HelpTourUser.class.php - model class for tour user visits
- *
- * 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.
- *
- * @author      Arne Schröder <schroeder@data-quest>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $tour_id database column
- * @property string $user_id database column
- * @property int $step_nr database column
- * @property int $completed database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-class HelpTourUser extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'help_tour_user';
-
-        parent::configure($config);
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Hilfetouren'), 'help_tour_user', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/HelpTourUser.php b/lib/models/HelpTourUser.php
new file mode 100644
index 0000000..aa2869d
--- /dev/null
+++ b/lib/models/HelpTourUser.php
@@ -0,0 +1,69 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2014 Arne Schröder <schroeder@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+/**
+ * HelpTourUser.class.php - model class for tour user visits
+ *
+ * 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.
+ *
+ * @author      Arne Schröder <schroeder@data-quest>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $tour_id database column
+ * @property string $user_id database column
+ * @property int $step_nr database column
+ * @property int $completed database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ */
+class HelpTourUser extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'help_tour_user';
+
+        parent::configure($config);
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Hilfetouren'), 'help_tour_user', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/Institute.class.php b/lib/models/Institute.class.php
deleted file mode 100644
index 47cf271..0000000
--- a/lib/models/Institute.class.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-/**
- * Institute.class.php - model class for table Institute
- *
- * 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.
- *
- * @author      Rasmus Fuhse <fuhse@data-quest>
- * @author      Suchi & Berg GmbH <info@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.0
- *
- * @property string $id alias column for institut_id
- * @property string $institut_id database column
- * @property I18NString $name database column
- * @property string $fakultaets_id database column
- * @property string $strasse database column
- * @property string $plz database column
- * @property I18NString $url database column
- * @property string $telefon database column
- * @property string $email database column
- * @property string $fax database column
- * @property int $type database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property string|null $lit_plugin_name database column
- * @property int $srienabled database column
- * @property string $lock_rule database column
- * @property SimpleORMapCollection|InstituteMember[] $members has_many InstituteMember
- * @property SimpleORMapCollection|Course[] $home_courses has_many Course
- * @property SimpleORMapCollection|Institute[] $sub_institutes has_many Institute
- * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
- * @property SimpleORMapCollection|StudipScmEntry[] $scm has_many StudipScmEntry
- * @property SimpleORMapCollection|Statusgruppen[] $status_groups has_many Statusgruppen
- * @property SimpleORMapCollection|BlubberThread[] $blubberthreads has_many BlubberThread
- * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock
- * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility
- * @property SimpleORMapCollection|ToolActivation[] $tools has_many ToolActivation
- * @property Institute $faculty belongs_to Institute
- * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course
- * @property-read mixed $is_fak additional field
- * @property-read mixed $all_status_groups additional field
- */
-
-class Institute extends SimpleORMap implements Range
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'Institute';
-        $config['additional_fields']['is_fak']['get'] = 'isFaculty';
-
-        $config['has_many']['members'] = [
-            'class_name' => InstituteMember::class,
-            'assoc_func' => 'findByInstitute',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-        ];
-        $config['has_many']['home_courses'] = [
-            'class_name' => Course::class,
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-        ];
-        $config['has_many']['sub_institutes'] = [
-            'class_name' => Institute::class,
-            'assoc_foreign_key' => 'fakultaets_id',
-            'assoc_func' => 'findByFaculty',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-        ];
-        $config['has_many']['datafields'] = [
-            'class_name' => DatafieldEntryModel::class,
-            'assoc_foreign_key' =>
-                function($model,$params) {
-                    $model->setValue('range_id', $params[0]->id);
-                },
-            'assoc_func' => 'findByModel',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-            'foreign_key' =>
-                function($i) {
-                    return [$i];
-                }
-        ];
-        $config['belongs_to']['faculty'] = [
-            'class_name' => Institute::class,
-            'foreign_key' => 'fakultaets_id',
-        ];
-        $config['has_and_belongs_to_many']['courses'] = [
-            'class_name' => Course::class,
-            'thru_table' => 'seminar_inst',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-        ];
-        $config['has_many']['scm'] = [
-            'class_name'        => StudipScmEntry::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_many']['status_groups'] = [
-            'class_name'        => Statusgruppen::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-            'order_by'          => 'ORDER BY position ASC',
-        ];
-        $config['has_many']['blubberthreads'] = [
-            'class_name' => BlubberThread::class,
-            'assoc_func' => 'findByInstitut',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['consultation_blocks'] = [
-            'class_name'        => ConsultationBlock::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-        ];
-        $config['has_many']['consultation_responsibilities'] = [
-            'class_name'        => ConsultationResponsibility::class,
-            'assoc_func'        => 'findByInstituteId',
-            'on_delete'         => 'delete',
-        ];
-        $config['has_many']['tools'] = [
-            'class_name'        => ToolActivation::class,
-            'assoc_foreign_key' => 'range_id',
-            'order_by'          => 'ORDER BY position',
-            'on_delete'         => 'delete',
-        ];
-        $config['additional_fields']['all_status_groups']['get'] = function ($institute) {
-            return Statusgruppen::findAllByRangeId($institute->id, true);
-        };
-
-        $config['i18n_fields'] = ['name', 'url'];
-        $config['registered_callbacks']['after_create'][] = 'setDefaultTools';
-
-        parent::configure($config);
-    }
-
-    /**
-    * Returns the currently active course or false if none is active.
-    *
-    * @return Institute object of currently active institute
-    * @since 3.0
-    */
-    public static function findCurrent()
-    {
-        if (Context::isInstitute()) {
-            return Context::get();
-        }
-        return null;
-    }
-
-    /**
-     * returns array of instances of Institutes belonging to given faculty
-     * @param string $fakultaets_id
-     * @return array
-     */
-    public static function findByFaculty($fakultaets_id)
-    {
-        return self::findBySQL("fakultaets_id=? AND fakultaets_id <> institut_id ORDER BY Name ASC", [$fakultaets_id]);
-    }
-
-    /**
-     * returns an array of all institutes ordered by faculties and name
-     * @return array
-     */
-    public static function getInstitutes()
-    {
-        $db = DBManager::get();
-        $result = $db->query("SELECT Institute.Institut_id, Institute.Name, IF(Institute.Institut_id=Institute.fakultaets_id,1,0) AS is_fak " .
-                "FROM Institute " .
-                    "LEFT JOIN Institute as fakultaet ON (Institute.fakultaets_id = fakultaet.Institut_id) " .
-                "ORDER BY fakultaet.Name ASC, is_fak DESC, Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
-        return $result;
-    }
-
-    /**
-     * returns an array of all institutes to which the given user belongs,
-     * ordered by faculties and name. The user role for each institute is included
-     *
-     * @param string $user_id if omitted, the current user is used
-     *
-     * @return array
-     */
-    public static function getMyInstitutes($user_id = NULL)
-    {
-        global $perm, $user;
-        if (!$user_id) {
-            $user_id = $user->id;
-        }
-        $db = DBManager::get();
-        if (!$perm->have_perm("admin", $user_id)) {
-            $result = $db->query("SELECT user_inst.Institut_id, Institute.Name, Institute.fakultaets_id, IF(user_inst.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, user_inst.inst_perms " .
-                "FROM user_inst " .
-                    "LEFT JOIN Institute USING (institut_id) " .
-                "WHERE (user_id = ".$db->quote($user_id)." " .
-                    "AND (inst_perms = 'dozent' OR inst_perms = 'tutor')) " .
-                "ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
-        } else if (!$perm->have_perm("root", $user_id)) {
-            $result = $db->query("SELECT user_inst.Institut_id, Institute.Name, Institute.fakultaets_id, IF(user_inst.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, user_inst.inst_perms " .
-                "FROM user_inst " .
-                    "LEFT JOIN Institute USING (institut_id) " .
-                "WHERE (user_id = ".$db->quote($user_id)." AND inst_perms = 'admin') " .
-                "ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
-            if ($perm->is_fak_admin($user_id)) {
-                foreach($result as $fak) {
-                    $combined_result[] = $fak;
-                    $institutes = $db->query("SELECT Institut_id, Name, fakultaets_id, 0 as is_fak, 'admin' as inst_perms
-                                              FROM Institute WHERE Institut_id <> fakultaets_id AND fakultaets_id = " . $db->quote($fak['Institut_id'])
-                                             . " ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
-                    $combined_result = array_merge($combined_result, $institutes);
-                }
-                $result = $combined_result;
-            }
-
-        } else {
-            $result = $db->query("SELECT Institute.Institut_id, Institute.Name, Institute.fakultaets_id, IF(Institute.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, 'admin' AS inst_perms " .
-                "FROM Institute " .
-                    "LEFT JOIN Institute as fakultaet ON (Institute.fakultaets_id = fakultaet.Institut_id) " .
-                "ORDER BY fakultaet.Name ASC, is_fak DESC, Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
-        }
-        return $result;
-    }
-
-    public function isFaculty()
-    {
-        return $this->fakultaets_id === $this->institut_id;
-    }
-
-    /**
-     * Returns the full name of an institute.
-     *
-     * @param string formatting template name
-     * @return string Fullname
-     */
-    public function getFullName($format = 'default'): string
-    {
-        $template['type-name'] = '%2$s: %1$s';
-        if ($format === 'default' || !isset($template[$format])) {
-           $format = 'type-name';
-        }
-        $type = $GLOBALS['INST_TYPE'][$this['type']]['name'];
-        if (!$type) {
-            $type = _('Einrichtung');
-        }
-        $data[0] = $this['name'];
-        $data[1] = $type;
-        return trim(vsprintf($template[$format], array_map('trim', $data)));
-    }
-
-    /**
-     * Returns a descriptive text for the range type.
-     *
-     * @return string
-     */
-    public function describeRange(): string
-    {
-        return _('Einrichtung');
-    }
-
-    /**
-     * Returns a unique identificator for the range type.
-     *
-     * @return string
-     */
-    public function getRangeType(): string
-    {
-        return 'institute';
-    }
-
-    /**
-     * Returns the id of the current range
-     *
-     * @return mixed (string|int)
-     */
-    public function getRangeId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfiguration()
-    {
-        return InstituteConfig::get($this);
-    }
-
-    /**
-     * Decides whether the user may access the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     * @todo Check permissions
-     */
-    public function isAccessibleToUser($user_id = null): bool
-    {
-        return true;
-    }
-
-    /**
-     * Decides whether the user may edit/alter the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     * @todo Check permissions
-     */
-    public function isEditableByUser($user_id = null): bool
-    {
-        if ($user_id === null) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        $member = $this->members->findOneBy('user_id', $user_id);
-        return ($member && in_array($member->inst_perms, ['tutor', 'dozent', 'admin']))
-            || User::find($user_id)->perms === 'root';
-    }
-
-    /**
-     * @return SemClass
-     */
-    public function getSemClass()
-    {
-        return SemClass::getDefaultInstituteClass($this->type);
-    }
-
-    /**
-     *
-     */
-    public function setDefaultTools()
-    {
-       $this->tools = [];
-       foreach (array_values($this->getSemClass()->getActivatedModuleObjects()) as $module) {
-           PluginManager::getInstance()->setPluginActivated($module->getPluginId(), $this->id, true);
-           $this->tools[] = ToolActivation::find([$this->id, $module->getPluginId()]);
-       }
-    }
-
-    /**
-     * @param $name string name of tool / plugin
-     * @return bool
-     */
-    public function isToolActive($name): bool
-    {
-        $plugin = PluginEngine::getPlugin($name);
-        return $plugin && $this->tools->findOneby('plugin_id', $plugin->getPluginId());
-    }
-
-    /**
-     * returns all activated plugins/modules for this course
-     * @return StudipModule[]
-     */
-    public function getActivatedTools()
-    {
-        return array_filter($this->tools->getStudipModule());
-    }
-
-
-    /**
-     * @see Range::__toString()
-     */
-    public function __toString() : string
-    {
-        return $this->getFullName();
-    }
-}
diff --git a/lib/models/Institute.php b/lib/models/Institute.php
new file mode 100644
index 0000000..47cf271
--- /dev/null
+++ b/lib/models/Institute.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * Institute.class.php - model class for table Institute
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse <fuhse@data-quest>
+ * @author      Suchi & Berg GmbH <info@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.0
+ *
+ * @property string $id alias column for institut_id
+ * @property string $institut_id database column
+ * @property I18NString $name database column
+ * @property string $fakultaets_id database column
+ * @property string $strasse database column
+ * @property string $plz database column
+ * @property I18NString $url database column
+ * @property string $telefon database column
+ * @property string $email database column
+ * @property string $fax database column
+ * @property int $type database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property string|null $lit_plugin_name database column
+ * @property int $srienabled database column
+ * @property string $lock_rule database column
+ * @property SimpleORMapCollection|InstituteMember[] $members has_many InstituteMember
+ * @property SimpleORMapCollection|Course[] $home_courses has_many Course
+ * @property SimpleORMapCollection|Institute[] $sub_institutes has_many Institute
+ * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
+ * @property SimpleORMapCollection|StudipScmEntry[] $scm has_many StudipScmEntry
+ * @property SimpleORMapCollection|Statusgruppen[] $status_groups has_many Statusgruppen
+ * @property SimpleORMapCollection|BlubberThread[] $blubberthreads has_many BlubberThread
+ * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock
+ * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility
+ * @property SimpleORMapCollection|ToolActivation[] $tools has_many ToolActivation
+ * @property Institute $faculty belongs_to Institute
+ * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course
+ * @property-read mixed $is_fak additional field
+ * @property-read mixed $all_status_groups additional field
+ */
+
+class Institute extends SimpleORMap implements Range
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'Institute';
+        $config['additional_fields']['is_fak']['get'] = 'isFaculty';
+
+        $config['has_many']['members'] = [
+            'class_name' => InstituteMember::class,
+            'assoc_func' => 'findByInstitute',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+        ];
+        $config['has_many']['home_courses'] = [
+            'class_name' => Course::class,
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+        ];
+        $config['has_many']['sub_institutes'] = [
+            'class_name' => Institute::class,
+            'assoc_foreign_key' => 'fakultaets_id',
+            'assoc_func' => 'findByFaculty',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+        ];
+        $config['has_many']['datafields'] = [
+            'class_name' => DatafieldEntryModel::class,
+            'assoc_foreign_key' =>
+                function($model,$params) {
+                    $model->setValue('range_id', $params[0]->id);
+                },
+            'assoc_func' => 'findByModel',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+            'foreign_key' =>
+                function($i) {
+                    return [$i];
+                }
+        ];
+        $config['belongs_to']['faculty'] = [
+            'class_name' => Institute::class,
+            'foreign_key' => 'fakultaets_id',
+        ];
+        $config['has_and_belongs_to_many']['courses'] = [
+            'class_name' => Course::class,
+            'thru_table' => 'seminar_inst',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+        ];
+        $config['has_many']['scm'] = [
+            'class_name'        => StudipScmEntry::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_many']['status_groups'] = [
+            'class_name'        => Statusgruppen::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+            'order_by'          => 'ORDER BY position ASC',
+        ];
+        $config['has_many']['blubberthreads'] = [
+            'class_name' => BlubberThread::class,
+            'assoc_func' => 'findByInstitut',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['consultation_blocks'] = [
+            'class_name'        => ConsultationBlock::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+        ];
+        $config['has_many']['consultation_responsibilities'] = [
+            'class_name'        => ConsultationResponsibility::class,
+            'assoc_func'        => 'findByInstituteId',
+            'on_delete'         => 'delete',
+        ];
+        $config['has_many']['tools'] = [
+            'class_name'        => ToolActivation::class,
+            'assoc_foreign_key' => 'range_id',
+            'order_by'          => 'ORDER BY position',
+            'on_delete'         => 'delete',
+        ];
+        $config['additional_fields']['all_status_groups']['get'] = function ($institute) {
+            return Statusgruppen::findAllByRangeId($institute->id, true);
+        };
+
+        $config['i18n_fields'] = ['name', 'url'];
+        $config['registered_callbacks']['after_create'][] = 'setDefaultTools';
+
+        parent::configure($config);
+    }
+
+    /**
+    * Returns the currently active course or false if none is active.
+    *
+    * @return Institute object of currently active institute
+    * @since 3.0
+    */
+    public static function findCurrent()
+    {
+        if (Context::isInstitute()) {
+            return Context::get();
+        }
+        return null;
+    }
+
+    /**
+     * returns array of instances of Institutes belonging to given faculty
+     * @param string $fakultaets_id
+     * @return array
+     */
+    public static function findByFaculty($fakultaets_id)
+    {
+        return self::findBySQL("fakultaets_id=? AND fakultaets_id <> institut_id ORDER BY Name ASC", [$fakultaets_id]);
+    }
+
+    /**
+     * returns an array of all institutes ordered by faculties and name
+     * @return array
+     */
+    public static function getInstitutes()
+    {
+        $db = DBManager::get();
+        $result = $db->query("SELECT Institute.Institut_id, Institute.Name, IF(Institute.Institut_id=Institute.fakultaets_id,1,0) AS is_fak " .
+                "FROM Institute " .
+                    "LEFT JOIN Institute as fakultaet ON (Institute.fakultaets_id = fakultaet.Institut_id) " .
+                "ORDER BY fakultaet.Name ASC, is_fak DESC, Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
+        return $result;
+    }
+
+    /**
+     * returns an array of all institutes to which the given user belongs,
+     * ordered by faculties and name. The user role for each institute is included
+     *
+     * @param string $user_id if omitted, the current user is used
+     *
+     * @return array
+     */
+    public static function getMyInstitutes($user_id = NULL)
+    {
+        global $perm, $user;
+        if (!$user_id) {
+            $user_id = $user->id;
+        }
+        $db = DBManager::get();
+        if (!$perm->have_perm("admin", $user_id)) {
+            $result = $db->query("SELECT user_inst.Institut_id, Institute.Name, Institute.fakultaets_id, IF(user_inst.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, user_inst.inst_perms " .
+                "FROM user_inst " .
+                    "LEFT JOIN Institute USING (institut_id) " .
+                "WHERE (user_id = ".$db->quote($user_id)." " .
+                    "AND (inst_perms = 'dozent' OR inst_perms = 'tutor')) " .
+                "ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
+        } else if (!$perm->have_perm("root", $user_id)) {
+            $result = $db->query("SELECT user_inst.Institut_id, Institute.Name, Institute.fakultaets_id, IF(user_inst.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, user_inst.inst_perms " .
+                "FROM user_inst " .
+                    "LEFT JOIN Institute USING (institut_id) " .
+                "WHERE (user_id = ".$db->quote($user_id)." AND inst_perms = 'admin') " .
+                "ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
+            if ($perm->is_fak_admin($user_id)) {
+                foreach($result as $fak) {
+                    $combined_result[] = $fak;
+                    $institutes = $db->query("SELECT Institut_id, Name, fakultaets_id, 0 as is_fak, 'admin' as inst_perms
+                                              FROM Institute WHERE Institut_id <> fakultaets_id AND fakultaets_id = " . $db->quote($fak['Institut_id'])
+                                             . " ORDER BY Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
+                    $combined_result = array_merge($combined_result, $institutes);
+                }
+                $result = $combined_result;
+            }
+
+        } else {
+            $result = $db->query("SELECT Institute.Institut_id, Institute.Name, Institute.fakultaets_id, IF(Institute.Institut_id=Institute.fakultaets_id,1,0) AS is_fak, 'admin' AS inst_perms " .
+                "FROM Institute " .
+                    "LEFT JOIN Institute as fakultaet ON (Institute.fakultaets_id = fakultaet.Institut_id) " .
+                "ORDER BY fakultaet.Name ASC, is_fak DESC, Institute.Name ASC")->fetchAll(PDO::FETCH_ASSOC);
+        }
+        return $result;
+    }
+
+    public function isFaculty()
+    {
+        return $this->fakultaets_id === $this->institut_id;
+    }
+
+    /**
+     * Returns the full name of an institute.
+     *
+     * @param string formatting template name
+     * @return string Fullname
+     */
+    public function getFullName($format = 'default'): string
+    {
+        $template['type-name'] = '%2$s: %1$s';
+        if ($format === 'default' || !isset($template[$format])) {
+           $format = 'type-name';
+        }
+        $type = $GLOBALS['INST_TYPE'][$this['type']]['name'];
+        if (!$type) {
+            $type = _('Einrichtung');
+        }
+        $data[0] = $this['name'];
+        $data[1] = $type;
+        return trim(vsprintf($template[$format], array_map('trim', $data)));
+    }
+
+    /**
+     * Returns a descriptive text for the range type.
+     *
+     * @return string
+     */
+    public function describeRange(): string
+    {
+        return _('Einrichtung');
+    }
+
+    /**
+     * Returns a unique identificator for the range type.
+     *
+     * @return string
+     */
+    public function getRangeType(): string
+    {
+        return 'institute';
+    }
+
+    /**
+     * Returns the id of the current range
+     *
+     * @return mixed (string|int)
+     */
+    public function getRangeId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfiguration()
+    {
+        return InstituteConfig::get($this);
+    }
+
+    /**
+     * Decides whether the user may access the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     * @todo Check permissions
+     */
+    public function isAccessibleToUser($user_id = null): bool
+    {
+        return true;
+    }
+
+    /**
+     * Decides whether the user may edit/alter the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     * @todo Check permissions
+     */
+    public function isEditableByUser($user_id = null): bool
+    {
+        if ($user_id === null) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        $member = $this->members->findOneBy('user_id', $user_id);
+        return ($member && in_array($member->inst_perms, ['tutor', 'dozent', 'admin']))
+            || User::find($user_id)->perms === 'root';
+    }
+
+    /**
+     * @return SemClass
+     */
+    public function getSemClass()
+    {
+        return SemClass::getDefaultInstituteClass($this->type);
+    }
+
+    /**
+     *
+     */
+    public function setDefaultTools()
+    {
+       $this->tools = [];
+       foreach (array_values($this->getSemClass()->getActivatedModuleObjects()) as $module) {
+           PluginManager::getInstance()->setPluginActivated($module->getPluginId(), $this->id, true);
+           $this->tools[] = ToolActivation::find([$this->id, $module->getPluginId()]);
+       }
+    }
+
+    /**
+     * @param $name string name of tool / plugin
+     * @return bool
+     */
+    public function isToolActive($name): bool
+    {
+        $plugin = PluginEngine::getPlugin($name);
+        return $plugin && $this->tools->findOneby('plugin_id', $plugin->getPluginId());
+    }
+
+    /**
+     * returns all activated plugins/modules for this course
+     * @return StudipModule[]
+     */
+    public function getActivatedTools()
+    {
+        return array_filter($this->tools->getStudipModule());
+    }
+
+
+    /**
+     * @see Range::__toString()
+     */
+    public function __toString() : string
+    {
+        return $this->getFullName();
+    }
+}
diff --git a/lib/models/InstituteMember.class.php b/lib/models/InstituteMember.class.php
deleted file mode 100644
index ec1c026..0000000
--- a/lib/models/InstituteMember.class.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * InstituteMember
- * model class for table user_inst
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property int $id database column
- * @property string $user_id database column
- * @property string $institut_id database column
- * @property string $inst_perms database column
- * @property I18NString $sprechzeiten database column
- * @property I18NString $raum database column
- * @property I18NString $telefon database column
- * @property I18NString $fax database column
- * @property int $externdefault database column
- * @property int $priority database column
- * @property int $visible database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
- * @property User $user belongs_to User
- * @property Institute $institute belongs_to Institute
- * @property mixed $vorname additional field
- * @property mixed $nachname additional field
- * @property mixed $username additional field
- * @property mixed $email additional field
- * @property mixed $title_front additional field
- * @property mixed $title_rear additional field
- * @property mixed $user_info additional field
- * @property mixed $institute_name additional field
- */
-class InstituteMember extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'user_inst';
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['institute'] = [
-            'class_name' => Institute::class,
-            'foreign_key' => 'institut_id',
-        ];
-        $config['has_many']['datafields'] = [
-            'class_name' => DatafieldEntryModel::class,
-            'assoc_foreign_key' =>
-                function($model, $params) {
-                    $model->setValue('range_id', $params[0]->user_id);
-                    $model->setValue('sec_range_id', $params[0]->institut_id);
-                },
-            'assoc_func' => 'findByModel',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-            'foreign_key' =>
-                function($institute_member) {
-                    return [$institute_member];
-                }
-        ];
-
-        $config['additional_fields']['vorname']     = ['user', 'vorname'];
-        $config['additional_fields']['nachname']    = ['user', 'nachname'];
-        $config['additional_fields']['username']    = ['user', 'username'];
-        $config['additional_fields']['email']       = ['user', 'email'];
-        $config['additional_fields']['title_front'] = ['user', 'title_front'];
-        $config['additional_fields']['title_rear']  = ['user', 'title_rear'];
-        $config['additional_fields']['user_info']   = ['user', 'info'];
-
-        $config['additional_fields']['institute_name'] = [];
-
-        $config['i18n_fields']['raum'] = true;
-        $config['i18n_fields']['sprechzeiten'] = true;
-        $config['i18n_fields']['telefon'] = true;
-        $config['i18n_fields']['fax'] = true;
-
-        $config['registered_callbacks']['after_delete'][] = function ($member) {
-            $institute = $member->institute;
-            $user_id   = $member->user_id;
-
-            if ($institute) {
-                $institute->status_groups->removeUser($user_id, true);
-            }
-        };
-
-        parent::configure($config);
-    }
-
-    public static function findByInstitute($institute_id)
-    {
-        $query = "SELECT user_inst.*, aum.Vorname, aum.Nachname, aum.Email,
-                         aum.username, ui.title_front, ui.title_rear
-                  FROM user_inst
-                  LEFT JOIN auth_user_md5 aum USING (user_id)
-                  LEFT JOIN user_info ui USING (user_id)
-                  WHERE institut_id = ?
-                    AND inst_perms <> 'user'
-                  ORDER BY inst_perms, Nachname, Vorname";
-        return DBManager::get()->fetchAll(
-            $query,
-            [$institute_id],
-            __CLASS__ . '::buildExisting'
-        );
-    }
-
-    public static function findByInstituteAndStatus($institute_id, $status)
-    {
-        $query = "SELECT user_inst.*, aum.Vorname, aum.Nachname, aum.Email,
-                         aum.username, ui.title_front, ui.title_rear
-                  FROM user_inst
-                  LEFT JOIN auth_user_md5 aum USING (user_id)
-                  LEFT JOIN user_info ui USING (user_id)
-                  WHERE institut_id = ?
-                    AND user_inst.inst_perms IN (?)
-                  ORDER BY inst_perms, Nachname, Vorname";
-        return DBManager::get()->fetchAll(
-            $query,
-            [$institute_id, is_array($status) ? $status : words($status)],
-            __CLASS__ . '::buildExisting'
-        );
-    }
-
-    public static function findByUser($user_id)
-    {
-        $query = "SELECT user_inst.*, Institute.Name AS institute_name
-                  FROM user_inst
-                  JOIN Institute USING (institut_id)
-                  WHERE user_id = ?
-                  ORDER BY priority, Institute.Name";
-        return DBManager::get()->fetchAll(
-            $query,
-            [$user_id],
-            __CLASS__ . '::buildExisting'
-        );
-    }
-
-    /**
-     * Finds an institute membership by user and institute id.
-     *
-     * @param string $user_id
-     * @param string $institute_id
-     * @return InstituteMember|null
-     */
-    public static function findByUserAndInstitute($user_id, $institute_id)
-    {
-        return self::findOneBySQL('user_id = ? AND institut_id = ?', [$user_id, $institute_id]);
-    }
-
-    public function getUserFullname($format = 'full')
-    {
-        return User::build(array_merge(
-            ['motto' => ''],
-            $this->toArray('vorname nachname username title_front title_rear')
-        ))->getFullName($format);
-    }
-
-    /**
-     * Returns the id of the default institute for a user or false if none is set.
-     *
-     * @param string $user_id Id of the user
-     * @return string institute id or bool false
-     */
-    public static function getDefaultInstituteIdForUser($user_id)
-    {
-        $institute = self::findOneBySQL(
-            "user_id = ? AND inst_perms != 'user' AND externdefault = 1",
-            [$user_id]
-        );
-        return $institute ? $institute->institut_id : false;
-    }
-
-    /**
-     * Returns the id of the default institute for a user or false if none is set.
-     *
-     * @param string $user_id Id of the user
-     * @return bool true if institute was updated, false otherwise
-     */
-    public static function ensureDefaultInstituteForUser($user_id)
-    {
-        $institute = self::findOneBySQL(
-            "user_id = ? AND inst_perms != 'user' ORDER BY externdefault = 1 DESC, priority",
-            [$user_id]
-        );
-        if (!$institute || $institute->externdefault) {
-            return false;
-        }
-
-        $institute->externdefault = true;
-        $institute->store();
-
-        return true;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL('user_id = ?', [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Einrichtungs Informationen'), 'user_inst', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/InstituteMember.php b/lib/models/InstituteMember.php
new file mode 100644
index 0000000..ec1c026
--- /dev/null
+++ b/lib/models/InstituteMember.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * InstituteMember
+ * model class for table user_inst
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property int $id database column
+ * @property string $user_id database column
+ * @property string $institut_id database column
+ * @property string $inst_perms database column
+ * @property I18NString $sprechzeiten database column
+ * @property I18NString $raum database column
+ * @property I18NString $telefon database column
+ * @property I18NString $fax database column
+ * @property int $externdefault database column
+ * @property int $priority database column
+ * @property int $visible database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
+ * @property User $user belongs_to User
+ * @property Institute $institute belongs_to Institute
+ * @property mixed $vorname additional field
+ * @property mixed $nachname additional field
+ * @property mixed $username additional field
+ * @property mixed $email additional field
+ * @property mixed $title_front additional field
+ * @property mixed $title_rear additional field
+ * @property mixed $user_info additional field
+ * @property mixed $institute_name additional field
+ */
+class InstituteMember extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'user_inst';
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['institute'] = [
+            'class_name' => Institute::class,
+            'foreign_key' => 'institut_id',
+        ];
+        $config['has_many']['datafields'] = [
+            'class_name' => DatafieldEntryModel::class,
+            'assoc_foreign_key' =>
+                function($model, $params) {
+                    $model->setValue('range_id', $params[0]->user_id);
+                    $model->setValue('sec_range_id', $params[0]->institut_id);
+                },
+            'assoc_func' => 'findByModel',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+            'foreign_key' =>
+                function($institute_member) {
+                    return [$institute_member];
+                }
+        ];
+
+        $config['additional_fields']['vorname']     = ['user', 'vorname'];
+        $config['additional_fields']['nachname']    = ['user', 'nachname'];
+        $config['additional_fields']['username']    = ['user', 'username'];
+        $config['additional_fields']['email']       = ['user', 'email'];
+        $config['additional_fields']['title_front'] = ['user', 'title_front'];
+        $config['additional_fields']['title_rear']  = ['user', 'title_rear'];
+        $config['additional_fields']['user_info']   = ['user', 'info'];
+
+        $config['additional_fields']['institute_name'] = [];
+
+        $config['i18n_fields']['raum'] = true;
+        $config['i18n_fields']['sprechzeiten'] = true;
+        $config['i18n_fields']['telefon'] = true;
+        $config['i18n_fields']['fax'] = true;
+
+        $config['registered_callbacks']['after_delete'][] = function ($member) {
+            $institute = $member->institute;
+            $user_id   = $member->user_id;
+
+            if ($institute) {
+                $institute->status_groups->removeUser($user_id, true);
+            }
+        };
+
+        parent::configure($config);
+    }
+
+    public static function findByInstitute($institute_id)
+    {
+        $query = "SELECT user_inst.*, aum.Vorname, aum.Nachname, aum.Email,
+                         aum.username, ui.title_front, ui.title_rear
+                  FROM user_inst
+                  LEFT JOIN auth_user_md5 aum USING (user_id)
+                  LEFT JOIN user_info ui USING (user_id)
+                  WHERE institut_id = ?
+                    AND inst_perms <> 'user'
+                  ORDER BY inst_perms, Nachname, Vorname";
+        return DBManager::get()->fetchAll(
+            $query,
+            [$institute_id],
+            __CLASS__ . '::buildExisting'
+        );
+    }
+
+    public static function findByInstituteAndStatus($institute_id, $status)
+    {
+        $query = "SELECT user_inst.*, aum.Vorname, aum.Nachname, aum.Email,
+                         aum.username, ui.title_front, ui.title_rear
+                  FROM user_inst
+                  LEFT JOIN auth_user_md5 aum USING (user_id)
+                  LEFT JOIN user_info ui USING (user_id)
+                  WHERE institut_id = ?
+                    AND user_inst.inst_perms IN (?)
+                  ORDER BY inst_perms, Nachname, Vorname";
+        return DBManager::get()->fetchAll(
+            $query,
+            [$institute_id, is_array($status) ? $status : words($status)],
+            __CLASS__ . '::buildExisting'
+        );
+    }
+
+    public static function findByUser($user_id)
+    {
+        $query = "SELECT user_inst.*, Institute.Name AS institute_name
+                  FROM user_inst
+                  JOIN Institute USING (institut_id)
+                  WHERE user_id = ?
+                  ORDER BY priority, Institute.Name";
+        return DBManager::get()->fetchAll(
+            $query,
+            [$user_id],
+            __CLASS__ . '::buildExisting'
+        );
+    }
+
+    /**
+     * Finds an institute membership by user and institute id.
+     *
+     * @param string $user_id
+     * @param string $institute_id
+     * @return InstituteMember|null
+     */
+    public static function findByUserAndInstitute($user_id, $institute_id)
+    {
+        return self::findOneBySQL('user_id = ? AND institut_id = ?', [$user_id, $institute_id]);
+    }
+
+    public function getUserFullname($format = 'full')
+    {
+        return User::build(array_merge(
+            ['motto' => ''],
+            $this->toArray('vorname nachname username title_front title_rear')
+        ))->getFullName($format);
+    }
+
+    /**
+     * Returns the id of the default institute for a user or false if none is set.
+     *
+     * @param string $user_id Id of the user
+     * @return string institute id or bool false
+     */
+    public static function getDefaultInstituteIdForUser($user_id)
+    {
+        $institute = self::findOneBySQL(
+            "user_id = ? AND inst_perms != 'user' AND externdefault = 1",
+            [$user_id]
+        );
+        return $institute ? $institute->institut_id : false;
+    }
+
+    /**
+     * Returns the id of the default institute for a user or false if none is set.
+     *
+     * @param string $user_id Id of the user
+     * @return bool true if institute was updated, false otherwise
+     */
+    public static function ensureDefaultInstituteForUser($user_id)
+    {
+        $institute = self::findOneBySQL(
+            "user_id = ? AND inst_perms != 'user' ORDER BY externdefault = 1 DESC, priority",
+            [$user_id]
+        );
+        if (!$institute || $institute->externdefault) {
+            return false;
+        }
+
+        $institute->externdefault = true;
+        $institute->store();
+
+        return true;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL('user_id = ?', [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Einrichtungs Informationen'), 'user_inst', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/InstitutePlanColumn.class.php b/lib/models/InstitutePlanColumn.class.php
deleted file mode 100644
index b5ec876..0000000
--- a/lib/models/InstitutePlanColumn.class.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * InstitutePlanColumn
- * model class for table institute_plan_columns
- *
- * 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.
- *
- * @author  Timo Hartge <hartge@data-quest.de>
- * @license GPL2 or any version
- * @since   Stud.IP 4.5
- * *
- *
- * @property array $id alias for pk
- * @property string $range_id database column
- * @property int $column database column
- * @property string|null $name database column
- * @property int $visible database column
- * @property int $mkdate database column
- * @property int $chdate database column
- */
-class InstitutePlanColumn extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'institute_plan_columns';
-        parent::configure($config);
-    }
-
-    public static function findByInstitute($institute_id)
-    {
-        return self::findBySQL('range_id=?', [$institute_id]);
-    }
-
-    /**
-     * returns the last column for given institute
-     *
-     * @param string $institut_id
-     *
-     * @return InstitutePlanColumn last column
-     */
-    public static function getLastColumnOfInstitute($institute_id)
-    {
-        return self::findOneBySQL('range_id=? ORDER BY `column` DESC', [$institute_id]);
-    }
-
-    /**
-     * Sets the visibility of multiple columns for given institute
-     *
-     * @param string $institut_id
-     * @param array $columns_change column number to be changed
-     * @param int $visibility 0 or 1
-     *
-     * @return int number of changes
-     */
-    public static function setVisbilities($institute_id, $columns_change, $visibility)
-    {
-        $changes = 0;
-        foreach (self::findBySQL('range_id=?', [$institute_id]) as $plan_column) {
-            if (in_array($plan_column->column, $columns_change)) {
-                $plan_column->visible = $visibility;
-                if ($plan_column->store()) {
-                    $changes++;
-                }
-            }
-        }
-        return $changes;
-    }
-
-}
diff --git a/lib/models/InstitutePlanColumn.php b/lib/models/InstitutePlanColumn.php
new file mode 100644
index 0000000..b5ec876
--- /dev/null
+++ b/lib/models/InstitutePlanColumn.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * InstitutePlanColumn
+ * model class for table institute_plan_columns
+ *
+ * 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.
+ *
+ * @author  Timo Hartge <hartge@data-quest.de>
+ * @license GPL2 or any version
+ * @since   Stud.IP 4.5
+ * *
+ *
+ * @property array $id alias for pk
+ * @property string $range_id database column
+ * @property int $column database column
+ * @property string|null $name database column
+ * @property int $visible database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ */
+class InstitutePlanColumn extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'institute_plan_columns';
+        parent::configure($config);
+    }
+
+    public static function findByInstitute($institute_id)
+    {
+        return self::findBySQL('range_id=?', [$institute_id]);
+    }
+
+    /**
+     * returns the last column for given institute
+     *
+     * @param string $institut_id
+     *
+     * @return InstitutePlanColumn last column
+     */
+    public static function getLastColumnOfInstitute($institute_id)
+    {
+        return self::findOneBySQL('range_id=? ORDER BY `column` DESC', [$institute_id]);
+    }
+
+    /**
+     * Sets the visibility of multiple columns for given institute
+     *
+     * @param string $institut_id
+     * @param array $columns_change column number to be changed
+     * @param int $visibility 0 or 1
+     *
+     * @return int number of changes
+     */
+    public static function setVisbilities($institute_id, $columns_change, $visibility)
+    {
+        $changes = 0;
+        foreach (self::findBySQL('range_id=?', [$institute_id]) as $plan_column) {
+            if (in_array($plan_column->column, $columns_change)) {
+                $plan_column->visible = $visibility;
+                if ($plan_column->store()) {
+                    $changes++;
+                }
+            }
+        }
+        return $changes;
+    }
+
+}
diff --git a/lib/models/Kategorie.class.php b/lib/models/Kategorie.class.php
deleted file mode 100644
index a43629f..0000000
--- a/lib/models/Kategorie.class.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Kategorie model
- *
- * 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.
- *
- * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- *
- * @property string $id alias column for kategorie_id
- * @property string $kategorie_id database column
- * @property string $range_id database column
- * @property I18NString $name database column
- * @property I18NString $content database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $priority database column
- * @property User $user belongs_to User
- */
-
-class Kategorie extends SimpleORMap
-{
-    /**
-     * Configures the model.
-     *
-     * @param array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'kategorien';
-
-        $config['belongs_to'] = [
-            'user' => [
-                'class_name'  => User::class,
-                'foreign_key' => 'range_id',
-            ],
-        ];
-
-        $config['i18n_fields'] = [
-            'name' => true,
-            'content' => true,
-        ];
-
-        parent::configure($config);
-    }
-
-    /**
-     * Finds all categories of a specific user
-     *
-     * @param string $user_id Id of the user
-     * @return Kategorie[] of category objects
-     */
-    public static function findByUserId(string $user_id): array
-    {
-        return self::findByRange_id($user_id, 'ORDER BY priority');
-    }
-
-    /**
-     * Increases all category priorities of a user
-     *
-     * @param string $user_id Id of the user
-     * @return bool indicating if anything has changed
-     */
-    public static function increasePrioritiesByUserId(string $user_id): bool
-    {
-        $query = "UPDATE kategorien SET priority = priority + 1 WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_id]);
-        return $statement->rowCount() > 0;
-    }
-}
diff --git a/lib/models/Kategorie.php b/lib/models/Kategorie.php
new file mode 100644
index 0000000..a43629f
--- /dev/null
+++ b/lib/models/Kategorie.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Kategorie model
+ *
+ * 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.
+ *
+ * @author      Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ *
+ * @property string $id alias column for kategorie_id
+ * @property string $kategorie_id database column
+ * @property string $range_id database column
+ * @property I18NString $name database column
+ * @property I18NString $content database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $priority database column
+ * @property User $user belongs_to User
+ */
+
+class Kategorie extends SimpleORMap
+{
+    /**
+     * Configures the model.
+     *
+     * @param array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'kategorien';
+
+        $config['belongs_to'] = [
+            'user' => [
+                'class_name'  => User::class,
+                'foreign_key' => 'range_id',
+            ],
+        ];
+
+        $config['i18n_fields'] = [
+            'name' => true,
+            'content' => true,
+        ];
+
+        parent::configure($config);
+    }
+
+    /**
+     * Finds all categories of a specific user
+     *
+     * @param string $user_id Id of the user
+     * @return Kategorie[] of category objects
+     */
+    public static function findByUserId(string $user_id): array
+    {
+        return self::findByRange_id($user_id, 'ORDER BY priority');
+    }
+
+    /**
+     * Increases all category priorities of a user
+     *
+     * @param string $user_id Id of the user
+     * @return bool indicating if anything has changed
+     */
+    public static function increasePrioritiesByUserId(string $user_id): bool
+    {
+        $query = "UPDATE kategorien SET priority = priority + 1 WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_id]);
+        return $statement->rowCount() > 0;
+    }
+}
diff --git a/lib/models/LikertScale.php b/lib/models/LikertScale.php
index 833d794..3a055f3 100644
--- a/lib/models/LikertScale.php
+++ b/lib/models/LikertScale.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'lib/classes/QuestionType.interface.php';
-
 /**
  * @license GPL2 or any later version
  *
diff --git a/lib/models/LockRule.class.php b/lib/models/LockRule.class.php
deleted file mode 100644
index a3ef271..0000000
--- a/lib/models/LockRule.class.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * LockRule.class.php
- * model class for table lock_rule
- * this class represents one record of the lock_rules table
- * the column attributes is converted to an ArrayObject and vice-versa,
- * to allow array-like access
- *
- * e.g.
- * @code
- * $lockrule = LockRule::find($id);
- * $lockrule['attributes']['name'] = 1;
- * $lockrule->store();
- * @endcode
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2011 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for lock_id
- * @property string $lock_id database column
- * @property string $permission database column
- * @property string $name database column
- * @property string $description database column
- * @property JSONArrayObject $attributes database column
- * @property string $object_type database column
- * @property string $user_id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-
-class LockRule extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'lock_rules';
-
-        $config['serialized_fields']['attributes'] = JSONArrayObject::class;
-
-        parent::configure($config);
-    }
-
-    /**
-     * returns the lockrule for a course
-     *
-     * @param string $seminar_id id of a course
-     * @return LockRule
-     */
-    static function findBySeminar($seminar_id)
-    {
-        $db = DBManager::get();
-        $lock_rule_id = $db->query("SELECT lock_rule FROM seminare WHERE seminar_id = " . $db->quote($seminar_id))
-                           ->fetchColumn();
-        return self::find($lock_rule_id);
-    }
-
-    /**
-     * returns the lockrule for an institute
-     *
-     * @param string $institute_id id of an institute
-     * @return LockRule
-     */
-    static function findByInstitute($institute_id)
-    {
-        $db = DBManager::get();
-        $lock_rule_id = $db->query("SELECT lock_rule FROM Institute WHERE Institut_id = " . $db->quote($institute_id))
-                           ->fetchColumn();
-        return self::find($lock_rule_id);
-    }
-
-    /**
-     * returns the lockrule for a user
-     *
-     * @param string $user_id id of a user
-     * @return LockRule
-     */
-    static function findByUser($user_id)
-    {
-        $db = DBManager::get();
-        $lock_rule_id = $db->query("SELECT lock_rule FROM user_info WHERE user_id = " . $db->quote($user_id))
-                           ->fetchColumn();
-        return self::find($lock_rule_id);
-    }
-
-    /**
-     * returns all exisiting lockrules for a given entity type
-     *
-     * @param string $type entity type, one of [sem,inst,user]
-     * @return array of LockRule objects
-     */
-    static function findAllByType($type)
-    {
-        return self::findByObject_type($type, " ORDER BY name");
-    }
-    /**
-     * @see SimpleORMap::delete()
-     */
-    function delete()
-    {
-        $id = $this->getId();
-        $object_type = $this->object_type;
-        $ret = parent::delete();
-
-        $db = DBManager::get();
-        $tables['sem'] = 'seminare';
-        $tables['inst'] = 'Institute';
-        $tables['user'] = 'user_info';
-        $db->exec("UPDATE " . $tables[$object_type] . " SET lock_rule='' WHERE lock_rule = " . $db->quote($id));
-        return $ret;
-    }
-
-    /**
-     * returns the number of uses for this lockrule
-     *
-     * @return integer
-     */
-    function getUsage()
-    {
-        if (!$this->isNew()) {
-            $db = DBManager::get();
-            $tables['sem'] = 'seminare';
-            $tables['inst'] = 'Institute';
-            $tables['user'] = 'user_info';
-            return $db->query("SELECT COUNT(*) FROM " . $tables[$this->object_type] . " WHERE lock_rule = " . $db->quote($this->getId()))->fetchColumn();
-        } else {
-            return 0;
-        }
-    }
-}
diff --git a/lib/models/LockRule.php b/lib/models/LockRule.php
new file mode 100644
index 0000000..a3ef271
--- /dev/null
+++ b/lib/models/LockRule.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * LockRule.class.php
+ * model class for table lock_rule
+ * this class represents one record of the lock_rules table
+ * the column attributes is converted to an ArrayObject and vice-versa,
+ * to allow array-like access
+ *
+ * e.g.
+ * @code
+ * $lockrule = LockRule::find($id);
+ * $lockrule['attributes']['name'] = 1;
+ * $lockrule->store();
+ * @endcode
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2011 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for lock_id
+ * @property string $lock_id database column
+ * @property string $permission database column
+ * @property string $name database column
+ * @property string $description database column
+ * @property JSONArrayObject $attributes database column
+ * @property string $object_type database column
+ * @property string $user_id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ */
+
+class LockRule extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'lock_rules';
+
+        $config['serialized_fields']['attributes'] = JSONArrayObject::class;
+
+        parent::configure($config);
+    }
+
+    /**
+     * returns the lockrule for a course
+     *
+     * @param string $seminar_id id of a course
+     * @return LockRule
+     */
+    static function findBySeminar($seminar_id)
+    {
+        $db = DBManager::get();
+        $lock_rule_id = $db->query("SELECT lock_rule FROM seminare WHERE seminar_id = " . $db->quote($seminar_id))
+                           ->fetchColumn();
+        return self::find($lock_rule_id);
+    }
+
+    /**
+     * returns the lockrule for an institute
+     *
+     * @param string $institute_id id of an institute
+     * @return LockRule
+     */
+    static function findByInstitute($institute_id)
+    {
+        $db = DBManager::get();
+        $lock_rule_id = $db->query("SELECT lock_rule FROM Institute WHERE Institut_id = " . $db->quote($institute_id))
+                           ->fetchColumn();
+        return self::find($lock_rule_id);
+    }
+
+    /**
+     * returns the lockrule for a user
+     *
+     * @param string $user_id id of a user
+     * @return LockRule
+     */
+    static function findByUser($user_id)
+    {
+        $db = DBManager::get();
+        $lock_rule_id = $db->query("SELECT lock_rule FROM user_info WHERE user_id = " . $db->quote($user_id))
+                           ->fetchColumn();
+        return self::find($lock_rule_id);
+    }
+
+    /**
+     * returns all exisiting lockrules for a given entity type
+     *
+     * @param string $type entity type, one of [sem,inst,user]
+     * @return array of LockRule objects
+     */
+    static function findAllByType($type)
+    {
+        return self::findByObject_type($type, " ORDER BY name");
+    }
+    /**
+     * @see SimpleORMap::delete()
+     */
+    function delete()
+    {
+        $id = $this->getId();
+        $object_type = $this->object_type;
+        $ret = parent::delete();
+
+        $db = DBManager::get();
+        $tables['sem'] = 'seminare';
+        $tables['inst'] = 'Institute';
+        $tables['user'] = 'user_info';
+        $db->exec("UPDATE " . $tables[$object_type] . " SET lock_rule='' WHERE lock_rule = " . $db->quote($id));
+        return $ret;
+    }
+
+    /**
+     * returns the number of uses for this lockrule
+     *
+     * @return integer
+     */
+    function getUsage()
+    {
+        if (!$this->isNew()) {
+            $db = DBManager::get();
+            $tables['sem'] = 'seminare';
+            $tables['inst'] = 'Institute';
+            $tables['user'] = 'user_info';
+            return $db->query("SELECT COUNT(*) FROM " . $tables[$this->object_type] . " WHERE lock_rule = " . $db->quote($this->getId()))->fetchColumn();
+        } else {
+            return 0;
+        }
+    }
+}
diff --git a/lib/models/LoginBackground.class.php b/lib/models/LoginBackground.class.php
deleted file mode 100644
index 3ede275..0000000
--- a/lib/models/LoginBackground.class.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * LoginBackground.class.php
- * model class for table loginbackgrounds
- *
- * 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.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property int $id alias column for background_id
- * @property int $background_id database column
- * @property string $filename database column
- * @property int $mobile database column
- * @property int $desktop database column
- * @property int $in_release database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-class LoginBackground extends SimpleORMap
-{
-    /**
-     * Configures this model.
-     *
-     * @param Array $config
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'loginbackgrounds';
-
-        $config['registered_callbacks']['after_delete'][] = function ($pic) {
-            if (file_exists($pic->getPath())) {
-                unlink($pic->getPath());
-            }
-        };
-
-        parent::configure($config);
-    }
-
-    /**
-     * @return string The full URL to this picture.
-     */
-    public function getURL()
-    {
-        return URLHelper::getURL(
-            $GLOBALS['DYNAMIC_CONTENT_URL']
-                . self::getRelativePath()
-                . "/{$this->id}.{$this->getExtension()}",
-            null,
-            true
-        );
-    }
-
-    /**
-     * @return string the full file system path to this picture.
-     */
-    public function getPath()
-    {
-        return self::getPictureDirectory() . "/{$this->id}.{$this->getExtension()}";
-    }
-
-    /**
-     * @return int The file size in bytes.
-     */
-    public function getFilesize()
-    {
-        if (file_exists($this->getPath())) {
-            return filesize($this->getPath());
-        }
-        return false;
-    }
-
-    /**
-     * @return int The picture dimensions as provided by getimagesize.
-     */
-    public function getDimensions()
-    {
-        if (file_exists($this->getPath())) {
-            return getimagesize($this->getPath());
-        }
-        return false;
-    }
-
-    /**
-     * @return string The picture's extension
-     */
-    public function getExtension()
-    {
-        return pathinfo($this->filename, PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Provides a random picture for the given view.
-     * @param string $view one of 'desktop', 'mobile'.
-     * @return LoginBackground One of the available pictures.
-     */
-    public static function getRandomPicture($view = 'desktop')
-    {
-        if (!in_array($view, ['desktop', 'mobile'])) {
-            throw new Exception('Unknown view mode');
-        }
-
-        $pic = self::findOneBySQL("{$view} = 1 ORDER BY RAND() LIMIT 1");
-        return $pic;
-    }
-
-    /**
-     * @return string The relative path to the Stud.IP web root.
-     */
-    public static function getRelativePath()
-    {
-        return '/loginbackgrounds';
-    }
-
-    /**
-     * @return The directory where all available background pictures live.
-     */
-    public static function getPictureDirectory()
-    {
-        return $GLOBALS['DYNAMIC_CONTENT_PATH'] . self::getRelativePath();
-    }
-
-}
diff --git a/lib/models/LoginBackground.php b/lib/models/LoginBackground.php
new file mode 100644
index 0000000..3ede275
--- /dev/null
+++ b/lib/models/LoginBackground.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * LoginBackground.class.php
+ * model class for table loginbackgrounds
+ *
+ * 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.
+ *
+ * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property int $id alias column for background_id
+ * @property int $background_id database column
+ * @property string $filename database column
+ * @property int $mobile database column
+ * @property int $desktop database column
+ * @property int $in_release database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ */
+class LoginBackground extends SimpleORMap
+{
+    /**
+     * Configures this model.
+     *
+     * @param Array $config
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'loginbackgrounds';
+
+        $config['registered_callbacks']['after_delete'][] = function ($pic) {
+            if (file_exists($pic->getPath())) {
+                unlink($pic->getPath());
+            }
+        };
+
+        parent::configure($config);
+    }
+
+    /**
+     * @return string The full URL to this picture.
+     */
+    public function getURL()
+    {
+        return URLHelper::getURL(
+            $GLOBALS['DYNAMIC_CONTENT_URL']
+                . self::getRelativePath()
+                . "/{$this->id}.{$this->getExtension()}",
+            null,
+            true
+        );
+    }
+
+    /**
+     * @return string the full file system path to this picture.
+     */
+    public function getPath()
+    {
+        return self::getPictureDirectory() . "/{$this->id}.{$this->getExtension()}";
+    }
+
+    /**
+     * @return int The file size in bytes.
+     */
+    public function getFilesize()
+    {
+        if (file_exists($this->getPath())) {
+            return filesize($this->getPath());
+        }
+        return false;
+    }
+
+    /**
+     * @return int The picture dimensions as provided by getimagesize.
+     */
+    public function getDimensions()
+    {
+        if (file_exists($this->getPath())) {
+            return getimagesize($this->getPath());
+        }
+        return false;
+    }
+
+    /**
+     * @return string The picture's extension
+     */
+    public function getExtension()
+    {
+        return pathinfo($this->filename, PATHINFO_EXTENSION);
+    }
+
+    /**
+     * Provides a random picture for the given view.
+     * @param string $view one of 'desktop', 'mobile'.
+     * @return LoginBackground One of the available pictures.
+     */
+    public static function getRandomPicture($view = 'desktop')
+    {
+        if (!in_array($view, ['desktop', 'mobile'])) {
+            throw new Exception('Unknown view mode');
+        }
+
+        $pic = self::findOneBySQL("{$view} = 1 ORDER BY RAND() LIMIT 1");
+        return $pic;
+    }
+
+    /**
+     * @return string The relative path to the Stud.IP web root.
+     */
+    public static function getRelativePath()
+    {
+        return '/loginbackgrounds';
+    }
+
+    /**
+     * @return The directory where all available background pictures live.
+     */
+    public static function getPictureDirectory()
+    {
+        return $GLOBALS['DYNAMIC_CONTENT_PATH'] . self::getRelativePath();
+    }
+
+}
diff --git a/lib/models/LoginFaq.class.php b/lib/models/LoginFaq.class.php
deleted file mode 100644
index d6cad40..0000000
--- a/lib/models/LoginFaq.class.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * LoginFaq.class.php
- * model class for table login_faq
- *
- *
- *
- * 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.
- *
- * @author      Michaela Brückner <brueckner@data-quest.de>
- * @copyright   2023 data-quest
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       5.5
-*/
-class LoginFaq extends SimpleORMap
-{
-    /**
-     * @param array $config
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'login_faq';
-
-        $config['i18n_fields']['title'] = true;
-        $config['i18n_fields']['description'] = true;
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/LoginFaq.php b/lib/models/LoginFaq.php
new file mode 100644
index 0000000..d6cad40
--- /dev/null
+++ b/lib/models/LoginFaq.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * LoginFaq.class.php
+ * model class for table login_faq
+ *
+ *
+ *
+ * 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.
+ *
+ * @author      Michaela Brückner <brueckner@data-quest.de>
+ * @copyright   2023 data-quest
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       5.5
+*/
+class LoginFaq extends SimpleORMap
+{
+    /**
+     * @param array $config
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'login_faq';
+
+        $config['i18n_fields']['title'] = true;
+        $config['i18n_fields']['description'] = true;
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/MailQueueEntry.class.php b/lib/models/MailQueueEntry.class.php
deleted file mode 100644
index d0f9685..0000000
--- a/lib/models/MailQueueEntry.class.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2013  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-/**
- * Class to handle entries in the mail-queue in Stud.IP.
- * Use MailQueueEntry::add($mail, $message_id, $user_id) to add a mail to the queue
- * and MailQueueEntry::sendAll() or MailQueueEntry::sendNew() to flush the queue
- * and send the mails.
- *
- * @property string $id alias column for mail_queue_id
- * @property string $mail_queue_id database column
- * @property JSONArrayObject $mail database column
- * @property string|null $message_id database column
- * @property string|null $user_id database column
- * @property int $tries database column
- * @property int $last_try database column
- * @property int $mkdate database column
- * @property int $chdate database column
- */
-class MailQueueEntry extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'mail_queue_entries';
-
-        $config['serialized_fields']['mail'] = JSONArrayObject::class;
-
-        parent::configure($config);
-    }
-
-    /**
-     * Add an email to the queue.
-     * @param StudipMail $mail : the mailobject that should be added and sent later.
-     * @param string|null $message_id : the id of the Stud.IP internal message the
-     * mail is related to. Leave this null if it isn't related to any internal message.
-     * @param string|null $user_id : user_id of the receiver. Leave null if the
-     * receiver has no account in Stud.IP.
-     * @return MailQueueEntry : object in the mailqueue.
-     */
-    public static function add(StudipMail $mail, $message_id = null, $user_id = null)
-    {
-        $queue_entry = new self();
-        $queue_entry['mail'] = $mail->toArray();
-        $queue_entry['message_id'] = $message_id;
-        $queue_entry['user_id'] = $user_id;
-        $queue_entry['tries'] = 0;
-        $queue_entry->store();
-
-        return $queue_entry;
-    }
-
-    /**
-     * Sends all new mails in the mailqueue (which means they haven't been sent yet).
-     */
-    public static function sendNew()
-    {
-        self::findEachBySQL(function ($m) {
-            $m->send();
-        }, "tries = 0 ORDER BY mkdate");
-    }
-
-    /**
-     * Sends all mails in the mailqueue. Stud.IP will give each mail 24 tries to
-     * deliver it. If the mail could not be sent after 24 tries (which are 24
-     * hours) it will stay in the mailqueue table but won't be sent anymore.
-     * Each mail will only be tried to deliver once per hour. So if it fails
-     * Stud.IP will try again next hour.
-     *
-     * @param int $limit The maximum amount of messages to be sent.
-     * @return array An empty array if no status messages are output
-     *     or an array with status messages, one for each mail.
-     */
-    public static function sendAll($limit = null)
-    {
-        //The status messages will be returned
-        $status_messages = [];
-
-        self::findEachBySQL(function ($m) use (&$status_messages) {
-            // Reconstruct the StudipMail object
-            $mail = new StudipMail($m->mail);
-            $status_message = sprintf(
-                'sending message %1$s (sender: %2$s, %3$u recipient(s))...',
-                $m->message_id,
-                $mail->getSenderEmail(),
-                count($mail->getRecipients())
-            );
-
-            $was_sent = $m->send();
-            $status_message .= $was_sent ? 'DONE' : 'FAILURE';
-
-            if ($m->tries > 0) {
-                // If sending the message has failed at least once
-                // we add the amount of tries to the status message.
-                $status_message .= "(t={$m->tries})";
-            }
-
-            $status_messages[] = $status_message;
-        }, "tries = 0 " .
-           "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY tries, mkdate".
-           ($limit > 0 ? " LIMIT ". (int) $limit : "")
-        );
-
-        return $status_messages;
-    }
-
-    /**
-     * Sends the object in the mailqueue. If this succeeds, the object will be
-     * deleted immediately. Otherwise the field "tries" in the mailqueue table
-     * will be incremented by one.
-     *
-     * @return bool True, if the mail in the mailqueue entry could be sent,
-     *     false otherwise.
-     */
-    public function send()
-    {
-        $mail = new StudipMail($this->mail);
-
-        if ($mail->getRecipients()) {
-            $success = $mail->send();
-            if ($success) {
-                $this->delete();
-            } else {
-                $this['tries'] = $this['tries'] + 1;
-                $this['last_try'] = time();
-                $this->store();
-            }
-        } else {
-            $success = false;
-            $this->delete();
-        }
-        return $success;
-    }
-}
diff --git a/lib/models/MailQueueEntry.php b/lib/models/MailQueueEntry.php
new file mode 100644
index 0000000..d0f9685
--- /dev/null
+++ b/lib/models/MailQueueEntry.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ *  Copyright (c) 2013  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+/**
+ * Class to handle entries in the mail-queue in Stud.IP.
+ * Use MailQueueEntry::add($mail, $message_id, $user_id) to add a mail to the queue
+ * and MailQueueEntry::sendAll() or MailQueueEntry::sendNew() to flush the queue
+ * and send the mails.
+ *
+ * @property string $id alias column for mail_queue_id
+ * @property string $mail_queue_id database column
+ * @property JSONArrayObject $mail database column
+ * @property string|null $message_id database column
+ * @property string|null $user_id database column
+ * @property int $tries database column
+ * @property int $last_try database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ */
+class MailQueueEntry extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'mail_queue_entries';
+
+        $config['serialized_fields']['mail'] = JSONArrayObject::class;
+
+        parent::configure($config);
+    }
+
+    /**
+     * Add an email to the queue.
+     * @param StudipMail $mail : the mailobject that should be added and sent later.
+     * @param string|null $message_id : the id of the Stud.IP internal message the
+     * mail is related to. Leave this null if it isn't related to any internal message.
+     * @param string|null $user_id : user_id of the receiver. Leave null if the
+     * receiver has no account in Stud.IP.
+     * @return MailQueueEntry : object in the mailqueue.
+     */
+    public static function add(StudipMail $mail, $message_id = null, $user_id = null)
+    {
+        $queue_entry = new self();
+        $queue_entry['mail'] = $mail->toArray();
+        $queue_entry['message_id'] = $message_id;
+        $queue_entry['user_id'] = $user_id;
+        $queue_entry['tries'] = 0;
+        $queue_entry->store();
+
+        return $queue_entry;
+    }
+
+    /**
+     * Sends all new mails in the mailqueue (which means they haven't been sent yet).
+     */
+    public static function sendNew()
+    {
+        self::findEachBySQL(function ($m) {
+            $m->send();
+        }, "tries = 0 ORDER BY mkdate");
+    }
+
+    /**
+     * Sends all mails in the mailqueue. Stud.IP will give each mail 24 tries to
+     * deliver it. If the mail could not be sent after 24 tries (which are 24
+     * hours) it will stay in the mailqueue table but won't be sent anymore.
+     * Each mail will only be tried to deliver once per hour. So if it fails
+     * Stud.IP will try again next hour.
+     *
+     * @param int $limit The maximum amount of messages to be sent.
+     * @return array An empty array if no status messages are output
+     *     or an array with status messages, one for each mail.
+     */
+    public static function sendAll($limit = null)
+    {
+        //The status messages will be returned
+        $status_messages = [];
+
+        self::findEachBySQL(function ($m) use (&$status_messages) {
+            // Reconstruct the StudipMail object
+            $mail = new StudipMail($m->mail);
+            $status_message = sprintf(
+                'sending message %1$s (sender: %2$s, %3$u recipient(s))...',
+                $m->message_id,
+                $mail->getSenderEmail(),
+                count($mail->getRecipients())
+            );
+
+            $was_sent = $m->send();
+            $status_message .= $was_sent ? 'DONE' : 'FAILURE';
+
+            if ($m->tries > 0) {
+                // If sending the message has failed at least once
+                // we add the amount of tries to the status message.
+                $status_message .= "(t={$m->tries})";
+            }
+
+            $status_messages[] = $status_message;
+        }, "tries = 0 " .
+           "OR (last_try > (UNIX_TIMESTAMP() - 60 * 60) AND tries < 25) ORDER BY tries, mkdate".
+           ($limit > 0 ? " LIMIT ". (int) $limit : "")
+        );
+
+        return $status_messages;
+    }
+
+    /**
+     * Sends the object in the mailqueue. If this succeeds, the object will be
+     * deleted immediately. Otherwise the field "tries" in the mailqueue table
+     * will be incremented by one.
+     *
+     * @return bool True, if the mail in the mailqueue entry could be sent,
+     *     false otherwise.
+     */
+    public function send()
+    {
+        $mail = new StudipMail($this->mail);
+
+        if ($mail->getRecipients()) {
+            $success = $mail->send();
+            if ($success) {
+                $this->delete();
+            } else {
+                $this['tries'] = $this['tries'] + 1;
+                $this['last_try'] = time();
+                $this->store();
+            }
+        } else {
+            $success = false;
+            $this->delete();
+        }
+        return $success;
+    }
+}
diff --git a/lib/models/Message.class.php b/lib/models/Message.class.php
deleted file mode 100644
index 46493d6..0000000
--- a/lib/models/Message.class.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * Message.class.php
- * model class for table message
- *
- * 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.
- *
- * @author    mlunzena
- * @copyright (c) Authors
- *
- * @property string $id alias column for message_id
- * @property string $message_id database column
- * @property string $autor_id database column
- * @property string $subject database column
- * @property string $message database column
- * @property int $show_adressees database column
- * @property int $mkdate database column
- * @property string $priority database column
- * @property SimpleORMapCollection|MessageUser[] $receivers has_many MessageUser
- * @property User $author belongs_to User
- * @property MessageUser $originator has_one MessageUser
- * @property Folder $attachment_folder has_one Folder
- */
-
-class Message extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'message';
-
-        $config['belongs_to']['author'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'autor_id'
-        ];
-        $config['has_one']['originator'] = [
-            'class_name' => MessageUser::class,
-            'assoc_func' => 'findSentByMessageId',
-            'on_store' => 'store',
-            'on_delete' => 'delete'
-        ];
-        $config['has_many']['receivers'] = [
-            'class_name' => MessageUser::class,
-            'assoc_func' => 'findReceivedByMessageId',
-            'on_store' => 'store',
-            'on_delete' => 'delete'
-        ];
-        $config['has_one']['attachment_folder'] = [
-            'class_name' => Folder::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_store' => 'store',
-            'on_delete' => 'delete'
-        ];
-
-        parent::configure($config);
-    }
-
-    public static function markAllAs($user_id = null, $state_of_flag = 1)
-    {
-        PersonalNotifications::markAsReadByHTML('message_%', $user_id ?: $GLOBALS['user']->id);
-
-        $query = "UPDATE message_user
-            SET readed = :flag
-            WHERE user_id = :user_id
-            AND snd_rec = 'rec' AND deleted = 0
-            AND readed = :other_flag";
-        $statement = DBManager::get()->prepare($query);
-        return $statement->execute([
-            'user_id' => $user_id ?: $GLOBALS['user']->id,
-            'flag' => $state_of_flag ? 1 : 0,
-            'other_flag' => $state_of_flag ? 0 : 1
-        ]);
-    }
-
-    public static function getUserTags($user_id = null)
-    {
-        $query = "SELECT DISTINCT tag
-                  FROM message_tags
-                  WHERE user_id = :user_id
-                  ORDER BY tag ASC";
-        return DBManager::get()->fetchFirst($query, [
-            ':user_id' => $user_id ?: $GLOBALS['user']->id,
-        ], function ($tag) {
-            return ucfirst($tag);
-        });
-    }
-
-    public static function findNew($user_id, $receiver = true, $since = 0, $tag = null)
-    {
-        if ($tag) {
-            $messages_data = DBManager::get()->prepare("
-                SELECT message.*
-                FROM message_user
-                    INNER JOIN message ON (message_user.message_id = message.message_id)
-                    INNER JOIN message_tags ON (message_tags.message_id = message_user.message_id
-                        AND message_user.user_id = message_tags.user_id)
-                WHERE message_user.user_id = :me
-                    AND snd_rec = :sender_receiver
-                    AND message_tags.tag = :tag
-                    AND message_user.mkdate > :since
-                ORDER BY message_user.mkdate ASC
-            ");
-            $messages_data->execute([
-                'me' => $user_id,
-                'tag' => $tag,
-                'sender_receiver' => $receiver ? "rec" : "snd",
-                'since' => $since
-            ]);
-        } else {
-            $messages_data = DBManager::get()->prepare("
-                SELECT message.*
-                FROM message_user
-                    INNER JOIN message ON (message_user.message_id = message.message_id)
-                WHERE message_user.user_id = :me
-                    AND snd_rec = :sender_receiver
-                    AND message_user.mkdate > :since
-                ORDER BY message_user.mkdate ASC
-            ");
-            $messages_data->execute([
-                'me' => $user_id,
-                'sender_receiver' => $receiver ? "rec" : "snd",
-                'since' => $since
-            ]);
-        }
-        $messages_data->setFetchMode(PDO::FETCH_ASSOC);
-        $messages = [];
-        foreach ($messages_data as $data) {
-            $messages[] = Message::buildExisting($data);
-        }
-        return $messages;
-    }
-
-    public function getSender()
-    {
-        return $this->author;
-    }
-
-    public function getRecipients()
-    {
-        if ($this->relations['receivers'] === null) {
-            $sql = "SELECT user_id,vorname,nachname,username,title_front,title_rear,perms,motto
-                    FROM message_user
-                    INNER JOIN auth_user_md5 aum USING (user_id)
-                    LEFT JOIN user_info ui USING (user_id)
-                    WHERE message_id = ? AND snd_rec = 'rec'
-                    ORDER BY Nachname, Vorname";
-            $params = [$this->id];
-        } else {
-            $sql = "SELECT user_id,vorname,nachname,username,title_front,title_rear,perms,motto
-                    FROM auth_user_md5 AS aum
-                    LEFT JOIN user_info ui USING (user_id)
-                    WHERE aum.user_id IN (?)
-                    ORDER BY Nachname, Vorname";
-            $params = [$this->receivers->pluck('user_id')];
-        }
-        $db = DBManager::get();
-        return new SimpleCollection(
-            $db->fetchAll($sql,
-                             $params,
-                             function ($data) {
-                                 $user_id = $data['user_id'];
-                                 unset($data['user_id']);
-                                 $user = User::build($data);
-                                 $ret = $user->toArray('username vorname nachname');
-                                 $ret['fullname'] = $user->getFullName();
-                                 $ret['user_id'] = $user_id;
-                                 return $ret;
-                             })
-            );
-    }
-
-    public function getNumRecipients()
-    {
-        return MessageUser::countBySQL("message_id=? AND snd_rec='rec'", [$this->id]);
-    }
-
-    public function markAsRead($user_id)
-    {
-        PersonalNotifications::markAsReadByHTML('message_'.$this->getId(), $user_id);
-        return $this->markAs($user_id, 1);
-    }
-
-    public function markAsUnread($user_id)
-    {
-        return $this->markAs($user_id, 0);
-    }
-
-    private function markAs($user_id, $state_of_flag)
-    {
-        $changed = 0;
-        $mu = [];
-        if ($user_id == $this->autor_id) {
-            $mu[] = $this->originator;
-        }
-        $receiver = MessageUser::findOneBySQL("message_id = ? AND user_id = ? AND snd_rec ='rec'", [$this->id, $user_id]);
-        if ($receiver) {
-            $mu[] = $receiver;
-        }
-        foreach ($mu as $message_user) {
-            $message_user->readed = $state_of_flag;
-            $changed += $message_user->store();
-        }
-        return $changed;
-    }
-
-    public function markAsAnswered($user_id)
-    {
-        $mu = MessageUser::findOneBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd')", [$this->id, $user_id]);
-        if ($mu) {
-            $mu->answered = 1;
-            return $mu->store();
-        }
-    }
-
-    public function isRead($user_id = null)
-    {
-        $user_id || $user_id = $GLOBALS['user']->id;
-        return (bool)MessageUser::countBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd') AND readed = 1", [$this->message_id, $user_id]);
-    }
-
-    public function isAnswered($user_id = null)
-    {
-        $user_id || $user_id = $GLOBALS['user']->id;
-        return (bool)MessageUser::countBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd') AND answered = 1", [$this->message_id, $user_id]);
-    }
-
-    public static function send($sender, $recipients, $subject, $message)
-    {
-        if ($sender === 'cli') {
-            $sender = '____%system%____';
-        }
-        $messaging = new \messaging();
-        $result = $messaging->insert_message($message,
-                                             $recipients,
-                                             $sender,
-                                             time(),
-                                             $message_id = md5(uniqid('message', true)),
-                                             false, // deleted
-                                             '', // force email
-                                             $subject);
-        return $result ? self::find($message_id) : null;
-    }
-
-    public function permissionToRead($user_id = null)
-    {
-        $user_id || $user_id = $GLOBALS['user']->id;
-        return (bool) MessageUser::countBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd') AND deleted = 0", [$this->message_id, $user_id]);
-    }
-
-    /**
-     * Returns all tags for the message for the given user.
-     * @param null $user_id : user-id of the user that tags should be related. null if it's the current user.
-     * @return array of string : tags
-     */
-    public function getTags($user_id = null)
-    {
-        $query = "SELECT tag
-                  FROM message_tags
-                  WHERE message_id = :message_id AND user_id = :user_id
-                  ORDER BY tag ASC";
-        return DBManager::get()->fetchFirst($query, [
-            'message_id' => $this->id,
-            'user_id'    => $user_id ?: $GLOBALS['user']->id,
-        ], function ($tag) {
-            return ucfirst($tag);
-        });
-    }
-
-    public function addTag($tag, $user_id = null)
-    {
-        $user_id || $user_id = $GLOBALS['user']->id;
-        $statement = DBManager::get()->prepare("
-            INSERT INTO message_tags
-            SET message_id = :message_id,
-                user_id = :user_id,
-                tag = :tag,
-                mkdate = UNIX_TIMESTAMP()
-            ON DUPLICATE KEY
-                UPDATE chdate = UNIX_TIMESTAMP()
-        ");
-        return $statement->execute([
-            'message_id' => $this->getId(),
-            'user_id' => $user_id,
-            'tag' => mb_strtolower($tag)
-        ]);
-    }
-
-    public function removeTag($tag, $user_id = null)
-    {
-        $user_id || $user_id = $GLOBALS['user']->id;
-        $statement = DBManager::get()->prepare("
-            DELETE FROM message_tags
-            WHERE message_id = :message_id
-                AND user_id = :user_id
-                AND tag = :tag
-        ");
-        return $statement->execute([
-            'message_id' => $this->getId(),
-            'user_id' => $user_id,
-            'tag' => mb_strtolower($tag)
-        ]);
-    }
-
-    public function getNumAttachments()
-    {
-        return FileRef::countBySql("INNER JOIN folders ON(folders.id = folder_id) WHERE folders.range_id = ?", [$this->id]);
-    }
-
-    /**
-     * Deletes the message if all references in message_user indicate 'deleted'
-     * @return bool
-     */
-    public function removeIfOrphaned()
-    {
-        if (!MessageUser::countBySQL("message_id = ? AND snd_rec IN('rec','snd') AND deleted = 0", [$this->message_id])) {
-            return (bool)$this->delete();
-        }
-        return false;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("autor_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Nachrichten'), 'message', $field_data);
-            }
-        }
-    }
-
-}
diff --git a/lib/models/Message.php b/lib/models/Message.php
new file mode 100644
index 0000000..46493d6
--- /dev/null
+++ b/lib/models/Message.php
@@ -0,0 +1,343 @@
+<?php
+/**
+ * Message.class.php
+ * model class for table message
+ *
+ * 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.
+ *
+ * @author    mlunzena
+ * @copyright (c) Authors
+ *
+ * @property string $id alias column for message_id
+ * @property string $message_id database column
+ * @property string $autor_id database column
+ * @property string $subject database column
+ * @property string $message database column
+ * @property int $show_adressees database column
+ * @property int $mkdate database column
+ * @property string $priority database column
+ * @property SimpleORMapCollection|MessageUser[] $receivers has_many MessageUser
+ * @property User $author belongs_to User
+ * @property MessageUser $originator has_one MessageUser
+ * @property Folder $attachment_folder has_one Folder
+ */
+
+class Message extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'message';
+
+        $config['belongs_to']['author'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'autor_id'
+        ];
+        $config['has_one']['originator'] = [
+            'class_name' => MessageUser::class,
+            'assoc_func' => 'findSentByMessageId',
+            'on_store' => 'store',
+            'on_delete' => 'delete'
+        ];
+        $config['has_many']['receivers'] = [
+            'class_name' => MessageUser::class,
+            'assoc_func' => 'findReceivedByMessageId',
+            'on_store' => 'store',
+            'on_delete' => 'delete'
+        ];
+        $config['has_one']['attachment_folder'] = [
+            'class_name' => Folder::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_store' => 'store',
+            'on_delete' => 'delete'
+        ];
+
+        parent::configure($config);
+    }
+
+    public static function markAllAs($user_id = null, $state_of_flag = 1)
+    {
+        PersonalNotifications::markAsReadByHTML('message_%', $user_id ?: $GLOBALS['user']->id);
+
+        $query = "UPDATE message_user
+            SET readed = :flag
+            WHERE user_id = :user_id
+            AND snd_rec = 'rec' AND deleted = 0
+            AND readed = :other_flag";
+        $statement = DBManager::get()->prepare($query);
+        return $statement->execute([
+            'user_id' => $user_id ?: $GLOBALS['user']->id,
+            'flag' => $state_of_flag ? 1 : 0,
+            'other_flag' => $state_of_flag ? 0 : 1
+        ]);
+    }
+
+    public static function getUserTags($user_id = null)
+    {
+        $query = "SELECT DISTINCT tag
+                  FROM message_tags
+                  WHERE user_id = :user_id
+                  ORDER BY tag ASC";
+        return DBManager::get()->fetchFirst($query, [
+            ':user_id' => $user_id ?: $GLOBALS['user']->id,
+        ], function ($tag) {
+            return ucfirst($tag);
+        });
+    }
+
+    public static function findNew($user_id, $receiver = true, $since = 0, $tag = null)
+    {
+        if ($tag) {
+            $messages_data = DBManager::get()->prepare("
+                SELECT message.*
+                FROM message_user
+                    INNER JOIN message ON (message_user.message_id = message.message_id)
+                    INNER JOIN message_tags ON (message_tags.message_id = message_user.message_id
+                        AND message_user.user_id = message_tags.user_id)
+                WHERE message_user.user_id = :me
+                    AND snd_rec = :sender_receiver
+                    AND message_tags.tag = :tag
+                    AND message_user.mkdate > :since
+                ORDER BY message_user.mkdate ASC
+            ");
+            $messages_data->execute([
+                'me' => $user_id,
+                'tag' => $tag,
+                'sender_receiver' => $receiver ? "rec" : "snd",
+                'since' => $since
+            ]);
+        } else {
+            $messages_data = DBManager::get()->prepare("
+                SELECT message.*
+                FROM message_user
+                    INNER JOIN message ON (message_user.message_id = message.message_id)
+                WHERE message_user.user_id = :me
+                    AND snd_rec = :sender_receiver
+                    AND message_user.mkdate > :since
+                ORDER BY message_user.mkdate ASC
+            ");
+            $messages_data->execute([
+                'me' => $user_id,
+                'sender_receiver' => $receiver ? "rec" : "snd",
+                'since' => $since
+            ]);
+        }
+        $messages_data->setFetchMode(PDO::FETCH_ASSOC);
+        $messages = [];
+        foreach ($messages_data as $data) {
+            $messages[] = Message::buildExisting($data);
+        }
+        return $messages;
+    }
+
+    public function getSender()
+    {
+        return $this->author;
+    }
+
+    public function getRecipients()
+    {
+        if ($this->relations['receivers'] === null) {
+            $sql = "SELECT user_id,vorname,nachname,username,title_front,title_rear,perms,motto
+                    FROM message_user
+                    INNER JOIN auth_user_md5 aum USING (user_id)
+                    LEFT JOIN user_info ui USING (user_id)
+                    WHERE message_id = ? AND snd_rec = 'rec'
+                    ORDER BY Nachname, Vorname";
+            $params = [$this->id];
+        } else {
+            $sql = "SELECT user_id,vorname,nachname,username,title_front,title_rear,perms,motto
+                    FROM auth_user_md5 AS aum
+                    LEFT JOIN user_info ui USING (user_id)
+                    WHERE aum.user_id IN (?)
+                    ORDER BY Nachname, Vorname";
+            $params = [$this->receivers->pluck('user_id')];
+        }
+        $db = DBManager::get();
+        return new SimpleCollection(
+            $db->fetchAll($sql,
+                             $params,
+                             function ($data) {
+                                 $user_id = $data['user_id'];
+                                 unset($data['user_id']);
+                                 $user = User::build($data);
+                                 $ret = $user->toArray('username vorname nachname');
+                                 $ret['fullname'] = $user->getFullName();
+                                 $ret['user_id'] = $user_id;
+                                 return $ret;
+                             })
+            );
+    }
+
+    public function getNumRecipients()
+    {
+        return MessageUser::countBySQL("message_id=? AND snd_rec='rec'", [$this->id]);
+    }
+
+    public function markAsRead($user_id)
+    {
+        PersonalNotifications::markAsReadByHTML('message_'.$this->getId(), $user_id);
+        return $this->markAs($user_id, 1);
+    }
+
+    public function markAsUnread($user_id)
+    {
+        return $this->markAs($user_id, 0);
+    }
+
+    private function markAs($user_id, $state_of_flag)
+    {
+        $changed = 0;
+        $mu = [];
+        if ($user_id == $this->autor_id) {
+            $mu[] = $this->originator;
+        }
+        $receiver = MessageUser::findOneBySQL("message_id = ? AND user_id = ? AND snd_rec ='rec'", [$this->id, $user_id]);
+        if ($receiver) {
+            $mu[] = $receiver;
+        }
+        foreach ($mu as $message_user) {
+            $message_user->readed = $state_of_flag;
+            $changed += $message_user->store();
+        }
+        return $changed;
+    }
+
+    public function markAsAnswered($user_id)
+    {
+        $mu = MessageUser::findOneBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd')", [$this->id, $user_id]);
+        if ($mu) {
+            $mu->answered = 1;
+            return $mu->store();
+        }
+    }
+
+    public function isRead($user_id = null)
+    {
+        $user_id || $user_id = $GLOBALS['user']->id;
+        return (bool)MessageUser::countBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd') AND readed = 1", [$this->message_id, $user_id]);
+    }
+
+    public function isAnswered($user_id = null)
+    {
+        $user_id || $user_id = $GLOBALS['user']->id;
+        return (bool)MessageUser::countBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd') AND answered = 1", [$this->message_id, $user_id]);
+    }
+
+    public static function send($sender, $recipients, $subject, $message)
+    {
+        if ($sender === 'cli') {
+            $sender = '____%system%____';
+        }
+        $messaging = new \messaging();
+        $result = $messaging->insert_message($message,
+                                             $recipients,
+                                             $sender,
+                                             time(),
+                                             $message_id = md5(uniqid('message', true)),
+                                             false, // deleted
+                                             '', // force email
+                                             $subject);
+        return $result ? self::find($message_id) : null;
+    }
+
+    public function permissionToRead($user_id = null)
+    {
+        $user_id || $user_id = $GLOBALS['user']->id;
+        return (bool) MessageUser::countBySQL("message_id = ? AND user_id = ? AND snd_rec IN('rec','snd') AND deleted = 0", [$this->message_id, $user_id]);
+    }
+
+    /**
+     * Returns all tags for the message for the given user.
+     * @param null $user_id : user-id of the user that tags should be related. null if it's the current user.
+     * @return array of string : tags
+     */
+    public function getTags($user_id = null)
+    {
+        $query = "SELECT tag
+                  FROM message_tags
+                  WHERE message_id = :message_id AND user_id = :user_id
+                  ORDER BY tag ASC";
+        return DBManager::get()->fetchFirst($query, [
+            'message_id' => $this->id,
+            'user_id'    => $user_id ?: $GLOBALS['user']->id,
+        ], function ($tag) {
+            return ucfirst($tag);
+        });
+    }
+
+    public function addTag($tag, $user_id = null)
+    {
+        $user_id || $user_id = $GLOBALS['user']->id;
+        $statement = DBManager::get()->prepare("
+            INSERT INTO message_tags
+            SET message_id = :message_id,
+                user_id = :user_id,
+                tag = :tag,
+                mkdate = UNIX_TIMESTAMP()
+            ON DUPLICATE KEY
+                UPDATE chdate = UNIX_TIMESTAMP()
+        ");
+        return $statement->execute([
+            'message_id' => $this->getId(),
+            'user_id' => $user_id,
+            'tag' => mb_strtolower($tag)
+        ]);
+    }
+
+    public function removeTag($tag, $user_id = null)
+    {
+        $user_id || $user_id = $GLOBALS['user']->id;
+        $statement = DBManager::get()->prepare("
+            DELETE FROM message_tags
+            WHERE message_id = :message_id
+                AND user_id = :user_id
+                AND tag = :tag
+        ");
+        return $statement->execute([
+            'message_id' => $this->getId(),
+            'user_id' => $user_id,
+            'tag' => mb_strtolower($tag)
+        ]);
+    }
+
+    public function getNumAttachments()
+    {
+        return FileRef::countBySql("INNER JOIN folders ON(folders.id = folder_id) WHERE folders.range_id = ?", [$this->id]);
+    }
+
+    /**
+     * Deletes the message if all references in message_user indicate 'deleted'
+     * @return bool
+     */
+    public function removeIfOrphaned()
+    {
+        if (!MessageUser::countBySQL("message_id = ? AND snd_rec IN('rec','snd') AND deleted = 0", [$this->message_id])) {
+            return (bool)$this->delete();
+        }
+        return false;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("autor_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Nachrichten'), 'message', $field_data);
+            }
+        }
+    }
+
+}
diff --git a/lib/models/MessageUser.class.php b/lib/models/MessageUser.class.php
deleted file mode 100644
index 0ae6dd5..0000000
--- a/lib/models/MessageUser.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * MessageUser.class.php
- * model class for table message_user
- *
- * 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.
- *
- * @author    mlunzena
- * @copyright (c) Authors
- *
- * @property array $id alias for pk
- * @property string $user_id database column
- * @property string $message_id database column
- * @property int $readed database column
- * @property int $deleted database column
- * @property string $snd_rec database column
- * @property int $answered database column
- * @property int $mkdate database column
- * @property User $user belongs_to User
- * @property Message $message belongs_to Message
- */
-
-class MessageUser extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'message_user';
-
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['message'] = [
-            'class_name' => Message::class,
-            'foreign_key' => 'message_id',
-        ];
-
-        $config['registered_callbacks']['after_store'][] = 'cleanUpTags';
-        $config['registered_callbacks']['after_delete'][] = 'cleanUpTags';
-
-        parent::configure($config);
-    }
-
-    public static function hasUnreadByUserId($user_id)
-    {
-        return self::countBySql("snd_rec = 'rec' AND readed = 0 AND user_id = ? AND deleted = 0", [$user_id]) > 0;
-    }
-
-    public static function findSentByMessageId($message_id)
-    {
-        return self::findOneBySQL("message_id=? AND snd_rec='snd'", [$message_id]);
-    }
-
-    public static function findReceivedByMessageId($message_id)
-    {
-        return self::findBySQL("message_id=? AND snd_rec='rec'", [$message_id]);
-    }
-
-    public function cleanUpTags($callback)
-    {
-        $query = "DELETE FROM message_tags
-                      WHERE message_id = :message_id AND user_id = :user_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':message_id', $this['message_id']);
-        $statement->bindValue(':user_id', $this['user_id']);
-        if ($callback == 'after_delete') {
-            $statement->execute();
-        }
-        if ($callback == 'after_store' && $this->isDirty("deleted") && $this['deleted']) {
-            $statement->execute();
-            $this->message->removeIfOrphaned();
-        }
-        return true;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('MessageUser'), 'message_user', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/MessageUser.php b/lib/models/MessageUser.php
new file mode 100644
index 0000000..0ae6dd5
--- /dev/null
+++ b/lib/models/MessageUser.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * MessageUser.class.php
+ * model class for table message_user
+ *
+ * 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.
+ *
+ * @author    mlunzena
+ * @copyright (c) Authors
+ *
+ * @property array $id alias for pk
+ * @property string $user_id database column
+ * @property string $message_id database column
+ * @property int $readed database column
+ * @property int $deleted database column
+ * @property string $snd_rec database column
+ * @property int $answered database column
+ * @property int $mkdate database column
+ * @property User $user belongs_to User
+ * @property Message $message belongs_to Message
+ */
+
+class MessageUser extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'message_user';
+
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['message'] = [
+            'class_name' => Message::class,
+            'foreign_key' => 'message_id',
+        ];
+
+        $config['registered_callbacks']['after_store'][] = 'cleanUpTags';
+        $config['registered_callbacks']['after_delete'][] = 'cleanUpTags';
+
+        parent::configure($config);
+    }
+
+    public static function hasUnreadByUserId($user_id)
+    {
+        return self::countBySql("snd_rec = 'rec' AND readed = 0 AND user_id = ? AND deleted = 0", [$user_id]) > 0;
+    }
+
+    public static function findSentByMessageId($message_id)
+    {
+        return self::findOneBySQL("message_id=? AND snd_rec='snd'", [$message_id]);
+    }
+
+    public static function findReceivedByMessageId($message_id)
+    {
+        return self::findBySQL("message_id=? AND snd_rec='rec'", [$message_id]);
+    }
+
+    public function cleanUpTags($callback)
+    {
+        $query = "DELETE FROM message_tags
+                      WHERE message_id = :message_id AND user_id = :user_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':message_id', $this['message_id']);
+        $statement->bindValue(':user_id', $this['user_id']);
+        if ($callback == 'after_delete') {
+            $statement->execute();
+        }
+        if ($callback == 'after_store' && $this->isDirty("deleted") && $this['deleted']) {
+            $statement->execute();
+            $this->message->removeIfOrphaned();
+        }
+        return true;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('MessageUser'), 'message_user', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/MvvOverlappingConflict.class.php b/lib/models/MvvOverlappingConflict.class.php
deleted file mode 100644
index 6ac8e29..0000000
--- a/lib/models/MvvOverlappingConflict.class.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * MvvOverlappingConflict.class.php - model class for table mvv_ovl_conflicts
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @copyright   2018 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.4
- *
- * @property int $id alias column for conflict_id
- * @property int $conflict_id database column
- * @property int $selection_id database column
- * @property string $base_abschnitt_id database column
- * @property string $base_modulteil_id database column
- * @property string $base_course_id database column
- * @property string $base_metadate_id database column
- * @property string $comp_abschnitt_id database column
- * @property string $comp_modulteil_id database column
- * @property string $comp_course_id database column
- * @property string $comp_metadate_id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property MvvOverlappingSelection $selection belongs_to MvvOverlappingSelection
- * @property StgteilAbschnitt $base_abschnitt belongs_to StgteilAbschnitt
- * @property Modulteil $base_modulteil belongs_to Modulteil
- * @property SeminarCycleDate $base_cycle belongs_to SeminarCycleDate
- * @property Course $base_course belongs_to Course
- * @property StgteilAbschnitt $comp_abschnitt belongs_to StgteilAbschnitt
- * @property Modulteil $comp_modulteil belongs_to Modulteil
- * @property SeminarCycleDate $comp_cycle belongs_to SeminarCycleDate
- * @property Course $comp_course belongs_to Course
- */
-
-class MvvOverlappingConflict extends SimpleORMap
-{
-    /**
-     * Configures the model.
-     *
-     * @param array  $config Configuration
-     */
-    protected static function configure($config = array()) {
-
-        $config['db_table'] = 'mvv_ovl_conflicts';
-        $config['belongs_to']['selection'] = [
-            'class_name'  => MvvOverlappingSelection::class,
-            'foreign_key' => 'selection_id',
-            'assoc_foreign_key' => 'id'
-        ];
-        $config['belongs_to']['base_abschnitt'] = [
-            'class_name'  => StgteilAbschnitt::class,
-            'foreign_key' => 'base_abschnitt_id'
-        ];
-        $config['belongs_to']['base_modulteil'] = [
-            'class_name'  => Modulteil::class,
-            'foreign_key' => 'base_modulteil_id'
-        ];
-        $config['belongs_to']['base_cycle'] = [
-            'class_name'  => SeminarCycleDate::class,
-            'foreign_key' => 'base_metadate_id'
-        ];
-        $config['belongs_to']['base_course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'base_course_id'
-        ];
-        $config['belongs_to']['comp_abschnitt'] = [
-            'class_name'  => StgteilAbschnitt::class,
-            'foreign_key' => 'comp_abschnitt_id'
-        ];
-        $config['belongs_to']['comp_modulteil'] = [
-            'class_name'  => Modulteil::class,
-            'foreign_key' => 'comp_modulteil_id'
-        ];
-        $config['belongs_to']['comp_cycle'] = [
-            'class_name'  => SeminarCycleDate::class,
-            'foreign_key' => 'comp_metadate_id'
-        ];
-        $config['belongs_to']['comp_course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'comp_course_id'
-        ];
-
-        parent::configure($config);
-    }
-
-    /**
-     * Returns true if this conflict belongs to a excluded (hidden) course.
-     *
-     * @return boolean True if this conflict is excluded.
-     */
-    public function isExcluded()
-    {
-        return MvvOverlappingExclude::find([$this->selection->selection_id,
-            $this->comp_course_id]) ? true : false;
-    }
-
-    /**
-     * Deletes all conflicts by given selection id.
-     *
-     * @param string $selection_id
-     * @return number
-     */
-    public static function deleteBySelection($selection_id)
-    {
-        return self::deleteBySQL('INNER JOIN `mvv_ovl_selections`
-            ON `mvv_ovl_selections`.`id` = `mvv_ovl_conflicts`.`selection_id`
-            WHERE `mvv_ovl_selections`.`selection_id` = ?',
-            [$selection_id]);
-    }
-}
diff --git a/lib/models/MvvOverlappingConflict.php b/lib/models/MvvOverlappingConflict.php
new file mode 100644
index 0000000..6ac8e29
--- /dev/null
+++ b/lib/models/MvvOverlappingConflict.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * MvvOverlappingConflict.class.php - model class for table mvv_ovl_conflicts
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @copyright   2018 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.4
+ *
+ * @property int $id alias column for conflict_id
+ * @property int $conflict_id database column
+ * @property int $selection_id database column
+ * @property string $base_abschnitt_id database column
+ * @property string $base_modulteil_id database column
+ * @property string $base_course_id database column
+ * @property string $base_metadate_id database column
+ * @property string $comp_abschnitt_id database column
+ * @property string $comp_modulteil_id database column
+ * @property string $comp_course_id database column
+ * @property string $comp_metadate_id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property MvvOverlappingSelection $selection belongs_to MvvOverlappingSelection
+ * @property StgteilAbschnitt $base_abschnitt belongs_to StgteilAbschnitt
+ * @property Modulteil $base_modulteil belongs_to Modulteil
+ * @property SeminarCycleDate $base_cycle belongs_to SeminarCycleDate
+ * @property Course $base_course belongs_to Course
+ * @property StgteilAbschnitt $comp_abschnitt belongs_to StgteilAbschnitt
+ * @property Modulteil $comp_modulteil belongs_to Modulteil
+ * @property SeminarCycleDate $comp_cycle belongs_to SeminarCycleDate
+ * @property Course $comp_course belongs_to Course
+ */
+
+class MvvOverlappingConflict extends SimpleORMap
+{
+    /**
+     * Configures the model.
+     *
+     * @param array  $config Configuration
+     */
+    protected static function configure($config = array()) {
+
+        $config['db_table'] = 'mvv_ovl_conflicts';
+        $config['belongs_to']['selection'] = [
+            'class_name'  => MvvOverlappingSelection::class,
+            'foreign_key' => 'selection_id',
+            'assoc_foreign_key' => 'id'
+        ];
+        $config['belongs_to']['base_abschnitt'] = [
+            'class_name'  => StgteilAbschnitt::class,
+            'foreign_key' => 'base_abschnitt_id'
+        ];
+        $config['belongs_to']['base_modulteil'] = [
+            'class_name'  => Modulteil::class,
+            'foreign_key' => 'base_modulteil_id'
+        ];
+        $config['belongs_to']['base_cycle'] = [
+            'class_name'  => SeminarCycleDate::class,
+            'foreign_key' => 'base_metadate_id'
+        ];
+        $config['belongs_to']['base_course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'base_course_id'
+        ];
+        $config['belongs_to']['comp_abschnitt'] = [
+            'class_name'  => StgteilAbschnitt::class,
+            'foreign_key' => 'comp_abschnitt_id'
+        ];
+        $config['belongs_to']['comp_modulteil'] = [
+            'class_name'  => Modulteil::class,
+            'foreign_key' => 'comp_modulteil_id'
+        ];
+        $config['belongs_to']['comp_cycle'] = [
+            'class_name'  => SeminarCycleDate::class,
+            'foreign_key' => 'comp_metadate_id'
+        ];
+        $config['belongs_to']['comp_course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'comp_course_id'
+        ];
+
+        parent::configure($config);
+    }
+
+    /**
+     * Returns true if this conflict belongs to a excluded (hidden) course.
+     *
+     * @return boolean True if this conflict is excluded.
+     */
+    public function isExcluded()
+    {
+        return MvvOverlappingExclude::find([$this->selection->selection_id,
+            $this->comp_course_id]) ? true : false;
+    }
+
+    /**
+     * Deletes all conflicts by given selection id.
+     *
+     * @param string $selection_id
+     * @return number
+     */
+    public static function deleteBySelection($selection_id)
+    {
+        return self::deleteBySQL('INNER JOIN `mvv_ovl_selections`
+            ON `mvv_ovl_selections`.`id` = `mvv_ovl_conflicts`.`selection_id`
+            WHERE `mvv_ovl_selections`.`selection_id` = ?',
+            [$selection_id]);
+    }
+}
diff --git a/lib/models/MvvOverlappingSelection.class.php b/lib/models/MvvOverlappingSelection.class.php
deleted file mode 100644
index 9d159e2..0000000
--- a/lib/models/MvvOverlappingSelection.class.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/**
- * MvvOverlappingSelection.class.php - model class for table mvv_ovl_selections
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @copyright   2018 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.4
- *
- * @property int $id database column
- * @property string $selection_id database column
- * @property string $semester_id database column
- * @property string $base_version_id database column
- * @property string $comp_version_id database column
- * @property string $fachsems database column
- * @property string $semtypes database column
- * @property string $user_id database column
- * @property int $show_excluded database column
- * @property int $mkdate database column
- * @property SimpleORMapCollection|MvvOverlappingConflict[] $conflicts has_many MvvOverlappingConflict
- * @property SimpleORMapCollection|MvvOverlappingExclude[] $excludes has_many MvvOverlappingExclude
- * @property Semester $semester belongs_to Semester
- * @property StgteilVersion $base_version belongs_to StgteilVersion
- * @property StgteilVersion $comp_version belongs_to StgteilVersion
- * @property User $user belongs_to User
- */
-
-class MvvOverlappingSelection extends SimpleORMap
-{
-    /**
-     * Configures the model.
-     *
-     * @param array  $config Configuration
-     */
-    protected static function configure($config = array())
-    {
-        $config['db_table'] = 'mvv_ovl_selections';
-        $config['belongs_to']['semester'] = [
-            'class_name'  => Semester::class,
-            'foreign_key' => 'semester_id'
-        ];
-        $config['belongs_to']['base_version'] = [
-            'class_name'  => StgteilVersion::class,
-            'foreign_key' => 'base_version_id'
-        ];
-        $config['belongs_to']['comp_version'] = [
-            'class_name'  => StgteilVersion::class,
-            'foreign_key' => 'comp_version_id'
-        ];
-        $config['has_many']['conflicts'] = [
-            'class_name'        => MvvOverlappingConflict::class,
-            'foreign_key'       => 'id',
-            'assoc_foreign_key' => 'selection_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store'
-        ];
-        $config['belongs_to']['user'] =  [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id'
-        ];
-        $config['has_many']['excludes'] = [
-            'class_name'        => MvvOverlappingExclude::class,
-            'foreign_key'       => 'selection_id',
-            'assoc_foreign_key' => 'selection_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store'
-        ];
-        parent::configure($config);
-    }
-
-    /**
-     * Creates a selection id and stores the selection.
-     *
-     * @throws UnexpectedValueException if there are forbidden NULL values
-     * @return number|boolean
-     */
-    public function store()
-    {
-        if ($this->isNew() && $this->selection_id == '') {
-            $this->selection_id = self::createSelectionId(
-                $this->base_version,
-                $this->comp_version,
-                $this->fachsems,
-                $this->semtypes
-            );
-        }
-        return parent::store();
-    }
-
-    /**
-     * Sets the given Fachsemester. Expects an array or a comma
-     * separated list of Fachsemester.
-     *
-     * @param array|string $semtypes
-     */
-    public function setFachsemester($fachsems)
-    {
-        if (is_array($fachsems)) {
-            sort($fachsems, SORT_NUMERIC);
-            $fachsems = implode(',', $fachsems);
-        }
-        $this->fachsems = $fachsems;
-    }
-
-    /**
-     * Sets the given course types (semtypes). Expects an array or a comma
-     * separated list of course types.
-     *
-     * @param array|string $semtypes
-     */
-    public function setCoursetypes($semtypes)
-    {
-        if (is_array($semtypes)) {
-            sort($semtypes, SORT_NUMERIC);
-            $semtypes = implode(',', $semtypes);
-        }
-        $this->semtypes = $semtypes;
-    }
-
-    /**
-     * Store this selection with its all conflicts.
-     *
-     * @throws UnexpectedValueException if there are forbidden NULL values
-     * @return number|boolean
-     */
-    public function storeConflicts()
-    {
-
-        $query = "
-            SELECT DISTINCT `cbase`.`metadate_id` AS `cbase_metadate_id`,
-                `cbase`.`seminar_id` AS `cbase_seminar_id`,
-                `sembase`.`abschnitt_id` AS `sembase_abschnitt_id`,
-                `sembase`.`modulteil_id` AS `sembase_modulteil_id`,
-                `ccomp`.`metadate_id` AS `ccomp_metadate_id`,
-                `ccomp`.`seminar_id` AS `ccomp_seminar_id`,
-                `semcomp`.`abschnitt_id` AS `semcomp_abschnitt_id`,
-                `semcomp`.`modulteil_id` AS `semcomp_modulteil_id`
-            FROM `seminar_cycle_dates` AS `cbase`
-                INNER JOIN (
-                    SELECT `mvv_lvgruppe_seminar`.`seminar_id`,
-                        `mvv_stgteilabschnitt_modul`.`abschnitt_id`,
-                        `mvv_modulteil`.`modulteil_id`
-                    FROM `mvv_stgteilabschnitt`
-                        INNER JOIN `mvv_stgteilabschnitt_modul` USING (`abschnitt_id`)
-                        INNER JOIN `mvv_modul` USING (`modul_id`)
-                        INNER JOIN `mvv_modulteil` USING (`modul_id`)
-                        INNER JOIN `mvv_lvgruppe_modulteil` USING (`modulteil_id`)
-                        INNER JOIN `mvv_lvgruppe_seminar` USING (`lvgruppe_id`)
-                        INNER JOIN `seminare` USING (`seminar_id`)
-                        INNER JOIN `mvv_modulteil_stgteilabschnitt`
-                            ON (`mvv_stgteilabschnitt_modul`.`abschnitt_id` =
-                                    `mvv_modulteil_stgteilabschnitt`.`abschnitt_id`
-                                AND `mvv_modulteil`.`modulteil_id` =
-                                    `mvv_modulteil_stgteilabschnitt`.`modulteil_id`)
-                        LEFT JOIN `semester_data` AS `start_sem`
-                            ON (`mvv_modul`.`start` = `start_sem`.`semester_id`)
-                        LEFT JOIN `semester_data` AS `end_sem`
-                            ON (`mvv_modul`.`end` = `end_sem`.`semester_id`)
-                        LEFT JOIN `semester_courses` ON (`seminare`.`Seminar_id` = `semester_courses`.`course_id`)
-                    WHERE `mvv_stgteilabschnitt`.`version_id` = :base_version
-                        AND `mvv_modulteil_stgteilabschnitt`.`fachsemester` IN (:fachsem)
-                        AND ((`start_sem`.`beginn` < :sem_end OR ISNULL(`start_sem`.`beginn`))
-                            AND (`end_sem`.`ende` > :sem_start OR ISNULL(`end_sem`.`ende`)))
-                        AND `seminare`.`status` IN (:typ)
-                        AND `seminare`.`start_time` <= :sem_end
-                        AND (`semester_courses`.`semester_id` IS NULL OR `semester_courses`.`semester_id` = :semester_id)
-                ) AS `sembase` ON (`sembase`.`seminar_id` = `cbase`.`seminar_id`)
-                INNER JOIN `seminar_cycle_dates` AS `ccomp`
-                    ON (`cbase`.`seminar_id` != `ccomp`.`seminar_id`
-                        AND `cbase`.`weekday` = `ccomp`.`weekday`
-                        AND `cbase`.`start_time` < `ccomp`.`end_time`
-                        AND `cbase`.`end_time` > `ccomp`.`start_time`
-                        AND `cbase`.`metadate_id` = (
-                            SELECT DISTINCT `metadate_id`
-                                FROM `termine`
-                                WHERE `termine`.`metadate_id` = `cbase`.`metadate_id`
-                                LIMIT 1)
-                        AND `ccomp`.`metadate_id` = (
-                            SELECT DISTINCT `metadate_id`
-                                FROM `termine`
-                                WHERE `termine`.`metadate_id` = `ccomp`.`metadate_id`
-                                LIMIT 1)
-                    )
-                INNER JOIN (
-                    SELECT `mvv_lvgruppe_seminar`.`seminar_id`,
-                        `mvv_stgteilabschnitt_modul`.`abschnitt_id`,
-                        `mvv_modulteil`.`modulteil_id`
-                    FROM `mvv_stgteilabschnitt`
-                        INNER JOIN `mvv_stgteilabschnitt_modul` USING (`abschnitt_id`)
-                        INNER JOIN `mvv_modul` USING (`modul_id`)
-                        INNER JOIN `mvv_modulteil` USING (`modul_id`)
-                        INNER JOIN `mvv_lvgruppe_modulteil` USING (`modulteil_id`)
-                        INNER JOIN `mvv_lvgruppe_seminar` USING (`lvgruppe_id`)
-                        INNER JOIN `seminare` USING (`seminar_id`)
-                        INNER JOIN `mvv_modulteil_stgteilabschnitt`
-                            ON (`mvv_stgteilabschnitt_modul`.`abschnitt_id` =
-                                    `mvv_modulteil_stgteilabschnitt`.`abschnitt_id`
-                                AND `mvv_modulteil`.`modulteil_id` =
-                                    `mvv_modulteil_stgteilabschnitt`.`modulteil_id`)
-                        LEFT JOIN `semester_data` AS `start_sem`
-                            ON (`mvv_modul`.`start` = `start_sem`.`semester_id`)
-                        LEFT JOIN `semester_data` AS `end_sem`
-                            ON (`mvv_modul`.`end` = `end_sem`.`semester_id`)
-                        LEFT JOIN `semester_courses` ON (`seminare`.`Seminar_id` = `semester_courses`.`course_id`)
-                    WHERE `mvv_stgteilabschnitt`.`version_id` = :comp_version
-                        AND `mvv_modulteil_stgteilabschnitt`.`fachsemester` IN (:fachsem)
-                        AND ((`start_sem`.`beginn` < :sem_end OR ISNULL(`start_sem`.`beginn`))
-                            AND (`end_sem`.`ende` > :sem_start OR ISNULL(`end_sem`.`ende`)))
-                        AND `seminare`.`status` IN (:typ)
-                        AND `seminare`.`start_time` <= :sem_end
-                        AND (`semester_courses`.`semester_id` IS NULL OR `semester_courses`.`semester_id` = :semester_id)
-                ) AS `semcomp` ON (`semcomp`.`seminar_id` = `ccomp`.`seminar_id`)
-                INNER JOIN `mvv_modulteil_stgteilabschnitt` AS `mms1`
-                    ON (`mms1`.`abschnitt_id` = `semcomp`.`abschnitt_id` AND `mms1`.`modulteil_id` = `semcomp`.`modulteil_id`)
-                    WHERE `mms1`.`fachsemester` IN (
-                        SELECT `fachsemester`
-                        FROM `mvv_modulteil_stgteilabschnitt` AS `mms2`
-                        WHERE `mms2`.`abschnitt_id` = `sembase`.`abschnitt_id`
-                            AND `mms2`.`modulteil_id` = `sembase`.`modulteil_id`)
-            ORDER BY `cbase_seminar_id`";
-
-        // if no filter is set use all types and fachsems
-        $fachsems = $this->fachsems ? $this->fachsems : implode(',', range(1, 6));
-        $semtypes = $this->semtypes ? $this->semtypes : implode(',', array_keys(SemType::getTypes()));
-
-        $db = DBManager::get();
-        $conflicts = $db->fetchAll($query, [
-            ':base_version' => $this->base_version_id,
-            ':comp_version' => $this->comp_version_id,
-            ':fachsem'      => explode(',', $fachsems),
-            ':typ'          => explode(',', $semtypes),
-            ':sem_start'    => $this->semester->beginn,
-            ':sem_end'      => $this->semester->ende,
-            ':semester_id'  => $this->semester->id
-        ]);
-
-        $conlicts = [];
-        foreach ($conflicts as $conflict) {
-            $ovl_conflict = new MvvOverlappingConflict();
-            $ovl_conflict->selection_id = $this->id;
-            $ovl_conflict->base_abschnitt_id = $conflict['sembase_abschnitt_id'];
-            $ovl_conflict->base_modulteil_id = $conflict['sembase_modulteil_id'];
-            $ovl_conflict->base_course_id    = $conflict['cbase_seminar_id'];
-            $ovl_conflict->base_metadate_id  = $conflict['cbase_metadate_id'];
-            $ovl_conflict->comp_abschnitt_id = $conflict['semcomp_abschnitt_id'];
-            $ovl_conflict->comp_modulteil_id = $conflict['semcomp_modulteil_id'];
-            $ovl_conflict->comp_course_id    = $conflict['ccomp_seminar_id'];
-            $ovl_conflict->comp_metadate_id  = $conflict['ccomp_metadate_id'];
-            $this->conflicts[] = $ovl_conflict;
-        }
-        return $this->store();
-    }
-
-    /**
-     * Returns all conflicts of all selections with the given selection id.
-     *
-     * @param string $selection_id The selection id.
-     * @param boolean $only_visible Returns only visible conflicts.
-     * @return SimpleORMapCollection All conflicts of appropriate selections.
-     */
-    public static function getConflictsBySelection($selection_id, $only_visible = false)
-    {
-        $excluded_courses = [];
-        $visible_sql = '';
-        if ($only_visible) {
-            $excluded_courses = SimpleORMapCollection::createFromArray(
-                    MvvOverlappingExclude::findBySelection_id($selection_id))->pluck('course_id');
-            if ($excluded_courses) {
-                $visible_sql = 'AND `mvv_ovl_conflicts`.`comp_course_id` NOT IN (:course_ids)';
-            }
-        }
-        return SimpleORMapCollection::createFromArray(
-            MvvOverlappingConflict::findBySql('LEFT JOIN `mvv_ovl_selections`
-                ON (`mvv_ovl_conflicts`.`selection_id` = `mvv_ovl_selections`.`id`)
-                WHERE `mvv_ovl_selections`.`selection_id` = :selection_id ' . $visible_sql, [
-                ':selection_id' => $selection_id,
-                ':course_ids'    => $excluded_courses
-            ])
-        );
-    }
-
-    /**
-     * Returns a md5 hash over all given parameters.
-     *
-     * @param string $base_version The id of the base version.
-     * @param string $comp_versions The id of the compared version.
-     * @param array|string $fachsems An array or a string with comma separated fachsem numbers.
-     * @param array|string $semtypes An array or a string with comma separated course types.
-     * @param string|null $user_id User id that created the selection (defaults to current user)
-     * @return string The md5 id.
-     */
-    public static function createSelectionId($base_version, $comp_versions, $fachsems, $semtypes, string $user_id = null)
-    {
-        if (is_array($fachsems)) {
-            sort($fachsems, SORT_NUMERIC);
-            $fachsems = implode(',', $fachsems);
-        }
-        if (is_array($semtypes)) {
-            sort($semtypes, SORT_NUMERIC);
-            $semtypes = implode(',', $semtypes);
-        }
-        if (is_array($comp_versions)) {
-            $comp_version_ids = [];
-            foreach ($comp_versions as $comp_version) {
-                $comp_version_ids[] = $comp_version->id;
-            }
-            sort($comp_version_ids);
-            $comp_versions = implode(',', $comp_version_ids);
-        } else {
-            $comp_versions = $comp_versions->id;
-        }
-        return md5(implode('_', [
-            $base_version->id,
-            $comp_versions,
-            trim($fachsems) ? $fachsems : 'x',
-            trim($semtypes) ? $semtypes : 'x',
-            $user_id ?? $GLOBALS['user']->id,
-        ]));
-    }
-
-    /**
-     * Returns all excluded (hidden) conflicts of this selection.
-     *
-     * @return SimpleORMapCollection The excluded (hidden) conflicts.
-     */
-    public function getExcludedConflicts()
-    {
-        return $this->conflicts->findBy(
-            'comp_course_id',
-            $this->excludes->pluck('course_id')
-        );
-    }
-}
diff --git a/lib/models/MvvOverlappingSelection.php b/lib/models/MvvOverlappingSelection.php
new file mode 100644
index 0000000..9d159e2
--- /dev/null
+++ b/lib/models/MvvOverlappingSelection.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ * MvvOverlappingSelection.class.php - model class for table mvv_ovl_selections
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @copyright   2018 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       4.4
+ *
+ * @property int $id database column
+ * @property string $selection_id database column
+ * @property string $semester_id database column
+ * @property string $base_version_id database column
+ * @property string $comp_version_id database column
+ * @property string $fachsems database column
+ * @property string $semtypes database column
+ * @property string $user_id database column
+ * @property int $show_excluded database column
+ * @property int $mkdate database column
+ * @property SimpleORMapCollection|MvvOverlappingConflict[] $conflicts has_many MvvOverlappingConflict
+ * @property SimpleORMapCollection|MvvOverlappingExclude[] $excludes has_many MvvOverlappingExclude
+ * @property Semester $semester belongs_to Semester
+ * @property StgteilVersion $base_version belongs_to StgteilVersion
+ * @property StgteilVersion $comp_version belongs_to StgteilVersion
+ * @property User $user belongs_to User
+ */
+
+class MvvOverlappingSelection extends SimpleORMap
+{
+    /**
+     * Configures the model.
+     *
+     * @param array  $config Configuration
+     */
+    protected static function configure($config = array())
+    {
+        $config['db_table'] = 'mvv_ovl_selections';
+        $config['belongs_to']['semester'] = [
+            'class_name'  => Semester::class,
+            'foreign_key' => 'semester_id'
+        ];
+        $config['belongs_to']['base_version'] = [
+            'class_name'  => StgteilVersion::class,
+            'foreign_key' => 'base_version_id'
+        ];
+        $config['belongs_to']['comp_version'] = [
+            'class_name'  => StgteilVersion::class,
+            'foreign_key' => 'comp_version_id'
+        ];
+        $config['has_many']['conflicts'] = [
+            'class_name'        => MvvOverlappingConflict::class,
+            'foreign_key'       => 'id',
+            'assoc_foreign_key' => 'selection_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store'
+        ];
+        $config['belongs_to']['user'] =  [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id'
+        ];
+        $config['has_many']['excludes'] = [
+            'class_name'        => MvvOverlappingExclude::class,
+            'foreign_key'       => 'selection_id',
+            'assoc_foreign_key' => 'selection_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store'
+        ];
+        parent::configure($config);
+    }
+
+    /**
+     * Creates a selection id and stores the selection.
+     *
+     * @throws UnexpectedValueException if there are forbidden NULL values
+     * @return number|boolean
+     */
+    public function store()
+    {
+        if ($this->isNew() && $this->selection_id == '') {
+            $this->selection_id = self::createSelectionId(
+                $this->base_version,
+                $this->comp_version,
+                $this->fachsems,
+                $this->semtypes
+            );
+        }
+        return parent::store();
+    }
+
+    /**
+     * Sets the given Fachsemester. Expects an array or a comma
+     * separated list of Fachsemester.
+     *
+     * @param array|string $semtypes
+     */
+    public function setFachsemester($fachsems)
+    {
+        if (is_array($fachsems)) {
+            sort($fachsems, SORT_NUMERIC);
+            $fachsems = implode(',', $fachsems);
+        }
+        $this->fachsems = $fachsems;
+    }
+
+    /**
+     * Sets the given course types (semtypes). Expects an array or a comma
+     * separated list of course types.
+     *
+     * @param array|string $semtypes
+     */
+    public function setCoursetypes($semtypes)
+    {
+        if (is_array($semtypes)) {
+            sort($semtypes, SORT_NUMERIC);
+            $semtypes = implode(',', $semtypes);
+        }
+        $this->semtypes = $semtypes;
+    }
+
+    /**
+     * Store this selection with its all conflicts.
+     *
+     * @throws UnexpectedValueException if there are forbidden NULL values
+     * @return number|boolean
+     */
+    public function storeConflicts()
+    {
+
+        $query = "
+            SELECT DISTINCT `cbase`.`metadate_id` AS `cbase_metadate_id`,
+                `cbase`.`seminar_id` AS `cbase_seminar_id`,
+                `sembase`.`abschnitt_id` AS `sembase_abschnitt_id`,
+                `sembase`.`modulteil_id` AS `sembase_modulteil_id`,
+                `ccomp`.`metadate_id` AS `ccomp_metadate_id`,
+                `ccomp`.`seminar_id` AS `ccomp_seminar_id`,
+                `semcomp`.`abschnitt_id` AS `semcomp_abschnitt_id`,
+                `semcomp`.`modulteil_id` AS `semcomp_modulteil_id`
+            FROM `seminar_cycle_dates` AS `cbase`
+                INNER JOIN (
+                    SELECT `mvv_lvgruppe_seminar`.`seminar_id`,
+                        `mvv_stgteilabschnitt_modul`.`abschnitt_id`,
+                        `mvv_modulteil`.`modulteil_id`
+                    FROM `mvv_stgteilabschnitt`
+                        INNER JOIN `mvv_stgteilabschnitt_modul` USING (`abschnitt_id`)
+                        INNER JOIN `mvv_modul` USING (`modul_id`)
+                        INNER JOIN `mvv_modulteil` USING (`modul_id`)
+                        INNER JOIN `mvv_lvgruppe_modulteil` USING (`modulteil_id`)
+                        INNER JOIN `mvv_lvgruppe_seminar` USING (`lvgruppe_id`)
+                        INNER JOIN `seminare` USING (`seminar_id`)
+                        INNER JOIN `mvv_modulteil_stgteilabschnitt`
+                            ON (`mvv_stgteilabschnitt_modul`.`abschnitt_id` =
+                                    `mvv_modulteil_stgteilabschnitt`.`abschnitt_id`
+                                AND `mvv_modulteil`.`modulteil_id` =
+                                    `mvv_modulteil_stgteilabschnitt`.`modulteil_id`)
+                        LEFT JOIN `semester_data` AS `start_sem`
+                            ON (`mvv_modul`.`start` = `start_sem`.`semester_id`)
+                        LEFT JOIN `semester_data` AS `end_sem`
+                            ON (`mvv_modul`.`end` = `end_sem`.`semester_id`)
+                        LEFT JOIN `semester_courses` ON (`seminare`.`Seminar_id` = `semester_courses`.`course_id`)
+                    WHERE `mvv_stgteilabschnitt`.`version_id` = :base_version
+                        AND `mvv_modulteil_stgteilabschnitt`.`fachsemester` IN (:fachsem)
+                        AND ((`start_sem`.`beginn` < :sem_end OR ISNULL(`start_sem`.`beginn`))
+                            AND (`end_sem`.`ende` > :sem_start OR ISNULL(`end_sem`.`ende`)))
+                        AND `seminare`.`status` IN (:typ)
+                        AND `seminare`.`start_time` <= :sem_end
+                        AND (`semester_courses`.`semester_id` IS NULL OR `semester_courses`.`semester_id` = :semester_id)
+                ) AS `sembase` ON (`sembase`.`seminar_id` = `cbase`.`seminar_id`)
+                INNER JOIN `seminar_cycle_dates` AS `ccomp`
+                    ON (`cbase`.`seminar_id` != `ccomp`.`seminar_id`
+                        AND `cbase`.`weekday` = `ccomp`.`weekday`
+                        AND `cbase`.`start_time` < `ccomp`.`end_time`
+                        AND `cbase`.`end_time` > `ccomp`.`start_time`
+                        AND `cbase`.`metadate_id` = (
+                            SELECT DISTINCT `metadate_id`
+                                FROM `termine`
+                                WHERE `termine`.`metadate_id` = `cbase`.`metadate_id`
+                                LIMIT 1)
+                        AND `ccomp`.`metadate_id` = (
+                            SELECT DISTINCT `metadate_id`
+                                FROM `termine`
+                                WHERE `termine`.`metadate_id` = `ccomp`.`metadate_id`
+                                LIMIT 1)
+                    )
+                INNER JOIN (
+                    SELECT `mvv_lvgruppe_seminar`.`seminar_id`,
+                        `mvv_stgteilabschnitt_modul`.`abschnitt_id`,
+                        `mvv_modulteil`.`modulteil_id`
+                    FROM `mvv_stgteilabschnitt`
+                        INNER JOIN `mvv_stgteilabschnitt_modul` USING (`abschnitt_id`)
+                        INNER JOIN `mvv_modul` USING (`modul_id`)
+                        INNER JOIN `mvv_modulteil` USING (`modul_id`)
+                        INNER JOIN `mvv_lvgruppe_modulteil` USING (`modulteil_id`)
+                        INNER JOIN `mvv_lvgruppe_seminar` USING (`lvgruppe_id`)
+                        INNER JOIN `seminare` USING (`seminar_id`)
+                        INNER JOIN `mvv_modulteil_stgteilabschnitt`
+                            ON (`mvv_stgteilabschnitt_modul`.`abschnitt_id` =
+                                    `mvv_modulteil_stgteilabschnitt`.`abschnitt_id`
+                                AND `mvv_modulteil`.`modulteil_id` =
+                                    `mvv_modulteil_stgteilabschnitt`.`modulteil_id`)
+                        LEFT JOIN `semester_data` AS `start_sem`
+                            ON (`mvv_modul`.`start` = `start_sem`.`semester_id`)
+                        LEFT JOIN `semester_data` AS `end_sem`
+                            ON (`mvv_modul`.`end` = `end_sem`.`semester_id`)
+                        LEFT JOIN `semester_courses` ON (`seminare`.`Seminar_id` = `semester_courses`.`course_id`)
+                    WHERE `mvv_stgteilabschnitt`.`version_id` = :comp_version
+                        AND `mvv_modulteil_stgteilabschnitt`.`fachsemester` IN (:fachsem)
+                        AND ((`start_sem`.`beginn` < :sem_end OR ISNULL(`start_sem`.`beginn`))
+                            AND (`end_sem`.`ende` > :sem_start OR ISNULL(`end_sem`.`ende`)))
+                        AND `seminare`.`status` IN (:typ)
+                        AND `seminare`.`start_time` <= :sem_end
+                        AND (`semester_courses`.`semester_id` IS NULL OR `semester_courses`.`semester_id` = :semester_id)
+                ) AS `semcomp` ON (`semcomp`.`seminar_id` = `ccomp`.`seminar_id`)
+                INNER JOIN `mvv_modulteil_stgteilabschnitt` AS `mms1`
+                    ON (`mms1`.`abschnitt_id` = `semcomp`.`abschnitt_id` AND `mms1`.`modulteil_id` = `semcomp`.`modulteil_id`)
+                    WHERE `mms1`.`fachsemester` IN (
+                        SELECT `fachsemester`
+                        FROM `mvv_modulteil_stgteilabschnitt` AS `mms2`
+                        WHERE `mms2`.`abschnitt_id` = `sembase`.`abschnitt_id`
+                            AND `mms2`.`modulteil_id` = `sembase`.`modulteil_id`)
+            ORDER BY `cbase_seminar_id`";
+
+        // if no filter is set use all types and fachsems
+        $fachsems = $this->fachsems ? $this->fachsems : implode(',', range(1, 6));
+        $semtypes = $this->semtypes ? $this->semtypes : implode(',', array_keys(SemType::getTypes()));
+
+        $db = DBManager::get();
+        $conflicts = $db->fetchAll($query, [
+            ':base_version' => $this->base_version_id,
+            ':comp_version' => $this->comp_version_id,
+            ':fachsem'      => explode(',', $fachsems),
+            ':typ'          => explode(',', $semtypes),
+            ':sem_start'    => $this->semester->beginn,
+            ':sem_end'      => $this->semester->ende,
+            ':semester_id'  => $this->semester->id
+        ]);
+
+        $conlicts = [];
+        foreach ($conflicts as $conflict) {
+            $ovl_conflict = new MvvOverlappingConflict();
+            $ovl_conflict->selection_id = $this->id;
+            $ovl_conflict->base_abschnitt_id = $conflict['sembase_abschnitt_id'];
+            $ovl_conflict->base_modulteil_id = $conflict['sembase_modulteil_id'];
+            $ovl_conflict->base_course_id    = $conflict['cbase_seminar_id'];
+            $ovl_conflict->base_metadate_id  = $conflict['cbase_metadate_id'];
+            $ovl_conflict->comp_abschnitt_id = $conflict['semcomp_abschnitt_id'];
+            $ovl_conflict->comp_modulteil_id = $conflict['semcomp_modulteil_id'];
+            $ovl_conflict->comp_course_id    = $conflict['ccomp_seminar_id'];
+            $ovl_conflict->comp_metadate_id  = $conflict['ccomp_metadate_id'];
+            $this->conflicts[] = $ovl_conflict;
+        }
+        return $this->store();
+    }
+
+    /**
+     * Returns all conflicts of all selections with the given selection id.
+     *
+     * @param string $selection_id The selection id.
+     * @param boolean $only_visible Returns only visible conflicts.
+     * @return SimpleORMapCollection All conflicts of appropriate selections.
+     */
+    public static function getConflictsBySelection($selection_id, $only_visible = false)
+    {
+        $excluded_courses = [];
+        $visible_sql = '';
+        if ($only_visible) {
+            $excluded_courses = SimpleORMapCollection::createFromArray(
+                    MvvOverlappingExclude::findBySelection_id($selection_id))->pluck('course_id');
+            if ($excluded_courses) {
+                $visible_sql = 'AND `mvv_ovl_conflicts`.`comp_course_id` NOT IN (:course_ids)';
+            }
+        }
+        return SimpleORMapCollection::createFromArray(
+            MvvOverlappingConflict::findBySql('LEFT JOIN `mvv_ovl_selections`
+                ON (`mvv_ovl_conflicts`.`selection_id` = `mvv_ovl_selections`.`id`)
+                WHERE `mvv_ovl_selections`.`selection_id` = :selection_id ' . $visible_sql, [
+                ':selection_id' => $selection_id,
+                ':course_ids'    => $excluded_courses
+            ])
+        );
+    }
+
+    /**
+     * Returns a md5 hash over all given parameters.
+     *
+     * @param string $base_version The id of the base version.
+     * @param string $comp_versions The id of the compared version.
+     * @param array|string $fachsems An array or a string with comma separated fachsem numbers.
+     * @param array|string $semtypes An array or a string with comma separated course types.
+     * @param string|null $user_id User id that created the selection (defaults to current user)
+     * @return string The md5 id.
+     */
+    public static function createSelectionId($base_version, $comp_versions, $fachsems, $semtypes, string $user_id = null)
+    {
+        if (is_array($fachsems)) {
+            sort($fachsems, SORT_NUMERIC);
+            $fachsems = implode(',', $fachsems);
+        }
+        if (is_array($semtypes)) {
+            sort($semtypes, SORT_NUMERIC);
+            $semtypes = implode(',', $semtypes);
+        }
+        if (is_array($comp_versions)) {
+            $comp_version_ids = [];
+            foreach ($comp_versions as $comp_version) {
+                $comp_version_ids[] = $comp_version->id;
+            }
+            sort($comp_version_ids);
+            $comp_versions = implode(',', $comp_version_ids);
+        } else {
+            $comp_versions = $comp_versions->id;
+        }
+        return md5(implode('_', [
+            $base_version->id,
+            $comp_versions,
+            trim($fachsems) ? $fachsems : 'x',
+            trim($semtypes) ? $semtypes : 'x',
+            $user_id ?? $GLOBALS['user']->id,
+        ]));
+    }
+
+    /**
+     * Returns all excluded (hidden) conflicts of this selection.
+     *
+     * @return SimpleORMapCollection The excluded (hidden) conflicts.
+     */
+    public function getExcludedConflicts()
+    {
+        return $this->conflicts->findBy(
+            'comp_course_id',
+            $this->excludes->pluck('course_id')
+        );
+    }
+}
diff --git a/lib/models/NewsRange.class.php b/lib/models/NewsRange.class.php
deleted file mode 100644
index 7785214..0000000
--- a/lib/models/NewsRange.class.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * NewsRange.class.php - model class for table Institute
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2012 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $news_id database column
- * @property string $range_id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property User $user belongs_to User
- * @property Course $course belongs_to Course
- * @property Institute $institute belongs_to Institute
- * @property mixed $type additional field
- * @property mixed $name additional field
- */
-class NewsRange extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'news_range';
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'range_id',
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name' => Course::class,
-            'foreign_key' => 'range_id',
-        ];
-        $config['belongs_to']['institute'] = [
-            'class_name' => Institute::class,
-            'foreign_key' => 'range_id',
-        ];
-        $config['additional_fields']['type'] = true;
-        $config['additional_fields']['name'] = true;
-        parent::configure($config);
-    }
-
-    function getType()
-    {
-        return get_object_type($this->range_id, ['sem','inst','user','fak']);
-    }
-
-    function getName()
-    {
-        switch ($this->type) {
-            case 'global':
-                return _('Stud.IP-Startseite');
-                break;
-            case 'sem':
-                return $this->course->name;
-                break;
-            case 'user':
-                return $this->user->getFullName();
-                break;
-            case 'inst':
-            case 'fak':
-                return $this->institute->name;
-                break;
-            }
-    }
-}
diff --git a/lib/models/NewsRange.php b/lib/models/NewsRange.php
new file mode 100644
index 0000000..7785214
--- /dev/null
+++ b/lib/models/NewsRange.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * NewsRange.class.php - model class for table Institute
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2012 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $news_id database column
+ * @property string $range_id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property User $user belongs_to User
+ * @property Course $course belongs_to Course
+ * @property Institute $institute belongs_to Institute
+ * @property mixed $type additional field
+ * @property mixed $name additional field
+ */
+class NewsRange extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'news_range';
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'range_id',
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name' => Course::class,
+            'foreign_key' => 'range_id',
+        ];
+        $config['belongs_to']['institute'] = [
+            'class_name' => Institute::class,
+            'foreign_key' => 'range_id',
+        ];
+        $config['additional_fields']['type'] = true;
+        $config['additional_fields']['name'] = true;
+        parent::configure($config);
+    }
+
+    function getType()
+    {
+        return get_object_type($this->range_id, ['sem','inst','user','fak']);
+    }
+
+    function getName()
+    {
+        switch ($this->type) {
+            case 'global':
+                return _('Stud.IP-Startseite');
+                break;
+            case 'sem':
+                return $this->course->name;
+                break;
+            case 'user':
+                return $this->user->getFullName();
+                break;
+            case 'inst':
+            case 'fak':
+                return $this->institute->name;
+                break;
+            }
+    }
+}
diff --git a/lib/models/NewsRoles.class.php b/lib/models/NewsRoles.class.php
deleted file mode 100644
index 56da6ec..0000000
--- a/lib/models/NewsRoles.class.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * NewsRoles.class.php - model class for the news roles
- *
- * 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.
- *
- * @author      Sebastian Biller <s.biller@tu-braunschweig.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     admin
- * @since       5.1
- *
- * @property array $id alias for pk
- * @property string $news_id database column
- * @property int $roleid database column
- * @property StudipNews $news_ranges belongs_to StudipNews
- */
-
-class NewsRoles extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'news_roles';
-
-        $config['belongs_to']['news_ranges'] = [
-            'class_name'  => StudipNews::class,
-            'foreign_key' => 'news_id',
-        ];
-
-        parent::configure($config);
-    }
-
-    public static function checkUserAccess($news_id, $user_id = null)
-    {
-        $user_id = $user_id ?: (isset($GLOBALS['user']) ? $GLOBALS['user']->id : null);
-        $news_roles = self::getRoles($news_id);
-
-        if (!$news_roles) {
-            return true;
-        }
-
-        if (!$user_id) {
-            return false;
-        }
-
-        $user_roles = RolePersistence::getAssignedRoles($user_id, true);
-
-        foreach ($news_roles as $news_role) {
-            foreach ($user_roles as $user_role) {
-                if ($news_role->getRoleid() === $user_role->getRoleid()) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public static function getRoles($news_id)
-    {
-        $news_roles = self::findBynews_id($news_id);
-        $news_role_ids = [];
-        foreach ($news_roles as $news_role) {
-            $news_role_ids[] = $news_role['roleid'];
-        }
-
-        $only_system_roles = Config::get()->NEWS_ONLY_SYSTEM_ROLES;
-        $roles = RolePersistence::getAllRoles();
-        $re = [];
-        foreach ($news_role_ids as $role_id) {
-            if (isset($roles[$role_id])) {
-                if ($only_system_roles && !$roles[$role_id]->getSystemtype()) {
-                    continue;
-                }
-                $re[$role_id] = $roles[$role_id];
-            }
-        }
-        return $re;
-    }
-
-    public static function getAvailableRoles($news_id = null)
-    {
-        $news_role_ids = [];
-        if ($news_id) {
-            $news_roles = self::findBynews_id($news_id);
-            foreach ($news_roles as $news_role) {
-                $news_role_ids[] = $news_role['roleid'];
-            }
-        }
-
-        $only_system_roles = Config::get()->NEWS_ONLY_SYSTEM_ROLES;
-        $roles = RolePersistence::getAllRoles();
-        $rolesStats = RolePersistence::getStatistics();
-        $re = [];
-        foreach ($roles as $key => $role) {
-            if (!in_array($key, $news_role_ids)) {
-                if ($only_system_roles && !$role->getSystemtype()) {
-                    continue;
-                }
-                if ($rolesStats[$role->getRoleid()]['explicit'] + $rolesStats[$role->getRoleid()]['implicit'] == 0) {
-                    continue;
-                }
-                $re[$key] = $role;
-            }
-        }
-
-        return $re;
-    }
-
-    public static function update($news_id, $new_roles)
-    {
-        self::deleteBynews_id($news_id);
-
-        if ($new_roles) {
-            foreach ($new_roles as $new_role) {
-                $NewsRoles = new self();
-                $NewsRoles->news_id = $news_id;
-                $NewsRoles->roleid = $new_role;
-                $NewsRoles->store();
-            }
-        }
-    }
-
-    public static function load($new_roles)
-    {
-        $roles = RolePersistence::getAllRoles();
-
-        return array_filter(array_map(
-            function ($role_id) use ($roles) {
-                if (!isset($roles[$role_id])) {
-                    return false;
-                }
-                return [$role_id, $roles[$role_id]];
-            },
-            $new_roles
-        ));
-    }
-}
diff --git a/lib/models/NewsRoles.php b/lib/models/NewsRoles.php
new file mode 100644
index 0000000..56da6ec
--- /dev/null
+++ b/lib/models/NewsRoles.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * NewsRoles.class.php - model class for the news roles
+ *
+ * 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.
+ *
+ * @author      Sebastian Biller <s.biller@tu-braunschweig.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     admin
+ * @since       5.1
+ *
+ * @property array $id alias for pk
+ * @property string $news_id database column
+ * @property int $roleid database column
+ * @property StudipNews $news_ranges belongs_to StudipNews
+ */
+
+class NewsRoles extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'news_roles';
+
+        $config['belongs_to']['news_ranges'] = [
+            'class_name'  => StudipNews::class,
+            'foreign_key' => 'news_id',
+        ];
+
+        parent::configure($config);
+    }
+
+    public static function checkUserAccess($news_id, $user_id = null)
+    {
+        $user_id = $user_id ?: (isset($GLOBALS['user']) ? $GLOBALS['user']->id : null);
+        $news_roles = self::getRoles($news_id);
+
+        if (!$news_roles) {
+            return true;
+        }
+
+        if (!$user_id) {
+            return false;
+        }
+
+        $user_roles = RolePersistence::getAssignedRoles($user_id, true);
+
+        foreach ($news_roles as $news_role) {
+            foreach ($user_roles as $user_role) {
+                if ($news_role->getRoleid() === $user_role->getRoleid()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public static function getRoles($news_id)
+    {
+        $news_roles = self::findBynews_id($news_id);
+        $news_role_ids = [];
+        foreach ($news_roles as $news_role) {
+            $news_role_ids[] = $news_role['roleid'];
+        }
+
+        $only_system_roles = Config::get()->NEWS_ONLY_SYSTEM_ROLES;
+        $roles = RolePersistence::getAllRoles();
+        $re = [];
+        foreach ($news_role_ids as $role_id) {
+            if (isset($roles[$role_id])) {
+                if ($only_system_roles && !$roles[$role_id]->getSystemtype()) {
+                    continue;
+                }
+                $re[$role_id] = $roles[$role_id];
+            }
+        }
+        return $re;
+    }
+
+    public static function getAvailableRoles($news_id = null)
+    {
+        $news_role_ids = [];
+        if ($news_id) {
+            $news_roles = self::findBynews_id($news_id);
+            foreach ($news_roles as $news_role) {
+                $news_role_ids[] = $news_role['roleid'];
+            }
+        }
+
+        $only_system_roles = Config::get()->NEWS_ONLY_SYSTEM_ROLES;
+        $roles = RolePersistence::getAllRoles();
+        $rolesStats = RolePersistence::getStatistics();
+        $re = [];
+        foreach ($roles as $key => $role) {
+            if (!in_array($key, $news_role_ids)) {
+                if ($only_system_roles && !$role->getSystemtype()) {
+                    continue;
+                }
+                if ($rolesStats[$role->getRoleid()]['explicit'] + $rolesStats[$role->getRoleid()]['implicit'] == 0) {
+                    continue;
+                }
+                $re[$key] = $role;
+            }
+        }
+
+        return $re;
+    }
+
+    public static function update($news_id, $new_roles)
+    {
+        self::deleteBynews_id($news_id);
+
+        if ($new_roles) {
+            foreach ($new_roles as $new_role) {
+                $NewsRoles = new self();
+                $NewsRoles->news_id = $news_id;
+                $NewsRoles->roleid = $new_role;
+                $NewsRoles->store();
+            }
+        }
+    }
+
+    public static function load($new_roles)
+    {
+        $roles = RolePersistence::getAllRoles();
+
+        return array_filter(array_map(
+            function ($role_id) use ($roles) {
+                if (!isset($roles[$role_id])) {
+                    return false;
+                }
+                return [$role_id, $roles[$role_id]];
+            },
+            $new_roles
+        ));
+    }
+}
diff --git a/lib/models/OpenGraphURL.class.php b/lib/models/OpenGraphURL.class.php
deleted file mode 100644
index 29e5718..0000000
--- a/lib/models/OpenGraphURL.class.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/*
- * Copyright (C) 2013 - Rasmus Fuhse <fuhse@data-quest.de>
- *
- * 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.
- */
-
-/**
- * A model class to handle the database table "opengraphdata", fetch data from
- * an Opengraph-URL and render a fitting box with the opengraph information to
- * the user.
- *
- * @property int $id alias column for opengraph_id
- * @property int $opengraph_id database column
- * @property string $hash database column
- * @property string $url database column
- * @property int|null $is_opengraph database column
- * @property string|null $title database column
- * @property string|null $image database column
- * @property string|null $description database column
- * @property string|null $type database column
- * @property JSONArrayObject $data database column
- * @property int $last_update database column
- * @property int $chdate database column
- * @property int $mkdate database column
- */
-class OpenGraphURL extends SimpleORMap
-{
-    const EXPIRES_DURATION = 86400; // = 24 * 60 * 60
-
-    /**
-     * Configures this model.
-     *
-     * @param Array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'opengraphdata';
-
-        $config['serialized_fields']['data'] = JSONArrayObject::class;
-
-        parent::configure($config);
-    }
-
-    /**
-     * Create an instance of this model given url. Differs from findOneByURL
-     * insofar that it will return a new object with the given url set
-     * instead of null.
-     *
-     * @param String $url URL to find
-     * @return OpenGraphURL Either existing instance or a new instance for
-     *                      the given url
-     */
-    public static function fromURL($url)
-    {
-        $og = self::findOneByUrl($url);
-        if (!$og) {
-            $og = new self();
-            $og->url = $url;
-        }
-        return $og;
-    }
-
-    /**
-     * Specialized findOneByURL function that uses the hash to find the
-     * appropriate record instead.
-     *
-     * @param  string $url URL to find record for
-     * @return mixed instance of OpenGraphURL if available, null otherwise
-     */
-    public static function findOneByURL($url)
-    {
-        return self::findOneByHash(md5($url));
-    }
-
-    /**
-     * Constructor of the object. Provides a fallback if a url is passed
-     * instead of the usually expected numeric id in order to not break
-     * backward compatibility.
-     * But this constructor will fail miserably if a url is passed that
-     * is not in the database. This was chosen by design to encourage the
-     * correct use of an id.
-     *
-     * @param mixed $id Numeric id, existing url or null
-     */
-    public function __construct($id = null)
-    {
-        // Try to find matching id when an url is passed instead of an id.
-        // This is to ensure that no legacy code will immediately break.
-        if ($id !== null && !ctype_digit($id)) {
-            $temp = self::findOneByUrl($id);
-            if ($temp) {
-                $id = $temp->id;
-            }
-        }
-
-        parent::__construct($id);
-    }
-
-    /**
-     * Sets value of a column. Overwritten so that the hash is also set when
-     * the url is set.
-     *
-     * @param string $field
-     * @param string $value
-     * @return string
-     * @see SimpleORMap::setValue
-     */
-    public function setValue($field, $value)
-    {
-        $ret = parent::setValue($field, $value);
-
-        if ($field === 'url') {
-            $this->content['hash'] = md5($value);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Stores the object and fetches the opengraph information when either
-     * the object is new or outdated.
-     *
-     * @return int Number of updated records
-     */
-    public function store()
-    {
-        if ($this->isNew() || $this->last_update < time() - self::EXPIRES_DURATION) {
-            // Store last update timestamp BEFORE fetching so another thread
-            // will not fetch again
-            $this->last_update = time();
-            parent::store();
-
-            $this->fetch();
-        }
-
-        return parent::store();
-    }
-
-    /**
-     * Fetches information from the url by getting the contents of the
-     * webpage, parse the webpage and extract the information from the
-     * opengraph meta-tags.
-     * If the site doesn't have any opengraph-metatags it is in fact no
-     * opengraph node and thus no data will be stored in the database.
-     * Only $url['is_opengraph'] === '0' indicates that the site is no
-     * opengraph node at all.
-     *
-     * @todo The combination of FileManager::fetchURLMetadata() and the following request
-     *       leads to two requests for the open graph data. This should
-     *       be fixed due to performance reasons.
-     */
-    public function fetch()
-    {
-        if (!Config::get()->OPENGRAPH_ENABLE) {
-            return;
-        }
-
-        $isOpenGraph = false;
-
-        $response = FileManager::fetchURLMetadata($this['url']);
-        if ((int)$response['response_code'] === 200 && isset($response['Content-Type']) && mb_strpos($response['Content-Type'],'html') !== false) {
-            if (preg_match('/(?<=charset=)[^;]*/i', $response['Content-Type'], $match)) {
-                $currentEncoding = trim($match[0], '"');
-            } else {
-                $currentEncoding = 'UTF-8';
-            }
-
-            $context = get_default_http_stream_context($this['url']);
-            stream_context_set_option($context, [
-                'http' => [
-                    'method' => 'GET',
-                    'header' => sprintf("User-Agent: Stud.IP v%s OpenGraph Parser\r\n", $GLOBALS['SOFTWARE_VERSION']),
-                ],
-            ]);
-
-            $content = @file_get_contents($this['url'], false, $context);
-
-            if ($content === false) {
-                return;
-            }
-
-            $content = mb_encode_numericentity($content, [0x80, 0xffff, 0, 0xffff], $currentEncoding);
-            $old_libxml_error = libxml_use_internal_errors(true);
-            $doc = new DOMDocument();
-            $doc->loadHTML($content);
-            libxml_use_internal_errors($old_libxml_error);
-
-            $metatags = $doc->getElementsByTagName('meta');
-            $reservedTags = ['url', 'chdate', 'mkdate', 'last_update', 'is_opengraph', 'data'];
-            $ogTags = [];
-            $data = [];
-            foreach ($metatags as $tag) {
-                $key = false;
-                if ($tag->hasAttribute('property')
-                    && mb_strpos($tag->getAttribute('property'), 'og:') === 0)
-                {
-                    $key = mb_strtolower(mb_substr($tag->getAttribute('property'), 3));
-                }
-                if (!$key && $tag->hasAttribute('name')
-                    && mb_strpos($tag->getAttribute('name'), 'og:') === 0)
-                {
-                    $key = mb_strtolower(mb_substr($tag->getAttribute('name'), 3));
-                }
-                if ($key) {
-                    $content = $tag->getAttribute('content');
-                    $data[] = ['og:'.$key => $content];
-                    $ogTags[$key] = $content;
-                    $isOpenGraph = true;
-                }
-            }
-            foreach ($ogTags as $key => $tag) {
-                if ($this->isField($key) && !in_array($key, $reservedTags)) {
-                    $this[$key] = $tag;
-                }
-            }
-            if (empty($this['title']) && $isOpenGraph) {
-                $titles = $doc->getElementsByTagName('title');
-                if ($titles->length > 0) {
-                    $this['title'] = $titles->item(0)->textContent;
-                }
-            }
-            if (empty($this['description']) && $isOpenGraph) {
-                foreach ($metatags as $tag) {
-                    if (mb_stripos($tag->getAttribute('name'), "description") !== false
-                        || mb_stripos($tag->getAttribute('property'), "description") !== false)
-                    {
-                        $this['description'] = $tag->getAttribute('content');
-                    }
-                }
-            }
-            $this['data'] = $data;
-        }
-
-        $this['is_opengraph'] = (int) $isOpenGraph;
-    }
-
-    /**
-     * Renders a small box with the information of the opengraph url. Used in
-     * blubber and in the forum.
-     *
-     * @return string html output of the box.
-     */
-    public function render()
-    {
-        if (!Config::get()->OPENGRAPH_ENABLE || !$this->getValue('is_opengraph')) {
-            return '';
-        }
-        $template = $GLOBALS['template_factory']->open('shared/opengraphinfo_wide.php');
-        $template->og = $this;
-        return $template->render();
-    }
-
-    /**
-     * Returns an array with all audiofiles that are provided by the opengraph-node.
-     * Each array-entry is an array itself with the url as first parameter and the
-     * content-type (important for <audio/> tags) as the second.
-     *
-     * @return array(array($url, $content_type), ...)
-     */
-    public function getAudioFiles()
-    {
-        return $this->getMediaFiles('audio');
-    }
-
-    /**
-     * Returns an array with all videofiles that are provided by the opengraph-node.
-     * Each array-entry is an array itself with the url as first parameter and the
-     * content-type (important for <video/> tags) as the second.
-     *
-     * @return array(array($url, $content_type), ...)
-     */
-    public function getVideoFiles()
-    {
-        return $this->getMediaFiles('video');
-    }
-
-    /**
-     * Returns an array with all mediafiles that are provided by the opengraph-node.
-     * Each array-entry is an array itself with the url as first parameter and the
-     * content-type (important for <audio/> or <video/> tags) as the second.
-     *
-     * @param string $type "audio" or "video"
-     * @return array(array($url, $content_type), ...)
-     */
-    protected function getMediaFiles($type)
-    {
-        $files = [];
-        $media = [];
-        $secure_media = [];
-        $media_types = [];
-        foreach ($this['data'] as $meta) {
-            foreach ($meta as $key => $value) {
-                switch ($key) {
-                    case "og:{$type}:url":
-                    case "og:{$type}":
-                        $media[] = $value;
-                        break;
-                    case "og:{$type}:secure_url":
-                        $secure_media[] = $value;
-                        break;
-                    case "og:{$type}:type":
-                        $media_types[] = $value;
-                        break;
-                }
-            }
-        }
-        if (
-            isset($_SERVER['HTTPS'])
-            && $_SERVER['HTTPS'] === 'on'
-            && count($secure_media) > 0
-        ) {
-            foreach ($secure_media as $index => $url) {
-                $files[] = [$url, $media_types[$index]];
-            }
-        } else {
-            foreach ($media as $index => $url) {
-                $files[] = [$url, $media_types[$index]];
-            }
-        }
-        return $files;
-    }
-}
diff --git a/lib/models/OpenGraphURL.php b/lib/models/OpenGraphURL.php
new file mode 100644
index 0000000..29e5718
--- /dev/null
+++ b/lib/models/OpenGraphURL.php
@@ -0,0 +1,326 @@
+<?php
+/*
+ * Copyright (C) 2013 - Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ * 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.
+ */
+
+/**
+ * A model class to handle the database table "opengraphdata", fetch data from
+ * an Opengraph-URL and render a fitting box with the opengraph information to
+ * the user.
+ *
+ * @property int $id alias column for opengraph_id
+ * @property int $opengraph_id database column
+ * @property string $hash database column
+ * @property string $url database column
+ * @property int|null $is_opengraph database column
+ * @property string|null $title database column
+ * @property string|null $image database column
+ * @property string|null $description database column
+ * @property string|null $type database column
+ * @property JSONArrayObject $data database column
+ * @property int $last_update database column
+ * @property int $chdate database column
+ * @property int $mkdate database column
+ */
+class OpenGraphURL extends SimpleORMap
+{
+    const EXPIRES_DURATION = 86400; // = 24 * 60 * 60
+
+    /**
+     * Configures this model.
+     *
+     * @param Array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'opengraphdata';
+
+        $config['serialized_fields']['data'] = JSONArrayObject::class;
+
+        parent::configure($config);
+    }
+
+    /**
+     * Create an instance of this model given url. Differs from findOneByURL
+     * insofar that it will return a new object with the given url set
+     * instead of null.
+     *
+     * @param String $url URL to find
+     * @return OpenGraphURL Either existing instance or a new instance for
+     *                      the given url
+     */
+    public static function fromURL($url)
+    {
+        $og = self::findOneByUrl($url);
+        if (!$og) {
+            $og = new self();
+            $og->url = $url;
+        }
+        return $og;
+    }
+
+    /**
+     * Specialized findOneByURL function that uses the hash to find the
+     * appropriate record instead.
+     *
+     * @param  string $url URL to find record for
+     * @return mixed instance of OpenGraphURL if available, null otherwise
+     */
+    public static function findOneByURL($url)
+    {
+        return self::findOneByHash(md5($url));
+    }
+
+    /**
+     * Constructor of the object. Provides a fallback if a url is passed
+     * instead of the usually expected numeric id in order to not break
+     * backward compatibility.
+     * But this constructor will fail miserably if a url is passed that
+     * is not in the database. This was chosen by design to encourage the
+     * correct use of an id.
+     *
+     * @param mixed $id Numeric id, existing url or null
+     */
+    public function __construct($id = null)
+    {
+        // Try to find matching id when an url is passed instead of an id.
+        // This is to ensure that no legacy code will immediately break.
+        if ($id !== null && !ctype_digit($id)) {
+            $temp = self::findOneByUrl($id);
+            if ($temp) {
+                $id = $temp->id;
+            }
+        }
+
+        parent::__construct($id);
+    }
+
+    /**
+     * Sets value of a column. Overwritten so that the hash is also set when
+     * the url is set.
+     *
+     * @param string $field
+     * @param string $value
+     * @return string
+     * @see SimpleORMap::setValue
+     */
+    public function setValue($field, $value)
+    {
+        $ret = parent::setValue($field, $value);
+
+        if ($field === 'url') {
+            $this->content['hash'] = md5($value);
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Stores the object and fetches the opengraph information when either
+     * the object is new or outdated.
+     *
+     * @return int Number of updated records
+     */
+    public function store()
+    {
+        if ($this->isNew() || $this->last_update < time() - self::EXPIRES_DURATION) {
+            // Store last update timestamp BEFORE fetching so another thread
+            // will not fetch again
+            $this->last_update = time();
+            parent::store();
+
+            $this->fetch();
+        }
+
+        return parent::store();
+    }
+
+    /**
+     * Fetches information from the url by getting the contents of the
+     * webpage, parse the webpage and extract the information from the
+     * opengraph meta-tags.
+     * If the site doesn't have any opengraph-metatags it is in fact no
+     * opengraph node and thus no data will be stored in the database.
+     * Only $url['is_opengraph'] === '0' indicates that the site is no
+     * opengraph node at all.
+     *
+     * @todo The combination of FileManager::fetchURLMetadata() and the following request
+     *       leads to two requests for the open graph data. This should
+     *       be fixed due to performance reasons.
+     */
+    public function fetch()
+    {
+        if (!Config::get()->OPENGRAPH_ENABLE) {
+            return;
+        }
+
+        $isOpenGraph = false;
+
+        $response = FileManager::fetchURLMetadata($this['url']);
+        if ((int)$response['response_code'] === 200 && isset($response['Content-Type']) && mb_strpos($response['Content-Type'],'html') !== false) {
+            if (preg_match('/(?<=charset=)[^;]*/i', $response['Content-Type'], $match)) {
+                $currentEncoding = trim($match[0], '"');
+            } else {
+                $currentEncoding = 'UTF-8';
+            }
+
+            $context = get_default_http_stream_context($this['url']);
+            stream_context_set_option($context, [
+                'http' => [
+                    'method' => 'GET',
+                    'header' => sprintf("User-Agent: Stud.IP v%s OpenGraph Parser\r\n", $GLOBALS['SOFTWARE_VERSION']),
+                ],
+            ]);
+
+            $content = @file_get_contents($this['url'], false, $context);
+
+            if ($content === false) {
+                return;
+            }
+
+            $content = mb_encode_numericentity($content, [0x80, 0xffff, 0, 0xffff], $currentEncoding);
+            $old_libxml_error = libxml_use_internal_errors(true);
+            $doc = new DOMDocument();
+            $doc->loadHTML($content);
+            libxml_use_internal_errors($old_libxml_error);
+
+            $metatags = $doc->getElementsByTagName('meta');
+            $reservedTags = ['url', 'chdate', 'mkdate', 'last_update', 'is_opengraph', 'data'];
+            $ogTags = [];
+            $data = [];
+            foreach ($metatags as $tag) {
+                $key = false;
+                if ($tag->hasAttribute('property')
+                    && mb_strpos($tag->getAttribute('property'), 'og:') === 0)
+                {
+                    $key = mb_strtolower(mb_substr($tag->getAttribute('property'), 3));
+                }
+                if (!$key && $tag->hasAttribute('name')
+                    && mb_strpos($tag->getAttribute('name'), 'og:') === 0)
+                {
+                    $key = mb_strtolower(mb_substr($tag->getAttribute('name'), 3));
+                }
+                if ($key) {
+                    $content = $tag->getAttribute('content');
+                    $data[] = ['og:'.$key => $content];
+                    $ogTags[$key] = $content;
+                    $isOpenGraph = true;
+                }
+            }
+            foreach ($ogTags as $key => $tag) {
+                if ($this->isField($key) && !in_array($key, $reservedTags)) {
+                    $this[$key] = $tag;
+                }
+            }
+            if (empty($this['title']) && $isOpenGraph) {
+                $titles = $doc->getElementsByTagName('title');
+                if ($titles->length > 0) {
+                    $this['title'] = $titles->item(0)->textContent;
+                }
+            }
+            if (empty($this['description']) && $isOpenGraph) {
+                foreach ($metatags as $tag) {
+                    if (mb_stripos($tag->getAttribute('name'), "description") !== false
+                        || mb_stripos($tag->getAttribute('property'), "description") !== false)
+                    {
+                        $this['description'] = $tag->getAttribute('content');
+                    }
+                }
+            }
+            $this['data'] = $data;
+        }
+
+        $this['is_opengraph'] = (int) $isOpenGraph;
+    }
+
+    /**
+     * Renders a small box with the information of the opengraph url. Used in
+     * blubber and in the forum.
+     *
+     * @return string html output of the box.
+     */
+    public function render()
+    {
+        if (!Config::get()->OPENGRAPH_ENABLE || !$this->getValue('is_opengraph')) {
+            return '';
+        }
+        $template = $GLOBALS['template_factory']->open('shared/opengraphinfo_wide.php');
+        $template->og = $this;
+        return $template->render();
+    }
+
+    /**
+     * Returns an array with all audiofiles that are provided by the opengraph-node.
+     * Each array-entry is an array itself with the url as first parameter and the
+     * content-type (important for <audio/> tags) as the second.
+     *
+     * @return array(array($url, $content_type), ...)
+     */
+    public function getAudioFiles()
+    {
+        return $this->getMediaFiles('audio');
+    }
+
+    /**
+     * Returns an array with all videofiles that are provided by the opengraph-node.
+     * Each array-entry is an array itself with the url as first parameter and the
+     * content-type (important for <video/> tags) as the second.
+     *
+     * @return array(array($url, $content_type), ...)
+     */
+    public function getVideoFiles()
+    {
+        return $this->getMediaFiles('video');
+    }
+
+    /**
+     * Returns an array with all mediafiles that are provided by the opengraph-node.
+     * Each array-entry is an array itself with the url as first parameter and the
+     * content-type (important for <audio/> or <video/> tags) as the second.
+     *
+     * @param string $type "audio" or "video"
+     * @return array(array($url, $content_type), ...)
+     */
+    protected function getMediaFiles($type)
+    {
+        $files = [];
+        $media = [];
+        $secure_media = [];
+        $media_types = [];
+        foreach ($this['data'] as $meta) {
+            foreach ($meta as $key => $value) {
+                switch ($key) {
+                    case "og:{$type}:url":
+                    case "og:{$type}":
+                        $media[] = $value;
+                        break;
+                    case "og:{$type}:secure_url":
+                        $secure_media[] = $value;
+                        break;
+                    case "og:{$type}:type":
+                        $media_types[] = $value;
+                        break;
+                }
+            }
+        }
+        if (
+            isset($_SERVER['HTTPS'])
+            && $_SERVER['HTTPS'] === 'on'
+            && count($secure_media) > 0
+        ) {
+            foreach ($secure_media as $index => $url) {
+                $files[] = [$url, $media_types[$index]];
+            }
+        } else {
+            foreach ($media as $index => $url) {
+                $files[] = [$url, $media_types[$index]];
+            }
+        }
+        return $files;
+    }
+}
diff --git a/lib/models/OpenGraphURLCollection.class.php b/lib/models/OpenGraphURLCollection.class.php
deleted file mode 100644
index f575945..0000000
--- a/lib/models/OpenGraphURLCollection.class.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Specialized version of SimpleORMapCollection that accepts only
- * OpenGraphURL objects and provides a method that renders the collection
- * to html.
- *
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- */
-class OpenGraphURLCollection extends SimpleORMapCollection
-{
-    /**
-     * Returns the class name of the object this collection accepts.
-     *
-     * @return String containing the provided class name 'OpenGraphURL'
-     */
-    public function getClassName()
-    {
-        return 'OpenGraphURL';
-    }
-
-    /**
-     * Renders the collection to html. The collection is usually wrapped in
-     * a wrapper element but in some edge cases you might want to choose not
-     * to do so. This is enabled by the only parameter this method accepts.
-     *
-     * Note: I advice you not to exclude the wrapper. The javascript that
-     * handles the collection will fail!
-     *
-     * @param bool $with_wrapper Should the collection be wrapped in a wrapper
-     *                           element (optional, defaults to true)
-     * @return String containing the rendered collection as a html chunk
-     */
-    public function render($with_wrapper = true)
-    {
-        if (!Config::Get()->OPENGRAPH_ENABLE || count($this) === 0) {
-            return '';
-        }
-
-        $rendered_urls = $this->sendMessage('render');
-        $rendered_urls = array_filter($rendered_urls);
-
-        if (count($rendered_urls) === 0) {
-            return '';
-        }
-
-        if ($with_wrapper) {
-            $template = $GLOBALS['template_factory']->open('shared/opengraph-container.php');
-            $template->urls = $rendered_urls;
-            $result = $template->render();
-        } else {
-            $result = implode("\n", $rendered_urls);
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/models/OpenGraphURLCollection.php b/lib/models/OpenGraphURLCollection.php
new file mode 100644
index 0000000..f575945
--- /dev/null
+++ b/lib/models/OpenGraphURLCollection.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Specialized version of SimpleORMapCollection that accepts only
+ * OpenGraphURL objects and provides a method that renders the collection
+ * to html.
+ *
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ */
+class OpenGraphURLCollection extends SimpleORMapCollection
+{
+    /**
+     * Returns the class name of the object this collection accepts.
+     *
+     * @return String containing the provided class name 'OpenGraphURL'
+     */
+    public function getClassName()
+    {
+        return 'OpenGraphURL';
+    }
+
+    /**
+     * Renders the collection to html. The collection is usually wrapped in
+     * a wrapper element but in some edge cases you might want to choose not
+     * to do so. This is enabled by the only parameter this method accepts.
+     *
+     * Note: I advice you not to exclude the wrapper. The javascript that
+     * handles the collection will fail!
+     *
+     * @param bool $with_wrapper Should the collection be wrapped in a wrapper
+     *                           element (optional, defaults to true)
+     * @return String containing the rendered collection as a html chunk
+     */
+    public function render($with_wrapper = true)
+    {
+        if (!Config::Get()->OPENGRAPH_ENABLE || count($this) === 0) {
+            return '';
+        }
+
+        $rendered_urls = $this->sendMessage('render');
+        $rendered_urls = array_filter($rendered_urls);
+
+        if (count($rendered_urls) === 0) {
+            return '';
+        }
+
+        if ($with_wrapper) {
+            $template = $GLOBALS['template_factory']->open('shared/opengraph-container.php');
+            $template->urls = $rendered_urls;
+            $result = $template->render();
+        } else {
+            $result = implode("\n", $rendered_urls);
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/models/PersonalNotifications.class.php b/lib/models/PersonalNotifications.class.php
deleted file mode 100644
index 12d9c1b..0000000
--- a/lib/models/PersonalNotifications.class.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-/**
- * This is an easy to use class to display personal notifications to the user,
- * that are shown in real-time. Users can deactivate the feature of personal
- * notifications, but by default it is turned on.
- *
- * For example if user A subscribed to the changes of a special wiki-page, and
- * another user B changed this wiki-page, you can inform user A about the change
- * by the following one-liner:
- *
- * PersonalNotifications::add(
- *      $user_A_user_id, //id of user A or array of ´multiple user_ids
- *      $url_of_wiki_page, //when user A clicks this URL he/she should jump directly to the changed wiki-page
- *      "User B changed wiki-page xyz", //a small text that describes the notification
- *      "wiki_page_1234", //an (optional) html-id of the content of the wiki page. If the user is looking at the content already, the notification will disappear automatically
- *      Icon::create('wiki', 'clickable'), //an (optional) icon that is displayed next to the notification-text
- * );
- *
- * Appearing to the user, deleting by the user and so on of the notification is
- * handled by this class automatically.
- *
- * 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.
- *
- * @author      Rasmus Fuhse <fuhse@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.4
- *
- * @property int $id alias column for personal_notification_id
- * @property int $personal_notification_id database column
- * @property string $url database column
- * @property string $text database column
- * @property string $avatar database column
- * @property int $dialog database column
- * @property string $html_id database column
- * @property int $mkdate database column
- * @property mixed $more_unseen additional field
- */
-class PersonalNotifications extends SimpleORMap
-{
-    const GC_MAX_DAYS = 30; // Garbage collector removes notifications after 30 days
-    const CACHE_DURATION = 86400; // 24 * 60 * 60 = 1 day
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'personal_notifications';
-        $config['additional_fields']['more_unseen'] = true;
-
-        $config['registered_callbacks']['after_store'][] = 'cbExpireCache';
-        $config['registered_callbacks']['before_delete'][] = 'cbExpireCache';
-
-        parent::configure($config);
-    }
-
-    protected $unseen = null;
-
-    protected function cbExpireCache()
-    {
-        $query = "SELECT user_id
-                  FROM personal_notifications_user
-                  WHERE personal_notification_id = :id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':id', $this->id);
-        $statement->execute();
-
-        $user_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-        foreach ($user_ids as $user_id) {
-            self::expireCache($user_id);
-        }
-    }
-
-    /**
-     * Garbage collector the personal notifications.
-     * Removes all notifications older than 30 days.
-     */
-    public static function doGarbageCollect()
-    {
-        $sql = "DELETE personal_notifications, personal_notifications_user
-                FROM personal_notifications
-                LEFT JOIN personal_notifications_user USING(personal_notification_id)
-                WHERE mkdate < ?";
-        $st = DBManager::get()->prepare($sql);
-        $st->execute([time() - self::GC_MAX_DAYS * 24 * 60 * 60]);
-    }
-
-    /**
-     * Central function to add a personal notification to the user. This could be
-     * anything that needs to catch the attention of the user. The notification
-     * will be displayed in realtime to the user and he/she can get to the url.
-     * @param array|string $user_ids : array of user_ids or a single md5-user_id
-     * @param string $url : URL of the point of interest of the notification
-     * @param string $text : a displayed text that describes the notification
-     * @param null|string $html_id : id in the html-document. If user reaches
-     *   this html-element the notification will be marked as read, so the user
-     *   does not need to handle the information twice. Optional. Default: null
-     * @param Icon|string $avatar : either an Icon or a URL of an
-     *   image for the notification. Best size: 40px x 40px
-     * @return boolean : true on success
-     */
-    public static function add($user_ids, $url, $text, $html_id = null, $avatar = null, $dialog = false)
-    {
-        if (!is_array($user_ids)) {
-            $user_ids = [$user_ids];
-        }
-
-        $user_ids = array_filter($user_ids, [self::class, 'isActivated']);
-
-        if (!count($user_ids)) {
-            return false;
-        }
-
-        $notification = new self();
-        $notification['html_id'] = $html_id;
-        $notification['url']     = $url;
-        $notification['text']    = $text;
-        $notification['avatar']  = $avatar instanceof Icon ? $avatar->asImagePath(40) : $avatar;
-        $notification['dialog']  = $dialog ? 1 : 0;
-        $notification->store();
-
-        foreach ($user_ids as $user_id) {
-            $notification->link($user_id);
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns all notifications fitting to the parameters.
-     * @param boolean $only_unread : true for getting only unread notifications, false for all.
-     * @param null|string $user_id : ID of special user the notification should belong to or (default:) null for current user
-     * @return array of \PersonalNotifications in ascending order of mkdate
-     */
-    public static function getMyNotifications($only_unread = true, $user_id = null, $limit = 15)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-
-        $cached = self::getCache($user_id);
-        if ($cached === false) {
-            $query = "SELECT pn.*, COUNT(DISTINCT personal_notification_id) - 1 AS unseen
-                      FROM personal_notifications AS pn
-                      INNER JOIN personal_notifications_user AS u USING (personal_notification_id)
-                      WHERE u.user_id = :user_id
-                        AND u.seen = IFNULL(:only_unread, u.seen)
-                      GROUP BY pn.url
-                      ORDER BY mkdate ASC
-                      LIMIT :limit";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':user_id', $user_id);
-            $statement->bindValue(':only_unread', $only_unread ? '0' : null);
-            $statement->bindValue(':limit', (int)$limit, StudipPDO::PARAM_COLUMN);
-            $statement->execute();
-
-            $db_data = $statement->fetchAll(PDO::FETCH_ASSOC);
-
-            self::setCache($user_id, $db_data);
-        } else {
-            $db_data = $cached;
-        }
-
-        $notifications = [];
-        foreach ($db_data as $data) {
-            $notification = new PersonalNotifications();
-            $notification->setData($data);
-            $notification->more_unseen = $data['unseen'];
-            $notifications[] = $notification;
-        }
-        return $notifications;
-    }
-
-    /**
-     * Mark a notification as read by the user. It won't appear anymore in the
-     * notification-list on top of its site.
-     * @param string $notification_id : ID of the notification
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     */
-    public static function markAsRead($notification_id, $user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        self::expireCache($user_id);
-
-        $pn = new PersonalNotifications($notification_id);
-        $notification_users = PersonalNotificationsUser::findBySQL("INNER JOIN personal_notifications USING (personal_notification_id) WHERE user_id = :user_id AND seen = '0' AND personal_notifications.url = :url ", [
-            'user_id' => $user_id,
-            'url' => $pn['url']
-        ]);
-        foreach ($notification_users as $notification_user) {
-            $notification_user['seen'] = 1;
-            $notification_user->store();
-        }
-    }
-
-    /**
-     * Marks all notifications as read by the user. It won't appear anymore in
-     * the notification-list on top of its site.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     * @return boolean : true on success, false if it failed.
-     */
-    public static function markAllAsRead($user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        self::expireCache($user_id);
-
-        $notification_users = PersonalNotificationsUser::findBySQL("user_id = :user_id AND seen = '0'", [
-            'user_id' => $user_id
-        ]);
-        foreach ($notification_users as $notification_user) {
-            $notification_user['seen'] = 1;
-            $notification_user->store();
-        }
-        return true;
-    }
-
-    /**
-     * Mark a notification as read for the user by the given HTML-ID. It won't appear anymore in the
-     * notification-list on top of its site.
-     * @param string $html_id : HTML ID attribute of the notification
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     */
-    public static function markAsReadByHTML($html_id, $user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        self::expireCache($user_id);
-
-        $notification_users = PersonalNotificationsUser::findBySQL("INNER JOIN personal_notifications USING (personal_notification_id) WHERE user_id = :user_id AND seen = '0' AND personal_notifications.html_id = :html_id ", [
-            'user_id' => $user_id,
-            'html_id' => $html_id
-        ]);
-        foreach ($notification_users as $notification_user) {
-            $notification_user['seen'] = 1;
-            $notification_user->store();
-        }
-    }
-
-    /**
-     * Returns the cache hash to use for a specific user.
-     *
-     * @param String $user_id Id of the user
-     * @return String Cache hash to use for the user
-     */
-    protected static function getCacheHash($user_id)
-    {
-        return '/personal-notifications/' . $user_id;
-    }
-
-    /**
-     * Returns the cached values for a specific user.
-     *
-     * @param String $user_id Id of the user
-     * @return mixed Array of item data (may be empty) or false if no data is cached
-     */
-    protected static function getCache($user_id)
-    {
-        $cache  = \Studip\Cache\Factory::getCache();
-        $hash   = self::getCacheHash($user_id);
-        $cached = $cache->read($hash);
-
-        if ($cached === false) {
-            return false;
-        }
-
-        return unserialize($cached);
-    }
-
-    /**
-     * Stored the provided item data in cache for a specific user.
-     *
-     * @param String $user_id Id of the user
-     * @param Array  $items   Raw db data of the items
-     */
-    protected static function setCache($user_id, $items)
-    {
-        $cache = \Studip\Cache\Factory::getCache();
-        $hash  = self::getCacheHash($user_id);
-        $cache->write($hash, serialize($items), self::CACHE_DURATION);
-    }
-
-    /**
-     * Removes the cached entries for a specific user.
-     *
-     * @param String $user_id Id of the user
-     */
-    protected static function expireCache($user_id)
-    {
-        $cache = \Studip\Cache\Factory::getCache();
-        $hash  = self::getCacheHash($user_id);
-        $cache->expire($hash);
-    }
-
-    /**
-     * Activates personal notifications for a given user.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     */
-    public static function activate($user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_DEACTIVATED", "0");
-    }
-
-    /**
-     * Deactivates personal notifications for a given user.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     */
-    public static function deactivate($user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_DEACTIVATED", "1");
-    }
-
-    /**
-     * Activates audio plopp for new personal notifications for a given user.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     */
-    public static function activateAudioFeedback($user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED", "0");
-    }
-
-    /**
-     * Deactivates audio plopp for new personal notifications for a given user.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     */
-    public static function deactivateAudioFeedback($user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED", "1");
-    }
-
-    /**
-     * Checks if personal notifications are activated for the whole Stud.IP. This
-     * could be false for performance issues.
-     * @return boolean : true if activated else false
-     */
-    public static function isGloballyActivated()
-    {
-        $config = Config::GetInstance();
-        return !empty($config['PERSONAL_NOTIFICATIONS_ACTIVATED']);
-    }
-
-    /**
-     * Checks if a given user should see the personal notification. Either the
-     * Stud.IP or the user could deactivate personal notification. If neither is
-     * the case, this function returns true.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     * @return boolean : true if activated else false
-     */
-    public static function isActivated($user_id = null)
-    {
-        if (!PersonalNotifications::isGloballyActivated()) {
-            return false;
-        }
-
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        return (new UserConfig($user_id))->getValue('PERSONAL_NOTIFICATIONS_DEACTIVATED') ? false : true;
-    }
-
-    /**
-     * Checks if a given user should hear audio plopp for new personal notification.
-     * Either the Stud.IP or the user could deactivate personal notification or
-     * audio feedback. If neither is the case, this function returns true.
-     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
-     * @return boolean : true if activated else false
-     */
-    public static function isAudioActivated($user_id = null)
-    {
-        if (!PersonalNotifications::isGloballyActivated()) {
-            return false;
-        }
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        return UserConfig::get($user_id)->getValue("PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED") ? false : true;
-    }
-
-    /**
-     * Returns HTML-represantation of the notification which is a list-element.
-     * @return string : html-output;
-     */
-    public function getLiElement()
-    {
-        return $GLOBALS['template_factory']
-                ->open('personal_notifications/notification.php')
-                ->render(['notification' => $this]);
-    }
-
-    /**
-     * Sets the value of the "more unseen" notifications (notification with same url but a different id).
-     *
-     * @param int $unseen Number of more unseen notifications
-     */
-    public function setmore_unseen($unseen)
-    {
-        $this->unseen = (int)$unseen;
-    }
-
-    /**
-     * Returns (or retrieves) the number of "more unseen" notifications.
-     *
-     * @return int Number of "more unseen" notifications
-     */
-    public function getmore_unseen()
-    {
-        if ($this->unseen === null) {
-            $query = "SELECT COUNT(*)
-                      FROM personal_notifications AS pn
-                      INNER JOIN personal_notifications_user AS u USING (personal_notification_id)
-                      WHERE pn.personal_notification_id != :pn_id
-                        AND u.user_id = :user_id
-                        AND u.seen = '0'
-                        AND pn.url = :url";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                ':pn_id'   => $this->id,
-                ':user_id' => $GLOBALS['user']->id,
-                ':url'     => $this->url,
-            ]);
-            $this->unseen = 0 + $statement->fetchColumn();
-        }
-        return $this->unseen;
-    }
-
-    /**
-     * Links this notification to user.
-     *
-     * @param User|string $user_id_or_object User object or id of user
-     * @return PersonalNotificationsUser|false
-     */
-    public function link($user_id_or_object)
-    {
-        $user_id = $user_id_or_object instanceof User ? $user_id_or_object->id : $user_id_or_object;
-
-        // If not activated, return false
-        if (!self::isActivated($user_id)) {
-            return false;
-        }
-
-        // Expire cache for user
-        self::expireCache($user_id);
-
-        // Create link from notification to user
-        return PersonalNotificationsUser::create([
-            'personal_notification_id' => $this->id,
-            'user_id'                  => $user_id,
-            'seen'                     => 0,
-        ]);
-    }
-
-}
diff --git a/lib/models/PersonalNotifications.php b/lib/models/PersonalNotifications.php
new file mode 100644
index 0000000..12d9c1b
--- /dev/null
+++ b/lib/models/PersonalNotifications.php
@@ -0,0 +1,470 @@
+<?php
+/**
+ * This is an easy to use class to display personal notifications to the user,
+ * that are shown in real-time. Users can deactivate the feature of personal
+ * notifications, but by default it is turned on.
+ *
+ * For example if user A subscribed to the changes of a special wiki-page, and
+ * another user B changed this wiki-page, you can inform user A about the change
+ * by the following one-liner:
+ *
+ * PersonalNotifications::add(
+ *      $user_A_user_id, //id of user A or array of ´multiple user_ids
+ *      $url_of_wiki_page, //when user A clicks this URL he/she should jump directly to the changed wiki-page
+ *      "User B changed wiki-page xyz", //a small text that describes the notification
+ *      "wiki_page_1234", //an (optional) html-id of the content of the wiki page. If the user is looking at the content already, the notification will disappear automatically
+ *      Icon::create('wiki', 'clickable'), //an (optional) icon that is displayed next to the notification-text
+ * );
+ *
+ * Appearing to the user, deleting by the user and so on of the notification is
+ * handled by this class automatically.
+ *
+ * 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.
+ *
+ * @author      Rasmus Fuhse <fuhse@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.4
+ *
+ * @property int $id alias column for personal_notification_id
+ * @property int $personal_notification_id database column
+ * @property string $url database column
+ * @property string $text database column
+ * @property string $avatar database column
+ * @property int $dialog database column
+ * @property string $html_id database column
+ * @property int $mkdate database column
+ * @property mixed $more_unseen additional field
+ */
+class PersonalNotifications extends SimpleORMap
+{
+    const GC_MAX_DAYS = 30; // Garbage collector removes notifications after 30 days
+    const CACHE_DURATION = 86400; // 24 * 60 * 60 = 1 day
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'personal_notifications';
+        $config['additional_fields']['more_unseen'] = true;
+
+        $config['registered_callbacks']['after_store'][] = 'cbExpireCache';
+        $config['registered_callbacks']['before_delete'][] = 'cbExpireCache';
+
+        parent::configure($config);
+    }
+
+    protected $unseen = null;
+
+    protected function cbExpireCache()
+    {
+        $query = "SELECT user_id
+                  FROM personal_notifications_user
+                  WHERE personal_notification_id = :id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':id', $this->id);
+        $statement->execute();
+
+        $user_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+        foreach ($user_ids as $user_id) {
+            self::expireCache($user_id);
+        }
+    }
+
+    /**
+     * Garbage collector the personal notifications.
+     * Removes all notifications older than 30 days.
+     */
+    public static function doGarbageCollect()
+    {
+        $sql = "DELETE personal_notifications, personal_notifications_user
+                FROM personal_notifications
+                LEFT JOIN personal_notifications_user USING(personal_notification_id)
+                WHERE mkdate < ?";
+        $st = DBManager::get()->prepare($sql);
+        $st->execute([time() - self::GC_MAX_DAYS * 24 * 60 * 60]);
+    }
+
+    /**
+     * Central function to add a personal notification to the user. This could be
+     * anything that needs to catch the attention of the user. The notification
+     * will be displayed in realtime to the user and he/she can get to the url.
+     * @param array|string $user_ids : array of user_ids or a single md5-user_id
+     * @param string $url : URL of the point of interest of the notification
+     * @param string $text : a displayed text that describes the notification
+     * @param null|string $html_id : id in the html-document. If user reaches
+     *   this html-element the notification will be marked as read, so the user
+     *   does not need to handle the information twice. Optional. Default: null
+     * @param Icon|string $avatar : either an Icon or a URL of an
+     *   image for the notification. Best size: 40px x 40px
+     * @return boolean : true on success
+     */
+    public static function add($user_ids, $url, $text, $html_id = null, $avatar = null, $dialog = false)
+    {
+        if (!is_array($user_ids)) {
+            $user_ids = [$user_ids];
+        }
+
+        $user_ids = array_filter($user_ids, [self::class, 'isActivated']);
+
+        if (!count($user_ids)) {
+            return false;
+        }
+
+        $notification = new self();
+        $notification['html_id'] = $html_id;
+        $notification['url']     = $url;
+        $notification['text']    = $text;
+        $notification['avatar']  = $avatar instanceof Icon ? $avatar->asImagePath(40) : $avatar;
+        $notification['dialog']  = $dialog ? 1 : 0;
+        $notification->store();
+
+        foreach ($user_ids as $user_id) {
+            $notification->link($user_id);
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns all notifications fitting to the parameters.
+     * @param boolean $only_unread : true for getting only unread notifications, false for all.
+     * @param null|string $user_id : ID of special user the notification should belong to or (default:) null for current user
+     * @return array of \PersonalNotifications in ascending order of mkdate
+     */
+    public static function getMyNotifications($only_unread = true, $user_id = null, $limit = 15)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+
+        $cached = self::getCache($user_id);
+        if ($cached === false) {
+            $query = "SELECT pn.*, COUNT(DISTINCT personal_notification_id) - 1 AS unseen
+                      FROM personal_notifications AS pn
+                      INNER JOIN personal_notifications_user AS u USING (personal_notification_id)
+                      WHERE u.user_id = :user_id
+                        AND u.seen = IFNULL(:only_unread, u.seen)
+                      GROUP BY pn.url
+                      ORDER BY mkdate ASC
+                      LIMIT :limit";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':user_id', $user_id);
+            $statement->bindValue(':only_unread', $only_unread ? '0' : null);
+            $statement->bindValue(':limit', (int)$limit, StudipPDO::PARAM_COLUMN);
+            $statement->execute();
+
+            $db_data = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+            self::setCache($user_id, $db_data);
+        } else {
+            $db_data = $cached;
+        }
+
+        $notifications = [];
+        foreach ($db_data as $data) {
+            $notification = new PersonalNotifications();
+            $notification->setData($data);
+            $notification->more_unseen = $data['unseen'];
+            $notifications[] = $notification;
+        }
+        return $notifications;
+    }
+
+    /**
+     * Mark a notification as read by the user. It won't appear anymore in the
+     * notification-list on top of its site.
+     * @param string $notification_id : ID of the notification
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     */
+    public static function markAsRead($notification_id, $user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        self::expireCache($user_id);
+
+        $pn = new PersonalNotifications($notification_id);
+        $notification_users = PersonalNotificationsUser::findBySQL("INNER JOIN personal_notifications USING (personal_notification_id) WHERE user_id = :user_id AND seen = '0' AND personal_notifications.url = :url ", [
+            'user_id' => $user_id,
+            'url' => $pn['url']
+        ]);
+        foreach ($notification_users as $notification_user) {
+            $notification_user['seen'] = 1;
+            $notification_user->store();
+        }
+    }
+
+    /**
+     * Marks all notifications as read by the user. It won't appear anymore in
+     * the notification-list on top of its site.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     * @return boolean : true on success, false if it failed.
+     */
+    public static function markAllAsRead($user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        self::expireCache($user_id);
+
+        $notification_users = PersonalNotificationsUser::findBySQL("user_id = :user_id AND seen = '0'", [
+            'user_id' => $user_id
+        ]);
+        foreach ($notification_users as $notification_user) {
+            $notification_user['seen'] = 1;
+            $notification_user->store();
+        }
+        return true;
+    }
+
+    /**
+     * Mark a notification as read for the user by the given HTML-ID. It won't appear anymore in the
+     * notification-list on top of its site.
+     * @param string $html_id : HTML ID attribute of the notification
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     */
+    public static function markAsReadByHTML($html_id, $user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        self::expireCache($user_id);
+
+        $notification_users = PersonalNotificationsUser::findBySQL("INNER JOIN personal_notifications USING (personal_notification_id) WHERE user_id = :user_id AND seen = '0' AND personal_notifications.html_id = :html_id ", [
+            'user_id' => $user_id,
+            'html_id' => $html_id
+        ]);
+        foreach ($notification_users as $notification_user) {
+            $notification_user['seen'] = 1;
+            $notification_user->store();
+        }
+    }
+
+    /**
+     * Returns the cache hash to use for a specific user.
+     *
+     * @param String $user_id Id of the user
+     * @return String Cache hash to use for the user
+     */
+    protected static function getCacheHash($user_id)
+    {
+        return '/personal-notifications/' . $user_id;
+    }
+
+    /**
+     * Returns the cached values for a specific user.
+     *
+     * @param String $user_id Id of the user
+     * @return mixed Array of item data (may be empty) or false if no data is cached
+     */
+    protected static function getCache($user_id)
+    {
+        $cache  = \Studip\Cache\Factory::getCache();
+        $hash   = self::getCacheHash($user_id);
+        $cached = $cache->read($hash);
+
+        if ($cached === false) {
+            return false;
+        }
+
+        return unserialize($cached);
+    }
+
+    /**
+     * Stored the provided item data in cache for a specific user.
+     *
+     * @param String $user_id Id of the user
+     * @param Array  $items   Raw db data of the items
+     */
+    protected static function setCache($user_id, $items)
+    {
+        $cache = \Studip\Cache\Factory::getCache();
+        $hash  = self::getCacheHash($user_id);
+        $cache->write($hash, serialize($items), self::CACHE_DURATION);
+    }
+
+    /**
+     * Removes the cached entries for a specific user.
+     *
+     * @param String $user_id Id of the user
+     */
+    protected static function expireCache($user_id)
+    {
+        $cache = \Studip\Cache\Factory::getCache();
+        $hash  = self::getCacheHash($user_id);
+        $cache->expire($hash);
+    }
+
+    /**
+     * Activates personal notifications for a given user.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     */
+    public static function activate($user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_DEACTIVATED", "0");
+    }
+
+    /**
+     * Deactivates personal notifications for a given user.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     */
+    public static function deactivate($user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_DEACTIVATED", "1");
+    }
+
+    /**
+     * Activates audio plopp for new personal notifications for a given user.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     */
+    public static function activateAudioFeedback($user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED", "0");
+    }
+
+    /**
+     * Deactivates audio plopp for new personal notifications for a given user.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     */
+    public static function deactivateAudioFeedback($user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        UserConfig::get($user_id)->store("PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED", "1");
+    }
+
+    /**
+     * Checks if personal notifications are activated for the whole Stud.IP. This
+     * could be false for performance issues.
+     * @return boolean : true if activated else false
+     */
+    public static function isGloballyActivated()
+    {
+        $config = Config::GetInstance();
+        return !empty($config['PERSONAL_NOTIFICATIONS_ACTIVATED']);
+    }
+
+    /**
+     * Checks if a given user should see the personal notification. Either the
+     * Stud.IP or the user could deactivate personal notification. If neither is
+     * the case, this function returns true.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     * @return boolean : true if activated else false
+     */
+    public static function isActivated($user_id = null)
+    {
+        if (!PersonalNotifications::isGloballyActivated()) {
+            return false;
+        }
+
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        return (new UserConfig($user_id))->getValue('PERSONAL_NOTIFICATIONS_DEACTIVATED') ? false : true;
+    }
+
+    /**
+     * Checks if a given user should hear audio plopp for new personal notification.
+     * Either the Stud.IP or the user could deactivate personal notification or
+     * audio feedback. If neither is the case, this function returns true.
+     * @param string|null $user_id : ID of special user the notification should belong to or (default:) null for current user
+     * @return boolean : true if activated else false
+     */
+    public static function isAudioActivated($user_id = null)
+    {
+        if (!PersonalNotifications::isGloballyActivated()) {
+            return false;
+        }
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        return UserConfig::get($user_id)->getValue("PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED") ? false : true;
+    }
+
+    /**
+     * Returns HTML-represantation of the notification which is a list-element.
+     * @return string : html-output;
+     */
+    public function getLiElement()
+    {
+        return $GLOBALS['template_factory']
+                ->open('personal_notifications/notification.php')
+                ->render(['notification' => $this]);
+    }
+
+    /**
+     * Sets the value of the "more unseen" notifications (notification with same url but a different id).
+     *
+     * @param int $unseen Number of more unseen notifications
+     */
+    public function setmore_unseen($unseen)
+    {
+        $this->unseen = (int)$unseen;
+    }
+
+    /**
+     * Returns (or retrieves) the number of "more unseen" notifications.
+     *
+     * @return int Number of "more unseen" notifications
+     */
+    public function getmore_unseen()
+    {
+        if ($this->unseen === null) {
+            $query = "SELECT COUNT(*)
+                      FROM personal_notifications AS pn
+                      INNER JOIN personal_notifications_user AS u USING (personal_notification_id)
+                      WHERE pn.personal_notification_id != :pn_id
+                        AND u.user_id = :user_id
+                        AND u.seen = '0'
+                        AND pn.url = :url";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                ':pn_id'   => $this->id,
+                ':user_id' => $GLOBALS['user']->id,
+                ':url'     => $this->url,
+            ]);
+            $this->unseen = 0 + $statement->fetchColumn();
+        }
+        return $this->unseen;
+    }
+
+    /**
+     * Links this notification to user.
+     *
+     * @param User|string $user_id_or_object User object or id of user
+     * @return PersonalNotificationsUser|false
+     */
+    public function link($user_id_or_object)
+    {
+        $user_id = $user_id_or_object instanceof User ? $user_id_or_object->id : $user_id_or_object;
+
+        // If not activated, return false
+        if (!self::isActivated($user_id)) {
+            return false;
+        }
+
+        // Expire cache for user
+        self::expireCache($user_id);
+
+        // Create link from notification to user
+        return PersonalNotificationsUser::create([
+            'personal_notification_id' => $this->id,
+            'user_id'                  => $user_id,
+            'seen'                     => 0,
+        ]);
+    }
+
+}
diff --git a/lib/models/RangeScale.php b/lib/models/RangeScale.php
index f935e4f..20e134a 100644
--- a/lib/models/RangeScale.php
+++ b/lib/models/RangeScale.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'lib/classes/QuestionType.interface.php';
-
 /**
  * @license GPL2 or any later version
  *
diff --git a/lib/models/Semester.class.php b/lib/models/Semester.class.php
deleted file mode 100644
index 03243a5..0000000
--- a/lib/models/Semester.class.php
+++ /dev/null
@@ -1,515 +0,0 @@
-<?php
-
-/**
- * Semester.class.php
- * model class for table semester_data
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for semester_id
- * @property string $semester_id database column
- * @property I18NString $name database column
- * @property I18NString $semester_token database column
- * @property I18NString $token alias column for semester_token
- * @property int|null $beginn database column
- * @property int|null $ende database column
- * @property int|null $sem_wechsel database column
- * @property int|null $vorles_beginn database column
- * @property int|null $vorles_ende database column
- * @property int $visible database column
- * @property string|null $external_id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property-read mixed $first_sem_week additional field
- * @property-read mixed $last_sem_week additional field
- * @property-read mixed $current additional field
- * @property-read mixed $past additional field
- * @property-read mixed $short_name additional field
- * @property mixed $absolute_seminars_count additional field
- * @property mixed $duration_seminars_count additional field
- * @property mixed $continuous_seminars_count additional field
- */
-class Semester extends SimpleORMap
-{
-    /**
-     * Configures this model.
-     *
-     * @param array $config
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'semester_data';
-
-        $config['additional_fields']['first_sem_week']['get'] = 'getFirstSemesterWeek';
-        $config['additional_fields']['last_sem_week']['get'] = 'getLastSemesterWeek';
-        $config['additional_fields']['current']['get'] = 'isCurrent';
-        $config['additional_fields']['past']['get'] = 'isPast';
-        $config['additional_fields']['short_name']['get'] = function($semester) {
-            return (string) $semester->semester_token ?: (string) $semester->name;
-        };
-
-        $config['additional_fields']['absolute_seminars_count'] = [
-            'get' => 'seminarCounter',
-            'set' => false,
-        ];
-        $config['additional_fields']['duration_seminars_count'] = [
-            'get' => 'seminarCounter',
-            'set' => false,
-        ];
-        $config['additional_fields']['continuous_seminars_count'] = [
-            'get' => 'seminarCounter',
-            'set' => false,
-        ];
-
-        $config['alias_fields']['token'] = 'semester_token';
-
-        $config['registered_callbacks']['after_store'][] = 'refreshCache';
-        $config['registered_callbacks']['after_delete'][] = 'refreshCache';
-
-        $config['i18n_fields']['name'] = true;
-        $config['i18n_fields']['semester_token'] = true;
-
-        parent::configure($config);
-    }
-
-    /**
-     * cache
-     */
-    private static $semester_cache;
-    private static $current_semester;
-
-
-    /**
-     * returns semester object for given id or null
-     * @param string $id
-     * @return NULL|Semester
-     */
-    public static function find($id)
-    {
-        $semester_cache = self::getAll();
-        return $semester_cache[$id] ?? null;
-    }
-
-    /**
-     * returns Semester for given timestamp
-     * @param integer $timestamp
-     * @return null|Semester
-     */
-    public static function findByTimestamp($timestamp)
-    {
-        foreach (self::getAll() as $semester) {
-            if ($timestamp >= $semester->beginn && $timestamp <= $semester->ende) {
-                return $semester;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * returns following Semester for given timestamp
-     * @param integer $timestamp
-     * @return null|Semester
-     */
-    public static function findNext($timestamp = null)
-    {
-        $timestamp = $timestamp ?: time();
-        $semester = self::findByTimestamp($timestamp);
-        if ($semester) {
-            return self::findByTimestamp((int)$semester->ende + 1);
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the previous semester for a semester specified by a timestamp.
-     * If no timestamp is specified, the previous semester of the current semester is returned.
-     *
-     * @param integer|null $timestamp The timestamp of the semester whose predecessor
-     *     shall be found. Defaults to null.
-     *
-     * @return null|Semester A previous semester to the specified one or null, if no such semester
-     *     could be found.
-     */
-    public static function findPrevious($timestamp = null)
-    {
-        $timestamp = $timestamp ?: time();
-        $semester = self::findByTimestamp($timestamp);
-        if ($semester) {
-            return self::findByTimestamp((int)$semester->beginn - 1);
-        }
-
-        return null;
-    }
-
-    /**
-     * returns current Semester
-     */
-    public static function findCurrent()
-    {
-        self::getAll();
-        return self::$current_semester;
-    }
-
-    /**
-     * Return a specially orderd array of all semesters
-     */
-    public static function findAllVisible($with_before_first = true): array
-    {
-        return array_values(
-            array_filter(self::getAllAsArray(), function ($semester, $key) use($with_before_first) {
-                return $GLOBALS['perm']->have_perm('admin') || !empty($semester['visible']) || ((int)$key === 0 && $with_before_first);
-            }, ARRAY_FILTER_USE_BOTH)
-        );
-    }
-
-    /**
-     * returns array of all existing semester objects
-     * orderd by begin
-     * @param boolean $force_reload
-     * @return array
-     */
-    public static function getAll($force_reload = false)
-    {
-        if (!is_array(self::$semester_cache) || $force_reload) {
-            self::$semester_cache = [];
-            if (!$force_reload) {
-                $cache = \Studip\Cache\Factory::getCache();
-                $semester_data_array = unserialize($cache->read('DB_SEMESTER_DATA'));
-                if ($semester_data_array) {
-                    foreach ($semester_data_array as $semester_data) {
-                        $semester = self::buildExisting($semester_data);
-                        self::$semester_cache[$semester->getId()] = $semester;
-                        if ($semester->isCurrent()) {
-                            self::$current_semester = $semester;
-                        }
-                    }
-                }
-            }
-            if (!count(self::$semester_cache)) {
-                $semester_data = [];
-                foreach (self::findBySql('1 ORDER BY beginn') as $semester) {
-                    self::$semester_cache[$semester->getId()] = $semester;
-                    if ($semester->isCurrent()) {
-                        self::$current_semester = $semester;
-                    }
-                    $semester_data[] = $semester->toRawArray();
-                }
-                $cache = \Studip\Cache\Factory::getCache();
-                $cache->write('DB_SEMESTER_DATA', serialize($semester_data));
-            }
-        }
-        return self::$semester_cache;
-    }
-
-    /**
-     * Returns a list of all semesters as array, optionally with an entry at
-     * the beginning that represents the time before the first semester in the
-     * system.
-     *
-     * @param boolean $with_before_first Show the optional first entry as described above
-     * @param boolean $force_reload
-     * @return array
-     */
-    public static function getAllAsArray($with_before_first = true, $force_reload = false)
-    {
-        $result = array_map(function ($semester) {
-            return $semester->toArray();
-        }, self::getAll($force_reload));
-        $result = array_values($result);
-
-        if ($with_before_first) {
-            array_unshift($result, [
-                'name' => _('abgelaufene Semester'),
-                'past' => true,
-            ]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * returns the index for a given semester id, in an array returned from self::getAllAsArray(), beware of second parameter
-     *
-     * @param $semester_id
-     * @param bool $with_before_first
-     * @param bool $only_visible
-     * @return bool|int
-     * @deprecated ASK YOURSELF WHAT THE F!!! YOU ARE DOING
-     */
-    public static function getIndexById($semester_id, $with_before_first = true, $only_visible = false)
-    {
-        if($only_visible) {
-            $semesters = self::findAllVisible($with_before_first);
-        } else {
-            $semesters = self::getAllAsArray($with_before_first);
-        }
-        foreach ($semesters as $index => $semester) {
-            if (isset($semester['semester_id']) && $semester['semester_id'] === $semester_id) {
-                return $index;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns an html fragment with a semester select-box
-     *
-     * @param array $select_attributes
-     * @param integer $default
-     * @param string $option_value
-     * @param boolean $include_all
-     * @param boolean $use_semester_id
-     * @return string
-     */
-    public static function getSemesterSelector(
-        $select_attributes = null,
-        $default = 0,
-        $option_value = 'semester_id',
-        $include_all = true,
-        $use_semester_id = true
-    )
-    {
-        $select_attributes = array_merge([
-            'name' => 'sem_select',
-        ], $select_attributes ?? []);
-
-        $semester = Semester::findAllVisible();
-
-        unset($semester[0]);
-
-        if ($include_all) {
-            $semester['all'] = [
-                'name' => _('alle'),
-                'semester_id' => 0
-            ];
-        }
-        $semester = array_reverse($semester, true);
-
-        $template = $GLOBALS['template_factory']->open('shared/semester-selector');
-        $template->semesters = $semester;
-        $template->select_attributes = $select_attributes;
-        $template->default = $default;
-        $template->option_value = $option_value;
-        $template->use_semester_id = $use_semester_id;
-        return $template->render();
-    }
-
-    /**
-     * Caches seminar counts
-     */
-    protected $seminar_counts = null;
-
-    /**
-     * Counts the number of different seminar types in this semester.
-     * This method caches the result in $seminar_counts so the db
-     * will only be queried once per semester.
-     *
-     * @param String $field Name of the seminar (/additional_fields) type
-     * @return int The count of seminars of this type
-     */
-    protected function seminarCounter($field)
-    {
-        if ($this->seminar_counts === null) {
-            $query = "
-                SELECT SUM(IF(semester_courses.semester_id IS NULL, 1, 0)) AS continuous,
-                       0 AS duration,
-                       SUM(IF(semester_courses.semester_id IS NOT NULL, 1, 0)) AS absolute
-                FROM seminare
-                    LEFT JOIN semester_courses ON (seminare.Seminar_id = semester_courses.course_id)
-                WHERE start_time <= :beginn
-                    AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id)
-            ";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':beginn', $this['beginn']);
-            $statement->bindValue(':semester_id', $this['semester_id']);
-            $statement->execute();
-            $this->seminar_counts = $statement->fetch(PDO::FETCH_ASSOC);
-        }
-
-        $index = str_replace('_seminars_count', '', $field);
-        return (int)$this->seminar_counts[$index];
-    }
-
-    /**
-     * Returns the calendar week number of the first week of the lecture
-     * period.
-     *
-     * @return int Calendar week number of the first week of lecture
-     */
-    public function getFirstSemesterWeek()
-    {
-        return (int)strftime('%W', $this['vorles_beginn']);
-    }
-
-    /**
-     * Returns the calendar week number of the last week of the lecture
-     * period.
-     *
-     * @return int Calendar week number of the last week of lecture
-     */
-    public function getLastSemesterWeek()
-    {
-        return (int)strftime('%W', $this['vorles_ende']);
-    }
-
-    /**
-     * Return whether this semester is in the past.
-     *
-     * @return bool Indicating whether this semester is in the past
-     */
-    public function isPast()
-    {
-        return $this->ende < time();
-    }
-
-    /**
-     * Returns whether this semester is the current semester.
-     *
-     * @return bool Indicating if this is the current semester
-     */
-    public function isCurrent()
-    {
-        return time() >= $this->beginn && time() < $this->ende;
-    }
-
-    /**
-     * Returns the start week dates for this semester (and other
-     * semesters if $end_semester is given).
-     *
-     * @param Semester $end_semester end semester, default is $this
-     * @return array containing the start weeks
-     */
-    public function getStartWeeks(?Semester $end_semester = null)
-    {
-        if (!$end_semester) {
-            $end_semester = $this;
-        }
-
-        $timestamp = $this->getCorrectedLectureBegin();
-        $end_date = $end_semester->vorles_ende;
-
-        $i = 0;
-
-        $start_weeks = [];
-        while ($timestamp < $end_date) {
-            $start_weeks[$i] = sprintf(
-                _('%u. Semesterwoche (ab %s)'),
-                $i + 1,
-                strftime('%x', $timestamp));
-
-            $i += 1;
-
-            $timestamp = strtotime('+1 week', $timestamp);
-        }
-
-        return $start_weeks;
-    }
-
-    /**
-     * Returns the corrected begin of lectures which ensures that the begin
-     * is always on a monday.
-     *
-     * @return int unix timestamp of correct begin of lectures
-     */
-    public function getCorrectedLectureBegin()
-    {
-        return strtotime('this week monday', $this->vorles_beginn);
-    }
-
-
-    /**
-     * returns "Semesterwoche" for a given timestamp
-     * @param integer $timestamp
-     * @return number|boolean
-     */
-    public function getSemWeekNumber($timestamp)
-    {
-        $current_sem_week = (int)strftime('%W', $timestamp);
-        if (strftime('%Y', $timestamp) > strftime('%Y', $this->vorles_beginn)) {
-            $current_sem_week += 52;
-        }
-        if ($this->last_sem_week < $this->first_sem_week) {
-            $last_sem_week = (int)$this->last_sem_week + 52;
-        } else {
-            $last_sem_week = $this->last_sem_week;
-        }
-        if ($current_sem_week >= $this->first_sem_week && $current_sem_week <= $last_sem_week) {
-            return $current_sem_week - $this->first_sem_week + 1;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns an array representation of this semester.
-     *
-     * @param mixed $only_these_fields List of fields to extract
-     * @return array represenation
-     */
-    public function toArray($only_these_fields = null)
-    {
-        if (!isset($only_these_fields)) {
-            $fields = array_flip(array_diff($this->known_slots(), array_keys($this->relations)));
-            unset($fields['absolute_seminars_count']);
-            unset($fields['duration_seminars_count']);
-            unset($fields['continuous_seminars_count']);
-            $only_these_fields = array_flip($fields);
-        }
-        return parent::toArray($only_these_fields);
-    }
-
-    /**
-     * Flushes the cache just after storing and deleting a semester
-     */
-    public function refreshCache()
-    {
-        \Studip\Cache\Factory::getCache()->expire('DB_SEMESTER_DATA');
-    }
-
-    /*
-     * for Admin
-     */
-    public static function getSemChangeDate($semester)
-    {
-
-        if ($semester->sem_wechsel) {
-            $semchangedate = strftime('%x', $semester->sem_wechsel);
-        } else {
-            $semesterSwitch = (int) Config::get()->SEMESTER_TIME_SWITCH;
-            $currentSem = $semester->beginn - $semesterSwitch * 7 * 24 * 60 * 60;
-            $semchangedate = strftime('%x', $currentSem);
-        }
-
-        return $semchangedate;
-    }
-
-    public static function findDefault()
-    {
-        $all_sems = self::getAll();
-
-        // $all_sems now contents only semesters with valid change dates, either manual or SEMESTER_TIME_SWITCH
-        foreach (array_reverse($all_sems) as $semester) {
-            if ($semester['ende'] <= time()) {
-                continue;
-            }
-
-            if ($semester['sem_wechsel']) {
-                $timestamp = $semester['sem_wechsel'];
-            } else {
-                $timestamp = $semester['beginn'] - (int)Config::get()->SEMESTER_TIME_SWITCH * 7 * 24 * 60 * 60;
-            }
-
-            if ($timestamp <= time()) {
-                return  $semester;
-            }
-        }
-    }
-}
diff --git a/lib/models/Semester.php b/lib/models/Semester.php
new file mode 100644
index 0000000..03243a5
--- /dev/null
+++ b/lib/models/Semester.php
@@ -0,0 +1,515 @@
+<?php
+
+/**
+ * Semester.class.php
+ * model class for table semester_data
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for semester_id
+ * @property string $semester_id database column
+ * @property I18NString $name database column
+ * @property I18NString $semester_token database column
+ * @property I18NString $token alias column for semester_token
+ * @property int|null $beginn database column
+ * @property int|null $ende database column
+ * @property int|null $sem_wechsel database column
+ * @property int|null $vorles_beginn database column
+ * @property int|null $vorles_ende database column
+ * @property int $visible database column
+ * @property string|null $external_id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property-read mixed $first_sem_week additional field
+ * @property-read mixed $last_sem_week additional field
+ * @property-read mixed $current additional field
+ * @property-read mixed $past additional field
+ * @property-read mixed $short_name additional field
+ * @property mixed $absolute_seminars_count additional field
+ * @property mixed $duration_seminars_count additional field
+ * @property mixed $continuous_seminars_count additional field
+ */
+class Semester extends SimpleORMap
+{
+    /**
+     * Configures this model.
+     *
+     * @param array $config
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'semester_data';
+
+        $config['additional_fields']['first_sem_week']['get'] = 'getFirstSemesterWeek';
+        $config['additional_fields']['last_sem_week']['get'] = 'getLastSemesterWeek';
+        $config['additional_fields']['current']['get'] = 'isCurrent';
+        $config['additional_fields']['past']['get'] = 'isPast';
+        $config['additional_fields']['short_name']['get'] = function($semester) {
+            return (string) $semester->semester_token ?: (string) $semester->name;
+        };
+
+        $config['additional_fields']['absolute_seminars_count'] = [
+            'get' => 'seminarCounter',
+            'set' => false,
+        ];
+        $config['additional_fields']['duration_seminars_count'] = [
+            'get' => 'seminarCounter',
+            'set' => false,
+        ];
+        $config['additional_fields']['continuous_seminars_count'] = [
+            'get' => 'seminarCounter',
+            'set' => false,
+        ];
+
+        $config['alias_fields']['token'] = 'semester_token';
+
+        $config['registered_callbacks']['after_store'][] = 'refreshCache';
+        $config['registered_callbacks']['after_delete'][] = 'refreshCache';
+
+        $config['i18n_fields']['name'] = true;
+        $config['i18n_fields']['semester_token'] = true;
+
+        parent::configure($config);
+    }
+
+    /**
+     * cache
+     */
+    private static $semester_cache;
+    private static $current_semester;
+
+
+    /**
+     * returns semester object for given id or null
+     * @param string $id
+     * @return NULL|Semester
+     */
+    public static function find($id)
+    {
+        $semester_cache = self::getAll();
+        return $semester_cache[$id] ?? null;
+    }
+
+    /**
+     * returns Semester for given timestamp
+     * @param integer $timestamp
+     * @return null|Semester
+     */
+    public static function findByTimestamp($timestamp)
+    {
+        foreach (self::getAll() as $semester) {
+            if ($timestamp >= $semester->beginn && $timestamp <= $semester->ende) {
+                return $semester;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * returns following Semester for given timestamp
+     * @param integer $timestamp
+     * @return null|Semester
+     */
+    public static function findNext($timestamp = null)
+    {
+        $timestamp = $timestamp ?: time();
+        $semester = self::findByTimestamp($timestamp);
+        if ($semester) {
+            return self::findByTimestamp((int)$semester->ende + 1);
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the previous semester for a semester specified by a timestamp.
+     * If no timestamp is specified, the previous semester of the current semester is returned.
+     *
+     * @param integer|null $timestamp The timestamp of the semester whose predecessor
+     *     shall be found. Defaults to null.
+     *
+     * @return null|Semester A previous semester to the specified one or null, if no such semester
+     *     could be found.
+     */
+    public static function findPrevious($timestamp = null)
+    {
+        $timestamp = $timestamp ?: time();
+        $semester = self::findByTimestamp($timestamp);
+        if ($semester) {
+            return self::findByTimestamp((int)$semester->beginn - 1);
+        }
+
+        return null;
+    }
+
+    /**
+     * returns current Semester
+     */
+    public static function findCurrent()
+    {
+        self::getAll();
+        return self::$current_semester;
+    }
+
+    /**
+     * Return a specially orderd array of all semesters
+     */
+    public static function findAllVisible($with_before_first = true): array
+    {
+        return array_values(
+            array_filter(self::getAllAsArray(), function ($semester, $key) use($with_before_first) {
+                return $GLOBALS['perm']->have_perm('admin') || !empty($semester['visible']) || ((int)$key === 0 && $with_before_first);
+            }, ARRAY_FILTER_USE_BOTH)
+        );
+    }
+
+    /**
+     * returns array of all existing semester objects
+     * orderd by begin
+     * @param boolean $force_reload
+     * @return array
+     */
+    public static function getAll($force_reload = false)
+    {
+        if (!is_array(self::$semester_cache) || $force_reload) {
+            self::$semester_cache = [];
+            if (!$force_reload) {
+                $cache = \Studip\Cache\Factory::getCache();
+                $semester_data_array = unserialize($cache->read('DB_SEMESTER_DATA'));
+                if ($semester_data_array) {
+                    foreach ($semester_data_array as $semester_data) {
+                        $semester = self::buildExisting($semester_data);
+                        self::$semester_cache[$semester->getId()] = $semester;
+                        if ($semester->isCurrent()) {
+                            self::$current_semester = $semester;
+                        }
+                    }
+                }
+            }
+            if (!count(self::$semester_cache)) {
+                $semester_data = [];
+                foreach (self::findBySql('1 ORDER BY beginn') as $semester) {
+                    self::$semester_cache[$semester->getId()] = $semester;
+                    if ($semester->isCurrent()) {
+                        self::$current_semester = $semester;
+                    }
+                    $semester_data[] = $semester->toRawArray();
+                }
+                $cache = \Studip\Cache\Factory::getCache();
+                $cache->write('DB_SEMESTER_DATA', serialize($semester_data));
+            }
+        }
+        return self::$semester_cache;
+    }
+
+    /**
+     * Returns a list of all semesters as array, optionally with an entry at
+     * the beginning that represents the time before the first semester in the
+     * system.
+     *
+     * @param boolean $with_before_first Show the optional first entry as described above
+     * @param boolean $force_reload
+     * @return array
+     */
+    public static function getAllAsArray($with_before_first = true, $force_reload = false)
+    {
+        $result = array_map(function ($semester) {
+            return $semester->toArray();
+        }, self::getAll($force_reload));
+        $result = array_values($result);
+
+        if ($with_before_first) {
+            array_unshift($result, [
+                'name' => _('abgelaufene Semester'),
+                'past' => true,
+            ]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * returns the index for a given semester id, in an array returned from self::getAllAsArray(), beware of second parameter
+     *
+     * @param $semester_id
+     * @param bool $with_before_first
+     * @param bool $only_visible
+     * @return bool|int
+     * @deprecated ASK YOURSELF WHAT THE F!!! YOU ARE DOING
+     */
+    public static function getIndexById($semester_id, $with_before_first = true, $only_visible = false)
+    {
+        if($only_visible) {
+            $semesters = self::findAllVisible($with_before_first);
+        } else {
+            $semesters = self::getAllAsArray($with_before_first);
+        }
+        foreach ($semesters as $index => $semester) {
+            if (isset($semester['semester_id']) && $semester['semester_id'] === $semester_id) {
+                return $index;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns an html fragment with a semester select-box
+     *
+     * @param array $select_attributes
+     * @param integer $default
+     * @param string $option_value
+     * @param boolean $include_all
+     * @param boolean $use_semester_id
+     * @return string
+     */
+    public static function getSemesterSelector(
+        $select_attributes = null,
+        $default = 0,
+        $option_value = 'semester_id',
+        $include_all = true,
+        $use_semester_id = true
+    )
+    {
+        $select_attributes = array_merge([
+            'name' => 'sem_select',
+        ], $select_attributes ?? []);
+
+        $semester = Semester::findAllVisible();
+
+        unset($semester[0]);
+
+        if ($include_all) {
+            $semester['all'] = [
+                'name' => _('alle'),
+                'semester_id' => 0
+            ];
+        }
+        $semester = array_reverse($semester, true);
+
+        $template = $GLOBALS['template_factory']->open('shared/semester-selector');
+        $template->semesters = $semester;
+        $template->select_attributes = $select_attributes;
+        $template->default = $default;
+        $template->option_value = $option_value;
+        $template->use_semester_id = $use_semester_id;
+        return $template->render();
+    }
+
+    /**
+     * Caches seminar counts
+     */
+    protected $seminar_counts = null;
+
+    /**
+     * Counts the number of different seminar types in this semester.
+     * This method caches the result in $seminar_counts so the db
+     * will only be queried once per semester.
+     *
+     * @param String $field Name of the seminar (/additional_fields) type
+     * @return int The count of seminars of this type
+     */
+    protected function seminarCounter($field)
+    {
+        if ($this->seminar_counts === null) {
+            $query = "
+                SELECT SUM(IF(semester_courses.semester_id IS NULL, 1, 0)) AS continuous,
+                       0 AS duration,
+                       SUM(IF(semester_courses.semester_id IS NOT NULL, 1, 0)) AS absolute
+                FROM seminare
+                    LEFT JOIN semester_courses ON (seminare.Seminar_id = semester_courses.course_id)
+                WHERE start_time <= :beginn
+                    AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id)
+            ";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':beginn', $this['beginn']);
+            $statement->bindValue(':semester_id', $this['semester_id']);
+            $statement->execute();
+            $this->seminar_counts = $statement->fetch(PDO::FETCH_ASSOC);
+        }
+
+        $index = str_replace('_seminars_count', '', $field);
+        return (int)$this->seminar_counts[$index];
+    }
+
+    /**
+     * Returns the calendar week number of the first week of the lecture
+     * period.
+     *
+     * @return int Calendar week number of the first week of lecture
+     */
+    public function getFirstSemesterWeek()
+    {
+        return (int)strftime('%W', $this['vorles_beginn']);
+    }
+
+    /**
+     * Returns the calendar week number of the last week of the lecture
+     * period.
+     *
+     * @return int Calendar week number of the last week of lecture
+     */
+    public function getLastSemesterWeek()
+    {
+        return (int)strftime('%W', $this['vorles_ende']);
+    }
+
+    /**
+     * Return whether this semester is in the past.
+     *
+     * @return bool Indicating whether this semester is in the past
+     */
+    public function isPast()
+    {
+        return $this->ende < time();
+    }
+
+    /**
+     * Returns whether this semester is the current semester.
+     *
+     * @return bool Indicating if this is the current semester
+     */
+    public function isCurrent()
+    {
+        return time() >= $this->beginn && time() < $this->ende;
+    }
+
+    /**
+     * Returns the start week dates for this semester (and other
+     * semesters if $end_semester is given).
+     *
+     * @param Semester $end_semester end semester, default is $this
+     * @return array containing the start weeks
+     */
+    public function getStartWeeks(?Semester $end_semester = null)
+    {
+        if (!$end_semester) {
+            $end_semester = $this;
+        }
+
+        $timestamp = $this->getCorrectedLectureBegin();
+        $end_date = $end_semester->vorles_ende;
+
+        $i = 0;
+
+        $start_weeks = [];
+        while ($timestamp < $end_date) {
+            $start_weeks[$i] = sprintf(
+                _('%u. Semesterwoche (ab %s)'),
+                $i + 1,
+                strftime('%x', $timestamp));
+
+            $i += 1;
+
+            $timestamp = strtotime('+1 week', $timestamp);
+        }
+
+        return $start_weeks;
+    }
+
+    /**
+     * Returns the corrected begin of lectures which ensures that the begin
+     * is always on a monday.
+     *
+     * @return int unix timestamp of correct begin of lectures
+     */
+    public function getCorrectedLectureBegin()
+    {
+        return strtotime('this week monday', $this->vorles_beginn);
+    }
+
+
+    /**
+     * returns "Semesterwoche" for a given timestamp
+     * @param integer $timestamp
+     * @return number|boolean
+     */
+    public function getSemWeekNumber($timestamp)
+    {
+        $current_sem_week = (int)strftime('%W', $timestamp);
+        if (strftime('%Y', $timestamp) > strftime('%Y', $this->vorles_beginn)) {
+            $current_sem_week += 52;
+        }
+        if ($this->last_sem_week < $this->first_sem_week) {
+            $last_sem_week = (int)$this->last_sem_week + 52;
+        } else {
+            $last_sem_week = $this->last_sem_week;
+        }
+        if ($current_sem_week >= $this->first_sem_week && $current_sem_week <= $last_sem_week) {
+            return $current_sem_week - $this->first_sem_week + 1;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns an array representation of this semester.
+     *
+     * @param mixed $only_these_fields List of fields to extract
+     * @return array represenation
+     */
+    public function toArray($only_these_fields = null)
+    {
+        if (!isset($only_these_fields)) {
+            $fields = array_flip(array_diff($this->known_slots(), array_keys($this->relations)));
+            unset($fields['absolute_seminars_count']);
+            unset($fields['duration_seminars_count']);
+            unset($fields['continuous_seminars_count']);
+            $only_these_fields = array_flip($fields);
+        }
+        return parent::toArray($only_these_fields);
+    }
+
+    /**
+     * Flushes the cache just after storing and deleting a semester
+     */
+    public function refreshCache()
+    {
+        \Studip\Cache\Factory::getCache()->expire('DB_SEMESTER_DATA');
+    }
+
+    /*
+     * for Admin
+     */
+    public static function getSemChangeDate($semester)
+    {
+
+        if ($semester->sem_wechsel) {
+            $semchangedate = strftime('%x', $semester->sem_wechsel);
+        } else {
+            $semesterSwitch = (int) Config::get()->SEMESTER_TIME_SWITCH;
+            $currentSem = $semester->beginn - $semesterSwitch * 7 * 24 * 60 * 60;
+            $semchangedate = strftime('%x', $currentSem);
+        }
+
+        return $semchangedate;
+    }
+
+    public static function findDefault()
+    {
+        $all_sems = self::getAll();
+
+        // $all_sems now contents only semesters with valid change dates, either manual or SEMESTER_TIME_SWITCH
+        foreach (array_reverse($all_sems) as $semester) {
+            if ($semester['ende'] <= time()) {
+                continue;
+            }
+
+            if ($semester['sem_wechsel']) {
+                $timestamp = $semester['sem_wechsel'];
+            } else {
+                $timestamp = $semester['beginn'] - (int)Config::get()->SEMESTER_TIME_SWITCH * 7 * 24 * 60 * 60;
+            }
+
+            if ($timestamp <= time()) {
+                return  $semester;
+            }
+        }
+    }
+}
diff --git a/lib/models/SemesterCourse.class.php b/lib/models/SemesterCourse.class.php
deleted file mode 100644
index 04590e3..0000000
--- a/lib/models/SemesterCourse.class.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * SemesterCourse.class.php
- * Contains the SemesterCourse model.
- *
- * This class represents entries in the mapping table
- * seminare_semester.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $semester_id database column
- * @property string $course_id database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property Semester $semester belongs_to Semester
- * @property Course $course belongs_to Course
- */
-class SemesterCourse extends SimpleORMap
-{
-    public static function configure($config = [])
-    {
-        $config['db_table'] = 'semester_courses';
-
-        $config['belongs_to']['semester'] = [
-            'class_name'  => Semester::class,
-            'foreign_key' => 'semester_id',
-        ];
-
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'course_id',
-        ];
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/SemesterCourse.php b/lib/models/SemesterCourse.php
new file mode 100644
index 0000000..04590e3
--- /dev/null
+++ b/lib/models/SemesterCourse.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * SemesterCourse.class.php
+ * Contains the SemesterCourse model.
+ *
+ * This class represents entries in the mapping table
+ * seminare_semester.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $semester_id database column
+ * @property string $course_id database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property Semester $semester belongs_to Semester
+ * @property Course $course belongs_to Course
+ */
+class SemesterCourse extends SimpleORMap
+{
+    public static function configure($config = [])
+    {
+        $config['db_table'] = 'semester_courses';
+
+        $config['belongs_to']['semester'] = [
+            'class_name'  => Semester::class,
+            'foreign_key' => 'semester_id',
+        ];
+
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'course_id',
+        ];
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/SemesterHoliday.class.php b/lib/models/SemesterHoliday.class.php
deleted file mode 100644
index 90f9ecd..0000000
--- a/lib/models/SemesterHoliday.class.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * SemesterHoliday.class.php
- * model class for table semester_holiday
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for holiday_id
- * @property string $holiday_id database column
- * @property string $semester_id database column
- * @property string $name database column
- * @property string $description database column
- * @property int|null $beginn database column
- * @property int $ende database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property mixed $current additional field
- */
-
-class SemesterHoliday extends SimpleORMap
-{
-    /**
-     * Configures this model.
-     *
-     * @param Array $config
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'semester_holiday';
-        $config['additional_fields']['current'] = true;
-        parent::configure($config);
-    }
-
-    /**
-     * cache
-     */
-    private static $holiday_cache;
-
-    /**
-     * returns SemesterHoliday object for given id or null
-     * @param string $id
-     * @return NULL|SemesterHoliday
-     */
-    public static function find($id)
-    {
-        $holiday_cache = self::getAll();
-        return $holiday_cache[$id] ?: null;
-    }
-
-     /**
-     * returns all SemesterHoliday between given timestamps (starting AND ending within given timestamps)
-     * @param integer $timestamp_start
-     * @param integer $timestamp_end
-     * @return array of SemesterHoliday
-     */
-    public static function findByTimestampRange($timestamp_start, $timestamp_end)
-    {
-        $ret = [];
-        if ($timestamp_start < $timestamp_end) {
-            foreach(self::getAll() as $holiday) {
-               if ($holiday->beginn >= $timestamp_start && $holiday->ende <= $timestamp_end) {
-                    $ret[] = $holiday;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * returns all SemesterHolidays for given semester
-     *
-     * @param mixed semester object or id as string or assoc array
-     * @return array of SemesterHoliday
-     */
-    public static function findBySemester($semester)
-    {
-        $semester = Semester::toObject($semester);
-        return self::findByTimestampRange($semester->beginn, $semester->ende);
-    }
-
-    /**
-     * returns array of all existing SemesterHoliday objects
-     * orderd by begin
-     * @param boolean $force_reload
-     * @return array
-     */
-    public static function getAll($force_reload = false)
-    {
-        if (!is_array(self::$holiday_cache) || $force_reload) {
-            self::$holiday_cache = [];
-            foreach(self::findBySql('1 ORDER BY beginn') as $holiday){
-                self::$holiday_cache[$holiday->getId()] = $holiday;
-            }
-        }
-        return self::$holiday_cache;
-    }
-
-    /**
-     * Returns whether we currently have this holidays (yay).
-     *
-     * @return bool
-     */
-    public function getcurrent()
-    {
-        return $this->beginn < time() && $this->ende > time();
-    }
-
-    /**
-     * Returns if a given date is a holiday.
-     *
-     * @param int  $time                Timestamp to check
-     * @param bool $check_vacation_only Defines whether to check only vacation
-     *                                  times or against all holidays
-     * @return mixed false if no holiday was found, an array with the name and
-     *               the "col" value of the holiday otherwise
-     */
-    public static function isHoliday($time, $check_vacation_only = true)
-    {
-        // Check all defined vaciation times
-        foreach (SemesterHoliday::getAll() as $val) {
-            if ($val->beginn <= $time && $val->ende >= $time) {
-                return [
-                    'name' => $val->name,
-                    'col' => 3,
-                ];
-            }
-        }
-
-        // Check all other holidays
-        if (!$check_vacation_only) {
-            return holiday($time);
-            $holiday_entry = holiday($time);
-        }
-
-        // Nothing found
-        return false;
-    }
-
-}
diff --git a/lib/models/SemesterHoliday.php b/lib/models/SemesterHoliday.php
new file mode 100644
index 0000000..90f9ecd
--- /dev/null
+++ b/lib/models/SemesterHoliday.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * SemesterHoliday.class.php
+ * model class for table semester_holiday
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for holiday_id
+ * @property string $holiday_id database column
+ * @property string $semester_id database column
+ * @property string $name database column
+ * @property string $description database column
+ * @property int|null $beginn database column
+ * @property int $ende database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property mixed $current additional field
+ */
+
+class SemesterHoliday extends SimpleORMap
+{
+    /**
+     * Configures this model.
+     *
+     * @param Array $config
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'semester_holiday';
+        $config['additional_fields']['current'] = true;
+        parent::configure($config);
+    }
+
+    /**
+     * cache
+     */
+    private static $holiday_cache;
+
+    /**
+     * returns SemesterHoliday object for given id or null
+     * @param string $id
+     * @return NULL|SemesterHoliday
+     */
+    public static function find($id)
+    {
+        $holiday_cache = self::getAll();
+        return $holiday_cache[$id] ?: null;
+    }
+
+     /**
+     * returns all SemesterHoliday between given timestamps (starting AND ending within given timestamps)
+     * @param integer $timestamp_start
+     * @param integer $timestamp_end
+     * @return array of SemesterHoliday
+     */
+    public static function findByTimestampRange($timestamp_start, $timestamp_end)
+    {
+        $ret = [];
+        if ($timestamp_start < $timestamp_end) {
+            foreach(self::getAll() as $holiday) {
+               if ($holiday->beginn >= $timestamp_start && $holiday->ende <= $timestamp_end) {
+                    $ret[] = $holiday;
+                }
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * returns all SemesterHolidays for given semester
+     *
+     * @param mixed semester object or id as string or assoc array
+     * @return array of SemesterHoliday
+     */
+    public static function findBySemester($semester)
+    {
+        $semester = Semester::toObject($semester);
+        return self::findByTimestampRange($semester->beginn, $semester->ende);
+    }
+
+    /**
+     * returns array of all existing SemesterHoliday objects
+     * orderd by begin
+     * @param boolean $force_reload
+     * @return array
+     */
+    public static function getAll($force_reload = false)
+    {
+        if (!is_array(self::$holiday_cache) || $force_reload) {
+            self::$holiday_cache = [];
+            foreach(self::findBySql('1 ORDER BY beginn') as $holiday){
+                self::$holiday_cache[$holiday->getId()] = $holiday;
+            }
+        }
+        return self::$holiday_cache;
+    }
+
+    /**
+     * Returns whether we currently have this holidays (yay).
+     *
+     * @return bool
+     */
+    public function getcurrent()
+    {
+        return $this->beginn < time() && $this->ende > time();
+    }
+
+    /**
+     * Returns if a given date is a holiday.
+     *
+     * @param int  $time                Timestamp to check
+     * @param bool $check_vacation_only Defines whether to check only vacation
+     *                                  times or against all holidays
+     * @return mixed false if no holiday was found, an array with the name and
+     *               the "col" value of the holiday otherwise
+     */
+    public static function isHoliday($time, $check_vacation_only = true)
+    {
+        // Check all defined vaciation times
+        foreach (SemesterHoliday::getAll() as $val) {
+            if ($val->beginn <= $time && $val->ende >= $time) {
+                return [
+                    'name' => $val->name,
+                    'col' => 3,
+                ];
+            }
+        }
+
+        // Check all other holidays
+        if (!$check_vacation_only) {
+            return holiday($time);
+            $holiday_entry = holiday($time);
+        }
+
+        // Nothing found
+        return false;
+    }
+
+}
diff --git a/lib/models/SeminarCycleDate.class.php b/lib/models/SeminarCycleDate.class.php
deleted file mode 100644
index f384426..0000000
--- a/lib/models/SeminarCycleDate.class.php
+++ /dev/null
@@ -1,819 +0,0 @@
-<?php
-
-
-//Do not remove! This is still needed for the toString method!
-require_once 'lib/dates.inc.php';
-
-
-/**
- * SeminarCycleDate.class.php
- * model class for table seminar_cycle_dates
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       2.0
- *
- * @property string $id alias column for metadate_id
- * @property string $metadate_id database column
- * @property string $seminar_id database column
- * @property string $start_time database column
- * @property string $end_time database column
- * @property int $weekday database column
- * @property string $description database column
- * @property float $sws database column
- * @property int $cycle database column
- * @property int $week_offset database column
- * @property int|null $end_offset database column
- * @property int $sorter database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest
- * @property SimpleORMapCollection|CourseDate[] $dates has_many CourseDate
- * @property SimpleORMapCollection|CourseExDate[] $exdates has_many CourseExDate
- * @property Course $course belongs_to Course
- * @property mixed $start_hour additional field
- * @property mixed $start_minute additional field
- * @property mixed $end_hour additional field
- * @property mixed $end_minute additional field
- * @property-read mixed $is_visible additional field
- */
-class SeminarCycleDate extends SimpleORMap
-{
-    /**
-     * Configures this model.
-     *
-     * @param Array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'seminar_cycle_dates';
-        $config['belongs_to']['course'] = array(
-            'class_name' => Course::class,
-            'foreign_key' => 'seminar_id',
-        );
-        $config['has_many']['room_requests'] = [
-            'class_name' => RoomRequest::class,
-            'on_store'   => 'store',
-            'on_delete'  => 'delete',
-            'assoc_func' => 'findByMetadate_id'
-        ];
-        $config['has_many']['dates'] = [
-            'class_name' => CourseDate::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-            'order_by'   => 'ORDER BY date'
-        ];
-
-        $config['has_many']['exdates'] = [
-            'class_name' => CourseExDate::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-            'order_by'   => 'ORDER BY date'
-        ];
-
-        $config['additional_fields']['start_hour'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
-        $config['additional_fields']['start_minute'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
-        $config['additional_fields']['end_hour'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
-        $config['additional_fields']['end_minute'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
-        $config['additional_fields']['is_visible'] = ['get' => 'getIsVisible'];
-        parent::configure($config);
-    }
-
-    /**
-     * returns array of instances of SeminarCycleDates of the given seminar_id
-     *
-     * @param string seminar_id: selected seminar to search for SeminarCycleDates
-     * @return array of instances of SeminarCycleDates of the given seminar_id or
-     *               an empty array
-     */
-    public static function findBySeminar($seminar_id)
-    {
-        return self::findBySeminar_id($seminar_id, "ORDER BY sorter ASC, weekday ASC, start_time ASC");
-    }
-
-    /**
-     * return instance of SeminarCycleDates of given termin_id
-     *
-     * @param string termin_id: selected seminar to search for SeminarCycleDates
-     * @return array
-     */
-    public static function findByTermin($termin_id)
-    {
-        return self::findOneBySql("metadate_id=(SELECT metadate_id FROM termine WHERE termin_id = ? "
-                                  . "UNION SELECT metadate_id FROM ex_termine WHERE termin_id = ? )", [$termin_id, $termin_id]);
-    }
-    /**
-     * Returns the time fraction for a given field.
-     *
-     * @param String $field Time fraction field
-     * @return int the time fraction
-     */
-    protected function getTimeFraction($field)
-    {
-        if (in_array($field, ['start_hour', 'start_minute'])) {
-            list($start_hour, $start_minute) = explode(':', $this->start_time);
-            return (int)$$field;
-        }
-        if (in_array($field, ['end_hour', 'end_minute'])) {
-            list($end_hour, $end_minute) = explode(':', $this->end_time);
-            return (int)$$field;
-        }
-
-        throw new InvalidArgumentException("Invalid field {$field}");
-    }
-
-    /**
-     * Sets the time fraction for a given field.
-     *
-     * @param String $field Time fraction field
-     * @param mixed  $value Time fraction value as string or int
-     * @return String containing the time fraction
-     */
-    protected function setTimeFraction($field, $value)
-    {
-        if ($field == 'start_hour') {
-            $this->start_time = sprintf('%02u:%02u:00', $value, $this->start_minute);
-            return $this->start_hour;
-        }
-        if ($field == 'start_minute') {
-            $this->start_time = sprintf('%02u:%02u:00', $this->start_hour, $value);
-            return $this->start_minute;
-        }
-        if ($field == 'end_hour') {
-            $this->end_time = sprintf('%02u:%02u:00', $value, $this->end_minute);
-            return $this->end_hour;
-        }
-        if ($field == 'end_minute') {
-            $this->end_time = sprintf('%02u:%02u:00', $this->end_hour, $value);
-            return $this->end_minute;
-        }
-
-        throw new InvalidArgumentException("Invalid field {$field}");
-    }
-
-    /**
-     * Check if there is a least one not cancelled date for this cycle data
-     *
-     * @return bool   true, if there is at least one not cancelled date
-     */
-    public function getIsVisible()
-    {
-        return sizeof($this->dates) ? true : false;
-    }
-
-    /**
-     * SWS needs special setter to always store a decimal
-     *
-     * @param number $value
-     */
-    protected function setSws($value)
-    {
-        $this->content['sws'] = round(str_replace(',', '.', $value), 1);
-    }
-
-    /**
-     * returns a string for a date like '3. 9:00s - 10:45' (short and long)
-     * or '3. 9:00s - 10:45, , ab der 7. Semesterwoche, (Vorlesung)' with the week of the semester
-     * @param format string: "short"|"long"|"full"
-     * @return formatted string
-     */
-    public function toString($format = 'short')
-    {
-        $template['short'] = '%s. %02s:%02s - %02s:%02s';
-        $template['long'] = '%s: %02s:%02s - %02s:%02s, %s';
-        $template['full'] = '%s: %02s:%02s - %02s:%02s, ' . _('%s, ab der %s. Semesterwoche');
-        if ($this->end_offset) {
-            $template['full'] .= ' bis zur %s. Semesterwoche';
-        } else {
-            $template['full'] .= '%s';
-        }
-        $template['full'] .= '%s';
-        $cycles = [_('wöchentlich'), _('zweiwöchentlich'), _('dreiwöchentlich')];
-        $day = getWeekDay($this->weekday, $format == 'short');
-        $result = sprintf($template[$format],
-            $day,
-            $this->start_hour,
-            $this->start_minute,
-            $this->end_hour,
-            $this->end_minute,
-            $cycles[(int)$this->cycle],
-            $this->week_offset + 1,
-            $this->end_offset ? $this->end_offset: '',
-            $this->description ? ' (' . $this->description . ')' : '');
-        return $result;
-    }
-
-    /**
-     * returns an sorted array with all dates and exdates for the cycledate entry
-     * @return array of instances of dates or exdates
-     */
-    public function getAllDates()
-    {
-        $dates = [];
-        foreach ($this->exdates as $date) {
-            $dates[] = $date;
-        }
-        foreach ($this->dates as $date) {
-            $dates[] = $date;
-        }
-
-        usort($dates, function ($a, $b) {
-            return $a->date - $b->date;
-        });
-
-        return $dates;
-    }
-
-    /**
-     * Deletes the cycle.
-     *
-     * @return int number of affected rows
-     */
-    public function delete()
-    {
-        $cycle_info = $this->toString();
-        $seminar_id = $this->seminar_id;
-        $metadate_id = $this->metadate_id;
-        $result = parent::delete();
-
-        if ($result) {
-            $stmt = DBManager::get()->prepare('DELETE FROM schedule_seminare WHERE metadate_id = :metadate_id');
-            $stmt->execute(['metadate_id' => $metadate_id]);
-
-            StudipLog::log('SEM_DELETE_CYCLE', $seminar_id, null, $cycle_info);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Set date-type for all dates
-     * @param $type
-     * @return int
-     */
-    public function setSingleDateType($type)
-    {
-        $result = 0;
-        if (count($this->dates)) {
-            foreach($this->dates as $date) {
-                $date->date_typ = $type;
-                $result += $date->store();
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Stores this cycle.
-     * @return int number of changed rows
-     */
-    public function store()
-    {
-        //create new entry in seminare_cycle_date
-        if ($this->isNew()) {
-            $result = parent::store();
-            if ($result) {
-                $course = Course::find($this->seminar_id);
-                //create start timestamp
-                $new_dates = $this->createTerminSlots($this->calculateTimestamp(
-                    $course->start_semester->vorles_beginn,
-                    $this->week_offset*7
-                ));
-
-                if (!empty($new_dates)) {
-                    foreach ($new_dates as $semester_dates) {
-                        foreach ($semester_dates['dates'] as $date) {
-                            $result += $date->store();
-                        }
-                    }
-                } else {
-                    $this->delete();
-                    return 0;
-                }
-                $this->resetRelation("dates");
-                StudipLog::log('SEM_ADD_CYCLE', $this->seminar_id, NULL, $this->toString());
-                return $result;
-            }
-            return 0;
-        }
-
-        //change existing cycledate, changes also corresponding single dates
-        $old_cycle = SeminarCycleDate::find($this->metadate_id);
-        if (!parent::store()) {
-            return false;
-        }
-
-        if ($this->start_time != $old_cycle->start_time
-                || $this->end_time != $old_cycle->end_time
-                || $old_cycle->weekday != $this->weekday )
-        {
-            $update_count = $this->updateExistingDates($old_cycle);
-        }
-
-        if ($old_cycle->week_offset != $this->week_offset
-            || $old_cycle->end_offset != $this->end_offset
-            || $old_cycle->cycle != $this->cycle )
-        {
-            $update_count = $this->generateNewDates();
-        }
-
-        StudipLog::log('SEM_CHANGE_CYCLE', $this->seminar_id, NULL,
-                $old_cycle->toString() .' -> ' . $this->toString());
-
-        return $update_count;
-    }
-
-    private function updateExistingDates($old_cycle)
-    {
-        $update_count = 0;
-        foreach ($this->getAllDates() as $date) {
-            // ignore dates in the past
-            if ($date->date < time()) {
-                continue;
-            }
-
-            $tos = $date->date;
-            $toe = $date->end_time;
-            $day = $this->weekday - $old_cycle->weekday;
-
-            $date->date = mktime(date('G', strtotime($this->start_time)), date('i', strtotime($this->start_time)), 0, date('m', $tos), date('d', $tos), date('Y', $tos)) + $day * 24 * 60 * 60;
-            $date->end_time = mktime(date('G', strtotime($this->end_time)), date('i', strtotime($this->end_time)), 0, date('m', $toe), date('d', $toe), date('Y', $toe)) + $day * 24 * 60 * 60;
-
-            if ($date instanceof CourseDate && !is_null($date->room_booking)) {
-                //Check if the time range of the date has decreased and did not exceed the
-                //boundaries of the existing room booking. In that case, the room booking is shortened.
-                if ($date->date < $tos || $date->end_time > $toe) {
-                    //The room booking must be deleted.
-                    $date->room_booking->delete();
-                } else {
-                    //The room booking must be shortened.
-                    $date->room_booking->begin = $date->date;
-                    $date->room_booking->end = $date->end_time;
-                    $date->room_booking->store();
-                }
-            }
-
-            if ($old_cycle->weekday != $this->weekday) {
-                $all_holiday = SemesterHoliday::getAll(); // fetch all Holidays
-                $holiday_date = false;
-                foreach ($all_holiday as $val2) {
-                    if (($val2["beginn"] <= $date->date) && ($date->date <= $val2["ende"])) {
-                        $holiday_date = true;
-                        break;
-                    }
-                }
-
-                //check for calculatable holidays
-                if ($date instanceof CourseDate || $date instanceof CourseExDate) {
-                    $holy_type = SemesterHoliday::isHoliday($date->date, false);
-                    if ($holy_type["col"] == 3) {
-                        $holiday_date = true;
-                    }
-                }
-
-                if ($holiday_date && $date instanceof CourseDate) {
-                    $date->cancelDate();
-                } else if (!$holiday_date && $date instanceof CourseExDate) {
-                    $date->unCancelDate();
-                } else if ($date->isDirty()) {
-                    $date->store();
-                    $update_count++;
-                }
-            } else if ($date->isDirty()) {
-                $date->store();
-                $update_count++;
-            }
-        }
-        $this->resetRelation('dates');
-        $this->resetRelation('exdates');
-        return $update_count;
-    }
-
-    /**
-     * Generate any currently missing single dates for this cycle.
-     */
-    public function generateNewDates()
-    {
-        $course = Course::find($this->seminar_id);
-        $topics = [];
-        //collect topics for existing future dates (CourseDate)
-        foreach ($this->getAllDates() as $date) {
-            if ($date->end_time >= time()) {
-                $topics_tmp = CourseTopic::findByTermin_id($date->termin_id);
-                if (!empty($topics_tmp)) {
-                    $topics[] = $topics_tmp;
-                }
-            }
-
-            if (is_null($this->end_offset)) {
-                // check if seminar is endless
-                if ($course->isOpenEnded()) {
-                    $last_sem = Semester::findOneBySQL('1 ORDER BY beginn DESC');
-                    $end_time_offset = $last_sem->vorles_ende;
-                } else {
-                    $end_time_offset = $course->end_semester->vorles_ende;
-                }
-            } else {
-                $end_time_offset = $this->calculateTimestamp($course->start_semester->vorles_beginn,
-                    ($this->end_offset + 1) * 7
-                );
-            }
-
-            if ($date->date < $this->calculateTimestamp($course->start_semester->vorles_beginn, $this->week_offset * 7) ||
-                $date->date > $end_time_offset
-            ) {
-                $date->delete();
-            }
-        }
-        //restore for updated singledate entries
-        $this->resetRelation('dates');
-        $this->resetRelation('exdates');
-
-        //create start timestamp
-        $new_dates = $this->createTerminSlots($this->calculateTimestamp(
-            $course->start_semester->vorles_beginn,
-            $this->week_offset*7
-        ));
-
-        $update_count = 0;
-
-        foreach ($new_dates as $semester_dates) {
-            //update or create singeldate entries
-            foreach ($semester_dates['dates'] as $date) {
-                if ($date instanceof CourseDate && $date->date >= time() && count($topics) > 0) {
-                    $date->topics = array_shift($topics);
-                }
-                if ($date->store()) {
-                    $update_count++;
-                }
-            }
-
-            //delete unnecessary singeldate entries
-            foreach ($semester_dates['dates_to_delete'] as $date) {
-                $date->delete();
-            }
-        }
-        return $update_count;
-    }
-
-    /**
-     * generate single date objects for one cycle and all semester, existing dates are merged in
-     *
-     * @param startAfterTimeStamp => int timestamp to override semester start
-     * @return array array of arrays, for each semester id  an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
-     */
-    private function createTerminSlots($startAfterTimeStamp = 0)
-    {
-        $course = Course::find($this->seminar_id);
-        $ret = [];
-
-        if ($startAfterTimeStamp == 0 || $startAfterTimeStamp < $course->start_semester->vorles_beginn) {
-            $startAfterTimeStamp = $course->start_semester->vorles_beginn;
-        }
-
-        // check if cycle has a fix end (end_offset == null -> endless)
-        if (is_null($this->end_offset)) {
-            // check if seminar is endless
-            if ($course->isOpenEnded()) {
-                $last_sem = Semester::findOneBySQL('1 ORDER BY beginn DESC');
-                $sem_end = $last_sem->vorles_ende;
-            } else {
-                $sem_end = $course->end_semester->vorles_ende;
-            }
-        } else {
-            $sem_end = $this->calculateTimestamp($course->start_semester->vorles_beginn, ($this->end_offset + 1) * 7);
-        }
-
-        $semester = Semester::findBySQL('beginn <= :ende AND ende >= :start',
-                ['start' => $startAfterTimeStamp, 'ende' => $sem_end]);
-
-        foreach ($semester as $val) {
-                $ret[$val['semester_id']] = $this->createSemesterTerminSlots($val['vorles_beginn'], $val['vorles_ende'], $startAfterTimeStamp);
-        }
-        return $ret;
-    }
-
-
-    /**
-     * generate single date objects for one cycle and one semester, existing dates are merged in
-     *
-     * @param string cycle id
-     * @param int    timestamp of semester start
-     * @param int    timestamp of semester end
-     * @param int    alternative timestamp to start from
-     * @return array returns an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
-     */
-    private function createSemesterTerminSlots($sem_begin, $sem_end, $startAfterTimeStamp)
-    {
-
-        $dates = [];
-        $dates_to_delete = [];
-
-        // The currently existing singledates for the by metadate_id denoted  regular time-entry
-        //$existingSingleDates =& $this->cycles[$metadate_id]->getSingleDates();
-        $all_dates = $this->getAllDates();
-        $existingSingleDates =& $all_dates;
-
-        $start_woche = $this->week_offset;
-        $turnus_offset = 0;
-
-        // This variable is used to check if a given singledate shall be created in a bi-weekly seminar.
-        if ($start_woche == -1) {
-            $start_woche = 0;
-        }
-        $week = 0;
-
-        // get the first presence date after sem_begin
-        $day_of_week = date('l', strtotime('Sunday + ' . $this->weekday . ' days'));
-        $stamp = strtotime('this week ' . $day_of_week, max($sem_begin, $startAfterTimeStamp));
-
-        $start = explode(':', $this->start_time);
-
-        $start_time = mktime(
-            (int)$start[0],                                     // Hour
-            (int)$start[1],                                     // Minute
-            0,                                                  // Second
-            date("n", $stamp),                                  // Month
-            date("j", $stamp),                                  // Day
-            date("Y", $stamp));                                 // Year
-
-        $end = explode(':', $this->end_time);
-        $end_time = mktime(
-            (int)$end[0],                                       // Hour
-            (int)$end[1],                                       // Minute
-            0,                                                  // Second
-            date("n", $stamp),                                  // Month
-            date("j", $stamp),                                  // Day
-            date("Y", $stamp));                                 // Year
-
-        $course = Course::find($this->seminar_id);
-
-        // check if cycle has a fix end (end_offset == null -> endless)
-        if (is_null($this->end_offset)) {
-            // check if seminar is endless
-            if ($course->isOpenEnded()) {
-                $last_sem = Semester::findOneBySQL('1 ORDER BY beginn DESC');
-                $end_time_offset = $last_sem->vorles_ende;
-            } else {
-                $end_time_offset = $course->end_semester->vorles_ende;
-            }
-        } else {
-            $end_time_offset = $this->calculateTimestamp($course->start_semester->vorles_beginn, ($this->end_offset + 1) * 7);
-        }
-
-        // loop through all possible singledates for this regular time-entry
-        do {
-
-            // if dateExists is true, the singledate will not be created. Default is of course to create the singledate
-            $dateExists = false;
-
-            // do not create singledates if they are earlier than the semester start
-            if ($end_time < $sem_begin) {
-                $dateExists = true;
-                $turnus_offset = 1;
-            }
-
-            /*
-             * We only create dates, which do not already exist, so we do not overwrite existing dates.
-             *
-             * Additionally, we delete singledates which are not needed any more (bi-weekly, changed start-week, etc.)
-             */
-            $date_values['range_id'] = $this->seminar_id;
-            $date_values['autor_id'] = $GLOBALS['user']->id;
-            $date_values['metadate_id'] = $this->metadate_id;
-            foreach ($existingSingleDates as $key => $val) {
-                // take only the singledate into account, that maps the current timepoint
-                // only compare the week and year, because dates in the past may differ on time or day
-                if ($start_time > $startAfterTimeStamp && date('W Y', $val->date) == date('W Y', $start_time)) {
-                    $dateExists = true;
-                    if (isset($existingSingleDates[$key])) {
-                        $dates[] = $val;
-                    }
-                }
-            }
-
-            if (!$dateExists) {
-                $termin = new CourseDate();
-
-                $all_holiday = SemesterHoliday::getAll(); // fetch all Holidays
-                foreach ($all_holiday as $val2) {
-                    if (($val2["beginn"] <= $start_time) && ($start_time <= $val2["ende"])) {
-                        $termin = new CourseExDate();
-                        break;
-                    }
-                }
-
-                //check for calculatable holidays
-                if ($termin instanceof CourseDate) {
-                    $holy_type = SemesterHoliday::isHoliday($start_time, false);
-                    if (!is_bool($holy_type) && $holy_type['col'] == 3) {
-                        $termin = new CourseExDate();
-                    }
-                }
-                $date_values['date'] = $start_time;
-                $date_values['end_time'] = $end_time;
-                $date_values['date_type'] = 1;
-                $termin->setData($date_values);
-
-                $dates[] = $termin;
-            }
-
-            //inc the week, create timestamps for the next singledate
-            $start_time = strtotime('+ 1 week', $start_time);
-            $end_time = strtotime('+ 1 week', $end_time);
-            $week++;
-
-        } while ($end_time < $sem_end && $end_time < $end_time_offset);
-
-        //calulate trurnus
-        if ($this->cycle != 0) {
-            return $this->calculateTurnusDates($dates, $turnus_offset);
-        }
-        return ['dates' => $dates, 'dates_to_delete' => $dates_to_delete];
-    }
-
-
-    /**
-     * Calculate turnus for singledate entries
-     *
-     * @param array $dates
-     * @param int $turnus_offset correction for turnus calculation if first date is not within semester
-     * @return array
-     */
-    public function calculateTurnusDates($dates, $turnus_offset)
-    {
-        $week_count = 0 + $turnus_offset;
-        $dates_to_store = [];
-        $dates_to_delete = [];
-        foreach ($dates as $date) {
-
-            if ($this->cycle == 1 && $week_count % 2 != 0 && $week_count > 0) {
-                if (!$date->isNew()) {
-                    $dates_to_delete[] = $date;
-                }
-            } else if ($this->cycle == 2 && $week_count % 3 != 0 && $week_count > 0) {
-                if (!$date->isNew()) {
-                    $dates_to_delete[] = $date;
-                }
-            } else {
-                $dates_to_store[] = $date;
-            }
-            $week_count++;
-        }
-        return ['dates' => $dates_to_store, 'dates_to_delete' => $dates_to_delete];
-    }
-
-    /**
-     * removes all singleDates which are NOT between $start and $end
-     *
-     * @param int    timestamp for start
-     * @param int    timestamp for end
-     * @param string seminar_id
-     */
-    public static function removeOutRangedSingleDates($start, $end, $seminar_id)
-    {
-        $query = "SELECT termin_id
-                  FROM termine
-                  WHERE range_id = ? AND (`date` NOT BETWEEN ? AND ?)
-                    AND NOT (metadate_id IS NULL OR metadate_id = '')";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id, $start, $end]);
-        $ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-        foreach ($ids as $id) {
-            $termin = new SingleDate($id);
-            $termin->delete();
-            unset($termin);
-        }
-
-        if (count($ids) > 0) {
-            // remove all assigns for the dates in question
-            $query = "SELECT id FROM resource_bookings WHERE range_id IN (?)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$ids]);
-
-            $booking_ids = $statement->fetchAll(PDO::FETCH_COLUMN | PDO::FETCH_UNIQUE, 0);
-
-            ResourceBooking::deleteBySql(
-                'id IN ( :booking_ids )',
-                [
-                    'booking_ids' => $booking_ids
-                ]
-            );
-        }
-
-        $query = "DELETE FROM ex_termine
-                  WHERE range_id = ? AND (`date` NOT BETWEEN ? AND ?)
-                    AND NOT (metadate_id IS NULL OR metadate_id = '')";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id, $start, $end]);
-    }
-
-    /**
-     * returns a new timestamp for an given start-timestamp and
-     * an amount of days calculated with DateTime-Class
-     *
-     * @param  int  starttime as timestamp
-     * @param  int  amount of days
-     * @return int  new timestamp
-     */
-    private static function calculateTimestamp($base, $days = 0)
-    {
-        $date = new DateTime();
-        $date->setTimestamp($base);
-        $date->modify(sprintf('this week monday +%s days', $days));
-        return $date->getTimestamp();
-    }
-
-
-    /**
-     * This is a helper method for getRoomRequestsForDates and
-     * countRoomRequestsForDates which helps at building the
-     * SQL query and parameters.
-     *
-     * @returns array An associative array with two indexes:
-     *     - sql: The SQL query
-     *     - sql_params: The parameters for the SQL query as associative array.
-     */
-    protected function buildOpenRequestsForDatesQuery(
-        $include_metadate = false,
-        $order = ''
-    )
-    {
-        $sql = "closed < '1' AND ";
-        $sql_params = [];
-
-        if ($include_metadate) {
-            $sql = 'metadate_id = :metadate_id OR ';
-        }
-
-        $sql .= 'termin_id IN (
-            SELECT termin_id FROM termine
-            WHERE metadate_id = :metadate_id
-        ) OR id IN (
-            SELECT request_id
-            FROM resource_request_appointments rra
-            INNER JOIN termine
-            ON rra.appointment_id = termine.termin_id
-            WHERE termine.metadate_id = :metadate_id
-        ) ';
-        $sql_params['metadate_id'] = $this->id;
-
-        if ($order) {
-            $sql .= 'ORDER BY ' . $order;
-        }
-        return [
-            'sql' => $sql,
-            'sql_params' => $sql_params
-        ];
-    }
-
-
-    /**
-     * Returns the open room requests that are associated with this metadate.
-     * If the optional parameter $include_metadate is set to false,
-     * the requests associated with this metadate are not included
-     * in the result.
-     *
-     * @param bool $include_metadate Whether to include requests associated
-     *     with this metadate (true) or not (false). The default is false.
-     *
-     * @returns ResourceRequest[] The requests for this metadate.
-     */
-    public function getOpenRequestsForDates(
-        $include_metadate = false,
-        $order = 'mkdate DESC'
-    )
-    {
-        $data = $this->buildOpenRequestsForDatesQuery($include_metadate, $order);
-        return ResourceRequest::findBySql($data['sql'], $data['sql_params']);
-    }
-
-
-    /**
-     * Returns the amount of open room requests that are associated
-     * with this metadate.
-     * The amount of requests is determined by counting requests that are
-     * directly associated to this metadate and the requests that are
-     * associated with the dates of this metadate.
-     * If the optional parameter $include_metadate is set to false,
-     * the requests associated with this metadate are not included
-     * in the result.
-     *
-     * @param bool $include_metadate Whether to include requests associated
-     *     with this metadate (true) or not (false). The default is false.
-     *
-     * @returns int The amount of requests for this metadate.
-     */
-    public function countOpenRequestsForDates($include_metadate = false)
-    {
-        $data = $this->buildOpenRequestsForDatesQuery($include_metadate);
-        return ResourceRequest::countBySql($data['sql'], $data['sql_params']);
-    }
-}
diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php
new file mode 100644
index 0000000..f384426
--- /dev/null
+++ b/lib/models/SeminarCycleDate.php
@@ -0,0 +1,819 @@
+<?php
+
+
+//Do not remove! This is still needed for the toString method!
+require_once 'lib/dates.inc.php';
+
+
+/**
+ * SeminarCycleDate.class.php
+ * model class for table seminar_cycle_dates
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       2.0
+ *
+ * @property string $id alias column for metadate_id
+ * @property string $metadate_id database column
+ * @property string $seminar_id database column
+ * @property string $start_time database column
+ * @property string $end_time database column
+ * @property int $weekday database column
+ * @property string $description database column
+ * @property float $sws database column
+ * @property int $cycle database column
+ * @property int $week_offset database column
+ * @property int|null $end_offset database column
+ * @property int $sorter database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|RoomRequest[] $room_requests has_many RoomRequest
+ * @property SimpleORMapCollection|CourseDate[] $dates has_many CourseDate
+ * @property SimpleORMapCollection|CourseExDate[] $exdates has_many CourseExDate
+ * @property Course $course belongs_to Course
+ * @property mixed $start_hour additional field
+ * @property mixed $start_minute additional field
+ * @property mixed $end_hour additional field
+ * @property mixed $end_minute additional field
+ * @property-read mixed $is_visible additional field
+ */
+class SeminarCycleDate extends SimpleORMap
+{
+    /**
+     * Configures this model.
+     *
+     * @param Array $config Configuration array
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'seminar_cycle_dates';
+        $config['belongs_to']['course'] = array(
+            'class_name' => Course::class,
+            'foreign_key' => 'seminar_id',
+        );
+        $config['has_many']['room_requests'] = [
+            'class_name' => RoomRequest::class,
+            'on_store'   => 'store',
+            'on_delete'  => 'delete',
+            'assoc_func' => 'findByMetadate_id'
+        ];
+        $config['has_many']['dates'] = [
+            'class_name' => CourseDate::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+            'order_by'   => 'ORDER BY date'
+        ];
+
+        $config['has_many']['exdates'] = [
+            'class_name' => CourseExDate::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+            'order_by'   => 'ORDER BY date'
+        ];
+
+        $config['additional_fields']['start_hour'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
+        $config['additional_fields']['start_minute'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
+        $config['additional_fields']['end_hour'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
+        $config['additional_fields']['end_minute'] = ['get' => 'getTimeFraction', 'set' => 'setTimeFraction'];
+        $config['additional_fields']['is_visible'] = ['get' => 'getIsVisible'];
+        parent::configure($config);
+    }
+
+    /**
+     * returns array of instances of SeminarCycleDates of the given seminar_id
+     *
+     * @param string seminar_id: selected seminar to search for SeminarCycleDates
+     * @return array of instances of SeminarCycleDates of the given seminar_id or
+     *               an empty array
+     */
+    public static function findBySeminar($seminar_id)
+    {
+        return self::findBySeminar_id($seminar_id, "ORDER BY sorter ASC, weekday ASC, start_time ASC");
+    }
+
+    /**
+     * return instance of SeminarCycleDates of given termin_id
+     *
+     * @param string termin_id: selected seminar to search for SeminarCycleDates
+     * @return array
+     */
+    public static function findByTermin($termin_id)
+    {
+        return self::findOneBySql("metadate_id=(SELECT metadate_id FROM termine WHERE termin_id = ? "
+                                  . "UNION SELECT metadate_id FROM ex_termine WHERE termin_id = ? )", [$termin_id, $termin_id]);
+    }
+    /**
+     * Returns the time fraction for a given field.
+     *
+     * @param String $field Time fraction field
+     * @return int the time fraction
+     */
+    protected function getTimeFraction($field)
+    {
+        if (in_array($field, ['start_hour', 'start_minute'])) {
+            list($start_hour, $start_minute) = explode(':', $this->start_time);
+            return (int)$$field;
+        }
+        if (in_array($field, ['end_hour', 'end_minute'])) {
+            list($end_hour, $end_minute) = explode(':', $this->end_time);
+            return (int)$$field;
+        }
+
+        throw new InvalidArgumentException("Invalid field {$field}");
+    }
+
+    /**
+     * Sets the time fraction for a given field.
+     *
+     * @param String $field Time fraction field
+     * @param mixed  $value Time fraction value as string or int
+     * @return String containing the time fraction
+     */
+    protected function setTimeFraction($field, $value)
+    {
+        if ($field == 'start_hour') {
+            $this->start_time = sprintf('%02u:%02u:00', $value, $this->start_minute);
+            return $this->start_hour;
+        }
+        if ($field == 'start_minute') {
+            $this->start_time = sprintf('%02u:%02u:00', $this->start_hour, $value);
+            return $this->start_minute;
+        }
+        if ($field == 'end_hour') {
+            $this->end_time = sprintf('%02u:%02u:00', $value, $this->end_minute);
+            return $this->end_hour;
+        }
+        if ($field == 'end_minute') {
+            $this->end_time = sprintf('%02u:%02u:00', $this->end_hour, $value);
+            return $this->end_minute;
+        }
+
+        throw new InvalidArgumentException("Invalid field {$field}");
+    }
+
+    /**
+     * Check if there is a least one not cancelled date for this cycle data
+     *
+     * @return bool   true, if there is at least one not cancelled date
+     */
+    public function getIsVisible()
+    {
+        return sizeof($this->dates) ? true : false;
+    }
+
+    /**
+     * SWS needs special setter to always store a decimal
+     *
+     * @param number $value
+     */
+    protected function setSws($value)
+    {
+        $this->content['sws'] = round(str_replace(',', '.', $value), 1);
+    }
+
+    /**
+     * returns a string for a date like '3. 9:00s - 10:45' (short and long)
+     * or '3. 9:00s - 10:45, , ab der 7. Semesterwoche, (Vorlesung)' with the week of the semester
+     * @param format string: "short"|"long"|"full"
+     * @return formatted string
+     */
+    public function toString($format = 'short')
+    {
+        $template['short'] = '%s. %02s:%02s - %02s:%02s';
+        $template['long'] = '%s: %02s:%02s - %02s:%02s, %s';
+        $template['full'] = '%s: %02s:%02s - %02s:%02s, ' . _('%s, ab der %s. Semesterwoche');
+        if ($this->end_offset) {
+            $template['full'] .= ' bis zur %s. Semesterwoche';
+        } else {
+            $template['full'] .= '%s';
+        }
+        $template['full'] .= '%s';
+        $cycles = [_('wöchentlich'), _('zweiwöchentlich'), _('dreiwöchentlich')];
+        $day = getWeekDay($this->weekday, $format == 'short');
+        $result = sprintf($template[$format],
+            $day,
+            $this->start_hour,
+            $this->start_minute,
+            $this->end_hour,
+            $this->end_minute,
+            $cycles[(int)$this->cycle],
+            $this->week_offset + 1,
+            $this->end_offset ? $this->end_offset: '',
+            $this->description ? ' (' . $this->description . ')' : '');
+        return $result;
+    }
+
+    /**
+     * returns an sorted array with all dates and exdates for the cycledate entry
+     * @return array of instances of dates or exdates
+     */
+    public function getAllDates()
+    {
+        $dates = [];
+        foreach ($this->exdates as $date) {
+            $dates[] = $date;
+        }
+        foreach ($this->dates as $date) {
+            $dates[] = $date;
+        }
+
+        usort($dates, function ($a, $b) {
+            return $a->date - $b->date;
+        });
+
+        return $dates;
+    }
+
+    /**
+     * Deletes the cycle.
+     *
+     * @return int number of affected rows
+     */
+    public function delete()
+    {
+        $cycle_info = $this->toString();
+        $seminar_id = $this->seminar_id;
+        $metadate_id = $this->metadate_id;
+        $result = parent::delete();
+
+        if ($result) {
+            $stmt = DBManager::get()->prepare('DELETE FROM schedule_seminare WHERE metadate_id = :metadate_id');
+            $stmt->execute(['metadate_id' => $metadate_id]);
+
+            StudipLog::log('SEM_DELETE_CYCLE', $seminar_id, null, $cycle_info);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set date-type for all dates
+     * @param $type
+     * @return int
+     */
+    public function setSingleDateType($type)
+    {
+        $result = 0;
+        if (count($this->dates)) {
+            foreach($this->dates as $date) {
+                $date->date_typ = $type;
+                $result += $date->store();
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Stores this cycle.
+     * @return int number of changed rows
+     */
+    public function store()
+    {
+        //create new entry in seminare_cycle_date
+        if ($this->isNew()) {
+            $result = parent::store();
+            if ($result) {
+                $course = Course::find($this->seminar_id);
+                //create start timestamp
+                $new_dates = $this->createTerminSlots($this->calculateTimestamp(
+                    $course->start_semester->vorles_beginn,
+                    $this->week_offset*7
+                ));
+
+                if (!empty($new_dates)) {
+                    foreach ($new_dates as $semester_dates) {
+                        foreach ($semester_dates['dates'] as $date) {
+                            $result += $date->store();
+                        }
+                    }
+                } else {
+                    $this->delete();
+                    return 0;
+                }
+                $this->resetRelation("dates");
+                StudipLog::log('SEM_ADD_CYCLE', $this->seminar_id, NULL, $this->toString());
+                return $result;
+            }
+            return 0;
+        }
+
+        //change existing cycledate, changes also corresponding single dates
+        $old_cycle = SeminarCycleDate::find($this->metadate_id);
+        if (!parent::store()) {
+            return false;
+        }
+
+        if ($this->start_time != $old_cycle->start_time
+                || $this->end_time != $old_cycle->end_time
+                || $old_cycle->weekday != $this->weekday )
+        {
+            $update_count = $this->updateExistingDates($old_cycle);
+        }
+
+        if ($old_cycle->week_offset != $this->week_offset
+            || $old_cycle->end_offset != $this->end_offset
+            || $old_cycle->cycle != $this->cycle )
+        {
+            $update_count = $this->generateNewDates();
+        }
+
+        StudipLog::log('SEM_CHANGE_CYCLE', $this->seminar_id, NULL,
+                $old_cycle->toString() .' -> ' . $this->toString());
+
+        return $update_count;
+    }
+
+    private function updateExistingDates($old_cycle)
+    {
+        $update_count = 0;
+        foreach ($this->getAllDates() as $date) {
+            // ignore dates in the past
+            if ($date->date < time()) {
+                continue;
+            }
+
+            $tos = $date->date;
+            $toe = $date->end_time;
+            $day = $this->weekday - $old_cycle->weekday;
+
+            $date->date = mktime(date('G', strtotime($this->start_time)), date('i', strtotime($this->start_time)), 0, date('m', $tos), date('d', $tos), date('Y', $tos)) + $day * 24 * 60 * 60;
+            $date->end_time = mktime(date('G', strtotime($this->end_time)), date('i', strtotime($this->end_time)), 0, date('m', $toe), date('d', $toe), date('Y', $toe)) + $day * 24 * 60 * 60;
+
+            if ($date instanceof CourseDate && !is_null($date->room_booking)) {
+                //Check if the time range of the date has decreased and did not exceed the
+                //boundaries of the existing room booking. In that case, the room booking is shortened.
+                if ($date->date < $tos || $date->end_time > $toe) {
+                    //The room booking must be deleted.
+                    $date->room_booking->delete();
+                } else {
+                    //The room booking must be shortened.
+                    $date->room_booking->begin = $date->date;
+                    $date->room_booking->end = $date->end_time;
+                    $date->room_booking->store();
+                }
+            }
+
+            if ($old_cycle->weekday != $this->weekday) {
+                $all_holiday = SemesterHoliday::getAll(); // fetch all Holidays
+                $holiday_date = false;
+                foreach ($all_holiday as $val2) {
+                    if (($val2["beginn"] <= $date->date) && ($date->date <= $val2["ende"])) {
+                        $holiday_date = true;
+                        break;
+                    }
+                }
+
+                //check for calculatable holidays
+                if ($date instanceof CourseDate || $date instanceof CourseExDate) {
+                    $holy_type = SemesterHoliday::isHoliday($date->date, false);
+                    if ($holy_type["col"] == 3) {
+                        $holiday_date = true;
+                    }
+                }
+
+                if ($holiday_date && $date instanceof CourseDate) {
+                    $date->cancelDate();
+                } else if (!$holiday_date && $date instanceof CourseExDate) {
+                    $date->unCancelDate();
+                } else if ($date->isDirty()) {
+                    $date->store();
+                    $update_count++;
+                }
+            } else if ($date->isDirty()) {
+                $date->store();
+                $update_count++;
+            }
+        }
+        $this->resetRelation('dates');
+        $this->resetRelation('exdates');
+        return $update_count;
+    }
+
+    /**
+     * Generate any currently missing single dates for this cycle.
+     */
+    public function generateNewDates()
+    {
+        $course = Course::find($this->seminar_id);
+        $topics = [];
+        //collect topics for existing future dates (CourseDate)
+        foreach ($this->getAllDates() as $date) {
+            if ($date->end_time >= time()) {
+                $topics_tmp = CourseTopic::findByTermin_id($date->termin_id);
+                if (!empty($topics_tmp)) {
+                    $topics[] = $topics_tmp;
+                }
+            }
+
+            if (is_null($this->end_offset)) {
+                // check if seminar is endless
+                if ($course->isOpenEnded()) {
+                    $last_sem = Semester::findOneBySQL('1 ORDER BY beginn DESC');
+                    $end_time_offset = $last_sem->vorles_ende;
+                } else {
+                    $end_time_offset = $course->end_semester->vorles_ende;
+                }
+            } else {
+                $end_time_offset = $this->calculateTimestamp($course->start_semester->vorles_beginn,
+                    ($this->end_offset + 1) * 7
+                );
+            }
+
+            if ($date->date < $this->calculateTimestamp($course->start_semester->vorles_beginn, $this->week_offset * 7) ||
+                $date->date > $end_time_offset
+            ) {
+                $date->delete();
+            }
+        }
+        //restore for updated singledate entries
+        $this->resetRelation('dates');
+        $this->resetRelation('exdates');
+
+        //create start timestamp
+        $new_dates = $this->createTerminSlots($this->calculateTimestamp(
+            $course->start_semester->vorles_beginn,
+            $this->week_offset*7
+        ));
+
+        $update_count = 0;
+
+        foreach ($new_dates as $semester_dates) {
+            //update or create singeldate entries
+            foreach ($semester_dates['dates'] as $date) {
+                if ($date instanceof CourseDate && $date->date >= time() && count($topics) > 0) {
+                    $date->topics = array_shift($topics);
+                }
+                if ($date->store()) {
+                    $update_count++;
+                }
+            }
+
+            //delete unnecessary singeldate entries
+            foreach ($semester_dates['dates_to_delete'] as $date) {
+                $date->delete();
+            }
+        }
+        return $update_count;
+    }
+
+    /**
+     * generate single date objects for one cycle and all semester, existing dates are merged in
+     *
+     * @param startAfterTimeStamp => int timestamp to override semester start
+     * @return array array of arrays, for each semester id  an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
+     */
+    private function createTerminSlots($startAfterTimeStamp = 0)
+    {
+        $course = Course::find($this->seminar_id);
+        $ret = [];
+
+        if ($startAfterTimeStamp == 0 || $startAfterTimeStamp < $course->start_semester->vorles_beginn) {
+            $startAfterTimeStamp = $course->start_semester->vorles_beginn;
+        }
+
+        // check if cycle has a fix end (end_offset == null -> endless)
+        if (is_null($this->end_offset)) {
+            // check if seminar is endless
+            if ($course->isOpenEnded()) {
+                $last_sem = Semester::findOneBySQL('1 ORDER BY beginn DESC');
+                $sem_end = $last_sem->vorles_ende;
+            } else {
+                $sem_end = $course->end_semester->vorles_ende;
+            }
+        } else {
+            $sem_end = $this->calculateTimestamp($course->start_semester->vorles_beginn, ($this->end_offset + 1) * 7);
+        }
+
+        $semester = Semester::findBySQL('beginn <= :ende AND ende >= :start',
+                ['start' => $startAfterTimeStamp, 'ende' => $sem_end]);
+
+        foreach ($semester as $val) {
+                $ret[$val['semester_id']] = $this->createSemesterTerminSlots($val['vorles_beginn'], $val['vorles_ende'], $startAfterTimeStamp);
+        }
+        return $ret;
+    }
+
+
+    /**
+     * generate single date objects for one cycle and one semester, existing dates are merged in
+     *
+     * @param string cycle id
+     * @param int    timestamp of semester start
+     * @param int    timestamp of semester end
+     * @param int    alternative timestamp to start from
+     * @return array returns an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
+     */
+    private function createSemesterTerminSlots($sem_begin, $sem_end, $startAfterTimeStamp)
+    {
+
+        $dates = [];
+        $dates_to_delete = [];
+
+        // The currently existing singledates for the by metadate_id denoted  regular time-entry
+        //$existingSingleDates =& $this->cycles[$metadate_id]->getSingleDates();
+        $all_dates = $this->getAllDates();
+        $existingSingleDates =& $all_dates;
+
+        $start_woche = $this->week_offset;
+        $turnus_offset = 0;
+
+        // This variable is used to check if a given singledate shall be created in a bi-weekly seminar.
+        if ($start_woche == -1) {
+            $start_woche = 0;
+        }
+        $week = 0;
+
+        // get the first presence date after sem_begin
+        $day_of_week = date('l', strtotime('Sunday + ' . $this->weekday . ' days'));
+        $stamp = strtotime('this week ' . $day_of_week, max($sem_begin, $startAfterTimeStamp));
+
+        $start = explode(':', $this->start_time);
+
+        $start_time = mktime(
+            (int)$start[0],                                     // Hour
+            (int)$start[1],                                     // Minute
+            0,                                                  // Second
+            date("n", $stamp),                                  // Month
+            date("j", $stamp),                                  // Day
+            date("Y", $stamp));                                 // Year
+
+        $end = explode(':', $this->end_time);
+        $end_time = mktime(
+            (int)$end[0],                                       // Hour
+            (int)$end[1],                                       // Minute
+            0,                                                  // Second
+            date("n", $stamp),                                  // Month
+            date("j", $stamp),                                  // Day
+            date("Y", $stamp));                                 // Year
+
+        $course = Course::find($this->seminar_id);
+
+        // check if cycle has a fix end (end_offset == null -> endless)
+        if (is_null($this->end_offset)) {
+            // check if seminar is endless
+            if ($course->isOpenEnded()) {
+                $last_sem = Semester::findOneBySQL('1 ORDER BY beginn DESC');
+                $end_time_offset = $last_sem->vorles_ende;
+            } else {
+                $end_time_offset = $course->end_semester->vorles_ende;
+            }
+        } else {
+            $end_time_offset = $this->calculateTimestamp($course->start_semester->vorles_beginn, ($this->end_offset + 1) * 7);
+        }
+
+        // loop through all possible singledates for this regular time-entry
+        do {
+
+            // if dateExists is true, the singledate will not be created. Default is of course to create the singledate
+            $dateExists = false;
+
+            // do not create singledates if they are earlier than the semester start
+            if ($end_time < $sem_begin) {
+                $dateExists = true;
+                $turnus_offset = 1;
+            }
+
+            /*
+             * We only create dates, which do not already exist, so we do not overwrite existing dates.
+             *
+             * Additionally, we delete singledates which are not needed any more (bi-weekly, changed start-week, etc.)
+             */
+            $date_values['range_id'] = $this->seminar_id;
+            $date_values['autor_id'] = $GLOBALS['user']->id;
+            $date_values['metadate_id'] = $this->metadate_id;
+            foreach ($existingSingleDates as $key => $val) {
+                // take only the singledate into account, that maps the current timepoint
+                // only compare the week and year, because dates in the past may differ on time or day
+                if ($start_time > $startAfterTimeStamp && date('W Y', $val->date) == date('W Y', $start_time)) {
+                    $dateExists = true;
+                    if (isset($existingSingleDates[$key])) {
+                        $dates[] = $val;
+                    }
+                }
+            }
+
+            if (!$dateExists) {
+                $termin = new CourseDate();
+
+                $all_holiday = SemesterHoliday::getAll(); // fetch all Holidays
+                foreach ($all_holiday as $val2) {
+                    if (($val2["beginn"] <= $start_time) && ($start_time <= $val2["ende"])) {
+                        $termin = new CourseExDate();
+                        break;
+                    }
+                }
+
+                //check for calculatable holidays
+                if ($termin instanceof CourseDate) {
+                    $holy_type = SemesterHoliday::isHoliday($start_time, false);
+                    if (!is_bool($holy_type) && $holy_type['col'] == 3) {
+                        $termin = new CourseExDate();
+                    }
+                }
+                $date_values['date'] = $start_time;
+                $date_values['end_time'] = $end_time;
+                $date_values['date_type'] = 1;
+                $termin->setData($date_values);
+
+                $dates[] = $termin;
+            }
+
+            //inc the week, create timestamps for the next singledate
+            $start_time = strtotime('+ 1 week', $start_time);
+            $end_time = strtotime('+ 1 week', $end_time);
+            $week++;
+
+        } while ($end_time < $sem_end && $end_time < $end_time_offset);
+
+        //calulate trurnus
+        if ($this->cycle != 0) {
+            return $this->calculateTurnusDates($dates, $turnus_offset);
+        }
+        return ['dates' => $dates, 'dates_to_delete' => $dates_to_delete];
+    }
+
+
+    /**
+     * Calculate turnus for singledate entries
+     *
+     * @param array $dates
+     * @param int $turnus_offset correction for turnus calculation if first date is not within semester
+     * @return array
+     */
+    public function calculateTurnusDates($dates, $turnus_offset)
+    {
+        $week_count = 0 + $turnus_offset;
+        $dates_to_store = [];
+        $dates_to_delete = [];
+        foreach ($dates as $date) {
+
+            if ($this->cycle == 1 && $week_count % 2 != 0 && $week_count > 0) {
+                if (!$date->isNew()) {
+                    $dates_to_delete[] = $date;
+                }
+            } else if ($this->cycle == 2 && $week_count % 3 != 0 && $week_count > 0) {
+                if (!$date->isNew()) {
+                    $dates_to_delete[] = $date;
+                }
+            } else {
+                $dates_to_store[] = $date;
+            }
+            $week_count++;
+        }
+        return ['dates' => $dates_to_store, 'dates_to_delete' => $dates_to_delete];
+    }
+
+    /**
+     * removes all singleDates which are NOT between $start and $end
+     *
+     * @param int    timestamp for start
+     * @param int    timestamp for end
+     * @param string seminar_id
+     */
+    public static function removeOutRangedSingleDates($start, $end, $seminar_id)
+    {
+        $query = "SELECT termin_id
+                  FROM termine
+                  WHERE range_id = ? AND (`date` NOT BETWEEN ? AND ?)
+                    AND NOT (metadate_id IS NULL OR metadate_id = '')";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id, $start, $end]);
+        $ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+        foreach ($ids as $id) {
+            $termin = new SingleDate($id);
+            $termin->delete();
+            unset($termin);
+        }
+
+        if (count($ids) > 0) {
+            // remove all assigns for the dates in question
+            $query = "SELECT id FROM resource_bookings WHERE range_id IN (?)";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$ids]);
+
+            $booking_ids = $statement->fetchAll(PDO::FETCH_COLUMN | PDO::FETCH_UNIQUE, 0);
+
+            ResourceBooking::deleteBySql(
+                'id IN ( :booking_ids )',
+                [
+                    'booking_ids' => $booking_ids
+                ]
+            );
+        }
+
+        $query = "DELETE FROM ex_termine
+                  WHERE range_id = ? AND (`date` NOT BETWEEN ? AND ?)
+                    AND NOT (metadate_id IS NULL OR metadate_id = '')";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id, $start, $end]);
+    }
+
+    /**
+     * returns a new timestamp for an given start-timestamp and
+     * an amount of days calculated with DateTime-Class
+     *
+     * @param  int  starttime as timestamp
+     * @param  int  amount of days
+     * @return int  new timestamp
+     */
+    private static function calculateTimestamp($base, $days = 0)
+    {
+        $date = new DateTime();
+        $date->setTimestamp($base);
+        $date->modify(sprintf('this week monday +%s days', $days));
+        return $date->getTimestamp();
+    }
+
+
+    /**
+     * This is a helper method for getRoomRequestsForDates and
+     * countRoomRequestsForDates which helps at building the
+     * SQL query and parameters.
+     *
+     * @returns array An associative array with two indexes:
+     *     - sql: The SQL query
+     *     - sql_params: The parameters for the SQL query as associative array.
+     */
+    protected function buildOpenRequestsForDatesQuery(
+        $include_metadate = false,
+        $order = ''
+    )
+    {
+        $sql = "closed < '1' AND ";
+        $sql_params = [];
+
+        if ($include_metadate) {
+            $sql = 'metadate_id = :metadate_id OR ';
+        }
+
+        $sql .= 'termin_id IN (
+            SELECT termin_id FROM termine
+            WHERE metadate_id = :metadate_id
+        ) OR id IN (
+            SELECT request_id
+            FROM resource_request_appointments rra
+            INNER JOIN termine
+            ON rra.appointment_id = termine.termin_id
+            WHERE termine.metadate_id = :metadate_id
+        ) ';
+        $sql_params['metadate_id'] = $this->id;
+
+        if ($order) {
+            $sql .= 'ORDER BY ' . $order;
+        }
+        return [
+            'sql' => $sql,
+            'sql_params' => $sql_params
+        ];
+    }
+
+
+    /**
+     * Returns the open room requests that are associated with this metadate.
+     * If the optional parameter $include_metadate is set to false,
+     * the requests associated with this metadate are not included
+     * in the result.
+     *
+     * @param bool $include_metadate Whether to include requests associated
+     *     with this metadate (true) or not (false). The default is false.
+     *
+     * @returns ResourceRequest[] The requests for this metadate.
+     */
+    public function getOpenRequestsForDates(
+        $include_metadate = false,
+        $order = 'mkdate DESC'
+    )
+    {
+        $data = $this->buildOpenRequestsForDatesQuery($include_metadate, $order);
+        return ResourceRequest::findBySql($data['sql'], $data['sql_params']);
+    }
+
+
+    /**
+     * Returns the amount of open room requests that are associated
+     * with this metadate.
+     * The amount of requests is determined by counting requests that are
+     * directly associated to this metadate and the requests that are
+     * associated with the dates of this metadate.
+     * If the optional parameter $include_metadate is set to false,
+     * the requests associated with this metadate are not included
+     * in the result.
+     *
+     * @param bool $include_metadate Whether to include requests associated
+     *     with this metadate (true) or not (false). The default is false.
+     *
+     * @returns int The amount of requests for this metadate.
+     */
+    public function countOpenRequestsForDates($include_metadate = false)
+    {
+        $data = $this->buildOpenRequestsForDatesQuery($include_metadate);
+        return ResourceRequest::countBySql($data['sql'], $data['sql_params']);
+    }
+}
diff --git a/lib/models/StudipComment.class.php b/lib/models/StudipComment.class.php
deleted file mode 100644
index 2e0389d..0000000
--- a/lib/models/StudipComment.class.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TEST
-# Lifter010: TODO
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2005 Tobias Thelen ,   <tthelen@uni-osnabrueck.de>
-//
-// +---------------------------------------------------------------------------+
-// 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 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.
-// +---------------------------------------------------------------------------+
-
-/**
- * StudipComment.class.php
- *
- *
- *
- *
- * @author   André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @access   public
- *
- * @property string $id alias column for comment_id
- * @property string $comment_id database column
- * @property string $object_id database column
- * @property string $user_id database column
- * @property string $content database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property StudipNews $news belongs_to StudipNews
- */
-
-class StudipComment extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'comments';
-
-        $config['belongs_to']['news'] = [
-            'class_name' => StudipNews::class,
-            'foreign_key' => 'object_id',
-        ];
-
-        parent::configure($config);
-    }
-
-    public static function NumCommentsForObject($object_id)
-    {
-        return self::countBySql('object_id = ?', [$object_id]);
-    }
-
-    public static function NumCommentsForObjectSinceLastVisit($object_id, $comments_since = 0, $exclude_user_id = null)
-    {
-        $query = "object_id = ?";
-        $query .= " AND chdate > ?";
-        if ($exclude_user_id) {
-            $query .= " AND user_id != ?";
-        }
-        return self::countBySql($query, [$object_id, $comments_since, $exclude_user_id]);
-    }
-
-    public static function GetCommentsForObject($object_id)
-    {
-        global $_fullname_sql;
-        $query = "SELECT comments.content, {$_fullname_sql['full']} AS fullname,
-                         a.username, comments.mkdate, comments.comment_id
-                  FROM comments
-                  LEFT JOIN auth_user_md5 AS a USING (user_id)
-                  LEFT JOIN user_info USING (user_id)
-                  WHERE object_id = ?
-                  ORDER BY comments.mkdate";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$object_id]);
-        return $statement->fetchAll(PDO::FETCH_BOTH);
-    }
-
-    public static function DeleteCommentsByObject($object_ids)
-    {
-        if (!is_array($object_ids)) {
-            $object_ids = [$object_ids];
-        }
-        $where = "object_id IN (?)";
-        return self::deleteBySQL($where, [$object_ids]);
-    }
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Ankündigungen Kommentare'), 'comments', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/StudipComment.php b/lib/models/StudipComment.php
new file mode 100644
index 0000000..2e0389d
--- /dev/null
+++ b/lib/models/StudipComment.php
@@ -0,0 +1,115 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TEST
+# Lifter010: TODO
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2005 Tobias Thelen ,   <tthelen@uni-osnabrueck.de>
+//
+// +---------------------------------------------------------------------------+
+// 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 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.
+// +---------------------------------------------------------------------------+
+
+/**
+ * StudipComment.class.php
+ *
+ *
+ *
+ *
+ * @author   André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @access   public
+ *
+ * @property string $id alias column for comment_id
+ * @property string $comment_id database column
+ * @property string $object_id database column
+ * @property string $user_id database column
+ * @property string $content database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property StudipNews $news belongs_to StudipNews
+ */
+
+class StudipComment extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'comments';
+
+        $config['belongs_to']['news'] = [
+            'class_name' => StudipNews::class,
+            'foreign_key' => 'object_id',
+        ];
+
+        parent::configure($config);
+    }
+
+    public static function NumCommentsForObject($object_id)
+    {
+        return self::countBySql('object_id = ?', [$object_id]);
+    }
+
+    public static function NumCommentsForObjectSinceLastVisit($object_id, $comments_since = 0, $exclude_user_id = null)
+    {
+        $query = "object_id = ?";
+        $query .= " AND chdate > ?";
+        if ($exclude_user_id) {
+            $query .= " AND user_id != ?";
+        }
+        return self::countBySql($query, [$object_id, $comments_since, $exclude_user_id]);
+    }
+
+    public static function GetCommentsForObject($object_id)
+    {
+        global $_fullname_sql;
+        $query = "SELECT comments.content, {$_fullname_sql['full']} AS fullname,
+                         a.username, comments.mkdate, comments.comment_id
+                  FROM comments
+                  LEFT JOIN auth_user_md5 AS a USING (user_id)
+                  LEFT JOIN user_info USING (user_id)
+                  WHERE object_id = ?
+                  ORDER BY comments.mkdate";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$object_id]);
+        return $statement->fetchAll(PDO::FETCH_BOTH);
+    }
+
+    public static function DeleteCommentsByObject($object_ids)
+    {
+        if (!is_array($object_ids)) {
+            $object_ids = [$object_ids];
+        }
+        $where = "object_id IN (?)";
+        return self::deleteBySQL($where, [$object_ids]);
+    }
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Ankündigungen Kommentare'), 'comments', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/StudipNews.class.php b/lib/models/StudipNews.class.php
deleted file mode 100644
index 12eb3e1..0000000
--- a/lib/models/StudipNews.class.php
+++ /dev/null
@@ -1,696 +0,0 @@
-<?php
-// +---------------------------------------------------------------------------+
-// This file is part of Stud.IP
-//
-// Copyright (C) 2005 André Noack <noack@data-quest>,
-// Suchi & Berg GmbH <info@data-quest.de>
-// +---------------------------------------------------------------------------+
-// 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 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 'lib/object.inc.php';
-
-/**
- * StudipNews.class.php
- *
- * @author   André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @author   Arne Schröder <schroeder@data-quest>
- * @access   public
- *
- * @property string $id alias column for news_id
- * @property string $news_id database column
- * @property I18NString $topic database column
- * @property I18NString $body database column
- * @property string $author database column
- * @property int $date database column
- * @property string $user_id database column
- * @property int $expire database column
- * @property int $allow_comments database column
- * @property int $prio database column
- * @property int $chdate database column
- * @property string $chdate_uid database column
- * @property int $mkdate database column
- * @property SimpleORMapCollection|NewsRange[] $news_ranges has_many NewsRange
- * @property SimpleORMapCollection|StudipComment[] $comments has_many StudipComment
- * @property SimpleORMapCollection|NewsRoles[] $news_roles has_many NewsRoles
- * @property User $owner belongs_to User
- * @property int $views additional field
- */
-class StudipNews extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'news';
-        $config['has_many']['news_ranges'] = [
-            'class_name'        => NewsRange::class,
-            'assoc_foreign_key' => 'news_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_many']['comments'] = [
-            'class_name'        => StudipComment::class,
-            'assoc_foreign_key' => 'object_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['belongs_to']['owner'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['has_many']['news_roles'] = [
-            'class_name'        => NewsRoles::class,
-            'assoc_foreign_key' => 'news_id',
-            'on_delete'         => 'delete'
-        ];
-
-        $config['additional_fields'] = [
-            'views' => [
-                'get' => function (StudipNews $news): int {
-                    return object_return_views($news->id);
-                },
-            ],
-        ];
-
-        $config['i18n_fields'] = ['topic', 'body'];
-
-        // Strip <admin_msg> from news body
-        $config['registered_callbacks']['after_initialize'][] = function ($news) {
-            if ($news->isI18nField('body')) {
-                $news->body->setOriginal(explode('<admin_msg>', $news->body->original())[0]);
-                foreach ($news->body->toArray() as $lang => $value) {
-                    if ($value) {
-                        $news->body->setLocalized(
-                            explode('<admin_msg>', $value)[0],
-                            $lang
-                        );
-                    }
-                }
-            }
-        };
-
-        parent::configure($config);
-    }
-
-    public static function GetNewsByRange($range_id, $only_visible = false, $as_objects = false)
-    {
-        $clause = '';
-        if ($only_visible) {
-            $clause = " AND date < UNIX_TIMESTAMP() AND (date + expire) > UNIX_TIMESTAMP() ";
-        }
-        $query = "SELECT news_id AS idx, news.*
-                  FROM news_range
-                  INNER JOIN news USING (news_id)
-                  WHERE range_id = ? {$clause} ";
-        if (Config::get()->SORT_NEWS_BY_CHDATE) {
-            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, chdate DESC, date DESC, topic ASC";
-        } else {
-            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, date DESC, chdate DESC, topic ASC";
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$range_id]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        if (!(isset($GLOBALS['perm']) && $GLOBALS['perm']->have_perm('root'))) {
-            if (!(User::find($range_id) && $GLOBALS['user']->id == $range_id)) {
-                foreach ($ret as $news_id => $news) {
-                    if (!NewsRoles::checkUserAccess($news_id)) {
-                        unset($ret[$news_id]);
-                    }
-                }
-            }
-        }
-
-        return $as_objects ? static::GetNewsObjects($ret) : $ret;
-    }
-
-    public static function CountUnread($range_id = 'studip', $user_id = false)
-    {
-        $query = "SELECT nw.news_id as idx, nw.chdate > IFNULL(b.visitdate, :threshold) AS active
-                  FROM news_range a
-                  LEFT JOIN news nw ON (a.news_id = nw.news_id AND UNIX_TIMESTAMP() BETWEEN date AND date + expire)
-                  LEFT JOIN object_user_visits b ON (b.object_id = nw.news_id AND b.user_id = :user_id AND b.plugin_id = :plugin_id)
-                  WHERE a.range_id = :range_id AND nw.user_id != :user_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':threshold', object_get_visit_threshold());
-        $statement->bindValue(':user_id', $user_id ?: $GLOBALS['user']->id);
-        $statement->bindValue(':range_id', $range_id);
-        $plugin_id = object_type_to_id('news');
-        $statement->bindValue(':plugin_id', $plugin_id);
-        $statement->execute();
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        foreach ($ret as $news_id => $news) {
-            if (!NewsRoles::checkUserAccess($news_id, $user_id) && !$GLOBALS['perm']->have_perm('root') || !$news['active']) {
-                unset($ret[$news_id]);
-            }
-        }
-        return count($ret);
-    }
-
-    public static function GetNewsByAuthor($user_id, $as_objects = false)
-    {
-        $query = "SELECT news_id AS idx, news.*
-                  FROM news
-                  WHERE user_id = ? ";
-        if (Config::get()->SORT_NEWS_BY_CHDATE) {
-            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, chdate DESC, date DESC";
-        } else {
-            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, date DESC, chdate DESC";
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$user_id]);
-        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
-        if (!(isset($GLOBALS['perm']) && $GLOBALS['perm']->have_perm('root'))) {
-            if ($GLOBALS['user']->id != $user_id) {
-                foreach ($ret as $news_id => $news) {
-                    if (!NewsRoles::checkUserAccess($news_id)) {
-                        unset($ret[$news_id]);
-                    }
-                }
-            }
-        }
-
-        return $as_objects ? static::GetNewsObjects($ret) : $ret;
-    }
-
-    public static function GetNewsByRSSId($rss_id, $as_objects = false)
-    {
-        if ($user_id = static::GetUserIDFromRssID($rss_id)) {
-            return static::GetNewsByRange($user_id, true, $as_objects);
-        }
-
-        return [];
-    }
-
-    public static function GetNewsObjects($news_result)
-    {
-        return array_map(
-            [static::class, 'buildExisting'],
-            (array) $news_result
-        );
-    }
-
-    /**
-     * fetches set of news items from database
-     *
-     * @param string $user_id         author id for news set
-     * @param string $area            area group for news set (global, inst, sem or user)
-     * @param string $term            search term for news topic
-     * @param int $startdate          return only news (still) visible after this date
-     * @param int $enddate            return only news (still) visible before this date
-     * @param boolean $as_objects     include StudipNews objects in result array
-     * @param int $limit              max size of returned news set
-     * @return array                  set of news items
-     */
-    public static function GetNewsRangesByFilter($user_id, $area = '', $term = '', $startdate = 0, $enddate = 0, $as_objects = false, $limit = 100)
-    {
-        $news_result    = [];
-        $query_vars     = [];
-
-        if ($limit <= 0) {
-            return $news_result;
-        }
-        $where_querypart = [];
-        if (isset($startdate)) {
-            $where_querypart[]  = '(date+expire) > ?';
-            $query_vars[]       = $startdate;
-        }
-        if (isset($enddate)) {
-            $where_querypart[]  = 'date < ?';
-            $query_vars[]       = $enddate;
-        }
-
-        if(!$GLOBALS['perm']->have_perm('root') || $area !== 'global') {
-            $where_querypart[]  = 'news.user_id = ?';
-            $query_vars[]       = $user_id;
-        }
-
-        if (isset($term)) {
-            $where_querypart[]  = "topic LIKE CONCAT('%', ?, '%')";
-            $query_vars[]       = $term;
-        }
-        switch ($area) {
-            case 'global':
-                $select_querypart   = 'CONCAT(news_id, "_studip") AS idx, range_id, news.* ';
-                $from_querypart     = 'news_range INNER JOIN news USING(news_id)';
-                $where_querypart[]  = 'range_id = ?';
-                if (Config::get()->SORT_NEWS_BY_CHDATE) {
-                    $order_querypart = 'news.chdate DESC, news.date DESC';
-                } else {
-                    $order_querypart = 'news.date DESC, news.chdate DESC';
-                }
-                $query_vars[]       = 'studip';
-                break;
-            case 'sem':
-                $select_querypart   = 'CONCAT(news_id, "_", range_id) AS idx, range_id, seminare.Name AS title, '
-                    .'seminare.start_time AS start, news.*, seminare.start_time, sd1.name AS startsem, '
-                    .'IFNULL((SELECT semester_data.name FROM semester_data INNER JOIN semester_courses USING (semester_id) WHERE semester_courses.course_id = seminare.Seminar_id ORDER BY semester_data.beginn DESC LIMIT 1), "'._("unbegrenzt").'") AS endsem ';
-                $from_querypart     = 'news INNER JOIN news_range USING(news_id) INNER JOIN seminare ON Seminar_id = range_id '
-                    .'LEFT JOIN semester_data sd1 ON (start_time BETWEEN sd1.beginn AND sd1.ende) ';
-                if (Config::get()->SORT_NEWS_BY_CHDATE) {
-                    $order_querypart = 'seminare.Name, news.chdate DESC, news.date DESC';
-                } else {
-                    $order_querypart = 'seminare.Name, news.date DESC, news.chdate DESC';
-                }
-                break;
-            case 'inst':
-                $select_querypart   = 'CONCAT(news_id, "_", range_id) AS idx, range_id, Institute.Name AS title, news.* ';
-                $from_querypart     = 'Institute INNER JOIN news_range ON Institut_id = range_id INNER JOIN news USING(news_id)';
-                if (Config::get()->SORT_NEWS_BY_CHDATE) {
-                    $order_querypart = 'Institute.Name, news.chdate DESC, news.date DESC';
-                } else {
-                    $order_querypart = 'Institute.Name, news.date DESC, news.chdate DESC';
-                }
-                break;
-            case 'user':
-                $select_querypart   = 'CONCAT(news_id, "_", auth_user_md5.user_id) AS idx, range_id, auth_user_md5.user_id AS userid, news.* ';
-                $from_querypart     = 'auth_user_md5 INNER JOIN news_range ON auth_user_md5.user_id = range_id INNER JOIN news USING(news_id)';
-                if (Config::get()->SORT_NEWS_BY_CHDATE) {
-                    $order_querypart = 'auth_user_md5.Nachname, news.chdate DESC, news.date DESC';
-                } else {
-                    $order_querypart = 'auth_user_md5.Nachname, news.date DESC, news.chdate DESC';
-                }
-                break;
-            default:
-                foreach (['global', 'inst', 'sem', 'user'] as $type) {
-                    $add_news = static::GetNewsRangesByFilter($user_id, $type, $term, $startdate, $enddate, $as_objects, $limit);
-                    if (is_array($add_news) && isset($add_news[$type])) {
-                        $limit          = $limit - count($add_news[$type]);
-                        $news_result    = array_merge($news_result, $add_news);
-                    }
-                }
-                return $news_result;
-        }
-        $query = "SELECT " . $select_querypart . "
-                  FROM " . $from_querypart . "
-                  WHERE " . implode(' AND ', $where_querypart) . "
-                  ORDER BY " . $order_querypart . " LIMIT 0, ?";
-
-        $query_vars[]   = $limit;
-        $statement      = DBManager::get()->prepare($query);
-        $statement->execute($query_vars);
-        $news_result    = $statement->fetchGrouped();
-
-        $objects = [$area => []];
-        foreach ($news_result as $id => $result) {
-            $objects[$area][$id] = [
-                'range_id' => $result['range_id'],
-                'title'    => $result['title'] ?? '',
-            ];
-            if ($area === 'sem') {
-                if (!isset($objects[$area][$id]['semester'])) {
-                    $objects[$area][$id]['semester'] = '';
-                }
-                $objects[$area][$id]['semester'] .= sprintf('(%s%s)',
-                    $result['startsem'],
-                    $result['startsem'] != $result['endsem'] ? ' - ' . $result['endsem'] : '');
-            } elseif ($area === 'user') {
-                if ($GLOBALS['user']->id === $result['userid']) {
-                    $objects[$area][$id]['title'] = _('Ankündigungen auf Ihrer Profilseite');
-                } else {
-                    $objects[$area][$id]['title'] = sprintf(_('Ankündigungen auf der Profilseite von %s'), get_fullname($result['userid']));
-                }
-            } elseif ($area === 'global') {
-                $objects[$area][$id]['title'] = _('Ankündigungen auf der Stud.IP Startseite');
-            }
-            if ($as_objects) {
-                $objects[$area][$id]['object'] = self::build($result, false);
-            }
-        }
-
-        return $objects;
-    }
-
-    public static function GetUserIdFromRssID($rss_id)
-    {
-        $ret = static::GetRangeIdFromRssID($rss_id);
-        return $ret['range_id'];
-    }
-
-    public static function GetRssIdFromUserId($user_id)
-    {
-        return static::GetRssIdFromRangeId($user_id);
-    }
-
-    public static function GetRangeFromRssID($rss_id)
-    {
-        if ($rss_id){
-            $query = "SELECT range_id ,range_type
-                      FROM news_rss_range
-                      WHERE rss_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$rss_id]);
-            $ret = $statement->fetch(PDO::FETCH_ASSOC);
-
-            if (count($ret)) {
-                return $ret;
-            }
-        }
-        return false;
-    }
-
-    public static function GetRangeIdFromRssID($rss_id)
-    {
-        $ret = static::GetRangeFromRssID($rss_id);
-        return $ret['range_id'];
-    }
-
-    public static function GetRssIdFromRangeId($range_id)
-    {
-        $query = "SELECT rss_id FROM news_rss_range WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$range_id]);
-        return $statement->fetchColumn();
-    }
-
-    public static function SetRssId($range_id, $type = false)
-    {
-        if (!$type){
-            $type = get_object_type($range_id);
-            if ($type === 'fak') {
-                $type = 'inst';
-            }
-        }
-        $rss_id = md5('StudipRss' . $range_id);
-
-        $query = "REPLACE INTO news_rss_range (range_id,rss_id,range_type)
-                  VALUES (?, ?, ?)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([
-            $range_id,
-            $rss_id,
-            $type
-        ]);
-        return $statement->rowCount();
-    }
-
-    public static function UnsetRssId($range_id)
-    {
-        $query = "DELETE FROM news_rss_range WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$range_id]);
-        return $statement->rowCount();
-    }
-
-    public static function GetAdminMsg($user_id, $date)
-    {
-        return sprintf(
-            _('Zuletzt aktualisiert von %s (%s) am %s'),
-            get_fullname($user_id),
-            get_username($user_id),
-            date('d.m.y', $date)
-        );
-    }
-
-    public static function DoGarbageCollect($news_deletion_days = false)
-    {
-        $db = DBManager::get();
-        $queries = [];
-        $parameters = [];
-
-        if ($news_deletion_days !== false) {
-            $queries[] = "SELECT news.news_id
-                          FROM news
-                          WHERE date + expire + ? < UNIX_TIMESTAMP()";
-            $parameters[] = (int) $news_deletion_days;
-        }
-
-        $queries[] = "SELECT news_range.news_id
-                      FROM news_range
-                      LEFT JOIN news USING (news_id)
-                      WHERE news.news_id IS NULL";
-        $queries[] = "SELECT news.news_id
-                      FROM news
-                      LEFT JOIN news_range USING (news_id)
-                      WHERE range_id IS NULL";
-
-        $query = implode(' UNION DISTINCT ', $queries);
-        $stm = $db->prepare($query);
-        $stm->execute($parameters);
-        $result = $stm->fetchAll(PDO::FETCH_COLUMN);
-        $killed = 0;
-        if (count($result) > 0) {
-            $query = "DELETE FROM news WHERE news_id IN (?)";
-            $statement = $db->prepare($query);
-            $statement->execute([$result]);
-            $killed = $statement->rowCount();
-
-            $query = "DELETE FROM news_range WHERE news_id IN (?)";
-            $statement = $db->prepare($query);
-            $statement->execute([$result]);
-
-            object_kill_visits(null, $result);
-            object_kill_views($result);
-            StudipComment::DeleteCommentsByObject($result);
-        }
-        return $killed;
-    }
-
-    public static function DeleteNewsRanges($range_id)
-    {
-        $query = "DELETE FROM news_range WHERE range_id = :id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':id', $range_id);
-        $result = $statement->execute();
-
-        static::DoGarbageCollect();
-
-        return $result;
-    }
-
-    public static function DeleteNewsByAuthor($user_id)
-    {
-        $deleted = 0;
-        foreach (static::GetNewsByAuthor($user_id, true) as $news) {
-            $deleted += $news->delete();
-        }
-        return $deleted;
-    }
-
-    public static function haveRangePermission($operation, $range_id, $user_id = '')
-    {
-        static $news_range_perm_cache;
-        if (isset($news_range_perm_cache[$user_id.$range_id.$operation])) {
-            return $news_range_perm_cache[$user_id.$range_id.$operation];
-        }
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        if ($GLOBALS['perm']->have_perm('root', $user_id)) {
-            return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
-        }
-
-        $type = get_object_type($range_id, ['global', 'sem', 'inst', 'fak', 'user']);
-        switch($type) {
-            case 'global':
-                if ($operation === 'view')
-                    return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
-                break;
-            case 'fak':
-            case 'inst':
-            case 'sem':
-                if ($operation === 'view'
-                    && ($type !== 'sem'
-                        || $GLOBALS['perm']->have_studip_perm('user', $range_id)
-                        || (Config::get()->ENABLE_FREE_ACCESS && Seminar::getInstance($range_id)->read_level == 0)
-                        )) {
-                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
-                    }
-                if ($operation === 'edit' || $operation === 'copy') {
-                    if ($GLOBALS['perm']->have_studip_perm('tutor', $range_id))
-                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
-                }
-                break;
-            case 'user':
-                if ($operation === 'view') {
-                    if ($range_id === $user_id || get_visibility_by_id($range_id)) {
-                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
-                    }
-                } elseif ($operation === 'edit' || $operation == 'copy') {
-                    if ($GLOBALS['perm']->have_profile_perm('user', $range_id))
-                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
-                }
-                break;
-        }
-        return $news_range_perm_cache[$user_id.$range_id.$operation] = false;
-    }
-
-    public function restoreRanges()
-    {
-        $this->resetRelation('news_ranges');
-        return count($this->news_ranges);
-    }
-
-    public function getRanges()
-    {
-        return $this->news_ranges->pluck('range_id');
-    }
-
-    public function issetRange($range_id)
-    {
-        return array_search($range_id, $this->getRanges()) !== false;
-    }
-
-    public function addRange($range_id)
-    {
-        if (!$this->issetRange($range_id)) {
-            $range = new NewsRange([$this->getId(), $range_id]);
-            if ($range->isNew()) {
-                $range->range_id = $range_id;
-                $range->news_id = $this->getId();
-            }
-            $this->news_ranges[] = $range;
-            return true;
-        }
-
-        return false;
-    }
-
-    public function deleteRange($range_id)
-    {
-        if ($this->issetRange($range_id)) {
-            return $this->news_ranges->unsetBy('range_id', $range_id);
-        }
-
-        return false;
-    }
-
-    public function storeRanges()
-    {
-        $this->storeRelations();
-    }
-
-    public function delete()
-    {
-        object_kill_visits(null, $this->getId());
-        object_kill_views($this->getId());
-        return parent::delete();
-    }
-
-    /**
-     * checks, if user has permission to perform given operation on news object
-     *
-     * @param string $operation       delete, unassign, edit, copy, or view
-     * @param string $check_range_id  specified range-id, used only for unassign-operation
-     * @param string $user_id         optional; check permission for
-     *                                given user ID; otherwise for the
-     *                                global $user's ID
-     * @return boolean true or false
-     */
-    public function havePermission($operation, $check_range_id = '', $user_id = null)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        if (!in_array($operation, ['delete', 'unassign', 'edit', 'copy', 'view'])) {
-            return false;
-        }
-
-        // in order to unassign, there must be more than one range assigned; $check_range_id must be specified.
-        if ($operation === 'unassign' && count($this->getRanges()) < 2) {
-            return false;
-        }
-        // root, owner, and owner's deputy have full permission
-        if ($GLOBALS['perm']->have_perm('root', $user_id)
-            || ($user_id === $this->user_id && $GLOBALS['perm']->have_perm('autor'))
-            || (Deputy::isEditActivated() && Deputy::isDeputy($user_id, $this->user_id, true)))
-        {
-            return true;
-        }
-
-        // check news' ranges for edit, copy or view permission
-        if ($operation === 'unassign' || $operation === 'delete') {
-            $range_operation = 'edit';
-        } else {
-            $range_operation = $operation;
-        }
-        $permission_ranges = 0;
-        foreach ($this->getRanges() as $range_id) {
-            if (static::haveRangePermission($range_operation, $range_id, $user_id)) {
-                if ($operation === 'view' || $operation === 'edit' || $operation === 'copy') {
-                    // in order to view, edit, copy, or unassign, access to one of the ranges is sufficient
-                    return true;
-                } elseif ($operation === 'unassign' && $range_id === $check_range_id) {
-                    // in order to unassign, access to the specified range is needed
-                    return true;
-                }
-                // in order to delete, access to all ranges is necessary
-                $permission_ranges += 1;
-            } elseif ($operation === 'delete') {
-                return false;
-            }
-        }
-        if ($operation === 'delete' && count($this->getRanges()) == $permission_ranges) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * checks, if basic news data is complete
-     *
-     * @return boolean true or false
-     */
-    public function validate()
-    {
-        if (!$this->user_id && $this->isNew()) {
-            $this->user_id = $GLOBALS['user']->id;
-            $this->author = get_fullname(false, 'full', false);
-        }
-        if (!$this->user_id OR !$this->author) {
-            PageLayout::postError(_('Fehler: Personenangabe unvollständig.'));
-            return false;
-        }
-        if (!$this->topic) {
-            PageLayout::postError(_('Bitte geben Sie einen Titel für die Ankündigung ein.'));
-            return false;
-        }
-        if (!$this->body) {
-            PageLayout::postError(_('Bitte geben Sie einen Inhalt für die Ankündigung ein.'));
-            return false;
-        }
-        if (!count($this->getRanges())) {
-            PageLayout::postError(_('Die Ankündigung muss mindestens einem Bereich zugeordnet sein.'));
-            return false;
-        }
-        if ((int)$this->date < 1) {
-            PageLayout::postError(_('Ungültiges Einstelldatum.'));
-            return false;
-        }
-        if ((int)$this->expire < 1) {
-            PageLayout::postError(_('Ungültiges Ablaufdatum.'));
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Ankündigungen'), 'news', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/StudipNews.php b/lib/models/StudipNews.php
new file mode 100644
index 0000000..12eb3e1
--- /dev/null
+++ b/lib/models/StudipNews.php
@@ -0,0 +1,696 @@
+<?php
+// +---------------------------------------------------------------------------+
+// This file is part of Stud.IP
+//
+// Copyright (C) 2005 André Noack <noack@data-quest>,
+// Suchi & Berg GmbH <info@data-quest.de>
+// +---------------------------------------------------------------------------+
+// 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 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 'lib/object.inc.php';
+
+/**
+ * StudipNews.class.php
+ *
+ * @author   André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @author   Arne Schröder <schroeder@data-quest>
+ * @access   public
+ *
+ * @property string $id alias column for news_id
+ * @property string $news_id database column
+ * @property I18NString $topic database column
+ * @property I18NString $body database column
+ * @property string $author database column
+ * @property int $date database column
+ * @property string $user_id database column
+ * @property int $expire database column
+ * @property int $allow_comments database column
+ * @property int $prio database column
+ * @property int $chdate database column
+ * @property string $chdate_uid database column
+ * @property int $mkdate database column
+ * @property SimpleORMapCollection|NewsRange[] $news_ranges has_many NewsRange
+ * @property SimpleORMapCollection|StudipComment[] $comments has_many StudipComment
+ * @property SimpleORMapCollection|NewsRoles[] $news_roles has_many NewsRoles
+ * @property User $owner belongs_to User
+ * @property int $views additional field
+ */
+class StudipNews extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'news';
+        $config['has_many']['news_ranges'] = [
+            'class_name'        => NewsRange::class,
+            'assoc_foreign_key' => 'news_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_many']['comments'] = [
+            'class_name'        => StudipComment::class,
+            'assoc_foreign_key' => 'object_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['belongs_to']['owner'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['has_many']['news_roles'] = [
+            'class_name'        => NewsRoles::class,
+            'assoc_foreign_key' => 'news_id',
+            'on_delete'         => 'delete'
+        ];
+
+        $config['additional_fields'] = [
+            'views' => [
+                'get' => function (StudipNews $news): int {
+                    return object_return_views($news->id);
+                },
+            ],
+        ];
+
+        $config['i18n_fields'] = ['topic', 'body'];
+
+        // Strip <admin_msg> from news body
+        $config['registered_callbacks']['after_initialize'][] = function ($news) {
+            if ($news->isI18nField('body')) {
+                $news->body->setOriginal(explode('<admin_msg>', $news->body->original())[0]);
+                foreach ($news->body->toArray() as $lang => $value) {
+                    if ($value) {
+                        $news->body->setLocalized(
+                            explode('<admin_msg>', $value)[0],
+                            $lang
+                        );
+                    }
+                }
+            }
+        };
+
+        parent::configure($config);
+    }
+
+    public static function GetNewsByRange($range_id, $only_visible = false, $as_objects = false)
+    {
+        $clause = '';
+        if ($only_visible) {
+            $clause = " AND date < UNIX_TIMESTAMP() AND (date + expire) > UNIX_TIMESTAMP() ";
+        }
+        $query = "SELECT news_id AS idx, news.*
+                  FROM news_range
+                  INNER JOIN news USING (news_id)
+                  WHERE range_id = ? {$clause} ";
+        if (Config::get()->SORT_NEWS_BY_CHDATE) {
+            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, chdate DESC, date DESC, topic ASC";
+        } else {
+            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, date DESC, chdate DESC, topic ASC";
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$range_id]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        if (!(isset($GLOBALS['perm']) && $GLOBALS['perm']->have_perm('root'))) {
+            if (!(User::find($range_id) && $GLOBALS['user']->id == $range_id)) {
+                foreach ($ret as $news_id => $news) {
+                    if (!NewsRoles::checkUserAccess($news_id)) {
+                        unset($ret[$news_id]);
+                    }
+                }
+            }
+        }
+
+        return $as_objects ? static::GetNewsObjects($ret) : $ret;
+    }
+
+    public static function CountUnread($range_id = 'studip', $user_id = false)
+    {
+        $query = "SELECT nw.news_id as idx, nw.chdate > IFNULL(b.visitdate, :threshold) AS active
+                  FROM news_range a
+                  LEFT JOIN news nw ON (a.news_id = nw.news_id AND UNIX_TIMESTAMP() BETWEEN date AND date + expire)
+                  LEFT JOIN object_user_visits b ON (b.object_id = nw.news_id AND b.user_id = :user_id AND b.plugin_id = :plugin_id)
+                  WHERE a.range_id = :range_id AND nw.user_id != :user_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':threshold', object_get_visit_threshold());
+        $statement->bindValue(':user_id', $user_id ?: $GLOBALS['user']->id);
+        $statement->bindValue(':range_id', $range_id);
+        $plugin_id = object_type_to_id('news');
+        $statement->bindValue(':plugin_id', $plugin_id);
+        $statement->execute();
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        foreach ($ret as $news_id => $news) {
+            if (!NewsRoles::checkUserAccess($news_id, $user_id) && !$GLOBALS['perm']->have_perm('root') || !$news['active']) {
+                unset($ret[$news_id]);
+            }
+        }
+        return count($ret);
+    }
+
+    public static function GetNewsByAuthor($user_id, $as_objects = false)
+    {
+        $query = "SELECT news_id AS idx, news.*
+                  FROM news
+                  WHERE user_id = ? ";
+        if (Config::get()->SORT_NEWS_BY_CHDATE) {
+            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, chdate DESC, date DESC";
+        } else {
+            $query .= "ORDER BY IF(prio = 0, 6, prio) DESC, date DESC, chdate DESC";
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$user_id]);
+        $ret = $statement->fetchGrouped(PDO::FETCH_ASSOC);
+        if (!(isset($GLOBALS['perm']) && $GLOBALS['perm']->have_perm('root'))) {
+            if ($GLOBALS['user']->id != $user_id) {
+                foreach ($ret as $news_id => $news) {
+                    if (!NewsRoles::checkUserAccess($news_id)) {
+                        unset($ret[$news_id]);
+                    }
+                }
+            }
+        }
+
+        return $as_objects ? static::GetNewsObjects($ret) : $ret;
+    }
+
+    public static function GetNewsByRSSId($rss_id, $as_objects = false)
+    {
+        if ($user_id = static::GetUserIDFromRssID($rss_id)) {
+            return static::GetNewsByRange($user_id, true, $as_objects);
+        }
+
+        return [];
+    }
+
+    public static function GetNewsObjects($news_result)
+    {
+        return array_map(
+            [static::class, 'buildExisting'],
+            (array) $news_result
+        );
+    }
+
+    /**
+     * fetches set of news items from database
+     *
+     * @param string $user_id         author id for news set
+     * @param string $area            area group for news set (global, inst, sem or user)
+     * @param string $term            search term for news topic
+     * @param int $startdate          return only news (still) visible after this date
+     * @param int $enddate            return only news (still) visible before this date
+     * @param boolean $as_objects     include StudipNews objects in result array
+     * @param int $limit              max size of returned news set
+     * @return array                  set of news items
+     */
+    public static function GetNewsRangesByFilter($user_id, $area = '', $term = '', $startdate = 0, $enddate = 0, $as_objects = false, $limit = 100)
+    {
+        $news_result    = [];
+        $query_vars     = [];
+
+        if ($limit <= 0) {
+            return $news_result;
+        }
+        $where_querypart = [];
+        if (isset($startdate)) {
+            $where_querypart[]  = '(date+expire) > ?';
+            $query_vars[]       = $startdate;
+        }
+        if (isset($enddate)) {
+            $where_querypart[]  = 'date < ?';
+            $query_vars[]       = $enddate;
+        }
+
+        if(!$GLOBALS['perm']->have_perm('root') || $area !== 'global') {
+            $where_querypart[]  = 'news.user_id = ?';
+            $query_vars[]       = $user_id;
+        }
+
+        if (isset($term)) {
+            $where_querypart[]  = "topic LIKE CONCAT('%', ?, '%')";
+            $query_vars[]       = $term;
+        }
+        switch ($area) {
+            case 'global':
+                $select_querypart   = 'CONCAT(news_id, "_studip") AS idx, range_id, news.* ';
+                $from_querypart     = 'news_range INNER JOIN news USING(news_id)';
+                $where_querypart[]  = 'range_id = ?';
+                if (Config::get()->SORT_NEWS_BY_CHDATE) {
+                    $order_querypart = 'news.chdate DESC, news.date DESC';
+                } else {
+                    $order_querypart = 'news.date DESC, news.chdate DESC';
+                }
+                $query_vars[]       = 'studip';
+                break;
+            case 'sem':
+                $select_querypart   = 'CONCAT(news_id, "_", range_id) AS idx, range_id, seminare.Name AS title, '
+                    .'seminare.start_time AS start, news.*, seminare.start_time, sd1.name AS startsem, '
+                    .'IFNULL((SELECT semester_data.name FROM semester_data INNER JOIN semester_courses USING (semester_id) WHERE semester_courses.course_id = seminare.Seminar_id ORDER BY semester_data.beginn DESC LIMIT 1), "'._("unbegrenzt").'") AS endsem ';
+                $from_querypart     = 'news INNER JOIN news_range USING(news_id) INNER JOIN seminare ON Seminar_id = range_id '
+                    .'LEFT JOIN semester_data sd1 ON (start_time BETWEEN sd1.beginn AND sd1.ende) ';
+                if (Config::get()->SORT_NEWS_BY_CHDATE) {
+                    $order_querypart = 'seminare.Name, news.chdate DESC, news.date DESC';
+                } else {
+                    $order_querypart = 'seminare.Name, news.date DESC, news.chdate DESC';
+                }
+                break;
+            case 'inst':
+                $select_querypart   = 'CONCAT(news_id, "_", range_id) AS idx, range_id, Institute.Name AS title, news.* ';
+                $from_querypart     = 'Institute INNER JOIN news_range ON Institut_id = range_id INNER JOIN news USING(news_id)';
+                if (Config::get()->SORT_NEWS_BY_CHDATE) {
+                    $order_querypart = 'Institute.Name, news.chdate DESC, news.date DESC';
+                } else {
+                    $order_querypart = 'Institute.Name, news.date DESC, news.chdate DESC';
+                }
+                break;
+            case 'user':
+                $select_querypart   = 'CONCAT(news_id, "_", auth_user_md5.user_id) AS idx, range_id, auth_user_md5.user_id AS userid, news.* ';
+                $from_querypart     = 'auth_user_md5 INNER JOIN news_range ON auth_user_md5.user_id = range_id INNER JOIN news USING(news_id)';
+                if (Config::get()->SORT_NEWS_BY_CHDATE) {
+                    $order_querypart = 'auth_user_md5.Nachname, news.chdate DESC, news.date DESC';
+                } else {
+                    $order_querypart = 'auth_user_md5.Nachname, news.date DESC, news.chdate DESC';
+                }
+                break;
+            default:
+                foreach (['global', 'inst', 'sem', 'user'] as $type) {
+                    $add_news = static::GetNewsRangesByFilter($user_id, $type, $term, $startdate, $enddate, $as_objects, $limit);
+                    if (is_array($add_news) && isset($add_news[$type])) {
+                        $limit          = $limit - count($add_news[$type]);
+                        $news_result    = array_merge($news_result, $add_news);
+                    }
+                }
+                return $news_result;
+        }
+        $query = "SELECT " . $select_querypart . "
+                  FROM " . $from_querypart . "
+                  WHERE " . implode(' AND ', $where_querypart) . "
+                  ORDER BY " . $order_querypart . " LIMIT 0, ?";
+
+        $query_vars[]   = $limit;
+        $statement      = DBManager::get()->prepare($query);
+        $statement->execute($query_vars);
+        $news_result    = $statement->fetchGrouped();
+
+        $objects = [$area => []];
+        foreach ($news_result as $id => $result) {
+            $objects[$area][$id] = [
+                'range_id' => $result['range_id'],
+                'title'    => $result['title'] ?? '',
+            ];
+            if ($area === 'sem') {
+                if (!isset($objects[$area][$id]['semester'])) {
+                    $objects[$area][$id]['semester'] = '';
+                }
+                $objects[$area][$id]['semester'] .= sprintf('(%s%s)',
+                    $result['startsem'],
+                    $result['startsem'] != $result['endsem'] ? ' - ' . $result['endsem'] : '');
+            } elseif ($area === 'user') {
+                if ($GLOBALS['user']->id === $result['userid']) {
+                    $objects[$area][$id]['title'] = _('Ankündigungen auf Ihrer Profilseite');
+                } else {
+                    $objects[$area][$id]['title'] = sprintf(_('Ankündigungen auf der Profilseite von %s'), get_fullname($result['userid']));
+                }
+            } elseif ($area === 'global') {
+                $objects[$area][$id]['title'] = _('Ankündigungen auf der Stud.IP Startseite');
+            }
+            if ($as_objects) {
+                $objects[$area][$id]['object'] = self::build($result, false);
+            }
+        }
+
+        return $objects;
+    }
+
+    public static function GetUserIdFromRssID($rss_id)
+    {
+        $ret = static::GetRangeIdFromRssID($rss_id);
+        return $ret['range_id'];
+    }
+
+    public static function GetRssIdFromUserId($user_id)
+    {
+        return static::GetRssIdFromRangeId($user_id);
+    }
+
+    public static function GetRangeFromRssID($rss_id)
+    {
+        if ($rss_id){
+            $query = "SELECT range_id ,range_type
+                      FROM news_rss_range
+                      WHERE rss_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$rss_id]);
+            $ret = $statement->fetch(PDO::FETCH_ASSOC);
+
+            if (count($ret)) {
+                return $ret;
+            }
+        }
+        return false;
+    }
+
+    public static function GetRangeIdFromRssID($rss_id)
+    {
+        $ret = static::GetRangeFromRssID($rss_id);
+        return $ret['range_id'];
+    }
+
+    public static function GetRssIdFromRangeId($range_id)
+    {
+        $query = "SELECT rss_id FROM news_rss_range WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$range_id]);
+        return $statement->fetchColumn();
+    }
+
+    public static function SetRssId($range_id, $type = false)
+    {
+        if (!$type){
+            $type = get_object_type($range_id);
+            if ($type === 'fak') {
+                $type = 'inst';
+            }
+        }
+        $rss_id = md5('StudipRss' . $range_id);
+
+        $query = "REPLACE INTO news_rss_range (range_id,rss_id,range_type)
+                  VALUES (?, ?, ?)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([
+            $range_id,
+            $rss_id,
+            $type
+        ]);
+        return $statement->rowCount();
+    }
+
+    public static function UnsetRssId($range_id)
+    {
+        $query = "DELETE FROM news_rss_range WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$range_id]);
+        return $statement->rowCount();
+    }
+
+    public static function GetAdminMsg($user_id, $date)
+    {
+        return sprintf(
+            _('Zuletzt aktualisiert von %s (%s) am %s'),
+            get_fullname($user_id),
+            get_username($user_id),
+            date('d.m.y', $date)
+        );
+    }
+
+    public static function DoGarbageCollect($news_deletion_days = false)
+    {
+        $db = DBManager::get();
+        $queries = [];
+        $parameters = [];
+
+        if ($news_deletion_days !== false) {
+            $queries[] = "SELECT news.news_id
+                          FROM news
+                          WHERE date + expire + ? < UNIX_TIMESTAMP()";
+            $parameters[] = (int) $news_deletion_days;
+        }
+
+        $queries[] = "SELECT news_range.news_id
+                      FROM news_range
+                      LEFT JOIN news USING (news_id)
+                      WHERE news.news_id IS NULL";
+        $queries[] = "SELECT news.news_id
+                      FROM news
+                      LEFT JOIN news_range USING (news_id)
+                      WHERE range_id IS NULL";
+
+        $query = implode(' UNION DISTINCT ', $queries);
+        $stm = $db->prepare($query);
+        $stm->execute($parameters);
+        $result = $stm->fetchAll(PDO::FETCH_COLUMN);
+        $killed = 0;
+        if (count($result) > 0) {
+            $query = "DELETE FROM news WHERE news_id IN (?)";
+            $statement = $db->prepare($query);
+            $statement->execute([$result]);
+            $killed = $statement->rowCount();
+
+            $query = "DELETE FROM news_range WHERE news_id IN (?)";
+            $statement = $db->prepare($query);
+            $statement->execute([$result]);
+
+            object_kill_visits(null, $result);
+            object_kill_views($result);
+            StudipComment::DeleteCommentsByObject($result);
+        }
+        return $killed;
+    }
+
+    public static function DeleteNewsRanges($range_id)
+    {
+        $query = "DELETE FROM news_range WHERE range_id = :id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':id', $range_id);
+        $result = $statement->execute();
+
+        static::DoGarbageCollect();
+
+        return $result;
+    }
+
+    public static function DeleteNewsByAuthor($user_id)
+    {
+        $deleted = 0;
+        foreach (static::GetNewsByAuthor($user_id, true) as $news) {
+            $deleted += $news->delete();
+        }
+        return $deleted;
+    }
+
+    public static function haveRangePermission($operation, $range_id, $user_id = '')
+    {
+        static $news_range_perm_cache;
+        if (isset($news_range_perm_cache[$user_id.$range_id.$operation])) {
+            return $news_range_perm_cache[$user_id.$range_id.$operation];
+        }
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        if ($GLOBALS['perm']->have_perm('root', $user_id)) {
+            return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
+        }
+
+        $type = get_object_type($range_id, ['global', 'sem', 'inst', 'fak', 'user']);
+        switch($type) {
+            case 'global':
+                if ($operation === 'view')
+                    return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
+                break;
+            case 'fak':
+            case 'inst':
+            case 'sem':
+                if ($operation === 'view'
+                    && ($type !== 'sem'
+                        || $GLOBALS['perm']->have_studip_perm('user', $range_id)
+                        || (Config::get()->ENABLE_FREE_ACCESS && Seminar::getInstance($range_id)->read_level == 0)
+                        )) {
+                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
+                    }
+                if ($operation === 'edit' || $operation === 'copy') {
+                    if ($GLOBALS['perm']->have_studip_perm('tutor', $range_id))
+                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
+                }
+                break;
+            case 'user':
+                if ($operation === 'view') {
+                    if ($range_id === $user_id || get_visibility_by_id($range_id)) {
+                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
+                    }
+                } elseif ($operation === 'edit' || $operation == 'copy') {
+                    if ($GLOBALS['perm']->have_profile_perm('user', $range_id))
+                        return $news_range_perm_cache[$user_id.$range_id.$operation] = true;
+                }
+                break;
+        }
+        return $news_range_perm_cache[$user_id.$range_id.$operation] = false;
+    }
+
+    public function restoreRanges()
+    {
+        $this->resetRelation('news_ranges');
+        return count($this->news_ranges);
+    }
+
+    public function getRanges()
+    {
+        return $this->news_ranges->pluck('range_id');
+    }
+
+    public function issetRange($range_id)
+    {
+        return array_search($range_id, $this->getRanges()) !== false;
+    }
+
+    public function addRange($range_id)
+    {
+        if (!$this->issetRange($range_id)) {
+            $range = new NewsRange([$this->getId(), $range_id]);
+            if ($range->isNew()) {
+                $range->range_id = $range_id;
+                $range->news_id = $this->getId();
+            }
+            $this->news_ranges[] = $range;
+            return true;
+        }
+
+        return false;
+    }
+
+    public function deleteRange($range_id)
+    {
+        if ($this->issetRange($range_id)) {
+            return $this->news_ranges->unsetBy('range_id', $range_id);
+        }
+
+        return false;
+    }
+
+    public function storeRanges()
+    {
+        $this->storeRelations();
+    }
+
+    public function delete()
+    {
+        object_kill_visits(null, $this->getId());
+        object_kill_views($this->getId());
+        return parent::delete();
+    }
+
+    /**
+     * checks, if user has permission to perform given operation on news object
+     *
+     * @param string $operation       delete, unassign, edit, copy, or view
+     * @param string $check_range_id  specified range-id, used only for unassign-operation
+     * @param string $user_id         optional; check permission for
+     *                                given user ID; otherwise for the
+     *                                global $user's ID
+     * @return boolean true or false
+     */
+    public function havePermission($operation, $check_range_id = '', $user_id = null)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        if (!in_array($operation, ['delete', 'unassign', 'edit', 'copy', 'view'])) {
+            return false;
+        }
+
+        // in order to unassign, there must be more than one range assigned; $check_range_id must be specified.
+        if ($operation === 'unassign' && count($this->getRanges()) < 2) {
+            return false;
+        }
+        // root, owner, and owner's deputy have full permission
+        if ($GLOBALS['perm']->have_perm('root', $user_id)
+            || ($user_id === $this->user_id && $GLOBALS['perm']->have_perm('autor'))
+            || (Deputy::isEditActivated() && Deputy::isDeputy($user_id, $this->user_id, true)))
+        {
+            return true;
+        }
+
+        // check news' ranges for edit, copy or view permission
+        if ($operation === 'unassign' || $operation === 'delete') {
+            $range_operation = 'edit';
+        } else {
+            $range_operation = $operation;
+        }
+        $permission_ranges = 0;
+        foreach ($this->getRanges() as $range_id) {
+            if (static::haveRangePermission($range_operation, $range_id, $user_id)) {
+                if ($operation === 'view' || $operation === 'edit' || $operation === 'copy') {
+                    // in order to view, edit, copy, or unassign, access to one of the ranges is sufficient
+                    return true;
+                } elseif ($operation === 'unassign' && $range_id === $check_range_id) {
+                    // in order to unassign, access to the specified range is needed
+                    return true;
+                }
+                // in order to delete, access to all ranges is necessary
+                $permission_ranges += 1;
+            } elseif ($operation === 'delete') {
+                return false;
+            }
+        }
+        if ($operation === 'delete' && count($this->getRanges()) == $permission_ranges) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * checks, if basic news data is complete
+     *
+     * @return boolean true or false
+     */
+    public function validate()
+    {
+        if (!$this->user_id && $this->isNew()) {
+            $this->user_id = $GLOBALS['user']->id;
+            $this->author = get_fullname(false, 'full', false);
+        }
+        if (!$this->user_id OR !$this->author) {
+            PageLayout::postError(_('Fehler: Personenangabe unvollständig.'));
+            return false;
+        }
+        if (!$this->topic) {
+            PageLayout::postError(_('Bitte geben Sie einen Titel für die Ankündigung ein.'));
+            return false;
+        }
+        if (!$this->body) {
+            PageLayout::postError(_('Bitte geben Sie einen Inhalt für die Ankündigung ein.'));
+            return false;
+        }
+        if (!count($this->getRanges())) {
+            PageLayout::postError(_('Die Ankündigung muss mindestens einem Bereich zugeordnet sein.'));
+            return false;
+        }
+        if ((int)$this->date < 1) {
+            PageLayout::postError(_('Ungültiges Einstelldatum.'));
+            return false;
+        }
+        if ((int)$this->expire < 1) {
+            PageLayout::postError(_('Ungültiges Ablaufdatum.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Ankündigungen'), 'news', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/StudipScmEntry.class.php b/lib/models/StudipScmEntry.class.php
deleted file mode 100644
index 7001a4a..0000000
--- a/lib/models/StudipScmEntry.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * StudipScmEntry.class.php
- *
- * 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.
- *
- * @author André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- *
- * @property string $id alias column for scm_id
- * @property string $scm_id database column
- * @property string $range_id database column
- * @property string $user_id database column
- * @property I18NString $tab_name database column
- * @property I18NString $content database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $position database column
- * @property User $user belongs_to User
- * @property Course $course belongs_to Course
- */
-
-class StudipScmEntry extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'scm';
-
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'range_id',
-        ];
-
-        $config['i18n_fields']['tab_name'] = true;
-        $config['i18n_fields']['content'] = true;
-
-        $config['registered_callbacks']['before_create'][] = function ($scm) {
-            $query = "SELECT MAX(`position`)
-                      FROM `scm`
-                      WHERE `range_id` = ?";
-            $max_pos = DBManager::get()->fetchColumn($query, [$scm->range_id]);
-
-            $scm->position = $max_pos + 1;
-        };
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/StudipScmEntry.php b/lib/models/StudipScmEntry.php
new file mode 100644
index 0000000..7001a4a
--- /dev/null
+++ b/lib/models/StudipScmEntry.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * StudipScmEntry.class.php
+ *
+ * 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.
+ *
+ * @author André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ *
+ * @property string $id alias column for scm_id
+ * @property string $scm_id database column
+ * @property string $range_id database column
+ * @property string $user_id database column
+ * @property I18NString $tab_name database column
+ * @property I18NString $content database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $position database column
+ * @property User $user belongs_to User
+ * @property Course $course belongs_to Course
+ */
+
+class StudipScmEntry extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'scm';
+
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'range_id',
+        ];
+
+        $config['i18n_fields']['tab_name'] = true;
+        $config['i18n_fields']['content'] = true;
+
+        $config['registered_callbacks']['before_create'][] = function ($scm) {
+            $query = "SELECT MAX(`position`)
+                      FROM `scm`
+                      WHERE `range_id` = ?";
+            $max_pos = DBManager::get()->fetchColumn($query, [$scm->range_id]);
+
+            $scm->position = $max_pos + 1;
+        };
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/StudipStudyArea.class.php b/lib/models/StudipStudyArea.class.php
deleted file mode 100644
index 8da8e16..0000000
--- a/lib/models/StudipStudyArea.class.php
+++ /dev/null
@@ -1,637 +0,0 @@
-<?php
-/**
- * Studienbereich... TODO
- *
- * Copyright (C) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * @package     studip
- *
- * @author    mlunzena
- * @author    André Noack <noack@data-quest.de>
- * @copyright (c) Authors
- *
- * @property string $id alias column for sem_tree_id
- * @property string $sem_tree_id database column
- * @property string $parent_id database column
- * @property int $priority database column
- * @property string $info database column
- * @property string $name database column
- * @property string|null $studip_object_id database column
- * @property int $type database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property SimpleORMapCollection|StudipStudyArea[] $_children has_many StudipStudyArea
- * @property StudipStudyArea $_parent belongs_to StudipStudyArea
- * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course
- */
-
-class StudipStudyArea extends SimpleORMap implements StudipTreeNode
-{
-    use StudipTreeNodeCachableTrait;
-
-    /**
-     * This constant represents the key of the root area.
-     */
-    const ROOT = 'root';
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'sem_tree';
-        $config['has_many']['_children'] = [
-            'class_name' => StudipStudyArea::class,
-            'assoc_foreign_key' => 'parent_id',
-            'assoc_func' => 'findByParent',
-            'on_delete' => 'delete',
-            'on_store' => 'store',
-        ];
-        $config['has_and_belongs_to_many']['courses'] = [
-            'class_name' => Course::class,
-            'thru_table' => 'seminar_sem_tree',
-        ];
-        $config['belongs_to']['_parent'] = [
-            'class_name' => StudipStudyArea::class,
-            'foreign_key' => 'parent_id',
-        ];
-
-        $config = self::registerCachableCallbacks($config);
-
-        parent::configure($config);
-    }
-
-    /**
-     * This is required, if the nodes are added backwards
-     */
-    public $required_children = [];
-
-    /**
-     * Returns the children of the study area with the specified ID.
-     */
-    public static function findByParent($parent_id)
-    {
-        return self::findByparent_id($parent_id, "ORDER BY priority,name");
-    }
-
-    /**
-     * Returns the study area with the specified ID.
-     */
-    public static function find($id)
-    {
-
-        $result = NULL;
-
-        if ($id === self::ROOT) {
-            $result = self::getRootArea();
-        }
-
-        else {
-            $result = parent::find($id);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get a string representation of this study area.
-     */
-    public function __toString()
-    {
-        return $this->id;
-    }
-
-
-    /**
-     * Get the comment of this study area.
-     */
-    public function getInfo()
-    {
-        return $this->content['info'];
-    }
-
-
-    /**
-     * Set the comment of this study area.
-     */
-    public function setInfo($info)
-    {
-        $this->content['info'] = (string) $info;
-        return $this;
-    }
-
-
-    /**
-     * Get the display name of this study area.
-     */
-    public function getName(): string
-    {
-        return $this->content['name'];
-    }
-
-    /**
-     * Set the display name of this study area.
-     */
-    public function setName($name)
-    {
-        $this->content['name'] = (string) $name;
-        return $this;
-    }
-
-
-    /**
-     * Get the parent ID of this study area.
-     */
-    public function getParentId()
-    {
-        return $this->content['parent_id'];
-    }
-
-
-    /**
-     * Get the parent.
-     */
-    public function getParent()
-    {
-        $result = NULL;
-        if ($this->getID() !== self::ROOT) {
-            $result = $this->_parent;
-        }
-        return $result;
-    }
-
-
-    /**
-     * Set the parent of this study area.
-     */
-    public function setParentId($parent_id)
-    {
-        $this->content['parent_id'] = (string) $parent_id;
-        $this->resetRelation('parent');
-        return $this;
-    }
-
-    /**
-     * get the type of this study area.
-     */
-    public function getType()
-    {
-        return $this->content['type'];
-    }
-
-    /**
-     * set the type of this study area.
-     */
-    public function setType($type)
-    {
-        $this->content['type'] = (int) $type;
-        return $this;
-    }
-
-    /**
-     * get the name of the type of this study area, see $SEM_TREE_TYPES in config.inc.php
-     *
-     * @return string
-     */
-    public function getTypeName()
-    {
-        if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name'])){
-            return $GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name'];
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * is this study area editable, see $SEM_TREE_TYPES in config.inc.php
-     *
-     * @return bool
-     */
-    public function isEditable()
-    {
-        if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable'])){
-            return (bool)$GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * is this study area hidden, see $SEM_TREE_TYPES in config.inc.php
-     *
-     * @return bool
-     */
-    public function isHidden()
-    {
-        if (isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['hidden'])) {
-            return (bool) $GLOBALS['SEM_TREE_TYPES'][$this->getType()]['hidden'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the path along the sem_tree to this study area.
-     *
-     * @param  string     optional; TODO
-     *
-     * @return mixed      TODO
-     */
-    public function getPath($separator = NULL)
-    {
-
-        $path = [];
-
-        $area = $this;
-        while ($area) {
-            if ($area->getName() != '') {
-                $path[] = $area->getName();
-            }
-            if ($area->getParentId() == self::ROOT) {
-                break;
-            }
-            $area = $area->getParent();
-        }
-
-        $path = array_reverse($path);
-
-        return isset($separator)
-        ? join($separator, $path)
-        : $path;
-    }
-
-
-    /**
-     * Get the priority of this study area.
-     */
-    public function getPriority()
-    {
-        return $this->content['priority'];
-    }
-
-
-    /**
-     * Set the priority of this study area.
-     */
-    public function setPriority($priority)
-    {
-        $this->content['priority'] = (int) $priority;
-        return $this;
-    }
-
-
-    /**
-     * Returns the children of this study area.
-     */
-    public function getChildren()
-    {
-        return $this->_children;
-    }
-
-    /**
-     * Returns1 TRUE if the area has children.
-     */
-    public function hasChildren()
-    {
-        return sizeof($this->_children) > 0;
-    }
-
-
-    /**
-     * Returns TRUE if this area is the root.
-     */
-    public function isRoot()
-    {
-        return $this->getId() === self::ROOT;
-    }
-
-
-    /**
-     * Returns TRUE if this area can be select.
-     */
-    public function isAssignable()
-    {
-        $cfg = Config::GetInstance();
-        $leaves_too = $cfg->getValue('SEM_TREE_ALLOW_BRANCH_ASSIGN');
-        if ($leaves_too) {
-            return !$this->isRoot() && !$this->isHidden();
-        } else {
-            return !$this->isRoot() && !$this->isHidden() && !$this->hasChildren();
-        }
-    }
-
-    /**
-     * is this study area considered a study modul?, see $SEM_TREE_TYPES in config.inc.php
-     *
-     * @return bool
-     */
-    public function isModule()
-    {
-        return isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['is_module']);
-    }
-
-    /**
-     * Get an associative array of all study areas of a course. The array
-     * contains StudipStudyArea instances
-     *
-     * @param  id         the course's ID
-     *
-     * @return SimpleCollection      a SimpleORMapCollection of that course's study areas
-     */
-    public static function getStudyAreasForCourse($id)
-    {
-        $course = Course::find($id);
-        return $course ? $course->study_areas : new SimpleCollection();
-    }
-
-
-    /**
-     * Returns the not really existing root study area.
-     *
-     * @return object     the root study area object
-     */
-    public static function getRootArea()
-    {
-        $root = new StudipStudyArea();
-        $root->setID(self::ROOT);
-        $root->setName(Config::get()->UNI_NAME_CLEAN);
-        return $root;
-    }
-
-
-    /**
-     * Search for study areas whose name matches the given search term.
-     *
-     * @param string $searchTerm the seach term
-     *
-     * @return StudipStudyArea[] nodes
-     */
-    public static function search($searchTerm)
-    {
-        return self::findBySql(
-            "name LIKE :searchTerm ORDER BY priority",
-            ['searchTerm' => "%$searchTerm%"]
-        );
-    }
-
-    /**
-     * Takes an array of StudyArea objects and produces the tree to the root node
-     *
-     * @param array $nodes All required nodes in the tree
-     * @return StudipStudyArea the root node
-     */
-    public static function backwards($nodes)
-    {
-        // create the dummy root
-        $root = static::getRootArea();
-
-        $hashmap = [];
-
-        $i = 0;
-
-        // let the backwardssearch begin
-        while ($nodes && $i < 99) {
-
-            //clear cache
-            $newNodes = [];
-
-            //process nodes on this level
-            foreach ($nodes as $node) {
-
-                // if we know the node already place there
-                if (isset($hashmap[$node->parent_id])) {
-                    $cached = $hashmap[$node->parent_id];
-                    $cached->required_children[$node->id] = $node;
-                } else {
-                    // if we have a node that is directly under root
-                    if ($node->parent_id == $root->id) {
-                        $root->required_children[$node->id] = $node;
-                    } else {
-                        // else store in hashmap and continue
-                        $hashmap[$node->parent_id] = $node->_parent;
-                        $node->_parent->required_children[$node->id] = $node;
-                        $newNodes[$node->id] = $node->_parent;
-                    }
-                }
-            }
-            $nodes = $newNodes;
-            $i++;
-        }
-
-        // plant the tree
-        return $root;
-    }
-
-    public static function getNode($id): StudipTreeNode
-    {
-        if ($id === 'root') {
-            return static::build([
-                'id'   => 'root',
-                'name' => Config::get()->UNI_NAME_CLEAN,
-            ]);
-        }
-
-        return static::find($id);
-    }
-
-    public static function getCourseNodes(string $course_id): array
-    {
-        return Course::find($course_id)->study_areas->getArrayCopy();
-    }
-
-    public function getDescription(): string
-    {
-        return $this->getInfo();
-    }
-
-    /**
-     * @see StudipTreeNode::getImage()
-     */
-    public function getImage()
-    {
-        return null;
-    }
-
-    public function hasChildNodes(): bool
-    {
-        return count($this->_children) > 0;
-    }
-
-    /**
-     * @see StudipTreeNode::getChildNodes()
-     */
-    public function getChildNodes(bool $onlyVisible = false): array
-    {
-        if ($onlyVisible) {
-            $visibleTypes = array_filter($GLOBALS['SEM_TREE_TYPES'], function ($t) {
-                return isset($t['hidden']) ? !$t['hidden'] : true;
-            });
-
-            return static::findBySQL(
-                "`parent_id` = :parent AND `type` IN (:types) ORDER BY `priority`, `name`",
-                ['parent' => $this->id, 'types' => $visibleTypes]
-            );
-        } else {
-            return static::findByParent_id($this->id, "ORDER BY `priority`, `name`");
-        }
-    }
-
-    /**
-     * @see StudipTreeNode::countCourses()
-     */
-    public function countCourses(
-        $semester_id = 'all',
-        $semclass = 0,
-        $with_children = false
-    ) :int
-    {
-        $query = "SELECT COUNT(DISTINCT t.`seminar_id`) FROM `seminar_sem_tree` t";
-
-        if ($semester_id !== 'all') {
-            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)
-                  LEFT JOIN `semester_courses` sc ON (t.`seminar_id` = sc.`course_id`)
-                  WHERE sc.`semester_id` = :semester";
-            $parameters = [
-                'semester' => $semester_id
-            ];
-        } else {
-            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)";
-            $parameters = [];
-        }
-
-        if ($with_children) {
-            $query .= " AND t.`sem_tree_id` IN (:ids)";
-            $parameters['ids'] = array_merge([$this->id], $this->getDescendantIds());
-        } else {
-            $query .= " AND t.`sem_tree_id` = :id";
-            $parameters['id'] = $this->id;
-        }
-
-        if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
-            $query .= " AND s.`visible` = 1";
-        }
-
-        if ($semclass !== 0) {
-            $query .= "  AND s.`status` IN (:types)";
-            $parameters['types'] = array_map(
-                function ($type) {
-                    return $type['id'];
-                },
-                array_filter(
-                    SemType::getTypes(),
-                    function ($t) use ($semclass) { return $t['class'] === $semclass; }
-                )
-            );
-        }
-
-        return $this->id === 'root' && !$with_children ? 0 : DBManager::get()->fetchColumn($query, $parameters);
-    }
-
-    public function getCourses(
-        $semester_id = 'all',
-        $semclass = 0,
-        $searchterm = '',
-        $with_children = false,
-        array $courses = []
-    ): array
-    {
-        $query = "SELECT DISTINCT s.* FROM `seminar_sem_tree` t";
-
-        if ($semester_id !== 'all') {
-            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)
-                  LEFT JOIN `semester_courses` sc ON (t.`seminar_id` = sc.`course_id`)
-                  WHERE sc.`semester_id` = :semester";
-            $parameters = [
-                'semester' => $semester_id
-            ];
-        } else {
-            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)";
-            $parameters = [];
-        }
-
-        if ($with_children) {
-            $query .= " AND t.`sem_tree_id` IN (:ids)";
-            $parameters['ids'] = array_merge([$this->id], $this->getDescendantIds());
-        } else {
-            $query .= " AND t.`sem_tree_id` = :id";
-            $parameters['id'] = $this->id;
-        }
-
-        if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
-            $query .= " AND s.`visible` = 1";
-        }
-
-        if ($semclass !== 0) {
-            $query .= "  AND s.`status` IN (:types)";
-            $parameters['types'] = array_map(
-                function ($type) {
-                    return $type['id'];
-                },
-                array_filter(
-                    SemType::getTypes(),
-                    function ($t) use ($semclass) { return $t['class'] === $semclass; }
-                )
-            );
-        }
-
-        if ($searchterm) {
-            $query .= " AND s.`Name` LIKE :searchterm";
-            $parameters['searchterm'] = '%' . trim($searchterm) . '%';
-        }
-
-        if ($courses) {
-            $query .= " AND t.`seminar_id` IN (:courses)";
-            $parameters['courses'] = $courses;
-        }
-
-        if (Config::get()->IMPORTANT_SEMNUMBER) {
-            $query .= " ORDER BY s.`start_time`, s.`VeranstaltungsNummer`, s.`Name`";
-        } else {
-            $query .= " ORDER BY s.`start_time`, s.`Name`";
-        }
-
-        return DBManager::get()->fetchAll($query, $parameters, 'Course::buildExisting');
-    }
-
-    public function getAncestors(): array
-    {
-        $path = [
-            [
-                'id' => $this->id,
-                'name' => $this->getName(),
-                'classname' => static::class
-            ]
-        ];
-
-        if ($this->parent_id) {
-            $path = array_merge($this->getNode($this->parent_id)->getAncestors(), $path);
-        }
-
-        return $path;
-    }
-
-    /**
-     * Constructs an index from the level hierarchy, This index is a number,
-     * containing the "depth" level and the priority on this level. For example,
-     * a node on level 2 with priority 3 will get an index of 23.
-     *
-     * @return int
-     */
-    public function getIndex()
-    {
-        $level = 1;
-        $index = (string) $level . (string) $this->priority;
-        $current = $this;
-
-        while ($current->getParent()) {
-            $current = $current->getParent();
-            $index .= $level . $current->priority;
-            $level++;
-        }
-
-        return $index;
-    }
-
-}
diff --git a/lib/models/StudipStudyArea.php b/lib/models/StudipStudyArea.php
new file mode 100644
index 0000000..8da8e16
--- /dev/null
+++ b/lib/models/StudipStudyArea.php
@@ -0,0 +1,637 @@
+<?php
+/**
+ * Studienbereich... TODO
+ *
+ * Copyright (C) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * @package     studip
+ *
+ * @author    mlunzena
+ * @author    André Noack <noack@data-quest.de>
+ * @copyright (c) Authors
+ *
+ * @property string $id alias column for sem_tree_id
+ * @property string $sem_tree_id database column
+ * @property string $parent_id database column
+ * @property int $priority database column
+ * @property string $info database column
+ * @property string $name database column
+ * @property string|null $studip_object_id database column
+ * @property int $type database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property SimpleORMapCollection|StudipStudyArea[] $_children has_many StudipStudyArea
+ * @property StudipStudyArea $_parent belongs_to StudipStudyArea
+ * @property SimpleORMapCollection|Course[] $courses has_and_belongs_to_many Course
+ */
+
+class StudipStudyArea extends SimpleORMap implements StudipTreeNode
+{
+    use StudipTreeNodeCachableTrait;
+
+    /**
+     * This constant represents the key of the root area.
+     */
+    const ROOT = 'root';
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'sem_tree';
+        $config['has_many']['_children'] = [
+            'class_name' => StudipStudyArea::class,
+            'assoc_foreign_key' => 'parent_id',
+            'assoc_func' => 'findByParent',
+            'on_delete' => 'delete',
+            'on_store' => 'store',
+        ];
+        $config['has_and_belongs_to_many']['courses'] = [
+            'class_name' => Course::class,
+            'thru_table' => 'seminar_sem_tree',
+        ];
+        $config['belongs_to']['_parent'] = [
+            'class_name' => StudipStudyArea::class,
+            'foreign_key' => 'parent_id',
+        ];
+
+        $config = self::registerCachableCallbacks($config);
+
+        parent::configure($config);
+    }
+
+    /**
+     * This is required, if the nodes are added backwards
+     */
+    public $required_children = [];
+
+    /**
+     * Returns the children of the study area with the specified ID.
+     */
+    public static function findByParent($parent_id)
+    {
+        return self::findByparent_id($parent_id, "ORDER BY priority,name");
+    }
+
+    /**
+     * Returns the study area with the specified ID.
+     */
+    public static function find($id)
+    {
+
+        $result = NULL;
+
+        if ($id === self::ROOT) {
+            $result = self::getRootArea();
+        }
+
+        else {
+            $result = parent::find($id);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get a string representation of this study area.
+     */
+    public function __toString()
+    {
+        return $this->id;
+    }
+
+
+    /**
+     * Get the comment of this study area.
+     */
+    public function getInfo()
+    {
+        return $this->content['info'];
+    }
+
+
+    /**
+     * Set the comment of this study area.
+     */
+    public function setInfo($info)
+    {
+        $this->content['info'] = (string) $info;
+        return $this;
+    }
+
+
+    /**
+     * Get the display name of this study area.
+     */
+    public function getName(): string
+    {
+        return $this->content['name'];
+    }
+
+    /**
+     * Set the display name of this study area.
+     */
+    public function setName($name)
+    {
+        $this->content['name'] = (string) $name;
+        return $this;
+    }
+
+
+    /**
+     * Get the parent ID of this study area.
+     */
+    public function getParentId()
+    {
+        return $this->content['parent_id'];
+    }
+
+
+    /**
+     * Get the parent.
+     */
+    public function getParent()
+    {
+        $result = NULL;
+        if ($this->getID() !== self::ROOT) {
+            $result = $this->_parent;
+        }
+        return $result;
+    }
+
+
+    /**
+     * Set the parent of this study area.
+     */
+    public function setParentId($parent_id)
+    {
+        $this->content['parent_id'] = (string) $parent_id;
+        $this->resetRelation('parent');
+        return $this;
+    }
+
+    /**
+     * get the type of this study area.
+     */
+    public function getType()
+    {
+        return $this->content['type'];
+    }
+
+    /**
+     * set the type of this study area.
+     */
+    public function setType($type)
+    {
+        $this->content['type'] = (int) $type;
+        return $this;
+    }
+
+    /**
+     * get the name of the type of this study area, see $SEM_TREE_TYPES in config.inc.php
+     *
+     * @return string
+     */
+    public function getTypeName()
+    {
+        if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name'])){
+            return $GLOBALS['SEM_TREE_TYPES'][$this->getType()]['name'];
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * is this study area editable, see $SEM_TREE_TYPES in config.inc.php
+     *
+     * @return bool
+     */
+    public function isEditable()
+    {
+        if(isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable'])){
+            return (bool)$GLOBALS['SEM_TREE_TYPES'][$this->getType()]['editable'];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * is this study area hidden, see $SEM_TREE_TYPES in config.inc.php
+     *
+     * @return bool
+     */
+    public function isHidden()
+    {
+        if (isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['hidden'])) {
+            return (bool) $GLOBALS['SEM_TREE_TYPES'][$this->getType()]['hidden'];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Get the path along the sem_tree to this study area.
+     *
+     * @param  string     optional; TODO
+     *
+     * @return mixed      TODO
+     */
+    public function getPath($separator = NULL)
+    {
+
+        $path = [];
+
+        $area = $this;
+        while ($area) {
+            if ($area->getName() != '') {
+                $path[] = $area->getName();
+            }
+            if ($area->getParentId() == self::ROOT) {
+                break;
+            }
+            $area = $area->getParent();
+        }
+
+        $path = array_reverse($path);
+
+        return isset($separator)
+        ? join($separator, $path)
+        : $path;
+    }
+
+
+    /**
+     * Get the priority of this study area.
+     */
+    public function getPriority()
+    {
+        return $this->content['priority'];
+    }
+
+
+    /**
+     * Set the priority of this study area.
+     */
+    public function setPriority($priority)
+    {
+        $this->content['priority'] = (int) $priority;
+        return $this;
+    }
+
+
+    /**
+     * Returns the children of this study area.
+     */
+    public function getChildren()
+    {
+        return $this->_children;
+    }
+
+    /**
+     * Returns1 TRUE if the area has children.
+     */
+    public function hasChildren()
+    {
+        return sizeof($this->_children) > 0;
+    }
+
+
+    /**
+     * Returns TRUE if this area is the root.
+     */
+    public function isRoot()
+    {
+        return $this->getId() === self::ROOT;
+    }
+
+
+    /**
+     * Returns TRUE if this area can be select.
+     */
+    public function isAssignable()
+    {
+        $cfg = Config::GetInstance();
+        $leaves_too = $cfg->getValue('SEM_TREE_ALLOW_BRANCH_ASSIGN');
+        if ($leaves_too) {
+            return !$this->isRoot() && !$this->isHidden();
+        } else {
+            return !$this->isRoot() && !$this->isHidden() && !$this->hasChildren();
+        }
+    }
+
+    /**
+     * is this study area considered a study modul?, see $SEM_TREE_TYPES in config.inc.php
+     *
+     * @return bool
+     */
+    public function isModule()
+    {
+        return isset($GLOBALS['SEM_TREE_TYPES'][$this->getType()]['is_module']);
+    }
+
+    /**
+     * Get an associative array of all study areas of a course. The array
+     * contains StudipStudyArea instances
+     *
+     * @param  id         the course's ID
+     *
+     * @return SimpleCollection      a SimpleORMapCollection of that course's study areas
+     */
+    public static function getStudyAreasForCourse($id)
+    {
+        $course = Course::find($id);
+        return $course ? $course->study_areas : new SimpleCollection();
+    }
+
+
+    /**
+     * Returns the not really existing root study area.
+     *
+     * @return object     the root study area object
+     */
+    public static function getRootArea()
+    {
+        $root = new StudipStudyArea();
+        $root->setID(self::ROOT);
+        $root->setName(Config::get()->UNI_NAME_CLEAN);
+        return $root;
+    }
+
+
+    /**
+     * Search for study areas whose name matches the given search term.
+     *
+     * @param string $searchTerm the seach term
+     *
+     * @return StudipStudyArea[] nodes
+     */
+    public static function search($searchTerm)
+    {
+        return self::findBySql(
+            "name LIKE :searchTerm ORDER BY priority",
+            ['searchTerm' => "%$searchTerm%"]
+        );
+    }
+
+    /**
+     * Takes an array of StudyArea objects and produces the tree to the root node
+     *
+     * @param array $nodes All required nodes in the tree
+     * @return StudipStudyArea the root node
+     */
+    public static function backwards($nodes)
+    {
+        // create the dummy root
+        $root = static::getRootArea();
+
+        $hashmap = [];
+
+        $i = 0;
+
+        // let the backwardssearch begin
+        while ($nodes && $i < 99) {
+
+            //clear cache
+            $newNodes = [];
+
+            //process nodes on this level
+            foreach ($nodes as $node) {
+
+                // if we know the node already place there
+                if (isset($hashmap[$node->parent_id])) {
+                    $cached = $hashmap[$node->parent_id];
+                    $cached->required_children[$node->id] = $node;
+                } else {
+                    // if we have a node that is directly under root
+                    if ($node->parent_id == $root->id) {
+                        $root->required_children[$node->id] = $node;
+                    } else {
+                        // else store in hashmap and continue
+                        $hashmap[$node->parent_id] = $node->_parent;
+                        $node->_parent->required_children[$node->id] = $node;
+                        $newNodes[$node->id] = $node->_parent;
+                    }
+                }
+            }
+            $nodes = $newNodes;
+            $i++;
+        }
+
+        // plant the tree
+        return $root;
+    }
+
+    public static function getNode($id): StudipTreeNode
+    {
+        if ($id === 'root') {
+            return static::build([
+                'id'   => 'root',
+                'name' => Config::get()->UNI_NAME_CLEAN,
+            ]);
+        }
+
+        return static::find($id);
+    }
+
+    public static function getCourseNodes(string $course_id): array
+    {
+        return Course::find($course_id)->study_areas->getArrayCopy();
+    }
+
+    public function getDescription(): string
+    {
+        return $this->getInfo();
+    }
+
+    /**
+     * @see StudipTreeNode::getImage()
+     */
+    public function getImage()
+    {
+        return null;
+    }
+
+    public function hasChildNodes(): bool
+    {
+        return count($this->_children) > 0;
+    }
+
+    /**
+     * @see StudipTreeNode::getChildNodes()
+     */
+    public function getChildNodes(bool $onlyVisible = false): array
+    {
+        if ($onlyVisible) {
+            $visibleTypes = array_filter($GLOBALS['SEM_TREE_TYPES'], function ($t) {
+                return isset($t['hidden']) ? !$t['hidden'] : true;
+            });
+
+            return static::findBySQL(
+                "`parent_id` = :parent AND `type` IN (:types) ORDER BY `priority`, `name`",
+                ['parent' => $this->id, 'types' => $visibleTypes]
+            );
+        } else {
+            return static::findByParent_id($this->id, "ORDER BY `priority`, `name`");
+        }
+    }
+
+    /**
+     * @see StudipTreeNode::countCourses()
+     */
+    public function countCourses(
+        $semester_id = 'all',
+        $semclass = 0,
+        $with_children = false
+    ) :int
+    {
+        $query = "SELECT COUNT(DISTINCT t.`seminar_id`) FROM `seminar_sem_tree` t";
+
+        if ($semester_id !== 'all') {
+            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)
+                  LEFT JOIN `semester_courses` sc ON (t.`seminar_id` = sc.`course_id`)
+                  WHERE sc.`semester_id` = :semester";
+            $parameters = [
+                'semester' => $semester_id
+            ];
+        } else {
+            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)";
+            $parameters = [];
+        }
+
+        if ($with_children) {
+            $query .= " AND t.`sem_tree_id` IN (:ids)";
+            $parameters['ids'] = array_merge([$this->id], $this->getDescendantIds());
+        } else {
+            $query .= " AND t.`sem_tree_id` = :id";
+            $parameters['id'] = $this->id;
+        }
+
+        if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
+            $query .= " AND s.`visible` = 1";
+        }
+
+        if ($semclass !== 0) {
+            $query .= "  AND s.`status` IN (:types)";
+            $parameters['types'] = array_map(
+                function ($type) {
+                    return $type['id'];
+                },
+                array_filter(
+                    SemType::getTypes(),
+                    function ($t) use ($semclass) { return $t['class'] === $semclass; }
+                )
+            );
+        }
+
+        return $this->id === 'root' && !$with_children ? 0 : DBManager::get()->fetchColumn($query, $parameters);
+    }
+
+    public function getCourses(
+        $semester_id = 'all',
+        $semclass = 0,
+        $searchterm = '',
+        $with_children = false,
+        array $courses = []
+    ): array
+    {
+        $query = "SELECT DISTINCT s.* FROM `seminar_sem_tree` t";
+
+        if ($semester_id !== 'all') {
+            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)
+                  LEFT JOIN `semester_courses` sc ON (t.`seminar_id` = sc.`course_id`)
+                  WHERE sc.`semester_id` = :semester";
+            $parameters = [
+                'semester' => $semester_id
+            ];
+        } else {
+            $query .= " JOIN `seminare` s ON (s.`Seminar_id` = t.`seminar_id`)";
+            $parameters = [];
+        }
+
+        if ($with_children) {
+            $query .= " AND t.`sem_tree_id` IN (:ids)";
+            $parameters['ids'] = array_merge([$this->id], $this->getDescendantIds());
+        } else {
+            $query .= " AND t.`sem_tree_id` = :id";
+            $parameters['id'] = $this->id;
+        }
+
+        if (!$GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM)) {
+            $query .= " AND s.`visible` = 1";
+        }
+
+        if ($semclass !== 0) {
+            $query .= "  AND s.`status` IN (:types)";
+            $parameters['types'] = array_map(
+                function ($type) {
+                    return $type['id'];
+                },
+                array_filter(
+                    SemType::getTypes(),
+                    function ($t) use ($semclass) { return $t['class'] === $semclass; }
+                )
+            );
+        }
+
+        if ($searchterm) {
+            $query .= " AND s.`Name` LIKE :searchterm";
+            $parameters['searchterm'] = '%' . trim($searchterm) . '%';
+        }
+
+        if ($courses) {
+            $query .= " AND t.`seminar_id` IN (:courses)";
+            $parameters['courses'] = $courses;
+        }
+
+        if (Config::get()->IMPORTANT_SEMNUMBER) {
+            $query .= " ORDER BY s.`start_time`, s.`VeranstaltungsNummer`, s.`Name`";
+        } else {
+            $query .= " ORDER BY s.`start_time`, s.`Name`";
+        }
+
+        return DBManager::get()->fetchAll($query, $parameters, 'Course::buildExisting');
+    }
+
+    public function getAncestors(): array
+    {
+        $path = [
+            [
+                'id' => $this->id,
+                'name' => $this->getName(),
+                'classname' => static::class
+            ]
+        ];
+
+        if ($this->parent_id) {
+            $path = array_merge($this->getNode($this->parent_id)->getAncestors(), $path);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Constructs an index from the level hierarchy, This index is a number,
+     * containing the "depth" level and the priority on this level. For example,
+     * a node on level 2 with priority 3 will get an index of 23.
+     *
+     * @return int
+     */
+    public function getIndex()
+    {
+        $level = 1;
+        $index = (string) $level . (string) $this->priority;
+        $current = $this;
+
+        while ($current->getParent()) {
+            $current = $current->getParent();
+            $index .= $level . $current->priority;
+            $level++;
+        }
+
+        return $index;
+    }
+
+}
diff --git a/lib/models/StudyCourse.class.php b/lib/models/StudyCourse.class.php
deleted file mode 100644
index faf6df4..0000000
--- a/lib/models/StudyCourse.class.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * StudyCourse.class.php
- * model class for table studiengang
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for fach_id
- * @property string $fach_id database column
- * @property string $name database column
- * @property string|null $name_kurz database column
- * @property string|null $beschreibung database column
- * @property string|null $schlagworte database column
- * @property string $author_id database column
- * @property string $editor_id database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|Degree[] $degrees has_and_belongs_to_many Degree
- * @property-read mixed $count_user additional field
- */
-class StudyCourse extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'fach';
-
-        $config['has_and_belongs_to_many']['degrees'] = [
-            'class_name' => Degree::class,
-            'thru_table' => 'user_studiengang',
-            'thru_key' => 'fach_id',
-            'thru_assoc_key' => 'abschluss_id',
-            'order_by' => 'GROUP BY abschluss_id ORDER BY name'
-        ];
-
-        $config['additional_fields']['count_user']['get'] = 'countUser';
-
-        parent::configure($config);
-    }
-
-    public function countUser()
-    {
-        $stmt = DBManager::get()->prepare('SELECT COUNT(DISTINCT user_id) '
-                . 'FROM user_studiengang WHERE fach_id = ?');
-        $stmt->execute([$this->id]);
-        return $stmt->fetchColumn();
-    }
-
-    public function countUserByDegree($degree_id)
-    {
-        $stmt = DBManager::get()->prepare('SELECT COUNT(DISTINCT user_id) '
-                . 'FROM user_studiengang '
-                . 'WHERE fach_id = ? AND abschluss_id = ?');
-        $stmt->execute([$this->id, $degree_id]);
-        return $stmt->fetchColumn();
-    }
-
-    public function store()
-    {
-        if ($this->isNew() || $this->isDirty()) {
-            $this->editor_id = $GLOBALS['user']->id;
-            if (!$this->getPristineValue('author_id')) {
-                $this->author_id = $GLOBALS['user']->id;
-            }
-        }
-
-        return parent::store();
-    }
-
-}
diff --git a/lib/models/StudyCourse.php b/lib/models/StudyCourse.php
new file mode 100644
index 0000000..faf6df4
--- /dev/null
+++ b/lib/models/StudyCourse.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * StudyCourse.class.php
+ * model class for table studiengang
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for fach_id
+ * @property string $fach_id database column
+ * @property string $name database column
+ * @property string|null $name_kurz database column
+ * @property string|null $beschreibung database column
+ * @property string|null $schlagworte database column
+ * @property string $author_id database column
+ * @property string $editor_id database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|Degree[] $degrees has_and_belongs_to_many Degree
+ * @property-read mixed $count_user additional field
+ */
+class StudyCourse extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'fach';
+
+        $config['has_and_belongs_to_many']['degrees'] = [
+            'class_name' => Degree::class,
+            'thru_table' => 'user_studiengang',
+            'thru_key' => 'fach_id',
+            'thru_assoc_key' => 'abschluss_id',
+            'order_by' => 'GROUP BY abschluss_id ORDER BY name'
+        ];
+
+        $config['additional_fields']['count_user']['get'] = 'countUser';
+
+        parent::configure($config);
+    }
+
+    public function countUser()
+    {
+        $stmt = DBManager::get()->prepare('SELECT COUNT(DISTINCT user_id) '
+                . 'FROM user_studiengang WHERE fach_id = ?');
+        $stmt->execute([$this->id]);
+        return $stmt->fetchColumn();
+    }
+
+    public function countUserByDegree($degree_id)
+    {
+        $stmt = DBManager::get()->prepare('SELECT COUNT(DISTINCT user_id) '
+                . 'FROM user_studiengang '
+                . 'WHERE fach_id = ? AND abschluss_id = ?');
+        $stmt->execute([$this->id, $degree_id]);
+        return $stmt->fetchColumn();
+    }
+
+    public function store()
+    {
+        if ($this->isNew() || $this->isDirty()) {
+            $this->editor_id = $GLOBALS['user']->id;
+            if (!$this->getPristineValue('author_id')) {
+                $this->author_id = $GLOBALS['user']->id;
+            }
+        }
+
+        return parent::store();
+    }
+
+}
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
deleted file mode 100644
index 4894031..0000000
--- a/lib/models/User.class.php
+++ /dev/null
@@ -1,1650 +0,0 @@
-<?php
-/**
- * User.class.php
- * model class for combined auth_user_md5/user_info record
- * this class represents one user, the attributes from tables
- * auth_user_md5 and user_info were merged.
- *
- * @code
- * $a_user = User::find($id);
- * $another_users_email = User::findByUsername($username)->email;
- * $a_user->email = $another_users_email;
- * $a_user->store();
- * @endcode
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2011 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for user_id
- * @property string $user_id database column
- * @property string $username database column
- * @property string $password database column
- * @property string $perms database column
- * @property string $vorname database column
- * @property string $nachname database column
- * @property string $email database column
- * @property string $matriculation_number database column
- * @property string $validation_key database column
- * @property string|null $auth_plugin database column
- * @property int $locked database column
- * @property string|null $lock_comment database column
- * @property string|null $locked_by database column
- * @property string $visible database column
- * @property SimpleORMapCollection|CourseMember[] $course_memberships has_many CourseMember
- * @property SimpleORMapCollection|InstituteMember[] $institute_memberships has_many InstituteMember
- * @property SimpleORMapCollection|AdmissionApplication[] $admission_applications has_many AdmissionApplication
- * @property SimpleORMapCollection|ArchivedCourseMember[] $archived_course_memberships has_many ArchivedCourseMember
- * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
- * @property SimpleORMapCollection|UserStudyCourse[] $studycourses has_many UserStudyCourse
- * @property SimpleORMapCollection|Statusgruppen[] $contactgroups has_many Statusgruppen
- * @property SimpleORMapCollection|ResourcePermission[] $resource_permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceTemporaryPermission[] $resource_temporary_permissions has_many ResourceTemporaryPermission
- * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock
- * @property SimpleORMapCollection|ConsultationBooking[] $consultation_bookings has_many ConsultationBooking
- * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility
- * @property SimpleORMapCollection|Kategorie[] $profile_categories has_many Kategorie
- * @property SimpleORMapCollection|MvvContact[] $mvv_assignments has_many MvvContact
- * @property SimpleORMapCollection|CourseMemberNotification[] $course_notifications has_many CourseMemberNotification
- * @property SimpleORMapCollection|BlubberThread[] $blubber_threads has_many BlubberThread
- * @property SimpleORMapCollection|BlubberComment[] $blubber_comments has_many BlubberComment
- * @property SimpleORMapCollection|BlubberMention[] $blubber_mentions has_many BlubberMention
- * @property UserInfo $info has_one UserInfo
- * @property UserOnline $online has_one UserOnline
- * @property Courseware\Unit $courseware_units has_one Courseware\Unit
- * @property SimpleORMapCollection|User[] $contacts has_and_belongs_to_many User
- * @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain
- * @property-read mixed $config additional field
- * @property mixed $hobby additional field
- * @property mixed $lebenslauf additional field
- * @property mixed $publi additional field
- * @property mixed $schwerp additional field
- * @property mixed $home additional field
- * @property mixed $privatnr additional field
- * @property mixed $privatcell additional field
- * @property mixed $privadr additional field
- * @property mixed $score additional field
- * @property mixed $geschlecht additional field
- * @property mixed $mkdate additional field
- * @property mixed $chdate additional field
- * @property mixed $title_front additional field
- * @property mixed $title_rear additional field
- * @property mixed $preferred_language additional field
- * @property mixed $smsforward_copy additional field
- * @property mixed $smsforward_rec additional field
- * @property mixed $email_forward additional field
- * @property mixed $motto additional field
- * @property mixed $lock_rule additional field
- * @property mixed $oercampus_description additional field
- */
-class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\Owner
-{
-    /**
-     *
-     */
-    protected static function configure($config = [])
-    {
-        $config['has_many']['course_memberships'] = [
-            'class_name' => CourseMember::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['institute_memberships'] = [
-            'class_name' => InstituteMember::class,
-            'order_by'   => 'ORDER BY priority ASC',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['admission_applications'] = [
-            'class_name' => AdmissionApplication::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['archived_course_memberships'] = [
-            'class_name' => ArchivedCourseMember::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['datafields'] = [
-            'class_name'  => DatafieldEntryModel::class,
-            'foreign_key' => function ($user) {
-                return [$user];
-            },
-            'assoc_foreign_key' => function ($model, $params) {
-                $model->setValue('range_id', $params[0]->id);
-            },
-            'assoc_func' => 'findByModel',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['studycourses'] = [
-            'class_name' => UserStudyCourse::class,
-            'assoc_func' => 'findByUser',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_and_belongs_to_many']['contacts'] = [
-            'class_name'     => User::class,
-            'thru_table'     => 'contact',
-            'thru_key'       => 'owner_id',
-            'thru_assoc_key' => 'user_id',
-            'order_by'       => 'ORDER BY Nachname, Vorname',
-            'on_delete'      => 'delete',
-            'on_store'       => 'store',
-        ];
-        $config['has_many']['contactgroups'] = [
-            'class_name'        => Statusgruppen::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-        ];
-        $config['has_one']['info'] = [
-            'class_name' => UserInfo::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_one']['online'] = [
-            'class_name' => UserOnline::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store',
-        ];
-        $config['has_many']['resource_permissions'] = [
-            'class_name' => ResourcePermission::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-        $config['has_many']['resource_temporary_permissions'] = [
-            'class_name' => ResourceTemporaryPermission::class,
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-        $config['has_many']['consultation_blocks'] = [
-            'class_name'        => ConsultationBlock::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-        ];
-        $config['has_many']['consultation_bookings'] = [
-            'class_name' => ConsultationBooking::class,
-            'on_delete'  => 'delete',
-        ];
-        $config['has_many']['consultation_responsibilities'] = [
-            'class_name'        => ConsultationResponsibility::class,
-            'assoc_func'        => 'findByUserId',
-            'on_delete'         => 'delete',
-        ];
-        $config['has_many']['profile_categories'] = [
-            'class_name'        => Kategorie::class,
-            'assoc_foreign_key' => 'range_id',
-            'on_delete'         => 'delete',
-        ];
-
-
-        $config['has_many']['mvv_assignments'] = [
-            'class_name'        => MvvContact::class,
-            'assoc_foreign_key' => 'contact_id',
-            'on_delete'         => 'delete'
-        ];
-
-        $config['has_and_belongs_to_many']['domains'] = [
-            'class_name'        => UserDomain::class,
-            'thru_table'        => 'user_userdomains',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store',
-            'order_by'          => 'ORDER BY name',
-        ];
-
-        $config['has_many']['course_notifications'] = [
-            'class_name'        => CourseMemberNotification::class,
-            'on_delete'         => 'delete',
-        ];
-
-        $config['has_many']['extern_pages_configs'] = [
-            'class_name' => ExternPageConfig::class,
-            'assoc_foreign_key' => 'author_id'
-        ];
-
-        // Blubber relations
-        $config['has_many']['blubber_threads'] = [
-            'class_name' => BlubberThread::class,
-            'on_delete'  => 'delete',
-        ];
-        $config['has_many']['blubber_comments'] = [
-            'class_name' => BlubberComment::class,
-            'on_delete'  => 'delete',
-        ];
-        $config['has_many']['blubber_mentions'] = [
-            'class_name' => BlubberMention::class,
-            'on_delete'  => 'delete',
-        ];
-
-        $config['additional_fields']['config']['get'] = function ($user) {
-            return UserConfig::get($user->id);
-        };
-        $config['additional_fields']['gender']['get'] = 'getGender';
-        $config['additional_fields']['salutation']['get'] = 'getSalutation';
-
-        $config['registered_callbacks']['after_delete'][] = 'cbRemoveFeedback';
-        $config['registered_callbacks']['after_delete'][] = 'cbRemoveForumVisits';
-        $config['registered_callbacks']['before_store'][] = 'cbClearCaches';
-        $config['registered_callbacks']['before_store'][] = 'cbStudipLog';
-
-        $info = new UserInfo();
-        $info_meta = $info->getTableMetadata();
-        foreach ($info_meta ['fields'] as $field => $meta) {
-            if ($field !== $info_meta['pk'][0]) {
-                $config['additional_fields'][$field] = [
-                    'get'            => '_getAdditionalValueFromRelation',
-                    'set'            => '_setAdditionalValueFromRelation',
-                    'relation'       => 'info',
-                    'relation_field' => $field,
-                ];
-            }
-        }
-
-        parent::configure($config);
-    }
-
-    /**
-     * @param $type string type of callback
-     */
-    protected function cbStudipLog($type)
-    {
-        if ($type == 'before_store' && !$this->isNew()) {
-            if ($this->isFieldDirty('locked') && $this->isFieldDirty('lock_comment')) {
-                if ((int)$this->locked === 1) {
-                    StudipLog::log('USER_LOCK',
-                        $this->user_id,
-                        null,
-                        sprintf(
-                            'Kommentar: %s',
-                            $this->lock_comment
-                        )
-                    );
-                } else {
-                    StudipLog::log('USER_UNLOCK',
-                        $this->user_id
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the currently authenticated user.
-     *
-     * @return ?User User
-     */
-    public static function findCurrent()
-    {
-        if (isset($GLOBALS['user']) && is_object($GLOBALS['user'])) {
-            return $GLOBALS['user']->getAuthenticatedUser();
-        }
-
-        return null;
-    }
-
-    /**
-     * build new object with given data
-     *
-     * @param $data array assoc array of record
-     * @return User
-     */
-    public static function build($data, $is_new = true)
-    {
-        // Note: This should be used instead of `new static()` since PHPStan
-        $class = get_called_class();
-        $user = new $class();
-
-        $user->info = new UserInfo();
-        $user->setData($data);
-        $user->setNew($is_new);
-        foreach (array_keys($user->db_fields()) as $field) {
-            $user->content_db[$field] = $user->content[$field];
-        }
-        $user->info = UserInfo::build($data, $is_new);
-        return $user;
-    }
-
-    /**
-     * Returns user object including user_info
-     *
-     * @param string $id
-     * @return ?User User
-     */
-    public static function findFull($id)
-    {
-        $sql = "SELECT *
-                FROM auth_user_md5
-                LEFT JOIN user_info USING (user_id)
-                WHERE user_id = ?";
-        $data = DBManager::get()->fetchOne($sql, [$id]);
-        if ($data) {
-            return static::buildExisting($data);
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns user objects including user_info
-     *
-     * @param array $ids
-     * @param string $order_by
-     * @return User[] User
-     */
-    public static function findFullMany($ids, $order_by = '')
-    {
-        $sql = "SELECT *
-                FROM auth_user_md5
-                LEFT JOIN user_info USING (user_id)
-                WHERE user_id IN (?) " . $order_by;
-        $data = DBManager::get()->fetchAll($sql, [$ids], [static::class, 'buildExisting']);
-        return $data;
-    }
-
-    /**
-     * return user object for given username
-     *
-     * @param string $username a username
-     * @return User
-     */
-    public static function findByUsername($username)
-    {
-        return parent::findOneByUsername($username);
-    }
-
-    /**
-     * returns an array of User-objects that have the given value in the
-     * given datafield.
-     * @param string $datafield_id
-     * @param array of User
-     */
-    public static function findByDatafield($datafield_id, $value)
-    {
-        return static::findMany(
-            array_column(
-                DatafieldEntryModel::findBySQL(
-                    'datafield_id = :datafield_id AND content = :value',
-                    compact('datafield_id', 'value')
-                ),
-                'range_id'
-            )
-        );
-    }
-
-    /**
-     * Wraps a search parameter in %..% if the parameter itself does not
-     * contain % or _.
-     *
-     * @param String $needle Search parameter
-     * @return String containing the wrapped needle if neccessary
-     */
-    private static function searchParam($needle)
-    {
-        if (preg_match('/[%_]/S', $needle)) {
-            return $needle;
-        }
-
-        return '%' . $needle . '%';
-    }
-
-    /**
-     * Temporary migrate to User.class.php
-     *
-     * @param $attributes
-     * @return array
-     */
-    public static function search($attributes)
-    {
-        $params = [];
-        $joins  = [];
-        $where  = [];
-
-        $query = "SELECT au.*, ui.*
-                  FROM `auth_user_md5` au
-                  LEFT JOIN `user_online` uo ON (au.`user_id` = uo.`user_id`)
-                  LEFT JOIN `user_info` ui ON (au.`user_id` = ui.`user_id`)";
-
-        if (!empty($attributes['username'])) {
-            $where[] =  "au.`username` like :username";
-            $params[':username'] = self::searchParam($attributes['username']);
-        }
-
-        if (!empty($attributes['vorname'])) {
-            $where[] = "au.`Vorname` LIKE :vorname";
-            $params[':vorname'] = self::searchParam($attributes['vorname']);
-        }
-
-        if (!empty($attributes['nachname'])) {
-            $where[] = "au.`Nachname` LIKE :nachname";
-            $params[':nachname'] = self::searchParam($attributes['nachname']);
-        }
-
-        if (!empty($attributes['email'])) {
-            $where[] = "au.`Email` LIKE :email";
-            $params[':email'] = self::searchParam($attributes['email']);
-        }
-
-        //permissions
-        if (!empty($attributes['perm']) && $attributes['perm'] !== 'alle') {
-            $where[] = "au.`perms` = :perms";
-            $params[':perms'] = $attributes['perm'];
-        }
-
-        //locked user
-        if (!empty($attributes['locked'])) {
-            $where[] = "au.`locked` = 1";
-        }
-
-        // show only users who are not lecturers
-        if (!empty($attributes['show_only_not_lectures'])) {
-            $where[] = "au.`user_id` NOT IN (SELECT `user_id` FROM `seminar_user` WHERE `status` = 'dozent') ";
-        }
-
-        if (!empty($attributes['auth_plugins'])) {
-            $where[] = "IFNULL(`auth_plugin`, 'preliminary') = :auth_plugins ";
-            $params[':auth_plugins'] = $attributes['auth_plugins'];
-        }
-
-        //inactivity
-        if (!is_null($attributes['inaktiv']) && $attributes['inaktiv'][0] != 'nie') {
-            $comp = in_array(trim($attributes['inaktiv'][0]), ['=', '>', '<=']) ? $attributes['inaktiv'][0] : '=';
-            $days = (int)$attributes['inaktiv'][1];
-            $where[] = "uo.`last_lifesign` {$comp} UNIX_TIMESTAMP(TIMESTAMPADD(DAY, -{$days}, NOW())) ";
-        } elseif (!is_null($attributes['inaktiv'])) {
-            $where[] = "uo.`last_lifesign` IS NULL";
-        }
-
-        //datafields
-        if (
-            !empty($attributes['datafields'])
-            && is_array($attributes['datafields'])
-            && count($attributes['datafields']) > 0
-        ) {
-            $joins[] = "LEFT JOIN `datafields_entries` de ON (de.`range_id` = au.`user_id`)";
-            foreach ($attributes['datafields'] as $id => $entry) {
-                $where[] = "de.`datafield_id` = :df_id_". $id;
-                $where[] = "de.`content` LIKE :df_content_". $id;
-                $params[':df_id_' . $id] = $id;
-                $params[':df_content_' . $id] = $entry;
-            }
-        }
-
-        // roles
-        if (!empty($attributes['roles'])) {
-            $joins[] = "LEFT JOIN `roles_user` ON roles_user.`userid` = au.`user_id`";
-            $where[] = "roles_user.`roleid` IN (:roles)";
-            $params[':roles'] = $attributes['roles'];
-        }
-
-        // userdomains
-        if (!empty($attributes['userdomains'])) {
-            $joins[] = "LEFT JOIN `user_userdomains` uud ON (au.`user_id` = uud.`user_id`)";
-            $joins[] = "LEFT JOIN `userdomains` uds USING (`userdomain_id`)";
-            if ($attributes['userdomains'] === 'null-domain') {
-                $where[] = "`userdomain_id` IS NULL ";
-            } else {
-                $where[] = "userdomain_id = :userdomains";
-                $params[':userdomains'] = $attributes['userdomains'];
-            }
-        }
-
-        // degree or studycourse
-        if (!empty($attributes['degree']) || !empty($attributes['studycourse']) || !empty($attributes['fachsem'])) {
-            $joins[] = "LEFT JOIN `user_studiengang` us ON (us.`user_id` = au.`user_id`)";
-            if (!empty($attributes['degree'])) {
-                $where[] = "us.`abschluss_id` IN (:degree)";
-                $params[':degree'] = $attributes['degree'];
-            }
-
-            if (!empty($attributes['studycourse'])) {
-                $where[] = "us.`fach_id` IN (:studycourse)";
-                $params[':studycourse'] = $attributes['studycourse'];
-            }
-
-            if(!empty($attributes['fachsem'])) {
-                $where[] = 'us.`semester` = :fachsem';
-                $params[':fachsem'] = $attributes['fachsem'];
-            }
-        }
-
-        if (!empty($attributes['institute'])) {
-            $joins[] = "LEFT JOIN `user_inst` uis ON uis.`user_id` = au.`user_id`";
-            $where[] = "uis.`Institut_id` = :institute";
-            $params[':institute'] = $attributes['institute'];
-        }
-
-        $query .= implode(' ', $joins);
-        $query .= " WHERE 1 AND ";
-        $query .= implode(' AND ', $where);
-        $query .= " GROUP BY au.`user_id` ";
-
-        if (!empty($attributes['sortby'])) {
-            //sortieren
-            switch ($attributes['sortby']) {
-                case "perms":
-                    $query .= "ORDER BY au.`perms` {$attributes['order']}, au.`username`";
-                    break;
-                case "Vorname":
-                    $query .= "ORDER BY au.`Vorname` {$attributes['order']}, au.`Nachname`";
-                    break;
-                case "Nachname":
-                    $query .= "ORDER BY au.`Nachname` {$attributes['order']}, au.`Vorname`";
-                    break;
-                case "Email":
-                    $query .= "ORDER BY au.`Email` {$attributes['order']}, au.`username`";
-                    break;
-                case 'matriculation_number':
-                    $query .= "ORDER BY au.`matriculation_number` {$attributes['order']}, au.`username`";
-                    break;
-                case "changed":
-                    $query .= "ORDER BY uo.`last_lifesign` {$attributes['order']}, au.`username`";
-                    break;
-                case "mkdate":
-                    $query .= "ORDER BY ui.`mkdate` {$attributes['order']}, au.`username`";
-                    break;
-                case "auth_plugin":
-                    $query .= "ORDER BY `auth_plugin` {$attributes['order']}, au.`username`";
-                    break;
-                default:
-                    $query .= " ORDER BY au.`username` {$attributes['order']}";
-            }
-        }
-
-        return DBManager::get()->fetchAll($query, $params, [static::class, 'buildExisting']);
-    }
-
-
-    /**
-     * @see SimpleORMap::store()
-     */
-    public function store()
-    {
-        if ($this->isDirty() && !$this->info->isFieldDirty('chdate')) {
-            $this->info->setValue('chdate', time());
-        }
-        return parent::store();
-    }
-
-    /**
-     * @see SimpleORMap::triggerChdate()
-     */
-    public function triggerChdate()
-    {
-       return $this->info->triggerChdate();
-    }
-
-    /**
-     * returns the name in specified format
-     * (formats defined in $GLOBALS['_fullname_sql'])
-     *
-     * @param string one of full,full_rev,no_title,no_title_rev,no_title_short,no_title_motto,full_rev_username
-     * @return string guess what - the fullname
-     */
-    public function getFullName($format = 'default')
-    {
-        static $concat,$left,$if,$quote;
-
-        if ($format === 'default') {
-            $format = 'full';
-        }
-
-        $sql = $GLOBALS['_fullname_sql'][$format] ?? null;
-        if (!$sql || $format == 'no_title') {
-            return $this->vorname . ' ' . $this->nachname;
-        }
-        if ($format == 'no_title_rev') {
-            return $this->nachname . ', ' . $this->vorname;
-        }
-        if ($concat === null) {
-            $concat = function() {return join('', func_get_args());};
-            $left = function($str, $c = 0) {return mb_substr($str,0,$c);};
-            $if = function($ok,$yes,$no) {return $ok ? $yes : $no;};
-            $quote = function($str) {return "'" . addcslashes($str, "\\'\0") . "'";};
-        }
-
-        $data = array_map($quote, $this->toArray('vorname nachname username title_front title_rear motto perms'));
-        $replace_func['CONCAT'] = '$concat';
-        $replace_func['LEFT'] = '$left';
-        $replace_func['UCASE'] = 'mb_strtoupper';
-        $replace_func['IF'] = '$if';
-        $eval = strtr($sql, $replace_func);
-        $eval = strtr(mb_strtolower($eval), $data);
-        return eval('return ' . $eval . ';');
-    }
-
-    public function toArrayRecursive($only_these_fields = null)
-    {
-        $ret = parent::toArrayRecursive($only_these_fields);
-        unset($ret['info']);
-        return  $ret;
-    }
-
-    /**
-     * Returns whether the user was assigned a certain role.
-     *
-     * @param string $role         The role to check
-     * @param string $institute_id An optional institute_id
-     * @return bool True if the user was assigned this role, false otherwise
-     */
-    public function hasRole($role, $institute_id = '')
-    {
-        return RolePersistence::isAssignedRole($this->user_id, $role, $institute_id);
-    }
-
-    /**
-     * Returns the roles that were assigned to the user.
-     *
-     * @param boolean $with_implicit
-     * @return array
-     */
-    public function getRoles($with_implicit = false)
-    {
-        return RolePersistence::getAssignedRoles($this->user_id, $with_implicit);
-    }
-
-    /**
-     * Returns whether the given user is stored in contacts.
-     *
-     * @param User $another_user
-     * @return bool
-     */
-    public function isFriendOf($another_user)
-    {
-        return (bool) DBManager::get()->fetchColumn("SELECT 1 FROM contact WHERE owner_id=? AND user_id=?", [$this->user_id, $another_user->user_id]);
-    }
-
-    /**
-     * checks if at least one field was modified since last restore
-     *
-     * @return boolean
-     */
-    public function isDirty()
-    {
-        return parent::isDirty() || $this->info->isDirty();
-    }
-
-    /**
-     * checks if given field was modified since last restore
-     *
-     * @param string $field
-     * @return boolean
-     */
-    public function isFieldDirty($field)
-    {
-        $field = mb_strtolower($field);
-        return (array_key_exists($field, $this->content_db) ? parent::isFieldDirty($field) : $this->info->isFieldDirty($field));
-    }
-
-    /**
-     * reverts value of given field to last restored value
-     *
-     * @param string $field
-     * @return mixed the restored value
-     */
-    public function revertValue($field)
-    {
-        $field = mb_strtolower($field);
-        return (array_key_exists($field, $this->content_db) ? parent::revertValue($field) : $this->info->revertValue($field));
-    }
-
-    /**
-     * returns unmodified value of given field
-     *
-     * @param string $field
-     * @throws InvalidArgumentException
-     * @return mixed
-     */
-    public function getPristineValue($field)
-    {
-        $field = mb_strtolower($field);
-        return (array_key_exists($field, $this->content_db) ? parent::getPristineValue($field) : $this->info->getPristineValue($field));
-    }
-
-    /**
-     * Returns data of table row as assoc array with raw contents like
-     * they are in the database.
-     * Pass array of fieldnames or ws separated string to limit
-     * fields.
-     *
-     * @param mixed $only_these_fields
-     * @return array
-     */
-    public function toRawArray($only_these_fields = null)
-    {
-        return array_merge($this->info->toRawArray($only_these_fields), parent::toRawArray($only_these_fields));
-    }
-
-    /**
-     * @param string $relation
-     */
-    public function initRelation($relation)
-    {
-        parent::initRelation($relation);
-        if ($relation == 'info' && is_null($this->relations['info'])) {
-            $options = $this->getRelationOptions($relation);
-            $result = new $options['class_name'];
-            $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
-            call_user_func($options['assoc_foreign_key_setter'], $result, $foreign_key_value);
-            $this->relations[$relation] = $result;
-        }
-    }
-
-    /**
-     * This function returns the perms allowed for an institute for the current user
-     *
-     * @return array list of perms
-     */
-    public function getInstitutePerms()
-    {
-        if($this->perms === 'admin') {
-            return ['admin'];
-        }
-        $allowed_status = [];
-        $possible_status = ['autor', 'tutor', 'dozent'];
-
-        $pos = array_search($this->perms, $possible_status);
-
-        if ($pos !== false) {
-            $allowed_status = array_slice($possible_status, 0, $pos + 1);
-        }
-        return $allowed_status;
-    }
-
-    /**
-     * Get the decorated StudIP-Kings information
-     * @return String
-     */
-    public function getStudipKingIcon()
-    {
-        $is_king = StudipKing::is_king($this->user_id, TRUE);
-
-        $result = '';
-        foreach ($is_king as $type => $text) {
-            $type = str_replace('_', '-', $type);
-            $result .= Assets::img('crowns/crown-' . $type . '.png', ['alt' => $text, 'title' => $text]);
-        }
-
-        return $result ?: null;
-    }
-
-    /**
-     * Builds an array containing all available elements that are part of a
-     * user's homepage together with their visibility. It isn't sufficient to
-     * just load the visibility settings from database, because if the user
-     * has added some data (e.g. CV) but not yet assigned a special visibility
-     * to that field, it wouldn't show up.
-     *
-     * @return array An array containing all available homepage elements
-     * together with their visibility settings in the form
-     * $name => $visibility.
-     */
-    public function getHomepageElements()
-    {
-        $homepage_visibility = get_local_visibility_by_id($this->id, 'homepage');
-        if (is_array(json_decode($homepage_visibility, true))) {
-            $homepage_visibility = json_decode($homepage_visibility, true);
-        } else {
-            $homepage_visibility = [];
-        }
-
-        // News
-        $news = StudipNews::GetNewsByRange($this->id, true);
-
-        // Non-private dates.
-        if (Config::get()->CALENDAR_ENABLE) {
-            $dates = CalendarDateAssignment::countBySql('range_id = ?', [$this->id]);
-        } else {
-            $dates = [];
-        }
-
-        // Votes
-        if (Config::get()->VOTE_ENABLE) {
-            $activeVotes  = Questionnaire::countBySQL("user_id = ? AND visible = '1'", [$this->id]);
-            $stoppedVotes = Questionnaire::countBySQL("user_id = ? AND visible = '0'", [$this->id]);
-        } else {
-            $activeVotes = [];
-            $stoppedVotes = [];
-        }
-
-        // Free datafields
-        $data_fields = DataFieldEntry::getDataFieldEntries($this->id, 'user');
-
-        // Now join all available elements with visibility settings.
-        $homepage_elements = [];
-
-        if (Avatar::getAvatar($this->id)->is_customized() && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['picture'])) {
-            $homepage_elements['picture'] = [
-                'name'        => _('Eigenes Bild'),
-                'visibility'  => $homepage_visibility['picture'] ?? get_default_homepage_visibility($this->id),
-                'extern'      => true,
-                'identifier'  => 'commondata'
-            ];
-        }
-
-        if ($this->info->motto && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['motto'])) {
-            $homepage_elements['motto'] = [
-                'name'       => _('Motto'),
-                'visibility' => $homepage_visibility['motto'] ?? get_default_homepage_visibility($this->id),
-                'identifier' => 'privatedata'
-            ];
-        }
-        if (Config::get()->ENABLE_SKYPE_INFO) {
-            if ($GLOBALS['user']->cfg->getValue('SKYPE_NAME') && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['skype_name'])) {
-                $homepage_elements['skype_name'] = [
-                    'name'       => _('Skype Name'),
-                    'visibility' => $homepage_visibility['skype_name'] ?? get_default_homepage_visibility($this->id),
-                    'identifier' => 'privatedata'
-                ];
-            }
-        }
-        if ($this->info->privatnr && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['Private Daten_phone'])) {
-            $homepage_elements['private_phone'] = [
-                'name'       => _('Private Telefonnummer'),
-                'visibility' => $homepage_visibility['private_phone'] ?? get_default_homepage_visibility($this->id),
-                'identifier' => 'privatedata'
-            ];
-        }
-        if ($this->info->privatcell && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['private_cell'])) {
-            $homepage_elements['private_cell'] = [
-                'name'       => _('Private Handynummer'),
-                'visibility' => $homepage_visibility['private_cell'] ?? get_default_homepage_visibility($this->id),
-                'identifier' => 'privatedata'
-            ];
-        }
-        if ($this->info->privadr && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['privadr'])) {
-            $homepage_elements['privadr'] = [
-                'name'         => _('Private Adresse'),
-                'visibility'   => $homepage_visibility['privadr'] ?? get_default_homepage_visibility($this->id),
-                'identifier'   => 'privatedata'
-            ];
-        }
-        if ($this->info->home && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['homepage'])) {
-            $homepage_elements['homepage'] = [
-                'name'        => _('Homepage-Adresse'),
-                'visibility'  => $homepage_visibility['homepage'] ?? get_default_homepage_visibility($this->id),
-                'extern'      => true,
-                'identifier'  => 'privatedata'
-            ];
-        }
-        if ($news && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['news'])) {
-            $homepage_elements['news'] = [
-                'name'       => _('Ankündigungen'),
-                'visibility' => $homepage_visibility['news'] ?? get_default_homepage_visibility($this->id),
-                'extern'     => true,
-                'identifier' => 'commondata'
-            ];
-        }
-        if (Config::get()->CALENDAR_ENABLE && $dates && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['dates'])) {
-            $homepage_elements['termine'] = [
-                'name'       => _('Termine'),
-                'visibility' => $homepage_visibility['termine'] ?? get_default_homepage_visibility($this->id),
-                'extern'     => true,
-                'identifier' => 'commondata'
-            ];
-        }
-        if (Config::get()->VOTE_ENABLE && ($activeVotes || $stoppedVotes) && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['votes'])) {
-            $homepage_elements['votes'] = [
-                'name'       => _('Fragebögen'),
-                'visibility' => $homepage_visibility['votes'] ?? get_default_homepage_visibility($this->id),
-                'identifier' => 'commondata'
-            ];
-        }
-
-        $query = "SELECT 1
-                  FROM user_inst
-                  LEFT JOIN Institute USING (Institut_id)
-                  WHERE user_id = ? AND inst_perms = 'user'";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$this->id]);
-        if ($statement->fetchColumn() && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['studying'])) {
-            $homepage_elements['studying'] = [
-                'name'       => _('Wo ich studiere'),
-                'visibility' => $homepage_visibility['studying'] ?? get_default_homepage_visibility($this->id),
-                'identifier' => 'studdata'
-            ];
-        }
-        if ($this->info->lebenslauf && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['lebenslauf'])) {
-            $homepage_elements['lebenslauf'] = [
-                'name'       => _('Lebenslauf'),
-                'visibility' => $homepage_visibility['lebenslauf'] ?? get_default_homepage_visibility($this->id),
-                'extern'     => true,
-                'identifier' => 'privatedata'
-            ];
-        }
-        if ($this->info->hobby && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['hobby'])) {
-            $homepage_elements['hobby'] = [
-                'name'       => _('Hobbys'),
-                'visibility' => $homepage_visibility['hobby'] ?? get_default_homepage_visibility($this->id),
-                'identifier' => 'privatedata'
-            ];
-        }
-        if ($this->info->publi && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['publi'])) {
-            $homepage_elements['publi'] = [
-                'name'       => _('Publikationen'),
-                'visibility' => $homepage_visibility['publi'] ?? get_default_homepage_visibility($this->id),
-                'extern'     => true,
-                'identifier' => 'privatedata'
-            ];
-        }
-        if ($this->info->schwerp && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['schwerp'])) {
-            $homepage_elements['schwerp'] = [
-                'name'       => _('Schwerpunkte'),
-                'visibility' => $homepage_visibility['schwerp'] ?? get_default_homepage_visibility($this->id),
-                'extern'     => true,
-                'identifier' => 'privatedata'
-            ];
-        }
-
-        if ($data_fields) {
-            foreach ($data_fields as $key => $field) {
-                if ($field->getValue() && $field->isEditable($this->perms) && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms][$key])) {
-                    $homepage_elements[$key] = [
-                        'name'       => $field->getName(),
-                        'visibility' => $homepage_visibility[$key] ?? get_default_homepage_visibility($this->id),
-                        'extern'     => true,
-                        'identifier' => 'additionaldata'
-                    ];
-                }
-            }
-        }
-
-        foreach ($this->profile_categories as $category) {
-            $homepage_elements['kat_' . $category->id] = [
-                'name'       => $category->name,
-                'visibility' => $homepage_visibility['kat_' . $category->id] ?? get_default_homepage_visibility($this->id),
-                'extern'     => true,
-                'identifier' => 'owncategory'
-            ];
-        }
-
-        return $homepage_elements;
-    }
-
-    /**
-     * Changes a user's email adress.
-     *
-     * @param string $email New email
-     * @param bool   $force Force update (even if nothing actually changed)
-     * @return bool
-     */
-    public function changeEmail($email, $force = false)
-    {
-        // Email did not actually change and update is not forced
-        if ($this->email === $email && !$force) {
-            return true;
-        }
-
-        // Is changing of email globally allowed?
-        if (!Config::get()->ALLOW_CHANGE_EMAIL) {
-            return false;
-        }
-
-        // Is changing of email allowed by auth plugin?
-        if (StudipAuthAbstract::CheckField('auth_user_md5.Email', $this->auth_plugin) || LockRules::check($this->user_id, 'email')) {
-            return false;
-        }
-
-        $validator          = new email_validation_class; ## Klasse zum Ueberpruefen der Eingaben
-        $validator->timeout = 10;
-        $REMOTE_ADDR        = $_SERVER['REMOTE_ADDR'];
-        $Zeit               = date('H:i:s, d.m.Y');
-
-        // accept only registered domains if set
-        $email_restriction = trim(Config::get()->EMAIL_DOMAIN_RESTRICTION);
-        if (!$validator->ValidateEmailAddress($email, $email_restriction)) {
-            if ($email_restriction) {
-                $email_restriction_msg_part = '';
-                $email_restriction_parts    = explode(',', $email_restriction);
-                for ($email_restriction_count = 0; $email_restriction_count < count($email_restriction_parts); $email_restriction_count++) {
-                    if ($email_restriction_count == count($email_restriction_parts) - 1) {
-                        $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . '<br>';
-                    } else if (($email_restriction_count + 1) % 3) {
-                        $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . ', ';
-                    } else {
-                        $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . ',<br>';
-                    }
-                }
-                PageLayout::postError(sprintf(_('Die E-Mail-Adresse fehlt, ist falsch geschrieben oder gehört nicht zu folgenden Domains:%s'),
-                    '<br>' . htmlReady($email_restriction_msg_part)));
-            } else {
-                PageLayout::postError(_('Die E-Mail-Adresse fehlt oder ist falsch geschrieben!'));
-            }
-            return false;
-        }
-
-        if (!$validator->ValidateEmailHost($email)) {     // Mailserver nicht erreichbar, ablehnen
-            PageLayout::postError(_('Der Mailserver ist nicht erreichbar. Bitte überprüfen Sie, ob Sie E-Mails mit der angegebenen Adresse verschicken können!'));
-            return false;
-        } else {       // Server ereichbar
-            if (!$validator->ValidateEmailBox($email)) {    // aber user unbekannt. Mail an abuse!
-                StudipMail::sendAbuseMessage("edit_about", "Emailbox unbekannt\n\nUser: " . $this->username . "\nEmail: ".$email ."\n\nIP: " . $REMOTE_ADDR ." \nZeit: " . $Zeit . "\n");
-                PageLayout::postError(_('Die angegebene E-Mail-Adresse ist nicht erreichbar. Bitte überprüfen Sie Ihre Angaben!'));
-                return false;
-            }
-        }
-
-        if (self::countBySql('email = ? AND user_id != ?', [$email, $this->user_id])) {
-            PageLayout::postError(sprintf(_('Die angegebene E-Mail-Adresse wird bereits von einem anderen Benutzer (%s) verwendet. Bitte geben Sie eine andere E-Mail-Adresse an.'),
-                htmlReady($this->getFullName())));
-            return false;
-        }
-
-        if (StudipAuthAbstract::CheckField('auth_user_md5.validation_key', $this->auth_plugin)) {
-            PageLayout::postSuccess(_('Ihre E-Mail-Adresse wurde geändert!'));
-        } else {
-            // auth_plugin does not map validation_key (what if...?)
-
-            // generate 10 char activation key
-            $key = '';
-            mt_srand((double)microtime() * 1000000);
-            for ($i = 1; $i <= 10; $i++) {
-                $temp = mt_rand() % 36;
-                if ($temp < 10)
-                    $temp += 48;   // 0 = chr(48), 9 = chr(57)
-                else
-                    $temp += 87;   // a = chr(97), z = chr(122)
-                $key .= chr($temp);
-            }
-            $this->validation_key = $key;
-
-            $activatation_url = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'activate_email.php?uid=' . $this->user_id . '&key=' . $this->validation_key;
-            // include language-specific subject and mailbody with fallback to german
-            $lang = getUserLanguagePath($this->id);
-            if($lang == '') {
-                $lang = 'de';
-            }
-
-            // TODO: This should be refactored so that the included file returns an array
-            include "locale/$lang/LC_MAILS/change_self_mail.inc.php"; // Defines $subject and $mailbody
-
-            $mail = StudipMail::sendMessage($email, $subject ?? '', $mailbody ?? '');
-
-            if (!$mail) {
-                return true;
-            }
-
-            $this->store();
-
-            PageLayout::postInfo(sprintf(_('An Ihre neue E-Mail-Adresse <b>%s</b> wurde ein Aktivierungslink geschickt, dem Sie folgen müssen bevor Sie sich das nächste mal einloggen können.'), htmlReady($email)));
-            StudipLog::log('USER_NEWPWD', $this->user_id);
-        }
-        return true;
-    }
-
-    /**
-     * Merge an user ($old_id) to another user ($new_id).  This is a part of the
-     * old numit-plugin.
-     *
-     * @param string $old_user
-     * @param string $new_user
-     * @param boolean $identity merge identity (if true)
-     *
-     * @return array() messages to display after migration
-     * @deprecated
-     */
-    public static function convert($old_id, $new_id, $identity = false)
-    {
-        NotificationCenter::postNotification('UserWillMigrate', $old_id, $new_id);
-
-        $messages = [];
-
-        //Identitätsrelevante Daten migrieren
-        if ($identity) {
-            // Veranstaltungseintragungen
-            self::removeDoubles('seminar_user', 'Seminar_id', $new_id, $old_id);
-            $query = "UPDATE IGNORE seminar_user SET user_id = ? WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            self::removeDoubles('admission_seminar_user', 'seminar_id', $new_id, $old_id);
-            $query = "UPDATE IGNORE admission_seminar_user SET user_id = ? WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            self::removeDoubles('termin_related_persons', 'range_id', $new_id, $old_id);
-            $query = "UPDATE IGNORE `termin_related_persons` SET `user_id` = ? WHERE `user_id` = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            // Persönliche Infos
-            $query = "DELETE FROM user_info WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id]);
-
-            $query = "UPDATE IGNORE user_info SET user_id = ? WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            // Migrate registration timestamp by creating a new empty user info
-            // entry
-            $query = "INSERT INTO `user_info` (`user_id`, `mkdate`, `chdate`)
-                      SELECT ?, `mkdate`, `chdate`
-                      FROM `user_info`
-                      WHERE `user_id` = ?";
-            DBManager::get()->execute($query, [$old_id, $new_id]);
-
-            // Studiengänge
-            self::removeDoubles('user_studiengang', 'fach_id', $new_id, $old_id);
-            $query = "UPDATE IGNORE user_studiengang SET user_id = ? WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            // Eigene Kategorien
-            $query = "UPDATE IGNORE kategorien SET range_id = ? WHERE range_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            // Institute
-            self::removeDoubles('user_inst', 'Institut_id', $new_id, $old_id);
-            $query = "UPDATE IGNORE user_inst SET user_id = ? WHERE user_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            // Generische Datenfelder zusammenführen (bestehende Einträge des
-            // "neuen" Nutzers werden dabei nicht überschrieben)
-            $old_user = User::find($old_id);
-            $old_user->datafields->each(function ($field) use ($new_id) {
-                if (!$field->isNew() && $field->content !== null) {
-                    $entry = new DatafieldEntryModel([$field->datafield_id, $new_id, $field->sec_range_id, $field->lang]);
-
-                    if ($entry->content === null || $entry->content === '' || $entry->content === 'default_value') {
-                        $entry->content = $field->content;
-                        $entry->store();
-                    }
-                }
-            });
-
-            # Datenfelder des alten Nutzers leeren
-            $old_user->datafields = [];
-            $old_user->store();
-
-            //
-
-            //Buddys
-            $query = "UPDATE IGNORE contact SET owner_id = ? WHERE owner_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$new_id, $old_id]);
-
-            // Avatar
-            $old_avatar = Avatar::getAvatar($old_id);
-            $new_avatar = Avatar::getAvatar($new_id);
-            if ($old_avatar->is_customized()) {
-                if (!$new_avatar->is_customized()) {
-                    $avatar_file = $old_avatar->getFilename(Avatar::NORMAL);
-                    $new_avatar->createFrom($avatar_file);
-                }
-                $old_avatar->reset();
-            }
-
-            $messages[] = _('Identitätsrelevante Daten wurden migriert.');
-        }
-
-        // Restliche Daten übertragen
-
-        // ForumsModule migrieren
-        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
-            $plugin->migrateUser($old_id, $new_id);
-        }
-
-        // Dateieintragungen und Ordner
-        // TODO (mlunzena) should post a notification
-        $query = "UPDATE IGNORE file_refs SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE files SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE folders SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        //Kalender
-        $query = "UPDATE IGNORE `calendar_date_assignments` SET `range_id` = ? WHERE `range_id` = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE `calendar_dates` SET `author_id` = ? WHERE `author_id` = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE `calendar_dates` SET `editor_id` = ? WHERE `editor_id` = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        //Archiv
-        self::removeDoubles('archiv_user', 'seminar_id', $new_id, $old_id);
-        $query = "UPDATE IGNORE archiv_user SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // Kategorien
-        $query = "UPDATE IGNORE kategorien SET range_id = ? WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // Nachrichten (Interne)
-        $query = "UPDATE IGNORE message SET autor_id = ? WHERE autor_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        self::removeDoubles('message_user', 'message_id', $new_id, $old_id);
-        $query = "UPDATE IGNORE message_user SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // News
-        $query = "UPDATE IGNORE news SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE news_range SET range_id = ? WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // Informationsseiten
-        $query = "UPDATE IGNORE scm SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // Statusgruppeneinträge
-        self::removeDoubles('statusgruppe_user', 'statusgruppe_id', $new_id, $old_id);
-        $query = "UPDATE IGNORE statusgruppe_user SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // Termine
-        $query = "UPDATE IGNORE termine SET autor_id = ? WHERE autor_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        //Votings
-        $query = "UPDATE IGNORE questionnaires SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE questionnaire_assignments SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE questionnaire_assignments SET range_id = ? WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        self::removeDoubles('questionnaire_anonymous_answers', 'questionnaire_id', $new_id, $old_id);
-        $query = "UPDATE IGNORE questionnaire_anonymous_answers SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        self::removeDoubles('questionnaire_answers', 'question_id', $new_id, $old_id);
-        $query = "UPDATE IGNORE questionnaire_answers SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        //Wiki
-        $query = "UPDATE IGNORE wiki SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE wiki_locks SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        //Adressbucheinträge
-        $query = "UPDATE IGNORE contact SET owner_id = ? WHERE owner_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        //Blubber
-        $query = "UPDATE IGNORE blubber_comments SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-        $query = "UPDATE IGNORE blubber_mentions SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-        $query = "UPDATE IGNORE blubber_threads SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-        $query = "UPDATE IGNORE blubber_threads_followstates SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        // Consultations
-        $query = "UPDATE IGNORE consultation_blocks SET range_id = ? WHERE range_id = ? AND range_type = 'user'";
-        DBManager::get()->execute($query, [$new_id, $old_id]);
-        $query = "UPDATE IGNORE consultation_bookings SET user_id = ? WHERE user_id = ?";
-        DBManager::get()->execute($query, [$new_id, $old_id]);
-        $query = "UPDATE IGNORE consultation_events SET user_id = ? WHERE user_id = ?";
-        DBManager::get()->execute($query, [$new_id, $old_id]);
-        $query = "UPDATE IGNORE consultation_responsibilities SET range_id = ? WHERE range_id = ?
-                                                               AND range_type = 'user'";
-        DBManager::get()->execute($query, [$new_id, $old_id]);
-
-        NotificationCenter::postNotification('UserDidMigrate', $old_id, $new_id);
-
-        $messages[] = _('Dateien, Termine, Adressbuch, Nachrichten und weitere Daten wurden migriert.');
-        return $messages;
-    }
-
-    /**
-     * Delete double entries of the old and new user. This is a part of the old
-     * numit-plugin.
-     *
-     * @param string $table
-     * @param string $field
-     * @param md5 $new_id
-     * @param md5 $old_id
-     * @deprecated
-     */
-    private static function removeDoubles($table, $field, $new_id, $old_id)
-    {
-        $items = [];
-
-        $query = "SELECT a.{$field} AS field_item
-                  FROM {$table} AS a, {$table} AS b
-                  WHERE a.user_id = ? AND b.user_id = ? AND a.{$field} = b.{$field}";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-        $results = $statement->fetchAll(PDO::FETCH_ASSOC);
-
-        foreach ($results as $value) {
-            array_push($items, $value['field_item']);
-        }
-
-        if (!empty($items)) {
-            $query = "DELETE FROM `{$table}`
-                      WHERE user_id = :user_id AND `{$field}` IN (:items)";
-
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':user_id', $new_id);
-            $statement->bindValue(':items', $items, StudipPDO::PARAM_ARRAY);
-            $statement->execute();
-        }
-    }
-
-    /**
-     * Returns a descriptive text for the range type.
-     *
-     * @return string
-     */
-    public function describeRange()
-    {
-        return _('NutzerIn');
-    }
-
-    /**
-     * Returns a unique identificator for the range type.
-     *
-     * @return string
-     */
-    public function getRangeType()
-    {
-        return 'user';
-    }
-
-    /**
-     * Returns the id of the current range
-     *
-     * @return mixed (string|int)
-     */
-    public function getRangeId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfiguration()
-    {
-        return UserConfig::get($this);
-    }
-
-    /**
-     * Decides whether the user may access the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     */
-    public function isAccessibleToUser($user_id = null)
-    {
-        // TODO: Visibility checks
-        if ($user_id === null) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        return $user_id === $this->user_id
-            || static::find($user_id)->perms === 'root'
-            || !in_array(static::find($this->user_id)->visible, ['no', 'never']);
-    }
-
-    /**
-     * Decides whether the user may edit/alter the range.
-     *
-     * @param string|null $user_id Optional id of a user, defaults to current user
-     * @return bool
-     */
-    public function isEditableByUser($user_id = null)
-    {
-        if ($user_id === null) {
-            $user_id = $GLOBALS['user']->id;
-        }
-        return $user_id === $this->user_id
-            || $GLOBALS['perm']->have_profile_perm('admin', $this->user_id)
-            || Deputy::isDeputy($user_id, $this->user_id, true)
-            || static::find($user_id)->perms === 'root';
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = User::findBySQL("user_id = ?", [$storage->user_id]);
-
-        if ($sorm) {
-            $limit ='user_id username password perms vorname nachname email validation_key auth_plugin locked lock_comment locked_by visible';
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray($limit);
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Kerndaten'), 'auth_user_md5', $field_data);
-            }
-
-            $limit = 'user_id hobby lebenslauf publi schwerp home privatnr privatcell privadr score geschlecht mkdate chdate title_front title_rear preferred_language smsforward_copy smsforward_rec email_forward motto lock_rule';
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray($limit);
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Benutzer Informationen'), 'user_info', $field_data);
-            }
-        }
-
-        $data = DBManager::get()->fetchAll('SELECT * FROM object_user_visits WHERE user_id = ?', [$storage->user_id]);
-        $storage->addTabularData(_('Objekt Aufrufe'), 'object_user_visits', $data);
-    }
-
-    /**
-     * This callback is called after deleting a User.
-     * It removes feedback entries that are associated with the User.
-     */
-    public function cbRemoveFeedback()
-    {
-        FeedbackElement::deleteBySQL('user_id = ?', [$this->id]);
-        FeedbackEntry::deleteBySQL('user_id = ?', [$this->id]);
-    }
-
-    /**
-     * This callback is called after deleting a User.
-     * It removes forum visit entries that are associated with the User.
-     */
-    public function cbRemoveForumVisits()
-    {
-        $query = "DELETE FROM `forum_visits`
-                  WHERE `user_id` = ?";
-        DBManager::get()->execute($query, [$this->id]);
-    }
-
-    public function cbClearCaches()
-    {
-        if ($this->isFieldDirty('perms')) {
-            RolePersistence::expireUserCache($this->user_id);
-        }
-    }
-
-
-    /**
-     * @see Range::__toString()
-     */
-    public function __toString() : string
-    {
-        return $this->getFullName();
-    }
-
-    /**
-     * Returns whether a user is blocked either explicitely due to the "locked"
-     * property or by a set expiration date.
-     *
-     * @return bool
-     * @since Stud.IP 5.4
-     */
-    public function isBlocked(): bool
-    {
-        return $this->locked || $this->isExpired();
-    }
-
-    /**
-     * Returns whether a user account is expired.
-     *
-     * @return bool
-     * @since Stud.IP 5.4
-     */
-    public function isExpired(): bool
-    {
-        return $this->config->EXPIRATION_DATE > 0
-            && $this->config->EXPIRATION_DATE < time();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public static function getCalendarOwner(string $owner_id): ?\Studip\Calendar\Owner
-    {
-        return self::find($owner_id);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isCalendarReadable(?string $user_id = null): bool
-    {
-        if ($user_id === null) {
-            $user_id = self::findCurrent()->id;
-        }
-
-        if ($this->id === $user_id) {
-            //The owner can always read their own calendar.
-            return true;
-        }
-        return Contact::countBySql(
-            "`owner_id` = :this_user_id AND `user_id` = :other_user_id
-            AND `calendar_permissions` <> ''",
-            ['this_user_id' => $this->id, 'other_user_id' => $user_id]
-        ) > 0;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isCalendarWritable(string $user_id = null): bool
-    {
-        if ($user_id === null) {
-            $user_id = self::findCurrent()->id;
-        }
-
-        if ($this->id === $user_id) {
-            //The owner can always write their own calendar.
-            return true;
-        }
-        if (Config::get()->CALENDAR_GRANT_ALL_INSERT) {
-            //All users can write in all users calendars.
-            return true;
-        }
-        return Contact::countBySql(
-                "`owner_id` = :this_user_id AND `user_id` = :other_user_id
-            AND `calendar_permissions` = 'WRITE'",
-            ['this_user_id' => $this->id, 'other_user_id' => $user_id]
-        ) > 0;
-    }
-
-    /**
-     * Delivers the gender as text
-     * @return string
-     */
-    public function getGender(): string
-    {
-        switch ($this->geschlecht) {
-            case 1:
-                return _('männlich');
-            case 2:
-                return _('weiblich');
-            case 3:
-                return _('divers');
-            default:
-                return _('unbekannt');
-        }
-    }
-
-    /**
-     * Delivers the gender as text
-     * @return string
-     */
-    public function getSalutation(): string
-    {
-        switch ($this->geschlecht) {
-            case 1:
-                return _('Herr');
-            case 2:
-                return _('Frau');
-            default:
-                return '';
-        }
-    }
-
-    /*
-     * Returns whether the user has the given permission (for the given range).
-     *
-     * @param string     $permission
-     * @param Range|null $for_range
-     *
-     * @return bool
-     */
-    public function hasPermissionLevel(string $permission, ?Range $for_range = null): bool
-    {
-        if (func_num_args() === 1) {
-            return $GLOBALS['perm']->have_perm($permission, $this->id);
-        }
-
-        if ($for_range === null) {
-            throw new Exception('No valid range given');
-        }
-
-        if ($for_range instanceof User) {
-            return $GLOBALS['perm']->have_profile_perm($permission, $for_range->id, $this->id);
-        }
-
-        return $GLOBALS['perm']->have_studip_perm($permission, $for_range->id, $this->id);
-    }
-}
diff --git a/lib/models/User.php b/lib/models/User.php
new file mode 100644
index 0000000..4894031
--- /dev/null
+++ b/lib/models/User.php
@@ -0,0 +1,1650 @@
+<?php
+/**
+ * User.class.php
+ * model class for combined auth_user_md5/user_info record
+ * this class represents one user, the attributes from tables
+ * auth_user_md5 and user_info were merged.
+ *
+ * @code
+ * $a_user = User::find($id);
+ * $another_users_email = User::findByUsername($username)->email;
+ * $a_user->email = $another_users_email;
+ * $a_user->store();
+ * @endcode
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2011 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for user_id
+ * @property string $user_id database column
+ * @property string $username database column
+ * @property string $password database column
+ * @property string $perms database column
+ * @property string $vorname database column
+ * @property string $nachname database column
+ * @property string $email database column
+ * @property string $matriculation_number database column
+ * @property string $validation_key database column
+ * @property string|null $auth_plugin database column
+ * @property int $locked database column
+ * @property string|null $lock_comment database column
+ * @property string|null $locked_by database column
+ * @property string $visible database column
+ * @property SimpleORMapCollection|CourseMember[] $course_memberships has_many CourseMember
+ * @property SimpleORMapCollection|InstituteMember[] $institute_memberships has_many InstituteMember
+ * @property SimpleORMapCollection|AdmissionApplication[] $admission_applications has_many AdmissionApplication
+ * @property SimpleORMapCollection|ArchivedCourseMember[] $archived_course_memberships has_many ArchivedCourseMember
+ * @property SimpleORMapCollection|DatafieldEntryModel[] $datafields has_many DatafieldEntryModel
+ * @property SimpleORMapCollection|UserStudyCourse[] $studycourses has_many UserStudyCourse
+ * @property SimpleORMapCollection|Statusgruppen[] $contactgroups has_many Statusgruppen
+ * @property SimpleORMapCollection|ResourcePermission[] $resource_permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceTemporaryPermission[] $resource_temporary_permissions has_many ResourceTemporaryPermission
+ * @property SimpleORMapCollection|ConsultationBlock[] $consultation_blocks has_many ConsultationBlock
+ * @property SimpleORMapCollection|ConsultationBooking[] $consultation_bookings has_many ConsultationBooking
+ * @property SimpleORMapCollection|ConsultationResponsibility[] $consultation_responsibilities has_many ConsultationResponsibility
+ * @property SimpleORMapCollection|Kategorie[] $profile_categories has_many Kategorie
+ * @property SimpleORMapCollection|MvvContact[] $mvv_assignments has_many MvvContact
+ * @property SimpleORMapCollection|CourseMemberNotification[] $course_notifications has_many CourseMemberNotification
+ * @property SimpleORMapCollection|BlubberThread[] $blubber_threads has_many BlubberThread
+ * @property SimpleORMapCollection|BlubberComment[] $blubber_comments has_many BlubberComment
+ * @property SimpleORMapCollection|BlubberMention[] $blubber_mentions has_many BlubberMention
+ * @property UserInfo $info has_one UserInfo
+ * @property UserOnline $online has_one UserOnline
+ * @property Courseware\Unit $courseware_units has_one Courseware\Unit
+ * @property SimpleORMapCollection|User[] $contacts has_and_belongs_to_many User
+ * @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain
+ * @property-read mixed $config additional field
+ * @property mixed $hobby additional field
+ * @property mixed $lebenslauf additional field
+ * @property mixed $publi additional field
+ * @property mixed $schwerp additional field
+ * @property mixed $home additional field
+ * @property mixed $privatnr additional field
+ * @property mixed $privatcell additional field
+ * @property mixed $privadr additional field
+ * @property mixed $score additional field
+ * @property mixed $geschlecht additional field
+ * @property mixed $mkdate additional field
+ * @property mixed $chdate additional field
+ * @property mixed $title_front additional field
+ * @property mixed $title_rear additional field
+ * @property mixed $preferred_language additional field
+ * @property mixed $smsforward_copy additional field
+ * @property mixed $smsforward_rec additional field
+ * @property mixed $email_forward additional field
+ * @property mixed $motto additional field
+ * @property mixed $lock_rule additional field
+ * @property mixed $oercampus_description additional field
+ */
+class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\Owner
+{
+    /**
+     *
+     */
+    protected static function configure($config = [])
+    {
+        $config['has_many']['course_memberships'] = [
+            'class_name' => CourseMember::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['institute_memberships'] = [
+            'class_name' => InstituteMember::class,
+            'order_by'   => 'ORDER BY priority ASC',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['admission_applications'] = [
+            'class_name' => AdmissionApplication::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['archived_course_memberships'] = [
+            'class_name' => ArchivedCourseMember::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['datafields'] = [
+            'class_name'  => DatafieldEntryModel::class,
+            'foreign_key' => function ($user) {
+                return [$user];
+            },
+            'assoc_foreign_key' => function ($model, $params) {
+                $model->setValue('range_id', $params[0]->id);
+            },
+            'assoc_func' => 'findByModel',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['studycourses'] = [
+            'class_name' => UserStudyCourse::class,
+            'assoc_func' => 'findByUser',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_and_belongs_to_many']['contacts'] = [
+            'class_name'     => User::class,
+            'thru_table'     => 'contact',
+            'thru_key'       => 'owner_id',
+            'thru_assoc_key' => 'user_id',
+            'order_by'       => 'ORDER BY Nachname, Vorname',
+            'on_delete'      => 'delete',
+            'on_store'       => 'store',
+        ];
+        $config['has_many']['contactgroups'] = [
+            'class_name'        => Statusgruppen::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+        ];
+        $config['has_one']['info'] = [
+            'class_name' => UserInfo::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_one']['online'] = [
+            'class_name' => UserOnline::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store',
+        ];
+        $config['has_many']['resource_permissions'] = [
+            'class_name' => ResourcePermission::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+        $config['has_many']['resource_temporary_permissions'] = [
+            'class_name' => ResourceTemporaryPermission::class,
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+        $config['has_many']['consultation_blocks'] = [
+            'class_name'        => ConsultationBlock::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+        ];
+        $config['has_many']['consultation_bookings'] = [
+            'class_name' => ConsultationBooking::class,
+            'on_delete'  => 'delete',
+        ];
+        $config['has_many']['consultation_responsibilities'] = [
+            'class_name'        => ConsultationResponsibility::class,
+            'assoc_func'        => 'findByUserId',
+            'on_delete'         => 'delete',
+        ];
+        $config['has_many']['profile_categories'] = [
+            'class_name'        => Kategorie::class,
+            'assoc_foreign_key' => 'range_id',
+            'on_delete'         => 'delete',
+        ];
+
+
+        $config['has_many']['mvv_assignments'] = [
+            'class_name'        => MvvContact::class,
+            'assoc_foreign_key' => 'contact_id',
+            'on_delete'         => 'delete'
+        ];
+
+        $config['has_and_belongs_to_many']['domains'] = [
+            'class_name'        => UserDomain::class,
+            'thru_table'        => 'user_userdomains',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store',
+            'order_by'          => 'ORDER BY name',
+        ];
+
+        $config['has_many']['course_notifications'] = [
+            'class_name'        => CourseMemberNotification::class,
+            'on_delete'         => 'delete',
+        ];
+
+        $config['has_many']['extern_pages_configs'] = [
+            'class_name' => ExternPageConfig::class,
+            'assoc_foreign_key' => 'author_id'
+        ];
+
+        // Blubber relations
+        $config['has_many']['blubber_threads'] = [
+            'class_name' => BlubberThread::class,
+            'on_delete'  => 'delete',
+        ];
+        $config['has_many']['blubber_comments'] = [
+            'class_name' => BlubberComment::class,
+            'on_delete'  => 'delete',
+        ];
+        $config['has_many']['blubber_mentions'] = [
+            'class_name' => BlubberMention::class,
+            'on_delete'  => 'delete',
+        ];
+
+        $config['additional_fields']['config']['get'] = function ($user) {
+            return UserConfig::get($user->id);
+        };
+        $config['additional_fields']['gender']['get'] = 'getGender';
+        $config['additional_fields']['salutation']['get'] = 'getSalutation';
+
+        $config['registered_callbacks']['after_delete'][] = 'cbRemoveFeedback';
+        $config['registered_callbacks']['after_delete'][] = 'cbRemoveForumVisits';
+        $config['registered_callbacks']['before_store'][] = 'cbClearCaches';
+        $config['registered_callbacks']['before_store'][] = 'cbStudipLog';
+
+        $info = new UserInfo();
+        $info_meta = $info->getTableMetadata();
+        foreach ($info_meta ['fields'] as $field => $meta) {
+            if ($field !== $info_meta['pk'][0]) {
+                $config['additional_fields'][$field] = [
+                    'get'            => '_getAdditionalValueFromRelation',
+                    'set'            => '_setAdditionalValueFromRelation',
+                    'relation'       => 'info',
+                    'relation_field' => $field,
+                ];
+            }
+        }
+
+        parent::configure($config);
+    }
+
+    /**
+     * @param $type string type of callback
+     */
+    protected function cbStudipLog($type)
+    {
+        if ($type == 'before_store' && !$this->isNew()) {
+            if ($this->isFieldDirty('locked') && $this->isFieldDirty('lock_comment')) {
+                if ((int)$this->locked === 1) {
+                    StudipLog::log('USER_LOCK',
+                        $this->user_id,
+                        null,
+                        sprintf(
+                            'Kommentar: %s',
+                            $this->lock_comment
+                        )
+                    );
+                } else {
+                    StudipLog::log('USER_UNLOCK',
+                        $this->user_id
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the currently authenticated user.
+     *
+     * @return ?User User
+     */
+    public static function findCurrent()
+    {
+        if (isset($GLOBALS['user']) && is_object($GLOBALS['user'])) {
+            return $GLOBALS['user']->getAuthenticatedUser();
+        }
+
+        return null;
+    }
+
+    /**
+     * build new object with given data
+     *
+     * @param $data array assoc array of record
+     * @return User
+     */
+    public static function build($data, $is_new = true)
+    {
+        // Note: This should be used instead of `new static()` since PHPStan
+        $class = get_called_class();
+        $user = new $class();
+
+        $user->info = new UserInfo();
+        $user->setData($data);
+        $user->setNew($is_new);
+        foreach (array_keys($user->db_fields()) as $field) {
+            $user->content_db[$field] = $user->content[$field];
+        }
+        $user->info = UserInfo::build($data, $is_new);
+        return $user;
+    }
+
+    /**
+     * Returns user object including user_info
+     *
+     * @param string $id
+     * @return ?User User
+     */
+    public static function findFull($id)
+    {
+        $sql = "SELECT *
+                FROM auth_user_md5
+                LEFT JOIN user_info USING (user_id)
+                WHERE user_id = ?";
+        $data = DBManager::get()->fetchOne($sql, [$id]);
+        if ($data) {
+            return static::buildExisting($data);
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns user objects including user_info
+     *
+     * @param array $ids
+     * @param string $order_by
+     * @return User[] User
+     */
+    public static function findFullMany($ids, $order_by = '')
+    {
+        $sql = "SELECT *
+                FROM auth_user_md5
+                LEFT JOIN user_info USING (user_id)
+                WHERE user_id IN (?) " . $order_by;
+        $data = DBManager::get()->fetchAll($sql, [$ids], [static::class, 'buildExisting']);
+        return $data;
+    }
+
+    /**
+     * return user object for given username
+     *
+     * @param string $username a username
+     * @return User
+     */
+    public static function findByUsername($username)
+    {
+        return parent::findOneByUsername($username);
+    }
+
+    /**
+     * returns an array of User-objects that have the given value in the
+     * given datafield.
+     * @param string $datafield_id
+     * @param array of User
+     */
+    public static function findByDatafield($datafield_id, $value)
+    {
+        return static::findMany(
+            array_column(
+                DatafieldEntryModel::findBySQL(
+                    'datafield_id = :datafield_id AND content = :value',
+                    compact('datafield_id', 'value')
+                ),
+                'range_id'
+            )
+        );
+    }
+
+    /**
+     * Wraps a search parameter in %..% if the parameter itself does not
+     * contain % or _.
+     *
+     * @param String $needle Search parameter
+     * @return String containing the wrapped needle if neccessary
+     */
+    private static function searchParam($needle)
+    {
+        if (preg_match('/[%_]/S', $needle)) {
+            return $needle;
+        }
+
+        return '%' . $needle . '%';
+    }
+
+    /**
+     * Temporary migrate to User.class.php
+     *
+     * @param $attributes
+     * @return array
+     */
+    public static function search($attributes)
+    {
+        $params = [];
+        $joins  = [];
+        $where  = [];
+
+        $query = "SELECT au.*, ui.*
+                  FROM `auth_user_md5` au
+                  LEFT JOIN `user_online` uo ON (au.`user_id` = uo.`user_id`)
+                  LEFT JOIN `user_info` ui ON (au.`user_id` = ui.`user_id`)";
+
+        if (!empty($attributes['username'])) {
+            $where[] =  "au.`username` like :username";
+            $params[':username'] = self::searchParam($attributes['username']);
+        }
+
+        if (!empty($attributes['vorname'])) {
+            $where[] = "au.`Vorname` LIKE :vorname";
+            $params[':vorname'] = self::searchParam($attributes['vorname']);
+        }
+
+        if (!empty($attributes['nachname'])) {
+            $where[] = "au.`Nachname` LIKE :nachname";
+            $params[':nachname'] = self::searchParam($attributes['nachname']);
+        }
+
+        if (!empty($attributes['email'])) {
+            $where[] = "au.`Email` LIKE :email";
+            $params[':email'] = self::searchParam($attributes['email']);
+        }
+
+        //permissions
+        if (!empty($attributes['perm']) && $attributes['perm'] !== 'alle') {
+            $where[] = "au.`perms` = :perms";
+            $params[':perms'] = $attributes['perm'];
+        }
+
+        //locked user
+        if (!empty($attributes['locked'])) {
+            $where[] = "au.`locked` = 1";
+        }
+
+        // show only users who are not lecturers
+        if (!empty($attributes['show_only_not_lectures'])) {
+            $where[] = "au.`user_id` NOT IN (SELECT `user_id` FROM `seminar_user` WHERE `status` = 'dozent') ";
+        }
+
+        if (!empty($attributes['auth_plugins'])) {
+            $where[] = "IFNULL(`auth_plugin`, 'preliminary') = :auth_plugins ";
+            $params[':auth_plugins'] = $attributes['auth_plugins'];
+        }
+
+        //inactivity
+        if (!is_null($attributes['inaktiv']) && $attributes['inaktiv'][0] != 'nie') {
+            $comp = in_array(trim($attributes['inaktiv'][0]), ['=', '>', '<=']) ? $attributes['inaktiv'][0] : '=';
+            $days = (int)$attributes['inaktiv'][1];
+            $where[] = "uo.`last_lifesign` {$comp} UNIX_TIMESTAMP(TIMESTAMPADD(DAY, -{$days}, NOW())) ";
+        } elseif (!is_null($attributes['inaktiv'])) {
+            $where[] = "uo.`last_lifesign` IS NULL";
+        }
+
+        //datafields
+        if (
+            !empty($attributes['datafields'])
+            && is_array($attributes['datafields'])
+            && count($attributes['datafields']) > 0
+        ) {
+            $joins[] = "LEFT JOIN `datafields_entries` de ON (de.`range_id` = au.`user_id`)";
+            foreach ($attributes['datafields'] as $id => $entry) {
+                $where[] = "de.`datafield_id` = :df_id_". $id;
+                $where[] = "de.`content` LIKE :df_content_". $id;
+                $params[':df_id_' . $id] = $id;
+                $params[':df_content_' . $id] = $entry;
+            }
+        }
+
+        // roles
+        if (!empty($attributes['roles'])) {
+            $joins[] = "LEFT JOIN `roles_user` ON roles_user.`userid` = au.`user_id`";
+            $where[] = "roles_user.`roleid` IN (:roles)";
+            $params[':roles'] = $attributes['roles'];
+        }
+
+        // userdomains
+        if (!empty($attributes['userdomains'])) {
+            $joins[] = "LEFT JOIN `user_userdomains` uud ON (au.`user_id` = uud.`user_id`)";
+            $joins[] = "LEFT JOIN `userdomains` uds USING (`userdomain_id`)";
+            if ($attributes['userdomains'] === 'null-domain') {
+                $where[] = "`userdomain_id` IS NULL ";
+            } else {
+                $where[] = "userdomain_id = :userdomains";
+                $params[':userdomains'] = $attributes['userdomains'];
+            }
+        }
+
+        // degree or studycourse
+        if (!empty($attributes['degree']) || !empty($attributes['studycourse']) || !empty($attributes['fachsem'])) {
+            $joins[] = "LEFT JOIN `user_studiengang` us ON (us.`user_id` = au.`user_id`)";
+            if (!empty($attributes['degree'])) {
+                $where[] = "us.`abschluss_id` IN (:degree)";
+                $params[':degree'] = $attributes['degree'];
+            }
+
+            if (!empty($attributes['studycourse'])) {
+                $where[] = "us.`fach_id` IN (:studycourse)";
+                $params[':studycourse'] = $attributes['studycourse'];
+            }
+
+            if(!empty($attributes['fachsem'])) {
+                $where[] = 'us.`semester` = :fachsem';
+                $params[':fachsem'] = $attributes['fachsem'];
+            }
+        }
+
+        if (!empty($attributes['institute'])) {
+            $joins[] = "LEFT JOIN `user_inst` uis ON uis.`user_id` = au.`user_id`";
+            $where[] = "uis.`Institut_id` = :institute";
+            $params[':institute'] = $attributes['institute'];
+        }
+
+        $query .= implode(' ', $joins);
+        $query .= " WHERE 1 AND ";
+        $query .= implode(' AND ', $where);
+        $query .= " GROUP BY au.`user_id` ";
+
+        if (!empty($attributes['sortby'])) {
+            //sortieren
+            switch ($attributes['sortby']) {
+                case "perms":
+                    $query .= "ORDER BY au.`perms` {$attributes['order']}, au.`username`";
+                    break;
+                case "Vorname":
+                    $query .= "ORDER BY au.`Vorname` {$attributes['order']}, au.`Nachname`";
+                    break;
+                case "Nachname":
+                    $query .= "ORDER BY au.`Nachname` {$attributes['order']}, au.`Vorname`";
+                    break;
+                case "Email":
+                    $query .= "ORDER BY au.`Email` {$attributes['order']}, au.`username`";
+                    break;
+                case 'matriculation_number':
+                    $query .= "ORDER BY au.`matriculation_number` {$attributes['order']}, au.`username`";
+                    break;
+                case "changed":
+                    $query .= "ORDER BY uo.`last_lifesign` {$attributes['order']}, au.`username`";
+                    break;
+                case "mkdate":
+                    $query .= "ORDER BY ui.`mkdate` {$attributes['order']}, au.`username`";
+                    break;
+                case "auth_plugin":
+                    $query .= "ORDER BY `auth_plugin` {$attributes['order']}, au.`username`";
+                    break;
+                default:
+                    $query .= " ORDER BY au.`username` {$attributes['order']}";
+            }
+        }
+
+        return DBManager::get()->fetchAll($query, $params, [static::class, 'buildExisting']);
+    }
+
+
+    /**
+     * @see SimpleORMap::store()
+     */
+    public function store()
+    {
+        if ($this->isDirty() && !$this->info->isFieldDirty('chdate')) {
+            $this->info->setValue('chdate', time());
+        }
+        return parent::store();
+    }
+
+    /**
+     * @see SimpleORMap::triggerChdate()
+     */
+    public function triggerChdate()
+    {
+       return $this->info->triggerChdate();
+    }
+
+    /**
+     * returns the name in specified format
+     * (formats defined in $GLOBALS['_fullname_sql'])
+     *
+     * @param string one of full,full_rev,no_title,no_title_rev,no_title_short,no_title_motto,full_rev_username
+     * @return string guess what - the fullname
+     */
+    public function getFullName($format = 'default')
+    {
+        static $concat,$left,$if,$quote;
+
+        if ($format === 'default') {
+            $format = 'full';
+        }
+
+        $sql = $GLOBALS['_fullname_sql'][$format] ?? null;
+        if (!$sql || $format == 'no_title') {
+            return $this->vorname . ' ' . $this->nachname;
+        }
+        if ($format == 'no_title_rev') {
+            return $this->nachname . ', ' . $this->vorname;
+        }
+        if ($concat === null) {
+            $concat = function() {return join('', func_get_args());};
+            $left = function($str, $c = 0) {return mb_substr($str,0,$c);};
+            $if = function($ok,$yes,$no) {return $ok ? $yes : $no;};
+            $quote = function($str) {return "'" . addcslashes($str, "\\'\0") . "'";};
+        }
+
+        $data = array_map($quote, $this->toArray('vorname nachname username title_front title_rear motto perms'));
+        $replace_func['CONCAT'] = '$concat';
+        $replace_func['LEFT'] = '$left';
+        $replace_func['UCASE'] = 'mb_strtoupper';
+        $replace_func['IF'] = '$if';
+        $eval = strtr($sql, $replace_func);
+        $eval = strtr(mb_strtolower($eval), $data);
+        return eval('return ' . $eval . ';');
+    }
+
+    public function toArrayRecursive($only_these_fields = null)
+    {
+        $ret = parent::toArrayRecursive($only_these_fields);
+        unset($ret['info']);
+        return  $ret;
+    }
+
+    /**
+     * Returns whether the user was assigned a certain role.
+     *
+     * @param string $role         The role to check
+     * @param string $institute_id An optional institute_id
+     * @return bool True if the user was assigned this role, false otherwise
+     */
+    public function hasRole($role, $institute_id = '')
+    {
+        return RolePersistence::isAssignedRole($this->user_id, $role, $institute_id);
+    }
+
+    /**
+     * Returns the roles that were assigned to the user.
+     *
+     * @param boolean $with_implicit
+     * @return array
+     */
+    public function getRoles($with_implicit = false)
+    {
+        return RolePersistence::getAssignedRoles($this->user_id, $with_implicit);
+    }
+
+    /**
+     * Returns whether the given user is stored in contacts.
+     *
+     * @param User $another_user
+     * @return bool
+     */
+    public function isFriendOf($another_user)
+    {
+        return (bool) DBManager::get()->fetchColumn("SELECT 1 FROM contact WHERE owner_id=? AND user_id=?", [$this->user_id, $another_user->user_id]);
+    }
+
+    /**
+     * checks if at least one field was modified since last restore
+     *
+     * @return boolean
+     */
+    public function isDirty()
+    {
+        return parent::isDirty() || $this->info->isDirty();
+    }
+
+    /**
+     * checks if given field was modified since last restore
+     *
+     * @param string $field
+     * @return boolean
+     */
+    public function isFieldDirty($field)
+    {
+        $field = mb_strtolower($field);
+        return (array_key_exists($field, $this->content_db) ? parent::isFieldDirty($field) : $this->info->isFieldDirty($field));
+    }
+
+    /**
+     * reverts value of given field to last restored value
+     *
+     * @param string $field
+     * @return mixed the restored value
+     */
+    public function revertValue($field)
+    {
+        $field = mb_strtolower($field);
+        return (array_key_exists($field, $this->content_db) ? parent::revertValue($field) : $this->info->revertValue($field));
+    }
+
+    /**
+     * returns unmodified value of given field
+     *
+     * @param string $field
+     * @throws InvalidArgumentException
+     * @return mixed
+     */
+    public function getPristineValue($field)
+    {
+        $field = mb_strtolower($field);
+        return (array_key_exists($field, $this->content_db) ? parent::getPristineValue($field) : $this->info->getPristineValue($field));
+    }
+
+    /**
+     * Returns data of table row as assoc array with raw contents like
+     * they are in the database.
+     * Pass array of fieldnames or ws separated string to limit
+     * fields.
+     *
+     * @param mixed $only_these_fields
+     * @return array
+     */
+    public function toRawArray($only_these_fields = null)
+    {
+        return array_merge($this->info->toRawArray($only_these_fields), parent::toRawArray($only_these_fields));
+    }
+
+    /**
+     * @param string $relation
+     */
+    public function initRelation($relation)
+    {
+        parent::initRelation($relation);
+        if ($relation == 'info' && is_null($this->relations['info'])) {
+            $options = $this->getRelationOptions($relation);
+            $result = new $options['class_name'];
+            $foreign_key_value = call_user_func($options['assoc_func_params_func'], $this);
+            call_user_func($options['assoc_foreign_key_setter'], $result, $foreign_key_value);
+            $this->relations[$relation] = $result;
+        }
+    }
+
+    /**
+     * This function returns the perms allowed for an institute for the current user
+     *
+     * @return array list of perms
+     */
+    public function getInstitutePerms()
+    {
+        if($this->perms === 'admin') {
+            return ['admin'];
+        }
+        $allowed_status = [];
+        $possible_status = ['autor', 'tutor', 'dozent'];
+
+        $pos = array_search($this->perms, $possible_status);
+
+        if ($pos !== false) {
+            $allowed_status = array_slice($possible_status, 0, $pos + 1);
+        }
+        return $allowed_status;
+    }
+
+    /**
+     * Get the decorated StudIP-Kings information
+     * @return String
+     */
+    public function getStudipKingIcon()
+    {
+        $is_king = StudipKing::is_king($this->user_id, TRUE);
+
+        $result = '';
+        foreach ($is_king as $type => $text) {
+            $type = str_replace('_', '-', $type);
+            $result .= Assets::img('crowns/crown-' . $type . '.png', ['alt' => $text, 'title' => $text]);
+        }
+
+        return $result ?: null;
+    }
+
+    /**
+     * Builds an array containing all available elements that are part of a
+     * user's homepage together with their visibility. It isn't sufficient to
+     * just load the visibility settings from database, because if the user
+     * has added some data (e.g. CV) but not yet assigned a special visibility
+     * to that field, it wouldn't show up.
+     *
+     * @return array An array containing all available homepage elements
+     * together with their visibility settings in the form
+     * $name => $visibility.
+     */
+    public function getHomepageElements()
+    {
+        $homepage_visibility = get_local_visibility_by_id($this->id, 'homepage');
+        if (is_array(json_decode($homepage_visibility, true))) {
+            $homepage_visibility = json_decode($homepage_visibility, true);
+        } else {
+            $homepage_visibility = [];
+        }
+
+        // News
+        $news = StudipNews::GetNewsByRange($this->id, true);
+
+        // Non-private dates.
+        if (Config::get()->CALENDAR_ENABLE) {
+            $dates = CalendarDateAssignment::countBySql('range_id = ?', [$this->id]);
+        } else {
+            $dates = [];
+        }
+
+        // Votes
+        if (Config::get()->VOTE_ENABLE) {
+            $activeVotes  = Questionnaire::countBySQL("user_id = ? AND visible = '1'", [$this->id]);
+            $stoppedVotes = Questionnaire::countBySQL("user_id = ? AND visible = '0'", [$this->id]);
+        } else {
+            $activeVotes = [];
+            $stoppedVotes = [];
+        }
+
+        // Free datafields
+        $data_fields = DataFieldEntry::getDataFieldEntries($this->id, 'user');
+
+        // Now join all available elements with visibility settings.
+        $homepage_elements = [];
+
+        if (Avatar::getAvatar($this->id)->is_customized() && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['picture'])) {
+            $homepage_elements['picture'] = [
+                'name'        => _('Eigenes Bild'),
+                'visibility'  => $homepage_visibility['picture'] ?? get_default_homepage_visibility($this->id),
+                'extern'      => true,
+                'identifier'  => 'commondata'
+            ];
+        }
+
+        if ($this->info->motto && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['motto'])) {
+            $homepage_elements['motto'] = [
+                'name'       => _('Motto'),
+                'visibility' => $homepage_visibility['motto'] ?? get_default_homepage_visibility($this->id),
+                'identifier' => 'privatedata'
+            ];
+        }
+        if (Config::get()->ENABLE_SKYPE_INFO) {
+            if ($GLOBALS['user']->cfg->getValue('SKYPE_NAME') && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['skype_name'])) {
+                $homepage_elements['skype_name'] = [
+                    'name'       => _('Skype Name'),
+                    'visibility' => $homepage_visibility['skype_name'] ?? get_default_homepage_visibility($this->id),
+                    'identifier' => 'privatedata'
+                ];
+            }
+        }
+        if ($this->info->privatnr && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['Private Daten_phone'])) {
+            $homepage_elements['private_phone'] = [
+                'name'       => _('Private Telefonnummer'),
+                'visibility' => $homepage_visibility['private_phone'] ?? get_default_homepage_visibility($this->id),
+                'identifier' => 'privatedata'
+            ];
+        }
+        if ($this->info->privatcell && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['private_cell'])) {
+            $homepage_elements['private_cell'] = [
+                'name'       => _('Private Handynummer'),
+                'visibility' => $homepage_visibility['private_cell'] ?? get_default_homepage_visibility($this->id),
+                'identifier' => 'privatedata'
+            ];
+        }
+        if ($this->info->privadr && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['privadr'])) {
+            $homepage_elements['privadr'] = [
+                'name'         => _('Private Adresse'),
+                'visibility'   => $homepage_visibility['privadr'] ?? get_default_homepage_visibility($this->id),
+                'identifier'   => 'privatedata'
+            ];
+        }
+        if ($this->info->home && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['homepage'])) {
+            $homepage_elements['homepage'] = [
+                'name'        => _('Homepage-Adresse'),
+                'visibility'  => $homepage_visibility['homepage'] ?? get_default_homepage_visibility($this->id),
+                'extern'      => true,
+                'identifier'  => 'privatedata'
+            ];
+        }
+        if ($news && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['news'])) {
+            $homepage_elements['news'] = [
+                'name'       => _('Ankündigungen'),
+                'visibility' => $homepage_visibility['news'] ?? get_default_homepage_visibility($this->id),
+                'extern'     => true,
+                'identifier' => 'commondata'
+            ];
+        }
+        if (Config::get()->CALENDAR_ENABLE && $dates && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['dates'])) {
+            $homepage_elements['termine'] = [
+                'name'       => _('Termine'),
+                'visibility' => $homepage_visibility['termine'] ?? get_default_homepage_visibility($this->id),
+                'extern'     => true,
+                'identifier' => 'commondata'
+            ];
+        }
+        if (Config::get()->VOTE_ENABLE && ($activeVotes || $stoppedVotes) && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['votes'])) {
+            $homepage_elements['votes'] = [
+                'name'       => _('Fragebögen'),
+                'visibility' => $homepage_visibility['votes'] ?? get_default_homepage_visibility($this->id),
+                'identifier' => 'commondata'
+            ];
+        }
+
+        $query = "SELECT 1
+                  FROM user_inst
+                  LEFT JOIN Institute USING (Institut_id)
+                  WHERE user_id = ? AND inst_perms = 'user'";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$this->id]);
+        if ($statement->fetchColumn() && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['studying'])) {
+            $homepage_elements['studying'] = [
+                'name'       => _('Wo ich studiere'),
+                'visibility' => $homepage_visibility['studying'] ?? get_default_homepage_visibility($this->id),
+                'identifier' => 'studdata'
+            ];
+        }
+        if ($this->info->lebenslauf && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['lebenslauf'])) {
+            $homepage_elements['lebenslauf'] = [
+                'name'       => _('Lebenslauf'),
+                'visibility' => $homepage_visibility['lebenslauf'] ?? get_default_homepage_visibility($this->id),
+                'extern'     => true,
+                'identifier' => 'privatedata'
+            ];
+        }
+        if ($this->info->hobby && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['hobby'])) {
+            $homepage_elements['hobby'] = [
+                'name'       => _('Hobbys'),
+                'visibility' => $homepage_visibility['hobby'] ?? get_default_homepage_visibility($this->id),
+                'identifier' => 'privatedata'
+            ];
+        }
+        if ($this->info->publi && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['publi'])) {
+            $homepage_elements['publi'] = [
+                'name'       => _('Publikationen'),
+                'visibility' => $homepage_visibility['publi'] ?? get_default_homepage_visibility($this->id),
+                'extern'     => true,
+                'identifier' => 'privatedata'
+            ];
+        }
+        if ($this->info->schwerp && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms]['schwerp'])) {
+            $homepage_elements['schwerp'] = [
+                'name'       => _('Schwerpunkte'),
+                'visibility' => $homepage_visibility['schwerp'] ?? get_default_homepage_visibility($this->id),
+                'extern'     => true,
+                'identifier' => 'privatedata'
+            ];
+        }
+
+        if ($data_fields) {
+            foreach ($data_fields as $key => $field) {
+                if ($field->getValue() && $field->isEditable($this->perms) && empty($GLOBALS['NOT_HIDEABLE_FIELDS'][$this->perms][$key])) {
+                    $homepage_elements[$key] = [
+                        'name'       => $field->getName(),
+                        'visibility' => $homepage_visibility[$key] ?? get_default_homepage_visibility($this->id),
+                        'extern'     => true,
+                        'identifier' => 'additionaldata'
+                    ];
+                }
+            }
+        }
+
+        foreach ($this->profile_categories as $category) {
+            $homepage_elements['kat_' . $category->id] = [
+                'name'       => $category->name,
+                'visibility' => $homepage_visibility['kat_' . $category->id] ?? get_default_homepage_visibility($this->id),
+                'extern'     => true,
+                'identifier' => 'owncategory'
+            ];
+        }
+
+        return $homepage_elements;
+    }
+
+    /**
+     * Changes a user's email adress.
+     *
+     * @param string $email New email
+     * @param bool   $force Force update (even if nothing actually changed)
+     * @return bool
+     */
+    public function changeEmail($email, $force = false)
+    {
+        // Email did not actually change and update is not forced
+        if ($this->email === $email && !$force) {
+            return true;
+        }
+
+        // Is changing of email globally allowed?
+        if (!Config::get()->ALLOW_CHANGE_EMAIL) {
+            return false;
+        }
+
+        // Is changing of email allowed by auth plugin?
+        if (StudipAuthAbstract::CheckField('auth_user_md5.Email', $this->auth_plugin) || LockRules::check($this->user_id, 'email')) {
+            return false;
+        }
+
+        $validator          = new email_validation_class; ## Klasse zum Ueberpruefen der Eingaben
+        $validator->timeout = 10;
+        $REMOTE_ADDR        = $_SERVER['REMOTE_ADDR'];
+        $Zeit               = date('H:i:s, d.m.Y');
+
+        // accept only registered domains if set
+        $email_restriction = trim(Config::get()->EMAIL_DOMAIN_RESTRICTION);
+        if (!$validator->ValidateEmailAddress($email, $email_restriction)) {
+            if ($email_restriction) {
+                $email_restriction_msg_part = '';
+                $email_restriction_parts    = explode(',', $email_restriction);
+                for ($email_restriction_count = 0; $email_restriction_count < count($email_restriction_parts); $email_restriction_count++) {
+                    if ($email_restriction_count == count($email_restriction_parts) - 1) {
+                        $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . '<br>';
+                    } else if (($email_restriction_count + 1) % 3) {
+                        $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . ', ';
+                    } else {
+                        $email_restriction_msg_part .= '@' . trim($email_restriction_parts[$email_restriction_count]) . ',<br>';
+                    }
+                }
+                PageLayout::postError(sprintf(_('Die E-Mail-Adresse fehlt, ist falsch geschrieben oder gehört nicht zu folgenden Domains:%s'),
+                    '<br>' . htmlReady($email_restriction_msg_part)));
+            } else {
+                PageLayout::postError(_('Die E-Mail-Adresse fehlt oder ist falsch geschrieben!'));
+            }
+            return false;
+        }
+
+        if (!$validator->ValidateEmailHost($email)) {     // Mailserver nicht erreichbar, ablehnen
+            PageLayout::postError(_('Der Mailserver ist nicht erreichbar. Bitte überprüfen Sie, ob Sie E-Mails mit der angegebenen Adresse verschicken können!'));
+            return false;
+        } else {       // Server ereichbar
+            if (!$validator->ValidateEmailBox($email)) {    // aber user unbekannt. Mail an abuse!
+                StudipMail::sendAbuseMessage("edit_about", "Emailbox unbekannt\n\nUser: " . $this->username . "\nEmail: ".$email ."\n\nIP: " . $REMOTE_ADDR ." \nZeit: " . $Zeit . "\n");
+                PageLayout::postError(_('Die angegebene E-Mail-Adresse ist nicht erreichbar. Bitte überprüfen Sie Ihre Angaben!'));
+                return false;
+            }
+        }
+
+        if (self::countBySql('email = ? AND user_id != ?', [$email, $this->user_id])) {
+            PageLayout::postError(sprintf(_('Die angegebene E-Mail-Adresse wird bereits von einem anderen Benutzer (%s) verwendet. Bitte geben Sie eine andere E-Mail-Adresse an.'),
+                htmlReady($this->getFullName())));
+            return false;
+        }
+
+        if (StudipAuthAbstract::CheckField('auth_user_md5.validation_key', $this->auth_plugin)) {
+            PageLayout::postSuccess(_('Ihre E-Mail-Adresse wurde geändert!'));
+        } else {
+            // auth_plugin does not map validation_key (what if...?)
+
+            // generate 10 char activation key
+            $key = '';
+            mt_srand((double)microtime() * 1000000);
+            for ($i = 1; $i <= 10; $i++) {
+                $temp = mt_rand() % 36;
+                if ($temp < 10)
+                    $temp += 48;   // 0 = chr(48), 9 = chr(57)
+                else
+                    $temp += 87;   // a = chr(97), z = chr(122)
+                $key .= chr($temp);
+            }
+            $this->validation_key = $key;
+
+            $activatation_url = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'activate_email.php?uid=' . $this->user_id . '&key=' . $this->validation_key;
+            // include language-specific subject and mailbody with fallback to german
+            $lang = getUserLanguagePath($this->id);
+            if($lang == '') {
+                $lang = 'de';
+            }
+
+            // TODO: This should be refactored so that the included file returns an array
+            include "locale/$lang/LC_MAILS/change_self_mail.inc.php"; // Defines $subject and $mailbody
+
+            $mail = StudipMail::sendMessage($email, $subject ?? '', $mailbody ?? '');
+
+            if (!$mail) {
+                return true;
+            }
+
+            $this->store();
+
+            PageLayout::postInfo(sprintf(_('An Ihre neue E-Mail-Adresse <b>%s</b> wurde ein Aktivierungslink geschickt, dem Sie folgen müssen bevor Sie sich das nächste mal einloggen können.'), htmlReady($email)));
+            StudipLog::log('USER_NEWPWD', $this->user_id);
+        }
+        return true;
+    }
+
+    /**
+     * Merge an user ($old_id) to another user ($new_id).  This is a part of the
+     * old numit-plugin.
+     *
+     * @param string $old_user
+     * @param string $new_user
+     * @param boolean $identity merge identity (if true)
+     *
+     * @return array() messages to display after migration
+     * @deprecated
+     */
+    public static function convert($old_id, $new_id, $identity = false)
+    {
+        NotificationCenter::postNotification('UserWillMigrate', $old_id, $new_id);
+
+        $messages = [];
+
+        //Identitätsrelevante Daten migrieren
+        if ($identity) {
+            // Veranstaltungseintragungen
+            self::removeDoubles('seminar_user', 'Seminar_id', $new_id, $old_id);
+            $query = "UPDATE IGNORE seminar_user SET user_id = ? WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            self::removeDoubles('admission_seminar_user', 'seminar_id', $new_id, $old_id);
+            $query = "UPDATE IGNORE admission_seminar_user SET user_id = ? WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            self::removeDoubles('termin_related_persons', 'range_id', $new_id, $old_id);
+            $query = "UPDATE IGNORE `termin_related_persons` SET `user_id` = ? WHERE `user_id` = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            // Persönliche Infos
+            $query = "DELETE FROM user_info WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id]);
+
+            $query = "UPDATE IGNORE user_info SET user_id = ? WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            // Migrate registration timestamp by creating a new empty user info
+            // entry
+            $query = "INSERT INTO `user_info` (`user_id`, `mkdate`, `chdate`)
+                      SELECT ?, `mkdate`, `chdate`
+                      FROM `user_info`
+                      WHERE `user_id` = ?";
+            DBManager::get()->execute($query, [$old_id, $new_id]);
+
+            // Studiengänge
+            self::removeDoubles('user_studiengang', 'fach_id', $new_id, $old_id);
+            $query = "UPDATE IGNORE user_studiengang SET user_id = ? WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            // Eigene Kategorien
+            $query = "UPDATE IGNORE kategorien SET range_id = ? WHERE range_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            // Institute
+            self::removeDoubles('user_inst', 'Institut_id', $new_id, $old_id);
+            $query = "UPDATE IGNORE user_inst SET user_id = ? WHERE user_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            // Generische Datenfelder zusammenführen (bestehende Einträge des
+            // "neuen" Nutzers werden dabei nicht überschrieben)
+            $old_user = User::find($old_id);
+            $old_user->datafields->each(function ($field) use ($new_id) {
+                if (!$field->isNew() && $field->content !== null) {
+                    $entry = new DatafieldEntryModel([$field->datafield_id, $new_id, $field->sec_range_id, $field->lang]);
+
+                    if ($entry->content === null || $entry->content === '' || $entry->content === 'default_value') {
+                        $entry->content = $field->content;
+                        $entry->store();
+                    }
+                }
+            });
+
+            # Datenfelder des alten Nutzers leeren
+            $old_user->datafields = [];
+            $old_user->store();
+
+            //
+
+            //Buddys
+            $query = "UPDATE IGNORE contact SET owner_id = ? WHERE owner_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$new_id, $old_id]);
+
+            // Avatar
+            $old_avatar = Avatar::getAvatar($old_id);
+            $new_avatar = Avatar::getAvatar($new_id);
+            if ($old_avatar->is_customized()) {
+                if (!$new_avatar->is_customized()) {
+                    $avatar_file = $old_avatar->getFilename(Avatar::NORMAL);
+                    $new_avatar->createFrom($avatar_file);
+                }
+                $old_avatar->reset();
+            }
+
+            $messages[] = _('Identitätsrelevante Daten wurden migriert.');
+        }
+
+        // Restliche Daten übertragen
+
+        // ForumsModule migrieren
+        foreach (PluginEngine::getPlugins(ForumModule::class) as $plugin) {
+            $plugin->migrateUser($old_id, $new_id);
+        }
+
+        // Dateieintragungen und Ordner
+        // TODO (mlunzena) should post a notification
+        $query = "UPDATE IGNORE file_refs SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE files SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE folders SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        //Kalender
+        $query = "UPDATE IGNORE `calendar_date_assignments` SET `range_id` = ? WHERE `range_id` = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE `calendar_dates` SET `author_id` = ? WHERE `author_id` = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE `calendar_dates` SET `editor_id` = ? WHERE `editor_id` = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        //Archiv
+        self::removeDoubles('archiv_user', 'seminar_id', $new_id, $old_id);
+        $query = "UPDATE IGNORE archiv_user SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // Kategorien
+        $query = "UPDATE IGNORE kategorien SET range_id = ? WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // Nachrichten (Interne)
+        $query = "UPDATE IGNORE message SET autor_id = ? WHERE autor_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        self::removeDoubles('message_user', 'message_id', $new_id, $old_id);
+        $query = "UPDATE IGNORE message_user SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // News
+        $query = "UPDATE IGNORE news SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE news_range SET range_id = ? WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // Informationsseiten
+        $query = "UPDATE IGNORE scm SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // Statusgruppeneinträge
+        self::removeDoubles('statusgruppe_user', 'statusgruppe_id', $new_id, $old_id);
+        $query = "UPDATE IGNORE statusgruppe_user SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // Termine
+        $query = "UPDATE IGNORE termine SET autor_id = ? WHERE autor_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        //Votings
+        $query = "UPDATE IGNORE questionnaires SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE questionnaire_assignments SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE questionnaire_assignments SET range_id = ? WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        self::removeDoubles('questionnaire_anonymous_answers', 'questionnaire_id', $new_id, $old_id);
+        $query = "UPDATE IGNORE questionnaire_anonymous_answers SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        self::removeDoubles('questionnaire_answers', 'question_id', $new_id, $old_id);
+        $query = "UPDATE IGNORE questionnaire_answers SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        //Wiki
+        $query = "UPDATE IGNORE wiki SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        $query = "UPDATE IGNORE wiki_locks SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        //Adressbucheinträge
+        $query = "UPDATE IGNORE contact SET owner_id = ? WHERE owner_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        //Blubber
+        $query = "UPDATE IGNORE blubber_comments SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+        $query = "UPDATE IGNORE blubber_mentions SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+        $query = "UPDATE IGNORE blubber_threads SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+        $query = "UPDATE IGNORE blubber_threads_followstates SET user_id = ? WHERE user_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+
+        // Consultations
+        $query = "UPDATE IGNORE consultation_blocks SET range_id = ? WHERE range_id = ? AND range_type = 'user'";
+        DBManager::get()->execute($query, [$new_id, $old_id]);
+        $query = "UPDATE IGNORE consultation_bookings SET user_id = ? WHERE user_id = ?";
+        DBManager::get()->execute($query, [$new_id, $old_id]);
+        $query = "UPDATE IGNORE consultation_events SET user_id = ? WHERE user_id = ?";
+        DBManager::get()->execute($query, [$new_id, $old_id]);
+        $query = "UPDATE IGNORE consultation_responsibilities SET range_id = ? WHERE range_id = ?
+                                                               AND range_type = 'user'";
+        DBManager::get()->execute($query, [$new_id, $old_id]);
+
+        NotificationCenter::postNotification('UserDidMigrate', $old_id, $new_id);
+
+        $messages[] = _('Dateien, Termine, Adressbuch, Nachrichten und weitere Daten wurden migriert.');
+        return $messages;
+    }
+
+    /**
+     * Delete double entries of the old and new user. This is a part of the old
+     * numit-plugin.
+     *
+     * @param string $table
+     * @param string $field
+     * @param md5 $new_id
+     * @param md5 $old_id
+     * @deprecated
+     */
+    private static function removeDoubles($table, $field, $new_id, $old_id)
+    {
+        $items = [];
+
+        $query = "SELECT a.{$field} AS field_item
+                  FROM {$table} AS a, {$table} AS b
+                  WHERE a.user_id = ? AND b.user_id = ? AND a.{$field} = b.{$field}";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$new_id, $old_id]);
+        $results = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+        foreach ($results as $value) {
+            array_push($items, $value['field_item']);
+        }
+
+        if (!empty($items)) {
+            $query = "DELETE FROM `{$table}`
+                      WHERE user_id = :user_id AND `{$field}` IN (:items)";
+
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':user_id', $new_id);
+            $statement->bindValue(':items', $items, StudipPDO::PARAM_ARRAY);
+            $statement->execute();
+        }
+    }
+
+    /**
+     * Returns a descriptive text for the range type.
+     *
+     * @return string
+     */
+    public function describeRange()
+    {
+        return _('NutzerIn');
+    }
+
+    /**
+     * Returns a unique identificator for the range type.
+     *
+     * @return string
+     */
+    public function getRangeType()
+    {
+        return 'user';
+    }
+
+    /**
+     * Returns the id of the current range
+     *
+     * @return mixed (string|int)
+     */
+    public function getRangeId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfiguration()
+    {
+        return UserConfig::get($this);
+    }
+
+    /**
+     * Decides whether the user may access the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     */
+    public function isAccessibleToUser($user_id = null)
+    {
+        // TODO: Visibility checks
+        if ($user_id === null) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        return $user_id === $this->user_id
+            || static::find($user_id)->perms === 'root'
+            || !in_array(static::find($this->user_id)->visible, ['no', 'never']);
+    }
+
+    /**
+     * Decides whether the user may edit/alter the range.
+     *
+     * @param string|null $user_id Optional id of a user, defaults to current user
+     * @return bool
+     */
+    public function isEditableByUser($user_id = null)
+    {
+        if ($user_id === null) {
+            $user_id = $GLOBALS['user']->id;
+        }
+        return $user_id === $this->user_id
+            || $GLOBALS['perm']->have_profile_perm('admin', $this->user_id)
+            || Deputy::isDeputy($user_id, $this->user_id, true)
+            || static::find($user_id)->perms === 'root';
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = User::findBySQL("user_id = ?", [$storage->user_id]);
+
+        if ($sorm) {
+            $limit ='user_id username password perms vorname nachname email validation_key auth_plugin locked lock_comment locked_by visible';
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray($limit);
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Kerndaten'), 'auth_user_md5', $field_data);
+            }
+
+            $limit = 'user_id hobby lebenslauf publi schwerp home privatnr privatcell privadr score geschlecht mkdate chdate title_front title_rear preferred_language smsforward_copy smsforward_rec email_forward motto lock_rule';
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray($limit);
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Benutzer Informationen'), 'user_info', $field_data);
+            }
+        }
+
+        $data = DBManager::get()->fetchAll('SELECT * FROM object_user_visits WHERE user_id = ?', [$storage->user_id]);
+        $storage->addTabularData(_('Objekt Aufrufe'), 'object_user_visits', $data);
+    }
+
+    /**
+     * This callback is called after deleting a User.
+     * It removes feedback entries that are associated with the User.
+     */
+    public function cbRemoveFeedback()
+    {
+        FeedbackElement::deleteBySQL('user_id = ?', [$this->id]);
+        FeedbackEntry::deleteBySQL('user_id = ?', [$this->id]);
+    }
+
+    /**
+     * This callback is called after deleting a User.
+     * It removes forum visit entries that are associated with the User.
+     */
+    public function cbRemoveForumVisits()
+    {
+        $query = "DELETE FROM `forum_visits`
+                  WHERE `user_id` = ?";
+        DBManager::get()->execute($query, [$this->id]);
+    }
+
+    public function cbClearCaches()
+    {
+        if ($this->isFieldDirty('perms')) {
+            RolePersistence::expireUserCache($this->user_id);
+        }
+    }
+
+
+    /**
+     * @see Range::__toString()
+     */
+    public function __toString() : string
+    {
+        return $this->getFullName();
+    }
+
+    /**
+     * Returns whether a user is blocked either explicitely due to the "locked"
+     * property or by a set expiration date.
+     *
+     * @return bool
+     * @since Stud.IP 5.4
+     */
+    public function isBlocked(): bool
+    {
+        return $this->locked || $this->isExpired();
+    }
+
+    /**
+     * Returns whether a user account is expired.
+     *
+     * @return bool
+     * @since Stud.IP 5.4
+     */
+    public function isExpired(): bool
+    {
+        return $this->config->EXPIRATION_DATE > 0
+            && $this->config->EXPIRATION_DATE < time();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getCalendarOwner(string $owner_id): ?\Studip\Calendar\Owner
+    {
+        return self::find($owner_id);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isCalendarReadable(?string $user_id = null): bool
+    {
+        if ($user_id === null) {
+            $user_id = self::findCurrent()->id;
+        }
+
+        if ($this->id === $user_id) {
+            //The owner can always read their own calendar.
+            return true;
+        }
+        return Contact::countBySql(
+            "`owner_id` = :this_user_id AND `user_id` = :other_user_id
+            AND `calendar_permissions` <> ''",
+            ['this_user_id' => $this->id, 'other_user_id' => $user_id]
+        ) > 0;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isCalendarWritable(string $user_id = null): bool
+    {
+        if ($user_id === null) {
+            $user_id = self::findCurrent()->id;
+        }
+
+        if ($this->id === $user_id) {
+            //The owner can always write their own calendar.
+            return true;
+        }
+        if (Config::get()->CALENDAR_GRANT_ALL_INSERT) {
+            //All users can write in all users calendars.
+            return true;
+        }
+        return Contact::countBySql(
+                "`owner_id` = :this_user_id AND `user_id` = :other_user_id
+            AND `calendar_permissions` = 'WRITE'",
+            ['this_user_id' => $this->id, 'other_user_id' => $user_id]
+        ) > 0;
+    }
+
+    /**
+     * Delivers the gender as text
+     * @return string
+     */
+    public function getGender(): string
+    {
+        switch ($this->geschlecht) {
+            case 1:
+                return _('männlich');
+            case 2:
+                return _('weiblich');
+            case 3:
+                return _('divers');
+            default:
+                return _('unbekannt');
+        }
+    }
+
+    /**
+     * Delivers the gender as text
+     * @return string
+     */
+    public function getSalutation(): string
+    {
+        switch ($this->geschlecht) {
+            case 1:
+                return _('Herr');
+            case 2:
+                return _('Frau');
+            default:
+                return '';
+        }
+    }
+
+    /*
+     * Returns whether the user has the given permission (for the given range).
+     *
+     * @param string     $permission
+     * @param Range|null $for_range
+     *
+     * @return bool
+     */
+    public function hasPermissionLevel(string $permission, ?Range $for_range = null): bool
+    {
+        if (func_num_args() === 1) {
+            return $GLOBALS['perm']->have_perm($permission, $this->id);
+        }
+
+        if ($for_range === null) {
+            throw new Exception('No valid range given');
+        }
+
+        if ($for_range instanceof User) {
+            return $GLOBALS['perm']->have_profile_perm($permission, $for_range->id, $this->id);
+        }
+
+        return $GLOBALS['perm']->have_studip_perm($permission, $for_range->id, $this->id);
+    }
+}
diff --git a/lib/models/UserInfo.class.php b/lib/models/UserInfo.class.php
deleted file mode 100644
index 28808a2..0000000
--- a/lib/models/UserInfo.class.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * UserInfo.class.php
- * model class for table user_info
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2010 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for user_id
- * @property string $user_id database column
- * @property I18NString $hobby database column
- * @property I18NString $lebenslauf database column
- * @property I18NString $publi database column
- * @property I18NString $schwerp database column
- * @property string $home database column
- * @property string $privatnr database column
- * @property string $privatcell database column
- * @property string $privadr database column
- * @property int $score database column
- * @property int $geschlecht database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property string $title_front database column
- * @property string $title_rear database column
- * @property string|null $preferred_language database column
- * @property int $smsforward_copy database column
- * @property string $smsforward_rec database column
- * @property int $email_forward database column
- * @property string $motto database column
- * @property string $lock_rule database column
- * @property string|null $oercampus_description database column
- */
-
-class UserInfo extends SimpleORMap
-{
-    /**
-     * Constants for column geschlecht
-     */
-    const GENDER_UNKNOWN = 0;
-    const GENDER_MALE = 1;
-    const GENDER_FEMALE = 2;
-    const GENDER_DIVERSE = 3;
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'user_info';
-        $config['i18n_fields']['hobby'] = true;
-        $config['i18n_fields']['lebenslauf'] = true;
-        $config['i18n_fields']['schwerp'] = true;
-        $config['i18n_fields']['publi'] = true;
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/UserInfo.php b/lib/models/UserInfo.php
new file mode 100644
index 0000000..28808a2
--- /dev/null
+++ b/lib/models/UserInfo.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * UserInfo.class.php
+ * model class for table user_info
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2010 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for user_id
+ * @property string $user_id database column
+ * @property I18NString $hobby database column
+ * @property I18NString $lebenslauf database column
+ * @property I18NString $publi database column
+ * @property I18NString $schwerp database column
+ * @property string $home database column
+ * @property string $privatnr database column
+ * @property string $privatcell database column
+ * @property string $privadr database column
+ * @property int $score database column
+ * @property int $geschlecht database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property string $title_front database column
+ * @property string $title_rear database column
+ * @property string|null $preferred_language database column
+ * @property int $smsforward_copy database column
+ * @property string $smsforward_rec database column
+ * @property int $email_forward database column
+ * @property string $motto database column
+ * @property string $lock_rule database column
+ * @property string|null $oercampus_description database column
+ */
+
+class UserInfo extends SimpleORMap
+{
+    /**
+     * Constants for column geschlecht
+     */
+    const GENDER_UNKNOWN = 0;
+    const GENDER_MALE = 1;
+    const GENDER_FEMALE = 2;
+    const GENDER_DIVERSE = 3;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'user_info';
+        $config['i18n_fields']['hobby'] = true;
+        $config['i18n_fields']['lebenslauf'] = true;
+        $config['i18n_fields']['schwerp'] = true;
+        $config['i18n_fields']['publi'] = true;
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/UserOnline.class.php b/lib/models/UserOnline.class.php
deleted file mode 100644
index e18322d..0000000
--- a/lib/models/UserOnline.class.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * UserOnline.class.php
- *
- * 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.
- *
- * @author      David Siegfried <david.siegfried@uni-vechta.de>
- * @copyright   206 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $id alias column for user_id
- * @property string $user_id database column
- * @property int $last_lifesign database column
- */
-class UserOnline extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'user_online';
-        parent::configure($config);
-    }
-}
\ No newline at end of file
diff --git a/lib/models/UserOnline.php b/lib/models/UserOnline.php
new file mode 100644
index 0000000..e18322d
--- /dev/null
+++ b/lib/models/UserOnline.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * UserOnline.class.php
+ *
+ * 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.
+ *
+ * @author      David Siegfried <david.siegfried@uni-vechta.de>
+ * @copyright   206 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $id alias column for user_id
+ * @property string $user_id database column
+ * @property int $last_lifesign database column
+ */
+class UserOnline extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'user_online';
+        parent::configure($config);
+    }
+}
\ No newline at end of file
diff --git a/lib/models/UserStudyCourse.class.php b/lib/models/UserStudyCourse.class.php
deleted file mode 100644
index cac37c8..0000000
--- a/lib/models/UserStudyCourse.class.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * UserStudyCourse.class.php
- * model class for table user_studiengang
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2013 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property array $id alias for pk
- * @property string $user_id database column
- * @property string $fach_id database column
- * @property int|null $semester database column
- * @property string $abschluss_id database column
- * @property string|null $version_id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property User $user belongs_to User
- * @property Abschluss $degree belongs_to Abschluss
- * @property Fach $studycourse belongs_to Fach
- * @property mixed $degree_name additional field
- * @property mixed $studycourse_name additional field
- */
-class UserStudyCourse extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'user_studiengang';
-
-        $config['belongs_to']['user'] = [
-            'class_name' => 'User',
-            'foreign_key' => 'user_id',
-        ];
-        $config['belongs_to']['degree'] = [
-            'class_name' => 'Abschluss',
-            'foreign_key' => 'abschluss_id',
-        ];
-        $config['belongs_to']['studycourse'] = [
-            'class_name' => 'Fach',
-            'foreign_key' => 'fach_id',
-        ];
-
-        $config['additional_fields']['degree_name'] = [];
-        $config['additional_fields']['studycourse_name'] = [];
-        parent::configure($config);
-    }
-
-    public static function findByUser($user_id)
-    {
-        $db = DBManager::get();
-        $st = $db->prepare("SELECT user_studiengang.*, abschluss.name as degree_name,
-                            fach.name as studycourse_name
-                            FROM user_studiengang
-                            LEFT JOIN abschluss USING (abschluss_id)
-                            LEFT JOIN fach USING (fach_id)
-                            WHERE user_id = ? ORDER BY studycourse_name,degree_name");
-        $st->execute([$user_id]);
-        $ret = [];
-        while ($row = $st->fetch(PDO::FETCH_ASSOC)) {
-            $ret[] = self::buildExisting($row);
-        }
-        return $ret;
-    }
-
-    public static function findByStudyCourseAndDegree($study_course_id, $degree_id)
-    {
-        return self::findBySql("fach_id = ? AND abschluss_id = ?", [$study_course_id, $degree_id]);
-    }
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('UserStudiengang'), 'user_studiengang', $field_data);
-            }
-        }
-    }
-}
diff --git a/lib/models/UserStudyCourse.php b/lib/models/UserStudyCourse.php
new file mode 100644
index 0000000..cac37c8
--- /dev/null
+++ b/lib/models/UserStudyCourse.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * UserStudyCourse.class.php
+ * model class for table user_studiengang
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2013 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property array $id alias for pk
+ * @property string $user_id database column
+ * @property string $fach_id database column
+ * @property int|null $semester database column
+ * @property string $abschluss_id database column
+ * @property string|null $version_id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property User $user belongs_to User
+ * @property Abschluss $degree belongs_to Abschluss
+ * @property Fach $studycourse belongs_to Fach
+ * @property mixed $degree_name additional field
+ * @property mixed $studycourse_name additional field
+ */
+class UserStudyCourse extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'user_studiengang';
+
+        $config['belongs_to']['user'] = [
+            'class_name' => 'User',
+            'foreign_key' => 'user_id',
+        ];
+        $config['belongs_to']['degree'] = [
+            'class_name' => 'Abschluss',
+            'foreign_key' => 'abschluss_id',
+        ];
+        $config['belongs_to']['studycourse'] = [
+            'class_name' => 'Fach',
+            'foreign_key' => 'fach_id',
+        ];
+
+        $config['additional_fields']['degree_name'] = [];
+        $config['additional_fields']['studycourse_name'] = [];
+        parent::configure($config);
+    }
+
+    public static function findByUser($user_id)
+    {
+        $db = DBManager::get();
+        $st = $db->prepare("SELECT user_studiengang.*, abschluss.name as degree_name,
+                            fach.name as studycourse_name
+                            FROM user_studiengang
+                            LEFT JOIN abschluss USING (abschluss_id)
+                            LEFT JOIN fach USING (fach_id)
+                            WHERE user_id = ? ORDER BY studycourse_name,degree_name");
+        $st->execute([$user_id]);
+        $ret = [];
+        while ($row = $st->fetch(PDO::FETCH_ASSOC)) {
+            $ret[] = self::buildExisting($row);
+        }
+        return $ret;
+    }
+
+    public static function findByStudyCourseAndDegree($study_course_id, $degree_id)
+    {
+        return self::findBySql("fach_id = ? AND abschluss_id = ?", [$study_course_id, $degree_id]);
+    }
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('UserStudiengang'), 'user_studiengang', $field_data);
+            }
+        }
+    }
+}
diff --git a/lib/models/Vote.php b/lib/models/Vote.php
index a434f7b..b5cd142 100644
--- a/lib/models/Vote.php
+++ b/lib/models/Vote.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'lib/classes/QuestionType.interface.php';
-
 /**
  * @license GPL2 or any later version
  *
diff --git a/lib/models/WebserviceAccessRule.class.php b/lib/models/WebserviceAccessRule.class.php
deleted file mode 100644
index 48da0ef..0000000
--- a/lib/models/WebserviceAccessRule.class.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * WebserviceAccessRule.class.php
- * model class for table webservice_access_rules
- * this class represents one record of the table webservice_access_rules
- * the column ip_range is converted from a comma separated list to an ArrayObject and vice-versa,
- * to allow array-like access
- *
- * Example:
- * @code
- * $rule = WebserviceAccessRule::find($id);
- * echo $rule['ip_range']; //prints out e.g. 127.0.0.1
- * $rule['ip_range'][] = '192.168.19.0/8';
- * echo $rule['ip_range']; //prints out 127.0.0.1,192.168.19.0/8
- * @endcode
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2011 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- *
- * @property string $api_key database column
- * @property string $method database column
- * @property CSVArrayObject $ip_range database column
- * @property string $type database column
- * @property int $id database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- */
-class WebserviceAccessRule extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'webservice_access_rules';
-        $config['serialized_fields']['ip_range'] = CSVArrayObject::class;
-        parent::configure($config);
-    }
-
-    /**
-     * returns all rules for an given api key
-     *
-     * @param string $api_key
-     * @return array of WebserviceAccessRule objects
-     */
-    static function findByApiKey($api_key)
-    {
-        return self::findByapi_key($api_key, " ORDER BY type");
-    }
-
-    /**
-     * returns all rules in db sorted by api key
-     *
-     * @return array of WebserviceAccessRule objects
-     */
-    static function findAll()
-    {
-        return self::findBySQL("1 ORDER BY api_key, type");
-    }
-
-    /**
-     * Checks for given api key, methodname and IP Address if access
-     * is granted or not
-     *
-     * @param string $api_key an api key
-     * @param string $method a name of an webservice method
-     * @param string $ip an IP Address
-     * @return boolean returns true if access fpr given params is allowed
-     */
-    static function checkAccess($api_key, $method, $ip)
-    {
-        $rules = self::findByApiKey($api_key);
-        $access = false;
-        foreach ($rules as $rule) {
-            if ($rule->type == 'allow'
-                && $rule->checkIpInRange($ip)
-                && $rule->checkMethodName($method)) {
-                $access = true;
-            }
-            if ($rule->type == 'deny'
-                && $rule->checkIpInRange($ip)
-                && $rule->checkMethodName($method)) {
-                $access = false;
-            }
-        }
-        return $access;
-    }
-
-    /**
-     * checks, if a given IP Address is in the range specified
-     * for this rule. If there is no specified range, it returns true
-     *
-     * @param string $check_ip an IP Address
-     * @return boolean true if given Address is in specified range
-     */
-    function checkIpInRange($check_ip)
-    {
-        if (!ip2long($check_ip)) {
-            return false;
-        }
-        if (!count($this->ip_range)) {
-            return true;
-        }
-        foreach($this->ip_range as $range) {
-            list($ip, $mask) = explode('/', $range);
-            if (!$mask) {
-                $mask = 32;
-            }
-            if ( (ip2long($check_ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($ip)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * checks, if the specified method name for this rule
-     * is part of the given one.
-     * If there is no specified method name, it returns true
-     *
-     *
-     * @param string $method a webservice method name
-     * @return boolean true if given name matches the specified
-     */
-    function checkMethodName($method)
-    {
-        return ($method && (!$this->method || mb_strpos($method, $this->method) !== false));
-    }
-}
diff --git a/lib/models/WebserviceAccessRule.php b/lib/models/WebserviceAccessRule.php
new file mode 100644
index 0000000..48da0ef
--- /dev/null
+++ b/lib/models/WebserviceAccessRule.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * WebserviceAccessRule.class.php
+ * model class for table webservice_access_rules
+ * this class represents one record of the table webservice_access_rules
+ * the column ip_range is converted from a comma separated list to an ArrayObject and vice-versa,
+ * to allow array-like access
+ *
+ * Example:
+ * @code
+ * $rule = WebserviceAccessRule::find($id);
+ * echo $rule['ip_range']; //prints out e.g. 127.0.0.1
+ * $rule['ip_range'][] = '192.168.19.0/8';
+ * echo $rule['ip_range']; //prints out 127.0.0.1,192.168.19.0/8
+ * @endcode
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2011 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ *
+ * @property string $api_key database column
+ * @property string $method database column
+ * @property CSVArrayObject $ip_range database column
+ * @property string $type database column
+ * @property int $id database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ */
+class WebserviceAccessRule extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'webservice_access_rules';
+        $config['serialized_fields']['ip_range'] = CSVArrayObject::class;
+        parent::configure($config);
+    }
+
+    /**
+     * returns all rules for an given api key
+     *
+     * @param string $api_key
+     * @return array of WebserviceAccessRule objects
+     */
+    static function findByApiKey($api_key)
+    {
+        return self::findByapi_key($api_key, " ORDER BY type");
+    }
+
+    /**
+     * returns all rules in db sorted by api key
+     *
+     * @return array of WebserviceAccessRule objects
+     */
+    static function findAll()
+    {
+        return self::findBySQL("1 ORDER BY api_key, type");
+    }
+
+    /**
+     * Checks for given api key, methodname and IP Address if access
+     * is granted or not
+     *
+     * @param string $api_key an api key
+     * @param string $method a name of an webservice method
+     * @param string $ip an IP Address
+     * @return boolean returns true if access fpr given params is allowed
+     */
+    static function checkAccess($api_key, $method, $ip)
+    {
+        $rules = self::findByApiKey($api_key);
+        $access = false;
+        foreach ($rules as $rule) {
+            if ($rule->type == 'allow'
+                && $rule->checkIpInRange($ip)
+                && $rule->checkMethodName($method)) {
+                $access = true;
+            }
+            if ($rule->type == 'deny'
+                && $rule->checkIpInRange($ip)
+                && $rule->checkMethodName($method)) {
+                $access = false;
+            }
+        }
+        return $access;
+    }
+
+    /**
+     * checks, if a given IP Address is in the range specified
+     * for this rule. If there is no specified range, it returns true
+     *
+     * @param string $check_ip an IP Address
+     * @return boolean true if given Address is in specified range
+     */
+    function checkIpInRange($check_ip)
+    {
+        if (!ip2long($check_ip)) {
+            return false;
+        }
+        if (!count($this->ip_range)) {
+            return true;
+        }
+        foreach($this->ip_range as $range) {
+            list($ip, $mask) = explode('/', $range);
+            if (!$mask) {
+                $mask = 32;
+            }
+            if ( (ip2long($check_ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($ip)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * checks, if the specified method name for this rule
+     * is part of the given one.
+     * If there is no specified method name, it returns true
+     *
+     *
+     * @param string $method a webservice method name
+     * @return boolean true if given name matches the specified
+     */
+    function checkMethodName($method)
+    {
+        return ($method && (!$this->method || mb_strpos($method, $this->method) !== false));
+    }
+}
diff --git a/lib/models/WikiPage.class.php b/lib/models/WikiPage.class.php
deleted file mode 100644
index 67ddd7e..0000000
--- a/lib/models/WikiPage.class.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/**
- * WikiPage.class.php
- * model class for table wiki
- *
- * 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.
- *
- * @author    mlunzena
- * @copyright (c) Authors
- *
- * @property array $id alias for pk
- * @property string $course_id database column
- * @property string|null $user_id database column
- * @property string $name database column
- * @property string $content database column
- * @property string|null $ancestor database column
- * @property int|null $chdate database column
- * @property int $version database column
- * @property int|null $mkdate database column
- * @property User|null $user belongs_to User
- * @property Course $course belongs_to Course
- * @property WikiVersion[]|SimpleORMapCollection $versions
- * @property WikiOnlineEditingUser[]|SimpleORMapCollection $onlineeditingusers
- * @property-read WikiPage $parent additional field
- * @property-read WikiPage[] $children additional field
- * @property-read WikiVersion|null $predecessor additional field
- * @property-read int $versionnumber additional field
- */
-class WikiPage extends SimpleORMap implements PrivacyObject
-{
-    /**
-     * Configures the model
-     * @param  array  $config Configuration
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'wiki_pages';
-
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id'
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'range_id',
-        ];
-        $config['has_many']['versions'] = [
-            'class_name'  => WikiVersion::class,
-            'foreign_key' => 'page_id',
-            'order_by'    => 'ORDER BY mkdate DESC',
-            'on_delete'   => 'delete',
-        ];
-        $config['has_many']['onlineeditingusers'] = [
-            'class_name' => WikiOnlineEditingUser::class,
-            'foreign_key' => 'page_id',
-            'on_delete'   => 'delete',
-        ];
-
-        $config['additional_fields']['parent'] = [
-            'get' => function (WikiPage $page): ?WikiPage {
-                return self::find($page->parent_id);
-            }
-        ];
-
-        $config['additional_fields']['children'] = [
-            'get' => function (WikiPage $page): array {
-                return self::findBySQL('parent_id = ?', [
-                    $page->id
-                ]);
-            }
-        ];
-        $config['additional_fields']['predecessor'] = [
-            'get' => function (WikiPage $page): ?WikiVersion {
-                return $page->versions ? $page->versions[0] : null;
-            }
-        ];
-        $config['additional_fields']['versionnumber'] = [
-            'get' => function (WikiPage $page): int {
-                return count($page->versions) + 1;
-            }
-        ];
-
-        $config['registered_callbacks']['before_store'][] = 'createVersion';
-        $config['default_values']['last_author'] = 'nobody';
-
-        parent::configure($config);
-    }
-
-
-    protected function createVersion()
-    {
-        $last_version = $this->versions[0];
-        if (
-            !$this->isNew()
-            && $this->content['content'] !== $this->content_db['content']
-            && (
-                $this->content_db['user_id'] !== $this->content['user_id']
-                || $this->content_db['chdate'] < time() - 60 * 30
-            )
-            && (!$last_version || $last_version['content'] !== $this['content'])
-        ) {
-            //Neue Version anlegen:
-            WikiVersion::create([
-                'page_id' => $this->id,
-                'name'    => $this->content_db['name'],
-                'content' => $this->content_db['content'],
-                'user_id' => $this->content_db['user_id'],
-                'mkdate'  => $this->content_db['chdate'],
-            ]);
-        }
-        return true;
-    }
-
-    public static function findByName($range_id, $name)
-    {
-        return self::findOneBySQL('name = :name AND range_id = :range_id', [
-            'range_id' => $range_id,
-            'name' => $name
-        ]);
-    }
-
-
-    /**
-     * Returns whether this page is visible to the given user.
-     * @param  string|null $user_id User id
-     * @return boolean indicating whether the page is visible
-     */
-    public function isReadable(?string $user_id = null): bool
-    {
-        if ($this->isNew()) {
-            return true;
-        }
-        // anyone can see this page if it belongs to a free course
-        if (
-            $this->read_permission === 'all'
-            && Config::get()->ENABLE_FREE_ACCESS
-            && $this->course
-            && !$this->course->lesezugriff
-        ) {
-            return true;
-        }
-        if ($user_id === null && User::findCurrent()) {
-            $user_id = User::findCurrent()->id;
-        }
-
-        if (
-            $this->read_permission === 'all'
-            && $GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)
-        ) {
-            return true;
-        }
-
-        if ($GLOBALS['perm']->have_studip_perm(
-            'dozent',
-            $this->range_id,
-            $user_id
-        )) {
-            return true;
-        }
-
-        if (in_array($this->read_permission, ['tutor', 'dozent'])) {
-            return $GLOBALS['perm']->have_studip_perm($this->read_permission, $this->range_id, $user_id);
-        } else {
-            return StatusgruppeUser::exists([$this->read_permission, $user_id]);
-        }
-    }
-
-    /**
-     * Returns whether this page is editable to the given user.
-     * @param  string|null  $user_id the ID of the user
-     * @return boolean indicating whether the page is editable
-     */
-    public function isEditable(?string $user_id = null): bool
-    {
-        if ($user_id === null && User::findCurrent()) {
-            $user_id = User::findCurrent()->id;
-        }
-        if ($GLOBALS['perm']->have_studip_perm(
-            'dozent',
-            $this->range_id,
-            $user_id
-        )) {
-            return true;
-        }
-        if ($this->write_permission === 'all') {
-            return true;
-        }
-        if (in_array($this->write_permission, ['tutor', 'dozent'])) {
-            return $GLOBALS['perm']->have_studip_perm(
-                $this->write_permission,
-                $this->range_id,
-                $user_id
-            );
-        } else {
-            return StatusgruppeUser::exists([$this->write_permission, $user_id]);
-        }
-    }
-
-
-    /**
-     * Returns the start page of a wiki for a given course. The start page has
-     * the keyword 'WikiWikiWeb'.
-     *
-     * @param  string $range_id Course id
-     * @return WikiPage
-     */
-    public static function getStartPage($range_id): WikiPage
-    {
-        $page_id = CourseConfig::get($range_id)->WIKI_STARTPAGE_ID;
-
-        if ($page_id) {
-            return self::find($page_id);
-        }
-
-        $page = new WikiPage();
-        $page->content = _('Dieses Wiki ist noch leer.');
-        if ($page->isEditable()) {
-            $page->content .=  ' ' . _("Bearbeiten Sie es!\nNeue Seiten oder Links werden einfach durch Eingeben von [nop][[Wikinamen]][/nop] in doppelten eckigen Klammern angelegt.");
-        }
-        return $page;
-    }
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Wiki Einträge'), 'wiki', $field_data);
-            }
-        }
-    }
-
-
-    /**
-     * Tests if a given Wikipage name (keyword) is a valid ancestor for this page.
-     *
-     * @param   string   $ancestor Wikipage name to be tested to be an ancestor
-     * @return  boolean  true if ok, false if not
-     *
-     */
-    public function isValidAncestor($ancestor): bool
-    {
-        if ($this->name === 'WikiWikiWeb' || $this->name === $ancestor) {
-            return false;
-        }
-
-        $keywords = array_map(
-            function ($descendant) {
-                return $descendant->name;
-            },
-            $this->getDescendants()
-        );
-
-        return !in_array($ancestor, $keywords);
-    }
-
-    /**
-     * Retrieve an array of all descending WikiPages (recursive).
-     *
-     * @return WikiPage[] Array of all descendant WikiPages
-     *
-     */
-    public function getDescendants(): array
-    {
-        $descendants = [];
-
-        foreach ($this->children as $child) {
-            array_push($descendants, $child, ...$child->getDescendants());
-        }
-
-        return $descendants;
-    }
-
-    /**
-     * @return array
-     */
-    public function getOnlineUsers(): array
-    {
-        $users = [];
-        WikiOnlineEditingUser::deleteBySQL(
-            "`page_id` = :page_id AND `chdate` < UNIX_TIMESTAMP() - :threshold",
-            [
-                'page_id' => $this->id,
-                'threshold' => WikiOnlineEditingUser::$threshold
-            ]
-        );
-        return $this->onlineeditingusers->map(function (WikiOnlineEditingUser $editing_user) {
-            return [
-                'user_id' => $editing_user->user_id,
-                'username' => $editing_user->user->username,
-                'fullname' => $editing_user->user->getFullName(),
-                'avatar' => Avatar::getAvatar($editing_user->user_id)->getURL(Avatar::SMALL),
-                'editing' => (bool) $editing_user->editing,
-                'editing_request' => (bool) $editing_user->editing_request,
-            ];
-        });
-    }
-}
diff --git a/lib/models/WikiPage.php b/lib/models/WikiPage.php
new file mode 100644
index 0000000..67ddd7e
--- /dev/null
+++ b/lib/models/WikiPage.php
@@ -0,0 +1,311 @@
+<?php
+/**
+ * WikiPage.class.php
+ * model class for table wiki
+ *
+ * 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.
+ *
+ * @author    mlunzena
+ * @copyright (c) Authors
+ *
+ * @property array $id alias for pk
+ * @property string $course_id database column
+ * @property string|null $user_id database column
+ * @property string $name database column
+ * @property string $content database column
+ * @property string|null $ancestor database column
+ * @property int|null $chdate database column
+ * @property int $version database column
+ * @property int|null $mkdate database column
+ * @property User|null $user belongs_to User
+ * @property Course $course belongs_to Course
+ * @property WikiVersion[]|SimpleORMapCollection $versions
+ * @property WikiOnlineEditingUser[]|SimpleORMapCollection $onlineeditingusers
+ * @property-read WikiPage $parent additional field
+ * @property-read WikiPage[] $children additional field
+ * @property-read WikiVersion|null $predecessor additional field
+ * @property-read int $versionnumber additional field
+ */
+class WikiPage extends SimpleORMap implements PrivacyObject
+{
+    /**
+     * Configures the model
+     * @param  array  $config Configuration
+     */
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'wiki_pages';
+
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id'
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'range_id',
+        ];
+        $config['has_many']['versions'] = [
+            'class_name'  => WikiVersion::class,
+            'foreign_key' => 'page_id',
+            'order_by'    => 'ORDER BY mkdate DESC',
+            'on_delete'   => 'delete',
+        ];
+        $config['has_many']['onlineeditingusers'] = [
+            'class_name' => WikiOnlineEditingUser::class,
+            'foreign_key' => 'page_id',
+            'on_delete'   => 'delete',
+        ];
+
+        $config['additional_fields']['parent'] = [
+            'get' => function (WikiPage $page): ?WikiPage {
+                return self::find($page->parent_id);
+            }
+        ];
+
+        $config['additional_fields']['children'] = [
+            'get' => function (WikiPage $page): array {
+                return self::findBySQL('parent_id = ?', [
+                    $page->id
+                ]);
+            }
+        ];
+        $config['additional_fields']['predecessor'] = [
+            'get' => function (WikiPage $page): ?WikiVersion {
+                return $page->versions ? $page->versions[0] : null;
+            }
+        ];
+        $config['additional_fields']['versionnumber'] = [
+            'get' => function (WikiPage $page): int {
+                return count($page->versions) + 1;
+            }
+        ];
+
+        $config['registered_callbacks']['before_store'][] = 'createVersion';
+        $config['default_values']['last_author'] = 'nobody';
+
+        parent::configure($config);
+    }
+
+
+    protected function createVersion()
+    {
+        $last_version = $this->versions[0];
+        if (
+            !$this->isNew()
+            && $this->content['content'] !== $this->content_db['content']
+            && (
+                $this->content_db['user_id'] !== $this->content['user_id']
+                || $this->content_db['chdate'] < time() - 60 * 30
+            )
+            && (!$last_version || $last_version['content'] !== $this['content'])
+        ) {
+            //Neue Version anlegen:
+            WikiVersion::create([
+                'page_id' => $this->id,
+                'name'    => $this->content_db['name'],
+                'content' => $this->content_db['content'],
+                'user_id' => $this->content_db['user_id'],
+                'mkdate'  => $this->content_db['chdate'],
+            ]);
+        }
+        return true;
+    }
+
+    public static function findByName($range_id, $name)
+    {
+        return self::findOneBySQL('name = :name AND range_id = :range_id', [
+            'range_id' => $range_id,
+            'name' => $name
+        ]);
+    }
+
+
+    /**
+     * Returns whether this page is visible to the given user.
+     * @param  string|null $user_id User id
+     * @return boolean indicating whether the page is visible
+     */
+    public function isReadable(?string $user_id = null): bool
+    {
+        if ($this->isNew()) {
+            return true;
+        }
+        // anyone can see this page if it belongs to a free course
+        if (
+            $this->read_permission === 'all'
+            && Config::get()->ENABLE_FREE_ACCESS
+            && $this->course
+            && !$this->course->lesezugriff
+        ) {
+            return true;
+        }
+        if ($user_id === null && User::findCurrent()) {
+            $user_id = User::findCurrent()->id;
+        }
+
+        if (
+            $this->read_permission === 'all'
+            && $GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)
+        ) {
+            return true;
+        }
+
+        if ($GLOBALS['perm']->have_studip_perm(
+            'dozent',
+            $this->range_id,
+            $user_id
+        )) {
+            return true;
+        }
+
+        if (in_array($this->read_permission, ['tutor', 'dozent'])) {
+            return $GLOBALS['perm']->have_studip_perm($this->read_permission, $this->range_id, $user_id);
+        } else {
+            return StatusgruppeUser::exists([$this->read_permission, $user_id]);
+        }
+    }
+
+    /**
+     * Returns whether this page is editable to the given user.
+     * @param  string|null  $user_id the ID of the user
+     * @return boolean indicating whether the page is editable
+     */
+    public function isEditable(?string $user_id = null): bool
+    {
+        if ($user_id === null && User::findCurrent()) {
+            $user_id = User::findCurrent()->id;
+        }
+        if ($GLOBALS['perm']->have_studip_perm(
+            'dozent',
+            $this->range_id,
+            $user_id
+        )) {
+            return true;
+        }
+        if ($this->write_permission === 'all') {
+            return true;
+        }
+        if (in_array($this->write_permission, ['tutor', 'dozent'])) {
+            return $GLOBALS['perm']->have_studip_perm(
+                $this->write_permission,
+                $this->range_id,
+                $user_id
+            );
+        } else {
+            return StatusgruppeUser::exists([$this->write_permission, $user_id]);
+        }
+    }
+
+
+    /**
+     * Returns the start page of a wiki for a given course. The start page has
+     * the keyword 'WikiWikiWeb'.
+     *
+     * @param  string $range_id Course id
+     * @return WikiPage
+     */
+    public static function getStartPage($range_id): WikiPage
+    {
+        $page_id = CourseConfig::get($range_id)->WIKI_STARTPAGE_ID;
+
+        if ($page_id) {
+            return self::find($page_id);
+        }
+
+        $page = new WikiPage();
+        $page->content = _('Dieses Wiki ist noch leer.');
+        if ($page->isEditable()) {
+            $page->content .=  ' ' . _("Bearbeiten Sie es!\nNeue Seiten oder Links werden einfach durch Eingeben von [nop][[Wikinamen]][/nop] in doppelten eckigen Klammern angelegt.");
+        }
+        return $page;
+    }
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findBySQL("user_id = ?", [$storage->user_id]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Wiki Einträge'), 'wiki', $field_data);
+            }
+        }
+    }
+
+
+    /**
+     * Tests if a given Wikipage name (keyword) is a valid ancestor for this page.
+     *
+     * @param   string   $ancestor Wikipage name to be tested to be an ancestor
+     * @return  boolean  true if ok, false if not
+     *
+     */
+    public function isValidAncestor($ancestor): bool
+    {
+        if ($this->name === 'WikiWikiWeb' || $this->name === $ancestor) {
+            return false;
+        }
+
+        $keywords = array_map(
+            function ($descendant) {
+                return $descendant->name;
+            },
+            $this->getDescendants()
+        );
+
+        return !in_array($ancestor, $keywords);
+    }
+
+    /**
+     * Retrieve an array of all descending WikiPages (recursive).
+     *
+     * @return WikiPage[] Array of all descendant WikiPages
+     *
+     */
+    public function getDescendants(): array
+    {
+        $descendants = [];
+
+        foreach ($this->children as $child) {
+            array_push($descendants, $child, ...$child->getDescendants());
+        }
+
+        return $descendants;
+    }
+
+    /**
+     * @return array
+     */
+    public function getOnlineUsers(): array
+    {
+        $users = [];
+        WikiOnlineEditingUser::deleteBySQL(
+            "`page_id` = :page_id AND `chdate` < UNIX_TIMESTAMP() - :threshold",
+            [
+                'page_id' => $this->id,
+                'threshold' => WikiOnlineEditingUser::$threshold
+            ]
+        );
+        return $this->onlineeditingusers->map(function (WikiOnlineEditingUser $editing_user) {
+            return [
+                'user_id' => $editing_user->user_id,
+                'username' => $editing_user->user->username,
+                'fullname' => $editing_user->user->getFullName(),
+                'avatar' => Avatar::getAvatar($editing_user->user_id)->getURL(Avatar::SMALL),
+                'editing' => (bool) $editing_user->editing,
+                'editing_request' => (bool) $editing_user->editing_request,
+            ];
+        });
+    }
+}
diff --git a/lib/models/calendar/CalendarCourseDate.class.php b/lib/models/calendar/CalendarCourseDate.class.php
deleted file mode 100644
index 370dcd1..0000000
--- a/lib/models/calendar/CalendarCourseDate.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * CalendarCourseDate is a specialisation of CourseDate for
- * course dates that are displayed in the personal calendar.
- */
-class CalendarCourseDate extends CourseDate
-{
-    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
-    {
-        $events = [];
-        parent::findEachBySQL(
-            function ($e) use (&$events, $range_id) {
-                if (self::checkRelated($e, $range_id)) {
-                    $events[] = $e;
-                }
-            },
-            "JOIN `seminar_user`
-               ON `seminar_user`.`seminar_id` = `termine`.`range_id`
-             WHERE `seminar_user`.`user_id` = :user_id
-               AND `seminar_user`.`bind_calendar` = '1'
-               AND `termine`.`date` BETWEEN :begin AND :end
-               AND (
-                   IFNULL(`termine`.`metadate_id`, '') = ''
-                   OR `termine`.`metadate_id` NOT IN (
-                       SELECT `metadate_id`
-                       FROM `schedule_seminare`
-                       WHERE `user_id` = :user_id
-                         AND `visible` = 0
-                   )
-               )
-               ORDER BY date",
-            [
-                'begin'   => $begin->getTimestamp(),
-                'end'     => $end->getTimestamp(),
-                'user_id' => $range_id
-            ]
-        );
-        return $events;
-    }
-
-    /**
-     * Checks if given user is the responsible lecturer or is member of a
-     * related group.
-     *
-     * @global object $perm The global perm object.
-     * @param CalendarCourseDate $event The course event to check against.
-     * @param string $user_id The id of the user.
-     * @return boolean
-     */
-    protected static function checkRelated(CalendarCourseDate $event, string $user_id): bool
-    {
-        $check_related = false;
-        $permission = $GLOBALS['perm']->get_studip_perm($event->range_id, $user_id);
-        switch ($permission) {
-            case 'dozent' :
-                $related_persons = $event->dozenten->pluck('user_id');
-                if (count($related_persons) > 0) {
-                    $check_related = in_array($user_id, $related_persons);
-                } else {
-                    $check_related = true;
-                }
-                break;
-            case 'tutor' :
-                $check_related = true;
-                break;
-            default :
-                $group_ids = $event->statusgruppen->pluck('statusgruppe_id');
-                if (count($group_ids) > 0) {
-                    $member = StatusgruppeUser::findBySQL(
-                        'statusgruppe_id IN(?) AND user_id = ?',
-                        [$group_ids, $user_id]);
-                    $check_related = count($member) > 0;
-                } else {
-                    $check_related = true;
-                }
-        }
-        return $check_related;
-    }
-}
diff --git a/lib/models/calendar/CalendarCourseDate.php b/lib/models/calendar/CalendarCourseDate.php
new file mode 100644
index 0000000..370dcd1
--- /dev/null
+++ b/lib/models/calendar/CalendarCourseDate.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * CalendarCourseDate is a specialisation of CourseDate for
+ * course dates that are displayed in the personal calendar.
+ */
+class CalendarCourseDate extends CourseDate
+{
+    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
+    {
+        $events = [];
+        parent::findEachBySQL(
+            function ($e) use (&$events, $range_id) {
+                if (self::checkRelated($e, $range_id)) {
+                    $events[] = $e;
+                }
+            },
+            "JOIN `seminar_user`
+               ON `seminar_user`.`seminar_id` = `termine`.`range_id`
+             WHERE `seminar_user`.`user_id` = :user_id
+               AND `seminar_user`.`bind_calendar` = '1'
+               AND `termine`.`date` BETWEEN :begin AND :end
+               AND (
+                   IFNULL(`termine`.`metadate_id`, '') = ''
+                   OR `termine`.`metadate_id` NOT IN (
+                       SELECT `metadate_id`
+                       FROM `schedule_seminare`
+                       WHERE `user_id` = :user_id
+                         AND `visible` = 0
+                   )
+               )
+               ORDER BY date",
+            [
+                'begin'   => $begin->getTimestamp(),
+                'end'     => $end->getTimestamp(),
+                'user_id' => $range_id
+            ]
+        );
+        return $events;
+    }
+
+    /**
+     * Checks if given user is the responsible lecturer or is member of a
+     * related group.
+     *
+     * @global object $perm The global perm object.
+     * @param CalendarCourseDate $event The course event to check against.
+     * @param string $user_id The id of the user.
+     * @return boolean
+     */
+    protected static function checkRelated(CalendarCourseDate $event, string $user_id): bool
+    {
+        $check_related = false;
+        $permission = $GLOBALS['perm']->get_studip_perm($event->range_id, $user_id);
+        switch ($permission) {
+            case 'dozent' :
+                $related_persons = $event->dozenten->pluck('user_id');
+                if (count($related_persons) > 0) {
+                    $check_related = in_array($user_id, $related_persons);
+                } else {
+                    $check_related = true;
+                }
+                break;
+            case 'tutor' :
+                $check_related = true;
+                break;
+            default :
+                $group_ids = $event->statusgruppen->pluck('statusgruppe_id');
+                if (count($group_ids) > 0) {
+                    $member = StatusgruppeUser::findBySQL(
+                        'statusgruppe_id IN(?) AND user_id = ?',
+                        [$group_ids, $user_id]);
+                    $check_related = count($member) > 0;
+                } else {
+                    $check_related = true;
+                }
+        }
+        return $check_related;
+    }
+}
diff --git a/lib/models/calendar/CalendarCourseExDate.class.php b/lib/models/calendar/CalendarCourseExDate.class.php
deleted file mode 100644
index eb23aeb..0000000
--- a/lib/models/calendar/CalendarCourseExDate.class.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * CalendarCourseExDate is a specialisation of CourseExDate for
- * cancelled course dates that are displayed in the personal calendar.
- */
-class CalendarCourseExDate extends CourseExDate
-{
-    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
-    {
-        return parent::findBySQL(
-            "JOIN `seminar_user`
-               ON `seminar_user`.`seminar_id` = `ex_termine`.`range_id`
-             WHERE `seminar_user`.`user_id` = :user_id
-               AND `seminar_user`.`bind_calendar` = '1'
-               AND `ex_termine`.`date` BETWEEN :begin AND :end
-               AND `ex_termine`.`content` <> ''
-               AND (
-                   IFNULL(`ex_termine`.`metadate_id`, '') = ''
-                   OR `ex_termine`.`metadate_id` NOT IN (
-                       SELECT `metadate_id`
-                       FROM `schedule_seminare`
-                       WHERE `user_id` = :user_id
-                         AND `visible` = 0
-                 )
-             )
-             ORDER BY date",
-            [
-                'begin'   => $begin->getTimestamp(),
-                'end'     => $end->getTimestamp(),
-                'user_id' => $range_id
-            ]
-        );
-    }
-}
diff --git a/lib/models/calendar/CalendarCourseExDate.php b/lib/models/calendar/CalendarCourseExDate.php
new file mode 100644
index 0000000..eb23aeb
--- /dev/null
+++ b/lib/models/calendar/CalendarCourseExDate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * CalendarCourseExDate is a specialisation of CourseExDate for
+ * cancelled course dates that are displayed in the personal calendar.
+ */
+class CalendarCourseExDate extends CourseExDate
+{
+    public static function getEvents(DateTime $begin, DateTime $end, string $range_id): array
+    {
+        return parent::findBySQL(
+            "JOIN `seminar_user`
+               ON `seminar_user`.`seminar_id` = `ex_termine`.`range_id`
+             WHERE `seminar_user`.`user_id` = :user_id
+               AND `seminar_user`.`bind_calendar` = '1'
+               AND `ex_termine`.`date` BETWEEN :begin AND :end
+               AND `ex_termine`.`content` <> ''
+               AND (
+                   IFNULL(`ex_termine`.`metadate_id`, '') = ''
+                   OR `ex_termine`.`metadate_id` NOT IN (
+                       SELECT `metadate_id`
+                       FROM `schedule_seminare`
+                       WHERE `user_id` = :user_id
+                         AND `visible` = 0
+                 )
+             )
+             ORDER BY date",
+            [
+                'begin'   => $begin->getTimestamp(),
+                'end'     => $end->getTimestamp(),
+                'user_id' => $range_id
+            ]
+        );
+    }
+}
diff --git a/lib/models/calendar/CalendarDate.class.php b/lib/models/calendar/CalendarDate.class.php
deleted file mode 100644
index d901cf1..0000000
--- a/lib/models/calendar/CalendarDate.class.php
+++ /dev/null
@@ -1,946 +0,0 @@
-<?php
-/**
- * CalendarDate.class.php - Model class for calendar dates.
- *
- * CalendarDate represents a date in the personal calendar.
- *
- * 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.
- *
- * @author      Peter Thienel <thienel@data-quest.de>
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       3.2
- *
- * @property string id database column
- * @property string author_id database column
- * @property string editor_id database column
- * @property string unique_id database column
- * @property string begin database column
- * @property string end database column
- * @property string title database column
- * @property string description database column
- * @property string access database column
- * @property string user_category database column
- * @property string category database column
- * @property string location database column
- * @property string interval database column
- * @property string offset database column
- * @property string days database column
- * @property string month database column
- * @property string day_offset database column
- * @property string repetition_type database column
- * @property string number_of_dates database column
- * @property string repetition_end database column
- * @property string mkdate database column
- * @property string chdate database column
- * @property string import_date database column
- */
-class CalendarDate extends SimpleORMap implements PrivacyObject
-{
-    /**
-     * NEVER_ENDING represents the value of the repetition_end field for
-     * a date that never ends. The value is the result of computing
-     * 2 ^ 31 - 1.
-     *
-     * NOTE: This constant must be changed long before 2038-01-19 03:14:07 UTC
-     * or else dates that should end at some specific point in time may end
-     * never.
-     */
-    public const NEVER_ENDING = 2147483647;
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'calendar_dates';
-
-        $config['belongs_to']['author'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'author_id',
-        ];
-        $config['belongs_to']['editor'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'editor_id',
-        ];
-        $config['has_many']['calendars'] = [
-            'class_name'  => CalendarDateAssignment::class,
-            'assoc_foreign_key' => 'calendar_date_id',
-            'on_store'    => 'store',
-            'on_delete'   => 'delete'
-        ];
-        $config['has_many']['exceptions'] = [
-            'class_name'  => CalendarDateException::class,
-            'assoc_foreign_key' => 'calendar_date_id',
-            'on_store'    => 'store',
-            'on_delete'   => 'delete'
-        ];
-
-        $config['default_values']['interval'] = 0;
-        $config['default_values']['offset'] = 0;
-
-        $config['registered_callbacks']['before_store'][] = 'calculateExpiration';
-        $config['registered_callbacks']['after_store'][] = 'cbSendDateModificationMail';
-        $config['registered_callbacks']['before_store'][] = 'cbGenerateUniqueId';
-
-        parent::configure($config);
-
-    }
-
-    public static function garbageCollect()
-    {
-        DBManager::get()->query(
-            'DELETE `calendar_dates`
-            FROM `calendar_date_assignments`
-            LEFT JOIN `calendar_dates` ON (`calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`)
-            WHERE `range_id` IS NULL'
-        );
-    }
-
-    /**
-     * @deprecated
-     */
-    public function getDefaultValue($field)
-    {
-        if ($field == 'begin') {
-            return time();
-        }
-        if ($field == 'end' && $this->content['begin']) {
-            return $this->content['begin'] + 3600;
-        }
-        return parent::getDefaultValue($field);
-    }
-
-    public function cbSendDateModificationMail()
-    {
-        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
-
-        foreach ($this->calendars as $calendar) {
-            if ($calendar->range_id === $this->editor_id) {
-                //The editor shall not get a mail about the changes they just made.
-                continue;
-            }
-            if (!$calendar->user) {
-                //Wrong range or not a user.
-                continue;
-            }
-            setTempLanguage($calendar->range_id);
-
-            $lang_path = getUserLanguagePath($calendar->range_id);
-            $template = $template_factory->open($lang_path . '/LC_MAILS/date_changed.php');
-            $template->set_attribute('date', $this);
-            $template->set_attribute('receiver', $calendar->user);
-            $template->set_attribute('receiver_date_assignment', $calendar);
-            $mail_text = $template->render();
-            Message::send(
-                '____%system%____',
-                [$calendar->user->username],
-                sprintf(_('Terminänderung durch %s'), $this->editor->getFullName()),
-                $mail_text
-            );
-
-            restoreLanguage();
-        }
-    }
-
-    /**
-     * Generates an unique id if it isn't present.
-     * @return void
-     */
-    public function cbGenerateUniqueId()
-    {
-        if (!$this->unique_id) {
-            $this->unique_id = 'Stud.IP-' . $this->id . '@' . ($_SERVER['SERVER_NAME'] ?? '');
-        }
-    }
-
-    /**
-     * TODO
-     *
-     * @param string $range_id
-     * @return bool
-     */
-    public function isVisible(string $range_id)
-    {
-        if (CalendarDateAssignment::exists([$range_id, $this->id])) {
-            //Users may see the dates in their calendar:
-            return true;
-        }
-
-        $assignments = CalendarDateAssignment::findByCalendar_date_id($this->id);
-        foreach ($assignments as $assignment) {
-            if ($assignment->course instanceof Course) {
-                if ($assignment->course->isCalendarReadable($range_id)) {
-                    return true;
-                }
-            } elseif ($assignment->user instanceof User) {
-                if ($assignment->user->isCalendarReadable($range_id)) {
-                    return true;
-                }
-            }
-        }
-
-        //In case the date is not in a calendar of the user or a course
-        //where the user has access to, it is only visible when it is public.
-        return $this->access === 'PUBLIC';
-    }
-
-
-    public function isWritable(string $range_id)
-    {
-        if (CalendarDateAssignment::exists([$range_id, $this->id])) {
-            //The date is in the calendar of the user/course
-            //and therefore, the user or course administrator (tutor, dozent)
-            //may change the date.
-            return true;
-        }
-        //In case $range_id is a User-ID, a check has to be made if the calendar
-        //date is bound to a course and the user has at least "tutor" permissions
-        //in the course.
-        if (User::exists($range_id)) {
-            $writable_via_course = false;
-            $assignments = CalendarDateAssignment::findByCalendar_date_id($this->id);
-            foreach ($assignments as $assignment) {
-                if (Course::exists($assignment->range_id)
-                    && $GLOBALS['perm']->have_studip_perm('tutor', $assignment->range_id, $range_id)) {
-                    $writable_via_course = true;
-                    break;
-                }
-            }
-            if ($writable_via_course) {
-                return true;
-            }
-        }
-
-        //Check contacts: Has the contact of the user that is represented by
-        //$range_id write permissions to all the calendars of all the users that
-        //are assigned to the date?
-
-        $contacts_with_write_permissions = Contact::countBySql(
-            "JOIN `calendar_date_assignments` cda
-               ON `contact`.`user_id` = cda.`range_id`
-            WHERE `contact`.`owner_id` = :current_range_id
-              AND `contact`.`calendar_permissions` = 'WRITE'
-              AND cda.`calendar_date_id` = :calendar_date_id
-              AND cda.`range_id` <> :current_range_id",
-            [
-                'calendar_date_id' => $this->id,
-                'current_range_id' => $range_id
-            ]
-        );
-        $other_participant_count = CalendarDateAssignment::countBySql(
-            "`calendar_date_id` = :calendar_date_id
-             AND `range_id` <> :current_range_id",
-            [
-                'calendar_date_id' => $this->id,
-                'current_range_id' => $range_id
-            ]
-        );
-
-        if ($contacts_with_write_permissions === $other_participant_count) {
-            //The user represented by $range_id has write permissions to all
-            //calendars of all the other users that are assigned to the date.
-            return true;
-        }
-
-        //NOTE: CALENDAR_GRANT_ALL_INSERT MUST NOT be regarded here, because it only
-        //defines the behavior when inserting calendar dates and not when modifying them.
-
-        //In case it is a course date, we must check if the user has write
-        //permissions from the course:
-        $course_assignments = CalendarDateAssignment::findBySql(
-            "JOIN `seminare`
-               ON `calendar_date_assignments`.`range_id` = `seminare`.`seminar_id`
-            WHERE `calendar_date_id` = :calendar_date_id",
-            ['calendar_date_id' => $this->id]
-        );
-        foreach ($course_assignments as $course_assignment) {
-            if ($course_assignment->course->isCalendarWritable($range_id)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Determines whether the date spans over one whole day. This means that the date takes
-     * place on one day from 0:00:00 to 23:59:59.
-     *
-     * @return bool True, if the date spans over the whole day, false otherwise.
-     */
-    public function isWholeDay() : bool
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->begin);
-        $end = new DateTime();
-        $end->setTimestamp($this->end);
-
-        if ($begin->format('Ymd') !== $end->format('Ymd')) {
-            //Beginning and end are on different days.
-            return false;
-        }
-        //If the beginning is on midnight and the end is one second before midnight of the next day,
-        //the date spans over the whole day.
-        return $begin->format('His') === '000000'
-            && $end->format('His') === '235959';
-    }
-
-
-    /**
-     * Calculates the value of the "expire" column in case the CalendarDate object
-     * has a repetition defined.
-     *
-     * @return void
-     */
-    public function calculateExpiration()
-    {
-        if (!in_array($this->repetition_type, ['DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY'])) {
-            //No repetition. Nothing to do.
-            return;
-        }
-        if ($this->number_of_dates > 1) {
-            //There is a certain amount of repetitions, so that the expiration date
-            //has to be calculated by that.
-            $expiration = new DateTime();
-            $expiration->setTimestamp($this->begin);
-            $interval_str = '';
-            if ($this->repetition_type === 'DAILY') {
-                $interval_str = sprintf('P%dD', ((int) $this->number_of_dates - 1) * $this->interval);
-            } elseif ($this->repetition_type === 'WEEKLY') {
-                $days_length = mb_strlen($this->days);
-                if ($days_length > 0) {
-                    $wday = $expiration->format('N');
-                    // set next weekday as first repetition
-                    $expiration->modify($this->getWeekdayName());
-
-                    $rep_offset = ($this->number_of_dates - 1) % $days_length;
-
-                    $rep_count = $this->number_of_dates - 1;
-
-                    $days_offset = floor($rep_count / $days_length) * 7 *
-                        $this->interval + $rep_offset - 1;
-                    $interval_str = sprintf('P%dD', $days_offset);
-                } else {
-                    $interval_str = sprintf('P%dW', ($this->number_of_dates - 1) * $this->interval);
-                }
-            } elseif ($this->repetition_type === 'MONTHLY') {
-                $interval_str = sprintf('P%dM', ($this->number_of_dates - 1) * $this->interval);
-            } elseif ($this->repetition_type === 'YEARLY') {
-                $interval_str = sprintf('P%dY', ($this->number_of_dates - 1) * $this->interval);
-            }
-            try {
-                $interval = new DateInterval($interval_str);
-                $expiration->add($interval);
-                $expiration->setTime(23, 59, 59);
-                $this->repetition_end = $expiration->getTimestamp();
-            } catch (Exception $e) {
-                //Nothing to do.
-            }
-        } elseif (!$this->repetition_end) {
-            //No expiration date is specified.
-            //This would mean that the event "never" expires.
-            $this->repetition_end = self::NEVER_ENDING;
-        }
-    }
-
-
-    /**
-     *
-     * Returns the DateInterval for the repetition of this calendar date.
-     *
-     * @return DateInterval|null The DateInterval for this calendar date or null
-     *     in case the date has no repetition.
-     * @throws Exception In case a DateInterval cannot be constructed.
-     */
-    public function getRepetitionInterval() : ?DateInterval
-    {
-        if ($this->repetition_type === 'DAILY') {
-            return new DateInterval(sprintf('P%uD', $this->interval));
-        } elseif ($this->repetition_type === 'WORKDAYS') {
-            return new DateInterval('P1W');
-        } elseif ($this->repetition_type === 'WEEKLY') {
-            return new DateInterval(sprintf('P%uW', $this->interval));
-        } elseif ($this->repetition_type === 'MONTHLY') {
-            return new DateInterval(sprintf('P%uM', $this->interval));
-        } elseif ($this->repetition_type === 'YEARLY') {
-            return new DateInterval(sprintf('P%uY', $this->interval));
-        }
-        //No repetition: no interval.
-        return null;
-    }
-
-
-    public function getRepetitionOffset() : ?DateInterval
-    {
-        if (!$this->offset) {
-            return null;
-        }
-
-        if ($this->repetition_type === 'MONTHLY') {
-            if ($this->days_offset) {
-                return new DateInterval(sprintf('P%1$uM%2$uD', $this->offset, $this->days_offset));
-            } else {
-                return new DateInterval(sprintf('P%uM', $this->offset));
-            }
-        } elseif ($this->repetition_type === 'YEARLY') {
-            return new DateInterval(sprintf('P%uM', $this->offset));
-        }
-        return null;
-    }
-
-
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $sorm = self::findThru($storage->user_id, [
-            'thru_table'        => 'calendar_date_assignments',
-            'thru_key'          => 'range_id',
-            'thru_assoc_key'    => 'calendar_date_id',
-            'assoc_foreign_key' => 'id',
-        ]);
-        if ($sorm) {
-            $field_data = [];
-            foreach ($sorm as $row) {
-                $field_data[] = $row->toRawArray();
-            }
-            if ($field_data) {
-                $storage->addTabularData(_('Kalendereinträge'), 'calendar_dates', $field_data);
-            }
-        }
-    }
-
-
-    /**
-     * This is a helper method to set all the fields for date repetition to an empty string.
-     *
-     * @return void
-     */
-    public function clearRepetitionFields()
-    {
-        $this->repetition_type = '';
-        $this->interval = '';
-        $this->offset = '';
-        $this->days = '';
-        $this->month = '';
-        $this->number_of_dates = '1';
-        $this->repetition_end = '';
-    }
-
-    public function getAccessAsString() : string
-    {
-        if ($this->access === 'PUBLIC') {
-            return _('Öffentlich');
-        } elseif ($this->access === 'PRIVATE') {
-            return _('Privat');
-        } elseif ($this->access === 'CONFIDENTIAL') {
-            return _('Vertraulich');
-        } else {
-            return _('Keine Angabe');
-        }
-    }
-
-    public function getRepetitionAsString() : string
-    {
-        require_once 'lib/dates.inc.php';
-
-        $repetition_string = '';
-
-        if ($this->repetition_type === 'SINGLE') {
-            $repetition_string = _('Keine Wiederholung');
-        } elseif ($this->repetition_type === 'DAILY') {
-            if ($this->interval > 0) {
-                if ($this->interval == '1') {
-                    //Each day
-                    if ($this->number_of_dates > 1) {
-                        $repetition_string = sprintf(
-                            _('Täglich (%u Termine)'),
-                            $this->number_of_dates
-                        );
-                    } elseif ($this->repetition_end < CalendarDate::NEVER_ENDING) {
-                        $repetition_string = sprintf(
-                            _('Täglich bis zum %1$s'),
-                            date('d.m.Y', $this->repetition_end)
-                        );
-                    } else {
-                        $repetition_string = _('Täglich ohne Begrenzung');
-                    }
-                } else {
-                    //Every %u day
-                    if ($this->number_of_dates > 1) {
-                        $repetition_string = sprintf(
-                            _('Jeden %1$u. Tag (%2$u Termine)'),
-                            $this->interval,
-                            $this->number_of_dates
-                        );
-                    } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                        $repetition_string = sprintf(
-                            _('Jeden %1$u. Tag bis zum %2$s'),
-                            $this->interval,
-                            date('d.m.Y', $this->repetition_end)
-                        );
-                    } else {
-                        $repetition_string = sprintf(
-                            _('Jeden %u. Tag ohne Begrenzung'),
-                            $this->interval
-                        );
-                    }
-                }
-            }
-        } elseif ($this->repetition_type === 'WEEKLY') {
-            $weekday_string = '';
-            if (strlen($this->days) > 1) {
-                //Multiple days
-                $days = [];
-                foreach (str_split($this->days) as $day_number) {
-                    if ($day_number == '7') {
-                        $day_number = '0';
-                    }
-                    $days[] = getWeekday($day_number, false);
-                }
-                $all_but_last_day = array_slice($days, 0, -1);
-                $weekday_string = sprintf(
-                    _('%1$s und %2$s'),
-                    implode(', ', $all_but_last_day),
-                    end($days)
-                );
-            } else {
-                //One day
-                $weekday_string = getWeekday($this->days[0], false);
-            }
-            if ($this->interval == '1') {
-                //Each week
-                if ($this->number_of_dates > 1) {
-                    $repetition_string = sprintf(
-                        ngettext('Einmal am folgenden %s', 'Jeden %1$s (%2$u Termine)', $this->number_of_dates - 1),
-                        $weekday_string,
-                        $this->number_of_dates
-                    );
-                } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                    $repetition_string = sprintf(
-                        _('Jeden %1$s bis zum %2$s'),
-                        $weekday_string,
-                        date('d.m.Y', $this->repetition_end)
-                    );
-                } else {
-                    $repetition_string = sprintf(
-                        _('Jeden %s ohne Begrenzung'),
-                        $weekday_string
-                    );
-                }
-            } else {
-                //Every %u week
-                if ($this->number_of_dates > 1) {
-                    $repetition_string = sprintf(
-                        _('Jeden %1$u. %2$s (%3$u Termine)'),
-                        $this->interval,
-                        $weekday_string,
-                        $this->number_of_dates
-                    );
-                } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                    $repetition_string = sprintf(
-                        _('Jeden %1$u. %2$s bis zum %3$s'),
-                        $this->interval,
-                        $weekday_string,
-                        date('d.m.Y', $this->repetition_end)
-                    );
-                } else {
-                    $repetition_string = sprintf(
-                        _('Jeden %1$u. %2$s ohne Begrenzung'),
-                        $this->interval,
-                        $weekday_string
-                    );
-                }
-            }
-        } elseif ($this->repetition_type === 'MONTHLY') {
-            if ($this->interval == '1') {
-                //Each month
-                if ($this->days) {
-                    if ($this->offset < 0) {
-                        //Repetition on one specific day of week in the last week.
-                        $repetition_string = sprintf(
-                            _('Jeden Monat am letzten %s'),
-                            getWeekday($this->days, false)
-                        );
-                    } else {
-                        //Repetition on one specific day of week in a specific week.
-                        $repetition_string = sprintf(
-                            _('Jeden Monat am %1$u. %2$s'),
-                            $this->offset,
-                            getWeekday($this->days, false)
-                        );
-                    }
-                } else {
-                    //Repetition on one specific day of month.
-                    $repetition_string = sprintf(
-                        _('Jeden Monat am %u. Tag'),
-                        $this->offset
-                    );
-                }
-            } else {
-                //Every %u month
-                if ($this->days) {
-                    if ($this->offset < 0) {
-                        //Repetition on one specific day of week on the last week.
-                        $repetition_string = sprintf(
-                            _('Jeden %1$u. Monat am letzten %2$s'),
-                            $this->interval,
-                            getWeekday($this->days, false)
-                        );
-                    } else {
-                        //Repetition on one specific day of week in a specific week.
-                        $repetition_string = sprintf(
-                            _('Jeden %1$u. Monat am %2$u. %3$s'),
-                            $this->interval,
-                            $this->offset,
-                            getWeekday($this->days, false)
-                        );
-                    }
-                } else {
-                    //Repetition on one specific day of month.
-                    $repetition_string = sprintf(
-                        _('Jeden %1$u. Monat am %2$u.'),
-                        $this->interval,
-                        $this->offset
-                    );
-                }
-            }
-        } elseif ($this->repetition_type === 'YEARLY') {
-            if ($this->interval == '1') {
-                //Each year
-                if ($this->days) {
-                    //Repetition on one specific day of week in a specific week
-                    //in a specific month.
-                    if ($this->offset < 0) {
-                        if ($this->number_of_dates > 1) {
-                            $repetition_string = sprintf(
-                                _('Jedes Jahr im %1$s am letzten %2$s (%3$u Termine)'),
-                                getMonthName($this->month, false),
-                                getWeekday($this->days, false),
-                                $this->number_of_dates
-                            );
-                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                            $repetition_string = sprintf(
-                                _('Jedes Jahr im %1$s am letzten %2$s bis zum %3$s'),
-                                getMonthName($this->month, false),
-                                getWeekday($this->days, false),
-                                date('d.m.Y', $this->repetition_end)
-                            );
-                        } else {
-                            $repetition_string = sprintf(
-                                _('Jedes Jahr im %1$s am letzten %2$s ohne Begrenzung'),
-                                getMonthName($this->month, false),
-                                getWeekday($this->days, false)
-                            );
-                        }
-                    } else {
-                        if ($this->number_of_dates > 1) {
-                            $repetition_string = sprintf(
-                                _('Jedes Jahr im %1$s am %2$u. %3$s (%4$u Termine'),
-                                getMonthName($this->month, false),
-                                $this->offset,
-                                getWeekday($this->days, false),
-                                $this->number_of_dates
-                            );
-                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                            $repetition_string = sprintf(
-                                _('Jedes Jahr im %1$s am %2$u. %3$s bis zum %4$s'),
-                                getMonthName($this->month, false),
-                                $this->offset,
-                                getWeekday($this->days, false),
-                                date('d.m.Y', $this->repetition_end)
-                            );
-                        } else {
-                            $repetition_string = sprintf(
-                                _('Jedes Jahr im %1$s am %2$u. %3$s ohne Begrenzung'),
-                                getMonthName($this->month, false),
-                                $this->offset,
-                                getWeekday($this->days, false)
-                            );
-                        }
-                    }
-                } else {
-                    //Repetition on one specific day of month.
-                    if ($this->number_of_dates > 1) {
-                        $repetition_string = sprintf(
-                            _('Jedes Jahr am %1$u. %2$s (%3$u Termine)'),
-                            $this->offset,
-                            getMonthName($this->month, false),
-                            $this->number_of_dates
-                        );
-                    } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                        $repetition_string = sprintf(
-                            _('Jedes Jahr am %1$u. %2$s bis zum %3$s'),
-                            $this->offset,
-                            getMonthName($this->month, false),
-                            date('d.m.Y', $this->repetition_end)
-                        );
-                    } else {
-                        $repetition_string = sprintf(
-                            _('Jedes Jahr am %1$u. %2$s ohne Begrenzung'),
-                            $this->offset,
-                            getMonthName($this->month, false)
-                        );
-                    }
-                }
-            } else {
-                //Every %u years
-                if ($this->days) {
-                    //Repetition on one specific day of week in a specific week
-                    //in a specific month.
-                    if ($this->offset < 0) {
-                        if ($this->number_of_dates > 1) {
-                            $repetition_string = sprintf(
-                                _('Jedes %1$u. Jahr im %2$s am letzten %3$s (%4$u Termine)'),
-                                $this->interval,
-                                getMonthName($this->month, false),
-                                getWeekday($this->days, false),
-                                $this->number_of_dates
-                            );
-                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                            $repetition_string = sprintf(
-                                _('Jedes %1$u. Jahr im %2$s am letzten %3$s bis zum %4$s'),
-                                $this->interval,
-                                getMonthName($this->month, false),
-                                getWeekday($this->days, false),
-                                date('d.m.Y', $this->repetition_end)
-                            );
-                        } else {
-                            $repetition_string = sprintf(
-                                _('Jedes %1$u. Jahr im %2$s am letzten %3$s ohne Begrenzung'),
-                                $this->interval,
-                                getMonthName($this->month, false),
-                                getWeekday($this->days, false)
-                            );
-                        }
-                    } else {
-                        if ($this->number_of_dates > 1) {
-                            $repetition_string = sprintf(
-                                _('Jedes %1$u. Jahr im %2$s am %3$u. %4$s (%5$u Termine)'),
-                                $this->interval,
-                                getMonthName($this->month, false),
-                                $this->offset,
-                                getWeekday($this->days, false),
-                                $this->number_of_dates
-                            );
-                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                            $repetition_string = sprintf(
-                                _('Jedes %1$u. Jahr im %2$s am %3$u. %4$s bis zum %5$s'),
-                                $this->interval,
-                                getMonthName($this->month, false),
-                                $this->offset,
-                                getWeekday($this->days, false),
-                                date('d.m.Y', $this->repetition_end)
-                            );
-                        } else {
-                            $repetition_string = sprintf(
-                                _('Jedes %1$u. Jahr im %2$s am %3$u. %4$s ohne Begrenzung'),
-                                $this->interval,
-                                getMonthName($this->month, false),
-                                $this->offset,
-                                getWeekday($this->days, false)
-                            );
-                        }
-                    }
-                } else {
-                    //Repetition on one specific day of month.
-                    if ($this->number_of_dates > 1) {
-                        $repetition_string = sprintf(
-                            _('Jedes %1$u. Jahr am %2$u. %3$s (%4$u Termine)'),
-                            $this->interval,
-                            $this->offset,
-                            getMonthName($this->month, false),
-                            $this->number_of_dates
-                        );
-                    } elseif ($this->repetition_end < self::NEVER_ENDING) {
-                        $repetition_string = sprintf(
-                            _('Jedes %1$u. Jahr am %2$u. %3$s bis zum %4$s'),
-                            $this->interval,
-                            $this->offset,
-                            getMonthName($this->month, false),
-                            date('d.m.Y', $this->repetition_end)
-                        );
-                    } else {
-                        $repetition_string = sprintf(
-                            _('Jedes %1$u. Jahr am %2$u. %3$s ohne Begrenzung'),
-                            $this->interval,
-                            $this->offset,
-                            getMonthName($this->month, false)
-                        );
-                    }
-                }
-            }
-        }
-
-        return $repetition_string;
-    }
-
-
-    /**
-     * Creates the HTML for creating a repetition input Vue component instance
-     * and fills it with the values from the model.
-     *
-     * @param string $element_name The name of the element.
-     *
-     * @return string The HTML code for creating the repetition input vue instance.
-     */
-    public function getRepetitionInputHtml(string $element_name = 'repetition') : string
-    {
-        $repetition_end_type = '';
-        $repetition_end_date = '';
-        $repetition_dow = '[]';
-        $repetition_dow_week = '';
-
-        if ($this->isNew()) {
-            $repetition_end_date = htmlReady(date('d.m.Y', $this->end));
-            $repetition_dow = sprintf('["%s"]', date('N', $this->begin));
-            $repetition_dow_week = '1';
-        } else {
-
-            if ($this->repetition_end && intval($this->repetition_end) !== self::NEVER_ENDING) {
-                $repetition_end_date = htmlReady(date('d.m.Y', $this->repetition_end));
-            } else {
-                //Provide a good default value in case the user wants to enable or change the repetition:
-                $repetition_end_date = htmlReady(date('d.m.Y', $this->end));
-            }
-            if ($this->days) {
-                $repetition_dow = json_encode(str_split($this->days));
-                $repetition_dow_week = $this->offset;
-            } else {
-                //The days field is not in use. Use the day of the beginning as a good default.
-                $repetition_dow = sprintf('["%s"]', date('N', $this->begin));
-                //Also set repetition_dow_week to 1 as a good default in case the user
-                //switches to the monthly repetition type where a specific day of week
-                //is selected instead of a specific day of month:
-                $repetition_dow_week = '1';
-            }
-
-            if ($this->number_of_dates > 1) {
-                $repetition_end_type = 'end_count';
-            } elseif ($this->repetition_end && intval($this->repetition_end) !== self::NEVER_ENDING) {
-                //The end date is at some certain date and not on the virtual "never" date.
-                $repetition_end_type = 'end_date';
-            }
-        }
-
-        $attributes = [
-            'name'                   => $element_name,
-            'default_date'           => $this->begin,
-            'repetition_type'        => $this->isNew() ? '' : $this->repetition_type,
-            'repetition_interval'    => $this->isNew() ? '1'  : $this->interval,
-            ':repetition_dow'        => $repetition_dow,
-            ':repetition_dow_week'   => $repetition_dow_week,
-            ':repetition_month'      => $this->isNew() ? date('m', $this->begin) : $this->month,
-            ':repetition_month_type' => $this->isNew() ? "'dom'" : ($this->days ? "'dow'" : "'dom'"),
-            ':repetition_dom'        => $this->isNew() ? date('d', $this->begin) : $this->offset,
-            ':repetition_end_type'   => sprintf("'%s'", $repetition_end_type),
-            ':number_of_dates'       => $this->isNew() ? '1' : $this->number_of_dates,
-            ':repetition_end_date'   => sprintf("'%s'", $repetition_end_date)
-        ];
-        return sprintf('<repetition-input %s></repetition-input>', arrayToHtmlAttributes($attributes));
-    }
-
-    public function getCategoryAsString() : string
-    {
-        if ($this->user_category) {
-            return $this->user_category;
-        }
-        return $GLOBALS['PERS_TERMIN_KAT'][$this->category]['name'] ?? '';
-    }
-
-    /**
-     * Returns the textual ordinal for the offset of a weekday from property offset
-     * or an empty string if offset is not set.
-     *
-     * @return string The textual ordinal.
-     */
-    public function getOrdinalName(): string
-    {
-        if (mb_strlen($this->offset)) {
-            $ordinal_array = [
-                '1' => 'first',
-                '2' => 'second',
-                '3' => 'third',
-                '4' => 'fourth',
-                '5' => 'fifth',
-                '-1' => 'last'
-            ];
-            return $ordinal_array[$this->offset];
-        }
-        return '';
-    }
-
-    /**
-     * Returns the short name of first weekday from property days or an
-     * empty string if days is not set.
-     *
-     * @param $offset int Offset of days.
-     * @return string Short name of weekday.
-     */
-    public function getWeekdayName(int $offset = 0): string
-    {
-        if (mb_strlen($this->days)) {
-            $wdays = [
-                '1' => 'mon',
-                '2' => 'tue',
-                '3' => 'wed',
-                '4' => 'thu',
-                '5' => 'fri',
-                '6' => 'sat',
-                '7' => 'sun'
-            ];
-            return $wdays[substr($this->days, $offset, 1)];
-        }
-        return '';
-    }
-
-    /**
-     * Returns a string representation of the access field.
-     *
-     * @return string A localised string of the access field.
-     */
-    public function getVisibilityAsString() : string
-    {
-        if ($this->access === 'PUBLIC') {
-            return _('Öffentlich');
-        } elseif ($this->access === 'CONFIDENTIAL') {
-            return _('Vertraulich');
-        } else {
-            return _('Privat');
-        }
-    }
-
-    /**
-     * Returns the names of the participants of the date. This also includes courses
-     * to which the date is assigned.
-     *
-     * @param string $user_id The user for which to generate the participant array.
-     *     The user with that ID is excluded from that list.
-     * @return array A list with the names of the participants of the date.
-     */
-    public function getParticipantsAsStringArray(string $user_id = '') : array
-    {
-        $participant_strings = [];
-        foreach ($this->calendars as $calendar) {
-            if ($calendar->range_id === $user_id) {
-                //Exclude the user for which to generate the list.
-                continue;
-            }
-            if ($calendar->course instanceof Course) {
-                $participant_strings[] = $calendar->course->getFullName();
-            } elseif ($calendar->user instanceof User) {
-                $participant_strings[] = $calendar->user->getFullName();
-            }
-        }
-
-        asort($participant_strings);
-
-        return $participant_strings;
-    }
-}
diff --git a/lib/models/calendar/CalendarDate.php b/lib/models/calendar/CalendarDate.php
new file mode 100644
index 0000000..d901cf1
--- /dev/null
+++ b/lib/models/calendar/CalendarDate.php
@@ -0,0 +1,946 @@
+<?php
+/**
+ * CalendarDate.class.php - Model class for calendar dates.
+ *
+ * CalendarDate represents a date in the personal calendar.
+ *
+ * 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.
+ *
+ * @author      Peter Thienel <thienel@data-quest.de>
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       3.2
+ *
+ * @property string id database column
+ * @property string author_id database column
+ * @property string editor_id database column
+ * @property string unique_id database column
+ * @property string begin database column
+ * @property string end database column
+ * @property string title database column
+ * @property string description database column
+ * @property string access database column
+ * @property string user_category database column
+ * @property string category database column
+ * @property string location database column
+ * @property string interval database column
+ * @property string offset database column
+ * @property string days database column
+ * @property string month database column
+ * @property string day_offset database column
+ * @property string repetition_type database column
+ * @property string number_of_dates database column
+ * @property string repetition_end database column
+ * @property string mkdate database column
+ * @property string chdate database column
+ * @property string import_date database column
+ */
+class CalendarDate extends SimpleORMap implements PrivacyObject
+{
+    /**
+     * NEVER_ENDING represents the value of the repetition_end field for
+     * a date that never ends. The value is the result of computing
+     * 2 ^ 31 - 1.
+     *
+     * NOTE: This constant must be changed long before 2038-01-19 03:14:07 UTC
+     * or else dates that should end at some specific point in time may end
+     * never.
+     */
+    public const NEVER_ENDING = 2147483647;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'calendar_dates';
+
+        $config['belongs_to']['author'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'author_id',
+        ];
+        $config['belongs_to']['editor'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'editor_id',
+        ];
+        $config['has_many']['calendars'] = [
+            'class_name'  => CalendarDateAssignment::class,
+            'assoc_foreign_key' => 'calendar_date_id',
+            'on_store'    => 'store',
+            'on_delete'   => 'delete'
+        ];
+        $config['has_many']['exceptions'] = [
+            'class_name'  => CalendarDateException::class,
+            'assoc_foreign_key' => 'calendar_date_id',
+            'on_store'    => 'store',
+            'on_delete'   => 'delete'
+        ];
+
+        $config['default_values']['interval'] = 0;
+        $config['default_values']['offset'] = 0;
+
+        $config['registered_callbacks']['before_store'][] = 'calculateExpiration';
+        $config['registered_callbacks']['after_store'][] = 'cbSendDateModificationMail';
+        $config['registered_callbacks']['before_store'][] = 'cbGenerateUniqueId';
+
+        parent::configure($config);
+
+    }
+
+    public static function garbageCollect()
+    {
+        DBManager::get()->query(
+            'DELETE `calendar_dates`
+            FROM `calendar_date_assignments`
+            LEFT JOIN `calendar_dates` ON (`calendar_dates`.`id` = `calendar_date_assignments`.`calendar_date_id`)
+            WHERE `range_id` IS NULL'
+        );
+    }
+
+    /**
+     * @deprecated
+     */
+    public function getDefaultValue($field)
+    {
+        if ($field == 'begin') {
+            return time();
+        }
+        if ($field == 'end' && $this->content['begin']) {
+            return $this->content['begin'] + 3600;
+        }
+        return parent::getDefaultValue($field);
+    }
+
+    public function cbSendDateModificationMail()
+    {
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+
+        foreach ($this->calendars as $calendar) {
+            if ($calendar->range_id === $this->editor_id) {
+                //The editor shall not get a mail about the changes they just made.
+                continue;
+            }
+            if (!$calendar->user) {
+                //Wrong range or not a user.
+                continue;
+            }
+            setTempLanguage($calendar->range_id);
+
+            $lang_path = getUserLanguagePath($calendar->range_id);
+            $template = $template_factory->open($lang_path . '/LC_MAILS/date_changed.php');
+            $template->set_attribute('date', $this);
+            $template->set_attribute('receiver', $calendar->user);
+            $template->set_attribute('receiver_date_assignment', $calendar);
+            $mail_text = $template->render();
+            Message::send(
+                '____%system%____',
+                [$calendar->user->username],
+                sprintf(_('Terminänderung durch %s'), $this->editor->getFullName()),
+                $mail_text
+            );
+
+            restoreLanguage();
+        }
+    }
+
+    /**
+     * Generates an unique id if it isn't present.
+     * @return void
+     */
+    public function cbGenerateUniqueId()
+    {
+        if (!$this->unique_id) {
+            $this->unique_id = 'Stud.IP-' . $this->id . '@' . ($_SERVER['SERVER_NAME'] ?? '');
+        }
+    }
+
+    /**
+     * TODO
+     *
+     * @param string $range_id
+     * @return bool
+     */
+    public function isVisible(string $range_id)
+    {
+        if (CalendarDateAssignment::exists([$range_id, $this->id])) {
+            //Users may see the dates in their calendar:
+            return true;
+        }
+
+        $assignments = CalendarDateAssignment::findByCalendar_date_id($this->id);
+        foreach ($assignments as $assignment) {
+            if ($assignment->course instanceof Course) {
+                if ($assignment->course->isCalendarReadable($range_id)) {
+                    return true;
+                }
+            } elseif ($assignment->user instanceof User) {
+                if ($assignment->user->isCalendarReadable($range_id)) {
+                    return true;
+                }
+            }
+        }
+
+        //In case the date is not in a calendar of the user or a course
+        //where the user has access to, it is only visible when it is public.
+        return $this->access === 'PUBLIC';
+    }
+
+
+    public function isWritable(string $range_id)
+    {
+        if (CalendarDateAssignment::exists([$range_id, $this->id])) {
+            //The date is in the calendar of the user/course
+            //and therefore, the user or course administrator (tutor, dozent)
+            //may change the date.
+            return true;
+        }
+        //In case $range_id is a User-ID, a check has to be made if the calendar
+        //date is bound to a course and the user has at least "tutor" permissions
+        //in the course.
+        if (User::exists($range_id)) {
+            $writable_via_course = false;
+            $assignments = CalendarDateAssignment::findByCalendar_date_id($this->id);
+            foreach ($assignments as $assignment) {
+                if (Course::exists($assignment->range_id)
+                    && $GLOBALS['perm']->have_studip_perm('tutor', $assignment->range_id, $range_id)) {
+                    $writable_via_course = true;
+                    break;
+                }
+            }
+            if ($writable_via_course) {
+                return true;
+            }
+        }
+
+        //Check contacts: Has the contact of the user that is represented by
+        //$range_id write permissions to all the calendars of all the users that
+        //are assigned to the date?
+
+        $contacts_with_write_permissions = Contact::countBySql(
+            "JOIN `calendar_date_assignments` cda
+               ON `contact`.`user_id` = cda.`range_id`
+            WHERE `contact`.`owner_id` = :current_range_id
+              AND `contact`.`calendar_permissions` = 'WRITE'
+              AND cda.`calendar_date_id` = :calendar_date_id
+              AND cda.`range_id` <> :current_range_id",
+            [
+                'calendar_date_id' => $this->id,
+                'current_range_id' => $range_id
+            ]
+        );
+        $other_participant_count = CalendarDateAssignment::countBySql(
+            "`calendar_date_id` = :calendar_date_id
+             AND `range_id` <> :current_range_id",
+            [
+                'calendar_date_id' => $this->id,
+                'current_range_id' => $range_id
+            ]
+        );
+
+        if ($contacts_with_write_permissions === $other_participant_count) {
+            //The user represented by $range_id has write permissions to all
+            //calendars of all the other users that are assigned to the date.
+            return true;
+        }
+
+        //NOTE: CALENDAR_GRANT_ALL_INSERT MUST NOT be regarded here, because it only
+        //defines the behavior when inserting calendar dates and not when modifying them.
+
+        //In case it is a course date, we must check if the user has write
+        //permissions from the course:
+        $course_assignments = CalendarDateAssignment::findBySql(
+            "JOIN `seminare`
+               ON `calendar_date_assignments`.`range_id` = `seminare`.`seminar_id`
+            WHERE `calendar_date_id` = :calendar_date_id",
+            ['calendar_date_id' => $this->id]
+        );
+        foreach ($course_assignments as $course_assignment) {
+            if ($course_assignment->course->isCalendarWritable($range_id)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines whether the date spans over one whole day. This means that the date takes
+     * place on one day from 0:00:00 to 23:59:59.
+     *
+     * @return bool True, if the date spans over the whole day, false otherwise.
+     */
+    public function isWholeDay() : bool
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->begin);
+        $end = new DateTime();
+        $end->setTimestamp($this->end);
+
+        if ($begin->format('Ymd') !== $end->format('Ymd')) {
+            //Beginning and end are on different days.
+            return false;
+        }
+        //If the beginning is on midnight and the end is one second before midnight of the next day,
+        //the date spans over the whole day.
+        return $begin->format('His') === '000000'
+            && $end->format('His') === '235959';
+    }
+
+
+    /**
+     * Calculates the value of the "expire" column in case the CalendarDate object
+     * has a repetition defined.
+     *
+     * @return void
+     */
+    public function calculateExpiration()
+    {
+        if (!in_array($this->repetition_type, ['DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY'])) {
+            //No repetition. Nothing to do.
+            return;
+        }
+        if ($this->number_of_dates > 1) {
+            //There is a certain amount of repetitions, so that the expiration date
+            //has to be calculated by that.
+            $expiration = new DateTime();
+            $expiration->setTimestamp($this->begin);
+            $interval_str = '';
+            if ($this->repetition_type === 'DAILY') {
+                $interval_str = sprintf('P%dD', ((int) $this->number_of_dates - 1) * $this->interval);
+            } elseif ($this->repetition_type === 'WEEKLY') {
+                $days_length = mb_strlen($this->days);
+                if ($days_length > 0) {
+                    $wday = $expiration->format('N');
+                    // set next weekday as first repetition
+                    $expiration->modify($this->getWeekdayName());
+
+                    $rep_offset = ($this->number_of_dates - 1) % $days_length;
+
+                    $rep_count = $this->number_of_dates - 1;
+
+                    $days_offset = floor($rep_count / $days_length) * 7 *
+                        $this->interval + $rep_offset - 1;
+                    $interval_str = sprintf('P%dD', $days_offset);
+                } else {
+                    $interval_str = sprintf('P%dW', ($this->number_of_dates - 1) * $this->interval);
+                }
+            } elseif ($this->repetition_type === 'MONTHLY') {
+                $interval_str = sprintf('P%dM', ($this->number_of_dates - 1) * $this->interval);
+            } elseif ($this->repetition_type === 'YEARLY') {
+                $interval_str = sprintf('P%dY', ($this->number_of_dates - 1) * $this->interval);
+            }
+            try {
+                $interval = new DateInterval($interval_str);
+                $expiration->add($interval);
+                $expiration->setTime(23, 59, 59);
+                $this->repetition_end = $expiration->getTimestamp();
+            } catch (Exception $e) {
+                //Nothing to do.
+            }
+        } elseif (!$this->repetition_end) {
+            //No expiration date is specified.
+            //This would mean that the event "never" expires.
+            $this->repetition_end = self::NEVER_ENDING;
+        }
+    }
+
+
+    /**
+     *
+     * Returns the DateInterval for the repetition of this calendar date.
+     *
+     * @return DateInterval|null The DateInterval for this calendar date or null
+     *     in case the date has no repetition.
+     * @throws Exception In case a DateInterval cannot be constructed.
+     */
+    public function getRepetitionInterval() : ?DateInterval
+    {
+        if ($this->repetition_type === 'DAILY') {
+            return new DateInterval(sprintf('P%uD', $this->interval));
+        } elseif ($this->repetition_type === 'WORKDAYS') {
+            return new DateInterval('P1W');
+        } elseif ($this->repetition_type === 'WEEKLY') {
+            return new DateInterval(sprintf('P%uW', $this->interval));
+        } elseif ($this->repetition_type === 'MONTHLY') {
+            return new DateInterval(sprintf('P%uM', $this->interval));
+        } elseif ($this->repetition_type === 'YEARLY') {
+            return new DateInterval(sprintf('P%uY', $this->interval));
+        }
+        //No repetition: no interval.
+        return null;
+    }
+
+
+    public function getRepetitionOffset() : ?DateInterval
+    {
+        if (!$this->offset) {
+            return null;
+        }
+
+        if ($this->repetition_type === 'MONTHLY') {
+            if ($this->days_offset) {
+                return new DateInterval(sprintf('P%1$uM%2$uD', $this->offset, $this->days_offset));
+            } else {
+                return new DateInterval(sprintf('P%uM', $this->offset));
+            }
+        } elseif ($this->repetition_type === 'YEARLY') {
+            return new DateInterval(sprintf('P%uM', $this->offset));
+        }
+        return null;
+    }
+
+
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $sorm = self::findThru($storage->user_id, [
+            'thru_table'        => 'calendar_date_assignments',
+            'thru_key'          => 'range_id',
+            'thru_assoc_key'    => 'calendar_date_id',
+            'assoc_foreign_key' => 'id',
+        ]);
+        if ($sorm) {
+            $field_data = [];
+            foreach ($sorm as $row) {
+                $field_data[] = $row->toRawArray();
+            }
+            if ($field_data) {
+                $storage->addTabularData(_('Kalendereinträge'), 'calendar_dates', $field_data);
+            }
+        }
+    }
+
+
+    /**
+     * This is a helper method to set all the fields for date repetition to an empty string.
+     *
+     * @return void
+     */
+    public function clearRepetitionFields()
+    {
+        $this->repetition_type = '';
+        $this->interval = '';
+        $this->offset = '';
+        $this->days = '';
+        $this->month = '';
+        $this->number_of_dates = '1';
+        $this->repetition_end = '';
+    }
+
+    public function getAccessAsString() : string
+    {
+        if ($this->access === 'PUBLIC') {
+            return _('Öffentlich');
+        } elseif ($this->access === 'PRIVATE') {
+            return _('Privat');
+        } elseif ($this->access === 'CONFIDENTIAL') {
+            return _('Vertraulich');
+        } else {
+            return _('Keine Angabe');
+        }
+    }
+
+    public function getRepetitionAsString() : string
+    {
+        require_once 'lib/dates.inc.php';
+
+        $repetition_string = '';
+
+        if ($this->repetition_type === 'SINGLE') {
+            $repetition_string = _('Keine Wiederholung');
+        } elseif ($this->repetition_type === 'DAILY') {
+            if ($this->interval > 0) {
+                if ($this->interval == '1') {
+                    //Each day
+                    if ($this->number_of_dates > 1) {
+                        $repetition_string = sprintf(
+                            _('Täglich (%u Termine)'),
+                            $this->number_of_dates
+                        );
+                    } elseif ($this->repetition_end < CalendarDate::NEVER_ENDING) {
+                        $repetition_string = sprintf(
+                            _('Täglich bis zum %1$s'),
+                            date('d.m.Y', $this->repetition_end)
+                        );
+                    } else {
+                        $repetition_string = _('Täglich ohne Begrenzung');
+                    }
+                } else {
+                    //Every %u day
+                    if ($this->number_of_dates > 1) {
+                        $repetition_string = sprintf(
+                            _('Jeden %1$u. Tag (%2$u Termine)'),
+                            $this->interval,
+                            $this->number_of_dates
+                        );
+                    } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                        $repetition_string = sprintf(
+                            _('Jeden %1$u. Tag bis zum %2$s'),
+                            $this->interval,
+                            date('d.m.Y', $this->repetition_end)
+                        );
+                    } else {
+                        $repetition_string = sprintf(
+                            _('Jeden %u. Tag ohne Begrenzung'),
+                            $this->interval
+                        );
+                    }
+                }
+            }
+        } elseif ($this->repetition_type === 'WEEKLY') {
+            $weekday_string = '';
+            if (strlen($this->days) > 1) {
+                //Multiple days
+                $days = [];
+                foreach (str_split($this->days) as $day_number) {
+                    if ($day_number == '7') {
+                        $day_number = '0';
+                    }
+                    $days[] = getWeekday($day_number, false);
+                }
+                $all_but_last_day = array_slice($days, 0, -1);
+                $weekday_string = sprintf(
+                    _('%1$s und %2$s'),
+                    implode(', ', $all_but_last_day),
+                    end($days)
+                );
+            } else {
+                //One day
+                $weekday_string = getWeekday($this->days[0], false);
+            }
+            if ($this->interval == '1') {
+                //Each week
+                if ($this->number_of_dates > 1) {
+                    $repetition_string = sprintf(
+                        ngettext('Einmal am folgenden %s', 'Jeden %1$s (%2$u Termine)', $this->number_of_dates - 1),
+                        $weekday_string,
+                        $this->number_of_dates
+                    );
+                } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                    $repetition_string = sprintf(
+                        _('Jeden %1$s bis zum %2$s'),
+                        $weekday_string,
+                        date('d.m.Y', $this->repetition_end)
+                    );
+                } else {
+                    $repetition_string = sprintf(
+                        _('Jeden %s ohne Begrenzung'),
+                        $weekday_string
+                    );
+                }
+            } else {
+                //Every %u week
+                if ($this->number_of_dates > 1) {
+                    $repetition_string = sprintf(
+                        _('Jeden %1$u. %2$s (%3$u Termine)'),
+                        $this->interval,
+                        $weekday_string,
+                        $this->number_of_dates
+                    );
+                } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                    $repetition_string = sprintf(
+                        _('Jeden %1$u. %2$s bis zum %3$s'),
+                        $this->interval,
+                        $weekday_string,
+                        date('d.m.Y', $this->repetition_end)
+                    );
+                } else {
+                    $repetition_string = sprintf(
+                        _('Jeden %1$u. %2$s ohne Begrenzung'),
+                        $this->interval,
+                        $weekday_string
+                    );
+                }
+            }
+        } elseif ($this->repetition_type === 'MONTHLY') {
+            if ($this->interval == '1') {
+                //Each month
+                if ($this->days) {
+                    if ($this->offset < 0) {
+                        //Repetition on one specific day of week in the last week.
+                        $repetition_string = sprintf(
+                            _('Jeden Monat am letzten %s'),
+                            getWeekday($this->days, false)
+                        );
+                    } else {
+                        //Repetition on one specific day of week in a specific week.
+                        $repetition_string = sprintf(
+                            _('Jeden Monat am %1$u. %2$s'),
+                            $this->offset,
+                            getWeekday($this->days, false)
+                        );
+                    }
+                } else {
+                    //Repetition on one specific day of month.
+                    $repetition_string = sprintf(
+                        _('Jeden Monat am %u. Tag'),
+                        $this->offset
+                    );
+                }
+            } else {
+                //Every %u month
+                if ($this->days) {
+                    if ($this->offset < 0) {
+                        //Repetition on one specific day of week on the last week.
+                        $repetition_string = sprintf(
+                            _('Jeden %1$u. Monat am letzten %2$s'),
+                            $this->interval,
+                            getWeekday($this->days, false)
+                        );
+                    } else {
+                        //Repetition on one specific day of week in a specific week.
+                        $repetition_string = sprintf(
+                            _('Jeden %1$u. Monat am %2$u. %3$s'),
+                            $this->interval,
+                            $this->offset,
+                            getWeekday($this->days, false)
+                        );
+                    }
+                } else {
+                    //Repetition on one specific day of month.
+                    $repetition_string = sprintf(
+                        _('Jeden %1$u. Monat am %2$u.'),
+                        $this->interval,
+                        $this->offset
+                    );
+                }
+            }
+        } elseif ($this->repetition_type === 'YEARLY') {
+            if ($this->interval == '1') {
+                //Each year
+                if ($this->days) {
+                    //Repetition on one specific day of week in a specific week
+                    //in a specific month.
+                    if ($this->offset < 0) {
+                        if ($this->number_of_dates > 1) {
+                            $repetition_string = sprintf(
+                                _('Jedes Jahr im %1$s am letzten %2$s (%3$u Termine)'),
+                                getMonthName($this->month, false),
+                                getWeekday($this->days, false),
+                                $this->number_of_dates
+                            );
+                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                            $repetition_string = sprintf(
+                                _('Jedes Jahr im %1$s am letzten %2$s bis zum %3$s'),
+                                getMonthName($this->month, false),
+                                getWeekday($this->days, false),
+                                date('d.m.Y', $this->repetition_end)
+                            );
+                        } else {
+                            $repetition_string = sprintf(
+                                _('Jedes Jahr im %1$s am letzten %2$s ohne Begrenzung'),
+                                getMonthName($this->month, false),
+                                getWeekday($this->days, false)
+                            );
+                        }
+                    } else {
+                        if ($this->number_of_dates > 1) {
+                            $repetition_string = sprintf(
+                                _('Jedes Jahr im %1$s am %2$u. %3$s (%4$u Termine'),
+                                getMonthName($this->month, false),
+                                $this->offset,
+                                getWeekday($this->days, false),
+                                $this->number_of_dates
+                            );
+                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                            $repetition_string = sprintf(
+                                _('Jedes Jahr im %1$s am %2$u. %3$s bis zum %4$s'),
+                                getMonthName($this->month, false),
+                                $this->offset,
+                                getWeekday($this->days, false),
+                                date('d.m.Y', $this->repetition_end)
+                            );
+                        } else {
+                            $repetition_string = sprintf(
+                                _('Jedes Jahr im %1$s am %2$u. %3$s ohne Begrenzung'),
+                                getMonthName($this->month, false),
+                                $this->offset,
+                                getWeekday($this->days, false)
+                            );
+                        }
+                    }
+                } else {
+                    //Repetition on one specific day of month.
+                    if ($this->number_of_dates > 1) {
+                        $repetition_string = sprintf(
+                            _('Jedes Jahr am %1$u. %2$s (%3$u Termine)'),
+                            $this->offset,
+                            getMonthName($this->month, false),
+                            $this->number_of_dates
+                        );
+                    } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                        $repetition_string = sprintf(
+                            _('Jedes Jahr am %1$u. %2$s bis zum %3$s'),
+                            $this->offset,
+                            getMonthName($this->month, false),
+                            date('d.m.Y', $this->repetition_end)
+                        );
+                    } else {
+                        $repetition_string = sprintf(
+                            _('Jedes Jahr am %1$u. %2$s ohne Begrenzung'),
+                            $this->offset,
+                            getMonthName($this->month, false)
+                        );
+                    }
+                }
+            } else {
+                //Every %u years
+                if ($this->days) {
+                    //Repetition on one specific day of week in a specific week
+                    //in a specific month.
+                    if ($this->offset < 0) {
+                        if ($this->number_of_dates > 1) {
+                            $repetition_string = sprintf(
+                                _('Jedes %1$u. Jahr im %2$s am letzten %3$s (%4$u Termine)'),
+                                $this->interval,
+                                getMonthName($this->month, false),
+                                getWeekday($this->days, false),
+                                $this->number_of_dates
+                            );
+                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                            $repetition_string = sprintf(
+                                _('Jedes %1$u. Jahr im %2$s am letzten %3$s bis zum %4$s'),
+                                $this->interval,
+                                getMonthName($this->month, false),
+                                getWeekday($this->days, false),
+                                date('d.m.Y', $this->repetition_end)
+                            );
+                        } else {
+                            $repetition_string = sprintf(
+                                _('Jedes %1$u. Jahr im %2$s am letzten %3$s ohne Begrenzung'),
+                                $this->interval,
+                                getMonthName($this->month, false),
+                                getWeekday($this->days, false)
+                            );
+                        }
+                    } else {
+                        if ($this->number_of_dates > 1) {
+                            $repetition_string = sprintf(
+                                _('Jedes %1$u. Jahr im %2$s am %3$u. %4$s (%5$u Termine)'),
+                                $this->interval,
+                                getMonthName($this->month, false),
+                                $this->offset,
+                                getWeekday($this->days, false),
+                                $this->number_of_dates
+                            );
+                        } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                            $repetition_string = sprintf(
+                                _('Jedes %1$u. Jahr im %2$s am %3$u. %4$s bis zum %5$s'),
+                                $this->interval,
+                                getMonthName($this->month, false),
+                                $this->offset,
+                                getWeekday($this->days, false),
+                                date('d.m.Y', $this->repetition_end)
+                            );
+                        } else {
+                            $repetition_string = sprintf(
+                                _('Jedes %1$u. Jahr im %2$s am %3$u. %4$s ohne Begrenzung'),
+                                $this->interval,
+                                getMonthName($this->month, false),
+                                $this->offset,
+                                getWeekday($this->days, false)
+                            );
+                        }
+                    }
+                } else {
+                    //Repetition on one specific day of month.
+                    if ($this->number_of_dates > 1) {
+                        $repetition_string = sprintf(
+                            _('Jedes %1$u. Jahr am %2$u. %3$s (%4$u Termine)'),
+                            $this->interval,
+                            $this->offset,
+                            getMonthName($this->month, false),
+                            $this->number_of_dates
+                        );
+                    } elseif ($this->repetition_end < self::NEVER_ENDING) {
+                        $repetition_string = sprintf(
+                            _('Jedes %1$u. Jahr am %2$u. %3$s bis zum %4$s'),
+                            $this->interval,
+                            $this->offset,
+                            getMonthName($this->month, false),
+                            date('d.m.Y', $this->repetition_end)
+                        );
+                    } else {
+                        $repetition_string = sprintf(
+                            _('Jedes %1$u. Jahr am %2$u. %3$s ohne Begrenzung'),
+                            $this->interval,
+                            $this->offset,
+                            getMonthName($this->month, false)
+                        );
+                    }
+                }
+            }
+        }
+
+        return $repetition_string;
+    }
+
+
+    /**
+     * Creates the HTML for creating a repetition input Vue component instance
+     * and fills it with the values from the model.
+     *
+     * @param string $element_name The name of the element.
+     *
+     * @return string The HTML code for creating the repetition input vue instance.
+     */
+    public function getRepetitionInputHtml(string $element_name = 'repetition') : string
+    {
+        $repetition_end_type = '';
+        $repetition_end_date = '';
+        $repetition_dow = '[]';
+        $repetition_dow_week = '';
+
+        if ($this->isNew()) {
+            $repetition_end_date = htmlReady(date('d.m.Y', $this->end));
+            $repetition_dow = sprintf('["%s"]', date('N', $this->begin));
+            $repetition_dow_week = '1';
+        } else {
+
+            if ($this->repetition_end && intval($this->repetition_end) !== self::NEVER_ENDING) {
+                $repetition_end_date = htmlReady(date('d.m.Y', $this->repetition_end));
+            } else {
+                //Provide a good default value in case the user wants to enable or change the repetition:
+                $repetition_end_date = htmlReady(date('d.m.Y', $this->end));
+            }
+            if ($this->days) {
+                $repetition_dow = json_encode(str_split($this->days));
+                $repetition_dow_week = $this->offset;
+            } else {
+                //The days field is not in use. Use the day of the beginning as a good default.
+                $repetition_dow = sprintf('["%s"]', date('N', $this->begin));
+                //Also set repetition_dow_week to 1 as a good default in case the user
+                //switches to the monthly repetition type where a specific day of week
+                //is selected instead of a specific day of month:
+                $repetition_dow_week = '1';
+            }
+
+            if ($this->number_of_dates > 1) {
+                $repetition_end_type = 'end_count';
+            } elseif ($this->repetition_end && intval($this->repetition_end) !== self::NEVER_ENDING) {
+                //The end date is at some certain date and not on the virtual "never" date.
+                $repetition_end_type = 'end_date';
+            }
+        }
+
+        $attributes = [
+            'name'                   => $element_name,
+            'default_date'           => $this->begin,
+            'repetition_type'        => $this->isNew() ? '' : $this->repetition_type,
+            'repetition_interval'    => $this->isNew() ? '1'  : $this->interval,
+            ':repetition_dow'        => $repetition_dow,
+            ':repetition_dow_week'   => $repetition_dow_week,
+            ':repetition_month'      => $this->isNew() ? date('m', $this->begin) : $this->month,
+            ':repetition_month_type' => $this->isNew() ? "'dom'" : ($this->days ? "'dow'" : "'dom'"),
+            ':repetition_dom'        => $this->isNew() ? date('d', $this->begin) : $this->offset,
+            ':repetition_end_type'   => sprintf("'%s'", $repetition_end_type),
+            ':number_of_dates'       => $this->isNew() ? '1' : $this->number_of_dates,
+            ':repetition_end_date'   => sprintf("'%s'", $repetition_end_date)
+        ];
+        return sprintf('<repetition-input %s></repetition-input>', arrayToHtmlAttributes($attributes));
+    }
+
+    public function getCategoryAsString() : string
+    {
+        if ($this->user_category) {
+            return $this->user_category;
+        }
+        return $GLOBALS['PERS_TERMIN_KAT'][$this->category]['name'] ?? '';
+    }
+
+    /**
+     * Returns the textual ordinal for the offset of a weekday from property offset
+     * or an empty string if offset is not set.
+     *
+     * @return string The textual ordinal.
+     */
+    public function getOrdinalName(): string
+    {
+        if (mb_strlen($this->offset)) {
+            $ordinal_array = [
+                '1' => 'first',
+                '2' => 'second',
+                '3' => 'third',
+                '4' => 'fourth',
+                '5' => 'fifth',
+                '-1' => 'last'
+            ];
+            return $ordinal_array[$this->offset];
+        }
+        return '';
+    }
+
+    /**
+     * Returns the short name of first weekday from property days or an
+     * empty string if days is not set.
+     *
+     * @param $offset int Offset of days.
+     * @return string Short name of weekday.
+     */
+    public function getWeekdayName(int $offset = 0): string
+    {
+        if (mb_strlen($this->days)) {
+            $wdays = [
+                '1' => 'mon',
+                '2' => 'tue',
+                '3' => 'wed',
+                '4' => 'thu',
+                '5' => 'fri',
+                '6' => 'sat',
+                '7' => 'sun'
+            ];
+            return $wdays[substr($this->days, $offset, 1)];
+        }
+        return '';
+    }
+
+    /**
+     * Returns a string representation of the access field.
+     *
+     * @return string A localised string of the access field.
+     */
+    public function getVisibilityAsString() : string
+    {
+        if ($this->access === 'PUBLIC') {
+            return _('Öffentlich');
+        } elseif ($this->access === 'CONFIDENTIAL') {
+            return _('Vertraulich');
+        } else {
+            return _('Privat');
+        }
+    }
+
+    /**
+     * Returns the names of the participants of the date. This also includes courses
+     * to which the date is assigned.
+     *
+     * @param string $user_id The user for which to generate the participant array.
+     *     The user with that ID is excluded from that list.
+     * @return array A list with the names of the participants of the date.
+     */
+    public function getParticipantsAsStringArray(string $user_id = '') : array
+    {
+        $participant_strings = [];
+        foreach ($this->calendars as $calendar) {
+            if ($calendar->range_id === $user_id) {
+                //Exclude the user for which to generate the list.
+                continue;
+            }
+            if ($calendar->course instanceof Course) {
+                $participant_strings[] = $calendar->course->getFullName();
+            } elseif ($calendar->user instanceof User) {
+                $participant_strings[] = $calendar->user->getFullName();
+            }
+        }
+
+        asort($participant_strings);
+
+        return $participant_strings;
+    }
+}
diff --git a/lib/models/calendar/CalendarDateAssignment.class.php b/lib/models/calendar/CalendarDateAssignment.class.php
deleted file mode 100644
index e0bf467..0000000
--- a/lib/models/calendar/CalendarDateAssignment.class.php
+++ /dev/null
@@ -1,722 +0,0 @@
-<?php
-/**
- * CalendarDateAssignment.class.php - Model class for calendar date assignments.
- *
- * CalendarDateAssignment represents the assignment of a calendar date
- *  to a specific calendar. The calendar is represented by a range-ID
- *  since it can be a personal calendar, course calendar or institute
- *  calendar.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       5.5
- *
- * @property string range_id The range-ID for the assignment.
- * @property string calendar_date_id The ID of the calendar date for the assignment.
- * @property string participation The participation status of the receiver (range_id).
- *     This column is an enum with the following values:
- *     - empty string: Participation status is unknown.
- *     - "ACCEPTED": The calendar owner accepted the date.
- *     - "DECLINED": The calendar owner declined the date.
- *     - "ACKNOWLEDGED": The calendar owner only acknowledged that the date exists
- *           but doesn't necessarily participate in it.
- * @property string mkdate The creation date of the assignment.
- * @property string chdate The modification date of the assignment.
- * @property CalendarDate|null calendar_date The associated calendar date object.
- */
-class CalendarDateAssignment extends SimpleORMap implements Event
-{
-    /**
-     * @var bool This attribute allows the suppression of automatic mail sending
-     *     when storing or deleting the calendar date assignment.
-     *     By default, mails are sent.
-     */
-    public $suppress_mails = false;
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'calendar_date_assignments';
-
-        $config['belongs_to']['calendar_date'] = [
-            'class_name'  => CalendarDate::class,
-            'foreign_key' => 'calendar_date_id',
-            'assoc_func'  => 'find'
-        ];
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'range_id',
-            'assoc_func'  => 'find'
-        ];
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'range_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['registered_callbacks']['after_create'][] = 'cbSendNewDateMail';
-        $config['registered_callbacks']['after_delete'][] = 'cbSendDateDeletedMail';
-
-        parent::configure($config);
-    }
-
-
-    public function cbSendNewDateMail()
-    {
-        if ($this->suppress_mails) {
-            return;
-        }
-        if ($this->range_id === $this->calendar_date->editor_id) {
-            return;
-        }
-        if (!$this->calendar_date || !$this->user) {
-            //Wrong calendar range (not a user) or invalid data set.
-            return;
-        }
-
-        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
-
-        setTempLanguage($this->range_id);
-        $lang_path = getUserLanguagePath($this->range_id);
-        $template = $template_factory->open($lang_path . '/LC_MAILS/date_created.php');
-        $template->set_attribute('date', $this->calendar_date);
-        $template->set_attribute('receiver', $this->user);
-        $mail_text = $template->render();
-        Message::send(
-            '____%system%____',
-            [$this->user->username],
-            sprintf(_('%s hat einen Termin im Kalender eingetragen'), $this->calendar_date->editor->getFullName()),
-            $mail_text
-        );
-
-        restoreLanguage();
-    }
-
-    public function cbSendDateDeletedMail()
-    {
-        if ($this->suppress_mails) {
-            return;
-        }
-        $actor = User::findCurrent() ?? $this->calendar_date->editor;
-        if ($this->range_id === $actor->id) {
-            //The user who deleted the date shall not get notified about this.
-            return;
-        }
-        if (!$this->calendar_date || !$this->user) {
-            //Wrong calendar range (not a user) or invalid data set.
-            return;
-        }
-
-        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
-
-        setTempLanguage($this->range_id);
-        $lang_path = getUserLanguagePath($this->range_id);
-        $template = $template_factory->open($lang_path . '/LC_MAILS/date_deleted.php');
-        $template->set_attribute('date', $this->calendar_date);
-        $template->set_attribute('actor', $actor);
-        $template->set_attribute('receiver', $this->user);
-        $mail_text = $template->render();
-        Message::send(
-            '____%system%____',
-            [$this->user->username],
-            sprintf(_('%s hat einen Termin im Kalender gelöscht'), $actor->getFullName()),
-            $mail_text
-        );
-
-        restoreLanguage();
-    }
-
-    /**
-     * Sends the participation status of the calendar the date
-     * is assigned to. This is only done for user calendars
-     * and not for course calendars.
-     *
-     * @return void
-     */
-    public function sendParticipationStatus() : void
-    {
-        if (!($this->user instanceof User)) {
-            //The calendar date is assigned to a course calendar.
-            return;
-        }
-
-        if (!$this->participation || $this->participation === 'ACKNOWLEDGED') {
-            //Nothing shall be done in these two cases.
-            return;
-        }
-
-        if (empty($this->calendar_date->author->username)) {
-            //The calendar date has no author.
-            return;
-        }
-        if ($this->range_id === $this->calendar_date->author_id) {
-            //The author of the date changed their participation status.
-            //So they know what they did and do not have to be notified.
-            return;
-        }
-
-        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
-
-        setTempLanguage($this->range_id);
-        $lang_path = getUserLanguagePath($this->range_id);
-        $template = $template_factory->open($lang_path . '/LC_MAILS/date_participation.php');
-        $template->set_attribute('date_assignment', $this);
-        $mail_text = $template->render();
-
-        $subject = '';
-        if ($this->participation === 'ACCEPTED') {
-            $subject = sprintf(
-                _('%1$s hat Ihren Termin am %2$s angenommen'),
-                $this->user->getFullName(),
-                date('d.m.Y', $this->calendar_date->begin)
-            );
-        } elseif ($this->participation === 'DECLINED') {
-            $subject = sprintf(
-                _('%1$s hat Ihren Termin am %2$s abgelehnt'),
-                $this->user->getFullName(),
-                date('d.m.Y', $this->calendar_date->begin)
-            );
-        }
-
-        Message::send(
-            '____%system%____',
-            [$this->calendar_date->author->username],
-            $subject,
-            $mail_text
-        );
-
-        restoreLanguage();
-    }
-
-    /**
-     * Retrieves calendar dates inside a specified time range that are present in the calendar of a
-     * course or user. They can additionally be filtered by the access level and declined events
-     * can be filtered out, too.
-     *
-     * @param DateTime $begin The beginning of the time range.
-     *
-     * @param DateTime $end The end of the time range.
-     *
-     * @param string $range_id The ID of the course or user whose calendar dates shall be retrieved.
-     *
-     * @param array $access_levels The access level filter: Only include calendar dates that have one of the
-     *     access levels in the list.
-     *
-     * @param bool $with_declined Include declined calendar dates (true) or filter them out (false).
-     *     Defaults to false.
-     *
-     * @return CalendarDateAssignment[] A list of calendar date assignments in the time range that match the filters.
-     */
-    public static function getEvents(
-        DateTime $begin,
-        DateTime $end,
-        string $range_id,
-        array $access_levels = ['PUBLIC', 'PRIVATE', 'CONFIDENTIAL'],
-        bool $with_declined = false
-    ) : array
-    {
-        // Always use the timezone of the server:
-        $local_timezone = (new DateTime())->getTimezone();
-        $begin->setTimezone($local_timezone);
-        $end->setTimezone($local_timezone);
-
-        // one whole day as minimum (begin and end time stamp at the same day)
-        $begin->modify('midnight');
-        $end->modify('tomorrow -1 second');
-
-        $sql = "JOIN `calendar_dates`
-            ON calendar_date_id = `calendar_dates`.`id`
-            WHERE
-            `calendar_date_assignments`.`range_id` = :range_id
-            AND
-            `access` IN ( :access_levels ) ";
-        if (!$with_declined) {
-            $sql .= "AND `calendar_date_assignments`.`participation` <> 'DECLINED' ";
-        }
-        $sql_single = $sql . " AND
-                `calendar_dates`.`begin` < :end  AND :begin < `calendar_dates`.`end`
-            ";
-
-        $events = self::findBySql($sql_single, [
-            'range_id'      => $range_id,
-            'begin'         => $begin->getTimestamp(),
-            'end'           => $end->getTimestamp(),
-            'access_levels' => $access_levels
-        ]);
-
-
-        $sql_repetition = $sql . " AND `calendar_dates`.`begin` < :end AND `calendar_dates`.`repetition_type` IN ('DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY')
-                    AND `calendar_dates`.`repetition_end` > :begin
-            ";
-
-        $events = array_merge($events, self::findBySql($sql_repetition, [
-            'range_id'      => $range_id,
-            'begin'         => $begin->getTimestamp(),
-            'end'           => $end->getTimestamp(),
-            'access_levels' => $access_levels
-        ]));
-
-        $m_start = clone $begin;
-        $m_end = clone $end;
-        $events_created = [];
-        while ($m_start < $m_end) {
-
-            foreach ($events as $event) {
-                $e_start = clone $event->getBegin();
-                $e_end = clone $event->getEnd();
-                $e_expire = $event->getExpire();
-
-                $cal_start = DateTimeImmutable::createFromMutable($m_start);
-                $cal_end = DateTimeImmutable::createFromMutable($m_start)->modify('tomorrow -1 second');
-                $cal_noon = $cal_start->modify('noon');
-                // single events or first event
-                if (
-                    ($e_start >= $cal_start && $e_end <= $cal_end)
-                    || ($e_start >= $cal_start && $e_start <= $cal_end)
-                    || ($e_start < $cal_start && $e_end > $cal_end)
-                    || ($e_end > $cal_start && $e_start <= $cal_end)
-                ) {
-                    // exception for first event or single event
-                    if (!$event->calendar_date->exceptions->findOneBy('date', $cal_start->format('Y-m-d'))
-                        && !isset($events_created[$event->calendar_date->id])) {
-                            $events_created[$event->calendar_date->id . '_' . $event->calendar_date->begin] = $event;
-                    }
-                } elseif ($e_expire > $cal_start) {
-                    $events_created = array_merge($events_created, self::getRepetition($event, $cal_noon));
-                }
-            }
-
-            $m_start->modify('+1 day');
-        }
-
-        return $events_created;
-    }
-
-    private static function getRepetition(
-        CalendarDateAssignment $date,
-        DateTimeImmutable $cal_noon,
-        bool $calc_prev = true
-    ): array
-    {
-        $rep_dates = [];
-        $ts = $date->getNoonDate();
-        if ($cal_noon >= $ts) {
-            if ($date->isRepeatedAtDate($cal_noon)) {
-                $rep_dates = array_merge($rep_dates, self::createRecurrentDate($date, $cal_noon));
-            }
-            if ($calc_prev) {
-                $rep_noon = $cal_noon->modify(sprintf('-%s days', $date->getDurationDays()));
-                $rep_dates = array_merge(
-                    $rep_dates,
-                    self::getRepetition(
-                        $date,
-                        $rep_noon,
-                        false
-                    )
-                );
-            }
-        }
-        return $rep_dates;
-    }
-
-    private function isRepeatedAtDate(DateTimeImmutable $cal_date): bool
-    {
-        $ts = $this->getNoonDate();
-        $pos = 1;
-        switch ($this->getRepetitionType()) {
-            case 'DAILY':
-                $pos = $cal_date->diff($ts)->days % $this->calendar_date->interval;
-                break;
-            case 'WEEKLY':
-                $cal_ts = $cal_date->modify('monday this week noon');
-                if ($cal_date >= $this->getBegin()) {
-                    $pos = $cal_ts->diff($ts)->days % ($this->calendar_date->interval * 7);
-                    if (
-                        $pos === 0
-                        && strpos($this->calendar_date->days, $cal_date->format('N')) === false
-                    ) {
-                        $pos = 1;
-                    }
-                }
-                break;
-            case 'MONTHLY':
-                $cal_ts = $cal_date->modify('first day of this month noon');
-                $diff = $cal_ts->diff($ts);
-                $pos = ($diff->m + $diff->y * 12) % $this->calendar_date->interval;
-                if ($pos === 0) {
-                    if (strlen($this->calendar_date->days)) {
-                        $cal_ts_dom = $cal_ts->modify(sprintf('%s %s of this month noon',
-                            $this->calendar_date->getOrdinalName(),
-                            $this->calendar_date->getWeekdayName()));
-                        if ($cal_ts_dom != $cal_date->setTime(12, 0)) {
-                            $pos = 1;
-                        }
-                    } elseif ($this->calendar_date->offset !== $cal_date->format('j')) {
-                        $pos = 1;
-                    }
-                }
-                break;
-            case 'YEARLY':
-                $cal_ts = $cal_date->modify('first day of this year noon');
-                $diff = $cal_ts->diff($ts);
-                $pos = $diff->y % $this->calendar_date->interval;
-                if ($pos === 0) {
-                    if (strlen($this->calendar_date->days)) {
-                        $ts_doy = $ts->modify(sprintf('%s %s of %s-%s noon',
-                            $this->calendar_date->getOrdinalName(),
-                            $this->calendar_date->getWeekdayName(),
-                            $cal_date->format('Y'),
-                            $this->calendar_date->month));
-                        if ($ts_doy->format('n-j') !== $cal_date->format('n-j')) {
-                            $pos = 1;
-                        }
-                    } elseif (
-                        $cal_date->format('n-j') !== sprintf(
-                            '%s-%s',
-                            $this->calendar_date->month,
-                            $this->calendar_date->offset
-                        )
-                    ) {
-                        $pos = 1;
-                    }
-                }
-                break;
-            default:
-                $pos = 1;
-        }
-        //Also check for exceptions before returning:
-        return $pos === 0
-            && !$this->calendar_date->exceptions->findOneBy(
-                'date',
-                $cal_date->format('Y-m-d'));
-    }
-
-    private static function createRecurrentDate(
-        CalendarDateAssignment $date,
-        DateTimeImmutable $date_time
-    ) : array
-    {
-        $date_begin = $date->getBegin();
-        $date_end = $date->getEnd();
-
-        $rec_date = clone $date;
-        $time_begin = $date_begin->format('H:i:s');
-        $time_end = $date_end->format('H:i:s');
-
-        $rec_date_begin = $date_time->modify(sprintf('today %s', $time_begin));
-        $rec_date_end = $rec_date_begin->add($date->getDuration())->modify($time_end);
-
-        $rec_date->calendar_date->begin = $rec_date_begin->getTimestamp();
-        $rec_date->calendar_date->end = $rec_date_end->getTimestamp();
-        $index = $date->calendar_date->id . '_' . $rec_date_begin->getTimestamp();
-        return [$index => $rec_date];
-    }
-
-    //Event interface implementation:
-
-    public function getObjectId() : string
-    {
-        return (string)$this->id;
-    }
-
-    public function getPrimaryObjectID(): string
-    {
-        return $this->calendar_date_id;
-    }
-
-    public function getObjectClass(): string
-    {
-        return static::class;
-    }
-
-    public function getTitle() : string
-    {
-        return $this->calendar_date->title ?? '';
-    }
-
-    public function getBegin(): DateTime
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->calendar_date->begin ?? 0);
-        return $begin;
-    }
-
-    public function getEnd(): DateTime
-    {
-        $end = new DateTime();
-        $end->setTimestamp($this->calendar_date->end ?? 0);
-        return $end;
-    }
-
-    public function getDuration(): DateInterval
-    {
-        $begin = $this->getBegin();
-        $end = $this->getEnd();
-        return $begin->diff($end);
-    }
-
-    /**
-     * Returns the "extent" in days of this date.
-     *
-     * @return int The "extent" in days of this date.
-     */
-    public function getDurationDays(): int
-    {
-        return self::getExtent($this->getEnd(), $this->getBegin());
-    }
-
-    /**
-     * Returns the "extent" in days of this date.
-     * The extent is the number of days a date is displayed in a calendar.
-     *
-     * @return int The "extent" in days of this date.
-     */
-    public static function getExtent(DateTimeInterface $date_begin, DateTimeInterface $date_end): int
-    {
-        $days_duration = $date_end->diff($date_begin)->days;
-        if ($date_begin->format('His') > $date_end->format('His')) {
-            $days_duration += 1;
-        }
-        return $days_duration;
-    }
-
-    public function getLocation(): string
-    {
-        return $this->calendar_date->location ?? '';
-    }
-
-    public function getUniqueId(): string
-    {
-        return $this->calendar_date->unique_id ?? '';
-    }
-
-    public function getDescription(): string
-    {
-        return $this->calendar_date->description ?? '';
-    }
-
-    public function getAdditionalDescriptions(): array
-    {
-        return [
-            _('Kategorie')    => $this->calendar_date->getCategoryAsString(),
-            _('Sichtbarkeit') => $this->calendar_date->getVisibilityAsString(),
-            _('Wiederholung') => $this->calendar_date->getRepetitionAsString()
-        ];
-    }
-
-    public function isAllDayEvent(): bool
-    {
-        $begin = $this->getBegin();
-        if ($begin->format('His') !== '000000') {
-            return false;
-        }
-        $end = $this->getEnd();
-        return $end->format('His') === '235959';
-    }
-
-    public function isWritable(string $user_id): bool
-    {
-        if ($this->calendar_date->author_id === $user_id) {
-            //The author may always modify one of their dates:
-            return true;
-        }
-        if ($this->calendar_date->isWritable($user_id)) {
-            //The date is writable.
-            return true;
-        }
-
-        //The user referenced by $user_id is not the author of the date.
-        //Check if they have write permissions to the calendar where the date is assigned to:
-        if ($this->user instanceof User) {
-            //It is a personal calendar. Check if the owner of the calendar has granted write permissions
-            //to the user:
-            return Contact::countBySQL(
-                "`owner_id` = :owner_id AND `user_id` = :user_id
-                AND `calendar_permissions` = 'WRITE'",
-                ['owner_id' => $this->range_id, 'user_id' => $user_id]
-            ) > 0;
-        } elseif ($this->course instanceof Course) {
-            //It is a course calendar.
-            return $GLOBALS['perm']->have_studip_perm('dozent', $this->range_id, $user_id);
-        }
-
-        //No write permissions are granted.
-        return false;
-    }
-
-    public function getCreationDate(): DateTime
-    {
-        $mkdate = new DateTime();
-        $mkdate->setTimestamp($this->calendar_date->mkdate ?? 0);
-        return $mkdate;
-    }
-
-    public function getModificationDate(): DateTime
-    {
-        $chdate = new DateTime();
-        $chdate->setTimestamp($this->calendar_date->chdate ?? 0);
-        return $chdate;
-    }
-
-    public function getImportDate(): DateTime
-    {
-        $import_date = new DateTime();
-        $import_date->setTimestamp($this->calendar_date->import_date ?? 0);
-        return $import_date;
-    }
-
-    public function getAuthor(): ?User
-    {
-        return $this->calendar_date->author ?? null;
-    }
-
-    public function getEditor(): ?User
-    {
-        return $this->calendar_date->editor ?? null;
-    }
-
-    /**
-     * TODO calculate end of repetition for different types of repetition
-     * @return float|int|object
-     */
-    public function getExpire()
-    {
-        if ($this->calendar_date->repetition_end > 0) {
-            $expire = $this->calendar_date->repetition_end;
-        } else {
-            $expire = CalendarDate::NEVER_ENDING;
-        }
-
-        $end = new DateTime();
-        $end->setTimestamp($expire);
-        return $end;
-    }
-
-    // TODO calculate ts for monthly and yearly repetition
-    public function getNoonDate()
-    {
-        $ts = DateTimeImmutable::createFromMutable($this->getBegin());
-        switch ($this->calendar_date->repetition_type) {
-            case 'DAILY':
-                return $ts->modify('noon');
-            case 'WEEKLY':
-                return  $ts->modify('monday this week noon');
-            case 'MONTHLY':
-                return $ts->modify('first day of this month noon');
-            case 'YEARLY':
-                return $ts->modify('first day of this year noon');
-            default:
-                return $ts;
-        }
-    }
-
-    /**
-     * Returns the type of repetition.
-     *
-     * @return string The type of repetition.
-     */
-    public function getRepetitionType(): string
-    {
-        return $this->calendar_date->repetition_type;
-    }
-
-    public function toEventData(string $user_id): \Studip\Calendar\EventData
-    {
-        $begin = $this->getBegin();
-        $end = $this->getEnd();
-
-        $all_day = $this->isAllDayEvent();
-
-        $hide_confidential_data = $this->calendar_date->access === 'CONFIDENTIAL'
-            && $user_id !== $this->calendar_date->author_id;
-
-        $event_classes = ['user-date'];
-
-        $text_colour = '#000000';
-        $background_colour = '#ffffff';
-        $border_colour = '#000000';
-        if (!$hide_confidential_data) {
-            if ($this->calendar_date->user_category) {
-                //The date belongs to a personal category that gets a grey colour.
-                $background_colour = '#a7abaf';
-                $border_colour     = '#a7abaf';
-            } else {
-                //The date belongs to a system category that has its own colours.
-                $text_colour = $GLOBALS['PERS_TERMIN_KAT'][$this->calendar_date->category]['fgcolor'] ?? $text_colour;
-                $background_colour = $GLOBALS['PERS_TERMIN_KAT'][$this->calendar_date->category]['bgcolor'] ?? $background_colour;
-                $border_colour = $GLOBALS['PERS_TERMIN_KAT'][$this->calendar_date->category]['border_color'] ?? $border_colour;
-                $event_classes[] = sprintf('user-date-category%d', $this->calendar_date->category);
-            }
-        }
-
-        $show_url_params = [];
-        if ($this->calendar_date->repetition_type) {
-            $show_url_params['selected_date'] = $begin->format('Y-m-d');
-        }
-
-        return new \Studip\Calendar\EventData(
-            $begin,
-            $end,
-            !$hide_confidential_data ? $this->getTitle() : '',
-            $event_classes,
-            $text_colour,
-            $background_colour,
-            $this->isWritable($user_id),
-            CalendarDateAssignment::class,
-            $this->id,
-            CalendarDate::class,
-            $this->calendar_date_id,
-            'user',
-            $this->range_id ?? '',
-            [
-                'show'   => URLHelper::getURL('dispatch.php/calendar/date/index/' . $this->calendar_date_id, $show_url_params)
-            ],
-            [
-                'resize_dialog' => URLHelper::getURL('dispatch.php/calendar/date/move/' . $this->calendar_date_id),
-                'move_dialog'   => URLHelper::getURL('dispatch.php/calendar/date/move/' . $this->calendar_date_id)
-            ],
-            $this->participation === 'DECLINED' ? 'decline-circle-full' : '',
-            $border_colour,
-            $all_day
-        );
-    }
-
-    public function getRangeName() : string
-    {
-        if ($this->course instanceof Course) {
-            return $this->course->getFullName();
-        } elseif ($this->user instanceof User) {
-            return $this->user->getFullName();
-        }
-        return '';
-    }
-
-    public function getRangeAvatar() : ?Avatar
-    {
-        if ($this->course instanceof Course) {
-            return CourseAvatar::getAvatar($this->range_id);
-        } elseif ($this->user instanceof User) {
-            return Avatar::getAvatar($this->range_id);
-        }
-        return null;
-    }
-
-    public function getParticipationAsString() : string
-    {
-        if ($this->participation === '') {
-            return _('Abwartend');
-        } elseif ($this->participation === 'ACKNOWLEDGED') {
-            return _('Angenommen (keine Teilnahme)');
-        } elseif ($this->participation === 'ACCEPTED') {
-            return _('Angenommen');
-        } elseif ($this->participation === 'DECLINED') {
-            return _('Abgelehnt');
-        }
-        return '';
-    }
-}
diff --git a/lib/models/calendar/CalendarDateAssignment.php b/lib/models/calendar/CalendarDateAssignment.php
new file mode 100644
index 0000000..e0bf467
--- /dev/null
+++ b/lib/models/calendar/CalendarDateAssignment.php
@@ -0,0 +1,722 @@
+<?php
+/**
+ * CalendarDateAssignment.class.php - Model class for calendar date assignments.
+ *
+ * CalendarDateAssignment represents the assignment of a calendar date
+ *  to a specific calendar. The calendar is represented by a range-ID
+ *  since it can be a personal calendar, course calendar or institute
+ *  calendar.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @since       5.5
+ *
+ * @property string range_id The range-ID for the assignment.
+ * @property string calendar_date_id The ID of the calendar date for the assignment.
+ * @property string participation The participation status of the receiver (range_id).
+ *     This column is an enum with the following values:
+ *     - empty string: Participation status is unknown.
+ *     - "ACCEPTED": The calendar owner accepted the date.
+ *     - "DECLINED": The calendar owner declined the date.
+ *     - "ACKNOWLEDGED": The calendar owner only acknowledged that the date exists
+ *           but doesn't necessarily participate in it.
+ * @property string mkdate The creation date of the assignment.
+ * @property string chdate The modification date of the assignment.
+ * @property CalendarDate|null calendar_date The associated calendar date object.
+ */
+class CalendarDateAssignment extends SimpleORMap implements Event
+{
+    /**
+     * @var bool This attribute allows the suppression of automatic mail sending
+     *     when storing or deleting the calendar date assignment.
+     *     By default, mails are sent.
+     */
+    public $suppress_mails = false;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'calendar_date_assignments';
+
+        $config['belongs_to']['calendar_date'] = [
+            'class_name'  => CalendarDate::class,
+            'foreign_key' => 'calendar_date_id',
+            'assoc_func'  => 'find'
+        ];
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'range_id',
+            'assoc_func'  => 'find'
+        ];
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'range_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['registered_callbacks']['after_create'][] = 'cbSendNewDateMail';
+        $config['registered_callbacks']['after_delete'][] = 'cbSendDateDeletedMail';
+
+        parent::configure($config);
+    }
+
+
+    public function cbSendNewDateMail()
+    {
+        if ($this->suppress_mails) {
+            return;
+        }
+        if ($this->range_id === $this->calendar_date->editor_id) {
+            return;
+        }
+        if (!$this->calendar_date || !$this->user) {
+            //Wrong calendar range (not a user) or invalid data set.
+            return;
+        }
+
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+
+        setTempLanguage($this->range_id);
+        $lang_path = getUserLanguagePath($this->range_id);
+        $template = $template_factory->open($lang_path . '/LC_MAILS/date_created.php');
+        $template->set_attribute('date', $this->calendar_date);
+        $template->set_attribute('receiver', $this->user);
+        $mail_text = $template->render();
+        Message::send(
+            '____%system%____',
+            [$this->user->username],
+            sprintf(_('%s hat einen Termin im Kalender eingetragen'), $this->calendar_date->editor->getFullName()),
+            $mail_text
+        );
+
+        restoreLanguage();
+    }
+
+    public function cbSendDateDeletedMail()
+    {
+        if ($this->suppress_mails) {
+            return;
+        }
+        $actor = User::findCurrent() ?? $this->calendar_date->editor;
+        if ($this->range_id === $actor->id) {
+            //The user who deleted the date shall not get notified about this.
+            return;
+        }
+        if (!$this->calendar_date || !$this->user) {
+            //Wrong calendar range (not a user) or invalid data set.
+            return;
+        }
+
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+
+        setTempLanguage($this->range_id);
+        $lang_path = getUserLanguagePath($this->range_id);
+        $template = $template_factory->open($lang_path . '/LC_MAILS/date_deleted.php');
+        $template->set_attribute('date', $this->calendar_date);
+        $template->set_attribute('actor', $actor);
+        $template->set_attribute('receiver', $this->user);
+        $mail_text = $template->render();
+        Message::send(
+            '____%system%____',
+            [$this->user->username],
+            sprintf(_('%s hat einen Termin im Kalender gelöscht'), $actor->getFullName()),
+            $mail_text
+        );
+
+        restoreLanguage();
+    }
+
+    /**
+     * Sends the participation status of the calendar the date
+     * is assigned to. This is only done for user calendars
+     * and not for course calendars.
+     *
+     * @return void
+     */
+    public function sendParticipationStatus() : void
+    {
+        if (!($this->user instanceof User)) {
+            //The calendar date is assigned to a course calendar.
+            return;
+        }
+
+        if (!$this->participation || $this->participation === 'ACKNOWLEDGED') {
+            //Nothing shall be done in these two cases.
+            return;
+        }
+
+        if (empty($this->calendar_date->author->username)) {
+            //The calendar date has no author.
+            return;
+        }
+        if ($this->range_id === $this->calendar_date->author_id) {
+            //The author of the date changed their participation status.
+            //So they know what they did and do not have to be notified.
+            return;
+        }
+
+        $template_factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH'] . '/locale/');
+
+        setTempLanguage($this->range_id);
+        $lang_path = getUserLanguagePath($this->range_id);
+        $template = $template_factory->open($lang_path . '/LC_MAILS/date_participation.php');
+        $template->set_attribute('date_assignment', $this);
+        $mail_text = $template->render();
+
+        $subject = '';
+        if ($this->participation === 'ACCEPTED') {
+            $subject = sprintf(
+                _('%1$s hat Ihren Termin am %2$s angenommen'),
+                $this->user->getFullName(),
+                date('d.m.Y', $this->calendar_date->begin)
+            );
+        } elseif ($this->participation === 'DECLINED') {
+            $subject = sprintf(
+                _('%1$s hat Ihren Termin am %2$s abgelehnt'),
+                $this->user->getFullName(),
+                date('d.m.Y', $this->calendar_date->begin)
+            );
+        }
+
+        Message::send(
+            '____%system%____',
+            [$this->calendar_date->author->username],
+            $subject,
+            $mail_text
+        );
+
+        restoreLanguage();
+    }
+
+    /**
+     * Retrieves calendar dates inside a specified time range that are present in the calendar of a
+     * course or user. They can additionally be filtered by the access level and declined events
+     * can be filtered out, too.
+     *
+     * @param DateTime $begin The beginning of the time range.
+     *
+     * @param DateTime $end The end of the time range.
+     *
+     * @param string $range_id The ID of the course or user whose calendar dates shall be retrieved.
+     *
+     * @param array $access_levels The access level filter: Only include calendar dates that have one of the
+     *     access levels in the list.
+     *
+     * @param bool $with_declined Include declined calendar dates (true) or filter them out (false).
+     *     Defaults to false.
+     *
+     * @return CalendarDateAssignment[] A list of calendar date assignments in the time range that match the filters.
+     */
+    public static function getEvents(
+        DateTime $begin,
+        DateTime $end,
+        string $range_id,
+        array $access_levels = ['PUBLIC', 'PRIVATE', 'CONFIDENTIAL'],
+        bool $with_declined = false
+    ) : array
+    {
+        // Always use the timezone of the server:
+        $local_timezone = (new DateTime())->getTimezone();
+        $begin->setTimezone($local_timezone);
+        $end->setTimezone($local_timezone);
+
+        // one whole day as minimum (begin and end time stamp at the same day)
+        $begin->modify('midnight');
+        $end->modify('tomorrow -1 second');
+
+        $sql = "JOIN `calendar_dates`
+            ON calendar_date_id = `calendar_dates`.`id`
+            WHERE
+            `calendar_date_assignments`.`range_id` = :range_id
+            AND
+            `access` IN ( :access_levels ) ";
+        if (!$with_declined) {
+            $sql .= "AND `calendar_date_assignments`.`participation` <> 'DECLINED' ";
+        }
+        $sql_single = $sql . " AND
+                `calendar_dates`.`begin` < :end  AND :begin < `calendar_dates`.`end`
+            ";
+
+        $events = self::findBySql($sql_single, [
+            'range_id'      => $range_id,
+            'begin'         => $begin->getTimestamp(),
+            'end'           => $end->getTimestamp(),
+            'access_levels' => $access_levels
+        ]);
+
+
+        $sql_repetition = $sql . " AND `calendar_dates`.`begin` < :end AND `calendar_dates`.`repetition_type` IN ('DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY')
+                    AND `calendar_dates`.`repetition_end` > :begin
+            ";
+
+        $events = array_merge($events, self::findBySql($sql_repetition, [
+            'range_id'      => $range_id,
+            'begin'         => $begin->getTimestamp(),
+            'end'           => $end->getTimestamp(),
+            'access_levels' => $access_levels
+        ]));
+
+        $m_start = clone $begin;
+        $m_end = clone $end;
+        $events_created = [];
+        while ($m_start < $m_end) {
+
+            foreach ($events as $event) {
+                $e_start = clone $event->getBegin();
+                $e_end = clone $event->getEnd();
+                $e_expire = $event->getExpire();
+
+                $cal_start = DateTimeImmutable::createFromMutable($m_start);
+                $cal_end = DateTimeImmutable::createFromMutable($m_start)->modify('tomorrow -1 second');
+                $cal_noon = $cal_start->modify('noon');
+                // single events or first event
+                if (
+                    ($e_start >= $cal_start && $e_end <= $cal_end)
+                    || ($e_start >= $cal_start && $e_start <= $cal_end)
+                    || ($e_start < $cal_start && $e_end > $cal_end)
+                    || ($e_end > $cal_start && $e_start <= $cal_end)
+                ) {
+                    // exception for first event or single event
+                    if (!$event->calendar_date->exceptions->findOneBy('date', $cal_start->format('Y-m-d'))
+                        && !isset($events_created[$event->calendar_date->id])) {
+                            $events_created[$event->calendar_date->id . '_' . $event->calendar_date->begin] = $event;
+                    }
+                } elseif ($e_expire > $cal_start) {
+                    $events_created = array_merge($events_created, self::getRepetition($event, $cal_noon));
+                }
+            }
+
+            $m_start->modify('+1 day');
+        }
+
+        return $events_created;
+    }
+
+    private static function getRepetition(
+        CalendarDateAssignment $date,
+        DateTimeImmutable $cal_noon,
+        bool $calc_prev = true
+    ): array
+    {
+        $rep_dates = [];
+        $ts = $date->getNoonDate();
+        if ($cal_noon >= $ts) {
+            if ($date->isRepeatedAtDate($cal_noon)) {
+                $rep_dates = array_merge($rep_dates, self::createRecurrentDate($date, $cal_noon));
+            }
+            if ($calc_prev) {
+                $rep_noon = $cal_noon->modify(sprintf('-%s days', $date->getDurationDays()));
+                $rep_dates = array_merge(
+                    $rep_dates,
+                    self::getRepetition(
+                        $date,
+                        $rep_noon,
+                        false
+                    )
+                );
+            }
+        }
+        return $rep_dates;
+    }
+
+    private function isRepeatedAtDate(DateTimeImmutable $cal_date): bool
+    {
+        $ts = $this->getNoonDate();
+        $pos = 1;
+        switch ($this->getRepetitionType()) {
+            case 'DAILY':
+                $pos = $cal_date->diff($ts)->days % $this->calendar_date->interval;
+                break;
+            case 'WEEKLY':
+                $cal_ts = $cal_date->modify('monday this week noon');
+                if ($cal_date >= $this->getBegin()) {
+                    $pos = $cal_ts->diff($ts)->days % ($this->calendar_date->interval * 7);
+                    if (
+                        $pos === 0
+                        && strpos($this->calendar_date->days, $cal_date->format('N')) === false
+                    ) {
+                        $pos = 1;
+                    }
+                }
+                break;
+            case 'MONTHLY':
+                $cal_ts = $cal_date->modify('first day of this month noon');
+                $diff = $cal_ts->diff($ts);
+                $pos = ($diff->m + $diff->y * 12) % $this->calendar_date->interval;
+                if ($pos === 0) {
+                    if (strlen($this->calendar_date->days)) {
+                        $cal_ts_dom = $cal_ts->modify(sprintf('%s %s of this month noon',
+                            $this->calendar_date->getOrdinalName(),
+                            $this->calendar_date->getWeekdayName()));
+                        if ($cal_ts_dom != $cal_date->setTime(12, 0)) {
+                            $pos = 1;
+                        }
+                    } elseif ($this->calendar_date->offset !== $cal_date->format('j')) {
+                        $pos = 1;
+                    }
+                }
+                break;
+            case 'YEARLY':
+                $cal_ts = $cal_date->modify('first day of this year noon');
+                $diff = $cal_ts->diff($ts);
+                $pos = $diff->y % $this->calendar_date->interval;
+                if ($pos === 0) {
+                    if (strlen($this->calendar_date->days)) {
+                        $ts_doy = $ts->modify(sprintf('%s %s of %s-%s noon',
+                            $this->calendar_date->getOrdinalName(),
+                            $this->calendar_date->getWeekdayName(),
+                            $cal_date->format('Y'),
+                            $this->calendar_date->month));
+                        if ($ts_doy->format('n-j') !== $cal_date->format('n-j')) {
+                            $pos = 1;
+                        }
+                    } elseif (
+                        $cal_date->format('n-j') !== sprintf(
+                            '%s-%s',
+                            $this->calendar_date->month,
+                            $this->calendar_date->offset
+                        )
+                    ) {
+                        $pos = 1;
+                    }
+                }
+                break;
+            default:
+                $pos = 1;
+        }
+        //Also check for exceptions before returning:
+        return $pos === 0
+            && !$this->calendar_date->exceptions->findOneBy(
+                'date',
+                $cal_date->format('Y-m-d'));
+    }
+
+    private static function createRecurrentDate(
+        CalendarDateAssignment $date,
+        DateTimeImmutable $date_time
+    ) : array
+    {
+        $date_begin = $date->getBegin();
+        $date_end = $date->getEnd();
+
+        $rec_date = clone $date;
+        $time_begin = $date_begin->format('H:i:s');
+        $time_end = $date_end->format('H:i:s');
+
+        $rec_date_begin = $date_time->modify(sprintf('today %s', $time_begin));
+        $rec_date_end = $rec_date_begin->add($date->getDuration())->modify($time_end);
+
+        $rec_date->calendar_date->begin = $rec_date_begin->getTimestamp();
+        $rec_date->calendar_date->end = $rec_date_end->getTimestamp();
+        $index = $date->calendar_date->id . '_' . $rec_date_begin->getTimestamp();
+        return [$index => $rec_date];
+    }
+
+    //Event interface implementation:
+
+    public function getObjectId() : string
+    {
+        return (string)$this->id;
+    }
+
+    public function getPrimaryObjectID(): string
+    {
+        return $this->calendar_date_id;
+    }
+
+    public function getObjectClass(): string
+    {
+        return static::class;
+    }
+
+    public function getTitle() : string
+    {
+        return $this->calendar_date->title ?? '';
+    }
+
+    public function getBegin(): DateTime
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->calendar_date->begin ?? 0);
+        return $begin;
+    }
+
+    public function getEnd(): DateTime
+    {
+        $end = new DateTime();
+        $end->setTimestamp($this->calendar_date->end ?? 0);
+        return $end;
+    }
+
+    public function getDuration(): DateInterval
+    {
+        $begin = $this->getBegin();
+        $end = $this->getEnd();
+        return $begin->diff($end);
+    }
+
+    /**
+     * Returns the "extent" in days of this date.
+     *
+     * @return int The "extent" in days of this date.
+     */
+    public function getDurationDays(): int
+    {
+        return self::getExtent($this->getEnd(), $this->getBegin());
+    }
+
+    /**
+     * Returns the "extent" in days of this date.
+     * The extent is the number of days a date is displayed in a calendar.
+     *
+     * @return int The "extent" in days of this date.
+     */
+    public static function getExtent(DateTimeInterface $date_begin, DateTimeInterface $date_end): int
+    {
+        $days_duration = $date_end->diff($date_begin)->days;
+        if ($date_begin->format('His') > $date_end->format('His')) {
+            $days_duration += 1;
+        }
+        return $days_duration;
+    }
+
+    public function getLocation(): string
+    {
+        return $this->calendar_date->location ?? '';
+    }
+
+    public function getUniqueId(): string
+    {
+        return $this->calendar_date->unique_id ?? '';
+    }
+
+    public function getDescription(): string
+    {
+        return $this->calendar_date->description ?? '';
+    }
+
+    public function getAdditionalDescriptions(): array
+    {
+        return [
+            _('Kategorie')    => $this->calendar_date->getCategoryAsString(),
+            _('Sichtbarkeit') => $this->calendar_date->getVisibilityAsString(),
+            _('Wiederholung') => $this->calendar_date->getRepetitionAsString()
+        ];
+    }
+
+    public function isAllDayEvent(): bool
+    {
+        $begin = $this->getBegin();
+        if ($begin->format('His') !== '000000') {
+            return false;
+        }
+        $end = $this->getEnd();
+        return $end->format('His') === '235959';
+    }
+
+    public function isWritable(string $user_id): bool
+    {
+        if ($this->calendar_date->author_id === $user_id) {
+            //The author may always modify one of their dates:
+            return true;
+        }
+        if ($this->calendar_date->isWritable($user_id)) {
+            //The date is writable.
+            return true;
+        }
+
+        //The user referenced by $user_id is not the author of the date.
+        //Check if they have write permissions to the calendar where the date is assigned to:
+        if ($this->user instanceof User) {
+            //It is a personal calendar. Check if the owner of the calendar has granted write permissions
+            //to the user:
+            return Contact::countBySQL(
+                "`owner_id` = :owner_id AND `user_id` = :user_id
+                AND `calendar_permissions` = 'WRITE'",
+                ['owner_id' => $this->range_id, 'user_id' => $user_id]
+            ) > 0;
+        } elseif ($this->course instanceof Course) {
+            //It is a course calendar.
+            return $GLOBALS['perm']->have_studip_perm('dozent', $this->range_id, $user_id);
+        }
+
+        //No write permissions are granted.
+        return false;
+    }
+
+    public function getCreationDate(): DateTime
+    {
+        $mkdate = new DateTime();
+        $mkdate->setTimestamp($this->calendar_date->mkdate ?? 0);
+        return $mkdate;
+    }
+
+    public function getModificationDate(): DateTime
+    {
+        $chdate = new DateTime();
+        $chdate->setTimestamp($this->calendar_date->chdate ?? 0);
+        return $chdate;
+    }
+
+    public function getImportDate(): DateTime
+    {
+        $import_date = new DateTime();
+        $import_date->setTimestamp($this->calendar_date->import_date ?? 0);
+        return $import_date;
+    }
+
+    public function getAuthor(): ?User
+    {
+        return $this->calendar_date->author ?? null;
+    }
+
+    public function getEditor(): ?User
+    {
+        return $this->calendar_date->editor ?? null;
+    }
+
+    /**
+     * TODO calculate end of repetition for different types of repetition
+     * @return float|int|object
+     */
+    public function getExpire()
+    {
+        if ($this->calendar_date->repetition_end > 0) {
+            $expire = $this->calendar_date->repetition_end;
+        } else {
+            $expire = CalendarDate::NEVER_ENDING;
+        }
+
+        $end = new DateTime();
+        $end->setTimestamp($expire);
+        return $end;
+    }
+
+    // TODO calculate ts for monthly and yearly repetition
+    public function getNoonDate()
+    {
+        $ts = DateTimeImmutable::createFromMutable($this->getBegin());
+        switch ($this->calendar_date->repetition_type) {
+            case 'DAILY':
+                return $ts->modify('noon');
+            case 'WEEKLY':
+                return  $ts->modify('monday this week noon');
+            case 'MONTHLY':
+                return $ts->modify('first day of this month noon');
+            case 'YEARLY':
+                return $ts->modify('first day of this year noon');
+            default:
+                return $ts;
+        }
+    }
+
+    /**
+     * Returns the type of repetition.
+     *
+     * @return string The type of repetition.
+     */
+    public function getRepetitionType(): string
+    {
+        return $this->calendar_date->repetition_type;
+    }
+
+    public function toEventData(string $user_id): \Studip\Calendar\EventData
+    {
+        $begin = $this->getBegin();
+        $end = $this->getEnd();
+
+        $all_day = $this->isAllDayEvent();
+
+        $hide_confidential_data = $this->calendar_date->access === 'CONFIDENTIAL'
+            && $user_id !== $this->calendar_date->author_id;
+
+        $event_classes = ['user-date'];
+
+        $text_colour = '#000000';
+        $background_colour = '#ffffff';
+        $border_colour = '#000000';
+        if (!$hide_confidential_data) {
+            if ($this->calendar_date->user_category) {
+                //The date belongs to a personal category that gets a grey colour.
+                $background_colour = '#a7abaf';
+                $border_colour     = '#a7abaf';
+            } else {
+                //The date belongs to a system category that has its own colours.
+                $text_colour = $GLOBALS['PERS_TERMIN_KAT'][$this->calendar_date->category]['fgcolor'] ?? $text_colour;
+                $background_colour = $GLOBALS['PERS_TERMIN_KAT'][$this->calendar_date->category]['bgcolor'] ?? $background_colour;
+                $border_colour = $GLOBALS['PERS_TERMIN_KAT'][$this->calendar_date->category]['border_color'] ?? $border_colour;
+                $event_classes[] = sprintf('user-date-category%d', $this->calendar_date->category);
+            }
+        }
+
+        $show_url_params = [];
+        if ($this->calendar_date->repetition_type) {
+            $show_url_params['selected_date'] = $begin->format('Y-m-d');
+        }
+
+        return new \Studip\Calendar\EventData(
+            $begin,
+            $end,
+            !$hide_confidential_data ? $this->getTitle() : '',
+            $event_classes,
+            $text_colour,
+            $background_colour,
+            $this->isWritable($user_id),
+            CalendarDateAssignment::class,
+            $this->id,
+            CalendarDate::class,
+            $this->calendar_date_id,
+            'user',
+            $this->range_id ?? '',
+            [
+                'show'   => URLHelper::getURL('dispatch.php/calendar/date/index/' . $this->calendar_date_id, $show_url_params)
+            ],
+            [
+                'resize_dialog' => URLHelper::getURL('dispatch.php/calendar/date/move/' . $this->calendar_date_id),
+                'move_dialog'   => URLHelper::getURL('dispatch.php/calendar/date/move/' . $this->calendar_date_id)
+            ],
+            $this->participation === 'DECLINED' ? 'decline-circle-full' : '',
+            $border_colour,
+            $all_day
+        );
+    }
+
+    public function getRangeName() : string
+    {
+        if ($this->course instanceof Course) {
+            return $this->course->getFullName();
+        } elseif ($this->user instanceof User) {
+            return $this->user->getFullName();
+        }
+        return '';
+    }
+
+    public function getRangeAvatar() : ?Avatar
+    {
+        if ($this->course instanceof Course) {
+            return CourseAvatar::getAvatar($this->range_id);
+        } elseif ($this->user instanceof User) {
+            return Avatar::getAvatar($this->range_id);
+        }
+        return null;
+    }
+
+    public function getParticipationAsString() : string
+    {
+        if ($this->participation === '') {
+            return _('Abwartend');
+        } elseif ($this->participation === 'ACKNOWLEDGED') {
+            return _('Angenommen (keine Teilnahme)');
+        } elseif ($this->participation === 'ACCEPTED') {
+            return _('Angenommen');
+        } elseif ($this->participation === 'DECLINED') {
+            return _('Abgelehnt');
+        }
+        return '';
+    }
+}
diff --git a/lib/models/calendar/CalendarDateException.class.php b/lib/models/calendar/CalendarDateException.class.php
deleted file mode 100644
index b53a728..0000000
--- a/lib/models/calendar/CalendarDateException.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * The CalendarDateException class represents one exception for a calendar date.
- * 
- * This file is part of Stud.IP
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2023
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       5.5
- *
- * @property string $id The ID of the exception.
- * @property string $calendar_date_id The ID of the calendar date where the exception belongs to.
- * @property string $date The date of the exception in the date format YYYY-MM-DD.
- * @property string $mkdate The creation date of the exception.
- * @property string $chdate The modification date of the exception.
- * @property CalendarDate|null $calendar_date The associated calendar date object.
- */
-class CalendarDateException extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'calendar_date_exceptions';
-
-        $config['belongs_to']['calendar_date'] = [
-            'class_name' => CalendarDate::class,
-            'foreign_key' => 'calendar_date_id',
-            'assoc_func' => 'find'
-        ];
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/calendar/CalendarDateException.php b/lib/models/calendar/CalendarDateException.php
new file mode 100644
index 0000000..b53a728
--- /dev/null
+++ b/lib/models/calendar/CalendarDateException.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * The CalendarDateException class represents one exception for a calendar date.
+ * 
+ * This file is part of Stud.IP
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2023
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       5.5
+ *
+ * @property string $id The ID of the exception.
+ * @property string $calendar_date_id The ID of the calendar date where the exception belongs to.
+ * @property string $date The date of the exception in the date format YYYY-MM-DD.
+ * @property string $mkdate The creation date of the exception.
+ * @property string $chdate The modification date of the exception.
+ * @property CalendarDate|null $calendar_date The associated calendar date object.
+ */
+class CalendarDateException extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'calendar_date_exceptions';
+
+        $config['belongs_to']['calendar_date'] = [
+            'class_name' => CalendarDate::class,
+            'foreign_key' => 'calendar_date_id',
+            'assoc_func' => 'find'
+        ];
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/resources/BrokenResource.class.php b/lib/models/resources/BrokenResource.class.php
deleted file mode 100644
index 5266b4f..0000000
--- a/lib/models/resources/BrokenResource.class.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-/**
- * ResourceLabel.class.php - model class for a resource label
- *
- * The BrokenResource class represents resources whose class
- * cannot be found due to missing Resource specialisations
- * that cannot be loaded. This can happen if a plugin is uninstalled
- * without removing the resources that are handled by the plugin.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * All properties are inherited from the parent class (Resource).
- *
- * @property string $id database column
- * @property string $parent_id database column
- * @property string $category_id database column
- * @property int|null $level database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property int $requestable database column
- * @property int $lockable database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $sort_position database column
- * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
- * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
- * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
- * @property SimpleORMapCollection|Resource[] $children has_many Resource
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property Resource $parent belongs_to Resource
- * @property mixed $class_name additional field
- */
-class BrokenResource extends Resource
-{
-    public function store()
-    {
-        //Broken resources shall not be stored or modified.
-        //Modification may break things.
-        return false;
-    }
-
-    public function getFolder($create_if_missing = true)
-    {
-        return null;
-    }
-
-    public function setFolder(ResourceFolder $folder)
-    {
-        return false;
-    }
-
-    public function createFolder()
-    {
-        return null;
-    }
-
-    public function createSimpleBooking(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL
-    )
-    {
-        return null;
-    }
-
-    public function createBookingFromRequest(
-        User $user,
-        ResourceRequest $request,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $prepend_preparation_time = false,
-        $notify_lecturers = false
-    )
-    {
-        return null;
-    }
-
-    public function createBooking(
-        User $user,
-        $range_id = null,
-        $time_ranges = [],
-        $repetition_interval = null,
-        $repetition_amount = 0,
-        $repetition_end_date = null,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $force_booking = false
-    ) {
-        return null;
-    }
-
-    public function createSimpleRequest(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $comment = '',
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-
-    public function createRequest(
-        User $user,
-        $date_range_ids = null,
-        $comment = '',
-        $properties = [],
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createLock(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $internal_comment = ''
-    )
-    {
-        return null;
-    }
-
-    public function propertyExists($name = '')
-    {
-        //Resource labels don't have properties:
-        return false;
-    }
-
-    public function getPropertyObject(string $name = '')
-    {
-        return null;
-    }
-
-    public function getProperty(string $name = '')
-    {
-        return null;
-    }
-
-    public function getPropertyRelatedObject(string $name = '')
-    {
-        return null;
-    }
-
-    public function setProperty(string $name = '', $state = '', $user_id = null)
-    {
-        return false;
-    }
-
-    public function isPropertyEditable(string $name, User $user)
-    {
-        return false;
-    }
-
-    public function setPropertyByDefinitionId(
-        $property_definition_id = null,
-        $state = null
-    )
-    {
-        return false;
-    }
-
-    public function setPropertyRelatedObject(string $name, SimpleORMap $object)
-    {
-        return false;
-    }
-
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        return Icon::create('resources-broken', $role);
-    }
-
-    public function getPropertyArray($only_requestable_properties = false)
-    {
-        return [];
-    }
-
-    public function isAssigned(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isReserved(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_reservation_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isLocked(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_lock_ids = []
-    )
-    {
-        return true;
-    }
-
-    public function isAvailable(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isAvailableForRequest(ResourceRequest $request)
-    {
-        return false;
-    }
-
-    public function getFullName()
-    {
-        return sprintf('%1$s (%2$s)', $this->name, _('defekt'));
-    }
-
-    public function getOpenResourceRequests(DateTime $begin, DateTime $end)
-    {
-        return [];
-    }
-
-    public function getResourceBookings(DateTime $begin, DateTime $end, array $booking_types = [0])
-    {
-        return [];
-    }
-
-    public function getResourceLocks(DateTime $begin, DateTime $end)
-    {
-        return [];
-    }
-
-    public function hasFiles()
-    {
-        return false;
-    }
-
-    public function checkHierarchy()
-    {
-        return true;
-    }
-
-    public function getItemAvatarURL()
-    {
-        return Icon::create('info', Icon::ROLE_INFO)->asImagePath();
-    }
-}
diff --git a/lib/models/resources/BrokenResource.php b/lib/models/resources/BrokenResource.php
new file mode 100644
index 0000000..5266b4f
--- /dev/null
+++ b/lib/models/resources/BrokenResource.php
@@ -0,0 +1,274 @@
+<?php
+
+/**
+ * ResourceLabel.class.php - model class for a resource label
+ *
+ * The BrokenResource class represents resources whose class
+ * cannot be found due to missing Resource specialisations
+ * that cannot be loaded. This can happen if a plugin is uninstalled
+ * without removing the resources that are handled by the plugin.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * All properties are inherited from the parent class (Resource).
+ *
+ * @property string $id database column
+ * @property string $parent_id database column
+ * @property string $category_id database column
+ * @property int|null $level database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property int $requestable database column
+ * @property int $lockable database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $sort_position database column
+ * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
+ * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
+ * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
+ * @property SimpleORMapCollection|Resource[] $children has_many Resource
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property Resource $parent belongs_to Resource
+ * @property mixed $class_name additional field
+ */
+class BrokenResource extends Resource
+{
+    public function store()
+    {
+        //Broken resources shall not be stored or modified.
+        //Modification may break things.
+        return false;
+    }
+
+    public function getFolder($create_if_missing = true)
+    {
+        return null;
+    }
+
+    public function setFolder(ResourceFolder $folder)
+    {
+        return false;
+    }
+
+    public function createFolder()
+    {
+        return null;
+    }
+
+    public function createSimpleBooking(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL
+    )
+    {
+        return null;
+    }
+
+    public function createBookingFromRequest(
+        User $user,
+        ResourceRequest $request,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $prepend_preparation_time = false,
+        $notify_lecturers = false
+    )
+    {
+        return null;
+    }
+
+    public function createBooking(
+        User $user,
+        $range_id = null,
+        $time_ranges = [],
+        $repetition_interval = null,
+        $repetition_amount = 0,
+        $repetition_end_date = null,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $force_booking = false
+    ) {
+        return null;
+    }
+
+    public function createSimpleRequest(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $comment = '',
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+
+    public function createRequest(
+        User $user,
+        $date_range_ids = null,
+        $comment = '',
+        $properties = [],
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createLock(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $internal_comment = ''
+    )
+    {
+        return null;
+    }
+
+    public function propertyExists($name = '')
+    {
+        //Resource labels don't have properties:
+        return false;
+    }
+
+    public function getPropertyObject(string $name = '')
+    {
+        return null;
+    }
+
+    public function getProperty(string $name = '')
+    {
+        return null;
+    }
+
+    public function getPropertyRelatedObject(string $name = '')
+    {
+        return null;
+    }
+
+    public function setProperty(string $name = '', $state = '', $user_id = null)
+    {
+        return false;
+    }
+
+    public function isPropertyEditable(string $name, User $user)
+    {
+        return false;
+    }
+
+    public function setPropertyByDefinitionId(
+        $property_definition_id = null,
+        $state = null
+    )
+    {
+        return false;
+    }
+
+    public function setPropertyRelatedObject(string $name, SimpleORMap $object)
+    {
+        return false;
+    }
+
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        return Icon::create('resources-broken', $role);
+    }
+
+    public function getPropertyArray($only_requestable_properties = false)
+    {
+        return [];
+    }
+
+    public function isAssigned(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isReserved(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_reservation_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isLocked(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_lock_ids = []
+    )
+    {
+        return true;
+    }
+
+    public function isAvailable(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isAvailableForRequest(ResourceRequest $request)
+    {
+        return false;
+    }
+
+    public function getFullName()
+    {
+        return sprintf('%1$s (%2$s)', $this->name, _('defekt'));
+    }
+
+    public function getOpenResourceRequests(DateTime $begin, DateTime $end)
+    {
+        return [];
+    }
+
+    public function getResourceBookings(DateTime $begin, DateTime $end, array $booking_types = [0])
+    {
+        return [];
+    }
+
+    public function getResourceLocks(DateTime $begin, DateTime $end)
+    {
+        return [];
+    }
+
+    public function hasFiles()
+    {
+        return false;
+    }
+
+    public function checkHierarchy()
+    {
+        return true;
+    }
+
+    public function getItemAvatarURL()
+    {
+        return Icon::create('info', Icon::ROLE_INFO)->asImagePath();
+    }
+}
diff --git a/lib/models/resources/Building.class.php b/lib/models/resources/Building.class.php
deleted file mode 100644
index 0edb983..0000000
--- a/lib/models/resources/Building.class.php
+++ /dev/null
@@ -1,534 +0,0 @@
-<?php
-
-/**
- * Building.class.php - model class for a resource which is a building
- *
- * The building class is a derived class from the Resource class
- * which includes specialisations for Building resource types.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.1
- *
- * @property string $id database column
- * @property string $parent_id database column
- * @property string $category_id database column
- * @property int|null $level database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property int $requestable database column
- * @property int $lockable database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $sort_position database column
- * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
- * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
- * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
- * @property SimpleORMapCollection|Resource[] $children has_many Resource
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property Resource $parent belongs_to Resource
- * @property mixed $address additional field
- * @property mixed $number additional field
- * @property mixed $geo_coordinates additional field
- * @property-read mixed $location additional field
- * @property-read mixed $rooms additional field
- * @property mixed $facility_manager additional field
- * @property mixed $class_name additional field
- */
-class Building extends Resource
-{
-    protected static $required_properties = [
-        'address',
-        'number',
-        'geo_coordinates'
-    ];
-
-    protected static function configure($config = [])
-    {
-        if (!isset($config['additional_fields'])) {
-            $config['additional_fields'] = [];
-        }
-
-        foreach (self::$required_properties as $property) {
-            $config['additional_fields'][$property] = [
-                'get' => 'getProperty',
-                'set' => 'setProperty'
-            ];
-        }
-
-        $config['additional_fields']['location']['get'] = 'findLocation';
-        $config['additional_fields']['rooms']['get']    = 'findRooms';
-
-        $config['additional_fields']['facility_manager'] = [
-            'get' => 'getPropertyRelatedObject',
-            'set' => 'setPropertyRelatedObject'
-        ];
-
-        $config['registered_callbacks']['before_store'][] = 'cbValidate';
-        parent::configure($config);
-    }
-
-    /**
-     * Returns all buildings which are stored in the database.
-     *
-     * @return Building[] An array of Building objects.
-     */
-    public static function findAll()
-    {
-        return self::findBySql(
-            "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE rc.class_name = 'Building'
-            ORDER BY sort_position DESC, name ASC, mkdate ASC"
-        );
-    }
-
-    public static function getTranslatedClassName($item_count = 1)
-    {
-        return ngettext(
-            'Gebäude',
-            'Gebäude',
-            $item_count
-        );
-    }
-
-    public static function getRequiredProperties()
-    {
-        return self::$required_properties;
-    }
-
-    /**
-     * Finds buildings by a location specified by its ID.
-     *
-     * @param string $location_id The ID of the location.
-     *
-     * @return Building[] An array with buildings or an empty array.
-     */
-    public static function findByLocation($location_id = null)
-    {
-        if (!$location_id) {
-            return [];
-        }
-
-        $location = Building::find($location_id);
-        if (!$location) {
-            return [];
-        }
-
-        //Return all found Building objects below the location:
-        return $location->findChildrenByClassName('Building', 0, true);
-    }
-
-
-    /**
-     * Returns the part of the URL for getLink and getURL which will be
-     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
-     * in these methods.
-     *
-     * @param string $action The action for the building.
-     * @param string $id The ID of the building.
-     *
-     * @return string The URL path for the specified action.
-     * @throws InvalidArgumentException If $building_id is empty.
-     *
-     */
-    protected static function buildPathForAction($action = 'show', $id = null)
-    {
-        if (!$id) {
-            throw new InvalidArgumentException(
-                _('Zur Erstellung der URL fehlt eine Gebäude-ID!')
-            );
-        }
-
-        //There are some actions which can be handled by the general
-        //resource controller:
-        if (in_array($action, ['files', 'request', 'lock'])) {
-            return parent::buildPathForAction($action, $id);
-        }
-
-        switch ($action) {
-            case 'show':
-                return 'dispatch.php/resources/building/index/' . $id;
-            case 'add':
-                return 'dispatch.php/resources/building/add';
-            case 'edit':
-                return 'dispatch.php/resources/building/edit/' . $id;
-            case 'delete':
-                return 'dispatch.php/resources/building/delete/' . $id;
-            default:
-                return parent::buildPathForAction($action, $id);
-        }
-    }
-
-    /**
-     * Returns the appropriate link for the building action that shall be
-     * executed on a building.
-     *
-     * @param string $action The action which shall be executed.
-     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
-     *     and 'delete' are defined.
-     * @param string $id The ID of the building on which the specified
-     *     action shall be executed.
-     * @param $link_parameters @TODO
-     *
-     * @return string The Link for the building action.
-     */
-    public static function getLinkForAction(
-        $action = 'show',
-        $id = null,
-        $link_parameters = []
-    )
-    {
-        return URLHelper::getLink(
-            self::buildPathForAction($action, $id),
-            $link_parameters
-        );
-    }
-
-    /**
-     * Returns the appropriate URL for the building action that shall be
-     * executed on a building.
-     *
-     * @param string $action The action which shall be executed.
-     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
-     *     and 'delete' are defined.
-     * @param string $id The ID of the building on which the specified
-     *     action shall be executed.
-     * @param $url_parameters @TODO
-     * @return string The URL for the building action.
-     */
-    public static function getURLForAction(
-        $action = 'show',
-        $id = null,
-        $url_parameters = []
-    )
-    {
-        return URLHelper::getURL(
-            self::buildPathForAction($action, $id),
-            $url_parameters
-        );
-    }
-
-    public function getRequiredPropertyNames()
-    {
-        return self::$required_properties;
-    }
-
-    /**
-     * @see StudipItem::__toString
-     */
-    public function __toString()
-    {
-        return $this->getFullName();
-    }
-
-    public function cbValidate()
-    {
-        if (!$this->findParentByClassName('Location')) {
-            //Buildings must have a location as parent!
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Das Gebäude %1$s ist keinem Standort zugeordnet!'),
-                    $this->name
-                )
-            );
-        }
-
-        if (!is_a($this->category->class_name, get_class($this), true)) {
-            //Only resources with the Building category can be handled
-            //with this class!
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Das Gebäude %1$s ist der falschen Ressourcen-Klasse zugeordnet!'),
-                    $this->name
-                )
-            );
-        }
-
-        return true;
-    }
-
-    //property and shortcut methods:
-
-    /**
-     * Returns the full (localised) name of the building.
-     *
-     * @return string The full name of the building.
-     */
-    public function getFullName()
-    {
-        return sprintf(
-            _('Gebäude %s'),
-            $this->name
-        );
-    }
-
-    /**
-     * Returns the path for the building's image.
-     * If the building has no image the path for a general
-     * building icon will be returned.
-     *
-     * @return string The image path to the building's image.
-     */
-    public function getDefaultPictureUrl()
-    {
-        return $this->getIcon()->asImagePath();
-    }
-
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        return Icon::create('home', $role);
-    }
-
-    public function checkHierarchy()
-    {
-        //We must check if this building has buildings as children
-        //or rooms or buildings as parents. In any of those cases the hierarchy
-        //is invalid!
-
-        $children = $this->findChildrenByClassName('Building');
-        if (count($children) > 0) {
-            //At least one child anywhere below this building
-            //resource is a building, too.
-            return false;
-        }
-
-        $parents = ResourceManager::getHierarchy($this);
-        //We do not need to check this element:
-        array_shift($parents);
-        foreach ($parents as $parent) {
-            $parent = $parent->getDerivedClassInstance();
-            if (($parent instanceof Building) || ($parent instanceof Room)) {
-                //Hierarchy error
-                return false;
-            }
-        }
-
-        //If code execution reaches this point then
-        //the hierarchy around this building is valid.
-        return true;
-    }
-
-    /**
-     * Returns the link for an action for this building.
-     * This is the non-static variant of Building::getLinkForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
-     *     and 'delete' are defined.
-     * @param array $link_parameters Optional parameters for the link.
-     *
-     * @return string The Link for the building action.
-     */
-    public function getActionLink($action = 'show', $link_parameters = [])
-    {
-        return self::getLinkForAction(
-            $action,
-            $this->id,
-            $link_parameters
-        );
-    }
-
-    /**
-     * Returns the URL for an action for this building.
-     * This is the non-static variant of Building::getURLForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
-     *     and 'delete' are defined.
-     * @param array $link_parameters Optional parameters for the URL.
-     *
-     * @return string The URL for the building action.
-     */
-    public function getActionURL($action = 'show', $url_parameters = [])
-    {
-        return self::getURLForAction(
-            $action,
-            $this->id,
-            $url_parameters
-        );
-    }
-
-    /**
-     * Retrieves the rooms which reside inside this building by looking up
-     * the child resources of this building.
-     *
-     * @return Room[] An array with Room objects or an empty array
-     *     if no rooms can be found.
-     */
-    public function findRooms()
-    {
-        $rooms = parent::findChildrenByClassName('Room', 0, true);
-
-        $result = [];
-        foreach ($rooms as $room) {
-            if ($room instanceof Room) {
-                $result[] = $room;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Retrieves the location where this building is assigned to by looking up
-     * the parent resources of this building.
-     *
-     * @return Location|null A Location object if it can be found,
-     *     null otherwise.
-     */
-    public function findLocation()
-    {
-        $location = parent::findParentByClassName('Location');
-        if ($location instanceof Resource) {
-            return $location->getDerivedClassInstance();
-        }
-        return null;
-    }
-
-    /**
-     * Adds a child resource to this building. The child resource
-     * must not be a resource of the class Building or Location.
-     *
-     * @param Resource $resource The resource which shall be added as child.
-     *
-     * @return True, if the resource could be added as child, false otherwise.
-     * @throws InvalidResourceException If the specified resource belongs to
-     *     the resource classes Building or Location.
-     *
-     */
-    public function addChild(Resource $resource)
-    {
-        if ($resource->class_name == $this->class_name) {
-            throw new InvalidResourceException(
-                _('Ein Gebäude darf keinem anderen Gebäude in der Hierarchie untergeordnet werden!')
-            );
-        } elseif ($resource->class_name == 'Location') {
-            throw new InvalidResourceException(
-                _('Ein Standort darf keinem Gebäude in der Hierarchie untergeordnet werden!')
-            );
-        }
-        return parent::addChild($resource);
-    }
-
-    public function createSimpleBooking(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL
-    )
-    {
-        return null;
-    }
-
-    public function createBookingFromRequest(
-        User $user,
-        ResourceRequest $request,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $prepend_preparation_time = false,
-        $notify_lecturers = false
-    )
-    {
-        return null;
-    }
-
-
-    public function createBooking(
-        User $user,
-        $range_id = null,
-        $time_ranges = [],
-        $repetition_interval = null,
-        $repetition_amount = 0,
-        $repetition_end_date = null,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $force_booking = false
-    )
-    {
-        return null;
-    }
-
-    public function createSimpleRequest(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $comment = '',
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createRequest(
-        User $user,
-        $date_range_ids = null,
-        $comment = '',
-        $properties = [],
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createLock(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $internal_comment = ''
-    )
-    {
-        return null;
-    }
-
-    public function isAssigned(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isReserved(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_reservation_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isLocked(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_lock_ids = []
-    )
-    {
-        return true;
-    }
-
-    public function isAvailable(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-}
diff --git a/lib/models/resources/Building.php b/lib/models/resources/Building.php
new file mode 100644
index 0000000..0edb983
--- /dev/null
+++ b/lib/models/resources/Building.php
@@ -0,0 +1,534 @@
+<?php
+
+/**
+ * Building.class.php - model class for a resource which is a building
+ *
+ * The building class is a derived class from the Resource class
+ * which includes specialisations for Building resource types.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.1
+ *
+ * @property string $id database column
+ * @property string $parent_id database column
+ * @property string $category_id database column
+ * @property int|null $level database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property int $requestable database column
+ * @property int $lockable database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $sort_position database column
+ * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
+ * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
+ * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
+ * @property SimpleORMapCollection|Resource[] $children has_many Resource
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property Resource $parent belongs_to Resource
+ * @property mixed $address additional field
+ * @property mixed $number additional field
+ * @property mixed $geo_coordinates additional field
+ * @property-read mixed $location additional field
+ * @property-read mixed $rooms additional field
+ * @property mixed $facility_manager additional field
+ * @property mixed $class_name additional field
+ */
+class Building extends Resource
+{
+    protected static $required_properties = [
+        'address',
+        'number',
+        'geo_coordinates'
+    ];
+
+    protected static function configure($config = [])
+    {
+        if (!isset($config['additional_fields'])) {
+            $config['additional_fields'] = [];
+        }
+
+        foreach (self::$required_properties as $property) {
+            $config['additional_fields'][$property] = [
+                'get' => 'getProperty',
+                'set' => 'setProperty'
+            ];
+        }
+
+        $config['additional_fields']['location']['get'] = 'findLocation';
+        $config['additional_fields']['rooms']['get']    = 'findRooms';
+
+        $config['additional_fields']['facility_manager'] = [
+            'get' => 'getPropertyRelatedObject',
+            'set' => 'setPropertyRelatedObject'
+        ];
+
+        $config['registered_callbacks']['before_store'][] = 'cbValidate';
+        parent::configure($config);
+    }
+
+    /**
+     * Returns all buildings which are stored in the database.
+     *
+     * @return Building[] An array of Building objects.
+     */
+    public static function findAll()
+    {
+        return self::findBySql(
+            "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE rc.class_name = 'Building'
+            ORDER BY sort_position DESC, name ASC, mkdate ASC"
+        );
+    }
+
+    public static function getTranslatedClassName($item_count = 1)
+    {
+        return ngettext(
+            'Gebäude',
+            'Gebäude',
+            $item_count
+        );
+    }
+
+    public static function getRequiredProperties()
+    {
+        return self::$required_properties;
+    }
+
+    /**
+     * Finds buildings by a location specified by its ID.
+     *
+     * @param string $location_id The ID of the location.
+     *
+     * @return Building[] An array with buildings or an empty array.
+     */
+    public static function findByLocation($location_id = null)
+    {
+        if (!$location_id) {
+            return [];
+        }
+
+        $location = Building::find($location_id);
+        if (!$location) {
+            return [];
+        }
+
+        //Return all found Building objects below the location:
+        return $location->findChildrenByClassName('Building', 0, true);
+    }
+
+
+    /**
+     * Returns the part of the URL for getLink and getURL which will be
+     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
+     * in these methods.
+     *
+     * @param string $action The action for the building.
+     * @param string $id The ID of the building.
+     *
+     * @return string The URL path for the specified action.
+     * @throws InvalidArgumentException If $building_id is empty.
+     *
+     */
+    protected static function buildPathForAction($action = 'show', $id = null)
+    {
+        if (!$id) {
+            throw new InvalidArgumentException(
+                _('Zur Erstellung der URL fehlt eine Gebäude-ID!')
+            );
+        }
+
+        //There are some actions which can be handled by the general
+        //resource controller:
+        if (in_array($action, ['files', 'request', 'lock'])) {
+            return parent::buildPathForAction($action, $id);
+        }
+
+        switch ($action) {
+            case 'show':
+                return 'dispatch.php/resources/building/index/' . $id;
+            case 'add':
+                return 'dispatch.php/resources/building/add';
+            case 'edit':
+                return 'dispatch.php/resources/building/edit/' . $id;
+            case 'delete':
+                return 'dispatch.php/resources/building/delete/' . $id;
+            default:
+                return parent::buildPathForAction($action, $id);
+        }
+    }
+
+    /**
+     * Returns the appropriate link for the building action that shall be
+     * executed on a building.
+     *
+     * @param string $action The action which shall be executed.
+     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
+     *     and 'delete' are defined.
+     * @param string $id The ID of the building on which the specified
+     *     action shall be executed.
+     * @param $link_parameters @TODO
+     *
+     * @return string The Link for the building action.
+     */
+    public static function getLinkForAction(
+        $action = 'show',
+        $id = null,
+        $link_parameters = []
+    )
+    {
+        return URLHelper::getLink(
+            self::buildPathForAction($action, $id),
+            $link_parameters
+        );
+    }
+
+    /**
+     * Returns the appropriate URL for the building action that shall be
+     * executed on a building.
+     *
+     * @param string $action The action which shall be executed.
+     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
+     *     and 'delete' are defined.
+     * @param string $id The ID of the building on which the specified
+     *     action shall be executed.
+     * @param $url_parameters @TODO
+     * @return string The URL for the building action.
+     */
+    public static function getURLForAction(
+        $action = 'show',
+        $id = null,
+        $url_parameters = []
+    )
+    {
+        return URLHelper::getURL(
+            self::buildPathForAction($action, $id),
+            $url_parameters
+        );
+    }
+
+    public function getRequiredPropertyNames()
+    {
+        return self::$required_properties;
+    }
+
+    /**
+     * @see StudipItem::__toString
+     */
+    public function __toString()
+    {
+        return $this->getFullName();
+    }
+
+    public function cbValidate()
+    {
+        if (!$this->findParentByClassName('Location')) {
+            //Buildings must have a location as parent!
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Das Gebäude %1$s ist keinem Standort zugeordnet!'),
+                    $this->name
+                )
+            );
+        }
+
+        if (!is_a($this->category->class_name, get_class($this), true)) {
+            //Only resources with the Building category can be handled
+            //with this class!
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Das Gebäude %1$s ist der falschen Ressourcen-Klasse zugeordnet!'),
+                    $this->name
+                )
+            );
+        }
+
+        return true;
+    }
+
+    //property and shortcut methods:
+
+    /**
+     * Returns the full (localised) name of the building.
+     *
+     * @return string The full name of the building.
+     */
+    public function getFullName()
+    {
+        return sprintf(
+            _('Gebäude %s'),
+            $this->name
+        );
+    }
+
+    /**
+     * Returns the path for the building's image.
+     * If the building has no image the path for a general
+     * building icon will be returned.
+     *
+     * @return string The image path to the building's image.
+     */
+    public function getDefaultPictureUrl()
+    {
+        return $this->getIcon()->asImagePath();
+    }
+
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        return Icon::create('home', $role);
+    }
+
+    public function checkHierarchy()
+    {
+        //We must check if this building has buildings as children
+        //or rooms or buildings as parents. In any of those cases the hierarchy
+        //is invalid!
+
+        $children = $this->findChildrenByClassName('Building');
+        if (count($children) > 0) {
+            //At least one child anywhere below this building
+            //resource is a building, too.
+            return false;
+        }
+
+        $parents = ResourceManager::getHierarchy($this);
+        //We do not need to check this element:
+        array_shift($parents);
+        foreach ($parents as $parent) {
+            $parent = $parent->getDerivedClassInstance();
+            if (($parent instanceof Building) || ($parent instanceof Room)) {
+                //Hierarchy error
+                return false;
+            }
+        }
+
+        //If code execution reaches this point then
+        //the hierarchy around this building is valid.
+        return true;
+    }
+
+    /**
+     * Returns the link for an action for this building.
+     * This is the non-static variant of Building::getLinkForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
+     *     and 'delete' are defined.
+     * @param array $link_parameters Optional parameters for the link.
+     *
+     * @return string The Link for the building action.
+     */
+    public function getActionLink($action = 'show', $link_parameters = [])
+    {
+        return self::getLinkForAction(
+            $action,
+            $this->id,
+            $link_parameters
+        );
+    }
+
+    /**
+     * Returns the URL for an action for this building.
+     * This is the non-static variant of Building::getURLForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For buildings the actions 'show', 'booking_plan', 'add', 'edit'
+     *     and 'delete' are defined.
+     * @param array $link_parameters Optional parameters for the URL.
+     *
+     * @return string The URL for the building action.
+     */
+    public function getActionURL($action = 'show', $url_parameters = [])
+    {
+        return self::getURLForAction(
+            $action,
+            $this->id,
+            $url_parameters
+        );
+    }
+
+    /**
+     * Retrieves the rooms which reside inside this building by looking up
+     * the child resources of this building.
+     *
+     * @return Room[] An array with Room objects or an empty array
+     *     if no rooms can be found.
+     */
+    public function findRooms()
+    {
+        $rooms = parent::findChildrenByClassName('Room', 0, true);
+
+        $result = [];
+        foreach ($rooms as $room) {
+            if ($room instanceof Room) {
+                $result[] = $room;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieves the location where this building is assigned to by looking up
+     * the parent resources of this building.
+     *
+     * @return Location|null A Location object if it can be found,
+     *     null otherwise.
+     */
+    public function findLocation()
+    {
+        $location = parent::findParentByClassName('Location');
+        if ($location instanceof Resource) {
+            return $location->getDerivedClassInstance();
+        }
+        return null;
+    }
+
+    /**
+     * Adds a child resource to this building. The child resource
+     * must not be a resource of the class Building or Location.
+     *
+     * @param Resource $resource The resource which shall be added as child.
+     *
+     * @return True, if the resource could be added as child, false otherwise.
+     * @throws InvalidResourceException If the specified resource belongs to
+     *     the resource classes Building or Location.
+     *
+     */
+    public function addChild(Resource $resource)
+    {
+        if ($resource->class_name == $this->class_name) {
+            throw new InvalidResourceException(
+                _('Ein Gebäude darf keinem anderen Gebäude in der Hierarchie untergeordnet werden!')
+            );
+        } elseif ($resource->class_name == 'Location') {
+            throw new InvalidResourceException(
+                _('Ein Standort darf keinem Gebäude in der Hierarchie untergeordnet werden!')
+            );
+        }
+        return parent::addChild($resource);
+    }
+
+    public function createSimpleBooking(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL
+    )
+    {
+        return null;
+    }
+
+    public function createBookingFromRequest(
+        User $user,
+        ResourceRequest $request,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $prepend_preparation_time = false,
+        $notify_lecturers = false
+    )
+    {
+        return null;
+    }
+
+
+    public function createBooking(
+        User $user,
+        $range_id = null,
+        $time_ranges = [],
+        $repetition_interval = null,
+        $repetition_amount = 0,
+        $repetition_end_date = null,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $force_booking = false
+    )
+    {
+        return null;
+    }
+
+    public function createSimpleRequest(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $comment = '',
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createRequest(
+        User $user,
+        $date_range_ids = null,
+        $comment = '',
+        $properties = [],
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createLock(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $internal_comment = ''
+    )
+    {
+        return null;
+    }
+
+    public function isAssigned(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isReserved(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_reservation_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isLocked(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_lock_ids = []
+    )
+    {
+        return true;
+    }
+
+    public function isAvailable(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+}
diff --git a/lib/models/resources/GlobalResourceLock.class.php b/lib/models/resources/GlobalResourceLock.class.php
deleted file mode 100644
index b1753f5..0000000
--- a/lib/models/resources/GlobalResourceLock.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * GlobalResourceLock.class.php - model class for resource locks
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property string $id alias column for lock_id
- * @property string $lock_id database column
- * @property int $begin database column
- * @property int $end database column
- * @property string $type database column
- * @property string $user_id database column
- * @property int $mkdate database column
- * @property int $chdate database column
- */
-class GlobalResourceLock extends SimpleORMap
-{
-    protected static $defined_types = [];
-    
-    public function __construct($id = null)
-    {
-        self::initDefinedTypes();
-        parent::__construct($id);
-    }
-    
-    protected static function initDefinedTypes()
-    {
-        if (empty(self::$defined_types)) {
-            self::$defined_types = [
-                'default'        => _('Allgemeine Sperrung'),
-                'planning'       => _('Planungsphase'),
-                'reorganisation' => _('Reorganisation')
-            ];
-        }
-    }
-    
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'global_resource_locks';
-        
-        parent::configure($config);
-    }
-    
-    public static function isLocked($begin, $end)
-    {
-        return self::countBySql('begin < :end AND end > :begin', compact('begin', 'end')) > 0;
-    }
-
-    /**
-     * Returns a list of defined lock types.
-     *
-     * @return string[] An associative array with all defined lock types.
-     */
-    public static function getDefinedTypes()
-    {
-        self::initDefinedTypes();
-        return self::$defined_types;
-    }
-    
-    /**
-     * Returns a string representation of the type of this resource lock.
-     *
-     * @return string A string representing the type of this resource lock.
-     */
-    public function getTypeString()
-    {
-        if (array_key_exists($this->type, self::$defined_types)) {
-            return self::$defined_types[$this->type];
-        } else {
-            if ($this->type) {
-                return _('Grund unbekannt');
-            } else {
-                return _('Grund nicht angegeben');
-            }
-        }
-    }
-}
diff --git a/lib/models/resources/GlobalResourceLock.php b/lib/models/resources/GlobalResourceLock.php
new file mode 100644
index 0000000..b1753f5
--- /dev/null
+++ b/lib/models/resources/GlobalResourceLock.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * GlobalResourceLock.class.php - model class for resource locks
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property string $id alias column for lock_id
+ * @property string $lock_id database column
+ * @property int $begin database column
+ * @property int $end database column
+ * @property string $type database column
+ * @property string $user_id database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ */
+class GlobalResourceLock extends SimpleORMap
+{
+    protected static $defined_types = [];
+    
+    public function __construct($id = null)
+    {
+        self::initDefinedTypes();
+        parent::__construct($id);
+    }
+    
+    protected static function initDefinedTypes()
+    {
+        if (empty(self::$defined_types)) {
+            self::$defined_types = [
+                'default'        => _('Allgemeine Sperrung'),
+                'planning'       => _('Planungsphase'),
+                'reorganisation' => _('Reorganisation')
+            ];
+        }
+    }
+    
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'global_resource_locks';
+        
+        parent::configure($config);
+    }
+    
+    public static function isLocked($begin, $end)
+    {
+        return self::countBySql('begin < :end AND end > :begin', compact('begin', 'end')) > 0;
+    }
+
+    /**
+     * Returns a list of defined lock types.
+     *
+     * @return string[] An associative array with all defined lock types.
+     */
+    public static function getDefinedTypes()
+    {
+        self::initDefinedTypes();
+        return self::$defined_types;
+    }
+    
+    /**
+     * Returns a string representation of the type of this resource lock.
+     *
+     * @return string A string representing the type of this resource lock.
+     */
+    public function getTypeString()
+    {
+        if (array_key_exists($this->type, self::$defined_types)) {
+            return self::$defined_types[$this->type];
+        } else {
+            if ($this->type) {
+                return _('Grund unbekannt');
+            } else {
+                return _('Grund nicht angegeben');
+            }
+        }
+    }
+}
diff --git a/lib/models/resources/Location.class.php b/lib/models/resources/Location.class.php
deleted file mode 100644
index 8e79382..0000000
--- a/lib/models/resources/Location.class.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<?php
-
-/**
- * Location.class.php - model class for a resource which is a location
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.1
- *
- * @property string $id database column
- * @property string $parent_id database column
- * @property string $category_id database column
- * @property int|null $level database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property int $requestable database column
- * @property int $lockable database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $sort_position database column
- * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
- * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
- * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
- * @property SimpleORMapCollection|Resource[] $children has_many Resource
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property Resource $parent belongs_to Resource
- * @property mixed $geo_coordinates additional field
- * @property-read mixed $buildings additional field
- * @property mixed $director additional field
- * @property mixed $class_name additional field
- */
-class Location extends Resource
-{
-    protected static $required_properties = [
-        'geo_coordinates'
-    ];
-
-    protected static function configure($config = [])
-    {
-        if (!isset($config['additional_fields'])) {
-            $config['additional_fields'] = [];
-        }
-        foreach (self::$required_properties as $property) {
-            $config['additional_fields'][$property] = [
-                'get' => 'getProperty',
-                'set' => 'setProperty'
-            ];
-        }
-
-        $config['additional_fields']['buildings']['get'] = 'findBuildings';
-
-        $config['additional_fields']['director'] = [
-            'get' => 'getPropertyRelatedObject',
-            'set' => 'setPropertyRelatedObject'
-        ];
-
-        $config['registered_callbacks']['before_store'][] = 'cbValidate';
-        parent::configure($config);
-    }
-
-    public static function getTranslatedClassName($item_count = 1)
-    {
-        return ngettext(
-            'Standort',
-            'Standorte',
-            $item_count
-        );
-    }
-
-    /**
-     * Returns all locations which are stored in the database.
-     *
-     * @return Location[] An array of Location objects.
-     */
-    public static function findAll()
-    {
-        return self::findBySql(
-            "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE rc.class_name = 'Location'
-            ORDER BY sort_position DESC, name ASC, mkdate ASC"
-        );
-    }
-
-    /**
-     * Returns the part of the URL for getLink and getURL which will be
-     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
-     * in these methods.
-     */
-    protected static function buildPathForAction($action = 'show', $id = null)
-    {
-        if (!$id) {
-            throw new InvalidArgumentException(
-                _('Zuer Erstellung der URL fehlt eine Standort-ID!')
-            );
-        }
-
-        switch ($action) {
-            case 'show':
-                return 'dispatch.php/resources/location/index/' . $id;
-            case 'add':
-                return 'dispatch.php/resources/location/add';
-            case 'edit':
-                return 'dispatch.php/resources/location/edit/' . $id;
-            case 'delete':
-                return 'dispatch.php/resources/location/delete/' . $id;
-            default:
-                //There are some actions which can be handled by the general
-                //resource controller:
-                return parent::buildPathForAction($action, $id);
-        }
-    }
-
-    /**
-     * Returns the appropriate link for the location action that shall be
-     * executed on a location.
-     *
-     * @param string $action The action which shall be executed.
-     *     For locations the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param string $id The ID of the location on which the specified
-     *     action shall be executed.
-     * @param array $link_parameters Optional parameters for the link.
-     *
-     * @return string The Link for the location action.
-     */
-    public static function getLinkForAction(
-        $action = 'show',
-        $id = null,
-        $link_parameters = []
-    )
-    {
-        return URLHelper::getLink(
-            self::buildPathForAction($action, $id),
-            $link_parameters
-        );
-    }
-
-
-    /**
-     * Returns the appropriate URL for the location action that shall be
-     * executed on a location.
-     *
-     * @param string $action The action which shall be executed.
-     *     For locations the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param string $id The ID of the location on which the specified
-     *     action shall be executed.
-     * @param array $url_parameters Optional parameters for the URL.
-     *
-     * @return string The URL for the location action.
-     */
-    public static function getURLForAction(
-        $action = 'show',
-        $id = null,
-        $url_parameters = []
-    )
-    {
-        return URLHelper::getURL(
-            self::buildPathForAction($action, $id),
-            $url_parameters
-        );
-    }
-
-    public function getRequiredPropertyNames()
-    {
-        return self::$required_properties;
-    }
-
-    /**
-     * @see StudipItem::__toString
-     */
-    public function __toString()
-    {
-        return $this->getFullName();
-    }
-
-    public function cbValidate()
-    {
-        if ($this->parent_id) {
-            //Locations must not have parents! They are a top layer resource!
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Der Standort %1$s darf keiner anderen Ressource untergeordnet sein!'),
-                    $this->name
-                )
-            );
-        }
-
-        if (!is_a($this->category->class_name, get_class($this), true)) {
-            //Only resources with the Location category can be handled
-            //with this class!
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Der Standort %1$s ist der falschen Ressourcen-Klasse zugeordnet!'),
-                    $this->name
-                )
-            );
-        }
-    }
-
-    /**
-     * Returns the full (localised) name of the location.
-     *
-     * @return string The full name of the location.
-     */
-    public function getFullName()
-    {
-        return sprintf(
-            _('Standort %s'),
-            $this->name
-        );
-    }
-
-    public function getDefaultPictureUrl()
-    {
-        return $this->getIcon()->asImagePath();
-    }
-
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        return Icon::create('place', $role);
-    }
-
-    public function checkHierarchy()
-    {
-        //We must check if this location has locations as children
-        //or rooms, buildings or locations as parents.
-        //In any of those cases the hierarchy is invalid!
-
-        $children = $this->findChildrenByClassName('Location');
-        if (count($children) > 0) {
-            //At least one child anywhere below this location
-            //resource is a location, too.
-            return false;
-        }
-
-        $parents = ResourceManager::getHierarchy($this);
-        //We do not need to check this element:
-        array_shift($parents);
-        foreach ($parents as $parent) {
-            $parent = $parent->getDerivedClassInstance();
-            if (($parent instanceof Location) || ($parent instanceof Building)
-                || ($parent instanceof Room)) {
-                //Hierarchy error
-                return false;
-            }
-        }
-
-        //If code execution reaches this point then
-        //the hierarchy around this location is valid.
-        return true;
-    }
-
-    /**
-     * Returns the link for an action for this building.
-     * This is the non-static variant of Building::getLinkForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For locations the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param array $link_parameters Optional parameters for the link.
-     *
-     * @return string The Link for the building action.
-     */
-    public function getActionLink($action = 'show', $link_parameters = [])
-    {
-        return self::getLinkForAction(
-            $action,
-            $this->id,
-            $link_parameters
-        );
-    }
-
-    /**
-     * Returns the URL for an action for this location.
-     * This is the non-static variant of Location::getURLForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For locations the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param array $url_parameters Optional parameters for the URL.
-     * @return string
-     */
-    public function getActionURL($action = 'show', $url_parameters = [])
-    {
-        return self::getURLForAction(
-            $action,
-            $this->id,
-            $url_parameters
-        );
-    }
-
-    // Relation methods:
-
-    /**
-     * Retrieves the buildings which are associated to this location
-     * by looking up the child resources of this location.
-     *
-     * @return Building[] An array with Building objects or an empty array
-     *     if no buildings can be found.
-     */
-    public function findBuildings()
-    {
-        $buildings = parent::findChildrenByClassName('Building');
-
-        $result = [];
-        foreach ($buildings as $building) {
-            $result[] = Building::toObject($building);
-        }
-        return $result;
-    }
-
-    /**
-     * Adds a child resource to this location. The child resource
-     * must not be a resource of the Location class.
-     *
-     * @param Resource $resource The resource which shall be added as child.
-     *
-     * @return True, if the resource could be added as child, false otherwise.
-     * @throws InvalidResourceException If the specified resource belongs to
-     *     the Location resource class.
-     *
-     */
-    public function addChild(Resource $resource)
-    {
-        if ($resource->class_name == $this->class_name) {
-            throw new InvalidResourceException(
-                _('Ein Standort darf keinem anderen Standort in der Hierarchie untergeordnet werden!')
-            );
-        }
-        return parent::addChild($resource);
-    }
-
-    public function createSimpleBooking(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL
-    )
-    {
-        return null;
-    }
-
-    public function createBookingFromRequest(
-        User $user,
-        ResourceRequest $request,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $prepend_preparation_time = false,
-        $notify_lecturers = false
-    )
-    {
-        return null;
-    }
-
-    public function createBooking(
-        User $user,
-        $range_id = null,
-        $time_ranges = [],
-        $repetition_interval = null,
-        $repetition_amount = 0,
-        $repetition_end_date = null,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $force_booking = false
-    )
-    {
-        return null;
-    }
-
-    public function createSimpleRequest(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $comment = '',
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createRequest(
-        User $user,
-        $date_range_ids = null,
-        $comment = '',
-        $properties = [],
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createLock(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $internal_comment = ''
-    )
-    {
-        return null;
-    }
-
-    public function isAssigned(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isReserved(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_reservation_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isLocked(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_lock_ids = []
-    )
-    {
-        return true;
-    }
-
-    public function isAvailable(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-}
diff --git a/lib/models/resources/Location.php b/lib/models/resources/Location.php
new file mode 100644
index 0000000..8e79382
--- /dev/null
+++ b/lib/models/resources/Location.php
@@ -0,0 +1,455 @@
+<?php
+
+/**
+ * Location.class.php - model class for a resource which is a location
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.1
+ *
+ * @property string $id database column
+ * @property string $parent_id database column
+ * @property string $category_id database column
+ * @property int|null $level database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property int $requestable database column
+ * @property int $lockable database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $sort_position database column
+ * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
+ * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
+ * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
+ * @property SimpleORMapCollection|Resource[] $children has_many Resource
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property Resource $parent belongs_to Resource
+ * @property mixed $geo_coordinates additional field
+ * @property-read mixed $buildings additional field
+ * @property mixed $director additional field
+ * @property mixed $class_name additional field
+ */
+class Location extends Resource
+{
+    protected static $required_properties = [
+        'geo_coordinates'
+    ];
+
+    protected static function configure($config = [])
+    {
+        if (!isset($config['additional_fields'])) {
+            $config['additional_fields'] = [];
+        }
+        foreach (self::$required_properties as $property) {
+            $config['additional_fields'][$property] = [
+                'get' => 'getProperty',
+                'set' => 'setProperty'
+            ];
+        }
+
+        $config['additional_fields']['buildings']['get'] = 'findBuildings';
+
+        $config['additional_fields']['director'] = [
+            'get' => 'getPropertyRelatedObject',
+            'set' => 'setPropertyRelatedObject'
+        ];
+
+        $config['registered_callbacks']['before_store'][] = 'cbValidate';
+        parent::configure($config);
+    }
+
+    public static function getTranslatedClassName($item_count = 1)
+    {
+        return ngettext(
+            'Standort',
+            'Standorte',
+            $item_count
+        );
+    }
+
+    /**
+     * Returns all locations which are stored in the database.
+     *
+     * @return Location[] An array of Location objects.
+     */
+    public static function findAll()
+    {
+        return self::findBySql(
+            "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE rc.class_name = 'Location'
+            ORDER BY sort_position DESC, name ASC, mkdate ASC"
+        );
+    }
+
+    /**
+     * Returns the part of the URL for getLink and getURL which will be
+     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
+     * in these methods.
+     */
+    protected static function buildPathForAction($action = 'show', $id = null)
+    {
+        if (!$id) {
+            throw new InvalidArgumentException(
+                _('Zuer Erstellung der URL fehlt eine Standort-ID!')
+            );
+        }
+
+        switch ($action) {
+            case 'show':
+                return 'dispatch.php/resources/location/index/' . $id;
+            case 'add':
+                return 'dispatch.php/resources/location/add';
+            case 'edit':
+                return 'dispatch.php/resources/location/edit/' . $id;
+            case 'delete':
+                return 'dispatch.php/resources/location/delete/' . $id;
+            default:
+                //There are some actions which can be handled by the general
+                //resource controller:
+                return parent::buildPathForAction($action, $id);
+        }
+    }
+
+    /**
+     * Returns the appropriate link for the location action that shall be
+     * executed on a location.
+     *
+     * @param string $action The action which shall be executed.
+     *     For locations the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param string $id The ID of the location on which the specified
+     *     action shall be executed.
+     * @param array $link_parameters Optional parameters for the link.
+     *
+     * @return string The Link for the location action.
+     */
+    public static function getLinkForAction(
+        $action = 'show',
+        $id = null,
+        $link_parameters = []
+    )
+    {
+        return URLHelper::getLink(
+            self::buildPathForAction($action, $id),
+            $link_parameters
+        );
+    }
+
+
+    /**
+     * Returns the appropriate URL for the location action that shall be
+     * executed on a location.
+     *
+     * @param string $action The action which shall be executed.
+     *     For locations the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param string $id The ID of the location on which the specified
+     *     action shall be executed.
+     * @param array $url_parameters Optional parameters for the URL.
+     *
+     * @return string The URL for the location action.
+     */
+    public static function getURLForAction(
+        $action = 'show',
+        $id = null,
+        $url_parameters = []
+    )
+    {
+        return URLHelper::getURL(
+            self::buildPathForAction($action, $id),
+            $url_parameters
+        );
+    }
+
+    public function getRequiredPropertyNames()
+    {
+        return self::$required_properties;
+    }
+
+    /**
+     * @see StudipItem::__toString
+     */
+    public function __toString()
+    {
+        return $this->getFullName();
+    }
+
+    public function cbValidate()
+    {
+        if ($this->parent_id) {
+            //Locations must not have parents! They are a top layer resource!
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Der Standort %1$s darf keiner anderen Ressource untergeordnet sein!'),
+                    $this->name
+                )
+            );
+        }
+
+        if (!is_a($this->category->class_name, get_class($this), true)) {
+            //Only resources with the Location category can be handled
+            //with this class!
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Der Standort %1$s ist der falschen Ressourcen-Klasse zugeordnet!'),
+                    $this->name
+                )
+            );
+        }
+    }
+
+    /**
+     * Returns the full (localised) name of the location.
+     *
+     * @return string The full name of the location.
+     */
+    public function getFullName()
+    {
+        return sprintf(
+            _('Standort %s'),
+            $this->name
+        );
+    }
+
+    public function getDefaultPictureUrl()
+    {
+        return $this->getIcon()->asImagePath();
+    }
+
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        return Icon::create('place', $role);
+    }
+
+    public function checkHierarchy()
+    {
+        //We must check if this location has locations as children
+        //or rooms, buildings or locations as parents.
+        //In any of those cases the hierarchy is invalid!
+
+        $children = $this->findChildrenByClassName('Location');
+        if (count($children) > 0) {
+            //At least one child anywhere below this location
+            //resource is a location, too.
+            return false;
+        }
+
+        $parents = ResourceManager::getHierarchy($this);
+        //We do not need to check this element:
+        array_shift($parents);
+        foreach ($parents as $parent) {
+            $parent = $parent->getDerivedClassInstance();
+            if (($parent instanceof Location) || ($parent instanceof Building)
+                || ($parent instanceof Room)) {
+                //Hierarchy error
+                return false;
+            }
+        }
+
+        //If code execution reaches this point then
+        //the hierarchy around this location is valid.
+        return true;
+    }
+
+    /**
+     * Returns the link for an action for this building.
+     * This is the non-static variant of Building::getLinkForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For locations the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param array $link_parameters Optional parameters for the link.
+     *
+     * @return string The Link for the building action.
+     */
+    public function getActionLink($action = 'show', $link_parameters = [])
+    {
+        return self::getLinkForAction(
+            $action,
+            $this->id,
+            $link_parameters
+        );
+    }
+
+    /**
+     * Returns the URL for an action for this location.
+     * This is the non-static variant of Location::getURLForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For locations the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param array $url_parameters Optional parameters for the URL.
+     * @return string
+     */
+    public function getActionURL($action = 'show', $url_parameters = [])
+    {
+        return self::getURLForAction(
+            $action,
+            $this->id,
+            $url_parameters
+        );
+    }
+
+    // Relation methods:
+
+    /**
+     * Retrieves the buildings which are associated to this location
+     * by looking up the child resources of this location.
+     *
+     * @return Building[] An array with Building objects or an empty array
+     *     if no buildings can be found.
+     */
+    public function findBuildings()
+    {
+        $buildings = parent::findChildrenByClassName('Building');
+
+        $result = [];
+        foreach ($buildings as $building) {
+            $result[] = Building::toObject($building);
+        }
+        return $result;
+    }
+
+    /**
+     * Adds a child resource to this location. The child resource
+     * must not be a resource of the Location class.
+     *
+     * @param Resource $resource The resource which shall be added as child.
+     *
+     * @return True, if the resource could be added as child, false otherwise.
+     * @throws InvalidResourceException If the specified resource belongs to
+     *     the Location resource class.
+     *
+     */
+    public function addChild(Resource $resource)
+    {
+        if ($resource->class_name == $this->class_name) {
+            throw new InvalidResourceException(
+                _('Ein Standort darf keinem anderen Standort in der Hierarchie untergeordnet werden!')
+            );
+        }
+        return parent::addChild($resource);
+    }
+
+    public function createSimpleBooking(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL
+    )
+    {
+        return null;
+    }
+
+    public function createBookingFromRequest(
+        User $user,
+        ResourceRequest $request,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $prepend_preparation_time = false,
+        $notify_lecturers = false
+    )
+    {
+        return null;
+    }
+
+    public function createBooking(
+        User $user,
+        $range_id = null,
+        $time_ranges = [],
+        $repetition_interval = null,
+        $repetition_amount = 0,
+        $repetition_end_date = null,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $force_booking = false
+    )
+    {
+        return null;
+    }
+
+    public function createSimpleRequest(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $comment = '',
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createRequest(
+        User $user,
+        $date_range_ids = null,
+        $comment = '',
+        $properties = [],
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createLock(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $internal_comment = ''
+    )
+    {
+        return null;
+    }
+
+    public function isAssigned(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isReserved(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_reservation_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isLocked(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_lock_ids = []
+    )
+    {
+        return true;
+    }
+
+    public function isAvailable(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+}
diff --git a/lib/models/resources/Resource.class.php b/lib/models/resources/Resource.class.php
deleted file mode 100644
index 92d8107..0000000
--- a/lib/models/resources/Resource.class.php
+++ /dev/null
@@ -1,2965 +0,0 @@
-<?php
-
-/**
- * Resource.class.php - model class for a resource
- *
- * The Resource class is the base class of the new
- * Room and Resource management system in Stud.IP.
- * It provides core functionality for handling general resources
- * and can be derived for handling special resources.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property string $id database column
- * @property string $parent_id database column
- * @property string $category_id database column
- * @property int|null $level database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property int $requestable database column
- * @property int $lockable database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $sort_position database column
- * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
- * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
- * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
- * @property SimpleORMapCollection|Resource[] $children has_many Resource
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property Resource $parent belongs_to Resource
- * @property mixed $class_name additional field
- */
-class Resource extends SimpleORMap implements StudipItem
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resources';
-
-        $config['belongs_to']['category'] = [
-            'class_name'  => ResourceCategory::class,
-            'foreign_key' => 'category_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['has_many']['properties'] = [
-            'class_name'        => ResourceProperty::class,
-            'assoc_foreign_key' => 'resource_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store'
-        ];
-
-        $config['has_many']['permissions'] = [
-            'class_name'        => ResourcePermission::class,
-            'assoc_foreign_key' => 'resource_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store'
-        ];
-
-        $config['has_many']['requests'] = [
-            'class_name'        => ResourceRequest::class,
-            'assoc_foreign_key' => 'resource_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store'
-        ];
-
-        $config['has_many']['bookings'] = [
-            'class_name'        => ResourceBooking::class,
-            'assoc_foreign_key' => 'resource_id',
-            'on_delete'         => 'delete',
-            'on_store'          => 'store'
-        ];
-
-        $config['has_many']['children'] = [
-            'class_name' => Resource::class,
-            'assoc_func' => 'findChildren',
-            'on_delete'  => 'delete',
-            'on_store'   => 'store'
-        ];
-
-        $config['belongs_to']['parent'] = [
-            'class_name'  => Resource::class,
-            'foreign_key' => 'parent_id'
-        ];
-
-        $config['i18n_fields']['description'] = true;
-
-        $config['additional_fields']['class_name']        = ['category', 'class_name'];
-        $config['registered_callbacks']['before_store'][] = 'cbValidate';
-
-        parent::configure($config);
-    }
-
-    /**
-     * This is a cache for permissions that users have on resources.
-     * It is meant to reduce the database requests in cases where the
-     * same permission is queried a lot of times.
-     */
-    protected static $permission_cache;
-
-    /**
-     * Returns the children of a resource.
-     * The children are converted to an instance of the derived class,
-     * if they are not instances of the default Resource class.
-     */
-    public static function findChildren($resource_id)
-    {
-        $children = self::findBySql(
-            'parent_id = :parent_id ORDER BY name ASC',
-            ['parent_id' => $resource_id]
-        );
-
-        if (!$children) {
-            return [];
-        }
-
-        foreach ($children as &$child) {
-            $child = $child->getDerivedClassInstance();
-        }
-        return $children;
-    }
-
-    /**
-     * Returns a translation of the resource class name.
-     * The translated name can be singular or plural, depending
-     * on the value of the parameter $item_count.
-     *
-     * @param int $item_count The amount of items the translation shall be
-     *     made for. This is only used to determine, if a singular or a
-     *     plural form shall be returned.
-     *
-     * @return string The translated form of the class name, either in
-     *     singular or plural.
-     *
-     */
-    public static function getTranslatedClassName($item_count = 1)
-    {
-        return ngettext(
-            'Ressource',
-            'Ressourcen',
-            $item_count
-        );
-    }
-
-    /**
-     * Retrieves all resources which don't have a parent resource assigned.
-     * Such resources are called root resources since they are roots of
-     * a resource hierarchy (or a resource tree).
-     *
-     * @return Resource[] An array of Resource objects
-     *     which are root resources.
-     */
-    public static function getRootResources()
-    {
-        return self::findBySql("parent_id = '' ORDER BY name");
-    }
-
-    /**
-     * A method for overloaded classes so that they can define properties
-     * that are required for that resource class.
-     *
-     * @return string[] An array with the names of the required properties.
-     *     Example: The properties with the names "foo", "bar" and "baz"
-     *     are required properties. The array would have the following content:
-     *     [
-     *         'foo',
-     *         'bar',
-     *         'baz'
-     *     ]
-     */
-    public static function getRequiredProperties()
-    {
-        return [];
-    }
-
-
-    /**
-     * Returns the part of the URL for getLink and getURL which will be
-     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
-     * in these methods.
-     *
-     * @param string $action The action for the resource.
-     * @param string $id The ID of the resource.
-     *
-     * @return string The URL path for the specified action.
-     * @throws InvalidArgumentException If $resource_id is empty.
-     *
-     */
-    protected static function buildPathForAction($action = 'show', $id = null)
-    {
-        $actions_without_id = ['add'];
-        if (!$id && !in_array($action, $actions_without_id)) {
-            throw new InvalidArgumentException(
-                _('Zur Erstellung der URL fehlt eine Ressourcen-ID!')
-            );
-        }
-
-        switch ($action) {
-            case 'show':
-                return 'dispatch.php/resources/resource/index/' . $id;
-            case 'add':
-                return 'dispatch.php/resources/resource/add';
-            case 'edit':
-                return 'dispatch.php/resources/resource/edit/' . $id;
-            case 'files':
-                return 'dispatch.php/resources/resource/files/' . $id . '/';
-            case 'permissions':
-                return 'dispatch.php/resources/resource/permissions/' . $id;
-            case 'temporary_permissions':
-                return 'dispatch.php/resources/resource/temporary_permissions/' . $id;
-            case 'booking_plan':
-                return 'dispatch.php/resources/room_planning/booking_plan/' . $id;
-            case 'request_plan':
-                return 'dispatch.php/resources/room_planning/request_plan/' . $id;
-            case 'semester_plan':
-                return 'dispatch.php/resources/room_planning/semester_plan/' . $id;
-            case 'assign-undecided':
-                return 'dispatch.php/resources/booking/add/' . $id;
-            case 'assign':
-                return 'dispatch.php/resources/booking/add/' . $id . '/0';
-            case 'reserve':
-                return 'dispatch.php/resources/booking/add/' . $id . '/1';
-            case 'lock':
-                return 'dispatch.php/resources/booking/add/' . $id . '/2';
-            case 'delete_bookings':
-                return 'dispatch.php/resources/resource/delete_bookings/' . $id;
-            case 'export_bookings':
-                return 'dispatch.php/resources/export/resource_bookings/' . $id;
-            case 'delete':
-                return 'dispatch.php/resources/resource/delete/' . $id;
-            default:
-                return 'dispatch.php/resources/resource/show/' . $id;
-        }
-    }
-
-    /**
-     * Returns the appropriate link for the resource action that shall be
-     * executed on a resource.
-     *
-     * @param string $action The action which shall be executed.
-     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param string $id The ID of the resource on which the specified
-     *     action shall be executed.
-     * @param array $link_parameters Optional parameters for the link.
-     *
-     * @return string The Link for the resource action.
-     * @throws InvalidArgumentException If $resource_id is empty.
-     *
-     */
-    public static function getLinkForAction(
-        $action = 'show',
-        $id = null,
-        $link_parameters = []
-    )
-    {
-        return URLHelper::getLink(
-            self::buildPathForAction($action, $id),
-            $link_parameters
-        );
-    }
-
-    /**
-     * Returns the appropriate URL for the resource action that shall be
-     * executed on a resource.
-     *
-     * @param string $action The action which shall be executed.
-     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param string $id The ID of the resource on which the specified
-     *     action shall be executed.
-     * @param array $url_parameters Optional parameters for the URL.
-     *
-     * @return string The URL for the resource action.
-     * @throws InvalidArgumentException If $resource_id is empty.
-     *
-     */
-    public static function getURLForAction(
-        $action = 'show',
-        $id = null,
-        $url_parameters = []
-    )
-    {
-        return URLHelper::getURL(
-            self::buildPathForAction($action, $id),
-            $url_parameters
-        );
-    }
-
-    /**
-     * The SORM store method is overloaded to assure that the right level
-     * attribute is stored.
-     */
-    public function store()
-    {
-        //Set the level attribute according to the parent's
-        //level attribute. If no parents are defined
-        //set the level to zero.
-        if ($this->parent_id && $this->parent) {
-            $this->level = $this->parent->level + 1;
-        } else {
-            $this->level = 0;
-        }
-
-        //Store the folder, if it hasn't been stored before:
-
-        $folder = $this->getFolder();
-        if ($folder) {
-            $folder->store();
-        }
-
-        return parent::store();
-    }
-
-    public function delete()
-    {
-        //Delete the folder:
-
-        $folder = $this->getFolder(false);
-        if ($folder) {
-            $folder->delete();
-        }
-
-        return parent::delete();
-    }
-
-    public function cbValidate()
-    {
-        if (!$this->category_id) {
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Die Ressource %s ist keiner Ressourcenkategorie zugeordnet!'),
-                    $this->name
-                )
-            );
-        }
-        return true;
-    }
-
-
-    /**
-     * @see StudipItem::__toString
-     */
-    public function __toString()
-    {
-        return $this->getFullName();
-    }
-
-
-    /**
-     * Retrieves the folder for this resource.
-     *
-     * @param bool $create_if_missing Whether to create a folder (true) or
-     *     not (false) in case no folder exists for this resource.
-     *     Defaults to true.
-     *
-     * @returns ResourceFolder|null Either a ResourceFolder instance or null
-     *     in case no such instance can be retrieved or created.
-     */
-    public function getFolder($create_if_missing = true)
-    {
-        $folder = Folder::findOneByRange_id($this->id);
-
-        if ($folder) {
-            $folder = $folder->getTypedFolder();
-
-            if ($folder instanceof ResourceFolder) {
-                //Only return ResourceFolder instances.
-                return $folder;
-            }
-        } elseif ($create_if_missing) {
-            $folder = $this->createFolder();
-            if ($folder instanceof ResourceFolder) {
-                return $folder;
-            }
-        }
-        //In all other cases return null:
-        return null;
-    }
-
-    public function setFolder(ResourceFolder $folder)
-    {
-        if ($this->isNew()) {
-            $this->store();
-        }
-
-        $folder->range_id   = $this->id;
-        $folder->range_type = 'Resource';
-
-        return $folder->store();
-    }
-
-    public function createFolder()
-    {
-        if ($this->isNew()) {
-            $this->id = $this->getNewId();
-        }
-
-        $folder = Folder::createTopFolder(
-            $this->id,
-            'Resource',
-            'ResourceFolder'
-        );
-
-        if ($folder) {
-            $folder = $folder->getTypedFolder();
-            if ($folder) {
-                $folder->store();
-                return $folder;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns a list of property names that are required
-     * for the resource class.
-     *
-     * @return string[] An array with the property names.
-     */
-    public function getRequiredPropertyNames()
-    {
-        return [];
-    }
-
-
-    /**
-     * This is a simplified version of the createBooking method.
-     * @param User $user
-     * @param DateTime $begin
-     * @param DateTime $end
-     * @param int $preparation_time
-     * @param string $description
-     * @param string $internal_comment
-     * @param int $booking_type
-     * @return ResourceBooking
-     * @see Resource::createBooking
-     */
-    public function createSimpleBooking(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL
-    )
-    {
-        return $this->createBooking(
-            $user,
-            $user->id,
-            [
-                [
-                    'begin' => $begin,
-                    'end'   => $end
-                ]
-            ],
-            null,
-            0,
-            null,
-            $preparation_time,
-            $description,
-            $internal_comment,
-            $booking_type
-        );
-    }
-
-    /**
-     * Creates bookings from a request.
-     * @param User $user
-     * @param ResourceRequest $request The request from which
-     *     a resource booking shall be built.
-     * @param int $preparation_time
-     * @param string $description
-     * @param string $internal_comment
-     * @param int $booking_type
-     * @param bool $prepend_preparation_time . If this is set to true,
-     *     the preparation time will end before the start of the
-     *     requested time. If $prepend_preparation_time is set to false
-     *     (the default) the preparation time starts with the start of the
-     *     requested time.
-     * @param bool $notify_lecturers
-     * @return ResourceBooking[] A list of resource bookings
-     *     matching the request.
-     * @throws ResourceRequestException if the request could not be marked
-     *     as resolved.
-     *
-     * @throws ResourceUnavailableException if the resource cannot be assigned
-     *     in at least one of the time ranges specified by the resource request.
-     */
-    public function createBookingFromRequest(
-        User $user,
-        ResourceRequest $request,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $prepend_preparation_time = false,
-        $notify_lecturers = false
-    )
-    {
-        $course_dates = $request->getAffectedDates();
-
-        $bookings = [];
-        if ($course_dates) {
-            foreach ($course_dates as $course_date) {
-                $booking = $this->createBooking(
-                    $user,
-                    $course_date->id,
-                    [
-                        [
-                            'begin' => (
-                            $prepend_preparation_time
-                                ? $course_date->date - $preparation_time
-                                : $course_date->date
-                            ),
-                            'end'   => $course_date->end_time
-                        ]
-                    ],
-                    null,
-                    0,
-                    $course_date->end_time,
-                    $preparation_time,
-                    $description,
-                    $internal_comment,
-                    $booking_type
-                );
-
-                if ($booking instanceof ResourceBooking) {
-                    $bookings[] = $booking;
-                }
-            }
-        } elseif (count($request->appointments)) {
-            //It is a request for multiple single dates.
-            //Such requests are resolved into multiple bookings.
-            foreach ($request->appointments as $appointment) {
-                $begin = (
-                $prepend_preparation_time
-                    ? $appointment->appointment->date - $preparation_time
-                    : $appointment->appointment->date
-                );
-                $end   = $appointment->appointment->end_time;
-
-                $booking = $this->createBooking(
-                    $user,
-                    $appointment->appointment_id,
-                    [
-                        [
-                            'begin' => $begin,
-                            'end'   => $end
-                        ]
-                    ],
-                    null,
-                    0,
-                    $end,
-                    $preparation_time,
-                    $description,
-                    $internal_comment,
-                    $booking_type
-                );
-
-                if ($booking instanceof ResourceBooking) {
-                    $bookings[] = $booking;
-                }
-            }
-        } else {
-            //No date objects for the request.
-            //It is a simple request:
-            $booking = $this->createBooking(
-                $user,
-                $request->user->id,
-                [
-                    [
-                        'begin' => (
-                        $prepend_preparation_time
-                            ? $request->begin - $preparation_time
-                            : $request->begin
-                        ),
-                        'end'   => $request->end
-                    ]
-                ],
-                null,
-                0,
-                $request->end,
-                $preparation_time,
-                $description,
-                $internal_comment,
-                $booking_type
-            );
-
-            if ($booking instanceof ResourceBooking) {
-                $bookings[] = $booking;
-            }
-        }
-
-        if (!$request->closeRequest($notify_lecturers)) {
-            throw new ResourceRequestException(
-                _('Die Anfrage konnte nicht als bearbeitet markiert werden!')
-            );
-        }
-
-        return $bookings;
-    }
-
-    /**
-     * A factory method for creating a ResourceBooking object
-     * for this resource.
-     *
-     * @param User $user The user who wishes to create a resource booking.
-     * @param string $range_id The ID of the user (or the Stud.IP object)
-     *     which owns the ResourceBooking.
-     * @param array[][] $time_ranges The time ranges for the booking.
-     *     At least one time range has to be specified using unix timestamps
-     *     or DateTime objects.
-     *     This array has the following structure:
-     *     [
-     *         [
-     *             'begin' => The begin timestamp or DateTime object.
-     *             'end' => The end timestamp or DateTime object.
-     *         ]
-     *     ]
-     * @param DateInterval|null $repetition_interval The repetition interval
-     *     for the new booking. This must be a DateInterval object if
-     *     repetitions shall be stored.
-     *     Otherwise this parameter must be set to null.
-     * @param int $repeat_amount The amount of repetitions.
-     *     This parameter is only regarded if $repetition_interval contains
-     *     a DateInterval object.
-     *     In case repetitions are specified by their end date set this
-     *     parameter to 0.
-     * @param DateTime|string|null $repetition_end_date The end date of the
-     *     repetition. This can either be an unix timestamp or a DateTime object
-     *     and will only be regarded if $repetition_interval contains a
-     *     DateInterval object.
-     *     In case repetitions are specified by their amount set this
-     *     parameter to null.
-     * @param int $repetition_amount (obsolete, has no effect)
-     * @param int $preparation_time The preparation time which is needed before
-     *     the real start time. This will be substracted
-     *     from the begin timestamp and stored in an extra column of the
-     *     resource_bookings table.
-     * @param string $description An optional description for the booking.
-     *     This fields was previously known as "user_free_name".
-     * @param string $internal_comment An optional comment for the
-     *     booking which is intended to be used internally
-     *     in the room and resource administration staff.
-     * @param int $booking_type The booking type.
-     *     0 = normal booking
-     *     1 = reservation
-     *     2 = lock booking
-     * @param bool $force_booking If this parameter is set to true,
-     *     overlapping bookings are removed before storing this booking.
-     *
-     * @return ResourceBooking object.
-     * @throws InvalidArgumentException If no time ranges are specified
-     *     or if there is an error regarding the time ranges.
-     * @throws ResourceBookingRangeException If $range_id is not set.
-     * @throws ResourceBookingOverlapException If the booking overlaps
-     *     with another booking or a resource lock.
-     * @throws ResourcePermissionException If the specified user does not
-     *     have sufficient permissions to create a resource booking.
-     * @throws ResourceBookingException If the repetition interval
-     *     is invalid or if the resource booking cannot be stored.
-     *
-     */
-    public function createBooking(
-        User $user,
-        $range_id = null,
-        $time_ranges = [],
-        $repetition_interval = null,
-        $repetition_amount = 0,
-        $repetition_end_date = null,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $force_booking = false
-    )
-    {
-        if (!is_array($time_ranges)) {
-            throw new InvalidArgumentException(
-                _('Es wurden keine Zeitbereiche für die Buchung angegeben!')
-            );
-        }
-
-        $booking_begin = null;
-        $booking_end   = null;
-
-        //Check if each entry of the $time_intervals array is in the right
-        //format and if it contains either timestamps or DateTime objects.
-        //After that the time ranges are checked for validity (begin > end)
-        //and if there are locks or bookings in one of the time ranges.
-        //Furthermore all reservations that are affected by this booking
-        //are collected so that the persons who made the reservations
-        //can be informed about the new booking.
-        $affected_reservations = [];
-        foreach ($time_ranges as $index => $time_range) {
-            $begin = $time_range['begin'];
-            $end   = $time_range['end'];
-
-            if ($begin === null || $end === null) {
-                throw new InvalidArgumentException(
-                    _('Mindestens eines der Zeitintervalls ist im falschen Format!')
-                );
-            }
-
-            if (!($begin instanceof DateTime)) {
-                $b = new DateTime();
-                $b->setTimestamp($begin);
-                $begin = $b;
-            }
-            if (!($end instanceof DateTime)) {
-                $e = new DateTime();
-                $e->setTimestamp($end);
-                $end = $e;
-            }
-
-            $real_begin = clone $begin;
-            if ($preparation_time > 0) {
-                $real_begin = $real_begin->sub(
-                    new DateInterval('PT' . $preparation_time . 'S')
-                );
-            }
-
-            if ($real_begin > $end) {
-                throw new InvalidArgumentException(
-                    _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-                );
-            }
-
-            $duration     = $end->getTimestamp() - $begin->getTimestamp();
-            $min_duration = Config::get()->RESOURCES_MIN_BOOKING_TIME;
-            if ($min_duration && ($duration < ($min_duration * 60))) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        _('Die minimale Buchungsdauer von %1$d Minuten wurde unterschritten!'),
-                        $min_duration
-                    )
-                );
-            }
-
-            if ($index == array_keys($time_ranges)[0]) {
-                $booking_begin = clone $begin;
-                $booking_end   = clone $end;
-            }
-
-            if ($repetition_interval instanceof DateInterval) {
-                //We must calculate the end of the repetition interval
-                //by using $repetition_amount or $repetition_end_date.
-                $repetition_end = null;
-                if ($repetition_end_date instanceof DateTime) {
-                    $repetition_end = $repetition_end_date;
-                } elseif ($repetition_end_date) {
-                    //convert $repetition_end_date to a DateTime object:
-                    $red = new DateTime();
-                    $red->setTimestamp($repetition_end_date);
-                    $repetition_end = $red;
-                } else {
-                    //$repetition_end_date is not set: Use $repetition_amount.
-                    //Add the repetition interval $repetition_amount times
-                    //to the $real_begin DateTime object to get the end date
-                    //of the repetition:
-                    $repetition = clone $real_begin;
-                    for ($i = 0; $i < $repetition_amount; $i++) {
-                        $repetition = $repetition->add($repetition_interval);
-                    }
-                    $repetition_end = $repetition;
-                }
-
-                $current_date = clone $real_begin;
-
-                //Check for each repetition if the resource is available
-                //or locked:
-                while ($current_date <= $repetition_end) {
-                    $current_begin = clone $current_date;
-                    $current_end   = clone $current_date;
-                    $current_end->setTime(
-                        intval($end->format('H')),
-                        intval($end->format('i')),
-                        intval($end->format('s'))
-                    );
-
-                    if ($current_begin < $current_end) {
-                        $affected_reservations = array_merge(
-                            ResourceBooking::findByResourceAndTimeRanges(
-                                $this,
-                                [
-                                    [
-                                        'begin' => $current_begin->getTimestamp(),
-                                        'end'   => $current_end->getTimestamp(),
-                                    ]
-                                ],
-                                [1, 3]
-                            ),
-                            $affected_reservations
-                        );
-                    }
-
-                    $current_date = $current_date->add($repetition_interval);
-                }
-            } else {
-                $affected_reservations = array_merge(
-                    ResourceBooking::findByResourceAndTimeRanges(
-                        $this,
-                        [
-                            [
-                                'begin' => $real_begin->getTimestamp(),
-                                'end'   => $end->getTimestamp(),
-                            ]
-                        ],
-                        [1, 3]
-                    ),
-                    $affected_reservations
-                );
-            }
-        }
-
-        $booking                  = new ResourceBooking();
-        $booking->resource_id     = $this->id;
-        $booking->booking_user_id = $user->id;
-        $booking->range_id        = $range_id;
-        $booking->description     = $description;
-        $booking->begin           = $booking_begin->getTimestamp();
-        $booking->end             = $booking_end->getTimestamp();
-
-        if ($repetition_interval instanceof DateInterval) {
-            if ($repetition_end_date) {
-                if ($repetition_end_date instanceof DateTime) {
-                    $booking->repeat_end = $repetition_end_date->getTimestamp();
-                } else {
-                    $booking->repeat_end = $repetition_end_date;
-                }
-            }
-
-            $booking->repetition_interval = $repetition_interval->format('P%YY%MM%DD');
-        }
-
-        if ($preparation_time) {
-            $booking->preparation_time = $preparation_time;
-        } else {
-            $booking->preparation_time = '0';
-        }
-        $booking->internal_comment = $internal_comment;
-        $booking->booking_type     = (int)$booking_type;
-
-        //We can finally store the new booking.
-
-        try {
-            $booking->store($force_booking);
-        } catch (ResourceBookingOverlapException $e) {
-            if ($begin->format('Ymd') == $end->format('Ymd')) {
-                throw new ResourceBookingException(
-                    sprintf(
-                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte wegen Überlappungen nicht gespeichert werden: %4$s'),
-                        $this->getFullName(),
-                        $begin->format('d.m.Y H:i'),
-                        $end->format('H:i'),
-                        $e->getMessage()
-                    )
-                );
-            } else {
-                throw new ResourceBookingException(
-                    sprintf(
-                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte wegen Überlappungen nicht gespeichert werden: %4$s'),
-                        $this->getFullName(),
-                        $begin->format('d.m.Y H:i'),
-                        $end->format('d.m.Y H:i'),
-                        $e->getMessage()
-                    )
-                );
-            }
-        } catch (Exception $e) {
-            if ($begin->format('Ymd') == $end->format('Ymd')) {
-                throw new ResourceBookingException(
-                    sprintf(
-                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte aus folgendem Grund nicht gespeichert werden: %4$s'),
-                        $this->getFullName(),
-                        $begin->format('d.m.Y H:i'),
-                        $end->format('H:i'),
-                        $e->getMessage()
-                    )
-                );
-            } else {
-                throw new ResourceBookingException(
-                    sprintf(
-                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte aus folgendem Grund nicht gespeichert werden: %4$s'),
-                        $this->getFullName(),
-                        $begin->format('d.m.Y H:i'),
-                        $end->format('d.m.Y H:i'),
-                        $e->getMessage()
-                    )
-                );
-            }
-        }
-
-        return $booking;
-    }
-
-    /**
-     * This method creates a simple request for this resource.
-     * A simple request is not bound to a date, metadate
-     * or course object and its time ranges. Instead the time
-     * range is specified directly.
-     * Note that simple resource requests do not support recurrence.
-     *
-     * @param User $user The user who wishes to create a simple request.
-     * @param DateTime $begin The begin timestamp of the request.
-     * @param DateTime $end The end timestamp of the request.
-     * @param string $comment A comment for the resource request.
-     * @param int $preparation_time The requested preparation time before
-     *     the begin of the requested time range. This parameter must be
-     *     specified in seconds. Only positive values are accepted.
-     *
-     * @return ResourceRequest A resource request object.
-     * @throws AccessDeniedException If the user is not permitted
-     *     to request this resource.
-     * @throws InvalidArgumentException If the the timestamps provided by
-     *     $begin and $end are invalid or if $begin is greater than or equal
-     *     to $end which results in an invalid time range.
-     * @throws ResourceUnavailableException If the resource is not available
-     *     in the selected time range.
-     * @throws ResourceRequestException If the resource request
-     *     cannot be stored.
-     *
-     */
-    public function createSimpleRequest(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $comment = '',
-        $preparation_time = 0
-    )
-    {
-        //All users are permitted to create a request,
-        //if the resource is requestable.
-
-        if (!$this->requestable) {
-            throw new InvalidArgumentException(
-                _('Diese Ressource kann nicht angefragt werden!')
-            );
-        }
-
-        if ($begin > $end) {
-            throw new InvalidArgumentException(
-                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-            );
-        } elseif ($begin == $end) {
-            throw new InvalidArgumentException(
-                _('Startzeitpunkt und Endzeitpunkt sind identisch!')
-            );
-        }
-
-        if (!$this->isAvailable($begin, $end)) {
-            throw new ResourceUnavailableException(
-                sprintf(
-                    _('Die Ressource %1$s ist im Zeitraum von %2$s bis %3$s nicht verfügbar!'),
-                    $this->name,
-                    $begin->format('d.m.Y H:i'),
-                    $end->format('d.m.Y H:i')
-                )
-            );
-        }
-
-        $request              = new ResourceRequest();
-        $request->resource_id = $this->id;
-        $request->category_id = $this->category_id;
-        $request->user_id     = $user->id;
-
-        $request->begin            = $begin->getTimestamp();
-        $request->end              = $end->getTimestamp();
-        $request->preparation_time = (
-        $preparation_time > 0
-            ? $preparation_time
-            : 0
-        );
-
-        $request->closed  = '0';
-        $request->comment = $comment;
-
-        if (!$request->store()) {
-            throw new ResourceRequestException(
-                sprintf(
-                    _('Die Anfrage zur Ressource %s konnte nicht gespeichert werden!'),
-                    $this->name
-                )
-            );
-        }
-
-        return $request;
-    }
-
-
-    /**
-     * This method creates a resource request for this resource.
-     *
-     * @param User $user The user who wishes to create a request.
-     * @param string|array $date_range_ids One or more IDs of Stud.IP objects
-     *     which can provide at least one time range.
-     *     Objects which fulfill this requirement are
-     *     course dates (CourseDate objects),
-     *     cycle dates (SeminarCycleDate objects)
-     *     and courses (Course objects).
-     *     If only one ID is provided it can be passed as string.
-     *     If multiple IDs are provided they have to be passed as array.
-     * @param string $comment A comment for the resource request.
-     * @param mixed[] $properties The wishable properties
-     *     for the resource request. The format of the array is as follows:
-     *     [
-     *         'property name' => 'property state'
-     *     ]
-     * @param int $preparation_time The requested preparation time before
-     *     the begin of the requested time range. This parameter must be
-     *     specified in seconds. Only positive values are accepted.
-     *
-     * @return ResourceRequest A resource request object.
-     * @throws InvalidArgumentException If $date_range_id is not set.
-     *     or no object which can provide at least one time range
-     *     can be found with the specified ID.
-     * @throws ResourceNoTimeRangeException If no time range can be found
-     *     by looking at the object, specified by its ID in $date_range_id.
-     * @throws ResourceUnavailableException If the resource is not available
-     *     in the selected time range.
-     * @throws ResourceRequestException If the resource request
-     *     cannot be stored.
-     *
-     */
-    public function createRequest(
-        User $user,
-        $date_range_ids = null,
-        $comment = '',
-        $properties = [],
-        $preparation_time = 0
-    )
-    {
-        if (!$date_range_ids) {
-            throw new InvalidArgumentException(
-                _('Es wurde keine ID eines Objektes angegeben, welches Zeiträume für eine Ressourcenanfrage liefern kann!')
-            );
-        }
-
-        if (!$this->requestable) {
-            throw new InvalidArgumentException(
-                _('Diese Ressource kann nicht angefragt werden!')
-            );
-        }
-
-        //We must get the date ranges by looking at $date_range_id
-        //and the object which lies behind that ID.
-
-        if (!is_array($date_range_ids)) {
-            $date_range_ids = [$date_range_ids];
-        }
-
-        $time_ranges = [];
-        foreach ($date_range_ids as $date_range_id) {
-            $time_ranges = array_merge(
-                $time_ranges,
-                ResourceManager::getTimeRangesFromRangeId(
-                    $date_range_id
-                )
-            );
-        }
-
-        if (!$time_ranges) {
-            //We couldn't find any time range.
-            throw new ResourceNoTimeRangeException(
-                sprintf(
-                    _('Es konnte kein Zeitbereich für die Anfrage der Ressource %s gefunden werden.'),
-                    $this->name
-                )
-            );
-        }
-
-        //Default resource request handling:
-        //Check if the resource is available in all requested time ranges.
-
-        foreach ($time_ranges as $time_range) {
-            if (!$this->isAvailable($time_range[0], $time_range[1])) {
-                throw new ResourceUnavailableException(
-                    sprintf(
-                        _('Die Ressource %1$s ist im Zeitraum vom %2$s bis %3$s nicht verfügbar!'),
-                        $this->name,
-                        $time_range[0]->format('d.m.Y H:i'),
-                        $time_range[1]->format('d.m.Y H:i')
-                    )
-                );
-            }
-        }
-
-        //We must check, if all the properties exist:
-        if ($properties and is_array($properties)) {
-            foreach ($properties as $property_name => $property_state) {
-                $property_object = ResourcePropertyDefinition::findByName(
-                    $property_name
-                );
-
-                if (!$property_object) {
-                    throw new ResourcePropertyException(
-                        sprintf(
-                            _('Die Ressourceneigenschaft %s ist nicht definiert!'),
-                            $property_name
-                        )
-                    );
-                } elseif (count($property_object) > 1) {
-                    throw new ResourcePropertyException(
-                        sprintf(
-                            _('Es gibt mehrere Ressourceneigenschaften mit dem Namen %s!'),
-                            $property_name
-                        )
-                    );
-                }
-
-                //$property_object is an array of ResourcePropertyDefinition objects:
-                $property_data[] = [
-                    'object' => $property_object[0],
-                    'state'  => $property_state
-                ];
-            }
-        }
-
-        $request                   = new ResourceRequest();
-        $request->resource_id      = $this->id;
-        $request->category_id      = $this->category_id;
-        $request->user_id          = $user->id;
-        $request->comment          = $comment;
-        $request->preparation_time = (
-        $preparation_time > 0
-            ? $preparation_time
-            : 0
-        );
-        $request->closed           = '0';
-
-        //Resolve the date range ID and set the
-        //appropriate field in the request object:
-        if (count($date_range_ids) <= 1) {
-            $course_date = CourseDate::find($date_range_ids[0]);
-            if ($course_date) {
-                $request->termin_id = $course_date->id;
-            } else {
-                $cycle_date = SeminarCycleDate::find($date_range_ids[0]);
-                if ($cycle_date) {
-                    $request->metadate_id = $cycle_date->id;
-                } else {
-                    $course = Course::find($date_range_ids[0]);
-                    if ($course) {
-                        $request->course_id = $course->id;
-                    }
-                }
-            }
-
-            if (!$request->store()) {
-                throw new ResourceRequestException(
-                    sprintf(
-                        _('Die Anfrage zur Ressource %s konnte nicht gespeichert werden!'),
-                        $this->name
-                    )
-                );
-            }
-        } else {
-            if (!$request->store()) {
-                throw new ResourceRequestException(
-                    sprintf(
-                        _('Die Anfrage zur Ressource %s konnte nicht gespeichert werden!'),
-                        $this->name
-                    )
-                );
-            }
-
-            //More than one entry:
-            //We must use ResourceBookingAppointment objects.
-            foreach ($date_range_ids as $date_range_id) {
-                $appointment_id = null;
-                $course_date    = CourseDate::find($date_range_id);
-                if ($course_date) {
-                    $appointment_id = $course_date->id;
-                } else {
-                    $cycle_date = SeminarCycleDate::find($date_range_id);
-                    if ($cycle_date) {
-                        $appointment_id = $cycle_date->id;
-                    } else {
-                        $course = Course::find($date_range_id);
-                        if ($course) {
-                            $appointment_id = $course->id;
-                        }
-                    }
-                }
-
-                if ($appointment_id) {
-                    $rra                 = new ResourceRequestAppointment();
-                    $rra->request_id     = $request->id;
-                    $rra->appointment_id = $appointment_id;
-                    if (!$rra->store()) {
-                        throw new ResourceRequestException(
-                            _('Die Terminzuordnungen zur Anfrage konnten nicht gespeichert werden!')
-                        );
-                    }
-                }
-            }
-        }
-
-        //The request has been created: Now we need to link the properties:
-        if(!empty($property_data)) {
-            foreach ($property_data as $property) {
-                $rrp              = new ResourceRequestProperty();
-                $rrp->request_id  = $request->id;
-                $rrp->property_id = $property['object']->id;
-                $rrp->state       = intval($property['state']);
-                if (!$rrp->store()) {
-                    throw new InvalidResourceRequestException(
-                        sprintf(
-                            _('%1$s: Die Eigenschaft %2$s zur Anfrage konnte nicht gespeichert werden!'),
-                            $this->getFullName(),
-                            $property['object']->name
-                        )
-                    );
-                }
-            }
-        }
-        return $request;
-    }
-
-    /**
-     * Creates a lock booking for this resource.
-     *
-     * @param User $user The user who wishes to create a lock booking.
-     * @param DateTime $begin The begin of the lock time range.
-     * @param DateTime $end The end of the lock time range.
-     * @param string $internal_comment An optional comment for the
-     *     lock booking which is intended to be used internally
-     *     in the room and resource administration staff.
-     *
-     * @return ResourceBooking A ResourceBooking object.
-     * @throws ResourceUnavailableException If a lock booking already
-     *     exists in the specified time range.
-     *
-     * @throws AccessDeniedException If the user does not have sufficient
-     *     permissions to lock this resource.
-     */
-    public function createLock(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $internal_comment = ''
-    )
-    {
-        if (!$this->userHasPermission($user, 'admin', [$begin, $end])) {
-            throw new AccessDeniedException(
-                sprintf(
-                    _('%s: Unzureichende Berechtigungen zum Erstellen einer Sperrbuchung!'),
-                    $this->getFullName()
-                )
-            );
-        }
-
-        if ($this->isLocked($begin, $end)) {
-            throw new ResourceUnavailableException(
-                sprintf(
-                    _('%1$s: Im Zeitbereich von %2$s bis %3$s gibt es bereits Sperrbuchungen!'),
-                    $this->getFullName(),
-                    $begin->format('d.m.Y H:i'),
-                    $end->format('d.m.Y H:i')
-                )
-            );
-        }
-
-        $lock                   = new ResourceBooking();
-        $lock->booking_type     = ResourceBooking::TYPE_LOCK;
-        $lock->range_id         = $user->id;
-        $lock->resource_id      = $this->id;
-        $lock->begin            = $begin->getTimestamp();
-        $lock->end              = $end->getTimestamp();
-        $lock->internal_comment = $internal_comment;
-
-        if (!$lock->store()) {
-            throw new ResourceBookingException(
-                sprintf(
-                    _('%1$s: Fehler beim Speichern der Sperrbuchung für den Zeitbereich von %2$s bis %3$s!'),
-                    $begin->format('d.m.Y H:i'),
-                    $end->format('d.m.Y H:i')
-                )
-            );
-        }
-
-        return $lock;
-    }
-
-    /**
-     * Retrieves the properties grouped by their property groups
-     * and in the order specified in that group.
-     *
-     * @param string[] excluded_properties An array with the names
-     *     of the properties that shall be excluded from the result set.
-     *
-     * @return array An array with the group names as keys and the properties
-     *     in the second array dimension. The structure of the array
-     *     is as follows:
-     *     [
-     *          group1 name => [
-     *              property1,
-     *              property2,
-     *              ...
-     *          ],
-     *          group2 name => [
-     *              ...
-     *          ]
-     *     ]
-     */
-    public function getGroupedProperties($excluded_properties = [])
-    {
-        if (is_array($excluded_properties) && count($excluded_properties)) {
-            $properties = ResourceProperty::findBySql(
-                "INNER JOIN resource_property_definitions rpd
-                USING (property_id)
-                LEFT JOIN resource_property_groups rpg
-                ON rpd.property_group_id = rpg.id
-                WHERE
-                resource_properties.resource_id = :resource_id
-                AND
-                rpd.name NOT IN ( :excluded_properties )
-                ORDER BY
-                rpg.position ASC, rpg.name ASC,
-                rpd.property_group_pos ASC, rpd.name ASC",
-                [
-                    'resource_id'         => $this->id,
-                    'excluded_properties' => $excluded_properties
-                ]
-            );
-        } else {
-            $properties = ResourceProperty::findBySql(
-                "INNER JOIN resource_property_definitions rpd
-                USING (property_id)
-                LEFT JOIN resource_property_groups rpg
-                ON rpd.property_group_id = rpg.id
-                WHERE
-                resource_properties.resource_id = :resource_id
-                ORDER BY
-                rpg.position ASC, rpg.name ASC,
-                rpd.property_group_pos ASC, rpd.name ASC",
-                [
-                    'resource_id' => $this->id
-                ]
-            );
-        }
-
-        if (!$properties) {
-            return [];
-        }
-
-        $property_groups = [];
-        foreach ($properties as $property) {
-            if (!$property->state) {
-                continue;
-            }
-            $group_name = '';
-            if (!empty($property->definition->group->name)) {
-                $group_name = $property->definition->group->name;
-            }
-            if (empty($property_groups[$group_name]) || !is_array($property_groups[$group_name])) {
-                $property_groups[$group_name] = [];
-            }
-            $property_groups[$group_name][] = $property;
-        }
-
-        return $property_groups;
-    }
-
-
-    /**
-     * Determines wheter this resource has a property
-     * with the specified name.
-     *
-     * @param string $name The name of the resource property.
-     *
-     * @return bool True, if this resource has a property with
-     *     the specified name, false otherwise.
-     */
-    public function propertyExists($name = '')
-    {
-        if (!$name) {
-            return false;
-        }
-
-        $db = DBManager::get();
-
-        $exists_stmt = $db->prepare(
-            "SELECT TRUE FROM resource_properties
-            INNER JOIN resource_property_definitions rpd
-            ON resource_properties.property_id = rpd.property_id
-            WHERE resource_properties.resource_id = :resource_id
-                AND rpd.name = :name");
-
-        $exists_stmt->execute(
-            [
-                'resource_id' => $this->id,
-                'name'        => $name
-            ]
-        );
-
-        $exists = $exists_stmt->fetchColumn(0);
-
-        return (bool)$exists;
-    }
-
-    /**
-     * Retrieves a ResourceProperty object for a property of this resource
-     * which has the specified name. If the property has not been set for this
-     * resource, but is defined for this resource's category, a new
-     * ResourceProperty object will be created, stored and returned.
-     *
-     * @param string $name The name of the resource property.
-     *
-     * @return ResourceProperty|null Either a ResourceProperty object for
-     *     the resource property matching the specified name or null,
-     *     if no resource property with the specified name can be found.
-     * @throws InvalidResourceCategoryException If this resource category
-     * doesn't match the category of the resource object.
-     *
-     */
-    public function getPropertyObject(string $name)
-    {
-        if (!$this->propertyExists($name)) {
-            if ($name === 'geo_coordinates') {
-                return null;
-            }
-            //A property with the name $name does not exist for this
-            //resource object. If it is a defined property
-            //we can still try to create it:
-
-            if ($this->category->hasProperty($name)) {
-                $property = $this->category->createDefinedResourceProperty(
-                    $this,
-                    $name
-                );
-
-                $property->store();
-                return $property;
-            } else {
-                return null;
-            }
-        }
-        return ResourceProperty::findOneBySql(
-            "INNER JOIN resource_property_definitions rpd
-                ON resource_properties.property_id = rpd.property_id
-            WHERE resource_properties.resource_id = :resource_id
-                AND rpd.name = :name",
-            [
-                'resource_id' => $this->id,
-                'name'        => $name
-            ]
-        );
-    }
-
-    /**
-     * Returns all info-label properties
-     *
-     * @return SimpleCollection
-     */
-    public function getInfolabelProperties()
-    {
-        return SimpleCollection::createFromArray(
-            ResourceProperty::findBySQL('INNER JOIN `resource_property_definitions` USING (`property_id`)
-                WHERE `info_label` = 1 AND `state` != "" AND `resource_id` = ?', [$this->id]
-            )
-        );
-    }
-
-    /**
-     * Returns the state of the property specified by $name.
-     * If the property has not been set for this resource, but is defined
-     * for this resource's category, a new ResourceProperty object
-     * will be created, stored and its state will be returned.
-     *
-     * @param string $name The name of the resource property.
-     *
-     * @return string|null The state of the specified property or null
-     *     if the propery can't be found.
-     */
-    public function getProperty(string $name)
-    {
-        if (!$this->propertyExists($name)) {
-            //A property with the name $name does not exist for this
-            //resource object. If it is a defined property
-            //we can still try to create it:
-
-            if ($this->category->hasProperty($name)) {
-                $property = $this->category->createDefinedResourceProperty(
-                    $this,
-                    $name,
-                    ''
-                );
-
-                $property->store();
-                return $property->state;
-            } else {
-                return null;
-            }
-        }
-
-        $db = DBManager::get();
-
-        $value_stmt = $db->prepare(
-            "SELECT resource_properties.state FROM resource_properties
-            INNER JOIN resource_property_definitions rpd
-                ON resource_properties.property_id = rpd.property_id
-            WHERE resource_properties.resource_id = :resource_id
-                AND rpd.name = :name");
-
-        $value_stmt->execute(
-            [
-                'resource_id' => $this->id,
-                'name'        => $name
-            ]
-        );
-
-        $value = $value_stmt->fetchColumn(0);
-
-        if (!$value) {
-            return null;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Retrieves an object by the state of a property of this resource,
-     * specified by the property's name.
-     * This method is useful for properties of type user, institute
-     * or fileref. Those properties store IDs of User, Institute
-     * or FileRef objects. Therefore the IDs can be resolved directly
-     * to get the corresponding User, Institute or FileRef object directly.
-     *
-     * @param string $name The name of the resource property.
-     *
-     * @return SimpleORMap|null A SimpleORMap-based object or null,
-     *     if no such object can be retrieved from the property's state.
-     */
-    public function getPropertyRelatedObject(string $name)
-    {
-        //Get the property state first:
-        $property = $this->getPropertyObject($name);
-
-        //Now we return the object which is referenced by the property's state:
-
-        if ($property) {
-            switch ($property->definition->type) {
-                case 'user':
-                    return User::find($property->state);
-                case 'institute':
-                    return Institute::find($property->state);
-                case 'fileref' :
-                    return FileRef::find($property->state);
-                default:
-                    //For all other property types where we cannot create an object
-                    //we return the raw state value:
-                    return $property->state;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets a specified property of this resource to the specified state.
-     * If the property has not been set for this resource, but is defined
-     * for this resource's category, a new ResourceProperty object
-     * will be created, stored and its state will be returned.
-     *
-     * @param string $name The name of the resource property.
-     * @param mixed $state The state of the resource property.
-     * @param User|null $user The user who wishes to set the property.
-     *
-     * @return bool True, if the property state could be set, false otherwise.
-     */
-    public function setProperty(string $name, $state = '', $user = null)
-    {
-        if (!($user instanceof User)) {
-            $user = User::findCurrent();
-            if (!$user) {
-                //We cannot continue without a user object!
-                return false;
-            }
-        }
-
-        //Get the minimum permission level required for modifying the property:
-
-        if (!$this->userHasPermission($user, 'admin')) {
-            throw new AccessDeniedException(
-                sprintf(
-                    _('Unzureichende Berechtigungen zum Ändern der Ressource %s!'),
-                    $this->name
-                )
-            );
-        }
-        if (!$this->category->userHasPropertyWritePermissions($name, $user, $this)) {
-            throw new AccessDeniedException(
-                sprintf(
-                    _('Unzureichende Berechtigungen zum Ändern der Eigenschaft %s!'),
-                    $name
-                )
-            );
-        }
-
-        if (!$this->propertyExists($name)) {
-            //A property with the name $name does not exist for this
-            //resource object. If it is a defined property
-            //we can still try to create it:
-
-            if ($this->category->hasProperty($name)) {
-                $property = $this->category->createDefinedResourceProperty(
-                    $this,
-                    $name,
-                    $state
-                );
-                return $property->store();
-            } else {
-                return false;
-            }
-        }
-
-        $property = $this->getPropertyObject($name);
-
-        if ($property) {
-            $property->state = $state;
-            if ($property->isDirty()) {
-                return $property->store();
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Sets the properties (specified by their names) to the specified values.
-     *
-     * @param array $properties The properties array in the format "key-value".
-     *     The array keys must contain the property name while the
-     *     items of the array contain the values.
-     *     Example:
-     *     ['bar' => 'foo']: Sets the value 'foo' for the property
-     *     with the name 'bar'.
-     *
-     * @param User|null $user The user who wishes to set the properties.
-     *     If this is left empty, the current user will be used.
-     *
-     * @return array If properties cannot be set, their names (as key) and the
-     *     error messages (if any) are returned.
-     *     The array has the following structure:
-     *     [
-     *         (property name) => (error message or empty string)
-     *     ]
-     */
-    public function setPropertiesByName(array $properties, User $user)
-    {
-        $failed_properties = [];
-
-        if (!($user instanceof User)) {
-            $user = User::findCurrent();
-            if (!$user) {
-                //No property can be set.
-                foreach ($properties as $name => $state) {
-                    $failed_properties[$name] = '';
-                }
-                return $failed_properties;
-            }
-        }
-
-        foreach ($properties as $name => $state) {
-            try {
-                $this->setProperty($name, $state, $user);
-            } catch (Exception $e) {
-                $this->failed_properties[$name] = $e->getMessage();
-            }
-        }
-
-        return $failed_properties;
-    }
-
-    /**
-     * Sets the properties (specified by their IDs) to the specified values.
-     *
-     * @param array $properties The properties array in the format "key-value".
-     *     The array keys must contain the property-ID while the
-     *     items of the array contain the values.
-     *     Example:
-     *     ['1' => 'foo']: Sets the value 'foo' for the property
-     *     with the ID '1'.
-     *
-     * @param User|null $user The user who wishes to set the properties.
-     *     If this is left empty, the current user will be used.
-     *
-     * @return array If properties cannot be set, their ids (as key) and the
-     *     error messages (if any) are returned.
-     *     The array has the following structure:
-     *     [
-     *         (property-ID) => (error message or empty string)
-     *     ]
-     */
-    public function setPropertiesById(array $properties, User $user = null)
-    {
-        $failed_properties = [];
-
-        if (!($user instanceof User)) {
-            $user = User::findCurrent();
-            if (!$user) {
-                //No property can be set.
-                foreach ($properties as $id => $state) {
-                    $failed_properties[$id] = '';
-                }
-                return $failed_properties;
-            }
-        }
-
-        foreach ($properties as $id => $state) {
-            $property = ResourcePropertyDefinition::find($id);
-            if (!$property) {
-                //Invalid property:
-                $this->failed_properties[$id] =
-                    _('Die Eigenschaft wurde nicht gefunden!');
-                continue;
-            }
-            try {
-                $this->setProperty($property->name, $state, $user);
-            } catch (Exception $e) {
-                $failed_properties[$id] = $e->getMessage();
-            }
-        }
-
-        return $failed_properties;
-    }
-
-    /**
-     * Determines if the specified user has sufficient permissions to edit
-     * the property specified by its name.
-     *
-     * @param string $name The name of the resource property.
-     * @param user $user The user whose edit permissions shall be checked.
-     *
-     * @return bool True, if the user has edit permissions for the property,
-     *     false otherwise.
-     */
-    public function isPropertyEditable(string $name, User $user)
-    {
-        return $this->category->userHasPropertyWritePermissions($name, $user, $this);
-    }
-
-    /**
-     * Sets the state of a property by its definition_id rather than its name.
-     *
-     * @param string $property_definition_id The definition-ID of the property.
-     * @param string $state The state of the property.
-     *
-     * @return bool True, if the property state can be stored, false otherwise.
-     * @throws ResourcePropertyStateException If the provided state is invalid
-     *     for the specified resource property.
-     *
-     */
-    public function setPropertyByDefinitionId($property_definition_id = null, $state = null)
-    {
-        if (!$property_definition_id and !$state) {
-            return false;
-        }
-
-        //Get property definition:
-        $definition = ResourcePropertyDefinition::find($property_definition_id);
-        if (!$definition) {
-            return false;
-        }
-
-        //Check if the state matches the property definition's rules:
-        $definition->validateState($state);
-
-        //Check if the property for this resource already exists.
-        //If so, update it. Otherwise create it.
-
-        $property = ResourceProperty::findOneBySql(
-            '(property_id = :property_id) AND (resource_id = :resource_id)',
-            [
-                'property_id' => $definition->id,
-                'resource_id' => $this->id
-            ]
-        );
-
-        if (!$property) {
-            $property              = new ResourceProperty();
-            $property->property_id = $definition->id;
-            $property->resource_id = $this->id;
-        }
-
-        $property->state = $state;
-        return $property->store();
-    }
-
-    /**
-     * Sets the property state by specifying an SimpleORMap object.
-     * This method is meant for resource properties of type user,
-     * institute or fileref.
-     *
-     * @param string $name The name of the resource property.
-     * @param SimpleORMap $object The object for the resource property.
-     *
-     * @return bool True, if the property has been saved, false otherwise.
-     */
-    public function setPropertyRelatedObject(string $name, SimpleORMap $object)
-    {
-        //Get the property state first:
-        $property = $this->getPropertyObject($name);
-
-        if (!$property) {
-            return false;
-        }
-
-        //Now we return the object which is referenced by the property's state:
-
-        switch ($property->definition->type) {
-            case 'user':
-                if (!($object instanceof User)) {
-                    throw new ResourcePropertyException(
-                        _("Eine Ressourceneigenschaft vom Typ 'user' benötigt ein Nutzer-Objekt zur Wertzuweisung!")
-                    );
-                }
-            break;
-            case 'institute':
-                if (!($object instanceof Institute)) {
-                    throw new ResourcePropertyException(
-                        _("Eine Ressourceneigenschaft vom Typ 'institute' benötigt ein Institut-Objekt zur Wertzuweisung!")
-                    );
-                }
-            break;
-            case 'fileref':
-                if (!($object instanceof FileRef)) {
-                    throw new ResourcePropertyException(
-                        _("Eine Ressourceneigenschaft vom Typ 'fileref' benötigt ein FileRef-Objekt zur Wertzuweisung!")
-                    );
-                }
-            break;
-            default:
-            break;
-        }
-
-        //When no exception is thrown above we can set the object's ID
-        //as the property's state:
-        $property->state = $object->id;
-
-        return $property->store();
-    }
-
-    /**
-     * Deletes a property for a resource.
-     *
-     * @param string $name The name of the property to be deleted.
-     *
-     * @param User $user The user who wishes to delete the property.
-     * @return number
-     */
-    public function deleteProperty(string $name, User $user)
-    {
-        //Get the user object and the minimum permission level
-        //required for modifying the property:
-
-        if (!$this->userHasPermission($user, 'admin')) {
-            throw new AccessDeniedException(
-                sprintf(
-                    _('Unzureichende Berechtigungen zum Ändern der Ressource %s!'),
-                    $this->name
-                )
-            );
-        }
-        if (!$this->category->userHasPropertyWritePermissions($name, $user)) {
-            throw new AccessDeniedException(
-                sprintf(
-                    _('Unzureichende Berechtigungen zum Löschen der Eigenschaft %s!'),
-                    $name
-                )
-            );
-        }
-
-        return ResourceProperty::deleteBySql(
-            "INNER JOIN resource_property_definitions rpd
-            ON resource_properties.property_id = rpd.property_id
-            WHERE
-            rpd.name = :name AND resource_properties.resource_id = :resource_id",
-            [
-                'name'        => $name,
-                'resource_id' => $this->id
-            ]
-        );
-    }
-
-    /**
-     * Returns the path for the resource's image.
-     * If the resource has no image the path for a general
-     * resource icon will be returned.
-     *
-     * Classes derived from the Resource class should only re-implement
-     * this method if they have an alternative storage method for
-     * resource pictures than the Stud.IP file system.
-     *
-     * @return string The URL to the resource picture.
-     */
-    public function getPictureUrl()
-    {
-        return '';
-    }
-
-    /**
-     * Returns the default picture for the resource class.
-     *
-     * Classes derived from Resource should re-implement this method
-     * if they want to get a different default picture than the resource icon.
-     * The call to getPictureUrl will call the getDefaultPictureUrl method
-     * from the derived class.
-     *
-     * @return string The URL to the picture.
-     */
-    public function getDefaultPictureUrl()
-    {
-        return $this->getIcon()->asImagePath();
-    }
-
-    /**
-     * Returns the Icon for the resource class.
-     *
-     * Classes derived from Resource should re-implement this method
-     * if they want to get a different icon than the resource icon.
-     * @param string $role
-     * @return Icon The icon for the resource.
-     */
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        return Icon::create('resources', $role);
-    }
-
-    /**
-     * Returns all properties in a two-dimensional array with the following
-     * property data inside of the second dimension:
-     * [
-     *     'name' => (the property's name)
-     *     'display_name' => (the display name of the property)
-     *     'type' => (the property's type)
-     *     'state' => (the property's state)
-     *     'requestable' => (if the property is requestable or not (true or false))
-     * ]
-     *
-     * @param bool $only_requestable_properties If only requestable properties
-     *     shall be returned set this to true. If all properties shall be
-     *     returned, set this to false.
-     *
-     * @return array[] A two-dimensional array containing property data.
-     */
-    public function getPropertyArray($only_requestable_properties = false)
-    {
-        $property_array = [];
-
-        if ($this->properties) {
-            foreach ($this->properties as $property) {
-                if ($only_requestable_properties) {
-                    $category_property = ResourceCategoryProperty::findByNameAndCategoryId(
-                        $property->name,
-                        $this->category_id
-                    );
-
-                    if ($category_property) {
-                        if ($category_property->requestable) {
-                            $property_array[] = [
-                                'name'         => $property->name,
-                                'display_name' => $property->display_name,
-                                'type'         => $property->type,
-                                'state'        => $property->state,
-                                'requestable'  => $property->isRequestable()
-                            ];
-                        }
-                    }
-                } else {
-                    $property_array[] = [
-                        'name'         => $property->name,
-                        'display_name' => $property->display_name,
-                        'type'         => $property->type,
-                        'state'        => $property->state,
-                        'requestable'  => $property->isRequestable()
-                    ];
-                }
-            }
-        }
-        return $property_array;
-    }
-
-    /**
-     * Shortcut method for ResourceBooking::countByResourceAndTimeRanges.
-     * Determines whether normal resource bookings exist
-     * in the specified time range.
-     *
-     * @param DateTime $begin Time range start timestamp.
-     *
-     * @param DateTime $end Time range end timestamp.
-     *
-     * @param array $excluded_booking_ids The IDs of bookings that shall
-     *     be excluded from the determination of the "assigned" status.
-     *
-     * @return bool True, if the resource is assigned in the specified
-     *     time range, false otherwise.
-     */
-    public function isAssigned(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return ResourceBooking::countByResourceAndTimeRanges(
-                $this,
-                [
-                    [
-                        'begin' => $begin->getTimestamp(),
-                        'end'   => $end->getTimestamp()
-                    ]
-                ],
-                [0],
-                $excluded_booking_ids
-            ) > 0;
-    }
-
-    /**
-     * Shortcut method for ResourceBooking::countByResourceAndTimeRanges.
-     * Determines whether resource reservations exist
-     * in the specified time range.
-     *
-     * @param DateTime $begin Time range start timestamp.
-     *
-     * @param DateTime $end Time range end timestamp.
-     *
-     * @param array $excluded_reservation_ids The IDs of reservation bookings that shall
-     *     be excluded from the determination of the "reserved" status.
-     *
-     * @return bool True, if the resource is reserved in the specified
-     *     time range, false otherwise.
-     */
-    public function isReserved(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_reservation_ids = []
-    )
-    {
-        //One second is added to the begin timestamp to avoid
-        //getting "false" overlaps where another booking ends on exactly
-        //the begin timestamp.
-        return ResourceBooking::countByResourceAndTimeRanges(
-                $this,
-                [
-                    [
-                        'begin' => $begin->getTimestamp(),
-                        'end'   => $end->getTimestamp()
-                    ]
-                ],
-                [1, 3],
-                $excluded_reservation_ids
-            ) > 0;
-    }
-
-    /**
-     * Shortcut method for ResourceBooking::countByResourceAndTimeRanges.
-     * Determines whether resource locks exist
-     * in the specified time range.
-     *
-     * @param DateTime $begin Time range start timestamp.
-     *
-     * @param DateTime $end Time range end timestamp.
-     *
-     * @param array $excluded_lock_ids The IDs of lock bookings that shall
-     *     be excluded from the determination of the "locked" status.
-     *
-     * @return bool True, if the resource is locked in the specified
-     *     time range, false otherwise.
-     */
-    public function isLocked(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_lock_ids = []
-    )
-    {
-        //One second is added to the begin timestamp to avoid
-        //getting "false" overlaps where another booking ends on exactly
-        //the begin timestamp.
-        return ResourceBooking::countByResourceAndTimeRanges(
-                $this,
-                [
-                    [
-                        'begin' => $begin->getTimestamp(),
-                        'end'   => $end->getTimestamp()
-                    ]
-                ],
-                [2],
-                $excluded_lock_ids
-            ) > 0;
-    }
-
-    /**
-     * Determines, if the resource is available (not assigned or locked)
-     * in a specified time range.
-     *
-     * @param DateTime $begin Time range start timestamp.
-     * @param DateTime $end Time range end timestamp.
-     *
-     * @param array $excluded_booking_ids The IDs of available bookings that shall
-     *     be excluded from the determination of the "available" status.
-     *
-     * @return bool True, if the resource is available in the specified
-     *     time range, false otherwise.
-     */
-    public function isAvailable(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return ResourceBooking::countByResourceAndTimeRanges(
-                $this,
-                [
-                    [
-                        'begin' => $begin->getTimestamp(),
-                        'end'   => $end->getTimestamp()
-                    ]
-                ],
-                [0, 2],
-                $excluded_booking_ids
-            ) == 0;
-    }
-
-    /**
-     * Determines, if the resource is available (not assigned or locked)
-     * in the time ranges specified by a resource request.
-     *
-     * @param ResourceRequest $request A resource request object.
-     *
-     * @return bool True, if the resource is available in the
-     *     time ranges of the resource request, false otherwise.
-     */
-    public function isAvailableForRequest(ResourceRequest $request)
-    {
-        $time_intervals = $request->getTimeIntervals(true);
-        if (!$time_intervals) {
-            //Without a single time interval we cannot check
-            //if the resource is available.
-            return false;
-        }
-        foreach ($time_intervals as $time_interval) {
-            $begin = new DateTime();
-            $end   = new DateTime();
-            $begin->setTimestamp($time_interval['begin']);
-            $end->setTimestamp($time_interval['end']);
-
-            if (!$this->isAvailable($begin, $end)) {
-                //The resource is not available in the time interval.
-                //We can stop here and return false.
-                return false;
-            }
-
-            //If code execution reaches this point the resource is
-            //available in all time intervals of the resource request:
-            return true;
-        }
-    }
-
-    /**
-     * Returns the full (localised) name of the resource.
-     *
-     * @return string The full name of the resource.
-     */
-    public function getFullName()
-    {
-        return sprintf(
-            _('Ressource %s'),
-            $this->name
-        );
-    }
-
-    /**
-     * Sets the permission for one user for this resource.
-     *
-     * @param User $user The user whose permission shall be set.
-     * @param string $perm The permission level for the specified user.
-     *     The levels 'user', 'autor', 'tutor' and 'admin' are allowed.
-     *
-     * @return bool True, if the permission has been stored successfully,
-     *     false otherwise.
-     */
-    public function setUserPermission(User $user, $perm = 'autor')
-    {
-        if (!in_array($perm, ['user', 'autor', 'tutor', 'admin'])) {
-            return false;
-        }
-
-        $perm_object = ResourcePermission::findOneBySql(
-            '(user_id = :user_id) AND (resource_id = :resource_id)',
-            [
-                'user_id'     => $user->id,
-                'resource_id' => $this->id
-            ]
-        );
-
-        if (!$perm_object) {
-            $perm_object              = new ResourcePermission();
-            $perm_object->user_id     = $user->id;
-            $perm_object->resource_id = $this->id;
-        }
-
-        $perm_object->perms = $perm;
-        $stored = (bool)$perm_object->store();
-        if ($stored) {
-            if (!isset(self::$permission_cache[$this->id])) {
-                self::$permission_cache[$this->id] = [];
-            }
-            //Update the permission cache.
-            self::$permission_cache[$this->id][$user->id] = $perm;
-        }
-        return $stored;
-    }
-
-    /**
-     * Deletes the permission a specified user has on this resource.
-     *
-     * @param User $user The user whose permission shall be deleted.
-     *
-     * @return bool True
-     */
-    public function deleteUserPermission(User $user)
-    {
-        $deleted = ResourcePermission::deleteBySql(
-            '(user_id = :user_id) AND (resource_id = :resource_id)',
-            [
-                'user_id'     => $user->id,
-                'resource_id' => $this->id
-            ]
-        );
-
-        if ($deleted && is_array(self::$permission_cache[$this->id])) {
-            //Update the permission cache.
-            self::$permission_cache[$this->id][$user->id] = null;
-        }
-
-        return true;
-    }
-
-    /**
-     * Deletes all permissions of all users for this resource.
-     *
-     * @return bool True
-     */
-    public function deleteAllPermissions()
-    {
-        ResourcePermission::deleteBySql(
-            'resource_id = :resource_id',
-            [
-                'resource_id' => $this->id
-            ]
-        );
-
-        //Update the permission cache:
-        self::$permission_cache[$this->id] = [];
-
-        return true;
-    }
-
-    /**
-     * Retrieves the permission level a specified user
-     * has on this resource.
-     *
-     * Setting the optional $time_range parameter will also enable checks for
-     * temporary global permissions.
-     *
-     * @param User $user The user whose permission shall be retrieved.
-     *
-     * @param array $time_range (DateTime) This is an optional parameter that can
-     *     be used to pass two DateTime objects to this method. The first object
-     *     will be treated as the begin timestamp and the second one as the
-     *     end timestamp.
-     *
-     * @param bool $permanent_only Whether to retrieve only permanent permissions
-     *     (true) or permanent and temporary permissions (false).
-     *     Defaults to false.
-     *
-     * @return string The permission level, expressed as string.
-     *     The level can be 'user', 'autor', 'tutor' or 'admin'.
-     */
-    public function getUserPermission(User $user, $time_range = [], $permanent_only = false)
-    {
-        if (ResourceManager::getGlobalResourcePermission($user) === 'admin') {
-            return 'admin';
-        }
-
-
-        $perm_string = '';
-        $temp_perm   = null;
-
-        $begin = time();
-        $end   = $begin;
-        //Check for a temporary permission first:
-        //check only against current timestamp
-        if (!$permanent_only) {
-            $temp_perm = ResourceTemporaryPermission::findOneBySql(
-                '(resource_id = :resource_id) AND (user_id = :user_id)
-                AND (begin <= :begin) AND (end >= :end)',
-                [
-                    'resource_id' => $this->id,
-                    'user_id'     => $user->id,
-                    'begin'       => $begin,
-                    'end'         => $end
-                ]
-            );
-        }
-
-        if ($temp_perm) {
-            $perm_string = $temp_perm->perms;
-        } else {
-            //No temporary permission exist or has been retrieved.
-            //Check for a "normal" permission.
-            $cached_perms = self::$permission_cache[$this->id][$user->id] ?? null;
-            if ($cached_perms === null) {
-                //The permission of the specified user is not in the
-                //permission cache. Load it from the database and store
-                //it in the permission cache before returning it.
-                $perms = ResourcePermission::findOneBySql(
-                    '(resource_id = :resource_id) AND (user_id = :user_id)',
-                    [
-                        'resource_id' => $this->id,
-                        'user_id'     => $user->id
-                    ]
-                );
-                if ($perms) {
-                    if (!isset(self::$permission_cache[$this->id])) {
-                        self::$permission_cache[$this->id] = [];
-                    }
-                    self::$permission_cache[$this->id][$user->id] = $perms->perms;
-                    $perm_string                                  = $perms->perms;
-                }
-            } else {
-                $perm_string = $cached_perms;
-            }
-        }
-
-        if (!$perm_string) {
-            //A user which doesn't have special permissions for this resource
-            //can have global resource permissions:
-            $global_perm = ResourceManager::getGlobalResourcePermission($user);
-            if ($global_perm) {
-                //Set the permission cache:
-                if (!isset(self::$permission_cache[$this->id])) {
-                    self::$permission_cache[$this->id] = [];
-                }
-                self::$permission_cache[$this->id][$user->id] = $global_perm;
-            }
-            $perm_string = $global_perm;
-        }
-        //Now we must check for global resource locks:
-        if ($perm_string && $time_range && $this->lockable) {
-
-            if ($time_range[0] instanceof DateTime) {
-                $begin = $time_range[0]->getTimestamp();
-            } else {
-                $begin = $time_range[0];
-            }
-            if ($time_range[1] instanceof DateTime) {
-                $end = $time_range[1]->getTimestamp();
-            } else {
-                $end = $time_range[1];
-            }
-            if (GlobalResourceLock::isLocked($begin, $end)) {
-                //A permission level exists for the user.
-                //The user gets "user" permissions in case
-                //a global lock is active.
-                $perm_string = 'user';
-            }
-        }
-
-        //No global resource lock exists. We must return
-        //the permission string if it is set:
-        if ($perm_string) {
-            return $perm_string;
-        }
-
-        return '';
-    }
-
-    /**
-     * Determines if a user has the specified permission.
-     *
-     * @param ?User $user The user whose permissions shall be checked on this
-     *     resource object. May be null.
-     * @param string $permission The permission level.
-     * @param $time_range @TODO
-     *
-     * @return bool True, if the specified user has the specified permission,
-     *     false otherwise.
-     */
-    public function userHasPermission(
-        ?User $user,
-        string $permission = 'user',
-        array $time_range = []
-    )
-    {
-        if (!in_array($permission, ['user', 'autor', 'tutor', 'admin']) || $user === null) {
-            return false;
-        }
-
-
-        if (ResourceManager::getGlobalResourcePermission($user) === 'admin') {
-            return true;
-        }
-
-        $perm_level = $this->getUserPermission($user, $time_range);
-
-        if ($permission === 'user') {
-            //No check for global resource locks here:
-            //If only user permissions are requested we can safely grant them
-            //since 'user' users may only perform reading actions but
-            //no writing actions.
-            if (in_array($perm_level, ['user', 'autor', 'tutor', 'admin'])) {
-                return true;
-            } else {
-                return false;
-            }
-        } elseif ($permission === 'autor') {
-            if (in_array($perm_level, ['autor', 'tutor', 'admin'])) {
-                return true;
-            } else {
-                return false;
-            }
-        } elseif ($permission === 'tutor') {
-            if (in_array($perm_level, ['tutor', 'admin'])) {
-                return true;
-            } else {
-                return false;
-            }
-        } elseif ($permission === 'admin') {
-            if ($perm_level == 'admin') {
-                return true;
-            } else {
-                return false;
-            }
-        }
-        //Code execution should be finished at this point.
-        //If this point is reached the user has no permissions for the
-        //resource management system at all.
-        return false;
-    }
-
-    /**
-     * Determines whether the user may create a child resource
-     * on this resource.
-     *
-     * @param User $user The user whose permission to create a child
-     *     resource shall be checked.
-     *
-     * @return bool True, if the user may create a child resource
-     *     on this resource, false otherwise.
-     */
-    public function userMayCreateChild(User $user)
-    {
-        return $this->userHasPermission($user, 'admin');
-    }
-
-    /**
-     * Checks if the specified user has sufficient permissions to make resource
-     * requests, according to the setting RESOURCES_MIN_REQUEST_PERMISSION.
-     * This permission check is only relevant for creating requests that are not
-     * bound to a course.
-     *
-     * @param User $user The user whose request permissions shall be checked.
-     *
-     * @return bool True, if the user has request permissions, false otherwise.
-     */
-    public function userHasRequestRights(User $user)
-    {
-        if (!Config::get()->RESOURCES_ALLOW_ROOM_REQUESTS) {
-            return false;
-        }
-        $min_perm = Config::get()->RESOURCES_MIN_REQUEST_PERMISSION;
-        if (!in_array($min_perm, ['', 'user', 'autor', 'tutor', 'admin'])) {
-            //Invalid permission level!
-            return false;
-        }
-        if (!$min_perm) {
-            //No minimum permission set: Every logged-in user
-            //can create requests.
-            return true;
-        }
-        return $this->userHasPermission($user, $min_perm);
-    }
-
-    /**
-     * Determines whether the user may book the resource or not.
-     * An optional time range can be set to check  the user's
-     * temporary permissions on another date than the current date.
-     *
-     * @param User $user The user whose booking permissions shall be checked.
-     *
-     * @param int|string|DateTime $begin The begin timestamp of the
-     *     optional time range.
-     *
-     * @param int|string|DateTime $end The end timestamp of the
-     *     optional time range.
-     *
-     * @return bool True, if the user may book the resource, false otherwise.
-     */
-    public function userHasBookingRights(
-        User $user,
-        $begin = null,
-        $end = null
-    )
-    {
-        if ($begin && $end) {
-            $time_range = [$begin, $end];
-        } else {
-            $time_range = [];
-        }
-
-        //Check the permissions on this resource and the global permissions:
-        return $this->userHasPermission($user, 'autor', $time_range);
-    }
-
-    /**
-     * Determines if the booking plan of the resource is visible for a
-     * specified user.
-     *
-     * @param ?User $user The user whose permission to view the booking plan
-     *     shall be determined. May be null.
-     *
-     * @param DateTime[] $time_range An optional time range for the
-     *     permission check.
-     * @return bool True, if the user can see the resource booking plan,
-     *     false otherwise.
-     * @see Resource::getUserPermission
-     *
-     */
-    public function bookingPlanVisibleForUser(?User $user, $time_range = [])
-    {
-        return $this->userHasPermission($user, 'user', $time_range);
-    }
-
-    /**
-     * Retrieves a parent resource object that matches the specified
-     * class name. The search stops when either a parent resource
-     * with the class name is found or when the root resource object
-     * is reached.
-     *
-     * @param string $class_name The class name of the parent.
-     *
-     * @return Resource|null Either a resource object or null
-     *     in case a matching parent resource cannot be found.
-     */
-    public function findParentByClassName($class_name = 'Resource')
-    {
-        $resource_ids = [$this->id];
-        $resource     = $this->parent;
-
-        while ($resource) {
-            //We should check for circular hierarchies first
-            //to avoid an endless while loop:
-            if (in_array($resource->id, $resource_ids)) {
-                //We have a circular hierarchy: this resource is
-                //the parent of itself which is an invalid state!
-                throw new InvalidResourceException(
-                    sprintf(
-                        _('Zirkuläre Hierarchie: Die Ressource %1$s ist ein Elternknoten von sich selbst!'),
-                        $resource->name
-                    )
-                );
-            }
-            if (is_a($resource->class_name, $class_name, true)) {
-                //We have found a parent node which has the
-                //specified class name: return that parent.
-                return $resource;
-            }
-            //The current parent was not the one we were looking for.
-            //Therefore we must go one layer up in the resource
-            //hierarchy and continue search:
-            $resource_ids[] = $resource->id;
-            $resource       = $resource->parent;
-        }
-        //The search was not successful:
-        //We have reached the root resource (whose parent_id field
-        //is set to an equivalend of NULL) and we haven't found a
-        //resource matching the specified class name.
-        return null;
-    }
-
-    /**
-     * This method searches the hierarchy below this resource
-     * to find resources matching the specified class name.
-     * Via the optional parameter $depth the search can be limited
-     * to a specific amount of layers.
-     *
-     * @param string $class_name The name of the resource class
-     *     where resources shall be found to.
-     * @param int $depth The (optional) maximum depth below this resource
-     *     which shall be searched.
-     * @param bool $convert_objects True, if objects shall be converted to
-     *     $class_name (default), false otherwise.
-     * @param bool $order_by_name Order the children by name.
-     *     Defaults to true.
-     *
-     * @return Resource[] An array of resource objects or an empty array
-     *     if no matching resources can be found.
-     */
-    public function findChildrenByClassName(
-        $class_name = 'Resource',
-        $depth = 0,
-        $convert_objects = true,
-        $order_by_name = true
-    )
-    {
-        $result = [];
-        if ($this->children) {
-            //this resource has children: iterate over them and
-            //check if they match the search criteria.
-            foreach ($this->children as $child) {
-                if (is_a($child->class_name, $class_name, true)) {
-                    if ($convert_objects) {
-                        $result[] = $child->getDerivedClassInstance();
-                    } else {
-                        $result[] = $child;
-                    }
-                }
-                if (($depth > 1) || ($depth == 0)) {
-                    //Search the child and lower depth by one when calling this
-                    //method on the child.
-                    $result = array_merge(
-                        $result,
-                        $child->findChildrenByClassName(
-                            $class_name,
-                            (($depth > 1) ? $depth - 1 : 0),
-                            $convert_objects
-                        )
-                    );
-                }
-            }
-            if ($order_by_name) {
-                usort(
-                    $result,
-                    function ($a, $b) {
-                        if ($a->name == $b->name) {
-                            return 0;
-                        } elseif ($a->name < $b->name) {
-                            return -1;
-                        } else {
-                            return 1;
-                        }
-                    }
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Adds a resource as child resource to this resource.
-     *
-     * @param Resource $resource The child resource.
-     *
-     * @return bool True on success, false on failure.
-     */
-    public function addChild(Resource $resource)
-    {
-        $old_parent    = $resource->parent;
-        $old_parent_id = $resource->parent_id;
-
-        $resource->parent    = $this;
-        $resource->parent_id = $this->id;
-
-        if (!$resource->checkHierarchy()) {
-            //We must revert the parent fields since $resource
-            //may be used in other code pieces afterwards.
-            $resource->parent    = $old_parent;
-            $resource->parent_id = $old_parent_id;
-            throw new InvalidArgumentException(
-                sprintf(
-                    _('Die Ressource %1$s (Typ %2$s) kann nicht unterhalb der Ressource %3$s (Typ %4$s) platziert werden!'),
-                    $resource->name,
-                    $resource->class_name,
-                    $this->name,
-                    $this->class_name
-                )
-            );
-        }
-        if ($resource->isDirty()) {
-            //Only store the resource object if setting the parent_id field
-            //did change it:
-            return $resource->store();
-        }
-        //The resource object hasn't changed by setting the parent_id field:
-        //We can return true.
-        return true;
-    }
-
-    /**
-     * Get all resource requests for the resource in a given timeframe.
-     *
-     * @param DateTime $begin Begin of timeframe.
-     * @param DateTime $end End of timeframe.
-     *
-     * @return ResourceRequest[] An array of ResourceRequest objects.
-     */
-    public function getOpenResourceRequests(DateTime $begin, DateTime $end)
-    {
-        //We must get all requests that either have a start and end date
-        //set or that have a start date, repeate end, repeat interval and
-        //repeat quantity set.
-
-        return ResourceRequest::findByResourceAndTimeRanges(
-            $this,
-            [
-                [
-                    'begin' => $begin->getTimestamp(),
-                    'end'   => $end->getTimestamp()
-                ]
-            ],
-            0
-        );
-    }
-
-    /**
-     * Get all resource bookings for the resource in a given timeframe.
-     *
-     * @param DateTime $begin Begin of timeframe.
-     * @param DateTime $end End of timeframe.
-     * @param array $booking_types
-     *
-     * @return ResourceBooking[] An array of ResourceBooking objects.
-     */
-    public function getResourceBookings(DateTime $begin, DateTime $end, array $booking_types = [0])
-    {
-        return ResourceBooking::findByResourceAndTimeRanges(
-            $this,
-            [
-                [
-                    'begin' => $begin->getTimestamp(),
-                    'end' => $end->getTimestamp()
-                ]
-            ],
-            $booking_types
-        );
-    }
-
-
-    /**
-     * Get all resource locks for the resource in a given timeframe.
-     *
-     * @param DateTime $begin Begin of timeframe.
-     * @param DateTime $end End of timeframe.
-     *
-     * @return ResourceBooking[] An array of ResourceBooking objects.
-     */
-    public function getResourceLocks(DateTime $begin, DateTime $end)
-    {
-        return ResourceBooking::findByResourceAndTimeRanges(
-            $this,
-            [
-                [
-                    $begin->getTimestamp(),
-                    $end->getTimestamp()
-                ]
-            ],
-            [2]
-        );
-    }
-
-
-    /**
-     * Determines if files are attached to this resource.
-     * If a folder exists for this resource its files are counted.
-     * Depending on whether the folder has files in it or not
-     * this method returns true or false.
-     *
-     * @return bool True, if there are files attached to this resource,
-     *     false otherwise.
-     */
-    public function hasFiles()
-    {
-        $folder = Folder::findOneBySql(
-            'range_id = :range_id',
-            [
-                'range_id' => $this->id
-            ]
-        );
-
-        if (!$folder) {
-            return false;
-        }
-
-        //Since files from resources shall always be stored in the
-        //Stud.IP file system we can skip the conversion from Folder
-        //to FolderType and count the FileRef-objects for this resource
-        //directly in the database. Since resource folders do not
-        //have subfolders we will count any file of the resource:
-        return FileRef::countBySql(
-                'folder_id = :folder_id',
-                [
-                    'folder_id' => $folder->id
-                ]
-            ) > 0;
-    }
-
-    /**
-     * Converts a Resource object to an object of a specialised resource class.
-     *
-     * @return Resource|other An object of a specialised resource class
-     *     or a Resource object, if the resource is a standard resource
-     *     with the class_name 'Resource' in its resource category.
-     *     If the derived resource class is not available, an instance of
-     *     BrokenResource is returned.
-     */
-    public function getDerivedClassInstance()
-    {
-        $class_name = $this->class_name;
-
-        if ($class_name == 'Resource') {
-            //It is a standard resource which is managed by this class.
-            return $this;
-        }
-
-        if (is_subclass_of($class_name, 'Resource')) {
-            $converted_resource = $class_name::buildExisting(
-                $this->toRawArray()
-            );
-            return $converted_resource;
-        } else {
-            //$class_name does not contain the name of a subclass
-            //of Resource. That's an error!
-            $broken_resource = BrokenResource::buildExisting(
-                $this->toRawArray()
-            );
-            return $broken_resource;
-        }
-    }
-
-    /**
-     * Checks if the place in the resource hierarchy (resource tree)
-     * is correct for this resource.
-     * This method has no function in this class but can be filled
-     * with logic in one of the classes derived from Resource.
-     *
-     * @return bool True, if this resource is correctly placed,
-     *     false otherwise.
-     * @throws NoResourceClassException
-     *     if the class name of this resource is not a derived class
-     *     of the Resource class.
-     *
-     */
-    public function checkHierarchy()
-    {
-        if ($this->class_name == 'Resource') {
-            //Objects of the Resource class are always in the right
-            //place of the resource hierarchy.
-            return true;
-        }
-
-        //The object does not use the Resource class name and uses
-        //a derived class instead. We must check the hierarchy
-        //using the checkHierarchy method of the derived class.
-
-        $converted_resource = $this->getDerivedClassInstance();
-        return $converted_resource->checkHierarchy();
-    }
-
-    /**
-     * Returns the link for an action for this resource.
-     * This is the non-static variant of Resource::getLinkForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param array $link_parameters Optional parameters for the link.
-     * @return string @TODO
-     */
-    public function getActionLink($action = 'show', $link_parameters = [])
-    {
-        //We must check the class name and call the appropriate
-        //getLinkForAction method for derived classes:
-
-        $class_name = $this->class_name;
-        if (is_subclass_of($class_name, 'Resource')) {
-            return $class_name::getLinkForAction(
-                $action,
-                $this->id,
-                $link_parameters
-            );
-        } else {
-            return self::getLinkForAction(
-                $action,
-                $this->id,
-                $link_parameters
-            );
-        }
-    }
-
-    /**
-     * Returns the URL for an action for this resource.
-     * This is the non-static variant of Resource::getURLForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param array $url_parameters Optional parameters for the URL.
-     * @return string @TODO
-     */
-    public function getActionURL($action = 'show', $url_parameters = [])
-    {
-        //We must check the class name and call the appropriate
-        //getURLForAction method for derived classes:
-
-        $class_name = $this->class_name;
-        if (is_subclass_of($class_name, 'Resource')) {
-            return $class_name::getURLForAction(
-                $action,
-                $this->id,
-                $url_parameters
-            );
-        } else {
-            return self::getURLForAction(
-                $action,
-                $this->id,
-                $url_parameters
-            );
-        }
-    }
-
-    public function getItemName($long_format = true)
-    {
-        if ($long_format) {
-            //In some cases the general Resource class may be used
-            //when the resource objects are in fact instances
-            //of derived classes. To make sure that the correct prefix
-            //is always displayed, we retrieve the derived class first
-            //before returning the name:
-            $derived_class = $this->getDerivedClassInstance();
-            return $derived_class->getFullName();
-        } else {
-            return $this->name;
-        }
-    }
-
-    public function getItemURL()
-    {
-        return $this->getActionURL('show');
-    }
-
-    public function getItemAvatarURL()
-    {
-        return Icon::create('resources', Icon::ROLE_INFO)->asImagePath();
-    }
-
-
-    public function getLink() : StudipLink
-    {
-        return new StudipLink($this->getActionURL(), $this->name, Icon::create('resources'));
-    }
-}
diff --git a/lib/models/resources/Resource.php b/lib/models/resources/Resource.php
new file mode 100644
index 0000000..92d8107
--- /dev/null
+++ b/lib/models/resources/Resource.php
@@ -0,0 +1,2965 @@
+<?php
+
+/**
+ * Resource.class.php - model class for a resource
+ *
+ * The Resource class is the base class of the new
+ * Room and Resource management system in Stud.IP.
+ * It provides core functionality for handling general resources
+ * and can be derived for handling special resources.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property string $id database column
+ * @property string $parent_id database column
+ * @property string $category_id database column
+ * @property int|null $level database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property int $requestable database column
+ * @property int $lockable database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $sort_position database column
+ * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
+ * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
+ * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
+ * @property SimpleORMapCollection|Resource[] $children has_many Resource
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property Resource $parent belongs_to Resource
+ * @property mixed $class_name additional field
+ */
+class Resource extends SimpleORMap implements StudipItem
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resources';
+
+        $config['belongs_to']['category'] = [
+            'class_name'  => ResourceCategory::class,
+            'foreign_key' => 'category_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['has_many']['properties'] = [
+            'class_name'        => ResourceProperty::class,
+            'assoc_foreign_key' => 'resource_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store'
+        ];
+
+        $config['has_many']['permissions'] = [
+            'class_name'        => ResourcePermission::class,
+            'assoc_foreign_key' => 'resource_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store'
+        ];
+
+        $config['has_many']['requests'] = [
+            'class_name'        => ResourceRequest::class,
+            'assoc_foreign_key' => 'resource_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store'
+        ];
+
+        $config['has_many']['bookings'] = [
+            'class_name'        => ResourceBooking::class,
+            'assoc_foreign_key' => 'resource_id',
+            'on_delete'         => 'delete',
+            'on_store'          => 'store'
+        ];
+
+        $config['has_many']['children'] = [
+            'class_name' => Resource::class,
+            'assoc_func' => 'findChildren',
+            'on_delete'  => 'delete',
+            'on_store'   => 'store'
+        ];
+
+        $config['belongs_to']['parent'] = [
+            'class_name'  => Resource::class,
+            'foreign_key' => 'parent_id'
+        ];
+
+        $config['i18n_fields']['description'] = true;
+
+        $config['additional_fields']['class_name']        = ['category', 'class_name'];
+        $config['registered_callbacks']['before_store'][] = 'cbValidate';
+
+        parent::configure($config);
+    }
+
+    /**
+     * This is a cache for permissions that users have on resources.
+     * It is meant to reduce the database requests in cases where the
+     * same permission is queried a lot of times.
+     */
+    protected static $permission_cache;
+
+    /**
+     * Returns the children of a resource.
+     * The children are converted to an instance of the derived class,
+     * if they are not instances of the default Resource class.
+     */
+    public static function findChildren($resource_id)
+    {
+        $children = self::findBySql(
+            'parent_id = :parent_id ORDER BY name ASC',
+            ['parent_id' => $resource_id]
+        );
+
+        if (!$children) {
+            return [];
+        }
+
+        foreach ($children as &$child) {
+            $child = $child->getDerivedClassInstance();
+        }
+        return $children;
+    }
+
+    /**
+     * Returns a translation of the resource class name.
+     * The translated name can be singular or plural, depending
+     * on the value of the parameter $item_count.
+     *
+     * @param int $item_count The amount of items the translation shall be
+     *     made for. This is only used to determine, if a singular or a
+     *     plural form shall be returned.
+     *
+     * @return string The translated form of the class name, either in
+     *     singular or plural.
+     *
+     */
+    public static function getTranslatedClassName($item_count = 1)
+    {
+        return ngettext(
+            'Ressource',
+            'Ressourcen',
+            $item_count
+        );
+    }
+
+    /**
+     * Retrieves all resources which don't have a parent resource assigned.
+     * Such resources are called root resources since they are roots of
+     * a resource hierarchy (or a resource tree).
+     *
+     * @return Resource[] An array of Resource objects
+     *     which are root resources.
+     */
+    public static function getRootResources()
+    {
+        return self::findBySql("parent_id = '' ORDER BY name");
+    }
+
+    /**
+     * A method for overloaded classes so that they can define properties
+     * that are required for that resource class.
+     *
+     * @return string[] An array with the names of the required properties.
+     *     Example: The properties with the names "foo", "bar" and "baz"
+     *     are required properties. The array would have the following content:
+     *     [
+     *         'foo',
+     *         'bar',
+     *         'baz'
+     *     ]
+     */
+    public static function getRequiredProperties()
+    {
+        return [];
+    }
+
+
+    /**
+     * Returns the part of the URL for getLink and getURL which will be
+     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
+     * in these methods.
+     *
+     * @param string $action The action for the resource.
+     * @param string $id The ID of the resource.
+     *
+     * @return string The URL path for the specified action.
+     * @throws InvalidArgumentException If $resource_id is empty.
+     *
+     */
+    protected static function buildPathForAction($action = 'show', $id = null)
+    {
+        $actions_without_id = ['add'];
+        if (!$id && !in_array($action, $actions_without_id)) {
+            throw new InvalidArgumentException(
+                _('Zur Erstellung der URL fehlt eine Ressourcen-ID!')
+            );
+        }
+
+        switch ($action) {
+            case 'show':
+                return 'dispatch.php/resources/resource/index/' . $id;
+            case 'add':
+                return 'dispatch.php/resources/resource/add';
+            case 'edit':
+                return 'dispatch.php/resources/resource/edit/' . $id;
+            case 'files':
+                return 'dispatch.php/resources/resource/files/' . $id . '/';
+            case 'permissions':
+                return 'dispatch.php/resources/resource/permissions/' . $id;
+            case 'temporary_permissions':
+                return 'dispatch.php/resources/resource/temporary_permissions/' . $id;
+            case 'booking_plan':
+                return 'dispatch.php/resources/room_planning/booking_plan/' . $id;
+            case 'request_plan':
+                return 'dispatch.php/resources/room_planning/request_plan/' . $id;
+            case 'semester_plan':
+                return 'dispatch.php/resources/room_planning/semester_plan/' . $id;
+            case 'assign-undecided':
+                return 'dispatch.php/resources/booking/add/' . $id;
+            case 'assign':
+                return 'dispatch.php/resources/booking/add/' . $id . '/0';
+            case 'reserve':
+                return 'dispatch.php/resources/booking/add/' . $id . '/1';
+            case 'lock':
+                return 'dispatch.php/resources/booking/add/' . $id . '/2';
+            case 'delete_bookings':
+                return 'dispatch.php/resources/resource/delete_bookings/' . $id;
+            case 'export_bookings':
+                return 'dispatch.php/resources/export/resource_bookings/' . $id;
+            case 'delete':
+                return 'dispatch.php/resources/resource/delete/' . $id;
+            default:
+                return 'dispatch.php/resources/resource/show/' . $id;
+        }
+    }
+
+    /**
+     * Returns the appropriate link for the resource action that shall be
+     * executed on a resource.
+     *
+     * @param string $action The action which shall be executed.
+     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param string $id The ID of the resource on which the specified
+     *     action shall be executed.
+     * @param array $link_parameters Optional parameters for the link.
+     *
+     * @return string The Link for the resource action.
+     * @throws InvalidArgumentException If $resource_id is empty.
+     *
+     */
+    public static function getLinkForAction(
+        $action = 'show',
+        $id = null,
+        $link_parameters = []
+    )
+    {
+        return URLHelper::getLink(
+            self::buildPathForAction($action, $id),
+            $link_parameters
+        );
+    }
+
+    /**
+     * Returns the appropriate URL for the resource action that shall be
+     * executed on a resource.
+     *
+     * @param string $action The action which shall be executed.
+     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param string $id The ID of the resource on which the specified
+     *     action shall be executed.
+     * @param array $url_parameters Optional parameters for the URL.
+     *
+     * @return string The URL for the resource action.
+     * @throws InvalidArgumentException If $resource_id is empty.
+     *
+     */
+    public static function getURLForAction(
+        $action = 'show',
+        $id = null,
+        $url_parameters = []
+    )
+    {
+        return URLHelper::getURL(
+            self::buildPathForAction($action, $id),
+            $url_parameters
+        );
+    }
+
+    /**
+     * The SORM store method is overloaded to assure that the right level
+     * attribute is stored.
+     */
+    public function store()
+    {
+        //Set the level attribute according to the parent's
+        //level attribute. If no parents are defined
+        //set the level to zero.
+        if ($this->parent_id && $this->parent) {
+            $this->level = $this->parent->level + 1;
+        } else {
+            $this->level = 0;
+        }
+
+        //Store the folder, if it hasn't been stored before:
+
+        $folder = $this->getFolder();
+        if ($folder) {
+            $folder->store();
+        }
+
+        return parent::store();
+    }
+
+    public function delete()
+    {
+        //Delete the folder:
+
+        $folder = $this->getFolder(false);
+        if ($folder) {
+            $folder->delete();
+        }
+
+        return parent::delete();
+    }
+
+    public function cbValidate()
+    {
+        if (!$this->category_id) {
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Die Ressource %s ist keiner Ressourcenkategorie zugeordnet!'),
+                    $this->name
+                )
+            );
+        }
+        return true;
+    }
+
+
+    /**
+     * @see StudipItem::__toString
+     */
+    public function __toString()
+    {
+        return $this->getFullName();
+    }
+
+
+    /**
+     * Retrieves the folder for this resource.
+     *
+     * @param bool $create_if_missing Whether to create a folder (true) or
+     *     not (false) in case no folder exists for this resource.
+     *     Defaults to true.
+     *
+     * @returns ResourceFolder|null Either a ResourceFolder instance or null
+     *     in case no such instance can be retrieved or created.
+     */
+    public function getFolder($create_if_missing = true)
+    {
+        $folder = Folder::findOneByRange_id($this->id);
+
+        if ($folder) {
+            $folder = $folder->getTypedFolder();
+
+            if ($folder instanceof ResourceFolder) {
+                //Only return ResourceFolder instances.
+                return $folder;
+            }
+        } elseif ($create_if_missing) {
+            $folder = $this->createFolder();
+            if ($folder instanceof ResourceFolder) {
+                return $folder;
+            }
+        }
+        //In all other cases return null:
+        return null;
+    }
+
+    public function setFolder(ResourceFolder $folder)
+    {
+        if ($this->isNew()) {
+            $this->store();
+        }
+
+        $folder->range_id   = $this->id;
+        $folder->range_type = 'Resource';
+
+        return $folder->store();
+    }
+
+    public function createFolder()
+    {
+        if ($this->isNew()) {
+            $this->id = $this->getNewId();
+        }
+
+        $folder = Folder::createTopFolder(
+            $this->id,
+            'Resource',
+            'ResourceFolder'
+        );
+
+        if ($folder) {
+            $folder = $folder->getTypedFolder();
+            if ($folder) {
+                $folder->store();
+                return $folder;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a list of property names that are required
+     * for the resource class.
+     *
+     * @return string[] An array with the property names.
+     */
+    public function getRequiredPropertyNames()
+    {
+        return [];
+    }
+
+
+    /**
+     * This is a simplified version of the createBooking method.
+     * @param User $user
+     * @param DateTime $begin
+     * @param DateTime $end
+     * @param int $preparation_time
+     * @param string $description
+     * @param string $internal_comment
+     * @param int $booking_type
+     * @return ResourceBooking
+     * @see Resource::createBooking
+     */
+    public function createSimpleBooking(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL
+    )
+    {
+        return $this->createBooking(
+            $user,
+            $user->id,
+            [
+                [
+                    'begin' => $begin,
+                    'end'   => $end
+                ]
+            ],
+            null,
+            0,
+            null,
+            $preparation_time,
+            $description,
+            $internal_comment,
+            $booking_type
+        );
+    }
+
+    /**
+     * Creates bookings from a request.
+     * @param User $user
+     * @param ResourceRequest $request The request from which
+     *     a resource booking shall be built.
+     * @param int $preparation_time
+     * @param string $description
+     * @param string $internal_comment
+     * @param int $booking_type
+     * @param bool $prepend_preparation_time . If this is set to true,
+     *     the preparation time will end before the start of the
+     *     requested time. If $prepend_preparation_time is set to false
+     *     (the default) the preparation time starts with the start of the
+     *     requested time.
+     * @param bool $notify_lecturers
+     * @return ResourceBooking[] A list of resource bookings
+     *     matching the request.
+     * @throws ResourceRequestException if the request could not be marked
+     *     as resolved.
+     *
+     * @throws ResourceUnavailableException if the resource cannot be assigned
+     *     in at least one of the time ranges specified by the resource request.
+     */
+    public function createBookingFromRequest(
+        User $user,
+        ResourceRequest $request,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $prepend_preparation_time = false,
+        $notify_lecturers = false
+    )
+    {
+        $course_dates = $request->getAffectedDates();
+
+        $bookings = [];
+        if ($course_dates) {
+            foreach ($course_dates as $course_date) {
+                $booking = $this->createBooking(
+                    $user,
+                    $course_date->id,
+                    [
+                        [
+                            'begin' => (
+                            $prepend_preparation_time
+                                ? $course_date->date - $preparation_time
+                                : $course_date->date
+                            ),
+                            'end'   => $course_date->end_time
+                        ]
+                    ],
+                    null,
+                    0,
+                    $course_date->end_time,
+                    $preparation_time,
+                    $description,
+                    $internal_comment,
+                    $booking_type
+                );
+
+                if ($booking instanceof ResourceBooking) {
+                    $bookings[] = $booking;
+                }
+            }
+        } elseif (count($request->appointments)) {
+            //It is a request for multiple single dates.
+            //Such requests are resolved into multiple bookings.
+            foreach ($request->appointments as $appointment) {
+                $begin = (
+                $prepend_preparation_time
+                    ? $appointment->appointment->date - $preparation_time
+                    : $appointment->appointment->date
+                );
+                $end   = $appointment->appointment->end_time;
+
+                $booking = $this->createBooking(
+                    $user,
+                    $appointment->appointment_id,
+                    [
+                        [
+                            'begin' => $begin,
+                            'end'   => $end
+                        ]
+                    ],
+                    null,
+                    0,
+                    $end,
+                    $preparation_time,
+                    $description,
+                    $internal_comment,
+                    $booking_type
+                );
+
+                if ($booking instanceof ResourceBooking) {
+                    $bookings[] = $booking;
+                }
+            }
+        } else {
+            //No date objects for the request.
+            //It is a simple request:
+            $booking = $this->createBooking(
+                $user,
+                $request->user->id,
+                [
+                    [
+                        'begin' => (
+                        $prepend_preparation_time
+                            ? $request->begin - $preparation_time
+                            : $request->begin
+                        ),
+                        'end'   => $request->end
+                    ]
+                ],
+                null,
+                0,
+                $request->end,
+                $preparation_time,
+                $description,
+                $internal_comment,
+                $booking_type
+            );
+
+            if ($booking instanceof ResourceBooking) {
+                $bookings[] = $booking;
+            }
+        }
+
+        if (!$request->closeRequest($notify_lecturers)) {
+            throw new ResourceRequestException(
+                _('Die Anfrage konnte nicht als bearbeitet markiert werden!')
+            );
+        }
+
+        return $bookings;
+    }
+
+    /**
+     * A factory method for creating a ResourceBooking object
+     * for this resource.
+     *
+     * @param User $user The user who wishes to create a resource booking.
+     * @param string $range_id The ID of the user (or the Stud.IP object)
+     *     which owns the ResourceBooking.
+     * @param array[][] $time_ranges The time ranges for the booking.
+     *     At least one time range has to be specified using unix timestamps
+     *     or DateTime objects.
+     *     This array has the following structure:
+     *     [
+     *         [
+     *             'begin' => The begin timestamp or DateTime object.
+     *             'end' => The end timestamp or DateTime object.
+     *         ]
+     *     ]
+     * @param DateInterval|null $repetition_interval The repetition interval
+     *     for the new booking. This must be a DateInterval object if
+     *     repetitions shall be stored.
+     *     Otherwise this parameter must be set to null.
+     * @param int $repeat_amount The amount of repetitions.
+     *     This parameter is only regarded if $repetition_interval contains
+     *     a DateInterval object.
+     *     In case repetitions are specified by their end date set this
+     *     parameter to 0.
+     * @param DateTime|string|null $repetition_end_date The end date of the
+     *     repetition. This can either be an unix timestamp or a DateTime object
+     *     and will only be regarded if $repetition_interval contains a
+     *     DateInterval object.
+     *     In case repetitions are specified by their amount set this
+     *     parameter to null.
+     * @param int $repetition_amount (obsolete, has no effect)
+     * @param int $preparation_time The preparation time which is needed before
+     *     the real start time. This will be substracted
+     *     from the begin timestamp and stored in an extra column of the
+     *     resource_bookings table.
+     * @param string $description An optional description for the booking.
+     *     This fields was previously known as "user_free_name".
+     * @param string $internal_comment An optional comment for the
+     *     booking which is intended to be used internally
+     *     in the room and resource administration staff.
+     * @param int $booking_type The booking type.
+     *     0 = normal booking
+     *     1 = reservation
+     *     2 = lock booking
+     * @param bool $force_booking If this parameter is set to true,
+     *     overlapping bookings are removed before storing this booking.
+     *
+     * @return ResourceBooking object.
+     * @throws InvalidArgumentException If no time ranges are specified
+     *     or if there is an error regarding the time ranges.
+     * @throws ResourceBookingRangeException If $range_id is not set.
+     * @throws ResourceBookingOverlapException If the booking overlaps
+     *     with another booking or a resource lock.
+     * @throws ResourcePermissionException If the specified user does not
+     *     have sufficient permissions to create a resource booking.
+     * @throws ResourceBookingException If the repetition interval
+     *     is invalid or if the resource booking cannot be stored.
+     *
+     */
+    public function createBooking(
+        User $user,
+        $range_id = null,
+        $time_ranges = [],
+        $repetition_interval = null,
+        $repetition_amount = 0,
+        $repetition_end_date = null,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $force_booking = false
+    )
+    {
+        if (!is_array($time_ranges)) {
+            throw new InvalidArgumentException(
+                _('Es wurden keine Zeitbereiche für die Buchung angegeben!')
+            );
+        }
+
+        $booking_begin = null;
+        $booking_end   = null;
+
+        //Check if each entry of the $time_intervals array is in the right
+        //format and if it contains either timestamps or DateTime objects.
+        //After that the time ranges are checked for validity (begin > end)
+        //and if there are locks or bookings in one of the time ranges.
+        //Furthermore all reservations that are affected by this booking
+        //are collected so that the persons who made the reservations
+        //can be informed about the new booking.
+        $affected_reservations = [];
+        foreach ($time_ranges as $index => $time_range) {
+            $begin = $time_range['begin'];
+            $end   = $time_range['end'];
+
+            if ($begin === null || $end === null) {
+                throw new InvalidArgumentException(
+                    _('Mindestens eines der Zeitintervalls ist im falschen Format!')
+                );
+            }
+
+            if (!($begin instanceof DateTime)) {
+                $b = new DateTime();
+                $b->setTimestamp($begin);
+                $begin = $b;
+            }
+            if (!($end instanceof DateTime)) {
+                $e = new DateTime();
+                $e->setTimestamp($end);
+                $end = $e;
+            }
+
+            $real_begin = clone $begin;
+            if ($preparation_time > 0) {
+                $real_begin = $real_begin->sub(
+                    new DateInterval('PT' . $preparation_time . 'S')
+                );
+            }
+
+            if ($real_begin > $end) {
+                throw new InvalidArgumentException(
+                    _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+                );
+            }
+
+            $duration     = $end->getTimestamp() - $begin->getTimestamp();
+            $min_duration = Config::get()->RESOURCES_MIN_BOOKING_TIME;
+            if ($min_duration && ($duration < ($min_duration * 60))) {
+                throw new InvalidArgumentException(
+                    sprintf(
+                        _('Die minimale Buchungsdauer von %1$d Minuten wurde unterschritten!'),
+                        $min_duration
+                    )
+                );
+            }
+
+            if ($index == array_keys($time_ranges)[0]) {
+                $booking_begin = clone $begin;
+                $booking_end   = clone $end;
+            }
+
+            if ($repetition_interval instanceof DateInterval) {
+                //We must calculate the end of the repetition interval
+                //by using $repetition_amount or $repetition_end_date.
+                $repetition_end = null;
+                if ($repetition_end_date instanceof DateTime) {
+                    $repetition_end = $repetition_end_date;
+                } elseif ($repetition_end_date) {
+                    //convert $repetition_end_date to a DateTime object:
+                    $red = new DateTime();
+                    $red->setTimestamp($repetition_end_date);
+                    $repetition_end = $red;
+                } else {
+                    //$repetition_end_date is not set: Use $repetition_amount.
+                    //Add the repetition interval $repetition_amount times
+                    //to the $real_begin DateTime object to get the end date
+                    //of the repetition:
+                    $repetition = clone $real_begin;
+                    for ($i = 0; $i < $repetition_amount; $i++) {
+                        $repetition = $repetition->add($repetition_interval);
+                    }
+                    $repetition_end = $repetition;
+                }
+
+                $current_date = clone $real_begin;
+
+                //Check for each repetition if the resource is available
+                //or locked:
+                while ($current_date <= $repetition_end) {
+                    $current_begin = clone $current_date;
+                    $current_end   = clone $current_date;
+                    $current_end->setTime(
+                        intval($end->format('H')),
+                        intval($end->format('i')),
+                        intval($end->format('s'))
+                    );
+
+                    if ($current_begin < $current_end) {
+                        $affected_reservations = array_merge(
+                            ResourceBooking::findByResourceAndTimeRanges(
+                                $this,
+                                [
+                                    [
+                                        'begin' => $current_begin->getTimestamp(),
+                                        'end'   => $current_end->getTimestamp(),
+                                    ]
+                                ],
+                                [1, 3]
+                            ),
+                            $affected_reservations
+                        );
+                    }
+
+                    $current_date = $current_date->add($repetition_interval);
+                }
+            } else {
+                $affected_reservations = array_merge(
+                    ResourceBooking::findByResourceAndTimeRanges(
+                        $this,
+                        [
+                            [
+                                'begin' => $real_begin->getTimestamp(),
+                                'end'   => $end->getTimestamp(),
+                            ]
+                        ],
+                        [1, 3]
+                    ),
+                    $affected_reservations
+                );
+            }
+        }
+
+        $booking                  = new ResourceBooking();
+        $booking->resource_id     = $this->id;
+        $booking->booking_user_id = $user->id;
+        $booking->range_id        = $range_id;
+        $booking->description     = $description;
+        $booking->begin           = $booking_begin->getTimestamp();
+        $booking->end             = $booking_end->getTimestamp();
+
+        if ($repetition_interval instanceof DateInterval) {
+            if ($repetition_end_date) {
+                if ($repetition_end_date instanceof DateTime) {
+                    $booking->repeat_end = $repetition_end_date->getTimestamp();
+                } else {
+                    $booking->repeat_end = $repetition_end_date;
+                }
+            }
+
+            $booking->repetition_interval = $repetition_interval->format('P%YY%MM%DD');
+        }
+
+        if ($preparation_time) {
+            $booking->preparation_time = $preparation_time;
+        } else {
+            $booking->preparation_time = '0';
+        }
+        $booking->internal_comment = $internal_comment;
+        $booking->booking_type     = (int)$booking_type;
+
+        //We can finally store the new booking.
+
+        try {
+            $booking->store($force_booking);
+        } catch (ResourceBookingOverlapException $e) {
+            if ($begin->format('Ymd') == $end->format('Ymd')) {
+                throw new ResourceBookingException(
+                    sprintf(
+                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte wegen Überlappungen nicht gespeichert werden: %4$s'),
+                        $this->getFullName(),
+                        $begin->format('d.m.Y H:i'),
+                        $end->format('H:i'),
+                        $e->getMessage()
+                    )
+                );
+            } else {
+                throw new ResourceBookingException(
+                    sprintf(
+                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte wegen Überlappungen nicht gespeichert werden: %4$s'),
+                        $this->getFullName(),
+                        $begin->format('d.m.Y H:i'),
+                        $end->format('d.m.Y H:i'),
+                        $e->getMessage()
+                    )
+                );
+            }
+        } catch (Exception $e) {
+            if ($begin->format('Ymd') == $end->format('Ymd')) {
+                throw new ResourceBookingException(
+                    sprintf(
+                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte aus folgendem Grund nicht gespeichert werden: %4$s'),
+                        $this->getFullName(),
+                        $begin->format('d.m.Y H:i'),
+                        $end->format('H:i'),
+                        $e->getMessage()
+                    )
+                );
+            } else {
+                throw new ResourceBookingException(
+                    sprintf(
+                        _('%1$s: Die Buchung vom %2$s bis %3$s konnte aus folgendem Grund nicht gespeichert werden: %4$s'),
+                        $this->getFullName(),
+                        $begin->format('d.m.Y H:i'),
+                        $end->format('d.m.Y H:i'),
+                        $e->getMessage()
+                    )
+                );
+            }
+        }
+
+        return $booking;
+    }
+
+    /**
+     * This method creates a simple request for this resource.
+     * A simple request is not bound to a date, metadate
+     * or course object and its time ranges. Instead the time
+     * range is specified directly.
+     * Note that simple resource requests do not support recurrence.
+     *
+     * @param User $user The user who wishes to create a simple request.
+     * @param DateTime $begin The begin timestamp of the request.
+     * @param DateTime $end The end timestamp of the request.
+     * @param string $comment A comment for the resource request.
+     * @param int $preparation_time The requested preparation time before
+     *     the begin of the requested time range. This parameter must be
+     *     specified in seconds. Only positive values are accepted.
+     *
+     * @return ResourceRequest A resource request object.
+     * @throws AccessDeniedException If the user is not permitted
+     *     to request this resource.
+     * @throws InvalidArgumentException If the the timestamps provided by
+     *     $begin and $end are invalid or if $begin is greater than or equal
+     *     to $end which results in an invalid time range.
+     * @throws ResourceUnavailableException If the resource is not available
+     *     in the selected time range.
+     * @throws ResourceRequestException If the resource request
+     *     cannot be stored.
+     *
+     */
+    public function createSimpleRequest(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $comment = '',
+        $preparation_time = 0
+    )
+    {
+        //All users are permitted to create a request,
+        //if the resource is requestable.
+
+        if (!$this->requestable) {
+            throw new InvalidArgumentException(
+                _('Diese Ressource kann nicht angefragt werden!')
+            );
+        }
+
+        if ($begin > $end) {
+            throw new InvalidArgumentException(
+                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+            );
+        } elseif ($begin == $end) {
+            throw new InvalidArgumentException(
+                _('Startzeitpunkt und Endzeitpunkt sind identisch!')
+            );
+        }
+
+        if (!$this->isAvailable($begin, $end)) {
+            throw new ResourceUnavailableException(
+                sprintf(
+                    _('Die Ressource %1$s ist im Zeitraum von %2$s bis %3$s nicht verfügbar!'),
+                    $this->name,
+                    $begin->format('d.m.Y H:i'),
+                    $end->format('d.m.Y H:i')
+                )
+            );
+        }
+
+        $request              = new ResourceRequest();
+        $request->resource_id = $this->id;
+        $request->category_id = $this->category_id;
+        $request->user_id     = $user->id;
+
+        $request->begin            = $begin->getTimestamp();
+        $request->end              = $end->getTimestamp();
+        $request->preparation_time = (
+        $preparation_time > 0
+            ? $preparation_time
+            : 0
+        );
+
+        $request->closed  = '0';
+        $request->comment = $comment;
+
+        if (!$request->store()) {
+            throw new ResourceRequestException(
+                sprintf(
+                    _('Die Anfrage zur Ressource %s konnte nicht gespeichert werden!'),
+                    $this->name
+                )
+            );
+        }
+
+        return $request;
+    }
+
+
+    /**
+     * This method creates a resource request for this resource.
+     *
+     * @param User $user The user who wishes to create a request.
+     * @param string|array $date_range_ids One or more IDs of Stud.IP objects
+     *     which can provide at least one time range.
+     *     Objects which fulfill this requirement are
+     *     course dates (CourseDate objects),
+     *     cycle dates (SeminarCycleDate objects)
+     *     and courses (Course objects).
+     *     If only one ID is provided it can be passed as string.
+     *     If multiple IDs are provided they have to be passed as array.
+     * @param string $comment A comment for the resource request.
+     * @param mixed[] $properties The wishable properties
+     *     for the resource request. The format of the array is as follows:
+     *     [
+     *         'property name' => 'property state'
+     *     ]
+     * @param int $preparation_time The requested preparation time before
+     *     the begin of the requested time range. This parameter must be
+     *     specified in seconds. Only positive values are accepted.
+     *
+     * @return ResourceRequest A resource request object.
+     * @throws InvalidArgumentException If $date_range_id is not set.
+     *     or no object which can provide at least one time range
+     *     can be found with the specified ID.
+     * @throws ResourceNoTimeRangeException If no time range can be found
+     *     by looking at the object, specified by its ID in $date_range_id.
+     * @throws ResourceUnavailableException If the resource is not available
+     *     in the selected time range.
+     * @throws ResourceRequestException If the resource request
+     *     cannot be stored.
+     *
+     */
+    public function createRequest(
+        User $user,
+        $date_range_ids = null,
+        $comment = '',
+        $properties = [],
+        $preparation_time = 0
+    )
+    {
+        if (!$date_range_ids) {
+            throw new InvalidArgumentException(
+                _('Es wurde keine ID eines Objektes angegeben, welches Zeiträume für eine Ressourcenanfrage liefern kann!')
+            );
+        }
+
+        if (!$this->requestable) {
+            throw new InvalidArgumentException(
+                _('Diese Ressource kann nicht angefragt werden!')
+            );
+        }
+
+        //We must get the date ranges by looking at $date_range_id
+        //and the object which lies behind that ID.
+
+        if (!is_array($date_range_ids)) {
+            $date_range_ids = [$date_range_ids];
+        }
+
+        $time_ranges = [];
+        foreach ($date_range_ids as $date_range_id) {
+            $time_ranges = array_merge(
+                $time_ranges,
+                ResourceManager::getTimeRangesFromRangeId(
+                    $date_range_id
+                )
+            );
+        }
+
+        if (!$time_ranges) {
+            //We couldn't find any time range.
+            throw new ResourceNoTimeRangeException(
+                sprintf(
+                    _('Es konnte kein Zeitbereich für die Anfrage der Ressource %s gefunden werden.'),
+                    $this->name
+                )
+            );
+        }
+
+        //Default resource request handling:
+        //Check if the resource is available in all requested time ranges.
+
+        foreach ($time_ranges as $time_range) {
+            if (!$this->isAvailable($time_range[0], $time_range[1])) {
+                throw new ResourceUnavailableException(
+                    sprintf(
+                        _('Die Ressource %1$s ist im Zeitraum vom %2$s bis %3$s nicht verfügbar!'),
+                        $this->name,
+                        $time_range[0]->format('d.m.Y H:i'),
+                        $time_range[1]->format('d.m.Y H:i')
+                    )
+                );
+            }
+        }
+
+        //We must check, if all the properties exist:
+        if ($properties and is_array($properties)) {
+            foreach ($properties as $property_name => $property_state) {
+                $property_object = ResourcePropertyDefinition::findByName(
+                    $property_name
+                );
+
+                if (!$property_object) {
+                    throw new ResourcePropertyException(
+                        sprintf(
+                            _('Die Ressourceneigenschaft %s ist nicht definiert!'),
+                            $property_name
+                        )
+                    );
+                } elseif (count($property_object) > 1) {
+                    throw new ResourcePropertyException(
+                        sprintf(
+                            _('Es gibt mehrere Ressourceneigenschaften mit dem Namen %s!'),
+                            $property_name
+                        )
+                    );
+                }
+
+                //$property_object is an array of ResourcePropertyDefinition objects:
+                $property_data[] = [
+                    'object' => $property_object[0],
+                    'state'  => $property_state
+                ];
+            }
+        }
+
+        $request                   = new ResourceRequest();
+        $request->resource_id      = $this->id;
+        $request->category_id      = $this->category_id;
+        $request->user_id          = $user->id;
+        $request->comment          = $comment;
+        $request->preparation_time = (
+        $preparation_time > 0
+            ? $preparation_time
+            : 0
+        );
+        $request->closed           = '0';
+
+        //Resolve the date range ID and set the
+        //appropriate field in the request object:
+        if (count($date_range_ids) <= 1) {
+            $course_date = CourseDate::find($date_range_ids[0]);
+            if ($course_date) {
+                $request->termin_id = $course_date->id;
+            } else {
+                $cycle_date = SeminarCycleDate::find($date_range_ids[0]);
+                if ($cycle_date) {
+                    $request->metadate_id = $cycle_date->id;
+                } else {
+                    $course = Course::find($date_range_ids[0]);
+                    if ($course) {
+                        $request->course_id = $course->id;
+                    }
+                }
+            }
+
+            if (!$request->store()) {
+                throw new ResourceRequestException(
+                    sprintf(
+                        _('Die Anfrage zur Ressource %s konnte nicht gespeichert werden!'),
+                        $this->name
+                    )
+                );
+            }
+        } else {
+            if (!$request->store()) {
+                throw new ResourceRequestException(
+                    sprintf(
+                        _('Die Anfrage zur Ressource %s konnte nicht gespeichert werden!'),
+                        $this->name
+                    )
+                );
+            }
+
+            //More than one entry:
+            //We must use ResourceBookingAppointment objects.
+            foreach ($date_range_ids as $date_range_id) {
+                $appointment_id = null;
+                $course_date    = CourseDate::find($date_range_id);
+                if ($course_date) {
+                    $appointment_id = $course_date->id;
+                } else {
+                    $cycle_date = SeminarCycleDate::find($date_range_id);
+                    if ($cycle_date) {
+                        $appointment_id = $cycle_date->id;
+                    } else {
+                        $course = Course::find($date_range_id);
+                        if ($course) {
+                            $appointment_id = $course->id;
+                        }
+                    }
+                }
+
+                if ($appointment_id) {
+                    $rra                 = new ResourceRequestAppointment();
+                    $rra->request_id     = $request->id;
+                    $rra->appointment_id = $appointment_id;
+                    if (!$rra->store()) {
+                        throw new ResourceRequestException(
+                            _('Die Terminzuordnungen zur Anfrage konnten nicht gespeichert werden!')
+                        );
+                    }
+                }
+            }
+        }
+
+        //The request has been created: Now we need to link the properties:
+        if(!empty($property_data)) {
+            foreach ($property_data as $property) {
+                $rrp              = new ResourceRequestProperty();
+                $rrp->request_id  = $request->id;
+                $rrp->property_id = $property['object']->id;
+                $rrp->state       = intval($property['state']);
+                if (!$rrp->store()) {
+                    throw new InvalidResourceRequestException(
+                        sprintf(
+                            _('%1$s: Die Eigenschaft %2$s zur Anfrage konnte nicht gespeichert werden!'),
+                            $this->getFullName(),
+                            $property['object']->name
+                        )
+                    );
+                }
+            }
+        }
+        return $request;
+    }
+
+    /**
+     * Creates a lock booking for this resource.
+     *
+     * @param User $user The user who wishes to create a lock booking.
+     * @param DateTime $begin The begin of the lock time range.
+     * @param DateTime $end The end of the lock time range.
+     * @param string $internal_comment An optional comment for the
+     *     lock booking which is intended to be used internally
+     *     in the room and resource administration staff.
+     *
+     * @return ResourceBooking A ResourceBooking object.
+     * @throws ResourceUnavailableException If a lock booking already
+     *     exists in the specified time range.
+     *
+     * @throws AccessDeniedException If the user does not have sufficient
+     *     permissions to lock this resource.
+     */
+    public function createLock(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $internal_comment = ''
+    )
+    {
+        if (!$this->userHasPermission($user, 'admin', [$begin, $end])) {
+            throw new AccessDeniedException(
+                sprintf(
+                    _('%s: Unzureichende Berechtigungen zum Erstellen einer Sperrbuchung!'),
+                    $this->getFullName()
+                )
+            );
+        }
+
+        if ($this->isLocked($begin, $end)) {
+            throw new ResourceUnavailableException(
+                sprintf(
+                    _('%1$s: Im Zeitbereich von %2$s bis %3$s gibt es bereits Sperrbuchungen!'),
+                    $this->getFullName(),
+                    $begin->format('d.m.Y H:i'),
+                    $end->format('d.m.Y H:i')
+                )
+            );
+        }
+
+        $lock                   = new ResourceBooking();
+        $lock->booking_type     = ResourceBooking::TYPE_LOCK;
+        $lock->range_id         = $user->id;
+        $lock->resource_id      = $this->id;
+        $lock->begin            = $begin->getTimestamp();
+        $lock->end              = $end->getTimestamp();
+        $lock->internal_comment = $internal_comment;
+
+        if (!$lock->store()) {
+            throw new ResourceBookingException(
+                sprintf(
+                    _('%1$s: Fehler beim Speichern der Sperrbuchung für den Zeitbereich von %2$s bis %3$s!'),
+                    $begin->format('d.m.Y H:i'),
+                    $end->format('d.m.Y H:i')
+                )
+            );
+        }
+
+        return $lock;
+    }
+
+    /**
+     * Retrieves the properties grouped by their property groups
+     * and in the order specified in that group.
+     *
+     * @param string[] excluded_properties An array with the names
+     *     of the properties that shall be excluded from the result set.
+     *
+     * @return array An array with the group names as keys and the properties
+     *     in the second array dimension. The structure of the array
+     *     is as follows:
+     *     [
+     *          group1 name => [
+     *              property1,
+     *              property2,
+     *              ...
+     *          ],
+     *          group2 name => [
+     *              ...
+     *          ]
+     *     ]
+     */
+    public function getGroupedProperties($excluded_properties = [])
+    {
+        if (is_array($excluded_properties) && count($excluded_properties)) {
+            $properties = ResourceProperty::findBySql(
+                "INNER JOIN resource_property_definitions rpd
+                USING (property_id)
+                LEFT JOIN resource_property_groups rpg
+                ON rpd.property_group_id = rpg.id
+                WHERE
+                resource_properties.resource_id = :resource_id
+                AND
+                rpd.name NOT IN ( :excluded_properties )
+                ORDER BY
+                rpg.position ASC, rpg.name ASC,
+                rpd.property_group_pos ASC, rpd.name ASC",
+                [
+                    'resource_id'         => $this->id,
+                    'excluded_properties' => $excluded_properties
+                ]
+            );
+        } else {
+            $properties = ResourceProperty::findBySql(
+                "INNER JOIN resource_property_definitions rpd
+                USING (property_id)
+                LEFT JOIN resource_property_groups rpg
+                ON rpd.property_group_id = rpg.id
+                WHERE
+                resource_properties.resource_id = :resource_id
+                ORDER BY
+                rpg.position ASC, rpg.name ASC,
+                rpd.property_group_pos ASC, rpd.name ASC",
+                [
+                    'resource_id' => $this->id
+                ]
+            );
+        }
+
+        if (!$properties) {
+            return [];
+        }
+
+        $property_groups = [];
+        foreach ($properties as $property) {
+            if (!$property->state) {
+                continue;
+            }
+            $group_name = '';
+            if (!empty($property->definition->group->name)) {
+                $group_name = $property->definition->group->name;
+            }
+            if (empty($property_groups[$group_name]) || !is_array($property_groups[$group_name])) {
+                $property_groups[$group_name] = [];
+            }
+            $property_groups[$group_name][] = $property;
+        }
+
+        return $property_groups;
+    }
+
+
+    /**
+     * Determines wheter this resource has a property
+     * with the specified name.
+     *
+     * @param string $name The name of the resource property.
+     *
+     * @return bool True, if this resource has a property with
+     *     the specified name, false otherwise.
+     */
+    public function propertyExists($name = '')
+    {
+        if (!$name) {
+            return false;
+        }
+
+        $db = DBManager::get();
+
+        $exists_stmt = $db->prepare(
+            "SELECT TRUE FROM resource_properties
+            INNER JOIN resource_property_definitions rpd
+            ON resource_properties.property_id = rpd.property_id
+            WHERE resource_properties.resource_id = :resource_id
+                AND rpd.name = :name");
+
+        $exists_stmt->execute(
+            [
+                'resource_id' => $this->id,
+                'name'        => $name
+            ]
+        );
+
+        $exists = $exists_stmt->fetchColumn(0);
+
+        return (bool)$exists;
+    }
+
+    /**
+     * Retrieves a ResourceProperty object for a property of this resource
+     * which has the specified name. If the property has not been set for this
+     * resource, but is defined for this resource's category, a new
+     * ResourceProperty object will be created, stored and returned.
+     *
+     * @param string $name The name of the resource property.
+     *
+     * @return ResourceProperty|null Either a ResourceProperty object for
+     *     the resource property matching the specified name or null,
+     *     if no resource property with the specified name can be found.
+     * @throws InvalidResourceCategoryException If this resource category
+     * doesn't match the category of the resource object.
+     *
+     */
+    public function getPropertyObject(string $name)
+    {
+        if (!$this->propertyExists($name)) {
+            if ($name === 'geo_coordinates') {
+                return null;
+            }
+            //A property with the name $name does not exist for this
+            //resource object. If it is a defined property
+            //we can still try to create it:
+
+            if ($this->category->hasProperty($name)) {
+                $property = $this->category->createDefinedResourceProperty(
+                    $this,
+                    $name
+                );
+
+                $property->store();
+                return $property;
+            } else {
+                return null;
+            }
+        }
+        return ResourceProperty::findOneBySql(
+            "INNER JOIN resource_property_definitions rpd
+                ON resource_properties.property_id = rpd.property_id
+            WHERE resource_properties.resource_id = :resource_id
+                AND rpd.name = :name",
+            [
+                'resource_id' => $this->id,
+                'name'        => $name
+            ]
+        );
+    }
+
+    /**
+     * Returns all info-label properties
+     *
+     * @return SimpleCollection
+     */
+    public function getInfolabelProperties()
+    {
+        return SimpleCollection::createFromArray(
+            ResourceProperty::findBySQL('INNER JOIN `resource_property_definitions` USING (`property_id`)
+                WHERE `info_label` = 1 AND `state` != "" AND `resource_id` = ?', [$this->id]
+            )
+        );
+    }
+
+    /**
+     * Returns the state of the property specified by $name.
+     * If the property has not been set for this resource, but is defined
+     * for this resource's category, a new ResourceProperty object
+     * will be created, stored and its state will be returned.
+     *
+     * @param string $name The name of the resource property.
+     *
+     * @return string|null The state of the specified property or null
+     *     if the propery can't be found.
+     */
+    public function getProperty(string $name)
+    {
+        if (!$this->propertyExists($name)) {
+            //A property with the name $name does not exist for this
+            //resource object. If it is a defined property
+            //we can still try to create it:
+
+            if ($this->category->hasProperty($name)) {
+                $property = $this->category->createDefinedResourceProperty(
+                    $this,
+                    $name,
+                    ''
+                );
+
+                $property->store();
+                return $property->state;
+            } else {
+                return null;
+            }
+        }
+
+        $db = DBManager::get();
+
+        $value_stmt = $db->prepare(
+            "SELECT resource_properties.state FROM resource_properties
+            INNER JOIN resource_property_definitions rpd
+                ON resource_properties.property_id = rpd.property_id
+            WHERE resource_properties.resource_id = :resource_id
+                AND rpd.name = :name");
+
+        $value_stmt->execute(
+            [
+                'resource_id' => $this->id,
+                'name'        => $name
+            ]
+        );
+
+        $value = $value_stmt->fetchColumn(0);
+
+        if (!$value) {
+            return null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Retrieves an object by the state of a property of this resource,
+     * specified by the property's name.
+     * This method is useful for properties of type user, institute
+     * or fileref. Those properties store IDs of User, Institute
+     * or FileRef objects. Therefore the IDs can be resolved directly
+     * to get the corresponding User, Institute or FileRef object directly.
+     *
+     * @param string $name The name of the resource property.
+     *
+     * @return SimpleORMap|null A SimpleORMap-based object or null,
+     *     if no such object can be retrieved from the property's state.
+     */
+    public function getPropertyRelatedObject(string $name)
+    {
+        //Get the property state first:
+        $property = $this->getPropertyObject($name);
+
+        //Now we return the object which is referenced by the property's state:
+
+        if ($property) {
+            switch ($property->definition->type) {
+                case 'user':
+                    return User::find($property->state);
+                case 'institute':
+                    return Institute::find($property->state);
+                case 'fileref' :
+                    return FileRef::find($property->state);
+                default:
+                    //For all other property types where we cannot create an object
+                    //we return the raw state value:
+                    return $property->state;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Sets a specified property of this resource to the specified state.
+     * If the property has not been set for this resource, but is defined
+     * for this resource's category, a new ResourceProperty object
+     * will be created, stored and its state will be returned.
+     *
+     * @param string $name The name of the resource property.
+     * @param mixed $state The state of the resource property.
+     * @param User|null $user The user who wishes to set the property.
+     *
+     * @return bool True, if the property state could be set, false otherwise.
+     */
+    public function setProperty(string $name, $state = '', $user = null)
+    {
+        if (!($user instanceof User)) {
+            $user = User::findCurrent();
+            if (!$user) {
+                //We cannot continue without a user object!
+                return false;
+            }
+        }
+
+        //Get the minimum permission level required for modifying the property:
+
+        if (!$this->userHasPermission($user, 'admin')) {
+            throw new AccessDeniedException(
+                sprintf(
+                    _('Unzureichende Berechtigungen zum Ändern der Ressource %s!'),
+                    $this->name
+                )
+            );
+        }
+        if (!$this->category->userHasPropertyWritePermissions($name, $user, $this)) {
+            throw new AccessDeniedException(
+                sprintf(
+                    _('Unzureichende Berechtigungen zum Ändern der Eigenschaft %s!'),
+                    $name
+                )
+            );
+        }
+
+        if (!$this->propertyExists($name)) {
+            //A property with the name $name does not exist for this
+            //resource object. If it is a defined property
+            //we can still try to create it:
+
+            if ($this->category->hasProperty($name)) {
+                $property = $this->category->createDefinedResourceProperty(
+                    $this,
+                    $name,
+                    $state
+                );
+                return $property->store();
+            } else {
+                return false;
+            }
+        }
+
+        $property = $this->getPropertyObject($name);
+
+        if ($property) {
+            $property->state = $state;
+            if ($property->isDirty()) {
+                return $property->store();
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets the properties (specified by their names) to the specified values.
+     *
+     * @param array $properties The properties array in the format "key-value".
+     *     The array keys must contain the property name while the
+     *     items of the array contain the values.
+     *     Example:
+     *     ['bar' => 'foo']: Sets the value 'foo' for the property
+     *     with the name 'bar'.
+     *
+     * @param User|null $user The user who wishes to set the properties.
+     *     If this is left empty, the current user will be used.
+     *
+     * @return array If properties cannot be set, their names (as key) and the
+     *     error messages (if any) are returned.
+     *     The array has the following structure:
+     *     [
+     *         (property name) => (error message or empty string)
+     *     ]
+     */
+    public function setPropertiesByName(array $properties, User $user)
+    {
+        $failed_properties = [];
+
+        if (!($user instanceof User)) {
+            $user = User::findCurrent();
+            if (!$user) {
+                //No property can be set.
+                foreach ($properties as $name => $state) {
+                    $failed_properties[$name] = '';
+                }
+                return $failed_properties;
+            }
+        }
+
+        foreach ($properties as $name => $state) {
+            try {
+                $this->setProperty($name, $state, $user);
+            } catch (Exception $e) {
+                $this->failed_properties[$name] = $e->getMessage();
+            }
+        }
+
+        return $failed_properties;
+    }
+
+    /**
+     * Sets the properties (specified by their IDs) to the specified values.
+     *
+     * @param array $properties The properties array in the format "key-value".
+     *     The array keys must contain the property-ID while the
+     *     items of the array contain the values.
+     *     Example:
+     *     ['1' => 'foo']: Sets the value 'foo' for the property
+     *     with the ID '1'.
+     *
+     * @param User|null $user The user who wishes to set the properties.
+     *     If this is left empty, the current user will be used.
+     *
+     * @return array If properties cannot be set, their ids (as key) and the
+     *     error messages (if any) are returned.
+     *     The array has the following structure:
+     *     [
+     *         (property-ID) => (error message or empty string)
+     *     ]
+     */
+    public function setPropertiesById(array $properties, User $user = null)
+    {
+        $failed_properties = [];
+
+        if (!($user instanceof User)) {
+            $user = User::findCurrent();
+            if (!$user) {
+                //No property can be set.
+                foreach ($properties as $id => $state) {
+                    $failed_properties[$id] = '';
+                }
+                return $failed_properties;
+            }
+        }
+
+        foreach ($properties as $id => $state) {
+            $property = ResourcePropertyDefinition::find($id);
+            if (!$property) {
+                //Invalid property:
+                $this->failed_properties[$id] =
+                    _('Die Eigenschaft wurde nicht gefunden!');
+                continue;
+            }
+            try {
+                $this->setProperty($property->name, $state, $user);
+            } catch (Exception $e) {
+                $failed_properties[$id] = $e->getMessage();
+            }
+        }
+
+        return $failed_properties;
+    }
+
+    /**
+     * Determines if the specified user has sufficient permissions to edit
+     * the property specified by its name.
+     *
+     * @param string $name The name of the resource property.
+     * @param user $user The user whose edit permissions shall be checked.
+     *
+     * @return bool True, if the user has edit permissions for the property,
+     *     false otherwise.
+     */
+    public function isPropertyEditable(string $name, User $user)
+    {
+        return $this->category->userHasPropertyWritePermissions($name, $user, $this);
+    }
+
+    /**
+     * Sets the state of a property by its definition_id rather than its name.
+     *
+     * @param string $property_definition_id The definition-ID of the property.
+     * @param string $state The state of the property.
+     *
+     * @return bool True, if the property state can be stored, false otherwise.
+     * @throws ResourcePropertyStateException If the provided state is invalid
+     *     for the specified resource property.
+     *
+     */
+    public function setPropertyByDefinitionId($property_definition_id = null, $state = null)
+    {
+        if (!$property_definition_id and !$state) {
+            return false;
+        }
+
+        //Get property definition:
+        $definition = ResourcePropertyDefinition::find($property_definition_id);
+        if (!$definition) {
+            return false;
+        }
+
+        //Check if the state matches the property definition's rules:
+        $definition->validateState($state);
+
+        //Check if the property for this resource already exists.
+        //If so, update it. Otherwise create it.
+
+        $property = ResourceProperty::findOneBySql(
+            '(property_id = :property_id) AND (resource_id = :resource_id)',
+            [
+                'property_id' => $definition->id,
+                'resource_id' => $this->id
+            ]
+        );
+
+        if (!$property) {
+            $property              = new ResourceProperty();
+            $property->property_id = $definition->id;
+            $property->resource_id = $this->id;
+        }
+
+        $property->state = $state;
+        return $property->store();
+    }
+
+    /**
+     * Sets the property state by specifying an SimpleORMap object.
+     * This method is meant for resource properties of type user,
+     * institute or fileref.
+     *
+     * @param string $name The name of the resource property.
+     * @param SimpleORMap $object The object for the resource property.
+     *
+     * @return bool True, if the property has been saved, false otherwise.
+     */
+    public function setPropertyRelatedObject(string $name, SimpleORMap $object)
+    {
+        //Get the property state first:
+        $property = $this->getPropertyObject($name);
+
+        if (!$property) {
+            return false;
+        }
+
+        //Now we return the object which is referenced by the property's state:
+
+        switch ($property->definition->type) {
+            case 'user':
+                if (!($object instanceof User)) {
+                    throw new ResourcePropertyException(
+                        _("Eine Ressourceneigenschaft vom Typ 'user' benötigt ein Nutzer-Objekt zur Wertzuweisung!")
+                    );
+                }
+            break;
+            case 'institute':
+                if (!($object instanceof Institute)) {
+                    throw new ResourcePropertyException(
+                        _("Eine Ressourceneigenschaft vom Typ 'institute' benötigt ein Institut-Objekt zur Wertzuweisung!")
+                    );
+                }
+            break;
+            case 'fileref':
+                if (!($object instanceof FileRef)) {
+                    throw new ResourcePropertyException(
+                        _("Eine Ressourceneigenschaft vom Typ 'fileref' benötigt ein FileRef-Objekt zur Wertzuweisung!")
+                    );
+                }
+            break;
+            default:
+            break;
+        }
+
+        //When no exception is thrown above we can set the object's ID
+        //as the property's state:
+        $property->state = $object->id;
+
+        return $property->store();
+    }
+
+    /**
+     * Deletes a property for a resource.
+     *
+     * @param string $name The name of the property to be deleted.
+     *
+     * @param User $user The user who wishes to delete the property.
+     * @return number
+     */
+    public function deleteProperty(string $name, User $user)
+    {
+        //Get the user object and the minimum permission level
+        //required for modifying the property:
+
+        if (!$this->userHasPermission($user, 'admin')) {
+            throw new AccessDeniedException(
+                sprintf(
+                    _('Unzureichende Berechtigungen zum Ändern der Ressource %s!'),
+                    $this->name
+                )
+            );
+        }
+        if (!$this->category->userHasPropertyWritePermissions($name, $user)) {
+            throw new AccessDeniedException(
+                sprintf(
+                    _('Unzureichende Berechtigungen zum Löschen der Eigenschaft %s!'),
+                    $name
+                )
+            );
+        }
+
+        return ResourceProperty::deleteBySql(
+            "INNER JOIN resource_property_definitions rpd
+            ON resource_properties.property_id = rpd.property_id
+            WHERE
+            rpd.name = :name AND resource_properties.resource_id = :resource_id",
+            [
+                'name'        => $name,
+                'resource_id' => $this->id
+            ]
+        );
+    }
+
+    /**
+     * Returns the path for the resource's image.
+     * If the resource has no image the path for a general
+     * resource icon will be returned.
+     *
+     * Classes derived from the Resource class should only re-implement
+     * this method if they have an alternative storage method for
+     * resource pictures than the Stud.IP file system.
+     *
+     * @return string The URL to the resource picture.
+     */
+    public function getPictureUrl()
+    {
+        return '';
+    }
+
+    /**
+     * Returns the default picture for the resource class.
+     *
+     * Classes derived from Resource should re-implement this method
+     * if they want to get a different default picture than the resource icon.
+     * The call to getPictureUrl will call the getDefaultPictureUrl method
+     * from the derived class.
+     *
+     * @return string The URL to the picture.
+     */
+    public function getDefaultPictureUrl()
+    {
+        return $this->getIcon()->asImagePath();
+    }
+
+    /**
+     * Returns the Icon for the resource class.
+     *
+     * Classes derived from Resource should re-implement this method
+     * if they want to get a different icon than the resource icon.
+     * @param string $role
+     * @return Icon The icon for the resource.
+     */
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        return Icon::create('resources', $role);
+    }
+
+    /**
+     * Returns all properties in a two-dimensional array with the following
+     * property data inside of the second dimension:
+     * [
+     *     'name' => (the property's name)
+     *     'display_name' => (the display name of the property)
+     *     'type' => (the property's type)
+     *     'state' => (the property's state)
+     *     'requestable' => (if the property is requestable or not (true or false))
+     * ]
+     *
+     * @param bool $only_requestable_properties If only requestable properties
+     *     shall be returned set this to true. If all properties shall be
+     *     returned, set this to false.
+     *
+     * @return array[] A two-dimensional array containing property data.
+     */
+    public function getPropertyArray($only_requestable_properties = false)
+    {
+        $property_array = [];
+
+        if ($this->properties) {
+            foreach ($this->properties as $property) {
+                if ($only_requestable_properties) {
+                    $category_property = ResourceCategoryProperty::findByNameAndCategoryId(
+                        $property->name,
+                        $this->category_id
+                    );
+
+                    if ($category_property) {
+                        if ($category_property->requestable) {
+                            $property_array[] = [
+                                'name'         => $property->name,
+                                'display_name' => $property->display_name,
+                                'type'         => $property->type,
+                                'state'        => $property->state,
+                                'requestable'  => $property->isRequestable()
+                            ];
+                        }
+                    }
+                } else {
+                    $property_array[] = [
+                        'name'         => $property->name,
+                        'display_name' => $property->display_name,
+                        'type'         => $property->type,
+                        'state'        => $property->state,
+                        'requestable'  => $property->isRequestable()
+                    ];
+                }
+            }
+        }
+        return $property_array;
+    }
+
+    /**
+     * Shortcut method for ResourceBooking::countByResourceAndTimeRanges.
+     * Determines whether normal resource bookings exist
+     * in the specified time range.
+     *
+     * @param DateTime $begin Time range start timestamp.
+     *
+     * @param DateTime $end Time range end timestamp.
+     *
+     * @param array $excluded_booking_ids The IDs of bookings that shall
+     *     be excluded from the determination of the "assigned" status.
+     *
+     * @return bool True, if the resource is assigned in the specified
+     *     time range, false otherwise.
+     */
+    public function isAssigned(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return ResourceBooking::countByResourceAndTimeRanges(
+                $this,
+                [
+                    [
+                        'begin' => $begin->getTimestamp(),
+                        'end'   => $end->getTimestamp()
+                    ]
+                ],
+                [0],
+                $excluded_booking_ids
+            ) > 0;
+    }
+
+    /**
+     * Shortcut method for ResourceBooking::countByResourceAndTimeRanges.
+     * Determines whether resource reservations exist
+     * in the specified time range.
+     *
+     * @param DateTime $begin Time range start timestamp.
+     *
+     * @param DateTime $end Time range end timestamp.
+     *
+     * @param array $excluded_reservation_ids The IDs of reservation bookings that shall
+     *     be excluded from the determination of the "reserved" status.
+     *
+     * @return bool True, if the resource is reserved in the specified
+     *     time range, false otherwise.
+     */
+    public function isReserved(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_reservation_ids = []
+    )
+    {
+        //One second is added to the begin timestamp to avoid
+        //getting "false" overlaps where another booking ends on exactly
+        //the begin timestamp.
+        return ResourceBooking::countByResourceAndTimeRanges(
+                $this,
+                [
+                    [
+                        'begin' => $begin->getTimestamp(),
+                        'end'   => $end->getTimestamp()
+                    ]
+                ],
+                [1, 3],
+                $excluded_reservation_ids
+            ) > 0;
+    }
+
+    /**
+     * Shortcut method for ResourceBooking::countByResourceAndTimeRanges.
+     * Determines whether resource locks exist
+     * in the specified time range.
+     *
+     * @param DateTime $begin Time range start timestamp.
+     *
+     * @param DateTime $end Time range end timestamp.
+     *
+     * @param array $excluded_lock_ids The IDs of lock bookings that shall
+     *     be excluded from the determination of the "locked" status.
+     *
+     * @return bool True, if the resource is locked in the specified
+     *     time range, false otherwise.
+     */
+    public function isLocked(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_lock_ids = []
+    )
+    {
+        //One second is added to the begin timestamp to avoid
+        //getting "false" overlaps where another booking ends on exactly
+        //the begin timestamp.
+        return ResourceBooking::countByResourceAndTimeRanges(
+                $this,
+                [
+                    [
+                        'begin' => $begin->getTimestamp(),
+                        'end'   => $end->getTimestamp()
+                    ]
+                ],
+                [2],
+                $excluded_lock_ids
+            ) > 0;
+    }
+
+    /**
+     * Determines, if the resource is available (not assigned or locked)
+     * in a specified time range.
+     *
+     * @param DateTime $begin Time range start timestamp.
+     * @param DateTime $end Time range end timestamp.
+     *
+     * @param array $excluded_booking_ids The IDs of available bookings that shall
+     *     be excluded from the determination of the "available" status.
+     *
+     * @return bool True, if the resource is available in the specified
+     *     time range, false otherwise.
+     */
+    public function isAvailable(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return ResourceBooking::countByResourceAndTimeRanges(
+                $this,
+                [
+                    [
+                        'begin' => $begin->getTimestamp(),
+                        'end'   => $end->getTimestamp()
+                    ]
+                ],
+                [0, 2],
+                $excluded_booking_ids
+            ) == 0;
+    }
+
+    /**
+     * Determines, if the resource is available (not assigned or locked)
+     * in the time ranges specified by a resource request.
+     *
+     * @param ResourceRequest $request A resource request object.
+     *
+     * @return bool True, if the resource is available in the
+     *     time ranges of the resource request, false otherwise.
+     */
+    public function isAvailableForRequest(ResourceRequest $request)
+    {
+        $time_intervals = $request->getTimeIntervals(true);
+        if (!$time_intervals) {
+            //Without a single time interval we cannot check
+            //if the resource is available.
+            return false;
+        }
+        foreach ($time_intervals as $time_interval) {
+            $begin = new DateTime();
+            $end   = new DateTime();
+            $begin->setTimestamp($time_interval['begin']);
+            $end->setTimestamp($time_interval['end']);
+
+            if (!$this->isAvailable($begin, $end)) {
+                //The resource is not available in the time interval.
+                //We can stop here and return false.
+                return false;
+            }
+
+            //If code execution reaches this point the resource is
+            //available in all time intervals of the resource request:
+            return true;
+        }
+    }
+
+    /**
+     * Returns the full (localised) name of the resource.
+     *
+     * @return string The full name of the resource.
+     */
+    public function getFullName()
+    {
+        return sprintf(
+            _('Ressource %s'),
+            $this->name
+        );
+    }
+
+    /**
+     * Sets the permission for one user for this resource.
+     *
+     * @param User $user The user whose permission shall be set.
+     * @param string $perm The permission level for the specified user.
+     *     The levels 'user', 'autor', 'tutor' and 'admin' are allowed.
+     *
+     * @return bool True, if the permission has been stored successfully,
+     *     false otherwise.
+     */
+    public function setUserPermission(User $user, $perm = 'autor')
+    {
+        if (!in_array($perm, ['user', 'autor', 'tutor', 'admin'])) {
+            return false;
+        }
+
+        $perm_object = ResourcePermission::findOneBySql(
+            '(user_id = :user_id) AND (resource_id = :resource_id)',
+            [
+                'user_id'     => $user->id,
+                'resource_id' => $this->id
+            ]
+        );
+
+        if (!$perm_object) {
+            $perm_object              = new ResourcePermission();
+            $perm_object->user_id     = $user->id;
+            $perm_object->resource_id = $this->id;
+        }
+
+        $perm_object->perms = $perm;
+        $stored = (bool)$perm_object->store();
+        if ($stored) {
+            if (!isset(self::$permission_cache[$this->id])) {
+                self::$permission_cache[$this->id] = [];
+            }
+            //Update the permission cache.
+            self::$permission_cache[$this->id][$user->id] = $perm;
+        }
+        return $stored;
+    }
+
+    /**
+     * Deletes the permission a specified user has on this resource.
+     *
+     * @param User $user The user whose permission shall be deleted.
+     *
+     * @return bool True
+     */
+    public function deleteUserPermission(User $user)
+    {
+        $deleted = ResourcePermission::deleteBySql(
+            '(user_id = :user_id) AND (resource_id = :resource_id)',
+            [
+                'user_id'     => $user->id,
+                'resource_id' => $this->id
+            ]
+        );
+
+        if ($deleted && is_array(self::$permission_cache[$this->id])) {
+            //Update the permission cache.
+            self::$permission_cache[$this->id][$user->id] = null;
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes all permissions of all users for this resource.
+     *
+     * @return bool True
+     */
+    public function deleteAllPermissions()
+    {
+        ResourcePermission::deleteBySql(
+            'resource_id = :resource_id',
+            [
+                'resource_id' => $this->id
+            ]
+        );
+
+        //Update the permission cache:
+        self::$permission_cache[$this->id] = [];
+
+        return true;
+    }
+
+    /**
+     * Retrieves the permission level a specified user
+     * has on this resource.
+     *
+     * Setting the optional $time_range parameter will also enable checks for
+     * temporary global permissions.
+     *
+     * @param User $user The user whose permission shall be retrieved.
+     *
+     * @param array $time_range (DateTime) This is an optional parameter that can
+     *     be used to pass two DateTime objects to this method. The first object
+     *     will be treated as the begin timestamp and the second one as the
+     *     end timestamp.
+     *
+     * @param bool $permanent_only Whether to retrieve only permanent permissions
+     *     (true) or permanent and temporary permissions (false).
+     *     Defaults to false.
+     *
+     * @return string The permission level, expressed as string.
+     *     The level can be 'user', 'autor', 'tutor' or 'admin'.
+     */
+    public function getUserPermission(User $user, $time_range = [], $permanent_only = false)
+    {
+        if (ResourceManager::getGlobalResourcePermission($user) === 'admin') {
+            return 'admin';
+        }
+
+
+        $perm_string = '';
+        $temp_perm   = null;
+
+        $begin = time();
+        $end   = $begin;
+        //Check for a temporary permission first:
+        //check only against current timestamp
+        if (!$permanent_only) {
+            $temp_perm = ResourceTemporaryPermission::findOneBySql(
+                '(resource_id = :resource_id) AND (user_id = :user_id)
+                AND (begin <= :begin) AND (end >= :end)',
+                [
+                    'resource_id' => $this->id,
+                    'user_id'     => $user->id,
+                    'begin'       => $begin,
+                    'end'         => $end
+                ]
+            );
+        }
+
+        if ($temp_perm) {
+            $perm_string = $temp_perm->perms;
+        } else {
+            //No temporary permission exist or has been retrieved.
+            //Check for a "normal" permission.
+            $cached_perms = self::$permission_cache[$this->id][$user->id] ?? null;
+            if ($cached_perms === null) {
+                //The permission of the specified user is not in the
+                //permission cache. Load it from the database and store
+                //it in the permission cache before returning it.
+                $perms = ResourcePermission::findOneBySql(
+                    '(resource_id = :resource_id) AND (user_id = :user_id)',
+                    [
+                        'resource_id' => $this->id,
+                        'user_id'     => $user->id
+                    ]
+                );
+                if ($perms) {
+                    if (!isset(self::$permission_cache[$this->id])) {
+                        self::$permission_cache[$this->id] = [];
+                    }
+                    self::$permission_cache[$this->id][$user->id] = $perms->perms;
+                    $perm_string                                  = $perms->perms;
+                }
+            } else {
+                $perm_string = $cached_perms;
+            }
+        }
+
+        if (!$perm_string) {
+            //A user which doesn't have special permissions for this resource
+            //can have global resource permissions:
+            $global_perm = ResourceManager::getGlobalResourcePermission($user);
+            if ($global_perm) {
+                //Set the permission cache:
+                if (!isset(self::$permission_cache[$this->id])) {
+                    self::$permission_cache[$this->id] = [];
+                }
+                self::$permission_cache[$this->id][$user->id] = $global_perm;
+            }
+            $perm_string = $global_perm;
+        }
+        //Now we must check for global resource locks:
+        if ($perm_string && $time_range && $this->lockable) {
+
+            if ($time_range[0] instanceof DateTime) {
+                $begin = $time_range[0]->getTimestamp();
+            } else {
+                $begin = $time_range[0];
+            }
+            if ($time_range[1] instanceof DateTime) {
+                $end = $time_range[1]->getTimestamp();
+            } else {
+                $end = $time_range[1];
+            }
+            if (GlobalResourceLock::isLocked($begin, $end)) {
+                //A permission level exists for the user.
+                //The user gets "user" permissions in case
+                //a global lock is active.
+                $perm_string = 'user';
+            }
+        }
+
+        //No global resource lock exists. We must return
+        //the permission string if it is set:
+        if ($perm_string) {
+            return $perm_string;
+        }
+
+        return '';
+    }
+
+    /**
+     * Determines if a user has the specified permission.
+     *
+     * @param ?User $user The user whose permissions shall be checked on this
+     *     resource object. May be null.
+     * @param string $permission The permission level.
+     * @param $time_range @TODO
+     *
+     * @return bool True, if the specified user has the specified permission,
+     *     false otherwise.
+     */
+    public function userHasPermission(
+        ?User $user,
+        string $permission = 'user',
+        array $time_range = []
+    )
+    {
+        if (!in_array($permission, ['user', 'autor', 'tutor', 'admin']) || $user === null) {
+            return false;
+        }
+
+
+        if (ResourceManager::getGlobalResourcePermission($user) === 'admin') {
+            return true;
+        }
+
+        $perm_level = $this->getUserPermission($user, $time_range);
+
+        if ($permission === 'user') {
+            //No check for global resource locks here:
+            //If only user permissions are requested we can safely grant them
+            //since 'user' users may only perform reading actions but
+            //no writing actions.
+            if (in_array($perm_level, ['user', 'autor', 'tutor', 'admin'])) {
+                return true;
+            } else {
+                return false;
+            }
+        } elseif ($permission === 'autor') {
+            if (in_array($perm_level, ['autor', 'tutor', 'admin'])) {
+                return true;
+            } else {
+                return false;
+            }
+        } elseif ($permission === 'tutor') {
+            if (in_array($perm_level, ['tutor', 'admin'])) {
+                return true;
+            } else {
+                return false;
+            }
+        } elseif ($permission === 'admin') {
+            if ($perm_level == 'admin') {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        //Code execution should be finished at this point.
+        //If this point is reached the user has no permissions for the
+        //resource management system at all.
+        return false;
+    }
+
+    /**
+     * Determines whether the user may create a child resource
+     * on this resource.
+     *
+     * @param User $user The user whose permission to create a child
+     *     resource shall be checked.
+     *
+     * @return bool True, if the user may create a child resource
+     *     on this resource, false otherwise.
+     */
+    public function userMayCreateChild(User $user)
+    {
+        return $this->userHasPermission($user, 'admin');
+    }
+
+    /**
+     * Checks if the specified user has sufficient permissions to make resource
+     * requests, according to the setting RESOURCES_MIN_REQUEST_PERMISSION.
+     * This permission check is only relevant for creating requests that are not
+     * bound to a course.
+     *
+     * @param User $user The user whose request permissions shall be checked.
+     *
+     * @return bool True, if the user has request permissions, false otherwise.
+     */
+    public function userHasRequestRights(User $user)
+    {
+        if (!Config::get()->RESOURCES_ALLOW_ROOM_REQUESTS) {
+            return false;
+        }
+        $min_perm = Config::get()->RESOURCES_MIN_REQUEST_PERMISSION;
+        if (!in_array($min_perm, ['', 'user', 'autor', 'tutor', 'admin'])) {
+            //Invalid permission level!
+            return false;
+        }
+        if (!$min_perm) {
+            //No minimum permission set: Every logged-in user
+            //can create requests.
+            return true;
+        }
+        return $this->userHasPermission($user, $min_perm);
+    }
+
+    /**
+     * Determines whether the user may book the resource or not.
+     * An optional time range can be set to check  the user's
+     * temporary permissions on another date than the current date.
+     *
+     * @param User $user The user whose booking permissions shall be checked.
+     *
+     * @param int|string|DateTime $begin The begin timestamp of the
+     *     optional time range.
+     *
+     * @param int|string|DateTime $end The end timestamp of the
+     *     optional time range.
+     *
+     * @return bool True, if the user may book the resource, false otherwise.
+     */
+    public function userHasBookingRights(
+        User $user,
+        $begin = null,
+        $end = null
+    )
+    {
+        if ($begin && $end) {
+            $time_range = [$begin, $end];
+        } else {
+            $time_range = [];
+        }
+
+        //Check the permissions on this resource and the global permissions:
+        return $this->userHasPermission($user, 'autor', $time_range);
+    }
+
+    /**
+     * Determines if the booking plan of the resource is visible for a
+     * specified user.
+     *
+     * @param ?User $user The user whose permission to view the booking plan
+     *     shall be determined. May be null.
+     *
+     * @param DateTime[] $time_range An optional time range for the
+     *     permission check.
+     * @return bool True, if the user can see the resource booking plan,
+     *     false otherwise.
+     * @see Resource::getUserPermission
+     *
+     */
+    public function bookingPlanVisibleForUser(?User $user, $time_range = [])
+    {
+        return $this->userHasPermission($user, 'user', $time_range);
+    }
+
+    /**
+     * Retrieves a parent resource object that matches the specified
+     * class name. The search stops when either a parent resource
+     * with the class name is found or when the root resource object
+     * is reached.
+     *
+     * @param string $class_name The class name of the parent.
+     *
+     * @return Resource|null Either a resource object or null
+     *     in case a matching parent resource cannot be found.
+     */
+    public function findParentByClassName($class_name = 'Resource')
+    {
+        $resource_ids = [$this->id];
+        $resource     = $this->parent;
+
+        while ($resource) {
+            //We should check for circular hierarchies first
+            //to avoid an endless while loop:
+            if (in_array($resource->id, $resource_ids)) {
+                //We have a circular hierarchy: this resource is
+                //the parent of itself which is an invalid state!
+                throw new InvalidResourceException(
+                    sprintf(
+                        _('Zirkuläre Hierarchie: Die Ressource %1$s ist ein Elternknoten von sich selbst!'),
+                        $resource->name
+                    )
+                );
+            }
+            if (is_a($resource->class_name, $class_name, true)) {
+                //We have found a parent node which has the
+                //specified class name: return that parent.
+                return $resource;
+            }
+            //The current parent was not the one we were looking for.
+            //Therefore we must go one layer up in the resource
+            //hierarchy and continue search:
+            $resource_ids[] = $resource->id;
+            $resource       = $resource->parent;
+        }
+        //The search was not successful:
+        //We have reached the root resource (whose parent_id field
+        //is set to an equivalend of NULL) and we haven't found a
+        //resource matching the specified class name.
+        return null;
+    }
+
+    /**
+     * This method searches the hierarchy below this resource
+     * to find resources matching the specified class name.
+     * Via the optional parameter $depth the search can be limited
+     * to a specific amount of layers.
+     *
+     * @param string $class_name The name of the resource class
+     *     where resources shall be found to.
+     * @param int $depth The (optional) maximum depth below this resource
+     *     which shall be searched.
+     * @param bool $convert_objects True, if objects shall be converted to
+     *     $class_name (default), false otherwise.
+     * @param bool $order_by_name Order the children by name.
+     *     Defaults to true.
+     *
+     * @return Resource[] An array of resource objects or an empty array
+     *     if no matching resources can be found.
+     */
+    public function findChildrenByClassName(
+        $class_name = 'Resource',
+        $depth = 0,
+        $convert_objects = true,
+        $order_by_name = true
+    )
+    {
+        $result = [];
+        if ($this->children) {
+            //this resource has children: iterate over them and
+            //check if they match the search criteria.
+            foreach ($this->children as $child) {
+                if (is_a($child->class_name, $class_name, true)) {
+                    if ($convert_objects) {
+                        $result[] = $child->getDerivedClassInstance();
+                    } else {
+                        $result[] = $child;
+                    }
+                }
+                if (($depth > 1) || ($depth == 0)) {
+                    //Search the child and lower depth by one when calling this
+                    //method on the child.
+                    $result = array_merge(
+                        $result,
+                        $child->findChildrenByClassName(
+                            $class_name,
+                            (($depth > 1) ? $depth - 1 : 0),
+                            $convert_objects
+                        )
+                    );
+                }
+            }
+            if ($order_by_name) {
+                usort(
+                    $result,
+                    function ($a, $b) {
+                        if ($a->name == $b->name) {
+                            return 0;
+                        } elseif ($a->name < $b->name) {
+                            return -1;
+                        } else {
+                            return 1;
+                        }
+                    }
+                );
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Adds a resource as child resource to this resource.
+     *
+     * @param Resource $resource The child resource.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function addChild(Resource $resource)
+    {
+        $old_parent    = $resource->parent;
+        $old_parent_id = $resource->parent_id;
+
+        $resource->parent    = $this;
+        $resource->parent_id = $this->id;
+
+        if (!$resource->checkHierarchy()) {
+            //We must revert the parent fields since $resource
+            //may be used in other code pieces afterwards.
+            $resource->parent    = $old_parent;
+            $resource->parent_id = $old_parent_id;
+            throw new InvalidArgumentException(
+                sprintf(
+                    _('Die Ressource %1$s (Typ %2$s) kann nicht unterhalb der Ressource %3$s (Typ %4$s) platziert werden!'),
+                    $resource->name,
+                    $resource->class_name,
+                    $this->name,
+                    $this->class_name
+                )
+            );
+        }
+        if ($resource->isDirty()) {
+            //Only store the resource object if setting the parent_id field
+            //did change it:
+            return $resource->store();
+        }
+        //The resource object hasn't changed by setting the parent_id field:
+        //We can return true.
+        return true;
+    }
+
+    /**
+     * Get all resource requests for the resource in a given timeframe.
+     *
+     * @param DateTime $begin Begin of timeframe.
+     * @param DateTime $end End of timeframe.
+     *
+     * @return ResourceRequest[] An array of ResourceRequest objects.
+     */
+    public function getOpenResourceRequests(DateTime $begin, DateTime $end)
+    {
+        //We must get all requests that either have a start and end date
+        //set or that have a start date, repeate end, repeat interval and
+        //repeat quantity set.
+
+        return ResourceRequest::findByResourceAndTimeRanges(
+            $this,
+            [
+                [
+                    'begin' => $begin->getTimestamp(),
+                    'end'   => $end->getTimestamp()
+                ]
+            ],
+            0
+        );
+    }
+
+    /**
+     * Get all resource bookings for the resource in a given timeframe.
+     *
+     * @param DateTime $begin Begin of timeframe.
+     * @param DateTime $end End of timeframe.
+     * @param array $booking_types
+     *
+     * @return ResourceBooking[] An array of ResourceBooking objects.
+     */
+    public function getResourceBookings(DateTime $begin, DateTime $end, array $booking_types = [0])
+    {
+        return ResourceBooking::findByResourceAndTimeRanges(
+            $this,
+            [
+                [
+                    'begin' => $begin->getTimestamp(),
+                    'end' => $end->getTimestamp()
+                ]
+            ],
+            $booking_types
+        );
+    }
+
+
+    /**
+     * Get all resource locks for the resource in a given timeframe.
+     *
+     * @param DateTime $begin Begin of timeframe.
+     * @param DateTime $end End of timeframe.
+     *
+     * @return ResourceBooking[] An array of ResourceBooking objects.
+     */
+    public function getResourceLocks(DateTime $begin, DateTime $end)
+    {
+        return ResourceBooking::findByResourceAndTimeRanges(
+            $this,
+            [
+                [
+                    $begin->getTimestamp(),
+                    $end->getTimestamp()
+                ]
+            ],
+            [2]
+        );
+    }
+
+
+    /**
+     * Determines if files are attached to this resource.
+     * If a folder exists for this resource its files are counted.
+     * Depending on whether the folder has files in it or not
+     * this method returns true or false.
+     *
+     * @return bool True, if there are files attached to this resource,
+     *     false otherwise.
+     */
+    public function hasFiles()
+    {
+        $folder = Folder::findOneBySql(
+            'range_id = :range_id',
+            [
+                'range_id' => $this->id
+            ]
+        );
+
+        if (!$folder) {
+            return false;
+        }
+
+        //Since files from resources shall always be stored in the
+        //Stud.IP file system we can skip the conversion from Folder
+        //to FolderType and count the FileRef-objects for this resource
+        //directly in the database. Since resource folders do not
+        //have subfolders we will count any file of the resource:
+        return FileRef::countBySql(
+                'folder_id = :folder_id',
+                [
+                    'folder_id' => $folder->id
+                ]
+            ) > 0;
+    }
+
+    /**
+     * Converts a Resource object to an object of a specialised resource class.
+     *
+     * @return Resource|other An object of a specialised resource class
+     *     or a Resource object, if the resource is a standard resource
+     *     with the class_name 'Resource' in its resource category.
+     *     If the derived resource class is not available, an instance of
+     *     BrokenResource is returned.
+     */
+    public function getDerivedClassInstance()
+    {
+        $class_name = $this->class_name;
+
+        if ($class_name == 'Resource') {
+            //It is a standard resource which is managed by this class.
+            return $this;
+        }
+
+        if (is_subclass_of($class_name, 'Resource')) {
+            $converted_resource = $class_name::buildExisting(
+                $this->toRawArray()
+            );
+            return $converted_resource;
+        } else {
+            //$class_name does not contain the name of a subclass
+            //of Resource. That's an error!
+            $broken_resource = BrokenResource::buildExisting(
+                $this->toRawArray()
+            );
+            return $broken_resource;
+        }
+    }
+
+    /**
+     * Checks if the place in the resource hierarchy (resource tree)
+     * is correct for this resource.
+     * This method has no function in this class but can be filled
+     * with logic in one of the classes derived from Resource.
+     *
+     * @return bool True, if this resource is correctly placed,
+     *     false otherwise.
+     * @throws NoResourceClassException
+     *     if the class name of this resource is not a derived class
+     *     of the Resource class.
+     *
+     */
+    public function checkHierarchy()
+    {
+        if ($this->class_name == 'Resource') {
+            //Objects of the Resource class are always in the right
+            //place of the resource hierarchy.
+            return true;
+        }
+
+        //The object does not use the Resource class name and uses
+        //a derived class instead. We must check the hierarchy
+        //using the checkHierarchy method of the derived class.
+
+        $converted_resource = $this->getDerivedClassInstance();
+        return $converted_resource->checkHierarchy();
+    }
+
+    /**
+     * Returns the link for an action for this resource.
+     * This is the non-static variant of Resource::getLinkForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param array $link_parameters Optional parameters for the link.
+     * @return string @TODO
+     */
+    public function getActionLink($action = 'show', $link_parameters = [])
+    {
+        //We must check the class name and call the appropriate
+        //getLinkForAction method for derived classes:
+
+        $class_name = $this->class_name;
+        if (is_subclass_of($class_name, 'Resource')) {
+            return $class_name::getLinkForAction(
+                $action,
+                $this->id,
+                $link_parameters
+            );
+        } else {
+            return self::getLinkForAction(
+                $action,
+                $this->id,
+                $link_parameters
+            );
+        }
+    }
+
+    /**
+     * Returns the URL for an action for this resource.
+     * This is the non-static variant of Resource::getURLForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For default Resources the actions 'show', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param array $url_parameters Optional parameters for the URL.
+     * @return string @TODO
+     */
+    public function getActionURL($action = 'show', $url_parameters = [])
+    {
+        //We must check the class name and call the appropriate
+        //getURLForAction method for derived classes:
+
+        $class_name = $this->class_name;
+        if (is_subclass_of($class_name, 'Resource')) {
+            return $class_name::getURLForAction(
+                $action,
+                $this->id,
+                $url_parameters
+            );
+        } else {
+            return self::getURLForAction(
+                $action,
+                $this->id,
+                $url_parameters
+            );
+        }
+    }
+
+    public function getItemName($long_format = true)
+    {
+        if ($long_format) {
+            //In some cases the general Resource class may be used
+            //when the resource objects are in fact instances
+            //of derived classes. To make sure that the correct prefix
+            //is always displayed, we retrieve the derived class first
+            //before returning the name:
+            $derived_class = $this->getDerivedClassInstance();
+            return $derived_class->getFullName();
+        } else {
+            return $this->name;
+        }
+    }
+
+    public function getItemURL()
+    {
+        return $this->getActionURL('show');
+    }
+
+    public function getItemAvatarURL()
+    {
+        return Icon::create('resources', Icon::ROLE_INFO)->asImagePath();
+    }
+
+
+    public function getLink() : StudipLink
+    {
+        return new StudipLink($this->getActionURL(), $this->name, Icon::create('resources'));
+    }
+}
diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
deleted file mode 100644
index fadf92f..0000000
--- a/lib/models/resources/ResourceBooking.class.php
+++ /dev/null
@@ -1,1946 +0,0 @@
-<?php
-
-/**
- * ResourceBooking.class.php - model class for resource bookings
- *
- * The ResourceBooking class is responsible for storing
- * bookings of resources in a specified time range
- * or a time interval.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * The repetition_interval column contains a date interval string in a
- * format that is accepted by the DateInterval class constructor.
- * Examples for values of the repetition_interval column:
- * - For an one month interval, the value is "P1M".
- * - For an interval of two days, the value is "P2D".
- * See the DateInterval documentation for more examples:
- * https://secure.php.net/manual/en/class.dateinterval.php
- *
- * @property string $id database column
- * @property string $resource_id database column
- * @property string $range_id database column
- * @property string|null $description database column
- * @property int $begin database column
- * @property int $end database column
- * @property int|null $repeat_end database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property string|null $internal_comment database column
- * @property int $preparation_time database column
- * @property int $booking_type database column
- * @property string $booking_user_id database column
- * @property string $repetition_interval database column
- * @property SimpleORMapCollection|ResourceBookingInterval[] $time_intervals has_many ResourceBookingInterval
- * @property Resource $resource belongs_to Resource
- * @property User $assigned_user belongs_to User
- * @property CourseDate $assigned_course_date belongs_to CourseDate
- * @property User $booking_user belongs_to User
- * @property mixed $course_id additional field
- * @property mixed $room_name additional field
- * @property-read mixed $real_begin additional field
- * @property-read mixed $real_begin_dt additional field
- */
-class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calendar\EventSource
-{
-    const TYPE_NORMAL = 0;
-    const TYPE_RESERVATION = 1;
-    const TYPE_LOCK = 2;
-    const TYPE_PLANNED = 3;
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_bookings';
-
-        $config['belongs_to']['resource'] = [
-            'class_name' => Resource::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func' => 'find'
-        ];
-        $config['belongs_to']['assigned_user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'range_id',
-            'assoc_func' => 'find'
-        ];
-        $config['belongs_to']['assigned_course_date'] = [
-            'class_name' => CourseDate::class,
-            'foreign_key' => 'range_id',
-            'assoc_func' => 'find'
-        ];
-        $config['has_many']['time_intervals'] = [
-            'class_name' => ResourceBookingInterval::class,
-            'assoc_foreign_key' => 'booking_id',
-            'on_delete' => 'delete'
-        ];
-        $config['belongs_to']['booking_user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'booking_user_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['additional_fields']['course_id'] = ['assigned_course_date', 'range_id'];
-        $config['additional_fields']['room_name'] = ['resource', 'name'];
-
-        $config['additional_fields']['real_begin'] = [
-            'get' => function (ResourceBooking $booking) {
-                return $booking->begin - $booking->preparation_time;
-            }
-        ];
-        $config['additional_fields']['real_begin_dt'] = [
-            'get' => function (ResourceBooking $booking) {
-                $real_begin = new DateTime();
-                $real_begin->setTimestamp($booking->real_begin);
-                return $real_begin;
-            }
-        ];
-
-        $config['registered_callbacks']['after_store'][] = 'updateIntervals';
-        $config['registered_callbacks']['after_store'][] = 'createStoreLogEntry';
-        $config['registered_callbacks']['after_delete'][] = 'sendDeleteNotification';
-        $config['registered_callbacks']['after_delete'][] = 'createDeleteLogEntry';
-
-        //In regard to TIC 6460:
-        //As long as TIC 6460 is not implemented, we must add the validate
-        //method as a callback before storing the object.
-        if (!method_exists('SimpleORMap', 'validate')) {
-            $config['registered_callbacks']['before_store'][] = 'validate';
-        }
-
-        parent::configure($config);
-    }
-
-    private $assigned_user_type;
-
-    public function createStoreLogEntry()
-    {
-        if ($this->isSimpleBooking()) {
-            StudipLog::log(
-                'RES_ASSIGN_SINGLE',
-                $this->resource_id,
-                null,
-                $this->__toString(),
-                null,
-                $GLOBALS['user']->id
-            );
-        } else {
-            StudipLog::log(
-                'RES_ASSIGN_SEM',
-                $this->resource_id,
-                $this->course_id,
-                $this->__toString(),
-                null,
-                $GLOBALS['user']->id
-            );
-        }
-    }
-
-
-    public function createDeleteLogEntry()
-    {
-        if ($this->isSimpleBooking()) {
-            StudipLog::log(
-                'RES_ASSIGN_DEL_SINGLE',
-                $this->resource_id,
-                null,
-                $this->__toString(),
-                null,
-                $GLOBALS['user']->id
-            );
-        } else {
-            StudipLog::log(
-                'RES_ASSIGN_DEL_SEM',
-                $this->resource_id,
-                $this->course_id,
-                $this->__toString(),
-                null,
-                $GLOBALS['user']->id
-            );
-        }
-    }
-
-
-    /**
-     * Internal method that generated the SQL query used in
-     * findByResourceAndTimeRanges and countByResourceAndTimeRanges.
-     *
-     * @see findByResourceAndTimeRanges
-     * @inheritDoc
-     */
-    protected static function buildResourceAndTimeRangesSqlQuery(
-        Resource $resource,
-        $time_ranges = [],
-        $booking_types = [],
-        $excluded_booking_ids = []
-    )
-    {
-        if (!is_array($time_ranges)) {
-            throw new InvalidArgumentException(
-                _('Es wurde keine Liste mit Zeiträumen angegeben!')
-            );
-        }
-
-        //Check the array:
-        foreach ($time_ranges as $time_range) {
-            if ($time_range['begin'] > $time_range['end']) {
-                throw new InvalidArgumentException(
-                    _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-                );
-            }
-
-            if ($time_range['begin'] == $time_range['end']) {
-                throw new InvalidArgumentException(
-                    _('Startzeitpunkt und Endzeitpunkt dürfen nicht identisch sein!')
-                );
-            }
-        }
-
-        $sql_params = [
-            'resource_id' => $resource->id
-        ];
-
-        //First we build the SQL snippet for the case that the $booking_type
-        //variable is set to something different than null.
-        $booking_type_sql = '';
-        if (is_array($booking_types) && count($booking_types)) {
-            $booking_type_sql = ' AND booking_type IN ( :booking_types )';
-            $sql_params['booking_types'] = $booking_types;
-        }
-
-        //Then we build the snippet for excluded booking IDs, if specified.
-        $excluded_booking_ids_sql = '';
-        if (is_array($excluded_booking_ids) && count($excluded_booking_ids)) {
-            $excluded_booking_ids_sql = ' AND resource_booking_intervals.booking_id NOT IN ( :excluded_ids ) ';
-            $sql_params['excluded_ids'] = $excluded_booking_ids;
-        }
-
-        //Now we build the SQL snippet for the time intervals.
-        //These are repeated four times in the query below.
-        //First we use one template ($time_sql_template) and
-        //replace NUMBER with our counting variable $i.
-        //BEGIN and END are replaced below since the columns for
-        //BEGIN and END are different in the four cases where we
-        //repeat the SQL snippet for the time intervals.
-        $time_sql_template = '
-            (resource_booking_intervals.begin < :endNUMBER AND :beginNUMBER < resource_booking_intervals.end)
-            ';
-
-        $time_sql = '';
-        if ($time_ranges) {
-            $time_sql = ' AND (';
-
-            $i = 1;
-            foreach ($time_ranges as $time_range) {
-                if ($i > 1) {
-                    $time_sql .= ' OR ';
-                }
-                $time_sql .= str_replace(
-                    'NUMBER',
-                    $i,
-                    $time_sql_template
-                );
-
-                if ($time_range['begin'] instanceof DateTime) {
-                    $sql_params[('begin' . $i)] = $time_range['begin']->getTimestamp();
-                } else {
-                    $sql_params[('begin' . $i)] = $time_range['begin'];
-                }
-                if ($time_range['end'] instanceof DateTime) {
-                    $sql_params[('end' . $i)] = $time_range['end']->getTimestamp();
-                } else {
-                    $sql_params[('end' . $i)] = $time_range['end'];
-                }
-
-                $i++;
-            }
-
-            $time_sql .= ') ';
-        }
-
-        //Check if the booking has a start and end timestamp set
-        //or if it has repetitions that have a matching timestamp.
-        //This is done in the rest of the SQL query:
-
-        $whole_sql = "resource_bookings.id IN (
-                    SELECT resource_booking_intervals.booking_id FROM resource_booking_intervals WHERE
-                    resource_booking_intervals.resource_id = :resource_id
-                    AND resource_booking_intervals.takes_place = 1"
-                    . $excluded_booking_ids_sql
-                    . $time_sql
-                    . " GROUP BY resource_booking_intervals.booking_id ORDER BY NULL)
-                    $booking_type_sql
-";
-
-        return [
-            'sql' => $whole_sql,
-            'params' => $sql_params
-        ];
-    }
-
-
-    /**
-     * Retrieves all resource booking for the given resource and
-     * time range. By default, all booking are returned.
-     * To get only bookings of a certain type
-     * set the $booking_type parameter.
-     *
-     * @param Resource $resource The resource whose requests shall be retrieved.
-     * @param array $time_ranges An array with time ranges as DateTime objects.
-     *     The array has the following structure:
-     *     [
-     *         [
-     *             'begin' => begin timestamp,
-     *             'end' => end timestamp
-     *         ],
-     *         ...
-     *     ]
-     * @param array $booking_types An optional specification for the
-     *     booking_type column in the database. More than one booking
-     *     type can be specified.
-     *     By default this is set to an empty array which means
-     *     that resource booking are not filtered by the type column.
-     *     The allowed resource booking types are specified in the
-     *     class documentation.
-     *
-     * @param array $excluded_booking_ids An array of strings representing
-     *     resource booking IDs. IDs specified in this array are excluded
-     *     from the search.
-     * @return ResourceBooking[] An array of ResourceRequest objects.
-     *     If no requests can be found, the array is empty.
-     *
-     * @throws InvalidArgumentException, if the time ranges are either not in an
-     *     array matching the format description from above or if one of the
-     *     following conditions is met in one of the time ranges:
-     *     - begin > end
-     *     - begin == end
-     */
-    public static function findByResourceAndTimeRanges(
-        Resource $resource,
-        $time_ranges = [],
-        $booking_types = [],
-        $excluded_booking_ids = []
-    )
-    {
-        //Build the SQL query and the parameter array.
-
-        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
-            $resource,
-            $time_ranges,
-            $booking_types,
-            $excluded_booking_ids
-        );
-
-        //Call findBySql:
-        return self::findBySql($sql_data['sql'], $sql_data['params']);
-    }
-
-
-    /**
-     * Counts all resource bookings for the specified resource and
-     * time range. By default, all bookings are counted.
-     * To count only bookings of a certain type
-     * set the $booking_type parameter.
-     *
-     * @see findByResourceAndTimeRanges
-     * @inheritDoc
-     */
-    public static function countByResourceAndTimeRanges(
-        Resource $resource,
-        $time_ranges = [],
-        $booking_types = [],
-        $excluded_booking_ids = []
-    )
-    {
-        //Build the SQL query and the parameter array.
-
-        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
-            $resource,
-            $time_ranges,
-            $booking_types,
-            $excluded_booking_ids
-        );
-
-        //Call countBySql:
-        return self::countBySql($sql_data['sql'], $sql_data['params']);
-    }
-
-
-    /**
-     * Deletes all resource bookings for the specified resource and
-     * time range. By default, all bookings are counted.
-     * To count only bookings of a certain type
-     * set the $booking_type parameter.
-     *
-     * @see findByResourceAndTimeRanges
-     * @inheritDoc
-     */
-    public static function deleteByResourceAndTimeRanges(
-        Resource $resource,
-        $time_ranges = [],
-        $booking_types = [],
-        $excluded_booking_ids = []
-    )
-    {
-        //Build the SQL query and the parameter array.
-        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
-            $resource,
-            $time_ranges,
-            $booking_types,
-            $excluded_booking_ids
-        );
-
-        //Call deleteBySql:
-        return self::deleteBySql($sql_data['sql'], $sql_data['params']);
-    }
-
-
-    /**
-     * The SimpleORMap::store method is overloaded to allow forced booking
-     * of resource bookings, meaning that all other bookings of the
-     * resource of a booking are deleted when they overlap with this booking.
-     *
-     * @param bool $force_booking Whether booking shall be forced (true)
-     *     or not (false). Defaults to false.
-     * @return bool
-     */
-    public function store($force_booking = false)
-    {
-        if ($force_booking == true) {
-            $this->deleteOverlappingBookings();
-        }
-        $this->deleteOverlappingReservations();
-
-        if (parent::store()) {
-            //Check if the booking is bound to a course date.
-            //If this is the case, check for existing bookings
-            //and delete them, so that there is only one booking
-            //for a course date:
-            $course_date_exists = CourseDate::exists($this->range_id);
-            if ($course_date_exists) {
-                self::deleteBySql(
-                    'range_id = :range_id AND id <> :this_id',
-                    [
-                        'this_id' => $this->id,
-                        'range_id' => $this->range_id
-                    ]
-                );
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * This validation method is called before storing an object.
-     */
-    public function validate()
-    {
-        if ((!$this->resource_id) || !($this->resource instanceof Resource)) {
-            throw new InvalidArgumentException(
-                _('Es wurde keine Ressource zur Buchung angegeben!')
-            );
-        }
-
-        if (!$this->range_id && !$this->description) {
-            throw new ResourceBookingRangeException(
-                _('Es muss eine Person oder ein Text zur Buchung eingegeben werden!')
-            );
-        }
-
-        if ($this->begin >= $this->end) {
-            throw new InvalidArgumentException(
-                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-            );
-        }
-
-        if ($this->repetition_interval) {
-            if (!$this->repeat_end) {
-                throw new InvalidArgumentException(
-                    _('Es wurde ein Wiederholungsintervall ohne Begrenzung angegeben!')
-                );
-            }
-            if ($this->real_begin > $this->repeat_end) {
-                throw new InvalidArgumentException(
-                    _('Der Startzeitpunkt darf nicht hinter dem Ende der Wiederholungen liegen!')
-                );
-            }
-        }
-
-        // update the booking user
-        if (!$this->isNew() || !$this->booking_user_id) {
-            $this->booking_user = User::findCurrent();
-        }
-
-        $derived_resource = $this->resource->getDerivedClassInstance();
-
-        // check if the user needs booking rights on the resource
-        if (
-            $this->isFieldDirty('resource_id')
-            || $this->isFieldDirty('repetition_interval')
-            || $this->begin < $this->getPristineValue('begin')
-            || $this->end > $this->getPristineValue('end')
-            || $this->preparation_time > $this->getPristineValue('preparation_time')
-            || $this->repeat_end > $this->getPristineValue('repeat_end')
-        ) {
-
-            //Check if the user has booking rights on the resource.
-            //The user must have either permanent permissions or they have to
-            //have booking rights by a temporary permission in this moment
-            $user_has_booking_rights = $derived_resource->userHasBookingRights(
-                $this->booking_user, $this->begin, $this->end
-            );
-            if (!$user_has_booking_rights) {
-                throw new ResourcePermissionException(
-                    sprintf(
-                        _('Unzureichende Berechtigungen zum Buchen der Ressource %s!'),
-                        $this->resource->name
-                    )
-                );
-            }
-        }
-
-        $time_intervals = $this->calculateTimeIntervals(true);
-        $time_interval_overlaps = [];
-        $existing_deleted_intervals = [];
-        if (!$this->isNew()) {
-            $existing_deleted_intervals = array_filter(
-                $this->getTimeIntervals(),
-                function ($i): bool {
-                    return !$i->takes_place;
-                }
-            );
-        }
-        foreach ($time_intervals as $time_interval) {
-            foreach ($existing_deleted_intervals as $deleted_interval) {
-                if (
-                    $time_interval['begin']->getTimestamp() == $deleted_interval['begin']
-                    && $time_interval['end']->getTimestamp() == $deleted_interval['end']
-                ) {
-                    continue 2;
-                }
-            }
-            $is_locked = $derived_resource->isLocked(
-                $time_interval['begin'],
-                $time_interval['end'],
-                ($this->isNew() ? [] : [$this->id])
-            );
-            if ($is_locked) {
-                if ($time_interval['begin']->format('Ymd') == $time_interval['end']->format('Ymd')) {
-                    $time_interval_overlaps[] = sprintf(
-                        _('Gesperrt im Bereich vom %1$s bis %2$s'),
-                        $time_interval['begin']->format('d.m.Y H:i'),
-                        $time_interval['end']->format('H:i')
-                    );
-                } else {
-                    $time_interval_overlaps[] = sprintf(
-                        _('Gesperrt im Bereich vom %1$s bis zum %2$s'),
-                        $time_interval['begin']->format('d.m.Y H:i'),
-                        $time_interval['end']->format('d.m.Y H:i')
-                    );
-                }
-            } else {
-                $is_assigned = $derived_resource->isAssigned(
-                    $time_interval['begin'],
-                    $time_interval['end'],
-                    ($this->isNew() ? [] : [$this->id])
-                );
-                if ($is_assigned) {
-                    //Find the other booking:
-                    $other_booking = self::findByResourceAndTimeRanges(
-                        $derived_resource,
-                        [$time_interval],
-                        [self::TYPE_NORMAL, self::TYPE_LOCK],
-                        [$this->id]
-                    );
-                    $course = null;
-                    if (
-                        count($other_booking) >= 1
-                        && !empty($other_booking[0]->assigned_course_date->course)
-                    ) {
-                        $course = $other_booking[0]->assigned_course_date->course;
-                    }
-                    if ($time_interval['begin']->format('Ymd') == $time_interval['end']->format('Ymd')) {
-                        if ($course) {
-                            $time_interval_overlaps[] = sprintf(
-                                    _('Gebucht im Bereich vom %1$s bis %2$s durch die Veranstaltung %3$s.'),
-                                    $time_interval['begin']->format('d.m.Y H:i'),
-                                    $time_interval['end']->format('H:i'),
-                                    $course->getFullName()
-                                );
-                        } else {
-                            $time_interval_overlaps[] = sprintf(
-                                _('Gebucht im Bereich vom %1$s bis %2$s'),
-                                $time_interval['begin']->format('d.m.Y H:i'),
-                                $time_interval['end']->format('H:i')
-                            );
-                        }
-                    } else {
-                        if ($course) {
-                            $time_interval_overlaps[] = sprintf(
-                                    _('Gebucht im Bereich vom %1$s bis zum %2$s durch die Veranstaltung %3$s.'),
-                                    $time_interval['begin']->format('d.m.Y H:i'),
-                                    $time_interval['end']->format('d.m.Y H:i'),
-                                    $course->getFullName()
-                                );
-                        } else {
-                            $time_interval_overlaps[] = sprintf(
-                                _('Gebucht im Bereich vom %1$s bis zum %2$s'),
-                                $time_interval['begin']->format('d.m.Y H:i'),
-                                $time_interval['end']->format('d.m.Y H:i')
-                            );
-                        }
-                    }
-                }
-            }
-        }
-        if ($time_interval_overlaps) {
-            throw new ResourceBookingOverlapException(
-                implode(', ', $time_interval_overlaps)
-            );
-        }
-
-        NotificationCenter::postNotification('ResourceBookingWillValidate', $this);
-    }
-
-
-    /**
-     * This method updates the intervals of this resource booking
-     * which are stored in the resource_booking_intervals table.
-     */
-    public function updateIntervals($keep_exceptions = true)
-    {
-        if ($keep_exceptions) {
-            //Delete all intervals with takes_place > 0
-            //and update the time intervals of the exceptions:
-            ResourceBookingInterval::deleteBySql(
-                "booking_id = :booking_id
-                AND
-                takes_place > '0'",
-                [
-                    'booking_id' => $this->id
-                ]
-            );
-
-            //Get all interval exceptions:
-            $exceptions = ResourceBookingInterval::findBySql(
-                "booking_id = :booking_id
-                AND
-                takes_place < '1'",
-                [
-                    'booking_id' => $this->id
-                ]
-            );
-
-            if ($exceptions) {
-                //Now we must compare the time intervals of the booking
-                //with the time intervals of the exceptions.
-                //If there is only a difference in hours we update
-                //the exceptions. Otherwise we delete the exceptions.
-
-                $repetition_interval = $this->getRepetitionInterval();
-                if (!$repetition_interval) {
-                    //No repetition interval also means nothing left to do.
-                    return;
-                }
-
-                $repetition_begin = new DateTime();
-                $repetition_begin->setTimestamp($this->begin - $this->preparation_time);
-                $date_end = new DateTime();
-                $date_end->setTimestamp($this->end);
-                $repetition_end = new DateTime();
-                $repetition_end->setTimestamp($this->repeat_end);
-                $repetition_interval = $this->getRepetitionInterval();
-
-                $duration = $repetition_begin->diff($date_end);
-
-                //Loop over all exceptions and check if they belong to
-                //one of the repetions:
-
-                $obsolete_exception_ids = [];
-                foreach ($exceptions as $exception) {
-                    $exception_begin = new DateTime();
-                    $exception_begin->setTimestamp($exception->begin);
-                    $exception_end = new DateTime();
-                    $exception_end->setTimestamp($exception->end);
-                    $exc_begin_str = $exception_begin->format('Y-m-d');
-                    $exc_end_str = $exception_end->format('Y-m-d');
-
-                    $exception_obsolete = true;
-
-                    $current_repetition = clone $repetition_begin;
-                    while ($current_repetition < $repetition_end) {
-                        $current_end = clone $current_repetition;
-                        $current_end->add($duration);
-
-                        $current_begin_str = $current_repetition->format('Y-m-d');
-                        $current_end_str = $current_end->format('Y-m-d');
-
-                        if ($current_begin_str == $exc_begin_str && $current_end_str == $exc_end_str) {
-                            //We found one exception which needs to be updated.
-                            $exception_obsolete = false;
-                            $exception->begin = $current_repetition->getTimestamp();
-                            $exception->end = $current_end->getTimestamp();
-                            if ($exception->isDirty()) {
-                                $exception->store();
-                            }
-                            //No need to loop the rest of the repetitions:
-                            break;
-                        }
-
-                        $current_repetition->add($repetition_interval);
-                    }
-
-                    if ($exception_obsolete) {
-                        $obsolete_exception_ids[] = $exception->id;
-                    }
-                }
-
-                if ($obsolete_exception_ids) {
-                    ResourceBookingInterval::deleteBySql(
-                        'interval_id IN ( :ids )',
-                        [
-                            'ids' => $obsolete_exception_ids
-                        ]
-                    );
-                }
-            }
-        } else {
-            //We delete all existing intervals for this booking
-            //and re-create them.
-            ResourceBookingInterval::deleteBySql(
-                'booking_id = :booking_id',
-                [
-                    'booking_id' => $this->id
-                ]
-            );
-        }
-
-        ResourceBookingInterval::createFromBooking($this);
-    }
-
-
-    /**
-     * Deletes the ResourceBooking object if there are no
-     * ResourceBookingInterval objects attachted to it.
-     *
-     * @return null|bool If the ResourceBooking object still has
-     *     ResourceBookingInterval objects attachted to it,
-     *     null is returned. Otherwise the return value of the
-     *     SimpleORMap::delete method for the ResourceBooking object
-     *     is returned.
-     */
-    public function deleteIfNoInterval()
-    {
-        $intervals = ResourceBookingInterval::countBySql(
-            'booking_id = :id',
-            [
-                'id' => $this->id
-            ]
-        );
-        if ($intervals == 0) {
-            return $this->delete();
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Deletes all bookings in the time ranges of this resource booking.
-     * Such bookings would prevent saving this booking.
-     *
-     * @return int The amount of deleted bookings.
-     */
-    public function deleteOverlappingBookings()
-    {
-        $end = new DateTime();
-        $end->setTimestamp($this->end);
-        $repetition_end = new DateTime();
-        $repetition_end->setTimestamp($this->repeat_end);
-
-        $deleted_c = 0;
-        if ($this->repetition_interval) {
-            $repetition_interval = $this->getRepetitionInterval();
-
-            if (!$this->repeat_end) {
-                throw new InvalidArgumentException(
-                    _('Es wurde ein Wiederholungsintervall ohne Begrenzung angegeben!')
-                );
-            }
-            if ($this->real_begin > $this->repeat_end) {
-                throw new InvalidArgumentException(
-                    _('Der Startzeitpunkt darf nicht hinter dem Ende der Wiederholungen liegen!')
-                );
-            }
-
-            //Look in each repetition for overlapping bookings and delete them.
-            $current_date = $this->real_begin_dt;
-            while ($current_date <= $repetition_end) {
-                $current_begin = clone $current_date;
-                $current_end = clone $current_date;
-                $current_end->setTime(
-                    intval($end->format('H')),
-                    intval($end->format('i')),
-                    intval($end->format('s'))
-                );
-                $derived_resource = $this->resource->getDerivedClassInstance();
-                if ($derived_resource->userHasPermission($this->booking_user, 'tutor', [$current_begin, $current_end])) {
-                    //Sufficient permissions to delete bookings
-                    //in the time frame.
-                    $delete_sql = 'begin < :end AND end > :begin AND resource_id = :resource_id ';
-                    $sql_params = [
-                        'begin' => $current_begin->getTimestamp(),
-                        'end' => $current_end->getTimestamp(),
-                        'resource_id' => $this->resource->id
-                    ];
-                    if (!$this->isNew()) {
-                        $delete_sql .= 'booking_id <> :booking_id';
-                        $sql_params['booking_id'] = $this->id;
-                    }
-                    $intervals = ResourceBookingInterval::findBySQL(
-                        $delete_sql,
-                        $sql_params
-                    );
-
-                    $affected_bookings = [];
-                    foreach ($intervals as $interval) {
-                        if ($interval->booking instanceof ResourceBooking) {
-                            $affected_bookings[$interval->booking_id] = $interval->booking;
-                        }
-                        $deleted_c += $interval->delete();
-                    }
-
-                    foreach ($affected_bookings as $booking) {
-                        $booking->deleteIfNoInterval();
-                    }
-                }
-                $current_date = $current_date->add($repetition_interval);
-            }
-        } else {
-            $derived_resource = $this->resource->getDerivedClassInstance();
-            if ($derived_resource->userHasPermission($this->booking_user, 'autor', [$this->real_begin_dt, $end])) {
-                $delete_sql = 'begin < :end AND end > :begin AND resource_id = :resource_id ';
-                $sql_params = [
-                    'begin' => $this->real_begin,
-                    'end' => $end->getTimestamp(),
-                    'resource_id' => $this->resource->id
-                ];
-                if (!$this->isNew()) {
-                    $delete_sql .= 'booking_id <> :booking_id';
-                    $sql_params['booking_id'] = $this->id;
-                }
-                $intervals = ResourceBookingInterval::findBySQL(
-                    $delete_sql,
-                    $sql_params
-                );
-                $affected_bookings = [];
-                foreach ($intervals as $interval) {
-                    if ($interval->booking instanceof ResourceBooking) {
-                        $affected_bookings[$interval->booking_id] = $interval->booking;
-                    }
-                    $deleted_c += $interval->delete();
-                }
-
-                foreach ($affected_bookings as $booking) {
-                    $booking->deleteIfNoInterval();
-                }
-            }
-        }
-
-        return $deleted_c;
-    }
-
-
-    /**
-     * Deletes all reservations in the time ranges of this resource booking.
-     *
-     * @return int The amount of deleted reservations.
-     */
-    public function deleteOverlappingReservations()
-    {
-        //Notify all persons who made reservations or who are assigned
-        //to the reservation about the new booking which overwrites
-        //their reservation:
-        $booking_resource = Resource::find($this->resource_id);
-        $booking_user = User::find($this->booking_user_id);
-
-        $deleted_c = 0;
-
-        $template_factory = new Flexi\Factory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-        );
-
-        $affected_reservations =  ResourceBooking::findByResourceAndTimeRanges(
-            $booking_resource,
-            [
-                [
-                    'begin' => $this->real_begin,
-                    'end' => $this->end,
-                ]
-            ],
-            [self::TYPE_RESERVATION, self::TYPE_PLANNED],
-            [$this->id]
-        );
-        foreach ($affected_reservations as $reservation) {
-            if ($reservation->id == $this->id) {
-                continue;
-            }
-            if ($reservation->assigned_user && (
-                $reservation->range_id != $reservation->booking_user_id
-            )) {
-                //Inform the person who is assigned to the reservation:
-                setTempLanguage($reservation->assigned_user->id);
-                $lang_path = getUserLanguagePath($reservation->assigned_user->id);
-
-                $template = $template_factory->open(
-                    $lang_path . '/LC_MAILS/overbooked_reservation.php'
-                );
-                $template->set_attribute('resource', $booking_resource);
-                $template->set_attribute('reservation', $reservation);
-                $template->set_attribute('booking_user', $booking_user);
-                $mail_text = $template->render();
-
-                Message::send(
-                    User::findCurrent()->id,
-                    [$reservation->assigned_user->username],
-                    _('Reservierung überbucht'),
-                    $mail_text
-                );
-
-                restoreLanguage();
-            }
-            if ($reservation->booking_user) {
-                //Inform the person who made the reservation:
-                setTempLanguage($reservation->booking_user->id);
-                $lang_path = getUserLanguagePath($reservation->booking_user->id);
-
-                $template = $template_factory->open(
-                    $lang_path . '/LC_MAILS/overbooked_reservation.php'
-                );
-                $template->set_attribute('resource', $booking_resource);
-                $template->set_attribute('reservation', $reservation);
-                $template->set_attribute('booking_user', $booking_user);
-                $mail_text = $template->render();
-
-                Message::send(
-                    User::findCurrent()->id,
-                    [$reservation->booking_user->username],
-                    _('Reservierung überbucht'),
-                    $mail_text
-                );
-
-                restoreLanguage();
-            }
-
-            //Delete the reservation:
-            $deleted_c += $reservation->delete();
-        }
-        return $deleted_c;
-    }
-
-
-    /**
-     * Determines whether the resource booking ends on the same timestamp
-     * like the lecture time of one of the defined semesters.
-     *
-     * @return True, if the resource booking ends with a semester,
-     *     false otherwise.
-     */
-    public function endsWithSemester()
-    {
-        return Semester::countBySql(
-            '(beginn <= :begin) AND (ende >= :begin)
-             AND vorles_ende = :repeat_end',
-            [
-                'begin' => $this->begin,
-                'repeat_end' => $this->repeat_end
-            ]
-        ) > 0;
-    }
-
-
-    /**
-     * Check if the specified user is the owner of the booking.
-     *
-     * @param User $user The user whose ownership shall be tested.
-     *
-     * @return bool True, if the specified user is the owner of the booking,
-     *     false otherwise.
-     */
-    public function userIsOwner(User $user)
-    {
-        return $this->booking_user_id == $user->id;
-    }
-
-
-    /**
-     * Determines wheter the booking is read only for a specified user.
-     *
-     * @param User $user The user whose permissions shall be checked.
-     *
-     * @return bool True, if the specified user may only perform reading
-     *     actions on the booking, false otherwise.
-     */
-    public function isReadOnlyForUser(User $user)
-    {
-        if ($this->isSimpleBooking()) {
-            //In case it is a simple booking, one has to be
-            //either resource tutor or the owner of the request.
-            if ($this->userIsOwner($user)) {
-                return false;
-            }
-            //Still no answer? Check, if the user is resource tutor.
-            $derived_resource = $this->resource->getDerivedClassInstance();
-            return !$derived_resource->userHasPermission($user, 'tutor');
-        }
-        //Non-simple bookings (course bookings etc.) are always read-only.
-        return true;
-    }
-
-
-    /**
-     * Determines whether this resource booking has a repetition in the
-     * specified time range.
-     * @param DateTime $begin
-     * @param DateTime $end
-     * @return bool True, if the booking has repetitions in the timeframe
-     * specified by $begin and $end, false otherwise.
-     */
-    public function isRepetitionInTimeframe(DateTime $begin, DateTime $end)
-    {
-        return ResourceBookingInterval::countBySql(
-            'booking_id = :booking_id AND begin < :end AND end > :begin',
-            [
-                'booking_id' => $this->id,
-                'begin' => $begin->getTimestamp(),
-                'end' => $end->getTimestamp()
-            ]
-        ) > 0;
-    }
-
-
-    /**
-     * Returns the DateInterval object according to the set repetition
-     * interval of this resource booking object.
-     *
-     * @return DateInterval|null A DateInterval object or null,
-     *     if this booking has no repetition interval.
-     */
-    public function getRepetitionInterval()
-    {
-        $repetition_interval = null;
-        if ($this->repetition_interval) {
-            try {
-                if ($this->repetition_interval instanceof DateInterval) {
-                    $repetition_interval = $this->repetition_interval;
-                } else {
-                    $repetition_interval = new DateInterval($this->repetition_interval);
-                }
-            } catch (Exception $e) {
-                //Invalid repetition interval string.
-                throw new InvalidArgumentException(
-                    sprintf(
-                        _('Das Wiederholungsintervall ist in einem ungültigen Format (%s)!'),
-                        $this->repetition_interval
-                    )
-                );
-            }
-        }
-        return $repetition_interval;
-    }
-
-
-    public function getRepeatModeString()
-    {
-        $interval = $this->getRepetitionInterval();
-
-        if ($interval->m) {
-            switch ($interval->m) {
-                case 1:  return _('jeden Monat');
-                case 2:  return _('jeden zweiten Monat');
-                case 3:  return _('jeden dritten Monat');
-                case 4:  return _('jeden vierten Monat');
-                case 5:  return _('jeden fünften Monat');
-                case 6:  return _('jeden sechsten Monat');
-                case 7:  return _('jeden siebten Monat');
-                case 8:  return _('jeden achten Monat');
-                case 9:  return _('jeden neunten Monat');
-                case 10: return _('jeden zehnten Monat');
-                case 11: return _('jeden elften Monat');
-            }
-        } elseif (($interval->d % 7) == 0) {
-            $week = round($interval->d / 7);
-            switch ($week) {
-                case 1: return _('jede Woche');
-                case 2: return _('jede zweite Woche');
-                case 3: return _('jede dritte Woche');
-            }
-        } elseif ($interval->d) {
-            if ($interval->d > 1) {
-                return sprintf(
-                    _('jeden %d. Tag'),
-                    $interval->d
-                );
-            } elseif ($interval->d == 1) {
-                return _('jeden Tag');
-            } else {
-                return _('ungültiges Zeitintervall');
-            }
-        }
-    }
-
-    /**
-     * Determines if the resource booking overlaps with another
-     * resource booking.
-     *
-     * @return bool True, if there are other bookings which overlap
-     *     with this one, false otherwise.
-     */
-    public function hasOverlappingBookings()
-    {
-        //Get all intervals of this booking, loop over them
-        //and check if there are other intervals in the same
-        //timeframe for the same resource.
-
-        $intervals = ResourceBookingInterval::findBySql(
-            'booking_id = :booking_id',
-            [
-                'booking_id' => $this->id
-            ]
-        );
-
-        if ($intervals) {
-            foreach ($intervals as $interval) {
-                $count = ResourceBookingInterval::countBySql(
-                    'booking_id <> :booking_id
-                    AND
-                    resource_id = :resource_id
-                    AND takes_place = 1
-                    AND
-                    (
-                        begin < :end AND :begin < end
-                    )',
-                    [
-                        'booking_id' => $this->id,
-                        'resource_id' => $this->resource_id,
-                        'begin' => $interval->begin,
-                        'end' => $interval->end
-                    ]
-                );
-
-                if ($count) {
-                    //We have found an interval which overlaps
-                    //with an interval of this booking.
-                    return true;
-                }
-            }
-        }
-
-        //If this booking has no intervals it means it doesn't have
-        //any time intervals at all. Therefore there can't be any
-        //overlapping bookings.
-        return false;
-    }
-
-    /**
-     * Gets the bookings that overlap with this booking.
-     *
-     * @return array Array of ResourceBooking objects
-     */
-    public function getOverlappingBookings()
-    {
-        //Get all intervals of this booking, loop over them
-        //and check if there are other intervals in the same
-        //timeframe for the same resource. If so, collect the
-        //booking-IDs and get all the bookings.
-
-        $intervals = ResourceBookingInterval::findBybooking_id($this->id);
-
-        if ($intervals) {
-            $db = DBManager::get();
-
-            $get_booking_id_stmt = $db->prepare(
-                'SELECT DISTINCT booking_id
-                FROM resource_booking_intervals
-                WHERE
-                booking_id <> :booking_id
-                AND
-                resource_id = :resource_id
-                AND takes_place = 1
-                AND
-                (
-                    begin < :end AND :begin < end
-                )'
-            );
-            $overlapping_booking_ids = [];
-            foreach ($intervals as $interval) {
-                $get_booking_id_stmt->execute(
-                    [
-                        'booking_id' => $this->id,
-                        'resource_id' => $this->resource_id,
-                        'begin' => $interval->begin,
-                        'end' => $interval->end
-                    ]
-                );
-
-                $overlapping_booking_ids = array_merge(
-                    $overlapping_booking_ids,
-                    $get_booking_id_stmt->fetchAll(
-                        PDO::FETCH_COLUMN,
-                        0
-                    )
-                );
-            }
-
-            if ($overlapping_booking_ids) {
-                $overlapping_booking_ids = array_unique(
-                    $overlapping_booking_ids
-                );
-
-                return ResourceBooking::findMany(
-                    $overlapping_booking_ids
-                );
-            }
-        }
-
-        //If this booking has no intervals it means it doesn't have
-        //any time intervals at all. Therefore there can't be any
-        //overlapping bookings.
-        return false;
-    }
-
-
-    /**
-     * Calculates all time intervals as begin and end timestamps
-     * by looking at the repetition settings, if any.
-     *
-     * @param bool $as_datetime Whether to return the timestamps
-     *     as DateTime objects (true) or not (false). Defaults to false.
-     *
-     * @return array A two-dimensional array with each time interval
-     *     for this booking. The array has the following structure:
-     *     [
-     *         [
-     *             'begin' => Begin timestamp.
-     *             'end' => End timestamp.
-     *         ]
-     *     ]
-     */
-    public function calculateTimeIntervals($as_datetime = false)
-    {
-        $interval_data = [];
-        $booking_begin = new DateTime();
-        $booking_begin->setTimestamp($this->begin);
-        if ($this->preparation_time) {
-            $booking_begin->setTimestamp(
-                $this->begin - $this->preparation_time
-            );
-        }
-        $booking_end = new DateTime();
-        $booking_end->setTimestamp($this->end);
-
-        //use begin and end to create the first interval:
-        $interval_data[] = [
-            'begin' => (
-                $as_datetime
-                ? clone $booking_begin
-                : $booking_begin->getTimestamp()
-            ),
-            'end' => (
-                $as_datetime
-                ? clone $booking_end
-                : $booking_end->getTimestamp()
-            )
-        ];
-
-        if ($this->repeat_end) {
-            //Repetition: we must check which repetition interval has been
-            //selected and then create entries for each repetition.
-            //Repetition starts with the begin date and ends with the
-            //"repeat_end" date.
-            $repetition_end = new DateTime();
-            $repetition_end->setTimestamp($this->repeat_end);
-            //The DateInterval constructor will throw an exception,
-            //if it cannot parse the string stored in $this->repetition_interval.
-            $repetition_interval = $this->getRepetitionInterval();
-
-            if ($repetition_interval instanceof DateInterval) {
-                $duration = $booking_begin->diff($booking_end);
-
-                //Check if end is later than begin to avoid
-                //infinite loops.
-                if ($repetition_end > $booking_begin) {
-                    $current_begin = clone $booking_begin;
-                    $current_begin->add($repetition_interval);
-                    while ($current_begin < $repetition_end) {
-                        $current_end = clone $current_begin;
-                        $current_end->add($duration);
-                        $interval_data[] = [
-                            'begin' => (
-                                $as_datetime
-                                ? clone $current_begin
-                                : $current_begin->getTimestamp()
-                            ),
-                            'end' => (
-                                $as_datetime
-                                ? clone $current_end
-                                : $current_end->getTimestamp()
-                            )
-                        ];
-                        $current_begin->add($repetition_interval);
-                    }
-                } else {
-                    //end timestamp is before begin timestamp:
-                    //return an empty array
-                    return [];
-                }
-            }
-            //Everything went fine.
-        }
-        return $interval_data;
-    }
-
-
-    /**
-     * Retrieves all time intervals for this resource booking.
-     *
-     * @return ResourceBookingInterval[] An array of
-     *     ResourceBookingInterval objects.
-     */
-    public function getTimeIntervals($with_exceptions = true)
-    {
-        if ($with_exceptions) {
-            return ResourceBookingInterval::findBySQL(
-                "booking_id = :booking_id
-                ORDER BY begin ASC, end ASC",
-                [
-                    'booking_id' => $this->id
-                ]
-            );
-        } else {
-            return ResourceBookingInterval::findBySQL(
-                "booking_id = :booking_id AND takes_place = '1'
-                ORDER BY begin ASC, end ASC",
-                [
-                    'booking_id' => $this->id
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * Retrieves all time intervals for this resource booking
-     * in a specified time range.
-     *
-     * @param DateTime $begin The begin of the time range.
-     * @param DateTime $end The end of the time range.
-     *
-     * @return ResourceBookingInterval[] An array of
-     *     ResourceBookingInterval objects.
-     */
-    public function getTimeIntervalsInTimeRange(DateTime $begin, DateTime $end)
-    {
-        if ($begin > $end) {
-            //We don't serve querys with invalid time ranges here.
-            return [];
-        }
-
-        return ResourceBookingInterval::findBySql(
-            'booking_id = :booking_id AND begin < :end AND end > :begin ORDER BY begin, end',
-            [
-                'booking_id' => $this->id,
-                'begin' => $begin->getTimestamp(),
-                'end' => $end->getTimestamp()
-            ]
-        );
-    }
-
-
-    /**
-     * Returns all allocating users: Users who are associated with this booking
-     * through a request or a course date for which this booking has been made
-     * (all allocating users). If no user could be determined but the booking
-     * is bound to a course, the course name is returned instead.
-     *
-     * @deprecated
-     * @param bool $only_names Whether only the names of these users shall be
-     *     returned (true) or user objects shall be returned (false).
-     *
-     * @return string[]|User[] Depending on the value of the $only_names
-     *     parameter a string array or an user object array is returned.
-     *     In case no user can be found, the array is empty.
-     *     In case the parameter $only_names is set to true, the result
-     *     may also contain a course name, if no users can be found but the
-     *     booking is bound to a course.
-     */
-    public function getAssignedUsers($only_names = true)
-    {
-        //The only two cases which shall be handled are that
-        //a booking is assigned to a course or an user.
-        if ($this->getAssignedUserType() === 'course') {
-            //Return all persons associated with that course date.
-            if (count($this->assigned_course_date->dozenten)) {
-                if ($only_names) {
-                    $lecturers = [];
-                    foreach ($this->assigned_course_date->dozenten as $lecturer) {
-                        $lecturers[] = $lecturer->getFullName();
-                    }
-                    return $lecturers;
-                } else {
-                    return $this->assigned_course_date->dozenten;
-                }
-            } else {
-                $lecturers = User::findBySql(
-                    "INNER JOIN seminar_user
-                    USING (user_id)
-                    WHERE
-                    seminar_user.seminar_id = :course_id
-                    AND
-                    seminar_user.status = 'dozent'
-                    ORDER BY nachname ASC, vorname ASC",
-                    [
-                        'course_id' => $this->assigned_course_date->range_id
-                    ]
-                );
-                if (!$lecturers) {
-                    return [];
-                }
-                if ($only_names) {
-                    $names = [];
-                    foreach ($lecturers as $lecturer) {
-                        $names[] = $lecturer->getFullName();
-                    }
-                    return $names;
-                } else {
-                    return $lecturers;
-                }
-            }
-        } elseif ($this->getAssignedUserType() === 'user') {
-            if ($only_names) {
-                return [$this->assigned_user->getFullName()];
-            }
-            return [$this->assigned_user];
-        }
-
-        return [];
-    }
-
-    public function getAssignedUser()
-    {
-        if ($this->getAssignedUserType() === 'course') {
-            return $this->assigned_course_date->course;
-        }
-        if ($this->getAssignedUserType() === 'user') {
-            return $this->assigned_user;
-        }
-    }
-
-    public function getAssignedUserType()
-    {
-        if (isset($this->assigned_user_type)) {
-            return $this->assigned_user_type;
-        }
-        if ($this->assigned_course_date instanceof CourseDate) {
-            return $this->assigned_user_type = 'course';
-        }
-        if ($this->assigned_user instanceof User) {
-            return $this->assigned_user_type = 'user';
-        }
-        return $this->assigned_user_type = 'none';
-    }
-
-    public function getAssignedUserName()
-    {
-        $name = '';
-        if ($this->getAssignedUserType() === 'course') {
-            $name = $this->assigned_course_date->course->getFullName();
-            $name .= ' (' . implode(',', $this->assigned_course_date->course->getMembersWithStatus('dozent', true)->limit(3)->getValue('nachname')) . ')';
-        } elseif ($this->getAssignedUserType() === 'user') {
-            if (get_visibility_by_id($this->assigned_user->id) ||
-                ($this->assigned_user->id == $GLOBALS['user']->id)
-            ) {
-                $name = $this->assigned_user->getFullName();
-                if ($this->description) {
-                    $name .= " \n" . $this->description;
-                }
-            } else {
-                //Check if the current user has at least user permissions
-                //on the resource. In that case, even invisible assigned
-                //users become visible.
-                $resource = $this->resource->getDerivedClassInstance();
-                $current_user = User::findCurrent();
-                if (($resource instanceof Resource) && ($current_user instanceof User)) {
-                    if ($resource->userHasPermission($current_user, 'user')) {
-                        $name = $this->assigned_user->getFullName();
-                        if ($this->description) {
-                            $name .= " \n" . $this->description;
-                        }
-                    }
-                }
-            }
-        } else {
-            $name = $this->description;
-        }
-        return $name;
-    }
-
-
-    /**
-     * Determines whether the booking is a simple booking
-     * that is not bound to course dates or similar Stud.IP objects.
-     */
-    public function isSimpleBooking()
-    {
-        return !($this->getAssignedUserType() === 'course');
-    }
-
-
-    /**
-     * Determins whether the booking has exceptions in repetitions or not.
-     * When the booking is bound to a course via a CourseDate instance,
-     * the exceptions are looked up using the corresponding metadate (if any).
-     * If a metadate exists to the course date and it has cancelled dates
-     * (metadate has CourseExDate instances assigned) then the booking has
-     * exceptions.
-     * If the booking is a simple booking, the exception status is determined
-     * by checking if the booking has ResourceBookingInterval instances
-     * that don't take place assigned to it. This is only checked,
-     * if a repetition interval is set for the booking so that such instances
-     * can exist.
-     *
-     * @return bool True, if the booking has exceptions in the repetition,
-     *     false otherwise.
-     */
-    public function hasExceptions()
-    {
-        if ($this->isSimpleBooking()) {
-            //This is a simple booking: Check the repetition interval:
-            if ($this->repetition_interval) {
-                //A repetition interval exists: Check if booking intervals
-                //exist that don't take place:
-                return ResourceBookingInterval::countBySql(
-                    "booking_id = :booking_id
-                    AND takes_place = '0'",
-                    [
-                        'booking_id' => $this->id
-                    ]
-                ) > 0;
-            } else {
-                return false;
-            }
-        } else {
-            //Check if the course booking has exceptions (via metadate):
-            $metadate = $this->assigned_course_date->cycle;
-            if ($metadate instanceof SeminarCycleDate) {
-                //Check if the metadate has exceptions:
-                return CourseExDate::countBySql(
-                    'metadate_id = :metadate_id',
-                    [
-                        'metadate_id' => $metadate->id
-                    ]
-                ) > 0;
-            } else {
-                //No metadate is assigned to the course booking.
-                return false;
-            }
-        }
-    }
-
-
-    public function __toString()
-    {
-        return date('d.m.Y H:i', $this->begin)
-             . ' - '
-             . date('d.m.Y H:i', $this->end);
-    }
-
-
-    public function getTimeIntervalStrings()
-    {
-        $time_intervals = ResourceBookingInterval::findBySQL(
-            'booking_id = :booking_id ORDER BY begin ASC, end ASC',
-            [
-                'booking_id' => $this->id
-            ]
-        );
-
-        $strings = [];
-        foreach ($time_intervals as $interval) {
-            if (date('Ymd', $interval->begin) == date('Ymd', $interval->end)) {
-                $strings[] = sprintf(
-                    '%1$s %2$s - %3$s',
-                    date('d.m.Y', $interval->begin),
-                    date('H:i', $interval->begin),
-                    date('H:i', $interval->end)
-                );
-            } else {
-                $strings[] = sprintf(
-                    '%1$s - %2$s',
-                    date('d.m.Y H:i', $interval->begin),
-                    date('d.m.Y H:i', $interval->end)
-                );
-            }
-        }
-        return $strings;
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $user = User::find($storage->user_id);
-        $bookings = self::findBySql(
-            'user_id = :user_id ORDER BY mkdate',
-            [
-                'user_id' => $storage->user_id
-            ]
-        );
-
-        $rows = [];
-        foreach ($bookings as $booking) {
-            $rows[] = $booking->toRawArray();
-        }
-        $storage->addTabularData(
-            _('Buchungen von Ressourcen'),
-            'resource_bookings',
-            $rows,
-            $user
-        );
-    }
-
-
-    public function convertToEventData(array $time_intervals, $user)
-    {
-        $booking_plan_booking_bg =
-            \ColourValue::find('Resources.BookingPlan.Booking.Bg');
-        $booking_plan_booking_fg =
-            \ColourValue::find('Resources.BookingPlan.Booking.Fg');
-        $booking_plan_simple_booking_with_exceptions_bg =
-            ColourValue::find('Resources.BookingPlan.SimpleBookingWithExceptions.Bg');
-        $booking_plan_simple_booking_with_exceptions_fg =
-            ColourValue::find('Resources.BookingPlan.SimpleBookingWithExceptions.Fg');
-        $booking_plan_reservation_bg = \ColourValue::find('Resources.BookingPlan.Reservation.Bg');
-        $booking_plan_reservation_fg = \ColourValue::find('Resources.BookingPlan.Reservation.Fg');
-        $booking_plan_lock_bg = \ColourValue::find('Resources.BookingPlan.Lock.Bg');
-        $booking_plan_lock_fg = \ColourValue::find('Resources.BookingPlan.Lock.Fg');
-        $booking_plan_planned_booking_bg = \ColourValue::find('Resources.BookingPlan.PlannedBooking.Bg');
-        $booking_plan_planned_booking_fg = \ColourValue::find('Resources.BookingPlan.PlannedBooking.Fg');
-        $booking_plan_preparation_bg = \ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
-        $booking_plan_preparation_fg = \ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
-        $booking_plan_course_booking_bg = \ColourValue::find('Resources.BookingPlan.CourseBooking.Bg');
-        $booking_plan_course_booking_fg = \ColourValue::find('Resources.BookingPlan.CourseBooking.Fg');
-
-        $colour = $booking_plan_booking_bg->__toString();
-        $text_colour = $booking_plan_booking_fg->__toString();
-        $event_classes = [];
-
-        if ($this->booking_type == self::TYPE_NORMAL) {
-            $event_classes[] = 'resource-booking';
-            //Check if the booking is a course booking:
-            if ($this->getAssignedUserType() === 'course') {
-                //It is a course date.
-                $event_classes[] = 'for-course';
-                $colour = $booking_plan_course_booking_bg->__toString();
-                $text_colour = $booking_plan_course_booking_fg->__toString();
-            }
-        } elseif ($this->booking_type == self::TYPE_RESERVATION) {
-            $event_classes[] = 'resource-reservation';
-            $colour = $booking_plan_reservation_bg->__toString();
-            $text_colour = $booking_plan_reservation_fg->__toString();
-        } elseif ($this->booking_type == self::TYPE_LOCK) {
-            $event_classes[] = 'resource-lock';
-            $colour = $booking_plan_lock_bg->__toString();
-            $text_colour = $booking_plan_lock_fg->__toString();
-        } elseif ($this->booking_type == self::TYPE_PLANNED) {
-            $event_classes[] = 'resource-planned-booking';
-            $colour = $booking_plan_planned_booking_bg->__toString();
-            $text_colour = $booking_plan_planned_booking_fg->__toString();
-        }
-
-        $booking_is_editable = false;
-        if ($user instanceof User) {
-            $booking_is_editable = !$this->isReadOnlyForUser($user);
-        }
-
-        $booking_api_urls = [];
-        $booking_view_urls = [
-            'show' => \URLHelper::getURL(
-                'dispatch.php/resources/booking/index/'
-                . $this->id
-            ),
-        ];
-        if ($booking_is_editable) {
-            $booking_view_urls['edit'] = \URLHelper::getURL(
-                'dispatch.php/resources/booking/edit/'
-                . $this->id
-            );
-        }
-        $events = [];
-
-        foreach ($time_intervals as $interval) {
-            $real_begin = $interval['begin'];
-            if ($this->preparation_time) {
-                $real_begin += $this->preparation_time;
-                $begin = new DateTime();
-                $begin->setTimestamp($interval['begin']);
-                $end = new DateTime();
-                $end->setTimestamp($real_begin);
-                $events[] = new Studip\Calendar\EventData(
-                    $begin,
-                    $end,
-                    _('Rüstzeit'),
-                    ['preparation-time'],
-                    $booking_plan_preparation_fg->__toString(),
-                    $booking_plan_preparation_bg->__toString(),
-                    $booking_is_editable,
-                    'ResourceBookingInterval',
-                    $interval->id,
-                    'ResourceBooking',
-                    $this->id,
-                    'Resource',
-                    $this->resource_id,
-                    $booking_view_urls
-                );
-            }
-
-            $event_title = '';
-            $icon = '';
-
-            if ($user instanceof User) {
-                $derived_resource = $this->resource->getDerivedClassInstance();
-                if ($derived_resource->userHasPermission($user, 'user') && $this->internal_comment) {
-                    $icon = 'chat2';
-                }
-            }
-
-            if (!$this->isSimpleBooking()) {
-                if ($this->assigned_course_date->metadate_id) {
-                    $icon = 'refresh';
-                }
-            } elseif ($this->repeat_end > $this->end) {
-                $icon = 'refresh';
-            }
-
-            if ($this->assigned_course_date instanceof CourseDate) {
-                $course = $this->assigned_course_date->course;
-                if ($course instanceof Course) {
-                    $has_perms = $GLOBALS['perm']->have_studip_perm('user', $course->id, $user->id);
-                    $vis_perms = $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM, $user->id);
-                    if ($has_perms || $vis_perms || $course->visible) {
-                        $event_title = $this->getAssignedUserName();
-                    }
-                }
-            } else {
-                $event_title = $this->getAssignedUserName();
-            }
-
-            $interval_api_urls = $booking_api_urls;
-            if ($booking_is_editable) {
-                //A note on the move URL:
-                //When used in a room group booking plan, the interval_id
-                //URL parameter is subject to modification in JavaScript.
-                //(lib/resources.js, method dropEventInRoomGroupBookingPlan)
-                $interval_api_urls = [
-                    'resize' => \URLHelper::getURL(
-                        'api.php/resources/booking/'
-                      . $this->id . '/move',
-                        [
-                            'quiet' => '1',
-                            'interval_id' => $interval->id
-                        ]
-                    ),
-                    'move' => \URLHelper::getURL(
-                        'api.php/resources/booking/'
-                      . $this->id . '/move',
-                        [
-                            'quiet' => '1',
-                            'interval_id' => $interval->id
-                        ]
-                    )
-                ];
-            }
-            $begin = new DateTime();
-            $begin->setTimestamp($real_begin);
-            $end = new DateTime();
-            $end->setTimestamp($interval['end']);
-            $events[] = new Studip\Calendar\EventData(
-                $begin,
-                $end,
-                $event_title,
-                $event_classes,
-                $text_colour,
-                $colour,
-                $booking_is_editable,
-                'ResourceBookingInterval',
-                $interval->id,
-                'ResourceBooking',
-                $this->id,
-                'Resource',
-                $this->resource_id,
-                $booking_view_urls,
-                $interval_api_urls,
-                $icon
-            );
-        }
-
-        return $events;
-    }
-
-
-    public function getAllEventData()
-    {
-        return $this->convertToEventData(
-            $this->getTimeIntervals(false),
-            User::findCurrent()
-        );
-    }
-
-
-    public function getEventDataForTimeRange(DateTime $begin, DateTime $end)
-    {
-
-        return $this->getFilteredEventData(null, null, null, $begin, $end);
-    }
-
-
-    public function getFilteredEventData(
-        $user_id = null,
-        $range_id = null,
-        $range_type = null,
-        $begin = null,
-        $end = null
-    )
-    {
-        $sql = "booking_id = :booking_id AND takes_place = 1 ";
-        $sql_array = [
-            'booking_id' => $this->id
-        ];
-
-        if ($begin && $end) {
-            if ($begin instanceof DateTime) {
-                $begin = $begin->getTimestamp();
-            }
-            if ($end instanceof DateTime) {
-                $end = $end->getTimestamp();
-            }
-            $sql .= "AND begin < :end AND :begin < end";
-            $sql_array['begin'] = $begin;
-            $sql_array['end'] = $end;
-        }
-        $time_intervals = ResourceBookingInterval::findBySQL(
-            $sql,
-            $sql_array
-        );
-
-        $user = null;
-        if ($user_id) {
-            $user = User::find($user_id);
-        } else {
-            $user = User::findCurrent();
-        }
-
-        return $this->convertToEventData($time_intervals, $user);
-    }
-
-    /**
-     * @return string
-     */
-    public function getRepetitionType()
-    {
-        if ($this->getAssignedUserType() === 'course') {
-            if ($this->assigned_course_date->metadate_id) {
-                return 'weekly';
-            } else {
-                return 'single';
-            }
-        } else {
-            $intervall = $this->getRepetitionInterval();
-            if (!$intervall) {
-                return 'single';
-            }
-            if ($intervall->m) {
-                return 'monthly';
-            }
-            if ($intervall->d % 7 === 0) {
-                return 'weekly';
-            }
-            if ($intervall->d) {
-                return 'daily';
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Sends a notification that the booking has been deleted
-     * to the user that created the booking.
-     */
-    public function sendDeleteNotification()
-    {
-        if ($this->booking_type != self::TYPE_NORMAL) {
-            //We only handle real bookings in this method.
-            return;
-        }
-
-        if ($this->end < time()) {
-            //Bookings that lie in the past can be deleted without
-            //sending notifications.
-            return;
-        }
-
-        $booking_resource = Resource::find($this->resource_id);
-        $booking_user = User::find($this->booking_user_id);
-        $booking_course = null;
-        if ($this->course_id) {
-            $booking_course = Course::find($this->course_id);
-        }
-        if (!$booking_resource || !$booking_user) {
-            //Nothing we can do here.
-            return;
-        }
-        if (User::findCurrent()->id === $booking_user->id) {
-            return;
-        }
-
-        $template_factory = new Flexi\Factory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-        );
-        setTempLanguage($booking_user->id);
-        $lang_path = getUserLanguagePath($booking_user->id);
-
-        $template = $template_factory->open(
-            $lang_path . '/LC_MAILS/delete_booking_notification.php'
-        );
-        $template->set_attribute('resource', $booking_resource->getDerivedClassInstance());
-        $template->set_attribute('begin', $this->begin);
-        $template->set_attribute('end', $this->end);
-        $template->set_attribute('deleting_user', User::findCurrent());
-        $template->set_attribute('booking_course', $booking_course);
-
-        $mail_text = $template->render();
-
-        Message::send(
-            User::findCurrent()->id,
-            [$booking_user->username],
-            _('Ihre Buchung wurde gelöscht'),
-            $mail_text
-        );
-
-        restoreLanguage();
-    }
-}
diff --git a/lib/models/resources/ResourceBooking.php b/lib/models/resources/ResourceBooking.php
new file mode 100644
index 0000000..fadf92f
--- /dev/null
+++ b/lib/models/resources/ResourceBooking.php
@@ -0,0 +1,1946 @@
+<?php
+
+/**
+ * ResourceBooking.class.php - model class for resource bookings
+ *
+ * The ResourceBooking class is responsible for storing
+ * bookings of resources in a specified time range
+ * or a time interval.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * The repetition_interval column contains a date interval string in a
+ * format that is accepted by the DateInterval class constructor.
+ * Examples for values of the repetition_interval column:
+ * - For an one month interval, the value is "P1M".
+ * - For an interval of two days, the value is "P2D".
+ * See the DateInterval documentation for more examples:
+ * https://secure.php.net/manual/en/class.dateinterval.php
+ *
+ * @property string $id database column
+ * @property string $resource_id database column
+ * @property string $range_id database column
+ * @property string|null $description database column
+ * @property int $begin database column
+ * @property int $end database column
+ * @property int|null $repeat_end database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property string|null $internal_comment database column
+ * @property int $preparation_time database column
+ * @property int $booking_type database column
+ * @property string $booking_user_id database column
+ * @property string $repetition_interval database column
+ * @property SimpleORMapCollection|ResourceBookingInterval[] $time_intervals has_many ResourceBookingInterval
+ * @property Resource $resource belongs_to Resource
+ * @property User $assigned_user belongs_to User
+ * @property CourseDate $assigned_course_date belongs_to CourseDate
+ * @property User $booking_user belongs_to User
+ * @property mixed $course_id additional field
+ * @property mixed $room_name additional field
+ * @property-read mixed $real_begin additional field
+ * @property-read mixed $real_begin_dt additional field
+ */
+class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calendar\EventSource
+{
+    const TYPE_NORMAL = 0;
+    const TYPE_RESERVATION = 1;
+    const TYPE_LOCK = 2;
+    const TYPE_PLANNED = 3;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_bookings';
+
+        $config['belongs_to']['resource'] = [
+            'class_name' => Resource::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func' => 'find'
+        ];
+        $config['belongs_to']['assigned_user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'range_id',
+            'assoc_func' => 'find'
+        ];
+        $config['belongs_to']['assigned_course_date'] = [
+            'class_name' => CourseDate::class,
+            'foreign_key' => 'range_id',
+            'assoc_func' => 'find'
+        ];
+        $config['has_many']['time_intervals'] = [
+            'class_name' => ResourceBookingInterval::class,
+            'assoc_foreign_key' => 'booking_id',
+            'on_delete' => 'delete'
+        ];
+        $config['belongs_to']['booking_user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'booking_user_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['additional_fields']['course_id'] = ['assigned_course_date', 'range_id'];
+        $config['additional_fields']['room_name'] = ['resource', 'name'];
+
+        $config['additional_fields']['real_begin'] = [
+            'get' => function (ResourceBooking $booking) {
+                return $booking->begin - $booking->preparation_time;
+            }
+        ];
+        $config['additional_fields']['real_begin_dt'] = [
+            'get' => function (ResourceBooking $booking) {
+                $real_begin = new DateTime();
+                $real_begin->setTimestamp($booking->real_begin);
+                return $real_begin;
+            }
+        ];
+
+        $config['registered_callbacks']['after_store'][] = 'updateIntervals';
+        $config['registered_callbacks']['after_store'][] = 'createStoreLogEntry';
+        $config['registered_callbacks']['after_delete'][] = 'sendDeleteNotification';
+        $config['registered_callbacks']['after_delete'][] = 'createDeleteLogEntry';
+
+        //In regard to TIC 6460:
+        //As long as TIC 6460 is not implemented, we must add the validate
+        //method as a callback before storing the object.
+        if (!method_exists('SimpleORMap', 'validate')) {
+            $config['registered_callbacks']['before_store'][] = 'validate';
+        }
+
+        parent::configure($config);
+    }
+
+    private $assigned_user_type;
+
+    public function createStoreLogEntry()
+    {
+        if ($this->isSimpleBooking()) {
+            StudipLog::log(
+                'RES_ASSIGN_SINGLE',
+                $this->resource_id,
+                null,
+                $this->__toString(),
+                null,
+                $GLOBALS['user']->id
+            );
+        } else {
+            StudipLog::log(
+                'RES_ASSIGN_SEM',
+                $this->resource_id,
+                $this->course_id,
+                $this->__toString(),
+                null,
+                $GLOBALS['user']->id
+            );
+        }
+    }
+
+
+    public function createDeleteLogEntry()
+    {
+        if ($this->isSimpleBooking()) {
+            StudipLog::log(
+                'RES_ASSIGN_DEL_SINGLE',
+                $this->resource_id,
+                null,
+                $this->__toString(),
+                null,
+                $GLOBALS['user']->id
+            );
+        } else {
+            StudipLog::log(
+                'RES_ASSIGN_DEL_SEM',
+                $this->resource_id,
+                $this->course_id,
+                $this->__toString(),
+                null,
+                $GLOBALS['user']->id
+            );
+        }
+    }
+
+
+    /**
+     * Internal method that generated the SQL query used in
+     * findByResourceAndTimeRanges and countByResourceAndTimeRanges.
+     *
+     * @see findByResourceAndTimeRanges
+     * @inheritDoc
+     */
+    protected static function buildResourceAndTimeRangesSqlQuery(
+        Resource $resource,
+        $time_ranges = [],
+        $booking_types = [],
+        $excluded_booking_ids = []
+    )
+    {
+        if (!is_array($time_ranges)) {
+            throw new InvalidArgumentException(
+                _('Es wurde keine Liste mit Zeiträumen angegeben!')
+            );
+        }
+
+        //Check the array:
+        foreach ($time_ranges as $time_range) {
+            if ($time_range['begin'] > $time_range['end']) {
+                throw new InvalidArgumentException(
+                    _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+                );
+            }
+
+            if ($time_range['begin'] == $time_range['end']) {
+                throw new InvalidArgumentException(
+                    _('Startzeitpunkt und Endzeitpunkt dürfen nicht identisch sein!')
+                );
+            }
+        }
+
+        $sql_params = [
+            'resource_id' => $resource->id
+        ];
+
+        //First we build the SQL snippet for the case that the $booking_type
+        //variable is set to something different than null.
+        $booking_type_sql = '';
+        if (is_array($booking_types) && count($booking_types)) {
+            $booking_type_sql = ' AND booking_type IN ( :booking_types )';
+            $sql_params['booking_types'] = $booking_types;
+        }
+
+        //Then we build the snippet for excluded booking IDs, if specified.
+        $excluded_booking_ids_sql = '';
+        if (is_array($excluded_booking_ids) && count($excluded_booking_ids)) {
+            $excluded_booking_ids_sql = ' AND resource_booking_intervals.booking_id NOT IN ( :excluded_ids ) ';
+            $sql_params['excluded_ids'] = $excluded_booking_ids;
+        }
+
+        //Now we build the SQL snippet for the time intervals.
+        //These are repeated four times in the query below.
+        //First we use one template ($time_sql_template) and
+        //replace NUMBER with our counting variable $i.
+        //BEGIN and END are replaced below since the columns for
+        //BEGIN and END are different in the four cases where we
+        //repeat the SQL snippet for the time intervals.
+        $time_sql_template = '
+            (resource_booking_intervals.begin < :endNUMBER AND :beginNUMBER < resource_booking_intervals.end)
+            ';
+
+        $time_sql = '';
+        if ($time_ranges) {
+            $time_sql = ' AND (';
+
+            $i = 1;
+            foreach ($time_ranges as $time_range) {
+                if ($i > 1) {
+                    $time_sql .= ' OR ';
+                }
+                $time_sql .= str_replace(
+                    'NUMBER',
+                    $i,
+                    $time_sql_template
+                );
+
+                if ($time_range['begin'] instanceof DateTime) {
+                    $sql_params[('begin' . $i)] = $time_range['begin']->getTimestamp();
+                } else {
+                    $sql_params[('begin' . $i)] = $time_range['begin'];
+                }
+                if ($time_range['end'] instanceof DateTime) {
+                    $sql_params[('end' . $i)] = $time_range['end']->getTimestamp();
+                } else {
+                    $sql_params[('end' . $i)] = $time_range['end'];
+                }
+
+                $i++;
+            }
+
+            $time_sql .= ') ';
+        }
+
+        //Check if the booking has a start and end timestamp set
+        //or if it has repetitions that have a matching timestamp.
+        //This is done in the rest of the SQL query:
+
+        $whole_sql = "resource_bookings.id IN (
+                    SELECT resource_booking_intervals.booking_id FROM resource_booking_intervals WHERE
+                    resource_booking_intervals.resource_id = :resource_id
+                    AND resource_booking_intervals.takes_place = 1"
+                    . $excluded_booking_ids_sql
+                    . $time_sql
+                    . " GROUP BY resource_booking_intervals.booking_id ORDER BY NULL)
+                    $booking_type_sql
+";
+
+        return [
+            'sql' => $whole_sql,
+            'params' => $sql_params
+        ];
+    }
+
+
+    /**
+     * Retrieves all resource booking for the given resource and
+     * time range. By default, all booking are returned.
+     * To get only bookings of a certain type
+     * set the $booking_type parameter.
+     *
+     * @param Resource $resource The resource whose requests shall be retrieved.
+     * @param array $time_ranges An array with time ranges as DateTime objects.
+     *     The array has the following structure:
+     *     [
+     *         [
+     *             'begin' => begin timestamp,
+     *             'end' => end timestamp
+     *         ],
+     *         ...
+     *     ]
+     * @param array $booking_types An optional specification for the
+     *     booking_type column in the database. More than one booking
+     *     type can be specified.
+     *     By default this is set to an empty array which means
+     *     that resource booking are not filtered by the type column.
+     *     The allowed resource booking types are specified in the
+     *     class documentation.
+     *
+     * @param array $excluded_booking_ids An array of strings representing
+     *     resource booking IDs. IDs specified in this array are excluded
+     *     from the search.
+     * @return ResourceBooking[] An array of ResourceRequest objects.
+     *     If no requests can be found, the array is empty.
+     *
+     * @throws InvalidArgumentException, if the time ranges are either not in an
+     *     array matching the format description from above or if one of the
+     *     following conditions is met in one of the time ranges:
+     *     - begin > end
+     *     - begin == end
+     */
+    public static function findByResourceAndTimeRanges(
+        Resource $resource,
+        $time_ranges = [],
+        $booking_types = [],
+        $excluded_booking_ids = []
+    )
+    {
+        //Build the SQL query and the parameter array.
+
+        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
+            $resource,
+            $time_ranges,
+            $booking_types,
+            $excluded_booking_ids
+        );
+
+        //Call findBySql:
+        return self::findBySql($sql_data['sql'], $sql_data['params']);
+    }
+
+
+    /**
+     * Counts all resource bookings for the specified resource and
+     * time range. By default, all bookings are counted.
+     * To count only bookings of a certain type
+     * set the $booking_type parameter.
+     *
+     * @see findByResourceAndTimeRanges
+     * @inheritDoc
+     */
+    public static function countByResourceAndTimeRanges(
+        Resource $resource,
+        $time_ranges = [],
+        $booking_types = [],
+        $excluded_booking_ids = []
+    )
+    {
+        //Build the SQL query and the parameter array.
+
+        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
+            $resource,
+            $time_ranges,
+            $booking_types,
+            $excluded_booking_ids
+        );
+
+        //Call countBySql:
+        return self::countBySql($sql_data['sql'], $sql_data['params']);
+    }
+
+
+    /**
+     * Deletes all resource bookings for the specified resource and
+     * time range. By default, all bookings are counted.
+     * To count only bookings of a certain type
+     * set the $booking_type parameter.
+     *
+     * @see findByResourceAndTimeRanges
+     * @inheritDoc
+     */
+    public static function deleteByResourceAndTimeRanges(
+        Resource $resource,
+        $time_ranges = [],
+        $booking_types = [],
+        $excluded_booking_ids = []
+    )
+    {
+        //Build the SQL query and the parameter array.
+        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
+            $resource,
+            $time_ranges,
+            $booking_types,
+            $excluded_booking_ids
+        );
+
+        //Call deleteBySql:
+        return self::deleteBySql($sql_data['sql'], $sql_data['params']);
+    }
+
+
+    /**
+     * The SimpleORMap::store method is overloaded to allow forced booking
+     * of resource bookings, meaning that all other bookings of the
+     * resource of a booking are deleted when they overlap with this booking.
+     *
+     * @param bool $force_booking Whether booking shall be forced (true)
+     *     or not (false). Defaults to false.
+     * @return bool
+     */
+    public function store($force_booking = false)
+    {
+        if ($force_booking == true) {
+            $this->deleteOverlappingBookings();
+        }
+        $this->deleteOverlappingReservations();
+
+        if (parent::store()) {
+            //Check if the booking is bound to a course date.
+            //If this is the case, check for existing bookings
+            //and delete them, so that there is only one booking
+            //for a course date:
+            $course_date_exists = CourseDate::exists($this->range_id);
+            if ($course_date_exists) {
+                self::deleteBySql(
+                    'range_id = :range_id AND id <> :this_id',
+                    [
+                        'this_id' => $this->id,
+                        'range_id' => $this->range_id
+                    ]
+                );
+            }
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * This validation method is called before storing an object.
+     */
+    public function validate()
+    {
+        if ((!$this->resource_id) || !($this->resource instanceof Resource)) {
+            throw new InvalidArgumentException(
+                _('Es wurde keine Ressource zur Buchung angegeben!')
+            );
+        }
+
+        if (!$this->range_id && !$this->description) {
+            throw new ResourceBookingRangeException(
+                _('Es muss eine Person oder ein Text zur Buchung eingegeben werden!')
+            );
+        }
+
+        if ($this->begin >= $this->end) {
+            throw new InvalidArgumentException(
+                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+            );
+        }
+
+        if ($this->repetition_interval) {
+            if (!$this->repeat_end) {
+                throw new InvalidArgumentException(
+                    _('Es wurde ein Wiederholungsintervall ohne Begrenzung angegeben!')
+                );
+            }
+            if ($this->real_begin > $this->repeat_end) {
+                throw new InvalidArgumentException(
+                    _('Der Startzeitpunkt darf nicht hinter dem Ende der Wiederholungen liegen!')
+                );
+            }
+        }
+
+        // update the booking user
+        if (!$this->isNew() || !$this->booking_user_id) {
+            $this->booking_user = User::findCurrent();
+        }
+
+        $derived_resource = $this->resource->getDerivedClassInstance();
+
+        // check if the user needs booking rights on the resource
+        if (
+            $this->isFieldDirty('resource_id')
+            || $this->isFieldDirty('repetition_interval')
+            || $this->begin < $this->getPristineValue('begin')
+            || $this->end > $this->getPristineValue('end')
+            || $this->preparation_time > $this->getPristineValue('preparation_time')
+            || $this->repeat_end > $this->getPristineValue('repeat_end')
+        ) {
+
+            //Check if the user has booking rights on the resource.
+            //The user must have either permanent permissions or they have to
+            //have booking rights by a temporary permission in this moment
+            $user_has_booking_rights = $derived_resource->userHasBookingRights(
+                $this->booking_user, $this->begin, $this->end
+            );
+            if (!$user_has_booking_rights) {
+                throw new ResourcePermissionException(
+                    sprintf(
+                        _('Unzureichende Berechtigungen zum Buchen der Ressource %s!'),
+                        $this->resource->name
+                    )
+                );
+            }
+        }
+
+        $time_intervals = $this->calculateTimeIntervals(true);
+        $time_interval_overlaps = [];
+        $existing_deleted_intervals = [];
+        if (!$this->isNew()) {
+            $existing_deleted_intervals = array_filter(
+                $this->getTimeIntervals(),
+                function ($i): bool {
+                    return !$i->takes_place;
+                }
+            );
+        }
+        foreach ($time_intervals as $time_interval) {
+            foreach ($existing_deleted_intervals as $deleted_interval) {
+                if (
+                    $time_interval['begin']->getTimestamp() == $deleted_interval['begin']
+                    && $time_interval['end']->getTimestamp() == $deleted_interval['end']
+                ) {
+                    continue 2;
+                }
+            }
+            $is_locked = $derived_resource->isLocked(
+                $time_interval['begin'],
+                $time_interval['end'],
+                ($this->isNew() ? [] : [$this->id])
+            );
+            if ($is_locked) {
+                if ($time_interval['begin']->format('Ymd') == $time_interval['end']->format('Ymd')) {
+                    $time_interval_overlaps[] = sprintf(
+                        _('Gesperrt im Bereich vom %1$s bis %2$s'),
+                        $time_interval['begin']->format('d.m.Y H:i'),
+                        $time_interval['end']->format('H:i')
+                    );
+                } else {
+                    $time_interval_overlaps[] = sprintf(
+                        _('Gesperrt im Bereich vom %1$s bis zum %2$s'),
+                        $time_interval['begin']->format('d.m.Y H:i'),
+                        $time_interval['end']->format('d.m.Y H:i')
+                    );
+                }
+            } else {
+                $is_assigned = $derived_resource->isAssigned(
+                    $time_interval['begin'],
+                    $time_interval['end'],
+                    ($this->isNew() ? [] : [$this->id])
+                );
+                if ($is_assigned) {
+                    //Find the other booking:
+                    $other_booking = self::findByResourceAndTimeRanges(
+                        $derived_resource,
+                        [$time_interval],
+                        [self::TYPE_NORMAL, self::TYPE_LOCK],
+                        [$this->id]
+                    );
+                    $course = null;
+                    if (
+                        count($other_booking) >= 1
+                        && !empty($other_booking[0]->assigned_course_date->course)
+                    ) {
+                        $course = $other_booking[0]->assigned_course_date->course;
+                    }
+                    if ($time_interval['begin']->format('Ymd') == $time_interval['end']->format('Ymd')) {
+                        if ($course) {
+                            $time_interval_overlaps[] = sprintf(
+                                    _('Gebucht im Bereich vom %1$s bis %2$s durch die Veranstaltung %3$s.'),
+                                    $time_interval['begin']->format('d.m.Y H:i'),
+                                    $time_interval['end']->format('H:i'),
+                                    $course->getFullName()
+                                );
+                        } else {
+                            $time_interval_overlaps[] = sprintf(
+                                _('Gebucht im Bereich vom %1$s bis %2$s'),
+                                $time_interval['begin']->format('d.m.Y H:i'),
+                                $time_interval['end']->format('H:i')
+                            );
+                        }
+                    } else {
+                        if ($course) {
+                            $time_interval_overlaps[] = sprintf(
+                                    _('Gebucht im Bereich vom %1$s bis zum %2$s durch die Veranstaltung %3$s.'),
+                                    $time_interval['begin']->format('d.m.Y H:i'),
+                                    $time_interval['end']->format('d.m.Y H:i'),
+                                    $course->getFullName()
+                                );
+                        } else {
+                            $time_interval_overlaps[] = sprintf(
+                                _('Gebucht im Bereich vom %1$s bis zum %2$s'),
+                                $time_interval['begin']->format('d.m.Y H:i'),
+                                $time_interval['end']->format('d.m.Y H:i')
+                            );
+                        }
+                    }
+                }
+            }
+        }
+        if ($time_interval_overlaps) {
+            throw new ResourceBookingOverlapException(
+                implode(', ', $time_interval_overlaps)
+            );
+        }
+
+        NotificationCenter::postNotification('ResourceBookingWillValidate', $this);
+    }
+
+
+    /**
+     * This method updates the intervals of this resource booking
+     * which are stored in the resource_booking_intervals table.
+     */
+    public function updateIntervals($keep_exceptions = true)
+    {
+        if ($keep_exceptions) {
+            //Delete all intervals with takes_place > 0
+            //and update the time intervals of the exceptions:
+            ResourceBookingInterval::deleteBySql(
+                "booking_id = :booking_id
+                AND
+                takes_place > '0'",
+                [
+                    'booking_id' => $this->id
+                ]
+            );
+
+            //Get all interval exceptions:
+            $exceptions = ResourceBookingInterval::findBySql(
+                "booking_id = :booking_id
+                AND
+                takes_place < '1'",
+                [
+                    'booking_id' => $this->id
+                ]
+            );
+
+            if ($exceptions) {
+                //Now we must compare the time intervals of the booking
+                //with the time intervals of the exceptions.
+                //If there is only a difference in hours we update
+                //the exceptions. Otherwise we delete the exceptions.
+
+                $repetition_interval = $this->getRepetitionInterval();
+                if (!$repetition_interval) {
+                    //No repetition interval also means nothing left to do.
+                    return;
+                }
+
+                $repetition_begin = new DateTime();
+                $repetition_begin->setTimestamp($this->begin - $this->preparation_time);
+                $date_end = new DateTime();
+                $date_end->setTimestamp($this->end);
+                $repetition_end = new DateTime();
+                $repetition_end->setTimestamp($this->repeat_end);
+                $repetition_interval = $this->getRepetitionInterval();
+
+                $duration = $repetition_begin->diff($date_end);
+
+                //Loop over all exceptions and check if they belong to
+                //one of the repetions:
+
+                $obsolete_exception_ids = [];
+                foreach ($exceptions as $exception) {
+                    $exception_begin = new DateTime();
+                    $exception_begin->setTimestamp($exception->begin);
+                    $exception_end = new DateTime();
+                    $exception_end->setTimestamp($exception->end);
+                    $exc_begin_str = $exception_begin->format('Y-m-d');
+                    $exc_end_str = $exception_end->format('Y-m-d');
+
+                    $exception_obsolete = true;
+
+                    $current_repetition = clone $repetition_begin;
+                    while ($current_repetition < $repetition_end) {
+                        $current_end = clone $current_repetition;
+                        $current_end->add($duration);
+
+                        $current_begin_str = $current_repetition->format('Y-m-d');
+                        $current_end_str = $current_end->format('Y-m-d');
+
+                        if ($current_begin_str == $exc_begin_str && $current_end_str == $exc_end_str) {
+                            //We found one exception which needs to be updated.
+                            $exception_obsolete = false;
+                            $exception->begin = $current_repetition->getTimestamp();
+                            $exception->end = $current_end->getTimestamp();
+                            if ($exception->isDirty()) {
+                                $exception->store();
+                            }
+                            //No need to loop the rest of the repetitions:
+                            break;
+                        }
+
+                        $current_repetition->add($repetition_interval);
+                    }
+
+                    if ($exception_obsolete) {
+                        $obsolete_exception_ids[] = $exception->id;
+                    }
+                }
+
+                if ($obsolete_exception_ids) {
+                    ResourceBookingInterval::deleteBySql(
+                        'interval_id IN ( :ids )',
+                        [
+                            'ids' => $obsolete_exception_ids
+                        ]
+                    );
+                }
+            }
+        } else {
+            //We delete all existing intervals for this booking
+            //and re-create them.
+            ResourceBookingInterval::deleteBySql(
+                'booking_id = :booking_id',
+                [
+                    'booking_id' => $this->id
+                ]
+            );
+        }
+
+        ResourceBookingInterval::createFromBooking($this);
+    }
+
+
+    /**
+     * Deletes the ResourceBooking object if there are no
+     * ResourceBookingInterval objects attachted to it.
+     *
+     * @return null|bool If the ResourceBooking object still has
+     *     ResourceBookingInterval objects attachted to it,
+     *     null is returned. Otherwise the return value of the
+     *     SimpleORMap::delete method for the ResourceBooking object
+     *     is returned.
+     */
+    public function deleteIfNoInterval()
+    {
+        $intervals = ResourceBookingInterval::countBySql(
+            'booking_id = :id',
+            [
+                'id' => $this->id
+            ]
+        );
+        if ($intervals == 0) {
+            return $this->delete();
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Deletes all bookings in the time ranges of this resource booking.
+     * Such bookings would prevent saving this booking.
+     *
+     * @return int The amount of deleted bookings.
+     */
+    public function deleteOverlappingBookings()
+    {
+        $end = new DateTime();
+        $end->setTimestamp($this->end);
+        $repetition_end = new DateTime();
+        $repetition_end->setTimestamp($this->repeat_end);
+
+        $deleted_c = 0;
+        if ($this->repetition_interval) {
+            $repetition_interval = $this->getRepetitionInterval();
+
+            if (!$this->repeat_end) {
+                throw new InvalidArgumentException(
+                    _('Es wurde ein Wiederholungsintervall ohne Begrenzung angegeben!')
+                );
+            }
+            if ($this->real_begin > $this->repeat_end) {
+                throw new InvalidArgumentException(
+                    _('Der Startzeitpunkt darf nicht hinter dem Ende der Wiederholungen liegen!')
+                );
+            }
+
+            //Look in each repetition for overlapping bookings and delete them.
+            $current_date = $this->real_begin_dt;
+            while ($current_date <= $repetition_end) {
+                $current_begin = clone $current_date;
+                $current_end = clone $current_date;
+                $current_end->setTime(
+                    intval($end->format('H')),
+                    intval($end->format('i')),
+                    intval($end->format('s'))
+                );
+                $derived_resource = $this->resource->getDerivedClassInstance();
+                if ($derived_resource->userHasPermission($this->booking_user, 'tutor', [$current_begin, $current_end])) {
+                    //Sufficient permissions to delete bookings
+                    //in the time frame.
+                    $delete_sql = 'begin < :end AND end > :begin AND resource_id = :resource_id ';
+                    $sql_params = [
+                        'begin' => $current_begin->getTimestamp(),
+                        'end' => $current_end->getTimestamp(),
+                        'resource_id' => $this->resource->id
+                    ];
+                    if (!$this->isNew()) {
+                        $delete_sql .= 'booking_id <> :booking_id';
+                        $sql_params['booking_id'] = $this->id;
+                    }
+                    $intervals = ResourceBookingInterval::findBySQL(
+                        $delete_sql,
+                        $sql_params
+                    );
+
+                    $affected_bookings = [];
+                    foreach ($intervals as $interval) {
+                        if ($interval->booking instanceof ResourceBooking) {
+                            $affected_bookings[$interval->booking_id] = $interval->booking;
+                        }
+                        $deleted_c += $interval->delete();
+                    }
+
+                    foreach ($affected_bookings as $booking) {
+                        $booking->deleteIfNoInterval();
+                    }
+                }
+                $current_date = $current_date->add($repetition_interval);
+            }
+        } else {
+            $derived_resource = $this->resource->getDerivedClassInstance();
+            if ($derived_resource->userHasPermission($this->booking_user, 'autor', [$this->real_begin_dt, $end])) {
+                $delete_sql = 'begin < :end AND end > :begin AND resource_id = :resource_id ';
+                $sql_params = [
+                    'begin' => $this->real_begin,
+                    'end' => $end->getTimestamp(),
+                    'resource_id' => $this->resource->id
+                ];
+                if (!$this->isNew()) {
+                    $delete_sql .= 'booking_id <> :booking_id';
+                    $sql_params['booking_id'] = $this->id;
+                }
+                $intervals = ResourceBookingInterval::findBySQL(
+                    $delete_sql,
+                    $sql_params
+                );
+                $affected_bookings = [];
+                foreach ($intervals as $interval) {
+                    if ($interval->booking instanceof ResourceBooking) {
+                        $affected_bookings[$interval->booking_id] = $interval->booking;
+                    }
+                    $deleted_c += $interval->delete();
+                }
+
+                foreach ($affected_bookings as $booking) {
+                    $booking->deleteIfNoInterval();
+                }
+            }
+        }
+
+        return $deleted_c;
+    }
+
+
+    /**
+     * Deletes all reservations in the time ranges of this resource booking.
+     *
+     * @return int The amount of deleted reservations.
+     */
+    public function deleteOverlappingReservations()
+    {
+        //Notify all persons who made reservations or who are assigned
+        //to the reservation about the new booking which overwrites
+        //their reservation:
+        $booking_resource = Resource::find($this->resource_id);
+        $booking_user = User::find($this->booking_user_id);
+
+        $deleted_c = 0;
+
+        $template_factory = new Flexi\Factory(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
+        );
+
+        $affected_reservations =  ResourceBooking::findByResourceAndTimeRanges(
+            $booking_resource,
+            [
+                [
+                    'begin' => $this->real_begin,
+                    'end' => $this->end,
+                ]
+            ],
+            [self::TYPE_RESERVATION, self::TYPE_PLANNED],
+            [$this->id]
+        );
+        foreach ($affected_reservations as $reservation) {
+            if ($reservation->id == $this->id) {
+                continue;
+            }
+            if ($reservation->assigned_user && (
+                $reservation->range_id != $reservation->booking_user_id
+            )) {
+                //Inform the person who is assigned to the reservation:
+                setTempLanguage($reservation->assigned_user->id);
+                $lang_path = getUserLanguagePath($reservation->assigned_user->id);
+
+                $template = $template_factory->open(
+                    $lang_path . '/LC_MAILS/overbooked_reservation.php'
+                );
+                $template->set_attribute('resource', $booking_resource);
+                $template->set_attribute('reservation', $reservation);
+                $template->set_attribute('booking_user', $booking_user);
+                $mail_text = $template->render();
+
+                Message::send(
+                    User::findCurrent()->id,
+                    [$reservation->assigned_user->username],
+                    _('Reservierung überbucht'),
+                    $mail_text
+                );
+
+                restoreLanguage();
+            }
+            if ($reservation->booking_user) {
+                //Inform the person who made the reservation:
+                setTempLanguage($reservation->booking_user->id);
+                $lang_path = getUserLanguagePath($reservation->booking_user->id);
+
+                $template = $template_factory->open(
+                    $lang_path . '/LC_MAILS/overbooked_reservation.php'
+                );
+                $template->set_attribute('resource', $booking_resource);
+                $template->set_attribute('reservation', $reservation);
+                $template->set_attribute('booking_user', $booking_user);
+                $mail_text = $template->render();
+
+                Message::send(
+                    User::findCurrent()->id,
+                    [$reservation->booking_user->username],
+                    _('Reservierung überbucht'),
+                    $mail_text
+                );
+
+                restoreLanguage();
+            }
+
+            //Delete the reservation:
+            $deleted_c += $reservation->delete();
+        }
+        return $deleted_c;
+    }
+
+
+    /**
+     * Determines whether the resource booking ends on the same timestamp
+     * like the lecture time of one of the defined semesters.
+     *
+     * @return True, if the resource booking ends with a semester,
+     *     false otherwise.
+     */
+    public function endsWithSemester()
+    {
+        return Semester::countBySql(
+            '(beginn <= :begin) AND (ende >= :begin)
+             AND vorles_ende = :repeat_end',
+            [
+                'begin' => $this->begin,
+                'repeat_end' => $this->repeat_end
+            ]
+        ) > 0;
+    }
+
+
+    /**
+     * Check if the specified user is the owner of the booking.
+     *
+     * @param User $user The user whose ownership shall be tested.
+     *
+     * @return bool True, if the specified user is the owner of the booking,
+     *     false otherwise.
+     */
+    public function userIsOwner(User $user)
+    {
+        return $this->booking_user_id == $user->id;
+    }
+
+
+    /**
+     * Determines wheter the booking is read only for a specified user.
+     *
+     * @param User $user The user whose permissions shall be checked.
+     *
+     * @return bool True, if the specified user may only perform reading
+     *     actions on the booking, false otherwise.
+     */
+    public function isReadOnlyForUser(User $user)
+    {
+        if ($this->isSimpleBooking()) {
+            //In case it is a simple booking, one has to be
+            //either resource tutor or the owner of the request.
+            if ($this->userIsOwner($user)) {
+                return false;
+            }
+            //Still no answer? Check, if the user is resource tutor.
+            $derived_resource = $this->resource->getDerivedClassInstance();
+            return !$derived_resource->userHasPermission($user, 'tutor');
+        }
+        //Non-simple bookings (course bookings etc.) are always read-only.
+        return true;
+    }
+
+
+    /**
+     * Determines whether this resource booking has a repetition in the
+     * specified time range.
+     * @param DateTime $begin
+     * @param DateTime $end
+     * @return bool True, if the booking has repetitions in the timeframe
+     * specified by $begin and $end, false otherwise.
+     */
+    public function isRepetitionInTimeframe(DateTime $begin, DateTime $end)
+    {
+        return ResourceBookingInterval::countBySql(
+            'booking_id = :booking_id AND begin < :end AND end > :begin',
+            [
+                'booking_id' => $this->id,
+                'begin' => $begin->getTimestamp(),
+                'end' => $end->getTimestamp()
+            ]
+        ) > 0;
+    }
+
+
+    /**
+     * Returns the DateInterval object according to the set repetition
+     * interval of this resource booking object.
+     *
+     * @return DateInterval|null A DateInterval object or null,
+     *     if this booking has no repetition interval.
+     */
+    public function getRepetitionInterval()
+    {
+        $repetition_interval = null;
+        if ($this->repetition_interval) {
+            try {
+                if ($this->repetition_interval instanceof DateInterval) {
+                    $repetition_interval = $this->repetition_interval;
+                } else {
+                    $repetition_interval = new DateInterval($this->repetition_interval);
+                }
+            } catch (Exception $e) {
+                //Invalid repetition interval string.
+                throw new InvalidArgumentException(
+                    sprintf(
+                        _('Das Wiederholungsintervall ist in einem ungültigen Format (%s)!'),
+                        $this->repetition_interval
+                    )
+                );
+            }
+        }
+        return $repetition_interval;
+    }
+
+
+    public function getRepeatModeString()
+    {
+        $interval = $this->getRepetitionInterval();
+
+        if ($interval->m) {
+            switch ($interval->m) {
+                case 1:  return _('jeden Monat');
+                case 2:  return _('jeden zweiten Monat');
+                case 3:  return _('jeden dritten Monat');
+                case 4:  return _('jeden vierten Monat');
+                case 5:  return _('jeden fünften Monat');
+                case 6:  return _('jeden sechsten Monat');
+                case 7:  return _('jeden siebten Monat');
+                case 8:  return _('jeden achten Monat');
+                case 9:  return _('jeden neunten Monat');
+                case 10: return _('jeden zehnten Monat');
+                case 11: return _('jeden elften Monat');
+            }
+        } elseif (($interval->d % 7) == 0) {
+            $week = round($interval->d / 7);
+            switch ($week) {
+                case 1: return _('jede Woche');
+                case 2: return _('jede zweite Woche');
+                case 3: return _('jede dritte Woche');
+            }
+        } elseif ($interval->d) {
+            if ($interval->d > 1) {
+                return sprintf(
+                    _('jeden %d. Tag'),
+                    $interval->d
+                );
+            } elseif ($interval->d == 1) {
+                return _('jeden Tag');
+            } else {
+                return _('ungültiges Zeitintervall');
+            }
+        }
+    }
+
+    /**
+     * Determines if the resource booking overlaps with another
+     * resource booking.
+     *
+     * @return bool True, if there are other bookings which overlap
+     *     with this one, false otherwise.
+     */
+    public function hasOverlappingBookings()
+    {
+        //Get all intervals of this booking, loop over them
+        //and check if there are other intervals in the same
+        //timeframe for the same resource.
+
+        $intervals = ResourceBookingInterval::findBySql(
+            'booking_id = :booking_id',
+            [
+                'booking_id' => $this->id
+            ]
+        );
+
+        if ($intervals) {
+            foreach ($intervals as $interval) {
+                $count = ResourceBookingInterval::countBySql(
+                    'booking_id <> :booking_id
+                    AND
+                    resource_id = :resource_id
+                    AND takes_place = 1
+                    AND
+                    (
+                        begin < :end AND :begin < end
+                    )',
+                    [
+                        'booking_id' => $this->id,
+                        'resource_id' => $this->resource_id,
+                        'begin' => $interval->begin,
+                        'end' => $interval->end
+                    ]
+                );
+
+                if ($count) {
+                    //We have found an interval which overlaps
+                    //with an interval of this booking.
+                    return true;
+                }
+            }
+        }
+
+        //If this booking has no intervals it means it doesn't have
+        //any time intervals at all. Therefore there can't be any
+        //overlapping bookings.
+        return false;
+    }
+
+    /**
+     * Gets the bookings that overlap with this booking.
+     *
+     * @return array Array of ResourceBooking objects
+     */
+    public function getOverlappingBookings()
+    {
+        //Get all intervals of this booking, loop over them
+        //and check if there are other intervals in the same
+        //timeframe for the same resource. If so, collect the
+        //booking-IDs and get all the bookings.
+
+        $intervals = ResourceBookingInterval::findBybooking_id($this->id);
+
+        if ($intervals) {
+            $db = DBManager::get();
+
+            $get_booking_id_stmt = $db->prepare(
+                'SELECT DISTINCT booking_id
+                FROM resource_booking_intervals
+                WHERE
+                booking_id <> :booking_id
+                AND
+                resource_id = :resource_id
+                AND takes_place = 1
+                AND
+                (
+                    begin < :end AND :begin < end
+                )'
+            );
+            $overlapping_booking_ids = [];
+            foreach ($intervals as $interval) {
+                $get_booking_id_stmt->execute(
+                    [
+                        'booking_id' => $this->id,
+                        'resource_id' => $this->resource_id,
+                        'begin' => $interval->begin,
+                        'end' => $interval->end
+                    ]
+                );
+
+                $overlapping_booking_ids = array_merge(
+                    $overlapping_booking_ids,
+                    $get_booking_id_stmt->fetchAll(
+                        PDO::FETCH_COLUMN,
+                        0
+                    )
+                );
+            }
+
+            if ($overlapping_booking_ids) {
+                $overlapping_booking_ids = array_unique(
+                    $overlapping_booking_ids
+                );
+
+                return ResourceBooking::findMany(
+                    $overlapping_booking_ids
+                );
+            }
+        }
+
+        //If this booking has no intervals it means it doesn't have
+        //any time intervals at all. Therefore there can't be any
+        //overlapping bookings.
+        return false;
+    }
+
+
+    /**
+     * Calculates all time intervals as begin and end timestamps
+     * by looking at the repetition settings, if any.
+     *
+     * @param bool $as_datetime Whether to return the timestamps
+     *     as DateTime objects (true) or not (false). Defaults to false.
+     *
+     * @return array A two-dimensional array with each time interval
+     *     for this booking. The array has the following structure:
+     *     [
+     *         [
+     *             'begin' => Begin timestamp.
+     *             'end' => End timestamp.
+     *         ]
+     *     ]
+     */
+    public function calculateTimeIntervals($as_datetime = false)
+    {
+        $interval_data = [];
+        $booking_begin = new DateTime();
+        $booking_begin->setTimestamp($this->begin);
+        if ($this->preparation_time) {
+            $booking_begin->setTimestamp(
+                $this->begin - $this->preparation_time
+            );
+        }
+        $booking_end = new DateTime();
+        $booking_end->setTimestamp($this->end);
+
+        //use begin and end to create the first interval:
+        $interval_data[] = [
+            'begin' => (
+                $as_datetime
+                ? clone $booking_begin
+                : $booking_begin->getTimestamp()
+            ),
+            'end' => (
+                $as_datetime
+                ? clone $booking_end
+                : $booking_end->getTimestamp()
+            )
+        ];
+
+        if ($this->repeat_end) {
+            //Repetition: we must check which repetition interval has been
+            //selected and then create entries for each repetition.
+            //Repetition starts with the begin date and ends with the
+            //"repeat_end" date.
+            $repetition_end = new DateTime();
+            $repetition_end->setTimestamp($this->repeat_end);
+            //The DateInterval constructor will throw an exception,
+            //if it cannot parse the string stored in $this->repetition_interval.
+            $repetition_interval = $this->getRepetitionInterval();
+
+            if ($repetition_interval instanceof DateInterval) {
+                $duration = $booking_begin->diff($booking_end);
+
+                //Check if end is later than begin to avoid
+                //infinite loops.
+                if ($repetition_end > $booking_begin) {
+                    $current_begin = clone $booking_begin;
+                    $current_begin->add($repetition_interval);
+                    while ($current_begin < $repetition_end) {
+                        $current_end = clone $current_begin;
+                        $current_end->add($duration);
+                        $interval_data[] = [
+                            'begin' => (
+                                $as_datetime
+                                ? clone $current_begin
+                                : $current_begin->getTimestamp()
+                            ),
+                            'end' => (
+                                $as_datetime
+                                ? clone $current_end
+                                : $current_end->getTimestamp()
+                            )
+                        ];
+                        $current_begin->add($repetition_interval);
+                    }
+                } else {
+                    //end timestamp is before begin timestamp:
+                    //return an empty array
+                    return [];
+                }
+            }
+            //Everything went fine.
+        }
+        return $interval_data;
+    }
+
+
+    /**
+     * Retrieves all time intervals for this resource booking.
+     *
+     * @return ResourceBookingInterval[] An array of
+     *     ResourceBookingInterval objects.
+     */
+    public function getTimeIntervals($with_exceptions = true)
+    {
+        if ($with_exceptions) {
+            return ResourceBookingInterval::findBySQL(
+                "booking_id = :booking_id
+                ORDER BY begin ASC, end ASC",
+                [
+                    'booking_id' => $this->id
+                ]
+            );
+        } else {
+            return ResourceBookingInterval::findBySQL(
+                "booking_id = :booking_id AND takes_place = '1'
+                ORDER BY begin ASC, end ASC",
+                [
+                    'booking_id' => $this->id
+                ]
+            );
+        }
+    }
+
+
+    /**
+     * Retrieves all time intervals for this resource booking
+     * in a specified time range.
+     *
+     * @param DateTime $begin The begin of the time range.
+     * @param DateTime $end The end of the time range.
+     *
+     * @return ResourceBookingInterval[] An array of
+     *     ResourceBookingInterval objects.
+     */
+    public function getTimeIntervalsInTimeRange(DateTime $begin, DateTime $end)
+    {
+        if ($begin > $end) {
+            //We don't serve querys with invalid time ranges here.
+            return [];
+        }
+
+        return ResourceBookingInterval::findBySql(
+            'booking_id = :booking_id AND begin < :end AND end > :begin ORDER BY begin, end',
+            [
+                'booking_id' => $this->id,
+                'begin' => $begin->getTimestamp(),
+                'end' => $end->getTimestamp()
+            ]
+        );
+    }
+
+
+    /**
+     * Returns all allocating users: Users who are associated with this booking
+     * through a request or a course date for which this booking has been made
+     * (all allocating users). If no user could be determined but the booking
+     * is bound to a course, the course name is returned instead.
+     *
+     * @deprecated
+     * @param bool $only_names Whether only the names of these users shall be
+     *     returned (true) or user objects shall be returned (false).
+     *
+     * @return string[]|User[] Depending on the value of the $only_names
+     *     parameter a string array or an user object array is returned.
+     *     In case no user can be found, the array is empty.
+     *     In case the parameter $only_names is set to true, the result
+     *     may also contain a course name, if no users can be found but the
+     *     booking is bound to a course.
+     */
+    public function getAssignedUsers($only_names = true)
+    {
+        //The only two cases which shall be handled are that
+        //a booking is assigned to a course or an user.
+        if ($this->getAssignedUserType() === 'course') {
+            //Return all persons associated with that course date.
+            if (count($this->assigned_course_date->dozenten)) {
+                if ($only_names) {
+                    $lecturers = [];
+                    foreach ($this->assigned_course_date->dozenten as $lecturer) {
+                        $lecturers[] = $lecturer->getFullName();
+                    }
+                    return $lecturers;
+                } else {
+                    return $this->assigned_course_date->dozenten;
+                }
+            } else {
+                $lecturers = User::findBySql(
+                    "INNER JOIN seminar_user
+                    USING (user_id)
+                    WHERE
+                    seminar_user.seminar_id = :course_id
+                    AND
+                    seminar_user.status = 'dozent'
+                    ORDER BY nachname ASC, vorname ASC",
+                    [
+                        'course_id' => $this->assigned_course_date->range_id
+                    ]
+                );
+                if (!$lecturers) {
+                    return [];
+                }
+                if ($only_names) {
+                    $names = [];
+                    foreach ($lecturers as $lecturer) {
+                        $names[] = $lecturer->getFullName();
+                    }
+                    return $names;
+                } else {
+                    return $lecturers;
+                }
+            }
+        } elseif ($this->getAssignedUserType() === 'user') {
+            if ($only_names) {
+                return [$this->assigned_user->getFullName()];
+            }
+            return [$this->assigned_user];
+        }
+
+        return [];
+    }
+
+    public function getAssignedUser()
+    {
+        if ($this->getAssignedUserType() === 'course') {
+            return $this->assigned_course_date->course;
+        }
+        if ($this->getAssignedUserType() === 'user') {
+            return $this->assigned_user;
+        }
+    }
+
+    public function getAssignedUserType()
+    {
+        if (isset($this->assigned_user_type)) {
+            return $this->assigned_user_type;
+        }
+        if ($this->assigned_course_date instanceof CourseDate) {
+            return $this->assigned_user_type = 'course';
+        }
+        if ($this->assigned_user instanceof User) {
+            return $this->assigned_user_type = 'user';
+        }
+        return $this->assigned_user_type = 'none';
+    }
+
+    public function getAssignedUserName()
+    {
+        $name = '';
+        if ($this->getAssignedUserType() === 'course') {
+            $name = $this->assigned_course_date->course->getFullName();
+            $name .= ' (' . implode(',', $this->assigned_course_date->course->getMembersWithStatus('dozent', true)->limit(3)->getValue('nachname')) . ')';
+        } elseif ($this->getAssignedUserType() === 'user') {
+            if (get_visibility_by_id($this->assigned_user->id) ||
+                ($this->assigned_user->id == $GLOBALS['user']->id)
+            ) {
+                $name = $this->assigned_user->getFullName();
+                if ($this->description) {
+                    $name .= " \n" . $this->description;
+                }
+            } else {
+                //Check if the current user has at least user permissions
+                //on the resource. In that case, even invisible assigned
+                //users become visible.
+                $resource = $this->resource->getDerivedClassInstance();
+                $current_user = User::findCurrent();
+                if (($resource instanceof Resource) && ($current_user instanceof User)) {
+                    if ($resource->userHasPermission($current_user, 'user')) {
+                        $name = $this->assigned_user->getFullName();
+                        if ($this->description) {
+                            $name .= " \n" . $this->description;
+                        }
+                    }
+                }
+            }
+        } else {
+            $name = $this->description;
+        }
+        return $name;
+    }
+
+
+    /**
+     * Determines whether the booking is a simple booking
+     * that is not bound to course dates or similar Stud.IP objects.
+     */
+    public function isSimpleBooking()
+    {
+        return !($this->getAssignedUserType() === 'course');
+    }
+
+
+    /**
+     * Determins whether the booking has exceptions in repetitions or not.
+     * When the booking is bound to a course via a CourseDate instance,
+     * the exceptions are looked up using the corresponding metadate (if any).
+     * If a metadate exists to the course date and it has cancelled dates
+     * (metadate has CourseExDate instances assigned) then the booking has
+     * exceptions.
+     * If the booking is a simple booking, the exception status is determined
+     * by checking if the booking has ResourceBookingInterval instances
+     * that don't take place assigned to it. This is only checked,
+     * if a repetition interval is set for the booking so that such instances
+     * can exist.
+     *
+     * @return bool True, if the booking has exceptions in the repetition,
+     *     false otherwise.
+     */
+    public function hasExceptions()
+    {
+        if ($this->isSimpleBooking()) {
+            //This is a simple booking: Check the repetition interval:
+            if ($this->repetition_interval) {
+                //A repetition interval exists: Check if booking intervals
+                //exist that don't take place:
+                return ResourceBookingInterval::countBySql(
+                    "booking_id = :booking_id
+                    AND takes_place = '0'",
+                    [
+                        'booking_id' => $this->id
+                    ]
+                ) > 0;
+            } else {
+                return false;
+            }
+        } else {
+            //Check if the course booking has exceptions (via metadate):
+            $metadate = $this->assigned_course_date->cycle;
+            if ($metadate instanceof SeminarCycleDate) {
+                //Check if the metadate has exceptions:
+                return CourseExDate::countBySql(
+                    'metadate_id = :metadate_id',
+                    [
+                        'metadate_id' => $metadate->id
+                    ]
+                ) > 0;
+            } else {
+                //No metadate is assigned to the course booking.
+                return false;
+            }
+        }
+    }
+
+
+    public function __toString()
+    {
+        return date('d.m.Y H:i', $this->begin)
+             . ' - '
+             . date('d.m.Y H:i', $this->end);
+    }
+
+
+    public function getTimeIntervalStrings()
+    {
+        $time_intervals = ResourceBookingInterval::findBySQL(
+            'booking_id = :booking_id ORDER BY begin ASC, end ASC',
+            [
+                'booking_id' => $this->id
+            ]
+        );
+
+        $strings = [];
+        foreach ($time_intervals as $interval) {
+            if (date('Ymd', $interval->begin) == date('Ymd', $interval->end)) {
+                $strings[] = sprintf(
+                    '%1$s %2$s - %3$s',
+                    date('d.m.Y', $interval->begin),
+                    date('H:i', $interval->begin),
+                    date('H:i', $interval->end)
+                );
+            } else {
+                $strings[] = sprintf(
+                    '%1$s - %2$s',
+                    date('d.m.Y H:i', $interval->begin),
+                    date('d.m.Y H:i', $interval->end)
+                );
+            }
+        }
+        return $strings;
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $user = User::find($storage->user_id);
+        $bookings = self::findBySql(
+            'user_id = :user_id ORDER BY mkdate',
+            [
+                'user_id' => $storage->user_id
+            ]
+        );
+
+        $rows = [];
+        foreach ($bookings as $booking) {
+            $rows[] = $booking->toRawArray();
+        }
+        $storage->addTabularData(
+            _('Buchungen von Ressourcen'),
+            'resource_bookings',
+            $rows,
+            $user
+        );
+    }
+
+
+    public function convertToEventData(array $time_intervals, $user)
+    {
+        $booking_plan_booking_bg =
+            \ColourValue::find('Resources.BookingPlan.Booking.Bg');
+        $booking_plan_booking_fg =
+            \ColourValue::find('Resources.BookingPlan.Booking.Fg');
+        $booking_plan_simple_booking_with_exceptions_bg =
+            ColourValue::find('Resources.BookingPlan.SimpleBookingWithExceptions.Bg');
+        $booking_plan_simple_booking_with_exceptions_fg =
+            ColourValue::find('Resources.BookingPlan.SimpleBookingWithExceptions.Fg');
+        $booking_plan_reservation_bg = \ColourValue::find('Resources.BookingPlan.Reservation.Bg');
+        $booking_plan_reservation_fg = \ColourValue::find('Resources.BookingPlan.Reservation.Fg');
+        $booking_plan_lock_bg = \ColourValue::find('Resources.BookingPlan.Lock.Bg');
+        $booking_plan_lock_fg = \ColourValue::find('Resources.BookingPlan.Lock.Fg');
+        $booking_plan_planned_booking_bg = \ColourValue::find('Resources.BookingPlan.PlannedBooking.Bg');
+        $booking_plan_planned_booking_fg = \ColourValue::find('Resources.BookingPlan.PlannedBooking.Fg');
+        $booking_plan_preparation_bg = \ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
+        $booking_plan_preparation_fg = \ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
+        $booking_plan_course_booking_bg = \ColourValue::find('Resources.BookingPlan.CourseBooking.Bg');
+        $booking_plan_course_booking_fg = \ColourValue::find('Resources.BookingPlan.CourseBooking.Fg');
+
+        $colour = $booking_plan_booking_bg->__toString();
+        $text_colour = $booking_plan_booking_fg->__toString();
+        $event_classes = [];
+
+        if ($this->booking_type == self::TYPE_NORMAL) {
+            $event_classes[] = 'resource-booking';
+            //Check if the booking is a course booking:
+            if ($this->getAssignedUserType() === 'course') {
+                //It is a course date.
+                $event_classes[] = 'for-course';
+                $colour = $booking_plan_course_booking_bg->__toString();
+                $text_colour = $booking_plan_course_booking_fg->__toString();
+            }
+        } elseif ($this->booking_type == self::TYPE_RESERVATION) {
+            $event_classes[] = 'resource-reservation';
+            $colour = $booking_plan_reservation_bg->__toString();
+            $text_colour = $booking_plan_reservation_fg->__toString();
+        } elseif ($this->booking_type == self::TYPE_LOCK) {
+            $event_classes[] = 'resource-lock';
+            $colour = $booking_plan_lock_bg->__toString();
+            $text_colour = $booking_plan_lock_fg->__toString();
+        } elseif ($this->booking_type == self::TYPE_PLANNED) {
+            $event_classes[] = 'resource-planned-booking';
+            $colour = $booking_plan_planned_booking_bg->__toString();
+            $text_colour = $booking_plan_planned_booking_fg->__toString();
+        }
+
+        $booking_is_editable = false;
+        if ($user instanceof User) {
+            $booking_is_editable = !$this->isReadOnlyForUser($user);
+        }
+
+        $booking_api_urls = [];
+        $booking_view_urls = [
+            'show' => \URLHelper::getURL(
+                'dispatch.php/resources/booking/index/'
+                . $this->id
+            ),
+        ];
+        if ($booking_is_editable) {
+            $booking_view_urls['edit'] = \URLHelper::getURL(
+                'dispatch.php/resources/booking/edit/'
+                . $this->id
+            );
+        }
+        $events = [];
+
+        foreach ($time_intervals as $interval) {
+            $real_begin = $interval['begin'];
+            if ($this->preparation_time) {
+                $real_begin += $this->preparation_time;
+                $begin = new DateTime();
+                $begin->setTimestamp($interval['begin']);
+                $end = new DateTime();
+                $end->setTimestamp($real_begin);
+                $events[] = new Studip\Calendar\EventData(
+                    $begin,
+                    $end,
+                    _('Rüstzeit'),
+                    ['preparation-time'],
+                    $booking_plan_preparation_fg->__toString(),
+                    $booking_plan_preparation_bg->__toString(),
+                    $booking_is_editable,
+                    'ResourceBookingInterval',
+                    $interval->id,
+                    'ResourceBooking',
+                    $this->id,
+                    'Resource',
+                    $this->resource_id,
+                    $booking_view_urls
+                );
+            }
+
+            $event_title = '';
+            $icon = '';
+
+            if ($user instanceof User) {
+                $derived_resource = $this->resource->getDerivedClassInstance();
+                if ($derived_resource->userHasPermission($user, 'user') && $this->internal_comment) {
+                    $icon = 'chat2';
+                }
+            }
+
+            if (!$this->isSimpleBooking()) {
+                if ($this->assigned_course_date->metadate_id) {
+                    $icon = 'refresh';
+                }
+            } elseif ($this->repeat_end > $this->end) {
+                $icon = 'refresh';
+            }
+
+            if ($this->assigned_course_date instanceof CourseDate) {
+                $course = $this->assigned_course_date->course;
+                if ($course instanceof Course) {
+                    $has_perms = $GLOBALS['perm']->have_studip_perm('user', $course->id, $user->id);
+                    $vis_perms = $GLOBALS['perm']->have_perm(Config::get()->SEM_VISIBILITY_PERM, $user->id);
+                    if ($has_perms || $vis_perms || $course->visible) {
+                        $event_title = $this->getAssignedUserName();
+                    }
+                }
+            } else {
+                $event_title = $this->getAssignedUserName();
+            }
+
+            $interval_api_urls = $booking_api_urls;
+            if ($booking_is_editable) {
+                //A note on the move URL:
+                //When used in a room group booking plan, the interval_id
+                //URL parameter is subject to modification in JavaScript.
+                //(lib/resources.js, method dropEventInRoomGroupBookingPlan)
+                $interval_api_urls = [
+                    'resize' => \URLHelper::getURL(
+                        'api.php/resources/booking/'
+                      . $this->id . '/move',
+                        [
+                            'quiet' => '1',
+                            'interval_id' => $interval->id
+                        ]
+                    ),
+                    'move' => \URLHelper::getURL(
+                        'api.php/resources/booking/'
+                      . $this->id . '/move',
+                        [
+                            'quiet' => '1',
+                            'interval_id' => $interval->id
+                        ]
+                    )
+                ];
+            }
+            $begin = new DateTime();
+            $begin->setTimestamp($real_begin);
+            $end = new DateTime();
+            $end->setTimestamp($interval['end']);
+            $events[] = new Studip\Calendar\EventData(
+                $begin,
+                $end,
+                $event_title,
+                $event_classes,
+                $text_colour,
+                $colour,
+                $booking_is_editable,
+                'ResourceBookingInterval',
+                $interval->id,
+                'ResourceBooking',
+                $this->id,
+                'Resource',
+                $this->resource_id,
+                $booking_view_urls,
+                $interval_api_urls,
+                $icon
+            );
+        }
+
+        return $events;
+    }
+
+
+    public function getAllEventData()
+    {
+        return $this->convertToEventData(
+            $this->getTimeIntervals(false),
+            User::findCurrent()
+        );
+    }
+
+
+    public function getEventDataForTimeRange(DateTime $begin, DateTime $end)
+    {
+
+        return $this->getFilteredEventData(null, null, null, $begin, $end);
+    }
+
+
+    public function getFilteredEventData(
+        $user_id = null,
+        $range_id = null,
+        $range_type = null,
+        $begin = null,
+        $end = null
+    )
+    {
+        $sql = "booking_id = :booking_id AND takes_place = 1 ";
+        $sql_array = [
+            'booking_id' => $this->id
+        ];
+
+        if ($begin && $end) {
+            if ($begin instanceof DateTime) {
+                $begin = $begin->getTimestamp();
+            }
+            if ($end instanceof DateTime) {
+                $end = $end->getTimestamp();
+            }
+            $sql .= "AND begin < :end AND :begin < end";
+            $sql_array['begin'] = $begin;
+            $sql_array['end'] = $end;
+        }
+        $time_intervals = ResourceBookingInterval::findBySQL(
+            $sql,
+            $sql_array
+        );
+
+        $user = null;
+        if ($user_id) {
+            $user = User::find($user_id);
+        } else {
+            $user = User::findCurrent();
+        }
+
+        return $this->convertToEventData($time_intervals, $user);
+    }
+
+    /**
+     * @return string
+     */
+    public function getRepetitionType()
+    {
+        if ($this->getAssignedUserType() === 'course') {
+            if ($this->assigned_course_date->metadate_id) {
+                return 'weekly';
+            } else {
+                return 'single';
+            }
+        } else {
+            $intervall = $this->getRepetitionInterval();
+            if (!$intervall) {
+                return 'single';
+            }
+            if ($intervall->m) {
+                return 'monthly';
+            }
+            if ($intervall->d % 7 === 0) {
+                return 'weekly';
+            }
+            if ($intervall->d) {
+                return 'daily';
+            }
+        }
+
+        return '';
+    }
+
+
+    /**
+     * Sends a notification that the booking has been deleted
+     * to the user that created the booking.
+     */
+    public function sendDeleteNotification()
+    {
+        if ($this->booking_type != self::TYPE_NORMAL) {
+            //We only handle real bookings in this method.
+            return;
+        }
+
+        if ($this->end < time()) {
+            //Bookings that lie in the past can be deleted without
+            //sending notifications.
+            return;
+        }
+
+        $booking_resource = Resource::find($this->resource_id);
+        $booking_user = User::find($this->booking_user_id);
+        $booking_course = null;
+        if ($this->course_id) {
+            $booking_course = Course::find($this->course_id);
+        }
+        if (!$booking_resource || !$booking_user) {
+            //Nothing we can do here.
+            return;
+        }
+        if (User::findCurrent()->id === $booking_user->id) {
+            return;
+        }
+
+        $template_factory = new Flexi\Factory(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
+        );
+        setTempLanguage($booking_user->id);
+        $lang_path = getUserLanguagePath($booking_user->id);
+
+        $template = $template_factory->open(
+            $lang_path . '/LC_MAILS/delete_booking_notification.php'
+        );
+        $template->set_attribute('resource', $booking_resource->getDerivedClassInstance());
+        $template->set_attribute('begin', $this->begin);
+        $template->set_attribute('end', $this->end);
+        $template->set_attribute('deleting_user', User::findCurrent());
+        $template->set_attribute('booking_course', $booking_course);
+
+        $mail_text = $template->render();
+
+        Message::send(
+            User::findCurrent()->id,
+            [$booking_user->username],
+            _('Ihre Buchung wurde gelöscht'),
+            $mail_text
+        );
+
+        restoreLanguage();
+    }
+}
diff --git a/lib/models/resources/ResourceBookingInterval.class.php b/lib/models/resources/ResourceBookingInterval.class.php
deleted file mode 100644
index 7908e40..0000000
--- a/lib/models/resources/ResourceBookingInterval.class.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * ResourceBookingInterval.class.php - model class for storing
- * all resource bookings time intervals, including those for
- * repetitions.
- *
- * The ResourceBookingEvent class contains all
- * time intervals of all resources where they are
- * assigned.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.1
- *
- * @property string $id alias column for interval_id
- * @property string $interval_id database column
- * @property string $resource_id database column
- * @property string $booking_id database column
- * @property int $begin database column
- * @property int $end database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $takes_place database column
- * @property ResourceBooking $booking belongs_to ResourceBooking
- * @property Resource $resource belongs_to Resource
- */
-class ResourceBookingInterval extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_booking_intervals';
-
-        $config['belongs_to']['booking'] = [
-            'class_name' => ResourceBooking::class,
-            'foreign_key' => 'booking_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['belongs_to']['resource'] = [
-            'class_name' => Resource::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func' => 'find'
-        ];
-
-        parent::configure($config);
-    }
-
-    /**
-     * Creates resource booking interval entries by checking the
-     * values of a specified ResourceBooking object.
-     *
-     * @param ResourceBooking $booking The resource booking object
-     *     from which interval entries shall be generated.
-     *
-     * @return True, if all intervals have been created successfully,
-     *     false otherwise.
-     */
-    public static function createFromBooking(ResourceBooking $booking)
-    {
-        $time_intervals = $booking->calculateTimeIntervals();
-        foreach ($time_intervals as $time_interval) {
-            //Check if the time interval already exists:
-            $interval_exists = ResourceBookingInterval::countBySql(
-                'booking_id = :booking_id AND resource_id = :resource_id
-                AND begin = :begin AND end = :end',
-                [
-                    'booking_id' => $booking->id,
-                    'resource_id' => $booking->resource_id,
-                    'begin' => $time_interval['begin'],
-                    'end' => $time_interval['end']
-                ]
-            ) > 0;
-            if (!$interval_exists) {
-                $interval = new ResourceBookingInterval();
-                $interval->booking_id = $booking->id;
-                $interval->resource_id = $booking->resource_id;
-                $interval->begin = $time_interval['begin'];
-                $interval->end = $time_interval['end'];
-                if (!$interval->store()) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Converts this ResourceBookingInterval object to a DateInterval object.
-     *
-     * @return DateInterval A DateInterval representing the time interval
-     *     of this ResourceBookingInterval object.
-     */
-    public function toDateInterval()
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->begin);
-        $end = new DateTime();
-        $end->setTimestamp($this->end);
-
-        return $begin->diff($end);
-    }
-
-    public function __toString()
-    {
-        if (date('Ymd', $this->begin) == date('Ymd', $this->end)) {
-            return strftime('%a %x %R', $this->begin) . ' - ' . strftime('%R', $this->end);
-        } else {
-            return strftime('%a %x %R', $this->begin)
-                . ' - '
-                . strftime('%a %x %R', $this->end);
-        }
-    }
-}
diff --git a/lib/models/resources/ResourceBookingInterval.php b/lib/models/resources/ResourceBookingInterval.php
new file mode 100644
index 0000000..7908e40
--- /dev/null
+++ b/lib/models/resources/ResourceBookingInterval.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * ResourceBookingInterval.class.php - model class for storing
+ * all resource bookings time intervals, including those for
+ * repetitions.
+ *
+ * The ResourceBookingEvent class contains all
+ * time intervals of all resources where they are
+ * assigned.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.1
+ *
+ * @property string $id alias column for interval_id
+ * @property string $interval_id database column
+ * @property string $resource_id database column
+ * @property string $booking_id database column
+ * @property int $begin database column
+ * @property int $end database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $takes_place database column
+ * @property ResourceBooking $booking belongs_to ResourceBooking
+ * @property Resource $resource belongs_to Resource
+ */
+class ResourceBookingInterval extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_booking_intervals';
+
+        $config['belongs_to']['booking'] = [
+            'class_name' => ResourceBooking::class,
+            'foreign_key' => 'booking_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['belongs_to']['resource'] = [
+            'class_name' => Resource::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func' => 'find'
+        ];
+
+        parent::configure($config);
+    }
+
+    /**
+     * Creates resource booking interval entries by checking the
+     * values of a specified ResourceBooking object.
+     *
+     * @param ResourceBooking $booking The resource booking object
+     *     from which interval entries shall be generated.
+     *
+     * @return True, if all intervals have been created successfully,
+     *     false otherwise.
+     */
+    public static function createFromBooking(ResourceBooking $booking)
+    {
+        $time_intervals = $booking->calculateTimeIntervals();
+        foreach ($time_intervals as $time_interval) {
+            //Check if the time interval already exists:
+            $interval_exists = ResourceBookingInterval::countBySql(
+                'booking_id = :booking_id AND resource_id = :resource_id
+                AND begin = :begin AND end = :end',
+                [
+                    'booking_id' => $booking->id,
+                    'resource_id' => $booking->resource_id,
+                    'begin' => $time_interval['begin'],
+                    'end' => $time_interval['end']
+                ]
+            ) > 0;
+            if (!$interval_exists) {
+                $interval = new ResourceBookingInterval();
+                $interval->booking_id = $booking->id;
+                $interval->resource_id = $booking->resource_id;
+                $interval->begin = $time_interval['begin'];
+                $interval->end = $time_interval['end'];
+                if (!$interval->store()) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Converts this ResourceBookingInterval object to a DateInterval object.
+     *
+     * @return DateInterval A DateInterval representing the time interval
+     *     of this ResourceBookingInterval object.
+     */
+    public function toDateInterval()
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->begin);
+        $end = new DateTime();
+        $end->setTimestamp($this->end);
+
+        return $begin->diff($end);
+    }
+
+    public function __toString()
+    {
+        if (date('Ymd', $this->begin) == date('Ymd', $this->end)) {
+            return strftime('%a %x %R', $this->begin) . ' - ' . strftime('%R', $this->end);
+        } else {
+            return strftime('%a %x %R', $this->begin)
+                . ' - '
+                . strftime('%a %x %R', $this->end);
+        }
+    }
+}
diff --git a/lib/models/resources/ResourceCategory.class.php b/lib/models/resources/ResourceCategory.class.php
deleted file mode 100644
index 766a5f6..0000000
--- a/lib/models/resources/ResourceCategory.class.php
+++ /dev/null
@@ -1,806 +0,0 @@
-<?php
-
-/**
- * ResourceCategory.class.php - model class for resource categories
- *
- * The ResourceCategory class can be used as a Factory for
- * Resource objects.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.1
- *
- * @property string $id database column
- * @property string $name database column
- * @property string $description database column
- * @property int $system database column
- * @property int|null $iconnr database column
- * @property string $class_name database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|ResourceCategoryProperty[] $property_links has_many ResourceCategoryProperty
- * @property SimpleORMapCollection|ResourcePropertyDefinition[] $property_definitions has_and_belongs_to_many ResourcePropertyDefinition
- */
-class ResourceCategory extends SimpleORMap
-{
-    private static $cache;
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_categories';
-
-        $config['has_and_belongs_to_many']['property_definitions'] = [
-            'class_name'        => ResourcePropertyDefinition::class,
-            'assoc_foreign_key' => 'property_id',
-            'thru_table'        => 'resource_category_properties',
-            'thru_key'          => 'category_id',
-            'order_by'          => 'ORDER BY name ASC'
-        ];
-
-        $config['has_many']['property_links'] = [
-            'class_name'  => ResourceCategoryProperty::class,
-            'assoc_func'  => 'findByCategory_id',
-            'foreign_key' => 'id',
-            'on_delete'   => 'delete'
-        ];
-
-        $config['registered_callbacks']['after_create'][] = function ($category) {
-            self::$cache[$category->id] = $category;
-        };
-        $config['registered_callbacks']['after_store'][] = function ($category) {
-            self::$cache[$category->id] = $category;
-        };
-        $config['registered_callbacks']['after_delete'][] = function ($category) {
-            unset(self::$cache[$category->id]);
-        };
-
-        parent::configure($config);
-    }
-
-    /**
-     * Retrieves all resource categories from the database.
-     * @param bool $force_reload
-     * @return ResourceCategory[] An array of ResourceCategory objects
-     *     or an empty array if no resource categories are defined.
-     */
-    public static function findAll($force_reload = false)
-    {
-        if (!is_array(self::$cache) || $force_reload) {
-            self::$cache = [];
-            foreach (self::findBySql('1 ORDER BY name') as $one) {
-                self::$cache[$one->id] = $one;
-            }
-        }
-        return self::$cache;
-    }
-
-    public static function find($id)
-    {
-        $all = self::findAll();
-        return $all[$id] ?? null;
-    }
-
-    /**
-     * "Converts" a category-ID to a class name by looking up the
-     * class name of a specified category.
-     *
-     * @param string $category_id The category-ID of the specified category.
-     *
-     * @return string The class name field of the category which is specified
-     *     by $category_id. In case no category could be found, an empty
-     *     string is returned.
-     */
-    public static function getClassNameById($category_id)
-    {
-        $category = self::find($category_id);
-        if ($category) {
-            return $category->class_name;
-        }
-        return '';
-    }
-
-    public function hasResources()
-    {
-        $db   = DBManager::get();
-        $stmt = $db->prepare(
-            "SELECT 1 FROM resources WHERE category_id = :category_id LIMIT 1"
-        );
-        $stmt->execute(['category_id' => $this->id]);
-        return $stmt->fetchColumn() !== false;
-    }
-
-    /**
-     * Retrieves the definitions of all properties that are available
-     * for this resource category.
-     *
-     * @param string[] excluded_properties An array with the names
-     *     of the properties that shall be excluded from the result set.
-     *
-     * @return ResourcePropertyDefinition[] An array of resource property
-     *     definitions.
-     */
-    public function getPropertyDefinitions($excluded_properties = [])
-    {
-        if (is_array($excluded_properties) && count($excluded_properties)) {
-            return ResourcePropertyDefinition::findBySql(
-                "INNER JOIN resource_category_properties rcp
-                ON resource_property_definitions.property_id = rcp.property_id
-                WHERE
-                rcp.category_id = :category_id
-                AND resource_property_definitions.name NOT IN (
-                    :excluded_properties
-                )
-                ORDER BY resource_property_definitions.name ASC",
-                [
-                    'category_id'         => $this->id,
-                    'excluded_properties' => $excluded_properties
-                ]
-            );
-        }
-
-        //No excluded properties are specified.
-        //We can return all property definitions.
-        return ResourcePropertyDefinition::findBySql(
-            "INNER JOIN resource_category_properties rcp
-            ON resource_property_definitions.property_id = rcp.property_id
-            WHERE
-            rcp.category_id = :category_id
-            ORDER BY resource_property_definitions.name ASC",
-            [
-                'category_id' => $this->id
-            ]
-        );
-    }
-
-    /**
-     * This method returns the same properties as getPropertyDefinitions,
-     * but grouped and ordered by the property groups and the position of the
-     * property in that group.
-     *
-     * @return array An array with the group names as keys and the properties
-     *     in the second array dimension. The structure of the array
-     *     is as follows:
-     *     [
-     *          group1 name => [
-     *              property1,
-     *              property2,
-     *              ...
-     *          ],
-     *          group2 name => [
-     *              ...
-     *          ]
-     *     ]
-     */
-    public function getGroupedPropertyDefinitions($excluded_properties = [])
-    {
-        if (is_array($excluded_properties) && count($excluded_properties)) {
-            $definitions = ResourcePropertyDefinition::findBySql(
-                "INNER JOIN resource_category_properties rcp
-                ON resource_property_definitions.property_id = rcp.property_id
-                LEFT JOIN resource_property_groups rpg
-                ON resource_property_definitions.property_group_id = rpg.id
-                WHERE
-                rcp.category_id = :category_id
-                AND resource_property_definitions.name NOT IN (
-                    :excluded_properties
-                )
-                ORDER BY
-                type DESC, rpg.position ASC, rpg.name ASC,
-                resource_property_definitions.property_group_pos,
-                resource_property_definitions.name ASC",
-                [
-                    'category_id'         => $this->id,
-                    'excluded_properties' => $excluded_properties
-                ]
-            );
-
-            $empty_index          = _('Sonstige');
-            $empty_property_group = [
-                $empty_index => []
-            ];
-            $property_groups      = [];
-            foreach ($definitions as $definition) {
-                if ($definition->group && $definition->group->name) {
-                    $group_name = $definition->group->name;
-                    if (!is_array($property_groups[$group_name])) {
-                        $property_groups[$group_name] = [];
-                    }
-                    $property_groups[$group_name][] = $definition;
-                } else {
-                    $empty_property_group[$empty_index][] = $definition;
-                }
-            }
-            if ($empty_property_group[$empty_index]) {
-                return array_merge($property_groups, $empty_property_group);
-            } else {
-                return $property_groups;
-            }
-        }
-
-        //No excluded properties are specified.
-        //We can return all property definitions.
-        $definitions = ResourcePropertyDefinition::findBySql(
-            "INNER JOIN resource_category_properties rcp
-            ON resource_property_definitions.property_id = rcp.property_id
-            LEFT JOIN resource_property_groups rpg
-            ON resource_property_definitions.property_group_id = rpg.id
-            WHERE
-            rcp.category_id = :category_id
-            ORDER BY
-            rpg.position ASC, rpg.name ASC,
-            resource_property_definitions.property_group_pos,
-            resource_property_definitions.name ASC",
-            [
-                'category_id' => $this->id
-            ]
-        );
-
-        $empty_index          = _('Sonstige');
-        $empty_property_group = [
-            $empty_index => []
-        ];
-        $property_groups      = [];
-        foreach ($definitions as $definition) {
-            if ($definition->group->name) {
-                $group_name = $definition->group->name;
-                if (!is_array($property_groups[$group_name])) {
-                    $property_groups[$group_name] = [];
-                }
-                $property_groups[$group_name][] = $definition;
-            } else {
-                $empty_property_group[$empty_index][] = $definition;
-            }
-        }
-        if ($empty_property_group[$empty_index]) {
-            return array_merge($property_groups, $empty_property_group);
-        } else {
-            return $property_groups;
-        }
-    }
-
-    /**
-     * Adds a property to this category. If the property doesn't exist
-     * it will be created.
-     *
-     * @param string $name The name of the property.
-     * @param string $type The type of the property.
-     * @param bool $requestable Whether the property is requestable or not.
-     *     Defaults to false.
-     * @param bool $protected Whether the property is protected or not.
-     *     Defaults to false.
-     * @param string $write_permission_level
-     * @return ResourceCategoryProperty The created or updated
-     *     resource category property.
-     * @throws ResourcePropertyDefinitionException If the property definition
-     *     cannot be created.
-     *
-     * @throws ResourcePropertyException If the property cannot be created.
-     */
-    public function addProperty(
-        $name = '',
-        $type = 'bool',
-        $requestable = false,
-        $protected = false,
-        $write_permission_level = 'autor'
-    )
-    {
-        if (!$name) {
-            throw new ResourcePropertyException(
-                _('Es wurde kein Name für die Eigenschaft angegeben!')
-            );
-        }
-
-        $defined_types = ResourcePropertyDefinition::getDefinedTypes();
-
-        if (!in_array($type, $defined_types)) {
-            throw new ResourcePropertyException(
-                sprintf(
-                    _('Der Eigenschaftstyp %s ist ungültig!'),
-                    $type
-                )
-            );
-        }
-
-        if (!in_array($write_permission_level, ['user', 'autor', 'tutor', 'admin'])) {
-            throw new ResourcePropertyException(
-                sprintf(
-                    _('Die Rechtestufe %s ist ungültig!'),
-                    $write_permission_level
-                )
-            );
-        }
-
-        $existing_property = ResourceCategoryProperty::findOneBySql(
-            'INNER JOIN resource_property_definitions rpd
-            ON resource_category_properties.property_id = rpd.property_id
-            WHERE
-            resource_category_properties.category_id = :category_id
-            AND
-            rpd.name = :name
-            AND
-            rpd.type = :type',
-            [
-                'category_id' => $this->id,
-                'name'        => $name,
-                'type'        => $type
-            ]
-        );
-
-        if ($existing_property) {
-            $existing_property->requestable = $requestable ? '1' : '0';
-            $existing_property->protected   = $protected ? '1' : '0';
-            if ($existing_property->isDirty() && !$existing_property->store()) {
-                throw new ResourcePropertyException(
-                    sprintf(
-                        _('Fehler beim Aktualisieren der Eigenschaft %1$s (vom Typ %2$s)!'),
-                        $name,
-                        $type
-                    )
-                );
-            }
-            return $existing_property;
-        } else {
-            $definition = ResourcePropertyDefinition::findOneBySql(
-                'name = :name AND type = :type',
-                [
-                    'name' => $name,
-                    'type' => $type
-                ]
-            );
-
-            if (!$definition) {
-                $definition       = new ResourcePropertyDefinition();
-                $definition->name = $name;
-                $definition->type = $type;
-                if (!$definition->store()) {
-                    throw new ResourcePropertyDefinitionException(
-                        sprintf(
-                            _('Fehler beim Speichern der Definition der Eigenschaft %1$s (vom Typ %2$s)!'),
-                            $name,
-                            $type
-                        )
-                    );
-                }
-            }
-
-            $property              = new ResourceCategoryProperty();
-            $property->property_id = $definition->id;
-            $property->category_id = $this->id;
-            $property->requestable = $requestable ? '1' : '0';
-            $property->protected   = $protected ? '1' : '0';
-
-            if ($property->store()) {
-                return $property;
-            } else {
-                throw new ResourcePropertyException(
-                    sprintf(
-                        _('Fehler beim Speichern der neuen Eigenschaft %1$s (vom Typ %2$s)!'),
-                        $name,
-                        $type
-                    )
-                );
-            }
-        }
-    }
-
-    /**
-     * Creates a resource object which belongs to this category.
-     * All properties which are mandatory for resources of this
-     * category are set to default values unless they are specified in the
-     * properties array.
-     *
-     * @param string $name The name of the new resource.
-     * @param string $description The description of the new resource.
-     * @param string $parent_id The parent resource's ID (if any).
-     * @param array $properties An associative array in the form [$key] = $value
-     *     containing the defined properties which can be set to this resource.
-     * @param bool $ignore_invalid If set to true, invalid values or invalid
-     *     property names are ignored and no exception is thrown if an invalid
-     *     value or property name occurs. Instead an invalid valud will be replaced
-     *     with a default value and an invalid property name will not result
-     *     in a set property.
-     *
-     * @return Resource New Resource object which is a member of this resource category.
-     * @throws InvalidResourceException if the resource cannot be stored.
-     * @throws ResourcePropertyException If the name of the resource property
-     *     is not defined for this resource category.
-     * @throws InvalidResourceCategoryException if the class_name attribute of
-     *     the resource category contains a class name of a class which is not
-     *     derived from the Resource class.
-     */
-    public function createResource(
-        $name = '',
-        $description = '',
-        $parent_id = '',
-        $properties = [],
-        $ignore_invalid = false
-    )
-    {
-        if (($this->class_name != 'Resource') and
-            !is_subclass_of($this->class_name, 'Resource')) {
-            //Invalid resource category specification:
-            //All class names for a resource category must be derived from the
-            //resource class!
-            throw new InvalidResourceCategoryException(
-                sprintf(
-                    _('Die Ressourcenkategorie %1$s ist ungültig, da die dort angegebene Klasse %2$s nicht von der Klasse Resource abgeleitet ist!'),
-                    $this->name,
-                    $this->class_name
-                )
-            );
-        }
-
-        $resource              = new $this->class_name;
-        $resource->parent_id   = $parent_id;
-        $resource->category_id = $this->id;
-        $resource->name        = $name;
-        $resource->description = $description;
-
-        if (!$resource->store()) {
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Fehler beim Speichern der Resource %1$s!'),
-                    $resource->name
-                )
-            );
-        }
-
-        //The resource is stored. We can now store its attributes:
-        if ($properties) {
-            foreach ($properties as $name => $state) {
-                try {
-                    $resource->setProperty($name, $state);
-                } catch (ResourcePropertyException $e) {
-                    if (!$ignore_invalid) {
-                        throw $e;
-                    }
-                }
-            }
-        }
-
-        return $resource;
-    }
-
-    /**
-     * Returns the default state for a resource property.
-     * Depending on the type of the resource property
-     * different state is returned.
-     *
-     * @param ResourcePropertyDefinition $definition The definition of a
-     *     resource property whose default state shall be returned.
-     *
-     * @return mixed The default state for the property type,
-     *     specified by the given property definition.
-     */
-    protected function setPropertyDefaultState(
-        ResourcePropertyDefinition $definition
-    )
-    {
-        switch ($definition->type) {
-            case 'bool':
-                return false;
-            case 'num':
-                return 0;
-            case 'select':
-                //Set the first option as default.
-                //For that, we have to split the option list first,
-                //since it containts semicolon separated values:
-                $options = explode(';', $definition->options);
-                return $options[0];
-            case 'user':
-                //Return the ID of the current user:
-                return User::findCurrent()->id;
-            case 'position':
-                return '+0.0+0.0+0.0CRSWGS_84/';
-            case 'institute':
-            case 'fileref':
-            case 'url':
-            case 'text':
-                return '';
-        }
-    }
-
-    /**
-     * Creates a ResourceProperty object for a specified Resource object.
-     *
-     * @param Resource $resource The resource for which the ResourceProperty
-     *     object shall be built.
-     * @param string $name The name of the property.
-     * @param string $state The value of the property.
-     *
-     * @return ResourceProperty A ResourceProperty object
-     *     for the given Resource object.
-     * @throws ResourcePropertyException If the name of the resource property
-     *     is not defined for this resource category.
-     *
-     * @throws InvalidResourceCategoryException If this resource category
-     *     doesn't match the category of the resource object.
-     */
-    public function createDefinedResourceProperty(Resource $resource, $name, $state = null)
-    {
-        if ($resource->category_id != $this->id) {
-            throw new InvalidResourceCategoryException(
-                sprintf(
-                    _('Die Ressource %1$s ist kein Mitglied der Ressourcenkategorie %2$s!'),
-                    $resource->name,
-                    $this->name
-                )
-            );
-        }
-
-        if (!$resource->id) {
-            //The resource has no ID: probably it is a new resource.
-            if ($resource->isNew()) {
-                //We need an ID so we have to create one:
-                $resource->getNewId();
-            } else {
-                throw new InvalidResourceException(
-                    sprintf(
-                        _('Die Ressource %1$s besitzt keine ID!'),
-                        $resource->name
-                    )
-                );
-            }
-        }
-
-
-        //get property definition:
-        $definition = ResourcePropertyDefinition::findOneBySql(
-            'INNER JOIN resource_category_properties rcp
-                ON rcp.property_id = resource_property_definitions.property_id
-            WHERE category_id = :category_id
-            AND name = :name
-            LIMIT 1',
-            [
-                'category_id' => $this->id,
-                'name'        => $name
-            ]
-        );
-
-        if (!$definition) {
-            //Property is undefined for this resource category:
-            throw new ResourcePropertyException(
-                sprintf(
-                    _('Die Eigenschaft %1$s ist für die Ressourcenkategorie %2$s nicht definiert!'),
-                    $name,
-                    $this->name
-                )
-            );
-        }
-
-        $property              = new ResourceProperty();
-        $property->resource_id = $resource->id;
-        $property->property_id = $definition->id;
-
-        //if state is not set we can set it to defined default values
-        //for some state types:
-        if ($state === null) {
-            $property->state = self::setPropertyDefaultState($definition);
-        } else {
-            $property->state = $state;
-        }
-
-        return $property;
-    }
-
-    /**
-     * Creates a ResourceRequestProperty object
-     * for a specified ResourceRequest object.
-     *
-     * @param ResourceRequest $request The resource request for which the
-     *     ResourceRequestProperty object shall be built.
-     * @param string $name The name of the property.
-     * @param string $state The value of the property.
-     *
-     * @return ResourceRequestProperty A ResourceProperty object for the
-     *     given Resource object.
-     * @throws ResourcePropertyException If the name of the resource property is
-     *     not defined for the resource category of the resource request.
-     *
-     * @throws InvalidResourceCategoryException If this resource category
-     *     doesn't match the resource category of the resource request object.
-     */
-    public function createDefinedResourceRequestProperty(
-        ResourceRequest $request,
-        $name,
-        $state = null
-    )
-    {
-        if ($request->category_id != $this->id) {
-            throw new InvalidResourceCategoryException(
-                sprintf(
-                    _('Die Resourcenanfrage %1$s ist kein Mitglied der Ressourcenkategorie %2$s!'),
-                    $request->name,
-                    $this->name
-                )
-            );
-        }
-
-        if (!$request->id) {
-            //The request has no ID: probably it is a new resource request.
-            if ($request->isNew()) {
-                //We need an ID so we have to create one:
-                $request->id = $request->getNewId();
-            } else {
-                throw new InvalidResourceRequestException(
-                    sprintf(
-                        _('Die Ressourcenanfrage %1$s besitzt keine ID!'),
-                        $request->name
-                    )
-                );
-            }
-        }
-
-        //get property definition:
-        $definition = ResourcePropertyDefinition::findOneBySql(
-            'INNER JOIN resource_category_properties rcp
-                ON rcp.property_id = resource_property_definitions.property_id
-            WHERE category_id = :category_id
-            AND name = :name
-            LIMIT 1',
-            [
-                'category_id' => $this->id,
-                'name'        => $name
-            ]
-        );
-
-        if (!$definition) {
-            //Property is undefined for this resource category:
-            throw new ResourcePropertyException(
-                sprintf(
-                    _('Die Eigenschaft %1$s ist für die Ressourcenkategorie %2$s nicht definiert!'),
-                    $name,
-                    $this->name
-                )
-            );
-        }
-
-        $property              = new ResourceRequestProperty();
-        $property->request_id  = $request->id;
-        $property->property_id = $definition->id;
-
-        //if state is not set we can set it to defined default values
-        //for some state types:
-        if ($state === null) {
-            $property->state = self::setPropertyDefaultState($definition);
-        } else {
-            $property->state = $state;
-        }
-
-        return $property;
-    }
-
-    public function getRequestableProperties()
-    {
-        return ResourcePropertyDefinition::findBySql(
-            "INNER JOIN resource_category_properties
-            USING (property_id)
-            WHERE
-            resource_category_properties.category_id = :category_id
-            AND
-            resource_category_properties.requestable = '1'
-            ORDER BY type DESC, name ASC",
-            [
-                'category_id' => $this->id
-            ]
-        );
-    }
-
-    /**
-     * Determines if this resource category has a property with the
-     * specified name and type.
-     *
-     * @param string $name The requested property name.
-     * @param string $type The requested property type (optional).
-     *
-     * @return bool True, if a property with the specified name and type
-     *     exists, false otherwise.
-     */
-    public function hasProperty($name = '', $type = null)
-    {
-        if ($type) {
-            return ResourceCategoryProperty::countBySql(
-                    'INNER JOIN resource_property_definitions
-                USING (property_id)
-                WHERE
-                name = :name
-                AND
-                type = :type
-                AND
-                category_id = :category_id',
-                    [
-                        'name'        => $name,
-                        'type'        => $type,
-                        'category_id' => $this->id
-                    ]
-                ) > 0;
-        } else {
-            return ResourceCategoryProperty::countBySql(
-                    'INNER JOIN resource_property_definitions
-                USING (property_id)
-                WHERE
-                name = :name
-                AND
-                category_id = :category_id',
-                    [
-                        'name'        => $name,
-                        'category_id' => $this->id
-                    ]
-                ) > 0;
-        }
-    }
-
-    /**
-     * Determines if the user has write permissions for the
-     * resource property specified by its name.
-     *
-     * @param string The name of the resource property definition.
-     * @param User $user The user whose permissions shall be checked.
-     * @param Resource|null $resource An optional resource that shall be used
-     *     to check for non-global permissions.
-     *
-     * @return bool True, if the user has write permissions, false otherwise.
-     * @throws ResourcePropertyDefinitionException If no property is found.
-     *
-     */
-    public function userHasPropertyWritePermissions(string $name, User $user, $resource = null)
-    {
-        $property = ResourcePropertyDefinition::findOneBySql(
-            'name = :name',
-            [
-                'name' => $name
-            ]
-        );
-
-        if (!$property) {
-            throw new ResourcePropertyDefinitionException(
-                sprintf(
-                    _('Die Ressourceneigenschaft %s existiert nicht!'),
-                    $name
-                )
-            );
-        }
-
-        if ($property->write_permission_level == 'admin-global') {
-            return ResourceManager::userHasGlobalPermission(
-                $user,
-                'admin'
-            );
-        } elseif ($resource instanceof Resource) {
-            //It must be a permission for the specified resource.
-            return $resource->userHasPermission(
-                $user,
-                $property->write_permission_level
-            );
-        } else {
-            //We cannot check permissions.
-            return false;
-        }
-    }
-
-    /**
-     * Get the icon of a category
-     * @param string $role
-     * @return Icon
-     */
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        if ($this->iconnr == 0) {
-            //No special icon
-            return Icon::create('resources', $role);
-        } elseif ($this->iconnr == 1) {
-            return Icon::create('home', $role);
-        } else {
-            //No known icon
-            return Icon::create('resources', $role);
-        }
-    }
-}
diff --git a/lib/models/resources/ResourceCategory.php b/lib/models/resources/ResourceCategory.php
new file mode 100644
index 0000000..766a5f6
--- /dev/null
+++ b/lib/models/resources/ResourceCategory.php
@@ -0,0 +1,806 @@
+<?php
+
+/**
+ * ResourceCategory.class.php - model class for resource categories
+ *
+ * The ResourceCategory class can be used as a Factory for
+ * Resource objects.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.1
+ *
+ * @property string $id database column
+ * @property string $name database column
+ * @property string $description database column
+ * @property int $system database column
+ * @property int|null $iconnr database column
+ * @property string $class_name database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|ResourceCategoryProperty[] $property_links has_many ResourceCategoryProperty
+ * @property SimpleORMapCollection|ResourcePropertyDefinition[] $property_definitions has_and_belongs_to_many ResourcePropertyDefinition
+ */
+class ResourceCategory extends SimpleORMap
+{
+    private static $cache;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_categories';
+
+        $config['has_and_belongs_to_many']['property_definitions'] = [
+            'class_name'        => ResourcePropertyDefinition::class,
+            'assoc_foreign_key' => 'property_id',
+            'thru_table'        => 'resource_category_properties',
+            'thru_key'          => 'category_id',
+            'order_by'          => 'ORDER BY name ASC'
+        ];
+
+        $config['has_many']['property_links'] = [
+            'class_name'  => ResourceCategoryProperty::class,
+            'assoc_func'  => 'findByCategory_id',
+            'foreign_key' => 'id',
+            'on_delete'   => 'delete'
+        ];
+
+        $config['registered_callbacks']['after_create'][] = function ($category) {
+            self::$cache[$category->id] = $category;
+        };
+        $config['registered_callbacks']['after_store'][] = function ($category) {
+            self::$cache[$category->id] = $category;
+        };
+        $config['registered_callbacks']['after_delete'][] = function ($category) {
+            unset(self::$cache[$category->id]);
+        };
+
+        parent::configure($config);
+    }
+
+    /**
+     * Retrieves all resource categories from the database.
+     * @param bool $force_reload
+     * @return ResourceCategory[] An array of ResourceCategory objects
+     *     or an empty array if no resource categories are defined.
+     */
+    public static function findAll($force_reload = false)
+    {
+        if (!is_array(self::$cache) || $force_reload) {
+            self::$cache = [];
+            foreach (self::findBySql('1 ORDER BY name') as $one) {
+                self::$cache[$one->id] = $one;
+            }
+        }
+        return self::$cache;
+    }
+
+    public static function find($id)
+    {
+        $all = self::findAll();
+        return $all[$id] ?? null;
+    }
+
+    /**
+     * "Converts" a category-ID to a class name by looking up the
+     * class name of a specified category.
+     *
+     * @param string $category_id The category-ID of the specified category.
+     *
+     * @return string The class name field of the category which is specified
+     *     by $category_id. In case no category could be found, an empty
+     *     string is returned.
+     */
+    public static function getClassNameById($category_id)
+    {
+        $category = self::find($category_id);
+        if ($category) {
+            return $category->class_name;
+        }
+        return '';
+    }
+
+    public function hasResources()
+    {
+        $db   = DBManager::get();
+        $stmt = $db->prepare(
+            "SELECT 1 FROM resources WHERE category_id = :category_id LIMIT 1"
+        );
+        $stmt->execute(['category_id' => $this->id]);
+        return $stmt->fetchColumn() !== false;
+    }
+
+    /**
+     * Retrieves the definitions of all properties that are available
+     * for this resource category.
+     *
+     * @param string[] excluded_properties An array with the names
+     *     of the properties that shall be excluded from the result set.
+     *
+     * @return ResourcePropertyDefinition[] An array of resource property
+     *     definitions.
+     */
+    public function getPropertyDefinitions($excluded_properties = [])
+    {
+        if (is_array($excluded_properties) && count($excluded_properties)) {
+            return ResourcePropertyDefinition::findBySql(
+                "INNER JOIN resource_category_properties rcp
+                ON resource_property_definitions.property_id = rcp.property_id
+                WHERE
+                rcp.category_id = :category_id
+                AND resource_property_definitions.name NOT IN (
+                    :excluded_properties
+                )
+                ORDER BY resource_property_definitions.name ASC",
+                [
+                    'category_id'         => $this->id,
+                    'excluded_properties' => $excluded_properties
+                ]
+            );
+        }
+
+        //No excluded properties are specified.
+        //We can return all property definitions.
+        return ResourcePropertyDefinition::findBySql(
+            "INNER JOIN resource_category_properties rcp
+            ON resource_property_definitions.property_id = rcp.property_id
+            WHERE
+            rcp.category_id = :category_id
+            ORDER BY resource_property_definitions.name ASC",
+            [
+                'category_id' => $this->id
+            ]
+        );
+    }
+
+    /**
+     * This method returns the same properties as getPropertyDefinitions,
+     * but grouped and ordered by the property groups and the position of the
+     * property in that group.
+     *
+     * @return array An array with the group names as keys and the properties
+     *     in the second array dimension. The structure of the array
+     *     is as follows:
+     *     [
+     *          group1 name => [
+     *              property1,
+     *              property2,
+     *              ...
+     *          ],
+     *          group2 name => [
+     *              ...
+     *          ]
+     *     ]
+     */
+    public function getGroupedPropertyDefinitions($excluded_properties = [])
+    {
+        if (is_array($excluded_properties) && count($excluded_properties)) {
+            $definitions = ResourcePropertyDefinition::findBySql(
+                "INNER JOIN resource_category_properties rcp
+                ON resource_property_definitions.property_id = rcp.property_id
+                LEFT JOIN resource_property_groups rpg
+                ON resource_property_definitions.property_group_id = rpg.id
+                WHERE
+                rcp.category_id = :category_id
+                AND resource_property_definitions.name NOT IN (
+                    :excluded_properties
+                )
+                ORDER BY
+                type DESC, rpg.position ASC, rpg.name ASC,
+                resource_property_definitions.property_group_pos,
+                resource_property_definitions.name ASC",
+                [
+                    'category_id'         => $this->id,
+                    'excluded_properties' => $excluded_properties
+                ]
+            );
+
+            $empty_index          = _('Sonstige');
+            $empty_property_group = [
+                $empty_index => []
+            ];
+            $property_groups      = [];
+            foreach ($definitions as $definition) {
+                if ($definition->group && $definition->group->name) {
+                    $group_name = $definition->group->name;
+                    if (!is_array($property_groups[$group_name])) {
+                        $property_groups[$group_name] = [];
+                    }
+                    $property_groups[$group_name][] = $definition;
+                } else {
+                    $empty_property_group[$empty_index][] = $definition;
+                }
+            }
+            if ($empty_property_group[$empty_index]) {
+                return array_merge($property_groups, $empty_property_group);
+            } else {
+                return $property_groups;
+            }
+        }
+
+        //No excluded properties are specified.
+        //We can return all property definitions.
+        $definitions = ResourcePropertyDefinition::findBySql(
+            "INNER JOIN resource_category_properties rcp
+            ON resource_property_definitions.property_id = rcp.property_id
+            LEFT JOIN resource_property_groups rpg
+            ON resource_property_definitions.property_group_id = rpg.id
+            WHERE
+            rcp.category_id = :category_id
+            ORDER BY
+            rpg.position ASC, rpg.name ASC,
+            resource_property_definitions.property_group_pos,
+            resource_property_definitions.name ASC",
+            [
+                'category_id' => $this->id
+            ]
+        );
+
+        $empty_index          = _('Sonstige');
+        $empty_property_group = [
+            $empty_index => []
+        ];
+        $property_groups      = [];
+        foreach ($definitions as $definition) {
+            if ($definition->group->name) {
+                $group_name = $definition->group->name;
+                if (!is_array($property_groups[$group_name])) {
+                    $property_groups[$group_name] = [];
+                }
+                $property_groups[$group_name][] = $definition;
+            } else {
+                $empty_property_group[$empty_index][] = $definition;
+            }
+        }
+        if ($empty_property_group[$empty_index]) {
+            return array_merge($property_groups, $empty_property_group);
+        } else {
+            return $property_groups;
+        }
+    }
+
+    /**
+     * Adds a property to this category. If the property doesn't exist
+     * it will be created.
+     *
+     * @param string $name The name of the property.
+     * @param string $type The type of the property.
+     * @param bool $requestable Whether the property is requestable or not.
+     *     Defaults to false.
+     * @param bool $protected Whether the property is protected or not.
+     *     Defaults to false.
+     * @param string $write_permission_level
+     * @return ResourceCategoryProperty The created or updated
+     *     resource category property.
+     * @throws ResourcePropertyDefinitionException If the property definition
+     *     cannot be created.
+     *
+     * @throws ResourcePropertyException If the property cannot be created.
+     */
+    public function addProperty(
+        $name = '',
+        $type = 'bool',
+        $requestable = false,
+        $protected = false,
+        $write_permission_level = 'autor'
+    )
+    {
+        if (!$name) {
+            throw new ResourcePropertyException(
+                _('Es wurde kein Name für die Eigenschaft angegeben!')
+            );
+        }
+
+        $defined_types = ResourcePropertyDefinition::getDefinedTypes();
+
+        if (!in_array($type, $defined_types)) {
+            throw new ResourcePropertyException(
+                sprintf(
+                    _('Der Eigenschaftstyp %s ist ungültig!'),
+                    $type
+                )
+            );
+        }
+
+        if (!in_array($write_permission_level, ['user', 'autor', 'tutor', 'admin'])) {
+            throw new ResourcePropertyException(
+                sprintf(
+                    _('Die Rechtestufe %s ist ungültig!'),
+                    $write_permission_level
+                )
+            );
+        }
+
+        $existing_property = ResourceCategoryProperty::findOneBySql(
+            'INNER JOIN resource_property_definitions rpd
+            ON resource_category_properties.property_id = rpd.property_id
+            WHERE
+            resource_category_properties.category_id = :category_id
+            AND
+            rpd.name = :name
+            AND
+            rpd.type = :type',
+            [
+                'category_id' => $this->id,
+                'name'        => $name,
+                'type'        => $type
+            ]
+        );
+
+        if ($existing_property) {
+            $existing_property->requestable = $requestable ? '1' : '0';
+            $existing_property->protected   = $protected ? '1' : '0';
+            if ($existing_property->isDirty() && !$existing_property->store()) {
+                throw new ResourcePropertyException(
+                    sprintf(
+                        _('Fehler beim Aktualisieren der Eigenschaft %1$s (vom Typ %2$s)!'),
+                        $name,
+                        $type
+                    )
+                );
+            }
+            return $existing_property;
+        } else {
+            $definition = ResourcePropertyDefinition::findOneBySql(
+                'name = :name AND type = :type',
+                [
+                    'name' => $name,
+                    'type' => $type
+                ]
+            );
+
+            if (!$definition) {
+                $definition       = new ResourcePropertyDefinition();
+                $definition->name = $name;
+                $definition->type = $type;
+                if (!$definition->store()) {
+                    throw new ResourcePropertyDefinitionException(
+                        sprintf(
+                            _('Fehler beim Speichern der Definition der Eigenschaft %1$s (vom Typ %2$s)!'),
+                            $name,
+                            $type
+                        )
+                    );
+                }
+            }
+
+            $property              = new ResourceCategoryProperty();
+            $property->property_id = $definition->id;
+            $property->category_id = $this->id;
+            $property->requestable = $requestable ? '1' : '0';
+            $property->protected   = $protected ? '1' : '0';
+
+            if ($property->store()) {
+                return $property;
+            } else {
+                throw new ResourcePropertyException(
+                    sprintf(
+                        _('Fehler beim Speichern der neuen Eigenschaft %1$s (vom Typ %2$s)!'),
+                        $name,
+                        $type
+                    )
+                );
+            }
+        }
+    }
+
+    /**
+     * Creates a resource object which belongs to this category.
+     * All properties which are mandatory for resources of this
+     * category are set to default values unless they are specified in the
+     * properties array.
+     *
+     * @param string $name The name of the new resource.
+     * @param string $description The description of the new resource.
+     * @param string $parent_id The parent resource's ID (if any).
+     * @param array $properties An associative array in the form [$key] = $value
+     *     containing the defined properties which can be set to this resource.
+     * @param bool $ignore_invalid If set to true, invalid values or invalid
+     *     property names are ignored and no exception is thrown if an invalid
+     *     value or property name occurs. Instead an invalid valud will be replaced
+     *     with a default value and an invalid property name will not result
+     *     in a set property.
+     *
+     * @return Resource New Resource object which is a member of this resource category.
+     * @throws InvalidResourceException if the resource cannot be stored.
+     * @throws ResourcePropertyException If the name of the resource property
+     *     is not defined for this resource category.
+     * @throws InvalidResourceCategoryException if the class_name attribute of
+     *     the resource category contains a class name of a class which is not
+     *     derived from the Resource class.
+     */
+    public function createResource(
+        $name = '',
+        $description = '',
+        $parent_id = '',
+        $properties = [],
+        $ignore_invalid = false
+    )
+    {
+        if (($this->class_name != 'Resource') and
+            !is_subclass_of($this->class_name, 'Resource')) {
+            //Invalid resource category specification:
+            //All class names for a resource category must be derived from the
+            //resource class!
+            throw new InvalidResourceCategoryException(
+                sprintf(
+                    _('Die Ressourcenkategorie %1$s ist ungültig, da die dort angegebene Klasse %2$s nicht von der Klasse Resource abgeleitet ist!'),
+                    $this->name,
+                    $this->class_name
+                )
+            );
+        }
+
+        $resource              = new $this->class_name;
+        $resource->parent_id   = $parent_id;
+        $resource->category_id = $this->id;
+        $resource->name        = $name;
+        $resource->description = $description;
+
+        if (!$resource->store()) {
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Fehler beim Speichern der Resource %1$s!'),
+                    $resource->name
+                )
+            );
+        }
+
+        //The resource is stored. We can now store its attributes:
+        if ($properties) {
+            foreach ($properties as $name => $state) {
+                try {
+                    $resource->setProperty($name, $state);
+                } catch (ResourcePropertyException $e) {
+                    if (!$ignore_invalid) {
+                        throw $e;
+                    }
+                }
+            }
+        }
+
+        return $resource;
+    }
+
+    /**
+     * Returns the default state for a resource property.
+     * Depending on the type of the resource property
+     * different state is returned.
+     *
+     * @param ResourcePropertyDefinition $definition The definition of a
+     *     resource property whose default state shall be returned.
+     *
+     * @return mixed The default state for the property type,
+     *     specified by the given property definition.
+     */
+    protected function setPropertyDefaultState(
+        ResourcePropertyDefinition $definition
+    )
+    {
+        switch ($definition->type) {
+            case 'bool':
+                return false;
+            case 'num':
+                return 0;
+            case 'select':
+                //Set the first option as default.
+                //For that, we have to split the option list first,
+                //since it containts semicolon separated values:
+                $options = explode(';', $definition->options);
+                return $options[0];
+            case 'user':
+                //Return the ID of the current user:
+                return User::findCurrent()->id;
+            case 'position':
+                return '+0.0+0.0+0.0CRSWGS_84/';
+            case 'institute':
+            case 'fileref':
+            case 'url':
+            case 'text':
+                return '';
+        }
+    }
+
+    /**
+     * Creates a ResourceProperty object for a specified Resource object.
+     *
+     * @param Resource $resource The resource for which the ResourceProperty
+     *     object shall be built.
+     * @param string $name The name of the property.
+     * @param string $state The value of the property.
+     *
+     * @return ResourceProperty A ResourceProperty object
+     *     for the given Resource object.
+     * @throws ResourcePropertyException If the name of the resource property
+     *     is not defined for this resource category.
+     *
+     * @throws InvalidResourceCategoryException If this resource category
+     *     doesn't match the category of the resource object.
+     */
+    public function createDefinedResourceProperty(Resource $resource, $name, $state = null)
+    {
+        if ($resource->category_id != $this->id) {
+            throw new InvalidResourceCategoryException(
+                sprintf(
+                    _('Die Ressource %1$s ist kein Mitglied der Ressourcenkategorie %2$s!'),
+                    $resource->name,
+                    $this->name
+                )
+            );
+        }
+
+        if (!$resource->id) {
+            //The resource has no ID: probably it is a new resource.
+            if ($resource->isNew()) {
+                //We need an ID so we have to create one:
+                $resource->getNewId();
+            } else {
+                throw new InvalidResourceException(
+                    sprintf(
+                        _('Die Ressource %1$s besitzt keine ID!'),
+                        $resource->name
+                    )
+                );
+            }
+        }
+
+
+        //get property definition:
+        $definition = ResourcePropertyDefinition::findOneBySql(
+            'INNER JOIN resource_category_properties rcp
+                ON rcp.property_id = resource_property_definitions.property_id
+            WHERE category_id = :category_id
+            AND name = :name
+            LIMIT 1',
+            [
+                'category_id' => $this->id,
+                'name'        => $name
+            ]
+        );
+
+        if (!$definition) {
+            //Property is undefined for this resource category:
+            throw new ResourcePropertyException(
+                sprintf(
+                    _('Die Eigenschaft %1$s ist für die Ressourcenkategorie %2$s nicht definiert!'),
+                    $name,
+                    $this->name
+                )
+            );
+        }
+
+        $property              = new ResourceProperty();
+        $property->resource_id = $resource->id;
+        $property->property_id = $definition->id;
+
+        //if state is not set we can set it to defined default values
+        //for some state types:
+        if ($state === null) {
+            $property->state = self::setPropertyDefaultState($definition);
+        } else {
+            $property->state = $state;
+        }
+
+        return $property;
+    }
+
+    /**
+     * Creates a ResourceRequestProperty object
+     * for a specified ResourceRequest object.
+     *
+     * @param ResourceRequest $request The resource request for which the
+     *     ResourceRequestProperty object shall be built.
+     * @param string $name The name of the property.
+     * @param string $state The value of the property.
+     *
+     * @return ResourceRequestProperty A ResourceProperty object for the
+     *     given Resource object.
+     * @throws ResourcePropertyException If the name of the resource property is
+     *     not defined for the resource category of the resource request.
+     *
+     * @throws InvalidResourceCategoryException If this resource category
+     *     doesn't match the resource category of the resource request object.
+     */
+    public function createDefinedResourceRequestProperty(
+        ResourceRequest $request,
+        $name,
+        $state = null
+    )
+    {
+        if ($request->category_id != $this->id) {
+            throw new InvalidResourceCategoryException(
+                sprintf(
+                    _('Die Resourcenanfrage %1$s ist kein Mitglied der Ressourcenkategorie %2$s!'),
+                    $request->name,
+                    $this->name
+                )
+            );
+        }
+
+        if (!$request->id) {
+            //The request has no ID: probably it is a new resource request.
+            if ($request->isNew()) {
+                //We need an ID so we have to create one:
+                $request->id = $request->getNewId();
+            } else {
+                throw new InvalidResourceRequestException(
+                    sprintf(
+                        _('Die Ressourcenanfrage %1$s besitzt keine ID!'),
+                        $request->name
+                    )
+                );
+            }
+        }
+
+        //get property definition:
+        $definition = ResourcePropertyDefinition::findOneBySql(
+            'INNER JOIN resource_category_properties rcp
+                ON rcp.property_id = resource_property_definitions.property_id
+            WHERE category_id = :category_id
+            AND name = :name
+            LIMIT 1',
+            [
+                'category_id' => $this->id,
+                'name'        => $name
+            ]
+        );
+
+        if (!$definition) {
+            //Property is undefined for this resource category:
+            throw new ResourcePropertyException(
+                sprintf(
+                    _('Die Eigenschaft %1$s ist für die Ressourcenkategorie %2$s nicht definiert!'),
+                    $name,
+                    $this->name
+                )
+            );
+        }
+
+        $property              = new ResourceRequestProperty();
+        $property->request_id  = $request->id;
+        $property->property_id = $definition->id;
+
+        //if state is not set we can set it to defined default values
+        //for some state types:
+        if ($state === null) {
+            $property->state = self::setPropertyDefaultState($definition);
+        } else {
+            $property->state = $state;
+        }
+
+        return $property;
+    }
+
+    public function getRequestableProperties()
+    {
+        return ResourcePropertyDefinition::findBySql(
+            "INNER JOIN resource_category_properties
+            USING (property_id)
+            WHERE
+            resource_category_properties.category_id = :category_id
+            AND
+            resource_category_properties.requestable = '1'
+            ORDER BY type DESC, name ASC",
+            [
+                'category_id' => $this->id
+            ]
+        );
+    }
+
+    /**
+     * Determines if this resource category has a property with the
+     * specified name and type.
+     *
+     * @param string $name The requested property name.
+     * @param string $type The requested property type (optional).
+     *
+     * @return bool True, if a property with the specified name and type
+     *     exists, false otherwise.
+     */
+    public function hasProperty($name = '', $type = null)
+    {
+        if ($type) {
+            return ResourceCategoryProperty::countBySql(
+                    'INNER JOIN resource_property_definitions
+                USING (property_id)
+                WHERE
+                name = :name
+                AND
+                type = :type
+                AND
+                category_id = :category_id',
+                    [
+                        'name'        => $name,
+                        'type'        => $type,
+                        'category_id' => $this->id
+                    ]
+                ) > 0;
+        } else {
+            return ResourceCategoryProperty::countBySql(
+                    'INNER JOIN resource_property_definitions
+                USING (property_id)
+                WHERE
+                name = :name
+                AND
+                category_id = :category_id',
+                    [
+                        'name'        => $name,
+                        'category_id' => $this->id
+                    ]
+                ) > 0;
+        }
+    }
+
+    /**
+     * Determines if the user has write permissions for the
+     * resource property specified by its name.
+     *
+     * @param string The name of the resource property definition.
+     * @param User $user The user whose permissions shall be checked.
+     * @param Resource|null $resource An optional resource that shall be used
+     *     to check for non-global permissions.
+     *
+     * @return bool True, if the user has write permissions, false otherwise.
+     * @throws ResourcePropertyDefinitionException If no property is found.
+     *
+     */
+    public function userHasPropertyWritePermissions(string $name, User $user, $resource = null)
+    {
+        $property = ResourcePropertyDefinition::findOneBySql(
+            'name = :name',
+            [
+                'name' => $name
+            ]
+        );
+
+        if (!$property) {
+            throw new ResourcePropertyDefinitionException(
+                sprintf(
+                    _('Die Ressourceneigenschaft %s existiert nicht!'),
+                    $name
+                )
+            );
+        }
+
+        if ($property->write_permission_level == 'admin-global') {
+            return ResourceManager::userHasGlobalPermission(
+                $user,
+                'admin'
+            );
+        } elseif ($resource instanceof Resource) {
+            //It must be a permission for the specified resource.
+            return $resource->userHasPermission(
+                $user,
+                $property->write_permission_level
+            );
+        } else {
+            //We cannot check permissions.
+            return false;
+        }
+    }
+
+    /**
+     * Get the icon of a category
+     * @param string $role
+     * @return Icon
+     */
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        if ($this->iconnr == 0) {
+            //No special icon
+            return Icon::create('resources', $role);
+        } elseif ($this->iconnr == 1) {
+            return Icon::create('home', $role);
+        } else {
+            //No known icon
+            return Icon::create('resources', $role);
+        }
+    }
+}
diff --git a/lib/models/resources/ResourceCategoryProperty.class.php b/lib/models/resources/ResourceCategoryProperty.class.php
deleted file mode 100644
index b1460cd..0000000
--- a/lib/models/resources/ResourceCategoryProperty.class.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * ResourceCategoryProperty.class.php - model class for
- * resource category properties
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property array $id alias for pk
- * @property string $category_id database column
- * @property string $property_id database column
- * @property int $requestable database column
- * @property int $protected database column
- * @property int $system database column
- * @property string|null $form_text database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property ResourcePropertyDefinition $definition belongs_to ResourcePropertyDefinition
- * @property mixed $name additional field
- * @property mixed $type additional field
- */
-
-
-class ResourceCategoryProperty extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_category_properties';
-
-        $config['belongs_to']['category'] = [
-            'class_name' => ResourceCategory::class,
-            'foreign_key' => 'category_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['belongs_to']['definition'] = [
-            'class_name' => ResourcePropertyDefinition::class,
-            'foreign_key' => 'property_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['additional_fields']['name'] = ['definition', 'name'];
-        $config['additional_fields']['type'] = ['definition', 'type'];
-
-        parent::configure($config);
-    }
-
-    public static function findByNameAndCategoryId($name, $category_id)
-    {
-        return self::findOneBySql(
-            'INNER JOIN resource_property_definitions rpd
-            USING (property_id)
-            WHERE
-            rpd.name = :name
-            AND
-            resource_category_properties.category_id = :category_id',
-            [
-                'name' => $name,
-                'category_id' => $category_id
-            ]
-        );
-    }
-}
diff --git a/lib/models/resources/ResourceCategoryProperty.php b/lib/models/resources/ResourceCategoryProperty.php
new file mode 100644
index 0000000..b1460cd
--- /dev/null
+++ b/lib/models/resources/ResourceCategoryProperty.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * ResourceCategoryProperty.class.php - model class for
+ * resource category properties
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property array $id alias for pk
+ * @property string $category_id database column
+ * @property string $property_id database column
+ * @property int $requestable database column
+ * @property int $protected database column
+ * @property int $system database column
+ * @property string|null $form_text database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property ResourcePropertyDefinition $definition belongs_to ResourcePropertyDefinition
+ * @property mixed $name additional field
+ * @property mixed $type additional field
+ */
+
+
+class ResourceCategoryProperty extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_category_properties';
+
+        $config['belongs_to']['category'] = [
+            'class_name' => ResourceCategory::class,
+            'foreign_key' => 'category_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['belongs_to']['definition'] = [
+            'class_name' => ResourcePropertyDefinition::class,
+            'foreign_key' => 'property_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['additional_fields']['name'] = ['definition', 'name'];
+        $config['additional_fields']['type'] = ['definition', 'type'];
+
+        parent::configure($config);
+    }
+
+    public static function findByNameAndCategoryId($name, $category_id)
+    {
+        return self::findOneBySql(
+            'INNER JOIN resource_property_definitions rpd
+            USING (property_id)
+            WHERE
+            rpd.name = :name
+            AND
+            resource_category_properties.category_id = :category_id',
+            [
+                'name' => $name,
+                'category_id' => $category_id
+            ]
+        );
+    }
+}
diff --git a/lib/models/resources/ResourceLabel.class.php b/lib/models/resources/ResourceLabel.class.php
deleted file mode 100644
index d9c869f..0000000
--- a/lib/models/resources/ResourceLabel.class.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-
-/**
- * ResourceLabel.class.php - model class for a resource label
- *
- * The ResourceLabel class represents headings or subheadings whose
- * only purpose is helping with organising the resource tree.
- * ResourceLabel instances must not be booked, reserved or locked.
- * Furthermore, they cannot be requested.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * All properties are inherited from the parent class (Resource).
- *
- * @property string $id database column
- * @property string $parent_id database column
- * @property string $category_id database column
- * @property int|null $level database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property int $requestable database column
- * @property int $lockable database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $sort_position database column
- * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
- * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
- * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
- * @property SimpleORMapCollection|Resource[] $children has_many Resource
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property Resource $parent belongs_to Resource
- * @property mixed $class_name additional field
- */
-class ResourceLabel extends Resource
-{
-    public function getFolder($create_if_missing = true)
-    {
-        return null;
-    }
-
-    public function setFolder(ResourceFolder $folder)
-    {
-        return false;
-    }
-
-    public function createFolder()
-    {
-        return null;
-    }
-
-    public function createSimpleBooking(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL
-    )
-    {
-        return null;
-    }
-
-    public function createBookingFromRequest(
-        User $user,
-        ResourceRequest $request,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $prepend_preparation_time = false,
-        $notify_lecturers = false
-    )
-    {
-        return null;
-    }
-
-    public function createBooking(
-        User $user,
-        $range_id = null,
-        $time_ranges = [],
-        $repetition_interval = null,
-        $repetition_amount = 0,
-        $repetition_end_date = null,
-        $preparation_time = 0,
-        $description = '',
-        $internal_comment = '',
-        $booking_type = ResourceBooking::TYPE_NORMAL,
-        $force_booking = false
-    )
-    {
-        return null;
-    }
-
-    public function createSimpleRequest(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $comment = '',
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createRequest(
-        User $user,
-        $date_range_ids = null,
-        $comment = '',
-        $properties = [],
-        $preparation_time = 0
-    )
-    {
-        return null;
-    }
-
-    public function createLock(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $internal_comment = ''
-    )
-    {
-        return null;
-    }
-
-    public function propertyExists($name = '')
-    {
-        //Resource labels don't have properties:
-        return false;
-    }
-
-    public function getPropertyObject(string $name)
-    {
-        return null;
-    }
-
-    public function getProperty(string $name)
-    {
-        return null;
-    }
-
-    public function getPropertyRelatedObject(string $name)
-    {
-        return null;
-    }
-
-    public function setProperty(string $name, $state = '', $user_id = null)
-    {
-        return false;
-    }
-
-    public function isPropertyEditable(string $name, User $user)
-    {
-        return false;
-    }
-
-    public function setPropertyByDefinitionId(
-        $property_definition_id = null,
-        $state = null
-    )
-    {
-        return false;
-    }
-
-    public function setPropertyRelatedObject(string $name, SimpleORMap $object)
-    {
-        return false;
-    }
-
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        return Icon::create('resource-label', $role);
-    }
-
-    public function getPropertyArray($only_requestable_properties = false)
-    {
-        return [];
-    }
-
-    public function isAssigned(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isReserved(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_reservation_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isLocked(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_lock_ids = []
-    )
-    {
-        return true;
-    }
-
-    public function isAvailable(
-        DateTime $begin,
-        DateTime $end,
-        $excluded_booking_ids = []
-    )
-    {
-        return false;
-    }
-
-    public function isAvailableForRequest(ResourceRequest $request)
-    {
-        return false;
-    }
-
-    public function getFullName()
-    {
-        return $this->name;
-    }
-
-    public function getOpenResourceRequests(DateTime $begin, DateTime $end)
-    {
-        return [];
-    }
-
-    public function getResourceBookings(DateTime $begin, DateTime $end, array $booking_types = [ResourceBooking::TYPE_NORMAL])
-    {
-        return [];
-    }
-
-    public function getResourceLocks(DateTime $begin, DateTime $end)
-    {
-        return [];
-    }
-
-    public function hasFiles()
-    {
-        return false;
-    }
-
-    public function checkHierarchy()
-    {
-        return true;
-    }
-
-    public function getItemAvatarURL()
-    {
-        return Icon::create('info',  Icon::ROLE_INFO)->asImagePath();
-    }
-}
diff --git a/lib/models/resources/ResourceLabel.php b/lib/models/resources/ResourceLabel.php
new file mode 100644
index 0000000..d9c869f
--- /dev/null
+++ b/lib/models/resources/ResourceLabel.php
@@ -0,0 +1,267 @@
+<?php
+
+/**
+ * ResourceLabel.class.php - model class for a resource label
+ *
+ * The ResourceLabel class represents headings or subheadings whose
+ * only purpose is helping with organising the resource tree.
+ * ResourceLabel instances must not be booked, reserved or locked.
+ * Furthermore, they cannot be requested.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * All properties are inherited from the parent class (Resource).
+ *
+ * @property string $id database column
+ * @property string $parent_id database column
+ * @property string $category_id database column
+ * @property int|null $level database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property int $requestable database column
+ * @property int $lockable database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $sort_position database column
+ * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
+ * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
+ * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
+ * @property SimpleORMapCollection|Resource[] $children has_many Resource
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property Resource $parent belongs_to Resource
+ * @property mixed $class_name additional field
+ */
+class ResourceLabel extends Resource
+{
+    public function getFolder($create_if_missing = true)
+    {
+        return null;
+    }
+
+    public function setFolder(ResourceFolder $folder)
+    {
+        return false;
+    }
+
+    public function createFolder()
+    {
+        return null;
+    }
+
+    public function createSimpleBooking(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL
+    )
+    {
+        return null;
+    }
+
+    public function createBookingFromRequest(
+        User $user,
+        ResourceRequest $request,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $prepend_preparation_time = false,
+        $notify_lecturers = false
+    )
+    {
+        return null;
+    }
+
+    public function createBooking(
+        User $user,
+        $range_id = null,
+        $time_ranges = [],
+        $repetition_interval = null,
+        $repetition_amount = 0,
+        $repetition_end_date = null,
+        $preparation_time = 0,
+        $description = '',
+        $internal_comment = '',
+        $booking_type = ResourceBooking::TYPE_NORMAL,
+        $force_booking = false
+    )
+    {
+        return null;
+    }
+
+    public function createSimpleRequest(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $comment = '',
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createRequest(
+        User $user,
+        $date_range_ids = null,
+        $comment = '',
+        $properties = [],
+        $preparation_time = 0
+    )
+    {
+        return null;
+    }
+
+    public function createLock(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $internal_comment = ''
+    )
+    {
+        return null;
+    }
+
+    public function propertyExists($name = '')
+    {
+        //Resource labels don't have properties:
+        return false;
+    }
+
+    public function getPropertyObject(string $name)
+    {
+        return null;
+    }
+
+    public function getProperty(string $name)
+    {
+        return null;
+    }
+
+    public function getPropertyRelatedObject(string $name)
+    {
+        return null;
+    }
+
+    public function setProperty(string $name, $state = '', $user_id = null)
+    {
+        return false;
+    }
+
+    public function isPropertyEditable(string $name, User $user)
+    {
+        return false;
+    }
+
+    public function setPropertyByDefinitionId(
+        $property_definition_id = null,
+        $state = null
+    )
+    {
+        return false;
+    }
+
+    public function setPropertyRelatedObject(string $name, SimpleORMap $object)
+    {
+        return false;
+    }
+
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        return Icon::create('resource-label', $role);
+    }
+
+    public function getPropertyArray($only_requestable_properties = false)
+    {
+        return [];
+    }
+
+    public function isAssigned(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isReserved(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_reservation_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isLocked(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_lock_ids = []
+    )
+    {
+        return true;
+    }
+
+    public function isAvailable(
+        DateTime $begin,
+        DateTime $end,
+        $excluded_booking_ids = []
+    )
+    {
+        return false;
+    }
+
+    public function isAvailableForRequest(ResourceRequest $request)
+    {
+        return false;
+    }
+
+    public function getFullName()
+    {
+        return $this->name;
+    }
+
+    public function getOpenResourceRequests(DateTime $begin, DateTime $end)
+    {
+        return [];
+    }
+
+    public function getResourceBookings(DateTime $begin, DateTime $end, array $booking_types = [ResourceBooking::TYPE_NORMAL])
+    {
+        return [];
+    }
+
+    public function getResourceLocks(DateTime $begin, DateTime $end)
+    {
+        return [];
+    }
+
+    public function hasFiles()
+    {
+        return false;
+    }
+
+    public function checkHierarchy()
+    {
+        return true;
+    }
+
+    public function getItemAvatarURL()
+    {
+        return Icon::create('info',  Icon::ROLE_INFO)->asImagePath();
+    }
+}
diff --git a/lib/models/resources/ResourcePermission.class.php b/lib/models/resources/ResourcePermission.class.php
deleted file mode 100644
index bd33708..0000000
--- a/lib/models/resources/ResourcePermission.class.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
- * ResourcePermission.class.php - model class for resource permissions.
- *
- * Description of the resources permission system:
- * - admin: An admin may do everything in the resource management:
- *     edit resource bookings and resources.
- * - tutor: A tutor may edit all resource bookings.
- * - autor: An autor may edit his own resource bookings only.
- * - user: A user may read internal comments on resource bookings.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property array $id alias for pk
- * @property string $user_id database column
- * @property string $resource_id database column
- * @property string $perms database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property User $user belongs_to User
- * @property Resource $resource belongs_to Resource
- */
-class ResourcePermission extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_permissions';
-
-        $config['belongs_to']['user'] = [
-            'class_name' => User::class,
-            'foreign_key' => 'user_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['belongs_to']['resource'] = [
-            'class_name' => Resource::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['registered_callbacks']['before_store'][] = 'cbLogChanges';
-        $config['registered_callbacks']['before_delete'][] = 'cbLogDeletion';
-
-        parent::configure($config);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $user = User::find($storage->user_id);
-        $permissions = self::findBySql(
-            'user_id = :user_id ORDER BY mkdate',
-            [
-                'user_id' => $storage->user_id
-            ]
-        );
-
-        $rows = [];
-        foreach ($permissions as $permission) {
-            $rows[] = $permission->toRawArray();
-        }
-        $storage->addTabularData(
-            _('Berechtigungen an Ressourcen'),
-            self::$config['db_table'],
-            $rows,
-            $user
-        );
-    }
-
-
-    /**
-     * This is a callback method to create an entry in the Stud.IP log
-     * when a ResourcePermission object is stored.
-     */
-    public function cbLogChanges()
-    {
-        if ($this->isNew()) {
-            //Insert
-            if ($this->resource_id == 'global') {
-                //Global permissions
-                StudipLog::log(
-                    'RES_PERM_CHANGE',
-                    $this->resource_id,
-                    $this->user_id,
-                    sprintf(
-                        _('Globale Berechtigungen für %1$s (Rechtestufe %2$s) hinzugefügt.'),
-                        $this->user->username,
-                        $this->perms
-                    )
-                );
-
-            } elseif ($this->resource_id) {
-                //Resource-specific permissions
-                StudipLog::log(
-                    'RES_PERM_CHANGE',
-                    $this->resource_id,
-                    $this->user_id,
-                    sprintf(
-                        _('%1$s: Hinzufügen von Berechtigungen für %2$s (Rechtestufe %3$s).'),
-                        $this->resource->getDerivedClassInstance()->getFullName(),
-                        $this->user->username,
-                        $this->perms
-                    )
-                );
-            } else {
-                throw new ResourcePermissionException(
-                    _('Berechtigungen müssen mit bestimmten Ressourcen verknüpft sein, bevor sie gespeichert werden!')
-                );
-            }
-        } else {
-            //Update?
-            if ($this->content_db['perms'] != $this->perms) {
-                //Update!
-                if ($this->resource_id == 'global') {
-                    StudipLog::log(
-                        'RES_PERM_CHANGE',
-                        $this->resource_id,
-                        $this->user_id,
-                        sprintf(
-                            _('Globale Berechtigungen für %1$s von %2$s auf %3$s geändert.'),
-                            $this->user->username,
-                            $this->content_db['perms'],
-                            $this->perms
-                        )
-                    );
-                } else {
-                    StudipLog::log(
-                        'RES_PERM_CHANGE',
-                        $this->resource_id,
-                        $this->user_id,
-                        sprintf(
-                            _('%1$s: Änderung der Berechtigungen für %2$s von %3$s auf %4$s.'),
-                            $this->resource->getFullName(),
-                            $this->user->username,
-                            $this->content_db['perms'],
-                            $this->perms
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * This is a callback method to create an entry in the Stud.IP log
-     * when a ResourcePermission object is deleted.
-     */
-    public function cbLogDeletion()
-    {
-        if ($this->resource_id == 'global') {
-            StudipLog::log(
-                'RES_PERM_CHANGE',
-                $this->resource_id,
-                $this->user_id,
-                sprintf(
-                    _('Globale Berechtigungen für %1$s (Rechtestufe %2$s) gelöscht.'),
-                    $this->user->username,
-                    $this->perms
-                )
-            );
-        } else {
-            StudipLog::log(
-                'RES_PERM_CHANGE',
-                $this->resource_id,
-                $this->user_id,
-                sprintf(
-                    _('%1$s: Löschen der Berechtigungen für %2$s (Rechtestufe %3$s).'),
-                    $this->resource->getFullName(),
-                    $this->user->username,
-                    $this->perms
-                )
-            );
-        }
-    }
-}
diff --git a/lib/models/resources/ResourcePermission.php b/lib/models/resources/ResourcePermission.php
new file mode 100644
index 0000000..bd33708
--- /dev/null
+++ b/lib/models/resources/ResourcePermission.php
@@ -0,0 +1,188 @@
+<?php
+
+/**
+ * ResourcePermission.class.php - model class for resource permissions.
+ *
+ * Description of the resources permission system:
+ * - admin: An admin may do everything in the resource management:
+ *     edit resource bookings and resources.
+ * - tutor: A tutor may edit all resource bookings.
+ * - autor: An autor may edit his own resource bookings only.
+ * - user: A user may read internal comments on resource bookings.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property array $id alias for pk
+ * @property string $user_id database column
+ * @property string $resource_id database column
+ * @property string $perms database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property User $user belongs_to User
+ * @property Resource $resource belongs_to Resource
+ */
+class ResourcePermission extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_permissions';
+
+        $config['belongs_to']['user'] = [
+            'class_name' => User::class,
+            'foreign_key' => 'user_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['belongs_to']['resource'] = [
+            'class_name' => Resource::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['registered_callbacks']['before_store'][] = 'cbLogChanges';
+        $config['registered_callbacks']['before_delete'][] = 'cbLogDeletion';
+
+        parent::configure($config);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $user = User::find($storage->user_id);
+        $permissions = self::findBySql(
+            'user_id = :user_id ORDER BY mkdate',
+            [
+                'user_id' => $storage->user_id
+            ]
+        );
+
+        $rows = [];
+        foreach ($permissions as $permission) {
+            $rows[] = $permission->toRawArray();
+        }
+        $storage->addTabularData(
+            _('Berechtigungen an Ressourcen'),
+            self::$config['db_table'],
+            $rows,
+            $user
+        );
+    }
+
+
+    /**
+     * This is a callback method to create an entry in the Stud.IP log
+     * when a ResourcePermission object is stored.
+     */
+    public function cbLogChanges()
+    {
+        if ($this->isNew()) {
+            //Insert
+            if ($this->resource_id == 'global') {
+                //Global permissions
+                StudipLog::log(
+                    'RES_PERM_CHANGE',
+                    $this->resource_id,
+                    $this->user_id,
+                    sprintf(
+                        _('Globale Berechtigungen für %1$s (Rechtestufe %2$s) hinzugefügt.'),
+                        $this->user->username,
+                        $this->perms
+                    )
+                );
+
+            } elseif ($this->resource_id) {
+                //Resource-specific permissions
+                StudipLog::log(
+                    'RES_PERM_CHANGE',
+                    $this->resource_id,
+                    $this->user_id,
+                    sprintf(
+                        _('%1$s: Hinzufügen von Berechtigungen für %2$s (Rechtestufe %3$s).'),
+                        $this->resource->getDerivedClassInstance()->getFullName(),
+                        $this->user->username,
+                        $this->perms
+                    )
+                );
+            } else {
+                throw new ResourcePermissionException(
+                    _('Berechtigungen müssen mit bestimmten Ressourcen verknüpft sein, bevor sie gespeichert werden!')
+                );
+            }
+        } else {
+            //Update?
+            if ($this->content_db['perms'] != $this->perms) {
+                //Update!
+                if ($this->resource_id == 'global') {
+                    StudipLog::log(
+                        'RES_PERM_CHANGE',
+                        $this->resource_id,
+                        $this->user_id,
+                        sprintf(
+                            _('Globale Berechtigungen für %1$s von %2$s auf %3$s geändert.'),
+                            $this->user->username,
+                            $this->content_db['perms'],
+                            $this->perms
+                        )
+                    );
+                } else {
+                    StudipLog::log(
+                        'RES_PERM_CHANGE',
+                        $this->resource_id,
+                        $this->user_id,
+                        sprintf(
+                            _('%1$s: Änderung der Berechtigungen für %2$s von %3$s auf %4$s.'),
+                            $this->resource->getFullName(),
+                            $this->user->username,
+                            $this->content_db['perms'],
+                            $this->perms
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * This is a callback method to create an entry in the Stud.IP log
+     * when a ResourcePermission object is deleted.
+     */
+    public function cbLogDeletion()
+    {
+        if ($this->resource_id == 'global') {
+            StudipLog::log(
+                'RES_PERM_CHANGE',
+                $this->resource_id,
+                $this->user_id,
+                sprintf(
+                    _('Globale Berechtigungen für %1$s (Rechtestufe %2$s) gelöscht.'),
+                    $this->user->username,
+                    $this->perms
+                )
+            );
+        } else {
+            StudipLog::log(
+                'RES_PERM_CHANGE',
+                $this->resource_id,
+                $this->user_id,
+                sprintf(
+                    _('%1$s: Löschen der Berechtigungen für %2$s (Rechtestufe %3$s).'),
+                    $this->resource->getFullName(),
+                    $this->user->username,
+                    $this->perms
+                )
+            );
+        }
+    }
+}
diff --git a/lib/models/resources/ResourceProperty.class.php b/lib/models/resources/ResourceProperty.class.php
deleted file mode 100644
index 4bbc4ec..0000000
--- a/lib/models/resources/ResourceProperty.class.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/**
- * ResourceProperty.class.php - model class for resource properties
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       TODO
- *
- * @property array $id alias for pk
- * @property string $resource_id database column
- * @property string $property_id database column
- * @property string $state database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property ResourcePropertyDefinition $definition belongs_to ResourcePropertyDefinition
- * @property Resource $resource belongs_to Resource
- * @property mixed $name additional field
- * @property-read mixed $fullname additional field
- * @property mixed $display_name additional field
- * @property mixed $type additional field
- * @property mixed $info_label additional field
- */
-class ResourceProperty extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_properties';
-
-        $config['belongs_to']['definition'] = [
-            'class_name' => ResourcePropertyDefinition::class,
-            'foreign_key' => 'property_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['belongs_to']['resource'] = [
-            'class_name' => Resource::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['additional_fields']['name'] = ['definition', 'name'];
-        $config['additional_fields']['fullname'] = ['get' => 'getFullName'];
-        $config['additional_fields']['display_name'] = ['definition', 'display_name'];
-        $config['additional_fields']['type'] = ['definition', 'type'];
-        $config['additional_fields']['info_label'] = ['definition', 'info_label'];
-
-        parent::configure($config);
-    }
-
-    /**
-     * Determines whether this resource property is requestable
-     * by checking the requestable flag of the corresponding
-     * resource category property.
-     *
-     * @return bool True, if this property is requestable, false otherwise.
-     */
-    public function isRequestable()
-    {
-        //We must only check if there is a ResourceCategoryProperty
-        //object in the database which has the same category-ID
-        //as the Resource of this ResourceProperty object,
-        //the same definition-ID as this ResourceProperty and which has
-        //furthermore the requestable column set to '1'.
-        //In this case we return true, otherwise false.
-
-        return ResourceCategoryProperty::countBySql(
-            "category_id = :category_id
-            AND property_id = :definition_id
-            AND requestable = '1'
-            ",
-            [
-                'category_id' => $this->resource->category_id,
-                'definition_id' => $this->definition->id
-            ]
-        ) > 0;
-    }
-
-
-    /**
-     * Creates a string containing the appropriate value
-     * of this resource property.
-     *
-     * @return string The string representation of this resource property.
-     */
-    public function __toString()
-    {
-        $string = '';
-
-        if ($this->type == 'position') {
-            $string .= ResourceManager::getPositionString($this);
-        } elseif ($this->type == 'bool') {
-            $string .= $this->state ? _('ja') : _('nein');
-        } elseif ($this->type == 'num') {
-            $string .= $this->state;
-        } elseif ($this->type == 'user') {
-            $user = User::find($this->state);
-            if ($user) {
-                $string .= $user->getFullName();
-            } else {
-                $string .= _('unbekannt');
-            }
-        } else {
-            $string .= $this->state;
-        }
-        return $string;
-    }
-
-    public function getFullName()
-    {
-        $name = (string)$this->definition->display_name ?: $this->definition->name;
-        $category = trim(strstr($name, ':', true));
-        if ($category) {
-            $name = trim(strstr($name, ':'), ' :');
-        }
-        $value = (string)$this;
-        return $name . ': ' . $value;
-    }
-}
diff --git a/lib/models/resources/ResourceProperty.php b/lib/models/resources/ResourceProperty.php
new file mode 100644
index 0000000..4bbc4ec
--- /dev/null
+++ b/lib/models/resources/ResourceProperty.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * ResourceProperty.class.php - model class for resource properties
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       TODO
+ *
+ * @property array $id alias for pk
+ * @property string $resource_id database column
+ * @property string $property_id database column
+ * @property string $state database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property ResourcePropertyDefinition $definition belongs_to ResourcePropertyDefinition
+ * @property Resource $resource belongs_to Resource
+ * @property mixed $name additional field
+ * @property-read mixed $fullname additional field
+ * @property mixed $display_name additional field
+ * @property mixed $type additional field
+ * @property mixed $info_label additional field
+ */
+class ResourceProperty extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_properties';
+
+        $config['belongs_to']['definition'] = [
+            'class_name' => ResourcePropertyDefinition::class,
+            'foreign_key' => 'property_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['belongs_to']['resource'] = [
+            'class_name' => Resource::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['additional_fields']['name'] = ['definition', 'name'];
+        $config['additional_fields']['fullname'] = ['get' => 'getFullName'];
+        $config['additional_fields']['display_name'] = ['definition', 'display_name'];
+        $config['additional_fields']['type'] = ['definition', 'type'];
+        $config['additional_fields']['info_label'] = ['definition', 'info_label'];
+
+        parent::configure($config);
+    }
+
+    /**
+     * Determines whether this resource property is requestable
+     * by checking the requestable flag of the corresponding
+     * resource category property.
+     *
+     * @return bool True, if this property is requestable, false otherwise.
+     */
+    public function isRequestable()
+    {
+        //We must only check if there is a ResourceCategoryProperty
+        //object in the database which has the same category-ID
+        //as the Resource of this ResourceProperty object,
+        //the same definition-ID as this ResourceProperty and which has
+        //furthermore the requestable column set to '1'.
+        //In this case we return true, otherwise false.
+
+        return ResourceCategoryProperty::countBySql(
+            "category_id = :category_id
+            AND property_id = :definition_id
+            AND requestable = '1'
+            ",
+            [
+                'category_id' => $this->resource->category_id,
+                'definition_id' => $this->definition->id
+            ]
+        ) > 0;
+    }
+
+
+    /**
+     * Creates a string containing the appropriate value
+     * of this resource property.
+     *
+     * @return string The string representation of this resource property.
+     */
+    public function __toString()
+    {
+        $string = '';
+
+        if ($this->type == 'position') {
+            $string .= ResourceManager::getPositionString($this);
+        } elseif ($this->type == 'bool') {
+            $string .= $this->state ? _('ja') : _('nein');
+        } elseif ($this->type == 'num') {
+            $string .= $this->state;
+        } elseif ($this->type == 'user') {
+            $user = User::find($this->state);
+            if ($user) {
+                $string .= $user->getFullName();
+            } else {
+                $string .= _('unbekannt');
+            }
+        } else {
+            $string .= $this->state;
+        }
+        return $string;
+    }
+
+    public function getFullName()
+    {
+        $name = (string)$this->definition->display_name ?: $this->definition->name;
+        $category = trim(strstr($name, ':', true));
+        if ($category) {
+            $name = trim(strstr($name, ':'), ' :');
+        }
+        $value = (string)$this;
+        return $name . ': ' . $value;
+    }
+}
diff --git a/lib/models/resources/ResourcePropertyDefinition.class.php b/lib/models/resources/ResourcePropertyDefinition.class.php
deleted file mode 100644
index 450ec00..0000000
--- a/lib/models/resources/ResourcePropertyDefinition.class.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-
-/**
- * ResourcePropertyDefinition.class.php - model class for resource property definitions
- *
- * The ResourcePropertyDefinition class can be used as a Factory
- * for ResourceProperty objects.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2018
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.1
- *
- * @property string $id alias column for property_id
- * @property string $property_id database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property string $type database column
- * @property string $options database column
- * @property int $system database column
- * @property int $info_label database column
- * @property I18NString $display_name database column
- * @property int $searchable database column
- * @property int $range_search database column
- * @property string $write_permission_level database column
- * @property int|null $property_group_id database column
- * @property int|null $property_group_pos database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property ResourcePropertyGroup|null $group belongs_to ResourcePropertyGroup
- */
-
-
-class ResourcePropertyDefinition extends SimpleORMap
-{
-    /**
-     * This regular expression is used to ensure that position properties
-     * are always in a format as specified by the ISO-6709
-     * string representation.
-     */
-    const CRSWGS84_REGEX = '/[+-]\d{1,3}\.\d{1,10}[+-]\d{1,3}\.\d{1,10}[+-]\d{1,5}\.\d{1,10}CRSWGS_84\/$/';
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_property_definitions';
-
-        $config['belongs_to']['group'] = [
-            'class_name' => ResourcePropertyGroup::class,
-            'foreign_key' => 'property_group_id'
-        ];
-
-        $config['has_many']['properties'] = [
-            'class_name'        => ResourceProperty::class,
-            'assoc_foreign_key' => 'property_id',
-            'on_delete'         => 'delete',
-        ];
-
-        $config['i18n_fields']['display_name'] = true;
-        $config['i18n_fields']['description'] = true;
-
-        parent::configure($config);
-    }
-
-    public static function findByPropertyGroup($group_id)
-    {
-        return self::findBySql(
-            'property_group_id = :group_id
-            ORDER BY property_group_pos ASC, name ASC',
-            [
-                'group_id' => $group_id
-            ]
-        );
-    }
-
-    /**
-     * Returns a list of all defined data types.
-     *
-     * @return string[] An array containing the names of all defined
-     *     resource property types.
-     */
-    public static function getDefinedTypes()
-    {
-        return [
-            'bool',
-            'text',
-            'num',
-            'select',
-            'user',
-            'institute',
-            'position',
-            'fileref',
-            'url'
-        ];
-    }
-
-    /**
-     * Returns all available options for this property
-     * as an array.
-     */
-    public function getOptionsArray()
-    {
-        if ($this->options) {
-            $options = explode(';', $this->options);
-            return array_combine($options, $options);
-        }
-        return [];
-    }
-
-
-    public function setOptionsFromArray($array = [])
-    {
-        if (is_array($array)) {
-            $this->options = implode(';', $array);
-        } else {
-            $this->options = '';
-        }
-    }
-
-    /**
-     * Generates appropriate HTML input elements for this property.
-     *
-     * @param string $value The value of the HTML input element.
-     *
-     * @param string $special_name A special name for the HTML input(s).
-     *
-     * @param bool $with_label Whether a label shall be placed around the
-     *     HTML input element(s) or not.
-     *
-     * @param bool $allow_boolean_false Wheter boolean attributes shall
-     *     also include a hidden input field that sets the value to zero
-     *     if the checkbox for the boolean attribute is not checked.
-     *     Defaults to true.
-     *
-     * @return string A string containing HTML code.
-     */
-    public function toHtmlInput(
-        $value = '',
-        $special_name = '',
-        $with_label = false,
-        $allow_boolean_false = true,
-        $disabled = false
-    )
-    {
-        $label_html_classes = '';
-        $type = $this->type;
-        $input_name = $special_name
-                    ? $special_name
-                    : 'properties[' . $this->id . ']';
-
-        if ($type === 'bool') {
-            $label_html_classes = 'col-3';
-            //Booleans can have one or two input elements,
-            //whether a false state shall be selectable or not.
-            if ($allow_boolean_false) {
-                $input_html = sprintf(
-                    '<input type="hidden" name="%1$s" value="0" %2$s %3$s>'
-                  . '<input type="checkbox" name="%1$s" value="1" %2$s>',
-                    htmlReady($input_name),
-                    $value ? 'checked' : '',
-                    $disabled ? 'disabled' : ''
-                );
-            } else {
-                $input_html = sprintf(
-                    '<input type="checkbox" name="%1$s" value="1" %2$s %3$s>',
-                    htmlReady($input_name),
-                    $value ? 'checked' : '',
-                    $disabled ? 'disabled' : ''
-                );
-            }
-            if ($with_label) {
-                return sprintf(
-                    '<label %1$s>%2$s %3$s</label>',
-                    (
-                        $label_html_classes
-                        ? 'class="' . htmlReady($label_html_classes) . '"'
-                        : ''
-                    ),
-                    $input_html,
-                    htmlReady($this->__toString())
-                );
-            } else {
-                return $input_html;
-            }
-        } elseif ($type === 'select') {
-            $options_html = sprintf(
-                '<option value="" %2$s>%1$s</option>',
-                _('Bitte wählen'),
-                !$value ? 'selected="selected"' : ''
-            );
-            foreach ($this->getOptionsArray() as $option) {
-                $options_html .= sprintf(
-                    '<option value="%1$s" %2$s>%1$s</option>',
-                    htmlReady($option),
-                    $value == $option ? 'selected="selected"' : ''
-                );
-            }
-            if ($with_label) {
-                return sprintf(
-                    '<label %1$s>%4$s<select name="%2$s">%3$s</select></label>',
-                    (
-                        $label_html_classes
-                        ? 'class="' . htmlReady($label_html_classes) . '"'
-                        : ''
-                    ),
-                    htmlReady($input_name),
-                    $options_html,
-                    htmlReady($this->__toString())
-                );
-            } else {
-                return sprintf(
-                    '<select name="%1$s">%2$s</select>',
-                    htmlReady($input_name),
-                    $options_html
-                );
-            }
-        } elseif ($type === 'position') {
-            $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH']);
-            $template = $factory->open('templates/resources/position_attribute_form_part.php');
-            $template->set_attribute(
-                'input_name',
-                $input_name
-            );
-            $template->set_attribute(
-                'latitude',
-                $value[0]
-            );
-            $template->set_attribute(
-                'longitude',
-                $value[1]
-            );
-            $template->set_attribute(
-                'altitude',
-                $value[2]
-            );
-
-            return $template->render();
-        } elseif ($type === 'user') {
-            $search = new QuickSearch($input_name, new StandardSearch('user_id'));
-            $search->defaultValue($value, ($value ? get_fullname($value, 'full_rev_username') : ''));
-            return sprintf(
-                '<label %1$s>%2$s<div class="assigned-user-search-wrapper flex-row">%3$s%4$s</div></label>',
-                (
-                    $label_html_classes
-                    ? 'class="' . htmlReady($label_html_classes) . '"'
-                    : ''
-                ),
-                $this->__toString(),
-                $search->render(),
-                Icon::create('refresh')->asImg(
-                    [
-                        'class'           => 'delete-assigned-user-icon enter-accessible',
-                        'data-input-name' => $input_name,
-                        'title'           => _('Zuorndung entfernen'),
-                        'tabindex'        => '0',
-                        'aria-role'       => 'button'
-                    ]
-                )
-            );
-        } else {
-            $input_type = 'text';
-            $min = '';
-            if ($type === 'num') {
-                $input_type = 'number';
-                $min = 'min="0"';
-            }
-            if ($with_label) {
-                return sprintf(
-                    '<label %1$s>%5$s<input type="%2$s" name="%3$s" value="%4$s" %6$s %7$s></label>',
-                    (
-                        $label_html_classes
-                        ? 'class="' . htmlReady($label_html_classes) . '"'
-                        : ''
-                    ),
-                    $input_type,
-                    htmlReady($input_name),
-                    $value,
-                    htmlReady($this->__toString()),
-                    $disabled ? 'disabled' : '',
-                    $min
-                );
-            } else {
-                return sprintf(
-                    '<input type="%1$s" name="%2$s" value="%3$s" %4$s %5$s>',
-                    $input_type,
-                    htmlReady($input_name),
-                    $value,
-                    $disabled ? 'disabled' : '',
-                    $min
-                );
-            }
-        }
-    }
-
-    /**
-     * Verifies that a property value (state) is valid for the given
-     * resource property definition.
-     *
-     * @param string $state A state for this property which shall be checked.
-     *
-     * @throws ResourcePropertyStateException If the state has an invalid value
-     *     a ResourcePropertyStateException is thrown.
-     *
-     * @return bool True, if the state value is valid.
-     */
-    public function validateState($state = '')
-    {
-        $invalid_state = false;
-
-        //The type 'text' does not need to be validated since it can have
-        //all sorts of data in it.
-        if ($this->type == 'bool') {
-            if (!in_array($state, ['0', '1'])) {
-                //invalid boolean state: neither true nor false
-                $invalid_state = true;
-            }
-        } elseif ($this->type == 'num') {
-            if (!preg_match('/[0-9.]+/', $state)) {
-                //not a number
-                $invalid_state = true;
-            }
-        } elseif ($this->type == 'user') {
-            if (!User::exists($state)) {
-                //User does not exist
-                throw new ResourcePropertyStateException(
-                    sprintf(
-                        _('Die Eigenschaft %1$s besitzt einen ungültigen Wert! Der/die Nutzer/-in mit der ID %2$s existiert nicht!'),
-                        $this->name,
-                        $state
-                    )
-                );
-            }
-        } elseif ($this->type == 'institute') {
-            if (!Institute::exists($state)) {
-                //Institute does not exist
-                throw new ResourcePropertyStateException(
-                    sprintf(
-                        _('Die Eigenschaft %1$s besitzt einen ungültigen Wert! Die Einrichtung mit der ID %2$s existiert nicht!'),
-                        $this->name,
-                        $state
-                    )
-                );
-            }
-        } elseif ($this->type == 'position') {
-            if (!preg_match(self::CRSWGS84_REGEX, $state)) {
-                //$state does not contain ISO-6709 coordinates
-                //in the CRSWGS84 format!
-                throw new ResourcePropertyStateException(
-                    sprintf(
-                        _('Die Positionsangabe für die Eigenschaft %1$s ist ungültig!'),
-                        $state
-                    )
-                );
-            }
-        }
-
-        //A general exception message:
-        if ($invalid_state) {
-            throw new ResourcePropertyException(
-                sprintf(
-                    _('Der Wert %1$s ist für die Eigenschaft %2$s (Typ %3$s) nicht zulässig!'),
-                    $state,
-                    $this->name,
-                    $this->type
-                )
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a ResourceProperty object that is automatically linked
-     * to the property definition. The ResourceProperty object is only
-     * created but not stored in the database.
-     *
-     * @param Resource $resource The resource object which shall be extended
-     *     by a property.
-     * @param string $state The value of the property that shall be created.
-     *
-     * @throws ResourcePropertyException If $state is invalid for this property.
-     *
-     * @return ResourceProperty A ResourceProperty object
-     *     which can be modified.
-     */
-    public function createResourceProperty(Resource $resource, $state = '')
-    {
-        if ($this->validateState($state)) {
-            $property = new ResourceProperty();
-            $property->property_id = $this->id;
-            $property->resource_id = $resource->id;
-            $property->state = $state;
-            return $property;
-        }
-
-        throw new Exception('Could not validate state');
-    }
-
-    public function __toString()
-    {
-        return trim($this->display_name) ?: $this->name;
-    }
-}
diff --git a/lib/models/resources/ResourcePropertyDefinition.php b/lib/models/resources/ResourcePropertyDefinition.php
new file mode 100644
index 0000000..450ec00
--- /dev/null
+++ b/lib/models/resources/ResourcePropertyDefinition.php
@@ -0,0 +1,409 @@
+<?php
+
+/**
+ * ResourcePropertyDefinition.class.php - model class for resource property definitions
+ *
+ * The ResourcePropertyDefinition class can be used as a Factory
+ * for ResourceProperty objects.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2018
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.1
+ *
+ * @property string $id alias column for property_id
+ * @property string $property_id database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property string $type database column
+ * @property string $options database column
+ * @property int $system database column
+ * @property int $info_label database column
+ * @property I18NString $display_name database column
+ * @property int $searchable database column
+ * @property int $range_search database column
+ * @property string $write_permission_level database column
+ * @property int|null $property_group_id database column
+ * @property int|null $property_group_pos database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property ResourcePropertyGroup|null $group belongs_to ResourcePropertyGroup
+ */
+
+
+class ResourcePropertyDefinition extends SimpleORMap
+{
+    /**
+     * This regular expression is used to ensure that position properties
+     * are always in a format as specified by the ISO-6709
+     * string representation.
+     */
+    const CRSWGS84_REGEX = '/[+-]\d{1,3}\.\d{1,10}[+-]\d{1,3}\.\d{1,10}[+-]\d{1,5}\.\d{1,10}CRSWGS_84\/$/';
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_property_definitions';
+
+        $config['belongs_to']['group'] = [
+            'class_name' => ResourcePropertyGroup::class,
+            'foreign_key' => 'property_group_id'
+        ];
+
+        $config['has_many']['properties'] = [
+            'class_name'        => ResourceProperty::class,
+            'assoc_foreign_key' => 'property_id',
+            'on_delete'         => 'delete',
+        ];
+
+        $config['i18n_fields']['display_name'] = true;
+        $config['i18n_fields']['description'] = true;
+
+        parent::configure($config);
+    }
+
+    public static function findByPropertyGroup($group_id)
+    {
+        return self::findBySql(
+            'property_group_id = :group_id
+            ORDER BY property_group_pos ASC, name ASC',
+            [
+                'group_id' => $group_id
+            ]
+        );
+    }
+
+    /**
+     * Returns a list of all defined data types.
+     *
+     * @return string[] An array containing the names of all defined
+     *     resource property types.
+     */
+    public static function getDefinedTypes()
+    {
+        return [
+            'bool',
+            'text',
+            'num',
+            'select',
+            'user',
+            'institute',
+            'position',
+            'fileref',
+            'url'
+        ];
+    }
+
+    /**
+     * Returns all available options for this property
+     * as an array.
+     */
+    public function getOptionsArray()
+    {
+        if ($this->options) {
+            $options = explode(';', $this->options);
+            return array_combine($options, $options);
+        }
+        return [];
+    }
+
+
+    public function setOptionsFromArray($array = [])
+    {
+        if (is_array($array)) {
+            $this->options = implode(';', $array);
+        } else {
+            $this->options = '';
+        }
+    }
+
+    /**
+     * Generates appropriate HTML input elements for this property.
+     *
+     * @param string $value The value of the HTML input element.
+     *
+     * @param string $special_name A special name for the HTML input(s).
+     *
+     * @param bool $with_label Whether a label shall be placed around the
+     *     HTML input element(s) or not.
+     *
+     * @param bool $allow_boolean_false Wheter boolean attributes shall
+     *     also include a hidden input field that sets the value to zero
+     *     if the checkbox for the boolean attribute is not checked.
+     *     Defaults to true.
+     *
+     * @return string A string containing HTML code.
+     */
+    public function toHtmlInput(
+        $value = '',
+        $special_name = '',
+        $with_label = false,
+        $allow_boolean_false = true,
+        $disabled = false
+    )
+    {
+        $label_html_classes = '';
+        $type = $this->type;
+        $input_name = $special_name
+                    ? $special_name
+                    : 'properties[' . $this->id . ']';
+
+        if ($type === 'bool') {
+            $label_html_classes = 'col-3';
+            //Booleans can have one or two input elements,
+            //whether a false state shall be selectable or not.
+            if ($allow_boolean_false) {
+                $input_html = sprintf(
+                    '<input type="hidden" name="%1$s" value="0" %2$s %3$s>'
+                  . '<input type="checkbox" name="%1$s" value="1" %2$s>',
+                    htmlReady($input_name),
+                    $value ? 'checked' : '',
+                    $disabled ? 'disabled' : ''
+                );
+            } else {
+                $input_html = sprintf(
+                    '<input type="checkbox" name="%1$s" value="1" %2$s %3$s>',
+                    htmlReady($input_name),
+                    $value ? 'checked' : '',
+                    $disabled ? 'disabled' : ''
+                );
+            }
+            if ($with_label) {
+                return sprintf(
+                    '<label %1$s>%2$s %3$s</label>',
+                    (
+                        $label_html_classes
+                        ? 'class="' . htmlReady($label_html_classes) . '"'
+                        : ''
+                    ),
+                    $input_html,
+                    htmlReady($this->__toString())
+                );
+            } else {
+                return $input_html;
+            }
+        } elseif ($type === 'select') {
+            $options_html = sprintf(
+                '<option value="" %2$s>%1$s</option>',
+                _('Bitte wählen'),
+                !$value ? 'selected="selected"' : ''
+            );
+            foreach ($this->getOptionsArray() as $option) {
+                $options_html .= sprintf(
+                    '<option value="%1$s" %2$s>%1$s</option>',
+                    htmlReady($option),
+                    $value == $option ? 'selected="selected"' : ''
+                );
+            }
+            if ($with_label) {
+                return sprintf(
+                    '<label %1$s>%4$s<select name="%2$s">%3$s</select></label>',
+                    (
+                        $label_html_classes
+                        ? 'class="' . htmlReady($label_html_classes) . '"'
+                        : ''
+                    ),
+                    htmlReady($input_name),
+                    $options_html,
+                    htmlReady($this->__toString())
+                );
+            } else {
+                return sprintf(
+                    '<select name="%1$s">%2$s</select>',
+                    htmlReady($input_name),
+                    $options_html
+                );
+            }
+        } elseif ($type === 'position') {
+            $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH']);
+            $template = $factory->open('templates/resources/position_attribute_form_part.php');
+            $template->set_attribute(
+                'input_name',
+                $input_name
+            );
+            $template->set_attribute(
+                'latitude',
+                $value[0]
+            );
+            $template->set_attribute(
+                'longitude',
+                $value[1]
+            );
+            $template->set_attribute(
+                'altitude',
+                $value[2]
+            );
+
+            return $template->render();
+        } elseif ($type === 'user') {
+            $search = new QuickSearch($input_name, new StandardSearch('user_id'));
+            $search->defaultValue($value, ($value ? get_fullname($value, 'full_rev_username') : ''));
+            return sprintf(
+                '<label %1$s>%2$s<div class="assigned-user-search-wrapper flex-row">%3$s%4$s</div></label>',
+                (
+                    $label_html_classes
+                    ? 'class="' . htmlReady($label_html_classes) . '"'
+                    : ''
+                ),
+                $this->__toString(),
+                $search->render(),
+                Icon::create('refresh')->asImg(
+                    [
+                        'class'           => 'delete-assigned-user-icon enter-accessible',
+                        'data-input-name' => $input_name,
+                        'title'           => _('Zuorndung entfernen'),
+                        'tabindex'        => '0',
+                        'aria-role'       => 'button'
+                    ]
+                )
+            );
+        } else {
+            $input_type = 'text';
+            $min = '';
+            if ($type === 'num') {
+                $input_type = 'number';
+                $min = 'min="0"';
+            }
+            if ($with_label) {
+                return sprintf(
+                    '<label %1$s>%5$s<input type="%2$s" name="%3$s" value="%4$s" %6$s %7$s></label>',
+                    (
+                        $label_html_classes
+                        ? 'class="' . htmlReady($label_html_classes) . '"'
+                        : ''
+                    ),
+                    $input_type,
+                    htmlReady($input_name),
+                    $value,
+                    htmlReady($this->__toString()),
+                    $disabled ? 'disabled' : '',
+                    $min
+                );
+            } else {
+                return sprintf(
+                    '<input type="%1$s" name="%2$s" value="%3$s" %4$s %5$s>',
+                    $input_type,
+                    htmlReady($input_name),
+                    $value,
+                    $disabled ? 'disabled' : '',
+                    $min
+                );
+            }
+        }
+    }
+
+    /**
+     * Verifies that a property value (state) is valid for the given
+     * resource property definition.
+     *
+     * @param string $state A state for this property which shall be checked.
+     *
+     * @throws ResourcePropertyStateException If the state has an invalid value
+     *     a ResourcePropertyStateException is thrown.
+     *
+     * @return bool True, if the state value is valid.
+     */
+    public function validateState($state = '')
+    {
+        $invalid_state = false;
+
+        //The type 'text' does not need to be validated since it can have
+        //all sorts of data in it.
+        if ($this->type == 'bool') {
+            if (!in_array($state, ['0', '1'])) {
+                //invalid boolean state: neither true nor false
+                $invalid_state = true;
+            }
+        } elseif ($this->type == 'num') {
+            if (!preg_match('/[0-9.]+/', $state)) {
+                //not a number
+                $invalid_state = true;
+            }
+        } elseif ($this->type == 'user') {
+            if (!User::exists($state)) {
+                //User does not exist
+                throw new ResourcePropertyStateException(
+                    sprintf(
+                        _('Die Eigenschaft %1$s besitzt einen ungültigen Wert! Der/die Nutzer/-in mit der ID %2$s existiert nicht!'),
+                        $this->name,
+                        $state
+                    )
+                );
+            }
+        } elseif ($this->type == 'institute') {
+            if (!Institute::exists($state)) {
+                //Institute does not exist
+                throw new ResourcePropertyStateException(
+                    sprintf(
+                        _('Die Eigenschaft %1$s besitzt einen ungültigen Wert! Die Einrichtung mit der ID %2$s existiert nicht!'),
+                        $this->name,
+                        $state
+                    )
+                );
+            }
+        } elseif ($this->type == 'position') {
+            if (!preg_match(self::CRSWGS84_REGEX, $state)) {
+                //$state does not contain ISO-6709 coordinates
+                //in the CRSWGS84 format!
+                throw new ResourcePropertyStateException(
+                    sprintf(
+                        _('Die Positionsangabe für die Eigenschaft %1$s ist ungültig!'),
+                        $state
+                    )
+                );
+            }
+        }
+
+        //A general exception message:
+        if ($invalid_state) {
+            throw new ResourcePropertyException(
+                sprintf(
+                    _('Der Wert %1$s ist für die Eigenschaft %2$s (Typ %3$s) nicht zulässig!'),
+                    $state,
+                    $this->name,
+                    $this->type
+                )
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Creates a ResourceProperty object that is automatically linked
+     * to the property definition. The ResourceProperty object is only
+     * created but not stored in the database.
+     *
+     * @param Resource $resource The resource object which shall be extended
+     *     by a property.
+     * @param string $state The value of the property that shall be created.
+     *
+     * @throws ResourcePropertyException If $state is invalid for this property.
+     *
+     * @return ResourceProperty A ResourceProperty object
+     *     which can be modified.
+     */
+    public function createResourceProperty(Resource $resource, $state = '')
+    {
+        if ($this->validateState($state)) {
+            $property = new ResourceProperty();
+            $property->property_id = $this->id;
+            $property->resource_id = $resource->id;
+            $property->state = $state;
+            return $property;
+        }
+
+        throw new Exception('Could not validate state');
+    }
+
+    public function __toString()
+    {
+        return trim($this->display_name) ?: $this->name;
+    }
+}
diff --git a/lib/models/resources/ResourcePropertyGroup.class.php b/lib/models/resources/ResourcePropertyGroup.class.php
deleted file mode 100644
index ad53902..0000000
--- a/lib/models/resources/ResourcePropertyGroup.class.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * ResourcePropertyGroup.class.php - model class for resource property groups
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       TODO
- *
- * @property int $id database column
- * @property string $name database column
- * @property int $position database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|ResourcePropertyDefinition[] $properties has_many ResourcePropertyDefinition
- */
-class ResourcePropertyGroup extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_property_groups';
-
-        $config['has_many']['properties'] = [
-            'class_name' => ResourcePropertyDefinition::class,
-            'assoc_foreign_key' => 'property_group_id',
-            'assoc_func' => 'findByPropertyGroup'
-        ];
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/resources/ResourcePropertyGroup.php b/lib/models/resources/ResourcePropertyGroup.php
new file mode 100644
index 0000000..ad53902
--- /dev/null
+++ b/lib/models/resources/ResourcePropertyGroup.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * ResourcePropertyGroup.class.php - model class for resource property groups
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       TODO
+ *
+ * @property int $id database column
+ * @property string $name database column
+ * @property int $position database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|ResourcePropertyDefinition[] $properties has_many ResourcePropertyDefinition
+ */
+class ResourcePropertyGroup extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_property_groups';
+
+        $config['has_many']['properties'] = [
+            'class_name' => ResourcePropertyDefinition::class,
+            'assoc_foreign_key' => 'property_group_id',
+            'assoc_func' => 'findByPropertyGroup'
+        ];
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
deleted file mode 100644
index 9cad900..0000000
--- a/lib/models/resources/ResourceRequest.class.php
+++ /dev/null
@@ -1,2478 +0,0 @@
-<?php
-
-/**
- * ResourceRequest.class.php - Contains a model class for resource requests.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * The attributes begin and end are only used in simple resource requests.
- * The "traditional" resource requests use either course_id, metadate_id
- * or termin_id to store the time ranges connected to the request.
- *
- * @property string $id database column
- * @property string $course_id database column
- * @property string $termin_id database column
- * @property string $metadate_id database column
- * @property string $user_id database column
- * @property string $last_modified_by database column
- * @property string $resource_id database column
- * @property string|null $category_id database column
- * @property string|null $comment database column
- * @property string|null $reply_comment database column
- * @property string $reply_recipients database column
- * @property int $closed database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property int $begin database column
- * @property int $end database column
- * @property int $preparation_time database column
- * @property int $marked database column
- * @property SimpleORMapCollection|ResourceRequestProperty[] $properties has_many ResourceRequestProperty
- * @property SimpleORMapCollection|ResourceRequestAppointment[] $appointments has_many ResourceRequestAppointment
- * @property Resource $resource belongs_to Resource
- * @property ResourceCategory|null $category belongs_to ResourceCategory
- * @property User $user belongs_to User
- * @property User $last_modifier belongs_to User
- * @property Course $course belongs_to Course
- * @property SeminarCycleDate $cycle belongs_to SeminarCycleDate
- * @property CourseDate $date belongs_to CourseDate
- */
-class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calendar\EventSource
-{
-    const MARK_NONE = 0;
-    const MARK_RED = 1;
-    const MARK_YELLOW = 2;
-    const MARK_GREEN = 3;
-
-    const REPLY_REQUESTER = 'requester';
-    const REPLY_LECTURER = 'lecturer';
-
-    const STATE_OPEN = 0; // room-request is open
-    const STATE_PENDING = 1; // room-request has been processed, but no confirmation has been sent
-    const STATE_CLOSED = 2; // room-request has been processed and a confirmation has been sent
-    const STATE_DECLINED = 3; // room-request has been declined
-
-    /**
-     * The amount of defined marking states.
-     */
-    const MARKING_STATES = 4;
-
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_requests';
-
-        $config['belongs_to']['resource'] = [
-            'class_name'  => Resource::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['belongs_to']['category'] = [
-            'class_name'  => ResourceCategory::class,
-            'foreign_key' => 'category_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['belongs_to']['last_modifier'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'last_modified_by',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['belongs_to']['course'] = [
-            'class_name'  => Course::class,
-            'foreign_key' => 'course_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['belongs_to']['cycle'] = [
-            'class_name'  => SeminarCycleDate::class,
-            'foreign_key' => 'metadate_id'
-        ];
-
-        $config['belongs_to']['date'] = [
-            'class_name'  => CourseDate::class,
-            'foreign_key' => 'termin_id'
-        ];
-
-        $config['has_many']['properties'] = [
-            'class_name'        => ResourceRequestProperty::class,
-            'foreign_key'       => 'id',
-            'assoc_foreign_key' => 'request_id',
-            'on_store'          => 'store',
-            'on_delete'         => 'delete'
-        ];
-
-        $config['has_many']['appointments'] = [
-            'class_name'        => ResourceRequestAppointment::class,
-            'foreign_key'       => 'id',
-            'assoc_foreign_key' => 'request_id',
-            'on_store'          => 'store',
-            'on_delete'         => 'delete'
-        ];
-
-        //In regard to TIC 6460:
-        //As long as TIC 6460 is not implemented, we must add the validate
-        //method as a callback before storing the object.
-        if (!method_exists('SimpleORMap', 'validate')) {
-            $config['registered_callbacks']['before_store'][] = 'validate';
-        }
-        $config['registered_callbacks']['after_create'][] = 'cbLogNewRequest';
-        $config['registered_callbacks']['after_store'][] = 'cbAfterStore';
-        $config['registered_callbacks']['after_delete'][] = 'cbAfterDelete';
-
-
-        parent::configure($config);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public static function exportUserdata(StoredUserData $storage)
-    {
-        $user = User::find($storage->user_id);
-
-        $requests = self::findBySql(
-            'user_id = :user_id ORDER BY mkdate',
-            [
-                'user_id' => $storage->user_id
-            ]
-        );
-
-        $request_rows = [];
-        foreach ($requests as $request) {
-            $request_rows[] = $request->toRawArray();
-        }
-        $storage->addTabularData(
-            _('Ressourcenanfragen'),
-            'resource_requests',
-            $request_rows,
-            $user
-        );
-    }
-
-    /**
-     * Retrieves all resource requests from the database.
-     *
-     * @return ResourceRequest[] An array of ResourceRequests objects
-     *     or an empty array, if no resource requests are stored
-     *     in the database.
-     */
-    public static function findAll()
-    {
-        return self::findBySql('TRUE ORDER BY mkdate ASC');
-    }
-
-    /**
-     * Retrieves all open resource requests from the database.
-     *
-     * @return ResourceRequest[] An array of ResourceRequests objects
-     *     or an empty array, if no open resource requests are stored
-     *     in the database.
-     */
-    public static function findOpen()
-    {
-        return self::findBySql(
-            'closed = ? ORDER BY mkdate ASC',
-            [self::STATE_OPEN]
-        );
-    }
-
-    /**
-     * Internal method that generated the SQL query used in
-     * findByResourceAndTimeRanges and countByResourceAndTimeRanges.
-     *
-     * @see findByResourceAndTimeRanges
-     * @inheritDoc
-     */
-    protected static function buildResourceAndTimeRangesSqlQuery(
-        Resource $resource,
-        $time_ranges = [],
-        $closed_status = null,
-        $excluded_request_ids = [],
-        $additional_conditions = '',
-        $additional_parameters = []
-    )
-    {
-        if (!is_array($time_ranges)) {
-            throw new InvalidArgumentException(
-                _('Es wurde keine Liste mit Zeiträumen angegeben!')
-            );
-        }
-
-        //Check the array:
-        foreach ($time_ranges as $time_range) {
-            if ($time_range['begin'] > $time_range['end']) {
-                throw new InvalidArgumentException(
-                    _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-                );
-            }
-
-            if ($time_range['begin'] == $time_range['end']) {
-                throw new InvalidArgumentException(
-                    _('Startzeitpunkt und Endzeitpunkt dürfen nicht identisch sein!')
-                );
-            }
-        }
-
-        $sql_params = [
-            'resource_id' => $resource->id
-        ];
-
-        //First we build the SQL snippet for the case that the $closed_status
-        //variable is set to something different than null.
-        $closed_status_sql = '';
-        if ($closed_status !== null) {
-            $closed_status_sql    = ' AND (resource_requests.closed = :status) ';
-            $sql_params['status'] = strval($closed_status);
-        }
-
-        //Then we build the snipped for excluded request IDs, if specified.
-        $excluded_request_ids_sql = '';
-        if (is_array($excluded_request_ids) && count($excluded_request_ids)) {
-            $excluded_request_ids_sql   = ' AND resource_requests.id NOT IN ( :excluded_ids ) ';
-            $sql_params['excluded_ids'] = $excluded_request_ids;
-        }
-
-        //Now we build the SQL snippet for the time intervals.
-        //These are repeated four times in the query below.
-        //BEGIN and END are replaced below since the columns for
-        //BEGIN and END are different in the four cases where we
-        //repeat the SQL snippet for the time intervals.
-
-        $time_sql = '';
-        if ($time_ranges) {
-            $time_sql = 'AND (';
-
-            $i = 1;
-            foreach ($time_ranges as $time_range) {
-                if ($i > 1) {
-                    $time_sql .= ' OR ';
-                }
-                $time_sql .= sprintf('BEGIN < :end%d AND END > :begin%d ', $i, $i);
-
-                $sql_params[('begin' . $i)] = $time_range['begin'];
-                $sql_params[('end' . $i)]   = $time_range['end'];
-
-                $i++;
-            }
-
-            $time_sql .= ') ';
-        }
-
-        //Check if the request has a start and end timestamp set or if it belongs
-        //to a date, a metadate or a course.
-        //This is done in the rest of the SQL query:
-
-        // FIXME this subselect looks unnecessarily complex
-        $whole_sql = '
-                SELECT id FROM resource_requests
-                WHERE
-                resource_id = :resource_id
-        '
-            . str_replace(
-                ['BEGIN', 'END'],
-                ['(CAST(begin AS SIGNED) - preparation_time)', 'end'],
-                $time_sql
-            )
-            . $closed_status_sql
-            . '
-                UNION
-                SELECT id FROM resource_requests
-                INNER JOIN termine USING (termin_id)
-                WHERE
-                resource_id = :resource_id
-                   '
-            . str_replace(
-                ['BEGIN', 'END'],
-                [
-                    '(CAST(termine.date AS SIGNED) - resource_requests.preparation_time)',
-                    'termine.end_time'
-                ],
-                $time_sql
-            )
-            . $closed_status_sql
-            . '
-                UNION
-                SELECT id FROM resource_requests
-                INNER JOIN termine USING (metadate_id)
-                WHERE
-                resource_id = :resource_id
-                   '
-            . str_replace(
-                ['BEGIN', 'END'],
-                [
-                    '(CAST(termine.date AS SIGNED) - resource_requests.preparation_time)',
-                    'termine.end_time'
-                ],
-                $time_sql
-            )
-            . $closed_status_sql
-            . '
-            UNION
-            SELECT id FROM resource_requests
-            INNER JOIN termine
-            ON resource_requests.course_id = termine.range_id
-            WHERE
-            resource_id = :resource_id
-                   '
-            . str_replace(
-                ['BEGIN', 'END'],
-                [
-                    '(CAST(termine.date AS SIGNED) - resource_requests.preparation_time)',
-                    'termine.end_time'
-                ],
-                $time_sql
-            )
-            . $closed_status_sql
-            . '
-            GROUP BY id
-         '
-            . $excluded_request_ids_sql;
-        $request_ids = DBManager::get()->fetchFirst($whole_sql, $sql_params);
-        $whole_sql = "resource_requests.id IN(:request_ids)";
-        $sql_params = ['request_ids' => $request_ids];
-        if ($additional_conditions) {
-            $whole_sql .= ' AND ' . $additional_conditions;
-            if ($additional_parameters) {
-                $sql_params = array_merge($sql_params, $additional_parameters);
-            }
-        }
-        $whole_sql .= ' ORDER BY mkdate ASC';
-
-        return [
-            'sql'    => $whole_sql,
-            'params' => $sql_params
-        ];
-    }
-
-    /**
-     * Retrieves all resource requests for the given resource and
-     * time range. By default, all requests are returned.
-     * To get only open or closed requests set the $closed_status parameter.
-     *
-     * @param Resource $resource The resource whose requests shall be retrieved.
-     * @param array $time_ranges An array with time ranges as DateTime objects.
-     *     The array has the following structure:
-     *     [
-     *         [
-     *             'begin' => begin timestamp,
-     *             'end' => end timestamp
-     *         ],
-     *         ...
-     *     ]
-     * @param mixed $closed_status An optional status for the closed column in the
-     *     database. By default this is set to null which means that
-     *     resource requests are not filtered by the status column field.
-     *     A value of 0 means only open requests are retrived.
-     *     A value of 1 means only closed requests are retrieved.
-     *
-     * @param array $excluded_request_ids An array of strings representing
-     *     resource request IDs. IDs specified in this array are excluded from
-     *     the search.
-     * @return ResourceRequest[] An array of ResourceRequest objects.
-     *     If no requests can be found, the array is empty.
-     *
-     * @throws InvalidArgumentException, if the time ranges are either not in an
-     *     array matching the format description from above or if one of the
-     *     following conditions is met in one of the time ranges:
-     *     - begin > end
-     *     - begin == end
-     */
-    public static function findByResourceAndTimeRanges(
-        Resource $resource,
-        $time_ranges = [],
-        $closed_status = null,
-        $excluded_request_ids = [],
-        $additional_conditions = '',
-        $additional_parameters = []
-    )
-    {
-        //Build the SQL query and the parameter array.
-
-        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
-            $resource,
-            $time_ranges,
-            $closed_status,
-            $excluded_request_ids,
-            $additional_conditions,
-            $additional_parameters
-        );
-
-        //Call findBySql:
-        return self::findBySql($sql_data['sql'], $sql_data['params']);
-    }
-
-    public static function countByResourceAndTimeRanges(
-        Resource $resource,
-        $time_ranges = [],
-        $closed_status = null,
-        $excluded_request_ids = [],
-        $additional_conditions = '',
-        $additional_parameters = []
-    )
-    {
-        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
-            $resource,
-            $time_ranges,
-            $closed_status,
-            $excluded_request_ids,
-            $additional_conditions,
-            $additional_parameters
-        );
-
-        return self::countBySql($sql_data['sql'], $sql_data['params']);
-    }
-
-    public static function findByCourse($course_id)
-    {
-        return self::findOneBySql(
-            "termin_id = '' AND metadate_id = '' AND course_id = :course_id",
-            [
-                'course_id' => $course_id
-            ]
-        );
-    }
-
-    public static function findByDate($date_id)
-    {
-        return self::findOneBySql(
-            'termin_id = :date_id',
-            [
-                'date_id' => $date_id
-            ]
-        );
-    }
-
-    public static function findByMetadate($metadate_id)
-    {
-        return self::findOneBySql(
-            'metadate_id = :metadate_id',
-            [
-                'metadate_id' => $metadate_id
-            ]
-        );
-    }
-
-    public static function existsByCourse($course_id, $request_is_open = false)
-    {
-        $parameters = [':course_id' => $course_id];
-
-        $sql = '';
-        if ($request_is_open) {
-            $sql .= "closed = :closed_state AND ";
-            $parameters[':closed_state'] = self::STATE_OPEN;
-        }
-
-        $request = self::findOneBySql(
-            $sql . "termin_id = '' AND metadate_id = '' AND course_id = :course_id",
-            $parameters
-        );
-
-        if ($request) {
-            return $request->id;
-        } else {
-            return false;
-        }
-    }
-
-    public static function existsByDate($date_id, $request_is_open = false)
-    {
-        $parameters = [':date_id' => $date_id];
-
-        $sql = '';
-        if ($request_is_open) {
-            $sql .= "closed = :closed_state AND ";
-            $parameters[':closed_state'] = self::STATE_OPEN;
-        }
-
-        $request = self::findOneBySql(
-            $sql . "termin_id = :date_id",
-            $parameters
-        );
-
-        if ($request) {
-            return $request->id;
-        } else {
-            return false;
-        }
-    }
-
-    public static function existsByMetadate($metadate_id, $request_is_open = false)
-    {
-        $parameters = [':metadate_id' => $metadate_id];
-
-        $sql = '';
-        if ($request_is_open) {
-            $sql .= "closed = :closed_state AND ";
-            $parameters[':closed_state'] = self::STATE_OPEN;
-        }
-
-        $request = self::findOneBySql(
-            $sql . "metadate_id = :metadate_id",
-            $parameters
-        );
-
-        if ($request) {
-            return $request->id;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * A callback method that creates a Stud.IP log entry
-     * when a new request has been made.
-     */
-    public function cbLogNewRequest()
-    {
-        $this->sendNewRequestMail();
-        StudipLog::log('RES_REQUEST_NEW', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
-    }
-
-    /**
-     * A callback method that send a mail
-     * when a new request has been udpated.
-     */
-    public function cbAfterStore()
-    {
-        if ($this->isFieldDirty('closed')) {
-            if ($this->closed == self::STATE_DECLINED) {
-                $this->sendRequestDeniedMail();
-                StudipLog::log('RES_REQUEST_DENY', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
-            } elseif ($this->closed == self::STATE_PENDING || $this->closed == self::STATE_CLOSED) {
-                StudipLog::log('RES_REQUEST_RESOLVE', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
-            }
-        } else {
-            StudipLog::log('RES_REQUEST_UPDATE', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
-        }
-    }
-
-    public function cbAfterDelete()
-    {
-        StudipLog::log('RES_REQUEST_DEL', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
-    }
-
-    /**
-     * This validation method is called before storing an object.
-     */
-    public function validate()
-    {
-        if (!$this->resource_id && !$this->category_id) {
-            throw new Exception(
-                _('Eine Anfrage muss einer konkreten Ressource oder deren Kategorie zugewiesen sein!')
-            );
-        }
-    }
-
-    public function getDerivedClassInstance()
-    {
-        if (!$this->resource) {
-            //We cannot determine a derived class.
-            return $this;
-        }
-        $class_name = $this->resource->class_name;
-
-        if ($class_name === 'Resource') {
-            //This is already the correct class.
-            return $this;
-        }
-
-        if (is_subclass_of($class_name, 'Resource')) {
-            //Now we append 'Request' to the class name:
-            $class_name         = $class_name . 'Request';
-            return $class_name::buildExisting(
-                $this->toRawArray()
-            );
-        } else {
-            //$class_name does not contain the name of a subclass
-            //of Resource. That's an error!
-            throw new NoResourceClassException(
-                sprintf(
-                    _('Die Klasse %1$s ist keine Spezialisierung der Ressourcen-Kernklasse!'),
-                    $class_name
-                )
-            );
-        }
-    }
-
-    /**
-     * Sets the range fields (termin_id, metadate_id, course_id)
-     * or the ResourceRequestAppointment objects related to this request
-     * according to the range type and its range-IDs specified as parameters
-     * for this method. The ResourceRequest object is not stored after
-     * setting the fields / related objects.
-     *
-     * @param string $range_type The range type for this request. One of
-     *     the following: 'date', 'cycle', 'course' or 'date-multiple'.
-     *
-     * @param array $range_ids An array of range-IDs to be set for the
-     *     specified range type. This is mostly an array of size one
-     *     since the fields termin_id, metadate_id and course_id only
-     *     accept one ID. The range type 'date-multiple' accepts multiple
-     *     IDs.
-     *
-     * @return void No return value.
-     */
-    public function setRangeFields($range_type = '', $range_ids = [])
-    {
-        if ($range_type === 'date') {
-            $this->termin_id   = $range_ids[0];
-            $this->metadate_id = '';
-        } elseif ($range_type === 'cycle') {
-            $this->termin_id   = '';
-            $this->metadate_id = $range_ids[0];
-        } elseif ($range_type === 'date-multiple') {
-            $this->termin_id   = '';
-            $this->metadate_id = '';
-            $appointments      = [];
-            foreach ($range_ids as $range_id) {
-                $app                 = new ResourceRequestAppointment();
-                $app->appointment_id = $range_id;
-                $appointments[]      = $app;
-            }
-            $this->appointments = $appointments;
-        } elseif ($range_type === 'course') {
-            $this->termin_id   = '';
-            $this->metadate_id = '';
-            $this->course_id   = $range_ids[0];
-        }
-    }
-
-    /**
-     * Closes the requests and sends out notification mails.
-     * If the request is closed and a resource has been booked,
-     * it can be passed as parameter to be included in the notification mails.
-     *
-     * @param bool $notify_lecturers Whether to notify lecturers of a course
-     *     (true) or not (false). Defaults to false. Note that this parameter
-     *     is only useful in case the request is bound to a course, either
-     *     directly or via a course date or a course cycle date.
-     *
-     * @param ResourceBooking $bookings The resource bookings that have been
-     *     created from this request.
-     * @return bool @TODO
-     */
-    public function closeRequest($notify_lecturers = false, $bookings = [])
-    {
-        if (
-            $this->closed == self::STATE_CLOSED
-            || $this->closed == self::STATE_DECLINED
-        ) {
-            //The request has already been closed.
-            return true;
-        }
-
-        $this->closed = self::STATE_PENDING;
-        if ($this->isDirty()) {
-            $this->store();
-        }
-
-        //Now we send the confirmation mail to the requester:
-        $this->sendCloseRequestMailToRequester($bookings);
-
-        if ($notify_lecturers) {
-            $this->sendCloseRequestMailToLecturers($bookings);
-        }
-
-        //Sending successful: The request is closed.
-        $this->closed = self::STATE_CLOSED;
-        if ($this->isDirty()) {
-            return $this->store();
-        }
-        return true;
-    }
-
-    /**
-     * Returns the resource requests whose time ranges overlap
-     * with those of this resource request.
-     *
-     * @return ResourceRequest[] An array of ResourceRequest objects.
-     */
-    public function getOverlappingRequests()
-    {
-        if ($this->resource) {
-            return self::findByResourceAndTimeRanges(
-                $this->resource,
-                $this->getTimeIntervals(true),
-                self::STATE_OPEN,
-                [$this->id]
-            );
-        }
-        return [];
-    }
-
-    /**
-     * Counts the resource requests whose time ranges overlap
-     * with those of this resource request.
-     *
-     * @return int The amount of overlapping resource requests.
-     */
-    public function countOverlappingRequests()
-    {
-        if ($this->resource) {
-            return self::countByResourceAndTimeRanges(
-                $this->resource,
-                $this->getTimeIntervals(true),
-                self::STATE_OPEN,
-                [$this->id]
-            );
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the resource bookings whose time ranges overlap
-     * with those of this resource request.
-     *
-     * @return ResourceBooking[] An array of ResourceBooking objects.
-     */
-    public function getOverlappingBookings()
-    {
-        if ($this->resource) {
-            return ResourceBooking::findByResourceAndTimeRanges(
-                $this->resource,
-                $this->getTimeIntervals(true),
-                [ResourceBooking::TYPE_NORMAL, ResourceBooking::TYPE_LOCK]
-            );
-        }
-        return [];
-    }
-
-    /**
-     * Counts the resource bookings whose time ranges overlap
-     * with those of this resource request.
-     *
-     * @return int The amount of overlapping resource bookings.
-     */
-    public function countOverlappingBookings()
-    {
-        if ($this->resource) {
-            return ResourceBooking::countByResourceAndTimeRanges(
-                $this->resource,
-                $this->getTimeIntervals(true),
-                [ResourceBooking::TYPE_NORMAL, ResourceBooking::TYPE_LOCK]
-            );
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the repetion interval if regular appointments are used
-     * for this request.
-     *
-     * @return DateInterval|null In case regular appointments are used
-     *     for this request a DateInterval is returned.
-     *     Otherwise null is returned.
-     */
-    public function getRepetitionInterval()
-    {
-        if ($this->metadate_id) {
-            //It is a set of regular appointments.
-            //We just have to compute the time difference between the first
-            //two appointments to get the interval.
-
-            $first_date  = $this->cycle->dates[0];
-            $second_date = $this->cycle->dates[1];
-
-            if (!$first_date || !$second_date) {
-                //Either only one date is in the set of regular appointments
-                //or there is a database error. We cannot continue.
-                return null;
-            }
-
-            $first_datetime = new DateTime();
-            $first_datetime->setTimestamp($first_date->date);
-            $second_datetime = new DateTime();
-            $second_datetime->setTimestamp($second_date->date);
-
-            return $first_datetime->diff($second_datetime);
-        }
-
-        return null;
-    }
-
-    public function getStartDate()
-    {
-        $start_date = new DateTime();
-        if (count($this->appointments) > 0) {
-            $start_date->setTimestamp($this->appointments->first()->appointment->date);
-            return $start_date;
-        }
-
-        if ($this->termin_id) {
-            $start_date->setTimestamp($this->date->date);
-            return $start_date;
-        }
-
-        if (isset($this->cycle) && count($this->cycle->dates) > 0) {
-            $first_date = $this->cycle->dates->first();
-            if ($this->metadate_id && isset($first_date->date)) {
-                $start_date->setTimestamp($first_date->date);
-                return $start_date;
-            }
-
-            if ($this->course_id && isset($first_date->date)) {
-                $start_date->setTimestamp($first_date->date);
-                return $start_date;
-            }
-        }
-
-        if ($this->begin) {
-            $start_date->setTimestamp($this->begin);
-            return $start_date;
-        }
-
-        return null;
-    }
-
-    public function getEndDate()
-    {
-        $end_date = new DateTime();
-        if (count($this->appointments) > 0) {
-            $end_date->setTimestamp($this->appointments->last()->appointment->end_time);
-            return $end_date;
-        }
-
-        if ($this->termin_id) {
-            $end_date->setTimestamp($this->date->end_time);
-            return $end_date;
-        }
-
-        if ($this->metadate_id) {
-            $date = $this->cycle->dates->last();
-            if (!isset($date)) {
-                return null;
-            }
-
-            $end_date->setTimestamp($this->cycle->dates->last()->end_time);
-            return $end_date;
-        }
-
-        if ($this->course_id) {
-            $date = $this->course->dates->last();
-            if (!isset($date)) {
-                return null;
-            }
-
-            $end_date->setTimestamp($this->course->dates->last()->end_time);
-            return $end_date;
-        }
-
-        if ($this->end) {
-            $end_date->setTimestamp($this->end);
-            return $end_date;
-        }
-
-        return null;
-    }
-
-    public function getStartSemester()
-    {
-        $start_date = $this->getStartDate();
-        if ($start_date instanceof DateTime) {
-            return Semester::findByTimestamp($start_date->getTimestamp());
-        }
-        return null;
-    }
-
-    public function getEndSemester()
-    {
-        $end_date = $this->getEndDate();
-        if ($end_date instanceof DateTime) {
-            return Semester::findByTimestamp($end_date->getTimestamp());
-        }
-        return null;
-    }
-
-    public function getRepetitionEndDate()
-    {
-        $repetition_interval = $this->getRepetitionInterval();
-
-        if (!$repetition_interval) {
-            //There is no repetition.
-            return null;
-        }
-
-        return $this->getEndDate();
-    }
-
-    /**
-     * Retrieves the time intervals by looking at metadate objects
-     * and other time interval sources and returns them grouped by metadate.
-     * @param bool $with_preparation_time @TODO
-     * @return mixed[][][] A three-dimensional array with
-     *     the following structure:
-     *     - The first dimension has the metadate-id as index. For single dates
-     *       an empty string is used as index.
-     *     - The second dimension contains two elements:
-     *       - 'metadate' => The metadate object. This is only set, if the
-     *                       request is for a metadate.
-     *       - 'intervals' => The time intervals.
-     *     - The third dimension contains a time interval
-     *       in the following format:
-     *       [
-     *           'begin' => The begin timestamp
-     *           'end' => The end timestamp
-     *           'range' => The name of the range class that provides the range_id.
-     *               This is usually the name of the SORM class.
-     *           'range_id' => The ID of the single date or ResourceRequestAppointment.
-     *       ]
-     */
-    public function getGroupedTimeIntervals($with_preparation_time = false, $with_past_intervals = true)
-    {
-        $now = time();
-        if (count($this->appointments)) {
-            $time_intervals = [
-                '' => [
-                    'metadate'  => null,
-                    'intervals' => []
-                ]
-            ];
-            foreach ($this->appointments as $appointment) {
-                if (!$with_past_intervals && $appointment->appointment->end_time < $now) {
-                    continue;
-                }
-                if ($with_preparation_time) {
-                    $interval = [
-                        'begin' => $appointment->appointment->date - $this->preparation_time,
-                        'end'   => $appointment->appointment->end_time
-                    ];
-                } else {
-                    $interval = [
-                        'begin' => $appointment->appointment->date,
-                        'end'   => $appointment->appointment->end_time
-                    ];
-                }
-
-                $date = CourseDate::find($appointment->appointment_id);
-                $interval['range']                 = 'CourseDate';
-                $interval['range_id']              = $appointment->appointment_id;
-                $interval['booked_room']           = $date->room_booking->resource_id;
-                $interval['booking_id']            = $date->room_booking->id;
-                $time_intervals['']['intervals'][] = $interval;
-            }
-
-            if (empty($time_intervals['']['intervals'])) {
-                return [];
-            } else {
-                return $time_intervals;
-            }
-        } elseif ($this->termin_id) {
-            if (!$with_past_intervals && $this->date->end_time < $now) {
-                return [];
-            }
-            if ($with_preparation_time) {
-                $interval = [
-                    'begin' => $this->date->date - $this->preparation_time,
-                    'end'   => $this->date->end_time
-                ];
-            } else {
-                $interval = [
-                    'begin' => $this->date->date,
-                    'end'   => $this->date->end_time
-                ];
-            }
-
-            $date = CourseDate::find($this->termin_id);
-            $interval['range']       = 'CourseDate';
-            $interval['range_id']    = $this->termin_id;
-            $interval['booked_room'] = $date->room_booking->resource_id;
-            $interval['booking_id']  = $date->room_booking->id;
-
-            if (!empty($interval)) {
-                return [
-                    '' => [
-                        'metadate'  => null,
-                        'intervals' => [$interval]
-                    ]
-                ];
-            } else {
-                return [];
-            }
-        } elseif ($this->metadate_id) {
-            $time_intervals = [
-                $this->metadate_id => [
-                    'metadate'  => $this->cycle,
-                    'intervals' => []
-                ]
-            ];
-            foreach ($this->cycle->dates as $date) {
-                if (!$with_past_intervals && $date->end_time < $now) {
-                    continue;
-                }
-                if ($with_preparation_time) {
-                    $interval = [
-                        'begin' => $date->date - $this->preparation_time,
-                        'end'   => $date->end_time
-                    ];
-                } else {
-                    $interval = [
-                        'begin' => $date->date,
-                        'end'   => $date->end_time
-                    ];
-                }
-                $interval['range']                                 = 'CourseDate';
-                $interval['range_id']                              = $date->id;
-                $interval['booked_room']                           = $date->room_booking->resource_id;
-                $interval['booking_id']                            = $date->room_booking->id;
-                $time_intervals[$this->metadate_id]['intervals'][] = $interval;
-            }
-            return $time_intervals;
-        } elseif ($this->course_id) {
-            $time_intervals = [];
-            if ($this->course->cycles) {
-                foreach ($this->course->cycles as $cycle) {
-                    $time_intervals[$cycle->id] = [
-                        'metadate'  => $cycle,
-                        'intervals' => []
-                    ];
-                    if ($cycle->dates) {
-                        foreach ($cycle->dates as $date) {
-                            if (!$with_past_intervals && $date->end_time < $now) {
-                                continue;
-                            }
-                            if ($with_preparation_time) {
-                                $interval = [
-                                    'begin' => $date->date - $this->preparation_time,
-                                    'end'   => $date->end_time
-                                ];
-                            } else {
-                                $interval = [
-                                    'begin' => $date->date,
-                                    'end'   => $date->end_time
-                                ];
-                            }
-                            $interval['range']                         = 'CourseDate';
-                            $interval['range_id']                      = $date->id;
-                            $interval['booked_room']                   = $date->room_booking->resource_id;
-                            $interval['booking_id']                    = $date->room_booking->id;
-                            $time_intervals[$cycle->id]['intervals'][] = $interval;
-                        }
-                    }
-                }
-            }
-            if ($this->course->dates) {
-                $time_intervals[''] = [
-                    'metadate'  => null,
-                    'intervals' => []
-                ];
-                foreach ($this->course->dates as $date) {
-                    if (!$with_past_intervals && $date->end_time < $now) {
-                        continue;
-                    }
-                    if ($date->cycle instanceof SeminarCycleDate) {
-                        //Metadates are already handled above.
-                        continue;
-                    }
-                    if ($with_preparation_time) {
-                        $interval = [
-                            'begin' => $date->date - $this->preparation_time,
-                            'end'   => $date->end_time
-                        ];
-                    } else {
-                        $interval = [
-                            'begin' => $date->date,
-                            'end'   => $date->end_time
-                        ];
-                    }
-                    $interval['range']                 = 'CourseDate';
-                    $interval['range_id']              = $date->id;
-                    $interval['booked_room']           = $date->room_booking->resource_id;
-                    $interval['booking_id']            = $date->room_booking->id;
-                    $time_intervals['']['intervals'][] = $interval;
-                }
-
-                if (empty($time_intervals['']['intervals'])) {
-                    unset($time_intervals['']);
-                }
-            }
-            return $time_intervals;
-        } elseif ($this->begin && $this->end) {
-            if (!$with_past_intervals && $this->end < $now) {
-                return [];
-            }
-            if ($with_preparation_time) {
-                $interval = [
-                    'begin' => $this->begin - $this->preparation_time,
-                    'end'   => $this->end
-                ];
-            } else {
-                $interval = [
-                    'begin' => $this->begin,
-                    'end'   => $this->end
-                ];
-            }
-            $interval['range']    = 'User';
-            $interval['range_id'] = $this->user_id;
-
-            return [
-                '' => [
-                    'metadate'  => null,
-                    'intervals' => [$interval]
-                ]
-            ];
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * Retrieves the time intervals for this request.
-     *
-     * @param bool $with_preparation_time Whether the preparation time
-     *     of the request shall be prepended to the begin timestamp (true)
-     *     or whether it should not be included at all (false).
-     *     Defaults to false.
-     *
-     * @param bool $with_range Whether to include data of the Stud.IP range
-     *     and its corresponding ID to the request (true) or not (false).
-     *     Defaults to false.
-     *
-     * @param bool $with_past_intervals Whether to include past intervals (true)
-     *     or only include intervals from the current time and the future (false).
-     *     Defaults to true.
-     *
-     * @return string[][] A two-dimensional array of unix timestamps.
-     *     The first dimension contains one entry for each date,
-     *     the second dimension contains the start and end timestamp
-     *     for the date.
-     *     The second dimension uses the array keys 'begin' and 'end'
-     *     for start and end date.
-     *     If the @with_range parameter is set to true, the second array
-     *     dimension also contains the key 'range' for specifying the
-     *     range type and 'range_id' for specifying the ID of the
-     *     range object.
-     *     The range can be "CourseDate", "ResourceRequestAppointment"
-     *     or "User". The last two can only be present for simple requests
-     *     that are not bound to a course. The range "CourseDate"
-     *     can only occur on course-bound requests.
-     */
-    public function getTimeIntervals($with_preparation_time = false, $with_range = false, $with_past_intervals = true)
-    {
-        $now = time();
-        if (count($this->appointments)) {
-            $time_intervals = [];
-            foreach ($this->appointments as $appointment) {
-                if (!$with_past_intervals && $appointment->appointment->end_time < $now) {
-                    continue;
-                }
-                if ($with_preparation_time) {
-                    $interval = [
-                        'begin' => $appointment->appointment->date - $this->preparation_time,
-                        'end'   => $appointment->appointment->end_time
-                    ];
-                } else {
-                    $interval = [
-                        'begin' => $appointment->appointment->date,
-                        'end'   => $appointment->appointment->end_time
-                    ];
-                }
-                if ($with_range) {
-                    $date = CourseDate::find($appointment->appointment_id);
-
-                    $interval['range']       = ResourceRequestAppointment::class;
-                    $interval['range_id']    = $appointment->appointment_id;
-                    $interval['booked_room'] = $date->room_booking->resource_id ?? null;
-                    $interval['booking_id']  = $date->room_booking->id ?? null;
-
-                }
-                $time_intervals[] = $interval;
-            }
-            return $time_intervals;
-        } elseif ($this->termin_id) {
-            if (!$with_past_intervals && $this->date->end_time < $now) {
-                return [];
-            }
-            if ($with_preparation_time) {
-                $interval = [
-                    'begin' => $this->date->date - $this->preparation_time,
-                    'end'   => $this->date->end_time
-                ];
-            } else {
-                $interval = [
-                    'begin' => $this->date->date,
-                    'end'   => $this->date->end_time
-                ];
-            }
-            if ($with_range) {
-                $interval['range']       = CourseDate::class;
-                $interval['range_id']    = $this->termin_id;
-                $interval['booked_room'] = $this->date->room_booking->resource_id ?? null;
-                $interval['booking_id']  = $this->date->room_booking->id ?? null;
-            }
-            return [$interval];
-        } elseif ($this->metadate_id) {
-            $time_intervals = [];
-            foreach ($this->cycle->dates as $date) {
-                if (!$with_past_intervals && $date->end_time < $now) {
-                    continue;
-                }
-                if ($with_preparation_time) {
-                    $interval = [
-                        'begin' => $date->date - $this->preparation_time,
-                        'end'   => $date->end_time
-                    ];
-                } else {
-                    $interval = [
-                        'begin' => $date->date,
-                        'end'   => $date->end_time
-                    ];
-                }
-                if ($with_range) {
-                    $interval['range']       = CourseDate::class;
-                    $interval['range_id']    = $date->id;
-                    $interval['booked_room'] = $date->room_booking->resource_id ?? null;
-                    $interval['booking_id']  = $date->room_booking->id ?? null;
-                }
-                $time_intervals[] = $interval;
-            }
-            return $time_intervals;
-        } elseif ($this->course_id) {
-            $time_intervals = [];
-            if ($this->course->dates) {
-                foreach ($this->course->dates as $date) {
-                    if (!$with_past_intervals && $date->end_time < $now) {
-                        continue;
-                    }
-                    if ($with_preparation_time) {
-                        $interval = [
-                            'begin' => $date->date - $this->preparation_time,
-                            'end'   => $date->end_time
-                        ];
-                    } else {
-                        $interval = [
-                            'begin' => $date->date,
-                            'end'   => $date->end_time
-                        ];
-                    }
-                    if ($with_range) {
-                        $interval['range']       = CourseDate::class;
-                        $interval['range_id']    = $date->id;
-                        $interval['booked_room'] = $date->room_booking->resource_id ?? null;
-                        $interval['booking_id']  = $date->room_booking->id ?? null;
-                    }
-                    $time_intervals[] = $interval;
-                }
-            }
-            return $time_intervals;
-        } elseif ($this->begin && $this->end) {
-            if (!$with_past_intervals && $this->end < $now) {
-                return [];
-            }
-            if ($with_preparation_time) {
-                $interval = [
-                    'begin' => $this->begin - $this->preparation_time,
-                    'end'   => $this->end
-                ];
-            } else {
-                $interval = [
-                    'begin' => $this->begin,
-                    'end'   => $this->end
-                ];
-            }
-            if ($with_range) {
-                $interval['range']    = 'User';
-                $interval['range_id'] = $this->user_id;
-            }
-            return [$interval];
-        } else {
-            return [];
-        }
-    }
-
-
-    /**
-     * Returns a string representation of the time intervals for this request.
-     */
-    public function getTimeIntervalStrings()
-    {
-        $strings   = [];
-        $intervals = $this->getTimeIntervals(false, true);
-        foreach ($intervals as $interval) {
-            $room = '';
-
-            if ($interval['range'] === 'CourseDate') {
-                $date = call_user_func([$interval['range'], 'find'], $interval['range_id']);
-                if ($date->room_booking) {
-                    $room_obj = Room::find($date->room_booking->resource_id);
-                    if ($room_obj) {
-                        $room = $room_obj->name;
-                    }
-                }
-            }
-
-            $same_day = date('Ymd', $interval['begin']) === date('Ymd', $interval['end']);
-            if ($same_day) {
-                $strings[] = strftime('%a. %x %R', $interval['begin'])
-                    . ' - ' . strftime('%R', $interval['end'])
-                    . ($room ? ', '. $room : '');
-            } else {
-                $strings[] = strftime('%a. %x %R', $interval['begin'])
-                    . ' - ' . strftime('%a %x %R', $interval['end'])
-                    . ($room ? ', '. $room : '');
-            }
-
-        }
-        return $strings;
-    }
-
-
-    /**
-     * Filters the time intervals for this request
-     * by a specified time range.
-     *
-     * @see ResourceRequest::getTimeIntervals for the return format.
-     */
-    public function getTimeIntervalsInTimeRange(DateTime $begin, DateTime $end)
-    {
-        $all_time_intervals = $this->getTimeIntervals();
-
-        $included_intervals = [];
-        foreach ($all_time_intervals as $interval) {
-            $interval_in_range = (
-                (
-                    $interval['begin'] >= $begin->getTimestamp()
-                    &&
-                    $interval['begin'] <= $end->getTimestamp()
-                )
-                ||
-                (
-                    $interval['end'] >= $begin->getTimestamp()
-                    &&
-                    $interval['end'] <= $end->getTimestamp()
-                )
-            );
-            if ($interval_in_range) {
-                $included_intervals[] = $interval;
-            }
-        }
-
-        return $included_intervals;
-    }
-
-
-    /**
-     * Returns a string representation of the ResourceRequest's type.
-     */
-    public function getType()
-    {
-        if (count($this->appointments)) {
-            return 'appointments';
-        } elseif ($this->termin_id) {
-            return 'date';
-        } elseif ($this->metadate_id) {
-            return 'cycle';
-        } elseif ($this->course_id) {
-            return 'course';
-        }
-        return null;
-    }
-
-    /**
-     * Returns a string representation of the status of the ResourceRequest.
-     */
-    public function getStatus()
-    {
-        switch ($this->closed) {
-            case self::STATE_OPEN:
-                return 'open';
-            case self::STATE_PENDING:
-                return 'pending';
-            case self::STATE_CLOSED:
-                return 'closed';
-            case self::STATE_DECLINED:
-                return 'declined';
-            default:
-                return '';
-        }
-    }
-
-
-    /**
-     * Returns a textual representation of the status of the ResourceRequest.
-     */
-    public function getStatusText()
-    {
-        if ($this->isNew()) {
-            return _('Diese Anfrage wurde noch nicht gespeichert.');
-        }
-        if ($this->closed == self::STATE_OPEN) {
-            return _('Die Anfrage wurde noch nicht bearbeitet.');
-        } else if ($this->closed == self::STATE_DECLINED) {
-            return _('Die Anfrage wurde bearbeitet und abgelehnt.');
-        } else {
-            return _('Die Anfrage wurde bearbeitet.');
-        }
-    }
-
-
-    /**
-     * Returns a textual representation of the dates for which the request
-     * has been created.
-     *
-     * @param bool $as_array True, if an array with a string for each date
-     *     (single or cycle date) shall be returned, false otherwise.
-     *
-     * @returns string|array Depending on the parameter $as_array, the text
-     *     is returned as one string or as an array of strings for each date
-     *     (single or cycle date).
-     */
-    public function getDateString($as_array = false, $with_past_intervals = true)
-    {
-        $now = time();
-        $strings = [];
-        $resource_name = '';
-        if (count($this->appointments)) {
-            $parts  = [];
-            foreach ($this->appointments as $rra) {
-                if (!$with_past_intervals && $rra->appointment->end_time < $now) {
-                    continue;
-                }
-                if ($rra->appointment) {
-                    $parts[] = $rra->appointment->getFullName('include-room');
-                }
-            }
-            $strings[] = implode('; ', $parts);
-        } elseif ($this->termin_id) {
-            if ($this->date) {
-                if ($with_past_intervals || $this->date->end_time >= $now) {
-                    $strings[] = $this->date->getFullName('include-room');
-                }
-            }
-        } elseif ($this->metadate_id) {
-            if ($this->cycle) {
-                $this->cycle->dates->filter(function($date) use($with_past_intervals, $now) {
-                    return $with_past_intervals || $date->end_time >= $now;
-                })->map(function($date) use(&$strings) {
-                    $strings[] = $date->getFullName('include-room');
-                });
-            }
-        } elseif ($this->course_id) {
-            $course = new Seminar($this->course_id);
-            $strings[] = $course->getDatesTemplate('dates/seminar_html_roomplanning',
-                [
-                    'shrink'    => false,
-                    'show_room' => true,
-                    'with_past_intervals' => $with_past_intervals
-                ]
-            );
-        } elseif ($this->begin && $this->end) {
-            $begin_date = date('Ymd', $this->begin);
-            $end_date   = date('Ymd', $this->end);
-            if($this->resource) {
-                $resource_name = htmlReady($this->resource->getFullName());
-            }
-            if ($begin_date == $end_date) {
-                $strings[] = strftime('%a., %x, %R', $this->begin) . ' - '
-                           . strftime('%R', $this->end) . ' ' . $resource_name;
-            } else {
-                //Begin and end are on differnt dates
-                $strings[] = strftime('%a., %x, %R', $this->begin) . ' - '
-                    . strftime('%a., %x, %R', $this->end) . ' ' . $resource_name;
-            }
-        }
-
-        if ($as_array) {
-            return $strings;
-        } else {
-            return implode(';', $strings);
-        }
-    }
-
-
-    /**
-     * Returns a human-readable string describing the type of the request.
-     *
-     * @param bool $short If this parameter is set to true, only the
-     *     type of the request is returned without any information about the
-     *     appointments. Otherwise, appointment information like the
-     *     date or the repetition are appended. Defaults to false.
-     * @return string
-     */
-    public function getTypeString($short = false)
-    {
-        if (count($this->appointments) > 1) {
-            if ($short) {
-                return _('Einzeltermine');
-            } else {
-                return sprintf(_('Einzeltermine (%sx)'), count($this->appointments));
-            }
-        } elseif (count($this->appointments) === 1) {
-            $date = $this->appointments[0]->appointment;
-            if ($short || !$date) {
-                return _('Einzeltermin');
-            } else {
-                return sprintf(_('Einzeltermin (%s)'), $date->getFullName());
-            }
-        } elseif ($this->date) {
-            if ($short) {
-                return _('Einzeltermin');
-            } else {
-                return sprintf(_('Einzeltermin (%s)'), $this->date->getFullName());
-            }
-        } elseif ($this->cycle) {
-            if ($short) {
-                return _('Regelmäßige Termine');
-            } else {
-                return sprintf(
-                    _('Regelmäßige Termine (%s)'),
-                    $this->cycle->toString('full')
-                );
-            }
-        } elseif ($this->course) {
-            if ($short) {
-                return _('Alle Termine der Veranstaltung');
-            } else {
-                return sprintf(
-                    _('Alle Termine der Veranstaltung (%sx)'),
-                    count($this->course->dates)
-                );
-            }
-        } else {
-            return _('Einfache Anfrage');
-        }
-    }
-
-
-    /**
-     * Returns an array of date objects which are affected
-     * by this ResourceRequest.
-     */
-    public function getAffectedDates()
-    {
-        $dates = [];
-        switch ($this->getType()) {
-            case 'date':
-                $dates[] = $this->date;
-                break;
-            case 'cycle':
-                $dates = $this->cycle->dates->getArrayCopy();
-                break;
-            case 'course':
-                $dates = $this->course->dates->getArrayCopy();
-                break;
-        }
-        return $dates;
-    }
-
-
-    /**
-     * @param array $excluded_property_names
-     * Returns all resource property definitions for all properties
-     * which can be applied for this ResourceRequest by looking at the
-     * Resource category. If no resource category ID is set for the request
-     * an empty array is returned.
-     */
-    public function getAvailableProperties($excluded_property_names = [])
-    {
-        if (!$this->category_id) {
-            //Without a category-ID we cannot find any property!
-            return [];
-        }
-        if (count($excluded_property_names)) {
-            return ResourcePropertyDefinition::findBySql(
-                "INNER JOIN resource_category_properties
-                USING (property_id)
-                WHERE requestable = '1' AND category_id = :category_id
-                AND name NOT IN ( :excluded_property_names )",
-                [
-                    'category_id'             => $this->category_id,
-                    'excluded_property_names' => $excluded_property_names
-                ]
-            );
-        } else {
-            return ResourcePropertyDefinition::findBySql(
-                "INNER JOIN resource_category_properties
-                USING (property_id)
-                WHERE requestable = '1' AND category_id = :category_id",
-                [
-                    'category_id' => $this->category_id
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * Returns a "compressed" array of resource request properties.
-     * @param array $excluded_property_names
-     * @return array An associative array where the keys represent the
-     *     property names and the values represent the property states.
-     *     Note that the value can be an array in case of range properties.
-     */
-    public function getPropertyData($excluded_property_names = [])
-    {
-        $data = [];
-        foreach ($this->properties as $property) {
-            if ($property->definition->range_search) {
-                //Assume that a minimum value is requested:
-                $data[$property->name] = [$property->state];
-            } else {
-                $data[$property->name] = $property->state;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @param $name
-     * @return bool
-     */
-    public function propertyExists($name)
-    {
-        $db = DBManager::get();
-
-        $exists_stmt = $db->prepare(
-            "SELECT TRUE FROM resource_request_properties
-            INNER JOIN resource_property_definitions rpd
-                ON resource_request_properties.property_id = rpd.property_id
-            WHERE resource_request_properties.request_id = :request_id
-                AND rpd.name = :name");
-
-        $exists_stmt->execute(
-            [
-                'request_id' => $this->id,
-                'name'       => $name
-            ]
-        );
-
-        $exists = $exists_stmt->fetchColumn(0);
-
-        return (bool)$exists;
-    }
-
-
-    /**
-     * @param $name
-     * Returns the state of the property specified by $name.
-     */
-    public function getProperty($name)
-    {
-        if (!$this->propertyExists($name)) {
-            //A property with the name $name does not exist for this
-            //resource request object.
-            //In that case we can only return null, since resource requests
-            //store only those properties which are requested:
-
-            return null;
-        }
-
-        $db = DBManager::get();
-
-        $value_stmt = $db->prepare(
-            "SELECT resource_request_properties.state FROM resource_request_properties
-            INNER JOIN resource_property_definitions rpd
-                ON resource_request_properties.property_id = rpd.property_id
-            WHERE resource_request_properties.request_id = :request_id
-                AND rpd.name = :name");
-
-        $value_stmt->execute(
-            [
-                'request_id' => $this->id,
-                'name'       => $name
-            ]
-        );
-
-        $value = $value_stmt->fetchColumn(0);
-
-        if (!$value) {
-            return null;
-        }
-
-        return $value;
-    }
-
-
-    /**
-     * @param $name
-     * @return ResourceRequestProperty
-     * @throws InvalidResourceCategoryException If this resource category
-     *     doesn't match the category of the resource request object.
-     * @throws ResourcePropertyException If the name of the
-     *     resource request property is not defined for this resource category.
-     */
-    public function getPropertyObject($name)
-    {
-        if (!$this->propertyExists($name)) {
-            //A property with the name $name does not exist for this
-            //resource object. If it is a mandatory property
-            //we can still try to create it:
-
-            $property = $this->category->createDefinedResourceRequestProperty(
-                $this,
-                $name
-            );
-
-            $property->store();
-            return $property;
-        }
-
-        return ResourceRequestProperty::findOneBySql(
-            "INNER JOIN resource_property_definitions rpd
-                ON resource_request_properties.property_id = rpd.property_id
-            WHERE resource_request_properties.request_id = :request_id
-                AND rpd.name = :name",
-            [
-                'request_id' => $this->id,
-                'name'       => $name
-            ]
-        );
-    }
-
-
-    /**
-     * @param string $name
-     * @param string $state
-     * @return bool True, if the property state could be set, false otherwise.
-     */
-    public function setProperty($name, $state = '')
-    {
-        if (!$this->propertyExists($name)) {
-            //A property with the name $name does not exist for this
-            //resource object. If it is a mandatory property
-            //we can still try to create it:
-
-            if ($this->category) {
-                $property = $this->category->createDefinedResourceRequestProperty(
-                    $this,
-                    $name,
-                    $state
-                );
-                return $property->store();
-            }
-            return false;
-        }
-
-        $property = $this->getPropertyObject($name);
-
-        if ($property) {
-            $property->state = $state;
-            if ($property->isDirty()) {
-                return $property->store();
-            }
-            return true;
-        }
-    }
-
-
-    /**
-     * Sets or unsets the properties for this resource request.
-     *
-     * @param array $property_list The properties which shall be set
-     *     or unset. The array has the following structure:
-     *     [
-     *         property_name => property_value
-     *     ]
-     *
-     * @param bool $accept_null_values True, if a value of null
-     *     shall be used when setting the property.
-     *     If $accept_null_values is set to false all properties
-     *     with a value equal to null will be deleted.
-     *
-     * @return null
-     */
-    public function updateProperties($property_list = [], $accept_null_values = false)
-    {
-        //Delete all properties first then re-create them
-        //from the $property_list array:
-        $this->properties->delete();
-        if (is_array($property_list)) {
-            foreach ($property_list as $name => $state) {
-                if ($state or $accept_null_values) {
-                    //State is set or null values are allowed:
-                    //create/update the property
-                    $this->setProperty($name, $state);
-                }
-            }
-        }
-        $this->resetRelation('properties');
-    }
-
-
-    public function deletePropertyIfExists($name = '')
-    {
-        if (!$this->propertyExists($name)) {
-            return true;
-        } else {
-            $property = $this->getPropertyObject($name);
-            return $property->delete();
-        }
-    }
-
-
-    public function getRangeName()
-    {
-        if ($this->getRangeType() === 'course') {
-            $name = $this->getRangeObject()->getFullName();
-            $name .= ' (' . implode(',', $this->getRangeObject()->getMembersWithStatus('dozent', true)->limit(3)->getValue('nachname')) . ')';
-        } else {
-            $range_object = $this->getRangeObject();
-            if ($range_object instanceof User) {
-                if (get_visibility_by_id($range_object->id)) {
-                    $name = $range_object->getFullName();
-                } else if ($this->user_id === $GLOBALS['user']->id) {
-                    $name = $range_object->getFullName();
-                } else {
-                    $current_user = User::findCurrent();
-                    if ($current_user instanceof User) {
-                        //If the current user has at least autor permissions
-                        //(which are required to see all requests), they can
-                        //see the name of the requester.
-                        if ($this->resource_id && ($this->resource instanceof Resource)
-                            && $this->resource->userHasPermission($current_user, 'autor')) {
-                            $name = $range_object->getFullName();
-                        } else if (ResourceManager::userHasGlobalPermission($current_user, 'autor')) {
-                            $name = $range_object->getFullName();
-                        } else {
-                            return '';
-                        }
-                    } else {
-                        return '';
-                    }
-                }
-            } else {
-                $name = $range_object->getFullName();
-            }
-            if ($this->comment) {
-                $name .= " \n" . $this->comment;
-            }
-        }
-        return $name;
-    }
-
-
-    public function isSimpleRequest()
-    {
-        return !$this->course_id && !$this->metadate_id && !$this->termin_id;
-    }
-
-
-    public function getRangeId()
-    {
-        //Check if the request belongs to a course:
-        if ($this->termin_id) {
-            return $this->date->range_id;
-        } elseif ($this->metadate_id) {
-            return $this->cycle->seminar_id;
-        } elseif ($this->course_id) {
-            return $this->course_id;
-        }
-
-        //The request does not belong to a course and therefore
-        //belongs to a user:
-        return $this->user_id;
-    }
-
-
-    public function getRangeType()
-    {
-        if ($this->course_id || $this->termin_id || $this->metadate_id) {
-            return 'course';
-        }
-        return 'user';
-    }
-
-
-    public function getRangeObject()
-    {
-        if ($this->course_id) {
-            return $this->course;
-        }
-        if ($this->termin_id) {
-            return $this->date->course;
-        }
-        if ($this->metadate_id) {
-            return $this->cycle->course;
-        }
-        return $this->user;
-    }
-
-
-    /**
-     * This method sends a notification mail to all room administrators
-     * that informs them of this new request.
-     */
-    public function sendNewRequestMail()
-    {
-        //First we must get all users who have admin permissions in the
-        //resource management system. Depending wheter a resource_id is set
-        //for this resource request either all admins of a resource or
-        //all admins of the resource management system must be informed.
-
-        $now         = time();
-        if ($this->resource_id) {
-            //The resource-ID is set for this request:
-            //Get all admins of the resource and the resource management system.
-            $admin_users = User::findBySql(
-                "user_id IN (
-                    SELECT user_id FROM resource_permissions
-                    WHERE (
-                        resource_id = :resource_id
-                        OR resource_id = 'global'
-                    )
-                    AND perms = 'admin'
-                    UNION
-                    SELECT user_id FROM resource_temporary_permissions
-                    WHERE resource_id = :resource_id
-                    AND perms = 'admin'
-                    AND begin <= :now AND end >= :now
-                )",
-                [
-                    'resource_id' => $this->resource_id,
-                    'now'         => $now
-                ]
-            );
-        } else {
-            //Get all admins of the resource management system.
-            $admin_users = User::findBySql(
-                "user_id IN (
-                    SELECT user_id FROM resource_permissions
-                    WHERE resource_id = 'global'
-                    AND perms = 'admin'
-                    UNION
-                    SELECT user_id FROM resource_temporary_permissions
-                    WHERE resource_id = 'global'
-                    AND perms = 'admin'
-                    AND begin <= :now AND end >= :now
-                    GROUP BY user_id
-                )",
-                [
-                    'now' => $now
-                ]
-            );
-        }
-
-        if (!$admin_users) {
-            return;
-        }
-
-        $factory = new Flexi\Factory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-        );
-
-        foreach ($admin_users as $user) {
-            $user_lang_path = getUserLanguagePath($user->id);
-
-            $template = $factory->open(
-                $user_lang_path . '/LC_MAILS/new_resource_request.php'
-            );
-            $template->set_attribute('request', $this);
-
-            if ($this->resource instanceof Resource) {
-                $resource = $this->resource->getDerivedClassInstance();
-                if ($resource instanceof Room) {
-                    $template->set_attribute('requested_room', $resource->name);
-                } else {
-                    $template->set_attribute('requested_resource', $resource->name);
-                }
-            }
-
-            $mail_text = $template->render();
-
-            setLocaleEnv($user->preferred_language);
-
-            if ($this->resource) {
-                $resource = $this->resource->getDerivedClassInstance();
-                $template->set_attribute('derived_resource', $resource);
-                $mail_title = sprintf(
-                    _('%1$s: Neue Anfrage in der Raumverwaltung'),
-                    $resource->getFullName()
-                );
-            } else {
-                $mail_title = sprintf(
-                    _('Neue Anfrage in der Raumverwaltung')
-                );
-            }
-
-            Message::send(
-                User::findCurrent()->id,
-                $user->username,
-                $mail_title,
-                $mail_text
-            );
-
-            restoreLanguage();
-        }
-    }
-
-
-    /**
-     * @param array $bookings
-     * This method sends a mail to inform the requester that
-     * the request has been closed.
-     */
-    public function sendCloseRequestMailToRequester($bookings = [])
-    {
-        $factory = new Flexi\Factory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-        );
-
-        $requester_lang      = $this->user->preferred_language;
-        $requester_lang_path = getUserLanguagePath($this->user->id);
-        setLocaleEnv($requester_lang);
-
-        $template = $factory->open(
-            $requester_lang_path . '/LC_MAILS/close_resource_request.php'
-        );
-        $template->set_attribute('request', $this);
-        if ($this->course) {
-            $lecturers      = CourseMember::findByCourseAndStatus(
-                $this->course->id,
-                'dozent'
-            );
-            $lecturer_names = [];
-            foreach ($lecturers as $lecturer) {
-                if ($lecturer->user instanceof User) {
-                    $lecturer_names[] = $lecturer->user->getFullName();
-                }
-            }
-
-            $lecturer_names = implode(', ', $lecturer_names);
-            $template->set_attribute('lecturer_names', $lecturer_names);
-        }
-        if (is_array($bookings)) {
-            $booked_rooms          = [];
-            $booked_time_intervals = [];
-            $metadates             = [];
-            $single_dates          = [];
-            foreach ($bookings as $booking) {
-                if (!($booking instanceof ResourceBooking)) {
-                    continue;
-                }
-                $booked_rooms[] = $booking->resource->name;
-                if ($booking->assigned_course_date instanceof CourseDate) {
-                    $single_date = $booking->assigned_course_date;
-                    $metadate    = $single_date->cycle;
-                    if ($metadate instanceof SeminarCycleDate) {
-                        $metadates[$metadate->id] = $metadate;
-                    } else {
-                        $single_dates[$single_date->id] = $single_date;
-                    }
-                } else {
-                    $time_intervals = $booking->getTimeIntervals();
-                    foreach ($time_intervals as $time_interval) {
-                        $booked_time_intervals[] = $time_interval->__toString();
-                    }
-                }
-            }
-            $booked_rooms = array_unique($booked_rooms);
-            sort($booked_rooms);
-            $template->set_attribute('booked_rooms', implode(', ', $booked_rooms));
-            $template->set_attribute('metadates', $metadates);
-            $template->set_attribute('single_dates', $single_dates);
-            $template->set_attribute('booked_time_intervals', $booked_time_intervals);
-        }
-
-        $mail_title = _('Ihre Anfrage wurde bearbeitet!');
-        $mail_text  = $template->render();
-
-        Message::send(
-            User::findCurrent()->id,
-            $this->user->username,
-            $mail_title,
-            $mail_text
-        );
-
-        restoreLanguage();
-    }
-
-
-    /**
-     * @param array $bookings
-     * This method sends mails to the lecurers of the course (if any)
-     * where this request has been assigned to. The sent mail informs them
-     * about the closing of the request.
-     */
-    public function sendCloseRequestMailToLecturers($bookings = [])
-    {
-        //Notify each lecturer of the course:
-        if ($this->course) {
-            $lecturers = CourseMember::findByCourseAndStatus(
-                $this->course->id,
-                'dozent'
-            );
-
-            if ($lecturers) {
-                $factory = new Flexi\Factory(
-                    $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-                );
-
-                $lecturer_names = [];
-                foreach ($lecturers as $lecturer) {
-                    if ($lecturer->user instanceof User) {
-                        $lecturer_names[] = $lecturer->user->getFullName();
-                    }
-                }
-                $lecturer_names = implode(', ', $lecturer_names);
-
-                $booked_rooms          = [];
-                $booked_time_intervals = [];
-                $metadates             = [];
-                $single_dates          = [];
-                if (is_array($bookings)) {
-                    foreach ($bookings as $booking) {
-                        if (!($booking instanceof ResourceBooking)) {
-                            continue;
-                        }
-                        $booked_rooms[] = $booking->resource->name;
-                        if ($booking->assigned_course_date instanceof CourseDate) {
-                            $single_date = $booking->assigned_course_date;
-                            $metadate    = $single_date->cycle;
-                            if ($metadate instanceof SeminarCycleDate) {
-                                $metadates[$metadate->id] = $metadate;
-                            } else {
-                                $single_dates[$single_date->id] = $single_date;
-                            }
-                        } else {
-                            $time_intervals = $booking->getTimeIntervals();
-                            foreach ($time_intervals as $time_interval) {
-                                $booked_time_intervals[] = $time_interval->__toString();
-                            }
-                        }
-                    }
-                }
-                $booked_rooms = array_unique($booked_rooms);
-                sort($booked_rooms);
-                $booked_rooms = implode(', ', $booked_rooms);
-
-                foreach ($lecturers as $lecturer) {
-                    $lec_lang      = $lecturer->user->preferred_language;
-                    $lec_lang_path = getUserLanguagePath($lecturer->user->id);
-
-                    setLocaleEnv($lec_lang);
-
-                    $template = $factory->open(
-                        $lec_lang_path . '/LC_MAILS/close_resource_request.php'
-                    );
-                    $template->set_attribute('request', $this);
-                    $template->set_attribute('lecturer_names', $lecturer_names);
-                    $template->set_attribute('booked_rooms', $booked_rooms);
-                    $template->set_attribute('metadates', $metadates);
-                    $template->set_attribute('single_dates', $single_dates);
-                    $template->set_attribute('booked_time_intervals', $booked_time_intervals);
-
-                    $mail_title = _('Bearbeitung einer Anfrage!');
-                    $mail_text  = $template->render();
-
-                    Message::send(
-                        User::findCurrent()->id,
-                        $lecturer->user->username,
-                        $mail_title,
-                        $mail_text
-                    );
-
-                    restoreLanguage();
-                }
-            }
-        }
-    }
-
-
-    /**
-     * This method sends a mail to inform the requester
-     * about the denial of the request.
-     */
-    public function sendRequestDeniedMail()
-    {
-        //Get the user who made the request:
-        $user = $this->user;
-        if (!($user instanceof User)) {
-            //No mail to send.
-            return;
-        }
-
-        //Load the mail template:
-        $factory = new Flexi\Factory(
-            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
-        );
-        $user_lang_path = getUserLanguagePath($user->id);
-        $template       = $factory->open(
-            $user_lang_path . '/LC_MAILS/request_denied_mail.inc.php'
-        );
-
-        $range_object = $this->getRangeObject();
-        $mail_title = _('Raumanfrage wurde abgelehnt');
-        if($range_object instanceof Course) {
-            $mail_title .= ': ' . $range_object->getFullName();
-        }
-        $mail_text  = $template->render(
-            [
-                'request' => $this,
-                'range_object' => $range_object
-            ]
-        );
-
-        //Send the mail:
-        Message::send(
-            User::findCurrent()->id,
-            $user->username,
-            $mail_title,
-            $mail_text
-        );
-    }
-
-
-    public function isReadOnlyForUser(User $user)
-    {
-        $resource = $this->resource;
-        if (!$resource) {
-            //We cannot continue with the permission check.
-            return false;
-        }
-        $resource = $resource->getDerivedClassInstance();
-
-        return !$resource->userHasPermission($user, 'autor')
-            && ($this->user_id != $user->id);
-    }
-
-    protected function convertToEventData(array $time_intervals, User $user)
-    {
-        $booking_plan_request_bg     =
-            ColourValue::find('Resources.BookingPlan.Request.Bg');
-        $booking_plan_request_fg     =
-            ColourValue::find('Resources.BookingPlan.Request.Fg');
-        $booking_plan_preparation_bg =
-            ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
-        $booking_plan_preparation_fg =
-            ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
-
-        $user_is_resource_autor = false;
-        if ($this->resource_id && ($this->resource instanceof Resource)) {
-            $user_is_resource_autor = $this->resource->userHasPermission(
-                $user,
-                'autor'
-            );
-        }
-        $request_is_editable =
-            $user_is_resource_autor || ($user->id == $this->user_id);
-
-        $request_api_urls  = [];
-        $request_view_urls = [];
-
-        if ($request_is_editable) {
-            $request_api_urls = [
-                'resize' => URLHelper::getURL(
-                    'api.php/resources/request/'
-                    . $this->id . '/move',
-                    [
-                        'quiet' => '1'
-                    ]
-                ),
-                'move'   => URLHelper::getURL(
-                    'api.php/resources/request/'
-                    . $this->id . '/move',
-                    [
-                        'quiet' => '1'
-                    ]
-                )
-            ];
-
-            $request_view_urls = [
-                'edit' => URLHelper::getURL(
-                    'dispatch.php/resources/room_request/edit/'
-                    . $this->id
-                )
-            ];
-            if ($this->resource_id && ($this->resource instanceof Resource)) {
-                if ($this->resource->userHasBookingRights($user)) {
-                    $request_view_urls['edit'] = URLHelper::getURL(
-                        'dispatch.php/resources/room_request/resolve/'
-                        . $this->id
-                    );
-                }
-            }
-        }
-
-        $events = [];
-
-        foreach ($time_intervals as $interval) {
-            $real_begin = $interval['begin'];
-            if ($this->preparation_time) {
-                $real_begin += (int)$this->preparation_time;
-                $begin      = new DateTime();
-                $begin->setTimestamp($interval['begin']);
-                $end = new DateTime();
-                $end->setTimestamp($real_begin);
-                $events[] = new Studip\Calendar\EventData(
-                    $begin,
-                    $end,
-                    _('Rüstzeit'),
-                    ['preparation-time'],
-                    $booking_plan_preparation_fg->__toString(),
-                    $booking_plan_preparation_bg->__toString(),
-                    $request_is_editable,
-                    '',
-                    '',
-                    'ResourceRequest',
-                    $this->id,
-                    'Resource',
-                    $this->resource_id,
-                    $request_view_urls,
-                    $request_api_urls
-                );
-            }
-
-            $begin = new DateTime();
-            $begin->setTimestamp($real_begin);
-            $end = new DateTime();
-            $end->setTimestamp($interval['end']);
-
-            $events[] = new Studip\Calendar\EventData(
-                $begin,
-                $end,
-                $this->getRangeName(),
-                ['resource-request'],
-                $booking_plan_request_fg->__toString(),
-                $booking_plan_request_bg->__toString(),
-                $request_is_editable,
-                'ResourceRequest',
-                $this->id,
-                'Resource',
-                $this->resource_id,
-                'Resource',
-                $this->resource_id,
-                $request_view_urls,
-                $request_api_urls
-            );
-        }
-
-        return $events;
-    }
-
-
-    public function getAllEventData()
-    {
-        return $this->convertToEventData(
-            $this->getTimeIntervals(true),
-            User::findCurrent()
-        );
-    }
-
-
-    public function getEventDataForTimeRange(DateTime $begin, DateTime $end)
-    {
-        $intervals      = $this->getTimeIntervals(true);
-        $time_intervals = [];
-
-        $begin_timestamp = $begin->getTimestamp();
-        $end_timestamp   = $end->getTimestamp();
-
-        foreach ($intervals as $interval) {
-            if ((($interval['begin'] >= $begin_timestamp)
-                    && ($interval['begin'] <= $end_timestamp)) ||
-                (($interval['end'] >= $begin_timestamp)
-                    && ($interval['end'] <= $end_timestamp)) ||
-                (($interval['begin'] < $begin_timestamp)
-                    && ($interval['end'] > $end_timestamp))
-            ) {
-                $time_intervals[] = $interval;
-            }
-        }
-
-        return $this->convertToEventData($time_intervals, User::findCurrent());
-    }
-
-
-    public function getFilteredEventData(
-        $user_id = null,
-        $range_id = null,
-        $range_type = null,
-        $begin = null,
-        $end = null
-    )
-    {
-        $intervals      = $this->getTimeIntervals(true);
-        $time_intervals = [];
-
-        if ($begin && $end) {
-            $begin_timestamp = $begin;
-            $end_timestamp   = $end;
-            if ($begin instanceof DateTime) {
-                $begin_timestamp = $begin->getTimestamp();
-            }
-            if ($end instanceof DateTime) {
-                $end_timestamp = $end->getTimestamp();
-            }
-
-            foreach ($intervals as $interval) {
-                if ((($interval['begin'] >= $begin_timestamp)
-                        && ($interval['begin'] <= $end_timestamp)) ||
-                    (($interval['end'] >= $begin_timestamp)
-                        && ($interval['end'] <= $end_timestamp)) ||
-                    (($interval['begin'] < $begin_timestamp)
-                        && ($interval['end'] > $end_timestamp))
-                ) {
-                    $time_intervals[] = $interval;
-                }
-            }
-        } else {
-            $time_intervals = $intervals;
-        }
-
-        if ($user_id) {
-            $user = User::find($user_id);
-        } else {
-            $user = User::findCurrent();
-        }
-
-        return $this->convertToEventData($time_intervals, $user);
-    }
-
-    public function getPriority()
-    {
-
-        $result = $this->getTimeIntervals();
-        if (count($result) === 0) {
-            return null;
-        }
-        $first = $result[0];
-        return round(($first['begin'] - time()) / 86400);
-    }
-
-    public function getLoggingInfoText()
-    {
-        $props = '';
-        foreach ($this->getPropertyData() as $name => $state) {
-            $props .= $name . '=' . $state . ' ';
-        }
-        $info['Anfrage'] = $this->getType();
-        $info['Status'] = $this->getStatus();
-        if ($this->category) {
-            $info['Raumtyp'] = $this->category->name;
-        }
-        if ($this->termin_id) {
-            $info['Termin'] = $this->termin_id;
-        }
-        if ($this->metadate_id) {
-            $info['Metadate'] = $this->metadate_id;
-        }
-        if ($props) {
-            $info['Eigenschaften'] = $props;
-        }
-        if ($this->comment) {
-            $info['Kommentar'] = $this->comment;
-        }
-        $txt = '';
-        foreach ($info as $n => $m) {
-            $txt .= $n . ': ' . $m . ', ';
-        }
-        return trim($txt, ' ,');
-    }
-}
diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php
new file mode 100644
index 0000000..9cad900
--- /dev/null
+++ b/lib/models/resources/ResourceRequest.php
@@ -0,0 +1,2478 @@
+<?php
+
+/**
+ * ResourceRequest.class.php - Contains a model class for resource requests.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * The attributes begin and end are only used in simple resource requests.
+ * The "traditional" resource requests use either course_id, metadate_id
+ * or termin_id to store the time ranges connected to the request.
+ *
+ * @property string $id database column
+ * @property string $course_id database column
+ * @property string $termin_id database column
+ * @property string $metadate_id database column
+ * @property string $user_id database column
+ * @property string $last_modified_by database column
+ * @property string $resource_id database column
+ * @property string|null $category_id database column
+ * @property string|null $comment database column
+ * @property string|null $reply_comment database column
+ * @property string $reply_recipients database column
+ * @property int $closed database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property int $begin database column
+ * @property int $end database column
+ * @property int $preparation_time database column
+ * @property int $marked database column
+ * @property SimpleORMapCollection|ResourceRequestProperty[] $properties has_many ResourceRequestProperty
+ * @property SimpleORMapCollection|ResourceRequestAppointment[] $appointments has_many ResourceRequestAppointment
+ * @property Resource $resource belongs_to Resource
+ * @property ResourceCategory|null $category belongs_to ResourceCategory
+ * @property User $user belongs_to User
+ * @property User $last_modifier belongs_to User
+ * @property Course $course belongs_to Course
+ * @property SeminarCycleDate $cycle belongs_to SeminarCycleDate
+ * @property CourseDate $date belongs_to CourseDate
+ */
+class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calendar\EventSource
+{
+    const MARK_NONE = 0;
+    const MARK_RED = 1;
+    const MARK_YELLOW = 2;
+    const MARK_GREEN = 3;
+
+    const REPLY_REQUESTER = 'requester';
+    const REPLY_LECTURER = 'lecturer';
+
+    const STATE_OPEN = 0; // room-request is open
+    const STATE_PENDING = 1; // room-request has been processed, but no confirmation has been sent
+    const STATE_CLOSED = 2; // room-request has been processed and a confirmation has been sent
+    const STATE_DECLINED = 3; // room-request has been declined
+
+    /**
+     * The amount of defined marking states.
+     */
+    const MARKING_STATES = 4;
+
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_requests';
+
+        $config['belongs_to']['resource'] = [
+            'class_name'  => Resource::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['belongs_to']['category'] = [
+            'class_name'  => ResourceCategory::class,
+            'foreign_key' => 'category_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['belongs_to']['last_modifier'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'last_modified_by',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['belongs_to']['course'] = [
+            'class_name'  => Course::class,
+            'foreign_key' => 'course_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['belongs_to']['cycle'] = [
+            'class_name'  => SeminarCycleDate::class,
+            'foreign_key' => 'metadate_id'
+        ];
+
+        $config['belongs_to']['date'] = [
+            'class_name'  => CourseDate::class,
+            'foreign_key' => 'termin_id'
+        ];
+
+        $config['has_many']['properties'] = [
+            'class_name'        => ResourceRequestProperty::class,
+            'foreign_key'       => 'id',
+            'assoc_foreign_key' => 'request_id',
+            'on_store'          => 'store',
+            'on_delete'         => 'delete'
+        ];
+
+        $config['has_many']['appointments'] = [
+            'class_name'        => ResourceRequestAppointment::class,
+            'foreign_key'       => 'id',
+            'assoc_foreign_key' => 'request_id',
+            'on_store'          => 'store',
+            'on_delete'         => 'delete'
+        ];
+
+        //In regard to TIC 6460:
+        //As long as TIC 6460 is not implemented, we must add the validate
+        //method as a callback before storing the object.
+        if (!method_exists('SimpleORMap', 'validate')) {
+            $config['registered_callbacks']['before_store'][] = 'validate';
+        }
+        $config['registered_callbacks']['after_create'][] = 'cbLogNewRequest';
+        $config['registered_callbacks']['after_store'][] = 'cbAfterStore';
+        $config['registered_callbacks']['after_delete'][] = 'cbAfterDelete';
+
+
+        parent::configure($config);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function exportUserdata(StoredUserData $storage)
+    {
+        $user = User::find($storage->user_id);
+
+        $requests = self::findBySql(
+            'user_id = :user_id ORDER BY mkdate',
+            [
+                'user_id' => $storage->user_id
+            ]
+        );
+
+        $request_rows = [];
+        foreach ($requests as $request) {
+            $request_rows[] = $request->toRawArray();
+        }
+        $storage->addTabularData(
+            _('Ressourcenanfragen'),
+            'resource_requests',
+            $request_rows,
+            $user
+        );
+    }
+
+    /**
+     * Retrieves all resource requests from the database.
+     *
+     * @return ResourceRequest[] An array of ResourceRequests objects
+     *     or an empty array, if no resource requests are stored
+     *     in the database.
+     */
+    public static function findAll()
+    {
+        return self::findBySql('TRUE ORDER BY mkdate ASC');
+    }
+
+    /**
+     * Retrieves all open resource requests from the database.
+     *
+     * @return ResourceRequest[] An array of ResourceRequests objects
+     *     or an empty array, if no open resource requests are stored
+     *     in the database.
+     */
+    public static function findOpen()
+    {
+        return self::findBySql(
+            'closed = ? ORDER BY mkdate ASC',
+            [self::STATE_OPEN]
+        );
+    }
+
+    /**
+     * Internal method that generated the SQL query used in
+     * findByResourceAndTimeRanges and countByResourceAndTimeRanges.
+     *
+     * @see findByResourceAndTimeRanges
+     * @inheritDoc
+     */
+    protected static function buildResourceAndTimeRangesSqlQuery(
+        Resource $resource,
+        $time_ranges = [],
+        $closed_status = null,
+        $excluded_request_ids = [],
+        $additional_conditions = '',
+        $additional_parameters = []
+    )
+    {
+        if (!is_array($time_ranges)) {
+            throw new InvalidArgumentException(
+                _('Es wurde keine Liste mit Zeiträumen angegeben!')
+            );
+        }
+
+        //Check the array:
+        foreach ($time_ranges as $time_range) {
+            if ($time_range['begin'] > $time_range['end']) {
+                throw new InvalidArgumentException(
+                    _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+                );
+            }
+
+            if ($time_range['begin'] == $time_range['end']) {
+                throw new InvalidArgumentException(
+                    _('Startzeitpunkt und Endzeitpunkt dürfen nicht identisch sein!')
+                );
+            }
+        }
+
+        $sql_params = [
+            'resource_id' => $resource->id
+        ];
+
+        //First we build the SQL snippet for the case that the $closed_status
+        //variable is set to something different than null.
+        $closed_status_sql = '';
+        if ($closed_status !== null) {
+            $closed_status_sql    = ' AND (resource_requests.closed = :status) ';
+            $sql_params['status'] = strval($closed_status);
+        }
+
+        //Then we build the snipped for excluded request IDs, if specified.
+        $excluded_request_ids_sql = '';
+        if (is_array($excluded_request_ids) && count($excluded_request_ids)) {
+            $excluded_request_ids_sql   = ' AND resource_requests.id NOT IN ( :excluded_ids ) ';
+            $sql_params['excluded_ids'] = $excluded_request_ids;
+        }
+
+        //Now we build the SQL snippet for the time intervals.
+        //These are repeated four times in the query below.
+        //BEGIN and END are replaced below since the columns for
+        //BEGIN and END are different in the four cases where we
+        //repeat the SQL snippet for the time intervals.
+
+        $time_sql = '';
+        if ($time_ranges) {
+            $time_sql = 'AND (';
+
+            $i = 1;
+            foreach ($time_ranges as $time_range) {
+                if ($i > 1) {
+                    $time_sql .= ' OR ';
+                }
+                $time_sql .= sprintf('BEGIN < :end%d AND END > :begin%d ', $i, $i);
+
+                $sql_params[('begin' . $i)] = $time_range['begin'];
+                $sql_params[('end' . $i)]   = $time_range['end'];
+
+                $i++;
+            }
+
+            $time_sql .= ') ';
+        }
+
+        //Check if the request has a start and end timestamp set or if it belongs
+        //to a date, a metadate or a course.
+        //This is done in the rest of the SQL query:
+
+        // FIXME this subselect looks unnecessarily complex
+        $whole_sql = '
+                SELECT id FROM resource_requests
+                WHERE
+                resource_id = :resource_id
+        '
+            . str_replace(
+                ['BEGIN', 'END'],
+                ['(CAST(begin AS SIGNED) - preparation_time)', 'end'],
+                $time_sql
+            )
+            . $closed_status_sql
+            . '
+                UNION
+                SELECT id FROM resource_requests
+                INNER JOIN termine USING (termin_id)
+                WHERE
+                resource_id = :resource_id
+                   '
+            . str_replace(
+                ['BEGIN', 'END'],
+                [
+                    '(CAST(termine.date AS SIGNED) - resource_requests.preparation_time)',
+                    'termine.end_time'
+                ],
+                $time_sql
+            )
+            . $closed_status_sql
+            . '
+                UNION
+                SELECT id FROM resource_requests
+                INNER JOIN termine USING (metadate_id)
+                WHERE
+                resource_id = :resource_id
+                   '
+            . str_replace(
+                ['BEGIN', 'END'],
+                [
+                    '(CAST(termine.date AS SIGNED) - resource_requests.preparation_time)',
+                    'termine.end_time'
+                ],
+                $time_sql
+            )
+            . $closed_status_sql
+            . '
+            UNION
+            SELECT id FROM resource_requests
+            INNER JOIN termine
+            ON resource_requests.course_id = termine.range_id
+            WHERE
+            resource_id = :resource_id
+                   '
+            . str_replace(
+                ['BEGIN', 'END'],
+                [
+                    '(CAST(termine.date AS SIGNED) - resource_requests.preparation_time)',
+                    'termine.end_time'
+                ],
+                $time_sql
+            )
+            . $closed_status_sql
+            . '
+            GROUP BY id
+         '
+            . $excluded_request_ids_sql;
+        $request_ids = DBManager::get()->fetchFirst($whole_sql, $sql_params);
+        $whole_sql = "resource_requests.id IN(:request_ids)";
+        $sql_params = ['request_ids' => $request_ids];
+        if ($additional_conditions) {
+            $whole_sql .= ' AND ' . $additional_conditions;
+            if ($additional_parameters) {
+                $sql_params = array_merge($sql_params, $additional_parameters);
+            }
+        }
+        $whole_sql .= ' ORDER BY mkdate ASC';
+
+        return [
+            'sql'    => $whole_sql,
+            'params' => $sql_params
+        ];
+    }
+
+    /**
+     * Retrieves all resource requests for the given resource and
+     * time range. By default, all requests are returned.
+     * To get only open or closed requests set the $closed_status parameter.
+     *
+     * @param Resource $resource The resource whose requests shall be retrieved.
+     * @param array $time_ranges An array with time ranges as DateTime objects.
+     *     The array has the following structure:
+     *     [
+     *         [
+     *             'begin' => begin timestamp,
+     *             'end' => end timestamp
+     *         ],
+     *         ...
+     *     ]
+     * @param mixed $closed_status An optional status for the closed column in the
+     *     database. By default this is set to null which means that
+     *     resource requests are not filtered by the status column field.
+     *     A value of 0 means only open requests are retrived.
+     *     A value of 1 means only closed requests are retrieved.
+     *
+     * @param array $excluded_request_ids An array of strings representing
+     *     resource request IDs. IDs specified in this array are excluded from
+     *     the search.
+     * @return ResourceRequest[] An array of ResourceRequest objects.
+     *     If no requests can be found, the array is empty.
+     *
+     * @throws InvalidArgumentException, if the time ranges are either not in an
+     *     array matching the format description from above or if one of the
+     *     following conditions is met in one of the time ranges:
+     *     - begin > end
+     *     - begin == end
+     */
+    public static function findByResourceAndTimeRanges(
+        Resource $resource,
+        $time_ranges = [],
+        $closed_status = null,
+        $excluded_request_ids = [],
+        $additional_conditions = '',
+        $additional_parameters = []
+    )
+    {
+        //Build the SQL query and the parameter array.
+
+        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
+            $resource,
+            $time_ranges,
+            $closed_status,
+            $excluded_request_ids,
+            $additional_conditions,
+            $additional_parameters
+        );
+
+        //Call findBySql:
+        return self::findBySql($sql_data['sql'], $sql_data['params']);
+    }
+
+    public static function countByResourceAndTimeRanges(
+        Resource $resource,
+        $time_ranges = [],
+        $closed_status = null,
+        $excluded_request_ids = [],
+        $additional_conditions = '',
+        $additional_parameters = []
+    )
+    {
+        $sql_data = self::buildResourceAndTimeRangesSqlQuery(
+            $resource,
+            $time_ranges,
+            $closed_status,
+            $excluded_request_ids,
+            $additional_conditions,
+            $additional_parameters
+        );
+
+        return self::countBySql($sql_data['sql'], $sql_data['params']);
+    }
+
+    public static function findByCourse($course_id)
+    {
+        return self::findOneBySql(
+            "termin_id = '' AND metadate_id = '' AND course_id = :course_id",
+            [
+                'course_id' => $course_id
+            ]
+        );
+    }
+
+    public static function findByDate($date_id)
+    {
+        return self::findOneBySql(
+            'termin_id = :date_id',
+            [
+                'date_id' => $date_id
+            ]
+        );
+    }
+
+    public static function findByMetadate($metadate_id)
+    {
+        return self::findOneBySql(
+            'metadate_id = :metadate_id',
+            [
+                'metadate_id' => $metadate_id
+            ]
+        );
+    }
+
+    public static function existsByCourse($course_id, $request_is_open = false)
+    {
+        $parameters = [':course_id' => $course_id];
+
+        $sql = '';
+        if ($request_is_open) {
+            $sql .= "closed = :closed_state AND ";
+            $parameters[':closed_state'] = self::STATE_OPEN;
+        }
+
+        $request = self::findOneBySql(
+            $sql . "termin_id = '' AND metadate_id = '' AND course_id = :course_id",
+            $parameters
+        );
+
+        if ($request) {
+            return $request->id;
+        } else {
+            return false;
+        }
+    }
+
+    public static function existsByDate($date_id, $request_is_open = false)
+    {
+        $parameters = [':date_id' => $date_id];
+
+        $sql = '';
+        if ($request_is_open) {
+            $sql .= "closed = :closed_state AND ";
+            $parameters[':closed_state'] = self::STATE_OPEN;
+        }
+
+        $request = self::findOneBySql(
+            $sql . "termin_id = :date_id",
+            $parameters
+        );
+
+        if ($request) {
+            return $request->id;
+        } else {
+            return false;
+        }
+    }
+
+    public static function existsByMetadate($metadate_id, $request_is_open = false)
+    {
+        $parameters = [':metadate_id' => $metadate_id];
+
+        $sql = '';
+        if ($request_is_open) {
+            $sql .= "closed = :closed_state AND ";
+            $parameters[':closed_state'] = self::STATE_OPEN;
+        }
+
+        $request = self::findOneBySql(
+            $sql . "metadate_id = :metadate_id",
+            $parameters
+        );
+
+        if ($request) {
+            return $request->id;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * A callback method that creates a Stud.IP log entry
+     * when a new request has been made.
+     */
+    public function cbLogNewRequest()
+    {
+        $this->sendNewRequestMail();
+        StudipLog::log('RES_REQUEST_NEW', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
+    }
+
+    /**
+     * A callback method that send a mail
+     * when a new request has been udpated.
+     */
+    public function cbAfterStore()
+    {
+        if ($this->isFieldDirty('closed')) {
+            if ($this->closed == self::STATE_DECLINED) {
+                $this->sendRequestDeniedMail();
+                StudipLog::log('RES_REQUEST_DENY', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
+            } elseif ($this->closed == self::STATE_PENDING || $this->closed == self::STATE_CLOSED) {
+                StudipLog::log('RES_REQUEST_RESOLVE', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
+            }
+        } else {
+            StudipLog::log('RES_REQUEST_UPDATE', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
+        }
+    }
+
+    public function cbAfterDelete()
+    {
+        StudipLog::log('RES_REQUEST_DEL', $this->course_id, $this->resource_id, $this->getLoggingInfoText());
+    }
+
+    /**
+     * This validation method is called before storing an object.
+     */
+    public function validate()
+    {
+        if (!$this->resource_id && !$this->category_id) {
+            throw new Exception(
+                _('Eine Anfrage muss einer konkreten Ressource oder deren Kategorie zugewiesen sein!')
+            );
+        }
+    }
+
+    public function getDerivedClassInstance()
+    {
+        if (!$this->resource) {
+            //We cannot determine a derived class.
+            return $this;
+        }
+        $class_name = $this->resource->class_name;
+
+        if ($class_name === 'Resource') {
+            //This is already the correct class.
+            return $this;
+        }
+
+        if (is_subclass_of($class_name, 'Resource')) {
+            //Now we append 'Request' to the class name:
+            $class_name         = $class_name . 'Request';
+            return $class_name::buildExisting(
+                $this->toRawArray()
+            );
+        } else {
+            //$class_name does not contain the name of a subclass
+            //of Resource. That's an error!
+            throw new NoResourceClassException(
+                sprintf(
+                    _('Die Klasse %1$s ist keine Spezialisierung der Ressourcen-Kernklasse!'),
+                    $class_name
+                )
+            );
+        }
+    }
+
+    /**
+     * Sets the range fields (termin_id, metadate_id, course_id)
+     * or the ResourceRequestAppointment objects related to this request
+     * according to the range type and its range-IDs specified as parameters
+     * for this method. The ResourceRequest object is not stored after
+     * setting the fields / related objects.
+     *
+     * @param string $range_type The range type for this request. One of
+     *     the following: 'date', 'cycle', 'course' or 'date-multiple'.
+     *
+     * @param array $range_ids An array of range-IDs to be set for the
+     *     specified range type. This is mostly an array of size one
+     *     since the fields termin_id, metadate_id and course_id only
+     *     accept one ID. The range type 'date-multiple' accepts multiple
+     *     IDs.
+     *
+     * @return void No return value.
+     */
+    public function setRangeFields($range_type = '', $range_ids = [])
+    {
+        if ($range_type === 'date') {
+            $this->termin_id   = $range_ids[0];
+            $this->metadate_id = '';
+        } elseif ($range_type === 'cycle') {
+            $this->termin_id   = '';
+            $this->metadate_id = $range_ids[0];
+        } elseif ($range_type === 'date-multiple') {
+            $this->termin_id   = '';
+            $this->metadate_id = '';
+            $appointments      = [];
+            foreach ($range_ids as $range_id) {
+                $app                 = new ResourceRequestAppointment();
+                $app->appointment_id = $range_id;
+                $appointments[]      = $app;
+            }
+            $this->appointments = $appointments;
+        } elseif ($range_type === 'course') {
+            $this->termin_id   = '';
+            $this->metadate_id = '';
+            $this->course_id   = $range_ids[0];
+        }
+    }
+
+    /**
+     * Closes the requests and sends out notification mails.
+     * If the request is closed and a resource has been booked,
+     * it can be passed as parameter to be included in the notification mails.
+     *
+     * @param bool $notify_lecturers Whether to notify lecturers of a course
+     *     (true) or not (false). Defaults to false. Note that this parameter
+     *     is only useful in case the request is bound to a course, either
+     *     directly or via a course date or a course cycle date.
+     *
+     * @param ResourceBooking $bookings The resource bookings that have been
+     *     created from this request.
+     * @return bool @TODO
+     */
+    public function closeRequest($notify_lecturers = false, $bookings = [])
+    {
+        if (
+            $this->closed == self::STATE_CLOSED
+            || $this->closed == self::STATE_DECLINED
+        ) {
+            //The request has already been closed.
+            return true;
+        }
+
+        $this->closed = self::STATE_PENDING;
+        if ($this->isDirty()) {
+            $this->store();
+        }
+
+        //Now we send the confirmation mail to the requester:
+        $this->sendCloseRequestMailToRequester($bookings);
+
+        if ($notify_lecturers) {
+            $this->sendCloseRequestMailToLecturers($bookings);
+        }
+
+        //Sending successful: The request is closed.
+        $this->closed = self::STATE_CLOSED;
+        if ($this->isDirty()) {
+            return $this->store();
+        }
+        return true;
+    }
+
+    /**
+     * Returns the resource requests whose time ranges overlap
+     * with those of this resource request.
+     *
+     * @return ResourceRequest[] An array of ResourceRequest objects.
+     */
+    public function getOverlappingRequests()
+    {
+        if ($this->resource) {
+            return self::findByResourceAndTimeRanges(
+                $this->resource,
+                $this->getTimeIntervals(true),
+                self::STATE_OPEN,
+                [$this->id]
+            );
+        }
+        return [];
+    }
+
+    /**
+     * Counts the resource requests whose time ranges overlap
+     * with those of this resource request.
+     *
+     * @return int The amount of overlapping resource requests.
+     */
+    public function countOverlappingRequests()
+    {
+        if ($this->resource) {
+            return self::countByResourceAndTimeRanges(
+                $this->resource,
+                $this->getTimeIntervals(true),
+                self::STATE_OPEN,
+                [$this->id]
+            );
+        }
+        return 0;
+    }
+
+    /**
+     * Returns the resource bookings whose time ranges overlap
+     * with those of this resource request.
+     *
+     * @return ResourceBooking[] An array of ResourceBooking objects.
+     */
+    public function getOverlappingBookings()
+    {
+        if ($this->resource) {
+            return ResourceBooking::findByResourceAndTimeRanges(
+                $this->resource,
+                $this->getTimeIntervals(true),
+                [ResourceBooking::TYPE_NORMAL, ResourceBooking::TYPE_LOCK]
+            );
+        }
+        return [];
+    }
+
+    /**
+     * Counts the resource bookings whose time ranges overlap
+     * with those of this resource request.
+     *
+     * @return int The amount of overlapping resource bookings.
+     */
+    public function countOverlappingBookings()
+    {
+        if ($this->resource) {
+            return ResourceBooking::countByResourceAndTimeRanges(
+                $this->resource,
+                $this->getTimeIntervals(true),
+                [ResourceBooking::TYPE_NORMAL, ResourceBooking::TYPE_LOCK]
+            );
+        }
+        return 0;
+    }
+
+    /**
+     * Returns the repetion interval if regular appointments are used
+     * for this request.
+     *
+     * @return DateInterval|null In case regular appointments are used
+     *     for this request a DateInterval is returned.
+     *     Otherwise null is returned.
+     */
+    public function getRepetitionInterval()
+    {
+        if ($this->metadate_id) {
+            //It is a set of regular appointments.
+            //We just have to compute the time difference between the first
+            //two appointments to get the interval.
+
+            $first_date  = $this->cycle->dates[0];
+            $second_date = $this->cycle->dates[1];
+
+            if (!$first_date || !$second_date) {
+                //Either only one date is in the set of regular appointments
+                //or there is a database error. We cannot continue.
+                return null;
+            }
+
+            $first_datetime = new DateTime();
+            $first_datetime->setTimestamp($first_date->date);
+            $second_datetime = new DateTime();
+            $second_datetime->setTimestamp($second_date->date);
+
+            return $first_datetime->diff($second_datetime);
+        }
+
+        return null;
+    }
+
+    public function getStartDate()
+    {
+        $start_date = new DateTime();
+        if (count($this->appointments) > 0) {
+            $start_date->setTimestamp($this->appointments->first()->appointment->date);
+            return $start_date;
+        }
+
+        if ($this->termin_id) {
+            $start_date->setTimestamp($this->date->date);
+            return $start_date;
+        }
+
+        if (isset($this->cycle) && count($this->cycle->dates) > 0) {
+            $first_date = $this->cycle->dates->first();
+            if ($this->metadate_id && isset($first_date->date)) {
+                $start_date->setTimestamp($first_date->date);
+                return $start_date;
+            }
+
+            if ($this->course_id && isset($first_date->date)) {
+                $start_date->setTimestamp($first_date->date);
+                return $start_date;
+            }
+        }
+
+        if ($this->begin) {
+            $start_date->setTimestamp($this->begin);
+            return $start_date;
+        }
+
+        return null;
+    }
+
+    public function getEndDate()
+    {
+        $end_date = new DateTime();
+        if (count($this->appointments) > 0) {
+            $end_date->setTimestamp($this->appointments->last()->appointment->end_time);
+            return $end_date;
+        }
+
+        if ($this->termin_id) {
+            $end_date->setTimestamp($this->date->end_time);
+            return $end_date;
+        }
+
+        if ($this->metadate_id) {
+            $date = $this->cycle->dates->last();
+            if (!isset($date)) {
+                return null;
+            }
+
+            $end_date->setTimestamp($this->cycle->dates->last()->end_time);
+            return $end_date;
+        }
+
+        if ($this->course_id) {
+            $date = $this->course->dates->last();
+            if (!isset($date)) {
+                return null;
+            }
+
+            $end_date->setTimestamp($this->course->dates->last()->end_time);
+            return $end_date;
+        }
+
+        if ($this->end) {
+            $end_date->setTimestamp($this->end);
+            return $end_date;
+        }
+
+        return null;
+    }
+
+    public function getStartSemester()
+    {
+        $start_date = $this->getStartDate();
+        if ($start_date instanceof DateTime) {
+            return Semester::findByTimestamp($start_date->getTimestamp());
+        }
+        return null;
+    }
+
+    public function getEndSemester()
+    {
+        $end_date = $this->getEndDate();
+        if ($end_date instanceof DateTime) {
+            return Semester::findByTimestamp($end_date->getTimestamp());
+        }
+        return null;
+    }
+
+    public function getRepetitionEndDate()
+    {
+        $repetition_interval = $this->getRepetitionInterval();
+
+        if (!$repetition_interval) {
+            //There is no repetition.
+            return null;
+        }
+
+        return $this->getEndDate();
+    }
+
+    /**
+     * Retrieves the time intervals by looking at metadate objects
+     * and other time interval sources and returns them grouped by metadate.
+     * @param bool $with_preparation_time @TODO
+     * @return mixed[][][] A three-dimensional array with
+     *     the following structure:
+     *     - The first dimension has the metadate-id as index. For single dates
+     *       an empty string is used as index.
+     *     - The second dimension contains two elements:
+     *       - 'metadate' => The metadate object. This is only set, if the
+     *                       request is for a metadate.
+     *       - 'intervals' => The time intervals.
+     *     - The third dimension contains a time interval
+     *       in the following format:
+     *       [
+     *           'begin' => The begin timestamp
+     *           'end' => The end timestamp
+     *           'range' => The name of the range class that provides the range_id.
+     *               This is usually the name of the SORM class.
+     *           'range_id' => The ID of the single date or ResourceRequestAppointment.
+     *       ]
+     */
+    public function getGroupedTimeIntervals($with_preparation_time = false, $with_past_intervals = true)
+    {
+        $now = time();
+        if (count($this->appointments)) {
+            $time_intervals = [
+                '' => [
+                    'metadate'  => null,
+                    'intervals' => []
+                ]
+            ];
+            foreach ($this->appointments as $appointment) {
+                if (!$with_past_intervals && $appointment->appointment->end_time < $now) {
+                    continue;
+                }
+                if ($with_preparation_time) {
+                    $interval = [
+                        'begin' => $appointment->appointment->date - $this->preparation_time,
+                        'end'   => $appointment->appointment->end_time
+                    ];
+                } else {
+                    $interval = [
+                        'begin' => $appointment->appointment->date,
+                        'end'   => $appointment->appointment->end_time
+                    ];
+                }
+
+                $date = CourseDate::find($appointment->appointment_id);
+                $interval['range']                 = 'CourseDate';
+                $interval['range_id']              = $appointment->appointment_id;
+                $interval['booked_room']           = $date->room_booking->resource_id;
+                $interval['booking_id']            = $date->room_booking->id;
+                $time_intervals['']['intervals'][] = $interval;
+            }
+
+            if (empty($time_intervals['']['intervals'])) {
+                return [];
+            } else {
+                return $time_intervals;
+            }
+        } elseif ($this->termin_id) {
+            if (!$with_past_intervals && $this->date->end_time < $now) {
+                return [];
+            }
+            if ($with_preparation_time) {
+                $interval = [
+                    'begin' => $this->date->date - $this->preparation_time,
+                    'end'   => $this->date->end_time
+                ];
+            } else {
+                $interval = [
+                    'begin' => $this->date->date,
+                    'end'   => $this->date->end_time
+                ];
+            }
+
+            $date = CourseDate::find($this->termin_id);
+            $interval['range']       = 'CourseDate';
+            $interval['range_id']    = $this->termin_id;
+            $interval['booked_room'] = $date->room_booking->resource_id;
+            $interval['booking_id']  = $date->room_booking->id;
+
+            if (!empty($interval)) {
+                return [
+                    '' => [
+                        'metadate'  => null,
+                        'intervals' => [$interval]
+                    ]
+                ];
+            } else {
+                return [];
+            }
+        } elseif ($this->metadate_id) {
+            $time_intervals = [
+                $this->metadate_id => [
+                    'metadate'  => $this->cycle,
+                    'intervals' => []
+                ]
+            ];
+            foreach ($this->cycle->dates as $date) {
+                if (!$with_past_intervals && $date->end_time < $now) {
+                    continue;
+                }
+                if ($with_preparation_time) {
+                    $interval = [
+                        'begin' => $date->date - $this->preparation_time,
+                        'end'   => $date->end_time
+                    ];
+                } else {
+                    $interval = [
+                        'begin' => $date->date,
+                        'end'   => $date->end_time
+                    ];
+                }
+                $interval['range']                                 = 'CourseDate';
+                $interval['range_id']                              = $date->id;
+                $interval['booked_room']                           = $date->room_booking->resource_id;
+                $interval['booking_id']                            = $date->room_booking->id;
+                $time_intervals[$this->metadate_id]['intervals'][] = $interval;
+            }
+            return $time_intervals;
+        } elseif ($this->course_id) {
+            $time_intervals = [];
+            if ($this->course->cycles) {
+                foreach ($this->course->cycles as $cycle) {
+                    $time_intervals[$cycle->id] = [
+                        'metadate'  => $cycle,
+                        'intervals' => []
+                    ];
+                    if ($cycle->dates) {
+                        foreach ($cycle->dates as $date) {
+                            if (!$with_past_intervals && $date->end_time < $now) {
+                                continue;
+                            }
+                            if ($with_preparation_time) {
+                                $interval = [
+                                    'begin' => $date->date - $this->preparation_time,
+                                    'end'   => $date->end_time
+                                ];
+                            } else {
+                                $interval = [
+                                    'begin' => $date->date,
+                                    'end'   => $date->end_time
+                                ];
+                            }
+                            $interval['range']                         = 'CourseDate';
+                            $interval['range_id']                      = $date->id;
+                            $interval['booked_room']                   = $date->room_booking->resource_id;
+                            $interval['booking_id']                    = $date->room_booking->id;
+                            $time_intervals[$cycle->id]['intervals'][] = $interval;
+                        }
+                    }
+                }
+            }
+            if ($this->course->dates) {
+                $time_intervals[''] = [
+                    'metadate'  => null,
+                    'intervals' => []
+                ];
+                foreach ($this->course->dates as $date) {
+                    if (!$with_past_intervals && $date->end_time < $now) {
+                        continue;
+                    }
+                    if ($date->cycle instanceof SeminarCycleDate) {
+                        //Metadates are already handled above.
+                        continue;
+                    }
+                    if ($with_preparation_time) {
+                        $interval = [
+                            'begin' => $date->date - $this->preparation_time,
+                            'end'   => $date->end_time
+                        ];
+                    } else {
+                        $interval = [
+                            'begin' => $date->date,
+                            'end'   => $date->end_time
+                        ];
+                    }
+                    $interval['range']                 = 'CourseDate';
+                    $interval['range_id']              = $date->id;
+                    $interval['booked_room']           = $date->room_booking->resource_id;
+                    $interval['booking_id']            = $date->room_booking->id;
+                    $time_intervals['']['intervals'][] = $interval;
+                }
+
+                if (empty($time_intervals['']['intervals'])) {
+                    unset($time_intervals['']);
+                }
+            }
+            return $time_intervals;
+        } elseif ($this->begin && $this->end) {
+            if (!$with_past_intervals && $this->end < $now) {
+                return [];
+            }
+            if ($with_preparation_time) {
+                $interval = [
+                    'begin' => $this->begin - $this->preparation_time,
+                    'end'   => $this->end
+                ];
+            } else {
+                $interval = [
+                    'begin' => $this->begin,
+                    'end'   => $this->end
+                ];
+            }
+            $interval['range']    = 'User';
+            $interval['range_id'] = $this->user_id;
+
+            return [
+                '' => [
+                    'metadate'  => null,
+                    'intervals' => [$interval]
+                ]
+            ];
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * Retrieves the time intervals for this request.
+     *
+     * @param bool $with_preparation_time Whether the preparation time
+     *     of the request shall be prepended to the begin timestamp (true)
+     *     or whether it should not be included at all (false).
+     *     Defaults to false.
+     *
+     * @param bool $with_range Whether to include data of the Stud.IP range
+     *     and its corresponding ID to the request (true) or not (false).
+     *     Defaults to false.
+     *
+     * @param bool $with_past_intervals Whether to include past intervals (true)
+     *     or only include intervals from the current time and the future (false).
+     *     Defaults to true.
+     *
+     * @return string[][] A two-dimensional array of unix timestamps.
+     *     The first dimension contains one entry for each date,
+     *     the second dimension contains the start and end timestamp
+     *     for the date.
+     *     The second dimension uses the array keys 'begin' and 'end'
+     *     for start and end date.
+     *     If the @with_range parameter is set to true, the second array
+     *     dimension also contains the key 'range' for specifying the
+     *     range type and 'range_id' for specifying the ID of the
+     *     range object.
+     *     The range can be "CourseDate", "ResourceRequestAppointment"
+     *     or "User". The last two can only be present for simple requests
+     *     that are not bound to a course. The range "CourseDate"
+     *     can only occur on course-bound requests.
+     */
+    public function getTimeIntervals($with_preparation_time = false, $with_range = false, $with_past_intervals = true)
+    {
+        $now = time();
+        if (count($this->appointments)) {
+            $time_intervals = [];
+            foreach ($this->appointments as $appointment) {
+                if (!$with_past_intervals && $appointment->appointment->end_time < $now) {
+                    continue;
+                }
+                if ($with_preparation_time) {
+                    $interval = [
+                        'begin' => $appointment->appointment->date - $this->preparation_time,
+                        'end'   => $appointment->appointment->end_time
+                    ];
+                } else {
+                    $interval = [
+                        'begin' => $appointment->appointment->date,
+                        'end'   => $appointment->appointment->end_time
+                    ];
+                }
+                if ($with_range) {
+                    $date = CourseDate::find($appointment->appointment_id);
+
+                    $interval['range']       = ResourceRequestAppointment::class;
+                    $interval['range_id']    = $appointment->appointment_id;
+                    $interval['booked_room'] = $date->room_booking->resource_id ?? null;
+                    $interval['booking_id']  = $date->room_booking->id ?? null;
+
+                }
+                $time_intervals[] = $interval;
+            }
+            return $time_intervals;
+        } elseif ($this->termin_id) {
+            if (!$with_past_intervals && $this->date->end_time < $now) {
+                return [];
+            }
+            if ($with_preparation_time) {
+                $interval = [
+                    'begin' => $this->date->date - $this->preparation_time,
+                    'end'   => $this->date->end_time
+                ];
+            } else {
+                $interval = [
+                    'begin' => $this->date->date,
+                    'end'   => $this->date->end_time
+                ];
+            }
+            if ($with_range) {
+                $interval['range']       = CourseDate::class;
+                $interval['range_id']    = $this->termin_id;
+                $interval['booked_room'] = $this->date->room_booking->resource_id ?? null;
+                $interval['booking_id']  = $this->date->room_booking->id ?? null;
+            }
+            return [$interval];
+        } elseif ($this->metadate_id) {
+            $time_intervals = [];
+            foreach ($this->cycle->dates as $date) {
+                if (!$with_past_intervals && $date->end_time < $now) {
+                    continue;
+                }
+                if ($with_preparation_time) {
+                    $interval = [
+                        'begin' => $date->date - $this->preparation_time,
+                        'end'   => $date->end_time
+                    ];
+                } else {
+                    $interval = [
+                        'begin' => $date->date,
+                        'end'   => $date->end_time
+                    ];
+                }
+                if ($with_range) {
+                    $interval['range']       = CourseDate::class;
+                    $interval['range_id']    = $date->id;
+                    $interval['booked_room'] = $date->room_booking->resource_id ?? null;
+                    $interval['booking_id']  = $date->room_booking->id ?? null;
+                }
+                $time_intervals[] = $interval;
+            }
+            return $time_intervals;
+        } elseif ($this->course_id) {
+            $time_intervals = [];
+            if ($this->course->dates) {
+                foreach ($this->course->dates as $date) {
+                    if (!$with_past_intervals && $date->end_time < $now) {
+                        continue;
+                    }
+                    if ($with_preparation_time) {
+                        $interval = [
+                            'begin' => $date->date - $this->preparation_time,
+                            'end'   => $date->end_time
+                        ];
+                    } else {
+                        $interval = [
+                            'begin' => $date->date,
+                            'end'   => $date->end_time
+                        ];
+                    }
+                    if ($with_range) {
+                        $interval['range']       = CourseDate::class;
+                        $interval['range_id']    = $date->id;
+                        $interval['booked_room'] = $date->room_booking->resource_id ?? null;
+                        $interval['booking_id']  = $date->room_booking->id ?? null;
+                    }
+                    $time_intervals[] = $interval;
+                }
+            }
+            return $time_intervals;
+        } elseif ($this->begin && $this->end) {
+            if (!$with_past_intervals && $this->end < $now) {
+                return [];
+            }
+            if ($with_preparation_time) {
+                $interval = [
+                    'begin' => $this->begin - $this->preparation_time,
+                    'end'   => $this->end
+                ];
+            } else {
+                $interval = [
+                    'begin' => $this->begin,
+                    'end'   => $this->end
+                ];
+            }
+            if ($with_range) {
+                $interval['range']    = 'User';
+                $interval['range_id'] = $this->user_id;
+            }
+            return [$interval];
+        } else {
+            return [];
+        }
+    }
+
+
+    /**
+     * Returns a string representation of the time intervals for this request.
+     */
+    public function getTimeIntervalStrings()
+    {
+        $strings   = [];
+        $intervals = $this->getTimeIntervals(false, true);
+        foreach ($intervals as $interval) {
+            $room = '';
+
+            if ($interval['range'] === 'CourseDate') {
+                $date = call_user_func([$interval['range'], 'find'], $interval['range_id']);
+                if ($date->room_booking) {
+                    $room_obj = Room::find($date->room_booking->resource_id);
+                    if ($room_obj) {
+                        $room = $room_obj->name;
+                    }
+                }
+            }
+
+            $same_day = date('Ymd', $interval['begin']) === date('Ymd', $interval['end']);
+            if ($same_day) {
+                $strings[] = strftime('%a. %x %R', $interval['begin'])
+                    . ' - ' . strftime('%R', $interval['end'])
+                    . ($room ? ', '. $room : '');
+            } else {
+                $strings[] = strftime('%a. %x %R', $interval['begin'])
+                    . ' - ' . strftime('%a %x %R', $interval['end'])
+                    . ($room ? ', '. $room : '');
+            }
+
+        }
+        return $strings;
+    }
+
+
+    /**
+     * Filters the time intervals for this request
+     * by a specified time range.
+     *
+     * @see ResourceRequest::getTimeIntervals for the return format.
+     */
+    public function getTimeIntervalsInTimeRange(DateTime $begin, DateTime $end)
+    {
+        $all_time_intervals = $this->getTimeIntervals();
+
+        $included_intervals = [];
+        foreach ($all_time_intervals as $interval) {
+            $interval_in_range = (
+                (
+                    $interval['begin'] >= $begin->getTimestamp()
+                    &&
+                    $interval['begin'] <= $end->getTimestamp()
+                )
+                ||
+                (
+                    $interval['end'] >= $begin->getTimestamp()
+                    &&
+                    $interval['end'] <= $end->getTimestamp()
+                )
+            );
+            if ($interval_in_range) {
+                $included_intervals[] = $interval;
+            }
+        }
+
+        return $included_intervals;
+    }
+
+
+    /**
+     * Returns a string representation of the ResourceRequest's type.
+     */
+    public function getType()
+    {
+        if (count($this->appointments)) {
+            return 'appointments';
+        } elseif ($this->termin_id) {
+            return 'date';
+        } elseif ($this->metadate_id) {
+            return 'cycle';
+        } elseif ($this->course_id) {
+            return 'course';
+        }
+        return null;
+    }
+
+    /**
+     * Returns a string representation of the status of the ResourceRequest.
+     */
+    public function getStatus()
+    {
+        switch ($this->closed) {
+            case self::STATE_OPEN:
+                return 'open';
+            case self::STATE_PENDING:
+                return 'pending';
+            case self::STATE_CLOSED:
+                return 'closed';
+            case self::STATE_DECLINED:
+                return 'declined';
+            default:
+                return '';
+        }
+    }
+
+
+    /**
+     * Returns a textual representation of the status of the ResourceRequest.
+     */
+    public function getStatusText()
+    {
+        if ($this->isNew()) {
+            return _('Diese Anfrage wurde noch nicht gespeichert.');
+        }
+        if ($this->closed == self::STATE_OPEN) {
+            return _('Die Anfrage wurde noch nicht bearbeitet.');
+        } else if ($this->closed == self::STATE_DECLINED) {
+            return _('Die Anfrage wurde bearbeitet und abgelehnt.');
+        } else {
+            return _('Die Anfrage wurde bearbeitet.');
+        }
+    }
+
+
+    /**
+     * Returns a textual representation of the dates for which the request
+     * has been created.
+     *
+     * @param bool $as_array True, if an array with a string for each date
+     *     (single or cycle date) shall be returned, false otherwise.
+     *
+     * @returns string|array Depending on the parameter $as_array, the text
+     *     is returned as one string or as an array of strings for each date
+     *     (single or cycle date).
+     */
+    public function getDateString($as_array = false, $with_past_intervals = true)
+    {
+        $now = time();
+        $strings = [];
+        $resource_name = '';
+        if (count($this->appointments)) {
+            $parts  = [];
+            foreach ($this->appointments as $rra) {
+                if (!$with_past_intervals && $rra->appointment->end_time < $now) {
+                    continue;
+                }
+                if ($rra->appointment) {
+                    $parts[] = $rra->appointment->getFullName('include-room');
+                }
+            }
+            $strings[] = implode('; ', $parts);
+        } elseif ($this->termin_id) {
+            if ($this->date) {
+                if ($with_past_intervals || $this->date->end_time >= $now) {
+                    $strings[] = $this->date->getFullName('include-room');
+                }
+            }
+        } elseif ($this->metadate_id) {
+            if ($this->cycle) {
+                $this->cycle->dates->filter(function($date) use($with_past_intervals, $now) {
+                    return $with_past_intervals || $date->end_time >= $now;
+                })->map(function($date) use(&$strings) {
+                    $strings[] = $date->getFullName('include-room');
+                });
+            }
+        } elseif ($this->course_id) {
+            $course = new Seminar($this->course_id);
+            $strings[] = $course->getDatesTemplate('dates/seminar_html_roomplanning',
+                [
+                    'shrink'    => false,
+                    'show_room' => true,
+                    'with_past_intervals' => $with_past_intervals
+                ]
+            );
+        } elseif ($this->begin && $this->end) {
+            $begin_date = date('Ymd', $this->begin);
+            $end_date   = date('Ymd', $this->end);
+            if($this->resource) {
+                $resource_name = htmlReady($this->resource->getFullName());
+            }
+            if ($begin_date == $end_date) {
+                $strings[] = strftime('%a., %x, %R', $this->begin) . ' - '
+                           . strftime('%R', $this->end) . ' ' . $resource_name;
+            } else {
+                //Begin and end are on differnt dates
+                $strings[] = strftime('%a., %x, %R', $this->begin) . ' - '
+                    . strftime('%a., %x, %R', $this->end) . ' ' . $resource_name;
+            }
+        }
+
+        if ($as_array) {
+            return $strings;
+        } else {
+            return implode(';', $strings);
+        }
+    }
+
+
+    /**
+     * Returns a human-readable string describing the type of the request.
+     *
+     * @param bool $short If this parameter is set to true, only the
+     *     type of the request is returned without any information about the
+     *     appointments. Otherwise, appointment information like the
+     *     date or the repetition are appended. Defaults to false.
+     * @return string
+     */
+    public function getTypeString($short = false)
+    {
+        if (count($this->appointments) > 1) {
+            if ($short) {
+                return _('Einzeltermine');
+            } else {
+                return sprintf(_('Einzeltermine (%sx)'), count($this->appointments));
+            }
+        } elseif (count($this->appointments) === 1) {
+            $date = $this->appointments[0]->appointment;
+            if ($short || !$date) {
+                return _('Einzeltermin');
+            } else {
+                return sprintf(_('Einzeltermin (%s)'), $date->getFullName());
+            }
+        } elseif ($this->date) {
+            if ($short) {
+                return _('Einzeltermin');
+            } else {
+                return sprintf(_('Einzeltermin (%s)'), $this->date->getFullName());
+            }
+        } elseif ($this->cycle) {
+            if ($short) {
+                return _('Regelmäßige Termine');
+            } else {
+                return sprintf(
+                    _('Regelmäßige Termine (%s)'),
+                    $this->cycle->toString('full')
+                );
+            }
+        } elseif ($this->course) {
+            if ($short) {
+                return _('Alle Termine der Veranstaltung');
+            } else {
+                return sprintf(
+                    _('Alle Termine der Veranstaltung (%sx)'),
+                    count($this->course->dates)
+                );
+            }
+        } else {
+            return _('Einfache Anfrage');
+        }
+    }
+
+
+    /**
+     * Returns an array of date objects which are affected
+     * by this ResourceRequest.
+     */
+    public function getAffectedDates()
+    {
+        $dates = [];
+        switch ($this->getType()) {
+            case 'date':
+                $dates[] = $this->date;
+                break;
+            case 'cycle':
+                $dates = $this->cycle->dates->getArrayCopy();
+                break;
+            case 'course':
+                $dates = $this->course->dates->getArrayCopy();
+                break;
+        }
+        return $dates;
+    }
+
+
+    /**
+     * @param array $excluded_property_names
+     * Returns all resource property definitions for all properties
+     * which can be applied for this ResourceRequest by looking at the
+     * Resource category. If no resource category ID is set for the request
+     * an empty array is returned.
+     */
+    public function getAvailableProperties($excluded_property_names = [])
+    {
+        if (!$this->category_id) {
+            //Without a category-ID we cannot find any property!
+            return [];
+        }
+        if (count($excluded_property_names)) {
+            return ResourcePropertyDefinition::findBySql(
+                "INNER JOIN resource_category_properties
+                USING (property_id)
+                WHERE requestable = '1' AND category_id = :category_id
+                AND name NOT IN ( :excluded_property_names )",
+                [
+                    'category_id'             => $this->category_id,
+                    'excluded_property_names' => $excluded_property_names
+                ]
+            );
+        } else {
+            return ResourcePropertyDefinition::findBySql(
+                "INNER JOIN resource_category_properties
+                USING (property_id)
+                WHERE requestable = '1' AND category_id = :category_id",
+                [
+                    'category_id' => $this->category_id
+                ]
+            );
+        }
+    }
+
+
+    /**
+     * Returns a "compressed" array of resource request properties.
+     * @param array $excluded_property_names
+     * @return array An associative array where the keys represent the
+     *     property names and the values represent the property states.
+     *     Note that the value can be an array in case of range properties.
+     */
+    public function getPropertyData($excluded_property_names = [])
+    {
+        $data = [];
+        foreach ($this->properties as $property) {
+            if ($property->definition->range_search) {
+                //Assume that a minimum value is requested:
+                $data[$property->name] = [$property->state];
+            } else {
+                $data[$property->name] = $property->state;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @param $name
+     * @return bool
+     */
+    public function propertyExists($name)
+    {
+        $db = DBManager::get();
+
+        $exists_stmt = $db->prepare(
+            "SELECT TRUE FROM resource_request_properties
+            INNER JOIN resource_property_definitions rpd
+                ON resource_request_properties.property_id = rpd.property_id
+            WHERE resource_request_properties.request_id = :request_id
+                AND rpd.name = :name");
+
+        $exists_stmt->execute(
+            [
+                'request_id' => $this->id,
+                'name'       => $name
+            ]
+        );
+
+        $exists = $exists_stmt->fetchColumn(0);
+
+        return (bool)$exists;
+    }
+
+
+    /**
+     * @param $name
+     * Returns the state of the property specified by $name.
+     */
+    public function getProperty($name)
+    {
+        if (!$this->propertyExists($name)) {
+            //A property with the name $name does not exist for this
+            //resource request object.
+            //In that case we can only return null, since resource requests
+            //store only those properties which are requested:
+
+            return null;
+        }
+
+        $db = DBManager::get();
+
+        $value_stmt = $db->prepare(
+            "SELECT resource_request_properties.state FROM resource_request_properties
+            INNER JOIN resource_property_definitions rpd
+                ON resource_request_properties.property_id = rpd.property_id
+            WHERE resource_request_properties.request_id = :request_id
+                AND rpd.name = :name");
+
+        $value_stmt->execute(
+            [
+                'request_id' => $this->id,
+                'name'       => $name
+            ]
+        );
+
+        $value = $value_stmt->fetchColumn(0);
+
+        if (!$value) {
+            return null;
+        }
+
+        return $value;
+    }
+
+
+    /**
+     * @param $name
+     * @return ResourceRequestProperty
+     * @throws InvalidResourceCategoryException If this resource category
+     *     doesn't match the category of the resource request object.
+     * @throws ResourcePropertyException If the name of the
+     *     resource request property is not defined for this resource category.
+     */
+    public function getPropertyObject($name)
+    {
+        if (!$this->propertyExists($name)) {
+            //A property with the name $name does not exist for this
+            //resource object. If it is a mandatory property
+            //we can still try to create it:
+
+            $property = $this->category->createDefinedResourceRequestProperty(
+                $this,
+                $name
+            );
+
+            $property->store();
+            return $property;
+        }
+
+        return ResourceRequestProperty::findOneBySql(
+            "INNER JOIN resource_property_definitions rpd
+                ON resource_request_properties.property_id = rpd.property_id
+            WHERE resource_request_properties.request_id = :request_id
+                AND rpd.name = :name",
+            [
+                'request_id' => $this->id,
+                'name'       => $name
+            ]
+        );
+    }
+
+
+    /**
+     * @param string $name
+     * @param string $state
+     * @return bool True, if the property state could be set, false otherwise.
+     */
+    public function setProperty($name, $state = '')
+    {
+        if (!$this->propertyExists($name)) {
+            //A property with the name $name does not exist for this
+            //resource object. If it is a mandatory property
+            //we can still try to create it:
+
+            if ($this->category) {
+                $property = $this->category->createDefinedResourceRequestProperty(
+                    $this,
+                    $name,
+                    $state
+                );
+                return $property->store();
+            }
+            return false;
+        }
+
+        $property = $this->getPropertyObject($name);
+
+        if ($property) {
+            $property->state = $state;
+            if ($property->isDirty()) {
+                return $property->store();
+            }
+            return true;
+        }
+    }
+
+
+    /**
+     * Sets or unsets the properties for this resource request.
+     *
+     * @param array $property_list The properties which shall be set
+     *     or unset. The array has the following structure:
+     *     [
+     *         property_name => property_value
+     *     ]
+     *
+     * @param bool $accept_null_values True, if a value of null
+     *     shall be used when setting the property.
+     *     If $accept_null_values is set to false all properties
+     *     with a value equal to null will be deleted.
+     *
+     * @return null
+     */
+    public function updateProperties($property_list = [], $accept_null_values = false)
+    {
+        //Delete all properties first then re-create them
+        //from the $property_list array:
+        $this->properties->delete();
+        if (is_array($property_list)) {
+            foreach ($property_list as $name => $state) {
+                if ($state or $accept_null_values) {
+                    //State is set or null values are allowed:
+                    //create/update the property
+                    $this->setProperty($name, $state);
+                }
+            }
+        }
+        $this->resetRelation('properties');
+    }
+
+
+    public function deletePropertyIfExists($name = '')
+    {
+        if (!$this->propertyExists($name)) {
+            return true;
+        } else {
+            $property = $this->getPropertyObject($name);
+            return $property->delete();
+        }
+    }
+
+
+    public function getRangeName()
+    {
+        if ($this->getRangeType() === 'course') {
+            $name = $this->getRangeObject()->getFullName();
+            $name .= ' (' . implode(',', $this->getRangeObject()->getMembersWithStatus('dozent', true)->limit(3)->getValue('nachname')) . ')';
+        } else {
+            $range_object = $this->getRangeObject();
+            if ($range_object instanceof User) {
+                if (get_visibility_by_id($range_object->id)) {
+                    $name = $range_object->getFullName();
+                } else if ($this->user_id === $GLOBALS['user']->id) {
+                    $name = $range_object->getFullName();
+                } else {
+                    $current_user = User::findCurrent();
+                    if ($current_user instanceof User) {
+                        //If the current user has at least autor permissions
+                        //(which are required to see all requests), they can
+                        //see the name of the requester.
+                        if ($this->resource_id && ($this->resource instanceof Resource)
+                            && $this->resource->userHasPermission($current_user, 'autor')) {
+                            $name = $range_object->getFullName();
+                        } else if (ResourceManager::userHasGlobalPermission($current_user, 'autor')) {
+                            $name = $range_object->getFullName();
+                        } else {
+                            return '';
+                        }
+                    } else {
+                        return '';
+                    }
+                }
+            } else {
+                $name = $range_object->getFullName();
+            }
+            if ($this->comment) {
+                $name .= " \n" . $this->comment;
+            }
+        }
+        return $name;
+    }
+
+
+    public function isSimpleRequest()
+    {
+        return !$this->course_id && !$this->metadate_id && !$this->termin_id;
+    }
+
+
+    public function getRangeId()
+    {
+        //Check if the request belongs to a course:
+        if ($this->termin_id) {
+            return $this->date->range_id;
+        } elseif ($this->metadate_id) {
+            return $this->cycle->seminar_id;
+        } elseif ($this->course_id) {
+            return $this->course_id;
+        }
+
+        //The request does not belong to a course and therefore
+        //belongs to a user:
+        return $this->user_id;
+    }
+
+
+    public function getRangeType()
+    {
+        if ($this->course_id || $this->termin_id || $this->metadate_id) {
+            return 'course';
+        }
+        return 'user';
+    }
+
+
+    public function getRangeObject()
+    {
+        if ($this->course_id) {
+            return $this->course;
+        }
+        if ($this->termin_id) {
+            return $this->date->course;
+        }
+        if ($this->metadate_id) {
+            return $this->cycle->course;
+        }
+        return $this->user;
+    }
+
+
+    /**
+     * This method sends a notification mail to all room administrators
+     * that informs them of this new request.
+     */
+    public function sendNewRequestMail()
+    {
+        //First we must get all users who have admin permissions in the
+        //resource management system. Depending wheter a resource_id is set
+        //for this resource request either all admins of a resource or
+        //all admins of the resource management system must be informed.
+
+        $now         = time();
+        if ($this->resource_id) {
+            //The resource-ID is set for this request:
+            //Get all admins of the resource and the resource management system.
+            $admin_users = User::findBySql(
+                "user_id IN (
+                    SELECT user_id FROM resource_permissions
+                    WHERE (
+                        resource_id = :resource_id
+                        OR resource_id = 'global'
+                    )
+                    AND perms = 'admin'
+                    UNION
+                    SELECT user_id FROM resource_temporary_permissions
+                    WHERE resource_id = :resource_id
+                    AND perms = 'admin'
+                    AND begin <= :now AND end >= :now
+                )",
+                [
+                    'resource_id' => $this->resource_id,
+                    'now'         => $now
+                ]
+            );
+        } else {
+            //Get all admins of the resource management system.
+            $admin_users = User::findBySql(
+                "user_id IN (
+                    SELECT user_id FROM resource_permissions
+                    WHERE resource_id = 'global'
+                    AND perms = 'admin'
+                    UNION
+                    SELECT user_id FROM resource_temporary_permissions
+                    WHERE resource_id = 'global'
+                    AND perms = 'admin'
+                    AND begin <= :now AND end >= :now
+                    GROUP BY user_id
+                )",
+                [
+                    'now' => $now
+                ]
+            );
+        }
+
+        if (!$admin_users) {
+            return;
+        }
+
+        $factory = new Flexi\Factory(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
+        );
+
+        foreach ($admin_users as $user) {
+            $user_lang_path = getUserLanguagePath($user->id);
+
+            $template = $factory->open(
+                $user_lang_path . '/LC_MAILS/new_resource_request.php'
+            );
+            $template->set_attribute('request', $this);
+
+            if ($this->resource instanceof Resource) {
+                $resource = $this->resource->getDerivedClassInstance();
+                if ($resource instanceof Room) {
+                    $template->set_attribute('requested_room', $resource->name);
+                } else {
+                    $template->set_attribute('requested_resource', $resource->name);
+                }
+            }
+
+            $mail_text = $template->render();
+
+            setLocaleEnv($user->preferred_language);
+
+            if ($this->resource) {
+                $resource = $this->resource->getDerivedClassInstance();
+                $template->set_attribute('derived_resource', $resource);
+                $mail_title = sprintf(
+                    _('%1$s: Neue Anfrage in der Raumverwaltung'),
+                    $resource->getFullName()
+                );
+            } else {
+                $mail_title = sprintf(
+                    _('Neue Anfrage in der Raumverwaltung')
+                );
+            }
+
+            Message::send(
+                User::findCurrent()->id,
+                $user->username,
+                $mail_title,
+                $mail_text
+            );
+
+            restoreLanguage();
+        }
+    }
+
+
+    /**
+     * @param array $bookings
+     * This method sends a mail to inform the requester that
+     * the request has been closed.
+     */
+    public function sendCloseRequestMailToRequester($bookings = [])
+    {
+        $factory = new Flexi\Factory(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
+        );
+
+        $requester_lang      = $this->user->preferred_language;
+        $requester_lang_path = getUserLanguagePath($this->user->id);
+        setLocaleEnv($requester_lang);
+
+        $template = $factory->open(
+            $requester_lang_path . '/LC_MAILS/close_resource_request.php'
+        );
+        $template->set_attribute('request', $this);
+        if ($this->course) {
+            $lecturers      = CourseMember::findByCourseAndStatus(
+                $this->course->id,
+                'dozent'
+            );
+            $lecturer_names = [];
+            foreach ($lecturers as $lecturer) {
+                if ($lecturer->user instanceof User) {
+                    $lecturer_names[] = $lecturer->user->getFullName();
+                }
+            }
+
+            $lecturer_names = implode(', ', $lecturer_names);
+            $template->set_attribute('lecturer_names', $lecturer_names);
+        }
+        if (is_array($bookings)) {
+            $booked_rooms          = [];
+            $booked_time_intervals = [];
+            $metadates             = [];
+            $single_dates          = [];
+            foreach ($bookings as $booking) {
+                if (!($booking instanceof ResourceBooking)) {
+                    continue;
+                }
+                $booked_rooms[] = $booking->resource->name;
+                if ($booking->assigned_course_date instanceof CourseDate) {
+                    $single_date = $booking->assigned_course_date;
+                    $metadate    = $single_date->cycle;
+                    if ($metadate instanceof SeminarCycleDate) {
+                        $metadates[$metadate->id] = $metadate;
+                    } else {
+                        $single_dates[$single_date->id] = $single_date;
+                    }
+                } else {
+                    $time_intervals = $booking->getTimeIntervals();
+                    foreach ($time_intervals as $time_interval) {
+                        $booked_time_intervals[] = $time_interval->__toString();
+                    }
+                }
+            }
+            $booked_rooms = array_unique($booked_rooms);
+            sort($booked_rooms);
+            $template->set_attribute('booked_rooms', implode(', ', $booked_rooms));
+            $template->set_attribute('metadates', $metadates);
+            $template->set_attribute('single_dates', $single_dates);
+            $template->set_attribute('booked_time_intervals', $booked_time_intervals);
+        }
+
+        $mail_title = _('Ihre Anfrage wurde bearbeitet!');
+        $mail_text  = $template->render();
+
+        Message::send(
+            User::findCurrent()->id,
+            $this->user->username,
+            $mail_title,
+            $mail_text
+        );
+
+        restoreLanguage();
+    }
+
+
+    /**
+     * @param array $bookings
+     * This method sends mails to the lecurers of the course (if any)
+     * where this request has been assigned to. The sent mail informs them
+     * about the closing of the request.
+     */
+    public function sendCloseRequestMailToLecturers($bookings = [])
+    {
+        //Notify each lecturer of the course:
+        if ($this->course) {
+            $lecturers = CourseMember::findByCourseAndStatus(
+                $this->course->id,
+                'dozent'
+            );
+
+            if ($lecturers) {
+                $factory = new Flexi\Factory(
+                    $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
+                );
+
+                $lecturer_names = [];
+                foreach ($lecturers as $lecturer) {
+                    if ($lecturer->user instanceof User) {
+                        $lecturer_names[] = $lecturer->user->getFullName();
+                    }
+                }
+                $lecturer_names = implode(', ', $lecturer_names);
+
+                $booked_rooms          = [];
+                $booked_time_intervals = [];
+                $metadates             = [];
+                $single_dates          = [];
+                if (is_array($bookings)) {
+                    foreach ($bookings as $booking) {
+                        if (!($booking instanceof ResourceBooking)) {
+                            continue;
+                        }
+                        $booked_rooms[] = $booking->resource->name;
+                        if ($booking->assigned_course_date instanceof CourseDate) {
+                            $single_date = $booking->assigned_course_date;
+                            $metadate    = $single_date->cycle;
+                            if ($metadate instanceof SeminarCycleDate) {
+                                $metadates[$metadate->id] = $metadate;
+                            } else {
+                                $single_dates[$single_date->id] = $single_date;
+                            }
+                        } else {
+                            $time_intervals = $booking->getTimeIntervals();
+                            foreach ($time_intervals as $time_interval) {
+                                $booked_time_intervals[] = $time_interval->__toString();
+                            }
+                        }
+                    }
+                }
+                $booked_rooms = array_unique($booked_rooms);
+                sort($booked_rooms);
+                $booked_rooms = implode(', ', $booked_rooms);
+
+                foreach ($lecturers as $lecturer) {
+                    $lec_lang      = $lecturer->user->preferred_language;
+                    $lec_lang_path = getUserLanguagePath($lecturer->user->id);
+
+                    setLocaleEnv($lec_lang);
+
+                    $template = $factory->open(
+                        $lec_lang_path . '/LC_MAILS/close_resource_request.php'
+                    );
+                    $template->set_attribute('request', $this);
+                    $template->set_attribute('lecturer_names', $lecturer_names);
+                    $template->set_attribute('booked_rooms', $booked_rooms);
+                    $template->set_attribute('metadates', $metadates);
+                    $template->set_attribute('single_dates', $single_dates);
+                    $template->set_attribute('booked_time_intervals', $booked_time_intervals);
+
+                    $mail_title = _('Bearbeitung einer Anfrage!');
+                    $mail_text  = $template->render();
+
+                    Message::send(
+                        User::findCurrent()->id,
+                        $lecturer->user->username,
+                        $mail_title,
+                        $mail_text
+                    );
+
+                    restoreLanguage();
+                }
+            }
+        }
+    }
+
+
+    /**
+     * This method sends a mail to inform the requester
+     * about the denial of the request.
+     */
+    public function sendRequestDeniedMail()
+    {
+        //Get the user who made the request:
+        $user = $this->user;
+        if (!($user instanceof User)) {
+            //No mail to send.
+            return;
+        }
+
+        //Load the mail template:
+        $factory = new Flexi\Factory(
+            $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
+        );
+        $user_lang_path = getUserLanguagePath($user->id);
+        $template       = $factory->open(
+            $user_lang_path . '/LC_MAILS/request_denied_mail.inc.php'
+        );
+
+        $range_object = $this->getRangeObject();
+        $mail_title = _('Raumanfrage wurde abgelehnt');
+        if($range_object instanceof Course) {
+            $mail_title .= ': ' . $range_object->getFullName();
+        }
+        $mail_text  = $template->render(
+            [
+                'request' => $this,
+                'range_object' => $range_object
+            ]
+        );
+
+        //Send the mail:
+        Message::send(
+            User::findCurrent()->id,
+            $user->username,
+            $mail_title,
+            $mail_text
+        );
+    }
+
+
+    public function isReadOnlyForUser(User $user)
+    {
+        $resource = $this->resource;
+        if (!$resource) {
+            //We cannot continue with the permission check.
+            return false;
+        }
+        $resource = $resource->getDerivedClassInstance();
+
+        return !$resource->userHasPermission($user, 'autor')
+            && ($this->user_id != $user->id);
+    }
+
+    protected function convertToEventData(array $time_intervals, User $user)
+    {
+        $booking_plan_request_bg     =
+            ColourValue::find('Resources.BookingPlan.Request.Bg');
+        $booking_plan_request_fg     =
+            ColourValue::find('Resources.BookingPlan.Request.Fg');
+        $booking_plan_preparation_bg =
+            ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
+        $booking_plan_preparation_fg =
+            ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
+
+        $user_is_resource_autor = false;
+        if ($this->resource_id && ($this->resource instanceof Resource)) {
+            $user_is_resource_autor = $this->resource->userHasPermission(
+                $user,
+                'autor'
+            );
+        }
+        $request_is_editable =
+            $user_is_resource_autor || ($user->id == $this->user_id);
+
+        $request_api_urls  = [];
+        $request_view_urls = [];
+
+        if ($request_is_editable) {
+            $request_api_urls = [
+                'resize' => URLHelper::getURL(
+                    'api.php/resources/request/'
+                    . $this->id . '/move',
+                    [
+                        'quiet' => '1'
+                    ]
+                ),
+                'move'   => URLHelper::getURL(
+                    'api.php/resources/request/'
+                    . $this->id . '/move',
+                    [
+                        'quiet' => '1'
+                    ]
+                )
+            ];
+
+            $request_view_urls = [
+                'edit' => URLHelper::getURL(
+                    'dispatch.php/resources/room_request/edit/'
+                    . $this->id
+                )
+            ];
+            if ($this->resource_id && ($this->resource instanceof Resource)) {
+                if ($this->resource->userHasBookingRights($user)) {
+                    $request_view_urls['edit'] = URLHelper::getURL(
+                        'dispatch.php/resources/room_request/resolve/'
+                        . $this->id
+                    );
+                }
+            }
+        }
+
+        $events = [];
+
+        foreach ($time_intervals as $interval) {
+            $real_begin = $interval['begin'];
+            if ($this->preparation_time) {
+                $real_begin += (int)$this->preparation_time;
+                $begin      = new DateTime();
+                $begin->setTimestamp($interval['begin']);
+                $end = new DateTime();
+                $end->setTimestamp($real_begin);
+                $events[] = new Studip\Calendar\EventData(
+                    $begin,
+                    $end,
+                    _('Rüstzeit'),
+                    ['preparation-time'],
+                    $booking_plan_preparation_fg->__toString(),
+                    $booking_plan_preparation_bg->__toString(),
+                    $request_is_editable,
+                    '',
+                    '',
+                    'ResourceRequest',
+                    $this->id,
+                    'Resource',
+                    $this->resource_id,
+                    $request_view_urls,
+                    $request_api_urls
+                );
+            }
+
+            $begin = new DateTime();
+            $begin->setTimestamp($real_begin);
+            $end = new DateTime();
+            $end->setTimestamp($interval['end']);
+
+            $events[] = new Studip\Calendar\EventData(
+                $begin,
+                $end,
+                $this->getRangeName(),
+                ['resource-request'],
+                $booking_plan_request_fg->__toString(),
+                $booking_plan_request_bg->__toString(),
+                $request_is_editable,
+                'ResourceRequest',
+                $this->id,
+                'Resource',
+                $this->resource_id,
+                'Resource',
+                $this->resource_id,
+                $request_view_urls,
+                $request_api_urls
+            );
+        }
+
+        return $events;
+    }
+
+
+    public function getAllEventData()
+    {
+        return $this->convertToEventData(
+            $this->getTimeIntervals(true),
+            User::findCurrent()
+        );
+    }
+
+
+    public function getEventDataForTimeRange(DateTime $begin, DateTime $end)
+    {
+        $intervals      = $this->getTimeIntervals(true);
+        $time_intervals = [];
+
+        $begin_timestamp = $begin->getTimestamp();
+        $end_timestamp   = $end->getTimestamp();
+
+        foreach ($intervals as $interval) {
+            if ((($interval['begin'] >= $begin_timestamp)
+                    && ($interval['begin'] <= $end_timestamp)) ||
+                (($interval['end'] >= $begin_timestamp)
+                    && ($interval['end'] <= $end_timestamp)) ||
+                (($interval['begin'] < $begin_timestamp)
+                    && ($interval['end'] > $end_timestamp))
+            ) {
+                $time_intervals[] = $interval;
+            }
+        }
+
+        return $this->convertToEventData($time_intervals, User::findCurrent());
+    }
+
+
+    public function getFilteredEventData(
+        $user_id = null,
+        $range_id = null,
+        $range_type = null,
+        $begin = null,
+        $end = null
+    )
+    {
+        $intervals      = $this->getTimeIntervals(true);
+        $time_intervals = [];
+
+        if ($begin && $end) {
+            $begin_timestamp = $begin;
+            $end_timestamp   = $end;
+            if ($begin instanceof DateTime) {
+                $begin_timestamp = $begin->getTimestamp();
+            }
+            if ($end instanceof DateTime) {
+                $end_timestamp = $end->getTimestamp();
+            }
+
+            foreach ($intervals as $interval) {
+                if ((($interval['begin'] >= $begin_timestamp)
+                        && ($interval['begin'] <= $end_timestamp)) ||
+                    (($interval['end'] >= $begin_timestamp)
+                        && ($interval['end'] <= $end_timestamp)) ||
+                    (($interval['begin'] < $begin_timestamp)
+                        && ($interval['end'] > $end_timestamp))
+                ) {
+                    $time_intervals[] = $interval;
+                }
+            }
+        } else {
+            $time_intervals = $intervals;
+        }
+
+        if ($user_id) {
+            $user = User::find($user_id);
+        } else {
+            $user = User::findCurrent();
+        }
+
+        return $this->convertToEventData($time_intervals, $user);
+    }
+
+    public function getPriority()
+    {
+
+        $result = $this->getTimeIntervals();
+        if (count($result) === 0) {
+            return null;
+        }
+        $first = $result[0];
+        return round(($first['begin'] - time()) / 86400);
+    }
+
+    public function getLoggingInfoText()
+    {
+        $props = '';
+        foreach ($this->getPropertyData() as $name => $state) {
+            $props .= $name . '=' . $state . ' ';
+        }
+        $info['Anfrage'] = $this->getType();
+        $info['Status'] = $this->getStatus();
+        if ($this->category) {
+            $info['Raumtyp'] = $this->category->name;
+        }
+        if ($this->termin_id) {
+            $info['Termin'] = $this->termin_id;
+        }
+        if ($this->metadate_id) {
+            $info['Metadate'] = $this->metadate_id;
+        }
+        if ($props) {
+            $info['Eigenschaften'] = $props;
+        }
+        if ($this->comment) {
+            $info['Kommentar'] = $this->comment;
+        }
+        $txt = '';
+        foreach ($info as $n => $m) {
+            $txt .= $n . ': ' . $m . ', ';
+        }
+        return trim($txt, ' ,');
+    }
+}
diff --git a/lib/models/resources/ResourceRequestAppointment.class.php b/lib/models/resources/ResourceRequestAppointment.class.php
deleted file mode 100644
index 929733b..0000000
--- a/lib/models/resources/ResourceRequestAppointment.class.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * ResourceRequestAppointment.class.php - Contains a model class for
- * the resource_request_appointments table.
- *
- * ResourceRequestAppointment is a model class to connect
- * resource requests to CourseDate objects.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property int $id database column
- * @property string $request_id database column
- * @property string $appointment_id database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property ResourceRequest $resource_request belongs_to ResourceRequest
- * @property CourseDate $appointment belongs_to CourseDate
- */
-class ResourceRequestAppointment extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_request_appointments';
-
-        $config['belongs_to']['resource_request'] = [
-            'class_name'  => ResourceRequest::class,
-            'foreign_key' => 'request_id',
-            'assoc_func'  => 'find'
-        ];
-        $config['belongs_to']['appointment']      = [
-            'class_name'  => CourseDate::class,
-            'foreign_key' => 'appointment_id',
-            'assoc_func'  => 'find'
-        ];
-
-        parent::configure($config);
-    }
-}
diff --git a/lib/models/resources/ResourceRequestAppointment.php b/lib/models/resources/ResourceRequestAppointment.php
new file mode 100644
index 0000000..929733b
--- /dev/null
+++ b/lib/models/resources/ResourceRequestAppointment.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * ResourceRequestAppointment.class.php - Contains a model class for
+ * the resource_request_appointments table.
+ *
+ * ResourceRequestAppointment is a model class to connect
+ * resource requests to CourseDate objects.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property int $id database column
+ * @property string $request_id database column
+ * @property string $appointment_id database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property ResourceRequest $resource_request belongs_to ResourceRequest
+ * @property CourseDate $appointment belongs_to CourseDate
+ */
+class ResourceRequestAppointment extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_request_appointments';
+
+        $config['belongs_to']['resource_request'] = [
+            'class_name'  => ResourceRequest::class,
+            'foreign_key' => 'request_id',
+            'assoc_func'  => 'find'
+        ];
+        $config['belongs_to']['appointment']      = [
+            'class_name'  => CourseDate::class,
+            'foreign_key' => 'appointment_id',
+            'assoc_func'  => 'find'
+        ];
+
+        parent::configure($config);
+    }
+}
diff --git a/lib/models/resources/ResourceRequestProperty.class.php b/lib/models/resources/ResourceRequestProperty.class.php
deleted file mode 100644
index 2952be9..0000000
--- a/lib/models/resources/ResourceRequestProperty.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * ResourceRequestProperty.class.php - model class for
- * resource request properties
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.1
- *
- * @property array $id alias for pk
- * @property string $request_id database column
- * @property string $property_id database column
- * @property string|null $state database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property ResourcePropertyDefinition $definition belongs_to ResourcePropertyDefinition
- * @property ResourceRequest $request belongs_to ResourceRequest
- * @property mixed $name additional field
- * @property mixed $display_name additional field
- * @property mixed $type additional field
- */
-class ResourceRequestProperty extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_request_properties';
-
-        $config['belongs_to']['definition'] = [
-            'class_name' => ResourcePropertyDefinition::class,
-            'foreign_key' => 'property_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['belongs_to']['request'] = [
-            'class_name' => ResourceRequest::class,
-            'foreign_key' => 'request_id',
-            'assoc_func' => 'find'
-        ];
-
-        $config['additional_fields']['name'] = ['definition', 'name'];
-        $config['additional_fields']['display_name'] = ['definition', 'display_name'];
-        $config['additional_fields']['type'] = ['definition', 'type'];
-
-        parent::configure($config);
-    }
-
-    /**
-     * Creates a string containing the appropriate value
-     * of this resource property.
-     *
-     * @return string The string representation of this resource property.
-     */
-    public function __toString()
-    {
-        $string = '';
-
-        if ($this->type == 'position') {
-            $string .= ResourceManager::getPositionString($this);
-        } elseif ($this->type == 'bool') {
-            $string .= $this->state ? _('ja') : _('nein');
-        } elseif ($this->type == 'num') {
-            $string .= $this->state;
-        } elseif ($this->type == 'user') {
-            $user = User::find($this->state);
-            $string .= $user->getFullName();
-        } else {
-            $string .= $this->state;
-        }
-        return $string;
-    }
-}
diff --git a/lib/models/resources/ResourceRequestProperty.php b/lib/models/resources/ResourceRequestProperty.php
new file mode 100644
index 0000000..2952be9
--- /dev/null
+++ b/lib/models/resources/ResourceRequestProperty.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * ResourceRequestProperty.class.php - model class for
+ * resource request properties
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.1
+ *
+ * @property array $id alias for pk
+ * @property string $request_id database column
+ * @property string $property_id database column
+ * @property string|null $state database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property ResourcePropertyDefinition $definition belongs_to ResourcePropertyDefinition
+ * @property ResourceRequest $request belongs_to ResourceRequest
+ * @property mixed $name additional field
+ * @property mixed $display_name additional field
+ * @property mixed $type additional field
+ */
+class ResourceRequestProperty extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_request_properties';
+
+        $config['belongs_to']['definition'] = [
+            'class_name' => ResourcePropertyDefinition::class,
+            'foreign_key' => 'property_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['belongs_to']['request'] = [
+            'class_name' => ResourceRequest::class,
+            'foreign_key' => 'request_id',
+            'assoc_func' => 'find'
+        ];
+
+        $config['additional_fields']['name'] = ['definition', 'name'];
+        $config['additional_fields']['display_name'] = ['definition', 'display_name'];
+        $config['additional_fields']['type'] = ['definition', 'type'];
+
+        parent::configure($config);
+    }
+
+    /**
+     * Creates a string containing the appropriate value
+     * of this resource property.
+     *
+     * @return string The string representation of this resource property.
+     */
+    public function __toString()
+    {
+        $string = '';
+
+        if ($this->type == 'position') {
+            $string .= ResourceManager::getPositionString($this);
+        } elseif ($this->type == 'bool') {
+            $string .= $this->state ? _('ja') : _('nein');
+        } elseif ($this->type == 'num') {
+            $string .= $this->state;
+        } elseif ($this->type == 'user') {
+            $user = User::find($this->state);
+            $string .= $user->getFullName();
+        } else {
+            $string .= $this->state;
+        }
+        return $string;
+    }
+}
diff --git a/lib/models/resources/ResourceTemporaryPermission.class.php b/lib/models/resources/ResourceTemporaryPermission.class.php
deleted file mode 100644
index ddbc397..0000000
--- a/lib/models/resources/ResourceTemporaryPermission.class.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * ResourceTemporaryPermission.class.php
- * Contains the ResourceTemporaryPermission class
- *
- * The ResourceTemporaryPermission class represents temporary permissions
- * granted to a user for a resource.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property int $id database column
- * @property string $resource_id database column
- * @property string $user_id database column
- * @property int $begin database column
- * @property int $end database column
- * @property string $perms database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property Resource $resource belongs_to Resource
- * @property User $user belongs_to User
- */
-class ResourceTemporaryPermission extends SimpleORMap implements PrivacyObject
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'resource_temporary_permissions';
-
-        $config['belongs_to']['resource'] = [
-            'class_name'  => Resource::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['belongs_to']['user'] = [
-            'class_name'  => User::class,
-            'foreign_key' => 'user_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $config['registered_callbacks']['before_store'][]  = 'cbLogChanges';
-        $config['registered_callbacks']['before_delete'][] = 'cbLogDeletion';
-
-        parent::configure($config);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public static function exportUserData(StoredUserData $storage)
-    {
-        $user        = User::find($storage->user_id);
-        $permissions = self::findBySql(
-            'user_id = :user_id ORDER BY mkdate',
-            [
-                'user_id' => $storage->user_id
-            ]
-        );
-
-        $rows = [];
-        foreach ($permissions as $permission) {
-            $rows[] = $permission->toRawArray();
-        }
-
-        $storage->addTabularData(
-            _('Temporäre Berechtigungen an Ressourcen'),
-            self::$config['db_table'],
-            $rows,
-            $user
-        );
-    }
-
-    /**
-     * Returns the current permission a user has for a resource.
-     *
-     * @param User $user The user whose permission shall be retrieved.
-     * @param string $resource_id The resource where the user's permission
-     *     shall be retrieved.
-     *
-     * @return string The permission level as string or an empty string, if no
-     *    temporary permission exists for the specified user on the
-     *    specified resource.
-     */
-    public static function getCurrentTemporaryPermissions(User $user, string $resource_id)
-    {
-        $perm = self::findOneBySql(
-            'resource_id = :resource_id
-            AND
-            user_id = :user_id',
-            [
-                'resource_id' => $resource_id,
-                'user_id'     => $user->id
-            ]
-        );
-        if ($perm) {
-            return $perm->perm;
-        }
-        return '';
-    }
-
-
-    public static function userHasPermissionInTimeRange(
-        User $user,
-        string $resource_id,
-        DateTime $begin,
-        DateTime $end
-    )
-    {
-        //Query explaination: We want exactly one permission object
-        //for the specified user and the resource.
-        //The permission must exist during the whole specified time range
-        //and therefore the begin and end of the permission must either
-        //meet the time range exactly or it must start earlier and end
-        //later than the time range. The permission level is checked afterwards
-        //if a permission object can be found.
-        $perm = self::findOneBySql(
-            'user_id = :user_id
-            AND
-            resource_id = :resource_id
-            AND
-            (begin <= :begin AND end >= :end)',
-            [
-                'user_id'     => $user->id,
-                'resource_id' => $resource_id,
-                'begin'       => $begin->getTimestamp(),
-                'end'         => $end->getTimestamp()
-            ]
-        );
-
-        if (!$perm) {
-            //If no permission object can be found the user obviously
-            //doesn't have the requested permissions.
-            return false;
-        }
-
-        return ResourceManager::comparePermissionLevels($perm->perm, $perm) >= 0;
-    }
-
-
-    /**
-     * This is a callback method to create an entry in the Stud.IP log
-     * when a ResourceTemporaryPermission object is stored.
-     */
-    public function cbLogChanges()
-    {
-        if ($this->isNew()) {
-            //Insert
-            if ($this->resource_id == 'global') {
-                //Global permissions
-                StudipLog::log(
-                    'RES_PERM_CHANGE',
-                    $this->resource_id,
-                    $this->user_id,
-                    sprintf(
-                        _('Globale temporäre Berechtigungen für %1$s (Rechtestufe %2$s) hinzugefügt.'),
-                        $this->user->username,
-                        $this->perms
-                    )
-                );
-
-            } elseif ($this->resource_id) {
-                //Resource-specific permissions
-                StudipLog::log(
-                    'RES_PERM_CHANGE',
-                    $this->resource_id,
-                    $this->user_id,
-                    sprintf(
-                        _('%1$s: Hinzufügen von temporären Berechtigungen für %2$s (Rechtestufe %3$s).'),
-                        $this->resource->getDerivedClassInstance()->getFullName(),
-                        $this->user->username,
-                        $this->perms
-                    )
-                );
-            } else {
-                throw new ResourcePermissionException(
-                    _('Berechtigungen müssen mit bestimmten Ressourcen verknüpft sein, bevor sie gespeichert werden!')
-                );
-            }
-        } else {
-            //Update?
-            if ($this->content_db['perms'] != $this->perms) {
-                //Update!
-                if ($this->resource_id == 'global') {
-                    StudipLog::log(
-                        'RES_PERM_CHANGE',
-                        $this->resource_id,
-                        $this->user_id,
-                        sprintf(
-                            _('Globale temporäre Berechtigungen für %1$s von %2$s auf %3$s geändert.'),
-                            $this->user->username,
-                            $this->content_db['perms'],
-                            $this->perms
-                        )
-                    );
-                } else {
-                    StudipLog::log(
-                        'RES_PERM_CHANGE',
-                        $this->resource_id,
-                        $this->user_id,
-                        sprintf(
-                            _('%1$s: Änderung der temporären Berechtigungen für %2$s von %3$s auf %4$s.'),
-                            $this->resource->getFullName(),
-                            $this->user->username,
-                            $this->content_db['perms'],
-                            $this->perms
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * This is a callback method to create an entry in the Stud.IP log
-     * when a ResourceTemporaryPermission object is deleted.
-     */
-    public function cbLogDeletion()
-    {
-        if ($this->resource_id == 'global') {
-            StudipLog::log(
-                'RES_PERM_CHANGE',
-                $this->resource_id,
-                $this->user_id,
-                sprintf(
-                    _('Globale temporäre Berechtigungen für %1$s (Rechtestufe %2$s) gelöscht.'),
-                    $this->user->username,
-                    $this->perms
-                )
-            );
-        } else {
-            StudipLog::log(
-                'RES_PERM_CHANGE',
-                $this->resource_id,
-                $this->user_id,
-                sprintf(
-                    _('%1$s: Löschen der temporären Berechtigungen für %2$s (Rechtestufe %3$s).'),
-                    $this->resource->getFullName(),
-                    $this->user->username,
-                    $this->perms
-                )
-            );
-        }
-    }
-}
diff --git a/lib/models/resources/ResourceTemporaryPermission.php b/lib/models/resources/ResourceTemporaryPermission.php
new file mode 100644
index 0000000..ddbc397
--- /dev/null
+++ b/lib/models/resources/ResourceTemporaryPermission.php
@@ -0,0 +1,254 @@
+<?php
+
+/**
+ * ResourceTemporaryPermission.class.php
+ * Contains the ResourceTemporaryPermission class
+ *
+ * The ResourceTemporaryPermission class represents temporary permissions
+ * granted to a user for a resource.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property int $id database column
+ * @property string $resource_id database column
+ * @property string $user_id database column
+ * @property int $begin database column
+ * @property int $end database column
+ * @property string $perms database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property Resource $resource belongs_to Resource
+ * @property User $user belongs_to User
+ */
+class ResourceTemporaryPermission extends SimpleORMap implements PrivacyObject
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'resource_temporary_permissions';
+
+        $config['belongs_to']['resource'] = [
+            'class_name'  => Resource::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['belongs_to']['user'] = [
+            'class_name'  => User::class,
+            'foreign_key' => 'user_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $config['registered_callbacks']['before_store'][]  = 'cbLogChanges';
+        $config['registered_callbacks']['before_delete'][] = 'cbLogDeletion';
+
+        parent::configure($config);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function exportUserData(StoredUserData $storage)
+    {
+        $user        = User::find($storage->user_id);
+        $permissions = self::findBySql(
+            'user_id = :user_id ORDER BY mkdate',
+            [
+                'user_id' => $storage->user_id
+            ]
+        );
+
+        $rows = [];
+        foreach ($permissions as $permission) {
+            $rows[] = $permission->toRawArray();
+        }
+
+        $storage->addTabularData(
+            _('Temporäre Berechtigungen an Ressourcen'),
+            self::$config['db_table'],
+            $rows,
+            $user
+        );
+    }
+
+    /**
+     * Returns the current permission a user has for a resource.
+     *
+     * @param User $user The user whose permission shall be retrieved.
+     * @param string $resource_id The resource where the user's permission
+     *     shall be retrieved.
+     *
+     * @return string The permission level as string or an empty string, if no
+     *    temporary permission exists for the specified user on the
+     *    specified resource.
+     */
+    public static function getCurrentTemporaryPermissions(User $user, string $resource_id)
+    {
+        $perm = self::findOneBySql(
+            'resource_id = :resource_id
+            AND
+            user_id = :user_id',
+            [
+                'resource_id' => $resource_id,
+                'user_id'     => $user->id
+            ]
+        );
+        if ($perm) {
+            return $perm->perm;
+        }
+        return '';
+    }
+
+
+    public static function userHasPermissionInTimeRange(
+        User $user,
+        string $resource_id,
+        DateTime $begin,
+        DateTime $end
+    )
+    {
+        //Query explaination: We want exactly one permission object
+        //for the specified user and the resource.
+        //The permission must exist during the whole specified time range
+        //and therefore the begin and end of the permission must either
+        //meet the time range exactly or it must start earlier and end
+        //later than the time range. The permission level is checked afterwards
+        //if a permission object can be found.
+        $perm = self::findOneBySql(
+            'user_id = :user_id
+            AND
+            resource_id = :resource_id
+            AND
+            (begin <= :begin AND end >= :end)',
+            [
+                'user_id'     => $user->id,
+                'resource_id' => $resource_id,
+                'begin'       => $begin->getTimestamp(),
+                'end'         => $end->getTimestamp()
+            ]
+        );
+
+        if (!$perm) {
+            //If no permission object can be found the user obviously
+            //doesn't have the requested permissions.
+            return false;
+        }
+
+        return ResourceManager::comparePermissionLevels($perm->perm, $perm) >= 0;
+    }
+
+
+    /**
+     * This is a callback method to create an entry in the Stud.IP log
+     * when a ResourceTemporaryPermission object is stored.
+     */
+    public function cbLogChanges()
+    {
+        if ($this->isNew()) {
+            //Insert
+            if ($this->resource_id == 'global') {
+                //Global permissions
+                StudipLog::log(
+                    'RES_PERM_CHANGE',
+                    $this->resource_id,
+                    $this->user_id,
+                    sprintf(
+                        _('Globale temporäre Berechtigungen für %1$s (Rechtestufe %2$s) hinzugefügt.'),
+                        $this->user->username,
+                        $this->perms
+                    )
+                );
+
+            } elseif ($this->resource_id) {
+                //Resource-specific permissions
+                StudipLog::log(
+                    'RES_PERM_CHANGE',
+                    $this->resource_id,
+                    $this->user_id,
+                    sprintf(
+                        _('%1$s: Hinzufügen von temporären Berechtigungen für %2$s (Rechtestufe %3$s).'),
+                        $this->resource->getDerivedClassInstance()->getFullName(),
+                        $this->user->username,
+                        $this->perms
+                    )
+                );
+            } else {
+                throw new ResourcePermissionException(
+                    _('Berechtigungen müssen mit bestimmten Ressourcen verknüpft sein, bevor sie gespeichert werden!')
+                );
+            }
+        } else {
+            //Update?
+            if ($this->content_db['perms'] != $this->perms) {
+                //Update!
+                if ($this->resource_id == 'global') {
+                    StudipLog::log(
+                        'RES_PERM_CHANGE',
+                        $this->resource_id,
+                        $this->user_id,
+                        sprintf(
+                            _('Globale temporäre Berechtigungen für %1$s von %2$s auf %3$s geändert.'),
+                            $this->user->username,
+                            $this->content_db['perms'],
+                            $this->perms
+                        )
+                    );
+                } else {
+                    StudipLog::log(
+                        'RES_PERM_CHANGE',
+                        $this->resource_id,
+                        $this->user_id,
+                        sprintf(
+                            _('%1$s: Änderung der temporären Berechtigungen für %2$s von %3$s auf %4$s.'),
+                            $this->resource->getFullName(),
+                            $this->user->username,
+                            $this->content_db['perms'],
+                            $this->perms
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * This is a callback method to create an entry in the Stud.IP log
+     * when a ResourceTemporaryPermission object is deleted.
+     */
+    public function cbLogDeletion()
+    {
+        if ($this->resource_id == 'global') {
+            StudipLog::log(
+                'RES_PERM_CHANGE',
+                $this->resource_id,
+                $this->user_id,
+                sprintf(
+                    _('Globale temporäre Berechtigungen für %1$s (Rechtestufe %2$s) gelöscht.'),
+                    $this->user->username,
+                    $this->perms
+                )
+            );
+        } else {
+            StudipLog::log(
+                'RES_PERM_CHANGE',
+                $this->resource_id,
+                $this->user_id,
+                sprintf(
+                    _('%1$s: Löschen der temporären Berechtigungen für %2$s (Rechtestufe %3$s).'),
+                    $this->resource->getFullName(),
+                    $this->user->username,
+                    $this->perms
+                )
+            );
+        }
+    }
+}
diff --git a/lib/models/resources/Room.class.php b/lib/models/resources/Room.class.php
deleted file mode 100644
index 7f1668e..0000000
--- a/lib/models/resources/Room.class.php
+++ /dev/null
@@ -1,723 +0,0 @@
-<?php
-
-/**
- * Room.class.php - model class for a resource which is a room
- *
- * The Room class is a derived class of the Resource class.
- * It containts specialisations for room resources.
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property string $id database column
- * @property string $parent_id database column
- * @property string $category_id database column
- * @property int|null $level database column
- * @property string $name database column
- * @property I18NString|null $description database column
- * @property int $requestable database column
- * @property int $lockable database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property int $sort_position database column
- * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
- * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
- * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
- * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
- * @property SimpleORMapCollection|Resource[] $children has_many Resource
- * @property ResourceCategory $category belongs_to ResourceCategory
- * @property Resource $parent belongs_to Resource
- * @property mixed $room_type additional field
- * @property mixed $seats additional field
- * @property mixed $booking_plan_is_public additional field
- * @property-read mixed $building additional field
- * @property mixed $class_name additional field
- */
-class Room extends Resource
-{
-    protected static $required_properties = [
-        'room_type',
-        'seats',
-        'booking_plan_is_public'
-    ];
-
-
-    protected static function configure($config = [])
-    {
-        if (!isset($config['additional_fields'])) {
-            $config['additional_fields'] = [];
-        }
-        foreach (self::$required_properties as $property) {
-            $config['additional_fields'][$property] = [
-                'get' => 'getProperty',
-                'set' => 'setProperty'
-            ];
-        }
-
-        $config['additional_fields']['building']['get']   = 'findBuilding';
-        $config['registered_callbacks']['before_store'][] = 'cbValidate';
-        $config['registered_callbacks']['after_delete'][] = 'cbDeleteClipboardItems';
-
-        parent::configure($config);
-    }
-
-
-    public static function getTranslatedClassName($item_count = 1)
-    {
-        return ngettext(
-            'Raum',
-            'Räume',
-            $item_count
-        );
-    }
-
-
-    public static function countAll()
-    {
-        return self::countBySql(
-            "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE rc.class_name IN ( :room_class_names )",
-            [
-                'room_class_names' => RoomManager::getAllRoomClassNames()
-            ]
-        );
-    }
-
-
-    public static function findAll()
-    {
-        return self::findBySql(
-            "INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE rc.class_name IN ( :room_class_names )
-            ORDER BY sort_position DESC, name ASC, mkdate ASC",
-            [
-                'room_class_names' => RoomManager::getAllRoomClassNames()
-            ]
-        );
-    }
-
-
-    public static function findByNameOrBuilding($room, $building)
-    {
-        $params = [];
-
-        $sql = "INNER JOIN resource_categories rc
-                ON resources.category_id = rc.id";
-        if ($building) {
-            $sql .= " INNER JOIN resources pr
-                    ON resources.parent_id = pr.id";
-        }
-        $sql .= " WHERE rc.class_name IN ( :room_class_names )";
-        $params['room_class_names'] = RoomManager::getAllRoomClassNames();
-        if ($room) {
-            $sql                 .= " AND resources.name LIKE CONCAT('%', :room_name, '%')";
-            $params['room_name'] = $room;
-        }
-        if ($building) {
-            $sql                     .= " AND pr.name LIKE CONCAT('%', :building_name, '%')";
-            $params['building_name'] = $building;
-        }
-        $sql .= " ORDER BY sort_position DESC, name ASC, mkdate ASC";
-
-        return self::findBySql($sql, $params);
-    }
-
-
-    public static function getRequiredProperties()
-    {
-        return self::$required_properties;
-    }
-
-
-    /**
-     * Finds rooms by a building specified by its ID.
-     *
-     * @param string $building_id The ID of the building.
-     *
-     * @return array An array with rooms or an empty array.
-     */
-    public static function findByBuilding(string $building_id)
-    {
-        $building = Building::find($building_id);
-        if (!$building) {
-            return [];
-        }
-
-        //Return all found Room objects below the building:
-        return $building->findChildrenByClassName('Room', 0, true);
-    }
-
-
-    /**
-     * Returns rooms that match the criteria of the room request.
-     *
-     * @param RoomRequest $request A RoomRequest object.
-     * @param User $user The user who wishes to search for rooms matching
-     *     the room request.
-     * @param int $offset An offset for the result set.
-     * @param int $limit A limit for the result set.
-     * @param Room[] $searchable_rooms An (optional) array of rooms
-     *     which will limit the search to the rooms in the array.
-     * @param array $properties An array providing request properties
-     *     and their values in case the request doesn't have (the desired)
-     *     properties set.
-     *
-     * @return Room[] An array of room resources.
-     */
-    public static function findByRoomRequestAndProperties(
-        RoomRequest $request,
-        User $user,
-        $offset = 0,
-        $limit = 0,
-        $searchable_rooms = [],
-        $properties = []
-    )
-    {
-        //We have to check first if the user is permitted to search:
-        //The user must have at least 'tutor' status in the
-        //room and resource management:
-
-        if (!ResourceManager::userHasGlobalPermission($user, 'tutor')) {
-            throw new AccessDeniedException(
-                _('Ihre Berechtigungen sind unzureichend, um Räume anhand einer Raumanfrage zu suchen!')
-            );
-        }
-
-        if (!$properties) {
-            $properties = [];
-            foreach ($request->properties as $property) {
-                $properties[$property->name] = $property->state;
-            }
-        }
-
-        //Build the SQL query, based on the room request's properties
-        //and the specified parameters:
-
-        $sql = "INNER JOIN resource_properties rp
-            ON resources.id = rp.resource_id
-            INNER JOIN resource_categories rc
-            ON resources.category_id = rc.id
-            WHERE
-            resources.requestable = '1'
-            AND
-            rc.class_name IN ( :room_class_names ) ";
-        $sql_array = [
-            'room_class_names' => RoomManager::getAllRoomClassNames()
-        ];
-        if (count($properties)) {
-            $sql       .= "AND ( ";
-
-            $property_c = 1;
-            foreach ($properties as $name => $state) {
-                if (!$state) {
-                    continue;
-                }
-                $definition = ResourcePropertyDefinition::findOneBySql(
-                    "INNER JOIN resource_category_properties rcp
-                    WHERE rcp.category_id = :category_id
-                    AND resource_property_definitions.name = :name",
-                    [
-                        'category_id' => $request->category_id,
-                        'name'        => $name
-                    ]
-                );
-                if (!$definition) {
-                    //Such a property doesn't exist for the specified category.
-                    continue;
-                }
-
-                if ($property_c > 1) {
-                    $sql .= ' OR ';
-                }
-                $sql .= "(rp.property_id = :property_id$property_c ";
-
-                //By looking at the definition we can determine if we have to do
-                //a range search or a search for an exact match.
-                if ($definition->range_search || $name == 'seats') {
-                    $sql .= "AND rp.state >= :property_state$property_c";
-                } else {
-                    $sql .= "AND rp.state = :property_state$property_c";
-                }
-
-                $sql                                    .= ")";
-                $sql_array["property_id$property_c"]    = $definition->id;
-                $sql_array["property_state$property_c"] = $state;
-
-                $property_c++;
-            }
-
-            $sql .= ") ";
-        }
-
-        if (!empty($searchable_rooms)) {
-            $room_ids = [];
-            foreach ($searchable_rooms as $room) {
-                if ($room instanceof Room) {
-                    $room_ids[] = $room->id;
-                }
-            }
-            if ($room_ids) {
-                $sql                   .= "AND resources.id IN ( :room_ids ) ";
-                $sql_array['room_ids'] = $room_ids;
-            } else {
-                //We can't look for non-existing rooms:
-                return [];
-            }
-        }
-
-        $sql .= "GROUP BY resource_id ORDER BY resources.name ASC ";
-
-        $offset = intval($offset);
-        if ($offset > 0) {
-            $sql                 .= "OFFSET :offset ";
-            $sql_array['offset'] = $offset;
-        }
-
-        $limit = intval($limit);
-        if ($limit > 0) {
-            $sql                .= "LIMIT :limit ";
-            $sql_array['limit'] = $limit;
-        }
-
-        return Room::findBySql($sql, $sql_array);
-    }
-
-
-    /**
-     * Determins if the specified room is a room part
-     * and then returns all other room parts.
-     *
-     * @param Room $room The room part whose other room parts shall be found.
-     *
-     * @return Room[] An array of room objects or an empty array
-     *     if no other room parts can be found.
-     */
-    public static function findOtherRoomParts(Room $room)
-    {
-        $other_room_parts = [];
-
-        $separable_room = SeparableRoom::findByRoomPart($room);
-        if ($separable_room instanceof SeparableRoom) {
-            $other_room_parts = $separable_room->findOtherRoomParts(
-                [$room]
-            );
-        }
-
-        return $other_room_parts;
-    }
-
-
-    /**
-     * Helper method to return the SQL code for publicBookingPlansExists,
-     * countByPublicBookingPlans and getByPublicBookingPlans.
-     */
-    protected static function getPublicBookingPlansSql()
-    {
-        return "INNER JOIN resource_categories AS rc
-            ON resources.category_id = rc.id
-        INNER JOIN resource_properties AS rp
-            ON resources.id = rp.resource_id
-        INNER JOIN resource_property_definitions AS rpd
-            USING (property_id)
-        WHERE rc.class_name IN ( :room_class_names )
-            AND rpd.name = 'booking_plan_is_public'
-            AND rp.state = '1'
-        ORDER BY resources.name ASC, resources.mkdate ASC";
-    }
-
-
-    /**
-     * Checks whether rooms with public booking plans exist.
-     *
-     * @return bool True, if at least one room has a public booking plan,
-     *     false otherwise.
-     */
-    public static function publicBookingPlansExists()
-    {
-        return Room::countBySql(
-            self::getPublicBookingPlansSql(),
-            ['room_class_names' => RoomManager::getAllRoomClassNames()]
-        ) > 0;
-    }
-
-
-    /**
-     * Retrieves all rooms that have a public booking plan,
-     * ordered by name and creation date.
-     *
-     * @return array A list of rooms with public booking plans.
-     */
-    public static function findByPublicBookingPlans()
-    {
-        return self::findBySql(
-            self::getPublicBookingPlansSql(),
-            ['room_class_names' => RoomManager::getAllRoomClassNames()]
-        );
-    }
-
-
-    /**
-     * Retrieves all existing room types from the database.
-     * Only room types which have at least one room object with that
-     * type in the database are considered here.
-     *
-     * @return array An array consisting of all room types which
-     *     exist in the database.
-     */
-    public static function getAllRoomTypes()
-    {
-        $db      = DBManager::get();
-        $stmt = $db->prepare(
-            "SELECT DISTINCT state FROM resource_properties
-            INNER JOIN resource_property_definitions rpd
-            USING (property_id)
-            INNER JOIN resource_category_properties rcp
-            USING (property_id)
-            INNER JOIN resource_categories rc
-            ON rcp.category_id = rc.id
-            WHERE
-            state != ''
-            AND
-            rc.class_name IN ( :room_class_names )
-            AND
-            rpd.name = 'room_type'
-            ORDER BY state ASC"
-        );
-        $stmt->execute(
-            ['room_class_names' => RoomManager::getAllRoomClassNames()]
-        );
-        return $stmt->fetchAll(
-            PDO::FETCH_COLUMN,
-            0
-        );
-    }
-
-    /**
-     * Returns the part of the URL for getLink and getURL which will be
-     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
-     * in these methods.
-     *
-     * @param string $action The action for the room.
-     * @param string $id The ID of the room.
-     *
-     * @return string The URL path for the specified action.
-     * @throws InvalidArgumentException If $room_id is empty.
-     *
-     */
-    protected static function buildPathForAction($action = 'show', $id = null)
-    {
-        if (!$id) {
-            throw new InvalidArgumentException(
-                _('Zur Erstellung der URL fehlt eine Raum-ID!')
-            );
-        }
-
-        switch ($action) {
-            case 'show':
-                return 'dispatch.php/resources/room/index/' . $id;
-            case 'add':
-                return 'dispatch.php/resources/room/add';
-            case 'edit':
-                return 'dispatch.php/resources/room/edit/' . $id;
-            case 'delete':
-                return 'dispatch.php/resources/room/delete/' . $id;
-            case 'request':
-                return 'dispatch.php/resources/room_request/add/' . $id;
-            case 'request_list':
-                return 'dispatch.php/resources/room_request/overview?room_id=' . $id;
-            case 'booking_plan':
-                return 'dispatch.php/resources/room_planning/booking_plan/' . $id;
-            default:
-                //There are some actions which can be handled by the general
-                //resource controller:
-                return parent::buildPathForAction($action, $id);
-        }
-    }
-
-
-    /**
-     * Returns the appropriate link for the room action that shall be
-     * executed on a room.
-     *
-     * @param string $action The action which shall be executed.
-     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param string $id The ID of the room on which the specified
-     *     action shall be executed.
-     * @param array $link_parameters Optional parameters for the link.
-     *
-     * @return string The Link for the room action.
-     * @throws InvalidArgumentException If $room_id is empty.
-     *
-     */
-    public static function getLinkForAction($action = 'show', $id = null, $link_parameters = [])
-    {
-        return URLHelper::getLink(
-            self::buildPathForAction($action, $id),
-            $link_parameters
-        );
-    }
-
-
-    /**
-     * Returns the appropriate URL for the room action that shall be
-     * executed on a room.
-     *
-     * @param string $action The action which shall be executed.
-     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param string $id The ID of the room on which the specified
-     *     action shall be executed.
-     * @param array $url_parameters Optional parameters for the URL.
-     *
-     * @return string The URL for the room action.
-     * @throws InvalidArgumentException If $room_id is empty.
-     *
-     */
-    public static function getURLForAction($action = 'show', $id = null, $url_parameters = [])
-    {
-        return URLHelper::getURL(
-            self::buildPathForAction($action, $id),
-            $url_parameters
-        );
-    }
-
-
-    public function cbValidate()
-    {
-        $building = $this->findParentByClassName('Building');
-        if (!$building) {
-            //Rooms must have parents! They have to be placed below buildings!
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Der Raum %1$s ist keinem Gebäude zugeordnet!'),
-                    $this->name
-                )
-            );
-        }
-
-        if (!is_a($this->category->class_name, get_class($this), true)) {
-            //Only resources with the Building category can be handled
-            //with this class!
-            throw new InvalidResourceException(
-                sprintf(
-                    _('Der Raum %1$s ist der falschen Ressourcen-Klasse zugeordnet!'),
-                    $this->name
-                )
-            );
-        }
-        return true;
-    }
-
-    public function cbDeleteClipboardItems()
-    {
-        ClipboardItem::deleteBySQL('range_id = ?', [$this->id]);
-    }
-
-
-    public function getRequiredPropertyNames()
-    {
-        return self::$required_properties;
-    }
-
-
-    /**
-     * @see StudipItem::__toString
-     */
-    public function __toString()
-    {
-        return $this->getFullName();
-    }
-
-
-    /**
-     * This method calls Resource::createRequest and transforms the
-     * resulting ResourceRequest object into a RoomRequest object.
-     *
-     * @return RoomRequest A room request object.
-     * @see Resource::createRequest for paramter descriptions
-     *     and thrown exceptions.
-     * @inheritDoc
-     */
-    public function createRequest(
-        User $user,
-        $date_range_id = null,
-        $comment = '',
-        $properties = [],
-        $preparation_time = 0
-    )
-    {
-        $request = parent::createRequest(
-            $user,
-            $date_range_id,
-            $comment,
-            $properties,
-            $preparation_time
-        );
-
-        return RoomRequest::build($request, false);
-    }
-
-
-    /**
-     * Adds a child resource to this room. The child resource
-     * must not be a resource of the class Room, Building or Location.
-     *
-     * @param Resource $resource The resource which shall be added as child.
-     *
-     * @return bool True, if the resource could be added as child, false otherwise.
-     * @throws InvalidResourceException If the specified resource belongs to
-     *     the resource classes Room, Building or Location.
-     *
-     */
-    public function addChild(Resource $resource)
-    {
-        if ($resource->class_name == $this->class_name) {
-            throw new InvalidResourceException(
-                _('Ein Raum darf keinem anderen Raum in der Hierarchie untergeordnet werden!')
-            );
-        } elseif ($resource->class_name == 'Location') {
-            throw new InvalidResourceException(
-                _('Ein Standort darf keinem Raum in der Hierarchie untergeordnet werden!')
-            );
-        } elseif ($resource->class_name == 'Building') {
-            throw new InvalidResourceException(
-                _('Ein Gebäude darf keinem Raum in der Hierarchie untergeordnet werden!')
-            );
-        }
-        return parent::addChild($resource);
-    }
-
-
-    /**
-     * Returns the full name of this room.
-     *
-     * @return string The full name of this room.
-     */
-    public function getFullName()
-    {
-        return sprintf(
-            _('Raum %s'),
-            $this->name
-        );
-    }
-
-    public function getDefaultPictureUrl()
-    {
-        return $this->getIcon()->asImagePath();
-    }
-
-    public function getIcon($role = Icon::ROLE_INFO)
-    {
-        return Icon::create('room', $role);
-    }
-
-
-    public function checkHierarchy()
-    {
-        //We must check if this room has rooms as children
-        //or as parents. In any of those cases the hierarchy
-        //is invalid!
-
-        $children = $this->findChildrenByClassName('Room');
-        if (count($children) > 0) {
-            //At least one child anywhere below this room
-            //resource is a room, too.
-            return false;
-        }
-
-        $parents = ResourceManager::getHierarchy($this);
-        //We do not need to check this element:
-        array_shift($parents);
-        foreach ($parents as $parent) {
-            $parent = $parent->getDerivedClassInstance();
-            if ($parent instanceof Room) {
-                //Hierarchy error
-                return false;
-            }
-        }
-
-        //If code execution reaches this point then
-        //the hierarchy around this room is valid.
-        return true;
-    }
-
-
-    /**
-     * @see Resource::bookingPlanVisibleForUser
-     * @inheritDoc
-     */
-    public function bookingPlanVisibleForUser(?User $user, $time_range = [])
-    {
-        return $this->booking_plan_is_public
-            || parent::bookingPlanVisibleForUser($user, $time_range);
-    }
-
-
-    /**
-     * Returns the link for an action for this room.
-     * This is the non-static variant of Room::getLinkForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param array $link_parameters Optional parameters for the link.
-     * @return string @TODO
-     */
-    public function getActionLink($action = 'show', $link_parameters = [])
-    {
-        return self::getLinkForAction(
-            $action,
-            $this->id,
-            $link_parameters
-        );
-    }
-
-
-    /**
-     * Returns the URL for an action for this room.
-     * This is the non-static variant of Room::getURLForAction.
-     *
-     * @param string $action The action which shall be executed.
-     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
-     *     are defined.
-     * @param array $url_parameters Optional parameters for the URL.
-     * @return string @TODO
-     */
-    public function getActionURL($action = 'show', $url_parameters = [])
-    {
-        return self::getURLForAction(
-            $action,
-            $this->id,
-            $url_parameters
-        );
-    }
-
-
-    /**
-     * Retrieves the building where this room resides in by looking up
-     * the parent resources of this Room.
-     *
-     * @return Building|null A Building object if it can be found,
-     *     null otherwise.
-     */
-    public function findBuilding()
-    {
-        $building = self::findParentByClassName('Building');
-        if ($building instanceof Resource) {
-            return $building->getDerivedClassInstance();
-        }
-        return null;
-    }
-}
diff --git a/lib/models/resources/Room.php b/lib/models/resources/Room.php
new file mode 100644
index 0000000..7f1668e
--- /dev/null
+++ b/lib/models/resources/Room.php
@@ -0,0 +1,723 @@
+<?php
+
+/**
+ * Room.class.php - model class for a resource which is a room
+ *
+ * The Room class is a derived class of the Resource class.
+ * It containts specialisations for room resources.
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property string $id database column
+ * @property string $parent_id database column
+ * @property string $category_id database column
+ * @property int|null $level database column
+ * @property string $name database column
+ * @property I18NString|null $description database column
+ * @property int $requestable database column
+ * @property int $lockable database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property int $sort_position database column
+ * @property SimpleORMapCollection|ResourceProperty[] $properties has_many ResourceProperty
+ * @property SimpleORMapCollection|ResourcePermission[] $permissions has_many ResourcePermission
+ * @property SimpleORMapCollection|ResourceRequest[] $requests has_many ResourceRequest
+ * @property SimpleORMapCollection|ResourceBooking[] $bookings has_many ResourceBooking
+ * @property SimpleORMapCollection|Resource[] $children has_many Resource
+ * @property ResourceCategory $category belongs_to ResourceCategory
+ * @property Resource $parent belongs_to Resource
+ * @property mixed $room_type additional field
+ * @property mixed $seats additional field
+ * @property mixed $booking_plan_is_public additional field
+ * @property-read mixed $building additional field
+ * @property mixed $class_name additional field
+ */
+class Room extends Resource
+{
+    protected static $required_properties = [
+        'room_type',
+        'seats',
+        'booking_plan_is_public'
+    ];
+
+
+    protected static function configure($config = [])
+    {
+        if (!isset($config['additional_fields'])) {
+            $config['additional_fields'] = [];
+        }
+        foreach (self::$required_properties as $property) {
+            $config['additional_fields'][$property] = [
+                'get' => 'getProperty',
+                'set' => 'setProperty'
+            ];
+        }
+
+        $config['additional_fields']['building']['get']   = 'findBuilding';
+        $config['registered_callbacks']['before_store'][] = 'cbValidate';
+        $config['registered_callbacks']['after_delete'][] = 'cbDeleteClipboardItems';
+
+        parent::configure($config);
+    }
+
+
+    public static function getTranslatedClassName($item_count = 1)
+    {
+        return ngettext(
+            'Raum',
+            'Räume',
+            $item_count
+        );
+    }
+
+
+    public static function countAll()
+    {
+        return self::countBySql(
+            "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE rc.class_name IN ( :room_class_names )",
+            [
+                'room_class_names' => RoomManager::getAllRoomClassNames()
+            ]
+        );
+    }
+
+
+    public static function findAll()
+    {
+        return self::findBySql(
+            "INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE rc.class_name IN ( :room_class_names )
+            ORDER BY sort_position DESC, name ASC, mkdate ASC",
+            [
+                'room_class_names' => RoomManager::getAllRoomClassNames()
+            ]
+        );
+    }
+
+
+    public static function findByNameOrBuilding($room, $building)
+    {
+        $params = [];
+
+        $sql = "INNER JOIN resource_categories rc
+                ON resources.category_id = rc.id";
+        if ($building) {
+            $sql .= " INNER JOIN resources pr
+                    ON resources.parent_id = pr.id";
+        }
+        $sql .= " WHERE rc.class_name IN ( :room_class_names )";
+        $params['room_class_names'] = RoomManager::getAllRoomClassNames();
+        if ($room) {
+            $sql                 .= " AND resources.name LIKE CONCAT('%', :room_name, '%')";
+            $params['room_name'] = $room;
+        }
+        if ($building) {
+            $sql                     .= " AND pr.name LIKE CONCAT('%', :building_name, '%')";
+            $params['building_name'] = $building;
+        }
+        $sql .= " ORDER BY sort_position DESC, name ASC, mkdate ASC";
+
+        return self::findBySql($sql, $params);
+    }
+
+
+    public static function getRequiredProperties()
+    {
+        return self::$required_properties;
+    }
+
+
+    /**
+     * Finds rooms by a building specified by its ID.
+     *
+     * @param string $building_id The ID of the building.
+     *
+     * @return array An array with rooms or an empty array.
+     */
+    public static function findByBuilding(string $building_id)
+    {
+        $building = Building::find($building_id);
+        if (!$building) {
+            return [];
+        }
+
+        //Return all found Room objects below the building:
+        return $building->findChildrenByClassName('Room', 0, true);
+    }
+
+
+    /**
+     * Returns rooms that match the criteria of the room request.
+     *
+     * @param RoomRequest $request A RoomRequest object.
+     * @param User $user The user who wishes to search for rooms matching
+     *     the room request.
+     * @param int $offset An offset for the result set.
+     * @param int $limit A limit for the result set.
+     * @param Room[] $searchable_rooms An (optional) array of rooms
+     *     which will limit the search to the rooms in the array.
+     * @param array $properties An array providing request properties
+     *     and their values in case the request doesn't have (the desired)
+     *     properties set.
+     *
+     * @return Room[] An array of room resources.
+     */
+    public static function findByRoomRequestAndProperties(
+        RoomRequest $request,
+        User $user,
+        $offset = 0,
+        $limit = 0,
+        $searchable_rooms = [],
+        $properties = []
+    )
+    {
+        //We have to check first if the user is permitted to search:
+        //The user must have at least 'tutor' status in the
+        //room and resource management:
+
+        if (!ResourceManager::userHasGlobalPermission($user, 'tutor')) {
+            throw new AccessDeniedException(
+                _('Ihre Berechtigungen sind unzureichend, um Räume anhand einer Raumanfrage zu suchen!')
+            );
+        }
+
+        if (!$properties) {
+            $properties = [];
+            foreach ($request->properties as $property) {
+                $properties[$property->name] = $property->state;
+            }
+        }
+
+        //Build the SQL query, based on the room request's properties
+        //and the specified parameters:
+
+        $sql = "INNER JOIN resource_properties rp
+            ON resources.id = rp.resource_id
+            INNER JOIN resource_categories rc
+            ON resources.category_id = rc.id
+            WHERE
+            resources.requestable = '1'
+            AND
+            rc.class_name IN ( :room_class_names ) ";
+        $sql_array = [
+            'room_class_names' => RoomManager::getAllRoomClassNames()
+        ];
+        if (count($properties)) {
+            $sql       .= "AND ( ";
+
+            $property_c = 1;
+            foreach ($properties as $name => $state) {
+                if (!$state) {
+                    continue;
+                }
+                $definition = ResourcePropertyDefinition::findOneBySql(
+                    "INNER JOIN resource_category_properties rcp
+                    WHERE rcp.category_id = :category_id
+                    AND resource_property_definitions.name = :name",
+                    [
+                        'category_id' => $request->category_id,
+                        'name'        => $name
+                    ]
+                );
+                if (!$definition) {
+                    //Such a property doesn't exist for the specified category.
+                    continue;
+                }
+
+                if ($property_c > 1) {
+                    $sql .= ' OR ';
+                }
+                $sql .= "(rp.property_id = :property_id$property_c ";
+
+                //By looking at the definition we can determine if we have to do
+                //a range search or a search for an exact match.
+                if ($definition->range_search || $name == 'seats') {
+                    $sql .= "AND rp.state >= :property_state$property_c";
+                } else {
+                    $sql .= "AND rp.state = :property_state$property_c";
+                }
+
+                $sql                                    .= ")";
+                $sql_array["property_id$property_c"]    = $definition->id;
+                $sql_array["property_state$property_c"] = $state;
+
+                $property_c++;
+            }
+
+            $sql .= ") ";
+        }
+
+        if (!empty($searchable_rooms)) {
+            $room_ids = [];
+            foreach ($searchable_rooms as $room) {
+                if ($room instanceof Room) {
+                    $room_ids[] = $room->id;
+                }
+            }
+            if ($room_ids) {
+                $sql                   .= "AND resources.id IN ( :room_ids ) ";
+                $sql_array['room_ids'] = $room_ids;
+            } else {
+                //We can't look for non-existing rooms:
+                return [];
+            }
+        }
+
+        $sql .= "GROUP BY resource_id ORDER BY resources.name ASC ";
+
+        $offset = intval($offset);
+        if ($offset > 0) {
+            $sql                 .= "OFFSET :offset ";
+            $sql_array['offset'] = $offset;
+        }
+
+        $limit = intval($limit);
+        if ($limit > 0) {
+            $sql                .= "LIMIT :limit ";
+            $sql_array['limit'] = $limit;
+        }
+
+        return Room::findBySql($sql, $sql_array);
+    }
+
+
+    /**
+     * Determins if the specified room is a room part
+     * and then returns all other room parts.
+     *
+     * @param Room $room The room part whose other room parts shall be found.
+     *
+     * @return Room[] An array of room objects or an empty array
+     *     if no other room parts can be found.
+     */
+    public static function findOtherRoomParts(Room $room)
+    {
+        $other_room_parts = [];
+
+        $separable_room = SeparableRoom::findByRoomPart($room);
+        if ($separable_room instanceof SeparableRoom) {
+            $other_room_parts = $separable_room->findOtherRoomParts(
+                [$room]
+            );
+        }
+
+        return $other_room_parts;
+    }
+
+
+    /**
+     * Helper method to return the SQL code for publicBookingPlansExists,
+     * countByPublicBookingPlans and getByPublicBookingPlans.
+     */
+    protected static function getPublicBookingPlansSql()
+    {
+        return "INNER JOIN resource_categories AS rc
+            ON resources.category_id = rc.id
+        INNER JOIN resource_properties AS rp
+            ON resources.id = rp.resource_id
+        INNER JOIN resource_property_definitions AS rpd
+            USING (property_id)
+        WHERE rc.class_name IN ( :room_class_names )
+            AND rpd.name = 'booking_plan_is_public'
+            AND rp.state = '1'
+        ORDER BY resources.name ASC, resources.mkdate ASC";
+    }
+
+
+    /**
+     * Checks whether rooms with public booking plans exist.
+     *
+     * @return bool True, if at least one room has a public booking plan,
+     *     false otherwise.
+     */
+    public static function publicBookingPlansExists()
+    {
+        return Room::countBySql(
+            self::getPublicBookingPlansSql(),
+            ['room_class_names' => RoomManager::getAllRoomClassNames()]
+        ) > 0;
+    }
+
+
+    /**
+     * Retrieves all rooms that have a public booking plan,
+     * ordered by name and creation date.
+     *
+     * @return array A list of rooms with public booking plans.
+     */
+    public static function findByPublicBookingPlans()
+    {
+        return self::findBySql(
+            self::getPublicBookingPlansSql(),
+            ['room_class_names' => RoomManager::getAllRoomClassNames()]
+        );
+    }
+
+
+    /**
+     * Retrieves all existing room types from the database.
+     * Only room types which have at least one room object with that
+     * type in the database are considered here.
+     *
+     * @return array An array consisting of all room types which
+     *     exist in the database.
+     */
+    public static function getAllRoomTypes()
+    {
+        $db      = DBManager::get();
+        $stmt = $db->prepare(
+            "SELECT DISTINCT state FROM resource_properties
+            INNER JOIN resource_property_definitions rpd
+            USING (property_id)
+            INNER JOIN resource_category_properties rcp
+            USING (property_id)
+            INNER JOIN resource_categories rc
+            ON rcp.category_id = rc.id
+            WHERE
+            state != ''
+            AND
+            rc.class_name IN ( :room_class_names )
+            AND
+            rpd.name = 'room_type'
+            ORDER BY state ASC"
+        );
+        $stmt->execute(
+            ['room_class_names' => RoomManager::getAllRoomClassNames()]
+        );
+        return $stmt->fetchAll(
+            PDO::FETCH_COLUMN,
+            0
+        );
+    }
+
+    /**
+     * Returns the part of the URL for getLink and getURL which will be
+     * placed inside the calls to URLHelper::getLink and URLHelper::getURL
+     * in these methods.
+     *
+     * @param string $action The action for the room.
+     * @param string $id The ID of the room.
+     *
+     * @return string The URL path for the specified action.
+     * @throws InvalidArgumentException If $room_id is empty.
+     *
+     */
+    protected static function buildPathForAction($action = 'show', $id = null)
+    {
+        if (!$id) {
+            throw new InvalidArgumentException(
+                _('Zur Erstellung der URL fehlt eine Raum-ID!')
+            );
+        }
+
+        switch ($action) {
+            case 'show':
+                return 'dispatch.php/resources/room/index/' . $id;
+            case 'add':
+                return 'dispatch.php/resources/room/add';
+            case 'edit':
+                return 'dispatch.php/resources/room/edit/' . $id;
+            case 'delete':
+                return 'dispatch.php/resources/room/delete/' . $id;
+            case 'request':
+                return 'dispatch.php/resources/room_request/add/' . $id;
+            case 'request_list':
+                return 'dispatch.php/resources/room_request/overview?room_id=' . $id;
+            case 'booking_plan':
+                return 'dispatch.php/resources/room_planning/booking_plan/' . $id;
+            default:
+                //There are some actions which can be handled by the general
+                //resource controller:
+                return parent::buildPathForAction($action, $id);
+        }
+    }
+
+
+    /**
+     * Returns the appropriate link for the room action that shall be
+     * executed on a room.
+     *
+     * @param string $action The action which shall be executed.
+     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param string $id The ID of the room on which the specified
+     *     action shall be executed.
+     * @param array $link_parameters Optional parameters for the link.
+     *
+     * @return string The Link for the room action.
+     * @throws InvalidArgumentException If $room_id is empty.
+     *
+     */
+    public static function getLinkForAction($action = 'show', $id = null, $link_parameters = [])
+    {
+        return URLHelper::getLink(
+            self::buildPathForAction($action, $id),
+            $link_parameters
+        );
+    }
+
+
+    /**
+     * Returns the appropriate URL for the room action that shall be
+     * executed on a room.
+     *
+     * @param string $action The action which shall be executed.
+     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param string $id The ID of the room on which the specified
+     *     action shall be executed.
+     * @param array $url_parameters Optional parameters for the URL.
+     *
+     * @return string The URL for the room action.
+     * @throws InvalidArgumentException If $room_id is empty.
+     *
+     */
+    public static function getURLForAction($action = 'show', $id = null, $url_parameters = [])
+    {
+        return URLHelper::getURL(
+            self::buildPathForAction($action, $id),
+            $url_parameters
+        );
+    }
+
+
+    public function cbValidate()
+    {
+        $building = $this->findParentByClassName('Building');
+        if (!$building) {
+            //Rooms must have parents! They have to be placed below buildings!
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Der Raum %1$s ist keinem Gebäude zugeordnet!'),
+                    $this->name
+                )
+            );
+        }
+
+        if (!is_a($this->category->class_name, get_class($this), true)) {
+            //Only resources with the Building category can be handled
+            //with this class!
+            throw new InvalidResourceException(
+                sprintf(
+                    _('Der Raum %1$s ist der falschen Ressourcen-Klasse zugeordnet!'),
+                    $this->name
+                )
+            );
+        }
+        return true;
+    }
+
+    public function cbDeleteClipboardItems()
+    {
+        ClipboardItem::deleteBySQL('range_id = ?', [$this->id]);
+    }
+
+
+    public function getRequiredPropertyNames()
+    {
+        return self::$required_properties;
+    }
+
+
+    /**
+     * @see StudipItem::__toString
+     */
+    public function __toString()
+    {
+        return $this->getFullName();
+    }
+
+
+    /**
+     * This method calls Resource::createRequest and transforms the
+     * resulting ResourceRequest object into a RoomRequest object.
+     *
+     * @return RoomRequest A room request object.
+     * @see Resource::createRequest for paramter descriptions
+     *     and thrown exceptions.
+     * @inheritDoc
+     */
+    public function createRequest(
+        User $user,
+        $date_range_id = null,
+        $comment = '',
+        $properties = [],
+        $preparation_time = 0
+    )
+    {
+        $request = parent::createRequest(
+            $user,
+            $date_range_id,
+            $comment,
+            $properties,
+            $preparation_time
+        );
+
+        return RoomRequest::build($request, false);
+    }
+
+
+    /**
+     * Adds a child resource to this room. The child resource
+     * must not be a resource of the class Room, Building or Location.
+     *
+     * @param Resource $resource The resource which shall be added as child.
+     *
+     * @return bool True, if the resource could be added as child, false otherwise.
+     * @throws InvalidResourceException If the specified resource belongs to
+     *     the resource classes Room, Building or Location.
+     *
+     */
+    public function addChild(Resource $resource)
+    {
+        if ($resource->class_name == $this->class_name) {
+            throw new InvalidResourceException(
+                _('Ein Raum darf keinem anderen Raum in der Hierarchie untergeordnet werden!')
+            );
+        } elseif ($resource->class_name == 'Location') {
+            throw new InvalidResourceException(
+                _('Ein Standort darf keinem Raum in der Hierarchie untergeordnet werden!')
+            );
+        } elseif ($resource->class_name == 'Building') {
+            throw new InvalidResourceException(
+                _('Ein Gebäude darf keinem Raum in der Hierarchie untergeordnet werden!')
+            );
+        }
+        return parent::addChild($resource);
+    }
+
+
+    /**
+     * Returns the full name of this room.
+     *
+     * @return string The full name of this room.
+     */
+    public function getFullName()
+    {
+        return sprintf(
+            _('Raum %s'),
+            $this->name
+        );
+    }
+
+    public function getDefaultPictureUrl()
+    {
+        return $this->getIcon()->asImagePath();
+    }
+
+    public function getIcon($role = Icon::ROLE_INFO)
+    {
+        return Icon::create('room', $role);
+    }
+
+
+    public function checkHierarchy()
+    {
+        //We must check if this room has rooms as children
+        //or as parents. In any of those cases the hierarchy
+        //is invalid!
+
+        $children = $this->findChildrenByClassName('Room');
+        if (count($children) > 0) {
+            //At least one child anywhere below this room
+            //resource is a room, too.
+            return false;
+        }
+
+        $parents = ResourceManager::getHierarchy($this);
+        //We do not need to check this element:
+        array_shift($parents);
+        foreach ($parents as $parent) {
+            $parent = $parent->getDerivedClassInstance();
+            if ($parent instanceof Room) {
+                //Hierarchy error
+                return false;
+            }
+        }
+
+        //If code execution reaches this point then
+        //the hierarchy around this room is valid.
+        return true;
+    }
+
+
+    /**
+     * @see Resource::bookingPlanVisibleForUser
+     * @inheritDoc
+     */
+    public function bookingPlanVisibleForUser(?User $user, $time_range = [])
+    {
+        return $this->booking_plan_is_public
+            || parent::bookingPlanVisibleForUser($user, $time_range);
+    }
+
+
+    /**
+     * Returns the link for an action for this room.
+     * This is the non-static variant of Room::getLinkForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param array $link_parameters Optional parameters for the link.
+     * @return string @TODO
+     */
+    public function getActionLink($action = 'show', $link_parameters = [])
+    {
+        return self::getLinkForAction(
+            $action,
+            $this->id,
+            $link_parameters
+        );
+    }
+
+
+    /**
+     * Returns the URL for an action for this room.
+     * This is the non-static variant of Room::getURLForAction.
+     *
+     * @param string $action The action which shall be executed.
+     *     For rooms the actions 'show', 'booking_plan', 'add', 'edit' and 'delete'
+     *     are defined.
+     * @param array $url_parameters Optional parameters for the URL.
+     * @return string @TODO
+     */
+    public function getActionURL($action = 'show', $url_parameters = [])
+    {
+        return self::getURLForAction(
+            $action,
+            $this->id,
+            $url_parameters
+        );
+    }
+
+
+    /**
+     * Retrieves the building where this room resides in by looking up
+     * the parent resources of this Room.
+     *
+     * @return Building|null A Building object if it can be found,
+     *     null otherwise.
+     */
+    public function findBuilding()
+    {
+        $building = self::findParentByClassName('Building');
+        if ($building instanceof Resource) {
+            return $building->getDerivedClassInstance();
+        }
+        return null;
+    }
+}
diff --git a/lib/models/resources/RoomRequest.class.php b/lib/models/resources/RoomRequest.class.php
deleted file mode 100644
index 6db9c38..0000000
--- a/lib/models/resources/RoomRequest.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * RoomRequest.class.php - model class for table resource_requests
- *
- * 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.
- *
- * @property string $id database column
- * @property string $course_id database column
- * @property string $termin_id database column
- * @property string $metadate_id database column
- * @property string $user_id database column
- * @property string $last_modified_by database column
- * @property string $resource_id database column
- * @property string|null $category_id database column
- * @property string|null $comment database column
- * @property string|null $reply_comment database column
- * @property string $reply_recipients database column
- * @property int $closed database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property int $begin database column
- * @property int $end database column
- * @property int $preparation_time database column
- * @property int $marked database column
- * @property SimpleORMapCollection|ResourceRequestProperty[] $properties has_many ResourceRequestProperty
- * @property SimpleORMapCollection|ResourceRequestAppointment[] $appointments has_many ResourceRequestAppointment
- * @property Room $room belongs_to Room
- * @property Resource $resource belongs_to Resource
- * @property ResourceCategory|null $category belongs_to ResourceCategory
- * @property User $user belongs_to User
- * @property User $last_modifier belongs_to User
- * @property Course $course belongs_to Course
- * @property SeminarCycleDate $cycle belongs_to SeminarCycleDate
- * @property CourseDate $date belongs_to CourseDate
- * @property mixed $seats additional field
- * @property mixed $room_type additional field
- * @property mixed $booking_plan_is_public additional field
- */
-class RoomRequest extends ResourceRequest
-{
-    protected static function configure($config = [])
-    {
-        $config['belongs_to']['room'] = [
-            'class_name'  => Room::class,
-            'foreign_key' => 'resource_id',
-            'assoc_func'  => 'find'
-        ];
-
-        $required_properties = [
-            'seats',
-            'room_type',
-            'booking_plan_is_public'
-        ];
-
-        $config['additional_fields'] = [];
-        foreach ($required_properties as $property) {
-            $config['additional_fields'][$property] = [
-                'get' => 'getProperty',
-                'set' => 'setProperty'
-            ];
-        }
-
-        parent::configure($config);
-
-    }
-
-    public function checkOpen($also_change = false)
-    {
-        $db              = DBManager::get();
-        $existing_assign = false;
-        //a request for a date is easy...
-        if ($this->termin_id) {
-            $query           = sprintf("SELECT id FROM resource_bookings WHERE range_id = %s ", $db->quote($this->termin_id));
-            $existing_assign = $db->query($query)->fetchColumn();
-            //metadate request
-        } elseif ($this->metadate_id) {
-            $query = sprintf("SELECT count(termin_id)=count(resource_bookings.id) FROM termine LEFT JOIN resource_bookings ON(termin_id=resource_bookings.range_id)
-                    WHERE metadate_id=%s", $db->quote($this->metadate_id));
-            //seminar request
-        } else {
-            $query = sprintf("SELECT count(termin_id)=count(resource_bookings.id) FROM termine LEFT JOIN resource_bookings ON(termin_id=resource_bookings.range_id)
-                    WHERE range_id='%s' AND date_typ IN" . getPresenceTypeClause(), $this->course_id);
-        }
-        if ($query) {
-            $existing_assign = $db->query($query)->fetchColumn();
-        }
-
-        if ($existing_assign && $also_change) {
-            $this->closed = 1;
-            $this->store();
-        }
-        return (bool)$existing_assign;
-    }
-}
diff --git a/lib/models/resources/RoomRequest.php b/lib/models/resources/RoomRequest.php
new file mode 100644
index 0000000..6db9c38
--- /dev/null
+++ b/lib/models/resources/RoomRequest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * RoomRequest.class.php - model class for table resource_requests
+ *
+ * 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.
+ *
+ * @property string $id database column
+ * @property string $course_id database column
+ * @property string $termin_id database column
+ * @property string $metadate_id database column
+ * @property string $user_id database column
+ * @property string $last_modified_by database column
+ * @property string $resource_id database column
+ * @property string|null $category_id database column
+ * @property string|null $comment database column
+ * @property string|null $reply_comment database column
+ * @property string $reply_recipients database column
+ * @property int $closed database column
+ * @property int|null $mkdate database column
+ * @property int|null $chdate database column
+ * @property int $begin database column
+ * @property int $end database column
+ * @property int $preparation_time database column
+ * @property int $marked database column
+ * @property SimpleORMapCollection|ResourceRequestProperty[] $properties has_many ResourceRequestProperty
+ * @property SimpleORMapCollection|ResourceRequestAppointment[] $appointments has_many ResourceRequestAppointment
+ * @property Room $room belongs_to Room
+ * @property Resource $resource belongs_to Resource
+ * @property ResourceCategory|null $category belongs_to ResourceCategory
+ * @property User $user belongs_to User
+ * @property User $last_modifier belongs_to User
+ * @property Course $course belongs_to Course
+ * @property SeminarCycleDate $cycle belongs_to SeminarCycleDate
+ * @property CourseDate $date belongs_to CourseDate
+ * @property mixed $seats additional field
+ * @property mixed $room_type additional field
+ * @property mixed $booking_plan_is_public additional field
+ */
+class RoomRequest extends ResourceRequest
+{
+    protected static function configure($config = [])
+    {
+        $config['belongs_to']['room'] = [
+            'class_name'  => Room::class,
+            'foreign_key' => 'resource_id',
+            'assoc_func'  => 'find'
+        ];
+
+        $required_properties = [
+            'seats',
+            'room_type',
+            'booking_plan_is_public'
+        ];
+
+        $config['additional_fields'] = [];
+        foreach ($required_properties as $property) {
+            $config['additional_fields'][$property] = [
+                'get' => 'getProperty',
+                'set' => 'setProperty'
+            ];
+        }
+
+        parent::configure($config);
+
+    }
+
+    public function checkOpen($also_change = false)
+    {
+        $db              = DBManager::get();
+        $existing_assign = false;
+        //a request for a date is easy...
+        if ($this->termin_id) {
+            $query           = sprintf("SELECT id FROM resource_bookings WHERE range_id = %s ", $db->quote($this->termin_id));
+            $existing_assign = $db->query($query)->fetchColumn();
+            //metadate request
+        } elseif ($this->metadate_id) {
+            $query = sprintf("SELECT count(termin_id)=count(resource_bookings.id) FROM termine LEFT JOIN resource_bookings ON(termin_id=resource_bookings.range_id)
+                    WHERE metadate_id=%s", $db->quote($this->metadate_id));
+            //seminar request
+        } else {
+            $query = sprintf("SELECT count(termin_id)=count(resource_bookings.id) FROM termine LEFT JOIN resource_bookings ON(termin_id=resource_bookings.range_id)
+                    WHERE range_id='%s' AND date_typ IN" . getPresenceTypeClause(), $this->course_id);
+        }
+        if ($query) {
+            $existing_assign = $db->query($query)->fetchColumn();
+        }
+
+        if ($existing_assign && $also_change) {
+            $this->closed = 1;
+            $this->store();
+        }
+        return (bool)$existing_assign;
+    }
+}
diff --git a/lib/models/resources/SeparableRoom.class.php b/lib/models/resources/SeparableRoom.class.php
deleted file mode 100644
index 9ec1ccf..0000000
--- a/lib/models/resources/SeparableRoom.class.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-/**
- * SeparableRoom.class.php - model class for a separable room
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property int $id database column
- * @property string $building_id database column
- * @property string $name database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SimpleORMapCollection|SeparableRoomPart[] $parts has_many SeparableRoomPart
- * @property Building $building belongs_to Building
- */
-
-class SeparableRoom extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'separable_rooms';
-
-        $config['belongs_to']['building'] = [
-            'class_name'  => Building::class,
-            'foreign_key' => 'building_id',
-            'assoc_func'  => 'find'
-        ];
-        $config['has_many']['parts']      = [
-            'class_name'        => SeparableRoomPart::class,
-            'assoc_foreign_key' => 'separable_room_id',
-            'on_store'          => 'store',
-            'on_delete'         => 'delete'
-        ];
-
-        parent::configure($config);
-    }
-
-
-    /**
-     *  Creates a SeparableRoom object from a list of room objects.
-     * @param string $building_id
-     * @param array $rooms
-     * @param string $name
-     * @return SeparableRoom|null
-     */
-    public static function createFromRooms(string $building_id, array $rooms = [], $name = '')
-    {
-        if (count($rooms) === 0) {
-            return null;
-        }
-
-        //Check if all array items are room objects:
-        $room_names = [];
-        foreach ($rooms as $room) {
-            if (!($room instanceof Room)) {
-                throw new InvalidArgumentException(
-                    _('Teilbare Räume dürfen nur aus Raum-Objekten bestehen!')
-                );
-            }
-            $room_names[] = $room->name;
-        }
-
-        //Now we can create the separable room:
-        if (!$name) {
-            //First we create a common name from all the room names.
-            $common_name = '';
-            if (count($room_names) > 1) {
-                $name_position     = 0;
-                $current_character = '';
-                //Loop over all rooms until $common_name doesn't grow anymore
-                while ($current_character !== null) {
-                    $current_character = $room_names[0][$name_position];
-                    foreach ($room_names as $room_name) {
-                        if ($room_name[$name_position] != $current_character) {
-                            //At this point the name is diverting.
-                            break 2;
-                        }
-                    }
-                    //The current character is the same for all room names.
-                    $common_name .= $current_character;
-                    $name_position++;
-                }
-            } else {
-                $common_name = $room_names[0];
-            }
-            $name = $common_name;
-        }
-
-        //At this point we have either found the common name
-        //or $common_name is empty.
-
-        $separable_room              = new SeparableRoom();
-        $separable_room->building_id = $building_id;
-        if ($name) {
-            $separable_room->name = $name;
-        } else {
-            $separable_room->name = _('Teilbarer Raum');
-        }
-        if (!$separable_room->store()) {
-            throw new SeparableRoomException(
-                _('Fehler beim Speichern des teilbaren Raumes!')
-            );
-        }
-
-        $successfully_stored = 0;
-        foreach ($rooms as $room) {
-            $part                    = new SeparableRoomPart();
-            $part->separable_room_id = $separable_room->id;
-            $part->room_id           = $room->id;
-            if ($part->store()) {
-                $successfully_stored++;
-            }
-        }
-
-        if ($successfully_stored < count($rooms)) {
-            throw new SeparableRoomException(
-                sprintf(
-                    _('Nur %1$d von %2$d Räumen konnten dem teilbaren Raum zugeordnet werden!'),
-                    $successfully_stored,
-                    count($rooms)
-                )
-            );
-        }
-
-        return $separable_room;
-    }
-
-
-    public static function findByRoomPart(Room $room)
-    {
-        return self::findOneBySql(
-            'INNER JOIN separable_room_parts
-            ON separable_room_parts.separable_room_id = separable_rooms.id
-            WHERE
-            separable_room_parts.room_id = :room_id',
-            [
-                'room_id' => $room->id
-            ]
-        );
-    }
-
-
-    public function findOtherRoomParts(array $known_parts = [])
-    {
-        $known_part_ids = [];
-        foreach ($known_parts as $known_part) {
-            if ($known_part instanceof Room) {
-                $known_part_ids[] = $known_part->id;
-            }
-        }
-
-        $resources = Resource::findBySql(
-            'INNER JOIN separable_room_parts
-            ON resources.id = separable_room_parts.room_id
-            WHERE
-            room_id NOT IN ( :known_part_ids )
-            AND
-            separable_room_id = :separable_room_id',
-            [
-                'known_part_ids'    => $known_part_ids,
-                'separable_room_id' => $this->id
-            ]
-        );
-
-        if (!$resources) {
-            //There are no other room parts.
-            return [];
-        }
-
-        $room_parts = [];
-        foreach ($resources as $resource) {
-            $resource = $resource->getDerivedClassInstance();
-            if ($resource instanceof Room) {
-                $room_parts[] = $resource;
-            }
-        }
-
-        return $room_parts;
-    }
-}
diff --git a/lib/models/resources/SeparableRoom.php b/lib/models/resources/SeparableRoom.php
new file mode 100644
index 0000000..9ec1ccf
--- /dev/null
+++ b/lib/models/resources/SeparableRoom.php
@@ -0,0 +1,190 @@
+<?php
+
+/**
+ * SeparableRoom.class.php - model class for a separable room
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property int $id database column
+ * @property string $building_id database column
+ * @property string $name database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SimpleORMapCollection|SeparableRoomPart[] $parts has_many SeparableRoomPart
+ * @property Building $building belongs_to Building
+ */
+
+class SeparableRoom extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'separable_rooms';
+
+        $config['belongs_to']['building'] = [
+            'class_name'  => Building::class,
+            'foreign_key' => 'building_id',
+            'assoc_func'  => 'find'
+        ];
+        $config['has_many']['parts']      = [
+            'class_name'        => SeparableRoomPart::class,
+            'assoc_foreign_key' => 'separable_room_id',
+            'on_store'          => 'store',
+            'on_delete'         => 'delete'
+        ];
+
+        parent::configure($config);
+    }
+
+
+    /**
+     *  Creates a SeparableRoom object from a list of room objects.
+     * @param string $building_id
+     * @param array $rooms
+     * @param string $name
+     * @return SeparableRoom|null
+     */
+    public static function createFromRooms(string $building_id, array $rooms = [], $name = '')
+    {
+        if (count($rooms) === 0) {
+            return null;
+        }
+
+        //Check if all array items are room objects:
+        $room_names = [];
+        foreach ($rooms as $room) {
+            if (!($room instanceof Room)) {
+                throw new InvalidArgumentException(
+                    _('Teilbare Räume dürfen nur aus Raum-Objekten bestehen!')
+                );
+            }
+            $room_names[] = $room->name;
+        }
+
+        //Now we can create the separable room:
+        if (!$name) {
+            //First we create a common name from all the room names.
+            $common_name = '';
+            if (count($room_names) > 1) {
+                $name_position     = 0;
+                $current_character = '';
+                //Loop over all rooms until $common_name doesn't grow anymore
+                while ($current_character !== null) {
+                    $current_character = $room_names[0][$name_position];
+                    foreach ($room_names as $room_name) {
+                        if ($room_name[$name_position] != $current_character) {
+                            //At this point the name is diverting.
+                            break 2;
+                        }
+                    }
+                    //The current character is the same for all room names.
+                    $common_name .= $current_character;
+                    $name_position++;
+                }
+            } else {
+                $common_name = $room_names[0];
+            }
+            $name = $common_name;
+        }
+
+        //At this point we have either found the common name
+        //or $common_name is empty.
+
+        $separable_room              = new SeparableRoom();
+        $separable_room->building_id = $building_id;
+        if ($name) {
+            $separable_room->name = $name;
+        } else {
+            $separable_room->name = _('Teilbarer Raum');
+        }
+        if (!$separable_room->store()) {
+            throw new SeparableRoomException(
+                _('Fehler beim Speichern des teilbaren Raumes!')
+            );
+        }
+
+        $successfully_stored = 0;
+        foreach ($rooms as $room) {
+            $part                    = new SeparableRoomPart();
+            $part->separable_room_id = $separable_room->id;
+            $part->room_id           = $room->id;
+            if ($part->store()) {
+                $successfully_stored++;
+            }
+        }
+
+        if ($successfully_stored < count($rooms)) {
+            throw new SeparableRoomException(
+                sprintf(
+                    _('Nur %1$d von %2$d Räumen konnten dem teilbaren Raum zugeordnet werden!'),
+                    $successfully_stored,
+                    count($rooms)
+                )
+            );
+        }
+
+        return $separable_room;
+    }
+
+
+    public static function findByRoomPart(Room $room)
+    {
+        return self::findOneBySql(
+            'INNER JOIN separable_room_parts
+            ON separable_room_parts.separable_room_id = separable_rooms.id
+            WHERE
+            separable_room_parts.room_id = :room_id',
+            [
+                'room_id' => $room->id
+            ]
+        );
+    }
+
+
+    public function findOtherRoomParts(array $known_parts = [])
+    {
+        $known_part_ids = [];
+        foreach ($known_parts as $known_part) {
+            if ($known_part instanceof Room) {
+                $known_part_ids[] = $known_part->id;
+            }
+        }
+
+        $resources = Resource::findBySql(
+            'INNER JOIN separable_room_parts
+            ON resources.id = separable_room_parts.room_id
+            WHERE
+            room_id NOT IN ( :known_part_ids )
+            AND
+            separable_room_id = :separable_room_id',
+            [
+                'known_part_ids'    => $known_part_ids,
+                'separable_room_id' => $this->id
+            ]
+        );
+
+        if (!$resources) {
+            //There are no other room parts.
+            return [];
+        }
+
+        $room_parts = [];
+        foreach ($resources as $resource) {
+            $resource = $resource->getDerivedClassInstance();
+            if ($resource instanceof Room) {
+                $room_parts[] = $resource;
+            }
+        }
+
+        return $room_parts;
+    }
+}
diff --git a/lib/models/resources/SeparableRoomPart.class.php b/lib/models/resources/SeparableRoomPart.class.php
deleted file mode 100644
index e7e99e7..0000000
--- a/lib/models/resources/SeparableRoomPart.class.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * SeparableRoomItem.class.php - model class for a separable room item
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2018-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @package     resources
- * @since       4.5
- *
- * @property array $id alias for pk
- * @property int $separable_room_id database column
- * @property string $room_id database column
- * @property int $mkdate database column
- * @property int $chdate database column
- * @property SeparableRoom $separable_room belongs_to SeparableRoom
- * @property Room $room belongs_to Room
- */
-class SeparableRoomPart extends SimpleORMap
-{
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'separable_room_parts';
-
-        $config['belongs_to']['separable_room'] = [
-            'class_name'  => SeparableRoom::class,
-            'foreign_key' => 'separable_room_id',
-            'assoc_func'  => 'find'
-        ];
-        $config['belongs_to']['room']           = [
-            'class_name'  => Room::class,
-            'foreign_key' => 'room_id',
-            'assoc_func'  => 'find'
-        ];
-
-        parent::configure($config);
-    }
-
-    public function getRoomName()
-    {
-        if ($this->room) {
-            return $this->room->name;
-        }
-
-        return '';
-    }
-}
diff --git a/lib/models/resources/SeparableRoomPart.php b/lib/models/resources/SeparableRoomPart.php
new file mode 100644
index 0000000..e7e99e7
--- /dev/null
+++ b/lib/models/resources/SeparableRoomPart.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * SeparableRoomItem.class.php - model class for a separable room item
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2018-2019
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ * @package     resources
+ * @since       4.5
+ *
+ * @property array $id alias for pk
+ * @property int $separable_room_id database column
+ * @property string $room_id database column
+ * @property int $mkdate database column
+ * @property int $chdate database column
+ * @property SeparableRoom $separable_room belongs_to SeparableRoom
+ * @property Room $room belongs_to Room
+ */
+class SeparableRoomPart extends SimpleORMap
+{
+    protected static function configure($config = [])
+    {
+        $config['db_table'] = 'separable_room_parts';
+
+        $config['belongs_to']['separable_room'] = [
+            'class_name'  => SeparableRoom::class,
+            'foreign_key' => 'separable_room_id',
+            'assoc_func'  => 'find'
+        ];
+        $config['belongs_to']['room']           = [
+            'class_name'  => Room::class,
+            'foreign_key' => 'room_id',
+            'assoc_func'  => 'find'
+        ];
+
+        parent::configure($config);
+    }
+
+    public function getRoomName()
+    {
+        if ($this->room) {
+            return $this->room->name;
+        }
+
+        return '';
+    }
+}
diff --git a/lib/modules/Blubber.class.php b/lib/modules/Blubber.class.php
deleted file mode 100644
index 4dd2f99..0000000
--- a/lib/modules/Blubber.class.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/*
- *  Copyright (c) 2012-2019  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-/**
- * Class Blubber - the Blubber-plugin
- * This is only used to manage blubber within a course.
- */
-class Blubber extends CorePlugin implements StudipModule
-{
-    /**
-     * Returns a navigation for the tab displayed in the course.
-     * @param string $course_id of the course
-     * @return \Navigation
-     */
-    public function getTabNavigation($course_id)
-    {
-        $tab = new Navigation(
-            _('Blubber'),
-            'dispatch.php/course/messenger/course'
-        );
-        $tab->setImage(Icon::create('blubber', Icon::ROLE_INFO_ALT));
-        return ['blubber' => $tab];
-    }
-
-    /**
-     * Returns a navigation-object with the grey/red icon for displaying in the
-     * my_courses.php page.
-     * @param string  $course_id
-     * @param int $last_visit
-     * @param string|null  $user_id
-     * @return \Navigation
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id = null)
-    {
-        $user_id || $user_id = $GLOBALS['user']->id;
-        $icon = new Navigation(
-            _('Blubber'),
-            'dispatch.php/course/messenger/course'
-        );
-        $icon->setImage(Icon::create('blubber', Icon::ROLE_CLICKABLE, ['title' => _('Blubber-Messenger')]));
-
-        $condition = "INNER JOIN blubber_threads USING (thread_id)
-                      WHERE blubber_threads.context_type = 'course'
-                        AND blubber_threads.context_id = :course_id
-                        AND blubber_comments.mkdate >= :last_visit
-                        AND blubber_comments.user_id != :me
-                        AND blubber_threads.visible_in_stream = 1
-                        ";
-        $comments = BlubberComment::findBySQL($condition, [
-            'course_id'  => $course_id,
-            'last_visit' => $last_visit,
-            'me'         => $user_id,
-        ]);
-        foreach ($comments as $comment) {
-            if (
-                $comment->thread->isVisibleInStream()
-                && $comment->thread->isReadable()
-                && $comment->thread->getLatestActivity() > $comment->thread->getLastVisit()
-            ) {
-                $icon->setImage(Icon::create('blubber', Icon::ROLE_NEW, ['title' => _('Es gibt neue Blubber')]));
-                $icon->setTitle(_('Es gibt neue Blubber'));
-                $icon->setBadgeNumber(count($comments));
-                $icon->setURL('dispatch.php/course/messenger/course', ['thread' => 'new']);
-                break;
-            }
-        }
-
-        $condition = "context_type = 'course'
-                        AND context_id = :course_id
-                        AND mkdate >= :last_visit
-                        AND user_id != :me
-                        AND visible_in_stream = 1
-                        AND (
-                            blubber_threads.display_class IS NOT NULL
-                            OR blubber_threads.`content` IS NOT NULL
-                        )";
-        $threads = BlubberThread::findBySQL($condition, [
-            'course_id'  => $course_id,
-            'last_visit' => $last_visit,
-            'me'         => $GLOBALS['user']->id,
-        ]);
-        foreach ($threads as $thread) {
-            if (
-                $thread->isVisibleInStream()
-                && $thread->isReadable()
-                && $thread->mkdate > $thread->getLastVisit()
-            ) {
-                $icon->setImage(Icon::create('blubber', Icon::ROLE_ATTENTION, ['title' => _('Es gibt neue Blubber')]));
-                $icon->setTitle(_('Es gibt neue Blubber'));
-                break;
-            }
-        }
-        return $icon;
-    }
-
-    /**
-     * Returns no template, because this plugin doesn't want to insert an
-     * info-template in the course-overview.
-     * @param string $course_id
-     * @return null
-     */
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'displayname' => _('Blubber'),
-            'summary' => _('Schneller Austausch von Informationen in Gesprächsform'),
-            'description' => _('Blubber ist eine Kommunikationsform mit Ähnlichkeiten zu einem Forum, in dem aber in Echtzeit miteinander kommuniziert werden kann und das durch den etwas informelleren Charakter eher einem Chat anmutet. Anders als im Forum ist es nicht notwendig, die Seiten neu zu laden, um die neuesten Einträge (z. B. Antworten auf eigene Postings) sehen zu können: Die Seite aktualisiert sich selbst bei neuen Einträgen. Dateien (z.B. Fotos, Audiodateien, Links) können per Drag and Drop in das Feld gezogen und somit verlinkt werden. Auch Textformatierungen sind möglich.'),
-            'descriptionlong' => _('Kommunikationsform mit Ähnlichkeiten zu einem Forum. Im Gegensatz zum Forum kann mit Blubber jedoch in Echtzeit miteinander kommuniziert werden. Das Tool ähnelt durch den etwas informelleren Charakter einem Messenger. Anders als im Forum ist es nicht notwendig, die Seiten neu zu laden, um die neuesten Einträge (z. B. Antworten auf eigene Postings) sehen zu können. Dateien (z. B. Fotos, Audiodateien, Links) können per drag and drop in das Feld gezogen und somit verlinkt werden. Auch Textformatierungen sind möglich.'),
-            'category' => _('Kommunikation und Zusammenarbeit'),
-            'keywords' => _('Einfach Text schreiben und mit <Enter> abschicken; Direktes Kontaktieren anderer Stud.IP-NutzerInnen (@Vorname Nachname); Setzen von und Suche nach Stichworten über Hashtags (#Stichwort); Einbinden von Dateien per drag and drop'),
-            'icon' => Icon::create('blubber', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('blubber', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Blubber',
-                'pictures' => [
-                    ['source' => 'blubberscreenshot.png', 'title' => 'Blubbern']
-                ]
-            ]
-        ];
-    }
-}
diff --git a/lib/modules/Blubber.php b/lib/modules/Blubber.php
new file mode 100644
index 0000000..4dd2f99
--- /dev/null
+++ b/lib/modules/Blubber.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ *  Copyright (c) 2012-2019  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+/**
+ * Class Blubber - the Blubber-plugin
+ * This is only used to manage blubber within a course.
+ */
+class Blubber extends CorePlugin implements StudipModule
+{
+    /**
+     * Returns a navigation for the tab displayed in the course.
+     * @param string $course_id of the course
+     * @return \Navigation
+     */
+    public function getTabNavigation($course_id)
+    {
+        $tab = new Navigation(
+            _('Blubber'),
+            'dispatch.php/course/messenger/course'
+        );
+        $tab->setImage(Icon::create('blubber', Icon::ROLE_INFO_ALT));
+        return ['blubber' => $tab];
+    }
+
+    /**
+     * Returns a navigation-object with the grey/red icon for displaying in the
+     * my_courses.php page.
+     * @param string  $course_id
+     * @param int $last_visit
+     * @param string|null  $user_id
+     * @return \Navigation
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id = null)
+    {
+        $user_id || $user_id = $GLOBALS['user']->id;
+        $icon = new Navigation(
+            _('Blubber'),
+            'dispatch.php/course/messenger/course'
+        );
+        $icon->setImage(Icon::create('blubber', Icon::ROLE_CLICKABLE, ['title' => _('Blubber-Messenger')]));
+
+        $condition = "INNER JOIN blubber_threads USING (thread_id)
+                      WHERE blubber_threads.context_type = 'course'
+                        AND blubber_threads.context_id = :course_id
+                        AND blubber_comments.mkdate >= :last_visit
+                        AND blubber_comments.user_id != :me
+                        AND blubber_threads.visible_in_stream = 1
+                        ";
+        $comments = BlubberComment::findBySQL($condition, [
+            'course_id'  => $course_id,
+            'last_visit' => $last_visit,
+            'me'         => $user_id,
+        ]);
+        foreach ($comments as $comment) {
+            if (
+                $comment->thread->isVisibleInStream()
+                && $comment->thread->isReadable()
+                && $comment->thread->getLatestActivity() > $comment->thread->getLastVisit()
+            ) {
+                $icon->setImage(Icon::create('blubber', Icon::ROLE_NEW, ['title' => _('Es gibt neue Blubber')]));
+                $icon->setTitle(_('Es gibt neue Blubber'));
+                $icon->setBadgeNumber(count($comments));
+                $icon->setURL('dispatch.php/course/messenger/course', ['thread' => 'new']);
+                break;
+            }
+        }
+
+        $condition = "context_type = 'course'
+                        AND context_id = :course_id
+                        AND mkdate >= :last_visit
+                        AND user_id != :me
+                        AND visible_in_stream = 1
+                        AND (
+                            blubber_threads.display_class IS NOT NULL
+                            OR blubber_threads.`content` IS NOT NULL
+                        )";
+        $threads = BlubberThread::findBySQL($condition, [
+            'course_id'  => $course_id,
+            'last_visit' => $last_visit,
+            'me'         => $GLOBALS['user']->id,
+        ]);
+        foreach ($threads as $thread) {
+            if (
+                $thread->isVisibleInStream()
+                && $thread->isReadable()
+                && $thread->mkdate > $thread->getLastVisit()
+            ) {
+                $icon->setImage(Icon::create('blubber', Icon::ROLE_ATTENTION, ['title' => _('Es gibt neue Blubber')]));
+                $icon->setTitle(_('Es gibt neue Blubber'));
+                break;
+            }
+        }
+        return $icon;
+    }
+
+    /**
+     * Returns no template, because this plugin doesn't want to insert an
+     * info-template in the course-overview.
+     * @param string $course_id
+     * @return null
+     */
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'displayname' => _('Blubber'),
+            'summary' => _('Schneller Austausch von Informationen in Gesprächsform'),
+            'description' => _('Blubber ist eine Kommunikationsform mit Ähnlichkeiten zu einem Forum, in dem aber in Echtzeit miteinander kommuniziert werden kann und das durch den etwas informelleren Charakter eher einem Chat anmutet. Anders als im Forum ist es nicht notwendig, die Seiten neu zu laden, um die neuesten Einträge (z. B. Antworten auf eigene Postings) sehen zu können: Die Seite aktualisiert sich selbst bei neuen Einträgen. Dateien (z.B. Fotos, Audiodateien, Links) können per Drag and Drop in das Feld gezogen und somit verlinkt werden. Auch Textformatierungen sind möglich.'),
+            'descriptionlong' => _('Kommunikationsform mit Ähnlichkeiten zu einem Forum. Im Gegensatz zum Forum kann mit Blubber jedoch in Echtzeit miteinander kommuniziert werden. Das Tool ähnelt durch den etwas informelleren Charakter einem Messenger. Anders als im Forum ist es nicht notwendig, die Seiten neu zu laden, um die neuesten Einträge (z. B. Antworten auf eigene Postings) sehen zu können. Dateien (z. B. Fotos, Audiodateien, Links) können per drag and drop in das Feld gezogen und somit verlinkt werden. Auch Textformatierungen sind möglich.'),
+            'category' => _('Kommunikation und Zusammenarbeit'),
+            'keywords' => _('Einfach Text schreiben und mit <Enter> abschicken; Direktes Kontaktieren anderer Stud.IP-NutzerInnen (@Vorname Nachname); Setzen von und Suche nach Stichworten über Hashtags (#Stichwort); Einbinden von Dateien per drag and drop'),
+            'icon' => Icon::create('blubber', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('blubber', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Blubber',
+                'pictures' => [
+                    ['source' => 'blubberscreenshot.png', 'title' => 'Blubbern']
+                ]
+            ]
+        ];
+    }
+}
diff --git a/lib/modules/ConsultationModule.class.php b/lib/modules/ConsultationModule.class.php
deleted file mode 100644
index c68f8ca..0000000
--- a/lib/modules/ConsultationModule.class.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- */
-class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugin, PrivacyPlugin, HomepagePlugin
-{
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Update consultation events for the course when a member changes
-        foreach (['UserDidEnterCourse', 'UserDidLeaveCourse'] as $event) {
-            NotificationCenter::on($event, function ($event, $course_id) {
-                $course = Course::find($course_id);
-                if ($course) {
-                    ConsultationSlot::findEachBySQL(
-                        function (ConsultationSlot $slot) {
-                            $slot->updateEvents();
-                        },
-                        "JOIN consultation_blocks USING (block_id)
-                         WHERE range_id = ? AND range_type = 'course'",
-                        [$course_id]
-                    );
-                }
-            });
-        }
-
-        // Update consultation events for the course when a member changes
-        foreach (['InstituteMemberDidCreate', 'InstituteMemberDidDelete'] as $event) {
-            NotificationCenter::on($event, function ($event, InstituteMember $member) {
-                ConsultationSlot::findEachBySQL(
-                    function (ConsultationSlot $slot) {
-                        $slot->updateEvents();
-                    },
-                    "JOIN consultation_blocks USING (block_id)
-                      WHERE range_id = ? AND range_type = 'institute'",
-                    [$member->institut_id]
-                );
-            });
-        }
-
-        NotificationCenter::on('UserDidLeaveCourse', function ($event, $course_id) {
-            // Delete consultation events for the user and course
-            $course = Course::find($course_id);
-            if ($course) {
-                ConsultationSlot::findEachBySQL(
-                    function (ConsultationSlot $slot) {
-                        $slot->updateEvents();
-                    },
-                    "JOIN consultation_blocks USING (block_id)
-                     WHERE range_id = ? AND range_type = 'course'",
-                    [$course_id]
-                );
-            }
-        });
-
-        NotificationCenter::on('UserDidDelete', function ($event, $user) {
-            // Delete consultation bookings and slots
-            ConsultationBooking::deleteByUser_id($user->id);
-            ConsultationBlock::deleteBySQL("range_id = ? AND range_type = 'user'", [$user->id]);
-        });
-        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
-            // Delete consultation blocks
-            ConsultationBlock::deleteBySQL("range_id = ? AND range_type = 'course'", [$course->id]);
-        });
-        NotificationCenter::on('InstituteDidDelete', function ($event, $institute) {
-            // Delete consultation blocks
-            ConsultationBlock::deleteBySQL("range_id = ? AND range_type = 'institute'", [$institute->id]);
-        });
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isActivatableForContext(Range $context)
-    {
-        // Consultations globally disabled?
-        if (!Config::get()->CONSULTATION_ENABLED) {
-            return false;
-        }
-
-        // Context is user and current user has required permission?
-        if ($context instanceof User) {
-            return $GLOBALS['perm']->have_perm(Config::get()->CONSULTATION_REQUIRED_PERMISSION, $context->getRangeId());
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        // TODO
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if ($GLOBALS['user']->id !== 'nobody') {
-            $navigation = new ConsultationNavigation(RangeFactory::find($course_id));
-            $navigation->setImage(Icon::create('consultation', Icon::ROLE_INFO_ALT));
-            return ['consultation' => $navigation];
-        }
-
-        return [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHomepageTemplate($user_id)
-    {
-        return null;
-    }
-
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary'     => _('Generische Terminvergabe'),
-            'description' => _('Über die generische Terminvergabe können jegliche Formen von Terminen ' .
-                               'angeboten werden, zu denen sich Personen oder auch Gruppen von Personen ' .
-                               'anmelden können.'),
-            'category'    => _('Kommunikation und Zusammenarbeit'),
-            'keywords'    => _('Terminvergabe, Sprechstunden'),
-            'displayname' => _('Terminvergabe'),
-            'icon'        => Icon::create('consultation', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('consultation', Icon::ROLE_CLICKABLE),
-             'screenshots' => [
-                 'path'     => 'assets/images/plus/screenshots/Terminvergabe',
-                 'pictures' => [
-                     [
-                         'source' => 'uebersicht.png',
-                         'title'  => _('Übersicht der erstellten Termine'),
-                     ],
-                     [
-                         'source' => 'anlegen.png',
-                         'title'  => _('Erstellen neuer Termine'),
-                     ],
-                 ]
-             ]
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exportUserData(StoredUserData $storage)
-    {
-        $storage->addTabularData(
-            _('Terminblöcke'),
-            'consultation_blocks',
-            ConsultationBlock::findAndMapBySQL(
-                function ($block) {
-                    return $block->toRawArray();
-                },
-                "range_id = :user_id AND range_type = 'user'",
-                [':user_id' => $storage->user_id]
-            )
-        );
-        $storage->addTabularData(
-            _('Terminbuchungen'),
-            'consultation_bookings',
-            ConsultationBooking::findAndMapBySQL(
-                function ($booking) {
-                    return $booking->toRawArray();
-                },
-                'user_id = :user_id',
-                [':user_id' => $storage->user_id]
-            )
-        );
-        $storage->addTabularData(
-            _('Terminverantwortlichkeiten'),
-            'consultation_responsibilities',
-            ConsultationResponsibility::findAndMapBySQL(
-                function ($responsibility) {
-                    return $responsibility->toRawArray();
-                },
-                "range_id = :user_id AND range_type = 'user'",
-                [':user_id' => $storage->user_id]
-            )
-        );
-    }
-}
diff --git a/lib/modules/ConsultationModule.php b/lib/modules/ConsultationModule.php
new file mode 100644
index 0000000..c68f8ca
--- /dev/null
+++ b/lib/modules/ConsultationModule.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @license GPL2 or any later version
+ */
+class ConsultationModule extends CorePlugin implements StudipModule, SystemPlugin, PrivacyPlugin, HomepagePlugin
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        // Update consultation events for the course when a member changes
+        foreach (['UserDidEnterCourse', 'UserDidLeaveCourse'] as $event) {
+            NotificationCenter::on($event, function ($event, $course_id) {
+                $course = Course::find($course_id);
+                if ($course) {
+                    ConsultationSlot::findEachBySQL(
+                        function (ConsultationSlot $slot) {
+                            $slot->updateEvents();
+                        },
+                        "JOIN consultation_blocks USING (block_id)
+                         WHERE range_id = ? AND range_type = 'course'",
+                        [$course_id]
+                    );
+                }
+            });
+        }
+
+        // Update consultation events for the course when a member changes
+        foreach (['InstituteMemberDidCreate', 'InstituteMemberDidDelete'] as $event) {
+            NotificationCenter::on($event, function ($event, InstituteMember $member) {
+                ConsultationSlot::findEachBySQL(
+                    function (ConsultationSlot $slot) {
+                        $slot->updateEvents();
+                    },
+                    "JOIN consultation_blocks USING (block_id)
+                      WHERE range_id = ? AND range_type = 'institute'",
+                    [$member->institut_id]
+                );
+            });
+        }
+
+        NotificationCenter::on('UserDidLeaveCourse', function ($event, $course_id) {
+            // Delete consultation events for the user and course
+            $course = Course::find($course_id);
+            if ($course) {
+                ConsultationSlot::findEachBySQL(
+                    function (ConsultationSlot $slot) {
+                        $slot->updateEvents();
+                    },
+                    "JOIN consultation_blocks USING (block_id)
+                     WHERE range_id = ? AND range_type = 'course'",
+                    [$course_id]
+                );
+            }
+        });
+
+        NotificationCenter::on('UserDidDelete', function ($event, $user) {
+            // Delete consultation bookings and slots
+            ConsultationBooking::deleteByUser_id($user->id);
+            ConsultationBlock::deleteBySQL("range_id = ? AND range_type = 'user'", [$user->id]);
+        });
+        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
+            // Delete consultation blocks
+            ConsultationBlock::deleteBySQL("range_id = ? AND range_type = 'course'", [$course->id]);
+        });
+        NotificationCenter::on('InstituteDidDelete', function ($event, $institute) {
+            // Delete consultation blocks
+            ConsultationBlock::deleteBySQL("range_id = ? AND range_type = 'institute'", [$institute->id]);
+        });
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isActivatableForContext(Range $context)
+    {
+        // Consultations globally disabled?
+        if (!Config::get()->CONSULTATION_ENABLED) {
+            return false;
+        }
+
+        // Context is user and current user has required permission?
+        if ($context instanceof User) {
+            return $GLOBALS['perm']->have_perm(Config::get()->CONSULTATION_REQUIRED_PERMISSION, $context->getRangeId());
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        // TODO
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if ($GLOBALS['user']->id !== 'nobody') {
+            $navigation = new ConsultationNavigation(RangeFactory::find($course_id));
+            $navigation->setImage(Icon::create('consultation', Icon::ROLE_INFO_ALT));
+            return ['consultation' => $navigation];
+        }
+
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHomepageTemplate($user_id)
+    {
+        return null;
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary'     => _('Generische Terminvergabe'),
+            'description' => _('Über die generische Terminvergabe können jegliche Formen von Terminen ' .
+                               'angeboten werden, zu denen sich Personen oder auch Gruppen von Personen ' .
+                               'anmelden können.'),
+            'category'    => _('Kommunikation und Zusammenarbeit'),
+            'keywords'    => _('Terminvergabe, Sprechstunden'),
+            'displayname' => _('Terminvergabe'),
+            'icon'        => Icon::create('consultation', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('consultation', Icon::ROLE_CLICKABLE),
+             'screenshots' => [
+                 'path'     => 'assets/images/plus/screenshots/Terminvergabe',
+                 'pictures' => [
+                     [
+                         'source' => 'uebersicht.png',
+                         'title'  => _('Übersicht der erstellten Termine'),
+                     ],
+                     [
+                         'source' => 'anlegen.png',
+                         'title'  => _('Erstellen neuer Termine'),
+                     ],
+                 ]
+             ]
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function exportUserData(StoredUserData $storage)
+    {
+        $storage->addTabularData(
+            _('Terminblöcke'),
+            'consultation_blocks',
+            ConsultationBlock::findAndMapBySQL(
+                function ($block) {
+                    return $block->toRawArray();
+                },
+                "range_id = :user_id AND range_type = 'user'",
+                [':user_id' => $storage->user_id]
+            )
+        );
+        $storage->addTabularData(
+            _('Terminbuchungen'),
+            'consultation_bookings',
+            ConsultationBooking::findAndMapBySQL(
+                function ($booking) {
+                    return $booking->toRawArray();
+                },
+                'user_id = :user_id',
+                [':user_id' => $storage->user_id]
+            )
+        );
+        $storage->addTabularData(
+            _('Terminverantwortlichkeiten'),
+            'consultation_responsibilities',
+            ConsultationResponsibility::findAndMapBySQL(
+                function ($responsibility) {
+                    return $responsibility->toRawArray();
+                },
+                "range_id = :user_id AND range_type = 'user'",
+                [':user_id' => $storage->user_id]
+            )
+        );
+    }
+}
diff --git a/lib/modules/CoreAdmin.class.php b/lib/modules/CoreAdmin.class.php
deleted file mode 100644
index 4bf1880..0000000
--- a/lib/modules/CoreAdmin.class.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-class CoreAdmin extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        $navigation = new Navigation(_('Verwaltung'), 'dispatch.php/course/management');
-        $navigation->setImage(Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => _('Verwaltung')]));
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
-            $navigation = new Navigation(_('Verwaltung'));
-            $navigation->setImage(Icon::create('admin', Icon::ROLE_INFO_ALT));
-            $navigation->setActiveImage(Icon::create('admin', Icon::ROLE_INFO));
-
-            $main = new Navigation(_('Werkzeuge'), 'dispatch.php/course/contentmodules');
-            $navigation->addSubNavigation('contentmodules', $main);
-
-            if (!Context::isInstitute()) {
-                $item = new Navigation(_('Grunddaten'), 'dispatch.php/course/basicdata/view/' . $course_id);
-                $item->setImage(Icon::create('edit'));
-                $item->setDescription(_('Bearbeiten der Grundeinstellungen dieser Veranstaltung.'));
-                $navigation->addSubNavigation('details', $item);
-
-                $item = new Navigation(_('Infobild'), 'dispatch.php/avatar/update/course/' . $course_id);
-                $item->setImage(Icon::create('file-pic'));
-                $item->setDescription(_('Infobild dieser Veranstaltung bearbeiten oder löschen.'));
-                $navigation->addSubNavigation('avatar', $item);
-
-                $item = new Navigation(_('Studienbereiche'), 'dispatch.php/course/study_areas/show/' . $course_id);
-                $item->setImage(Icon::create('module'));
-                $item->setDescription(_('Zuordnung dieser Veranstaltung zu Studienbereichen für die Darstellung im Verzeichnis aller Veranstaltungen.'));
-                $navigation->addSubNavigation('study_areas', $item);
-
-                $current_course = Course::find($course_id);
-                if ($current_course && $current_course->getSemClass()->offsetGet('module')) {
-                    $item = new Navigation(_('LV-Gruppen'), 'dispatch.php/course/lvgselector/index/' . $course_id, ['list' => 'TRUE']);
-                    $item->setImage(Icon::create('learnmodule'));
-                    $item->setDescription(_('Zuordnung der Veranstaltung zu Lehrveranstaltungsgruppen um die Einordnung innerhalb des Modulverzeichnisses festzulegen.'));
-                    $navigation->addSubNavigation('lvgruppen', $item);
-                }
-
-                $item = new Navigation(_('Zeiten/Räume'), 'dispatch.php/course/timesrooms');
-                $item->setImage(Icon::create('date'));
-                $item->setDescription(_('Regelmäßige Veranstaltungszeiten, Einzeltermine und Ortsangaben ändern.'));
-                $navigation->addSubNavigation('dates', $item);
-
-                $item = new Navigation(_('Zugangsberechtigungen'), 'dispatch.php/course/admission');
-                $item->setImage(Icon::create('lock-locked'));
-                $item->setDescription(_('Zugangsbeschränkungen, Anmeldeverfahren oder einen Passwortschutz für diese Veranstaltung einrichten.'));
-                $navigation->addSubNavigation('admission', $item);
-
-                $item = new AutoNavigation(_('Zusatzangaben'), 'dispatch.php/admin/additional');
-                $item->setImage(Icon::create('add'));
-                $item->setDescription(_('Vorlagen zur Erhebung weiterer Angaben von Teilnehmenden auswählen.'));
-                $navigation->addSubNavigation('additional_data', $item);
-
-            }  // endif modules only seminars
-
-            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
-                if (Config::get()->VOTE_ENABLE) {
-                    $item = new Navigation(_('Fragebögen'), 'dispatch.php/questionnaire/courseoverview');
-                    $item->setImage(Icon::create('vote'));
-                    $item->setDescription(_('Erstellen und bearbeiten von Fragebögen.'));
-                    $navigation->addSubNavigation('questionnaires', $item);
-                }
-            }
-
-            /*
-             * Is the current SemClass available for grouping other courses?
-             * -> show child management
-             */
-            $course = Course::find($course_id);
-            if ($course) {
-                $c = $course->getSemClass();
-                if ($c->isGroup()) {
-
-                    $item = new Navigation(_('Unterveranstaltungen'), 'dispatch.php/course/grouping/children');
-                    $item->setImage(Icon::create('group', Icon::ROLE_INFO_ALT));
-                    $item->setActiveImage(Icon::create('group', Icon::ROLE_INFO));
-                    $item->setDescription(_('Ordnen Sie dieser Veranstaltung eine oder mehrere Unterveranstaltungen zu.'));
-                    $navigation->addSubNavigation('children', $item);
-
-                /*
-                 * Check if any SemClasses with grouping functionality exist at all
-                 * -> show parent assignment.
-                 */
-                } else if (count(SemClass::getGroupClasses()) > 0) {
-
-                    $item = new Navigation(_('Zuordnung zu Hauptveranstaltung'), 'dispatch.php/course/grouping/parent');
-                    $item->setImage(Icon::create('group', Icon::ROLE_INFO_ALT));
-                    $item->setActiveImage(Icon::create('group', Icon::ROLE_INFO));
-                    $item->setDescription(_('Ordnen Sie diese Veranstaltung einer bestehenden ' .
-                        'Hauptveranstaltung zu oder lösen Sie eine bestehende Zuordnung.'));
-                    $navigation->addSubNavigation('parent', $item);
-
-                }
-            }
-
-            return ['admin' => $navigation];
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'displayname' => _('Verwaltung')
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return false;
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-}
diff --git a/lib/modules/CoreAdmin.php b/lib/modules/CoreAdmin.php
new file mode 100644
index 0000000..4bf1880
--- /dev/null
+++ b/lib/modules/CoreAdmin.php
@@ -0,0 +1,142 @@
+<?php
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+class CoreAdmin extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        $navigation = new Navigation(_('Verwaltung'), 'dispatch.php/course/management');
+        $navigation->setImage(Icon::create('admin', Icon::ROLE_CLICKABLE, ['title' => _('Verwaltung')]));
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
+            $navigation = new Navigation(_('Verwaltung'));
+            $navigation->setImage(Icon::create('admin', Icon::ROLE_INFO_ALT));
+            $navigation->setActiveImage(Icon::create('admin', Icon::ROLE_INFO));
+
+            $main = new Navigation(_('Werkzeuge'), 'dispatch.php/course/contentmodules');
+            $navigation->addSubNavigation('contentmodules', $main);
+
+            if (!Context::isInstitute()) {
+                $item = new Navigation(_('Grunddaten'), 'dispatch.php/course/basicdata/view/' . $course_id);
+                $item->setImage(Icon::create('edit'));
+                $item->setDescription(_('Bearbeiten der Grundeinstellungen dieser Veranstaltung.'));
+                $navigation->addSubNavigation('details', $item);
+
+                $item = new Navigation(_('Infobild'), 'dispatch.php/avatar/update/course/' . $course_id);
+                $item->setImage(Icon::create('file-pic'));
+                $item->setDescription(_('Infobild dieser Veranstaltung bearbeiten oder löschen.'));
+                $navigation->addSubNavigation('avatar', $item);
+
+                $item = new Navigation(_('Studienbereiche'), 'dispatch.php/course/study_areas/show/' . $course_id);
+                $item->setImage(Icon::create('module'));
+                $item->setDescription(_('Zuordnung dieser Veranstaltung zu Studienbereichen für die Darstellung im Verzeichnis aller Veranstaltungen.'));
+                $navigation->addSubNavigation('study_areas', $item);
+
+                $current_course = Course::find($course_id);
+                if ($current_course && $current_course->getSemClass()->offsetGet('module')) {
+                    $item = new Navigation(_('LV-Gruppen'), 'dispatch.php/course/lvgselector/index/' . $course_id, ['list' => 'TRUE']);
+                    $item->setImage(Icon::create('learnmodule'));
+                    $item->setDescription(_('Zuordnung der Veranstaltung zu Lehrveranstaltungsgruppen um die Einordnung innerhalb des Modulverzeichnisses festzulegen.'));
+                    $navigation->addSubNavigation('lvgruppen', $item);
+                }
+
+                $item = new Navigation(_('Zeiten/Räume'), 'dispatch.php/course/timesrooms');
+                $item->setImage(Icon::create('date'));
+                $item->setDescription(_('Regelmäßige Veranstaltungszeiten, Einzeltermine und Ortsangaben ändern.'));
+                $navigation->addSubNavigation('dates', $item);
+
+                $item = new Navigation(_('Zugangsberechtigungen'), 'dispatch.php/course/admission');
+                $item->setImage(Icon::create('lock-locked'));
+                $item->setDescription(_('Zugangsbeschränkungen, Anmeldeverfahren oder einen Passwortschutz für diese Veranstaltung einrichten.'));
+                $navigation->addSubNavigation('admission', $item);
+
+                $item = new AutoNavigation(_('Zusatzangaben'), 'dispatch.php/admin/additional');
+                $item->setImage(Icon::create('add'));
+                $item->setDescription(_('Vorlagen zur Erhebung weiterer Angaben von Teilnehmenden auswählen.'));
+                $navigation->addSubNavigation('additional_data', $item);
+
+            }  // endif modules only seminars
+
+            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
+                if (Config::get()->VOTE_ENABLE) {
+                    $item = new Navigation(_('Fragebögen'), 'dispatch.php/questionnaire/courseoverview');
+                    $item->setImage(Icon::create('vote'));
+                    $item->setDescription(_('Erstellen und bearbeiten von Fragebögen.'));
+                    $navigation->addSubNavigation('questionnaires', $item);
+                }
+            }
+
+            /*
+             * Is the current SemClass available for grouping other courses?
+             * -> show child management
+             */
+            $course = Course::find($course_id);
+            if ($course) {
+                $c = $course->getSemClass();
+                if ($c->isGroup()) {
+
+                    $item = new Navigation(_('Unterveranstaltungen'), 'dispatch.php/course/grouping/children');
+                    $item->setImage(Icon::create('group', Icon::ROLE_INFO_ALT));
+                    $item->setActiveImage(Icon::create('group', Icon::ROLE_INFO));
+                    $item->setDescription(_('Ordnen Sie dieser Veranstaltung eine oder mehrere Unterveranstaltungen zu.'));
+                    $navigation->addSubNavigation('children', $item);
+
+                /*
+                 * Check if any SemClasses with grouping functionality exist at all
+                 * -> show parent assignment.
+                 */
+                } else if (count(SemClass::getGroupClasses()) > 0) {
+
+                    $item = new Navigation(_('Zuordnung zu Hauptveranstaltung'), 'dispatch.php/course/grouping/parent');
+                    $item->setImage(Icon::create('group', Icon::ROLE_INFO_ALT));
+                    $item->setActiveImage(Icon::create('group', Icon::ROLE_INFO));
+                    $item->setDescription(_('Ordnen Sie diese Veranstaltung einer bestehenden ' .
+                        'Hauptveranstaltung zu oder lösen Sie eine bestehende Zuordnung.'));
+                    $navigation->addSubNavigation('parent', $item);
+
+                }
+            }
+
+            return ['admin' => $navigation];
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'displayname' => _('Verwaltung')
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return false;
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+}
diff --git a/lib/modules/CoreCalendar.class.php b/lib/modules/CoreCalendar.class.php
deleted file mode 100644
index 318a2ba..0000000
--- a/lib/modules/CoreCalendar.class.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreCalendar extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        if (!Config::get()->CALENDAR_GROUP_ENABLE) {
-            return null;
-        }
-
-        $navigation = new Navigation(_('Kalender'), URLHelper::getURL('dispatch.php/calendar/calendar/course/' . $course_id));
-        $navigation->setImage(Icon::create('schedule', Icon::ROLE_CLICKABLE));
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if (!Config::get()->CALENDAR_GROUP_ENABLE) {
-            return null;
-        }
-
-        $navigation = new Navigation(_('Kalender'), 'dispatch.php/calendar/calendar/course/' . $course_id);
-        $navigation->setImage(Icon::create('schedule', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('schedule', Icon::ROLE_INFO));
-        return ['calendar' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Kalender'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'icon' => Icon::create('schedule', Icon::ROLE_INFO),
-            'displayname' => _('Kalender'),
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return Config::get()->CALENDAR_GROUP_ENABLE && $context->getRangeType() === 'course';
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-}
diff --git a/lib/modules/CoreCalendar.php b/lib/modules/CoreCalendar.php
new file mode 100644
index 0000000..318a2ba
--- /dev/null
+++ b/lib/modules/CoreCalendar.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreCalendar extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        if (!Config::get()->CALENDAR_GROUP_ENABLE) {
+            return null;
+        }
+
+        $navigation = new Navigation(_('Kalender'), URLHelper::getURL('dispatch.php/calendar/calendar/course/' . $course_id));
+        $navigation->setImage(Icon::create('schedule', Icon::ROLE_CLICKABLE));
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if (!Config::get()->CALENDAR_GROUP_ENABLE) {
+            return null;
+        }
+
+        $navigation = new Navigation(_('Kalender'), 'dispatch.php/calendar/calendar/course/' . $course_id);
+        $navigation->setImage(Icon::create('schedule', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('schedule', Icon::ROLE_INFO));
+        return ['calendar' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Kalender'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'icon' => Icon::create('schedule', Icon::ROLE_INFO),
+            'displayname' => _('Kalender'),
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return Config::get()->CALENDAR_GROUP_ENABLE && $context->getRangeType() === 'course';
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+}
diff --git a/lib/modules/CoreDocuments.class.php b/lib/modules/CoreDocuments.class.php
deleted file mode 100644
index 2acfeef..0000000
--- a/lib/modules/CoreDocuments.class.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreDocuments extends CorePlugin implements StudipModule, OERModule
-{
-
-
-    /**
-     * Determines if the StudipModule wants to handle the OERMaterial. Returns false if not.
-     * @param OERMaterial $material
-     * @return false|Icon
-     */
-    static public function oerModuleWantsToUseMaterial(OERMaterial $material)
-    {
-        return true;
-    }
-
-    /**
-     * Returns an Icon class object with the given role.
-     * @param string $role
-     * @return null|Icon
-     */
-    public function oerGetIcon($role = Icon::ROLE_CLICKABLE)
-    {
-        return Icon::create("file", $role);
-    }
-
-    /**
-     * This function is triggered i a user chose to use this module as the target of the oermaterial.
-     * Now this module should put a copy of $material in its own area of the given course.
-     * @param OERMaterial $material
-     * @param Course $course
-     * @return array|FileType
-     */
-    static public function oerModuleIntegrateMaterialToCourse(OERMaterial $material, Course $course)
-    {
-        $folder = Folder::findTopFolder($course->id);
-        $folder = $folder->getTypedFolder();
-        $uploaded_file = [
-            'name' => $material['filename'],
-            'type' => $material['content_type'],
-            'content_terms_of_use_id' => "FREE_LICENSE",
-            'description' => $material['description']
-        ];
-        $url = $material->getDownloadUrl();
-        if ($url) {
-            if ($material['host_id']) {
-                $tmp_name = $GLOBALS['TMP_PATH'] . '/oer_' . $material->getId();
-                file_put_contents($tmp_name, file_get_contents($url, false, get_default_http_stream_context($url)));
-                $uploaded_file['tmp_name'] = $tmp_name;
-                $uploaded_file['type'] = filesize($tmp_name);
-            } else {
-                $uploaded_file['tmp_name'] = $material->getFilePath();
-                $uploaded_file['size'] = filesize($material->getFilePath());
-            }
-
-            $standardfile = StandardFile::create($uploaded_file);
-        } elseif($material['source_url']) {
-            $standardfile = URLFile::create([
-                'url' => $material['source_url'],
-                'name' => $material['name'],
-                'author_name' => implode(', ', array_map(function ($a) { return $a['name']; }, $material)),
-                'description' => $material['description'],
-                'content_terms_of_use_id' => "FREE_LICENSE"
-            ]);
-        }
-
-        if ($standardfile->getSize() || is_a($standardfile, 'URLFile')) {
-            $error = $folder->validateUpload($standardfile, User::findCurrent()->id);
-            if ($error && is_string($error)) {
-                if ($tmp_name) {
-                    @unlink($tmp_name);
-                }
-                return [$error];
-            }
-
-            $newfile = $folder->addFile($standardfile);
-            if ($tmp_name) {
-                @unlink($tmp_name);
-            }
-            if (!$newfile) {
-                return [_('Daten konnten nicht kopiert werden!')];
-            }
-            return $newfile;
-        } else {
-            if ($tmp_name) {
-                @unlink($tmp_name);
-            }
-            return [_('Daten konnten nicht kopiert werden!')];
-        }
-    }
-
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        $range_type = get_object_type($course_id, ['sem', 'inst']) === 'sem' ? 'course' : 'institute';
-        $navigation = new Navigation(
-            _('Dateibereich'),
-            "dispatch.php/{$range_type}/files"
-        );
-        $navigation->setImage(Icon::create('files', Icon::ROLE_CLICKABLE, ['title' => _('Dateien')]));
-
-        $condition = "INNER JOIN folders ON (folders.id = file_refs.folder_id)
-                      WHERE folders.range_type = :range_type
-                        AND folders.range_id = :context_id
-                        AND GREATEST(file_refs.mkdate, file_refs.chdate) >= :last_visit
-                        AND file_refs.user_id != :me";
-        $file_refs = FileRef::findBySQL($condition, [
-            'me'         => $user_id,
-            'last_visit' => $last_visit,
-            'context_id' => $course_id,
-            'range_type' => $range_type
-        ]);
-        foreach ($file_refs as $fileref) {
-            $foldertype = $fileref->folder->getTypedFolder();
-            if ($foldertype->isFileDownloadable($fileref->getId(), $user_id)) {
-                $navigation->setImage(Icon::create('files', Icon::ROLE_ATTENTION), [
-                    'title' => _('Es gibt neue Dateien.'),
-                ]);
-                $navigation->setURL("dispatch.php/{$range_type}/files/flat", ['select' => 'new']);
-                break;
-            }
-        }
-
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        $range_type = get_object_type($course_id, ['sem', 'inst']) === 'sem' ? 'course' : 'institute';
-        $newFilesNavigation = new Navigation(_('Dateien'), "dispatch.php/{$range_type}/files");
-        $newFilesNavigation->setImage(Icon::create('files', Icon::ROLE_INFO_ALT));
-        $newFilesNavigation->setActiveImage(Icon::create('files', Icon::ROLE_INFO));
-        return ['files' => $newFilesNavigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary'          => _('Austausch von Dateien, Hausaufgabenordner & Terminordner'),
-            'description'      => _('Im Dateibereich können Dateien sowohl von ' .
-                'Lehrenden als auch von Studierenden hoch- bzw. ' .
-                'heruntergeladen werden. Es können Ordner angelegt und ' .
-                'individuell benannt werden (nur Lehrende). Die Dateien ' .
-                'können somit strukturiert zur Verfügung gestellt werden. ' .
-                'Multimediadateien wie Grafiken, Audio- und Videodateien ' .
-                'können sofort angezeigt bzw. abgespielt werden. Über das ' .
-                'PlugIn "Dateiordnerberechtigung" können Im Dateibereich ' .
-                'bestimmte Rechte für Studierende, wie z.B. das Leserecht, ' .
-                'festgelegt werden.'),
-            'displayname'      => _('Dateien'),
-            'category'         => _('Lehr- und Lernorganisation'),
-            'keywords'         => _('Hoch- und Herunterladen von Dateien;
-                            Anlegen von Ordnern und Unterordnern;
-                            Verschieben einer Datei/eines Ordners per drag and drop innerhalb einer Veranstaltung;
-                            Verschieben einer Datei/eines Ordners in eine andere Veranstaltung;
-                            Kopieren einer Datei/eines Ordners in eine andere oder mehrere Veranstaltungen;
-                            Verlinkung auf abgelegte Dateien möglich;
-                            Erstellung Hausaufgabenordner durch Aktivierung der Funktion "Dateiordnerberechtigung"'),
-            'descriptionshort' => _('Austausch von Dateien'),
-            'descriptionlong'  => _('Dateien können sowohl von Lehrenden als auch von Studierenden hoch- bzw. ' .
-                'heruntergeladen werden. Ordner können angelegt und individuell benannt werden ' .
-                '(Standard: nur Lehrende), so dass Dateien strukuriert zur Verfügung gestellt ' .
-                'werden können. Multimediadateien wie Grafiken, Audio- und Videodateien werden ' .
-                'sofort angezeigt bzw. abspielbar dargestellt. Über das PlugIn "Dateiordnerberechtigungen" ' .
-                'können Im Dateibereich bestimmte Rechte (r, w, x, f) für Studierende, wie z.B. das ' .
-                'Leserecht (r), festgelegt werden.'),
-            'icon'             => Icon::create('files', Icon::ROLE_INFO),
-            'icon_clickable'   => Icon::create('files', Icon::ROLE_CLICKABLE),
-            'screenshots'      => [
-                'path'     => 'assets/images/plus/screenshots/Dateibereich_-_Dateiordnerberechtigung',
-                'pictures' => [
-                    0 => ['source' => 'Ordneransicht_mit_geoeffnetem_Ordner.jpg', 'title' => _('Ordneransicht mit geöffnetem Ordner')],
-                    1 => ['source' => 'Ordneransicht_mit_Dateiinformationen.jpg', 'title' => _('Ordneransicht mit Dateiinformationen')],
-                    2 => ['source' => 'Neuen_Ordner_erstellen.jpg', 'title' => _('Neuen Ordner erstellen')],
-                    3 => ['source' => 'Ordner_zum_Hausaufgabenordner_umwandeln.jpg', 'title' => _('Ordner zum Hausaufgabenordner umwandeln')],
-                    4 => ['source' => 'Ansicht_alle_Dateien.jpg', 'title' => _('Ansicht alle Dateien')]
-                ]
-            ]
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-}
diff --git a/lib/modules/CoreDocuments.php b/lib/modules/CoreDocuments.php
new file mode 100644
index 0000000..2acfeef
--- /dev/null
+++ b/lib/modules/CoreDocuments.php
@@ -0,0 +1,205 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreDocuments extends CorePlugin implements StudipModule, OERModule
+{
+
+
+    /**
+     * Determines if the StudipModule wants to handle the OERMaterial. Returns false if not.
+     * @param OERMaterial $material
+     * @return false|Icon
+     */
+    static public function oerModuleWantsToUseMaterial(OERMaterial $material)
+    {
+        return true;
+    }
+
+    /**
+     * Returns an Icon class object with the given role.
+     * @param string $role
+     * @return null|Icon
+     */
+    public function oerGetIcon($role = Icon::ROLE_CLICKABLE)
+    {
+        return Icon::create("file", $role);
+    }
+
+    /**
+     * This function is triggered i a user chose to use this module as the target of the oermaterial.
+     * Now this module should put a copy of $material in its own area of the given course.
+     * @param OERMaterial $material
+     * @param Course $course
+     * @return array|FileType
+     */
+    static public function oerModuleIntegrateMaterialToCourse(OERMaterial $material, Course $course)
+    {
+        $folder = Folder::findTopFolder($course->id);
+        $folder = $folder->getTypedFolder();
+        $uploaded_file = [
+            'name' => $material['filename'],
+            'type' => $material['content_type'],
+            'content_terms_of_use_id' => "FREE_LICENSE",
+            'description' => $material['description']
+        ];
+        $url = $material->getDownloadUrl();
+        if ($url) {
+            if ($material['host_id']) {
+                $tmp_name = $GLOBALS['TMP_PATH'] . '/oer_' . $material->getId();
+                file_put_contents($tmp_name, file_get_contents($url, false, get_default_http_stream_context($url)));
+                $uploaded_file['tmp_name'] = $tmp_name;
+                $uploaded_file['type'] = filesize($tmp_name);
+            } else {
+                $uploaded_file['tmp_name'] = $material->getFilePath();
+                $uploaded_file['size'] = filesize($material->getFilePath());
+            }
+
+            $standardfile = StandardFile::create($uploaded_file);
+        } elseif($material['source_url']) {
+            $standardfile = URLFile::create([
+                'url' => $material['source_url'],
+                'name' => $material['name'],
+                'author_name' => implode(', ', array_map(function ($a) { return $a['name']; }, $material)),
+                'description' => $material['description'],
+                'content_terms_of_use_id' => "FREE_LICENSE"
+            ]);
+        }
+
+        if ($standardfile->getSize() || is_a($standardfile, 'URLFile')) {
+            $error = $folder->validateUpload($standardfile, User::findCurrent()->id);
+            if ($error && is_string($error)) {
+                if ($tmp_name) {
+                    @unlink($tmp_name);
+                }
+                return [$error];
+            }
+
+            $newfile = $folder->addFile($standardfile);
+            if ($tmp_name) {
+                @unlink($tmp_name);
+            }
+            if (!$newfile) {
+                return [_('Daten konnten nicht kopiert werden!')];
+            }
+            return $newfile;
+        } else {
+            if ($tmp_name) {
+                @unlink($tmp_name);
+            }
+            return [_('Daten konnten nicht kopiert werden!')];
+        }
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        $range_type = get_object_type($course_id, ['sem', 'inst']) === 'sem' ? 'course' : 'institute';
+        $navigation = new Navigation(
+            _('Dateibereich'),
+            "dispatch.php/{$range_type}/files"
+        );
+        $navigation->setImage(Icon::create('files', Icon::ROLE_CLICKABLE, ['title' => _('Dateien')]));
+
+        $condition = "INNER JOIN folders ON (folders.id = file_refs.folder_id)
+                      WHERE folders.range_type = :range_type
+                        AND folders.range_id = :context_id
+                        AND GREATEST(file_refs.mkdate, file_refs.chdate) >= :last_visit
+                        AND file_refs.user_id != :me";
+        $file_refs = FileRef::findBySQL($condition, [
+            'me'         => $user_id,
+            'last_visit' => $last_visit,
+            'context_id' => $course_id,
+            'range_type' => $range_type
+        ]);
+        foreach ($file_refs as $fileref) {
+            $foldertype = $fileref->folder->getTypedFolder();
+            if ($foldertype->isFileDownloadable($fileref->getId(), $user_id)) {
+                $navigation->setImage(Icon::create('files', Icon::ROLE_ATTENTION), [
+                    'title' => _('Es gibt neue Dateien.'),
+                ]);
+                $navigation->setURL("dispatch.php/{$range_type}/files/flat", ['select' => 'new']);
+                break;
+            }
+        }
+
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        $range_type = get_object_type($course_id, ['sem', 'inst']) === 'sem' ? 'course' : 'institute';
+        $newFilesNavigation = new Navigation(_('Dateien'), "dispatch.php/{$range_type}/files");
+        $newFilesNavigation->setImage(Icon::create('files', Icon::ROLE_INFO_ALT));
+        $newFilesNavigation->setActiveImage(Icon::create('files', Icon::ROLE_INFO));
+        return ['files' => $newFilesNavigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary'          => _('Austausch von Dateien, Hausaufgabenordner & Terminordner'),
+            'description'      => _('Im Dateibereich können Dateien sowohl von ' .
+                'Lehrenden als auch von Studierenden hoch- bzw. ' .
+                'heruntergeladen werden. Es können Ordner angelegt und ' .
+                'individuell benannt werden (nur Lehrende). Die Dateien ' .
+                'können somit strukturiert zur Verfügung gestellt werden. ' .
+                'Multimediadateien wie Grafiken, Audio- und Videodateien ' .
+                'können sofort angezeigt bzw. abgespielt werden. Über das ' .
+                'PlugIn "Dateiordnerberechtigung" können Im Dateibereich ' .
+                'bestimmte Rechte für Studierende, wie z.B. das Leserecht, ' .
+                'festgelegt werden.'),
+            'displayname'      => _('Dateien'),
+            'category'         => _('Lehr- und Lernorganisation'),
+            'keywords'         => _('Hoch- und Herunterladen von Dateien;
+                            Anlegen von Ordnern und Unterordnern;
+                            Verschieben einer Datei/eines Ordners per drag and drop innerhalb einer Veranstaltung;
+                            Verschieben einer Datei/eines Ordners in eine andere Veranstaltung;
+                            Kopieren einer Datei/eines Ordners in eine andere oder mehrere Veranstaltungen;
+                            Verlinkung auf abgelegte Dateien möglich;
+                            Erstellung Hausaufgabenordner durch Aktivierung der Funktion "Dateiordnerberechtigung"'),
+            'descriptionshort' => _('Austausch von Dateien'),
+            'descriptionlong'  => _('Dateien können sowohl von Lehrenden als auch von Studierenden hoch- bzw. ' .
+                'heruntergeladen werden. Ordner können angelegt und individuell benannt werden ' .
+                '(Standard: nur Lehrende), so dass Dateien strukuriert zur Verfügung gestellt ' .
+                'werden können. Multimediadateien wie Grafiken, Audio- und Videodateien werden ' .
+                'sofort angezeigt bzw. abspielbar dargestellt. Über das PlugIn "Dateiordnerberechtigungen" ' .
+                'können Im Dateibereich bestimmte Rechte (r, w, x, f) für Studierende, wie z.B. das ' .
+                'Leserecht (r), festgelegt werden.'),
+            'icon'             => Icon::create('files', Icon::ROLE_INFO),
+            'icon_clickable'   => Icon::create('files', Icon::ROLE_CLICKABLE),
+            'screenshots'      => [
+                'path'     => 'assets/images/plus/screenshots/Dateibereich_-_Dateiordnerberechtigung',
+                'pictures' => [
+                    0 => ['source' => 'Ordneransicht_mit_geoeffnetem_Ordner.jpg', 'title' => _('Ordneransicht mit geöffnetem Ordner')],
+                    1 => ['source' => 'Ordneransicht_mit_Dateiinformationen.jpg', 'title' => _('Ordneransicht mit Dateiinformationen')],
+                    2 => ['source' => 'Neuen_Ordner_erstellen.jpg', 'title' => _('Neuen Ordner erstellen')],
+                    3 => ['source' => 'Ordner_zum_Hausaufgabenordner_umwandeln.jpg', 'title' => _('Ordner zum Hausaufgabenordner umwandeln')],
+                    4 => ['source' => 'Ansicht_alle_Dateien.jpg', 'title' => _('Ansicht alle Dateien')]
+                ]
+            ]
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+}
diff --git a/lib/modules/CoreElearningInterface.class.php b/lib/modules/CoreElearningInterface.class.php
deleted file mode 100644
index a5f7119..0000000
--- a/lib/modules/CoreElearningInterface.class.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreElearningInterface extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        if (!Config::get()->ELEARNING_INTERFACE_ENABLE) {
-            return null;
-        }
-
-        $sql = "SELECT COUNT(module_id) AS count,
-                       COUNT(IF((chdate > IFNULL(b.visitdate, :threshold) AND a.module_type != 'crs'), module_id, NULL)) AS neue
-                FROM object_contentmodules AS a
-                LEFT JOIN object_user_visits AS b
-                  ON b.object_id = a.object_id
-                     AND b.user_id = :user_id
-                     AND b.plugin_id = :plugin_id
-                WHERE a.object_id = :course_id
-                  AND a.module_type != 'crs'
-                GROUP BY a.object_id";
-
-        $statement = DBManager::get()->prepare($sql);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $course_id);
-        $statement->bindValue(':threshold', $last_visit);
-        $statement->bindValue(':plugin_id', $this->getPluginId());
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-        if (!empty($result)) {
-            $nav = new Navigation(_('Lernmodule'), 'dispatch.php/course/elearning/show');
-            if ($result['neue']) {
-                $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
-                    'title' => sprintf(
-                        ngettext(
-                            '%1$d Lernmodul, %2$d neues',
-                            '%1$d Lernmodule, %2$d neue',
-                            $result['count']
-                        ),
-                        $result['count'],
-                        $result['neue']
-                    )
-                ]);
-            } elseif ($result['count']) {
-                $nav->setImage(Icon::create('learnmodule', Icon::ROLE_CLICKABLE), [
-                    'title' => sprintf(
-                        ngettext(
-                            '%d Lernmodul',
-                            '%d Lernmodule',
-                            $result['count']
-                        ),
-                        $result['count']
-                    )
-                ]);
-            }
-            return $nav;
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if (!Config::get()->ELEARNING_INTERFACE_ENABLE) {
-            return null;
-        }
-
-        $navigation = new Navigation(_('Lernmodule'));
-        $navigation->setImage(Icon::create('learnmodule', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('learnmodule', Icon::ROLE_INFO));
-
-        if (ObjectConnections::isObjectConnected($course_id)) {
-            $elearning_nav = new Navigation(_('Lernmodule dieser Veranstaltung'), 'dispatch.php/course/elearning/show?seminar_id=' . $course_id);
-
-            if (get_object_type($course_id, ['inst'])) {
-                $elearning_nav->setTitle(_('Lernmodule dieser Einrichtung'));
-            }
-
-            $navigation->addSubNavigation('show', $elearning_nav);
-        }
-
-        if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
-            $navigation->addSubNavigation('edit', new Navigation(_('Lernmodule hinzufügen / entfernen'), 'dispatch.php/course/elearning/edit?seminar_id=' . $course_id));
-        }
-
-        return ['elearning' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Zugang zu extern erstellten Lernmodulen'),
-            'description' => _('Über diese Schnittstelle ist es möglich, '.
-                'Selbstlerneinheiten, die in externen Programmen erstellt '.
-                'werden, in Stud.IP zur Verfügung zu stellen. Ein häufig '.
-                'angebundenes System ist ILIAS. Besteht eine Anbindung zu '.
-                'einem ILIAS-System, haben Lehrende die Möglichkeit, in '.
-                'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP '.
-                'bereit zu stellen.'),
-            'displayname' => _('Lernmodulschnittstelle'),
-            'category' => _('Inhalte und Aufgabenstellungen'),
-            'keywords' => _('Einbindung z. B. von ILIAS-Lerneinheiten;
-                            Zugang zu externen Lernplattformen;
-                            Aufgaben- und Test-Erstellung'),
-            'icon' => Icon::create('learnmodule', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('learnmodule', Icon::ROLE_CLICKABLE),
-            'descriptionshort' => _('Zugang zu extern erstellten Lernmodulen'),
-            'descriptionlong' => _('Über diese Schnittstelle ist es möglich, Selbstlerneinheiten, '.
-                                    'die in externen Programmen erstellt werden, in Stud.IP zur Verfügung '.
-                                    'zu stellen. Ein häufig angebundenes System ist ILIAS. Besteht eine '.
-                                    'Anbindung zu einem ILIAS-System, haben Lehrende die Möglichkeit, in '.
-                                    'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP bereit zu stellen.')
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return Config::get()->ELEARNING_INTERFACE_ENABLE && $context->getRangeType() === 'course';
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-}
diff --git a/lib/modules/CoreElearningInterface.php b/lib/modules/CoreElearningInterface.php
new file mode 100644
index 0000000..a5f7119
--- /dev/null
+++ b/lib/modules/CoreElearningInterface.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreElearningInterface extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        if (!Config::get()->ELEARNING_INTERFACE_ENABLE) {
+            return null;
+        }
+
+        $sql = "SELECT COUNT(module_id) AS count,
+                       COUNT(IF((chdate > IFNULL(b.visitdate, :threshold) AND a.module_type != 'crs'), module_id, NULL)) AS neue
+                FROM object_contentmodules AS a
+                LEFT JOIN object_user_visits AS b
+                  ON b.object_id = a.object_id
+                     AND b.user_id = :user_id
+                     AND b.plugin_id = :plugin_id
+                WHERE a.object_id = :course_id
+                  AND a.module_type != 'crs'
+                GROUP BY a.object_id";
+
+        $statement = DBManager::get()->prepare($sql);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':course_id', $course_id);
+        $statement->bindValue(':threshold', $last_visit);
+        $statement->bindValue(':plugin_id', $this->getPluginId());
+        $statement->execute();
+        $result = $statement->fetch(PDO::FETCH_ASSOC);
+        if (!empty($result)) {
+            $nav = new Navigation(_('Lernmodule'), 'dispatch.php/course/elearning/show');
+            if ($result['neue']) {
+                $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
+                    'title' => sprintf(
+                        ngettext(
+                            '%1$d Lernmodul, %2$d neues',
+                            '%1$d Lernmodule, %2$d neue',
+                            $result['count']
+                        ),
+                        $result['count'],
+                        $result['neue']
+                    )
+                ]);
+            } elseif ($result['count']) {
+                $nav->setImage(Icon::create('learnmodule', Icon::ROLE_CLICKABLE), [
+                    'title' => sprintf(
+                        ngettext(
+                            '%d Lernmodul',
+                            '%d Lernmodule',
+                            $result['count']
+                        ),
+                        $result['count']
+                    )
+                ]);
+            }
+            return $nav;
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if (!Config::get()->ELEARNING_INTERFACE_ENABLE) {
+            return null;
+        }
+
+        $navigation = new Navigation(_('Lernmodule'));
+        $navigation->setImage(Icon::create('learnmodule', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('learnmodule', Icon::ROLE_INFO));
+
+        if (ObjectConnections::isObjectConnected($course_id)) {
+            $elearning_nav = new Navigation(_('Lernmodule dieser Veranstaltung'), 'dispatch.php/course/elearning/show?seminar_id=' . $course_id);
+
+            if (get_object_type($course_id, ['inst'])) {
+                $elearning_nav->setTitle(_('Lernmodule dieser Einrichtung'));
+            }
+
+            $navigation->addSubNavigation('show', $elearning_nav);
+        }
+
+        if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
+            $navigation->addSubNavigation('edit', new Navigation(_('Lernmodule hinzufügen / entfernen'), 'dispatch.php/course/elearning/edit?seminar_id=' . $course_id));
+        }
+
+        return ['elearning' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Zugang zu extern erstellten Lernmodulen'),
+            'description' => _('Über diese Schnittstelle ist es möglich, '.
+                'Selbstlerneinheiten, die in externen Programmen erstellt '.
+                'werden, in Stud.IP zur Verfügung zu stellen. Ein häufig '.
+                'angebundenes System ist ILIAS. Besteht eine Anbindung zu '.
+                'einem ILIAS-System, haben Lehrende die Möglichkeit, in '.
+                'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP '.
+                'bereit zu stellen.'),
+            'displayname' => _('Lernmodulschnittstelle'),
+            'category' => _('Inhalte und Aufgabenstellungen'),
+            'keywords' => _('Einbindung z. B. von ILIAS-Lerneinheiten;
+                            Zugang zu externen Lernplattformen;
+                            Aufgaben- und Test-Erstellung'),
+            'icon' => Icon::create('learnmodule', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('learnmodule', Icon::ROLE_CLICKABLE),
+            'descriptionshort' => _('Zugang zu extern erstellten Lernmodulen'),
+            'descriptionlong' => _('Über diese Schnittstelle ist es möglich, Selbstlerneinheiten, '.
+                                    'die in externen Programmen erstellt werden, in Stud.IP zur Verfügung '.
+                                    'zu stellen. Ein häufig angebundenes System ist ILIAS. Besteht eine '.
+                                    'Anbindung zu einem ILIAS-System, haben Lehrende die Möglichkeit, in '.
+                                    'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP bereit zu stellen.')
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return Config::get()->ELEARNING_INTERFACE_ENABLE && $context->getRangeType() === 'course';
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+}
diff --git a/lib/modules/CoreForum.class.php b/lib/modules/CoreForum.class.php
deleted file mode 100644
index 3a43372..0000000
--- a/lib/modules/CoreForum.class.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/*
- * Forum.class.php - Forum
- *
- * 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.
- *
- * @author      Till Glöggler <till.gloeggler@elan-ev.de>
- * @copyright   2011 ELAN e.V. <http://www.elan-ev.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-// Notifications
-NotificationCenter::addObserver('CoreForum', 'overviewDidClear', 'OverviewDidClear');
-NotificationCenter::addObserver('CoreForum', 'removeAbosForUserAndCourse', 'UserDidLeaveCourse');
-
-NotificationCenter::addObserver('ForumActivity', 'newEntry', 'ForumAfterInsert');
-NotificationCenter::addObserver('ForumActivity', 'updateEntry', 'ForumAfterUpdate');
-NotificationCenter::addObserver('ForumActivity', 'deleteEntry', 'ForumBeforeDelete');
-
-NotificationCenter::addObserver('ForumIssue', 'unlinkIssue', 'ForumBeforeDelete');
-
-class CoreForum extends CorePlugin implements ForumModule
-{
-    /* interface method */
-    public function getTabNavigation($course_id)
-    {
-        $navigation = new Navigation(_('Forum'), 'dispatch.php/course/forum/index');
-        $navigation->setImage(Icon::create('forum', 'info_alt'));
-
-        // add main third-level navigation-item
-        $navigation->addSubNavigation('index', new Navigation(_('Übersicht'), 'dispatch.php/course/forum/index'));
-
-        if (ForumPerm::has('fav_entry', $course_id)) {
-            $navigation->addSubNavigation('newest', new Navigation(_("Neue Beiträge"), 'dispatch.php/course/forum/index/newest'));
-            $navigation->addSubNavigation('latest', new Navigation(_("Letzte Beiträge"), 'dispatch.php/course/forum/index/latest'));
-            $navigation->addSubNavigation('favorites', new Navigation(_('Gemerkte Beiträge'), 'dispatch.php/course/forum/index/favorites'));
-
-            // mass-administrate the forum
-            if (ForumPerm::has('admin', $course_id)) {
-                $navigation->addSubNavigation('admin', new Navigation(_('Administration'), 'dispatch.php/course/forum/admin'));
-            }
-        }
-
-        return ['forum2' => $navigation];
-    }
-
-    /* interface method */
-    public function getIconNavigation($course_id, $last_visit, $user_id = null)
-    {
-        if ($GLOBALS['perm']->have_studip_perm('user', $course_id)) {
-            $num_entries = ForumVisit::getCount($course_id, ForumVisit::getVisit($course_id));
-            $text = ForumHelpers::getVisitText($num_entries, $course_id);
-        } else {
-            $num_entries = 0;
-            $text = 'Forum';
-        }
-
-        $navigation = new Navigation('forum', 'dispatch.php/course/forum/index/enter_seminar');
-        $navigation->setBadgeNumber($num_entries);
-
-        if ($num_entries > 0) {
-            $navigation->setImage(Icon::create('forum', Icon::ROLE_ATTENTION, ['title' => $text]));
-        } else {
-            $navigation->setImage(Icon::create('forum', Icon::ROLE_CLICKABLE, ['title' => $text]));
-        }
-
-        return $navigation;
-    }
-
-    /**
-     * This method is called, whenever an user clicked to clear the visit timestamps
-     * and set everything as visited
-     *
-     * @param object $notification
-     * @param string $user_id
-     */
-    public static function overviewDidClear($notification, $user_id)
-    {
-        $query = "REPLACE INTO `forum_visits`
-                  SELECT `user_id`, `Seminar_id`, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
-                  FROM `seminar_user`
-                  WHERE `user_id` = ?";
-        DBManager::get()->execute($query, [$user_id]);
-    }
-
-    /**
-     * This method is called whenever a user is removed from a course and thus
-     * the forum abos will be removed.
-     *
-     * @param object $notification
-     * @param string $course_id
-     * @param string $user_id
-     */
-    public static function removeAbosForUserAndCourse($notification, $course_id, $user_id)
-    {
-        ForumAbo::removeForCourseAndUser($course_id, $user_id);
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-    /* * IMPLEMENTATION OF METHODS FROM FORUMMODULE-INTERFACE  * */
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-    public function getLinkToThread($issue_id)
-    {
-        if ($topic_id = ForumIssue::getThreadIdForIssue($issue_id)) {
-            return URLHelper::getLink('dispatch.php/course/forum/index/index/' . $topic_id);
-        }
-
-        return false;
-    }
-
-    public function setThreadForIssue($issue_id, $title, $content)
-    {
-        ForumIssue::setThreadForIssue(Context::getId(), $issue_id, $title, $content);
-    }
-
-    public function getNumberOfPostingsForUser($user_id, $seminar_id = null)
-    {
-        return ForumEntry::countUserEntries($user_id, $seminar_id);
-    }
-
-    public function getNumberOfPostingsForIssue($issue_id)
-    {
-        $topic_id = ForumIssue::getThreadIdForIssue($issue_id);
-
-        return $topic_id ? ForumEntry::countEntries($topic_id) : 0;
-    }
-
-    public function getNumberOfPostingsForSeminar($seminar_id)
-    {
-        return floor(ForumEntry::countEntries($seminar_id));
-    }
-
-    public function getNumberOfPostings()
-    {
-        return ForumEntry::countAllEntries();
-    }
-
-    public function getEntryTableInfo()
-    {
-        return [
-            'table'      => 'forum_entries',
-            'content'    => 'content',
-            'chdate'     => 'chdate',
-            'seminar_id' => 'seminar_id',
-            'user_id'    => 'user_id'
-        ];
-    }
-
-    public function getTopTenSeminars()
-    {
-        return ForumEntry::getTopTenSeminars();
-    }
-
-    public function migrateUser($user_from, $user_to)
-    {
-        ForumEntry::migrateUser($user_from, $user_to);
-    }
-
-    public function deleteContents($seminar_id)
-    {
-        ForumEntry::delete($seminar_id);
-    }
-
-    public function getDump($seminar_id)
-    {
-        return ForumEntry::getDump($seminar_id);
-    }
-
-    public static function getDescription()
-    {
-        return _('Textbasierte und zeit- und ortsunabhängige '.
-            'Diskursmöglichkeit. Lehrende können parallel zu '.
-            'Veranstaltungsthemen Fragen stellen, die von den Studierenden '.
-            'per Meinungsaustausch besprochen werden.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Veranstaltungsbegleitender Meinungsaustausch zu bestimmten Themen'),
-            'description' => _('Textbasierte zeit- und ortsunabhängige Möglichkeit zum Austausch von Gedanken, Meinungen und Erfahrungen. Lehrende und/oder Studierende können parallel zu Veranstaltungsthemen Fragen stellen, die in Form von Textbeiträgen besprochen werden können. Diese Beiträge können von allen Teilnehmenden der Veranstaltung gemerkt, verlinkt, positiv bewertet (sog. "Gefällt mir") und editiert werden (Letzeres nur von Lehrenden). Lehrende können zusätzlich Themen in Bereiche gliedern, zwischen den Bereichen verschiebe, im Bereich hervorheben und diesen öffnen und schließen.'),
-            'descriptionlong' => _('Textbasierte zeit- und ortsunabhängige Möglichkeit zum Austausch von Gedanken, Meinungen und Erfahrungen. Lehrende und/oder Studierende können parallel zu Veranstaltungsthemen Fragen stellen, die in Form von Textbeiträgen besprochen werden können. Diese Beiträge können von allen Teilnehmenden der Veranstaltung gemerkt, verlinkt, positiv bewertet (sog. "Gefällt mir") und editiert werden (Letzeres nur von Lehrenden). Lehrende können zusätzlich Themen in Bereiche gliedern, zwischen den Bereichen verschieben, im Bereich hervorheben und diesen öffnen und schließen.'),
-            'category' => _('Kommunikation und Zusammenarbeit'),
-            'keywords' => _('Möglichkeit zum intensiven, nachhaltigen textbasierten Austausch; (nachträgliche) Strukturierung der Beiträge; Editierfunktion für Lehrende'),
-            'icon' => Icon::create('forum', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('forum', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Forum',
-                'pictures' => [
-                    ['source' => 'Lehrendensicht_-_Kategorien_mit_Bereichen_und_Beitraegen.jpg'],
-                    ['source' => 'Studentische_Sicht_-_Kategorien_mit_Bereichen_und_Beitraegen.jpg'],
-                    ['source' => 'Einen_Forumsbeitrag_erstellen.jpg'],
-                ]
-            ]
-        ];
-    }
-}
diff --git a/lib/modules/CoreForum.php b/lib/modules/CoreForum.php
new file mode 100644
index 0000000..3a43372
--- /dev/null
+++ b/lib/modules/CoreForum.php
@@ -0,0 +1,210 @@
+<?php
+/*
+ * Forum.class.php - Forum
+ *
+ * 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.
+ *
+ * @author      Till Glöggler <till.gloeggler@elan-ev.de>
+ * @copyright   2011 ELAN e.V. <http://www.elan-ev.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+// Notifications
+NotificationCenter::addObserver('CoreForum', 'overviewDidClear', 'OverviewDidClear');
+NotificationCenter::addObserver('CoreForum', 'removeAbosForUserAndCourse', 'UserDidLeaveCourse');
+
+NotificationCenter::addObserver('ForumActivity', 'newEntry', 'ForumAfterInsert');
+NotificationCenter::addObserver('ForumActivity', 'updateEntry', 'ForumAfterUpdate');
+NotificationCenter::addObserver('ForumActivity', 'deleteEntry', 'ForumBeforeDelete');
+
+NotificationCenter::addObserver('ForumIssue', 'unlinkIssue', 'ForumBeforeDelete');
+
+class CoreForum extends CorePlugin implements ForumModule
+{
+    /* interface method */
+    public function getTabNavigation($course_id)
+    {
+        $navigation = new Navigation(_('Forum'), 'dispatch.php/course/forum/index');
+        $navigation->setImage(Icon::create('forum', 'info_alt'));
+
+        // add main third-level navigation-item
+        $navigation->addSubNavigation('index', new Navigation(_('Übersicht'), 'dispatch.php/course/forum/index'));
+
+        if (ForumPerm::has('fav_entry', $course_id)) {
+            $navigation->addSubNavigation('newest', new Navigation(_("Neue Beiträge"), 'dispatch.php/course/forum/index/newest'));
+            $navigation->addSubNavigation('latest', new Navigation(_("Letzte Beiträge"), 'dispatch.php/course/forum/index/latest'));
+            $navigation->addSubNavigation('favorites', new Navigation(_('Gemerkte Beiträge'), 'dispatch.php/course/forum/index/favorites'));
+
+            // mass-administrate the forum
+            if (ForumPerm::has('admin', $course_id)) {
+                $navigation->addSubNavigation('admin', new Navigation(_('Administration'), 'dispatch.php/course/forum/admin'));
+            }
+        }
+
+        return ['forum2' => $navigation];
+    }
+
+    /* interface method */
+    public function getIconNavigation($course_id, $last_visit, $user_id = null)
+    {
+        if ($GLOBALS['perm']->have_studip_perm('user', $course_id)) {
+            $num_entries = ForumVisit::getCount($course_id, ForumVisit::getVisit($course_id));
+            $text = ForumHelpers::getVisitText($num_entries, $course_id);
+        } else {
+            $num_entries = 0;
+            $text = 'Forum';
+        }
+
+        $navigation = new Navigation('forum', 'dispatch.php/course/forum/index/enter_seminar');
+        $navigation->setBadgeNumber($num_entries);
+
+        if ($num_entries > 0) {
+            $navigation->setImage(Icon::create('forum', Icon::ROLE_ATTENTION, ['title' => $text]));
+        } else {
+            $navigation->setImage(Icon::create('forum', Icon::ROLE_CLICKABLE, ['title' => $text]));
+        }
+
+        return $navigation;
+    }
+
+    /**
+     * This method is called, whenever an user clicked to clear the visit timestamps
+     * and set everything as visited
+     *
+     * @param object $notification
+     * @param string $user_id
+     */
+    public static function overviewDidClear($notification, $user_id)
+    {
+        $query = "REPLACE INTO `forum_visits`
+                  SELECT `user_id`, `Seminar_id`, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
+                  FROM `seminar_user`
+                  WHERE `user_id` = ?";
+        DBManager::get()->execute($query, [$user_id]);
+    }
+
+    /**
+     * This method is called whenever a user is removed from a course and thus
+     * the forum abos will be removed.
+     *
+     * @param object $notification
+     * @param string $course_id
+     * @param string $user_id
+     */
+    public static function removeAbosForUserAndCourse($notification, $course_id, $user_id)
+    {
+        ForumAbo::removeForCourseAndUser($course_id, $user_id);
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+    /* * IMPLEMENTATION OF METHODS FROM FORUMMODULE-INTERFACE  * */
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    public function getLinkToThread($issue_id)
+    {
+        if ($topic_id = ForumIssue::getThreadIdForIssue($issue_id)) {
+            return URLHelper::getLink('dispatch.php/course/forum/index/index/' . $topic_id);
+        }
+
+        return false;
+    }
+
+    public function setThreadForIssue($issue_id, $title, $content)
+    {
+        ForumIssue::setThreadForIssue(Context::getId(), $issue_id, $title, $content);
+    }
+
+    public function getNumberOfPostingsForUser($user_id, $seminar_id = null)
+    {
+        return ForumEntry::countUserEntries($user_id, $seminar_id);
+    }
+
+    public function getNumberOfPostingsForIssue($issue_id)
+    {
+        $topic_id = ForumIssue::getThreadIdForIssue($issue_id);
+
+        return $topic_id ? ForumEntry::countEntries($topic_id) : 0;
+    }
+
+    public function getNumberOfPostingsForSeminar($seminar_id)
+    {
+        return floor(ForumEntry::countEntries($seminar_id));
+    }
+
+    public function getNumberOfPostings()
+    {
+        return ForumEntry::countAllEntries();
+    }
+
+    public function getEntryTableInfo()
+    {
+        return [
+            'table'      => 'forum_entries',
+            'content'    => 'content',
+            'chdate'     => 'chdate',
+            'seminar_id' => 'seminar_id',
+            'user_id'    => 'user_id'
+        ];
+    }
+
+    public function getTopTenSeminars()
+    {
+        return ForumEntry::getTopTenSeminars();
+    }
+
+    public function migrateUser($user_from, $user_to)
+    {
+        ForumEntry::migrateUser($user_from, $user_to);
+    }
+
+    public function deleteContents($seminar_id)
+    {
+        ForumEntry::delete($seminar_id);
+    }
+
+    public function getDump($seminar_id)
+    {
+        return ForumEntry::getDump($seminar_id);
+    }
+
+    public static function getDescription()
+    {
+        return _('Textbasierte und zeit- und ortsunabhängige '.
+            'Diskursmöglichkeit. Lehrende können parallel zu '.
+            'Veranstaltungsthemen Fragen stellen, die von den Studierenden '.
+            'per Meinungsaustausch besprochen werden.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Veranstaltungsbegleitender Meinungsaustausch zu bestimmten Themen'),
+            'description' => _('Textbasierte zeit- und ortsunabhängige Möglichkeit zum Austausch von Gedanken, Meinungen und Erfahrungen. Lehrende und/oder Studierende können parallel zu Veranstaltungsthemen Fragen stellen, die in Form von Textbeiträgen besprochen werden können. Diese Beiträge können von allen Teilnehmenden der Veranstaltung gemerkt, verlinkt, positiv bewertet (sog. "Gefällt mir") und editiert werden (Letzeres nur von Lehrenden). Lehrende können zusätzlich Themen in Bereiche gliedern, zwischen den Bereichen verschiebe, im Bereich hervorheben und diesen öffnen und schließen.'),
+            'descriptionlong' => _('Textbasierte zeit- und ortsunabhängige Möglichkeit zum Austausch von Gedanken, Meinungen und Erfahrungen. Lehrende und/oder Studierende können parallel zu Veranstaltungsthemen Fragen stellen, die in Form von Textbeiträgen besprochen werden können. Diese Beiträge können von allen Teilnehmenden der Veranstaltung gemerkt, verlinkt, positiv bewertet (sog. "Gefällt mir") und editiert werden (Letzeres nur von Lehrenden). Lehrende können zusätzlich Themen in Bereiche gliedern, zwischen den Bereichen verschieben, im Bereich hervorheben und diesen öffnen und schließen.'),
+            'category' => _('Kommunikation und Zusammenarbeit'),
+            'keywords' => _('Möglichkeit zum intensiven, nachhaltigen textbasierten Austausch; (nachträgliche) Strukturierung der Beiträge; Editierfunktion für Lehrende'),
+            'icon' => Icon::create('forum', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('forum', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Forum',
+                'pictures' => [
+                    ['source' => 'Lehrendensicht_-_Kategorien_mit_Bereichen_und_Beitraegen.jpg'],
+                    ['source' => 'Studentische_Sicht_-_Kategorien_mit_Bereichen_und_Beitraegen.jpg'],
+                    ['source' => 'Einen_Forumsbeitrag_erstellen.jpg'],
+                ]
+            ]
+        ];
+    }
+}
diff --git a/lib/modules/CoreOverview.class.php b/lib/modules/CoreOverview.class.php
deleted file mode 100644
index 94005da..0000000
--- a/lib/modules/CoreOverview.class.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreOverview extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        $sql = "SELECT COUNT(nw.news_id) AS count,
-                       COUNT(IF((nw.chdate > IFNULL(b.visitdate, :threshold) AND nw.user_id !=:user_id), nw.news_id, NULL)) AS neue
-                FROM news_range AS a
-                LEFT JOIN news AS nw
-                  ON a.news_id = nw.news_id
-                     AND UNIX_TIMESTAMP() BETWEEN date AND date + expire
-                LEFT JOIN object_user_visits AS b
-                  ON b.object_id = a.news_id
-                     AND b.user_id = :user_id
-                     AND b.plugin_id = :plugin_id
-                WHERE a.range_id = :course_id
-                GROUP BY a.range_id";
-
-        $statement = DBManager::get()->prepare($sql);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $course_id);
-        $statement->bindValue(':threshold', object_get_visit_threshold());
-        $statement->bindValue(':plugin_id', $this->getPluginId());
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-        if (!$result) {
-            return null;
-        }
-
-        $nav = new Navigation(_('Ankündigungen'), '');
-        if ($result['neue']) {
-            $nav->setURL('?new_news=true');
-            $nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [
-                'title' => sprintf(
-                    ngettext(
-                        '%1$d Ankündigung, %2$d neue',
-                        '%1$d Ankündigungen, %2$d neue',
-                        $result['count']
-                    ),
-                    $result['count'],
-                    $result['neue']
-                )
-            ]);
-            $nav->setBadgeNumber($result['neue']);
-        } elseif ($result['count']) {
-            $nav->setImage(Icon::create('news', Icon::ROLE_CLICKABLE), [
-                'title' => sprintf(
-                    ngettext(
-                        '%d Ankündigung',
-                        '%d Ankündigungen',
-                        $result['count']
-                    ),
-                    $result['count']
-                )
-            ]);
-        }
-        return $nav;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        $object_type = get_object_type($course_id, ['sem', 'inst']);
-        if ($object_type === 'sem') {
-            $course = Course::find($course_id);
-            $sem_class = $GLOBALS['SEM_CLASS'][$GLOBALS['SEM_TYPE'][$course->status]['class']] ?: SemClass::getDefaultSemClass();
-        } else {
-            $institute = Institute::find($course_id);
-            $sem_class = SemClass::getDefaultInstituteClass($institute->type);
-        }
-
-        $navigation = new Navigation(_('Übersicht'));
-        $navigation->setImage(Icon::create('seminar', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('seminar', Icon::ROLE_INFO));
-        if ($object_type !== 'sem') {
-            $navigation->addSubNavigation('info', new Navigation(_('Kurzinfo'), 'dispatch.php/institute/overview'));
-            $navigation->addSubNavigation('courses', new Navigation(_('Veranstaltungen'), 'show_bereich.php?level=s&id='.$course_id));
-            $navigation->addSubNavigation('schedule', new Navigation(_('Veranstaltungs-Stundenplan'), 'dispatch.php/institute/schedule/index/' . $course_id));
-
-            if ($GLOBALS['perm']->have_studip_perm('admin', $course_id)) {
-                $navigation->addSubNavigation('admin', new Navigation(_('Administration der Einrichtung'), 'dispatch.php/institute/basicdata/index?new_inst=TRUE'));
-            }
-        } else {
-            $navigation->addSubNavigation('info', new Navigation(_('Kurzinfo'), 'dispatch.php/course/overview'));
-            if (!$sem_class['studygroup_mode']) {
-                $navigation->addSubNavigation('details', new Navigation(_('Details'), 'dispatch.php/course/details/'));
-            }
-        }
-        return ['main' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'displayname' => _('Übersicht'),
-            'summary' => _('Ankündigungen, Termine, Fragebögen & Details'),
-            'icon' => Icon::create('home', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('home', Icon::ROLE_CLICKABLE)
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-}
diff --git a/lib/modules/CoreOverview.php b/lib/modules/CoreOverview.php
new file mode 100644
index 0000000..94005da
--- /dev/null
+++ b/lib/modules/CoreOverview.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreOverview extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        $sql = "SELECT COUNT(nw.news_id) AS count,
+                       COUNT(IF((nw.chdate > IFNULL(b.visitdate, :threshold) AND nw.user_id !=:user_id), nw.news_id, NULL)) AS neue
+                FROM news_range AS a
+                LEFT JOIN news AS nw
+                  ON a.news_id = nw.news_id
+                     AND UNIX_TIMESTAMP() BETWEEN date AND date + expire
+                LEFT JOIN object_user_visits AS b
+                  ON b.object_id = a.news_id
+                     AND b.user_id = :user_id
+                     AND b.plugin_id = :plugin_id
+                WHERE a.range_id = :course_id
+                GROUP BY a.range_id";
+
+        $statement = DBManager::get()->prepare($sql);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':course_id', $course_id);
+        $statement->bindValue(':threshold', object_get_visit_threshold());
+        $statement->bindValue(':plugin_id', $this->getPluginId());
+        $statement->execute();
+        $result = $statement->fetch(PDO::FETCH_ASSOC);
+        if (!$result) {
+            return null;
+        }
+
+        $nav = new Navigation(_('Ankündigungen'), '');
+        if ($result['neue']) {
+            $nav->setURL('?new_news=true');
+            $nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [
+                'title' => sprintf(
+                    ngettext(
+                        '%1$d Ankündigung, %2$d neue',
+                        '%1$d Ankündigungen, %2$d neue',
+                        $result['count']
+                    ),
+                    $result['count'],
+                    $result['neue']
+                )
+            ]);
+            $nav->setBadgeNumber($result['neue']);
+        } elseif ($result['count']) {
+            $nav->setImage(Icon::create('news', Icon::ROLE_CLICKABLE), [
+                'title' => sprintf(
+                    ngettext(
+                        '%d Ankündigung',
+                        '%d Ankündigungen',
+                        $result['count']
+                    ),
+                    $result['count']
+                )
+            ]);
+        }
+        return $nav;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        $object_type = get_object_type($course_id, ['sem', 'inst']);
+        if ($object_type === 'sem') {
+            $course = Course::find($course_id);
+            $sem_class = $GLOBALS['SEM_CLASS'][$GLOBALS['SEM_TYPE'][$course->status]['class']] ?: SemClass::getDefaultSemClass();
+        } else {
+            $institute = Institute::find($course_id);
+            $sem_class = SemClass::getDefaultInstituteClass($institute->type);
+        }
+
+        $navigation = new Navigation(_('Übersicht'));
+        $navigation->setImage(Icon::create('seminar', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('seminar', Icon::ROLE_INFO));
+        if ($object_type !== 'sem') {
+            $navigation->addSubNavigation('info', new Navigation(_('Kurzinfo'), 'dispatch.php/institute/overview'));
+            $navigation->addSubNavigation('courses', new Navigation(_('Veranstaltungen'), 'show_bereich.php?level=s&id='.$course_id));
+            $navigation->addSubNavigation('schedule', new Navigation(_('Veranstaltungs-Stundenplan'), 'dispatch.php/institute/schedule/index/' . $course_id));
+
+            if ($GLOBALS['perm']->have_studip_perm('admin', $course_id)) {
+                $navigation->addSubNavigation('admin', new Navigation(_('Administration der Einrichtung'), 'dispatch.php/institute/basicdata/index?new_inst=TRUE'));
+            }
+        } else {
+            $navigation->addSubNavigation('info', new Navigation(_('Kurzinfo'), 'dispatch.php/course/overview'));
+            if (!$sem_class['studygroup_mode']) {
+                $navigation->addSubNavigation('details', new Navigation(_('Details'), 'dispatch.php/course/details/'));
+            }
+        }
+        return ['main' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'displayname' => _('Übersicht'),
+            'summary' => _('Ankündigungen, Termine, Fragebögen & Details'),
+            'icon' => Icon::create('home', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('home', Icon::ROLE_CLICKABLE)
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+}
diff --git a/lib/modules/CoreParticipants.class.php b/lib/modules/CoreParticipants.class.php
deleted file mode 100644
index b2f1948..0000000
--- a/lib/modules/CoreParticipants.class.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreParticipants extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        if ($user_id === 'nobody') {
-            return null;
-        }
-
-        $auto_insert_perm = Config::get()->AUTO_INSERT_SEM_PARTICIPANTS_VIEW_PERM;
-        // show the participants-icon only if the course is not an auto-insert-sem
-        if (
-            AutoInsert::checkSeminar($course_id)
-            && (
-                ($GLOBALS['perm']->have_perm('admin', $user_id) && !$GLOBALS['perm']->have_perm($auto_insert_perm, $user_id))
-                || !$GLOBALS['perm']->have_studip_perm($auto_insert_perm, $course_id, $user_id)
-            )
-        ) {
-            return null;
-        }
-
-        $course = Course::find($course_id);
-
-        // Is the participants page hidden for students?
-        if (!$GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id) && $course->config->COURSE_MEMBERS_HIDE) {
-            $tab_navigation = $this->getTabNavigation($course_id);
-            if ($tab_navigation && count($tab_navigation['members']->getSubNavigation()) > 0) {
-                $sub_nav = $tab_navigation['members']->getSubNavigation();
-                $first_nav = reset($sub_nav);
-
-                $navigation = new Navigation($first_nav->getTitle(), $first_nav->getURL());
-                $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
-                return $navigation;
-
-            }
-            return null;
-        }
-
-        // Determine url to redirect to
-        if (!$course->getSemClass()->isGroup()) {
-            $url = 'dispatch.php/course/members/index';
-        } elseif (!$GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id)) {
-            return null;
-        } else {
-            $url = 'dispatch.php/course/grouping/members';
-        }
-
-        $navigation = new Navigation(_('Teilnehmende'), $url);
-        $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
-
-        // Check permission, show no indicator if not at least tutor
-        if (!$GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id)) {
-            return $navigation;
-        }
-
-        $query = "SELECT COUNT(tmp.user_id) as count,
-                         COUNT(IF((tmp.mkdate > IFNULL(b.visitdate, :threshold) AND tmp.user_id != :user_id), tmp.user_id, NULL)) AS neue
-                  FROM (
-                      SELECT user_id, mkdate
-                      FROM admission_seminar_user
-                      WHERE seminar_id = :course_id
-
-                      UNION ALL
-
-                      SELECT user_id, mkdate
-                      FROM seminar_user
-                      WHERE seminar_id = :course_id
-                  ) AS tmp
-                  LEFT JOIN object_user_visits AS b
-                    ON b.object_id = :course_id
-                       AND b.user_id = :user_id
-                       AND b.plugin_id = :plugin_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $course_id);
-        $statement->bindValue(':threshold', $last_visit);
-        $statement->bindValue(':plugin_id', $this->getPluginId());
-
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if ($result['neue']) {
-            $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION), [
-                'title' => sprintf(
-                    ngettext(
-                        '%1$d Teilnehmende/r, %2$d neue/r',
-                        '%1$d Teilnehmende, %2$d neue',
-                        $result['count']
-                    ),
-                    $result['count'],
-                    $result['neue']
-                )
-            ]);
-            $navigation->setBadgeNumber($result['neue']);
-        } elseif ($result['count']) {
-            $navigation->setLinkAttributes([
-                'title' => sprintf(
-                    ngettext(
-                        '%d Teilnehmende/r',
-                        '%d Teilnehmende',
-                        $result['count']
-                    ),
-                    $result['count']
-                )
-            ]);
-        }
-
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if ($GLOBALS['user']->id === 'nobody') {
-            return [];
-        }
-
-        $navigation = new Navigation(_('Teilnehmende'));
-        $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('persons', Icon::ROLE_INFO));
-
-        $course = Course::find($course_id);
-
-        // Only courses without children have a regular member list and statusgroups.
-        if (!$course->getSemClass()->isGroup()) {
-            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) || !$course->config->COURSE_MEMBERS_HIDE) {
-                $navigation->addSubNavigation('view', new Navigation(_('Teilnehmende'), 'dispatch.php/course/members'));
-                $navigation->addSubNavigation('statusgroups', new Navigation(_('Gruppen'), 'dispatch.php/course/statusgroups'));
-            }
-        } else {
-            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
-                $navigation->addSubNavigation('children', new Navigation(_('Teilnehmende in Unterveranstaltungen'), 'dispatch.php/course/grouping/members'));
-            }
-        }
-
-        if ($course->aux_lock_rule) {
-            $navigation->addSubNavigation('additional', new Navigation(_('Zusatzangaben'), 'dispatch.php/course/members/additional'));
-        }
-
-        return count($navigation->getSubNavigation()) > 0 ? ['members' => $navigation] : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'),
-            'description' => _('Die Teilnehmenden werden gruppiert nach ihrer '.
-                'jeweiligen Funktion in einer Tabelle gelistet. Für Lehrende '.
-                'werden sowohl das Anmeldedatum als auch der Studiengang mit '.
-                'Semesterangabe dargestellt. Die Liste kann in verschiedene '.
-                'Formate exportiert werden. Außerdem gibt es die '.
-                'Möglichkeiten, eine Rundmail an alle zu schreiben (nur '.
-                'Lehrende) bzw. einzelne Teilnehmende separat anzuschreiben.'),
-            'displayname' => _('Teilnehmende'),
-            'keywords' => _('Rundmail an einzelne, mehrere oder alle Teilnehmenden;
-                            Gruppierung nach Lehrenden, Tutor/-innen und Studierenden (Autor/-innen);
-                            Aufnahme neuer Studierender (Autor/-innen) und Tutor/-innen;
-                            Import einer Teilnehmendenliste;
-                            Export der Teilnehmendenliste;
-                            Einrichten von Gruppen;
-                            Anzeige Studiengang und Fachsemester'),
-            'descriptionshort' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'),
-            'descriptionlong' => _('Die Teilnehmenden werden gruppiert nach ihrer jeweiligen Rolle in '.
-                                   'einer Tabelle gelistet. Für Lehrende werden sowohl das Anmeldedatum '.
-                                   'als auch der Studiengang mit Semesterangabe der Studierenden dargestellt. '.
-                                   'Die Liste kann in verschiedene Formate exportiert werden. Außerdem gibt '.
-                                   'es die Möglichkeiten für Lehrende, allen eine Rundmail zukommen zu lassen '.
-                                   'bzw. einzelne Teilnehmende separat anzuschreiben.'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'icon' => Icon::create('persons', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('persons', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/TeilnehmerInnen',
-                'pictures' => [
-                    ['source' => 'Liste_aller_Teilnehmenden_einer_Veranstaltung.jpg', 'title' => _('Liste aller Teilnehmenden einer Veranstaltung')],
-                    ['source' => 'Rundmail_an_alle_TeilnehmerInnen_einer_Veranstaltung.jpg', 'title' => _('Rundmail an alle Teilnehmdenden einer Veranstaltung')],
-                ]
-            ],
-        ];
-    }
-
-    protected function getCourseStatus(Course $course, $user_id)
-    {
-        $member = CourseMember::find([$course->id, $user_id]);
-        if ($member) {
-            return $member->status;
-        }
-
-        if (Config::get()->DEPUTIES_ENABLE && Deputy::isDeputy($user_id, $course->id)) {
-            return 'dozent';
-        }
-
-        return false;
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return $context->getRangeType() === 'course';
-    }
-}
diff --git a/lib/modules/CoreParticipants.php b/lib/modules/CoreParticipants.php
new file mode 100644
index 0000000..b2f1948
--- /dev/null
+++ b/lib/modules/CoreParticipants.php
@@ -0,0 +1,224 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreParticipants extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        if ($user_id === 'nobody') {
+            return null;
+        }
+
+        $auto_insert_perm = Config::get()->AUTO_INSERT_SEM_PARTICIPANTS_VIEW_PERM;
+        // show the participants-icon only if the course is not an auto-insert-sem
+        if (
+            AutoInsert::checkSeminar($course_id)
+            && (
+                ($GLOBALS['perm']->have_perm('admin', $user_id) && !$GLOBALS['perm']->have_perm($auto_insert_perm, $user_id))
+                || !$GLOBALS['perm']->have_studip_perm($auto_insert_perm, $course_id, $user_id)
+            )
+        ) {
+            return null;
+        }
+
+        $course = Course::find($course_id);
+
+        // Is the participants page hidden for students?
+        if (!$GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id) && $course->config->COURSE_MEMBERS_HIDE) {
+            $tab_navigation = $this->getTabNavigation($course_id);
+            if ($tab_navigation && count($tab_navigation['members']->getSubNavigation()) > 0) {
+                $sub_nav = $tab_navigation['members']->getSubNavigation();
+                $first_nav = reset($sub_nav);
+
+                $navigation = new Navigation($first_nav->getTitle(), $first_nav->getURL());
+                $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
+                return $navigation;
+
+            }
+            return null;
+        }
+
+        // Determine url to redirect to
+        if (!$course->getSemClass()->isGroup()) {
+            $url = 'dispatch.php/course/members/index';
+        } elseif (!$GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id)) {
+            return null;
+        } else {
+            $url = 'dispatch.php/course/grouping/members';
+        }
+
+        $navigation = new Navigation(_('Teilnehmende'), $url);
+        $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
+
+        // Check permission, show no indicator if not at least tutor
+        if (!$GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id)) {
+            return $navigation;
+        }
+
+        $query = "SELECT COUNT(tmp.user_id) as count,
+                         COUNT(IF((tmp.mkdate > IFNULL(b.visitdate, :threshold) AND tmp.user_id != :user_id), tmp.user_id, NULL)) AS neue
+                  FROM (
+                      SELECT user_id, mkdate
+                      FROM admission_seminar_user
+                      WHERE seminar_id = :course_id
+
+                      UNION ALL
+
+                      SELECT user_id, mkdate
+                      FROM seminar_user
+                      WHERE seminar_id = :course_id
+                  ) AS tmp
+                  LEFT JOIN object_user_visits AS b
+                    ON b.object_id = :course_id
+                       AND b.user_id = :user_id
+                       AND b.plugin_id = :plugin_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':course_id', $course_id);
+        $statement->bindValue(':threshold', $last_visit);
+        $statement->bindValue(':plugin_id', $this->getPluginId());
+
+        $statement->execute();
+        $result = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if ($result['neue']) {
+            $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION), [
+                'title' => sprintf(
+                    ngettext(
+                        '%1$d Teilnehmende/r, %2$d neue/r',
+                        '%1$d Teilnehmende, %2$d neue',
+                        $result['count']
+                    ),
+                    $result['count'],
+                    $result['neue']
+                )
+            ]);
+            $navigation->setBadgeNumber($result['neue']);
+        } elseif ($result['count']) {
+            $navigation->setLinkAttributes([
+                'title' => sprintf(
+                    ngettext(
+                        '%d Teilnehmende/r',
+                        '%d Teilnehmende',
+                        $result['count']
+                    ),
+                    $result['count']
+                )
+            ]);
+        }
+
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if ($GLOBALS['user']->id === 'nobody') {
+            return [];
+        }
+
+        $navigation = new Navigation(_('Teilnehmende'));
+        $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('persons', Icon::ROLE_INFO));
+
+        $course = Course::find($course_id);
+
+        // Only courses without children have a regular member list and statusgroups.
+        if (!$course->getSemClass()->isGroup()) {
+            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) || !$course->config->COURSE_MEMBERS_HIDE) {
+                $navigation->addSubNavigation('view', new Navigation(_('Teilnehmende'), 'dispatch.php/course/members'));
+                $navigation->addSubNavigation('statusgroups', new Navigation(_('Gruppen'), 'dispatch.php/course/statusgroups'));
+            }
+        } else {
+            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id)) {
+                $navigation->addSubNavigation('children', new Navigation(_('Teilnehmende in Unterveranstaltungen'), 'dispatch.php/course/grouping/members'));
+            }
+        }
+
+        if ($course->aux_lock_rule) {
+            $navigation->addSubNavigation('additional', new Navigation(_('Zusatzangaben'), 'dispatch.php/course/members/additional'));
+        }
+
+        return count($navigation->getSubNavigation()) > 0 ? ['members' => $navigation] : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'),
+            'description' => _('Die Teilnehmenden werden gruppiert nach ihrer '.
+                'jeweiligen Funktion in einer Tabelle gelistet. Für Lehrende '.
+                'werden sowohl das Anmeldedatum als auch der Studiengang mit '.
+                'Semesterangabe dargestellt. Die Liste kann in verschiedene '.
+                'Formate exportiert werden. Außerdem gibt es die '.
+                'Möglichkeiten, eine Rundmail an alle zu schreiben (nur '.
+                'Lehrende) bzw. einzelne Teilnehmende separat anzuschreiben.'),
+            'displayname' => _('Teilnehmende'),
+            'keywords' => _('Rundmail an einzelne, mehrere oder alle Teilnehmenden;
+                            Gruppierung nach Lehrenden, Tutor/-innen und Studierenden (Autor/-innen);
+                            Aufnahme neuer Studierender (Autor/-innen) und Tutor/-innen;
+                            Import einer Teilnehmendenliste;
+                            Export der Teilnehmendenliste;
+                            Einrichten von Gruppen;
+                            Anzeige Studiengang und Fachsemester'),
+            'descriptionshort' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'),
+            'descriptionlong' => _('Die Teilnehmenden werden gruppiert nach ihrer jeweiligen Rolle in '.
+                                   'einer Tabelle gelistet. Für Lehrende werden sowohl das Anmeldedatum '.
+                                   'als auch der Studiengang mit Semesterangabe der Studierenden dargestellt. '.
+                                   'Die Liste kann in verschiedene Formate exportiert werden. Außerdem gibt '.
+                                   'es die Möglichkeiten für Lehrende, allen eine Rundmail zukommen zu lassen '.
+                                   'bzw. einzelne Teilnehmende separat anzuschreiben.'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'icon' => Icon::create('persons', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('persons', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/TeilnehmerInnen',
+                'pictures' => [
+                    ['source' => 'Liste_aller_Teilnehmenden_einer_Veranstaltung.jpg', 'title' => _('Liste aller Teilnehmenden einer Veranstaltung')],
+                    ['source' => 'Rundmail_an_alle_TeilnehmerInnen_einer_Veranstaltung.jpg', 'title' => _('Rundmail an alle Teilnehmdenden einer Veranstaltung')],
+                ]
+            ],
+        ];
+    }
+
+    protected function getCourseStatus(Course $course, $user_id)
+    {
+        $member = CourseMember::find([$course->id, $user_id]);
+        if ($member) {
+            return $member->status;
+        }
+
+        if (Config::get()->DEPUTIES_ENABLE && Deputy::isDeputy($user_id, $course->id)) {
+            return 'dozent';
+        }
+
+        return false;
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return $context->getRangeType() === 'course';
+    }
+}
diff --git a/lib/modules/CorePersonal.class.php b/lib/modules/CorePersonal.class.php
deleted file mode 100644
index 71aaa6b..0000000
--- a/lib/modules/CorePersonal.class.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CorePersonal extends CorePlugin implements StudipModule
-{
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        return null;
-    }
-
-    public function getTabNavigation($course_id)
-    {
-        if ($GLOBALS['user']->id != 'nobody') {
-            $navigation = new Navigation(_('Personal'));
-            $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT));
-            $navigation->setActiveImage(Icon::create('persons', Icon::ROLE_INFO));
-            $navigation->addSubNavigation('view', new Navigation(_('MitarbeiterInnen'), 'dispatch.php/institute/members'));
-
-            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) && $GLOBALS['perm']->have_perm('admin')) {
-                $navigation->addSubNavigation('edit_groups', new Navigation(_('Funktionen / Gruppen verwalten'), 'dispatch.php/admin/statusgroups'));
-            }
-
-            return ['faculty' => $navigation];
-        } else {
-            return [];
-        }
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return $context->getRangeType() === 'institute';
-    }
-
-    /**
-     * @see StudipModule::getMetadata()
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary'          => _('Liste aller MitarbeiterInnen'),
-            'description'      => '',
-            'displayname'      => _('MitarbeiterInnen'),
-            'category'         => _('Sonstiges'),
-            'icon'             => Icon::create('persons', Icon::ROLE_INFO),
-            'icon_clickable'   => Icon::create('persons', Icon::ROLE_CLICKABLE)
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-}
diff --git a/lib/modules/CorePersonal.php b/lib/modules/CorePersonal.php
new file mode 100644
index 0000000..71aaa6b
--- /dev/null
+++ b/lib/modules/CorePersonal.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CorePersonal extends CorePlugin implements StudipModule
+{
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        return null;
+    }
+
+    public function getTabNavigation($course_id)
+    {
+        if ($GLOBALS['user']->id != 'nobody') {
+            $navigation = new Navigation(_('Personal'));
+            $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT));
+            $navigation->setActiveImage(Icon::create('persons', Icon::ROLE_INFO));
+            $navigation->addSubNavigation('view', new Navigation(_('MitarbeiterInnen'), 'dispatch.php/institute/members'));
+
+            if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) && $GLOBALS['perm']->have_perm('admin')) {
+                $navigation->addSubNavigation('edit_groups', new Navigation(_('Funktionen / Gruppen verwalten'), 'dispatch.php/admin/statusgroups'));
+            }
+
+            return ['faculty' => $navigation];
+        } else {
+            return [];
+        }
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return $context->getRangeType() === 'institute';
+    }
+
+    /**
+     * @see StudipModule::getMetadata()
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary'          => _('Liste aller MitarbeiterInnen'),
+            'description'      => '',
+            'displayname'      => _('MitarbeiterInnen'),
+            'category'         => _('Sonstiges'),
+            'icon'             => Icon::create('persons', Icon::ROLE_INFO),
+            'icon_clickable'   => Icon::create('persons', Icon::ROLE_CLICKABLE)
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+}
diff --git a/lib/modules/CoreSchedule.class.php b/lib/modules/CoreSchedule.class.php
deleted file mode 100644
index 601b618..0000000
--- a/lib/modules/CoreSchedule.class.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreSchedule extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        $query = "SELECT COUNT(termin_id) AS count,
-                         COUNT(IF((chdate > IFNULL(ouv.visitdate, :threshold) AND autor_id != :user_id), termin_id, NULL)) AS neue
-                  FROM termine
-                  LEFT JOIN object_user_visits AS ouv
-                    ON ouv.object_id = range_id
-                       AND ouv.user_id = :user_id
-                       AND ouv.plugin_id = :plugin_id
-                  WHERE range_id = :course_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $course_id);
-        $statement->bindValue(':threshold', $last_visit);
-        $statement->bindValue(':plugin_id', $this->getPluginId());
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$result || (!$result['neue'] && !$result['count'])) {
-            return null;
-        }
-
-        $nav = new Navigation(_('Ablaufplan'), 'dispatch.php/course/dates');
-        if ($result['neue']) {
-            $nav->setImage(Icon::create('schedule', Icon::ROLE_ATTENTION), [
-                'title' => sprintf(
-                    ngettext(
-                        '%1$d Termin, %2$d neuer',
-                        '%1$d Termine, %2$d neue',
-                        $result['count']
-                    ),
-                    $result['count'],
-                    $result['neue']
-                )
-            ]);
-            $nav->setBadgeNumber($result['neue']);
-        } else {
-            $nav->setImage(Icon::create('schedule', Icon::ROLE_CLICKABLE), [
-                'title' => sprintf(
-                    ngettext(
-                        '%d Termin',
-                        '%d Termine',
-                        $result['count']
-                    ),
-                    $result['count']
-                )
-            ]);
-        }
-        return $nav;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        $navigation = new Navigation(_('Ablaufplan'));
-        $navigation->setImage(Icon::create('schedule', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('schedule', Icon::ROLE_INFO));
-
-        $navigation->addSubNavigation('dates', new Navigation(_('Termine'), 'dispatch.php/course/dates'));
-        $navigation->addSubNavigation('topics', new Navigation(_('Themen'), 'dispatch.php/course/topics'));
-
-        return ['schedule' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Anzeige aller Termine der Veranstaltung'),
-            'description' => _('Der Ablaufplan listet alle Präsenz-, '.
-                'E-Learning-, Klausur-, Exkursions- und sonstige '.
-                'Veranstaltungstermine auf. Zur besseren Orientierung und zur '.
-                'inhaltlichen Einstimmung der Studierenden können Lehrende den '.
-                'Terminen Themen hinzufügen, die z. B. eine Kurzbeschreibung '.
-                'der Inhalte darstellen.'),
-            'displayname' => _('Ablaufplan'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'keywords' => _('Inhaltliche und räumliche Orientierung für Studierende;
-                            Beschreibung der Inhalte einzelner Termine;
-                            Raumangabe;
-                            Themenzuordnung zu Terminen;
-                            Terminzuordnung zu Themen'),
-            'descriptionshort' => _('Anzeige aller Termine der Veranstaltung, ggf. mit Themenansicht'),
-            'descriptionlong' => _('Der Ablaufplan listet alle Präsenz-, E-Learning-, Klausur-, Exkursions- ' .
-                                    'und sonstige Veranstaltungstermine auf. Zur besseren Orientierung und zur ' .
-                                    'inhaltlichen Einstimmung der Studierenden können Lehrende den Terminen ' .
-                                    'Themen hinzufügen, die z. B. eine Kurzbeschreibung der Inhalte darstellen.'),
-            'icon' => Icon::create('schedule', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('schedule', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Ablaufplan',
-                'pictures' => [
-                    0 => ['source' => 'Termine_mit_Themen.jpg', 'title' => _('Termine mit Themen')],
-                    1 => [ 'source' => 'Thema_bearbeiten_und_einem_Termin_zuordnen.jpg', 'title' => _('Thema bearbeiten und einem Termin zuordnen')]
-                ]
-            ]
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return $context->getRangeType() === 'course';
-    }
-}
diff --git a/lib/modules/CoreSchedule.php b/lib/modules/CoreSchedule.php
new file mode 100644
index 0000000..601b618
--- /dev/null
+++ b/lib/modules/CoreSchedule.php
@@ -0,0 +1,130 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreSchedule extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        $query = "SELECT COUNT(termin_id) AS count,
+                         COUNT(IF((chdate > IFNULL(ouv.visitdate, :threshold) AND autor_id != :user_id), termin_id, NULL)) AS neue
+                  FROM termine
+                  LEFT JOIN object_user_visits AS ouv
+                    ON ouv.object_id = range_id
+                       AND ouv.user_id = :user_id
+                       AND ouv.plugin_id = :plugin_id
+                  WHERE range_id = :course_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':course_id', $course_id);
+        $statement->bindValue(':threshold', $last_visit);
+        $statement->bindValue(':plugin_id', $this->getPluginId());
+        $statement->execute();
+        $result = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$result || (!$result['neue'] && !$result['count'])) {
+            return null;
+        }
+
+        $nav = new Navigation(_('Ablaufplan'), 'dispatch.php/course/dates');
+        if ($result['neue']) {
+            $nav->setImage(Icon::create('schedule', Icon::ROLE_ATTENTION), [
+                'title' => sprintf(
+                    ngettext(
+                        '%1$d Termin, %2$d neuer',
+                        '%1$d Termine, %2$d neue',
+                        $result['count']
+                    ),
+                    $result['count'],
+                    $result['neue']
+                )
+            ]);
+            $nav->setBadgeNumber($result['neue']);
+        } else {
+            $nav->setImage(Icon::create('schedule', Icon::ROLE_CLICKABLE), [
+                'title' => sprintf(
+                    ngettext(
+                        '%d Termin',
+                        '%d Termine',
+                        $result['count']
+                    ),
+                    $result['count']
+                )
+            ]);
+        }
+        return $nav;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        $navigation = new Navigation(_('Ablaufplan'));
+        $navigation->setImage(Icon::create('schedule', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('schedule', Icon::ROLE_INFO));
+
+        $navigation->addSubNavigation('dates', new Navigation(_('Termine'), 'dispatch.php/course/dates'));
+        $navigation->addSubNavigation('topics', new Navigation(_('Themen'), 'dispatch.php/course/topics'));
+
+        return ['schedule' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Anzeige aller Termine der Veranstaltung'),
+            'description' => _('Der Ablaufplan listet alle Präsenz-, '.
+                'E-Learning-, Klausur-, Exkursions- und sonstige '.
+                'Veranstaltungstermine auf. Zur besseren Orientierung und zur '.
+                'inhaltlichen Einstimmung der Studierenden können Lehrende den '.
+                'Terminen Themen hinzufügen, die z. B. eine Kurzbeschreibung '.
+                'der Inhalte darstellen.'),
+            'displayname' => _('Ablaufplan'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'keywords' => _('Inhaltliche und räumliche Orientierung für Studierende;
+                            Beschreibung der Inhalte einzelner Termine;
+                            Raumangabe;
+                            Themenzuordnung zu Terminen;
+                            Terminzuordnung zu Themen'),
+            'descriptionshort' => _('Anzeige aller Termine der Veranstaltung, ggf. mit Themenansicht'),
+            'descriptionlong' => _('Der Ablaufplan listet alle Präsenz-, E-Learning-, Klausur-, Exkursions- ' .
+                                    'und sonstige Veranstaltungstermine auf. Zur besseren Orientierung und zur ' .
+                                    'inhaltlichen Einstimmung der Studierenden können Lehrende den Terminen ' .
+                                    'Themen hinzufügen, die z. B. eine Kurzbeschreibung der Inhalte darstellen.'),
+            'icon' => Icon::create('schedule', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('schedule', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Ablaufplan',
+                'pictures' => [
+                    0 => ['source' => 'Termine_mit_Themen.jpg', 'title' => _('Termine mit Themen')],
+                    1 => [ 'source' => 'Thema_bearbeiten_und_einem_Termin_zuordnen.jpg', 'title' => _('Thema bearbeiten und einem Termin zuordnen')]
+                ]
+            ]
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return $context->getRangeType() === 'course';
+    }
+}
diff --git a/lib/modules/CoreScm.class.php b/lib/modules/CoreScm.class.php
deleted file mode 100644
index d37023b..0000000
--- a/lib/modules/CoreScm.class.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreScm extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        if (!Config::get()->SCM_ENABLE) {
-            return null;
-        }
-
-        $sql = "SELECT scm_id,
-                       SUM(IF(content != '', 1, 0)) AS count,
-                       SUM(IF((chdate > IFNULL(ouv.visitdate, :threshold) AND scm.user_id !=:user_id), IF(content != '', 1, 0), NULL)) AS neue
-                FROM scm
-                LEFT JOIN object_user_visits AS ouv
-                  ON ouv.object_id = scm.range_id
-                     AND ouv.user_id = :user_id
-                     AND ouv.plugin_id = :plugin_id
-                WHERE scm.range_id = :course_id
-                GROUP BY scm.range_id";
-
-        $statement = DBManager::get()->prepare($sql);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $course_id);
-        $statement->bindValue(':threshold', $last_visit);
-        $statement->bindValue(':plugin_id', $this->getPluginId());
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$result) {
-            return null;
-        }
-
-        $scm = StudipScmEntry::find($result['scm_id']);
-
-        $nav = new Navigation((string) $scm->tab_name, 'dispatch.php/course/scm');
-
-        if ($result['count']) {
-            if ($result['neue']) {
-                $image = Icon::create('infopage', Icon::ROLE_NEW);
-                $nav->setBadgeNumber($result['neue']);
-                if ($result['count'] == 1) {
-                    $title = $scm->tab_name . _(' (geändert)');
-                } else {
-                    $title = sprintf(
-                        _('%1$d Einträge insgesamt, %2$d neue'),
-                        $result['count'],
-                        $result['neue']
-                    );
-                }
-            } else {
-                $image = Icon::create('infopage', Icon::ROLE_CLICKABLE);
-                if ($result['count'] == 1) {
-                    $title = $scm->tab_name;
-                } else {
-                    $title = sprintf(
-                        ngettext(
-                            '%d Eintrag',
-                            '%d Einträge',
-                            $result['count']
-                        ),
-                        $result['count']
-                    );
-                }
-            }
-            $nav->setImage($image, ['title' => $title]);
-        }
-        return $nav;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if (!Config::get()->SCM_ENABLE) {
-            return null;
-        }
-
-        $temp = StudipScmEntry::findByRange_id($course_id, 'ORDER BY position ASC');
-        $scms = SimpleORMapCollection::createFromArray($temp);
-
-        $link = 'dispatch.php/course/scm';
-
-        $navigation = new Navigation($scms->first()->tab_name ?? _('Informationen'), $link);
-        $navigation->setImage(Icon::create('infopage', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('infopage', Icon::ROLE_INFO));
-
-        foreach ($scms as $scm) {
-            $scm_link = "{$link}/{$scm->id}";
-            $nav = new Navigation($scm['tab_name'], $scm_link);
-            $navigation->addSubNavigation($scm->id, $nav);
-        }
-
-        return ['scm' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Die Lehrenden bestimmen, wie Titel und Inhalt dieser Seite aussehen.'),
-            'description' => _('Die Freie Informationsseite ist eine Seite, '.
-                'die sich die Lehrenden nach ihren speziellen Anforderungen '.
-                'einrichten können. So kann z.B. der Titel im Kartenreiter '.
-                'selbst definiert werden. Ferner können beliebig viele '.
-                'Einträge im Untermenü vorgenommen werden. Für jeden Eintrag '.
-                'öffnet sich eine Seite mit einem Text-Editor, in den '.
-                'beliebiger Text eingegeben und formatiert werden kann. Oft '.
-                'wird die Seite für die Angabe von Literatur genutzt als '.
-                'Alternative zum Plugin Literatur. Sie kann aber auch für '.
-                'andere beliebige Zusatzinformationen (Links, Protokolle '.
-                'etc.) verwendet werden.'),
-            'displayname' => _('Informationen'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'keywords' => _('Raum für eigene Informationen;
-                            Name des Reiters frei definierbar;
-                            Beliebig erweiterbar durch zusätzliche "neue Einträge"'),
-            'descriptionshort' => _('Freie Gestaltung von Reiternamen und Inhalten durch Lehrende.'),
-            'descriptionlong' => _('Diese Seite kann von Lehrenden nach ihren speziellen Anforderungen eingerichtet werden. '.
-                                    'So ist z.B. der Titel im Reiter frei definierbar. Ferner können beliebig viele neue '.
-                                    'Eintragsseiten eingefügt werden. Für jeden Eintrag öffnet sich eine Seite mit einem '.
-                                    'Text-Editor, in den beliebiger Text eingefüft, eingegeben und formatiert werden kann. '.
-                                    'Oft wird die Seite für die Angabe von Literatur genutzt als Alternative zur Funktion '.
-                                    'Literatur. Sie kann aber auch für andere beliebige Zusatzinformationen (Links, Protokolle '.
-                                    'etc.) verwendet werden.'),
-            'icon' => Icon::create('infopage', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('infopage', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Freie_Informationsseite',
-                'pictures' => [
-                    0 => ['source' => 'Zwei_Eintraege_mit_Inhalten_zur_Verfuegung_stellen.jpg', 'title' => _('Zwei Einträge mit Inhalten zur Verfügung stellen')],
-                    1 => [ 'source' => 'Neue_Informationsseite_anlegen.jpg', 'title' => _('Neue Informationsseite anlegen')]
-                ]
-            ]
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-
-    function deleteContent($course_id)
-    {
-
-    }
-}
diff --git a/lib/modules/CoreScm.php b/lib/modules/CoreScm.php
new file mode 100644
index 0000000..d37023b
--- /dev/null
+++ b/lib/modules/CoreScm.php
@@ -0,0 +1,163 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreScm extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        if (!Config::get()->SCM_ENABLE) {
+            return null;
+        }
+
+        $sql = "SELECT scm_id,
+                       SUM(IF(content != '', 1, 0)) AS count,
+                       SUM(IF((chdate > IFNULL(ouv.visitdate, :threshold) AND scm.user_id !=:user_id), IF(content != '', 1, 0), NULL)) AS neue
+                FROM scm
+                LEFT JOIN object_user_visits AS ouv
+                  ON ouv.object_id = scm.range_id
+                     AND ouv.user_id = :user_id
+                     AND ouv.plugin_id = :plugin_id
+                WHERE scm.range_id = :course_id
+                GROUP BY scm.range_id";
+
+        $statement = DBManager::get()->prepare($sql);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':course_id', $course_id);
+        $statement->bindValue(':threshold', $last_visit);
+        $statement->bindValue(':plugin_id', $this->getPluginId());
+        $statement->execute();
+        $result = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$result) {
+            return null;
+        }
+
+        $scm = StudipScmEntry::find($result['scm_id']);
+
+        $nav = new Navigation((string) $scm->tab_name, 'dispatch.php/course/scm');
+
+        if ($result['count']) {
+            if ($result['neue']) {
+                $image = Icon::create('infopage', Icon::ROLE_NEW);
+                $nav->setBadgeNumber($result['neue']);
+                if ($result['count'] == 1) {
+                    $title = $scm->tab_name . _(' (geändert)');
+                } else {
+                    $title = sprintf(
+                        _('%1$d Einträge insgesamt, %2$d neue'),
+                        $result['count'],
+                        $result['neue']
+                    );
+                }
+            } else {
+                $image = Icon::create('infopage', Icon::ROLE_CLICKABLE);
+                if ($result['count'] == 1) {
+                    $title = $scm->tab_name;
+                } else {
+                    $title = sprintf(
+                        ngettext(
+                            '%d Eintrag',
+                            '%d Einträge',
+                            $result['count']
+                        ),
+                        $result['count']
+                    );
+                }
+            }
+            $nav->setImage($image, ['title' => $title]);
+        }
+        return $nav;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if (!Config::get()->SCM_ENABLE) {
+            return null;
+        }
+
+        $temp = StudipScmEntry::findByRange_id($course_id, 'ORDER BY position ASC');
+        $scms = SimpleORMapCollection::createFromArray($temp);
+
+        $link = 'dispatch.php/course/scm';
+
+        $navigation = new Navigation($scms->first()->tab_name ?? _('Informationen'), $link);
+        $navigation->setImage(Icon::create('infopage', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('infopage', Icon::ROLE_INFO));
+
+        foreach ($scms as $scm) {
+            $scm_link = "{$link}/{$scm->id}";
+            $nav = new Navigation($scm['tab_name'], $scm_link);
+            $navigation->addSubNavigation($scm->id, $nav);
+        }
+
+        return ['scm' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Die Lehrenden bestimmen, wie Titel und Inhalt dieser Seite aussehen.'),
+            'description' => _('Die Freie Informationsseite ist eine Seite, '.
+                'die sich die Lehrenden nach ihren speziellen Anforderungen '.
+                'einrichten können. So kann z.B. der Titel im Kartenreiter '.
+                'selbst definiert werden. Ferner können beliebig viele '.
+                'Einträge im Untermenü vorgenommen werden. Für jeden Eintrag '.
+                'öffnet sich eine Seite mit einem Text-Editor, in den '.
+                'beliebiger Text eingegeben und formatiert werden kann. Oft '.
+                'wird die Seite für die Angabe von Literatur genutzt als '.
+                'Alternative zum Plugin Literatur. Sie kann aber auch für '.
+                'andere beliebige Zusatzinformationen (Links, Protokolle '.
+                'etc.) verwendet werden.'),
+            'displayname' => _('Informationen'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'keywords' => _('Raum für eigene Informationen;
+                            Name des Reiters frei definierbar;
+                            Beliebig erweiterbar durch zusätzliche "neue Einträge"'),
+            'descriptionshort' => _('Freie Gestaltung von Reiternamen und Inhalten durch Lehrende.'),
+            'descriptionlong' => _('Diese Seite kann von Lehrenden nach ihren speziellen Anforderungen eingerichtet werden. '.
+                                    'So ist z.B. der Titel im Reiter frei definierbar. Ferner können beliebig viele neue '.
+                                    'Eintragsseiten eingefügt werden. Für jeden Eintrag öffnet sich eine Seite mit einem '.
+                                    'Text-Editor, in den beliebiger Text eingefüft, eingegeben und formatiert werden kann. '.
+                                    'Oft wird die Seite für die Angabe von Literatur genutzt als Alternative zur Funktion '.
+                                    'Literatur. Sie kann aber auch für andere beliebige Zusatzinformationen (Links, Protokolle '.
+                                    'etc.) verwendet werden.'),
+            'icon' => Icon::create('infopage', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('infopage', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Freie_Informationsseite',
+                'pictures' => [
+                    0 => ['source' => 'Zwei_Eintraege_mit_Inhalten_zur_Verfuegung_stellen.jpg', 'title' => _('Zwei Einträge mit Inhalten zur Verfügung stellen')],
+                    1 => [ 'source' => 'Neue_Informationsseite_anlegen.jpg', 'title' => _('Neue Informationsseite anlegen')]
+                ]
+            ]
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+
+    function deleteContent($course_id)
+    {
+
+    }
+}
diff --git a/lib/modules/CoreStudygroupAdmin.class.php b/lib/modules/CoreStudygroupAdmin.class.php
deleted file mode 100644
index d299adf..0000000
--- a/lib/modules/CoreStudygroupAdmin.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreStudygroupAdmin extends CorePlugin implements StudipModule
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        $navigation = new Navigation(_('Verwaltung'), "dispatch.php/course/studygroup/edit/?cid={$course_id}");
-        $navigation->setImage(Icon::create('admin', Icon::ROLE_CLICKABLE), ['title' => _('Verwaltung')]);
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if (!$GLOBALS['perm']->have_studip_perm('dozent', $course_id)) {
-            return [];
-        }
-
-        $navigation = new Navigation(_('Verwaltung'));
-        $navigation->setImage(Icon::create('admin', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('admin', Icon::ROLE_INFO));
-
-        $navigation->addSubNavigation('contentmodules', new Navigation(_('Werkzeuge'), "dispatch.php/course/contentmodules?cid={$course_id}"));
-        $navigation->addSubNavigation('main', new Navigation(_('Verwaltung'), "dispatch.php/course/studygroup/edit/?cid={$course_id}"));
-        $navigation->addSubNavigation('avatar', new Navigation(_('Infobild'), "dispatch.php/avatar/update/course/{$course_id}?cid={$course_id}"));
-
-        if (!$GLOBALS['perm']->have_perm('admin') && Config::get()->VOTE_ENABLE) {
-            $item = new Navigation(_('Fragebögen'), 'dispatch.php/questionnaire/courseoverview');
-            $item->setDescription(_('Erstellen und bearbeiten von Fragebögen.'));
-            $navigation->addSubNavigation('questionnaires', $item);
-        }
-        return ['admin' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'displayname' => _('Verwaltung')
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return false;
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-}
diff --git a/lib/modules/CoreStudygroupAdmin.php b/lib/modules/CoreStudygroupAdmin.php
new file mode 100644
index 0000000..d299adf
--- /dev/null
+++ b/lib/modules/CoreStudygroupAdmin.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreStudygroupAdmin extends CorePlugin implements StudipModule
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        $navigation = new Navigation(_('Verwaltung'), "dispatch.php/course/studygroup/edit/?cid={$course_id}");
+        $navigation->setImage(Icon::create('admin', Icon::ROLE_CLICKABLE), ['title' => _('Verwaltung')]);
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if (!$GLOBALS['perm']->have_studip_perm('dozent', $course_id)) {
+            return [];
+        }
+
+        $navigation = new Navigation(_('Verwaltung'));
+        $navigation->setImage(Icon::create('admin', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('admin', Icon::ROLE_INFO));
+
+        $navigation->addSubNavigation('contentmodules', new Navigation(_('Werkzeuge'), "dispatch.php/course/contentmodules?cid={$course_id}"));
+        $navigation->addSubNavigation('main', new Navigation(_('Verwaltung'), "dispatch.php/course/studygroup/edit/?cid={$course_id}"));
+        $navigation->addSubNavigation('avatar', new Navigation(_('Infobild'), "dispatch.php/avatar/update/course/{$course_id}?cid={$course_id}"));
+
+        if (!$GLOBALS['perm']->have_perm('admin') && Config::get()->VOTE_ENABLE) {
+            $item = new Navigation(_('Fragebögen'), 'dispatch.php/questionnaire/courseoverview');
+            $item->setDescription(_('Erstellen und bearbeiten von Fragebögen.'));
+            $navigation->addSubNavigation('questionnaires', $item);
+        }
+        return ['admin' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'displayname' => _('Verwaltung')
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return false;
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+}
diff --git a/lib/modules/CoreStudygroupParticipants.class.php b/lib/modules/CoreStudygroupParticipants.class.php
deleted file mode 100644
index 334f84a..0000000
--- a/lib/modules/CoreStudygroupParticipants.class.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreStudygroupParticipants extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/{$course_id}");
-        $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
-        if ($last_visit && CourseMember::countBySQL("seminar_id = :course_id AND mkdate >= :last_visit", ['last_visit' => $last_visit, 'course_id' => $course_id]) > 0) {
-            $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION));
-        }
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/".$course_id);
-        $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('persons', Icon::ROLE_INFO));
-        return ['members' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'icon' => Icon::create('persons', Icon::ROLE_INFO),
-            'displayname' => _('Teilnehmende'),
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        // TODO: Implement getInfoTemplate() method.
-        return null;
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return false;
-    }
-}
diff --git a/lib/modules/CoreStudygroupParticipants.php b/lib/modules/CoreStudygroupParticipants.php
new file mode 100644
index 0000000..334f84a
--- /dev/null
+++ b/lib/modules/CoreStudygroupParticipants.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreStudygroupParticipants extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/{$course_id}");
+        $navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
+        if ($last_visit && CourseMember::countBySQL("seminar_id = :course_id AND mkdate >= :last_visit", ['last_visit' => $last_visit, 'course_id' => $course_id]) > 0) {
+            $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION));
+        }
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/".$course_id);
+        $navigation->setImage(Icon::create('persons', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('persons', Icon::ROLE_INFO));
+        return ['members' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Liste aller Teilnehmenden einschließlich Nachrichtenfunktionen'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'icon' => Icon::create('persons', Icon::ROLE_INFO),
+            'displayname' => _('Teilnehmende'),
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        // TODO: Implement getInfoTemplate() method.
+        return null;
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return false;
+    }
+}
diff --git a/lib/modules/CoreWiki.class.php b/lib/modules/CoreWiki.class.php
deleted file mode 100644
index a447451..0000000
--- a/lib/modules/CoreWiki.class.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-class CoreWiki extends CorePlugin implements StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($range_id, $last_visit, $user_id)
-    {
-        if (!Config::get()->WIKI_ENABLE) {
-            return null;
-        }
-        $perm = $GLOBALS['perm']->get_perm($user_id);
-        if (in_array($perm, ['admin', 'root'])) {
-            $perm = 'dozent';
-        }
-
-        $statement = DBManager::get()->prepare("
-            SELECT `wiki_pages`.`page_id`
-            FROM `wiki_pages`
-                LEFT JOIN `statusgruppe_user` ON (`statusgruppe_user`.`statusgruppe_id` = `wiki_pages`.`read_permission`)
-            WHERE `wiki_pages`.`range_id` = :range_id
-                AND (
-                    `wiki_pages`.`read_permission` = 'all'
-                    OR `statusgruppe_user`.`user_id` = :user_id
-                    OR `wiki_pages`.`read_permission` = :perm
-                    OR (`wiki_pages`.`read_permission` = 'tutor' AND :perm = 'dozent')
-                )
-        ");
-
-        $statement->execute([
-            'range_id' => $range_id,
-            'user_id' => $user_id,
-            'perm' => $perm
-        ]);
-        $wiki_page_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-        if (count($wiki_page_ids) === 0) {
-            return null;
-        }
-
-        $visit_date = object_get_visit($range_id, $this->getPluginId(), 'visitdate') ?? $last_visit;
-
-        $statement = DBManager::get()->prepare("
-            SELECT COUNT(*) AS `neue`
-            FROM `wiki_pages`
-            WHERE `wiki_pages`.`page_id` IN (:page_ids)
-                AND `wiki_pages`.`chdate` > :threshold
-                AND `wiki_pages`.`user_id` != :user_id
-        ");
-        $statement->execute([
-            'page_ids' => $wiki_page_ids,
-            'threshold' => $visit_date,
-            'user_id' => $user_id,
-        ]);
-        $new_pages = $statement->fetch(PDO::FETCH_COLUMN, 0);
-
-        $nav = new Navigation(_('Wiki'));
-        if ($new_pages > 0) {
-            $nav->setURL('dispatch.php/course/wiki/newpages');
-            $nav->setImage(Icon::create('wiki', Icon::ROLE_ATTENTION, [
-                'title' => sprintf(
-                    ngettext(
-                        '%d Wiki-Seite',
-                        '%d Wiki-Seiten',
-                        count($wiki_page_ids)
-                    ),
-                    count($wiki_page_ids)
-                )
-                . ', '
-                . sprintf(
-                    ngettext(
-                        '%d Änderung',
-                        '%d Änderungen',
-                        $new_pages
-                     ),
-                        $new_pages
-                 )
-            ]));
-            $nav->setBadgeNumber($new_pages);
-        } else {
-            $nav->setURL('dispatch.php/course/wiki/page');
-            $nav->setImage(Icon::create('wiki', Icon::ROLE_CLICKABLE, [
-                'title' => sprintf(
-                    ngettext(
-                        '%d Wiki-Seite',
-                        '%d Wiki-Seiten',
-                        count($wiki_page_ids)
-                    ),
-                    count($wiki_page_ids)
-                )
-            ]));
-        }
-        return $nav;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($range_id)
-    {
-        if (!Config::get()->WIKI_ENABLE) {
-            return null;
-        }
-
-        $navigation = new Navigation(_('Wiki'));
-        $navigation->setImage(Icon::create('wiki', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('wiki', Icon::ROLE_INFO));
-
-        $navigation->addSubNavigation('start', new Navigation(_('Wiki-Startseite'), 'dispatch.php/course/wiki/page'));
-        if (WikiPage::countBySQL('`range_id` = ?', [$range_id]) > 0) {
-            $navigation->addSubNavigation('listnew', new Navigation(_('Neue Seiten'), 'dispatch.php/course/wiki/newpages'));
-            $navigation->addSubNavigation('allpages', new Navigation(_('Alle Seiten'), 'dispatch.php/course/wiki/allpages'));
-        }
-        return ['wiki' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Gemeinsames Erstellen und Bearbeiten von Texten'),
-            'description' => _('Im Wiki können '.
-                'verschiedene Autor/-innen gemeinsam Texte, Konzepte und andere '.
-                'schriftliche Arbeiten erstellen und gestalten, dies '.
-                'allerdings nicht gleichzeitig. Texte können individuell '.
-                'bearbeitet und die Änderungen gespeichert werden. Das '.
-                'Besondere im Wiki ist, dass Studierende und Lehrende '.
-                'annähernd die gleichen Rechte (schreiben, lesen, ändern, '.
-                'löschen) haben, was sich nicht einschränken lässt. Das '.
-                'System erstellt eine Versionshistorie, mit der Änderungen '.
-                'nachvollziehbar werden. Einzelne Versionen können zudem '.
-                'auch gelöscht werden (nur Lehrende). Ein Export als '.
-                'pdf-Datei ist integriert.'),
-
-            'displayname' => _('Wiki-Web'),
-            'keywords' => _('Individuelle Bearbeitung von Texten;
-                            Versionshistorie;
-                            Druckansicht und PDF-Export;
-                            Löschfunktion für die aktuellste Seiten-Version;
-                            Keine gleichzeitige Bearbeitung desselben Textes möglich, nur nacheinander'),
-            'descriptionshort' => _('Gemeinsames asynchrones Erstellen und Bearbeiten von Texten'),
-            'descriptionlong' => _('Im Wiki können verschiedene Autor/-innen gemeinsam Texte, '.
-                                    'Konzepte und andere schriftliche Arbeiten erstellen und gestalten. Dies '.
-                                    'allerdings nicht gleichzeitig. Texte können individuell bearbeitet und '.
-                                    'gespeichert werden. Das Besondere im Wiki ist, dass Studierende und Lehrende '.
-                                    'annähernd die gleichen Rechte (schreiben, lesen, ändern, löschen) haben, was '.
-                                    'gegenseitiges Vertrauen voraussetzt. Das System erstellt eine Versionshistorie, '.
-                                    'mit der Änderungen nachvollziehbar werden. Einzelne Versionen können zudem auch '.
-                                    'gelöscht werden (nur Lehrende). Eine Druckansicht und eine Exportmöglichkeit als '.
-                                    'PDF-Datei ist integriert.'),
-            'category' => _('Kommunikation und Zusammenarbeit'),
-            'icon' => Icon::create('wiki', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('wiki', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Wiki-Web',
-                'pictures' => [
-                    0 => [ 'source' => 'Gemeinsam_erstellte_Texte.jpg', 'title' => 'Gemeinsam erstellte Texte']
-                ]
-            ]
-        ];
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-
-    /**
-     * Generates a page hierarchy for table of contents/breadcrumbs.
-     * @return TOCItem
-     */
-    public static function getTOC($page, $first = true): TOCItem
-    {
-        $root = new TOCItem(
-            ($page && ($page->isNew() || $page->name === 'WikiWikiWeb'))
-            ? _('Wiki-Startseite')
-            : $page->name
-        );
-        $root->setURL(URLHelper::getURL('dispatch.php/course/wiki/page/'.$page->id));
-        if ($page->name == 'WikiWikiWeb' || $page->id == CourseConfig::get($page->range_id)->WIKI_STARTPAGE_ID) {
-            $root->setIcon(Icon::create('wiki'));
-        }
-        $root->setActive($first);
-
-        if ($page->parent) {
-            $parent = self::getTOC($page->parent, false);
-            $root->setParent($parent);
-        }
-
-        return $root;
-    }
-
-}
diff --git a/lib/modules/CoreWiki.php b/lib/modules/CoreWiki.php
new file mode 100644
index 0000000..a447451
--- /dev/null
+++ b/lib/modules/CoreWiki.php
@@ -0,0 +1,205 @@
+<?php
+
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+class CoreWiki extends CorePlugin implements StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($range_id, $last_visit, $user_id)
+    {
+        if (!Config::get()->WIKI_ENABLE) {
+            return null;
+        }
+        $perm = $GLOBALS['perm']->get_perm($user_id);
+        if (in_array($perm, ['admin', 'root'])) {
+            $perm = 'dozent';
+        }
+
+        $statement = DBManager::get()->prepare("
+            SELECT `wiki_pages`.`page_id`
+            FROM `wiki_pages`
+                LEFT JOIN `statusgruppe_user` ON (`statusgruppe_user`.`statusgruppe_id` = `wiki_pages`.`read_permission`)
+            WHERE `wiki_pages`.`range_id` = :range_id
+                AND (
+                    `wiki_pages`.`read_permission` = 'all'
+                    OR `statusgruppe_user`.`user_id` = :user_id
+                    OR `wiki_pages`.`read_permission` = :perm
+                    OR (`wiki_pages`.`read_permission` = 'tutor' AND :perm = 'dozent')
+                )
+        ");
+
+        $statement->execute([
+            'range_id' => $range_id,
+            'user_id' => $user_id,
+            'perm' => $perm
+        ]);
+        $wiki_page_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+        if (count($wiki_page_ids) === 0) {
+            return null;
+        }
+
+        $visit_date = object_get_visit($range_id, $this->getPluginId(), 'visitdate') ?? $last_visit;
+
+        $statement = DBManager::get()->prepare("
+            SELECT COUNT(*) AS `neue`
+            FROM `wiki_pages`
+            WHERE `wiki_pages`.`page_id` IN (:page_ids)
+                AND `wiki_pages`.`chdate` > :threshold
+                AND `wiki_pages`.`user_id` != :user_id
+        ");
+        $statement->execute([
+            'page_ids' => $wiki_page_ids,
+            'threshold' => $visit_date,
+            'user_id' => $user_id,
+        ]);
+        $new_pages = $statement->fetch(PDO::FETCH_COLUMN, 0);
+
+        $nav = new Navigation(_('Wiki'));
+        if ($new_pages > 0) {
+            $nav->setURL('dispatch.php/course/wiki/newpages');
+            $nav->setImage(Icon::create('wiki', Icon::ROLE_ATTENTION, [
+                'title' => sprintf(
+                    ngettext(
+                        '%d Wiki-Seite',
+                        '%d Wiki-Seiten',
+                        count($wiki_page_ids)
+                    ),
+                    count($wiki_page_ids)
+                )
+                . ', '
+                . sprintf(
+                    ngettext(
+                        '%d Änderung',
+                        '%d Änderungen',
+                        $new_pages
+                     ),
+                        $new_pages
+                 )
+            ]));
+            $nav->setBadgeNumber($new_pages);
+        } else {
+            $nav->setURL('dispatch.php/course/wiki/page');
+            $nav->setImage(Icon::create('wiki', Icon::ROLE_CLICKABLE, [
+                'title' => sprintf(
+                    ngettext(
+                        '%d Wiki-Seite',
+                        '%d Wiki-Seiten',
+                        count($wiki_page_ids)
+                    ),
+                    count($wiki_page_ids)
+                )
+            ]));
+        }
+        return $nav;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($range_id)
+    {
+        if (!Config::get()->WIKI_ENABLE) {
+            return null;
+        }
+
+        $navigation = new Navigation(_('Wiki'));
+        $navigation->setImage(Icon::create('wiki', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('wiki', Icon::ROLE_INFO));
+
+        $navigation->addSubNavigation('start', new Navigation(_('Wiki-Startseite'), 'dispatch.php/course/wiki/page'));
+        if (WikiPage::countBySQL('`range_id` = ?', [$range_id]) > 0) {
+            $navigation->addSubNavigation('listnew', new Navigation(_('Neue Seiten'), 'dispatch.php/course/wiki/newpages'));
+            $navigation->addSubNavigation('allpages', new Navigation(_('Alle Seiten'), 'dispatch.php/course/wiki/allpages'));
+        }
+        return ['wiki' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Gemeinsames Erstellen und Bearbeiten von Texten'),
+            'description' => _('Im Wiki können '.
+                'verschiedene Autor/-innen gemeinsam Texte, Konzepte und andere '.
+                'schriftliche Arbeiten erstellen und gestalten, dies '.
+                'allerdings nicht gleichzeitig. Texte können individuell '.
+                'bearbeitet und die Änderungen gespeichert werden. Das '.
+                'Besondere im Wiki ist, dass Studierende und Lehrende '.
+                'annähernd die gleichen Rechte (schreiben, lesen, ändern, '.
+                'löschen) haben, was sich nicht einschränken lässt. Das '.
+                'System erstellt eine Versionshistorie, mit der Änderungen '.
+                'nachvollziehbar werden. Einzelne Versionen können zudem '.
+                'auch gelöscht werden (nur Lehrende). Ein Export als '.
+                'pdf-Datei ist integriert.'),
+
+            'displayname' => _('Wiki-Web'),
+            'keywords' => _('Individuelle Bearbeitung von Texten;
+                            Versionshistorie;
+                            Druckansicht und PDF-Export;
+                            Löschfunktion für die aktuellste Seiten-Version;
+                            Keine gleichzeitige Bearbeitung desselben Textes möglich, nur nacheinander'),
+            'descriptionshort' => _('Gemeinsames asynchrones Erstellen und Bearbeiten von Texten'),
+            'descriptionlong' => _('Im Wiki können verschiedene Autor/-innen gemeinsam Texte, '.
+                                    'Konzepte und andere schriftliche Arbeiten erstellen und gestalten. Dies '.
+                                    'allerdings nicht gleichzeitig. Texte können individuell bearbeitet und '.
+                                    'gespeichert werden. Das Besondere im Wiki ist, dass Studierende und Lehrende '.
+                                    'annähernd die gleichen Rechte (schreiben, lesen, ändern, löschen) haben, was '.
+                                    'gegenseitiges Vertrauen voraussetzt. Das System erstellt eine Versionshistorie, '.
+                                    'mit der Änderungen nachvollziehbar werden. Einzelne Versionen können zudem auch '.
+                                    'gelöscht werden (nur Lehrende). Eine Druckansicht und eine Exportmöglichkeit als '.
+                                    'PDF-Datei ist integriert.'),
+            'category' => _('Kommunikation und Zusammenarbeit'),
+            'icon' => Icon::create('wiki', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('wiki', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Wiki-Web',
+                'pictures' => [
+                    0 => [ 'source' => 'Gemeinsam_erstellte_Texte.jpg', 'title' => 'Gemeinsam erstellte Texte']
+                ]
+            ]
+        ];
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+
+    /**
+     * Generates a page hierarchy for table of contents/breadcrumbs.
+     * @return TOCItem
+     */
+    public static function getTOC($page, $first = true): TOCItem
+    {
+        $root = new TOCItem(
+            ($page && ($page->isNew() || $page->name === 'WikiWikiWeb'))
+            ? _('Wiki-Startseite')
+            : $page->name
+        );
+        $root->setURL(URLHelper::getURL('dispatch.php/course/wiki/page/'.$page->id));
+        if ($page->name == 'WikiWikiWeb' || $page->id == CourseConfig::get($page->range_id)->WIKI_STARTPAGE_ID) {
+            $root->setIcon(Icon::create('wiki'));
+        }
+        $root->setActive($first);
+
+        if ($page->parent) {
+            $parent = self::getTOC($page->parent, false);
+            $root->setParent($parent);
+        }
+
+        return $root;
+    }
+
+}
diff --git a/lib/modules/CoursewareModule.class.php b/lib/modules/CoursewareModule.class.php
deleted file mode 100644
index 8deeda7..0000000
--- a/lib/modules/CoursewareModule.class.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-use Courseware\Instance;
-use Courseware\StructuralElement;
-
-class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
-            $last_element_configs = \ConfigValue::findBySQL('field = ? AND value LIKE ?', [
-                'COURSEWARE_LAST_ELEMENT',
-                '%' . $course->id . '%',
-            ]);
-            foreach ($last_element_configs as $config) {
-                $arr = json_decode($config->value, true);
-                $arr = array_filter(
-                    $arr,
-                    function ($key) use ($course) {
-                        return $key !== $course->id;
-                    },
-                    ARRAY_FILTER_USE_KEY
-                );
-                \UserConfig::get($config->range_id)->store('COURSEWARE_LAST_ELEMENT', $arr);
-            }
-        });
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function getInfoTemplate($courseId)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($courseId)
-    {
-        if ($GLOBALS['user']->id === 'nobody') {
-            return [];
-        }
-
-        $navigation = new Navigation(
-            _('Courseware'),
-            URLHelper::getURL('dispatch.php/course/courseware/?cid='.$courseId)
-        );
-        $navigation->setImage(Icon::create('courseware', Icon::ROLE_INFO_ALT));
-        $navigation->addSubNavigation(
-            'shelf',
-            new Navigation(_('Lernmaterialien'), 'dispatch.php/course/courseware/?cid=' . $courseId)
-        );
-        $navigation->addSubNavigation(
-            'unit',
-            new Navigation(_('Inhalt'), 'dispatch.php/course/courseware/courseware?cid=' . $courseId)
-        );
-        $navigation->addSubNavigation(
-            'activities',
-            new Navigation(_('Aktivitäten'), 'dispatch.php/course/courseware/activities?cid=' . $courseId)
-        );
-        $navigation->addSubNavigation(
-            'tasks',
-            new Navigation(_('Aufgaben'), 'dispatch.php/course/courseware/tasks?cid=' . $courseId)
-        );
-        $navigation->addSubNavigation(
-            'comments',
-            new Navigation(_('Kommentare und Anmerkungen'), 'dispatch.php/course/courseware/comments_overview?cid=' . $courseId)
-        );
-
-        return ['courseware' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($courseId, $last_visit, $user_id)
-    {
-        if ($user_id === 'nobody') {
-            return null;
-        }
-
-        $statement = DBManager::get()->prepare("
-                SELECT COUNT(DISTINCT elem.id)
-                FROM `cw_structural_elements` AS elem
-                INNER JOIN `cw_containers` as container ON (elem.id = container.structural_element_id)
-                INNER JOIN `cw_blocks` as blocks ON (container.id = blocks.container_id)
-                WHERE elem.range_type = 'course'
-                AND elem.range_id = :range_id
-                AND blocks.payload != ''
-                AND blocks.chdate > :last_visit
-                AND blocks.editor_id != :user_id
-        ");
-
-        $statement->execute([
-            'range_id' => $courseId,
-            'last_visit' => $last_visit,
-            'user_id' => $user_id
-        ]);
-
-        $new = $statement->fetchColumn();
-
-        $nav = new Navigation(_('Courseware'), 'dispatch.php/course/courseware');
-        $nav->setImage(Icon::create('courseware', Icon::ROLE_CLICKABLE), [
-            'title' => _('Courseware'),
-        ]);
-
-        if ($new > 0) {
-            if ($new === 1) {
-                $text =  _('neue Seite');
-
-            } else {
-                $text =  _('neue Seiten');
-            }
-            $nav->setImage(Icon::create('courseware', Icon::ROLE_ATTENTION), [
-                'title' => $new . ' ' . $text,
-            ]);
-            $nav->setBadgeNumber("$new");
-        }
-
-        return $nav;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Lerninhalte erstellen, verteilen und erleben'),
-            'description' => _('Mit Courseware können Sie interaktive, multimediale Lerninhalte erstellen und nutzen. '
-                             . 'Die Lerninhalte lassen sich hierarchisch unterteilen und können aus Texten, '
-                             . 'Videosequenzen, Aufgaben, Kommunikationselementen und einer Vielzahl weiterer '
-                             . 'Elemente bestehen. Fertige Lerninhalte können exportiert und in andere Kurse oder '
-                             . 'andere Installationen importiert werden. Courseware ist nicht nur für digitale '
-                             . 'Formate geeignet, sondern kann auch genutzt werden, um klassische '
-                             . 'Präsenzveranstaltungen mit Online-Anteilen zu ergänzen. Formate wie integriertes '
-                             . 'Lernen (Blended Learning) lassen sich mit Courseware ideal umsetzen. Kollaboratives '
-                             . 'Lernen kann dank Schreibrechtevergabe und dem Einsatz von Courseware in '
-                             . 'Studiengruppen realisiert werden.'),
-            'displayname' => _('Courseware'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'icon' => Icon::create('courseware', 'info'),
-            'icon_clickable' => Icon::create('courseware', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Courseware',
-                'pictures' => [
-                    0 => ['source' => 'preview.png', 'title' => _('Überssichtsseite der Courseware')],
-                ],
-            ],
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return $context->getRangeType() === 'course';
-    }
-}
diff --git a/lib/modules/CoursewareModule.php b/lib/modules/CoursewareModule.php
new file mode 100644
index 0000000..8deeda7
--- /dev/null
+++ b/lib/modules/CoursewareModule.php
@@ -0,0 +1,166 @@
+<?php
+
+use Courseware\Instance;
+use Courseware\StructuralElement;
+
+class CoursewareModule extends CorePlugin implements SystemPlugin, StudipModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
+            $last_element_configs = \ConfigValue::findBySQL('field = ? AND value LIKE ?', [
+                'COURSEWARE_LAST_ELEMENT',
+                '%' . $course->id . '%',
+            ]);
+            foreach ($last_element_configs as $config) {
+                $arr = json_decode($config->value, true);
+                $arr = array_filter(
+                    $arr,
+                    function ($key) use ($course) {
+                        return $key !== $course->id;
+                    },
+                    ARRAY_FILTER_USE_KEY
+                );
+                \UserConfig::get($config->range_id)->store('COURSEWARE_LAST_ELEMENT', $arr);
+            }
+        });
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getInfoTemplate($courseId)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($courseId)
+    {
+        if ($GLOBALS['user']->id === 'nobody') {
+            return [];
+        }
+
+        $navigation = new Navigation(
+            _('Courseware'),
+            URLHelper::getURL('dispatch.php/course/courseware/?cid='.$courseId)
+        );
+        $navigation->setImage(Icon::create('courseware', Icon::ROLE_INFO_ALT));
+        $navigation->addSubNavigation(
+            'shelf',
+            new Navigation(_('Lernmaterialien'), 'dispatch.php/course/courseware/?cid=' . $courseId)
+        );
+        $navigation->addSubNavigation(
+            'unit',
+            new Navigation(_('Inhalt'), 'dispatch.php/course/courseware/courseware?cid=' . $courseId)
+        );
+        $navigation->addSubNavigation(
+            'activities',
+            new Navigation(_('Aktivitäten'), 'dispatch.php/course/courseware/activities?cid=' . $courseId)
+        );
+        $navigation->addSubNavigation(
+            'tasks',
+            new Navigation(_('Aufgaben'), 'dispatch.php/course/courseware/tasks?cid=' . $courseId)
+        );
+        $navigation->addSubNavigation(
+            'comments',
+            new Navigation(_('Kommentare und Anmerkungen'), 'dispatch.php/course/courseware/comments_overview?cid=' . $courseId)
+        );
+
+        return ['courseware' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($courseId, $last_visit, $user_id)
+    {
+        if ($user_id === 'nobody') {
+            return null;
+        }
+
+        $statement = DBManager::get()->prepare("
+                SELECT COUNT(DISTINCT elem.id)
+                FROM `cw_structural_elements` AS elem
+                INNER JOIN `cw_containers` as container ON (elem.id = container.structural_element_id)
+                INNER JOIN `cw_blocks` as blocks ON (container.id = blocks.container_id)
+                WHERE elem.range_type = 'course'
+                AND elem.range_id = :range_id
+                AND blocks.payload != ''
+                AND blocks.chdate > :last_visit
+                AND blocks.editor_id != :user_id
+        ");
+
+        $statement->execute([
+            'range_id' => $courseId,
+            'last_visit' => $last_visit,
+            'user_id' => $user_id
+        ]);
+
+        $new = $statement->fetchColumn();
+
+        $nav = new Navigation(_('Courseware'), 'dispatch.php/course/courseware');
+        $nav->setImage(Icon::create('courseware', Icon::ROLE_CLICKABLE), [
+            'title' => _('Courseware'),
+        ]);
+
+        if ($new > 0) {
+            if ($new === 1) {
+                $text =  _('neue Seite');
+
+            } else {
+                $text =  _('neue Seiten');
+            }
+            $nav->setImage(Icon::create('courseware', Icon::ROLE_ATTENTION), [
+                'title' => $new . ' ' . $text,
+            ]);
+            $nav->setBadgeNumber("$new");
+        }
+
+        return $nav;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Lerninhalte erstellen, verteilen und erleben'),
+            'description' => _('Mit Courseware können Sie interaktive, multimediale Lerninhalte erstellen und nutzen. '
+                             . 'Die Lerninhalte lassen sich hierarchisch unterteilen und können aus Texten, '
+                             . 'Videosequenzen, Aufgaben, Kommunikationselementen und einer Vielzahl weiterer '
+                             . 'Elemente bestehen. Fertige Lerninhalte können exportiert und in andere Kurse oder '
+                             . 'andere Installationen importiert werden. Courseware ist nicht nur für digitale '
+                             . 'Formate geeignet, sondern kann auch genutzt werden, um klassische '
+                             . 'Präsenzveranstaltungen mit Online-Anteilen zu ergänzen. Formate wie integriertes '
+                             . 'Lernen (Blended Learning) lassen sich mit Courseware ideal umsetzen. Kollaboratives '
+                             . 'Lernen kann dank Schreibrechtevergabe und dem Einsatz von Courseware in '
+                             . 'Studiengruppen realisiert werden.'),
+            'displayname' => _('Courseware'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'icon' => Icon::create('courseware', 'info'),
+            'icon_clickable' => Icon::create('courseware', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Courseware',
+                'pictures' => [
+                    0 => ['source' => 'preview.png', 'title' => _('Überssichtsseite der Courseware')],
+                ],
+            ],
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return $context->getRangeType() === 'course';
+    }
+}
diff --git a/lib/modules/FeedbackModule.class.php b/lib/modules/FeedbackModule.class.php
deleted file mode 100644
index 8674f62..0000000
--- a/lib/modules/FeedbackModule.class.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * FeedbackModule.class.php - Feedback Elements for Stud.IP as Module.
- *
- * 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.
- *
- * @author      Nils Gehrke <nils.gehrke@uni-goettingen.de>
- * @license     https://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-class FeedbackModule extends CorePlugin implements StudipModule, SystemPlugin
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if (Feedback::hasAdminPerm($course_id)) {
-            $navigation = new Navigation(_('Feedback'));
-            $navigation->addSubNavigation('index', new Navigation(_('Übersicht'), 'dispatch.php/course/feedback'));
-            return ['feedback' => $navigation];
-        }
-
-        return [];
-    }
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary'       => _('Einholen von Feedback zu Inhaltselementen'),
-            'description'   => _('Ermöglicht das Anlegen von Feedback-Elementen an verschiedenen Inhalten, sodass Nutzer dort ein Feedback zum Inhalt geben können. Dies kann aus einer Punkt- bzw. Sternbewertung bestehen oder nur aus einem Kommentar.'),
-            'category'      => _('Kommunikation und Zusammenarbeit'),
-            'keywords'      => _('Anlegen von Feedback-Elementen an verschiedenen Stellen; Auswahl verschiedener Feedback-Modi, wie Sternbewertung; Übersicht über alle Feedback-Elemente einer Veranstaltung'),
-            'icon'          => Icon::create('star', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('star', Icon::ROLE_CLICKABLE),
-            'screenshots'   => [
-                'path'      => 'assets/images/plus/screenshots/Feedback',
-                'pictures'      => [
-                    ['source' => 'FeedbackIndex.png', 'title' => 'Übersichtsseite des Feedbacktools'],
-                    ['source' => 'FeedbackAnDatei.png', 'title' => 'Inhaltselement an einer Datei']
-                ]
-            ]
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return $context->getRangeType() === 'course';
-    }
-}
diff --git a/lib/modules/FeedbackModule.php b/lib/modules/FeedbackModule.php
new file mode 100644
index 0000000..8674f62
--- /dev/null
+++ b/lib/modules/FeedbackModule.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * FeedbackModule.class.php - Feedback Elements for Stud.IP as Module.
+ *
+ * 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.
+ *
+ * @author      Nils Gehrke <nils.gehrke@uni-goettingen.de>
+ * @license     https://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+class FeedbackModule extends CorePlugin implements StudipModule, SystemPlugin
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if (Feedback::hasAdminPerm($course_id)) {
+            $navigation = new Navigation(_('Feedback'));
+            $navigation->addSubNavigation('index', new Navigation(_('Übersicht'), 'dispatch.php/course/feedback'));
+            return ['feedback' => $navigation];
+        }
+
+        return [];
+    }
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary'       => _('Einholen von Feedback zu Inhaltselementen'),
+            'description'   => _('Ermöglicht das Anlegen von Feedback-Elementen an verschiedenen Inhalten, sodass Nutzer dort ein Feedback zum Inhalt geben können. Dies kann aus einer Punkt- bzw. Sternbewertung bestehen oder nur aus einem Kommentar.'),
+            'category'      => _('Kommunikation und Zusammenarbeit'),
+            'keywords'      => _('Anlegen von Feedback-Elementen an verschiedenen Stellen; Auswahl verschiedener Feedback-Modi, wie Sternbewertung; Übersicht über alle Feedback-Elemente einer Veranstaltung'),
+            'icon'          => Icon::create('star', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('star', Icon::ROLE_CLICKABLE),
+            'screenshots'   => [
+                'path'      => 'assets/images/plus/screenshots/Feedback',
+                'pictures'      => [
+                    ['source' => 'FeedbackIndex.png', 'title' => 'Übersichtsseite des Feedbacktools'],
+                    ['source' => 'FeedbackAnDatei.png', 'title' => 'Inhaltselement an einer Datei']
+                ]
+            ]
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return $context->getRangeType() === 'course';
+    }
+}
diff --git a/lib/modules/GradebookModule.class.php b/lib/modules/GradebookModule.class.php
deleted file mode 100644
index 66886a2..0000000
--- a/lib/modules/GradebookModule.class.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-use Grading\Definition;
-use Grading\Instance;
-
-/**
- * GradebookModule.class.php - Gradebook API for Stud.IP.
- *
- * 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.
- *
- * @author      <mlunzena@uos.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule
-{
-    public function __construct()
-    {
-        parent::__construct();
-
-        NotificationCenter::on('UserDidDelete', function ($event, $user) {
-            Instance::deleteBySQL('user_id = ?', [$user->id]);
-        });
-        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
-            Definition::deleteBySQL('course_id = ?', [$course->id]);
-        });
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function getInfoTemplate($courseId)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
-    public function getIconNavigation($courseId, $lastVisit, $userId)
-    {
-        if ($userId === 'nobody') {
-            return null;
-        }
-
-        $title = _('Gradebook');
-        if ($GLOBALS['perm']->have_studip_perm('tutor', $courseId, $userId)) {
-            $changed = Instance::countBySQL(
-                'INNER JOIN grading_definitions gd ON(gd.id = definition_id) '.
-                'WHERE gd.course_id = ? AND grading_instances.chdate > ?',
-                [$courseId, $lastVisit]
-            );
-        } else {
-            $changed = Instance::countBySQL(
-                'INNER JOIN grading_definitions gd ON(gd.id = definition_id) '.
-                'WHERE gd.course_id = ? AND grading_instances.chdate > ? AND user_id = ?',
-                [$courseId, $lastVisit, $userId]
-            );
-        }
-
-        $icon = $changed
-              ? Icon::create('assessment', Icon::ROLE_NEW)
-              : Icon::create('assessment', Icon::ROLE_CLICKABLE);
-
-        $navigation = new Navigation($title, 'dispatch.php/course/gradebook/overview');
-        $navigation->setImage($icon, ['title' => $title]);
-
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
-    public function getTabNavigation($cid)
-    {
-        if ('nobody' === $GLOBALS['user']->id) {
-            return [];
-        }
-
-        $gradebook = new Navigation('Gradebook');
-        $gradebook->addSubNavigation('index', new Navigation(_('Erbrachte Leistungen'), 'dispatch.php/course/gradebook/overview'));
-
-        if ($GLOBALS['perm']->have_studip_perm('tutor', $cid)) {
-            $this->addTabNavigationOfLecturers($gradebook, $cid);
-        }
-
-        return compact('gradebook');
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
-    private function addTabNavigationOfLecturers(\Navigation $navigation, $cid)
-    {
-        $navigation->addSubNavigation(
-            'weights',
-            new Navigation(_('Gewichtungen'), 'dispatch.php/course/gradebook/lecturers/weights')
-        );
-        $navigation->addSubNavigation(
-            'edit_custom_definitions',
-            new Navigation(_('Manuelle Leistungen definieren'), 'dispatch.php/course/gradebook/lecturers/edit_custom_definitions')
-        );
-        $navigation->addSubNavigation(
-            'custom_definitions',
-            new Navigation(_('Noten manuell erfassen'), 'dispatch.php/course/gradebook/lecturers/custom_definitions')
-        );
-        if (Config::get()->ILIAS_INTERFACE_ENABLE && Course::find($cid)->isToolActive('IliasInterfaceModule')) {
-            $navigation->addSubNavigation(
-                'edit_ilias_definitions',
-                new Navigation(_('ILIAS-Test als Leistung definieren'), 'dispatch.php/course/gradebook/lecturers/edit_ilias_definitions')
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exportUserData(StoredUserData $storage)
-    {
-        if ($instances = Grading\Instance::findBySql('user_id = ?', [$storage->user_id])) {
-            $fieldData = array_map(
-                function ($instance) {
-                    return
-                        array_merge(
-                            $instance->definition->toRawArray('course_id item name tool category weight'),
-                            $instance->toRawArray('rawgrade feedback mkdate chdate')
-                        );
-                },
-                $instances
-            );
-            if ($fieldData) {
-                $storage->addTabularData(_('Leistungen'), 'fach', $fieldData);
-            }
-        }
-    }
-
-    /**
-     * Provides metadata like a descriptional text for this module that
-     * is shown on the course "+" page to inform users about what the
-     * module acutally does. Additionally, a URL can be specified.
-     *
-     * @return array metadata containg description and/or url
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Noten- und Fortschrittserfassung (Gradebook)'),
-            'description' => _('Dieses Modul ermöglicht die manuelle und automatische Erfassung von Noten und Leistungen.'),
-            'category' => _('Lehr- und Lernorganisation'),
-            'keywords' => _('automatische und manuelle Erfassung von gewichteten Leistungen;Export von Leistungen;persönliche Fortschrittskontrolle'),
-            'icon' => Icon::create('assessment', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('assessment', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Gradebook',
-                'pictures' => [
-                    [
-                        'source' => 'Lehrendensicht.png',
-                        'title' => 'Beispiel für das Gradebook aus der Sicht der Lehrenden',
-                    ],
-                    [
-                        'source' => 'Studierendensicht.png',
-                        'title' => 'Beispiel für das Gradebook aus der Sicht der Studierenden',
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return $context->getRangeType() === 'course';
-    }
-}
diff --git a/lib/modules/GradebookModule.php b/lib/modules/GradebookModule.php
new file mode 100644
index 0000000..66886a2
--- /dev/null
+++ b/lib/modules/GradebookModule.php
@@ -0,0 +1,181 @@
+<?php
+
+use Grading\Definition;
+use Grading\Instance;
+
+/**
+ * GradebookModule.class.php - Gradebook API for Stud.IP.
+ *
+ * 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.
+ *
+ * @author      <mlunzena@uos.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        NotificationCenter::on('UserDidDelete', function ($event, $user) {
+            Instance::deleteBySQL('user_id = ?', [$user->id]);
+        });
+        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
+            Definition::deleteBySQL('course_id = ?', [$course->id]);
+        });
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getInfoTemplate($courseId)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public function getIconNavigation($courseId, $lastVisit, $userId)
+    {
+        if ($userId === 'nobody') {
+            return null;
+        }
+
+        $title = _('Gradebook');
+        if ($GLOBALS['perm']->have_studip_perm('tutor', $courseId, $userId)) {
+            $changed = Instance::countBySQL(
+                'INNER JOIN grading_definitions gd ON(gd.id = definition_id) '.
+                'WHERE gd.course_id = ? AND grading_instances.chdate > ?',
+                [$courseId, $lastVisit]
+            );
+        } else {
+            $changed = Instance::countBySQL(
+                'INNER JOIN grading_definitions gd ON(gd.id = definition_id) '.
+                'WHERE gd.course_id = ? AND grading_instances.chdate > ? AND user_id = ?',
+                [$courseId, $lastVisit, $userId]
+            );
+        }
+
+        $icon = $changed
+              ? Icon::create('assessment', Icon::ROLE_NEW)
+              : Icon::create('assessment', Icon::ROLE_CLICKABLE);
+
+        $navigation = new Navigation($title, 'dispatch.php/course/gradebook/overview');
+        $navigation->setImage($icon, ['title' => $title]);
+
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public function getTabNavigation($cid)
+    {
+        if ('nobody' === $GLOBALS['user']->id) {
+            return [];
+        }
+
+        $gradebook = new Navigation('Gradebook');
+        $gradebook->addSubNavigation('index', new Navigation(_('Erbrachte Leistungen'), 'dispatch.php/course/gradebook/overview'));
+
+        if ($GLOBALS['perm']->have_studip_perm('tutor', $cid)) {
+            $this->addTabNavigationOfLecturers($gradebook, $cid);
+        }
+
+        return compact('gradebook');
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    private function addTabNavigationOfLecturers(\Navigation $navigation, $cid)
+    {
+        $navigation->addSubNavigation(
+            'weights',
+            new Navigation(_('Gewichtungen'), 'dispatch.php/course/gradebook/lecturers/weights')
+        );
+        $navigation->addSubNavigation(
+            'edit_custom_definitions',
+            new Navigation(_('Manuelle Leistungen definieren'), 'dispatch.php/course/gradebook/lecturers/edit_custom_definitions')
+        );
+        $navigation->addSubNavigation(
+            'custom_definitions',
+            new Navigation(_('Noten manuell erfassen'), 'dispatch.php/course/gradebook/lecturers/custom_definitions')
+        );
+        if (Config::get()->ILIAS_INTERFACE_ENABLE && Course::find($cid)->isToolActive('IliasInterfaceModule')) {
+            $navigation->addSubNavigation(
+                'edit_ilias_definitions',
+                new Navigation(_('ILIAS-Test als Leistung definieren'), 'dispatch.php/course/gradebook/lecturers/edit_ilias_definitions')
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function exportUserData(StoredUserData $storage)
+    {
+        if ($instances = Grading\Instance::findBySql('user_id = ?', [$storage->user_id])) {
+            $fieldData = array_map(
+                function ($instance) {
+                    return
+                        array_merge(
+                            $instance->definition->toRawArray('course_id item name tool category weight'),
+                            $instance->toRawArray('rawgrade feedback mkdate chdate')
+                        );
+                },
+                $instances
+            );
+            if ($fieldData) {
+                $storage->addTabularData(_('Leistungen'), 'fach', $fieldData);
+            }
+        }
+    }
+
+    /**
+     * Provides metadata like a descriptional text for this module that
+     * is shown on the course "+" page to inform users about what the
+     * module acutally does. Additionally, a URL can be specified.
+     *
+     * @return array metadata containg description and/or url
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Noten- und Fortschrittserfassung (Gradebook)'),
+            'description' => _('Dieses Modul ermöglicht die manuelle und automatische Erfassung von Noten und Leistungen.'),
+            'category' => _('Lehr- und Lernorganisation'),
+            'keywords' => _('automatische und manuelle Erfassung von gewichteten Leistungen;Export von Leistungen;persönliche Fortschrittskontrolle'),
+            'icon' => Icon::create('assessment', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('assessment', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Gradebook',
+                'pictures' => [
+                    [
+                        'source' => 'Lehrendensicht.png',
+                        'title' => 'Beispiel für das Gradebook aus der Sicht der Lehrenden',
+                    ],
+                    [
+                        'source' => 'Studierendensicht.png',
+                        'title' => 'Beispiel für das Gradebook aus der Sicht der Studierenden',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return $context->getRangeType() === 'course';
+    }
+}
diff --git a/lib/modules/IliasInterfaceModule.class.php b/lib/modules/IliasInterfaceModule.class.php
deleted file mode 100644
index a8cafbf..0000000
--- a/lib/modules/IliasInterfaceModule.class.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Ilias Interface - navigation and meta data
- *
- * @author    André Noack <noack@data-quest.de>
- * @copyright 2019 Stud.IP Core-Group
- * @license   GPL version 2 or any later version
- * @since     4.3
- */
-
-class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlugin
-{
-    public function __construct()
-    {
-        parent::__construct();
-        if (Config::get()->ILIAS_INTERFACE_ENABLE) {
-            $ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS;
-            if (Seminar_Perm::get()->have_perm('root')) {
-                Navigation::addItem('/admin/config/ilias_interface',
-                    new Navigation(_('ILIAS-Schnittstelle'), 'dispatch.php/admin/ilias_interface'));
-            }
-            if (Seminar_Perm::get()->have_perm('tutor') || (Seminar_Perm::get()->have_perm('autor') && array_key_exists('show_tools_page', $ilias_interface_config) && $ilias_interface_config['show_tools_page'])) {
-                $ilias = new Navigation(_('ILIAS'), 'dispatch.php/my_ilias_accounts');
-                $ilias->setImage(Icon::create('ilias'));
-                $ilias->setDescription(_('Schnittstelle zu ILIAS'));
-                Navigation::addItem('/contents/my_ilias_accounts', $ilias);
-            }
-        }
-    }
-
-    public function isActivatableForContext(Range $context)
-    {
-        return Config::get()->ILIAS_INTERFACE_ENABLE && $context->getRangeType() === 'course';
-    }
-
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        if (!Config::get()->ILIAS_INTERFACE_ENABLE) {
-            return;
-        }
-
-        $sql = "SELECT COUNT(IF(a.module_type != 'crs', module_id, NULL)) AS count_modules,
-                       COUNT(IF(a.module_type = 'crs', module_id, NULL)) AS count_courses,
-                       COUNT(IF((chdate > IFNULL(b.visitdate, :threshold) AND a.module_type != 'crs'), module_id, NULL)) AS neue
-                FROM object_contentmodules AS a
-                LEFT JOIN object_user_visits AS b
-                  ON b.object_id = a.object_id
-                     AND b.user_id = :user_id
-                     AND b.plugin_id = :plugin_id
-                WHERE a.object_id = :course_id
-                GROUP BY a.object_id";
-
-        $statement = DBManager::get()->prepare($sql);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->bindValue(':course_id', $course_id);
-        $statement->bindValue(':threshold', $last_visit);
-        $statement->bindValue(':plugin_id', $this->getPluginId());
-        $statement->execute();
-        $result = $statement->fetch(PDO::FETCH_ASSOC);
-
-        if (!$result) {
-            return null;
-        }
-
-        $title = CourseConfig::get($course_id)->getValue('ILIAS_INTERFACE_MODULETITLE');
-        $nav = new Navigation($title, 'dispatch.php/course/ilias_interface/index');
-        if ($result['neue']) {
-            $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
-                'title' => sprintf(
-                    ngettext(
-                        '%1$d Lernobjekt, %2$d neues',
-                        '%1$d Lernobjekte, %2$d neue',
-                        $result['count_modules']
-                    ),
-                    $result['count_modules'],
-                    $result['neue']
-                )
-            ]);
-        } elseif ($result['count_modules']) {
-            $nav->setImage(Icon::create('learnmodule', Icon::ROLE_CLICKABLE), [
-                'title' => sprintf(
-                    ngettext(
-                        '%d Lernobjekt',
-                        '%d Lernobjekte',
-                        $result['count_modules']
-                    ),
-                    $result['count_modules']
-                )
-            ]);
-        } elseif ($result['count_courses']) {
-            $nav->setImage(Icon::create('learnmodule', Icon::ROLE_CLICKABLE), [
-                'title' => sprintf(
-                    ngettext(
-                        '%d ILIAS-Kurs',
-                        '%d ILIAS-Kurse',
-                        $result['count_courses']
-                    ),
-                    $result['count_courses']
-                )
-            ]);
-        }
-        return $nav;
-    }
-
-    public function getTabNavigation($course_id)
-    {
-        if (!Config::get()->ILIAS_INTERFACE_ENABLE) {
-            return null;
-        }
-        $ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS;
-        if (count($ilias_interface_config) === 0) {
-            return null;
-        }
-
-        $moduletitle = Config::get()->ILIAS_INTERFACE_MODULETITLE;
-        if ($ilias_interface_config['edit_moduletitle']) {
-            $moduletitle = CourseConfig::get($course_id)->ILIAS_INTERFACE_MODULETITLE;
-        }
-
-        $navigation = new Navigation($moduletitle);
-        $navigation->setImage(Icon::create('learnmodule', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('learnmodule', Icon::ROLE_INFO));
-        if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) || ($GLOBALS['perm']->have_studip_perm('autor', $course_id) && IliasObjectConnections::isCourseConnected($course_id))) {
-            if (get_object_type($course_id, ['inst'])) {
-                $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Einrichtung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
-            } else {
-                $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Veranstaltung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
-            }
-        }
-
-        return ['ilias_interface' => $navigation];
-    }
-
-    /**
-     * @see StudipModule::getMetadata()
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary'          => _('Zugang zu extern erstellten ILIAS-Lernobjekten'),
-            'description'      => _('Über diese Schnittstelle ist es möglich, Lernobjekte aus ' .
-                'einer ILIAS-Installation (ILIAS-Version >= 5.3.8) in Stud.IP zur Verfügung ' .
-                'zu stellen. Lehrende haben die Möglichkeit, in ' .
-                'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP bereit zu stellen.'),
-            'displayname'      => _('ILIAS-Schnittstelle'),
-            'category'         => _('Inhalte und Aufgabenstellungen'),
-            'keywords'         => _('Einbindung von ILIAS-Lernobjekten;
-                            Zugang zu ILIAS;
-                            Aufgaben- und Test-Erstellung'),
-            'icon'             => Icon::create('learnmodule', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('learnmodule', Icon::ROLE_CLICKABLE),
-            'descriptionshort' => _('Zugang zu extern erstellten ILIAS-Lernobjekten'),
-            'descriptionlong'  => _('Über diese Schnittstelle ist es möglich, Lernobjekte aus ' .
-                'einer ILIAS-Installation (> 5.3.8) in Stud.IP zur Verfügung ' .
-                'zu stellen. Lehrende haben die Möglichkeit, in ' .
-                'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP bereit zu stellen.'),
-        ];
-    }
-}
diff --git a/lib/modules/IliasInterfaceModule.php b/lib/modules/IliasInterfaceModule.php
new file mode 100644
index 0000000..a8cafbf
--- /dev/null
+++ b/lib/modules/IliasInterfaceModule.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Ilias Interface - navigation and meta data
+ *
+ * @author    André Noack <noack@data-quest.de>
+ * @copyright 2019 Stud.IP Core-Group
+ * @license   GPL version 2 or any later version
+ * @since     4.3
+ */
+
+class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlugin
+{
+    public function __construct()
+    {
+        parent::__construct();
+        if (Config::get()->ILIAS_INTERFACE_ENABLE) {
+            $ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS;
+            if (Seminar_Perm::get()->have_perm('root')) {
+                Navigation::addItem('/admin/config/ilias_interface',
+                    new Navigation(_('ILIAS-Schnittstelle'), 'dispatch.php/admin/ilias_interface'));
+            }
+            if (Seminar_Perm::get()->have_perm('tutor') || (Seminar_Perm::get()->have_perm('autor') && array_key_exists('show_tools_page', $ilias_interface_config) && $ilias_interface_config['show_tools_page'])) {
+                $ilias = new Navigation(_('ILIAS'), 'dispatch.php/my_ilias_accounts');
+                $ilias->setImage(Icon::create('ilias'));
+                $ilias->setDescription(_('Schnittstelle zu ILIAS'));
+                Navigation::addItem('/contents/my_ilias_accounts', $ilias);
+            }
+        }
+    }
+
+    public function isActivatableForContext(Range $context)
+    {
+        return Config::get()->ILIAS_INTERFACE_ENABLE && $context->getRangeType() === 'course';
+    }
+
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        if (!Config::get()->ILIAS_INTERFACE_ENABLE) {
+            return;
+        }
+
+        $sql = "SELECT COUNT(IF(a.module_type != 'crs', module_id, NULL)) AS count_modules,
+                       COUNT(IF(a.module_type = 'crs', module_id, NULL)) AS count_courses,
+                       COUNT(IF((chdate > IFNULL(b.visitdate, :threshold) AND a.module_type != 'crs'), module_id, NULL)) AS neue
+                FROM object_contentmodules AS a
+                LEFT JOIN object_user_visits AS b
+                  ON b.object_id = a.object_id
+                     AND b.user_id = :user_id
+                     AND b.plugin_id = :plugin_id
+                WHERE a.object_id = :course_id
+                GROUP BY a.object_id";
+
+        $statement = DBManager::get()->prepare($sql);
+        $statement->bindValue(':user_id', $user_id);
+        $statement->bindValue(':course_id', $course_id);
+        $statement->bindValue(':threshold', $last_visit);
+        $statement->bindValue(':plugin_id', $this->getPluginId());
+        $statement->execute();
+        $result = $statement->fetch(PDO::FETCH_ASSOC);
+
+        if (!$result) {
+            return null;
+        }
+
+        $title = CourseConfig::get($course_id)->getValue('ILIAS_INTERFACE_MODULETITLE');
+        $nav = new Navigation($title, 'dispatch.php/course/ilias_interface/index');
+        if ($result['neue']) {
+            $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
+                'title' => sprintf(
+                    ngettext(
+                        '%1$d Lernobjekt, %2$d neues',
+                        '%1$d Lernobjekte, %2$d neue',
+                        $result['count_modules']
+                    ),
+                    $result['count_modules'],
+                    $result['neue']
+                )
+            ]);
+        } elseif ($result['count_modules']) {
+            $nav->setImage(Icon::create('learnmodule', Icon::ROLE_CLICKABLE), [
+                'title' => sprintf(
+                    ngettext(
+                        '%d Lernobjekt',
+                        '%d Lernobjekte',
+                        $result['count_modules']
+                    ),
+                    $result['count_modules']
+                )
+            ]);
+        } elseif ($result['count_courses']) {
+            $nav->setImage(Icon::create('learnmodule', Icon::ROLE_CLICKABLE), [
+                'title' => sprintf(
+                    ngettext(
+                        '%d ILIAS-Kurs',
+                        '%d ILIAS-Kurse',
+                        $result['count_courses']
+                    ),
+                    $result['count_courses']
+                )
+            ]);
+        }
+        return $nav;
+    }
+
+    public function getTabNavigation($course_id)
+    {
+        if (!Config::get()->ILIAS_INTERFACE_ENABLE) {
+            return null;
+        }
+        $ilias_interface_config = Config::get()->ILIAS_INTERFACE_BASIC_SETTINGS;
+        if (count($ilias_interface_config) === 0) {
+            return null;
+        }
+
+        $moduletitle = Config::get()->ILIAS_INTERFACE_MODULETITLE;
+        if ($ilias_interface_config['edit_moduletitle']) {
+            $moduletitle = CourseConfig::get($course_id)->ILIAS_INTERFACE_MODULETITLE;
+        }
+
+        $navigation = new Navigation($moduletitle);
+        $navigation->setImage(Icon::create('learnmodule', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('learnmodule', Icon::ROLE_INFO));
+        if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) || ($GLOBALS['perm']->have_studip_perm('autor', $course_id) && IliasObjectConnections::isCourseConnected($course_id))) {
+            if (get_object_type($course_id, ['inst'])) {
+                $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Einrichtung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+            } else {
+                $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Veranstaltung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+            }
+        }
+
+        return ['ilias_interface' => $navigation];
+    }
+
+    /**
+     * @see StudipModule::getMetadata()
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary'          => _('Zugang zu extern erstellten ILIAS-Lernobjekten'),
+            'description'      => _('Über diese Schnittstelle ist es möglich, Lernobjekte aus ' .
+                'einer ILIAS-Installation (ILIAS-Version >= 5.3.8) in Stud.IP zur Verfügung ' .
+                'zu stellen. Lehrende haben die Möglichkeit, in ' .
+                'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP bereit zu stellen.'),
+            'displayname'      => _('ILIAS-Schnittstelle'),
+            'category'         => _('Inhalte und Aufgabenstellungen'),
+            'keywords'         => _('Einbindung von ILIAS-Lernobjekten;
+                            Zugang zu ILIAS;
+                            Aufgaben- und Test-Erstellung'),
+            'icon'             => Icon::create('learnmodule', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('learnmodule', Icon::ROLE_CLICKABLE),
+            'descriptionshort' => _('Zugang zu extern erstellten ILIAS-Lernobjekten'),
+            'descriptionlong'  => _('Über diese Schnittstelle ist es möglich, Lernobjekte aus ' .
+                'einer ILIAS-Installation (> 5.3.8) in Stud.IP zur Verfügung ' .
+                'zu stellen. Lehrende haben die Möglichkeit, in ' .
+                'ILIAS Selbstlerneinheiten zu erstellen und in Stud.IP bereit zu stellen.'),
+        ];
+    }
+}
diff --git a/lib/modules/LtiToolModule.class.php b/lib/modules/LtiToolModule.class.php
deleted file mode 100644
index 033f5e8..0000000
--- a/lib/modules/LtiToolModule.class.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * LtiToolModule.class.php - LTI consumer API for Stud.IP
- *
- * 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.
- *
- * @author      Elmar Ludwig
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-
-class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, PrivacyPlugin
-{
-    /**
-     * Initialize the LtiToolModule.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        if ($GLOBALS['perm']->have_perm('root')) {
-            Navigation::addItem('/admin/config/lti', new Navigation(_('LTI-Tools'), 'dispatch.php/admin/lti'));
-        }
-
-        NotificationCenter::on('UserDidDelete', function ($event, $user) {
-            LtiGrade::deleteBySQL('user_id = ?', [$user->id]);
-        });
-        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
-            LtiData::deleteBySQL('course_id = ?', [$course->id]);
-        });
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id)
-    {
-        if ($user_id === 'nobody') {
-            return null;
-        }
-
-        $title = CourseConfig::get($course_id)->LTI_TOOL_TITLE;
-        $changed = LtiData::countBySQL('course_id = ? AND chdate > ?', [$course_id, $last_visit]);
-
-        $icon = $changed
-              ? Icon::create('link-extern', Icon::ROLE_NEW)
-              : Icon::create('link-extern', Icon::ROLE_CLICKABLE);
-
-        $navigation = new Navigation($title, 'dispatch.php/course/lti');
-        $navigation->setImage($icon, ['title' => $title]);
-
-        return $navigation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTabNavigation($course_id)
-    {
-        if ($GLOBALS['user']->id === 'nobody') {
-            return [];
-        }
-
-        $title = CourseConfig::get($course_id)->LTI_TOOL_TITLE;
-        $grades = LtiData::countBySQL('course_id = ?', [$course_id]);
-
-        $navigation = new Navigation($title);
-        $navigation->setImage(Icon::create('link-extern', Icon::ROLE_INFO_ALT));
-        $navigation->setActiveImage(Icon::create('link-extern', Icon::ROLE_INFO));
-        $navigation->addSubNavigation('index', new Navigation($title, 'dispatch.php/course/lti'));
-
-        if ($grades) {
-            $navigation->addSubNavigation('grades', new Navigation(_('Ergebnisse'), 'dispatch.php/course/lti/grades'));
-        }
-
-        return ['lti' => $navigation];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getInfoTemplate($course_id)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exportUserData(StoredUserData $storage)
-    {
-        $db = DBManager::get();
-
-        $data = $db->fetchAll('SELECT * FROM lti_grade WHERE user_id = ?', [$storage->user_id]);
-        $storage->addTabularData(_('LTI-Ergebnisse'), 'lti_grade', $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return [
-            'summary' => _('Verlinkung auf Inhalte in externen Anwendungen (LTI-Tool)'),
-            'description' => _('Dieses Modul bietet eine Möglichkeit zur Einbindung von externen Tools, '.
-                               'sofern diese den LTI-Standard unterstützen. Ähnlich wie bei der Seite '.
-                               '"Informationen" kann ein Titel sowie ein freier Text angegeben werden, der '.
-                               'den Nutzern zur Erläuterung angezeigt wird. Zur Einbindung von Inhalten aus '.
-                               'Fremdsystemen wird die LTI-Schnittstelle in der Version 1.x unterstützt.'),
-            'category' => _('Kommunikation und Zusammenarbeit'),
-            'keywords' => _('Einbindung von LTI-Tools (Version 1.x)'),
-            'icon' => Icon::create('link-extern', Icon::ROLE_INFO),
-            'icon_clickable' => Icon::create('link-extern', Icon::ROLE_CLICKABLE),
-            'screenshots' => [
-                'path' => 'assets/images/plus/screenshots/Lti',
-                'pictures' => [
-                    ['source' => 'Lti_tool_demo.jpg', 'title' => 'Beispiel für Wordpress-Einbindung']
-                ]
-            ]
-        ];
-    }
-}
diff --git a/lib/modules/LtiToolModule.php b/lib/modules/LtiToolModule.php
new file mode 100644
index 0000000..033f5e8
--- /dev/null
+++ b/lib/modules/LtiToolModule.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * LtiToolModule.class.php - LTI consumer API for Stud.IP
+ *
+ * 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.
+ *
+ * @author      Elmar Ludwig
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+
+class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, PrivacyPlugin
+{
+    /**
+     * Initialize the LtiToolModule.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        if ($GLOBALS['perm']->have_perm('root')) {
+            Navigation::addItem('/admin/config/lti', new Navigation(_('LTI-Tools'), 'dispatch.php/admin/lti'));
+        }
+
+        NotificationCenter::on('UserDidDelete', function ($event, $user) {
+            LtiGrade::deleteBySQL('user_id = ?', [$user->id]);
+        });
+        NotificationCenter::on('CourseDidDelete', function ($event, $course) {
+            LtiData::deleteBySQL('course_id = ?', [$course->id]);
+        });
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id)
+    {
+        if ($user_id === 'nobody') {
+            return null;
+        }
+
+        $title = CourseConfig::get($course_id)->LTI_TOOL_TITLE;
+        $changed = LtiData::countBySQL('course_id = ? AND chdate > ?', [$course_id, $last_visit]);
+
+        $icon = $changed
+              ? Icon::create('link-extern', Icon::ROLE_NEW)
+              : Icon::create('link-extern', Icon::ROLE_CLICKABLE);
+
+        $navigation = new Navigation($title, 'dispatch.php/course/lti');
+        $navigation->setImage($icon, ['title' => $title]);
+
+        return $navigation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabNavigation($course_id)
+    {
+        if ($GLOBALS['user']->id === 'nobody') {
+            return [];
+        }
+
+        $title = CourseConfig::get($course_id)->LTI_TOOL_TITLE;
+        $grades = LtiData::countBySQL('course_id = ?', [$course_id]);
+
+        $navigation = new Navigation($title);
+        $navigation->setImage(Icon::create('link-extern', Icon::ROLE_INFO_ALT));
+        $navigation->setActiveImage(Icon::create('link-extern', Icon::ROLE_INFO));
+        $navigation->addSubNavigation('index', new Navigation($title, 'dispatch.php/course/lti'));
+
+        if ($grades) {
+            $navigation->addSubNavigation('grades', new Navigation(_('Ergebnisse'), 'dispatch.php/course/lti/grades'));
+        }
+
+        return ['lti' => $navigation];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInfoTemplate($course_id)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function exportUserData(StoredUserData $storage)
+    {
+        $db = DBManager::get();
+
+        $data = $db->fetchAll('SELECT * FROM lti_grade WHERE user_id = ?', [$storage->user_id]);
+        $storage->addTabularData(_('LTI-Ergebnisse'), 'lti_grade', $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata()
+    {
+        return [
+            'summary' => _('Verlinkung auf Inhalte in externen Anwendungen (LTI-Tool)'),
+            'description' => _('Dieses Modul bietet eine Möglichkeit zur Einbindung von externen Tools, '.
+                               'sofern diese den LTI-Standard unterstützen. Ähnlich wie bei der Seite '.
+                               '"Informationen" kann ein Titel sowie ein freier Text angegeben werden, der '.
+                               'den Nutzern zur Erläuterung angezeigt wird. Zur Einbindung von Inhalten aus '.
+                               'Fremdsystemen wird die LTI-Schnittstelle in der Version 1.x unterstützt.'),
+            'category' => _('Kommunikation und Zusammenarbeit'),
+            'keywords' => _('Einbindung von LTI-Tools (Version 1.x)'),
+            'icon' => Icon::create('link-extern', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('link-extern', Icon::ROLE_CLICKABLE),
+            'screenshots' => [
+                'path' => 'assets/images/plus/screenshots/Lti',
+                'pictures' => [
+                    ['source' => 'Lti_tool_demo.jpg', 'title' => 'Beispiel für Wordpress-Einbindung']
+                ]
+            ]
+        ];
+    }
+}
diff --git a/lib/modules/StudipModule.class.php b/lib/modules/StudipModule.class.php
deleted file mode 100644
index c281d29..0000000
--- a/lib/modules/StudipModule.class.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
- *
- *  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.
- */
-
-interface StudipModule
-{
-    /**
-     * Return a navigation object representing this plugin in the
-     * course overview table or return NULL if you want to display
-     * no icon for this plugin (or course). The navigation object's
-     * title will not be shown, only the image (and its associated
-     * attributes like 'title') and the URL are actually used.
-     *
-     * By convention, new or changed plugin content is indicated
-     * by a different icon and a corresponding tooltip.
-     *
-     * @param  string   $course_id   course or institute range id
-     * @param  int      $last_visit  time of user's last visit
-     * @param  string   $user_id     the user to get the navigation for
-     *
-     * @return object   navigation item to render or NULL
-     */
-    public function getIconNavigation($course_id, $last_visit, $user_id);
-
-    /**
-     * Return a navigation object representing this plugin in the
-     * course overview table or return NULL if you want to display
-     * no icon for this plugin (or course). The navigation object's
-     * title will not be shown, only the image (and its associated
-     * attributes like 'title') and the URL are actually used.
-     *
-     * By convention, new or changed plugin content is indicated
-     * by a different icon and a corresponding tooltip.
-     *
-     * @param  string   $course_id   course or institute range id
-     *
-     * @return array    navigation item to render or NULL
-     */
-    public function getTabNavigation($course_id);
-
-    /**
-     * Provides metadata like a descriptional text for this module that
-     * is shown on the course "+" page to inform users about what the
-     * module acutally does. Additionally, a URL can be specified.
-     *
-     * @return array    metadata containg description and/or url
-     */
-    public function getMetadata();
-
-    /**
-     * Return a template (an instance of the Flexi\Template class)
-     * to be rendered on the course summary page. Return NULL to
-     * render nothing for this plugin.
-     *
-     * The template will automatically get a standard layout, which
-     * can be configured via attributes set on the template:
-     *
-     *  title        title to display, defaults to plugin name
-     *  icon_url     icon for this plugin (if any)
-     *  admin_url    admin link for this plugin (if any)
-     *  admin_title  title for admin link (default: Administration)
-     *
-     * @return Flexi\Template|null template object to render or NULL
-     */
-    public function getInfoTemplate($course_id);
-}
diff --git a/lib/modules/StudipModule.php b/lib/modules/StudipModule.php
new file mode 100644
index 0000000..c281d29
--- /dev/null
+++ b/lib/modules/StudipModule.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ *  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.
+ */
+
+interface StudipModule
+{
+    /**
+     * Return a navigation object representing this plugin in the
+     * course overview table or return NULL if you want to display
+     * no icon for this plugin (or course). The navigation object's
+     * title will not be shown, only the image (and its associated
+     * attributes like 'title') and the URL are actually used.
+     *
+     * By convention, new or changed plugin content is indicated
+     * by a different icon and a corresponding tooltip.
+     *
+     * @param  string   $course_id   course or institute range id
+     * @param  int      $last_visit  time of user's last visit
+     * @param  string   $user_id     the user to get the navigation for
+     *
+     * @return object   navigation item to render or NULL
+     */
+    public function getIconNavigation($course_id, $last_visit, $user_id);
+
+    /**
+     * Return a navigation object representing this plugin in the
+     * course overview table or return NULL if you want to display
+     * no icon for this plugin (or course). The navigation object's
+     * title will not be shown, only the image (and its associated
+     * attributes like 'title') and the URL are actually used.
+     *
+     * By convention, new or changed plugin content is indicated
+     * by a different icon and a corresponding tooltip.
+     *
+     * @param  string   $course_id   course or institute range id
+     *
+     * @return array    navigation item to render or NULL
+     */
+    public function getTabNavigation($course_id);
+
+    /**
+     * Provides metadata like a descriptional text for this module that
+     * is shown on the course "+" page to inform users about what the
+     * module acutally does. Additionally, a URL can be specified.
+     *
+     * @return array    metadata containg description and/or url
+     */
+    public function getMetadata();
+
+    /**
+     * Return a template (an instance of the Flexi\Template class)
+     * to be rendered on the course summary page. Return NULL to
+     * render nothing for this plugin.
+     *
+     * The template will automatically get a standard layout, which
+     * can be configured via attributes set on the template:
+     *
+     *  title        title to display, defaults to plugin name
+     *  icon_url     icon for this plugin (if any)
+     *  admin_url    admin link for this plugin (if any)
+     *  admin_title  title for admin link (default: Administration)
+     *
+     * @return Flexi\Template|null template object to render or NULL
+     */
+    public function getInfoTemplate($course_id);
+}
diff --git a/lib/phplib/CT_Cache.class.php b/lib/phplib/CT_Cache.class.php
deleted file mode 100644
index d4eccfa..0000000
--- a/lib/phplib/CT_Cache.class.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-## Copyright (c) 2011 Elmar Ludwig, University of Osnabrueck
-##
-## PHPLIB Data Storage Container using Stud.IP cache
-## for use with Stud.IP and cache only!
-
-class CT_Cache
-{
-    protected const CACHE_KEY_PREFIX = 'session_data';
-    protected const SESSION_LIFETIME = 7200;
-
-    private $cache;
-
-    public function ac_start()
-    {
-        $this->cache = \Studip\Cache\Factory::getCache();
-    }
-
-    public function ac_get_lock()
-    {
-    }
-
-    public function ac_release_lock()
-    {
-    }
-
-    public function ac_newid($str, $name = null)
-    {
-        return $this->ac_get_value($str) === false ? $str : false;
-    }
-
-    public function ac_store($id, $name, $str)
-    {
-        $cache_key = self::CACHE_KEY_PREFIX . '/' . $id;
-        return $this->cache->write($cache_key, $str, ini_get('session.gc_maxlifetime') ?: self::SESSION_LIFETIME);
-    }
-
-    public function ac_delete($id, $name = null)
-    {
-        $cache_key = self::CACHE_KEY_PREFIX . '/' . $id;
-        $this->cache->expire($cache_key);
-    }
-
-    public function ac_gc($gc_time, $name = null)
-    {
-    }
-
-    public function ac_halt($s)
-    {
-        echo "<b>$s</b>";
-        exit;
-    }
-
-    public function ac_get_value($id, $name = null)
-    {
-        $cache_key = self::CACHE_KEY_PREFIX . '/' . $id;
-        return $this->cache->read($cache_key);
-    }
-
-    public function ac_get_changed($id, $name = null)
-    {
-    }
-
-    public function ac_set_changed($id, $name, $timestamp)
-    {
-    }
-}
diff --git a/lib/phplib/CT_Cache.php b/lib/phplib/CT_Cache.php
new file mode 100644
index 0000000..d4eccfa
--- /dev/null
+++ b/lib/phplib/CT_Cache.php
@@ -0,0 +1,68 @@
+<?php
+
+## Copyright (c) 2011 Elmar Ludwig, University of Osnabrueck
+##
+## PHPLIB Data Storage Container using Stud.IP cache
+## for use with Stud.IP and cache only!
+
+class CT_Cache
+{
+    protected const CACHE_KEY_PREFIX = 'session_data';
+    protected const SESSION_LIFETIME = 7200;
+
+    private $cache;
+
+    public function ac_start()
+    {
+        $this->cache = \Studip\Cache\Factory::getCache();
+    }
+
+    public function ac_get_lock()
+    {
+    }
+
+    public function ac_release_lock()
+    {
+    }
+
+    public function ac_newid($str, $name = null)
+    {
+        return $this->ac_get_value($str) === false ? $str : false;
+    }
+
+    public function ac_store($id, $name, $str)
+    {
+        $cache_key = self::CACHE_KEY_PREFIX . '/' . $id;
+        return $this->cache->write($cache_key, $str, ini_get('session.gc_maxlifetime') ?: self::SESSION_LIFETIME);
+    }
+
+    public function ac_delete($id, $name = null)
+    {
+        $cache_key = self::CACHE_KEY_PREFIX . '/' . $id;
+        $this->cache->expire($cache_key);
+    }
+
+    public function ac_gc($gc_time, $name = null)
+    {
+    }
+
+    public function ac_halt($s)
+    {
+        echo "<b>$s</b>";
+        exit;
+    }
+
+    public function ac_get_value($id, $name = null)
+    {
+        $cache_key = self::CACHE_KEY_PREFIX . '/' . $id;
+        return $this->cache->read($cache_key);
+    }
+
+    public function ac_get_changed($id, $name = null)
+    {
+    }
+
+    public function ac_set_changed($id, $name, $timestamp)
+    {
+    }
+}
diff --git a/lib/phplib/CT_Sql.class.php b/lib/phplib/CT_Sql.class.php
deleted file mode 100644
index 220af22..0000000
--- a/lib/phplib/CT_Sql.class.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-##
-## Copyright (c) 1998-2000 NetUSE AG
-##                    Boris Erdmann, Kristian Koehntopp
-##
-## Copyright (c) 1998-2000 Sascha Schumann <sascha@schumann.cx>
-##
-## PHPLIB Data Storage Container using a SQL database
-## for use with Stud.IP and PDO only!
-
-class CT_Sql {
-    
-    ##
-    ## Define these parameters by overwriting or by
-    ## deriving your own class from it (recommened)
-    ##
-    
-    var $database_table = "session_data";
-    var $gzip_level = 0;
-    var $exists = '';
-    
-    ## end of configuration
-    
-    function ac_start() {
-    }
-    
-    function ac_get_lock() {
-        return true;
-    }
-    
-    function ac_release_lock() {
-        return true;
-    }
-    
-    function ac_gc($gc_time, $name = null) {
-        return DBManager::get()->exec(sprintf("DELETE FROM %s WHERE changed < FROM_UNIXTIME(%s) ",
-            $this->database_table,
-            (time() - ($gc_time * 60))
-            ));
-    }
-    
-    function ac_store($id, $name, $str) {
-        $db = DBManager::get();
-        if ($this->gzip_level){
-            $str = gzcompress($str, $this->gzip_level);
-        }
-        if ($this->exists === $id) {
-            $stmt = $db->prepare(sprintf("UPDATE %s SET val = ? WHERE sid = ?", $this->database_table));
-        } else {
-            $stmt = $db->prepare(sprintf("REPLACE INTO %s ( val, sid ) VALUES (?, ?)", $this->database_table));
-        }
-        $stmt->execute([$str, $id]);
-        return $stmt->rowCount();
-    }
-    
-    function ac_delete($id, $name = null) {
-        return DBManager::get()->exec(sprintf("DELETE FROM %s WHERE sid = '%s' LIMIT 1",
-            $this->database_table,
-            $id));
-    }
-    
-    function ac_get_value($id, $name = null) {
-        $rs = DBManager::get()->query(sprintf("SELECT val FROM %s where sid  = '%s'",
-            $this->database_table,
-            $id));
-        $str  = $rs->fetchColumn();
-        if ($this->gzip_level){
-            $str = @gzuncompress($str);
-        }
-        if ($str) $this->exists = $id;
-        return $str;
-    }
-    
-    function ac_get_changed($id, $name = null){
-        $rs = DBManager::get()->query(sprintf("SELECT UNIX_TIMESTAMP(changed) FROM %s WHERE sid  = '%s'",
-            $this->database_table,
-            $id));
-        return $rs->fetchColumn();
-    }
-    
-    function ac_set_changed($id, $name, $timestamp){
-        $db = DBManager::get();
-        $stmt = $db->prepare(sprintf("UPDATE %s SET changed = FROM_UNIXTIME(?) WHERE sid  = ?", $this->database_table));
-        $stmt->execute([$timestamp, $id]);
-        return $stmt->rowCount();
-    }
-    
-    function ac_newid($str, $name = null) {
-        $db = DBManager::get();
-        $query = "SELECT sid FROM " . $this->database_table . " WHERE sid = '$str'";
-        if (!$db->query($query)->fetchColumn()) {
-            return $str;
-        } else {
-            return FALSE;
-        }
-    }
-    
-    function ac_halt($s) {
-    }
-}
diff --git a/lib/phplib/CT_Sql.php b/lib/phplib/CT_Sql.php
new file mode 100644
index 0000000..220af22
--- /dev/null
+++ b/lib/phplib/CT_Sql.php
@@ -0,0 +1,101 @@
+<?php
+
+##
+## Copyright (c) 1998-2000 NetUSE AG
+##                    Boris Erdmann, Kristian Koehntopp
+##
+## Copyright (c) 1998-2000 Sascha Schumann <sascha@schumann.cx>
+##
+## PHPLIB Data Storage Container using a SQL database
+## for use with Stud.IP and PDO only!
+
+class CT_Sql {
+    
+    ##
+    ## Define these parameters by overwriting or by
+    ## deriving your own class from it (recommened)
+    ##
+    
+    var $database_table = "session_data";
+    var $gzip_level = 0;
+    var $exists = '';
+    
+    ## end of configuration
+    
+    function ac_start() {
+    }
+    
+    function ac_get_lock() {
+        return true;
+    }
+    
+    function ac_release_lock() {
+        return true;
+    }
+    
+    function ac_gc($gc_time, $name = null) {
+        return DBManager::get()->exec(sprintf("DELETE FROM %s WHERE changed < FROM_UNIXTIME(%s) ",
+            $this->database_table,
+            (time() - ($gc_time * 60))
+            ));
+    }
+    
+    function ac_store($id, $name, $str) {
+        $db = DBManager::get();
+        if ($this->gzip_level){
+            $str = gzcompress($str, $this->gzip_level);
+        }
+        if ($this->exists === $id) {
+            $stmt = $db->prepare(sprintf("UPDATE %s SET val = ? WHERE sid = ?", $this->database_table));
+        } else {
+            $stmt = $db->prepare(sprintf("REPLACE INTO %s ( val, sid ) VALUES (?, ?)", $this->database_table));
+        }
+        $stmt->execute([$str, $id]);
+        return $stmt->rowCount();
+    }
+    
+    function ac_delete($id, $name = null) {
+        return DBManager::get()->exec(sprintf("DELETE FROM %s WHERE sid = '%s' LIMIT 1",
+            $this->database_table,
+            $id));
+    }
+    
+    function ac_get_value($id, $name = null) {
+        $rs = DBManager::get()->query(sprintf("SELECT val FROM %s where sid  = '%s'",
+            $this->database_table,
+            $id));
+        $str  = $rs->fetchColumn();
+        if ($this->gzip_level){
+            $str = @gzuncompress($str);
+        }
+        if ($str) $this->exists = $id;
+        return $str;
+    }
+    
+    function ac_get_changed($id, $name = null){
+        $rs = DBManager::get()->query(sprintf("SELECT UNIX_TIMESTAMP(changed) FROM %s WHERE sid  = '%s'",
+            $this->database_table,
+            $id));
+        return $rs->fetchColumn();
+    }
+    
+    function ac_set_changed($id, $name, $timestamp){
+        $db = DBManager::get();
+        $stmt = $db->prepare(sprintf("UPDATE %s SET changed = FROM_UNIXTIME(?) WHERE sid  = ?", $this->database_table));
+        $stmt->execute([$timestamp, $id]);
+        return $stmt->rowCount();
+    }
+    
+    function ac_newid($str, $name = null) {
+        $db = DBManager::get();
+        $query = "SELECT sid FROM " . $this->database_table . " WHERE sid = '$str'";
+        if (!$db->query($query)->fetchColumn()) {
+            return $str;
+        } else {
+            return FALSE;
+        }
+    }
+    
+    function ac_halt($s) {
+    }
+}
diff --git a/lib/phplib/DB_Sql.class.php b/lib/phplib/DB_Sql.class.php
deleted file mode 100644
index 1a61703..0000000
--- a/lib/phplib/DB_Sql.class.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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.
- */
-
-
-class DB_Sql {
-
-    /* public: connection parameters */
-    public $Host     = "";
-    public $Database = "";
-    public $User     = "";
-    public $Password = "";
-
-    /* public: configuration parameters */
-    public $Auto_Free     = 1;     ## Set to 1 for automatic mysql_free_result()
-    public $Debug         = 0;     ## Set to 1 for debugging messages.
-    public $Halt_On_Error = "yes"; ## "yes" (halt with message), "no" (ignore errors quietly), "report" (ignore errror, but spit a warning)
-
-    /* public: result array and current row number */
-    public $Record   = [];
-    public $Row;
-    public $RowCount;
-    public $ColumnCount;
-
-    /* public: current error number and error text */
-    public $Errno    = 0;
-    public $Error    = "";
-
-    protected $pdo;
-    protected $resultSet;
-
-    /* public: constructor */
-    function __construct($query = "") {
-        $this->pdo = DBManager::get();
-        $this->query($query);
-    }
-
-    function link_id() {
-        return TRUE;
-    }
-
-    function query_id() {
-        return !is_null($this->resultSet);
-    }
-
-    /* public: discard the query result */
-    function free() {
-        $this->resultSet = NULL;
-        $this->Errno     = NULL;
-        $this->Error     = NULL;
-        $this->Row       = 0;
-        $this->RowCount  = null;
-        $this->ColumnCount  = null;
-    }
-
-    /* public: perform a query */
-    function query($Query_String) {
-
-        $Query_String = trim($Query_String);
-        if ($Query_String == "") {
-            return 0;
-        }
-
-        # New query, discard previous result.
-        $this->free();
-
-        if ($this->Debug) {
-            printf("Debug: query = %s<br>\n", $Query_String);
-        }
-        if(mb_stripos($Query_String, 'select') === 0 || mb_stripos($Query_String, 'show') === 0){
-
-            $this->resultSet = $this->pdo->query($Query_String);
-
-            # Will return nada if it fails. That's fine.
-            return $this->resultSet;
-        } else {
-            $this->RowCount = $this->pdo->exec($Query_String);
-            return $this->RowCount;
-        }
-    }
-
-    /* public: walk result set */
-    function next_record() {
-        if (!$this->resultSet) {
-            //$this->halt("next_record called with no query pending.");
-            return 0;
-        }
-
-        $this->Record = $this->resultSet->fetch();
-        $this->Row   += 1;
-        /*
-        $this->Errno  = $this->resultSet->errorCode();
-        $this->Error  = $this->resultSet->errorInfo();
-        */
-        $stat = is_array($this->Record);
-        if ($this->Row == $this->num_rows()) {
-            $this->ColumnCount = $this->resultSet->ColumnCount();
-            $this->resultSet = null;
-        }
-        return $stat;
-    }
-
-    /* public: evaluate the result (size, width) */
-    function affected_rows() {
-        return $this->num_rows();
-    }
-
-    function num_rows() {
-        return (!is_null($this->RowCount) ? $this->RowCount : ($this->resultSet ? ($this->RowCount = $this->resultSet->rowCount()) : FALSE));
-    }
-
-    function num_fields() {
-        return (!is_null($this->ColumnCount) ? $this->ColumnCount : ($this->resultSet ? ($this->ColumnCount = $this->resultSet->ColumnCount()) : FALSE));
-    }
-
-    /* public: shorthand notation */
-    function nf() {
-        return $this->num_rows();
-    }
-
-    function np() {
-        print $this->num_rows();
-    }
-
-    function f($Name) {
-        return $this->Record[$Name];
-    }
-
-    function p($Name) {
-        print $this->Record[$Name];
-    }
-
-    /* public: return table metadata */
-    function metadata($table='',$full=false) {
-        $count = 0;
-        $id    = 0;
-        $res   = [];
-
-        /*
-        * Due to compatibility problems with Table we changed the behavior
-        * of metadata();
-        * depending on $full, metadata returns the following values:
-        *
-        * - full is false (default):
-        * $result[]:
-        *   [0]["table"]  table name
-        *   [0]["name"]   field name
-        *   [0]["type"]   field type
-        *   [0]["len"]    field length
-        *   [0]["flags"]  field flags
-        *
-        * - full is true
-        * $result[]:
-        *   ["num_fields"] number of metadata records
-        *   [0]["table"]  table name
-        *   [0]["name"]   field name
-        *   [0]["type"]   field type
-        *   [0]["len"]    field length
-        *   [0]["flags"]  field flags
-        *   ["meta"][field name]  index of field named "field name"
-        *   The last one is used, if you have a field name, but no index.
-        *   Test:  if (isset($result['meta']['myfield'])) { ...
-            */
-
-            // if no $table specified, assume that we are working with a query
-            // result
-            if ($table) {
-                throw new Exception('Not yet implemented.');
-                $this->connect();
-                $id = @mysql_list_fields($this->Database, $table);
-                if (!$id)
-                $this->halt("Metadata query failed.");
-            } else {
-                if (is_null($this->resultSet))
-                $this->halt("No query specified.");
-            }
-
-            $count = $this->resultSet->ColumnCount();
-
-            // made this IF due to performance (one if is faster than $count if's)
-            if (!$full) {
-                for ($i = 0; $i < $count; $i++) {
-                    $meta = $this->resultSet->getColumnMeta($i);
-                    $res[$i]["table"] = $meta['table'];
-                    $res[$i]["name"]  = $meta['name'];
-                    $res[$i]["type"]  = $meta['native_type'];
-                    $res[$i]["len"]   = $meta['len'];
-                    $res[$i]["flags"] = $meta['flags'];
-                }
-            } else { // full
-                throw new Exception('Not yet implemented.');
-                $res["num_fields"]= $count;
-
-                for ($i=0; $i<$count; $i++) {
-                    $res[$i]["table"] = @mysql_field_table ($id, $i);
-                    $res[$i]["name"]  = @mysql_field_name  ($id, $i);
-                    $res[$i]["type"]  = @mysql_field_type  ($id, $i);
-                    $res[$i]["len"]   = @mysql_field_len   ($id, $i);
-                    $res[$i]["flags"] = @mysql_field_flags ($id, $i);
-                    $res["meta"][$res[$i]["name"]] = $i;
-                }
-            }
-
-            // free the result only if we were called on a table
-            if ($table) {
-                throw new Exception('Not yet implemented.');
-                @mysql_free_result($id);
-            }
-
-            return $res;
-    }
-
-    /* private: error handling */
-    function halt($msg) {
-        if ($this->Halt_On_Error == "no")
-        return;
-
-        $this->haltmsg($msg);
-
-        if ($this->Halt_On_Error != "report")
-        die("Session halted.");
-    }
-
-    function haltmsg($msg) {
-        printf("</td></tr></table><b>Database error:</b> %s<br>\n", $msg);
-        printf("<b>MySQL Error</b>: %s (%s)<br>\n",
-        $this->Errno,
-        join(':',$this->Error));
-    }
-
-    /* public: perform a query using format string*/
-    function queryf($format /* , .. */) {
-
-        // get args
-        $args = func_get_args();
-
-        // get format string
-        $format = array_shift($args);
-
-        // do something
-        return $this->query(vsprintf($format, $args));
-    }
-
-    /**
-     * perform a query with caching directive for mysql
-     * @param  string $Query_String
-     * @return Resultset | int
-     */
-    public function cache_query($Query_String) {
-        trigger_error(__CLASS__ . ' no longer supports query caching - use query() instead.', E_USER_DEPRECATED);
-        return $this->query($Query_String);
-    }
-}
diff --git a/lib/phplib/DB_Sql.php b/lib/phplib/DB_Sql.php
new file mode 100644
index 0000000..1a61703
--- /dev/null
+++ b/lib/phplib/DB_Sql.php
@@ -0,0 +1,260 @@
+<?php
+
+/*
+ * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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.
+ */
+
+
+class DB_Sql {
+
+    /* public: connection parameters */
+    public $Host     = "";
+    public $Database = "";
+    public $User     = "";
+    public $Password = "";
+
+    /* public: configuration parameters */
+    public $Auto_Free     = 1;     ## Set to 1 for automatic mysql_free_result()
+    public $Debug         = 0;     ## Set to 1 for debugging messages.
+    public $Halt_On_Error = "yes"; ## "yes" (halt with message), "no" (ignore errors quietly), "report" (ignore errror, but spit a warning)
+
+    /* public: result array and current row number */
+    public $Record   = [];
+    public $Row;
+    public $RowCount;
+    public $ColumnCount;
+
+    /* public: current error number and error text */
+    public $Errno    = 0;
+    public $Error    = "";
+
+    protected $pdo;
+    protected $resultSet;
+
+    /* public: constructor */
+    function __construct($query = "") {
+        $this->pdo = DBManager::get();
+        $this->query($query);
+    }
+
+    function link_id() {
+        return TRUE;
+    }
+
+    function query_id() {
+        return !is_null($this->resultSet);
+    }
+
+    /* public: discard the query result */
+    function free() {
+        $this->resultSet = NULL;
+        $this->Errno     = NULL;
+        $this->Error     = NULL;
+        $this->Row       = 0;
+        $this->RowCount  = null;
+        $this->ColumnCount  = null;
+    }
+
+    /* public: perform a query */
+    function query($Query_String) {
+
+        $Query_String = trim($Query_String);
+        if ($Query_String == "") {
+            return 0;
+        }
+
+        # New query, discard previous result.
+        $this->free();
+
+        if ($this->Debug) {
+            printf("Debug: query = %s<br>\n", $Query_String);
+        }
+        if(mb_stripos($Query_String, 'select') === 0 || mb_stripos($Query_String, 'show') === 0){
+
+            $this->resultSet = $this->pdo->query($Query_String);
+
+            # Will return nada if it fails. That's fine.
+            return $this->resultSet;
+        } else {
+            $this->RowCount = $this->pdo->exec($Query_String);
+            return $this->RowCount;
+        }
+    }
+
+    /* public: walk result set */
+    function next_record() {
+        if (!$this->resultSet) {
+            //$this->halt("next_record called with no query pending.");
+            return 0;
+        }
+
+        $this->Record = $this->resultSet->fetch();
+        $this->Row   += 1;
+        /*
+        $this->Errno  = $this->resultSet->errorCode();
+        $this->Error  = $this->resultSet->errorInfo();
+        */
+        $stat = is_array($this->Record);
+        if ($this->Row == $this->num_rows()) {
+            $this->ColumnCount = $this->resultSet->ColumnCount();
+            $this->resultSet = null;
+        }
+        return $stat;
+    }
+
+    /* public: evaluate the result (size, width) */
+    function affected_rows() {
+        return $this->num_rows();
+    }
+
+    function num_rows() {
+        return (!is_null($this->RowCount) ? $this->RowCount : ($this->resultSet ? ($this->RowCount = $this->resultSet->rowCount()) : FALSE));
+    }
+
+    function num_fields() {
+        return (!is_null($this->ColumnCount) ? $this->ColumnCount : ($this->resultSet ? ($this->ColumnCount = $this->resultSet->ColumnCount()) : FALSE));
+    }
+
+    /* public: shorthand notation */
+    function nf() {
+        return $this->num_rows();
+    }
+
+    function np() {
+        print $this->num_rows();
+    }
+
+    function f($Name) {
+        return $this->Record[$Name];
+    }
+
+    function p($Name) {
+        print $this->Record[$Name];
+    }
+
+    /* public: return table metadata */
+    function metadata($table='',$full=false) {
+        $count = 0;
+        $id    = 0;
+        $res   = [];
+
+        /*
+        * Due to compatibility problems with Table we changed the behavior
+        * of metadata();
+        * depending on $full, metadata returns the following values:
+        *
+        * - full is false (default):
+        * $result[]:
+        *   [0]["table"]  table name
+        *   [0]["name"]   field name
+        *   [0]["type"]   field type
+        *   [0]["len"]    field length
+        *   [0]["flags"]  field flags
+        *
+        * - full is true
+        * $result[]:
+        *   ["num_fields"] number of metadata records
+        *   [0]["table"]  table name
+        *   [0]["name"]   field name
+        *   [0]["type"]   field type
+        *   [0]["len"]    field length
+        *   [0]["flags"]  field flags
+        *   ["meta"][field name]  index of field named "field name"
+        *   The last one is used, if you have a field name, but no index.
+        *   Test:  if (isset($result['meta']['myfield'])) { ...
+            */
+
+            // if no $table specified, assume that we are working with a query
+            // result
+            if ($table) {
+                throw new Exception('Not yet implemented.');
+                $this->connect();
+                $id = @mysql_list_fields($this->Database, $table);
+                if (!$id)
+                $this->halt("Metadata query failed.");
+            } else {
+                if (is_null($this->resultSet))
+                $this->halt("No query specified.");
+            }
+
+            $count = $this->resultSet->ColumnCount();
+
+            // made this IF due to performance (one if is faster than $count if's)
+            if (!$full) {
+                for ($i = 0; $i < $count; $i++) {
+                    $meta = $this->resultSet->getColumnMeta($i);
+                    $res[$i]["table"] = $meta['table'];
+                    $res[$i]["name"]  = $meta['name'];
+                    $res[$i]["type"]  = $meta['native_type'];
+                    $res[$i]["len"]   = $meta['len'];
+                    $res[$i]["flags"] = $meta['flags'];
+                }
+            } else { // full
+                throw new Exception('Not yet implemented.');
+                $res["num_fields"]= $count;
+
+                for ($i=0; $i<$count; $i++) {
+                    $res[$i]["table"] = @mysql_field_table ($id, $i);
+                    $res[$i]["name"]  = @mysql_field_name  ($id, $i);
+                    $res[$i]["type"]  = @mysql_field_type  ($id, $i);
+                    $res[$i]["len"]   = @mysql_field_len   ($id, $i);
+                    $res[$i]["flags"] = @mysql_field_flags ($id, $i);
+                    $res["meta"][$res[$i]["name"]] = $i;
+                }
+            }
+
+            // free the result only if we were called on a table
+            if ($table) {
+                throw new Exception('Not yet implemented.');
+                @mysql_free_result($id);
+            }
+
+            return $res;
+    }
+
+    /* private: error handling */
+    function halt($msg) {
+        if ($this->Halt_On_Error == "no")
+        return;
+
+        $this->haltmsg($msg);
+
+        if ($this->Halt_On_Error != "report")
+        die("Session halted.");
+    }
+
+    function haltmsg($msg) {
+        printf("</td></tr></table><b>Database error:</b> %s<br>\n", $msg);
+        printf("<b>MySQL Error</b>: %s (%s)<br>\n",
+        $this->Errno,
+        join(':',$this->Error));
+    }
+
+    /* public: perform a query using format string*/
+    function queryf($format /* , .. */) {
+
+        // get args
+        $args = func_get_args();
+
+        // get format string
+        $format = array_shift($args);
+
+        // do something
+        return $this->query(vsprintf($format, $args));
+    }
+
+    /**
+     * perform a query with caching directive for mysql
+     * @param  string $Query_String
+     * @return Resultset | int
+     */
+    public function cache_query($Query_String) {
+        trigger_error(__CLASS__ . ' no longer supports query caching - use query() instead.', E_USER_DEPRECATED);
+        return $this->query($Query_String);
+    }
+}
diff --git a/lib/phplib/Seminar_Auth.class.php b/lib/phplib/Seminar_Auth.class.php
deleted file mode 100644
index 2c1c60c..0000000
--- a/lib/phplib/Seminar_Auth.class.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-
-/**
- * Seminar_Auth.class.php
- *
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2000 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-class Seminar_Auth
-{
-    /**
-     * @var string
-     */
-    public $classname;
-
-    /**
-     * @var string
-     */
-    public $error_msg = "";
-
-    /**
-     * @var array
-     */
-    protected $persistent_slots = ["auth", "classname"];
-
-    /**
-     * @var bool
-     */
-    protected $nobody = false; ## If true, a default auth is created...
-
-    /**
-     * @var string
-     */
-    protected $cancel_login = "cancel_login"; ## The name of a button that can be
-    ## used to cancel a login form
-    /**
-     * @var array
-     */
-    public $auth = []; ## Data array
-
-    public $need_email_activation = null;
-
-    /**
-     *
-     */
-    function __construct()
-    {
-        $this->classname = get_class($this);
-    }
-
-    /**
-     * @param $f
-     * @return $this
-     */
-    function check_feature($f)
-    {
-        if ($this->classname != $f) {
-            $clone = new $f;
-            $clone->auth = $this->auth;
-            return $clone;
-        } else {
-            return $this;
-        }
-    }
-
-    /**
-     * Check current auth state. Should be one of
-     * 1) Not logged in (no valid auth info or auth expired)
-     * 2) Logged in (valid auth info)
-     * 3) Login in progress (if $this->cancel_login, revert to state 1)
-
-     * @return int
-     */
-    protected function getState(): int
-    {
-        if ($this->is_authenticated()) {
-            $uid = $this->auth['uid'];
-            switch ($uid) {
-                case 'form':
-                    # Login in progress
-                    if (Request::option($this->cancel_login)) {
-                        # If $this->cancel_login is set, delete all auth info and set
-                        # state to "Not logged in", so eventually default or automatic
-                        # authentication may take place
-                        $this->unauth();
-                        $state = 1;
-                    } else {
-                        # Set state to "Login in progress"
-                        $state = 3;
-                    }
-                    break;
-                default:
-                    # User is authenticated and auth not expired
-                    $state = 2;
-                    break;
-            }
-        } else {
-            # User is not (yet) authenticated
-            $this->unauth();
-            $state = 1;
-        }
-
-        return $state;
-    }
-
-    /**
-     * @return bool
-     * @throws RuntimeException
-     */
-    public function start()
-    {
-        global $sess;
-
-        switch ($this->getState()) {
-            case 1:
-                # No valid auth info or auth is expired
-
-                # Check for user supplied automatic login procedure
-                if ($uid = $this->auth_preauth()) {
-                    $this->auth["uid"] = $uid;
-                    $sess->regenerate_session_id(['auth', '_language', 'phpCAS', 'contrast']);
-                    $sess->freeze();
-                    $GLOBALS['user'] = new Seminar_User($this->auth['uid']);
-                    return true;
-                }
-
-                if ($this->nobody) {
-                    # Authenticate as nobody
-                    $this->auth["uid"] = "nobody";
-                    return true;
-                } else {
-                    # Show the login form
-                    $this->auth_loginform();
-                    $this->auth["uid"] = "form";
-                    $sess->freeze();
-                    exit;
-                }
-            case 2:
-                # Valid auth info
-                # do nothin
-                break;
-            case 3:
-                # Login in progress, check results and act accordingly
-                $uid = $this->auth_validatelogin();
-                if ($uid) {
-                    $this->auth["uid"] = $uid;
-                    $keep_session_vars = ['auth', 'forced_language', '_language', 'contrast', 'oauth2'];
-                    if ($this->auth['perm'] === 'root') {
-                        $keep_session_vars[] = 'plugins_disabled';
-                    }
-                    $sess->regenerate_session_id($keep_session_vars);
-                    $sess->freeze();
-                    $GLOBALS['user'] = new Seminar_User($this->auth['uid']);
-                    return true;
-                } else {
-                    $this->auth_loginform();
-                    $this->auth["uid"] = "form";
-                    $sess->freeze();
-                    exit;
-                }
-            default:
-                # This should never happen. Complain.
-                throw new RuntimeException("Error in auth handling: invalid state reached.");
-        }
-
-        return false;
-    }
-
-
-    /**
-     * @return array
-     */
-    function __sleep()
-    {
-        return $this->persistent_slots;
-    }
-
-
-    /**
-     *
-     */
-    function unauth()
-    {
-        $this->auth = [];
-        $this->auth["uid"] = "";
-        $this->auth["perm"] = "";
-    }
-
-
-    /**
-     *
-     */
-    function logout()
-    {
-        $_SESSION['auth'] = null;
-        $this->unauth();
-        $GLOBALS['auth'] = $this;
-    }
-
-    /**
-     * @param $ok
-     * @return bool
-     */
-    function login_if($ok)
-    {
-        if ($ok) {
-            $this->unauth(); # We have to relogin, so clear current auth info
-            $this->nobody = false; # We are forcing login, so default auth is
-            # disabled
-            $this->start(); # Call authentication code
-        }
-        return true;
-    }
-
-    /**
-     * @return bool
-     * @throws AccessDeniedException
-     */
-    function is_authenticated()
-    {
-        $cfg = Config::GetInstance();
-        //check if the user got kicked meanwhile, or if user is locked out
-        if (!empty($this->auth['uid']) && !in_array($this->auth['uid'], ['form', 'nobody'])) {
-            $user = null;
-            if (isset($GLOBALS['user']) && $GLOBALS['user']->id == $this->auth['uid']) {
-                $user = $GLOBALS['user']->getAuthenticatedUser();
-            } else {
-                $user = User::find($this->auth['uid']);
-            }
-            if (!$user->username || $user->isBlocked()) {
-                $this->unauth();
-            }
-        } elseif ($cfg->getValue('MAINTENANCE_MODE_ENABLE') && Request::username('loginname')) {
-            $user = User::findByUsername(Request::username('loginname'));
-        }
-        if ($cfg->getValue('MAINTENANCE_MODE_ENABLE') && $user->perms != 'root') {
-            $this->unauth();
-            throw new AccessDeniedException(_("Das System befindet sich im Wartungsmodus. Zur Zeit ist kein Zugriff möglich."));
-        }
-        return @$this->auth['uid'] ? : false;
-    }
-
-    /**
-     * @return bool
-     */
-    function auth_preauth()
-    {
-        // is Single Sign On activated?
-        if (($provider = Request::option('sso'))) {
-
-            $this->check_environment();
-
-            Metrics::increment('core.sso_login.attempted');
-
-            // then do login
-            if (($authplugin = StudipAuthAbstract::GetInstance($provider))) {
-                $user = $authplugin->authenticateUser('', '');
-                if ($user) {
-                    if ($user->isExpired()) {
-                        throw new AccessDeniedException(_('Dieses Benutzerkonto ist abgelaufen. Wenden Sie sich bitte an die Administration.'));
-                    }
-                    if ($user->locked == 1) {
-                        throw new AccessDeniedException(_('Dieser Benutzer ist gesperrt! Wenden Sie sich bitte an die Administration.'));
-                    }
-                    $this->auth["jscript"] = true;
-                    $this->auth["perm"] = $user->perms;
-                    $this->auth["uname"] = $user->username;
-                    $this->auth["auth_plugin"] = $user->auth_plugin;
-                    $this->auth_set_user_settings($user);
-
-                    Metrics::increment('core.sso_login.succeeded');
-
-                    return $user->id;
-                } else {
-                    PageLayout::postMessage(MessageBox::error($authplugin->plugin_name . ': ' . _('Login fehlgeschlagen'), $authplugin->error_msg ? [$authplugin->error_msg] : []),md5($authplugin->error_msg));
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     *
-     */
-    function auth_loginform()
-    {
-        if (Request::isXhr()) {
-            if (Request::isDialog()) {
-                header('X-Location: ' . URLHelper::getURL($_SERVER['REQUEST_URI']));
-                page_close();
-                die();
-            }
-            throw new AccessDeniedException();
-        }
-
-        if (Request::submitted('user_config_submitted')) {
-            CSRFProtection::verifyUnsafeRequest();
-            if (Request::submitted('unset_contrast')) {
-                $_SESSION['contrast'] = 0;
-            }
-            if (Request::submitted('set_contrast')) {
-                $_SESSION['contrast'] = 1;
-            }
-
-
-            foreach (array_keys($GLOBALS['INSTALLED_LANGUAGES']) as $language_key) {
-                if (Request::submitted('set_language_' . $language_key)) {
-                    $_SESSION['forced_language'] = $language_key;
-                    $_SESSION['_language'] = $language_key;
-                }
-            }
-        }
-
-        $this->check_environment();
-
-        PageLayout::setBodyElementId('login');
-
-        // load the default set of plugins
-        PluginEngine::loadPlugins();
-
-        if (Request::get('loginname') && empty($_COOKIE[get_class($GLOBALS['sess'])])) {
-            $login_template = $GLOBALS['template_factory']->open('nocookies');
-        } else if (isset($this->need_email_activation)) {
-            $this->unauth();
-            header('Location: ' . URLHelper::getURL('activate_email.php?cancel_login=1&key=&uid=' . $this->need_email_activation));
-            page_close();
-            die();
-        } else {
-            unset($_SESSION['semi_logged_in']); // used by email activation
-            $login_template = $GLOBALS['template_factory']->open('loginform');
-            if (isset($this->auth['uname']) && $this->error_msg) {
-                PageLayout::postException(_('Bei der Anmeldung trat ein Fehler auf!'), $this->error_msg);
-            }
-            $login_template->set_attribute('error_msg', $this->error_msg);
-            $login_template->set_attribute('uname', (isset($this->auth["uname"]) ? $this->auth["uname"] : Request::username('loginname')));
-            $login_template->set_attribute('self_registration_activated', Config::get()->ENABLE_SELF_REGISTRATION);
-
-            $query = "SHOW TABLES LIKE 'login_faq'";
-            $result = DBManager::get()->query($query);
-
-            if ($result && $result->rowCount() > 0) {
-                $login_template->set_attribute('faq_entries', LoginFaq::findBySQL("1"));
-            }
-        }
-        PageLayout::setHelpKeyword('Basis.AnmeldungLogin');
-        $header_template = $GLOBALS['template_factory']->open('header');
-        $header_template->current_page = _('Login');
-        $header_template->link_params = ['cancel_login' => 1];
-
-        include 'lib/include/html_head.inc.php';
-        echo $header_template->render();
-        echo $login_template->render();
-        include 'lib/include/html_end.inc.php';
-        page_close();
-    }
-
-    /**
-     * @return bool
-     */
-    function auth_validatelogin()
-    {
-        //prevent replay attack
-        if (!Seminar_Session::check_ticket(Request::option('login_ticket'))) {
-            return false;
-        }
-
-        $this->check_environment();
-
-        $this->auth["uname"] = Request::get('loginname'); // This provides access for "loginform.ihtml"
-        $this->auth["jscript"] = Request::get('resolution') != "";
-
-        $check_auth = StudipAuthAbstract::CheckAuthentication(Request::get('loginname'), Request::get('password'));
-
-        if ($check_auth['uid']) {
-            $uid = $check_auth['uid'];
-            if (isset($check_auth['need_email_activation']) && $check_auth['need_email_activation'] == $uid) {
-                $this->need_email_activation = $uid;
-                $_SESSION['semi_logged_in'] = $uid;
-                return false;
-            }
-            $user = $check_auth['user'];
-            $this->auth["perm"] = $user->perms;
-            $this->auth["uname"] = $user->username;
-            $this->auth["auth_plugin"] = $user->auth_plugin;
-            $this->auth_set_user_settings($user);
-
-            Metrics::increment('core.login.succeeded');
-
-            return $uid;
-        } else {
-            Metrics::increment('core.login.failed');
-            $this->error_msg = $check_auth['error'];
-            return false;
-        }
-    }
-
-    /**
-     * @param $user
-     */
-    function auth_set_user_settings($user)
-    {
-        $divided = explode('x', Request::get('resolution'));
-        $this->auth["xres" . ""] = !empty($divided[0]) ? (int) $divided[0] : 1024; //default
-        $this->auth['yres'] = !empty($divided[1]) ? (int)$divided[1] : 768; //default
-        // Change X-Resulotion on Multi-Screen Systems (as Matrox Graphic-Adapters are)
-        if ($this->auth['xres'] / $this->auth['yres'] > 2) {
-            $this->auth['xres'] = $this->auth['xres'] / 2;
-        }
-        $user = User::toObject($user);
-        //restore user-specific language preference
-        if ($user->preferred_language) {
-            // we found a stored setting for preferred language
-            $_SESSION['_language'] = $user->preferred_language;
-        }
-    }
-
-    /**
-     * setup dummy user environment
-     */
-    function check_environment()
-    {
-        global $_language_path;
-
-        if (!isset($GLOBALS['user']) || $GLOBALS['user']->id !== 'nobody') {
-            $GLOBALS['user'] = new Seminar_User('nobody');
-            $GLOBALS['perm'] = new Seminar_Perm();
-            $GLOBALS['auth'] = $this;
-        }
-
-        if (empty($_SESSION['_language'])) {
-            $_SESSION['_language'] = get_accepted_languages();
-        }
-
-        // init of output via I18N
-        $_language_path = init_i18n($_SESSION['_language']);
-        include 'config.inc.php';
-
-        if (!empty($_SESSION['contrast'])) {
-            PageLayout::addStylesheet('accessibility.css');
-        }
-    }
-}
diff --git a/lib/phplib/Seminar_Auth.php b/lib/phplib/Seminar_Auth.php
new file mode 100644
index 0000000..2c1c60c
--- /dev/null
+++ b/lib/phplib/Seminar_Auth.php
@@ -0,0 +1,450 @@
+<?php
+
+/**
+ * Seminar_Auth.class.php
+ *
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2000 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+class Seminar_Auth
+{
+    /**
+     * @var string
+     */
+    public $classname;
+
+    /**
+     * @var string
+     */
+    public $error_msg = "";
+
+    /**
+     * @var array
+     */
+    protected $persistent_slots = ["auth", "classname"];
+
+    /**
+     * @var bool
+     */
+    protected $nobody = false; ## If true, a default auth is created...
+
+    /**
+     * @var string
+     */
+    protected $cancel_login = "cancel_login"; ## The name of a button that can be
+    ## used to cancel a login form
+    /**
+     * @var array
+     */
+    public $auth = []; ## Data array
+
+    public $need_email_activation = null;
+
+    /**
+     *
+     */
+    function __construct()
+    {
+        $this->classname = get_class($this);
+    }
+
+    /**
+     * @param $f
+     * @return $this
+     */
+    function check_feature($f)
+    {
+        if ($this->classname != $f) {
+            $clone = new $f;
+            $clone->auth = $this->auth;
+            return $clone;
+        } else {
+            return $this;
+        }
+    }
+
+    /**
+     * Check current auth state. Should be one of
+     * 1) Not logged in (no valid auth info or auth expired)
+     * 2) Logged in (valid auth info)
+     * 3) Login in progress (if $this->cancel_login, revert to state 1)
+
+     * @return int
+     */
+    protected function getState(): int
+    {
+        if ($this->is_authenticated()) {
+            $uid = $this->auth['uid'];
+            switch ($uid) {
+                case 'form':
+                    # Login in progress
+                    if (Request::option($this->cancel_login)) {
+                        # If $this->cancel_login is set, delete all auth info and set
+                        # state to "Not logged in", so eventually default or automatic
+                        # authentication may take place
+                        $this->unauth();
+                        $state = 1;
+                    } else {
+                        # Set state to "Login in progress"
+                        $state = 3;
+                    }
+                    break;
+                default:
+                    # User is authenticated and auth not expired
+                    $state = 2;
+                    break;
+            }
+        } else {
+            # User is not (yet) authenticated
+            $this->unauth();
+            $state = 1;
+        }
+
+        return $state;
+    }
+
+    /**
+     * @return bool
+     * @throws RuntimeException
+     */
+    public function start()
+    {
+        global $sess;
+
+        switch ($this->getState()) {
+            case 1:
+                # No valid auth info or auth is expired
+
+                # Check for user supplied automatic login procedure
+                if ($uid = $this->auth_preauth()) {
+                    $this->auth["uid"] = $uid;
+                    $sess->regenerate_session_id(['auth', '_language', 'phpCAS', 'contrast']);
+                    $sess->freeze();
+                    $GLOBALS['user'] = new Seminar_User($this->auth['uid']);
+                    return true;
+                }
+
+                if ($this->nobody) {
+                    # Authenticate as nobody
+                    $this->auth["uid"] = "nobody";
+                    return true;
+                } else {
+                    # Show the login form
+                    $this->auth_loginform();
+                    $this->auth["uid"] = "form";
+                    $sess->freeze();
+                    exit;
+                }
+            case 2:
+                # Valid auth info
+                # do nothin
+                break;
+            case 3:
+                # Login in progress, check results and act accordingly
+                $uid = $this->auth_validatelogin();
+                if ($uid) {
+                    $this->auth["uid"] = $uid;
+                    $keep_session_vars = ['auth', 'forced_language', '_language', 'contrast', 'oauth2'];
+                    if ($this->auth['perm'] === 'root') {
+                        $keep_session_vars[] = 'plugins_disabled';
+                    }
+                    $sess->regenerate_session_id($keep_session_vars);
+                    $sess->freeze();
+                    $GLOBALS['user'] = new Seminar_User($this->auth['uid']);
+                    return true;
+                } else {
+                    $this->auth_loginform();
+                    $this->auth["uid"] = "form";
+                    $sess->freeze();
+                    exit;
+                }
+            default:
+                # This should never happen. Complain.
+                throw new RuntimeException("Error in auth handling: invalid state reached.");
+        }
+
+        return false;
+    }
+
+
+    /**
+     * @return array
+     */
+    function __sleep()
+    {
+        return $this->persistent_slots;
+    }
+
+
+    /**
+     *
+     */
+    function unauth()
+    {
+        $this->auth = [];
+        $this->auth["uid"] = "";
+        $this->auth["perm"] = "";
+    }
+
+
+    /**
+     *
+     */
+    function logout()
+    {
+        $_SESSION['auth'] = null;
+        $this->unauth();
+        $GLOBALS['auth'] = $this;
+    }
+
+    /**
+     * @param $ok
+     * @return bool
+     */
+    function login_if($ok)
+    {
+        if ($ok) {
+            $this->unauth(); # We have to relogin, so clear current auth info
+            $this->nobody = false; # We are forcing login, so default auth is
+            # disabled
+            $this->start(); # Call authentication code
+        }
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws AccessDeniedException
+     */
+    function is_authenticated()
+    {
+        $cfg = Config::GetInstance();
+        //check if the user got kicked meanwhile, or if user is locked out
+        if (!empty($this->auth['uid']) && !in_array($this->auth['uid'], ['form', 'nobody'])) {
+            $user = null;
+            if (isset($GLOBALS['user']) && $GLOBALS['user']->id == $this->auth['uid']) {
+                $user = $GLOBALS['user']->getAuthenticatedUser();
+            } else {
+                $user = User::find($this->auth['uid']);
+            }
+            if (!$user->username || $user->isBlocked()) {
+                $this->unauth();
+            }
+        } elseif ($cfg->getValue('MAINTENANCE_MODE_ENABLE') && Request::username('loginname')) {
+            $user = User::findByUsername(Request::username('loginname'));
+        }
+        if ($cfg->getValue('MAINTENANCE_MODE_ENABLE') && $user->perms != 'root') {
+            $this->unauth();
+            throw new AccessDeniedException(_("Das System befindet sich im Wartungsmodus. Zur Zeit ist kein Zugriff möglich."));
+        }
+        return @$this->auth['uid'] ? : false;
+    }
+
+    /**
+     * @return bool
+     */
+    function auth_preauth()
+    {
+        // is Single Sign On activated?
+        if (($provider = Request::option('sso'))) {
+
+            $this->check_environment();
+
+            Metrics::increment('core.sso_login.attempted');
+
+            // then do login
+            if (($authplugin = StudipAuthAbstract::GetInstance($provider))) {
+                $user = $authplugin->authenticateUser('', '');
+                if ($user) {
+                    if ($user->isExpired()) {
+                        throw new AccessDeniedException(_('Dieses Benutzerkonto ist abgelaufen. Wenden Sie sich bitte an die Administration.'));
+                    }
+                    if ($user->locked == 1) {
+                        throw new AccessDeniedException(_('Dieser Benutzer ist gesperrt! Wenden Sie sich bitte an die Administration.'));
+                    }
+                    $this->auth["jscript"] = true;
+                    $this->auth["perm"] = $user->perms;
+                    $this->auth["uname"] = $user->username;
+                    $this->auth["auth_plugin"] = $user->auth_plugin;
+                    $this->auth_set_user_settings($user);
+
+                    Metrics::increment('core.sso_login.succeeded');
+
+                    return $user->id;
+                } else {
+                    PageLayout::postMessage(MessageBox::error($authplugin->plugin_name . ': ' . _('Login fehlgeschlagen'), $authplugin->error_msg ? [$authplugin->error_msg] : []),md5($authplugin->error_msg));
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     *
+     */
+    function auth_loginform()
+    {
+        if (Request::isXhr()) {
+            if (Request::isDialog()) {
+                header('X-Location: ' . URLHelper::getURL($_SERVER['REQUEST_URI']));
+                page_close();
+                die();
+            }
+            throw new AccessDeniedException();
+        }
+
+        if (Request::submitted('user_config_submitted')) {
+            CSRFProtection::verifyUnsafeRequest();
+            if (Request::submitted('unset_contrast')) {
+                $_SESSION['contrast'] = 0;
+            }
+            if (Request::submitted('set_contrast')) {
+                $_SESSION['contrast'] = 1;
+            }
+
+
+            foreach (array_keys($GLOBALS['INSTALLED_LANGUAGES']) as $language_key) {
+                if (Request::submitted('set_language_' . $language_key)) {
+                    $_SESSION['forced_language'] = $language_key;
+                    $_SESSION['_language'] = $language_key;
+                }
+            }
+        }
+
+        $this->check_environment();
+
+        PageLayout::setBodyElementId('login');
+
+        // load the default set of plugins
+        PluginEngine::loadPlugins();
+
+        if (Request::get('loginname') && empty($_COOKIE[get_class($GLOBALS['sess'])])) {
+            $login_template = $GLOBALS['template_factory']->open('nocookies');
+        } else if (isset($this->need_email_activation)) {
+            $this->unauth();
+            header('Location: ' . URLHelper::getURL('activate_email.php?cancel_login=1&key=&uid=' . $this->need_email_activation));
+            page_close();
+            die();
+        } else {
+            unset($_SESSION['semi_logged_in']); // used by email activation
+            $login_template = $GLOBALS['template_factory']->open('loginform');
+            if (isset($this->auth['uname']) && $this->error_msg) {
+                PageLayout::postException(_('Bei der Anmeldung trat ein Fehler auf!'), $this->error_msg);
+            }
+            $login_template->set_attribute('error_msg', $this->error_msg);
+            $login_template->set_attribute('uname', (isset($this->auth["uname"]) ? $this->auth["uname"] : Request::username('loginname')));
+            $login_template->set_attribute('self_registration_activated', Config::get()->ENABLE_SELF_REGISTRATION);
+
+            $query = "SHOW TABLES LIKE 'login_faq'";
+            $result = DBManager::get()->query($query);
+
+            if ($result && $result->rowCount() > 0) {
+                $login_template->set_attribute('faq_entries', LoginFaq::findBySQL("1"));
+            }
+        }
+        PageLayout::setHelpKeyword('Basis.AnmeldungLogin');
+        $header_template = $GLOBALS['template_factory']->open('header');
+        $header_template->current_page = _('Login');
+        $header_template->link_params = ['cancel_login' => 1];
+
+        include 'lib/include/html_head.inc.php';
+        echo $header_template->render();
+        echo $login_template->render();
+        include 'lib/include/html_end.inc.php';
+        page_close();
+    }
+
+    /**
+     * @return bool
+     */
+    function auth_validatelogin()
+    {
+        //prevent replay attack
+        if (!Seminar_Session::check_ticket(Request::option('login_ticket'))) {
+            return false;
+        }
+
+        $this->check_environment();
+
+        $this->auth["uname"] = Request::get('loginname'); // This provides access for "loginform.ihtml"
+        $this->auth["jscript"] = Request::get('resolution') != "";
+
+        $check_auth = StudipAuthAbstract::CheckAuthentication(Request::get('loginname'), Request::get('password'));
+
+        if ($check_auth['uid']) {
+            $uid = $check_auth['uid'];
+            if (isset($check_auth['need_email_activation']) && $check_auth['need_email_activation'] == $uid) {
+                $this->need_email_activation = $uid;
+                $_SESSION['semi_logged_in'] = $uid;
+                return false;
+            }
+            $user = $check_auth['user'];
+            $this->auth["perm"] = $user->perms;
+            $this->auth["uname"] = $user->username;
+            $this->auth["auth_plugin"] = $user->auth_plugin;
+            $this->auth_set_user_settings($user);
+
+            Metrics::increment('core.login.succeeded');
+
+            return $uid;
+        } else {
+            Metrics::increment('core.login.failed');
+            $this->error_msg = $check_auth['error'];
+            return false;
+        }
+    }
+
+    /**
+     * @param $user
+     */
+    function auth_set_user_settings($user)
+    {
+        $divided = explode('x', Request::get('resolution'));
+        $this->auth["xres" . ""] = !empty($divided[0]) ? (int) $divided[0] : 1024; //default
+        $this->auth['yres'] = !empty($divided[1]) ? (int)$divided[1] : 768; //default
+        // Change X-Resulotion on Multi-Screen Systems (as Matrox Graphic-Adapters are)
+        if ($this->auth['xres'] / $this->auth['yres'] > 2) {
+            $this->auth['xres'] = $this->auth['xres'] / 2;
+        }
+        $user = User::toObject($user);
+        //restore user-specific language preference
+        if ($user->preferred_language) {
+            // we found a stored setting for preferred language
+            $_SESSION['_language'] = $user->preferred_language;
+        }
+    }
+
+    /**
+     * setup dummy user environment
+     */
+    function check_environment()
+    {
+        global $_language_path;
+
+        if (!isset($GLOBALS['user']) || $GLOBALS['user']->id !== 'nobody') {
+            $GLOBALS['user'] = new Seminar_User('nobody');
+            $GLOBALS['perm'] = new Seminar_Perm();
+            $GLOBALS['auth'] = $this;
+        }
+
+        if (empty($_SESSION['_language'])) {
+            $_SESSION['_language'] = get_accepted_languages();
+        }
+
+        // init of output via I18N
+        $_language_path = init_i18n($_SESSION['_language']);
+        include 'config.inc.php';
+
+        if (!empty($_SESSION['contrast'])) {
+            PageLayout::addStylesheet('accessibility.css');
+        }
+    }
+}
diff --git a/lib/phplib/Seminar_Default_Auth.class.php b/lib/phplib/Seminar_Default_Auth.class.php
deleted file mode 100644
index 6d0e46c..0000000
--- a/lib/phplib/Seminar_Default_Auth.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Seminar_Default_Auth.class.php
- *
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2000 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-class Seminar_Default_Auth extends Seminar_Auth
-{
-    protected $nobody = true;
-}
\ No newline at end of file
diff --git a/lib/phplib/Seminar_Default_Auth.php b/lib/phplib/Seminar_Default_Auth.php
new file mode 100644
index 0000000..6d0e46c
--- /dev/null
+++ b/lib/phplib/Seminar_Default_Auth.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Seminar_Default_Auth.class.php
+ *
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2000 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+class Seminar_Default_Auth extends Seminar_Auth
+{
+    protected $nobody = true;
+}
\ No newline at end of file
diff --git a/lib/phplib/Seminar_Perm.class.php b/lib/phplib/Seminar_Perm.class.php
deleted file mode 100644
index a116938..0000000
--- a/lib/phplib/Seminar_Perm.class.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-/**
- * Seminar_Perm.class.php
- *
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2000 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-class Seminar_Perm
-{
-
-    /**
-     * @var array
-     */
-    public $permissions = [
-        "user"   => 1,
-        "autor"  => 3,
-        "tutor"  => 7,
-        "dozent" => 15,
-        "admin"  => 31,
-        "root"   => 63
-    ];
-    /**
-     * @var array
-     */
-    private $studip_perms = [];
-    /**
-     * @var array
-     */
-    private $fak_admins = [];
-
-    /**
-     * @return Seminar_Perm
-     */
-    public static function get()
-    {
-        if (is_object($GLOBALS['perm'])) {
-            return $GLOBALS['perm'];
-        } else {
-            return new Seminar_Perm();
-        }
-    }
-
-    /**
-     * @param $must_have
-     * @throws AccessDeniedException
-     */
-    public function check($must_have)
-    {
-        if (!$this->have_perm($must_have)) {
-            if ($GLOBALS['user']->id === 'nobody') {
-                $message = _('Sie sind nicht im System angemeldet und können daher nicht auf diesen Teil des Systems zugreifen. '
-                           . 'Um den vollen Funktionsumfang des Systems benutzen zu können, müssen Sie sich mit Ihrem Nutzernamen und Passwort anmelden.');
-                throw new AccessDeniedException($message);
-            } else {
-                throw new AccessDeniedException();
-            }
-        }
-    }
-
-    /**
-     * @param bool $user_id
-     * @return string|null
-     */
-    public function get_perm($user_id = false)
-    {
-        global $user;
-        if (!$user_id) {
-            $user_id = $user->id;
-        }
-        if ($user_id && $user_id == $user->id) {
-            return $user->perms;
-        }
-        if ($user_id && isset($this->studip_perms['studip'][$user_id])) {
-            return $this->studip_perms['studip'][$user_id];
-        }
-        if ($user_id && $user_id !== 'nobody') {
-            $query = "SELECT perms FROM auth_user_md5 WHERE user_id = :user_id";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':user_id', $user_id);
-            $statement->execute();
-            $perms = $statement->fetchColumn();
-
-            return $this->studip_perms['studip'][$user_id] = $perms;
-        }
-
-        return null;
-    }
-
-    /**
-     * @param $perm
-     * @param bool $user_id
-     * @return bool
-     */
-    public function have_perm($perm, $user_id = false)
-    {
-        $page_perm_value = $this->permissions[$perm] ?? 0;
-        $user_perm_value = $this->permissions[$this->get_perm($user_id)] ?? 0;
-
-        return $page_perm_value <= $user_perm_value;
-    }
-
-
-    /**
-     * @param $range_id
-     * @param bool $user_id
-     * @return mixed
-     */
-    public function get_studip_perm($range_id, $user_id = false)
-    {
-
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-
-        if (!isset($this->studip_perms[$range_id][$user_id])) {
-            $this->studip_perms[$range_id][$user_id] = $this->get_uncached_studip_perm($range_id, $user_id);
-        }
-        return $this->studip_perms[$range_id][$user_id];
-    }
-
-    /**
-     * @param $range_id
-     * @param $user_id
-     * @return bool|string
-     */
-    public function get_uncached_studip_perm($range_id, $user_id)
-    {
-        global $user;
-        $db = DBManager::get();
-        $status = false;
-        if ($user_id && $user_id == $user->id) {
-            $user_perm = $user->perms;
-        } else {
-            $user_perm = $this->get_perm($user_id);
-            if (!$user_perm) {
-                return false;
-            }
-        }
-        if ($user_perm == "root") {
-            $status = "root";
-        } elseif ($user_perm == "admin") {
-            if (Config::get()->ALLOW_ADMIN_RELATED_INST) {
-                $sem_inst = 'seminar_inst';
-            } else {
-                $sem_inst = 'seminare';
-            }
-            $st = $db->prepare("SELECT Seminar_id
-                          FROM user_inst
-                          LEFT JOIN $sem_inst USING (Institut_id)
-                          WHERE inst_perms='admin' AND user_id = ? AND Seminar_id = ? LIMIT 1");
-            $st->execute([$user_id, $range_id]);
-            if ($st->fetchColumn()) {
-                $status = "admin";
-            } else {
-                $st = $db->prepare("SELECT Seminar_id FROM user_inst a
-                            LEFT JOIN Institute b ON(a.Institut_id=b.Institut_id AND b.Institut_id=b.fakultaets_id)
-                            LEFT JOIN Institute c ON (b.Institut_id=c.fakultaets_id)
-                            LEFT JOIN $sem_inst d ON (d.Institut_id=c.Institut_id)
-                            WHERE a.user_id = ? AND a.inst_perms='admin' AND d.Seminar_id = ? LIMIT 1");
-                $st->execute([$user_id, $range_id]);
-                if ($st->fetchColumn()) {
-                    $status = "admin";
-                } else {
-                    $st = $db->prepare("SELECT a.Institut_id FROM user_inst a
-                                LEFT JOIN Institute b ON(a.Institut_id=b.fakultaets_id)
-                                WHERE user_id = ? AND a.inst_perms='admin'
-                                AND b.Institut_id = ? LIMIT 1");
-                    $st->execute([$user_id, $range_id]);
-                    if ($st->fetchColumn()) {
-                        $status = "admin";
-                    }
-                }
-            }
-        }
-
-        if (isset($_SESSION['seminar_change_view_' . $range_id])) {
-            $status = $_SESSION['seminar_change_view_' . $range_id];
-        }
-
-        if ($status) {
-            return $status;
-        }
-
-        if (Config::get()->DEPUTIES_ENABLE && Deputy::isDeputy($user_id, $range_id)) {
-            $status = 'dozent';
-        } else {
-            $st = $db->prepare("SELECT status FROM seminar_user
-                          WHERE user_id = ? AND Seminar_id = ?");
-            $st->execute([$user_id, $range_id]);
-            $status = $st->fetchColumn();
-
-            if (!$status) {
-                $st = $db->prepare("SELECT inst_perms FROM user_inst
-                              WHERE user_id = ? AND Institut_id = ?");
-                $st->execute([$user_id, $range_id]);
-                $status = $st->fetchColumn();
-            }
-        }
-        return $status;
-    }
-
-    /**
-     * @param $perm
-     * @param $range_id
-     * @param bool $user_id
-     * @return bool
-     */
-    public function have_studip_perm($perm, $range_id, $user_id = false)
-    {
-        $pageperm = $this->permissions[$perm] ?? 0;
-        $userperm = $this->permissions[$this->get_studip_perm($range_id, $user_id)] ?? 0;
-
-        return $pageperm <= $userperm;
-    }
-
-    /**
-     * @param $range_id
-     * @param bool $user_id
-     * @return mixed
-     */
-    public function get_profile_perm($range_id, $user_id = false)
-    {
-        if (!$user_id) {
-            $user_id = $GLOBALS['user']->id;
-        }
-
-        if (!isset($this->studip_perms[$range_id][$user_id])) {
-            $this->studip_perms[$range_id][$user_id] = $this->get_uncached_profile_perm($range_id, $user_id);
-        }
-        return $this->studip_perms[$range_id][$user_id];
-    }
-
-    /**
-     * @param $range_id
-     * @param $user_id
-     * @return bool|string
-     */
-    public function get_uncached_profile_perm($range_id, $user_id)
-    {
-        $status = false;
-
-        if ($range_id === $user_id && $this->have_perm('autor', $user_id)) {
-            // user on his own profile
-            $status = 'user';
-        } else if (Deputy::isEditActivated() && Deputy::isDeputy($user_id, $range_id, true)) {
-            // user is an assigned deputy
-            $status = 'user';
-        } else if ($this->have_perm('root', $user_id)) {
-            // respect root's authority
-            $status = 'admin';
-        } else if ($this->have_perm('admin', $user_id)) {
-            // institute admin may have permission
-            $db = DBManager::get();
-            $stmt = $db->prepare("SELECT a.inst_perms FROM user_inst AS a " .
-                "LEFT JOIN user_inst AS b USING (Institut_id) " .
-                "WHERE a.user_id = ? AND a.inst_perms = 'admin' " .
-                "  AND b.user_id = ? AND b.inst_perms IN ('autor', 'tutor', 'dozent')");
-            $stmt->execute([$user_id, $range_id]);
-
-            if ($stmt->fetchColumn()) {
-                $status = 'admin';
-            } else if ($this->is_fak_admin($user_id)) {
-                $stmt = $db->prepare("SELECT a.inst_perms FROM user_inst a " .
-                    "LEFT JOIN Institute i ON a.Institut_id = i.fakultaets_id " .
-                    "LEFT JOIN user_inst b ON b.Institut_id = i.Institut_id " .
-                    "WHERE a.user_id = ? AND a.inst_perms = 'admin' " .
-                    "  AND b.user_id = ? AND b.inst_perms != 'user'");
-                $stmt->execute([$user_id, $range_id]);
-
-                if ($stmt->fetchColumn()) {
-                    $status = 'admin';
-                }
-            }
-        }
-
-        return $status;
-    }
-
-    /**
-     * @param $perm
-     * @param $range_id
-     * @param bool $user_id
-     * @return bool
-     */
-    public function have_profile_perm($perm, $range_id, $user_id = false)
-    {
-
-        $pageperm = $this->permissions[$perm] ?? 0;
-        $userperm = $this->permissions[$this->get_profile_perm($range_id, $user_id)] ?? 0;
-
-        return $pageperm <= $userperm;
-    }
-
-    /**
-     * @param bool $user_id
-     * @return bool
-     */
-    public function is_fak_admin($user_id = false)
-    {
-        global $user;
-        if (!$user_id) $user_id = $user->id;
-        $user_perm = $this->get_perm($user_id);
-        if ($user_perm == "root") {
-            return true;
-        }
-        if ($user_perm != "admin") {
-            return false;
-        }
-        if (isset($this->fak_admins[$user_id])) {
-            return $this->fak_admins[$user_id];
-        } else {
-            $db = DBManager::get();
-            $st = $db->prepare("SELECT a.Institut_id FROM user_inst a
-                          LEFT JOIN Institute b ON(a.Institut_id=b.Institut_id AND b.Institut_id=b.fakultaets_id)
-                          WHERE a.user_id = ? AND a.inst_perms='admin' AND NOT ISNULL(b.Institut_id) LIMIT 1");
-            $st->execute([$user_id]);
-            return $this->fak_admins[$user_id] = (bool)$st->fetchColumn();
-        }
-    }
-
-    /**
-     * @param bool $user_id
-     * @return bool
-     */
-    public function is_staff_member($user_id = false)
-    {
-        global $user;
-        if (!$user_id) $user_id = $user->id;
-        $user_perm = $this->get_perm($user_id);
-        if ($user_perm == "root") {
-            return true;
-        }
-        if (!$this->have_perm('autor', $user_id)) {
-            return false;
-        }
-        $db = DBManager::get();
-        $st = $db->prepare("SELECT 1 FROM user_inst
-                            WHERE user_id = ? AND inst_perms <> 'user' LIMIT 1");
-        $st->execute([$user_id]);
-        return (bool)$st->fetchColumn();
-    }
-}
diff --git a/lib/phplib/Seminar_Perm.php b/lib/phplib/Seminar_Perm.php
new file mode 100644
index 0000000..a116938
--- /dev/null
+++ b/lib/phplib/Seminar_Perm.php
@@ -0,0 +1,350 @@
+<?php
+
+/**
+ * Seminar_Perm.class.php
+ *
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2000 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+class Seminar_Perm
+{
+
+    /**
+     * @var array
+     */
+    public $permissions = [
+        "user"   => 1,
+        "autor"  => 3,
+        "tutor"  => 7,
+        "dozent" => 15,
+        "admin"  => 31,
+        "root"   => 63
+    ];
+    /**
+     * @var array
+     */
+    private $studip_perms = [];
+    /**
+     * @var array
+     */
+    private $fak_admins = [];
+
+    /**
+     * @return Seminar_Perm
+     */
+    public static function get()
+    {
+        if (is_object($GLOBALS['perm'])) {
+            return $GLOBALS['perm'];
+        } else {
+            return new Seminar_Perm();
+        }
+    }
+
+    /**
+     * @param $must_have
+     * @throws AccessDeniedException
+     */
+    public function check($must_have)
+    {
+        if (!$this->have_perm($must_have)) {
+            if ($GLOBALS['user']->id === 'nobody') {
+                $message = _('Sie sind nicht im System angemeldet und können daher nicht auf diesen Teil des Systems zugreifen. '
+                           . 'Um den vollen Funktionsumfang des Systems benutzen zu können, müssen Sie sich mit Ihrem Nutzernamen und Passwort anmelden.');
+                throw new AccessDeniedException($message);
+            } else {
+                throw new AccessDeniedException();
+            }
+        }
+    }
+
+    /**
+     * @param bool $user_id
+     * @return string|null
+     */
+    public function get_perm($user_id = false)
+    {
+        global $user;
+        if (!$user_id) {
+            $user_id = $user->id;
+        }
+        if ($user_id && $user_id == $user->id) {
+            return $user->perms;
+        }
+        if ($user_id && isset($this->studip_perms['studip'][$user_id])) {
+            return $this->studip_perms['studip'][$user_id];
+        }
+        if ($user_id && $user_id !== 'nobody') {
+            $query = "SELECT perms FROM auth_user_md5 WHERE user_id = :user_id";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':user_id', $user_id);
+            $statement->execute();
+            $perms = $statement->fetchColumn();
+
+            return $this->studip_perms['studip'][$user_id] = $perms;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param $perm
+     * @param bool $user_id
+     * @return bool
+     */
+    public function have_perm($perm, $user_id = false)
+    {
+        $page_perm_value = $this->permissions[$perm] ?? 0;
+        $user_perm_value = $this->permissions[$this->get_perm($user_id)] ?? 0;
+
+        return $page_perm_value <= $user_perm_value;
+    }
+
+
+    /**
+     * @param $range_id
+     * @param bool $user_id
+     * @return mixed
+     */
+    public function get_studip_perm($range_id, $user_id = false)
+    {
+
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+
+        if (!isset($this->studip_perms[$range_id][$user_id])) {
+            $this->studip_perms[$range_id][$user_id] = $this->get_uncached_studip_perm($range_id, $user_id);
+        }
+        return $this->studip_perms[$range_id][$user_id];
+    }
+
+    /**
+     * @param $range_id
+     * @param $user_id
+     * @return bool|string
+     */
+    public function get_uncached_studip_perm($range_id, $user_id)
+    {
+        global $user;
+        $db = DBManager::get();
+        $status = false;
+        if ($user_id && $user_id == $user->id) {
+            $user_perm = $user->perms;
+        } else {
+            $user_perm = $this->get_perm($user_id);
+            if (!$user_perm) {
+                return false;
+            }
+        }
+        if ($user_perm == "root") {
+            $status = "root";
+        } elseif ($user_perm == "admin") {
+            if (Config::get()->ALLOW_ADMIN_RELATED_INST) {
+                $sem_inst = 'seminar_inst';
+            } else {
+                $sem_inst = 'seminare';
+            }
+            $st = $db->prepare("SELECT Seminar_id
+                          FROM user_inst
+                          LEFT JOIN $sem_inst USING (Institut_id)
+                          WHERE inst_perms='admin' AND user_id = ? AND Seminar_id = ? LIMIT 1");
+            $st->execute([$user_id, $range_id]);
+            if ($st->fetchColumn()) {
+                $status = "admin";
+            } else {
+                $st = $db->prepare("SELECT Seminar_id FROM user_inst a
+                            LEFT JOIN Institute b ON(a.Institut_id=b.Institut_id AND b.Institut_id=b.fakultaets_id)
+                            LEFT JOIN Institute c ON (b.Institut_id=c.fakultaets_id)
+                            LEFT JOIN $sem_inst d ON (d.Institut_id=c.Institut_id)
+                            WHERE a.user_id = ? AND a.inst_perms='admin' AND d.Seminar_id = ? LIMIT 1");
+                $st->execute([$user_id, $range_id]);
+                if ($st->fetchColumn()) {
+                    $status = "admin";
+                } else {
+                    $st = $db->prepare("SELECT a.Institut_id FROM user_inst a
+                                LEFT JOIN Institute b ON(a.Institut_id=b.fakultaets_id)
+                                WHERE user_id = ? AND a.inst_perms='admin'
+                                AND b.Institut_id = ? LIMIT 1");
+                    $st->execute([$user_id, $range_id]);
+                    if ($st->fetchColumn()) {
+                        $status = "admin";
+                    }
+                }
+            }
+        }
+
+        if (isset($_SESSION['seminar_change_view_' . $range_id])) {
+            $status = $_SESSION['seminar_change_view_' . $range_id];
+        }
+
+        if ($status) {
+            return $status;
+        }
+
+        if (Config::get()->DEPUTIES_ENABLE && Deputy::isDeputy($user_id, $range_id)) {
+            $status = 'dozent';
+        } else {
+            $st = $db->prepare("SELECT status FROM seminar_user
+                          WHERE user_id = ? AND Seminar_id = ?");
+            $st->execute([$user_id, $range_id]);
+            $status = $st->fetchColumn();
+
+            if (!$status) {
+                $st = $db->prepare("SELECT inst_perms FROM user_inst
+                              WHERE user_id = ? AND Institut_id = ?");
+                $st->execute([$user_id, $range_id]);
+                $status = $st->fetchColumn();
+            }
+        }
+        return $status;
+    }
+
+    /**
+     * @param $perm
+     * @param $range_id
+     * @param bool $user_id
+     * @return bool
+     */
+    public function have_studip_perm($perm, $range_id, $user_id = false)
+    {
+        $pageperm = $this->permissions[$perm] ?? 0;
+        $userperm = $this->permissions[$this->get_studip_perm($range_id, $user_id)] ?? 0;
+
+        return $pageperm <= $userperm;
+    }
+
+    /**
+     * @param $range_id
+     * @param bool $user_id
+     * @return mixed
+     */
+    public function get_profile_perm($range_id, $user_id = false)
+    {
+        if (!$user_id) {
+            $user_id = $GLOBALS['user']->id;
+        }
+
+        if (!isset($this->studip_perms[$range_id][$user_id])) {
+            $this->studip_perms[$range_id][$user_id] = $this->get_uncached_profile_perm($range_id, $user_id);
+        }
+        return $this->studip_perms[$range_id][$user_id];
+    }
+
+    /**
+     * @param $range_id
+     * @param $user_id
+     * @return bool|string
+     */
+    public function get_uncached_profile_perm($range_id, $user_id)
+    {
+        $status = false;
+
+        if ($range_id === $user_id && $this->have_perm('autor', $user_id)) {
+            // user on his own profile
+            $status = 'user';
+        } else if (Deputy::isEditActivated() && Deputy::isDeputy($user_id, $range_id, true)) {
+            // user is an assigned deputy
+            $status = 'user';
+        } else if ($this->have_perm('root', $user_id)) {
+            // respect root's authority
+            $status = 'admin';
+        } else if ($this->have_perm('admin', $user_id)) {
+            // institute admin may have permission
+            $db = DBManager::get();
+            $stmt = $db->prepare("SELECT a.inst_perms FROM user_inst AS a " .
+                "LEFT JOIN user_inst AS b USING (Institut_id) " .
+                "WHERE a.user_id = ? AND a.inst_perms = 'admin' " .
+                "  AND b.user_id = ? AND b.inst_perms IN ('autor', 'tutor', 'dozent')");
+            $stmt->execute([$user_id, $range_id]);
+
+            if ($stmt->fetchColumn()) {
+                $status = 'admin';
+            } else if ($this->is_fak_admin($user_id)) {
+                $stmt = $db->prepare("SELECT a.inst_perms FROM user_inst a " .
+                    "LEFT JOIN Institute i ON a.Institut_id = i.fakultaets_id " .
+                    "LEFT JOIN user_inst b ON b.Institut_id = i.Institut_id " .
+                    "WHERE a.user_id = ? AND a.inst_perms = 'admin' " .
+                    "  AND b.user_id = ? AND b.inst_perms != 'user'");
+                $stmt->execute([$user_id, $range_id]);
+
+                if ($stmt->fetchColumn()) {
+                    $status = 'admin';
+                }
+            }
+        }
+
+        return $status;
+    }
+
+    /**
+     * @param $perm
+     * @param $range_id
+     * @param bool $user_id
+     * @return bool
+     */
+    public function have_profile_perm($perm, $range_id, $user_id = false)
+    {
+
+        $pageperm = $this->permissions[$perm] ?? 0;
+        $userperm = $this->permissions[$this->get_profile_perm($range_id, $user_id)] ?? 0;
+
+        return $pageperm <= $userperm;
+    }
+
+    /**
+     * @param bool $user_id
+     * @return bool
+     */
+    public function is_fak_admin($user_id = false)
+    {
+        global $user;
+        if (!$user_id) $user_id = $user->id;
+        $user_perm = $this->get_perm($user_id);
+        if ($user_perm == "root") {
+            return true;
+        }
+        if ($user_perm != "admin") {
+            return false;
+        }
+        if (isset($this->fak_admins[$user_id])) {
+            return $this->fak_admins[$user_id];
+        } else {
+            $db = DBManager::get();
+            $st = $db->prepare("SELECT a.Institut_id FROM user_inst a
+                          LEFT JOIN Institute b ON(a.Institut_id=b.Institut_id AND b.Institut_id=b.fakultaets_id)
+                          WHERE a.user_id = ? AND a.inst_perms='admin' AND NOT ISNULL(b.Institut_id) LIMIT 1");
+            $st->execute([$user_id]);
+            return $this->fak_admins[$user_id] = (bool)$st->fetchColumn();
+        }
+    }
+
+    /**
+     * @param bool $user_id
+     * @return bool
+     */
+    public function is_staff_member($user_id = false)
+    {
+        global $user;
+        if (!$user_id) $user_id = $user->id;
+        $user_perm = $this->get_perm($user_id);
+        if ($user_perm == "root") {
+            return true;
+        }
+        if (!$this->have_perm('autor', $user_id)) {
+            return false;
+        }
+        $db = DBManager::get();
+        $st = $db->prepare("SELECT 1 FROM user_inst
+                            WHERE user_id = ? AND inst_perms <> 'user' LIMIT 1");
+        $st->execute([$user_id]);
+        return (bool)$st->fetchColumn();
+    }
+}
diff --git a/lib/phplib/Seminar_Register_Auth.class.php b/lib/phplib/Seminar_Register_Auth.class.php
deleted file mode 100644
index f2a272e..0000000
--- a/lib/phplib/Seminar_Register_Auth.class.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-/**
- * Seminar_Register_Auth.class.php
- *
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2000 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- */
-class Seminar_Register_Auth extends Seminar_Auth
-{
-    public function start()
-    {
-        global $sess;
-
-        switch ($this->getState()) {
-            # No valid auth info or auth is expired
-            case 1:
-
-                if ($this->nobody) {
-                    # Authenticate as nobody
-                    $this->auth['uid'] = 'nobody';
-                    return true;
-                } else {
-                    # Show the registration form
-                    $this->auth_registerform();
-                    $this->auth['uid'] = 'form';
-                    exit;
-                }
-            # Login in progress, check results and act accordingly
-            case 3:
-                $uid = $this->auth_doregister();
-                if ($uid) {
-                    $this->auth['uid'] = $uid;
-                    $GLOBALS['user'] = new Seminar_User($this->auth['uid']);
-                    return true;
-                } else {
-                    $this->auth_registerform();
-                    $this->auth['uid'] = 'form';
-                    $sess->freeze();
-                    exit;
-                }
-        }
-
-        return parent::start();
-    }
-
-    public function auth_registerform()
-    {
-        $this->check_environment();
-
-        // load the default set of plugins
-        PluginEngine::loadPlugins();
-
-        if (!$_COOKIE[get_class($GLOBALS['sess'])]) {
-            $register_template = $GLOBALS['template_factory']->open('nocookies');
-        } else {
-            $register_template = $GLOBALS['template_factory']->open('register/form');
-            $register_template->validator   = new email_validation_class();
-            $register_template->error_msg   = $this->error_msg;
-            $register_template->username    = Request::get('username');
-            $register_template->Vorname     = Request::get('Vorname');
-            $register_template->Nachname    = Request::get('Nachname');
-            $register_template->Email       = Request::get('Email');
-            $register_template->title_front = Request::get('title_front');
-            $register_template->title_rear  = Request::get('title_rear');
-            $register_template->geschlecht  = Request::int('geschlecht', 0);
-        }
-        PageLayout::setHelpKeyword('Basis.AnmeldungRegistrierung');
-        PageLayout::setTitle(_('Registrierung'));
-
-        echo $register_template->render(
-            [],
-            $GLOBALS['template_factory']->open('layouts/base.php')
-        );
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function auth_doregister()
-    {
-        $this->check_environment();
-
-        $this->error_msg = '';
-
-        $this->auth['uname'] = Request::username('username'); // This provides access for "crcregister.ihtml"
-
-        $validator = new email_validation_class(); // Klasse zum Ueberpruefen der Eingaben
-        $validator->timeout = 10; // Wie lange warten wir auf eine Antwort des Mailservers?
-
-        if (!Seminar_Session::check_ticket(Request::option('login_ticket'))) {
-            return false;
-        }
-
-        $username = trim(Request::get('username'));
-        $Vorname  = trim(Request::get('Vorname'));
-        $Nachname = trim(Request::get('Nachname'));
-
-        // accept only registered domains if set
-        if (Config::get()->EMAIL_DOMAIN_RESTRICTION) {
-            $Email = trim(Request::get('Email')) . '@' . trim(Request::get('emaildomain'));
-        } else {
-            $Email = trim(Request::get('Email'));
-        }
-
-        if (!$validator->ValidateUsername($username)) {
-            $this->error_msg = $this->error_msg . _('Der gewählte Benutzername ist zu kurz!') . '<br>';
-            return false;
-        } // username syntaktisch falsch oder zu kurz
-        // auf doppelte Vergabe wird weiter unten getestet.
-
-        if (!$validator->ValidatePassword(Request::get('password'))) {
-            $this->error_msg = $this->error_msg . _('Das Passwort ist zu kurz, zu lang oder enthält nicht erlaubte Zeichen!') . '<br>';
-            return false;
-        }
-
-        if (!$validator->ValidateName($Vorname)) {
-            $this->error_msg = $this->error_msg . _('Der Vorname fehlt oder ist unsinnig!') . '<br>';
-            return false;
-        } // Vorname nicht korrekt oder fehlend
-        if (!$validator->ValidateName($Nachname)) {
-            $this->error_msg = $this->error_msg . _('Der Nachname fehlt oder ist unsinnig!') . '<br>';
-            return false; // Nachname nicht korrekt oder fehlend
-        }
-        if (!$validator->ValidateEmailAddress($Email)) {
-            $this->error_msg = $this->error_msg . _('Die E-Mail-Adresse fehlt oder ist falsch geschrieben!') . '<br>';
-            return false;
-        } // E-Mail syntaktisch nicht korrekt oder fehlend
-
-        $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
-        $Zeit = date('H:i:s, d.m.Y');
-
-        if (!$validator->ValidateEmailHost($Email)) { // Mailserver nicht erreichbar, ablehnen
-            $this->error_msg = $this->error_msg . _('Der Mailserver ist nicht erreichbar, bitte überprüfen Sie, ob Sie E-Mails mit der angegebenen Adresse verschicken und empfangen können!') . '<br>';
-            return false;
-        } else { // Server ereichbar
-            if (!$validator->ValidateEmailBox($Email)) { // aber user unbekannt. Mail an abuse!
-                StudipMail::sendAbuseMessage('Register', "Emailbox unbekannt\n\nUser: $username\nEmail: $Email\n\nIP: $REMOTE_ADDR\nZeit: $Zeit\n");
-                $this->error_msg = $this->error_msg . _('Die angegebene E-Mail-Adresse ist nicht erreichbar, bitte überprüfen Sie Ihre Angaben!') . '<br>';
-                return false;
-            } else {
-                ; // Alles paletti, jetzt kommen die Checks gegen die Datenbank...
-            }
-        }
-
-        $check_uname = StudipAuthAbstract::CheckUsername($username);
-
-        if ($check_uname['found']) {
-            $this->error_msg = $this->error_msg . _('Der gewählte Benutzername ist bereits vorhanden!') . '<br>';
-            return false; // username schon vorhanden
-        }
-
-        if (User::countBySQL('Email = ?', [$Email])) {
-            $this->error_msg = $this->error_msg . _('Die angegebene E-Mail-Adresse wird bereits von einem anderen Benutzer verwendet. Sie müssen eine andere E-Mail-Adresse angeben!') . '<br>';
-            return false; // Email schon vorhanden
-        }
-
-        // alle Checks ok, Benutzer registrieren...
-        $hasher = UserManagement::getPwdHasher();
-        $new_user = new User();
-        $new_user->username = $username;
-        $new_user->perms = 'user';
-        $new_user->password = $hasher->HashPassword(Request::get('password'));
-        $new_user->vorname = $Vorname;
-        $new_user->nachname = $Nachname;
-        $new_user->email = $Email;
-        $new_user->geschlecht = Request::int('geschlecht');
-        $new_user->title_front = trim(Request::get('title_front', Request::get('title_front_chooser')));
-        $new_user->title_rear = trim(Request::get('title_rear', Request::get('title_rear_chooser')));
-        $new_user->auth_plugin = 'standard';
-        $new_user->store();
-
-        if (!$new_user->user_id) {
-            return false;
-        }
-
-        self::sendValidationMail($new_user);
-
-        $this->auth['perm'] = $new_user->perms;
-        $this->auth['uname'] = $new_user->username;
-        $this->auth['auth_plugin'] = $new_user->auth_plugin;
-
-        return $new_user->user_id;
-    }
-
-    /**
-     * Send a validation mail to the passed user
-     *
-     * @param User $user a user-object or id of the user
-     *                   to resend the validation mail for
-     */
-    public static function sendValidationMail($user){
-        // if no user-object is given interpret it as a user-id
-        if (is_string($user)) {
-            $user = new User($user);
-        }
-
-        // template-variables for the include partial
-        $Zeit     = date('H:i:s, d.m.Y', $user->mkdate);
-        $username = $user->username;
-        $Vorname  = $user->vorname;
-        $Nachname = $user->nachname;
-        $Email    = $user->email;
-
-        // (re-)send the confirmation mail
-        $to     = $user->email;
-        $token  = Token::create(7 * 24 * 60 * 60, $user->id); // Link is valid for 1 week
-        $url    = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'email_validation.php?secret=' . $token;
-        $mail   = new StudipMail();
-        $abuse  = StudipMail::getAbuseEmail();
-
-        $lang_path = getUserLanguagePath($user->id);
-
-        // include language-specific subject and mailbody
-        // TODO: This should be refactored so that the included file returns an array
-        include "locale/{$lang_path}/LC_MAILS/register_mail.inc.php"; // Defines $subject and $mailbody
-
-        // send the mail
-        $mail->setSubject($subject ?? '')
-            ->addRecipient($to)
-            ->setBodyText($mailbody ?? '')
-            ->send();
-    }
-
-    /**
-     * Validates a given hash for a given user id.
-     * @param  string $secret  Secret to validate
-     * @param  string $user_id User id
-     * @return bool
-     */
-    public static function validateSecret($secret, $user_id)
-    {
-        return Token::isValid($secret, $user_id);
-    }
-}
diff --git a/lib/phplib/Seminar_Register_Auth.php b/lib/phplib/Seminar_Register_Auth.php
new file mode 100644
index 0000000..f2a272e
--- /dev/null
+++ b/lib/phplib/Seminar_Register_Auth.php
@@ -0,0 +1,242 @@
+<?php
+
+/**
+ * Seminar_Register_Auth.class.php
+ *
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2000 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ */
+class Seminar_Register_Auth extends Seminar_Auth
+{
+    public function start()
+    {
+        global $sess;
+
+        switch ($this->getState()) {
+            # No valid auth info or auth is expired
+            case 1:
+
+                if ($this->nobody) {
+                    # Authenticate as nobody
+                    $this->auth['uid'] = 'nobody';
+                    return true;
+                } else {
+                    # Show the registration form
+                    $this->auth_registerform();
+                    $this->auth['uid'] = 'form';
+                    exit;
+                }
+            # Login in progress, check results and act accordingly
+            case 3:
+                $uid = $this->auth_doregister();
+                if ($uid) {
+                    $this->auth['uid'] = $uid;
+                    $GLOBALS['user'] = new Seminar_User($this->auth['uid']);
+                    return true;
+                } else {
+                    $this->auth_registerform();
+                    $this->auth['uid'] = 'form';
+                    $sess->freeze();
+                    exit;
+                }
+        }
+
+        return parent::start();
+    }
+
+    public function auth_registerform()
+    {
+        $this->check_environment();
+
+        // load the default set of plugins
+        PluginEngine::loadPlugins();
+
+        if (!$_COOKIE[get_class($GLOBALS['sess'])]) {
+            $register_template = $GLOBALS['template_factory']->open('nocookies');
+        } else {
+            $register_template = $GLOBALS['template_factory']->open('register/form');
+            $register_template->validator   = new email_validation_class();
+            $register_template->error_msg   = $this->error_msg;
+            $register_template->username    = Request::get('username');
+            $register_template->Vorname     = Request::get('Vorname');
+            $register_template->Nachname    = Request::get('Nachname');
+            $register_template->Email       = Request::get('Email');
+            $register_template->title_front = Request::get('title_front');
+            $register_template->title_rear  = Request::get('title_rear');
+            $register_template->geschlecht  = Request::int('geschlecht', 0);
+        }
+        PageLayout::setHelpKeyword('Basis.AnmeldungRegistrierung');
+        PageLayout::setTitle(_('Registrierung'));
+
+        echo $register_template->render(
+            [],
+            $GLOBALS['template_factory']->open('layouts/base.php')
+        );
+    }
+
+    /**
+     * @return bool|string
+     */
+    public function auth_doregister()
+    {
+        $this->check_environment();
+
+        $this->error_msg = '';
+
+        $this->auth['uname'] = Request::username('username'); // This provides access for "crcregister.ihtml"
+
+        $validator = new email_validation_class(); // Klasse zum Ueberpruefen der Eingaben
+        $validator->timeout = 10; // Wie lange warten wir auf eine Antwort des Mailservers?
+
+        if (!Seminar_Session::check_ticket(Request::option('login_ticket'))) {
+            return false;
+        }
+
+        $username = trim(Request::get('username'));
+        $Vorname  = trim(Request::get('Vorname'));
+        $Nachname = trim(Request::get('Nachname'));
+
+        // accept only registered domains if set
+        if (Config::get()->EMAIL_DOMAIN_RESTRICTION) {
+            $Email = trim(Request::get('Email')) . '@' . trim(Request::get('emaildomain'));
+        } else {
+            $Email = trim(Request::get('Email'));
+        }
+
+        if (!$validator->ValidateUsername($username)) {
+            $this->error_msg = $this->error_msg . _('Der gewählte Benutzername ist zu kurz!') . '<br>';
+            return false;
+        } // username syntaktisch falsch oder zu kurz
+        // auf doppelte Vergabe wird weiter unten getestet.
+
+        if (!$validator->ValidatePassword(Request::get('password'))) {
+            $this->error_msg = $this->error_msg . _('Das Passwort ist zu kurz, zu lang oder enthält nicht erlaubte Zeichen!') . '<br>';
+            return false;
+        }
+
+        if (!$validator->ValidateName($Vorname)) {
+            $this->error_msg = $this->error_msg . _('Der Vorname fehlt oder ist unsinnig!') . '<br>';
+            return false;
+        } // Vorname nicht korrekt oder fehlend
+        if (!$validator->ValidateName($Nachname)) {
+            $this->error_msg = $this->error_msg . _('Der Nachname fehlt oder ist unsinnig!') . '<br>';
+            return false; // Nachname nicht korrekt oder fehlend
+        }
+        if (!$validator->ValidateEmailAddress($Email)) {
+            $this->error_msg = $this->error_msg . _('Die E-Mail-Adresse fehlt oder ist falsch geschrieben!') . '<br>';
+            return false;
+        } // E-Mail syntaktisch nicht korrekt oder fehlend
+
+        $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
+        $Zeit = date('H:i:s, d.m.Y');
+
+        if (!$validator->ValidateEmailHost($Email)) { // Mailserver nicht erreichbar, ablehnen
+            $this->error_msg = $this->error_msg . _('Der Mailserver ist nicht erreichbar, bitte überprüfen Sie, ob Sie E-Mails mit der angegebenen Adresse verschicken und empfangen können!') . '<br>';
+            return false;
+        } else { // Server ereichbar
+            if (!$validator->ValidateEmailBox($Email)) { // aber user unbekannt. Mail an abuse!
+                StudipMail::sendAbuseMessage('Register', "Emailbox unbekannt\n\nUser: $username\nEmail: $Email\n\nIP: $REMOTE_ADDR\nZeit: $Zeit\n");
+                $this->error_msg = $this->error_msg . _('Die angegebene E-Mail-Adresse ist nicht erreichbar, bitte überprüfen Sie Ihre Angaben!') . '<br>';
+                return false;
+            } else {
+                ; // Alles paletti, jetzt kommen die Checks gegen die Datenbank...
+            }
+        }
+
+        $check_uname = StudipAuthAbstract::CheckUsername($username);
+
+        if ($check_uname['found']) {
+            $this->error_msg = $this->error_msg . _('Der gewählte Benutzername ist bereits vorhanden!') . '<br>';
+            return false; // username schon vorhanden
+        }
+
+        if (User::countBySQL('Email = ?', [$Email])) {
+            $this->error_msg = $this->error_msg . _('Die angegebene E-Mail-Adresse wird bereits von einem anderen Benutzer verwendet. Sie müssen eine andere E-Mail-Adresse angeben!') . '<br>';
+            return false; // Email schon vorhanden
+        }
+
+        // alle Checks ok, Benutzer registrieren...
+        $hasher = UserManagement::getPwdHasher();
+        $new_user = new User();
+        $new_user->username = $username;
+        $new_user->perms = 'user';
+        $new_user->password = $hasher->HashPassword(Request::get('password'));
+        $new_user->vorname = $Vorname;
+        $new_user->nachname = $Nachname;
+        $new_user->email = $Email;
+        $new_user->geschlecht = Request::int('geschlecht');
+        $new_user->title_front = trim(Request::get('title_front', Request::get('title_front_chooser')));
+        $new_user->title_rear = trim(Request::get('title_rear', Request::get('title_rear_chooser')));
+        $new_user->auth_plugin = 'standard';
+        $new_user->store();
+
+        if (!$new_user->user_id) {
+            return false;
+        }
+
+        self::sendValidationMail($new_user);
+
+        $this->auth['perm'] = $new_user->perms;
+        $this->auth['uname'] = $new_user->username;
+        $this->auth['auth_plugin'] = $new_user->auth_plugin;
+
+        return $new_user->user_id;
+    }
+
+    /**
+     * Send a validation mail to the passed user
+     *
+     * @param User $user a user-object or id of the user
+     *                   to resend the validation mail for
+     */
+    public static function sendValidationMail($user){
+        // if no user-object is given interpret it as a user-id
+        if (is_string($user)) {
+            $user = new User($user);
+        }
+
+        // template-variables for the include partial
+        $Zeit     = date('H:i:s, d.m.Y', $user->mkdate);
+        $username = $user->username;
+        $Vorname  = $user->vorname;
+        $Nachname = $user->nachname;
+        $Email    = $user->email;
+
+        // (re-)send the confirmation mail
+        $to     = $user->email;
+        $token  = Token::create(7 * 24 * 60 * 60, $user->id); // Link is valid for 1 week
+        $url    = $GLOBALS['ABSOLUTE_URI_STUDIP'] . 'email_validation.php?secret=' . $token;
+        $mail   = new StudipMail();
+        $abuse  = StudipMail::getAbuseEmail();
+
+        $lang_path = getUserLanguagePath($user->id);
+
+        // include language-specific subject and mailbody
+        // TODO: This should be refactored so that the included file returns an array
+        include "locale/{$lang_path}/LC_MAILS/register_mail.inc.php"; // Defines $subject and $mailbody
+
+        // send the mail
+        $mail->setSubject($subject ?? '')
+            ->addRecipient($to)
+            ->setBodyText($mailbody ?? '')
+            ->send();
+    }
+
+    /**
+     * Validates a given hash for a given user id.
+     * @param  string $secret  Secret to validate
+     * @param  string $user_id User id
+     * @return bool
+     */
+    public static function validateSecret($secret, $user_id)
+    {
+        return Token::isValid($secret, $user_id);
+    }
+}
diff --git a/lib/phplib/Seminar_Session.class.php b/lib/phplib/Seminar_Session.class.php
deleted file mode 100644
index 8324062..0000000
--- a/lib/phplib/Seminar_Session.class.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-
-/**
- * PHPLib Sessions using PHP 4 build-in sessions and PHPLib storage container
- *
- * @copyright  (c) 1998,1999 NetUSE GmbH Boris Erdmann, Kristian Koehntopp,
- *             2000 Maxim Derkachev <kot@books.ru>,
- *             2000 Teodor Cimpoesu <teo@digiro.net>
- * @author     André Noack <noack@data-quest.de> Maxim Derkachev <kot@books.ru>,
- *               Teodor Cimpoesu <teo@digiro.net>,Ulf Wendel <uw@netuse.de>
- */
-class Seminar_Session
-{
-    /**
-     * Current session id.
-     *
-     * @var  string
-     * @see  id(), Session()
-     */
-    private $id;
-
-
-    /**
-     * Current session name also cookie name
-     *
-     * @var  string
-     * @see  name(), Session()
-     */
-    private $name;
-
-    /**
-     *
-     * @var  string
-     */
-    private $cookie_path;
-
-    /**
-     * If set, the domain for which the session cookie is set.
-     *
-     * @var  string
-     */
-    private $cookie_domain;
-
-    /**
-     * If set, the domain for which the session cookie is set.
-     *
-     * @var  bool
-     */
-    private $cookie_secure = false;
-
-    /**
-     * If set, the domain for which the session cookie is set.
-     *
-     * @var  bool
-     */
-    private $cookie_httponly = true;
-
-    /**
-     * session storage module - user, files or mm
-     *
-     * @var  string
-     */
-    private $module = 'user';
-
-
-    /**
-     * where to save session files if module == files
-     *
-     * @var string
-     */
-    private $save_path;
-
-
-    /**
-     * Name of data storage container
-     *
-     * var string
-     */
-    private $that_class = 'CT_Sql';
-
-    /**
-     *
-     * @var  object CT_*
-     */
-    private $that;
-
-    /**
-     * Purge all session data older than this.
-     *
-     * @var int
-     */
-    private $gc_time;
-
-
-    /**
-     * @var
-     */
-    private static $studipticket;
-    /**
-     * @var
-     */
-    private static $current_session_state;
-
-    /**
-     * Returns true, if the current session is valid and belongs to an
-     * authenticated user. Does not start a session.
-     *
-     * @static
-     * @return bool
-     */
-    public static function is_current_session_authenticated()
-    {
-        return self::get_current_session_state() == 'authenticated';
-    }
-
-    /**
-     * Returns the state of the current session. Does not start a session.
-     * possible return values:
-     * 'authenticated' - session is valid and user is authenticated
-     * 'nobody' - session is valid, but user is not authenticated
-     * false - no valid session
-     *
-     * @static
-     * @return string|false
-     */
-    public static function get_current_session_state()
-    {
-
-        if (!is_null(self::$current_session_state)) {
-            return self::$current_session_state;
-        }
-        $state = false;
-        if (isset($GLOBALS['user']) && is_object($GLOBALS['user'])) {
-            $state = in_array($GLOBALS['user']->id, ['nobody', 'form']) ? 'nobody' : 'authenticated';
-        } else {
-            $sid = $_COOKIE[__CLASS__];
-            if ($sid) {
-                $session_vars = self::get_session_vars($sid);
-                $session_auth = $session_vars['auth']->auth;
-                if ($session_auth['uid'] && !in_array($session_auth['uid'], ['nobody', 'form'])) {
-                    $state = 'authenticated';
-                } else {
-                    $state = in_array($session_auth['uid'], ['nobody', 'form']) ? 'nobody' : false;
-                }
-            }
-        }
-        return (self::$current_session_state = $state);
-    }
-
-    /**
-     * returns a SessionDecoder object containing the session variables
-     * for the given session id
-     *
-     * @static
-     * @param string $sid a session id
-     * @return SessionDecoder
-     */
-    public static function get_session_vars($sid)
-    {
-        $sess = $GLOBALS['sess'] ?? null;
-        if (!is_object($sess)) {
-            $sess = new self();
-        }
-        $storage_class = $sess->that_class;
-        $storage = new $storage_class();
-        $storage->ac_start();
-        return new SessionDecoder($storage->ac_get_value($sid));
-    }
-
-    /**
-     * returns a random string token for XSRF prevention
-     * the string is stored in the session
-     *
-     * @static
-     * @return string
-     */
-    public static function get_ticket()
-    {
-        if (!self::$studipticket) {
-            self::$studipticket = $_SESSION['last_ticket'] = md5(uniqid('studipticket', 1));
-        }
-        return self::$studipticket;
-    }
-
-    /**
-     * checks the given string token against the one stored
-     * in the session
-     *
-     * @static
-     * @param string $studipticket
-     * @return bool
-     */
-    public static function check_ticket($studipticket)
-    {
-        $check = (isset($_SESSION['last_ticket']) && $_SESSION['last_ticket'] == $studipticket);
-        $_SESSION['last_ticket'] = null;
-        return $check;
-    }
-
-
-    /**
-     *
-     */
-    function __construct()
-    {
-        if (Config::get()->CACHING_ENABLE && $GLOBALS['CACHE_IS_SESSION_STORAGE']) {
-            $this->that_class = 'CT_Cache';
-        }
-        $this->cookie_path = $this->cookie_path ?: $GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'];
-        $this->cookie_secure = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
-        $this->name(get_class($this));
-    }
-
-    /**
-     * Start a new session or recovers from an existing session
-     *
-     * @return boolean   session_start() return value
-     * @access public
-     */
-    function start()
-    {
-        $this->set_container();
-
-        session_set_cookie_params(
-            0,
-            implode('/', array_map('rawurlencode', explode('/', $this->cookie_path))),
-            $this->cookie_domain,
-            $this->cookie_secure,
-            $this->cookie_httponly
-        );
-        session_cache_limiter("nocache");
-        //check for illegal cookiename
-        if (
-            !isset($_COOKIE[$this->name])
-            || mb_strlen($_COOKIE[$this->name]) !== 32
-            || preg_match('/[^0-9a-f]+/', $_COOKIE[$this->name])
-        ) {
-            do {
-                $new_id = md5(bin2hex(random_bytes(128)));
-            } while (!$this->that->ac_newid($new_id));
-
-            session_id($new_id);
-        }
-
-        $ok = session_start();
-        $this->id = session_id();
-        return $ok;
-    }
-
-    /**
-     * Sets or returns the name of the current session
-     *
-     * @param  string  If given, sets the session name
-     * @return string  session_name() return value
-     * @access public
-     */
-    function name($name = '')
-    {
-        if ($name) {
-            $this->name = $name;
-            $ok = session_name($name);
-        } else {
-            $ok = session_name();
-        }
-        return $ok;
-    }
-
-    /**
-     * ?
-     *
-     */
-    function set_container()
-    {
-
-        switch ($this->module) {
-            case "user" :
-                $name = $this->that_class;
-                $this->that = new $name;
-                $this->that->ac_start();
-                // set custom session handlers
-                session_set_save_handler([$this, 'open'],
-                    [$this, 'close'],
-                    [$this, 'thaw'],
-                    [$this, 'freeze'],
-                    [$this, 'del'],
-                    [$this, 'gc']
-                );
-                break;
-
-            case "mm":
-                session_module_name('mm');
-                break;
-
-            case "files":
-            default:
-                if ($this->save_path) {
-                    session_save_path($this->save_path);
-                }
-                session_module_name('files');
-                break;
-        }
-    }
-
-    /**
-     * @param array $keep_session_vars
-     */
-    function regenerate_session_id($keep_session_vars = [])
-    {
-        $keep = [];
-        if (is_array($_SESSION)) {
-            foreach (array_keys($_SESSION) as $k) {
-                if (in_array($k, $keep_session_vars)) {
-                    $keep[$k] = $_SESSION[$k];
-                }
-            }
-            $_SESSION = [];
-        }
-        $this->delete();
-        $this->start();
-        foreach ($keep_session_vars as $k) {
-            $_SESSION[$k] = $keep[$k] ?? null;
-        }
-    }
-
-    /**
-     * Delete the current session destroying all registered data.
-     *
-     * Note that it does more but the PHP 4 session_destroy it also
-     * throws away a cookie is there's one.
-     *
-     * @return boolean session_destroy return value
-     * @access public
-     */
-    function delete()
-    {
-        $cookie_params = session_get_cookie_params();
-        setCookie(
-            $this->name,
-            '',
-            0,
-            implode('/', array_map('rawurlencode', explode('/', $cookie_params['path']))),
-            $cookie_params['domain'],
-            $cookie_params['secure'],
-            $cookie_params['httponly']
-        );
-        $_COOKIE[$this->name] = "";
-        $_SESSION = [];
-        return session_destroy();
-    }
-
-    // the following functions used in session_set_save_handler
-
-    /**
-     * Open callback
-     *
-     */
-    function open()
-    {
-        return true;
-    }
-
-
-    /**
-     * Close callback
-     *
-     */
-    function close()
-    {
-        return true;
-    }
-
-
-    /**
-     * Delete callback
-     */
-    function del()
-    {
-        if ($this->module == 'user') {
-            $this->that->ac_delete($this->id, $this->name);
-        }
-        return true;
-    }
-
-
-    /**
-     * Write callback.
-     *
-     */
-    function freeze($id = null, $sess_data = null)
-    {
-        if ($this->module == 'user') {
-            if (!isset($sess_data)) {
-                $sess_data = session_encode();
-            }
-            $r = $this->that->ac_store($this->id, $this->name, $sess_data);
-            if (!$r) {
-                $this->that->ac_halt("Session: freeze() failed.");
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Read callback.
-     */
-    function thaw()
-    {
-        if ($this->module == 'user') {
-            return $this->that->ac_get_value(session_id(), $this->name) ?: '';
-        }
-        return '';
-    }
-
-    /**
-     * @return bool
-     */
-    function gc()
-    {
-        if ($this->module === 'user') {
-            //bail out if cronjob activated and not called in cli context
-            if (
-                Config::getInstance()->getValue('CRONJOBS_ENABLE')
-                && ($task = CronjobTask::findOneByClass(SessionGcJob::class))
-                && count($task->schedules->findBy('active', 1))
-                && PHP_SAPI !== 'cli'
-            ) {
-                return false;
-            }
-            if (empty($this->gc_time)) {
-                $this->gc_time = ini_get("session.gc_maxlifetime");
-            }
-            return (bool)$this->that->ac_gc($this->gc_time, $this->name);
-        }
-        return true;
-    }
-}
diff --git a/lib/phplib/Seminar_Session.php b/lib/phplib/Seminar_Session.php
new file mode 100644
index 0000000..8324062
--- /dev/null
+++ b/lib/phplib/Seminar_Session.php
@@ -0,0 +1,436 @@
+<?php
+
+/**
+ * PHPLib Sessions using PHP 4 build-in sessions and PHPLib storage container
+ *
+ * @copyright  (c) 1998,1999 NetUSE GmbH Boris Erdmann, Kristian Koehntopp,
+ *             2000 Maxim Derkachev <kot@books.ru>,
+ *             2000 Teodor Cimpoesu <teo@digiro.net>
+ * @author     André Noack <noack@data-quest.de> Maxim Derkachev <kot@books.ru>,
+ *               Teodor Cimpoesu <teo@digiro.net>,Ulf Wendel <uw@netuse.de>
+ */
+class Seminar_Session
+{
+    /**
+     * Current session id.
+     *
+     * @var  string
+     * @see  id(), Session()
+     */
+    private $id;
+
+
+    /**
+     * Current session name also cookie name
+     *
+     * @var  string
+     * @see  name(), Session()
+     */
+    private $name;
+
+    /**
+     *
+     * @var  string
+     */
+    private $cookie_path;
+
+    /**
+     * If set, the domain for which the session cookie is set.
+     *
+     * @var  string
+     */
+    private $cookie_domain;
+
+    /**
+     * If set, the domain for which the session cookie is set.
+     *
+     * @var  bool
+     */
+    private $cookie_secure = false;
+
+    /**
+     * If set, the domain for which the session cookie is set.
+     *
+     * @var  bool
+     */
+    private $cookie_httponly = true;
+
+    /**
+     * session storage module - user, files or mm
+     *
+     * @var  string
+     */
+    private $module = 'user';
+
+
+    /**
+     * where to save session files if module == files
+     *
+     * @var string
+     */
+    private $save_path;
+
+
+    /**
+     * Name of data storage container
+     *
+     * var string
+     */
+    private $that_class = 'CT_Sql';
+
+    /**
+     *
+     * @var  object CT_*
+     */
+    private $that;
+
+    /**
+     * Purge all session data older than this.
+     *
+     * @var int
+     */
+    private $gc_time;
+
+
+    /**
+     * @var
+     */
+    private static $studipticket;
+    /**
+     * @var
+     */
+    private static $current_session_state;
+
+    /**
+     * Returns true, if the current session is valid and belongs to an
+     * authenticated user. Does not start a session.
+     *
+     * @static
+     * @return bool
+     */
+    public static function is_current_session_authenticated()
+    {
+        return self::get_current_session_state() == 'authenticated';
+    }
+
+    /**
+     * Returns the state of the current session. Does not start a session.
+     * possible return values:
+     * 'authenticated' - session is valid and user is authenticated
+     * 'nobody' - session is valid, but user is not authenticated
+     * false - no valid session
+     *
+     * @static
+     * @return string|false
+     */
+    public static function get_current_session_state()
+    {
+
+        if (!is_null(self::$current_session_state)) {
+            return self::$current_session_state;
+        }
+        $state = false;
+        if (isset($GLOBALS['user']) && is_object($GLOBALS['user'])) {
+            $state = in_array($GLOBALS['user']->id, ['nobody', 'form']) ? 'nobody' : 'authenticated';
+        } else {
+            $sid = $_COOKIE[__CLASS__];
+            if ($sid) {
+                $session_vars = self::get_session_vars($sid);
+                $session_auth = $session_vars['auth']->auth;
+                if ($session_auth['uid'] && !in_array($session_auth['uid'], ['nobody', 'form'])) {
+                    $state = 'authenticated';
+                } else {
+                    $state = in_array($session_auth['uid'], ['nobody', 'form']) ? 'nobody' : false;
+                }
+            }
+        }
+        return (self::$current_session_state = $state);
+    }
+
+    /**
+     * returns a SessionDecoder object containing the session variables
+     * for the given session id
+     *
+     * @static
+     * @param string $sid a session id
+     * @return SessionDecoder
+     */
+    public static function get_session_vars($sid)
+    {
+        $sess = $GLOBALS['sess'] ?? null;
+        if (!is_object($sess)) {
+            $sess = new self();
+        }
+        $storage_class = $sess->that_class;
+        $storage = new $storage_class();
+        $storage->ac_start();
+        return new SessionDecoder($storage->ac_get_value($sid));
+    }
+
+    /**
+     * returns a random string token for XSRF prevention
+     * the string is stored in the session
+     *
+     * @static
+     * @return string
+     */
+    public static function get_ticket()
+    {
+        if (!self::$studipticket) {
+            self::$studipticket = $_SESSION['last_ticket'] = md5(uniqid('studipticket', 1));
+        }
+        return self::$studipticket;
+    }
+
+    /**
+     * checks the given string token against the one stored
+     * in the session
+     *
+     * @static
+     * @param string $studipticket
+     * @return bool
+     */
+    public static function check_ticket($studipticket)
+    {
+        $check = (isset($_SESSION['last_ticket']) && $_SESSION['last_ticket'] == $studipticket);
+        $_SESSION['last_ticket'] = null;
+        return $check;
+    }
+
+
+    /**
+     *
+     */
+    function __construct()
+    {
+        if (Config::get()->CACHING_ENABLE && $GLOBALS['CACHE_IS_SESSION_STORAGE']) {
+            $this->that_class = 'CT_Cache';
+        }
+        $this->cookie_path = $this->cookie_path ?: $GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'];
+        $this->cookie_secure = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+        $this->name(get_class($this));
+    }
+
+    /**
+     * Start a new session or recovers from an existing session
+     *
+     * @return boolean   session_start() return value
+     * @access public
+     */
+    function start()
+    {
+        $this->set_container();
+
+        session_set_cookie_params(
+            0,
+            implode('/', array_map('rawurlencode', explode('/', $this->cookie_path))),
+            $this->cookie_domain,
+            $this->cookie_secure,
+            $this->cookie_httponly
+        );
+        session_cache_limiter("nocache");
+        //check for illegal cookiename
+        if (
+            !isset($_COOKIE[$this->name])
+            || mb_strlen($_COOKIE[$this->name]) !== 32
+            || preg_match('/[^0-9a-f]+/', $_COOKIE[$this->name])
+        ) {
+            do {
+                $new_id = md5(bin2hex(random_bytes(128)));
+            } while (!$this->that->ac_newid($new_id));
+
+            session_id($new_id);
+        }
+
+        $ok = session_start();
+        $this->id = session_id();
+        return $ok;
+    }
+
+    /**
+     * Sets or returns the name of the current session
+     *
+     * @param  string  If given, sets the session name
+     * @return string  session_name() return value
+     * @access public
+     */
+    function name($name = '')
+    {
+        if ($name) {
+            $this->name = $name;
+            $ok = session_name($name);
+        } else {
+            $ok = session_name();
+        }
+        return $ok;
+    }
+
+    /**
+     * ?
+     *
+     */
+    function set_container()
+    {
+
+        switch ($this->module) {
+            case "user" :
+                $name = $this->that_class;
+                $this->that = new $name;
+                $this->that->ac_start();
+                // set custom session handlers
+                session_set_save_handler([$this, 'open'],
+                    [$this, 'close'],
+                    [$this, 'thaw'],
+                    [$this, 'freeze'],
+                    [$this, 'del'],
+                    [$this, 'gc']
+                );
+                break;
+
+            case "mm":
+                session_module_name('mm');
+                break;
+
+            case "files":
+            default:
+                if ($this->save_path) {
+                    session_save_path($this->save_path);
+                }
+                session_module_name('files');
+                break;
+        }
+    }
+
+    /**
+     * @param array $keep_session_vars
+     */
+    function regenerate_session_id($keep_session_vars = [])
+    {
+        $keep = [];
+        if (is_array($_SESSION)) {
+            foreach (array_keys($_SESSION) as $k) {
+                if (in_array($k, $keep_session_vars)) {
+                    $keep[$k] = $_SESSION[$k];
+                }
+            }
+            $_SESSION = [];
+        }
+        $this->delete();
+        $this->start();
+        foreach ($keep_session_vars as $k) {
+            $_SESSION[$k] = $keep[$k] ?? null;
+        }
+    }
+
+    /**
+     * Delete the current session destroying all registered data.
+     *
+     * Note that it does more but the PHP 4 session_destroy it also
+     * throws away a cookie is there's one.
+     *
+     * @return boolean session_destroy return value
+     * @access public
+     */
+    function delete()
+    {
+        $cookie_params = session_get_cookie_params();
+        setCookie(
+            $this->name,
+            '',
+            0,
+            implode('/', array_map('rawurlencode', explode('/', $cookie_params['path']))),
+            $cookie_params['domain'],
+            $cookie_params['secure'],
+            $cookie_params['httponly']
+        );
+        $_COOKIE[$this->name] = "";
+        $_SESSION = [];
+        return session_destroy();
+    }
+
+    // the following functions used in session_set_save_handler
+
+    /**
+     * Open callback
+     *
+     */
+    function open()
+    {
+        return true;
+    }
+
+
+    /**
+     * Close callback
+     *
+     */
+    function close()
+    {
+        return true;
+    }
+
+
+    /**
+     * Delete callback
+     */
+    function del()
+    {
+        if ($this->module == 'user') {
+            $this->that->ac_delete($this->id, $this->name);
+        }
+        return true;
+    }
+
+
+    /**
+     * Write callback.
+     *
+     */
+    function freeze($id = null, $sess_data = null)
+    {
+        if ($this->module == 'user') {
+            if (!isset($sess_data)) {
+                $sess_data = session_encode();
+            }
+            $r = $this->that->ac_store($this->id, $this->name, $sess_data);
+            if (!$r) {
+                $this->that->ac_halt("Session: freeze() failed.");
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Read callback.
+     */
+    function thaw()
+    {
+        if ($this->module == 'user') {
+            return $this->that->ac_get_value(session_id(), $this->name) ?: '';
+        }
+        return '';
+    }
+
+    /**
+     * @return bool
+     */
+    function gc()
+    {
+        if ($this->module === 'user') {
+            //bail out if cronjob activated and not called in cli context
+            if (
+                Config::getInstance()->getValue('CRONJOBS_ENABLE')
+                && ($task = CronjobTask::findOneByClass(SessionGcJob::class))
+                && count($task->schedules->findBy('active', 1))
+                && PHP_SAPI !== 'cli'
+            ) {
+                return false;
+            }
+            if (empty($this->gc_time)) {
+                $this->gc_time = ini_get("session.gc_maxlifetime");
+            }
+            return (bool)$this->that->ac_gc($this->gc_time, $this->name);
+        }
+        return true;
+    }
+}
diff --git a/lib/phplib/Seminar_User.class.php b/lib/phplib/Seminar_User.class.php
deleted file mode 100644
index c82d73a..0000000
--- a/lib/phplib/Seminar_User.class.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Seminar_User.class.php
- * global object representing current user
- *
- * 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.
- *
- * @author      André Noack <noack@data-quest.de>
- * @copyright   2000 Stud.IP Core-Group
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
-*/
-
-class Seminar_User
-{
-    public $cfg = null; //UserConfig object
-    private $user = null; //User object
-    //private $last_online_time = null;
-
-    public function __construct($user = null)
-    {
-        if ($user instanceOf User) {
-            $this->user = $user;
-        } else {
-            $this->user = User::findFull($user);
-        }
-        if (!isset($this->user)) {
-            $this->user = new User();
-            $this->user->user_id = 'nobody';
-            $this->user->perms = null;
-        }
-        $this->cfg = UserConfig::get($this->user->user_id);
-        //$this->last_online_time = $this->get_last_action();
-    }
-
-    public function getAuthenticatedUser()
-    {
-        return $this->user->id !== 'nobody' ? $this->user : null;
-    }
-
-    private function get_last_action()
-    {
-        if ($this->id && $this->id != 'nobody') {
-            $stmt = DBManager::get()->prepare("SELECT last_lifesign FROM user_online WHERE user_id = ?");
-            $stmt->execute([$this->id]);
-            return $stmt->fetchColumn();
-        }
-    }
-
-    public function set_last_action($timestamp = 0)
-    {
-        if ($this->id && $this->id != 'nobody') {
-            if ($timestamp <= 0) {
-                $current_user_last_lifesign = $_SESSION['USER_LAST_LIFESIGN'] ?? 0;
-                if (time() - $current_user_last_lifesign < 180) {
-                    return 0;
-                }
-                $timestamp = time();
-            }
-            $query = "INSERT INTO user_online (user_id, last_lifesign)
-                      VALUES (:user_id, UNIX_TIMESTAMP() - :time_delta)
-                      ON DUPLICATE KEY UPDATE last_lifesign = UNIX_TIMESTAMP() - :time_delta";
-            $stmt = DBManager::get()->prepare($query);
-            $stmt->bindValue(':user_id', $this->id);
-            $stmt->bindValue(':time_delta', time() - $timestamp, PDO::PARAM_INT);
-            $stmt->execute();
-            $_SESSION['USER_LAST_LIFESIGN'] = time() - $timestamp;
-            return $stmt->rowCount();
-        }
-    }
-
-    public function delete()
-    {
-        if ($this->id && $this->id != 'nobody') {
-            $stmt = DBManager::get()->prepare("DELETE FROM user_online WHERE user_id = ?");
-            $stmt->execute([$this->id]);
-            return $stmt->rowCount();
-        }
-    }
-
-    public function __get($field)
-    {
-        if ($field == 'id') {
-            return $this->user->user_id;
-        }
-        return $this->user->$field;
-    }
-
-    public function __set($field, $value)
-    {
-        return null;
-    }
-
-    public function __isset($field)
-    {
-        return isset($this->user->$field);
-    }
-
-    public function getFullName($format = 'full')
-    {
-        return $this->user->getFullName($format);
-    }
-
-    /**
-     * Returns whether the current needs to accept the terms of use.
-     * @return bool
-     */
-    public function needsToAcceptTerms()
-    {
-        return $this->id !== 'nobody'
-            && Config::get()->SHOW_TERMS_ON_FIRST_LOGIN
-            && !$this->cfg->TERMS_ACCEPTED;
-    }
-}
diff --git a/lib/phplib/Seminar_User.php b/lib/phplib/Seminar_User.php
new file mode 100644
index 0000000..c82d73a
--- /dev/null
+++ b/lib/phplib/Seminar_User.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Seminar_User.class.php
+ * global object representing current user
+ *
+ * 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.
+ *
+ * @author      André Noack <noack@data-quest.de>
+ * @copyright   2000 Stud.IP Core-Group
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+*/
+
+class Seminar_User
+{
+    public $cfg = null; //UserConfig object
+    private $user = null; //User object
+    //private $last_online_time = null;
+
+    public function __construct($user = null)
+    {
+        if ($user instanceOf User) {
+            $this->user = $user;
+        } else {
+            $this->user = User::findFull($user);
+        }
+        if (!isset($this->user)) {
+            $this->user = new User();
+            $this->user->user_id = 'nobody';
+            $this->user->perms = null;
+        }
+        $this->cfg = UserConfig::get($this->user->user_id);
+        //$this->last_online_time = $this->get_last_action();
+    }
+
+    public function getAuthenticatedUser()
+    {
+        return $this->user->id !== 'nobody' ? $this->user : null;
+    }
+
+    private function get_last_action()
+    {
+        if ($this->id && $this->id != 'nobody') {
+            $stmt = DBManager::get()->prepare("SELECT last_lifesign FROM user_online WHERE user_id = ?");
+            $stmt->execute([$this->id]);
+            return $stmt->fetchColumn();
+        }
+    }
+
+    public function set_last_action($timestamp = 0)
+    {
+        if ($this->id && $this->id != 'nobody') {
+            if ($timestamp <= 0) {
+                $current_user_last_lifesign = $_SESSION['USER_LAST_LIFESIGN'] ?? 0;
+                if (time() - $current_user_last_lifesign < 180) {
+                    return 0;
+                }
+                $timestamp = time();
+            }
+            $query = "INSERT INTO user_online (user_id, last_lifesign)
+                      VALUES (:user_id, UNIX_TIMESTAMP() - :time_delta)
+                      ON DUPLICATE KEY UPDATE last_lifesign = UNIX_TIMESTAMP() - :time_delta";
+            $stmt = DBManager::get()->prepare($query);
+            $stmt->bindValue(':user_id', $this->id);
+            $stmt->bindValue(':time_delta', time() - $timestamp, PDO::PARAM_INT);
+            $stmt->execute();
+            $_SESSION['USER_LAST_LIFESIGN'] = time() - $timestamp;
+            return $stmt->rowCount();
+        }
+    }
+
+    public function delete()
+    {
+        if ($this->id && $this->id != 'nobody') {
+            $stmt = DBManager::get()->prepare("DELETE FROM user_online WHERE user_id = ?");
+            $stmt->execute([$this->id]);
+            return $stmt->rowCount();
+        }
+    }
+
+    public function __get($field)
+    {
+        if ($field == 'id') {
+            return $this->user->user_id;
+        }
+        return $this->user->$field;
+    }
+
+    public function __set($field, $value)
+    {
+        return null;
+    }
+
+    public function __isset($field)
+    {
+        return isset($this->user->$field);
+    }
+
+    public function getFullName($format = 'full')
+    {
+        return $this->user->getFullName($format);
+    }
+
+    /**
+     * Returns whether the current needs to accept the terms of use.
+     * @return bool
+     */
+    public function needsToAcceptTerms()
+    {
+        return $this->id !== 'nobody'
+            && Config::get()->SHOW_TERMS_ON_FIRST_LOGIN
+            && !$this->cfg->TERMS_ACCEPTED;
+    }
+}
diff --git a/lib/phplib/email_validation.class.php b/lib/phplib/email_validation.class.php
deleted file mode 100644
index f825e82..0000000
--- a/lib/phplib/email_validation.class.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/*
- * email_validation.php
- *
- * @(#) $Header$
- *
- */
-
-class email_validation_class
-{
-    var $username_regular_expression=null;
-    var $password_regular_expression="/^.{8,}\$/";
-    var $name_regular_expression='/^[_ a-zA-ZÀ-ÿ\'-]+$/';
-    var $telefon_regular_expression="/^([0-9 \(\)\\/+_-]*)\$/";
-    var $timeout=10;
-    var $data_timeout=10;
-    var $localhost="studip.de";
-    var $localuser="info";
-    var $debug=0;
-    var $html_debug=0;
-    var $exclude_address="";
-    var $getmxrr="GetMXRR";
-
-    var $next_token="";
-
-    private $idna_convert;
-
-    function __construct()
-    {
-        $this->username_regular_expression = Config::get()->USERNAME_REGULAR_EXPRESSION;
-        $this->idna_convert = new Algo26\IdnaConvert\ToIdn();
-    }
-
-    Function Tokenize($string,$separator="")
-    {
-        if(!strcmp($separator,""))
-        {
-            $separator=$string;
-            $string=$this->next_token;
-        }
-        for($character=0;$character<mb_strlen($separator);$character++)
-        {
-            if(GetType($position=mb_strpos($string,$separator[$character]))=="integer")
-                $found=(IsSet($found) ? min($found,$position) : $position);
-        }
-        if(IsSet($found))
-        {
-            $this->next_token=mb_substr($string,$found+1);
-            return(mb_substr($string,0,$found));
-        }
-        else
-        {
-            $this->next_token="";
-            return($string);
-        }
-    }
-
-    Function OutputDebug($message)
-    {
-        $message.="\n";
-        if($this->html_debug)
-            $message=str_replace("\n","<br>\n",HtmlEntities($message));
-        echo $message;
-        flush();
-    }
-
-    Function GetLine($connection)
-    {
-        for($line="";;)
-        {
-            if(feof($connection))
-                return(0);
-            $line.=fgets($connection,100);
-            $length=mb_strlen($line);
-            if($length>=2
-            && mb_substr($line,$length-2,2)=="\r\n")
-            {
-                $line=mb_substr($line,0,$length-2);
-                if($this->debug)
-                    $this->OutputDebug("S $line");
-                return($line);
-            }
-        }
-    }
-
-    Function PutLine($connection,$line)
-    {
-        if($this->debug)
-            $this->OutputDebug("C $line");
-        return(fputs($connection,"$line\r\n"));
-    }
-
-    Function ValidateUsername($username)
-    {
-        return(mb_strtolower($username) != 'studip' && preg_match($this->username_regular_expression,$username)!=0);
-    }
-
-    Function ValidatePassword($password)
-    {
-        return preg_match($this->password_regular_expression, $password) != 0;
-    }
-
-    Function ValidateName($name)
-    {
-        return(preg_match($this->name_regular_expression,$name)!=0);
-    }
-
-    Function ValidateTelefon($telefon)
-    {
-        return(preg_match($this->telefon_regular_expression,$telefon)!=0);
-    }
-
-    /**
-     * Validates an email adress. If you pass a comma separated list of domains
-     * as the second parameter, the email is also validated against this list
-     * of domains and the email is only valid if it matches any of the domains.
-     *
-     * @param string $email   Email adress to validate
-     * @param string $domains Optional comma separated list of valid domains
-     * @return bool
-     */
-    public function ValidateEmailAddress($email, $domains = '')
-    {
-        $converted_email = $this->idna_convert->convertEmailAddress($email);
-        if (!filter_var($converted_email, FILTER_VALIDATE_EMAIL)) {
-            return false;
-        }
-
-        if (!$domains) {
-            return true;
-        }
-
-        $checks = [];
-        foreach (explode(',', $domains) as $domain) {
-            $checks[] = preg_quote('@' . trim($domain), '/');
-        }
-
-        $regexp = '/' . implode('|', $checks) . '$/i';
-        return preg_match($regexp, $email) > 0;
-    }
-
-    Function ValidateEmailHost($email){
-        return $this->ValidateEmailHostIntern($email, $hosts);
-    }
-
-    Function ValidateEmailHostIntern($email,&$hosts)
-    {
-        if (!$GLOBALS['MAIL_VALIDATE_HOST']){
-            return true;
-        }
-        if(!$this->ValidateEmailAddress($email))
-            return(0);
-        $user=$this->Tokenize($email,"@");
-        $domain=$this->Tokenize("");
-        $hosts=$weights=[];
-        $getmxrr=$this->getmxrr;
-        if(function_exists($getmxrr)
-        && $getmxrr($domain,$hosts,$weights))
-        {
-            $mxhosts=[];
-            for($host=0;$host<count($hosts);$host++)
-                $mxhosts[$weights[$host]]=$hosts[$host];
-            KSort($mxhosts);
-            for(Reset($mxhosts),$host=0;$host<count($mxhosts);Next($mxhosts),$host++)
-                $hosts[$host]=$mxhosts[Key($mxhosts)];
-        }
-        else
-        {
-            if(strcmp($ip=@gethostbyname($domain),$domain)
-            && (mb_strlen($this->exclude_address)==0
-            || strcmp(@gethostbyname($this->exclude_address),$ip)))
-                $hosts[]=$domain;
-        }
-        return(count($hosts)!=0);
-    }
-
-    Function VerifyResultLines($connection,$code)
-    {
-        while(($line=$this->GetLine($connection)))
-        {
-            if(!strcmp($this->Tokenize($line," "),$code))
-                return(1);
-            if(strcmp($this->Tokenize($line,"-"),$code))
-                return(0);
-        }
-        return(-1);
-    }
-
-    Function ValidateEmailBox($email)
-    {
-        if (!$GLOBALS['MAIL_VALIDATE_BOX']){
-            return true;
-        }
-        if(!$this->ValidateEmailHostIntern($email,$hosts))
-            return(0);
-        if(!strcmp($localhost=$this->localhost,"")
-        && !strcmp($localhost=getenv("SERVER_NAME"),"")
-        && !strcmp($localhost=getenv("HOST"),""))
-           $localhost="localhost";
-        if(!strcmp($localuser=$this->localuser,"")
-        && !strcmp($localuser=getenv("USERNAME"),"")
-        && !strcmp($localuser=getenv("USER"),""))
-           $localuser="root";
-        for($host=0;$host<count($hosts);$host++)
-        {
-            $domain=$hosts[$host];
-            if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
-                $ip=$domain;
-            else
-            {
-                if($this->debug)
-                    $this->OutputDebug("Resolving host name \"".$hosts[$host]."\"...");
-                if(!strcmp($ip=@gethostbyname($domain),$domain))
-                {
-                    if($this->debug)
-                        $this->OutputDebug("Could not resolve host name \"".$hosts[$host]."\".");
-                    continue;
-                }
-            }
-            if(mb_strlen($this->exclude_address)
-            && !strcmp(@gethostbyname($this->exclude_address),$ip))
-            {
-                if($this->debug)
-                    $this->OutputDebug("Host address of \"".$hosts[$host]."\" is the exclude address");
-                continue;
-            }
-            if($this->debug)
-                $this->OutputDebug("Connecting to host address \"".$ip."\"...");
-            if(($connection=($this->timeout ? @fsockopen($ip,25,$errno,$error,$this->timeout) : @fsockopen($ip,25))))
-            {
-                $timeout=($this->data_timeout ? $this->data_timeout : $this->timeout);
-                if($timeout
-                && function_exists("socket_set_timeout"))
-                    socket_set_timeout($connection,$timeout,0);
-                if($this->debug)
-                    $this->OutputDebug("Connected.");
-                if($this->VerifyResultLines($connection,"220")>0
-                && $this->PutLine($connection,"HELO $localhost")
-                && $this->VerifyResultLines($connection,"250")>0
-                && $this->PutLine($connection,"MAIL FROM: <$localuser@$localhost>")
-                && $this->VerifyResultLines($connection,"250")>0
-                && $this->PutLine($connection,"RCPT TO: <$email>")
-                && ($result=$this->VerifyResultLines($connection,"250"))>=0)
-                {
-                    if($result
-                    && $this->PutLine($connection,"DATA"))
-                        $result=($this->VerifyResultLines($connection,"354")!=0);
-                    if($this->debug)
-                        $this->OutputDebug("This host states that the address is ".($result ? "" : "not ")."valid.");
-                    fclose($connection);
-                    if($this->debug)
-                        $this->OutputDebug("Disconnected.");
-                    return($result);
-                }
-                if($this->debug)
-                    $this->OutputDebug("Unable to validate the address with this host.");
-                fclose($connection);
-                if($this->debug)
-                    $this->OutputDebug("Disconnected.");
-            }
-            else
-            {
-                if($this->debug)
-                    $this->OutputDebug("Failed.");
-            }
-        }
-        return(-1);
-    }
-};
-
-?>
diff --git a/lib/phplib/email_validation.php b/lib/phplib/email_validation.php
new file mode 100644
index 0000000..f825e82
--- /dev/null
+++ b/lib/phplib/email_validation.php
@@ -0,0 +1,271 @@
+<?php
+/*
+ * email_validation.php
+ *
+ * @(#) $Header$
+ *
+ */
+
+class email_validation_class
+{
+    var $username_regular_expression=null;
+    var $password_regular_expression="/^.{8,}\$/";
+    var $name_regular_expression='/^[_ a-zA-ZÀ-ÿ\'-]+$/';
+    var $telefon_regular_expression="/^([0-9 \(\)\\/+_-]*)\$/";
+    var $timeout=10;
+    var $data_timeout=10;
+    var $localhost="studip.de";
+    var $localuser="info";
+    var $debug=0;
+    var $html_debug=0;
+    var $exclude_address="";
+    var $getmxrr="GetMXRR";
+
+    var $next_token="";
+
+    private $idna_convert;
+
+    function __construct()
+    {
+        $this->username_regular_expression = Config::get()->USERNAME_REGULAR_EXPRESSION;
+        $this->idna_convert = new Algo26\IdnaConvert\ToIdn();
+    }
+
+    Function Tokenize($string,$separator="")
+    {
+        if(!strcmp($separator,""))
+        {
+            $separator=$string;
+            $string=$this->next_token;
+        }
+        for($character=0;$character<mb_strlen($separator);$character++)
+        {
+            if(GetType($position=mb_strpos($string,$separator[$character]))=="integer")
+                $found=(IsSet($found) ? min($found,$position) : $position);
+        }
+        if(IsSet($found))
+        {
+            $this->next_token=mb_substr($string,$found+1);
+            return(mb_substr($string,0,$found));
+        }
+        else
+        {
+            $this->next_token="";
+            return($string);
+        }
+    }
+
+    Function OutputDebug($message)
+    {
+        $message.="\n";
+        if($this->html_debug)
+            $message=str_replace("\n","<br>\n",HtmlEntities($message));
+        echo $message;
+        flush();
+    }
+
+    Function GetLine($connection)
+    {
+        for($line="";;)
+        {
+            if(feof($connection))
+                return(0);
+            $line.=fgets($connection,100);
+            $length=mb_strlen($line);
+            if($length>=2
+            && mb_substr($line,$length-2,2)=="\r\n")
+            {
+                $line=mb_substr($line,0,$length-2);
+                if($this->debug)
+                    $this->OutputDebug("S $line");
+                return($line);
+            }
+        }
+    }
+
+    Function PutLine($connection,$line)
+    {
+        if($this->debug)
+            $this->OutputDebug("C $line");
+        return(fputs($connection,"$line\r\n"));
+    }
+
+    Function ValidateUsername($username)
+    {
+        return(mb_strtolower($username) != 'studip' && preg_match($this->username_regular_expression,$username)!=0);
+    }
+
+    Function ValidatePassword($password)
+    {
+        return preg_match($this->password_regular_expression, $password) != 0;
+    }
+
+    Function ValidateName($name)
+    {
+        return(preg_match($this->name_regular_expression,$name)!=0);
+    }
+
+    Function ValidateTelefon($telefon)
+    {
+        return(preg_match($this->telefon_regular_expression,$telefon)!=0);
+    }
+
+    /**
+     * Validates an email adress. If you pass a comma separated list of domains
+     * as the second parameter, the email is also validated against this list
+     * of domains and the email is only valid if it matches any of the domains.
+     *
+     * @param string $email   Email adress to validate
+     * @param string $domains Optional comma separated list of valid domains
+     * @return bool
+     */
+    public function ValidateEmailAddress($email, $domains = '')
+    {
+        $converted_email = $this->idna_convert->convertEmailAddress($email);
+        if (!filter_var($converted_email, FILTER_VALIDATE_EMAIL)) {
+            return false;
+        }
+
+        if (!$domains) {
+            return true;
+        }
+
+        $checks = [];
+        foreach (explode(',', $domains) as $domain) {
+            $checks[] = preg_quote('@' . trim($domain), '/');
+        }
+
+        $regexp = '/' . implode('|', $checks) . '$/i';
+        return preg_match($regexp, $email) > 0;
+    }
+
+    Function ValidateEmailHost($email){
+        return $this->ValidateEmailHostIntern($email, $hosts);
+    }
+
+    Function ValidateEmailHostIntern($email,&$hosts)
+    {
+        if (!$GLOBALS['MAIL_VALIDATE_HOST']){
+            return true;
+        }
+        if(!$this->ValidateEmailAddress($email))
+            return(0);
+        $user=$this->Tokenize($email,"@");
+        $domain=$this->Tokenize("");
+        $hosts=$weights=[];
+        $getmxrr=$this->getmxrr;
+        if(function_exists($getmxrr)
+        && $getmxrr($domain,$hosts,$weights))
+        {
+            $mxhosts=[];
+            for($host=0;$host<count($hosts);$host++)
+                $mxhosts[$weights[$host]]=$hosts[$host];
+            KSort($mxhosts);
+            for(Reset($mxhosts),$host=0;$host<count($mxhosts);Next($mxhosts),$host++)
+                $hosts[$host]=$mxhosts[Key($mxhosts)];
+        }
+        else
+        {
+            if(strcmp($ip=@gethostbyname($domain),$domain)
+            && (mb_strlen($this->exclude_address)==0
+            || strcmp(@gethostbyname($this->exclude_address),$ip)))
+                $hosts[]=$domain;
+        }
+        return(count($hosts)!=0);
+    }
+
+    Function VerifyResultLines($connection,$code)
+    {
+        while(($line=$this->GetLine($connection)))
+        {
+            if(!strcmp($this->Tokenize($line," "),$code))
+                return(1);
+            if(strcmp($this->Tokenize($line,"-"),$code))
+                return(0);
+        }
+        return(-1);
+    }
+
+    Function ValidateEmailBox($email)
+    {
+        if (!$GLOBALS['MAIL_VALIDATE_BOX']){
+            return true;
+        }
+        if(!$this->ValidateEmailHostIntern($email,$hosts))
+            return(0);
+        if(!strcmp($localhost=$this->localhost,"")
+        && !strcmp($localhost=getenv("SERVER_NAME"),"")
+        && !strcmp($localhost=getenv("HOST"),""))
+           $localhost="localhost";
+        if(!strcmp($localuser=$this->localuser,"")
+        && !strcmp($localuser=getenv("USERNAME"),"")
+        && !strcmp($localuser=getenv("USER"),""))
+           $localuser="root";
+        for($host=0;$host<count($hosts);$host++)
+        {
+            $domain=$hosts[$host];
+            if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
+                $ip=$domain;
+            else
+            {
+                if($this->debug)
+                    $this->OutputDebug("Resolving host name \"".$hosts[$host]."\"...");
+                if(!strcmp($ip=@gethostbyname($domain),$domain))
+                {
+                    if($this->debug)
+                        $this->OutputDebug("Could not resolve host name \"".$hosts[$host]."\".");
+                    continue;
+                }
+            }
+            if(mb_strlen($this->exclude_address)
+            && !strcmp(@gethostbyname($this->exclude_address),$ip))
+            {
+                if($this->debug)
+                    $this->OutputDebug("Host address of \"".$hosts[$host]."\" is the exclude address");
+                continue;
+            }
+            if($this->debug)
+                $this->OutputDebug("Connecting to host address \"".$ip."\"...");
+            if(($connection=($this->timeout ? @fsockopen($ip,25,$errno,$error,$this->timeout) : @fsockopen($ip,25))))
+            {
+                $timeout=($this->data_timeout ? $this->data_timeout : $this->timeout);
+                if($timeout
+                && function_exists("socket_set_timeout"))
+                    socket_set_timeout($connection,$timeout,0);
+                if($this->debug)
+                    $this->OutputDebug("Connected.");
+                if($this->VerifyResultLines($connection,"220")>0
+                && $this->PutLine($connection,"HELO $localhost")
+                && $this->VerifyResultLines($connection,"250")>0
+                && $this->PutLine($connection,"MAIL FROM: <$localuser@$localhost>")
+                && $this->VerifyResultLines($connection,"250")>0
+                && $this->PutLine($connection,"RCPT TO: <$email>")
+                && ($result=$this->VerifyResultLines($connection,"250"))>=0)
+                {
+                    if($result
+                    && $this->PutLine($connection,"DATA"))
+                        $result=($this->VerifyResultLines($connection,"354")!=0);
+                    if($this->debug)
+                        $this->OutputDebug("This host states that the address is ".($result ? "" : "not ")."valid.");
+                    fclose($connection);
+                    if($this->debug)
+                        $this->OutputDebug("Disconnected.");
+                    return($result);
+                }
+                if($this->debug)
+                    $this->OutputDebug("Unable to validate the address with this host.");
+                fclose($connection);
+                if($this->debug)
+                    $this->OutputDebug("Disconnected.");
+            }
+            else
+            {
+                if($this->debug)
+                    $this->OutputDebug("Failed.");
+            }
+        }
+        return(-1);
+    }
+};
+
+?>
diff --git a/lib/plugins/core/AdminCourseAction.class.php b/lib/plugins/core/AdminCourseAction.class.php
deleted file mode 100644
index 046502c..0000000
--- a/lib/plugins/core/AdminCourseAction.class.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-interface AdminCourseAction
-{
-    public function getAdminActionURL();
-
-    /**
-     * Defines if the Plugin wants to use the multimode to edit multiple courses at once.
-     * @return boolean|string: false, if multimode is not important, else true. But you can also set it to a string (means true) that is the label of the send-button like _("Veranstaltungen archivieren")
-     */
-    public function useMultimode();
-
-    /**
-     * Returns a template for a small table cell (the <td> wraps the template-content)
-     * in which you can set inputs and links to display special actions for an admin
-     * for the given course.
-     * @param $course_id
-     * @param null $values
-     * @return null|Flex_Template
-     */
-    public function getAdminCourseActionTemplate($course_id, $values = null);
-}
diff --git a/lib/plugins/core/AdminCourseAction.php b/lib/plugins/core/AdminCourseAction.php
new file mode 100644
index 0000000..046502c
--- /dev/null
+++ b/lib/plugins/core/AdminCourseAction.php
@@ -0,0 +1,22 @@
+<?php
+
+interface AdminCourseAction
+{
+    public function getAdminActionURL();
+
+    /**
+     * Defines if the Plugin wants to use the multimode to edit multiple courses at once.
+     * @return boolean|string: false, if multimode is not important, else true. But you can also set it to a string (means true) that is the label of the send-button like _("Veranstaltungen archivieren")
+     */
+    public function useMultimode();
+
+    /**
+     * Returns a template for a small table cell (the <td> wraps the template-content)
+     * in which you can set inputs and links to display special actions for an admin
+     * for the given course.
+     * @param $course_id
+     * @param null $values
+     * @return null|Flex_Template
+     */
+    public function getAdminCourseActionTemplate($course_id, $values = null);
+}
diff --git a/lib/plugins/core/AdminCourseContents.class.php b/lib/plugins/core/AdminCourseContents.class.php
deleted file mode 100644
index 0e07b58..0000000
--- a/lib/plugins/core/AdminCourseContents.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Interface AdminCourseContents
- * With this interface a plugin is able to add columns to the course-overview table for admins and roots.
- */
-interface AdminCourseContents
-{
-    /**
-     * The available columns for the course-overview table for admins. Index is the identifier of the column
-     * for the method adminAreaGetCourseContent. The value is the display name of the column.
-     * @return array : an associative array like array('index' => _("Translated display name"))
-     */
-    public function adminAvailableContents();
-
-    /**
-     * Returns the value of the additional column for the course-overview table in the admin-area.
-     *
-     * @param Course $course : A Course-object of the given ... course
-     * @param string $index : the index that comes from adminAvailableContents to identify the column.
-     *
-     * @return Flexi\Template | String : Either one will do, but string is preferred, because it can exported as CSV-file more easily.
-     */
-    public function adminAreaGetCourseContent($course, $index);
-}
diff --git a/lib/plugins/core/AdminCourseContents.php b/lib/plugins/core/AdminCourseContents.php
new file mode 100644
index 0000000..0e07b58
--- /dev/null
+++ b/lib/plugins/core/AdminCourseContents.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Interface AdminCourseContents
+ * With this interface a plugin is able to add columns to the course-overview table for admins and roots.
+ */
+interface AdminCourseContents
+{
+    /**
+     * The available columns for the course-overview table for admins. Index is the identifier of the column
+     * for the method adminAreaGetCourseContent. The value is the display name of the column.
+     * @return array : an associative array like array('index' => _("Translated display name"))
+     */
+    public function adminAvailableContents();
+
+    /**
+     * Returns the value of the additional column for the course-overview table in the admin-area.
+     *
+     * @param Course $course : A Course-object of the given ... course
+     * @param string $index : the index that comes from adminAvailableContents to identify the column.
+     *
+     * @return Flexi\Template | String : Either one will do, but string is preferred, because it can exported as CSV-file more easily.
+     */
+    public function adminAreaGetCourseContent($course, $index);
+}
diff --git a/lib/plugins/core/AdminCourseWidgetPlugin.class.php b/lib/plugins/core/AdminCourseWidgetPlugin.class.php
deleted file mode 100644
index c554626..0000000
--- a/lib/plugins/core/AdminCourseWidgetPlugin.class.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * This plugin interface is used to add functionality to the sidebar of the
- * admin courses page.
- *
- * @see    AdminCourseOptionsWidget
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @since Stud.IP 5.4
- */
-interface AdminCourseWidgetPlugin
-{
-    /**
-     * Returns a list of widgets for the admin courses page.
-     *
-     * @return AdminCourseOptionsWidget[]
-     */
-    public function getWidgets(): iterable;
-
-    /**
-     * Return the filter values this widget provides. Return an associative
-     * array with filter names as indices and filter values as values.
-     *
-     * @return array
-     */
-    public function getFilters(): array;
-
-    /**
-     * Apply the set filters to the AdminCourseFilter query.
-     *
-     * @param AdminCourseFilter $filter
-     */
-    public function applyFilters(AdminCourseFilter $filter): void;
-
-
-    /**
-     * Set filters from the admin course page. You will be given an associative
-     * array according to getFilters().
-     *
-     * @param array $filters
-     */
-    public function setFilters(array $filters): void;
-}
diff --git a/lib/plugins/core/AdminCourseWidgetPlugin.php b/lib/plugins/core/AdminCourseWidgetPlugin.php
new file mode 100644
index 0000000..c554626
--- /dev/null
+++ b/lib/plugins/core/AdminCourseWidgetPlugin.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This plugin interface is used to add functionality to the sidebar of the
+ * admin courses page.
+ *
+ * @see    AdminCourseOptionsWidget
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
+ * @since Stud.IP 5.4
+ */
+interface AdminCourseWidgetPlugin
+{
+    /**
+     * Returns a list of widgets for the admin courses page.
+     *
+     * @return AdminCourseOptionsWidget[]
+     */
+    public function getWidgets(): iterable;
+
+    /**
+     * Return the filter values this widget provides. Return an associative
+     * array with filter names as indices and filter values as values.
+     *
+     * @return array
+     */
+    public function getFilters(): array;
+
+    /**
+     * Apply the set filters to the AdminCourseFilter query.
+     *
+     * @param AdminCourseFilter $filter
+     */
+    public function applyFilters(AdminCourseFilter $filter): void;
+
+
+    /**
+     * Set filters from the admin course page. You will be given an associative
+     * array according to getFilters().
+     *
+     * @param array $filters
+     */
+    public function setFilters(array $filters): void;
+}
diff --git a/lib/plugins/core/AdministrationPlugin.class.php b/lib/plugins/core/AdministrationPlugin.class.php
deleted file mode 100644
index c9aa8da..0000000
--- a/lib/plugins/core/AdministrationPlugin.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-# Lifter010: TODO
-/*
- * AdministrationPlugin.class.php - administration plugin interface
- *
- * NOTE: This interface is deprecated, use SystemPlugin instead.
- *
- * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- * Copyright (c) 2009 - Elmar Ludwig
- *
- * 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.
- */
-
-interface AdministrationPlugin
-{
-}
diff --git a/lib/plugins/core/AdministrationPlugin.php b/lib/plugins/core/AdministrationPlugin.php
new file mode 100644
index 0000000..c9aa8da
--- /dev/null
+++ b/lib/plugins/core/AdministrationPlugin.php
@@ -0,0 +1,19 @@
+<?php
+# Lifter010: TODO
+/*
+ * AdministrationPlugin.class.php - administration plugin interface
+ *
+ * NOTE: This interface is deprecated, use SystemPlugin instead.
+ *
+ * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ * Copyright (c) 2009 - Elmar Ludwig
+ *
+ * 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.
+ */
+
+interface AdministrationPlugin
+{
+}
diff --git a/lib/plugins/core/DetailspagePlugin.class.php b/lib/plugins/core/DetailspagePlugin.class.php
deleted file mode 100644
index 36e6efa..0000000
--- a/lib/plugins/core/DetailspagePlugin.class.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*
- * DetailspagePlugin.class.php
- *
- * Copyright (c) 2019 - Rasmus Fuhse <fuhse@data-quest.de>
- *
- * 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.
- */
-interface DetailspagePlugin
-{
-    /**
-     * Return a template (an instance of the Flexi\Template class)
-     * to be rendered on the details page. Return NULL to
-     * render nothing for this plugin or this course.
-     *
-     * The template will automatically get a standard layout, which
-     * can be configured via attributes set on the template:
-     *
-     *  title        title to display, defaults to plugin name
-     *
-     * @return Flexi\Template|null template object to render or NULL
-     */
-    public function getDetailspageTemplate($course);
-}
diff --git a/lib/plugins/core/DetailspagePlugin.php b/lib/plugins/core/DetailspagePlugin.php
new file mode 100644
index 0000000..36e6efa
--- /dev/null
+++ b/lib/plugins/core/DetailspagePlugin.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * DetailspagePlugin.class.php
+ *
+ * Copyright (c) 2019 - Rasmus Fuhse <fuhse@data-quest.de>
+ *
+ * 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.
+ */
+interface DetailspagePlugin
+{
+    /**
+     * Return a template (an instance of the Flexi\Template class)
+     * to be rendered on the details page. Return NULL to
+     * render nothing for this plugin or this course.
+     *
+     * The template will automatically get a standard layout, which
+     * can be configured via attributes set on the template:
+     *
+     *  title        title to display, defaults to plugin name
+     *
+     * @return Flexi\Template|null template object to render or NULL
+     */
+    public function getDetailspageTemplate($course);
+}
diff --git a/lib/plugins/core/FileUploadHook.class.php b/lib/plugins/core/FileUploadHook.class.php
deleted file mode 100644
index 27323fd..0000000
--- a/lib/plugins/core/FileUploadHook.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-interface FileUploadHook
-{
-    /**
-     * If this method returns a URL the new page will be shown right after adding a file
-     * into a filesystem.
-     *
-     * @param $file_ref
-     * @return null|string: URL or null if no page should be added
-     */
-    public function getAdditionalUploadWizardPage($file_ref);
-}
diff --git a/lib/plugins/core/FileUploadHook.php b/lib/plugins/core/FileUploadHook.php
new file mode 100644
index 0000000..27323fd
--- /dev/null
+++ b/lib/plugins/core/FileUploadHook.php
@@ -0,0 +1,12 @@
+<?php
+interface FileUploadHook
+{
+    /**
+     * If this method returns a URL the new page will be shown right after adding a file
+     * into a filesystem.
+     *
+     * @param $file_ref
+     * @return null|string: URL or null if no page should be added
+     */
+    public function getAdditionalUploadWizardPage($file_ref);
+}
diff --git a/lib/plugins/core/FilesystemPlugin.class.php b/lib/plugins/core/FilesystemPlugin.class.php
deleted file mode 100644
index 31b4b5b..0000000
--- a/lib/plugins/core/FilesystemPlugin.class.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-interface FilesystemPlugin
-{
-    /**
-     * Returns a Navigation-object. Only the title and the image will be used.
-     *
-     * @return null|Navigation with title and image
-     */
-    public function getFileSelectNavigation();
-
-    /**
-     * Returns an URL to a page, where the filesystem can be configured.
-     *
-     * @return mixed
-     */
-    public function filesystemConfigurationURL();
-
-    /**
-     * Determines if this filesystem plugin should be a source for copying or a search.
-     * This may be dependend on the current user and his/her configurations.
-     *
-     * @return boolean
-     */
-    public function isSource();
-
-    /**
-     * Determines if this filesystem-plugin should show up as a personal file-area and be a destination
-     * for copied files.
-     * This may be dependend on the current user and his/her configurations.
-     *
-     * @return boolean
-     */
-    public function isPersonalFileArea();
-
-    /**
-     * This method is used to get a folder-object for this plugin.
-     * Not recommended but still possible is to return a Flexi\Template for the folder, if you want to
-     * take care of the frontend of displaying the folder as well.
-     *
-     * @param null $folder_id : folder_id of folder to get or null if you want the top-folder
-     *
-     * @return FolderType|Flexi\Template
-     */
-    public function getFolder($folder_id = null);
-
-    /**
-     * @param $file_id : The id for the file in the given filesystem of the plugin.
-     * @return array : the already prepared File just like a file-upload-array
-     */
-    public function getPreparedFile($file_id, $with_blob = false);
-
-    /**
-     * Defines if the filesystem-plugin has a search-function.
-     *
-     * @return mixed
-     */
-    public function hasSearch();
-
-    /**
-     * Returns an array for each special search parameter. Each parameter is itself represented by as associative array
-     * like
-     *     array(
-     *         'name' => "name of this parameter in the form",
-     *         'type' => "one of 'text', 'checkbox', 'select'",
-     *         'options' => array() //only neccesary if type is 'select' - a key-value array with the key key as the value of the select and the value as the label of the option
-     *         'placeholder' => "only possible for type 'text' but not mandatory"
-     *     )
-     * This method can also return an empty array or null if no search parameters are needed or no search is provided at all.
-     *
-     * @return null|array(array(), ...)
-     */
-    public function getSearchParameters();
-
-    /**
-     * Returns a virtual folder that 'contains' all the files as a search-result. Only return null
-     * if search is not implemented.
-     *
-     * @param string $text a string
-     * @param array $parameters : an associative array of additional search parameters as defined in getSearchParameters()
-     * @return FolderType|null
-     */
-    public function search($text, $parameters = []);
-}
diff --git a/lib/plugins/core/FilesystemPlugin.php b/lib/plugins/core/FilesystemPlugin.php
new file mode 100644
index 0000000..31b4b5b
--- /dev/null
+++ b/lib/plugins/core/FilesystemPlugin.php
@@ -0,0 +1,83 @@
+<?php
+interface FilesystemPlugin
+{
+    /**
+     * Returns a Navigation-object. Only the title and the image will be used.
+     *
+     * @return null|Navigation with title and image
+     */
+    public function getFileSelectNavigation();
+
+    /**
+     * Returns an URL to a page, where the filesystem can be configured.
+     *
+     * @return mixed
+     */
+    public function filesystemConfigurationURL();
+
+    /**
+     * Determines if this filesystem plugin should be a source for copying or a search.
+     * This may be dependend on the current user and his/her configurations.
+     *
+     * @return boolean
+     */
+    public function isSource();
+
+    /**
+     * Determines if this filesystem-plugin should show up as a personal file-area and be a destination
+     * for copied files.
+     * This may be dependend on the current user and his/her configurations.
+     *
+     * @return boolean
+     */
+    public function isPersonalFileArea();
+
+    /**
+     * This method is used to get a folder-object for this plugin.
+     * Not recommended but still possible is to return a Flexi\Template for the folder, if you want to
+     * take care of the frontend of displaying the folder as well.
+     *
+     * @param null $folder_id : folder_id of folder to get or null if you want the top-folder
+     *
+     * @return FolderType|Flexi\Template
+     */
+    public function getFolder($folder_id = null);
+
+    /**
+     * @param $file_id : The id for the file in the given filesystem of the plugin.
+     * @return array : the already prepared File just like a file-upload-array
+     */
+    public function getPreparedFile($file_id, $with_blob = false);
+
+    /**
+     * Defines if the filesystem-plugin has a search-function.
+     *
+     * @return mixed
+     */
+    public function hasSearch();
+
+    /**
+     * Returns an array for each special search parameter. Each parameter is itself represented by as associative array
+     * like
+     *     array(
+     *         'name' => "name of this parameter in the form",
+     *         'type' => "one of 'text', 'checkbox', 'select'",
+     *         'options' => array() //only neccesary if type is 'select' - a key-value array with the key key as the value of the select and the value as the label of the option
+     *         'placeholder' => "only possible for type 'text' but not mandatory"
+     *     )
+     * This method can also return an empty array or null if no search parameters are needed or no search is provided at all.
+     *
+     * @return null|array(array(), ...)
+     */
+    public function getSearchParameters();
+
+    /**
+     * Returns a virtual folder that 'contains' all the files as a search-result. Only return null
+     * if search is not implemented.
+     *
+     * @param string $text a string
+     * @param array $parameters : an associative array of additional search parameters as defined in getSearchParameters()
+     * @return FolderType|null
+     */
+    public function search($text, $parameters = []);
+}
diff --git a/lib/plugins/core/ForumModule.class.php b/lib/plugins/core/ForumModule.class.php
deleted file mode 100644
index 33784db..0000000
--- a/lib/plugins/core/ForumModule.class.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * ForumModule.class.php - Interface for all intersections between the Stud.IP 
- *                         Core and something that behaves like a forum
- *
- * Implement all interface methods and you can integrate your plugin like
- * a real core-module into Stud.IP
- *
- * 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.
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @license     http://www.gnu.org/licenses/gpl-3.0.html GPL version 3
- * @category    Stud.IP
- */
-
-interface ForumModule extends StandardPlugin
-{
-    /**
-     * Issues can be connected with an entry in a forum. This method
-     * has to return an url to the connected topic for the passed issue_id.
-     * If no topic is connected, it has to return "false"
-     * 
-     * @param string $issue_id 
-     * @return mixed URL or false
-     */
-    function getLinkToThread($issue_id);
-    
-    /**
-     * This method is called in case of an creation OR an update of an issue.
-     * Normally one would update the title and the content of the linked topic
-     * when called
-     * 
-     * @param string $issue_id
-     * @param string $title     the title of the issue
-     * @param string $content   the description of the issue
-     */
-    function setThreadForIssue($issue_id, $title, $content);
-    
-    /**
-     * Return the number of postings the connected topic contains for
-     * the issue with the passed id
-     * 
-     * @param type $issue_id
-     * 
-     * @return int
-     */
-    function getNumberOfPostingsForIssue($issue_id);
-    
-    /**
-     * Return the number of postings for the passed user
-     * 
-     * @param type $user_id
-     * 
-     * @return int
-     */    
-    function getNumberOfPostingsForUser($user_id);
-    
-    /**
-     * Return the number of postings for the passed seminar
-     * 
-     * @param type $seminar_id
-     * 
-     * @return int
-     */        
-    function getNumberOfPostingsForSeminar($seminar_id);
-    
-    /**
-     * Return the number of all postings served by your module. The
-     * results are used for statistics.
-     * 
-     * @return int
-     */        
-    function getNumberOfPostings();
-
-    /**
-     * This function is called whenever Stud.IP needs to directly operate
-     * on your entries-table. Your entries-table MUST have at least fields
-     * for a date (a change-date is preferred, but make-date will suffice),
-     * posting-content, seminar_id and user_id.
-     * 
-     * The returning array must have the following structure:
-     * Array (
-     *     'table'      => 'your_entry_table,
-     *     'content'    => 'your_content_field',
-     *     'chdate'     => 'your_date_field',
-     *     'seminar_id' => 'your_seminar_id_field',
-     *     'user_id'    => 'your_user_id_field'
-     * )
-     * 
-     * @return array
-     */
-    function getEntryTableInfo();
-    
-    /**
-     * The caller expects an array of the ten seminars with the most postings
-     * in your module.
-     * 
-     * Return an array of the following structure:
-     * Array (
-     *     Array (
-     *         'seminar_id' =>
-     *         'display'    =>
-     *         'count'      =>
-     *     )
-     * )
-     * 
-     * @return array
-     */
-    function getTopTenSeminars();
-    
-    /**
-     * Is called when the data of a user is moved to another user.
-     * Update all user_ids with the passed new one.
-     * 
-     * @param string $user_from  the user_id of the user who has the data
-     * @param string $user_to    the user_id of the user who shall receive the data
-     */
-    function migrateUser($user_from, $user_to);
-    
-    /**
-     * Clean up everything for the passed seminar, because the seminar
-     * is beeing deleted.
-     * 
-     * @param string $seminar_id
-     */
-    function deleteContents($seminar_id);
-    
-    /**
-     * Return a complete HTML-Dump of all entries in the forum-module. This is 
-     * used for archiving purposes, so make it pretty!
-     * 
-     * @param string $seminar_id
-     * 
-     * @return string  a single-page HTML-view of all contents in one string
-     */
-    function getDump($seminar_id);
-}
\ No newline at end of file
diff --git a/lib/plugins/core/ForumModule.php b/lib/plugins/core/ForumModule.php
new file mode 100644
index 0000000..33784db
--- /dev/null
+++ b/lib/plugins/core/ForumModule.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * ForumModule.class.php - Interface for all intersections between the Stud.IP 
+ *                         Core and something that behaves like a forum
+ *
+ * Implement all interface methods and you can integrate your plugin like
+ * a real core-module into Stud.IP
+ *
+ * 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.
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @license     http://www.gnu.org/licenses/gpl-3.0.html GPL version 3
+ * @category    Stud.IP
+ */
+
+interface ForumModule extends StandardPlugin
+{
+    /**
+     * Issues can be connected with an entry in a forum. This method
+     * has to return an url to the connected topic for the passed issue_id.
+     * If no topic is connected, it has to return "false"
+     * 
+     * @param string $issue_id 
+     * @return mixed URL or false
+     */
+    function getLinkToThread($issue_id);
+    
+    /**
+     * This method is called in case of an creation OR an update of an issue.
+     * Normally one would update the title and the content of the linked topic
+     * when called
+     * 
+     * @param string $issue_id
+     * @param string $title     the title of the issue
+     * @param string $content   the description of the issue
+     */
+    function setThreadForIssue($issue_id, $title, $content);
+    
+    /**
+     * Return the number of postings the connected topic contains for
+     * the issue with the passed id
+     * 
+     * @param type $issue_id
+     * 
+     * @return int
+     */
+    function getNumberOfPostingsForIssue($issue_id);
+    
+    /**
+     * Return the number of postings for the passed user
+     * 
+     * @param type $user_id
+     * 
+     * @return int
+     */    
+    function getNumberOfPostingsForUser($user_id);
+    
+    /**
+     * Return the number of postings for the passed seminar
+     * 
+     * @param type $seminar_id
+     * 
+     * @return int
+     */        
+    function getNumberOfPostingsForSeminar($seminar_id);
+    
+    /**
+     * Return the number of all postings served by your module. The
+     * results are used for statistics.
+     * 
+     * @return int
+     */        
+    function getNumberOfPostings();
+
+    /**
+     * This function is called whenever Stud.IP needs to directly operate
+     * on your entries-table. Your entries-table MUST have at least fields
+     * for a date (a change-date is preferred, but make-date will suffice),
+     * posting-content, seminar_id and user_id.
+     * 
+     * The returning array must have the following structure:
+     * Array (
+     *     'table'      => 'your_entry_table,
+     *     'content'    => 'your_content_field',
+     *     'chdate'     => 'your_date_field',
+     *     'seminar_id' => 'your_seminar_id_field',
+     *     'user_id'    => 'your_user_id_field'
+     * )
+     * 
+     * @return array
+     */
+    function getEntryTableInfo();
+    
+    /**
+     * The caller expects an array of the ten seminars with the most postings
+     * in your module.
+     * 
+     * Return an array of the following structure:
+     * Array (
+     *     Array (
+     *         'seminar_id' =>
+     *         'display'    =>
+     *         'count'      =>
+     *     )
+     * )
+     * 
+     * @return array
+     */
+    function getTopTenSeminars();
+    
+    /**
+     * Is called when the data of a user is moved to another user.
+     * Update all user_ids with the passed new one.
+     * 
+     * @param string $user_from  the user_id of the user who has the data
+     * @param string $user_to    the user_id of the user who shall receive the data
+     */
+    function migrateUser($user_from, $user_to);
+    
+    /**
+     * Clean up everything for the passed seminar, because the seminar
+     * is beeing deleted.
+     * 
+     * @param string $seminar_id
+     */
+    function deleteContents($seminar_id);
+    
+    /**
+     * Return a complete HTML-Dump of all entries in the forum-module. This is 
+     * used for archiving purposes, so make it pretty!
+     * 
+     * @param string $seminar_id
+     * 
+     * @return string  a single-page HTML-view of all contents in one string
+     */
+    function getDump($seminar_id);
+}
\ No newline at end of file
diff --git a/lib/plugins/core/HomepagePlugin.class.php b/lib/plugins/core/HomepagePlugin.class.php
deleted file mode 100644
index 37efb54..0000000
--- a/lib/plugins/core/HomepagePlugin.class.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-# Lifter010: TODO
-/*
- * HomepagePlugin.class.php - home page plugin interface
- *
- * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- * Copyright (c) 2009 - Elmar Ludwig
- *
- * 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.
- */
-
-interface HomepagePlugin
-{
-    /**
-     * Return a template (an instance of the Flexi\Template class)
-     * to be rendered on the given user's home page. Return NULL to
-     * render nothing for this plugin.
-     *
-     * The template will automatically get a standard layout, which
-     * can be configured via attributes set on the template:
-     *
-     *  title        title to display, defaults to plugin name
-     *  icon_url     icon for this plugin (if any)
-     *  admin_url    admin link for this plugin (if any)
-     *  admin_title  title for admin link (default: Administration)
-     *
-     * @return Flexi\Template|null template object to render or NULL
-     */
-    function getHomepageTemplate($user_id);
-}
diff --git a/lib/plugins/core/HomepagePlugin.php b/lib/plugins/core/HomepagePlugin.php
new file mode 100644
index 0000000..37efb54
--- /dev/null
+++ b/lib/plugins/core/HomepagePlugin.php
@@ -0,0 +1,33 @@
+<?php
+# Lifter010: TODO
+/*
+ * HomepagePlugin.class.php - home page plugin interface
+ *
+ * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ * Copyright (c) 2009 - Elmar Ludwig
+ *
+ * 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.
+ */
+
+interface HomepagePlugin
+{
+    /**
+     * Return a template (an instance of the Flexi\Template class)
+     * to be rendered on the given user's home page. Return NULL to
+     * render nothing for this plugin.
+     *
+     * The template will automatically get a standard layout, which
+     * can be configured via attributes set on the template:
+     *
+     *  title        title to display, defaults to plugin name
+     *  icon_url     icon for this plugin (if any)
+     *  admin_url    admin link for this plugin (if any)
+     *  admin_title  title for admin link (default: Administration)
+     *
+     * @return Flexi\Template|null template object to render or NULL
+     */
+    function getHomepageTemplate($user_id);
+}
diff --git a/lib/plugins/core/LibraryPlugin.class.php b/lib/plugins/core/LibraryPlugin.class.php
deleted file mode 100644
index a7fb873..0000000
--- a/lib/plugins/core/LibraryPlugin.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-
-/*
- * LibraryPlugin.class.php - A plugin class for library plugins.
- *
- * Copyright (c) 2020  Moritz Strohm
- *
- * 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.
- */
-
-
-interface LibraryPlugin
-{
-    /**
-     * Generates the URL that leads to the plugin action to create a request.
-     * The URL may vary depending on the ID of the library file that shall be
-     * requested. Therefore, the library file ID is passed to this method.
-     *
-     * @param $library_file_id The library file ID to which a request URL shall
-     *     be generated.
-     *
-     * @returns string The URL for the request action of the plugin.
-     */
-    public function getRequestURL(string $library_file_id) : string;
-
-
-    /**
-     * Generates the title for the plugin action to create a request.
-     * That title may vary depending on the library file that shall be requested.
-     * Therefore, the file is passed to this method.
-     *
-     * @param LibraryFile $file The file to which the request URL title shall be
-     *     generated.
-     *
-     * @returns string The title for the request URL action of the plugin.
-     */
-    public function getRequestTitle() : string;
-
-
-    /**
-     * Generates the icon for the plugin action to create a request.
-     * That icon may vary depending on the library file that shall be requested.
-     * Therefore, the file is passed to this method.
-     *
-     * @param LibraryFile $file The file to which the request URL icon shall be
-     *     generated.
-     *
-     * @returns Icon The icon for the request URL action of the plugin.
-     */
-    public function getRequestIcon() : Icon;
-}
diff --git a/lib/plugins/core/LibraryPlugin.php b/lib/plugins/core/LibraryPlugin.php
new file mode 100644
index 0000000..a7fb873
--- /dev/null
+++ b/lib/plugins/core/LibraryPlugin.php
@@ -0,0 +1,55 @@
+<?php
+
+
+/*
+ * LibraryPlugin.class.php - A plugin class for library plugins.
+ *
+ * Copyright (c) 2020  Moritz Strohm
+ *
+ * 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.
+ */
+
+
+interface LibraryPlugin
+{
+    /**
+     * Generates the URL that leads to the plugin action to create a request.
+     * The URL may vary depending on the ID of the library file that shall be
+     * requested. Therefore, the library file ID is passed to this method.
+     *
+     * @param $library_file_id The library file ID to which a request URL shall
+     *     be generated.
+     *
+     * @returns string The URL for the request action of the plugin.
+     */
+    public function getRequestURL(string $library_file_id) : string;
+
+
+    /**
+     * Generates the title for the plugin action to create a request.
+     * That title may vary depending on the library file that shall be requested.
+     * Therefore, the file is passed to this method.
+     *
+     * @param LibraryFile $file The file to which the request URL title shall be
+     *     generated.
+     *
+     * @returns string The title for the request URL action of the plugin.
+     */
+    public function getRequestTitle() : string;
+
+
+    /**
+     * Generates the icon for the plugin action to create a request.
+     * That icon may vary depending on the library file that shall be requested.
+     * Therefore, the file is passed to this method.
+     *
+     * @param LibraryFile $file The file to which the request URL icon shall be
+     *     generated.
+     *
+     * @returns Icon The icon for the request URL action of the plugin.
+     */
+    public function getRequestIcon() : Icon;
+}
diff --git a/lib/plugins/core/MetricsPlugin.class.php b/lib/plugins/core/MetricsPlugin.class.php
deleted file mode 100644
index 95edaf1..0000000
--- a/lib/plugins/core/MetricsPlugin.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- * MetricsPlugins take countings and measurements and transfer them to
- * a specific backend like statsd.
- *
- * 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.
- *
- * @author      <mlunzena@uos.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-interface MetricsPlugin
-{
-    public function count($stat, $value, $sampleRate = null);
-
-    public function timing($stat, $time, $sampleRate = null);
-
-    public function gauge($stat, $value, $sampleRate = null);
-}
diff --git a/lib/plugins/core/MetricsPlugin.php b/lib/plugins/core/MetricsPlugin.php
new file mode 100644
index 0000000..95edaf1
--- /dev/null
+++ b/lib/plugins/core/MetricsPlugin.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ * MetricsPlugins take countings and measurements and transfer them to
+ * a specific backend like statsd.
+ *
+ * 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.
+ *
+ * @author      <mlunzena@uos.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+interface MetricsPlugin
+{
+    public function count($stat, $value, $sampleRate = null);
+
+    public function timing($stat, $time, $sampleRate = null);
+
+    public function gauge($stat, $value, $sampleRate = null);
+}
diff --git a/lib/plugins/core/PortalPlugin.class.php b/lib/plugins/core/PortalPlugin.class.php
deleted file mode 100644
index cb5aca4..0000000
--- a/lib/plugins/core/PortalPlugin.class.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-# Lifter010: TODO
-/*
- * PortalPlugin.class.php - start / portal page plugin interface
- *
- * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- * Copyright (c) 2009 - Elmar Ludwig
- *
- * 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.
- */
-
-interface PortalPlugin
-{
-    /**
-     * Return a template (an instance of the Flexi\Template class)
-     * to be rendered on the start or portal page. Return NULL to
-     * render nothing for this plugin.
-     *
-     * The template will automatically get a standard layout, which
-     * can be configured via attributes set on the template:
-     *
-     *  title        title to display, defaults to plugin name
-     *  icon_url     icon for this plugin (if any)
-     *  admin_url    admin link for this plugin (if any)
-     *  admin_title  title for admin link (default: Administration)
-     *
-     * @return ?Flexi\Template template object to render or NULL
-     */
-    function getPortalTemplate();
-}
diff --git a/lib/plugins/core/PortalPlugin.php b/lib/plugins/core/PortalPlugin.php
new file mode 100644
index 0000000..cb5aca4
--- /dev/null
+++ b/lib/plugins/core/PortalPlugin.php
@@ -0,0 +1,33 @@
+<?php
+# Lifter010: TODO
+/*
+ * PortalPlugin.class.php - start / portal page plugin interface
+ *
+ * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ * Copyright (c) 2009 - Elmar Ludwig
+ *
+ * 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.
+ */
+
+interface PortalPlugin
+{
+    /**
+     * Return a template (an instance of the Flexi\Template class)
+     * to be rendered on the start or portal page. Return NULL to
+     * render nothing for this plugin.
+     *
+     * The template will automatically get a standard layout, which
+     * can be configured via attributes set on the template:
+     *
+     *  title        title to display, defaults to plugin name
+     *  icon_url     icon for this plugin (if any)
+     *  admin_url    admin link for this plugin (if any)
+     *  admin_title  title for admin link (default: Administration)
+     *
+     * @return ?Flexi\Template template object to render or NULL
+     */
+    function getPortalTemplate();
+}
diff --git a/lib/plugins/core/PrivacyPlugin.class.php b/lib/plugins/core/PrivacyPlugin.class.php
deleted file mode 100644
index 73a971d..0000000
--- a/lib/plugins/core/PrivacyPlugin.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * PrivacyPlugin are able to handle user data according the privacy policy.
- *
- * 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.
- *
- * @author      Timo Hartge <hartge@data-quest.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-interface PrivacyPlugin
-{
-    /**
-     * Export available data of a given user into a storage object
-     * (an instance of the StoredUserData class) for that user.
-     *
-     * @param StoredUserData $storage object to store data into
-     */
-    public function exportUserData(StoredUserData $storage);
-}
diff --git a/lib/plugins/core/PrivacyPlugin.php b/lib/plugins/core/PrivacyPlugin.php
new file mode 100644
index 0000000..73a971d
--- /dev/null
+++ b/lib/plugins/core/PrivacyPlugin.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PrivacyPlugin are able to handle user data according the privacy policy.
+ *
+ * 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.
+ *
+ * @author      Timo Hartge <hartge@data-quest.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+interface PrivacyPlugin
+{
+    /**
+     * Export available data of a given user into a storage object
+     * (an instance of the StoredUserData class) for that user.
+     *
+     * @param StoredUserData $storage object to store data into
+     */
+    public function exportUserData(StoredUserData $storage);
+}
diff --git a/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php b/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
deleted file mode 100644
index cadaf52..0000000
--- a/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Interface QuestionnaireAssignmentPlugin
- * Implement this interface if you want to relate Stud.IP-questionnaires to your plugin-contents.
- * By storing an assignment you should set the range_type to something unique that is
- * related to your plugin like "mytaskplugin". In all methods you should first check if the
- * assignment is related to your plugin, because other QuestionnaireAssignmentPlugins might
- * be installed as well.
- */
-interface QuestionnaireAssignmentPlugin
-{
-    /**
-     * Returns if the questionnaire is viewable dependend on the assignment. Check for the range_type
-     * and range_id to see if the the assignment has to do with your plugin (and not with
-     * somebody else's plugin) and if type and id fit.
-     * @param QuestionnaireAssignment $questionnaire
-     * @return boolean
-     */
-    public function isQuestionnaireViewable(QuestionnaireAssignment $questionnaire);
-
-    /**
-     * Returns if the questionnaire is editable dependend on the assignment. Check for the range_type
-     * and range_id to see if the the assignment has to do with your plugin (and not with
-     * somebody else's plugin) and if type and id fit.
-     * @param QuestionnaireAssignment $questionnaire
-     * @return boolean
-     */
-    public function isQuestionnaireEditable(QuestionnaireAssignment $questionnaire);
-
-    /**
-     * The display name of the assignment.
-     * @param QuestionnaireAssignment $questionnaire
-     * @return string
-     */
-    public function getQuestionnaireAssignmentName(QuestionnaireAssignment $questionnaire);
-
-    /**
-     * This template will get displayed when someone at tools -> questionnaires
-     * wants to edit the contexts of the questionnaire. Maybe you don't want to provide a
-     * template here, so return null or just a readonly html-snippet.
-     *
-     * @param Questionnaire $questionnaire
-     *
-     * @return null|Flexi\Template
-     */
-    public function getQuestionnaireAssignmentEditTemplate(Questionnaire $questionnaire);
-
-    /**
-     * When the context of the questionnaire is stored at tools -> questionnaires (where
-     * the template from getQuestionnaireAssignmentEditTemplate was displayed) you should
-     * use this method to store your assignments as well.
-     * @param Questionnaire $questionnaire
-     * @return null
-     */
-    public function storeQuestionnaireAssignments(Questionnaire $questionnaire);
-}
diff --git a/lib/plugins/core/QuestionnaireAssignmentPlugin.php b/lib/plugins/core/QuestionnaireAssignmentPlugin.php
new file mode 100644
index 0000000..cadaf52
--- /dev/null
+++ b/lib/plugins/core/QuestionnaireAssignmentPlugin.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Interface QuestionnaireAssignmentPlugin
+ * Implement this interface if you want to relate Stud.IP-questionnaires to your plugin-contents.
+ * By storing an assignment you should set the range_type to something unique that is
+ * related to your plugin like "mytaskplugin". In all methods you should first check if the
+ * assignment is related to your plugin, because other QuestionnaireAssignmentPlugins might
+ * be installed as well.
+ */
+interface QuestionnaireAssignmentPlugin
+{
+    /**
+     * Returns if the questionnaire is viewable dependend on the assignment. Check for the range_type
+     * and range_id to see if the the assignment has to do with your plugin (and not with
+     * somebody else's plugin) and if type and id fit.
+     * @param QuestionnaireAssignment $questionnaire
+     * @return boolean
+     */
+    public function isQuestionnaireViewable(QuestionnaireAssignment $questionnaire);
+
+    /**
+     * Returns if the questionnaire is editable dependend on the assignment. Check for the range_type
+     * and range_id to see if the the assignment has to do with your plugin (and not with
+     * somebody else's plugin) and if type and id fit.
+     * @param QuestionnaireAssignment $questionnaire
+     * @return boolean
+     */
+    public function isQuestionnaireEditable(QuestionnaireAssignment $questionnaire);
+
+    /**
+     * The display name of the assignment.
+     * @param QuestionnaireAssignment $questionnaire
+     * @return string
+     */
+    public function getQuestionnaireAssignmentName(QuestionnaireAssignment $questionnaire);
+
+    /**
+     * This template will get displayed when someone at tools -> questionnaires
+     * wants to edit the contexts of the questionnaire. Maybe you don't want to provide a
+     * template here, so return null or just a readonly html-snippet.
+     *
+     * @param Questionnaire $questionnaire
+     *
+     * @return null|Flexi\Template
+     */
+    public function getQuestionnaireAssignmentEditTemplate(Questionnaire $questionnaire);
+
+    /**
+     * When the context of the questionnaire is stored at tools -> questionnaires (where
+     * the template from getQuestionnaireAssignmentEditTemplate was displayed) you should
+     * use this method to store your assignments as well.
+     * @param Questionnaire $questionnaire
+     * @return null
+     */
+    public function storeQuestionnaireAssignments(Questionnaire $questionnaire);
+}
diff --git a/lib/plugins/core/RESTAPIPlugin.class.php b/lib/plugins/core/RESTAPIPlugin.class.php
deleted file mode 100644
index f69344c..0000000
--- a/lib/plugins/core/RESTAPIPlugin.class.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * REST-API Plugins add maps to the REST-API router.
- *
- * Copyright (c) 2014 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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.
- */
-
-/**
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-interface RESTAPIPlugin
-{
-    /**
-     * Returns one or more instances of RESTAPI\RouteMap to register
-     * to the Router.
-     *
-     * @return RouteMap|Array   either a single instance of class
-     *                          RouteMap or an array of them
-     */
-    public function getRouteMaps();
-}
diff --git a/lib/plugins/core/RESTAPIPlugin.php b/lib/plugins/core/RESTAPIPlugin.php
new file mode 100644
index 0000000..f69344c
--- /dev/null
+++ b/lib/plugins/core/RESTAPIPlugin.php
@@ -0,0 +1,26 @@
+<?php
+/*
+ * REST-API Plugins add maps to the REST-API router.
+ *
+ * Copyright (c) 2014 - Marcus Lunzenauer <mlunzena@uos.de>
+ *
+ * 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.
+ */
+
+/**
+ * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
+ */
+interface RESTAPIPlugin
+{
+    /**
+     * Returns one or more instances of RESTAPI\RouteMap to register
+     * to the Router.
+     *
+     * @return RouteMap|Array   either a single instance of class
+     *                          RouteMap or an array of them
+     */
+    public function getRouteMaps();
+}
diff --git a/lib/plugins/core/Role.class.php b/lib/plugins/core/Role.class.php
deleted file mode 100644
index 3ca8a11..0000000
--- a/lib/plugins/core/Role.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Role.class.php
- *
- * @author      Dennis Reil <dennis.reil@offis.de>
- * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
- * @package     pluginengine
- * @subpackage  core
- * @copyright   2009 Stud.IP
- * @license     http://www.gnu.org/licenses/gpl.html GPL Licence 3
- */
-class Role
-{
-    const UNKNOWN_ROLE_ID = null;
-
-    public $roleid;
-    public $rolename;
-    public $systemtype;
-
-    /**
-     * Constructor
-     */
-    public function __construct($id = self::UNKNOWN_ROLE_ID, $name = '', $system = false)
-    {
-        $this->setRoleid($id);
-        $this->setRolename($name);
-        $this->setSystemtype($system);
-    }
-
-    /**
-     * Returns the role's id.
-     *
-     * @return int
-     */
-    public function getRoleid()
-    {
-        return $this->roleid;
-    }
-
-    /**
-     * Set the role's id.
-     *
-     * @param int $newid
-     */
-    public function setRoleid($newid)
-    {
-        $this->roleid = $newid;
-    }
-
-    /**
-     * Returns the role's name.
-     *
-     * @return string
-     */
-    public function getRolename()
-    {
-        return $this->rolename;
-    }
-
-    /**
-     * Set the role's name.
-     *
-     * @param string $newrole
-     */
-    public function setRolename($newrole)
-    {
-        $this->rolename = $newrole;
-    }
-
-    /**
-     * Returns whether the role is a system role.
-     *
-     * @return boolean
-     */
-    public function getSystemtype()
-    {
-        return $this->systemtype;
-    }
-
-    /**
-     * Sets whether the role is a system role.
-     *
-     * @param boolean $newtype
-     */
-    public function setSystemtype($newtype)
-    {
-        $this->systemtype = (bool) $newtype;
-    }
-}
diff --git a/lib/plugins/core/Role.php b/lib/plugins/core/Role.php
new file mode 100644
index 0000000..3ca8a11
--- /dev/null
+++ b/lib/plugins/core/Role.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Role.class.php
+ *
+ * @author      Dennis Reil <dennis.reil@offis.de>
+ * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
+ * @package     pluginengine
+ * @subpackage  core
+ * @copyright   2009 Stud.IP
+ * @license     http://www.gnu.org/licenses/gpl.html GPL Licence 3
+ */
+class Role
+{
+    const UNKNOWN_ROLE_ID = null;
+
+    public $roleid;
+    public $rolename;
+    public $systemtype;
+
+    /**
+     * Constructor
+     */
+    public function __construct($id = self::UNKNOWN_ROLE_ID, $name = '', $system = false)
+    {
+        $this->setRoleid($id);
+        $this->setRolename($name);
+        $this->setSystemtype($system);
+    }
+
+    /**
+     * Returns the role's id.
+     *
+     * @return int
+     */
+    public function getRoleid()
+    {
+        return $this->roleid;
+    }
+
+    /**
+     * Set the role's id.
+     *
+     * @param int $newid
+     */
+    public function setRoleid($newid)
+    {
+        $this->roleid = $newid;
+    }
+
+    /**
+     * Returns the role's name.
+     *
+     * @return string
+     */
+    public function getRolename()
+    {
+        return $this->rolename;
+    }
+
+    /**
+     * Set the role's name.
+     *
+     * @param string $newrole
+     */
+    public function setRolename($newrole)
+    {
+        $this->rolename = $newrole;
+    }
+
+    /**
+     * Returns whether the role is a system role.
+     *
+     * @return boolean
+     */
+    public function getSystemtype()
+    {
+        return $this->systemtype;
+    }
+
+    /**
+     * Sets whether the role is a system role.
+     *
+     * @param boolean $newtype
+     */
+    public function setSystemtype($newtype)
+    {
+        $this->systemtype = (bool) $newtype;
+    }
+}
diff --git a/lib/plugins/core/ScorePlugin.class.php b/lib/plugins/core/ScorePlugin.class.php
deleted file mode 100644
index 064ddc3..0000000
--- a/lib/plugins/core/ScorePlugin.class.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
- * 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.
- */
-
-interface ScorePlugin
-{
-    /**
-     * Returns null or an array of associated arrays - each one to
-     * indicate a db-table in which the plugin stores user activities.
-     *
-     * For a bullitin-board-plugin this array could look like this:
-     *
-     * return array(
-     *     array(
-     *         'table' => "bullitin_board_entries",
-     *         'user_id_column' => "user_id",
-     *         'date_column' => "mkdate",
-     *         'where' => "public = '1'" //only public entries should be counted
-     *     )
-     * );
-     *
-     * @return null|array   of associated arrays
-     */
-    function getPluginActivityTables();
-}
diff --git a/lib/plugins/core/ScorePlugin.php b/lib/plugins/core/ScorePlugin.php
new file mode 100644
index 0000000..064ddc3
--- /dev/null
+++ b/lib/plugins/core/ScorePlugin.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * 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.
+ */
+
+interface ScorePlugin
+{
+    /**
+     * Returns null or an array of associated arrays - each one to
+     * indicate a db-table in which the plugin stores user activities.
+     *
+     * For a bullitin-board-plugin this array could look like this:
+     *
+     * return array(
+     *     array(
+     *         'table' => "bullitin_board_entries",
+     *         'user_id_column' => "user_id",
+     *         'date_column' => "mkdate",
+     *         'where' => "public = '1'" //only public entries should be counted
+     *     )
+     * );
+     *
+     * @return null|array   of associated arrays
+     */
+    function getPluginActivityTables();
+}
diff --git a/lib/plugins/core/StandardPlugin.class.php b/lib/plugins/core/StandardPlugin.class.php
deleted file mode 100644
index 960ffd0..0000000
--- a/lib/plugins/core/StandardPlugin.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-# Lifter010: TODO
-/*
- * StandardPlugin.class.php - course or institute plugin interface
- *
- * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- * Copyright (c) 2009 - Elmar Ludwig
- *
- * 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.
- */
-
-interface StandardPlugin extends StudipModule
-{
-}
diff --git a/lib/plugins/core/StandardPlugin.php b/lib/plugins/core/StandardPlugin.php
new file mode 100644
index 0000000..960ffd0
--- /dev/null
+++ b/lib/plugins/core/StandardPlugin.php
@@ -0,0 +1,17 @@
+<?php
+# Lifter010: TODO
+/*
+ * StandardPlugin.class.php - course or institute plugin interface
+ *
+ * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ * Copyright (c) 2009 - Elmar Ludwig
+ *
+ * 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.
+ */
+
+interface StandardPlugin extends StudipModule
+{
+}
diff --git a/lib/plugins/core/StudIPPlugin.class.php b/lib/plugins/core/StudIPPlugin.class.php
deleted file mode 100644
index fe74259..0000000
--- a/lib/plugins/core/StudIPPlugin.class.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
- * StudIPPlugin.class.php - generic plugin base class
- *
- * @author    Elmar Ludwig <ludwig@uos.de>
- * @copyright 2009 Authors
- * @license   GPL2 or any later version
- */
-abstract class StudIPPlugin
-{
-    use PluginAssetsTrait;
-    use TranslatablePluginTrait;
-
-    /**
-     * plugin meta data
-     */
-    protected $plugin_info;
-
-    /**
-     * Plugin manifest
-     */
-    protected $manifest = null;
-
-    /**
-     * plugin constructor
-     */
-    public function __construct()
-    {
-        $plugin_manager = PluginManager::getInstance();
-        $this->plugin_info = $plugin_manager->getPluginInfo(static::class);
-    }
-
-    /**
-     * Return the ID of this plugin.
-     */
-    public function getPluginId()
-    {
-        return $this->plugin_info['id'];
-    }
-
-    public function isEnabled()
-    {
-        return $this->plugin_info['enabled'];
-    }
-
-    /**
-     * Return the name of this plugin.
-     */
-    public function getPluginName()
-    {
-        return $this->plugin_info['name'];
-    }
-
-    /**
-     * Return the filesystem path to this plugin.
-     */
-    public function getPluginPath()
-    {
-        return "plugins_packages/{$this->plugin_info['path']}";
-    }
-
-    /**
-     * Return the URL of this plugin. Can be used to refer to resources
-     * (images, style sheets, etc.) inside the installed plugin package.
-     */
-    public function getPluginURL()
-    {
-        return $GLOBALS['ABSOLUTE_URI_STUDIP'] . $this->getPluginPath();
-    }
-
-    /**
-     * Return metadata stored in the manifest of this plugin.
-     */
-    public function getMetadata()
-    {
-        if ($this->manifest === null) {
-            $plugin_manager = PluginManager::getInstance();
-            $this->manifest = $plugin_manager->getPluginManifest($this->getPluginPath());
-        }
-        return $this->manifest;
-    }
-
-    /**
-     * Returns the description of the plugin either from plugins-table or from the manifest's descriptionlong
-     * or description attribute.
-     * @return string|null
-     */
-    public function getPluginDescription()
-    {
-        $metadata = $this->getMetadata();
-        $language = getUserLanguage(User::findCurrent()->id);
-        if (!empty($metadata['descriptionlong_' . $language])) {
-            return $metadata['descriptionlong_' . $language];
-        }
-        if (!empty($metadata['description_' . $language])) {
-            return $metadata['description_' . $language];
-        }
-        $description = $metadata['descriptionlong'] ?? $metadata['description'] ?? '';
-
-        if ($this->plugin_info['description_mode'] === 'override_description') {
-            return $this->plugin_info['description'];
-        } else {
-            return $description . $this->plugin_info['description'];
-        }
-    }
-
-    public function getDescriptionMode()
-    {
-        return $this->plugin_info['description_mode'];
-    }
-
-    public function isHighlighted()
-    {
-        return $this->plugin_info['highlight_until'] > time();
-    }
-
-    public function getHighlightText()
-    {
-        return $this->plugin_info['highlight_text'];
-    }
-
-    /**
-     * Returns the version of this plugin as defined in manifest.
-     * @return string
-     */
-    public function getPluginVersion()
-    {
-        return $this->getMetadata()['version'];
-    }
-
-    /**
-     * Checks if the plugin is a core-plugin. Returns true if this is the case.
-     *
-     * @return boolean
-     */
-    public function isCorePlugin()
-    {
-       return $this->plugin_info['core'];
-    }
-
-    /**
-     * Get the activation status of this plugin in the given context.
-     * This also checks the plugin default activations.
-     *
-     * @param $context   context range id (optional)
-     * @param $type      type of activation (optional), can be set to 'user'
-     *                   in order to point to a homepage plugin
-     */
-    public function isActivated($context = null, $type = 'sem')
-    {
-        $plugin_id = $this->getPluginId();
-        $plugin_manager = PluginManager::getInstance();
-
-        /*
-         * Context can be a Seminar ID or the current user ID if not set.
-         * Identification is done via the "username" parameter.
-         */
-        if (!isset($context)) {
-            if ($type === 'user') {
-                $context = get_userid(Request::username('username', $GLOBALS['user']->username));
-            } else {
-                $context = Context::getId();
-            }
-        }
-
-        if ($type === 'user') {
-            $activated = $plugin_manager->isPluginActivatedForUser($plugin_id, $context);
-        } else {
-            $activated = $plugin_manager->isPluginActivated($plugin_id, $context);
-        }
-
-        return $activated;
-    }
-
-    /**
-     * Returns whether the plugin may be activated in a certain context.
-     *
-     * @param Range $context
-     * @return bool
-     */
-    public function isActivatableForContext(Range $context)
-    {
-        return true;
-    }
-
-    /**
-     * This method dispatches all actions.
-     *
-     * @param string   part of the dispatch path that was not consumed
-     *
-     * @return void
-     */
-    public function perform($unconsumed_path)
-    {
-        $args = explode('/', $unconsumed_path);
-        $action = $args[0] !== '' ? array_shift($args).'_action' : 'show_action';
-
-        if (!method_exists($this, $action)) {
-            $dispatcher = app(\Trails\Dispatcher::class);
-            $dispatcher->trails_root = $this->getPluginPath();
-            $dispatcher->trails_uri = rtrim(PluginEngine::getLink($this, [], null, true), '/');
-            $dispatcher->default_controller = 'index';
-            $dispatcher->current_plugin = $this;
-            try {
-                $dispatcher->dispatch($unconsumed_path);
-            } catch (Trails\Exceptions\UnknownAction $exception) {
-                if (count($args) > 0) {
-                    throw $exception;
-                } else {
-                    throw new Exception(_('unbekannte Plugin-Aktion: ') . $unconsumed_path);
-                }
-            }
-        } else {
-            call_user_func_array([$this, $action], $args);
-        }
-    }
-
-    /**
-     * Callback function called after enabling a plugin.
-     * The plugin's ID is transmitted for convenience.
-     *
-     * @param $plugin_id string The ID of the plugin just enabled.
-     */
-    public static function onEnable($plugin_id)
-    {
-    }
-
-    /**
-     * Callback function called after disabling a plugin.
-     * The plugin's ID is transmitted for convenience.
-     *
-     * @param $plugin_id string The ID of the plugin just disabled.
-     */
-    public static function onDisable($plugin_id)
-    {
-    }
-
-    /**
-     * Callback function called after enabling a plugin.
-     * The plugin's ID is transmitted for convenience.
-     *
-     * @param $plugin_id string The ID of the plugin just enabled.
-     */
-    public static function onActivation($plugin_id, $range_id)
-    {
-    }
-
-    /**
-     * Callback function called after disabling a plugin.
-     * The plugin's ID is transmitted for convenience.
-     *
-     * @param $plugin_id string The ID of the plugin just disabled.
-     */
-    public static function onDeactivation($plugin_id, $range_id)
-    {
-    }
-}
diff --git a/lib/plugins/core/StudIPPlugin.php b/lib/plugins/core/StudIPPlugin.php
new file mode 100644
index 0000000..fe74259
--- /dev/null
+++ b/lib/plugins/core/StudIPPlugin.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * StudIPPlugin.class.php - generic plugin base class
+ *
+ * @author    Elmar Ludwig <ludwig@uos.de>
+ * @copyright 2009 Authors
+ * @license   GPL2 or any later version
+ */
+abstract class StudIPPlugin
+{
+    use PluginAssetsTrait;
+    use TranslatablePluginTrait;
+
+    /**
+     * plugin meta data
+     */
+    protected $plugin_info;
+
+    /**
+     * Plugin manifest
+     */
+    protected $manifest = null;
+
+    /**
+     * plugin constructor
+     */
+    public function __construct()
+    {
+        $plugin_manager = PluginManager::getInstance();
+        $this->plugin_info = $plugin_manager->getPluginInfo(static::class);
+    }
+
+    /**
+     * Return the ID of this plugin.
+     */
+    public function getPluginId()
+    {
+        return $this->plugin_info['id'];
+    }
+
+    public function isEnabled()
+    {
+        return $this->plugin_info['enabled'];
+    }
+
+    /**
+     * Return the name of this plugin.
+     */
+    public function getPluginName()
+    {
+        return $this->plugin_info['name'];
+    }
+
+    /**
+     * Return the filesystem path to this plugin.
+     */
+    public function getPluginPath()
+    {
+        return "plugins_packages/{$this->plugin_info['path']}";
+    }
+
+    /**
+     * Return the URL of this plugin. Can be used to refer to resources
+     * (images, style sheets, etc.) inside the installed plugin package.
+     */
+    public function getPluginURL()
+    {
+        return $GLOBALS['ABSOLUTE_URI_STUDIP'] . $this->getPluginPath();
+    }
+
+    /**
+     * Return metadata stored in the manifest of this plugin.
+     */
+    public function getMetadata()
+    {
+        if ($this->manifest === null) {
+            $plugin_manager = PluginManager::getInstance();
+            $this->manifest = $plugin_manager->getPluginManifest($this->getPluginPath());
+        }
+        return $this->manifest;
+    }
+
+    /**
+     * Returns the description of the plugin either from plugins-table or from the manifest's descriptionlong
+     * or description attribute.
+     * @return string|null
+     */
+    public function getPluginDescription()
+    {
+        $metadata = $this->getMetadata();
+        $language = getUserLanguage(User::findCurrent()->id);
+        if (!empty($metadata['descriptionlong_' . $language])) {
+            return $metadata['descriptionlong_' . $language];
+        }
+        if (!empty($metadata['description_' . $language])) {
+            return $metadata['description_' . $language];
+        }
+        $description = $metadata['descriptionlong'] ?? $metadata['description'] ?? '';
+
+        if ($this->plugin_info['description_mode'] === 'override_description') {
+            return $this->plugin_info['description'];
+        } else {
+            return $description . $this->plugin_info['description'];
+        }
+    }
+
+    public function getDescriptionMode()
+    {
+        return $this->plugin_info['description_mode'];
+    }
+
+    public function isHighlighted()
+    {
+        return $this->plugin_info['highlight_until'] > time();
+    }
+
+    public function getHighlightText()
+    {
+        return $this->plugin_info['highlight_text'];
+    }
+
+    /**
+     * Returns the version of this plugin as defined in manifest.
+     * @return string
+     */
+    public function getPluginVersion()
+    {
+        return $this->getMetadata()['version'];
+    }
+
+    /**
+     * Checks if the plugin is a core-plugin. Returns true if this is the case.
+     *
+     * @return boolean
+     */
+    public function isCorePlugin()
+    {
+       return $this->plugin_info['core'];
+    }
+
+    /**
+     * Get the activation status of this plugin in the given context.
+     * This also checks the plugin default activations.
+     *
+     * @param $context   context range id (optional)
+     * @param $type      type of activation (optional), can be set to 'user'
+     *                   in order to point to a homepage plugin
+     */
+    public function isActivated($context = null, $type = 'sem')
+    {
+        $plugin_id = $this->getPluginId();
+        $plugin_manager = PluginManager::getInstance();
+
+        /*
+         * Context can be a Seminar ID or the current user ID if not set.
+         * Identification is done via the "username" parameter.
+         */
+        if (!isset($context)) {
+            if ($type === 'user') {
+                $context = get_userid(Request::username('username', $GLOBALS['user']->username));
+            } else {
+                $context = Context::getId();
+            }
+        }
+
+        if ($type === 'user') {
+            $activated = $plugin_manager->isPluginActivatedForUser($plugin_id, $context);
+        } else {
+            $activated = $plugin_manager->isPluginActivated($plugin_id, $context);
+        }
+
+        return $activated;
+    }
+
+    /**
+     * Returns whether the plugin may be activated in a certain context.
+     *
+     * @param Range $context
+     * @return bool
+     */
+    public function isActivatableForContext(Range $context)
+    {
+        return true;
+    }
+
+    /**
+     * This method dispatches all actions.
+     *
+     * @param string   part of the dispatch path that was not consumed
+     *
+     * @return void
+     */
+    public function perform($unconsumed_path)
+    {
+        $args = explode('/', $unconsumed_path);
+        $action = $args[0] !== '' ? array_shift($args).'_action' : 'show_action';
+
+        if (!method_exists($this, $action)) {
+            $dispatcher = app(\Trails\Dispatcher::class);
+            $dispatcher->trails_root = $this->getPluginPath();
+            $dispatcher->trails_uri = rtrim(PluginEngine::getLink($this, [], null, true), '/');
+            $dispatcher->default_controller = 'index';
+            $dispatcher->current_plugin = $this;
+            try {
+                $dispatcher->dispatch($unconsumed_path);
+            } catch (Trails\Exceptions\UnknownAction $exception) {
+                if (count($args) > 0) {
+                    throw $exception;
+                } else {
+                    throw new Exception(_('unbekannte Plugin-Aktion: ') . $unconsumed_path);
+                }
+            }
+        } else {
+            call_user_func_array([$this, $action], $args);
+        }
+    }
+
+    /**
+     * Callback function called after enabling a plugin.
+     * The plugin's ID is transmitted for convenience.
+     *
+     * @param $plugin_id string The ID of the plugin just enabled.
+     */
+    public static function onEnable($plugin_id)
+    {
+    }
+
+    /**
+     * Callback function called after disabling a plugin.
+     * The plugin's ID is transmitted for convenience.
+     *
+     * @param $plugin_id string The ID of the plugin just disabled.
+     */
+    public static function onDisable($plugin_id)
+    {
+    }
+
+    /**
+     * Callback function called after enabling a plugin.
+     * The plugin's ID is transmitted for convenience.
+     *
+     * @param $plugin_id string The ID of the plugin just enabled.
+     */
+    public static function onActivation($plugin_id, $range_id)
+    {
+    }
+
+    /**
+     * Callback function called after disabling a plugin.
+     * The plugin's ID is transmitted for convenience.
+     *
+     * @param $plugin_id string The ID of the plugin just disabled.
+     */
+    public static function onDeactivation($plugin_id, $range_id)
+    {
+    }
+}
diff --git a/lib/plugins/core/SystemPlugin.class.php b/lib/plugins/core/SystemPlugin.class.php
deleted file mode 100644
index c204567..0000000
--- a/lib/plugins/core/SystemPlugin.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-# Lifter010: TODO
-/*
- * SystemPlugin.class.php - generic system plugin interface
- *
- * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
- * Copyright (c) 2009 - Elmar Ludwig
- *
- * 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.
- */
-
-interface SystemPlugin
-{
-}
diff --git a/lib/plugins/core/SystemPlugin.php b/lib/plugins/core/SystemPlugin.php
new file mode 100644
index 0000000..c204567
--- /dev/null
+++ b/lib/plugins/core/SystemPlugin.php
@@ -0,0 +1,17 @@
+<?php
+# Lifter010: TODO
+/*
+ * SystemPlugin.class.php - generic system plugin interface
+ *
+ * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
+ * Copyright (c) 2009 - Elmar Ludwig
+ *
+ * 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.
+ */
+
+interface SystemPlugin
+{
+}
diff --git a/lib/plugins/core/WebServicePlugin.class.php b/lib/plugins/core/WebServicePlugin.class.php
deleted file mode 100644
index ff3e757..0000000
--- a/lib/plugins/core/WebServicePlugin.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*
- * Copyright (c) 2011 <mlunzena@uos.de>
- *
- * 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.
- */
-
-interface WebServicePlugin
-{
-    function getWebServices();
-}
diff --git a/lib/plugins/core/WebServicePlugin.php b/lib/plugins/core/WebServicePlugin.php
new file mode 100644
index 0000000..ff3e757
--- /dev/null
+++ b/lib/plugins/core/WebServicePlugin.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * Copyright (c) 2011 <mlunzena@uos.de>
+ *
+ * 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.
+ */
+
+interface WebServicePlugin
+{
+    function getWebServices();
+}
diff --git a/lib/plugins/db/RolePersistence.class.php b/lib/plugins/db/RolePersistence.class.php
deleted file mode 100644
index df63a77..0000000
--- a/lib/plugins/db/RolePersistence.class.php
+++ /dev/null
@@ -1,721 +0,0 @@
-<?php
-/**
- * RolePersistence.class.php
- *
- * Funktionen für das Rollenmanagement
- *
- * @author      Dennis Reil <dennis.reil@offis.de>
- * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
- * @package     pluginengine
- * @subpackage  db
- * @copyright   2009 Stud.IP
- * @license     http://www.gnu.org/licenses/gpl.html GPL Licence 3
- */
-class RolePersistence
-{
-    const ROLES_CACHE_KEY = 'roles';
-    const USER_ROLES_CACHE_KEY = 'roles/user';
-    const PLUGIN_ROLES_CACHE_KEY = 'roles/plugin';
-
-    protected static $all_roles = null;
-
-    /**
-     * Returns all available roles.
-     *
-     * @param bool $grouped Return the roles grouped by system type or other
-     * @return Role[]|array{system: Role[], other: Role[]}
-     */
-    public static function getAllRoles(bool $grouped = false): array
-    {
-        if (self::$all_roles === null) {
-            // read cache
-            $cache = \Studip\Cache\Factory::getCache();
-
-            // cache miss, retrieve from database
-            self::$all_roles = $cache->read(self::ROLES_CACHE_KEY);
-            if (!self::$all_roles) {
-                $query = "SELECT `roleid`, `rolename`, `system` = 'y' AS `is_system`
-                      FROM `roles`
-                      ORDER BY `rolename`";
-                $statement = DBManager::get()->query($query);
-                $statement->setFetchMode(PDO::FETCH_ASSOC);
-
-                self::$all_roles = [];
-                foreach ($statement as $row) {
-                    self::$all_roles[$row['roleid']] = new Role($row['roleid'], $row['rolename'], $row['is_system']);
-                }
-
-                $cache->write(self::ROLES_CACHE_KEY, self::$all_roles);
-            }
-        }
-
-        if (!$grouped) {
-            return self::$all_roles;
-        }
-
-        $groups = ['system' => [], 'other' => []];
-        foreach (self::$all_roles as $id => $role) {
-            $index = $role->getSystemtype() ? 'system' : 'other';
-            $groups[$index][$id] = $role;
-        }
-
-        return $groups;
-    }
-
-    public static function getRoleIdByName($name)
-    {
-        foreach (self::getAllRoles() as $id => $role) {
-            if ($role->getRolename() === $name) {
-                return $id;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Inserts the role into the database or does an update, if it's already there
-     *
-     * @param Role $role
-     * @return int the role id
-     */
-    public static function saveRole($role)
-    {
-        $query = "INSERT INTO `roles` (`roleid`, `rolename`, `system`)
-                  VALUES (?, ?, 'n')
-                  ON DUPLICATE KEY UPDATE `rolename` = VALUES(`rolename`)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$role->getRoleId(), $role->getRolename()]);
-
-        if ($role->getRoleid() === Role::UNKNOWN_ROLE_ID) {
-            $role_id = DBManager::get()->lastInsertId();
-            $role->setRoleid($role_id);
-
-            $event = 'RoleDidCreate';
-        } else {
-            $event = 'RoleDidUpdate';
-        }
-
-        // sweep roles cache, see #getAllRoles
-        self::expireRolesCache();
-
-        NotificationCenter::postNotification(
-            $event,
-            $role->getRoleid(),
-            $role->getRolename()
-        );
-
-        return $role->getRoleid();
-    }
-
-    /**
-     * Delete role if not a permanent role. System roles cannot be deleted.
-     *
-     * @param Role $role
-     */
-    public static function deleteRole($role): bool
-    {
-        $id = $role->getRoleid();
-        $name = $role->getRolename();
-
-        $query = "SELECT `pluginid` FROM `roles_plugins` WHERE `roleid` = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$id]);
-        $statement->setFetchMode(PDO::FETCH_COLUMN, 0);
-
-        $result = DBManager::get()->execute(
-            "DELETE `roles`, `roles_user`, `roles_plugins`, `roles_studipperms`
-             FROM `roles`
-             LEFT JOIN `roles_user` USING (`roleid`)
-             LEFT JOIN `roles_plugins` USING (`roleid`)
-             LEFT JOIN `roles_studipperms` USING (`roleid`)
-             WHERE `roleid` = ? AND `system` = 'n'",
-            [$id]
-        );
-
-        if ($result === 0) {
-            return false;
-        }
-
-        // sweep roles cache
-        self::expireRolesCache();
-        self::expireUserCache();
-
-        foreach ($statement as $plugin_id) {
-            self::expirePluginCache($plugin_id);
-        }
-
-        NotificationCenter::postNotification('RoleDidDelete', $id, $name);
-
-        return true;
-    }
-
-    /**
-     * Delete role by name if not a permanent role. System roles cannot be
-     * deleted.
-     *
-     * @param string $role_name
-     *
-     * @return bool
-     */
-    public static function deleteRoleByName(string $role_name): bool
-    {
-        foreach (self::getAllRoles() as $role) {
-            if ($role->getRolename() === $role_name) {
-                return self::deleteRole($role);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Saves a role assignment to the database
-     *
-     * @param User $user
-     * @param Role $role
-     * @param string $institut_id
-     */
-    public static function assignRole(User $user, $role, $institut_id = '')
-    {
-        // role is not in database
-        // save it to the database first
-        if ($role->getRoleid() === Role::UNKNOWN_ROLE_ID) {
-            $roleid = self::saveRole($role);
-        } else {
-            $roleid = $role->getRoleid();
-        }
-
-        $query = "REPLACE INTO `roles_user` (`roleid`, `userid`, `institut_id`)
-                  VALUES (?, ?, ?)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$roleid, $user->id, $institut_id]);
-
-        unset(self::getUserRolesCache()[$user->id]);
-
-        NotificationCenter::postNotification(
-            'RoleAssignmentDidCreate',
-            $roleid,
-            $user->id,
-            $institut_id
-        );
-    }
-
-    /**
-     * Assigns a role to a stud.ip permission. System roles cannot be assigned
-     * to permissions.
-     *
-     * @param string $perm
-     * @param Role   $role
-     *
-     * @return bool
-     * @throws Exception
-     */
-    public static function assignRoleToPerm(string $perm, Role $role): bool
-    {
-        if ($role->getSystemtype()) {
-            throw new Exception('Cannot assign system roles to permissions.');
-        }
-
-        if (!in_array($perm, ['user', 'autor', 'tutor', 'dozent', 'admin', 'root'])) {
-            throw new Exception("Invalid permission {$perm}");
-        }
-
-        $query = "INSERT INTO `roles_studipperms` (`roleid`, `permname`)
-                  VALUES (?, ?)";
-        $result = DBManager::get()->execute($query, [$role->getRoleid(), $perm]);
-
-        if ($result === 0) {
-            return false;
-        }
-
-        User::findEachByPerms(
-            function (User $user) {
-                self::expireUserCache($user->id);
-            },
-            $perm
-        );
-
-        return true;
-    }
-
-    /**
-     * Gets all assigned roles from the database for a user
-     *
-     * @param int $userid
-     * @param boolean $implicit
-     * @return array
-     */
-    public static function getAssignedRoles($user_id, $implicit = false)
-    {
-        return array_intersect_key(
-            self::getAllRoles(),
-            self::loadUserRoles($user_id, $implicit)
-        );
-    }
-
-    /**
-     * Returns institutes for which the given user has the given role.
-     * @param  string $user_id User id
-     * @param  int    $role_id Role id
-     * @return array of institute ids
-     */
-    public static function getAssignedRoleInstitutes($user_id, $role_id)
-    {
-        $roles = self::loadUserRoles($user_id);
-        return $roles[$role_id] ?? [];
-    }
-
-    /**
-     * Checks a role assignment for an user
-     * optionally check for institute
-     *
-     * @param string $userid
-     * @param string $assignedrole
-     * @param string $institut_id
-     * @return boolean
-     */
-    public static function isAssignedRole($userid, $assignedrole, $institut_id = '')
-    {
-        if (!$userid) {
-            return false;
-        }
-
-        $faculty_id = $institut_id
-                    ? Institute::find($institut_id)->fakultaets_id
-                    : null;
-
-        $role_id = self::getRoleIdByName($assignedrole);
-        $user_roles = self::loadUserRoles($userid, true);
-
-        return isset($user_roles[$role_id])
-            && (
-                 !$institut_id
-                 || in_array($institut_id, $user_roles[$role_id])
-                 || in_array($faculty_id, $user_roles[$role_id])
-               );
-    }
-
-    private static function loadUserRoles($user_id, $implicit = false)
-    {
-        $cache = self::getUserRolesCache();
-
-        if (!isset($cache[$user_id])) {
-            $query = "SELECT `roleid`, `institut_id`, 1 AS explicit
-                      FROM `roles_user`
-                      WHERE `userid` = :user_id
-
-                      UNION ALL
-
-                      SELECT `roleid`, '' AS institut_id, 0 AS explicit
-                      FROM `roles_studipperms`
-                      WHERE `permname` = :perm";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':user_id', $user_id);
-            $statement->bindValue(':perm', empty($GLOBALS['perm']) ? 'nobody' : $GLOBALS['perm']->get_perm($user_id));
-            $statement->execute();
-            $statement->setFetchMode(PDO::FETCH_ASSOC);
-
-            $roles = [];
-            foreach ($statement as $row) {
-                if (!isset($roles[$row['roleid']])) {
-                    $roles[$row['roleid']] = [
-                        'id'         => $row['roleid'],
-                        'institutes' => [],
-                        'explicit'   => (bool) $row['explicit'],
-                    ];
-                }
-                if ($row['institut_id']) {
-                    $roles[$row['roleid']]['institutes'][] = $row['institut_id'];
-                }
-            }
-
-            $cache[$user_id] = $roles;
-        }
-
-        // Filter implicit roles away if necessary
-        $roles = array_filter(
-            $cache[$user_id],
-            function ($role) use ($implicit) {
-                return $implicit || $role['explicit'];
-            }
-        );
-
-        return array_column($roles, 'institutes', 'id');
-    }
-
-    /**
-     * Deletes a role assignment from the database
-     *
-     * @param User   $user
-     * @param Role   $role
-     * @param String $institut_id
-     */
-    public static function deleteRoleAssignment(User $user, $role, $institut_id = null)
-    {
-        $query = "DELETE FROM `roles_user`
-                  WHERE `roleid` = ?
-                    AND `userid` = ?
-                    AND `institut_id` = IFNULL(?, `institut_id`)";
-        DBManager::get()->execute(
-            $query,
-            [$role->getRoleid(), $user->id, $institut_id]
-        );
-
-        unset(self::getUserRolesCache()[$user->id]);
-
-        NotificationCenter::postNotification(
-            'RoleAssignmentDidDelete',
-            $role->getRoleid(),
-            $user->id,
-            $institut_id
-        );
-    }
-
-    /**
-     * Removes a role from a stud.ip permission. System roles cannot be removed
-     * from permissions.
-     *
-     * @param string $perm
-     * @param Role   $role
-     *
-     * @return bool
-     * @throws Exception
-     */
-    public static function deleteRoleAssignmentFromPerm(string $perm, Role $role): bool
-    {
-        if ($role->getSystemtype()) {
-            throw new Exception('Cannot remove system role assignment from permissions.');
-        }
-
-        if (!in_array($perm, ['user', 'autor', 'tutor', 'dozent', 'admin', 'root'])) {
-            throw new Exception("Invalid permission {$perm}");
-        }
-
-        $query = "DELETE FROM `roles_studipperms`
-                  WHERE `roleid` = ?
-                    AND `permname` = ?";
-        $result = DBManager::get()->execute($query, [$role->getRoleid(), $perm]);
-
-        if ($result === 0) {
-            return false;
-        }
-
-        User::findEachByPerms(
-            function (User $user) {
-                self::expireUserCache($user->id);
-            },
-            $perm
-        );
-
-        return true;
-    }
-
-
-    /**
-     * Get's all Role-Assignments for a certain user.
-     * If no user is set, all role assignments are returned.
-     *
-     * @param User $user
-     * @return array with roleids and the assigned userids
-     * @deprecated seems to be unused (and was corrupt for some versions)
-     */
-    public static function getAllRoleAssignments($user = null)
-    {
-        $query = "SELECT `roleid`, `userid`
-                  FROM `roles_user`
-                  WHERE `userid` = IFNULL(?, `userid`)";
-        return DBManager::get()->fetchPairs($query, [$user]);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $pluginid
-     * @param array $roleids
-     */
-    public static function assignPluginRoles($plugin_id, $role_ids)
-    {
-        $plugin_id = (int) $plugin_id;
-
-        $query = "REPLACE INTO `roles_plugins` (`roleid`, `pluginid`)
-                  VALUES (:role_id, :plugin_id)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':plugin_id', $plugin_id);
-
-        foreach ($role_ids as $role_id) {
-            $statement->bindValue(':role_id', $role_id);
-            $statement->execute();
-        }
-
-        self::expirePluginCache($plugin_id);
-
-        foreach ($role_ids as $role_id) {
-            NotificationCenter::postNotification(
-                'PluginRoleAssignmentDidCreate',
-                $role_id,
-                $plugin_id
-            );
-        }
-    }
-
-    /**
-     * Removes the given roles' assignments from the given plugin.
-     *
-     * @param int $pluginid
-     * @param array $roleids
-     */
-    public static function deleteAssignedPluginRoles($plugin_id, $role_ids)
-    {
-        $plugin_id = (int) $plugin_id;
-
-        $query = "DELETE FROM `roles_plugins`
-                  WHERE `pluginid` = :plugin_id
-                    AND `roleid` = :role_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':plugin_id', $plugin_id);
-
-        foreach ($role_ids as $role_id) {
-            $statement->bindValue(':role_id', $role_id);
-            $statement->execute();
-        }
-
-        self::expirePluginCache($plugin_id);
-
-        foreach ($role_ids as $role_id) {
-            NotificationCenter::postNotification(
-                'PluginRoleAssignmentDidDelete',
-                $role_id,
-                $plugin_id
-            );
-        }
-    }
-
-    /**
-     * Return all roles assigned to a plugin.
-     *
-     * @param int $pluginid
-     * @return array
-     */
-    public static function getAssignedPluginRoles($plugin_id)
-    {
-        $plugin_id = (int) $plugin_id;
-
-        // read plugin roles from cache
-        $cache = self::getPluginRolesCache();
-
-        // cache miss, retrieve roles from database
-        if (!isset($cache[$plugin_id])) {
-            $query = "SELECT `roleid` FROM `roles_plugins` WHERE `pluginid` = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$plugin_id]);
-            $role_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-            // write to cache
-            $cache[$plugin_id] = $role_ids;
-        }
-
-        $roles = self::getAllRoles();
-        return array_filter(array_map(
-            function ($role_id) use ($roles) {
-                if (!isset($roles[$role_id])) {
-                    return false;
-                }
-                return $roles[$role_id];
-            },
-            $cache[$plugin_id]
-        ));
-    }
-
-    /**
-     * Returns all users that have a specific role - given by it's name.
-     *
-     * @param string $role_name   Name of the role
-     * @param bool   $only_explicit Only select explicit assignments from table
-     *                              `roles_user` if true, otherwise also select
-     *                              by perm defined in table `roles_studipperms`
-     *
-     * @return User[]
-     */
-    public static function getUsersWithRoleByName(string $role_name, bool $only_explicit = true): array
-    {
-        $role_id = self::getRoleIdByName($role_name);
-        if ($role_id === false) {
-            throw new Exception("Unknown role name {$role_name}");
-        }
-
-        return self::getUsersWithRoleById($role_id, $only_explicit);
-    }
-
-    /**
-     * Returns all users that have a specific role - given by it's id.
-     *
-     * @param int  $role_id       Id of the role
-     * @param bool $only_explicit Only select explicit assignments from table
-     *                            `roles_user` if true, otherwise also select
-     *                            by perm defined in table `roles_studipperms`
-     *
-     * @return User[]
-     */
-    public static function getUsersWithRoleById(int $role_id, bool $only_explicit = true): array
-    {
-        $query = "SELECT `userid` AS `user_id`
-                  FROM `roles_user`
-                  WHERE `roleid` = :role_id";
-
-        if (!$only_explicit) {
-            $query = "SELECT DISTINCT `user_id`
-                      FROM (
-                          {$query}
-
-                          UNION ALL
-
-                          SELECT `user_id`
-                          FROM `roles_studipperms` AS `rsp`
-                          JOIN `auth_user_md5` AS `aum`
-                            ON (`rsp`.`permname` = `aum`.`perms`)
-                          WHERE `rsp`.`roleid` = :role_id
-                      ) AS tmp";
-        }
-
-        $user_ids = DBManager::get()->fetchFirst($query, [':role_id' => $role_id]);
-
-        return User::findMany($user_ids);
-    }
-
-    /**
-     * Returns statistic values for each role:
-     *
-     * - number of explicitely assigned users
-     * - number of implicitely assigned users
-     * - number of assigned plugins
-     *
-     * @return array
-     */
-    public static function getStatistics()
-    {
-        // Get basic statistics
-        $query = "SELECT r.`roleid`,
-                         COUNT(DISTINCT ru.`userid`) AS explicit,
-                         COUNT(DISTINCT rp.`pluginid`) AS plugins
-                  FROM roles AS r
-                  -- Explicit assignment
-                  LEFT JOIN `roles_user` AS ru
-                    ON r.`roleid` = ru.`roleid` AND ru.`userid` IN (SELECT `user_id` FROM `auth_user_md5`)
-                  -- Plugins
-                  LEFT JOIN `roles_plugins` AS rp
-                    ON r.`roleid` = rp.`roleid` AND rp.`pluginid` IN (SELECT `pluginid` FROM `plugins`)
-                  GROUP BY r.`roleid`";
-        $result = DBManager::get()->fetchGrouped($query);
-
-        // Fetch implicit assignments in a second query due to performance
-        // reasons
-        foreach (self::countImplicitUsers(array_keys($result)) as $id => $count) {
-            $result[$id]['implicit'] = $count;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Counts the implicitely assigned users for a role.
-     * @param  mixed $role_id Role id or array of role ids
-     * @return mixed number of implictit for the role (if one role id is given)
-     *               or associative array [role id => number of implicit users]
-     *               when given a list of role ids
-     */
-    public static function countImplicitUsers($role_id)
-    {
-        // Ensure that the result array has an entry for every role id
-        $result = array_fill_keys((array) $role_id, 0);
-
-        $query = "SELECT rsp.`roleid`, COUNT(*) AS implicit
-                  FROM `roles_studipperms` AS rsp
-                  JOIN `auth_user_md5` AS a ON rsp.`permname` = a.`perms`
-                  LEFT JOIN `roles_user` AS ru
-                    ON a.`user_id` = ru.`userid` AND rsp.`roleid` = ru.`roleid`
-                  WHERE rsp.`roleid` IN (?)
-                    AND ru.`userid` IS NULL
-                  GROUP BY rsp.`roleid`";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$role_id]);
-        $statement->setFetchMode(PDO::FETCH_ASSOC);
-
-        foreach ($statement as $row) {
-            $result[$row['roleid']] = (int) $row['implicit'];
-        }
-
-        return is_array($role_id)
-             ? $result
-             : $result[$role_id];
-    }
-
-    // Cache operations
-    private static $user_roles_cache = null;
-    private static $plugin_roles_cache = null;
-
-    private static function getUserRolesCache(): StudipCachedArray
-    {
-        if (self::$user_roles_cache === null) {
-            self::$user_roles_cache = new StudipCachedArray(self::USER_ROLES_CACHE_KEY);
-        }
-        return self::$user_roles_cache;
-    }
-
-    private static function getPluginRolesCache(): StudipCachedArray
-    {
-        if (self::$plugin_roles_cache === null) {
-            self::$plugin_roles_cache = new StudipCachedArray(self::PLUGIN_ROLES_CACHE_KEY);
-        }
-        return self::$plugin_roles_cache;
-    }
-
-    /**
-     * Expires all cached roles.
-     */
-    public static function expireRolesCache()
-    {
-        self::$all_roles = null;
-        \Studip\Cache\Factory::getCache()->expire(self::ROLES_CACHE_KEY);
-    }
-
-    /**
-     * Expires all cached user role assignments.
-     *
-     * @param string|null $user_id Optional user id to expire the cache for.
-     *                             If none is given, the whole cache is cleared.
-     */
-    public static function expireUserCache($user_id = null)
-    {
-        if ($user_id === null) {
-            self::getUserRolesCache()->expire();
-        } else {
-            unset(self::getUserRolesCache()[$user_id]);
-        }
-    }
-
-    /**
-     * Expires all cached plugin role assignments.
-     *
-     * @param string|int|null $plugin_id Optional plugin id to expire the cache
-     *                                   for. If none is given, the whole cache
-     *                                   is cleared.
-     */
-    public static function expirePluginCache($plugin_id = null)
-    {
-        if ($plugin_id === null) {
-            self::getPluginRolesCache()->expire();
-        } else {
-            unset(self::getPluginRolesCache()[$plugin_id]);
-        }
-    }
-
-    /**
-     * Expires all caches
-     */
-    public static function expireCaches(): void
-    {
-        self::expireRolesCache();
-        self::expireUserCache();
-        self::expirePluginCache();
-    }
-}
diff --git a/lib/plugins/db/RolePersistence.php b/lib/plugins/db/RolePersistence.php
new file mode 100644
index 0000000..df63a77
--- /dev/null
+++ b/lib/plugins/db/RolePersistence.php
@@ -0,0 +1,721 @@
+<?php
+/**
+ * RolePersistence.class.php
+ *
+ * Funktionen für das Rollenmanagement
+ *
+ * @author      Dennis Reil <dennis.reil@offis.de>
+ * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
+ * @package     pluginengine
+ * @subpackage  db
+ * @copyright   2009 Stud.IP
+ * @license     http://www.gnu.org/licenses/gpl.html GPL Licence 3
+ */
+class RolePersistence
+{
+    const ROLES_CACHE_KEY = 'roles';
+    const USER_ROLES_CACHE_KEY = 'roles/user';
+    const PLUGIN_ROLES_CACHE_KEY = 'roles/plugin';
+
+    protected static $all_roles = null;
+
+    /**
+     * Returns all available roles.
+     *
+     * @param bool $grouped Return the roles grouped by system type or other
+     * @return Role[]|array{system: Role[], other: Role[]}
+     */
+    public static function getAllRoles(bool $grouped = false): array
+    {
+        if (self::$all_roles === null) {
+            // read cache
+            $cache = \Studip\Cache\Factory::getCache();
+
+            // cache miss, retrieve from database
+            self::$all_roles = $cache->read(self::ROLES_CACHE_KEY);
+            if (!self::$all_roles) {
+                $query = "SELECT `roleid`, `rolename`, `system` = 'y' AS `is_system`
+                      FROM `roles`
+                      ORDER BY `rolename`";
+                $statement = DBManager::get()->query($query);
+                $statement->setFetchMode(PDO::FETCH_ASSOC);
+
+                self::$all_roles = [];
+                foreach ($statement as $row) {
+                    self::$all_roles[$row['roleid']] = new Role($row['roleid'], $row['rolename'], $row['is_system']);
+                }
+
+                $cache->write(self::ROLES_CACHE_KEY, self::$all_roles);
+            }
+        }
+
+        if (!$grouped) {
+            return self::$all_roles;
+        }
+
+        $groups = ['system' => [], 'other' => []];
+        foreach (self::$all_roles as $id => $role) {
+            $index = $role->getSystemtype() ? 'system' : 'other';
+            $groups[$index][$id] = $role;
+        }
+
+        return $groups;
+    }
+
+    public static function getRoleIdByName($name)
+    {
+        foreach (self::getAllRoles() as $id => $role) {
+            if ($role->getRolename() === $name) {
+                return $id;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Inserts the role into the database or does an update, if it's already there
+     *
+     * @param Role $role
+     * @return int the role id
+     */
+    public static function saveRole($role)
+    {
+        $query = "INSERT INTO `roles` (`roleid`, `rolename`, `system`)
+                  VALUES (?, ?, 'n')
+                  ON DUPLICATE KEY UPDATE `rolename` = VALUES(`rolename`)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$role->getRoleId(), $role->getRolename()]);
+
+        if ($role->getRoleid() === Role::UNKNOWN_ROLE_ID) {
+            $role_id = DBManager::get()->lastInsertId();
+            $role->setRoleid($role_id);
+
+            $event = 'RoleDidCreate';
+        } else {
+            $event = 'RoleDidUpdate';
+        }
+
+        // sweep roles cache, see #getAllRoles
+        self::expireRolesCache();
+
+        NotificationCenter::postNotification(
+            $event,
+            $role->getRoleid(),
+            $role->getRolename()
+        );
+
+        return $role->getRoleid();
+    }
+
+    /**
+     * Delete role if not a permanent role. System roles cannot be deleted.
+     *
+     * @param Role $role
+     */
+    public static function deleteRole($role): bool
+    {
+        $id = $role->getRoleid();
+        $name = $role->getRolename();
+
+        $query = "SELECT `pluginid` FROM `roles_plugins` WHERE `roleid` = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$id]);
+        $statement->setFetchMode(PDO::FETCH_COLUMN, 0);
+
+        $result = DBManager::get()->execute(
+            "DELETE `roles`, `roles_user`, `roles_plugins`, `roles_studipperms`
+             FROM `roles`
+             LEFT JOIN `roles_user` USING (`roleid`)
+             LEFT JOIN `roles_plugins` USING (`roleid`)
+             LEFT JOIN `roles_studipperms` USING (`roleid`)
+             WHERE `roleid` = ? AND `system` = 'n'",
+            [$id]
+        );
+
+        if ($result === 0) {
+            return false;
+        }
+
+        // sweep roles cache
+        self::expireRolesCache();
+        self::expireUserCache();
+
+        foreach ($statement as $plugin_id) {
+            self::expirePluginCache($plugin_id);
+        }
+
+        NotificationCenter::postNotification('RoleDidDelete', $id, $name);
+
+        return true;
+    }
+
+    /**
+     * Delete role by name if not a permanent role. System roles cannot be
+     * deleted.
+     *
+     * @param string $role_name
+     *
+     * @return bool
+     */
+    public static function deleteRoleByName(string $role_name): bool
+    {
+        foreach (self::getAllRoles() as $role) {
+            if ($role->getRolename() === $role_name) {
+                return self::deleteRole($role);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Saves a role assignment to the database
+     *
+     * @param User $user
+     * @param Role $role
+     * @param string $institut_id
+     */
+    public static function assignRole(User $user, $role, $institut_id = '')
+    {
+        // role is not in database
+        // save it to the database first
+        if ($role->getRoleid() === Role::UNKNOWN_ROLE_ID) {
+            $roleid = self::saveRole($role);
+        } else {
+            $roleid = $role->getRoleid();
+        }
+
+        $query = "REPLACE INTO `roles_user` (`roleid`, `userid`, `institut_id`)
+                  VALUES (?, ?, ?)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$roleid, $user->id, $institut_id]);
+
+        unset(self::getUserRolesCache()[$user->id]);
+
+        NotificationCenter::postNotification(
+            'RoleAssignmentDidCreate',
+            $roleid,
+            $user->id,
+            $institut_id
+        );
+    }
+
+    /**
+     * Assigns a role to a stud.ip permission. System roles cannot be assigned
+     * to permissions.
+     *
+     * @param string $perm
+     * @param Role   $role
+     *
+     * @return bool
+     * @throws Exception
+     */
+    public static function assignRoleToPerm(string $perm, Role $role): bool
+    {
+        if ($role->getSystemtype()) {
+            throw new Exception('Cannot assign system roles to permissions.');
+        }
+
+        if (!in_array($perm, ['user', 'autor', 'tutor', 'dozent', 'admin', 'root'])) {
+            throw new Exception("Invalid permission {$perm}");
+        }
+
+        $query = "INSERT INTO `roles_studipperms` (`roleid`, `permname`)
+                  VALUES (?, ?)";
+        $result = DBManager::get()->execute($query, [$role->getRoleid(), $perm]);
+
+        if ($result === 0) {
+            return false;
+        }
+
+        User::findEachByPerms(
+            function (User $user) {
+                self::expireUserCache($user->id);
+            },
+            $perm
+        );
+
+        return true;
+    }
+
+    /**
+     * Gets all assigned roles from the database for a user
+     *
+     * @param int $userid
+     * @param boolean $implicit
+     * @return array
+     */
+    public static function getAssignedRoles($user_id, $implicit = false)
+    {
+        return array_intersect_key(
+            self::getAllRoles(),
+            self::loadUserRoles($user_id, $implicit)
+        );
+    }
+
+    /**
+     * Returns institutes for which the given user has the given role.
+     * @param  string $user_id User id
+     * @param  int    $role_id Role id
+     * @return array of institute ids
+     */
+    public static function getAssignedRoleInstitutes($user_id, $role_id)
+    {
+        $roles = self::loadUserRoles($user_id);
+        return $roles[$role_id] ?? [];
+    }
+
+    /**
+     * Checks a role assignment for an user
+     * optionally check for institute
+     *
+     * @param string $userid
+     * @param string $assignedrole
+     * @param string $institut_id
+     * @return boolean
+     */
+    public static function isAssignedRole($userid, $assignedrole, $institut_id = '')
+    {
+        if (!$userid) {
+            return false;
+        }
+
+        $faculty_id = $institut_id
+                    ? Institute::find($institut_id)->fakultaets_id
+                    : null;
+
+        $role_id = self::getRoleIdByName($assignedrole);
+        $user_roles = self::loadUserRoles($userid, true);
+
+        return isset($user_roles[$role_id])
+            && (
+                 !$institut_id
+                 || in_array($institut_id, $user_roles[$role_id])
+                 || in_array($faculty_id, $user_roles[$role_id])
+               );
+    }
+
+    private static function loadUserRoles($user_id, $implicit = false)
+    {
+        $cache = self::getUserRolesCache();
+
+        if (!isset($cache[$user_id])) {
+            $query = "SELECT `roleid`, `institut_id`, 1 AS explicit
+                      FROM `roles_user`
+                      WHERE `userid` = :user_id
+
+                      UNION ALL
+
+                      SELECT `roleid`, '' AS institut_id, 0 AS explicit
+                      FROM `roles_studipperms`
+                      WHERE `permname` = :perm";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':user_id', $user_id);
+            $statement->bindValue(':perm', empty($GLOBALS['perm']) ? 'nobody' : $GLOBALS['perm']->get_perm($user_id));
+            $statement->execute();
+            $statement->setFetchMode(PDO::FETCH_ASSOC);
+
+            $roles = [];
+            foreach ($statement as $row) {
+                if (!isset($roles[$row['roleid']])) {
+                    $roles[$row['roleid']] = [
+                        'id'         => $row['roleid'],
+                        'institutes' => [],
+                        'explicit'   => (bool) $row['explicit'],
+                    ];
+                }
+                if ($row['institut_id']) {
+                    $roles[$row['roleid']]['institutes'][] = $row['institut_id'];
+                }
+            }
+
+            $cache[$user_id] = $roles;
+        }
+
+        // Filter implicit roles away if necessary
+        $roles = array_filter(
+            $cache[$user_id],
+            function ($role) use ($implicit) {
+                return $implicit || $role['explicit'];
+            }
+        );
+
+        return array_column($roles, 'institutes', 'id');
+    }
+
+    /**
+     * Deletes a role assignment from the database
+     *
+     * @param User   $user
+     * @param Role   $role
+     * @param String $institut_id
+     */
+    public static function deleteRoleAssignment(User $user, $role, $institut_id = null)
+    {
+        $query = "DELETE FROM `roles_user`
+                  WHERE `roleid` = ?
+                    AND `userid` = ?
+                    AND `institut_id` = IFNULL(?, `institut_id`)";
+        DBManager::get()->execute(
+            $query,
+            [$role->getRoleid(), $user->id, $institut_id]
+        );
+
+        unset(self::getUserRolesCache()[$user->id]);
+
+        NotificationCenter::postNotification(
+            'RoleAssignmentDidDelete',
+            $role->getRoleid(),
+            $user->id,
+            $institut_id
+        );
+    }
+
+    /**
+     * Removes a role from a stud.ip permission. System roles cannot be removed
+     * from permissions.
+     *
+     * @param string $perm
+     * @param Role   $role
+     *
+     * @return bool
+     * @throws Exception
+     */
+    public static function deleteRoleAssignmentFromPerm(string $perm, Role $role): bool
+    {
+        if ($role->getSystemtype()) {
+            throw new Exception('Cannot remove system role assignment from permissions.');
+        }
+
+        if (!in_array($perm, ['user', 'autor', 'tutor', 'dozent', 'admin', 'root'])) {
+            throw new Exception("Invalid permission {$perm}");
+        }
+
+        $query = "DELETE FROM `roles_studipperms`
+                  WHERE `roleid` = ?
+                    AND `permname` = ?";
+        $result = DBManager::get()->execute($query, [$role->getRoleid(), $perm]);
+
+        if ($result === 0) {
+            return false;
+        }
+
+        User::findEachByPerms(
+            function (User $user) {
+                self::expireUserCache($user->id);
+            },
+            $perm
+        );
+
+        return true;
+    }
+
+
+    /**
+     * Get's all Role-Assignments for a certain user.
+     * If no user is set, all role assignments are returned.
+     *
+     * @param User $user
+     * @return array with roleids and the assigned userids
+     * @deprecated seems to be unused (and was corrupt for some versions)
+     */
+    public static function getAllRoleAssignments($user = null)
+    {
+        $query = "SELECT `roleid`, `userid`
+                  FROM `roles_user`
+                  WHERE `userid` = IFNULL(?, `userid`)";
+        return DBManager::get()->fetchPairs($query, [$user]);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $pluginid
+     * @param array $roleids
+     */
+    public static function assignPluginRoles($plugin_id, $role_ids)
+    {
+        $plugin_id = (int) $plugin_id;
+
+        $query = "REPLACE INTO `roles_plugins` (`roleid`, `pluginid`)
+                  VALUES (:role_id, :plugin_id)";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':plugin_id', $plugin_id);
+
+        foreach ($role_ids as $role_id) {
+            $statement->bindValue(':role_id', $role_id);
+            $statement->execute();
+        }
+
+        self::expirePluginCache($plugin_id);
+
+        foreach ($role_ids as $role_id) {
+            NotificationCenter::postNotification(
+                'PluginRoleAssignmentDidCreate',
+                $role_id,
+                $plugin_id
+            );
+        }
+    }
+
+    /**
+     * Removes the given roles' assignments from the given plugin.
+     *
+     * @param int $pluginid
+     * @param array $roleids
+     */
+    public static function deleteAssignedPluginRoles($plugin_id, $role_ids)
+    {
+        $plugin_id = (int) $plugin_id;
+
+        $query = "DELETE FROM `roles_plugins`
+                  WHERE `pluginid` = :plugin_id
+                    AND `roleid` = :role_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':plugin_id', $plugin_id);
+
+        foreach ($role_ids as $role_id) {
+            $statement->bindValue(':role_id', $role_id);
+            $statement->execute();
+        }
+
+        self::expirePluginCache($plugin_id);
+
+        foreach ($role_ids as $role_id) {
+            NotificationCenter::postNotification(
+                'PluginRoleAssignmentDidDelete',
+                $role_id,
+                $plugin_id
+            );
+        }
+    }
+
+    /**
+     * Return all roles assigned to a plugin.
+     *
+     * @param int $pluginid
+     * @return array
+     */
+    public static function getAssignedPluginRoles($plugin_id)
+    {
+        $plugin_id = (int) $plugin_id;
+
+        // read plugin roles from cache
+        $cache = self::getPluginRolesCache();
+
+        // cache miss, retrieve roles from database
+        if (!isset($cache[$plugin_id])) {
+            $query = "SELECT `roleid` FROM `roles_plugins` WHERE `pluginid` = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$plugin_id]);
+            $role_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+            // write to cache
+            $cache[$plugin_id] = $role_ids;
+        }
+
+        $roles = self::getAllRoles();
+        return array_filter(array_map(
+            function ($role_id) use ($roles) {
+                if (!isset($roles[$role_id])) {
+                    return false;
+                }
+                return $roles[$role_id];
+            },
+            $cache[$plugin_id]
+        ));
+    }
+
+    /**
+     * Returns all users that have a specific role - given by it's name.
+     *
+     * @param string $role_name   Name of the role
+     * @param bool   $only_explicit Only select explicit assignments from table
+     *                              `roles_user` if true, otherwise also select
+     *                              by perm defined in table `roles_studipperms`
+     *
+     * @return User[]
+     */
+    public static function getUsersWithRoleByName(string $role_name, bool $only_explicit = true): array
+    {
+        $role_id = self::getRoleIdByName($role_name);
+        if ($role_id === false) {
+            throw new Exception("Unknown role name {$role_name}");
+        }
+
+        return self::getUsersWithRoleById($role_id, $only_explicit);
+    }
+
+    /**
+     * Returns all users that have a specific role - given by it's id.
+     *
+     * @param int  $role_id       Id of the role
+     * @param bool $only_explicit Only select explicit assignments from table
+     *                            `roles_user` if true, otherwise also select
+     *                            by perm defined in table `roles_studipperms`
+     *
+     * @return User[]
+     */
+    public static function getUsersWithRoleById(int $role_id, bool $only_explicit = true): array
+    {
+        $query = "SELECT `userid` AS `user_id`
+                  FROM `roles_user`
+                  WHERE `roleid` = :role_id";
+
+        if (!$only_explicit) {
+            $query = "SELECT DISTINCT `user_id`
+                      FROM (
+                          {$query}
+
+                          UNION ALL
+
+                          SELECT `user_id`
+                          FROM `roles_studipperms` AS `rsp`
+                          JOIN `auth_user_md5` AS `aum`
+                            ON (`rsp`.`permname` = `aum`.`perms`)
+                          WHERE `rsp`.`roleid` = :role_id
+                      ) AS tmp";
+        }
+
+        $user_ids = DBManager::get()->fetchFirst($query, [':role_id' => $role_id]);
+
+        return User::findMany($user_ids);
+    }
+
+    /**
+     * Returns statistic values for each role:
+     *
+     * - number of explicitely assigned users
+     * - number of implicitely assigned users
+     * - number of assigned plugins
+     *
+     * @return array
+     */
+    public static function getStatistics()
+    {
+        // Get basic statistics
+        $query = "SELECT r.`roleid`,
+                         COUNT(DISTINCT ru.`userid`) AS explicit,
+                         COUNT(DISTINCT rp.`pluginid`) AS plugins
+                  FROM roles AS r
+                  -- Explicit assignment
+                  LEFT JOIN `roles_user` AS ru
+                    ON r.`roleid` = ru.`roleid` AND ru.`userid` IN (SELECT `user_id` FROM `auth_user_md5`)
+                  -- Plugins
+                  LEFT JOIN `roles_plugins` AS rp
+                    ON r.`roleid` = rp.`roleid` AND rp.`pluginid` IN (SELECT `pluginid` FROM `plugins`)
+                  GROUP BY r.`roleid`";
+        $result = DBManager::get()->fetchGrouped($query);
+
+        // Fetch implicit assignments in a second query due to performance
+        // reasons
+        foreach (self::countImplicitUsers(array_keys($result)) as $id => $count) {
+            $result[$id]['implicit'] = $count;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Counts the implicitely assigned users for a role.
+     * @param  mixed $role_id Role id or array of role ids
+     * @return mixed number of implictit for the role (if one role id is given)
+     *               or associative array [role id => number of implicit users]
+     *               when given a list of role ids
+     */
+    public static function countImplicitUsers($role_id)
+    {
+        // Ensure that the result array has an entry for every role id
+        $result = array_fill_keys((array) $role_id, 0);
+
+        $query = "SELECT rsp.`roleid`, COUNT(*) AS implicit
+                  FROM `roles_studipperms` AS rsp
+                  JOIN `auth_user_md5` AS a ON rsp.`permname` = a.`perms`
+                  LEFT JOIN `roles_user` AS ru
+                    ON a.`user_id` = ru.`userid` AND rsp.`roleid` = ru.`roleid`
+                  WHERE rsp.`roleid` IN (?)
+                    AND ru.`userid` IS NULL
+                  GROUP BY rsp.`roleid`";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$role_id]);
+        $statement->setFetchMode(PDO::FETCH_ASSOC);
+
+        foreach ($statement as $row) {
+            $result[$row['roleid']] = (int) $row['implicit'];
+        }
+
+        return is_array($role_id)
+             ? $result
+             : $result[$role_id];
+    }
+
+    // Cache operations
+    private static $user_roles_cache = null;
+    private static $plugin_roles_cache = null;
+
+    private static function getUserRolesCache(): StudipCachedArray
+    {
+        if (self::$user_roles_cache === null) {
+            self::$user_roles_cache = new StudipCachedArray(self::USER_ROLES_CACHE_KEY);
+        }
+        return self::$user_roles_cache;
+    }
+
+    private static function getPluginRolesCache(): StudipCachedArray
+    {
+        if (self::$plugin_roles_cache === null) {
+            self::$plugin_roles_cache = new StudipCachedArray(self::PLUGIN_ROLES_CACHE_KEY);
+        }
+        return self::$plugin_roles_cache;
+    }
+
+    /**
+     * Expires all cached roles.
+     */
+    public static function expireRolesCache()
+    {
+        self::$all_roles = null;
+        \Studip\Cache\Factory::getCache()->expire(self::ROLES_CACHE_KEY);
+    }
+
+    /**
+     * Expires all cached user role assignments.
+     *
+     * @param string|null $user_id Optional user id to expire the cache for.
+     *                             If none is given, the whole cache is cleared.
+     */
+    public static function expireUserCache($user_id = null)
+    {
+        if ($user_id === null) {
+            self::getUserRolesCache()->expire();
+        } else {
+            unset(self::getUserRolesCache()[$user_id]);
+        }
+    }
+
+    /**
+     * Expires all cached plugin role assignments.
+     *
+     * @param string|int|null $plugin_id Optional plugin id to expire the cache
+     *                                   for. If none is given, the whole cache
+     *                                   is cleared.
+     */
+    public static function expirePluginCache($plugin_id = null)
+    {
+        if ($plugin_id === null) {
+            self::getPluginRolesCache()->expire();
+        } else {
+            unset(self::getPluginRolesCache()[$plugin_id]);
+        }
+    }
+
+    /**
+     * Expires all caches
+     */
+    public static function expireCaches(): void
+    {
+        self::expireRolesCache();
+        self::expireUserCache();
+        self::expirePluginCache();
+    }
+}
diff --git a/lib/plugins/engine/PluginEngine.class.php b/lib/plugins/engine/PluginEngine.class.php
deleted file mode 100644
index 25974c5..0000000
--- a/lib/plugins/engine/PluginEngine.class.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Factory Class for the plugin engine
- * @author Dennis Reil, <dennis.reil@offis.de>
- * @template P of StudIPPlugin
- */
-
-class PluginEngine
-{
-    /**
-     * This function maps an incoming request to a tuple
-     * (pluginclassname, unconsumed rest).
-     * @param string $dispatch_to
-     * @return array the above mentioned tuple
-     */
-    public static function routeRequest($dispatch_to)
-    {
-        $dispatch_to = ltrim($dispatch_to, '/');
-        if (mb_strlen($dispatch_to) === 0) {
-            throw new PluginNotFoundException(_('Es wurde kein Plugin gewählt.'));
-        }
-        $pos = mb_strpos($dispatch_to, '/');
-        return $pos === false
-            ? [$dispatch_to, '']
-            : [mb_substr($dispatch_to, 0, $pos), mb_substr($dispatch_to, $pos + 1)];
-    }
-
-    /**
-     * Load the default set of plugins. This currently loads plugins of
-     * type Homepage, Standard (if a course is selected), Administration
-     * (if user has admin status) and System. The exact type of plugins
-     * loaded here may change in the future.
-     */
-    public static function loadPlugins()
-    {
-        global $user, $perm;
-
-        // load system plugins
-        self::getPlugins(SystemPlugin::class);
-
-        // load homepage plugins
-        self::getPlugins(HomepagePlugin::class);
-
-        // load course plugins
-        if (Context::getId()) {
-            self::getPlugins(StudipModule::class);
-            self::getPlugins(StandardPlugin::class);
-        }
-
-        // load admin plugins
-        if (is_object($user) && $perm->have_perm('admin')) {
-            self::getPlugins(AdministrationPlugin::class);
-        }
-    }
-
-    /**
-     * Get instance of the plugin specified by plugin class name.
-     *
-     * @param class-string<P> $class class name of plugin
-     * @return P
-     */
-    public static function getPlugin ($class)
-    {
-        return PluginManager::getInstance()->getPlugin($class);
-    }
-
-    /**
-     * Get instances of all plugins of the specified type. A type of NULL
-     * returns all enabled plugins. The optional context parameter can be
-     * used to get only plugins that are activated in the given context.
-     *
-     * @param class-string<P>|null $type plugin type or null (all types)
-     * @param string $context context range id (optional)
-     * @return P[]|StudIPPlugin[] all plugins of the specified type
-     */
-    public static function getPlugins ($type, $context = null)
-    {
-        return PluginManager::getInstance()->getPlugins($type, $context);
-    }
-
-    /**
-     * Sends a message to all activated plugins of a type and returns an array of
-     * the return values.
-     *
-     * @param  string $type plugin type or null (all types)
-     * @param  string $method the method name that should be send to all plugins
-     * @param  mixed  a variable number of arguments
-     *
-     * @return array an array containing the return values
-     */
-    public static function sendMessage($type, $method /* ... */)
-    {
-        $args = func_get_args();
-        array_splice($args, 1, 0, [null]);
-        return call_user_func_array([__CLASS__, 'sendMessageWithContext'], $args);
-    }
-
-    /**
-     * Sends a message to all activated plugins of a type enabled in a context and
-     * returns an array of the return values.
-     *
-     * @param  string $type plugin type or null (all types)
-     * @param  string $context context range id (may be null)
-     * @param  string $method the method name that should be send to all plugins
-     * @param  mixed  a variable number of arguments
-     *
-     * @return array      an array containing the return values
-     */
-    public static function sendMessageWithContext($type, $context, $method /* ... */)
-    {
-        $args = func_get_args();
-        $args = array_slice($args, 3);
-        $results = [];
-        foreach (self::getPlugins($type, $context) as $plugin) {
-            $results[] = call_user_func_array([$plugin, $method], $args);
-        }
-        return $results;
-    }
-
-    /**
-    * Generates a URL which can be shown in user interfaces
-    * @param StudIPPlugin|string $plugin - the plugin to which should be linked
-    * @param array $params - an array with name value pairs
-    * @param string $cmd - command to execute by clicking the link
-    * @param bool $ignore_registered_params do not add registered params
-    * @return string a link to the current plugin with the additional $params
-    */
-    public static function getURL($plugin, $params = [], $cmd = 'show', $ignore_registered_params = false)
-    {
-        if (is_null($plugin)) {
-            throw new InvalidArgumentException(_('Es wurde kein Plugin gewählt.'));
-        } else if (is_object($plugin)) {
-            $plugin = mb_strtolower(get_class($plugin)) . '/' . $cmd;
-        } else if (mb_strpos($plugin, '/') === false) {
-            $plugin = $plugin . '/' . $cmd;
-        }
-
-        return URLHelper::getURL('plugins.php/' . $plugin, $params, $ignore_registered_params);
-    }
-
-    /**
-    * Generates a link (entity encoded URL) which can be shown in user interfaces
-    * @param StudIPPlugin|string $plugin - the plugin to which should be linked
-    * @param array $params - an array with name value pairs
-    * @param string $cmd - command to execute by clicking the link
-    * @param bool $ignore_registered_params do not add registeredparams
-    * @return string a link to the current plugin with the additional $params
-    */
-    public static function getLink($plugin, $params = [], $cmd = 'show', $ignore_registered_params = false)
-    {
-        return htmlReady(self::getURL($plugin, $params, $cmd, $ignore_registered_params));
-    }
-}
diff --git a/lib/plugins/engine/PluginEngine.php b/lib/plugins/engine/PluginEngine.php
new file mode 100644
index 0000000..25974c5
--- /dev/null
+++ b/lib/plugins/engine/PluginEngine.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Factory Class for the plugin engine
+ * @author Dennis Reil, <dennis.reil@offis.de>
+ * @template P of StudIPPlugin
+ */
+
+class PluginEngine
+{
+    /**
+     * This function maps an incoming request to a tuple
+     * (pluginclassname, unconsumed rest).
+     * @param string $dispatch_to
+     * @return array the above mentioned tuple
+     */
+    public static function routeRequest($dispatch_to)
+    {
+        $dispatch_to = ltrim($dispatch_to, '/');
+        if (mb_strlen($dispatch_to) === 0) {
+            throw new PluginNotFoundException(_('Es wurde kein Plugin gewählt.'));
+        }
+        $pos = mb_strpos($dispatch_to, '/');
+        return $pos === false
+            ? [$dispatch_to, '']
+            : [mb_substr($dispatch_to, 0, $pos), mb_substr($dispatch_to, $pos + 1)];
+    }
+
+    /**
+     * Load the default set of plugins. This currently loads plugins of
+     * type Homepage, Standard (if a course is selected), Administration
+     * (if user has admin status) and System. The exact type of plugins
+     * loaded here may change in the future.
+     */
+    public static function loadPlugins()
+    {
+        global $user, $perm;
+
+        // load system plugins
+        self::getPlugins(SystemPlugin::class);
+
+        // load homepage plugins
+        self::getPlugins(HomepagePlugin::class);
+
+        // load course plugins
+        if (Context::getId()) {
+            self::getPlugins(StudipModule::class);
+            self::getPlugins(StandardPlugin::class);
+        }
+
+        // load admin plugins
+        if (is_object($user) && $perm->have_perm('admin')) {
+            self::getPlugins(AdministrationPlugin::class);
+        }
+    }
+
+    /**
+     * Get instance of the plugin specified by plugin class name.
+     *
+     * @param class-string<P> $class class name of plugin
+     * @return P
+     */
+    public static function getPlugin ($class)
+    {
+        return PluginManager::getInstance()->getPlugin($class);
+    }
+
+    /**
+     * Get instances of all plugins of the specified type. A type of NULL
+     * returns all enabled plugins. The optional context parameter can be
+     * used to get only plugins that are activated in the given context.
+     *
+     * @param class-string<P>|null $type plugin type or null (all types)
+     * @param string $context context range id (optional)
+     * @return P[]|StudIPPlugin[] all plugins of the specified type
+     */
+    public static function getPlugins ($type, $context = null)
+    {
+        return PluginManager::getInstance()->getPlugins($type, $context);
+    }
+
+    /**
+     * Sends a message to all activated plugins of a type and returns an array of
+     * the return values.
+     *
+     * @param  string $type plugin type or null (all types)
+     * @param  string $method the method name that should be send to all plugins
+     * @param  mixed  a variable number of arguments
+     *
+     * @return array an array containing the return values
+     */
+    public static function sendMessage($type, $method /* ... */)
+    {
+        $args = func_get_args();
+        array_splice($args, 1, 0, [null]);
+        return call_user_func_array([__CLASS__, 'sendMessageWithContext'], $args);
+    }
+
+    /**
+     * Sends a message to all activated plugins of a type enabled in a context and
+     * returns an array of the return values.
+     *
+     * @param  string $type plugin type or null (all types)
+     * @param  string $context context range id (may be null)
+     * @param  string $method the method name that should be send to all plugins
+     * @param  mixed  a variable number of arguments
+     *
+     * @return array      an array containing the return values
+     */
+    public static function sendMessageWithContext($type, $context, $method /* ... */)
+    {
+        $args = func_get_args();
+        $args = array_slice($args, 3);
+        $results = [];
+        foreach (self::getPlugins($type, $context) as $plugin) {
+            $results[] = call_user_func_array([$plugin, $method], $args);
+        }
+        return $results;
+    }
+
+    /**
+    * Generates a URL which can be shown in user interfaces
+    * @param StudIPPlugin|string $plugin - the plugin to which should be linked
+    * @param array $params - an array with name value pairs
+    * @param string $cmd - command to execute by clicking the link
+    * @param bool $ignore_registered_params do not add registered params
+    * @return string a link to the current plugin with the additional $params
+    */
+    public static function getURL($plugin, $params = [], $cmd = 'show', $ignore_registered_params = false)
+    {
+        if (is_null($plugin)) {
+            throw new InvalidArgumentException(_('Es wurde kein Plugin gewählt.'));
+        } else if (is_object($plugin)) {
+            $plugin = mb_strtolower(get_class($plugin)) . '/' . $cmd;
+        } else if (mb_strpos($plugin, '/') === false) {
+            $plugin = $plugin . '/' . $cmd;
+        }
+
+        return URLHelper::getURL('plugins.php/' . $plugin, $params, $ignore_registered_params);
+    }
+
+    /**
+    * Generates a link (entity encoded URL) which can be shown in user interfaces
+    * @param StudIPPlugin|string $plugin - the plugin to which should be linked
+    * @param array $params - an array with name value pairs
+    * @param string $cmd - command to execute by clicking the link
+    * @param bool $ignore_registered_params do not add registeredparams
+    * @return string a link to the current plugin with the additional $params
+    */
+    public static function getLink($plugin, $params = [], $cmd = 'show', $ignore_registered_params = false)
+    {
+        return htmlReady(self::getURL($plugin, $params, $cmd, $ignore_registered_params));
+    }
+}
diff --git a/lib/plugins/engine/PluginManager.class.php b/lib/plugins/engine/PluginManager.class.php
deleted file mode 100644
index 7e36fa0..0000000
--- a/lib/plugins/engine/PluginManager.class.php
+++ /dev/null
@@ -1,719 +0,0 @@
-<?php
-/**
- * PluginManager.class.php - plugin manager for Stud.IP
- *
- * @copyright  2009  Elmar Ludwig
- * @license GPL2 or any later version
- *
- * @template P of StudIPPlugin
- */
-
-class PluginManager
-{
-    /**
-     * meta data of installed plugins
-     */
-    private $plugins;
-
-    /**
-     * cache of created plugin instances
-     */
-    private $plugin_cache;
-
-    /**
-     * cache of activated plugins by context
-     */
-    private $plugins_activated_cache;
-
-    /**
-     * Returns the PluginManager singleton instance.
-     */
-    public static function getInstance ()
-    {
-        static $instance;
-
-        if (isset($instance)) {
-            return $instance;
-        }
-
-        return $instance = new PluginManager();
-    }
-
-    /**
-     * Initialize a new PluginManager instance.
-     */
-    private function __construct ()
-    {
-        $this->readPluginInfos();
-        $this->plugin_cache = [];
-
-        $this->plugins_activated_cache = new StudipCachedArray('/PluginActivations');
-    }
-
-    /**
-     * Comparison function used to order plugins by position.
-     */
-    private static function positionCompare ($plugin1, $plugin2)
-    {
-        return $plugin1['position'] - $plugin2['position'];
-    }
-
-    /**
-     * Read meta data for all plugins registered in the data base.
-     */
-    private function readPluginInfos ()
-    {
-        $db = DBManager::get();
-        $this->plugins = [];
-
-        $result = $db->query('SELECT * FROM plugins ORDER BY pluginname');
-
-        foreach ($result as $plugin) {
-            $id = (int) $plugin['pluginid'];
-
-            $this->plugins[$id] = [
-                'id'                      => $id,
-                'name'                    => $plugin['pluginname'],
-                'class'                   => $plugin['pluginclassname'],
-                'path'                    => $plugin['pluginpath'],
-                'type'                    => explode(',', $plugin['plugintype']),
-                'enabled'                 => $plugin['enabled'] === 'yes',
-                'position'                => $plugin['navigationpos'],
-                'depends'                 => (int) $plugin['dependentonid'],
-                'core'                    => $plugin['pluginpath'] === '',
-                'automatic_update_url'    => $plugin['automatic_update_url'],
-                'automatic_update_secret' => $plugin['automatic_update_secret'],
-                'description'             => $plugin['description'],
-                'description_mode'        => $plugin['description_mode'] ?? null,
-                'highlight_until'         => $plugin['highlight_until'] ?? null,
-                'highlight_text'          => $plugin['highlight_text'] ?? null,
-            ];
-        }
-    }
-
-    /**
-     * @addtogroup notifications
-     *
-     * Enabling or disabling a plugin triggers a PluginDidEnable or
-     * respectively PluginDidDisable notification. The plugin's ID
-     * is transmitted as subject of the notification.
-     */
-    /**
-     * Set the enabled/disabled status of the given plugin.
-     *
-     * If the plugin implements the method "onEnable" or "onDisable", this
-     * method will be called accordingly. If the method returns false or
-     * throws and exception, the plugin's activation state is not updated.
-     *
-     * @param int $id        id of the plugin
-     * @param bool   $enabled   plugin status (true or false)
-     * @param bool   $force     force (de)activation regardless of the result
-     *                           of on(en|dis)able
-     * @return bool  indicating whether the plugin was updated or null if the
-     *               passed state equals the current state or if the plugin is
-     *               missing.
-     */
-    public function setPluginEnabled ($id, $enabled, $force = false)
-    {
-        $info = $this->getPluginInfoById($id);
-        $plugin_class = null;
-
-        // Plugin is not present or no changes
-        if (!$info || $info['enabled'] == $enabled) {
-            return null;
-        }
-
-        if ($info['core'] || !$this->isPluginsDisabled()) {
-            $plugin_class = $this->loadPlugin($info['class'], $info['path']);
-        }
-
-        if ($plugin_class) {
-            $method = $enabled ? 'onEnable' : 'onDisable';
-            $result = $plugin_class->getMethod($method)->invoke(null, $id);
-
-            // if callback returns false, don't enable or disable the plugin
-            if ($result === false && !$force) {
-                return false;
-            }
-        }
-
-        // Update plugin
-        $state = $enabled ? 'yes' : 'no';
-
-        $query = "UPDATE plugins SET enabled = ? WHERE pluginid = ?";
-        DBManager::get()->execute($query, [$state, $id]);
-
-        $this->plugins[$id]['enabled'] = (boolean) $enabled;
-
-        NotificationCenter::postNotification(
-            $enabled ? 'PluginDidEnable' : 'PluginDidDisable',
-            $id
-        );
-
-        return true;
-    }
-
-    /**
-     * Set the navigation position of the given plugin.
-     *
-     * @param int $id id of the plugin
-     * @param int $position plugin navigation position
-     * @return bool indicating whether any change occured
-     */
-    public function setPluginPosition ($id, $position)
-    {
-        $info = $this->getPluginInfoById($id);
-        $position = (int) $position;
-
-        if (!$info || $info['position'] == $position) {
-            return false;
-        }
-
-        $query = "UPDATE plugins SET navigationpos = ? WHERE pluginid = ?";
-        DBManager::get()->execute($query, [$position, $id]);
-
-        $this->plugins[$id]['position'] = $position;
-        $this->readPluginInfos();
-
-        return true;
-    }
-
-    /**
-     * Get the activation status of a plugin in the given context.
-     * This also checks the plugin default activations and sem_class-settings.
-     *
-     * @param int $id  id of the plugin
-     * @param string $context range id
-     * @returns bool
-     */
-    public function isPluginActivated ($id, $context)
-    {
-        if (!$context) {
-            return null;
-        }
-        if (!isset($this->plugins_activated_cache[$context])) {
-            $query = "SELECT plugin_id, 1 as state
-                      FROM tools_activated
-                      WHERE range_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$context]);
-            $this->plugins_activated_cache[$context] = $statement->fetchGrouped(PDO::FETCH_COLUMN);
-        }
-        return isset($this->plugins_activated_cache[$context][$id]);
-    }
-
-    /**
-     * Get the activation status of a plugin for the given user.
-     * This also checks the plugin default activations and sem_class-settings.
-     *
-     * @param int $pluginId id of the plugin
-     * @param string $userId id of the user
-     */
-    public function isPluginActivatedForUser($pluginId, $userId)
-    {
-        if (!$userId) {
-            $userId = $GLOBALS['user']->id;
-        }
-        if (!isset($this->plugins_activated_cache[$userId])) {
-            $query = "SELECT pluginid, state
-                      FROM plugins_activated
-                      WHERE range_type = 'user'
-                        AND range_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([$userId]);
-            $this->plugins_activated_cache[$userId] = $statement->fetchGrouped(PDO::FETCH_COLUMN);
-        }
-        $state = $this->plugins_activated_cache[$userId][$pluginId] ?? null;
-        if ($state === null) {
-            $activated = (bool) Config::get()->HOMEPAGEPLUGIN_DEFAULT_ACTIVATION;
-        } else {
-            $activated = (bool) $state;
-        }
-
-        return $activated;
-    }
-
-    /**
-     * Sets the activation status of a plugin in the given context.
-     *
-     * @param int $id id of the plugin
-     * @param string $rangeId context range id
-     * @param bool $active plugin status (true or false)
-     */
-    public function setPluginActivated ($id, $rangeId, $active)
-    {
-        unset($this->plugins_activated_cache[$rangeId]);
-        $activation = ToolActivation::find([$rangeId, $id]);
-        if (!$activation) {
-            $range = get_object_by_range_id($rangeId);
-            $activation = new ToolActivation();
-            $activation->range_id = $rangeId;
-            $activation->plugin_id = $id;
-            $activation->range_type = $range->getRangeType();
-        }
-        $plugin = $this->getPluginById($id);
-
-        if ($active) {
-            call_user_func([get_class($plugin), 'onActivation'], $id, $rangeId);
-            StudipLog::log('PLUGIN_ENABLE', $rangeId, $id, User::findCurrent()->id);
-            NotificationCenter::postNotification('PluginDidActivate', $rangeId, $id);
-            return $activation->store();
-        } else {
-            call_user_func([get_class($plugin), 'onDeactivation'], $id, $rangeId);
-            StudipLog::log('PLUGIN_DISABLE', $rangeId, $id, User::findCurrent()->id);
-            NotificationCenter::postNotification('PluginDidDeactivate', $rangeId, $id);
-            return $activation->delete();
-        }
-    }
-
-    /**
-     * Sets the activation status of a plugin in the given context.
-     *
-     * @param int $pluginid id of the plugin
-     * @param string $user_id user id
-     * @param bool $active plugin status (true or false)
-     */
-    public function setPluginActivatedForUser($pluginid, $user_id, $active)
-    {
-        $db = DBManager::get();
-        $state = $active ? 1 : 0;
-        unset($this->plugins_activated_cache[$user_id]);
-
-        $query = "REPLACE INTO plugins_activated (pluginid, range_type, range_id, state)
-                  VALUES (?, 'user', ?, ?)";
-        $result = $db->execute($query, [$pluginid, $user_id, $state]);
-
-        if ($result > 0) {
-            $plugin = $this->getPluginById($pluginid);
-            if ($active) {
-                call_user_func([get_class($plugin), 'onActivation'], $pluginid, $user_id);
-            } else {
-                call_user_func([get_class($plugin), 'onDeactivation'], $pluginid, $user_id);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Deactivate all plugins for the given range.
-     *
-     * @param  string $range_type Type of range (sem, inst or user)
-     * @param  string $range_id   Id of range
-     * @return int number of deactivated/removed plugins for range
-     */
-    public function deactivateAllPluginsForRange($range_type, $range_id)
-    {
-        unset($this->plugins_activated_cache[$range_id]);
-
-        $query = "DELETE FROM `plugins_activated`
-                  WHERE `range_type` = :range_type
-                    AND `range_id` = :range_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':range_type', $range_type);
-        $statement->bindValue(':range_id', $range_id);
-        $statement->execute();
-
-        return $statement->rowCount();
-    }
-
-    /**
-     * Disable loading of all non-core plugins for the current session.
-     *
-     * @param bool $status true: disable non-core plugins
-     */
-    public function setPluginsDisabled($status)
-    {
-        $_SESSION['plugins_disabled'] = (bool) $status;
-    }
-
-    /**
-     * Check whether loading of non-core plugins is currently disabled.
-     */
-    public function isPluginsDisabled()
-    {
-        return $_SESSION['plugins_disabled'] ?? false;
-    }
-
-    /**
-     * Load a plugin class from the given file system path and
-     * return the ReflectionClass instance for the plugin.
-     *
-     * @param string $class plugin class name
-     * @param string $path plugin relative path
-     */
-    private function loadPlugin ($class, $path)
-    {
-        if ($path) {
-            $basepath = Config::get()->PLUGINS_PATH;
-        } else {
-            $basepath = $GLOBALS['STUDIP_BASE_PATH'];
-            $path = 'lib/modules';
-        }
-
-        $pluginfile = $basepath.'/'.$path.'/'.$class.'.class.php';
-
-        if (!file_exists($pluginfile)) {
-            $pluginfile = $basepath.'/'.$path.'/'.$class.'.php';
-
-            if (!file_exists($pluginfile)) {
-                return null;
-            }
-        }
-
-        require_once $pluginfile;
-
-        return new ReflectionClass($class);
-    }
-
-    /**
-     * Determine the type of a plugin to be installed.
-     *
-     * @param string $class plugin class name
-     * @param string $path plugin relative path
-     */
-    private function getPluginType ($class, $path)
-    {
-        $plugin_class = $this->loadPlugin($class, $path);
-        $types = [];
-
-        if ($plugin_class) {
-            $plugin_base = new ReflectionClass('StudIPPlugin');
-            $interfaces = $plugin_class->getInterfaces();
-
-            if ($plugin_class->isSubclassOf($plugin_base)) {
-                foreach ($interfaces as $interface) {
-                    $types[] = $interface->getName();
-                }
-            }
-        }
-
-        sort($types);
-
-        return $types;
-    }
-
-    /**
-     * Register a new plugin or update an existing plugin entry in the
-     * data base. Returns the id of the new or updated plugin.
-     *
-     * @param string $name      plugin name
-     * @param string $class     plugin class name
-     * @param string $path      plugin relative path
-     * @param int $depends   id of plugin this plugin depends on
-     */
-    public function registerPlugin ($name, $class, $path, $depends = null)
-    {
-        $db = DBManager::get();
-        $info = $this->getPluginInfo($class);
-        $type = $this->getPluginType($class, $path);
-        $position = 1;
-
-        // plugin must implement at least one interface
-        if (count($type) == 0) {
-            throw new Exception(_("Plugin implementiert kein gültiges Interface."));
-        }
-
-        if ($info) {
-            $id = $info['id'];
-            $sql = 'UPDATE plugins SET pluginname = ?, pluginpath = ?,
-                                       plugintype = ? WHERE pluginid = ?';
-            $stmt = $db->prepare($sql);
-            $stmt->execute([$name, $path, join(',', $type), $id]);
-
-            $this->plugins[$id]['name'] = $name;
-            $this->plugins[$id]['path'] = $path;
-            $this->plugins[$id]['type'] = $type;
-        } else {
-            foreach ($this->plugins as $plugin) {
-                $common_types = array_intersect($type, $plugin['type']);
-
-                if (count($common_types) > 0 && $plugin['position'] >= $position) {
-                    $position = $plugin['position'] + 1;
-                }
-            }
-
-            $sql = 'INSERT INTO plugins (
-                    pluginname, pluginclassname, pluginpath,
-                    plugintype, navigationpos, dependentonid
-                ) VALUES (?,?,?,?,?,?)';
-            $stmt = $db->prepare($sql);
-            $stmt->execute([$name, $class, $path, join(',', $type), $position, $depends]);
-            $id = $db->lastInsertId();
-
-            $this->plugins[$id] = [
-                'id'          => $id,
-                'name'        => $name,
-                'class'       => $class,
-                'path'        => $path,
-                'type'        => $type,
-                'enabled'     => false,
-                'position'    => $position,
-                'depends'     => $depends
-            ];
-
-            $this->readPluginInfos();
-
-            $db->exec("INSERT INTO roles_plugins (roleid, pluginid)
-                   SELECT roleid, $id FROM roles WHERE `system` = 'y' AND rolename != 'Nobody'");
-        }
-
-        if (!in_array(StandardPlugin::class, $type)) {
-            ToolActivation::findEachBySQL(
-                function (ToolActivation $activation) use ($id) {
-                    $this->setPluginActivated($id, $activation->range_id, false);
-                },
-                'plugin_id = ?',
-                [$id]
-            );
-        }
-
-        return $id;
-    }
-
-    /**
-     * Remove registration for the given plugin from the data base.
-     *
-     * @param int $id id of the plugin
-     */
-    public function unregisterPlugin ($id)
-    {
-        $info = $this->getPluginInfoById($id);
-
-        if ($info) {
-            $db = DBManager::get();
-
-            $db->execute("DELETE FROM plugins WHERE pluginid = ?", [$id]);
-            $db->execute("DELETE FROM plugins_activated WHERE pluginid = ?", [$id]);
-            $db->execute("DELETE FROM roles_plugins WHERE pluginid = ?", [$id]);
-
-            unset($this->plugins[$id]);
-
-            unset($this->plugins_activated_cache[$id]);
-        }
-    }
-
-    /**
-     * Get meta data for the plugin specified by plugin class name.
-     *
-     * @param string $class class name of plugin
-     */
-    public function getPluginInfo ($class)
-    {
-        foreach ($this->plugins as $plugin) {
-            if (strcasecmp($plugin['class'], $class) == 0) {
-                return $plugin;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get meta data for the plugin specified by plugin id.
-     *
-     * @param int $id id of the plugin
-     */
-    public function getPluginInfoById ($id)
-    {
-        if (isset($this->plugins[$id])) {
-            return $this->plugins[$id];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get meta data for all plugins of the specified type. A type of null
-     * returns meta data for all installed plugins.
-     *
-     * @param string $type plugin type or null (all types)
-     */
-    public function getPluginInfos ($type = null)
-    {
-        $result = [];
-
-        foreach ($this->plugins as $id => $plugin) {
-            if ($type === null || in_array($type, $plugin['type'])) {
-                $result[$id] = $plugin;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Check user access permission for the given plugin.
-     *
-     * @param array $plugin plugin meta data
-     * @param string $user_id id of user
-     * @return bool
-     */
-    protected function checkUserAccess ($plugin, $user_id)
-    {
-        if (!$plugin['enabled']) {
-            return false;
-        }
-
-        $plugin_roles = RolePersistence::getAssignedPluginRoles($plugin['id']);
-        $user_roles = RolePersistence::getAssignedRoles($user_id, true);
-
-        foreach ($plugin_roles as $plugin_role) {
-            foreach ($user_roles as $user_role) {
-                if ($plugin_role->getRoleid() === $user_role->getRoleid()) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get instance of the plugin specified by plugin meta data.
-     *
-     * @param array $plugin_info plugin meta data
-     * @return P
-     */
-    protected function getCachedPlugin ($plugin_info)
-    {
-        $class = $plugin_info['class'];
-        $path  = $plugin_info['path'];
-        $plugin_class = '';
-        $plugin = null;
-
-        if (isset($this->plugin_cache[$class])) {
-            return $this->plugin_cache[$class];
-        }
-
-        if ($plugin_info['core'] || !$this->isPluginsDisabled()) {
-            $plugin_class = $this->loadPlugin($class, $path);
-        }
-
-        if ($plugin_class) {
-            $plugin = app()->get($class);
-        }
-
-        return $this->plugin_cache[$class] = $plugin;
-    }
-
-    /**
-     * Get instance of the plugin specified by plugin class name.
-     *
-     * @param class-string<P> $class class name of plugin
-     * @return P|null
-     */
-    public function getPlugin ($class)
-    {
-        $user = $GLOBALS['user']->id;
-        $plugin_info = $this->getPluginInfo($class);
-        $plugin = null;
-
-        if (isset($plugin_info) && $this->checkUserAccess($plugin_info, $user)) {
-            $plugin = $this->getCachedPlugin($plugin_info);
-        }
-
-        return $plugin;
-    }
-
-    /**
-     * Get instance of the plugin specified by plugin id.
-     *
-     * @param int $id id of the plugin
-     * @return P|null $plugin
-     */
-    public function getPluginById ($id)
-    {
-        $user = $GLOBALS['user']->id;
-        $plugin_info = $this->getPluginInfoById($id);
-        $plugin = null;
-
-        if (isset($plugin_info) && $this->checkUserAccess($plugin_info, $user)) {
-            $plugin = $this->getCachedPlugin($plugin_info);
-        }
-
-        return $plugin;
-    }
-
-    /**
-     * Get instances of all plugins of the specified type. A type of null
-     * returns all enabled plugins. The optional context parameter can be
-     * used to get only plugins that are activated in the given context.
-     *
-     * @param class-string<P>|null $type plugin type or null (all types)
-     * @param string $context context range id (optional)
-     * @return P[]|StudIPPlugin[]
-     */
-    public function getPlugins ($type, $context = null)
-    {
-        $user = isset($GLOBALS['user']) ? $GLOBALS['user']->id : 'nobody';
-        $plugin_info = $this->getPluginInfos($type);
-        $plugins = [];
-
-        usort($plugin_info, [self::class, 'positionCompare']);
-
-        foreach ($plugin_info as $info) {
-            $activated = $context == null
-                || $this->isPluginActivated($info['id'], $context);
-
-            if ($this->checkUserAccess($info, $user) && $activated) {
-                $plugin = $this->getCachedPlugin($info);
-
-                if ($plugin !== null) {
-                    $plugins[] = $plugin;
-                }
-            }
-        }
-
-        return $plugins;
-    }
-
-    /**
-     * Read the manifest of the plugin in the given directory.
-     * Returns null if the manifest cannot be found.
-     *
-     * @return array    containing the manifest information
-     */
-    public function getPluginManifest($plugindir)
-    {
-        if (!file_exists($plugindir . '/plugin.manifest')) {
-            return null;
-        }
-        $manifest = file($plugindir . '/plugin.manifest');
-        $result = [];
-
-        if ($manifest === false) {
-            return null;
-        }
-
-        foreach ($manifest as $line) {
-            $key_and_value = explode('=', $line);
-            $key = trim($key_and_value[0]);
-            $value = trim($key_and_value[1] ?? '');
-
-            // skip empty lines and comments
-            if ($key === '' || $key[0] === '#') {
-                continue;
-            }
-
-            $key_array = explode('.',$key,2);
-            if(count($key_array) > 1){
-                if($key_array[0] === 'screenshots'){
-                    $screenshot_data['source'] = $key_array[1];
-                    $screenshot_data['title'] = $value;
-                    $result['screenshots']['pictures'][] = $screenshot_data;
-                }
-            } elseif($key === 'screenshots') {
-                $result['screenshots']['path'] = $value;
-            } elseif ($key === 'pluginclassname' && isset($result[$key])) {
-                $result['additionalclasses'][] = $value;
-            } elseif ($key === 'screenshot' && isset($result[$key])) {
-                $result['additionalscreenshots'][] = $value;
-            } else {
-                $result[$key] = $value;
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/plugins/engine/PluginManager.php b/lib/plugins/engine/PluginManager.php
new file mode 100644
index 0000000..7e36fa0
--- /dev/null
+++ b/lib/plugins/engine/PluginManager.php
@@ -0,0 +1,719 @@
+<?php
+/**
+ * PluginManager.class.php - plugin manager for Stud.IP
+ *
+ * @copyright  2009  Elmar Ludwig
+ * @license GPL2 or any later version
+ *
+ * @template P of StudIPPlugin
+ */
+
+class PluginManager
+{
+    /**
+     * meta data of installed plugins
+     */
+    private $plugins;
+
+    /**
+     * cache of created plugin instances
+     */
+    private $plugin_cache;
+
+    /**
+     * cache of activated plugins by context
+     */
+    private $plugins_activated_cache;
+
+    /**
+     * Returns the PluginManager singleton instance.
+     */
+    public static function getInstance ()
+    {
+        static $instance;
+
+        if (isset($instance)) {
+            return $instance;
+        }
+
+        return $instance = new PluginManager();
+    }
+
+    /**
+     * Initialize a new PluginManager instance.
+     */
+    private function __construct ()
+    {
+        $this->readPluginInfos();
+        $this->plugin_cache = [];
+
+        $this->plugins_activated_cache = new StudipCachedArray('/PluginActivations');
+    }
+
+    /**
+     * Comparison function used to order plugins by position.
+     */
+    private static function positionCompare ($plugin1, $plugin2)
+    {
+        return $plugin1['position'] - $plugin2['position'];
+    }
+
+    /**
+     * Read meta data for all plugins registered in the data base.
+     */
+    private function readPluginInfos ()
+    {
+        $db = DBManager::get();
+        $this->plugins = [];
+
+        $result = $db->query('SELECT * FROM plugins ORDER BY pluginname');
+
+        foreach ($result as $plugin) {
+            $id = (int) $plugin['pluginid'];
+
+            $this->plugins[$id] = [
+                'id'                      => $id,
+                'name'                    => $plugin['pluginname'],
+                'class'                   => $plugin['pluginclassname'],
+                'path'                    => $plugin['pluginpath'],
+                'type'                    => explode(',', $plugin['plugintype']),
+                'enabled'                 => $plugin['enabled'] === 'yes',
+                'position'                => $plugin['navigationpos'],
+                'depends'                 => (int) $plugin['dependentonid'],
+                'core'                    => $plugin['pluginpath'] === '',
+                'automatic_update_url'    => $plugin['automatic_update_url'],
+                'automatic_update_secret' => $plugin['automatic_update_secret'],
+                'description'             => $plugin['description'],
+                'description_mode'        => $plugin['description_mode'] ?? null,
+                'highlight_until'         => $plugin['highlight_until'] ?? null,
+                'highlight_text'          => $plugin['highlight_text'] ?? null,
+            ];
+        }
+    }
+
+    /**
+     * @addtogroup notifications
+     *
+     * Enabling or disabling a plugin triggers a PluginDidEnable or
+     * respectively PluginDidDisable notification. The plugin's ID
+     * is transmitted as subject of the notification.
+     */
+    /**
+     * Set the enabled/disabled status of the given plugin.
+     *
+     * If the plugin implements the method "onEnable" or "onDisable", this
+     * method will be called accordingly. If the method returns false or
+     * throws and exception, the plugin's activation state is not updated.
+     *
+     * @param int $id        id of the plugin
+     * @param bool   $enabled   plugin status (true or false)
+     * @param bool   $force     force (de)activation regardless of the result
+     *                           of on(en|dis)able
+     * @return bool  indicating whether the plugin was updated or null if the
+     *               passed state equals the current state or if the plugin is
+     *               missing.
+     */
+    public function setPluginEnabled ($id, $enabled, $force = false)
+    {
+        $info = $this->getPluginInfoById($id);
+        $plugin_class = null;
+
+        // Plugin is not present or no changes
+        if (!$info || $info['enabled'] == $enabled) {
+            return null;
+        }
+
+        if ($info['core'] || !$this->isPluginsDisabled()) {
+            $plugin_class = $this->loadPlugin($info['class'], $info['path']);
+        }
+
+        if ($plugin_class) {
+            $method = $enabled ? 'onEnable' : 'onDisable';
+            $result = $plugin_class->getMethod($method)->invoke(null, $id);
+
+            // if callback returns false, don't enable or disable the plugin
+            if ($result === false && !$force) {
+                return false;
+            }
+        }
+
+        // Update plugin
+        $state = $enabled ? 'yes' : 'no';
+
+        $query = "UPDATE plugins SET enabled = ? WHERE pluginid = ?";
+        DBManager::get()->execute($query, [$state, $id]);
+
+        $this->plugins[$id]['enabled'] = (boolean) $enabled;
+
+        NotificationCenter::postNotification(
+            $enabled ? 'PluginDidEnable' : 'PluginDidDisable',
+            $id
+        );
+
+        return true;
+    }
+
+    /**
+     * Set the navigation position of the given plugin.
+     *
+     * @param int $id id of the plugin
+     * @param int $position plugin navigation position
+     * @return bool indicating whether any change occured
+     */
+    public function setPluginPosition ($id, $position)
+    {
+        $info = $this->getPluginInfoById($id);
+        $position = (int) $position;
+
+        if (!$info || $info['position'] == $position) {
+            return false;
+        }
+
+        $query = "UPDATE plugins SET navigationpos = ? WHERE pluginid = ?";
+        DBManager::get()->execute($query, [$position, $id]);
+
+        $this->plugins[$id]['position'] = $position;
+        $this->readPluginInfos();
+
+        return true;
+    }
+
+    /**
+     * Get the activation status of a plugin in the given context.
+     * This also checks the plugin default activations and sem_class-settings.
+     *
+     * @param int $id  id of the plugin
+     * @param string $context range id
+     * @returns bool
+     */
+    public function isPluginActivated ($id, $context)
+    {
+        if (!$context) {
+            return null;
+        }
+        if (!isset($this->plugins_activated_cache[$context])) {
+            $query = "SELECT plugin_id, 1 as state
+                      FROM tools_activated
+                      WHERE range_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$context]);
+            $this->plugins_activated_cache[$context] = $statement->fetchGrouped(PDO::FETCH_COLUMN);
+        }
+        return isset($this->plugins_activated_cache[$context][$id]);
+    }
+
+    /**
+     * Get the activation status of a plugin for the given user.
+     * This also checks the plugin default activations and sem_class-settings.
+     *
+     * @param int $pluginId id of the plugin
+     * @param string $userId id of the user
+     */
+    public function isPluginActivatedForUser($pluginId, $userId)
+    {
+        if (!$userId) {
+            $userId = $GLOBALS['user']->id;
+        }
+        if (!isset($this->plugins_activated_cache[$userId])) {
+            $query = "SELECT pluginid, state
+                      FROM plugins_activated
+                      WHERE range_type = 'user'
+                        AND range_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([$userId]);
+            $this->plugins_activated_cache[$userId] = $statement->fetchGrouped(PDO::FETCH_COLUMN);
+        }
+        $state = $this->plugins_activated_cache[$userId][$pluginId] ?? null;
+        if ($state === null) {
+            $activated = (bool) Config::get()->HOMEPAGEPLUGIN_DEFAULT_ACTIVATION;
+        } else {
+            $activated = (bool) $state;
+        }
+
+        return $activated;
+    }
+
+    /**
+     * Sets the activation status of a plugin in the given context.
+     *
+     * @param int $id id of the plugin
+     * @param string $rangeId context range id
+     * @param bool $active plugin status (true or false)
+     */
+    public function setPluginActivated ($id, $rangeId, $active)
+    {
+        unset($this->plugins_activated_cache[$rangeId]);
+        $activation = ToolActivation::find([$rangeId, $id]);
+        if (!$activation) {
+            $range = get_object_by_range_id($rangeId);
+            $activation = new ToolActivation();
+            $activation->range_id = $rangeId;
+            $activation->plugin_id = $id;
+            $activation->range_type = $range->getRangeType();
+        }
+        $plugin = $this->getPluginById($id);
+
+        if ($active) {
+            call_user_func([get_class($plugin), 'onActivation'], $id, $rangeId);
+            StudipLog::log('PLUGIN_ENABLE', $rangeId, $id, User::findCurrent()->id);
+            NotificationCenter::postNotification('PluginDidActivate', $rangeId, $id);
+            return $activation->store();
+        } else {
+            call_user_func([get_class($plugin), 'onDeactivation'], $id, $rangeId);
+            StudipLog::log('PLUGIN_DISABLE', $rangeId, $id, User::findCurrent()->id);
+            NotificationCenter::postNotification('PluginDidDeactivate', $rangeId, $id);
+            return $activation->delete();
+        }
+    }
+
+    /**
+     * Sets the activation status of a plugin in the given context.
+     *
+     * @param int $pluginid id of the plugin
+     * @param string $user_id user id
+     * @param bool $active plugin status (true or false)
+     */
+    public function setPluginActivatedForUser($pluginid, $user_id, $active)
+    {
+        $db = DBManager::get();
+        $state = $active ? 1 : 0;
+        unset($this->plugins_activated_cache[$user_id]);
+
+        $query = "REPLACE INTO plugins_activated (pluginid, range_type, range_id, state)
+                  VALUES (?, 'user', ?, ?)";
+        $result = $db->execute($query, [$pluginid, $user_id, $state]);
+
+        if ($result > 0) {
+            $plugin = $this->getPluginById($pluginid);
+            if ($active) {
+                call_user_func([get_class($plugin), 'onActivation'], $pluginid, $user_id);
+            } else {
+                call_user_func([get_class($plugin), 'onDeactivation'], $pluginid, $user_id);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deactivate all plugins for the given range.
+     *
+     * @param  string $range_type Type of range (sem, inst or user)
+     * @param  string $range_id   Id of range
+     * @return int number of deactivated/removed plugins for range
+     */
+    public function deactivateAllPluginsForRange($range_type, $range_id)
+    {
+        unset($this->plugins_activated_cache[$range_id]);
+
+        $query = "DELETE FROM `plugins_activated`
+                  WHERE `range_type` = :range_type
+                    AND `range_id` = :range_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':range_type', $range_type);
+        $statement->bindValue(':range_id', $range_id);
+        $statement->execute();
+
+        return $statement->rowCount();
+    }
+
+    /**
+     * Disable loading of all non-core plugins for the current session.
+     *
+     * @param bool $status true: disable non-core plugins
+     */
+    public function setPluginsDisabled($status)
+    {
+        $_SESSION['plugins_disabled'] = (bool) $status;
+    }
+
+    /**
+     * Check whether loading of non-core plugins is currently disabled.
+     */
+    public function isPluginsDisabled()
+    {
+        return $_SESSION['plugins_disabled'] ?? false;
+    }
+
+    /**
+     * Load a plugin class from the given file system path and
+     * return the ReflectionClass instance for the plugin.
+     *
+     * @param string $class plugin class name
+     * @param string $path plugin relative path
+     */
+    private function loadPlugin ($class, $path)
+    {
+        if ($path) {
+            $basepath = Config::get()->PLUGINS_PATH;
+        } else {
+            $basepath = $GLOBALS['STUDIP_BASE_PATH'];
+            $path = 'lib/modules';
+        }
+
+        $pluginfile = $basepath.'/'.$path.'/'.$class.'.class.php';
+
+        if (!file_exists($pluginfile)) {
+            $pluginfile = $basepath.'/'.$path.'/'.$class.'.php';
+
+            if (!file_exists($pluginfile)) {
+                return null;
+            }
+        }
+
+        require_once $pluginfile;
+
+        return new ReflectionClass($class);
+    }
+
+    /**
+     * Determine the type of a plugin to be installed.
+     *
+     * @param string $class plugin class name
+     * @param string $path plugin relative path
+     */
+    private function getPluginType ($class, $path)
+    {
+        $plugin_class = $this->loadPlugin($class, $path);
+        $types = [];
+
+        if ($plugin_class) {
+            $plugin_base = new ReflectionClass('StudIPPlugin');
+            $interfaces = $plugin_class->getInterfaces();
+
+            if ($plugin_class->isSubclassOf($plugin_base)) {
+                foreach ($interfaces as $interface) {
+                    $types[] = $interface->getName();
+                }
+            }
+        }
+
+        sort($types);
+
+        return $types;
+    }
+
+    /**
+     * Register a new plugin or update an existing plugin entry in the
+     * data base. Returns the id of the new or updated plugin.
+     *
+     * @param string $name      plugin name
+     * @param string $class     plugin class name
+     * @param string $path      plugin relative path
+     * @param int $depends   id of plugin this plugin depends on
+     */
+    public function registerPlugin ($name, $class, $path, $depends = null)
+    {
+        $db = DBManager::get();
+        $info = $this->getPluginInfo($class);
+        $type = $this->getPluginType($class, $path);
+        $position = 1;
+
+        // plugin must implement at least one interface
+        if (count($type) == 0) {
+            throw new Exception(_("Plugin implementiert kein gültiges Interface."));
+        }
+
+        if ($info) {
+            $id = $info['id'];
+            $sql = 'UPDATE plugins SET pluginname = ?, pluginpath = ?,
+                                       plugintype = ? WHERE pluginid = ?';
+            $stmt = $db->prepare($sql);
+            $stmt->execute([$name, $path, join(',', $type), $id]);
+
+            $this->plugins[$id]['name'] = $name;
+            $this->plugins[$id]['path'] = $path;
+            $this->plugins[$id]['type'] = $type;
+        } else {
+            foreach ($this->plugins as $plugin) {
+                $common_types = array_intersect($type, $plugin['type']);
+
+                if (count($common_types) > 0 && $plugin['position'] >= $position) {
+                    $position = $plugin['position'] + 1;
+                }
+            }
+
+            $sql = 'INSERT INTO plugins (
+                    pluginname, pluginclassname, pluginpath,
+                    plugintype, navigationpos, dependentonid
+                ) VALUES (?,?,?,?,?,?)';
+            $stmt = $db->prepare($sql);
+            $stmt->execute([$name, $class, $path, join(',', $type), $position, $depends]);
+            $id = $db->lastInsertId();
+
+            $this->plugins[$id] = [
+                'id'          => $id,
+                'name'        => $name,
+                'class'       => $class,
+                'path'        => $path,
+                'type'        => $type,
+                'enabled'     => false,
+                'position'    => $position,
+                'depends'     => $depends
+            ];
+
+            $this->readPluginInfos();
+
+            $db->exec("INSERT INTO roles_plugins (roleid, pluginid)
+                   SELECT roleid, $id FROM roles WHERE `system` = 'y' AND rolename != 'Nobody'");
+        }
+
+        if (!in_array(StandardPlugin::class, $type)) {
+            ToolActivation::findEachBySQL(
+                function (ToolActivation $activation) use ($id) {
+                    $this->setPluginActivated($id, $activation->range_id, false);
+                },
+                'plugin_id = ?',
+                [$id]
+            );
+        }
+
+        return $id;
+    }
+
+    /**
+     * Remove registration for the given plugin from the data base.
+     *
+     * @param int $id id of the plugin
+     */
+    public function unregisterPlugin ($id)
+    {
+        $info = $this->getPluginInfoById($id);
+
+        if ($info) {
+            $db = DBManager::get();
+
+            $db->execute("DELETE FROM plugins WHERE pluginid = ?", [$id]);
+            $db->execute("DELETE FROM plugins_activated WHERE pluginid = ?", [$id]);
+            $db->execute("DELETE FROM roles_plugins WHERE pluginid = ?", [$id]);
+
+            unset($this->plugins[$id]);
+
+            unset($this->plugins_activated_cache[$id]);
+        }
+    }
+
+    /**
+     * Get meta data for the plugin specified by plugin class name.
+     *
+     * @param string $class class name of plugin
+     */
+    public function getPluginInfo ($class)
+    {
+        foreach ($this->plugins as $plugin) {
+            if (strcasecmp($plugin['class'], $class) == 0) {
+                return $plugin;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get meta data for the plugin specified by plugin id.
+     *
+     * @param int $id id of the plugin
+     */
+    public function getPluginInfoById ($id)
+    {
+        if (isset($this->plugins[$id])) {
+            return $this->plugins[$id];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get meta data for all plugins of the specified type. A type of null
+     * returns meta data for all installed plugins.
+     *
+     * @param string $type plugin type or null (all types)
+     */
+    public function getPluginInfos ($type = null)
+    {
+        $result = [];
+
+        foreach ($this->plugins as $id => $plugin) {
+            if ($type === null || in_array($type, $plugin['type'])) {
+                $result[$id] = $plugin;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check user access permission for the given plugin.
+     *
+     * @param array $plugin plugin meta data
+     * @param string $user_id id of user
+     * @return bool
+     */
+    protected function checkUserAccess ($plugin, $user_id)
+    {
+        if (!$plugin['enabled']) {
+            return false;
+        }
+
+        $plugin_roles = RolePersistence::getAssignedPluginRoles($plugin['id']);
+        $user_roles = RolePersistence::getAssignedRoles($user_id, true);
+
+        foreach ($plugin_roles as $plugin_role) {
+            foreach ($user_roles as $user_role) {
+                if ($plugin_role->getRoleid() === $user_role->getRoleid()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get instance of the plugin specified by plugin meta data.
+     *
+     * @param array $plugin_info plugin meta data
+     * @return P
+     */
+    protected function getCachedPlugin ($plugin_info)
+    {
+        $class = $plugin_info['class'];
+        $path  = $plugin_info['path'];
+        $plugin_class = '';
+        $plugin = null;
+
+        if (isset($this->plugin_cache[$class])) {
+            return $this->plugin_cache[$class];
+        }
+
+        if ($plugin_info['core'] || !$this->isPluginsDisabled()) {
+            $plugin_class = $this->loadPlugin($class, $path);
+        }
+
+        if ($plugin_class) {
+            $plugin = app()->get($class);
+        }
+
+        return $this->plugin_cache[$class] = $plugin;
+    }
+
+    /**
+     * Get instance of the plugin specified by plugin class name.
+     *
+     * @param class-string<P> $class class name of plugin
+     * @return P|null
+     */
+    public function getPlugin ($class)
+    {
+        $user = $GLOBALS['user']->id;
+        $plugin_info = $this->getPluginInfo($class);
+        $plugin = null;
+
+        if (isset($plugin_info) && $this->checkUserAccess($plugin_info, $user)) {
+            $plugin = $this->getCachedPlugin($plugin_info);
+        }
+
+        return $plugin;
+    }
+
+    /**
+     * Get instance of the plugin specified by plugin id.
+     *
+     * @param int $id id of the plugin
+     * @return P|null $plugin
+     */
+    public function getPluginById ($id)
+    {
+        $user = $GLOBALS['user']->id;
+        $plugin_info = $this->getPluginInfoById($id);
+        $plugin = null;
+
+        if (isset($plugin_info) && $this->checkUserAccess($plugin_info, $user)) {
+            $plugin = $this->getCachedPlugin($plugin_info);
+        }
+
+        return $plugin;
+    }
+
+    /**
+     * Get instances of all plugins of the specified type. A type of null
+     * returns all enabled plugins. The optional context parameter can be
+     * used to get only plugins that are activated in the given context.
+     *
+     * @param class-string<P>|null $type plugin type or null (all types)
+     * @param string $context context range id (optional)
+     * @return P[]|StudIPPlugin[]
+     */
+    public function getPlugins ($type, $context = null)
+    {
+        $user = isset($GLOBALS['user']) ? $GLOBALS['user']->id : 'nobody';
+        $plugin_info = $this->getPluginInfos($type);
+        $plugins = [];
+
+        usort($plugin_info, [self::class, 'positionCompare']);
+
+        foreach ($plugin_info as $info) {
+            $activated = $context == null
+                || $this->isPluginActivated($info['id'], $context);
+
+            if ($this->checkUserAccess($info, $user) && $activated) {
+                $plugin = $this->getCachedPlugin($info);
+
+                if ($plugin !== null) {
+                    $plugins[] = $plugin;
+                }
+            }
+        }
+
+        return $plugins;
+    }
+
+    /**
+     * Read the manifest of the plugin in the given directory.
+     * Returns null if the manifest cannot be found.
+     *
+     * @return array    containing the manifest information
+     */
+    public function getPluginManifest($plugindir)
+    {
+        if (!file_exists($plugindir . '/plugin.manifest')) {
+            return null;
+        }
+        $manifest = file($plugindir . '/plugin.manifest');
+        $result = [];
+
+        if ($manifest === false) {
+            return null;
+        }
+
+        foreach ($manifest as $line) {
+            $key_and_value = explode('=', $line);
+            $key = trim($key_and_value[0]);
+            $value = trim($key_and_value[1] ?? '');
+
+            // skip empty lines and comments
+            if ($key === '' || $key[0] === '#') {
+                continue;
+            }
+
+            $key_array = explode('.',$key,2);
+            if(count($key_array) > 1){
+                if($key_array[0] === 'screenshots'){
+                    $screenshot_data['source'] = $key_array[1];
+                    $screenshot_data['title'] = $value;
+                    $result['screenshots']['pictures'][] = $screenshot_data;
+                }
+            } elseif($key === 'screenshots') {
+                $result['screenshots']['path'] = $value;
+            } elseif ($key === 'pluginclassname' && isset($result[$key])) {
+                $result['additionalclasses'][] = $value;
+            } elseif ($key === 'screenshot' && isset($result[$key])) {
+                $result['additionalscreenshots'][] = $value;
+            } else {
+                $result[$key] = $value;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/plugins/engine/PluginRepository.class.php b/lib/plugins/engine/PluginRepository.class.php
deleted file mode 100644
index 235e9bd..0000000
--- a/lib/plugins/engine/PluginRepository.class.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/*
- * PluginRepository.class.php - query plugin meta data
- *
- * Copyright (c) 2008  Elmar Ludwig
- *
- * 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.
- */
-
-/**
- * Class used to locate plugins available from a plugin repository.
- */
-class PluginRepository
-{
-    /**
-     * list and meta data of available plugins
-     */
-    private $plugins = [];
-
-    /**
-     * Initialize a new PluginRepository and read meta data from
-     * the given URL or the default list of URLs (if $url is null).
-     */
-    public function __construct($url = null)
-    {
-        if (isset($url)) {
-            $this->readMetadata($url);
-        } else {
-            foreach ($GLOBALS['PLUGIN_REPOSITORIES'] as $url) {
-                $this->readMetadata($url);
-            }
-        }
-    }
-
-    /**
-     * Read plugin meta data from the given URL (using XML format).
-     * The structure of the XML is:
-     *
-     * <plugins>
-     *   <plugin name="DummyPlugin"
-     *     <release
-     *           version="2.0"
-     *           url="http://plugins.example.com/dummy-2.0.zip"
-     *           studipMinVersion="1.4"
-     *           studipMaxVersion="1.9">
-     *   </plugin>
-     *   [...]
-     * </plugins>
-     *
-     * @param string $url plugin repository url
-     */
-    public function readMetadata($url)
-    {
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache_key = 'plugin_metadata/'.$url;
-        $metadata = $cache->read($cache_key);
-
-        if ($metadata === false) {
-            // Set small timeout for the rare case that the repository is not
-            // available
-            $context = get_default_http_stream_context($url);
-            stream_context_set_option($context, ['http' => [
-                'timeout' => 5,
-            ]]);
-            $metadata = @file_get_contents($url, false, $context);
-
-            if ($metadata === false) {
-                throw new Exception(sprintf(_('Fehler beim Zugriff auf %s'), $url));
-            }
-
-            $cache->write($cache_key, $metadata, 3600);
-        }
-
-        $xml = new SimpleXMLElement($metadata);
-
-        if (!isset($xml->plugin)) {
-            $cache->expire($cache_key);
-            throw new Exception(_('Keine Plugin Meta-Daten gefunden'));
-        }
-
-        foreach ($xml->plugin as $plugin) {
-            foreach ($plugin->release as $release) {
-                $min_version = trim($release['studipMinVersion']);
-                $max_version = trim($release['studipMaxVersion']);
-
-                if (($min_version && StudipVersion::olderThan($min_version)) ||
-                    ($max_version && StudipVersion::newerThan($max_version))) {
-                    // plugin is not compatible, so skip it
-                    continue;
-                }
-
-                $meta_data = [
-                    'version'         => (string) $release['version'],
-                    'url'             => (string) $release['url'],
-                    'description'     => (string) $plugin['description'],
-                    'plugin_url'      => (string) $plugin['homepage'],
-                    'image'           => (string) $plugin['image'],
-                    'score'           => (float) $plugin['score'],
-                    'marketplace_url' => (string) $plugin['marketplace_url'],
-                ];
-
-                $this->registerPlugin((string) $plugin['name'], $meta_data);
-            }
-        }
-    }
-
-    /**
-     * Register a new plugin in this repository.
-     *
-     * @param string $name plugin name
-     * @param array $meta_data plugin meta data
-     */
-    protected function registerPlugin($name, $meta_data)
-    {
-        $old_data = $this->plugins[$name] ?? null;
-
-        if (!isset($old_data) ||
-            version_compare($meta_data['version'], $old_data['version']) > 0) {
-            $this->plugins[$name] = $meta_data;
-        }
-    }
-
-    /**
-     * Get meta data for the plugin with the given name (if available).
-     * Always chooses the newest compatible version of the plugin.
-     * @param string $name name of the plgin
-     * @return array meta data for plugin (or null)
-     */
-    public function getPlugin($name)
-    {
-        return $this->plugins[$name] ?? null;
-    }
-
-    /**
-     * Get meta data for all plugins whose names contain the given
-     * string. You may omit the search string to get a list of all
-     * available plugins. Returns the newest compatible version of
-     * each plugin.
-     * @param string $search search string
-     * @return array array of meta data for matching plugins
-     */
-    public function getPlugins($search = null)
-    {
-        $result = [];
-
-        foreach ($this->plugins as $name => $data) {
-            if ($search === null || $search === '' ||
-                is_int(mb_stripos($name, $search)) ||
-                is_int(mb_stripos($data['description'], $search))) {
-                $result[$name] = $data;
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/plugins/engine/PluginRepository.php b/lib/plugins/engine/PluginRepository.php
new file mode 100644
index 0000000..235e9bd
--- /dev/null
+++ b/lib/plugins/engine/PluginRepository.php
@@ -0,0 +1,160 @@
+<?php
+
+/*
+ * PluginRepository.class.php - query plugin meta data
+ *
+ * Copyright (c) 2008  Elmar Ludwig
+ *
+ * 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.
+ */
+
+/**
+ * Class used to locate plugins available from a plugin repository.
+ */
+class PluginRepository
+{
+    /**
+     * list and meta data of available plugins
+     */
+    private $plugins = [];
+
+    /**
+     * Initialize a new PluginRepository and read meta data from
+     * the given URL or the default list of URLs (if $url is null).
+     */
+    public function __construct($url = null)
+    {
+        if (isset($url)) {
+            $this->readMetadata($url);
+        } else {
+            foreach ($GLOBALS['PLUGIN_REPOSITORIES'] as $url) {
+                $this->readMetadata($url);
+            }
+        }
+    }
+
+    /**
+     * Read plugin meta data from the given URL (using XML format).
+     * The structure of the XML is:
+     *
+     * <plugins>
+     *   <plugin name="DummyPlugin"
+     *     <release
+     *           version="2.0"
+     *           url="http://plugins.example.com/dummy-2.0.zip"
+     *           studipMinVersion="1.4"
+     *           studipMaxVersion="1.9">
+     *   </plugin>
+     *   [...]
+     * </plugins>
+     *
+     * @param string $url plugin repository url
+     */
+    public function readMetadata($url)
+    {
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache_key = 'plugin_metadata/'.$url;
+        $metadata = $cache->read($cache_key);
+
+        if ($metadata === false) {
+            // Set small timeout for the rare case that the repository is not
+            // available
+            $context = get_default_http_stream_context($url);
+            stream_context_set_option($context, ['http' => [
+                'timeout' => 5,
+            ]]);
+            $metadata = @file_get_contents($url, false, $context);
+
+            if ($metadata === false) {
+                throw new Exception(sprintf(_('Fehler beim Zugriff auf %s'), $url));
+            }
+
+            $cache->write($cache_key, $metadata, 3600);
+        }
+
+        $xml = new SimpleXMLElement($metadata);
+
+        if (!isset($xml->plugin)) {
+            $cache->expire($cache_key);
+            throw new Exception(_('Keine Plugin Meta-Daten gefunden'));
+        }
+
+        foreach ($xml->plugin as $plugin) {
+            foreach ($plugin->release as $release) {
+                $min_version = trim($release['studipMinVersion']);
+                $max_version = trim($release['studipMaxVersion']);
+
+                if (($min_version && StudipVersion::olderThan($min_version)) ||
+                    ($max_version && StudipVersion::newerThan($max_version))) {
+                    // plugin is not compatible, so skip it
+                    continue;
+                }
+
+                $meta_data = [
+                    'version'         => (string) $release['version'],
+                    'url'             => (string) $release['url'],
+                    'description'     => (string) $plugin['description'],
+                    'plugin_url'      => (string) $plugin['homepage'],
+                    'image'           => (string) $plugin['image'],
+                    'score'           => (float) $plugin['score'],
+                    'marketplace_url' => (string) $plugin['marketplace_url'],
+                ];
+
+                $this->registerPlugin((string) $plugin['name'], $meta_data);
+            }
+        }
+    }
+
+    /**
+     * Register a new plugin in this repository.
+     *
+     * @param string $name plugin name
+     * @param array $meta_data plugin meta data
+     */
+    protected function registerPlugin($name, $meta_data)
+    {
+        $old_data = $this->plugins[$name] ?? null;
+
+        if (!isset($old_data) ||
+            version_compare($meta_data['version'], $old_data['version']) > 0) {
+            $this->plugins[$name] = $meta_data;
+        }
+    }
+
+    /**
+     * Get meta data for the plugin with the given name (if available).
+     * Always chooses the newest compatible version of the plugin.
+     * @param string $name name of the plgin
+     * @return array meta data for plugin (or null)
+     */
+    public function getPlugin($name)
+    {
+        return $this->plugins[$name] ?? null;
+    }
+
+    /**
+     * Get meta data for all plugins whose names contain the given
+     * string. You may omit the search string to get a list of all
+     * available plugins. Returns the newest compatible version of
+     * each plugin.
+     * @param string $search search string
+     * @return array array of meta data for matching plugins
+     */
+    public function getPlugins($search = null)
+    {
+        $result = [];
+
+        foreach ($this->plugins as $name => $data) {
+            if ($search === null || $search === '' ||
+                is_int(mb_stripos($name, $search)) ||
+                is_int(mb_stripos($data['description'], $search))) {
+                $result[$name] = $data;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/raumzeit/CycleData.class.php b/lib/raumzeit/CycleData.class.php
deleted file mode 100644
index 587e0bc..0000000
--- a/lib/raumzeit/CycleData.class.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// CycleData.class.php
-//
-// Repräsentiert ein Turnusdatum eines MetaDates
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-/**
- * This class is subject to change, for now it wraps getter
- * and setter to SeminarCycleDate. For compatibility reasons it has
- * magic __get() __set() __isset, and it combines the old metadata_dates
- * keys and the new fields from SeminarCycleDate (see CycleData::$alias)
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- */
-class CycleData
-{
-    /**
-     * list of aliases to translate old style metadata_dates keys to
-     * new fields of SeminarCycleDate
-     *
-     * @var array
-     */
-    private $alias = [
-        'start_stunde' => 'start_hour',
-        'end_stunde'   => 'end_hour',
-        'day'          => 'weekday',
-        'desc'         => 'description',
-        'is_visible'   => 'is_visible'
-    ];
-
-    /**
-     * this is mostly filtered, see readSingleDates()
-     * should not be public
-     *
-     * @var array of SingleDate
-     */
-    public $termine = NULL; // Array
-
-    /**
-     * Enter description here ...
-     * @var SeminarCycleDate
-     */
-    private $cycle_date = null;
-
-    /**
-     * Constructor
-     * @param SeminarCycleDate|array
-     */
-    function __construct($cycle_data = FALSE)
-    {
-        if ($cycle_data instanceof SeminarCycleDate) {
-            $this->cycle_date = $cycle_data;
-        } else {
-            if ($cycle_data['metadate_id']) {
-                $metadate_id = $cycle_data['metadate_id'];
-            } else {
-                $metadate_id = md5(uniqid('metadate_id'));
-            }
-            $this->cycle_date = new SeminarCycleDate($metadate_id);
-            $this->setStart($cycle_data['start_stunde'], $cycle_data['start_minute']);
-            $this->setEnd($cycle_data['end_stunde'], $cycle_data['end_minute']);
-            $this->setDay($cycle_data['day']);
-            $this->setDescription($cycle_data['desc']);
-        }
-    }
-
-    function getDescription()
-    {
-        return $this->cycle_date->description;
-    }
-
-    function getCycleDate() {
-        return $this->cycle_date;
-    }
-    function setDescription($description)
-    {
-        $this->cycle_date->description = $description;
-    }
-
-    function setStart($start_stunde, $start_minute)
-    {
-        $this->cycle_date->start_hour = (int)$start_stunde;
-        $this->cycle_date->start_minute = (int)$start_minute;
-    }
-
-    function setEnd($end_stunde, $end_minute)
-    {
-        $this->cycle_date->end_hour = (int)$end_stunde;
-        $this->cycle_date->end_minute = (int)$end_minute;
-    }
-
-    function getStartStunde ()
-    {
-        return $this->cycle_date->start_hour;
-    }
-
-    function getStartMinute ()
-    {
-        return $this->cycle_date->start_minute;
-    }
-
-    function getEndStunde ()
-    {
-        return $this->cycle_date->end_hour;
-    }
-
-    function getEndMinute ()
-    {
-        return $this->cycle_date->end_minute;
-    }
-
-    function getMetaDateID()
-    {
-        return $this->cycle_date->getId();
-    }
-
-    function getDay()
-    {
-        return $this->cycle_date->weekday;
-    }
-
-    function getStartTime()
-    {
-        return sprintf('%02d:%02d',$this->getStartStunde(), $this->getStartMinute());
-    }
-
-    function getEndTime()
-    {
-        return sprintf('%02d:%02d',$this->getEndStunde(), $this->getEndMinute());
-    }
-
-    function setDay($day)
-    {
-        $this->cycle_date->weekday = $day;
-    }
-
-    /**
-     * Check if there is a least one not cancelled date for this cycle data
-     *
-     * @return bool   true, if there is at least one not cancelled date
-     */
-    function getIsVisible()
-    {
-        return $this->cycle_date->is_visible;
-    }
-
-    function __get($field)
-    {
-        if(isset($this->alias[$field])) {
-            $field = $this->alias[$field];
-        }
-        return $this->cycle_date->$field;
-    }
-
-    function __set($field, $value)
-    {
-        if(isset($this->alias[$field])) {
-            $field = $this->alias[$field];
-        }
-        return $this->cycle_date->$field = $value;
-    }
-
-    function __isset($field)
-    {
-        if(isset($this->alias[$field])) {
-            $field = $this->alias[$field];
-        }
-        return isset($this->cycle_date->$field);
-    }
-
-    /**
-     * stores only the cycledate data
-     *
-     * @return boolean
-     */
-    function storeCycleDate()
-    {
-        if (!$this->description) $this->description = '';
-        return $this->cycle_date->store();
-    }
-
-    /**
-     * stores the single dates belonging to this cycledate,
-     * but only the ones which are currently loaded!
-     * (see readSingleDates())
-     * should be private
-     *
-     * @return boolean
-     */
-    function store()
-    {
-        foreach ($this->termine as $val) {
-            $val->store();
-        }
-
-        return TRUE;
-    }
-
-    /**
-     * refreshes the currently loaded single dates from database,
-     * does not reload cycledate data!
-     * should be private
-     *
-     * @return boolean
-     */
-    function restore()
-    {
-        foreach ($this->termine as $key => $val) {
-            $new_termine[$key] = $val->restore();
-        }
-        $this->termine =& $new_termine;
-        return TRUE;
-    }
-
-    /**
-     * deletes cycledate and corresponding single dates
-     *
-     * @param boolean $removeSingles
-     * @return boolean
-     */
-    function delete($removeSingles = TRUE)
-    {
-        if ($removeSingles) {
-            if (!$this->termine) {
-                $this->readSingleDates();
-            }
-            foreach ($this->termine as $termin) {
-                $termin->delete();
-            }
-        }
-        return $this->cycle_date->delete();
-    }
-
-    /**
-     * this does not delete a single date, but set it to be marked
-     * as to not take place. do not use!
-     *
-     * @deprecated
-     * @param sting $date_id
-     * @param int $filterStart
-     * @param int $filterEnd
-     */
-    function deleteSingleDate($date_id, $filterStart, $filterEnd)
-    {
-        if (!$this->termine) {
-            $this->readSingleDates($filterStart, $filterEnd);
-        }
-
-        $this->termine[$date_id]->setExTermin(true);
-        $this->termine[$date_id]->store();
-    }
-
-    /**
-     * this should ressurect a single date whis is marked
-     * as to not take place. do not use!
-     *
-     * @deprecated
-     * @param sting $date_id
-     * @param int $filterStart
-     * @param int $filterEnd
-     */
-    function unDeleteSingleDate($date_id, $filterStart, $filterEnd)
-    {
-        if (!$this->termine) {
-            $this->readSingleDates($filterStart, $filterEnd);
-        }
-
-        if (!$this->termine[$date_id]->isExTermin()) {
-            return false;
-        }
-
-        $this->termine[$date_id]->setExTermin(false);
-        $this->termine[$date_id]->store();
-        return true;
-    }
-
-    /**
-     * load corresponding single dates from database
-     * give timestamps as params to filter by time range
-     *
-     * @param int $start
-     * @param int $end
-     * @return boolean
-     */
-    function readSingleDates($start = 0, $end = 0)
-    {
-        $this->termine = [];
-        $termin_data = CycleDataDB::getTermine($this->metadate_id, $start, $end);
-        if ($termin_data) {
-            foreach ($termin_data as $val) {
-                unset($termin);
-                $termin = new SingleDate();
-                $termin->fillValuesFromArray($val);
-                $termin->setExTermin($val['ex_termin']);
-                $this->termine[$val['termin_id']] = $termin;
-            }
-            return TRUE;
-        }
-
-        return FALSE;
-    }
-
-    /**
-     * get the currently loaded single dates, or all when no dates
-     * are loaded. you must use readSingleDates() before to be shure what to get!
-     *
-     * @return array of SingleDate
-     */
-    function getSingleDates()
-    {
-        if (!$this->termine) {
-            $this->readSingleDates();
-        }
-        return $this->termine;
-    }
-
-    /**
-     * returns an assoc array, keys are room names values are number of dates for this room
-     * give timestamps as params to filter by time range
-     *
-     * @param int $filterStart
-     * @param int $filterEnd
-     * @return array|false
-     */
-    function getFreeTextPredominantRoom($filterStart = 0, $filterEnd = 0)
-    {
-        return CycleDataDB::getFreeTextPredominantRoomDB($this->metadate_id, $filterStart, $filterEnd);
-    }
-
-    /**
-     * returns an assoc array, keys are resource_id of rooms values are number of dates for this room
-     * give timestamps as params to filter by time range
-     *
-     * @param int $filterStart
-     * @param int $filterEnd
-     * @return array
-     */
-    function getPredominantRoom($filterStart = 0, $filterEnd = 0)
-    {
-        if ($rooms = CycleDataDB::getPredominantRoomDB($this->metadate_id, $filterStart, $filterEnd)) {
-            return $rooms;
-        }
-
-        return false;
-    }
-
-    /**
-     * returns a formatted string for cycledate
-     *
-     * @see SeminarCycleDate::toString()
-     * @param boolean $short
-     * @return string
-     */
-    function toString($short = false)
-    {
-        if($short === false) {
-            return $this->cycle_date->toString('long');
-        } else if ($short === true) {
-            return $this->cycle_date->toString('short');
-        } else {
-            return $this->cycle_date->toString($short);
-        }
-    }
-
-    /**
-     * return all fields from SeminarCycleDate and old style
-     * metadata_dates, combined with info about rooms
-     *
-     * @return array
-     */
-    function toArray()
-    {
-        $ret = $this->cycle_date->toArray();
-        foreach($this->alias as $a => $o) {
-            $ret[$a] = $this->cycle_date->$o;
-        }
-        $ret['assigned_rooms'] = $this->getPredominantRoom();
-        $ret['freetext_rooms'] = $this->getFreetextPredominantRoom();
-        $ret['tostring']       = $this->toString();
-        $ret['tostring_short'] = $this->toString(true);
-
-        $ret['start_minute'] = leadingZero($ret['start_minute']);
-        $ret['end_minute'] = leadingZero($ret['end_minute']);
-        return $ret;
-    }
-
-    /**
-     * assign single dates one by one to a list of issues
-     * seems not to be the right place for this method
-     *
-     * @deprecated
-     * @param array $themen
-     * @param int $filterStart
-     * @param int $filterEnd
-     */
-    function autoAssignIssues($themen, $filterStart, $filterEnd)
-    {
-        $this->readSingleDates($filterStart, $filterEnd);
-        $z = 0;
-        foreach ($this->termine as $key => $val) {
-            if (sizeof($val->getIssueIDs()) == 0) {
-                if (!$themen[$z]) break;
-                if (!$val->isExTermin()) {
-                    $this->termine[$key]->addIssueID($themen[$z++]);
-                }
-            }
-        }
-        $this->store();
-    }
-}
diff --git a/lib/raumzeit/CycleData.php b/lib/raumzeit/CycleData.php
new file mode 100644
index 0000000..587e0bc
--- /dev/null
+++ b/lib/raumzeit/CycleData.php
@@ -0,0 +1,434 @@
+<?
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// CycleData.class.php
+//
+// Repräsentiert ein Turnusdatum eines MetaDates
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+/**
+ * This class is subject to change, for now it wraps getter
+ * and setter to SeminarCycleDate. For compatibility reasons it has
+ * magic __get() __set() __isset, and it combines the old metadata_dates
+ * keys and the new fields from SeminarCycleDate (see CycleData::$alias)
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ */
+class CycleData
+{
+    /**
+     * list of aliases to translate old style metadata_dates keys to
+     * new fields of SeminarCycleDate
+     *
+     * @var array
+     */
+    private $alias = [
+        'start_stunde' => 'start_hour',
+        'end_stunde'   => 'end_hour',
+        'day'          => 'weekday',
+        'desc'         => 'description',
+        'is_visible'   => 'is_visible'
+    ];
+
+    /**
+     * this is mostly filtered, see readSingleDates()
+     * should not be public
+     *
+     * @var array of SingleDate
+     */
+    public $termine = NULL; // Array
+
+    /**
+     * Enter description here ...
+     * @var SeminarCycleDate
+     */
+    private $cycle_date = null;
+
+    /**
+     * Constructor
+     * @param SeminarCycleDate|array
+     */
+    function __construct($cycle_data = FALSE)
+    {
+        if ($cycle_data instanceof SeminarCycleDate) {
+            $this->cycle_date = $cycle_data;
+        } else {
+            if ($cycle_data['metadate_id']) {
+                $metadate_id = $cycle_data['metadate_id'];
+            } else {
+                $metadate_id = md5(uniqid('metadate_id'));
+            }
+            $this->cycle_date = new SeminarCycleDate($metadate_id);
+            $this->setStart($cycle_data['start_stunde'], $cycle_data['start_minute']);
+            $this->setEnd($cycle_data['end_stunde'], $cycle_data['end_minute']);
+            $this->setDay($cycle_data['day']);
+            $this->setDescription($cycle_data['desc']);
+        }
+    }
+
+    function getDescription()
+    {
+        return $this->cycle_date->description;
+    }
+
+    function getCycleDate() {
+        return $this->cycle_date;
+    }
+    function setDescription($description)
+    {
+        $this->cycle_date->description = $description;
+    }
+
+    function setStart($start_stunde, $start_minute)
+    {
+        $this->cycle_date->start_hour = (int)$start_stunde;
+        $this->cycle_date->start_minute = (int)$start_minute;
+    }
+
+    function setEnd($end_stunde, $end_minute)
+    {
+        $this->cycle_date->end_hour = (int)$end_stunde;
+        $this->cycle_date->end_minute = (int)$end_minute;
+    }
+
+    function getStartStunde ()
+    {
+        return $this->cycle_date->start_hour;
+    }
+
+    function getStartMinute ()
+    {
+        return $this->cycle_date->start_minute;
+    }
+
+    function getEndStunde ()
+    {
+        return $this->cycle_date->end_hour;
+    }
+
+    function getEndMinute ()
+    {
+        return $this->cycle_date->end_minute;
+    }
+
+    function getMetaDateID()
+    {
+        return $this->cycle_date->getId();
+    }
+
+    function getDay()
+    {
+        return $this->cycle_date->weekday;
+    }
+
+    function getStartTime()
+    {
+        return sprintf('%02d:%02d',$this->getStartStunde(), $this->getStartMinute());
+    }
+
+    function getEndTime()
+    {
+        return sprintf('%02d:%02d',$this->getEndStunde(), $this->getEndMinute());
+    }
+
+    function setDay($day)
+    {
+        $this->cycle_date->weekday = $day;
+    }
+
+    /**
+     * Check if there is a least one not cancelled date for this cycle data
+     *
+     * @return bool   true, if there is at least one not cancelled date
+     */
+    function getIsVisible()
+    {
+        return $this->cycle_date->is_visible;
+    }
+
+    function __get($field)
+    {
+        if(isset($this->alias[$field])) {
+            $field = $this->alias[$field];
+        }
+        return $this->cycle_date->$field;
+    }
+
+    function __set($field, $value)
+    {
+        if(isset($this->alias[$field])) {
+            $field = $this->alias[$field];
+        }
+        return $this->cycle_date->$field = $value;
+    }
+
+    function __isset($field)
+    {
+        if(isset($this->alias[$field])) {
+            $field = $this->alias[$field];
+        }
+        return isset($this->cycle_date->$field);
+    }
+
+    /**
+     * stores only the cycledate data
+     *
+     * @return boolean
+     */
+    function storeCycleDate()
+    {
+        if (!$this->description) $this->description = '';
+        return $this->cycle_date->store();
+    }
+
+    /**
+     * stores the single dates belonging to this cycledate,
+     * but only the ones which are currently loaded!
+     * (see readSingleDates())
+     * should be private
+     *
+     * @return boolean
+     */
+    function store()
+    {
+        foreach ($this->termine as $val) {
+            $val->store();
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * refreshes the currently loaded single dates from database,
+     * does not reload cycledate data!
+     * should be private
+     *
+     * @return boolean
+     */
+    function restore()
+    {
+        foreach ($this->termine as $key => $val) {
+            $new_termine[$key] = $val->restore();
+        }
+        $this->termine =& $new_termine;
+        return TRUE;
+    }
+
+    /**
+     * deletes cycledate and corresponding single dates
+     *
+     * @param boolean $removeSingles
+     * @return boolean
+     */
+    function delete($removeSingles = TRUE)
+    {
+        if ($removeSingles) {
+            if (!$this->termine) {
+                $this->readSingleDates();
+            }
+            foreach ($this->termine as $termin) {
+                $termin->delete();
+            }
+        }
+        return $this->cycle_date->delete();
+    }
+
+    /**
+     * this does not delete a single date, but set it to be marked
+     * as to not take place. do not use!
+     *
+     * @deprecated
+     * @param sting $date_id
+     * @param int $filterStart
+     * @param int $filterEnd
+     */
+    function deleteSingleDate($date_id, $filterStart, $filterEnd)
+    {
+        if (!$this->termine) {
+            $this->readSingleDates($filterStart, $filterEnd);
+        }
+
+        $this->termine[$date_id]->setExTermin(true);
+        $this->termine[$date_id]->store();
+    }
+
+    /**
+     * this should ressurect a single date whis is marked
+     * as to not take place. do not use!
+     *
+     * @deprecated
+     * @param sting $date_id
+     * @param int $filterStart
+     * @param int $filterEnd
+     */
+    function unDeleteSingleDate($date_id, $filterStart, $filterEnd)
+    {
+        if (!$this->termine) {
+            $this->readSingleDates($filterStart, $filterEnd);
+        }
+
+        if (!$this->termine[$date_id]->isExTermin()) {
+            return false;
+        }
+
+        $this->termine[$date_id]->setExTermin(false);
+        $this->termine[$date_id]->store();
+        return true;
+    }
+
+    /**
+     * load corresponding single dates from database
+     * give timestamps as params to filter by time range
+     *
+     * @param int $start
+     * @param int $end
+     * @return boolean
+     */
+    function readSingleDates($start = 0, $end = 0)
+    {
+        $this->termine = [];
+        $termin_data = CycleDataDB::getTermine($this->metadate_id, $start, $end);
+        if ($termin_data) {
+            foreach ($termin_data as $val) {
+                unset($termin);
+                $termin = new SingleDate();
+                $termin->fillValuesFromArray($val);
+                $termin->setExTermin($val['ex_termin']);
+                $this->termine[$val['termin_id']] = $termin;
+            }
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * get the currently loaded single dates, or all when no dates
+     * are loaded. you must use readSingleDates() before to be shure what to get!
+     *
+     * @return array of SingleDate
+     */
+    function getSingleDates()
+    {
+        if (!$this->termine) {
+            $this->readSingleDates();
+        }
+        return $this->termine;
+    }
+
+    /**
+     * returns an assoc array, keys are room names values are number of dates for this room
+     * give timestamps as params to filter by time range
+     *
+     * @param int $filterStart
+     * @param int $filterEnd
+     * @return array|false
+     */
+    function getFreeTextPredominantRoom($filterStart = 0, $filterEnd = 0)
+    {
+        return CycleDataDB::getFreeTextPredominantRoomDB($this->metadate_id, $filterStart, $filterEnd);
+    }
+
+    /**
+     * returns an assoc array, keys are resource_id of rooms values are number of dates for this room
+     * give timestamps as params to filter by time range
+     *
+     * @param int $filterStart
+     * @param int $filterEnd
+     * @return array
+     */
+    function getPredominantRoom($filterStart = 0, $filterEnd = 0)
+    {
+        if ($rooms = CycleDataDB::getPredominantRoomDB($this->metadate_id, $filterStart, $filterEnd)) {
+            return $rooms;
+        }
+
+        return false;
+    }
+
+    /**
+     * returns a formatted string for cycledate
+     *
+     * @see SeminarCycleDate::toString()
+     * @param boolean $short
+     * @return string
+     */
+    function toString($short = false)
+    {
+        if($short === false) {
+            return $this->cycle_date->toString('long');
+        } else if ($short === true) {
+            return $this->cycle_date->toString('short');
+        } else {
+            return $this->cycle_date->toString($short);
+        }
+    }
+
+    /**
+     * return all fields from SeminarCycleDate and old style
+     * metadata_dates, combined with info about rooms
+     *
+     * @return array
+     */
+    function toArray()
+    {
+        $ret = $this->cycle_date->toArray();
+        foreach($this->alias as $a => $o) {
+            $ret[$a] = $this->cycle_date->$o;
+        }
+        $ret['assigned_rooms'] = $this->getPredominantRoom();
+        $ret['freetext_rooms'] = $this->getFreetextPredominantRoom();
+        $ret['tostring']       = $this->toString();
+        $ret['tostring_short'] = $this->toString(true);
+
+        $ret['start_minute'] = leadingZero($ret['start_minute']);
+        $ret['end_minute'] = leadingZero($ret['end_minute']);
+        return $ret;
+    }
+
+    /**
+     * assign single dates one by one to a list of issues
+     * seems not to be the right place for this method
+     *
+     * @deprecated
+     * @param array $themen
+     * @param int $filterStart
+     * @param int $filterEnd
+     */
+    function autoAssignIssues($themen, $filterStart, $filterEnd)
+    {
+        $this->readSingleDates($filterStart, $filterEnd);
+        $z = 0;
+        foreach ($this->termine as $key => $val) {
+            if (sizeof($val->getIssueIDs()) == 0) {
+                if (!$themen[$z]) break;
+                if (!$val->isExTermin()) {
+                    $this->termine[$key]->addIssueID($themen[$z++]);
+                }
+            }
+        }
+        $this->store();
+    }
+}
diff --git a/lib/raumzeit/CycleDataDB.class.php b/lib/raumzeit/CycleDataDB.class.php
deleted file mode 100644
index eb586b4..0000000
--- a/lib/raumzeit/CycleDataDB.class.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// CycleDataDB.class.php
-//
-// Datenbank-Abfragen für CycleData.class.php
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * CycleDataDB.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- */
-class CycleDataDB
-{
-    /**
-     * Returns sorted array of all dates belonging to the passed metadate,
-     * optionally filtered by start- and end-date
-     *
-     * @param  string  $metadate_id
-     * @param  integer $start
-     * @param  integer $end
-     *
-     * @return array
-     */
-    public static function getTermine($metadate_id, $start = 0, $end = 0)
-    {
-        if (($start != 0) || ($end != 0)) {
-            $query = "SELECT termine.*, r.resource_id, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                      FROM termine
-                      LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
-                      LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
-                      LEFT JOIN resource_bookings AS r ON (termine.termin_id = r.range_id)
-                      WHERE metadate_id = ? AND termine.date BETWEEN ? AND ?
-                      GROUP BY termine.termin_id
-                      ORDER BY NULL";
-            $parameters = [$metadate_id, $start, $end];
-        } else {
-            $query = "SELECT termine.*, r.resource_id, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                      FROM termine
-                        LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
-                        LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
-                        LEFT JOIN resource_bookings AS r ON (termine.termin_id = r.range_id)
-                      WHERE metadate_id = ?
-                      GROUP BY termine.termin_id
-                      ORDER BY NULL";
-            $parameters = [$metadate_id];
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-
-        $ret = [];
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $data = $row;
-            $data['related_persons'] = array_filter(explode(',', $data['related_persons']));
-            $data['related_groups'] = array_filter(explode(',', $data['related_groups']));
-            $ret[] = $data;
-        }
-
-        if (($start != 0) || ($end != 0)) {
-            $query = "SELECT ex_termine.*, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                      FROM ex_termine
-                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
-                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
-                      WHERE metadate_id = ? AND `date` BETWEEN ? AND ?
-                      GROUP BY ex_termine.termin_id
-                      ORDER BY NULL";
-            $parameters = [$metadate_id, $start, $end];
-        } else {
-            $query = "SELECT ex_termine.*, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                      FROM ex_termine
-                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
-                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
-                      WHERE metadate_id = ?
-                      GROUP BY ex_termine.termin_id
-                      ORDER BY NULL";
-            $parameters = [$metadate_id];
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $zw = $row;
-            $zw['ex_termin'] = TRUE;
-            $zw['related_persons'] = array_filter(explode(',', $zw['related_persons']));
-            $zw['related_groups'] = array_filter(explode(',', $zw['related_groups']));
-            $ret[] = $zw;
-        }
-
-        if ($ret) {
-            usort($ret, 'CycleDataDB::sort_dates');
-            return $ret;
-        }
-
-        return FALSE;
-    }
-
-    public static function sort_dates($a, $b)
-    {
-        if ($a['date'] == $b['date']) return 0;
-        return ($a['date'] < $b['date']) ? -1 : 1;
-    }
-
-    /**
-     * Deletes all dates that are newer then the passed date for metadate
-     * with the passed id
-     *
-     * @param  string  $metadate_id
-     * @param  int  $timestamp
-     *
-     * @return int  number of deleted singledates
-     */
-    public static function deleteNewerSingleDates($metadate_id, $timestamp)
-    {
-        $count = 0;
-
-        $query = "SELECT termin_id
-                  FROM termine
-                  WHERE metadate_id = ? AND `date` > ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$metadate_id, $timestamp]);
-        while ($termin_id = $statement->fetchColumn()) {
-            $termin = new SingleDate($termin_id);
-            $termin->delete();
-            unset($termin);
-
-            $count += 1;
-        }
-
-        $query = "DELETE FROM termine WHERE metadate_id = ? AND `date` > ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$metadate_id, $timestamp]);
-
-        $query = "DELETE FROM ex_termine WHERE metadate_id = ? AND `date` > ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$metadate_id, $timestamp]);
-
-        return $count;
-    }
-
-    /**
-     * Returns the list of booked rooms ordered by number of appearance
-     * in the metadate with the passed id
-     *
-     * @param  string  $metadate_id
-     * @param  integer $filterStart
-     * @param  integer $filterEnd
-     *
-     * @return array [resource_id, number_of_appearances]
-     */
-    public static function getPredominantRoomDB($metadate_id, $filterStart = 0, $filterEnd = 0)
-    {
-        if (($filterStart == 0) && ($filterEnd == 0)) {
-            $query = "SELECT resource_id, COUNT(resource_id) AS c
-                      FROM termine
-                      INNER JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
-                      WHERE termine.metadate_id = ? AND resource_id != ''
-                      GROUP BY resource_id
-                      ORDER BY c DESC";
-            $parameters = [$metadate_id];
-        } else {
-            $query = "SELECT resource_id, COUNT(resource_id) AS c
-                      FROM termine
-                      INNER JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
-                      WHERE termine.metadate_id = ? AND termine.date BETWEEN ? AND ?
-                      GROUP BY resource_id
-                      ORDER BY c DESC";
-            $parameters = [$metadate_id, $filterStart, $filterEnd];
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-        return $statement->fetchGrouped(PDO::FETCH_COLUMN) ?: false;
-    }
-
-    /**
-     * Returns the list of freetext rooms ordered by number of appearance
-     * in the metadate with the passed id
-     *
-     * @param  [type]  $metadate_id
-     * @param  integer $filterStart
-     * @param  integer $filterEnd
-     *
-     * @return array [freetex, number_of_appearances]
-     */
-    public static function getFreeTextPredominantRoomDB($metadate_id, $filterStart = 0, $filterEnd = 0)
-    {
-        if (($filterStart == 0) && ($filterEnd == 0)) {
-            $query = "SELECT raum, COUNT(raum) AS c
-                      FROM termine
-                      LEFT JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
-                      WHERE termine.metadate_id = ? AND resource_bookings.range_id IS NULL
-                      GROUP BY raum
-                      ORDER BY c DESC";
-            $parameters = [$metadate_id];
-        } else {
-            $query = "SELECT raum, COUNT(raum) AS c
-                      FROM termine
-                      LEFT JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
-                      WHERE termine.metadate_id = ? AND resource_bookings.range_id IS NULL
-                        AND termine.date BETWEEN ? AND ?
-                      GROUP BY raum
-                      ORDER BY c DESC";
-            $parameters = [$metadate_id, $filterStart, $filterEnd];
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-        return $statement->fetchGrouped(PDO::FETCH_COLUMN) ?: false;
-    }
-
-    /**
-     * returns the first date for a given metadate_id as array
-     *
-     * @param string $metadate_id
-     *
-     * @return array
-     */
-    public static function getFirstDate($metadate_id)
-    {
-        $query = "SELECT *
-                  FROM termine
-                  WHERE metadate_id = ?
-                  ORDER BY `date` ASC
-                  LIMIT 1";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$metadate_id]);
-        return $statement->fetch(PDO::FETCH_ASSOC);
-    }
-
-
-    /**
-     * returns the last date for a given metadate_id as array
-     *
-     * @param string $metadate_id
-     *
-     * @return array
-     */
-    public static function getLastDate($metadate_id)
-    {
-        $query = "SELECT *
-                  FROM termine
-                  WHERE metadate_id = ?
-                  ORDER BY `date` DESC
-                  LIMIT 1";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$metadate_id]);
-        return $statement->fetch(PDO::FETCH_ASSOC);
-    }
-}
diff --git a/lib/raumzeit/CycleDataDB.php b/lib/raumzeit/CycleDataDB.php
new file mode 100644
index 0000000..eb586b4
--- /dev/null
+++ b/lib/raumzeit/CycleDataDB.php
@@ -0,0 +1,271 @@
+<?
+# Lifter002: TODO
+# Lifter003: TEST
+# Lifter007: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// CycleDataDB.class.php
+//
+// Datenbank-Abfragen für CycleData.class.php
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * CycleDataDB.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ */
+class CycleDataDB
+{
+    /**
+     * Returns sorted array of all dates belonging to the passed metadate,
+     * optionally filtered by start- and end-date
+     *
+     * @param  string  $metadate_id
+     * @param  integer $start
+     * @param  integer $end
+     *
+     * @return array
+     */
+    public static function getTermine($metadate_id, $start = 0, $end = 0)
+    {
+        if (($start != 0) || ($end != 0)) {
+            $query = "SELECT termine.*, r.resource_id, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                      FROM termine
+                      LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
+                      LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
+                      LEFT JOIN resource_bookings AS r ON (termine.termin_id = r.range_id)
+                      WHERE metadate_id = ? AND termine.date BETWEEN ? AND ?
+                      GROUP BY termine.termin_id
+                      ORDER BY NULL";
+            $parameters = [$metadate_id, $start, $end];
+        } else {
+            $query = "SELECT termine.*, r.resource_id, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                      FROM termine
+                        LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
+                        LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
+                        LEFT JOIN resource_bookings AS r ON (termine.termin_id = r.range_id)
+                      WHERE metadate_id = ?
+                      GROUP BY termine.termin_id
+                      ORDER BY NULL";
+            $parameters = [$metadate_id];
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+
+        $ret = [];
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $data = $row;
+            $data['related_persons'] = array_filter(explode(',', $data['related_persons']));
+            $data['related_groups'] = array_filter(explode(',', $data['related_groups']));
+            $ret[] = $data;
+        }
+
+        if (($start != 0) || ($end != 0)) {
+            $query = "SELECT ex_termine.*, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                      FROM ex_termine
+                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
+                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
+                      WHERE metadate_id = ? AND `date` BETWEEN ? AND ?
+                      GROUP BY ex_termine.termin_id
+                      ORDER BY NULL";
+            $parameters = [$metadate_id, $start, $end];
+        } else {
+            $query = "SELECT ex_termine.*, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                      FROM ex_termine
+                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
+                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
+                      WHERE metadate_id = ?
+                      GROUP BY ex_termine.termin_id
+                      ORDER BY NULL";
+            $parameters = [$metadate_id];
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $zw = $row;
+            $zw['ex_termin'] = TRUE;
+            $zw['related_persons'] = array_filter(explode(',', $zw['related_persons']));
+            $zw['related_groups'] = array_filter(explode(',', $zw['related_groups']));
+            $ret[] = $zw;
+        }
+
+        if ($ret) {
+            usort($ret, 'CycleDataDB::sort_dates');
+            return $ret;
+        }
+
+        return FALSE;
+    }
+
+    public static function sort_dates($a, $b)
+    {
+        if ($a['date'] == $b['date']) return 0;
+        return ($a['date'] < $b['date']) ? -1 : 1;
+    }
+
+    /**
+     * Deletes all dates that are newer then the passed date for metadate
+     * with the passed id
+     *
+     * @param  string  $metadate_id
+     * @param  int  $timestamp
+     *
+     * @return int  number of deleted singledates
+     */
+    public static function deleteNewerSingleDates($metadate_id, $timestamp)
+    {
+        $count = 0;
+
+        $query = "SELECT termin_id
+                  FROM termine
+                  WHERE metadate_id = ? AND `date` > ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$metadate_id, $timestamp]);
+        while ($termin_id = $statement->fetchColumn()) {
+            $termin = new SingleDate($termin_id);
+            $termin->delete();
+            unset($termin);
+
+            $count += 1;
+        }
+
+        $query = "DELETE FROM termine WHERE metadate_id = ? AND `date` > ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$metadate_id, $timestamp]);
+
+        $query = "DELETE FROM ex_termine WHERE metadate_id = ? AND `date` > ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$metadate_id, $timestamp]);
+
+        return $count;
+    }
+
+    /**
+     * Returns the list of booked rooms ordered by number of appearance
+     * in the metadate with the passed id
+     *
+     * @param  string  $metadate_id
+     * @param  integer $filterStart
+     * @param  integer $filterEnd
+     *
+     * @return array [resource_id, number_of_appearances]
+     */
+    public static function getPredominantRoomDB($metadate_id, $filterStart = 0, $filterEnd = 0)
+    {
+        if (($filterStart == 0) && ($filterEnd == 0)) {
+            $query = "SELECT resource_id, COUNT(resource_id) AS c
+                      FROM termine
+                      INNER JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
+                      WHERE termine.metadate_id = ? AND resource_id != ''
+                      GROUP BY resource_id
+                      ORDER BY c DESC";
+            $parameters = [$metadate_id];
+        } else {
+            $query = "SELECT resource_id, COUNT(resource_id) AS c
+                      FROM termine
+                      INNER JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
+                      WHERE termine.metadate_id = ? AND termine.date BETWEEN ? AND ?
+                      GROUP BY resource_id
+                      ORDER BY c DESC";
+            $parameters = [$metadate_id, $filterStart, $filterEnd];
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+        return $statement->fetchGrouped(PDO::FETCH_COLUMN) ?: false;
+    }
+
+    /**
+     * Returns the list of freetext rooms ordered by number of appearance
+     * in the metadate with the passed id
+     *
+     * @param  [type]  $metadate_id
+     * @param  integer $filterStart
+     * @param  integer $filterEnd
+     *
+     * @return array [freetex, number_of_appearances]
+     */
+    public static function getFreeTextPredominantRoomDB($metadate_id, $filterStart = 0, $filterEnd = 0)
+    {
+        if (($filterStart == 0) && ($filterEnd == 0)) {
+            $query = "SELECT raum, COUNT(raum) AS c
+                      FROM termine
+                      LEFT JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
+                      WHERE termine.metadate_id = ? AND resource_bookings.range_id IS NULL
+                      GROUP BY raum
+                      ORDER BY c DESC";
+            $parameters = [$metadate_id];
+        } else {
+            $query = "SELECT raum, COUNT(raum) AS c
+                      FROM termine
+                      LEFT JOIN resource_bookings ON (termin_id = resource_bookings.range_id)
+                      WHERE termine.metadate_id = ? AND resource_bookings.range_id IS NULL
+                        AND termine.date BETWEEN ? AND ?
+                      GROUP BY raum
+                      ORDER BY c DESC";
+            $parameters = [$metadate_id, $filterStart, $filterEnd];
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+        return $statement->fetchGrouped(PDO::FETCH_COLUMN) ?: false;
+    }
+
+    /**
+     * returns the first date for a given metadate_id as array
+     *
+     * @param string $metadate_id
+     *
+     * @return array
+     */
+    public static function getFirstDate($metadate_id)
+    {
+        $query = "SELECT *
+                  FROM termine
+                  WHERE metadate_id = ?
+                  ORDER BY `date` ASC
+                  LIMIT 1";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$metadate_id]);
+        return $statement->fetch(PDO::FETCH_ASSOC);
+    }
+
+
+    /**
+     * returns the last date for a given metadate_id as array
+     *
+     * @param string $metadate_id
+     *
+     * @return array
+     */
+    public static function getLastDate($metadate_id)
+    {
+        $query = "SELECT *
+                  FROM termine
+                  WHERE metadate_id = ?
+                  ORDER BY `date` DESC
+                  LIMIT 1";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$metadate_id]);
+        return $statement->fetch(PDO::FETCH_ASSOC);
+    }
+}
diff --git a/lib/raumzeit/Issue.class.php b/lib/raumzeit/Issue.class.php
deleted file mode 100644
index 939aaee..0000000
--- a/lib/raumzeit/Issue.class.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// Issue.class.php
-//
-// Repräsentiert ein einzelnes Thema einer Veranstaltung
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * Issue.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- */
-
-class Issue {
-    var $issue_id = '';
-    var $seminar_id = '';
-    var $author_id = '';
-    var $title = '';
-    var $description = '';
-    var $mkdate = 0;
-    var $chdate = 0;
-    var $priority = 0;
-    var $file = FALSE;
-    var $folder_id = '';
-    var $messages = [];
-    var $new = false;
-    var $hasForum = false;
-
-    /**
-     * Constructor for class Issue
-     *
-     * $data is an Array with the following possible fields:
-     * issue_id:        when set, the Issue with this id is restored
-     * seminar_id:  when set and issue_id is not set, a new issue for this seminar is created
-     *
-     * returns NULL if both are unset
-     */
-    function __construct($data = []) {
-        global $user;
-
-        if ($data['issue_id']) {
-            $this->issue_id = $data['issue_id'];
-            $this->restore();
-        } else if ($data['seminar_id']) {
-            $this->issue_id = md5(uniqid('Issue'));
-            $this->seminar_id = $data['seminar_id'];
-            $this->mkdate = time();
-            $this->chdate = time();
-            $this->author_id = $user->id;
-            $this->new = true;
-        } else {
-            return NULL;
-        }
-    }
-
-    function getPriority() {
-        return $this->priority;
-    }
-
-    function setPriority($priority) {
-        $this->priority = $priority;
-    }
-
-    function getMkDate() {
-        return $this->mkdate;
-    }
-
-    function getChDate() {
-        return $this->chdate;
-    }
-
-    function getTitle() {
-        return $this->title;
-    }
-
-    function setTitle($title) {
-        $this->title = $title;
-    }
-
-    function getDescription() {
-        return $this->description;
-    }
-
-    function setDescription($description) {
-        $this->description = $description;
-    }
-
-    function getAuthorID() {
-        return $this->author_id;
-    }
-
-    function getIssueID() {
-        return $this->issue_id;
-    }
-
-    function setSeminarID($seminar_id) {
-        $this->seminar_id = $seminar_id;
-    }
-
-    function getSeminarID() {
-        return $this->seminar_id;
-    }
-
-    function readSingleDates() {
-        /*if ($termin_data = IssueDB::getTermine($this->issue_id)) {
-            foreach ($termin_data as $val) {
-                $this->singleDates[] = $val['termin_id'];
-            }
-            return TRUE;
-        }*/
-
-        return FALSE;
-
-    }
-
-    function store() {
-        $this->chdate = time();
-
-        if ($this->hasForum) {
-            $sem = Seminar::getInstance($this->seminar_id);
-            $forum_module = $sem->getSlotModule('forum');
-
-            if ($forum_module instanceof ForumModule) {
-                $forum_module->setThreadForIssue($this->issue_id, $this->title, $this->description);
-            }
-        }
-
-        IssueDB::storeIssue($this);
-        $this->new = false;
-    }
-
-    function restore() {
-        /*
-         * To avoid inconsistency, the restore function has been removed.
-         * The only way to load an Issue is via the Seminar.class.php, with the function fillValuesFromArray
-         */
-        $this->fillValuesFromArray(IssueDB::restoreIssue($this->issue_id));
-    }
-
-    function delete() {
-        $dates = IssueDB::getDatesforIssue($this->issue_id);
-
-        $titles = [];
-        $title = '';
-
-        foreach ($dates as $termin_id => $termin_data) {
-            $titles[] = date('d.m.y, H:i', $termin_data['date']).' - '.date('H:i', $termin_data['end_time']);
-        }
-
-        if (sizeof($titles) > 0) {
-            $title = implode(', ', $titles).', '.$this->getTitle() . ' ' ._("(Thema gelöscht)");
-        } else {
-            $title = $this->getTitle() . ' ' ._("(Thema gelöscht)");
-        }
-        $description = _("Dateiordner bezieht sich auf ein nicht mehr vorhandenes Thema.");
-
-        IssueDB::deleteIssue($this->issue_id, $this->seminar_id, $title, $description);
-    }
-
-    function fillValuesFromArray($data) {
-        $this->issue_id = $data['issue_id'];
-        $this->seminar_id = $data['seminar_id'];
-        $this->author_id = $data['author_id'];
-        $this->title = $data['title'];
-        $this->description = $data['description'];
-        $this->mkdate = $data['mkdate'];
-        $this->chdate = $data['chdate'];
-        $this->priority = $data['priority'];
-        $this->file = ($data['range_id'] == '') ? FALSE : TRUE;
-        if ($this->file) {
-            $this->folder_id = $data['folder_id'];
-        }
-        $this->new = false;
-
-        // check, if there is a forums-connection
-        $sem = Seminar::getInstance($this->seminar_id);
-        $forum_module = $sem->getSlotModule('forum');
-
-        if ($forum_module instanceof ForumModule) {
-            $this->hasForum = $forum_module->getLinkToThread($this->issue_id) ? true : false;
-        }
-
-        $this->readSingleDates();
-    }
-
-    function toString() {
-        return $this->title;
-    }
-
-    function getFolderID() {
-        if ($this->file) {
-            return $this->folder_id;
-        } else {
-            return FALSE;
-        }
-    }
-
-    function hasFile() {
-        return $this->file;
-    }
-
-    function setFile($file) {
-        if ($file != $this->file) {
-            if ($file) {
-                $this->messages[] = sprintf(_("Dateiordner für das Thema \"%s\" angelegt."),$this->toString());
-            } else {
-                //$this->messages[] = sprintf(_("Dateiordner für das Thema \"%s\" gelöscht!"),$this->toString());
-            }
-        }
-        $this->file = $file;
-    }
-
-    function setForum($newForumValue) {
-        // only do something, if we enable the link to a thread in a forum
-        if ($newForumValue) {
-
-            // find the ForumModule which takes the role of the CoreForum in the current Seminar
-            $sem = Seminar::getInstance($this->seminar_id);
-            $forum_module = $sem->getSlotModule('forum');
-
-            if ($forum_module instanceof ForumModule) {
-                // only link if there is none yet
-                if (!$forum_module->getLinkToThread($this->issue_id)) {
-                    $forum_module->setThreadForIssue($this->issue_id, $this->title, $this->description);
-                    $this->messages[] = sprintf(_("Ordner im Forum für das Thema \"%s\" angelegt."), $this->toString());
-                }
-            }
-        }
-    }
-
-    function getMessages() {
-        $temp = $this->messages;
-        $this->messages = NULL;
-        return $temp;
-    }
-
-  /* * * * * * * * * * * * * * * * * * * *
-     * * S T A T I C   F U N C T I O N S * *
-   * * * * * * * * * * * * * * * * * * * */
-
-    function isIssue($issue_id) {
-        return IssueDB::isIssue($issue_id);
-    }
-}
diff --git a/lib/raumzeit/Issue.php b/lib/raumzeit/Issue.php
new file mode 100644
index 0000000..939aaee
--- /dev/null
+++ b/lib/raumzeit/Issue.php
@@ -0,0 +1,268 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// Issue.class.php
+//
+// Repräsentiert ein einzelnes Thema einer Veranstaltung
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * Issue.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ */
+
+class Issue {
+    var $issue_id = '';
+    var $seminar_id = '';
+    var $author_id = '';
+    var $title = '';
+    var $description = '';
+    var $mkdate = 0;
+    var $chdate = 0;
+    var $priority = 0;
+    var $file = FALSE;
+    var $folder_id = '';
+    var $messages = [];
+    var $new = false;
+    var $hasForum = false;
+
+    /**
+     * Constructor for class Issue
+     *
+     * $data is an Array with the following possible fields:
+     * issue_id:        when set, the Issue with this id is restored
+     * seminar_id:  when set and issue_id is not set, a new issue for this seminar is created
+     *
+     * returns NULL if both are unset
+     */
+    function __construct($data = []) {
+        global $user;
+
+        if ($data['issue_id']) {
+            $this->issue_id = $data['issue_id'];
+            $this->restore();
+        } else if ($data['seminar_id']) {
+            $this->issue_id = md5(uniqid('Issue'));
+            $this->seminar_id = $data['seminar_id'];
+            $this->mkdate = time();
+            $this->chdate = time();
+            $this->author_id = $user->id;
+            $this->new = true;
+        } else {
+            return NULL;
+        }
+    }
+
+    function getPriority() {
+        return $this->priority;
+    }
+
+    function setPriority($priority) {
+        $this->priority = $priority;
+    }
+
+    function getMkDate() {
+        return $this->mkdate;
+    }
+
+    function getChDate() {
+        return $this->chdate;
+    }
+
+    function getTitle() {
+        return $this->title;
+    }
+
+    function setTitle($title) {
+        $this->title = $title;
+    }
+
+    function getDescription() {
+        return $this->description;
+    }
+
+    function setDescription($description) {
+        $this->description = $description;
+    }
+
+    function getAuthorID() {
+        return $this->author_id;
+    }
+
+    function getIssueID() {
+        return $this->issue_id;
+    }
+
+    function setSeminarID($seminar_id) {
+        $this->seminar_id = $seminar_id;
+    }
+
+    function getSeminarID() {
+        return $this->seminar_id;
+    }
+
+    function readSingleDates() {
+        /*if ($termin_data = IssueDB::getTermine($this->issue_id)) {
+            foreach ($termin_data as $val) {
+                $this->singleDates[] = $val['termin_id'];
+            }
+            return TRUE;
+        }*/
+
+        return FALSE;
+
+    }
+
+    function store() {
+        $this->chdate = time();
+
+        if ($this->hasForum) {
+            $sem = Seminar::getInstance($this->seminar_id);
+            $forum_module = $sem->getSlotModule('forum');
+
+            if ($forum_module instanceof ForumModule) {
+                $forum_module->setThreadForIssue($this->issue_id, $this->title, $this->description);
+            }
+        }
+
+        IssueDB::storeIssue($this);
+        $this->new = false;
+    }
+
+    function restore() {
+        /*
+         * To avoid inconsistency, the restore function has been removed.
+         * The only way to load an Issue is via the Seminar.class.php, with the function fillValuesFromArray
+         */
+        $this->fillValuesFromArray(IssueDB::restoreIssue($this->issue_id));
+    }
+
+    function delete() {
+        $dates = IssueDB::getDatesforIssue($this->issue_id);
+
+        $titles = [];
+        $title = '';
+
+        foreach ($dates as $termin_id => $termin_data) {
+            $titles[] = date('d.m.y, H:i', $termin_data['date']).' - '.date('H:i', $termin_data['end_time']);
+        }
+
+        if (sizeof($titles) > 0) {
+            $title = implode(', ', $titles).', '.$this->getTitle() . ' ' ._("(Thema gelöscht)");
+        } else {
+            $title = $this->getTitle() . ' ' ._("(Thema gelöscht)");
+        }
+        $description = _("Dateiordner bezieht sich auf ein nicht mehr vorhandenes Thema.");
+
+        IssueDB::deleteIssue($this->issue_id, $this->seminar_id, $title, $description);
+    }
+
+    function fillValuesFromArray($data) {
+        $this->issue_id = $data['issue_id'];
+        $this->seminar_id = $data['seminar_id'];
+        $this->author_id = $data['author_id'];
+        $this->title = $data['title'];
+        $this->description = $data['description'];
+        $this->mkdate = $data['mkdate'];
+        $this->chdate = $data['chdate'];
+        $this->priority = $data['priority'];
+        $this->file = ($data['range_id'] == '') ? FALSE : TRUE;
+        if ($this->file) {
+            $this->folder_id = $data['folder_id'];
+        }
+        $this->new = false;
+
+        // check, if there is a forums-connection
+        $sem = Seminar::getInstance($this->seminar_id);
+        $forum_module = $sem->getSlotModule('forum');
+
+        if ($forum_module instanceof ForumModule) {
+            $this->hasForum = $forum_module->getLinkToThread($this->issue_id) ? true : false;
+        }
+
+        $this->readSingleDates();
+    }
+
+    function toString() {
+        return $this->title;
+    }
+
+    function getFolderID() {
+        if ($this->file) {
+            return $this->folder_id;
+        } else {
+            return FALSE;
+        }
+    }
+
+    function hasFile() {
+        return $this->file;
+    }
+
+    function setFile($file) {
+        if ($file != $this->file) {
+            if ($file) {
+                $this->messages[] = sprintf(_("Dateiordner für das Thema \"%s\" angelegt."),$this->toString());
+            } else {
+                //$this->messages[] = sprintf(_("Dateiordner für das Thema \"%s\" gelöscht!"),$this->toString());
+            }
+        }
+        $this->file = $file;
+    }
+
+    function setForum($newForumValue) {
+        // only do something, if we enable the link to a thread in a forum
+        if ($newForumValue) {
+
+            // find the ForumModule which takes the role of the CoreForum in the current Seminar
+            $sem = Seminar::getInstance($this->seminar_id);
+            $forum_module = $sem->getSlotModule('forum');
+
+            if ($forum_module instanceof ForumModule) {
+                // only link if there is none yet
+                if (!$forum_module->getLinkToThread($this->issue_id)) {
+                    $forum_module->setThreadForIssue($this->issue_id, $this->title, $this->description);
+                    $this->messages[] = sprintf(_("Ordner im Forum für das Thema \"%s\" angelegt."), $this->toString());
+                }
+            }
+        }
+    }
+
+    function getMessages() {
+        $temp = $this->messages;
+        $this->messages = NULL;
+        return $temp;
+    }
+
+  /* * * * * * * * * * * * * * * * * * * *
+     * * S T A T I C   F U N C T I O N S * *
+   * * * * * * * * * * * * * * * * * * * */
+
+    function isIssue($issue_id) {
+        return IssueDB::isIssue($issue_id);
+    }
+}
diff --git a/lib/raumzeit/IssueDB.class.php b/lib/raumzeit/IssueDB.class.php
deleted file mode 100644
index d6c0ba3..0000000
--- a/lib/raumzeit/IssueDB.class.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// IssueDB.class.php
-//
-// Datenbank-Abfragen für Issue.class.php
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * IssueDB.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- * @deprecated
- */
-
-class IssueDB
-{
-    public static function restoreIssue($issue_id)
-    {
-        $query = "SELECT *
-                  FROM themen
-                  WHERE issue_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$issue_id]);
-        return $statement->fetch(PDO::FETCH_ASSOC);
-    }
-
-    public static function storeIssue(&$issue)
-    {
-        if ($issue->new) {
-            $query = "INSERT INTO themen
-                        (issue_id, seminar_id, author_id, title, description, mkdate, chdate, priority)
-                      VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $issue->issue_id,
-                $issue->seminar_id,
-                $issue->author_id,
-                $issue->title,
-                $issue->description,
-                $issue->mkdate,
-                $issue->chdate,
-                $issue->priority
-            ]);
-        } else {
-            $query = "UPDATE themen
-                      SET seminar_id = ?, author_id = ?, title = ?, description = ?, mkdate = ?, priority = ?
-                      WHERE issue_id = ?";
-            $statement = DBManager::get()->prepare($query);
-            $statement->execute([
-                $issue->seminar_id,
-                $issue->author_id,
-                $issue->title,
-                $issue->description,
-                $issue->mkdate,
-                $issue->priority,
-                $issue->issue_id
-            ]);
-
-            if ($statement->rowCount()) {
-                $query = "UPDATE themen SET chdate = UNIX_TIMESTAMP() WHERE issue_id = ?";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([$issue->issue_id]);
-
-                $query = "SELECT termin_id FROM themen_termine WHERE issue_id = ?";
-                $statement = DBManager::get()->prepare($query);
-                $statement->execute([$issue->issue_id]);
-                $termin_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-                if (count($termin_ids) > 0) {
-                    $query = "UPDATE termine SET chdate = UNIX_TIMESTAMP() WHERE termin_id IN (?)";
-                    $statement = DBManager::get()->prepare($query);
-                    $statement->execute([$termin_ids]);
-                }
-            }
-
-        }
-        return TRUE;
-    }
-
-    public static function deleteIssue($issue_id)
-    {
-        $query = "DELETE FROM themen WHERE issue_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$issue_id]);
-
-        $query = "DELETE FROM themen_termine WHERE issue_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$issue_id]);
-    }
-
-    public static function isIssue($issue_id)
-    {
-        $query = "SELECT 1 FROM themen WHERE issue_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$issue_id]);
-        return (bool)$statement->fetchColumn();
-    }
-
-    public static function getDatesforIssue($issue_id)
-    {
-        $query = "SELECT termine.*
-                  FROM themen_termine
-                  INNER JOIN termine USING (termin_id)
-                  WHERE issue_id = ?
-                  ORDER BY `date` ASC";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$issue_id]);
-
-        $ret = [];
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $ret[$row['termin_id']] = $row;
-        }
-        return $ret;
-    }
-
-    public static function deleteAllIssues($course_id)
-    {
-        $query = "SELECT issue_id FROM themen WHERE seminar_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$course_id]);
-        $themen = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-        foreach ($themen as $issue_id) {
-            self::deleteIssue($issue_id, $course_id);
-        }
-
-        return count($themen);
-    }
-}
diff --git a/lib/raumzeit/IssueDB.php b/lib/raumzeit/IssueDB.php
new file mode 100644
index 0000000..d6c0ba3
--- /dev/null
+++ b/lib/raumzeit/IssueDB.php
@@ -0,0 +1,153 @@
+<?
+# Lifter002: TODO
+# Lifter003: TEST
+# Lifter007: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// IssueDB.class.php
+//
+// Datenbank-Abfragen für Issue.class.php
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * IssueDB.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ * @deprecated
+ */
+
+class IssueDB
+{
+    public static function restoreIssue($issue_id)
+    {
+        $query = "SELECT *
+                  FROM themen
+                  WHERE issue_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$issue_id]);
+        return $statement->fetch(PDO::FETCH_ASSOC);
+    }
+
+    public static function storeIssue(&$issue)
+    {
+        if ($issue->new) {
+            $query = "INSERT INTO themen
+                        (issue_id, seminar_id, author_id, title, description, mkdate, chdate, priority)
+                      VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $issue->issue_id,
+                $issue->seminar_id,
+                $issue->author_id,
+                $issue->title,
+                $issue->description,
+                $issue->mkdate,
+                $issue->chdate,
+                $issue->priority
+            ]);
+        } else {
+            $query = "UPDATE themen
+                      SET seminar_id = ?, author_id = ?, title = ?, description = ?, mkdate = ?, priority = ?
+                      WHERE issue_id = ?";
+            $statement = DBManager::get()->prepare($query);
+            $statement->execute([
+                $issue->seminar_id,
+                $issue->author_id,
+                $issue->title,
+                $issue->description,
+                $issue->mkdate,
+                $issue->priority,
+                $issue->issue_id
+            ]);
+
+            if ($statement->rowCount()) {
+                $query = "UPDATE themen SET chdate = UNIX_TIMESTAMP() WHERE issue_id = ?";
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute([$issue->issue_id]);
+
+                $query = "SELECT termin_id FROM themen_termine WHERE issue_id = ?";
+                $statement = DBManager::get()->prepare($query);
+                $statement->execute([$issue->issue_id]);
+                $termin_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+                if (count($termin_ids) > 0) {
+                    $query = "UPDATE termine SET chdate = UNIX_TIMESTAMP() WHERE termin_id IN (?)";
+                    $statement = DBManager::get()->prepare($query);
+                    $statement->execute([$termin_ids]);
+                }
+            }
+
+        }
+        return TRUE;
+    }
+
+    public static function deleteIssue($issue_id)
+    {
+        $query = "DELETE FROM themen WHERE issue_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$issue_id]);
+
+        $query = "DELETE FROM themen_termine WHERE issue_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$issue_id]);
+    }
+
+    public static function isIssue($issue_id)
+    {
+        $query = "SELECT 1 FROM themen WHERE issue_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$issue_id]);
+        return (bool)$statement->fetchColumn();
+    }
+
+    public static function getDatesforIssue($issue_id)
+    {
+        $query = "SELECT termine.*
+                  FROM themen_termine
+                  INNER JOIN termine USING (termin_id)
+                  WHERE issue_id = ?
+                  ORDER BY `date` ASC";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$issue_id]);
+
+        $ret = [];
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $ret[$row['termin_id']] = $row;
+        }
+        return $ret;
+    }
+
+    public static function deleteAllIssues($course_id)
+    {
+        $query = "SELECT issue_id FROM themen WHERE seminar_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$course_id]);
+        $themen = $statement->fetchAll(PDO::FETCH_COLUMN);
+
+        foreach ($themen as $issue_id) {
+            self::deleteIssue($issue_id, $course_id);
+        }
+
+        return count($themen);
+    }
+}
diff --git a/lib/raumzeit/MetaDate.class.php b/lib/raumzeit/MetaDate.class.php
deleted file mode 100644
index 0af632d..0000000
--- a/lib/raumzeit/MetaDate.class.php
+++ /dev/null
@@ -1,697 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// MetaDate.class.php
-//
-// Repräsentiert die Zeit- und Turnusdaten einer Veranstaltung
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * MetaDate.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     28. Juni 2007
- * @access      protected
- * @package     raumzeit
- */
-class MetaDate
-{
-    var $seminar_id          = '';
-    var $seminarStartTime    = 0;
-    var $seminarDurationTime = 0;
-    var $cycles              = [];
-    var $hasDatesTmp         = [];
-
-    /**
-     * Constructor
-     * @param string $seminar_id
-     */
-    function __construct($seminar_id = '')
-    {
-        if ($seminar_id != '') {
-            $this->seminar_id = $seminar_id;
-            $this->restore();
-        }
-
-    }
-
-    /**
-     * returns start week (Semesterwoche) for a cycledate
-     * for compatibility the first cycledate is chosen if no one is specified
-     *
-     * @deprecated
-     * @param string id of cycledate
-     * @return int
-     */
-    function getStartWoche($metadate_id = null)
-    {
-        if ($metadate_id) {
-            return $this->cycles[$metadate_id]->week_offset;
-        } else {
-            $first_metadate = $this->getFirstMetadate();
-            return $first_metadate ? $first_metadate->week_offset : null;
-        }
-    }
-
-    /**
-     * sets start week (Semesterwoche) for a cycledate
-     * for compatibility the first cycledate is chosen if no one is specified
-     *
-     * @deprecated
-     * @param int    $start_woche
-     * @param string $metadate_id
-     * @return null|Ambigous <NULL, unknown>
-     */
-    function setStartWoche($start_woche, $metadate_id = null)
-    {
-        if ($metadate_id) {
-            return $this->cycles[$metadate_id]->week_offset = $start_woche;
-        } else {
-            $first_metadate = $this->getFirstMetadate();
-            return $first_metadate ? $first_metadate->week_offset = $start_woche : null;
-        }
-    }
-
-    /**
-     * returns first cycledate
-     *
-     * @return CycleData
-     */
-    function getFirstMetadate()
-    {
-        $cycles = array_keys($this->cycles);
-        $first_metadate_id = array_shift($cycles);
-        return $first_metadate_id ? $this->cycles[$first_metadate_id] : null;
-    }
-
-    /**
-     * returns the cycle for a cycledate
-     * for compatibility the first cycledate is chosen if no one is specified
-     *
-     * @deprecated
-     * @param string $metadate_id
-     * @return int 0,1,2 for weekly, biweekly ...
-     */
-    function getTurnus($metadate_id = null)
-    {
-        if ($metadate_id) {
-            return $this->cycles[$metadate_id]->cycle;
-        } else {
-            $first_metadate = $this->getFirstMetadate();
-            return $first_metadate ? $first_metadate->cycle : null;
-        }
-    }
-
-    /**
-     * set the cycle for a cycledate
-     * for compatibility the first cycledate is chosen if no one is specified
-     *
-     * @deprecated
-     * @param        int 0,1,2 for weekly, biweekly ...
-     * @param string $metadate_id
-     * @return int
-     */
-    function setTurnus($turnus, $metadate_id = null)
-    {
-        if ($metadate_id) {
-            return $this->cycles[$metadate_id]->cycle = $turnus;
-        } else {
-            $first_metadate = $this->getFirstMetadate();
-            return $first_metadate ? $first_metadate->cycle = $turnus : null;
-        }
-    }
-
-    function setSeminarStartTime($start)
-    {
-        $this->seminarStartTime = $start;
-    }
-
-    function setSeminarDurationTime($duration)
-    {
-        $this->seminarDurationTime = $duration;
-    }
-
-    function getSeminarID()
-    {
-        return $this->seminar_id;
-    }
-
-    /**
-     * internal method to apply cycledate data from assoc array to a given
-     * CycleData object. checks the start and endtime and retruns false if wrong
-     *
-     * @deprecated
-     * @param           array assoc, see CycleData, metadate_id must be in $data['cycle_id']
-     * @param CycleData $cycle
-     * @return boolean
-     */
-    function setCycleData($data, $cycle)
-    {
-        $cycle->seminar_id = $this->getSeminarId();
-        $cycles = array_keys($this->cycles);
-        if ($last_one = array_pop($cycles)) {
-            $cycle->sorter = $this->cycles[$last_one]->sorter > 0 ? $this->cycles[$last_one]->sorter + 1 : 0;
-        }
-        if ($cycle->getDescription() != $data['description']) {
-            $cycle->setDescription($data['description']);
-        }
-
-        if (isset($data['weekday'])) $cycle->weekday = (int)$data['weekday'];
-        if (isset($data['week_offset'])) $cycle->week_offset = (int)$data['week_offset'];
-        if (isset($data['cycle'])) $cycle->cycle = (int)$data['cycle'];
-        if (isset($data['sws'])) $cycle->sws = $data['sws'];
-        if (isset($data['endWeek'])) $cycle->end_offset = (int)$data['endWeek'];
-        if (isset($data['day']) && isset($data['start_stunde']) && isset($data['start_minute']) && isset($data['end_stunde']) && isset($data['end_minute'])) {
-
-            if (
-                ($data['start_stunde'] > 23) || ($data['start_stunde'] < 0) ||
-                ($data['end_stunde'] > 23) || ($data['end_stunde'] < 0) ||
-                ($data['start_minute'] > 59) || ($data['start_minute'] < 0) ||
-                ($data['end_minute'] > 59) || ($data['end_minute'] < 0)
-            ) {
-                return FALSE;
-            }
-
-            if (mktime((int)$data['start_stunde'], (int)$data['start_minute']) < mktime((int)$data['end_stunde'], (int)$data['end_minute'])) {
-                $cycle->setDay($data['day']);
-                $cycle->setStart($data['start_stunde'], $data['start_minute']);
-                $cycle->setEnd($data['end_stunde'], $data['end_minute']);
-                return TRUE;
-            }
-        }
-
-        return FALSE;
-    }
-
-
-    /**
-     * adds a new cycledate, single dates are created if second param is true
-     *
-     * @param      array assoc, see CycleData, metadate_id must be in $data['cycle_id']
-     * @param bool $create_single_dates
-     * @return string|boolean metadate_id of created cycle
-     */
-    function addCycle($data = [], $create_single_dates = true)
-    {
-        $data['day'] = (int)$data['day'];
-        $data['start_stunde'] = (int)$data['start_stunde'];
-        $data['start_minute'] = (int)$data['start_minute'];
-        $data['end_stunde'] = (int)$data['end_stunde'];
-        $data['end_minute'] = (int)$data['end_minute'];
-
-        $cycle = new CycleData();
-
-        if ($this->setCycleData($data, $cycle)) {
-            $this->cycles[$cycle->getMetadateID()] = $cycle;
-            $this->sortCycleData();
-            if ($create_single_dates) $this->createSingleDates($cycle->getMetadateID());
-            return $cycle->getMetadateID();
-        }
-        return FALSE;
-    }
-
-    /**
-     * change existing cycledate, changes also corresponding single dates
-     *
-     * @param array assoc, see CycleData, metadate_id must be in $data['cycle_id']
-     * @return number|boolean
-     */
-    function editCycle($data = [])
-    {
-        $cycle = $this->cycles[$data['cycle_id']];
-        $new_start = mktime((int)$data['start_stunde'], (int)$data['start_minute']);
-        $new_end = mktime((int)$data['end_stunde'], (int)$data['end_minute']);
-        $old_start = mktime($cycle->getStartStunde(), $cycle->getStartMinute());
-        $old_end = mktime($cycle->getEndStunde(), $cycle->getEndMinute());
-
-        if (($new_start >= $old_start) && ($new_end <= $old_end) && ($data['day'] == $cycle->day) && ($data['endWeek'] == $cycle->end_offset)) {
-            // Zeitraum wurde verkuerzt, Raumbuchungen bleiben erhalten...
-            if ($this->setCycleData($data, $cycle)) {
-                $termine = $cycle->getSingleDates();
-                foreach ($termine as $key => $val) {
-                    $tos = $val->getStartTime();
-                    $toe = $val->getEndTime();
-                    if ($toe > time()) {
-                        $t_start = mktime((int)$data['start_stunde'], (int)$data['start_minute'], 0, date('m', $tos), date('d', $tos), date('Y', $tos));
-                        $t_end = mktime((int)$data['end_stunde'], (int)$data['end_minute'], 0, date('m', $toe), date('d', $toe), date('Y', $toe));
-                        $termine[$key]->setTime($t_start, $t_end);
-                        $termine[$key]->store();
-                    } else {
-                        unset($termine[$key]);
-                    }
-                }
-                $this->sortCycleData();
-            }
-            return sizeof($termine);
-        } else {
-            if ($this->setCycleData($data, $cycle)) {
-                // collect all existing themes (issues) for this cycle:
-                $issues = [];
-                $issue_objects = [];
-                $singledate_count = 0;
-
-                // loop through the single dates and look for themes (issues)
-                $termine = $cycle->getSingleDates();
-                foreach ($termine as $key => $termin) {
-                    // get all isues of this date ( zero, one, or more, if the expert view is activated)
-                    // and store them at the relative position of this single date
-                    $issues[$singledate_count] = $termin->getIssueIDs();
-                    $singledate_count++;
-                }
-                // remove all SingleDates in the future for this CycleData
-                $count = CycleDataDB::deleteNewerSingleDates($data['cycle_id'], time());
-                // create new SingleDates
-                $this->createSingleDates(['metadate_id'         => $cycle->getMetaDateId(),
-                                               'startAfterTimeStamp' => time()
-                ]);
-
-                // clear all loaded SingleDates so no odd ones remain. The Seminar-Class will load them fresh when needed
-                $cycle->termine = NULL;
-
-                // read all new single dates
-                $termine = $cycle->getSingleDates();
-
-                // new dates counter
-                $new_singledate_count = 0;
-
-                // loop through the single dates and add the themes (issues)
-                foreach ($termine as $key => $termin) {
-                    // check, if there are issues for this single date
-                    if ($issues[$new_singledate_count] != NULL) {
-                        // add all issues:
-                        foreach ($issues[$new_singledate_count] as $issue_key => $issue_id) {
-                            $termin->addIssueID($issue_id);
-                            $termin->store();
-                        }
-                    }
-                    unset($issues[$new_singledate_count]);
-                    $new_singledate_count++;
-                }
-
-                // delete issues, that are not assigned to a single date because of to few dates
-                // (only if the schedule expert view is off)
-                if (!Config::get()->RESOURCES_ENABLES_EXPERT_SCHEDULE_VIEW) {
-                    if ($new_singledate_count < $singledate_count) {
-                        for ($i = $new_singledate_count; $i < $singledate_count; $i++) {
-                            if ($issues[$i] != NULL) {
-                                foreach ($issues[$i] as $issue_id) {
-                                    // delete this issue
-                                    IssueDB::deleteIssue($issue_id);
-                                }
-                            }
-                        }
-                    }
-                }
-                $this->sortCycleData();
-                return $count;
-            }
-        }
-        return FALSE;
-    }
-
-    /**
-     * completey remove cycledate
-     * @see CycleData::delete()
-     * @param string $cycle_id
-     * @return boolean
-     */
-    function deleteCycle($cycle_id)
-    {
-        $this->cycles[$cycle_id]->delete();
-        unset ($this->cycles[$cycle_id]);
-        return TRUE;
-    }
-
-    function deleteSingleDate($cycle_id, $date_id, $filterStart, $filterEnd)
-    {
-        $this->cycles[$cycle_id]->deleteSingleDate($date_id, $filterStart, $filterEnd);
-    }
-
-    function unDeleteSingleDate($cycle_id, $date_id, $filterStart, $filterEnd)
-    {
-        return $this->cycles[$cycle_id]->unDeleteSingleDate($date_id, $filterStart, $filterEnd);
-    }
-
-    /**
-     * store all changes to cycledates for the course, removed cycles are deleted from database
-     * @return int > 0 if changes where made
-     */
-    function store()
-    {
-        $old_cycle_dates = [];
-        $changed = 0;
-        foreach (SeminarCycleDate::findBySeminar($this->seminar_id) as $c) {
-            $old_cycle_dates[$c->getId()] = $c;
-        }
-        $removed = array_diff(array_keys($old_cycle_dates), array_keys($this->cycles));
-        foreach ($removed as $one) {
-            $changed += $old_cycle_dates[$one]->delete();
-        }
-        foreach ($this->cycles as $one) {
-            $changed += $one->storeCycleDate();
-        }
-        $this->sortCycleData();
-        return $changed;
-    }
-
-
-    /**
-     * load all cycledates from database
-     */
-    function restore()
-    {
-        $this->cycles = [];
-        foreach (SeminarCycleDate::findBySeminar($this->seminar_id) as $c) {
-            $this->cycles[$c->getId()] = new CycleData($c);
-        }
-        $this->sortCycleData();
-    }
-
-    function delete($removeSingleDates = TRUE)
-    {
-        //TODO: Löschen eines MetaDate-Eintrages (CycleData);
-    }
-
-    /**
-     * sort cycledates by sorter column and date
-     */
-    function sortCycleData()
-    {
-        uasort($this->cycles, function ($a, $b) {
-            return $a->sorter - $b->sorter
-                ?: $a->weekday - $b->weekday
-                ?: $a->start_hour - $b->start_hour;
-        });
-    }
-
-    /**
-     * returns cycledates as arrays
-     *
-     * @param bool $show_invisibles if cycles without dates should
-     *                              be in the array, defaults to false
-     * @return array assoc of cycledate data arrays
-     */
-    function getCycleData($show_invisibles = false)
-    {
-        $ret = [];
-
-        foreach ($this->cycles as $val) {
-            if ($val->is_visible || $show_invisibles) {
-                $ret[$val->getMetaDateID()] = $val->toArray();
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * returns the cycledate objects
-     * @return array of CycleData objects
-     */
-    function getCycles()
-    {
-        return $this->cycles;
-    }
-
-    /**
-     * returns an array of SingleDate objects corresponding to the given cycle id
-     * use the optional params to specify a timerange
-     *
-     * @param string a cycle id
-     * @param int    unix timestamp
-     * @param int    unix timestamp
-     * @return array of SingleDate objects
-     */
-    function getSingleDates($metadate_id, $filterStart = 0, $filterEnd = 0)
-    {
-        if (!$this->cycles[$metadate_id]->termine) {
-            $this->readSingleDates($metadate_id, $filterStart, $filterEnd);
-        }
-
-        return $this->cycles[$metadate_id]->termine;
-    }
-
-    /**
-     * reload SingleDate objects for a given cycle id
-     *
-     * @param string $metadate_id
-     * @param int    $start
-     * @param int    $end
-     * @return bool
-     */
-    function readSingleDates($metadate_id, $start = 0, $end = 0)
-    {
-        return $this->cycles[$metadate_id]->readSingleDates($start, $end);
-    }
-
-    /**
-     * returns true if a given cycle has at least one date at all or in the given time range
-     *
-     * @param string $metadate_id
-     * @param int $filterStart
-     * @param int $filterEnd
-     * @return bool
-     */
-    function hasDates($metadate_id, $filterStart = 0, $filterEnd = 0)
-    {
-        if (!isset($this->hasDatesTmp[$metadate_id])) {
-            $this->hasDatesTmp[$metadate_id] = MetaDateDB::has_dates($metadate_id, $this->getSeminarID(), $filterStart, $filterEnd);
-        }
-
-        return $this->hasDatesTmp[$metadate_id];
-    }
-
-    /**
-     * create single dates for one cycle and all semester and store them in database, deleting obsolete ones
-     *
-     * @param mixed cycle id (string) or array with 'metadate_id' => string cycle id, 'startAfterTimeStamp' => int timestamp to override semester start
-     */
-    function createSingleDates($data)
-    {
-        foreach ($this->getVirtualSingleDates($data) as $semester_id => $dates_for_semester) {
-            list($dates, $dates_to_delete) = array_values($dates_for_semester);
-            foreach ($dates_to_delete as $d) $d->delete();
-            foreach ($dates as $d) {
-                if ($d->isUpdate()) continue; //vorhandene Termine nicht speichern wg. chdate
-                $d->store();
-            }
-        }
-        //das sollte nicht nötig sein, muss aber erst genauer untersucht werden
-        $this->store();
-        $this->restore();
-    }
-
-    /**
-     * generate single date objects for one cycle and all semester, existing dates are merged in
-     *
-     * @param mixed cycle id (string) or array with 'metadate_id' => string cycle id, 'startAfterTimeStamp' => int timestamp to override semester start
-     * @return array array of arrays, for each semester id  an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
-     */
-    function getVirtualSingleDates($data)
-    {
-        if (is_array($data)) {
-            $metadate_id = $data['metadate_id'];
-            $startAfterTimeStamp = $data['startAfterTimeStamp'];
-        } else {
-            $metadate_id = $data;
-            $startAfterTimeStamp = 0;
-        }
-
-        $ret = [];
-
-        $all_semester = Semester::findAllVisible(false);
-        $sem_begin = null;
-        $sem_end = null;
-        // get the starting-point for creating singleDates for the choosen cycleData
-        foreach ($all_semester as $val) {
-            if (($this->seminarStartTime >= $val["beginn"]) && ($this->seminarStartTime <= $val["ende"])) {
-                $sem_begin = mktime(0, 0, 0, date("n", $val["vorles_beginn"]), date("j", $val["vorles_beginn"]), date("Y", $val["vorles_beginn"]));
-            }
-        }
-
-        // get the end-point
-        if ($this->seminarDurationTime == -1) {
-            foreach ($all_semester as $val) {
-                $sem_end = $val['vorles_ende'];
-            }
-        } else {
-            $i = 0;
-            foreach ($all_semester as $val) {
-                $i++;
-                $timestamp = $this->seminarDurationTime + $this->seminarStartTime;
-                if (($timestamp >= $val['beginn']) && ($timestamp <= $val['ende'])) {
-                    $sem_end = $val["vorles_ende"];
-                }
-            }
-        }
-
-        $passed = false;
-        foreach ($all_semester as $val) {
-            if ($sem_begin <= $val['vorles_beginn']) {
-                $passed = true;
-            }
-            if ($passed && ($sem_end >= $val['vorles_ende']) && ($startAfterTimeStamp <= $val['ende'])) {
-                $ret[$val['semester_id']] = $this->getVirtualSingleDatesForSemester($metadate_id, $val['vorles_beginn'], $val['vorles_ende'], $startAfterTimeStamp);
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * generate single date objects for one cycle and one semester, existing dates are merged in
-     *
-     * @param string cycle id
-     * @param int    timestamp of semester start
-     * @param int    timestamp of semester end
-     * @param int    alternative timestamp to start from
-     * @param int    correction calculation (obsolete)
-     * @return array returns an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
-     */
-    function getVirtualSingleDatesForSemester($metadate_id, $sem_begin, $sem_end, $startAfterTimeStamp, $corr = 0)
-    {
-        $dates = [];
-        $dates_to_delete = [];
-
-        // loads the singledates of the by metadate_id denoted regular time-entry into the object
-        $this->readSingleDates($metadate_id);
-
-        // The currently existing singledates for the by metadate_id denoted  regular time-entry
-        $existingSingleDates =& $this->cycles[$metadate_id]->getSingleDates();
-
-        $start_woche = $this->cycles[$metadate_id]->week_offset;
-        $end_woche = $this->cycles[$metadate_id]->end_offset;
-
-        $turnus = $this->cycles[$metadate_id]->cycle;
-
-        // This variable is used to check if a given singledate shall be created in a bi-weekly seminar.
-        if ($start_woche == -1) $start_woche = 0;
-
-        $week = 0;
-
-        // get the first presence date after sem_begin
-        $day_of_week = date('l', strtotime('Sunday + ' . $this->cycles[$metadate_id]->day . ' days'));
-        $stamp = strtotime('this week ' . $day_of_week, $sem_begin);
-
-        $start_time = mktime(
-            (int)$this->cycles[$metadate_id]->start_stunde,     // Hour
-            (int)$this->cycles[$metadate_id]->start_minute,     // Minute
-            0,                                                  // Second
-            date("n", $stamp),                                  // Month
-            date("j", $stamp),                                  // Day
-            date("Y", $stamp));                                 // Year
-
-        $end_time = mktime(
-            (int)$this->cycles[$metadate_id]->end_stunde,       // Hour
-            (int)$this->cycles[$metadate_id]->end_minute,       // Minute
-            0,                                                  // Second
-            date("n", $stamp),                                  // Month
-            date("j", $stamp),                                  // Day
-            date("Y", $stamp));                                 // Year
-
-        // loop through all possible singledates for this regular time-entry
-        do {
-
-            // if dateExists is true, the singledate will not be created. Default is of course to create the singledate
-            $dateExists = false;
-
-            // do not create singledates if they are earlier than the semester start
-            if ($end_time < $sem_begin) $dateExists = true;
-
-            // do not create singledates, if they are earlier then the chosen start-week
-            if ($start_woche > $week || (isset($end_woche) && $week > $end_woche)) $dateExists = true;
-
-            // bi-weekly check
-            if ($turnus > 0 && ($week - $start_woche) > 0 && (($week - $start_woche) % ($turnus + 1))) {
-                $dateExists = true;
-            }
-
-            /*
-             * We only create dates, which do not already exist, so we do not overwrite existing dates.
-             *
-             * Additionally, we delete singledates which are not needed any more (bi-weekly, changed start-week, etc.)
-             */
-            foreach ($existingSingleDates as $key => $val) {
-                // take only the singledate into account, that maps the current timepoint
-                if ($start_time > $startAfterTimeStamp && ($val->date == $start_time) && ($val->end_time == $end_time)) {
-
-                    // bi-weekly check
-                    if ($turnus > 0 && ($week - $start_woche) > 0 && (($week - $start_woche) % ($turnus + 1))) {
-                        $dates_to_delete[$key] = $val;
-                        unset($existingSingleDates[$key]);
-                    }
-
-                    // delete singledates if they are earlier than the chosen start-week
-                    if ($start_woche > $week || (isset($end_woche) && $week > $end_woche)) {
-                        $dates_to_delete[$key] = $val;
-                        unset($existingSingleDates[$key]);
-                    }
-
-                    $dateExists = true;
-                    if (isset($existingSingleDates[$key])) {
-                        $dates[$key] = $val;
-                    }
-                }
-            }
-
-            if ($start_time < $startAfterTimeStamp) {
-                $dateExists = true;
-            }
-
-            if (!$dateExists) {
-
-                $termin = new SingleDate(['seminar_id' => $this->seminar_id]);
-
-                $all_holiday = SemesterHoliday::getAll(); // fetch all Holidays
-                foreach ($all_holiday as $val2) {
-                    if (($val2["beginn"] <= $start_time) && ($start_time <= $val2["ende"])) {
-                        $termin->setExTermin(true);
-                    }
-                }
-
-                //check for calculatable holidays
-                if (!$termin->isExTermin()) {
-                    $holy_type = holiday($start_time);
-                    if ($holy_type["col"] == 3) {
-                        $termin->setExTermin(true);
-                    }
-                }
-
-                // fill the singleDate-Object with data
-                $termin->setMetaDateID($metadate_id);
-                $termin->setTime($start_time, $end_time);
-                $termin->setDateType(1); //best guess
-
-                $dates[$termin->getTerminID()] = $termin;
-            }
-
-            //inc the week, create timestamps for the next singledate
-            $start_time = strtotime('+1 week', $start_time);
-            $end_time = strtotime('+1 week', $end_time);
-
-            $week++;
-
-        } while ($end_time < $sem_end);
-
-        return ['dates' => $dates, 'dates_to_delete' => $dates_to_delete];
-    }
-}
diff --git a/lib/raumzeit/MetaDate.php b/lib/raumzeit/MetaDate.php
new file mode 100644
index 0000000..0af632d
--- /dev/null
+++ b/lib/raumzeit/MetaDate.php
@@ -0,0 +1,697 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// MetaDate.class.php
+//
+// Repräsentiert die Zeit- und Turnusdaten einer Veranstaltung
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * MetaDate.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     28. Juni 2007
+ * @access      protected
+ * @package     raumzeit
+ */
+class MetaDate
+{
+    var $seminar_id          = '';
+    var $seminarStartTime    = 0;
+    var $seminarDurationTime = 0;
+    var $cycles              = [];
+    var $hasDatesTmp         = [];
+
+    /**
+     * Constructor
+     * @param string $seminar_id
+     */
+    function __construct($seminar_id = '')
+    {
+        if ($seminar_id != '') {
+            $this->seminar_id = $seminar_id;
+            $this->restore();
+        }
+
+    }
+
+    /**
+     * returns start week (Semesterwoche) for a cycledate
+     * for compatibility the first cycledate is chosen if no one is specified
+     *
+     * @deprecated
+     * @param string id of cycledate
+     * @return int
+     */
+    function getStartWoche($metadate_id = null)
+    {
+        if ($metadate_id) {
+            return $this->cycles[$metadate_id]->week_offset;
+        } else {
+            $first_metadate = $this->getFirstMetadate();
+            return $first_metadate ? $first_metadate->week_offset : null;
+        }
+    }
+
+    /**
+     * sets start week (Semesterwoche) for a cycledate
+     * for compatibility the first cycledate is chosen if no one is specified
+     *
+     * @deprecated
+     * @param int    $start_woche
+     * @param string $metadate_id
+     * @return null|Ambigous <NULL, unknown>
+     */
+    function setStartWoche($start_woche, $metadate_id = null)
+    {
+        if ($metadate_id) {
+            return $this->cycles[$metadate_id]->week_offset = $start_woche;
+        } else {
+            $first_metadate = $this->getFirstMetadate();
+            return $first_metadate ? $first_metadate->week_offset = $start_woche : null;
+        }
+    }
+
+    /**
+     * returns first cycledate
+     *
+     * @return CycleData
+     */
+    function getFirstMetadate()
+    {
+        $cycles = array_keys($this->cycles);
+        $first_metadate_id = array_shift($cycles);
+        return $first_metadate_id ? $this->cycles[$first_metadate_id] : null;
+    }
+
+    /**
+     * returns the cycle for a cycledate
+     * for compatibility the first cycledate is chosen if no one is specified
+     *
+     * @deprecated
+     * @param string $metadate_id
+     * @return int 0,1,2 for weekly, biweekly ...
+     */
+    function getTurnus($metadate_id = null)
+    {
+        if ($metadate_id) {
+            return $this->cycles[$metadate_id]->cycle;
+        } else {
+            $first_metadate = $this->getFirstMetadate();
+            return $first_metadate ? $first_metadate->cycle : null;
+        }
+    }
+
+    /**
+     * set the cycle for a cycledate
+     * for compatibility the first cycledate is chosen if no one is specified
+     *
+     * @deprecated
+     * @param        int 0,1,2 for weekly, biweekly ...
+     * @param string $metadate_id
+     * @return int
+     */
+    function setTurnus($turnus, $metadate_id = null)
+    {
+        if ($metadate_id) {
+            return $this->cycles[$metadate_id]->cycle = $turnus;
+        } else {
+            $first_metadate = $this->getFirstMetadate();
+            return $first_metadate ? $first_metadate->cycle = $turnus : null;
+        }
+    }
+
+    function setSeminarStartTime($start)
+    {
+        $this->seminarStartTime = $start;
+    }
+
+    function setSeminarDurationTime($duration)
+    {
+        $this->seminarDurationTime = $duration;
+    }
+
+    function getSeminarID()
+    {
+        return $this->seminar_id;
+    }
+
+    /**
+     * internal method to apply cycledate data from assoc array to a given
+     * CycleData object. checks the start and endtime and retruns false if wrong
+     *
+     * @deprecated
+     * @param           array assoc, see CycleData, metadate_id must be in $data['cycle_id']
+     * @param CycleData $cycle
+     * @return boolean
+     */
+    function setCycleData($data, $cycle)
+    {
+        $cycle->seminar_id = $this->getSeminarId();
+        $cycles = array_keys($this->cycles);
+        if ($last_one = array_pop($cycles)) {
+            $cycle->sorter = $this->cycles[$last_one]->sorter > 0 ? $this->cycles[$last_one]->sorter + 1 : 0;
+        }
+        if ($cycle->getDescription() != $data['description']) {
+            $cycle->setDescription($data['description']);
+        }
+
+        if (isset($data['weekday'])) $cycle->weekday = (int)$data['weekday'];
+        if (isset($data['week_offset'])) $cycle->week_offset = (int)$data['week_offset'];
+        if (isset($data['cycle'])) $cycle->cycle = (int)$data['cycle'];
+        if (isset($data['sws'])) $cycle->sws = $data['sws'];
+        if (isset($data['endWeek'])) $cycle->end_offset = (int)$data['endWeek'];
+        if (isset($data['day']) && isset($data['start_stunde']) && isset($data['start_minute']) && isset($data['end_stunde']) && isset($data['end_minute'])) {
+
+            if (
+                ($data['start_stunde'] > 23) || ($data['start_stunde'] < 0) ||
+                ($data['end_stunde'] > 23) || ($data['end_stunde'] < 0) ||
+                ($data['start_minute'] > 59) || ($data['start_minute'] < 0) ||
+                ($data['end_minute'] > 59) || ($data['end_minute'] < 0)
+            ) {
+                return FALSE;
+            }
+
+            if (mktime((int)$data['start_stunde'], (int)$data['start_minute']) < mktime((int)$data['end_stunde'], (int)$data['end_minute'])) {
+                $cycle->setDay($data['day']);
+                $cycle->setStart($data['start_stunde'], $data['start_minute']);
+                $cycle->setEnd($data['end_stunde'], $data['end_minute']);
+                return TRUE;
+            }
+        }
+
+        return FALSE;
+    }
+
+
+    /**
+     * adds a new cycledate, single dates are created if second param is true
+     *
+     * @param      array assoc, see CycleData, metadate_id must be in $data['cycle_id']
+     * @param bool $create_single_dates
+     * @return string|boolean metadate_id of created cycle
+     */
+    function addCycle($data = [], $create_single_dates = true)
+    {
+        $data['day'] = (int)$data['day'];
+        $data['start_stunde'] = (int)$data['start_stunde'];
+        $data['start_minute'] = (int)$data['start_minute'];
+        $data['end_stunde'] = (int)$data['end_stunde'];
+        $data['end_minute'] = (int)$data['end_minute'];
+
+        $cycle = new CycleData();
+
+        if ($this->setCycleData($data, $cycle)) {
+            $this->cycles[$cycle->getMetadateID()] = $cycle;
+            $this->sortCycleData();
+            if ($create_single_dates) $this->createSingleDates($cycle->getMetadateID());
+            return $cycle->getMetadateID();
+        }
+        return FALSE;
+    }
+
+    /**
+     * change existing cycledate, changes also corresponding single dates
+     *
+     * @param array assoc, see CycleData, metadate_id must be in $data['cycle_id']
+     * @return number|boolean
+     */
+    function editCycle($data = [])
+    {
+        $cycle = $this->cycles[$data['cycle_id']];
+        $new_start = mktime((int)$data['start_stunde'], (int)$data['start_minute']);
+        $new_end = mktime((int)$data['end_stunde'], (int)$data['end_minute']);
+        $old_start = mktime($cycle->getStartStunde(), $cycle->getStartMinute());
+        $old_end = mktime($cycle->getEndStunde(), $cycle->getEndMinute());
+
+        if (($new_start >= $old_start) && ($new_end <= $old_end) && ($data['day'] == $cycle->day) && ($data['endWeek'] == $cycle->end_offset)) {
+            // Zeitraum wurde verkuerzt, Raumbuchungen bleiben erhalten...
+            if ($this->setCycleData($data, $cycle)) {
+                $termine = $cycle->getSingleDates();
+                foreach ($termine as $key => $val) {
+                    $tos = $val->getStartTime();
+                    $toe = $val->getEndTime();
+                    if ($toe > time()) {
+                        $t_start = mktime((int)$data['start_stunde'], (int)$data['start_minute'], 0, date('m', $tos), date('d', $tos), date('Y', $tos));
+                        $t_end = mktime((int)$data['end_stunde'], (int)$data['end_minute'], 0, date('m', $toe), date('d', $toe), date('Y', $toe));
+                        $termine[$key]->setTime($t_start, $t_end);
+                        $termine[$key]->store();
+                    } else {
+                        unset($termine[$key]);
+                    }
+                }
+                $this->sortCycleData();
+            }
+            return sizeof($termine);
+        } else {
+            if ($this->setCycleData($data, $cycle)) {
+                // collect all existing themes (issues) for this cycle:
+                $issues = [];
+                $issue_objects = [];
+                $singledate_count = 0;
+
+                // loop through the single dates and look for themes (issues)
+                $termine = $cycle->getSingleDates();
+                foreach ($termine as $key => $termin) {
+                    // get all isues of this date ( zero, one, or more, if the expert view is activated)
+                    // and store them at the relative position of this single date
+                    $issues[$singledate_count] = $termin->getIssueIDs();
+                    $singledate_count++;
+                }
+                // remove all SingleDates in the future for this CycleData
+                $count = CycleDataDB::deleteNewerSingleDates($data['cycle_id'], time());
+                // create new SingleDates
+                $this->createSingleDates(['metadate_id'         => $cycle->getMetaDateId(),
+                                               'startAfterTimeStamp' => time()
+                ]);
+
+                // clear all loaded SingleDates so no odd ones remain. The Seminar-Class will load them fresh when needed
+                $cycle->termine = NULL;
+
+                // read all new single dates
+                $termine = $cycle->getSingleDates();
+
+                // new dates counter
+                $new_singledate_count = 0;
+
+                // loop through the single dates and add the themes (issues)
+                foreach ($termine as $key => $termin) {
+                    // check, if there are issues for this single date
+                    if ($issues[$new_singledate_count] != NULL) {
+                        // add all issues:
+                        foreach ($issues[$new_singledate_count] as $issue_key => $issue_id) {
+                            $termin->addIssueID($issue_id);
+                            $termin->store();
+                        }
+                    }
+                    unset($issues[$new_singledate_count]);
+                    $new_singledate_count++;
+                }
+
+                // delete issues, that are not assigned to a single date because of to few dates
+                // (only if the schedule expert view is off)
+                if (!Config::get()->RESOURCES_ENABLES_EXPERT_SCHEDULE_VIEW) {
+                    if ($new_singledate_count < $singledate_count) {
+                        for ($i = $new_singledate_count; $i < $singledate_count; $i++) {
+                            if ($issues[$i] != NULL) {
+                                foreach ($issues[$i] as $issue_id) {
+                                    // delete this issue
+                                    IssueDB::deleteIssue($issue_id);
+                                }
+                            }
+                        }
+                    }
+                }
+                $this->sortCycleData();
+                return $count;
+            }
+        }
+        return FALSE;
+    }
+
+    /**
+     * completey remove cycledate
+     * @see CycleData::delete()
+     * @param string $cycle_id
+     * @return boolean
+     */
+    function deleteCycle($cycle_id)
+    {
+        $this->cycles[$cycle_id]->delete();
+        unset ($this->cycles[$cycle_id]);
+        return TRUE;
+    }
+
+    function deleteSingleDate($cycle_id, $date_id, $filterStart, $filterEnd)
+    {
+        $this->cycles[$cycle_id]->deleteSingleDate($date_id, $filterStart, $filterEnd);
+    }
+
+    function unDeleteSingleDate($cycle_id, $date_id, $filterStart, $filterEnd)
+    {
+        return $this->cycles[$cycle_id]->unDeleteSingleDate($date_id, $filterStart, $filterEnd);
+    }
+
+    /**
+     * store all changes to cycledates for the course, removed cycles are deleted from database
+     * @return int > 0 if changes where made
+     */
+    function store()
+    {
+        $old_cycle_dates = [];
+        $changed = 0;
+        foreach (SeminarCycleDate::findBySeminar($this->seminar_id) as $c) {
+            $old_cycle_dates[$c->getId()] = $c;
+        }
+        $removed = array_diff(array_keys($old_cycle_dates), array_keys($this->cycles));
+        foreach ($removed as $one) {
+            $changed += $old_cycle_dates[$one]->delete();
+        }
+        foreach ($this->cycles as $one) {
+            $changed += $one->storeCycleDate();
+        }
+        $this->sortCycleData();
+        return $changed;
+    }
+
+
+    /**
+     * load all cycledates from database
+     */
+    function restore()
+    {
+        $this->cycles = [];
+        foreach (SeminarCycleDate::findBySeminar($this->seminar_id) as $c) {
+            $this->cycles[$c->getId()] = new CycleData($c);
+        }
+        $this->sortCycleData();
+    }
+
+    function delete($removeSingleDates = TRUE)
+    {
+        //TODO: Löschen eines MetaDate-Eintrages (CycleData);
+    }
+
+    /**
+     * sort cycledates by sorter column and date
+     */
+    function sortCycleData()
+    {
+        uasort($this->cycles, function ($a, $b) {
+            return $a->sorter - $b->sorter
+                ?: $a->weekday - $b->weekday
+                ?: $a->start_hour - $b->start_hour;
+        });
+    }
+
+    /**
+     * returns cycledates as arrays
+     *
+     * @param bool $show_invisibles if cycles without dates should
+     *                              be in the array, defaults to false
+     * @return array assoc of cycledate data arrays
+     */
+    function getCycleData($show_invisibles = false)
+    {
+        $ret = [];
+
+        foreach ($this->cycles as $val) {
+            if ($val->is_visible || $show_invisibles) {
+                $ret[$val->getMetaDateID()] = $val->toArray();
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * returns the cycledate objects
+     * @return array of CycleData objects
+     */
+    function getCycles()
+    {
+        return $this->cycles;
+    }
+
+    /**
+     * returns an array of SingleDate objects corresponding to the given cycle id
+     * use the optional params to specify a timerange
+     *
+     * @param string a cycle id
+     * @param int    unix timestamp
+     * @param int    unix timestamp
+     * @return array of SingleDate objects
+     */
+    function getSingleDates($metadate_id, $filterStart = 0, $filterEnd = 0)
+    {
+        if (!$this->cycles[$metadate_id]->termine) {
+            $this->readSingleDates($metadate_id, $filterStart, $filterEnd);
+        }
+
+        return $this->cycles[$metadate_id]->termine;
+    }
+
+    /**
+     * reload SingleDate objects for a given cycle id
+     *
+     * @param string $metadate_id
+     * @param int    $start
+     * @param int    $end
+     * @return bool
+     */
+    function readSingleDates($metadate_id, $start = 0, $end = 0)
+    {
+        return $this->cycles[$metadate_id]->readSingleDates($start, $end);
+    }
+
+    /**
+     * returns true if a given cycle has at least one date at all or in the given time range
+     *
+     * @param string $metadate_id
+     * @param int $filterStart
+     * @param int $filterEnd
+     * @return bool
+     */
+    function hasDates($metadate_id, $filterStart = 0, $filterEnd = 0)
+    {
+        if (!isset($this->hasDatesTmp[$metadate_id])) {
+            $this->hasDatesTmp[$metadate_id] = MetaDateDB::has_dates($metadate_id, $this->getSeminarID(), $filterStart, $filterEnd);
+        }
+
+        return $this->hasDatesTmp[$metadate_id];
+    }
+
+    /**
+     * create single dates for one cycle and all semester and store them in database, deleting obsolete ones
+     *
+     * @param mixed cycle id (string) or array with 'metadate_id' => string cycle id, 'startAfterTimeStamp' => int timestamp to override semester start
+     */
+    function createSingleDates($data)
+    {
+        foreach ($this->getVirtualSingleDates($data) as $semester_id => $dates_for_semester) {
+            list($dates, $dates_to_delete) = array_values($dates_for_semester);
+            foreach ($dates_to_delete as $d) $d->delete();
+            foreach ($dates as $d) {
+                if ($d->isUpdate()) continue; //vorhandene Termine nicht speichern wg. chdate
+                $d->store();
+            }
+        }
+        //das sollte nicht nötig sein, muss aber erst genauer untersucht werden
+        $this->store();
+        $this->restore();
+    }
+
+    /**
+     * generate single date objects for one cycle and all semester, existing dates are merged in
+     *
+     * @param mixed cycle id (string) or array with 'metadate_id' => string cycle id, 'startAfterTimeStamp' => int timestamp to override semester start
+     * @return array array of arrays, for each semester id  an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
+     */
+    function getVirtualSingleDates($data)
+    {
+        if (is_array($data)) {
+            $metadate_id = $data['metadate_id'];
+            $startAfterTimeStamp = $data['startAfterTimeStamp'];
+        } else {
+            $metadate_id = $data;
+            $startAfterTimeStamp = 0;
+        }
+
+        $ret = [];
+
+        $all_semester = Semester::findAllVisible(false);
+        $sem_begin = null;
+        $sem_end = null;
+        // get the starting-point for creating singleDates for the choosen cycleData
+        foreach ($all_semester as $val) {
+            if (($this->seminarStartTime >= $val["beginn"]) && ($this->seminarStartTime <= $val["ende"])) {
+                $sem_begin = mktime(0, 0, 0, date("n", $val["vorles_beginn"]), date("j", $val["vorles_beginn"]), date("Y", $val["vorles_beginn"]));
+            }
+        }
+
+        // get the end-point
+        if ($this->seminarDurationTime == -1) {
+            foreach ($all_semester as $val) {
+                $sem_end = $val['vorles_ende'];
+            }
+        } else {
+            $i = 0;
+            foreach ($all_semester as $val) {
+                $i++;
+                $timestamp = $this->seminarDurationTime + $this->seminarStartTime;
+                if (($timestamp >= $val['beginn']) && ($timestamp <= $val['ende'])) {
+                    $sem_end = $val["vorles_ende"];
+                }
+            }
+        }
+
+        $passed = false;
+        foreach ($all_semester as $val) {
+            if ($sem_begin <= $val['vorles_beginn']) {
+                $passed = true;
+            }
+            if ($passed && ($sem_end >= $val['vorles_ende']) && ($startAfterTimeStamp <= $val['ende'])) {
+                $ret[$val['semester_id']] = $this->getVirtualSingleDatesForSemester($metadate_id, $val['vorles_beginn'], $val['vorles_ende'], $startAfterTimeStamp);
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * generate single date objects for one cycle and one semester, existing dates are merged in
+     *
+     * @param string cycle id
+     * @param int    timestamp of semester start
+     * @param int    timestamp of semester end
+     * @param int    alternative timestamp to start from
+     * @param int    correction calculation (obsolete)
+     * @return array returns an array of two arrays of SingleDate objects: 'dates' => all new and surviving dates, 'dates_to_delete' => obsolete dates
+     */
+    function getVirtualSingleDatesForSemester($metadate_id, $sem_begin, $sem_end, $startAfterTimeStamp, $corr = 0)
+    {
+        $dates = [];
+        $dates_to_delete = [];
+
+        // loads the singledates of the by metadate_id denoted regular time-entry into the object
+        $this->readSingleDates($metadate_id);
+
+        // The currently existing singledates for the by metadate_id denoted  regular time-entry
+        $existingSingleDates =& $this->cycles[$metadate_id]->getSingleDates();
+
+        $start_woche = $this->cycles[$metadate_id]->week_offset;
+        $end_woche = $this->cycles[$metadate_id]->end_offset;
+
+        $turnus = $this->cycles[$metadate_id]->cycle;
+
+        // This variable is used to check if a given singledate shall be created in a bi-weekly seminar.
+        if ($start_woche == -1) $start_woche = 0;
+
+        $week = 0;
+
+        // get the first presence date after sem_begin
+        $day_of_week = date('l', strtotime('Sunday + ' . $this->cycles[$metadate_id]->day . ' days'));
+        $stamp = strtotime('this week ' . $day_of_week, $sem_begin);
+
+        $start_time = mktime(
+            (int)$this->cycles[$metadate_id]->start_stunde,     // Hour
+            (int)$this->cycles[$metadate_id]->start_minute,     // Minute
+            0,                                                  // Second
+            date("n", $stamp),                                  // Month
+            date("j", $stamp),                                  // Day
+            date("Y", $stamp));                                 // Year
+
+        $end_time = mktime(
+            (int)$this->cycles[$metadate_id]->end_stunde,       // Hour
+            (int)$this->cycles[$metadate_id]->end_minute,       // Minute
+            0,                                                  // Second
+            date("n", $stamp),                                  // Month
+            date("j", $stamp),                                  // Day
+            date("Y", $stamp));                                 // Year
+
+        // loop through all possible singledates for this regular time-entry
+        do {
+
+            // if dateExists is true, the singledate will not be created. Default is of course to create the singledate
+            $dateExists = false;
+
+            // do not create singledates if they are earlier than the semester start
+            if ($end_time < $sem_begin) $dateExists = true;
+
+            // do not create singledates, if they are earlier then the chosen start-week
+            if ($start_woche > $week || (isset($end_woche) && $week > $end_woche)) $dateExists = true;
+
+            // bi-weekly check
+            if ($turnus > 0 && ($week - $start_woche) > 0 && (($week - $start_woche) % ($turnus + 1))) {
+                $dateExists = true;
+            }
+
+            /*
+             * We only create dates, which do not already exist, so we do not overwrite existing dates.
+             *
+             * Additionally, we delete singledates which are not needed any more (bi-weekly, changed start-week, etc.)
+             */
+            foreach ($existingSingleDates as $key => $val) {
+                // take only the singledate into account, that maps the current timepoint
+                if ($start_time > $startAfterTimeStamp && ($val->date == $start_time) && ($val->end_time == $end_time)) {
+
+                    // bi-weekly check
+                    if ($turnus > 0 && ($week - $start_woche) > 0 && (($week - $start_woche) % ($turnus + 1))) {
+                        $dates_to_delete[$key] = $val;
+                        unset($existingSingleDates[$key]);
+                    }
+
+                    // delete singledates if they are earlier than the chosen start-week
+                    if ($start_woche > $week || (isset($end_woche) && $week > $end_woche)) {
+                        $dates_to_delete[$key] = $val;
+                        unset($existingSingleDates[$key]);
+                    }
+
+                    $dateExists = true;
+                    if (isset($existingSingleDates[$key])) {
+                        $dates[$key] = $val;
+                    }
+                }
+            }
+
+            if ($start_time < $startAfterTimeStamp) {
+                $dateExists = true;
+            }
+
+            if (!$dateExists) {
+
+                $termin = new SingleDate(['seminar_id' => $this->seminar_id]);
+
+                $all_holiday = SemesterHoliday::getAll(); // fetch all Holidays
+                foreach ($all_holiday as $val2) {
+                    if (($val2["beginn"] <= $start_time) && ($start_time <= $val2["ende"])) {
+                        $termin->setExTermin(true);
+                    }
+                }
+
+                //check for calculatable holidays
+                if (!$termin->isExTermin()) {
+                    $holy_type = holiday($start_time);
+                    if ($holy_type["col"] == 3) {
+                        $termin->setExTermin(true);
+                    }
+                }
+
+                // fill the singleDate-Object with data
+                $termin->setMetaDateID($metadate_id);
+                $termin->setTime($start_time, $end_time);
+                $termin->setDateType(1); //best guess
+
+                $dates[$termin->getTerminID()] = $termin;
+            }
+
+            //inc the week, create timestamps for the next singledate
+            $start_time = strtotime('+1 week', $start_time);
+            $end_time = strtotime('+1 week', $end_time);
+
+            $week++;
+
+        } while ($end_time < $sem_end);
+
+        return ['dates' => $dates, 'dates_to_delete' => $dates_to_delete];
+    }
+}
diff --git a/lib/raumzeit/MetaDateDB.class.php b/lib/raumzeit/MetaDateDB.class.php
deleted file mode 100644
index 5f5e1df..0000000
--- a/lib/raumzeit/MetaDateDB.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-# Lifter002: DONE - not applicable
-# Lifter007: TEST
-# Lifter003: TEST
-# Lifter010: DONE - not applicable
-
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// MetaDateDB.class.php
-//
-// Datenbank-Abfragen für MetaDate.class.php
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * MetaDateDB.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- */
-class MetaDateDB
-{
-    public static function has_dates($metadate_id, $seminar_id, $filterStart = 0, $filterEnd = 0)
-    {
-        $query = "SELECT 1 FROM termine WHERE range_id = ? AND metadate_id = ?";
-        $parameters = [$seminar_id, $metadate_id];
-
-        if ($filterStart != 0) {
-            $query .= " AND date >= ? AND end_time <= ?";
-            array_push($parameters, $filterStart, $filterEnd);
-        }
-
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-
-        return (bool)$statement->fetchColumn();
-    }
-}
diff --git a/lib/raumzeit/MetaDateDB.php b/lib/raumzeit/MetaDateDB.php
new file mode 100644
index 0000000..5f5e1df
--- /dev/null
+++ b/lib/raumzeit/MetaDateDB.php
@@ -0,0 +1,55 @@
+<?php
+# Lifter002: DONE - not applicable
+# Lifter007: TEST
+# Lifter003: TEST
+# Lifter010: DONE - not applicable
+
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// MetaDateDB.class.php
+//
+// Datenbank-Abfragen für MetaDate.class.php
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * MetaDateDB.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ */
+class MetaDateDB
+{
+    public static function has_dates($metadate_id, $seminar_id, $filterStart = 0, $filterEnd = 0)
+    {
+        $query = "SELECT 1 FROM termine WHERE range_id = ? AND metadate_id = ?";
+        $parameters = [$seminar_id, $metadate_id];
+
+        if ($filterStart != 0) {
+            $query .= " AND date >= ? AND end_time <= ?";
+            array_push($parameters, $filterStart, $filterEnd);
+        }
+
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+
+        return (bool)$statement->fetchColumn();
+    }
+}
diff --git a/lib/raumzeit/SeminarDB.class.php b/lib/raumzeit/SeminarDB.class.php
deleted file mode 100644
index 63241fe..0000000
--- a/lib/raumzeit/SeminarDB.class.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-# Lifter002: DONE
-# Lifter003: TEST
-# Lifter007: TODO
-# Lifter010: DONE
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// SeminarDB.class.php
-//
-// Datenbank-Abfragen für Seminar.class.php
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * SeminarDB.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- * @deprecated
- */
-
-class SeminarDB
-{
-    public static function getIssues($seminar_id)
-    {
-        $query = "SELECT *
-                  FROM themen
-                  WHERE themen.seminar_id = ?
-                  ORDER BY priority";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id]);
-        return $statement->fetchAll(PDO::FETCH_ASSOC);
-    }
-
-    public static function getSingleDates($seminar_id, $start = 0, $end = 0)
-    {
-        $query = "SELECT termine.*, resource_bookings.resource_id, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons,  GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                  FROM termine
-                  LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
-                  LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
-                  LEFT JOIN resource_bookings ON (resource_bookings.range_id = termine.termin_id)
-                  WHERE termine.range_id = ?
-                    AND (metadate_id IS NULL OR metadate_id = '')";
-        $parameters = [$seminar_id];
-
-        if ($start != 0 || $end != 0) {
-            $query .= " AND termine.date BETWEEN ? AND ?";
-            array_push($parameters, $start, $end);
-        }
-
-        $query .= " GROUP BY termine.termin_id ORDER BY date";
-
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-
-        $ret = [];
-        while ($data = $statement->fetch(PDO::FETCH_ASSOC)) {
-            if ($data['related_persons']) {
-                $data['related_persons'] = explode(',', $data['related_persons']);
-            }
-            if ($data['related_groups']) {
-                $data['related_groups'] = explode(',', $data['related_groups']);
-            }
-
-            $ret[] = $data;
-        }
-
-        return $ret;
-    }
-
-    public static function getStatOfNotBookedRooms($cycle_id, $seminar_id, $filterStart = 0, $filterEnd = 0)
-    {
-        $stat = [
-            'all'            => 0,
-            'booked'         => 0,
-            'open'           => 0,
-            'open_rooms'     => [],
-            'declined'       => 0,
-            'declined_dates' => [],
-        ];
-
-        $query = "SELECT termine.*, resource_bookings.resource_id
-                  FROM termine
-                  LEFT JOIN resource_bookings ON (resource_bookings.range_id = termin_id)
-                  WHERE termine.range_id = ? AND metadate_id = ?";
-        $parameters = [$seminar_id, $cycle_id];
-
-        if ($filterStart != 0 || $filterEnd != 0) {
-            $query .= " AND date >= ? AND end_time <= ?";
-            array_push($parameters, $filterStart, $filterEnd);
-        }
-        $query .= " ORDER BY date";
-
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $stat['all'] += 1;
-            if ($row['resource_id']) {
-                $stat['booked'] += 1;
-            } else {
-                $stat['open'] += 1;
-                $stat['open_rooms'][] = $row;
-            }
-        }
-
-        // count how many singledates have a declined room-request
-        $query = "SELECT *
-                  FROM termine t
-                  LEFT JOIN resource_requests AS rr ON (t.termin_id = rr.termin_id)
-                  WHERE range_id = ? AND t.metadate_id = ? AND closed = 3";
-        $parameters = [$seminar_id, $cycle_id];
-
-        if ($filterStart != 0 && $filterEnd != 0) {
-            $query .= " AND date >= ? AND end_time <= ?";
-            array_push($parameters, $filterStart, $filterEnd);
-        }
-        $query .= " ORDER BY date";
-
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute($parameters);
-
-        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            $stat['declined'] += 1;
-            $stat['declined_dates'][] = $data;
-        }
-
-        return $stat;
-    }
-
-    public static function hasDatesOutOfDuration($start, $end, $seminar_id)
-    {
-        $query = "SELECT COUNT(*)
-                  FROM termine
-                  WHERE range_id = ? AND `date` NOT BETWEEN ? AND ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id, $start, $end]);
-        return $statement->fetchColumn();
-    }
-
-    public static function getFirstDate($seminar_id)
-    {
-        $termine = [];
-
-        $query = "SELECT termin_id, date, end_time
-                    FROM termine
-                    WHERE range_id = ?
-                    ORDER BY date";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$seminar_id]);
-
-        $start = 0;
-        $end = 0;
-
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-            if (($start == 0 && $end == 0) || ($start == $row['date'] && $end == $row['end_time'])) {
-                $termine[] = $row['termin_id'];
-                $start     = $row['date'];
-                $end       = $row['end_time'];
-            }
-        }
-
-        return $termine ?: false;
-    }
-
-    public static function getNextDate($seminar_id)
-    {
-        $termin = [];
-
-        $query = "SELECT termin_id, date, end_time
-                  FROM termine
-                  WHERE range_id = ? AND date > UNIX_TIMESTAMP(NOW() - INTERVAL 1 HOUR)
-                  ORDER BY date, end_time";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([$seminar_id]);
-
-        $start = 0;
-        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
-            if ($start == 0 || $start == $data['date']) {
-                $termin[] = $data['termin_id'];
-                $start = $data['date'];
-            }
-        }
-
-        $ex_termin = [];
-
-        $query = "SELECT termin_id
-                  FROM ex_termine
-                  WHERE range_id = ? AND date > UNIX_TIMESTAMP(NOW() - INTERVAL 1 HOUR)
-                    AND content != '' AND content IS NOT NULL
-                  ORDER BY date
-                  LIMIT 1";
-        $stmt = DBManager::get()->prepare($query);
-        $stmt->execute([$seminar_id]);
-
-        while ($termin_id = $stmt->fetchColumn()) {
-            $ex_termin[] = $termin_id;
-        }
-
-        return compact('termin', 'ex_termin');
-    }
-
-
-    public static function getDeletedSingleDates($seminar_id, $start = 0, $end = 0)
-    {
-        if (($start != 0) || ($end != 0)) {
-            $query = "SELECT ex_termine.*, GROUP_CONCAT(trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                      FROM ex_termine
-                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
-                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
-                      WHERE ex_termine.range_id = ?
-                        AND (metadate_id IS NULL OR metadate_id = '')
-                      AND `date` BETWEEN ? AND ?
-                      GROUP BY ex_termine.termin_id
-                      ORDER BY date";
-            $parameters = [$seminar_id, $start, $end];
-        } else {
-            $query = "SELECT ex_termine.*, GROUP_CONCAT(trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                      FROM ex_termine
-                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
-                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
-                      WHERE ex_termine.range_id = ?
-                        AND (metadate_id IS NULL OR metadate_id = '')
-                      GROUP BY ex_termine.termin_id
-                      ORDER BY date";
-            $parameters = [$seminar_id];
-        }
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute($parameters);
-
-        $ret = [];
-        while ($data = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $data['ex_termin'] = true;
-
-            if ($data['related_persons']) {
-                $data['related_persons'] = explode(',', $data['related_persons']);
-            }
-            if ($data['related_groups']) {
-                $data['related_groups'] = explode(',', $data['related_groups']);
-            }
-
-            $ret[] = $data;
-        }
-        return $ret;
-    }
-
-}
diff --git a/lib/raumzeit/SeminarDB.php b/lib/raumzeit/SeminarDB.php
new file mode 100644
index 0000000..63241fe
--- /dev/null
+++ b/lib/raumzeit/SeminarDB.php
@@ -0,0 +1,264 @@
+<?php
+# Lifter002: DONE
+# Lifter003: TEST
+# Lifter007: TODO
+# Lifter010: DONE
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// SeminarDB.class.php
+//
+// Datenbank-Abfragen für Seminar.class.php
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * SeminarDB.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ * @deprecated
+ */
+
+class SeminarDB
+{
+    public static function getIssues($seminar_id)
+    {
+        $query = "SELECT *
+                  FROM themen
+                  WHERE themen.seminar_id = ?
+                  ORDER BY priority";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id]);
+        return $statement->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    public static function getSingleDates($seminar_id, $start = 0, $end = 0)
+    {
+        $query = "SELECT termine.*, resource_bookings.resource_id, GROUP_CONCAT(DISTINCT trp.user_id) AS related_persons,  GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                  FROM termine
+                  LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
+                  LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
+                  LEFT JOIN resource_bookings ON (resource_bookings.range_id = termine.termin_id)
+                  WHERE termine.range_id = ?
+                    AND (metadate_id IS NULL OR metadate_id = '')";
+        $parameters = [$seminar_id];
+
+        if ($start != 0 || $end != 0) {
+            $query .= " AND termine.date BETWEEN ? AND ?";
+            array_push($parameters, $start, $end);
+        }
+
+        $query .= " GROUP BY termine.termin_id ORDER BY date";
+
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+
+        $ret = [];
+        while ($data = $statement->fetch(PDO::FETCH_ASSOC)) {
+            if ($data['related_persons']) {
+                $data['related_persons'] = explode(',', $data['related_persons']);
+            }
+            if ($data['related_groups']) {
+                $data['related_groups'] = explode(',', $data['related_groups']);
+            }
+
+            $ret[] = $data;
+        }
+
+        return $ret;
+    }
+
+    public static function getStatOfNotBookedRooms($cycle_id, $seminar_id, $filterStart = 0, $filterEnd = 0)
+    {
+        $stat = [
+            'all'            => 0,
+            'booked'         => 0,
+            'open'           => 0,
+            'open_rooms'     => [],
+            'declined'       => 0,
+            'declined_dates' => [],
+        ];
+
+        $query = "SELECT termine.*, resource_bookings.resource_id
+                  FROM termine
+                  LEFT JOIN resource_bookings ON (resource_bookings.range_id = termin_id)
+                  WHERE termine.range_id = ? AND metadate_id = ?";
+        $parameters = [$seminar_id, $cycle_id];
+
+        if ($filterStart != 0 || $filterEnd != 0) {
+            $query .= " AND date >= ? AND end_time <= ?";
+            array_push($parameters, $filterStart, $filterEnd);
+        }
+        $query .= " ORDER BY date";
+
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $stat['all'] += 1;
+            if ($row['resource_id']) {
+                $stat['booked'] += 1;
+            } else {
+                $stat['open'] += 1;
+                $stat['open_rooms'][] = $row;
+            }
+        }
+
+        // count how many singledates have a declined room-request
+        $query = "SELECT *
+                  FROM termine t
+                  LEFT JOIN resource_requests AS rr ON (t.termin_id = rr.termin_id)
+                  WHERE range_id = ? AND t.metadate_id = ? AND closed = 3";
+        $parameters = [$seminar_id, $cycle_id];
+
+        if ($filterStart != 0 && $filterEnd != 0) {
+            $query .= " AND date >= ? AND end_time <= ?";
+            array_push($parameters, $filterStart, $filterEnd);
+        }
+        $query .= " ORDER BY date";
+
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute($parameters);
+
+        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $stat['declined'] += 1;
+            $stat['declined_dates'][] = $data;
+        }
+
+        return $stat;
+    }
+
+    public static function hasDatesOutOfDuration($start, $end, $seminar_id)
+    {
+        $query = "SELECT COUNT(*)
+                  FROM termine
+                  WHERE range_id = ? AND `date` NOT BETWEEN ? AND ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id, $start, $end]);
+        return $statement->fetchColumn();
+    }
+
+    public static function getFirstDate($seminar_id)
+    {
+        $termine = [];
+
+        $query = "SELECT termin_id, date, end_time
+                    FROM termine
+                    WHERE range_id = ?
+                    ORDER BY date";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$seminar_id]);
+
+        $start = 0;
+        $end = 0;
+
+        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+            if (($start == 0 && $end == 0) || ($start == $row['date'] && $end == $row['end_time'])) {
+                $termine[] = $row['termin_id'];
+                $start     = $row['date'];
+                $end       = $row['end_time'];
+            }
+        }
+
+        return $termine ?: false;
+    }
+
+    public static function getNextDate($seminar_id)
+    {
+        $termin = [];
+
+        $query = "SELECT termin_id, date, end_time
+                  FROM termine
+                  WHERE range_id = ? AND date > UNIX_TIMESTAMP(NOW() - INTERVAL 1 HOUR)
+                  ORDER BY date, end_time";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([$seminar_id]);
+
+        $start = 0;
+        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            if ($start == 0 || $start == $data['date']) {
+                $termin[] = $data['termin_id'];
+                $start = $data['date'];
+            }
+        }
+
+        $ex_termin = [];
+
+        $query = "SELECT termin_id
+                  FROM ex_termine
+                  WHERE range_id = ? AND date > UNIX_TIMESTAMP(NOW() - INTERVAL 1 HOUR)
+                    AND content != '' AND content IS NOT NULL
+                  ORDER BY date
+                  LIMIT 1";
+        $stmt = DBManager::get()->prepare($query);
+        $stmt->execute([$seminar_id]);
+
+        while ($termin_id = $stmt->fetchColumn()) {
+            $ex_termin[] = $termin_id;
+        }
+
+        return compact('termin', 'ex_termin');
+    }
+
+
+    public static function getDeletedSingleDates($seminar_id, $start = 0, $end = 0)
+    {
+        if (($start != 0) || ($end != 0)) {
+            $query = "SELECT ex_termine.*, GROUP_CONCAT(trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                      FROM ex_termine
+                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
+                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
+                      WHERE ex_termine.range_id = ?
+                        AND (metadate_id IS NULL OR metadate_id = '')
+                      AND `date` BETWEEN ? AND ?
+                      GROUP BY ex_termine.termin_id
+                      ORDER BY date";
+            $parameters = [$seminar_id, $start, $end];
+        } else {
+            $query = "SELECT ex_termine.*, GROUP_CONCAT(trp.user_id) AS related_persons, GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                      FROM ex_termine
+                        LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
+                        LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
+                      WHERE ex_termine.range_id = ?
+                        AND (metadate_id IS NULL OR metadate_id = '')
+                      GROUP BY ex_termine.termin_id
+                      ORDER BY date";
+            $parameters = [$seminar_id];
+        }
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute($parameters);
+
+        $ret = [];
+        while ($data = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $data['ex_termin'] = true;
+
+            if ($data['related_persons']) {
+                $data['related_persons'] = explode(',', $data['related_persons']);
+            }
+            if ($data['related_groups']) {
+                $data['related_groups'] = explode(',', $data['related_groups']);
+            }
+
+            $ret[] = $data;
+        }
+        return $ret;
+    }
+
+}
diff --git a/lib/raumzeit/SingleDate.class.php b/lib/raumzeit/SingleDate.class.php
deleted file mode 100644
index 2e8f41e..0000000
--- a/lib/raumzeit/SingleDate.class.php
+++ /dev/null
@@ -1,978 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-/**
- * SingelDate.class.php - Ein (Ex-)Termin
- *
- * Diese Klasse stellt einen einzelnen Eintrag in der Tabelle termine, bzw. ex_termine dar.
- *
- * 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.
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-require_once 'lib/dates.inc.php';
-
-class SingleDate
-{
-    var $termin_id       = '';
-    var $date_typ        = 1;
-    var $metadate_id     = '';
-    var $date            = 0;
-    var $end_time        = 0;
-    var $mkdate          = 0;
-    var $chdate          = 0;
-    var $orig_ex         = false;
-    var $ex_termin       = false;
-    var $range_id        = '';
-    var $author_id       = '';
-    var $resource_id     = '';
-    var $raum            = '';
-    var $request_id      = NULL;
-    var $requestData     = NULL;
-    var $update          = false;
-    var $issues          = NULL;
-    var $messages        = NULL;
-    var $content         = '';
-    var $room_request    = NULL;
-    var $related_persons = [];
-    var $related_groups  = [];
-
-    /**
-     * Return the SingleDate instance of the given id
-     *
-     * @param string      the id of the instance
-     * @return SingleDate the SingleDate instance
-     */
-    function getInstance($singledate_id)
-    {
-        static $singledate_object_pool;
-
-        if ($singledate_id) {
-            if (is_object($singledate_object_pool[$singledate_id]) && $singledate_object_pool[$singledate_id]->getTerminId() == $singledate_id) {
-                return $singledate_object_pool[$singledate_id];
-            } else {
-                $singledate_object_pool[$singledate_id] = new SingleDate($singledate_id);
-
-                return $singledate_object_pool[$singledate_id];
-            }
-        } else {
-            return new SingleDate();
-        }
-
-    }
-
-    function __construct($data = '')
-    {
-        global $user, $id;
-        $termin_id = '';
-        if ($data instanceOf CourseDate || $data instanceof CourseExDate) {
-            $single_date_data = $data->toArray();
-            $single_date_data['ex_termin'] = $data instanceOf CourseDate ? 0 : 1;
-            $single_date_data['resource_id'] = $data->room_booking->resource_id ?? '';
-            if ($data instanceOf CourseDate) {
-                $single_date_data['related_persons'] = $data->dozenten->pluck('user_id');
-                $single_date_data['related_groups'] = $data->statusgruppen->pluck('statusgruppe_id');
-            }
-            $this->fillValuesFromArray($single_date_data);
-        } else {
-            if (is_array($data)) {
-                if ($data['termin_id']) $termin_id = $data['termin_id'];
-                if ($data['seminar_id']) $id = $data['seminar_id'];
-            } else {
-                $termin_id = $data;
-            }
-            if ($termin_id !== '') {
-                $this->termin_id = $termin_id;
-                $this->update = true;
-                $this->restore();
-            } else {
-                $this->termin_id = md5(uniqid('SingleDate', 1));
-                $this->author_id = $user->id;
-                $this->range_id = $id;
-                $this->mkdate = time();
-                $this->chdate = time();
-                $this->update = false;
-            }
-        }
-    }
-
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    function getStartTime()
-    {
-        return $this->date;
-    }
-
-    function setTime($start, $end)
-    {
-        if (($start == 0) || ($end == 0)) return false;
-
-        if (($this->date != $start) || ($this->end_time != $end)) {
-            // validate the passed variables: they have to be ints and $start
-            // has to be smaller than $end
-            if ($this->validate($start, $end)) {
-                $before = $this->toString();
-
-                // if the time-span has been shortened, keep the room-booking,
-                // otherwise remove it.
-                if ($this->resource_id) {
-                    if ($start >= $this->date && $end <= $this->end_time) {
-                        //Shrink the booking.
-                        if ($assign_id = SingleDateDB::getAssignID($this->termin_id)) {
-                            $assign_object = new ResourceBooking($assign_id);
-                            $assign_object->resource_id = $this->resource_id;
-                            $assign_object->begin = $start;
-                            $assign_object->end = $end;
-                            $assign_object->repeat_end = $end;
-                            $assign_object->store();
-                        }
-                    } else {
-                        $this->killAssign();
-                    }
-                }
-
-                $this->date = $start;
-                $this->end_time = $end;
-
-                $after = $this->toString();
-                // logging
-                if ($before) {
-                    StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->termin_id, $before . ' -> ' . $after);
-                } else {
-                    StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->termin_id, $after);
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
-        return false;
-    }
-
-    function getEndTime()
-    {
-        return $this->end_time;
-    }
-
-    function setComment($comment)
-    {
-        $this->content = $comment;
-    }
-
-    function getComment()
-    {
-        if (!$this->isExTermin()) return '';
-
-        return $this->content;
-    }
-
-    function getMetaDateID()
-    {
-        return $this->metadate_id;
-    }
-
-    function setMetaDateID($id)
-    {
-        if ($id != '') {
-            $this->metadate_id = $id;
-
-            return true;
-        } else {
-            $this->metadate_id = 0;
-
-            return false;
-        }
-    }
-
-    function getRangeID()
-    {
-        return $this->range_id;
-    }
-
-    function setDateType($typ)
-    {
-        $this->date_typ = $typ;
-
-        return true;
-    }
-
-    function getDateType()
-    {
-        return $this->date_typ;
-    }
-
-    function getTypeName()
-    {
-        global $TERMIN_TYP;
-
-        return $TERMIN_TYP[$this->date_typ]['name'];
-    }
-
-    function getAuthorID()
-    {
-        return $this->author_id;
-    }
-
-    function getChDate()
-    {
-        return $this->chdate;
-    }
-
-    function getMkDate()
-    {
-        return $this->mkdate;
-    }
-
-    function setSeminarID($seminar_id)
-    {
-        $this->range_id = $seminar_id;
-    }
-
-    function getSeminarID()
-    {
-        return $this->range_id;
-    }
-
-    function getSingleDateID()
-    {
-        return $this->termin_id;
-    }
-
-    function getResourceID()
-    {
-        return $this->resource_id;
-    }
-
-    function getTerminID()
-    {
-        return $this->termin_id;
-    }
-
-    function getFreeRoomText()
-    {
-        return $this->raum;
-    }
-
-    function setFreeRoomText($freeRoomText)
-    {
-        $this->raum = $freeRoomText;
-    }
-
-    function getCycleID()
-    {
-        return $this->metadate_id;
-    }
-
-    /**
-     * @deprecated
-     */
-    function killIssue()
-    {
-        $issue_ids = $this->getIssueIDs();
-        if (count($issue_ids) > 0) {
-            CourseTopic::deleteBySQL("issue_id IN (?)", $issue_ids);
-
-            foreach ($issue_ids as $issue_id) {
-                unset($this->issues[$issue_id]);
-            }
-        }
-    }
-
-    function delete()
-    {
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache->expire('course/undecorated_data/' . $this->range_id);
-
-        $this->chdate = time();
-        $this->killAssign();
-
-        return SingleDateDB::deleteSingleDate($this->termin_id, $this->ex_termin);
-    }
-
-    function store()
-    {
-
-        $cache = \Studip\Cache\Factory::getCache();
-        $cache->expire('course/undecorated_data/' . $this->range_id);
-
-        $this->chdate = time();
-        if ($this->ex_termin) {
-            $this->killAssign();
-        }
-
-        // date_typ = 0 defaults to TERMIN_TYP[1] because there never exists one with zero
-        if (!$this->date_typ) $this->date_typ = 1;
-
-        if ($this->orig_ex != $this->ex_termin) {
-            SingleDateDB::deleteSingleDate($this->termin_id, $this->orig_ex);
-        }
-
-        return SingleDateDB::storeSingleDate($this);
-    }
-
-    function restore()
-    {
-        if (!($data = SingleDateDB::restoreSingleDate($this->termin_id))) {
-            return false;
-        }
-        $this->fillValuesFromArray($data);
-
-        return true;
-    }
-
-    function setExTermin($ex)
-    {
-        if ($ex != $this->ex_termin) {
-            $this->update = false;
-            $this->ex_termin = $ex;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function isExTermin()
-    {
-        return $this->ex_termin;
-    }
-
-    function isPresence()
-    {
-        return $GLOBALS['TERMIN_TYP'][$this->date_typ]['sitzung'] ? true : false;
-    }
-
-    function isUpdate()
-    {
-        return $this->update;
-    }
-
-    function isHoliday()
-    {
-        $name = null;
-        foreach (SemesterHoliday::getAll() as $val) {
-            if (($val['beginn'] <= $this->date) && ($val['ende'] >= $this->end_time)) {
-                $name = $val['name'];
-            }
-        }
-
-        if (!$name) {
-            $holy_type = holiday($this->date);
-            $name = $holy_type['name'];
-        }
-
-        if ($name) {
-            return $name;
-        } else {
-            return false;
-        }
-    }
-
-    function fillValuesFromArray($daten)
-    {
-        $this->metadate_id = $daten['metadate_id'];
-        $this->termin_id = $daten['termin_id'];
-        if ($daten['date_typ'] != 0) {
-            $this->date_typ = $daten['date_typ'];
-        } else {
-            // if no date_typ is specified it defaults to 1
-            $this->date_typ = 1;
-        }
-        $this->date = $daten['date'];
-        $this->end_time = $daten['end_time'];
-        $this->mkdate = $daten['mkdate'];
-        $this->chdate = $daten ['chdate'];
-        $this->ex_termin = $daten['ex_termin'] ?? null;
-        $this->orig_ex = $daten['ex_termin'] ?? null;
-        $this->range_id = $daten['range_id'];
-        $this->author_id = $daten['autor_id'];
-        $this->resource_id = $daten['resource_id'];
-        $this->raum = $daten['raum'];
-        $this->content = $daten['content'];
-        $this->update = true;
-        $this->related_persons = is_array($daten['related_persons']) ? $daten['related_persons'] : [];
-        $this->related_groups = is_array($daten['related_groups']) ? $daten['related_groups'] : [];
-
-        return true;
-    }
-
-    function toString()
-    {
-        $end_hours = strtotime(strftime('%H:%M', $this->end_time));
-        $start_hours = strtotime(strftime('%H:%M', $this->date));
-        if (!$this->date) {
-            return null;
-        } elseif ((($end_hours - $start_hours) / 60 / 60) > 23) {
-            return sprintf('%s (%s)', strftime('%A, %d.%m.%Y', $this->date),
-                _('ganztägig'));
-        } else {
-            return sprintf('%s - %s', strftime('%A, %d.%m.%Y %H:%M', $this->date),
-                strftime('%H:%M', $this->end_time));
-        }
-    }
-
-    function bookRoom($room_id, $preparation_time = 0)
-    {
-        if ($this->ex_termin || !$room_id) {
-            return false;
-        }
-
-        // create a resource-object of the passed room
-        $room = Room::find($room_id);
-
-        // there is no room with the passed id
-        if (!$room) {
-            return false;
-        }
-
-        // check permissions (is current user allowed to book the passed room?)
-        if (!$room->userHasBookingRights(User::findCurrent(), $this->date, $this->end_time)) {
-            return false;
-        }
-
-        // clear the freetext-field, if we book a room
-        $this->setFreeRoomText('');
-        $this->store();
-
-        //If there is already a room assigned, "change" the booking.
-        //Otherwise create a new one.
-        if ($this->resource_id != '') {
-            $this->changeAssign($room, $preparation_time);
-        } else {
-            $this->insertAssign($room, $preparation_time);
-        }
-
-        return $room;
-    }
-
-
-    /**
-     * This method converts overlap data about an overlapping booking
-     * to a string that can be used to output overlap information to the user.
-     * Only one overlap is converted by this method. For multiple overlaps
-     * this method must be called multiple times.
-     *
-     * @param ResourceBooking $booking The overlapping booking.
-     *
-     * @return string A string representation of the overlap.
-     */
-    protected function getOverlapMessage(ResourceBooking $booking)
-    {
-        $message = '';
-
-        if ($booking->booking_type == ResourceBooking::TYPE_LOCK) {
-            $message .= sprintf(
-                _('Vom %1$s, %2$s Uhr bis zum %3$s, %4$s Uhr (Sperrzeit)') . "\n",
-                date("d.m.Y", $booking->begin),
-                date("H:i", $booking->begin),
-                date("d.m.Y", $booking->end),
-                date("H:i", $booking->end)
-            );
-        } else {
-            $course = Course::find($booking->course_id);
-
-            if ($course) {
-                $user_has_permissions = $GLOBALS['perm']->have_studip_perm(
-                    'dozent',
-                    $course->id,
-                    $GLOBALS['user']->id
-                );
-                if ($user_has_permissions) {
-                    $course_link = URLHelper::getLink(
-                        'dispatch.php/course/timesrooms/index',
-                        [
-                            'cid' => $course->id
-                        ]
-                    );
-                    $message .= sprintf(
-                        _('Am %1$s von %2$s bis %3$s Uhr durch Veranstaltung %4$s') . "\n",
-                        date('d.m.Y', $booking->begin),
-                        date('H:i', $booking->begin),
-                        date('H:i', $booking->end),
-                        sprintf(
-                            '<a href="%1$s">%2$s</a>',
-                            $course_link,
-                            htmlReady($course->name)
-                        )
-                    );
-                } else {
-                    $course_link = URLHelper::getLink(
-                        'dispatch.php/course/details',
-                        [
-                            'sem_id' => $course->id
-                        ]
-                    );
-                    $message .= sprintf(
-                        _('Am %1$s von %2$s bis %3$s Uhr durch Veranstaltung %4$s') . "\n",
-                        date('d.m.Y', $booking->begin),
-                        date('H:i', $booking->begin),
-                        date('H:i', $booking->end),
-                        sprintf(
-                            '<a href="%1$s">%2$s</a>',
-                            $course_link,
-                            htmlReady($course->name)
-                        )
-                    );
-                }
-            } else {
-                $message .= sprintf(
-                    _('Am %1$s von %2$s bis %3$s Uhr belegt von "%4$s"') . "\n",
-                    date("d.m.Y", $booking->begin),
-                    date("H:i", $booking->begin),
-                    date("H:i", $booking->end),
-                    htmlReady($booking->description)
-                );
-            }
-        }
-
-        return $message;
-    }
-
-
-    private function insertAssign(Room $room, $preparation_time = 0)
-    {
-        $begin = new DateTime();
-        $begin->setTimestamp($this->date);
-        $end = new DateTime();
-        $end->setTimestamp($this->end_time);
-
-        //If the following code is executed a new room booking can be created:
-        try {
-            $booking = $room->createBooking(
-                User::findCurrent(),
-                $this->termin_id,
-                [
-                    [
-                        'begin' => $begin,
-                        'end' => $end
-                    ]
-                ],
-                null,
-                0,
-                null,
-                $preparation_time * 60
-            );
-            if ($booking instanceof ResourceBooking) {
-                $booking->deleteOverlappingReservations();
-                $room_link_string = sprintf(
-                    '<a href="%1$s" data-dialog="1">%2$s</a>',
-                    $room->getActionLink(),
-                    htmlReady($room->name)
-                );
-
-                SingleDateDB::storeSingleDate($this);
-                $msg = sprintf(
-                    _('Für den Termin %1$s wurde der Raum %2$s gebucht.'),
-                    $this->toString(),
-                    $room_link_string
-                );
-                $this->messages['success'][] = $msg;
-            }
-        } catch (ResourceBookingRangeException $e) {
-            $this->messages['error'][] = _('Fehler beim Verknüpfen der Raumbelegung mit dem Einzeltermin!');
-            return false;
-        } catch (ResourceBookingOverlapException $e) {
-            $error_message = sprintf(
-                _('Für den Termin %1$s konnte der Raum %2$s nicht gebucht werden, da es Überschneidungen mit folgenden Terminen gibt:'),
-                $this->toString(),
-                htmlReady($room->name)
-                ) . '<br>';
-            $overlapping_bookings = array_merge(
-                $room->getResourceBookings($begin, $end),
-                $room->getResourceLocks($begin, $end)
-            );
-            foreach ($overlapping_bookings as $overlapping_booking) {
-                $course_link = null;
-                if ($overlapping_booking->course) {
-                    $user_is_lecturer = $GLOBALS['perm']->have_studip_perm(
-                        'dozent',
-                        $overlapping_booking->course->id,
-                        $GLOBALS['user']->id
-                    );
-                    if ($user_is_lecturer) {
-                        $course_link = URLHelper::getLink(
-                            'dispatch.php/course/timesrooms/index',
-                            [
-                                'cid' => $overlapping_booking->course->id
-                            ]
-                        );
-                    }
-                }
-
-                $error_message .= $this->getOverlapMessage(
-                    $overlapping_booking
-                );
-            }
-            $this->messages['error'][] = $error_message;
-            return false;
-        } catch (ResourcePermissionException $e) {
-            $this->messages['error'][] = $e->getMessage();
-            return false;
-        } catch (ResourceBookingException $e) {
-            $this->messages['error'][] = $e->getMessage();
-            return false;
-        }
-
-        return true;
-    }
-
-
-    private function changeAssign(Room $room, $preparation_time = 0)
-    {
-        $max_preparation_time = (Config::get()->RESOURCES_MAX_PREPARATION_TIME);
-        if ($preparation_time > $max_preparation_time) {
-            $this->messages['error'][] = sprintf(
-                _('Die eingegebene Rüstzeit überschreitet das erlaubte Maximum von %d Minuten!'),
-                $max_preparation_time
-            );
-            return false;
-        }
-        if ($assign_id = SingleDateDB::getAssignID($this->termin_id)) {
-            $changeAssign = new ResourceBooking($assign_id);
-            $changeAssign->resource_id = $room->id;
-            $changeAssign->range_id = $this->termin_id;
-            $changeAssign->begin = $this->date;
-            $changeAssign->end = $this->end_time;
-            $changeAssign->repeat_end = $this->end_time;
-            $changeAssign->repetition_interval = '';
-            if ($preparation_time > 0) {
-                $changeAssign->preparation_time = $preparation_time * 60;
-            }
-
-            $room_link_string = sprintf(
-                '<a href="%1$s" data-dialog="1">%2$s</a>',
-                $room->getActionLink(),
-                htmlReady($room->name)
-            );
-
-            $overlaps = $changeAssign->getOverlappingBookings();
-            if (is_array($overlaps) && (sizeof($overlaps) > 0)) {
-                $msg = sprintf(
-                    _('Für den Termin %1$s konnte der Raum %2$s nicht gebucht werden, da es Überschneidungen mit folgenden Terminen gibt:'),
-                    $this->toString(),
-                    $room_link_string
-                    ) . '<br>';
-                foreach ($overlaps as $overlap) {
-                    $msg .= $this->getOverlapMessage($overlap);
-                }
-                $this->messages['error'][] = $msg;
-
-                return false;
-            }
-
-            $this->resource_id = $room->id;
-            try {
-                $changeAssign->store();
-            } catch (ResourceBookingOverlapException $e) {
-                $room = $changeAssign->resource->getDerivedClassInstance();
-                if($room instanceof Room) {
-                    $room_text = $link = sprintf(
-                        '<a href="%1$s" data-dialog="1">%2$s</a>',
-                        $room->getActionLink(),
-                        htmlReady($room->name)
-                    );
-                } else {
-                    $room_text = $changeAssign->resource->name;
-                }
-                $this->messages['error'][] = sprintf(
-                    _('%1$s: Die Buchung vom %2$s bis %3$s konnte wegen Überlappungen nicht gespeichert werden: %4$s'),
-                    $room_text,
-                    date('d.m.Y H:i', $changeAssign->begin),
-                    date('H:i', $changeAssign->end),
-                    htmlReady($e->getMessage())
-                );
-            }
-
-            $msg = sprintf(
-                _('Für den Termin %1$s wurde der Raum %2$s gebucht.'),
-                $this->toString(),
-                $room_link_string
-            );
-            $this->messages['success'][] = $msg;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function killAssign()
-    {
-        $this->resource_id = '';
-        if ($assign_id = SingleDateDB::getAssignID($this->termin_id)) {
-            $assign_object = new ResourceBooking($assign_id);
-            $assign_object->delete();
-        }
-    }
-
-
-    /**
-     * Returns the room name for this SingleDate object.
-     *
-     * @returns string The room name.
-     */
-    public function getRoom()
-    {
-        if (!$this->resource_id) {
-            return null;
-        } else {
-            $room = Room::find($this->resource_id);
-
-            return $room->name;
-        }
-    }
-
-
-    function readIssueIDs()
-    {
-        if (!$this->issues) {
-            if ($data = SingleDateDB::getIssueIDs($this->termin_id)) {
-                foreach ($data as $val) {
-                    $this->issues[$val['issue_id']] = $val['issue_id'];
-                }
-            }
-        }
-
-        return true;
-    }
-
-    function getIssueIDs()
-    {
-        $this->readIssueIDs();
-
-        return $this->issues;
-    }
-
-    function addIssueID($issue_id)
-    {
-        $this->readIssueIDs();
-        $this->issues[$issue_id] = $issue_id;
-
-        return true;
-    }
-
-    function deleteIssueID($issue_id)
-    {
-        $this->readIssueIDs();
-        unset($this->issues[$issue_id]);
-        SingleDateDB::deleteIssueID($issue_id, $this->termin_id);
-
-        return true;
-    }
-
-    function getMessages()
-    {
-        $temp = $this->messages;
-        $this->messages = NULL;
-
-        return $temp;
-    }
-
-    // checks, if the single-date has plausible values
-    function validate($start = 0, $end = 0)
-    {
-        if ($start == 0) {
-            $start = $this->date;
-        }
-        if ($end == 0) {
-            $end = $this->end_time;
-        }
-
-        if ($start < 100000) return false;
-        if ($end < 100000) return false;
-        if ($start > $end) {
-            $this->messages['error'][] = _("Die Endzeitpunkt darf nicht vor dem Anfangszeitpunkt liegen!");
-
-            return false;
-        }
-
-        return true;
-    }
-
-
-    /**
-     * returns a html representation of the date
-     *
-     * @param  array  optional variables which are passed to the template
-     * @return  string  the html-representation of the date
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    function getDatesHTML($params = [])
-    {
-        $template = $GLOBALS['template_factory']->open('dates/date_html.php');
-        $template->set_attributes($params);
-
-        return $this->getDatesTemplate($template);
-    }
-
-    /**
-     * returns a representation without html of the date
-     *
-     * @param  array  optional variables which are passed to the template
-     * @return  string  the representation of the date without html
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    function getDatesExport($params = [])
-    {
-        $template = $GLOBALS['template_factory']->open('dates/date_export.php');
-        $params['link'] = false;
-        $template->set_attributes($params);
-
-        return $this->getDatesTemplate($template);
-    }
-
-    /**
-     * returns a xml-representation of the date
-     *
-     * @param  array  optional variables which are passed to the template
-     * @return  string  the xml-representation of the date
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    function getDatesXML($params = [])
-    {
-        $template = $GLOBALS['template_factory']->open('dates/date_xml.php');
-        $template->set_attributes($params);
-
-        return $this->getDatesTemplate($template);
-    }
-
-    /**
-     * returns a representation of the date with a specifiable template
-     *
-     * @param  mixed  this can be a template-object or a string pointing to a template in path_to_studip/templates
-     * @return  string  the template output of the date
-     *
-     * @author Till Glöggler <tgloeggl@uos.de>
-     */
-    function getDatesTemplate($template)
-    {
-        if (!$template instanceof Flexi\Template && is_string($template)) {
-            $template = $GLOBALS['template_factory']->open($template);
-        }
-
-        $template->set_attribute('date', $this);
-
-        return $template->render();
-    }
-
-    /**
-     * adds a given user_id as a related person to the date
-     * @param string $user_id user_id from auth_user_md5 of the person to be added
-     */
-    public function addRelatedPerson($user_id)
-    {
-        $this->related_persons[] = $user_id;
-        $this->related_persons = array_unique($this->related_persons);
-    }
-
-    /**
-     * unsets a given user_id from the array of related persons
-     * @param string $user_id user_id from auth_user_md5 of the person to be added
-     */
-    public function deleteRelatedPerson($user_id)
-    {
-        if (!$this->related_persons) {
-            $sem = Seminar::getInstance($this->getSeminarID());
-            $this->related_persons = array_keys($sem->getMembers('dozent'));
-        }
-        foreach ($this->related_persons as $key => $related_person) {
-            if ($related_person === $user_id) {
-                unset($this->related_persons[$key]);
-            }
-        }
-    }
-
-    /**
-     * gets all user_ids of related persons of this date
-     * @return array of user_ids
-     */
-    public function getRelatedPersons()
-    {
-        if (count($this->related_persons)) {
-            return $this->related_persons;
-        } else {
-            $sem = Seminar::getInstance($this->getSeminarID());
-
-            return array_keys($sem->getMembers('dozent'));
-        }
-    }
-
-    /**
-     * clears all related persons (in the interface this means that all dozents are
-     * marked as related to the date)
-     */
-    public function clearRelatedPersons()
-    {
-        $this->related_persons = [];
-    }
-
-    /**
-     * adds a given statusgruppe_id as a related group to the date
-     * @param string $statusgruppe_id statusgruppe_id from statusgruppen of the group to be added
-     */
-    public function addRelatedGroup($statusgruppe_id)
-    {
-        $this->related_groups[] = $statusgruppe_id;
-        $this->related_groups = array_unique($this->related_groups);
-    }
-
-    /**
-     * unsets a given statusgruppe_id from the array of related statusgruppen
-     * @param string $statusgruppe_id statusgruppe_id from statusgruppen of the group to be removed
-     */
-    public function deleteRelatedGroup($statusgruppe_id)
-    {
-        if (!$this->related_groups) {
-            $groups = Statusgruppen::findBySeminar_id($this->getSeminarID());
-            $this->related_groups = array_map(function ($g) {
-                return $g->getId();
-            }, $groups);
-        }
-        foreach ($this->related_groups as $key => $related_group) {
-            if ($related_group === $statusgruppe_id) {
-                unset($this->related_groups[$key]);
-            }
-        }
-    }
-
-    /**
-     * gets all statusgruppe_ids of related groups of this date
-     * @return array of statusgruppe_ids
-     */
-    public function getRelatedGroups()
-    {
-        if (count($this->related_groups)) {
-            return $this->related_groups;
-        } else {
-            $groups = Statusgruppen::findBySeminar_id($this->getSeminarID());
-
-            return array_map(function ($g) {
-                return $g->getId();
-            }, $groups);
-        }
-    }
-
-    /**
-     * clears all related groups
-     */
-    public function clearRelatedGroups()
-    {
-        $this->related_groups = [];
-        $this->messages['success'][] = _('Die beteiligten Gruppen wurden zurückgesetzt!');
-    }
-}
diff --git a/lib/raumzeit/SingleDate.php b/lib/raumzeit/SingleDate.php
new file mode 100644
index 0000000..2e8f41e
--- /dev/null
+++ b/lib/raumzeit/SingleDate.php
@@ -0,0 +1,978 @@
+<?php
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+/**
+ * SingelDate.class.php - Ein (Ex-)Termin
+ *
+ * Diese Klasse stellt einen einzelnen Eintrag in der Tabelle termine, bzw. ex_termine dar.
+ *
+ * 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.
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+require_once 'lib/dates.inc.php';
+
+class SingleDate
+{
+    var $termin_id       = '';
+    var $date_typ        = 1;
+    var $metadate_id     = '';
+    var $date            = 0;
+    var $end_time        = 0;
+    var $mkdate          = 0;
+    var $chdate          = 0;
+    var $orig_ex         = false;
+    var $ex_termin       = false;
+    var $range_id        = '';
+    var $author_id       = '';
+    var $resource_id     = '';
+    var $raum            = '';
+    var $request_id      = NULL;
+    var $requestData     = NULL;
+    var $update          = false;
+    var $issues          = NULL;
+    var $messages        = NULL;
+    var $content         = '';
+    var $room_request    = NULL;
+    var $related_persons = [];
+    var $related_groups  = [];
+
+    /**
+     * Return the SingleDate instance of the given id
+     *
+     * @param string      the id of the instance
+     * @return SingleDate the SingleDate instance
+     */
+    function getInstance($singledate_id)
+    {
+        static $singledate_object_pool;
+
+        if ($singledate_id) {
+            if (is_object($singledate_object_pool[$singledate_id]) && $singledate_object_pool[$singledate_id]->getTerminId() == $singledate_id) {
+                return $singledate_object_pool[$singledate_id];
+            } else {
+                $singledate_object_pool[$singledate_id] = new SingleDate($singledate_id);
+
+                return $singledate_object_pool[$singledate_id];
+            }
+        } else {
+            return new SingleDate();
+        }
+
+    }
+
+    function __construct($data = '')
+    {
+        global $user, $id;
+        $termin_id = '';
+        if ($data instanceOf CourseDate || $data instanceof CourseExDate) {
+            $single_date_data = $data->toArray();
+            $single_date_data['ex_termin'] = $data instanceOf CourseDate ? 0 : 1;
+            $single_date_data['resource_id'] = $data->room_booking->resource_id ?? '';
+            if ($data instanceOf CourseDate) {
+                $single_date_data['related_persons'] = $data->dozenten->pluck('user_id');
+                $single_date_data['related_groups'] = $data->statusgruppen->pluck('statusgruppe_id');
+            }
+            $this->fillValuesFromArray($single_date_data);
+        } else {
+            if (is_array($data)) {
+                if ($data['termin_id']) $termin_id = $data['termin_id'];
+                if ($data['seminar_id']) $id = $data['seminar_id'];
+            } else {
+                $termin_id = $data;
+            }
+            if ($termin_id !== '') {
+                $this->termin_id = $termin_id;
+                $this->update = true;
+                $this->restore();
+            } else {
+                $this->termin_id = md5(uniqid('SingleDate', 1));
+                $this->author_id = $user->id;
+                $this->range_id = $id;
+                $this->mkdate = time();
+                $this->chdate = time();
+                $this->update = false;
+            }
+        }
+    }
+
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    function getStartTime()
+    {
+        return $this->date;
+    }
+
+    function setTime($start, $end)
+    {
+        if (($start == 0) || ($end == 0)) return false;
+
+        if (($this->date != $start) || ($this->end_time != $end)) {
+            // validate the passed variables: they have to be ints and $start
+            // has to be smaller than $end
+            if ($this->validate($start, $end)) {
+                $before = $this->toString();
+
+                // if the time-span has been shortened, keep the room-booking,
+                // otherwise remove it.
+                if ($this->resource_id) {
+                    if ($start >= $this->date && $end <= $this->end_time) {
+                        //Shrink the booking.
+                        if ($assign_id = SingleDateDB::getAssignID($this->termin_id)) {
+                            $assign_object = new ResourceBooking($assign_id);
+                            $assign_object->resource_id = $this->resource_id;
+                            $assign_object->begin = $start;
+                            $assign_object->end = $end;
+                            $assign_object->repeat_end = $end;
+                            $assign_object->store();
+                        }
+                    } else {
+                        $this->killAssign();
+                    }
+                }
+
+                $this->date = $start;
+                $this->end_time = $end;
+
+                $after = $this->toString();
+                // logging
+                if ($before) {
+                    StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->termin_id, $before . ' -> ' . $after);
+                } else {
+                    StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->termin_id, $after);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        return false;
+    }
+
+    function getEndTime()
+    {
+        return $this->end_time;
+    }
+
+    function setComment($comment)
+    {
+        $this->content = $comment;
+    }
+
+    function getComment()
+    {
+        if (!$this->isExTermin()) return '';
+
+        return $this->content;
+    }
+
+    function getMetaDateID()
+    {
+        return $this->metadate_id;
+    }
+
+    function setMetaDateID($id)
+    {
+        if ($id != '') {
+            $this->metadate_id = $id;
+
+            return true;
+        } else {
+            $this->metadate_id = 0;
+
+            return false;
+        }
+    }
+
+    function getRangeID()
+    {
+        return $this->range_id;
+    }
+
+    function setDateType($typ)
+    {
+        $this->date_typ = $typ;
+
+        return true;
+    }
+
+    function getDateType()
+    {
+        return $this->date_typ;
+    }
+
+    function getTypeName()
+    {
+        global $TERMIN_TYP;
+
+        return $TERMIN_TYP[$this->date_typ]['name'];
+    }
+
+    function getAuthorID()
+    {
+        return $this->author_id;
+    }
+
+    function getChDate()
+    {
+        return $this->chdate;
+    }
+
+    function getMkDate()
+    {
+        return $this->mkdate;
+    }
+
+    function setSeminarID($seminar_id)
+    {
+        $this->range_id = $seminar_id;
+    }
+
+    function getSeminarID()
+    {
+        return $this->range_id;
+    }
+
+    function getSingleDateID()
+    {
+        return $this->termin_id;
+    }
+
+    function getResourceID()
+    {
+        return $this->resource_id;
+    }
+
+    function getTerminID()
+    {
+        return $this->termin_id;
+    }
+
+    function getFreeRoomText()
+    {
+        return $this->raum;
+    }
+
+    function setFreeRoomText($freeRoomText)
+    {
+        $this->raum = $freeRoomText;
+    }
+
+    function getCycleID()
+    {
+        return $this->metadate_id;
+    }
+
+    /**
+     * @deprecated
+     */
+    function killIssue()
+    {
+        $issue_ids = $this->getIssueIDs();
+        if (count($issue_ids) > 0) {
+            CourseTopic::deleteBySQL("issue_id IN (?)", $issue_ids);
+
+            foreach ($issue_ids as $issue_id) {
+                unset($this->issues[$issue_id]);
+            }
+        }
+    }
+
+    function delete()
+    {
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache->expire('course/undecorated_data/' . $this->range_id);
+
+        $this->chdate = time();
+        $this->killAssign();
+
+        return SingleDateDB::deleteSingleDate($this->termin_id, $this->ex_termin);
+    }
+
+    function store()
+    {
+
+        $cache = \Studip\Cache\Factory::getCache();
+        $cache->expire('course/undecorated_data/' . $this->range_id);
+
+        $this->chdate = time();
+        if ($this->ex_termin) {
+            $this->killAssign();
+        }
+
+        // date_typ = 0 defaults to TERMIN_TYP[1] because there never exists one with zero
+        if (!$this->date_typ) $this->date_typ = 1;
+
+        if ($this->orig_ex != $this->ex_termin) {
+            SingleDateDB::deleteSingleDate($this->termin_id, $this->orig_ex);
+        }
+
+        return SingleDateDB::storeSingleDate($this);
+    }
+
+    function restore()
+    {
+        if (!($data = SingleDateDB::restoreSingleDate($this->termin_id))) {
+            return false;
+        }
+        $this->fillValuesFromArray($data);
+
+        return true;
+    }
+
+    function setExTermin($ex)
+    {
+        if ($ex != $this->ex_termin) {
+            $this->update = false;
+            $this->ex_termin = $ex;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    function isExTermin()
+    {
+        return $this->ex_termin;
+    }
+
+    function isPresence()
+    {
+        return $GLOBALS['TERMIN_TYP'][$this->date_typ]['sitzung'] ? true : false;
+    }
+
+    function isUpdate()
+    {
+        return $this->update;
+    }
+
+    function isHoliday()
+    {
+        $name = null;
+        foreach (SemesterHoliday::getAll() as $val) {
+            if (($val['beginn'] <= $this->date) && ($val['ende'] >= $this->end_time)) {
+                $name = $val['name'];
+            }
+        }
+
+        if (!$name) {
+            $holy_type = holiday($this->date);
+            $name = $holy_type['name'];
+        }
+
+        if ($name) {
+            return $name;
+        } else {
+            return false;
+        }
+    }
+
+    function fillValuesFromArray($daten)
+    {
+        $this->metadate_id = $daten['metadate_id'];
+        $this->termin_id = $daten['termin_id'];
+        if ($daten['date_typ'] != 0) {
+            $this->date_typ = $daten['date_typ'];
+        } else {
+            // if no date_typ is specified it defaults to 1
+            $this->date_typ = 1;
+        }
+        $this->date = $daten['date'];
+        $this->end_time = $daten['end_time'];
+        $this->mkdate = $daten['mkdate'];
+        $this->chdate = $daten ['chdate'];
+        $this->ex_termin = $daten['ex_termin'] ?? null;
+        $this->orig_ex = $daten['ex_termin'] ?? null;
+        $this->range_id = $daten['range_id'];
+        $this->author_id = $daten['autor_id'];
+        $this->resource_id = $daten['resource_id'];
+        $this->raum = $daten['raum'];
+        $this->content = $daten['content'];
+        $this->update = true;
+        $this->related_persons = is_array($daten['related_persons']) ? $daten['related_persons'] : [];
+        $this->related_groups = is_array($daten['related_groups']) ? $daten['related_groups'] : [];
+
+        return true;
+    }
+
+    function toString()
+    {
+        $end_hours = strtotime(strftime('%H:%M', $this->end_time));
+        $start_hours = strtotime(strftime('%H:%M', $this->date));
+        if (!$this->date) {
+            return null;
+        } elseif ((($end_hours - $start_hours) / 60 / 60) > 23) {
+            return sprintf('%s (%s)', strftime('%A, %d.%m.%Y', $this->date),
+                _('ganztägig'));
+        } else {
+            return sprintf('%s - %s', strftime('%A, %d.%m.%Y %H:%M', $this->date),
+                strftime('%H:%M', $this->end_time));
+        }
+    }
+
+    function bookRoom($room_id, $preparation_time = 0)
+    {
+        if ($this->ex_termin || !$room_id) {
+            return false;
+        }
+
+        // create a resource-object of the passed room
+        $room = Room::find($room_id);
+
+        // there is no room with the passed id
+        if (!$room) {
+            return false;
+        }
+
+        // check permissions (is current user allowed to book the passed room?)
+        if (!$room->userHasBookingRights(User::findCurrent(), $this->date, $this->end_time)) {
+            return false;
+        }
+
+        // clear the freetext-field, if we book a room
+        $this->setFreeRoomText('');
+        $this->store();
+
+        //If there is already a room assigned, "change" the booking.
+        //Otherwise create a new one.
+        if ($this->resource_id != '') {
+            $this->changeAssign($room, $preparation_time);
+        } else {
+            $this->insertAssign($room, $preparation_time);
+        }
+
+        return $room;
+    }
+
+
+    /**
+     * This method converts overlap data about an overlapping booking
+     * to a string that can be used to output overlap information to the user.
+     * Only one overlap is converted by this method. For multiple overlaps
+     * this method must be called multiple times.
+     *
+     * @param ResourceBooking $booking The overlapping booking.
+     *
+     * @return string A string representation of the overlap.
+     */
+    protected function getOverlapMessage(ResourceBooking $booking)
+    {
+        $message = '';
+
+        if ($booking->booking_type == ResourceBooking::TYPE_LOCK) {
+            $message .= sprintf(
+                _('Vom %1$s, %2$s Uhr bis zum %3$s, %4$s Uhr (Sperrzeit)') . "\n",
+                date("d.m.Y", $booking->begin),
+                date("H:i", $booking->begin),
+                date("d.m.Y", $booking->end),
+                date("H:i", $booking->end)
+            );
+        } else {
+            $course = Course::find($booking->course_id);
+
+            if ($course) {
+                $user_has_permissions = $GLOBALS['perm']->have_studip_perm(
+                    'dozent',
+                    $course->id,
+                    $GLOBALS['user']->id
+                );
+                if ($user_has_permissions) {
+                    $course_link = URLHelper::getLink(
+                        'dispatch.php/course/timesrooms/index',
+                        [
+                            'cid' => $course->id
+                        ]
+                    );
+                    $message .= sprintf(
+                        _('Am %1$s von %2$s bis %3$s Uhr durch Veranstaltung %4$s') . "\n",
+                        date('d.m.Y', $booking->begin),
+                        date('H:i', $booking->begin),
+                        date('H:i', $booking->end),
+                        sprintf(
+                            '<a href="%1$s">%2$s</a>',
+                            $course_link,
+                            htmlReady($course->name)
+                        )
+                    );
+                } else {
+                    $course_link = URLHelper::getLink(
+                        'dispatch.php/course/details',
+                        [
+                            'sem_id' => $course->id
+                        ]
+                    );
+                    $message .= sprintf(
+                        _('Am %1$s von %2$s bis %3$s Uhr durch Veranstaltung %4$s') . "\n",
+                        date('d.m.Y', $booking->begin),
+                        date('H:i', $booking->begin),
+                        date('H:i', $booking->end),
+                        sprintf(
+                            '<a href="%1$s">%2$s</a>',
+                            $course_link,
+                            htmlReady($course->name)
+                        )
+                    );
+                }
+            } else {
+                $message .= sprintf(
+                    _('Am %1$s von %2$s bis %3$s Uhr belegt von "%4$s"') . "\n",
+                    date("d.m.Y", $booking->begin),
+                    date("H:i", $booking->begin),
+                    date("H:i", $booking->end),
+                    htmlReady($booking->description)
+                );
+            }
+        }
+
+        return $message;
+    }
+
+
+    private function insertAssign(Room $room, $preparation_time = 0)
+    {
+        $begin = new DateTime();
+        $begin->setTimestamp($this->date);
+        $end = new DateTime();
+        $end->setTimestamp($this->end_time);
+
+        //If the following code is executed a new room booking can be created:
+        try {
+            $booking = $room->createBooking(
+                User::findCurrent(),
+                $this->termin_id,
+                [
+                    [
+                        'begin' => $begin,
+                        'end' => $end
+                    ]
+                ],
+                null,
+                0,
+                null,
+                $preparation_time * 60
+            );
+            if ($booking instanceof ResourceBooking) {
+                $booking->deleteOverlappingReservations();
+                $room_link_string = sprintf(
+                    '<a href="%1$s" data-dialog="1">%2$s</a>',
+                    $room->getActionLink(),
+                    htmlReady($room->name)
+                );
+
+                SingleDateDB::storeSingleDate($this);
+                $msg = sprintf(
+                    _('Für den Termin %1$s wurde der Raum %2$s gebucht.'),
+                    $this->toString(),
+                    $room_link_string
+                );
+                $this->messages['success'][] = $msg;
+            }
+        } catch (ResourceBookingRangeException $e) {
+            $this->messages['error'][] = _('Fehler beim Verknüpfen der Raumbelegung mit dem Einzeltermin!');
+            return false;
+        } catch (ResourceBookingOverlapException $e) {
+            $error_message = sprintf(
+                _('Für den Termin %1$s konnte der Raum %2$s nicht gebucht werden, da es Überschneidungen mit folgenden Terminen gibt:'),
+                $this->toString(),
+                htmlReady($room->name)
+                ) . '<br>';
+            $overlapping_bookings = array_merge(
+                $room->getResourceBookings($begin, $end),
+                $room->getResourceLocks($begin, $end)
+            );
+            foreach ($overlapping_bookings as $overlapping_booking) {
+                $course_link = null;
+                if ($overlapping_booking->course) {
+                    $user_is_lecturer = $GLOBALS['perm']->have_studip_perm(
+                        'dozent',
+                        $overlapping_booking->course->id,
+                        $GLOBALS['user']->id
+                    );
+                    if ($user_is_lecturer) {
+                        $course_link = URLHelper::getLink(
+                            'dispatch.php/course/timesrooms/index',
+                            [
+                                'cid' => $overlapping_booking->course->id
+                            ]
+                        );
+                    }
+                }
+
+                $error_message .= $this->getOverlapMessage(
+                    $overlapping_booking
+                );
+            }
+            $this->messages['error'][] = $error_message;
+            return false;
+        } catch (ResourcePermissionException $e) {
+            $this->messages['error'][] = $e->getMessage();
+            return false;
+        } catch (ResourceBookingException $e) {
+            $this->messages['error'][] = $e->getMessage();
+            return false;
+        }
+
+        return true;
+    }
+
+
+    private function changeAssign(Room $room, $preparation_time = 0)
+    {
+        $max_preparation_time = (Config::get()->RESOURCES_MAX_PREPARATION_TIME);
+        if ($preparation_time > $max_preparation_time) {
+            $this->messages['error'][] = sprintf(
+                _('Die eingegebene Rüstzeit überschreitet das erlaubte Maximum von %d Minuten!'),
+                $max_preparation_time
+            );
+            return false;
+        }
+        if ($assign_id = SingleDateDB::getAssignID($this->termin_id)) {
+            $changeAssign = new ResourceBooking($assign_id);
+            $changeAssign->resource_id = $room->id;
+            $changeAssign->range_id = $this->termin_id;
+            $changeAssign->begin = $this->date;
+            $changeAssign->end = $this->end_time;
+            $changeAssign->repeat_end = $this->end_time;
+            $changeAssign->repetition_interval = '';
+            if ($preparation_time > 0) {
+                $changeAssign->preparation_time = $preparation_time * 60;
+            }
+
+            $room_link_string = sprintf(
+                '<a href="%1$s" data-dialog="1">%2$s</a>',
+                $room->getActionLink(),
+                htmlReady($room->name)
+            );
+
+            $overlaps = $changeAssign->getOverlappingBookings();
+            if (is_array($overlaps) && (sizeof($overlaps) > 0)) {
+                $msg = sprintf(
+                    _('Für den Termin %1$s konnte der Raum %2$s nicht gebucht werden, da es Überschneidungen mit folgenden Terminen gibt:'),
+                    $this->toString(),
+                    $room_link_string
+                    ) . '<br>';
+                foreach ($overlaps as $overlap) {
+                    $msg .= $this->getOverlapMessage($overlap);
+                }
+                $this->messages['error'][] = $msg;
+
+                return false;
+            }
+
+            $this->resource_id = $room->id;
+            try {
+                $changeAssign->store();
+            } catch (ResourceBookingOverlapException $e) {
+                $room = $changeAssign->resource->getDerivedClassInstance();
+                if($room instanceof Room) {
+                    $room_text = $link = sprintf(
+                        '<a href="%1$s" data-dialog="1">%2$s</a>',
+                        $room->getActionLink(),
+                        htmlReady($room->name)
+                    );
+                } else {
+                    $room_text = $changeAssign->resource->name;
+                }
+                $this->messages['error'][] = sprintf(
+                    _('%1$s: Die Buchung vom %2$s bis %3$s konnte wegen Überlappungen nicht gespeichert werden: %4$s'),
+                    $room_text,
+                    date('d.m.Y H:i', $changeAssign->begin),
+                    date('H:i', $changeAssign->end),
+                    htmlReady($e->getMessage())
+                );
+            }
+
+            $msg = sprintf(
+                _('Für den Termin %1$s wurde der Raum %2$s gebucht.'),
+                $this->toString(),
+                $room_link_string
+            );
+            $this->messages['success'][] = $msg;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    function killAssign()
+    {
+        $this->resource_id = '';
+        if ($assign_id = SingleDateDB::getAssignID($this->termin_id)) {
+            $assign_object = new ResourceBooking($assign_id);
+            $assign_object->delete();
+        }
+    }
+
+
+    /**
+     * Returns the room name for this SingleDate object.
+     *
+     * @returns string The room name.
+     */
+    public function getRoom()
+    {
+        if (!$this->resource_id) {
+            return null;
+        } else {
+            $room = Room::find($this->resource_id);
+
+            return $room->name;
+        }
+    }
+
+
+    function readIssueIDs()
+    {
+        if (!$this->issues) {
+            if ($data = SingleDateDB::getIssueIDs($this->termin_id)) {
+                foreach ($data as $val) {
+                    $this->issues[$val['issue_id']] = $val['issue_id'];
+                }
+            }
+        }
+
+        return true;
+    }
+
+    function getIssueIDs()
+    {
+        $this->readIssueIDs();
+
+        return $this->issues;
+    }
+
+    function addIssueID($issue_id)
+    {
+        $this->readIssueIDs();
+        $this->issues[$issue_id] = $issue_id;
+
+        return true;
+    }
+
+    function deleteIssueID($issue_id)
+    {
+        $this->readIssueIDs();
+        unset($this->issues[$issue_id]);
+        SingleDateDB::deleteIssueID($issue_id, $this->termin_id);
+
+        return true;
+    }
+
+    function getMessages()
+    {
+        $temp = $this->messages;
+        $this->messages = NULL;
+
+        return $temp;
+    }
+
+    // checks, if the single-date has plausible values
+    function validate($start = 0, $end = 0)
+    {
+        if ($start == 0) {
+            $start = $this->date;
+        }
+        if ($end == 0) {
+            $end = $this->end_time;
+        }
+
+        if ($start < 100000) return false;
+        if ($end < 100000) return false;
+        if ($start > $end) {
+            $this->messages['error'][] = _("Die Endzeitpunkt darf nicht vor dem Anfangszeitpunkt liegen!");
+
+            return false;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * returns a html representation of the date
+     *
+     * @param  array  optional variables which are passed to the template
+     * @return  string  the html-representation of the date
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    function getDatesHTML($params = [])
+    {
+        $template = $GLOBALS['template_factory']->open('dates/date_html.php');
+        $template->set_attributes($params);
+
+        return $this->getDatesTemplate($template);
+    }
+
+    /**
+     * returns a representation without html of the date
+     *
+     * @param  array  optional variables which are passed to the template
+     * @return  string  the representation of the date without html
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    function getDatesExport($params = [])
+    {
+        $template = $GLOBALS['template_factory']->open('dates/date_export.php');
+        $params['link'] = false;
+        $template->set_attributes($params);
+
+        return $this->getDatesTemplate($template);
+    }
+
+    /**
+     * returns a xml-representation of the date
+     *
+     * @param  array  optional variables which are passed to the template
+     * @return  string  the xml-representation of the date
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    function getDatesXML($params = [])
+    {
+        $template = $GLOBALS['template_factory']->open('dates/date_xml.php');
+        $template->set_attributes($params);
+
+        return $this->getDatesTemplate($template);
+    }
+
+    /**
+     * returns a representation of the date with a specifiable template
+     *
+     * @param  mixed  this can be a template-object or a string pointing to a template in path_to_studip/templates
+     * @return  string  the template output of the date
+     *
+     * @author Till Glöggler <tgloeggl@uos.de>
+     */
+    function getDatesTemplate($template)
+    {
+        if (!$template instanceof Flexi\Template && is_string($template)) {
+            $template = $GLOBALS['template_factory']->open($template);
+        }
+
+        $template->set_attribute('date', $this);
+
+        return $template->render();
+    }
+
+    /**
+     * adds a given user_id as a related person to the date
+     * @param string $user_id user_id from auth_user_md5 of the person to be added
+     */
+    public function addRelatedPerson($user_id)
+    {
+        $this->related_persons[] = $user_id;
+        $this->related_persons = array_unique($this->related_persons);
+    }
+
+    /**
+     * unsets a given user_id from the array of related persons
+     * @param string $user_id user_id from auth_user_md5 of the person to be added
+     */
+    public function deleteRelatedPerson($user_id)
+    {
+        if (!$this->related_persons) {
+            $sem = Seminar::getInstance($this->getSeminarID());
+            $this->related_persons = array_keys($sem->getMembers('dozent'));
+        }
+        foreach ($this->related_persons as $key => $related_person) {
+            if ($related_person === $user_id) {
+                unset($this->related_persons[$key]);
+            }
+        }
+    }
+
+    /**
+     * gets all user_ids of related persons of this date
+     * @return array of user_ids
+     */
+    public function getRelatedPersons()
+    {
+        if (count($this->related_persons)) {
+            return $this->related_persons;
+        } else {
+            $sem = Seminar::getInstance($this->getSeminarID());
+
+            return array_keys($sem->getMembers('dozent'));
+        }
+    }
+
+    /**
+     * clears all related persons (in the interface this means that all dozents are
+     * marked as related to the date)
+     */
+    public function clearRelatedPersons()
+    {
+        $this->related_persons = [];
+    }
+
+    /**
+     * adds a given statusgruppe_id as a related group to the date
+     * @param string $statusgruppe_id statusgruppe_id from statusgruppen of the group to be added
+     */
+    public function addRelatedGroup($statusgruppe_id)
+    {
+        $this->related_groups[] = $statusgruppe_id;
+        $this->related_groups = array_unique($this->related_groups);
+    }
+
+    /**
+     * unsets a given statusgruppe_id from the array of related statusgruppen
+     * @param string $statusgruppe_id statusgruppe_id from statusgruppen of the group to be removed
+     */
+    public function deleteRelatedGroup($statusgruppe_id)
+    {
+        if (!$this->related_groups) {
+            $groups = Statusgruppen::findBySeminar_id($this->getSeminarID());
+            $this->related_groups = array_map(function ($g) {
+                return $g->getId();
+            }, $groups);
+        }
+        foreach ($this->related_groups as $key => $related_group) {
+            if ($related_group === $statusgruppe_id) {
+                unset($this->related_groups[$key]);
+            }
+        }
+    }
+
+    /**
+     * gets all statusgruppe_ids of related groups of this date
+     * @return array of statusgruppe_ids
+     */
+    public function getRelatedGroups()
+    {
+        if (count($this->related_groups)) {
+            return $this->related_groups;
+        } else {
+            $groups = Statusgruppen::findBySeminar_id($this->getSeminarID());
+
+            return array_map(function ($g) {
+                return $g->getId();
+            }, $groups);
+        }
+    }
+
+    /**
+     * clears all related groups
+     */
+    public function clearRelatedGroups()
+    {
+        $this->related_groups = [];
+        $this->messages['success'][] = _('Die beteiligten Gruppen wurden zurückgesetzt!');
+    }
+}
diff --git a/lib/raumzeit/SingleDateDB.class.php b/lib/raumzeit/SingleDateDB.class.php
deleted file mode 100644
index e50d6cf..0000000
--- a/lib/raumzeit/SingleDateDB.class.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-# Lifter007: TODO
-# Lifter003: TEST
-# Lifter010: DONE
-// +--------------------------------------------------------------------------+
-// This file is part of Stud.IP
-// SingleDateDB.class.php
-//
-// Datenbank-Abfragen für SingleDate.class.php
-//
-// +--------------------------------------------------------------------------+
-// 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 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.
-// +--------------------------------------------------------------------------+
-
-
-/**
- * SingleDateDB.class.php
- *
- *
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @version     19. Oktober 2005
- * @access      protected
- * @package     raumzeit
- */
-
-class SingleDateDB
-{
-    static function storeSingleDate($termin)
-    {
-        //NOTE: If you modify this method make sure the changes
-        //are also inserted in CourseDate::cancelDate and
-        //CourseExDate::unCancelDate to keep the behavior consistent
-        //across Stud.IP!
-
-        $table = 'termine';
-
-        if ($termin->isExTermin()) {
-            $table = 'ex_termine';
-
-            $booking = ResourceBooking::findByRange_id($termin->getTerminID());
-            if ($booking) {
-                // delete resource-request, if any
-                ResourceRequest::deleteBySql(
-                    'termin_id = :termin_id',
-                    [
-                        'termin_id' => $termin->getTerminID()
-                    ]
-                );
-
-                // delete resource booking, if any
-                $booking->delete();
-            }
-        }
-
-        $issueIDs = $termin->getIssueIDs();
-        if (is_array($issueIDs)) {
-            $query = "REPLACE INTO themen_termine (termin_id, issue_id)
-                      VALUES (?, ?)";
-            $statement = DBManager::get()->prepare($query);
-
-            foreach ($issueIDs as $val) {
-                $statement->execute([
-                    $termin->getTerminID(),
-                    $val
-                ]);
-            }
-        }
-
-        if ($termin->isUpdate()) {
-            $query = "UPDATE :table
-                      SET metadate_id = :metadate_id, date_typ = :date_typ,
-                          date = :date, end_time = :end_time,
-                          range_id = :range_id, autor_id = :autor_id,
-                          raum = :raum, content = :content
-                      WHERE termin_id = :termin_id";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':table', $table, StudipPDO::PARAM_COLUMN);
-            $statement->bindValue(':metadate_id', $termin->getMetaDateID() ?: null);
-            $statement->bindValue(':date_typ', $termin->getDateType());
-            $statement->bindValue(':date', $termin->getStartTime());
-            $statement->bindValue(':end_time', $termin->getEndTime());
-            $statement->bindValue(':range_id', $termin->getRangeID());
-            $statement->bindValue(':autor_id', $termin->getAuthorID());
-            $statement->bindValue(':raum', $termin->getFreeRoomText());
-            $statement->bindValue(':content', $termin->getComment());
-            $statement->bindValue(':termin_id',$termin->getTerminID());
-            $statement->execute();
-
-            if ($statement->rowCount() > 0) {
-                $query = "UPDATE :table SET chdate = :chdate WHERE termin_id = :termin_id";
-                $statement = DBManager::get()->prepare($query);
-                $statement->bindValue(':table', $table, StudipPDO::PARAM_COLUMN);
-                $statement->bindValue(':chdate', $termin->getChDate());
-                $statement->bindValue(':termin_id', $termin->getTerminID());
-                $statement->execute();
-            }
-        } else {
-            $query = "REPLACE INTO :table
-                        (metadate_id, date_typ, date, end_time, mkdate, chdate,
-                         termin_id, range_id, autor_id, raum, content)
-                      VALUES
-                        (:metadate_id, :date_typ, :date, :end_time, :mkdate, :chdate,
-                         :termin_id, :range_id, :autor_id, :raum, :content)";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':table', $table, StudipPDO::PARAM_COLUMN);
-            $statement->bindValue(':metadate_id', $termin->getMetaDateID());
-            $statement->bindValue(':date_typ', $termin->getDateType());
-            $statement->bindValue(':date', $termin->getStartTime());
-            $statement->bindValue(':end_time', $termin->getEndTime());
-            $statement->bindValue(':mkdate', $termin->getMkDate());
-            $statement->bindValue(':chdate', $termin->getChDate());
-            $statement->bindValue(':termin_id', $termin->getTerminID());
-            $statement->bindValue(':range_id', $termin->getRangeID());
-            $statement->bindValue(':autor_id', $termin->getAuthorID());
-            $statement->bindValue(':raum', $termin->getFreeRoomText());
-            $statement->bindValue(':content', $termin->getComment());
-            $statement->execute();
-        }
-
-        $query = "DELETE FROM termin_related_persons WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin->getTerminId()]);
-
-        if (count($termin->related_persons)
-                && (count($termin->related_persons) < CourseMember::countBySQL("Seminar_id = ? AND status = 'dozent'", [$termin->range_id]))) {
-            $query = "INSERT IGNORE INTO termin_related_persons (range_id, user_id) VALUES (?, ?)";
-            $statement = DBManager::get()->prepare($query);
-
-            foreach ($termin->getRelatedPersons() as $user_id) {
-                $statement->execute([
-                    $termin->getTerminId(),
-                    $user_id
-                ]);
-            }
-        }
-
-        $query = "DELETE FROM termin_related_groups WHERE termin_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin->getTerminId()]);
-        if (count($termin->related_groups)
-                && (count($termin->related_groups) < Statusgruppen::countBySQL("range_id = ?", [$termin->range_id]))) {
-            $query = "INSERT IGNORE INTO termin_related_groups (termin_id, statusgruppe_id) VALUES (?, ?)";
-            $statement = DBManager::get()->prepare($query);
-            foreach ($termin->getRelatedGroups() as $statusgruppe_id) {
-                $statement->execute([
-                    $termin->getTerminId(),
-                    $statusgruppe_id
-                ]);
-            }
-        }
-
-        return true;
-    }
-
-    static function restoreSingleDate($termin_id)
-    {
-        $query = "SELECT termine.*, resource_id, 0 AS ex_termin,
-                        GROUP_CONCAT(trp.user_id) AS related_persons,
-                        GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                  FROM termine
-                        LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
-                        LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
-                        LEFT JOIN resource_bookings ON (resource_bookings.range_id = termine.termin_id)
-                  WHERE termine.termin_id = ?
-                  GROUP BY termine.termin_id
-                  ORDER BY NULL";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin_id]);
-        if ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $result['related_persons'] = array_filter(explode(',', $result['related_persons']));
-            $result['related_groups'] = array_filter(explode(',', $result['related_groups']));
-            return $result;
-        }
-
-        $query = "SELECT ex_termine.*, 1 AS ex_termin,
-                         GROUP_CONCAT(trp.user_id) AS related_persons,
-                         GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
-                  FROM ex_termine
-                    LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
-                    LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
-                  WHERE ex_termine.termin_id = ?
-                  GROUP BY termin_id
-                  ORDER BY NULL";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin_id]);
-        if ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
-            $result['related_persons'] = array_filter(explode(',', $result['related_persons']));
-            $result['related_groups'] = array_filter(explode(',', $result['related_groups']));
-            return $result;
-        }
-
-        return false;
-    }
-
-    static function deleteSingleDate($id, $ex_termin)
-    {
-        if (Config::get()->RESOURCES_ENABLE) {
-            // delete resource booking, if any
-            $killAssign = new ResourceBooking(self::getAssignID($id));
-            $killAssign->delete();
-
-            //Delete resource requests:
-            ResourceRequest::deleteBySql(
-                'termin_id = :termin_id',
-                [
-                    'termin_id' => $id
-                ]
-            );
-        }
-
-        // Prepare query that deletes all entries for a given termin id
-        // from a given table
-        $query = "DELETE FROM :table WHERE termin_id = :termin_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':termin_id', $id);
-
-        // Execute statement for the termin itself (ex_termin if neccessary)
-        $statement->bindValue(':table', $ex_termin ? 'ex_termine' : 'termine', StudipPDO::PARAM_COLUMN);
-        $statement->execute();
-
-        // Execute statement for themen_termine
-        $statement->bindValue(':table', 'themen_termine', StudipPDO::PARAM_COLUMN);
-        $statement->execute();
-
-        // Execute statement for termin_related_persons
-        $query = "DELETE FROM termin_related_persons WHERE range_id = :termin_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':termin_id', $id);
-        $statement->execute();
-
-        return true;
-    }
-
-    static function getAssignID($termin_id)
-    {
-        $query = "SELECT resource_bookings.id
-                  FROM termine
-                  LEFT JOIN resource_bookings ON (resource_bookings.range_id = termin_id)
-                  WHERE termin_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin_id]);
-        return $statement->fetchColumn() ?: false;
-    }
-
-
-    static function getIssueIDs($termin_id)
-    {
-        $query = "SELECT tt.*
-                  FROM themen_termine AS tt
-                  LEFT JOIN themen AS t USING (issue_id)
-                  WHERE termin_id = ?
-                    AND issue_id IS NOT NULL AND issue_id != '' ORDER BY t.priority, t.title";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin_id]);
-        $result = $statement->fetchAll(PDO::FETCH_ASSOC);
-
-        return $result ?: null;
-    }
-
-    static function deleteIssueID($issue_id, $termin_id)
-    {
-        $query = "DELETE FROM themen_termine WHERE termin_id = ? AND issue_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$termin_id, $issue_id]);
-
-        return true;
-    }
-
-
-    static function deleteAllDates($course_id)
-    {
-        $query = "DELETE FROM ex_termine WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$course_id]);
-
-        $query = "SELECT termin_id FROM termine WHERE range_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$course_id]);
-
-        $termine = 0;
-        while ($termin_id = $statement->fetchColumn()) {
-            self::deleteSingleDate($termin_id, false);
-            $termine += 1;
-        }
-
-        return $termine;
-    }
-}
diff --git a/lib/raumzeit/SingleDateDB.php b/lib/raumzeit/SingleDateDB.php
new file mode 100644
index 0000000..e50d6cf
--- /dev/null
+++ b/lib/raumzeit/SingleDateDB.php
@@ -0,0 +1,299 @@
+<?php
+# Lifter007: TODO
+# Lifter003: TEST
+# Lifter010: DONE
+// +--------------------------------------------------------------------------+
+// This file is part of Stud.IP
+// SingleDateDB.class.php
+//
+// Datenbank-Abfragen für SingleDate.class.php
+//
+// +--------------------------------------------------------------------------+
+// 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 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.
+// +--------------------------------------------------------------------------+
+
+
+/**
+ * SingleDateDB.class.php
+ *
+ *
+ * @author      Till Glöggler <tgloeggl@uos.de>
+ * @version     19. Oktober 2005
+ * @access      protected
+ * @package     raumzeit
+ */
+
+class SingleDateDB
+{
+    static function storeSingleDate($termin)
+    {
+        //NOTE: If you modify this method make sure the changes
+        //are also inserted in CourseDate::cancelDate and
+        //CourseExDate::unCancelDate to keep the behavior consistent
+        //across Stud.IP!
+
+        $table = 'termine';
+
+        if ($termin->isExTermin()) {
+            $table = 'ex_termine';
+
+            $booking = ResourceBooking::findByRange_id($termin->getTerminID());
+            if ($booking) {
+                // delete resource-request, if any
+                ResourceRequest::deleteBySql(
+                    'termin_id = :termin_id',
+                    [
+                        'termin_id' => $termin->getTerminID()
+                    ]
+                );
+
+                // delete resource booking, if any
+                $booking->delete();
+            }
+        }
+
+        $issueIDs = $termin->getIssueIDs();
+        if (is_array($issueIDs)) {
+            $query = "REPLACE INTO themen_termine (termin_id, issue_id)
+                      VALUES (?, ?)";
+            $statement = DBManager::get()->prepare($query);
+
+            foreach ($issueIDs as $val) {
+                $statement->execute([
+                    $termin->getTerminID(),
+                    $val
+                ]);
+            }
+        }
+
+        if ($termin->isUpdate()) {
+            $query = "UPDATE :table
+                      SET metadate_id = :metadate_id, date_typ = :date_typ,
+                          date = :date, end_time = :end_time,
+                          range_id = :range_id, autor_id = :autor_id,
+                          raum = :raum, content = :content
+                      WHERE termin_id = :termin_id";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':table', $table, StudipPDO::PARAM_COLUMN);
+            $statement->bindValue(':metadate_id', $termin->getMetaDateID() ?: null);
+            $statement->bindValue(':date_typ', $termin->getDateType());
+            $statement->bindValue(':date', $termin->getStartTime());
+            $statement->bindValue(':end_time', $termin->getEndTime());
+            $statement->bindValue(':range_id', $termin->getRangeID());
+            $statement->bindValue(':autor_id', $termin->getAuthorID());
+            $statement->bindValue(':raum', $termin->getFreeRoomText());
+            $statement->bindValue(':content', $termin->getComment());
+            $statement->bindValue(':termin_id',$termin->getTerminID());
+            $statement->execute();
+
+            if ($statement->rowCount() > 0) {
+                $query = "UPDATE :table SET chdate = :chdate WHERE termin_id = :termin_id";
+                $statement = DBManager::get()->prepare($query);
+                $statement->bindValue(':table', $table, StudipPDO::PARAM_COLUMN);
+                $statement->bindValue(':chdate', $termin->getChDate());
+                $statement->bindValue(':termin_id', $termin->getTerminID());
+                $statement->execute();
+            }
+        } else {
+            $query = "REPLACE INTO :table
+                        (metadate_id, date_typ, date, end_time, mkdate, chdate,
+                         termin_id, range_id, autor_id, raum, content)
+                      VALUES
+                        (:metadate_id, :date_typ, :date, :end_time, :mkdate, :chdate,
+                         :termin_id, :range_id, :autor_id, :raum, :content)";
+            $statement = DBManager::get()->prepare($query);
+            $statement->bindValue(':table', $table, StudipPDO::PARAM_COLUMN);
+            $statement->bindValue(':metadate_id', $termin->getMetaDateID());
+            $statement->bindValue(':date_typ', $termin->getDateType());
+            $statement->bindValue(':date', $termin->getStartTime());
+            $statement->bindValue(':end_time', $termin->getEndTime());
+            $statement->bindValue(':mkdate', $termin->getMkDate());
+            $statement->bindValue(':chdate', $termin->getChDate());
+            $statement->bindValue(':termin_id', $termin->getTerminID());
+            $statement->bindValue(':range_id', $termin->getRangeID());
+            $statement->bindValue(':autor_id', $termin->getAuthorID());
+            $statement->bindValue(':raum', $termin->getFreeRoomText());
+            $statement->bindValue(':content', $termin->getComment());
+            $statement->execute();
+        }
+
+        $query = "DELETE FROM termin_related_persons WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin->getTerminId()]);
+
+        if (count($termin->related_persons)
+                && (count($termin->related_persons) < CourseMember::countBySQL("Seminar_id = ? AND status = 'dozent'", [$termin->range_id]))) {
+            $query = "INSERT IGNORE INTO termin_related_persons (range_id, user_id) VALUES (?, ?)";
+            $statement = DBManager::get()->prepare($query);
+
+            foreach ($termin->getRelatedPersons() as $user_id) {
+                $statement->execute([
+                    $termin->getTerminId(),
+                    $user_id
+                ]);
+            }
+        }
+
+        $query = "DELETE FROM termin_related_groups WHERE termin_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin->getTerminId()]);
+        if (count($termin->related_groups)
+                && (count($termin->related_groups) < Statusgruppen::countBySQL("range_id = ?", [$termin->range_id]))) {
+            $query = "INSERT IGNORE INTO termin_related_groups (termin_id, statusgruppe_id) VALUES (?, ?)";
+            $statement = DBManager::get()->prepare($query);
+            foreach ($termin->getRelatedGroups() as $statusgruppe_id) {
+                $statement->execute([
+                    $termin->getTerminId(),
+                    $statusgruppe_id
+                ]);
+            }
+        }
+
+        return true;
+    }
+
+    static function restoreSingleDate($termin_id)
+    {
+        $query = "SELECT termine.*, resource_id, 0 AS ex_termin,
+                        GROUP_CONCAT(trp.user_id) AS related_persons,
+                        GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                  FROM termine
+                        LEFT JOIN termin_related_persons AS trp ON (termine.termin_id = trp.range_id)
+                        LEFT JOIN termin_related_groups AS trg ON (termine.termin_id = trg.termin_id)
+                        LEFT JOIN resource_bookings ON (resource_bookings.range_id = termine.termin_id)
+                  WHERE termine.termin_id = ?
+                  GROUP BY termine.termin_id
+                  ORDER BY NULL";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin_id]);
+        if ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $result['related_persons'] = array_filter(explode(',', $result['related_persons']));
+            $result['related_groups'] = array_filter(explode(',', $result['related_groups']));
+            return $result;
+        }
+
+        $query = "SELECT ex_termine.*, 1 AS ex_termin,
+                         GROUP_CONCAT(trp.user_id) AS related_persons,
+                         GROUP_CONCAT(DISTINCT trg.statusgruppe_id) AS related_groups
+                  FROM ex_termine
+                    LEFT JOIN termin_related_persons AS trp ON (ex_termine.termin_id = trp.range_id)
+                    LEFT JOIN termin_related_groups AS trg ON (ex_termine.termin_id = trg.termin_id)
+                  WHERE ex_termine.termin_id = ?
+                  GROUP BY termin_id
+                  ORDER BY NULL";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin_id]);
+        if ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
+            $result['related_persons'] = array_filter(explode(',', $result['related_persons']));
+            $result['related_groups'] = array_filter(explode(',', $result['related_groups']));
+            return $result;
+        }
+
+        return false;
+    }
+
+    static function deleteSingleDate($id, $ex_termin)
+    {
+        if (Config::get()->RESOURCES_ENABLE) {
+            // delete resource booking, if any
+            $killAssign = new ResourceBooking(self::getAssignID($id));
+            $killAssign->delete();
+
+            //Delete resource requests:
+            ResourceRequest::deleteBySql(
+                'termin_id = :termin_id',
+                [
+                    'termin_id' => $id
+                ]
+            );
+        }
+
+        // Prepare query that deletes all entries for a given termin id
+        // from a given table
+        $query = "DELETE FROM :table WHERE termin_id = :termin_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':termin_id', $id);
+
+        // Execute statement for the termin itself (ex_termin if neccessary)
+        $statement->bindValue(':table', $ex_termin ? 'ex_termine' : 'termine', StudipPDO::PARAM_COLUMN);
+        $statement->execute();
+
+        // Execute statement for themen_termine
+        $statement->bindValue(':table', 'themen_termine', StudipPDO::PARAM_COLUMN);
+        $statement->execute();
+
+        // Execute statement for termin_related_persons
+        $query = "DELETE FROM termin_related_persons WHERE range_id = :termin_id";
+        $statement = DBManager::get()->prepare($query);
+        $statement->bindValue(':termin_id', $id);
+        $statement->execute();
+
+        return true;
+    }
+
+    static function getAssignID($termin_id)
+    {
+        $query = "SELECT resource_bookings.id
+                  FROM termine
+                  LEFT JOIN resource_bookings ON (resource_bookings.range_id = termin_id)
+                  WHERE termin_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin_id]);
+        return $statement->fetchColumn() ?: false;
+    }
+
+
+    static function getIssueIDs($termin_id)
+    {
+        $query = "SELECT tt.*
+                  FROM themen_termine AS tt
+                  LEFT JOIN themen AS t USING (issue_id)
+                  WHERE termin_id = ?
+                    AND issue_id IS NOT NULL AND issue_id != '' ORDER BY t.priority, t.title";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin_id]);
+        $result = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+        return $result ?: null;
+    }
+
+    static function deleteIssueID($issue_id, $termin_id)
+    {
+        $query = "DELETE FROM themen_termine WHERE termin_id = ? AND issue_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$termin_id, $issue_id]);
+
+        return true;
+    }
+
+
+    static function deleteAllDates($course_id)
+    {
+        $query = "DELETE FROM ex_termine WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$course_id]);
+
+        $query = "SELECT termin_id FROM termine WHERE range_id = ?";
+        $statement = DBManager::get()->prepare($query);
+        $statement->execute([$course_id]);
+
+        $termine = 0;
+        while ($termin_id = $statement->fetchColumn()) {
+            self::deleteSingleDate($termin_id, false);
+            $termine += 1;
+        }
+
+        return $termine;
+    }
+}
diff --git a/lib/resources/ResourceManager.class.php b/lib/resources/ResourceManager.class.php
deleted file mode 100644
index a30c470..0000000
--- a/lib/resources/ResourceManager.class.php
+++ /dev/null
@@ -1,1472 +0,0 @@
-<?php
-
-/**
- * ResourceManager.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2018
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-
-require_once 'lib/dates.inc.php';
-
-
-/**
- * The ResourceManager class contains methods that simplify the use of
- * Resources.
- */
-class ResourceManager
-{
-    // Factory methods
-
-    /**
-     * Simplifies the creation of a resource category.
-     *
-     * @param string $name The name of the new resource category.
-     * @param string $description The description of the new resource category.
-     * @param string $class_name The class (derived from Resource) which
-     *     shall be used for resources created with the new category.
-     * @param bool $is_system_category True, if the category shall be a system
-     *     category, false otherwise.
-     * @param string $iconnr The number of the icon for the resource category.
-     * @param mixed[] $properties A two-dimensional array with the
-     *     names and requestable, protected and system flags.
-     *     The second dimension of the array must have the following structure:
-     *     [
-     *          property name (string),
-     *          requestable flag (boolean),
-     *          protected flag (boolean),
-     *          system-flag (boolean)
-     *     ].
-     *
-     * @throws ResourceCategoryException In case if no name is set or a resource
-     *     property doesn't exist, if the category's name is ambigous
-     *     or if the new category cannot be stored, a ResourceCategoryException
-     *     is thrown.
-     *
-     * @return ResourceCategory A new ResourceCategory object.
-     */
-    public static function createCategory(
-        $name = null,
-        $description = null,
-        $class_name = 'Resource',
-        $is_system_category = false,
-        $iconnr = '1',
-        $properties = []
-    )
-    {
-        if (!$name) {
-            //A name must be set!
-            throw new InvalidResourceCategoryException(
-                _('Es wurde kein Name für die neue Ressourcenkategorie angegeben!')
-            );
-        }
-
-        $property_data = [];
-
-        //We must check, if all the properties exist:
-        if ($properties && is_array($properties)) {
-            foreach ($properties as $property) {
-                $property_object = ResourcePropertyDefinition::findByName(
-                    $property[0]
-                );
-
-                if (!$property_object) {
-                    throw new ResourcePropertyException(
-                        sprintf(
-                            _('Die Ressourceneigenschaft %s ist nicht definiert!'),
-                            $property[0]
-                        )
-                    );
-                } elseif (count($property_object) > 1) {
-                    throw new ResourcePropertyException(
-                        sprintf(
-                            _('Es gibt mehrere Ressourceneigenschaften mit dem Namen %s!'),
-                            $property[0]
-                        )
-                    );
-                }
-
-                //$property_object is an array of ResourcePropertyDefinition objects:
-                $property_data[] = [
-                    'object' => $property_object[0],
-                    'config' => $property
-                ];
-            }
-        }
-
-        //Ok, all properties exist: We can create the category:
-
-        $new_category = new ResourceCategory();
-        $new_category->name = $name;
-        if ($description != null) {
-            $new_category->description = $description;
-        }
-        $new_category->class_name = $class_name;
-        $new_category->system = ($is_system_category ? '1' : '0');
-        $new_category->iconnr = $iconnr;
-
-        if ($new_category->store()) {
-            //Add the properties:
-            foreach ($property_data as $p) {
-                $rcp = new ResourceCategoryProperty();
-                $rcp->category_id = $new_category->id;
-                $rcp->property_id = $p['object']->id;
-                $rcp->requestable = $p['config'][1];
-                $rcp->protected = $p['config'][2];
-                $rcp->system = $p['config'][3];
-                $rcp->store();
-            }
-            //die();
-        } else {
-            throw new InvalidResourceCategoryException(
-                sprintf(
-                    _('Die Ressourcenkategorie %s konnte nicht gespeichert werden!'),
-                    $name
-                )
-            );
-        }
-
-        return $new_category;
-    }
-
-    /**
-     * Simplifies the creation of a location resource category.
-     *
-     * @param string $name The name of the new resource category.
-     * @param string $description The description of the new resource category.
-     * @param string[] $additional_properties A two-dimensional array with the
-     *     names and requestable, protected and system flags. See
-     *     ResourceManager::createCategory for a description of the format
-     *     of the second array dimension.
-     *
-     * @throws ResourceCategoryException In case if no name is set or a resource
-     *     property doesn't exist, if the category's name is ambigous
-     *     or if the new category cannot be stored, a ResourceCategoryException
-     *     is thrown.
-     *
-     * @return ResourceCategory A new ResourceCategory object.
-     */
-    public static function createLocationCategory(
-        $name = null,
-        $description = null,
-        $additional_properties = []
-    )
-    {
-        $property_names = array_merge(
-            [
-                [
-                    'geo_coordinates',
-                    true,
-                    true,
-                    true
-                ]
-            ],
-            $additional_properties
-        );
-
-        return self::createCategory(
-            $name,
-            $description,
-            'Location',
-            false,
-            '1',
-            $property_names
-        );
-    }
-
-
-    /**
-     * Simplifies the creation of a building resource category.
-     *
-     * @param string $name The name of the new resource category.
-     * @param string $description The description of the new resource category.
-     * @param string[] $additional_properties A two-dimensional array with the
-     *     names and requestable, protected and system flags. See
-     *     ResourceManager::createCategory for a description of the format
-     *     of the second array dimension.
-     *
-     * @throws ResourceCategoryException In case if no name is set or a resource
-     *     property doesn't exist, if the category's name is ambigous
-     *     or if the new category cannot be stored, a ResourceCategoryException
-     *     is thrown.
-     *
-     * @return ResourceCategory A new ResourceCategory object.
-     */
-    public static function createBuildingCategory(
-        $name = null,
-        $description = null,
-        $additional_properties = []
-    )
-    {
-        $property_names = array_merge(
-            [
-                [
-                    'address',
-                    false,
-                    true,
-                    true
-                ],
-                [
-                    'accessible',
-                    false,
-                    true,
-                    true
-                ],
-                [
-                    'number',
-                    false,
-                    true,
-                    true
-                ],
-                [
-                    'geo_coordinates',
-                    true,
-                    true,
-                    true
-                ]
-            ],
-            $additional_properties
-        );
-
-        return self::createCategory(
-            $name,
-            $description,
-            'Building',
-            false,
-            '2',
-            $property_names
-        );
-    }
-
-
-    /**
-     * Simplifies the creation of a room resource category.
-     *
-     * @param string $name The name of the new resource category.
-     * @param string $description The description of the new resource category.
-     * @param string[] $additional_properties A two-dimensional array with the
-     *     names and requestable, protected and system flags. See
-     *     ResourceManager::createCategory for a description of the format
-     *     of the second array dimension.
-     *
-     * @throws ResourceCategoryException In case if no name is set or a resource
-     *     property doesn't exist, if the category's name is ambigous
-     *     or if the new category cannot be stored, a ResourceCategoryException
-     *     is thrown.
-     *
-     * @return ResourceCategory A new ResourceCategory object.
-     */
-    public static function createRoomCategory(
-        $name = null,
-        $description = null,
-        $additional_properties = []
-    )
-    {
-        $property_names = array_merge(
-            [
-                [
-                    'room_type',
-                    true,
-                    true,
-                    true
-                ],
-                [
-                    'seats',
-                    true,
-                    true,
-                    true
-                ],
-                [
-                    'booking_plan_is_public',
-                    true,
-                    true,
-                    true
-                ]
-            ],
-            $additional_properties
-        );
-
-        return self::createCategory(
-            $name,
-            $description,
-            'Room',
-            false,
-            '3',
-            $property_names
-        );
-    }
-
-
-    // Resource methods:
-
-    /**
-     * Creates a copy of a resource and stores the copy in the database.
-     *
-     * @param Resource $resource The resource which shall be copied.
-     * @param bool $copy_hierarchy True, if the resource's children shall also
-     *     be copied (default). False otherwise.
-     * @param string $new_parent_id If this is set the original parent_id will
-     *     be overwritten with the ID in $new_parent_id.
-     *
-     * @throws ResourceException If the copy cannot be stored.
-     *
-     * @returns Resource A copy of the resource.
-     */
-    public static function copyResource(
-        Resource $resource,
-        $copy_hierarchy = true,
-        $new_parent_id = null
-    )
-    {
-        //We can clone all the data but we must explicitly
-        //create a new ID and set the new flag of the copy
-        //to prevent updating the original object.
-        $copy = clone $resource;
-        $copy->id = $copy->getNewId();
-        $copy->setNew(true);
-        if ($new_parent_id) {
-            $copy->parent_id = $new_parent_id;
-        }
-        if (!$copy->store()) {
-            throw new ResourceException();
-        }
-        if ($copy_hierarchy) {
-            //get all children of the original resource and clone them, too.
-            //If $copy_hierarchy is set all children and their descendants etc.
-            //are cloned recursively.
-            $children = $resource->children;
-            foreach ($children as $child) {
-                $copied_child = self::copyResource(
-                    $child,
-                    $copy_hierarchy,
-                    $copy->id //$copy is the new parent node.
-                );
-            }
-        }
-        return $copy;
-    }
-
-    /**
-     * Moves a resource below another resource and does checks to prevent
-     * resource hierarchies with misplaced resource objects.
-     * This is just a convenience method which calls the addChild method
-     * of the destination resource.
-     *
-     * @param Resource $target The resource which shall be moved.
-     * @param Resource $destination The resource where $target shall be a new child.
-     *
-     * @throws InvalidArgumentException If $target cannot be placed below $destination.
-     *
-     * @returns bool True, if $target was successful placed below $destination.
-     */
-    public static function moveResource(Resource $target, Resource $destination)
-    {
-        return $destination->addChild($target);
-    }
-
-
-    //Resource retrieval methods:
-
-
-    /**
-     * Helper method that creates the identical SQL query for the
-     * countUserResources and findUserResources methods.
-     */
-    protected static function getUserResourcesSqlData(
-        User $user,
-        $level = 'user',
-        $time = null,
-        $class_names = []
-    )
-    {
-        $used_time = time();
-        if ($time instanceof DateTime) {
-            $used_time = $time->getTimestamp();
-        } elseif ($time) {
-            $used_time = $time;
-        }
-
-        $sql = '';
-
-        if (count($class_names)) {
-            //Make sure that all class names specify names
-            //of classes derived from the Resource class.
-            $valid_class_names = [];
-            foreach ($class_names as $class_name) {
-                if (is_a($class_name, 'Resource', true)) {
-                    $valid_class_names[] = $class_name;
-                }
-            }
-            $class_names = $valid_class_names;
-        }
-        if (count($class_names)) {
-            $sql .= 'INNER JOIN resource_categories rc
-                ON resources.category_id = rc.id
-                WHERE ';
-        }
-
-        $user_is_resource_admin = self::userHasGlobalPermission(
-            $user,
-            'admin'
-        ) || $GLOBALS['perm']->have_perm('root', $user->id);
-
-        if (!$user_is_resource_admin) {
-            $sql .= "resources.id IN (
-                    SELECT resource_id FROM resource_permissions
-                    WHERE user_id = :user_id
-                    AND perms IN ( :perms )
-                    UNION
-                    SELECT resource_id FROM resource_temporary_permissions
-                    WHERE user_id = :user_id
-                    AND perms IN ( :perms )
-                    AND (begin <= :time)
-                    AND (end >= :time)
-                ) ";
-            $data = [
-                'user_id' => $user->id,
-                'time' => $used_time
-            ];
-        }
-
-        if (count($class_names) && !$user_is_resource_admin) {
-            $sql .= 'AND ';
-        }
-
-        if (count($class_names)) {
-            $sql .= "rc.class_name IN ( :class_names ) ";
-            $data['class_names'] = $class_names;
-        }
-        $sql .= "GROUP BY resources.id
-            ORDER BY sort_position DESC, resources.name ASC";
-
-        $perms = self::getHigherPermissionLevels($level);
-        array_push($perms, $level);
-        $data['perms'] = $perms;
-
-        return [
-            'query' => $sql,
-            'data' => $data
-        ];
-    }
-
-
-    /**
-     * Counts all resources for which the specified user has permanent or
-     * temporary permissions.
-     *
-     * @param User $user The user whose resources shall be retrieved.
-     *
-     * @param string $level The minimum permission level the user must have
-     *     on a resource so that it will be included in the result set.
-     *
-     * @param DateTime|int|null $time The timestamp for the check on
-     *     temporary permissions. If this parameter is not set
-     *     the current timestamp will be used.
-     *
-     * @param string[] $class_names A list of resource classes that will
-     *     be used to filter the result set so that only resources being
-     *     a member of one of the specified resource classes will be retrieved.
-     *
-     */
-    public static function countUserResources(
-        User $user,
-        $level = 'user',
-        $time = null,
-        $class_names = []
-    )
-    {
-        $sql = self::getUserResourcesSqlData($user, $level, $time, $class_names);
-        return Resource::countBySql($sql['query'], $sql['data']);
-    }
-
-
-    /**
-     * Retrieves all resources for which the specified user has permanent or
-     * temporary permissions.
-     *
-     * @param User $user The user whose resources shall be retrieved.
-     *
-     * @param string $level The minimum permission level the user must have
-     *     on a resource so that it will be included in the result set.
-     *
-     * @param DateTime|int|null $time The timestamp for the check on
-     *     temporary permissions. If this parameter is not set
-     *     the current timestamp will be used.
-     *
-     * @param string[] $class_names A list of resource classes that will
-     *     be used to filter the result set so that only resources being
-     *     a member of one of the specified resource classes will be retrieved.
-     *
-     * @param bool $convert_objects If the resource objects
-     *     in the result set shall be converted to objects of the derived
-     *     resource classes set this to true, otherwise false.
-     *     Defaults to true.
-     *
-     * @returns Resource[] An array of Resource objects
-     *     or objects of derived resource classes.
-     */
-    public static function getUserResources(
-        User $user,
-        $level = 'user',
-        $time = null,
-        $class_names = [],
-        $convert_objects = true
-    )
-    {
-        $sql = self::getUserResourcesSqlData($user, $level, $time, $class_names);
-        $resources = Resource::findBySql($sql['query'], $sql['data']);
-        if ($convert_objects) {
-            $result = [];
-            foreach ($resources as $resource) {
-                $result[] = $resource->getDerivedClassInstance();
-            }
-            return $result;
-        } else {
-            return $resources;
-        }
-    }
-
-    /**
-     * Check if the coordinate are in appropriate CRSWGS_84 format.
-     *
-     * - latitude: up to 2 digits, decimal point, 1 to 10 digits for fraction
-     * - longitude: up to 3 digits, decimal point, 1 to 10 digits for fraction
-     * - altitude: up to 5 digits, decimal point, 1 to 10 digits for fraction
-     *
-     * @param string $coordinate_string
-     * @return bool
-     */
-    public static function validateCoordinates(string $coordinate_string): bool
-    {
-        return preg_match(
-            ResourcePropertyDefinition::CRSWGS84_REGEX,
-            $coordinate_string
-        );
-    }
-
-
-    // Static methods for position properties:
-
-    public static function getPositionArray(ResourceProperty $property)
-    {
-        if (!$property->definition) {
-            //An orphaned Resource property: we cannot generate an array for it!
-            throw new ResourcePropertyDefinitionException(
-                _('Die Positionsangabe kann nicht umgewandelt werden, da die angegebene Ressourceneigenschaft verwaist (ohne zugehörige Definition) ist!')
-            );
-        }
-
-        if ($property->definition->type != 'position') {
-            //We cannot generate an array for attributes other than the position type!
-            throw new ResourcePropertyException(
-                _("Die Positionsangabe kann nicht umgewandelt werden, da die angegebene Ressourceneigenschaft nicht vom Typ 'position' ist!")
-            );
-        }
-
-        //Parse the ISO-6709 coordinates from $property->value:
-        $coordinate_string = $property->state;
-
-
-        // Show error message when coordinates are invalid
-        if (!self::validateCoordinates($coordinate_string)) {
-            PageLayout::postError(_('Die Positionsangabe kann nicht umgewandelt werden, da sie ungültige Daten enthält!'));
-        }
-
-        //With the first split we separate the numbers in the coordinate string.
-        //The second split lets us retrieve the sign for each number.
-
-        $coordinate_parts = preg_split(
-            '/([+-]|(CRSWGS_84\/))+/',
-            $coordinate_string,
-            -1,
-            PREG_SPLIT_NO_EMPTY
-        );
-
-        //We can simply split the coordinate string by each dot,
-        //since there has to be a dot in every three coordinates!
-        //This is because the coordinates are always stored
-        //with decimal separators.
-
-        $coordinate_signs = preg_split(
-            '/\.\d{1,10}/',
-            $coordinate_string,
-            -1,
-            PREG_SPLIT_NO_EMPTY
-        );
-
-        //The array position of $coordinate_parts and $coordinate_signs
-        //are the same! We can directly use the indexes.
-        //If a sign index is less than zero we must invert the value
-        //of the corresponding coordinate part.
-
-        for ($i = 0; $i < 3; $i++) {
-            if ($coordinate_signs[$i] < 0) {
-                $coordinate_parts[$i] *= -1;
-            }
-        }
-
-        return $coordinate_parts;
-    }
-
-
-    /**
-     * This method allows locking the resource management globally.
-     * The user who creates the lock must have admin permissions
-     * and the time interval must not lie in another global resource lock
-     * interval.
-     *
-     * @param User $user The user who wishes to lock the room and resource
-     *      management globally.
-     * @param DateTime $begin The begin timestamp of the lock.
-     * @param DateTime $end The end timestamp of the lock.
-     *
-     * @throws InvalidArgumentException If $begin lies after $end or if
-     *     $begin is equal to $end.
-     * @throws ResourcePermissionException If the specified user does not
-     *     have sufficient permissions to lock the resource management globally.
-     * @throws GlobalResourceLockException If the resource lock could not be stored.
-     *
-     * @returns GlobalResourceLock object.
-     */
-    public function createGlobalLock(
-        User $user,
-        DateTime $begin,
-        DateTime $end,
-        $ignore_bookings = false
-    )
-    {
-        if ($begin > $end) {
-            throw new InvalidArgumentException(
-                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-            );
-        }
-        if ($begin == $end) {
-            throw new InvalidArgumentException(
-                _('Startzeitpunkt und Endzeitpunkt dürfen nicht identisch sein!')
-            );
-        }
-
-        if (!self::userHasGlobalPermission($user, 'admin')) {
-            throw new ResourcePermissionException(
-                _('Unzureichende Berechtigungen zum globalen Sperren der Raumverwaltung!')
-            );
-        }
-
-        if (GlobalResourceLock::existsInTimeRange($begin, $end)) {
-            throw new GlobalResourceLockOverlapException(
-                sprintf(
-                    _('Im Zeitbereich vom %1$s bis %2$s gibt es bereits eine globale Sperrung der Raumverwaltung!'),
-                    $begin->format('d.m.Y H:i'),
-                    $end->format('d.m.Y H:i')
-                )
-            );
-        }
-
-        $lock = new GlobalResourceLock();
-        $lock->begin = $begin->getTimestamp();
-        $lock->end = $end->getTimestamp();
-        $lock->user_id = $user->id;
-        $lock->type = '0';
-        if (!$lock->store()) {
-            throw new GlobalResourceLockException(
-                sprintf(
-                    _('Fehler beim Speichern der globalen Sperre der Raumverwaltung im Zeitbereich vom %1$s bis %2$s!'),
-                    $begin->format('d.m.Y H:i'),
-                    $end->format('d.m.Y H:i')
-                )
-            );
-        }
-        return $lock;
-    }
-
-
-    //Special methods for attributes of type position:
-
-    public static function getPositionString(
-        ResourceProperty $property,
-        $with_altitude = false
-    )
-    {
-        $coordinate_parts = [];
-        $string = '';
-        try {
-            $coordinate_parts = self::getPositionArray($property);
-        } catch (ResourcePropertyDefinitionException $e) {
-            //An orphaned Resource property: we cannot generate a string for it!
-            throw new ResourcePropertyDefinitionException(
-                _('Die Positionsangabe kann nicht formatiert werden, da die angegebene Ressourceneigenschaft verwaist (ohne zugehörige Definition) ist!')
-            );
-        } catch (ResourcePropertyException $e) {
-            //We cannot generate a string for attributes other than the position type!
-            throw new ResourcePropertyException(
-                _('Die Positionsangabe kann nicht formatiert werden, da die angegebene Ressourceneigenschaft nicht vom Typ "position" ist!')
-            );
-        } catch (ResourcePropertyStateException $e) {
-            //We cannot generate a string from invalid data!
-            return '';
-        }
-
-        $locale = localeconv();
-
-        if ($coordinate_parts[0] < 0) {
-            $string .= sprintf(
-                _('%s°S'),
-                number_format(
-                    abs($coordinate_parts[0]),
-                    7,
-                    $locale['decimal_point'],
-                    $locale['thousands_sep']
-                )
-            ) . ' ';
-        } else {
-            $string .= sprintf(
-                _('%s°N'),
-                number_format(
-                    abs($coordinate_parts[0]),
-                    7,
-                    $locale['decimal_point'],
-                    $locale['thousands_sep']
-                )
-            ) . ' ';
-        }
-
-        if ($coordinate_parts[1] < 0) {
-            $string .= sprintf(
-                _('%s°O'),
-                number_format(
-                    abs($coordinate_parts[1]),
-                    7,
-                    $locale['decimal_point'],
-                    $locale['thousands_sep']
-                )
-            ) . ' ';
-        } else {
-            $string .= sprintf(
-                _('%s°W'),
-                number_format(
-                    abs($coordinate_parts[1]),
-                    7,
-                    $locale['decimal_point'],
-                    $locale['thousands_sep']
-                )
-            );
-        }
-
-        if ($with_altitude) {
-            $string .=  ' ';
-            if ($coordinate_parts[2] < 0) {
-                $string .= sprintf(
-                    _('%s m unter NHN'),
-                    number_format(
-                        abs($coordinate_parts[2]),
-                        1,
-                        $locale['decimal_point'],
-                        $locale['thousands_sep']
-                    )
-                );
-            } else {
-                $string .= sprintf(
-                    _('%s m über NHN'),
-                    number_format(
-                        abs($coordinate_parts[2]),
-                        1,
-                        $locale['decimal_point'],
-                        $locale['thousands_sep']
-                    )
-                );
-            }
-        }
-
-        return $string;
-    }
-
-
-    public static function getMapUrlForResourcePosition(
-        ResourceProperty $property
-    )
-    {
-        $coordinate_parts = [];
-        try {
-            $coordinate_parts = self::getPositionArray($property);
-        } catch (ResourcePropertyDefinitionException $e) {
-            //An orphaned Resource property: we cannot generate an URL for it!
-            throw new InvalidArgumentException(
-                _('Eine URL zur Straßenkarte kann nicht erzeugt werden, da die angegebene Ressourceneigenschaft verwaist (ohne zugehörige Definition) ist!')
-            );
-        } catch (ResourcePropertyException $e) {
-            //We cannot generate an URL for attributes other than the position type!
-            throw new InvalidArgumentException(
-                _("Eine URL zur Straßenkarte kann nicht erzeugt werden, da die angegebene Ressourceneigenschaft nicht vom Typ 'position' ist!")
-            );
-        } catch (ResourcePropertyStateException $e) {
-            //We cannot generate an URL from invalid data!
-            return '';
-        }
-
-        $map_service_url = Config::get()->RESOURCES_MAP_SERVICE_URL;
-        if ($map_service_url) {
-            //Replace the strings LATITUDE and LONGITUDE in the URL
-            //with the coordinates.
-            return str_replace(
-                [
-                    'LATITUDE',
-                    'LONGITUDE'
-                ],
-                [
-                    $coordinate_parts[0],
-                    $coordinate_parts[1]
-                ],
-                $map_service_url
-            );
-        } else {
-            //Default to OpenStreepMap:
-            return sprintf(
-                'https://www.openstreetmap.org/#map=17/%1$s/%2$s',
-                $coordinate_parts[0],
-                $coordinate_parts[1]
-            );
-        }
-    }
-
-
-    // User permission methods:
-
-    /**
-     * Returns the resource management global permissions for a user,
-     * determined by the assigned roles and by the user's global permissions.
-     * This method does the mapping from the old resource management permissions
-     * to the new resource management permissions.
-     */
-    public static function getGlobalResourcePermission(User $user = null)
-    {
-        if (!$user) {
-            return '';
-        }
-
-        global $perm;
-        //First we check if the user is a root user:
-
-        if ($perm->get_perm($user->id) === 'root') {
-            return 'admin';
-        }
-
-        //The user is not a root user:
-        //We must check if he has special permissions
-        //for the virtual resource with id "global":
-
-        $permission = ResourcePermission::findOneBySql(
-            "user_id = :user_id AND resource_id = 'global'",
-            [
-                'user_id' => $user->id
-            ]
-        );
-
-        if (!$permission) {
-            //No global permissions in the resource management:
-            return '';
-        }
-
-        return $permission->perms;
-    }
-
-
-    /**
-     * Determines if the specified user has the specified permission level set
-     * for at least one resource.
-     *
-     * @param User $user The users whose resource permissions shall be retrieved.
-     * @param string $level The permission level the user should have
-     *     on at least one resource.
-     * @param string|int|DateTime|null $time The timestamp
-     *     for the temporary permission level check.
-     *     If this is not set the current timestamp will be used.
-     */
-    public static function userHasResourcePermissions(
-        User $user = null,
-        $level = 'admin',
-        $time = null
-    )
-    {
-        if (!$user) {
-            return false;
-        }
-
-        //Get all permissions and temporary permissions of the user:
-
-        $permissions = ResourcePermission::findBySQL(
-            "user_id = :user_id AND resource_id <> 'global'",
-            [
-                'user_id' => $user->id
-            ]
-        );
-
-        if ($permissions) {
-            foreach ($permissions as $permission) {
-                if (self::comparePermissionLevels($permission->perms, $level) >= 0) {
-                    //We have found a permission which is higher or equal
-                    //to the requested permission level and can therefore
-                    //return true:
-                    return true;
-                }
-            }
-        }
-
-        //No (sufficient) permanent permissions exist for the user
-        //for at least one resource. We must check the temporary permissions:
-
-        $used_time = time();
-        if ($time instanceof DateTime) {
-            $used_time = $time->getTimestamp();
-        } elseif ($time) {
-            $used_time = $time;
-        }
-
-        $temp_permissions = ResourceTemporaryPermission::findBySql(
-            "user_id = :user_id AND begin <= :time AND end >= :time
-            AND resource_id != 'global'",
-            [
-                'user_id' => $user->id,
-                'time' => $used_time
-            ]
-        );
-
-        if ($temp_permissions) {
-            foreach ($temp_permissions as $permission) {
-                if (self::comparePermissionLevels($permission->perms, $level) >= 0) {
-                    //We have found a temporary permission which is higher or
-                    //equal to the requested permission level and can therefore
-                    //return true:
-                    return true;
-                }
-            }
-        }
-
-        //We haven't found any permanent or temporary permission for the user
-        //that match the requested permission level on the specified timestamp.
-        return false;
-    }
-
-
-    //Helper methods:
-
-
-    /**
-     * Returns all permission levels lower than the specified level.
-     */
-    public static function getLowerPermissionLevels($level = 'user')
-    {
-        $defined_levels = ['user', 'autor', 'tutor', 'admin'];
-        if (!in_array($level, $defined_levels)) {
-            return [];
-        }
-
-        if ($level == 'admin') {
-            return array_slice($defined_levels, 0, 3);
-        } elseif ($level == 'tutor') {
-            return array_slice($defined_levels, 0, 2);
-        } elseif ($level == 'autor') {
-            return array_slice($defined_levels, 0, 1);
-        } else {
-            //There is no lower authority than user:
-            return [];
-        }
-    }
-
-
-    /**
-     * Returns all permission levels higher than the specified level.
-     */
-    public static function getHigherPermissionLevels($level = 'user')
-    {
-        $defined_levels = ['user', 'autor', 'tutor', 'admin'];
-        if (!in_array($level, $defined_levels)) {
-            return [];
-        }
-
-        if ($level == 'admin') {
-            //There is no higher authority than admin:
-            return [];
-        } elseif ($level == 'tutor') {
-            return array_slice($defined_levels, -1, 1);
-        } elseif ($level == 'autor') {
-            return array_slice($defined_levels, -2, 2);
-        } elseif ($level == 'user') {
-            return array_slice($defined_levels, -3, 3);
-        } else {
-            //We haven't found what you're looking for:
-            return [];
-        }
-    }
-
-
-    /**
-     * Compares two resource permission levels and returns an integer telling if
-     * the first level is less than (-1), equal (0) or greater than (1) the second level.
-     *
-     * @param string $level The first permission level.
-     * @param string $other_level The second permission level.
-     *
-     * @throws InvalidArgumentException if $level or $other_level are either not set
-     *     or if they contain invalid permission level strings.
-     * @returns integer -1 if $level is less than $other_level,
-     *     0 if both are equal,
-     *     1 if $level is greater than $other_level.
-     */
-    public static function comparePermissionLevels(
-        $level = 'user',
-        $other_level = 'user'
-    )
-    {
-        if (!$level or !$other_level) {
-            throw new InvalidArgumentException(
-                _('Mindestens eine Rechtestufe fehlt zum Vergleich!')
-            );
-        }
-
-        //The level list starts with the lowest permission level
-        //and ends with the highest permission level.
-        //The levels are compared by comparing the index values
-        //of the list.
-        $defined_levels = ['user', 'autor', 'tutor', 'admin'];
-
-        if (!in_array($level, $defined_levels)) {
-            throw new InvalidArgumentException(
-                _('Die angegebene Rechtestufe ist ungültig!')
-            );
-        }
-        if (!in_array($other_level, $defined_levels)) {
-            throw new InvalidArgumentException(
-                _('Die angegebene Rechtestufe ist ungültig!')
-            );
-        }
-
-        $level_index = array_search($level, $defined_levels);
-        $other_level_index = array_search($other_level, $defined_levels);
-
-        $diff = $level_index - $other_level_index;
-
-        if ($diff > 0) {
-            //$level is a higher permission level than $other_level.
-            return 1;
-        } elseif ($diff < 0) {
-            //$level is a lower permission level than $other_level.
-            return -1;
-        } else {
-            //$level and $other_level are the same permission level.
-            return 0;
-        }
-    }
-
-
-    /**
-     * Checks if the specified user has the specified permission level
-     * for the resource management system.
-     *
-     * @param User|null $user The user whose global resource permissions shall be checked.
-     * @param string $requested_permission The required permission level for the user.
-     *
-     * @returns bool True, if the user has the required permission level,
-     *     false otherwise.
-     */
-    public static function userHasGlobalPermission(
-        User $user = null,
-        $requested_permission = 'user'
-    )
-    {
-        //ResourceManager::getGlobalResourcePermission also checks
-        //for global resource locks and returns 'admin' if the
-        //user is 'admin' user or 'user' in all other cases
-        //where the user has permissions on the resource management system.
-        $existing_permission = self::getGlobalResourcePermission($user);
-
-        if (!$existing_permission) {
-            //No permissions in the resource management:
-            return false;
-        }
-
-        return self::comparePermissionLevels(
-            $existing_permission,
-            $requested_permission
-        ) > -1;
-    }
-
-
-    /**
-     * Counts the resources where the specified user has explicit
-     * permissions set, optionally limiting the result to permanent
-     * permissions.
-     *
-     * @param User $user The user whose resource permissions
-     *     shall be checked.
-     * @param string $requested_permission The required minimum permission
-     *     level for the user.
-     *
-     * @return int The amount of resources where the specified user has
-     *     explicit permissions for.
-     */
-    public static function countResourcesWithPermissions(
-        User $user,
-        $requested_permission = 'user',
-        $exclude_temporary_permissions = false
-    )
-    {
-        $perms = self::getHigherPermissionLevels($requested_permission);
-        array_push($perms, $requested_permission);
-        $total = Resource::countBySql(
-            "INNER JOIN resource_permissions rp
-            USING (resource_id)
-            WHERE
-            rp.perms IN ( :perms )
-            AND
-            rp.user_id = :user_id",
-            [
-                'perms' => $perms,
-                'user_id' => $user->id
-            ]
-        );
-
-        if (!$exclude_temporary_permissions) {
-            $now = time();
-            $total += Resource::countBySql(
-                "INNER JOIN resource_temporary_permissions rtp
-                USING (resource_id)
-                WHERE
-                rtp.perms IN ( :perms )
-                AND
-                rtp.user_id = :user_id
-                AND
-                rtp.begin <= :now
-                AND
-                rtp.end >= :now",
-                [
-                    'perms' => $perms,
-                    'user_id' => $user->id,
-                    'now' => $now
-                ]
-            );
-        }
-
-        return $total;
-    }
-
-
-    /**
-     * Checks if the specified user has the specified permission level
-     * on at least one specific resource.
-     *
-     * @param User $user The user whose resource permissions
-     *     shall be checked.
-     * @param string $requested_permission The required permission level
-     *     for the user.
-     *
-     * @returns bool True, if the user has the required permission level
-     *     for at least one resource, false otherwise.
-     */
-    public static function userHasSpecialPermissions(
-        User $user,
-        $requested_permission = 'user'
-    )
-    {
-        return self::countResourcesWithPermissions(
-            $user,
-            $requested_permission
-        ) > 0;
-    }
-
-
-    /**
-     * Get time ranges by looking at the object specified by its ID.
-     * This method works with CourseDate, SeminarCycleDate
-     * and Course objects.
-     *
-     * @param string $range_id The ID of a Stud.IP object.
-     *
-     * @returns Array An Array consisting of arrays of DateTime objects.
-     *     The structure of the array is as follows:
-     *     [
-     *         [
-     *             begin timestamp DateTime object
-     *             end timestamp DateTime object
-     *         ],
-     *         ...
-     *     ]
-     */
-    public static function getTimeRangesFromRangeId($range_id = null)
-    {
-        if (!$range_id) {
-            return [];
-        }
-
-        //We try a course date first, then a cycle date and finally
-        //a course as this is the standard order to check for dates.
-
-        $time_ranges = [];
-
-        $course_date = CourseDate::find($range_id);
-
-        if ($course_date) {
-            $begin = new DateTime();
-            $begin->setTimestamp($course_date->date);
-            $end = new DateTime();
-            $end->setTimestamp($course_date->end_time);
-            $time_ranges[] = [
-                $begin,
-                $end
-            ];
-        } else {
-            //No course date, but maybe a cycle date?
-            $cycle_date = SeminarCycleDate::find($range_id);
-
-            if ($cycle_date) {
-                if ($cycle_date->dates) {
-                    foreach ($cycle_date->dates as $date) {
-                        $begin = new DateTime();
-                        $begin->setTimestamp($date->date);
-                        $end = new DateTime();
-                        $end->setTimestamp($date->end_time);
-                        $time_ranges[] = [
-                            $begin,
-                            $end
-                        ];
-                    }
-                }
-            } else {
-                //No cycle date. It must be a course then!
-                $course = Course::find($range_id);
-
-                if ($course) {
-                    if ($course->dates) {
-                        foreach ($course->dates as $date) {
-                            $begin = new DateTime();
-                            $begin->setTimestamp($date->date);
-                            $end = new DateTime();
-                            $end->setTimestamp($date->end_time);
-                            $time_ranges[] = [
-                                $begin,
-                                $end
-                            ];
-                        }
-                    }
-                    if ($course->cycles) {
-                        foreach ($course->cycles as $cycle) {
-                            if ($cycle->dates) {
-                                foreach ($cycle->dates as $date) {
-                                    $begin = new DateTime();
-                                    $begin->setTimestamp($date->date);
-                                    $end = new DateTime();
-                                    $end->setTimestamp($date->end_time);
-                                    $time_ranges[] = [
-                                        $begin,
-                                        $end
-                                    ];
-                                }
-                            }
-                        }
-                    }
-                }
-                //No else here: Enough is enough.
-            }
-        }
-
-        return $time_ranges;
-    }
-
-
-    /**
-     * Determines the last booking of the user and calculates the timespan
-     * from the last booking until now.
-     *
-     * @returns DateInterval|null|false Either a date interval from the last
-     *     activity to the provided DateTime object or null in case the user
-     *     has never been active. False is returned in case the timestamp
-     *     comparison fails. @see DateTime::diff in the PHP Documentation.
-     */
-    public static function getUserInactivityInterval(User $user, DateTime $time)
-    {
-        $db = DBManager::get();
-
-        $stmt = $db->prepare(
-            "SELECT MAX(mkdate) FROM resource_bookings
-            WHERE range_id = :user_id"
-        );
-
-        $stmt->execute(['user_id' => $user->id]);
-
-        $last_activity_timestamp = $stmt->fetchColumn();
-
-        if (($last_activity_timestamp === false) or ($last_activity_timestamp === null)) {
-            //No activity found
-            return null;
-        }
-
-        $last_activity = new DateTime();
-        $last_activity->setTimestamp($last_activity_timestamp);
-
-        //Calculate the difference between the last activity and $time,
-        //if $time is greater or equal than $last_activity.
-        //If $time is less than $last_activity return null since the user
-        //has not been active at the timestamp $time.
-
-        if ($time < $last_activity) {
-            //The user has not been active at $time.
-            return null;
-        }
-
-        return $time->diff($last_activity);
-    }
-
-
-    /**
-     * Retrieves booking plan objects like resource bookings and requests.
-     *
-     * @param string|null $included_request_types If this parameter is a string,
-     *     it can have the values 'all' for retrieving all requests or the
-     *     ID of a user so that only requests of that user are retrieved.
-     *
-     */
-    public static function getBookingPlanObjects(
-        Resource $resource,
-        $time_ranges = [],
-        $allowed_booking_types = [],
-        $included_requests = null
-    )
-    {
-        if (!count($time_ranges)) {
-            return [];
-        }
-
-        $objects = [];
-
-        $bookings = \ResourceBooking::findByResourceAndTimeRanges(
-            $resource,
-            $time_ranges,
-            $allowed_booking_types
-        );
-        $objects = array_merge($objects, $bookings);
-
-        if ($included_requests == 'all') {
-            $requests = \ResourceRequest::findByResourceAndTimeRanges(
-                $resource,
-                $time_ranges,
-                0
-            );
-            $objects = array_merge($objects, $requests);
-        } elseif ($included_requests) {
-            $requests = \ResourceRequest::findByResourceAndTimeRanges(
-                $resource,
-                $time_ranges,
-                0,
-                [],
-                'user_id = :user_id',
-                ['user_id' => $included_requests]
-            );
-            $objects = array_merge($objects, $requests);
-        }
-
-        return $objects;
-    }
-
-
-    public static function getAllResourceClassNames($excluded_classes = [])
-    {
-        $class_names = [];
-        //We have to make the autoloader load all resource model classes,
-        //otherwise the get_declared_classes() statement below won't find
-        //any class derived from Resource!
-        foreach (
-            scandir($GLOBALS['STUDIP_BASE_PATH'] . '/lib/models/resources')
-            as $resource_model_file) {
-            $path = pathinfo($resource_model_file);
-
-            if ($path['extension'] == 'php') {
-                $class_name = explode('.class', $path['filename'])[0];
-                class_exists($class_name);
-            }
-        }
-
-        foreach (get_declared_classes() as $class_name) {
-            if (is_a($class_name, 'Resource', true)) {
-                foreach ($excluded_classes as $excl_class) {
-                    //For the resource base class, we must not check
-                    //derived classes.
-                    if ($excl_class == 'Resource') {
-                        if ($class_name == 'Resource') {
-                            continue 2;
-                        }
-                    } else {
-                        if (is_a($class_name, $excl_class, true)) {
-                            //The class belongs to one of the
-                            //excluded resource classes.
-                            continue 2;
-                        }
-                    }
-                }
-                $class_names[] = $class_name;
-            }
-        }
-        sort($class_names);
-
-        return $class_names;
-    }
-
-
-    /**
-     * Returns the names of all hierarchy elements from the root to the
-     * specified resource.
-     *
-     * @param Resource $room The resource to start with.
-     *
-     * @returns string[] An array with the names of the hierarchy elements,
-     *     starting with the top resource's name.
-     */
-    public static function getHierarchyNames(Resource $resource)
-    {
-        $names = [$resource->name];
-        $current_node = $resource->parent;
-        while ($current_node instanceof Resource) {
-            $names[] = $current_node->name;
-            $current_node = $current_node->parent;
-        }
-        return array_reverse($names);
-    }
-
-
-    /**
-     * Returns the hierarchy elements from the root to the
-     * specified resource.
-     *
-     * @param Resource $room The resource to start with.
-     *
-     * @returns Resource[] An array with the hierarchy elements,
-     *     starting with the top resource.
-     */
-    public static function getHierarchy(Resource $resource)
-    {
-        $hierarchy_ids = [$resource->id];
-        $items = [$resource];
-        $current_node = $resource->parent;
-        while ($current_node instanceof Resource) {
-            if (in_array($current_node->id, $hierarchy_ids)) {
-                //Circular hierarchy. That's a big error!
-                throw new InvalidResourceException(
-                    sprintf(
-                        _('Zirkuläre Hierarchie: Die Ressource %1$s ist ein Elternknoten von sich selbst!'),
-                        $current_node->name
-                    )
-                );
-            }
-            $items[] = $current_node;
-            $hierarchy_ids[] = $current_node->id;
-            $current_node = $current_node->parent;
-        }
-        return array_reverse($items);
-    }
-}
diff --git a/lib/resources/ResourceManager.php b/lib/resources/ResourceManager.php
new file mode 100644
index 0000000..a30c470
--- /dev/null
+++ b/lib/resources/ResourceManager.php
@@ -0,0 +1,1472 @@
+<?php
+
+/**
+ * ResourceManager.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017-2018
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+
+require_once 'lib/dates.inc.php';
+
+
+/**
+ * The ResourceManager class contains methods that simplify the use of
+ * Resources.
+ */
+class ResourceManager
+{
+    // Factory methods
+
+    /**
+     * Simplifies the creation of a resource category.
+     *
+     * @param string $name The name of the new resource category.
+     * @param string $description The description of the new resource category.
+     * @param string $class_name The class (derived from Resource) which
+     *     shall be used for resources created with the new category.
+     * @param bool $is_system_category True, if the category shall be a system
+     *     category, false otherwise.
+     * @param string $iconnr The number of the icon for the resource category.
+     * @param mixed[] $properties A two-dimensional array with the
+     *     names and requestable, protected and system flags.
+     *     The second dimension of the array must have the following structure:
+     *     [
+     *          property name (string),
+     *          requestable flag (boolean),
+     *          protected flag (boolean),
+     *          system-flag (boolean)
+     *     ].
+     *
+     * @throws ResourceCategoryException In case if no name is set or a resource
+     *     property doesn't exist, if the category's name is ambigous
+     *     or if the new category cannot be stored, a ResourceCategoryException
+     *     is thrown.
+     *
+     * @return ResourceCategory A new ResourceCategory object.
+     */
+    public static function createCategory(
+        $name = null,
+        $description = null,
+        $class_name = 'Resource',
+        $is_system_category = false,
+        $iconnr = '1',
+        $properties = []
+    )
+    {
+        if (!$name) {
+            //A name must be set!
+            throw new InvalidResourceCategoryException(
+                _('Es wurde kein Name für die neue Ressourcenkategorie angegeben!')
+            );
+        }
+
+        $property_data = [];
+
+        //We must check, if all the properties exist:
+        if ($properties && is_array($properties)) {
+            foreach ($properties as $property) {
+                $property_object = ResourcePropertyDefinition::findByName(
+                    $property[0]
+                );
+
+                if (!$property_object) {
+                    throw new ResourcePropertyException(
+                        sprintf(
+                            _('Die Ressourceneigenschaft %s ist nicht definiert!'),
+                            $property[0]
+                        )
+                    );
+                } elseif (count($property_object) > 1) {
+                    throw new ResourcePropertyException(
+                        sprintf(
+                            _('Es gibt mehrere Ressourceneigenschaften mit dem Namen %s!'),
+                            $property[0]
+                        )
+                    );
+                }
+
+                //$property_object is an array of ResourcePropertyDefinition objects:
+                $property_data[] = [
+                    'object' => $property_object[0],
+                    'config' => $property
+                ];
+            }
+        }
+
+        //Ok, all properties exist: We can create the category:
+
+        $new_category = new ResourceCategory();
+        $new_category->name = $name;
+        if ($description != null) {
+            $new_category->description = $description;
+        }
+        $new_category->class_name = $class_name;
+        $new_category->system = ($is_system_category ? '1' : '0');
+        $new_category->iconnr = $iconnr;
+
+        if ($new_category->store()) {
+            //Add the properties:
+            foreach ($property_data as $p) {
+                $rcp = new ResourceCategoryProperty();
+                $rcp->category_id = $new_category->id;
+                $rcp->property_id = $p['object']->id;
+                $rcp->requestable = $p['config'][1];
+                $rcp->protected = $p['config'][2];
+                $rcp->system = $p['config'][3];
+                $rcp->store();
+            }
+            //die();
+        } else {
+            throw new InvalidResourceCategoryException(
+                sprintf(
+                    _('Die Ressourcenkategorie %s konnte nicht gespeichert werden!'),
+                    $name
+                )
+            );
+        }
+
+        return $new_category;
+    }
+
+    /**
+     * Simplifies the creation of a location resource category.
+     *
+     * @param string $name The name of the new resource category.
+     * @param string $description The description of the new resource category.
+     * @param string[] $additional_properties A two-dimensional array with the
+     *     names and requestable, protected and system flags. See
+     *     ResourceManager::createCategory for a description of the format
+     *     of the second array dimension.
+     *
+     * @throws ResourceCategoryException In case if no name is set or a resource
+     *     property doesn't exist, if the category's name is ambigous
+     *     or if the new category cannot be stored, a ResourceCategoryException
+     *     is thrown.
+     *
+     * @return ResourceCategory A new ResourceCategory object.
+     */
+    public static function createLocationCategory(
+        $name = null,
+        $description = null,
+        $additional_properties = []
+    )
+    {
+        $property_names = array_merge(
+            [
+                [
+                    'geo_coordinates',
+                    true,
+                    true,
+                    true
+                ]
+            ],
+            $additional_properties
+        );
+
+        return self::createCategory(
+            $name,
+            $description,
+            'Location',
+            false,
+            '1',
+            $property_names
+        );
+    }
+
+
+    /**
+     * Simplifies the creation of a building resource category.
+     *
+     * @param string $name The name of the new resource category.
+     * @param string $description The description of the new resource category.
+     * @param string[] $additional_properties A two-dimensional array with the
+     *     names and requestable, protected and system flags. See
+     *     ResourceManager::createCategory for a description of the format
+     *     of the second array dimension.
+     *
+     * @throws ResourceCategoryException In case if no name is set or a resource
+     *     property doesn't exist, if the category's name is ambigous
+     *     or if the new category cannot be stored, a ResourceCategoryException
+     *     is thrown.
+     *
+     * @return ResourceCategory A new ResourceCategory object.
+     */
+    public static function createBuildingCategory(
+        $name = null,
+        $description = null,
+        $additional_properties = []
+    )
+    {
+        $property_names = array_merge(
+            [
+                [
+                    'address',
+                    false,
+                    true,
+                    true
+                ],
+                [
+                    'accessible',
+                    false,
+                    true,
+                    true
+                ],
+                [
+                    'number',
+                    false,
+                    true,
+                    true
+                ],
+                [
+                    'geo_coordinates',
+                    true,
+                    true,
+                    true
+                ]
+            ],
+            $additional_properties
+        );
+
+        return self::createCategory(
+            $name,
+            $description,
+            'Building',
+            false,
+            '2',
+            $property_names
+        );
+    }
+
+
+    /**
+     * Simplifies the creation of a room resource category.
+     *
+     * @param string $name The name of the new resource category.
+     * @param string $description The description of the new resource category.
+     * @param string[] $additional_properties A two-dimensional array with the
+     *     names and requestable, protected and system flags. See
+     *     ResourceManager::createCategory for a description of the format
+     *     of the second array dimension.
+     *
+     * @throws ResourceCategoryException In case if no name is set or a resource
+     *     property doesn't exist, if the category's name is ambigous
+     *     or if the new category cannot be stored, a ResourceCategoryException
+     *     is thrown.
+     *
+     * @return ResourceCategory A new ResourceCategory object.
+     */
+    public static function createRoomCategory(
+        $name = null,
+        $description = null,
+        $additional_properties = []
+    )
+    {
+        $property_names = array_merge(
+            [
+                [
+                    'room_type',
+                    true,
+                    true,
+                    true
+                ],
+                [
+                    'seats',
+                    true,
+                    true,
+                    true
+                ],
+                [
+                    'booking_plan_is_public',
+                    true,
+                    true,
+                    true
+                ]
+            ],
+            $additional_properties
+        );
+
+        return self::createCategory(
+            $name,
+            $description,
+            'Room',
+            false,
+            '3',
+            $property_names
+        );
+    }
+
+
+    // Resource methods:
+
+    /**
+     * Creates a copy of a resource and stores the copy in the database.
+     *
+     * @param Resource $resource The resource which shall be copied.
+     * @param bool $copy_hierarchy True, if the resource's children shall also
+     *     be copied (default). False otherwise.
+     * @param string $new_parent_id If this is set the original parent_id will
+     *     be overwritten with the ID in $new_parent_id.
+     *
+     * @throws ResourceException If the copy cannot be stored.
+     *
+     * @returns Resource A copy of the resource.
+     */
+    public static function copyResource(
+        Resource $resource,
+        $copy_hierarchy = true,
+        $new_parent_id = null
+    )
+    {
+        //We can clone all the data but we must explicitly
+        //create a new ID and set the new flag of the copy
+        //to prevent updating the original object.
+        $copy = clone $resource;
+        $copy->id = $copy->getNewId();
+        $copy->setNew(true);
+        if ($new_parent_id) {
+            $copy->parent_id = $new_parent_id;
+        }
+        if (!$copy->store()) {
+            throw new ResourceException();
+        }
+        if ($copy_hierarchy) {
+            //get all children of the original resource and clone them, too.
+            //If $copy_hierarchy is set all children and their descendants etc.
+            //are cloned recursively.
+            $children = $resource->children;
+            foreach ($children as $child) {
+                $copied_child = self::copyResource(
+                    $child,
+                    $copy_hierarchy,
+                    $copy->id //$copy is the new parent node.
+                );
+            }
+        }
+        return $copy;
+    }
+
+    /**
+     * Moves a resource below another resource and does checks to prevent
+     * resource hierarchies with misplaced resource objects.
+     * This is just a convenience method which calls the addChild method
+     * of the destination resource.
+     *
+     * @param Resource $target The resource which shall be moved.
+     * @param Resource $destination The resource where $target shall be a new child.
+     *
+     * @throws InvalidArgumentException If $target cannot be placed below $destination.
+     *
+     * @returns bool True, if $target was successful placed below $destination.
+     */
+    public static function moveResource(Resource $target, Resource $destination)
+    {
+        return $destination->addChild($target);
+    }
+
+
+    //Resource retrieval methods:
+
+
+    /**
+     * Helper method that creates the identical SQL query for the
+     * countUserResources and findUserResources methods.
+     */
+    protected static function getUserResourcesSqlData(
+        User $user,
+        $level = 'user',
+        $time = null,
+        $class_names = []
+    )
+    {
+        $used_time = time();
+        if ($time instanceof DateTime) {
+            $used_time = $time->getTimestamp();
+        } elseif ($time) {
+            $used_time = $time;
+        }
+
+        $sql = '';
+
+        if (count($class_names)) {
+            //Make sure that all class names specify names
+            //of classes derived from the Resource class.
+            $valid_class_names = [];
+            foreach ($class_names as $class_name) {
+                if (is_a($class_name, 'Resource', true)) {
+                    $valid_class_names[] = $class_name;
+                }
+            }
+            $class_names = $valid_class_names;
+        }
+        if (count($class_names)) {
+            $sql .= 'INNER JOIN resource_categories rc
+                ON resources.category_id = rc.id
+                WHERE ';
+        }
+
+        $user_is_resource_admin = self::userHasGlobalPermission(
+            $user,
+            'admin'
+        ) || $GLOBALS['perm']->have_perm('root', $user->id);
+
+        if (!$user_is_resource_admin) {
+            $sql .= "resources.id IN (
+                    SELECT resource_id FROM resource_permissions
+                    WHERE user_id = :user_id
+                    AND perms IN ( :perms )
+                    UNION
+                    SELECT resource_id FROM resource_temporary_permissions
+                    WHERE user_id = :user_id
+                    AND perms IN ( :perms )
+                    AND (begin <= :time)
+                    AND (end >= :time)
+                ) ";
+            $data = [
+                'user_id' => $user->id,
+                'time' => $used_time
+            ];
+        }
+
+        if (count($class_names) && !$user_is_resource_admin) {
+            $sql .= 'AND ';
+        }
+
+        if (count($class_names)) {
+            $sql .= "rc.class_name IN ( :class_names ) ";
+            $data['class_names'] = $class_names;
+        }
+        $sql .= "GROUP BY resources.id
+            ORDER BY sort_position DESC, resources.name ASC";
+
+        $perms = self::getHigherPermissionLevels($level);
+        array_push($perms, $level);
+        $data['perms'] = $perms;
+
+        return [
+            'query' => $sql,
+            'data' => $data
+        ];
+    }
+
+
+    /**
+     * Counts all resources for which the specified user has permanent or
+     * temporary permissions.
+     *
+     * @param User $user The user whose resources shall be retrieved.
+     *
+     * @param string $level The minimum permission level the user must have
+     *     on a resource so that it will be included in the result set.
+     *
+     * @param DateTime|int|null $time The timestamp for the check on
+     *     temporary permissions. If this parameter is not set
+     *     the current timestamp will be used.
+     *
+     * @param string[] $class_names A list of resource classes that will
+     *     be used to filter the result set so that only resources being
+     *     a member of one of the specified resource classes will be retrieved.
+     *
+     */
+    public static function countUserResources(
+        User $user,
+        $level = 'user',
+        $time = null,
+        $class_names = []
+    )
+    {
+        $sql = self::getUserResourcesSqlData($user, $level, $time, $class_names);
+        return Resource::countBySql($sql['query'], $sql['data']);
+    }
+
+
+    /**
+     * Retrieves all resources for which the specified user has permanent or
+     * temporary permissions.
+     *
+     * @param User $user The user whose resources shall be retrieved.
+     *
+     * @param string $level The minimum permission level the user must have
+     *     on a resource so that it will be included in the result set.
+     *
+     * @param DateTime|int|null $time The timestamp for the check on
+     *     temporary permissions. If this parameter is not set
+     *     the current timestamp will be used.
+     *
+     * @param string[] $class_names A list of resource classes that will
+     *     be used to filter the result set so that only resources being
+     *     a member of one of the specified resource classes will be retrieved.
+     *
+     * @param bool $convert_objects If the resource objects
+     *     in the result set shall be converted to objects of the derived
+     *     resource classes set this to true, otherwise false.
+     *     Defaults to true.
+     *
+     * @returns Resource[] An array of Resource objects
+     *     or objects of derived resource classes.
+     */
+    public static function getUserResources(
+        User $user,
+        $level = 'user',
+        $time = null,
+        $class_names = [],
+        $convert_objects = true
+    )
+    {
+        $sql = self::getUserResourcesSqlData($user, $level, $time, $class_names);
+        $resources = Resource::findBySql($sql['query'], $sql['data']);
+        if ($convert_objects) {
+            $result = [];
+            foreach ($resources as $resource) {
+                $result[] = $resource->getDerivedClassInstance();
+            }
+            return $result;
+        } else {
+            return $resources;
+        }
+    }
+
+    /**
+     * Check if the coordinate are in appropriate CRSWGS_84 format.
+     *
+     * - latitude: up to 2 digits, decimal point, 1 to 10 digits for fraction
+     * - longitude: up to 3 digits, decimal point, 1 to 10 digits for fraction
+     * - altitude: up to 5 digits, decimal point, 1 to 10 digits for fraction
+     *
+     * @param string $coordinate_string
+     * @return bool
+     */
+    public static function validateCoordinates(string $coordinate_string): bool
+    {
+        return preg_match(
+            ResourcePropertyDefinition::CRSWGS84_REGEX,
+            $coordinate_string
+        );
+    }
+
+
+    // Static methods for position properties:
+
+    public static function getPositionArray(ResourceProperty $property)
+    {
+        if (!$property->definition) {
+            //An orphaned Resource property: we cannot generate an array for it!
+            throw new ResourcePropertyDefinitionException(
+                _('Die Positionsangabe kann nicht umgewandelt werden, da die angegebene Ressourceneigenschaft verwaist (ohne zugehörige Definition) ist!')
+            );
+        }
+
+        if ($property->definition->type != 'position') {
+            //We cannot generate an array for attributes other than the position type!
+            throw new ResourcePropertyException(
+                _("Die Positionsangabe kann nicht umgewandelt werden, da die angegebene Ressourceneigenschaft nicht vom Typ 'position' ist!")
+            );
+        }
+
+        //Parse the ISO-6709 coordinates from $property->value:
+        $coordinate_string = $property->state;
+
+
+        // Show error message when coordinates are invalid
+        if (!self::validateCoordinates($coordinate_string)) {
+            PageLayout::postError(_('Die Positionsangabe kann nicht umgewandelt werden, da sie ungültige Daten enthält!'));
+        }
+
+        //With the first split we separate the numbers in the coordinate string.
+        //The second split lets us retrieve the sign for each number.
+
+        $coordinate_parts = preg_split(
+            '/([+-]|(CRSWGS_84\/))+/',
+            $coordinate_string,
+            -1,
+            PREG_SPLIT_NO_EMPTY
+        );
+
+        //We can simply split the coordinate string by each dot,
+        //since there has to be a dot in every three coordinates!
+        //This is because the coordinates are always stored
+        //with decimal separators.
+
+        $coordinate_signs = preg_split(
+            '/\.\d{1,10}/',
+            $coordinate_string,
+            -1,
+            PREG_SPLIT_NO_EMPTY
+        );
+
+        //The array position of $coordinate_parts and $coordinate_signs
+        //are the same! We can directly use the indexes.
+        //If a sign index is less than zero we must invert the value
+        //of the corresponding coordinate part.
+
+        for ($i = 0; $i < 3; $i++) {
+            if ($coordinate_signs[$i] < 0) {
+                $coordinate_parts[$i] *= -1;
+            }
+        }
+
+        return $coordinate_parts;
+    }
+
+
+    /**
+     * This method allows locking the resource management globally.
+     * The user who creates the lock must have admin permissions
+     * and the time interval must not lie in another global resource lock
+     * interval.
+     *
+     * @param User $user The user who wishes to lock the room and resource
+     *      management globally.
+     * @param DateTime $begin The begin timestamp of the lock.
+     * @param DateTime $end The end timestamp of the lock.
+     *
+     * @throws InvalidArgumentException If $begin lies after $end or if
+     *     $begin is equal to $end.
+     * @throws ResourcePermissionException If the specified user does not
+     *     have sufficient permissions to lock the resource management globally.
+     * @throws GlobalResourceLockException If the resource lock could not be stored.
+     *
+     * @returns GlobalResourceLock object.
+     */
+    public function createGlobalLock(
+        User $user,
+        DateTime $begin,
+        DateTime $end,
+        $ignore_bookings = false
+    )
+    {
+        if ($begin > $end) {
+            throw new InvalidArgumentException(
+                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+            );
+        }
+        if ($begin == $end) {
+            throw new InvalidArgumentException(
+                _('Startzeitpunkt und Endzeitpunkt dürfen nicht identisch sein!')
+            );
+        }
+
+        if (!self::userHasGlobalPermission($user, 'admin')) {
+            throw new ResourcePermissionException(
+                _('Unzureichende Berechtigungen zum globalen Sperren der Raumverwaltung!')
+            );
+        }
+
+        if (GlobalResourceLock::existsInTimeRange($begin, $end)) {
+            throw new GlobalResourceLockOverlapException(
+                sprintf(
+                    _('Im Zeitbereich vom %1$s bis %2$s gibt es bereits eine globale Sperrung der Raumverwaltung!'),
+                    $begin->format('d.m.Y H:i'),
+                    $end->format('d.m.Y H:i')
+                )
+            );
+        }
+
+        $lock = new GlobalResourceLock();
+        $lock->begin = $begin->getTimestamp();
+        $lock->end = $end->getTimestamp();
+        $lock->user_id = $user->id;
+        $lock->type = '0';
+        if (!$lock->store()) {
+            throw new GlobalResourceLockException(
+                sprintf(
+                    _('Fehler beim Speichern der globalen Sperre der Raumverwaltung im Zeitbereich vom %1$s bis %2$s!'),
+                    $begin->format('d.m.Y H:i'),
+                    $end->format('d.m.Y H:i')
+                )
+            );
+        }
+        return $lock;
+    }
+
+
+    //Special methods for attributes of type position:
+
+    public static function getPositionString(
+        ResourceProperty $property,
+        $with_altitude = false
+    )
+    {
+        $coordinate_parts = [];
+        $string = '';
+        try {
+            $coordinate_parts = self::getPositionArray($property);
+        } catch (ResourcePropertyDefinitionException $e) {
+            //An orphaned Resource property: we cannot generate a string for it!
+            throw new ResourcePropertyDefinitionException(
+                _('Die Positionsangabe kann nicht formatiert werden, da die angegebene Ressourceneigenschaft verwaist (ohne zugehörige Definition) ist!')
+            );
+        } catch (ResourcePropertyException $e) {
+            //We cannot generate a string for attributes other than the position type!
+            throw new ResourcePropertyException(
+                _('Die Positionsangabe kann nicht formatiert werden, da die angegebene Ressourceneigenschaft nicht vom Typ "position" ist!')
+            );
+        } catch (ResourcePropertyStateException $e) {
+            //We cannot generate a string from invalid data!
+            return '';
+        }
+
+        $locale = localeconv();
+
+        if ($coordinate_parts[0] < 0) {
+            $string .= sprintf(
+                _('%s°S'),
+                number_format(
+                    abs($coordinate_parts[0]),
+                    7,
+                    $locale['decimal_point'],
+                    $locale['thousands_sep']
+                )
+            ) . ' ';
+        } else {
+            $string .= sprintf(
+                _('%s°N'),
+                number_format(
+                    abs($coordinate_parts[0]),
+                    7,
+                    $locale['decimal_point'],
+                    $locale['thousands_sep']
+                )
+            ) . ' ';
+        }
+
+        if ($coordinate_parts[1] < 0) {
+            $string .= sprintf(
+                _('%s°O'),
+                number_format(
+                    abs($coordinate_parts[1]),
+                    7,
+                    $locale['decimal_point'],
+                    $locale['thousands_sep']
+                )
+            ) . ' ';
+        } else {
+            $string .= sprintf(
+                _('%s°W'),
+                number_format(
+                    abs($coordinate_parts[1]),
+                    7,
+                    $locale['decimal_point'],
+                    $locale['thousands_sep']
+                )
+            );
+        }
+
+        if ($with_altitude) {
+            $string .=  ' ';
+            if ($coordinate_parts[2] < 0) {
+                $string .= sprintf(
+                    _('%s m unter NHN'),
+                    number_format(
+                        abs($coordinate_parts[2]),
+                        1,
+                        $locale['decimal_point'],
+                        $locale['thousands_sep']
+                    )
+                );
+            } else {
+                $string .= sprintf(
+                    _('%s m über NHN'),
+                    number_format(
+                        abs($coordinate_parts[2]),
+                        1,
+                        $locale['decimal_point'],
+                        $locale['thousands_sep']
+                    )
+                );
+            }
+        }
+
+        return $string;
+    }
+
+
+    public static function getMapUrlForResourcePosition(
+        ResourceProperty $property
+    )
+    {
+        $coordinate_parts = [];
+        try {
+            $coordinate_parts = self::getPositionArray($property);
+        } catch (ResourcePropertyDefinitionException $e) {
+            //An orphaned Resource property: we cannot generate an URL for it!
+            throw new InvalidArgumentException(
+                _('Eine URL zur Straßenkarte kann nicht erzeugt werden, da die angegebene Ressourceneigenschaft verwaist (ohne zugehörige Definition) ist!')
+            );
+        } catch (ResourcePropertyException $e) {
+            //We cannot generate an URL for attributes other than the position type!
+            throw new InvalidArgumentException(
+                _("Eine URL zur Straßenkarte kann nicht erzeugt werden, da die angegebene Ressourceneigenschaft nicht vom Typ 'position' ist!")
+            );
+        } catch (ResourcePropertyStateException $e) {
+            //We cannot generate an URL from invalid data!
+            return '';
+        }
+
+        $map_service_url = Config::get()->RESOURCES_MAP_SERVICE_URL;
+        if ($map_service_url) {
+            //Replace the strings LATITUDE and LONGITUDE in the URL
+            //with the coordinates.
+            return str_replace(
+                [
+                    'LATITUDE',
+                    'LONGITUDE'
+                ],
+                [
+                    $coordinate_parts[0],
+                    $coordinate_parts[1]
+                ],
+                $map_service_url
+            );
+        } else {
+            //Default to OpenStreepMap:
+            return sprintf(
+                'https://www.openstreetmap.org/#map=17/%1$s/%2$s',
+                $coordinate_parts[0],
+                $coordinate_parts[1]
+            );
+        }
+    }
+
+
+    // User permission methods:
+
+    /**
+     * Returns the resource management global permissions for a user,
+     * determined by the assigned roles and by the user's global permissions.
+     * This method does the mapping from the old resource management permissions
+     * to the new resource management permissions.
+     */
+    public static function getGlobalResourcePermission(User $user = null)
+    {
+        if (!$user) {
+            return '';
+        }
+
+        global $perm;
+        //First we check if the user is a root user:
+
+        if ($perm->get_perm($user->id) === 'root') {
+            return 'admin';
+        }
+
+        //The user is not a root user:
+        //We must check if he has special permissions
+        //for the virtual resource with id "global":
+
+        $permission = ResourcePermission::findOneBySql(
+            "user_id = :user_id AND resource_id = 'global'",
+            [
+                'user_id' => $user->id
+            ]
+        );
+
+        if (!$permission) {
+            //No global permissions in the resource management:
+            return '';
+        }
+
+        return $permission->perms;
+    }
+
+
+    /**
+     * Determines if the specified user has the specified permission level set
+     * for at least one resource.
+     *
+     * @param User $user The users whose resource permissions shall be retrieved.
+     * @param string $level The permission level the user should have
+     *     on at least one resource.
+     * @param string|int|DateTime|null $time The timestamp
+     *     for the temporary permission level check.
+     *     If this is not set the current timestamp will be used.
+     */
+    public static function userHasResourcePermissions(
+        User $user = null,
+        $level = 'admin',
+        $time = null
+    )
+    {
+        if (!$user) {
+            return false;
+        }
+
+        //Get all permissions and temporary permissions of the user:
+
+        $permissions = ResourcePermission::findBySQL(
+            "user_id = :user_id AND resource_id <> 'global'",
+            [
+                'user_id' => $user->id
+            ]
+        );
+
+        if ($permissions) {
+            foreach ($permissions as $permission) {
+                if (self::comparePermissionLevels($permission->perms, $level) >= 0) {
+                    //We have found a permission which is higher or equal
+                    //to the requested permission level and can therefore
+                    //return true:
+                    return true;
+                }
+            }
+        }
+
+        //No (sufficient) permanent permissions exist for the user
+        //for at least one resource. We must check the temporary permissions:
+
+        $used_time = time();
+        if ($time instanceof DateTime) {
+            $used_time = $time->getTimestamp();
+        } elseif ($time) {
+            $used_time = $time;
+        }
+
+        $temp_permissions = ResourceTemporaryPermission::findBySql(
+            "user_id = :user_id AND begin <= :time AND end >= :time
+            AND resource_id != 'global'",
+            [
+                'user_id' => $user->id,
+                'time' => $used_time
+            ]
+        );
+
+        if ($temp_permissions) {
+            foreach ($temp_permissions as $permission) {
+                if (self::comparePermissionLevels($permission->perms, $level) >= 0) {
+                    //We have found a temporary permission which is higher or
+                    //equal to the requested permission level and can therefore
+                    //return true:
+                    return true;
+                }
+            }
+        }
+
+        //We haven't found any permanent or temporary permission for the user
+        //that match the requested permission level on the specified timestamp.
+        return false;
+    }
+
+
+    //Helper methods:
+
+
+    /**
+     * Returns all permission levels lower than the specified level.
+     */
+    public static function getLowerPermissionLevels($level = 'user')
+    {
+        $defined_levels = ['user', 'autor', 'tutor', 'admin'];
+        if (!in_array($level, $defined_levels)) {
+            return [];
+        }
+
+        if ($level == 'admin') {
+            return array_slice($defined_levels, 0, 3);
+        } elseif ($level == 'tutor') {
+            return array_slice($defined_levels, 0, 2);
+        } elseif ($level == 'autor') {
+            return array_slice($defined_levels, 0, 1);
+        } else {
+            //There is no lower authority than user:
+            return [];
+        }
+    }
+
+
+    /**
+     * Returns all permission levels higher than the specified level.
+     */
+    public static function getHigherPermissionLevels($level = 'user')
+    {
+        $defined_levels = ['user', 'autor', 'tutor', 'admin'];
+        if (!in_array($level, $defined_levels)) {
+            return [];
+        }
+
+        if ($level == 'admin') {
+            //There is no higher authority than admin:
+            return [];
+        } elseif ($level == 'tutor') {
+            return array_slice($defined_levels, -1, 1);
+        } elseif ($level == 'autor') {
+            return array_slice($defined_levels, -2, 2);
+        } elseif ($level == 'user') {
+            return array_slice($defined_levels, -3, 3);
+        } else {
+            //We haven't found what you're looking for:
+            return [];
+        }
+    }
+
+
+    /**
+     * Compares two resource permission levels and returns an integer telling if
+     * the first level is less than (-1), equal (0) or greater than (1) the second level.
+     *
+     * @param string $level The first permission level.
+     * @param string $other_level The second permission level.
+     *
+     * @throws InvalidArgumentException if $level or $other_level are either not set
+     *     or if they contain invalid permission level strings.
+     * @returns integer -1 if $level is less than $other_level,
+     *     0 if both are equal,
+     *     1 if $level is greater than $other_level.
+     */
+    public static function comparePermissionLevels(
+        $level = 'user',
+        $other_level = 'user'
+    )
+    {
+        if (!$level or !$other_level) {
+            throw new InvalidArgumentException(
+                _('Mindestens eine Rechtestufe fehlt zum Vergleich!')
+            );
+        }
+
+        //The level list starts with the lowest permission level
+        //and ends with the highest permission level.
+        //The levels are compared by comparing the index values
+        //of the list.
+        $defined_levels = ['user', 'autor', 'tutor', 'admin'];
+
+        if (!in_array($level, $defined_levels)) {
+            throw new InvalidArgumentException(
+                _('Die angegebene Rechtestufe ist ungültig!')
+            );
+        }
+        if (!in_array($other_level, $defined_levels)) {
+            throw new InvalidArgumentException(
+                _('Die angegebene Rechtestufe ist ungültig!')
+            );
+        }
+
+        $level_index = array_search($level, $defined_levels);
+        $other_level_index = array_search($other_level, $defined_levels);
+
+        $diff = $level_index - $other_level_index;
+
+        if ($diff > 0) {
+            //$level is a higher permission level than $other_level.
+            return 1;
+        } elseif ($diff < 0) {
+            //$level is a lower permission level than $other_level.
+            return -1;
+        } else {
+            //$level and $other_level are the same permission level.
+            return 0;
+        }
+    }
+
+
+    /**
+     * Checks if the specified user has the specified permission level
+     * for the resource management system.
+     *
+     * @param User|null $user The user whose global resource permissions shall be checked.
+     * @param string $requested_permission The required permission level for the user.
+     *
+     * @returns bool True, if the user has the required permission level,
+     *     false otherwise.
+     */
+    public static function userHasGlobalPermission(
+        User $user = null,
+        $requested_permission = 'user'
+    )
+    {
+        //ResourceManager::getGlobalResourcePermission also checks
+        //for global resource locks and returns 'admin' if the
+        //user is 'admin' user or 'user' in all other cases
+        //where the user has permissions on the resource management system.
+        $existing_permission = self::getGlobalResourcePermission($user);
+
+        if (!$existing_permission) {
+            //No permissions in the resource management:
+            return false;
+        }
+
+        return self::comparePermissionLevels(
+            $existing_permission,
+            $requested_permission
+        ) > -1;
+    }
+
+
+    /**
+     * Counts the resources where the specified user has explicit
+     * permissions set, optionally limiting the result to permanent
+     * permissions.
+     *
+     * @param User $user The user whose resource permissions
+     *     shall be checked.
+     * @param string $requested_permission The required minimum permission
+     *     level for the user.
+     *
+     * @return int The amount of resources where the specified user has
+     *     explicit permissions for.
+     */
+    public static function countResourcesWithPermissions(
+        User $user,
+        $requested_permission = 'user',
+        $exclude_temporary_permissions = false
+    )
+    {
+        $perms = self::getHigherPermissionLevels($requested_permission);
+        array_push($perms, $requested_permission);
+        $total = Resource::countBySql(
+            "INNER JOIN resource_permissions rp
+            USING (resource_id)
+            WHERE
+            rp.perms IN ( :perms )
+            AND
+            rp.user_id = :user_id",
+            [
+                'perms' => $perms,
+                'user_id' => $user->id
+            ]
+        );
+
+        if (!$exclude_temporary_permissions) {
+            $now = time();
+            $total += Resource::countBySql(
+                "INNER JOIN resource_temporary_permissions rtp
+                USING (resource_id)
+                WHERE
+                rtp.perms IN ( :perms )
+                AND
+                rtp.user_id = :user_id
+                AND
+                rtp.begin <= :now
+                AND
+                rtp.end >= :now",
+                [
+                    'perms' => $perms,
+                    'user_id' => $user->id,
+                    'now' => $now
+                ]
+            );
+        }
+
+        return $total;
+    }
+
+
+    /**
+     * Checks if the specified user has the specified permission level
+     * on at least one specific resource.
+     *
+     * @param User $user The user whose resource permissions
+     *     shall be checked.
+     * @param string $requested_permission The required permission level
+     *     for the user.
+     *
+     * @returns bool True, if the user has the required permission level
+     *     for at least one resource, false otherwise.
+     */
+    public static function userHasSpecialPermissions(
+        User $user,
+        $requested_permission = 'user'
+    )
+    {
+        return self::countResourcesWithPermissions(
+            $user,
+            $requested_permission
+        ) > 0;
+    }
+
+
+    /**
+     * Get time ranges by looking at the object specified by its ID.
+     * This method works with CourseDate, SeminarCycleDate
+     * and Course objects.
+     *
+     * @param string $range_id The ID of a Stud.IP object.
+     *
+     * @returns Array An Array consisting of arrays of DateTime objects.
+     *     The structure of the array is as follows:
+     *     [
+     *         [
+     *             begin timestamp DateTime object
+     *             end timestamp DateTime object
+     *         ],
+     *         ...
+     *     ]
+     */
+    public static function getTimeRangesFromRangeId($range_id = null)
+    {
+        if (!$range_id) {
+            return [];
+        }
+
+        //We try a course date first, then a cycle date and finally
+        //a course as this is the standard order to check for dates.
+
+        $time_ranges = [];
+
+        $course_date = CourseDate::find($range_id);
+
+        if ($course_date) {
+            $begin = new DateTime();
+            $begin->setTimestamp($course_date->date);
+            $end = new DateTime();
+            $end->setTimestamp($course_date->end_time);
+            $time_ranges[] = [
+                $begin,
+                $end
+            ];
+        } else {
+            //No course date, but maybe a cycle date?
+            $cycle_date = SeminarCycleDate::find($range_id);
+
+            if ($cycle_date) {
+                if ($cycle_date->dates) {
+                    foreach ($cycle_date->dates as $date) {
+                        $begin = new DateTime();
+                        $begin->setTimestamp($date->date);
+                        $end = new DateTime();
+                        $end->setTimestamp($date->end_time);
+                        $time_ranges[] = [
+                            $begin,
+                            $end
+                        ];
+                    }
+                }
+            } else {
+                //No cycle date. It must be a course then!
+                $course = Course::find($range_id);
+
+                if ($course) {
+                    if ($course->dates) {
+                        foreach ($course->dates as $date) {
+                            $begin = new DateTime();
+                            $begin->setTimestamp($date->date);
+                            $end = new DateTime();
+                            $end->setTimestamp($date->end_time);
+                            $time_ranges[] = [
+                                $begin,
+                                $end
+                            ];
+                        }
+                    }
+                    if ($course->cycles) {
+                        foreach ($course->cycles as $cycle) {
+                            if ($cycle->dates) {
+                                foreach ($cycle->dates as $date) {
+                                    $begin = new DateTime();
+                                    $begin->setTimestamp($date->date);
+                                    $end = new DateTime();
+                                    $end->setTimestamp($date->end_time);
+                                    $time_ranges[] = [
+                                        $begin,
+                                        $end
+                                    ];
+                                }
+                            }
+                        }
+                    }
+                }
+                //No else here: Enough is enough.
+            }
+        }
+
+        return $time_ranges;
+    }
+
+
+    /**
+     * Determines the last booking of the user and calculates the timespan
+     * from the last booking until now.
+     *
+     * @returns DateInterval|null|false Either a date interval from the last
+     *     activity to the provided DateTime object or null in case the user
+     *     has never been active. False is returned in case the timestamp
+     *     comparison fails. @see DateTime::diff in the PHP Documentation.
+     */
+    public static function getUserInactivityInterval(User $user, DateTime $time)
+    {
+        $db = DBManager::get();
+
+        $stmt = $db->prepare(
+            "SELECT MAX(mkdate) FROM resource_bookings
+            WHERE range_id = :user_id"
+        );
+
+        $stmt->execute(['user_id' => $user->id]);
+
+        $last_activity_timestamp = $stmt->fetchColumn();
+
+        if (($last_activity_timestamp === false) or ($last_activity_timestamp === null)) {
+            //No activity found
+            return null;
+        }
+
+        $last_activity = new DateTime();
+        $last_activity->setTimestamp($last_activity_timestamp);
+
+        //Calculate the difference between the last activity and $time,
+        //if $time is greater or equal than $last_activity.
+        //If $time is less than $last_activity return null since the user
+        //has not been active at the timestamp $time.
+
+        if ($time < $last_activity) {
+            //The user has not been active at $time.
+            return null;
+        }
+
+        return $time->diff($last_activity);
+    }
+
+
+    /**
+     * Retrieves booking plan objects like resource bookings and requests.
+     *
+     * @param string|null $included_request_types If this parameter is a string,
+     *     it can have the values 'all' for retrieving all requests or the
+     *     ID of a user so that only requests of that user are retrieved.
+     *
+     */
+    public static function getBookingPlanObjects(
+        Resource $resource,
+        $time_ranges = [],
+        $allowed_booking_types = [],
+        $included_requests = null
+    )
+    {
+        if (!count($time_ranges)) {
+            return [];
+        }
+
+        $objects = [];
+
+        $bookings = \ResourceBooking::findByResourceAndTimeRanges(
+            $resource,
+            $time_ranges,
+            $allowed_booking_types
+        );
+        $objects = array_merge($objects, $bookings);
+
+        if ($included_requests == 'all') {
+            $requests = \ResourceRequest::findByResourceAndTimeRanges(
+                $resource,
+                $time_ranges,
+                0
+            );
+            $objects = array_merge($objects, $requests);
+        } elseif ($included_requests) {
+            $requests = \ResourceRequest::findByResourceAndTimeRanges(
+                $resource,
+                $time_ranges,
+                0,
+                [],
+                'user_id = :user_id',
+                ['user_id' => $included_requests]
+            );
+            $objects = array_merge($objects, $requests);
+        }
+
+        return $objects;
+    }
+
+
+    public static function getAllResourceClassNames($excluded_classes = [])
+    {
+        $class_names = [];
+        //We have to make the autoloader load all resource model classes,
+        //otherwise the get_declared_classes() statement below won't find
+        //any class derived from Resource!
+        foreach (
+            scandir($GLOBALS['STUDIP_BASE_PATH'] . '/lib/models/resources')
+            as $resource_model_file) {
+            $path = pathinfo($resource_model_file);
+
+            if ($path['extension'] == 'php') {
+                $class_name = explode('.class', $path['filename'])[0];
+                class_exists($class_name);
+            }
+        }
+
+        foreach (get_declared_classes() as $class_name) {
+            if (is_a($class_name, 'Resource', true)) {
+                foreach ($excluded_classes as $excl_class) {
+                    //For the resource base class, we must not check
+                    //derived classes.
+                    if ($excl_class == 'Resource') {
+                        if ($class_name == 'Resource') {
+                            continue 2;
+                        }
+                    } else {
+                        if (is_a($class_name, $excl_class, true)) {
+                            //The class belongs to one of the
+                            //excluded resource classes.
+                            continue 2;
+                        }
+                    }
+                }
+                $class_names[] = $class_name;
+            }
+        }
+        sort($class_names);
+
+        return $class_names;
+    }
+
+
+    /**
+     * Returns the names of all hierarchy elements from the root to the
+     * specified resource.
+     *
+     * @param Resource $room The resource to start with.
+     *
+     * @returns string[] An array with the names of the hierarchy elements,
+     *     starting with the top resource's name.
+     */
+    public static function getHierarchyNames(Resource $resource)
+    {
+        $names = [$resource->name];
+        $current_node = $resource->parent;
+        while ($current_node instanceof Resource) {
+            $names[] = $current_node->name;
+            $current_node = $current_node->parent;
+        }
+        return array_reverse($names);
+    }
+
+
+    /**
+     * Returns the hierarchy elements from the root to the
+     * specified resource.
+     *
+     * @param Resource $room The resource to start with.
+     *
+     * @returns Resource[] An array with the hierarchy elements,
+     *     starting with the top resource.
+     */
+    public static function getHierarchy(Resource $resource)
+    {
+        $hierarchy_ids = [$resource->id];
+        $items = [$resource];
+        $current_node = $resource->parent;
+        while ($current_node instanceof Resource) {
+            if (in_array($current_node->id, $hierarchy_ids)) {
+                //Circular hierarchy. That's a big error!
+                throw new InvalidResourceException(
+                    sprintf(
+                        _('Zirkuläre Hierarchie: Die Ressource %1$s ist ein Elternknoten von sich selbst!'),
+                        $current_node->name
+                    )
+                );
+            }
+            $items[] = $current_node;
+            $hierarchy_ids[] = $current_node->id;
+            $current_node = $current_node->parent;
+        }
+        return array_reverse($items);
+    }
+}
diff --git a/lib/resources/RoomManager.class.php b/lib/resources/RoomManager.class.php
deleted file mode 100644
index f4b4802..0000000
--- a/lib/resources/RoomManager.class.php
+++ /dev/null
@@ -1,994 +0,0 @@
-<?php
-
-/**
- * RoomManager.class.php
- *
- * 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.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- */
-
-/**
- * The RoomManager class contains methods that simplify the handling of rooms
- * which are one type of resources.
- */
-class RoomManager
-{
-    public static function findRoomsByRequest(ResourceRequest $request, $excluded_room_ids = [])
-    {
-        $all_relevant_properties = $request->getPropertyData();
-        $all_relevant_properties['room_category_id'] = $request->category_id;
-        return self::findRooms(
-            '',
-            '',
-            '',
-            $all_relevant_properties,
-            $request->getTimeIntervals(true),
-            'name ASC, mkdate ASC',
-            true,
-            $excluded_room_ids,
-            false
-        );
-    }
-
-
-    /**
-     * Helper method that creates the identical SQL query for the
-     * countUserRooms and findUserRooms methods.
-     */
-    protected static function getUserRoomsSqlData(
-        User $user,
-        $level = 'user',
-        $permanent_only = false,
-        $time = null,
-        $sql_conditions = '',
-        $sql_condition_parameters = [],
-        $sql_order_by = 'ORDER BY resources.sort_position DESC, resources.name ASC'
-    )
-    {
-        $used_time = time();
-        if ($time instanceof DateTime) {
-            $used_time = $time->getTimestamp();
-        } elseif ($time) {
-            $used_time = $time;
-        }
-
-        $user_is_admin = (
-            ResourceManager::userHasGlobalPermission(
-                $user,
-                'admin'
-            ) ||
-            $GLOBALS['perm']->have_perm('root')
-        );
-
-        $query = '';
-        $data = [];
-        if ($user_is_admin) {
-            $query = "resources.category_id IN (:room_categories)
-                ";
-            if ($sql_conditions) {
-                $query .= 'AND ' . $sql_conditions;
-                if (count($sql_condition_parameters)) {
-                    $data = $sql_condition_parameters;
-                }
-            }
-        } else {
-            $perms = ResourceManager::getHigherPermissionLevels($level);
-            array_push($perms, $level);
-
-            $query = "resources.category_id IN (:room_categories)
-                AND
-                resources.id IN (
-                    SELECT resource_id FROM resource_permissions
-                    WHERE user_id = :user_id
-                    AND perms IN ( :perms ) ";
-            $data = [
-                'user_id' => $user->id,
-                'perms' => $perms
-            ];
-            if (!$permanent_only) {
-                $query .= " UNION
-                    SELECT resource_id FROM resource_temporary_permissions
-                    WHERE user_id = :user_id
-                    AND perms IN ( :perms )
-                    AND (begin <= :time)
-                    AND (end >= :time) ";
-                $data['time'] = $used_time;
-            }
-            $query .= ") ";
-
-            if ($sql_conditions) {
-                $query .= 'AND ' . $sql_conditions;
-                if (count($sql_condition_parameters)) {
-                    $data = array_merge($data, $sql_condition_parameters);
-                }
-            }
-        }
-        $data['room_categories'] = SimpleCollection::createFromArray(ResourceCategory::findAll())
-            ->findBy('class_name', self::getAllRoomClassNames())
-            ->pluck('id');
-        $query .= " GROUP BY resources.id " . $sql_order_by;
-
-        return [
-            'query' => $query,
-            'data' => $data
-        ];
-    }
-
-
-    /**
-     * Checks whether the specified user has at least one permanent or
-     * temporary permission on at least one room. Root users and global resource
-     * admins always have permanent permissions.
-     *
-     * @param User $user The user whose permissions shall be checkec.
-     *
-     * @param string $level The minimum permission level the user must have
-     *     on a room so that it will be accepted for the check.
-     *     Defaults to the "user" permission level.
-     *
-     * @param bool $permanent_only Whether to count only rooms with permanent
-     *     permissions (true) or rooms with permanent and temporary
-     *     permissions (false). Defaults to false.
-     *
-     * @param string $sql_conditions An optional SQL condition that will be
-     *     placed in the WHERE block of the SQL query to filter
-     *     the result set.
-     *
-     * @param array $sql_condition_parameters An optional associative array
-     *     for the sql condition parameter containing variable parameters
-     *     that shall be used in the SQL query.
-     *
-     * @param DateTime|int|null $time The timestamp for the check on
-     *     temporary permissions. If this parameter is not set
-     *     the current timestamp will be used.
-     *
-     * @returns bool True, when the user has permissions for at least one room,
-     *     false otherwise.
-     */
-    public static function userHasRooms(
-        User $user,
-        $level = 'user',
-        $permanent_only = false,
-        $time = null,
-        $sql_conditions = '',
-        $sql_condition_parameters = []
-    )
-    {
-        if ($GLOBALS['perm']->have_perm('root', $user->id)) {
-            return true;
-        }
-        $sql = self::getUserRoomsSqlData($user, $level, $permanent_only, $time, $sql_conditions, $sql_condition_parameters, 'ORDER BY NULL');
-
-        $db = DBManager::get();
-        $exists_query = 'SELECT 1 FROM resources WHERE ' . $sql['query'] . ' LIMIT 1';
-        $stmt = $db->prepare($exists_query);
-        $stmt->execute($sql['data']);
-        return $stmt->fetchColumn();
-    }
-
-
-    /**
-     * Counts all rooms for which the specified user has permanent or
-     * temporary permissions. Root users and global resource admins
-     * get the amount of rooms in the Stud.IP system as result.
-     *
-     * @param User $user The user whose rooms shall be retrieved.
-     *
-     * @param string $level The minimum permission level the user must have
-     *     on a room so that it will be included in the result set.
-     *     Defaults to the "user" permission level.
-     *
-     * @param bool $permanent_only Whether to count only rooms with permanent
-     *     permissions (true) or rooms with permanent and temporary
-     *     permissions (false). Defaults to false.
-     *
-     * @param DateTime|int|null $time The timestamp for the check on
-     *     temporary permissions. If this parameter is not set
-     *     the current timestamp will be used.
-     *
-     * @param string $sql_conditions An optional SQL condition that will be
-     *     placed in the WHERE block of the SQL query to filter
-     *     the result set.
-     *
-     * @param array $sql_condition_parameters An optional associative array
-     *     for the sql condition parameter containing variable parameters
-     *     that shall be used in the SQL query.
-     */
-    public static function countUserRooms(
-        User $user,
-        $level = 'user',
-        $permanent_only = false,
-        $time = null,
-        $sql_conditions = '',
-        $sql_condition_parameters = []
-    )
-    {
-        if (ResourceManager::userHasGlobalPermission($user, $level)) {
-            //Count all rooms.
-            $room_class_names = self::getAllRoomClassNames();
-            return Room::countBySql(
-                "INNER JOIN resource_categories
-                ON resources.category_id = resource_categories.id
-                WHERE
-                resource_categories.class_name IN ( :room_class_names )",
-                [
-                    'room_class_names' => $room_class_names
-                ]
-            );
-        }
-        $sql = self::getUserRoomsSqlData($user, $level, $permanent_only, $time, $sql_conditions, $sql_condition_parameters);
-        return Room::countBySql($sql['query'], $sql['data']);
-    }
-
-
-    /**
-     * Retrieves all rooms for which the specified user has permanent or
-     * temporary permissions. Root users and global resource admins
-     * get a list of all rooms stored in the Stud.IP system.
-     *
-     * @param User $user The user whose rooms shall be retrieved.
-     *
-     * @param bool $permanent_only Whether to retrieve only rooms with permanent
-     *     permissions (true) or rooms with permanent and temporary
-     *     permissions (false). Defaults to false.
-     *
-     * @param string $level The minimum permission level the user must have
-     *     on a room so that it will be included in the result set.
-     *
-     * @param string $sql_conditions An optional SQL condition that will be
-     *     placed in the WHERE block of the SQL query to filter
-     *     the result set.
-     *
-     * @param array $sql_condition_parameters An optional associative array
-     *     for the sql condition parameter containing variable parameters
-     *     that shall be used in the SQL query.
-     *
-     * @param DateTime|int|null $time The timestamp for the check on
-     *     temporary permissions. If this parameter is not set
-     *     the current timestamp will be used.
-     * @return Room[]
-     */
-    public static function getUserRooms(
-        User $user,
-        $level = 'user',
-        $permanent_only = false,
-        $time = null,
-        $sql_conditions = '',
-        $sql_condition_parameters = []
-    )
-    {
-        if (ResourceManager::userHasGlobalPermission($user, $level)) {
-            //Return all rooms:
-            $room_class_names = self::getAllRoomClassNames();
-            return Room::findBySql(
-                "INNER JOIN resource_categories
-                ON resources.category_id = resource_categories.id
-                WHERE
-                resource_categories.class_name IN ( :room_class_names )
-                GROUP BY resources.id
-                ORDER BY resources.sort_position DESC, resources.name ASC",
-                [
-                    'room_class_names' => $room_class_names
-                ]
-            );
-        }
-        $sql = self::getUserRoomsSqlData($user, $level, $permanent_only, $time, $sql_conditions, $sql_condition_parameters);
-        return Room::findBySql($sql['query'], $sql['data']);
-    }
-
-
-    /**
-     * @param bool $notify_teachers True, if the teachers of the course where
-     *     the room request belongs to shall be notified, false otherwise.
-     *     This parameter is only useful for room requests made for courses
-     *     and their dates.
-     */
-    public static function createRoomBookingsByRequest(
-        Room $room,
-        RoomRequest $room_request,
-        User $user,
-        $notify_teachers = true
-    )
-    {
-        $time_intervals = $room_request->getTimeIntervals();
-
-        $bookings = [];
-
-        //Create a ResourceBooking for each time interval:
-        foreach ($time_intervals as $interval) {
-            $booking = new ResourceBooking();
-            $booking->resource_id = $room->id;
-            $booking->begin = $interval['begin'];
-            $booking->end = $interval['end'];
-            $booking->range_id = $user->id;
-            $booking->preparation_time = $room_request->preparation_time;
-            if ($booking->store()) {
-                $bookings[] = $booking;
-            }
-        }
-
-        //Notify the creator of the room request:
-        if ($room_request->user) {
-            //Send the message in the room request creator's preferred language:
-            setTempLanguage($room_request->user->id);
-            Message::send(
-                '____%system%____',
-                [$room_request->user->username],
-                sprintf(
-                    _('Ihre Raumanfrage für den Raum %1$s wurde von %2$s aufgelöst'),
-                    $room->name,
-                    $user->getFullName()
-                ),
-                sprintf(
-                    _('Ihre Raumanfrage für den Raum %1$s wurde von %2$s aufgelöst.'),
-                    $room->name,
-                    $user->getFullName()
-                )
-            );
-            restoreLanguage();
-        }
-
-        if ($notify_teachers) {
-            //Notify the teachers of the course, but check first if the room
-            //request belongs to a course:
-
-            if ($room_request->course) {
-                $lecturers = CourseMember::findByCourseAndStatus(
-                    $room_request->course_id,
-                    'dozent'
-                );
-
-                foreach ($lecturers as $lecturer) {
-                    //Send the message in the lecturer's preferred language:
-                    setTempLanguage($lecturer->user->id);
-                    $message_body = sprintf(
-                        _('Für die Veranstaltung %1$s wurden Raumbuchungen für die folgenden Termine erstellt:'),
-                        $room_request->course->name
-                    ) . "\n\n";
-
-                    foreach ($time_intervals as $time_interval) {
-                        $message_body .= '- '
-                                       . sprintf(
-                                           _('Am %1$s von %2$s Uhr bis %3$s Uhr'),
-                                           date('d.m.Y', $time_interval['begin']),
-                                           date('H:i', $time_interval['begin']),
-                                           date('H:i', $time_interval['end'])
-                                       )
-                                       . "\n";
-                    }
-
-                    Message::send(
-                        '____%system%____',
-                        $lecturer->user->username,
-                        sprintf(
-                            _('Auflösung einer Raumanfrage in Veranstaltung %s'),
-                            $room_request->course->name
-                        ),
-                        $message_body
-                    );
-                    restoreLanguage();
-                }
-            }
-        }
-
-        $room_request->closed = 2;
-        $room_request->store();
-
-        return $bookings;
-    }
-
-
-    public static function getBookingIntervalsForRoom(
-        Room $room,
-        DateTime $begin,
-        DateTime $end,
-        $booking_types = [
-            ResourceBooking::TYPE_NORMAL,
-            ResourceBooking::TYPE_RESERVATION,
-            ResourceBooking::TYPE_LOCK,
-            ResourceBooking::TYPE_PLANNED,
-        ],
-        $building_booking_types = [
-            ResourceBooking::TYPE_NORMAL,
-            ResourceBooking::TYPE_RESERVATION,
-            ResourceBooking::TYPE_LOCK,
-            ResourceBooking::TYPE_PLANNED,
-        ],
-        $exclude_canceled_intervals = true
-    )
-    {
-        $intervals = [];
-
-        if (!$booking_types && !$building_booking_types) {
-            //No types specified => nothing to do.
-            return $intervals;
-        }
-
-        if ($begin >= $end) {
-            //Invalid time range specified => nothing to do either.
-            return $intervals;
-        }
-
-        //Build the SQL query and the SQL parameters:
-        $sql = "INNER JOIN resource_bookings
-                ON resource_booking_intervals.booking_id = resource_bookings.id
-                WHERE resource_booking_intervals.begin < :end AND resource_booking_intervals.end > :begin ";
-        $sql_array = [
-            'begin' => $begin->getTimestamp(),
-            'end' => $end->getTimestamp(),
-        ];
-
-        if ($exclude_canceled_intervals) {
-            $sql .= "AND resource_booking_intervals.takes_place = '1' ";
-        }
-
-        if ($booking_types) {
-            $sql .= "AND (
-                resource_booking_intervals.resource_id = :room_id
-                AND
-                resource_bookings.booking_type IN ( :booking_types )
-            ) ";
-            $sql_array['room_id'] = $room->id;
-            $sql_array['booking_types'] = $booking_types;
-        }
-        if ($building_booking_types) {
-            $sql .= "OR (
-                resource_booking_intervals.resource_id = :building_id
-                AND
-                resource_bookings.booking_type IN ( :building_booking_types )
-            ) ";
-            $sql_array['building_id'] = $room->building->id;
-            $sql_array['building_booking_types'] = $building_booking_types;
-        }
-
-        $sql .= "ORDER BY begin ASC, end ASC";
-
-        $intervals = ResourceBookingInterval::findBySql($sql, $sql_array);
-        return $intervals;
-    }
-
-
-    /**
-     * Finds rooms by name, time range and which (at your option)
-     * meet the requirements specified by other properties.
-     * If a property isn't specified it won't be searched for.
-     *
-     * @param string $room_name The name of the room.
-     * @param string $location_id The ID of the location where the room shall
-     *     lie in.
-     * @param string $building_id
-     * @param string[] $properties An array of properties
-     *     and their desired states.
-     *     This array has the following structure:
-     *     $properties['property_name'] = 'property_state';
-     *     The array keys specify the property names, the entries of the array
-     *     specify the desired state.
-     *     Only the seats property may be a single value or an array with
-     *     two entries. In the first case the room must have
-     *     at least $seats seats. In the latter case the room must have between
-     *     $seats[0] and $seats[1] seats.
-     *     There are special pseudo properties that are handled by this array:
-     *     - room_category_id: The id of a resource category
-     *       that has 'Room' as class name.
-     *
-     * @param array $time_ranges Optional time ranges where the rooms have
-     *     to be available. The format of the array is the following:
-     *     [
-     *         [
-     *             'begin' => (begin timestamp or DateTime object),
-     *             'end' => (end timestamp or DateTime object)
-     *         ]
-     *     ]
-     * @param string $order_by An optional SQL snippet specifying the order of
-     *     the results. Defaults to null (no sorting).
-     * @param bool $only_requestable_rooms Whether the search shall be limited
-     *     to requestable rooms only (true) or not (false).
-     * @param array $excluded_room_ids
-     *
-     * @param bool $only_fully_available Whether only rooms shall be added to
-     *     the result set that are fully available in the requested time
-     *     ranges (true) or whether rooms shall be added that are only
-     *     partially available in those time ranges (false).
-     *     Defaults to true.
-     *
-     * @return array
-     */
-    public static function findRooms(
-        $room_name = '',
-        $location_id = null,
-        $building_id = null,
-        $properties = [],
-        $time_ranges = [],
-        $order_by = null,
-        $only_requestable_rooms = true,
-        $excluded_room_ids = [],
-        $only_fully_available = true
-    )
-    {
-        $sql = "INNER JOIN resource_categories rc
-                ON resources.category_id = rc.id
-                WHERE rc.class_name IN ( :room_class_names ) ";
-
-        $sql_array = [
-            'room_class_names' => self::getAllRoomClassNames()
-        ];
-
-        if ($only_requestable_rooms) {
-            $sql .= "AND resources.requestable > '0' ";
-        }
-
-        if ($room_name) {
-            $sql .= "AND resources.name LIKE CONCAT('%', :room_name, '%') ";
-            $sql_array['room_name'] = $room_name;
-        }
-
-        if (!empty($properties['room_category_id'])) {
-            $sql .= "AND rc.id = :room_category_id ";
-            $sql_array['room_category_id'] = $properties['room_category_id'];
-        }
-        if ($excluded_room_ids && is_array($excluded_room_ids)) {
-            $sql .= " AND resources.id NOT IN ( :room_ids ) ";
-            $sql_array['room_ids'] = $excluded_room_ids;
-        }
-
-        $sql .= " GROUP BY resources.name ";
-
-        if ($order_by) {
-            $sql .= "ORDER BY " . $order_by . ' ';
-        }
-
-        $rooms = Room::findBySql($sql, $sql_array);
-
-        //We must filter the rooms after we retrieved them since
-        //room bookings can have repetitions that we have to check.
-
-        $filtered_rooms = [];
-        if ($location_id || $building_id) {
-            foreach ($rooms as $room) {
-                //First check if the room lies in the building
-                //before checking its availability:
-
-                $building = $room->findParentByClassName('Building');
-
-                if (!$building) {
-                    //An invalid room: we don't want that either!
-                    continue;
-                }
-
-                if ($building_id) {
-                    if (is_array($building_id)) {
-                        if (in_array($building->id, $building_id)) {
-                            //We have found a room inside the building we are
-                            //looking for.
-                            $filtered_rooms[] = $room;
-                            continue;
-                        }
-                    }
-
-                    if ($building->id == $building_id) {
-                        //We have found a room inside the building we are
-                        //looking for.
-                        $filtered_rooms[] = $room;
-                        continue;
-                    }
-                }
-
-                //If code execution reaches this point, we haven't found
-                //a room yet, because no building has been specified.
-                //We have to look for locations instead, if one is given.
-                if ($location_id) {
-                    $location = $building->findParentByClassName('Location');
-
-                    if ($location_id && ($location->id == $location_id)) {
-                        //The room lies in the location we're searching for.
-                        $filtered_rooms[] = $room;
-                    }
-                }
-            }
-        } else {
-            //There is no selection for a specific building or location.
-            $filtered_rooms = $rooms;
-        }
-
-        $result = [];
-        if (!empty($time_ranges)) {
-
-            //We must check if the room is available:
-            foreach ($filtered_rooms as $room) {
-                $room_is_available = $only_fully_available;
-                foreach ($time_ranges as $time_range) {
-                    if (!$time_range['begin'] || !$time_range['end']) {
-                        //Invalid format.
-                        continue;
-                    }
-                    if ($time_range['begin'] instanceof DateTime) {
-                        $begin = $time_range['begin'];
-                    } else {
-                        $begin = new DateTime();
-                        $begin->setTimestamp($time_range['begin']);
-                    }
-                    if ($time_range['end'] instanceof DateTime) {
-                        $end = $time_range['end'];
-                    } else {
-                        $end = new DateTime();
-                        $end->setTimestamp($time_range['end']);
-                    }
-                    if ($room->isAvailable($begin, $end)) {
-                        if (!$only_fully_available) {
-                            $room_is_available = true;
-                            break;
-                        }
-                    } else {
-                        if ($only_fully_available) {
-                            $room_is_available = false;
-                            break;
-                        }
-                    }
-                }
-                if ($room_is_available) {
-                    $result[] = $room;
-                }
-            }
-        } else {
-            //No time frame has been specified.
-            //All found rooms can be transferred to the result set.
-            $result = $filtered_rooms;
-        }
-
-        //Filter out the special property room_category_id:
-        unset($properties['room_category_id']);
-
-        //Now we filter each room for the properties, if any:
-        if (is_array($properties) && count($properties)) {
-            $old_result = $result;
-            $result = [];
-            $properties = array_filter($properties, function ($property) {
-                return !empty($property);
-            });
-            $required_property_c = count($properties);
-            foreach ($old_result as $room) {
-                $room_property_match = 0;
-                foreach ($properties as $name => $state) {
-                    $room_prop_state = $room->getProperty($name);
-                    if ($room_prop_state === null) {
-                        //No such property.
-                        continue;
-                    }
-                    if (is_array($state)) {
-                        //A range is specified. We must check if the
-                        //value of the property lies in the range.
-                        //Furthermore we must check if only minimum or maximum are
-                        //set or if both are set. Depending on that condition,
-                        //the conditions are different.
-                        if ($state[0] && $state[1]) {
-                            //Minimum and maximum are specified:
-                            if ($room_prop_state >= $state[0] && $room_prop_state <= $state[1]) {
-                                $room_property_match++;
-                            }
-                        } elseif ($state[0]) {
-                            //Only a minimum is given:
-                            if ($room_prop_state >= $state[0]) {
-                                $room_property_match++;
-                            }
-                        } elseif ($state[1]) {
-                            //Only a maximum is given:
-                            if ($room_prop_state <= $state[1]) {
-                                $room_property_match++;
-                            }
-                        }
-                    } elseif ($state) {
-                        if ($room_prop_state == $state) {
-                            $room_property_match++;
-                        }
-                    }
-                }
-                if ($room_property_match === $required_property_c) {
-                    $result[] = $room;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Searches for room bookings where the room is overbooked
-     * in the specified time range.
-     * A room is overbooked if a resource booking exists for that room
-     * which is associated with a course and the amount of course participants
-     * is higher than the amount of seats in the room.
-     *
-     * @param DateTime $begin The begin of the time range.
-     * @param DateTime $end The end of the time range.
-     *
-     * @returns SimpleORMapCollection A collection of overbooked room bookings
-     *     as ResourceBooking objects.
-     */
-    public static function findOverbookedRoomBookings(DateTime $begin, DateTime $end)
-    {
-        //First we must check if $begin and $end specify a valid time range:
-        if ($end <= $begin) {
-            throw new InvalidArgumentException(
-                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
-            );
-        }
-
-        //Now we query all room resources together with courses and
-        //resource bookings:
-
-        $found_bookings = ResourceBooking::findBySql(
-            "INNER JOIN resources
-                ON resource_bookings.resource_id = resources.id
-                INNER JOIN resource_categories
-                ON resources.category_id = resource_categories.id
-                INNER JOIN resource_properties
-                ON resources.id = resource_properties.resource_id
-                INNER JOIN resource_property_definitions rpd
-                ON resource_properties.property_id = rpd.property_id
-                WHERE TRUE"
-        );
-
-        return $found_bookings;
-    }
-
-
-    /**
-     * Retrieves all properties that are bound to room resource categories
-     * or room resources directly.
-     *
-     * @param bool $only_searchable Whether only searchable properties
-     *     shall be returned (true) or all properties shall be returned (false).
-     *     Defaults to false.
-     *
-     * @param string[] $excluded_properties An array containing the names
-     *     of the properties that shall be excluded from the result set.
-     *
-     * @returns ResourcePropertyDefinition[] An array of
-     *     ResourcePropertyDefinition objects.
-     */
-    public static function getAllRoomPropertyDefinitions(
-        $only_searchable = false,
-        $excluded_properties = []
-    )
-    {
-        if ($excluded_properties) {
-            if (!is_array($excluded_properties)) {
-                $excluded_properties = [$excluded_properties];
-            }
-        }
-
-        $sql = "INNER JOIN resource_category_properties rcp
-            USING (property_id)
-            INNER JOIN resource_categories rc
-            ON rcp.category_id = rc.id
-            WHERE
-            rc.class_name IN ( :room_class_names ) ";
-        $sql_array = [
-            'room_class_names' => self::getAllRoomClassNames()
-        ];
-
-        if ($only_searchable) {
-            $sql .= "AND resource_property_definitions.searchable = '1' ";
-        }
-
-        if ($excluded_properties) {
-            $sql .= "AND resource_property_definitions.name NOT IN (
-                :excluded_properties
-                ) ";
-            $sql_array['excluded_properties'] = $excluded_properties;
-        }
-
-        $sql .= "GROUP BY
-            resource_property_definitions.property_id
-            ORDER BY
-            resource_property_definitions.name ASC,
-            resource_property_definitions.mkdate ASC;";
-
-        return ResourcePropertyDefinition::findBySql(
-            $sql, $sql_array
-        );
-    }
-
-
-    /**
-     * Returns the names of all hierarchy elements from the location to the
-     * specified room.
-     *
-     * @param Room $room The room to start with.
-     *
-     * @param bool $all_items Whether to include all resource item names
-     *     while traversing the tree upwards (true) or to only include the
-     *     names of the room, the building and the location (false).
-     *
-     * @returns string[] An array with the names of the hierarchy elements,
-     *     starting with the location name.
-     */
-    public static function getHierarchyNames(Room $room, $all_items = false)
-    {
-        $names = [$room->name];
-
-        if ($all_items) {
-            return ResourceManager::getHierarchyNames($room);
-        } else {
-            $building = $room->building;
-            if ($building instanceof Building) {
-                $names[] = $building->name;
-
-                $location = $building->location;
-                if ($location instanceof Location) {
-                    $names[] = $location->name;
-                }
-            }
-        }
-        return array_reverse($names);
-    }
-
-
-    /**
-     * Groups rooms by their location and building.
-     *
-     * @param Room[] $rooms An array of rooms that shall be grouped.
-     *
-     * @returns Array[][][] A three dimensional array with the whole
-     *     hierarchy for the specified rooms.
-     *     The array structure is as follows:
-     *     [
-     *         [
-     *             'location' => Location object
-     *             'buildings' => [
-     *                 'building' => Building object
-     *                 'rooms' => Array of room objects.
-     *             ]
-     *         ]
-     *     ]
-     */
-    public static function groupRooms($rooms = [])
-    {
-        $grouped_rooms = [];
-        foreach ($rooms as $room) {
-            if (!$room instanceof Room) {
-                continue;
-            }
-            $building = $room->building;
-            if (!($building instanceof Building)) {
-                //Invalid room
-                continue;
-            }
-            $location = $building->location;
-            if (!($location instanceof Location)) {
-                //Invalid room
-                continue;
-            }
-            if (empty($grouped_rooms[$location->id])) {
-                $grouped_rooms[$location->id] = [
-                    'location' => $location,
-                    'buildings' => []
-                ];
-            }
-            if (empty($grouped_rooms[$location->id]['buildings'][$building->id])) {
-                $grouped_rooms[$location->id]['buildings'][$building->id] = [
-                    'building' => $building,
-                    'rooms' => []
-                ];
-            }
-            $grouped_rooms[$location->id]['buildings'][$building->id]['rooms'][] = $room;
-        }
-
-        return $grouped_rooms;
-    }
-
-
-    /**
-     * @returns string[] A list containing class names of all classes that are
-     *     derived from the Room class and the Room class itself.
-     */
-    public static function getAllRoomClassNames()
-    {
-        $resource_class_names = ResourceManager::getAllResourceClassNames();
-        $room_class_names = [];
-        foreach($resource_class_names as $class_name) {
-            if (is_a($class_name, 'Room', true)) {
-                $room_class_names[] = $class_name;
-            }
-        }
-        return $room_class_names;
-    }
-
-
-    /**
-     * This method creates the SQL data for the methods countRequestableRooms
-     * and findRequestableRooms.
-     *
-     * @param array time_ranges[][] The time ranges in which a requestable room
-     *     must be available to be included in the result set. This is a
-     *     two-dimensional array where the second dimension is an associative
-     *     array with two indexes: "begin" and "end". These can either be
-     *     timestamps or DateTime objects representing the begin and end
-     *     of the time range, respectively.
-     *
-     * @returns array An associative array with two indexes:
-     *     - sql: The SQL query as string.
-     *     - sql_params: An associative array with all parameters for the query.
-     */
-    protected static function getRequestableRoomsSqlData(array $time_ranges = [])
-    {
-        $sql = "INNER JOIN `resource_categories` rc
-                ON `resources`.`category_id` = rc.id ";
-        if ($time_ranges) {
-            $sql .= "INNER JOIN `resource_booking_intervals` rbi
-                     ON `resources`.`id` = rbi.`resource_id` ";
-        }
-        $sql .= "WHERE `rc`.`class_name` IN ( :room_class_names )
-                 AND `resources`.`requestable` > '0' ";
-
-        $sql_params = [
-            'room_class_names' => self::getAllRoomClassNames()
-        ];
-
-        if (!$time_ranges) {
-            $sql .= 'ORDER BY `resources`.`name` ASC';
-            return [
-                'sql' => $sql,
-                'sql_params' => $sql_params
-            ];
-        }
-
-        $sql .= "AND (";
-
-        $i = 1;
-        foreach ($time_ranges as $time_range) {
-            if (!is_array($time_range)) {
-                continue;
-            }
-            if ($time_range['begin'] >= $time_range['end']) {
-                continue;
-            }
-
-            $begin = $time_range['begin'];
-            if ($time_range['begin'] instanceof DateTime) {
-                $begin = $time_range['begin']->getTimestamp();
-            }
-            $end = $time_range['end'];
-            if ($time_range['end'] instanceof DateTime) {
-                $end = $time_range['end']->getTimestamp();
-            }
-
-            if ($i > 1) {
-                $sql .= 'AND ';
-            }
-            // FIXME this checks looks bogus to me
-            $sql .= "(rbi.begin >= :end$i OR rbi.end <= :begin$i)";
-            $sql_params["begin$i"] = $begin;
-            $sql_params["end$i"] = $end;
-
-            $i++;
-        }
-        $sql .= ') GROUP BY `resources`.`id` ORDER BY `resources`.`name` ASC';
-
-        return [
-            'sql' => $sql,
-            'sql_params' => $sql_params
-        ];
-    }
-
-
-    public static function countRequestableRooms(array $time_ranges = [])
-    {
-        $sql_data = self::getRequestableRoomsSqlData($time_ranges);
-        return Room::countBySql($sql_data['sql'], $sql_data['sql_params']);
-    }
-
-
-    public static function findRequestableRooms(array $time_ranges = [])
-    {
-        $sql_data = self::getRequestableRoomsSqlData($time_ranges);
-        return Room::findBySql($sql_data['sql'], $sql_data['sql_params']);
-    }
-}
diff --git a/lib/resources/RoomManager.php b/lib/resources/RoomManager.php
new file mode 100644
index 0000000..f4b4802
--- /dev/null
+++ b/lib/resources/RoomManager.php
@@ -0,0 +1,994 @@
+<?php
+
+/**
+ * RoomManager.class.php
+ *
+ * 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.
+ *
+ * @author      Moritz Strohm <strohm@data-quest.de>
+ * @copyright   2017
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category    Stud.IP
+ */
+
+/**
+ * The RoomManager class contains methods that simplify the handling of rooms
+ * which are one type of resources.
+ */
+class RoomManager
+{
+    public static function findRoomsByRequest(ResourceRequest $request, $excluded_room_ids = [])
+    {
+        $all_relevant_properties = $request->getPropertyData();
+        $all_relevant_properties['room_category_id'] = $request->category_id;
+        return self::findRooms(
+            '',
+            '',
+            '',
+            $all_relevant_properties,
+            $request->getTimeIntervals(true),
+            'name ASC, mkdate ASC',
+            true,
+            $excluded_room_ids,
+            false
+        );
+    }
+
+
+    /**
+     * Helper method that creates the identical SQL query for the
+     * countUserRooms and findUserRooms methods.
+     */
+    protected static function getUserRoomsSqlData(
+        User $user,
+        $level = 'user',
+        $permanent_only = false,
+        $time = null,
+        $sql_conditions = '',
+        $sql_condition_parameters = [],
+        $sql_order_by = 'ORDER BY resources.sort_position DESC, resources.name ASC'
+    )
+    {
+        $used_time = time();
+        if ($time instanceof DateTime) {
+            $used_time = $time->getTimestamp();
+        } elseif ($time) {
+            $used_time = $time;
+        }
+
+        $user_is_admin = (
+            ResourceManager::userHasGlobalPermission(
+                $user,
+                'admin'
+            ) ||
+            $GLOBALS['perm']->have_perm('root')
+        );
+
+        $query = '';
+        $data = [];
+        if ($user_is_admin) {
+            $query = "resources.category_id IN (:room_categories)
+                ";
+            if ($sql_conditions) {
+                $query .= 'AND ' . $sql_conditions;
+                if (count($sql_condition_parameters)) {
+                    $data = $sql_condition_parameters;
+                }
+            }
+        } else {
+            $perms = ResourceManager::getHigherPermissionLevels($level);
+            array_push($perms, $level);
+
+            $query = "resources.category_id IN (:room_categories)
+                AND
+                resources.id IN (
+                    SELECT resource_id FROM resource_permissions
+                    WHERE user_id = :user_id
+                    AND perms IN ( :perms ) ";
+            $data = [
+                'user_id' => $user->id,
+                'perms' => $perms
+            ];
+            if (!$permanent_only) {
+                $query .= " UNION
+                    SELECT resource_id FROM resource_temporary_permissions
+                    WHERE user_id = :user_id
+                    AND perms IN ( :perms )
+                    AND (begin <= :time)
+                    AND (end >= :time) ";
+                $data['time'] = $used_time;
+            }
+            $query .= ") ";
+
+            if ($sql_conditions) {
+                $query .= 'AND ' . $sql_conditions;
+                if (count($sql_condition_parameters)) {
+                    $data = array_merge($data, $sql_condition_parameters);
+                }
+            }
+        }
+        $data['room_categories'] = SimpleCollection::createFromArray(ResourceCategory::findAll())
+            ->findBy('class_name', self::getAllRoomClassNames())
+            ->pluck('id');
+        $query .= " GROUP BY resources.id " . $sql_order_by;
+
+        return [
+            'query' => $query,
+            'data' => $data
+        ];
+    }
+
+
+    /**
+     * Checks whether the specified user has at least one permanent or
+     * temporary permission on at least one room. Root users and global resource
+     * admins always have permanent permissions.
+     *
+     * @param User $user The user whose permissions shall be checkec.
+     *
+     * @param string $level The minimum permission level the user must have
+     *     on a room so that it will be accepted for the check.
+     *     Defaults to the "user" permission level.
+     *
+     * @param bool $permanent_only Whether to count only rooms with permanent
+     *     permissions (true) or rooms with permanent and temporary
+     *     permissions (false). Defaults to false.
+     *
+     * @param string $sql_conditions An optional SQL condition that will be
+     *     placed in the WHERE block of the SQL query to filter
+     *     the result set.
+     *
+     * @param array $sql_condition_parameters An optional associative array
+     *     for the sql condition parameter containing variable parameters
+     *     that shall be used in the SQL query.
+     *
+     * @param DateTime|int|null $time The timestamp for the check on
+     *     temporary permissions. If this parameter is not set
+     *     the current timestamp will be used.
+     *
+     * @returns bool True, when the user has permissions for at least one room,
+     *     false otherwise.
+     */
+    public static function userHasRooms(
+        User $user,
+        $level = 'user',
+        $permanent_only = false,
+        $time = null,
+        $sql_conditions = '',
+        $sql_condition_parameters = []
+    )
+    {
+        if ($GLOBALS['perm']->have_perm('root', $user->id)) {
+            return true;
+        }
+        $sql = self::getUserRoomsSqlData($user, $level, $permanent_only, $time, $sql_conditions, $sql_condition_parameters, 'ORDER BY NULL');
+
+        $db = DBManager::get();
+        $exists_query = 'SELECT 1 FROM resources WHERE ' . $sql['query'] . ' LIMIT 1';
+        $stmt = $db->prepare($exists_query);
+        $stmt->execute($sql['data']);
+        return $stmt->fetchColumn();
+    }
+
+
+    /**
+     * Counts all rooms for which the specified user has permanent or
+     * temporary permissions. Root users and global resource admins
+     * get the amount of rooms in the Stud.IP system as result.
+     *
+     * @param User $user The user whose rooms shall be retrieved.
+     *
+     * @param string $level The minimum permission level the user must have
+     *     on a room so that it will be included in the result set.
+     *     Defaults to the "user" permission level.
+     *
+     * @param bool $permanent_only Whether to count only rooms with permanent
+     *     permissions (true) or rooms with permanent and temporary
+     *     permissions (false). Defaults to false.
+     *
+     * @param DateTime|int|null $time The timestamp for the check on
+     *     temporary permissions. If this parameter is not set
+     *     the current timestamp will be used.
+     *
+     * @param string $sql_conditions An optional SQL condition that will be
+     *     placed in the WHERE block of the SQL query to filter
+     *     the result set.
+     *
+     * @param array $sql_condition_parameters An optional associative array
+     *     for the sql condition parameter containing variable parameters
+     *     that shall be used in the SQL query.
+     */
+    public static function countUserRooms(
+        User $user,
+        $level = 'user',
+        $permanent_only = false,
+        $time = null,
+        $sql_conditions = '',
+        $sql_condition_parameters = []
+    )
+    {
+        if (ResourceManager::userHasGlobalPermission($user, $level)) {
+            //Count all rooms.
+            $room_class_names = self::getAllRoomClassNames();
+            return Room::countBySql(
+                "INNER JOIN resource_categories
+                ON resources.category_id = resource_categories.id
+                WHERE
+                resource_categories.class_name IN ( :room_class_names )",
+                [
+                    'room_class_names' => $room_class_names
+                ]
+            );
+        }
+        $sql = self::getUserRoomsSqlData($user, $level, $permanent_only, $time, $sql_conditions, $sql_condition_parameters);
+        return Room::countBySql($sql['query'], $sql['data']);
+    }
+
+
+    /**
+     * Retrieves all rooms for which the specified user has permanent or
+     * temporary permissions. Root users and global resource admins
+     * get a list of all rooms stored in the Stud.IP system.
+     *
+     * @param User $user The user whose rooms shall be retrieved.
+     *
+     * @param bool $permanent_only Whether to retrieve only rooms with permanent
+     *     permissions (true) or rooms with permanent and temporary
+     *     permissions (false). Defaults to false.
+     *
+     * @param string $level The minimum permission level the user must have
+     *     on a room so that it will be included in the result set.
+     *
+     * @param string $sql_conditions An optional SQL condition that will be
+     *     placed in the WHERE block of the SQL query to filter
+     *     the result set.
+     *
+     * @param array $sql_condition_parameters An optional associative array
+     *     for the sql condition parameter containing variable parameters
+     *     that shall be used in the SQL query.
+     *
+     * @param DateTime|int|null $time The timestamp for the check on
+     *     temporary permissions. If this parameter is not set
+     *     the current timestamp will be used.
+     * @return Room[]
+     */
+    public static function getUserRooms(
+        User $user,
+        $level = 'user',
+        $permanent_only = false,
+        $time = null,
+        $sql_conditions = '',
+        $sql_condition_parameters = []
+    )
+    {
+        if (ResourceManager::userHasGlobalPermission($user, $level)) {
+            //Return all rooms:
+            $room_class_names = self::getAllRoomClassNames();
+            return Room::findBySql(
+                "INNER JOIN resource_categories
+                ON resources.category_id = resource_categories.id
+                WHERE
+                resource_categories.class_name IN ( :room_class_names )
+                GROUP BY resources.id
+                ORDER BY resources.sort_position DESC, resources.name ASC",
+                [
+                    'room_class_names' => $room_class_names
+                ]
+            );
+        }
+        $sql = self::getUserRoomsSqlData($user, $level, $permanent_only, $time, $sql_conditions, $sql_condition_parameters);
+        return Room::findBySql($sql['query'], $sql['data']);
+    }
+
+
+    /**
+     * @param bool $notify_teachers True, if the teachers of the course where
+     *     the room request belongs to shall be notified, false otherwise.
+     *     This parameter is only useful for room requests made for courses
+     *     and their dates.
+     */
+    public static function createRoomBookingsByRequest(
+        Room $room,
+        RoomRequest $room_request,
+        User $user,
+        $notify_teachers = true
+    )
+    {
+        $time_intervals = $room_request->getTimeIntervals();
+
+        $bookings = [];
+
+        //Create a ResourceBooking for each time interval:
+        foreach ($time_intervals as $interval) {
+            $booking = new ResourceBooking();
+            $booking->resource_id = $room->id;
+            $booking->begin = $interval['begin'];
+            $booking->end = $interval['end'];
+            $booking->range_id = $user->id;
+            $booking->preparation_time = $room_request->preparation_time;
+            if ($booking->store()) {
+                $bookings[] = $booking;
+            }
+        }
+
+        //Notify the creator of the room request:
+        if ($room_request->user) {
+            //Send the message in the room request creator's preferred language:
+            setTempLanguage($room_request->user->id);
+            Message::send(
+                '____%system%____',
+                [$room_request->user->username],
+                sprintf(
+                    _('Ihre Raumanfrage für den Raum %1$s wurde von %2$s aufgelöst'),
+                    $room->name,
+                    $user->getFullName()
+                ),
+                sprintf(
+                    _('Ihre Raumanfrage für den Raum %1$s wurde von %2$s aufgelöst.'),
+                    $room->name,
+                    $user->getFullName()
+                )
+            );
+            restoreLanguage();
+        }
+
+        if ($notify_teachers) {
+            //Notify the teachers of the course, but check first if the room
+            //request belongs to a course:
+
+            if ($room_request->course) {
+                $lecturers = CourseMember::findByCourseAndStatus(
+                    $room_request->course_id,
+                    'dozent'
+                );
+
+                foreach ($lecturers as $lecturer) {
+                    //Send the message in the lecturer's preferred language:
+                    setTempLanguage($lecturer->user->id);
+                    $message_body = sprintf(
+                        _('Für die Veranstaltung %1$s wurden Raumbuchungen für die folgenden Termine erstellt:'),
+                        $room_request->course->name
+                    ) . "\n\n";
+
+                    foreach ($time_intervals as $time_interval) {
+                        $message_body .= '- '
+                                       . sprintf(
+                                           _('Am %1$s von %2$s Uhr bis %3$s Uhr'),
+                                           date('d.m.Y', $time_interval['begin']),
+                                           date('H:i', $time_interval['begin']),
+                                           date('H:i', $time_interval['end'])
+                                       )
+                                       . "\n";
+                    }
+
+                    Message::send(
+                        '____%system%____',
+                        $lecturer->user->username,
+                        sprintf(
+                            _('Auflösung einer Raumanfrage in Veranstaltung %s'),
+                            $room_request->course->name
+                        ),
+                        $message_body
+                    );
+                    restoreLanguage();
+                }
+            }
+        }
+
+        $room_request->closed = 2;
+        $room_request->store();
+
+        return $bookings;
+    }
+
+
+    public static function getBookingIntervalsForRoom(
+        Room $room,
+        DateTime $begin,
+        DateTime $end,
+        $booking_types = [
+            ResourceBooking::TYPE_NORMAL,
+            ResourceBooking::TYPE_RESERVATION,
+            ResourceBooking::TYPE_LOCK,
+            ResourceBooking::TYPE_PLANNED,
+        ],
+        $building_booking_types = [
+            ResourceBooking::TYPE_NORMAL,
+            ResourceBooking::TYPE_RESERVATION,
+            ResourceBooking::TYPE_LOCK,
+            ResourceBooking::TYPE_PLANNED,
+        ],
+        $exclude_canceled_intervals = true
+    )
+    {
+        $intervals = [];
+
+        if (!$booking_types && !$building_booking_types) {
+            //No types specified => nothing to do.
+            return $intervals;
+        }
+
+        if ($begin >= $end) {
+            //Invalid time range specified => nothing to do either.
+            return $intervals;
+        }
+
+        //Build the SQL query and the SQL parameters:
+        $sql = "INNER JOIN resource_bookings
+                ON resource_booking_intervals.booking_id = resource_bookings.id
+                WHERE resource_booking_intervals.begin < :end AND resource_booking_intervals.end > :begin ";
+        $sql_array = [
+            'begin' => $begin->getTimestamp(),
+            'end' => $end->getTimestamp(),
+        ];
+
+        if ($exclude_canceled_intervals) {
+            $sql .= "AND resource_booking_intervals.takes_place = '1' ";
+        }
+
+        if ($booking_types) {
+            $sql .= "AND (
+                resource_booking_intervals.resource_id = :room_id
+                AND
+                resource_bookings.booking_type IN ( :booking_types )
+            ) ";
+            $sql_array['room_id'] = $room->id;
+            $sql_array['booking_types'] = $booking_types;
+        }
+        if ($building_booking_types) {
+            $sql .= "OR (
+                resource_booking_intervals.resource_id = :building_id
+                AND
+                resource_bookings.booking_type IN ( :building_booking_types )
+            ) ";
+            $sql_array['building_id'] = $room->building->id;
+            $sql_array['building_booking_types'] = $building_booking_types;
+        }
+
+        $sql .= "ORDER BY begin ASC, end ASC";
+
+        $intervals = ResourceBookingInterval::findBySql($sql, $sql_array);
+        return $intervals;
+    }
+
+
+    /**
+     * Finds rooms by name, time range and which (at your option)
+     * meet the requirements specified by other properties.
+     * If a property isn't specified it won't be searched for.
+     *
+     * @param string $room_name The name of the room.
+     * @param string $location_id The ID of the location where the room shall
+     *     lie in.
+     * @param string $building_id
+     * @param string[] $properties An array of properties
+     *     and their desired states.
+     *     This array has the following structure:
+     *     $properties['property_name'] = 'property_state';
+     *     The array keys specify the property names, the entries of the array
+     *     specify the desired state.
+     *     Only the seats property may be a single value or an array with
+     *     two entries. In the first case the room must have
+     *     at least $seats seats. In the latter case the room must have between
+     *     $seats[0] and $seats[1] seats.
+     *     There are special pseudo properties that are handled by this array:
+     *     - room_category_id: The id of a resource category
+     *       that has 'Room' as class name.
+     *
+     * @param array $time_ranges Optional time ranges where the rooms have
+     *     to be available. The format of the array is the following:
+     *     [
+     *         [
+     *             'begin' => (begin timestamp or DateTime object),
+     *             'end' => (end timestamp or DateTime object)
+     *         ]
+     *     ]
+     * @param string $order_by An optional SQL snippet specifying the order of
+     *     the results. Defaults to null (no sorting).
+     * @param bool $only_requestable_rooms Whether the search shall be limited
+     *     to requestable rooms only (true) or not (false).
+     * @param array $excluded_room_ids
+     *
+     * @param bool $only_fully_available Whether only rooms shall be added to
+     *     the result set that are fully available in the requested time
+     *     ranges (true) or whether rooms shall be added that are only
+     *     partially available in those time ranges (false).
+     *     Defaults to true.
+     *
+     * @return array
+     */
+    public static function findRooms(
+        $room_name = '',
+        $location_id = null,
+        $building_id = null,
+        $properties = [],
+        $time_ranges = [],
+        $order_by = null,
+        $only_requestable_rooms = true,
+        $excluded_room_ids = [],
+        $only_fully_available = true
+    )
+    {
+        $sql = "INNER JOIN resource_categories rc
+                ON resources.category_id = rc.id
+                WHERE rc.class_name IN ( :room_class_names ) ";
+
+        $sql_array = [
+            'room_class_names' => self::getAllRoomClassNames()
+        ];
+
+        if ($only_requestable_rooms) {
+            $sql .= "AND resources.requestable > '0' ";
+        }
+
+        if ($room_name) {
+            $sql .= "AND resources.name LIKE CONCAT('%', :room_name, '%') ";
+            $sql_array['room_name'] = $room_name;
+        }
+
+        if (!empty($properties['room_category_id'])) {
+            $sql .= "AND rc.id = :room_category_id ";
+            $sql_array['room_category_id'] = $properties['room_category_id'];
+        }
+        if ($excluded_room_ids && is_array($excluded_room_ids)) {
+            $sql .= " AND resources.id NOT IN ( :room_ids ) ";
+            $sql_array['room_ids'] = $excluded_room_ids;
+        }
+
+        $sql .= " GROUP BY resources.name ";
+
+        if ($order_by) {
+            $sql .= "ORDER BY " . $order_by . ' ';
+        }
+
+        $rooms = Room::findBySql($sql, $sql_array);
+
+        //We must filter the rooms after we retrieved them since
+        //room bookings can have repetitions that we have to check.
+
+        $filtered_rooms = [];
+        if ($location_id || $building_id) {
+            foreach ($rooms as $room) {
+                //First check if the room lies in the building
+                //before checking its availability:
+
+                $building = $room->findParentByClassName('Building');
+
+                if (!$building) {
+                    //An invalid room: we don't want that either!
+                    continue;
+                }
+
+                if ($building_id) {
+                    if (is_array($building_id)) {
+                        if (in_array($building->id, $building_id)) {
+                            //We have found a room inside the building we are
+                            //looking for.
+                            $filtered_rooms[] = $room;
+                            continue;
+                        }
+                    }
+
+                    if ($building->id == $building_id) {
+                        //We have found a room inside the building we are
+                        //looking for.
+                        $filtered_rooms[] = $room;
+                        continue;
+                    }
+                }
+
+                //If code execution reaches this point, we haven't found
+                //a room yet, because no building has been specified.
+                //We have to look for locations instead, if one is given.
+                if ($location_id) {
+                    $location = $building->findParentByClassName('Location');
+
+                    if ($location_id && ($location->id == $location_id)) {
+                        //The room lies in the location we're searching for.
+                        $filtered_rooms[] = $room;
+                    }
+                }
+            }
+        } else {
+            //There is no selection for a specific building or location.
+            $filtered_rooms = $rooms;
+        }
+
+        $result = [];
+        if (!empty($time_ranges)) {
+
+            //We must check if the room is available:
+            foreach ($filtered_rooms as $room) {
+                $room_is_available = $only_fully_available;
+                foreach ($time_ranges as $time_range) {
+                    if (!$time_range['begin'] || !$time_range['end']) {
+                        //Invalid format.
+                        continue;
+                    }
+                    if ($time_range['begin'] instanceof DateTime) {
+                        $begin = $time_range['begin'];
+                    } else {
+                        $begin = new DateTime();
+                        $begin->setTimestamp($time_range['begin']);
+                    }
+                    if ($time_range['end'] instanceof DateTime) {
+                        $end = $time_range['end'];
+                    } else {
+                        $end = new DateTime();
+                        $end->setTimestamp($time_range['end']);
+                    }
+                    if ($room->isAvailable($begin, $end)) {
+                        if (!$only_fully_available) {
+                            $room_is_available = true;
+                            break;
+                        }
+                    } else {
+                        if ($only_fully_available) {
+                            $room_is_available = false;
+                            break;
+                        }
+                    }
+                }
+                if ($room_is_available) {
+                    $result[] = $room;
+                }
+            }
+        } else {
+            //No time frame has been specified.
+            //All found rooms can be transferred to the result set.
+            $result = $filtered_rooms;
+        }
+
+        //Filter out the special property room_category_id:
+        unset($properties['room_category_id']);
+
+        //Now we filter each room for the properties, if any:
+        if (is_array($properties) && count($properties)) {
+            $old_result = $result;
+            $result = [];
+            $properties = array_filter($properties, function ($property) {
+                return !empty($property);
+            });
+            $required_property_c = count($properties);
+            foreach ($old_result as $room) {
+                $room_property_match = 0;
+                foreach ($properties as $name => $state) {
+                    $room_prop_state = $room->getProperty($name);
+                    if ($room_prop_state === null) {
+                        //No such property.
+                        continue;
+                    }
+                    if (is_array($state)) {
+                        //A range is specified. We must check if the
+                        //value of the property lies in the range.
+                        //Furthermore we must check if only minimum or maximum are
+                        //set or if both are set. Depending on that condition,
+                        //the conditions are different.
+                        if ($state[0] && $state[1]) {
+                            //Minimum and maximum are specified:
+                            if ($room_prop_state >= $state[0] && $room_prop_state <= $state[1]) {
+                                $room_property_match++;
+                            }
+                        } elseif ($state[0]) {
+                            //Only a minimum is given:
+                            if ($room_prop_state >= $state[0]) {
+                                $room_property_match++;
+                            }
+                        } elseif ($state[1]) {
+                            //Only a maximum is given:
+                            if ($room_prop_state <= $state[1]) {
+                                $room_property_match++;
+                            }
+                        }
+                    } elseif ($state) {
+                        if ($room_prop_state == $state) {
+                            $room_property_match++;
+                        }
+                    }
+                }
+                if ($room_property_match === $required_property_c) {
+                    $result[] = $room;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Searches for room bookings where the room is overbooked
+     * in the specified time range.
+     * A room is overbooked if a resource booking exists for that room
+     * which is associated with a course and the amount of course participants
+     * is higher than the amount of seats in the room.
+     *
+     * @param DateTime $begin The begin of the time range.
+     * @param DateTime $end The end of the time range.
+     *
+     * @returns SimpleORMapCollection A collection of overbooked room bookings
+     *     as ResourceBooking objects.
+     */
+    public static function findOverbookedRoomBookings(DateTime $begin, DateTime $end)
+    {
+        //First we must check if $begin and $end specify a valid time range:
+        if ($end <= $begin) {
+            throw new InvalidArgumentException(
+                _('Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!')
+            );
+        }
+
+        //Now we query all room resources together with courses and
+        //resource bookings:
+
+        $found_bookings = ResourceBooking::findBySql(
+            "INNER JOIN resources
+                ON resource_bookings.resource_id = resources.id
+                INNER JOIN resource_categories
+                ON resources.category_id = resource_categories.id
+                INNER JOIN resource_properties
+                ON resources.id = resource_properties.resource_id
+                INNER JOIN resource_property_definitions rpd
+                ON resource_properties.property_id = rpd.property_id
+                WHERE TRUE"
+        );
+
+        return $found_bookings;
+    }
+
+
+    /**
+     * Retrieves all properties that are bound to room resource categories
+     * or room resources directly.
+     *
+     * @param bool $only_searchable Whether only searchable properties
+     *     shall be returned (true) or all properties shall be returned (false).
+     *     Defaults to false.
+     *
+     * @param string[] $excluded_properties An array containing the names
+     *     of the properties that shall be excluded from the result set.
+     *
+     * @returns ResourcePropertyDefinition[] An array of
+     *     ResourcePropertyDefinition objects.
+     */
+    public static function getAllRoomPropertyDefinitions(
+        $only_searchable = false,
+        $excluded_properties = []
+    )
+    {
+        if ($excluded_properties) {
+            if (!is_array($excluded_properties)) {
+                $excluded_properties = [$excluded_properties];
+            }
+        }
+
+        $sql = "INNER JOIN resource_category_properties rcp
+            USING (property_id)
+            INNER JOIN resource_categories rc
+            ON rcp.category_id = rc.id
+            WHERE
+            rc.class_name IN ( :room_class_names ) ";
+        $sql_array = [
+            'room_class_names' => self::getAllRoomClassNames()
+        ];
+
+        if ($only_searchable) {
+            $sql .= "AND resource_property_definitions.searchable = '1' ";
+        }
+
+        if ($excluded_properties) {
+            $sql .= "AND resource_property_definitions.name NOT IN (
+                :excluded_properties
+                ) ";
+            $sql_array['excluded_properties'] = $excluded_properties;
+        }
+
+        $sql .= "GROUP BY
+            resource_property_definitions.property_id
+            ORDER BY
+            resource_property_definitions.name ASC,
+            resource_property_definitions.mkdate ASC;";
+
+        return ResourcePropertyDefinition::findBySql(
+            $sql, $sql_array
+        );
+    }
+
+
+    /**
+     * Returns the names of all hierarchy elements from the location to the
+     * specified room.
+     *
+     * @param Room $room The room to start with.
+     *
+     * @param bool $all_items Whether to include all resource item names
+     *     while traversing the tree upwards (true) or to only include the
+     *     names of the room, the building and the location (false).
+     *
+     * @returns string[] An array with the names of the hierarchy elements,
+     *     starting with the location name.
+     */
+    public static function getHierarchyNames(Room $room, $all_items = false)
+    {
+        $names = [$room->name];
+
+        if ($all_items) {
+            return ResourceManager::getHierarchyNames($room);
+        } else {
+            $building = $room->building;
+            if ($building instanceof Building) {
+                $names[] = $building->name;
+
+                $location = $building->location;
+                if ($location instanceof Location) {
+                    $names[] = $location->name;
+                }
+            }
+        }
+        return array_reverse($names);
+    }
+
+
+    /**
+     * Groups rooms by their location and building.
+     *
+     * @param Room[] $rooms An array of rooms that shall be grouped.
+     *
+     * @returns Array[][][] A three dimensional array with the whole
+     *     hierarchy for the specified rooms.
+     *     The array structure is as follows:
+     *     [
+     *         [
+     *             'location' => Location object
+     *             'buildings' => [
+     *                 'building' => Building object
+     *                 'rooms' => Array of room objects.
+     *             ]
+     *         ]
+     *     ]
+     */
+    public static function groupRooms($rooms = [])
+    {
+        $grouped_rooms = [];
+        foreach ($rooms as $room) {
+            if (!$room instanceof Room) {
+                continue;
+            }
+            $building = $room->building;
+            if (!($building instanceof Building)) {
+                //Invalid room
+                continue;
+            }
+            $location = $building->location;
+            if (!($location instanceof Location)) {
+                //Invalid room
+                continue;
+            }
+            if (empty($grouped_rooms[$location->id])) {
+                $grouped_rooms[$location->id] = [
+                    'location' => $location,
+                    'buildings' => []
+                ];
+            }
+            if (empty($grouped_rooms[$location->id]['buildings'][$building->id])) {
+                $grouped_rooms[$location->id]['buildings'][$building->id] = [
+                    'building' => $building,
+                    'rooms' => []
+                ];
+            }
+            $grouped_rooms[$location->id]['buildings'][$building->id]['rooms'][] = $room;
+        }
+
+        return $grouped_rooms;
+    }
+
+
+    /**
+     * @returns string[] A list containing class names of all classes that are
+     *     derived from the Room class and the Room class itself.
+     */
+    public static function getAllRoomClassNames()
+    {
+        $resource_class_names = ResourceManager::getAllResourceClassNames();
+        $room_class_names = [];
+        foreach($resource_class_names as $class_name) {
+            if (is_a($class_name, 'Room', true)) {
+                $room_class_names[] = $class_name;
+            }
+        }
+        return $room_class_names;
+    }
+
+
+    /**
+     * This method creates the SQL data for the methods countRequestableRooms
+     * and findRequestableRooms.
+     *
+     * @param array time_ranges[][] The time ranges in which a requestable room
+     *     must be available to be included in the result set. This is a
+     *     two-dimensional array where the second dimension is an associative
+     *     array with two indexes: "begin" and "end". These can either be
+     *     timestamps or DateTime objects representing the begin and end
+     *     of the time range, respectively.
+     *
+     * @returns array An associative array with two indexes:
+     *     - sql: The SQL query as string.
+     *     - sql_params: An associative array with all parameters for the query.
+     */
+    protected static function getRequestableRoomsSqlData(array $time_ranges = [])
+    {
+        $sql = "INNER JOIN `resource_categories` rc
+                ON `resources`.`category_id` = rc.id ";
+        if ($time_ranges) {
+            $sql .= "INNER JOIN `resource_booking_intervals` rbi
+                     ON `resources`.`id` = rbi.`resource_id` ";
+        }
+        $sql .= "WHERE `rc`.`class_name` IN ( :room_class_names )
+                 AND `resources`.`requestable` > '0' ";
+
+        $sql_params = [
+            'room_class_names' => self::getAllRoomClassNames()
+        ];
+
+        if (!$time_ranges) {
+            $sql .= 'ORDER BY `resources`.`name` ASC';
+            return [
+                'sql' => $sql,
+                'sql_params' => $sql_params
+            ];
+        }
+
+        $sql .= "AND (";
+
+        $i = 1;
+        foreach ($time_ranges as $time_range) {
+            if (!is_array($time_range)) {
+                continue;
+            }
+            if ($time_range['begin'] >= $time_range['end']) {
+                continue;
+            }
+
+            $begin = $time_range['begin'];
+            if ($time_range['begin'] instanceof DateTime) {
+                $begin = $time_range['begin']->getTimestamp();
+            }
+            $end = $time_range['end'];
+            if ($time_range['end'] instanceof DateTime) {
+                $end = $time_range['end']->getTimestamp();
+            }
+
+            if ($i > 1) {
+                $sql .= 'AND ';
+            }
+            // FIXME this checks looks bogus to me
+            $sql .= "(rbi.begin >= :end$i OR rbi.end <= :begin$i)";
+            $sql_params["begin$i"] = $begin;
+            $sql_params["end$i"] = $end;
+
+            $i++;
+        }
+        $sql .= ') GROUP BY `resources`.`id` ORDER BY `resources`.`name` ASC';
+
+        return [
+            'sql' => $sql,
+            'sql_params' => $sql_params
+        ];
+    }
+
+
+    public static function countRequestableRooms(array $time_ranges = [])
+    {
+        $sql_data = self::getRequestableRoomsSqlData($time_ranges);
+        return Room::countBySql($sql_data['sql'], $sql_data['sql_params']);
+    }
+
+
+    public static function findRequestableRooms(array $time_ranges = [])
+    {
+        $sql_data = self::getRequestableRoomsSqlData($time_ranges);
+        return Room::findBySql($sql_data['sql'], $sql_data['sql_params']);
+    }
+}
diff --git a/lib/soap/StudipSoapClient.class.php b/lib/soap/StudipSoapClient.class.php
deleted file mode 100644
index f6c0cad..0000000
--- a/lib/soap/StudipSoapClient.class.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-class StudipSoapClient
-{
-    var $soap_client;
-    var $error;
-    var $faultstring;
-
-    function __construct($path)
-    {
-        require_once("vendor/nusoap/nusoap.php");
-
-        $this->soap_client = new soap_client($path, true);
-        $this->soap_client->soap_defencoding = 'UTF-8';
-        $this->soap_client->decode_utf8 = false;
-        $this->soap_client->setDebugLevel(0);
-
-        $err = $this->soap_client->getError();
-        if ($err)
-            $this->error = "<b>Soap Constructor Error</b><br>" . $err . "<br><br>";
-    }
-
-    function _call($method, $params)
-    {
-        $this->faultstring = "";
-        $result = $this->soap_client->call($method, $params);
-
-        if ($this->soap_client->fault)
-        {
-            $this->faultstring = $result["faultstring"];
-            if (!in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"]))
-                $this->error .= "<b>" . sprintf(_("SOAP-Fehler, Funktion \"%s\":"), $method) . "</b> " . $result["faultstring"] . " (" . $result["faultcode"] . ")<br>";
-        } else {
-            $err = $this->soap_client->getError();
-            if ($err) {
-                $this->error .= "<b>" . sprintf(_("SOAP-Fehler, Funktion \"%s\":"), $method) . "</b> " . $err . "<br>";
-            } else {
-                return $result;
-            }
-        }
-        error_log($this->error);
-        return false;
-    }
-
-    function getError()
-    {
-         $error = $this->error;
-         $this->error = "";
-         if ($error != "")
-             return $error;
-        else
-            return false;
-    }
-}
-?>
diff --git a/lib/soap/StudipSoapClient.php b/lib/soap/StudipSoapClient.php
new file mode 100644
index 0000000..f6c0cad
--- /dev/null
+++ b/lib/soap/StudipSoapClient.php
@@ -0,0 +1,58 @@
+<?
+# Lifter002: TODO
+# Lifter007: TODO
+# Lifter003: TODO
+# Lifter010: TODO
+class StudipSoapClient
+{
+    var $soap_client;
+    var $error;
+    var $faultstring;
+
+    function __construct($path)
+    {
+        require_once("vendor/nusoap/nusoap.php");
+
+        $this->soap_client = new soap_client($path, true);
+        $this->soap_client->soap_defencoding = 'UTF-8';
+        $this->soap_client->decode_utf8 = false;
+        $this->soap_client->setDebugLevel(0);
+
+        $err = $this->soap_client->getError();
+        if ($err)
+            $this->error = "<b>Soap Constructor Error</b><br>" . $err . "<br><br>";
+    }
+
+    function _call($method, $params)
+    {
+        $this->faultstring = "";
+        $result = $this->soap_client->call($method, $params);
+
+        if ($this->soap_client->fault)
+        {
+            $this->faultstring = $result["faultstring"];
+            if (!in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"]))
+                $this->error .= "<b>" . sprintf(_("SOAP-Fehler, Funktion \"%s\":"), $method) . "</b> " . $result["faultstring"] . " (" . $result["faultcode"] . ")<br>";
+        } else {
+            $err = $this->soap_client->getError();
+            if ($err) {
+                $this->error .= "<b>" . sprintf(_("SOAP-Fehler, Funktion \"%s\":"), $method) . "</b> " . $err . "<br>";
+            } else {
+                return $result;
+            }
+        }
+        error_log($this->error);
+        return false;
+    }
+
+    function getError()
+    {
+         $error = $this->error;
+         $this->error = "";
+         if ($error != "")
+             return $error;
+        else
+            return false;
+    }
+}
+?>
diff --git a/lib/soap/StudipSoapClient_PHP5.class.php b/lib/soap/StudipSoapClient_PHP5.class.php
deleted file mode 100644
index 0aafd4a..0000000
--- a/lib/soap/StudipSoapClient_PHP5.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?
-# Lifter002: TODO
-# Lifter010: TODO
-/**
-* Adapter for using php5 ext:soap with Ilias3Soap
-*
-*
-* @author   Andre Noack <noack@data-quest.de>
-* @access   public
-* @package  ELearning-Interface
-*/
-class StudipSoapClient
-{
-    var $soap_client;
-    var $error;
-
-    function __construct($path)
-    {
-        try {
-            $this->soap_client = new SoapClient($path, ['trace' => 0]);
-        } catch (SoapFault $fault) {
-            $this->error = "Soap Constructor Error " . $fault->faultcode . ": ".$fault->faultstring;
-        }
-    }
-
-    function _call($method, $params)
-    {
-        $result = false;
-        if ($this->soap_client instanceOf SoapClient) {
-            $this->faultstring = "";
-            try {
-                $result = $this->soap_client->__soapCall($method, $params);
-            } catch  (SoapFault $fault) {
-                $this->faultstring = $fault->faultstring;
-                if (!in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"])) {
-                    unset($params['password']);
-                    $this->error .= sprintf(_("SOAP-Fehler, Funktion \"%s\":"), $method) . " " . $fault->faultstring . " (" .  $fault->faultcode . ")".print_r($params,1);
-                    error_log($this->error);
-                }
-                $this->soap_client->fault = true;
-                return false;
-            }
-            if (is_object($result)) $result = (array)$result;
-            if (is_array($result)){
-                foreach($result as $index => $one){
-                    if (is_object($one)) $result[$index] = (array)$one;
-                }
-            }
-            $this->soap_client->fault = false;
-        }
-        return $result;
-    }
-
-    function getError()
-    {
-         $error = $this->error;
-         $this->error = "";
-         if ($error != "")
-             return $error;
-        else
-            return false;
-    }
-}
diff --git a/lib/soap/StudipSoapClient_PHP5.php b/lib/soap/StudipSoapClient_PHP5.php
new file mode 100644
index 0000000..0aafd4a
--- /dev/null
+++ b/lib/soap/StudipSoapClient_PHP5.php
@@ -0,0 +1,63 @@
+<?
+# Lifter002: TODO
+# Lifter010: TODO
+/**
+* Adapter for using php5 ext:soap with Ilias3Soap
+*
+*
+* @author   Andre Noack <noack@data-quest.de>
+* @access   public
+* @package  ELearning-Interface
+*/
+class StudipSoapClient
+{
+    var $soap_client;
+    var $error;
+
+    function __construct($path)
+    {
+        try {
+            $this->soap_client = new SoapClient($path, ['trace' => 0]);
+        } catch (SoapFault $fault) {
+            $this->error = "Soap Constructor Error " . $fault->faultcode . ": ".$fault->faultstring;
+        }
+    }
+
+    function _call($method, $params)
+    {
+        $result = false;
+        if ($this->soap_client instanceOf SoapClient) {
+            $this->faultstring = "";
+            try {
+                $result = $this->soap_client->__soapCall($method, $params);
+            } catch  (SoapFault $fault) {
+                $this->faultstring = $fault->faultstring;
+                if (!in_array(mb_strtolower($this->faultstring), ["session not valid","session invalid", "session idled"])) {
+                    unset($params['password']);
+                    $this->error .= sprintf(_("SOAP-Fehler, Funktion \"%s\":"), $method) . " " . $fault->faultstring . " (" .  $fault->faultcode . ")".print_r($params,1);
+                    error_log($this->error);
+                }
+                $this->soap_client->fault = true;
+                return false;
+            }
+            if (is_object($result)) $result = (array)$result;
+            if (is_array($result)){
+                foreach($result as $index => $one){
+                    if (is_object($one)) $result[$index] = (array)$one;
+                }
+            }
+            $this->soap_client->fault = false;
+        }
+        return $result;
+    }
+
+    function getError()
+    {
+         $error = $this->error;
+         $this->error = "";
+         if ($error != "")
+             return $error;
+        else
+            return false;
+    }
+}
diff --git a/public/install.php b/public/install.php
index ffbf90f..9922f84 100644
--- a/public/install.php
+++ b/public/install.php
@@ -19,15 +19,15 @@ require 'composer/autoload.php';
 require 'lib/visual.inc.php';
 require 'lib/functions.php';
 require 'lib/classes/URLHelper.php';
-require 'lib/classes/LayoutMessage.interface.php';
-require 'lib/classes/MessageBox.class.php';
-require 'lib/classes/Request.class.php';
-require 'lib/classes/Interactable.class.php';
-require 'lib/classes/Button.class.php';
-require 'lib/classes/LinkButton.class.php';
+require 'lib/classes/LayoutMessage.php';
+require 'lib/classes/MessageBox.php';
+require 'lib/classes/Request.php';
+require 'lib/classes/Interactable.php';
+require 'lib/classes/Button.php';
+require 'lib/classes/LinkButton.php';
 require 'lib/classes/StudipInstaller.php';
 require 'lib/classes/SystemChecker.php';
-require 'lib/classes/Markup.class.php';
+require 'lib/classes/Markup.php';
 require 'lib/exceptions/AccessDeniedException.php';
 require 'lib/flexi/Factory.php';
 require 'lib/flexi/Template.php';
diff --git a/tests/_support/Helper/StudipDb.php b/tests/_support/Helper/StudipDb.php
index b95e703..8188be1 100644
--- a/tests/_support/Helper/StudipDb.php
+++ b/tests/_support/Helper/StudipDb.php
@@ -5,7 +5,7 @@ namespace Helper;
 use Codeception\Exception\ModuleConfigException;
 use Codeception\Exception\ModuleException;
 
-require_once 'lib/classes/StudipPDO.class.php';
+require_once 'lib/classes/StudipPDO.php';
 
 class StudipDb extends \Codeception\Module
 {
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
index 322883d..e8a911d 100644
--- a/tests/functional/_bootstrap.php
+++ b/tests/functional/_bootstrap.php
@@ -18,7 +18,6 @@ $inc_path .= PATH_SEPARATOR . __DIR__ . '/../..';
 $inc_path .= PATH_SEPARATOR . __DIR__ . '/../../config';
 ini_set('include_path', $inc_path);
 
-require 'lib/classes/StudipAutoloader.php';
 require 'lib/helpers.php';
 require 'lib/functions.php';
 require_once 'lib/language.inc.php';
@@ -27,27 +26,6 @@ require 'lib/messaging.inc.php';
 
 $STUDIP_BASE_PATH = realpath(dirname(__FILE__) . '/../..');
 
-StudipAutoloader::register();
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/calendar', 'Studip\\Calendar');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes', 'Studip');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes/cache');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/classes/cache', 'Studip');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/exceptions/resources');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/flexi', 'Flexi');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/filesystem');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/migrations');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/models');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/models/resources');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/phplib');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/raumzeit');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/resources');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/plugins/core');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/modules');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/plugins/db');
-StudipAutoloader::addAutoloadPath($STUDIP_BASE_PATH . '/lib/plugins/engine');
-
 // load config-variables
 $added_configs = [];
 StudipFileloader::load(
diff --git a/tests/jsonapi/_bootstrap.php b/tests/jsonapi/_bootstrap.php
index 7987b34..ea99293 100644
--- a/tests/jsonapi/_bootstrap.php
+++ b/tests/jsonapi/_bootstrap.php
@@ -27,6 +27,8 @@ $CACHING_ENABLE = false;
 
 date_default_timezone_set('Europe/Berlin');
 
+require_once __DIR__.'/../../composer/autoload.php';
+
 require 'config.inc.php';
 
 require 'lib/helpers.php';
@@ -36,51 +38,6 @@ require 'lib/visual.inc.php';
 require 'lib/calendar_functions.inc.php';
 require 'lib/dates.inc.php';
 
-// Setup autoloading
-require 'lib/classes/StudipAutoloader.php';
-StudipAutoloader::register();
-
-// General classes folders
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/models');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/models/calendar');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/models/resources');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes', 'Studip');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/flexi', 'Flexi');
-
-// Plugins
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/core');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/db');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/engine');
-
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/calendar');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/calendar', 'Studip\\Calendar');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'lib/classes/cache');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'lib/classes/cache', 'Studip');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/calendar/lib');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/exceptions');
-
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/filesystem');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/migrations');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/modules');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/navigation');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/phplib');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/raumzeit');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/resources');
-
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/activities', 'Studip\\Activity');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes/calendar');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes/globalsearch');
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/lib/classes/visibility');
-
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'].'/vendor/oauth-php/library');
-
-// Messy file names
-StudipAutoloader::addClassLookups([
-    'StudipPlugin' => $GLOBALS['STUDIP_BASE_PATH'].'/lib/plugins/core/StudIPPlugin.class.php',
-    'messaging' => $GLOBALS['STUDIP_BASE_PATH'].'/lib/messaging.inc.php',
-]);
-
 $GLOBALS['_fullname_sql'] = [];
 $GLOBALS['_fullname_sql']['full'] = "TRIM(CONCAT(title_front,' ',Vorname,' ',Nachname,IF(title_rear!='',CONCAT(', ',title_rear),'')))";
 $GLOBALS['_fullname_sql']['full_rev'] = "TRIM(CONCAT(Nachname,', ',Vorname,IF(title_front!='',CONCAT(', ',title_front),''),IF(title_rear!='',CONCAT(', ',title_rear),'')))";
@@ -103,6 +60,4 @@ class DB_Seminar extends DB_Sql
     }
 }
 
-require_once __DIR__.'/../../composer/autoload.php';
-
 session_id("test-session");
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index b15eeb0..0cf0f7e 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -29,38 +29,32 @@ $inc_path .= PATH_SEPARATOR . __DIR__ . '/../..';
 $inc_path .= PATH_SEPARATOR . __DIR__ . '/../../config';
 ini_set('include_path', $inc_path);
 
+global $ABSOLUTE_URI_STUDIP,
+    $ASSETS_URL,
+    $CACHING_ENABLE,
+    $CACHING_FILECACHE_PATH,
+    $CANONICAL_RELATIVE_PATH_STUDIP,
+    $DYNAMIC_CONTENT_PATH,
+    $DYNAMIC_CONTENT_URL,
+    $STUDIP_BASE_PATH,
+    $SYMBOL_SHORT,
+    $TMP_PATH,
+    $UPLOAD_PATH;
+
 // load varstream for easier filesystem testing
 require_once 'varstream.php';
 
-define("TEST_FIXTURES_PATH", dirname(__DIR__) . "/_data/");
+define('TEST_FIXTURES_PATH', dirname(__DIR__) . '/_data/');
 
 require __DIR__ . '/../../composer/autoload.php';
 
 global $STUDIP_BASE_PATH;
 $STUDIP_BASE_PATH = realpath(dirname(__DIR__) . '/..');
 
-require 'lib/classes/StudipAutoloader.php';
+require 'lib/helpers.php';
 require 'lib/functions.php';
 require 'lib/visual.inc.php';
 
-StudipAutoloader::setBasePath(realpath(__DIR__ . '/../..'));
-StudipAutoloader::register();
-
-StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
-StudipAutoloader::addAutoloadPath('lib/models');
-StudipAutoloader::addAutoloadPath('lib/classes');
-StudipAutoloader::addAutoloadPath('lib/classes', 'Studip');
-StudipAutoloader::addAutoloadPath('lib/classes/cache', 'Studip');
-StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
-StudipAutoloader::addAutoloadPath('lib/classes/helpbar');
-StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
-StudipAutoloader::addAutoloadPath('lib/exceptions');
-StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
-StudipAutoloader::addAutoloadPath('lib/plugins/engine');
-StudipAutoloader::addAutoloadPath('lib/plugins/core');
-StudipAutoloader::addAutoloadPath('lib/plugins/db');
-StudipAutoloader::addAutoloadPath('lib/trails', 'Trails');
-
 // load config-variables
 $added_configs = [];
 StudipFileloader::load(
@@ -74,16 +68,16 @@ foreach ($added_configs as $key => $value) {
     $GLOBALS[$key] = $value;
 }
 
-$config = Symfony\Component\Yaml\Yaml::parseFile(__DIR__ .'/../unit.suite.yml');
+$config = Symfony\Component\Yaml\Yaml::parseFile(__DIR__ . '/../unit.suite.yml');
 
 // connect to database if configured
 if (isset($config['modules']['config']['Db'])) {
-    DBManager::getInstance()->setConnection('studip',
+    DBManager::getInstance()->setConnection(
+        'studip',
         $config['modules']['config']['Db']['dsn'],
         $config['modules']['config']['Db']['user'],
-        $config['modules']['config']['Db']['password']);
-} else {
-    //DBManager::getInstance()->setConnection('studip', 'sqlite://'. $GLOBALS ,'', '');
+        $config['modules']['config']['Db']['password']
+    );
 }
 
 // Disable caching to fallback to memory cache
@@ -104,17 +98,17 @@ if (!class_exists('StudipTestHelper')) {
             $schemes = [];
 
             foreach ($tables as $db_table) {
-                include TEST_FIXTURES_PATH."simpleormap/$db_table.php";
+                include TEST_FIXTURES_PATH . "simpleormap/$db_table.php";
                 $db_fields = $pk = [];
                 foreach ($result as $rs) {
                     $db_fields[mb_strtolower($rs['name'])] = [
-                        'name'    => $rs['name'],
-                        'null'    => $rs['null'],
+                        'name' => $rs['name'],
+                        'null' => $rs['null'],
                         'default' => $rs['default'],
-                        'type'    => $rs['type'],
-                        'extra'   => $rs['extra']
+                        'type' => $rs['type'],
+                        'extra' => $rs['extra'],
                     ];
-                    if ($rs['key'] == 'PRI'){
+                    if ($rs['key'] == 'PRI') {
                         $pk[] = mb_strtolower($rs['name']);
                     }
                 }
diff --git a/tests/unit/lib/CalendarcolumnClassTest.php b/tests/unit/lib/CalendarcolumnClassTest.php
index 063f97e..d2ac9e0 100644
--- a/tests/unit/lib/CalendarcolumnClassTest.php
+++ b/tests/unit/lib/CalendarcolumnClassTest.php
@@ -9,7 +9,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/calendar/CalendarColumn.class.php';
+require_once 'lib/calendar/CalendarColumn.php';
 
 class CalendarColumnCase extends \Codeception\Test\Unit {
 
diff --git a/tests/unit/lib/CalendarviewClassTest.php b/tests/unit/lib/CalendarviewClassTest.php
index 962cd06..d810575 100644
--- a/tests/unit/lib/CalendarviewClassTest.php
+++ b/tests/unit/lib/CalendarviewClassTest.php
@@ -9,7 +9,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/calendar/CalendarView.class.php';
+require_once 'lib/calendar/CalendarView.php';
 
 class CalendarViewCase extends \Codeception\Test\Unit {
 
diff --git a/tests/unit/lib/VisualTest.php b/tests/unit/lib/VisualTest.php
index 2e75b1f..2ea8334 100644
--- a/tests/unit/lib/VisualTest.php
+++ b/tests/unit/lib/VisualTest.php
@@ -9,9 +9,9 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/classes/SimpleORMap.class.php';
+require_once 'lib/classes/SimpleORMap.php';
 require_once 'lib/visual.inc.php';
-require_once 'lib/classes/Config.class.php';
+require_once 'lib/classes/Config.php';
 
 class VisualFunctionsTest extends \Codeception\Test\Unit
 {
diff --git a/tests/unit/lib/classes/AvatarClassTest.php b/tests/unit/lib/classes/AvatarClassTest.php
index 8172e20..e09a3c2 100644
--- a/tests/unit/lib/classes/AvatarClassTest.php
+++ b/tests/unit/lib/classes/AvatarClassTest.php
@@ -9,7 +9,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/phplib/Seminar_Perm.class.php';
+require_once 'lib/phplib/Seminar_Perm.php';
 
 abstract class AvatarTest extends \Codeception\Test\Unit
 {
diff --git a/tests/unit/lib/classes/MarkupClassTest.php b/tests/unit/lib/classes/MarkupClassTest.php
index d1c35b1..347e453 100644
--- a/tests/unit/lib/classes/MarkupClassTest.php
+++ b/tests/unit/lib/classes/MarkupClassTest.php
@@ -21,15 +21,15 @@
 require_once 'tests/unit/fakeserver.php';
 
 # needed by visual.inc.php
-require_once 'lib/classes/DbView.class.php';
-require_once 'lib/classes/TreeAbstract.class.php';
+require_once 'lib/classes/DbView.php';
+require_once 'lib/classes/TreeAbstract.php';
 
-# needed by Markup.class.php
+# needed by Markup.php
 require_once 'lib/visual.inc.php';
-require_once 'lib/classes/Config.class.php';
+require_once 'lib/classes/Config.php';
 
 # class and functions that are tested by this script
-require_once 'lib/classes/Markup.class.php';
+require_once 'lib/classes/Markup.php';
 
 # Seminar_Session cannot be mocked since it uses static functions.
 # Also, including phplib_local.inc.php, where Seminar_Session is
diff --git a/tests/unit/lib/classes/PluginRepositoryTest.php b/tests/unit/lib/classes/PluginRepositoryTest.php
index 6676b7c..d045d3f 100644
--- a/tests/unit/lib/classes/PluginRepositoryTest.php
+++ b/tests/unit/lib/classes/PluginRepositoryTest.php
@@ -10,7 +10,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/plugins/engine/PluginRepository.class.php';
+require_once 'lib/plugins/engine/PluginRepository.php';
 
 class PluginRepositoryTest extends \Codeception\Test\Unit
 {
diff --git a/vendor/oauth-php/library/session/OAuthSessionAbstract.class.php b/vendor/oauth-php/library/session/OAuthSessionAbstract.class.php
deleted file mode 100644
index dcc80c1..0000000
--- a/vendor/oauth-php/library/session/OAuthSessionAbstract.class.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Abstract base class for OAuthStore implementations
- * 
- * @version $Id$
- * @author Bruno Barberi Gnecco <brunobg@corollarium.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2010 Corollarium Technologies
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * This class is used to store Session information on the server. Most 
- * people will use the $_SESSION based implementation, but you may prefer 
- * a SQL, Memcache or other implementation.
- *
- */
-abstract class OAuthSessionAbstract
-{
-	abstract public function get ( $key );
-	abstract public function set ( $key, $data );
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/session/OAuthSessionAbstract.php b/vendor/oauth-php/library/session/OAuthSessionAbstract.php
new file mode 100644
index 0000000..dcc80c1
--- /dev/null
+++ b/vendor/oauth-php/library/session/OAuthSessionAbstract.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Abstract base class for OAuthStore implementations
+ * 
+ * @version $Id$
+ * @author Bruno Barberi Gnecco <brunobg@corollarium.com>
+ * 
+ * The MIT License
+ * 
+ * Copyright (c) 2010 Corollarium Technologies
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * This class is used to store Session information on the server. Most 
+ * people will use the $_SESSION based implementation, but you may prefer 
+ * a SQL, Memcache or other implementation.
+ *
+ */
+abstract class OAuthSessionAbstract
+{
+	abstract public function get ( $key );
+	abstract public function set ( $key, $data );
+}
+
+?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.class.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.class.php
deleted file mode 100644
index 34ccb42..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.class.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Interface for OAuth signature methods
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 8, 2008 12:04:35 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-abstract class OAuthSignatureMethod
-{
-	/**
-	 * Return the name of this signature
-	 * 
-	 * @return string
-	 */
-	abstract public function name();
-	
-	/**
-	 * Return the signature for the given request
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string  
-	 */
-	abstract public function signature ( $request, $base_string, $consumer_secret, $token_secret );
-
-	/**
-	 * Check if the request signature corresponds to the one calculated for the request.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string	data to be signed, usually the base string, can be a request body
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature		from the request, still urlencoded
-	 * @return string
-	 */
-	abstract public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature );
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php
new file mode 100644
index 0000000..34ccb42
--- /dev/null
+++ b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Interface for OAuth signature methods
+ * 
+ * @version $Id$
+ * @author Marc Worrell <marcw@pobox.com>
+ * @date  Sep 8, 2008 12:04:35 PM
+ * 
+ * The MIT License
+ * 
+ * Copyright (c) 2007-2008 Mediamatic Lab
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+abstract class OAuthSignatureMethod
+{
+	/**
+	 * Return the name of this signature
+	 * 
+	 * @return string
+	 */
+	abstract public function name();
+	
+	/**
+	 * Return the signature for the given request
+	 * 
+	 * @param OAuthRequest request
+	 * @param string base_string
+	 * @param string consumer_secret
+	 * @param string token_secret
+	 * @return string  
+	 */
+	abstract public function signature ( $request, $base_string, $consumer_secret, $token_secret );
+
+	/**
+	 * Check if the request signature corresponds to the one calculated for the request.
+	 * 
+	 * @param OAuthRequest request
+	 * @param string base_string	data to be signed, usually the base string, can be a request body
+	 * @param string consumer_secret
+	 * @param string token_secret
+	 * @param string signature		from the request, still urlencoded
+	 * @return string
+	 */
+	abstract public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature );
+}
+
+
+/* vi:set ts=4 sts=4 sw=4 binary noeol: */
+
+?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreAbstract.class.php b/vendor/oauth-php/library/store/OAuthStoreAbstract.class.php
deleted file mode 100644
index 0b240ee..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreAbstract.class.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * Abstract base class for OAuthStore implementations
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-abstract class OAuthStoreAbstract
-{
-	abstract public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' );
-	abstract public function getSecretsForSignature ( $uri, $user_id );
-	abstract public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' );
-	abstract public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() );
-
-	abstract public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getServer( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getServerForUri ( $uri, $user_id );
-	abstract public function listServerTokens ( $user_id );
-	abstract public function countServerTokens ( $consumer_key );
-	abstract public function getServerToken ( $consumer_key, $token, $user_id );
-	abstract public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL );	
-	abstract public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false );
-	abstract public function listServers ( $q = '', $user_id );
-	abstract public function updateServer ( $server, $user_id, $user_is_admin = false );
-
-	abstract public function updateConsumer ( $consumer, $user_id, $user_is_admin = false );
-	abstract public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getConsumerStatic ();
-
-	abstract public function addConsumerRequestToken ( $consumer_key, $options = array() );
-	abstract public function getConsumerRequestToken ( $token );
-	abstract public function deleteConsumerRequestToken ( $token );
-	abstract public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' );
-	abstract public function countConsumerAccessTokens ( $consumer_key );
-	abstract public function exchangeConsumerRequestForAccessToken ( $token, $options = array() );
-	abstract public function getConsumerAccessToken ( $token, $user_id );
-	abstract public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false );
-	abstract public function setConsumerAccessTokenTtl ( $token, $ttl );
-	
-	abstract public function listConsumers ( $user_id );
-	abstract public function listConsumerApplications( $begin = 0, $total = 25 ); 
-	abstract public function listConsumerTokens ( $user_id );
-
-	abstract public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce );
-	
-	abstract public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null );
-	abstract public function listLog ( $options, $user_id );
-	
-	abstract public function install ();	
-	
-	/**
-	 * Fetch the current static consumer key for this site, create it when it was not found.
-	 * The consumer secret for the consumer key is always empty.
-	 * 
-	 * @return string	consumer key 
-	 */
-	
-	
-	/* ** Some handy utility functions ** */
-	
-	/**
-	 * Generate a unique key
-	 * 
-	 * @param boolean unique	force the key to be unique
-	 * @return string
-	 */
-	public function generateKey ( $unique = false )
-	{
-		$key = md5(uniqid(rand(), true));
-		if ($unique)
-		{
-			list($usec,$sec) = explode(' ',microtime());
-			$key .= dechex($usec).dechex($sec);
-		}
-		return $key;
-	}
-
-	/**
-	 * Check to see if a string is valid utf8
-	 * 
-	 * @param string $s
-	 * @return boolean
-	 */
-	protected function isUTF8 ( $s )
-	{
-		return preg_match('%(?:
-	       [\xC2-\xDF][\x80-\xBF]              # non-overlong 2-byte
-	       |\xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
-	       |[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-	       |\xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
-	       |\xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-	       |[\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-	       |\xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-	       )+%xs', $s);
-	}
-	
-	
-	/**
-	 * Make a string utf8, replacing all non-utf8 chars with a '.'
-	 * 
-	 * @param string
-	 * @return string
-	 */
-	protected function makeUTF8 ( $s )
-	{
-		if (function_exists('iconv'))
-		{
-			do
-			{
-				$ok   = true;
-				$text = @iconv('UTF-8', 'UTF-8//TRANSLIT', $s);
-				if (strlen($text) != strlen($s))
-				{
-					// Remove the offending character...
-					$s  = $text . '.' . substr($s, strlen($text) + 1);
-					$ok = false;
-				}
-			}
-			while (!$ok);
-		}
-		return $s;
-	}
-	
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreAbstract.php b/vendor/oauth-php/library/store/OAuthStoreAbstract.php
new file mode 100644
index 0000000..0b240ee
--- /dev/null
+++ b/vendor/oauth-php/library/store/OAuthStoreAbstract.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Abstract base class for OAuthStore implementations
+ * 
+ * @version $Id$
+ * @author Marc Worrell <marcw@pobox.com>
+ * 
+ * The MIT License
+ * 
+ * Copyright (c) 2007-2008 Mediamatic Lab
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+abstract class OAuthStoreAbstract
+{
+	abstract public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' );
+	abstract public function getSecretsForSignature ( $uri, $user_id );
+	abstract public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' );
+	abstract public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() );
+
+	abstract public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false );
+	abstract public function getServer( $consumer_key, $user_id, $user_is_admin = false );
+	abstract public function getServerForUri ( $uri, $user_id );
+	abstract public function listServerTokens ( $user_id );
+	abstract public function countServerTokens ( $consumer_key );
+	abstract public function getServerToken ( $consumer_key, $token, $user_id );
+	abstract public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL );	
+	abstract public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false );
+	abstract public function listServers ( $q = '', $user_id );
+	abstract public function updateServer ( $server, $user_id, $user_is_admin = false );
+
+	abstract public function updateConsumer ( $consumer, $user_id, $user_is_admin = false );
+	abstract public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false );
+	abstract public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false );
+	abstract public function getConsumerStatic ();
+
+	abstract public function addConsumerRequestToken ( $consumer_key, $options = array() );
+	abstract public function getConsumerRequestToken ( $token );
+	abstract public function deleteConsumerRequestToken ( $token );
+	abstract public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' );
+	abstract public function countConsumerAccessTokens ( $consumer_key );
+	abstract public function exchangeConsumerRequestForAccessToken ( $token, $options = array() );
+	abstract public function getConsumerAccessToken ( $token, $user_id );
+	abstract public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false );
+	abstract public function setConsumerAccessTokenTtl ( $token, $ttl );
+	
+	abstract public function listConsumers ( $user_id );
+	abstract public function listConsumerApplications( $begin = 0, $total = 25 ); 
+	abstract public function listConsumerTokens ( $user_id );
+
+	abstract public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce );
+	
+	abstract public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null );
+	abstract public function listLog ( $options, $user_id );
+	
+	abstract public function install ();	
+	
+	/**
+	 * Fetch the current static consumer key for this site, create it when it was not found.
+	 * The consumer secret for the consumer key is always empty.
+	 * 
+	 * @return string	consumer key 
+	 */
+	
+	
+	/* ** Some handy utility functions ** */
+	
+	/**
+	 * Generate a unique key
+	 * 
+	 * @param boolean unique	force the key to be unique
+	 * @return string
+	 */
+	public function generateKey ( $unique = false )
+	{
+		$key = md5(uniqid(rand(), true));
+		if ($unique)
+		{
+			list($usec,$sec) = explode(' ',microtime());
+			$key .= dechex($usec).dechex($sec);
+		}
+		return $key;
+	}
+
+	/**
+	 * Check to see if a string is valid utf8
+	 * 
+	 * @param string $s
+	 * @return boolean
+	 */
+	protected function isUTF8 ( $s )
+	{
+		return preg_match('%(?:
+	       [\xC2-\xDF][\x80-\xBF]              # non-overlong 2-byte
+	       |\xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
+	       |[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+	       |\xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
+	       |\xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
+	       |[\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+	       |\xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
+	       )+%xs', $s);
+	}
+	
+	
+	/**
+	 * Make a string utf8, replacing all non-utf8 chars with a '.'
+	 * 
+	 * @param string
+	 * @return string
+	 */
+	protected function makeUTF8 ( $s )
+	{
+		if (function_exists('iconv'))
+		{
+			do
+			{
+				$ok   = true;
+				$text = @iconv('UTF-8', 'UTF-8//TRANSLIT', $s);
+				if (strlen($text) != strlen($s))
+				{
+					// Remove the offending character...
+					$s  = $text . '.' . substr($s, strlen($text) + 1);
+					$ok = false;
+				}
+			}
+			while (!$ok);
+		}
+		return $s;
+	}
+	
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.0


From a088d0e696b11b501e84752c01e153e0bbab8212 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 15:47:06 +0200
Subject: re #4282

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 56db8e1..7098965 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
     },
     "autoload": {
         "psr-4": {
+            "Assets\\": "lib/classes/assets",
             "exTpl\\": "lib/exTpl/",
             "Flexi\\": "lib/flexi/",
             "Studip\\Activity\\": "lib/activities/",
@@ -37,7 +38,6 @@
                 "lib/classes/visibility/",
                 "lib/classes/wiki/",
                 "lib/elearning/",
-                "lib/exTpl', 'exTpl/",
                 "lib/exceptions/",
                 "lib/exceptions/resources/",
                 "lib/extern/",
-- 
cgit v1.0


From a1d75cc7e936954097fc3143a44952b29a5e85e7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 18 Jun 2024 13:57:31 +0000
Subject: fixes #4323

Closes #4323

Merge request studip/studip!3123
---
 templates/_standard_loginform.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/_standard_loginform.php b/templates/_standard_loginform.php
index 57c9cec..4ae9f27 100644
--- a/templates/_standard_loginform.php
+++ b/templates/_standard_loginform.php
@@ -44,7 +44,6 @@ $password_tooltip_text = (string)Config::get()->PASSWORD_TOOLTIP_TEXT;
                    autocomplete="current-password"
                    size="20"
                    required
-                   <?= $loginerror ? 'aria-describedby="messagebox-0"' : ''?>
             >
 
             <i id="password-toggle" tabindex="0" role="button" class="enter-accessible">
-- 
cgit v1.0


From 5bb2d3c4fc8d1497e108d06e97575ea1877a0fd0 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 16:31:35 +0200
Subject: re #4321

---
 docker/studip/Dockerfile     | 1 +
 docker/studip/Dockerfile-Dev | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index 92eb5b5..daa52e6 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -18,6 +18,7 @@ RUN apt update && apt install -y --no-install-recommends \
 
 # Install locales
 RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
+    && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale
 
diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev
index 3c2b2c5..28e112b 100644
--- a/docker/studip/Dockerfile-Dev
+++ b/docker/studip/Dockerfile-Dev
@@ -18,6 +18,7 @@ RUN apt update && apt install -y --no-install-recommends \
 
 # Install locales
 RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
+    && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale
 
-- 
cgit v1.0


From 3087b012948b301473f149b2ba70daa810833410 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 18 Jun 2024 14:50:59 +0000
Subject: fixes #4324

Closes #4324

Merge request studip/studip!3124
---
 templates/layouts/base.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index d7fc1f1..1f2ac32 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -55,7 +55,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
                 'OPENGRAPH_ENABLE'     => Config::get()->OPENGRAPH_ENABLE,
                 'COURSEWARE_CERTIFICATES_ENABLE' => Config::get()->COURSEWARE_CERTIFICATES_ENABLE,
                 'PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED' =>
-                    (bool) User::findCurrent()->getConfiguration()->PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED,
+                    (bool) User::findCurrent()?->getConfiguration()->PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED,
             ]) ?>,
         }
     </script>
@@ -97,7 +97,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
         <system-notification-manager
             id="system-notifications"
             :notifications='<?= htmlReady(json_encode(PageLayout::getMessages())) ?>'
-            placement="<?= User::findCurrent()->getConfiguration()->SYSTEM_NOTIFICATIONS_PLACEMENT ?>"></system-notification-manager>
+            placement="<?= User::findCurrent()?->getConfiguration()->SYSTEM_NOTIFICATIONS_PLACEMENT ?? 'topcenter' ?>"></system-notification-manager>
     </main>
     <!-- End main content -->
 
-- 
cgit v1.0


From 0f00e52fe60de2746233b19f985878f6e6e81002 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 19 Jun 2024 06:17:03 +0000
Subject: fix #4322

Closes #4322

Merge request studip/studip!3122
---
 resources/assets/stylesheets/scss/courseware/blockadder.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/assets/stylesheets/scss/courseware/blockadder.scss b/resources/assets/stylesheets/scss/courseware/blockadder.scss
index b3f4834..f0e993a 100644
--- a/resources/assets/stylesheets/scss/courseware/blockadder.scss
+++ b/resources/assets/stylesheets/scss/courseware/blockadder.scss
@@ -7,6 +7,7 @@
 
     .cw-blockadder-item-wrapper {
         display: flex;
+        position: relative;
         border: solid thin var(--content-color-40);
         max-width: 268px;
 
@@ -54,6 +55,7 @@
 }
 
 .cw-containeradder-item-wrapper {
+    position: relative;
     border: solid thin var(--content-color-40);
     margin-bottom: 4px;
     .cw-sortable-handle {
-- 
cgit v1.0


From 45ed79fbcc9a8c9be7f236b24b4c6a117b48184f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 19 Jun 2024 11:07:26 +0000
Subject: use correct color for globalsearch-clear, fixes #4326

Closes #4326

Merge request studip/studip!3127
---
 templates/globalsearch/searchbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/globalsearch/searchbar.php b/templates/globalsearch/searchbar.php
index 837931c..9aaa335 100644
--- a/templates/globalsearch/searchbar.php
+++ b/templates/globalsearch/searchbar.php
@@ -11,7 +11,7 @@
            aria-expanded="false"
            aria-controls="globalsearch-list"
            aria-label="Suche nach Objekten und Personen in Stud.IP">
-    <?= Icon::create('decline', Icon::ROLE_INACTIVE)->asInput([
+    <?= Icon::create('decline')->asInput([
         'id'    => 'globalsearch-clear',
         'class' => 'hidden-small-down',
         'alt'   => _('Suche zurücksetzen'),
-- 
cgit v1.0


From d4d5c311ec24ddc92c8d9053f9eeb37acf44f395 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 19 Jun 2024 14:13:42 +0000
Subject: remove restapi, fixes #2798

Closes #2798

Merge request studip/studip!1888
---
 RELEASE-NOTES.md                                   |    1 +
 app/controllers/activityfeed.php                   |  189 ++
 app/controllers/admin/api.php                      |  210 ---
 app/controllers/api/authorizations.php             |   58 -
 app/controllers/api/oauth.php                      |  113 --
 app/controllers/resources/ajax.php                 |  243 ++-
 app/routes/Activity.php                            |  168 --
 app/routes/Blubber.php                             |  321 ----
 app/routes/Clipboard.php                           |  193 --
 app/routes/Contacts.php                            |  302 ---
 app/routes/Course.php                              |  242 ---
 app/routes/Discovery.php                           |   27 -
 app/routes/Events.php                              |  186 --
 app/routes/Feedback.php                            |  271 ---
 app/routes/FileSystem.php                          |  684 -------
 app/routes/Forum.php                               |  419 -----
 app/routes/Messages.php                            |  301 ---
 app/routes/News.php                                |  375 ----
 app/routes/ResourceBooking.php                     |  192 --
 app/routes/ResourceCategories.php                  |  349 ----
 app/routes/ResourcePermissions.php                 |  585 ------
 app/routes/ResourceProperties.php                  |  224 ---
 app/routes/ResourceRequest.php                     |  138 --
 app/routes/Resources.php                           |  950 ----------
 app/routes/RoomClipboard.php                       |  322 ----
 app/routes/Schedule.php                            |   71 -
 app/routes/Semester.php                            |  115 --
 app/routes/Studip.php                              |   65 -
 app/routes/User.php                                |  300 ---
 app/routes/UserConfig.php                          |   99 -
 app/routes/Wiki.php                                |  148 --
 app/views/admin/api/config.php                     |   35 -
 app/views/admin/api/edit.php                       |  136 --
 app/views/admin/api/index.php                      |   77 -
 app/views/admin/api/permissions.php                |   62 -
 app/views/api/authorizations/index.php             |   44 -
 app/views/api/oauth/authorize.php                  |   34 -
 app/views/api/oauth/authorized.php                 |    0
 composer.json                                      |    1 -
 composer.lock                                      |  157 +-
 db/migrations/1.127_setup_api.php                  |   71 +-
 db/migrations/5.1.34_activate_semester_routes.php  |    6 +-
 db/migrations/6.0.10_remove_restapi.php            |   63 +
 lib/activities/DocumentsProvider.php               |    3 -
 lib/activities/ForumProvider.php                   |    4 -
 lib/activities/MessageProvider.php                 |    4 -
 lib/activities/NewsProvider.php                    |    2 -
 lib/activities/ParticipantsProvider.php            |    4 -
 lib/activities/ScheduleProvider.php                |    3 -
 lib/activities/WikiProvider.php                    |    6 -
 lib/bootstrap-api.php                              |   40 -
 lib/classes/restapi/ConsumerPermissions.php        |  212 ---
 lib/classes/restapi/Response.php                   |  148 --
 lib/classes/restapi/RouteMap.php                   | 1060 -----------
 lib/classes/restapi/Router.php                     |  665 -------
 lib/classes/restapi/RouterException.php            |   31 -
 lib/classes/restapi/RouterHalt.php                 |   19 -
 lib/classes/restapi/UriTemplate.php                |  115 --
 lib/classes/restapi/UserPermissions.php            |  144 --
 lib/classes/restapi/consumer/Base.php              |  226 ---
 lib/classes/restapi/consumer/HTTP.php              |   50 -
 lib/classes/restapi/consumer/OAuth.php             |  231 ---
 lib/classes/restapi/consumer/Studip.php            |   36 -
 lib/classes/restapi/renderer/DebugRenderer.php     |   57 -
 lib/classes/restapi/renderer/DefaultRenderer.php   |   74 -
 lib/classes/restapi/renderer/JSONRenderer.php      |   35 -
 lib/models/resources/ResourceBooking.php           |   16 +-
 lib/models/resources/ResourceRequest.php           |   60 +-
 lib/modules/ActivityFeed.php                       |   24 -
 lib/navigation/AdminNavigation.php                 |    4 -
 lib/navigation/ProfileNavigation.php               |    4 -
 lib/plugins/core/RESTAPIPlugin.php                 |   26 -
 public/api.php                                     |  103 -
 .../assets/javascripts/bootstrap/resources.js      |   67 +-
 resources/assets/javascripts/init.js               |    3 -
 resources/assets/javascripts/lib/activityfeed.js   |   53 +-
 resources/assets/javascripts/lib/fullcalendar.js   |    9 +-
 resources/assets/javascripts/lib/resources.js      |   45 +-
 resources/assets/javascripts/lib/restapi.js        |   12 -
 vendor/oauth-php/LICENSE                           |   22 -
 vendor/oauth-php/README                            |    1 -
 vendor/oauth-php/example/client/googledocs.php     |  109 --
 vendor/oauth-php/example/client/opera.php          |  125 --
 vendor/oauth-php/example/client/twolegged.php      |   67 -
 vendor/oauth-php/example/client/twoleggedtest.php  |   78 -
 .../oauth-php/example/client/twoleggedtwitter.php  |   67 -
 vendor/oauth-php/example/server/INSTALL            |   53 -
 vendor/oauth-php/example/server/core/init.php      |  128 --
 .../example/server/core/templates/inc/footer.tpl   |    2 -
 .../example/server/core/templates/inc/header.tpl   |    2 -
 .../example/server/core/templates/index.tpl        |   13 -
 .../example/server/core/templates/logon.tpl        |   21 -
 .../example/server/core/templates/register.tpl     |   41 -
 vendor/oauth-php/example/server/www/hello.php      |   65 -
 vendor/oauth-php/example/server/www/index.php      |   37 -
 vendor/oauth-php/example/server/www/logon.php      |   55 -
 vendor/oauth-php/example/server/www/oauth.php      |   77 -
 vendor/oauth-php/example/server/www/register.php   |   29 -
 .../oauth-php/example/server/www/services.xrds.php |   71 -
 vendor/oauth-php/library/OAuthDiscovery.php        |  227 ---
 vendor/oauth-php/library/OAuthException2.php       |   50 -
 vendor/oauth-php/library/OAuthRequest.php          |  854 ---------
 vendor/oauth-php/library/OAuthRequestLogger.php    |  314 ----
 vendor/oauth-php/library/OAuthRequestSigner.php    |  215 ---
 vendor/oauth-php/library/OAuthRequestVerifier.php  |  306 ---
 vendor/oauth-php/library/OAuthRequester.php        |  543 ------
 vendor/oauth-php/library/OAuthServer.php           |  333 ----
 vendor/oauth-php/library/OAuthSession.php          |   86 -
 vendor/oauth-php/library/OAuthStore.php            |   91 -
 .../library/body/OAuthBodyContentDisposition.php   |  129 --
 .../library/body/OAuthBodyMultipartFormdata.php    |  143 --
 vendor/oauth-php/library/discovery/xrds_parse.php  |  304 ---
 vendor/oauth-php/library/discovery/xrds_parse.txt  |  101 -
 .../library/session/OAuthSessionAbstract.php       |   44 -
 .../library/session/OAuthSessionSESSION.php        |   63 -
 .../signature_method/OAuthSignatureMethod.php      |   69 -
 .../OAuthSignatureMethod_HMAC_SHA1.php             |  115 --
 .../OAuthSignatureMethod_HMAC_SHA256.php           |   81 -
 .../signature_method/OAuthSignatureMethod_MD5.php  |   95 -
 .../OAuthSignatureMethod_PLAINTEXT.php             |   80 -
 .../OAuthSignatureMethod_RSA_SHA1.php              |  139 --
 vendor/oauth-php/library/store/OAuthStore2Leg.php  |  118 --
 .../oauth-php/library/store/OAuthStoreAbstract.php |  151 --
 .../oauth-php/library/store/OAuthStoreAnyMeta.php  |  264 ---
 vendor/oauth-php/library/store/OAuthStoreMySQL.php |  245 ---
 .../oauth-php/library/store/OAuthStoreMySQLi.php   |  306 ---
 .../oauth-php/library/store/OAuthStoreOracle.php   | 1541 ---------------
 vendor/oauth-php/library/store/OAuthStorePDO.php   |  274 ---
 .../library/store/OAuthStorePostgreSQL.php         | 1981 --------------------
 vendor/oauth-php/library/store/OAuthStoreSQL.php   | 1843 ------------------
 .../oauth-php/library/store/OAuthStoreSession.php  |  157 --
 vendor/oauth-php/library/store/mysql/install.php   |   32 -
 vendor/oauth-php/library/store/mysql/mysql.sql     |  240 ---
 .../store/oracle/OracleDB/1_Tables/TABLES.sql      |  114 --
 .../oracle/OracleDB/2_Sequences/SEQUENCES.sql      |    9 -
 .../3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc |   71 -
 .../oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc    |   31 -
 .../OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc  |   55 -
 .../3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc    |   32 -
 .../3_Procedures/SP_CHECK_SERVER_NONCE.prc         |   82 -
 .../3_Procedures/SP_CONSUMER_STATIC_SAVE.prc       |   28 -
 .../SP_COUNT_CONSUMER_ACCESS_TOKEN.prc             |   27 -
 .../3_Procedures/SP_COUNT_SERVICE_TOKENS.prc       |   28 -
 .../OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc   |   35 -
 .../OracleDB/3_Procedures/SP_DELETE_SERVER.prc     |   35 -
 .../3_Procedures/SP_DELETE_SERVER_TOKEN.prc        |   37 -
 .../3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc  |   33 -
 .../3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc |   25 -
 .../SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc             |   96 -
 .../OracleDB/3_Procedures/SP_GET_CONSUMER.prc      |   41 -
 .../3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc  |   43 -
 .../3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc |   41 -
 .../3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc |   25 -
 .../3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc  |   43 -
 .../3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc     |   52 -
 .../oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc |   35 -
 .../3_Procedures/SP_GET_SERVER_FOR_URI.prc         |   41 -
 .../OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc  |   45 -
 .../3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc   |   47 -
 .../OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc    |   41 -
 .../3_Procedures/SP_LIST_CONSUMER_TOKENS.prc       |   43 -
 .../oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc   |   75 -
 .../OracleDB/3_Procedures/SP_LIST_SERVERS.prc      |   66 -
 .../3_Procedures/SP_LIST_SERVER_TOKENS.prc         |   45 -
 .../3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc |   28 -
 .../3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc       |   29 -
 .../OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc   |   40 -
 .../OracleDB/3_Procedures/SP_UPDATE_SERVER.prc     |  139 --
 vendor/oauth-php/library/store/oracle/install.php  |   28 -
 .../oauth-php/library/store/postgresql/pgsql.sql   |  166 --
 .../oauth-php/test/discovery/xrds-fireeagle.xrds   |   78 -
 .../test/discovery/xrds-getsatisfaction.xrds       |   73 -
 vendor/oauth-php/test/discovery/xrds-magnolia.xrds |   81 -
 vendor/oauth-php/test/oauth_test.php               |  188 --
 174 files changed, 628 insertions(+), 26382 deletions(-)
 delete mode 100644 app/controllers/admin/api.php
 delete mode 100644 app/controllers/api/authorizations.php
 delete mode 100644 app/controllers/api/oauth.php
 delete mode 100644 app/routes/Activity.php
 delete mode 100644 app/routes/Blubber.php
 delete mode 100644 app/routes/Clipboard.php
 delete mode 100644 app/routes/Contacts.php
 delete mode 100644 app/routes/Course.php
 delete mode 100644 app/routes/Discovery.php
 delete mode 100644 app/routes/Events.php
 delete mode 100644 app/routes/Feedback.php
 delete mode 100644 app/routes/FileSystem.php
 delete mode 100644 app/routes/Forum.php
 delete mode 100644 app/routes/Messages.php
 delete mode 100644 app/routes/News.php
 delete mode 100644 app/routes/ResourceBooking.php
 delete mode 100644 app/routes/ResourceCategories.php
 delete mode 100644 app/routes/ResourcePermissions.php
 delete mode 100644 app/routes/ResourceProperties.php
 delete mode 100644 app/routes/ResourceRequest.php
 delete mode 100644 app/routes/Resources.php
 delete mode 100644 app/routes/RoomClipboard.php
 delete mode 100644 app/routes/Schedule.php
 delete mode 100644 app/routes/Semester.php
 delete mode 100644 app/routes/Studip.php
 delete mode 100644 app/routes/User.php
 delete mode 100644 app/routes/UserConfig.php
 delete mode 100644 app/routes/Wiki.php
 delete mode 100644 app/views/admin/api/config.php
 delete mode 100644 app/views/admin/api/edit.php
 delete mode 100644 app/views/admin/api/index.php
 delete mode 100644 app/views/admin/api/permissions.php
 delete mode 100644 app/views/api/authorizations/index.php
 delete mode 100644 app/views/api/oauth/authorize.php
 delete mode 100644 app/views/api/oauth/authorized.php
 create mode 100644 db/migrations/6.0.10_remove_restapi.php
 delete mode 100644 lib/bootstrap-api.php
 delete mode 100644 lib/classes/restapi/ConsumerPermissions.php
 delete mode 100644 lib/classes/restapi/Response.php
 delete mode 100644 lib/classes/restapi/RouteMap.php
 delete mode 100644 lib/classes/restapi/Router.php
 delete mode 100644 lib/classes/restapi/RouterException.php
 delete mode 100644 lib/classes/restapi/RouterHalt.php
 delete mode 100644 lib/classes/restapi/UriTemplate.php
 delete mode 100644 lib/classes/restapi/UserPermissions.php
 delete mode 100644 lib/classes/restapi/consumer/Base.php
 delete mode 100644 lib/classes/restapi/consumer/HTTP.php
 delete mode 100644 lib/classes/restapi/consumer/OAuth.php
 delete mode 100644 lib/classes/restapi/consumer/Studip.php
 delete mode 100644 lib/classes/restapi/renderer/DebugRenderer.php
 delete mode 100644 lib/classes/restapi/renderer/DefaultRenderer.php
 delete mode 100644 lib/classes/restapi/renderer/JSONRenderer.php
 delete mode 100644 lib/plugins/core/RESTAPIPlugin.php
 delete mode 100644 public/api.php
 delete mode 100644 resources/assets/javascripts/lib/restapi.js
 delete mode 100644 vendor/oauth-php/LICENSE
 delete mode 100644 vendor/oauth-php/README
 delete mode 100644 vendor/oauth-php/example/client/googledocs.php
 delete mode 100644 vendor/oauth-php/example/client/opera.php
 delete mode 100644 vendor/oauth-php/example/client/twolegged.php
 delete mode 100644 vendor/oauth-php/example/client/twoleggedtest.php
 delete mode 100644 vendor/oauth-php/example/client/twoleggedtwitter.php
 delete mode 100644 vendor/oauth-php/example/server/INSTALL
 delete mode 100644 vendor/oauth-php/example/server/core/init.php
 delete mode 100644 vendor/oauth-php/example/server/core/templates/inc/footer.tpl
 delete mode 100644 vendor/oauth-php/example/server/core/templates/inc/header.tpl
 delete mode 100644 vendor/oauth-php/example/server/core/templates/index.tpl
 delete mode 100644 vendor/oauth-php/example/server/core/templates/logon.tpl
 delete mode 100644 vendor/oauth-php/example/server/core/templates/register.tpl
 delete mode 100644 vendor/oauth-php/example/server/www/hello.php
 delete mode 100644 vendor/oauth-php/example/server/www/index.php
 delete mode 100644 vendor/oauth-php/example/server/www/logon.php
 delete mode 100644 vendor/oauth-php/example/server/www/oauth.php
 delete mode 100644 vendor/oauth-php/example/server/www/register.php
 delete mode 100644 vendor/oauth-php/example/server/www/services.xrds.php
 delete mode 100644 vendor/oauth-php/library/OAuthDiscovery.php
 delete mode 100644 vendor/oauth-php/library/OAuthException2.php
 delete mode 100644 vendor/oauth-php/library/OAuthRequest.php
 delete mode 100644 vendor/oauth-php/library/OAuthRequestLogger.php
 delete mode 100644 vendor/oauth-php/library/OAuthRequestSigner.php
 delete mode 100644 vendor/oauth-php/library/OAuthRequestVerifier.php
 delete mode 100644 vendor/oauth-php/library/OAuthRequester.php
 delete mode 100644 vendor/oauth-php/library/OAuthServer.php
 delete mode 100644 vendor/oauth-php/library/OAuthSession.php
 delete mode 100644 vendor/oauth-php/library/OAuthStore.php
 delete mode 100644 vendor/oauth-php/library/body/OAuthBodyContentDisposition.php
 delete mode 100644 vendor/oauth-php/library/body/OAuthBodyMultipartFormdata.php
 delete mode 100644 vendor/oauth-php/library/discovery/xrds_parse.php
 delete mode 100644 vendor/oauth-php/library/discovery/xrds_parse.txt
 delete mode 100644 vendor/oauth-php/library/session/OAuthSessionAbstract.php
 delete mode 100644 vendor/oauth-php/library/session/OAuthSessionSESSION.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA256.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod_MD5.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php
 delete mode 100644 vendor/oauth-php/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStore2Leg.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreAbstract.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreAnyMeta.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreMySQL.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreMySQLi.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreOracle.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStorePDO.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStorePostgreSQL.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreSQL.php
 delete mode 100644 vendor/oauth-php/library/store/OAuthStoreSession.php
 delete mode 100644 vendor/oauth-php/library/store/mysql/install.php
 delete mode 100644 vendor/oauth-php/library/store/mysql/mysql.sql
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc
 delete mode 100644 vendor/oauth-php/library/store/oracle/install.php
 delete mode 100644 vendor/oauth-php/library/store/postgresql/pgsql.sql
 delete mode 100644 vendor/oauth-php/test/discovery/xrds-fireeagle.xrds
 delete mode 100644 vendor/oauth-php/test/discovery/xrds-getsatisfaction.xrds
 delete mode 100644 vendor/oauth-php/test/discovery/xrds-magnolia.xrds
 delete mode 100644 vendor/oauth-php/test/oauth_test.php

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 0995c63..e445aca 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -59,6 +59,7 @@
 - Die Klasse `AuxLockRules` wurde ausgebaut. ([Issue #4187](https://gitlab.studip.de/studip/studip/-/issues/4187))
 - Die Klasse `ProfileModel` wurde gelöscht. Die darin enthaltenen Methoden wurden in den `Profile_Controller` verschoben. ([Issue #4185]https://gitlab.studip.de/studip/studip/-/issues/4185))
 - Die Klasse `StudipTransformFormat` wurde ausgebaut ([Issue #4188](https://gitlab.studip.de/studip/studip/-/issues/4188))
+- Die REST-API (`public/api.php`) wurde zu Stud.IP 5.0 deprecated und nun mit Stud.IP 6.0 entfernt. Als Ersatz steht die JSONAPI zur Verfügung. ([Issue #2798](https://gitlab.studip.de/studip/studip/-/issues/2798))
 
 ## Security related issues
 
diff --git a/app/controllers/activityfeed.php b/app/controllers/activityfeed.php
index 8e81912..ee83826 100644
--- a/app/controllers/activityfeed.php
+++ b/app/controllers/activityfeed.php
@@ -92,4 +92,193 @@ class ActivityfeedController extends AuthenticatedController
 
         PageLayout::setTitle(_('Aktivitäten konfigurieren'));
     }
+
+    public function load_action(): void
+    {
+        $user = User::findCurrent();
+
+        // failsafe einbauen - falls es keine älteren Aktivitäten mehr im System gibt, Abbruch!
+
+        $oldest_activity = \Studip\Activity\Activity::getOldestActivity();
+        $max_age = $oldest_activity ? $oldest_activity->mkdate : time();
+
+
+        $contexts = [];
+
+        // create system context
+        $system_context = new \Studip\Activity\SystemContext($user);
+        $contexts[] = $system_context;
+
+        $contexts[] = new \Studip\Activity\UserContext($user, $user);
+        $user->contacts->each(function ($another_user) use (&$contexts, $user) {
+            $contexts[] = new \Studip\Activity\UserContext($another_user, $user);
+        });
+
+        if (!in_array($user->perms, ['admin','root'])) {
+            // create courses and institutes context
+            foreach (\Course::findMany($user->course_memberships->pluck('seminar_id')) as $course) {
+                $contexts[] = new \Studip\Activity\CourseContext($course, $user);
+            }
+            foreach (\Institute::findMany($user->institute_memberships->pluck('institut_id')) as $institute) {
+                $contexts[] = new \Studip\Activity\InstituteContext($institute, $user);
+            }
+        }
+
+
+        // add filters
+        $filter = new \Studip\Activity\Filter();
+
+        $start = Request::int('start', strtotime('yesterday'));
+        $end   = Request::int('end',   time());
+
+
+        $scrollfrom = Request::int('scrollfrom', false);
+        $filtertype = Request::get('filtertype', '');
+
+        $objectType = Request::get('object_type');
+        $filter->setObjectType($objectType);
+
+        $objectId = Request::get('object_id');
+        $filter->setObjectId($objectId);
+
+        $context = Request::get('context_type');
+        $filter->setContext($context);
+
+        $contextId = Request::get('context_id');
+        $filter->setContextId($contextId);
+
+        if (!empty($filtertype)) {
+            $filter->setType(json_decode($filtertype));
+        }
+
+        if ($scrollfrom) {
+            // shorten "watch-window" by one second to prevent duplication of activities
+            $scrollfrom -= 1;
+
+            if ($scrollfrom > $max_age){
+                $end = $scrollfrom;
+                $start = strtotime('yesterday', $end);
+                $data = [];
+
+                $backtrack = 1;
+
+                while (empty($data)) {
+                    $filter->setStartDate($start);
+                    $filter->setEndDate($end);
+
+                    $data = $this->getStreamData($contexts, $filter);
+
+                    if ($start < $max_age) {
+                        break;
+                    }
+
+                    // move "watch-window" back one day at a time
+                    $end = $start - 1;
+                    $start = strtotime("-{$backtrack} days", $start);
+
+                    // enforce maximum "watch-window", currently 2 weeks
+                    $backtrack = min(14, $backtrack + 1);
+                }
+            } else {
+                $data = false;
+            }
+        } else {
+            $filter->setStartDate($start);
+            $filter->setEndDate($end);
+            $data = $this->getStreamData($contexts, $filter);
+        }
+
+        // set etag for preventing resending the same stuff over and over again
+        $etag = md5(serialize($data));
+        $this->response->add_header('ETag', '"' . $etag . '"');
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $this->etagMatches($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
+            $this->set_status(304);
+            $this->render_nothing();
+            return;
+        }
+        if (isset($_SERVER['HTTP_IF_MATCH']) && !$this->etagMatches($etag, $_SERVER['HTTP_IF_MATCH'])) {
+            $this->set_status(412);
+            $this->render_nothing();
+            return;
+        }
+
+        $this->render_json($data);
+    }
+
+    /**
+     *  private helper function to get stream data for given contexts and filter
+     *
+     * @param $contexts
+     * @param $filter
+     * @return array
+     */
+
+    private function getStreamData($contexts, $filter): array
+    {
+        $stream = new Studip\Activity\Stream($contexts, $filter);
+        $data = $stream->toArray();
+
+        foreach ($data as $key => $act) {
+            $actor = [
+                'type' => $act['actor_type'],
+                'id'   => $act['actor_id'],
+            ];
+
+            if ($act['actor_type'] == 'user') {
+                $a_user = \User::findFull($act['actor_id']);
+                $actor['details'] = $this->getMiniUser($a_user ?: new \User());
+            } elseif ($act['actor_type'] === 'anonymous') {
+                $actor['details'] = [
+                    'name' => _('Anonym'),
+                ];
+            }
+
+            unset($data[$key]['actor_type']);
+            unset($data[$key]['actor_id']);
+
+            $data[$key]['actor'] = $actor;
+        }
+
+        return $data;
+    }
+
+    private function getMiniUser(User $user): array
+    {
+        $avatar = \Avatar::getAvatar($user->id);
+
+        return [
+            'id'              => $user->id,
+            'name'            => $this->getNamesOfUser($user),
+            'avatar_small'    => $avatar->getURL(\Avatar::SMALL),
+            'avatar_medium'   => $avatar->getURL(\Avatar::MEDIUM),
+            'avatar_normal'   => $avatar->getURL(\Avatar::NORMAL),
+            'avatar_original' => $avatar->getURL(\Avatar::NORMAL)
+        ];
+    }
+
+    private function getNamesOfUser(User $user): array
+    {
+        return [
+            'username'  => $user->username,
+            'formatted' => $user->getFullName(),
+            'family'    => $user->nachname,
+            'given'     => $user->vorname,
+            'prefix'    => $user->title_front,
+            'suffix'    => $user->title_rear,
+        ];
+    }
+
+    // Helper method checking if a ETag value list includes the current ETag.
+    private function etagMatches(string $etag, string $list)
+    {
+        if ($list === '*') {
+            return true;
+        }
+
+        return in_array(
+            $etag,
+            preg_split('/\s*,\s*/', $list)
+        );
+    }
+
 }
diff --git a/app/controllers/admin/api.php b/app/controllers/admin/api.php
deleted file mode 100644
index 96adb65..0000000
--- a/app/controllers/admin/api.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- *
- **/
-class Admin_ApiController extends AuthenticatedController
-{
-    /**
-     *
-     **/
-    public function before_filter(&$action, &$args)
-    {
-        parent::before_filter($action, $args);
-
-        require_once 'lib/bootstrap-api.php';
-
-        $GLOBALS['perm']->check('root');
-
-        Navigation::activateItem('/admin/config/api');
-        PageLayout::setTitle(_('API Verwaltung'));
-
-        $this->types = [
-            'website' => _('Website'),
-            'desktop' => _('Herkömmliches Desktopprogramm'),
-            'mobile'  => _('Mobile App')
-        ];
-
-        // Sidebar
-        $views = new ViewsWidget();
-        $views->addLink(_('Registrierte Applikationen'),
-                        $this->url_for('admin/api'))
-              ->setActive($action === 'index');
-        $views->addLink(_('Globale Zugriffseinstellungen'),
-                        $this->url_for('admin/api/permissions'))
-              ->setActive($action == 'permissions');
-        $views->addLink(_('Konfiguration'),
-                        $this->url_for('admin/api/config'))
-              ->setActive($action == 'config');
-        Sidebar::get()->addWidget($views);
-
-        $actions = new ActionsWidget();
-        $actions->addLink(_('Neue Applikation registrieren'),
-                          $this->url_for('admin/api/edit'),
-                          Icon::create('add', 'clickable'))
-                ->asDialog();
-        Sidebar::get()->addWidget($actions);
-    }
-
-    /**
-     *
-     **/
-    public function index_action()
-    {
-        $this->consumers = RESTAPI\Consumer\Base::findAll();
-        $this->routes = RESTAPI\Router::getInstance()->getRoutes(true);
-    }
-
-    /**
-     *
-     **/
-    public function render_keys($id)
-    {
-        $consumer = RESTAPI\Consumer\Base::find($id);
-
-        return [
-            'Consumer Key = ' . $consumer->auth_key,
-            'Consumer Secret = ' . $consumer->auth_secret,
-        ];
-    }
-
-    /**
-     *
-     **/
-    public function keys_action($id)
-    {
-        $details = $this->render_keys($id);
-
-        if (Request::isXhr()) {
-            $this->render_text(implode('<br>', $details));
-        } else {
-            PageLayout::postMessage(MessageBox::info(_('Die Schlüssel in den Details dieser Meldung sollten vertraulich behandelt werden!'), $details, true));
-            $this->redirect('admin/api/#' . $id);
-        }
-    }
-
-    /**
-     *
-     **/
-    public function edit_action($id = null)
-    {
-        $consumer = $id
-                  ? RESTAPI\Consumer\Base::find($id)
-                  : RESTAPI\Consumer\Base::create(Request::option('consumer_type') ?: 'oauth');
-
-        if (Request::submitted('store')) {
-            $errors = [];
-
-            $consumer->active      = (bool) Request::int('active');
-            $consumer->title       = Request::get('title');
-            $consumer->contact     = Request::get('contact');
-            $consumer->email       = Request::get('email');
-            $consumer->callback    = Request::get('callback');
-            $consumer->url         = Request::get('url');
-            $consumer->type        = Request::get('type') ?: null;
-            $consumer->commercial  = Request::int('commercial');
-            $consumer->notes       = Request::get('notes');
-            $consumer->description = Request::get('description');
-
-            if (!empty($errors)) {
-                $message = MessageBox::error(_('Folgende Fehler sind aufgetreten:'), $errors);
-                PageLayout::postMessage($message);
-                return;
-            }
-
-            $consumer->store();
-
-            if ($id) {
-                $message = MessageBox::success(_('Die Applikation wurde erfolgreich gespeichert.'));
-            } else {
-                $details  = $this->render_keys($consumer->id);
-                $message = MessageBox::success(_('Die Applikation wurde erfolgreich erstellt, die Schlüssel finden Sie in den Details dieser Meldung.'), $details, true);
-            }
-            PageLayout::postMessage($message);
-            $this->redirect('admin/api/index#' . $consumer->id);
-            return;
-        }
-
-        $this->consumer = $consumer;
-        $this->id = $id;
-    }
-
-    /**
-     *
-     **/
-    public function toggle_action($id, $state = null)
-    {
-        $consumer = RESTAPI\Consumer\Base::find($id);
-
-        $consumer->active = $state === null ? !$consumer->active : ($state === 'on');
-        $consumer->store();
-
-        $message = $state
-                 ? _('Die Applikation wurde erfolgreich aktiviert.')
-                 : _('Die Applikation wurde erfolgreich deaktiviert.');
-
-        PageLayout::postMessage(MessageBox::success($message));
-        $this->redirect('admin/api/#' . $consumer->id);
-    }
-
-    /**
-     *
-     **/
-    public function delete_action($id)
-    {
-        if (!Request::isPost()) {
-            throw new MethodNotAllowedException();
-        }
-        if ($consumer = RESTAPI\Consumer\Base::find($id)) {
-            $consumer->delete();
-
-            PageLayout::postSuccess(_('Die Applikation wurde erfolgreich gelöscht.'));
-        }
-        $this->redirect('admin/api');
-    }
-
-    /**
-     *
-     **/
-    public function permissions_action($consumer_id = null)
-    {
-        if (Request::submitted('store')) {
-            $perms       = Request::getArray('permission');
-            $permissions = RESTAPI\ConsumerPermissions::get($consumer_id ?: 'global');
-
-            foreach ($perms as $route => $methods) {
-                foreach ($methods as $method => $granted) {
-                    $permissions->set(urldecode($route), urldecode($method), (bool)$granted, true);
-                }
-            }
-
-            $permissions->store();
-
-            PageLayout::postMessage(MessageBox::success(_('Die Zugriffsberechtigungen wurden erfolgreich gespeichert')));
-            $this->redirect($consumer_id ? 'admin/api' : 'admin/api/permissions');
-            return;
-        }
-
-        $title = $consumer_id ? _('Zugriffsberechtigungen') : _('Globale Zugriffsberechtigungen');
-        $title .= ' - ' . PageLayout::getTitle();
-        PageLayout::setTitle($title);
-
-        $this->consumer_id = $consumer_id;
-        $this->router      = RESTAPI\Router::getInstance();
-        $this->routes      = $this->router->getRoutes(true, false);
-        $this->permissions = RESTAPI\ConsumerPermissions::get($consumer_id ?: 'global');
-        $this->global      = $consumer_id ? RESTAPI\ConsumerPermissions::get('global') : false;
-    }
-
-    public function config_action()
-    {
-        $this->config = Config::get();
-
-        if (Request::isPost()) {
-            $this->config->store('API_ENABLED', Request::int('active', 0));
-            $this->config->store('API_OAUTH_AUTH_PLUGIN', Request::option('auth'));
-
-            PageLayout::postMessage(MessageBox::success(_('Die Einstellungen wurden gespeichert.')));
-            $this->redirect('admin/api/config');
-        }
-    }
-}
diff --git a/app/controllers/api/authorizations.php b/app/controllers/api/authorizations.php
deleted file mode 100644
index 543bc79..0000000
--- a/app/controllers/api/authorizations.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-require_once 'lib/bootstrap-api.php';
-
-/**
-* @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- **/
-class Api_AuthorizationsController extends AuthenticatedController
-{
-    /**
-     *
-     **/
-    public function before_filter(&$action, &$args)
-    {
-        parent::before_filter($action, $args);
-
-        $GLOBALS['perm']->check('autor');
-
-        Navigation::activateItem('/profile/settings/api');
-        PageLayout::setTitle(_('Applikationen'));
-
-        $this->types = [
-            'website' => _('Website'),
-            'program' => _('Herkömmliches Desktopprogramm'),
-            'app'     => _('Mobile App')
-        ];
-    }
-
-    /**
-     *
-     **/
-    public function index_action()
-    {
-        $this->consumers = RESTAPI\UserPermissions::get($GLOBALS['user']->id)->getConsumers();
-        $this->types = [
-            'website' => _('Website'),
-            'program' => _('Herkömmliches Desktopprogramm'),
-            'app'     => _('Mobile App')
-        ];
-
-        $widget = new SidebarWidget();
-        $widget->setTitle(_('Informationen'));
-        $widget->addElement(new WidgetElement(_('Dies sind die Apps, die Zugriff auf Ihren Account haben.')));
-        Sidebar::Get()->addWidget($widget);
-    }
-
-    /**
-     *
-     **/
-    public function revoke_action($id)
-    {
-        $consumer = new RESTAPI\Consumer\OAuth($id);
-        $consumer->revokeAccess($GLOBALS['user']->id);
-
-        PageLayout::postMessage(MessageBox::success(_('Der Applikation wurde der Zugriff auf Ihre Daten untersagt.')));
-        $this->redirect('api/authorizations');
-    }
-}
diff --git a/app/controllers/api/oauth.php b/app/controllers/api/oauth.php
deleted file mode 100644
index bc80c90..0000000
--- a/app/controllers/api/oauth.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-require_once 'lib/bootstrap-api.php';
-
-/**
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- **/
-class Api_OauthController extends StudipController
-{
-    /**
-     *
-     **/
-    public function before_filter(&$action, &$args)
-    {
-        parent::before_filter($action, $args);
-
-        # initialize Stud.IP-Session
-        page_open(['sess' => 'Seminar_Session',
-                        'auth' => 'Seminar_Default_Auth',
-                        'perm' => 'Seminar_Perm',
-                        'user' => 'Seminar_User']);
-
-        $this->set_layout(null);
-    }
-
-    /**
-     *
-     **/
-    public function index_action()
-    {
-        $this->render_text('TODO');
-    }
-
-    /**
-     *
-     **/
-    public function request_token_action()
-    {
-        $server = new OAuthServer();
-        $token = $server->requestToken();
-
-        $this->response->headers = [];
-        $this->render_nothing();
-    }
-
-    /**
-     *
-     **/
-    public function authorize_action()
-    {
-        global $user, $auth;
-
-        $auth_plugin = Config::get()->API_OAUTH_AUTH_PLUGIN;
-        if ($GLOBALS['user']->id === 'nobody' && $auth_plugin !== 'Standard' && !Request::option('sso')) {
-            $params = $_GET;
-            $params['sso'] = strtolower($auth_plugin);
-            $this->redirect($this->url_for('api/oauth/authorize?' . http_build_query($params)));
-            return;
-        } else {
-            $auth->login_if($user->id === 'nobody');
-        }
-
-        $user_id = RESTAPI\Consumer\OAuth::getOAuthId($GLOBALS['user']->id);
-
-        try {
-            $consumer = RESTAPI\Consumer\Base::detectConsumer('oauth', 'request');
-            if (!$consumer) {
-                $this->response->set_status(400, 'No consumer detected');
-                $this->render_nothing();
-                return;
-            }
-
-            if (Request::submitted('allow')) {
-                $result = $consumer->grantAccess($GLOBALS['user']->id);
-
-                $redirect_uri = Request::get('oauth_callback', $consumer->callback);
-
-                if ($redirect_uri) {
-                    $this->redirect($redirect_uri);
-                } else {
-                    // No oauth_callback, show the user the result of the authorization
-                    // ** your code here **
-                    PageLayout::postMessage(MessageBox::success(_('Sie haben der Applikation Zugriff auf Ihre Daten gewährt.')));
-                    $this->redirect('api/authorizations#' . $consumer->auth_key);
-                }
-                return;
-           }
-        } catch (OAuthException2 $e) {
-            // No token to be verified in the request, show a page where the user can enter the token to be verified
-            // **your code here**
-            die('invalid');
-        }
-
-        PageLayout::disableHeader();
-        PageLayout::setTitle(sprintf(_('"%s" bittet um Zugriff'), $consumer->title));
-        $this->set_layout($GLOBALS['template_factory']->open('layouts/base.php'));
-        $this->consumer = $consumer;
-        $this->token    = Request::option('oauth_token');
-        $this->oauth_callback = Request::get('oauth_callback');
-    }
-
-    /**
-     *
-     **/
-    public function access_token_action()
-    {
-        $server = new OAuthServer();
-        $server->accessToken();
-
-        $this->response->headers = [];
-        $this->render_nothing();
-    }
-}
diff --git a/app/controllers/resources/ajax.php b/app/controllers/resources/ajax.php
index 998acaf..cffd878 100644
--- a/app/controllers/resources/ajax.php
+++ b/app/controllers/resources/ajax.php
@@ -16,22 +16,22 @@ class Resources_AjaxController extends AuthenticatedController
 {
     public function toggle_marked_action($request_id)
     {
-        $request = \ResourceRequest::find($request_id);
+        $request = ResourceRequest::find($request_id);
 
         if (!$request) {
             throw new Exception('Resource request object not found!');
         }
 
-        $current_user = \User::findCurrent();
+        $current_user = User::findCurrent();
 
         if ($request->isReadOnlyForUser($current_user)) {
-            throw new \AccessDeniedException();
+            throw new AccessDeniedException();
         }
 
         //Switch to the next marking state or return to the unmarked state
         //if the next marking state would be after the last defined
         //marking state.
-        $request->marked = ($request->marked + 1) % \ResourceRequest::MARKING_STATES;
+        $request->marked = ($request->marked + 1) % ResourceRequest::MARKING_STATES;
         $request->store();
 
         $this->render_json($request->toArray());
@@ -39,46 +39,46 @@ class Resources_AjaxController extends AuthenticatedController
 
     public function get_resource_booking_intervals_action($booking_id)
     {
-        $booking = \ResourceBooking::find($booking_id);
+        $booking = ResourceBooking::find($booking_id);
         if (!$booking) {
             throw new Exception('Resource booking object not found!');
         }
 
         $resource = $booking->resource->getDerivedClassInstance();
-        if (!$resource->bookingPlanVisibleForUser(\User::findCurrent())) {
-            throw new \AccessDeniedException();
+        if (!$resource->bookingPlanVisibleForUser(User::findCurrent())) {
+            throw new AccessDeniedException();
         }
 
         //Get begin and end:
-        $begin_str = \Request::get('begin');
-        $end_str   = \Request::get('end');
+        $begin_str = Request::get('begin');
+        $end_str   = Request::get('end');
         $begin     = null;
         $end       = null;
         if ($begin_str && $end_str) {
             //Try the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
-            $begin = \DateTime::createFromFormat(\DateTime::RFC3339, $begin_str);
-            $end   = \DateTime::createFromFormat(\DateTime::RFC3339, $end_str);
-            if (!($begin instanceof \DateTime) || !($end instanceof \DateTime)) {
-                $tz = new \DateTime();
+            $begin = DateTime::createFromFormat(DateTime::RFC3339, $begin_str);
+            $end   = DateTime::createFromFormat(DateTime::RFC3339, $end_str);
+            if (!($begin instanceof DateTime) || !($end instanceof DateTime)) {
+                $tz = new DateTime();
                 $tz = $tz->getTimezone();
                 //Try the ISO format without timezone:
-                $begin = \DateTime::createFromFormat('Y-m-d\TH:i:s', $begin_str, $tz);
-                $end   = \DateTime::createFromFormat('Y-m-d\TH:i:s', $end_str, $tz);
+                $begin = DateTime::createFromFormat('Y-m-d\TH:i:s', $begin_str, $tz);
+                $end   = DateTime::createFromFormat('Y-m-d\TH:i:s', $end_str, $tz);
             }
         }
 
         $sql      = "booking_id = :booking_id ";
         $sql_data = ['booking_id' => $booking->id];
-        if ($begin instanceof \DateTime && $end instanceof \DateTime) {
+        if ($begin instanceof DateTime && $end instanceof DateTime) {
             $sql               .= "AND begin >= :begin AND end <= :end ";
             $sql_data['begin'] = $begin->getTimestamp();
             $sql_data['end']   = $end->getTimestamp();
         }
-        if (\Request::submitted('exclude_cancelled_intervals')) {
+        if (Request::submitted('exclude_cancelled_intervals')) {
             $sql .= "AND takes_place = '1' ";
         }
         $sql       .= "ORDER BY begin ASC, end ASC";
-        $intervals = \ResourceBookingInterval::findBySql($sql, $sql_data);
+        $intervals = ResourceBookingInterval::findBySql($sql, $sql_data);
 
         $result = [];
         foreach ($intervals as $interval) {
@@ -90,7 +90,7 @@ class Resources_AjaxController extends AuthenticatedController
 
     public function toggle_takes_place_field_action($interval_id)
     {
-        $interval = \ResourceBookingInterval::find($interval_id);
+        $interval = ResourceBookingInterval::find($interval_id);
         if (!$interval) {
             throw new Exception('ResourceBookingInterval object not found!');
         }
@@ -103,13 +103,13 @@ class Resources_AjaxController extends AuthenticatedController
 
         $resource = $resource->getDerivedClassInstance();
 
-        if (!$resource->userHasPermission(\User::findCurrent(), 'autor', [$interval->begin, $interval->end])) {
+        if (!$resource->userHasPermission(User::findCurrent(), 'autor', [$interval->begin, $interval->end])) {
             throw new Exception('You do not have sufficient permissions to modify the interval!');
         }
 
         if (
             !$interval->takes_place
-            && $resource->isAssigned(new \DateTime('@' . $interval->begin), new \DateTime('@' . $interval->end))
+            && $resource->isAssigned(new DateTime('@' . $interval->begin), new DateTime('@' . $interval->end))
         ) {
             throw new Exception('Already booked');
         }
@@ -121,13 +121,14 @@ class Resources_AjaxController extends AuthenticatedController
                 'takes_place' => $interval->takes_place
             ]);
         } else {
-            throw new Exception('Error while storing the interval!');
+            $this->set_status(500);
+            $this->render_text('Error while storing the interval!');
         }
     }
 
     public function get_semester_booking_plan_action($resource_id)
     {
-        $resource = \Resource::find($resource_id);
+        $resource = Resource::find($resource_id);
         if (!$resource) {
             throw new Exception('Resource object not found!');
         }
@@ -143,8 +144,8 @@ class Resources_AjaxController extends AuthenticatedController
         $display_requests     = Request::get('display_requests');
         $display_all_requests = Request::get('display_all_requests');
 
-        $begin = new \DateTime();
-        $end   = new \DateTime();
+        $begin = new DateTime();
+        $end   = new DateTime();
 
         $semester_id = Request::get('semester_id');
 
@@ -194,7 +195,7 @@ class Resources_AjaxController extends AuthenticatedController
                 $requests_sql_params['user_id'] = $current_user->id;
             }
 
-            $requests = \ResourceRequest::findBySql(
+            $requests = ResourceRequest::findBySql(
                 $requests_sql,
                 $requests_sql_params
             );
@@ -207,7 +208,7 @@ class Resources_AjaxController extends AuthenticatedController
             $booking->resource  = $resource;
             $irrelevant_booking = $booking->getRepetitionType() !== 'weekly'
                                   && (
-                                      !\Request::get('display_single_bookings')
+                                      !Request::get('display_single_bookings')
                                       || $booking->end < strtotime('today')
                                   );
             if ($booking->getAssignedUserType() === 'course' && in_array($booking->assigned_course_date->metadate_id, $meta_dates)) {
@@ -261,7 +262,7 @@ class Resources_AjaxController extends AuthenticatedController
 
         $relevant_request = false;
         foreach ($requests as $request) {
-            if ($request->cycle instanceof \SeminarCycleDate) {
+            if ($request->cycle instanceof SeminarCycleDate) {
                 $cycle_dates = $request->cycle->getAllDates();
                 foreach ($cycle_dates as $cycle_date) {
                     $relevant_request = $semester->beginn <= $cycle_date->date
@@ -488,7 +489,7 @@ class Resources_AjaxController extends AuthenticatedController
         $clipboard = Clipboard::find($clipboard_id);
 
         if (!empty($_SESSION['selected_clipboard_id'])) {
-            $clipboard = \Clipboard::find($_SESSION['selected_clipboard_id']);
+            $clipboard = Clipboard::find($_SESSION['selected_clipboard_id']);
         }
         if (!$clipboard) {
             throw new Exception('Clipboard object not found!');
@@ -497,7 +498,7 @@ class Resources_AjaxController extends AuthenticatedController
 
         //Permission check:
         if ($clipboard->user_id !== $current_user->id) {
-            throw new \AccessDeniedException();
+            throw new AccessDeniedException();
         }
 
         $display_requests     = Request::bool('display_requests');
@@ -656,4 +657,186 @@ class Resources_AjaxController extends AuthenticatedController
 
         $this->render_json($data);
     }
+
+    public function move_booking_action($booking_id): void
+    {
+        $booking = ResourceBooking::find($booking_id);
+        if (!$booking) {
+            $this->notFound('Resource booking object not found!');
+            return;
+        }
+
+        $current_user = User::findCurrent();
+
+        if ($booking->isReadOnlyForUser($current_user)) {
+            throw new AccessDeniedException();
+        }
+
+        $resource_id = Request::get('resource_id');
+        $interval_id = Request::get('interval_id');
+
+        $begin = $this->convertDatetime(Request::get('begin'));
+        $end = $this->convertDatetime(Request::get('end'));
+
+        //Check if a specific interval has been moved:
+        if ($interval_id) {
+            $interval = ResourceBookingInterval::findOneBySql(
+                'interval_id = ? AND booking_id = ?',
+                [$interval_id, $booking->id]
+            );
+            if (!$interval) {
+                $this->notFound('Resource booking interval not found!');
+                return;
+            }
+            $interval_begin = new DateTime();
+            $interval_begin->setTimestamp($interval->begin);
+            $interval_end = new DateTime();
+            $interval_end->setTimestamp($interval->end);
+
+            //Calculate the difference from the interval time range
+            //to the time range from the request. That difference
+            //is then applied to the booking.
+            $begin_diff = $interval_begin->diff($begin);
+            $end_diff = $interval_end->diff($end);
+
+            $new_booking_begin = new DateTime();
+            $new_booking_begin->setTimestamp($booking->begin);
+            $new_booking_end = new DateTime();
+            $new_booking_end->setTimestamp($booking->end);
+
+            $new_booking_begin = $new_booking_begin->add($begin_diff);
+            $new_booking_end = $new_booking_end->add($end_diff);
+            //We must substract the preparation time to the begin timestamp
+            //to get the real begin:
+            $real_begin = clone $new_booking_begin;
+            if ($booking->preparation_time > 0) {
+                $real_begin->sub(new DateInterval('PT' . ($booking->preparation_time / 60 ) . 'M'));
+            }
+            $booking->begin = $real_begin->getTimestamp();
+            $booking->end = $new_booking_end->getTimestamp();
+        } else {
+            //We must substract the preparation time to the begin timestamp
+            //to get the real begin:
+            $real_begin = clone $begin;
+            if ($booking->preparation_time > 0) {
+                $real_begin->sub(new DateInterval('PT' . ($booking->preparation_time / 60 ) . 'M'));
+            }
+            $booking->begin = $real_begin->getTimestamp();
+            $booking->end = $end->getTimestamp();
+        }
+        if ($resource_id) {
+            //The resource-ID has changed:
+            //The booking was moved from one resource to another.
+            $booking->resource_id = $resource_id;
+        }
+
+        //Update the booking_user_id field:
+        $booking->booking_user_id = User::findCurrent()->id;
+
+        try {
+            $booking->store();
+
+            if (Request::bool('quiet')) {
+                $this->render_nothing();
+            } else {
+                $this->render_json($booking->toRawArray());
+            }
+        } catch (Exception $e) {
+            $this->set_status(500);
+            $this->render_text($e->getMessage());
+        }
+    }
+
+    public function move_request_action($request_id): void
+    {
+        $request = ResourceRequest::find($request_id);
+        if (!$request) {
+            $this->notFound('Resource request object not found!');
+            return;
+        }
+
+        $current_user = User::findCurrent();
+
+        if ($request->isReadOnlyForUser($current_user)) {
+            throw new AccessDeniedException();
+        }
+
+        $request->begin = $this->convertDatetime(Request::get('begin'));
+        $request->end = $this->convertDatetime(Request::get('end'));
+
+        try {
+            $request->store();
+            $this->renderObject($request);
+        } catch (\Exception $e) {
+            $this->set_status(500);
+            $this->render_text($e->getMessage());
+        }
+    }
+
+    public function semester_week_action($timestamp)
+    {
+        $semester = \Semester::findByTimestamp($timestamp);
+        if (!$semester) {
+            $this->notFound('No semester found for given timestamp');
+            throw new RecordNotFoundException();
+        }
+
+        $timestamp = strtotime('today', $timestamp);
+        $week_begin_timestamp = strtotime('monday this week', $semester->vorles_beginn);
+        $end_date = $semester->vorles_ende;
+
+        $i = 0;
+        $result = [
+            'semester_name' => (string)$semester->name,
+            'week_number' => sprintf(_('KW %u'), date('W', $timestamp)),
+            'current_day' => strftime('%x', $timestamp)
+        ];
+        while ($week_begin_timestamp < $end_date) {
+            $next_week_timestamp = strtotime('+1 week', $week_begin_timestamp);
+            if ($week_begin_timestamp <= $timestamp && $timestamp < $next_week_timestamp) {
+                $result['sem_week'] = sprintf(
+                    _('%u. Vorlesungswoche (ab %s)'),
+                    $i + 1,
+                    strftime('%x', $week_begin_timestamp));
+                break;
+            }
+            $i += 1;
+
+            $week_begin_timestamp = $next_week_timestamp;
+        }
+
+        $this->render_json($result);
+    }
+
+    private function notFound(string $message = ''): void
+    {
+        $this->set_status(404);
+        $this->render_text($message);
+    }
+
+    private function renderObject(SimpleORMap $object): void
+    {
+        if (Request::bool('quiet')) {
+            $this->render_nothing();
+        } else{
+            $this->render_json($object->toArray());
+        }
+    }
+
+    /**
+     * Tries the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
+     */
+    private function convertDatetime(?string $input): ?Datetime
+    {
+        if (!$input) {
+            return null;
+        }
+
+        return DateTime::createFromFormat(DateTime::RFC3339, $input)
+            ?? DateTime::createFromFormat(
+                   'Y-m-d\TH:i:s',
+                   $input,
+                   (new DateTime())->getTimezone()
+               );
+    }
 }
diff --git a/app/routes/Activity.php b/app/routes/Activity.php
deleted file mode 100644
index fadca0f..0000000
--- a/app/routes/Activity.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author      Till Glöggler <tgloeggl@uos.de>
- * @author      André Klaßen <klassen@elan-ev.de>
- * @license     GPL 2 or later
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition user_id ^[a-f0-9]{1,32}$
- */
-class Activity extends \RESTAPI\RouteMap
-{
-    /**
-     * List activities for an user
-     *
-     * @get /user/:user_id/activitystream
-     *
-     * @param string  $user_id   the user to get the activities for
-     *
-     * @return array   the activities as array('collection' => array(...), 'pagination' => array())
-     */
-    public function getActivities($user_id)
-    {
-        // only root can retrieve arbitrary streams
-        if (!$GLOBALS['perm']->have_perm('root') && $GLOBALS['user']->id != $user_id) {
-            $this->error(401);
-        }
-
-        // failsafe einbauen - falls es keine älteren Aktivitäten mehr im System gibt, Abbruch!
-
-        $oldest_activity = \Studip\Activity\Activity::getOldestActivity();
-        $max_age = $oldest_activity ? $oldest_activity->mkdate : time();
-
-
-        $contexts = [];
-
-        $user = \User::find($user_id);
-
-        // create system context
-        $system_context = new \Studip\Activity\SystemContext($user);
-        $contexts[] = $system_context;
-
-        $contexts[] = new \Studip\Activity\UserContext($user, $user);
-        $user->contacts->each(function($another_user) use (&$contexts, $user) {
-            $contexts[] = new \Studip\Activity\UserContext($another_user, $user);
-        });
-
-        if (!in_array($user->perms, ['admin','root'])) {
-            // create courses and institutes context
-            foreach (\Course::findMany($user->course_memberships->pluck('seminar_id')) as $course) {
-                    $contexts[] = new \Studip\Activity\CourseContext($course, $user);
-            }
-            foreach (\Institute::findMany($user->institute_memberships->pluck('institut_id')) as $institute) {
-                $contexts[] = new \Studip\Activity\InstituteContext($institute, $user);
-            }
-        }
-
-
-        // add filters
-        $filter = new \Studip\Activity\Filter();
-
-        $start = \Request::int('start', strtotime('-1 days'));
-        $end   = \Request::int('end',   time());
-
-
-        $scrollfrom = \Request::int('scrollfrom', false);
-        $filtertype = \Request::get('filtertype', '');
-
-        $objectType = \Request::get('object_type');
-        $filter->setObjectType($objectType);
-
-        $objectId = \Request::get('object_id');
-        $filter->setObjectId($objectId);
-
-        $context = \Request::get('context_type');
-        $filter->setContext($context);
-
-        $contextId = \Request::get('context_id');
-        $filter->setContextId($contextId);
-
-        if (!empty($filtertype)) {
-            $filter->setType(json_decode($filtertype));
-        }
-
-        if ($scrollfrom) {
-            // shorten "watch-window" by one second to prevent duplication of activities
-            $scrollfrom -= 1;
-
-            if ($scrollfrom > $max_age){
-                $end = $scrollfrom;
-                $start = strtotime('-1 day', $end);
-                $data = [];
-
-                $backtrack = 1;
-
-                while (empty($data)) {
-                    $filter->setStartDate($start);
-                    $filter->setEndDate($end);
-
-                    $data = $this->getStreamData($contexts, $filter);
-
-                    if ($start < $max_age) {
-                        break;
-                    }
-
-                    // move "watch-window" back one day at a time
-                    $end = $start - 1;
-                    $start = strtotime('-'. $backtrack . ' days', $start);
-
-                    // enforce maximum "watch-window", currently 2 weeks
-                    $backtrack = min (14, $backtrack + 1);
-                }
-            } else {
-                $data = false;
-            }
-        } else {
-
-            $filter->setStartDate($start);
-            $filter->setEndDate($end);
-            $data = $this->getStreamData($contexts, $filter);
-
-        }
-
-        // set etag for preventing resending the same stuff over and over again
-        $this->etag(md5(serialize($data)));
-
-        return $data;
-    }
-
-    /**
-     *  private helper function to get stream data for given contexts and filter
-     *
-     * @param $contexts
-     * @param $filter
-     * @return array
-     */
-
-    private function getStreamData($contexts, $filter)
-    {
-        $stream = new \Studip\Activity\Stream($contexts, $filter);
-        $data = $stream->toArray();
-
-        foreach ($data as $key => $act) {
-            $actor = [
-                'type' => $data[$key]['actor_type'],
-                'id'   => $data[$key]['actor_id']
-            ];
-
-            if ($data[$key]['actor_type'] == 'user') {
-                $a_user = \User::findFull($data[$key]['actor_id']);
-                $actor['details'] = User::getMiniUser($this, $a_user ?: new \User());
-            } elseif ($data[$key]['actor_type'] === 'anonymous') {
-                $actor['details'] = [
-                    'name' => _('Anonym'),
-                ];
-            }
-
-            unset($data[$key]['actor_type']);
-            unset($data[$key]['actor_id']);
-
-            $data[$key]['actor'] = $actor;
-        }
-
-        return $data;
-
-    }
-}
diff --git a/app/routes/Blubber.php b/app/routes/Blubber.php
deleted file mode 100644
index 1445088..0000000
--- a/app/routes/Blubber.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @license GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition course_id ^[a-f0-9]{1,32}$
- * @condition stream_id ^(global|[a-f0-9]{1,32})$
- * @condition user_id ^[a-f0-9]{1,32}$
- * @condition blubber_id ^[a-f0-9]{1,32}$
- */
-class Blubber extends \RESTAPI\RouteMap
-{
-
-    /**
-     * Get content and some comments for a blubber-thread or for the "global" thread all "public" threads.
-     *
-     * @get /blubber/threads/:thread_id
-     * @param string $thread_id   id of the blubber thread or "global" if you want public threads (not comments). Remind the global thread is a virtual thread with a special behaviour.
-     * @return array   the blubber as array
-     */
-    public function getThreadData($thread_id)
-    {
-        if (!$GLOBALS['perm']->have_perm('autor')) {
-            $this->error(401);
-        }
-        $GLOBALS['user']->cfg->store('BLUBBER_DEFAULT_THREAD', $thread_id);
-
-        $thread = new \BlubberThread($thread_id);
-        $thread = \BlubberThread::upgradeThread($thread);
-        if (!$thread->isReadable()) {
-            $this->error(401);
-        }
-
-        $json = $thread->getJSONData(50, null, \Request::get("search"));
-        $thread->markAsRead();
-
-        $this->etag(md5(serialize($json)));
-
-        return $json;
-    }
-
-    /**
-     * Get threads
-     *
-     * @get /blubber/threads
-     * @return array   the stream as array
-     */
-    public function getMyThreads()
-    {
-        $threads_data = [
-            'threads'   => [],
-            'more_down' => 0,
-        ];
-        $limit = \Request::int('limit', 50);
-
-        $threads = \BlubberThread::findMyGlobalThreads(
-            $limit + 1,
-            null,
-            \Request::int('timestamp'),
-            null,
-            \Request::get("search") ?: null
-        );
-        if (count($threads) > $limit) {
-            array_pop($threads);
-            $threads_data['more_down'] = 1;
-        }
-        foreach ($threads as $thread) {
-            $threads_data['threads'][] = [
-                'thread_id' => $thread->getId(),
-                'avatar'    => $thread->getAvatar(),
-                'name'      => $thread->getName(),
-                'timestamp' => (int) $thread->getLatestActivity(),
-            ];
-        }
-        return $threads_data;
-    }
-
-    /**
-     * Write a comment to a thread
-     *
-     * @post /blubber/threads/:thread_id/comments
-     * @param string $thread_id   id of the blubber thread
-     * @return array   the comment as array
-     */
-    public function postComment($thread_id)
-    {
-        if (!$GLOBALS['perm']->have_perm('autor')) {
-            $this->error(401);
-        }
-
-        if (!trim($this->data['content'])) {
-            $this->error(406);
-        }
-
-        $thread = \BlubberThread::find($thread_id);
-        if (!$thread->isCommentable()) {
-            $this->error(401);
-        }
-
-        $comment = new \BlubberComment();
-        $comment['thread_id'] = $thread_id;
-        $comment['content'] = $this->data['content'];
-        $comment['user_id'] = $GLOBALS['user']->id;
-        $comment['external_contact'] = 0;
-        $comment->store();
-
-        $thread->setLastVisit();
-
-        return $comment->getJSONData();
-    }
-
-    /**
-     * Write a comment to a thread
-     *
-     * @put /blubber/threads/:thread_id/comments/:comment_id
-     *
-     * @param string $thread_id   id of the blubber thread
-     * @param string $comment     id of the comment
-     *
-     * @return array   the comment as array
-     */
-    public function editComment($thread_id, $comment_id)
-    {
-        $comment = \BlubberComment::find($comment_id);
-        if (!$comment->isWritable()) {
-            $this->error(401);
-        }
-        $old_content = $comment['content'];
-        $comment['content'] = $this->data['content'];
-
-        if ($comment['user_id'] !== $GLOBALS['user']->id) {
-            $messaging = new \messaging();
-            $message = sprintf(
-                _("%s hat als Moderator gerade Ihren Beitrag in Blubber editiert.\n\nDie alte Version des Beitrags lautete:\n\n%s\n\nDie neue lautet:\n\n%s\n"),
-                get_fullname(), $old_content, $comment['content']
-            );
-
-            $message .= "\n\n";
-
-            $message .= '[' . _('Link zu diesem Beitrag') . ']';
-            $message .= \URLHelper::getURL(
-                "{$GLOBALS['ABSOLUTE_URI_STUDIP']}dispatch.php/blubber/index/{$comment->thread_id}",
-                [],
-                true
-            );
-
-            $messaging->insert_message(
-                $message,
-                get_username($comment['user_id']),
-                $GLOBALS['user']->id,
-                null, null, null, null,
-                _("Änderungen an Ihrem Blubber.")
-            );
-        }
-
-        if (!trim($this->data['content'])) {
-            $data = $comment->getJSONData();
-            $comment->delete();
-        } else {
-            $comment->store();
-            $data = $comment->getJSONData();
-        }
-        return $data;
-    }
-
-    /**
-     * Write a comment to a thread
-     *
-     * @get /blubber/threads/:thread_id/comments
-     *
-     * @param string $thread_id   id of the blubber thread
-     *
-     * @return array   the comments as array
-     */
-    public function getComments($thread_id)
-    {
-        if (!$GLOBALS['perm']->have_perm('autor')) {
-            $this->error(401);
-        }
-
-        $thread = new \BlubberThread($thread_id);
-        if (!$thread->isReadable()) {
-            $this->error(401);
-        }
-
-        $modifier = \Request::get('modifier');
-        if ($modifier === 'olderthan') {
-            $limit = \Request::int('limit', 50);
-
-            $query = "SELECT blubber_comments.*
-                      FROM blubber_comments
-                      WHERE blubber_comments.thread_id = :thread_id
-                        AND blubber_comments.mkdate <= :timestamp
-                      ORDER BY mkdate DESC
-                      LIMIT :limit";
-            $result = \DBManager::get()->fetchAll($query, [
-                'thread_id' => $thread_id,
-                'timestamp' => \Request::int('timestamp', time()),
-                'limit'     => $limit + 1,
-            ]);
-
-            $output = ['comments' => []];
-
-            if (count($result) > $limit) {
-                array_pop($result);
-                $output['more_up'] = 1;
-            } else {
-                $output['more_up'] = 0;
-            }
-            foreach ($result as $data) {
-                $comment = \BlubberComment::buildExisting($data);
-                $output['comments'][] = $comment->getJSONData();
-            }
-            return $output;
-        }
-
-        if ($modifier === 'newerthan') {
-            $limit = \Request::int('limit', 50);
-
-            $query = "SELECT blubber_comments.*
-                      FROM blubber_comments
-                      WHERE blubber_comments.thread_id = :thread_id
-                        AND blubber_comments.mkdate >= :timestamp
-                      ORDER BY mkdate
-                      LIMIT :limit";
-            $comments = \DBManager::get()->fetchAll($query, [
-                'thread_id' => $thread_id,
-                'timestamp' => \Request::int('timestamp', time()),
-                'limit'     => $limit + 1,
-            ], function ($comment) {
-                return \BlubberComment::buildExisting($comment)->getJSONData();
-            });
-
-            $output = ['comments' => $comments];
-
-            if (count($comments) > $limit) {
-                array_pop($output['comments']);
-                $output['more_down'] = 1;
-            } else {
-                $output['more_down'] = 0;
-            }
-
-            return $output;
-        }
-
-        $query = "SELECT blubber_comments.*
-                  FROM blubber_comments
-                  WHERE blubber_comments.thread_id = :thread_id ";
-        $parameters = ['thread_id' => $thread_id];
-
-        if (\Request::get('search')) {
-            $query .= " AND blubber_comments.content LIKE :search ";
-            $parameters['search'] = '%'.\Request::get('search').'%';
-        }
-        $query .= " ORDER BY mkdate ASC ";
-
-        $output['comments'] = \DBManager::get()->fetchAll($query, $parameters, function ($comment) {
-            return \BlubberComment::buildExisting($comment)->getJSONData();
-        });
-        $output['more_up'] = 0;
-        $output['more_down'] = 0;
-
-        return $output;
-    }
-
-    /**
-     * Does the current user follow the thread?
-     *
-     * @get /blubber/threads/:thread_id/follow
-     */
-    public function threadIsFollowed($thread_id)
-    {
-        return $this->requireThread($thread_id)->isFollowedByUser();
-    }
-
-    /**
-     * User follows a thread.
-     *
-     * @post /blubber/threads/:thread_id/follow
-     *
-     * @param string $thread_id   id of the blubber thread
-     */
-    public function followThread($thread_id)
-    {
-        $this->requireThread($thread_id)->addFollowingByUser();
-    }
-
-    /**
-     * User unfollows a thread.
-     *
-     * @delete /blubber/threads/:thread_id/follow
-     *
-     * @param string $thread_id   id of the blubber thread
-     */
-    public function unfollowThread($thread_id)
-    {
-        $this->requireThread($thread_id)->removeFollowingByUser();
-    }
-
-    /**
-     * Returns a blubber thread and checks permissions.
-     *
-     * @param string $thread_id Id of the blubber thread
-     * @return \BlubberThread
-     */
-    private function requireThread($thread_id)
-    {
-        if (!$GLOBALS['perm']->have_perm('autor')) {
-            $this->error(401);
-        }
-
-        $thread = new \BlubberThread($thread_id);
-        if (!$thread->isReadable()) {
-            $this->error(401);
-        }
-
-        return \BlubberThread::upgradeThread($thread);
-    }
-}
diff --git a/app/routes/Clipboard.php b/app/routes/Clipboard.php
deleted file mode 100644
index dfe22e0..0000000
--- a/app/routes/Clipboard.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-
-/**
- * This file contains the REST class for the clipboard system.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Clipboard extends \RESTAPI\RouteMap
-{
-    /**
-     * Adds a new clipboard.
-     *
-     * @post /clipboard/add
-     */
-    public function addClipboard()
-    {
-        $name = \Request::get('name');
-
-        if (!$name) {
-            $this->halt(400, _('Es wurde kein Name angegeben!'));
-        }
-
-        $clipboard = new \Clipboard();
-        $clipboard->user_id = $GLOBALS['user']->id;
-        $clipboard->name = $name;
-        if (!$clipboard->store()) {
-            $this->halt(500, _('Fehler beim Speichern des Merkzettels!'));
-        }
-
-        $result = $clipboard->toRawArray();
-        //A special treatment for the widget_id parameter:
-        //It is passed through:
-        $widget_id = \Request::get('widget_id');
-        if ($widget_id) {
-            $result['widget_id'] = $widget_id;
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Edits a clipboard.
-     *
-     * @put /clipboard/:clipboard_id
-     */
-    public function editCliboard($clipboard_id = null)
-    {
-        $clipboard = \Clipboard::find($clipboard_id);
-        if (!$clipboard) {
-            $this->notFound(_('Ungültige Merkzettel-ID!'));
-        }
-
-        if ($clipboard->user_id != $GLOBALS['user']->id) {
-            //Thou shalt not delete clipboards
-            //which don't belong to you!
-            throw new \AccessDeniedException();
-        }
-
-        $name = $this->data['name'];
-        if (!$name) {
-            $this->halt(400, _('Es wurde kein Name angegeben!'));
-        }
-
-        $clipboard->name = $name;
-
-        if ($clipboard->isDirty()) {
-            $success = $clipboard->store();
-        } else {
-            $success = true;
-        }
-
-        if (!$success) {
-            $this->halt(500, _('Fehler beim Bearbeiten des Merkzettels!'));
-        }
-
-        $result = $clipboard->toRawArray();
-
-        //A special treatment for the widget_id parameter:
-        //It is passed through:
-        $widget_id = \Request::get('widget_id');
-        if ($widget_id) {
-            $result['widget_id'] = $widget_id;
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Deletes a clipboard.
-     *
-     * @delete /clipboard/:clipboard_id
-     */
-    public function deleteClipboard($clipboard_id = null)
-    {
-        $clipboard = \Clipboard::find($clipboard_id);
-        if (!$clipboard) {
-            $this->notFound(_('Ungültige Merkzettel-ID!'));
-        }
-
-        if ($clipboard->user_id !== $GLOBALS['user']->id) {
-            //Thou shalt not delete items of clipboards
-            //which don't belong to you!
-            throw new \AccessDeniedException();
-        }
-
-        if (!$clipboard->delete()) {
-            $this->halt(500, _('Fehler beim Löschen des Merkzettels!'));
-        }
-
-        return "";
-    }
-
-
-    /**
-     * Adds an item to a clipboard.
-     *
-     * @post /clipboard/:clipboard_id/item
-     */
-    public function addClipboardItem($clipboard_id = null)
-    {
-        $clipboard = \Clipboard::find($clipboard_id);
-        if (!$clipboard) {
-            $this->notFound(_('Ungültige Merkzettel-ID!'));
-        }
-
-        if ($clipboard->user_id != $GLOBALS['user']->id) {
-            //Thou shalt not add items to clipboards
-            //which don't belong to you!
-            throw new \AccessDeniedException();
-        }
-
-        $range_id = \Request::get('range_id');
-        $range_type = \Request::get('range_type');
-        $widget_id = \Request::get('widget_id');
-
-        if (!is_a($range_type, $clipboard->allowed_item_class, true)) {
-            $this->halt(
-                400,
-                sprintf(
-                    _('Die Klasse %s ist in dieser Merkzettel-Klasse nicht erlaubt!'),
-                    $range_type
-                )
-            );
-        }
-
-        try {
-            $item = $clipboard->addItem($range_id, $range_type);
-
-            $result = $item->toRawArray();
-            $result['name'] = $item->__toString();
-            if ($widget_id) {
-                $result['widget_id'] = $widget_id;
-            }
-            return $result;
-        } catch (\Exception $e) {
-            $this->halt(500, $e->getMessage());
-        }
-    }
-
-
-    /**
-     * Removes an item (selected by its range-ID) from a clipboard.
-     *
-     * @delete /clipboard/:clipboard_id/item/:range_id
-     */
-    public function removeClipboardItem($clipboard_id = null, $range_id = null)
-    {
-        $clipboard = \Clipboard::find($clipboard_id);
-        if (!$clipboard) {
-            $this->notFound(_('Ungültige Merkzettel-ID!'));
-        }
-
-        if ($clipboard->user_id != $GLOBALS['user']->id) {
-            //Thou shalt not delete items of clipboards
-            //which don't belong to you!
-            throw new \AccessDeniedException();
-        }
-
-        if ($clipboard->removeItem($range_id)) {
-            return ['range_id' => $range_id];
-        } else {
-            $this->halt(500, _('Fehler beim Löschen des Eintrags!'));
-        }
-    }
-}
diff --git a/app/routes/Contacts.php b/app/routes/Contacts.php
deleted file mode 100644
index d7fd010..0000000
--- a/app/routes/Contacts.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author  <mlunzena@uos.de>
- * @license GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition user_id ^[a-f0-9]{1,32}$
- * @condition friend_id ^[a-f0-9]{1,32}$
- * @condition group_id ^[a-f0-9]{1,32}$
- */
-class Contacts extends \RESTAPI\RouteMap
-{
-
-    public static function before()
-    {
-        require_once 'User.php';
-        require_once 'lib/statusgruppe.inc.php';
-    }
-
-    /**
-     * Lists all contacts of a user
-     *
-     * @get /user/:user_id/contacts
-     */
-    public function getUserContacts($user_id)
-    {
-        if ($GLOBALS['user']->id !== $user_id) {
-            $this->error(401);
-        }
-
-        // quite degenerated as long as we can only see our own contacts
-        $user = $this->requireUser($user_id);
-
-        $total = count($user->contacts);
-        $contacts = $user->contacts->limit($this->offset, $this->limit);
-
-        $contacts_json = $this->contactsToJSON($contacts);
-        $this->etag(md5(serialize($contacts_json)));
-
-        return $this->paginated($contacts_json,
-                                $total, compact('user_id'));
-    }
-
-    /**
-     * Adds/Updates a contact to user's list of contacts
-     *
-     * @put /user/:user_id/contacts/:friend_id
-     */
-    public function addUserContact($user_id, $buddy_user_id)
-    {
-        if ($GLOBALS['user']->id !== $user_id) {
-            $this->error(401);
-        }
-
-        $user = $this->requireUser($user_id);
-        $friend = $this->requireUser($buddy_user_id);
-
-        // prevent duplicates
-        if ($user->isFriendOf($friend)) {
-            $this->error(409, sprintf('User "%s" is already a contact', htmlReady($friend->id)));
-        }
-
-        $user->contacts[] = $friend;
-        $user->store();
-
-        $this->status(201);
-    }
-
-    /**
-     * Deletes a contact
-     *
-     * @delete /user/:user_id/contacts/:friend_id
-     */
-    public function removeUserContact($user_id, $buddy_user_id)
-    {
-        if ($GLOBALS['user']->id !== $user_id) {
-            $this->error(401);
-        }
-
-        $user = $this->requireUser($user_id);
-        $friend = $this->requireUser($buddy_user_id);
-
-        if (!$user->isFriendOf($friend)) {
-            $this->notFound("Contact not found");
-        }
-
-        $user->contacts->unsetByPK($friend->id);
-        $user->store();
-
-        $this->status(204);
-    }
-
-
-    /**
-     * List all contact groups of a user
-     *
-     * @get /user/:user_id/contact_groups
-     */
-    public function getUserContactGroups($user_id)
-    {
-        if ($GLOBALS['user']->id !== $user_id) {
-            $this->error(401);
-        }
-
-        $contact_groups = \SimpleCollection::createFromArray(
-                \Statusgruppen::findByRange_id($GLOBALS['user']->id))
-            ->orderBy('name ASC');
-
-        $total = count($contact_groups);
-        $contact_groups = $contact_groups->limit($this->offset, $this->limit);
-
-        $contact_groups_json = $this->contactGroupsToJSON($contact_groups);
-        $this->etag(md5(serialize($contact_groups_json)));
-
-        return $this->paginated($contact_groups_json,
-                                $total, compact('user_id'));
-    }
-
-    /**
-     * Create a new contact group for a user.
-     *
-     * @post /user/:user_id/contact_groups
-     */
-    public function createContactGroup($user_id)
-    {
-        if ($GLOBALS['user']->id !== $user_id) {
-            $this->error(401);
-        }
-
-        if (!isset($this->data['name']) || !mb_strlen($name = trim($this->data['name']))) {
-            $this->error(400, 'Contact group name required.');
-        }
-
-        $group = new \Statusgruppen();
-        $group->range_id       = $GLOBALS['user']->id;
-        $group->name           = $name;
-        $group->size           = 0;
-        $group->selfassign     = 0;
-        $group->calendar_group = 0;
-        $group->store();
-        $this->redirect('contact_group/' . $group->id, 201, 'ok');
-    }
-
-    /**
-     * Show a single contact group
-     *
-     * @get /contact_group/:group_id
-     */
-    public function showContactGroup($group_id)
-    {
-        $group = $this->requireContactGroup($group_id);
-        $contact_group_json = $this->contactGroupToJSON($group);
-        $this->etag(md5(serialize($contact_group_json)));
-        return $contact_group_json;
-    }
-
-    /**
-     * Remove a contact group
-     *
-     * @delete /contact_group/:group_id
-     */
-    public function destroyContactGroup($group_id)
-    {
-        $group = $this->requireContactGroup($group_id);
-
-        $group->remove();
-
-        $this->status(204);
-    }
-
-    /**
-     * List all members of a contact group
-     *
-     * @get /contact_group/:group_id/members
-     */
-    public function indexOfContactGroupMembers($group_id)
-    {
-        $group = $this->requireContactGroup($group_id);
-        $contacts = $group->members->limit($this->offset, $this->limit);
-
-        $json = [];
-        foreach ($contacts as $contact) {
-            $url = $this->urlf('/contact_group/%s/members/%s', [$group_id, $contact->user_id]);
-            $json[$url] = User::getMiniUser($this, $contact->user);
-        }
-
-        $this->etag(md5(serialize($json)));
-
-        return $this->paginated($json, count($group->members), compact('group_id'));
-    }
-
-    /**
-     * Add a user to a contact group
-     *
-     * @put /contact_group/:group_id/members/:user_id
-     */
-    public function addToContactGroup($group_id, $user_id)
-    {
-        $group = $this->requireContactGroup($group_id);
-        $user = $this->requireUser($user_id);
-
-        // prevent duplicates
-        $exists = $group->members->findBy('user_id', $user_id)->first();
-        if ($exists) {
-            $this->halt(204);
-        }
-
-        $new_contact = [
-            'owner_id' => $GLOBALS['user']->id,
-            'user_id'  => $user->id];
-
-        $new_contact['group_assignments'][] = ['statusgruppe_id' => $group->id,
-                                                    'user_id'         => $user->id];
-
-        $success = (bool)\Contact::import($new_contact)->store();
-
-
-        if (!$success) {
-            $this->error(500);
-        }
-
-        $this->status(201);
-    }
-
-    /**
-     * Remove a user from a contact group
-     *
-     * @delete /contact_group/:group_id/members/:user_id
-     */
-    public function removeFromContactGroup($group_id, $user_id)
-    {
-        $group = $this->requireContactGroup($group_id);
-        $membership = $group->members->findBy('user_id', $user_id)->first();
-        if (!$membership) {
-            $this->notFound();
-        }
-
-        $membership->delete();
-
-        $this->status(204);
-    }
-
-
-    /**************************************************/
-    /* PRIVATE HELPER METHODS                         */
-    /**************************************************/
-
-    private function requireUser($user_id)
-    {
-        $user = \User::find($user_id);
-        // TODO: checks visibility using the global perm object!
-        if (!$user || !get_visibility_by_id($user_id)) {
-            $this->notFound(sprintf("Could not find user with id: %s", htmlReady($user_id)));
-        }
-
-        return $user;
-    }
-
-    private function requireContactGroup($group_id)
-    {
-        $group = \Statusgruppen::find($group_id);
-        if (!$group) {
-            $this->notFound();
-        }
-
-        if ($group->range_id !== $GLOBALS['user']->id) {
-            $this->error(401);
-        }
-        return $group;
-    }
-
-    private function contactsToJSON($contacts) {
-        $result = [];
-        foreach ($contacts as $contact) {
-            $result[] = User::getMiniUser($this, $contact);
-        }
-        return $result;
-    }
-
-    private function contactGroupsToJSON($contact_groups)
-    {
-        $result = [];
-        foreach ($contact_groups as $cg) {
-            $url = $this->urlf('/contact_group/%s', [htmlReady($cg->id)]);
-            $result[$url] = $this->contactGroupToJSON($cg);
-        }
-        return $result;
-    }
-
-    private function contactGroupToJSON($group)
-    {
-        $json = [
-            'id'             => $group->id,
-            'name'           => (string) $group->name,
-            'contacts'       => $this->urlf('/contact_group/%s/members', [htmlReady($group->id)]),
-            'contacts_count' => sizeof($group->members)
-        ];
-        return $json;
-    }
-}
diff --git a/app/routes/Course.php b/app/routes/Course.php
deleted file mode 100644
index d1fad96..0000000
--- a/app/routes/Course.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author  <mlunzena@uos.de>
- * @license GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition course_id ^[a-f0-9]{1,32}$
- * @condition user_id ^[a-f0-9]{1,32}$
- */
-class Course extends \RESTAPI\RouteMap
-{
-
-    public function before()
-    {
-        require_once 'User.php';
-    }
-
-    /**
-     * Lists all courses of a user including the semesters in which
-     * that course is active.
-     * Optionally filtered by a URL parameter 'semester'.
-     *
-     * @get /user/:user_id/courses
-     */
-    public function getUserCourses($user_id)
-    {
-        if (($GLOBALS['user']->id !== $user_id) && !$GLOBALS['perm']->have_perm("root")) {
-            $this->error(401);
-        }
-
-        // setting up semester to filter by
-        $semester = null;
-        $semester_id = \Request::get('semester');
-        if ($semester_id) {
-            $semester = \Semester::find($semester_id);
-            if (!$semester) {
-                $this->error(400, "Semester not found.");
-            }
-        }
-
-        $memberships = $this->findMembershipsByUserId($user_id, $semester);
-
-        $total = count($memberships);
-        $memberships = $memberships->limit($this->offset, $this->limit);
-        $memberships_json = $this->membershipsToJSON($memberships);
-        $this->etag(md5(serialize($memberships_json)));
-        return $this->paginated(
-            $memberships_json,
-            $total,
-            compact('user_id'),
-            ['semester' => $semester_id]
-        );
-    }
-
-    /**
-     * Show a single course
-     *
-     * @get /course/:course_id
-     */
-    public function getCourse($course_id)
-    {
-        if (!$course = \Course::find($course_id)) {
-            $this->notFound("Course not found");
-        }
-
-        $course = $this->requireCourse($course_id);
-        $this->lastmodified($course->chdate);
-        $course_json = $this->courseToJSON($course);
-        $this->etag(md5(serialize($course_json)));
-        return $course_json;
-    }
-
-    /**
-     * List all members of a course.
-     * Optionally filtered by a URL parameter 'status'.
-     *
-     * @get /course/:course_id/members
-     */
-    public function getMembers($course_id)
-    {
-        $status_filter = \Request::get('status');
-        if ($status_filter && !in_array($status_filter, words("user autor tutor dozent"))) {
-            $this->error(400, "Status may be one of: user, autor, tutor, dozent");
-        }
-
-        $course = $this->requireCourse($course_id);
-        $members = $course->members;
-        if ($status_filter) {
-            $members = $members->findBy('status', $status_filter);
-        }
-
-        $total = count($members);
-        $members = $members->limit($this->offset, $this->limit);
-        $members_json = $this->membersToJSON($course, $members);
-        $this->etag(md5(serialize($members_json)));
-        return $this->paginated(
-            $members_json,
-            $total,
-            compact('course_id'),
-            ['status' => $status_filter]
-        );
-    }
-
-    /**
-     * Get the root file folder of a course.
-     *
-     * @get /course/:course_id/top_folder
-     */
-    public function getTopFolder($course_id)
-    {
-        $top_folder = \Folder::findTopFolder(
-            $this->requireCourse($course_id)->id,
-            'course'
-        );
-
-        if (!$top_folder) {
-            $this->notFound("No folder found for course with id {$course_id}!");
-        }
-
-        return (new FileSystem())->getFolder($top_folder->id);
-    }
-
-    /**************************************************/
-    /* PRIVATE HELPER METHODS                         */
-    /**************************************************/
-
-    private function findMembershipsByUserId($user_id, $semester)
-    {
-        $memberships = \SimpleORMapCollection::createFromArray(
-            \CourseMember::findBySQL('user_id = ? ORDER BY mkdate ASC', [$user_id])
-        );
-
-        // filter by semester
-        if ($semester) {
-
-            $memberships = $memberships->filter(function ($m) use ($semester) {
-                return $m->course->isInSemester($semester);
-            });
-        }
-
-        return $memberships;
-    }
-
-    private function membershipsToJSON($memberships)
-    {
-        $json = [];
-
-        foreach ($memberships as $membership) {
-            $course_json = $this->courseToJSON($course = $membership->course);
-
-            $json[$this->urlf("/course/%s", [$course->id])] = $course_json;
-        }
-        return $json;
-    }
-
-    private function courseToJSON($course)
-    {
-        $json = [];
-
-        $json['course_id']   = $course->id;
-        $json['number']      = $course->VeranstaltungsNummer;
-        $json['title']       = (string) $course->Name;
-        $json['subtitle']    = (string) $course->Untertitel;
-        $json['type']        = $course->status;
-        $json['description'] = (string) $course->Beschreibung;
-        $json['location']    = (string) $course->Ort;
-
-        // lecturers
-        foreach ($course->getMembersWithStatus('dozent') as $lecturer) {
-            $url = $this->urlf('/user/%s', [htmlReady($lecturer->user_id)]);
-            $json['lecturers'][$url] = User::getMiniUser($this, $lecturer->user);
-        }
-
-        // other members
-        foreach (words("user autor tutor dozent") as $status) {
-            $json['members'][$status] = $this->urlf('/course/%s/members?status=%s', [$course->id, $status]);
-            $json['members'][$status . '_count'] = $course->countMembersWithStatus($status);
-        }
-
-        foreach (words("start_semester end_semester") as $key) {
-            $json[$key] = $course->$key ? $this->urlf('/semester/%s', [htmlReady($course->$key->id)]) : null;
-        }
-
-        $activated = array_map('get_class', $course->getActivatedTools());
-
-        $json['modules'] = [];
-        foreach (['forum'     => 'forum_categories',
-                  'documents' => 'top_folder',
-                  'wiki'      => 'wiki'] as $module => $uri)
-        {
-            if (in_array('Core' . ucfirst($module), $activated)) {
-                $json['modules'][$module] = $this->urlf('/course/%s/%s', [htmlReady($course->id), $uri]);
-            }
-        }
-
-        // Add group if current user is member of the group
-        $json['group'] = null;
-
-        $member = \CourseMember::find([$course->id, $GLOBALS['user']->id]);
-        if ($member) {
-            $json['group'] = (int) $member->gruppe;
-        }
-
-
-        return $json;
-    }
-
-    private function requireCourse($id)
-    {
-        if (!$course = \Course::find($id)) {
-            $this->notFound("Course not found");
-        }
-
-        //This route is used in the room management system.
-        //Therefore, we need not only to check if the user is in the course,
-        //but also, if the user is a global resource admin. In the latter case,
-        //access shall also be granted.
-        if (!$GLOBALS['perm']->have_studip_perm('user', $id, $GLOBALS['user']->id)
-            && !\ResourceManager::userHasGlobalPermission(\User::findCurrent(), 'admin')) {
-            $this->error(401);
-        }
-
-        return $course;
-    }
-
-    private function membersToJSON($course, $members)
-    {
-        $json = [];
-
-        foreach ($members as $member) {
-            $url = $this->urlf('/user/%s', [$member->user_id]);
-            $avatar = \Avatar::getAvatar($member->user_id);
-            $json[$url] = [
-                'member' => User::getMiniUser($this, $member->user),
-                'status' => $member->status
-            ];
-        }
-        return $json;
-    }
-}
diff --git a/app/routes/Discovery.php b/app/routes/Discovery.php
deleted file mode 100644
index c83f524..0000000
--- a/app/routes/Discovery.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Discovery extends \RESTAPI\RouteMap
-{
-    /**
-     * Schnittstellenbeschreibung
-     *
-     * @get /discovery
-     */
-    public function getDiscovery()
-    {
-        $routes = $this->router->getRoutes(true);
-        foreach ($routes as $uri_template => $methods) {
-            foreach ($methods as $method => $route) {
-                $routes[$uri_template][$method] = $route['description'];
-            }
-        }
-        return $routes;
-    }
-}
diff --git a/app/routes/Events.php b/app/routes/Events.php
deleted file mode 100644
index 368d615..0000000
--- a/app/routes/Events.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-use Config;
-use Resource;
-use Room;
-use Seminar;
-use Issue;
-
-
-/**
- * @author     André Klaßen <andre.klassen@elan-ev.de>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition course_id ^[a-f0-9]{1,32}$
- * @condition user_id ^[a-f0-9]{1,32}$
- * @condition semester_id ^[a-f0-9]{1,32}$
- */
-class Events extends \RESTAPI\RouteMap
-{
-
-    /**
-     * returns all upcoming events within the next two weeks for a given user
-     *
-     * @get /user/:user_id/events
-     */
-    public function getEvents($user_id)
-    {
-        if ($user_id !== $GLOBALS['user']->id) {
-            $this->error(401);
-        }
-
-        $start = new \DateTime();
-        $end   = clone $start;
-        $end   = $end->add(new \DateInterval('P2W'));
-
-        $list = array_merge(
-            \CalendarCourseDate::getEvents($start, $end, $user_id),
-            \CalendarCourseExDate::getEvents($start, $end, $user_id)
-        );
-
-        $json = [];
-        $events = array_slice($list, $this->offset, $this->limit); ;
-        foreach ($events as $event) {
-
-            $course_uri = $this->urlf('/course/%s', [htmlReady($event->range_id)]);
-
-            $json[] = [
-                'event_id'    => $event->id,
-                'course'      => $course_uri,
-                'start'       => $event->date,
-                'end'         => $event->end_time,
-                'title'       => $event->getTitle(),
-                'description' => $event->getDescription() ?: '',
-                'categories'  => $event->getTypeName(),
-                'room'        => $event->getRoomName(),
-                'canceled'    => $event instanceof \CourseExDate || holiday($event->date),
-            ];
-        }
-
-        $this->etag(md5(serialize($json)));
-
-        return $this->paginated($json, count($list), compact('user_id'));
-    }
-
-    /**
-     *  returns an iCAL Export of all events for a given user
-     *
-     * @get /user/:user_id/events.ics
-     */
-    public function getEventsICAL($user_id)
-    {
-        if ($user_id !== $GLOBALS['user']->id) {
-            $this->error(401);
-        }
-        $end = new \DateTime();
-        $end->setTimestamp(\CalendarDate::NEVER_ENDING);
-        $start = new \DateTime();
-        $start->modify('-4 week');
-        $ical_export = new \ICalendarExport();
-        $ical = $ical_export->exportCalendarDates($user_id, $start, $end)
-            . $ical_export->exportCourseDates($user_id, $start, $end)
-            . $ical_export->exportCourseExDates($user_id, $start, $end);
-        $content = $ical_export->writeHeader() . $ical . $ical_export->writeFooter();
-
-        $this->contentType('text/calendar');
-        $this->headers([
-            'Content-Length'      => strlen($content),
-            'Content-Disposition' => 'attachment; ' . encode_header_parameter('filename', 'studip.ics'),
-        ]);
-        $this->halt(200, $this->response->headers, function () use ($content) {
-            echo $content;
-        });
-    }
-
-
-    /**
-     * returns events for a given course
-     *
-     * @get /course/:course_id/events
-     */
-    public function getEventsForCourse($course_id)
-    {
-        if (!$GLOBALS['perm']->have_studip_perm('user', $course_id, $GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-
-        $seminar = new Seminar($course_id);
-        $dates = getAllSortedSingleDates($seminar);
-        $total = sizeof($dates);
-
-        $events = [];
-        foreach (array_slice($dates, $this->offset, $this->limit) as $date) {
-
-            // get issue titles
-            $issue_titles = [];
-            if (is_array($issues = $date->getIssueIDs())) {
-                foreach ($issues as $is) {
-                    $issue = new Issue(['issue_id' => $is]);
-                    $issue_titles[] = $issue->getTitle();
-                }
-            }
-
-            $room = self::getRoomForSingleDate($date);
-            $events[] = [
-                'event_id'    => $date->getSingleDateID(),
-                'start'       => $date->getStartTime(),
-                'end'         => $date->getEndTime(),
-                'title'       => $date->toString(),
-                'description' => implode(', ', $issue_titles),
-                'categories'  => $date->getTypeName() ?: '',
-                'room'        => $room ?: '',
-                'deleted'     => $date->isExTermin(),
-                'canceled'    => $date->isHoliday() ?: false,
-            ];
-        }
-
-        $this->etag(md5(serialize($events)));
-
-        return $this->paginated($events, $total, compact('course_id'));
-    }
-
-    private static function getRoomForSingleDate($val) {
-
-        /* css-Klasse auswählen, sowie Template-Feld für den Raum mit Text füllen */
-        if (Config::get()->RESOURCES_ENABLE) {
-
-            if ($val->getResourceID()) {
-                $resObj = Resource::find($val->getResourceID());
-                if ($resObj) {
-                    $room_object = $resObj->getDerivedClassInstance();
-                    if ($room_object instanceof Room) {
-                        $room = _("Raum: ");
-                        $room .= $room_object->getActionURL('booking_plan');
-                    }
-                }
-            } else {
-                $room = _("keine Raumangabe");
-
-                if ($val->isExTermin()) {
-                    if ($name = $val->isHoliday()) {
-                        $room = '('.$name.')';
-                    } else {
-                        $room = '('._('fällt aus').')';
-                    }
-                }
-
-                else {
-                    if ($val->getFreeRoomText()) {
-                        $room = '('.htmlReady($val->getFreeRoomText()).')';
-                    }
-                }
-            }
-        } else {
-            $room = '';
-            if ($val->getFreeRoomText()) {
-                $room = '('.htmlReady($val->getFreeRoomText()).')';
-            }
-        }
-
-        return html_entity_decode(strip_tags($room));
-    }
-
-}
diff --git a/app/routes/Feedback.php b/app/routes/Feedback.php
deleted file mode 100644
index 9a28347..0000000
--- a/app/routes/Feedback.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-namespace RESTAPI\Routes;
-
-/**
- * @author     Nils Gehrke <nils.gehrke@uni-goettingen.de>
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition feedback_id ^\d*$
- * @condition course_id ^[a-f0-9]{32}$
- *
- */
-class Feedback extends \RESTAPI\RouteMap
-{
-    /**
-     * Create feedback element for a range
-     *
-     * @post /feedback/range/:range_id/:range_type
-     *
-     */
-    public function createFeedbackElement($range_id, $range_type)
-    {
-        $course_id = $range_type::find($range_id)->getRangeCourseId();
-        if (!\Feedback::hasRangeAccess($range_id, $range_type) || !\Feedback::hasCreatePerm($course_id)) {
-            $this->error(403);
-        }
-        $feedback = \FeedbackElement::build([
-            'range_id'          => $range_id,
-            'range_type'        => $range_type,
-            'user_id'           => $GLOBALS['user']->id,
-            'course_id'         => $course_id,
-            'question'          => $this->data['question'],
-            'description'       => $this->data['description'],
-            'results_visible'   => intval($this->data['results_visible']),
-            'commentable'       => intval($this->data['commentable']),
-            'mode'              => $this->data['mode']
-        ]);
-        $feedback->store();
-        return $feedback->toArray();
-    }
-
-    /**
-     * Get a feedback element
-     *
-     * @get /feedback/:feedback_id
-     *
-     */
-    public function getFeedbackElement($feedback_id)
-    {
-        if (!$feedback = \FeedbackElement::find($feedback_id)) {
-            $this->error(404);
-        }
-        if (!\Feedback::hasRangeAccess($feedback->range_id, $feedback->range_type)) {
-            $this->error(403);
-        }
-        return $feedback->toArray();
-    }
-
-
-    /**
-     * Get all entries of a feedback element
-     *
-     * @get /feedback/:feedback_id/entries
-     *
-     */
-    public function getFeedbackEntries($feedback_id)
-    {
-        if (!$feedback = \FeedbackElement::find($feedback_id)) {
-            $this->error(404);
-        }
-        if (!\Feedback::hasRangeAccess($feedback->range_id, $feedback->range_type)) {
-            $this->error(403);
-        }
-        if ($feedback->results_visible == 1 && !$feedback->isFeedbackable()) {
-            foreach($feedback->entries as $entry) {
-                $result['entries'][] = $entry->toArray();
-            }
-        } elseif (!$feedback->isFeedbackable()) {
-            $result['entries'][] = $feedback->getOwnEntry()->toArray();
-        } else {
-            $result = [];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Edit a feedback element
-     *
-     * @put /feedback/:feedback_id
-     *
-     */
-    public function editFeedbackElement($feedback_id)
-    {
-        if (!$feedback = \FeedbackElement::find($feedback_id)) {
-            $this->error(404);
-        }
-        $course_id = $feedback->course_id;
-        if (!\Feedback::hasRangeAccess($feedback->range_id, $feedback->range_type) || !\Feedback::hasAdminPerm($course_id)) {
-            $this->error(403);
-        }
-        $feedback->question = $this->data['question'] !== null ? $this->data['question'] : $feedback->question;
-        $feedback->description = $this->data['description'] !== null ? $this->data['description'] : $feedback->description;
-        $feedback->results_visible = $this->data['results_visible'] !== null ?
-            intval($this->data['results_visible']) : $feedback->results_visible;
-        $feedback->store();
-        return $feedback->toArray();
-    }
-
-    /**
-     * Delete a feedback element
-     *
-     * @delete /feedback/:feedback_id
-     *
-     */
-    public function deleteFeedbackElement($feedback_id)
-    {
-        if (!$feedback = \FeedbackElement::find($feedback_id)) {
-            $this->error(404);
-        }
-        $course_id = $feedback->course_id;
-        if (!\Feedback::hasRangeAccess($feedback->range_id, $feedback->range_type) || !\Feedback::hasAdminPerm($course_id)) {
-            $this->error(403);
-        }
-        $feedback->delete();
-        $this->halt(200);
-    }
-
-    /**
-     * List all feedback elements for a range
-     *
-     * @get /feedback/range/:range_id/:range_type
-     *
-     * @param string $range_id
-     * @param string $range_type
-     */
-    public function getFeedbackElementsForRange($range_id, $range_type)
-    {
-        if (!\Feedback::hasRangeAccess($range_id, $range_type)) {
-            $this->error(403, 'You may not access the given range object.');
-        }
-        $feedback_elements = \FeedbackElement::findBySQL('range_id = ? AND range_type = ?  ORDER BY mkdate DESC', [$range_id, $range_type]);
-        foreach($feedback_elements as $feedback) {
-            $result['feedback_elements'][] = $feedback->toArray();
-        }
-        return $result;
-    }
-
-    /**
-     * List all feedback elements of a course
-     *
-     * @get /course/:course_id/feedback
-     *
-     */
-    public function getFeedbackElementsForCourse($course_id)
-    {
-        if (!\Feedback::hasAdminPerm($course_id)) {
-            $this->error(403, 'You may not list all feedback elements of the course. Only feedback admins can.');
-        }
-        $feedback_elements  = \FeedbackElement::findBySQL('course_id = ? ORDER BY mkdate DESC', [$course_id]);
-        foreach($feedback_elements as $feedback) {
-            $result['feedback_elements'][] = $feedback->toArray();
-        }
-        return $result;
-    }
-
-    /**
-     * add an entry for a feedback element
-     *
-     * @post /feedback/:feedback_id/entry
-     *
-     */
-    public function addFeedbackEntry($feedback_id)
-    {
-        if (!$feedback = \FeedbackElement::find($feedback_id)) {
-            $this->error(404);
-        }
-        if (!$feedback->isFeedbackable()) {
-            $this->error(403, 'You may not add an entry here. Maybe you have already given feedback or you are the author of the feedback element.');
-        }
-        $entry = \FeedbackEntry::build([
-            'feedback_id'   => $feedback->id,
-            'user_id'       => $GLOBALS['user']->id
-        ]);
-
-        $entry->rating = $this->getRating(
-            $feedback->mode,
-            (int) $this->data['rating']
-        );
-
-        if ($feedback->commentable) {
-            $entry->comment = $this->data['comment'];
-        }
-
-        $entry->store();
-        return $entry->toArray();
-    }
-
-    /**
-     * edit an entry of a feedback element
-     *
-     * @put /feedback/entry/:entry_id
-     *
-     */
-    public function editFeedbackEntry($entry_id)
-    {
-        $entry = \FeedbackEntry::find($entry_id);
-
-        if (!$entry) {
-            $this->notFound();
-        }
-
-        if (!$entry->isEditable()) {
-            $this->error(403);
-        }
-
-        $entry->rating = $this->getRating(
-            $entry->feedback->mode,
-            (int) $this->data['rating']
-        );
-
-        if ($entry->feedback->commentable) {
-            $entry->comment = $this->data['comment'] ?? $entry->comment;
-        }
-
-        $entry->store();
-        return $entry->toArray();
-    }
-
-    /**
-     * delete an entry of a feedback element
-     *
-     * @delete /feedback/entry/:entry_id
-     *
-     */
-    public function deleteFeedbackEntry($entry_id)
-    {
-        if (!$entry = \FeedbackEntry::find($entry_id)) {
-            $this->error(404);
-        }
-        if ($entry->delete()){
-            $this->halt(200);
-        }
-    }
-
-    /**
-     * @param int $mode
-     * @param int $rating
-     * @return int
-     */
-    private function getRating(int $mode, int $rating): int
-    {
-        if ($mode === 0) {
-            return 0;
-        }
-
-        if ($rating === 0) {
-            return 1;
-        }
-
-        if ($mode === 1) {
-            return min(5, $rating);
-        }
-
-        if ($mode === 2) {
-            return min(10, $rating);
-        }
-
-        throw new \InvalidArgumentException("Invalid mode {$mode}");
-    }
-}
diff --git a/app/routes/FileSystem.php b/app/routes/FileSystem.php
deleted file mode 100644
index 9abd713..0000000
--- a/app/routes/FileSystem.php
+++ /dev/null
@@ -1,684 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This class implements REST routes for the new Stud.IP file system.
- *
- * @author     Moritz Strohm <strohm@data-quest.de>
- * @license    GNU General Public License Version 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * Partially based upon the Files.php source code from Jan-Hendrik Willms
- * (tleilax+studip@gmail.com) and mluzena@uos.de which is also
- * licensed under the terms of the GNU General Public License Version 2
- * or later.
- */
-
-class FileSystem extends \RESTAPI\RouteMap
-{
-    // FILE REFERENCE AND FILE ROUTES:
-
-    /**
-     * Get a file reference object (metadata)
-     * @get /file/:file_ref_id
-     */
-    public function getFileRef($file_ref_id)
-    {
-        return $this->filerefToJSON(
-            $this->requireFileRef($file_ref_id),
-            (bool) \Request::int('extended')
-        );
-    }
-
-    /**
-     * Get the data of a file by the ID of an associated FileRef object
-     *
-     * @get /file/:file_ref_id/download
-     */
-    public function getFileRefData($file_ref_id)
-    {
-        $file_ref = $this->requireFileRef($file_ref_id);
-
-        // check if the current user has the permissions to read this file reference:
-        $user = \User::findCurrent();
-        if (!$file_ref->folder->getTypedFolder()->isFileDownloadable($file_ref_id, $user->id)) {
-            $this->error(403, "You may not download the file reference with the id {$file_ref_id}");
-        }
-
-        // check if file exists:
-        if (!$file_ref->file) {
-            $this->error(500, 'File reference has no associated file object!');
-        }
-
-        $data_path = $file_ref->file->getPath();
-        if (!file_exists($data_path)) {
-            $this->error(500, "File was not found in the operating system's file system!");
-        }
-
-        $this->lastModified($file_ref->file->chdate);
-        $this->sendFile($data_path, ['filename' => $file_ref->name]);
-    }
-
-    /**
-     * Update file data using a FileReference to it.
-     *
-     * @post /file/:file_ref_id/update
-     */
-    public function updateFileData($file_ref_id)
-    {
-        // We only update the first file:
-        $uploaded_file = array_shift($this->data['_FILES']);
-
-        // FileManager::updateFileRef handles the whole file upload
-        // and does all the necessary security checks:
-        $result = \FileManager::updateFileRef(
-            $this->requireFileRef($file_ref_id),
-            \User::findCurrent(),
-            $uploaded_file,
-            true,
-            false
-        );
-
-        if (!$result instanceof \FileRef) {
-            $this->error(500, 'Error while updating a file reference: ' . implode(' ', $result));
-        }
-
-        return $this->filerefToJSON($result);
-    }
-
-    /**
-     * Edit a file reference.
-     *
-     * @put /file/:file_ref_id
-     */
-    public function editFileRef($file_ref_id)
-    {
-        $result = \FileManager::editFileRef(
-            $this->requireFileRef($file_ref_id),
-            \User::findCurrent(),
-            $this->data['name'],
-            $this->data['description'],
-            $this->data['content_term_of_use_id'],
-            $this->data['license']
-        );
-
-        if (!$result instanceof \FileRef) {
-            $this->error(500, 'Error while editing a file reference: ' . implode(' ', $result));
-        }
-
-        return $this->filerefToJSON($result);
-    }
-
-    /**
-     * Copies a file reference.
-     *
-     * @post /file/:file_ref_id/copy/:destination_folder_id
-     */
-    public function copyFileRef($file_ref_id, $destination_folder_id)
-    {
-        $result = \FileManager::copyFile(
-            $this->requireFileRef($file_ref_id)->getFileType(),
-            $this->requireFolder($destination_folder_id)->getTypedFolder(),
-            \User::findCurrent()
-        );
-
-        if (!($result instanceof \FileType)) {
-            $this->error(500, 'Error while copying a file reference: ' . implode(' ', $result));
-        }
-
-        return $this->filerefToJSON($result->getFileRef());
-    }
-
-    /**
-     * Moves a file reference.
-     *
-     * @post /file/:file_ref_id/move/:destination_folder_id
-     */
-    public function moveFileRef($file_ref_id, $destination_folder_id)
-    {
-        $result = \FileManager::moveFile(
-            $this->requireFileRef($file_ref_id)->getFileType(),
-            $this->requireFolder($destination_folder_id)->getTypedFolder(),
-             \User::findCurrent()
-        );
-
-        if (!($result instanceof \FileType)) {
-            $this->error(500, 'Error while moving a file reference: ' . implode(' ', $result));
-        }
-
-        return $this->filerefToJSON($result->getFileRef());
-    }
-
-    /**
-     * Deletes a file reference.
-     *
-     * @delete /file/:file_ref_id
-     */
-    public function deleteFileRef($file_ref_id)
-    {
-        $result = \FileManager::deleteFileRef(
-            $this->requireFileRef($file_ref_id),
-            \User::findCurrent()
-        );
-
-        if (!$result instanceof \FileRef) {
-            $this->error(500, 'Error while deleting a file reference: ' . implode(' ', $result));
-        }
-
-        $this->halt(200);
-    }
-
-    /**
-     * Upload file to given folder.
-     * file data has to be attached as multipart/form-data
-     *
-     * @post /file/:folder_id
-     */
-    public function uploadFile($folder_id)
-    {
-        $typed_folder = $this->requireFolder($folder_id)->getTypedFolder();
-        if (isset($this->data['_FILES'])) {
-            $file_data = array_map(function ($a) {
-                return is_array($a) ? $a : [$a];
-            }, array_shift($this->data['_FILES']));
-        }
-        if (is_array($file_data)) {
-            $validated_files = \FileManager::handleFileUpload(
-                $file_data,
-                $typed_folder,
-                $this->requireUser()->id
-            );
-
-            if (count($validated_files['error']) > 0) {
-                $this->error(500, 'Error while uploading files: ' . implode(' ', $validated_files['error']));
-            }
-
-            $uploaded_files = \SimpleCollection::createFromArray($validated_files['files']);
-            $default_license = \ContentTermsOfUse::findDefault();
-            $uploaded_files->setValue('content_terms_of_use_id', $default_license->id);
-            $uploaded_files->store();
-            if (count($uploaded_files) === 1) {
-                $result = $this->filerefToJSON($uploaded_files->first());
-            } else {
-                $result = $uploaded_files->map(function ($f) {
-                    return $this->filerefToJSON($f);
-                });
-            }
-            $this->halt(201, [], $result);
-        } else {
-            $this->error(400, 'No files found in request.');
-        }
-    }
-
-    // FOLDER ROUTES:
-
-    /**
-     * Returns a list of defined folder types, separated by range type.
-     * @get /studip/file_system/folder_types
-     */
-    public function getDefinedFolderTypes()
-    {
-        return \FileManager::getFolderTypes();
-    }
-
-    /**
-     * Get a folder object with its file references, subdirectories and the permissions for the user who has made the API call.
-     * @get /folder/:folder_id
-     */
-    public function getFolder($folder_id)
-    {
-        return $this->folderToJSON(
-            $this->requireFolder($folder_id),
-            true
-        );
-    }
-
-    /**
-     * Creates a new folder inside of another folder and returns the new object on success.
-     * @post /folder/:parent_folder_id/new_folder
-     */
-    public function createNewFolder($parent_folder_id)
-    {
-        $user   = \User::findCurrent();
-        $parent = $this->requireTypedFolder($parent_folder_id);
-
-        if (!$parent->isWritable($user->id)) {
-            $this->error(403, 'You are not permitted to create a subfolder in the parent folder!');
-        }
-
-        $result = \FileManager::createSubFolder(
-            $parent,
-            $user,
-            'StandardFolder', //to be extended
-            $this->data['name'],
-            $this->data['description']
-        );
-
-        if (!$result instanceof \FolderType) {
-            $this->error(500, 'Error while creating a folder: ' . implode(' ', $result));
-        }
-
-        return $this->folderToJSON(
-            $this->requireFolder($result->getId())
-        );
-    }
-
-    /**
-     * Get a list with all FileRef objects of a folder.
-     * @get /folder/:folder_id/files
-     */
-    public function getFileRefsOfFolder($folder_id)
-    {
-        $folder = $this->requireFolder($folder_id);
-
-        $query = "folder_id = :folder_id ORDER BY name ASC";
-        $parameters[':folder_id'] = $folder->id;
-
-        if ($this->limit || $this->offset) {
-            $query .= " LIMIT :limit OFFSET :offset";
-            $parameters[':limit'] = $this->limit;
-            $parameters[':offset'] = $this->offset;
-        }
-
-        $file_refs = \FileRef::findAndMapBySql(function (\FileRef $ref) {
-            return $this->filerefToJSON($ref);
-        }, $query, $parameters);
-
-        return $this->paginated(
-            $file_refs,
-            \FileRef::countByFolder_id($folder->id),
-            ['folder_id' => $folder->id]
-        );
-    }
-
-
-    /**
-     * Get a list with all FileRef objects of a folder.
-     * @get /folder/:folder_id/subfolders
-     */
-    public function getSubfoldersOfFolder($folder_id)
-    {
-        $user   = $this->requireUser();
-        $folder = $this->requireFolder($folder_id);
-
-        $query = "parent_id = :parent_id ORDER BY name ASC";
-        $parameters = [':parent_id' => $folder->id];
-
-        if ($this->limit || $this->offset) {
-            $query .= " LIMIT :limit OFFSET :offset";
-            $parameters[':limit']  = $this->limit;
-            $parameters[':offset'] = $this->offset;
-        }
-
-        $subfolders = \Folder::findAndMapBySql(function (\Folder $subfolder) use ($user) {
-            $type = $subfolder->getTypedFolder();
-            if (!$type || !$type->isVisible($user->id)) {
-                return false;
-            }
-            return $this->folderToJSON($subfolder);
-        }, $query, $parameters);
-
-        return $this->paginated(
-            array_filter($subfolders),
-            \Folder::countByParent_id($folder_id),
-            ['folder_id' => $folder_id]
-        );
-    }
-
-    /**
-     * Get a list with permissions the current user has for a folder.
-     * @get /folder/:folder_id/permissions
-     */
-    public function getFolderPermissions($folder_id)
-    {
-        $user   = $this->requireUser();
-        $folder = $this->requireFolder($folder_id);
-
-        // read permissions of the user and return them:
-        return array_merge([
-            'folder_id'   => $folder->id,
-            'user_id'     => $user->id,
-        ], $this->folderPermissionsToJSON($folder));
-    }
-
-    /**
-     * Allows editing the name or the description (or both) of a folder.
-     *
-     * @put /folder/:folder_id
-     */
-    public function editFolder($folder_id)
-    {
-        if (isset($this->data['name']) && !$this->data['name']) {
-            $this->error(400, "The name for the folder with the id {$folder_id} must not be empty!");
-        }
-
-        $user = $this->requireUser();
-        $typed_folder = $this->requireTypedFolder($folder_id);
-
-        if (!$typed_folder->isEditable($user->id)) {
-            $this->error(403, "You may not edit the folder with id {$folder_id}!");
-        }
-
-        if (!$typed_folder instanceof \StandardFolder) {
-            $this->error(501, "Editing is only allowed for folders of type StandardFolder for now!");
-        }
-
-        if ($this->data['name']) {
-            $typed_folder->name = $this->data['name'];
-        }
-        if (isset($this->data['description'])) {
-            $typed_folder->description = $this->data['description'] ?: '';
-        }
-
-        if (!$typed_folder->store()) {
-            $this->error(500, "Could not store folder with id {$folder_id}!");
-        }
-
-        return $this->folderToJSON(
-            $this->requireFolder($folder_id)
-        );
-    }
-
-    /**
-     * Copies a folder into another folder.
-     *
-     * @post /folder/:folder_id/copy/:destination_folder_id
-     */
-    public function copyFolder($folder_id, $destination_folder_id)
-    {
-        $result = \FileManager::copyFolder(
-            $this->requireTypedFolder($folder_id),
-            $this->requireTypedFolder($destination_folder_id),
-            \User::findCurrent()
-        );
-
-        if (!$result instanceof \FolderType) {
-            $this->error(500, 'Error while copying a folder: ' . implode(' ', $result));
-        }
-
-        return $this->folderToJSON(
-            $this->requireFolder($result->getId())
-        );
-    }
-
-
-    /**
-     * Move a folder into another folder.
-     * @post /folder/:folder_id/move/:destination_folder_id
-     */
-    public function moveFolder($folder_id, $destination_folder_id)
-    {
-        $result = \FileManager::moveFolder(
-            $this->requireTypedFolder($folder_id),
-            $this->requireTypedFolder($destination_folder_id),
-            \User::findCurrent()
-        );
-
-        if (!$result instanceof \FolderType) {
-            $this->error(500, 'Error while moving a folder: ' . implode(' ', $result));
-        }
-
-        return $this->folderToJSON(
-            $this->requireFolder($folder_id)
-        );
-    }
-
-
-    /**
-     * Deletes a folder.
-     *
-     * @delete /folder/:folder_id
-     */
-    public function deleteFolder($folder_id)
-    {
-        $result = \FileManager::deleteFolder(
-            $this->requireTypedFolder($folder_id),
-            \User::findCurrent()
-        );
-
-        if (!$result instanceof \FolderType) {
-            $this->error(500, 'Error while deleting a folder: ' . implode(' ', $result));
-        }
-
-        $this->halt(200);
-    }
-
-    // RELATED OBJECT ROUTES:
-
-    /**
-     * Get a collection of all ContentTermsOfUse objects
-     *
-     * @get /studip/content_terms_of_use_list
-     */
-    public function getContentTermsOfUseList()
-    {
-        $objects = \ContentTermsOfUse::findBySql(
-            '1 ORDER BY name ASC LIMIT :limit OFFSET :offset',
-            ['limit'  => $this->limit, 'offset' => $this->offset]
-        );
-
-        return $this->paginated(
-            array_map([$this, 'termsOfUseToJSON'], $objects),
-            \ContentTermsOfUse::countBySql('1')
-        );
-    }
-
-    // UTILITY METHODS
-
-    /**
-     * Requires a valid user object.
-     * @return \User object
-     */
-    private function requireUser()
-    {
-        return \User::findCurrent();
-    }
-
-    /**
-     * Requires a valid file reference object
-     * @param  mixed $id_or_object Either a file reference id or object
-     * @return \FileRef object
-     */
-    private function requireFileRef($id_or_object)
-    {
-        if ($id_or_object instanceof \FileRef) {
-            $file_ref = $id_or_object;
-        } else {
-            //check if the file_id references a file reference object:
-            $file_ref = \FileRef::find($id_or_object);
-            if (!$file_ref) {
-                $this->notFound("File reference with id {$id_or_object} not found!");
-            }
-        }
-
-        // check if the file reference is placed inside a folder.
-        // (must be present to check for permissions)
-        if (!$file_ref->folder) {
-            $this->error(500, "File reference with id {$file_ref->id} has no folder!");
-        }
-
-        $typed_folder = $file_ref->folder->getTypedFolder();
-        if (!$typed_folder) {
-            $this->error(500, "The folder of file reference with id {$file_ref->id} has no folder type!");
-        }
-
-        //check if the current user has the permissions to read this file reference:
-        if (!$typed_folder->isReadable($this->requireUser()->id)) {
-            $this->error(403, "You are not permitted to read the file reference with id {$file_ref->id}!");
-        }
-
-        return $file_ref;
-    }
-
-    /**
-     * Converts a file reference object to JSON.
-     * @param  \FileRef $ref     File reference object
-     * @param  boolean $extended Extended output? (includes folder, owner and terms of use)
-     * @return array representation for json encoding
-     */
-    private function filerefToJSON(\FileRef $ref, $extended = false)
-    {
-        $user = $this->requireUser();
-        $typed_folder = $ref->folder->getTypedFolder();
-        $filetype = $ref->getFileType();
-
-        $result = array_merge($ref->toRawArray(), [
-            'size'      => (int) $ref->file->size,
-            'mime_type' => $ref->file->mime_type,
-            'storage'   => $ref->file->filetype === "URLFile" ? "url" : "disk",
-
-            'is_readable'     => $typed_folder->isReadable($user->id),
-            'is_downloadable' => $filetype->isDownloadable($user->id),
-            'is_editable'     => $filetype->isEditable($user->id),
-            'is_writable'     => $filetype->isWritable($user->id),
-        ]);
-
-        $result['downloads'] = (int) $result['downloads'];
-        $result['mkdate']    = (int) $result['mkdate'];
-        $result['chdate']    = (int) $result['chdate'];
-
-        if ($result['storage'] === 'url') {
-            $result['url'] = $ref->getFileType()->getDownloadURL();
-        }
-
-        if ($extended) {
-            //folder does exist (since we checked for its existence above)
-            $result['folder'] = $this->folderToJSON($ref->folder);
-
-            if ($ref->owner) {
-                $result['owner'] = User::getMiniUser($this, $ref->owner);
-            }
-
-            //$result['license'] = $file_ref->license; //to be activated when licenses are defined
-
-            if ($ref->terms_of_use) {
-                $result['terms_of_use'] = $this->termsOfUseToJSON($ref->terms_of_use);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Requires a valid folder object
-     * @param  mixed $id_or_object Either a folder id or object
-     * @return Folder object
-     */
-    private function requireFolder($id_or_object)
-    {
-        if ($id_or_object instanceof \Folder) {
-            $folder = $id_or_object;
-        } else {
-            $folder = \Folder::find($id_or_object);
-            if (!$folder) {
-                $this->notFound("Folder with id {$id_or_object} not found!");
-            }
-        }
-
-        $typed_folder = $folder->getTypedFolder();
-        if (!$typed_folder) {
-            $this->error(500, "Cannot find folder type of folder with id {$folder->id}!");
-            return;
-        }
-
-        if (!$typed_folder->isReadable($this->requireUser()->id)) {
-            $this->error(403, "You are not allowed to read the contents of the folder with the id {$folder->id}!");
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Requires a valid typed folder object
-     * @param  mixed $id_or_object Either a folder id or object
-     * @return FolderType instance
-     */
-    private function requireTypedFolder($id_or_object)
-    {
-        return $this->requireFolder($id_or_object)->getTypedFolder();
-    }
-
-    /**
-     * Converts a given folder to JSON.
-     * @param  Folder  $folder   Folder object
-     * @param  boolean $extended Extended output? (includes subfolders and file references)
-     * @return array representation for json encoding
-     */
-    private function folderToJSON(\Folder $folder, $extended = false)
-    {
-        $result = $this->folderPermissionsToJSON($folder);
-
-        if ($result['is_readable']) {
-            $result = array_merge($folder->toRawArray(), $result);
-
-            $result['mkdate'] = (int) $result['mkdate'];
-            $result['chdate'] = (int) $result['chdate'];
-
-            //The field "data_content" must be handled differently
-            //than the other fields since it contains JSON data.
-            $data_content = json_decode($folder->data_content);
-            $result['data_content'] = $data_content;
-
-            if ($extended) {
-                $user = $this->requireUser();
-
-                $result['subfolders'] = [];
-                foreach ($folder->subfolders as $subfolder) {
-                    if (!$subfolder->getTypedFolder()->isVisible($user->id)) {
-                        continue;
-                    }
-                    $result['subfolders'][] = $this->folderToJSON($subfolder);
-                }
-
-                $result['file_refs'] = [];
-                foreach ($folder->getTypedFolder()->getFiles() as $file) {
-                    if (method_exists($file,"getFileRef")) {
-                        $result['file_refs'][] = $this->filerefToJSON(
-                            $file->getFileRef()
-                        );
-                    }
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts permissions of a folder to JSON.
-     * @param  Folder $folder Folder object
-     * @param  User   $user   User object to check permissions against
-     * @return array representation for json encoding
-     */
-    private function folderPermissionsToJSON(\Folder $folder)
-    {
-        $user = $this->requireUser();
-        $type = $folder = $folder->getTypedFolder();
-        if (!$type) {
-            $this->error(500, 'Folder type not found!');
-        }
-
-        return [
-            'is_visible'  => $type->isVisible($user->id),
-            'is_readable' => $type->isReadable($user->id),
-            'is_writable' => $type->isWritable($user->id),
-        ];
-    }
-
-    /**
-     * Converts a terms of use object to JSON.
-     * @param  ContentTermsOfUse $object Object
-     * @return array representation for json encoding
-     */
-    private function termsOfUseToJSON(\ContentTermsOfUse $object)
-    {
-        $result = $object->toRawArray();
-
-        $result['is_default'] = (bool) $result['is_default'];
-
-        $result['mkdate'] = (int) $result['mkdate'];
-        $result['chdate'] = (int) $result['chdate'];
-
-        return $result;
-    }
-}
diff --git a/app/routes/Forum.php b/app/routes/Forum.php
deleted file mode 100644
index 35aad91..0000000
--- a/app/routes/Forum.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition course_id ^[a-f0-9]{1,32}$
- */
-class Forum extends \RESTAPI\RouteMap
-{
-    /**
-     * List all categories of a forum
-     *
-     * @get /course/:course_id/forum_categories
-     */
-    public function getForumCategories($course_id)
-    {
-        if (!\ForumPerm::has('view', $course_id)) {
-            $this->error(401);
-        }
-
-        $categories = \ForumCat::findBySeminar_id($course_id, 'ORDER BY pos ASC');
-        $total      = sizeof($categories);
-        $categories = array_splice($categories, (int)$this->offset, (int)$this->limit ?: 10);
-
-        $json = [];
-        foreach ($categories as $cat) {
-            $json_cat = $cat->toArray();
-            $uri = $this->urlf('/forum_category/%s', [htmlReady($json_cat['category_id'])]);
-            $json_cat['course_id'] = $json_cat['seminar_id'];
-            $json[$uri] = $this->categoryToJson($json_cat);
-        }
-
-        $this->etag(md5(serialize($json)));
-
-        return $this->paginated($json, $total, compact('course_id'));
-    }
-
-    /**
-     * Create a new category
-     *
-     * @post /course/:course_id/forum_categories
-     */
-    public function createForumCategory($course_id)
-    {
-        if (!\ForumPerm::has("add_category", $course_id)) {
-            $this->error(401);
-        }
-
-        if (!isset($this->data['name']) || !mb_strlen($name = trim($this->data['name']))) {
-            $this->error(400, 'Category name required.');
-        }
-
-        $category_id = \ForumCat::add($course_id, $name);
-        if (!$category_id) {
-            $this->error(500, 'Error creating the forum category.');
-        }
-
-        $this->redirect('forum_category/' . $category_id, 201, 'ok');
-    }
-
-    /**
-     * Read a category
-     *
-     * @get /forum_category/:category_id
-     */
-    public function getForumCategory($category_id)
-    {
-        $category = $this->findCategory($category_id);
-        $cid = $category['course_id'];
-
-        if (!\ForumPerm::has('view', $cid)) {
-            $this->error(401);
-        }
-
-        $category_json = $this->categoryToJson($category);
-        $this->etag(md5(serialize($category_json)));
-        return $category_json;
-    }
-
-    /**
-     * Update a category
-     *
-     * @put /forum_category/:category_id
-     */
-    public function updateForumCategory($category_id)
-    {
-        $category = $this->findCategory($category_id);
-
-        if (!\ForumPerm::has("edit_category", $category['course_id'])) {
-            $this->error(401);
-        }
-
-        if (!isset($this->data['name']) || !mb_strlen($name = trim($this->data['name']))) {
-            $this->error(400, 'Category name required.');
-        }
-
-        \ForumCat::setName($category_id, $this->data['name']);
-
-        $this->status(204);
-    }
-
-    /**
-     * Delete a category
-     *
-     * @delete /forum_category/:category_id
-     */
-    public function deleteForumCategory($category_id)
-    {
-        $category = $this->findCategory($category_id);
-        $cid = $category['course_id'];
-
-        if (!\ForumPerm::has("remove_category", $cid)) {
-            $this->error(401);
-        }
-
-        \ForumCat::remove($category_id, $cid);
-
-        $this->status(204);
-    }
-
-    /**
-     * Show entries of a category
-     *
-     * @get /forum_category/:category_id/areas
-     */
-    public function getCategoryEntries($category_id)
-    {
-        $category = $this->findCategory($category_id);
-
-        if (!\ForumPerm::has('view', $category['course_id'])) {
-            $this->error(401);
-        }
-
-        $areas = $this->getAreas($category_id, $this->offset, $this->limit);
-
-        $this->etag(md5(serialize($areas)));
-        return $this->paginated($areas, $this->countAreas($category_id), compact('category_id'));
-    }
-
-
-
-    /**
-     * Add a new forum entry to an existing one
-     *
-     * @post /forum_category/:category_id/areas
-     */
-    public function appendForumEntry($category_id)
-    {
-        $category = $this->findCategory($category_id);
-        $cid = $category['course_id'];
-
-        if (!\ForumPerm::has('add_area', $cid)) {
-            $this->error(401);
-        }
-
-        if (!isset($this->data['subject']) || !mb_strlen($subject = trim($this->data['subject']))) {
-            $this->error(400, 'Subject required.');
-        }
-
-        if (!isset($this->data['content'])) {
-            $this->error(400, 'Content required.');
-        }
-        $content = trim($this->data['content']);
-
-        $anonymous = isset($this->data['anonymous']) ? intval($this->data['anonymous']) : 0;
-
-        $entry_id = $this->createEntry($cid, $cid, $subject, $content, $anonymous);
-
-        \ForumCat::addArea($category_id, $entry_id);
-
-        $this->redirect('forum_entry/' . $entry_id, 201, "ok");
-    }
-
-    /**
-     * Get a forum entry
-     *
-     * @get /forum_entry/:entry_id
-     */
-    public function getForumEntry($entry_id)
-    {
-        $entry = \ForumEntry::getConstraints($entry_id);
-        $cid   = $entry['seminar_id'];
-
-        if (!\ForumPerm::has('view', $cid)) {
-            $this->error(401);
-        }
-
-        $entry = $this->findEntry($entry_id);
-        $this->lastmodified($entry->chdate);
-        $this->etag(md5(serialize($entry)));
-        return $entry;
-    }
-
-    /**
-     * Add a new forum entry to an existing one
-     *
-     * @post /forum_entry/:entry_id
-     */
-    public function addForumEntry($parent_id)
-    {
-        $parent = \ForumEntry::getConstraints($parent_id);
-        $cid = $parent['seminar_id'];
-
-        $perm = self::isArea($parent) ? 'add_area' : 'add_entry';
-
-        if (!\ForumPerm::has($perm, $cid)) {
-            $this->error(401);
-        }
-
-        $subject = (string) trim($this->data['subject']);
-        $content = (string) trim($this->data['content']);
-
-        // areas and threads need a subject, postings do not
-        if ($parent['depth'] < 3 && !$subject) {
-            $this->error(400, 'Subject required.');
-        }
-
-        // all entries besides the area need content
-        if ($parent['depth'] > 1 && !$content) {
-            $this->error(400, 'Content required.');
-        }
-
-        if ($parent['depth'] >= 3 && $subject) {
-            $this->error(400, 'Must not have subject here.');
-        }
-
-        $anonymous = isset($this->data['anonymous']) ? (int) $this->data['anonymous'] : 0;
-
-        $entry_id = $this->createEntry($parent_id, $cid, $subject, $content, $anonymous);
-
-        $this->redirect('forum_entry/' . $entry_id, 201, "ok");
-    }
-
-    /**
-     * Update an existing one forum entry
-     *
-     * @put /forum_entry/:entry_id
-     */
-    public function updateForumEntry($entry_id)
-    {
-        $entry = \ForumEntry::getConstraints($entry_id);
-        $cid = $entry['seminar_id'];
-
-        $perm = self::isArea($entry) ? 'edit_area' : 'edit_entry';
-
-        if (!\ForumPerm::hasEditPerms($entry_id) || !\ForumPerm::has($perm, $cid)) {
-            $this->error(401);
-        }
-
-        $subject = (string) trim($this->data['subject']);
-        $content = (string) trim($this->data['content']);
-
-        // areas and threads need a subject, postings do not
-        if ($entry['depth'] < 3 && !$subject) {
-            $this->error(400, 'Subject required.');
-        }
-
-        // all entries besides the area need content
-        if ($entry['depth'] > 1 && !$content) {
-            $this->error(400, 'Content required.');
-        }
-
-        if ($entry['depth'] >= 3 && $subject) {
-            $this->error(400, 'Must not have subject here.');
-        }
-
-        \ForumEntry::update($entry_id, $subject, $content);
-
-        $this->status(204);
-    }
-
-    /**
-     * Delete an entry
-     *
-     * @delete /forum_entry/:entry_id
-     */
-    public function deleteForumEntry($entry_id)
-    {
-        $entry = \ForumEntry::getConstraints($entry_id);
-        $cid = $entry['seminar_id'];
-
-        if (!\ForumPerm::hasEditPerms($entry_id) || !\ForumPerm::has('remove_entry', $cid)) {
-            $this->error(401);
-        }
-
-        \ForumEntry::delete($entry_id);
-
-        $this->status(204);
-    }
-
-    /*********************
-     *                   *
-     * PRIVATE FUNCTIONS *
-     *                   *
-     *********************/
-
-
-    private function findEntry($entry_id)
-    {
-        $raw = \ForumEntry::getConstraints($entry_id);
-        if ($raw === false) {
-            $this->notFound();
-        }
-
-        $entry = $this->convertEntry($raw);
-
-        $children = \ForumEntry::getEntries($entry_id, \ForumEntry::WITHOUT_CHILDS, '', 'ASC', 0, false);
-
-        if (isset($children['list'][$entry_id])) {
-            unset($children['list'][$entry_id]);
-        }
-
-        $entry['children'] = [];
-        foreach (array_values($children['list']) as $childentry) {
-            $entry['children'][] = $this->convertEntry($childentry);
-        }
-
-        return $entry;
-    }
-
-    public function convertEntry($raw)
-    {
-        $entry = [];
-        foreach(words("topic_id mkdate chdate anonymous depth") as $key) {
-            $entry[$key] = $raw[$key];
-        }
-
-        $hide_user = $entry['anonymous'] && $raw['user_id'] !== $GLOBALS['user']->id;
-
-        $entry['subject']      = $raw['name'];
-        $entry['user']         = $hide_user ? null : $this->urlf('/user/%s', [$raw['user_id']]);
-        $entry['course']       = $this->urlf('/course/%s', [$raw['seminar_id']]);
-        $entry['content_html'] = \ForumEntry::getContentAsHtml($raw['content']);
-        $entry['content']      = \ForumEntry::killEdit($raw['content']);
-
-        return $entry;
-    }
-
-
-    private static function isArea($entry)
-    {
-        return 1 === $entry['depth'];
-    }
-
-    private function createEntry($parent_id, $course_id, $subject, $content, $anonymous)
-    {
-        $topic_id  = self::generateID();
-
-        $data = [
-            'topic_id'    => $topic_id,
-            'seminar_id'  => $course_id,
-            'user_id'     => $GLOBALS['user']->id,
-            'name'        => $subject,
-            'content'     => $content,
-            'author'      => $GLOBALS['user']->getFullName(),
-            'author_host' => $_SERVER['REMOTE_ADDR'],
-            'anonymous'   => (int) $anonymous
-        ];
-        \ForumEntry::insert($data, $parent_id);
-
-        return $topic_id;
-    }
-
-    private function findCategory($category_id)
-    {
-        $result = [];
-
-        if ($cat = \ForumCat::get($category_id)) {
-            $result = $cat;
-            $result['course_id'] = $cat['seminar_id'];
-            $result['name']      = $cat['entry_name'];
-        } else {
-            $this->error(404);
-        }
-
-        return $result;
-    }
-
-    private function categoryToJson($category)
-    {
-        $json = $category;
-
-        $json['course'] = $this->urlf('/course/%s', [htmlReady($json['course_id'])]);
-        unset($json['course_id']);
-
-        $json['areas'] = $this->urlf('/forum_category/%s/areas', [$json['category_id']]);
-        $json['areas_count'] = $this->countAreas($json['category_id']);
-
-        return $json;
-    }
-
-    private function countAreas($category_id)
-    {
-        return sizeof(\ForumCat::getAreas($category_id));
-    }
-
-    private function getAreas($category_id, $offset = 0, $limit = 10)
-    {
-        $offset = (int) $offset;
-        $limit  = (int) $limit;
-
-        $areas = [];
-
-        foreach (\ForumCat::getAreas($category_id, $offset, $limit) as $area) {
-            $url = $this->urlf('/forum_entry/%s', [htmlReady($area['topic_id'])]);
-            $areas[$url] = $this->convertEntry($area);
-        }
-
-        return $areas;
-    }
-
-    private static function generateID()
-    {
-        return md5(uniqid(rand()));
-    }
-}
diff --git a/app/routes/Messages.php b/app/routes/Messages.php
deleted file mode 100644
index db9cb2e..0000000
--- a/app/routes/Messages.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition message_id ^[a-f0-9]{1,32}$
- * @condition user_id ^[a-f0-9]{1,32}$
- * @condition box ^(inbox|outbox)$
- */
-class Messages extends \RESTAPI\RouteMap
-{
-    /**
-     * Liefert die Anzahl der vorhandenen Nachrichten des autorisierten Nutzers
-     * zurück. Der Parameter bestimmt je nach Wert, auf welchen Bereich
-     * (Posteingang bzw. Postausgang) zugegriffen werden soll.
-     * Die Rückgabe beinhaltet jeweils die Anzahl aller Nachrichten sowie die
-     * Anzahl der ungelesenen Nachrichten.
-     *
-     * @head /user/:user_id/:box
-     */
-    public function indexOfMessages($user_id, $box)
-    {
-        if ($user_id !== self::currentUser()) {
-            $this->error(401);
-        }
-
-        $count = $this->countMessages($user_id, $box);
-
-        $this->headers([
-            'X-Messages-Total'  => $count['total'],
-            'X-Messages-Unread' => $count['unread'],
-        ]);
-
-        return null;
-    }
-
-    /**
-     * Liefert die vorhandenen Nachrichten des autorisierten Nutzers zurück.
-     *
-     * @get /user/:user_id/:box
-     */
-    public function getMessages($user_id, $box)
-    {
-        if ($user_id !== self::currentUser()) {
-            $this->error(401);
-        }
-
-        $ids   = $this->getMessageIds($user_id, $box);
-        $total = count($ids);
-
-        $ids = array_slice($ids, $this->offset, $this->limit);
-
-        $messages = [];
-        if (count($ids) > 0) {
-            \Message::findEachMany(function ($message) use (&$messages) {
-                $url = $this->urlf('/message/%s', $message->id);
-                $messages[$url] = $this->messageToJSON($message);
-            }, $ids, 'ORDER BY mkdate DESC');
-        }
-
-        return $this->paginated($messages, $total, compact('user_id', 'box'));
-    }
-
-    /**
-     * Liefert die Daten der angegebenen Nachricht zurück.
-     *
-     * @get /message/:message_id
-     */
-    public function showMessage($message_id)
-    {
-        $message = $this->requireMessage($message_id);
-        $message_json = $this->messageToJSON($message);
-        $this->etag(md5(serialize($message_json)));
-        return $message_json;
-    }
-
-
-    /**
-     * Get the root file folder of a message. The root file folder contains all
-     * files that were appended to the message.
-     *
-     * @get /message/:message_id/file_folder
-     */
-    public function getTopFolder($message_id)
-    {
-        //first we check if the user exists:
-        $message = \Message::find($message_id);
-
-        $user = \User::findCurrent();
-
-        if (!$user) {
-            $this->halt(404, 'User not found!');
-        }
-
-        if(!$message->permissionToRead($user->id)) {
-            $this->halt(403, 'You are not allowed to read this message or its appended files!');
-        }
-
-        //we can get the top folder:
-        $top_folder = \Folder::findTopFolder($message->id, 'message');
-
-        if($top_folder) {
-            $file_system_api = new FileSystem();
-            return $file_system_api->getFolder($top_folder->id);
-        } else {
-            $this->halt(404, 'Folder not found!');
-        }
-    }
-
-
-    /**
-     * Schreibt eine neue Nachricht.
-     *
-     * @post /messages
-     */
-    public function createMessage()
-    {
-        if (!mb_strlen($subject = trim($this->data['subject'] ?: ''))) {
-            $this->error(400, 'No subject provided');
-        }
-
-        if (!mb_strlen($message = trim($this->data['message'] ?: ''))) {
-            $this->error(400, 'No message provided');
-        }
-
-        $recipients = (array) ($this->data['recipients'] ?: null);
-        if (!sizeof($recipients)) {
-            $this->error(400, 'No recipient(s) provided');
-        }
-
-        $usernames = array_map(function ($id) { $user = \User::find($id); return @$user['username']; }, $recipients);
-
-        if (sizeof($usernames) !== sizeof(array_filter($usernames))) {
-            $this->error(400, "Some recipients do not exist.");
-        }
-
-        $message = \Message::send($GLOBALS['user']->id, $usernames, $subject, $message);
-        if (!$message) {
-            $this->error(500, 'Could not create message');
-        }
-
-        $this->redirect('message/' . $message->id, 201, "ok");
-    }
-
-
-    /**
-     * Eine Nachricht als (un)gelesen markieren.
-     *
-     * @put /message/:message_id
-     */
-    public function updateMessage($message_id)
-    {
-
-        $message = $this->requireMessage($message_id);
-        $user_id = $this->currentUser();
-
-        if (isset($this->data['unread'])) {
-            if ($this->data['unread']) {
-                $message->markAsUnread($user_id);
-            } else {
-                $message->markAsRead($user_id);
-            }
-        }
-
-        $this->halt(204);
-    }
-
-    /**
-     * Löscht eine Nachricht.
-     *
-     * @delete /message/:message_id
-     */
-    public function destroyMessage($message_id)
-    {
-        $message = $this->requireMessage($message_id);
-
-        $msgin = new \messaging();
-        if (!$msgin->delete_message($message_id, self::currentUser(), true)) {
-            $this->error(500);
-        }
-
-        $this->status(204);
-    }
-
-    /**************************************************/
-    /* PRIVATE HELPER METHODS                         */
-    /**************************************************/
-
-    private static function currentUser()
-    {
-        return $GLOBALS['user']->id;
-    }
-
-    private function requireMessage($message_id)
-    {
-        if (!$message = \Message::find($message_id)) {
-            $this->notFound("Message not found");
-        }
-
-        $current_user = self::currentUser();
-        $message_user = $message->originator->user_id === $current_user
-                      ? $message->originator
-                      : $message->receivers->findOneBy('user_id', $current_user);
-
-        if (!$message_user) {
-            $this->error(401);
-        }
-
-        if ($message_user->deleted) {
-            $this->notFound("Message not found");
-        }
-
-        return $message;
-    }
-
-    private function messageToJSON($message)
-    {
-        $user_id = self::currentUser();
-
-        $my_mu = $message->receivers->filter(function ($mu) use ($user_id) {
-            return $mu->user_id === $user_id;
-        });
-        if ($message->originator->user_id === $user_id) {
-            $my_mu[] = $message->originator;
-        }
-
-        $my_roles = [
-            'snd' => $message->autor_id === $user_id,
-            'rec' => in_array('rec', $my_mu->pluck('snd_rec')),
-        ];
-
-        $json = $message->toArray(words('message_id subject message mkdate priority'));
-
-        // formatted message
-        $json['message_html'] = formatReady($json['message']) ?: '';
-
-        // Tags
-        $json['tags'] = $message->getTags($user_id);
-
-        // sender
-        $sender = $message->getSender();
-        $json['sender'] = $this->urlf('/user/%s', [$message->author->id]);
-
-        // recipients
-        if ($my_roles['snd']) {
-            $json['recipients'] = [];
-            foreach ($message->getRecipients() as $r) {
-                $json['recipients'][] = $this->urlf('/user/%s', [$r->user_id]);
-            }
-        } else {
-            $json['recipients'] = [$this->urlf('/user/%s', [$user_id])];
-        }
-
-        // attachments
-        if ($message->attachment_folder && count($message->attachment_folder->file_refs) > 0) {
-            $json['attachments'] = [];
-            foreach ($message->attachment_folder->file_refs as $ref) {
-                $json['attachments'][] = $this->urlf('/file/%s', [$ref->id]);
-            }
-        }
-
-        // unread only if in inbox
-        if ($my_roles['rec']) {
-            foreach ($my_mu as $mu) {
-                if ($mu->snd_rec === 'rec') {
-                    $json['unread'] = !$mu->readed;
-                    break;
-                }
-            }
-        }
-
-        return $json;
-    }
-
-    private function countMessages($user_id, $box)
-    {
-        $condition = 'user_id = ? AND snd_rec = ? AND deleted = 0';
-        $params    = [$user_id, $box === 'inbox' ? 'rec' : 'snd'];
-
-        $total  = \MessageUser::countBySQL($condition, $params);
-        $unread = \MessageUser::countBySQL(
-            $condition . ' AND readed = 0',
-            $params
-        );
-
-        return compact('total', 'unread');
-    }
-
-    private function getMessageIds($user_id, $box)
-    {
-        return \MessageUser::findAndMapBySQL(function ($row) {
-            return $row->message_id;
-        }, 'user_id = ? AND snd_rec = ? AND deleted = 0 ORDER BY mkdate DESC', [
-            $user_id, $box === 'inbox' ? 'rec' : 'snd'
-        ]);
-    }
-
-}
diff --git a/app/routes/News.php b/app/routes/News.php
deleted file mode 100644
index c9b258b..0000000
--- a/app/routes/News.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition news_id ^[0-9a-f]{1,32}$
- * @condition course_id ^[0-9a-f]{1,32}$
- * @condition user_id ^[0-9a-f]{1,32}$
- * @condition comment_id ^[0-9a-f]{1,32}$
- */
-class News extends \RESTAPI\RouteMap
-{
-    public static function before()
-    {
-        require_once 'lib/models/StudipNews.class.php';
-    }
-
-    /**
-     * Globale News auslesen
-     *
-     * @get /studip/news
-     */
-    public function getGlobalNews()
-    {
-        list($json, $total) = $this->getRangedNews('studip');
-
-        $this->etag(md5(serialize($json)));
-        return $this->paginated($json, $total);
-    }
-
-    /**
-     * News einer Veranstaltung auslesen
-     *
-     * @get /course/:course_id/news
-     */
-    public function getCourseNews($course_id)
-    {
-        list($json, $total) = $this->getRangedNews($course_id);
-
-        $this->etag(md5(serialize($json)));
-        return $this->paginated($json, $total, compact('course_id'));
-    }
-
-    /**
-     * News eines Nutzers auslesen
-     *
-     * @get /user/:user_id/news
-     */
-    public function getUserNews($user_id)
-    {
-        list($json, $total) = $this->getRangedNews($user_id);
-
-        $this->etag(md5(serialize($json)));
-        return $this->paginated($json, $total, compact('user_id'));
-    }
-
-
-    /**
-     * News auslesen
-     *
-     * @get /news/:news_id
-     */
-    public function getNews($news_id)
-    {
-        $news = $this->requireNews($news_id);
-        $news_json = $this->newsToJson($news);
-
-        $this->lastmodified($news->chdate);
-        $this->expires($news->expire);
-        $this->etag(md5(serialize($news_json)));
-
-        return $news_json;
-    }
-
-    /**
-     * News löschen
-     *
-     * @delete /news/:news_id
-     */
-    public function destroyNews($news_id)
-    {
-        $news = $this->requireNews($news_id);
-
-        if (!$news->havePermission('delete', '', $GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-
-        $news->delete();
-        $this->status(204);
-    }
-
-
-    /**
-     * News updaten
-     *
-     * @put /news/:news_id
-     */
-    public function updateNews($news_id)
-    {
-        $news = $this->requireNews($news_id);
-        if (!$news->havePermission('edit', '', $GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-
-        if (isset($this->data['topic'])) {
-            if (!mb_strlen(trim($topic = $this->data['topic']))) {
-                $this->error(400, 'Topic must not be empty.');
-            }
-            $news->topic = $topic;
-        }
-
-        if (isset($this->data['body'])) {
-            if (!mb_strlen(trim($body = $this->data['body']))) {
-                $this->error(400, 'Body must not be empty.');
-            }
-            $news->body = $body;
-        }
-
-        if (isset($this->data['expire'])) {
-            $news->expire = (int) $this->data['expire'];
-        }
-
-        if (isset($this->data['allow_comments'])) {
-            $news->allow_comments = (int) $this->data['allow_comments'];
-        }
-
-        $news->chdate_uid = $GLOBALS['user']->id;
-
-        if (!$news->store()) {
-            $this->error(500, 'Could not update news');
-
-        }
-        $this->status(204);
-    }
-
-    /**
-     * News anlegen
-     *
-     * @post /course/:course_id/news
-     * @post /user/:user_id/news
-     * @post /studip/news
-     */
-    public function createNews($range_id = 'studip')
-    {
-
-        if (!\StudipNews::haveRangePermission('edit', $range_id, $GLOBALS['user']->id)) {
-            $this->error(401, "Not authorized to create a news here.");
-        }
-
-        $news = new \StudipNews();
-        $news->setData([
-            'user_id'        => $GLOBALS['user']->id,
-            'author'         => $GLOBALS['user']->getFullName(),
-            'topic'          => trim(@$this->data['topic']),
-            'body'           => trim(@$this->data['body']),
-            'date'           => time(),
-            'expire'         => isset($this->data['expire']) ? intval($this->data['expire']) : 2 * 7 * 24 * 60 * 60,
-            'allow_comments' => isset($this->data['allow_comments']) ? intval($this->data['allow_comments']) : 0
-        ]);
-        $news->addRange($range_id);
-
-        if ($errors = $this->validateNews($news)) {
-            $this->error(400, compact('errors'));
-        }
-
-        if (!$news->store()) {
-            $this->error(500);
-        }
-
-        $news->storeRanges();
-
-        $this->redirect('news/' . $news->id, 201, "ok");
-    }
-
-    /**
-     * News-Comments auslesen
-     *
-     * @get /news/:news_id/comments
-     */
-    public function getNewsComments($news_id)
-    {
-        $comments = $this->requireNews($news_id)->comments->orderBy("mkdate asc");
-
-        $total = count($comments);
-        $json = [];
-        foreach ($comments->limit($this->offset, $this->limit) as $comment) {
-            $tmp = $comment->toArray("comment_id object_id user_id content mkdate chdate");
-            $tmp['content_html'] = htmlReady($comment->content);
-            $json[$this->urlf('/comment/%s', [htmlReady($comment->id)])] = $tmp;
-        }
-
-        $this->etag(md5(serialize($json)));
-
-        return $this->paginated($json, $total, compact('news_id'));
-    }
-
-    /**
-     * News-Comment auslesen
-     *
-     * @get /comment/:comment_id
-     */
-    public function getComment($comment_id)
-    {
-        $comment = $this->requireComment($comment_id);
-        $comment_json = $this->commentToJson($comment);
-
-        $this->lastmodified($comment->chdate);
-        $this->etag(md5(serialize($comment_json)));
-
-        return $comment_json;
-    }
-
-    /**
-     * News-Comment anlegen
-     *
-     * @post /news/:news_id/comments
-     */
-    public function appendComment($news_id)
-    {
-        $news = $this->requireNews($news_id);
-
-        if (!$news->allow_comments) {
-            $this->error(409, 'Comments are not allowed');
-        }
-
-        if (!isset($this->data['content']) || !mb_strlen($content = trim($this->data['content']))) {
-            $this->error(400, 'Content required.');
-        }
-
-        $comment = new \StudipComment();
-        $comment->setData(
-            [
-                'object_id' => $news_id,
-                'user_id'   => $GLOBALS['user']->id,
-                'content'   => $content
-            ]);
-
-        if (!$comment->store()) {
-            $this->halt(500, 'Could not create comment.');
-        }
-
-        $this->redirect('comment/' . $comment->id, 201, "ok");
-    }
-
-    /**
-     * News-Comment löschen
-     *
-     * @delete /comment/:comment_id
-     */
-    public function destroyComment($comment_id)
-    {
-        $comment = $this->requireComment($comment_id);
-
-        if (!$comment->delete()) {
-            $this->error(500, 'Comment could not be deleted.');
-        }
-
-        $this->halt(204);
-    }
-
-
-    /**************************************************/
-    /* PRIVATE HELPER METHODS                         */
-    /**************************************************/
-
-    private function getRangedNews($range_id)
-    {
-
-        $news = \StudipNews::getNewsByRange($range_id, true, true);
-
-        if (!self::checkRangePermission($range_id, $GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-
-        $total = count($news);
-        $news = array_slice($news, $this->offset, $this->limit);
-
-        $json = [];
-        foreach ($news as $n) {
-            $json[$this->urlf('/news/%s', [$n->id])] = $this->newsToJson($n);
-        }
-
-        return [$json, $total];
-    }
-
-    private function validateNews($news)
-    {
-        $errors = [];
-
-        $retain = $_SESSION['messages'];
-        $_SESSION['messages'] = [];
-
-        if (!$news->validate()) {
-            foreach ($_SESSION['messages'] as $message_box) {
-                $errors[] = $message_box->message;
-            }
-        }
-
-        $_SESSION['messages'] = $retain;
-        return $errors;
-    }
-
-    private static function checkRangePermission($range_id, $user_id)
-    {
-        return \StudipNews::haveRangePermission('view', $range_id, $user_id);
-    }
-
-
-    private function requireNews($id)
-    {
-        if (!$news = \StudipNews::find($id)) {
-            $this->notFound("News not found");
-        }
-
-        if (!$news->havePermission('view', '', $GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-
-        return $news;
-    }
-
-    private function newsToJson($news)
-    {
-        $json = $news->toArray(words("news_id topic body date user_id expire allow_comments chdate chdate_uid mkdate"));
-
-        $json['topic'] = (string) $news->topic;
-        $json['body_html'] = formatReady((string) $news->body);
-        $json['chdate_uid'] = trim($json['chdate_uid']);
-
-        if ($news->allow_comments) {
-            $json['comments'] = $this->urlf('/news/%s/comments', [$news->id]);
-            $json['comments_count'] = sizeof($news->comments);
-        }
-
-        $json['ranges'] = [];
-        foreach ($news->news_ranges as $range) {
-            if (self::checkRangePermission($range->range_id, $GLOBALS['user']->id)) {
-                switch ($range->type) {
-                case 'global': $url = $this->url('/studip/news'); break;
-                case 'sem':    $url = $this->urlf('/course/%s/news', [$range->range_id]); break;
-                case 'user':   $url = $this->urlf('/user/%s/news', [$range->range_id]); break;
-                case 'inst':   $url = $this->urlf('/TODO/%s/news', [$range->range_id]); break;
-                case 'fak':    $url = $this->urlf('/TODO/%s/news', [$range->range_id]); break;
-                }
-
-                $json['ranges'][] = $url;
-            }
-        }
-        return $json;
-    }
-
-    private function requireComment($id)
-    {
-        if (!$comment = \StudipComment::find($id)) {
-            $this->notFound("Comment not found");
-        }
-        if (!$comment->news->havePermission('view', '', $GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-
-        return $comment;
-    }
-
-    private function commentToJson($comment)
-    {
-        $json = $comment->toArray(words("comment_id mkdate chdate content"));
-        $json['content_html'] = formatReady($json['content']);
-        $json['author']       = $this->urlf('/user/%s', [$comment->user_id]);
-        $json['news']         = $this->urlf('/news/%s', [$comment->object_id]);
-        return $json;
-    }
-}
diff --git a/app/routes/ResourceBooking.php b/app/routes/ResourceBooking.php
deleted file mode 100644
index a5d027f..0000000
--- a/app/routes/ResourceBooking.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains the REST class for the
- * room and resource management system.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class ResourceBooking extends \RESTAPI\RouteMap
-{
-
-    /**
-     * Helper method that either returns the specified data
-     * or simply an empty string in case that no request result
-     * is requested.
-     */
-    protected function sendReturnData($data)
-    {
-        if (\Request::submitted('quiet')) {
-            //Return nothing.
-            return '';
-        }
-
-        //Return data.
-        return $data;
-    }
-
-
-    /**
-     * Moves a resource booking, if permitted.
-     *
-     * @post /resources/booking/:booking_id/move
-     */
-    public function move($booking_id)
-    {
-        $booking = \ResourceBooking::find($booking_id);
-        if (!$booking) {
-            $this->notFound('Resource booking object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        if ($booking->isReadOnlyForUser($current_user)) {
-            throw new \AccessDeniedException();
-        }
-
-        $resource_id = \Request::get('resource_id');
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        $interval_id = \Request::get('interval_id');
-
-        //Try the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
-        $begin = \DateTime::createFromFormat(\DateTime::RFC3339, $begin_str);
-        $end = \DateTime::createFromFormat(\DateTime::RFC3339, $end_str);
-        if (!($begin instanceof \DateTime) || !($end instanceof \DateTime)) {
-            $tz = new \DateTime();
-            $tz = $tz->getTimezone();
-            //Try the ISO format without timezone:
-            $begin = \DateTime::createFromFormat('Y-m-d\TH:i:s', $begin_str, $tz);
-            $end = \DateTime::createFromFormat('Y-m-d\TH:i:s', $end_str, $tz);
-        }
-
-        //Check if a specific interval has been moved:
-        if ($interval_id) {
-            $interval = \ResourceBookingInterval::findOneBySql(
-                'interval_id = :interval_id AND booking_id = :booking_id',
-                [
-                    'interval_id' => $interval_id,
-                    'booking_id' => $booking->id
-                ]
-            );
-            if (!$interval) {
-                $this->notFound('Resource booking interval not found!');
-            }
-            $interval_begin = new \DateTime();
-            $interval_begin->setTimestamp($interval->begin);
-            $interval_end = new \DateTime();
-            $interval_end->setTimestamp($interval->end);
-
-            //Calculate the difference from the interval time range
-            //to the time range from the request. That difference
-            //is then applied to the booking.
-            $begin_diff = $interval_begin->diff($begin);
-            $end_diff = $interval_end->diff($end);
-
-            $new_booking_begin = new \DateTime();
-            $new_booking_begin->setTimestamp($booking->begin);
-            $new_booking_end = new \DateTime();
-            $new_booking_end->setTimestamp($booking->end);
-
-            $new_booking_begin = $new_booking_begin->add($begin_diff);
-            $new_booking_end = $new_booking_end->add($end_diff);
-            //We must substract the preparation time to the begin timestamp
-            //to get the real begin:
-            $real_begin = clone $new_booking_begin;
-            if ($booking->preparation_time > 0) {
-                $real_begin->sub(new \DateInterval('PT' . ($booking->preparation_time / 60 ) . 'M'));
-            }
-            $booking->begin = $real_begin->getTimestamp();
-            $booking->end = $new_booking_end->getTimestamp();
-        } else {
-            //We must substract the preparation time to the begin timestamp
-            //to get the real begin:
-            $real_begin = clone $begin;
-            if ($booking->preparation_time > 0) {
-                $real_begin->sub(new \DateInterval('PT' . ($booking->preparation_time / 60 ) . 'M'));
-            }
-            $booking->begin = $real_begin->getTimestamp();
-            $booking->end = $end->getTimestamp();
-        }
-        if ($resource_id) {
-            //The resource-ID has changed:
-            //The booking was moved from one resource to another.
-            $booking->resource_id = $resource_id;
-        }
-
-        //Update the booking_user_id field:
-        $booking->booking_user_id = \User::findCurrent()->id;
-
-        try {
-            $booking->store();
-            return $this->sendReturnData($booking->toRawArray());
-        } catch (\Exception $e) {
-            $this->halt(500, $e->getMessage());
-        }
-    }
-
-
-    /**
-     * Retrieves the intervals of the resource booking.
-     * These can be filtered by a time range.
-     *
-     * @get /resources/booking/:booking_id/intervals
-     */
-    public function getIntervals($booking_id)
-    {
-        $booking = \ResourceBooking::find($booking_id);
-        if (!$booking) {
-            $this->notFound('Resource booking object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        $resource = $booking->resource->getDerivedClassInstance();
-        if (!$resource->bookingPlanVisibleForUser($current_user)) {
-            throw new \AccessDeniedException();
-        }
-
-        //Get begin and end:
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        $begin = null;
-        $end = null;
-        if ($begin_str && $end_str) {
-            //Try the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
-            $begin = \DateTime::createFromFormat(\DateTime::RFC3339, $begin_str);
-            $end = \DateTime::createFromFormat(\DateTime::RFC3339, $end_str);
-            if (!($begin instanceof \DateTime) || !($end instanceof \DateTime)) {
-                $tz = new \DateTime();
-                $tz = $tz->getTimezone();
-                //Try the ISO format without timezone:
-                $begin = \DateTime::createFromFormat('Y-m-d\TH:i:s', $begin_str, $tz);
-                $end = \DateTime::createFromFormat('Y-m-d\TH:i:s', $end_str, $tz);
-            }
-        }
-
-        $sql = "booking_id = :booking_id ";
-        $sql_data = ['booking_id' => $booking->id];
-        if (($begin instanceof \DateTime) && ($end instanceof \DateTime)) {
-            $sql .= "AND begin >= :begin AND end <= :end ";
-            $sql_data['begin'] = $begin->getTimestamp();
-            $sql_data['end'] = $end->getTimestamp();
-        }
-        if (\Request::submitted('exclude_cancelled_intervals')) {
-            $sql .= "AND takes_place = '1' ";
-        }
-        $sql .= "ORDER BY begin ASC, end ASC";
-        $intervals = \ResourceBookingInterval::findBySql($sql, $sql_data);
-
-        $result = [];
-        foreach ($intervals as $interval) {
-            $result[] = $interval->toRawArray();
-        }
-
-        return $result;
-    }
-}
diff --git a/app/routes/ResourceCategories.php b/app/routes/ResourceCategories.php
deleted file mode 100644
index bdd3d15..0000000
--- a/app/routes/ResourceCategories.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains API routes related to ResourceCategory objects.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class ResourceCategories extends \RESTAPI\RouteMap
-{
-    /**
-     * Validate access to each route.
-     */
-    public function before()
-    {
-        if (!\ResourceManager::userHasGlobalPermission(\User::findCurrent(), 'admin')) {
-            throw new \AccessDeniedException();
-        }
-    }
-
-    /**
-     * Returns all defined resource categories.
-     *
-     * @get /resources/categories
-     */
-    public function getAllResourceCategories()
-    {
-        return \ResourceCategory::findAndMapBySql(
-            function (\ResourceCategory $category) {
-                return $category->toRawArray();
-            },
-            'TRUE ORDER BY name ASC'
-        );
-    }
-
-
-    /**
-     * Get a resource category object.
-     *
-     * @get /resources/category/:category_id
-     */
-    public function getResourceCategory($category_id)
-    {
-        $category = \ResourceCategory::find($category_id);
-        if (!$category) {
-            $this->notFound('ResourceCategory object not found!');
-        }
-
-        return $category->toRawArray();
-    }
-
-
-    /**
-     * Creates a resource category object.
-     *
-     * @post /resources/new_category
-     */
-    public function addResourceCategory()
-    {
-        $name = \Request::get('name');
-        $description = \Request::get('description');
-        $class_name = \Request::get('class_name');
-        $iconnr = \Request::int('iconnr');
-
-        $properties_name = \Request::getArray('properties_name');
-        $properties_type = \Request::getArray('properties_type');
-        $properties_requestable = \Request::getArray('properties_requestable');
-        $properties_protected = \Request::getArray('properties_protected');
-
-        $set_properties = [];
-        foreach ($properties_name as $key => $property_name) {
-            $set_properties[] = [
-                'name' => $property_name,
-                'type' => $properties_type[$key],
-                'requestable' => $properties_requestable[$key],
-                'protected' => $properties_protected[$key]
-            ];
-        }
-
-        //validation:
-        if (!$name) {
-            $this->halt(
-                400,
-                _('Der Name der Kategorie ist leer!')
-            );
-        }
-
-        if (!is_a($class_name, 'Resource', true)) {
-            $this->halt(
-                400,
-                _('Es wurde keine gültige Ressourcen-Datenklasse ausgewählt!')
-            );
-        }
-
-        switch ($class_name) {
-            case 'Location':
-                $category = \ResourceManager::createLocationCategory(
-                    $name,
-                    $description
-                );
-                break;
-            case 'Building':
-                $category = \ResourceManager::createBuildingCategory(
-                    $name,
-                    $description
-                );
-                break;
-            case 'Room':
-                $category = \ResourceManager::createRoomCategory(
-                    $name,
-                    $description
-                );
-                break;
-            default:
-                $category = \ResourceManager::createCategory(
-                    $name,
-                    $description,
-                    $class_name,
-                    false,
-                    $iconnr
-                );
-        }
-
-        if ($category->store() === false) {
-            $this->halt(
-                500,
-                _('Fehler beim Speichern der Kategorie!')
-            );
-        }
-
-        //After we have stored the category we must store
-        //the properties or create them, if necessary:
-
-        foreach ($set_properties as $set_property) {
-            $category->addProperty(
-                $set_property['name'],
-                $set_property['type'],
-                $set_property['requestable'],
-                $set_property['protected']
-            );
-        }
-
-        return $category->toRawArray();
-    }
-
-    /**
-     * Modifies a resource category.
-     *
-     * @put /resources/category/:category_id
-     */
-    public function editResourceCategory($category_id)
-    {
-        $category = \ResourceCategory::find($category_id);
-        if (!$category) {
-            $this->notFound('ResourceCategory object not found!');
-        }
-
-        if ($category->system) {
-            $this->halt(403, 'System categories must not be modified!');
-            return;
-        }
-
-        $name = $this->data['name'];
-        $description = $this->data['description'];
-        $iconnr = intval($this->data['iconnr']);
-
-        //validation:
-        if ($name) {
-            $category->name = $name;
-        }
-        if ($description) {
-            $category->description = $description;
-        }
-        if ($iconnr) {
-            $category->iconnr = $iconnr;
-        }
-
-        if ($category->store() === false) {
-            $this->halt(
-                500,
-                'Error while saving the category!'
-            );
-        }
-
-        return $category->toRawArray();
-    }
-
-
-    /**
-     * Deletes a resource category.
-     *
-     * @delete /resources/category/:category_id
-     */
-    public function deleteResourceCategory($category_id)
-    {
-        $category = \ResourceCategory::find($category_id);
-        if (!$category) {
-            $this->notFound('ResourceCategory object not found!');
-        }
-
-        if ($category->system) {
-            $this->halt(403,'System resource categories must not be deleted!');
-            return;
-        }
-
-        if ($category->delete()) {
-            return 'OK';
-        } else {
-            $this->halt(
-                500,
-                'Error while deleting the resource category!'
-            );
-        }
-    }
-
-
-    /**
-     * Get all resource category property objects for a resource category.
-     *
-     * @get /resources/category/:category_id/properties
-     */
-    public function getResourceCategoryProperties($category_id)
-    {
-        $category = \ResourceCategory::find($category_id);
-        if (!$category) {
-            $this->notFound('ResourceCategory object not found!');
-        }
-
-        $result = [];
-        $properties = \ResourceCategoryProperty::findBySql(
-            'INNER JOIN resource_property_definitions rpd
-            USING (property_id)
-            WHERE category_id = :category_id ORDER BY rpd.name ASC',
-            [
-                'category_id' => $category->id
-            ]
-        );
-
-        if ($properties) {
-            foreach ($properties as $property) {
-                $data = $property->toRawArray();
-                $data['name'] = $property->definition->name;
-                $data['type'] = $property->definition->type;
-                $result[] = $data;
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns all resources which belong to the specified category.
-     * The result set can be limited by the parameters 'offset' and 'limit'.
-     * If the parameter 'with_full_name' is set to 1, the resources full name
-     * as provided by its responsible class, is added to the result set.
-     *
-     * @get /resources/category/:category_id/resources
-     */
-    public function getResourceCategoryResources($category_id)
-    {
-        $category = \ResourceCategory::find($category_id);
-        if (!$category) {
-            $this->notFound('ResourceCategory object not found!');
-        }
-
-        $offset = \Request::int('offset');
-        $limit = \Request::int('limit');
-        $with_full_name = \Request::get('with_full_name');
-
-        $result = [];
-
-        $sql = 'category_id = :category_id ORDER BY name ASC ';
-        $sql_array = ['category_id' => $category->id];
-
-        if ($limit > 0) {
-            $sql .= 'limit :limit ';
-            $sql_array['limit'] = $limit;
-            if ($offset > 0) {
-                $sql .= 'offset :offset ';
-                $sql_array['offset'] = $offset;
-            }
-        }
-
-        $resources = \Resource::findBySql($sql, $sql_array);
-
-        if ($resources) {
-            foreach ($resources as $r) {
-                if ($with_full_name) {
-                    $r = $r->getDerivedClassInstance();
-                    $data = $r->toRawArray();
-                    $data['full_name'] = $r->getFullName();
-                    $result[] = $data;
-                } else {
-                    $result[] = $r->toRawArray();
-                }
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Creates a resource.
-     *
-     * @post /resources/category/:category_id/create_resource
-     */
-    public function createResource($category_id)
-    {
-        $category = \ResourceCategory::find($category_id);
-        if (!$category) {
-            $this->notFound('ResourceCategory object not found!');
-        }
-
-
-        $name = \Request::get('name');
-        $description = \Request::get('description');
-        $parent_id = \Request::get('parent_id');
-        $properties = \Request::getArray('properties');
-
-        if (!$name) {
-            $this->halt(
-                400,
-                'The parameter \'name\' is not set!'
-            );
-        }
-
-        try {
-            $resource = $category->createResource(
-                $name,
-                $description,
-                $parent_id,
-                $properties
-            );
-
-            return $resource;
-        } catch (\Exception $e) {
-            $this->halt(
-                400,
-                $e->getMessage()
-            );
-        }
-    }
-}
diff --git a/app/routes/ResourcePermissions.php b/app/routes/ResourcePermissions.php
deleted file mode 100644
index be5c647..0000000
--- a/app/routes/ResourcePermissions.php
+++ /dev/null
@@ -1,585 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains API routes related to ResourcePermission
- * and ResourceTemporaryPermission objects.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class ResourcePermissions extends \RESTAPI\RouteMap
-{
-
-    //Methods for permanent permissions:
-
-
-    /**
-     * Get the permission levels of users for the specified resource.
-     *
-     * @param levels: Limit the result set to the specified permission levels.
-     *     Allowed permission levels: user, autor, tutor, admin.
-     *     The permission levels have to be comma separated like in the
-     *     following example: "autor,tutor,admin".
-     *
-     * @get /resources/permissions/:resource_id
-     */
-    public function getResourcePermissions($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'admin')) {
-            throw new \AccessDeniedException();
-        }
-
-        $levels_str = \Request::get('levels');
-        $levels = [];
-        if ($levels_str) {
-            $levels = explode(',', $levels_str);
-        }
-
-        $sql = 'resource_id = :resource_id ';
-        $sql_array = [
-            'resource_id' => $resource->id
-        ];
-
-        if ($levels) {
-            $sql .= 'AND perms IN ( :levels ) ';
-            $sql_array['levels'] = $levels;
-        }
-
-        $permissions = \ResourcePermission::findBySql($sql, $sql_array);
-
-        $result = [];
-        if ($permissions) {
-            foreach ($permissions as $permission) {
-                $result[] = $permission->toRawArray();
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns the permissions a specific user has on a specified resource.
-     *
-     * @get /resources/permissions/:resource_id/:user:_id
-     */
-    public function getPermission($resource_id, $user_id)
-    {
-        if ($resource_id !== 'global') {
-            if (!\Resource::exists($resource_id)) {
-                $this->halt(
-                    404,
-                    'Resource not found!'
-                );
-            }
-        }
-
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->halt(
-                400,
-                'No user was provided!'
-            );
-        }
-
-        $current_user = \User::findCurrent();
-
-        if (!\ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
-            if ($resource_id !== 'global') {
-                $resource = \Resource::find($resource_id);
-                $resource = $resource->getDerivedClassInstance();
-                if (!$resource->userHasPermission($current_user, 'admin')) {
-                    $this->halt(403);
-                }
-            } else {
-                //$resource_id == 'global': One must be admin
-                //to perform this action!
-                $this->halt(403);
-            }
-        }
-
-        $permission = \ResourcePermission::findOneBySql(
-            "resource_id = :resource_id AND user_id = :user_id",
-            [
-                'resource_id' => $resource_id,
-                'user_id' => $user->id
-            ]
-        );
-
-        if ($permission) {
-            return $permission->toRawArray();
-        } else {
-            //The user already had no global permissions!
-            return NULL;
-        }
-    }
-
-
-    /**
-     * @post /resources/permissions/:resource_id/:user_id
-     */
-    public function setPermission($resource_id, $user_id)
-    {
-        if ($resource_id !== 'global') {
-            if (!\Resource::exists($resource_id)) {
-                $this->halt(
-                    404,
-                    'Resource not found!'
-                );
-                return;
-            }
-        }
-
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->halt(
-                400,
-                'No user was provided!'
-            );
-        }
-
-        $current_user = \User::findCurrent();
-
-        if (!\ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
-            if ($resource_id !== 'global') {
-                $resource = \Resource::find($resource_id);
-                $resource = $resource->getDerivedClassInstance();
-                if (!$resource->userHasPermission($current_user, 'admin')) {
-                    $this->halt(403);
-                }
-            } else {
-                //$resource_id == 'global': One must be admin
-                //to perform this action!
-                $this->halt(403);
-            }
-        }
-
-        //Verify permission level:
-        $perms = \Request::get('perms');
-
-        if (!in_array($perms, ['user', 'autor', 'tutor', 'admin'])) {
-            $this->halt(
-                400,
-                'Invalid permission level specified!'
-            );
-        }
-
-        //Check if permissions are already present for the user.
-        //If not, create a new permission object.
-        $permission = \ResourcePermission::findOneBySql(
-            "resource_id = :resource_id AND user_id = :user_id",
-            [
-                'resource_id' => $resource_id,
-                'user_id' => $user->id
-            ]
-        );
-
-        if (!$permission) {
-            $permission = new \ResourcePermission();
-            $permission->resource_id = $resource_id;
-            $permission->user_id = $user->id;
-        }
-
-        $permission->perms = $perms;
-
-        if ($permission->store() === false) {
-            $this->halt(
-                500,
-                'Error while saving permissions!'
-            );
-        }
-
-        return $permission->toRawArray();
-    }
-
-
-    /**
-     * @delete /resources/permissions/:resource_id/:user_id
-     */
-    public function deletePermission($resource_id, $user_id)
-    {
-        if ($resource_id !== 'global' && !\Resource::exists($resource_id)) {
-            $this->notFound('Resource not found!');
-        }
-
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->halt(
-                400,
-                'No user was provided!'
-            );
-        }
-
-        $current_user = \User::findCurrent();
-
-        if (!\ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
-            if ($resource_id !== 'global') {
-                $resource = \Resource::find($resource_id);
-                $resource = $resource->getDerivedClassInstance();
-                if (!$resource->userHasPermission($current_user, 'admin')) {
-                    $this->halt(403);
-                }
-            } else {
-                //$resource_id == 'global': One must be admin
-                //to perform this action!
-                $this->halt(403);
-            }
-        }
-
-        $permission = \ResourcePermission::findOneBySql(
-            "resource_id = :resource_id AND user_id = :user_id",
-            [
-                'resource_id' => $resource_id,
-                'user_id' => $user->id
-            ]
-        );
-
-        if (!$permission) {
-            //The user already had no global permissions!
-            return 'OK';
-        }
-
-        if ($permission->delete()) {
-            return 'OK';
-        } else {
-            $this->halt(
-                500,
-                'Error while deleting global permissions!'
-            );
-        }
-    }
-
-
-    //Methods for temporary permissions:
-
-
-    /**
-     * Get the temporary permission levels of users for the specified resource.
-     * The begin and end parameters are mandatory to determine a time range
-     * to collect the temporary permissions in that range.
-     *
-     * @param begin: The begin timestamp of the time range.
-     * @param end: The end timestamp of the time range.
-     * @param levels: Limit the result set to the specified temporary permission
-     *     levels. Allowed permission levels: user, autor, tutor, admin.
-     *     The permission levels have to be comma separated like in the
-     *     following example: "autor,tutor,admin".
-     *
-     * @get /resources/temporary_permissions/:resource_id
-     */
-    public function getTemporaryResourcePermissions($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'admin')) {
-            throw new \AccessDeniedException();
-        }
-
-        $begin = \Request::get('begin');
-        $end = \Request::get('end');
-        $levels_str = \Request::get('levels');
-        $levels = [];
-        if ($levels_str) {
-            $levels = explode(',', $levels_str);
-        }
-
-        if (!$begin or !$end) {
-            //Use the current day:
-            $begin = strtotime('today 0:00:00');
-            $end = strtotime('today 23:59:59');
-        }
-
-        $sql = 'resource_id = :resource_id
-               AND
-               ((begin >= :begin AND begin <= :end)
-               OR
-               (end >= :begin AND end <= :end))
-               OR
-               (begin < :begin AND end > :end)';
-        $sql_array = [
-            'resource_id' => $resource->id,
-            'begin' => $begin,
-            'end' => $end
-        ];
-
-        if ($levels) {
-            $sql .= 'AND perms IN ( :levels ) ';
-            $sql_array['levels'] = $levels;
-        }
-
-        return \ResourceTemporaryPermission::findAndMapBySql(
-            function (\ResourceTemporaryPermission $permission) {
-                return $permission->toRawArray();
-            },
-            $sql,
-            $sql_array
-        );
-    }
-
-
-    /**
-     * Returns the permissions a specific user has on a specified resource.
-     *
-     * @get /resources/temporary_permissions/:resource_id/:user:_id
-     */
-    public function getTemporaryPermission($resource_id, $user_id)
-    {
-        if ($resource_id !== 'global') {
-            if (!\Resource::exists($resource_id)) {
-                $this->notFound('Resource not found!');
-            }
-        }
-
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->halt(
-                400,
-                'No user was provided!'
-            );
-        }
-
-        $current_user = \User::findCurrent();
-
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        $begin = null;
-        $end = null;
-        $with_time_range = false;
-        if ($begin_str && $end_str) {
-            $with_time_range = true;
-            $begin = new \DateTime();
-            $begin->setTimestamp($begin_str);
-            $end = new \DateTime();
-            $end->setTimestamp($end_str);
-        }
-
-        if (!\ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
-            if ($resource_id !== 'global') {
-                $resource = \Resource::find($resource_id);
-                $resource = $resource->getDerivedClassInstance();
-                if (!$resource->userHasPermission($current_user, 'admin')) {
-                    $this->halt(403);
-                }
-            } else {
-                //$resource_id == 'global': One must be admin
-                //to perform this action!
-                $this->halt(403);
-            }
-        }
-
-        $permissions = null;
-        if ($with_time_range) {
-            $permissions = \ResourceTemporaryPermission::findBySql(
-                "resource_id = :resource_id AND user_id = :user_id
-                AND (
-                    (begin >= :begin AND begin <= :end)
-                    OR
-                    (end >= :begin AND end <= :end)
-                )",
-                [
-                    'resource_id' => $resource_id,
-                    'user_id' => $user->id,
-                    'begin' => $begin->getTimestamp(),
-                    'end' => $end->getTimestamp()
-                ]
-            );
-        } else {
-            $permissions = \ResourceTemporaryPermission::findBySql(
-                "resource_id = :resource_id AND user_id = :user_id",
-                [
-                    'resource_id' => $resource_id,
-                    'user_id' => $user->id
-                ]
-            );
-        }
-
-        if ($permissions) {
-            $result = [];
-            foreach ($permissions as $permission) {
-                $result[] = $permission->toRawArray();
-            }
-            return $result;
-        } else {
-            //The user already had no global permissions!
-            return NULL;
-        }
-    }
-
-
-    /**
-     * Sets temporary permissions for a user.
-     *
-     * @param begin The begin timestamp for the temporary permisssion.
-     * @param end The end timestamp for the temporary permission.
-     * @param perms The permission level for the temporary permission.
-     *
-     * @post /resources/temporary_permissions/:resource_id/:user_id
-     */
-    public function setTemporaryPermission($resource_id, $user_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource not found!');
-        }
-
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->notFound('User not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        if (!\ResourceManager::userHasGlobalPermission($current_user, 'admin')
-            && !$resource->userHasPermission($current_user, 'admin')) {
-            $this->halt(403);
-        }
-
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        if (!$begin_str || !$end_str) {
-            $this->halt(
-                400,
-                'No time range specified for temporary permission!'
-            );
-        }
-
-        $begin = new \DateTime();
-        $begin->setTimestamp($begin_str);
-        $end = new \DateTime();
-        $end->setTimestamp($end_str);
-
-        //Verify permission level:
-        $perms = \Request::get('perms');
-
-        if (!in_array($perms, ['user', 'autor', 'tutor', 'admin'])) {
-            $this->halt(
-                400,
-                'Invalid permission level specified!'
-            );
-        }
-
-        //Check if permissions are already present for the user.
-        //If not, create a new permission object.
-        $permission = \ResourceTemporaryPermission::findOneBySql(
-            "resource_id = :resource_id AND user_id = :user_id
-            AND begin = :begin AND end = :end",
-            [
-                'resource_id' => $resource_id,
-                'user_id' => $user->id,
-                'begin' => $begin->getTimestamp(),
-                'end' => $end->getTimestamp()
-            ]
-        );
-
-        if (!$permission) {
-            $permission = new \ResourceTemporaryPermission();
-            $permission->resource_id = $resource_id;
-            $permission->user_id = $user->id;
-            $permission->begin = $begin->getTimestamp();
-            $permission->end = $end->getTimestamp();
-        }
-
-        $permission->perms = $perms;
-
-        if ($permission->store() === false) {
-            $this->halt(
-                500,
-                'Error while saving permissions!'
-            );
-        }
-
-        return $permission->toRawArray();
-    }
-
-
-    /**
-     * Deletes all temporary permissions of a user.
-     * If a time interval is given all permissions inside the interval
-     * are deleted.
-     *
-     * @delete /resources/temporary_permissions/:resource_id/:user_id
-     */
-    public function deleteTemporaryPermission($resource_id, $user_id)
-    {
-        if ($resource_id !== 'global') {
-            if (!\Resource::exists($resource_id)) {
-                $this->notFound('Resource not found!');
-            }
-        }
-
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->notFound('User not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        if (!\ResourceManager::userHasGlobalPermission($current_user, 'admin')) {
-            if ($resource_id !== 'global') {
-                $resource = \Resource::find($resource_id);
-                $resource = $resource->getDerivedClassInstance();
-                if (!$resource->userHasPermission($current_user, 'admin')) {
-                    $this->halt(403);
-                }
-            } else {
-                //$resource_id == 'global': One must be admin
-                //to perform this action!
-                $this->halt(403);
-            }
-        }
-
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        $begin = null;
-        $end = null;
-        $with_time_range = false;
-        if ($begin_str and $end_str) {
-            $with_time_range = true;
-            $begin = new \DateTime();
-            $begin->setTimestamp($begin_str);
-            $end = new \DateTime();
-            $end->setTimestamp($end_str);
-        }
-
-        if ($with_time_range) {
-            \ResourceTemporaryPermission::deleteBySql(
-                "resource_id = :resource_id AND user_id = :user_id
-                AND (
-                    (begin >= :begin AND end <= :end)
-                )",
-                [
-                    'resource_id' => $resource_id,
-                    'user_id' => $user->id,
-                    'begin' => $begin->getTimestamp(),
-                    'end' => $end->getTimestamp()
-                ]
-            );
-        } else {
-            \ResourceTemporaryPermission::deleteBySql(
-                "resource_id = :resource_id AND user_id = :user_id",
-                [
-                    'resource_id' => $resource_id,
-                    'user_id' => $user->id
-                ]
-            );
-        }
-
-        return 'OK';
-    }
-}
diff --git a/app/routes/ResourceProperties.php b/app/routes/ResourceProperties.php
deleted file mode 100644
index 2ddbbaf..0000000
--- a/app/routes/ResourceProperties.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains API routes related to ResourceProperty objects.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class ResourceProperties extends \RESTAPI\RouteMap
-{
-    /**
-     * Validate access to each route.
-     */
-    public function before()
-    {
-        if (!\ResourceManager::userHasGlobalPermission(\User::findCurrent(), 'admin')) {
-            throw new \AccessDeniedException();
-        }
-    }
-
-    /**
-     * Returns all resource property definitions.
-     *
-     * @get /resources/properties
-     */
-    public function getAllResourcePropertyDefinitions()
-    {
-        $properties = \ResourcePropertyDefinition::findBySql('TRUE ORDER BY name ASC');
-
-        $result = [];
-
-        if ($properties) {
-            foreach ($properties as $p) {
-                $result[] = $p->toRawArray();
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Creates a new resource property definition.
-     *
-     * @post /resources/add_property
-     */
-    public function addResourcePropertyDefinition()
-    {
-        $name = \Request::get('name');
-        $description = \Request::i18n('description');
-        $type = \Request::get('type');
-        $write_permission_level = \Request::get('write_permission_level');
-        $options = \Request::get('options', '');
-        $range_search = \Request::bool('range_search');
-
-        if (!$name) {
-            $this->halt(
-                400,
-                'The field \'name\' must not be empty!'
-            );
-        }
-        if (!in_array($type, \ResourcePropertyDefinition::getDefinedTypes())) {
-            $this->halt(
-                400,
-                'Invalid property type specified!'
-            );
-        }
-        if (!in_array($write_permission_level, ['user', 'autor', 'tutor', 'admin'])) {
-            $this->halt(
-                400,
-                'Invalid permission level in field \'write_permission_level\'!'
-            );
-        }
-
-        $property = new \ResourcePropertyDefinition();
-        $property->name = $name;
-        $property->description = $description;
-        $property->type = $type;
-        $property->options = $options ?: '';
-        $property->range_search = $range_search;
-        $property->write_permission_level = $write_permission_level;
-
-        if (!$property->store()) {
-            $this->halt(
-                500,
-                'Error while saving the property!'
-            );
-        }
-        return $property->toRawArray();
-    }
-
-
-    /**
-     * Get a resource property definition object.
-     *
-     * @get /resources/property/:property_id
-     */
-    public function getResourcePropertyDefinition($property_id)
-    {
-        $property = \ResourcePropertyDefinition::find($property_id);
-        if (!$property) {
-            $this->notFound('ResourcePropertyDefinition object not found!');
-        }
-
-        return $property->toRawArray();
-    }
-
-
-    /**
-     * Modifies a resource property definition.
-     *
-     * @put /resources/property/:property_id
-     */
-    public function editResourcePropertyDefinition($property_id)
-    {
-        $property = \ResourcePropertyDefinition::find($property_id);
-        if (!$property) {
-            $this->notFound('ResourcePropertyDefinition object not found!');
-        }
-
-        if ($property->system) {
-            $this->halt(
-                403,
-                'System properties must not be edited!'
-            );
-        }
-
-        $name = $this->data['name'];
-        $description = $this->data['description'];
-        $type = $this->data['type'];
-        $write_permission_level = $this->data['write_permission_level'];
-        $options = $this->data['options'];
-        $range_search = $this->data['range_search'];
-
-        if ($name) {
-            $property->name = $name;
-        }
-
-        if ($description) {
-            $property->description = $description;
-        }
-
-        if ($type) {
-            if (!in_array($type, \ResourcePropertyDefinition::getDefinedTypes())) {
-                $this->halt(
-                    400,
-                    'Invalid property type specified!'
-                );
-            }
-            $property->type = $type;
-        }
-
-        if ($write_permission_level) {
-            if (!in_array($write_permission_level, ['user', 'autor', 'tutor', 'admin'])) {
-                $this->halt(
-                    400,
-                    'Invalid permission level in field \'write_permission_level\'!'
-                );
-            }
-            $property->write_permission_level = $write_permission_level;
-        }
-
-        if ($options) {
-            $property->options = $options;
-        }
-
-        if ($range_search) {
-            $property->range_search = $range_search;
-        }
-
-        if ($property->isDirty()) {
-            if ($property->store()) {
-                return $property->toRawArray();
-            } else {
-                $this->halt(
-                    500,
-                    'Error while saving the property!'
-                );
-            }
-        }
-
-        return $property->toRawArray();
-    }
-
-
-    /**
-     * Deletes a resource property definition object.
-     *
-     * @delete /resources/property/:property_id
-     */
-    public function deleteResourcePropertyDefinition($property_id)
-    {
-        $property = \ResourcePropertyDefinition::find($property_id);
-        if (!$property) {
-            $this->notFound('ResourcePropertyDefinition object not found!');
-        }
-
-        if (!\ResourceManager::userHasGlobalPermission(\User::findCurrent(), 'admin')) {
-            $this->halt(403);
-        }
-
-        //Check if the property is in use:
-
-        if ($property->isInUse()) {
-            $this->halt(
-                403,
-                'The property is in use and can therefore not be deleted!'
-            );
-        }
-
-        if ($property->delete()) {
-            return "OK";
-        } else {
-            $this->halt(
-                500,
-                'Error while deleting resource property definition!'
-            );
-        }
-    }
-}
diff --git a/app/routes/ResourceRequest.php b/app/routes/ResourceRequest.php
deleted file mode 100644
index 24dfd2e..0000000
--- a/app/routes/ResourceRequest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains the REST class for resource requests from the
- * room and resource management system.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class ResourceRequest extends \RESTAPI\RouteMap
-{
-
-    /**
-     * Helper method that either returns the specified data
-     * or simply an empty string in case that no request result
-     * is requested.
-     */
-    protected function sendReturnData($data)
-    {
-        if (\Request::submitted('quiet')) {
-            //Return nothing.
-            return '';
-        }
-
-        //Return data.
-        return $data;
-    }
-
-
-    /**
-     * Moves a resource request, if permitted.
-     *
-     * @post /resources/request/:request_id/move
-     */
-    public function move($request_id)
-    {
-        $request = \ResourceRequest::find($request_id);
-        if (!$request) {
-            $this->notFound('Resource request object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        if ($request->isReadOnlyForUser($current_user)) {
-            throw new \AccessDeniedException();
-        }
-
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-
-        //Try the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
-        $begin = \DateTime::createFromFormat(\DateTime::RFC3339, $begin_str);
-        $end = \DateTime::createFromFormat(\DateTime::RFC3339, $end_str);
-        if (!($begin instanceof \DateTime) || !($end instanceof \DateTime)) {
-            $tz = new \DateTime();
-            $tz = $tz->getTimezone();
-            $begin = \DateTime::createFromFormat('Y-m-d\TH:i:s', $begin_str, $tz);
-            $end = \DateTime::createFromFormat('Y-m-d\TH:i:s', $end_str, $tz);
-        }
-
-        $request->begin = $begin->getTimestamp();
-        $request->end = $end->getTimestamp();
-
-        try {
-            $request->store();
-            return $this->sendReturnData($request->toRawArray());
-        } catch (\Exception $e) {
-            $this->halt(500, $e->getMessage());
-        }
-    }
-
-
-    /**
-     * Changes the reply comment of a request.
-     *
-     * @post /resources/request/:request_id/edit_reply_comment
-     */
-    public function editReplyComment($request_id)
-    {
-        $request = \ResourceRequest::find($request_id);
-        if (!$request) {
-            $this->notFound('Resource request object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        if ($request->isReadOnlyForUser($current_user)) {
-            throw new \AccessDeniedException();
-        }
-
-        $request->reply_comment = \Request::get('reply_comment');
-
-        try {
-            if ($request->store() === false) {
-                throw new \RuntimeException('Could not store comment');
-            }
-        } catch (\Exception $e) {
-            $this->halt(500, $e->getMessage());
-        }
-
-        return $this->sendReturnData($request->toRawArray());
-    }
-
-
-    /**
-     * Changes the reply comment of a request.
-     *
-     * @post /resources/request/:request_id/toggle_marked
-     */
-    public function toggleMarkedFlag($request_id)
-    {
-        $request = \ResourceRequest::find($request_id);
-        if (!$request) {
-            $this->notFound('Resource request object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        if ($request->isReadOnlyForUser($current_user)) {
-            throw new \AccessDeniedException();
-        }
-
-        //Switch to the next marking state or return to the unmarked state
-        //if the next marking state would be after the last defined
-        //marking state.
-        $request->marked = (++$request->marked % \ResourceRequest::MARKING_STATES);
-
-        if ($request->isDirty()) {
-            $request->store();
-        }
-
-        return $request;
-    }
-}
diff --git a/app/routes/Resources.php b/app/routes/Resources.php
deleted file mode 100644
index 7117546..0000000
--- a/app/routes/Resources.php
+++ /dev/null
@@ -1,950 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains the REST class for the
- * room and resource management system.
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Resources extends \RESTAPI\RouteMap
-{
-
-    //Resource routes:
-
-
-    /**
-     * Get a resource object.
-     * @param derived_class: If the URL parameter derived_class is set
-     *     the resource object is converted to an instance of the
-     *     class that does correct handling of the resource object.
-     *
-     * @get /resources/resource/:resource_id
-     */
-    public function getResource($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        if (\Request::submitted('derived_classes')) {
-            $resource = $resource->getDerivedClassInstance();
-        }
-
-        $result = $resource->toRawArray();
-
-        $result['full_name'] = $resource->getFullName();
-        $result['has_children'] = $resource->children ? true : false;
-
-        return $result;
-    }
-
-
-    /**
-     * Modifies a resource object.
-     *
-     * @put /resources/resource/:resource_id
-     */
-    public function editResource($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'autor')) {
-            $this->halt(403);
-            return;
-        }
-
-        $name = $this->data['name'];
-        $description = $this->data['description'];
-        $parent_id = $this->data['parent_id'];
-        $properties = $this->data['properties'];
-
-        if ($name) {
-            $resource->name = $name;
-        }
-        if ($description) {
-            $resource->description = $description;
-        }
-        if ($parent_id) {
-            if (!\Resource::exists($parent_id)) {
-                $this->halt(
-                    400,
-                    'No resource exists with the ID \'' . $parent_id . '\'!'
-                );
-            }
-            $resource->parent_id = $parent_id;
-        }
-        if ($properties) {
-            foreach ($properties as $name => $value) {
-                try {
-                    $resource->setProperty($name, $value, $GLOBALS['user']->id);
-                } catch (\AccessDeniedException $e) {
-                    $this->halt(
-                        403,
-                        $e->getMessage()
-                    );
-                } catch (\Exception $e) {
-                    $this->halt(
-                        500,
-                        $e->getMessage()
-                    );
-                }
-            }
-        }
-
-        if ($resource->isDirty()) {
-            if ($resource->store()) {
-                return $resource->toRawArray();
-            } else {
-                $this->halt(
-                    500,
-                    'Error while saving the resource object!'
-                );
-            }
-        }
-        return $resource->toRawArray();
-    }
-
-
-    /**
-     * Deletes a resource object.
-     *
-     * @delete /resources/resource/:resource_id
-     */
-    public function deleteResource($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'admin')) {
-            $this->halt(403);
-            return;
-        }
-
-        if (\Request::submitted('derived_classes')) {
-            $resource = $resource->getDerivedClassInstance();
-        }
-
-        if ($resource->delete()) {
-            return 'OK';
-        } else {
-            $this->halt(
-                500,
-                'Error while deleting the resource object!'
-            );
-        }
-    }
-
-
-    /**
-     * Returns the child resources of a resource object, if they exist.
-     *
-     * @get /resources/resource/:resource_id/children
-     */
-    public function getResourceChildren($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        $use_derived_classes = (bool) \Request::submitted('derived_classes');
-
-        $result = [];
-
-        $children = \Resource::findBySql(
-            'parent_id = :resource_id
-    ORDER BY name ASC',
-            [
-                'resource_id' => $resource->id
-            ]
-        );
-        if ($children) {
-            foreach ($children as $child) {
-                if ($use_derived_classes) {
-                    $child = $child->getDerivedClassInstance();
-                }
-                $result[] = $child->toRawArray();
-            }
-        }
-        return $result;
-    }
-
-
-    /**
-     * Returns the parent resource of a resource object, if it exists.
-     *
-     * @get /resources/resource/:resource_id/parent
-     */
-    public function getResourceParent($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        if (!$resource->parent) {
-            $this->notFound('This resource has no parent!');
-        }
-
-        $use_derived_classes = (bool) \Request::submitted('derived_classes');
-
-        if ($use_derived_classes) {
-            $parent = $resource->parent->getDerivedClassInstance();
-            return $parent->toRawArray();
-        }
-
-        return $resource->parent->toRawArray();
-    }
-
-
-    /**
-     * Get all property objects of a resource.
-     *
-     * @get /resources/resource/:resource_id/properties
-     */
-    public function getResourceProperties($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        $result = [];
-        $properties = \ResourceProperty::findBySql(
-            'INNER JOIN resource_property_definitions rpd
-            ON resource_properties.property_id = rpd.property_id
-            WHERE
-            resource_properties.resource_id = :resource_id
-            ORDER BY rpd.name ASC',
-            [
-                'resource_id' => $resource->id
-            ]
-        );
-
-        if ($properties) {
-            foreach ($properties as $property) {
-                $data = $property->toRawArray();
-                $data['name'] = $property->definition->name;
-                $data['type'] = $property->definition->type;
-                if ($data['type'] == 'position') {
-                    //position properties also get the map-URL:
-                    $data['map_url'] = \ResourceManager::getMapUrlForResourcePosition(
-                        $property
-                    );
-                }
-                $result[] = $data;
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns the booking plan of a resource for a week specified
-     * by the parameters begin and end.
-     *
-     * @param begin: The begin timestamp of the time range for the booking plan.
-     * @param end: The end timestamp of the time range for the booking plan.
-     *
-     * @allow_nobody
-     *
-     * @get /resources/resource/:resource_id/booking_plan
-     */
-    public function getResourceBookingPlan($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        $current_user = \User::findCurrent();
-        $nobody_access = true;
-
-        if ($current_user instanceof \User) {
-            $nobody_access = false;
-            if (!$resource->bookingPlanVisibleForUser($current_user)) {
-                throw new \AccessDeniedException();
-            }
-        } elseif ($resource instanceof \Room) {
-            if (!$resource->bookingPlanVisibleForUser($current_user)) {
-                throw new \AccessDeniedException();
-            }
-        }
-        $user_is_resource_user = false;
-        if ($current_user instanceof \User) {
-            $user_is_resource_user = $resource->userHasPermission(
-                $current_user,
-                'user'
-            );
-        }
-
-        $display_requests = false;
-        if ($current_user instanceof \User) {
-            $display_requests = \Request::get('display_requests');
-        }
-        $display_all_requests = \Request::get('display_all_requests');
-
-        if ($display_all_requests && !$user_is_resource_user) {
-            //The user is not allowed to see all requests.
-            throw new \AccessDeniedException();
-        }
-
-        $begin_date = \Request::get('start');
-        $end_date = \Request::get('end');
-        if (!$begin_date || !$end_date) {
-            //No time range specified.
-            $this->halt(400, 'The parameters "start" and "end" are missing!');
-            return;
-        }
-
-        //Try the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
-        $begin = \DateTime::createFromFormat(\DateTime::RFC3339, $begin_date);
-        $end = \DateTime::createFromFormat(\DateTime::RFC3339, $end_date);
-
-        if (!($begin instanceof \DateTime) || !($end instanceof \DateTime)) {
-            $begin = new \DateTime();
-            $end = new \DateTime();
-            //Assume the local timezone and use the Y-m-d format:
-            $date_regex = '/[0-9]{4}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])/';
-            if (preg_match($date_regex, $begin_date)) {
-                //$begin is specified in the date formay YYYY-MM-DD:
-                $begin_str = explode('-', $begin_date);
-                $begin->setDate(
-                    intval($begin_str[0]),
-                    intval($begin_str[1]),
-                    intval($begin_str[2])
-                );
-                $begin->setTime(0,0,0);
-            } else {
-                $begin->setTimestamp($begin_date);
-            }
-            //Now we do the same for $end_timestamp:
-            if (preg_match($date_regex, $end_date)) {
-                //$begin is specified in the date formay YYYY-MM-DD:
-                $end_str = explode('-', $end_date);
-                $end->setDate(
-                    intval($end_str[0]),
-                    intval($end_str[1]),
-                    intval($end_str[2])
-                );
-                $end->setTime(23,59,59);
-            } else {
-                $end->setTimestamp($end_date);
-            }
-        }
-
-        //Get parameters:
-        $booking_types = [];
-        if (!$nobody_access) {
-            $booking_types = explode(',', \Request::get('booking_types'));
-        }
-
-        $begin_timestamp = $begin->getTimestamp();
-        $end_timestamp = $end->getTimestamp();
-
-        //Get the event data sources:
-        $bookings = \ResourceBooking::findByResourceAndTimeRanges(
-            $resource,
-            [
-                [
-                    'begin' => $begin_timestamp,
-                    'end' => $end_timestamp
-                ]
-            ],
-            $booking_types
-        );
-        $requests = [];
-        if ($display_all_requests) {
-            $requests = \ResourceRequest::findByResourceAndTimeRanges(
-                $resource,
-                [
-                    [
-                        'begin' => $begin_timestamp,
-                        'end' => $end_timestamp
-                    ]
-                ],
-                0
-            );
-        } elseif ($display_requests) {
-            //Get the users own request only:
-            $requests = \ResourceRequest::findByResourceAndTimeRanges(
-                $resource,
-                [
-                    [
-                        'begin' => $begin_timestamp,
-                        'end' => $end_timestamp
-                    ]
-                ],
-                0,
-                [],
-                'user_id = :user_id',
-                ['user_id' => $current_user->id]
-            );
-        }
-
-        $objects = array_merge($bookings, $requests);
-        $event_data = \Studip\Fullcalendar::createData($objects, $begin_timestamp, $end_timestamp);
-
-        if ($nobody_access) {
-            //For nobody users, the code stops here since
-            //nobody users are not allowed to include additional objects.
-            return $event_data;
-        }
-
-        //Check if there are additional objects to be displayed:
-        $additional_objects = \Request::getArray('additional_objects');
-        $additional_object_colours = \Request::getArray('additional_object_colours');
-        if ($additional_objects) {
-            foreach ($additional_objects as $object_class => $object_ids) {
-                if (!is_a($object_class, '\SimpleORMap', true)) {
-                    continue;
-                }
-                if (!is_a($object_class, '\Studip\Calendar\EventSource', true)) {
-                    continue;
-                }
-
-                $special_colours = [];
-                if ($additional_object_colours[$object_class]) {
-                    $special_colours = $additional_object_colours[$object_class];
-                }
-
-                $additional_objects = $object_class::findMany($object_ids);
-                foreach ($additional_objects as $additional_object) {
-                    $event_data = $additional_object->getFilteredEventData(
-                        $current_user->id,
-                        null,
-                        null,
-                        $begin,
-                        $end
-                    );
-
-                    if ($special_colours) {
-                        foreach ($event_data as $data) {
-                            $data->text_colour = $special_colours['fg'];
-                            $data->background_colour = $special_colours['bg'];
-                            $data->editable = false;
-                            $event_data[] = $data->toFullcalendarEvent();
-                        }
-                    }
-                }
-            }
-        }
-        return $event_data;
-    }
-
-
-    /**
-     * Returns the booking plan of a resource for a selected semester.
-     *
-     * @param semester_id: The ID of the semester. Defaults to the current
-     *     semester, if not set.
-     *
-     * @get /resources/resource/:resource_id/semester_plan
-     */
-    public function getResourceSemesterBookingPlan($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        $current_user = \User::findCurrent();
-
-        if (!$resource->bookingPlanVisibleForUser($current_user)) {
-            throw new \AccessDeniedException();
-        }
-
-        $user_is_resource_user = $resource->userHasPermission(
-            $current_user,
-            'user'
-        );
-
-        $display_requests = \Request::get('display_requests');
-        $display_all_requests = \Request::get('display_all_requests');
-
-        $begin = new \DateTime();
-        $end = new \DateTime();
-
-        $semester_id = \Request::get('semester_id');
-        $semester = null;
-
-        if ($semester_id) {
-            $semester = \Semester::find($semester_id);
-            if (!$semester) {
-                $this->halt(404, 'Specified semester not found!');
-            }
-        } else {
-            $semester = \Semester::findCurrent();
-            if (!$semester) {
-                $this->halt(500, 'Current semester not available!');
-            }
-        }
-
-        if (\Request::get('semester_timerange') != 'fullsem') {
-            $begin->setTimestamp($semester->vorles_beginn);
-            $end->setTimestamp($semester->vorles_ende);
-        } else {
-            $begin->setTimestamp($semester->beginn);
-            $end->setTimestamp($semester->ende);
-        }
-
-        //Get parameters:
-        $booking_types = \Request::getArray('booking_types');
-
-        $begin_timestamp = $begin->getTimestamp();
-        $end_timestamp = $end->getTimestamp();
-
-        //Get the event data sources:
-        $bookings = \ResourceBooking::findByResourceAndTimeRanges(
-            $resource,
-            [
-                [
-                    'begin' => $begin_timestamp,
-                    'end' => $end_timestamp
-                ]
-            ],
-            $booking_types
-        );
-
-        $requests = [];
-        if ($display_all_requests || $display_requests) {
-            $requests_sql = "INNER JOIN seminar_cycle_dates scd
-                USING (metadate_id)
-                WHERE
-                resource_id = :resource_id
-                AND
-                closed = '0' ";
-            $requests_sql_params = [
-                'begin' => $begin_timestamp,
-                'end' => $end_timestamp,
-                'resource_id' => $resource->id
-            ];
-            if (!$display_all_requests) {
-                $requests_sql .= "AND user_id = :user_id ";
-                $requests_sql_params['user_id'] = $current_user->id;
-            }
-
-            $requests = \ResourceRequest::findBySql(
-                $requests_sql,
-                $requests_sql_params
-            );
-        }
-
-        $merged_objects = [];
-        $metadates = [];
-
-        foreach ($bookings as $booking) {
-            $booking->resource = $resource;
-            $irrelevant_booking = false;
-            if ($booking->getRepetitionType() != 'weekly') {
-                if (!\Request::get('display_single_bookings')) {
-                    $irrelevant_booking = true;
-                } else if ($booking->end < strtotime('today')) {
-                    $irrelevant_booking = true;
-                }
-            }
-            if ($booking->getAssignedUserType() === 'course' && in_array($booking->assigned_course_date->metadate_id, $metadates)) {
-                $irrelevant_booking = true;
-            };
-            if (!$irrelevant_booking) {
-                //It is an booking with repetitions that has to be included
-                //in the semester plan.
-                if (in_array($booking->getRepetitionType(), ['single','weekly'])) {
-                    $event_list = $booking->convertToEventData([\ResourceBookingInterval::build(['interval_id' => md5(uniqid()), 'begin' => $booking->begin - $booking->preparation_time, 'end' => $booking->end])], $current_user);
-                } else {
-                    $event_list = $booking->getFilteredEventData(null,null,null,strtotime('today'), $end_timestamp);
-                }
-                foreach ($event_list as $event_data) {
-                    if ($booking->getAssignedUserType() === 'course' && $booking->assigned_course_date->metadate_id) {
-                        $index = sprintf(
-                            '%1$s_%2$s_%3$s',
-                            $booking->assigned_course_date->metadate_id,
-                            $event_data->begin->format('NHis'),
-                            $event_data->end->format('NHis')
-                        );
-                        $metadates[] = $booking->assigned_course_date->metadate_id;
-                    } else {
-                        $index = sprintf(
-                            '%1$s_%2$s_%3$s',
-                            $booking->id,
-                            $event_data->begin->format('NHis'),
-                            $event_data->end->format('NHis')
-                        );
-                    }
-
-                    //Strip some data that cannot be used effectively in here:
-                    $event_data->api_urls = [];
-                    $event_data->editable = false;
-
-                    $merged_objects[$index] = $event_data;
-                }
-            }
-        }
-
-        foreach ($requests as $request) {
-            if ($request->cycle instanceof \SeminarCycleDate) {
-                $cycle_dates = $request->cycle->getAllDates();
-                foreach ($cycle_dates as $cycle_date) {
-                    $relevant_request = $semester->beginn <= $cycle_date->date
-                                     && $semester->ende >= $cycle_date->date;
-                    if ($relevant_request) {
-                        //We have found a date for the current semester
-                        //that makes the request relevant.
-                        break;
-                    }
-                }
-                if (!$relevant_request) {
-                    continue;
-                }
-                $event_data_list = $request->getFilteredEventData(
-                    $current_user->id
-                );
-
-                foreach ($event_data_list as $event_data) {
-                    $index = sprintf(
-                        '%1$s_%2$s_%3$s',
-                        $request->metadate_id,
-                        $event_data->begin->format('NHis'),
-                        $event_data->end->format('NHis')
-                    );
-
-                    //Strip some data that cannot be used effectively in here:
-                    $event_data->view_urls = [];
-                    $event_data->api_urls = [];
-
-                    $merged_objects[$index] = $event_data;
-                }
-            }
-        }
-
-        //Convert the merged events to Fullcalendar events:
-        $data = [];
-        foreach ($merged_objects as $obj) {
-            $data[] = $obj->toFullCalendarEvent();
-        }
-
-        return $data;
-    }
-
-
-    /**
-     * Gets request of a resource. At your option the requests can be
-     * limited to a specific time range, specified by the parameters
-     * begin and end. Furthermore the requests can be filtered by user-ID.
-     *
-     * @param begin: A timestamp specifying the begin of the time range.
-     * @param end: A timestamp specifying the end of the time range.
-     * @param user_id: This parameter limits the result set to requests
-     *     of the user specified by the user-ID provided in this parameter.
-     *
-     * @get /resources/resource/:resource_id/requests
-     */
-    public function getResourceRequests($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        $begin = $this->data['begin'];
-        $end = $this->data['end'];
-        $user_id = $this->data['user_id'];
-
-        $sql = 'resource_id = :resource_id ';
-        $sql_array = [
-            'resource_id' => $resource->id
-        ];
-
-        if ($begin and $end) {
-            $sql .= 'AND ((begin >= :begin AND begin <= :end)
-                    OR
-                    (end >= :begin AND end <= :end)) ';
-            $sql_array['begin'] = $begin;
-            $sql_array['end'] = $end;
-        }
-
-        if ($user_id) {
-            $sql .= 'AND user_id = :user_id ';
-            $sql_array['user_id'] = $user_id;
-        }
-
-        $sql .= 'ORDER BY mkdate ASC';
-
-        $requests = \ResourceRequest::findBySql($sql, $sql_array);
-
-        $result = [];
-        foreach ($requests as $request) {
-            $result[] = $request->toRawArray();
-        }
-
-        return $result;
-    }
-
-
-    /**
-     *
-     * @param begin: A timestamp specifying the begin of the time range.
-     * @param end: A timestamp specifying the end of the time range.
-     * @param user_id: This parameter limits the result set to bookings
-     *     of the user specified by the user-ID provided in this parameter.
-     * @param types: Limits the result to booking types specified in this
-     *     parameter. The allowed types are comma separated like this: "1,2,3".
-     *     The defined types are:
-     *     0 = normal booking, 1 = reservation, 2 = lock.
-     *
-     * @get /resources/resource/:resource_id/bookings
-     */
-    public function getResourceBookings($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        $begin = \Request::get('begin');
-        $end = \Request::get('end');
-        $user_id = \Request::get('user_id');
-        $types = [];
-        $types_str = \Request::get('types');
-        if ($types_str) {
-            $types = explode(',', $types_str);
-        }
-
-        $sql = 'resource_id = :resource_id ';
-        $sql_array = [
-            'resource_id' => $resource->id
-        ];
-
-        if ($begin and $end) {
-            $sql .= 'AND ((begin >= :begin AND begin <= :end)
-                    OR
-                    (end >= :begin AND end <= :end)) ';
-            $sql_array['begin'] = $begin;
-            $sql_array['end'] = $end;
-        }
-
-        if ($user_id) {
-            $sql .= 'AND user_id = :user_id ';
-            $sql_array['user_id'] = $user_id;
-        }
-        if ($types) {
-            $sql .= 'AND booking_type IN ( :types ) ';
-            $sql_array['types'] = $types;
-        }
-
-        $sql .= 'ORDER BY mkdate ASC';
-
-        $bookings = \ResourceBooking::findBySql($sql, $sql_array);
-
-        $result = [];
-        if ($bookings) {
-            foreach  ($bookings as $booking) {
-                $result[] = $booking->toRawArray();
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Creates a booking/reservation/lock for a resource.
-     *
-     * @param begin: The begin timestamp for the booking.
-     * @param end: The end timestamp for the booking.
-     * @param preparation_time: The amount of seconds for preparation time
-     *     before the begin timestamp.
-     * @param internal_comment: A comment that is only visible for some
-     *     parts of the staff.
-     * @param booking_type: The booking type:
-     *     0 = normal booking
-     *     1 = reservation
-     *     2 = lock
-     *
-     * @post /resources/resource/:resource_id/assign
-     */
-    public function createResourceBooking($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        $preparation_time = \Request::int('preparation_time');
-        $internal_comment = \Request::get('internal_comment');
-        $booking_type = \Request::int('booking_type');
-
-        $begin = new \DateTime();
-        $begin->setTimestamp($begin_str);
-        $end = new \DateTime();
-        $end->setTimestamp($end_str);
-
-        try {
-            $booking = $resource->createSimpleBooking(
-                \User::findCurrent(),
-                $begin,
-                $end,
-                $preparation_time,
-                $internal_comment,
-                $booking_type
-            );
-            return $booking;
-        } catch (\Exception $e) {
-            $this->halt(
-                400,
-                $e->getMessage()
-            );
-        }
-    }
-
-
-    /**
-     * Creates a resource request.
-     *
-     * @post /resources/resource/:resource_id/request_simple
-     */
-    public function createSimpleResourceRequest($resource_id)
-    {
-        $resource = \Resource::find($resource_id);
-        if (!$resource) {
-            $this->notFound('Resource object not found!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        $user = \User::findCurrent();
-        if (!$resource->userHasPermission($user, 'user')) {
-            throw new \AccessDeniedException();
-        }
-
-        $begin_str = \Request::get('begin');
-        $end_str = \Request::get('end');
-        $comment = \Request::get('comment');
-
-        $begin = new \DateTime();
-        $begin->setTimestamp($begin_str);
-        $end = new \DateTime();
-        $end->setTimestamp($end_str);
-
-        try {
-            $request = $resource->createSimpleRequest(
-                $user,
-                $begin,
-                $end,
-                $comment
-            );
-            return $request;
-        } catch (\Exception $e) {
-            $this->halt(
-                400,
-                $e->getMessage()
-            );
-        }
-    }
-
-
-    /**
-     * Change the status of a resource booking interval:
-     * @post /resources/booking_interval/:interval_id/toggle_takes_place
-     */
-    public function toggleResourceBookingIntervalTakesPlaceField($interval_id)
-    {
-        $interval = \ResourceBookingInterval::find($interval_id);
-        if (!$interval) {
-            $this->notFound('ResourceBookingInterval object not found!');
-        }
-
-        //Get the resource and check the permissions of the user:
-        $resource = $interval->resource;
-        if (!$resource) {
-            $this->halt(500, 'ResourceBookingInterval not linked with a resource!');
-        }
-
-        $resource = $resource->getDerivedClassInstance();
-
-        if (!$resource->userHasPermission(\User::findCurrent(), 'autor', [$interval->begin, $interval->end])) {
-            $this->halt(403, 'You do not have sufficient permissions to modify the interval!');
-        }
-
-        if (
-            !$interval->takes_place
-            && $resource->isAssigned(new \DateTime('@' . $interval->begin), new \DateTime('@' . $interval->end))
-        ) {
-            $this->halt(409, 'Already booked');
-        }
-        //Switch the takes_place field:
-        $interval->takes_place = $interval->takes_place ? '0' : '1';
-
-        if ($interval->store()) {
-            return [
-                'takes_place' => $interval->takes_place
-            ];
-        } else {
-            $this->halt(500, 'Error while storing the interval!');
-        }
-    }
-}
diff --git a/app/routes/RoomClipboard.php b/app/routes/RoomClipboard.php
deleted file mode 100644
index ffcafe6..0000000
--- a/app/routes/RoomClipboard.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * This file contains the REST class for room clipboards
- * (clipboards containing room resources).
- *
- * @author      Moritz Strohm <strohm@data-quest.de>
- * @copyright   2017-2019
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @since       4.5
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class RoomClipboard extends \RESTAPI\RouteMap
-{
-    //Room clipboard routes:
-
-    /**
-     * Returns the request/booking plan for a room clipboard.
-     *
-     * @get /room_clipboard/:clipboard_id/booking_plan
-     */
-    public function getPlan($clipboard_id = null)
-    {
-        if (!$clipboard_id) {
-            $this->notFound('ID of clipboard has not been provided!');
-        }
-
-        $clipboard = \Clipboard::find($clipboard_id);
-        if (!$clipboard) {
-            $this->notFound('Clipboard object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        //Permission check:
-        if ($clipboard->user_id !== $current_user->id) {
-            throw new \AccessDeniedException();
-        }
-
-        $display_requests = \Request::bool('display_requests');
-        $display_all_requests = \Request::bool('display_all_requests');
-
-        $begin_date = \Request::get('start');
-        $end_date = \Request::get('end');
-        if (!$begin_date || !$end_date) {
-            //No time range specified.
-            $this->halt(400, 'The parameters "start" and "end" are missing!');
-            return;
-        }
-
-        //Try the ISO format first: YYYY-MM-DDTHH:MM:SS±ZZ:ZZ
-        $begin = \DateTime::createFromFormat(\DateTime::RFC3339, $begin_date);
-        $end = \DateTime::createFromFormat(\DateTime::RFC3339, $end_date);
-
-        if (!($begin instanceof \DateTime) || !($end instanceof \DateTime)) {
-            $begin = new \DateTime();
-            $end = new \DateTime();
-            //Assume the local timezone and use the Y-m-d format:
-            $date_regex = '/[0-9]{4}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])/';
-            if (preg_match($date_regex, $begin_date)) {
-                //$begin is specified in the date formay YYYY-MM-DD:
-                $begin_str = explode('-', $begin_date);
-                $begin->setDate(
-                    intval($begin_str[0]),
-                    intval($begin_str[1]),
-                    intval($begin_str[2])
-                );
-                $begin->setTime(0,0,0);
-            } else {
-                $begin->setTimestamp($begin_date);
-            }
-            //Now we do the same for $end_timestamp:
-            if (preg_match($date_regex, $end_date)) {
-                //$begin is specified in the date formay YYYY-MM-DD:
-                $end_str = explode('-', $end_date);
-                $end->setDate(
-                    intval($end_str[0]),
-                    intval($end_str[1]),
-                    intval($end_str[2])
-                );
-                $end->setTime(23,59,59);
-            } else {
-                $end->setTimestamp($end_date);
-            }
-        }
-
-        //Check if a clipboard is selected:
-        $selected_clipboard_id = $_SESSION['selected_clipboard_id'];
-
-        $rooms = [];
-        if ($clipboard_id) {
-            $clipboard = \Clipboard::find($clipboard_id);
-        } elseif ($selected_clipboard_id) {
-            $clipboard = \Clipboard::find($selected_clipboard_id);
-        } else {
-            $this->halt(400, 'No clipboard selected!');
-        }
-        if ($clipboard) {
-            $rooms = \Room::findMany($clipboard->getAllRangeIds('Room'));
-        } else {
-            $this->halt(404, 'Clipboard not found!');
-        }
-
-        $booking_types = \Request::getArray('booking_types');
-
-        //Room permission check:
-        $plan_objects = [];
-        foreach ($rooms as $room) {
-            if ($room->bookingPlanVisibleForuser($current_user)) {
-                $plan_objects = array_merge(
-                    $plan_objects,
-                    \ResourceManager::getBookingPlanObjects(
-                        $room,
-                        [
-                            [
-                                'begin' => $begin->getTimestamp(),
-                                'end' => $end->getTimestamp()
-                            ]
-                        ],
-                        $booking_types,
-                        $display_all_requests ? 'all' : $display_requests
-                    )
-                );
-            }
-        }
-
-        $data = \Studip\Fullcalendar::createData($plan_objects, $begin, $end);
-
-        return $data;
-    }
-
-
-    /**
-     * Returns the semester plan for a room clipboard.
-     *
-     * @get /room_clipboard/:clipboard_id/semester_plan
-     */
-    public function getSemeterPlan($clipboard_id = null)
-    {
-        if (!$clipboard_id) {
-            $this->notFound('ID of clipboard has not been provided!');
-        }
-
-        $clipboard = \Clipboard::find($clipboard_id);
-        if (!$clipboard) {
-            $this->notFound('Clipboard object not found!');
-        }
-
-        $current_user = \User::findCurrent();
-
-        //Permission check:
-        if ($clipboard->user_id !== $current_user->id) {
-            throw new \AccessDeniedException();
-        }
-
-        $display_requests = \Request::bool('display_requests');
-        $display_all_requests = \Request::bool('display_all_requests');
-
-        $begin = new \DateTime();
-        $end = new \DateTime();
-
-        $semester_id = \Request::get('semester_id');
-        $semester = null;
-
-        if ($semester_id) {
-            $semester = \Semester::find($semester_id);
-            if (!$semester) {
-                $this->halt(404, 'Specified semester not found!');
-            }
-        } else {
-            $semester = \Semester::findCurrent();
-            if (!$semester) {
-                $this->halt(500, 'Current semester not available!');
-            }
-        }
-
-        if (\Request::get('semester_timerange') == 'vorles') {
-            $begin->setTimestamp($semester->vorles_beginn);
-            $end->setTimestamp($semester->vorles_ende);
-        } else {
-            $begin->setTimestamp($semester->beginn);
-            $end->setTimestamp($semester->ende);
-        }
-
-        //Check if a clipboard is selected:
-        $selected_clipboard_id = $_SESSION['selected_clipboard_id'];
-
-        $rooms = [];
-        if ($clipboard_id) {
-            $clipboard = \Clipboard::find($clipboard_id);
-        } elseif ($selected_clipboard_id) {
-            $clipboard = \Clipboard::find($selected_clipboard_id);
-        } else {
-            $this->halt(400, 'No clipboard selected!');
-        }
-        if ($clipboard) {
-            $rooms = \Room::findMany($clipboard->getAllRangeIds('Room'));
-        } else {
-            $this->halt(404, 'Clipboard not found!');
-        }
-
-        //Get parameters:
-        $booking_types = \Request::getArray('booking_types');
-
-        //Get the event data sources:
-        $plan_objects = [];
-
-        foreach ($rooms as $room) {
-            if ($room->bookingPlanVisibleForuser($current_user)) {
-                $plan_objects = array_merge(
-                    $plan_objects,
-                    \ResourceManager::getBookingPlanObjects(
-                        $room,
-                        [
-                            [
-                                'begin' => $begin->getTimestamp(),
-                                'end' => $end->getTimestamp()
-                            ]
-                        ],
-                        $booking_types,
-                        $display_all_requests ? 'all' : $display_requests
-                    )
-                );
-            }
-        }
-
-        $merged_objects = [];
-        $metadates = [];
-        foreach ($plan_objects as $plan_object) {
-            if ($plan_object instanceof \ResourceBooking) {
-                $irrelevant_booking =
-                    $plan_object->getRepetitionType() != 'weekly' ||
-                    ($plan_object->getAssignedUserType() === 'course' && in_array($plan_object->assigned_course_date->metadate_id, $metadates));
-                if ($irrelevant_booking) {
-                    continue;
-                }
-
-                //It is a booking with repetitions that has to be included
-                //in the semester plan.
-
-                $real_begin = $plan_object->begin;
-                if ($plan_object->preparation_time > 0) {
-                    $real_begin -= $plan_object->preparation_time;
-                }
-                $event_data = $plan_object->convertToEventData([\ResourceBookingInterval::build(['interval_id' => md5(uniqid()), 'begin' => $real_begin, 'end' => $plan_object->end])], $current_user);
-
-                //Merge event data from the same booking that have the
-                //same weekday and begin and end time into one event.
-                //If no repetition interval is set and the booking belongs
-                //to a course date, use the corresponding metadate ID or the
-                //course date ID in the index. Otherwise use the booking's
-                //ID (specified by event_data->object_id).
-                foreach ($event_data as $event) {
-                    if ($plan_object->getAssignedUserType() === 'course') {
-                        $index = sprintf(
-                            '%1$s_%2$s_%3$s',
-                            $plan_object->assigned_course_date->metadate_id,
-                            $event->begin->format('NHis'),
-                            $event->end->format('NHis')
-                        );
-                        $metadates[] = $plan_object->assigned_course_date->metadate_id;
-                    } else {
-                        $index = sprintf(
-                            '%1$s_%2$s_%3$s',
-                            $plan_object->id,
-                            $event->begin->format('NHis'),
-                            $event->end->format('NHis')
-                        );
-                    }
-
-                    //Strip some data that cannot be used effectively in here:
-                    $event->api_urls = [];
-
-                    $merged_objects[$index] = $event;
-                }
-            } elseif ($plan_object instanceof \ResourceRequest) {
-                if ($plan_object->cycle instanceof \SeminarCycleDate) {
-                    $cycle_dates = $plan_object->cycle->getAllDates();
-                    foreach ($cycle_dates as $cycle_date) {
-                        $relevant_request = $semester->beginn <= $cycle_date->date
-                                         && $semester->ende >= $cycle_date->date;
-                        if ($relevant_request) {
-                            //We have found a date for the current semester
-                            //that makes the request relevant.
-                            break;
-                        }
-                    }
-                    if (!$relevant_request) {
-                        continue;
-                    }
-                    $event_data_list = $plan_object->getFilteredEventData(
-                        $current_user->id
-                    );
-
-                    foreach ($event_data_list as $event_data) {
-                        $index = sprintf(
-                            '%1$s_%2$s_%3$s',
-                            $plan_object->metadate_id,
-                            $event_data->begin->format('NHis'),
-                            $event_data->end->format('NHis')
-                        );
-
-                        //Strip some data that cannot be used effectively in here:
-                        $event_data->view_urls = [];
-                        $event_data->api_urls = [];
-
-                        $merged_objects[$index] = $event_data;
-                    }
-                }
-            }
-        }
-
-        //Convert the merged events to Fullcalendar events:
-        $data = [];
-        foreach ($merged_objects as $obj) {
-            $data[] = $obj->toFullCalendarEvent();
-        }
-
-        return $data;
-    }
-}
diff --git a/app/routes/Schedule.php b/app/routes/Schedule.php
deleted file mode 100644
index 2341f73..0000000
--- a/app/routes/Schedule.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     André Klaßen <andre.klassen@elan-ev.de>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition user_id ^[a-f0-9]{1,32}$
- * @condition semester_id ^[a-f0-9]{1,32}$
- */
-class Schedule extends \RESTAPI\RouteMap
-{
-    /**
-     * returns schedule for a given user and semester
-     *
-     * @get /user/:user_id/schedule/:semester_id
-     * @get /user/:user_id/schedule
-     */
-    public function getSchedule($user_id, $semester_id = null)
-    {
-        if ($user_id !== $GLOBALS['user']->id) {
-            $this->error(401);
-        }
-
-        $current_semester = isset($semester_id)
-            ? \Semester::find($semester_id)
-            : \Semester::findCurrent();
-
-        if (!$current_semester) {
-            $this->notFound('No such semester.');
-        }
-
-        $schedule_settings = \UserConfig::get($user_id)->SCHEDULE_SETTINGS;
-        $days = \CalendarScheduleModel::getDisplayedDays($schedule_settings['glb_days']);
-
-        $entries = \CalendarScheduleModel::getEntries(
-            $user_id, $current_semester,
-            $schedule_settings['glb_start_time'], $schedule_settings['glb_end_time'],
-            $days,
-            $visible = false
-        );
-
-       $json = [];
-       foreach ($entries as $number_of_day => $schedule_of_day) {
-           $entries = [];
-           foreach ($schedule_of_day->entries as $entry) {
-               $entries[$entry['id']] = self::entryToJson($entry);
-           }
-           $json[$number_of_day] = $entries;
-       }
-
-       $this->etag(md5(serialize($json)));
-
-       return array_reverse($json, true);
-    }
-
-
-    private static function entryToJson($entry)
-    {
-        $json = [];
-        foreach (['start', 'end', 'content', 'title', 'color', 'type'] as $key) {
-            $json[$key] = in_array($key, ['start', 'end'])
-                        ? (int) $entry[$key]
-                        : $entry[$key];
-        }
-
-        return $json;
-    }
-}
diff --git a/app/routes/Semester.php b/app/routes/Semester.php
deleted file mode 100644
index bdb1ee7..0000000
--- a/app/routes/Semester.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition semester_id ^[0-9a-f]{1,32}$
- */
-class Semester extends \RESTAPI\RouteMap
-{
-    public function __construct()
-    {
-        parent::__construct();
-        if (!\Request::int('limit')) {
-            $this->limit = count(\Semester::getAll());
-        }
-    }
-
-    /**
-     * Returns a list of all semesters.
-     *
-     * @get /semesters
-     * @allow_nobody
-     */
-    public function getSemesters()
-    {
-        $semesters = \Semester::getAll();
-
-        // paginate
-        $total = count($semesters);
-        $semesters = array_slice($semesters, $this->offset, $this->limit);
-
-        $json = [];
-        foreach ($semesters as $semester) {
-            $url = $this->urlf('/semester/%s', $semester['semester_id']);
-            $json[$url] = $this->semesterToJSON($semester);
-        }
-
-        return $this->paginated($json, $total);
-    }
-
-    /**
-     * Returns the semester week as string for a given string
-     *
-     * @get /semester/:timestamp/week
-     * @allow_nobody
-     */
-    public function getSemesterWeek(int $timestamp)
-    {
-        $semester = \Semester::findByTimestamp($timestamp);
-        if (!$semester) {
-            return null;
-        }
-        $timestamp = strtotime('today', $timestamp);
-        $week_begin_timestamp = strtotime('monday this week', $semester->vorles_beginn);
-        $end_date = $semester->vorles_ende;
-
-        $i = 0;
-        $result = [
-            'semester_name' => (string)$semester->name,
-            'week_number' => sprintf(_('KW %u'), date('W', $timestamp)),
-            'current_day' => strftime('%x', $timestamp)
-        ];
-        while ($week_begin_timestamp < $end_date) {
-            $next_week_timestamp = strtotime('+1 week', $week_begin_timestamp);
-            if ($week_begin_timestamp <= $timestamp && $timestamp < $next_week_timestamp) {
-                $result['sem_week'] = sprintf(
-                    _('%u. Vorlesungswoche (ab %s)'),
-                    $i + 1,
-                    strftime('%x', $week_begin_timestamp));
-                break;
-            }
-            $i += 1;
-
-            $week_begin_timestamp = $next_week_timestamp;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns a single semester.
-     *
-     * @get /semester/:semester_id
-     */
-    public function getSemester($id)
-    {
-        $semester = \Semester::find($id);
-        if (!$semester) {
-            $this->notFound();
-        }
-
-        $semester_json = $this->semesterToJSON($semester);
-        $this->etag(md5(serialize($semester_json)));
-
-        return $semester_json;
-    }
-
-    private function semesterToJSON($semester)
-    {
-        return [
-            'id'             => $semester['semester_id'],
-            'title'          => (string) $semester['name'],
-            'token'          => (string) $semester['semester_token'],
-            'begin'          => (int) $semester['beginn'],
-            'end'            => (int) $semester['ende'],
-            'seminars_begin' => (int) $semester['vorles_beginn'],
-            'seminars_end'   => (int) $semester['vorles_ende'],
-            'visible'        => (int) $semester['visible'],
-        ];
-    }
-}
diff --git a/app/routes/Studip.php b/app/routes/Studip.php
deleted file mode 100644
index 749a53a..0000000
--- a/app/routes/Studip.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-use Config;
-use SemClass;
-use SemType;
-
-/**
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Studip extends \RESTAPI\RouteMap
-{
-    /**
-     * Grundlegende Systemeinstellungen
-     *
-     * @get /studip/settings
-     */
-    public function getSettings()
-    {
-        $sem_types = array_map(function ($item) {
-            return [
-                'name'  => $item['name'],
-                'class' => $item['class'],
-            ];
-        }, SemType::getTypes());
-
-        $sem_classes = array_map(function ($item) {
-            $item = (array) $item;
-            return reset($item);
-        }, SemClass::getClasses());
-
-        return [
-            'ALLOW_CHANGE_USERNAME' => Config::get()->ALLOW_CHANGE_USERNAME,
-            'ALLOW_CHANGE_EMAIL'    => Config::get()->ALLOW_CHANGE_EMAIL,
-            'ALLOW_CHANGE_NAME'     => Config::get()->ALLOW_CHANGE_NAME,
-            'ALLOW_CHANGE_TITLE'    => Config::get()->ALLOW_CHANGE_TITLE,
-            'INST_TYPE'             => $GLOBALS['INST_TYPE'],
-            'SEM_TYPE'              => $sem_types,
-            'SEM_CLASS'             => $sem_classes,
-            'TERMIN_TYP'            => $GLOBALS['TERMIN_TYP'],
-            'PERS_TERMIN_KAT'       => $GLOBALS['PERS_TERMIN_KAT'],
-            'SUPPORT_EMAIL'         => $GLOBALS['UNI_CONTACT'],
-            'TITLES'                => $GLOBALS['DEFAULT_TITLE_FOR_STATUS'],
-            'UNI_NAME_CLEAN'        => Config::get()->UNI_NAME_CLEAN,
-        ];
-    }
-
-    /**
-     * Farbeinstellungen
-     *
-     * @get /studip/colors
-     */
-    public function getColors()
-    {
-        // TODO: Move these definitions somewhere else (but where!?)
-        return [
-            'background' => '#e1e4e9',
-            'dark'       => '#34578c',
-            'light'      => '#899ab9',
-        ];
-    }
-}
diff --git a/app/routes/User.php b/app/routes/User.php
deleted file mode 100644
index d3cce26..0000000
--- a/app/routes/User.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     André Klaßen <andre.klassen@elan-ev.de>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition user_id ^[0-9a-f]{1,32}$
- */
-class User extends \RESTAPI\RouteMap
-{
-    /**************************************************/
-    /* PUBLIC STATIC HELPER METHODS                   */
-    /**************************************************/
-
-    public static function getMiniUser($routemap, $user)
-    {
-        $avatar = \Avatar::getAvatar($user->id);
-
-        return [
-            'id'              => $user->id,
-            'href'            => $routemap->urlf('/user/%s', [htmlReady($user->id)]),
-            'name'            => self::getNamesOfUser($user),
-            'avatar_small'    => $avatar->getURL(\Avatar::SMALL),
-            'avatar_medium'   => $avatar->getURL(\Avatar::MEDIUM),
-            'avatar_normal'   => $avatar->getURL(\Avatar::NORMAL),
-            'avatar_original' => $avatar->getURL(\Avatar::NORMAL)
-        ];
-    }
-
-    public static function getNamesOfUser($user)
-    {
-        $name = [
-            'username'  => $user->username,
-            'formatted' => $user->getFullName(),
-            'family'    => $user->nachname,
-            'given'     => $user->vorname,
-            'prefix'    => $user->title_front,
-            'suffix'    => $user->title_rear
-        ];
-        return $name;
-    }
-
-
-    /**************************************************/
-    /* ROUTES                                         */
-    /**************************************************/
-
-    /**
-     * Searches for users by a given keyword.
-     *
-     * @get /users
-     */
-    public function searchUsers()
-    {
-        $needle = \Request::get('q') ?? \Request::get('needle');
-        if (!$needle) {
-            $this->halt(400, 'Missing search paramter ?q=');
-        }
-
-        $query  = \GlobalSearchUsers::getSQL($needle, [], $this->offset + $this->limit);
-        $result = \DBManager::get()->fetchAll($query);
-        $total = (int) \DBManager::get()->fetchColumn('SELECT FOUND_ROWS() as found_rows');
-
-        $user_ids = array_column($result, 'user_id');
-        $users    = \User::findMany($user_ids);
-
-        return $this->paginated(
-            array_map(function ($user) {
-                return self::getMiniUser($this, $user);
-            }, $users),
-            $total
-        );
-    }
-
-
-    /**
-     * getUser - retrieves data of a user
-     *
-     * @get /user/:user_id
-     * @get /user
-     */
-    public function getUser($user_id = '')
-    {
-        $user_id = $user_id ?: $GLOBALS['user']->id;
-
-        $user = \User::findFull($user_id);
-        if (!$user) {
-            $this->halt(404, sprintf('User %s not found', $user_id));
-        }
-
-        $visibilities = get_local_visibility_by_id($user_id, 'homepage');
-        if (is_array(json_decode($visibilities, true))) {
-            $visibilities = json_decode($visibilities, true);
-        } else {
-            $visibilities = [];
-        }
-
-        $get_field = function ($field, $visibility) use ($user_id, $user, $visibilities) {
-            if (!$user[$field]
-                || !is_element_visible_for_user($GLOBALS['user']->id, $user_id, $visibilities[$visibility]))
-            {
-                return '';
-            }
-            return $user[$field];
-        };
-
-        $avatar = \Avatar::getAvatar($user_id);
-
-        $user = [
-            'user_id'         => $user_id,
-            'username'        => $user['username'],
-            'name'            => self::getNamesOfUser($user),
-            'perms'           => $user['perms'],
-            'email'           => get_visible_email($user_id),
-            'avatar_small'    => $avatar->getURL(\Avatar::SMALL),
-            'avatar_medium'   => $avatar->getURL(\Avatar::MEDIUM),
-            'avatar_normal'   => $avatar->getURL(\Avatar::NORMAL),
-            'avatar_original' => $avatar->getURL(\Avatar::NORMAL),
-            'phone'           => $get_field('privatnr', 'private_phone'),
-            'homepage'        => $get_field('Home', 'homepage'),
-            'privadr'         => strip_tags($get_field('privadr', 'privadr')),
-        ];
-
-        // Data fields
-        $datafields = [];
-        foreach (\DataFieldEntry::getDataFieldEntries($user_id, 'user') as $entry) {
-            if (!$entry->isVisible()) {
-                continue;
-            }
-            if (!\Visibility::verify($entry->getID(), $user_id)) {
-                continue;
-            }
-            $datafields[] = [
-                'type'  => $entry->getType(),
-                'id'    => $entry->getId(),
-                'name'  => (string) $entry->getName(),
-                'value' => $entry->getValue(),
-            ];
-        }
-        $user['datafields'] = $datafields;
-
-        $this->etag(md5(serialize($user)));
-
-        return $user;
-
-    }
-
-
-    /**
-     * deleteUser - deletes a user
-     *
-     * @delete /user/:user_id
-     */
-    public function deleteUser($user_id)
-    {
-        if (!$GLOBALS['perm']->have_perm('root')) {
-            $this->error(401);
-        }
-
-        if (!$GLOBALS['user']->id === $user_id) {
-            $this->error(400, 'Must not delete yourself');
-        }
-
-        $user = \User::find($user_id);
-        $user->delete();
-
-        $this->status(204);
-    }
-
-
-    /**
-     * returns institutes for a given user
-     *
-     * @get /user/:user_id/institutes
-     */
-    public function getInstitutes($user_id)
-    {
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->notFound(sprintf('User %s not found', $user_id));
-        }
-
-        $query = "SELECT i0.Institut_id AS institute_id, i0.Name AS name,
-                         inst_perms AS perms, sprechzeiten AS consultation,
-                         raum AS room, ui.telefon AS phone, ui.fax,
-                         i0.Strasse AS street, i0.Plz AS city,
-                         i1.Name AS faculty_name, i1.Strasse AS faculty_street,
-                         i1.Plz AS faculty_city
-                  FROM user_inst AS ui
-                  JOIN Institute AS i0 USING (Institut_id)
-                  LEFT JOIN Institute AS i1 ON (i0.fakultaets_id = i1.Institut_id)
-                  WHERE visible = 1 AND user_id = :user_id
-                  ORDER BY priority ASC";
-        $statement = \DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $user_id);
-        $statement->execute();
-
-        $institutes = [
-            'work'  => [],
-            'study' => [],
-        ];
-
-        foreach ($statement->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            if ($row['perms'] === 'user') {
-                $institutes['study'][] = $row;
-            } else {
-                $institutes['work'][] = $row;
-            }
-        }
-
-        $this->etag(md5(serialize($institutes)));
-
-        $result = array_slice($institutes, $this->offset, $this->limit);
-        return $this->paginated(
-            $result,
-            count($institutes['study']) + count($institutes['work']),
-            compact('user_id')
-        );
-    }
-
-
-    /**
-     * Get the root file folder of a user's file area.
-     *
-     * @get /user/:user_id/top_folder
-     */
-    public function getTopFolder($user_id)
-    {
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->notFound("User with id {$user_id} not found!");
-        }
-
-        if ($user->id !== \User::findCurrent()->id) {
-            $this->error(403, 'You are not allowed to see another user\'s personal file area!');
-        }
-
-        $top_folder = \Folder::findTopFolder($user->id, 'user');
-
-        if (!$top_folder) {
-            $this->notFound("No folder found for user with id {$user_id}!");
-        }
-
-        return (new FileSystem())->getFolder($top_folder->id);
-    }
-
-    /**
-     * Patches the course member data of a user and course. Pass data to be
-     * patched via a valid json object in the body. Fields that my be patched:
-     *
-     * - group - the associated group in the overview of the users's courses
-     * - visibility - visible state of the course
-     *
-     * @patch /user/:user_id/courses/:course_id
-     *
-     * @todo more patchable fields?
-     */
-    public function patchCourseGroup($user_id, $course_id)
-    {
-        $user = \User::find($user_id);
-        if (!$user) {
-            $this->notFound('User not found');
-        }
-
-        if ($user->id !== $GLOBALS['user']->id) {
-            $this->halt(403, "You may not alter this user's data");
-        }
-
-        $member = \CourseMember::find([$course_id, $user->id]);
-        if (!$member) {
-            $this->notFound('You are not a member of the course');
-        }
-
-        if (isset($this->data['group'])) {
-            if (!is_numeric($this->data['group']) || $this->data['group'] < 0 || $this->data['group'] > 8) {
-                $this->halt(400, 'Given group is not inside the valid range 0..8');
-            }
-            $member->gruppe = $this->data['group'];
-        }
-
-        if (isset($this->data['visibility'])) {
-            if (in_array($member->status, ['tutor', 'dozent'])) {
-                $this->halt(400, 'You may not change the visibility status for this course since you are a teacher.');
-            }
-            if (!in_array($this->data['visibility'], ['yes', 'no'])) {
-                $this->halt(400, 'Visibility may only be "yes" or "no".');
-            }
-            $member->visible = $this->data['visibility'];
-        }
-
-        if ($member->isDirty()) {
-            $member->store();
-        }
-
-        $this->halt(204);
-    }
-}
diff --git a/app/routes/UserConfig.php b/app/routes/UserConfig.php
deleted file mode 100644
index ba01538..0000000
--- a/app/routes/UserConfig.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-use RESTAPI\RouteMap;
-use RESTAPI\Router;
-
-/**
- * API routes for accessing user config values.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL2 or any later version
- * @since      Stud.IP 3.4
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition user_id ^[0-9a-f]{1,32}$
- *
- * @status 404 if user does not exist
- * @status 403 if user may access the request config item
- */
-class UserConfig extends RouteMap
-{
-    // Stores the user's config instance
-    private $config;
-
-    /**
-     * Performs checks if the user exists and may actually access the
-     * requested config.
-     *
-     * @param Router $router     Instance of the api router
-     * @param array  $handler    Detected handler router
-     * @param array  $parameters Parameters of the called route
-     */
-    public function before(Router $router, array $handler, array $parameters)
-    {
-        // Check whether user exist
-        if (\User::find($parameters['user_id']) === null) {
-            $this->error(404, sprintf('User %s not found', $parameters['user_id']));
-        }
-
-        // Check whether user accesses own config or user is root
-        if ($parameters['user_id'] !== $GLOBALS['user']->id && $GLOBALS['user']->perms !== 'root') {
-            $this->error(403, 'User may only access own config');
-        }
-
-        $this->config = \UserConfig::get($parameters['user_id']);
-    }
-
-    /**
-     * Returns the value of a specific config entry for a given user
-     *
-     * @get /user/:user_id/config/:field
-     *
-     * @return mixed Value for the request config item
-     * @status 404 if config item does not exist
-     */
-    public function getConfig($user_id, $field)
-    {
-        // Check whether key exists in config
-        if (!isset($this->config[$field])) {
-            $this->error(404, sprintf('No config item for field %s and user %s',
-                                      $field, $user_id));
-        }
-
-        return $this->config[$field];
-    }
-
-    /**
-     * Stored the value of a specific config entry for a given user
-     *
-     * @put /user/:user_id/config/:field
-     *
-     * @status 204 on success
-     * @status 400 if no value is given
-     */
-    public function setConfig($user_id, $field)
-    {
-        if (!isset($this->data['value'])) {
-            $this->error(400, 'No value given in request');
-        }
-
-        $this->config->store($field, $this->data['value']);
-
-        $this->status(204);
-    }
-
-    /**
-     * Removes a specific config entry for a given user
-     *
-     * @delete /user/:user_id/config/:field
-     *
-     * @status 204 on success
-     */
-    public function deleteConfig($user_id, $field)
-    {
-        $this->config->delete($field);
-
-        $this->status(204);
-    }
-}
diff --git a/app/routes/Wiki.php b/app/routes/Wiki.php
deleted file mode 100644
index 7f54628..0000000
--- a/app/routes/Wiki.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-namespace RESTAPI\Routes;
-
-/**
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- *
- * @condition range_id ^[0-9a-f]{1,32}$
- */
-class Wiki extends \RESTAPI\RouteMap
-{
-    public function before()
-    {
-        require_once 'User.php';
-    }
-
-    /**
-     * Wikiseitenindex einer Veranstaltung
-     *
-     * @get /course/:range_id/wiki
-     */
-    public function getCourseWiki($range_id)
-    {
-        $pages = \WikiPage::findBySQL("`range_id` = ? ORDER BY `name` ASC", [$range_id]);
-
-        if (!$pages[0]->isReadable()) {
-            $this->error(401);
-        }
-
-        $total = sizeof($pages);
-        $pages = $pages->limit($this->offset, $this->limit);
-
-        $linked_pages = [];
-        foreach ($pages as $page) {
-            $url = $this->urlf('/course/%s/wiki/%s', [$range_id, htmlReady($page['keyword'])]);
-            $linked_pages[$url] = $this->wikiPageToJson($page, ["content"]);
-        }
-
-        $this->etag(md5(serialize($linked_pages)));
-
-        return $this->paginated($linked_pages, $total, compact('range_id'));
-    }
-
-    /**
-     * Wikiseite auslesen
-     *
-     * @get /course/:range_id/wiki/:keyword
-     * @get /course/:range_id/wiki/:keyword/:version
-     */
-    public function getCourseWikiKeyword($range_id, $keyword, $version = null)
-    {
-        $page = $this->requirePage($range_id, $keyword, $version);
-        $wiki_json = $this->wikiPageToJson($page);
-        $this->etag(md5(serialize($wiki_json)));
-        $this->lastmodified($page->chdate);
-        return $wiki_json;
-    }
-
-    /**
-     * Wikiseite ändern/hinzufügen
-     *
-     * @put /course/:range_id/wiki/:keyword
-     */
-    public function putCourseWikiKeyword($range_id, $keyword)
-    {
-        if (!isset($this->data['content'])) {
-            $this->error(400, 'No content provided');
-        }
-
-        $page =\WikiPage::findOneBySQL("`range_id` = ? AND `name` = ?", [$range_id, $keyword]);
-        if (!$page) {
-            $page = new \WikiPage();
-            $page->range_id = $range_id;
-            $page->name = $keyword;
-        }
-
-        if (!$page->isEditable()) {
-            $this->error(401);
-        }
-
-        $page->content = $this->data['content'];
-        $page->store();
-
-        $url = sprintf('course/%s/wiki/%s/%d', htmlReady($range_id), htmlReady($keyword), count($page->versions) + 1);
-        $this->redirect($url, 201, 'ok');
-    }
-
-    /**************************************************/
-    /* PRIVATE HELPER METHODS                         */
-    /**************************************************/
-
-    private function requirePage($range_id, $keyword, $version = null)
-    {
-        $page = \WikiPage::findOneBySQL("`range_id` = ? AND `name` = ?", [$range_id, $keyword]);
-
-        if (!$page) {
-            $this->notFound();
-        }
-
-        if (!$page->isReadable($GLOBALS['user']->id)) {
-            $this->error(401);
-        }
-        if ($version !== null && $version !== count($page->versions) + 1) {
-            return $page->versions[count($page->versions) - 1 - $version];
-        } else {
-            return $page;
-        }
-    }
-
-    private function wikiPageToJson($page, $without = [])
-    {
-        $json = [
-            'range_id' => $page->range_id,
-            'keyword'  => $page->name,
-            'chdate'   => $page->chdate,
-            'version'  => 1
-        ];
-
-        // (pre-rendered) content
-        if (!in_array('content', $without)) {
-            $json['content']      = $page->content;
-            $json['content_html'] = wikiReady($page->content, true, $page->range_id, $page->id);
-        }
-        if (!in_array('user', $without)) {
-            if ($page->author) {
-                $json['user'] = User::getMiniUser($this, $page->user_id);
-            }
-        }
-
-        foreach ($without as $key) {
-            if (isset($json[$key])) {
-                unset($json[$key]);
-            }
-        }
-
-        // string to int conversions as SORM does not know about ints
-        foreach (['chdate', 'mkdate', 'filesize', 'downloads'] as $key) {
-            if (isset($json[$key])) {
-                $json[$key] = (int) $json[$key];
-            }
-        }
-
-        return $json;
-    }
-
-
-}
diff --git a/app/views/admin/api/config.php b/app/views/admin/api/config.php
deleted file mode 100644
index 83d2ae5..0000000
--- a/app/views/admin/api/config.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @var Admin_ApiController $controller
- * @var array $config
- */
-use Studip\Button, Studip\LinkButton;
-?>
-
-<form class="default" action="<?= $controller->url_for('admin/api/config') ?>" method="post">
-    <fieldset>
-        <legend><?= _('Konfiguration') ?></legend>
-
-        <input type="hidden" name="active" value="0">
-        <label>
-            <input type="checkbox" name="active" value="1" <? if ($config['API_ENABLED']) echo 'checked'; ?>>
-            <?= _('REST-API aktiviert') ?>
-        </label>
-        
-        
-        <label class="caption" for="auth">
-            <?= _('Standard-Authentifizierung beim Login') ?>
-            <select name="auth" id="auth">
-            <? foreach ($GLOBALS['STUDIP_AUTH_PLUGIN'] as $plugin): ?>
-                <option <? if ($config['API_OAUTH_AUTH_PLUGIN'] === $plugin) echo 'selected'; ?>>
-                    <?= $plugin ?>
-                </option>
-            <? endforeach; ?>
-            </select>
-        </label>
-    </fieldset>
-    <footer>
-        <?= Button::createAccept(_('Speichern')) ?>
-        <?= LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/api')) ?>
-    </footer>
-</form>
diff --git a/app/views/admin/api/edit.php b/app/views/admin/api/edit.php
deleted file mode 100644
index f1c7e03..0000000
--- a/app/views/admin/api/edit.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * @var Admin_ApiController $controller
- * @var RESTAPI\Consumer\Base $consumer
- * @var array $types
- */
-use Studip\Button, Studip\LinkButton;
-?>
-
-<? if ($consumer->id): ?>
-    <h1>
-        <?= sprintf(
-            _('Registrierte Applikation "%s" bearbeiten'),
-            htmlReady($consumer->title)
-        ) ?>
-    </h1>
-<? else: ?>
-    <h1 class="hide-in-dialog">
-        <?= _('Neue Applikation registrieren') ?>
-    </h1>
-<? endif; ?>
-
-<form class="settings default"
-      action="<?= $controller->url_for('admin/api/edit', $consumer->id) ?>" method="post">
-    <?= CSRFProtection::tokenTag() ?>
-
-    <fieldset>
-        <legend><?= _('Grundeinstellungen') ?></legend>
-
-        <label for="active">
-            <input type="checkbox" class="switch" id="active" name="active" value="1"
-                    <?= $consumer->active ? 'checked' : '' ?>>
-            <?= _('Aktiviert') ?>
-        </label>
-
-
-        <label for="title">
-            <?= _('Titel') ?>
-            <input required type="text" id="title" name="title"
-                   placeholder="<?= _('Beispiel-Applikation') ?>"
-                   value="<?= htmlReady($consumer->title) ?>"
-                   maxlength="128">
-        </label>
-
-        <label for="contact">
-            <?= _('Kontaktperson') ?>
-            <input required type="text" id="contact" name="contact"
-                   placeholder="John Doe"
-                   value="<?= htmlReady($consumer->contact) ?>"
-                   maxlength="255">
-        </label>
-
-        <label for="email">
-            <?= _('Kontaktadresse') ?>
-            <input required type="text" id="email" name="email"
-                   placeholder="support@appsite.tld"
-                   value="<?= htmlReady($consumer->email) ?>"
-                   maxlength="255">
-        </label>
-
-        <label for="callback">
-            <?= _('Callback URL') ?>
-            <input required type="text" id="callback" name="callback"
-                   placeholder="http://appsite.tld/auth"
-                   value="<?= htmlReady($consumer->callback) ?>"
-                   maxlength="255">
-        </label>
-
-    <? if ($consumer->id): ?>
-        <label for="consumer_key">
-            <?= _('Consumer Key') ?>
-            <input readonly type="text" id="consumer_key"
-                   value="<?= htmlReady($consumer->auth_key) ?>">
-        </label>
-
-        <label for="consumer_secret">
-            <?= _('Consumer Secret') ?>
-            <input readonly type="text" id="consumer_secret"
-                   value="<?= htmlReady($consumer->auth_secret) ?>">
-        </label>
-
-        <div class="centered">
-            <?= strftime(_('Erstellt am %d.%m.%Y %H:%M:%S'), $consumer->mkdate) ?><br>
-            <? if ($consumer->mkdate != $consumer->chdate): ?>
-                <?= strftime(_('Zuletzt geändert am %d.%m.%Y %H:%M:%S'), $consumer->chdate) ?>
-            <? endif; ?>
-        </div>
-    <? endif; ?>
-    </fieldset>
-
-    <fieldset>
-        <legend><?= _('Applikation-Details') ?></legend>
-
-        <label for="commercial">
-            <input type="checkbox" class="switch" id="commercial" name="commercial" value="1"
-                    <?= $consumer->commercial ? 'checked' : '' ?>>
-            <?= _('Kommerziell') ?>
-        </label>
-
-        <label for="description">
-            <?= _('Beschreibung') ?>
-            <textarea id="description" name="description" maxlength="65535"><?= htmlReady($consumer->description) ?></textarea>
-        </label>
-
-        <label for="url">
-            <?= _('URL') ?>
-            <input type="text" id="url" name="url"
-                   placeholder="http://appsite.tld"
-                   value="<?= htmlReady($consumer->url) ?>"
-                   maxlength="255">
-        </label>
-
-        <label for="type">
-            <?= _('Typ') ?>
-            <select name="type" id="type">
-                <option value="">- <?= _('Keine Angabe') ?> -</option>
-                <? foreach ($types as $type => $label): ?>
-                    <option value="<?= $type ?>" <?= $consumer->type == $type ? 'selected' : '' ?>>
-                        <?= $label ?>
-                    </option>
-                <? endforeach; ?>
-            </select>
-        </label>
-
-
-        <label for="notes">
-            <?= _('Notizen') ?>
-            <textarea id="notes" name="notes" maxlength="65535"><?= htmlReady($consumer->notes) ?></textarea>
-        </label>
-    </fieldset>
-
-    <footer data-dialog-button>
-        <?= Button::createAccept(_('Speichern'), 'store') ?>
-        <?= LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/api')) ?>
-    </footer>
-</form>
diff --git a/app/views/admin/api/index.php b/app/views/admin/api/index.php
deleted file mode 100644
index 132deac..0000000
--- a/app/views/admin/api/index.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * @var Admin_ApiController $controller
- * @var RESTAPI\Consumer\Base[] $consumers
- * @var array $types
- */
-?>
-<? if (!empty($consumers)): ?>
-<form action="#" method="post" class="default">
-<table class="default">
-    <caption><?= _('Registrierte Applikationen') ?></caption>
-    <thead>
-        <tr>
-            <th><?= ('Aktiv') ?></th>
-            <th><?= _('Name') ?></th>
-            <th><?= _('Typ') ?></th>
-            <th><?= _('Kontakt') ?></th>
-            <th><?= _('Kommerziell') ?></th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-    <tbody>
-<? foreach ($consumers as $consumer): ?>
-        <tr>
-            <td id="<?= $consumer->id ?>">
-                <a href="<?= $controller->url_for('admin/api/toggle', $consumer->id, $consumer->active ? 'off' : 'on') ?>">
-                    <?= Icon::create('checkbox-' . ($consumer->active ? '' : 'un') . 'checked', 'clickable')->asImg() ?>
-                </a>
-            </td>
-            <td>
-            <? if ($consumer->url): ?>
-                <a href="<?= htmlReady($consumer->url) ?>" target="_blank" rel="noopener noreferrer">
-                    <?= htmlReady($consumer->title) ?>
-                </a>
-            <? else: ?>
-                <?= htmlReady($consumer->title) ?>
-            <? endif; ?>
-            </td>
-            <td><?= $types[$consumer->type] ?? '&nbsp;' ?></td>
-            <td>
-                <a href="mailto:<?= htmlReady($consumer->email) ?>">
-                    <?= htmlReady($consumer->contact) ?>
-                </a>
-            </td>
-
-            <td><?= Icon::create('checkbox-' . ($consumer->commercial ? '' : 'un') . 'checked', 'clickable')->asImg() ?></td>
-            <td class="actions">
-                <a href="<?= $controller->url_for('admin/api/keys', $consumer->id) ?>"
-                   data-dialog="size=auto"
-                   title="<?= htmlReady(sprintf(_('Schlüssel anzeigen für Applikation "%s"'), $consumer->title)) ?>">
-                    <?= Icon::create('info-circle', 'clickable')->asImg() ?>
-                </a>
-                <a href="<?= $controller->url_for('admin/api/edit', $consumer->id) ?>" title="<?= _('Applikation bearbeiten') ?>" data-dialog>
-                    <?= Icon::create('edit', 'clickable')->asImg() ?>
-                </a>
-                <a href="<?= $controller->url_for('admin/api/permissions', $consumer->id) ?>" title="<?= _('Zugriffsberechtigungen verwalten') ?>">
-                    <?= Icon::create('admin', 'clickable')->asImg() ?>
-                </a>
-                <?= Icon::create('trash')->asInput([
-                    'formaction'   => $controller->url_for('admin/api/delete/', $consumer->id),
-                    'title'        => sprintf(_('Applikation "%s" entfernen'), $consumer->title),
-                    'data-confirm' => '',
-                    'style'        => 'vertical-align: middle'
-                ]) ?>
-            </td>
-        </tr>
-<? endforeach; ?>
-    </tbody>
-</table>
-</form>
-
-<? else: ?>
-<p>
-    <?= MessageBox::info(_('Es wurde noch keine Applikation registriert.'),
-        [sprintf(_('Klicken Sie <a href="%s">hier</a>, um eine Applikation zu registrieren.'), $controller->url_for('admin/api/edit'))]) ?>
-</p>
-<? endif; ?>
diff --git a/app/views/admin/api/permissions.php b/app/views/admin/api/permissions.php
deleted file mode 100644
index 9eb48e3..0000000
--- a/app/views/admin/api/permissions.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @var Admin_ApiController $controller
- * @var RESTAPI\ConsumerPermissions $permissions
- * @var string $consumer_id
- * @var array $routes
- * @var bool $global
- */
-?>
-<form action="<?= $controller->url_for('admin/api/permissions', $consumer_id) ?>" method="post" class="default">
-<table class="default">
-    <thead>
-        <tr>
-            <th><?= _('Zugriff') ?></th>
-            <th><?= _('Route') ?></th>
-            <th><?= _('Methoden') ?></th>
-            <th><?= _('Zugriff auf') ?></th>
-            <th><?= _('Quelle') ?></th>
-        </tr>
-    </thead>
-<? foreach ($routes as $route => $methods): ?>
-    <tbody>
-
-    <? $i = 0; ?>
-    <? foreach ($methods as $method => $info): ?>
-        <tr style="vertical-align: top;">
-            <td>
-                <input type="hidden" name="permission[<?= urlencode($route) ?>][<?= urlencode($method) ?>]" value="0">
-                <input type="checkbox" name="permission[<?= urlencode($route) ?>][<?= urlencode($method) ?>]"
-                <? if (!$global || $global->check($route, $method)): ?>
-                    <? if ($permissions->check($route, $method)) echo 'checked'; ?>
-                <? else: ?>
-                    disabled
-                <? endif; ?>
-                    value="1">
-            </td>
-        <? if ($i++): ?>
-            <td>&nbsp;</td>
-        <? else: ?>
-            <td><?= htmlReady($route) ?></td>
-        <? endif; ?>
-            <td><?= htmlReady($method) ?></td>
-            <td><?= htmlReady($info['description']) ?></td>
-            <td><?= $info['source'] ?></td>
-        </tr>
-    <? endforeach; ?>
-    </tbody>
-<? endforeach; ?>
-    <tfoot>
-        <tr>
-            <td>
-                <label>
-                    <input type="checkbox" data-proxyfor="[name^=permission]:checkbox"> <?= _('Alle') ?>
-                </label>
-            </td>
-            <td colspan="4">
-                <?= Studip\Button::createAccept(_('Speichern'), 'store') ?>
-            </td>
-        </tr>
-    </tfoot>
-</table>
-</form>
diff --git a/app/views/api/authorizations/index.php b/app/views/api/authorizations/index.php
deleted file mode 100644
index 95645f4..0000000
--- a/app/views/api/authorizations/index.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<? use Studip\Button, Studip\LinkButton; ?>
-
-<? if (empty($consumers)): ?>
-<?= MessageBox::info(_('Sie haben noch keinen Apps Zugriff auf Ihren Account gewährt.')) ?>
-<? else: ?>
-<table class="oauth-apps default">
-    <caption><?= _('Applikationen') ?></caption>
-    <thead>
-        <tr>
-            <th><?= _('Name') ?></th>
-            <th>&nbsp;</th>
-    </thead>
-    <tbody>
-    <? foreach ($consumers as $consumer): ?>
-        <tr>
-            <td>
-                <h3>
-                <? if ($consumer->url): ?>
-                    <a href="<?= htmlReady($consumer->url) ?>" target="_blank" rel="noopener noreferrer">
-                        <?= htmlReady($consumer->title) ?>
-                    </a>
-                <? else: ?>
-                    <?= htmlReady($consumer->title) ?>
-                <? endif; ?>
-                <? if (isset($types[$consumer->type])): ?>
-                    <small>(<?= htmlReady($types[$consumer->type]) ?>)</small>
-                <? endif; ?>
-                </h3>
-            <? if ($consumer->description): ?>
-                <p><?= htmlReady($consumer->description) ?></p>
-            <? endif; ?>
-            </td>
-            <td class="actions">
-                <?= LinkButton::createCancel(
-                    _('App entfernen'),
-                    $controller->url_for('api/authorizations/revoke', $consumer->id),
-                    ['data-confirm' => _('Wollen Sie der App wirklich den Zugriff auf Ihre Daten untersagen?')]
-                ) ?>
-            </td>
-        </tr>
-<? endforeach; ?>
-    </tbody>
-</table>
-<? endif; ?>
diff --git a/app/views/api/oauth/authorize.php b/app/views/api/oauth/authorize.php
deleted file mode 100644
index 6c66532..0000000
--- a/app/views/api/oauth/authorize.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<section class="oauth authorize">
-    <p>
-        <?= sprintf(
-            _('Die Applikation <strong>%s</strong> möchte auf Ihre Daten zugreifen.'),
-            htmlReady($consumer->title)
-        ) ?>
-    </p>
-
-    <form action="<?= $controller->url_for('api/oauth/authorize?oauth_token=' . $token) ?>" method="post">
-        <input type="hidden" name="oauth_callback" value="<?= htmlReady($oauth_callback) ?>">
-        <p>
-            <?= Studip\Button::createAccept(_('Erlauben'), 'allow') ?>
-            <?= Studip\LinkButton::createCancel(_('Verweigern'), $consumer->callback) ?>
-        </p>
-    </form>
-
-    <p>
-        <?= Avatar::getAvatar($GLOBALS['user']->id)->getImageTag(Avatar::SMALL) ?>
-
-        <?= sprintf(
-            _('Angemeldet als <strong>%s</strong> (%s)'),
-            htmlReady($GLOBALS['user']->getFullName()),
-            htmlReady($GLOBALS['user']->username)
-        ) ?><br>
-        <small>
-            <a href="<?= URLHelper::getLink('logout.php') ?>">
-                <?= sprintf(
-                    _('Sind sie nicht <strong>%s</strong>, so melden Sie sich bitte ab und versuchen es erneut.'),
-                    htmlReady($GLOBALS['user']->getFullName())
-                ) ?>
-            </a>
-        </small>
-    </p>
-</section>
diff --git a/app/views/api/oauth/authorized.php b/app/views/api/oauth/authorized.php
deleted file mode 100644
index e69de29..0000000
diff --git a/composer.json b/composer.json
index 7098965..dfb4fe1 100644
--- a/composer.json
+++ b/composer.json
@@ -112,7 +112,6 @@
         "league/oauth2-server": "8.5.4",
         "willdurand/negotiation": "^3.1",
         "monolog/monolog": "^2.8",
-        "phpowermove/docblock": "^2.0",
         "ksubileau/color-thief-php": "^2.0",
         "symfony/polyfill-php82": "1.29.0",
         "symfony/polyfill-php83": "1.29.0",
diff --git a/composer.lock b/composer.lock
index e4b114b..b41c344 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d524d0543302bb6f60235cbdecb3f811",
+    "content-hash": "ffcafdbc6269da0a1c7581f0129d6f1b",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -2279,109 +2279,6 @@
             "time": "2020-10-15T08:29:30+00:00"
         },
         {
-            "name": "phootwork/collection",
-            "version": "v2.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phootwork/collection.git",
-                "reference": "d58a0d7186074b601b016b9878b6fb65f6c23648"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phootwork/collection/zipball/d58a0d7186074b601b016b9878b6fb65f6c23648",
-                "reference": "d58a0d7186074b601b016b9878b6fb65f6c23648",
-                "shasum": ""
-            },
-            "require": {
-                "phootwork/lang": "^2.0",
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phootwork\\collection\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Thomas Gossmann",
-                    "homepage": "http://gos.si"
-                }
-            ],
-            "description": "The phootwork library fills gaps in the php language and provides better solutions than the existing ones php offers.",
-            "homepage": "https://phootwork.github.io/collection/",
-            "keywords": [
-                "Array object",
-                "Text object",
-                "collection",
-                "collections",
-                "json",
-                "list",
-                "map",
-                "queue",
-                "set",
-                "stack",
-                "xml"
-            ],
-            "support": {
-                "issues": "https://github.com/phootwork/phootwork/issues",
-                "source": "https://github.com/phootwork/collection/tree/v2.1.3"
-            },
-            "time": "2020-09-17T16:04:53+00:00"
-        },
-        {
-            "name": "phootwork/lang",
-            "version": "v2.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phootwork/lang.git",
-                "reference": "77402690535452da745cf11df33adc51a4ad89a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phootwork/lang/zipball/77402690535452da745cf11df33adc51a4ad89a1",
-                "reference": "77402690535452da745cf11df33adc51a4ad89a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2",
-                "symfony/polyfill-mbstring": "^1.12"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phootwork\\lang\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Thomas Gossmann",
-                    "homepage": "http://gos.si"
-                }
-            ],
-            "description": "Missing PHP language constructs",
-            "homepage": "https://phootwork.github.io/lang/",
-            "keywords": [
-                "array",
-                "comparator",
-                "comparison",
-                "string"
-            ],
-            "support": {
-                "issues": "https://github.com/phootwork/phootwork/issues",
-                "source": "https://github.com/phootwork/lang/tree/v2.1.3"
-            },
-            "time": "2021-02-15T17:24:43+00:00"
-        },
-        {
             "name": "php-di/invoker",
             "version": "2.3.4",
             "source": {
@@ -2689,58 +2586,6 @@
             "time": "2023-11-12T21:59:55+00:00"
         },
         {
-            "name": "phpowermove/docblock",
-            "version": "v2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpowermove/docblock.git",
-                "reference": "b96e2c9a14a6014fd8d932643c95b4d20638756a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpowermove/docblock/zipball/b96e2c9a14a6014fd8d932643c95b4d20638756a",
-                "reference": "b96e2c9a14a6014fd8d932643c95b4d20638756a",
-                "shasum": ""
-            },
-            "require": {
-                "phootwork/collection": "^2.0",
-                "phootwork/lang": "^2.0",
-                "php": ">=7.2"
-            },
-            "require-dev": {
-                "phootwork/php-cs-fixer-config": "^0.2.2",
-                "phpunit/phpunit": "^8.0",
-                "psalm/phar": "^4.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "gossi\\docblock\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Thomas Gossmann",
-                    "homepage": "http://gos.si"
-                }
-            ],
-            "description": "PHP Docblock parser and generator. An API to read and write Docblocks.",
-            "keywords": [
-                "docblock",
-                "generator",
-                "parser"
-            ],
-            "support": {
-                "issues": "https://github.com/gossi/docblock/issues",
-                "source": "https://github.com/phpowermove/docblock/tree/v2.0.1"
-            },
-            "time": "2021-02-17T11:36:51+00:00"
-        },
-        {
             "name": "phpseclib/phpseclib",
             "version": "3.0.37",
             "source": {
diff --git a/db/migrations/1.127_setup_api.php b/db/migrations/1.127_setup_api.php
index 7cae3f9..73b36f6 100644
--- a/db/migrations/1.127_setup_api.php
+++ b/db/migrations/1.127_setup_api.php
@@ -1,12 +1,46 @@
 <?php
 class SetupApi extends Migration
 {
-    function description()
+    public function description()
     {
         return 'Creates api tables in database and according config entries';
     }
 
-    function up()
+    public function up()
+    {
+        $this->createTables();
+
+        // Add config entries
+        $query = "INSERT IGNORE INTO `config`
+                    (`config_id`, `field`, `value`, `is_default`, `type`, `range`, `section`,
+                     `mkdate`, `chdate`, `description`)
+                  VALUES (MD5(:field), :field, :value, 1, :type, 'global', 'global',
+                          UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), :description)";
+        $statement = DBManager::get()->prepare($query);
+
+        $statement->execute([
+            ':field' => 'API_ENABLED',
+            ':value' => (int)false,
+            ':type'  => 'boolean',
+            ':description' => 'Schaltet die REST-API an',
+        ]);
+
+        $statement->execute([
+            ':field'       => 'API_OAUTH_AUTH_PLUGIN',
+            ':value'       => 'Standard',
+            ':type'        => 'string',
+            ':description' => 'Definiert das für OAuth verwendete Authentifizierungsverfahren',
+        ]);
+    }
+
+    public function down()
+    {
+        DBManager::get()->exec("DELETE FROM config WHERE field IN ('API_ENABLED', 'API_OAUTH_AUTH_PLUGIN')");
+
+        $this->dropTables();
+    }
+
+    public function createTables(): void
     {
         // Add vendor tables
         $query = "CREATE TABLE IF NOT EXISTS `oauth_consumer_registry` (
@@ -29,7 +63,7 @@ class SetupApi extends Migration
           KEY `ocr_usa_id_ref` (`ocr_usa_id_ref`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8";
         DBManager::get()->exec($query);
-        
+
         $query = "CREATE TABLE IF NOT EXISTS `oauth_consumer_token` (
           `oct_id` int(11) NOT NULL AUTO_INCREMENT,
           `oct_ocr_id_ref` int(11) NOT NULL,
@@ -47,7 +81,7 @@ class SetupApi extends Migration
           CONSTRAINT `oauth_consumer_token_ibfk_1` FOREIGN KEY (`oct_ocr_id_ref`) REFERENCES `oauth_consumer_registry` (`ocr_id`) ON DELETE CASCADE ON UPDATE CASCADE
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8";
         DBManager::get()->exec($query);
-        
+
         $query = "CREATE TABLE IF NOT EXISTS `oauth_log` (
           `olg_id` int(11) NOT NULL AUTO_INCREMENT,
           `olg_osr_consumer_key` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
@@ -80,7 +114,7 @@ class SetupApi extends Migration
           UNIQUE KEY `osn_consumer_key` (`osn_consumer_key`,`osn_token`,`osn_timestamp`,`osn_nonce`)
         ) ENGINE=MyISAM DEFAULT CHARSET=utf8";
         DBManager::get()->exec($query);
-        
+
         $query = "CREATE TABLE IF NOT EXISTS `oauth_server_registry` (
           `osr_id` int(11) NOT NULL AUTO_INCREMENT,
           `osr_usa_id_ref` int(11) DEFAULT NULL,
@@ -176,39 +210,16 @@ class SetupApi extends Migration
           PRIMARY KEY (`user_id`,`consumer_id`)
         ) ENGINE=MyISAM";
         DBManager::get()->exec($query);
-
-        // Add config entries
-        $query = "INSERT IGNORE INTO `config`
-                    (`config_id`, `field`, `value`, `is_default`, `type`, `range`, `section`,
-                     `mkdate`, `chdate`, `description`)
-                  VALUES (MD5(:field), :field, :value, 1, :type, 'global', 'global',
-                          UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), :description)";
-        $statement = DBManager::get()->prepare($query);
-
-        $statement->execute([
-            ':field' => 'API_ENABLED',
-            ':value' => (int)false,
-            ':type'  => 'boolean',
-            ':description' => 'Schaltet die REST-API an',
-        ]);
-
-        $statement->execute([
-            ':field'       => 'API_OAUTH_AUTH_PLUGIN',
-            ':value'       => 'Standard',
-            ':type'        => 'string',
-            ':description' => 'Definiert das für OAuth verwendete Authentifizierungsverfahren',
-        ]);
     }
 
-    function down()
+    public function dropTables(): void
     {
-        DBManager::get()->exec("DELETE FROM config WHERE field IN ('API_ENABLED', 'API_OAUTH_AUTH_PLUGIN')");
         DBManager::get()->exec("DROP TABLE IF EXISTS `oauth_consumer_registry`,
                                                      `oauth_consumer_token`,
                                                      `oauth_log`,
                                                      `oauth_server_nonce`,
                                                      `oauth_server_registry`,
-                                                     `oauth_server_token`
+                                                     `oauth_server_token`,
                                                      `api_consumer_permissions`,
                                                      `api_consumers`,
                                                      `api_oauth_user_mapping`,
diff --git a/db/migrations/5.1.34_activate_semester_routes.php b/db/migrations/5.1.34_activate_semester_routes.php
index 082a5db..21cbb64 100644
--- a/db/migrations/5.1.34_activate_semester_routes.php
+++ b/db/migrations/5.1.34_activate_semester_routes.php
@@ -8,7 +8,9 @@ class ActivateSemesterRoutes extends Migration
 
     public function up()
     {
-        require_once 'app/routes/Semester.php';
-        RESTAPI\ConsumerPermissions::get()->activateRouteMap(new RESTAPI\Routes\Semester());
+        // Deactivated since the restapi was removed in Stud.IP 6.0
+
+        # require_once 'app/routes/Semester.php';
+        # RESTAPI\ConsumerPermissions::get()->activateRouteMap(new RESTAPI\Routes\Semester());
     }
 }
diff --git a/db/migrations/6.0.10_remove_restapi.php b/db/migrations/6.0.10_remove_restapi.php
new file mode 100644
index 0000000..5062916
--- /dev/null
+++ b/db/migrations/6.0.10_remove_restapi.php
@@ -0,0 +1,63 @@
+<?php
+final class RemoveRestapi extends Migration
+{
+    private Migration $other_migration;
+
+    public function __construct($verbose = false)
+    {
+        parent::__construct($verbose);
+
+        require_once __DIR__ . '/1.127_setup_api.php';
+        $this->other_migration = new SetupApi($verbose);
+    }
+
+    public function description()
+    {
+        return 'Removes the deprecated REST API (essentially reverts migration 1.127)';
+    }
+
+    protected function up()
+    {
+        $this->other_migration->dropTables();
+
+        // Delete config
+        $query = "DELETE `config`, `config_values`
+                  FROM `config`
+                  LEFT JOIN `config_values` USING(`field`)
+                  WHERE `field` IN ('API_ENABLED', 'API_OAUTH_AUTH_PLUGIN')";
+        DBManager::get()->exec($query);
+
+        // Disable all RESTAPI-Plugins
+        $query = "UPDATE `plugins`
+                  SET `enabled` = 'no'
+                  WHERE FIND_IN_SET('RESTAPIPlugin', `plugintype`)";
+        DBManager::get()->exec($query);
+    }
+
+    protected function down()
+    {
+        // Add config entries
+        $query = "INSERT IGNORE INTO `config`
+                    (`field`, `value`, `type`, `range`, `section`,
+                     `mkdate`, `chdate`, `description`)
+                  VALUES (:field, :value, :type, 'global', 'global',
+                          UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), :description)";
+        $statement = DBManager::get()->prepare($query);
+
+        $statement->execute([
+            ':field' => 'API_ENABLED',
+            ':value' => 0,
+            ':type'  => 'boolean',
+            ':description' => 'Schaltet die REST-API an',
+        ]);
+
+        $statement->execute([
+            ':field'       => 'API_OAUTH_AUTH_PLUGIN',
+            ':value'       => 'Standard',
+            ':type'        => 'string',
+            ':description' => 'Definiert das für OAuth verwendete Authentifizierungsverfahren',
+        ]);
+
+        $this->other_migration->createTables();
+    }
+}
diff --git a/lib/activities/DocumentsProvider.php b/lib/activities/DocumentsProvider.php
index 0a770de..fae5df2 100644
--- a/lib/activities/DocumentsProvider.php
+++ b/lib/activities/DocumentsProvider.php
@@ -29,7 +29,6 @@ class DocumentsProvider implements ActivityProvider
 
         if ($activity->context == "course") {
             $url = \URLHelper::getUrl("dispatch.php/course/files/flat?cid={$activity->context_id}");
-            $route = \URLHelper::getURL('api.php/file/' . $activity->object_id, NULL, true);
 
             $activity->object_url = [
                 $url => _('Zum Dateibereich der Veranstaltung')
@@ -43,8 +42,6 @@ class DocumentsProvider implements ActivityProvider
             ];
         }
 
-        $activity->object_route = $route;
-
         return true;
     }
 
diff --git a/lib/activities/ForumProvider.php b/lib/activities/ForumProvider.php
index f543947..6a958eb 100644
--- a/lib/activities/ForumProvider.php
+++ b/lib/activities/ForumProvider.php
@@ -30,14 +30,10 @@ class ForumProvider implements ActivityProvider
                     .'?cid='. $post['seminar_id'] .'&highlight_topic='. $post['topic_id']
                     .'#'. $post['topic_id']);
 
-        $route = \URLHelper::getURL('api.php/forum_entry/' . $post['topic_id'], NULL, true);
-
         $activity->object_url = [
             $url => _('Zum Forum der Veranstaltung')
         ];
 
-        $activity->object_route = $route;
-
         return true;
     }
 
diff --git a/lib/activities/MessageProvider.php b/lib/activities/MessageProvider.php
index 9d16831..0db2ad8 100644
--- a/lib/activities/MessageProvider.php
+++ b/lib/activities/MessageProvider.php
@@ -30,14 +30,10 @@ class MessageProvider implements ActivityProvider
 
         $url = \URLHelper::getUrl("dispatch.php/messages/read/{$message->id}", ['cid' => null]);
 
-        $route = \URLHelper::getURL('api.php/message/' . $message->id, NULL, true);
-
         $activity->object_url = [
             $url => _('Zur Nachricht')
         ];
 
-        $activity->object_route = $route;
-
         return true;
     }
 
diff --git a/lib/activities/NewsProvider.php b/lib/activities/NewsProvider.php
index eed7fe7..8f1c5f4 100644
--- a/lib/activities/NewsProvider.php
+++ b/lib/activities/NewsProvider.php
@@ -116,10 +116,8 @@ class NewsProvider implements ActivityProvider
             .'</b><br>'. formatReady((string) $news->body);
 
         $url = self::getUrlForContext($news, $activity);
-        $route = \URLHelper::getURL('api.php/news/' . $news->id, NULL, true);
 
         $activity->object_url = $url;
-        $activity->object_route = $route;
 
         return true;
     }
diff --git a/lib/activities/ParticipantsProvider.php b/lib/activities/ParticipantsProvider.php
index 50bad46..7dc71fd 100644
--- a/lib/activities/ParticipantsProvider.php
+++ b/lib/activities/ParticipantsProvider.php
@@ -62,14 +62,10 @@ class ParticipantsProvider implements ActivityProvider
 
         $url = \URLHelper::getUrl("dispatch.php/course/members/index", ['cid' => $activity->context_id]);
 
-        $route = \URLHelper::getURL('api.php/course/' . $activity->context_id, NULL, true);
-
         $activity->object_url = [
             $url => _('Zur Veranstaltung')
         ];
 
-        $activity->object_route = $route;
-
         return true;
     }
 
diff --git a/lib/activities/ScheduleProvider.php b/lib/activities/ScheduleProvider.php
index 208b9b3..73ca7f5 100644
--- a/lib/activities/ScheduleProvider.php
+++ b/lib/activities/ScheduleProvider.php
@@ -20,14 +20,11 @@ class ScheduleProvider implements ActivityProvider
         $activity->content = htmlReady($activity->content);
 
         $url = \URLHelper::getUrl("dispatch.php/course/dates?cid={$activity->context_id}");
-        $route = \URLHelper::getURL('api.php/course/' . $activity->context_id . '/events', NULL, true);
 
         $activity->object_url = [
             $url => _('Zum Ablaufplan der Veranstaltung')
         ];
 
-        $activity->object_route = $route;
-
         return true;
     }
 
diff --git a/lib/activities/WikiProvider.php b/lib/activities/WikiProvider.php
index f3a8bbf..7a5266f 100644
--- a/lib/activities/WikiProvider.php
+++ b/lib/activities/WikiProvider.php
@@ -27,23 +27,17 @@ class WikiProvider implements ActivityProvider
 
         if ($activity->context === 'course') {
             $url = \URLHelper::getURL('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $activity->context_id]);
-            $route = \URLHelper::getURL("api.php/course/{$activity->context_id}/wiki/{$activity->object_id}", null, true);
 
             $activity->object_url = [
                 $url => _('Zum Wiki der Veranstaltung'),
             ];
 
-            $activity->object_route = $route;
-
         } elseif ($activity->context === 'institute') {
             $url = \URLHelper::getURL('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $activity->context_id]);
-            $route= null;
 
             $activity->object_url = [
                 $url => _('Zum Wiki der Einrichtung')
             ];
-
-            $activity->object_route = $route;
         }
 
         return true;
diff --git a/lib/bootstrap-api.php b/lib/bootstrap-api.php
deleted file mode 100644
index ffa0b40..0000000
--- a/lib/bootstrap-api.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-
-namespace {
-    StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'] . '/vendor/oauth-php/library');
-
-    // Set base url for URLHelper class
-    URLHelper::setBaseUrl($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP']);
-}
-
-namespace RESTAPI {
-    use Studip, OAuthStore;
-
-    // Define api version
-    const VERSION = '2';
-
-    $router = Router::getInstance();
-
-    // Register JSON content renderer
-    $router->registerRenderer(new Renderer\JSONRenderer, true);
-
-    // If in development mode, register debug content renderer
-    if (defined('Studip\\ENV') && Studip\ENV === 'development') {
-        $router->registerRenderer(new Renderer\DebugRenderer);
-    }
-
-    OAuthStore::instance('PDO', [
-        'dsn' => 'mysql:host=' . $GLOBALS['DB_STUDIP_HOST']
-                   . ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE'],
-        'username' => $GLOBALS['DB_STUDIP_USER'],
-        'password' => $GLOBALS['DB_STUDIP_PASSWORD']
-    ]);
-
-    // Register default consumers
-    Consumer\Base::addType('http', 'RESTAPI\\Consumer\\HTTP');
-    Consumer\Base::addType('studip', 'RESTAPI\\Consumer\\Studip');
-    Consumer\Base::addType('oauth', 'RESTAPI\\Consumer\\OAuth');
-}
diff --git a/lib/classes/restapi/ConsumerPermissions.php b/lib/classes/restapi/ConsumerPermissions.php
deleted file mode 100644
index 8fc2252..0000000
--- a/lib/classes/restapi/ConsumerPermissions.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-namespace RESTAPI;
-use DBManager, PDO;
-
-/**
- * REST API routing permissions
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class ConsumerPermissions
-{
-    /**
-     * Create a permission object (for a certain consumer).
-     * Permissions object will be cached for each consumer.
-     *
-     * @param mixed $consumer_id Id of consumer (optional, defaults to global)
-     * @return ConsumerPermissions Returns permissions object
-     */
-    public static function get($consumer_id = null)
-    {
-        static $cache = [];
-        if (!isset($cache[$consumer_id])) {
-            $cache[$consumer_id] = new self($consumer_id);
-        }
-
-        return $cache[$consumer_id];
-    }
-
-    private $consumer_id;
-    private $permissions = [];
-
-    /**
-     * Creates the actual permission object (for a certain consumer).
-     *
-     * @param mixed $consumer_id Id of consumer (optional, defaults to global)
-     */
-    private function __construct($consumer_id = null)
-    {
-        $this->consumer_id = $consumer_id;
-
-        // Init with global permissions
-        $this->loadPermissions('global', true);
-
-        // Specific consumers permissions?
-        if ($consumer_id) {
-            $this->loadPermissions($consumer_id, false);
-        }
-    }
-
-    /**
-     * Defines whether access if allowed for the current consumer to the
-     * passed route via the passed method.
-     *
-     * @param String $route_id Route template (hash)
-     * @param String $method   HTTP method
-     * @param mixed  $granted  Granted state (PHP'ish boolean)
-     * @param bool   $overwrite May values be overwritten
-     * @return bool Indicates if value could be changed.
-     */
-    public function set($route_id, $method, $granted, $overwrite = false)
-    {
-        // If route_id is not an md5 hash, convert it
-        if (!preg_match('/^[0-9a-f]{32}$/', $route_id)) {
-            $route_id = md5($route_id);
-        }
-
-        if (!isset($this->permissions[$route_id])) {
-            // Skip if not globally set and not allowed to overwrite
-            if (!$overwrite) {
-                return false;
-            }
-            $this->permissions[$route_id] = [];
-        }
-
-        // overwrite only if globally allowed
-        if (!$overwrite && empty($this->permissions[$route_id][$method])) {
-            return false;
-        }
-
-        $this->permissions[$route_id][$method] = (bool) $granted;
-
-        return true;
-    }
-
-    /**
-     * Convenience method for activating all routes in a route map.
-     *
-     * @param  \RESTAPI\RouteMap $routemap RouteMap to activate
-     */
-    public function activateRouteMap(RouteMap $routemap)
-    {
-        foreach ($routemap->getRoutes() as $method => $routes) {
-            foreach (array_keys($routes) as $route) {
-                $this->set($route, $method, true, true);
-            }
-        }
-
-        $this->store();
-    }
-
-    /**
-     * Removes stored permissions for a given route and method.
-     *
-     * @param String $route_id Route template
-     * @param String $method HTTP method
-     * @return bool
-     */
-    public function remove($route_id, $method)
-    {
-        if (!isset($this->permissions[$route_id][$method])) {
-            return false;
-        }
-
-        unset($this->permissions[$route_id][$method]);
-
-        if (count($this->permissions[$route_id]) === 0) {
-            unset($this->permissions[$route_id]);
-        }
-
-        return true;
-    }
-
-    /**
-     * Convenience method for deactivating all routes in a route map.
-     *
-     * @param \RESTAPI\RouteMap $routemap RouteMap to activate
-     */
-    public function deactivateRouteMap(RouteMap $routemap)
-    {
-        foreach ($routemap->getRoutes() as $method => $routes) {
-            foreach (array_keys($routes) as $route) {
-                $this->remove($route, $method);
-            }
-        }
-
-        $this->store();
-    }
-
-    /**
-     * Loads permissions for passed consumer.
-     *
-     * @param String $consumer_id Id of the consumer in question
-     * @param bool   $overwrite May values be overwritten
-     * @return ConsumerPermissions Returns instance of self to allow chaining
-     */
-    protected function loadPermissions($consumer_id, $overwrite = false)
-    {
-        $query = "SELECT route_id, method, granted
-                  FROM api_consumer_permissions
-                  WHERE consumer_id = IFNULL(:consumer_id, 'global')";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':consumer_id', $consumer_id);
-        $statement->execute();
-        $permissions = $statement->fetchAll(PDO::FETCH_ASSOC);
-
-        // Init with global permissions
-        foreach ($permissions as $permission) {
-            extract($permission);
-
-            $this->set($route_id, $method, $granted, $overwrite);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Checks if access to passed route via passed method is allowed for
-     * the current consumer.
-     *
-     * @param String $route  Route template
-     * @param String $method HTTP method
-     * @return bool Indicates whether access is allowed
-     */
-    public function check($route, $method)
-    {
-        $route_id = md5($route);
-
-        return isset($this->permissions[$route_id][$method])
-            && $this->permissions[$route_id][$method];
-    }
-
-    /**
-     * Stores the set permissions.
-     *
-     * @return bool Returns true if permissions were stored successfully
-     */
-    public function store()
-    {
-        $result = true;
-
-        $query = "INSERT INTO api_consumer_permissions (route_id, consumer_id, method, granted)
-                  VALUES (:route, IFNULL(:consumer_id, 'global'), :method, :granted)
-                  ON DUPLICATE KEY UPDATE granted = VALUES(granted)";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':consumer_id', $this->consumer_id);
-
-        foreach ($this->permissions as $route_id => $methods) {
-            $statement->bindParam(':route', $route_id);
-            foreach ($methods as $method => $granted) {
-                $statement->bindParam(':method', $method);
-                $granted = (int) !empty($granted);
-                $statement->bindParam(':granted', $granted);
-                $result = $result && $statement->execute();
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/lib/classes/restapi/Response.php b/lib/classes/restapi/Response.php
deleted file mode 100644
index 56d9b65..0000000
--- a/lib/classes/restapi/Response.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-namespace RESTAPI;
-
-/**
- * Response class for the rest api
- *
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Response implements \ArrayAccess
-{
-    public $body, $status, $headers;
-
-    /**
-     * Constructor, sets vital information if provided.
-     *
-     * @param String $body    Body contents of the response, optional,
-     *                        defaults to empty string
-     * @param int    $status  HTTP status code, optional, defaults to 200
-     * @param Array  $headers HTTP headers, optional, defaults to no headers
-     */
-    public function __construct($body = '', $status = 200, $headers = [])
-    {
-        $this->body = $body;
-        $this->status = (int) $status;
-        $this->headers = (array) $headers;
-    }
-
-    /**
-     * Detects whether the response status is of success type (HTTP status 2xx)
-     *
-     * @return bool True if status is of success type, false otherwise
-     */
-    public function isSuccess()
-    {
-        return 200 <= $this->status && $this->status <= 299;
-    }
-
-    /**
-     * Finishes the response with the given response renderer.
-     *
-     * @param Renderer\DefaultRenderer $content_renderer Used response renderer,
-     *                                                   only applied if body is
-     *                                                   not a callable closure
-     */
-    public function finish($content_renderer)
-    {
-        if (!is_callable($this->body)) {
-            $content_renderer->render($this);
-        }
-    }
-
-    /**
-     * Sends the response.
-     */
-    public function output()
-    {
-        if (isset($this->status)) {
-            if (mb_strpos(PHP_SAPI, 'cgi') === 0) {
-                $this->sendHeader(sprintf('Status: %d %s', $this->status, $this->reason()));
-            } else {
-                $this->sendHeader(sprintf('HTTP/1.1 %d %s', $this->status, $this->reason()));
-            }
-        }
-
-        foreach ($this->headers as $k => $v) {
-            $this->sendHeader("$k: $v", false, $this->status);
-        }
-
-        if (is_callable($this->body)) {
-            call_user_func($this->body);
-        } else {
-            echo $this->body;
-        }
-    }
-
-    /**
-     * Internally used function to actually send headers
-     *
-     * @param  string     the HTTP header
-     * @param  bool       optional; TRUE if previously sent header should be
-     *                    replaced - FALSE otherwise (default)
-     * @param  integer    optional; the HTTP response code
-     *
-     * @return void
-     */
-    public function sendHeader($header, $replace = FALSE, $status = NULL) {
-        if (isset($status)) {
-            header($header, $replace, $status);
-        }
-        else {
-            header($header, $replace);
-        }
-    }
-
-    /**
-     * Returns the reason phrase of this response according to RFC2616.
-     *
-     * @return string  the reason phrase for this response's status
-     */
-    public function reason() {
-        $reason = [
-            100 => 'Continue', 'Switching Protocols',
-            200 => 'OK', 'Created', 'Accepted', 'Non-Authoritative Information',
-                   'No Content', 'Reset Content', 'Partial Content',
-            300 => 'Multiple Choices', 'Moved Permanently', 'Found', 'See Other',
-                   'Not Modified', 'Use Proxy', '(Unused)', 'Temporary Redirect',
-            400 => 'Bad Request', 'Unauthorized', 'Payment Required','Forbidden',
-                   'Not Found', 'Method Not Allowed', 'Not Acceptable',
-                   'Proxy Authentication Required', 'Request Timeout', 'Conflict',
-                   'Gone', 'Length Required', 'Precondition Failed',
-                   'Request Entity Too Large', 'Request-URI Too Long',
-                   'Unsupported Media Type', 'Requested Range Not Satisfiable',
-                   'Expectation Failed',
-            500 => 'Internal Server Error', 'Not Implemented', 'Bad Gateway',
-                   'Service Unavailable', 'Gateway Timeout',
-                   'HTTP Version Not Supported'];
-
-        return isset($reason[$this->status]) ? $reason[$this->status] : '';
-    }
-
-    // array access methods for headers
-
-    public function offsetExists($offset): bool
-    {
-        return isset($this->headers[$offset]);
-    }
-
-    /**
-     * @param $offset
-     */
-    public function offsetGet($offset): mixed
-    {
-        return @$this->headers[$offset];
-    }
-
-    public function offsetSet($offset, $value): void
-    {
-        $this->headers[$offset] = $value;
-    }
-
-    public function offsetUnset($offset): void
-    {
-        unset($this->headers[$offset]);
-    }
-}
diff --git a/lib/classes/restapi/RouteMap.php b/lib/classes/restapi/RouteMap.php
deleted file mode 100644
index b8ad2f4..0000000
--- a/lib/classes/restapi/RouteMap.php
+++ /dev/null
@@ -1,1060 +0,0 @@
-<?php
-namespace RESTAPI;
-
-use Config;
-use Request;
-use gossi\docblock\Docblock;
-
-/**
- * RouteMaps define and group routes to resources.
- *
- * Instances of RouteMaps are registered with the RESTAPI\Router to
- * participate in the routing business.
- *
- * A RouteMap defines at least one handler method which has to be
- * annotated with one of these annotations correlating to HTTP request
- * methods:
- *
- * @code
- * / * *
- *  * An example handler method
- *  *
- *  * @get /foo
- *  * @post /bar/:id
- *  * @put /baz/:id/:other_id
- *  * @delete /
- *  * /
- *  public function anyMethodName($id, $other_id = null) {}
- * @endcode
- *
- * By default, all API routes are unaccessible for nobody users.
- * To explicitly allow access for nobody users, add the allow_nobody
- * tag to the handler method's doc block. Example:
- *
- * @code
- * / * *
- *  * Another example handler method
- *  *
- *  * @get /foo
- *  *
- *  * @allow_nobody
- *  * /
- * @endcode
- *
- * As soon as the Router matches a HTTP request to a handler defined
- * in a RouteMap, it calls RouteMap::init to initialize it and
- * especially the instance field `$this->response` of type
- * RESTAPI\Response. You do not call RouteMap::init on your own.
- *
- * After the router has initialized this RouteMap, the router tries to
- * call a method `before` of this signature:
- *
- * @code
- * public function before(Router $router, Array $handler, Array $parameters);
- * @endcode
- *
- * The parameter `$handler` is a callable (as in function is_callable)
- * consisting of the instance of this RouteMap and the name of a
- * method of this instance. You may change the values of this array to
- * redirect to another handler.
- *
- * The parameter `$parameters` is an associative array whose keys
- * correlate to the placeholders in the matched URI template. The
- * values are the actual values of that placeholders in regard to the
- * HTTP request.
- *
- *
- * After calling RouteMap::before control is transfered to the actual
- * handler method. The values of the placeholders in the URI template
- * of the annotation are send as arguments to the handler.
- *
- * Example: We have got this handler method defined:
- *
- * @code
- * / * *
- *  * @get /foo/:id/bar/:other_id
- *  * /
- * public function fooHandler($id, $other_id) {
- * }
- * @endcode
- *
- * The router receives a request like this: `http://[..]/foo/1/bar/2`
- * and matches it to our `fooHandler` which is then called something
- * like that:
- *
- * @code
- * $result = $routeMap->fooHandler(1, 2);
- * @endcode
- *
- * In your handler methods you have to process the input and return
- * some output data, which is then rendered in an appropriate way
- * after negotiating the content format in the Router.
- *
- * Thus the return value of your handler method becomes the body of
- * the HTTP response.
- *
- *
- * The RouteMap class defines several methods to ease up your work
- * with the HTTP specifica.
- *
- * The methods RouteMap::status, RouteMap::headers and RouteMap::body
- * correlate to the components of a HTTP response.
- *
- * There are helpers for returning paginated collections, see
- * RouteMap::paginated.
- *
- * If you encounter an error or have to stop further processing, see
- * methods RouteMap::halt, RouteMap::error and RouteMap::notFound.
- *
- * These methods are \a DISRUPTIVE as they immediately stop the control
- * flow in your handler:
- *
- * @code
- * public function fooHandler($id)
- * {
- *   // do something
- *
- *   $this->halt();
- *
- *   // this line will never be reached
- * }
- * @endcode
- *
- * If you want to simply send a redirection response (HTTP status code
- * of 302 or 303), you may find calling RouteMap::redirect helpful.
- *
- * To generate a URL to a handler, use RouteMap::url
- *
- * When you find the need to return the content of a file, please see
- * RouteMap::sendFile which will help you with streaming it to the
- * client. For custom streaming just return a Closure from your
- * handler method.
- *
- * There are several other methods which you may find useful each
- * matching a HTTP header:
- *
- *   - RouteMap::contentType
- *   - RouteMap::etag
- *   - RouteMap::expires
- *   - RouteMap::cacheControl
- *   - RouteMap::lastModified
- *
- * You can access the data sent in the body of the current HTTP
- * request using the `$this->data` instance variable.
- *
- *   - If the request was of Content-Type `application/json`, the
- *     body of the request is decoded using `json_decode`.
- *   - If the request was of Content-Type
- *     `application/x-www-form-urlencoded`, the body of the request is
- *     decoded using `parse_str`.
- *   - Otherwise the request will not be parsed and `$this->data` will
- *     just contain the raw string.
- *
- * NOTE: The result of the described parsing will always contain
- *       strings encoded in windows-1252. If the original body
- *       was UTF-8 encoded, it is automatically re-encoded to windows-1252.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-abstract class RouteMap
-{
-    protected $router;
-    protected $route;
-    protected $data = null;
-    protected $response;
-
-    /**
-     * Internal property which is used by RouteMap::paginated and
-     * contains everything about a paginated collection.
-     */
-    protected $pagination = false;
-
-    /**
-     * The offset into a RouteMap::paginated collection as requested
-     * by the client.
-     */
-    protected $offset;
-
-    /**
-     * The limit of a RouteMap::paginated collection as requested
-     * by the client.
-     */
-    protected $limit;
-
-    /**
-     * Constructor of the route map. Initializes neccessary offset and limit
-     * parameters for pagination.
-     */
-    public function __construct()
-    {
-        $this->offset = Request::int('offset', 0);
-        $this->limit  = Request::int('limit', Config::get()->ENTRIES_PER_PAGE);
-    }
-
-    /**
-     * Initializes the route map by binding it to a router and passing in
-     * the current route.
-     *
-     * @param Router $router Router to bind this route map to
-     * @param array $route   The matched route out of Router::matchRoute;
-     *                       an array with keys 'handler', 'conditions' and
-     *                       'source'
-     */
-    public function init($router, $route)
-    {
-        $this->router   = $router;
-        $this->route    = $route;
-        $this->response = new Response();
-
-        if ($mediaType = $this->getRequestMediaType()) {
-            $this->data = $this->parseRequestBody($mediaType);
-        }
-    }
-
-    /**
-     * Marks this chunk of data as a slice of a larger data set with
-     * a sum of "total" entries.
-     *
-     * @param mixed $data         Chunk of data (should be sliced according
-     *                            to current offset and limit parameters).
-     * @param int   $total        The total number of data entries in the
-     *                            according set.
-     * @param array $uri_params   Neccessary parameters when generating uris
-     *                            for the current route.
-     * @param array $query_params Optional query parameters.
-     */
-    public function paginated($data, $total, $uri_params = [], $query_params = [])
-    {
-        $uri = $this->url($this->route['uri_template']->inject($uri_params), $query_params);
-
-        $this->paginate($uri, $total);
-        return $this->collect($data);
-    }
-
-
-    /**
-     * Low level method for paginating collections. You better use
-     * RouteMap::paginated instead of this.
-     *
-     * Set the pagination data used by the RouteMap::collect.
-     *
-     * @param String $uri_format
-     * @param int    $total
-     * @param mixed  $offset
-     * @param mixed  $limit
-     *
-     * @return Routemap Returns instance of self to allow chaining
-     */
-    public function paginate($uri_format, $total, $offset = null, $limit = null)
-    {
-        $total  = (int)$total;
-        $offset = (int)($offset ?: $this->offset ?: 0);
-        $limit  = (int)($limit ?: $this->limit);
-
-        $this->pagination = compact('uri_format', 'total', 'offset', 'limit');
-
-        return $this;
-    }
-
-    /**
-     * Low level method for paginating collections. You better use
-     * RouteMap::paginated instead of this.
-     *
-     * Adjusts the result set to return a collection. A collection consists
-     * of the passed data array and the associated pagination information
-     * if available.
-     *
-     * Be aware that the passed data has to be already sliced according to
-     * the pagination information.
-     *
-     * @param array $data Actual dataset
-     * @return array Collection "object"
-     */
-    public function collect($data)
-    {
-        $collection = [
-            'collection' => $data
-        ];
-        if (is_array($this->pagination)) {
-            extract($this->pagination);
-
-            $offset = $offset - $offset % $limit;
-            $max    = ($total % $limit)
-                    ? $total - $total % $limit
-                    : $total - $limit;
-
-            $pagination = compact('total', 'offset', 'limit');
-            if ($total > $limit) {
-                $links = [];
-
-                foreach ([
-                             'first' => 0,
-                             'previous' => max(0, $offset - $limit),
-                             'next' => min($max, $offset + $limit),
-                             'last' => $max]
-                         as $key => $offset)
-                {
-                    $links[$key] = \URLHelper::getURL($uri_format, compact('offset', 'limit'));
-                }
-
-                $pagination['links'] = $links;
-            }
-            $collection['pagination'] = $pagination;
-        }
-        return $collection;
-    }
-
-    /************************/
-    /* REQUEST BODY METHODS */
-    /************************/
-
-    // find the requested media type
-    private function getRequestMediaType()
-    {
-        if (!empty($_SERVER['CONTENT_TYPE'])) {
-            $contentTypeParts = preg_split('/\s*[;,]\s*/', $_SERVER['CONTENT_TYPE']);
-            return mb_strtolower($contentTypeParts[0]);
-        }
-    }
-
-    // media-types that we know how to process
-    private static $mediaTypes = [
-        'application/json' => 'parseJson',
-        'application/x-www-form-urlencoded' => 'parseFormEncoded',
-        'multipart/form-data' => 'parseMultipartFormdata'
-    ];
-
-    // cache the request body
-    private static $_request_body;
-
-    // reads the HTTP request body
-    private function parseRequestBody($mediaType)
-    {
-        // read it only once
-        if (!isset(self::$_request_body)) {
-            self::$_request_body = file_get_contents('php://input');
-        }
-
-        if (isset(self::$mediaTypes[$mediaType])) {
-            $result = call_user_func([__CLASS__, self::$mediaTypes[$mediaType]], self::$_request_body);
-            if ($result) {
-                return $result;
-            }
-        }
-        return self::$_request_body;
-    }
-
-    // strategy to decode JSON strings
-    private static function parseJson($input)
-    {
-        return json_decode($input, true);
-    }
-
-    // strategy to decode form encoded strings
-    private static function parseFormEncoded($input)
-    {
-        parse_str($input, $result);
-        return $result;
-    }
-
-    // strategy to decode a multipart message. Used for file-uploads.
-    private static function parseMultipartFormdata($input)
-    {
-
-        $data = [];
-        if (Request::isPost()) {
-            foreach ($_POST as $key => $value) {
-                $data[$key] = $value;
-            }
-            $data['_FILES'] = $_FILES;
-            return $data;
-        }
-        $boundary = self::getMultipartBoundary();
-        if (!$boundary) {
-            return $data;
-        }
-        $input = explode("--".$boundary, $input);
-
-        array_pop($input);
-        array_shift($input);
-
-        foreach ($input as $part) {
-            $part = ltrim($part, "\r\n");
-            [$head, $body] = explode("\r\n\r\n", $part, 2);
-
-            $tmpheaders = $headers = [];
-            foreach (explode("\r\n", $head) as $headline) {
-                if (preg_match('/^[^\s]/', $headline)) {
-                    $lineIsHeader = preg_match('/([^:]+):\s*(.*)$/', $headline, $matches);
-                    if ($lineIsHeader) {
-                        $tmpheaders[] = ['index' => mb_strtolower(trim($matches[1])), 'value' => trim($matches[2])];
-                    }
-                } else {
-                    //noch zur letzten Zeile hinzuzählen
-                    end($tmpheaders);
-                    $lastkey = key($tmpheaders);
-                    $tmpheaders[$lastkey]['value'] .= " ".mb_substr($headline, 1);
-                }
-            }
-            foreach ($tmpheaders as $header) {
-                $headers[$header['index']] = $header['value'];
-            }
-
-            $contentType = "";
-            if (isset($headers['content-type'])) {
-                preg_match("/^([^;\s]*)/", $headers['content-type'], $matches);
-                $contentType = mb_strtolower($matches[1]);
-            }
-            switch ($headers["transfer-encoding"]) {
-                case "quoted-printable":
-                    $body = quoted_printable_decode($body);
-                    break;
-                case "base64":
-                    $body = base64_decode(preg_replace("/(\r?\n|\r)/", "", trim($body)));
-                    break;
-                case "7bit":
-                case "8bit":
-                default:
-                    //nothing to do
-            }
-            $matches = [];
-            preg_match("/name=([^;\s]*)/i", $headers['content-disposition'], $matches);
-            $name = str_replace(["'", '"'], '', $matches[1]);
-            if (!$contentType) {
-                $data[$name] = mb_substr($body, 0, mb_strlen($body) - 2);
-            } else {
-                switch ($contentType) {
-                    case 'application/json':
-                        $data = array_merge($data, self::parseJson($body));
-                        break;
-                    case 'application/x-www-form-urlencoded':
-                        $data = array_merge($data, self::parseFormEncoded($body));
-                        break;
-                    default:
-                        $matches = [];
-                        preg_match("/filename=([^;\s]*)/i", $headers['content-disposition'], $matches);
-                        if (!$matches[1]) {
-                            preg_match('/filename=([^;\s]*)/i', $headers['content-type'], $matches);
-                        }
-                        $filename = str_replace(["'", '"'], '', $matches[1]);
-                        $tmp_name = $GLOBALS['TMP_PATH']."/uploadfile_".md5(uniqid());
-                        $handle = fopen($tmp_name, 'wb');
-                        $filesize = fwrite($handle, $body, (mb_strlen($body) - 2));
-                        fclose($handle);
-                        $data['_FILES'][$name] = [
-                            'name' => $filename,
-                            'type' => $contentType,
-                            'tmp_name' => $tmp_name,
-                            'size' => $filesize
-                        ];
-                }
-            }
-        }
-        return $data;
-    }
-
-    private static function getMultipartBoundary()
-    {
-        if ($contentType = $_SERVER['CONTENT_TYPE']) {
-            foreach (preg_split('/\s*[;,]\s*/', $contentType) as $part) {
-                if (mb_strtolower(mb_substr($part, 0, 8)) === "boundary") {
-                    $part = explode("=", $part);
-                    return $part[1];
-                }
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Set the HTTP status of the current response.
-     *
-     * @param integer $status  the HTTP status of the response
-     */
-    public function status($status)
-    {
-        $this->response->status = $status;
-    }
-
-    /**
-     * Set multiple response headers of the current response by
-     * merging them with already set ones.
-     *
-     * @code
-     * $routemap->headers(array('X-example' => "yep"));
-     * @endcode
-     *
-     * @param array $headers  the headers to set
-     *
-     * @return array  the headers of the current response
-     */
-    public function headers($headers = [])
-    {
-        if (sizeof($headers)) {
-            $this->response->headers = array_merge($this->response->headers, $headers);
-        }
-        return $this->response->headers;
-    }
-
-    /**
-     * Set the HTTP body of the current response.
-     *
-     * @param string $body  the body to send back
-     */
-    public function body($body)
-    {
-        $this->response->body = $body;
-    }
-
-
-    /**
-     * Set the Content-Type of the HTTP response given a mime type and
-     * optionally further parameters as discusses in RFC 2616 14.17.
-     *
-     * If no charset is given, it defaults to Stud.IP's 'windows-1252'.
-     *
-     * Examples:
-     *
-     * @code
-     * // results in "Content-Type: image/gif"
-     * $this->contentType('image/gif);
-     *
-     * // results in "Content-Type: text/html;charset=ISO-8859-4"
-     * $this->contentType('text/html;charset=ISO-8859-4');
-     *
-     * // results in "Content-Type: text/html;charset=ISO-8859-4"
-     * $this->contentType('text/html', array('charset' => 'ISO-8859-4'));
-     *
-     * // results in "Content-type: multipart/byteranges; boundary=THIS_STRING_SEPARATES"
-     * $this->contentType('multipart/byteranges', array('boundary' => 'THIS_STRING_SEPARATES'));
-     *
-     * @endcode
-     *
-     * @param string $mime_type  a string describing a MIME type like 'application/json'
-     * @param array  $params     optional parameters as described above
-     */
-    public function contentType($mime_type, $params = [])
-    {
-        if (!isset($params['charset'])) {
-            $params['charset'] = 'utf-8';
-        }
-
-        if (mb_strpos($mime_type, 'charset') !== FALSE) {
-            unset($params['charset']);
-        }
-
-        if (sizeof($params)) {
-            $mime_type .= mb_strpos($mime_type, ';') !== FALSE ? ', ' : ';';
-            $ps = [];
-            foreach ($params as $k => $v) {
-                $ps[] = $k . '=' . $v;
-            }
-            $mime_type .= join(', ', $ps);
-        }
-
-        $this->response['Content-Type'] = $mime_type;
-    }
-
-    /**
-     * (Nice) sugar for calling RouteMap::halt and therefore
-     * as \a DISRUPTIVE. Code after calling RouteMap::error will not
-     * be evaluated.
-     *
-     * @see RouteMap::halt
-     *
-     * @param integer $status  a number indicating the HTTP status
-     *                         code; probably something 4xx or 5xx-ish
-     * @param string $body     optional; the body of the HTTP response
-     *
-     */
-    public function error($status, $body = null)
-    {
-        $this->halt($status, [], $body);
-    }
-
-
-    /**
-     * Sets the HTTP response's Etag header and halts, if the incoming
-     * HTTP request was a matching conditional GET using an
-     * 'If-None-Match' header. Thus it is a possibly \a DISRUPTIVE
-     * method as it will stop evaluation in that case and send a '304
-     * Not Modified'.
-     *
-     * Detail: If the request contains an If-Match or If-None-Match
-     * header set to `*`, a RouteMap assumes a match on safe
-     * (e.g. GET) and idempotent (e.g. PUT) requests. (In those cases
-     * it thinks that the resource already exists and therefore
-     * matches a wildcard.). This can be changed by passing an
-     * appropriate value for the `$new_resource` parameter.
-
-     * Details of this can be found in RFC 2616 14.24 and 14.26
-     *
-     * @param string $value       an identifier uniquely identifying the
-     *                            current state of a resource
-     * @param bool $strong_etag   optional; indicates whether the etag
-     *                            is a weak or strong (which is the
-     *                            default) cache validator. Have a look
-     *                            at the RFC for details.
-     * @param bool $new_resource  optional; a way to tell the RouteMap
-     *                            that this is a new or existing
-     *                            resource. See above.
-     */
-
-    public function etag($value, $strong_etag = true, $new_resource = null)
-    {
-        // Before touching this code, please double check RFC 2616
-        // 14.24 and 14.26.
-
-        if (!isset($new_resource)) {
-            $new_resource = Request::isPost();
-        }
-
-        $value = '"' . $value . '"';
-        if (!$strong_etag) {
-            $value = 'W/' . $value;
-        }
-        $this->response['ETag'] = $value;
-
-        if ($this->response->isSuccess() || $this->response->status === 304) {
-            if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $this->etagMatches($_SERVER['HTTP_IF_NONE_MATCH'], $new_resource)) {
-                $this->halt($this->isRequestSafe() ? 304 : 412);
-            }
-            if (isset($_SERVER['HTTP_IF_MATCH'])
-                && !$this->etagMatches($_SERVER['HTTP_IF_MATCH'], $new_resource)) {
-                $this->halt(412);
-            }
-        }
-    }
-
-    // Helper method checking if a ETag value list includes the current ETag.
-    private function etagMatches($list, $new_resource)
-    {
-        if ($list === '*') {
-            return !$new_resource;
-        }
-
-        return in_array($this->response['ETag'],
-                        preg_split('/\s*,\s*/', $list));
-    }
-
-    // Helper method checking if the request is safe
-    private function isRequestSafe()
-    {
-        $method = Request::method();
-        return $method === 'GET' or $method === 'HEAD' or $method === 'OPTIONS' or $method === 'TRACE';
-    }
-
-    /**
-     * This sets the `Expires` header and the `Cache-Control`
-     * directive `max-age`.
-     *
-     * Amount is an integer number of seconds in the future indicating
-     * when the response should be considered "stale". The
-     * `$cache_control` parameter is passed to RouteMap#cacheControl
-     * along with the automatically generated `max_age` directive.
-     *
-     * @param int $amount  an integer specifying the number of seconds
-     *                     this resource will go stale.
-     * @param array $cache_control  optional; more directives for
-     *                     RouteMap::cacheControl which is always
-     *                     automatically called using the computed max_age
-     */
-    public function expires($amount, $cache_control = [])
-    {
-        $time = time() + $amount;
-        $max_age = $amount;
-
-        $cache_control[] = "max-age=$max_age";
-        $this->cacheControl($cache_control);
-
-        $this->response['Expires'] = $this->httpDate($time);
-    }
-
-    /**
-     * This sets the Cache-Control header of the HTTP response.
-     *
-     * Example:
-     *
-     * @code
-     * $this->cacheControl(array('public', 'must-revalidate'));
-     * @endcode
-     *
-     * @param array $values  an array containing Cache-Control
-     *                       directives.
-     */
-    public function cacheControl($values)
-    {
-        if (is_array($values) && sizeof($values)) {
-            $this->response['Cache-Control'] = join(', ', $values);
-        }
-    }
-
-    /**
-     * This very important method stops further execution of your
-     * code. You may specify a status code, headers and the body of
-     * the resulting response. As the name implies, this method is \a
-     * DISRUPTIVE and will not return.
-     *
-     * @code
-     * // stops any further code of a route
-     * $this->halt();
-     *
-     * // you may specify an HTTP status
-     * $this->halt(409):
-     *
-     * // you may specify the HTTP response's body
-     * $this->halt('my ethereal body')
-     *
-     * // or even both
-     * $this->halt(100, 'Yes, pleazze!')
-     *
-     * // giving headers
-     * $this->halt(417, array('Content-Type' => 'x-not-a-cat'), 'Cats only!')
-     * @endcode
-     *
-     * This method is called by every single \a DISRUPTIVE method.
-     *
-     * @param integer $status  optional; the response's status code
-     * @param array $headers   optional; (additional) header lines
-     *                           which get merged with already set headers
-     * @param string $body     optional; the response's body
-     */
-    public function halt(/* [status], [headers], [body] */)
-    {
-        $args   = func_get_args();
-        $result = [];
-
-        $constraints = [
-            'status'  => 'is_int',
-            'headers' => 'is_array',
-            'body'    => function ($i) { return isset($i); } // #existy
-        ];
-        foreach ($constraints as $state => $constraint) {
-            if ($constraint(current($args))) {
-                call_user_func([$this, $state], array_shift($args));
-            }
-        }
-
-        throw new RouterHalt($this->response);
-    }
-
-    /**
-     * This method sets the Last-Modified header of the HTTP response
-     * and halts on matching conditional GET requests. Thus this
-     * method is \a DISRUPTIVE in certain circumstances.
-     *
-     * You have to give an integer typed timestamp (in seconds since
-     * epoch) to specify the data of the last modification to the
-     * requested resource.
-     *
-     * If the current HTTP request contains an `If-Modified-Since`
-     * header, its value is compared to the specified `$time`
-     * parameter. Unless the header's value is sooner than the given
-     * `$time`, further execution is precluded and the RouteMap
-     * returns with a '304 Not Modified'.
-     *
-     * @param integer $time  a timestamp described in seconds since epoch
-     */
-    public function lastModified($time)
-    {
-
-        $this->response['Last-Modified'] = $this->httpDate($time);
-
-        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
-            return;
-        }
-
-        if ($this->response->status === 200
-            && isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-            // compare based on seconds since epoch
-            $since = $this->httpdate($_SERVER['HTTP_IF_MODIFIED_SINCE']);
-            if ($since >= (int) $time) {
-                $this->halt(304);
-            }
-        }
-
-        if (($this->response->isSuccess() || $this->response->status === 412)
-            && isset($_SERVER['HTTP_IF_UNMODIFIED_SINCE'])) {
-
-            // compare based on seconds since epoch
-            $since = $this->httpdate($_SERVER['HTTP_IF_UNMODIFIED_SINCE']);
-
-            if ($since < (int) $time) {
-                $this->halt(412);
-            }
-        }
-    }
-
-    private function httpDate($timestamp)
-    {
-        return gmdate('D, d M Y H:i:s \G\M\T', (int) $timestamp);
-    }
-
-    /**
-     * Halts execution and returns a '404 Not Found' response.
-     *
-     * Sugar for calling RouteMap::error(404) and therefore
-     * \a DISRUPTIVE. Code after calling RouteMap::notFound will
-     * not be evaluated.
-     *
-     * @see RouteMap::error
-     * @see RouteMap::halt
-     *
-     * @param string $body     optional; the body of the HTTP response
-     */
-    public function notFound($body = null)
-    {
-        $this->halt(404, $body);
-    }
-
-    /**
-     * Stops your code and redirects to the URL provided. This method
-     * is \a DISRUPTIVE like RouteMap#halt
-     *
-     * In addition to the URL you may provide the status code,
-     * (additional) headers and a request body as you would when
-     * calling RouteMap#halt.
-     *
-     * @code
-     * $this->redirect('/foo', 201, array('X-Some-Header' => 1234), 'and even a body');
-     * @endcode
-     *
-     * @see RouteMap::halt
-     *
-     * @param string $url the URL to redirect to; it will be filtered
-     *                    using RouteMap#url, so you may call it with
-     *                    those nice and small strings used in the
-     *                    annotations
-     * @param mixed $args optional; any combinations of the three
-     *                    parameters as in RouteMap::halt
-     */
-    public function redirect($url, $args = null)
-    {
-        $this->status($_SERVER["SERVER_PROTOCOL"] === 'HTTP/1.1' && !Request::isGet() ? 303 : 302);
-        $this->response['Location'] = $this->url($url);
-
-        $args = array_slice(func_get_args(), 1);
-        call_user_func_array([$this, 'halt'], $args);
-    }
-
-
-    /**
-     * Stops execution of your code and starts sending the specified
-     * file. This method is \a DISRUPTIVE.
-     *
-     * Using the `$opts` parameter you may specify the file's mime
-     * content type, sending an appropriate 'Content-Type' header, and
-     * you may specify the 'Content-Disposition' of the file transfer.
-     *
-     * Example:
-     *
-     * @code
-     * $this->sendFile('/tmp/c29tZSB0ZXh0', array(
-     *     'type' => 'image/png',
-     *     'disposition' => 'inline',
-     *     'filename' => 'cutecats.png'));
-     * @endcode
-     *
-     * @param string $_path  the filesystem path to the file to send
-     * @param array  $opts   optional; specify the content type,
-     *                       disposition and filename
-     */
-    public function sendFile($_path, $opts = [])
-    {
-        $path = realpath($_path);
-
-        if (!file_exists($path)) {
-            $this->notFound('File to send does not exist');
-        }
-
-        if (isset($opts['type'])) {
-            $this->contentType($opts['type']);
-        } else if (!isset($this->response['Content-Type'])) {
-            $this->contentType(get_mime_type($path));
-        }
-
-        if ($opts['disposition'] === 'attachment' || isset($opts['filename'])) {
-            $this->response['Content-Disposition'] = 'attachment; ';
-            $filename = $opts['filename'] ?: $path;
-            $this->response['Content-Disposition'] .= encode_header_parameter('filename', basename($filename));
-        }
-
-        elseif ($opts['disposition'] === 'inline') {
-            $this->response['Content-Disposition'] = 'inline';
-        }
-
-        // TODO add HTTP 'Range' support
-
-        $size = filesize($path);
-        $this->response['Content-Length'] = $size;
-
-        // End all potential output buffers
-        while (ob_get_level() > 0) {
-            ob_end_clean();
-        }
-
-        // Send file
-        $this->halt(200, $this->response->headers, function () use ($path) {
-            readfile($path);
-        });
-    }
-
-
-    /**
-     * Generate a URL to a given handler using a URL fragment and URL
-     * parameters.
-     *
-     * Example:
-     * @code
-     * // result in something like "/some/path/api.php/course/123/members?status=student"
-     * $this->url('course/123/members', array('status' => 'student'));
-     * @endcode
-     *
-     * @param string $addr       a URL fragment to a handler
-     * @param array $url_params  optional; URL parameters to add to
-     *                           the generated URL
-     *
-     * @return string  the resulting URL
-     */
-    public function url($addr, $url_params = null)
-    {
-        $addr = ltrim($addr, '/');
-        return \URLHelper::getURL("api.php/$addr", $url_params, true);
-    }
-
-    /**
-     * A `vsprintf` like variant to the RouteMap::url method.
-     *
-     * Example:
-     * @code
-     * // results in "[...]/api.php/foo/some_id?status=student"
-     * $this->urlf("foo/%s", array("some_id"), array('status' => 'student'));
-     * @endcode
-     *
-     * @param string $addr_f        a URL fragment to a handler
-     *                              containing sprintf-ish format sequences
-     * @param array $format_params  values to fill into the format markers
-     * @param array $url_params     optional; URL parameters to add to
-     *                              the generated URL
-     *
-     * @return string  the resulting URL
-     */
-
-    public function urlf($addr_f, $format_params, $url_params = null)
-    {
-        if (!is_array($format_params)) {
-            $format_params = [$format_params];
-        }
-        return $this->url(vsprintf($addr_f, $format_params), $url_params);
-    }
-
-    /**
-     * Returns a list of all the routes this routemap provides.
-     *
-     * @param string $http_method Return only the routes for this specific
-     *                            http method (optional)
-     *
-     * @return array of all routes grouped by method
-     */
-    public function getRoutes($http_method = null)
-    {
-        $ref      = new \ReflectionClass($this);
-
-        if ($ref->getDocComment()) {
-            $docblock = new Docblock($ref);
-            $class_conditions = $this->extractConditions($docblock);
-        } else {
-            $class_conditions = [];
-        }
-
-
-        // Create result array by creating an associative array from all
-        // supported methods as keys
-        $routes = array_fill_keys(Router::getSupportedMethods(), []);
-
-        // Restrict routes to given http method (if given)
-        if ($http_method !== null) {
-            $routes = [$http_method => []];
-        }
-
-        // Iterate through all methods of the routemap
-        foreach ($ref->getMethods( \ReflectionMethod::IS_PUBLIC) as $ref_method) {
-            // No docblock? Not an api route!
-            if (!$ref_method->getDocComment()) {
-                continue;
-            }
-
-            // Parse docblock
-            $docblock = new Docblock($ref_method);
-
-            // No docblock tags? Not an api route!
-            if ($docblock->getTags()->isEmpty()) {
-                continue;
-            }
-
-            // Any specific condition to consider?
-            $conditions = $this->extractConditions($docblock, $class_conditions);
-
-            // Iterate through all possible methods in order to identify
-            // any according docblock tags
-            $allow_nobody = $docblock->hasTag('allow_nobody');
-            foreach (array_keys($routes) as $http_method) {
-                if (!$docblock->hasTag($http_method)) {
-                    //The tag for the current HTTP method cannot be found
-                    //in the route's DocBlock tags.
-                    continue;
-                }
-
-                // Route all defined method and uri template combinations to
-                // the according methods of the object.
-                foreach ($docblock->getTags($http_method) as $tag) {
-                    $uri_template = trim($tag->getDescription());
-                    $routes[$http_method][$uri_template] = [
-                        'handler'      => [$this, $ref_method->name],
-                        'conditions'   => $conditions,
-                        'description'  => trim($docblock->getShortDescription()) ?: false,
-                        'allow_nobody' => $allow_nobody
-                    ];
-                }
-            }
-        }
-
-        // Return all routes grouped or just the routes for the wanted method
-        return func_num_args() === 1
-             ? reset($routes)
-             : $routes;
-    }
-
-    /**
-     * Extracts defined conditions from a given docblock.
-     *
-     * @param Docblock $docblock   DocBlock to examine
-     * @param array    $conditions Optional array of already defined
-     *                             conditions to extend
-     * @return array of all extracted conditions with the variable name
-     *         as key and pattern to match as value
-     */
-    protected function extractConditions($docblock, $conditions = [])
-    {
-        foreach ($docblock->getTags('condition') as $condition) {
-            [$var, $pattern] = explode(' ', $condition->getDescription(), 2);
-            $conditions[$var] = $pattern;
-        }
-
-        return $conditions;
-    }
-
-    /**
-     * Returns the response object
-     * @return Response
-     */
-    public function getResponse(): Response
-    {
-        return $this->response;
-    }
-}
diff --git a/lib/classes/restapi/Router.php b/lib/classes/restapi/Router.php
deleted file mode 100644
index df7a6b9..0000000
--- a/lib/classes/restapi/Router.php
+++ /dev/null
@@ -1,665 +0,0 @@
-<?php
-/** @namespace RESTAPI
- *
- * Im Namensraum RESTAPI sind alle Klassen und Funktionen versammelt,
- * die für die RESTful Web Services von Stud.IP benötigt werden.
- */
-namespace RESTAPI;
-use RESTAPI\Renderer\DefaultRenderer;
-
-/**
- * Die Aufgabe des Routers ist das Anlegen und Auswerten eines
- * Mappings von sogenannten Routen (Tupel aus HTTP-Methode und Pfad)
- * auf Code.
- *
- * Dazu werden zunächst Routen mittels der Funktion
- * Router::registerRoutes registriert.
- *
- * Wenn dann ein HTTP-Request eingeht, kann mithilfe von
- * Router::dispatch und HTTP-Methode bzw. Pfad der zugehörige Code
- * gefunden und ausgeführt werden. Der Router bildet aus dem
- * Rückgabewert des Codes ein Response-Objekt, das er als Ergebnis
- * zurück meldet.
- *
- * @code
- * $router = Router::getInstance();
- *
- * // register a sample Route
- * $router->registerRoutes(new ExampleRoute);
- *
- * // dispatch to therein defined Routes
- * $response = $router->dispatch('/example', 'GET');
- *
- * // render response
- * $response->output();
- *
- * @endcode
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @see        Inspired by http://blog.sosedoff.com/2009/07/04/simpe-php-url-routing-controller/
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Router
-{
-    // instances are cached here
-    protected static $instances = [];
-
-    /**
-     * Holds the user object of the user that is accessing the API.
-     * This is null for nobody users.
-     */
-    protected $user = null;
-
-    /**
-     * Returns (and if neccessary, initializes) a (cached) router object for an
-     * optional consumer id.
-     *
-     * @param mixed $consumer_id ID of the consumer (defaults to 'global')
-     *
-     * @return Router returns the Router instance associated to the
-     *                consumer ID (or to the 'global' ID)
-     */
-    public static function getInstance($consumer_id = null)
-    {
-        $consumer_id = $consumer_id ?: 'global';
-
-        if (!isset(self::$instances[$consumer_id])) {
-            self::$instances[$consumer_id] = new self($consumer_id);
-        }
-        return self::$instances[$consumer_id];
-    }
-
-    // All supported method need to be defined here
-    protected static $supported_methods = [
-        'get', 'post', 'put', 'delete', 'patch', 'options', 'head'
-    ];
-
-    /**
-     * Returns a list of all supported methods.
-     *
-     * @return array of methods as strings
-     */
-    public static function getSupportedMethods()
-    {
-        return self::$supported_methods;
-    }
-
-    // registered routes by method and uri template
-    protected $routes = [];
-
-    // registered content renderers
-    protected $renderers = [];
-
-    // identified or forced content renderer
-    protected $content_renderer = false;
-
-    // default renderer
-    protected $default_renderer = false;
-
-    // registered conditions
-    protected $conditions = [];
-
-    // registered descriptions
-    protected $descriptions = [];
-
-    // registered consumers
-    protected $consumers = [];
-
-    // associated permissions
-    protected $permissions = false;
-
-    /**
-     * Constructs the router.
-     *
-     * @param mixed $consumer_id  the ID of the consumer this router
-     *                             should associate to
-     */
-    protected function __construct($consumer_id)
-    {
-        $this->permissions = ConsumerPermissions::get($consumer_id);
-        $this->registerRenderer(new Renderer\DefaultRenderer);
-    }
-
-    /**
-     * Registers a handler for a specific combination of request method
-     * and uri template.
-     *
-     * @param String  $request_method   expected HTTP request method
-     * @param String  $uri_template     expected URI template, for
-     *                                  example: \code "/user/:user_id/events" \endcode
-     * @param Array   $handler          request handler array:
-     *                                  \code array($object, "methodName") \endcode
-     * @param Array   $conditions       (optional) an associative
-     *                                  array using the name of
-     *                                  parameters as keys and regexps
-     *                                  as value
-     * @param string  $source           (optional) this denotes the
-     *                                  origin of a route. Usually
-     *                                  either 'core' or 'plugin', but
-     *                                  defaults to 'unknown'.
-     * @param bool    $allow_nobody     Whether the route can be accessed
-     *                                  as nobody user (true) or not (false).
-     *                                  Defaults to false.
-     *
-     * @return Router  returns itself to allow chaining
-     * @throws \Exception  if passed HTTP request method is not supported
-     */
-    public function register($request_method, $uri_template, $handler, $conditions = [], $source = 'unknown', $allow_nobody = false)
-    {
-        // Normalize method and test whether it's supported
-        $request_method = mb_strtolower($request_method);
-        if (!in_array($request_method, self::$supported_methods)) {
-            throw new \Exception('Method "' . $request_method . '" is not supported.');
-        }
-
-        // Initialize routes storage for this method if neccessary
-        if (!isset($this->routes[$request_method])) {
-            $this->routes[$request_method] = [];
-        }
-
-        // Normalize uri template (always starts with a slash)
-        if ($uri_template[0] !== '/') {
-            $uri_template = '/' . $uri_template;
-        }
-
-        // Sanitize conditions
-        foreach ($conditions as $var => $pattern) {
-            if ($pattern[0] !== $pattern[mb_strlen($pattern) - 1] || ctype_alnum($pattern[0])) {
-                $conditions[$var] = '/' . $pattern . '/';
-            }
-        }
-
-        $this->routes[$request_method][$uri_template] = compact(
-            'handler', 'conditions', 'source', 'allow_nobody'
-        );
-
-        // Return instance to allow chaining
-        return $this;
-    }
-
-    /**
-     * Registers the routes defined in a RouteMap instance using
-     * docblock annotations (like @get) of its methods.
-     *
-     * \code
-     * $router = \RESTAPI\Router::getInstance();
-     *
-     * $router->registerRoutes(new ExampleRouteMap());
-     * \endcode
-     *
-     * @param RouteMap $map  the RouteMap instance to register
-     *
-     * @return Router returns itself to allow chaining
-     */
-    public function registerRoutes(RouteMap $map)
-    {
-        // Investigate object, define whether it's located in the core system
-        // or a plugin, respect any defined class conditions and iterate
-        // through it's methods to find any defined route
-        $ref      = new \ReflectionClass($map);
-        $filename = $ref->getFilename();
-        $source   = mb_strpos($filename, 'plugins_packages') !== false
-                  ? 'plugin'
-                  : 'core';
-
-        foreach (self::$supported_methods as $http_method) {
-            foreach ($map->getRoutes($http_method) as $uri_template => $data) {
-                // Register (and describe) route
-                $this->register(
-                    $http_method, $uri_template,
-                    $data['handler'], $data['conditions'],
-                    $source,
-                    $data['allow_nobody']
-                );
-                if ($data['description']) {
-                    $this->describe(
-                        $uri_template,
-                        $data['description'],
-                        $http_method
-                    );
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Describe one or more routes.
-     *
-     * \code
-     * $router = \RESTAPI\Router::getInstance();
-     *
-     * // describe a single route
-     * $router->describe('/foo', 'returns everything about foo', 'get');
-     *
-     * // describe several routes that use the same path
-     * $router->describe('/foo', array(
-     *     'get'    => 'returns everything about foo',
-     *     'put'    => 'updates all of foo',
-     *     'delete' => 'empty up foo'
-     * ));
-     *
-     * // describe several routes
-     * $router->describe(array(
-     *     '/foo' => array(
-     *                   'get'    => 'returns everything about foo',
-     *                   'put'    => 'updates all of foo',
-     *                   'delete' => 'empty up foo'),
-     *     '/bar' => array(...),
-     * ));
-     * \endcode
-     *
-     * @param String|Array $uri_template  URI template to describe or pass an
-     *                                    array to describe multiple routes.
-     * @param String|null  $description   description of the route
-     * @param String       $method        method to describe.
-     *
-     * @return Router  returns instance of itself to allow chaining
-     */
-    public function describe($uri_template, $description = null, $method = 'get')
-    {
-        // describe multiple routes at once
-        if (func_num_args() === 1 && is_array($uri_template)) {
-            foreach ($uri_template as $template => $description) {
-                $this->describe($template, $description);
-            }
-        }
-
-        // describe routes that use the same URI template
-        elseif (func_num_args() === 2 && is_array($description)) {
-            foreach ($description as $method => $desc) {
-                $this->describe($uri_template, $desc, $method);
-            }
-        }
-
-        // describe a single route
-        else {
-            if (!isset($this->descriptions[$uri_template])) {
-                $this->descriptions[$uri_template] = [];
-            }
-            if (isset($this->routes[$method][$uri_template])) {
-                $this->descriptions[$uri_template][$method] = $description;
-            } else {
-                // Try to find route with different method
-                foreach ($this->routes as $m => $templates) {
-                    if (isset($templates[$uri_template])) {
-                        $this->descriptions[$uri_template][$m] = $description;
-                        break;
-                    }
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get list of registered routes - optionally with their descriptions.
-     *
-     * @param bool $describe      (optional) include descriptions,
-     *                              defaults to `false`
-     * @param bool $check_access  (optional) only show methods this router's
-     *                              consumer is authorized to,
-     *                              defaults to `true`
-     *
-     * @return array list of registered routes
-     */
-    public function getRoutes($describe = false, $check_access = true)
-    {
-        $this->setupRoutes();
-
-        $result = [];
-        foreach ($this->routes as $method => $routes) {
-            foreach ($routes as $uri => $route) {
-                if ($check_access && !$this->permissions->check($uri, $method)) {
-                    continue;
-                }
-                if (!isset($result[$uri])) {
-                    $result[$uri] = [];
-                }
-                if ($describe) {
-                    $result[$uri][$method] = [
-                        'description' => $this->descriptions[$uri][$method] ?? null,
-                        'source'      => $route['source'] ?? 'unknown',
-                    ];
-                } else {
-                    $result[$uri][] = $method;
-                }
-            }
-        }
-        ksort($result);
-        if ($describe) {
-            $result = array_map(function ($item) {
-                ksort($item);
-                return $item;
-            }, $result);
-        }
-        return $result;
-    }
-
-    /**
-     * Dispatches an URI across the defined routes and produces a
-     * Response object which may then be send back (using #output).
-     *
-     * @param mixed  $uri     URI to dispatch (defaults to `$_SERVER['PATH_INFO']`)
-     * @param String $method  Request method (defaults to the method
-     *                        of the actual HTTP request or "GET")
-     *
-     * @return Response  a Response object containing status, headers
-     *                   and body
-     * @throws RouterException  may throw such an exception if there
-     *                          is no matching route (404) or if there
-     *                          is one, but the consumer is not
-     *                          authorized to it (403)
-     */
-    public function dispatch($uri = null, $method = null)
-    {
-        $this->setupRoutes();
-
-        $uri = $this->normalizeDispatchURI($uri);
-        $method = $this->normalizeRequestMethod($method);
-
-        $content_renderer = $this->negotiateContent($uri);
-
-        $match_result = $this->matchRoute($uri, $method, $content_renderer);
-        $route = $match_result[0];
-        $parameters = $match_result[1];
-        $allow_nobody = $match_result[2] ?? false;
-        if (!$route) {
-            //No route found for the combination of URI and method.
-            //We return the allowed methods for the route in the HTTP header:
-            $methods = $this->getMethodsForUri($uri);
-            if (count($methods) > 0) {
-                header('Allow: ' . implode(', ', $methods));
-                throw new RouterException(405);
-            } else {
-                //Route not found.
-                throw new RouterException(404);
-            }
-        }
-        //At this point, a route is found.
-        //We need to check if it can be used as nobody user or not.
-        if (!$route['allow_nobody'] && !$this->user) {
-            //Nobody users aren't allowed for this route.
-            throw new RouterException(401, 'Unauthorized (no consumer)');
-        }
-
-        try {
-            $response = $this->execute($route, $parameters);
-        } catch (RouterHalt $halt) {
-            $response = $halt->response;
-        }
-
-        $response->finish($content_renderer);
-
-        return $response;
-    }
-
-    /**
-     * Searches and registers available routes.
-     */
-    private function setupRoutes()
-    {
-        // A bit ugly, I confess
-        static $was_setup = false;
-        if ($was_setup) {
-            return;
-        }
-        $was_setup = true;
-
-        // Register default routes
-        $routes = [
-            'Activity',
-            'Blubber',
-            'Clipboard',
-            'Contacts',
-            'Course',
-            'Discovery',
-            'Events',
-			'Feedback',
-            'FileSystem',
-            'Forum',
-            'Messages',
-            'News',
-            'ResourceBooking',
-            'Resources',
-            'ResourceCategories',
-            'ResourcePermissions',
-            'ResourceProperties',
-            'ResourceRequest',
-            'RoomClipboard',
-            'Schedule',
-            'Semester',
-            'Studip',
-            'User',
-            'UserConfig',
-            'Wiki'
-        ];
-
-        foreach ($routes as $route) {
-            require_once "app/routes/$route.php";
-            $class = "\\RESTAPI\\Routes\\$route";
-            $this->registerRoutes(new $class);
-        }
-
-        // Register plugin routes
-        $router = $this;
-        $routes = array_flatten(\PluginEngine::sendMessage('RESTAPIPlugin', 'getRouteMaps'));
-        array_walk(
-            $routes,
-            function ($route) use ($router) {
-                $router->registerRoutes($route);
-            }
-        );
-    }
-
-    /**
-     * Takes a route and the parameters out of the requested path and
-     * executes the handler of the route.
-     *
-     * @param array $route      the matched route out of
-     *                          Router::matchRoute; an array with keys
-     *                          'handler', 'conditions' and 'source'
-     * @param array $parameters the matched parameters out of
-     *                          Router::matchRoute; something like:
-     *                          `array('user_id' => '23a21d...e78f')`
-     * @return Response  the resulting Response object which is then
-     *                   polished in Router::dispatch
-     */
-    protected function execute($route, $parameters)
-    {
-        $handler = $route['handler'];
-
-        if (!is_object($handler[0])) {
-            throw new \RuntimeException("Handler is not a method.");
-        }
-
-        $handler[0]->init($this, $route);
-
-        if (method_exists($handler[0], 'before')) {
-            $handler[0]->before($this, $handler, $parameters);
-        }
-
-        $result = call_user_func_array($handler, $parameters);
-
-        if (is_object($result) && method_exists($result, 'toArray')) {
-            $result = $result->toArray();
-        }
-
-        // $result is stronger than $response->body
-        if (isset($result)) {
-            $handler[0]->body($result);
-        }
-
-        if (method_exists($handler[0], 'after')) {
-            $handler[0]->after($this, $parameters);
-        }
-
-        return $handler[0]->getResponse();
-    }
-
-    /**
-     * Registers a content renderer.
-     *
-     * @param DefaultRenderer $renderer    instance of a content renderer
-     * @param boolean         $is_default  (optional) set this
-     *                                     renderer as default?;
-     *                                     defaults to `false`
-     *
-     * @return Router returns itself to allow chaining
-     */
-    public function registerRenderer($renderer, $is_default = false)
-    {
-        $this->renderers[$renderer->extension()] = $renderer;
-        if ($is_default) {
-            $this->default_renderer = $renderer;
-        }
-
-        return $this;
-    }
-
-    private function normalizeDispatchURI($uri)
-    {
-        return $uri ?? \Request::pathInfo();
-    }
-
-    private function normalizeRequestMethod($method)
-    {
-        return mb_strtolower($method ?: \Request::method() ?: 'get');
-    }
-
-    /**
-     * Negotiate content using the registered content renderers. The
-     * first ContentRenderer that returns `true` when calling
-     * ContentRenderer::shouldRespondTo gets the job.
-     *
-     * @param String $uri  the URI to which the content renderers may respond
-     *
-     * @return ContentRenderer  either a ContentRenderer that responds
-     *                          to the URI or the default
-     *                          ContentRenderer of this router.
-     */
-    protected function negotiateContent($uri)
-    {
-        $content_renderer = null;
-        foreach ($this->renderers as $renderer) {
-            if ($renderer->shouldRespondTo($uri)) {
-                $content_renderer = $renderer;
-                break;
-            }
-        }
-        if (!$content_renderer) {
-            $content_renderer = $this->default_renderer ?: reset($this->renderers);
-        }
-        return $content_renderer;
-    }
-
-    /**
-     * Tries to match a route given a URI and a HTTP request method.
-     *
-     * @param String $uri     the URI to match
-     * @param String $method  the HTTP request method to match
-     * @param DefaultRenderer $content_renderer the used
-     *                                          ContentRenderer which
-     *                                          is needed to remove
-     *                                          a file extension
-     *
-     * @return array  an array containing the matched route and the
-     *                found parameters
-     */
-    protected function matchRoute($uri, $method, $content_renderer)
-    {
-        $matched    = null;
-        $parameters = [];
-        if (isset($this->routes[$method])) {
-            if ($content_renderer->extension() && mb_strpos($uri, $content_renderer->extension()) !== false) {
-                $uri = mb_substr($uri, 0, -mb_strlen($content_renderer->extension()));
-            }
-
-            foreach ($this->routes[$method] as $uri_template => $route) {
-                if (!isset($route['uri_template'])) {
-                    $route['uri_template'] = new UriTemplate($uri_template, $route['conditions']);
-                }
-
-                $prmtrs = null; // Will be filled by a successful match()
-                if ($route['uri_template']->match($uri, $prmtrs)) {
-                    if (!$this->permissions->check($uri_template, $method)) {
-                        throw new RouterException(403, "Route not activated");
-                    }
-                    $matched = $route;
-                    $parameters = $prmtrs;
-                    break;
-                }
-            }
-        }
-        return [$matched, $parameters];
-    }
-
-    /**
-     * Returns all methods the given uri responds to.
-     *
-     * @param String $uri the URI to match
-     *
-     * @return array of all of responding methods
-     */
-    protected function getMethodsForUri($uri)
-    {
-        $methods = [];
-
-        foreach ($this->routes as $method => $templates) {
-            foreach ($templates as $uri_template => $route) {
-                if (!isset($route['uri_template'])) {
-                    $route['uri_template'] = new UriTemplate($uri_template, $route['conditions']);
-                }
-
-                if ($route['uri_template']->match($uri)
-                    && $this->permissions->check($uri_template, $method))
-                {
-                    $methods[] = $method;
-                }
-            }
-        }
-
-        return array_map('strtoupper', $methods);
-    }
-
-
-    /**
-     * Sets up the authentication for the router.
-     */
-    public function setupAuth()
-    {
-        // Detect consumer
-        $consumer = Consumer\Base::detectConsumer();
-        if (!$consumer) {
-            return null;
-        }
-
-        $this->user = $consumer->getUser();
-
-        // Set authentication if present
-        if ($this->user) {
-            // Skip fake authentication if user is already logged in
-            if ($GLOBALS['user']->id !== $this->user->id) {
-
-                $GLOBALS['auth'] = new \Seminar_Auth();
-                $GLOBALS['auth']->auth = [
-                    'uid'   => $this->user->user_id,
-                    'uname' => $this->user->username,
-                    'perm'  => $this->user->perms,
-                ];
-
-                $GLOBALS['user'] = new \Seminar_User($this->user);
-
-                $GLOBALS['perm'] = new \Seminar_Perm();
-                $GLOBALS['MAIL_VALIDATE_BOX'] = false;
-            }
-            setTempLanguage($GLOBALS['user']->id);
-        }
-
-        return $this->user;
-    }
-}
diff --git a/lib/classes/restapi/RouterException.php b/lib/classes/restapi/RouterException.php
deleted file mode 100644
index 1ce2afc..0000000
--- a/lib/classes/restapi/RouterException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-namespace RESTAPI;
-use \Exception;
-
-/**
- * Router exception.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class RouterException extends Exception
-{
-    protected static $error_messages = [
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        500 => 'Internal Server Error',
-        501 => 'Not implemented',
-    ];
-
-    public function __construct($code = 500, $message = '', $previous = null)
-    {
-        $message = $message ?: self::$error_messages[$code] ?: '';
-        parent::__construct($message, $code, $previous);
-    }
-}
diff --git a/lib/classes/restapi/RouterHalt.php b/lib/classes/restapi/RouterHalt.php
deleted file mode 100644
index 55a2ca1..0000000
--- a/lib/classes/restapi/RouterHalt.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace RESTAPI;
-
-/**
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class RouterHalt extends \Exception
-{
-    public $response;
-
-    public function __construct($response)
-    {
-        parent::__construct();
-        $this->response = $response;
-    }
-}
diff --git a/lib/classes/restapi/UriTemplate.php b/lib/classes/restapi/UriTemplate.php
deleted file mode 100644
index 67161de..0000000
--- a/lib/classes/restapi/UriTemplate.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-namespace RESTAPI;
-
-/**
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class UriTemplate
-{
-    public $uri_template;
-    public $conditions;
-
-    public function __construct($uri_template, $conditions = [])
-    {
-        $this->uri_template = $uri_template;
-        $this->conditions = $conditions;
-    }
-
-    /**
-     * Tests whether an uri matches a template.
-     *
-     * The template may contain placeholders by prefixing an appropriate,
-     * unique placeholder name with a colon (:).
-     *
-     * <code>$template = '/hello/:name';</code>
-     *
-     * If the uri matches the template, all evaluated placeholders will
-     * be stored in the parameters array.
-     *
-     * @param String $uri        The uri to test
-     * @param array  $parameters Stores evaluated parameters on match (optional)
-     *
-     * @return bool Returns true if the uri matches the template
-     */
-    public function match($uri, &$parameters = null)
-    {
-        // Initialize parameters array
-        $parameters = [];
-
-        // Split and normalize uri and template
-        $given = array_filter(explode('/', $uri), 'mb_strlen');
-        $rules = array_filter(explode('/', $this->uri_template));
-
-        // Leave if uri and template do not contain the same number of
-        // elements
-        if (count($given) !== count($rules)) {
-            return false;
-        }
-
-        // Combine uri and template element-wise (simplifies iteration)
-        $combined = array_combine($rules, $given);
-
-        // Iterate over uri and template and compare element by element
-        foreach ($combined as $rule => $actual) {
-            if ($rule[0] === ':') {
-                // Rule is a placeholder
-                $parameter_name = mb_substr($rule, 1);
-
-                if (isset($this->conditions[$parameter_name])
-                    && !preg_match($this->conditions[$parameter_name], $actual)) {
-                    return false;
-                }
-
-                $parameters[$parameter_name] = $actual;
-
-            } elseif ($actual !== $rule) {
-                // Elements do not match
-                $parameters = [];
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    public function inject($params)
-    {
-        // Initialize parameters array
-        $parameters = [];
-
-        // Split and normalize template
-        $rules = array_filter(explode('/', $this->uri_template));
-
-        foreach ($rules as &$rule) {
-
-            // Rule is a placeholder
-            if ($rule[0] === ':') {
-                $parameter_name = mb_substr($rule, 1);
-
-                if (!isset($params[$parameter_name])) {
-                    $reason = sprintf('UriTemplate parameter :%s missing.',
-                                      htmlReady($parameter_name));
-                    throw new \RuntimeException($reason);
-                }
-
-                $actual = $params[$parameter_name];
-
-                if (isset($this->conditions[$parameter_name])
-                    && !preg_match($this->conditions[$parameter_name], $actual)) {
-                    $reason = sprintf('UriTemplate parameter :%s did not satisfy its condition.',
-                                      htmlReady($parameter_name));
-                    throw new \RuntimeException($reason);
-                }
-
-                $rule = htmlReady($actual);
-            }
-        }
-
-        return join('/', $rules);
-    }
-}
diff --git a/lib/classes/restapi/UserPermissions.php b/lib/classes/restapi/UserPermissions.php
deleted file mode 100644
index dcf1601..0000000
--- a/lib/classes/restapi/UserPermissions.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-namespace RESTAPI;
-use DBManager, PDO;
-
-/**
- * REST API routing permissions
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL 2 or later
- * @since      Stud.IP 2.6
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class UserPermissions
-{
-    /**
-     * Create a permission object (for a certain user).
-     * Permissions object will be cached for each user.
-     *
-     * @param mixed $user_id Id of user (optional, defaults to global)
-     * @return UserPermissions Returns permissions object
-     */
-    public static function get($user_id = null)
-    {
-        $user_id = $user_id ?: $GLOBALS['user']->id;
-
-        static $cache = [];
-        if (!isset($cache[$user_id])) {
-            $cache[$user_id] = new self($user_id);
-        }
-
-        return $cache[$user_id];
-    }
-
-    private $user_id;
-    private $permissions = [];
-
-    /**
-     * Creates the actual permission object (for a certain user).
-     *
-     * @param mixed $user_id Id of user (optional, defaults to global)
-     */
-    private function __construct($user_id = null)
-    {
-        $this->user_id = $user_id;
-
-        // Init with global permissions
-        $this->loadPermissions();
-    }
-
-    /**
-     * Defines whether access is allowed for the current user to the
-     * passed route via the passed method.
-     *
-     * @param String $user_id Id of the user
-     * @param mixed  $granted  Granted state (PHP'ish boolean)
-     * @return UserPermissions Returns instance of self to allow chaining
-     */
-    public function set($user_id, $granted = true)
-    {
-        $this->permissions[$user_id] = (bool)$granted;
-
-        return $this;
-    }
-
-    /**
-     * Loads permissions for passed user.
-     *
-     * @return UserPermissions Returns instance of self to allow chaining
-     */
-    protected function loadPermissions()
-    {
-        $query = "SELECT consumer_id, granted
-                  FROM api_user_permissions
-                  WHERE user_id = :user_id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $this->user_id);
-        $statement->execute();
-        $permissions = $statement->fetchAll(PDO::FETCH_ASSOC);
-
-        // Init with global permissions
-        foreach ($permissions as $permission) {
-            extract($permission);
-
-            $this->set($permission['consumer_id'], $permission['granted']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Checks if access to consumer is allowed for the current user.
-     *
-     * @param String $consumer_id  Id of the consumer
-     * @return bool Indicates whether access is allowed
-     */
-    public function check($consumer_id)
-    {
-        return isset($this->permissions[$consumer_id])
-            && $this->permissions[$consumer_id];
-    }
-
-    /**
-     * Stores the set permissions.
-     *
-     * @return bool Returns true if permissions were stored successfully
-     */
-    public function store()
-    {
-        $result = true;
-
-        $query = "INSERT INTO api_user_permissions (user_id, consumer_id, granted, mkdate, chdate)
-                  VALUES (:user_id, :consumer_id, :granted, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())
-                  ON DUPLICATE KEY UPDATE granted = VALUES(granted),
-                                          chdate = UNIX_TIMESTAMP()";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':user_id', $this->user_id);
-
-        foreach ($this->permissions as $consumer_id => $granted) {
-            $statement->bindValue(':consumer_id', $consumer_id);
-            $statement->bindValue(':granted', (int) !empty($granted));
-
-            $result = $result && $statement->execute();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get a list of all consumer the user has granted acces to.
-     *
-     * @return array List of consumer objects
-     */
-    public function getConsumers()
-    {
-        $result = [];
-        foreach ($this->permissions as $consumer_id => $granted) {
-            if (!$granted) {
-                continue;
-            }
-            $result[$consumer_id] = Consumer\Base::find($consumer_id);
-        }
-        return $result;
-    }
-}
diff --git a/lib/classes/restapi/consumer/Base.php b/lib/classes/restapi/consumer/Base.php
deleted file mode 100644
index 50f3150..0000000
--- a/lib/classes/restapi/consumer/Base.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-namespace RESTAPI\Consumer;
-
-use AuthUserMd5;
-use DBManager;
-use DBManagerException;
-use PDO;
-
-/**
- * Base consumer class for the rest api
- *
- * Consumers provide means for authenticating a user and the access
- * permissions for routes are bound to specific consumers.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-abstract class Base extends \SimpleORMap
-{
-    /**
-     * Each consumer type has to implement a detect feature which
-     * should extract crucial information from the request and return
-     * an instance of itself if the consumer detects a valid signature
-     * it can respond to.
-     *
-     * @param mixed $request_type Type of request (optional; defaults to any)
-     * @return mixed Detected consumer object or false
-     */
-    abstract public static function detect($request_type = null);
-
-    /* Concrete */
-
-    /**
-     * Configures the model.
-     *
-     * @param array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'api_consumers';
-
-        parent::configure($config);
-    }
-
-    /**
-     * Stores all known consumer types
-     */
-    protected static $known_types = [];
-
-    /**
-     * Add a consumer type to the list of consumer types
-     *
-     * @param String $type  Name of the type
-     * @param String $class Associated consumer class
-     */
-    public static function addType($type, $class)
-    {
-        self::$known_types[$type] = $class;
-    }
-
-    /**
-     * Removes a consumer type from the list of consumer types
-     *
-     * @param String $type Name of the type
-     */
-    public static function removeType($type)
-    {
-        unset(self::$known_types[$type]);
-    }
-
-    /**
-     * Overloaded find method. Will return a concrete specialized consumer
-     * object of the associated type.
-     *
-     * @param String $id Id of the consumer
-     * @return \RESTAPI\Consumer\Base Associated consumer object (derived
-     *                               from consumer base type)
-     * @throws \Exception if either consumer id or consumer type is invalid
-     */
-    public static function find($id)
-    {
-        $query = "SELECT consumer_type
-                  FROM api_consumers
-                  WHERE consumer_id = :id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':id', $id);
-        $statement->execute();
-        $type = $statement->fetchColumn();
-
-        if (!isset(self::$known_types[$type])) {
-            throw new \Exception('Consumer #' . $id . ' is of unknown type "' . $type . '"');
-        }
-
-        return new self::$known_types[$type]($id);
-    }
-
-    /**
-     * Returns a list of all known consumers.
-     *
-     * @return array List of all known consumers (as specialized consumer
-     *               objects)
-     */
-    public static function findAll()
-    {
-        $query = "SELECT consumer_id FROM api_consumers";
-        $statement = DBManager::get()->query($query);
-        $ids = $statement->fetchAll(PDO::FETCH_COLUMN);
-
-        return array_map([self::class, 'find'], $ids);
-    }
-
-    /**
-     * Creates a new consumer of the given type.
-     *
-     * @param String $type Name of the type
-     * @return \RESTAPI\Consumer\Base Consumer object of the given (derived
-     *                               from consumer base type)
-     * @throws \Exception if type is invalid
-     */
-    public static function create($type)
-    {
-        if (!isset(self::$known_types[$type])) {
-            throw new \Exception('Consumer is of unknown type "' . $type . '"');
-        }
-
-        return new self::$known_types[$type];
-    }
-
-    /**
-     * This method is used to detect a consumer (of a specific type) by
-     * executing the detect method on all known consumer types.
-     *
-     * @param mixed $type Name of the type (optional; defaults to all types)
-     * @param mixed $request_type Type of request (optional; defaults to any)
-     * @return mixed Either the detected consumer or false if no consumer
-     *               was detected
-     * @throws \Exception if type is invalid
-     */
-    public static function detectConsumer($type = null, $request_type = null)
-    {
-        $needles = $type === null
-                 ? array_keys(self::$known_types)
-                 : [$type];
-        foreach ($needles as $needle) {
-            if (!isset(self::$known_types)) {
-                throw new \Exception('Trying to detect consumer of unkown type "' . $needle . '"');
-            }
-            $consumer_class = self::$known_types[$needle];
-            if ($consumer = $consumer_class::detect($request_type)) {
-                return $consumer;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Contains user information
-     */
-    protected $user = null;
-
-    /**
-     * Extended SimpleORMap constructor. A certain user can be injected upon
-     * creation.
-     *
-     * @param mixed $id Id of the consumer or null to create a new one
-     * @param mixed $user Either a user object or id to inject to the consumer
-     *                    or null if no user should be injected
-     */
-    public function __construct($id = null, $user = null)
-    {
-        parent::__construct($id);
-
-        if ($user !== null) {
-            $this->setUser($user);
-        }
-    }
-
-    /**
-     * Retrieve the api permissions associated with this consumer.
-     *
-     * @return \RESTAPI\ConsumerPermissions Permission object for this consumer
-     */
-    public function getPermissions()
-    {
-        return \RESTAPI\ConsumerPermissions::get($this->id);
-    }
-
-    /**
-     * Inject a user to this consumer. Injecting in this context refers to
-     * "having a user authenticated by this consumer".
-     *
-     * @param mixed $user Either a user object or a user id
-     * @return \RESTAPI\Consumer\Base Returns instance of self to allow
-     *                               chaining
-     */
-    public function setUser($user)
-    {
-        if (!is_object($user)) {
-            $user = \User::findFull($user);
-        }
-        $this->user = $user;
-        return $this;
-    }
-
-    /**
-     * Returns whether the consumer has an injected user or not.
-     *
-     * @return bool True if a valid user is found, false otherwise
-     */
-    public function hasUser()
-    {
-        return $this->user !== null && $this->user->id && $this->user->id !== 'nobody';
-    }
-
-    /**
-     * Return the injected user.
-     *
-     * @param mixed User object or false if no user was injected
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-}
diff --git a/lib/classes/restapi/consumer/HTTP.php b/lib/classes/restapi/consumer/HTTP.php
deleted file mode 100644
index 97b0657..0000000
--- a/lib/classes/restapi/consumer/HTTP.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-namespace RESTAPI\Consumer;
-use StudipAuthAbstract, RESTAPI\RouterException;
-
-/**
- * Basic HTTP Authentication consumer for the rest api
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class HTTP extends Base
-{
-    /**
-     * Detects if a user is authenticated via basic http authentication.
-     * The only supported authentication for now is via the url:
-     *
-     * http://username:password@host/path?query
-     *
-     * @param mixed $request_type Type of request (optional; defaults to any)
-     * @return mixed Instance of self if authentication was detected, false
-     *               otherwise
-     * @throws RouterException if authentication fails
-     * @todo Integrate and test HTTP_AUTHORIZATION header authentication
-     */
-    public static function detect($request_type = null)
-    {
-        if (
-            isset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])
-            || isset($_SERVER['HTTP_AUTHORIZATION'])
-        ) {
-            $user_id = false;
-
-            if (isset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
-                $username = $_SERVER['PHP_AUTH_USER'];
-                $password = $_SERVER['PHP_AUTH_PW'];
-            } elseif (isset($_SERVER['HTTP_AUTHORIZATION'])) {
-                list($username, $password) = explode(':', base64_decode(mb_substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
-            }
-
-            $check = StudipAuthAbstract::CheckAuthentication($username, $password);
-            if ($check['uid'] && $check['uid'] !== 'nobody') {
-                return new self(null, $check['uid']);
-            }
-
-        }
-        return false;
-    }
-}
diff --git a/lib/classes/restapi/consumer/OAuth.php b/lib/classes/restapi/consumer/OAuth.php
deleted file mode 100644
index caf51c2..0000000
--- a/lib/classes/restapi/consumer/OAuth.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-namespace RESTAPI\Consumer;
-use StudipAutoloader, DBManager, OAuthRequestVerifier, OAuthStore, OAuthServer, Exception;
-use \RESTAPI\UserPermissions;
-
-StudipAutoloader::addAutoloadPath($GLOBALS['STUDIP_BASE_PATH'] . DIRECTORY_SEPARATOR . 'vendor/oauth-php/library/');
-
-/**
- * OAuth consumer for the rest api
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class OAuth extends Base
-{
-    /**
-     * Configures the model.
-     *
-     * @param array $config Configuration array
-     */
-    protected static function configure($config = [])
-    {
-        $config['default_values']['consumer_type'] = 'oauth';
-
-        $config['registered_callbacks']['before_store'][] = 'before_store';
-
-        parent::configure($config);
-    }
-
-    /**
-     * Detects whether the request is authenticated via OAuth.
-     *
-     * @param mixed $request_type Type of request (optional; defaults to any)
-     * @return mixed Instance of self if authentication was detected, false
-     *               otherwise
-     */
-    public static function detect($request_type = null)
-    {
-        if (OAuthRequestVerifier::requestIsSigned() && $request_type !== 'request') {
-            $user_id = false;
-
-            $parameters = (in_array($_SERVER['REQUEST_METHOD'], ['GET', 'POST']))
-                        ? null
-                        : $GLOBALS['_' . $_SERVER['REQUEST_METHOD']];
-
-            $req = new OAuthRequestVerifier(null, null, $parameters);
-
-            // Check oauth timestamp and deny access if timestamp is outdated
-            if ($req->getParam('oauth_timestamp') < strtotime('-6 hours')) {
-                return false;
-            }
-            $result = $req->verifyExtended('access');
-
-            // @todo
-            # self::$consumer_key = $result['consumer_key'];
-
-            $query = "SELECT user_id FROM api_oauth_user_mapping WHERE oauth_id = :oauth_id";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':oauth_id', $result['user_id']);
-            $statement->execute();
-            $user_id = $statement->fetchColumn();
-
-            if (!$user_id) {
-                return false;
-            }
-
-            $consumer = reset(self::findByAuth_Key($result['consumer_key']));
-            $consumer->setUser($user_id);
-            return $consumer;
-        } else {
-            try {
-                // Check if there is a valid request token in the current request
-                // Returns an array with the consumer key, consumer secret, token, token secret and token type.
-                $rs = self::getServer()->authorizeVerify();
-
-                $query = "SELECT consumer_id
-                          FROM api_consumers
-                          WHERE auth_key = :key";
-                $statement = DBManager::get()->prepare($query);
-                $statement->bindValue(':key', $rs['consumer_key']);
-                $statement->execute();
-                $id = $statement->fetchColumn();
-
-                if ($id) {
-                    return new self($id);
-                }
-            } catch (Exception $e) {
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a singleton instance of the oauth server.
-     *
-     * @return OAuthServer The server object
-     */
-    public static function getServer()
-    {
-        static $server = null;
-        if ($server === null) {
-            $server = new OAuthServer(null, null, null, 'SESSION', [], [
-                'allowed_uri_schemes' => []
-            ]);
-        }
-        return $server;
-    }
-
-    /**
-     * "Before store" trigger. Creates a clone of the consumer in the
-     * tables for the vendor oauth library.
-     */
-    protected function before_store()
-    {
-        static $mapping = [
-            'auth_key'    => 'consumer_key',
-            'auth_secret' => 'consumer_secret',
-            'active'      => 'enabled',
-            'contact'     => 'requester_name',
-            'email'       => 'requester_email',
-            'callback'    => 'callback_uri',
-            'url'         => 'application_uri',
-            'title'       => 'application_title',
-            'description' => 'application_descr',
-            'notes'       => 'application_notes',
-            'type'        => 'application_type',
-            'commercial'  => 'application_commercial',
-        ];
-
-        $consumer = [];
-        foreach ($mapping as $from => $to) {
-            $consumer[$to] = $this->$from;
-        }
-
-        $query = "SELECT osr_id
-                  FROM oauth_server_registry
-                  WHERE osr_consumer_key = :key AND osr_consumer_secret = :secret";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':key', $this->auth_key);
-        $statement->bindValue(':secret', $this->auth_secret);
-        $statement->execute();
-        $consumer['id'] = $statement->fetchColumn();
-
-        $consumer_key = OAuthStore::instance('PDO')->updateConsumer($consumer, null, true);
-
-        if ($this->isNew()) {
-            $consumer = OAuthStore::instance('PDO')->getConsumer($consumer_key, null, true);
-            $this->auth_key    = $consumer['consumer_key'];
-            $this->auth_secret = $consumer['consumer_secret'];
-        }
-    }
-
-    /**
-     * Grant oauth access for a user.
-     *
-     * @param mixed $user_id Specific user id or null to default to the
-     *                       injected user
-     * @throws Exception If no valid user is present
-     */
-    public function grantAccess($user_id = null)
-    {
-        if ($user_id === null && $this->hasUser()) {
-            $user_id = $this->user->id;
-        }
-        if (!$user_id) {
-            throw new Exception('Can not grant access to unknown user');
-        }
-
-        UserPermissions::get($GLOBALS['user']->id)->set($this->id, true)->store();
-        return self::getServer()->authorizeFinish(true, self::getOAuthId($user_id));
-    }
-
-    /**
-     * Revoke oauth access from a user.
-     *
-     * @param mixed $user_id Specific user id or null to default to the
-     *                       injected user
-     * @throws Exception If no valid user is present
-     */
-    public function revokeAccess($user_id = null)
-    {
-        if ($user_id === null && $this->hasUser()) {
-            $user_id = $this->user->id;
-        }
-        if (!$user_id) {
-            throw new Exception('Can not revoke access from unknown user');
-        }
-
-        $query = "DELETE oauth_server_token
-                  FROM oauth_server_token
-                  JOIN oauth_server_registry
-                  WHERE ost_usa_id_ref = :id AND osr_consumer_key = :key AND osr_consumer_secret = :secret";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':id', self::getOAuthId($user_id));
-        $statement->bindValue(':key', $this->auth_key);
-        $statement->bindValue(':secret', $this->auth_secret);
-        $statement->execute();
-
-        UserPermissions::get($GLOBALS['user']->id)->set($this->id, false)->store();
-        return self::getServer()->authorizeFinish(false, self::getOAuthId($user_id));
-    }
-
-    /**
-     * Maps a user to an oauth id. This is neccessary due to the fact that
-     * the oauth lib works with different ids than Stud.IP.
-     *
-     * @param String $user_id Id of the user to get an oauth id for
-     * @return String The mapped oauth id
-     */
-    public static function getOAuthId($user_id)
-    {
-        $query = "SELECT oauth_id FROM api_oauth_user_mapping WHERE user_id = :id";
-        $statement = DBManager::get()->prepare($query);
-        $statement->bindValue(':id', $user_id);
-        $statement->execute();
-        $oauth_id = $statement->fetchColumn();
-
-        if (!$oauth_id) {
-            $query = "INSERT INTO api_oauth_user_mapping (user_id, mkdate)
-                      VALUES (:id, UNIX_TIMESTAMP())";
-            $statement = DBManager::get()->prepare($query);
-            $statement->bindValue(':id', $user_id);
-            $statement->execute();
-            $oauth_id = DBManager::get()->lastInsertId();
-        }
-
-        return $oauth_id;
-    }
-}
diff --git a/lib/classes/restapi/consumer/Studip.php b/lib/classes/restapi/consumer/Studip.php
deleted file mode 100644
index 738dd75..0000000
--- a/lib/classes/restapi/consumer/Studip.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-namespace RESTAPI\Consumer;
-
-/**
- * Stud.IP Session Consumer for the rest api
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class Studip extends Base
-{
-    /**
-     * Detects a user via the Stud.IP session. If a session is present and
-     * valid, the auth and user object have already been set up by stud.ip
-     * functions, so we just need to check if these are present.
-     *
-     * @param mixed $request_type Type of request (optional; defaults to any)
-     * @return mixed Instance of self if authentication was detected, false
-     *               otherwise
-     */
-    public static function detect($request_type = null)
-    {
-        if (
-            !isset($GLOBALS['auth'])
-            || !$GLOBALS['auth']->is_authenticated()
-            || $GLOBALS['user']->id === 'nobody'
-            || !\CSRFProtection::verifyRequest()
-        ) {
-            return false;
-        }
-
-        return new self(null, $GLOBALS['user']->id);
-    }
-}
diff --git a/lib/classes/restapi/renderer/DebugRenderer.php b/lib/classes/restapi/renderer/DebugRenderer.php
deleted file mode 100644
index afd56f6..0000000
--- a/lib/classes/restapi/renderer/DebugRenderer.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-namespace RESTAPI\Renderer;
-
-/**
- * Debug content renderer.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class DebugRenderer extends DefaultRenderer
-{
-    /**
-     * Returns an associated content type.
-     */
-    public function contentType()
-    {
-        return 'text/plain';
-    }
-
-    /**
-     * Returns an associated extension.
-     */
-    public function extension()
-    {
-        return '.debug';
-    }
-
-    /**
-     * Response transformation function.
-     *
-     * @param \RESTAPI\Response $response  the response to transform
-     */
-    public function render($response)
-    {
-        if (!isset($response['Content-Type'])) {
-            $response['Content-Type'] = $this->contentType() . ';charset=utf-8';
-        }
-
-        $debug = function ($label, $data) {
-            echo str_pad('', 78, '=') . PHP_EOL;
-            echo str_pad('- ' . $label, 77, ' ') . '-' . PHP_EOL;
-            echo str_pad('', 78, '=') . PHP_EOL;
-            var_export($data);
-            echo PHP_EOL;
-        };
-
-        ob_start();
-        $debug('Response Status', $response->status);
-        $debug('Response Header', $response->headers);
-        $debug('Response Body',   $response->body);
-        $debug('Request', $GLOBALS['_' . $_SERVER['REQUEST_METHOD']]);
-        $response->body = ob_get_clean();
-    }
-}
diff --git a/lib/classes/restapi/renderer/DefaultRenderer.php b/lib/classes/restapi/renderer/DefaultRenderer.php
deleted file mode 100644
index 836ba36..0000000
--- a/lib/classes/restapi/renderer/DefaultRenderer.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace RESTAPI\Renderer;
-
-/**
- * Default base content renderer class (outputs text/plain).
- *
- * Content renderers are output filters that can reshape data before it
- * is sent to the client.
- * Each content renderer is associated with a certain content type and a
- * certain file extension. This is neccessary for content negotiation.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class DefaultRenderer
-{
-    /**
-     * Returns an associated content type.
-     *
-     * @return String Content/mime type for this renderer
-     */
-    public function contentType()
-    {
-        return 'text/plain';
-    }
-
-    /**
-     * Returns an associated extension.
-     *
-     * @return String Associated extension for this renderer.
-     */
-    public function extension()
-    {
-        return '';
-    }
-
-    /**
-     * Response transformation function.
-     *
-     * @param \RESTAPI\Response $response  the response to transform
-     */
-    public function render($response)
-    {
-        if (!isset($response['Content-Type'])) {
-            $response['Content-Type'] = $this->contentType() . ';charset=utf-8';
-        }
-    }
-
-    /**
-     * Detects whether the renderer should respond to either a certain
-     * filename (tests by extension) or to a certain media range.
-     *
-     * @param String $filename    Filename to test against
-     * @param mixed  $media_range Media range to test against (optional,
-     *                            defaults to request's accept header if set)
-     * @return bool Returns whether the renderer should respond
-     */
-    public function shouldRespondTo($filename, $media_range = null)
-    {
-        // If no media range is passed, evalute http header "Accept"
-        if ($media_range === null && isset($_SERVER['ACCEPT'])) {
-            $media_ranges = explode(';', $_SERVER['ACCEPT']);
-            $media_range = reset($media_ranges);
-        }
-
-        // Test if either the filename has the appropriate extension or
-        // if the client accepts the content type
-        return ($this->extension() && fnmatch('*' . $this->extension(), $filename))
-            || ($media_range && fnmatch($media_range, $this->contentType()));
-    }
-}
diff --git a/lib/classes/restapi/renderer/JSONRenderer.php b/lib/classes/restapi/renderer/JSONRenderer.php
deleted file mode 100644
index 9c6e449..0000000
--- a/lib/classes/restapi/renderer/JSONRenderer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-namespace RESTAPI\Renderer;
-
-/**
- * Content renderer for json content.
- *
- * @author     Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @author     <mlunzena@uos.de>
- * @license    GPL 2 or later
- * @since      Stud.IP 3.0
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-class JSONRenderer extends DefaultRenderer
-{
-    public function contentType()
-    {
-        return 'application/json';
-    }
-
-    public function extension()
-    {
-        return '.json';
-    }
-
-    public function render($response)
-    {
-        if (!isset($response['Content-Type'])) {
-            $response['Content-Type'] = $this->contentType() . ';charset=utf-8';
-        }
-
-        if (isset($response->body)) {
-            $response->body = json_encode($response->body);
-        }
-    }
-}
diff --git a/lib/models/resources/ResourceBooking.php b/lib/models/resources/ResourceBooking.php
index fadf92f..8950713 100644
--- a/lib/models/resources/ResourceBooking.php
+++ b/lib/models/resources/ResourceBooking.php
@@ -1755,18 +1755,16 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
                 //(lib/resources.js, method dropEventInRoomGroupBookingPlan)
                 $interval_api_urls = [
                     'resize' => \URLHelper::getURL(
-                        'api.php/resources/booking/'
-                      . $this->id . '/move',
+                        'dispatch.php/resources/ajax/move_booking/' . $this->id,
                         [
-                            'quiet' => '1',
+                            'quiet' => true,
                             'interval_id' => $interval->id
                         ]
                     ),
                     'move' => \URLHelper::getURL(
-                        'api.php/resources/booking/'
-                      . $this->id . '/move',
+                        'dispatch.php/resources/ajax/move_booking/' . $this->id,
                         [
-                            'quiet' => '1',
+                            'quiet' => true,
                             'interval_id' => $interval->id
                         ]
                     )
@@ -1784,11 +1782,11 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
                 $text_colour,
                 $colour,
                 $booking_is_editable,
-                'ResourceBookingInterval',
+                ResourceBookingInterval::class,
                 $interval->id,
-                'ResourceBooking',
+                ResourceBooking::class,
                 $this->id,
-                'Resource',
+                Resource::class,
                 $this->resource_id,
                 $booking_view_urls,
                 $interval_api_urls,
diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php
index 9cad900..b2f5524 100644
--- a/lib/models/resources/ResourceRequest.php
+++ b/lib/models/resources/ResourceRequest.php
@@ -2244,24 +2244,19 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
 
     protected function convertToEventData(array $time_intervals, User $user)
     {
-        $booking_plan_request_bg     =
-            ColourValue::find('Resources.BookingPlan.Request.Bg');
-        $booking_plan_request_fg     =
-            ColourValue::find('Resources.BookingPlan.Request.Fg');
-        $booking_plan_preparation_bg =
-            ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
-        $booking_plan_preparation_fg =
-            ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
+        $booking_plan_request_bg = ColourValue::find('Resources.BookingPlan.Request.Bg');
+        $booking_plan_request_fg = ColourValue::find('Resources.BookingPlan.Request.Fg');
+        $booking_plan_preparation_bg = ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
+        $booking_plan_preparation_fg = ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
 
         $user_is_resource_autor = false;
-        if ($this->resource_id && ($this->resource instanceof Resource)) {
+        if ($this->resource_id && $this->resource instanceof Resource) {
             $user_is_resource_autor = $this->resource->userHasPermission(
                 $user,
                 'autor'
             );
         }
-        $request_is_editable =
-            $user_is_resource_autor || ($user->id == $this->user_id);
+        $request_is_editable = $user_is_resource_autor || ($user->id == $this->user_id);
 
         $request_api_urls  = [];
         $request_view_urls = [];
@@ -2269,18 +2264,12 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
         if ($request_is_editable) {
             $request_api_urls = [
                 'resize' => URLHelper::getURL(
-                    'api.php/resources/request/'
-                    . $this->id . '/move',
-                    [
-                        'quiet' => '1'
-                    ]
+                    'dispatch.php/resources/ajax/move_request/'. $this->id,
+                    ['quiet' => true]
                 ),
-                'move'   => URLHelper::getURL(
-                    'api.php/resources/request/'
-                    . $this->id . '/move',
-                    [
-                        'quiet' => '1'
-                    ]
+                'move' => URLHelper::getURL(
+                    'dispatch.php/resources/ajax/move_request/'. $this->id,
+                    ['quiet' => true]
                 )
             ];
 
@@ -2290,13 +2279,14 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                     . $this->id
                 )
             ];
-            if ($this->resource_id && ($this->resource instanceof Resource)) {
-                if ($this->resource->userHasBookingRights($user)) {
-                    $request_view_urls['edit'] = URLHelper::getURL(
-                        'dispatch.php/resources/room_request/resolve/'
-                        . $this->id
-                    );
-                }
+            if (
+                $this->resource_id
+                && $this->resource instanceof Resource
+                && $this->resource->userHasBookingRights($user)
+            ) {
+                $request_view_urls['edit'] = URLHelper::getURL(
+                    'dispatch.php/resources/room_request/resolve/'. $this->id
+                );
             }
         }
 
@@ -2306,7 +2296,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
             $real_begin = $interval['begin'];
             if ($this->preparation_time) {
                 $real_begin += (int)$this->preparation_time;
-                $begin      = new DateTime();
+                $begin = new DateTime();
                 $begin->setTimestamp($interval['begin']);
                 $end = new DateTime();
                 $end->setTimestamp($real_begin);
@@ -2320,9 +2310,9 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                     $request_is_editable,
                     '',
                     '',
-                    'ResourceRequest',
+                    ResourceRequest::class,
                     $this->id,
-                    'Resource',
+                    Resource::class,
                     $this->resource_id,
                     $request_view_urls,
                     $request_api_urls
@@ -2342,11 +2332,11 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                 $booking_plan_request_fg->__toString(),
                 $booking_plan_request_bg->__toString(),
                 $request_is_editable,
-                'ResourceRequest',
+                ResourceRequest::class,
                 $this->id,
-                'Resource',
+                Resource::class,
                 $this->resource_id,
-                'Resource',
+                Resource::class,
                 $this->resource_id,
                 $request_view_urls,
                 $request_api_urls
diff --git a/lib/modules/ActivityFeed.php b/lib/modules/ActivityFeed.php
index 62762b6..667c4f9 100644
--- a/lib/modules/ActivityFeed.php
+++ b/lib/modules/ActivityFeed.php
@@ -50,28 +50,4 @@ class ActivityFeed extends CorePlugin implements PortalPlugin
 
         return $template;
     }
-
-    public static function onEnable($pluginId)
-    {
-        $errors = [];
-        if (!Config::get()->API_ENABLED) {
-            $errors[] = sprintf(
-                _('Die REST-API ist nicht aktiviert (%s "API_ENABLED")'),
-                formatReady(sprintf('[%s]%s',
-                    _('Konfiguration'),
-                    URLHelper::getLink('dispatch.php/admin/configuration/configuration')
-                ))
-            );
-        } elseif (!RESTAPI\ConsumerPermissions::get('global')->check('/user/:user_id/activitystream', 'get')) {
-            $errors[] = sprintf(
-                _('Die REST-API-Route ist nicht aktiviert (%s "/user/:user_id/activitystream"")'),
-                formatReady(sprintf('[%s]%s',
-                    _('Konfiguration'),
-                    URLHelper::getLink('dispatch.php/admin/api/permissions')
-                ))
-            );
-        }
-
-        return count($errors) === 0;
-    }
 }
diff --git a/lib/navigation/AdminNavigation.php b/lib/navigation/AdminNavigation.php
index a725082..3e63876 100644
--- a/lib/navigation/AdminNavigation.php
+++ b/lib/navigation/AdminNavigation.php
@@ -206,10 +206,6 @@ class AdminNavigation extends Navigation
 
             $navigation->addSubNavigation('admissionrules', new Navigation(_('Anmelderegeln'), 'dispatch.php/admission/ruleadministration'));
 
-            if (Config::get()->API_ENABLED) {
-                $navigation->addSubNavigation('api', new Navigation(_('API'), 'dispatch.php/admin/api'));
-            }
-
             $navigation->addSubNavigation('oauth2', new Navigation(_('OAuth2'), 'dispatch.php/admin/oauth2/index'));
 
             $navigation->addSubNavigation('globalsearch', new Navigation(_('Globale Suche'), 'dispatch.php/globalsearch/settings'));
diff --git a/lib/navigation/ProfileNavigation.php b/lib/navigation/ProfileNavigation.php
index 4827fe4..307cd98 100644
--- a/lib/navigation/ProfileNavigation.php
+++ b/lib/navigation/ProfileNavigation.php
@@ -114,10 +114,6 @@ class ProfileNavigation extends Navigation
                     $navigation->addSubNavigation('deputies', new Navigation(_('Standardvertretung'), 'dispatch.php/settings/deputies'));
                 }
 
-                if (Config::Get()->API_ENABLED) {
-                    $navigation->addSubNavigation('api', new Navigation(_('API-Berechtigungen'), 'dispatch.php/api/authorizations'));
-                }
-
                 if (TwoFactorAuth::isEnabledForUser()) {
                     $navigation->addSubNavigation('tfa', new Navigation(_('Zwei-Faktor-Authentifizierung'), 'dispatch.php/tfa'));
                 }
diff --git a/lib/plugins/core/RESTAPIPlugin.php b/lib/plugins/core/RESTAPIPlugin.php
deleted file mode 100644
index f69344c..0000000
--- a/lib/plugins/core/RESTAPIPlugin.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * REST-API Plugins add maps to the REST-API router.
- *
- * Copyright (c) 2014 - Marcus Lunzenauer <mlunzena@uos.de>
- *
- * 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.
- */
-
-/**
- * @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-interface RESTAPIPlugin
-{
-    /**
-     * Returns one or more instances of RESTAPI\RouteMap to register
-     * to the Router.
-     *
-     * @return RouteMap|Array   either a single instance of class
-     *                          RouteMap or an array of them
-     */
-    public function getRouteMaps();
-}
diff --git a/public/api.php b/public/api.php
deleted file mode 100644
index 9f7863c..0000000
--- a/public/api.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/** @file
- *
- * Diese Datei stellt den Ausgangspunkt für alle Zugriffe auf die
- * RESTful Web Services von Stud.IP dar.
- * Grob betrachtet läuft das Routings so ab:
- *
- * Ein HTTP-Request geht ein. Falls dort eine inkompatible Version der
- * REST-API verlangt wird, bricht das Skript ab. Die Authentifizierung
- * wird durchgeführt. Bei Erfolg wird die PATH_INFO und die HTTP
- * Methode im Router verwendet, um die passende Funktion zu
- * finden. Der Router liefert in jedem Fall ein Response-Objekt
- * zurück, dass dann anschließende ausgegeben wird, d.h. die Header
- * werden gesendet und dann das Ergebnis ausgegeben oder gestreamt.
- *
- * @deprecated  Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
- */
-
-
-namespace {
-    require_once '../lib/bootstrap.php';
-
-    page_open([
-        'sess' => 'Seminar_Session',
-        'auth' => 'Seminar_Default_Auth',
-        'perm' => 'Seminar_Perm',
-        'user' => 'Seminar_User',
-    ]);
-}
-
-namespace RESTAPI {
-
-    use Config;
-
-    // A potential api exception will lead to an according response with the
-    // exception code and name as the http status.
-    try {
-        if (!Config::get()->API_ENABLED) {
-            throw new RouterException(503, 'REST API is not available');
-        }
-
-        require 'lib/bootstrap-api.php';
-
-        // Initialize RESTAPI plugins
-        \PluginEngine::getPlugins(RESTAPIPlugin::class);
-
-        $uri = \Request::pathInfo();
-
-        // Check version
-        if (defined('RESTAPI\\VERSION') && preg_match('~^/v(\d+)~i', $uri, $match)) {
-            $version = $match[1];
-            if ($version != VERSION) {
-                throw new RouterException(400, 'Version not supported');
-            }
-
-            $uri = mb_substr($uri, mb_strlen($match[0]));
-            header('X-API-Version: ' . VERSION);
-        }
-
-        // Get router instance
-        $router = Router::getInstance();
-
-        $api_user = $router->setupAuth();
-
-        // Actual dispatch
-        $response = $router->dispatch($uri);
-
-        // Tear down
-        if ($api_user) {
-            restoreLanguage();
-        }
-
-        // Send output
-        $response->output();
-
-    } catch (RouterException $e) {
-        $status = sprintf('%s %u %s',
-                          $_SERVER['SERVER_PROTOCOL'] ?: 'HTTP/1.1',
-                          $e->getCode(),
-                          $e->getMessage());
-        $status = trim($status);
-        if (!headers_sent()) {
-            if ($e->getCode() === 401) {
-                header('WWW-Authenticate: Basic realm="' . Config::get()->STUDIP_INSTALLATION_ID . '"');
-            }
-            header($status, true, $e->getCode());
-            echo $status;
-        } else {
-            echo $status;
-        }
-    } catch (\Exception $e) {
-        error_log("Caught {$e}");
-
-        $message = explode("\n", $e->getMessage())[0];
-        header('Content-Type: application/json; charset=UTF-8');
-        header("{$_SERVER['SERVER_PROTOCOL']} 500 {$message}");
-        echo $GLOBALS['template_factory']->render('json_exception', [
-            'exception' => $e,
-            'status'    => 500,
-        ]);
-    }
-}
diff --git a/resources/assets/javascripts/bootstrap/resources.js b/resources/assets/javascripts/bootstrap/resources.js
index 8c89b7f..7eb6a68 100644
--- a/resources/assets/javascripts/bootstrap/resources.js
+++ b/resources/assets/javascripts/bootstrap/resources.js
@@ -416,7 +416,7 @@ STUDIP.ready(function () {
                     $("#BookingEndDateInput").prop('defaultValue', $(this).val());
                     $("#BookingEndDateInput").val($(this).val()).trigger('change');
                 }
-                updateRepeatEndSemesterByTimestamp(Math.floor(d / 1000));
+                updateRepeatEndSemesterByTimestamp(d);
             } else if ($(this).attr('id') == 'BookingEndDateInput') {
                 $("#end_date-weekdays span").addClass('invisible');
                 $("#end_date-weekdays #" + day_numer).removeClass('invisible');
@@ -545,38 +545,41 @@ STUDIP.ready(function () {
         }
     );
 
-    function updateRepeatEndSemesterByTimestamp(timestamp, api_url = 'api.php/semesters') {
-        var semester = null;
-        jQuery.ajax(
-            STUDIP.URLHelper.getURL(api_url),
-            {
-                method: 'get',
-                dataType: 'json',
-                success: function (data) {
-                    if (data) {
-                        Object.values(data.collection).forEach(item => {
-                            if (timestamp >= item.begin && timestamp < item.end) {
-                                semester = item;
-                            }
-                        });
-                        if (semester) {
-                            $("#semester_course_name").text(semester.title);
-                            $(".semester-time-option").prop('disabled', false);
-                        } else {
-                            if (data.pagination && data.pagination.links.next != api_url) {
-                                semester = updateRepeatEndSemesterByTimestamp(timestamp, data.pagination.links.next);
-                            } else {
-                                $("#semester_course_name").text('außerhalb definierter Zeiten');
-                                $(".semester-time-option").prop('checked', false);
-                                $(".semester-time-option").prop('disabled', true);
-                                $(".manual-time-option").prop('checked', true);
-                                $(".manual-time-option").trigger('change');
-                            }
-                        }
-                    }
-                }
+    function updateRepeatEndSemesterByTimestamp(timestamp) {
+        (new Promise((resolve, reject) => {
+            const cache = STUDIP.Cache.getInstance('jsonapi');
+            if (cache.has('semesters')) {
+                resolve(cache.get('semesters'));
+            } else {
+                STUDIP.jsonapi.GET('semesters', { data: { page: { limit: 100000 }}})
+                    .done(({data}) => {
+                        cache.set('semesters', data);
+                        resolve(data)
+                    })
+                    .fail(() => {
+                        reject(new Error('Could not load semesters'));
+                    });
+            }
+        })).then(semesters => {
+            const semester = semesters.find(({attributes}) => {
+                return new Date(attributes.start) <= timestamp
+                    && timestamp <= new Date(attributes.end);
+            });
+
+            if (semester) {
+                $('#semester_course_name').text(semester.attributes.title);
+                $('.semester-time-option').prop('disabled', false);
+            } else {
+                $('#semester_course_name').text('außerhalb definierter Zeiten');
+                $('.semester-time-option').prop({
+                    checked: false,
+                    disabled: true
+                });
+                $('.manual-time-option')
+                    .prop('checked', true)
+                    .trigger('change');
             }
-        );
+        });
     }
 
     function updateViewURL(defaultView) {
diff --git a/resources/assets/javascripts/init.js b/resources/assets/javascripts/init.js
index 36a72a5..1d7d5ac 100644
--- a/resources/assets/javascripts/init.js
+++ b/resources/assets/javascripts/init.js
@@ -64,7 +64,6 @@ import register from './lib/register.js';
 import Report from './lib/report.js';
 import Resources from './lib/resources.js';
 import Responsive from './lib/responsive.js';
-import RESTAPI, { api } from './lib/restapi.js';
 import Schedule from './lib/schedule.js';
 import Screenreader from './lib/screenreader.js';
 import Scroll from './lib/scroll.js';
@@ -92,7 +91,6 @@ window.STUDIP = _.assign(window.STUDIP || {}, {
     admin_sem_class,
     AdminCourses,
     Admission,
-    api,
     Arbeitsgruppen,
     Archive,
     Avatar,
@@ -151,7 +149,6 @@ window.STUDIP = _.assign(window.STUDIP || {}, {
     register,
     Report,
     Responsive,
-    RESTAPI,
     Schedule,
     Scroll,
     Screenreader,
diff --git a/resources/assets/javascripts/lib/activityfeed.js b/resources/assets/javascripts/lib/activityfeed.js
index 74c27f9..12f0bac 100644
--- a/resources/assets/javascripts/lib/activityfeed.js
+++ b/resources/assets/javascripts/lib/activityfeed.js
@@ -6,13 +6,13 @@ const ActivityFeed = {
     maxheight: null,
     filter: null,
 
-    init: function() {
+    init() {
         STUDIP.ActivityFeed.maxheight = parseInt($('#stream-container').css('max-height').replace(/[^-\d.]/g, ''));
 
         STUDIP.ActivityFeed.loadFeed(STUDIP.ActivityFeed.filter);
 
-        $('#stream-container').scroll(function () {
-            var scrollBottom = $('#stream-container').scrollTop() + $('#stream-container').height() + 250;
+        $('#stream-container').scroll(() => {
+            const scrollBottom = $('#stream-container').scrollTop() + $('#stream-container').height() + 250;
 
             if ($('#stream-container').prop('scrollHeight') < scrollBottom) {
                 STUDIP.ActivityFeed.loadFeed(STUDIP.ActivityFeed.filter);
@@ -23,7 +23,7 @@ const ActivityFeed = {
         $(document).on('click', '.provider_circle', function () {
             $(this).parent().parent().children('.activity-content').toggle();
         }).on('click', '#toggle-all-activities,#toggle-user-activities', function () {
-            var toggled = $(this).is(':not(.toggled)');
+            const toggled = $(this).is(':not(.toggled)');
             $(this).toggleClass('toggled', toggled);
 
             STUDIP.ActivityFeed.setToggleStatus();
@@ -32,11 +32,11 @@ const ActivityFeed = {
         });
     },
 
-    getTemplate: _.memoize(function(name) {
-        return _.template($("script." + name).html());
+    getTemplate: _.memoize(name => {
+        return _.template($(`script.${name}`).html());
     }),
 
-    loadFeed: function(filtertype) {
+    loadFeed(filtertype) {
         if (STUDIP.ActivityFeed.user_id === null) {
             console.log('Could not retrieve activities, no valid user id found!');
             return false;
@@ -48,17 +48,18 @@ const ActivityFeed = {
 
         STUDIP.ActivityFeed.polling = true;
 
-        STUDIP.api.GET(['user', STUDIP.ActivityFeed.user_id, 'activitystream'], {
-            data: {
-                filtertype: JSON.stringify(filtertype),
-                scrollfrom: STUDIP.ActivityFeed.scrolledfrom
-            }
-        }).done(function (activities) {
-            var stream        = STUDIP.ActivityFeed.getTemplate('activity_stream');
-            var activity      = STUDIP.ActivityFeed.getTemplate('activity');
-            var activity_urls = STUDIP.ActivityFeed.getTemplate('activity-urls');
-            var num_entries   = Object.keys(activities).length;
-            var lastelem      = $(activities).last();
+        const url = STUDIP.URLHelper.getURL('dispatch.php/activityfeed/load', {
+            filtertype: JSON.stringify(filtertype),
+            scrollfrom: STUDIP.ActivityFeed.scrolledfrom,
+        });
+        fetch(url).then(
+            response => response.json(),
+        ).then(activities => {
+            const stream = STUDIP.ActivityFeed.getTemplate('activity_stream');
+            const activity = STUDIP.ActivityFeed.getTemplate('activity');
+            const activity_urls = STUDIP.ActivityFeed.getTemplate('activity-urls');
+            const num_entries = Object.keys(activities).length;
+            const lastelem = $(activities).last();
 
             if (lastelem[0]) {
                 STUDIP.ActivityFeed.scrolledfrom  = lastelem[0].mkdate;
@@ -79,15 +80,15 @@ const ActivityFeed = {
             if ($('#stream-container').height() < STUDIP.ActivityFeed.maxheight) {
                 STUDIP.ActivityFeed.loadFeed('');
             }
-        }).fail(function () {
-            var template = STUDIP.ActivityFeed.getTemplate('activity-load-error');
+        }).catch(() => {
+            const template = STUDIP.ActivityFeed.getTemplate('activity-load-error');
             STUDIP.ActivityFeed.writeToStream(template());
-        }).always(function () {
+        }).finally(() => {
             STUDIP.ActivityFeed.polling = false;
         });
     },
 
-    writeToStream: function (html) {
+    writeToStream(html) {
         if (STUDIP.ActivityFeed.initial) {
             // replace data in DOM
             $('#stream-container').html('');
@@ -98,9 +99,9 @@ const ActivityFeed = {
         $('#stream-container').append(html);
     },
 
-    setToggleStatus: function() {
-        var show_details = $('#toggle-all-activities').is('.toggled'),
-            show_own     = $('#toggle-user-activities').is('.toggled');
+    setToggleStatus() {
+        const show_details = $('#toggle-all-activities').is('.toggled');
+        const show_own = $('#toggle-user-activities').is('.toggled');
 
         // update toggle status fir activity contents
         $('.activity-content').toggle(show_details);
@@ -109,7 +110,7 @@ const ActivityFeed = {
         $('.activity:has(.provider_circle.right)').toggle(show_own);
     },
 
-    updateFilter: function(filter) {
+    updateFilter(filter) {
         STUDIP.ActivityFeed.filter = filter;
         STUDIP.ActivityFeed.initial = true;
         STUDIP.ActivityFeed.scrolledfrom = Math.floor(Date.now() / 1000);
diff --git a/resources/assets/javascripts/lib/fullcalendar.js b/resources/assets/javascripts/lib/fullcalendar.js
index 3b8fa11..5b7d032 100644
--- a/resources/assets/javascripts/lib/fullcalendar.js
+++ b/resources/assets/javascripts/lib/fullcalendar.js
@@ -622,8 +622,13 @@ class Fullcalendar
                     $('.fc-slats tr:odd .fc-widget-content:not(.fc-axis)').remove();
                 }
 
-                STUDIP.api.GET(`semester/${timestamp}/week`).done((data) => {
+                if (document.getElementById('booking-plan-header-semname') === null) {
+                    return;
+                }
 
+                $.getJSON(
+                    STUDIP.URLHelper.getURL(`dispatch.php/resources/ajax/semester_week/${timestamp}`)
+                ).done((data) => {
                     if (data) {
                         $('#booking-plan-header-semname').text(data.semester_name);
                         if (data.sem_week) {
@@ -640,7 +645,7 @@ class Fullcalendar
                         $('#booking-plan-header-semrow').hide();
                         $('#booking-plan-header-semweek-part').hide();
                     }
-            })
+                });
             },
             resourceRender (renderInfo) {
                 if ($(renderInfo.view.context.calendar.el).hasClass('room-group-booking-plan')) {
diff --git a/resources/assets/javascripts/lib/resources.js b/resources/assets/javascripts/lib/resources.js
index 3287b42..6ff4156 100644
--- a/resources/assets/javascripts/lib/resources.js
+++ b/resources/assets/javascripts/lib/resources.js
@@ -50,7 +50,7 @@ class Resources
             jQuery(row_tds[user_td_index]).children('input').removeAttr('disabled');
 
             if (username) {
-                jQuery(row_tds[user_td_index]).append(username);
+                jQuery('<span>').text(username).appendTo(row_tds[user_td_index]);
             } else {
                 jQuery(row_tds[user_td_index]).append('ID ' + user_id);
             }
@@ -60,8 +60,6 @@ class Resources
             }
             jQuery(user_id_input).val(user_id);
 
-            var perm_select = jQuery(row_tds[user_td_index + 1]).children()[0];
-
             if (temp_perms_row) {
                 //Set the time input fields to useful values:
 
@@ -134,22 +132,19 @@ class Resources
             jQuery(table_element).trigger('update');
         };
 
-        STUDIP.api.GET(
-            `user/${user_id}`
-        ).done(function (data) {
-            var username = data.name.family
-                + ', '
-                + data.name.given;
-            if (data.name.prefix) {
-                username += ', ' + data.name.prefix;
+        STUDIP.jsonapi.GET(`users/${user_id}`).done(data => {
+            const attributes = data.data.attributes;
+
+            let username = `${attributes['family-name']}, ${attributes['given-name']}`;
+            if (attributes['name-prefix']) {
+                username += `, ${attributes['name-prefix']}`;
             }
-            if (data.name.suffix) {
-                username += ' ' + data.name.suffix;
+            if (attributes['name-suffix']) {
+                username += ` ${attributes['name-suffix']}`;
             }
-            username += ' (' + data.name.username + ')'
-                + ' (' + data.perms + ')';
+            username += ` (${attributes.username}) (${attributes.permission})`;
             insert_function(user_id, username);
-        }).fail(function () {
+        }).fail(() => {
             insert_function(user_id);
         });
     }
@@ -160,23 +155,13 @@ class Resources
             return;
         }
 
-        STUDIP.api.GET(
-            `course/${course_id}/members`,
-            {
-                data: {
-                    //The limit '0' results in a division by zero.
-                    //Hopefully, the limit is set to a value high enough:
-                    limit: 1000000
-                }
-            }
-        ).done(function (data) {
-            for (var attribute in data.collection) {
-                var user_id = data.collection[attribute].member.id;
+        STUDIP.jsonapi.GET(`courses/${course_id}/memberships`, {data: {page: {limit: 1000000}}}).done(data => {
+            data.data.forEach(membership => {
                 STUDIP.Resources.addUserToPermissionList(
-                    user_id,
+                    membership.relationships.user.data.id,
                     table_element
                 );
-            }
+            });
         });
     }
 
diff --git a/resources/assets/javascripts/lib/restapi.js b/resources/assets/javascripts/lib/restapi.js
deleted file mode 100644
index b6e31df..0000000
--- a/resources/assets/javascripts/lib/restapi.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import AbstractAPI from './abstract-api.js';
-
-// Actual RESTAPI object
-class RESTAPI extends AbstractAPI
-{
-    constructor() {
-        super('api.php');
-    }
-}
-
-export default RESTAPI;
-export const api = new RESTAPI();
diff --git a/vendor/oauth-php/LICENSE b/vendor/oauth-php/LICENSE
deleted file mode 100644
index fbdcc37..0000000
--- a/vendor/oauth-php/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License
-
-Copyright (c) 2007-2009 Mediamatic Lab
-Copyright (c) 2010 Corollarium Technologies
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/vendor/oauth-php/README b/vendor/oauth-php/README
deleted file mode 100644
index ecd6815..0000000
--- a/vendor/oauth-php/README
+++ /dev/null
@@ -1 +0,0 @@
-Please see http://code.google.com/p/oauth-php/ for documentation and help.
diff --git a/vendor/oauth-php/example/client/googledocs.php b/vendor/oauth-php/example/client/googledocs.php
deleted file mode 100644
index 45d66cc..0000000
--- a/vendor/oauth-php/example/client/googledocs.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth client for accessing Google Docs
- *
- * @author BBG
- *
- * 
- * The MIT License
- * 
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-include_once "../../library/OAuthStore.php";
-include_once "../../library/OAuthRequester.php";
-
-define("GOOGLE_CONSUMER_KEY", "FILL THIS"); // 
-define("GOOGLE_CONSUMER_SECRET", "FILL THIS"); // 
-
-define("GOOGLE_OAUTH_HOST", "https://www.google.com");
-define("GOOGLE_REQUEST_TOKEN_URL", GOOGLE_OAUTH_HOST . "/accounts/OAuthGetRequestToken");
-define("GOOGLE_AUTHORIZE_URL", GOOGLE_OAUTH_HOST . "/accounts/OAuthAuthorizeToken");
-define("GOOGLE_ACCESS_TOKEN_URL", GOOGLE_OAUTH_HOST . "/accounts/OAuthGetAccessToken");
-
-define('OAUTH_TMP_DIR', function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : realpath($_ENV["TMP"]));
-
-//  Init the OAuthStore
-$options = array(
-	'consumer_key' => GOOGLE_CONSUMER_KEY, 
-	'consumer_secret' => GOOGLE_CONSUMER_SECRET,
-	'server_uri' => GOOGLE_OAUTH_HOST,
-	'request_token_uri' => GOOGLE_REQUEST_TOKEN_URL,
-	'authorize_uri' => GOOGLE_AUTHORIZE_URL,
-	'access_token_uri' => GOOGLE_ACCESS_TOKEN_URL
-);
-// Note: do not use "Session" storage in production. Prefer a database
-// storage, such as MySQL.
-OAuthStore::instance("Session", $options);
-
-try
-{
-	//  STEP 1:  If we do not have an OAuth token yet, go get one
-	if (empty($_GET["oauth_token"]))
-	{
-		$getAuthTokenParams = array('scope' => 
-			'http://docs.google.com/feeds/',
-			'xoauth_displayname' => 'Oauth test',
-			'oauth_callback' => 'XXXXXXXXXXX');
-
-		// get a request token
-		$tokenResultParams = OAuthRequester::requestRequestToken(GOOGLE_CONSUMER_KEY, 0, $getAuthTokenParams);
-
-		//  redirect to the google authorization page, they will redirect back
-		header("Location: " . GOOGLE_AUTHORIZE_URL . "?btmpl=mobile&oauth_token=" . $tokenResultParams['token']);
-	}
-	else {
-		//  STEP 2:  Get an access token
-		$oauthToken = $_GET["oauth_token"];
-		
-		// echo "oauth_verifier = '" . $oauthVerifier . "'<br/>";
-		$tokenResultParams = $_GET;
-		
-		try {
-		    OAuthRequester::requestAccessToken(GOOGLE_CONSUMER_KEY, $oauthToken, 0, 'POST', $_GET);
-		}
-		catch (OAuthException2 $e)
-		{
-			var_dump($e);
-		    // Something wrong with the oauth_token.
-		    // Could be:
-		    // 1. Was already ok
-		    // 2. We were not authorized
-		    return;
-		}
-		
-		// make the docs requestrequest.
-		$request = new OAuthRequester("http://docs.google.com/feeds/documents/private/full", 'GET', $tokenResultParams);
-		$result = $request->doRequest(0);
-		if ($result['code'] == 200) {
-			var_dump($result['body']);
-		}
-		else {
-			echo 'Error';
-		}
-	}
-}
-catch(OAuthException2 $e) {
-	echo "OAuthException:  " . $e->getMessage();
-	var_dump($e);
-}
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/client/opera.php b/vendor/oauth-php/example/client/opera.php
deleted file mode 100644
index d881c98..0000000
--- a/vendor/oauth-php/example/client/opera.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth client for accessing my opera
- *
- * @author Ryan
- *
- * 
- * The MIT License
- * 
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- * Request your consumer key/secret here:
- * http://auth.opera.com/service/oauth/applications/
- * Make sure to set the Application callback URL
- * 
- * To make this example work change the following files
- *
- * OAuthRequestSigner.php	// Opera oAuth doesn't accept twice encoded signature
- * $this->setParam('oauth_signature',	$signature, true);
- * to:
- * $this->setParam('oauth_signature',		 urldecode($signature), true);
- */
-
-include_once "../../library/OAuthStore.php";
-include_once "../../library/OAuthRequester.php";
-
-define("OPERA_CONSUMER_KEY", "---");
-define("OPERA_CONSUMER_SECRET", "---");
-
-define("OPERA_REQUEST_TOKEN_URL", "https://auth.opera.com/service/oauth/request_token");
-define("OPERA_AUTHORIZE_URL", "https://auth.opera.com/service/oauth/authorize");
-define("OPERA_ACCESS_TOKEN_URL", "https://auth.opera.com/service/oauth/access_token");
-
-define('OAUTH_TMP_DIR', function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : realpath($_ENV["TMP"]));
-
-// Start the session
-session_start();
-
-//  Init the OAuthStore
-$options = array(
-	'consumer_key' => OPERA_CONSUMER_KEY, 
-	'consumer_secret' => OPERA_CONSUMER_SECRET,
-	'server_uri' => 'http://my.opera.com/community/api/',
-	'request_token_uri' => OPERA_REQUEST_TOKEN_URL,
-	'authorize_uri' => OPERA_AUTHORIZE_URL,
-	'access_token_uri' => OPERA_ACCESS_TOKEN_URL
-);
-// Note: do not use "Session" storage in production. Prefer a database
-// storage, such as MySQL.
-OAuthStore::instance("Session", $options);
-
-try
-{
-	//  STEP 1:  If we do not have an OAuth token yet, go get one
-	if (empty($_GET["oauth_verifier"]))
-	{
-		$getAuthTokenParams = array(
-			'oauth_callback'=>'oob'
-		);
-		$options = array (
-			'oauth_as_header' => false
-		);
-		
-		// get a request token
-		$tokenResultParams = OAuthRequester::requestRequestToken(OPERA_CONSUMER_KEY, 0, $getAuthTokenParams, 'POST', $options);
-		$_SESSION['oauth_token'] = $tokenResultParams['token'];
-
-		//  redirect to the opera authorization page, they will redirect back
-		header("Location: " . OPERA_AUTHORIZE_URL . "?oauth_token=" . $tokenResultParams['token']);
-	}
-	else {
-		//  STEP 2:  Get an access token
-		try {
-		    OAuthRequester::requestAccessToken(OPERA_CONSUMER_KEY, $_SESSION['oauth_token'], 0, 'POST', $options=array(
-				'oauth_verifier'=>$_GET['oauth_verifier']
-			));
-		}
-		catch (OAuthException2 $e)
-		{
-			var_dump($e);
-		    // Something wrong with the oauth_token.
-		    // Could be:
-		    // 1. Was already ok
-		    // 2. We were not authorized
-		    return;
-		}
-		
-		// make the docs requestrequest.
-		$request = new OAuthRequester("http://my.opera.com/community/api/users/status.pl", 'GET');
-		$result = $request->doRequest(0,array(
-			CURLOPT_HTTPHEADER=>array(
-				'Accept: application/json',
-			),
-		));
-		if ($result['code'] == 200) {
-			var_dump($result['body']);
-		}
-		else {
-			echo 'Error';
-		}
-	}
-}
-catch(OAuthException2 $e) {
-	echo "OAuthException:  " . $e->getMessage();
-	var_dump($e);
-}
-?>
diff --git a/vendor/oauth-php/example/client/twolegged.php b/vendor/oauth-php/example/client/twolegged.php
deleted file mode 100644
index a22c4fd..0000000
--- a/vendor/oauth-php/example/client/twolegged.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth client
- *
- * Performs simple 2-legged authentication
- *
- * @author Ben Hesketh
- *
- * 
- * The MIT License
- * 
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-include_once "../../library/OAuthStore.php";
-include_once "../../library/OAuthRequester.php";
-
-// Test of the OAuthStore2Leg 
-
-$key = '???????'; // fill with your public key 
-$secret = '????????'; // fill with your secret key
-$url = "?????????"; // fill with the url for the oauth service
-
-$options = array('consumer_key' => $key, 'consumer_secret' => $secret);
-OAuthStore::instance("2Leg", $options);
-
-$method = "GET";
-$params = null;
-
-try
-{
-	// Obtain a request object for the request we want to make
-	$request = new OAuthRequester($url, $method, $params);
-
-	// Sign the request, perform a curl request and return the results, 
-	// throws OAuthException2 exception on an error
-	// $result is an array of the form: array ('code'=>int, 'headers'=>array(), 'body'=>string)
-	$result = $request->doRequest();
-	
-	$response = $result['body'];
-	var_dump($response);
-}
-catch(OAuthException2 $e)
-{
-	echo "Exception";
-}
-
-?>
diff --git a/vendor/oauth-php/example/client/twoleggedtest.php b/vendor/oauth-php/example/client/twoleggedtest.php
deleted file mode 100644
index 0fc866b..0000000
--- a/vendor/oauth-php/example/client/twoleggedtest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth client
- *
- * Performs simple 2-legged authentication
- *
- * @author Ben Hesketh
- *
- * 
- * The MIT License
- * 
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-include_once "../../library/OAuthStore.php";
-include_once "../../library/OAuthRequester.php";
-
-// Test of the OAuthStore2Leg 
-// uses http://term.ie/oauth/example/
-
-$key = 'key'; // fill with your public key 
-$secret = 'secret'; // fill with your secret key
-$url = "http://term.ie/oauth/example/request_token.php"; // fill with the url for the oauth service
-
-$options = array('consumer_key' => $key, 'consumer_secret' => $secret);
-OAuthStore::instance("2Leg", $options);
-
-$method = "GET";
-$params = null;
-
-try
-{
-	// Obtain a request object for the request we want to make
-	$request = new OAuthRequester($url, $method, $params);
-
-	// Sign the request, perform a curl request and return the results, 
-	// throws OAuthException2 exception on an error
-	// $result is an array of the form: array ('code'=>int, 'headers'=>array(), 'body'=>string)
-	$result = $request->doRequest();
-	
-	$response = $result['body'];
-	
-	if ($response != 'oauth_token=requestkey&oauth_token_secret=requestsecret') 
-	{
-		echo 'Error! $response ' . $response;
-	}
-	else 
-	{
-	}
-
-
-	var_dump($response);
-}
-catch(OAuthException2 $e)
-{
-	echo "Exception" . $e->getMessage();
-}
-
-?>
diff --git a/vendor/oauth-php/example/client/twoleggedtwitter.php b/vendor/oauth-php/example/client/twoleggedtwitter.php
deleted file mode 100644
index 871c2a4..0000000
--- a/vendor/oauth-php/example/client/twoleggedtwitter.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth client
- *
- * Performs simple 2-legged authentication
- *
- * The MIT License
- * 
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-include_once "../../library/OAuthStore.php";
-include_once "../../library/OAuthRequester.php";
-
-// register at http://twitter.com/oauth_clients and fill these two 
-define("TWITTER_CONSUMER_KEY", "FILL THIS");
-define("TWITTER_CONSUMER_SECRET", "FILL THIS");
-
-define("TWITTER_OAUTH_HOST","https://twitter.com");
-define("TWITTER_REQUEST_TOKEN_URL", TWITTER_OAUTH_HOST . "/oauth/request_token");
-define("TWITTER_AUTHORIZE_URL", TWITTER_OAUTH_HOST . "/oauth/authorize");
-define("TWITTER_ACCESS_TOKEN_URL", TWITTER_OAUTH_HOST . "/oauth/access_token");
-define("TWITTER_PUBLIC_TIMELINE_API", TWITTER_OAUTH_HOST . "/statuses/public_timeline.json");
-define("TWITTER_UPDATE_STATUS_API", TWITTER_OAUTH_HOST . "/statuses/update.json");
-
-define('OAUTH_TMP_DIR', function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : realpath($_ENV["TMP"])); 
-
-// Twitter test
-$options = array('consumer_key' => TWITTER_CONSUMER_KEY, 'consumer_secret' => TWITTER_CONSUMER_SECRET);
-OAuthStore::instance("2Leg", $options);
-
-try
-{
-	// Obtain a request object for the request we want to make
-	$request = new OAuthRequester(TWITTER_REQUEST_TOKEN_URL, "POST");
-	$result = $request->doRequest(0);
-	parse_str($result['body'], $params);
-
-	// now make the request. 
-    $request = new OAuthRequester(TWITTER_PUBLIC_TIMELINE_API, 'GET', $params);
-    $result = $request->doRequest();
-}
-catch(OAuthException2 $e)
-{
-	echo "Exception" . $e->getMessage();
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/server/INSTALL b/vendor/oauth-php/example/server/INSTALL
deleted file mode 100644
index 249c85e..0000000
--- a/vendor/oauth-php/example/server/INSTALL
+++ /dev/null
@@ -1,53 +0,0 @@
-In this example I assume that oauth-php lives in /home/john/src/oauth-php
-
-
-1) Create a virtual host and set the DB_DSN VARIABLE to the DSN of your (mysql) database.
-
-Example
-<VirtualHost *>
-        ServerAdmin admin@localhost
-        ServerName hello.local
-        DocumentRoot /home/john/src/oauth-php/example/server/www
-
-        UseCanonicalName Off
-        ServerSignature On
-
-        SetEnv DB_DSN mysql://foo:bar@localhost/oauth_example_server_db
-
-        <Directory "home/john/src/oauth-php/example/server/www">
-                Options Indexes FollowSymLinks MultiViews
-                AllowOverride None
-                Order allow,deny
-                Allow from all
-
-                <IfModule mod_php5.c>
-                  php_value magic_quotes_gpc                0
-                  php_value register_globals                0
-                  php_value session.auto_start              0
-                </IfModule>
-
-        </Directory>
-</VirtualHost>
-
-
-2) Create the database structure for the server:
-
-# mysql -u foo -p bar -h localhost < /home/john/src/oauth-php/library/store/mysql/mysql.sql
-
-
-
-3) Download and install smarty into the smarty/core/smarty directory:
-
-# cd /home/john/src/oauth-php/example/server/core
-# wget 'http://www.smarty.net/do_download.php?download_file=Smarty-2.6.19.tar.gz'
-# tar zxf Smarty-2.6.19.tar.gz
-# mv Smarty-2.6.19 smarty
-
-
-4) That's it! Point your browser to 
-
-  http://hello.local/
-
-To get started.
-
-Arjan Scherpenisse <arjan@mediamatic.nl>, July 2008
diff --git a/vendor/oauth-php/example/server/core/init.php b/vendor/oauth-php/example/server/core/init.php
deleted file mode 100644
index 82c65db..0000000
--- a/vendor/oauth-php/example/server/core/init.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth server
- *
- * Global initialization file for the server, defines some helper
- * functions, required includes, and starts the session.
- *
- * @author Arjan Scherpenisse <arjan@scherpenisse.net>
- *
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-/*
- * Simple 'user management'
- */
-define ('USERNAME', 'sysadmin');
-define ('PASSWORD', 'sysadmin');
-
-
-/*
- * Always announce XRDS OAuth discovery
- */
-header('X-XRDS-Location: http://' . $_SERVER['SERVER_NAME'] . '/services.xrds');
-
-
-/*
- * Initialize the database connection
- */
-$info = parse_url(getenv('DB_DSN'));
-($GLOBALS['db_conn'] = mysql_connect($info['host'], $info['user'], $info['pass'])) || die(mysql_error());
-mysql_select_db(basename($info['path']), $GLOBALS['db_conn']) || die(mysql_error());
-unset($info);
-
-
-require_once '../../../library/OAuthServer.php';
-
-/*
- * Initialize OAuth store
- */
-require_once '../../../library/OAuthStore.php';
-OAuthStore::instance('MySQL', array('conn' => $GLOBALS['db_conn']));
-
-
-/*
- * Session
- */
-session_start();
-
-
-/*
- * Template handling
- */
-require_once 'smarty/libs/Smarty.class.php';
-function session_smarty()
-{
-	if (!isset($GLOBALS['smarty']))
-	{
-		$GLOBALS['smarty'] = new Smarty;
-		$GLOBALS['smarty']->template_dir = dirname(__FILE__) . '/templates/';
-		$GLOBALS['smarty']->compile_dir = dirname(__FILE__) . '/../cache/templates_c';
-	}
-	
-	return $GLOBALS['smarty'];
-}
-
-function assert_logged_in()
-{
-	if (empty($_SESSION['authorized']))
-	{
-		$uri = $_SERVER['REQUEST_URI'];
-		header('Location: /logon?goto=' . urlencode($uri));
-		exit();
-	}
-}
-
-function assert_request_vars()
-{
-	foreach(func_get_args() as $a)
-	{
-		if (!isset($_REQUEST[$a]))
-		{
-			header('HTTP/1.1 400 Bad Request');
-			echo 'Bad request.';
-			exit;
-		}
-	}
-}
-
-function assert_request_vars_all()
-{
-	foreach($_REQUEST as $row)
-	{
-		foreach(func_get_args() as $a)
-		{
-			if (!isset($row[$a]))
-			{
-				header('HTTP/1.1 400 Bad Request');
-				echo 'Bad request.';
-				exit;
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/server/core/templates/inc/footer.tpl b/vendor/oauth-php/example/server/core/templates/inc/footer.tpl
deleted file mode 100644
index 308b1d0..0000000
--- a/vendor/oauth-php/example/server/core/templates/inc/footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-</body>
-</html>
diff --git a/vendor/oauth-php/example/server/core/templates/inc/header.tpl b/vendor/oauth-php/example/server/core/templates/inc/header.tpl
deleted file mode 100644
index 5046f54..0000000
--- a/vendor/oauth-php/example/server/core/templates/inc/header.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<html>
-    <body>
diff --git a/vendor/oauth-php/example/server/core/templates/index.tpl b/vendor/oauth-php/example/server/core/templates/index.tpl
deleted file mode 100644
index 7b06553..0000000
--- a/vendor/oauth-php/example/server/core/templates/index.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{include file='inc/header.tpl'}
-
-<h1>OAuth server</h1>
-Go to:
-
-<ul>
-  <li><a href="/logon">Logon</a></li>
-  <li><a href="/register">Register your consumer</a></li>
-</ul>
-
-Afterwards, make an OAuth test request to <strong>http://{$smarty.server.name}/hello</strong> to test your connection.</p>
-
-{include file='inc/footer.tpl'}
diff --git a/vendor/oauth-php/example/server/core/templates/logon.tpl b/vendor/oauth-php/example/server/core/templates/logon.tpl
deleted file mode 100644
index 5ccd432..0000000
--- a/vendor/oauth-php/example/server/core/templates/logon.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{include file='inc/header.tpl'}
-
-<h1>Login</h1>
-
-<form method="post">
-    <input type="hidden" name="goto" value="{$smarty.request.goto}" />
-
-    <label for="username">User name</label><br />
-    <input type="text" name="username" id="username" />
-    
-    <br /><br />
-
-    <label for="password">Password</label><br />
-    <input type="text" name="password" id="password" />
-
-    <br /><br />
-    
-    <input type="submit" value="Login" />
-</form>
-
-{include file='inc/footer.tpl'}
diff --git a/vendor/oauth-php/example/server/core/templates/register.tpl b/vendor/oauth-php/example/server/core/templates/register.tpl
deleted file mode 100644
index 0e28c15..0000000
--- a/vendor/oauth-php/example/server/core/templates/register.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{include file='inc/header.tpl'}
-
-<h1>Register server</h1>
-
-<p>Register a server which is gonna act as an identity client.</p>
-
-<form method="post">
-
-    <fieldset>
-	<legend>About You</legend>
-	
-	<p>
-	    <label for="requester_name">Your name</label><br/>
-	    <input class="text" id="requester_name"  name="requester_name" type="text" value="{$consumer.requester_name|default:$smarty.request.requester_name|escape}" />
-	</p>
-	
-	<p>
-	    <label for="requester_email">Your email address</label><br/>
-	    <input class="text" id="requester_email"  name="requester_email" type="text" value="{$consumer.requester_email|default:$smarty.request.requester_email|escape}" />
-	</p>
-    </fieldset>
-    
-    <fieldset>
-	<legend>Location Of Your Application Or Site</legend>
-	
-	<p>
-	    <label for="application_uri">URL of your application or site</label><br/>
-	    <input id="application_uri" class="text" name="application_uri" type="text" value="{$consumer.application_uri|default:$smarty.request.application_uri|escape}" />
-	</p>
-	
-	<p>
-	    <label for="callback_uri">Callback URL</label><br/>
-	    <input id="callback_uri" class="text" name="callback_uri" type="text" value="{$consumer.callback_uri|default:$smarty.request.callback_uri|escape}" />
-	</p>
-    </fieldset>
-
-    <br />
-    <input type="submit" value="Register server" />
-</form>
-
-{include file='inc/footer.tpl'}
diff --git a/vendor/oauth-php/example/server/www/hello.php b/vendor/oauth-php/example/server/www/hello.php
deleted file mode 100644
index 12526a9..0000000
--- a/vendor/oauth-php/example/server/www/hello.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth server
- *
- * An example service, http://hostname/hello. You will only get the
- * 'Hello, world!' string back if you have signed your request with
- * oauth.
- *
- * @author Arjan Scherpenisse <arjan@scherpenisse.net>
- *
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once '../core/init.php';
-
-$authorized = false;
-$server = new OAuthServer();
-try
-{
-	if ($server->verifyIfSigned())
-	{
-		$authorized = true;
-	}
-}
-catch (OAuthException2 $e)
-{
-}
-
-if (!$authorized)
-{
-	header('HTTP/1.1 401 Unauthorized');
-	header('Content-Type: text/plain');
-	
-	echo "OAuth Verification Failed: " . $e->getMessage();
-	die;
-}
-
-// From here on we are authenticated with OAuth.
-
-header('Content-type: text/plain');
-echo 'Hello, world!';
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/server/www/index.php b/vendor/oauth-php/example/server/www/index.php
deleted file mode 100644
index f5cadbe..0000000
--- a/vendor/oauth-php/example/server/www/index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth server
- *
- * @author Arjan Scherpenisse <arjan@scherpenisse.net>
- *
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require '../core/init.php';
-
-$smarty = session_smarty();
-$smarty->display('index.tpl');
-
-?>
diff --git a/vendor/oauth-php/example/server/www/logon.php b/vendor/oauth-php/example/server/www/logon.php
deleted file mode 100644
index 5c937b7..0000000
--- a/vendor/oauth-php/example/server/www/logon.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth server
- *
- * Simple logon for consumer registration at this server.
- *
- * @author Arjan Scherpenisse <arjan@scherpenisse.net>
- *
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once '../core/init.php';
-
-if (isset($_POST['username']) && isset($_POST['password']))
-{
-	if ($_POST['username'] == USERNAME && $_POST['password'] == PASSWORD)
-	{
-		$_SESSION['authorized'] = true;
-		if (!empty($_REQUEST['goto']))
-		{
-			header('Location: ' . $_REQUEST['goto']);
-			die;
-		}
-
-		echo "Logon succesfull.";
-		die;
-	}
-}
-
-$smarty = session_smarty();
-$smarty->display('logon.tpl');
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/server/www/oauth.php b/vendor/oauth-php/example/server/www/oauth.php
deleted file mode 100644
index 6dafd61..0000000
--- a/vendor/oauth-php/example/server/www/oauth.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth server
- *
- * This file implements the OAuth server endpoints. The most basic
- * implementation of an OAuth server.
- *
- * Call with: /oauth/request_token, /oauth/authorize, /oauth/access_token
- *
- * @author Arjan Scherpenisse <arjan@scherpenisse.net>
- *
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once '../core/init.php';
-
-$server = new OAuthServer();
-
-switch($_SERVER['PATH_INFO'])
-{
-case '/request_token':
-	$server->requestToken();
-	exit;
-
-case '/access_token':
-	$server->accessToken();
-	exit;
-
-case '/authorize':
-	# logon
-
-	assert_logged_in();
-
-	try
-	{
-		$server->authorizeVerify();
-		$server->authorizeFinish(true, 1);
-	}
-	catch (OAuthException2 $e)
-	{
-		header('HTTP/1.1 400 Bad Request');
-		header('Content-Type: text/plain');
-		
-		echo "Failed OAuth Request: " . $e->getMessage();
-	}
-	exit;
-
-	
-default:
-	header('HTTP/1.1 500 Internal Server Error');
-	header('Content-Type: text/plain');
-	echo "Unknown request";
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/server/www/register.php b/vendor/oauth-php/example/server/www/register.php
deleted file mode 100644
index 0a74297..0000000
--- a/vendor/oauth-php/example/server/www/register.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-require_once '../core/init.php';
-
-assert_logged_in();
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST')
-{
-	try
-	{
-		$store = OAuthStore::instance();
-		$user_id = 1; // this should not be hardcoded, of course
-		$key   = $store->updateConsumer($_POST, $user_id, true);
-
-		$c = $store->getConsumer($key, $user_id);
-		echo 'Your consumer key is: <strong>' . $c['consumer_key'] . '</strong><br />';
-		echo 'Your consumer secret is: <strong>' . $c['consumer_secret'] . '</strong><br />';
-	}
-	catch (OAuthException2 $e)
-	{
-		echo '<strong>Error: ' . $e->getMessage() . '</strong><br />';
-	}
-}
-		
-
-$smarty = session_smarty();
-$smarty->display('register.tpl');
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/example/server/www/services.xrds.php b/vendor/oauth-php/example/server/www/services.xrds.php
deleted file mode 100644
index 0f4bbac..0000000
--- a/vendor/oauth-php/example/server/www/services.xrds.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * oauth-php: Example OAuth server
- *
- * XRDS discovery for OAuth. This file helps the consumer program to
- * discover where the OAuth endpoints for this server are.
- *
- * @author Arjan Scherpenisse <arjan@scherpenisse.net>
- *
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-header('Content-Type: application/xrds+xml');
-
-$server = $_SERVER['SERVER_NAME'];
-
-echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
-
-?>
-<XRDS xmlns="xri://$xrds">
-    <XRD xmlns:simple="http://xrds-simple.net/core/1.0" xmlns="xri://$XRD*($v*2.0)" xmlns:openid="http://openid.net/xmlns/1.0" version="2.0" xml:id="main">
-	<Type>xri://$xrds*simple</Type>
-	<Service>
-	    <Type>http://oauth.net/discovery/1.0</Type>
-	    <URI>#main</URI>
-	</Service>
-	<Service>
-	    <Type>http://oauth.net/core/1.0/endpoint/request</Type>
-	    <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-	    <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-	    <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-	    <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-	    <URI>http://<?php echo $server; ?>/oauth/request_token</URI>
-	</Service>
-	<Service>
-	    <Type>http://oauth.net/core/1.0/endpoint/authorize</Type>
-	    <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-	    <URI>http://<?php echo $server; ?>/oauth/authorize</URI>
-	</Service>
-	<Service>
-	    <Type>http://oauth.net/core/1.0/endpoint/access</Type>
-	    <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-	    <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-	    <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-	    <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-	    <URI>http://<?php echo $server; ?>/oauth/access_token</URI>
-	</Service>
-    </XRD>
-</XRDS>
diff --git a/vendor/oauth-php/library/OAuthDiscovery.php b/vendor/oauth-php/library/OAuthDiscovery.php
deleted file mode 100644
index 8eee118..0000000
--- a/vendor/oauth-php/library/OAuthDiscovery.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * Handle the discovery of OAuth service provider endpoints and static consumer identity.
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 4, 2008 5:05:19 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__).'/discovery/xrds_parse.php';
-
-require_once dirname(__FILE__).'/OAuthException2.php';
-require_once dirname(__FILE__).'/OAuthRequestLogger.php';
-
-
-class OAuthDiscovery
-{
-	/**
-	 * Return a description how we can do a consumer allocation.  Prefers static allocation if
-	 * possible.  If static allocation is possible
-	 * 
-	 * See also: http://oauth.net/discovery/#consumer_identity_types
-	 * 
-	 * @param string uri
-	 * @return array		provider description
-	 */
-	static function discover ( $uri )
-	{
-		// See what kind of consumer allocations are available
-		$xrds_file = self::discoverXRDS($uri);
-		if (!empty($xrds_file))
-		{
-			$xrds = xrds_parse($xrds_file);
-			if (empty($xrds))
-			{
-				throw new OAuthException2('Could not discover OAuth information for '.$uri);
-			}
-		}
-		else
-		{
-			throw new OAuthException2('Could not discover XRDS file at '.$uri);
-		}
-
-		// Fill an OAuthServer record for the uri found
-		$ps			= parse_url($uri);
-		$host		= isset($ps['host']) ? $ps['host'] : 'localhost';
-		$server_uri = $ps['scheme'].'://'.$host.'/';
-
-		$p = array(
-				'user_id'			=> null,
-				'consumer_key'		=> '',
-				'consumer_secret'	=> '',
-				'signature_methods'	=> '',
-				'server_uri'		=> $server_uri,
-				'request_token_uri'	=> '',
-				'authorize_uri'		=> '',
-				'access_token_uri'	=> ''
-			);
-
-
-		// Consumer identity (out of bounds or static)
-		if (isset($xrds['consumer_identity']))
-		{
-			// Try to find a static consumer allocation, we like those :)
-			foreach ($xrds['consumer_identity'] as $ci)
-			{
-				if ($ci['method'] == 'static' && !empty($ci['consumer_key']))
-				{
-					$p['consumer_key']    = $ci['consumer_key'];
-					$p['consumer_secret'] = '';
-				}
-				else if ($ci['method'] == 'oob' && !empty($ci['uri']))
-				{
-					// TODO: Keep this uri somewhere for the user?
-					$p['consumer_oob_uri'] = $ci['uri'];
-				}
-			}
-		}
-
-		// The token uris
-		if (isset($xrds['request'][0]['uri']))
-		{
-			$p['request_token_uri'] = $xrds['request'][0]['uri'];
-			if (!empty($xrds['request'][0]['signature_method']))
-			{
-				$p['signature_methods'] = $xrds['request'][0]['signature_method'];
-			}
-		}
-		if (isset($xrds['authorize'][0]['uri']))
-		{
-			$p['authorize_uri'] = $xrds['authorize'][0]['uri'];
-			if (!empty($xrds['authorize'][0]['signature_method']))
-			{
-				$p['signature_methods'] = $xrds['authorize'][0]['signature_method'];
-			}
-		}
-		if (isset($xrds['access'][0]['uri']))
-		{
-			$p['access_token_uri'] = $xrds['access'][0]['uri'];
-			if (!empty($xrds['access'][0]['signature_method']))
-			{
-				$p['signature_methods'] = $xrds['access'][0]['signature_method'];
-			}
-		}
-		return $p;
-	}
-	
-	
-	/**
-	 * Discover the XRDS file at the uri.  This is a bit primitive, you should overrule
-	 * this function so that the XRDS file can be cached for later referral.
-	 * 
-	 * @param string uri
-	 * @return string		false when no XRDS file found
-	 */
-	static protected function discoverXRDS ( $uri, $recur = 0 )
-	{
-		// Bail out when we are following redirects
-		if ($recur > 10)
-		{
-			return false;
-		}
-		
-		$data = self::curl($uri);
-
-		// Check what we got back, could be:
-		// 1. The XRDS discovery file itself (check content-type)
-		// 2. The X-XRDS-Location header
-		
-		if (is_string($data) && !empty($data))
-		{
-			list($head,$body) = explode("\r\n\r\n", $data);
-			$body = trim($body);
-			$m	  = false;
-
-			// See if we got the XRDS file itself or we have to follow a location header
-			if (	preg_match('/^Content-Type:\s*application\/xrds+xml/im', $head)
-				||	preg_match('/^<\?xml[^>]*\?>\s*<xrds\s/i', $body)
-				||	preg_match('/^<xrds\s/i', $body)
-				)
-			{
-				$xrds = $body;
-			}
-			else if (	preg_match('/^X-XRDS-Location:\s*([^\r\n]*)/im', $head, $m)
-					||	preg_match('/^Location:\s*([^\r\n]*)/im', $head, $m))
-			{
-				// Recurse to the given location
-				if ($uri != $m[1])
-				{
-					$xrds = self::discoverXRDS($m[1], $recur+1);
-				}
-				else
-				{
-					// Referring to the same uri, bail out
-					$xrds = false;
-				}
-			}
-			else
-			{
-				// Not an XRDS file an nowhere else to check
-				$xrds = false;
-			}
-		}
-		else
-		{
-			$xrds = false;
-		}
-		return $xrds;
-	}
-	
-	
-	/**
-	 * Try to fetch an XRDS file at the given location.  Sends an accept header preferring the xrds file.
-	 * 
-	 * @param string uri
-	 * @return array	(head,body), false on an error
-	 */
-	static protected function curl ( $uri )
-	{
-		$ch = curl_init();
-
-		curl_setopt($ch, CURLOPT_HTTPHEADER,	 array('Accept: application/xrds+xml, */*;q=0.1'));
-		curl_setopt($ch, CURLOPT_USERAGENT,		 'anyMeta/OAuth 1.0 - (OAuth Discovery $LastChangedRevision: 45 $)');
-		curl_setopt($ch, CURLOPT_URL, 			 $uri);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_HEADER, 		 true);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 		 30);
-
-		$txt = curl_exec($ch);
-		curl_close($ch);
-
-		// Tell the logger what we requested and what we received back
-		$data = "GET $uri";
-		OAuthRequestLogger::setSent($data, "");
-		OAuthRequestLogger::setReceived($txt);
-
-		return $txt;
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthException2.php b/vendor/oauth-php/library/OAuthException2.php
deleted file mode 100644
index 30fc80e..0000000
--- a/vendor/oauth-php/library/OAuthException2.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Simple exception wrapper for OAuth
- * 
- * @version $Id: OAuthException2.php 67 2010-01-12 18:42:04Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 29, 2007 5:33:54 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// TODO: something with the HTTP return code matching to the problem
-
-require_once dirname(__FILE__) . '/OAuthRequestLogger.php';
-
-class OAuthException2 extends Exception
-{
-	function __construct ( $message )
-	{
-		Exception::__construct($message);
-		OAuthRequestLogger::addNote('OAuthException2: '.$message);
-	}
-
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthRequest.php b/vendor/oauth-php/library/OAuthRequest.php
deleted file mode 100644
index 41448a3..0000000
--- a/vendor/oauth-php/library/OAuthRequest.php
+++ /dev/null
@@ -1,854 +0,0 @@
-<?php
-
-/**
- * Request wrapper class.  Prepares a request for consumption by the OAuth routines
- *
- * @version $Id: OAuthRequest.php 186 2011-02-18 15:46:18Z scherpenisse $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 12:20:31 PM
- *
- * The MIT License
- *
- * Copyright (c) 2007-2008 Mediamatic Lab
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__) . '/OAuthException2.php';
-
-/**
- * Object to parse an incoming OAuth request or prepare an outgoing OAuth request
- */
-class OAuthRequest
-{
-	/* the realm for this request */
-	protected $realm;
-
-	/* all the parameters, RFC3986 encoded name/value pairs */
-	protected $param = array();
-
-	/* the parsed request uri */
-	protected $uri_parts;
-
-	/* the raw request uri */
-	protected $uri;
-
-	/* the request headers */
-	protected $headers;
-
-	/* the request method */
-	protected $method;
-
-	/* the body of the OAuth request */
-	protected $body;
-
-
-	/**
-	 * Construct from the current request. Useful for checking the signature of a request.
-	 * When not supplied with any parameters this will use the current request.
-	 *
-	 * @param string	uri				might include parameters
-	 * @param string	method			GET, PUT, POST etc.
-	 * @param string	parameters		additional post parameters, urlencoded (RFC1738)
-	 * @param array		headers			headers for request
-	 * @param string	body			optional body of the OAuth request (POST or PUT)
-	 */
-	function __construct ( $uri = null, $method = null, $parameters = '', $headers = array(), $body = null )
-	{
-		if (is_object($_SERVER))
-		{
-			// Tainted arrays - the normal stuff in anyMeta
-			if (!$method) {
-				$method	= $_SERVER->REQUEST_METHOD->getRawUnsafe();
-			}
-			if (empty($uri)) {
-				$uri	= $_SERVER->REQUEST_URI->getRawUnsafe();
-				$proto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
-				if (strpos($uri, "://") === false) {
-					$uri = sprintf('%s://%s%s', $proto, $_SERVER->HTTP_HOST->getRawUnsafe(), $uri);
-				}
-			}
-		}
-		else
-		{
-			// non anyMeta systems
-			if (!$method) {
-				if (isset($_SERVER['REQUEST_METHOD'])) {
-					$method	= $_SERVER['REQUEST_METHOD'];
-				}
-				else {
-					$method = 'GET';
-				}
-			}
-			$proto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
-			if (empty($uri)) {
-				if (strpos($_SERVER['REQUEST_URI'], "://") !== false) {
-					$uri = $_SERVER['REQUEST_URI'];
-				}
-				else {
-					$uri = sprintf('%s://%s%s', $proto, $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI']);
-				}
-			}
-		}
-		$headers      = OAuthRequestLogger::getAllHeaders();
-		$this->method = strtoupper($method);
-
-		// If this is a post then also check the posted variables
-		if (strcasecmp($method, 'POST') == 0)
-		{
-			// TODO: what to do with 'multipart/form-data'?
-			if ($this->getRequestContentType() == 'multipart/form-data')
-			{
-				// Get the posted body (when available)
-				if (!isset($headers['X-OAuth-Test']))
-				{
-					$parameters .= $this->getRequestBodyOfMultipart();
-				}
-			}
-			if ($this->getRequestContentType() == 'application/x-www-form-urlencoded')
-			{
-				// Get the posted body (when available)
-				if (!isset($headers['X-OAuth-Test']))
-				{
-					$parameters .= $this->getRequestBody();
-				}
-			}
-			else
-			{
-				$body = $this->getRequestBody();
-			}
-		}
-		else if (strcasecmp($method, 'PUT') == 0)
-		{
-			$body = $this->getRequestBody();
-		}
-
-		$this->method  = strtoupper($method);
-		$this->headers = $headers;
-		// Store the values, prepare for oauth
-		$this->uri     = $uri;
-		$this->body    = $body;
-		$this->parseUri($parameters);
-		$this->parseHeaders();
-		$this->transcodeParams();
-	}
-
-
-	/**
-	 * Return the signature base string.
-	 * Note that we can't use rawurlencode due to specified use of RFC3986.
-	 *
-	 * @return string
-	 */
-	function signatureBaseString ()
-	{
-		$sig 	= array();
-		$sig[]	= $this->method;
-		$sig[]	= $this->getRequestUrl();
-		$sig[]	= $this->getNormalizedParams();
-
-		return implode('&', array_map(array($this, 'urlencode'), $sig));
-	}
-
-
-	/**
-	 * Calculate the signature of the request, using the method in oauth_signature_method.
-	 * The signature is returned encoded in the form as used in the url.  So the base64 and
-	 * urlencoding has been done.
-	 *
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string token_type
-	 * @exception when not all parts available
-	 * @return string
-	 */
-	function calculateSignature ( $consumer_secret, $token_secret, $token_type = 'access' )
-	{
-		$required = array(
-						'oauth_consumer_key',
-						'oauth_signature_method',
-						'oauth_timestamp',
-						'oauth_nonce'
-					);
-
-		if ($token_type != 'requestToken')
-		{
-			$required[] = 'oauth_token';
-		}
-
-		foreach ($required as $req)
-		{
-			if (!isset($this->param[$req]))
-			{
-				throw new OAuthException2('Can\'t sign request, missing parameter "'.$req.'"');
-			}
-		}
-
-		$this->checks();
-
-		$base      = $this->signatureBaseString();
-		$signature = $this->calculateDataSignature($base, $consumer_secret, $token_secret, $this->param['oauth_signature_method']);
-		return $signature;
-	}
-
-
-	/**
-	 * Calculate the signature of a string.
-	 * Uses the signature method from the current parameters.
-	 *
-	 * @param string 	data
-	 * @param string	consumer_secret
-	 * @param string	token_secret
-	 * @param string 	signature_method
-	 * @exception OAuthException2 thrown when the signature method is unknown
-	 * @return string signature
-	 */
-	function calculateDataSignature ( $data, $consumer_secret, $token_secret, $signature_method )
-	{
-		if (is_null($data))
-		{
-			$data = '';
-		}
-
-		$sig = $this->getSignatureMethod($signature_method);
-		return $sig->signature($this, $data, $consumer_secret, $token_secret);
-	}
-
-
-	/**
-	 * Select a signature method from the list of available methods.
-	 * We try to check the most secure methods first.
-	 *
-	 * @todo Let the signature method tell us how secure it is
-	 * @param array methods
-	 * @exception OAuthException2 when we don't support any method in the list
-	 * @return string
-	 */
-	public function selectSignatureMethod ( $methods )
-	{
-		if (in_array('HMAC-SHA1', $methods))
-		{
-			$method = 'HMAC-SHA1';
-		}
-		else if (in_array('MD5', $methods))
-		{
-			$method = 'MD5';
-		}
-		else
-		{
-			$method = false;
-			foreach ($methods as $m)
-			{
-				$m = strtoupper($m);
-				$m2 = preg_replace('/[^A-Z0-9]/', '_', $m);
-				if (file_exists(dirname(__FILE__).'/signature_method/OAuthSignatureMethod_'.$m2.'.php'))
-				{
-					$method = $m;
-					break;
-				}
-			}
-
-			if (empty($method))
-			{
-				throw new OAuthException2('None of the signing methods is supported.');
-			}
-		}
-		return $method;
-	}
-
-
-	/**
-	 * Fetch the signature object used for calculating and checking the signature base string
-	 *
-	 * @param string method
-	 * @return OAuthSignatureMethod object
-	 */
-	function getSignatureMethod ( $method )
-	{
-		$m     = strtoupper($method);
-		$m     = preg_replace('/[^A-Z0-9]/', '_', $m);
-		$class = 'OAuthSignatureMethod_'.$m;
-
-		if (file_exists(dirname(__FILE__).'/signature_method/'.$class.'.php'))
-		{
-			require_once dirname(__FILE__).'/signature_method/'.$class.'.php';
-			$sig = new $class();
-		}
-		else
-		{
-			throw new OAuthException2('Unsupported signature method "'.$m.'".');
-		}
-		return $sig;
-	}
-
-
-	/**
-	 * Perform some sanity checks.
-	 *
-	 * @exception OAuthException2 thrown when sanity checks failed
-	 */
-	function checks ()
-	{
-		if (isset($this->param['oauth_version']))
-		{
-			$version = $this->urldecode($this->param['oauth_version']);
-			if ($version != '1.0')
-			{
-				throw new OAuthException2('Expected OAuth version 1.0, got "'.$this->param['oauth_version'].'"');
-			}
-		}
-	}
-
-
-	/**
-	 * Return the request method
-	 *
-	 * @return string
-	 */
-	function getMethod ()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Return the complete parameter string for the signature check.
-	 * All parameters are correctly urlencoded and sorted on name and value
-	 *
-	 * @return string
-	 */
-	function getNormalizedParams ()
-	{
-		/*
-		// sort by name, then by value
-		// (needed when we start allowing multiple values with the same name)
-		$keys   = array_keys($this->param);
-		$values = array_values($this->param);
-		array_multisort($keys, SORT_ASC, $values, SORT_ASC);
-		*/
-		$params     = $this->param;
-		$normalized = array();
-
-		ksort($params);
-		foreach ($params as $key => $value)
-		{
-			// all names and values are already urlencoded, exclude the oauth signature
-			if ($key != 'oauth_signature')
-			{
-				if (is_array($value))
-				{
-					$value_sort = $value;
-					sort($value_sort);
-					foreach ($value_sort as $v)
-					{
-						$normalized[] = $key.'='.$v;
-					}
-				}
-				else
-				{
-					$normalized[] = $key.'='.$value;
-				}
-			}
-		}
-		return implode('&', $normalized);
-	}
-
-
-	/**
-	 * Return the normalised url for signature checks
-	 */
-	function getRequestUrl ()
-	{
-		$url =  $this->uri_parts['scheme'] . '://'
-			  . $this->uri_parts['user'] . (!empty($this->uri_parts['pass']) ? ':' : '')
-			  . $this->uri_parts['pass'] . (!empty($this->uri_parts['user']) ? '@' : '')
-			  . $this->uri_parts['host'];
-
-		if (	$this->uri_parts['port']
-			&&	$this->uri_parts['port'] != $this->defaultPortForScheme($this->uri_parts['scheme']))
-		{
-			$url .= ':'.$this->uri_parts['port'];
-		}
-		if (!empty($this->uri_parts['path']))
-		{
-			$url .= $this->uri_parts['path'];
-		}
-		return $url;
-	}
-
-
-	/**
-	 * Get a parameter, value is always urlencoded
-	 *
-	 * @param string	name
-	 * @param boolean	urldecode	set to true to decode the value upon return
-	 * @return string value		false when not found
-	 */
-	function getParam ( $name, $urldecode = false )
-	{
-		if (isset($this->param[$name]))
-		{
-			$s = $this->param[$name];
-		}
-		else if (isset($this->param[$this->urlencode($name)]))
-		{
-			$s = $this->param[$this->urlencode($name)];
-		}
-		else
-		{
-			$s = false;
-		}
-		if (!empty($s) && $urldecode)
-		{
-			if (is_array($s))
-			{
-				$s = array_map(array($this,'urldecode'), $s);
-			}
-			else
-			{
-				$s = $this->urldecode($s);
-			}
-		}
-		return $s;
-	}
-
-	/**
-	 * Set a parameter
-	 *
-	 * @param string	name
-	 * @param string	value
-	 * @param boolean	encoded	set to true when the values are already encoded
-	 */
-	function setParam ( $name, $value, $encoded = false )
-	{
-		if (!$encoded)
-		{
-			$name_encoded = $this->urlencode($name);
-			if (is_array($value))
-			{
-				foreach ($value as $v)
-				{
-					$this->param[$name_encoded][] = $this->urlencode($v);
-				}
-			}
-			else
-			{
-				$this->param[$name_encoded] = $this->urlencode($value);
-			}
-		}
-		else
-		{
-			$this->param[$name] = $value;
-		}
-	}
-
-
-	/**
-	 * Re-encode all parameters so that they are encoded using RFC3986.
-	 * Updates the $this->param attribute.
-	 */
-	protected function transcodeParams ()
-	{
-		$params      = $this->param;
-		$this->param = array();
-
-		foreach ($params as $name=>$value)
-		{
-			if (is_array($value))
-			{
-				$this->param[$this->urltranscode($name)] = array_map(array($this,'urltranscode'), $value);
-			}
-			else
-			{
-				$this->param[$this->urltranscode($name)] = $this->urltranscode($value);
-			}
-		}
-	}
-
-
-
-	/**
-	 * Return the body of the OAuth request.
-	 *
-	 * @return string		null when no body
-	 */
-	function getBody ()
-	{
-		return $this->body;
-	}
-
-
-	/**
-	 * Return the body of the OAuth request.
-	 *
-	 * @return string		null when no body
-	 */
-	function setBody ( $body )
-	{
-		$this->body = $body;
-	}
-
-
-	/**
-	 * Parse the uri into its parts.  Fill in the missing parts.
-	 *
-	 * @param string $parameters  optional extra parameters (from eg the http post)
-	 */
-	protected function parseUri ( $parameters )
-	{
-		$ps = @parse_url($this->uri);
-
-		// Get the current/requested method
-		$ps['scheme'] = strtolower($ps['scheme']);
-
-		// Get the current/requested host
-		if (function_exists('mb_strtolower'))
-			$ps['host'] = mb_strtolower($ps['host']);
-		else
-			$ps['host'] = strtolower($ps['host']);
-
-		if (!preg_match('/^[a-z0-9\.\-]+$/', $ps['host']))
-		{
-			throw new OAuthException2('Unsupported characters in host name');
-		}
-
-		// Get the port we are talking on
-		if (empty($ps['port']))
-		{
-			$ps['port'] = $this->defaultPortForScheme($ps['scheme']);
-		}
-
-		if (empty($ps['user']))
-		{
-			$ps['user'] = '';
-		}
-		if (empty($ps['pass']))
-		{
-			$ps['pass'] = '';
-		}
-		if (empty($ps['path']))
-		{
-			$ps['path'] = '/';
-		}
-		if (empty($ps['query']))
-		{
-			$ps['query'] = '';
-		}
-		if (empty($ps['fragment']))
-		{
-			$ps['fragment'] = '';
-		}
-
-		// Now all is complete - parse all parameters
-		foreach (array($ps['query'], $parameters) as $params)
-		{
-			if (strlen($params) > 0)
-			{
-				$params = explode('&', $params);
-				foreach ($params as $p)
-				{
-					@list($name, $value) = explode('=', $p, 2);
-					if (!strlen($name))
-					{
-						continue;
-					}
-
-					if (array_key_exists($name, $this->param))
-					{
-						if (is_array($this->param[$name]))
-							$this->param[$name][] = $value;
-						else
-							$this->param[$name] = array($this->param[$name], $value);
-					}
-					else
-					{
-						$this->param[$name]  = $value;
-					}
-				}
-			}
-		}
-		$this->uri_parts = $ps;
-	}
-
-
-	/**
-	 * Return the default port for a scheme
-	 *
-	 * @param string scheme
-	 * @return int
-	 */
-	protected function defaultPortForScheme ( $scheme )
-	{
-		switch ($scheme)
-		{
-		case 'http':	return 80;
-		case 'https':	return 443;
-		default:
-			throw new OAuthException2('Unsupported scheme type, expected http or https, got "'.$scheme.'"');
-			break;
-		}
-	}
-
-
-	/**
-	 * Encode a string according to the RFC3986
-	 *
-	 * @param string s
-	 * @return string
-	 */
-	function urlencode ( $s )
-	{
-		if ($s === false)
-		{
-			return $s;
-		}
-		else
-		{
-			return str_replace('%7E', '~', rawurlencode($s));
-		}
-	}
-
-	/**
-	 * Decode a string according to RFC3986.
-	 * Also correctly decodes RFC1738 urls.
-	 *
-	 * @param string s
-	 * @return string
-	 */
-	function urldecode ( $s )
-	{
-		if ($s === false)
-		{
-			return $s;
-		}
-		else
-		{
-			return rawurldecode($s);
-		}
-	}
-
-	/**
-	 * urltranscode - make sure that a value is encoded using RFC3986.
-	 * We use a basic urldecode() function so that any use of '+' as the
-	 * encoding of the space character is correctly handled.
-	 *
-	 * @param string s
-	 * @return string
-	 */
-	function urltranscode ( $s )
-	{
-		if ($s === false)
-		{
-			return $s;
-		}
-		else
-		{
-			//return $this->urlencode(rawurldecode($s));
-			return $this->urlencode(urldecode($s));
-		}
-	}
-
-
-	/**
-	 * Parse the oauth parameters from the request headers
-	 * Looks for something like:
-	 *
-	 * Authorization: OAuth realm="http://photos.example.net/authorize",
-	 *           oauth_consumer_key="dpf43f3p2l4k3l03",
-	 *           oauth_token="nnch734d00sl2jdk",
-	 *           oauth_signature_method="HMAC-SHA1",
-	 *           oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D",
-	 *           oauth_timestamp="1191242096",
-	 *           oauth_nonce="kllo9940pd9333jh",
-	 *           oauth_version="1.0"
-	 */
-	private function parseHeaders ()
-	{
-/*
-		$this->headers['Authorization'] = 'OAuth realm="http://photos.example.net/authorize",
-				oauth_consumer_key="dpf43f3p2l4k3l03",
-				oauth_token="nnch734d00sl2jdk",
-				oauth_signature_method="HMAC-SHA1",
-				oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D",
-				oauth_timestamp="1191242096",
-				oauth_nonce="kllo9940pd9333jh",
-				oauth_version="1.0"';
-*/
-		if (isset($this->headers['Authorization']))
-		{
-			$auth = trim($this->headers['Authorization']);
-			if (strncasecmp($auth, 'OAuth', 4) == 0)
-			{
-				$vs = explode(',', substr($auth, 6));
-				foreach ($vs as $v)
-				{
-					if (strpos($v, '='))
-					{
-						$v = trim($v);
-						list($name,$value) = explode('=', $v, 2);
-						if (!empty($value) && $value[0] == '"' && substr($value, -1) == '"')
-						{
-							$value = substr(substr($value, 1), 0, -1);
-						}
-
-						if (strcasecmp($name, 'realm') == 0)
-						{
-							$this->realm = $value;
-						}
-						else
-						{
-							$this->param[$name] = $value;
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Fetch the content type of the current request
-	 *
-	 * @return string
-	 */
-	private function getRequestContentType ()
-	{
-		$content_type = 'application/octet-stream';
-		if (!empty($_SERVER) && array_key_exists('CONTENT_TYPE', $_SERVER))
-		{
-			list($content_type) = explode(';', $_SERVER['CONTENT_TYPE']);
-		}
-		return trim($content_type);
-	}
-
-
-	/**
-	 * Get the body of a POST or PUT.
-	 *
-	 * Used for fetching the post parameters and to calculate the body signature.
-	 *
-	 * @return string		null when no body present (or wrong content type for body)
-	 */
-	private function getRequestBody ()
-	{
-		$body = null;
-		if ($this->method == 'POST' || $this->method == 'PUT')
-		{
-			$body = '';
-			$fh   = @fopen('php://input', 'r');
-			if ($fh)
-			{
-				while (!feof($fh))
-				{
-					$s = fread($fh, 1024);
-					if (is_string($s))
-					{
-						$body .= $s;
-					}
-				}
-				fclose($fh);
-			}
-		}
-		return $body;
-	}
-
-	/**
-	 * Get the body of a POST with multipart/form-data by Edison tsai on 16:52 2010/09/16
-	 *
-	 * Used for fetching the post parameters and to calculate the body signature.
-	 *
-	 * @return string               null when no body present (or wrong content type for body)
-	 */
-	private function getRequestBodyOfMultipart()
-	{
-		$body = null;
-		if ($this->method == 'POST')
-		{
-			$body = '';
-			if (is_array($_POST) && count($_POST) > 1)
-			{
-				foreach ($_POST AS $k => $v) {
-					$body .= $k . '=' . $this->urlencode($v) . '&';
-				} #end foreach
-				if(substr($body,-1) == '&')
-				{
-					$body = substr($body, 0, strlen($body)-1);
-				} #end if
-			} #end if
-		} #end if
-
-		return $body;
-	}
-
-
-	/**
-	 * Simple function to perform a redirect (GET).
-	 * Redirects the User-Agent, does not return.
-	 *
-	 * @param string uri
-	 * @param array params		parameters, urlencoded
-	 * @param bool  skip protocol check
-	 * @exception OAuthException2 when redirect uri is illegal
-	 */
-	public function redirect ( $uri, $params, $skip_protocol_check = false )
-	{
-		if (!empty($params))
-		{
-			$q = array();
-			foreach ($params as $name=>$value)
-			{
-				$q[] = $name.'='.$value;
-			}
-			$q_s = implode('&', $q);
-
-			if (strpos($uri, '?'))
-			{
-				$uri .= '&'.$q_s;
-			}
-			else
-			{
-				$uri .= '?'.$q_s;
-			}
-		}
-
-		// simple security - multiline location headers can inject all kinds of extras
-		$uri = preg_replace('/\s/', '%20', $uri);
-
-		if (!$skip_protocol_check) {
-			if (strncasecmp($uri, 'http://', 7) && strncasecmp($uri, 'https://', 8))
-			{
-				if (strpos($uri, '://'))
-				{
-					throw new OAuthException2('Illegal protocol in redirect uri '.$uri);
-				}
-				$uri = 'http://'.$uri;
-			}
-		}
-
-		header('HTTP/1.1 302 Found');
-		header('Location: '.$uri);
-		echo '';
-		exit();
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
diff --git a/vendor/oauth-php/library/OAuthRequestLogger.php b/vendor/oauth-php/library/OAuthRequestLogger.php
deleted file mode 100644
index 24cd8ba..0000000
--- a/vendor/oauth-php/library/OAuthRequestLogger.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-
-/**
- * Log OAuth requests
- * 
- * @version $Id: OAuthRequestLogger.php 185 2011-02-08 16:11:20Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Dec 7, 2007 12:22:43 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-class OAuthRequestLogger 
-{
-	static private $logging			= 0;
-	static private $enable_logging	= null;
-	static private $store_log		= null;
-	static private $note 			= '';
-	static private $user_id			= null;
-	static private $request_object	= null;
-	static private $sent			= null;
-	static private $received		= null;
-	static private $log				= array();
-	
-	/**
-	 * Start any logging, checks the system configuration if logging is needed.
-	 * 
-	 * @param OAuthRequest  $request_object
-	 */
-	static function start ( $request_object = null )
-	{
-		if (defined('OAUTH_LOG_REQUEST'))
-		{
-			if (is_null(OAuthRequestLogger::$enable_logging))
-			{
-				OAuthRequestLogger::$enable_logging = true;
-			}
-			if (is_null(OAuthRequestLogger::$store_log))
-			{
-				OAuthRequestLogger::$store_log = true;
-			}
-		}
-
-		if (OAuthRequestLogger::$enable_logging && !OAuthRequestLogger::$logging)
-		{
-			OAuthRequestLogger::$logging        = true;
-			OAuthRequestLogger::$request_object = $request_object;
-			ob_start();
-
-			// Make sure we flush our log entry when we stop the request (eg on an exception)
-			register_shutdown_function(array('OAuthRequestLogger','flush'));		
-		}
-	}
-	
-
-	/**
-	 * Force logging, needed for performing test connects independent from the debugging setting.
-	 * 
-	 * @param boolean  store_log		(optional) true to store the log in the db
-	 */
-	static function enableLogging ( $store_log = null )
-	{
-		OAuthRequestLogger::$enable_logging = true;
-		if (!is_null($store_log))
-		{
-			OAuthRequestLogger::$store_log = $store_log;
-		}
-	}	
-
-
-	/**
-	 * Logs the request to the database, sends any cached output.
-	 * Also called on shutdown, to make sure we always log the request being handled.
-	 */
-	static function flush ()
-	{
-		if (OAuthRequestLogger::$logging)
-		{
-			OAuthRequestLogger::$logging = false;
-
-			if (is_null(OAuthRequestLogger::$sent))
-			{
-				// What has been sent to the user-agent?
-				$data  = ob_get_contents();
-				if (strlen($data) > 0)
-				{
-					ob_end_flush();
-				}
-				elseif (ob_get_level())
-				{
-					ob_end_clean();
-				}
-				$hs    = headers_list();
-				$sent  = implode("\n", $hs) . "\n\n" . $data;
-			}
-			else
-			{
-				// The request we sent
-				$sent  = OAuthRequestLogger::$sent;
-			}
-			
-			if (is_null(OAuthRequestLogger::$received))
-			{
-				// Build the request we received
-				$hs0   = self::getAllHeaders();
-				$hs    = array();
-				foreach ($hs0 as $h => $v)
-				{
-					$hs[] = "$h: $v";
-				}
-
-				$data  = '';
-				$fh    = @fopen('php://input', 'r');
-				if ($fh)
-				{
-					while (!feof($fh))
-					{
-						$s = fread($fh, 1024);
-						if (is_string($s))
-						{
-							$data .= $s;
-						}
-					}
-					fclose($fh);
-				}
-				$received = implode("\n", $hs) . "\n\n" . $data;
-			}
-			else
-			{
-				// The answer we received
-				$received  = OAuthRequestLogger::$received;
-			}
-
-			// The request base string
-			if (OAuthRequestLogger::$request_object)
-			{
-				$base_string = OAuthRequestLogger::$request_object->signatureBaseString();
-			}
-			else
-			{
-				$base_string = '';
-			}
-
-			// Figure out to what keys we want to log this request
-			$keys = array();
-			if (OAuthRequestLogger::$request_object)
-			{
-				$consumer_key = OAuthRequestLogger::$request_object->getParam('oauth_consumer_key', true);
-				$token        = OAuthRequestLogger::$request_object->getParam('oauth_token',        true);
-
-				switch (get_class(OAuthRequestLogger::$request_object))
-				{
-				// tokens are access/request tokens by a consumer
-				case 'OAuthServer':
-				case 'OAuthRequestVerifier':
-					$keys['ocr_consumer_key'] = $consumer_key;
-					$keys['oct_token']        = $token;
-					break;
-
-				// tokens are access/request tokens to a server
-				case 'OAuthRequester':
-				case 'OAuthRequestSigner':
-					$keys['osr_consumer_key'] = $consumer_key;
-					$keys['ost_token']        = $token;
-					break;
-				}
-			}
-			
-			// Log the request
-			if (OAuthRequestLogger::$store_log)
-			{
-				$store = OAuthStore::instance();
-				$store->addLog($keys, $received, $sent, $base_string, OAuthRequestLogger::$note, OAuthRequestLogger::$user_id);
-			}
-			
-			OAuthRequestLogger::$log[] = array(
-					'keys'    		=> $keys,
-					'received'		=> $received,
-					'sent'			=> $sent,
-					'base_string'	=> $base_string,
-					'note'			=> OAuthRequestLogger::$note
-					);
-		}
-	}
-
-
-	/**
-	 * Add a note, used by the OAuthException2 to log all exceptions.
-	 * 
-	 * @param string note
-	 */
-	static function addNote ( $note )
-	{
-		OAuthRequestLogger::$note .= $note . "\n\n";
-	}
-
-	/**
-	 * Set the OAuth request object being used
-	 * 
-	 * @param OAuthRequest request_object
-	 */
-	static function setRequestObject ( $request_object )
-	{
-		OAuthRequestLogger::$request_object = $request_object;
-	}
-
-
-	/**
-	 * Set the relevant user (defaults to the current user)
-	 * 
-	 * @param int user_id
-	 */
-	static function setUser ( $user_id )
-	{
-		OAuthRequestLogger::$user_id = $user_id;
-	}
-	
-	
-	/**
-	 * Set the request we sent
-	 * 
-	 * @param string request
-	 */
-	static function setSent ( $request )
-	{
-		OAuthRequestLogger::$sent = $request;
-	}
-
-	/**
-	 * Set the reply we received
-	 * 
-	 * @param string request
-	 */
-	static function setReceived ( $reply )
-	{
-		OAuthRequestLogger::$received = $reply;
-	}
-	
-	
-	/**
-	 * Get the the log till now
-	 * 
-	 * @return array
-	 */
-	static function getLog ()
-	{
-		return OAuthRequestLogger::$log;
-	}
-
-
-	/**
-	 * helper to try to sort out headers for people who aren't running apache,
-	 * or people who are running PHP as FastCGI.
-	 *
-	 * @return array of request headers as associative array.
-	 */
-	public static function getAllHeaders() {
-		$retarr = array();
-		$headers = array();
-		
-		if (function_exists('apache_request_headers')) {
-			$headers = apache_request_headers();
-		} else {
-			$headers = array_merge($_ENV, $_SERVER);
-			
-			foreach ($headers as $key => $val) {
-				//we need this header
-				if (strpos(strtolower($key), 'content-type') !== FALSE)
-					continue;
-				if (strtoupper(substr($key, 0, 5)) != "HTTP_")
-					unset($headers[$key]);
-			}
-		}
-		
-		//Normalize this array to Cased-Like-This structure.
-		foreach ($headers AS $key => $value) {
-			$key = preg_replace('/^HTTP_/i', '', $key);
-			$key = str_replace(
-					" ",
-					"-",
-					ucwords(strtolower(str_replace(array("-", "_"), " ", $key)))
-				);
-			$retarr[$key] = $value;
-		}
-		ksort($retarr);
-		
-		return $retarr;
-	}
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthRequestSigner.php b/vendor/oauth-php/library/OAuthRequestSigner.php
deleted file mode 100644
index 15c0fd8..0000000
--- a/vendor/oauth-php/library/OAuthRequestSigner.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Sign requests before performing the request.
- * 
- * @version $Id: OAuthRequestSigner.php 174 2010-11-24 15:15:41Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:02:49 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__) . '/OAuthStore.php';
-require_once dirname(__FILE__) . '/OAuthRequest.php';
-
-
-class OAuthRequestSigner extends OAuthRequest
-{
-	protected $request;
-	protected $store;
-	protected $usr_id = 0;
-	private   $signed = false;
-
-	
-	/**
-	 * Construct the request to be signed.  Parses or appends the parameters in the params url.
-	 * When you supply an params array, then the params should not be urlencoded.
-	 * When you supply a string, then it is assumed it is of the type application/x-www-form-urlencoded
-	 * 
-	 * @param string request	url
-	 * @param string method		PUT, GET, POST etc.
-	 * @param mixed params 		string (for urlencoded data, or array with name/value pairs)
-	 * @param string body		optional body for PUT and/or POST requests
-	 */
-	function __construct ( $request, $method = null, $params = null, $body = null )
-	{
-		$this->store = OAuthStore::instance();
-		
-		if (is_string($params))
-		{
-			parent::__construct($request, $method, $params);
-		}
-		else
-		{
-			parent::__construct($request, $method);
-			if (is_array($params))
-			{
-				foreach ($params as $name => $value)
-				{
-					$this->setParam($name, $value);
-				}
-			}
-		}
-		
-		// With put/ post we might have a body (not for application/x-www-form-urlencoded requests)
-		if (strcasecmp($method, 'PUT') == 0 || strcasecmp($method, 'POST') == 0)
-		{
-			$this->setBody($body);
-		}
-	}
-
-
-	/**
-	 * Reset the 'signed' flag, so that any changes in the parameters force a recalculation
-	 * of the signature.
-	 */
-	function setUnsigned ()
-	{
-		$this->signed = false;
-	}
-
-
-	/**
-	 * Sign our message in the way the server understands.
-	 * Set the needed oauth_xxxx parameters.
-	 * 
-	 * @param int usr_id		(optional) user that wants to sign this request
-	 * @param array secrets		secrets used for signing, when empty then secrets will be fetched from the token registry
-	 * @param string name		name of the token to be used for signing
-	 * @exception OAuthException2 when there is no oauth relation with the server
-	 * @exception OAuthException2 when we don't support the signing methods of the server
-	 */	
-	function sign ( $usr_id = 0, $secrets = null, $name = '', $token_type = null)
-	{
-		$url = $this->getRequestUrl();
-		if (empty($secrets))
-		{
-			// get the access tokens for the site (on an user by user basis)
-			$secrets = $this->store->getSecretsForSignature($url, $usr_id, $name);
-		}
-		if (empty($secrets))
-		{
-			throw new OAuthException2('No OAuth relation with the server for at "'.$url.'"');
-		}
-
-		$signature_method = $this->selectSignatureMethod($secrets['signature_methods']);
-
-		$token		  = isset($secrets['token'])        ? $secrets['token']        : '';
-		$token_secret = isset($secrets['token_secret']) ? $secrets['token_secret'] : '';
-
-		if (!$token) {
-			$token = $this->getParam('oauth_token');
-		}
-
-		$this->setParam('oauth_signature_method',$signature_method);
-		$this->setParam('oauth_signature',		 '');
-		$this->setParam('oauth_nonce', 			 !empty($secrets['nonce'])     ? $secrets['nonce']     : uniqid(''));
-		$this->setParam('oauth_timestamp', 		 !empty($secrets['timestamp']) ? $secrets['timestamp'] : time());
-		if ($token_type != 'requestToken')
-			$this->setParam('oauth_token', 		 $token);
-		$this->setParam('oauth_consumer_key',	 $secrets['consumer_key']);
-		$this->setParam('oauth_version',		 '1.0');
-		
-		$body = $this->getBody();
-		if (!is_null($body))
-		{
-			// We also need to sign the body, use the default signature method
-			$body_signature = $this->calculateDataSignature($body, $secrets['consumer_secret'], $token_secret, $signature_method);
-			$this->setParam('xoauth_body_signature', $body_signature, true);
-		}
-		
-		$signature = $this->calculateSignature($secrets['consumer_secret'], $token_secret, $token_type);
-		$this->setParam('oauth_signature',	$signature, true);
-		// $this->setParam('oauth_signature',		 urldecode($signature), true);
-		
-		$this->signed = true;
-		$this->usr_id = $usr_id;
-	}
-
-
-	/**
-	 * Builds the Authorization header for the request.
-	 * Adds all oauth_ and xoauth_ parameters to the Authorization header.
-	 * 
-	 * @return string
-	 */
-	function getAuthorizationHeader ()
-	{
-		if (!$this->signed)
-		{
-			$this->sign($this->usr_id);
-		}
-		$h   = array();
-		$h[] = 'Authorization: OAuth realm=""';
-		foreach ($this->param as $name => $value)
-		{
-			if (strncmp($name, 'oauth_', 6) == 0 || strncmp($name, 'xoauth_', 7) == 0)
-          	{
-				$h[] = $name.'="'.$value.'"';
-			}
-		}
-		$hs = implode(', ', $h);
-		return $hs;
-	}
-
-
-	/**
-	 * Builds the application/x-www-form-urlencoded parameter string.  Can be appended as
-	 * the query part to a GET or inside the request body for a POST.
-	 * 
-	 * @param boolean oauth_as_header		(optional) set to false to include oauth parameters
-	 * @return string
-	 */	
-	function getQueryString ( $oauth_as_header = true )
-	{
-		$parms = array();
-		foreach ($this->param as $name => $value)
-		{
-			if (	!$oauth_as_header 
-				||	(strncmp($name, 'oauth_', 6) != 0 && strncmp($name, 'xoauth_', 7) != 0))
-			{
-				if (is_array($value))
-				{
-					foreach ($value as $v)
-					{
-						$parms[] = $name.'='.$v;
-					}
-				}
-				else
-				{
-					$parms[] = $name.'='.$value;
-				}
-			}
-		}
-		return implode('&', $parms);
-	}
-
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthRequestVerifier.php b/vendor/oauth-php/library/OAuthRequestVerifier.php
deleted file mode 100644
index a5def75..0000000
--- a/vendor/oauth-php/library/OAuthRequestVerifier.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-/**
- * Verify the current request.  Checks if signed and if the signature is correct.
- * When correct then also figures out on behalf of which user this request is being made.
- *  
- * @version $Id: OAuthRequestVerifier.php 155 2010-09-10 18:38:33Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:35:03 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthStore.php';
-require_once dirname(__FILE__) . '/OAuthRequest.php';
-
-
-class OAuthRequestVerifier extends OAuthRequest
-{
-	private $request;
-	private $store;
-	private $accepted_signatures = null;
-	
-	/**
-	 * Construct the request to be verified
-	 * 
-	 * @param string request
-	 * @param string method
-	 * @param array params The request parameters
-	 */
-	function __construct ( $uri = null, $method = null, $params = null )
-	{
- 		if ($params) {
- 			$encodedParams = array();
- 			foreach ($params as $key => $value) {
- 				if (preg_match("/^oauth_/", $key)) {  
- 					continue;
- 				}
- 				$encodedParams[rawurlencode($key)] = rawurlencode($value);
- 			}
- 			$this->param = array_merge($this->param, $encodedParams);
- 		}
- 
-		$this->store = OAuthStore::instance();
-		parent::__construct($uri, $method);
-		
-		OAuthRequestLogger::start($this);
-	}
-	
-	
-	/**
-	 * See if the current request is signed with OAuth
-	 * 
-	 * @return boolean
-	 */
-	static public function requestIsSigned ()
-	{
-		if (isset($_REQUEST['oauth_signature']))
-		{
-			$signed = true;
-		}
-		else
-		{
-			$hs = OAuthRequestLogger::getAllHeaders();
-			if (isset($hs['Authorization']) && strpos($hs['Authorization'], 'oauth_signature') !== false)
-			{
-				$signed = true;
-			}
-			else
-			{
-				$signed = false;
-			}
-		}
-		return $signed;
-	}
-
-
-	/**
-	 * Verify the request if it seemed to be signed.
-	 * 
-	 * @param string token_type the kind of token needed, defaults to 'access'
-	 * @exception OAuthException2 thrown when the request did not verify
-	 * @return boolean	true when signed, false when not signed
-	 */
-	public function verifyIfSigned ( $token_type = 'access' )
-	{
-		if ($this->getParam('oauth_consumer_key'))
-		{
-			OAuthRequestLogger::start($this);
-			$this->verify($token_type);
-			$signed = true;
-			OAuthRequestLogger::flush();
-		}
-		else
-		{
-			$signed = false;
-		}
-		return $signed;
-	}
-
-
-
-	/**
-	 * Verify the request
-	 * 
-	 * @param string token_type the kind of token needed, defaults to 'access' (false, 'access', 'request')
-	 * @exception OAuthException2 thrown when the request did not verify
-	 * @return int user_id associated with token (false when no user associated)
-	 */
-	public function verify ( $token_type = 'access' ) 
-	{
-		$retval = $this->verifyExtended($token_type);
-		return $retval['user_id'];
-	}
-	
-	
-	/**
-	 * Verify the request
-	 * 
-	 * @param string token_type the kind of token needed, defaults to 'access' (false, 'access', 'request')
-	 * @exception OAuthException2 thrown when the request did not verify
-	 * @return array ('user_id' => associated with token (false when no user associated),
-	 *  'consumer_key' => the associated consumer_key)
-	 * 
-	 */
-	public function verifyExtended ( $token_type = 'access' )
-	{
-		$consumer_key = $this->getParam('oauth_consumer_key');
-		$token        = $this->getParam('oauth_token');
-		$user_id      = false;
-		$secrets      = array();
-
-		if ($consumer_key && ($token_type === false || $token))
-		{
-			$secrets = $this->store->getSecretsForVerify(	$this->urldecode($consumer_key), 
-															$this->urldecode($token), 
-															$token_type);
-
-			$this->store->checkServerNonce(	$this->urldecode($consumer_key),
-											$this->urldecode($token),
-											$this->getParam('oauth_timestamp', true),
-											$this->getParam('oauth_nonce', true));
-
-			$oauth_sig = $this->getParam('oauth_signature');
-			if (empty($oauth_sig))
-			{
-				throw new OAuthException2('Verification of signature failed (no oauth_signature in request).');
-			} 
-			
-			try
-			{
-				$this->verifySignature($secrets['consumer_secret'], $secrets['token_secret'], $token_type);
-			}
-			catch (OAuthException2 $e)
-			{
-				throw new OAuthException2('Verification of signature failed (signature base string was "'.$this->signatureBaseString().'").' 
-					. " with  " . print_r(array($secrets['consumer_secret'], $secrets['token_secret'], $token_type), true));
-			}
-			
-			// Check the optional body signature
-			if ($this->getParam('xoauth_body_signature'))
-			{
-				$method = $this->getParam('xoauth_body_signature_method');
-				if (empty($method))
-				{
-					$method = $this->getParam('oauth_signature_method');
-				}
-
-				try
-				{
-					$this->verifyDataSignature($this->getBody(), $secrets['consumer_secret'], $secrets['token_secret'], $method, $this->getParam('xoauth_body_signature'));
-				}
-				catch (OAuthException2 $e)
-				{
-					throw new OAuthException2('Verification of body signature failed.');
-				}
-			}
-			
-			// All ok - fetch the user associated with this request
-			if (isset($secrets['user_id']))
-			{
-				$user_id = $secrets['user_id'];
-			}
-			
-			// Check if the consumer wants us to reset the ttl of this token
-			$ttl = $this->getParam('xoauth_token_ttl', true);
-			if (is_numeric($ttl))
-			{
-				$this->store->setConsumerAccessTokenTtl($this->urldecode($token), $ttl);
-			}
-		}
-		else
-		{
-			throw new OAuthException2('Can\'t verify request, missing oauth_consumer_key or oauth_token');
-		}
-		return array('user_id' => $user_id, 'consumer_key' => $consumer_key, 'osr_id' => $secrets['osr_id']); 
-	}
-
-
-	
-	/**
-	 * Verify the signature of the request, using the method in oauth_signature_method.
-	 * The signature is returned encoded in the form as used in the url.  So the base64 and
-	 * urlencoding has been done.
-	 * 
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @exception OAuthException2 thrown when the signature method is unknown 
-	 * @exception OAuthException2 when not all parts available
-	 * @exception OAuthException2 when signature does not match
-	 */
-	public function verifySignature ( $consumer_secret, $token_secret, $token_type = 'access' )
-	{
-		$required = array(
-						'oauth_consumer_key',
-						'oauth_signature_method',
-						'oauth_timestamp',
-						'oauth_nonce',
-						'oauth_signature'
-					);
-
-		if ($token_type !== false)
-		{
-			$required[] = 'oauth_token';
-		}
-
-		foreach ($required as $req)
-		{
-			if (!isset($this->param[$req]))
-			{
-				throw new OAuthException2('Can\'t verify request signature, missing parameter "'.$req.'"');
-			}
-		}
-
-		$this->checks();
-
-		$base = $this->signatureBaseString();
-		$this->verifyDataSignature($base, $consumer_secret, $token_secret, $this->param['oauth_signature_method'], $this->param['oauth_signature']);
-	}
-
-
-
-	/**
-	 * Verify the signature of a string.
-	 * 
-	 * @param string 	data
-	 * @param string	consumer_secret
-	 * @param string	token_secret
-	 * @param string 	signature_method
-	 * @param string 	signature
-	 * @exception OAuthException2 thrown when the signature method is unknown 
-	 * @exception OAuthException2 when signature does not match
-	 */
-	public function verifyDataSignature ( $data, $consumer_secret, $token_secret, $signature_method, $signature )
-	{
-		if (is_null($data))
-		{
-			$data = '';
-		}
-
-		$sig = $this->getSignatureMethod($signature_method);
-		if (!$sig->verify($this, $data, $consumer_secret, $token_secret, $signature))
-		{
-			throw new OAuthException2('Signature verification failed ('.$signature_method.')');
-		}
-	}
-
-	/**
-	 * 
-	 * @param array $accepted The array of accepted signature methods, or if null is passed 
-	 * all supported methods are accepted and there is no filtering.
-	 * 
-	 */
-	public function setAcceptedSignatureMethods($accepted = null) {
-		if (is_array($accepted))
-			$this->accepted_signatures = $accepted;
-		else if ($accepted == null)
-			$this->accepted_signatures = null;
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthRequester.php b/vendor/oauth-php/library/OAuthRequester.php
deleted file mode 100644
index dde9a99..0000000
--- a/vendor/oauth-php/library/OAuthRequester.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-
-/**
- * Perform a signed OAuth request with a GET, POST, PUT or DELETE operation.
- * 
- * @version $Id: OAuthRequester.php 191 2011-03-23 17:50:55Z scherpenisse $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 20, 2007 1:41:38 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthRequestSigner.php';
-require_once dirname(__FILE__) . '/body/OAuthBodyContentDisposition.php';
-
-
-class OAuthRequester extends OAuthRequestSigner
-{
-	protected $files;
-
-	/**
-	 * Construct a new request signer.  Perform the request with the doRequest() method below.
-	 * 
-	 * A request can have either one file or a body, not both. 
-	 * 
-	 * The files array consists of arrays:
-	 * - file			the filename/path containing the data for the POST/PUT
-	 * - data			data for the file, omit when you have a file
-	 * - mime			content-type of the file
-	 * - filename		filename for content disposition header
-	 * 
-	 * When OAuth (and PHP) can support multipart/form-data then we can handle more than one file.
-	 * For now max one file, with all the params encoded in the query string.
-	 * 
-	 * @param string request
-	 * @param string method		http method.  GET, PUT, POST etc. Defaults to 'GET'.
-	 * @param array params		name=>value array with request parameters
-	 * @param string body		optional body to send
-	 * @param array files		optional files to send (max 1 till OAuth support multipart/form-data posts)
-	 */
-	function __construct ( $request, $method = 'GET', $params = null, $body = null, $files = null )
-	{
-		parent::__construct($request, $method, $params, $body);
-
-		// When there are files, then we can construct a POST with a single file
-		if (!empty($files))
-		{
-			$empty = true;
-			foreach ($files as $f)
-			{
-				$empty = $empty && empty($f['file']) && !isset($f['data']);
-			}
-			
-			if (!$empty)
-			{
-				if (!is_null($body))
-				{
-					throw new OAuthException2('When sending files, you can\'t send a body as well.');
-				}
-				$this->files = $files;
-			}
-		}
-	}
-
-
-	/**
-	 * Perform the request, returns the response code, headers and body.
-	 * 
-	 * @param int usr_id			optional user id for which we make the request
-	 * @param array curl_options	optional extra options for curl request
-	 * @param array options			options like 
-	 * 	- name Named tokens, unique per user/consumer key
-	 *  - token_ttl Time to live
-	 *  - server_uri The server uri
-	 *  - boolean oauth_as_header set to false to include oauth parameters in query string. Default true (includes on headers)
-	 * @exception OAuthException2 when authentication not accepted
-	 * @exception OAuthException2 when signing was not possible
-	 * @return array (code=>int, headers=>array(), body=>string)
-	 */
-	function doRequest ( $usr_id = 0, $curl_options = array(), $options = array() )
-	{
-		$name = isset($options['name']) ? $options['name'] : '';
-		if (isset($options['token_ttl']))
-		{
-			$this->setParam('xoauth_token_ttl', intval($options['token_ttl']));
-		}
-
-		if (!empty($this->files))
-		{
-			// At the moment OAuth does not support multipart/form-data, so try to encode
-			// the supplied file (or data) as the request body and add a content-disposition header.
-			list($extra_headers, $body) = OAuthBodyContentDisposition::encodeBody($this->files);
-			$this->setBody($body);
-			$curl_options = $this->prepareCurlOptions($curl_options, $extra_headers);
-		}
-		$this->sign($usr_id, null, $name);
-		$text   = $this->curl_raw($curl_options, (isset($options['oauth_as_header']) ? $options['oauth_as_header'] : true));
-		$result = $this->curl_parse($text);	
-		if ($result['code'] >= 400)
-		{
-			throw new OAuthException2('Request failed with code ' . $result['code'] . ': ' . $result['body']);
-		}
-
-		// Record the token time to live for this server access token, immediate delete iff ttl <= 0
-		// Only done on a succesful request.	
-		$token_ttl = $this->getParam('xoauth_token_ttl', false);
-		if (is_numeric($token_ttl))
-		{
-			$this->store->setServerTokenTtl($this->getParam('oauth_consumer_key',true), $this->getParam('oauth_token',true), 
-				$token_ttl, (isset($options['server_uri']) ? $options['server_uri'] : NULL));
-		}
-
-		return $result;
-	}
-
-	
-	/**
-	 * Request a request token from the site belonging to consumer_key
-	 * 
-	 * @param string consumer_key
-	 * @param int usr_id
-	 * @param array params (optional) extra arguments for when requesting the request token
-	 * @param string method (optional) change the method of the request, defaults to POST (as it should be)
-	 * @param array options (optional) options:
-	 * 	- name Named tokens, unique per user/consumer key
-	 *  - token_ttl Time to live
-	 *  - server_uri The server uri
-	 *  - boolean oauth_as_header set to false to include oauth parameters in query string. Default true (includes on headers)
-	 * @param array curl_options	optional extra options for curl request
-	 * @exception OAuthException2 when no key could be fetched
-	 * @exception OAuthException2 when no server with consumer_key registered
-	 * @return array (authorize_uri, token)
-	 */
-	static function requestRequestToken ( $consumer_key, $usr_id, $params = null, $method = 'POST', $options = array(), $curl_options = array() )
-	{
-		OAuthRequestLogger::start();
-
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$params['xoauth_token_ttl'] = intval($options['token_ttl']);
-		}
-
-		$store	= OAuthStore::instance();
-		$r		= $store->getServer($consumer_key, $usr_id);
-		$uri 	= $r['request_token_uri'];
-
-		$oauth 	= new OAuthRequester($uri, $method, $params);
-		$oauth->sign($usr_id, $r, '', 'requestToken');
-		$text	= $oauth->curl_raw($curl_options, (isset($options['oauth_as_header']) ? $options['oauth_as_header'] : true));
-
-		if (empty($text))
-		{
-			throw new OAuthException2('No answer from the server "'.$uri.'" while requesting a request token');
-		}
-		$data	= $oauth->curl_parse($text);
-		if ($data['code'] != 200)
-		{
-			throw new OAuthException2('Unexpected result from the server "'.$uri.'" ('.$data['code'].') while requesting a request token:' . $data['body']);
-		}
-		$token  = array();
-		$params = explode('&', $data['body']);
-		foreach ($params as $p)
-		{
-			@list($name, $value) = explode('=', $p, 2);
-			$token[$name] = $oauth->urldecode($value);
-		}
-		
-		if (!empty($token['oauth_token']) && !empty($token['oauth_token_secret']))
-		{
-			$opts = array();
-			if (isset($options['name']))
-			{
-				$opts['name'] = $options['name'];
-			}
-			if (isset($token['xoauth_token_ttl']))
-			{
-				$opts['token_ttl'] = $token['xoauth_token_ttl'];
-			}
-			if (isset($options['server_uri']))
-			{
-				$opts['server_uri'] = $options['server_uri'];
-			}
-			$store->addServerToken($consumer_key, 'request', $token['oauth_token'], $token['oauth_token_secret'], $usr_id, $opts);
-		}
-		else
-		{
-			throw new OAuthException2('The server "'.$uri.'" did not return the oauth_token or the oauth_token_secret');
-		}
-
-		OAuthRequestLogger::flush();
-
-		// Now we can direct a browser to the authorize_uri
-		return array(
-					'authorize_uri' => $r['authorize_uri'],
-					'token'			=> $token['oauth_token']
-				);
-	}
-
-
-	/**
-	 * Request an access token from the site belonging to consumer_key.
-	 * Before this we got an request token, now we want to exchange it for
-	 * an access token.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int usr_id		user requesting the access token
-	 * @param string method (optional) change the method of the request, defaults to POST (as it should be)
-	 * @param array options (optional) options:
-	 * 	- name Named tokens, unique per user/consumer key
-	 *  - token_ttl Time to live
-	 *  - server_uri The server uri
-	 *  - boolean oauth_as_header set to false to include oauth parameters in query string. Default true (includes on headers)
-	 * @param array curl_options	optional extra options for curl request
-	 *  
-	 * @exception OAuthException2 when no key could be fetched
-	 * @exception OAuthException2 when no server with consumer_key registered
-	 */
-	static function requestAccessToken ( $consumer_key, $token, $usr_id, $method = 'POST', $options = array(), $curl_options = array())
-	{
-		OAuthRequestLogger::start();
-				
-		$store	    = OAuthStore::instance();
-		$r		    = $store->getServerTokenSecrets($consumer_key, $token, 'request', $usr_id);
-		$uri 	    = $r['access_token_uri'];
-		$token_name	= $r['token_name'];
-		
-		// Delete the server request token, this one was for one use only
-		$store->deleteServerToken($consumer_key, $r['token'], 0, true);
-
-		// Try to exchange our request token for an access token
-		$oauth 	= new OAuthRequester($uri, $method);
-
-		if (isset($options['oauth_verifier'])) 
-		{
-			$oauth->setParam('oauth_verifier', $options['oauth_verifier']);
-        }
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$oauth->setParam('xoauth_token_ttl', intval($options['token_ttl']));
-		}
-
-		OAuthRequestLogger::setRequestObject($oauth);
-
-		$oauth->sign($usr_id, $r, '', 'accessToken');
-		$text	= $oauth->curl_raw($curl_options, (isset($options['oauth_as_header']) ? $options['oauth_as_header'] : true));
-		if (empty($text))
-		{
-			throw new OAuthException2('No answer from the server "'.$uri.'" while requesting an access token');
-		}
-		$data	= $oauth->curl_parse($text);
-
-		if ($data['code'] != 200)
-		{
-			throw new OAuthException2('Unexpected result from the server "'.$uri.'" ('.$data['code'].') while requesting an access token');
-		}
-
-		$token  = array();
-		$params = explode('&', $data['body']);
-		foreach ($params as $p)
-		{
-			@list($name, $value) = explode('=', $p, 2);
-			$token[$oauth->urldecode($name)] = $oauth->urldecode($value);
-		}
-		
-		if (!empty($token['oauth_token']) && !empty($token['oauth_token_secret']))
-		{
-			$opts         = array();
-			$opts['name'] = $token_name;
-			if (isset($token['xoauth_token_ttl']))
-			{
-				$opts['token_ttl'] = $token['xoauth_token_ttl'];
-			}
-			if (isset($options['server_uri']))
-			{
-				$opts['server_uri'] = $options['server_uri'];
-			}
-			$store->addServerToken($consumer_key, 'access', $token['oauth_token'], $token['oauth_token_secret'], $usr_id, $opts);
-		}
-		else
-		{
-			throw new OAuthException2('The server "'.$uri.'" did not return the oauth_token or the oauth_token_secret');
-		}
-
-		OAuthRequestLogger::flush();
-	}
-
-
-
-	/**
-	 * Open and close a curl session passing all the options to the curl libs
-	 * 
-	 * @param array opts the curl options.
-	 * @param boolean oauth_as_header		(optional) set to false to include oauth parameters in query string
-	 * @exception OAuthException2 when temporary file for PUT operation could not be created
-	 * @return string the result of the curl action
-	 */
-	protected function curl_raw ( $opts = array(), $oauth_as_header = true )
-	{
-		if (isset($opts[CURLOPT_HTTPHEADER]))
-		{
-			$header = $opts[CURLOPT_HTTPHEADER];
-		}
-		else
-		{
-			$header = array();
-		}
-		
-		$ch 		= curl_init();
-		$method		= $this->getMethod();
-		$url		= $this->getRequestUrl();
-		$header[]	= $this->getAuthorizationHeader();
-		$query		= $this->getQueryString($oauth_as_header);
-		$body		= $this->getBody();
-
-		$has_content_type = false;
-		foreach ($header as $h)
-		{
-			if (strncasecmp($h, 'Content-Type:', 13) == 0)
-			{
-				$has_content_type = true;
-			}
-		}
-		
-		if (!is_null($body))
-		{
-			if ($method == 'TRACE')
-			{
-				throw new OAuthException2('A body can not be sent with a TRACE operation');
-			}
-
-			// PUT and POST allow a request body
-			if (!empty($query))
-			{
-				$url .= '?'.$query;
-			}
-
-			// Make sure that the content type of the request is ok
-			if (!$has_content_type)
-			{
-				$header[]         = 'Content-Type: application/octet-stream';
-				$has_content_type = true;
-			}
-			
-			// When PUTting, we need to use an intermediate file (because of the curl implementation)
-			if ($method == 'PUT')
-			{
-				/*
-				if (version_compare(phpversion(), '5.2.0') >= 0)
-				{
-					// Use the data wrapper to create the file expected by the put method
-					$put_file = fopen('data://application/octet-stream;base64,'.base64_encode($body));
-				}
-				*/
-				
-				$put_file = @tmpfile();
-				if (!$put_file)
-				{
-					throw new OAuthException2('Could not create tmpfile for PUT operation');
-				}
-				fwrite($put_file, $body);
-				fseek($put_file, 0);
-
-				curl_setopt($ch, CURLOPT_PUT, 		  true);
-  				curl_setopt($ch, CURLOPT_INFILE, 	  $put_file);
-  				curl_setopt($ch, CURLOPT_INFILESIZE,  strlen($body));
-			}
-			else
-			{
-				curl_setopt($ch, CURLOPT_POST,		  true);
-				curl_setopt($ch, CURLOPT_POSTFIELDS,  $body);
-  			}
-		}
-		else
-		{
-			// a 'normal' request, no body to be send
-			if ($method == 'POST')
-			{
-				if (!$has_content_type)
-				{
-					$header[]         = 'Content-Type: application/x-www-form-urlencoded';
-					$has_content_type = true;
-				}
-
-				curl_setopt($ch, CURLOPT_POST, 		  true);
-				curl_setopt($ch, CURLOPT_POSTFIELDS,  $query);
-			}
-			else
-			{
-				if (!empty($query))
-				{
-					$url .= '?'.$query;
-				}
-				if ($method != 'GET')
-				{
-					curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
-				}
-			}
-		}
-
-		curl_setopt($ch, CURLOPT_HTTPHEADER,	 $header);
-		curl_setopt($ch, CURLOPT_USERAGENT,		 'anyMeta/OAuth 1.0 - ($LastChangedRevision: 191 $)');
-		curl_setopt($ch, CURLOPT_URL, 			 $url);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_HEADER, 		 true);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 		 30);
-	
-		foreach ($opts as $k => $v)
-		{
-			if ($k != CURLOPT_HTTPHEADER)
-			{
-				curl_setopt($ch, $k, $v);
-			}
-		}
-
-		$txt = curl_exec($ch);
-		if ($txt === false) {
-			$error = curl_error($ch);
-			curl_close($ch);
-			throw new OAuthException2('CURL error: ' . $error);
-		} 
-		curl_close($ch);
-		
-		if (!empty($put_file))
-		{
-			fclose($put_file);
-		}
-
-		// Tell the logger what we requested and what we received back
-		$data = $method . " $url\n".implode("\n",$header);
-		if (is_string($body))
-		{
-			$data .= "\n\n".$body;
-		}
-		else if ($method == 'POST')
-		{
-			$data .= "\n\n".$query;
-		}
-
-		OAuthRequestLogger::setSent($data, $body);
-		OAuthRequestLogger::setReceived($txt);
-
-		return $txt;
-	}
-	
-	
-	/**
-	 * Parse an http response
-	 * 
-	 * @param string response the http text to parse
-	 * @return array (code=>http-code, headers=>http-headers, body=>body)
-	 */
-	protected function curl_parse ( $response )
-	{
-		if (empty($response))
-		{
-			return array();
-		}
-	
-		@list($headers,$body) = explode("\r\n\r\n",$response,2);
-		$lines = explode("\r\n",$headers);
-
-		if (preg_match('@^HTTP/[0-9]\.[0-9] +100@', $lines[0]))
-		{
-			/* HTTP/1.x 100 Continue
-			 * the real data is on the next line
-			 */
-			@list($headers,$body) = explode("\r\n\r\n",$body,2);
-			$lines = explode("\r\n",$headers);
-		}
-	
-		// first line of headers is the HTTP response code 
-		$http_line = array_shift($lines);
-		if (preg_match('@^HTTP/[0-9]\.[0-9] +([0-9]{3})@', $http_line, $matches))
-		{
-			$code = $matches[1];
-		}
-	
-		// put the rest of the headers in an array
-		$headers = array();
-		foreach ($lines as $l)
-		{
-			list($k, $v) = explode(': ', $l, 2);
-			$headers[strtolower($k)] = $v;
-		}
-	
-		return array( 'code' => $code, 'headers' => $headers, 'body' => $body);
-	}
-
-
-	/**
-	 * Mix the given headers into the headers that were given to curl
-	 * 
-	 * @param array curl_options
-	 * @param array extra_headers
-	 * @return array new curl options
-	 */
-	protected function prepareCurlOptions ( $curl_options, $extra_headers )
-	{
-		$hs = array();
-		if (!empty($curl_options[CURLOPT_HTTPHEADER]) && is_array($curl_options[CURLOPT_HTTPHEADER]))
-		{
-			foreach ($curl_options[CURLOPT_HTTPHEADER] as $h)
-			{
-				list($opt, $val) = explode(':', $h, 2);
-				$opt      = str_replace(' ', '-', ucwords(str_replace('-', ' ', $opt)));
-				$hs[$opt] = $val;
-			}
-		}
-
-		$curl_options[CURLOPT_HTTPHEADER] = array();
-		$hs = array_merge($hs, $extra_headers);		
-		foreach ($hs as $h => $v)
-		{
-			$curl_options[CURLOPT_HTTPHEADER][] = "$h: $v";
-		}
-		return $curl_options;
-	}
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthServer.php b/vendor/oauth-php/library/OAuthServer.php
deleted file mode 100644
index 878796a..0000000
--- a/vendor/oauth-php/library/OAuthServer.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-
-/**
- * Server layer over the OAuthRequest handler
- *
- * @version $Id: OAuthServer.php 154 2010-08-31 18:04:41Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 27, 2007 12:36:38 PM
- *
- *
- * The MIT License
- *
- * Copyright (c) 2007-2008 Mediamatic Lab
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once 'OAuthRequestVerifier.php';
-require_once 'OAuthSession.php';
-
-class OAuthServer extends OAuthRequestVerifier
-{
-	protected $session;
-
-	protected $allowed_uri_schemes = array(
-		'http',
-		'https'
-	);
-
-	protected $disallowed_uri_schemes = array(
-		'file',
-		'callto',
-		'mailto'
-	);
-
-	/**
-	 * Construct the request to be verified
-	 *
-	 * @param string request
-	 * @param string method
-	 * @param array params The request parameters
-	 * @param string store The session storage class.
-	 * @param array store_options The session storage class parameters.
-	 * @param array options Extra options:
-	 *   - allowed_uri_schemes: list of allowed uri schemes.
-	 *   - disallowed_uri_schemes: list of unallowed uri schemes.
-	 *
-	 * e.g. Allow only http and https
-	 * $options = array(
-	 *     'allowed_uri_schemes' => array('http', 'https'),
-	 *     'disallowed_uri_schemes' => array()
-	 * );
-	 *
-	 * e.g. Disallow callto, mailto and file, allow everything else
-	 * $options = array(
-	 *     'allowed_uri_schemes' => array(),
-	 *     'disallowed_uri_schemes' => array('callto', 'mailto', 'file')
-	 * );
-	 *
-	 * e.g. Allow everything
-	 * $options = array(
-	 *     'allowed_uri_schemes' => array(),
-	 *     'disallowed_uri_schemes' => array()
-	 * );
-	 *
-	 */
-	function __construct ( $uri = null, $method = null, $params = null, $store = 'SESSION',
-			$store_options = array(), $options = array() )
-	{
- 		parent::__construct($uri, $method, $params);
- 		$this->session = OAuthSession::instance($store, $store_options);
-
-	 	if (array_key_exists('allowed_uri_schemes', $options) && is_array($options['allowed_uri_schemes'])) {
-	 		$this->allowed_uri_schemes = $options['allowed_uri_schemes'];
-	 	}
-	 	if (array_key_exists('disallowed_uri_schemes', $options) && is_array($options['disallowed_uri_schemes'])) {
-	 		$this->disallowed_uri_schemes = $options['disallowed_uri_schemes'];
-	 	}
-	}
-
-	/**
-	 * Handle the request_token request.
-	 * Returns the new request token and request token secret.
-	 *
-	 * TODO: add correct result code to exception
-	 *
-	 * @return string 	returned request token, false on an error
-	 */
-	public function requestToken ()
-	{
-		OAuthRequestLogger::start($this);
-		try
-		{
-			$this->verify(false);
-
-			$options = array();
-			$ttl     = $this->getParam('xoauth_token_ttl', false);
-			if ($ttl)
-			{
-				$options['token_ttl'] = $ttl;
-			}
-
- 			// 1.0a Compatibility : associate callback url to the request token
- 			$cbUrl   = $this->getParam('oauth_callback', true);
- 			if ($cbUrl) {
- 				$options['oauth_callback'] = $cbUrl;
- 			}
-
-			// Create a request token
-			$store  = OAuthStore::instance();
-			$token  = $store->addConsumerRequestToken($this->getParam('oauth_consumer_key', true), $options);
-			$result = 'oauth_callback_confirmed=1&oauth_token='.$this->urlencode($token['token'])
-					.'&oauth_token_secret='.$this->urlencode($token['token_secret']);
-
-			if (!empty($token['token_ttl']))
-			{
-				$result .= '&xoauth_token_ttl='.$this->urlencode($token['token_ttl']);
-			}
-
-			$request_token = $token['token'];
-
-			header('HTTP/1.1 200 OK');
-			header('Content-Length: '.strlen($result));
-			header('Content-Type: application/x-www-form-urlencoded');
-
-			echo $result;
-		}
-		catch (OAuthException2 $e)
-		{
-			$request_token = false;
-
-			header('HTTP/1.1 401 Unauthorized');
-			header('Content-Type: text/plain');
-
-			echo "OAuth Verification Failed: " . $e->getMessage();
-		}
-
-		OAuthRequestLogger::flush();
-		return $request_token;
-	}
-
-
-	/**
-	 * Verify the start of an authorization request.  Verifies if the request token is valid.
-	 * Next step is the method authorizeFinish()
-	 *
-	 * Nota bene: this stores the current token, consumer key and callback in the _SESSION
-	 *
-	 * @exception OAuthException2 thrown when not a valid request
-	 * @return array token description
-	 */
-	public function authorizeVerify ()
-	{
-		OAuthRequestLogger::start($this);
-
-		$store = OAuthStore::instance();
-		$token = $this->getParam('oauth_token', true);
-		$rs    = $store->getConsumerRequestToken($token);
-		if (empty($rs))
-		{
-			throw new OAuthException2('Unknown request token "'.$token.'"');
-		}
-
-		// We need to remember the callback
-		$verify_oauth_token = $this->session->get('verify_oauth_token');
-		if (	empty($verify_oauth_token)
-			||	strcmp($verify_oauth_token, $rs['token']))
-		{
-			$this->session->set('verify_oauth_token', $rs['token']);
-			$this->session->set('verify_oauth_consumer_key', $rs['consumer_key']);
-			$cb = $this->getParam('oauth_callback', true);
-			if ($cb)
-				$this->session->set('verify_oauth_callback', $cb);
-			else
-				$this->session->set('verify_oauth_callback', $rs['callback_url']);
-		}
-		OAuthRequestLogger::flush();
-		return $rs;
-	}
-
-
-	/**
-	 * Overrule this method when you want to display a nice page when
-	 * the authorization is finished.  This function does not know if the authorization was
-	 * succesfull, you need to check the token in the database.
-	 *
-	 * @param boolean authorized	if the current token (oauth_token param) is authorized or not
-	 * @param int user_id			user for which the token was authorized (or denied)
-	 * @return string verifier  For 1.0a Compatibility
-	 */
-	public function authorizeFinish ( $authorized, $user_id )
-	{
-		OAuthRequestLogger::start($this);
-
-		$token = $this->getParam('oauth_token', true);
-		$verifier = null;
-		if ($this->session->get('verify_oauth_token') == $token)
-		{
-			// Flag the token as authorized, or remove the token when not authorized
-			$store = OAuthStore::instance();
-
-			// Fetch the referrer host from the oauth callback parameter
-			$referrer_host  = '';
-			$oauth_callback = false;
-			$verify_oauth_callback = $this->session->get('verify_oauth_callback');
-			if (!empty($verify_oauth_callback) && $verify_oauth_callback != 'oob') // OUT OF BAND
-			{
-				$oauth_callback = $this->session->get('verify_oauth_callback');
-				$ps = parse_url($oauth_callback);
-				if (isset($ps['host']))
-				{
-					$referrer_host = $ps['host'];
-				}
-			}
-
-			if ($authorized)
-			{
-				OAuthRequestLogger::addNote('Authorized token "'.$token.'" for user '.$user_id.' with referrer "'.$referrer_host.'"');
- 				// 1.0a Compatibility : create a verifier code
-				$verifier = $store->authorizeConsumerRequestToken($token, $user_id, $referrer_host);
-			}
-			else
-			{
-				OAuthRequestLogger::addNote('Authorization rejected for token "'.$token.'" for user '.$user_id."\nToken has been deleted");
-				$store->deleteConsumerRequestToken($token);
-			}
-
-			if (!empty($oauth_callback))
-			{
- 				$params = array('oauth_token' => rawurlencode($token));
- 				// 1.0a Compatibility : if verifier code has been generated, add it to the URL
- 				if ($verifier) {
- 					$params['oauth_verifier'] = $verifier;
- 				}
-
-				$uri = preg_replace('/\s/', '%20', $oauth_callback);
-				if (!empty($this->allowed_uri_schemes))
-				{
-					if (!in_array(substr($uri, 0, strpos($uri, '://')), $this->allowed_uri_schemes))
-					{
-						throw new OAuthException2('Illegal protocol in redirect uri '.$uri);
-					}
-				}
-				else if (!empty($this->disallowed_uri_schemes))
-				{
-					if (in_array(substr($uri, 0, strpos($uri, '://')), $this->disallowed_uri_schemes))
-					{
-						throw new OAuthException2('Illegal protocol in redirect uri '.$uri);
-					}
-				}
-
- 				$this->redirect($oauth_callback, $params, true);
-			}
-		}
-		OAuthRequestLogger::flush();
-		return $verifier;
-	}
-
-
-	/**
-	 * Exchange a request token for an access token.
-	 * The exchange is only succesful iff the request token has been authorized.
-	 *
-	 * Never returns, calls exit() when token is exchanged or when error is returned.
-	 */
-	public function accessToken ()
-	{
-		OAuthRequestLogger::start($this);
-
-		try
-		{
-			$this->verify('request');
-
-			$options = array();
-			$ttl     = $this->getParam('xoauth_token_ttl', false);
-			if ($ttl)
-			{
-				$options['token_ttl'] = $ttl;
-			}
-
-			$verifier = $this->getParam('oauth_verifier', false);
- 			if ($verifier) {
- 				$options['verifier'] = $verifier;
- 			}
-
-			$store  = OAuthStore::instance();
-			$token  = $store->exchangeConsumerRequestForAccessToken($this->getParam('oauth_token', true), $options);
-			$result = 'oauth_token='.$this->urlencode($token['token'])
-					.'&oauth_token_secret='.$this->urlencode($token['token_secret']);
-
-			if (!empty($token['token_ttl']))
-			{
-				$result .= '&xoauth_token_ttl='.$this->urlencode($token['token_ttl']);
-			}
-
-			header('HTTP/1.1 200 OK');
-			header('Content-Length: '.strlen($result));
-			header('Content-Type: application/x-www-form-urlencoded');
-
-			echo $result;
-		}
-		catch (OAuthException2 $e)
-		{
-			header('HTTP/1.1 401 Access Denied');
-			header('Content-Type: text/plain');
-
-			echo "OAuth Verification Failed: " . $e->getMessage();
-		}
-
-		OAuthRequestLogger::flush();
-		exit();
-	}
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
diff --git a/vendor/oauth-php/library/OAuthSession.php b/vendor/oauth-php/library/OAuthSession.php
deleted file mode 100644
index 80ceeb7..0000000
--- a/vendor/oauth-php/library/OAuthSession.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * This is the factory to select the store you want to use
- * 
- * @version $Id: OAuthSession.php 67 2010-01-12 18:42:04Z brunobg@corollarium.com $
- * @author brunobg@corollarium.com
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * Copyright (c) 2010 Corollarium Technologies
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthException2.php';
-
-class OAuthSession
-{
-	static private $instance = false;
-
-	/**
-	 * Request an instance of the OAuthSession
-	 */
-	public static function instance ( $store = 'SESSION', $options = array() )
-	{
-	    if (!OAuthSession::$instance)
-	    {
-			// Select the store you want to use
-			if (strpos($store, '/') === false)
-			{
-				$class = 'OAuthSession'.$store;
-				$file  = dirname(__FILE__) . '/session/'.$class.'.php';
-			}
-			else
-			{
-				$file  = $store;
-				$store = basename($file, '.php');
-				$class = $store;
-			}
-
-			if (is_file($file))
-			{
-				require_once $file;
-				
-				if (class_exists($class))
-				{
-					OAuthSession::$instance = new $class($options);
-				}
-				else
-				{
-					throw new OAuthException2('Could not find class '.$class.' in file '.$file);
-				}
-			}
-			else
-			{
-				throw new OAuthException2('No OAuthSession for '.$store.' (file '.$file.')');
-			}
-	    }
-	    return OAuthSession::$instance;	
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/OAuthStore.php b/vendor/oauth-php/library/OAuthStore.php
deleted file mode 100644
index ff6db0f..0000000
--- a/vendor/oauth-php/library/OAuthStore.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * This is the factory to select the store you want to use
- * 
- * @version $Id: OAuthStore.php 182 2011-01-12 14:57:29Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthException2.php';
-
-class OAuthStore
-{
-	static private $instance = false;
-
-	/**
-	 * Request an instance of the OAuthStore
-	 * 
-	 * @param string $store The storage system
-	 * @param array $options To pass to the storage system
-	 * @param boolean $forceNewInstance If true, forces the instantiation of a new store.
-	 * @throws OAuthException2
-	 */
-	public static function instance ( $store = 'MySQL', $options = array(), $forceNewInstance = false )
-	{
-	    if (!OAuthStore::$instance or $forceNewInstance)
-	    {
-			// Select the store you want to use
-			if (strpos($store, '/') === false)
-			{
-				$class = 'OAuthStore'.$store;
-				$file  = dirname(__FILE__) . '/store/'.$class.'.php';
-			}
-			else
-			{
-				$file  = $store;
-				$store = basename($file, '.php');
-				$class = $store;
-			}
-
-			if (is_file($file))
-			{
-				require_once $file;
-				
-				if (class_exists($class))
-				{
-					OAuthStore::$instance = new $class($options);
-				}
-				else
-				{
-					throw new OAuthException2('Could not find class '.$class.' in file '.$file);
-				}
-			}
-			else
-			{
-				throw new OAuthException2('No OAuthStore for '.$store.' (file '.$file.')');
-			}
-	    }
-	    return OAuthStore::$instance;	
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/body/OAuthBodyContentDisposition.php b/vendor/oauth-php/library/body/OAuthBodyContentDisposition.php
deleted file mode 100644
index 02b1e42..0000000
--- a/vendor/oauth-php/library/body/OAuthBodyContentDisposition.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * Add the extra headers for a PUT or POST request with a file.
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-class OAuthBodyContentDisposition
-{
-    /**
-     * Builds the request string.
-     * 
-     * The files array can be a combination of the following (either data or file):
-     * 
-     * file => "path/to/file", filename=, mime=, data=
-     *
-     * @param array files		(name => filedesc) (not urlencoded)
-     * @return array (headers, body)
-     */
-    static function encodeBody ( $files )
-    {
-    	$headers  	= array();
-		$body		= null;
-
-		// 1. Add all the files to the post
-		if (!empty($files))
-		{
-			foreach ($files as $name => $f)
-			{
-				$data     = false;
-				$filename = false;
-
-				if (isset($f['filename']))
-				{
-					$filename = $f['filename'];
-				}
-
-				if (!empty($f['file']))
-				{
-					$data = @file_get_contents($f['file']);
-					if ($data === false)
-					{
-						throw new OAuthException2(sprintf('Could not read the file "%s" for request body', $f['file']));
-					}
-					if (empty($filename))
-					{
-						$filename = basename($f['file']);
-					}
-				}
-				else if (isset($f['data']))
-				{
-					$data = $f['data'];
-				}
-				
-				// When there is data, add it as a request body, otherwise silently skip the upload
-				if ($data !== false)
-				{
-					if (isset($headers['Content-Disposition']))
-					{
-						throw new OAuthException2('Only a single file (or data) allowed in a signed PUT/POST request body.');
-					}
-
-					if (empty($filename))
-					{
-						$filename = 'untitled';
-					}
-					$mime  = !empty($f['mime']) ? $f['mime'] : 'application/octet-stream';
-					
-					$headers['Content-Disposition'] = 'attachment; filename="'.OAuthBodyContentDisposition::encodeParameterName($filename).'"';
-					$headers['Content-Type']		= $mime;
-
-					$body = $data;
-				}
-				
-			}
-
-			// When we have a body, add the content-length
-			if (!is_null($body))
-			{
-				$headers['Content-Length'] = strlen($body);
-			}
-		}
-		return array($headers, $body);
-	}
-	
-	
-	/**
-	 * Encode a parameter's name for use in a multipart header.
-	 * For now we do a simple filter that removes some unwanted characters.
-	 * We might want to implement RFC1522 here.  See http://tools.ietf.org/html/rfc1522
-	 * 
-	 * @param string name
-	 * @return string
-	 */
-	static function encodeParameterName ( $name )
-	{
-		return preg_replace('/[^\x20-\x7f]|"/', '-', $name);
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/body/OAuthBodyMultipartFormdata.php b/vendor/oauth-php/library/body/OAuthBodyMultipartFormdata.php
deleted file mode 100644
index a869e1e..0000000
--- a/vendor/oauth-php/library/body/OAuthBodyMultipartFormdata.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * Create the body for a multipart/form-data message.
- * 
- * @version $Id: OAuthMultipartFormdata.php 6 2008-02-13 12:35:09Z marcw@pobox.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Jan 31, 2008 12:50:05 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-class OAuthBodyMultipartFormdata
-{
-    /**
-     * Builds the request string.
-     * 
-     * The files array can be a combination of the following (either data or file):
-     * 
-     * file => "path/to/file", filename=, mime=, data=
-     *
-     * @param array params		(name => value) (all names and values should be urlencoded)
-     * @param array files		(name => filedesc) (not urlencoded)
-     * @return array (headers, body)
-     */
-    static function encodeBody ( $params, $files )
-    {
-    	$headers  	= array();
-		$body		= '';
-		$boundary	= 'OAuthRequester_'.md5(uniqid('multipart') . microtime());
-		$headers['Content-Type'] = 'multipart/form-data; boundary=' . $boundary;
-
-
-		// 1. Add the parameters to the post
-		if (!empty($params))
-		{
-			foreach ($params as $name => $value)
-			{
-				$body .= '--'.$boundary."\r\n";
-				$body .= 'Content-Disposition: form-data; name="'.OAuthBodyMultipartFormdata::encodeParameterName(rawurldecode($name)).'"';
-				$body .= "\r\n\r\n";
-				$body .= urldecode($value);
-				$body .= "\r\n";
-			}
-		}
-		
-		// 2. Add all the files to the post
-		if (!empty($files))
-		{
-			$untitled = 1;
-			
-			foreach ($files as $name => $f)
-			{
-				$data     = false;
-				$filename = false;
-
-				if (isset($f['filename']))
-				{
-					$filename = $f['filename'];
-				}
-
-				if (!empty($f['file']))
-				{
-					$data = @file_get_contents($f['file']);
-					if ($data === false)
-					{
-						throw new OAuthException2(sprintf('Could not read the file "%s" for form-data part', $f['file']));
-					}
-					if (empty($filename))
-					{
-						$filename = basename($f['file']);
-					}
-				}
-				else if (isset($f['data']))
-				{
-					$data = $f['data'];
-				}
-				
-				// When there is data, add it as a form-data part, otherwise silently skip the upload
-				if ($data !== false)
-				{
-					if (empty($filename))
-					{
-						$filename = sprintf('untitled-%d', $untitled++);
-					}
-					$mime  = !empty($f['mime']) ? $f['mime'] : 'application/octet-stream';
-					$body .= '--'.$boundary."\r\n";
-					$body .= 'Content-Disposition: form-data; name="'.OAuthBodyMultipartFormdata::encodeParameterName($name).'"; filename="'.OAuthBodyMultipartFormdata::encodeParameterName($filename).'"'."\r\n";
-					$body .= 'Content-Type: '.$mime;
-					$body .= "\r\n\r\n";
-					$body .= $data;
-					$body .= "\r\n";
-				}
-				
-			}
-		}
-		$body .= '--'.$boundary."--\r\n";
-
-		$headers['Content-Length'] = strlen($body);
-		return array($headers, $body);
-	}
-	
-	
-	/**
-	 * Encode a parameter's name for use in a multipart header.
-	 * For now we do a simple filter that removes some unwanted characters.
-	 * We might want to implement RFC1522 here.  See http://tools.ietf.org/html/rfc1522
-	 * 
-	 * @param string name
-	 * @return string
-	 */
-	static function encodeParameterName ( $name )
-	{
-		return preg_replace('/[^\x20-\x7f]|"/', '-', $name);
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/discovery/xrds_parse.php b/vendor/oauth-php/library/discovery/xrds_parse.php
deleted file mode 100644
index 7262bd9..0000000
--- a/vendor/oauth-php/library/discovery/xrds_parse.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-/**
- * Parse a XRDS discovery description to a simple array format.
- * 
- * For now a simple parse of the document. Better error checking
- * in a later version.
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/* example of use:
-
-header('content-type: text/plain');
-$file = file_get_contents('../../test/discovery/xrds-magnolia.xrds');
-$xrds = xrds_parse($file);
-print_r($xrds);
-
- */ 
-
-/**
- * Parse the xrds file in the argument.  The xrds description must have been 
- * fetched via curl or something else.
- * 
- * TODO: more robust checking, support for more service documents
- * TODO: support for URIs to definition instead of local xml:id
- * 
- * @param string data contents of xrds file
- * @exception Exception when the file is in an unknown format
- * @return array
- */
-function xrds_parse ( $data )
-{
-	$oauth = array();
-	$doc   = @DOMDocument::loadXML($data);
-	if ($doc === false)
-	{
-		throw new Exception('Error in XML, can\'t load XRDS document');
-	}
-	
-	$xpath = new DOMXPath($doc);
-	$xpath->registerNamespace('xrds',	'xri://$xrds');
-	$xpath->registerNamespace('xrd',  	'xri://$XRD*($v*2.0)');
-	$xpath->registerNamespace('simple', 'http://xrds-simple.net/core/1.0');
-
-	// Yahoo! uses this namespace, with lowercase xrd in it
-	$xpath->registerNamespace('xrd2',  	'xri://$xrd*($v*2.0)');
-
-	$uris = xrds_oauth_service_uris($xpath);
-
-	foreach ($uris as $uri)
-	{
-		// TODO: support uris referring to service documents outside this one
-		if ($uri[0] == '#')
-		{
-			$id    = substr($uri, 1);
-			$oauth = xrds_xrd_oauth($xpath, $id);
-			if (is_array($oauth) && !empty($oauth))
-			{
-				return $oauth;
-			}
-		}
-	}
-
-	return false;
-}
-
-
-/**
- * Parse a XRD definition for OAuth and return the uris etc.
- * 
- * @param XPath xpath
- * @param string id
- * @return array
- */
-function xrds_xrd_oauth ( $xpath, $id )
-{
-	$oauth = array();
-	$xrd   = $xpath->query('//xrds:XRDS/xrd:XRD[@xml:id="'.$id.'"]');
-	if ($xrd->length == 0)
-	{
-		// Yahoo! uses another namespace
-		$xrd = $xpath->query('//xrds:XRDS/xrd2:XRD[@xml:id="'.$id.'"]');
-	}
-
-	if ($xrd->length >= 1)
-	{
-		$x 		  = $xrd->item(0);
-		$services = array();
-		foreach ($x->childNodes as $n)
-		{
-			switch ($n->nodeName)
-			{
-			case 'Type':
-				if ($n->nodeValue != 'xri://$xrds*simple')
-				{
-					// Not a simple XRDS document
-					return false;
-				}
-				break;
-			case 'Expires':
-				$oauth['expires'] = $n->nodeValue;
-				break;
-			case 'Service':
-				list($type,$service) = xrds_xrd_oauth_service($n);
-				if ($type)
-				{
-					$services[$type][xrds_priority($n)][] = $service;
-				}
-				break;
-			}
-		}
-		
-		// Flatten the services on priority
-		foreach ($services as $type => $service)
-		{
-			$oauth[$type] = xrds_priority_flatten($service);
-		}
-	}
-	else
-	{
-		$oauth = false;
-	}
-	return $oauth;
-}
-
-
-/**
- * Parse a service definition for OAuth in a simple xrd element
- * 
- * @param DOMElement n
- * @return array (type, service desc)
- */
-function xrds_xrd_oauth_service ( $n )
-{
-	$service = array(
-				'uri'				=> '',
-				'signature_method'	=> array(),
-				'parameters'		=> array()
-				);
-
-	$type    = false;
-	foreach ($n->childNodes as $c)
-	{
-		$name  = $c->nodeName;
-		$value = $c->nodeValue;
-		
-		if ($name == 'URI')
-		{
-			$service['uri'] = $value;
-		}
-		else if ($name == 'Type')
-		{
-			if (strncmp($value, 'http://oauth.net/core/1.0/endpoint/', 35) == 0)
-			{
-				$type = basename($value);
-			}
-			else if (strncmp($value, 'http://oauth.net/core/1.0/signature/', 36) == 0)
-			{
-				$service['signature_method'][] = basename($value);
-			}
-			else if (strncmp($value, 'http://oauth.net/core/1.0/parameters/', 37) == 0)
-			{
-				$service['parameters'][] = basename($value);
-			}
-			else if (strncmp($value, 'http://oauth.net/discovery/1.0/consumer-identity/', 49) == 0)
-			{
-				$type = 'consumer_identity';
-				$service['method'] = basename($value);
-				unset($service['signature_method']);
-				unset($service['parameters']);
-			}
-			else
-			{
-				$service['unknown'][] = $value;
-			}
-		}
-		else if ($name == 'LocalID')
-		{
-			$service['consumer_key'] = $value;
-		}
-		else if ($name[0] != '#')
-		{
-			$service[strtolower($name)] = $value;
-		}
-	}
-	return array($type, $service);
-}
-
-
-/**
- * Return the OAuth service uris in order of the priority.
- * 
- * @param XPath xpath
- * @return array
- */
-function xrds_oauth_service_uris ( $xpath )
-{
-	$uris	   = array();
-	$xrd_oauth = $xpath->query('//xrds:XRDS/xrd:XRD/xrd:Service/xrd:Type[.=\'http://oauth.net/discovery/1.0\']');
-	if ($xrd_oauth->length > 0)
-	{
-		$service = array();
-		foreach ($xrd_oauth as $xo)
-		{
-			// Find the URI of the service definition
-			$cs = $xo->parentNode->childNodes;
-			foreach ($cs as $c)
-			{
-				if ($c->nodeName == 'URI')
-				{
-					$prio 			  = xrds_priority($xo);
-					$service[$prio][] = $c->nodeValue;
-				}
-			}
-		}
-		$uris = xrds_priority_flatten($service);
-	}
-	return $uris;
-}
-
-
-
-/**
- * Flatten an array according to the priority
- * 
- * @param array  ps buckets per prio
- * @return array one dimensional array
- */
-function xrds_priority_flatten ( $ps )
-{
-	$prio = array();
-	$null = array();
-	ksort($ps);
-	foreach ($ps as $idx => $bucket)
-	{
-		if (!empty($bucket))
-		{
-			if ($idx == 'null')
-			{
-				$null = $bucket;
-			}
-			else
-			{
-				$prio = array_merge($prio, $bucket);
-			}
-		}
-	}
-	$prio = array_merge($prio, $bucket);
-	return $prio;
-}
-
-
-/**
- * Fetch the priority of a element
- * 
- * @param DOMElement elt
- * @return mixed		'null' or int
- */
-function xrds_priority ( $elt )
-{
-	if ($elt->hasAttribute('priority'))
-	{
-		$prio = $elt->getAttribute('priority');
-		if (is_numeric($prio))
-		{
-			$prio = intval($prio);
-		}
-	}
-	else
-	{
-		$prio = 'null';
-	}
-	return $prio;
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
- 
-?>
diff --git a/vendor/oauth-php/library/discovery/xrds_parse.txt b/vendor/oauth-php/library/discovery/xrds_parse.txt
deleted file mode 100644
index fd867ea..0000000
--- a/vendor/oauth-php/library/discovery/xrds_parse.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-The xrds_parse.php script contains the function:
-
-	 function xrds_parse ( $data. )
-
-$data Contains the contents of a XRDS XML file.
-When the data is invalid XML then this will throw an exception.
-
-After parsing a XRDS definition it will return a datastructure much like the one below.
-
-Array
-(
-    [expires] => 2008-04-13T07:34:58Z
-    [request] => Array
-        (
-            [0] => Array
-                (
-                    [uri] => https://ma.gnolia.com/oauth/get_request_token
-                    [signature_method] => Array
-                        (
-                            [0] => HMAC-SHA1
-                            [1] => RSA-SHA1
-                            [2] => PLAINTEXT
-                        )
-
-                    [parameters] => Array
-                        (
-                            [0] => auth-header
-                            [1] => post-body
-                            [2] => uri-query
-                        )
-                )
-        )
-
-    [authorize] => Array
-        (
-            [0] => Array
-                (
-                    [uri] => http://ma.gnolia.com/oauth/authorize
-                    [signature_method] => Array
-                        (
-                        )
-
-                    [parameters] => Array
-                        (
-                            [0] => auth-header
-                            [1] => uri-query
-                        )
-                )
-        )
-
-    [access] => Array
-        (
-            [0] => Array
-                (
-                    [uri] => https://ma.gnolia.com/oauth/get_access_token
-                    [signature_method] => Array
-                        (
-                            [0] => HMAC-SHA1
-                            [1] => RSA-SHA1
-                            [2] => PLAINTEXT
-                        )
-
-                    [parameters] => Array
-                        (
-                            [0] => auth-header
-                            [1] => post-body
-                            [2] => uri-query
-                        )
-                )
-        )
-
-    [resource] => Array
-        (
-            [0] => Array
-                (
-                    [uri] => 
-                    [signature_method] => Array
-                        (
-                            [0] => HMAC-SHA1
-                            [1] => RSA-SHA1
-                        )
-
-                    [parameters] => Array
-                        (
-                            [0] => auth-header
-                            [1] => post-body
-                            [2] => uri-query
-                        )
-                )
-        )
-
-    [consumer_identity] => Array
-        (
-            [0] => Array
-                (
-                    [uri] => http://ma.gnolia.com/applications/new
-                    [method] => oob
-                )
-        )
-)
-
diff --git a/vendor/oauth-php/library/session/OAuthSessionAbstract.php b/vendor/oauth-php/library/session/OAuthSessionAbstract.php
deleted file mode 100644
index dcc80c1..0000000
--- a/vendor/oauth-php/library/session/OAuthSessionAbstract.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Abstract base class for OAuthStore implementations
- * 
- * @version $Id$
- * @author Bruno Barberi Gnecco <brunobg@corollarium.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2010 Corollarium Technologies
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * This class is used to store Session information on the server. Most 
- * people will use the $_SESSION based implementation, but you may prefer 
- * a SQL, Memcache or other implementation.
- *
- */
-abstract class OAuthSessionAbstract
-{
-	abstract public function get ( $key );
-	abstract public function set ( $key, $data );
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/session/OAuthSessionSESSION.php b/vendor/oauth-php/library/session/OAuthSessionSESSION.php
deleted file mode 100644
index 3201ecb..0000000
--- a/vendor/oauth-php/library/session/OAuthSessionSESSION.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Abstract base class for OAuthStore implementations
- * 
- * @version $Id$
- * @author Bruno Barberi Gnecco <brunobg@corollarium.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2010 Corollarium Technologies
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthSessionAbstract.class.php';
-
-class OAuthSessionSESSION extends OAuthSessionAbstract
-{
-	public function __construct( $options = array() )
-	{
-	}
-
-	/**
-	 * Gets a variable value
-	 * 
-	 * @param string $key
-	 * @return The value or null if not set.
-	 */
-	public function get ( $key ) 
-	{
-		return @$_SESSION[$key];
-	}
-	
-	/**
-	 * Sets a variable value
-	 * 
-	 * @param string $key The key
-	 * @param any $data The data 
-	 */
-	public function set ( $key, $data ) 
-	{
-		$_SESSION[$key] = $data;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php
deleted file mode 100644
index 34ccb42..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Interface for OAuth signature methods
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 8, 2008 12:04:35 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-abstract class OAuthSignatureMethod
-{
-	/**
-	 * Return the name of this signature
-	 * 
-	 * @return string
-	 */
-	abstract public function name();
-	
-	/**
-	 * Return the signature for the given request
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string  
-	 */
-	abstract public function signature ( $request, $base_string, $consumer_secret, $token_secret );
-
-	/**
-	 * Check if the request signature corresponds to the one calculated for the request.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string	data to be signed, usually the base string, can be a request body
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature		from the request, still urlencoded
-	 * @return string
-	 */
-	abstract public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature );
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php
deleted file mode 100644
index e189c93..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * OAuth signature implementation using HMAC-SHA1
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 8, 2008 12:21:19 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__).'/OAuthSignatureMethod.class.php';
-
-
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod
-{
-	public function name ()
-	{
-		return 'HMAC-SHA1';
-	}
-
-
-	/**
-	 * Calculate the signature using HMAC-SHA1
-	 * This function is copyright Andy Smith, 2007.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string  
-	 */
-	function signature ( $request, $base_string, $consumer_secret, $token_secret )
-	{
-		$key = $request->urlencode($consumer_secret).'&'.$request->urlencode($token_secret);
-		if (function_exists('hash_hmac'))
-		{
-			$signature = base64_encode(hash_hmac("sha1", $base_string, $key, true));
-		}
-		else
-		{
-		    $blocksize	= 64;
-		    $hashfunc	= 'sha1';
-		    if (strlen($key) > $blocksize)
-		    {
-		        $key = pack('H*', $hashfunc($key));
-		    }
-		    $key	= str_pad($key,$blocksize,chr(0x00));
-		    $ipad	= str_repeat(chr(0x36),$blocksize);
-		    $opad	= str_repeat(chr(0x5c),$blocksize);
-		    $hmac 	= pack(
-		                'H*',$hashfunc(
-		                    ($key^$opad).pack(
-		                        'H*',$hashfunc(
-		                            ($key^$ipad).$base_string
-		                        )
-		                    )
-		                )
-		            );
-			$signature = base64_encode($hmac);
-		}
-		return $request->urlencode($signature);
-	}
-
-
-	/**
-	 * Check if the request signature corresponds to the one calculated for the request.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string	data to be signed, usually the base string, can be a request body
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature		from the request, still urlencoded
-	 * @return string
-	 */
-	public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature )
-	{
-		$a = $request->urldecode($signature);
-		$b = $request->urldecode($this->signature($request, $base_string, $consumer_secret, $token_secret));
-
-		// We have to compare the decoded values
-		$valA  = base64_decode($a);
-		$valB  = base64_decode($b);
-
-		// Crude binary comparison
-		return rawurlencode($valA) == rawurlencode($valB);
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA256.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA256.php
deleted file mode 100644
index 2d037dd..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_HMAC_SHA256.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * OAuth signature implementation using HMAC-SHA256
- *
- * @author André Noack <noack@data-quest.de>
- *
- * The MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__).'/OAuthSignatureMethod.class.php';
-
-
-class OAuthSignatureMethod_HMAC_SHA256 extends OAuthSignatureMethod
-{
-	public function name ()
-	{
-		return 'HMAC-SHA256';
-	}
-
-
-	/**
-	 * Calculate the signature using HMAC-SHA1
-	 * This function is copyright Andy Smith, 2007.
-	 *
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string
-	 */
-	function signature ( $request, $base_string, $consumer_secret, $token_secret )
-	{
-		$key = $request->urlencode($consumer_secret).'&'.$request->urlencode($token_secret);
-		$signature = base64_encode(hash_hmac("sha256", $base_string, $key, true));
-        return $request->urlencode($signature);
-	}
-
-
-	/**
-	 * Check if the request signature corresponds to the one calculated for the request.
-	 *
-	 * @param OAuthRequest request
-	 * @param string base_string	data to be signed, usually the base string, can be a request body
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature		from the request, still urlencoded
-	 * @return string
-	 */
-	public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature )
-	{
-		$a = $request->urldecode($signature);
-		$b = $request->urldecode($this->signature($request, $base_string, $consumer_secret, $token_secret));
-
-		// We have to compare the decoded values
-		$valA  = base64_decode($a);
-		$valB  = base64_decode($b);
-
-		// Crude binary comparison
-		return rawurlencode($valA) == rawurlencode($valB);
-	}
-}
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_MD5.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_MD5.php
deleted file mode 100644
index a016709..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_MD5.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * OAuth signature implementation using MD5
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 8, 2008 12:09:43 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__).'/OAuthSignatureMethod.class.php';
-
-
-class OAuthSignatureMethod_MD5 extends OAuthSignatureMethod
-{
-	public function name ()
-	{
-		return 'MD5';
-	}
-
-
-	/**
-	 * Calculate the signature using MD5
-	 * Binary md5 digest, as distinct from PHP's built-in hexdigest.
-	 * This function is copyright Andy Smith, 2007.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string  
-	 */
-	function signature ( $request, $base_string, $consumer_secret, $token_secret )
-	{
-		$s  .= '&'.$request->urlencode($consumer_secret).'&'.$request->urlencode($token_secret);
-		$md5 = md5($base_string);
-		$bin = '';
-		
-		for ($i = 0; $i < strlen($md5); $i += 2)
-		{
-		    $bin .= chr(hexdec($md5{$i+1}) + hexdec($md5{$i}) * 16);
-		}
-		return $request->urlencode(base64_encode($bin));
-	}
-
-
-	/**
-	 * Check if the request signature corresponds to the one calculated for the request.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string	data to be signed, usually the base string, can be a request body
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature		from the request, still urlencoded
-	 * @return string
-	 */
-	public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature )
-	{
-		$a = $request->urldecode($signature);
-		$b = $request->urldecode($this->signature($request, $base_string, $consumer_secret, $token_secret));
-
-		// We have to compare the decoded values
-		$valA  = base64_decode($a);
-		$valB  = base64_decode($b);
-
-		// Crude binary comparison
-		return rawurlencode($valA) == rawurlencode($valB);
-	}
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php
deleted file mode 100644
index 92ef308..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * OAuth signature implementation using PLAINTEXT
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 8, 2008 12:09:43 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__).'/OAuthSignatureMethod.class.php';
-
-
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod
-{
-	public function name ()
-	{
-		return 'PLAINTEXT';
-	}
-
-
-	/**
-	 * Calculate the signature using PLAINTEXT
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string  
-	 */
-	function signature ( $request, $base_string, $consumer_secret, $token_secret )
-	{
-		return $request->urlencode($request->urlencode($consumer_secret).'&'.$request->urlencode($token_secret));
-	}
-
-
-	/**
-	 * Check if the request signature corresponds to the one calculated for the request.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string	data to be signed, usually the base string, can be a request body
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature		from the request, still urlencoded
-	 * @return string
-	 */
-	public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature )
-	{
-		$a = $request->urldecode($signature);
-		$b = $request->urldecode($this->signature($request, $base_string, $consumer_secret, $token_secret));
-
-		return $request->urldecode($a) == $request->urldecode($b);
-	}
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php b/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php
deleted file mode 100644
index 864dbfb..0000000
--- a/vendor/oauth-php/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * OAuth signature implementation using PLAINTEXT
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Sep 8, 2008 12:00:14 PM
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__).'/OAuthSignatureMethod.class.php';
-
-class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
-{
-	public function name() 
-	{
-		return 'RSA-SHA1';
-	}
-	
-
-	/**
-	 * Fetch the public CERT key for the signature
-	 * 
-	 * @param OAuthRequest request
-	 * @return string public key
-	 */
-	protected function fetch_public_cert ( $request )
-	{
-		// not implemented yet, ideas are:
-		// (1) do a lookup in a table of trusted certs keyed off of consumer
-		// (2) fetch via http using a url provided by the requester
-		// (3) some sort of specific discovery code based on request
-		//
-		// either way should return a string representation of the certificate
-		throw OAuthException2("OAuthSignatureMethod_RSA_SHA1::fetch_public_cert not implemented");
-	}
-	
-	
-	/**
-	 * Fetch the private CERT key for the signature
-	 * 
-	 * @param OAuthRequest request
-	 * @return string private key
-	 */
-	protected function fetch_private_cert ( $request )
-	{
-		// not implemented yet, ideas are:
-		// (1) do a lookup in a table of trusted certs keyed off of consumer
-		//
-		// either way should return a string representation of the certificate
-		throw OAuthException2("OAuthSignatureMethod_RSA_SHA1::fetch_private_cert not implemented");
-	}
-
-
-	/**
-	 * Calculate the signature using RSA-SHA1
-	 * This function is copyright Andy Smith, 2008.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @return string  
-	 */
-	public function signature ( $request, $base_string, $consumer_secret, $token_secret )
-	{
-		// Fetch the private key cert based on the request
-		$cert = $this->fetch_private_cert($request);
-		
-		// Pull the private key ID from the certificate
-		$privatekeyid = openssl_get_privatekey($cert);
-		
-		// Sign using the key
-		$sig = false;
-		$ok  = openssl_sign($base_string, $sig, $privatekeyid);   
-		
-		// Release the key resource
-		openssl_free_key($privatekeyid);
-		  
-		return $request->urlencode(base64_encode($sig));
-	}
-	
-
-	/**
-	 * Check if the request signature is the same as the one calculated for the request.
-	 * 
-	 * @param OAuthRequest request
-	 * @param string base_string
-	 * @param string consumer_secret
-	 * @param string token_secret
-	 * @param string signature
-	 * @return string  
-	 */
-	public function verify ( $request, $base_string, $consumer_secret, $token_secret, $signature )
-	{
-		$decoded_sig = base64_decode($request->urldecode($signature));
-		  
-		// Fetch the public key cert based on the request
-		$cert = $this->fetch_public_cert($request);
-		
-		// Pull the public key ID from the certificate
-		$publickeyid = openssl_get_publickey($cert);
-		
-		// Check the computed signature against the one passed in the query
-		$ok = openssl_verify($base_string, $decoded_sig, $publickeyid);   
-		
-		// Release the key resource
-		openssl_free_key($publickeyid);
-		return $ok == 1;
-	}
-
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStore2Leg.php b/vendor/oauth-php/library/store/OAuthStore2Leg.php
deleted file mode 100644
index d86505b..0000000
--- a/vendor/oauth-php/library/store/OAuthStore2Leg.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * OAuthStore implementation for 2 legged OAuth. This 'store' just saves the 
- * consumer_token and consumer_secret.
- * 
- * @version $Id$
- * @author Ben Hesketh <ben.hesketh@compassengine.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-class OAuthStore2Leg extends OAuthStoreAbstract
-{
-	protected $consumer_key;
-	protected $consumer_secret;
-	protected $signature_method = array('HMAC-SHA1');
-	protected $token_type = false;
-	
-	/*
-	 * Takes two options: consumer_key and consumer_secret
-	 */
-	public function __construct( $options = array() )
-	{
-		if(isset($options['consumer_key']) && isset($options['consumer_secret']))
-		{
-			$this->consumer_key = $options['consumer_key'];
-			$this->consumer_secret = $options['consumer_secret'];
-			if (isset($options['token_secret'])) 
-			{			
-				$this->token_secret = $options['token_secret'];
-			}
-		}
-		else
-		{
-			throw new OAuthException2("OAuthStore2Leg needs consumer_token and consumer_secret");
-		}
-	}
-
-	public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getSecretsForSignature ( $uri, $user_id ) 
-	{
-		return array(
-			'consumer_key' => $this->consumer_key,
-			'consumer_secret' => $this->consumer_secret,
-			'signature_methods' => $this->signature_method,
-			'token' => $this->token_type,
-			'token_secret' => $this->token_secret
-		);	
-	}
-	public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' ) 	{ throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getServer( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getServerForUri ( $uri, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listServerTokens ( $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function countServerTokens ( $consumer_key ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getServerToken ( $consumer_key, $token, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		//This method just needs to exist. It doesn't have to do anything!
-	}
-	
-	public function listServers ( $q = '', $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function updateServer ( $server, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumerStatic () { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function addConsumerRequestToken ( $consumer_key, $options = array() ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function countConsumerAccessTokens ( $consumer_key ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumerAccessToken ( $token, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function setConsumerAccessTokenTtl ( $token, $ttl ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	
-	public function listConsumers ( $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listConsumerApplications( $begin = 0, $total = 25 )  { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listConsumerTokens ( $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listLog ( $options, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	
-	public function install () { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }		
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreAbstract.php b/vendor/oauth-php/library/store/OAuthStoreAbstract.php
deleted file mode 100644
index 0b240ee..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreAbstract.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * Abstract base class for OAuthStore implementations
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-abstract class OAuthStoreAbstract
-{
-	abstract public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' );
-	abstract public function getSecretsForSignature ( $uri, $user_id );
-	abstract public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' );
-	abstract public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() );
-
-	abstract public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getServer( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getServerForUri ( $uri, $user_id );
-	abstract public function listServerTokens ( $user_id );
-	abstract public function countServerTokens ( $consumer_key );
-	abstract public function getServerToken ( $consumer_key, $token, $user_id );
-	abstract public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL );	
-	abstract public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false );
-	abstract public function listServers ( $q = '', $user_id );
-	abstract public function updateServer ( $server, $user_id, $user_is_admin = false );
-
-	abstract public function updateConsumer ( $consumer, $user_id, $user_is_admin = false );
-	abstract public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getConsumerStatic ();
-
-	abstract public function addConsumerRequestToken ( $consumer_key, $options = array() );
-	abstract public function getConsumerRequestToken ( $token );
-	abstract public function deleteConsumerRequestToken ( $token );
-	abstract public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' );
-	abstract public function countConsumerAccessTokens ( $consumer_key );
-	abstract public function exchangeConsumerRequestForAccessToken ( $token, $options = array() );
-	abstract public function getConsumerAccessToken ( $token, $user_id );
-	abstract public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false );
-	abstract public function setConsumerAccessTokenTtl ( $token, $ttl );
-	
-	abstract public function listConsumers ( $user_id );
-	abstract public function listConsumerApplications( $begin = 0, $total = 25 ); 
-	abstract public function listConsumerTokens ( $user_id );
-
-	abstract public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce );
-	
-	abstract public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null );
-	abstract public function listLog ( $options, $user_id );
-	
-	abstract public function install ();	
-	
-	/**
-	 * Fetch the current static consumer key for this site, create it when it was not found.
-	 * The consumer secret for the consumer key is always empty.
-	 * 
-	 * @return string	consumer key 
-	 */
-	
-	
-	/* ** Some handy utility functions ** */
-	
-	/**
-	 * Generate a unique key
-	 * 
-	 * @param boolean unique	force the key to be unique
-	 * @return string
-	 */
-	public function generateKey ( $unique = false )
-	{
-		$key = md5(uniqid(rand(), true));
-		if ($unique)
-		{
-			list($usec,$sec) = explode(' ',microtime());
-			$key .= dechex($usec).dechex($sec);
-		}
-		return $key;
-	}
-
-	/**
-	 * Check to see if a string is valid utf8
-	 * 
-	 * @param string $s
-	 * @return boolean
-	 */
-	protected function isUTF8 ( $s )
-	{
-		return preg_match('%(?:
-	       [\xC2-\xDF][\x80-\xBF]              # non-overlong 2-byte
-	       |\xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
-	       |[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-	       |\xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
-	       |\xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-	       |[\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-	       |\xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-	       )+%xs', $s);
-	}
-	
-	
-	/**
-	 * Make a string utf8, replacing all non-utf8 chars with a '.'
-	 * 
-	 * @param string
-	 * @return string
-	 */
-	protected function makeUTF8 ( $s )
-	{
-		if (function_exists('iconv'))
-		{
-			do
-			{
-				$ok   = true;
-				$text = @iconv('UTF-8', 'UTF-8//TRANSLIT', $s);
-				if (strlen($text) != strlen($s))
-				{
-					// Remove the offending character...
-					$s  = $text . '.' . substr($s, strlen($text) + 1);
-					$ok = false;
-				}
-			}
-			while (!$ok);
-		}
-		return $s;
-	}
-	
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreAnyMeta.php b/vendor/oauth-php/library/store/OAuthStoreAnyMeta.php
deleted file mode 100644
index b619ec0..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreAnyMeta.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * This file can only be used in conjunction with anyMeta.
- * 
- * @version $Id: OAuthStoreAnyMeta.php 68 2010-01-12 18:59:23Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreMySQL.php';
-
-
-class OAuthStoreAnymeta extends OAuthStoreMySQL
-{
-	/**
-	 * Construct the OAuthStoreAnymeta
-	 * 
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		parent::__construct(array('conn' => any_db_conn()));
-	}
-
-
-	/**
-	 * Add an entry to the log table
-	 * 
-	 * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-	 * @param string received
-	 * @param string sent
-	 * @param string base_string
-	 * @param string notes
-	 * @param int (optional) user_id
-	 */
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-	{
-		if (is_null($user_id) && isset($GLOBALS['any_auth']))
-		{
-			$user_id = $GLOBALS['any_auth']->getUserId();
-		}
-		parent::addLog($keys, $received, $sent, $base_string, $notes, $user_id);
-	}
-	
-	
-	/**
-	 * Get a page of entries from the log.  Returns the last 100 records
-	 * matching the options given.
-	 * 
-	 * @param array options
-	 * @param int user_id	current user
-	 * @return array log records
-	 */
-	public function listLog ( $options, $user_id )
-	{
-		$where = array();
-		$args  = array();
-		if (empty($options))
-		{
-			$where[] = 'olg_usa_id_ref = %d';
-			$args[]  = $user_id;
-		}
-		else
-		{
-			foreach ($options as $option => $value)
-			{
-				if (strlen($value) > 0)
-				{
-					switch ($option)
-					{
-					case 'osr_consumer_key':
-					case 'ocr_consumer_key':
-					case 'ost_token':
-					case 'oct_token':
-						$where[] = 'olg_'.$option.' = \'%s\'';
-						$args[]  = $value;	
-						break;				
-					}
-				}
-			}
-			
-			$where[] = '(olg_usa_id_ref IS NULL OR olg_usa_id_ref = %d)';
-			$args[]  = $user_id;
-		}
-
-		$rs = any_db_query_all_assoc('
-					SELECT olg_id,
-							olg_osr_consumer_key 	AS osr_consumer_key,
-							olg_ost_token			AS ost_token,
-							olg_ocr_consumer_key	AS ocr_consumer_key,
-							olg_oct_token			AS oct_token,
-							olg_usa_id_ref			AS user_id,
-							olg_received			AS received,
-							olg_sent				AS sent,
-							olg_base_string			AS base_string,
-							olg_notes				AS notes,
-							olg_timestamp			AS timestamp,
-							INET_NTOA(olg_remote_ip) AS remote_ip
-					FROM oauth_log
-					WHERE '.implode(' AND ', $where).'
-					ORDER BY olg_id DESC
-					LIMIT 0,100', $args);
-
-		return $rs;
-	}
-
-
-
-	/**
-	 * Initialise the database
-	 */
-	public function install ()
-	{
-		parent::install();
-
-		any_db_query("ALTER TABLE oauth_consumer_registry MODIFY ocr_usa_id_ref int(11) unsigned");
-		any_db_query("ALTER TABLE oauth_consumer_token    MODIFY oct_usa_id_ref int(11) unsigned not null");
-		any_db_query("ALTER TABLE oauth_server_registry   MODIFY osr_usa_id_ref int(11) unsigned");
-		any_db_query("ALTER TABLE oauth_server_token      MODIFY ost_usa_id_ref int(11) unsigned not null");
-		any_db_query("ALTER TABLE oauth_log               MODIFY olg_usa_id_ref int(11) unsigned");
-
-		any_db_alter_add_fk('oauth_consumer_registry', 'ocr_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete set null');
-		any_db_alter_add_fk('oauth_consumer_token',    'oct_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete cascade');
-		any_db_alter_add_fk('oauth_server_registry',   'osr_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete set null');
-		any_db_alter_add_fk('oauth_server_token',      'ost_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete cascade');
-		any_db_alter_add_fk('oauth_log',               'olg_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete cascade');
-	}
-
-	
-	
-	/** Some simple helper functions for querying the mysql db **/
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		any_db_query($sql, $args);
-	}
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_all_assoc($sql, $args);
-	}
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_row_assoc($sql, $args);
-	}
-
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_row($sql, $args);
-	}
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_one($sql, $args);
-	}
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 * 
-	 * @return int
-	 */
-	protected function query_affected_rows ()
-	{
-		return any_db_affected_rows();
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return any_db_insert_id();
-	}
-	
-	
-	private function sql_args ( $args )
-	{
-		$sql = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		return array($sql, $args);
-	}
-
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreMySQL.php b/vendor/oauth-php/library/store/OAuthStoreMySQL.php
deleted file mode 100644
index c568359..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreMySQL.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- * 
- * @version $Id: OAuthStoreMySQL.php 85 2010-02-19 14:56:40Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__) . '/OAuthStoreSQL.php';
-
-
-class OAuthStoreMySQL extends OAuthStoreSQL
-{
-	/**
-	 * The MySQL connection 
-	 */
-	protected $conn;
-
-	/**
-	 * Initialise the database
-	 */
-	public function install ()
-	{
-		require_once dirname(__FILE__) . '/mysql/install.php';
-	}
-	
-	
-	/* ** Some simple helper functions for querying the mysql db ** */
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if (is_resource($res))
-		{
-			mysql_free_result($res);
-		}
-	}
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		$rs = array();
-		while ($row  = mysql_fetch_assoc($res))
-		{
-			$rs[] = $row;
-		}
-		mysql_free_result($res);
-		return $rs;
-	}
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysql_fetch_assoc($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		mysql_free_result($res);
-		return $rs;
-	}
-
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysql_fetch_array($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		mysql_free_result($res);
-		return $rs;
-	}
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		$val = @mysql_result($res, 0, 0);
-		mysql_free_result($res);
-		return $val;
-	}
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	protected function query_affected_rows ()
-	{
-		return mysql_affected_rows($this->conn);
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return mysql_insert_id($this->conn);
-	}
-	
-	
-	protected function sql_printf ( $args )
-	{
-		$sql  = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		$args = array_map(array($this, 'sql_escape_string'), $args);
-		return vsprintf($sql, $args);
-	}
-	
-	
-	protected function sql_escape_string ( $s )
-	{
-		if (is_string($s))
-		{
-			return mysql_real_escape_string($s, $this->conn);
-		}
-		else if (is_null($s))
-		{
-			return NULL;
-		}
-		else if (is_bool($s))
-		{
-			return intval($s);
-		}
-		else if (is_int($s) || is_float($s))
-		{
-			return $s;
-		}
-		else
-		{
-			return mysql_real_escape_string(strval($s), $this->conn);
-		}
-	}
-	
-	
-	protected function sql_errcheck ( $sql )
-	{
-		if (mysql_errno($this->conn))
-		{
-			$msg =  "SQL Error in OAuthStoreMySQL: ".mysql_error($this->conn)."\n\n" . $sql;
-			throw new OAuthException2($msg);
-		}
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreMySQLi.php b/vendor/oauth-php/library/store/OAuthStoreMySQLi.php
deleted file mode 100644
index 09d71bf..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreMySQLi.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- * 
- * @version $Id: OAuthStoreMySQLi.php 64 2009-08-16 19:37:00Z marcw@pobox.com $
- * @author Bruno Barberi Gnecco <brunobg@users.sf.net> Based on code by Marc Worrell <marcw@pobox.com>
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/*
- * Modified from OAuthStoreMySQL to support MySQLi
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreMySQL.php';
-
-
-class OAuthStoreMySQLi extends OAuthStoreMySQL
-{
-	
-	public function install() {
-		$sql = file_get_contents(dirname(__FILE__) . '/mysql/mysql.sql');
-		$ps  = explode('#--SPLIT--', $sql);
-		
-		foreach ($ps as $p)
-		{
-			$p = preg_replace('/^\s*#.*$/m', '', $p);
-			
-			$this->query($p);
-			$this->sql_errcheck($p);
-		}		
-	}
-
-	/**
-	 * Construct the OAuthStoreMySQLi.
-	 * In the options you have to supply either:
-	 * - server, username, password and database (for a mysqli_connect)
-	 * - conn (for the connection to be used)
-	 * 
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		if (isset($options['conn']))
-		{
-			$this->conn = $options['conn'];
-		}
-		else
-		{
-			if (isset($options['server']))
-			{
-				$server   = $options['server'];
-				$username = $options['username'];
-				
-				if (isset($options['password']))
-				{
-					$this->conn = ($GLOBALS["___mysqli_ston"] = mysqli_connect($server,  $username,  $options['password']));
-				}
-				else
-				{
-					$this->conn = ($GLOBALS["___mysqli_ston"] = mysqli_connect($server,  $username));
-				}
-			}
-			else
-			{
-				// Try the default mysql connect
-				$this->conn = ($GLOBALS["___mysqli_ston"] = mysqli_connect());
-			}
-
-			if ($this->conn === false)
-			{
-				throw new OAuthException2('Could not connect to MySQL database: ' . ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false)));
-			}
-
-			if (isset($options['database']))
-			{
-				/* TODO: security. mysqli_ doesn't seem to have an escape identifier function.
-				$escapeddb = mysqli_real_escape_string($options['database']);
-				if (!((bool)mysqli_query( $this->conn, "USE `$escapeddb`" )))
-				{
-					$this->sql_errcheck();
-				}*/
-			}
-			$this->query('set character set utf8');
-		}
-	}
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if (!is_bool($res))
-		{
-			((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		}
-	}
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		$rs = array();
-		while ($row  = mysqli_fetch_assoc($res))
-		{
-			$rs[] = $row;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $rs;
-	}
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysqli_fetch_assoc($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $rs;
-	}
-
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysqli_fetch_array($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $rs;
-	}
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysqli_fetch_assoc($res))
-		{
-			$val = array_pop($row);
-		}
-		else
-		{
-			$val = false;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $val;
-	}
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	protected function query_affected_rows ()
-	{
-		return mysqli_affected_rows($this->conn);
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return ((is_null($___mysqli_res = mysqli_insert_id($this->conn))) ? false : $___mysqli_res);
-	}
-	
-	
-	protected function sql_printf ( $args )
-	{
-		$sql  = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		$args = array_map(array($this, 'sql_escape_string'), $args);
-		return vsprintf($sql, $args);
-	}
-	
-	
-	protected function sql_escape_string ( $s )
-	{
-		if (is_string($s))
-		{
-			return mysqli_real_escape_string( $this->conn, $s);
-		}
-		else if (is_null($s))
-		{
-			return NULL;
-		}
-		else if (is_bool($s))
-		{
-			return intval($s);
-		}
-		else if (is_int($s) || is_float($s))
-		{
-			return $s;
-		}
-		else
-		{
-			return mysqli_real_escape_string( $this->conn, strval($s));
-		}
-	}
-	
-	
-	protected function sql_errcheck ( $sql )
-	{
-		if (((is_object($this->conn)) ? mysqli_errno($this->conn) : (($___mysqli_res = mysqli_connect_errno()) ? $___mysqli_res : false)))
-		{
-			$msg =  "SQL Error in OAuthStoreMySQL: ".((is_object($this->conn)) ? mysqli_error($this->conn) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))."\n\n" . $sql;
-			throw new OAuthException2($msg);
-		}
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreOracle.php b/vendor/oauth-php/library/store/OAuthStoreOracle.php
deleted file mode 100644
index ea905a2..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreOracle.php
+++ /dev/null
@@ -1,1541 +0,0 @@
-<?php
-
-/**
- * Added by Vinay Kant Sahu.
- * Replaced all the MySQL queries with Oracle SPs. (ref: OAuthStoreSQL.php)
- * vinaykant.sahu@gmail.com
- *
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on Oracle
- *
- * @author Vinay Kant Sahu <vinaykant.sahu@gmail.com>
- * @date  Aug 6, 2010
- * 
- * The MIT License
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-abstract class OAuthStoreOracle extends OAuthStoreAbstract {
-    /**
-     * Maximum delta a timestamp may be off from a previous timestamp.
-     * Allows multiple consumers with some clock skew to work with the same token.
-     * Unit is seconds, default max skew is 10 minutes.
-     */
-    protected $max_timestamp_skew = MAX_TIMESTAMP_SKEW;
-
-    /**
-     * Default ttl for request tokens
-     */
-    protected $max_request_token_ttl = MAX_REQUEST_TOKEN_TIME;
-
-
-    /**
-     * Construct the OAuthStoreMySQL.
-     * In the options you have to supply either:
-     * - server, username, password and database (for a mysql_connect)
-     * - conn (for the connection to be used)
-     *
-     * @param array options
-     */
-    function __construct ( $options = array() ) {
-        if (isset($options['conn'])) {
-            $this->conn = $options['conn'];
-        }
-        else {
-            $this->conn=oci_connect(DBUSER,DBPASSWORD,DBHOST);
-
-            if ($this->conn === false) {
-                throw new OAuthException2('Could not connect to database');
-            }
-
-            // $this->query('set character set utf8');
-        }
-    }
-
-	/**
-	 * Find stored credentials for the consumer key and token. Used by an OAuth server
-	 * when verifying an OAuth request.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param string token_type		false, 'request' or 'access'
-	 * @exception OAuthException2 when no secrets where found
-	 * @return array	assoc (consumer_secret, token_secret, osr_id, ost_id, user_id)
-	 */
-	public function getSecretsForVerify ($consumer_key, $token, $token_type = 'access' ) {
-            $sql = "BEGIN SP_GET_SECRETS_FOR_VERIFY(:P_CONSUMER_KEY, :P_TOKEN, :P_TOKEN_TYPE, :P_ROWS, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-            
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-            oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-            oci_bind_by_name($stmt, ':P_TOKEN_TYPE', $token_type, 255);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Bind the ref cursor
-            $p_row = oci_new_cursor($this->conn);
-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-            //Execute the statement
-            oci_execute($stmt);
-
-            // treat the ref cursor as a statement resource
-            oci_execute($p_row, OCI_DEFAULT);
-            oci_fetch_all($p_row, $getSecretsForVerifyList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-
-            $rs =$getSecretsForVerifyList;
-            if (empty($rs)) {
-                throw new OAuthException2('The consumer_key "'.$consumer_key.'" token "'.$token.'" combination does not exist or is not enabled.');
-            }
- 
-            return $rs[0];
-        }
-
-
-	/**
-	 * Find the server details for signing a request, always looks for an access token.
-	 * The returned credentials depend on which local user is making the request.
-	 * 
-	 * The consumer_key must belong to the user or be public (user id is null)
-	 * 
-	 * For signing we need all of the following:
-	 * 
-	 * consumer_key			consumer key associated with the server
-	 * consumer_secret		consumer secret associated with this server
-	 * token				access token associated with this server
-	 * token_secret			secret for the access token
-	 * signature_methods	signing methods supported by the server (array)
-	 * 
-	 * @todo filter on token type (we should know how and with what to sign this request, and there might be old access tokens)
-	 * @param string uri	uri of the server
-	 * @param int user_id	id of the logged on user
-	 * @param string name	(optional) name of the token (case sensitive)
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getSecretsForSignature ( $uri, $user_id, $name = '' ) {
-            // Find a consumer key and token for the given uri
-            $ps     = parse_url($uri);
-            $host   = isset($ps['host']) ? $ps['host'] : 'localhost';
-            $path   = isset($ps['path']) ? $ps['path'] : '';
-
-            if (empty($path) || substr($path, -1) != '/') {
-                $path .= '/';
-            }
-            //
-            $sql = "BEGIN SP_GET_SECRETS_FOR_SIGNATURE(:P_HOST, :P_PATH, :P_USER_ID, :P_NAME, :P_ROWS, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_HOST', $host, 255);
-            oci_bind_by_name($stmt, ':P_PATH', $path, 255);
-            oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 20);
-            oci_bind_by_name($stmt, ':P_NAME', $name, 255);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Bind the ref cursor
-            $p_row = oci_new_cursor($this->conn);
-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-            //Execute the statement
-            oci_execute($stmt);
-
-            // treat the ref cursor as a statement resource
-            oci_execute($p_row, OCI_DEFAULT);
-            oci_fetch_all($p_row, $getSecretsForSignatureList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-            $secrets  = $getSecretsForSignatureList[0];
-            //
-            // The owner of the consumer_key is either the user or nobody (public consumer key)
-            /*$secrets = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							ocr_signature_methods	as signature_methods
-					FROM oauth_consumer_registry
-						JOIN oauth_consumer_token ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_server_uri_host = \'%s\'
-					  AND ocr_server_uri_path = LEFT(\'%s\', LENGTH(ocr_server_uri_path))
-					  AND (ocr_usa_id_ref = %s OR ocr_usa_id_ref IS NULL)
-					  AND oct_usa_id_ref	  = %d
-					  AND oct_token_type      = \'access\'
-					  AND oct_name			  = \'%s\'
-					  AND oct_token_ttl       >= NOW()
-					ORDER BY ocr_usa_id_ref DESC, ocr_consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-					LIMIT 0,1
-					', $host, $path, $user_id, $user_id, $name
-					);
-            */
-            if (empty($secrets)) {
-                throw new OAuthException2('No server tokens available for '.$uri);
-            }
-            $secrets['signature_methods'] = explode(',', $secrets['signature_methods']);
-            return $secrets;
-        }
-
-
-	/**
-	 * Get the token and token secret we obtained from a server.
-	 * 
-	 * @param string	consumer_key
-	 * @param string 	token
-	 * @param string	token_type
-	 * @param int		user_id			the user owning the token
-	 * @param string	name			optional name for a named token
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getServerTokenSecrets ($consumer_key,$token,$token_type,$user_id,$name = '')
-	{
-		if ($token_type != 'request' && $token_type != 'access')
-		{
-			throw new OAuthException2('Unkown token type "'.$token_type.'", must be either "request" or "access"');
-		}
-                //
-                $sql = "BEGIN SP_GET_SERVER_TOKEN_SECRETS(:P_CONSUMER_KEY, :P_TOKEN, :P_TOKEN_TYPE, :P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-                
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-                oci_bind_by_name($stmt, ':P_TOKEN_TYPE', $token_type, 20);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Bind the ref cursor
-                $p_row = oci_new_cursor($this->conn);
-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-                //Execute the statement
-                oci_execute($stmt);
-
-                // treat the ref cursor as a statement resource
-                oci_execute($p_row, OCI_DEFAULT);
-                oci_fetch_all($p_row, $getServerTokenSecretsList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-                $r=$getServerTokenSecretsList[0];
-                //
-		// Take the most recent token of the given type
-		/*$r = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_name				as token_name,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							IF(oct_token_ttl >= \'9999-12-31\', NULL, UNIX_TIMESTAMP(oct_token_ttl) - UNIX_TIMESTAMP(NOW())) as token_ttl
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_consumer_key = \'%s\'
-					  AND oct_token_type   = \'%s\'
-					  AND oct_token        = \'%s\'
-					  AND oct_usa_id_ref   = %d
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key, $token_type, $token, $user_id
-					);*/
-					
-		if (empty($r))
-		{
-			throw new OAuthException2('Could not find a "'.$token_type.'" token for consumer "'.$consumer_key.'" and user '.$user_id);
-		}
-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-		{
-			$r['signature_methods'] = explode(',',$r['signature_methods']);
-		}
-		else
-		{
-			$r['signature_methods'] = array();
-		}
-		return $r;		
-	}
-
-
-	/**
-	 * Add a request token we obtained from a server.
-	 * 
-	 * @todo remove old tokens for this user and this ocr_id
-	 * @param string consumer_key	key of the server in the consumer registry
-	 * @param string token_type		one of 'request' or 'access'
-	 * @param string token
-	 * @param string token_secret
-	 * @param int 	 user_id			the user owning the token
-	 * @param array  options			extra options, name and token_ttl
-	 * @exception OAuthException2 when server is not known
-	 * @exception OAuthException2 when we received a duplicate token
-	 */
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() )
-	{
-		if ($token_type != 'request' && $token_type != 'access')
-		{
-			throw new OAuthException2('Unknown token type "'.$token_type.'", must be either "request" or "access"');
-		}
-
-		// Maximum time to live for this token
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl = intval($options['token_ttl']);
-		}
-		else if ($token_type == 'request')
-		{
-			$ttl =intval($this->max_request_token_ttl);
-		}
-		else
-		{
-			$ttl = NULL;
-		}
-		
-		
-		
-		// Named tokens, unique per user/consumer key
-		if (isset($options['name']) && $options['name'] != '')
-		{
-			$name = $options['name'];
-		}
-		else
-		{
-			$name = '';
-		}
-                //
-                $sql = "BEGIN SP_ADD_SERVER_TOKEN(:P_CONSUMER_KEY, :P_USER_ID, :P_NAME, :P_TOKEN_TYPE, :P_TOKEN, :P_TOKEN_SECRET, :P_TOKEN_INTERVAL_IN_SEC, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_NAME', $name, 255);
-                oci_bind_by_name($stmt, ':P_TOKEN_TYPE', $token_type, 20);
-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-                oci_bind_by_name($stmt, ':P_TOKEN_SECRET', $token_secret, 255);
-                oci_bind_by_name($stmt, ':P_TOKEN_INTERVAL_IN_SEC', $ttl, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Execute the statement
-                oci_execute($stmt);
-                //
-
-              
-		
-		if (!$result)
-		{
-			throw new OAuthException2('Received duplicate token "'.$token.'" for the same consumer_key "'.$consumer_key.'"');
-		}
-	}
-
-
-	/**
-	 * Delete a server key.  This removes access to that site.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 */
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		
-            $sql = "BEGIN SP_DELETE_SERVER(:P_CONSUMER_KEY, :P_USER_ID, :P_USER_IS_ADMIN, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 255);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Execute the statement
-                oci_execute($stmt);
-	}
-	
-	
-	/**
-	 * Get a server from the consumer registry using the consumer key
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id
-	 * @param boolean user_is_admin (optional)
-	 * @exception OAuthException2 when server is not found
-	 * @return array
-	 */	
-	public function getServer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		
-                //
-                $sql = "BEGIN SP_GET_SERVER(:P_CONSUMER_KEY, :P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);                
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Bind the ref cursor
-                $p_row = oci_new_cursor($this->conn);
-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-                //Execute the statement
-                oci_execute($stmt);
-
-                // treat the ref cursor as a statement resource
-                oci_execute($p_row, OCI_DEFAULT);
-                oci_fetch_all($p_row, $getServerList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-                $r = $getServerList;
-                //
-		if (empty($r))
-		{
-			throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" has been registered (for this user)');
-		}
-			
-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-		{
-			$r['signature_methods'] = explode(',',$r['signature_methods']);
-		}
-		else
-		{
-			$r['signature_methods'] = array();
-		}
-		return $r;
-	}
-
-
-
-	/**
-	 * Find the server details that might be used for a request
-	 * 
-	 * The consumer_key must belong to the user or be public (user id is null)
-	 * 
-	 * @param string uri	uri of the server
-	 * @param int user_id	id of the logged on user
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getServerForUri ( $uri, $user_id )
-	{
-		// Find a consumer key and token for the given uri
-		$ps	= parse_url($uri);
-		$host	= isset($ps['host']) ? $ps['host'] : 'localhost';
-		$path	= isset($ps['path']) ? $ps['path'] : '';
-		
-		if (empty($path) || substr($path, -1) != '/')
-		{
-			$path .= '/';
-		}
-
-		
-                //
-                $sql = "BEGIN SP_GET_SERVER_FOR_URI(:P_HOST, :P_PATH,:P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_HOST', $host, 255);
-                oci_bind_by_name($stmt, ':P_PATH', $path, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Bind the ref cursor
-                $p_row = oci_new_cursor($this->conn);
-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-                //Execute the statement
-                oci_execute($stmt);
-
-                // treat the ref cursor as a statement resource
-                oci_execute($p_row, OCI_DEFAULT);
-                oci_fetch_all($p_row, $getServerForUriList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-                $server = $getServerForUriList;
-                //		
-		if (empty($server))
-		{
-			throw new OAuthException2('No server available for '.$uri);
-		}
-		$server['signature_methods'] = explode(',', $server['signature_methods']);
-		return $server;
-	}
-
-
-	/**
-	 * Get a list of all server token this user has access to.
-	 * 
-	 * @param int usr_id
-	 * @return array
-	 */
-	public function listServerTokens ( $user_id )
-	{
-		
-                $sql = "BEGIN SP_LIST_SERVER_TOKENS(:P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables                
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Bind the ref cursor
-                $p_row = oci_new_cursor($this->conn);
-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-                //Execute the statement
-                oci_execute($stmt);
-
-                // treat the ref cursor as a statement resource
-                oci_execute($p_row, OCI_DEFAULT);
-                oci_fetch_all($p_row, $listServerTokensList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-                $ts = $listServerTokensList;
-		return $ts;
-	}
-
-
-	/**
-	 * Count how many tokens we have for the given server
-	 * 
-	 * @param string consumer_key
-	 * @return int
-	 */
-	public function countServerTokens ( $consumer_key )
-	{
-		
-                //
-                $count =0;
-                $sql = "BEGIN SP_COUNT_SERVICE_TOKENS(:P_CONSUMER_KEY, :P_COUNT, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_COUNT', $count, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-                
-                //Execute the statement
-                oci_execute($stmt);                
-                //
-		return $count;
-	}
-
-
-	/**
-	 * Get a specific server token for the given user
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int user_id
-	 * @exception OAuthException2 when no such token found
-	 * @return array
-	 */
-	public function getServerToken ( $consumer_key, $token, $user_id )
-	{
-		
-                $sql = "BEGIN SP_GET_SERVER_TOKEN(:P_CONSUMER_KEY, :P_USER_ID,:P_TOKEN, :P_ROWS, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Bind the ref cursor
-                $p_row = oci_new_cursor($this->conn);
-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-                //Execute the statement
-                oci_execute($stmt);
-
-                // treat the ref cursor as a statement resource
-                oci_execute($p_row, OCI_DEFAULT);
-                oci_fetch_all($p_row, $getServerTokenList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-                $ts = $getServerTokenList;
-                //
-		
-		if (empty($ts))
-		{
-			throw new OAuthException2('No such consumer key ('.$consumer_key.') and token ('.$token.') combination for user "'.$user_id.'"');
-		}
-		return $ts;
-	}
-
-
-	/**
-	 * Delete a token we obtained from a server.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int user_id
-	 * @param boolean user_is_admin
-	 */
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false )
-	{
-		
-                //
-                $sql = "BEGIN SP_DELETE_SERVER_TOKEN(:P_CONSUMER_KEY, :P_USER_ID,:P_TOKEN, :P_USER_IS_ADMIN, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-                oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);                
-
-                //Execute the statement
-                oci_execute($stmt);
-                //
-
-        }
-
-
-	/**
-	 * Set the ttl of a server access token.  This is done when the
-	 * server receives a valid request with a xoauth_token_ttl parameter in it.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int token_ttl
-	 */
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		if ($token_ttl <= 0)
-		{
-			// Immediate delete when the token is past its ttl
-			$this->deleteServerToken($consumer_key, $token, 0, true);
-		}
-		else if ( $server_uri ) 
-		{
-			// TODO
-			throw new OAuthException2('server_uri not implemented in Oracle yet, sorry');	
-		}
-		else
-		{
-			// Set maximum time to live for this token
-
-			//
-			$sql = "BEGIN SP_SET_SERVER_TOKEN_TTL(:P_TOKEN_TTL, :P_CONSUMER_KEY, :P_TOKEN, :P_RESULT); END;";
-			
-			// parse sql
-			$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-			
-			// Bind In and Out Variables
-			oci_bind_by_name($stmt, ':P_TOKEN_TTL', $token_ttl, 40);
-			oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-			oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);                         
-			
-			//Execute the statement
-			oci_execute($stmt);
-//                    
-		}
-	}
-
-
-	/**
-	 * Get a list of all consumers from the consumer registry.
-	 * The consumer keys belong to the user or are public (user id is null)
-	 * 
-	 * @param string q	query term
-	 * @param int user_id
-	 * @return array
-	 */	
-	public function listServers ( $q = '', $user_id )
-	{
-		$q    = trim(str_replace('%', '', $q));
-		$args = array();
-
-		
-                //
-                $sql = "BEGIN SP_LIST_SERVERS(:P_Q, :P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_Q', $q, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-                //Bind the ref cursor
-                $p_row = oci_new_cursor($this->conn);
-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-                //Execute the statement
-                oci_execute($stmt);
-
-                // treat the ref cursor as a statement resource
-                oci_execute($p_row, OCI_DEFAULT);
-                oci_fetch_all($p_row, $listServersList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-                $servers = $listServersList;
-                //
-
-		return $servers;
-	}
-
-
-	/**
-	 * Register or update a server for our site (we will be the consumer)
-	 * 
-	 * (This is the registry at the consumers, registering servers ;-) )
-	 * 
-	 * @param array server
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 * @exception OAuthException2 when fields are missing or on duplicate consumer_key
-	 * @return consumer_key
-	 */
-        public function updateServer ( $server, $user_id, $user_is_admin = false ) {
-            foreach (array('consumer_key', 'server_uri') as $f) {
-                if (empty($server[$f])) {
-                    throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-                }
-            }
-            $parts = parse_url($server['server_uri']);
-            $host  = (isset($parts['host']) ? $parts['host'] : 'localhost');
-            $path  = (isset($parts['path']) ? $parts['path'] : '/');
-
-            if (isset($server['signature_methods'])) {
-                if (is_array($server['signature_methods'])) {
-                    $server['signature_methods'] = strtoupper(implode(',', $server['signature_methods']));
-                }
-            }
-            else {
-                $server['signature_methods'] = '';
-            }
-            // When the user is an admin, then the user can update the user_id of this record
-            if ($user_is_admin && array_key_exists('user_id', $server)) {
-                $flag=1;
-            }
-            if($flag) {
-                if (is_null($server['user_id'])) {
-                    $ocr_usa_id_ref= NULL;
-                }
-                else {
-                    $ocr_usa_id_ref = $server['user_id'];
-                }
-            }
-            else {
-                $flag=0;
-                $ocr_usa_id_ref=$user_id;
-            }
-            //sp
-            $sql = "BEGIN SP_UPDATE_SERVER(:P_CONSUMER_KEY, :P_USER_ID, :P_OCR_ID, :P_USER_IS_ADMIN,
-                 :P_OCR_CONSUMER_SECRET, :P_OCR_SERVER_URI, :P_OCR_SERVER_URI_HOST, :P_OCR_SERVER_URI_PATH,
-                 :P_OCR_REQUEST_TOKEN_URI, :P_OCR_AUTHORIZE_URI, :P_OCR_ACCESS_TOKEN_URI, :P_OCR_SIGNATURE_METHODS,
-                 :P_OCR_USA_ID_REF, :P_UPDATE_P_OCR_USA_ID_REF_FLAG, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-            $server['request_token_uri'] = isset($server['request_token_uri']) ? $server['request_token_uri'] : '';
-            $server['authorize_uri'] = isset($server['authorize_uri'])     ? $server['authorize_uri']     : '';
-            $server['access_token_uri'] = isset($server['access_token_uri'])  ? $server['access_token_uri']  : '';
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $server['consumer_key'], 255);
-            oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-            oci_bind_by_name($stmt, ':P_OCR_ID', $server['id'], 40);
-            oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 40);
-            oci_bind_by_name($stmt, ':P_OCR_CONSUMER_SECRET', $server['consumer_secret'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_SERVER_URI', $server['server_uri'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_SERVER_URI_HOST', strtolower($host), 255);
-            oci_bind_by_name($stmt, ':P_OCR_SERVER_URI_PATH', $path, 255);
-            oci_bind_by_name($stmt, ':P_OCR_REQUEST_TOKEN_URI', $server['request_token_uri'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_AUTHORIZE_URI', $server['authorize_uri'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_ACCESS_TOKEN_URI', $server['access_token_uri'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_SIGNATURE_METHODS', $server['signature_methods'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_USA_ID_REF', $ocr_usa_id_ref, 40);
-            oci_bind_by_name($stmt, ':P_UPDATE_P_OCR_USA_ID_REF_FLAG', $flag, 40);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-            
-            //Execute the statement
-            oci_execute($stmt);
-
-            return $server['consumer_key'];
-        }
-
-	/**
-	 * Insert/update a new consumer with this server (we will be the server)
-	 * When this is a new consumer, then also generate the consumer key and secret.
-	 * Never updates the consumer key and secret.
-	 * When the id is set, then the key and secret must correspond to the entry
-	 * being updated.
-	 * 
-	 * (This is the registry at the server, registering consumers ;-) )
-	 * 
-	 * @param array consumer
-	 * @param int user_id	user registering this consumer
-	 * @param boolean user_is_admin
-	 * @return string consumer key
-	 */
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false ) {
-            $consumer_key = $this->generateKey(true);
-            $consumer_secret = $this->generateKey();
-			
- $consumer['callback_uri'] = isset($consumer['callback_uri'])? $consumer['callback_uri']: '';
-            $consumer['application_uri'] = isset($consumer['application_uri'])? $consumer['application_uri']: '';
-            $consumer['application_title'] = isset($consumer['application_title'])? $consumer['application_title']: '';
-            $consumer['application_descr'] = isset($consumer['application_descr'])? $consumer['application_descr']: '';
-            $consumer['application_notes'] = isset($consumer['application_notes'])? $consumer['application_notes']: '';
-            $consumer['application_type'] = isset($consumer['application_type'])? $consumer['application_type']: '';
-            $consumer['application_commercial'] = isset($consumer['application_commercial'])?$consumer['application_commercial']:0;
-			
-            //sp
-            $sql = "BEGIN SP_UPDATE_CONSUMER(:P_OSR_USA_ID_REF, :P_OSR_CONSUMER_KEY, :P_OSR_CONSUMER_SECRET, :P_OSR_REQUESTER_NAME, :P_OSR_REQUESTER_EMAIL, :P_OSR_CALLBACK_URI, :P_OSR_APPLICATION_URI, :P_OSR_APPLICATION_TITLE  , :P_OSR_APPLICATION_DESCR, :P_OSR_APPLICATION_NOTES, :P_OSR_APPLICATION_TYPE, :P_OSR_APPLICATION_COMMERCIAL, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-			
-           
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_OSR_USA_ID_REF', $user_id, 40);
-            oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $consumer_key, 255);
-            oci_bind_by_name($stmt, ':P_OSR_CONSUMER_SECRET', $consumer_secret, 255);
-            oci_bind_by_name($stmt, ':P_OSR_REQUESTER_NAME', $consumer['requester_name'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_REQUESTER_EMAIL', $consumer['requester_email'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_CALLBACK_URI', $consumer['callback_uri'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_URI', $consumer['application_uri'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_TITLE', $consumer['application_title'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_DESCR', $consumer['application_descr'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_NOTES', $consumer['application_notes'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_TYPE', $consumer['application_type'], 255);
-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_COMMERCIAL', $consumer['application_commercial'], 40);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Execute the statement
-            oci_execute($stmt);
-			echo $result;
-            return $consumer_key;
-        }
-
-
-
-	/**
-	 * Delete a consumer key.  This removes access to our site for all applications using this key.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 */
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		
-                //
-                $sql = "BEGIN SP_DELETE_CONSUMER(:P_CONSUMER_KEY, :P_USER_ID, :P_USER_IS_ADMIN, :P_RESULT); END;";
-
-                // parse sql
-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-                // Bind In and Out Variables
-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);
-                oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 40);
-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);               
-
-                //Execute the statement
-                oci_execute($stmt);
-                //
-        }
-	
-	
-	
-	/**
-	 * Fetch a consumer of this server, by consumer_key.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id
-	 * @param boolean user_is_admin (optional)
-	 * @exception OAuthException2 when consumer not found
-	 * @return array
-	 */
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false ) {
-           
-            $sql = "BEGIN SP_GET_CONSUMER(:P_CONSUMER_KEY, :P_ROWS, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Bind the ref cursor
-            $p_row = oci_new_cursor($this->conn);
-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-            //Execute the statement
-            oci_execute($stmt);
-
-            // treat the ref cursor as a statement resource
-            oci_execute($p_row, OCI_DEFAULT);
-            oci_fetch_all($p_row, $getConsumerList, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-
-            $consumer = $getConsumerList;
-           
-		    if (!is_array($consumer)) {
-                throw new OAuthException2('No consumer with consumer_key "'.$consumer_key.'"');
-            }
-
-            $c = array();
-            foreach ($consumer as $key => $value) {
-                $c[substr($key, 4)] = $value;
-            }
-            $c['user_id'] = $c['usa_id_ref'];
-
-            if (!$user_is_admin && !empty($c['user_id']) && $c['user_id'] != $user_id) {
-                throw new OAuthException2('No access to the consumer information for consumer_key "'.$consumer_key.'"');
-            }
-            return $c;
-        }
-
-
-	/**
-	 * Fetch the static consumer key for this provider.  The user for the static consumer 
-	 * key is NULL (no user, shared key).  If the key did not exist then the key is created.
-	 * 
-	 * @return string
-	 */
-	public function getConsumerStatic ()
-	{
-		
-		 //
-		$sql = "BEGIN SP_GET_CONSUMER_STATIC_SELECT(:P_OSR_CONSUMER_KEY, :P_RESULT); END;";
-
-		// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $consumer, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);               
-
-		//Execute the statement
-		oci_execute($stmt);
-
-		if (empty($consumer))
-		{
-			$consumer_key = 'sc-'.$this->generateKey(true);
-			
-			$sql = "BEGIN SP_CONSUMER_STATIC_SAVE(:P_OSR_CONSUMER_KEY, :P_RESULT); END;";
-
-			// parse sql
-			$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-			// Bind In and Out Variables
-			oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $consumer_key, 255);
-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);               
-
-			//Execute the statement
-			oci_execute($stmt);
-			
-			
-			// Just make sure that if the consumer key is truncated that we get the truncated string
-			$consumer = $consumer_key;
-		}
-		return $consumer;
-	}
-
-
-	/**
-	 * Add an unautorized request token to our server.
-	 * 
-	 * @param string consumer_key
-	 * @param array options		(eg. token_ttl)
-	 * @return array (token, token_secret)
-	 */
-	public function addConsumerRequestToken ( $consumer_key, $options = array() )
-	{
-		$token  = $this->generateKey(true);
-		$secret = !isset($options['secret']) ? $this->generateKey() : $options['secret'];
-		 
-
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl = intval($options['token_ttl']);
-		}
-		else
-		{
-			$ttl = $this->max_request_token_ttl;
-		}
-
-		if (!isset($options['oauth_callback'])) {
-	 		// 1.0a Compatibility : store callback url associated with request token
-			$options['oauth_callback']='oob';
- 		}
-		$options_oauth_callback =$options['oauth_callback'];
-		$sql = "BEGIN SP_ADD_CONSUMER_REQUEST_TOKEN(:P_TOKEN_TTL, :P_CONSUMER_KEY, :P_TOKEN, :P_TOKEN_SECRET, :P_CALLBACK_URL, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
- 
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_TOKEN_TTL', $ttl, 20);
-		oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN_SECRET', $secret, 255);
-		oci_bind_by_name($stmt, ':P_CALLBACK_URL', $options_oauth_callback, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-		//Execute the statement
-		oci_execute($stmt);
-		
-
-		$returnArray= array('token'=>$token, 'token_secret'=>$secret, 'token_ttl'=>$ttl);
-		return $returnArray;
-	}
-	
-	
-	/**
-	 * Fetch the consumer request token, by request token.
-	 * 
-	 * @param string token
-	 * @return array  token and consumer details
-	 */
-	public function getConsumerRequestToken ( $token )
-	{
-		 
-		$sql = "BEGIN SP_GET_CONSUMER_REQUEST_TOKEN(:P_TOKEN, :P_ROWS, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Bind the ref cursor
-            $p_row = oci_new_cursor($this->conn);
-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-            //Execute the statement
-            oci_execute($stmt);
-
-            // treat the ref cursor as a statement resource
-            oci_execute($p_row, OCI_DEFAULT);
-			  
-            oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);
- 
-		return $rs[0];
-	}
-	
-
-	/**
-	 * Delete a consumer token.  The token must be a request or authorized token.
-	 * 
-	 * @param string token
-	 */
-	public function deleteConsumerRequestToken ( $token )
-	{
-		 
-		$sql = "BEGIN SP_DEL_CONSUMER_REQUEST_TOKEN(:P_TOKEN, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-		//Execute the statement
-		oci_execute($stmt);
-	}
-	
-
-	/**
-	 * Upgrade a request token to be an authorized request token.
-	 * 
-	 * @param string token
-	 * @param int	 user_id  user authorizing the token
-	 * @param string referrer_host used to set the referrer host for this token, for user feedback
-	 */
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' )
-	{
- 		// 1.0a Compatibility : create a token verifier
- 		$verifier = substr(md5(rand()),0,10);
-		
-		$sql = "BEGIN SP_AUTH_CONSUMER_REQ_TOKEN(:P_USER_ID, :P_REFERRER_HOST, :P_VERIFIER, :P_TOKEN, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);
-		oci_bind_by_name($stmt, ':P_REFERRER_HOST', $referrer_host, 255);
-		oci_bind_by_name($stmt, ':P_VERIFIER', $verifier, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-		//Execute the statement
-		oci_execute($stmt);
-
-		return $verifier;
-	}
-
-
-	/**
-	 * Count the consumer access tokens for the given consumer.
-	 * 
-	 * @param string consumer_key
-	 * @return int
-	 */
-	public function countConsumerAccessTokens ( $consumer_key )
-	{
-		/*$count = $this->query_one('
-					SELECT COUNT(ost_id)
-					FROM oauth_server_token
-							JOIN oauth_server_registry
-							ON ost_osr_id_ref = osr_id
-					WHERE ost_token_type   = \'access\'
-					  AND osr_consumer_key = \'%s\'
-					  AND ost_token_ttl    >= NOW()
-					', $consumer_key);
-		*/
-		$sql = "BEGIN SP_COUNT_CONSUMER_ACCESS_TOKEN(:P_CONSUMER_KEY, :P_COUNT, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-		oci_bind_by_name($stmt, ':P_COUNT', $count, 20);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-		//Execute the statement
-		oci_execute($stmt);
-
-		return $count;
-	}
-
-
-	/**
-	 * Exchange an authorized request token for new access token.
-	 * 
-	 * @param string token
-	 * @param array options		options for the token, token_ttl
-	 * @exception OAuthException2 when token could not be exchanged
-	 * @return array (token, token_secret)
-	 */
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() )
-	{
-		$new_token  = $this->generateKey(true);
-		$new_secret = $this->generateKey();
-		
-		$sql = "BEGIN SP_EXCH_CONS_REQ_FOR_ACC_TOKEN(:P_TOKEN_TTL, :P_NEW_TOKEN, :P_TOKEN, :P_TOKEN_SECRET, :P_VERIFIER, :P_OUT_TOKEN_TTL, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_TOKEN_TTL', $options['token_ttl'], 255);
-		oci_bind_by_name($stmt, ':P_NEW_TOKEN', $new_token, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN_SECRET', $new_secret, 255);
-		oci_bind_by_name($stmt, ':P_VERIFIER', $options['verifier'], 255);
-		oci_bind_by_name($stmt, ':P_OUT_TOKEN_TTL', $ttl, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-		//Execute the statement
-		oci_execute($stmt);
-
-		$ret = array('token' => $new_token, 'token_secret' => $new_secret);
-		if (is_numeric($ttl))
-		{
-			$ret['token_ttl'] = intval($ttl);
-		}
-		return $ret;
-	}
-
-
-	/**
-	 * Fetch the consumer access token, by access token.
-	 * 
-	 * @param string token
-	 * @param int user_id
-	 * @exception OAuthException2 when token is not found
-	 * @return array  token and consumer details
-	 */
-	public function getConsumerAccessToken ( $token, $user_id )
-	{
-		 
-		$sql = "BEGIN SP_GET_CONSUMER_ACCESS_TOKEN(:P_USER_ID, :P_TOKEN, :P_ROWS :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_USER_ID',$user_id, 255);
-            oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Bind the ref cursor
-            $p_row = oci_new_cursor($this->conn);
-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-            //Execute the statement
-            oci_execute($stmt);
-
-            // treat the ref cursor as a statement resource
-            oci_execute($p_row, OCI_DEFAULT);
-            oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-		if (empty($rs))
-		{
-			throw new OAuthException2('No server_token "'.$token.'" for user "'.$user_id.'"');
-		}
-		return $rs;
-	}
-
-
-	/**
-	 * Delete a consumer access token.
-	 * 
-	 * @param string token
-	 * @param int user_id
-	 * @param boolean user_is_admin
-	 */
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false )
-	{
-		/*if ($user_is_admin)
-		{
-			$this->query('
-						DELETE FROM oauth_server_token
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						', $token);
-		}
-		else
-		{
-			$this->query('
-						DELETE FROM oauth_server_token
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						  AND ost_usa_id_ref = %d
-						', $token, $user_id);
-		}*/
-		$sql = "BEGIN SP_DEL_CONSUMER_ACCESS_TOKEN(:P_USER_ID, :P_TOKEN, :P_USER_IS_ADMIN, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-		oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 20);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-		//Execute the statement
-		oci_execute($stmt);
-	}
-
-
-	/**
-	 * Set the ttl of a consumer access token.  This is done when the
-	 * server receives a valid request with a xoauth_token_ttl parameter in it.
-	 * 
-	 * @param string token
-	 * @param int ttl
-	 */
-	public function setConsumerAccessTokenTtl ( $token, $token_ttl )
-	{
-		if ($token_ttl <= 0)
-		{
-			// Immediate delete when the token is past its ttl
-			$this->deleteConsumerAccessToken($token, 0, true);
-		}
-		else
-		{
-			// Set maximum time to live for this token
-			 
-			
-			$sql = "BEGIN SP_SET_CONSUMER_ACC_TOKEN_TTL(:P_TOKEN, :P_TOKEN_TTL, :P_RESULT); END;";
-
-			// parse sql
-			$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-			// Bind In and Out Variables
-			oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-			oci_bind_by_name($stmt, ':P_TOKEN_TTL', $token_ttl, 20);
-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-			//Execute the statement
-			oci_execute($stmt);
-		}
-	}
-
-
-	/**
-	 * Fetch a list of all consumer keys, secrets etc.
-	 * Returns the public (user_id is null) and the keys owned by the user
-	 * 
-	 * @param int user_id
-	 * @return array
-	 */
-	public function listConsumers ( $user_id )
-	{
-
-		$sql = "BEGIN SP_LIST_CONSUMERS(:P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-		// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-		//Bind the ref cursor
-		$p_row = oci_new_cursor($this->conn);
-		oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-		//Execute the statement
-		oci_execute($stmt);
-
-		// treat the ref cursor as a statement resource
-		oci_execute($p_row, OCI_DEFAULT);
-		oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-
-		return $rs;
-	}
-
-	/**
-	 * List of all registered applications. Data returned has not sensitive 
-	 * information and therefore is suitable for public displaying.
-	 * 
-	 * @param int $begin
-	 * @param int $total
-	 * @return array
-	 */
-	public function listConsumerApplications($begin = 0, $total = 25) 
-	{
-		// TODO
-		return array();
-	}
-
-	/**
-	 * Fetch a list of all consumer tokens accessing the account of the given user.
-	 * 
-	 * @param int user_id
-	 * @return array
-	 */
-	public function listConsumerTokens ( $user_id )
-	{
-	 
-		$sql = "BEGIN SP_LIST_CONSUMER_TOKENS(:P_USER_ID, :P_ROWS, :P_RESULT); END;";
-
-		// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-		//Bind the ref cursor
-		$p_row = oci_new_cursor($this->conn);
-		oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-		//Execute the statement
-		oci_execute($stmt);
-
-		// treat the ref cursor as a statement resource
-		oci_execute($p_row, OCI_DEFAULT);
-		oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-
-		return $rs;
-	}
-
-
-	/**
-	 * Check an nonce/timestamp combination.  Clears any nonce combinations
-	 * that are older than the one received.
-	 * 
-	 * @param string	consumer_key
-	 * @param string 	token
-	 * @param int		timestamp
-	 * @param string 	nonce
-	 * @exception OAuthException2	thrown when the timestamp is not in sequence or nonce is not unique
-	 */
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce )
-	{
-		
-		 $sql = "BEGIN SP_CHECK_SERVER_NONCE(:P_CONSUMER_KEY, :P_TOKEN, :P_TIMESTAMP, :P_MAX_TIMESTAMP_SKEW, :P_NONCE, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);
-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);
-		oci_bind_by_name($stmt, ':P_TIMESTAMP', $timestamp, 255);
-		oci_bind_by_name($stmt, ':P_MAX_TIMESTAMP_SKEW', $this->max_timestamp_skew, 20);
-		oci_bind_by_name($stmt, ':P_NONCE', $nonce, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-		//Execute the statement
-		oci_execute($stmt);
-		
-	}
-
-
-	/**
-	 * Add an entry to the log table
-	 * 
-	 * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-	 * @param string received
-	 * @param string sent
-	 * @param string base_string
-	 * @param string notes
-	 * @param int (optional) user_id
-	 */
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-	{
-		$args = array();
-		$ps   = array();
-		foreach ($keys as $key => $value)
-		{
-			$args[] = $value;
-			$ps[]   = "olg_$key = '%s'";
-		}
-
-		if (!empty($_SERVER['REMOTE_ADDR']))
-		{
-			$remote_ip = $_SERVER['REMOTE_ADDR'];
-		}	
-		else if (!empty($_SERVER['REMOTE_IP']))
-		{
-			$remote_ip = $_SERVER['REMOTE_IP'];
-		}
-		else
-		{
-			$remote_ip = '0.0.0.0';
-		}
-
-		// Build the SQL
-		$olg_received = $this->makeUTF8($received);
-		$olg_sent = $this->makeUTF8($sent);
-		$olg_base_string = $base_string;
-		$olg_notes = $this->makeUTF8($notes);
-		$olg_usa_id_ref = $user_id;
-		$olg_remote_ip = $remote_ip;
-
-		 
-
-		$sql = "BEGIN SP_ADD_LOG(:P_RECEIVED, :P_SENT, :P_BASE_STRING, :P_NOTES, :P_USA_ID_REF, :P_REMOTE_IP, :P_RESULT); END;";
-
-			// parse sql
-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-		// Bind In and Out Variables
-		oci_bind_by_name($stmt, ':P_RECEIVED', $olg_received, 255);
-		oci_bind_by_name($stmt, ':P_SENT', $olg_sent, 255);
-		oci_bind_by_name($stmt, ':P_BASE_STRING', $olg_base_string, 255);
-		oci_bind_by_name($stmt, ':P_NOTES', $olg_notes, 255);
-		oci_bind_by_name($stmt, ':P_USA_ID_REF', $olg_usa_id_ref, 255);
-		oci_bind_by_name($stmt, ':P_REMOTE_IP', $olg_remote_ip, 255);
-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-
-		//Execute the statement
-		oci_execute($stmt);
-	}
-	
-	
-	/**
-	 * Get a page of entries from the log.  Returns the last 100 records
-	 * matching the options given.
-	 * 
-	 * @param array options
-	 * @param int user_id	current user
-	 * @return array log records
-	 */
-	public function listLog ( $options, $user_id )
-	{
-		
-		 if (empty($options))
-		{
-			$optionsFlag=NULL;
-			
-		}
-		else
-		{
-			$optionsFlag=1;
-			
-		}
-	
-		$sql = "BEGIN SP_LIST_LOG(:P_OPTION_FLAG, :P_USA_ID, :P_OSR_CONSUMER_KEY, :P_OCR_CONSUMER_KEY, :P_OST_TOKEN, :P_OCT_TOKEN, :P_ROWS, :P_RESULT); END;";
-
-            // parse sql
-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');
-
-            // Bind In and Out Variables
-            oci_bind_by_name($stmt, ':P_OPTION_FLAG', $optionsFlag, 255);
-            oci_bind_by_name($stmt, ':P_USA_ID', $user_id, 40);
-			oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $options['osr_consumer_key'], 255);
-            oci_bind_by_name($stmt, ':P_OCR_CONSUMER_KEY', $options['ocr_consumer_key'], 255);
-			oci_bind_by_name($stmt, ':P_OST_TOKEN', $options['ost_token'], 255);
-            oci_bind_by_name($stmt, ':P_OCT_TOKEN', $options['oct_token'], 255);
-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);
-
-            //Bind the ref cursor
-            $p_row = oci_new_cursor($this->conn);
-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);
-
-            //Execute the statement
-            oci_execute($stmt);
-
-            // treat the ref cursor as a statement resource
-            oci_execute($p_row, OCI_DEFAULT);
-            oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);
-
-		return $rs;
-	}
-
-	/**
-	 * Initialise the database
-	 */
-	public function install ()
-	{
-		require_once dirname(__FILE__) . '/oracle/install.php';
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStorePDO.php b/vendor/oauth-php/library/store/OAuthStorePDO.php
deleted file mode 100644
index aa3a1b9..0000000
--- a/vendor/oauth-php/library/store/OAuthStorePDO.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- *
- * @version $Id: OAuthStorePDO.php 64 2009-08-16 19:37:00Z marcw@pobox.com $
- * @author Bruno Barberi Gnecco <brunobg@users.sf.net> Based on code by Marc Worrell <marcw@pobox.com>
- *
- *
- * The MIT License
- *
- * Copyright (c) 2007-2008 Mediamatic Lab
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreSQL.php';
-
-
-class OAuthStorePDO extends OAuthStoreSQL
-{
-	private $conn; // PDO connection
-	private $lastaffectedrows;
-
-	/**
-	 * Construct the OAuthStorePDO.
-	 * In the options you have to supply either:
-	 * - dsn, username, password and database (for a new PDO connection)
-	 * - conn (for the connection to be used)
-	 *
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		if (isset($options['conn']))
-		{
-			$this->conn = $options['conn'];
-		}
-		else if (isset($options['dsn']))
-		{
-			try
-			{
-				$this->conn = new PDO($options['dsn'], $options['username'], @$options['password']);
-			}
-			catch (PDOException $e)
-			{
-				throw new OAuthException2('Could not connect to PDO database: ' . $e->getMessage());
-			}
-
-			$this->query('set character set utf8');
-		}
-	}
-
-	/**
-	 * Perform a query, ignore the results
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		try
-		{
-			$this->lastaffectedrows = $this->conn->exec($sql);
-			if ($this->lastaffectedrows === FALSE) {
-				$this->sql_errcheck($sql);
-			}
-		}
-		catch (PDOException $e)
-		{
-			$this->sql_errcheck($sql);
-		}
-	}
-
-
-	/**
-	 * Perform a query, ignore the results
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		$result = array();
-
-		try
-		{
-			$stmt = $this->conn->query($sql);
-
-			$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		}
-		catch (PDOException $e)
-		{
-			$this->sql_errcheck($sql);
-		}
-		return $result;
-	}
-
-
-	/**
-	 * Perform a query, return the first row
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		$result = $this->query_all_assoc($sql);
-		$val = array_pop($result);
-		return $val;
-	}
-
-
-	/**
-	 * Perform a query, return the first row
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		try
-		{
-			$all = $this->conn->query($sql, PDO::FETCH_NUM);
-			$row = array();
-			foreach ($all as $r) {
-				$row = $r;
-				break;
-			}
-		}
-		catch (PDOException $e)
-		{
-			$this->sql_errcheck($sql);
-		}
-		return $row;
-	}
-
-
-	/**
-	 * Perform a query, return the first column of the first row
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		$row = $this->query_row($sql);
-		$val = array_pop($row);
-		return $val;
-	}
-
-
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	protected function query_affected_rows ()
-	{
-		return $this->lastaffectedrows;
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 *
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return $this->conn->lastInsertId();
-	}
-
-
-	protected function sql_printf ( $args )
-	{
-		$sql  = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		$args = array_map(array($this, 'sql_escape_string'), $args);
-		return vsprintf($sql, $args);
-	}
-
-
-	protected function sql_escape_string ( $s )
-	{
-		if (is_string($s))
-		{
-			$s = $this->conn->quote($s);
-			// kludge. Quote already adds quotes, and this conflicts with OAuthStoreSQL.
-			// so remove the quotes
-			$len = strlen($s);
-			if ($len == 0)
-				return $s;
-
-			$startcut = 0;
-			while (isset($s[$startcut]) && $s[$startcut] == '\'')
-				$startcut++;
-
-			$endcut = $len-1;
-			while (isset($s[$endcut]) && $s[$endcut] == '\'')
-				$endcut--;
-
-			$s = substr($s, $startcut, $endcut-$startcut+1);
-			return $s;
-		}
-		else if (is_null($s))
-		{
-			return NULL;
-		}
-		else if (is_bool($s))
-		{
-			return intval($s);
-		}
-		else if (is_int($s) || is_float($s))
-		{
-			return $s;
-		}
-		else
-		{
-			return $this->conn->quote(strval($s));
-		}
-	}
-
-
-	protected function sql_errcheck ( $sql )
-	{
-		$msg =  "SQL Error in OAuthStoreMySQL: ". print_r($this->conn->errorInfo(), true) ."\n\n" . $sql;
-		$backtrace = debug_backtrace();
-		$msg .=  "\n\nAt file " . $backtrace[1]['file'] . ", line "  . $backtrace[1]['line'];
-		throw new OAuthException2($msg);
-	}
-
-	/**
-	* Initialise the database
-	*/
-	public function install ()
-	{
-		// TODO: this depends on mysql extension
-		require_once dirname(__FILE__) . '/mysql/install.php';
-	}
-
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
diff --git a/vendor/oauth-php/library/store/OAuthStorePostgreSQL.php b/vendor/oauth-php/library/store/OAuthStorePostgreSQL.php
deleted file mode 100644
index db55804..0000000
--- a/vendor/oauth-php/library/store/OAuthStorePostgreSQL.php
+++ /dev/null
@@ -1,1981 +0,0 @@
-<?php
-/**
- * OAuthStorePostgreSQL.php
- *
- * PHP Version 5.2
- *
- * @author Elma R&D Team  <rdteam@elma.fr>
- * @link http://elma.fr
- * 
- * @Id 2010-10-22 10:07:18 ndelanoe $
- * @version $Id: OAuthStorePostgreSQL.php 190 2011-03-22 09:16:01Z scherpenisse $
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- **/
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-
-class OAuthStorePostgreSQL extends OAuthStoreAbstract
-{
-    /**
-     * Maximum delta a timestamp may be off from a previous timestamp.
-     * Allows multiple consumers with some clock skew to work with the same token.
-     * Unit is seconds, default max skew is 10 minutes.
-     */
-    protected $max_timestamp_skew = 600;
-
-    /**
-     * Default ttl for request tokens
-     */
-    protected $max_request_token_ttl = 3600;
-
-    /**
-     * Number of affected rowsby the last queries
-     */
-    private $_lastAffectedRows = 0;
-
-    public function install()
-    {
-        throw new OAuthException2('Not yet implemented, see postgresql/pgsql.sql');
-    }
-
-    /**
-     * Construct the OAuthStorePostgrSQL.
-     * In the options you have to supply either:
-     * - server, username, password and database (for a pg_connect)
-     * - connectionString (for a pg_connect)
-     * - conn (for the connection to be used)
-     *
-     * @param array options
-     */
-    function __construct ( $options = array() )
-    {
-        if (isset($options['conn']))
-        {
-            $this->conn = $options['conn'];
-        }
-        else
-        {
-            if (isset($options['server']))
-            {
-                $host   = $options['server'];
-                $user = $options['username'];
-                $dbname = $options['database'];
-
-                $connectionString = sprintf('host=%s dbname=%s user=%s', $host, $dbname, $user);
-
-                if (isset($options['password']))
-                {
-                    $connectionString .= ' password=' . $options['password'];
-                }
-
-                $this->conn = pg_connect($connectionString);
-            }
-            elseif (isset($options['connectionString']))
-            {
-                $this->conn = pg_connect($options['connectionString']);
-            }
-            else {
-
-                // Try the default  pg connect
-                $this->conn = pg_connect();
-            }
-
-            if ($this->conn === false)
-            {
-                throw new OAuthException2('Could not connect to PostgresSQL database');
-            }
-        }
-    }
-
-    /**
-     * Find stored credentials for the consumer key and token. Used by an OAuth server
-     * when verifying an OAuth request.
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param string token_type        false, 'request' or 'access'
-     * @exception OAuthException2 when no secrets where found
-     * @return array    assoc (consumer_secret, token_secret, osr_id, ost_id, user_id)
-     */
-    public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' )
-    {
-        if ($token_type === false)
-        {
-            $rs = $this->query_row_assoc('
-                        SELECT    osr_id,
-                                osr_consumer_key        as consumer_key,
-                                osr_consumer_secret        as consumer_secret
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key    = \'%s\'
-                          AND osr_enabled        = \'1\'
-                        ',
-                        $consumer_key);
-
-            if ($rs)
-            {
-                $rs['token']         = false;
-                $rs['token_secret']    = false;
-                $rs['user_id']        = false;
-                $rs['ost_id']        = false;
-            }
-        }
-        else
-        {
-            $rs = $this->query_row_assoc('
-                        SELECT    osr_id,
-                                ost_id,
-                                ost_usa_id_ref            as user_id,
-                                osr_consumer_key        as consumer_key,
-                                osr_consumer_secret        as consumer_secret,
-                                ost_token                as token,
-                                ost_token_secret        as token_secret
-                        FROM oauth_server_registry
-                                JOIN oauth_server_token
-                                ON ost_osr_id_ref = osr_id
-                        WHERE ost_token_type    = \'%s\'
-                          AND osr_consumer_key    = \'%s\'
-                          AND ost_token            = \'%s\'
-                           AND osr_enabled        = \'1\'
-                          AND ost_token_ttl     >= NOW()
-                        ',
-                        $token_type, $consumer_key, $token);
-        }
-
-        if (empty($rs))
-        {
-            throw new OAuthException2('The consumer_key "'.$consumer_key.'" token "'.$token.'" combination does not exist or is not enabled.');
-        }
-        return $rs;
-    }
-
-    /**
-     * Find the server details for signing a request, always looks for an access token.
-     * The returned credentials depend on which local user is making the request.
-     *
-     * The consumer_key must belong to the user or be public (user id is null)
-     *
-     * For signing we need all of the following:
-     *
-     * consumer_key            consumer key associated with the server
-     * consumer_secret        consumer secret associated with this server
-     * token                access token associated with this server
-     * token_secret            secret for the access token
-     * signature_methods    signing methods supported by the server (array)
-     *
-     * @todo filter on token type (we should know how and with what to sign this request, and there might be old access tokens)
-     * @param string uri    uri of the server
-     * @param int user_id    id of the logged on user
-     * @param string name    (optional) name of the token (case sensitive)
-     * @exception OAuthException2 when no credentials found
-     * @return array
-     */
-    public function getSecretsForSignature ( $uri, $user_id, $name = '' )
-    {
-        // Find a consumer key and token for the given uri
-        $ps        = parse_url($uri);
-        $host    = isset($ps['host']) ? $ps['host'] : 'localhost';
-        $path    = isset($ps['path']) ? $ps['path'] : '';
-
-        if (empty($path) || substr($path, -1) != '/')
-        {
-            $path .= '/';
-        }
-
-        // The owner of the consumer_key is either the user or nobody (public consumer key)
-        $secrets = $this->query_row_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            ocr_signature_methods    as signature_methods
-                    FROM oauth_consumer_registry
-                        JOIN oauth_consumer_token ON oct_ocr_id_ref = ocr_id
-                    WHERE ocr_server_uri_host = \'%s\'
-                      AND ocr_server_uri_path = SUBSTR(\'%s\', 1, LENGTH(ocr_server_uri_path))
-                      AND (ocr_usa_id_ref = \'%s\' OR ocr_usa_id_ref IS NULL)
-                      AND oct_usa_id_ref      = \'%d\'
-                      AND oct_token_type      = \'access\'
-                      AND oct_name              = \'%s\'
-                      AND oct_token_ttl       >= NOW()
-                    ORDER BY ocr_usa_id_ref DESC, ocr_consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-                    LIMIT 1
-                    ', $host, $path, $user_id, $user_id, $name
-                    );
-
-        if (empty($secrets))
-        {
-            throw new OAuthException2('No server tokens available for '.$uri);
-        }
-        $secrets['signature_methods'] = explode(',', $secrets['signature_methods']);
-        return $secrets;
-    }
-
-    /**
-     * Get the token and token secret we obtained from a server.
-     *
-     * @param string    consumer_key
-     * @param string     token
-     * @param string    token_type
-     * @param int        user_id            the user owning the token
-     * @param string    name            optional name for a named token
-     * @exception OAuthException2 when no credentials found
-     * @return array
-     */
-    public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' )
-    {
-        if ($token_type != 'request' && $token_type != 'access')
-        {
-            throw new OAuthException2('Unkown token type "'.$token_type.'", must be either "request" or "access"');
-        }
-
-        // Take the most recent token of the given type
-        $r = $this->query_row_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            oct_name                as token_name,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri,
-                            CASE WHEN oct_token_ttl >= \'9999-12-31\' THEN NULL ELSE oct_token_ttl - NOW() END as token_ttl
-                    FROM oauth_consumer_registry
-                            JOIN oauth_consumer_token
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND oct_token_type   = \'%s\'
-                      AND oct_token        = \'%s\'
-                      AND oct_usa_id_ref   = \'%d\'
-                      AND oct_token_ttl    >= NOW()
-                    ', $consumer_key, $token_type, $token, $user_id
-                    );
-
-        if (empty($r))
-        {
-            throw new OAuthException2('Could not find a "'.$token_type.'" token for consumer "'.$consumer_key.'" and user '.$user_id);
-        }
-        if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-        {
-            $r['signature_methods'] = explode(',',$r['signature_methods']);
-        }
-        else
-        {
-            $r['signature_methods'] = array();
-        }
-        return $r;
-    }
-
-
-    /**
-     * Add a request token we obtained from a server.
-     *
-     * @todo remove old tokens for this user and this ocr_id
-     * @param string consumer_key    key of the server in the consumer registry
-     * @param string token_type        one of 'request' or 'access'
-     * @param string token
-     * @param string token_secret
-     * @param int      user_id            the user owning the token
-     * @param array  options            extra options, name and token_ttl
-     * @exception OAuthException2 when server is not known
-     * @exception OAuthException2 when we received a duplicate token
-     */
-    public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() )
-    {
-        if ($token_type != 'request' && $token_type != 'access')
-        {
-            throw new OAuthException2('Unknown token type "'.$token_type.'", must be either "request" or "access"');
-        }
-
-        // Maximum time to live for this token
-        if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-        {
-            $ttl = 'NOW() + INTERVAL \''.intval($options['token_ttl']).' SECOND\'';
-        }
-        else if ($token_type == 'request')
-        {
-            $ttl = 'NOW() + INTERVAL \''.$this->max_request_token_ttl.' SECOND\'';
-        }
-        else
-        {
-            $ttl = "'9999-12-31'";
-        }
-
-        if (isset($options['server_uri']))
-        {
-            $ocr_id = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                        AND ocr_usa_id_ref = \'%d\'
-                        AND ocr_server_uri = \'%s\'
-                        ', $consumer_key, $user_id, $options['server_uri']);
-        }
-        else
-        {
-            $ocr_id = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                        AND ocr_usa_id_ref = \'%d\'
-                        ', $consumer_key, $user_id);
-        }
-
-        if (empty($ocr_id))
-        {
-            throw new OAuthException2('No server associated with consumer_key "'.$consumer_key.'"');
-        }
-
-        // Named tokens, unique per user/consumer key
-        if (isset($options['name']) && $options['name'] != '')
-        {
-            $name = $options['name'];
-        }
-        else
-        {
-            $name = '';
-        }
-
-        // Delete any old tokens with the same type and name for this user/server combination
-        $this->query('
-                    DELETE FROM oauth_consumer_token
-                    WHERE oct_ocr_id_ref = %d
-                      AND oct_usa_id_ref = \'%d\'
-                      AND oct_token_type::text = LOWER(\'%s\')::text
-                      AND oct_name       = \'%s\'
-                    ',
-                    $ocr_id,
-                    $user_id,
-                    $token_type,
-                    $name);
-
-        // Insert the new token
-        $this->query('
-            INSERT INTO
-               oauth_consumer_token(
-                   oct_ocr_id_ref,
-                   oct_usa_id_ref,
-                   oct_name,
-                   oct_token,
-                   oct_token_secret,
-                   oct_token_type,
-                   oct_timestamp,
-                   oct_token_ttl
-               )
-               VALUES (%d,%d,\'%s\',\'%s\',\'%s\',\'%s\',NOW(),'.$ttl.')',
-                    $ocr_id,
-                    $user_id,
-                    $name,
-                    $token,
-                    $token_secret,
-                    $token_type);
-
-        if (!$this->query_affected_rows())
-        {
-            throw new OAuthException2('Received duplicate token "'.$token.'" for the same consumer_key "'.$consumer_key.'"');
-        }
-    }
-
-    /**
-     * Delete a server key.  This removes access to that site.
-     *
-     * @param string consumer_key
-     * @param int user_id    user registering this server
-     * @param boolean user_is_admin
-     */
-    public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                    DELETE FROM oauth_consumer_registry
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                    ', $consumer_key, $user_id);
-        }
-        else
-        {
-            $this->query('
-                    DELETE FROM oauth_consumer_registry
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND ocr_usa_id_ref   = \'%d\'
-                    ', $consumer_key, $user_id);
-        }
-    }
-
-
-    /**
-     * Get a server from the consumer registry using the consumer key
-     *
-     * @param string consumer_key
-     * @param int user_id
-     * @param boolean user_is_admin (optional)
-     * @exception OAuthException2 when server is not found
-     * @return array
-     */
-    public function getServer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        $r = $this->query_row_assoc('
-                SELECT    ocr_id                    as id,
-                        ocr_usa_id_ref            as user_id,
-                        ocr_consumer_key         as consumer_key,
-                        ocr_consumer_secret     as consumer_secret,
-                        ocr_signature_methods    as signature_methods,
-                        ocr_server_uri            as server_uri,
-                        ocr_request_token_uri    as request_token_uri,
-                        ocr_authorize_uri        as authorize_uri,
-                        ocr_access_token_uri    as access_token_uri
-                FROM oauth_consumer_registry
-                WHERE ocr_consumer_key = \'%s\'
-                  AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                ',    $consumer_key, $user_id);
-
-        if (empty($r))
-        {
-            throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" has been registered (for this user)');
-        }
-
-        if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-        {
-            $r['signature_methods'] = explode(',',$r['signature_methods']);
-        }
-        else
-        {
-            $r['signature_methods'] = array();
-        }
-        return $r;
-    }
-
-
-    /**
-     * Find the server details that might be used for a request
-     *
-     * The consumer_key must belong to the user or be public (user id is null)
-     *
-     * @param string uri    uri of the server
-     * @param int user_id    id of the logged on user
-     * @exception OAuthException2 when no credentials found
-     * @return array
-     */
-    public function getServerForUri ( $uri, $user_id )
-    {
-        // Find a consumer key and token for the given uri
-        $ps        = parse_url($uri);
-        $host    = isset($ps['host']) ? $ps['host'] : 'localhost';
-        $path    = isset($ps['path']) ? $ps['path'] : '';
-
-        if (empty($path) || substr($path, -1) != '/')
-        {
-            $path .= '/';
-        }
-
-        // The owner of the consumer_key is either the user or nobody (public consumer key)
-        $server = $this->query_row_assoc('
-                    SELECT    ocr_id                    as id,
-                            ocr_usa_id_ref            as user_id,
-                            ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri
-                    FROM oauth_consumer_registry
-                    WHERE ocr_server_uri_host = \'%s\'
-                      AND ocr_server_uri_path = SUBSTR(\'%s\', 1, LENGTH(ocr_server_uri_path))
-                      AND (ocr_usa_id_ref = \'%s\' OR ocr_usa_id_ref IS NULL)
-                    ORDER BY ocr_usa_id_ref DESC, consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-                    LIMIT 1
-                    ', $host, $path, $user_id
-                    );
-
-        if (empty($server))
-        {
-            throw new OAuthException2('No server available for '.$uri);
-        }
-        $server['signature_methods'] = explode(',', $server['signature_methods']);
-        return $server;
-    }
-
-    /**
-     * Get a list of all server token this user has access to.
-     *
-     * @param int usr_id
-     * @return array
-     */
-    public function listServerTokens ( $user_id )
-    {
-        $ts = $this->query_all_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_id                    as token_id,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            oct_usa_id_ref            as user_id,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_server_uri_host        as server_uri_host,
-                            ocr_server_uri_path        as server_uri_path,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri,
-                            oct_timestamp            as timestamp
-                    FROM oauth_consumer_registry
-                            JOIN oauth_consumer_token
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE oct_usa_id_ref = \'%d\'
-                      AND oct_token_type = \'access\'
-                      AND oct_token_ttl  >= NOW()
-                    ORDER BY ocr_server_uri_host, ocr_server_uri_path
-                    ', $user_id);
-        return $ts;
-    }
-
-     /**
-     * Count how many tokens we have for the given server
-     *
-     * @param string consumer_key
-     * @return int
-     */
-    public function countServerTokens ( $consumer_key )
-    {
-        $count = $this->query_one('
-                    SELECT COUNT(oct_id)
-                    FROM oauth_consumer_token
-                            JOIN oauth_consumer_registry
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE oct_token_type   = \'access\'
-                      AND ocr_consumer_key = \'%s\'
-                      AND oct_token_ttl    >= NOW()
-                    ', $consumer_key);
-
-        return $count;
-    }
-
-    /**
-     * Get a specific server token for the given user
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param int user_id
-     * @exception OAuthException2 when no such token found
-     * @return array
-     */
-    public function getServerToken ( $consumer_key, $token, $user_id )
-    {
-        $ts = $this->query_row_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            oct_usa_id_ref            as usr_id,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_server_uri_host        as server_uri_host,
-                            ocr_server_uri_path        as server_uri_path,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri,
-                            oct_timestamp            as timestamp
-                    FROM oauth_consumer_registry
-                            JOIN oauth_consumer_token
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND oct_usa_id_ref   = \'%d\'
-                      AND oct_token_type   = \'access\'
-                      AND oct_token        = \'%s\'
-                      AND oct_token_ttl    >= NOW()
-                    ', $consumer_key, $user_id, $token);
-
-        if (empty($ts))
-        {
-            throw new OAuthException2('No such consumer key ('.$consumer_key.') and token ('.$token.') combination for user "'.$user_id.'"');
-        }
-        return $ts;
-    }
-
-
-    /**
-     * Delete a token we obtained from a server.
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param int user_id
-     * @param boolean user_is_admin
-     */
-    public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                DELETE FROM oauth_consumer_token
-                    USING oauth_consumer_registry
-                WHERE
-                    oct_ocr_id_ref = ocr_id
-                    AND ocr_consumer_key    = \'%s\'
-                    AND oct_token            = \'%s\'
-                ', $consumer_key, $token);
-        }
-        else
-        {
-            $this->query('
-                DELETE FROM oauth_consumer_token
-                    USING oauth_consumer_registry
-                WHERE
-                    oct_ocr_id_ref = ocr_id
-                    AND ocr_consumer_key    = \'%s\'
-                    AND oct_token            = \'%s\'
-                    AND oct_usa_id_ref    = \'%d\'
-                ', $consumer_key, $token, $user_id);
-        }
-    }
-
-    /**
-     * Set the ttl of a server access token.  This is done when the
-     * server receives a valid request with a xoauth_token_ttl parameter in it.
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param int token_ttl
-     */
-    public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-    {
-        if ($token_ttl <= 0)
-        {
-            // Immediate delete when the token is past its ttl
-            $this->deleteServerToken($consumer_key, $token, 0, true);
-        }
-		else if ( $server_uri ) 
-		{
-			// Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_token
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-						  AND ocr_server_uri = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                          ', $token_ttl, $server_uri, $consumer_key, $token);
-
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_registry
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-						  AND ocr_server_uri = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                        ', $token_ttl, $server_uri, $consumer_key, $token);
-		}
-        else
-        {
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_token
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                          ', $token_ttl, $consumer_key, $token);
-
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_registry
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                        ', $token_ttl, $consumer_key, $token);
-        }
-    }
-
-    /**
-     * Get a list of all consumers from the consumer registry.
-     * The consumer keys belong to the user or are public (user id is null)
-     *
-     * @param string q    query term
-     * @param int user_id
-     * @return array
-     */
-    public function listServers ( $q = '', $user_id )
-    {
-        $q    = trim(str_replace('%', '', $q));
-        $args = array();
-
-        if (!empty($q))
-        {
-            $where = ' WHERE (    ocr_consumer_key like \'%%%s%%\'
-                               OR ocr_server_uri like \'%%%s%%\'
-                               OR ocr_server_uri_host like \'%%%s%%\'
-                               OR ocr_server_uri_path like \'%%%s%%\')
-                         AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                    ';
-
-            $args[] = $q;
-            $args[] = $q;
-            $args[] = $q;
-            $args[] = $q;
-            $args[] = $user_id;
-        }
-        else
-        {
-            $where  = ' WHERE ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL';
-            $args[] = $user_id;
-        }
-
-        $servers = $this->query_all_assoc('
-                    SELECT    ocr_id                    as id,
-                            ocr_usa_id_ref            as user_id,
-                            ocr_consumer_key         as consumer_key,
-                            ocr_consumer_secret     as consumer_secret,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_server_uri_host        as server_uri_host,
-                            ocr_server_uri_path        as server_uri_path,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri
-                    FROM oauth_consumer_registry
-                    '.$where.'
-                    ORDER BY ocr_server_uri_host, ocr_server_uri_path
-                    ', $args);
-        return $servers;
-    }
-
-    /**
-     * Register or update a server for our site (we will be the consumer)
-     *
-     * (This is the registry at the consumers, registering servers ;-) )
-     *
-     * @param array server
-     * @param int user_id    user registering this server
-     * @param boolean user_is_admin
-     * @exception OAuthException2 when fields are missing or on duplicate consumer_key
-     * @return consumer_key
-     */
-    public function updateServer ( $server, $user_id, $user_is_admin = false )
-    {
-        foreach (array('consumer_key', 'server_uri') as $f)
-        {
-            if (empty($server[$f]))
-            {
-                throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-            }
-        }
-
-        if (!empty($server['id']))
-        {
-            $exists = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                          AND ocr_id <> %d
-                          AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                        ', $server['consumer_key'], $server['id'], $user_id);
-        }
-        else
-        {
-            $exists = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                          AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                        ', $server['consumer_key'], $user_id);
-        }
-
-        if ($exists)
-        {
-            throw new OAuthException2('The server with key "'.$server['consumer_key'].'" has already been registered');
-        }
-
-        $parts = parse_url($server['server_uri']);
-        $host  = (isset($parts['host']) ? $parts['host'] : 'localhost');
-        $path  = (isset($parts['path']) ? $parts['path'] : '/');
-
-        if (isset($server['signature_methods']))
-        {
-            if (is_array($server['signature_methods']))
-            {
-                $server['signature_methods'] = strtoupper(implode(',', $server['signature_methods']));
-            }
-        }
-        else
-        {
-            $server['signature_methods'] = '';
-        }
-
-        // When the user is an admin, then the user can update the user_id of this record
-        if ($user_is_admin && array_key_exists('user_id', $server))
-        {
-            if (is_null($server['user_id']))
-            {
-                $update_user =  ', ocr_usa_id_ref = NULL';
-            }
-            else
-            {
-                $update_user =  ', ocr_usa_id_ref = \''. intval($server['user_id']) . '\'';
-            }
-        }
-        else
-        {
-            $update_user = '';
-        }
-
-        if (!empty($server['id']))
-        {
-            // Check if the current user can update this server definition
-            if (!$user_is_admin)
-            {
-                $ocr_usa_id_ref = $this->query_one('
-                                    SELECT ocr_usa_id_ref
-                                    FROM oauth_consumer_registry
-                                    WHERE ocr_id = %d
-                                    ', $server['id']);
-
-                if ($ocr_usa_id_ref != $user_id)
-                {
-                    throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this server');
-                }
-            }
-
-            // Update the consumer registration
-            $this->query('
-                    UPDATE oauth_consumer_registry
-                    SET ocr_consumer_key        = \'%s\',
-                        ocr_consumer_secret     = \'%s\',
-                        ocr_server_uri            = \'%s\',
-                        ocr_server_uri_host     = \'%s\',
-                        ocr_server_uri_path     = \'%s\',
-                        ocr_timestamp           = NOW(),
-                        ocr_request_token_uri    = \'%s\',
-                        ocr_authorize_uri        = \'%s\',
-                        ocr_access_token_uri    = \'%s\',
-                        ocr_signature_methods    = \'%s\'
-                        '.$update_user.'
-                    WHERE ocr_id = %d
-                    ',
-                    $server['consumer_key'],
-                    $server['consumer_secret'],
-                    $server['server_uri'],
-                    strtolower($host),
-                    $path,
-                    isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-                    isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-                    isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-                    $server['signature_methods'],
-                    $server['id']
-                    );
-        }
-        else
-        {
-            $update_user_field = '';
-            $update_user_value = '';
-            if (empty($update_user))
-            {
-                // Per default the user owning the key is the user registering the key
-                $update_user_field =  ', ocr_usa_id_ref';
-                $update_user_value = ', ' . intval($user_id);
-            }
-
-            $this->query('
-                INSERT INTO oauth_consumer_registry (
-                    ocr_consumer_key     ,
-                    ocr_consumer_secret  ,
-                    ocr_server_uri         ,
-                    ocr_server_uri_host  ,
-                    ocr_server_uri_path  ,
-                    ocr_timestamp        ,
-                    ocr_request_token_uri,
-                    ocr_authorize_uri     ,
-                    ocr_access_token_uri ,
-                    ocr_signature_methods' . $update_user_field . '
-                )
-                VALUES (\'%s\', \'%s\', \'%s\', \'%s\', \'%s\', NOW(), \'%s\', \'%s\', \'%s\', \'%s\''. $update_user_value . ')',
-                    $server['consumer_key'],
-                    $server['consumer_secret'],
-                    $server['server_uri'],
-                    strtolower($host),
-                    $path,
-                    isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-                    isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-                    isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-                    $server['signature_methods']
-                    );
-
-            $ocr_id = $this->query_insert_id('oauth_consumer_registry', 'ocr_id');
-        }
-        return $server['consumer_key'];
-    }
-
-
-    /**
-     * Insert/update a new consumer with this server (we will be the server)
-     * When this is a new consumer, then also generate the consumer key and secret.
-     * Never updates the consumer key and secret.
-     * When the id is set, then the key and secret must correspond to the entry
-     * being updated.
-     *
-     * (This is the registry at the server, registering consumers ;-) )
-     *
-     * @param array consumer
-     * @param int user_id    user registering this consumer
-     * @param boolean user_is_admin
-     * @return string consumer key
-     */
-    public function updateConsumer ( $consumer, $user_id, $user_is_admin = false )
-    {
-        if (!$user_is_admin)
-        {
-            foreach (array('requester_name', 'requester_email') as $f)
-            {
-                if (empty($consumer[$f]))
-                {
-                    throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-                }
-            }
-        }
-
-        if (!empty($consumer['id']))
-        {
-            if (empty($consumer['consumer_key']))
-            {
-                throw new OAuthException2('The field "consumer_key" must be set and non empty');
-            }
-            if (!$user_is_admin && empty($consumer['consumer_secret']))
-            {
-                throw new OAuthException2('The field "consumer_secret" must be set and non empty');
-            }
-
-            // Check if the current user can update this server definition
-            if (!$user_is_admin)
-            {
-                $osr_usa_id_ref = $this->query_one('
-                                    SELECT osr_usa_id_ref
-                                    FROM oauth_server_registry
-                                    WHERE osr_id = %d
-                                    ', $consumer['id']);
-
-                if ($osr_usa_id_ref != $user_id)
-                {
-                    throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this consumer');
-                }
-            }
-            else
-            {
-                // User is an admin, allow a key owner to be changed or key to be shared
-                if (array_key_exists('user_id',$consumer))
-                {
-                    if (is_null($consumer['user_id']))
-                    {
-                        $this->query('
-                            UPDATE oauth_server_registry
-                            SET osr_usa_id_ref = NULL
-                            WHERE osr_id = %d
-                            ', $consumer['id']);
-                    }
-                    else
-                    {
-                        $this->query('
-                            UPDATE oauth_server_registry
-                            SET osr_usa_id_ref = \'%d\'
-                            WHERE osr_id = %d
-                            ', $consumer['user_id'], $consumer['id']);
-                    }
-                }
-            }
-
-            $this->query('
-                UPDATE oauth_server_registry
-                SET osr_requester_name        = \'%s\',
-                    osr_requester_email        = \'%s\',
-                    osr_callback_uri        = \'%s\',
-                    osr_application_uri        = \'%s\',
-                    osr_application_title    = \'%s\',
-                    osr_application_descr    = \'%s\',
-                    osr_application_notes    = \'%s\',
-                    osr_application_type    = \'%s\',
-                    osr_application_commercial = IF(%d,\'1\',\'0\'),
-                    osr_timestamp            = NOW()
-                WHERE osr_id              = %d
-                  AND osr_consumer_key    = \'%s\'
-                  AND osr_consumer_secret = \'%s\'
-                ',
-                $consumer['requester_name'],
-                $consumer['requester_email'],
-                isset($consumer['callback_uri'])         ? $consumer['callback_uri']              : '',
-                isset($consumer['application_uri'])     ? $consumer['application_uri']              : '',
-                isset($consumer['application_title'])    ? $consumer['application_title']          : '',
-                isset($consumer['application_descr'])    ? $consumer['application_descr']          : '',
-                isset($consumer['application_notes'])    ? $consumer['application_notes']          : '',
-                isset($consumer['application_type'])     ? $consumer['application_type']          : '',
-                isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0,
-                $consumer['id'],
-                $consumer['consumer_key'],
-                $consumer['consumer_secret']
-                );
-
-
-            $consumer_key = $consumer['consumer_key'];
-        }
-        else
-        {
-            $consumer_key    = $this->generateKey(true);
-            $consumer_secret= $this->generateKey();
-
-            // When the user is an admin, then the user can be forced to something else that the user
-            if ($user_is_admin && array_key_exists('user_id',$consumer))
-            {
-                if (is_null($consumer['user_id']))
-                {
-                    $owner_id = 'NULL';
-                }
-                else
-                {
-                    $owner_id = intval($consumer['user_id']);
-                }
-            }
-            else
-            {
-                // No admin, take the user id as the owner id.
-                $owner_id = intval($user_id);
-            }
-
-            $this->query('
-                INSERT INTO oauth_server_registry (
-                    osr_enabled,
-                    osr_status,
-                    osr_usa_id_ref,
-                    osr_consumer_key,
-                    osr_consumer_secret,
-                    osr_requester_name,
-                    osr_requester_email,
-                    osr_callback_uri,
-                    osr_application_uri,
-                    osr_application_title,
-                    osr_application_descr,
-                    osr_application_notes,
-                    osr_application_type,
-                    osr_application_commercial,
-                    osr_timestamp,
-                    osr_issue_date
-                )
-                VALUES (\'1\', \'active\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%d\', NOW(), NOW())
-                ',
-                $owner_id,
-                $consumer_key,
-                $consumer_secret,
-                $consumer['requester_name'],
-                $consumer['requester_email'],
-                isset($consumer['callback_uri'])         ? $consumer['callback_uri']              : '',
-                isset($consumer['application_uri'])     ? $consumer['application_uri']              : '',
-                isset($consumer['application_title'])    ? $consumer['application_title']          : '',
-                isset($consumer['application_descr'])    ? $consumer['application_descr']          : '',
-                isset($consumer['application_notes'])    ? $consumer['application_notes']          : '',
-                isset($consumer['application_type'])     ? $consumer['application_type']          : '',
-                isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0
-                );
-        }
-        return $consumer_key;
-
-    }
-
-    /**
-     * Delete a consumer key.  This removes access to our site for all applications using this key.
-     *
-     * @param string consumer_key
-     * @param int user_id    user registering this server
-     * @param boolean user_is_admin
-     */
-    public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                    DELETE FROM oauth_server_registry
-                    WHERE osr_consumer_key = \'%s\'
-                      AND (osr_usa_id_ref = \'%d\' OR osr_usa_id_ref IS NULL)
-                    ', $consumer_key, $user_id);
-        }
-        else
-        {
-            $this->query('
-                    DELETE FROM oauth_server_registry
-                    WHERE osr_consumer_key = \'%s\'
-                      AND osr_usa_id_ref   = \'%d\'
-                    ', $consumer_key, $user_id);
-        }
-    }
-
-    /**
-     * Fetch a consumer of this server, by consumer_key.
-     *
-     * @param string consumer_key
-     * @param int user_id
-     * @param boolean user_is_admin (optional)
-     * @exception OAuthException2 when consumer not found
-     * @return array
-     */
-    public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        $consumer = $this->query_row_assoc('
-                        SELECT    *
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key = \'%s\'
-                        ', $consumer_key);
-
-        if (!is_array($consumer))
-        {
-            throw new OAuthException2('No consumer with consumer_key "'.$consumer_key.'"');
-        }
-
-        $c = array();
-        foreach ($consumer as $key => $value)
-        {
-            $c[substr($key, 4)] = $value;
-        }
-        $c['user_id'] = $c['usa_id_ref'];
-
-        if (!$user_is_admin && !empty($c['user_id']) && $c['user_id'] != $user_id)
-        {
-            throw new OAuthException2('No access to the consumer information for consumer_key "'.$consumer_key.'"');
-        }
-        return $c;
-    }
-
-
-    /**
-     * Fetch the static consumer key for this provider.  The user for the static consumer
-     * key is NULL (no user, shared key).  If the key did not exist then the key is created.
-     *
-     * @return string
-     */
-    public function getConsumerStatic ()
-    {
-        $consumer = $this->query_one('
-                        SELECT osr_consumer_key
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key LIKE \'sc-%%\'
-                          AND osr_usa_id_ref IS NULL
-                        ');
-
-        if (empty($consumer))
-        {
-            $consumer_key = 'sc-'.$this->generateKey(true);
-            $this->query('
-                INSERT INTO oauth_server_registry (
-                    osr_enabled,
-                    osr_status,
-                    osr_usa_id_ref,
-                    osr_consumer_key,
-                    osr_consumer_secret,
-                    osr_requester_name,
-                    osr_requester_email,
-                    osr_callback_uri,
-                    osr_application_uri,
-                    osr_application_title,
-                    osr_application_descr,
-                    osr_application_notes,
-                    osr_application_type,
-                    osr_application_commercial,
-                    osr_timestamp,
-                    osr_issue_date
-                )
-                VALUES (\'1\',\'active\', NULL, \'%s\', \'\', \'\', \'\', \'\', \'\', \'Static shared consumer key\', \'\', \'Static shared consumer key\', \'\', 0, NOW(), NOW())
-                ',
-                $consumer_key
-                );
-
-            // Just make sure that if the consumer key is truncated that we get the truncated string
-            $consumer = $this->getConsumerStatic();
-        }
-        return $consumer;
-    }
-
-    /**
-     * Add an unautorized request token to our server.
-     *
-     * @param string consumer_key
-     * @param array options        (eg. token_ttl)
-     * @return array (token, token_secret)
-     */
-    public function addConsumerRequestToken ( $consumer_key, $options = array() )
-    {
-        $token  = $this->generateKey(true);
-        $secret = !isset($options['secret']) ? $this->generateKey() : $options['secret'];
-        $osr_id    = $this->query_one('
-                        SELECT osr_id
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key = \'%s\'
-                          AND osr_enabled      = \'1\'
-                        ', $consumer_key);
-
-        if (!$osr_id)
-        {
-            throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" or consumer_key is disabled');
-        }
-
-        if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-        {
-            $ttl = intval($options['token_ttl']);
-        }
-        else
-        {
-            $ttl = $this->max_request_token_ttl;
-        }
-
-        if (!isset($options['oauth_callback'])) {
-             // 1.0a Compatibility : store callback url associated with request token
-            $options['oauth_callback']='oob';
-         }
-
-        $this->query('
-            INSERT INTO oauth_server_token (
-                ost_osr_id_ref,
-                ost_usa_id_ref,
-                ost_token,
-                ost_token_secret,
-                ost_token_type,
-                ost_token_ttl,
-                ost_callback_url
-            )
-            VALUES (%d, \'1\', \'%s\', \'%s\', \'request\', NOW() + INTERVAL \'%d SECOND\', \'%s\')',
-                $osr_id, $token, $secret, $ttl, $options['oauth_callback']);
-
-        return array('token'=>$token, 'token_secret'=>$secret, 'token_ttl'=>$ttl);
-    }
-
-    /**
-     * Fetch the consumer request token, by request token.
-     *
-     * @param string token
-     * @return array  token and consumer details
-     */
-    public function getConsumerRequestToken ( $token )
-    {
-        $rs = $this->query_row_assoc('
-                SELECT    ost_token            as token,
-                        ost_token_secret    as token_secret,
-                        osr_consumer_key    as consumer_key,
-                        osr_consumer_secret    as consumer_secret,
-                        ost_token_type        as token_type,
-                         ost_callback_url    as callback_url,
-                         osr_application_title as application_title,
-                         osr_application_descr as application_descr,
-                         osr_application_uri   as application_uri
-                FROM oauth_server_token
-                        JOIN oauth_server_registry
-                        ON ost_osr_id_ref = osr_id
-                WHERE ost_token_type = \'request\'
-                  AND ost_token      = \'%s\'
-                  AND ost_token_ttl  >= NOW()
-                ', $token);
-
-        return $rs;
-    }
-
-    /**
-     * Delete a consumer token.  The token must be a request or authorized token.
-     *
-     * @param string token
-     */
-    public function deleteConsumerRequestToken ( $token )
-    {
-        $this->query('
-                    DELETE FROM oauth_server_token
-                    WHERE ost_token      = \'%s\'
-                      AND ost_token_type = \'request\'
-                    ', $token);
-    }
-
-    /**
-     * Upgrade a request token to be an authorized request token.
-     *
-     * @param string token
-     * @param int     user_id  user authorizing the token
-     * @param string referrer_host used to set the referrer host for this token, for user feedback
-     */
-    public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' )
-    {
-         // 1.0a Compatibility : create a token verifier
-         $verifier = substr(md5(rand()),0,10);
-
-        $this->query('
-                    UPDATE oauth_server_token
-                    SET ost_authorized    = \'1\',
-                        ost_usa_id_ref    = \'%d\',
-                        ost_timestamp     = NOW(),
-                        ost_referrer_host = \'%s\',
-                        ost_verifier      = \'%s\'
-                    WHERE ost_token      = \'%s\'
-                      AND ost_token_type = \'request\'
-                    ', $user_id, $referrer_host, $verifier, $token);
-        return $verifier;
-    }
-
-    /**
-     * Count the consumer access tokens for the given consumer.
-     *
-     * @param string consumer_key
-     * @return int
-     */
-    public function countConsumerAccessTokens ( $consumer_key )
-    {
-        $count = $this->query_one('
-                    SELECT COUNT(ost_id)
-                    FROM oauth_server_token
-                            JOIN oauth_server_registry
-                            ON ost_osr_id_ref = osr_id
-                    WHERE ost_token_type   = \'access\'
-                      AND osr_consumer_key = \'%s\'
-                      AND ost_token_ttl    >= NOW()
-                    ', $consumer_key);
-
-        return $count;
-    }
-
-    /**
-     * Exchange an authorized request token for new access token.
-     *
-     * @param string token
-     * @param array options        options for the token, token_ttl
-     * @exception OAuthException2 when token could not be exchanged
-     * @return array (token, token_secret)
-     */
-    public function exchangeConsumerRequestForAccessToken ( $token, $options = array() )
-    {
-        $new_token  = $this->generateKey(true);
-        $new_secret = $this->generateKey();
-
-        // Maximum time to live for this token
-        if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-        {
-            $ttl_sql = '(NOW() + INTERVAL \''.intval($options['token_ttl']).' SECOND\')';
-        }
-        else
-        {
-            $ttl_sql = "'9999-12-31'";
-        }
-
-         if (isset($options['verifier'])) {
-             $verifier = $options['verifier'];
-
-             // 1.0a Compatibility : check token against oauth_verifier
-             $this->query('
-                         UPDATE oauth_server_token
-                         SET ost_token            = \'%s\',
-                             ost_token_secret    = \'%s\',
-                             ost_token_type        = \'access\',
-                             ost_timestamp        = NOW(),
-                             ost_token_ttl       = '.$ttl_sql.'
-                         WHERE ost_token      = \'%s\'
-                           AND ost_token_type = \'request\'
-                           AND ost_authorized = \'1\'
-                           AND ost_token_ttl  >= NOW()
-                           AND ost_verifier = \'%s\'
-                         ', $new_token, $new_secret, $token, $verifier);
-         } else {
-
-             // 1.0
-             $this->query('
-                         UPDATE oauth_server_token
-                         SET ost_token            = \'%s\',
-                             ost_token_secret    = \'%s\',
-                             ost_token_type        = \'access\',
-                             ost_timestamp        = NOW(),
-                             ost_token_ttl       = '.$ttl_sql.'
-                         WHERE ost_token      = \'%s\'
-                           AND ost_token_type = \'request\'
-                           AND ost_authorized = \'1\'
-                           AND ost_token_ttl  >= NOW()
-                         ', $new_token, $new_secret, $token);
-        }
-
-        if ($this->query_affected_rows() != 1)
-        {
-            throw new OAuthException2('Can\'t exchange request token "'.$token.'" for access token. No such token or not authorized');
-        }
-
-        $ret = array('token' => $new_token, 'token_secret' => $new_secret);
-        $ttl = $this->query_one('
-                    SELECT    (CASE WHEN ost_token_ttl >= \'9999-12-31\' THEN NULL ELSE ost_token_ttl - NOW() END) as token_ttl
-                    FROM oauth_server_token
-                    WHERE ost_token = \'%s\'', $new_token);
-
-        if (is_numeric($ttl))
-        {
-            $ret['token_ttl'] = intval($ttl);
-        }
-        return $ret;
-    }
-
-    /**
-     * Fetch the consumer access token, by access token.
-     *
-     * @param string token
-     * @param int user_id
-     * @exception OAuthException2 when token is not found
-     * @return array  token and consumer details
-     */
-    public function getConsumerAccessToken ( $token, $user_id )
-    {
-        $rs = $this->query_row_assoc('
-                SELECT    ost_token                as token,
-                        ost_token_secret        as token_secret,
-                        ost_referrer_host        as token_referrer_host,
-                        osr_consumer_key        as consumer_key,
-                        osr_consumer_secret        as consumer_secret,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr,
-                        osr_callback_uri        as callback_uri
-                FROM oauth_server_token
-                        JOIN oauth_server_registry
-                        ON ost_osr_id_ref = osr_id
-                WHERE ost_token_type = \'access\'
-                  AND ost_token      = \'%s\'
-                  AND ost_usa_id_ref = \'%d\'
-                  AND ost_token_ttl  >= NOW()
-                ', $token, $user_id);
-
-        if (empty($rs))
-        {
-            throw new OAuthException2('No server_token "'.$token.'" for user "'.$user_id.'"');
-        }
-        return $rs;
-    }
-
-    /**
-     * Delete a consumer access token.
-     *
-     * @param string token
-     * @param int user_id
-     * @param boolean user_is_admin
-     */
-    public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                        DELETE FROM oauth_server_token
-                        WHERE ost_token      = \'%s\'
-                          AND ost_token_type = \'access\'
-                        ', $token);
-        }
-        else
-        {
-            $this->query('
-                        DELETE FROM oauth_server_token
-                        WHERE ost_token      = \'%s\'
-                          AND ost_token_type = \'access\'
-                          AND ost_usa_id_ref = \'%d\'
-                        ', $token, $user_id);
-        }
-    }
-
-    /**
-     * Set the ttl of a consumer access token.  This is done when the
-     * server receives a valid request with a xoauth_token_ttl parameter in it.
-     *
-     * @param string token
-     * @param int ttl
-     */
-    public function setConsumerAccessTokenTtl ( $token, $token_ttl )
-    {
-        if ($token_ttl <= 0)
-        {
-            // Immediate delete when the token is past its ttl
-            $this->deleteConsumerAccessToken($token, 0, true);
-        }
-        else
-        {
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_server_token
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ost_token      = \'%s\'
-                          AND ost_token_type = \'access\'
-                        ', $token_ttl, $token);
-        }
-    }
-
-    /**
-     * Fetch a list of all consumer keys, secrets etc.
-     * Returns the public (user_id is null) and the keys owned by the user
-     *
-     * @param int user_id
-     * @return array
-     */
-    public function listConsumers ( $user_id )
-    {
-        $rs = $this->query_all_assoc('
-                SELECT    osr_id                    as id,
-                        osr_usa_id_ref            as user_id,
-                        osr_consumer_key         as consumer_key,
-                        osr_consumer_secret        as consumer_secret,
-                        osr_enabled                as enabled,
-                        osr_status                 as status,
-                        osr_issue_date            as issue_date,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr,
-                        osr_requester_name        as requester_name,
-                        osr_requester_email        as requester_email,
-                        osr_callback_uri        as callback_uri
-                FROM oauth_server_registry
-                WHERE (osr_usa_id_ref = \'%d\' OR osr_usa_id_ref IS NULL)
-                ORDER BY osr_application_title
-                ', $user_id);
-        return $rs;
-    }
-
-    /**
-     * List of all registered applications. Data returned has not sensitive
-     * information and therefore is suitable for public displaying.
-     *
-     * @param int $begin
-     * @param int $total
-     * @return array
-     */
-    public function listConsumerApplications($begin = 0, $total = 25)
-    {
-        $rs = $this->query_all_assoc('
-                SELECT    osr_id                    as id,
-                        osr_enabled                as enabled,
-                        osr_status                 as status,
-                        osr_issue_date            as issue_date,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr
-                FROM oauth_server_registry
-                ORDER BY osr_application_title
-                ');
-        // TODO: pagination
-        return $rs;
-    }
-
-
-    /**
-     * Fetch a list of all consumer tokens accessing the account of the given user.
-     *
-     * @param int user_id
-     * @return array
-     */
-    public function listConsumerTokens ( $user_id )
-    {
-        $rs = $this->query_all_assoc('
-                SELECT    osr_consumer_key         as consumer_key,
-                        osr_consumer_secret        as consumer_secret,
-                        osr_enabled                as enabled,
-                        osr_status                 as status,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr,
-                        ost_timestamp            as timestamp,
-                        ost_token                as token,
-                        ost_token_secret        as token_secret,
-                        ost_referrer_host        as token_referrer_host,
-                        osr_callback_uri        as callback_uri
-                FROM oauth_server_registry
-                    JOIN oauth_server_token
-                    ON ost_osr_id_ref = osr_id
-                WHERE ost_usa_id_ref = \'%d\'
-                  AND ost_token_type = \'access\'
-                  AND ost_token_ttl  >= NOW()
-                ORDER BY osr_application_title
-                ', $user_id);
-        return $rs;
-    }
-
-
-    /**
-     * Check an nonce/timestamp combination.  Clears any nonce combinations
-     * that are older than the one received.
-     *
-     * @param string    consumer_key
-     * @param string     token
-     * @param int        timestamp
-     * @param string     nonce
-     * @exception OAuthException2    thrown when the timestamp is not in sequence or nonce is not unique
-     */
-    public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce )
-    {
-    	/* removed in Appendix A of RFC 5849
-        $r = $this->query_row('
-                            SELECT MAX(osn_timestamp)
-                            FROM oauth_server_nonce
-                            WHERE osn_consumer_key = \'%s\'
-                              AND osn_token        = \'%s\'
-                            ', $timestamp, $this->max_timestamp_skew, $consumer_key, $token);
-
-        if (!empty($r) && $r[1] === 't')
-        {
-            throw new OAuthException2('Timestamp is out of sequence. Request rejected. Got '.$timestamp.' last max is '.$r[0].' allowed skew is '.$this->max_timestamp_skew);
-        }
-        */
-
-        // Insert the new combination
-        $this->query('
-            INSERT INTO oauth_server_nonce (
-                osn_consumer_key,
-                osn_token,
-                osn_timestamp,
-                osn_nonce
-            )
-            VALUES (\'%s\', \'%s\', %d, \'%s\')',
-            $consumer_key, $token, $timestamp, $nonce);
-
-        if ($this->query_affected_rows() == 0)
-        {
-            throw new OAuthException2('Duplicate timestamp/nonce combination, possible replay attack.  Request rejected.');
-        }
-
-        // Clean up all timestamps older than the one we just received
-        $this->query('
-                DELETE FROM oauth_server_nonce
-                WHERE osn_consumer_key    = \'%s\'
-                  AND osn_token            = \'%s\'
-                  AND osn_timestamp     < %d - %d
-                ', $consumer_key, $token, $timestamp, $this->max_timestamp_skew);
-    }
-
-    /**
-     * Add an entry to the log table
-     *
-     * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-     * @param string received
-     * @param string sent
-     * @param string base_string
-     * @param string notes
-     * @param int (optional) user_id
-     */
-    public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-    {
-        $args = array();
-        $ps   = array();
-        foreach ($keys as $key => $value)
-        {
-            $args[] = $value;
-            $ps["olg_$key"] = "'%s'";
-        }
-
-        if (!empty($_SERVER['REMOTE_ADDR']))
-        {
-            $remote_ip = $_SERVER['REMOTE_ADDR'];
-        }
-        else if (!empty($_SERVER['REMOTE_IP']))
-        {
-            $remote_ip = $_SERVER['REMOTE_IP'];
-        }
-        else
-        {
-            $remote_ip = '0.0.0.0';
-        }
-
-        // Build the SQL
-        $ps['olg_received']    = "'%s'";                        $args[] = $this->makeUTF8($received);
-        $ps['olg_sent']        = "'%s'";                        $args[] = $this->makeUTF8($sent);
-        $ps['olg_base_string'] = "'%s'";                        $args[] = $base_string;
-        $ps['olg_notes']       = "'%s'";                        $args[] = $this->makeUTF8($notes);
-        $ps['olg_usa_id_ref'] = "NULLIF('%d', '0')";            $args[] = $user_id;
-        $ps['olg_remote_ip']  = "NULLIF('%s','0.0.0.0')::inet";        $args[] = $remote_ip;
-        
-        $this->query('
-            INSERT INTO oauth_log ('.implode(',', array_keys($ps)) . ')
-            VALUES(' . implode(',', $ps) . ')',
-            $args
-        );
-    }
-
-     /**
-     * Get a page of entries from the log.  Returns the last 100 records
-     * matching the options given.
-     *
-     * @param array options
-     * @param int user_id    current user
-     * @return array log records
-     */
-    public function listLog ( $options, $user_id )
-    {
-        $where = array();
-        $args  = array();
-        if (empty($options))
-        {
-            $where[] = 'olg_usa_id_ref = \'%d\'';
-            $args[]  = $user_id;
-        }
-        else
-        {
-            foreach ($options as $option => $value)
-            {
-                if (strlen($value) > 0)
-                {
-                    switch ($option)
-                    {
-                    case 'osr_consumer_key':
-                    case 'ocr_consumer_key':
-                    case 'ost_token':
-                    case 'oct_token':
-                        $where[] = 'olg_'.$option.' = \'%s\'';
-                        $args[]  = $value;
-                        break;
-                    }
-                }
-            }
-
-            $where[] = '(olg_usa_id_ref IS NULL OR olg_usa_id_ref = \'%d\')';
-            $args[]  = $user_id;
-        }
-
-        $rs = $this->query_all_assoc('
-                    SELECT olg_id,
-                            olg_osr_consumer_key     AS osr_consumer_key,
-                            olg_ost_token            AS ost_token,
-                            olg_ocr_consumer_key    AS ocr_consumer_key,
-                            olg_oct_token            AS oct_token,
-                            olg_usa_id_ref            AS user_id,
-                            olg_received            AS received,
-                            olg_sent                AS sent,
-                            olg_base_string            AS base_string,
-                            olg_notes                AS notes,
-                            olg_timestamp            AS timestamp,
-                            olg_remote_ip           AS remote_ip
-                    FROM oauth_log
-                    WHERE '.implode(' AND ', $where).'
-                    ORDER BY olg_id DESC
-                    LIMIT 0,100', $args);
-
-        return $rs;
-    }
-
-
-    /* ** Some simple helper functions for querying the pgsql db ** */
-
-    /**
-     * Perform a query, ignore the results
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     */
-    protected function query ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        $this->_lastAffectedRows = pg_affected_rows($res);
-        if (is_resource($res))
-        {
-            pg_free_result($res);
-        }
-    }
-
-
-    /**
-     * Perform a query, return all rows
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return array
-     */
-    protected function query_all_assoc ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        $rs = array();
-        while ($row  = pg_fetch_assoc($res))
-        {
-            $rs[] = $row;
-        }
-        pg_free_result($res);
-        return $rs;
-    }
-
-
-    /**
-     * Perform a query, return the first row
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return array
-     */
-    protected function query_row_assoc ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        if ($row = pg_fetch_assoc($res))
-        {
-            $rs = $row;
-        }
-        else
-        {
-            $rs = false;
-        }
-        pg_free_result($res);
-        return $rs;
-    }
-
-    /**
-     * Perform a query, return the first row
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return array
-     */
-    protected function query_row ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        if ($row = pg_fetch_array($res))
-        {
-            $rs = $row;
-        }
-        else
-        {
-            $rs = false;
-        }
-        pg_free_result($res);
-        return $rs;
-    }
-
-
-    /**
-     * Perform a query, return the first column of the first row
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return mixed
-     */
-    protected function query_one ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        $val = pg_fetch_row($res);
-        if ($val && isset($val[0])) {
-            $val = $val[0];
-        }
-        pg_free_result($res);
-        return $val;
-    }
-
-
-    /**
-     * Return the number of rows affected in the last query
-     */
-    protected function query_affected_rows ()
-    {
-        return $this->_lastAffectedRows;
-    }
-
-
-    /**
-     * Return the id of the last inserted row
-     *
-     * @return int
-     */
-    protected function query_insert_id ( $tableName, $primaryKey = null )
-    {
-        $sequenceName = $tableName;
-        if ($primaryKey) {
-            $sequenceName .= "_$primaryKey";
-        }
-        $sequenceName .= '_seq';
-
-        $sql = "
-            SELECT
-                CURRVAL('%s')
-                ";
-        $args = array($sql, $sequenceName);
-        $sql = $this->sql_printf($args);
-        if (!($res = pg_query($this->conn, $sql))) {
-            return 0;
-        }
-        $val = pg_fetch_row($res, 0);
-        if ($val && isset($val[0])) {
-            $val = $val[0];
-        }
-
-        pg_free_result($res);
-        return $val;
-    }
-
-
-    protected function sql_printf ( $args )
-    {
-        $sql  = array_shift($args);
-        if (count($args) == 1 && is_array($args[0]))
-        {
-            $args = $args[0];
-        }
-        $args = array_map(array($this, 'sql_escape_string'), $args);
-        return vsprintf($sql, $args);
-    }
-
-
-    protected function sql_escape_string ( $s )
-    {
-        if (is_string($s))
-        {
-            return pg_escape_string($this->conn, $s);
-        }
-        else if (is_null($s))
-        {
-            return NULL;
-        }
-        else if (is_bool($s))
-        {
-            return intval($s);
-        }
-        else if (is_int($s) || is_float($s))
-        {
-            return $s;
-        }
-        else
-        {
-            return pg_escape_string($this->conn, strval($s));
-        }
-    }
-
-
-    protected function sql_errcheck ( $sql )
-    {
-            $msg =  "SQL Error in OAuthStorePostgreSQL: ".pg_last_error($this->conn)."\n\n" . $sql;
-            throw new OAuthException2($msg);
-    }
-}
diff --git a/vendor/oauth-php/library/store/OAuthStoreSQL.php b/vendor/oauth-php/library/store/OAuthStoreSQL.php
deleted file mode 100644
index 45a4887..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreSQL.php
+++ /dev/null
@@ -1,1843 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- * 
- * @version $Id: OAuthStoreMySQL.php 76 2010-01-27 19:51:17Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-
-abstract class OAuthStoreSQL extends OAuthStoreAbstract
-{
-	/**
-	 * Maximum delta a timestamp may be off from a previous timestamp.
-	 * Allows multiple consumers with some clock skew to work with the same token.
-	 * Unit is seconds, default max skew is 10 minutes.
-	 */
-	protected $max_timestamp_skew = 600;
-
-	/**
-	 * Default ttl for request tokens
-	 */
-	protected $max_request_token_ttl = 3600;
-	
-
-	/**
-	 * Construct the OAuthStoreMySQL.
-	 * In the options you have to supply either:
-	 * - server, username, password and database (for a mysql_connect)
-	 * - conn (for the connection to be used)
-	 * 
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		if (isset($options['conn']))
-		{
-			$this->conn = $options['conn'];
-		}
-		else
-		{
-			if (isset($options['server']))
-			{
-				$server   = $options['server'];
-				$username = $options['username'];
-				
-				if (isset($options['password']))
-				{
-					$this->conn = mysql_connect($server, $username, $options['password']);
-				}
-				else
-				{
-					$this->conn = mysql_connect($server, $username);
-				}
-			}
-			else
-			{
-				// Try the default mysql connect
-				$this->conn = mysql_connect();
-			}
-
-			if ($this->conn === false)
-			{
-				throw new OAuthException2('Could not connect to MySQL database: ' . mysql_error());
-			}
-
-			if (isset($options['database']))
-			{
-				if (!mysql_select_db($options['database'], $this->conn))
-				{
-					$this->sql_errcheck();
-				}
-			}
-			$this->query('set character set utf8');
-		}
-	}
-
-
-	/**
-	 * Find stored credentials for the consumer key and token. Used by an OAuth server
-	 * when verifying an OAuth request.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param string token_type		false, 'request' or 'access'
-	 * @exception OAuthException2 when no secrets where found
-	 * @return array	assoc (consumer_secret, token_secret, osr_id, ost_id, user_id)
-	 */
-	public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' )
-	{
-		if ($token_type === false)
-		{
-			$rs = $this->query_row_assoc('
-						SELECT	osr_id, 
-								osr_consumer_key		as consumer_key,
-								osr_consumer_secret		as consumer_secret
-						FROM oauth_server_registry
-						WHERE osr_consumer_key	= \'%s\'
-						  AND osr_enabled		= 1
-						', 
-						$consumer_key);
-
-			if ($rs)
-			{
-				$rs['token'] 		= false;
-				$rs['token_secret']	= false;
-				$rs['user_id']		= false;
-				$rs['ost_id']		= false;
-			}
-		}
-		else
-		{
-			$rs = $this->query_row_assoc('
-						SELECT	osr_id, 
-								ost_id,
-								ost_usa_id_ref			as user_id,
-								osr_consumer_key		as consumer_key,
-								osr_consumer_secret		as consumer_secret,
-								ost_token				as token,
-								ost_token_secret		as token_secret
-						FROM oauth_server_registry
-								JOIN oauth_server_token
-								ON ost_osr_id_ref = osr_id
-						WHERE ost_token_type	= \'%s\'
-						  AND osr_consumer_key	= \'%s\'
-						  AND ost_token			= \'%s\'
-					 	  AND osr_enabled		= 1
-						  AND ost_token_ttl     >= NOW()
-						',
-						$token_type, $consumer_key, $token);
-		}
-		
-		if (empty($rs))
-		{
-			throw new OAuthException2('The consumer_key "'.$consumer_key.'" token "'.$token.'" combination does not exist or is not enabled.');
-		}
-		return $rs;
-	}
-
-
-	/**
-	 * Find the server details for signing a request, always looks for an access token.
-	 * The returned credentials depend on which local user is making the request.
-	 * 
-	 * The consumer_key must belong to the user or be public (user id is null)
-	 * 
-	 * For signing we need all of the following:
-	 * 
-	 * consumer_key			consumer key associated with the server
-	 * consumer_secret		consumer secret associated with this server
-	 * token				access token associated with this server
-	 * token_secret			secret for the access token
-	 * signature_methods	signing methods supported by the server (array)
-	 * 
-	 * @todo filter on token type (we should know how and with what to sign this request, and there might be old access tokens)
-	 * @param string uri	uri of the server
-	 * @param int user_id	id of the logged on user
-	 * @param string name	(optional) name of the token (case sensitive)
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getSecretsForSignature ( $uri, $user_id, $name = '' )
-	{
-		// Find a consumer key and token for the given uri
-		$ps		= parse_url($uri);
-		$host	= isset($ps['host']) ? $ps['host'] : 'localhost';
-		$path	= isset($ps['path']) ? $ps['path'] : '';
-		
-		if (empty($path) || substr($path, -1) != '/')
-		{
-			$path .= '/';
-		}
-
-		// The owner of the consumer_key is either the user or nobody (public consumer key)
-		$secrets = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							ocr_signature_methods	as signature_methods
-					FROM oauth_consumer_registry
-						JOIN oauth_consumer_token ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_server_uri_host = \'%s\'
-					  AND ocr_server_uri_path = LEFT(\'%s\', LENGTH(ocr_server_uri_path))
-					  AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-					  AND oct_usa_id_ref = \'%d\'
-					  AND oct_token_type      = \'access\'
-					  AND oct_name			  = \'%s\'
-					  AND oct_token_ttl       >= NOW()
-					ORDER BY ocr_usa_id_ref DESC, ocr_consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-					LIMIT 0,1
-					', $host, $path, $user_id, $user_id, $name
-					);
-		
-		if (empty($secrets))
-		{
-			throw new OAuthException2('No server tokens available for '.$uri);
-		}
-		$secrets['signature_methods'] = explode(',', $secrets['signature_methods']);
-		return $secrets;
-	}
-
-
-	/**
-	 * Get the token and token secret we obtained from a server.
-	 * 
-	 * @param string	consumer_key
-	 * @param string 	token
-	 * @param string	token_type
-	 * @param int		user_id			the user owning the token
-	 * @param string	name			optional name for a named token
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' )
-	{
-		if ($token_type != 'request' && $token_type != 'access')
-		{
-			throw new OAuthException2('Unkown token type "'.$token_type.'", must be either "request" or "access"');
-		}
-
-		// Take the most recent token of the given type
-		$r = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_name				as token_name,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							IF(oct_token_ttl >= \'9999-12-31\', NULL, UNIX_TIMESTAMP(oct_token_ttl) - UNIX_TIMESTAMP(NOW())) as token_ttl
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_consumer_key = \'%s\'
-					  AND oct_token_type   = \'%s\'
-					  AND oct_token        = \'%s\'
-					  AND oct_usa_id_ref   = %d
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key, $token_type, $token, $user_id
-					);
-					
-		if (empty($r))
-		{
-			throw new OAuthException2('Could not find a "'.$token_type.'" token for consumer "'.$consumer_key.'" and user '.$user_id);
-		}
-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-		{
-			$r['signature_methods'] = explode(',',$r['signature_methods']);
-		}
-		else
-		{
-			$r['signature_methods'] = array();
-		}
-		return $r;		
-	}
-
-
-	/**
-	 * Add a request token we obtained from a server.
-	 * 
-	 * @todo remove old tokens for this user and this ocr_id
-	 * @param string consumer_key	key of the server in the consumer registry
-	 * @param string token_type		one of 'request' or 'access'
-	 * @param string token
-	 * @param string token_secret
-	 * @param int 	 user_id			the user owning the token
-	 * @param array  options			extra options, server_uri, name and token_ttl
-	 * @exception OAuthException2 when server is not known
-	 * @exception OAuthException2 when we received a duplicate token
-	 */
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() )
-	{
-		if ($token_type != 'request' && $token_type != 'access')
-		{
-			throw new OAuthException2('Unknown token type "'.$token_type.'", must be either "request" or "access"');
-		}
-
-		// Maximum time to live for this token
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl = 'DATE_ADD(NOW(), INTERVAL '.intval($options['token_ttl']).' SECOND)';
-		}
-		else if ($token_type == 'request')
-		{
-			$ttl = 'DATE_ADD(NOW(), INTERVAL '.$this->max_request_token_ttl.' SECOND)';
-		}
-		else
-		{
-			$ttl = "'9999-12-31'";
-		}
-		
-		if (isset($options['server_uri'])) 
-		{
-			$ocr_id = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						AND ocr_server_uri = \'%s\'
-						', $consumer_key, $user_id, $options['server_uri']);
-		}
-		else 
-		{
-			$ocr_id = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						', $consumer_key, $user_id);
-		}
-					
-		if (empty($ocr_id))
-		{
-			throw new OAuthException2('No server associated with consumer_key "'.$consumer_key.'"');
-		}
-		
-		// Named tokens, unique per user/consumer key
-		if (isset($options['name']) && $options['name'] != '')
-		{
-			$name = $options['name'];
-		}
-		else
-		{
-			$name = '';
-		}
-
-		// Delete any old tokens with the same type and name for this user/server combination
-		$this->query('
-					DELETE FROM oauth_consumer_token
-					WHERE oct_ocr_id_ref = %d
-					  AND oct_usa_id_ref = %d
-					  AND oct_token_type = LOWER(\'%s\')
-					  AND oct_name       = \'%s\'
-					',
-					$ocr_id,
-					$user_id,
-					$token_type,
-					$name);
-
-		// Insert the new token
-		$this->query('
-					INSERT IGNORE INTO oauth_consumer_token
-					SET oct_ocr_id_ref	= %d,
-						oct_usa_id_ref  = %d,
-						oct_name		= \'%s\',
-						oct_token		= \'%s\',
-						oct_token_secret= \'%s\',
-						oct_token_type	= LOWER(\'%s\'),
-						oct_timestamp	= NOW(),
-						oct_token_ttl	= '.$ttl.'
-					',
-					$ocr_id,
-					$user_id,
-					$name,
-					$token,
-					$token_secret,
-					$token_type);
-		
-		if (!$this->query_affected_rows())
-		{
-			throw new OAuthException2('Received duplicate token "'.$token.'" for the same consumer_key "'.$consumer_key.'"');
-		}
-	}
-
-
-	/**
-	 * Delete a server key.  This removes access to that site.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 */
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-					DELETE FROM oauth_consumer_registry
-					WHERE ocr_consumer_key = \'%s\'
-					  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-					', $consumer_key, $user_id);
-		}
-		else
-		{
-			$this->query('
-					DELETE FROM oauth_consumer_registry
-					WHERE ocr_consumer_key = \'%s\'
-					  AND ocr_usa_id_ref   = %d
-					', $consumer_key, $user_id);
-		}
-	}
-	
-	
-	/**
-	 * Get a server from the consumer registry using the consumer key
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id
-	 * @param boolean user_is_admin (optional)
-	 * @exception OAuthException2 when server is not found
-	 * @return array
-	 */	
-	public function getServer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		$r = $this->query_row_assoc('
-				SELECT	ocr_id					as id,
-						ocr_usa_id_ref			as user_id,
-						ocr_consumer_key 		as consumer_key,
-						ocr_consumer_secret 	as consumer_secret,
-						ocr_signature_methods	as signature_methods,
-						ocr_server_uri			as server_uri,
-						ocr_request_token_uri	as request_token_uri,
-						ocr_authorize_uri		as authorize_uri,
-						ocr_access_token_uri	as access_token_uri
-				FROM oauth_consumer_registry
-				WHERE ocr_consumer_key = \'%s\'
-				  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-				',	$consumer_key, $user_id);
-		
-		if (empty($r))
-		{
-			throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" has been registered (for this user)');
-		}
-			
-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-		{
-			$r['signature_methods'] = explode(',',$r['signature_methods']);
-		}
-		else
-		{
-			$r['signature_methods'] = array();
-		}
-		return $r;
-	}
-
-
-
-	/**
-	 * Find the server details that might be used for a request
-	 * 
-	 * The consumer_key must belong to the user or be public (user id is null)
-	 * 
-	 * @param string uri	uri of the server
-	 * @param int user_id	id of the logged on user
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getServerForUri ( $uri, $user_id )
-	{
-		// Find a consumer key and token for the given uri
-		$ps		= parse_url($uri);
-		$host	= isset($ps['host']) ? $ps['host'] : 'localhost';
-		$path	= isset($ps['path']) ? $ps['path'] : '';
-		
-		if (empty($path) || substr($path, -1) != '/')
-		{
-			$path .= '/';
-		}
-
-		// The owner of the consumer_key is either the user or nobody (public consumer key)
-		$server = $this->query_row_assoc('
-					SELECT	ocr_id					as id,
-							ocr_usa_id_ref			as user_id,
-							ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri
-					FROM oauth_consumer_registry
-					WHERE ocr_server_uri_host = \'%s\'
-					  AND ocr_server_uri_path = LEFT(\'%s\', LENGTH(ocr_server_uri_path))
-					  AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-					ORDER BY ocr_usa_id_ref DESC, consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-					LIMIT 0,1
-					', $host, $path, $user_id
-					);
-		
-		if (empty($server))
-		{
-			throw new OAuthException2('No server available for '.$uri);
-		}
-		$server['signature_methods'] = explode(',', $server['signature_methods']);
-		return $server;
-	}
-
-
-	/**
-	 * Get a list of all server token this user has access to.
-	 * 
-	 * @param int usr_id
-	 * @return array
-	 */
-	public function listServerTokens ( $user_id )
-	{
-		$ts = $this->query_all_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_id					as token_id,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_usa_id_ref			as user_id,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_server_uri_host		as server_uri_host,
-							ocr_server_uri_path		as server_uri_path,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							oct_timestamp			as timestamp
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE oct_usa_id_ref = %d
-					  AND oct_token_type = \'access\'
-					  AND oct_token_ttl  >= NOW()
-					ORDER BY ocr_server_uri_host, ocr_server_uri_path
-					', $user_id);
-		return $ts;
-	}
-
-
-	/**
-	 * Count how many tokens we have for the given server
-	 * 
-	 * @param string consumer_key
-	 * @return int
-	 */
-	public function countServerTokens ( $consumer_key )
-	{
-		$count = $this->query_one('
-					SELECT COUNT(oct_id)
-					FROM oauth_consumer_token
-							JOIN oauth_consumer_registry
-							ON oct_ocr_id_ref = ocr_id
-					WHERE oct_token_type   = \'access\'
-					  AND ocr_consumer_key = \'%s\'
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key);
-		
-		return $count;
-	}
-
-
-	/**
-	 * Get a specific server token for the given user
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int user_id
-	 * @exception OAuthException2 when no such token found
-	 * @return array
-	 */
-	public function getServerToken ( $consumer_key, $token, $user_id )
-	{
-		$ts = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_usa_id_ref			as usr_id,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_server_uri_host		as server_uri_host,
-							ocr_server_uri_path		as server_uri_path,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							oct_timestamp			as timestamp
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_consumer_key = \'%s\'
-					  AND oct_usa_id_ref   = %d
-					  AND oct_token_type   = \'access\'
-					  AND oct_token        = \'%s\'
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key, $user_id, $token);
-		
-		if (empty($ts))
-		{
-			throw new OAuthException2('No such consumer key ('.$consumer_key.') and token ('.$token.') combination for user "'.$user_id.'"');
-		}
-		return $ts;
-	}
-
-
-	/**
-	 * Delete a token we obtained from a server.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int user_id
-	 * @param boolean user_is_admin
-	 */
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-				DELETE oauth_consumer_token 
-				FROM oauth_consumer_token
-						JOIN oauth_consumer_registry
-						ON oct_ocr_id_ref = ocr_id
-				WHERE ocr_consumer_key	= \'%s\'
-				  AND oct_token			= \'%s\'
-				', $consumer_key, $token);
-		}
-		else
-		{
-			$this->query('
-				DELETE oauth_consumer_token 
-				FROM oauth_consumer_token
-						JOIN oauth_consumer_registry
-						ON oct_ocr_id_ref = ocr_id
-				WHERE ocr_consumer_key	= \'%s\'
-				  AND oct_token			= \'%s\'
-				  AND oct_usa_id_ref	= %d
-				', $consumer_key, $token, $user_id);
-		}
-	}
-
-
-	/**
-	 * Set the ttl of a server access token.  This is done when the
-	 * server receives a valid request with a xoauth_token_ttl parameter in it.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int token_ttl
-	 */
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		if ($token_ttl <= 0)
-		{
-			// Immediate delete when the token is past its ttl
-			$this->deleteServerToken($consumer_key, $token, 0, true);
-		}
-		else if ( $server_uri ) 
-		{
-			// Set maximum time to live for this token
-			$this->query('
-						UPDATE oauth_consumer_token, oauth_consumer_registry
-						SET ost_token_ttl = DATE_ADD(NOW(), INTERVAL %d SECOND)
-						WHERE ocr_consumer_key	= \'%s\'
-						  AND ocr_server_uri = \'%s\'
-						  AND oct_ocr_id_ref    = ocr_id
-						  AND oct_token 	    = \'%s\'
-						', $token_ttl, $server_uri, $consumer_key, $token);
-		}
-		else
-		{
-			// Set maximum time to live for this token
-			$this->query('
-						UPDATE oauth_consumer_token, oauth_consumer_registry
-						SET ost_token_ttl = DATE_ADD(NOW(), INTERVAL %d SECOND)
-						WHERE ocr_consumer_key	= \'%s\'
-						  AND oct_ocr_id_ref    = ocr_id
-						  AND oct_token 	    = \'%s\'
-						', $token_ttl, $consumer_key, $token);
-		}
-	}
-
-
-	/**
-	 * Get a list of all consumers from the consumer registry.
-	 * The consumer keys belong to the user or are public (user id is null)
-	 * 
-	 * @param string q	query term
-	 * @param int user_id
-	 * @return array
-	 */	
-	public function listServers ( $q = '', $user_id )
-	{
-		$q    = trim(str_replace('%', '', $q));
-		$args = array();
-
-		if (!empty($q))
-		{
-			$where = ' WHERE (	ocr_consumer_key like \'%%%s%%\'
-						  	 OR ocr_server_uri like \'%%%s%%\'
-						  	 OR ocr_server_uri_host like \'%%%s%%\'
-						  	 OR ocr_server_uri_path like \'%%%s%%\')
-						 AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-					';
-			
-			$args[] = $q;
-			$args[] = $q;
-			$args[] = $q;
-			$args[] = $q;
-			$args[] = $user_id;
-		}
-		else
-		{
-			$where  = ' WHERE ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL';
-			$args[] = $user_id;
-		}
-
-		$servers = $this->query_all_assoc('
-					SELECT	ocr_id					as id,
-							ocr_usa_id_ref			as user_id,
-							ocr_consumer_key 		as consumer_key,
-							ocr_consumer_secret 	as consumer_secret,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_server_uri_host		as server_uri_host,
-							ocr_server_uri_path		as server_uri_path,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri
-					FROM oauth_consumer_registry
-					'.$where.'
-					ORDER BY ocr_server_uri_host, ocr_server_uri_path
-					', $args);
-		return $servers;
-	}
-
-
-	/**
-	 * Register or update a server for our site (we will be the consumer)
-	 * 
-	 * (This is the registry at the consumers, registering servers ;-) )
-	 * 
-	 * @param array server
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 * @exception OAuthException2 when fields are missing or on duplicate consumer_key
-	 * @return consumer_key
-	 */
-	public function updateServer ( $server, $user_id, $user_is_admin = false )
-	{
-		foreach (array('consumer_key', 'server_uri') as $f)
-		{
-			if (empty($server[$f]))
-			{
-				throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-			}
-		}
-		
-		if (!empty($server['id']))
-		{
-			$exists = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						  AND ocr_id <> %d
-						  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						', $server['consumer_key'], $server['id'], $user_id);
-		}
-		else
-		{
-			$exists = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						', $server['consumer_key'], $user_id);
-		}
-
-		if ($exists)
-		{
-			throw new OAuthException2('The server with key "'.$server['consumer_key'].'" has already been registered');
-		}
-
-		$parts = parse_url($server['server_uri']);
-		$host  = (isset($parts['host']) ? $parts['host'] : 'localhost');
-		$path  = (isset($parts['path']) ? $parts['path'] : '/');
-
-		if (isset($server['signature_methods']))
-		{
-			if (is_array($server['signature_methods']))
-			{
-				$server['signature_methods'] = strtoupper(implode(',', $server['signature_methods']));
-			}
-		}	
-		else
-		{
-			$server['signature_methods'] = '';
-		}
-
-		// When the user is an admin, then the user can update the user_id of this record
-		if ($user_is_admin && array_key_exists('user_id', $server))
-		{
-			if (is_null($server['user_id']))
-			{
-				$update_user =  ', ocr_usa_id_ref = NULL';
-			}
-			else
-			{
-				$update_user =  ', ocr_usa_id_ref = '.intval($server['user_id']);
-			}
-		}
-		else
-		{
-			$update_user = '';
-		}
-		
-		if (!empty($server['id']))
-		{
-			// Check if the current user can update this server definition
-			if (!$user_is_admin)
-			{
-				$ocr_usa_id_ref = $this->query_one('
-									SELECT ocr_usa_id_ref
-									FROM oauth_consumer_registry
-									WHERE ocr_id = %d
-									', $server['id']);
-				
-				if ($ocr_usa_id_ref != $user_id)
-				{
-					throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this server');
-				}
-			}
-			
-			// Update the consumer registration	
-			$this->query('
-					UPDATE oauth_consumer_registry
-					SET ocr_consumer_key    	= \'%s\',
-						ocr_consumer_secret 	= \'%s\',
-						ocr_server_uri	    	= \'%s\',
-						ocr_server_uri_host 	= \'%s\',
-						ocr_server_uri_path 	= \'%s\',
-						ocr_timestamp       	= NOW(),
-						ocr_request_token_uri	= \'%s\',
-						ocr_authorize_uri		= \'%s\',
-						ocr_access_token_uri	= \'%s\',
-						ocr_signature_methods	= \'%s\'
-						'.$update_user.'
-					WHERE ocr_id = %d
-					', 
-					$server['consumer_key'],
-					$server['consumer_secret'],
-					$server['server_uri'],
-					strtolower($host),
-					$path,
-					isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-					isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-					isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-					$server['signature_methods'],
-					$server['id']
-					);
-		}
-		else
-		{
-			if (empty($update_user))
-			{
-				// Per default the user owning the key is the user registering the key
-				$update_user =  ', ocr_usa_id_ref = '.intval($user_id);
-			}
-
-			$this->query('
-					INSERT INTO oauth_consumer_registry
-					SET ocr_consumer_key    	= \'%s\',
-						ocr_consumer_secret 	= \'%s\',
-						ocr_server_uri	    	= \'%s\',
-						ocr_server_uri_host 	= \'%s\',
-						ocr_server_uri_path 	= \'%s\',
-						ocr_timestamp       	= NOW(),
-						ocr_request_token_uri	= \'%s\',
-						ocr_authorize_uri		= \'%s\',
-						ocr_access_token_uri	= \'%s\',
-						ocr_signature_methods	= \'%s\'
-						'.$update_user, 
-					$server['consumer_key'],
-					$server['consumer_secret'],
-					$server['server_uri'],
-					strtolower($host),
-					$path,
-					isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-					isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-					isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-					$server['signature_methods']
-					);
-		
-			$ocr_id = $this->query_insert_id();
-		}
-		return $server['consumer_key'];
-	}
-
-
-	/**
-	 * Insert/update a new consumer with this server (we will be the server)
-	 * When this is a new consumer, then also generate the consumer key and secret.
-	 * Never updates the consumer key and secret.
-	 * When the id is set, then the key and secret must correspond to the entry
-	 * being updated.
-	 * 
-	 * (This is the registry at the server, registering consumers ;-) )
-	 * 
-	 * @param array consumer
-	 * @param int user_id	user registering this consumer
-	 * @param boolean user_is_admin
-	 * @return string consumer key
-	 */
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false )
-	{
-		if (!$user_is_admin)
-		{
-			foreach (array('requester_name', 'requester_email') as $f)
-			{
-				if (empty($consumer[$f]))
-				{
-					throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-				}
-			}
-		}
-		
-		if (!empty($consumer['id']))
-		{
-			if (empty($consumer['consumer_key']))
-			{
-				throw new OAuthException2('The field "consumer_key" must be set and non empty');
-			}
-			if (!$user_is_admin && empty($consumer['consumer_secret']))
-			{
-				throw new OAuthException2('The field "consumer_secret" must be set and non empty');
-			}
-
-			// Check if the current user can update this server definition
-			if (!$user_is_admin)
-			{
-				$osr_usa_id_ref = $this->query_one('
-									SELECT osr_usa_id_ref
-									FROM oauth_server_registry
-									WHERE osr_id = %d
-									', $consumer['id']);
-				
-				if ($osr_usa_id_ref != $user_id)
-				{
-					throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this consumer');
-				}
-			}
-			else
-			{
-				// User is an admin, allow a key owner to be changed or key to be shared
-				if (array_key_exists('user_id',$consumer))
-				{
-					if (is_null($consumer['user_id']))
-					{
-						$this->query('
-							UPDATE oauth_server_registry
-							SET osr_usa_id_ref = NULL
-							WHERE osr_id = %d
-							', $consumer['id']);
-					}
-					else
-					{
-						$this->query('
-							UPDATE oauth_server_registry
-							SET osr_usa_id_ref = %d
-							WHERE osr_id = %d
-							', $consumer['user_id'], $consumer['id']);	
-					}
-				}
-			}
-			
-			$this->query('
-				UPDATE oauth_server_registry
-				SET osr_requester_name		= \'%s\',
-					osr_requester_email		= \'%s\',
-					osr_callback_uri		= \'%s\',
-					osr_application_uri		= \'%s\',
-					osr_application_title	= \'%s\',
-					osr_application_descr	= \'%s\',
-					osr_application_notes	= \'%s\',
-					osr_application_type	= \'%s\',
-					osr_application_commercial = IF(%d,1,0),
-					osr_timestamp			= NOW()
-				WHERE osr_id              = %d
-				  AND osr_consumer_key    = \'%s\'
-				  AND osr_consumer_secret = \'%s\'
-				',
-				$consumer['requester_name'],
-				$consumer['requester_email'],
-				isset($consumer['callback_uri']) 		? $consumer['callback_uri'] 			 : '',
-				isset($consumer['application_uri']) 	? $consumer['application_uri'] 			 : '',
-				isset($consumer['application_title'])	? $consumer['application_title'] 		 : '',
-				isset($consumer['application_descr'])	? $consumer['application_descr'] 		 : '',
-				isset($consumer['application_notes'])	? $consumer['application_notes'] 		 : '',
-				isset($consumer['application_type']) 	? $consumer['application_type'] 		 : '',
-				isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0,
-				$consumer['id'],
-				$consumer['consumer_key'],
-				$consumer['consumer_secret']
-				);
-				
-
-			$consumer_key = $consumer['consumer_key'];
-		}
-		else
-		{
-			$consumer_key	= $this->generateKey(true);
-			$consumer_secret= $this->generateKey();
-
-			// When the user is an admin, then the user can be forced to something else that the user
-			if ($user_is_admin && array_key_exists('user_id',$consumer))
-			{
-				if (is_null($consumer['user_id']))
-				{
-					$owner_id = 'NULL';
-				}
-				else
-				{
-					$owner_id = intval($consumer['user_id']);
-				}
-			}
-			else
-			{
-				// No admin, take the user id as the owner id.
-				$owner_id = intval($user_id);
-			}
-
-			$this->query('
-				INSERT INTO oauth_server_registry
-				SET osr_enabled				= 1,
-					osr_status				= \'active\',
-					osr_usa_id_ref			= \'%s\',
-					osr_consumer_key		= \'%s\',
-					osr_consumer_secret		= \'%s\',
-					osr_requester_name		= \'%s\',
-					osr_requester_email		= \'%s\',
-					osr_callback_uri		= \'%s\',
-					osr_application_uri		= \'%s\',
-					osr_application_title	= \'%s\',
-					osr_application_descr	= \'%s\',
-					osr_application_notes	= \'%s\',
-					osr_application_type	= \'%s\',
-					osr_application_commercial = IF(%d,1,0),
-					osr_timestamp			= NOW(),
-					osr_issue_date			= NOW()
-				',
-				$owner_id,
-				$consumer_key,
-				$consumer_secret,
-				$consumer['requester_name'],
-				$consumer['requester_email'],
-				isset($consumer['callback_uri']) 		? $consumer['callback_uri'] 			 : '',
-				isset($consumer['application_uri']) 	? $consumer['application_uri'] 			 : '',
-				isset($consumer['application_title'])	? $consumer['application_title'] 		 : '',
-				isset($consumer['application_descr'])	? $consumer['application_descr'] 		 : '',
-				isset($consumer['application_notes'])	? $consumer['application_notes'] 		 : '',
-				isset($consumer['application_type']) 	? $consumer['application_type'] 		 : '',
-				isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0
-				);
-		}
-		return $consumer_key;
-
-	}
-
-
-
-	/**
-	 * Delete a consumer key.  This removes access to our site for all applications using this key.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 */
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-					DELETE FROM oauth_server_registry
-					WHERE osr_consumer_key = \'%s\'
-					  AND (osr_usa_id_ref = %d OR osr_usa_id_ref IS NULL)
-					', $consumer_key, $user_id);
-		}
-		else
-		{
-			$this->query('
-					DELETE FROM oauth_server_registry
-					WHERE osr_consumer_key = \'%s\'
-					  AND osr_usa_id_ref   = %d
-					', $consumer_key, $user_id);
-		}
-	}	
-	
-	
-	
-	/**
-	 * Fetch a consumer of this server, by consumer_key.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id
-	 * @param boolean user_is_admin (optional)
-	 * @exception OAuthException2 when consumer not found
-	 * @return array
-	 */
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		$consumer = $this->query_row_assoc('
-						SELECT	*
-						FROM oauth_server_registry
-						WHERE osr_consumer_key = \'%s\'
-						', $consumer_key);
-		
-		if (!is_array($consumer))
-		{
-			throw new OAuthException2('No consumer with consumer_key "'.$consumer_key.'"');
-		}
-
-		$c = array();
-		foreach ($consumer as $key => $value)
-		{
-			$c[substr($key, 4)] = $value;
-		}
-		$c['user_id'] = $c['usa_id_ref'];
-
-		if (!$user_is_admin && !empty($c['user_id']) && $c['user_id'] != $user_id)
-		{
-			throw new OAuthException2('No access to the consumer information for consumer_key "'.$consumer_key.'"');
-		}
-		return $c;
-	}
-
-
-	/**
-	 * Fetch the static consumer key for this provider.  The user for the static consumer 
-	 * key is NULL (no user, shared key).  If the key did not exist then the key is created.
-	 * 
-	 * @return string
-	 */
-	public function getConsumerStatic ()
-	{
-		$consumer = $this->query_one('
-						SELECT osr_consumer_key
-						FROM oauth_server_registry
-						WHERE osr_consumer_key LIKE \'sc-%%\'
-						  AND osr_usa_id_ref IS NULL
-						');
-
-		if (empty($consumer))
-		{
-			$consumer_key = 'sc-'.$this->generateKey(true);
-			$this->query('
-				INSERT INTO oauth_server_registry
-				SET osr_enabled				= 1,
-					osr_status				= \'active\',
-					osr_usa_id_ref			= NULL,
-					osr_consumer_key		= \'%s\',
-					osr_consumer_secret		= \'\',
-					osr_requester_name		= \'\',
-					osr_requester_email		= \'\',
-					osr_callback_uri		= \'\',
-					osr_application_uri		= \'\',
-					osr_application_title	= \'Static shared consumer key\',
-					osr_application_descr	= \'\',
-					osr_application_notes	= \'Static shared consumer key\',
-					osr_application_type	= \'\',
-					osr_application_commercial = 0,
-					osr_timestamp			= NOW(),
-					osr_issue_date			= NOW()
-				',
-				$consumer_key
-				);
-			
-			// Just make sure that if the consumer key is truncated that we get the truncated string
-			$consumer = $this->getConsumerStatic();
-		}
-		return $consumer;
-	}
-
-
-	/**
-	 * Add an unautorized request token to our server.
-	 * 
-	 * @param string consumer_key
-	 * @param array options		(eg. token_ttl)
-	 * @return array (token, token_secret)
-	 */
-	public function addConsumerRequestToken ( $consumer_key, $options = array() )
-	{
-		$token  = $this->generateKey(true);
-		$secret = !isset($options['secret']) ? $this->generateKey() : $options['secret'];
-		$osr_id	= $this->query_one('
-						SELECT osr_id
-						FROM oauth_server_registry
-						WHERE osr_consumer_key = \'%s\'
-						  AND osr_enabled      = 1
-						', $consumer_key);
-
-		if (!$osr_id)
-		{
-			throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" or consumer_key is disabled');
-		}
-
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl = intval($options['token_ttl']);
-		}
-		else
-		{
-			$ttl = $this->max_request_token_ttl;
-		}
-
-		if (!isset($options['oauth_callback'])) {
-	 		// 1.0a Compatibility : store callback url associated with request token
-			$options['oauth_callback']='oob';
- 		}
-		
-		$this->query('
-				INSERT INTO oauth_server_token
-				SET ost_osr_id_ref		= %d,
-					ost_usa_id_ref		= 1,
-					ost_token			= \'%s\',
-					ost_token_secret	= \'%s\',
-					ost_token_type		= \'request\',
-					ost_token_ttl       = DATE_ADD(NOW(), INTERVAL %d SECOND),
-					ost_callback_url    = \'%s\'
-				ON DUPLICATE KEY UPDATE
-					ost_osr_id_ref		= VALUES(ost_osr_id_ref),
-					ost_usa_id_ref		= VALUES(ost_usa_id_ref),
-					ost_token			= VALUES(ost_token),
-					ost_token_secret	= VALUES(ost_token_secret),
-					ost_token_type		= VALUES(ost_token_type),
-					ost_token_ttl       = VALUES(ost_token_ttl),
-					ost_callback_url    = VALUES(ost_callback_url),
-					ost_timestamp		= NOW()
-				', $osr_id, $token, $secret, $ttl, $options['oauth_callback']);
-		
-		return array('token'=>$token, 'token_secret'=>$secret, 'token_ttl'=>$ttl);
-	}
-	
-	
-	/**
-	 * Fetch the consumer request token, by request token.
-	 * 
-	 * @param string token
-	 * @return array  token and consumer details
-	 */
-	public function getConsumerRequestToken ( $token )
-	{
-		$rs = $this->query_row_assoc('
-				SELECT	ost_token			as token,
-						ost_token_secret	as token_secret,
-						osr_consumer_key	as consumer_key,
-						osr_consumer_secret	as consumer_secret,
-						ost_token_type		as token_type,
- 						ost_callback_url    as callback_url,
- 						osr_application_title as application_title,
- 						osr_application_descr as application_descr,
- 						osr_application_uri   as application_uri					
-				FROM oauth_server_token
-						JOIN oauth_server_registry
-						ON ost_osr_id_ref = osr_id
-				WHERE ost_token_type = \'request\'
-				  AND ost_token      = \'%s\'
-				  AND ost_token_ttl  >= NOW()
-				', $token);
-		
-		return $rs;
-	}
-	
-
-	/**
-	 * Delete a consumer token.  The token must be a request or authorized token.
-	 * 
-	 * @param string token
-	 */
-	public function deleteConsumerRequestToken ( $token )
-	{
-		$this->query('
-					DELETE FROM oauth_server_token
-					WHERE ost_token 	 = \'%s\'
-					  AND ost_token_type = \'request\'
-					', $token);
-	}
-	
-
-	/**
-	 * Upgrade a request token to be an authorized request token.
-	 * 
-	 * @param string token
-	 * @param int	 user_id  user authorizing the token
-	 * @param string referrer_host used to set the referrer host for this token, for user feedback
-	 */
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' )
-	{
- 		// 1.0a Compatibility : create a token verifier
- 		$verifier = substr(md5(rand()),0,10);
-		
-		$this->query('
-					UPDATE oauth_server_token
-					SET ost_authorized    = 1,
-						ost_usa_id_ref    = %d,
-						ost_timestamp     = NOW(),
-						ost_referrer_host = \'%s\',
-						ost_verifier      = \'%s\'
-					WHERE ost_token      = \'%s\'
-					  AND ost_token_type = \'request\'
-					', $user_id, $referrer_host, $verifier, $token);
-		return $verifier;
-	}
-
-
-	/**
-	 * Count the consumer access tokens for the given consumer.
-	 * 
-	 * @param string consumer_key
-	 * @return int
-	 */
-	public function countConsumerAccessTokens ( $consumer_key )
-	{
-		$count = $this->query_one('
-					SELECT COUNT(ost_id)
-					FROM oauth_server_token
-							JOIN oauth_server_registry
-							ON ost_osr_id_ref = osr_id
-					WHERE ost_token_type   = \'access\'
-					  AND osr_consumer_key = \'%s\'
-					  AND ost_token_ttl    >= NOW()
-					', $consumer_key);
-		
-		return $count;
-	}
-
-
-	/**
-	 * Exchange an authorized request token for new access token.
-	 * 
-	 * @param string token
-	 * @param array options		options for the token, token_ttl
-	 * @exception OAuthException2 when token could not be exchanged
-	 * @return array (token, token_secret)
-	 */
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() )
-	{
-		$new_token  = $this->generateKey(true);
-		$new_secret = $this->generateKey();
-
-		// Maximum time to live for this token
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl_sql = 'DATE_ADD(NOW(), INTERVAL '.intval($options['token_ttl']).' SECOND)';
-		}
-		else
-		{
-			$ttl_sql = "'9999-12-31'";
-		}
-		
- 		if (isset($options['verifier'])) {
-		 	$verifier = $options['verifier'];
-
-		 	// 1.0a Compatibility : check token against oauth_verifier
-		 	$this->query('
-		 				UPDATE oauth_server_token
-		 				SET ost_token			= \'%s\',
-		 					ost_token_secret	= \'%s\',
-		 					ost_token_type		= \'access\',
-		 					ost_timestamp		= NOW(),
-		 					ost_token_ttl       = '.$ttl_sql.'
-		 				WHERE ost_token      = \'%s\'
-		 				  AND ost_token_type = \'request\'
-		 				  AND ost_authorized = 1
-		 				  AND ost_token_ttl  >= NOW()
-		 				  AND ost_verifier = \'%s\'
-		 				', $new_token, $new_secret, $token, $verifier);
- 		} else {
-
-		 	// 1.0
-		 	$this->query('
-		 				UPDATE oauth_server_token
-		 				SET ost_token			= \'%s\',
-		 					ost_token_secret	= \'%s\',
-		 					ost_token_type		= \'access\',
-		 					ost_timestamp		= NOW(),
-		 					ost_token_ttl       = '.$ttl_sql.'
-		 				WHERE ost_token      = \'%s\'
-		 				  AND ost_token_type = \'request\'
-		 				  AND ost_authorized = 1
-		 				  AND ost_token_ttl  >= NOW()
-		 				', $new_token, $new_secret, $token);
-		}
-		
-		if ($this->query_affected_rows() != 1)
-		{
-			throw new OAuthException2('Can\'t exchange request token "'.$token.'" for access token. No such token or not authorized');
-		}
-
-		$ret = array('token' => $new_token, 'token_secret' => $new_secret);
-		$ttl = $this->query_one('
-					SELECT	IF(ost_token_ttl >= \'9999-12-31\', NULL, UNIX_TIMESTAMP(ost_token_ttl) - UNIX_TIMESTAMP(NOW())) as token_ttl
-					FROM oauth_server_token
-					WHERE ost_token = \'%s\'', $new_token);
-
-		if (is_numeric($ttl))
-		{
-			$ret['token_ttl'] = intval($ttl);
-		}
-		return $ret;
-	}
-
-
-	/**
-	 * Fetch the consumer access token, by access token.
-	 * 
-	 * @param string token
-	 * @param int user_id
-	 * @exception OAuthException2 when token is not found
-	 * @return array  token and consumer details
-	 */
-	public function getConsumerAccessToken ( $token, $user_id )
-	{
-		$rs = $this->query_row_assoc('
-				SELECT	ost_token				as token,
-						ost_token_secret		as token_secret,
-						ost_referrer_host		as token_referrer_host,
-						osr_consumer_key		as consumer_key,
-						osr_consumer_secret		as consumer_secret,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr,
-						osr_callback_uri		as callback_uri
-				FROM oauth_server_token
-						JOIN oauth_server_registry
-						ON ost_osr_id_ref = osr_id
-				WHERE ost_token_type = \'access\'
-				  AND ost_token      = \'%s\'
-				  AND ost_usa_id_ref = %d
-				  AND ost_token_ttl  >= NOW()
-				', $token, $user_id);
-		
-		if (empty($rs))
-		{
-			throw new OAuthException2('No server_token "'.$token.'" for user "'.$user_id.'"');
-		}
-		return $rs;
-	}
-
-
-	/**
-	 * Delete a consumer access token.
-	 * 
-	 * @param string token
-	 * @param int user_id
-	 * @param boolean user_is_admin
-	 */
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-						DELETE FROM oauth_server_token
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						', $token);
-		}
-		else
-		{
-			$this->query('
-						DELETE FROM oauth_server_token
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						  AND ost_usa_id_ref = %d
-						', $token, $user_id);
-		}
-	}
-
-
-	/**
-	 * Set the ttl of a consumer access token.  This is done when the
-	 * server receives a valid request with a xoauth_token_ttl parameter in it.
-	 * 
-	 * @param string token
-	 * @param int ttl
-	 */
-	public function setConsumerAccessTokenTtl ( $token, $token_ttl )
-	{
-		if ($token_ttl <= 0)
-		{
-			// Immediate delete when the token is past its ttl
-			$this->deleteConsumerAccessToken($token, 0, true);
-		}
-		else
-		{
-			// Set maximum time to live for this token
-			$this->query('
-						UPDATE oauth_server_token
-						SET ost_token_ttl = DATE_ADD(NOW(), INTERVAL %d SECOND)
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						', $token_ttl, $token);
-		}
-	}
-
-
-	/**
-	 * Fetch a list of all consumer keys, secrets etc.
-	 * Returns the public (user_id is null) and the keys owned by the user
-	 * 
-	 * @param int user_id
-	 * @return array
-	 */
-	public function listConsumers ( $user_id )
-	{
-		$rs = $this->query_all_assoc('
-				SELECT	osr_id					as id,
-						osr_usa_id_ref			as user_id,
-						osr_consumer_key 		as consumer_key,
-						osr_consumer_secret		as consumer_secret,
-						osr_enabled				as enabled,
-						osr_status 				as status,
-						osr_issue_date			as issue_date,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr,
-						osr_application_type	as application_type,
-						osr_application_commercial	as application_commercial,
-						osr_requester_name		as requester_name,
-						osr_requester_email		as requester_email,
-						osr_callback_uri		as callback_uri
-				FROM oauth_server_registry
-				WHERE (osr_usa_id_ref = %d OR osr_usa_id_ref IS NULL)
-				ORDER BY osr_application_title
-				', $user_id);
-		return $rs;
-	}
-
-	/**
-	 * List of all registered applications. Data returned has not sensitive 
-	 * information and therefore is suitable for public displaying.
-	 * 
-	 * @param int $begin
-	 * @param int $total
-	 * @return array
-	 */
-	public function listConsumerApplications($begin = 0, $total = 25) 
-	{
-		$rs = $this->query_all_assoc('
-				SELECT	osr_id					as id,
-						osr_enabled				as enabled,
-						osr_status 				as status,
-						osr_issue_date			as issue_date,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr
-				FROM oauth_server_registry
-				ORDER BY osr_application_title
-				');
-		// TODO: pagination
-		return $rs;
-	}
-
-	/**
-	 * Fetch a list of all consumer tokens accessing the account of the given user.
-	 * 
-	 * @param int user_id
-	 * @return array
-	 */
-	public function listConsumerTokens ( $user_id )
-	{
-		$rs = $this->query_all_assoc('
-				SELECT	osr_consumer_key 		as consumer_key,
-						osr_consumer_secret		as consumer_secret,
-						osr_enabled				as enabled,
-						osr_status 				as status,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr,
-						ost_timestamp			as timestamp,	
-						ost_token				as token,
-						ost_token_secret		as token_secret,
-						ost_referrer_host		as token_referrer_host,
-						osr_callback_uri		as callback_uri
-				FROM oauth_server_registry
-					JOIN oauth_server_token
-					ON ost_osr_id_ref = osr_id
-				WHERE ost_usa_id_ref = %d
-				  AND ost_token_type = \'access\'
-				  AND ost_token_ttl  >= NOW()
-				ORDER BY osr_application_title
-				', $user_id);
-		return $rs;
-	}
-
-
-	/**
-	 * Check an nonce/timestamp combination.  Clears any nonce combinations
-	 * that are older than the one received.
-	 * 
-	 * @param string	consumer_key
-	 * @param string 	token
-	 * @param int		timestamp
-	 * @param string 	nonce
-	 * @exception OAuthException2	thrown when the timestamp is not in sequence or nonce is not unique
-	 */
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce )
-	{
-		/* removed in Appendix A of RFC 5849
-		$r = $this->query_row('
-							SELECT MAX(osn_timestamp), MAX(osn_timestamp) > %d + %d
-							FROM oauth_server_nonce
-							WHERE osn_consumer_key = \'%s\'
-							  AND osn_token        = \'%s\'
-							', $timestamp, $this->max_timestamp_skew, $consumer_key, $token);
-
-		if (!empty($r) && $r[1])
-		{
-			throw new OAuthException2('Timestamp is out of sequence. Request rejected. Got '.$timestamp.' last max is '.$r[0].' allowed skew is '.$this->max_timestamp_skew);
-		}*/
-		
-		// Insert the new combination
-		$this->query('
-				INSERT IGNORE INTO oauth_server_nonce
-				SET osn_consumer_key	= \'%s\',
-					osn_token			= \'%s\',
-					osn_timestamp		= %d,
-					osn_nonce			= \'%s\'
-				', $consumer_key, $token, $timestamp, $nonce);
-		
-		if ($this->query_affected_rows() == 0)
-		{
-			throw new OAuthException2('Duplicate timestamp/nonce combination, possible replay attack.  Request rejected.');
-		}
-
-		// Clean up all timestamps older than the one we just received
-		$this->query('
-				DELETE FROM oauth_server_nonce
-				WHERE osn_consumer_key	= \'%s\'
-				  AND osn_token			= \'%s\'
-				  AND osn_timestamp     < %d - %d
-				', $consumer_key, $token, $timestamp, $this->max_timestamp_skew);
-	}
-
-
-	/**
-	 * Add an entry to the log table
-	 * 
-	 * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-	 * @param string received
-	 * @param string sent
-	 * @param string base_string
-	 * @param string notes
-	 * @param int (optional) user_id
-	 */
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-	{
-		$args = array();
-		$ps   = array();
-		foreach ($keys as $key => $value)
-		{
-			$args[] = $value;
-			$ps[]   = "olg_$key = '%s'";
-		}
-
-		if (!empty($_SERVER['REMOTE_ADDR']))
-		{
-			$remote_ip = $_SERVER['REMOTE_ADDR'];
-		}	
-		else if (!empty($_SERVER['REMOTE_IP']))
-		{
-			$remote_ip = $_SERVER['REMOTE_IP'];
-		}
-		else
-		{
-			$remote_ip = '0.0.0.0';
-		}
-
-		// Build the SQL
-		$ps[] = "olg_received  	= '%s'";						$args[] = $this->makeUTF8($received);
-		$ps[] = "olg_sent   	= '%s'";						$args[] = $this->makeUTF8($sent);
-		$ps[] = "olg_base_string= '%s'";						$args[] = $base_string;
-		$ps[] = "olg_notes   	= '%s'";						$args[] = $this->makeUTF8($notes);
-		$ps[] = "olg_usa_id_ref = NULLIF(%d,0)";				$args[] = $user_id;
-		$ps[] = "olg_remote_ip  = IFNULL(INET_ATON('%s'),0)";	$args[] = $remote_ip;
-
-		$this->query('INSERT INTO oauth_log SET '.implode(',', $ps), $args);
-	}
-	
-	
-	/**
-	 * Get a page of entries from the log.  Returns the last 100 records
-	 * matching the options given.
-	 * 
-	 * @param array options
-	 * @param int user_id	current user
-	 * @return array log records
-	 */
-	public function listLog ( $options, $user_id )
-	{
-		$where = array();
-		$args  = array();
-		if (empty($options))
-		{
-			$where[] = 'olg_usa_id_ref = %d';
-			$args[]  = $user_id;
-		}
-		else
-		{
-			foreach ($options as $option => $value)
-			{
-				if (strlen($value) > 0)
-				{
-					switch ($option)
-					{
-					case 'osr_consumer_key':
-					case 'ocr_consumer_key':
-					case 'ost_token':
-					case 'oct_token':
-						$where[] = 'olg_'.$option.' = \'%s\'';
-						$args[]  = $value;	
-						break;				
-					}
-				}
-			}
-			
-			$where[] = '(olg_usa_id_ref IS NULL OR olg_usa_id_ref = %d)';
-			$args[]  = $user_id;
-		}
-
-		$rs = $this->query_all_assoc('
-					SELECT olg_id,
-							olg_osr_consumer_key 	AS osr_consumer_key,
-							olg_ost_token			AS ost_token,
-							olg_ocr_consumer_key	AS ocr_consumer_key,
-							olg_oct_token			AS oct_token,
-							olg_usa_id_ref			AS user_id,
-							olg_received			AS received,
-							olg_sent				AS sent,
-							olg_base_string			AS base_string,
-							olg_notes				AS notes,
-							olg_timestamp			AS timestamp,
-							INET_NTOA(olg_remote_ip) AS remote_ip
-					FROM oauth_log
-					WHERE '.implode(' AND ', $where).'
-					ORDER BY olg_id DESC
-					LIMIT 0,100', $args);
-
-		return $rs;
-	}
-
-	
-	/* ** Some simple helper functions for querying the mysql db ** */
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	abstract protected function query ( $sql );
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	abstract protected function query_all_assoc ( $sql );
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	abstract protected function query_row_assoc ( $sql );
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	abstract protected function query_row ( $sql );
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	abstract protected function query_one ( $sql );
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	abstract protected function query_affected_rows ();
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	abstract protected function query_insert_id ();
-	
-	
-	abstract protected function sql_printf ( $args );
-	
-	
-	abstract protected function sql_escape_string ( $s );
-	
-	
-	abstract protected function sql_errcheck ( $sql );
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreSession.php b/vendor/oauth-php/library/store/OAuthStoreSession.php
deleted file mode 100644
index ecb30c8..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreSession.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * OAuthSession is a really *dirty* storage. It's useful for testing and may 
- * be enough for some very simple applications, but it's not recommended for
- * production use.
- * 
- * @version $Id: OAuthStoreSession.php 183 2011-01-14 11:43:27Z brunobg@corollarium.com $
- * @author BBG
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-class OAuthStoreSession extends OAuthStoreAbstract
-{
-	private $session; 
-
-	/*
-	 * Takes two options: consumer_key and consumer_secret
-	 */
-	public function __construct( $options = array() )
-	{
-		if (!session_id()) {
-			session_start();
-		}
-		if(isset($options['consumer_key']) && isset($options['consumer_secret']))
-		{
-			$this->session = &$_SESSION['oauth_' . $options['consumer_key']];
-			$this->session['consumer_key'] = $options['consumer_key'];
-			$this->session['consumer_secret'] = $options['consumer_secret'];
-			$this->session['signature_methods'] = array('HMAC-SHA1');
-			$this->session['server_uri'] = $options['server_uri']; 
-			$this->session['request_token_uri'] = $options['request_token_uri'];
-			$this->session['authorize_uri'] = $options['authorize_uri'];
-			$this->session['access_token_uri'] = $options['access_token_uri']; 
-			
-		}
-		else
-		{
-			throw new OAuthException2("OAuthStoreSession needs consumer_key and consumer_secret");
-		}
-	}
-
-	public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getSecretsForSignature ( $uri, $user_id ) 
-	{
-		return $this->session;
-	}
-
-	public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '') 	
-	{ 
-		if ($consumer_key != $this->session['consumer_key']) {
-			return array();
-		} 
-		return array(
-			'consumer_key' => $consumer_key,
-			'consumer_secret' => $this->session['consumer_secret'],
-			'token' => $token,
-			'token_secret' => $this->session['token_secret'],
-			'token_name' => $name,
-			'signature_methods' => $this->session['signature_methods'],
-			'server_uri' => $this->session['server_uri'],
-			'request_token_uri' => $this->session['request_token_uri'],
-			'authorize_uri' => $this->session['authorize_uri'],
-			'access_token_uri' => $this->session['access_token_uri'],
-			'token_ttl' => 3600,
-		);
-	}
-	
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() ) 
-	{
-		$this->session['token_type'] = $token_type;
-		$this->session['token'] = $token;
-		$this->session['token_secret'] = $token_secret;
-	}
-
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getServer( $consumer_key, $user_id, $user_is_admin = false ) { 
-		return array( 
-			'id' => 0,
-			'user_id' => $user_id,
-			'consumer_key' => $this->session['consumer_key'],
-			'consumer_secret' => $this->session['consumer_secret'],
-			'signature_methods' => $this->session['signature_methods'],
-			'server_uri' => $this->session['server_uri'],
-			'request_token_uri' => $this->session['request_token_uri'],
-			'authorize_uri' => $this->session['authorize_uri'],
-			'access_token_uri' => $this->session['access_token_uri'],
-		);
-	}
-	
-	public function getServerForUri ( $uri, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listServerTokens ( $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function countServerTokens ( $consumer_key ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getServerToken ( $consumer_key, $token, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false ) {
-		// TODO 
-	}
-
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		//This method just needs to exist. It doesn't have to do anything!
-	}
-	
-	public function listServers ( $q = '', $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function updateServer ( $server, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumerStatic () { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-
-	public function addConsumerRequestToken ( $consumer_key, $options = array() ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function countConsumerAccessTokens ( $consumer_key ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumerAccessToken ( $token, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function setConsumerAccessTokenTtl ( $token, $ttl ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	
-	public function listConsumers ( $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listConsumerApplications( $begin = 0, $total = 25 )  { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listConsumerTokens ( $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listLog ( $options, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	
-	public function install () { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }		
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/mysql/install.php b/vendor/oauth-php/library/store/mysql/install.php
deleted file mode 100644
index 0015da5..0000000
--- a/vendor/oauth-php/library/store/mysql/install.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Installs all tables in the mysql.sql file, using the default mysql connection
- */
-
-/* Change and uncomment this when you need to: */
-
-/*
-mysql_connect('localhost', 'root');
-if (mysql_errno())
-{
-	die(' Error '.mysql_errno().': '.mysql_error());
-}
-mysql_select_db('test');
-*/
-
-$sql = file_get_contents(dirname(__FILE__) . '/mysql.sql');
-$ps  = explode('#--SPLIT--', $sql);
-
-foreach ($ps as $p)
-{
-	$p = preg_replace('/^\s*#.*$/m', '', $p);
-	
-	mysql_query($p);
-	if (mysql_errno())
-	{
-		die(' Error '.mysql_errno().': '.mysql_error());
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/mysql/mysql.sql b/vendor/oauth-php/library/store/mysql/mysql.sql
deleted file mode 100644
index ca8eb08..0000000
--- a/vendor/oauth-php/library/store/mysql/mysql.sql
+++ /dev/null
@@ -1,240 +0,0 @@
-# Datamodel for OAuthStoreMySQL
-#
-# You need to add the foreign key constraints for the user ids your are using.
-# I have commented the constraints out, just look for 'usa_id_ref' to enable them.
-#
-# The --SPLIT-- markers are used by the install.php script
-#   
-# @version $Id: mysql.sql 188 2011-02-25 14:40:26Z scherpenisse $
-# @author Marc Worrell
-#
-
-# Changes:
-#
-# 2011-02-25
-#           ALTER TABLE oauth_consumer_token MODIFY oct_token varchar(255) binary not null;
-#           ALTER TABLE oauth_consumer_token MODIFY oct_token_secret varchar(255) binary not null;
-#
-# 2010-09-15 
-#			ALTER TABLE oauth_server_token MODIFY ost_referrer_host varchar(128) not null default '';
-#
-# 2010-07-22 
-#			ALTER TABLE oauth_consumer_registry DROP INDEX ocr_consumer_key;
-#			ALTER TABLE oauth_consumer_registry ADD UNIQUE ocr_consumer_key(ocr_consumer_key,ocr_usa_id_ref,ocr_server_uri)
-#
-# 2010-04-20 (on 103 and 110)
-#           ALTER TABLE oauth_consumer_registry MODIFY ocr_consumer_key varchar(128) binary not null;
-#           ALTER TABLE oauth_consumer_registry MODIFY ocr_consumer_secret varchar(128) binary not null;
-#
-# 2010-04-20 (on 103 and 110)
-# 			ALTER TABLE oauth_server_token ADD ost_verifier char(10);
-# 			ALTER TABLE oauth_server_token ADD ost_callback_url varchar(512);
-#
-# 2008-10-15 (on r48) Added ttl to consumer and server tokens, added named server tokens
-#
-#			ALTER TABLE oauth_server_token 
-#			ADD ost_token_ttl datetime not null default '9999-12-31',
-#			ADD KEY (ost_token_ttl);
-#
-#			ALTER TABLE oauth_consumer_token 
-#			ADD oct_name varchar(64) binary not null default '',
-#			ADD oct_token_ttl datetime not null default '9999-12-31',
-#			DROP KEY oct_usa_id_ref,
-#			ADD UNIQUE KEY (oct_usa_id_ref, oct_ocr_id_ref, oct_token_type, oct_name),
-#			ADD KEY (oct_token_ttl);
-#
-# 2008-09-09 (on r5) Added referrer host to server access token
-#
-#			ALTER TABLE oauth_server_token ADD ost_referrer_host VARCHAR(128) NOT NULL;
-#
-
-
-#
-# Log table to hold all OAuth request when you enabled logging
-#
-
-CREATE TABLE IF NOT EXISTS oauth_log (
-    olg_id                  int(11) not null auto_increment,
-    olg_osr_consumer_key    varchar(64) binary,
-    olg_ost_token           varchar(64) binary,
-    olg_ocr_consumer_key    varchar(64) binary,
-    olg_oct_token           varchar(64) binary,
-    olg_usa_id_ref          int(11),
-    olg_received            text not null,
-    olg_sent                text not null,
-    olg_base_string         text not null,
-    olg_notes               text not null,
-    olg_timestamp           timestamp not null default current_timestamp,
-    olg_remote_ip           bigint not null,
-
-    primary key (olg_id),
-    key (olg_osr_consumer_key, olg_id),
-    key (olg_ost_token, olg_id),
-    key (olg_ocr_consumer_key, olg_id),
-    key (olg_oct_token, olg_id),
-    key (olg_usa_id_ref, olg_id)
-    
-#   , foreign key (olg_usa_id_ref) references any_user_auth (usa_id_ref)
-#       on update cascade
-#       on delete cascade
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-#
-# /////////////////// CONSUMER SIDE ///////////////////
-#
-
-# This is a registry of all consumer codes we got from other servers
-# The consumer_key/secret is obtained from the server
-# We also register the server uri, so that we can find the consumer key and secret
-# for a certain server.  From that server we can check if we have a token for a
-# particular user.
-
-CREATE TABLE IF NOT EXISTS oauth_consumer_registry (
-    ocr_id                  int(11) not null auto_increment,
-    ocr_usa_id_ref          int(11),
-    ocr_consumer_key        varchar(128) binary not null,
-    ocr_consumer_secret     varchar(128) binary not null,
-    ocr_signature_methods   varchar(255) not null default 'HMAC-SHA1,PLAINTEXT',
-    ocr_server_uri          varchar(255) not null,
-    ocr_server_uri_host     varchar(128) not null,
-    ocr_server_uri_path     varchar(128) binary not null,
-
-    ocr_request_token_uri   varchar(255) not null,
-    ocr_authorize_uri       varchar(255) not null,
-    ocr_access_token_uri    varchar(255) not null,
-    ocr_timestamp           timestamp not null default current_timestamp,
-
-    primary key (ocr_id),
-    unique key (ocr_consumer_key, ocr_usa_id_ref, ocr_server_uri),
-    key (ocr_server_uri),
-    key (ocr_server_uri_host, ocr_server_uri_path),
-    key (ocr_usa_id_ref)
-
-#   , foreign key (ocr_usa_id_ref) references any_user_auth(usa_id_ref)
-#       on update cascade
-#       on delete set null
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-# Table used to sign requests for sending to a server by the consumer
-# The key is defined for a particular user.  Only one single named
-# key is allowed per user/server combination
-
-CREATE TABLE IF NOT EXISTS oauth_consumer_token (
-    oct_id                  int(11) not null auto_increment,
-    oct_ocr_id_ref          int(11) not null,
-    oct_usa_id_ref          int(11) not null,
-    oct_name                varchar(64) binary not null default '',
-    oct_token               varchar(255) binary not null,
-    oct_token_secret        varchar(255) binary not null,
-    oct_token_type          enum('request','authorized','access'),
-    oct_token_ttl           datetime not null default '9999-12-31',
-    oct_timestamp           timestamp not null default current_timestamp,
-
-    primary key (oct_id),
-    unique key (oct_ocr_id_ref, oct_token),
-    unique key (oct_usa_id_ref, oct_ocr_id_ref, oct_token_type, oct_name),
-	key (oct_token_ttl),
-
-    foreign key (oct_ocr_id_ref) references oauth_consumer_registry (ocr_id)
-        on update cascade
-        on delete cascade
-
-#   , foreign key (oct_usa_id_ref) references any_user_auth (usa_id_ref)
-#       on update cascade
-#       on delete cascade           
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-
-#
-# ////////////////// SERVER SIDE /////////////////
-#
-
-# Table holding consumer key/secret combos an user issued to consumers. 
-# Used for verification of incoming requests.
-
-CREATE TABLE IF NOT EXISTS oauth_server_registry (
-    osr_id                      int(11) not null auto_increment,
-    osr_usa_id_ref              int(11),
-    osr_consumer_key            varchar(64) binary not null,
-    osr_consumer_secret         varchar(64) binary not null,
-    osr_enabled                 tinyint(1) not null default '1',
-    osr_status                  varchar(16) not null,
-    osr_requester_name          varchar(64) not null,
-    osr_requester_email         varchar(64) not null,
-    osr_callback_uri            varchar(255) not null,
-    osr_application_uri         varchar(255) not null,
-    osr_application_title       varchar(80) not null,
-    osr_application_descr       text not null,
-    osr_application_notes       text not null,
-    osr_application_type        varchar(20) not null,
-    osr_application_commercial  tinyint(1) not null default '0',
-    osr_issue_date              datetime not null,
-    osr_timestamp               timestamp not null default current_timestamp,
-
-    primary key (osr_id),
-    unique key (osr_consumer_key),
-    key (osr_usa_id_ref)
-
-#   , foreign key (osr_usa_id_ref) references any_user_auth(usa_id_ref)
-#       on update cascade
-#       on delete set null
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-# Nonce used by a certain consumer, every used nonce should be unique, this prevents
-# replaying attacks.  We need to store all timestamp/nonce combinations for the
-# maximum timestamp received.
-
-CREATE TABLE IF NOT EXISTS oauth_server_nonce (
-    osn_id                  int(11) not null auto_increment,
-    osn_consumer_key        varchar(64) binary not null,
-    osn_token               varchar(64) binary not null,
-    osn_timestamp           bigint not null,
-    osn_nonce               varchar(80) binary not null,
-
-    primary key (osn_id),
-    unique key (osn_consumer_key, osn_token, osn_timestamp, osn_nonce)
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-# Table used to verify signed requests sent to a server by the consumer
-# When the verification is succesful then the associated user id is returned.
-
-CREATE TABLE IF NOT EXISTS oauth_server_token (
-    ost_id                  int(11) not null auto_increment,
-    ost_osr_id_ref          int(11) not null,
-    ost_usa_id_ref          int(11) not null,
-    ost_token               varchar(64) binary not null,
-    ost_token_secret        varchar(64) binary not null,
-    ost_token_type          enum('request','access'),
-    ost_authorized          tinyint(1) not null default '0',
-	ost_referrer_host       varchar(128) not null default '',
-	ost_token_ttl           datetime not null default '9999-12-31',
-    ost_timestamp           timestamp not null default current_timestamp,
-    ost_verifier            char(10),
-    ost_callback_url        varchar(512),
-
-	primary key (ost_id),
-    unique key (ost_token),
-    key (ost_osr_id_ref),
-	key (ost_token_ttl),
-
-	foreign key (ost_osr_id_ref) references oauth_server_registry (osr_id)
-        on update cascade
-        on delete cascade
-
-#   , foreign key (ost_usa_id_ref) references any_user_auth (usa_id_ref)
-#       on update cascade
-#       on delete cascade           
-) engine=InnoDB default charset=utf8;
-
-
-
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql b/vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql
deleted file mode 100644
index 3d4fa22..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql
+++ /dev/null
@@ -1,114 +0,0 @@
-CREATE TABLE oauth_log 
-(
-    olg_id                  number,
-    olg_osr_consumer_key    varchar2(64),
-    olg_ost_token           varchar2(64),
-    olg_ocr_consumer_key    varchar2(64),
-    olg_oct_token           varchar2(64),
-    olg_usa_id_ref          number,
-    olg_received            varchar2(500),
-    olg_sent                varchar2(500),
-    olg_base_string         varchar2(500),
-    olg_notes               varchar2(500),
-    olg_timestamp           date default sysdate,
-    olg_remote_ip           varchar2(50)
-);
-
-alter table oauth_log
-  add constraint oauth_log_pk primary key (olg_id);
-  
-
-CREATE TABLE oauth_consumer_registry 
-(
-    ocr_id                  number,
-    ocr_usa_id_ref          number,
-    ocr_consumer_key        varchar2(64),
-    ocr_consumer_secret     varchar2(64),
-    ocr_signature_methods   varchar2(255)default 'HMAC-SHA1,PLAINTEXT',
-    ocr_server_uri          varchar2(255),
-    ocr_server_uri_host     varchar2(128),
-    ocr_server_uri_path     varchar2(128),
-    ocr_request_token_uri   varchar2(255),
-    ocr_authorize_uri       varchar2(255),
-    ocr_access_token_uri    varchar2(255),
-    ocr_timestamp           date default sysdate
-)
-
-alter table oauth_consumer_registry
-  add constraint oauth_consumer_registry_pk primary key (ocr_id);
-  
-
-CREATE TABLE oauth_consumer_token 
-(
-  oct_id                  number,
-  oct_ocr_id_ref          number,
-  oct_usa_id_ref          number,
-  oct_name                varchar2(64) default '',
-  oct_token               varchar2(64),
-  oct_token_secret        varchar2(64),
-  oct_token_type          varchar2(20), -- enum('request','authorized','access'),
-  oct_token_ttl           date default  TO_DATE('9999.12.31', 'yyyy.mm.dd'),
-  oct_timestamp           date default sysdate
-);
-
-alter table oauth_consumer_token
-  add constraint oauth_consumer_token_pk primary key (oct_id);
-  
-  
-CREATE TABLE oauth_server_registry 
-(
-    osr_id                      number,
-    osr_usa_id_ref              number,
-    osr_consumer_key            varchar2(64),
-    osr_consumer_secret         varchar2(64),
-    osr_enabled                 integer default '1',
-    osr_status                  varchar2(16),
-    osr_requester_name          varchar2(64),
-    osr_requester_email         varchar2(64),
-    osr_callback_uri            varchar2(255),
-    osr_application_uri         varchar2(255),
-    osr_application_title       varchar2(80),
-    osr_application_descr       varchar2(500),
-    osr_application_notes       varchar2(500),
-    osr_application_type        varchar2(20),
-    osr_application_commercial  integer default '0',
-    osr_issue_date              date,
-    osr_timestamp               date default sysdate
-);
-
-
-alter table oauth_server_registry
-  add constraint oauth_server_registry_pk primary key (osr_id);
-  
-
-CREATE TABLE oauth_server_nonce 
-(
-  osn_id                  number,
-  osn_consumer_key        varchar2(64),
-  osn_token               varchar2(64),
-  osn_timestamp           number,
-  osn_nonce               varchar2(80)
-);
-
-alter table oauth_server_nonce
-  add constraint oauth_server_nonce_pk primary key (osn_id);
-  
-  
-CREATE TABLE oauth_server_token 
-(
-    ost_id                  number,
-    ost_osr_id_ref          number,
-    ost_usa_id_ref          number,
-    ost_token               varchar2(64),
-    ost_token_secret        varchar2(64),
-    ost_token_type          varchar2(20), -- enum('request','access'),
-    ost_authorized          integer default '0',
-	  ost_referrer_host       varchar2(128),
-	  ost_token_ttl           date default TO_DATE('9999.12.31', 'yyyy.mm.dd'),
-    ost_timestamp           date default sysdate,
-    ost_verifier            varchar2(10),
-    ost_callback_url        varchar2(512)
-);
-
-alter table oauth_server_token
-  add constraint oauth_server_token_pk primary key (ost_id);
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql b/vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql
deleted file mode 100644
index 53e4227..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE SEQUENCE SEQ_OCT_ID NOCACHE;
-
-CREATE SEQUENCE SEQ_OCR_ID NOCACHE;
-
-CREATE SEQUENCE SEQ_OSR_ID NOCACHE;
-
-CREATE SEQUENCE SEQ_OSN_ID NOCACHE;
-
-CREATE SEQUENCE SEQ_OLG_ID NOCACHE;
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc
deleted file mode 100644
index efb9536..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc
+++ /dev/null
@@ -1,71 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_ADD_CONSUMER_REQUEST_TOKEN
-(
-P_TOKEN_TTL                    IN        NUMBER, -- IN SECOND
-P_CONSUMER_KEY                 IN        VARCHAR2,
-P_TOKEN                        IN        VARCHAR2,
-P_TOKEN_SECRET                 IN        VARCHAR2,
-P_CALLBACK_URL                 IN        VARCHAR2,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Add an unautorized request token to our server.
- 
-V_OSR_ID                                    NUMBER;
-V_OSR_ID_REF                                NUMBER;
-
-V_EXC_NO_SERVER_EXIST                       EXCEPTION;
-BEGIN
-
-  P_RESULT := 0;
- 
- BEGIN 
- SELECT OSR_ID INTO V_OSR_ID
-  FROM OAUTH_SERVER_REGISTRY
-  WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY
-  AND OSR_ENABLED      = 1;
- EXCEPTION
- WHEN NO_DATA_FOUND THEN
-      RAISE V_EXC_NO_SERVER_EXIST;
- END;
- 
-
-BEGIN 
-  SELECT OST_OSR_ID_REF INTO V_OSR_ID_REF
-  FROM OAUTH_SERVER_TOKEN
-  WHERE OST_OSR_ID_REF = V_OSR_ID;
-  
-  UPDATE OAUTH_SERVER_TOKEN
-  	SET OST_OSR_ID_REF		= V_OSR_ID,
-					OST_USA_ID_REF		= 1,
-					OST_TOKEN			= P_TOKEN,
-					OST_TOKEN_SECRET	= P_TOKEN_SECRET,
-					OST_TOKEN_TYPE		= 'REQUEST',
-					OST_TOKEN_TTL       = SYSDATE + (P_TOKEN_TTL/(24*60*60)),
-					OST_CALLBACK_URL    = P_CALLBACK_URL,
-          OST_TIMESTAMP		= SYSDATE
-     WHERE OST_OSR_ID_REF = V_OSR_ID_REF;
-  
-
- EXCEPTION
- WHEN NO_DATA_FOUND THEN
-      
-    INSERT INTO OAUTH_SERVER_TOKEN
-    (OST_ID, OST_OSR_ID_REF, OST_USA_ID_REF, OST_TOKEN, OST_TOKEN_SECRET, OST_TOKEN_TYPE, 
-    OST_TOKEN_TTL, OST_CALLBACK_URL)
-    VALUES
-    (SEQ_OCT_ID.NEXTVAL, V_OSR_ID, 1, P_TOKEN, P_TOKEN_SECRET, 'REQUEST', SYSDATE + (P_TOKEN_TTL/(24*60*60)),
-    P_CALLBACK_URL);
-    
- END;
- 
-
-EXCEPTION
-WHEN V_EXC_NO_SERVER_EXIST THEN
-P_RESULT := 2; -- NO_SERVER_EXIST
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc
deleted file mode 100644
index 329499d..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc
+++ /dev/null
@@ -1,31 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_ADD_LOG
-(
-P_RECEIVED                  IN        VARCHAR2,
-P_SENT                      IN        VARCHAR2,
-P_BASE_STRING               IN        VARCHAR2,
-P_NOTES                     IN        VARCHAR2,
-P_USA_ID_REF                IN        NUMBER,
-P_REMOTE_IP                 IN        VARCHAR2,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Add an entry to the log table
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  INSERT INTO oauth_log
-  (OLG_ID, olg_received, olg_sent, olg_base_string, olg_notes, olg_usa_id_ref, olg_remote_ip)
-  VALUES
-  (SEQ_OLG_ID.NEXTVAL, P_RECEIVED, P_SENT, P_BASE_STRING, P_NOTES, NVL(P_USA_ID_REF, 0), P_REMOTE_IP);
-            
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc
deleted file mode 100644
index 371134c..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc
+++ /dev/null
@@ -1,55 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_ADD_SERVER_TOKEN
-(
-P_CONSUMER_KEY      IN        VARCHAR2,
-P_USER_ID           IN        NUMBER,
-P_NAME              IN        VARCHAR2,
-P_TOKEN_TYPE        IN        VARCHAR2,
-P_TOKEN             IN        VARCHAR2,
-P_TOKEN_SECRET      IN        VARCHAR2,
-P_TOKEN_INTERVAL_IN_SEC         IN        NUMBER,
-P_RESULT            OUT       NUMBER
-)
-AS
- 
- -- Add a request token we obtained from a server.
-V_OCR_ID                                NUMBER;
-V_TOKEN_TTL                             DATE;
-
-V_EXC_INVALID_CONSUMER_KEY              EXCEPTION;
-BEGIN
-P_RESULT := 0;
-
-      BEGIN
-        SELECT OCR_ID INTO V_OCR_ID FROM OAUTH_CONSUMER_REGISTRY
-        WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY AND OCR_USA_ID_REF = P_USER_ID;
-      EXCEPTION
-      WHEN NO_DATA_FOUND THEN
-          RAISE V_EXC_INVALID_CONSUMER_KEY;
-      END;
-     
-      DELETE FROM OAUTH_CONSUMER_TOKEN
-      WHERE OCT_OCR_ID_REF = V_OCR_ID
-      AND OCT_USA_ID_REF = P_USER_ID
-      AND UPPER(OCT_TOKEN_TYPE) = UPPER(P_TOKEN_TYPE)
-      AND OCT_NAME       = P_NAME;
-      
-      IF P_TOKEN_INTERVAL_IN_SEC IS NOT NULL THEN
-         V_TOKEN_TTL := SYSDATE + (P_TOKEN_INTERVAL_IN_SEC/(24*60*60));
-      ELSE
-         V_TOKEN_TTL := TO_DATE('9999.12.31', 'yyyy.mm.dd');
-      END IF;
-      
-      INSERT INTO OAUTH_CONSUMER_TOKEN
-      (OCT_ID, OCT_OCR_ID_REF,OCT_USA_ID_REF, OCT_NAME, OCT_TOKEN, OCT_TOKEN_SECRET, OCT_TOKEN_TYPE, OCT_TIMESTAMP, OCT_TOKEN_TTL)
-      VALUES
-      (SEQ_OCT_ID.NEXTVAL, V_OCR_ID, P_USER_ID, P_NAME, P_TOKEN, P_TOKEN_SECRET, UPPER(P_TOKEN_TYPE), SYSDATE, V_TOKEN_TTL);
-       
-EXCEPTION
-WHEN V_EXC_INVALID_CONSUMER_KEY THEN
-P_RESULT := 2; -- INVALID_CONSUMER_KEY
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc
deleted file mode 100644
index c369349..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc
+++ /dev/null
@@ -1,32 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_AUTH_CONSUMER_REQ_TOKEN
-(
-P_USER_ID                   IN        NUMBER,    
-P_REFERRER_HOST             IN        VARCHAR2,                     
-P_VERIFIER                  IN        VARCHAR2,
-P_TOKEN                     IN        VARCHAR2,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Fetch the consumer request token, by request token.
-BEGIN
-P_RESULT := 0;
-
-
-UPDATE OAUTH_SERVER_TOKEN
-  SET OST_AUTHORIZED    = 1,
-  OST_USA_ID_REF    =  P_USER_ID,
-  OST_TIMESTAMP     = SYSDATE,
-  OST_REFERRER_HOST = P_REFERRER_HOST,
-  OST_VERIFIER      = P_VERIFIER
-  WHERE OST_TOKEN      = P_TOKEN
-  AND OST_TOKEN_TYPE = 'REQUEST';
-    
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc
deleted file mode 100644
index 765dd3b..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc
+++ /dev/null
@@ -1,82 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_CHECK_SERVER_NONCE
-(
-P_CONSUMER_KEY                 IN        VARCHAR2,
-P_TOKEN                        IN        VARCHAR2,
-P_TIMESTAMP                    IN        NUMBER,
-P_MAX_TIMESTAMP_SKEW           IN        NUMBER,
-P_NONCE                        IN        VARCHAR2,
-P_RESULT                       OUT       NUMBER
-)
-AS
- 
- -- PROCEDURE TO Check an nonce/timestamp combination.  Clears any nonce combinations
- -- that are older than the one received.
-V_IS_MAX                           NUMBER;
-V_MAX_TIMESTAMP                    NUMBER;
-V_IS_DUPLICATE_TIMESTAMP           NUMBER;
-
-V_EXC_INVALID_TIMESTAMP            EXCEPTION;
-V_EXC_DUPLICATE_TIMESTAMP          EXCEPTION;
-BEGIN
-
-  P_RESULT := 0;
-
-  -- removed in Appendix A of RFC 5849
-  -- BEGIN 
-  --   SELECT MAX(OSN_TIMESTAMP), 
-  --   CASE 
-  --        WHEN MAX(OSN_TIMESTAMP) > (P_TIMESTAMP + P_MAX_TIMESTAMP_SKEW) THEN 1 ELSE 0 
-  --   END "IS_MAX" INTO V_MAX_TIMESTAMP, V_IS_MAX
-  --   FROM OAUTH_SERVER_NONCE
-  --   WHERE OSN_CONSUMER_KEY = P_CONSUMER_KEY
-  --   AND OSN_TOKEN        = P_TOKEN;
-  --   
-  --   IF V_IS_MAX = 1 THEN
-  --      RAISE V_EXC_INVALID_TIMESTAMP;
-  --   END IF;
-  --     
-  -- EXCEPTION
-  -- WHEN NO_DATA_FOUND THEN
-  --      NULL;
-  -- END;        
-  
-  BEGIN
-  SELECT 1 INTO V_IS_DUPLICATE_TIMESTAMP FROM DUAL WHERE EXISTS
-  (SELECT OSN_ID FROM OAUTH_SERVER_NONCE 
-    WHERE OSN_CONSUMER_KEY = P_CONSUMER_KEY
-    AND OSN_TOKEN = P_TOKEN
-    AND OSN_TIMESTAMP = P_TIMESTAMP
-    AND OSN_NONCE = P_NONCE);
-    
-    IF V_IS_DUPLICATE_TIMESTAMP = 1 THEN
-       RAISE V_EXC_DUPLICATE_TIMESTAMP;
-    END IF;
-  EXCEPTION
-  WHEN NO_DATA_FOUND THEN
-    NULL;
-  END;          
-  
-  -- Insert the new combination
-  INSERT INTO OAUTH_SERVER_NONCE
-  (OSN_ID, OSN_CONSUMER_KEY, OSN_TOKEN, OSN_TIMESTAMP, OSN_NONCE)
-  VALUES
-  (SEQ_OSN_ID.NEXTVAL, P_CONSUMER_KEY, P_TOKEN, P_TIMESTAMP, P_NONCE);
-
-  -- Clean up all timestamps older than the one we just received
-  DELETE FROM OAUTH_SERVER_NONCE
-  WHERE OSN_CONSUMER_KEY	= P_CONSUMER_KEY
-  AND OSN_TOKEN			= P_TOKEN
-  AND OSN_TIMESTAMP     < (P_TIMESTAMP - P_MAX_TIMESTAMP_SKEW);
-                        
-
-EXCEPTION
-WHEN V_EXC_INVALID_TIMESTAMP THEN
-P_RESULT := 2; -- INVALID_TIMESTAMP
-WHEN V_EXC_DUPLICATE_TIMESTAMP THEN
-P_RESULT := 3; -- DUPLICATE_TIMESTAMP
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc
deleted file mode 100644
index 047c77b..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_CONSUMER_STATIC_SAVE
-(
-P_OSR_CONSUMER_KEY          IN        VARCHAR2,
-P_RESULT                    OUT       NUMBER
-)
-AS
- 
--- PROCEDURE TO Fetch the static consumer key for this provider.
-BEGIN
-P_RESULT := 0;
-
-
- INSERT INTO OAUTH_SERVER_REGISTRY
- (OSR_ID, OSR_ENABLED, OSR_STATUS, OSR_USA_ID_REF, OSR_CONSUMER_KEY, OSR_CONSUMER_SECRET, OSR_REQUESTER_NAME, OSR_REQUESTER_EMAIL, OSR_CALLBACK_URI, 
-					OSR_APPLICATION_URI, OSR_APPLICATION_TITLE, OSR_APPLICATION_DESCR, OSR_APPLICATION_NOTES,
-					OSR_APPLICATION_TYPE, OSR_APPLICATION_COMMERCIAL, OSR_TIMESTAMP,OSR_ISSUE_DATE)
-  VALUES
-  (SEQ_OSR_ID.NEXTVAL, 1, 'ACTIVE', NULL, P_OSR_CONSUMER_KEY, '\', '\', '\', '\', '\', 
-   'STATIC SHARED CONSUMER KEY', '\', 'STATIC SHARED CONSUMER KEY', '\', 0, SYSDATE, SYSDATE);
-              
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc
deleted file mode 100644
index f7099b9..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc
+++ /dev/null
@@ -1,27 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_COUNT_CONSUMER_ACCESS_TOKEN
-(
-P_CONSUMER_KEY    IN        VARCHAR2,
-P_COUNT           OUT        NUMBER,
-P_RESULT          OUT       NUMBER
-)
-AS
--- PROCEDURE TO Count the consumer access tokens for the given consumer.
-BEGIN
-P_RESULT := 0;
-
-SELECT COUNT(OST_ID) INTO P_COUNT
-  FROM OAUTH_SERVER_TOKEN
-  JOIN OAUTH_SERVER_REGISTRY
-  ON OST_OSR_ID_REF = OSR_ID
-  WHERE OST_TOKEN_TYPE   = 'ACCESS'
-  AND OSR_CONSUMER_KEY = P_CONSUMER_KEY
-  AND OST_TOKEN_TTL    >= SYSDATE;
-              
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc
deleted file mode 100644
index c73b366..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_COUNT_SERVICE_TOKENS
-(
-P_CONSUMER_KEY              IN        VARCHAR2,
-P_COUNT                     OUT       NUMBER,
-P_RESULT                    OUT       NUMBER
-)
-AS
- 
- -- PROCEDURE TO Count how many tokens we have for the given server
-BEGIN
-P_RESULT := 0;
-
-  SELECT COUNT(OCT_ID) INTO P_COUNT
-  FROM OAUTH_CONSUMER_TOKEN
-  JOIN OAUTH_CONSUMER_REGISTRY
-  ON OCT_OCR_ID_REF = OCR_ID
-  WHERE OCT_TOKEN_TYPE   = 'ACCESS'
-  AND OCR_CONSUMER_KEY = P_CONSUMER_KEY
-  AND OCT_TOKEN_TTL    >= SYSDATE;
-              
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc
deleted file mode 100644
index 3f18562..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DELETE_CONSUMER
-(
-P_CONSUMER_KEY      IN        VARCHAR2,
-P_USER_ID           IN        NUMBER,
-P_USER_IS_ADMIN     IN        NUMBER, --0:NO; 1:YES
-P_RESULT            OUT       NUMBER
-)
-AS
- 
- --  Delete a consumer key.  This removes access to our site for all applications using this key.
-
-BEGIN
-P_RESULT := 0;
-
-IF P_USER_IS_ADMIN = 1 THEN
- 
-  DELETE FROM OAUTH_SERVER_REGISTRY
-	WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY
-	AND (OSR_USA_ID_REF = P_USER_ID OR OSR_USA_ID_REF IS NULL);
- 
-ELSIF P_USER_IS_ADMIN = 0 THEN
- 
-  DELETE FROM OAUTH_SERVER_REGISTRY
-	WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY
-	AND OSR_USA_ID_REF   = P_USER_ID;
-  
-END IF;
-     
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc
deleted file mode 100644
index ba259de..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DELETE_SERVER
-(
-P_CONSUMER_KEY      IN        VARCHAR2,
-P_USER_ID           IN        NUMBER,
-P_USER_IS_ADMIN     IN        NUMBER, --0:NO; 1:YES
-P_RESULT            OUT       NUMBER
-)
-AS
- 
- --  Delete a server key.  This removes access to that site.
-
-BEGIN
-P_RESULT := 0;
-
-IF P_USER_IS_ADMIN = 1 THEN
-
-  DELETE FROM OAUTH_CONSUMER_REGISTRY
-  WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY
-  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL);
-  
-ELSIF P_USER_IS_ADMIN = 0 THEN
-
-  DELETE FROM OAUTH_CONSUMER_REGISTRY
-  WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY
-  AND OCR_USA_ID_REF   = P_USER_ID;
-  
-END IF;
-     
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc
deleted file mode 100644
index de9d450..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc
+++ /dev/null
@@ -1,37 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DELETE_SERVER_TOKEN
-(
-P_CONSUMER_KEY      IN        VARCHAR2,
-P_USER_ID           IN        NUMBER,
-P_TOKEN             IN        VARCHAR2,
-P_USER_IS_ADMIN     IN        NUMBER, --0:NO; 1:YES
-P_RESULT            OUT       NUMBER
-)
-AS
- 
- --  Delete a token we obtained from a server.
-
-BEGIN
-P_RESULT := 0;
-
-IF P_USER_IS_ADMIN = 1 THEN
- 
-  DELETE FROM OAUTH_CONSUMER_TOKEN
-  WHERE OCT_TOKEN	= P_TOKEN
-  AND OCT_OCR_ID_REF IN (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY); 
-  
-ELSIF P_USER_IS_ADMIN = 0 THEN
- 
-  DELETE FROM OAUTH_CONSUMER_TOKEN
-  WHERE OCT_TOKEN	= P_TOKEN
-  AND OCT_USA_ID_REF	= P_USER_ID
-  AND OCT_OCR_ID_REF IN (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY); 
-  
-END IF;
-     
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc
deleted file mode 100644
index 4281bdb..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc
+++ /dev/null
@@ -1,33 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DEL_CONSUMER_ACCESS_TOKEN
-(
-P_USER_ID                      IN        NUMBER,
-P_TOKEN                        IN        VARCHAR2,
-P_USER_IS_ADMIN                IN        NUMBER, -- 1:YES; 0:NO
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Delete a consumer access token.
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  IF P_USER_IS_ADMIN = 1 THEN
-    DELETE FROM OAUTH_SERVER_TOKEN
-    WHERE OST_TOKEN 	 = P_TOKEN
-    AND OST_TOKEN_TYPE = 'ACCESS';
-  ELSE
-    DELETE FROM OAUTH_SERVER_TOKEN
-    WHERE OST_TOKEN 	 = P_TOKEN
-    AND OST_TOKEN_TYPE = 'ACCESS'
-    AND OST_USA_ID_REF = P_USER_ID;
-  END IF;
-  
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc
deleted file mode 100644
index 01678d6..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DEL_CONSUMER_REQUEST_TOKEN
-(
-P_TOKEN                     IN        VARCHAR2,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Delete a consumer token.  The token must be a request or authorized token.
-
-BEGIN
-
-  P_RESULT := 0;
-  
-  DELETE FROM OAUTH_SERVER_TOKEN
-  WHERE OST_TOKEN 	 = P_TOKEN
-  AND OST_TOKEN_TYPE = 'REQUEST';
-              
-  
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc
deleted file mode 100644
index 66a53ed..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc
+++ /dev/null
@@ -1,96 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_EXCH_CONS_REQ_FOR_ACC_TOKEN
-(
-P_TOKEN_TTL                    IN        NUMBER, -- IN SECOND
-P_NEW_TOKEN                    IN        VARCHAR2,
-P_TOKEN                        IN        VARCHAR2,
-P_TOKEN_SECRET                 IN        VARCHAR2,
-P_VERIFIER                     IN        VARCHAR2,
-P_OUT_TOKEN_TTL                OUT       NUMBER,
-P_RESULT                       OUT       NUMBER
-)
-AS
- 
- -- PROCEDURE TO Add an unautorized request token to our server.
- 
-V_TOKEN_EXIST                               NUMBER;
-
-
-V_EXC_NO_TOKEN_EXIST                       EXCEPTION;
-BEGIN
-
-  P_RESULT := 0;
-  
-  IF P_VERIFIER IS NOT NULL THEN
-     
-      BEGIN 
-      SELECT 1 INTO V_TOKEN_EXIST FROM DUAL WHERE EXISTS
-       (SELECT OST_TOKEN FROM OAUTH_SERVER_TOKEN 
-               WHERE OST_TOKEN      = P_TOKEN
-            AND OST_TOKEN_TYPE = 'REQUEST'
-            AND OST_AUTHORIZED = 1
-            AND OST_TOKEN_TTL  >= SYSDATE
-            AND OST_VERIFIER = P_VERIFIER);
-       EXCEPTION
-       WHEN NO_DATA_FOUND THEN
-            RAISE V_EXC_NO_TOKEN_EXIST;
-       END;
-         
-        UPDATE OAUTH_SERVER_TOKEN
-          SET OST_TOKEN			= P_NEW_TOKEN,
-          OST_TOKEN_SECRET	= P_TOKEN_SECRET,
-          OST_TOKEN_TYPE		= 'ACCESS',
-          OST_TIMESTAMP		= SYSDATE,
-          OST_TOKEN_TTL       = NVL(SYSDATE + (P_TOKEN_TTL/(24*60*60)), TO_DATE('9999.12.31', 'yyyy.mm.dd'))
-          WHERE OST_TOKEN      = P_TOKEN
-          AND OST_TOKEN_TYPE = 'REQUEST'
-          AND OST_AUTHORIZED = 1
-          AND OST_TOKEN_TTL  >= SYSDATE
-          AND OST_VERIFIER = P_VERIFIER;
-  
-  ELSE
-      BEGIN 
-        SELECT 1 INTO V_TOKEN_EXIST FROM DUAL WHERE EXISTS
-        (SELECT OST_TOKEN FROM OAUTH_SERVER_TOKEN 
-             WHERE OST_TOKEN      = P_TOKEN
-          AND OST_TOKEN_TYPE = 'REQUEST'
-          AND OST_AUTHORIZED = 1
-          AND OST_TOKEN_TTL  >= SYSDATE);
-      EXCEPTION
-      WHEN NO_DATA_FOUND THEN
-         RAISE V_EXC_NO_TOKEN_EXIST;
-      END;
-        
-      UPDATE OAUTH_SERVER_TOKEN
-      SET OST_TOKEN			= P_NEW_TOKEN,
-      OST_TOKEN_SECRET	= P_TOKEN_SECRET,
-      OST_TOKEN_TYPE		= 'ACCESS',
-      OST_TIMESTAMP		= SYSDATE,
-      OST_TOKEN_TTL       = NVL(SYSDATE + (P_TOKEN_TTL/(24*60*60)), TO_DATE('9999.12.31', 'yyyy.mm.dd'))
-      WHERE OST_TOKEN      = P_TOKEN
-      AND OST_TOKEN_TYPE = 'REQUEST'
-      AND OST_AUTHORIZED = 1
-      AND OST_TOKEN_TTL  >= SYSDATE;
-              
-  
-  END IF;
-  
-    SELECT	CASE
-            WHEN OST_TOKEN_TTL >= TO_DATE('9999.12.31', 'yyyy.mm.dd') THEN NULL ELSE (OST_TOKEN_TTL - SYSDATE)*24*60*60 
-    END "TOKEN_TTL" INTO P_OUT_TOKEN_TTL
-    FROM OAUTH_SERVER_TOKEN
-    WHERE OST_TOKEN = P_NEW_TOKEN;
-              
-  
-  
-  
-  
-
-EXCEPTION
-WHEN V_EXC_NO_TOKEN_EXIST THEN
-P_RESULT := 2; -- NO_TOKEN_EXIST
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc
deleted file mode 100644
index 4225ff2..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER
-(
-P_CONSUMER_KEY              IN        STRING,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Fetch a consumer of this server, by consumer_key.
-BEGIN
-P_RESULT := 0;
-
-OPEN P_ROWS FOR
-  SELECT	OSR_ID "osr_id", 
-	OSR_USA_ID_REF "osr_usa_id_ref", 
-	OSR_CONSUMER_KEY "osr_consumer_key", 
-	OSR_CONSUMER_SECRET "osr_consumer_secret", 
-	OSR_ENABLED "osr_enabled", 
-	OSR_STATUS "osr_status", 
-	OSR_REQUESTER_NAME "osr_requester_name", 
-	OSR_REQUESTER_EMAIL "osr_requester_email",
-	OSR_CALLBACK_URI "osr_callback_uri",
-	OSR_APPLICATION_URI "osr_application_uri",
-	OSR_APPLICATION_TITLE "osr_application_title",
-	OSR_APPLICATION_DESCR "osr_application_descr",
-	OSR_APPLICATION_NOTES "osr_application_notes",
-	OSR_APPLICATION_TYPE "osr_application_type",
-	OSR_APPLICATION_COMMERCIAL "osr_application_commercial",
-	OSR_ISSUE_DATE "osr_issue_date",
-	OSR_TIMESTAMP "osr_timestamp"
-	FROM OAUTH_SERVER_REGISTRY
-	WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY;
-              
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc
deleted file mode 100644
index 0db2ea9..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc
+++ /dev/null
@@ -1,43 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER_ACCESS_TOKEN
-(
-P_USER_ID                      IN        NUMBER,
-P_TOKEN                        IN        VARCHAR2,
-P_ROWS                         OUT       TYPES.REF_CURSOR,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Fetch the consumer access token, by access token.
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  
-  OPEN P_ROWS FOR
-    SELECT	OST_TOKEN				"token",
-    OST_TOKEN_SECRET		"token_secret",
-    OST_REFERRER_HOST		"token_referrer_host",
-    OSR_CONSUMER_KEY		"consumer_key",
-    OSR_CONSUMER_SECRET		"consumer_secret",
-    OSR_APPLICATION_URI		"application_uri",
-    OSR_APPLICATION_TITLE	"application_title",
-    OSR_APPLICATION_DESCR	"application_descr",
-    OSR_CALLBACK_URI		"callback_uri"
-    FROM OAUTH_SERVER_TOKEN
-    JOIN OAUTH_SERVER_REGISTRY
-    ON OST_OSR_ID_REF = OSR_ID
-    WHERE OST_TOKEN_TYPE = 'ACCESS'
-    AND OST_TOKEN      = P_TOKEN
-    AND OST_USA_ID_REF = P_USER_ID
-    AND OST_TOKEN_TTL  >= SYSDATE;
-              
-   
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc
deleted file mode 100644
index 6d3b590..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER_REQUEST_TOKEN
-(
-P_TOKEN                     IN        VARCHAR2,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Fetch the consumer request token, by request token.
-BEGIN
-P_RESULT := 0;
-
-OPEN P_ROWS FOR
- 
-SELECT	OST_TOKEN			"token",
-    OST_TOKEN_SECRET	"token_secret",
-    OSR_CONSUMER_KEY	"consumer_key",
-    OSR_CONSUMER_SECRET	"consumer_secret",
-    OST_TOKEN_TYPE		"token_type",
-    OST_CALLBACK_URL    "callback_url",
-    OSR_APPLICATION_TITLE "application_title",
-    OSR_APPLICATION_DESCR "application_descr",
-    OSR_APPLICATION_URI   "application_uri"
-    FROM OAUTH_SERVER_TOKEN
-    JOIN OAUTH_SERVER_REGISTRY
-    ON OST_OSR_ID_REF = OSR_ID
-    WHERE OST_TOKEN_TYPE = 'REQUEST'
-    AND OST_TOKEN      = P_TOKEN
-    AND OST_TOKEN_TTL  >= SYSDATE;
-              
-              
-              
-        
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc
deleted file mode 100644
index 1126ef6..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER_STATIC_SELECT
-(
-P_OSR_CONSUMER_KEY          OUT        VARCHAR2,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
--- PROCEDURE TO Fetch the static consumer key for this provider.
-BEGIN
-P_RESULT := 0;
-
-
- SELECT OSR_CONSUMER_KEY INTO P_OSR_CONSUMER_KEY
-  FROM OAUTH_SERVER_REGISTRY
-  WHERE OSR_CONSUMER_KEY LIKE 'sc-%%'
-  AND OSR_USA_ID_REF IS NULL;
-              
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc
deleted file mode 100644
index 2af7847..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc
+++ /dev/null
@@ -1,43 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SECRETS_FOR_SIGNATURE
-(
-P_HOST                IN        VARCHAR2,
-P_PATH                IN        VARCHAR2,
-P_USER_ID             IN        NUMBER,
-P_NAME                IN        VARCHAR2,
-P_ROWS                OUT       TYPES.REF_CURSOR,
-P_RESULT              OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Find the server details for signing a request, always looks for an access token.
- -- The returned credentials depend on which local user is making the request.
-BEGIN
-P_RESULT := 0;
-
-   OPEN P_ROWS FOR
-   SELECT * FROM (
-   SELECT	OCR_CONSUMER_KEY		"consumer_key",
-      OCR_CONSUMER_SECRET		"consumer_secret",
-      OCT_TOKEN				"token",
-      OCT_TOKEN_SECRET		"token_secret",
-      OCR_SIGNATURE_METHODS	"signature_methods"
-      FROM OAUTH_CONSUMER_REGISTRY
-      JOIN OAUTH_CONSUMER_TOKEN ON OCT_OCR_ID_REF = OCR_ID
-      WHERE OCR_SERVER_URI_HOST = P_HOST
-      AND OCR_SERVER_URI_PATH = SUBSTR(P_PATH, 1, LENGTH(OCR_SERVER_URI_PATH))
-      AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL)
-      AND OCT_USA_ID_REF	= P_USER_ID
-      AND OCT_TOKEN_TYPE  = 'ACCESS'
-      AND OCT_NAME			  = P_NAME
-      AND OCT_TOKEN_TTL   >= SYSDATE
-      ORDER BY OCR_USA_ID_REF DESC, OCR_CONSUMER_SECRET DESC, LENGTH(OCR_SERVER_URI_PATH) DESC
-      ) WHERE ROWNUM<=1;
-
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc
deleted file mode 100644
index 4fbb435..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc
+++ /dev/null
@@ -1,52 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SECRETS_FOR_VERIFY
-(
-P_CONSUMER_KEY      IN        VARCHAR2,
-P_TOKEN             IN        VARCHAR2,
-P_TOKEN_TYPE        IN        VARCHAR2,
-P_ROWS          OUT       TYPES.REF_CURSOR,
-P_RESULT          OUT       NUMBER
-)
-AS
-
- -- PROCEDURE to Find stored credentials for the consumer key and token. Used by an OAuth server
- -- when verifying an OAuth request.
- 
-BEGIN
-P_RESULT := 0;
-
-IF P_TOKEN_TYPE IS NULL THEN
-   OPEN P_ROWS FOR
-   SELECT	OSR.OSR_ID "osr_id",
-          OSR.OSR_CONSUMER_KEY		"consumer_key",
-          OSR.OSR_CONSUMER_SECRET		"consumer_secret"
-          FROM OAUTH_SERVER_REGISTRY OSR
-          WHERE OSR.OSR_CONSUMER_KEY	= P_CONSUMER_KEY
-          AND OSR.OSR_ENABLED		= 1;
-ELSE
-    OPEN P_ROWS FOR
-    SELECT OSR.OSR_ID "osr_id",
-           OST.OST_ID "ost_id",
-           OST.OST_USA_ID_REF			"user_id",
-           OSR.OSR_CONSUMER_KEY		"consumer_key",
-           OSR.OSR_CONSUMER_SECRET		"consumer_secret",
-           OST.OST_TOKEN				"token",
-           OST.OST_TOKEN_SECRET		"token_secret"
-           FROM OAUTH_SERVER_REGISTRY OSR, OAUTH_SERVER_TOKEN OST
-           WHERE OST.OST_OSR_ID_REF = OSR.OSR_ID
-           AND upper(OST.OST_TOKEN_TYPE)	= upper(P_TOKEN_TYPE)
-           AND OSR.OSR_CONSUMER_KEY	= P_CONSUMER_KEY
-           AND OST.OST_TOKEN			= P_TOKEN
-           AND OSR.OSR_ENABLED		= 1
-           AND OST.OST_TOKEN_TTL  >= SYSDATE;
-    
-END IF;
-
-
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc
deleted file mode 100644
index af7d275..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER
-(
-P_CONSUMER_KEY              IN        VARCHAR2,
-P_USER_ID                   IN        NUMBER,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Get a server from the consumer registry using the consumer key
-BEGIN
-P_RESULT := 0;
-
-OPEN P_ROWS FOR
-  SELECT	OCR_ID	"id",
-  OCR_USA_ID_REF			"user_id",
-  OCR_CONSUMER_KEY 		"consumer_key",
-  OCR_CONSUMER_SECRET 	"consumer_secret",
-  OCR_SIGNATURE_METHODS	"signature_methods",
-  OCR_SERVER_URI			"server_uri",
-  OCR_REQUEST_TOKEN_URI	"request_token_uri",
-  OCR_AUTHORIZE_URI		"authorize_uri",
-  OCR_ACCESS_TOKEN_URI	"access_token_uri"
-  FROM OAUTH_CONSUMER_REGISTRY
-  WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY
-  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL);
-        
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc
deleted file mode 100644
index d838b51..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER_FOR_URI
-(
-P_HOST                      IN        VARCHAR2,
-P_PATH                      IN        VARCHAR2,
-P_USER_ID                   IN        NUMBER,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Find the server details that might be used for a request
-BEGIN
-P_RESULT := 0;
-
-OPEN P_ROWS FOR
-SELECT * FROM (
-  SELECT	OCR_ID					"id",
-  OCR_USA_ID_REF			"user_id",
-  OCR_CONSUMER_KEY		"consumer_key",
-  OCR_CONSUMER_SECRET		"consumer_secret",
-  OCR_SIGNATURE_METHODS	"signature_methods",
-  OCR_SERVER_URI			"server_uri",
-  OCR_REQUEST_TOKEN_URI	"request_token_uri",
-  OCR_AUTHORIZE_URI		"authorize_uri",
-  OCR_ACCESS_TOKEN_URI	"access_token_uri"
-  FROM OAUTH_CONSUMER_REGISTRY
-  WHERE OCR_SERVER_URI_HOST = P_HOST
-  AND OCR_SERVER_URI_PATH = SUBSTR(P_PATH, 1, LENGTH(OCR_SERVER_URI_PATH))
-  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL)
-  ORDER BY ocr_usa_id_ref DESC, OCR_CONSUMER_KEY DESC, LENGTH(ocr_server_uri_path) DESC
-) WHERE ROWNUM<=1;
-              
-        
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc
deleted file mode 100644
index fefbe8a..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc
+++ /dev/null
@@ -1,45 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER_TOKEN
-(
-P_CONSUMER_KEY              IN        VARCHAR2,
-P_USER_ID                   IN        NUMBER,
-P_TOKEN                     IN        VARCHAR2,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Get a specific server token for the given user
-BEGIN
-P_RESULT := 0;
-
-OPEN P_ROWS FOR
-  SELECT	OCR_CONSUMER_KEY		"consumer_key",
-    OCR_CONSUMER_SECRET		"consumer_secret",
-    OCT_TOKEN				"token",
-    OCT_TOKEN_SECRET		"token_secret",
-    OCT_USA_ID_REF			"usr_id",
-    OCR_SIGNATURE_METHODS	"signature_methods",
-    OCR_SERVER_URI			"server_uri",
-    OCR_SERVER_URI_HOST		"server_uri_host",
-    OCR_SERVER_URI_PATH		"server_uri_path",
-    OCR_REQUEST_TOKEN_URI	"request_token_uri",
-    OCR_AUTHORIZE_URI		"authorize_uri",
-    OCR_ACCESS_TOKEN_URI	"access_token_uri",
-    OCT_TIMESTAMP			"timestamp"
-    FROM OAUTH_CONSUMER_REGISTRY
-    JOIN OAUTH_CONSUMER_TOKEN
-    ON OCT_OCR_ID_REF = OCR_ID
-    WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY
-    AND OCT_USA_ID_REF   = P_USER_ID
-    AND OCT_TOKEN_TYPE   = 'ACCESS'
-    AND OCT_TOKEN        = P_TOKEN
-    AND OCT_TOKEN_TTL    >= SYSDATE;
-   
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc
deleted file mode 100644
index 95eec88..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc
+++ /dev/null
@@ -1,47 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER_TOKEN_SECRETS
-(
-P_CONSUMER_KEY      IN        VARCHAR2,
-P_TOKEN             IN        VARCHAR2,
-P_TOKEN_TYPE        IN        VARCHAR2,
-P_USER_ID           IN        NUMBER,
-P_ROWS              OUT       TYPES.REF_CURSOR,
-P_RESULT            OUT       NUMBER
-)
-AS
-
- --  Get the token and token secret we obtained from a server.
- 
-BEGIN
-P_RESULT := 0;
-
-
-   OPEN P_ROWS FOR
-   SELECT	OCR.OCR_CONSUMER_KEY		"consumer_key",
-      OCR.OCR_CONSUMER_SECRET		"consumer_secret",
-      OCT.OCT_TOKEN				"token",
-      OCT.OCT_TOKEN_SECRET		"token_secret",
-      OCT.OCT_NAME				"token_name",
-      OCR.OCR_SIGNATURE_METHODS	"signature_methods",
-      OCR.OCR_SERVER_URI			"server_uri",
-      OCR.OCR_REQUEST_TOKEN_URI	"request_token_uri",
-      OCR.OCR_AUTHORIZE_URI		"authorize_uri",
-      OCR.OCR_ACCESS_TOKEN_URI	"access_token_uri",
-      CASE WHEN OCT.OCT_TOKEN_TTL >= TO_DATE('9999.12.31', 'yyyy.mm.dd') THEN NULL 
-                 ELSE OCT.OCT_TOKEN_TTL - SYSDATE 
-            END "token_ttl"
-      FROM OAUTH_CONSUMER_REGISTRY OCR, OAUTH_CONSUMER_TOKEN OCT
-      WHERE OCT.OCT_OCR_ID_REF = OCR_ID
-      AND OCR.OCR_CONSUMER_KEY = P_CONSUMER_KEY
-      AND upper(OCT.OCT_TOKEN_TYPE)   = upper(P_TOKEN_TYPE)
-      AND OCT.OCT_TOKEN        = P_TOKEN
-      AND OCT.OCT_USA_ID_REF   = P_USER_ID
-      AND OCT.OCT_TOKEN_TTL    >= SYSDATE;
-
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc
deleted file mode 100644
index bb42465..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_CONSUMERS
-(
-P_USER_ID                      IN        NUMBER,
-P_ROWS                         OUT       TYPES.REF_CURSOR,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Fetch a list of all consumer keys, secrets etc.
- -- Returns the public (user_id is null) and the keys owned by the user
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  OPEN P_ROWS FOR
-    SELECT	OSR_ID					"id",
-    OSR_USA_ID_REF			"user_id",
-    OSR_CONSUMER_KEY 		"consumer_key",
-    OSR_CONSUMER_SECRET		"consumer_secret",
-    OSR_ENABLED				"enabled",
-    OSR_STATUS 				"status",
-    OSR_ISSUE_DATE			"issue_date",
-    OSR_APPLICATION_URI		"application_uri",
-    OSR_APPLICATION_TITLE	"application_title",
-    OSR_APPLICATION_DESCR	"application_descr",
-    OSR_REQUESTER_NAME		"requester_name",
-    OSR_REQUESTER_EMAIL		"requester_email",
-    OSR_CALLBACK_URI		"callback_uri"
-    FROM OAUTH_SERVER_REGISTRY
-    WHERE (OSR_USA_ID_REF = P_USER_ID OR OSR_USA_ID_REF IS NULL)
-    ORDER BY OSR_APPLICATION_TITLE;
-              
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc
deleted file mode 100644
index dae9c72..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc
+++ /dev/null
@@ -1,43 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_CONSUMER_TOKENS
-(
-P_USER_ID                      IN        NUMBER,
-P_ROWS                         OUT       TYPES.REF_CURSOR,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Fetch a list of all consumer tokens accessing the account of the given user.
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  OPEN P_ROWS FOR
-    SELECT	OSR_CONSUMER_KEY 		"consumer_key",
-    OSR_CONSUMER_SECRET		"consumer_secret",
-    OSR_ENABLED				"enabled",
-    OSR_STATUS 				"status",
-    OSR_APPLICATION_URI		"application_uri",
-    OSR_APPLICATION_TITLE	"application_title",
-    OSR_APPLICATION_DESCR	"application_descr",
-    OST_TIMESTAMP			"timestamp",
-    OST_TOKEN				"token",
-    OST_TOKEN_SECRET		"token_secret",
-    OST_REFERRER_HOST		"token_referrer_host",
-    OSR_CALLBACK_URI		"callback_uri"
-    FROM OAUTH_SERVER_REGISTRY
-    JOIN OAUTH_SERVER_TOKEN
-    ON OST_OSR_ID_REF = OSR_ID
-    WHERE OST_USA_ID_REF = P_USER_ID
-    AND OST_TOKEN_TYPE = 'ACCESS'
-    AND OST_TOKEN_TTL  >= SYSDATE
-    ORDER BY OSR_APPLICATION_TITLE;
-            
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc
deleted file mode 100644
index 275950e..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc
+++ /dev/null
@@ -1,75 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_LOG
-(
-P_OPTION_FLAG                  IN        NUMBER, -- 0:NULL; 1:OTHERWISE
-P_USA_ID                       IN        NUMBER,
-P_OSR_CONSUMER_KEY             IN        VARCHAR2,
-P_OCR_CONSUMER_KEY             IN        VARCHAR2,
-P_OST_TOKEN                    IN        VARCHAR2,
-P_OCT_TOKEN                    IN        VARCHAR2,
-P_ROWS                         OUT       TYPES.REF_CURSOR,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Get a page of entries from the log.  Returns the last 100 records
- -- matching the options given.
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  IF P_OPTION_FLAG IS NULL OR P_OPTION_FLAG = 0 THEN
-      OPEN P_ROWS FOR
-      SELECT * FROM (
-         SELECT OLG_ID "olg_id",
-    							OLG_OSR_CONSUMER_KEY 	"osr_consumer_key",
-    							OLG_OST_TOKEN			"ost_token",
-    							OLG_OCR_CONSUMER_KEY	"ocr_consumer_key",
-    							OLG_OCT_TOKEN			"oct_token",
-    							OLG_USA_ID_REF			"user_id",
-    							OLG_RECEIVED			"received",
-    							OLG_SENT				"sent",
-    							OLG_BASE_STRING			"base_string",
-    							OLG_NOTES				"notes",
-    							OLG_TIMESTAMP			"timestamp",
-    							-- INET_NTOA(OLG_REMOTE_IP) "remote_ip"
-                  OLG_REMOTE_IP "remote_ip"
-    					FROM OAUTH_LOG
-    					WHERE  OLG_USA_ID_REF = P_USA_ID
-    					ORDER BY OLG_ID DESC
-       )  WHERE ROWNUM<=100; 
-  ELSE
-      OPEN P_ROWS FOR
-      SELECT * FROM (
-          SELECT OLG_ID "olg_id",
-    							OLG_OSR_CONSUMER_KEY 	"osr_consumer_key",
-    							OLG_OST_TOKEN			"ost_token",
-    							OLG_OCR_CONSUMER_KEY	"ocr_consumer_key",
-    							OLG_OCT_TOKEN			"oct_token",
-    							OLG_USA_ID_REF			"user_id",
-    							OLG_RECEIVED			"received",
-    							OLG_SENT				"sent",
-    							OLG_BASE_STRING			"base_string",
-    							OLG_NOTES				"notes",
-    							OLG_TIMESTAMP			"timestamp",
-    							-- INET_NTOA(OLG_REMOTE_IP) "remote_ip"
-                  OLG_REMOTE_IP "remote_ip"
-    					FROM OAUTH_LOG
-    					WHERE  OLG_OSR_CONSUMER_KEY = P_OSR_CONSUMER_KEY
-              AND OLG_OCR_CONSUMER_KEY = P_OCR_CONSUMER_KEY
-              AND OLG_OST_TOKEN = P_OST_TOKEN
-              AND OLG_OCT_TOKEN = P_OCT_TOKEN
-              AND (OLG_USA_ID_REF IS NULL OR OLG_USA_ID_REF = P_USA_ID)
-    					ORDER BY OLG_ID DESC
-       )  WHERE ROWNUM<=100; 
-              
-  END IF;
-               
-
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc
deleted file mode 100644
index 51dd39a..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc
+++ /dev/null
@@ -1,66 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_SERVERS
-(
-P_Q                         IN        VARCHAR2,
-P_USER_ID                   IN        NUMBER,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Get a list of all consumers from the consumer registry.
-BEGIN
-P_RESULT := 0;
-
-IF P_Q IS NOT NULL THEN
-
-   OPEN P_ROWS FOR
-    SELECT	OCR_ID					"id",
-    	OCR_USA_ID_REF			"user_id",
-    	OCR_CONSUMER_KEY 		"consumer_key",
-    	OCR_CONSUMER_SECRET 	"consumer_secret",
-    	OCR_SIGNATURE_METHODS	"signature_methods",
-    	OCR_SERVER_URI			"server_uri",
-    	OCR_SERVER_URI_HOST		"server_uri_host",
-    	OCR_SERVER_URI_PATH		"server_uri_path",
-    	OCR_REQUEST_TOKEN_URI	"request_token_uri",
-    	OCR_AUTHORIZE_URI		"authorize_uri",
-    	OCR_ACCESS_TOKEN_URI	"access_token_uri"
-    FROM OAUTH_CONSUMER_REGISTRY
-    WHERE (	OCR_CONSUMER_KEY LIKE '%'|| P_Q ||'%'
-						  	 OR OCR_SERVER_URI LIKE '%'|| P_Q ||'%'
-						  	 OR OCR_SERVER_URI_HOST LIKE '%'|| P_Q ||'%'
-						  	 OR OCR_SERVER_URI_PATH LIKE '%'|| P_Q ||'%')
-						 AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL)
-    ORDER BY OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH;
-        
-ELSE
-
-   OPEN P_ROWS FOR
-    SELECT	OCR_ID					"id",
-    	OCR_USA_ID_REF			"user_id",
-    	OCR_CONSUMER_KEY 		"consumer_key",
-    	OCR_CONSUMER_SECRET 	"consumer_secret",
-    	OCR_SIGNATURE_METHODS	"signature_methods",
-    	OCR_SERVER_URI			"server_uri",
-    	OCR_SERVER_URI_HOST		"server_uri_host",
-    	OCR_SERVER_URI_PATH		"server_uri_path",
-    	OCR_REQUEST_TOKEN_URI	"request_token_uri",
-    	OCR_AUTHORIZE_URI		"authorize_uri",
-    	OCR_ACCESS_TOKEN_URI	"access_token_uri"
-    FROM OAUTH_CONSUMER_REGISTRY
-    WHERE OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL
-    ORDER BY OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH;
-                 
-END IF;
-
-
-  
-   
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc
deleted file mode 100644
index baa62c0..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc
+++ /dev/null
@@ -1,45 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_SERVER_TOKENS
-(
-P_USER_ID                   IN        NUMBER,
-P_ROWS                      OUT       TYPES.REF_CURSOR,
-P_RESULT                    OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Find the server details that might be used for a request
-BEGIN
-P_RESULT := 0;
-
-OPEN P_ROWS FOR
-  SELECT	OCR_CONSUMER_KEY		"consumer_key",
-  OCR_CONSUMER_SECRET		"consumer_secret",
-  OCT_ID					"token_id",
-  OCT_TOKEN				"token",
-  OCT_TOKEN_SECRET		"token_secret",
-  OCT_USA_ID_REF			"user_id",
-  OCR_SIGNATURE_METHODS	"signature_methods",
-  OCR_SERVER_URI			"server_uri",
-  OCR_SERVER_URI_HOST		"server_uri_host",
-  OCR_SERVER_URI_PATH		"server_uri_path",
-  OCR_REQUEST_TOKEN_URI	"request_token_uri",
-  OCR_AUTHORIZE_URI		"authorize_uri",
-  OCR_ACCESS_TOKEN_URI	"access_token_uri",
-  OCT_TIMESTAMP			"timestamp"
-  FROM OAUTH_CONSUMER_REGISTRY
-  JOIN OAUTH_CONSUMER_TOKEN
-  ON OCT_OCR_ID_REF = OCR_ID
-  WHERE OCT_USA_ID_REF = P_USER_ID
-  AND OCT_TOKEN_TYPE = 'ACCESS'
-  AND OCT_TOKEN_TTL  >= SYSDATE
-  ORDER BY OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH;
-              
-              
-        
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc
deleted file mode 100644
index e5a96c9..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_SET_CONSUMER_ACC_TOKEN_TTL
-(
-P_TOKEN                        IN        VARCHAR2,
-P_TOKEN_TTL                    IN        NUMBER,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Set the ttl of a consumer access token.  This is done when the
- -- server receives a valid request with a xoauth_token_ttl parameter in it.
- 
-BEGIN
-
-  P_RESULT := 0;
-  
-  UPDATE OAUTH_SERVER_TOKEN
-  SET OST_TOKEN_TTL = SYSDATE + (P_TOKEN_TTL/(24*60*60))
-  WHERE OST_TOKEN 	 = P_TOKEN
-  AND OST_TOKEN_TYPE = 'ACCESS';
-        
-  
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc
deleted file mode 100644
index 34a99de..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc
+++ /dev/null
@@ -1,29 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_SET_SERVER_TOKEN_TTL
-(
-P_TOKEN_TTL                    IN        NUMBER, -- IN SECOND
-P_CONSUMER_KEY                 IN        VARCHAR2,
-P_TOKEN                        IN        VARCHAR2,
-P_RESULT                       OUT       NUMBER
-)
-AS
-
- -- PROCEDURE TO Set the ttl of a server access token.
-
-BEGIN
-
-  P_RESULT := 0;
-  
-
-UPDATE OAUTH_CONSUMER_TOKEN
-SET OCT_TOKEN_TTL = SYSDATE + (P_TOKEN_TTL/(24*60*60)) -- DATE_ADD(NOW(), INTERVAL %D SECOND)
-WHERE OCT_TOKEN = P_TOKEN
-AND OCT_OCR_ID_REF IN (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY);
-              
-  
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc
deleted file mode 100644
index a79e64c..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc
+++ /dev/null
@@ -1,40 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_UPDATE_CONSUMER
-(
-P_OSR_USA_ID_REF                              IN      NUMBER, 
-P_OSR_CONSUMER_KEY                            IN      VARCHAR2, 
-P_OSR_CONSUMER_SECRET                         IN      VARCHAR2,
-P_OSR_REQUESTER_NAME                          IN      VARCHAR2,
-P_OSR_REQUESTER_EMAIL                         IN      VARCHAR2, 
-P_OSR_CALLBACK_URI                            IN      VARCHAR2, 
-P_OSR_APPLICATION_URI                         IN      VARCHAR2, 
-P_OSR_APPLICATION_TITLE                       IN      VARCHAR2, 
-P_OSR_APPLICATION_DESCR                       IN      VARCHAR2,
-P_OSR_APPLICATION_NOTES                       IN      VARCHAR2, 
-P_OSR_APPLICATION_TYPE                        IN      VARCHAR2, 
-P_OSR_APPLICATION_COMMERCIAL                  IN      INTEGER,
-P_RESULT                                      OUT     NUMBER
-)
-AS
-
- -- PROCEDURE TO Insert a new consumer with this server (we will be the server)
-BEGIN
-P_RESULT := 0;
-
-
- INSERT INTO OAUTH_SERVER_REGISTRY
- ( OSR_ID, OSR_ENABLED, OSR_STATUS,OSR_USA_ID_REF,OSR_CONSUMER_KEY, OSR_CONSUMER_SECRET,OSR_REQUESTER_NAME,
-					OSR_REQUESTER_EMAIL, OSR_CALLBACK_URI, OSR_APPLICATION_URI, OSR_APPLICATION_TITLE, OSR_APPLICATION_DESCR,
-					OSR_APPLICATION_NOTES, OSR_APPLICATION_TYPE, OSR_APPLICATION_COMMERCIAL, OSR_TIMESTAMP, OSR_ISSUE_DATE)
- VALUES
- ( SEQ_OSR_ID.NEXTVAL, 1, 'ACTIVE', P_OSR_USA_ID_REF, P_OSR_CONSUMER_KEY, P_OSR_CONSUMER_SECRET,P_OSR_REQUESTER_NAME,
-					P_OSR_REQUESTER_EMAIL, P_OSR_CALLBACK_URI, P_OSR_APPLICATION_URI, P_OSR_APPLICATION_TITLE, P_OSR_APPLICATION_DESCR,
-					P_OSR_APPLICATION_NOTES, P_OSR_APPLICATION_TYPE, P_OSR_APPLICATION_COMMERCIAL, SYSDATE, SYSDATE); 
-    
-              
-EXCEPTION
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc
deleted file mode 100644
index 7826eb6..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc
+++ /dev/null
@@ -1,139 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_UPDATE_SERVER
-(
-P_CONSUMER_KEY                          IN        VARCHAR2,
-P_USER_ID                               IN        NUMBER,
-P_OCR_ID                                IN        NUMBER,
-P_USER_IS_ADMIN                         IN        NUMBER, -- 0:NO; 1:YES;
-P_OCR_CONSUMER_SECRET                   IN        VARCHAR2,
-P_OCR_SERVER_URI                        IN        VARCHAR2,
-P_OCR_SERVER_URI_HOST                   IN        VARCHAR2,
-P_OCR_SERVER_URI_PATH                   IN        VARCHAR2,
-P_OCR_REQUEST_TOKEN_URI                 IN        VARCHAR2,
-P_OCR_AUTHORIZE_URI                     IN        VARCHAR2,
-P_OCR_ACCESS_TOKEN_URI                  IN        VARCHAR2,
-P_OCR_SIGNATURE_METHODS                 IN        VARCHAR2,
-P_OCR_USA_ID_REF                        IN        NUMBER,
-P_UPDATE_P_OCR_USA_ID_REF_FLAG          IN        NUMBER, -- 1:TRUE; 0:FALSE
-P_RESULT                                OUT       NUMBER
-)
-AS
-
- -- Add a request token we obtained from a server.
-V_OCR_ID_EXIST                                  NUMBER;
-V_OCR_USA_ID_REF                                NUMBER;
-
-V_EXC_DUPLICATE_CONSUMER_KEY              EXCEPTION;
-V_EXC_UNAUTHORISED_USER_ID                EXCEPTION;
-BEGIN
-P_RESULT := 0;
-
-V_OCR_USA_ID_REF := P_OCR_USA_ID_REF;
-
-      IF P_OCR_ID IS NOT NULL THEN
-        BEGIN
-          SELECT 1 INTO V_OCR_ID_EXIST FROM DUAL WHERE EXISTS 
-          (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY 
-  						WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY
-  						  AND OCR_ID != P_OCR_ID
-  						  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL));
-           
-        EXCEPTION
-        WHEN NO_DATA_FOUND THEN
-             V_OCR_ID_EXIST :=0;
-        END;
-      ELSE
-         BEGIN
-          SELECT 1 INTO V_OCR_ID_EXIST FROM DUAL WHERE EXISTS 
-          (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY 
-  						WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY
-  						  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL));
-           
-        EXCEPTION
-        WHEN NO_DATA_FOUND THEN
-             V_OCR_ID_EXIST :=0;
-        END;
-      END IF;
-      
-      IF V_OCR_ID_EXIST = 1 THEN
-         RAISE V_EXC_DUPLICATE_CONSUMER_KEY;
-      END IF;
-      
-      
-      IF P_OCR_ID IS NOT NULL THEN
-         IF P_USER_IS_ADMIN != 1 THEN
-            BEGIN
-              SELECT OCR_USA_ID_REF INTO V_OCR_USA_ID_REF
-  									FROM OAUTH_CONSUMER_REGISTRY
-  									WHERE OCR_ID = P_OCR_ID;
-               
-            EXCEPTION
-            WHEN NO_DATA_FOUND THEN
-                 NULL;
-            END;
-            
-            IF V_OCR_USA_ID_REF != P_USER_ID THEN
-               RAISE V_EXC_UNAUTHORISED_USER_ID;
-            END IF;
-         END IF; 
-         
-         IF P_UPDATE_P_OCR_USA_ID_REF_FLAG = 0 THEN
-         
-            UPDATE OAUTH_CONSUMER_REGISTRY
-              SET OCR_CONSUMER_KEY  = P_CONSUMER_KEY,
-              OCR_CONSUMER_SECRET 	= P_OCR_CONSUMER_SECRET,
-              OCR_SERVER_URI	    	= P_OCR_SERVER_URI,
-              OCR_SERVER_URI_HOST 	= P_OCR_SERVER_URI_HOST,
-              OCR_SERVER_URI_PATH 	= P_OCR_SERVER_URI_PATH,
-              OCR_TIMESTAMP       	= SYSDATE,
-              OCR_REQUEST_TOKEN_URI	= P_OCR_REQUEST_TOKEN_URI,
-              OCR_AUTHORIZE_URI		  = P_OCR_AUTHORIZE_URI,
-              OCR_ACCESS_TOKEN_URI	= P_OCR_ACCESS_TOKEN_URI,
-              OCR_SIGNATURE_METHODS	= P_OCR_SIGNATURE_METHODS
-              WHERE OCR_ID = P_OCR_ID;
-                  
-         ELSIF P_UPDATE_P_OCR_USA_ID_REF_FLAG = 1 THEN
-             UPDATE OAUTH_CONSUMER_REGISTRY
-              SET OCR_CONSUMER_KEY  = P_CONSUMER_KEY,
-              OCR_CONSUMER_SECRET 	= P_OCR_CONSUMER_SECRET,
-              OCR_SERVER_URI	    	= P_OCR_SERVER_URI,
-              OCR_SERVER_URI_HOST 	= P_OCR_SERVER_URI_HOST,
-              OCR_SERVER_URI_PATH 	= P_OCR_SERVER_URI_PATH,
-              OCR_TIMESTAMP       	= SYSDATE,
-              OCR_REQUEST_TOKEN_URI	= P_OCR_REQUEST_TOKEN_URI,
-              OCR_AUTHORIZE_URI		  = P_OCR_AUTHORIZE_URI,
-              OCR_ACCESS_TOKEN_URI	= P_OCR_ACCESS_TOKEN_URI,
-              OCR_SIGNATURE_METHODS	= P_OCR_SIGNATURE_METHODS,
-              OCR_USA_ID_REF        = P_OCR_USA_ID_REF
-              WHERE OCR_ID = P_OCR_ID;
-                    
-         END IF;
-      
-      ELSE
-          IF P_UPDATE_P_OCR_USA_ID_REF_FLAG = 0 THEN
-             V_OCR_USA_ID_REF := P_USER_ID;
-          END IF;
-          
-          INSERT INTO OAUTH_CONSUMER_REGISTRY
-          (OCR_ID, OCR_CONSUMER_KEY ,OCR_CONSUMER_SECRET, OCR_SERVER_URI, OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH,
-						OCR_TIMESTAMP, OCR_REQUEST_TOKEN_URI, OCR_AUTHORIZE_URI, OCR_ACCESS_TOKEN_URI, OCR_SIGNATURE_METHODS,
-						OCR_USA_ID_REF)
-          VALUES
-          (SEQ_OCR_ID.NEXTVAL, P_CONSUMER_KEY, P_OCR_CONSUMER_SECRET, P_OCR_SERVER_URI, P_OCR_SERVER_URI_HOST, P_OCR_SERVER_URI_PATH,
-						SYSDATE, P_OCR_REQUEST_TOKEN_URI, P_OCR_AUTHORIZE_URI, P_OCR_ACCESS_TOKEN_URI, P_OCR_SIGNATURE_METHODS,
-						V_OCR_USA_ID_REF);
-              
-      END IF;
-      
-      
-EXCEPTION
-WHEN V_EXC_DUPLICATE_CONSUMER_KEY THEN
-P_RESULT := 2; -- DUPLICATE_CONSUMER_KEY
-WHEN V_EXC_UNAUTHORISED_USER_ID THEN
-P_RESULT := 3; -- UNAUTHORISED_USER_ID
-
-WHEN OTHERS THEN
--- CALL THE FUNCTION TO LOG ERRORS
-ROLLBACK;
-P_RESULT := 1; -- ERROR
-END;
-/
diff --git a/vendor/oauth-php/library/store/oracle/install.php b/vendor/oauth-php/library/store/oracle/install.php
deleted file mode 100644
index 5a80f04..0000000
--- a/vendor/oauth-php/library/store/oracle/install.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-
-/**
- Added by Vinay Kant Sahu.
-vinaykant.sahu@gmail.com
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on Oracle
- * 
- 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
-
-
-
- */
-
-echo 'Right now we do not have Oracle DB installer.
-Please find OracleDB folder here with this Table, Sequences and Procedures. You need to manually install/create DB schema and SP with your oracle DB. ';
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/postgresql/pgsql.sql b/vendor/oauth-php/library/store/postgresql/pgsql.sql
deleted file mode 100644
index 8f0e4d3..0000000
--- a/vendor/oauth-php/library/store/postgresql/pgsql.sql
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# Log table to hold all OAuth request when you enabled logging
-#
-
-CREATE TABLE oauth_log (
-    olg_id                  serial primary key,
-    olg_osr_consumer_key    varchar(64),
-    olg_ost_token           varchar(64),
-    olg_ocr_consumer_key    varchar(64),
-    olg_oct_token           varchar(64),
-    olg_usa_id_ref          text,
-    olg_received            text not null,
-    olg_sent                text not null,
-    olg_base_string         text not null,
-    olg_notes               text not null,
-    olg_timestamp           timestamp not null default current_timestamp,
-    olg_remote_ip           inet not null
-);
-
-COMMENT ON TABLE oauth_log IS 'Log table to hold all OAuth request when you enabled logging';
-
-
-#
-# /////////////////// CONSUMER SIDE ///////////////////
-#
-
-# This is a registry of all consumer codes we got from other servers
-# The consumer_key/secret is obtained from the server
-# We also register the server uri, so that we can find the consumer key and secret
-# for a certain server.  From that server we can check if we have a token for a
-# particular user.
-
-CREATE TABLE oauth_consumer_registry (
-    ocr_id                  serial primary key,
-    ocr_usa_id_ref          text,
-    ocr_consumer_key        varchar(128) not null,
-    ocr_consumer_secret     varchar(128) not null,
-    ocr_signature_methods   varchar(255) not null default 'HMAC-SHA1,PLAINTEXT',
-    ocr_server_uri          varchar(255) not null,
-    ocr_server_uri_host     varchar(128) not null,
-    ocr_server_uri_path     varchar(128) not null,
-
-    ocr_request_token_uri   varchar(255) not null,
-    ocr_authorize_uri       varchar(255) not null,
-    ocr_access_token_uri    varchar(255) not null,
-    ocr_timestamp           timestamp not null default current_timestamp,
-
-    unique (ocr_consumer_key, ocr_usa_id_ref, ocr_server_uri)
-);
-
-COMMENT ON TABLE oauth_consumer_registry IS 'This is a registry of all consumer codes we got from other servers';
-
-# Table used to sign requests for sending to a server by the consumer
-# The key is defined for a particular user.  Only one single named
-# key is allowed per user/server combination
-
--- Create enum type token_type
-CREATE TYPE consumer_token_type AS ENUM (
-    'request',
-    'authorized',
-    'access'
-);
-
-CREATE TABLE oauth_consumer_token (
-    oct_id                  serial primary key,
-    oct_ocr_id_ref          integer not null,
-    oct_usa_id_ref          text not null,
-    oct_name                varchar(64) not null default '',
-    oct_token               varchar(64) not null,
-    oct_token_secret        varchar(64) not null,
-    oct_token_type          consumer_token_type,
-    oct_token_ttl           timestamp not null default timestamp '9999-12-31',
-    oct_timestamp           timestamp not null default current_timestamp,
-
-    unique (oct_ocr_id_ref, oct_token),
-    unique (oct_usa_id_ref, oct_ocr_id_ref, oct_token_type, oct_name),
-
-    foreign key (oct_ocr_id_ref) references oauth_consumer_registry (ocr_id)
-        on update cascade
-        on delete cascade
-);
-
-
-COMMENT ON TABLE oauth_consumer_token IS 'Table used to sign requests for sending to a server by the consumer';
-
-#
-# ////////////////// SERVER SIDE /////////////////
-#
-
-# Table holding consumer key/secret combos an user issued to consumers.
-# Used for verification of incoming requests.
-
-CREATE TABLE oauth_server_registry (
-    osr_id                      serial primary key,
-    osr_usa_id_ref              text,
-    osr_consumer_key            varchar(64) not null,
-    osr_consumer_secret         varchar(64) not null,
-    osr_enabled                 boolean not null default true,
-    osr_status                  varchar(16) not null,
-    osr_requester_name          varchar(64) not null,
-    osr_requester_email         varchar(64) not null,
-    osr_callback_uri            varchar(255) not null,
-    osr_application_uri         varchar(255) not null,
-    osr_application_title       varchar(80) not null,
-    osr_application_descr       text not null,
-    osr_application_notes       text not null,
-    osr_application_type        varchar(20) not null,
-    osr_application_commercial  boolean not null default false,
-    osr_issue_date              timestamp not null,
-    osr_timestamp               timestamp not null default current_timestamp,
-
-    unique (osr_consumer_key)
-);
-
-
-COMMENT ON TABLE oauth_server_registry IS 'Table holding consumer key/secret combos an user issued to consumers';
-
-# Nonce used by a certain consumer, every used nonce should be unique, this prevents
-# replaying attacks.  We need to store all timestamp/nonce combinations for the
-# maximum timestamp received.
-
-CREATE TABLE oauth_server_nonce (
-    osn_id                  serial primary key,
-    osn_consumer_key        varchar(64) not null,
-    osn_token               varchar(64) not null,
-    osn_timestamp           bigint not null,
-    osn_nonce               varchar(80) not null,
-
-    unique (osn_consumer_key, osn_token, osn_timestamp, osn_nonce)
-);
-
-
-COMMENT ON TABLE oauth_server_nonce IS 'Nonce used by a certain consumer, every used nonce should be unique, this prevents replaying attacks';
-
-# Table used to verify signed requests sent to a server by the consumer
-# When the verification is succesful then the associated user id is returned.
-
--- Create enum type token_type
-CREATE TYPE server_token_type AS ENUM (
-    'request',
-    'access'
-);
-
-CREATE TABLE oauth_server_token (
-    ost_id                  serial primary key,
-    ost_osr_id_ref          integer not null,
-    ost_usa_id_ref          text not null,
-    ost_token               varchar(64) not null,
-    ost_token_secret        varchar(64) not null,
-    ost_token_type          server_token_type,
-    ost_authorized          boolean not null default false,
-	ost_referrer_host       varchar(128) not null default '',
-	ost_token_ttl           timestamp not null default timestamp '9999-12-31',
-    ost_timestamp           timestamp not null default current_timestamp,
-    ost_verifier            char(10),
-    ost_callback_url        varchar(512),
-
-    unique (ost_token),
-
-	foreign key (ost_osr_id_ref) references oauth_server_registry (osr_id)
-        on update cascade
-        on delete cascade
-);
-
-
-COMMENT ON TABLE oauth_server_token IS 'Table used to verify signed requests sent to a server by the consumer';
diff --git a/vendor/oauth-php/test/discovery/xrds-fireeagle.xrds b/vendor/oauth-php/test/discovery/xrds-fireeagle.xrds
deleted file mode 100644
index 0f5eba2..0000000
--- a/vendor/oauth-php/test/discovery/xrds-fireeagle.xrds
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRDS xmlns="xri://$xrds">
-  
-  <!-- FireEagle User-Centric OAuth Configuration -->
-  <XRD xml:id="oauth" xmlns:simple="http://xrds-simple.net/core/1.0" xmlns="xri://$XRD*($v*2.0)" version="2.0">
-    
-    <Type>xri://$xrds*simple</Type>
-    <Expires>2008-04-15T00:25:30-07:00</Expires>
-
-    <!-- Request Token -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/request</Type>
-      
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/post-body</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-
-      <URI>https://fireeagle.yahooapis.com/oauth/request_token</URI>
-    </Service>
-
-    <!-- User Authorization -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/authorize</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-
-      <URI>https://fireeagle.yahooapis.com/oauth/access_token</URI>
-    </Service>
-
-    <!-- Access Token -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/access</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/post-body</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-
-      <URI>http://fireeagle.yahoo.net/oauth/authorize</URI>
-    </Service>
-
-    <!-- Protected Resources -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/resource</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/post-body</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-    </Service>
-
-    <!-- Consumer Identity -->
-    
-      <!-- Manual Consumer Identity Allocation -->
-      <Service>
-        <Type>http://oauth.net/discovery/1.0/consumer-identity/oob</Type>
-        <URI>https://fireeagle.yahoo.net/developer/create</URI>
-      </Service>
-  </XRD>
-  
-  <!-- Global Resource Definition -->
-  
-  <XRD xmlns="xri://$XRD*($v*2.0)" version="2.0">
-    <Type>xri://$xrds*simple</Type>
-    
-    <!-- OAuth Endpoints Definition -->
-    <Service>
-      <Type>http://oauth.net/discovery/1.0</Type>
-      <URI>#oauth</URI>
-    </Service>
-  </XRD>
-  
-</XRDS>
\ No newline at end of file
diff --git a/vendor/oauth-php/test/discovery/xrds-getsatisfaction.xrds b/vendor/oauth-php/test/discovery/xrds-getsatisfaction.xrds
deleted file mode 100644
index ab94b5b..0000000
--- a/vendor/oauth-php/test/discovery/xrds-getsatisfaction.xrds
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRDS xmlns="xri://$xrds">
-  
-  <XRD xml:id="oauth" xmlns:simple="http://xrds-simple.net/core/1.0" xmlns="xri://$XRD*($v*2.0)" version="2.0">
-    <Type>xri://$xrds*simple</Type>
-    <Expires>2008-04-30T23:59:59Z</Expires>
-
-    <!-- Request Token -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/request</Type>
-      
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      
-      <URI>http://getsatisfaction.com/api/request_token</URI>
-    </Service>
-
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/authorize</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-
-      <URI>http://getsatisfaction.com/api/authorize</URI>
-    </Service>
-
-    <!-- Access Token -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/access</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-
-      <URI>http://getsatisfaction.com/api/access_token</URI>
-    </Service>
-
-    <!-- Protected Resources -->
-    <!-- 
-      
-      To test successful access token grant, make a request against
-      
-        http://api.getsatisfaction.com/me
-
-      The API should respond with hCard of the user who authorized the token
-      -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/resource</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>      
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-
-    </Service>
-
-    <!-- Consumer Identity -->
-    
-    <Service>
-      <Type>http://oauth.net/discovery/1.0/consumer-identity/oob</Type>
-      <URI>http://getsatisfaction.com/me/extensions/new</URI>
-    </Service>
-  </XRD>
-  
-  <!-- Global Resource Definition -->
-  
-  <XRD xmlns="xri://$XRD*($v*2.0)" version="2.0">
-    <Type>xri://$xrds*simple</Type>
-    
-    <!-- OAuth Endpoints Definition -->
-    <Service priority="10">
-      <Type>http://oauth.net/discovery/1.0</Type>
-      <URI>#oauth</URI>
-    </Service>
-  </XRD>
-  
-</XRDS>
\ No newline at end of file
diff --git a/vendor/oauth-php/test/discovery/xrds-magnolia.xrds b/vendor/oauth-php/test/discovery/xrds-magnolia.xrds
deleted file mode 100644
index 361b5c9..0000000
--- a/vendor/oauth-php/test/discovery/xrds-magnolia.xrds
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRDS xmlns="xri://$xrds">
-  
-  <!-- Ma.gnolia OAuth Configuration -->
-  <XRD xml:id="oauth" xmlns="xri://$XRD*($v*2.0)" version="2.0">
-    
-    <Type>xri://$xrds*simple</Type>
-    <Expires>2008-04-13T07:34:58Z</Expires>
-
-    <!-- Request Token -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/request</Type>
-      
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/post-body</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/RSA-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-
-      <URI>https://ma.gnolia.com/oauth/get_request_token</URI>
-    </Service>
-
-    <!-- User Authorization (HTTPS Prefered) -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/authorize</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-
-      <URI priority="10">https://ma.gnolia.com/oauth/authorize</URI>
-      <URI priority="20">http://ma.gnolia.com/oauth/authorize</URI>
-    </Service>
-
-    <!-- Access Token -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/access</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/post-body</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/RSA-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/PLAINTEXT</Type>
-
-      <URI>https://ma.gnolia.com/oauth/get_access_token</URI>
-    </Service>
-
-    <!-- Protected Resources -->
-    <Service>
-      <Type>http://oauth.net/core/1.0/endpoint/resource</Type>
-
-      <Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
-      <Type>http://oauth.net/core/1.0/parameters/post-body</Type>
-      <Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
-      <Type>http://oauth.net/core/1.0/signature/HMAC-SHA1</Type>
-      <Type>http://oauth.net/core/1.0/signature/RSA-SHA1</Type>
-    </Service>
-
-    <!-- Consumer Identity -->
-    
-      <!-- Manual Consumer Identity Allocation -->
-      <Service>
-        <Type>http://oauth.net/discovery/1.0/consumer-identity/oob</Type>
-        <URI>http://ma.gnolia.com/applications/new</URI>
-      </Service>
-  </XRD>
-  
-  <!-- Global Resource Definition -->
-  
-  <XRD xmlns="xri://$XRD*($v*2.0)" version="2.0">
-    <Type>xri://$xrds*simple</Type>
-    
-    <!-- OAuth Endpoints Definition -->
-    <Service priority="10">
-      <Type>http://oauth.net/discovery/1.0</Type>
-      <URI>#oauth</URI>
-    </Service>
-  </XRD>
-  
-</XRDS>
\ No newline at end of file
diff --git a/vendor/oauth-php/test/oauth_test.php b/vendor/oauth-php/test/oauth_test.php
deleted file mode 100644
index c7d174b..0000000
--- a/vendor/oauth-php/test/oauth_test.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
- * Tests of OAuth implementation.
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 29, 2007 3:46:56 PM
- * @see http://wiki.oauth.net/TestCases
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-require_once dirname(__FILE__) . '/../library/OAuthRequest.php';
-require_once dirname(__FILE__) . '/../library/OAuthRequester.php';
-require_once dirname(__FILE__) . '/../library/OAuthRequestSigner.php';
-require_once dirname(__FILE__) . '/../library/OAuthRequestVerifier.php';
-
-if (!function_exists('getallheaders'))
-{
-	function getallheaders()
-	{
-		return array();
-	}
-}
-
-
-oauth_test();
-
-function oauth_test ()
-{
-	error_reporting(E_ALL);
-
-	header('Content-Type: text/plain; charset=utf-8');
-	
-	echo "Performing OAuth module tests.\n\n";
-	echo "See also: http://wiki.oauth.net/TestCases\n\n";
-	
-	assert_options(ASSERT_CALLBACK, 'oauth_assert_handler');
-	assert_options(ASSERT_WARNING,  0);
-	
-	$req = new OAuthRequest('http://www.example.com', 'GET');
-
-	echo "***** Parameter Encoding *****\n\n";
-	
-	assert('$req->urlencode(\'abcABC123\') == \'abcABC123\'');
-	assert('$req->urlencode(\'-._~\') == \'-._~\'');
-	assert('$req->urlencode(\'%\') == \'%25\'');
-	assert('$req->urlencode(\'&=*\') == \'%26%3D%2A\'');
-	assert('$req->urlencode(\'&=*\') == \'%26%3D%2A\'');
-	assert('$req->urlencode("\n") == \'%0A\'');
-	assert('$req->urlencode(" ") == \'%20\'');
-	assert('$req->urlencode("\x7f") == \'%7F\'');
-
-
-	echo "***** Normalize Request Parameters *****\n\n";
-	
-	$req = new OAuthRequest('http://example.com/?name', 'GET');
-	assert('$req->getNormalizedParams() == \'name=\'');
-
-	$req = new OAuthRequest('http://example.com/?a=b', 'GET');
-	assert('$req->getNormalizedParams() == \'a=b\'');
-	
-	$req = new OAuthRequest('http://example.com/?a=b&c=d', 'GET');
-	assert('$req->getNormalizedParams() == \'a=b&c=d\'');
-	
-	// At this moment we don't support two parameters with the same name
-	// so I changed this test case to "a=" and "b=" and not "a=" and "a="
-	$req = new OAuthRequest('http://example.com/?b=x!y&a=x+y', 'GET');
-	assert('$req->getNormalizedParams() == \'a=x%2By&b=x%21y\'');
-	
-	$req = new OAuthRequest('http://example.com/?x!y=a&x=a', 'GET');
-	assert('$req->getNormalizedParams() == \'x=a&x%21y=a\'');
-	
-
-	echo "***** Base String *****\n\n";
-	
-	$req  = new OAuthRequest('http://example.com/?n=v', 'GET');
-	assert('$req->signatureBaseString() == \'GET&http%3A%2F%2Fexample.com%2F&n%3Dv\'');
-	
-	$req = new OAuthRequest(
-							'https://photos.example.net/request_token', 
-							'POST',
-							'oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1191242090&oauth_nonce=hsu94j3884jdopsl&oauth_signature_method=PLAINTEXT&oauth_signature=ignored',
-							array('X-OAuth-Test' => true));
-	assert('$req->signatureBaseString() == \'POST&https%3A%2F%2Fphotos.example.net%2Frequest_token&oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dhsu94j3884jdopsl%26oauth_signature_method%3DPLAINTEXT%26oauth_timestamp%3D1191242090%26oauth_version%3D1.0\'');
-
-	$req = new OAuthRequest(
-							'http://photos.example.net/photos?file=vacation.jpg&size=original&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_token=nnch734d00sl2jdk&oauth_timestamp=1191242096&oauth_nonce=kllo9940pd9333jh&oauth_signature=ignored&oauth_signature_method=HMAC-SHA1', 
-							'GET');
-	assert('$req->signatureBaseString() == \'GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal\'');
-
-
-	echo "***** HMAC-SHA1 *****\nRequest signing\n";
-
-	OAuthStore::instance('MySQL', array('conn'=>false));
-	$req = new OAuthRequestSigner('http://photos.example.net/photos?file=vacation.jpg&size=original', 'GET');	
-
-	assert('$req->urldecode($req->calculateDataSignature(\'bs\', \'cs\', \'\',   \'HMAC-SHA1\')) == \'egQqG5AJep5sJ7anhXju1unge2I=\'');
-	assert('$req->urldecode($req->calculateDataSignature(\'bs\', \'cs\', \'ts\', \'HMAC-SHA1\')) == \'VZVjXceV7JgPq/dOTnNmEfO0Fv8=\'');
-	
-	$secrets = array(
-				'consumer_key'		=> 'dpf43f3p2l4k3l03',
-				'consumer_secret'	=> 'kd94hf93k423kf44',
-				'token'				=> 'nnch734d00sl2jdk',
-				'token_secret'		=> 'pfkkdhi9sl3r4s00',
-				'signature_methods'	=> array('HMAC-SHA1'),
-				'nonce'				=> 'kllo9940pd9333jh',
-				'timestamp'			=> '1191242096'
-				);
-	$req->sign(0, $secrets);
-	assert('$req->getParam(\'oauth_signature\', true) == \'tR3+Ty81lMeYAr/Fid0kMTYa/WM=\'');
-
-	echo "***** HMAC-SHA1 *****\nRequest verification\n";
-
-	$req = new OAuthRequestVerifier(
-				'http://photos.example.net/photos?file=vacation.jpg&size=original'
-				.'&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_token=nnch734d00sl2jdk'
-				.'&oauth_signature_method=HMAC-SHA1&oauth_nonce=kllo9940pd9333jh'
-				.'&oauth_timestamp=1191242096&oauth_version=1.0'
-				.'&oauth_signature='.rawurlencode('tR3+Ty81lMeYAr/Fid0kMTYa/WM=')
-				, 'GET');
-	
-	$req->verifySignature('kd94hf93k423kf44', 'pfkkdhi9sl3r4s00');
-
-	echo "\n";
-	echo "***** Yahoo! test case ******\n\n";
-
-	OAuthStore::instance('MySQL', array('conn'=>false));
-	$req = new OAuthRequestSigner('http://example.com:80/photo', 'GET');
-	
-	$req->setParam('title',   'taken with a 30% orange filter');
-	$req->setParam('file',    'mountain & water view');
-	$req->setParam('format',  'jpeg');
-	$req->setParam('include', array('date','aperture'));
-
-	$secrets = array(
-				'consumer_key'		=> '1234=asdf=4567',
-				'consumer_secret'	=> 'erks823*43=asd&123ls%23',
-				'token'				=> 'asdf-4354=asew-5698',
-				'token_secret'		=> 'dis9$#$Js009%==',
-				'signature_methods'	=> array('HMAC-SHA1'),
-				'nonce'				=> '3jd834jd9',
-				'timestamp'			=> '12303202302'
-				);
-	$req->sign(0, $secrets);
-
-	// echo "Basestring:\n",$req->signatureBaseString(), "\n\n";
-
-	//echo "queryString:\n",$req->getQueryString(), "\n\n";
-	assert('$req->getQueryString() == \'title=taken%20with%20a%2030%25%20orange%20filter&file=mountain%20%26%20water%20view&format=jpeg&include=date&include=aperture\'');	
-
-	//echo "oauth_signature:\n",$req->getParam('oauth_signature', true),"\n\n";
-	assert('$req->getParam(\'oauth_signature\', true) == \'jMdUSR1vOr3SzNv3gZ5DDDuGirA=\'');
-	
-	echo "\n\nFinished.\n";
-}
-
-
-function oauth_assert_handler ( $file, $line, $code )
-{
-	echo "\nAssertion failed in $file:$line
-   $code\n\n";
-}
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
-- 
cgit v1.0


From 6b15e09a48e16581d1fd8027fd64d9890a031bdb Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Thu, 20 Jun 2024 04:52:22 +0000
Subject: Resolve ""Link zu dieser Veranstaltung kopieren" verwendet einen
 eigenen Mechanismus"

Closes #4329

Merge request studip/studip!3129
---
 .../assets/javascripts/bootstrap/copyable_links.js | 24 ++++------------------
 .../assets/stylesheets/scss/copyable-links.scss    | 24 ----------------------
 resources/assets/stylesheets/studip.scss           |  1 -
 3 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 resources/assets/stylesheets/scss/copyable-links.scss

diff --git a/resources/assets/javascripts/bootstrap/copyable_links.js b/resources/assets/javascripts/bootstrap/copyable_links.js
index 521eae4..b4f6fc6 100644
--- a/resources/assets/javascripts/bootstrap/copyable_links.js
+++ b/resources/assets/javascripts/bootstrap/copyable_links.js
@@ -16,24 +16,8 @@ $(document).on('click', 'a.copyable-link', function (event) {
     document.execCommand('Copy');
     dummy.remove();
 
-    // Show visual hint using a deferred (this way we don't need to
-    // duplicate the functionality in the done() handler)
-    (new Promise((resolve, reject) => {
-        let confirmation = $('<div class="copyable-link-confirmation copyable-link-success">');
-        confirmation.text($gettext('Link wurde kopiert'));
-        confirmation.insertBefore('#content');
-
-        // Resolve deferred when animation has ended or after 2 seconds as a
-        // fail safe
-        let timeout = setTimeout(() => {
-            $(this).parent().off('animationend');
-            resolve(confirmation);
-        }, 1500);
-        $(this).parent().one('animationend', () => {
-            clearTimeout(timeout);
-            resolve(confirmation);
-        });
-    })).then((confirmation, parent) => {
-        confirmation.remove();
-    });
+    STUDIP.eventBus.emit(
+        'push-system-notification',
+        { type: 'success', message: $gettext('Link wurde kopiert') }
+    );
 });
diff --git a/resources/assets/stylesheets/scss/copyable-links.scss b/resources/assets/stylesheets/scss/copyable-links.scss
deleted file mode 100644
index f5ff73a..0000000
--- a/resources/assets/stylesheets/scss/copyable-links.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.copyable-link-confirmation {
-    position: fixed;
-    bottom: 60px;
-    right: 12px;
-    height: 60px;
-    line-height: 60px;
-    max-width: calc(100% - 140px);
-    z-index: 42000;
-    border: solid thin var(--content-color-40);
-    background-color: var(--white);
-    background-repeat: no-repeat;
-    background-position: 1em center;
-    background-size: 100px;
-    box-shadow: 5px 5px var(--dark-gray-color-10);
-    padding: 5px 100px;
-    transition: transform .5s ease;
-
-    &.copyable-link-success {
-        @include background-icon(check-circle, status-green, 24);
-    }
-    &.copyable-link-error {
-        @include background-icon(decline-circle, status-red, 24);
-    }
-}
diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss
index a322400..bf4022a 100644
--- a/resources/assets/stylesheets/studip.scss
+++ b/resources/assets/stylesheets/studip.scss
@@ -32,7 +32,6 @@
 @import "scss/contents";
 @import "scss/content";
 @import "scss/comments";
-@import "scss/copyable-links";
 @import "scss/cronjobs";
 @import "scss/coursewizard";
 @import "scss/css_tree";
-- 
cgit v1.0


From 27ea0ad12b9c47675fe3b763b79dd7465e8657c3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 20 Jun 2024 07:05:33 +0000
Subject: fix notification timer display and removal, fixes #4327

Closes #4327

Merge request studip/studip!3130
---
 resources/assets/javascripts/chunks/vue.js         |   3 +
 .../stylesheets/scss/system-notifications.scss     |   4 +
 resources/vue/components/SystemNotification.vue    | 183 +++++++++++----------
 .../vue/components/SystemNotificationManager.vue   |  57 +++++--
 4 files changed, 146 insertions(+), 101 deletions(-)

diff --git a/resources/assets/javascripts/chunks/vue.js b/resources/assets/javascripts/chunks/vue.js
index b98cc27..8d506a1 100644
--- a/resources/assets/javascripts/chunks/vue.js
+++ b/resources/assets/javascripts/chunks/vue.js
@@ -39,6 +39,9 @@ Vue.mixin({
         globalOn(...args) {
             eventBus.on(...args);
         },
+        globalOff(...args) {
+            eventBus.off(...args);
+        },
         getStudipConfig: store.getters['studip/getConfig']
     },
 });
diff --git a/resources/assets/stylesheets/scss/system-notifications.scss b/resources/assets/stylesheets/scss/system-notifications.scss
index 1da1ec2..34c341b 100644
--- a/resources/assets/stylesheets/scss/system-notifications.scss
+++ b/resources/assets/stylesheets/scss/system-notifications.scss
@@ -122,6 +122,10 @@
         width: 0;
     }
 
+    &.system-notification-disrupted .system-notification-timeout {
+        display: none;
+    }
+
     a:not(.system-notification-message) {
         color: var(--black);
         text-decoration-line: underline;
diff --git a/resources/vue/components/SystemNotification.vue b/resources/vue/components/SystemNotification.vue
index bf804ae..60cefd7 100644
--- a/resources/vue/components/SystemNotification.vue
+++ b/resources/vue/components/SystemNotification.vue
@@ -1,61 +1,70 @@
 <template>
-    <transition name="system-notification-slide" appear>
-        <div v-if="showMe"
-            :class="'system-notification system-notification-' + notification.type"
-            @mouseover="disruptTimeout"
-            @mouseout="initTimeout"
-            @focus="disruptTimeout"
-            @blur="initTimeout">
-            <div class="system-notification-icon">
-                <studip-icon :shape="icon.shape"
-                             :size="48"
-                             :role="icon.color"
-                             alt=""
-                             title=""></studip-icon>
-            </div>
-            <div class="system-notification-content">
-                <p v-html="notification.message"></p>
-                <p class="sr-only" v-if="hasTimeout">
-                    {{ $gettext('Strg+Alt+T hält das automatische Ausblenden der Meldung an bzw. setzt es wieder fort.') }}
-                </p>
-                <details v-if="notification.details?.length > 0"
-                     class="system-notification-details">
-                    <summary>
-                        {{ $gettext('Details') }}
-                    </summary>
-                    <template v-if="Array.isArray(notification.details)">
-                        <p v-for="(detail, index) in notification.details"
-                           :key="index"
-                           v-html="detail"></p>
-                    </template>
-                    <p v-else v-html="notification.details"></p>
-                </details>
-            </div>
-            <button v-if="allowClosing"
-                    class="system-notification-close undecorated"
-                    :title="$gettext('Diese Meldung schließen')"
-                    @click.prevent="destroyMe"
-                    @keydown.space="destroyMe"
-                    tabindex="0">
-                <studip-icon shape="decline"
-                             :size="20"
-                             class="close-system-notification"/>
-            </button>
-            <transition v-if="hasTimeout"
-                        name="system-notification-timeout"
-                        appear>
-                <div v-if="!stopTimeout"
-                     class="system-notification-timeout"
-                     ref="timeout-counter"></div>
-            </transition>
+    <div v-cloak
+         class="system-notification"
+         :class="cssClasses"
+         @mouseover="disruptTimeout"
+         @mouseout="initTimeout"
+         @focus="disruptTimeout"
+         @blur="initTimeout"
+    >
+        <div class="system-notification-icon">
+            <studip-icon :shape="icon.shape"
+                         :size="48"
+                         :role="icon.color"
+                         alt=""
+                         title=""></studip-icon>
         </div>
-    </transition>
+        <div class="system-notification-content">
+            <p v-html="notification.message"></p>
+            <p class="sr-only" v-if="hasTimeout">
+                {{ $gettext('Strg+Alt+T hält das automatische Ausblenden der Meldung an bzw. setzt es wieder fort.') }}
+            </p>
+            <details v-if="notification.details?.length > 0"
+                 class="system-notification-details">
+                <summary>
+                    {{ $gettext('Details') }}
+                </summary>
+                <template v-if="Array.isArray(notification.details)">
+                    <p v-for="(detail, index) in notification.details"
+                       :key="index"
+                       v-html="detail"></p>
+                </template>
+                <p v-else v-html="notification.details"></p>
+            </details>
+        </div>
+        <button v-if="allowClosing"
+                class="system-notification-close undecorated"
+                :title="$gettext('Diese Meldung schließen')"
+                @click.prevent="destroyMe"
+                @keydown.space="destroyMe"
+                tabindex="0">
+            <studip-icon shape="decline"
+                         :size="20"
+                         class="close-system-notification"/>
+        </button>
+        <transition v-if="hasTimeout"
+                    name="system-notification-timeout"
+                    appear
+        >
+            <div v-if="!stopTimeout"
+                 class="system-notification-timeout"
+                 ref="timeout-counter"></div>
+        </transition>
+    </div>
 </template>
 
 <script>
 export default {
     name: 'SystemNotification',
     props: {
+        allowClosing: {
+            type: Boolean,
+            default: true
+        },
+        appendTo: {
+            type: String,
+            default: null
+        },
         notification: {
             type: Object,
             required: true
@@ -63,23 +72,26 @@ export default {
         visibleFor: {
             type: Number,
             default: 5000
-        },
-        appendTo: {
-            type: String,
-            default: null
-        },
-        allowClosing: {
-            type: Boolean,
-            default: true
         }
     },
     data() {
         return {
-            showMe: false,
-            stopTimeout: false
+            stopTimeout: false,
+            timeout: null,
+            windowIsBlurred: false,
         }
     },
     computed: {
+        cssClasses() {
+            const classes = [`system-notification-${this.notification.type}`];
+            if (this.isDisrupted) {
+                classes.push('system-notification-disrupted');
+            }
+            return classes;
+        },
+        hasTimeout() {
+            return !['exception', 'error'].includes(this.notification.type);
+        },
         icon() {
             let iconShape = 'info-circle';
             let iconColor = 'info';
@@ -101,29 +113,28 @@ export default {
                     iconColor = 'status-green';
                     break;
             }
-            return { shape: iconShape, color: iconColor };
+            return {shape: iconShape, color: iconColor};
         },
-        hasTimeout() {
-            return !['exception', 'error'].includes(this.notification.type);
+        isDisrupted() {
+            return this.timeout !== null && this.stopTimeout;
         }
     },
     methods: {
-        initTimeout() {
-            if (this.hasTimeout && this.visibleFor > 0) {
-                this.stopTimeout = false;
-                setTimeout(() => {
-                    if (!this.stopTimeout) {
-                        this.destroyMe();
-                    }
-                }, this.visibleFor);
-            }
+        destroyMe() {
+            this.$emit('destroyMe');
         },
         disruptTimeout() {
             this.stopTimeout = true;
+            clearTimeout(this.timeout);
         },
-        destroyMe() {
-            this.showMe = false;
-            this.$emit('destroyMe');
+        initTimeout() {
+            if (this.hasTimeout && this.visibleFor > 0) {
+                this.stopTimeout = false;
+                this.timeout = setTimeout(
+                    () => this.destroyMe(),
+                    this.visibleFor
+                );
+            }
         }
     },
     mounted() {
@@ -139,18 +150,24 @@ export default {
             }
         }
 
+        this.initTimeout();
+
+        this.globalOn('disrupt-system-notifications', this.disruptTimeout);
+        this.globalOn('resume-system-notifications', this.initTimeout);
+
         if (!STUDIP.config?.PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED) {
             const audio = new Audio(STUDIP.ASSETS_URL + '/sounds/blubb.mp3');
             audio.play();
         }
-        this.showMe = true;
-
-        this.initTimeout();
-        window.addEventListener('keydown', evt => {
-            if (evt.altKey && evt.ctrlKey && evt.code === 'KeyT') {
-                this.stopTimeout ? this.initTimeout() : this.disruptTimeout();
-            }
-        })
+    },
+    destroyed() {
+        this.globalOff('disrupt-system-notifications', this.disruptTimeout);
+        this.globalOff('resume-system-notifications', this.initTimeout);
     }
 }
 </script>
+<style scoped>
+[v-cloak] {
+    display: none;
+}
+</style>
diff --git a/resources/vue/components/SystemNotificationManager.vue b/resources/vue/components/SystemNotificationManager.vue
index 72c4dbf..0acef24 100644
--- a/resources/vue/components/SystemNotificationManager.vue
+++ b/resources/vue/components/SystemNotificationManager.vue
@@ -1,10 +1,16 @@
 <template>
-    <div role="alert"
-         :class="'system-notifications ' + (placement === 'topcenter' ? 'top-center' : 'bottom-right')">
-        <system-notification v-for="(notification, index) in allNotifications"
-                             :key="'message-' + index"
-                             :notification="notification"></system-notification>
-    </div>
+    <transition-group name="system-notification-slide"
+                      :class="'system-notifications ' + (placement === 'topcenter' ? 'top-center' : 'bottom-right')"
+                      tag="div"
+                      role="alert"
+                      appear
+    >
+        <system-notification v-for="notification in allNotifications"
+                             :key="`message-${notification.key}`"
+                             :notification="notification"
+                             @destroyMe="destroyNotification(notification)"
+        ></system-notification>
+    </transition-group>
 </template>
 
 <script>
@@ -14,8 +20,9 @@ export default {
     name: 'SystemNotificationManager',
     components: { SystemNotification },
     props: {
+        appendAllTo: String,
         notifications: {
-            type: Array,
+            type: [Array, Object],
             default: () => []
         },
         placement: {
@@ -24,28 +31,42 @@ export default {
             validator: value => {
                 return ['topcenter', 'bottomright'].includes(value);
             }
-        },
-        appendAllTo: {
-            type: String,
-            default: null
         }
     },
     data() {
         return {
-            allNotifications: this.notifications
+            allNotifications: [],
+            counter: 0,
+            stoppedNotifications: false
         }
     },
     methods: {
-        getNotifications(type) {
-            return this.allNotifications.filter((n) => n.type === type);
-        },
-        destroyNotification(type, index) {
-
+        destroyNotification(notification) {
+            this.allNotifications = this.allNotifications.filter(n => n !== notification);
+        }
+    },
+    created() {
+        if (Array.isArray(this.notifications)) {
+            this.allNotifications = [...this.notifications];
+        } else {
+            this.allNotifications = Object.values(this.notifications);
         }
     },
     mounted() {
         this.globalOn('push-system-notification', notification => {
-            this.allNotifications.push(notification);
+            this.allNotifications.push({
+                key: this.counter++,
+                ...notification
+            });
+        });
+
+        window.addEventListener('keydown', evt => {
+            if (evt.altKey && evt.ctrlKey && evt.code === 'KeyT') {
+                this.stoppedNotifications = !this.stoppedNotifications;
+
+                const event = this.stoppedNotifications ? 'disrupt-system-notifications' : 'resume-system-notifications';
+                this.globalEmit(event);
+            }
         });
     }
 }
-- 
cgit v1.0


From ce6cff5a755f6aa02a4ee6e52ce70a321d0633ac Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 20 Jun 2024 10:35:15 +0200
Subject: revert node 18 back to node 16 for the moment, re #4285

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad7b1d2..cef443d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -139,7 +139,7 @@
                 "webpack-notifier": "^1.15.0"
             },
             "engines": {
-                "node": ">=18"
+                "node": ">=16"
             }
         },
         "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/package.json b/package.json
index 16574bf..3d382e5 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
         "url": "https://develop.studip.de/svn/studip"
     },
     "engines": {
-        "node": ">=18"
+        "node": ">=16"
     },
     "devDependencies": {
         "@axe-core/playwright": "^4.6.1",
-- 
cgit v1.0


From 6ff5f9c2b09a244bbb627eb7ab21d2154ba264c3 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 20 Jun 2024 11:06:40 +0000
Subject: fix usage of fade-out in scss (was migrated incorrectly from less),
 fixes #4332

Closes #4332

Merge request studip/studip!3133
---
 resources/assets/stylesheets/scss/messagebox.scss | 2 +-
 resources/assets/stylesheets/scss/tables.scss     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/assets/stylesheets/scss/messagebox.scss b/resources/assets/stylesheets/scss/messagebox.scss
index a928bb6..7f77f0f 100644
--- a/resources/assets/stylesheets/scss/messagebox.scss
+++ b/resources/assets/stylesheets/scss/messagebox.scss
@@ -72,7 +72,7 @@ div.messagebox_details {
 
 // Define modal messagebox
 .modaloverlay {
-    background: fadeout($base-color, 50%);
+    background: fade-out($base-color, 0.5);
     position: fixed;
     top: 0;
     left: 0;
diff --git a/resources/assets/stylesheets/scss/tables.scss b/resources/assets/stylesheets/scss/tables.scss
index 9e05f01..665a6f3 100644
--- a/resources/assets/stylesheets/scss/tables.scss
+++ b/resources/assets/stylesheets/scss/tables.scss
@@ -504,7 +504,7 @@ table.default {
     > thead {
         > tr > th {
             background-color: var(--content-color-20);
-            border-bottom: 1px solid fadeout($brand-color-lighter, 80%);
+            border-bottom: 1px solid fade-out($brand-color-lighter, 0.8);
             border-top: 1px solid var(--brand-color-darker);
             font-size: 1.0em;
         }
@@ -515,7 +515,7 @@ table.default {
             > th {
                 background-color: var(--content-color-20);
                 border-top: 1px solid var(--brand-color-darker);
-                border-bottom: 1px solid fadeout($brand-color-lighter, 80%);
+                border-bottom: 1px solid fade-out($brand-color-lighter, 0.8);
                 text-align: left;
             }
 
@@ -580,7 +580,7 @@ table.default {
 
     // Hover effect
     &:not(.nohover) > tbody:not(.nohover) > tr:not(.nohover):hover > td:not(.nohover) {
-        background-color: fadeout($light-gray-color, 80%);
+        background-color: fade-out($light-gray-color, 0.8);
     }
 
     &:not(.nohover) > tbody:not(.nohover) > tr.selected:not(.nohover):hover > td:not(.nohover) {
@@ -742,7 +742,7 @@ table.withdetails {
     }
 
     > tbody > tr.open > td {
-        background-color: fadeout($light-gray-color, 80%);
+        background-color: fade-out($light-gray-color, 0.8);
     }
 
     > tbody > tr.open > td:first-child {
-- 
cgit v1.0


From b04a8f60a9750dc4e152a180cb2a0ca1994ec54c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 20 Jun 2024 11:21:38 +0000
Subject: fix typo in oauth2 autorize controller, fixes #4333

Closes #4333

Merge request studip/studip!3134
---
 app/controllers/api/oauth2/authorize.php         | 2 +-
 resources/vue/components/tree/StudipTreeList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index b71f3d1..6387937 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -55,7 +55,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         if ('nobody' === $GLOBALS['user']->id && 'Standard' !== $authPlugin && !Request::option('sso')) {
             $queryParams = $psrRequest->getQueryParams();
             $queryParams['sso'] = strtolower($authPlugin);
-            $this->redirect($this->url_for('api/oaut2/authorize', $queryParams));
+            $this->redirect($this->url_for('api/oauth2/authorize', $queryParams));
 
             return;
         } else {
diff --git a/resources/vue/components/tree/StudipTreeList.vue b/resources/vue/components/tree/StudipTreeList.vue
index 2ab489c..a9b2f1a 100644
--- a/resources/vue/components/tree/StudipTreeList.vue
+++ b/resources/vue/components/tree/StudipTreeList.vue
@@ -92,7 +92,7 @@
                 <tr v-for="(course) in courses" :key="course.id" class="studip-tree-child studip-tree-course">
                     <td>
                         <a :href="courseUrl(course.id)" tabindex="0"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ title }'),
+                           :title="$gettextInterpolate($gettext('fZur Veranstaltung %{ title }'),
                                 { title: course.attributes.title })">
                             <studip-icon shape="seminar" :size="26"></studip-icon>
                             <template v-if="course.attributes['course-number']">
-- 
cgit v1.0


From e84d398fb21acc5be3ea296e9284d88496c29563 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 20 Jun 2024 13:23:55 +0200
Subject: Revert "fix typo in oauth2 autorize controller, fixes #4333"

This reverts commit b04a8f60a9750dc4e152a180cb2a0ca1994ec54c.
---
 app/controllers/api/oauth2/authorize.php         | 2 +-
 resources/vue/components/tree/StudipTreeList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index 6387937..b71f3d1 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -55,7 +55,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         if ('nobody' === $GLOBALS['user']->id && 'Standard' !== $authPlugin && !Request::option('sso')) {
             $queryParams = $psrRequest->getQueryParams();
             $queryParams['sso'] = strtolower($authPlugin);
-            $this->redirect($this->url_for('api/oauth2/authorize', $queryParams));
+            $this->redirect($this->url_for('api/oaut2/authorize', $queryParams));
 
             return;
         } else {
diff --git a/resources/vue/components/tree/StudipTreeList.vue b/resources/vue/components/tree/StudipTreeList.vue
index a9b2f1a..2ab489c 100644
--- a/resources/vue/components/tree/StudipTreeList.vue
+++ b/resources/vue/components/tree/StudipTreeList.vue
@@ -92,7 +92,7 @@
                 <tr v-for="(course) in courses" :key="course.id" class="studip-tree-child studip-tree-course">
                     <td>
                         <a :href="courseUrl(course.id)" tabindex="0"
-                           :title="$gettextInterpolate($gettext('fZur Veranstaltung %{ title }'),
+                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ title }'),
                                 { title: course.attributes.title })">
                             <studip-icon shape="seminar" :size="26"></studip-icon>
                             <template v-if="course.attributes['course-number']">
-- 
cgit v1.0


From 8554cfba3de68a4242ea574bd9c4e980ac6cff20 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 20 Jun 2024 13:24:24 +0200
Subject: fix typo in oauth2 autorize controller, fixes #4333

---
 app/controllers/api/oauth2/authorize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/oauth2/authorize.php b/app/controllers/api/oauth2/authorize.php
index b71f3d1..6387937 100644
--- a/app/controllers/api/oauth2/authorize.php
+++ b/app/controllers/api/oauth2/authorize.php
@@ -55,7 +55,7 @@ class Api_Oauth2_AuthorizeController extends OAuth2Controller
         if ('nobody' === $GLOBALS['user']->id && 'Standard' !== $authPlugin && !Request::option('sso')) {
             $queryParams = $psrRequest->getQueryParams();
             $queryParams['sso'] = strtolower($authPlugin);
-            $this->redirect($this->url_for('api/oaut2/authorize', $queryParams));
+            $this->redirect($this->url_for('api/oauth2/authorize', $queryParams));
 
             return;
         } else {
-- 
cgit v1.0


From 1504f1d4bbda6d329152dea6a757fe17fe38acbb Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 20 Jun 2024 12:27:18 +0000
Subject: don't html escape title attributes in vue, fixes #3050

Closes #3050

Merge request studip/studip!3135
---
 resources/vue/components/ActiveFilter.vue                    |  2 +-
 resources/vue/components/AdminCourses.vue                    |  2 +-
 resources/vue/components/ContentModulesControl.vue           |  2 +-
 resources/vue/components/ContentModulesEditTiles.vue         |  9 ++++++---
 resources/vue/components/ContentmodulesEditTable.vue         |  8 +++++---
 resources/vue/components/EditableList.vue                    |  2 +-
 resources/vue/components/FilesTable.vue                      | 12 ++++++------
 .../components/courseware/CoursewareContentPermissions.vue   |  6 +++---
 .../courseware/tasks/CoursewareTasksDialogDistribute.vue     |  4 ++--
 .../courseware/tasks/TaskGroupsAddSolversDialog.vue          |  4 ++--
 .../vue/components/courseware/unit/CoursewareUnitItem.vue    |  2 +-
 .../components/courseware/unit/CoursewareUnitProgress.vue    |  2 +-
 .../vue/components/form_inputs/CalendarPermissionsTable.vue  |  6 ++++--
 .../vue/components/form_inputs/MyCoursesColouredTable.vue    |  2 +-
 resources/vue/components/questionnaires/InputArray.vue       |  6 +++---
 resources/vue/components/tree/StudipTreeList.vue             | 11 +++++++----
 resources/vue/components/tree/StudipTreeTable.vue            | 11 +++++++----
 resources/vue/components/tree/TreeBreadcrumb.vue             |  2 +-
 resources/vue/components/tree/TreeCourseDetails.vue          |  2 +-
 resources/vue/components/tree/TreeNodeTile.vue               |  2 +-
 resources/vue/components/tree/TreeSearchResult.vue           |  2 +-
 21 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/resources/vue/components/ActiveFilter.vue b/resources/vue/components/ActiveFilter.vue
index d4654fa..5394bce 100644
--- a/resources/vue/components/ActiveFilter.vue
+++ b/resources/vue/components/ActiveFilter.vue
@@ -4,7 +4,7 @@
         <button
             @click="onRemoveActiveFilter"
             type="button"
-            :title="$gettextInterpolate($gettext('Filter \'%{name}\' entfernen'), { name })"
+            :title="$gettextInterpolate($gettext('Filter \'%{name}\' entfernen'), { name }, true)"
         >
             <StudipIcon class="text-bottom" shape="decline" role="presentation" alt="" />
         </button>
diff --git a/resources/vue/components/AdminCourses.vue b/resources/vue/components/AdminCourses.vue
index 23f9375..d24a900 100644
--- a/resources/vue/components/AdminCourses.vue
+++ b/resources/vue/components/AdminCourses.vue
@@ -23,7 +23,7 @@
                 <th v-for="activeField in sortedActivatedFields" :key="`field-${activeField}`" :class="sort.by === activeField ? 'sort' + sort.direction.toLowerCase() : ''">
                     <a href="#"
                        @click.prevent="changeSort(activeField)"
-                       :title="sort.by === activeField && sort.direction === 'ASC' ? $gettextInterpolate('Sortiert aufsteigend nach %{field}', {field: fields[activeField]}) : (sort.by === activeField && sort.direction === 'DESC' ? $gettextInterpolate('Sortiert absteigend nach %{ field } ', { field: fields[activeField]}) : $gettextInterpolate('Sortieren nach %{ field }', { field: fields[activeField]}))"
+                       :title="sort.by === activeField && sort.direction === 'ASC' ? $gettextInterpolate('Sortiert aufsteigend nach %{field}', {field: fields[activeField]}, true) : (sort.by === activeField && sort.direction === 'DESC' ? $gettextInterpolate('Sortiert absteigend nach %{ field } ', { field: fields[activeField]}, true) : $gettextInterpolate('Sortieren nach %{ field }', { field: fields[activeField]}, true))"
                        v-if="!unsortableFields.includes(activeField)"
                     >
                         {{ fields[activeField] }}
diff --git a/resources/vue/components/ContentModulesControl.vue b/resources/vue/components/ContentModulesControl.vue
index f403bdd..34f4125 100644
--- a/resources/vue/components/ContentModulesControl.vue
+++ b/resources/vue/components/ContentModulesControl.vue
@@ -15,7 +15,7 @@
                @click.prevent="toggleModuleVisibility(module)">
                 <studip-icon :shape="module.visibility !== 'tutor' ? 'visibility-visible' : 'visibility-invisible'"
                              class="text-bottom"
-                             :title="$gettextInterpolate($gettext('Inhaltsmodul %{ name } für Teilnehmende unsichtbar bzw. sichtbar schalten'), { name: module.displayname})"></studip-icon>
+                             :title="$gettextInterpolate($gettext('Inhaltsmodul %{ name } für Teilnehmende unsichtbar bzw. sichtbar schalten'), { name: module.displayname}, true)"></studip-icon>
             </a>
         </div>
     </div>
diff --git a/resources/vue/components/ContentModulesEditTiles.vue b/resources/vue/components/ContentModulesEditTiles.vue
index 383c6ab..7407632 100644
--- a/resources/vue/components/ContentModulesEditTiles.vue
+++ b/resources/vue/components/ContentModulesEditTiles.vue
@@ -35,7 +35,8 @@
                                             $gettext(
                                                 'Sortierelement für Werkzeug %{module}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'
                                             ),
-                                            { module: module.displayname }
+                                            { module: module.displayname },
+                                            true
                                         )
                                     "
                                     @keydown="keyboardHandler($event, module)"
@@ -76,7 +77,8 @@
                                                 $gettext(
                                                     'Inhaltsmodul %{ name } für Teilnehmende unsichtbar bzw. sichtbar schalten'
                                                 ),
-                                                { name: module.displayname }
+                                                { name: module.displayname },
+                                                true
                                             )
                                         "
                                     ></studip-icon>
@@ -90,7 +92,8 @@
                                                 $gettext(
                                                     'Umbenennen des Inhaltsmoduls %{ name }'
                                                 ),
-                                                { name: module.displayname }
+                                                { name: module.displayname },
+                                                true
                                             )
                                         "
                                     ></studip-icon>
diff --git a/resources/vue/components/ContentmodulesEditTable.vue b/resources/vue/components/ContentmodulesEditTable.vue
index 8724a24..0a8a0aa 100644
--- a/resources/vue/components/ContentmodulesEditTable.vue
+++ b/resources/vue/components/ContentmodulesEditTable.vue
@@ -25,7 +25,8 @@
                                 $gettext(
                                     'Sortierelement für Module %{module}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'
                                 ),
-                                { module: module.displayname }
+                                { module: module.displayname },
+                                true
                             )
                         "
                         @keydown="keyboardHandler($event, module)"
@@ -71,7 +72,8 @@
                                     $gettext(
                                         'Inhaltsmodul %{ name } für Teilnehmende unsichtbar bzw. sichtbar schalten'
                                     ),
-                                    { name: module.displayname }
+                                    { name: module.displayname },
+                                    true
                                 )
                             "
                         ></studip-icon>
@@ -83,7 +85,7 @@
                             :title="
                                 $gettextInterpolate($gettext('Umbenennen des Inhaltsmoduls %{ name }'), {
                                     name: module.displayname,
-                                })
+                                }, true)
                             "
                         ></studip-icon>
                     </a>
diff --git a/resources/vue/components/EditableList.vue b/resources/vue/components/EditableList.vue
index cf1716b..39c32ac 100644
--- a/resources/vue/components/EditableList.vue
+++ b/resources/vue/components/EditableList.vue
@@ -12,7 +12,7 @@
                     <studip-icon v-if="item.icon" :shape="item.icon" role="info" :size="20" class="text-bottom" alt=""></studip-icon>
                     <input v-if="name" type="hidden" :name="name + '[]'" :value="item.value">
                     <span>{{item.name}}</span>
-                    <button v-if="item.deletable" @click.prevent="deleteItem(item)" :title="$gettextInterpolate($gettext('%{ name } löschen'), {name: item.name})" class="undecorated">
+                    <button v-if="item.deletable" @click.prevent="deleteItem(item)" :title="$gettextInterpolate($gettext('%{ name } löschen'), {name: item.name}, true)" class="undecorated">
                         <studip-icon shape="trash" role="clickable" :size="20" class="text-bottom"></studip-icon>
                     </button>
                 </li>
diff --git a/resources/vue/components/FilesTable.vue b/resources/vue/components/FilesTable.vue
index 0c9dbda..1e19cc9 100644
--- a/resources/vue/components/FilesTable.vue
+++ b/resources/vue/components/FilesTable.vue
@@ -132,7 +132,7 @@
                     >
                         <a href="#"
                            @click.prevent
-                           :title="$gettextInterpolate($gettext('Nach %{ colName } sortieren'), {colName: name})">
+                           :title="$gettextInterpolate($gettext('Nach %{ colName } sortieren'), {colName: name}, true)">
                             {{name}}
                         </a>
                     </th>
@@ -170,14 +170,14 @@
                         <a :href="folder.url"
                            :id="`folder-${folder.id}`"
                            :title="$gettextInterpolate($gettext('Ordner %{foldername} öffnen'),
-                           { foldername: folder.name})">
+                           { foldername: folder.name}, true)">
                             <studip-icon :shape="folder.icon" :size="26" class="text-bottom" alt=""></studip-icon>
                         </a>
                     </td>
                     <td :class="{'filter-match': valueMatchesFilter(folder.name)}">
                         <a :href="folder.url"
                            :title="$gettextInterpolate($gettext('Ordner %{foldername} öffnen'),
-                           { foldername: folder.name})">
+                           { foldername: folder.name}, true)">
                             <span v-html="highlightString(folder.name)"></span>
                         </a>
                     </td>
@@ -228,7 +228,7 @@
                            :href="file.download_url"
                            target="_blank" rel="noopener noreferrer"
                            :title="$gettextInterpolate($gettext('Datei %{filename} herunterladen'),
-                            { filename: file.name })">
+                            { filename: file.name }, true)">
                             <studip-icon :shape="file.icon" :size="24" class="text-bottom"></studip-icon>
                         </a>
                         <studip-icon v-else :shape="file.icon" :size="24"></studip-icon>
@@ -238,14 +238,14 @@
                            class="lightbox-image"
                            data-lightbox="gallery"
                            :title="$gettextInterpolate($gettext('Datei %{filename} anzeigen'),
-                            { filename: file.name })"></a>
+                            { filename: file.name }, true)"></a>
                     </td>
                     <td :class="{'filter-match': valueMatchesFilter(file.name)}">
                         <a :href="file.details_url"
                            data-dialog
                            :id="`file-${file.id}`"
                            :title="$gettextInterpolate($gettext('Details zur Datei %{filename} anzeigen'),
-                            { filename: file.name })">
+                            { filename: file.name }, true)">
                             <span v-html="highlightString(file.name)"></span>
                             <studip-icon v-if="file.isAccessible"
                                          shape="accessibility"
diff --git a/resources/vue/components/courseware/CoursewareContentPermissions.vue b/resources/vue/components/courseware/CoursewareContentPermissions.vue
index d2412ef..60f0964 100644
--- a/resources/vue/components/courseware/CoursewareContentPermissions.vue
+++ b/resources/vue/components/courseware/CoursewareContentPermissions.vue
@@ -42,7 +42,7 @@
                     <td class="perm">
                         <input
                             class="right"
-                            :title="$gettextInterpolate($gettext('Leserechte für %{ userName }'), { userName: user_perm.username })"
+                            :title="$gettextInterpolate($gettext('Leserechte für %{ userName }'), { userName: user_perm.username }, true)"
                             type="radio"
                             :name="`${user_perm.id}_right`"
                             value="read"
@@ -53,7 +53,7 @@
                     <td class="perm">
                         <input
                             class="right"
-                            :title="$gettextInterpolate($gettext('Lese- und Schreibrechte für %{ userName }'), { userName: user_perm.username })"
+                            :title="$gettextInterpolate($gettext('Lese- und Schreibrechte für %{ userName }'), { userName: user_perm.username }, true)"
                             type="radio"
                             :name="`${user_perm.id}_right`"
                             value="write"
@@ -75,7 +75,7 @@
                     <td class="actions">
                         <button
                             class="cw-permission-delete"
-                            :title="$gettextInterpolate($gettext('Entfernen der Rechte von %{ userName }'), { userName: user_perm.username })"
+                            :title="$gettextInterpolate($gettext('Entfernen der Rechte von %{ userName }'), { userName: user_perm.username }, true)"
                             @click.prevent="confirmDeleteUserPerm(index)"
                         >
                         </button>
diff --git a/resources/vue/components/courseware/tasks/CoursewareTasksDialogDistribute.vue b/resources/vue/components/courseware/tasks/CoursewareTasksDialogDistribute.vue
index 1e076c7..7680167 100644
--- a/resources/vue/components/courseware/tasks/CoursewareTasksDialogDistribute.vue
+++ b/resources/vue/components/courseware/tasks/CoursewareTasksDialogDistribute.vue
@@ -179,7 +179,7 @@
                                         :aria-label="
                                             $gettextInterpolate($gettext('%{userName} auswählen'), {
                                                 userName: user.formattedname,
-                                            })
+                                            }, true)
                                         "
                                     />
                                 </td>
@@ -217,7 +217,7 @@
                                         :aria-label="
                                             $gettextInterpolate($gettext('%{groupName} auswählen'), {
                                                 groupName: group.name,
-                                            })
+                                            }, true)
                                         "
                                     />
                                 </td>
diff --git a/resources/vue/components/courseware/tasks/TaskGroupsAddSolversDialog.vue b/resources/vue/components/courseware/tasks/TaskGroupsAddSolversDialog.vue
index a843341..d7db6e1 100644
--- a/resources/vue/components/courseware/tasks/TaskGroupsAddSolversDialog.vue
+++ b/resources/vue/components/courseware/tasks/TaskGroupsAddSolversDialog.vue
@@ -44,7 +44,7 @@
                                         :aria-label="
                                             $gettextInterpolate($gettext('%{userName} auswählen'), {
                                                 userName: user.formattedname,
-                                            })
+                                            }, true)
                                         "
                                     />
                                 </td>
@@ -77,7 +77,7 @@
                                         :aria-label="
                                             $gettextInterpolate($gettext('%{groupName} auswählen'), {
                                                 groupName: group.name,
-                                            })
+                                            }, true)
                                         "
                                     />
                                 </td>
diff --git a/resources/vue/components/courseware/unit/CoursewareUnitItem.vue b/resources/vue/components/courseware/unit/CoursewareUnitItem.vue
index f09601e..dc68225 100644
--- a/resources/vue/components/courseware/unit/CoursewareUnitItem.vue
+++ b/resources/vue/components/courseware/unit/CoursewareUnitItem.vue
@@ -63,7 +63,7 @@
             :question="
                 $gettextInterpolate($gettext('Möchten Sie das Lernmaterial %{ unitTitle } wirklich löschen?'), {
                     unitTitle: title,
-                })
+                }, true)
             "
             height="200"
             @confirm="executeDelete"
diff --git a/resources/vue/components/courseware/unit/CoursewareUnitProgress.vue b/resources/vue/components/courseware/unit/CoursewareUnitProgress.vue
index 7c9de01..31c6c01 100644
--- a/resources/vue/components/courseware/unit/CoursewareUnitProgress.vue
+++ b/resources/vue/components/courseware/unit/CoursewareUnitProgress.vue
@@ -17,7 +17,7 @@
             <h1>
                 <a
                     :href="chapterUrl"
-                    :title="$gettextInterpolate('%{ pageTitle } öffnen', { pageTitle: selected.name })"
+                    :title="$gettextInterpolate('%{ pageTitle } öffnen', { pageTitle: selected.name }, true)"
                 >
                     {{ selected.name }}
                 </a>
diff --git a/resources/vue/components/form_inputs/CalendarPermissionsTable.vue b/resources/vue/components/form_inputs/CalendarPermissionsTable.vue
index a0a76a2..e507adc 100644
--- a/resources/vue/components/form_inputs/CalendarPermissionsTable.vue
+++ b/resources/vue/components/form_inputs/CalendarPermissionsTable.vue
@@ -30,14 +30,16 @@
                                v-model="user.write_permissions"
                                :aria-label="$gettextInterpolate(
                                    $gettext('Schreibzugriff für %{name}'),
-                                   {name: user.name}
+                                   {name: user.name},
+                                   true
                                )">
                     </td>
                     <td class="actions">
                         <studip-icon shape="trash" aria-role="button" @click="removeContact(user.id)"
                                      :title="$gettextInterpolate(
                                          $gettext('Kalender nicht mehr mit %{name} teilen'),
-                                         {name: user.name}
+                                         {name: user.name},
+                                         true
                                      )"></studip-icon>
                     </td>
                 </tr>
diff --git a/resources/vue/components/form_inputs/MyCoursesColouredTable.vue b/resources/vue/components/form_inputs/MyCoursesColouredTable.vue
index d2cc2f1..fe67db5 100644
--- a/resources/vue/components/form_inputs/MyCoursesColouredTable.vue
+++ b/resources/vue/components/form_inputs/MyCoursesColouredTable.vue
@@ -42,7 +42,7 @@
                         <input type="hidden" :name="`${name}_course_ids[${course.id}]`" value="0">
                         <input type="checkbox" :name="`${name}_course_ids[${course.id}]`"
                                value="1" :checked="selected_course_id_list.includes(course.id)"
-                               :title="$gettextInterpolate($gettext('%{course} auswählen'), {course: course.name})">
+                               :title="$gettextInterpolate($gettext('%{course} auswählen'), {course: course.name}, true)">
                     </td>
                 </tr>
                 <tr v-if="loadedSemesters.includes(semester_id) && courses.length === 0">
diff --git a/resources/vue/components/questionnaires/InputArray.vue b/resources/vue/components/questionnaires/InputArray.vue
index f57ca58..896418f 100644
--- a/resources/vue/components/questionnaires/InputArray.vue
+++ b/resources/vue/components/questionnaires/InputArray.vue
@@ -22,7 +22,7 @@
                     <td class="dragcolumn">
                         <a class="dragarea"
                            tabindex="0"
-                           :title="$gettextInterpolate($gettext(`Sortierelement für %{label} %{option}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.`), {option, label})"
+                           :title="$gettextInterpolate($gettext(`Sortierelement für %{label} %{option}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.`), {option, label}, true)"
                            @keydown="keyHandler($event, index)"
                            ref="draghandle">
                             <span class="drag-handle"></span>
@@ -41,7 +41,7 @@
                                      shape="trash"
                                      :size="20"
                                      @click.prevent="deleteOption(index)"
-                                     :title="$gettextInterpolate($gettext('%{label} löschen'), {label})"
+                                     :title="$gettextInterpolate($gettext('%{label} löschen'), {label}, true)"
                         />
                     </td>
                 </tr>
@@ -50,7 +50,7 @@
                 <tr>
                     <td :colspan="3 + additionalColspan">
                         <button class="as-link"
-                                :title="$gettextInterpolate($gettext('%{label} hinzufügen'),  {label})"
+                                :title="$gettextInterpolate($gettext('%{label} hinzufügen'),  {label}, true)"
                                 @click.prevent="addOption()">
                             <StudipIcon shape="add" :size="20" alt="" />
                         </button>
diff --git a/resources/vue/components/tree/StudipTreeList.vue b/resources/vue/components/tree/StudipTreeList.vue
index 2ab489c..6214234 100644
--- a/resources/vue/components/tree/StudipTreeList.vue
+++ b/resources/vue/components/tree/StudipTreeList.vue
@@ -15,7 +15,7 @@
                 <a v-if="editable && currentNode.attributes.id !== 'root'"
                    :href="editUrl + '/' + currentNode.attributes.id"
                    @click.prevent="editNode(editUrl, currentNode.id)" data-dialog="size=medium"
-                   :title="$gettextInterpolate($gettext('%{name} bearbeiten'), {name: currentNode.attributes.name})">
+                   :title="$gettextInterpolate($gettext('%{name} bearbeiten'), {name: currentNode.attributes.name}, true)">
                     <studip-icon shape="edit" :size="20"></studip-icon>
                 </a>
 
@@ -36,7 +36,7 @@
                 <li v-for="(child, index) in children" :key="index" class="studip-tree-child">
                     <a v-if="editable && children.length > 1" class="drag-link"
                        tabindex="0"
-                       :title="$gettextInterpolate($gettext('Sortierelement für Element %{node}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'), {node: child.attributes.name})"
+                       :title="$gettextInterpolate($gettext('Sortierelement für Element %{node}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'), {node: child.attributes.name}, true)"
                        @keydown="keyHandler($event, index)"
                        :ref="'draghandle-' + index">
                         <span class="drag-handle"></span>
@@ -92,8 +92,11 @@
                 <tr v-for="(course) in courses" :key="course.id" class="studip-tree-child studip-tree-course">
                     <td>
                         <a :href="courseUrl(course.id)" tabindex="0"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ title }'),
-                                { title: course.attributes.title })">
+                           :title="$gettextInterpolate(
+                               $gettext('Zur Veranstaltung %{ title }'),
+                               { title: course.attributes.title },
+                               true
+                           )">
                             <studip-icon shape="seminar" :size="26"></studip-icon>
                             <template v-if="course.attributes['course-number']">
                                 {{ course.attributes['course-number'] }}
diff --git a/resources/vue/components/tree/StudipTreeTable.vue b/resources/vue/components/tree/StudipTreeTable.vue
index 4cfa7d5..093dd9c 100644
--- a/resources/vue/components/tree/StudipTreeTable.vue
+++ b/resources/vue/components/tree/StudipTreeTable.vue
@@ -79,7 +79,7 @@
                     <td>
                         <a v-if="editable && children.length > 1" class="drag-link" role="option"
                            tabindex="0"
-                           :title="$gettextInterpolate($gettext('Sortierelement für Element %{node}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'), {node: child.attributes.name})"
+                           :title="$gettextInterpolate($gettext('Sortierelement für Element %{node}. Drücken Sie die Tasten Pfeil-nach-oben oder Pfeil-nach-unten, um dieses Element in der Liste zu verschieben.'), {node: child.attributes.name}, true)"
                            @keydown="keyHandler($event, index)"
                            :ref="'draghandle-' + index">
                             <span class="drag-handle"></span>
@@ -93,7 +93,7 @@
                         <a :href="nodeUrl(child.id, semester !== 'all' ? semester : null)" tabindex="0"
                            @click.prevent="openNode(child)"
                            :title="$gettextInterpolate($gettext('Unterebene %{ node } öffnen'),
-                                { node: node.attributes.name })">
+                                { node: node.attributes.name }, true)">
                             {{ child.attributes.name }}
                         </a>
                     </td>
@@ -112,8 +112,11 @@
                     </td>
                     <td>
                         <a :href="courseUrl(course.id)" tabindex="0"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{ title }'),
-                                { title: course.attributes.title })">
+                           :title="$gettextInterpolate(
+                               $gettext('Zur Veranstaltung %{ title }'),
+                               { title: course.attributes.title },
+                               true
+                           )">
                             <template v-if="course.attributes['course-number']">
                                 {{ course.attributes['course-number'] }}
                             </template>
diff --git a/resources/vue/components/tree/TreeBreadcrumb.vue b/resources/vue/components/tree/TreeBreadcrumb.vue
index 33b04b3..a8c3dd5 100644
--- a/resources/vue/components/tree/TreeBreadcrumb.vue
+++ b/resources/vue/components/tree/TreeBreadcrumb.vue
@@ -10,7 +10,7 @@
                     <a :href="nodeUrl(ancestor.classname + '_' + ancestor.id)" :ref="ancestor.id"
                        @click.prevent="openNode(ancestor.id, ancestor.classname)" tabindex="0"
                        :id="'tree-breadcrumb-' + ancestor.id"
-                       :title="$gettextInterpolate($gettext('%{ node } öffnen'), { node: ancestor.name})">
+                       :title="$gettextInterpolate($gettext('%{ node } öffnen'), { node: ancestor.name}, true)">
                         {{ ancestor.name }}
                     </a>
                     <template v-if="index !== node.attributes.ancestors.length - 1">
diff --git a/resources/vue/components/tree/TreeCourseDetails.vue b/resources/vue/components/tree/TreeCourseDetails.vue
index 6f3e056..020cc33 100644
--- a/resources/vue/components/tree/TreeCourseDetails.vue
+++ b/resources/vue/components/tree/TreeCourseDetails.vue
@@ -12,7 +12,7 @@
             <span v-for="(lecturer, index) in details.lecturers" :key="index">
                 <a :href="profileUrl(lecturer.username)"
                    :title="$gettextInterpolate($gettext('Zum Profil von %{ user }'),
-                        { user: lecturer.name })"
+                        { user: lecturer.name }, true)"
                    tabindex="0">
                     {{ lecturer.name }}
                 </a><template v-if="details.lecturers.length > 1 && index < details.lecturers.length - 1">, </template>
diff --git a/resources/vue/components/tree/TreeNodeTile.vue b/resources/vue/components/tree/TreeNodeTile.vue
index dab2bdf..698cc25 100644
--- a/resources/vue/components/tree/TreeNodeTile.vue
+++ b/resources/vue/components/tree/TreeNodeTile.vue
@@ -1,6 +1,6 @@
 <template>
     <a :href="url" @click.prevent="openNode" :title="$gettextInterpolate($gettext('Unterebene %{ node } öffnen'),
-                                { node: node.attributes.name })">
+                                { node: node.attributes.name }, true)">
         <p class="studip-tree-child-title">
             {{ node.attributes.name }}
         </p>
diff --git a/resources/vue/components/tree/TreeSearchResult.vue b/resources/vue/components/tree/TreeSearchResult.vue
index 1943dd3..9799dae 100644
--- a/resources/vue/components/tree/TreeSearchResult.vue
+++ b/resources/vue/components/tree/TreeSearchResult.vue
@@ -31,7 +31,7 @@
                     </td>
                     <td>
                         <a :href="courseUrl(course.id)"
-                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{title}'), {title: course.attributes.title})"
+                           :title="$gettextInterpolate($gettext('Zur Veranstaltung %{title}'), {title: course.attributes.title}, true)"
                            tabindex="0">
                             <template v-if="course.attributes['course-number']">
                                 {{ course.attributes['course-number'] }}
-- 
cgit v1.0


From adb602328765057a42269bd1771d4a4b63c708bf Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 21 Jun 2024 07:09:25 +0000
Subject: use correct variable name for assigned groups when editting a course
 date, fixes #4334

Closes #4334

Merge request studip/studip!3138
---
 app/views/course/timesrooms/editDate.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/views/course/timesrooms/editDate.php b/app/views/course/timesrooms/editDate.php
index c4c1495..3fbae99 100644
--- a/app/views/course/timesrooms/editDate.php
+++ b/app/views/course/timesrooms/editDate.php
@@ -1,3 +1,18 @@
+<?php
+/**
+ * @var Course_TimesroomsController $controller
+ * @var CourseDate $date
+ * @var Room[] $selectable_rooms
+ * @var QuickSearch|null $room_search
+ * @var bool $only_bookable_rooms
+ * @var int $preparation_time
+ * @var int $max_preparation_time
+ * @var CourseMember[] $teachers
+ * @var User[] $assigned_teachers
+ * @var Statusgruppen[] $groups
+ * @var Statusgruppen[] $assigned_groups
+ */
+?>
 <form action="<?= $controller->link_for('course/timesrooms/saveDate/' . $date->termin_id) ?>"
       method="post" class="default collapsable" <?= Request::int('fromDialog') ? 'data-dialog="size=big"' : '' ?>>
     <?= CSRFProtection::tokenTag() ?>
@@ -177,7 +192,7 @@
                 <ul>
                     <? foreach ($assigned_groups as $group) : ?>
                         <li data-selection-id="<?= htmlReady($group->id) ?>">
-                            <input type="hidden" name="assigned_groups[]"
+                            <input type="hidden" name="assigned-groups[]"
                                    value="<?= htmlReady($group->id) ?>">
 
                             <span class="studip-selection-label">
-- 
cgit v1.0


From 42ab8494bf96201bfaed755931b251da5411aa41 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Fri, 21 Jun 2024 09:03:33 +0000
Subject: Resolve "Fehlermeldung in Veranstaltungen mit Anmeldeset"

Closes #4336

Merge request studip/studip!3139
---
 lib/admissionrules/preferentialadmission/PreferentialAdmission.php | 3 ---
 lib/admissionrules/termsadmission/TermsAdmission.php               | 2 --
 2 files changed, 5 deletions(-)

diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
index bee3e19..9c90f69 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
@@ -15,9 +15,6 @@
  * @category    Stud.IP
  */
 
-require_once('lib/classes/admission/AdmissionRule.class.php');
-require_once('lib/classes/admission/UserFilter.class.php');
-
 class PreferentialAdmission extends AdmissionRule
 {
     // --- ATTRIBUTES ---
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.php b/lib/admissionrules/termsadmission/TermsAdmission.php
index 50c8712..1d421ad 100644
--- a/lib/admissionrules/termsadmission/TermsAdmission.php
+++ b/lib/admissionrules/termsadmission/TermsAdmission.php
@@ -14,8 +14,6 @@
  * @category    Stud.IP
  */
 
-require_once 'lib/classes/admission/AdmissionRule.class.php';
-
 class TermsAdmission extends AdmissionRule
 {
     // Terms of admission
-- 
cgit v1.0


From 7635e34c038e86e2b369b3f6edc457042ffa5b66 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 21 Jun 2024 09:27:24 +0000
Subject: add missing render function, fixes #4337

Closes #4337

Merge request studip/studip!3140
---
 resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue | 3 +++
 .../vue/components/courseware/layouts/CoursewareCompanionOverlay.vue   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue b/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue
index c40edd1..f26c8d7 100644
--- a/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareCompanionBox.vue
@@ -1,6 +1,9 @@
 <script>
 export default {
     name: 'courseware-companion-box',
+    render(createElement) {
+        return null;
+    },
     props: {
         msgCompanion: String,
         mood: {
diff --git a/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue b/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue
index a45da11..bfd0a93 100644
--- a/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareCompanionOverlay.vue
@@ -3,6 +3,9 @@ import { mapActions, mapGetters } from 'vuex';
 
 export default {
     name: 'courseware-companion-overlay',
+    render(createElement) {
+        return null;
+    },
     computed: {
         ...mapGetters({
             showCompanion: 'showCompanionOverlay',
-- 
cgit v1.0


From b1f13ce8299d581ccb889e2d98e13574bffcc5ba Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 21 Jun 2024 09:29:24 +0000
Subject: add remaining class filename and add migration to fix the cronjobs,
 re #4282

Merge request studip/studip!3136
---
 app/controllers/loncapa.php                        |  4 +-
 app/controllers/quicksearch.php                    |  2 +-
 cli/Commands/CleanupAdmissionRules.php             |  2 +-
 cli/Commands/Plugins/PluginInfo.php                |  4 +-
 composer.json                                      |  1 -
 config/config_develop.inc.php                      |  2 +-
 db/migrations/1.128_step00240_coursesets.php       |  2 +-
 db/migrations/1.12_step_120_userpic.php            |  2 +-
 db/migrations/6.0.11_adjust_cronjobs.php           | 43 ++++++++++++++++++++++
 .../conditionaladmission/ConditionalAdmission.php  |  2 +-
 .../CourseMemberAdmission.php                      |  2 +-
 .../limitedadmission/LimitedAdmission.php          |  2 +-
 .../lockedadmission/LockedAdmission.php            |  2 +-
 .../ParticipantRestrictedAdmission.php             |  2 +-
 .../passwordadmission/PasswordAdmission.php        |  2 +-
 .../PreferentialAdmission.php                      |  2 +-
 .../termsadmission/TermsAdmission.php              |  2 +-
 .../timedadmission/TimedAdmission.php              |  2 +-
 lib/calendar/CalendarColumn.php                    |  2 +-
 lib/calendar/CalendarView.php                      |  2 +-
 lib/calendar/CalendarWeekView.php                  |  2 +-
 lib/classes/ActionMenu.php                         |  2 +-
 lib/classes/Assets.php                             |  2 +-
 lib/classes/AuthorObject.php                       |  5 +--
 lib/classes/AutoInsert.php                         |  2 +-
 lib/classes/Color.php                              |  4 +-
 lib/classes/Config.php                             |  2 +-
 lib/classes/CourseConfig.php                       |  2 +-
 lib/classes/CronJob.php                            |  2 +-
 lib/classes/CronjobScheduler.php                   |  2 +-
 lib/classes/DataFieldEntry.php                     |  2 +-
 lib/classes/DatabaseObject.php                     |  4 +-
 lib/classes/DateFormatter.php                      |  2 +-
 lib/classes/DbSnapshot.php                         |  2 +-
 lib/classes/DbView.php                             |  2 +-
 lib/classes/InstituteCalendarHelper.php            |  2 +-
 lib/classes/InstituteConfig.php                    |  2 +-
 lib/classes/LockRules.php                          |  4 +-
 lib/classes/MVV.php                                |  2 +-
 lib/classes/Markup.php                             |  2 +-
 lib/classes/MessageBox.php                         |  2 +-
 lib/classes/ModulesNotification.php                |  4 +-
 lib/classes/MultiPersonSearch.php                  |  4 +-
 lib/classes/MvvQuickSearch.php                     |  2 +-
 lib/classes/NotificationCenter.php                 |  2 +-
 lib/classes/QuickSearch.php                        |  6 +--
 lib/classes/RangeConfig.php                        |  2 +-
 lib/classes/RangeTreeObject.php                    |  2 +-
 lib/classes/RangeTreeObjectFak.php                 |  2 +-
 lib/classes/RangeTreeObjectInst.php                |  2 +-
 lib/classes/Score.php                              |  2 +-
 lib/classes/Seminar.php                            |  2 +-
 lib/classes/SeminarCategories.php                  |  4 +-
 lib/classes/SessionDecoder.php                     |  4 +-
 lib/classes/SimpleCollection.php                   |  2 +-
 lib/classes/SimpleORMap.php                        |  2 +-
 lib/classes/SimpleORMapCollection.php              |  2 +-
 lib/classes/StudipAutoloader.php                   |  2 +-
 lib/classes/StudipForm.php                         |  2 +-
 lib/classes/StudipLock.php                         |  2 +-
 lib/classes/StudipMail.php                         |  2 +-
 lib/classes/StudipObject.php                       |  4 +-
 lib/classes/StudipPDO.php                          |  2 +-
 lib/classes/StudipRangeTree.php                    |  2 +-
 lib/classes/StudipRangeTreeView.php                |  2 +-
 lib/classes/StudipRangeTreeViewAdmin.php           |  2 +-
 lib/classes/StudipSemRangeTreeViewSimple.php       |  2 +-
 lib/classes/StudipSemSearch.php                    |  2 +-
 lib/classes/StudipSemSearchHelper.php              |  2 +-
 lib/classes/StudipSemTreeSearch.php                |  2 +-
 lib/classes/StudipSemTreeView.php                  |  2 +-
 lib/classes/StudipSemTreeViewAdmin.php             |  2 +-
 lib/classes/StudipSemTreeViewSimple.php            |  2 +-
 lib/classes/TreeAbstract.php                       |  2 +-
 lib/classes/TreeView.php                           |  8 ++--
 lib/classes/UserConfig.php                         |  2 +-
 lib/classes/UserLookup.php                         |  2 +-
 lib/classes/UserManagement.php                     |  4 +-
 lib/classes/admission/AdmissionAlgorithm.php       |  4 +-
 lib/classes/admission/AdmissionPriority.php        |  2 +-
 lib/classes/admission/AdmissionRule.php            |  2 +-
 lib/classes/admission/AdmissionUserList.php        |  2 +-
 lib/classes/admission/CourseSet.php                |  2 +-
 lib/classes/admission/RandomAlgorithm.php          |  2 +-
 lib/classes/admission/UserFilter.php               |  2 +-
 lib/classes/admission/UserFilterField.php          |  7 ++--
 .../admission/userfilter/DatafieldCondition.php    |  2 +-
 .../admission/userfilter/DegreeCondition.php       |  2 +-
 .../admission/userfilter/PermissionCondition.php   |  2 +-
 .../userfilter/SemesterOfStudyCondition.php        |  2 +-
 .../userfilter/StgteilVersionCondition.php         |  2 +-
 .../admission/userfilter/SubjectCondition.php      |  2 +-
 .../admission/userfilter/SubjectConditionAny.php   |  4 +-
 lib/classes/auth_plugins/StudipAuthAbstract.php    |  2 +-
 lib/classes/auth_plugins/StudipAuthIP.php          |  2 +-
 lib/classes/auth_plugins/StudipAuthLTI.php         |  2 +-
 lib/classes/auth_plugins/StudipAuthLdap.php        |  2 +-
 .../auth_plugins/StudipAuthLdapReadAndBind.php     |  2 +-
 lib/classes/auth_plugins/StudipAuthOIDC.php        |  2 +-
 lib/classes/auth_plugins/StudipAuthSSO.php         |  2 +-
 lib/classes/auth_plugins/StudipAuthShib.php        |  2 +-
 lib/classes/auth_plugins/StudipAuthStandard.php    |  2 +-
 lib/classes/cache/Exception.php                    |  2 +-
 .../cache/InvalidCacheArgumentException.php        |  2 +-
 lib/classes/cache/Item.php                         |  2 +-
 lib/classes/calendar/ICalendarExport.php           |  2 +-
 .../coursewizardsteps/LVGroupsWizardStep.php       |  2 +-
 lib/classes/exportdocument/ExportPDF.php           |  2 +-
 lib/classes/searchtypes/MyCoursesSearch.php        |  2 +-
 lib/classes/searchtypes/PermissionSearch.php       |  2 +-
 lib/classes/searchtypes/ResourceSearch.php         |  2 +-
 lib/classes/searchtypes/RoomSearch.php             |  2 +-
 lib/classes/searchtypes/SQLSearch.php              |  4 +-
 lib/classes/searchtypes/SearchType.php             |  3 +-
 lib/classes/searchtypes/SeminarSearch.php          |  2 +-
 lib/classes/searchtypes/StandardSearch.php         |  4 +-
 lib/classes/searchtypes/TreeSearch.php             |  2 +-
 lib/cronjobs/check_admission.php                   |  4 +-
 lib/cronjobs/cleanup_log.php                       |  4 +-
 lib/cronjobs/garbage_collector.php                 |  4 +-
 lib/cronjobs/purge_cache.php                       |  8 ++--
 lib/cronjobs/remind_oer_upload.php                 |  4 +-
 lib/cronjobs/send_mail_queue.php                   |  2 +-
 lib/cronjobs/session_gc.php                        |  2 +-
 lib/dbviews/range_tree.view.php                    |  2 +-
 lib/dbviews/sem_tree.view.php                      |  2 +-
 lib/elearning/ConnectedCMS.php                     | 20 +++++-----
 lib/elearning/ELearningUtils.php                   |  2 +-
 lib/elearning/Ilias3ConnectedCMS.php               |  2 +-
 lib/elearning/PmWikiConnectedCMS.php               |  2 +-
 lib/elearning/PmWikiConnectedLink.php              |  2 +-
 lib/elearning/PmWikiContentModule.php              |  2 +-
 lib/exceptions/ClipboardException.php              |  2 +-
 lib/exceptions/StudipException.php                 |  2 +-
 .../resources/GlobalResourceLockException.php      |  2 +-
 .../GlobalResourceLockOverlapException.php         |  2 +-
 .../resources/InvalidResourceCategoryException.php |  2 +-
 .../resources/InvalidResourceClassException.php    |  2 +-
 .../resources/InvalidResourceException.php         |  2 +-
 .../resources/InvalidResourceRequestException.php  |  2 +-
 .../resources/ResourceBookingException.php         |  2 +-
 .../resources/ResourceBookingOverlapException.php  |  2 +-
 .../resources/ResourceBookingRangeException.php    |  2 +-
 lib/exceptions/resources/ResourceException.php     |  2 +-
 .../resources/ResourceNoTimeRangeException.php     |  2 +-
 .../resources/ResourcePermissionException.php      |  2 +-
 .../ResourcePropertyDefinitionException.php        |  2 +-
 .../resources/ResourcePropertyException.php        |  2 +-
 .../resources/ResourcePropertyStateException.php   |  2 +-
 .../resources/ResourceRequestException.php         |  2 +-
 .../resources/ResourceUnavailableException.php     |  2 +-
 .../resources/ResourceUnlockableException.php      |  2 +-
 .../resources/SeparableRoomException.php           |  2 +-
 lib/filesystem/FileArchiveManager.php              |  2 +-
 lib/filesystem/HomeworkFolder.php                  |  2 +-
 lib/filesystem/InboxFolder.php                     |  2 +-
 lib/filesystem/InboxOutboxFolder.php               |  2 +-
 lib/filesystem/MessageFolder.php                   |  2 +-
 lib/filesystem/OutboxFolder.php                    |  2 +-
 lib/models/AdmissionApplication.php                |  2 +-
 lib/models/ArchivedCourse.php                      |  2 +-
 lib/models/ArchivedCourseMember.php                |  2 +-
 lib/models/AuthUserMd5.php                         |  2 +-
 lib/models/BannerRoles.php                         |  2 +-
 lib/models/Clipboard.php                           |  2 +-
 lib/models/ClipboardItem.php                       |  2 +-
 lib/models/ColourValue.php                         |  2 +-
 lib/models/ConfigEntry.php                         |  2 +-
 lib/models/Contact.php                             |  2 +-
 lib/models/ContentTermsOfUse.php                   |  2 +-
 lib/models/Course.php                              |  2 +-
 lib/models/CourseMember.php                        |  2 +-
 lib/models/CourseMemberNotification.php            |  2 +-
 lib/models/Courseware/BlockTypes/Text.php          |  2 -
 lib/models/CronjobLog.php                          |  2 +-
 lib/models/CronjobSchedule.php                     |  2 +-
 lib/models/CronjobTask.php                         |  2 +-
 lib/models/Degree.php                              |  2 +-
 lib/models/Deputy.php                              |  2 +-
 lib/models/HelpContent.php                         |  2 +-
 lib/models/HelpTour.php                            |  2 +-
 lib/models/HelpTourAudience.php                    |  2 +-
 lib/models/HelpTourSettings.php                    |  2 +-
 lib/models/HelpTourStep.php                        |  3 +-
 lib/models/HelpTourUser.php                        |  2 +-
 lib/models/Institute.php                           |  2 +-
 lib/models/LockRule.php                            |  2 +-
 lib/models/LoginBackground.php                     |  2 +-
 lib/models/LoginFaq.php                            |  2 +-
 lib/models/Message.php                             |  2 +-
 lib/models/MessageUser.php                         |  2 +-
 lib/models/MvvOverlappingConflict.php              |  2 +-
 lib/models/MvvOverlappingExclude.php               |  3 +-
 lib/models/MvvOverlappingSelection.php             |  2 +-
 lib/models/NewsRange.php                           |  2 +-
 lib/models/NewsRoles.php                           |  2 +-
 lib/models/Semester.php                            |  2 +-
 lib/models/SemesterCourse.php                      |  2 +-
 lib/models/SemesterHoliday.php                     |  2 +-
 lib/models/SeminarCycleDate.php                    |  2 +-
 lib/models/StudipComment.php                       |  2 +-
 lib/models/StudipNews.php                          |  2 +-
 lib/models/StudipScmEntry.php                      |  2 +-
 lib/models/StudyCourse.php                         |  2 +-
 lib/models/ToolActivation.php                      |  2 +-
 lib/models/User.php                                |  4 +-
 lib/models/UserInfo.php                            |  2 +-
 lib/models/UserOnline.php                          |  4 +-
 lib/models/UserStudyCourse.php                     |  2 +-
 lib/models/WebserviceAccessRule.php                |  2 +-
 lib/models/WikiPage.php                            |  2 +-
 lib/models/calendar/CalendarDate.php               |  2 +-
 lib/models/calendar/CalendarDateAssignment.php     |  2 +-
 lib/models/resources/BrokenResource.php            |  2 +-
 lib/models/resources/Building.php                  |  2 +-
 lib/models/resources/GlobalResourceLock.php        |  2 +-
 lib/models/resources/Location.php                  |  2 +-
 lib/models/resources/Resource.php                  |  2 +-
 lib/models/resources/ResourceBooking.php           |  2 +-
 lib/models/resources/ResourceBookingInterval.php   |  2 +-
 lib/models/resources/ResourceCategory.php          |  2 +-
 lib/models/resources/ResourceCategoryProperty.php  |  2 +-
 lib/models/resources/ResourceLabel.php             |  2 +-
 lib/models/resources/ResourcePermission.php        |  2 +-
 lib/models/resources/ResourceProperty.php          |  2 +-
 .../resources/ResourcePropertyDefinition.php       |  2 +-
 lib/models/resources/ResourcePropertyGroup.php     |  2 +-
 lib/models/resources/ResourceRequest.php           |  2 +-
 .../resources/ResourceRequestAppointment.php       |  2 +-
 lib/models/resources/ResourceRequestProperty.php   |  2 +-
 .../resources/ResourceTemporaryPermission.php      |  2 +-
 lib/models/resources/Room.php                      |  2 +-
 lib/models/resources/RoomRequest.php               |  2 +-
 lib/models/resources/SeparableRoom.php             |  2 +-
 lib/models/resources/SeparableRoomPart.php         |  2 +-
 lib/modules/CoreForum.php                          |  2 +-
 lib/modules/FeedbackModule.php                     |  2 +-
 lib/modules/GradebookModule.php                    |  2 +-
 lib/modules/LtiToolModule.php                      |  2 +-
 lib/object.inc.php                                 |  4 +-
 lib/phplib/Seminar_Auth.php                        |  2 +-
 lib/phplib/Seminar_Default_Auth.php                |  4 +-
 lib/phplib/Seminar_Perm.php                        |  2 +-
 lib/phplib/Seminar_Register_Auth.php               |  2 +-
 lib/phplib/Seminar_User.php                        |  2 +-
 lib/plugins/core/AdministrationPlugin.php          |  2 +-
 lib/plugins/core/CorePlugin.php                    |  2 +-
 lib/plugins/core/DetailspagePlugin.php             |  2 +-
 lib/plugins/core/ForumModule.php                   |  4 +-
 lib/plugins/core/HomepagePlugin.php                |  2 +-
 lib/plugins/core/LibraryPlugin.php                 |  2 +-
 lib/plugins/core/PortalPlugin.php                  |  2 +-
 lib/plugins/core/Role.php                          |  2 +-
 lib/plugins/core/StandardPlugin.php                |  2 +-
 lib/plugins/core/StudIPPlugin.php                  |  2 +-
 lib/plugins/core/SystemPlugin.php                  |  2 +-
 lib/plugins/db/RolePersistence.php                 |  2 +-
 lib/plugins/engine/PluginManager.php               |  6 +--
 lib/plugins/engine/PluginRepository.php            |  2 +-
 lib/raumzeit/CycleData.php                         |  2 +-
 lib/raumzeit/CycleDataDB.php                       |  6 +--
 lib/raumzeit/Issue.php                             |  6 +--
 lib/raumzeit/IssueDB.php                           |  6 +--
 lib/raumzeit/MetaDate.php                          |  4 +-
 lib/raumzeit/MetaDateDB.php                        |  6 +--
 lib/raumzeit/SeminarDB.php                         |  6 +--
 lib/raumzeit/SingleDate.php                        |  2 +-
 lib/raumzeit/SingleDateDB.php                      |  6 +--
 lib/resources/ResourceManager.php                  |  2 +-
 lib/resources/RoomManager.php                      |  2 +-
 lib/visual.inc.php                                 |  4 +-
 phpstan.neon.dist                                  |  2 +-
 public/admin_elearning_interface.php               |  2 +-
 resources/assets/javascripts/lib/wysiwyg.js        |  6 +--
 274 files changed, 375 insertions(+), 342 deletions(-)
 create mode 100644 db/migrations/6.0.11_adjust_cronjobs.php

diff --git a/app/controllers/loncapa.php b/app/controllers/loncapa.php
index 41331b6..dd7ea40 100644
--- a/app/controllers/loncapa.php
+++ b/app/controllers/loncapa.php
@@ -13,8 +13,8 @@ class LoncapaController extends AuthenticatedController
         if ($GLOBALS['perm']->have_studip_perm('user', $course_id)
             && isset($GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms_type]))
         {
-            require_once 'lib/elearning/ELearningUtils.class.php';
-            require_once 'lib/elearning/ObjectConnections.class.php';
+            require_once 'lib/elearning/ELearningUtils.php';
+            require_once 'lib/elearning/ObjectConnections.php';
 
             $object_connections = new ObjectConnections($course_id);
             $connected_modules = $object_connections->getConnections();
diff --git a/app/controllers/quicksearch.php b/app/controllers/quicksearch.php
index 9c6a4ae..c086498 100644
--- a/app/controllers/quicksearch.php
+++ b/app/controllers/quicksearch.php
@@ -14,7 +14,7 @@
 
 /**
  * Controller for the ajax-response of the QuickSearch class found in
- * lib/classes/QuickSearch.class.php
+ * lib/classes/QuickSearch.php
  */
 class QuicksearchController extends AuthenticatedController
 {
diff --git a/cli/Commands/CleanupAdmissionRules.php b/cli/Commands/CleanupAdmissionRules.php
index 3079ae4..a7036d3 100644
--- a/cli/Commands/CleanupAdmissionRules.php
+++ b/cli/Commands/CleanupAdmissionRules.php
@@ -18,7 +18,7 @@ class CleanupAdmissionRules extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        require_once 'lib/classes/admission/CourseSet.class.php';
+        require_once 'lib/classes/admission/CourseSet.php';
 
         $course_set = new \CourseSet();
 
diff --git a/cli/Commands/Plugins/PluginInfo.php b/cli/Commands/Plugins/PluginInfo.php
index 9809b13..c8f9748 100644
--- a/cli/Commands/Plugins/PluginInfo.php
+++ b/cli/Commands/Plugins/PluginInfo.php
@@ -65,11 +65,11 @@ class PluginInfo extends AbstractPluginCommand
 
     private function pluginClassExists(string $plugindir, array $plugin)
     {
-        $pluginfile = $plugindir . $plugin['class'] . '.class.php';
+        $pluginfile = $plugindir . $plugin['class'] . '.php';
         if (file_exists($pluginfile)) {
             return 1;
         } else {
-            $pluginfile = $plugindir . $plugin['class'] . '.php';
+            $pluginfile = $plugindir . $plugin['class'] . '.class.php';
             if (file_exists($pluginfile)) {
                 return 1;
             }
diff --git a/composer.json b/composer.json
index dfb4fe1..920069f 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
             "Trails\\": "lib/trails/",
             "": [
                 "lib/calendar/",
-                "lib/calendar/lib/",
                 "lib/classes/",
                 "lib/classes/admission/",
                 "lib/classes/admission/userfilter/",
diff --git a/config/config_develop.inc.php b/config/config_develop.inc.php
index a38726a..655fd4b 100644
--- a/config/config_develop.inc.php
+++ b/config/config_develop.inc.php
@@ -329,7 +329,7 @@ $INST_ADMIN_DATAFIELDS_VIEW = [
 /*
  * Fields that may not be hidden by users in their privacy settings.
  * Can be configured per permission level.
- * @see lib/models/User.class.php in function getHomepageElements for
+ * @see lib/models/User.php in function getHomepageElements for
  * available fields.
  * Entries look like "'field_name' => true".
  */
diff --git a/db/migrations/1.128_step00240_coursesets.php b/db/migrations/1.128_step00240_coursesets.php
index b767ae3..2f47805 100644
--- a/db/migrations/1.128_step00240_coursesets.php
+++ b/db/migrations/1.128_step00240_coursesets.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'vendor/phpass/PasswordHash.php';
-require_once 'lib/classes/admission/CourseSet.class.php';
+require_once 'lib/classes/admission/CourseSet.php';
 
 class Step00240CourseSets extends Migration
 {
diff --git a/db/migrations/1.12_step_120_userpic.php b/db/migrations/1.12_step_120_userpic.php
index f907b9f..eeb787a 100644
--- a/db/migrations/1.12_step_120_userpic.php
+++ b/db/migrations/1.12_step_120_userpic.php
@@ -10,7 +10,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/classes/Avatar.class.php';
+require_once 'lib/classes/Avatar.php';
 
 class Step120Userpic extends Migration {
 
diff --git a/db/migrations/6.0.11_adjust_cronjobs.php b/db/migrations/6.0.11_adjust_cronjobs.php
new file mode 100644
index 0000000..132885e
--- /dev/null
+++ b/db/migrations/6.0.11_adjust_cronjobs.php
@@ -0,0 +1,43 @@
+<?php
+return new class extends Migration
+{
+    private const ADJUSTMENTS = [
+        'lib/cronjobs/purge_cache',
+        'lib/cronjobs/check_admission',
+        'lib/cronjobs/session_gc',
+        'lib/cronjobs/cleanup_log',
+        'lib/cronjobs/garbage_collector',
+        'lib/cronjobs/send_mail_queue',
+        'lib/cronjobs/remind_oer_upload',
+        'lib/cronjobs/send_mail_notifications',
+    ];
+
+    public function description()
+    {
+        return 'Adjusts the class names for core cronjobs by losing the .class suffix';
+    }
+
+    protected function up()
+    {
+        $this->changeCronjobFilenames('.class.php', '.php');
+    }
+
+    protected function down()
+    {
+        $this->changeCronjobFilenames('.php', '.class.php');
+    }
+
+    private function changeCronjobFilenames(string $fromExtension, string $toExtension): void
+    {
+        $query = "UPDATE `cronjobs_tasks`
+                  SET `filename` = :new
+                  WHERE `filename` = :old";
+        $statement = DBManager::get()->prepare($query);
+
+        foreach (self::ADJUSTMENTS as $filename) {
+            $statement->bindValue(':new', $filename . $toExtension);
+            $statement->bindValue(':old', $filename . $fromExtension);
+            $statement->execute();
+        }
+    }
+};
diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
index 7fdbc00..640e800 100644
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
+++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ConditionalAdmission.class.php
+ * ConditionalAdmission.php
  *
  * An admission rule that specifies conditions for course admission, like
  * degree, study course or semester.
diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
index a3309e8..139c360 100644
--- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
+++ b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * CourseMemberAdmission.class.php
+ * CourseMemberAdmission.php
  *
  * Specifies a mandatory course membership for course admission.
  *
diff --git a/lib/admissionrules/limitedadmission/LimitedAdmission.php b/lib/admissionrules/limitedadmission/LimitedAdmission.php
index a193bda..d7f53c1 100644
--- a/lib/admissionrules/limitedadmission/LimitedAdmission.php
+++ b/lib/admissionrules/limitedadmission/LimitedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * LimitedAdmission.class.php
+ * LimitedAdmission.php
  *
  * Represents rules for admission to a limited number of courses.
  *
diff --git a/lib/admissionrules/lockedadmission/LockedAdmission.php b/lib/admissionrules/lockedadmission/LockedAdmission.php
index 0ca324b..92ef513 100644
--- a/lib/admissionrules/lockedadmission/LockedAdmission.php
+++ b/lib/admissionrules/lockedadmission/LockedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * LockedAdmission.class.php
+ * LockedAdmission.php
  * 
  * Represents a rule for completely locking courses for admission.
  *
diff --git a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
index 28a910d..586f82f 100644
--- a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
+++ b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ParticipantRestrictedAdmission.class.php
+ * ParticipantRestrictedAdmission.php
  *
  * Specifies restricted number of participants for course admission.
  *
diff --git a/lib/admissionrules/passwordadmission/PasswordAdmission.php b/lib/admissionrules/passwordadmission/PasswordAdmission.php
index 0650630..8715021 100644
--- a/lib/admissionrules/passwordadmission/PasswordAdmission.php
+++ b/lib/admissionrules/passwordadmission/PasswordAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PasswordAdmission.class.php
+ * PasswordAdmission.php
  *
  * Represents a rule for course access with a given password.
  *
diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
index 9c90f69..2f57a44 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PreferentialAdmission.class.php
+ * PreferentialAdmission.php
  *
  * An admission rule that favors selected courses of study or semesters of study.
  *
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.php b/lib/admissionrules/termsadmission/TermsAdmission.php
index 1d421ad..eb83dfc 100644
--- a/lib/admissionrules/termsadmission/TermsAdmission.php
+++ b/lib/admissionrules/termsadmission/TermsAdmission.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * TermsAdmission.class.php
+ * TermsAdmission.php
  *
  * Represents a rule for course access with conditions of admission to be accepted.
  *
diff --git a/lib/admissionrules/timedadmission/TimedAdmission.php b/lib/admissionrules/timedadmission/TimedAdmission.php
index e167bd8..5f5e885 100644
--- a/lib/admissionrules/timedadmission/TimedAdmission.php
+++ b/lib/admissionrules/timedadmission/TimedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * TimedAdmission.class.php
+ * TimedAdmission.php
  *
  * Specifies a time frame for course admission.
  *
diff --git a/lib/calendar/CalendarColumn.php b/lib/calendar/CalendarColumn.php
index cc3abea..78a3809 100644
--- a/lib/calendar/CalendarColumn.php
+++ b/lib/calendar/CalendarColumn.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * CalendarColumn.class.php - a column for a CalendarView
+ * CalendarColumn.php - a column for a CalendarView
  *
  * This class represents an entry-column like "monday" in the calendar
  *
diff --git a/lib/calendar/CalendarView.php b/lib/calendar/CalendarView.php
index 3d89ef1..9d9ebc2 100644
--- a/lib/calendar/CalendarView.php
+++ b/lib/calendar/CalendarView.php
@@ -2,7 +2,7 @@
 # Lifter010: TODO
 
  /**
- * CalendarView.class.php - generates a calendar
+ * CalendarView.php - generates a calendar
  *
  * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
  *
diff --git a/lib/calendar/CalendarWeekView.php b/lib/calendar/CalendarWeekView.php
index c1e0f24..1d14ca21 100644
--- a/lib/calendar/CalendarWeekView.php
+++ b/lib/calendar/CalendarWeekView.php
@@ -2,7 +2,7 @@
 # Lifter010: TODO
 
 /**
- * CalendarWeekView.class.php - a specialized calendar view for displaying weeks
+ * CalendarWeekView.php - a specialized calendar view for displaying weeks
  *
  * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
  *
diff --git a/lib/classes/ActionMenu.php b/lib/classes/ActionMenu.php
index 0822f72..25351ce 100644
--- a/lib/classes/ActionMenu.php
+++ b/lib/classes/ActionMenu.php
@@ -410,7 +410,7 @@ class ActionMenu
         $rendering_mode = $this->rendering_mode;
 
         if ($rendering_mode === null) {
-            $rendering_mode = $this->countActions() <= Config::get()->ACTION_MENU_THRESHOLD
+            $rendering_mode = $this->countActions() <= 1 // Config::get()->ACTION_MENU_THRESHOLD
                             ? self::RENDERING_MODE_ICONS
                             : self::RENDERING_MODE_MENU;
         }
diff --git a/lib/classes/Assets.php b/lib/classes/Assets.php
index 928c47c..d4d792e 100644
--- a/lib/classes/Assets.php
+++ b/lib/classes/Assets.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 
 /*
- * Assets.class.php - assets helper
+ * Assets.php - assets helper
  *
  * Copyright (C) 2007 - Marcus Lunzenauer <mlunzena@uos.de>
  *
diff --git a/lib/classes/AuthorObject.php b/lib/classes/AuthorObject.php
index b3e98e3..f08622e 100644
--- a/lib/classes/AuthorObject.php
+++ b/lib/classes/AuthorObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// AuthorObject.class.php
+// AuthorObject.php
 //
 // Class to provide basic properties of an object in Stud.IP
 //
@@ -31,7 +31,7 @@ define("ERROR_CRITICAL", "8");
 
 
 /**
- * AuthorObject.class.php
+ * AuthorObject.php
  *
  * Class to provide basic properties of an object in Stud.IP
  *
@@ -136,4 +136,3 @@ class AuthorObject
         $class->resetErrors();
     }
 }
-
diff --git a/lib/classes/AutoInsert.php b/lib/classes/AutoInsert.php
index b2168cc..b5cc005 100644
--- a/lib/classes/AutoInsert.php
+++ b/lib/classes/AutoInsert.php
@@ -14,7 +14,7 @@
  */
 
 /**
- * AutoInsert.class.php
+ * AutoInsert.php
  * Provides functions required by StEP00216:
  * - Assign seminars for automatic registration of certain user types
  * - Maintenance of registration rules
diff --git a/lib/classes/Color.php b/lib/classes/Color.php
index a9b4506..dcd68f5 100644
--- a/lib/classes/Color.php
+++ b/lib/classes/Color.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * lib/classes/Color.class.php - class to mix colors and convert them between different types
+ * lib/classes/Color.php - class to mix colors and convert them between different types
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -367,4 +367,4 @@ class Color {
         return [$H, $S, $L];
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/classes/Config.php b/lib/classes/Config.php
index 642665d..c49a845 100644
--- a/lib/classes/Config.php
+++ b/lib/classes/Config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Config.class.php
+ * Config.php
  * provides access to global configuration
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/CourseConfig.php b/lib/classes/CourseConfig.php
index ad62be0..3ac5587 100644
--- a/lib/classes/CourseConfig.php
+++ b/lib/classes/CourseConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CourseConfig.class.php
+ * CourseConfig.php
  * provides access to course preferences
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/CronJob.php b/lib/classes/CronJob.php
index 1e7fb41..dee65e7 100644
--- a/lib/classes/CronJob.php
+++ b/lib/classes/CronJob.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// Cronjob.class.php
+// Cronjob.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/CronjobScheduler.php b/lib/classes/CronjobScheduler.php
index cc4cf8b..fbb5b66 100644
--- a/lib/classes/CronjobScheduler.php
+++ b/lib/classes/CronjobScheduler.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobScheduler.class.php
+// CronjobScheduler.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/DataFieldEntry.php b/lib/classes/DataFieldEntry.php
index fd50a0b..eca0b4a 100644
--- a/lib/classes/DataFieldEntry.php
+++ b/lib/classes/DataFieldEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DataFieldEntry.class.php
+ * DataFieldEntry.php
  *
  * @author  Jan-Hendrik Willms <tleilax+studip@gmail.com>
  * @author  Marcus Lunzenauer <mlunzena@uos.de>
diff --git a/lib/classes/DatabaseObject.php b/lib/classes/DatabaseObject.php
index 2258adb..5c54229 100644
--- a/lib/classes/DatabaseObject.php
+++ b/lib/classes/DatabaseObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// DatabaseObject.class.php
+// DatabaseObject.php
 //
 // Class to provide basic properties of an DatabseObject in Stud.IP
 //
@@ -35,7 +35,7 @@ define("INSTANCEOF_DATABASEOBJECT", "DatabaseObject");
 
 
 /**
- * DatabaseObject.class.php
+ * DatabaseObject.php
  *
  * Class to provide basic properties of an DatabaseObject in Stud.IP
  *
diff --git a/lib/classes/DateFormatter.php b/lib/classes/DateFormatter.php
index 5f7c558..5309cbc 100644
--- a/lib/classes/DateFormatter.php
+++ b/lib/classes/DateFormatter.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * DateFormater.class.php - Handles the formatting of one date and associated rooms.
+ * DateFormater.php - Handles the formatting of one date and associated rooms.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/DbSnapshot.php b/lib/classes/DbSnapshot.php
index dfb4f89..33ea660 100644
--- a/lib/classes/DbSnapshot.php
+++ b/lib/classes/DbSnapshot.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// DbSnapshot.class.php
+// DbSnapshot.php
 // Class to provide snapshots of mysql result sets
 // Uses PHPLib DB Abstraction
 // Copyright (c) 2002 André Noack <andre.noack@gmx.net>
diff --git a/lib/classes/DbView.php b/lib/classes/DbView.php
index 81e9b91..0215f8e 100644
--- a/lib/classes/DbView.php
+++ b/lib/classes/DbView.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// DbView.class.php
+// DbView.php
 // Class to provide simple Views and Prepared Statements
 // Mainly for MySql, may work with other DBs (not tested)
 // Copyright (c) 2002 André Noack <andre.noack@gmx.net>
diff --git a/lib/classes/InstituteCalendarHelper.php b/lib/classes/InstituteCalendarHelper.php
index 4302cf1..6c934b4 100644
--- a/lib/classes/InstituteCalendarHelper.php
+++ b/lib/classes/InstituteCalendarHelper.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InstituteCalendarHelper.class.php - class for institute calendar convenience functions
+ * InstituteCalendarHelper.php - class for institute calendar convenience functions
  *
  * @author      Timo Hartge <hartge@data-quest>
  * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
diff --git a/lib/classes/InstituteConfig.php b/lib/classes/InstituteConfig.php
index d1a51cb..551ea4d 100644
--- a/lib/classes/InstituteConfig.php
+++ b/lib/classes/InstituteConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InstituteConfig.class.php
+ * InstituteConfig.php
  * provides access to institute preferences
  *
  * @author  Jan-Hendrik Wullms <tleilax+studip@gmail.com>
diff --git a/lib/classes/LockRules.php b/lib/classes/LockRules.php
index 59679db..f1feb9f 100644
--- a/lib/classes/LockRules.php
+++ b/lib/classes/LockRules.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LockRules.class.php
+ * LockRules.php
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
 */
 
 /**
-* LockRules.class.php
+* LockRules.php
 *
 * This class contains only static methods dealing with lock rules
 *
diff --git a/lib/classes/MVV.php b/lib/classes/MVV.php
index 517514c..b4d9edf 100644
--- a/lib/classes/MVV.php
+++ b/lib/classes/MVV.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MVV.class.php
+ * MVV.php
  * Helper class
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/Markup.php b/lib/classes/Markup.php
index fbde67b..dc6820f 100644
--- a/lib/classes/Markup.php
+++ b/lib/classes/Markup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Markup.class.php - Handling of Stud.IP- and HTML-markup.
+ * Markup.php - Handling of Stud.IP- and HTML-markup.
  **
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/MessageBox.php b/lib/classes/MessageBox.php
index 8936ebe..3573018 100644
--- a/lib/classes/MessageBox.php
+++ b/lib/classes/MessageBox.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * MessageBox.class.php
+ * MessageBox.php
  *
  * html boxes for different kinds of messages
  *
diff --git a/lib/classes/ModulesNotification.php b/lib/classes/ModulesNotification.php
index f414071..1dc361c 100644
--- a/lib/classes/ModulesNotification.php
+++ b/lib/classes/ModulesNotification.php
@@ -4,7 +4,7 @@
 # Lifter003: TEST
 # Lifter010: DONE - no html output in this file
 /**
-* ModulesNotification.class.php
+* ModulesNotification.php
 *
 * check for modules (global and local for institutes and Veranstaltungen), read and write
 *
@@ -17,7 +17,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// Modules.class.php
+// Modules.php
 // Checks fuer Module (global und lokal fuer Veranstaltungen und Einrichtungen), Schreib-/Lesezugriff
 // Copyright (C) 2003 Cornelis Kater <ckater@gwdg.de>, Suchi & Berg GmbH <info@data-quest.de>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/MultiPersonSearch.php b/lib/classes/MultiPersonSearch.php
index af10e6b..3ca617b 100644
--- a/lib/classes/MultiPersonSearch.php
+++ b/lib/classes/MultiPersonSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MultiPersonSearch.class.php
+ * MultiPersonSearch.php
  *
  * This class provides a GUI-element for searching, adding and removing
  * multiple persons. If JavaScript is enabled the GUI-element is shown
@@ -242,7 +242,7 @@ class MultiPersonSearch {
     /**
      * sets the search object.
      *
-     * @param SearchType object of type SearchType (e.g. SQLSearch.class.php)
+     * @param SearchType object of type SearchType (e.g. SQLSearch.php)
      *
      * @return MultiPersonSearch
      */
diff --git a/lib/classes/MvvQuickSearch.php b/lib/classes/MvvQuickSearch.php
index b0e79c0..b06de4f 100644
--- a/lib/classes/MvvQuickSearch.php
+++ b/lib/classes/MvvQuickSearch.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'lib/classes/searchtypes/SQLSearch.class.php';
+require_once 'lib/classes/searchtypes/SQLSearch.php';
 
 class MvvQuickSearch extends SQLSearch
 {
diff --git a/lib/classes/NotificationCenter.php b/lib/classes/NotificationCenter.php
index aaaa9e8..178fd62 100644
--- a/lib/classes/NotificationCenter.php
+++ b/lib/classes/NotificationCenter.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * NotificationCenter.class.php - NotificationCenter class
+ * NotificationCenter.php - NotificationCenter class
  *
  * Copyright (c) 2009  Elmar Ludwig
  *
diff --git a/lib/classes/QuickSearch.php b/lib/classes/QuickSearch.php
index d3983a3..f3e18cc 100644
--- a/lib/classes/QuickSearch.php
+++ b/lib/classes/QuickSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * QuickSearch.class.php - GUI class for quciksearch
+ * QuickSearch.php - GUI class for quciksearch
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -66,7 +66,7 @@
  *  $searcher = new TeacherSearch();
  *  print QuickSearch::get("username", $searcher)->withButton->render();
  *  //code-end
- * Watch the SearchType class in lib/classes/searchtypes/SearchType.class.php
+ * Watch the SearchType class in lib/classes/searchtypes/SearchType.php
  * for details.
  * Enjoy!
  */
@@ -166,7 +166,7 @@ class QuickSearch
     /**
      * constructor which prepares a searchfield for persons, courses, institutes or
      * special items you may want to search for. This is a GUI-class, see
-     * QuickSearch.class.php for further documentation.
+     * QuickSearch.php for further documentation.
      *
      * @param string $name the name of the destinated variable in your html-form. Handle it
      * as if it was an '<input type="text" name="yourname">' input.
diff --git a/lib/classes/RangeConfig.php b/lib/classes/RangeConfig.php
index b1030e3..ad48207 100644
--- a/lib/classes/RangeConfig.php
+++ b/lib/classes/RangeConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * RangeConfig.class.php
+ * RangeConfig.php
  * provides access to object preferences
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/RangeTreeObject.php b/lib/classes/RangeTreeObject.php
index 579db43..06f84bf 100644
--- a/lib/classes/RangeTreeObject.php
+++ b/lib/classes/RangeTreeObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// RangeTreeObject.class.php
+// RangeTreeObject.php
 // Class to handle items in the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/RangeTreeObjectFak.php b/lib/classes/RangeTreeObjectFak.php
index 76cc366..9e980ca 100644
--- a/lib/classes/RangeTreeObjectFak.php
+++ b/lib/classes/RangeTreeObjectFak.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// RangeTreeObjectFak.class.php
+// RangeTreeObjectFak.php
 // Class to handle items in the "range tree"
 // 
 // Copyright (c) 2002 André Noack <noack@data-quest.de> 
diff --git a/lib/classes/RangeTreeObjectInst.php b/lib/classes/RangeTreeObjectInst.php
index c291dfc..d41b03d 100644
--- a/lib/classes/RangeTreeObjectInst.php
+++ b/lib/classes/RangeTreeObjectInst.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// RangeTreeObjectInst.class.php
+// RangeTreeObjectInst.php
 // Class to handle items in the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/Score.php b/lib/classes/Score.php
index 4d114d5..3b7f149 100644
--- a/lib/classes/Score.php
+++ b/lib/classes/Score.php
@@ -1,6 +1,6 @@
 <?
 /**
- * Score.class.php - Score class
+ * Score.php - Score class
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/Seminar.php b/lib/classes/Seminar.php
index a2d69ea..0fccdbc 100644
--- a/lib/classes/Seminar.php
+++ b/lib/classes/Seminar.php
@@ -4,7 +4,7 @@
 # Lifter007: TODO
 # Lifter010: TODO
 /**
- * Seminar.class.php - This class represents a Seminar in Stud.IP
+ * Seminar.php - This class represents a Seminar in Stud.IP
  *
  * This class provides functions for seminar-members, seminar-dates, and seminar-modules
  *
diff --git a/lib/classes/SeminarCategories.php b/lib/classes/SeminarCategories.php
index 5302f1e..25eb4c1 100644
--- a/lib/classes/SeminarCategories.php
+++ b/lib/classes/SeminarCategories.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /**
- * SeminarCategories.class.php
+ * SeminarCategories.php
  *
  * encapsulates configuration settings for courses from config.inc.php
  * aka $SEM_CLASS, $SEM_TYPE, $UPLOAD_TYPES
@@ -14,7 +14,7 @@
  */
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SeminarCategories.class.php
+// SeminarCategories.php
 //
 // Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/SessionDecoder.php b/lib/classes/SessionDecoder.php
index d437494..fc40c07 100644
--- a/lib/classes/SessionDecoder.php
+++ b/lib/classes/SessionDecoder.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /**
- * SessionDecoder.class.php
+ * SessionDecoder.php
  *
  * decodes serialized PHP session data
  *
@@ -13,7 +13,7 @@
  */
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SessionDecoder.class.php
+// SessionDecoder.php
 //
 // Copyright (C) 2008 André Noack <noack@data-quest>, data-quest GmbH <info@data-quest.de>
 // +---------------------------------------------------------------------------+
diff --git a/lib/classes/SimpleCollection.php b/lib/classes/SimpleCollection.php
index 6acc10d..ae773f5 100644
--- a/lib/classes/SimpleCollection.php
+++ b/lib/classes/SimpleCollection.php
@@ -7,7 +7,7 @@ if (!defined('SORT_FLAG_CASE')) {
 }
 
 /**
- * SimpleCollection.class.php
+ * SimpleCollection.php
  * collection of assoc arrays with convenience
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/SimpleORMap.php b/lib/classes/SimpleORMap.php
index 7124cc4..7492906 100644
--- a/lib/classes/SimpleORMap.php
+++ b/lib/classes/SimpleORMap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SimpleORMap.class.php
+ * SimpleORMap.php
  * simple object-relational mapping
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/SimpleORMapCollection.php b/lib/classes/SimpleORMapCollection.php
index 7debb80..20162e5 100644
--- a/lib/classes/SimpleORMapCollection.php
+++ b/lib/classes/SimpleORMapCollection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SimpleORMapCollection.class.php
+ * SimpleORMapCollection.php
  * simple object-relational mapping
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/StudipAutoloader.php b/lib/classes/StudipAutoloader.php
index 7054478..883adc7 100644
--- a/lib/classes/StudipAutoloader.php
+++ b/lib/classes/StudipAutoloader.php
@@ -52,8 +52,8 @@ class StudipAutoloader
     // file is found quickly and unneccessary, costly calls to file_exists()
     // can be avoided.
     protected static $file_extensions = [
-        '.class.php',
         '.php',
+        '.class.php',
         '.interface.php',
     ];
 
diff --git a/lib/classes/StudipForm.php b/lib/classes/StudipForm.php
index 024e2e3..12029df 100644
--- a/lib/classes/StudipForm.php
+++ b/lib/classes/StudipForm.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipForm.class.php
+// StudipForm.php
 // Class to build HTML formular and handle persistence using PhpLib
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipLock.php b/lib/classes/StudipLock.php
index 601db8b..ce5752f 100644
--- a/lib/classes/StudipLock.php
+++ b/lib/classes/StudipLock.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipLock.class.php
+ * StudipLock.php
  * class with methods to perform cooperative advisory locking
  * using the GET_LOCK feature from Mysql
  * https://dev.mysql.com/doc/refman/5.0/en/miscellaneous-functions.html#function_get-lock
diff --git a/lib/classes/StudipMail.php b/lib/classes/StudipMail.php
index 4974f66..c517847 100644
--- a/lib/classes/StudipMail.php
+++ b/lib/classes/StudipMail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipMail.class.php
+ * StudipMail.php
  *
  * class for constructing and sending emails in Stud.IP
  *
diff --git a/lib/classes/StudipObject.php b/lib/classes/StudipObject.php
index 151fcdb..5f10c86 100644
--- a/lib/classes/StudipObject.php
+++ b/lib/classes/StudipObject.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipObject.class.php
+// StudipObject.php
 //
 // Class to provide basic properties of an StudipObject in Stud.IP
 //
@@ -36,7 +36,7 @@ define ("INSTANCEOF_STUDIPOBJECT", "StudipObject");
 
 
 /**
- * StudipObject.class.php
+ * StudipObject.php
  *
  * Class to provide basic properties of an StudipObject in Stud.IP
  *
diff --git a/lib/classes/StudipPDO.php b/lib/classes/StudipPDO.php
index 8a1422b..77046f7 100644
--- a/lib/classes/StudipPDO.php
+++ b/lib/classes/StudipPDO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipPDO.class.php - Stud.IP PDO class
+ * StudipPDO.php - Stud.IP PDO class
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/StudipRangeTree.php b/lib/classes/StudipRangeTree.php
index cf88d23..5e1aefe 100644
--- a/lib/classes/StudipRangeTree.php
+++ b/lib/classes/StudipRangeTree.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipRangeTree.class.php
+// StudipRangeTree.php
 // Class to handle structure of the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipRangeTreeView.php b/lib/classes/StudipRangeTreeView.php
index 2532e4b..7b23089 100644
--- a/lib/classes/StudipRangeTreeView.php
+++ b/lib/classes/StudipRangeTreeView.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipRangeTreeView.class.php
+// StudipRangeTreeView.php
 // Class to print out the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipRangeTreeViewAdmin.php b/lib/classes/StudipRangeTreeViewAdmin.php
index 0620957..1c5e5a1 100644
--- a/lib/classes/StudipRangeTreeViewAdmin.php
+++ b/lib/classes/StudipRangeTreeViewAdmin.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipRangeTreeViewAdmin.class.php
+// StudipRangeTreeViewAdmin.php
 // Class to print out the "range tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemRangeTreeViewSimple.php b/lib/classes/StudipSemRangeTreeViewSimple.php
index eecdd70..78b5ccf 100644
--- a/lib/classes/StudipSemRangeTreeViewSimple.php
+++ b/lib/classes/StudipSemRangeTreeViewSimple.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemRangeTreeViewSimple.class.php
+// StudipSemRangeTreeViewSimple.php
 // Class to print out the seminar tree
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemSearch.php b/lib/classes/StudipSemSearch.php
index 8932dd1..6d86b44 100644
--- a/lib/classes/StudipSemSearch.php
+++ b/lib/classes/StudipSemSearch.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemSearchForm.class.php
+// StudipSemSearchForm.php
 // Class to build search formular and execute search
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemSearchHelper.php b/lib/classes/StudipSemSearchHelper.php
index 29ee5d3..d221869 100644
--- a/lib/classes/StudipSemSearchHelper.php
+++ b/lib/classes/StudipSemSearchHelper.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemSearchHelper.class.php
+// StudipSemSearchHelper.php
 //
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeSearch.php b/lib/classes/StudipSemTreeSearch.php
index e79a34f..0d8f935 100644
--- a/lib/classes/StudipSemTreeSearch.php
+++ b/lib/classes/StudipSemTreeSearch.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeSearch.class.php
+// StudipSemTreeSearch.php
 // Class to build search formular and execute search
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeView.php b/lib/classes/StudipSemTreeView.php
index 3e984cc..f2d6fbe 100644
--- a/lib/classes/StudipSemTreeView.php
+++ b/lib/classes/StudipSemTreeView.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeView.class.php
+// StudipSemTreeView.php
 // Class to print out the seminar tree
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeViewAdmin.php b/lib/classes/StudipSemTreeViewAdmin.php
index edc65c8..59c926a 100644
--- a/lib/classes/StudipSemTreeViewAdmin.php
+++ b/lib/classes/StudipSemTreeViewAdmin.php
@@ -7,7 +7,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeViewAdmin.class.php
+// StudipSemTreeViewAdmin.php
 // Class to print out the seminar tree in administration mode
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/StudipSemTreeViewSimple.php b/lib/classes/StudipSemTreeViewSimple.php
index e2dba76..239275b 100644
--- a/lib/classes/StudipSemTreeViewSimple.php
+++ b/lib/classes/StudipSemTreeViewSimple.php
@@ -6,7 +6,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipSemTreeViewSimple.class.php
+// StudipSemTreeViewSimple.php
 // Class to print out the seminar tree
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/TreeAbstract.php b/lib/classes/TreeAbstract.php
index ccdb6e1..a1413b3 100644
--- a/lib/classes/TreeAbstract.php
+++ b/lib/classes/TreeAbstract.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// TreeAbstract.class.php
+// TreeAbstract.php
 // Abstract Base Class to handle in-memory tree structures
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/classes/TreeView.php b/lib/classes/TreeView.php
index 243a9b9..0bc2810 100644
--- a/lib/classes/TreeView.php
+++ b/lib/classes/TreeView.php
@@ -5,8 +5,8 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// TreeView.class.php
-// Class to print out html represantation of a tree object based on TreeAbstract.class.php
+// TreeView.php
+// Class to print out html represantation of a tree object based on TreeAbstract.php
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
 // Suchi & Berg GmbH <info@data-quest.de>
@@ -26,9 +26,7 @@
 // +---------------------------------------------------------------------------+
 
 /**
-* Class to print out html represantation of a tree object based on TreeAbstract.class.php
-*
-* Class to print out html represantation of a tree object based on TreeAbstract.class.php
+* Class to print out html represantation of a tree object based on TreeAbstract.php
 *
 * @access   public
 * @author   André Noack <noack@data-quest.de>
diff --git a/lib/classes/UserConfig.php b/lib/classes/UserConfig.php
index 4cb1ff6..413d4c8 100644
--- a/lib/classes/UserConfig.php
+++ b/lib/classes/UserConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserConfig.class.php
+ * UserConfig.php
  * provides access to user preferences
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/UserLookup.php b/lib/classes/UserLookup.php
index bdd9fc3..62de8fd 100644
--- a/lib/classes/UserLookup.php
+++ b/lib/classes/UserLookup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserLookup.class.php
+ * UserLookup.php
  *
  * provides an easy way to look up user ids by certain filter criteria
  *
diff --git a/lib/classes/UserManagement.php b/lib/classes/UserManagement.php
index 015e6cd..4bd47ec 100644
--- a/lib/classes/UserManagement.php
+++ b/lib/classes/UserManagement.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter007: TODO
 /**
- * UserManagement.class.php
+ * UserManagement.php
  *
  * Management for the Stud.IP global users
  *
@@ -25,7 +25,7 @@ require_once 'lib/messaging.inc.php';   // remove messages send or recieved by u
 require_once 'lib/object.inc.php';
 
 /**
- * UserManagement.class.php
+ * UserManagement.php
  *
  * Management for the Stud.IP global users
  *
diff --git a/lib/classes/admission/AdmissionAlgorithm.php b/lib/classes/admission/AdmissionAlgorithm.php
index 7e9df92..fae1061 100644
--- a/lib/classes/admission/AdmissionAlgorithm.php
+++ b/lib/classes/admission/AdmissionAlgorithm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * AdmissionAlgorithm.class.php
+ * AdmissionAlgorithm.php
  * 
  * Abstract class for seminar seat distribution. A concrete algorithm 
  * needs to be implemented.
@@ -32,4 +32,4 @@ abstract class AdmissionAlgorithm
 
 } /* end of class AdmissionAlgorithm */
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/classes/admission/AdmissionPriority.php b/lib/classes/admission/AdmissionPriority.php
index 47e1564..22d426e 100644
--- a/lib/classes/admission/AdmissionPriority.php
+++ b/lib/classes/admission/AdmissionPriority.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * AdmissionPriority.class.php
+ * AdmissionPriority.php
  *
  * This class represents priorities a user has given to a set of courses.
  * No instance is needed, all methods are designed to be called statically.
diff --git a/lib/classes/admission/AdmissionRule.php b/lib/classes/admission/AdmissionRule.php
index fe5e5bb..2b826e4 100644
--- a/lib/classes/admission/AdmissionRule.php
+++ b/lib/classes/admission/AdmissionRule.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * AdmissionRule.class.php
+ * AdmissionRule.php
  *
  * An abstract representation of rules for course admission.
  *
diff --git a/lib/classes/admission/AdmissionUserList.php b/lib/classes/admission/AdmissionUserList.php
index 570bc62..3e5a430 100644
--- a/lib/classes/admission/AdmissionUserList.php
+++ b/lib/classes/admission/AdmissionUserList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * AdmissionUserList.class.php
+ * AdmissionUserList.php
  *
  * Contains users that get different probabilities than others in seat
  * distribution algorithm.
diff --git a/lib/classes/admission/CourseSet.php b/lib/classes/admission/CourseSet.php
index d94bc05..cf87667 100644
--- a/lib/classes/admission/CourseSet.php
+++ b/lib/classes/admission/CourseSet.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * CourseSet.class.php
+ * CourseSet.php
  *
  * Represents groups of Stud.IP courses that have common rules for admission.
  *
diff --git a/lib/classes/admission/RandomAlgorithm.php b/lib/classes/admission/RandomAlgorithm.php
index 54d44d7..4666f59 100644
--- a/lib/classes/admission/RandomAlgorithm.php
+++ b/lib/classes/admission/RandomAlgorithm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RandomAlgorithm.class.php - Standard seat distribution algorithm
+ * RandomAlgorithm.php - Standard seat distribution algorithm
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/admission/UserFilter.php b/lib/classes/admission/UserFilter.php
index d380ef0..692422f 100644
--- a/lib/classes/admission/UserFilter.php
+++ b/lib/classes/admission/UserFilter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * UserFilter.class.php
+ * UserFilter.php
  *
  * Conditions for user selection in Stud.IP. A condition is a collection of
  * condition fields, e.g. degree, course of study or semester. Each
diff --git a/lib/classes/admission/UserFilterField.php b/lib/classes/admission/UserFilterField.php
index 9081e90..4b51322 100644
--- a/lib/classes/admission/UserFilterField.php
+++ b/lib/classes/admission/UserFilterField.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * UserFilterField.class.php
+ * UserFilterField.php
  *
  * A specification of a Stud.IP condition that must be fulfilled. One
  * or more instances of the UserFilterField subclasses make up a
@@ -197,11 +197,10 @@ class UserFilterField
         if (self::$available_filter_fields === null) {
         $fields = [];
         // Load all PHP class files found in the condition field folder.
-        foreach (glob(realpath(dirname(__FILE__).'/userfilter').'/*.class.php') as $file) {
+        foreach (glob(realpath(dirname(__FILE__).'/userfilter').'/*.php') as $file) {
             require_once($file);
             // Try to auto-calculate class name from file name.
-            $className = mb_substr(basename($file), 0,
-                mb_strpos(basename($file), '.class.php'));
+            $className = mb_substr(basename($file), 0, mb_strpos(basename($file), '.php'));
             // Check if class is right.
             if (is_subclass_of($className, 'UserFilterField')) {
                 if ($className::$isParameterized) {
diff --git a/lib/classes/admission/userfilter/DatafieldCondition.php b/lib/classes/admission/userfilter/DatafieldCondition.php
index 966fe8e..1bc93e8 100644
--- a/lib/classes/admission/userfilter/DatafieldCondition.php
+++ b/lib/classes/admission/userfilter/DatafieldCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DatafieldCondition.class.php
+ * DatafieldCondition.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/admission/userfilter/DegreeCondition.php b/lib/classes/admission/userfilter/DegreeCondition.php
index 9180e2d..61ce456 100644
--- a/lib/classes/admission/userfilter/DegreeCondition.php
+++ b/lib/classes/admission/userfilter/DegreeCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DegreeCondition.class.php
+ * DegreeCondition.php
  *
  * All conditions concerning the study degree in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/PermissionCondition.php b/lib/classes/admission/userfilter/PermissionCondition.php
index 4adfdbf..fe9458c 100644
--- a/lib/classes/admission/userfilter/PermissionCondition.php
+++ b/lib/classes/admission/userfilter/PermissionCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PermissionCondition.class.php
+ * PermissionCondition.php
  *
  * All conditions concerning the semester of study in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/SemesterOfStudyCondition.php b/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
index 2c1233a..5794f75 100644
--- a/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
+++ b/lib/classes/admission/userfilter/SemesterOfStudyCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SemesterOfStudyCondition.class.php
+ * SemesterOfStudyCondition.php
  *
  * All conditions concerning the semester of study in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/StgteilVersionCondition.php b/lib/classes/admission/userfilter/StgteilVersionCondition.php
index f6348e5..ec5c1f3 100644
--- a/lib/classes/admission/userfilter/StgteilVersionCondition.php
+++ b/lib/classes/admission/userfilter/StgteilVersionCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StgteilVersionCondition.class.php
+ * StgteilVersionCondition.php
  *
  * All conditions concerning the Studiengangteil-Versionen in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/SubjectCondition.php b/lib/classes/admission/userfilter/SubjectCondition.php
index ab44d49..7aa5f26 100644
--- a/lib/classes/admission/userfilter/SubjectCondition.php
+++ b/lib/classes/admission/userfilter/SubjectCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SubjectCondition.class.php
+ * SubjectCondition.php
  *
  * All conditions concerning the study subject in Stud.IP can be specified here.
  *
diff --git a/lib/classes/admission/userfilter/SubjectConditionAny.php b/lib/classes/admission/userfilter/SubjectConditionAny.php
index 107c86c..3a3712b 100644
--- a/lib/classes/admission/userfilter/SubjectConditionAny.php
+++ b/lib/classes/admission/userfilter/SubjectConditionAny.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SubjectConditionAny.class.php
+ * SubjectConditionAny.php
  *
  * All conditions concerning the study subject in Stud.IP can be specified here.
  *
@@ -14,7 +14,7 @@
  * @category    Stud.IP
  */
 
-require_once realpath(__DIR__ . '/..') . '/UserFilterField.class.php';
+require_once realpath(__DIR__ . '/..') . '/UserFilterField.php';
 
 class SubjectConditionAny extends UserFilterField
 {
diff --git a/lib/classes/auth_plugins/StudipAuthAbstract.php b/lib/classes/auth_plugins/StudipAuthAbstract.php
index 36c75df..19d5afa 100644
--- a/lib/classes/auth_plugins/StudipAuthAbstract.php
+++ b/lib/classes/auth_plugins/StudipAuthAbstract.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthAbstract.class.php
+// StudipAuthAbstract.php
 // Abstract class, used as a template for authentication plugins
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/auth_plugins/StudipAuthIP.php b/lib/classes/auth_plugins/StudipAuthIP.php
index e0d6afa..dd42a28 100644
--- a/lib/classes/auth_plugins/StudipAuthIP.php
+++ b/lib/classes/auth_plugins/StudipAuthIP.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StudipAuthIP.class.php - Stud.IP authentication with user ip
+ * StudipAuthIP.php - Stud.IP authentication with user ip
  * Copyright (c) 2014  Florian Bieringer, Uni Passau
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthLTI.php b/lib/classes/auth_plugins/StudipAuthLTI.php
index 07ab8c3..d5a2863 100644
--- a/lib/classes/auth_plugins/StudipAuthLTI.php
+++ b/lib/classes/auth_plugins/StudipAuthLTI.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StudipAuthLTI.class.php - Stud.IP authentication against LTI 1.1 consumer
+ * StudipAuthLTI.php - Stud.IP authentication against LTI 1.1 consumer
  * Copyright (c) 2018  Elmar Ludwig
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthLdap.php b/lib/classes/auth_plugins/StudipAuthLdap.php
index 7cb8686..6bbd3fd 100644
--- a/lib/classes/auth_plugins/StudipAuthLdap.php
+++ b/lib/classes/auth_plugins/StudipAuthLdap.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthLdap.class.php
+// StudipAuthLdap.php
 // Stud.IP authentication against LDAP Server
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
index 742f0cb..3acb1d8 100644
--- a/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
+++ b/lib/classes/auth_plugins/StudipAuthLdapReadAndBind.php
@@ -4,7 +4,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthLdapReadAndBind.class.php
+// StudipAuthLdapReadAndBind.php
 // Stud.IP authentication against LDAP Server using read-only account and
 // user bind
 //
diff --git a/lib/classes/auth_plugins/StudipAuthOIDC.php b/lib/classes/auth_plugins/StudipAuthOIDC.php
index adfe9c9..b26c17b 100644
--- a/lib/classes/auth_plugins/StudipAuthOIDC.php
+++ b/lib/classes/auth_plugins/StudipAuthOIDC.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StudipAuthOpenID.class.php - Stud.IP authentication using OpenID Connect
+ * StudipAuthOpenID.php - Stud.IP authentication using OpenID Connect
  * Copyright (c) 2021  André Noack <noack@data-quest.de>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthSSO.php b/lib/classes/auth_plugins/StudipAuthSSO.php
index 752fa59..dd6af11 100644
--- a/lib/classes/auth_plugins/StudipAuthSSO.php
+++ b/lib/classes/auth_plugins/StudipAuthSSO.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /*
- * StudipAuthSSO.class.php - abstract base class for SSO auth plugins
+ * StudipAuthSSO.php - abstract base class for SSO auth plugins
  * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthShib.php b/lib/classes/auth_plugins/StudipAuthShib.php
index 3eedc65..135b3f6 100644
--- a/lib/classes/auth_plugins/StudipAuthShib.php
+++ b/lib/classes/auth_plugins/StudipAuthShib.php
@@ -3,7 +3,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /*
- * StudipAuthShib.class.php - Stud.IP authentication against Shibboleth server
+ * StudipAuthShib.php - Stud.IP authentication against Shibboleth server
  * Copyright (c) 2007  Elmar Ludwig, Universitaet Osnabrueck
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/auth_plugins/StudipAuthStandard.php b/lib/classes/auth_plugins/StudipAuthStandard.php
index 5bb3e65..927a13c 100644
--- a/lib/classes/auth_plugins/StudipAuthStandard.php
+++ b/lib/classes/auth_plugins/StudipAuthStandard.php
@@ -4,7 +4,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// StudipAuthStandard.class.php
+// StudipAuthStandard.php
 // Basic Stud.IP authentication, using the Stud.IP database
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/classes/cache/Exception.php b/lib/classes/cache/Exception.php
index 64ee364..061d090 100644
--- a/lib/classes/cache/Exception.php
+++ b/lib/classes/cache/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * CacheException.class.php
+ * CacheException.php
  * This file is part of Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/cache/InvalidCacheArgumentException.php b/lib/classes/cache/InvalidCacheArgumentException.php
index e85c6b2..a201cad 100644
--- a/lib/classes/cache/InvalidCacheArgumentException.php
+++ b/lib/classes/cache/InvalidCacheArgumentException.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * CacheException.class.php
+ * CacheException.php
  * This file is part of Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/cache/Item.php b/lib/classes/cache/Item.php
index 4e83d4d..99a6df8 100644
--- a/lib/classes/cache/Item.php
+++ b/lib/classes/cache/Item.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Item.class.php
+ * Item.php
  * This file is part of Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/calendar/ICalendarExport.php b/lib/classes/calendar/ICalendarExport.php
index 00147ef..d8d1af7 100644
--- a/lib/classes/calendar/ICalendarExport.php
+++ b/lib/classes/calendar/ICalendarExport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ICalendarExport.class.php
+ * ICalendarExport.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
index e79e1bd..c651714 100644
--- a/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
+++ b/lib/classes/coursewizardsteps/LVGroupsWizardStep.php
@@ -13,7 +13,7 @@
  * @category    Stud.IP
  */
 
-require_once dirname(__FILE__) . '/../StudipLvgruppeSelection.class.php';
+require_once dirname(__FILE__) . '/../StudipLvgruppeSelection.php';
 
 class LVGroupsWizardStep implements CourseWizardStep
 {
diff --git a/lib/classes/exportdocument/ExportPDF.php b/lib/classes/exportdocument/ExportPDF.php
index 915cfde..f676c45 100644
--- a/lib/classes/exportdocument/ExportPDF.php
+++ b/lib/classes/exportdocument/ExportPDF.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * ExportPDF.class.php - create and export or save a pdf with simple HTML-Data
+ * ExportPDF.php - create and export or save a pdf with simple HTML-Data
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/searchtypes/MyCoursesSearch.php b/lib/classes/searchtypes/MyCoursesSearch.php
index 64bee64..1bdb250 100644
--- a/lib/classes/searchtypes/MyCoursesSearch.php
+++ b/lib/classes/searchtypes/MyCoursesSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MyCoursesSearch.class.php
+ * MyCoursesSearch.php
  * Search only in own courses.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/searchtypes/PermissionSearch.php b/lib/classes/searchtypes/PermissionSearch.php
index cc4ce3e..3f86271 100644
--- a/lib/classes/searchtypes/PermissionSearch.php
+++ b/lib/classes/searchtypes/PermissionSearch.php
@@ -12,7 +12,7 @@
 
 /**
  * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search for people with a given
+ * (lib/classes/QuickSearch.php). You can search for people with a given
  * Stud.IP permission level, either globally or at an institute.
  *
  * @author Thomas Hackl
diff --git a/lib/classes/searchtypes/ResourceSearch.php b/lib/classes/searchtypes/ResourceSearch.php
index 24038a8..f664beb 100644
--- a/lib/classes/searchtypes/ResourceSearch.php
+++ b/lib/classes/searchtypes/ResourceSearch.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceSearch.class.php - A search type for resources.
+ * ResourceSearch.php - A search type for resources.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/searchtypes/RoomSearch.php b/lib/classes/searchtypes/RoomSearch.php
index 002712e..877c2cb 100644
--- a/lib/classes/searchtypes/RoomSearch.php
+++ b/lib/classes/searchtypes/RoomSearch.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RoomSearch.class.php - A search type for rooms.
+ * RoomSearch.php - A search type for rooms.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/classes/searchtypes/SQLSearch.php b/lib/classes/searchtypes/SQLSearch.php
index 86aff6d..de4efa3 100644
--- a/lib/classes/searchtypes/SQLSearch.php
+++ b/lib/classes/searchtypes/SQLSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * SQLSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ * SQLSearch.php - Class of type SearchType used for searches with QuickSearch
  *
  * Long description for file (if any)...
  *
@@ -17,7 +17,7 @@
 
 /**
  * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
+ * (lib/classes/QuickSearch.php). You can search with a sql-syntax in the
  * database. You just need to give in a query like for a PDB-prepare statement
  * and at least the variable ":input" in the query (the :input will be replaced
  * with the input of the QuickSearch userinput.
diff --git a/lib/classes/searchtypes/SearchType.php b/lib/classes/searchtypes/SearchType.php
index d46d57e..b4f9b68 100644
--- a/lib/classes/searchtypes/SearchType.php
+++ b/lib/classes/searchtypes/SearchType.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * SQLSearch.class.php - A class-structure for alle search-objects in Stud.IP.
+ * SQLSearch.php - A class-structure for alle search-objects in Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -104,4 +104,3 @@ abstract class SearchType
      */
     abstract public function includePath();
 }
-
diff --git a/lib/classes/searchtypes/SeminarSearch.php b/lib/classes/searchtypes/SeminarSearch.php
index e490228..fd7bf8a 100644
--- a/lib/classes/searchtypes/SeminarSearch.php
+++ b/lib/classes/searchtypes/SeminarSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * SeminarSearch.class.php
+ * SeminarSearch.php
  * class to adapt StudipSemSearch to Quicksearch
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/classes/searchtypes/StandardSearch.php b/lib/classes/searchtypes/StandardSearch.php
index 837a849..a3f0f3b 100644
--- a/lib/classes/searchtypes/StandardSearch.php
+++ b/lib/classes/searchtypes/StandardSearch.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /**
- * StandardSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ * StandardSearch.php - Class of type SearchType used for searches with QuickSearch
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,7 +15,7 @@
 
 /**
  * Class of type SearchType used for searches with QuickSearch
- * (lib/classes/QuickSearch.class.php). You can search with a sql-syntax in the
+ * (lib/classes/QuickSearch.php). You can search with a sql-syntax in the
  * database. You just need to give in a query like for a PDB-prepare statement
  * and at least the variable ":input" in the query (the :input will be replaced
  * with the input of the QuickSearch userinput.
diff --git a/lib/classes/searchtypes/TreeSearch.php b/lib/classes/searchtypes/TreeSearch.php
index 2fecf60..73d4239 100644
--- a/lib/classes/searchtypes/TreeSearch.php
+++ b/lib/classes/searchtypes/TreeSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * TreeSearch.class.php - Class of type SearchType used for searches with QuickSearch
+ * TreeSearch.php - Class of type SearchType used for searches with QuickSearch
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/cronjobs/check_admission.php b/lib/cronjobs/check_admission.php
index dfd493c..1be4c09 100644
--- a/lib/cronjobs/check_admission.php
+++ b/lib/cronjobs/check_admission.php
@@ -4,7 +4,7 @@ use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 
 /**
-* check_admission.class.php
+* check_admission.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
@@ -49,7 +49,7 @@ class CheckAdmissionJob extends CronJob
 
     public function setUp()
     {
-        require_once 'lib/classes/admission/CourseSet.class.php';
+        require_once 'lib/classes/admission/CourseSet.php';
         if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
             throw new Exception('To use check_admission job you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
         }
diff --git a/lib/cronjobs/cleanup_log.php b/lib/cronjobs/cleanup_log.php
index 378a6ec..e88f803 100644
--- a/lib/cronjobs/cleanup_log.php
+++ b/lib/cronjobs/cleanup_log.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// cleanup_log.class.php
+// cleanup_log.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class CleanupLogJob extends CronJob
 {
diff --git a/lib/cronjobs/garbage_collector.php b/lib/cronjobs/garbage_collector.php
index bab44b2..eba57fc 100644
--- a/lib/cronjobs/garbage_collector.php
+++ b/lib/cronjobs/garbage_collector.php
@@ -1,12 +1,12 @@
 <?php
 /**
-* garbage_collector.class.php
+* garbage_collector.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
 * @since  2.4
 */
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class GarbageCollectorJob extends CronJob
 {
diff --git a/lib/cronjobs/purge_cache.php b/lib/cronjobs/purge_cache.php
index d2e3697..2e253e1 100644
--- a/lib/cronjobs/purge_cache.php
+++ b/lib/cronjobs/purge_cache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * purge_cache.class.php - Purges the file cache.
+ * purge_cache.php - Purges the file cache.
  * 
  * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
  * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// purge_cache.class.php
+// purge_cache.php
 // 
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class PurgeCacheJob extends CronJob
 {
@@ -70,7 +70,7 @@ class PurgeCacheJob extends CronJob
      */
     public function setUp()
     {
-        require_once 'lib/classes/cache/FileCache.class.php';
+        require_once 'lib/classes/cache/FileCache.php';
     }
 
     /**
diff --git a/lib/cronjobs/remind_oer_upload.php b/lib/cronjobs/remind_oer_upload.php
index a1a8ee1..528d789 100644
--- a/lib/cronjobs/remind_oer_upload.php
+++ b/lib/cronjobs/remind_oer_upload.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * remind_oer_upload.class.php - Sends reminder emails for uploading files to OER Campus.
+ * remind_oer_upload.php - Sends reminder emails for uploading files to OER Campus.
  *
  * @author Michaela Brückner <brueckner@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
  * @access public
  * @since  5.2
  */
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class RemindOerUpload extends CronJob
 {
diff --git a/lib/cronjobs/send_mail_queue.php b/lib/cronjobs/send_mail_queue.php
index 8f72918..f9cdd94 100644
--- a/lib/cronjobs/send_mail_queue.php
+++ b/lib/cronjobs/send_mail_queue.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* send_mail_queue.class.php
+* send_mail_queue.php
 *
 * @author Rasmus Fuhse <fuhse@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
diff --git a/lib/cronjobs/session_gc.php b/lib/cronjobs/session_gc.php
index 4289a29..54763ee 100644
--- a/lib/cronjobs/session_gc.php
+++ b/lib/cronjobs/session_gc.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* session_gc.class.php
+* session_gc.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
diff --git a/lib/dbviews/range_tree.view.php b/lib/dbviews/range_tree.view.php
index 8d3af86..913330d 100644
--- a/lib/dbviews/range_tree.view.php
+++ b/lib/dbviews/range_tree.view.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// range_tree.view.class.php
+// range_tree.view.php
 // Database views used with "range_tree"
 //
 // Copyright (c) 2002 André Noack <noack@data-quest.de>
diff --git a/lib/dbviews/sem_tree.view.php b/lib/dbviews/sem_tree.view.php
index 008ee93..8980e71 100644
--- a/lib/dbviews/sem_tree.view.php
+++ b/lib/dbviews/sem_tree.view.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// sem_tree.view.class.php
+// sem_tree.view.php
 // Database views used with "sem_tree"
 //
 // Copyright (c) 2003 André Noack <noack@data-quest.de>
diff --git a/lib/elearning/ConnectedCMS.php b/lib/elearning/ConnectedCMS.php
index 3dd3bfb..f5617e8 100644
--- a/lib/elearning/ConnectedCMS.php
+++ b/lib/elearning/ConnectedCMS.php
@@ -100,15 +100,15 @@ class ConnectedCMS
     public function initSubclasses()
     {
         if ($this->auth_necessary) {
-            require_once $this->CLASS_PREFIX . "ConnectedUser.class.php";
+            require_once $this->CLASS_PREFIX . "ConnectedUser.php";
             $classname = $this->CLASS_PREFIX . "ConnectedUser";
             $this->user = new $classname($this->cms_type);
 
-            require_once $this->CLASS_PREFIX  . "ConnectedPermissions.class.php";
+            require_once $this->CLASS_PREFIX  . "ConnectedPermissions.php";
             $classname = $this->CLASS_PREFIX  . "ConnectedPermissions";
             $this->permissions = new $classname($this->cms_type);
         }
-        require_once $this->CLASS_PREFIX . "ConnectedLink.class.php";
+        require_once $this->CLASS_PREFIX . "ConnectedLink.php";
         $classname = $this->CLASS_PREFIX . "ConnectedLink";
         $this->link = new $classname($this->cms_type);
     }
@@ -203,14 +203,14 @@ class ConnectedCMS
         $el_path = $GLOBALS['STUDIP_BASE_PATH'] . '/lib/elearning';
         // check if needed classes exist
         $files = [
-            'class_link'    => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.class.php",
-            'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.class.php",
-            'class_cms'     => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.class.php",
+            'class_link'    => "{$el_path}/{$this->CLASS_PREFIX}ConnectedLink.php",
+            'class_content' => "{$el_path}/{$this->CLASS_PREFIX}ContentModule.php",
+            'class_cms'     => "{$el_path}/{$this->CLASS_PREFIX}ConnectedCMS.php",
         ];
 
         if ($this->auth_necessary) {
-            $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.class.php";
-            $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.class.php";
+            $files['class_user'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedUser.php";
+            $files['class_perm'] = "{$el_path}/{$this->CLASS_PREFIX}ConnectedPermissions.php";
         }
 
         $errors = 0;
@@ -281,7 +281,7 @@ class ConnectedCMS
         global $current_module;
         $current_module = $data["ref_id"];
 
-        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
+        require_once($this->CLASS_PREFIX . "ContentModule.php");
         $classname = $this->CLASS_PREFIX  . "ContentModule";
 
         $this->content_module[$current_module] = new  $classname("", $data["type"], $this->cms_type);
@@ -305,7 +305,7 @@ class ConnectedCMS
         global $current_module;
         $current_module = $module_id;
 
-        require_once($this->CLASS_PREFIX . "ContentModule.class.php");
+        require_once($this->CLASS_PREFIX . "ContentModule.php");
         $classname = $this->CLASS_PREFIX  . "ContentModule";
 
         if ($is_connected == false)
diff --git a/lib/elearning/ELearningUtils.php b/lib/elearning/ELearningUtils.php
index 33fb4a2..806cff9 100644
--- a/lib/elearning/ELearningUtils.php
+++ b/lib/elearning/ELearningUtils.php
@@ -26,7 +26,7 @@ class ELearningUtils
         global $connected_cms, $ELEARNING_INTERFACE_MODULES;
 
         if (!isset($connected_cms[$cms]) || !is_object($connected_cms[$cms])) {
-            require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.class.php";
+            require_once "lib/elearning/{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS.php";
             $classname = "{$ELEARNING_INTERFACE_MODULES[$cms]['CLASS_PREFIX']}ConnectedCMS";
             $connected_cms[$cms] = new $classname($cms);
             $connected_cms[$cms]->initSubclasses();
diff --git a/lib/elearning/Ilias3ConnectedCMS.php b/lib/elearning/Ilias3ConnectedCMS.php
index 3e428ff..759880a 100644
--- a/lib/elearning/Ilias3ConnectedCMS.php
+++ b/lib/elearning/Ilias3ConnectedCMS.php
@@ -44,7 +44,7 @@ class Ilias3ConnectedCMS extends ConnectedCMS
 
         parent::__construct($cms);
 
-        require_once($this->CLASS_PREFIX . "Soap.class.php");
+        require_once($this->CLASS_PREFIX . "Soap.php");
         $classname = $this->CLASS_PREFIX . "Soap";
         $this->soap_client = new $classname($this->cms_type);
         $this->soap_client->setCachingStatus(true);
diff --git a/lib/elearning/PmWikiConnectedCMS.php b/lib/elearning/PmWikiConnectedCMS.php
index 7de0a78..d890126 100644
--- a/lib/elearning/PmWikiConnectedCMS.php
+++ b/lib/elearning/PmWikiConnectedCMS.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 
 /*
- * PmWikiConnectedCMS.class.php - Provides search capabilities
+ * PmWikiConnectedCMS.php - Provides search capabilities
  * to search WikiFarm
  *
  * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
diff --git a/lib/elearning/PmWikiConnectedLink.php b/lib/elearning/PmWikiConnectedLink.php
index 8ed7416..973c272 100644
--- a/lib/elearning/PmWikiConnectedLink.php
+++ b/lib/elearning/PmWikiConnectedLink.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 
 /*
- * PmWikiConnectedLink.class.php - Provides links to PmWiki Modules
+ * PmWikiConnectedLink.php - Provides links to PmWiki Modules
  *
  * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
  *
diff --git a/lib/elearning/PmWikiContentModule.php b/lib/elearning/PmWikiContentModule.php
index 06533dd..fb3cccd 100644
--- a/lib/elearning/PmWikiContentModule.php
+++ b/lib/elearning/PmWikiContentModule.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 
 /*
- * PmWikiContentModule.class.php - Provides access PmWiki Modules
+ * PmWikiContentModule.php - Provides access PmWiki Modules
  *
  * Copyright (C) 2006 - Marco Diedrich (mdiedric@uos.de)
  *
diff --git a/lib/exceptions/ClipboardException.php b/lib/exceptions/ClipboardException.php
index 676da93..1c80175 100644
--- a/lib/exceptions/ClipboardException.php
+++ b/lib/exceptions/ClipboardException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ClipboardException.class.php
+ * ClipboardException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/StudipException.php b/lib/exceptions/StudipException.php
index e9bbf3d..369ba6f 100644
--- a/lib/exceptions/StudipException.php
+++ b/lib/exceptions/StudipException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * StudipException.class.php
+ * StudipException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/GlobalResourceLockException.php b/lib/exceptions/resources/GlobalResourceLockException.php
index 165843f..d12c2d8 100644
--- a/lib/exceptions/resources/GlobalResourceLockException.php
+++ b/lib/exceptions/resources/GlobalResourceLockException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GlobalResourceLockException.class.php
+ * GlobalResourceLockException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/GlobalResourceLockOverlapException.php b/lib/exceptions/resources/GlobalResourceLockOverlapException.php
index 6b05cf5..b73a897 100644
--- a/lib/exceptions/resources/GlobalResourceLockOverlapException.php
+++ b/lib/exceptions/resources/GlobalResourceLockOverlapException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GlobalResourceLockOverlapException.class.php
+ * GlobalResourceLockOverlapException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceCategoryException.php b/lib/exceptions/resources/InvalidResourceCategoryException.php
index df4d36c..f2b1fe9 100644
--- a/lib/exceptions/resources/InvalidResourceCategoryException.php
+++ b/lib/exceptions/resources/InvalidResourceCategoryException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceCategoryException.class.php
+ * InvalidResourceCategoryException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceClassException.php b/lib/exceptions/resources/InvalidResourceClassException.php
index 8420a83..2c1f033 100644
--- a/lib/exceptions/resources/InvalidResourceClassException.php
+++ b/lib/exceptions/resources/InvalidResourceClassException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceClassException.class.php
+ * InvalidResourceClassException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceException.php b/lib/exceptions/resources/InvalidResourceException.php
index e9850b8..de61d24 100644
--- a/lib/exceptions/resources/InvalidResourceException.php
+++ b/lib/exceptions/resources/InvalidResourceException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceException.class.php
+ * InvalidResourceException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/InvalidResourceRequestException.php b/lib/exceptions/resources/InvalidResourceRequestException.php
index 8ec9dab..8ee48b3 100644
--- a/lib/exceptions/resources/InvalidResourceRequestException.php
+++ b/lib/exceptions/resources/InvalidResourceRequestException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * InvalidResourceRequestException.class.php
+ * InvalidResourceRequestException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceBookingException.php b/lib/exceptions/resources/ResourceBookingException.php
index c1db11c..3dcf483 100644
--- a/lib/exceptions/resources/ResourceBookingException.php
+++ b/lib/exceptions/resources/ResourceBookingException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingException.class.php
+ * ResourceBookingException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceBookingOverlapException.php b/lib/exceptions/resources/ResourceBookingOverlapException.php
index f59cc39..697cfc5 100644
--- a/lib/exceptions/resources/ResourceBookingOverlapException.php
+++ b/lib/exceptions/resources/ResourceBookingOverlapException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingOverlapException.class.php
+ * ResourceBookingOverlapException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceBookingRangeException.php b/lib/exceptions/resources/ResourceBookingRangeException.php
index 50e7144..48e04a2 100644
--- a/lib/exceptions/resources/ResourceBookingRangeException.php
+++ b/lib/exceptions/resources/ResourceBookingRangeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingRangeException.class.php
+ * ResourceBookingRangeException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceException.php b/lib/exceptions/resources/ResourceException.php
index 686cc33..3f7a5ad 100644
--- a/lib/exceptions/resources/ResourceException.php
+++ b/lib/exceptions/resources/ResourceException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceException.class.php
+ * ResourceException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceNoTimeRangeException.php b/lib/exceptions/resources/ResourceNoTimeRangeException.php
index 891b583..f1c5f2c 100644
--- a/lib/exceptions/resources/ResourceNoTimeRangeException.php
+++ b/lib/exceptions/resources/ResourceNoTimeRangeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceNoTimeRangeException.class.php
+ * ResourceNoTimeRangeException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePermissionException.php b/lib/exceptions/resources/ResourcePermissionException.php
index 3a0c919..add7385 100644
--- a/lib/exceptions/resources/ResourcePermissionException.php
+++ b/lib/exceptions/resources/ResourcePermissionException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePermissionException.class.php
+ * ResourcePermissionException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePropertyDefinitionException.php b/lib/exceptions/resources/ResourcePropertyDefinitionException.php
index 963ca64..5b96dd9 100644
--- a/lib/exceptions/resources/ResourcePropertyDefinitionException.php
+++ b/lib/exceptions/resources/ResourcePropertyDefinitionException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyDefinitionException.class.php
+ * ResourcePropertyDefinitionException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePropertyException.php b/lib/exceptions/resources/ResourcePropertyException.php
index 83f871f..917c3b0 100644
--- a/lib/exceptions/resources/ResourcePropertyException.php
+++ b/lib/exceptions/resources/ResourcePropertyException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyException.class.php
+ * ResourcePropertyException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourcePropertyStateException.php b/lib/exceptions/resources/ResourcePropertyStateException.php
index 1880265..b93d6da 100644
--- a/lib/exceptions/resources/ResourcePropertyStateException.php
+++ b/lib/exceptions/resources/ResourcePropertyStateException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyStateException.class.php
+ * ResourcePropertyStateException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceRequestException.php b/lib/exceptions/resources/ResourceRequestException.php
index 1e8d071..ffd238c 100644
--- a/lib/exceptions/resources/ResourceRequestException.php
+++ b/lib/exceptions/resources/ResourceRequestException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequestException.class.php
+ * ResourceRequestException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceUnavailableException.php b/lib/exceptions/resources/ResourceUnavailableException.php
index b335d14..86f33c7 100644
--- a/lib/exceptions/resources/ResourceUnavailableException.php
+++ b/lib/exceptions/resources/ResourceUnavailableException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceUnavailableException.class.php
+ * ResourceUnavailableException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/ResourceUnlockableException.php b/lib/exceptions/resources/ResourceUnlockableException.php
index 11bc92b..968729f 100644
--- a/lib/exceptions/resources/ResourceUnlockableException.php
+++ b/lib/exceptions/resources/ResourceUnlockableException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceUnlockableException.class.php
+ * ResourceUnlockableException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/exceptions/resources/SeparableRoomException.php b/lib/exceptions/resources/SeparableRoomException.php
index 78c9912..91a8c10 100644
--- a/lib/exceptions/resources/SeparableRoomException.php
+++ b/lib/exceptions/resources/SeparableRoomException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * SeparableRoomException.class.php
+ * SeparableRoomException.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/filesystem/FileArchiveManager.php b/lib/filesystem/FileArchiveManager.php
index 704bb44..aded83c 100644
--- a/lib/filesystem/FileArchiveManager.php
+++ b/lib/filesystem/FileArchiveManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * FileArchiveManager.class.php
+ * FileArchiveManager.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/filesystem/HomeworkFolder.php b/lib/filesystem/HomeworkFolder.php
index fb93ef8..f46b4a0 100644
--- a/lib/filesystem/HomeworkFolder.php
+++ b/lib/filesystem/HomeworkFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * HomeworkFolder.class.php
+ * HomeworkFolder.php
  *
  * This is a FolderType implementation for homework folders.
  *
diff --git a/lib/filesystem/InboxFolder.php b/lib/filesystem/InboxFolder.php
index 428bea5..d692158 100644
--- a/lib/filesystem/InboxFolder.php
+++ b/lib/filesystem/InboxFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InboxFolder.class.php
+ * InboxFolder.php
  *
  * This is a FolderType implementation for file attachments of messages
  * that were received by a user. It is a read-only folder.
diff --git a/lib/filesystem/InboxOutboxFolder.php b/lib/filesystem/InboxOutboxFolder.php
index 6a8f2fd..33ba6d2 100644
--- a/lib/filesystem/InboxOutboxFolder.php
+++ b/lib/filesystem/InboxOutboxFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * InboxOutboxFolder.class.php
+ * InboxOutboxFolder.php
  *
  * This is a common FolderType implementation for inbox and outbox folders.
  * It it not meant to be used directly! Instead use the InboxFolder and
diff --git a/lib/filesystem/MessageFolder.php b/lib/filesystem/MessageFolder.php
index 2e5c3af..2dfef0c 100644
--- a/lib/filesystem/MessageFolder.php
+++ b/lib/filesystem/MessageFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MessageFolder.class.php
+ * MessageFolder.php
  *
  * This is a FolderType implementation for message folders.
  * A message folder contains the attachments of a Stud.IP message.
diff --git a/lib/filesystem/OutboxFolder.php b/lib/filesystem/OutboxFolder.php
index 22170d5..5487258 100644
--- a/lib/filesystem/OutboxFolder.php
+++ b/lib/filesystem/OutboxFolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * OutboxFolder.class.php
+ * OutboxFolder.php
  *
  * This is a FolderType implementation for file attachments of messages
  * that were sent by a user. It is a read-only folder.
diff --git a/lib/models/AdmissionApplication.php b/lib/models/AdmissionApplication.php
index 02514ec..7e8c3f5 100644
--- a/lib/models/AdmissionApplication.php
+++ b/lib/models/AdmissionApplication.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * AdmissionApplication.class.php
+ * AdmissionApplication.php
  * model class for table admission_seminar_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/ArchivedCourse.php b/lib/models/ArchivedCourse.php
index 81879af..f3b2de8 100644
--- a/lib/models/ArchivedCourse.php
+++ b/lib/models/ArchivedCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ArchivedCourse.class.php
+ * ArchivedCourse.php
  * model class for table archiv
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/ArchivedCourseMember.php b/lib/models/ArchivedCourseMember.php
index 1febd35..e54de91 100644
--- a/lib/models/ArchivedCourseMember.php
+++ b/lib/models/ArchivedCourseMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ArchivedCourseMember.class.php
+ * ArchivedCourseMember.php
  * model class for table seminar_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/AuthUserMd5.php b/lib/models/AuthUserMd5.php
index 48e27f8..d8b7c53 100644
--- a/lib/models/AuthUserMd5.php
+++ b/lib/models/AuthUserMd5.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * AuthUserMd5.class.php
+ * AuthUserMd5.php
  * model class for table auth_user_md5
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/BannerRoles.php b/lib/models/BannerRoles.php
index d1c2986..a460986 100644
--- a/lib/models/BannerRoles.php
+++ b/lib/models/BannerRoles.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * BannerRoles.class.php - model class for the banner roles
+ * BannerRoles.php - model class for the banner roles
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/Clipboard.php b/lib/models/Clipboard.php
index cd8fe89..01282cc 100644
--- a/lib/models/Clipboard.php
+++ b/lib/models/Clipboard.php
@@ -2,7 +2,7 @@
 
 
 /**
- * Clipboard.class.php - model class for a clipboard (Merkzettel)
+ * Clipboard.php - model class for a clipboard (Merkzettel)
  *
  * The Clipboard class extends the wish list functionality of the clipboard
  * in the old literature management to allow it to be used in other areas of the
diff --git a/lib/models/ClipboardItem.php b/lib/models/ClipboardItem.php
index 888250f..a19eeaf 100644
--- a/lib/models/ClipboardItem.php
+++ b/lib/models/ClipboardItem.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ClipboardItem.class.php - model class for clipboard items
+ * ClipboardItem.php - model class for clipboard items
  * (Merkzettel-Einträge)
  *
  * The ClipboardItem class holds single items of a clipboard.
diff --git a/lib/models/ColourValue.php b/lib/models/ColourValue.php
index 6ae05ad..486de45 100644
--- a/lib/models/ColourValue.php
+++ b/lib/models/ColourValue.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ColorValue.class.php
+ * ColorValue.php
  * model class for table color_values
  *
  * Objects of this class holds a colour's name (its purpose)
diff --git a/lib/models/ConfigEntry.php b/lib/models/ConfigEntry.php
index 5e06da8..dd0efa4 100644
--- a/lib/models/ConfigEntry.php
+++ b/lib/models/ConfigEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ConfigEntry.class.php
+ * ConfigEntry.php
  * model class for table user_config
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/Contact.php b/lib/models/Contact.php
index 16bff26..bea5b95 100644
--- a/lib/models/Contact.php
+++ b/lib/models/Contact.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Contact.class.php - model class for table contact
+ * Contact.php - model class for table contact
  *
  * @author      <mlunzena@uos.de>
  * @license GPL 2 or later
diff --git a/lib/models/ContentTermsOfUse.php b/lib/models/ContentTermsOfUse.php
index fb2e592..1982dd6 100644
--- a/lib/models/ContentTermsOfUse.php
+++ b/lib/models/ContentTermsOfUse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ContentTermsOfUse.class.php
+ * ContentTermsOfUse.php
  * model class for table licenses
  *
  * The ContentTermsOfUse class provides information about the terms under which
diff --git a/lib/models/Course.php b/lib/models/Course.php
index bfea7a0..d8bb2f5 100644
--- a/lib/models/Course.php
+++ b/lib/models/Course.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Course.class.php
+ * Course.php
  * model class for table seminare
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/CourseMember.php b/lib/models/CourseMember.php
index cd7555f..7c4b335 100644
--- a/lib/models/CourseMember.php
+++ b/lib/models/CourseMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CourseMember.class.php
+ * CourseMember.php
  * model class for table seminar_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/CourseMemberNotification.php b/lib/models/CourseMemberNotification.php
index e72ba76..5e1b544 100644
--- a/lib/models/CourseMemberNotification.php
+++ b/lib/models/CourseMemberNotification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CourseMemberNotification.class.php
+ * CourseMemberNotification.php
  * model class for table seminar_user_notification
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/Courseware/BlockTypes/Text.php b/lib/models/Courseware/BlockTypes/Text.php
index 917efb3..1da7cbe 100644
--- a/lib/models/Courseware/BlockTypes/Text.php
+++ b/lib/models/Courseware/BlockTypes/Text.php
@@ -2,8 +2,6 @@
 
 namespace Courseware\BlockTypes;
 
-require_once 'lib/classes/Markup.class.php';
-
 /**
  * This class represents the content of a Courseware text block.
  *
diff --git a/lib/models/CronjobLog.php b/lib/models/CronjobLog.php
index c9e92f7..278a515 100644
--- a/lib/models/CronjobLog.php
+++ b/lib/models/CronjobLog.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobLog.class.php
+// CronjobLog.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/models/CronjobSchedule.php b/lib/models/CronjobSchedule.php
index 0eb19ba..08a18d3 100644
--- a/lib/models/CronjobSchedule.php
+++ b/lib/models/CronjobSchedule.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobSchedule.class.php
+// CronjobSchedule.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/models/CronjobTask.php b/lib/models/CronjobTask.php
index 8a56ca0..1304bc1 100644
--- a/lib/models/CronjobTask.php
+++ b/lib/models/CronjobTask.php
@@ -1,7 +1,7 @@
 <?php
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CronjobSchedule.class.php
+// CronjobSchedule.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
diff --git a/lib/models/Degree.php b/lib/models/Degree.php
index 6fef834..9c908d3 100644
--- a/lib/models/Degree.php
+++ b/lib/models/Degree.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Degree.class.php
+ * Degree.php
  * model class for table studiengang
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/Deputy.php b/lib/models/Deputy.php
index e2917e7..c74c741 100644
--- a/lib/models/Deputy.php
+++ b/lib/models/Deputy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Deputy.class.php
+ * Deputy.php
  * model class for table deputies
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/HelpContent.php b/lib/models/HelpContent.php
index f1e61b1..e9a6f47 100644
--- a/lib/models/HelpContent.php
+++ b/lib/models/HelpContent.php
@@ -21,7 +21,7 @@
 //require_once 'lib/object.inc.php';
 
 /**
- * HelpContent.class.php - model class for Stud.IP help content
+ * HelpContent.php - model class for Stud.IP help content
  *
  * @author   Arne Schröder <schroeder@data-quest>
  * @access   public
diff --git a/lib/models/HelpTour.php b/lib/models/HelpTour.php
index 68bd830..978e203 100644
--- a/lib/models/HelpTour.php
+++ b/lib/models/HelpTour.php
@@ -21,7 +21,7 @@
 require_once 'lib/object.inc.php';
 
 /**
- * HelpTour.class.php - model class for Stud.IP tours
+ * HelpTour.php - model class for Stud.IP tours
  *
  *
  *
diff --git a/lib/models/HelpTourAudience.php b/lib/models/HelpTourAudience.php
index 6255a46..f341196 100644
--- a/lib/models/HelpTourAudience.php
+++ b/lib/models/HelpTourAudience.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourSteps.class.php - model class for tour audiences
+ * HelpTourSteps.php - model class for tour audiences
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/HelpTourSettings.php b/lib/models/HelpTourSettings.php
index f24c86b..1cac957 100644
--- a/lib/models/HelpTourSettings.php
+++ b/lib/models/HelpTourSettings.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourSteps.class.php - model class for tour steps
+ * HelpTourSteps.php - model class for tour steps
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/HelpTourStep.php b/lib/models/HelpTourStep.php
index 6f31326..3bd5ad8 100644
--- a/lib/models/HelpTourStep.php
+++ b/lib/models/HelpTourStep.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourSteps.class.php - model class for tour steps
+ * HelpTourSteps.php - model class for tour steps
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -104,4 +104,3 @@ class HelpTourStep extends SimpleORMap
         return true;
     }
 }
-
diff --git a/lib/models/HelpTourUser.php b/lib/models/HelpTourUser.php
index aa2869d..4992225 100644
--- a/lib/models/HelpTourUser.php
+++ b/lib/models/HelpTourUser.php
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 /**
- * HelpTourUser.class.php - model class for tour user visits
+ * HelpTourUser.php - model class for tour user visits
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/Institute.php b/lib/models/Institute.php
index 47cf271..df344ff 100644
--- a/lib/models/Institute.php
+++ b/lib/models/Institute.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Institute.class.php - model class for table Institute
+ * Institute.php - model class for table Institute
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/LockRule.php b/lib/models/LockRule.php
index a3ef271..83dec60 100644
--- a/lib/models/LockRule.php
+++ b/lib/models/LockRule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LockRule.class.php
+ * LockRule.php
  * model class for table lock_rule
  * this class represents one record of the lock_rules table
  * the column attributes is converted to an ArrayObject and vice-versa,
diff --git a/lib/models/LoginBackground.php b/lib/models/LoginBackground.php
index 3ede275..530ae42 100644
--- a/lib/models/LoginBackground.php
+++ b/lib/models/LoginBackground.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LoginBackground.class.php
+ * LoginBackground.php
  * model class for table loginbackgrounds
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/LoginFaq.php b/lib/models/LoginFaq.php
index d6cad40..4c049ac 100644
--- a/lib/models/LoginFaq.php
+++ b/lib/models/LoginFaq.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LoginFaq.class.php
+ * LoginFaq.php
  * model class for table login_faq
  *
  *
diff --git a/lib/models/Message.php b/lib/models/Message.php
index 46493d6..fb6b78e 100644
--- a/lib/models/Message.php
+++ b/lib/models/Message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Message.class.php
+ * Message.php
  * model class for table message
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/MessageUser.php b/lib/models/MessageUser.php
index 0ae6dd5..1715de1 100644
--- a/lib/models/MessageUser.php
+++ b/lib/models/MessageUser.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MessageUser.class.php
+ * MessageUser.php
  * model class for table message_user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/MvvOverlappingConflict.php b/lib/models/MvvOverlappingConflict.php
index 6ac8e29..54b367f 100644
--- a/lib/models/MvvOverlappingConflict.php
+++ b/lib/models/MvvOverlappingConflict.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MvvOverlappingConflict.class.php - model class for table mvv_ovl_conflicts
+ * MvvOverlappingConflict.php - model class for table mvv_ovl_conflicts
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/MvvOverlappingExclude.php b/lib/models/MvvOverlappingExclude.php
index d199e30..6cde414 100644
--- a/lib/models/MvvOverlappingExclude.php
+++ b/lib/models/MvvOverlappingExclude.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * MvvOverlappingExclude.class.php - model class for table mvv_ovl_excludes
+ * MvvOverlappingExclude.php - model class for table mvv_ovl_excludes
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -46,4 +46,3 @@ class MvvOverlappingExclude extends SimpleORMap
     }
 
 }
-
diff --git a/lib/models/MvvOverlappingSelection.php b/lib/models/MvvOverlappingSelection.php
index 9d159e2..b3fcc15 100644
--- a/lib/models/MvvOverlappingSelection.php
+++ b/lib/models/MvvOverlappingSelection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * MvvOverlappingSelection.class.php - model class for table mvv_ovl_selections
+ * MvvOverlappingSelection.php - model class for table mvv_ovl_selections
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/NewsRange.php b/lib/models/NewsRange.php
index 7785214..675478f 100644
--- a/lib/models/NewsRange.php
+++ b/lib/models/NewsRange.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * NewsRange.class.php - model class for table Institute
+ * NewsRange.php - model class for table Institute
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/NewsRoles.php b/lib/models/NewsRoles.php
index 56da6ec..28a4064 100644
--- a/lib/models/NewsRoles.php
+++ b/lib/models/NewsRoles.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * NewsRoles.class.php - model class for the news roles
+ * NewsRoles.php - model class for the news roles
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/Semester.php b/lib/models/Semester.php
index 03243a5..ef3246b 100644
--- a/lib/models/Semester.php
+++ b/lib/models/Semester.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Semester.class.php
+ * Semester.php
  * model class for table semester_data
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/SemesterCourse.php b/lib/models/SemesterCourse.php
index 04590e3..79e5230 100644
--- a/lib/models/SemesterCourse.php
+++ b/lib/models/SemesterCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SemesterCourse.class.php
+ * SemesterCourse.php
  * Contains the SemesterCourse model.
  *
  * This class represents entries in the mapping table
diff --git a/lib/models/SemesterHoliday.php b/lib/models/SemesterHoliday.php
index 90f9ecd..265f8e1 100644
--- a/lib/models/SemesterHoliday.php
+++ b/lib/models/SemesterHoliday.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SemesterHoliday.class.php
+ * SemesterHoliday.php
  * model class for table semester_holiday
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/SeminarCycleDate.php b/lib/models/SeminarCycleDate.php
index f384426..b8431a3 100644
--- a/lib/models/SeminarCycleDate.php
+++ b/lib/models/SeminarCycleDate.php
@@ -6,7 +6,7 @@ require_once 'lib/dates.inc.php';
 
 
 /**
- * SeminarCycleDate.class.php
+ * SeminarCycleDate.php
  * model class for table seminar_cycle_dates
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/StudipComment.php b/lib/models/StudipComment.php
index 2e0389d..79610f8 100644
--- a/lib/models/StudipComment.php
+++ b/lib/models/StudipComment.php
@@ -23,7 +23,7 @@
 // +---------------------------------------------------------------------------+
 
 /**
- * StudipComment.class.php
+ * StudipComment.php
  *
  *
  *
diff --git a/lib/models/StudipNews.php b/lib/models/StudipNews.php
index 12eb3e1..ccb1828 100644
--- a/lib/models/StudipNews.php
+++ b/lib/models/StudipNews.php
@@ -21,7 +21,7 @@
 require_once 'lib/object.inc.php';
 
 /**
- * StudipNews.class.php
+ * StudipNews.php
  *
  * @author   André Noack <noack@data-quest>, Suchi & Berg GmbH <info@data-quest.de>
  * @author   Arne Schröder <schroeder@data-quest>
diff --git a/lib/models/StudipScmEntry.php b/lib/models/StudipScmEntry.php
index 7001a4a..30c13d3 100644
--- a/lib/models/StudipScmEntry.php
+++ b/lib/models/StudipScmEntry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudipScmEntry.class.php
+ * StudipScmEntry.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/StudyCourse.php b/lib/models/StudyCourse.php
index faf6df4..91937ea 100644
--- a/lib/models/StudyCourse.php
+++ b/lib/models/StudyCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudyCourse.class.php
+ * StudyCourse.php
  * model class for table studiengang
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/ToolActivation.php b/lib/models/ToolActivation.php
index a4a4de2..4209a20 100644
--- a/lib/models/ToolActivation.php
+++ b/lib/models/ToolActivation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ToolActivation.class.php
+ * ToolActivation.php
  * model class for table tools_activated
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/User.php b/lib/models/User.php
index 4894031..3fcc3f5 100644
--- a/lib/models/User.php
+++ b/lib/models/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * User.class.php
+ * User.php
  * model class for combined auth_user_md5/user_info record
  * this class represents one user, the attributes from tables
  * auth_user_md5 and user_info were merged.
@@ -395,7 +395,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
     }
 
     /**
-     * Temporary migrate to User.class.php
+     * Temporary migrate to User.php
      *
      * @param $attributes
      * @return array
diff --git a/lib/models/UserInfo.php b/lib/models/UserInfo.php
index 28808a2..62a63fc 100644
--- a/lib/models/UserInfo.php
+++ b/lib/models/UserInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserInfo.class.php
+ * UserInfo.php
  * model class for table user_info
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/UserOnline.php b/lib/models/UserOnline.php
index e18322d..c3efba2 100644
--- a/lib/models/UserOnline.php
+++ b/lib/models/UserOnline.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * UserOnline.class.php
+ * UserOnline.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -24,4 +24,4 @@ class UserOnline extends SimpleORMap
         $config['db_table'] = 'user_online';
         parent::configure($config);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/models/UserStudyCourse.php b/lib/models/UserStudyCourse.php
index cac37c8..aeac38b 100644
--- a/lib/models/UserStudyCourse.php
+++ b/lib/models/UserStudyCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * UserStudyCourse.class.php
+ * UserStudyCourse.php
  * model class for table user_studiengang
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/WebserviceAccessRule.php b/lib/models/WebserviceAccessRule.php
index 48da0ef..120ac47 100644
--- a/lib/models/WebserviceAccessRule.php
+++ b/lib/models/WebserviceAccessRule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WebserviceAccessRule.class.php
+ * WebserviceAccessRule.php
  * model class for table webservice_access_rules
  * this class represents one record of the table webservice_access_rules
  * the column ip_range is converted from a comma separated list to an ArrayObject and vice-versa,
diff --git a/lib/models/WikiPage.php b/lib/models/WikiPage.php
index 67ddd7e..b5f0101 100644
--- a/lib/models/WikiPage.php
+++ b/lib/models/WikiPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WikiPage.class.php
+ * WikiPage.php
  * model class for table wiki
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/calendar/CalendarDate.php b/lib/models/calendar/CalendarDate.php
index d901cf1..0318dab 100644
--- a/lib/models/calendar/CalendarDate.php
+++ b/lib/models/calendar/CalendarDate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CalendarDate.class.php - Model class for calendar dates.
+ * CalendarDate.php - Model class for calendar dates.
  *
  * CalendarDate represents a date in the personal calendar.
  *
diff --git a/lib/models/calendar/CalendarDateAssignment.php b/lib/models/calendar/CalendarDateAssignment.php
index e0bf467..e0e2135 100644
--- a/lib/models/calendar/CalendarDateAssignment.php
+++ b/lib/models/calendar/CalendarDateAssignment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CalendarDateAssignment.class.php - Model class for calendar date assignments.
+ * CalendarDateAssignment.php - Model class for calendar date assignments.
  *
  * CalendarDateAssignment represents the assignment of a calendar date
  *  to a specific calendar. The calendar is represented by a range-ID
diff --git a/lib/models/resources/BrokenResource.php b/lib/models/resources/BrokenResource.php
index 5266b4f..fc44e82 100644
--- a/lib/models/resources/BrokenResource.php
+++ b/lib/models/resources/BrokenResource.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceLabel.class.php - model class for a resource label
+ * ResourceLabel.php - model class for a resource label
  *
  * The BrokenResource class represents resources whose class
  * cannot be found due to missing Resource specialisations
diff --git a/lib/models/resources/Building.php b/lib/models/resources/Building.php
index 0edb983..a1c071a 100644
--- a/lib/models/resources/Building.php
+++ b/lib/models/resources/Building.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Building.class.php - model class for a resource which is a building
+ * Building.php - model class for a resource which is a building
  *
  * The building class is a derived class from the Resource class
  * which includes specialisations for Building resource types.
diff --git a/lib/models/resources/GlobalResourceLock.php b/lib/models/resources/GlobalResourceLock.php
index b1753f5..ed748e1 100644
--- a/lib/models/resources/GlobalResourceLock.php
+++ b/lib/models/resources/GlobalResourceLock.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GlobalResourceLock.class.php - model class for resource locks
+ * GlobalResourceLock.php - model class for resource locks
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/Location.php b/lib/models/resources/Location.php
index 8e79382..9da2e11 100644
--- a/lib/models/resources/Location.php
+++ b/lib/models/resources/Location.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Location.class.php - model class for a resource which is a location
+ * Location.php - model class for a resource which is a location
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/Resource.php b/lib/models/resources/Resource.php
index 92d8107..32fce2b 100644
--- a/lib/models/resources/Resource.php
+++ b/lib/models/resources/Resource.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Resource.class.php - model class for a resource
+ * Resource.php - model class for a resource
  *
  * The Resource class is the base class of the new
  * Room and Resource management system in Stud.IP.
diff --git a/lib/models/resources/ResourceBooking.php b/lib/models/resources/ResourceBooking.php
index 8950713..977cf32 100644
--- a/lib/models/resources/ResourceBooking.php
+++ b/lib/models/resources/ResourceBooking.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBooking.class.php - model class for resource bookings
+ * ResourceBooking.php - model class for resource bookings
  *
  * The ResourceBooking class is responsible for storing
  * bookings of resources in a specified time range
diff --git a/lib/models/resources/ResourceBookingInterval.php b/lib/models/resources/ResourceBookingInterval.php
index 7908e40..47f01cc 100644
--- a/lib/models/resources/ResourceBookingInterval.php
+++ b/lib/models/resources/ResourceBookingInterval.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceBookingInterval.class.php - model class for storing
+ * ResourceBookingInterval.php - model class for storing
  * all resource bookings time intervals, including those for
  * repetitions.
  *
diff --git a/lib/models/resources/ResourceCategory.php b/lib/models/resources/ResourceCategory.php
index 766a5f6..cfe323a 100644
--- a/lib/models/resources/ResourceCategory.php
+++ b/lib/models/resources/ResourceCategory.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceCategory.class.php - model class for resource categories
+ * ResourceCategory.php - model class for resource categories
  *
  * The ResourceCategory class can be used as a Factory for
  * Resource objects.
diff --git a/lib/models/resources/ResourceCategoryProperty.php b/lib/models/resources/ResourceCategoryProperty.php
index b1460cd..c9ac66e 100644
--- a/lib/models/resources/ResourceCategoryProperty.php
+++ b/lib/models/resources/ResourceCategoryProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceCategoryProperty.class.php - model class for
+ * ResourceCategoryProperty.php - model class for
  * resource category properties
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/resources/ResourceLabel.php b/lib/models/resources/ResourceLabel.php
index d9c869f..c465723 100644
--- a/lib/models/resources/ResourceLabel.php
+++ b/lib/models/resources/ResourceLabel.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceLabel.class.php - model class for a resource label
+ * ResourceLabel.php - model class for a resource label
  *
  * The ResourceLabel class represents headings or subheadings whose
  * only purpose is helping with organising the resource tree.
diff --git a/lib/models/resources/ResourcePermission.php b/lib/models/resources/ResourcePermission.php
index bd33708..044db83 100644
--- a/lib/models/resources/ResourcePermission.php
+++ b/lib/models/resources/ResourcePermission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePermission.class.php - model class for resource permissions.
+ * ResourcePermission.php - model class for resource permissions.
  *
  * Description of the resources permission system:
  * - admin: An admin may do everything in the resource management:
diff --git a/lib/models/resources/ResourceProperty.php b/lib/models/resources/ResourceProperty.php
index 4bbc4ec..4f7a329 100644
--- a/lib/models/resources/ResourceProperty.php
+++ b/lib/models/resources/ResourceProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceProperty.class.php - model class for resource properties
+ * ResourceProperty.php - model class for resource properties
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourcePropertyDefinition.php b/lib/models/resources/ResourcePropertyDefinition.php
index 450ec00..b87e8e6 100644
--- a/lib/models/resources/ResourcePropertyDefinition.php
+++ b/lib/models/resources/ResourcePropertyDefinition.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyDefinition.class.php - model class for resource property definitions
+ * ResourcePropertyDefinition.php - model class for resource property definitions
  *
  * The ResourcePropertyDefinition class can be used as a Factory
  * for ResourceProperty objects.
diff --git a/lib/models/resources/ResourcePropertyGroup.php b/lib/models/resources/ResourcePropertyGroup.php
index ad53902..f6ea825 100644
--- a/lib/models/resources/ResourcePropertyGroup.php
+++ b/lib/models/resources/ResourcePropertyGroup.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourcePropertyGroup.class.php - model class for resource property groups
+ * ResourcePropertyGroup.php - model class for resource property groups
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php
index b2f5524..df77b19 100644
--- a/lib/models/resources/ResourceRequest.php
+++ b/lib/models/resources/ResourceRequest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequest.class.php - Contains a model class for resource requests.
+ * ResourceRequest.php - Contains a model class for resource requests.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourceRequestAppointment.php b/lib/models/resources/ResourceRequestAppointment.php
index 929733b..63384a2 100644
--- a/lib/models/resources/ResourceRequestAppointment.php
+++ b/lib/models/resources/ResourceRequestAppointment.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequestAppointment.class.php - Contains a model class for
+ * ResourceRequestAppointment.php - Contains a model class for
  * the resource_request_appointments table.
  *
  * ResourceRequestAppointment is a model class to connect
diff --git a/lib/models/resources/ResourceRequestProperty.php b/lib/models/resources/ResourceRequestProperty.php
index 2952be9..c387daa 100644
--- a/lib/models/resources/ResourceRequestProperty.php
+++ b/lib/models/resources/ResourceRequestProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceRequestProperty.class.php - model class for
+ * ResourceRequestProperty.php - model class for
  * resource request properties
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/models/resources/ResourceTemporaryPermission.php b/lib/models/resources/ResourceTemporaryPermission.php
index ddbc397..ad7b33a 100644
--- a/lib/models/resources/ResourceTemporaryPermission.php
+++ b/lib/models/resources/ResourceTemporaryPermission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceTemporaryPermission.class.php
+ * ResourceTemporaryPermission.php
  * Contains the ResourceTemporaryPermission class
  *
  * The ResourceTemporaryPermission class represents temporary permissions
diff --git a/lib/models/resources/Room.php b/lib/models/resources/Room.php
index 7f1668e..c8e393c 100644
--- a/lib/models/resources/Room.php
+++ b/lib/models/resources/Room.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Room.class.php - model class for a resource which is a room
+ * Room.php - model class for a resource which is a room
  *
  * The Room class is a derived class of the Resource class.
  * It containts specialisations for room resources.
diff --git a/lib/models/resources/RoomRequest.php b/lib/models/resources/RoomRequest.php
index 6db9c38..4ba11bc 100644
--- a/lib/models/resources/RoomRequest.php
+++ b/lib/models/resources/RoomRequest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RoomRequest.class.php - model class for table resource_requests
+ * RoomRequest.php - model class for table resource_requests
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/SeparableRoom.php b/lib/models/resources/SeparableRoom.php
index 9ec1ccf..d1bf125 100644
--- a/lib/models/resources/SeparableRoom.php
+++ b/lib/models/resources/SeparableRoom.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * SeparableRoom.class.php - model class for a separable room
+ * SeparableRoom.php - model class for a separable room
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/SeparableRoomPart.php b/lib/models/resources/SeparableRoomPart.php
index e7e99e7..8a45ce7 100644
--- a/lib/models/resources/SeparableRoomPart.php
+++ b/lib/models/resources/SeparableRoomPart.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * SeparableRoomItem.class.php - model class for a separable room item
+ * SeparableRoomItem.php - model class for a separable room item
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/CoreForum.php b/lib/modules/CoreForum.php
index 3a43372..0283a09 100644
--- a/lib/modules/CoreForum.php
+++ b/lib/modules/CoreForum.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Forum.class.php - Forum
+ * Forum.php - Forum
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/FeedbackModule.php b/lib/modules/FeedbackModule.php
index 8674f62..2fc657d 100644
--- a/lib/modules/FeedbackModule.php
+++ b/lib/modules/FeedbackModule.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * FeedbackModule.class.php - Feedback Elements for Stud.IP as Module.
+ * FeedbackModule.php - Feedback Elements for Stud.IP as Module.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/GradebookModule.php b/lib/modules/GradebookModule.php
index 66886a2..45cd93e 100644
--- a/lib/modules/GradebookModule.php
+++ b/lib/modules/GradebookModule.php
@@ -4,7 +4,7 @@ use Grading\Definition;
 use Grading\Instance;
 
 /**
- * GradebookModule.class.php - Gradebook API for Stud.IP.
+ * GradebookModule.php - Gradebook API for Stud.IP.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/modules/LtiToolModule.php b/lib/modules/LtiToolModule.php
index 033f5e8..74fd70a 100644
--- a/lib/modules/LtiToolModule.php
+++ b/lib/modules/LtiToolModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LtiToolModule.class.php - LTI consumer API for Stud.IP
+ * LtiToolModule.php - LTI consumer API for Stud.IP
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/object.inc.php b/lib/object.inc.php
index c23efa4..a8bd5d7 100644
--- a/lib/object.inc.php
+++ b/lib/object.inc.php
@@ -51,7 +51,7 @@ function object_set_visit_module($plugin_id)
 * This function saves the actual time as last visitdate for the given object, user and type
 *
 * @param    string  the id of the object (i.e. seminar_id, news_id, vote_id)
-* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.class.php for definitions)
+* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.php for definitions)
 * @param    string  the user who visited the object - if not given, the actual user is used
 *
 */
@@ -81,7 +81,7 @@ function object_set_visit($object_id, $plugin_id, $user_id = '')
 * This function gets the (last) visit time for an object or module. If no information is found, the last visit of the open-object can bes used
 *
 * @param    string  the id of the object (i.e. seminar_id, news_id, vote_id)
-* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.class.php for definitions OR sem/inst, if the visit for the whole seminar was saved)
+* @param    string  the type of visited object or module (i.e. news, documents, wiki - see /lib/classes/Modules.php for definitions OR sem/inst, if the visit for the whole seminar was saved)
 * @param    string  the return-mode: 'last' for the last visit, other for actual-visit
 * @param    string  the user who visited the object - if not given, the actual user is used
 * @param    string  the id of an open-object (seminar or inst), to gather information for last visit from the visit of the whole open-object
diff --git a/lib/phplib/Seminar_Auth.php b/lib/phplib/Seminar_Auth.php
index 2c1c60c..950be8a 100644
--- a/lib/phplib/Seminar_Auth.php
+++ b/lib/phplib/Seminar_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Auth.class.php
+ * Seminar_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_Default_Auth.php b/lib/phplib/Seminar_Default_Auth.php
index 6d0e46c..146c588 100644
--- a/lib/phplib/Seminar_Default_Auth.php
+++ b/lib/phplib/Seminar_Default_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Default_Auth.class.php
+ * Seminar_Default_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -16,4 +16,4 @@
 class Seminar_Default_Auth extends Seminar_Auth
 {
     protected $nobody = true;
-}
\ No newline at end of file
+}
diff --git a/lib/phplib/Seminar_Perm.php b/lib/phplib/Seminar_Perm.php
index a116938..1c3a85e 100644
--- a/lib/phplib/Seminar_Perm.php
+++ b/lib/phplib/Seminar_Perm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Perm.class.php
+ * Seminar_Perm.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_Register_Auth.php b/lib/phplib/Seminar_Register_Auth.php
index f2a272e..5bf10f1 100644
--- a/lib/phplib/Seminar_Register_Auth.php
+++ b/lib/phplib/Seminar_Register_Auth.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Seminar_Register_Auth.class.php
+ * Seminar_Register_Auth.php
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/phplib/Seminar_User.php b/lib/phplib/Seminar_User.php
index c82d73a..4dd59bc 100644
--- a/lib/phplib/Seminar_User.php
+++ b/lib/phplib/Seminar_User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Seminar_User.class.php
+ * Seminar_User.php
  * global object representing current user
  *
  * This program is free software; you can redistribute it and/or
diff --git a/lib/plugins/core/AdministrationPlugin.php b/lib/plugins/core/AdministrationPlugin.php
index c9aa8da..6856e6a 100644
--- a/lib/plugins/core/AdministrationPlugin.php
+++ b/lib/plugins/core/AdministrationPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * AdministrationPlugin.class.php - administration plugin interface
+ * AdministrationPlugin.php - administration plugin interface
  *
  * NOTE: This interface is deprecated, use SystemPlugin instead.
  *
diff --git a/lib/plugins/core/CorePlugin.php b/lib/plugins/core/CorePlugin.php
index d059f4c..056efaf 100644
--- a/lib/plugins/core/CorePlugin.php
+++ b/lib/plugins/core/CorePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * CorePlugin.class.php - base class
+ * CorePlugin.php - base class
  *
  * @author    André Noack <noack@data-quest.de>
  * @copyright 2021 Authors
diff --git a/lib/plugins/core/DetailspagePlugin.php b/lib/plugins/core/DetailspagePlugin.php
index 36e6efa..3cc3b57 100644
--- a/lib/plugins/core/DetailspagePlugin.php
+++ b/lib/plugins/core/DetailspagePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * DetailspagePlugin.class.php
+ * DetailspagePlugin.php
  *
  * Copyright (c) 2019 - Rasmus Fuhse <fuhse@data-quest.de>
  *
diff --git a/lib/plugins/core/ForumModule.php b/lib/plugins/core/ForumModule.php
index 33784db..e72ffc2 100644
--- a/lib/plugins/core/ForumModule.php
+++ b/lib/plugins/core/ForumModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ForumModule.class.php - Interface for all intersections between the Stud.IP 
+ * ForumModule.php - Interface for all intersections between the Stud.IP
  *                         Core and something that behaves like a forum
  *
  * Implement all interface methods and you can integrate your plugin like
@@ -137,4 +137,4 @@ interface ForumModule extends StandardPlugin
      * @return string  a single-page HTML-view of all contents in one string
      */
     function getDump($seminar_id);
-}
\ No newline at end of file
+}
diff --git a/lib/plugins/core/HomepagePlugin.php b/lib/plugins/core/HomepagePlugin.php
index 37efb54..b0dbd65 100644
--- a/lib/plugins/core/HomepagePlugin.php
+++ b/lib/plugins/core/HomepagePlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * HomepagePlugin.class.php - home page plugin interface
+ * HomepagePlugin.php - home page plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/core/LibraryPlugin.php b/lib/plugins/core/LibraryPlugin.php
index a7fb873..3c1a751 100644
--- a/lib/plugins/core/LibraryPlugin.php
+++ b/lib/plugins/core/LibraryPlugin.php
@@ -2,7 +2,7 @@
 
 
 /*
- * LibraryPlugin.class.php - A plugin class for library plugins.
+ * LibraryPlugin.php - A plugin class for library plugins.
  *
  * Copyright (c) 2020  Moritz Strohm
  *
diff --git a/lib/plugins/core/PortalPlugin.php b/lib/plugins/core/PortalPlugin.php
index cb5aca4..826e410 100644
--- a/lib/plugins/core/PortalPlugin.php
+++ b/lib/plugins/core/PortalPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * PortalPlugin.class.php - start / portal page plugin interface
+ * PortalPlugin.php - start / portal page plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/core/Role.php b/lib/plugins/core/Role.php
index 3ca8a11..91e00e8 100644
--- a/lib/plugins/core/Role.php
+++ b/lib/plugins/core/Role.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Role.class.php
+ * Role.php
  *
  * @author      Dennis Reil <dennis.reil@offis.de>
  * @author      Michael Riehemann <michael.riehemann@uni-oldenburg.de>
diff --git a/lib/plugins/core/StandardPlugin.php b/lib/plugins/core/StandardPlugin.php
index 960ffd0..5180891 100644
--- a/lib/plugins/core/StandardPlugin.php
+++ b/lib/plugins/core/StandardPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * StandardPlugin.class.php - course or institute plugin interface
+ * StandardPlugin.php - course or institute plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/core/StudIPPlugin.php b/lib/plugins/core/StudIPPlugin.php
index fe74259..6642dbd 100644
--- a/lib/plugins/core/StudIPPlugin.php
+++ b/lib/plugins/core/StudIPPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * StudIPPlugin.class.php - generic plugin base class
+ * StudIPPlugin.php - generic plugin base class
  *
  * @author    Elmar Ludwig <ludwig@uos.de>
  * @copyright 2009 Authors
diff --git a/lib/plugins/core/SystemPlugin.php b/lib/plugins/core/SystemPlugin.php
index c204567..0ffd16f 100644
--- a/lib/plugins/core/SystemPlugin.php
+++ b/lib/plugins/core/SystemPlugin.php
@@ -1,7 +1,7 @@
 <?php
 # Lifter010: TODO
 /*
- * SystemPlugin.class.php - generic system plugin interface
+ * SystemPlugin.php - generic system plugin interface
  *
  * Copyright (c) 2008 - Marcus Lunzenauer <mlunzena@uos.de>
  * Copyright (c) 2009 - Elmar Ludwig
diff --git a/lib/plugins/db/RolePersistence.php b/lib/plugins/db/RolePersistence.php
index df63a77..54a0053 100644
--- a/lib/plugins/db/RolePersistence.php
+++ b/lib/plugins/db/RolePersistence.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * RolePersistence.class.php
+ * RolePersistence.php
  *
  * Funktionen für das Rollenmanagement
  *
diff --git a/lib/plugins/engine/PluginManager.php b/lib/plugins/engine/PluginManager.php
index 7e36fa0..ec434a9 100644
--- a/lib/plugins/engine/PluginManager.php
+++ b/lib/plugins/engine/PluginManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PluginManager.class.php - plugin manager for Stud.IP
+ * PluginManager.php - plugin manager for Stud.IP
  *
  * @copyright  2009  Elmar Ludwig
  * @license GPL2 or any later version
@@ -351,10 +351,10 @@ class PluginManager
             $path = 'lib/modules';
         }
 
-        $pluginfile = $basepath.'/'.$path.'/'.$class.'.class.php';
+        $pluginfile = $basepath.'/'.$path.'/'.$class.'.php';
 
         if (!file_exists($pluginfile)) {
-            $pluginfile = $basepath.'/'.$path.'/'.$class.'.php';
+            $pluginfile = $basepath.'/'.$path.'/'.$class.'.class.php';
 
             if (!file_exists($pluginfile)) {
                 return null;
diff --git a/lib/plugins/engine/PluginRepository.php b/lib/plugins/engine/PluginRepository.php
index 235e9bd..4bd24c6 100644
--- a/lib/plugins/engine/PluginRepository.php
+++ b/lib/plugins/engine/PluginRepository.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * PluginRepository.class.php - query plugin meta data
+ * PluginRepository.php - query plugin meta data
  *
  * Copyright (c) 2008  Elmar Ludwig
  *
diff --git a/lib/raumzeit/CycleData.php b/lib/raumzeit/CycleData.php
index 587e0bc..d89d8ae 100644
--- a/lib/raumzeit/CycleData.php
+++ b/lib/raumzeit/CycleData.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CycleData.class.php
+// CycleData.php
 //
 // Repräsentiert ein Turnusdatum eines MetaDates
 //
diff --git a/lib/raumzeit/CycleDataDB.php b/lib/raumzeit/CycleDataDB.php
index eb586b4..715df0b 100644
--- a/lib/raumzeit/CycleDataDB.php
+++ b/lib/raumzeit/CycleDataDB.php
@@ -5,9 +5,9 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// CycleDataDB.class.php
+// CycleDataDB.php
 //
-// Datenbank-Abfragen für CycleData.class.php
+// Datenbank-Abfragen für CycleData.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 
 /**
- * CycleDataDB.class.php
+ * CycleDataDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/Issue.php b/lib/raumzeit/Issue.php
index 939aaee..eeb38b3 100644
--- a/lib/raumzeit/Issue.php
+++ b/lib/raumzeit/Issue.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// Issue.class.php
+// Issue.php
 //
 // Repräsentiert ein einzelnes Thema einer Veranstaltung
 //
@@ -26,7 +26,7 @@
 
 
 /**
- * Issue.class.php
+ * Issue.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
@@ -156,7 +156,7 @@ class Issue {
     function restore() {
         /*
          * To avoid inconsistency, the restore function has been removed.
-         * The only way to load an Issue is via the Seminar.class.php, with the function fillValuesFromArray
+         * The only way to load an Issue is via the Seminar.php, with the function fillValuesFromArray
          */
         $this->fillValuesFromArray(IssueDB::restoreIssue($this->issue_id));
     }
diff --git a/lib/raumzeit/IssueDB.php b/lib/raumzeit/IssueDB.php
index d6c0ba3..17d8b95 100644
--- a/lib/raumzeit/IssueDB.php
+++ b/lib/raumzeit/IssueDB.php
@@ -5,9 +5,9 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// IssueDB.class.php
+// IssueDB.php
 //
-// Datenbank-Abfragen für Issue.class.php
+// Datenbank-Abfragen für Issue.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 
 /**
- * IssueDB.class.php
+ * IssueDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/MetaDate.php b/lib/raumzeit/MetaDate.php
index 0af632d..1348222 100644
--- a/lib/raumzeit/MetaDate.php
+++ b/lib/raumzeit/MetaDate.php
@@ -5,7 +5,7 @@
 # Lifter010: TODO
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// MetaDate.class.php
+// MetaDate.php
 //
 // Repräsentiert die Zeit- und Turnusdaten einer Veranstaltung
 //
@@ -26,7 +26,7 @@
 
 
 /**
- * MetaDate.class.php
+ * MetaDate.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/MetaDateDB.php b/lib/raumzeit/MetaDateDB.php
index 5f5e1df..29af00e 100644
--- a/lib/raumzeit/MetaDateDB.php
+++ b/lib/raumzeit/MetaDateDB.php
@@ -6,9 +6,9 @@
 
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// MetaDateDB.class.php
+// MetaDateDB.php
 //
-// Datenbank-Abfragen für MetaDate.class.php
+// Datenbank-Abfragen für MetaDate.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 
 
 /**
- * MetaDateDB.class.php
+ * MetaDateDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/SeminarDB.php b/lib/raumzeit/SeminarDB.php
index 63241fe..600510b 100644
--- a/lib/raumzeit/SeminarDB.php
+++ b/lib/raumzeit/SeminarDB.php
@@ -5,9 +5,9 @@
 # Lifter010: DONE
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SeminarDB.class.php
+// SeminarDB.php
 //
-// Datenbank-Abfragen für Seminar.class.php
+// Datenbank-Abfragen für Seminar
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 
 
 /**
- * SeminarDB.class.php
+ * SeminarDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/raumzeit/SingleDate.php b/lib/raumzeit/SingleDate.php
index 2e8f41e..06cb9a2 100644
--- a/lib/raumzeit/SingleDate.php
+++ b/lib/raumzeit/SingleDate.php
@@ -4,7 +4,7 @@
 # Lifter003: TODO
 # Lifter010: TODO
 /**
- * SingelDate.class.php - Ein (Ex-)Termin
+ * SingelDate.php - Ein (Ex-)Termin
  *
  * Diese Klasse stellt einen einzelnen Eintrag in der Tabelle termine, bzw. ex_termine dar.
  *
diff --git a/lib/raumzeit/SingleDateDB.php b/lib/raumzeit/SingleDateDB.php
index e50d6cf..04144a6 100644
--- a/lib/raumzeit/SingleDateDB.php
+++ b/lib/raumzeit/SingleDateDB.php
@@ -4,9 +4,9 @@
 # Lifter010: DONE
 // +--------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// SingleDateDB.class.php
+// SingleDateDB.php
 //
-// Datenbank-Abfragen für SingleDate.class.php
+// Datenbank-Abfragen für SingleDate.php
 //
 // +--------------------------------------------------------------------------+
 // This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 
 
 /**
- * SingleDateDB.class.php
+ * SingleDateDB.php
  *
  *
  * @author      Till Glöggler <tgloeggl@uos.de>
diff --git a/lib/resources/ResourceManager.php b/lib/resources/ResourceManager.php
index a30c470..b6115e7 100644
--- a/lib/resources/ResourceManager.php
+++ b/lib/resources/ResourceManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ResourceManager.class.php
+ * ResourceManager.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/resources/RoomManager.php b/lib/resources/RoomManager.php
index f4b4802..0122a48 100644
--- a/lib/resources/RoomManager.php
+++ b/lib/resources/RoomManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * RoomManager.class.php
+ * RoomManager.php
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 66f8e65..7b7ef10 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -695,8 +695,8 @@ function display_exception($exception, $as_html = false, $deep = false) {
  * @return String Icon path for the mime type
  */
 //DEPRECATED: replaced by FileManager::getIconNameForMimeType
-//TODO: test: lib/extern/modules/ExternModuleDownload.class.php
-//TODO: test: lib/extern/modules/ExternModuleTemplateDownload.class.php
+//TODO: test: lib/extern/modules/ExternModuleDownload.php
+//TODO: test: lib/extern/modules/ExternModuleTemplateDownload.php
 /*
 function get_icon_for_mimetype($mime_type)
 {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 531053a..0aec8e8 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -17,7 +17,7 @@ parameters:
     excludePaths:
         - lib/classes/ZipArchiveLegacyTrait.php
         - lib/elearning/studip_referrer.php
-        - lib/soap/StudipSoapClient_PHP5.class.php
+        - lib/soap/StudipSoapClient_PHP5.php
     tmpDir: .caches
     earlyTerminatingMethodCalls:
         RESTAPI\RouteMap:
diff --git a/public/admin_elearning_interface.php b/public/admin_elearning_interface.php
index f53f69c..24eb47c 100644
--- a/public/admin_elearning_interface.php
+++ b/public/admin_elearning_interface.php
@@ -60,7 +60,7 @@ if (Config::get()->ELEARNING_INTERFACE_ENABLE)
         }
         if (!count(array_column($connection_status, 'error')))
         {
-            require_once ("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS.class.php");
+            require_once ("lib/elearning/" . $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS.php");
             $classname = $ELEARNING_INTERFACE_MODULES[$cms_select]["CLASS_PREFIX"] . "ConnectedCMS";
             $connected_cms[$cms_select] = new $classname($cms_select);
             $connected_cms[$cms_select]->initSubclasses();
diff --git a/resources/assets/javascripts/lib/wysiwyg.js b/resources/assets/javascripts/lib/wysiwyg.js
index f9acb81..47c64d0 100644
--- a/resources/assets/javascripts/lib/wysiwyg.js
+++ b/resources/assets/javascripts/lib/wysiwyg.js
@@ -13,17 +13,17 @@ const wysiwyg = {
 
     isHtml: function isHtml(text) {
         // NOTE keep this function in sync with
-        // Markup::isHtml in Markup.class.php
+        // Markup::isHtml in Markup.php
         return this.hasHtmlMarker(text);
     },
     hasHtmlMarker: function hasHtmlMarker(text) {
         // NOTE keep this function in sync with
-        // Markup::hasHtmlMarker in Markup.class.php
+        // Markup::hasHtmlMarker in Markup.php
         return this.htmlMarkerRegExp.test(text);
     },
     markAsHtml: function markAsHtml(text) {
         // NOTE keep this function in sync with
-        // Markup::markAsHtml in Markup.class.php
+        // Markup::markAsHtml in Markup.php
         if (this.hasHtmlMarker(text) || text.trim() == '') {
             return text; // marker already set, don't set twice
         }
-- 
cgit v1.0


From 871ff3ae2b66aab875586e41e9cff6a81eb2b706 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 21 Jun 2024 12:21:16 +0000
Subject: fix #4340

Closes #4340

Merge request studip/studip!3142
---
 .../courseware/blocks/CoursewareCanvasBlock.vue           | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/resources/vue/components/courseware/blocks/CoursewareCanvasBlock.vue b/resources/vue/components/courseware/blocks/CoursewareCanvasBlock.vue
index 669a5b8..24a59f5 100644
--- a/resources/vue/components/courseware/blocks/CoursewareCanvasBlock.vue
+++ b/resources/vue/components/courseware/blocks/CoursewareCanvasBlock.vue
@@ -127,7 +127,7 @@
                                 <studip-file-chooser
                                     v-model="currentFileId"
                                     selectable="file"
-                                    :courseId="studipContext.id"
+                                    :courseId="context.id"
                                     :userId="userId"
                                     :isImage="true"
                                     :excludedCourseFolderTypes="excludedCourseFolderTypes"
@@ -187,7 +187,7 @@ export default {
             currentUserView: 'own',
             currentFile: {},
 
-            context: {},
+            canvasContext: {},
             paint: false,
             write: false,
             clickX: [],
@@ -221,7 +221,6 @@ export default {
     },
     computed: {
         ...mapGetters({
-            studipContext: 'context',
             fileRefById: 'file-refs/byId',
             getUserDataById: 'courseware-user-data-fields/byId',
             relatedUserData: 'user-data-field/related',
@@ -301,9 +300,7 @@ export default {
             return this.currentUploadFolderId !== "";
         },
         canSwitchView() {
-            // this feature is not something to offer in the Arbeitsplatz!
-            let context = this.$store.getters.context;
-            if (context.type !== 'courses') {
+            if (this.context.type !== 'courses') {
                 return false;
             }
             if (this.currentShowUserData === 'off') {
@@ -419,7 +416,7 @@ export default {
             } else {
                 canvas.height = 500;
             }
-            this.context = canvas.getContext('2d');
+            this.canvasContext = canvas.getContext('2d');
             this.setColor('blue');
             this.currentSize = this.sizes['normal'];
             this.currentTool = this.tools['pen'];
@@ -427,7 +424,7 @@ export default {
         },
         redraw() {
             let view = this;
-            let context = view.context;
+            let context = view.canvasContext;
             context.clearRect(0, 0, context.canvas.width, context.canvas.height); // Clears the canvas
             context.fillStyle = '#ffffff';
             context.fillRect(0, 0, context.canvas.width, context.canvas.height); // set background
@@ -658,7 +655,7 @@ export default {
         },
         async store() {
             let user = this.usersById({id: this.userId});
-            let imageBase64 = this.context.canvas.toDataURL("image/jpeg", 1.0);
+            let imageBase64 = this.canvasContext.canvas.toDataURL("image/jpeg", 1.0);
             let image = await fetch(imageBase64);
             let imageBlob = await image.blob();
             let file = {};
-- 
cgit v1.0


From 97a188592c679890a25c37ab78463add76a52ff7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 21 Jun 2024 15:51:27 +0000
Subject: fix php8 warning, fixes #4341

Closes #4341

Merge request studip/studip!3143
---
 app/controllers/course/timesrooms.php |  4 ++--
 app/controllers/profile.php           | 25 ++++++++++++-------------
 app/views/profile/index.php           |  4 ++--
 lib/activities/Context.php            |  2 +-
 lib/filesystem/CourseGroupFolder.php  |  4 ++--
 templates/layouts/dialog.php          |  4 ++--
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php
index f452f4d..4788eee 100644
--- a/app/controllers/course/timesrooms.php
+++ b/app/controllers/course/timesrooms.php
@@ -516,7 +516,7 @@ class Course_TimesroomsController extends AuthenticatedController
                 '<strong>' . htmlReady($singledate->toString()) . '</strong>'
             ));
         }
-        if ($singledate->messages['error']) {
+        if (!empty($singledate->messages['error'])) {
             PageLayout::postError(
                 _('Die folgenden Fehler traten beim Bearbeiten des Termins auf:'),
                 htmlReady($singledate->messages['error'])
@@ -1687,7 +1687,7 @@ class Course_TimesroomsController extends AuthenticatedController
             } else {
                 $user_rooms = RoomManager::getUserRooms($current_user);
                 foreach ($user_rooms as $room) {
-                    if ($room->userHasBookingRights($current_user, $begin, $end)) {
+                    if ($room->userHasBookingRights($current_user, $begin ?? null, $end ?? null)) {
                         $rooms_with_booking_permissions++;
                         if ($only_bookable_rooms) {
                             foreach ($all_time_intervals as $interval) {
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 72a500e..1412c9c 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -40,14 +40,14 @@ class ProfileController extends AuthenticatedController
 
         // set the page title depending on user selection
         if (
-            $this->user
+            isset($this->user, $this->current_user)
             && $this->current_user->id === $this->user->id
             && !$this->current_user->locked
         ) {
             PageLayout::setTitle(_('Mein Profil'));
             UserConfig::get($this->user->id)->store('PROFILE_LAST_VISIT', time());
         } elseif (
-            $this->current_user->id
+            !empty($this->current_user->id)
             && (
                 $this->perm->have_perm('root')
                 || (
@@ -139,17 +139,16 @@ class ProfileController extends AuthenticatedController
         }
 
         // calendar
-        $this->dates = '';
-        if (Config::get()->CALENDAR_ENABLE) {
-            if (!in_array($this->current_user->perms, ['admin', 'root'])) {
-                if (Visibility::verify('termine', $this->current_user->user_id)) {
-                    $start = time();
-                    $end   = strtotime('+1 week 23:59:59');
-
-                    $response    = $this->relay('calendar/contentbox/display/' . $this->current_user->user_id . '/' . ($end - $start));
-                    $this->dates = $response->body;
-                }
-            }
+        if (
+            Config::get()->CALENDAR_ENABLE
+            && !in_array($this->current_user->perms, ['admin', 'root'])
+            && Visibility::verify('termine', $this->current_user->user_id)
+        ) {
+            $start = time();
+            $end   = strtotime('+1 week 23:59:59');
+
+            $response    = $this->relay('calendar/contentbox/display/' . $this->current_user->user_id . '/' . ($end - $start));
+            $this->dates = $response->body;
         }
 
         // include and show votes and tests
diff --git a/app/views/profile/index.php b/app/views/profile/index.php
index b191151..9b7cb4f 100644
--- a/app/views/profile/index.php
+++ b/app/views/profile/index.php
@@ -83,9 +83,9 @@
 
 </section>
 
-<?= $news ?>
+<?= $news ?? '' ?>
 
-<?= $dates ?>
+<?= $dates ?? '' ?>
 
 <?= $questionnaires ?? '' ?>
 
diff --git a/lib/activities/Context.php b/lib/activities/Context.php
index 1705528..dba0d0f 100644
--- a/lib/activities/Context.php
+++ b/lib/activities/Context.php
@@ -147,7 +147,7 @@ abstract class Context
         } else {
             foreach ($providers as $provider) {
                 $ctype = $this->getContextType();
-                $filtered_classes = $filter->getType()->$ctype;
+                $filtered_classes = $filter->getType()->$ctype ?? null;
 
                 if (is_array($filtered_classes)) {
                     foreach ($filtered_classes as $class) {
diff --git a/lib/filesystem/CourseGroupFolder.php b/lib/filesystem/CourseGroupFolder.php
index 81867f6..36bbb92 100644
--- a/lib/filesystem/CourseGroupFolder.php
+++ b/lib/filesystem/CourseGroupFolder.php
@@ -123,7 +123,7 @@ class CourseGroupFolder extends StandardFolder
     public function getEditTemplate()
     {
         $template = $GLOBALS['template_factory']->open('filesystem/group_folder/edit.php');
-        $group = Statusgruppen::find($this->folderdata['data_content']['group']);
+        $group = Statusgruppen::find($this->folderdata['data_content']['group'] ?? null);
         $template->set_attribute('group', $group);
         $template->set_attribute('folder', $this);
         return $template;
@@ -151,7 +151,7 @@ class CourseGroupFolder extends StandardFolder
      */
     public function getDescriptionTemplate()
     {
-        $group = new Statusgruppen($this->folderdata['data_content']['group']);
+        $group = new Statusgruppen($this->folderdata['data_content']['group'] ?? null);
 
         $template = $GLOBALS['template_factory']->open('filesystem/group_folder/description.php');
         $template->type       = self::getTypeName();
diff --git a/templates/layouts/dialog.php b/templates/layouts/dialog.php
index ddf9280..147f69d 100644
--- a/templates/layouts/dialog.php
+++ b/templates/layouts/dialog.php
@@ -1,2 +1,2 @@
-<?= implode(PageLayout::getMessages()) ?>
-<?= $content_for_layout ?>
\ No newline at end of file
+<?= implode('', PageLayout::getMessages()) ?>
+<?= $content_for_layout ?>
-- 
cgit v1.0